diff --git a/.babelrc.js b/.babelrc.js
index bece57ec4a5..add243a5b5d 100644
--- a/.babelrc.js
+++ b/.babelrc.js
@@ -1,34 +1 @@
-
-let path = require('path');
-
-function useLocal(module) {
-  return require.resolve(module, {
-    paths: [
-      __dirname
-    ]
-  })
-}
-
-module.exports = {
-  "presets": [
-    [
-      useLocal('@babel/preset-env'),
-      {
-        "targets": {
-          "browsers": [
-            "chrome >= 61",
-            "safari >=8",
-            "edge >= 14",
-            "ff >= 57",
-            "ie >= 10",
-            "ios >= 8"
-          ]
-        }
-      }
-    ]
-  ],
-  "plugins": [
-    path.resolve(__dirname, './plugins/pbjsGlobals.js'),
-    useLocal('babel-plugin-transform-object-assign')
-  ]
-};
+module.exports = require('./babelConfig.js')();
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ea5e87218c..84ddcdf26ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,12 +3,12 @@
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
 #
 
-aliases: 
+aliases:
   - &environment
       docker:
         # specify the version you desire here
-        - image: circleci/node:12.16.1
-        
+        - image: circleci/node:12.16.1-browsers
+      resource_class: xlarge
         # Specify service dependencies here if necessary
         # CircleCI maintains a library of pre-built images
         # documented at https://circleci.com/docs/2.0/circleci-images/
@@ -36,26 +36,14 @@ 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
-
-  # Download and run BrowserStack local
-  - &setup_browserstack
-      name : Download BrowserStack Local binary and start it.
-      command : |
-        # Download the browserstack binary file
-        wget "https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip"
-        # Unzip it
-        unzip BrowserStackLocal-linux-x64.zip
-        # Run the file with user's access key
-        ./BrowserStackLocal ${BROWSERSTACK_ACCESS_KEY} &
+      command: gulp e2e-test
 
   - &unit_test_steps
     - checkout
     - restore_cache: *restore_dep_cache
-    - run: npm install
+    - run: npm ci
     - save_cache: *save_dep_cache
     - run: *install
-    - run: *setup_browserstack
     - run: *run_unit_test
 
   - &endtoend_test_steps
@@ -64,7 +52,6 @@ aliases:
     - run: npm install
     - save_cache: *save_dep_cache
     - run: *install
-    - run: *setup_browserstack
     - run: *run_endtoend_test
 
 version: 2
@@ -72,7 +59,7 @@ jobs:
   build:
     <<: *environment
     steps: *unit_test_steps
-      
+
   e2etest:
     <<: *environment
     steps: *endtoend_test_steps
@@ -82,16 +69,9 @@ workflows:
   commit:
     jobs:
       - build
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - e2etest
+      - e2etest:
+          requires:
+            - build
 
 experimental:
-  pipelines: true
\ No newline at end of file
+  pipelines: true
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 00000000000..cfb29ebdfa9
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,11 @@
+ARG VARIANT="12"
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:${VARIANT}
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+RUN echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
+RUN apt update
+RUN apt install -y google-chrome-stable xvfb
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000000..0176b8317b3
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,27 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/javascript-node
+{
+	"name": "Ubuntu",
+
+	"build": {
+		"dockerfile": "Dockerfile",		
+		"args": { "VARIANT": "12" }
+	},
+
+	"postCreateCommand": "bash .devcontainer/postCreate.sh",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {},
+
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"nickdodd79.gulptasks"
+	],
+
+	// 9999 is web server, 9876 is karma
+	"forwardPorts": [9876, 9999],
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "node"
+}
diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh
new file mode 100644
index 00000000000..7e14a2d200d
--- /dev/null
+++ b/.devcontainer/postCreate.sh
@@ -0,0 +1,6 @@
+echo "Post Create Starting"
+
+nvm install
+nvm use
+npm install gulp-cli -g
+npm ci
diff --git a/.eslintrc.js b/.eslintrc.js
index c64ab379c52..06a5e81d9f5 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,50 +1,68 @@
 
-const allowedModules = require("./allowedModules");
+const allowedModules = require('./allowedModules.js');
 
 module.exports = {
-  "env": {
-    "browser": true,
-    "commonjs": true
+  env: {
+    browser: true,
+    commonjs: true
   },
-  "settings": {
-    "import/resolver": {
-      "node": {
-        "moduleDirectory": ["node_modules", "./"]
+  settings: {
+    'import/resolver': {
+      node: {
+        moduleDirectory: ['node_modules', './']
       }
     }
   },
-  "extends": "standard",
-  "plugins": [
-    "prebid",
-    "import"
+  extends: 'standard',
+  plugins: [
+    'prebid',
+    'import'
   ],
-  "globals": {
-    "$$PREBID_GLOBAL$$": false
+  globals: {
+    '$$PREBID_GLOBAL$$': false,
+    'BROWSERSTACK_USERNAME': false,
+    'BROWSERSTACK_KEY': false,
+    'FEATURES': 'readonly',
   },
-  "parserOptions": {
-    "sourceType": "module"
+  // use babel as parser for fancy syntax
+  parser: '@babel/eslint-parser',
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 2018,
   },
-  "rules": {
-    "comma-dangle": "off",
-    "semi": "off",
-    "space-before-function-paren": "off",
-    "import/extensions": ["error", "ignorePackages"],
+
+  rules: {
+    'comma-dangle': 'off',
+    semi: 'off',
+    'space-before-function-paren': 'off',
+    'import/extensions': ['error', 'ignorePackages'],
 
     // Exceptions below this line are temporary, so that eslint can be added into the CI process.
     // Violations of these styles should be fixed, and the exceptions removed over time.
     //
     // See Issue #1111.
-    "eqeqeq": "off",
-    "no-return-assign": "off",
-    "no-throw-literal": "off",
-    "no-undef": 2,
-    "no-useless-escape": "off",
-    "no-console": "error"
+    eqeqeq: 'off',
+    'no-return-assign': 'off',
+    'no-throw-literal': 'off',
+    'no-undef': 2,
+    'no-useless-escape': 'off',
+    'no-console': 'error',
   },
-  "overrides": Object.keys(allowedModules).map((key) => ({
-    "files": key + "/**/*.js",
-    "rules": {
-      "prebid/validate-imports": ["error", allowedModules[key]]
+  overrides: Object.keys(allowedModules).map((key) => ({
+    files: key + '/**/*.js',
+    rules: {
+      'prebid/validate-imports': ['error', allowedModules[key]],
+      'no-restricted-globals': [
+        'error',
+        {
+          name: 'require',
+          message: 'use import instead'
+        }
+      ]
     }
-  }))
+  })).concat([{
+    // code in other packages (such as plugins/eslint) is not "seen" by babel and its parser will complain.
+    files: 'plugins/*/**/*.js',
+    parser: 'esprima'
+  }])
 };
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9fdb04ba556..09ef5c445f2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,15 @@
 <!--
-Thank you for your pull request. Please make sure this PR is scoped to one change, and that any added or changed code includes tests with greater than 80% code coverage. See https://github.com/prebid/Prebid.js/blob/master/CONTRIBUTING.md#testing-prebidjs for documentation on testing Prebid.js.
+Thank you for your pull request! 
+
+Please title your pull request like this: 'Module: Change', eg 'Fraggles Bid Adapter: support fragglerock'
+
+Please make sure this PR is scoped to one change or you may be asked to resubmit. 
+ 
+Please make sure any added or changed code includes tests with greater than 80% code coverage. 
+
+See https://github.com/prebid/Prebid.js/blob/master/CONTRIBUTING.md#testing-prebidjs for documentation on testing Prebid.js.
+
+For any user facing change, submit a link to a PR on the docs repo at https://github.com/prebid/prebid.github.io/
 -->
 
 ## Type of change
@@ -11,14 +21,16 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
 - [ ] Refactoring (no functional changes, no api changes)
 - [ ] Build related changes
 - [ ] CI related changes
+
 - [ ] Does this change affect user-facing APIs or examples documented on http://prebid.org?
 - [ ] Other
 
 ## Description of change
 <!-- Describe the change proposed in this pull request -->
 
-<!-- For new bidder adapters, please provide the following -->
-- test parameters for validating bids
+<!-- For new bidder adapters, please provide the following
+- contact email of the adapter’s maintainer
+- test parameters for validating bids:
 ```
 {
   bidder: '<bidder name>',
@@ -28,14 +40,8 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
 }
 ```
 
-Be sure to test the integration with your adserver using the [Hello World](/integrationExamples/gpt/hello_world.html) sample page.
-
-- contact email of the adapter’s maintainer
-- [ ] official adapter submission
-
-For any changes that affect user-facing APIs or example code documented on http://prebid.org, please provide:
+Be sure to test the integration with your adserver using the [Hello World](/integrationExamples/gpt/hello_world.html) sample page. -->
 
-- A link to a PR on the docs repo at https://github.com/prebid/prebid.github.io/
 
 ## Other information
 <!-- References to related PR or issue #s, @mentions of the person or team responsible for reviewing changes, etc. -->
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 00000000000..2e8465003e4
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,4 @@
+paths:
+  - src
+  - modules
+  - libraries
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..5ace4600a1f
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 00000000000..a3246cffd6d
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,28 @@
+
+name-template: 'Prebid $RESOLVED_VERSION Release'
+tag-template: '$RESOLVED_VERSION'
+categories:
+  - title: '🚀 New Features'
+    label: 'feature'
+  - title: '🛠 Maintenance'
+    label: 'maintenance'    
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'      
+change-template: '- $TITLE (#$NUMBER)'
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: minor
+template: |
+  ## In This Release
+  $CHANGES
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 00000000000..9b7c39d53d0
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,73 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '22 11 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/issue_tracker.yml b/.github/workflows/issue_tracker.yml
new file mode 100644
index 00000000000..4a9502e38c1
--- /dev/null
+++ b/.github/workflows/issue_tracker.yml
@@ -0,0 +1,94 @@
+name: Issue tracking
+on:
+  issues:
+    types:
+      - opened
+permissions:
+  contents: read
+
+jobs:
+  track_issue:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c
+        with:
+          app_id: ${{ secrets.ISSUE_APP_ID }}
+          private_key: ${{ secrets.ISSUE_APP_PEM }}
+
+      - name: Get project data
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ORGANIZATION: prebid
+          DATE_FIELD: Created on
+          PROJECT_NUMBER: 2
+        run: |
+          gh api graphql -f query='
+            query($org: String!, $number: Int!) {
+              organization(login: $org){
+                projectNext(number: $number) {
+                  id
+                  fields(first:100) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
+
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'DATE_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "'"$DATE_FIELD"'") | .id' project_data.json) >> $GITHUB_ENV
+
+      - name: Add issue to project
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          gh api graphql -f query='
+            mutation($project:ID!, $issue:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
+                projectNextItem {
+                  id,
+                  content {
+                     ... on Issue {
+                        createdAt
+                     }
+                     ... on PullRequest {
+                        createdAt
+                     }                     
+                  }
+                }
+              }
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID > issue_data.json
+          
+          echo 'ITEM_ID='$(jq '.data.addProjectNextItem.projectNextItem.id' issue_data.json) >> $GITHUB_ENV
+          echo 'ITEM_CREATION_DATE='$(jq '.data.addProjectNextItem.projectNextItem.content.createdAt' issue_data.json) >> $GITHUB_ENV
+
+      - name: Set fields
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+        run: |
+          gh api graphql -f query='
+            mutation (
+              $project: ID!
+              $item: ID!
+              $date_field: ID!
+              $date_value: String!
+            ) {
+              set_creation_date: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $date_field
+                value: $date_value
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f date_field=$DATE_FIELD_ID -f date_value=$ITEM_CREATION_DATE --silent
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
new file mode 100644
index 00000000000..a13237f1290
--- /dev/null
+++ b/.github/workflows/release-drafter.yml
@@ -0,0 +1,24 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      contents: write  # for release-drafter/release-drafter to create a github release
+      pull-requests: write  # for release-drafter/release-drafter to add label to PR
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        with:
+         config-name: release-drafter.yml         
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index c0452b7b3d0..e5f000dd4d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ selenium*.log
 integrationExamples/gpt/gpt.html
 integrationExamples/gpt/*-test.html
 integrationExamples/implementations/
-src/adapters/analytics/libraries
+libraries/analyticsAdapter/examples/libraries
 
 # Coverage reports
 build/coverage/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 016f4055216..606d26cd25a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,9 +3,11 @@ Contributions are always welcome. To contribute, [fork](https://help.github.com/
 commit your changes, and [open a pull request](https://help.github.com/articles/using-pull-requests/) against the
 master branch.
 
-Pull requests must have 80% code coverage before beign considered for merge.
+Pull requests must have 80% code coverage before being considered for merge.
 Additional details about the process can be found [here](./PR_REVIEW.md).
 
+There are more details available if you'd like to contribute a [bid adapter](https://docs.prebid.org/dev-docs/bidder-adaptor.html) or [analytics adapter](https://docs.prebid.org/dev-docs/integrate-with-the-prebid-analytics-api.html).
+
 ## Issues
 [prebid.org](http://prebid.org/) contains documentation that may help answer questions you have about using Prebid.js.
 If you can't find the answer there, try searching for a similar issue on the [issues page](https://github.com/prebid/Prebid.js/issues).
@@ -57,7 +59,7 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a
 Prebid.js already has many tests. Read them to see how Prebid.js is tested, and for inspiration:
 
 - Look in `test/spec` and its subdirectories
-- Tests for bidder adaptors are located in `test/spec/modules`
+- Tests for bidder adapters are located in `test/spec/modules`
 
 A test module might have the following general structure:
 
diff --git a/PR_REVIEW.md b/PR_REVIEW.md
index dac50593d6e..45ca30a7a3d 100644
--- a/PR_REVIEW.md
+++ b/PR_REVIEW.md
@@ -1,20 +1,67 @@
 ## Summary
+
 We take PR review seriously. Please read https://medium.com/@mrjoelkemp/giving-better-code-reviews-16109e0fdd36#.xa8lc4i23 to understand how a PR review should be conducted. Be rational and strict in your review, make sure you understand exactly what the submitter's intent is. Anyone in the community can review a PR, but a Prebid Org member is also required. A Prebid Org member should take ownership of a PR and do the initial review.
 
 If the PR is for a standard bid adapter or a standard analytics adapter, just the one review from a core member is sufficient. The reviewer will check against [required conventions](http://prebid.org/dev-docs/bidder-adaptor.html#required-adapter-conventions) and may merge the PR after approving and confirming that the documentation PR against prebid.org is open and linked to the issue.
 
 For modules and core platform updates, the initial reviewer should request an additional team member to review as a sanity check. Merge should only happen when the PR has 2 `LGTM` from the core team and a documentation PR if required.
 
+### Running Tests and Verifying Integrations
+
+General gulp commands include separate commands for serving the codebase on a built in webserver, creating code coverage reports and allowing serving integration examples. The `review-start` gulp command combinese those into one command.
+
+- Run `gulp review-start`, adding the host parameter `gulp review-start --host=0.0.0.0` will bind to all IPs on the machine
+    - A page will open which provides a hub for common reviewer tools.
+    - If you need to manually access the tools:
+        - Navigate to build/coverage/lcov-report/index.html to view coverage
+        - Navigate to integrationExamples/gpt/hellow_world.html for basic integration testing
+        - The hello_world.html and other examples can be edited and used as needed to verify functionality
+
 ### General PR review Process
-- Checkout the branch (these instructions are available on the github PR page as well).
+
+- All required global and bidder-adapter rules defined in the [Module Rules](https://docs.prebid.org/dev-docs/module-rules.html) must be followed. Please review these rules often - we depend on reviewers to enforce them.
+- Checkout the branch (these instructions are available on the GitHub PR page as well).
 - Verify PR is a single change type. Example, refactor OR bugfix. If more than 1 type, ask submitter to break out requests.
-- Verify code under review has at least 80% unit test coverage. If legacy code has no unit test coverage, ask for unit tests to be included in the PR.
+- Verify code under review has at least 80% unit test coverage. If legacy code doesn't have enough unit test coverage, require that additional unit tests to be included in the PR.
 - Verify tests are green in Travis-ci + local build by running `gulp serve` | `gulp test`
 - Verify no code quality violations are present from linting (should be reported in terminal)
+- Make sure the code is not setting cookies or localstorage directly -- it must use the `StorageManager`.
 - Review for obvious errors or bad coding practice / use best judgement here.
 - If the change is a new feature / change to core prebid.js - review the change with a Tech Lead on the project and make sure they agree with the nature of change.
 - If the change results in needing updates to docs (such as public API change, module interface etc), add a label for "needs docs" and inform the submitter they must submit a docs PR to update the appropriate area of Prebid.org **before the PR can merge**. Help them with finding where the docs are located on prebid.org if needed. 
-  - Below are some examples of bidder specific updates that should require docs update (in their dev-docs/bidders/bidder.md file):
+- If all above is good, add a `LGTM` comment and, if the change is in PBS-core or is an important module like the prebidServerBidAdapter, request 1 additional core member to review.
+- Once there are 2 `LGTM` on the PR, merge to master
+- The [draft release](https://github.com/prebid/Prebid.js/releases) notes are managed by [release drafter](https://github.com/release-drafter/release-drafter). To get the PR added to the release notes do the steps below. A GitHub action will use that information to build the release notes.
+    - Adjust the PR Title to be appropriate for release notes
+    - Add a label for `feature`, `maintenance`, `fix`, `bugfix` or `bug` to categorize the PR
+    - Add a SemVer label of `major`, `minor` or `patch` to indicate the scope of change    
+
+### Reviewing a New or Updated Bid Adapter
+
+Documentation: https://docs.prebid.org/dev-docs/bidder-adaptor.html
+
+Follow steps above for general review process. In addition, please verify the following:
+- Verify the biddercode and aliases are valid:
+    - Lower case alphanumeric with the only special character allowed is underscore.
+    - The bidder code should be unique for the first 6 characters
+    - Reserved words that cannot be used as bidder names: all, context, data, general, prebid, and skadn
+- Verify that bidder has submitted valid bid params and that bids are being received.
+- Verify that bidder is not manipulating the prebid.js auction in any way or doing things that go against the principles of the project. If unsure check with the Tech Lead.
+- Verify that code re-use is being done properly and that changes introduced by a bidder don't impact other bidders.
+- If the adapter being submitted is an alias type, check with the bidder contact that is being aliased to make sure it's allowed.
+- All bidder parameter conventions must be followed:
+    - Video params must be read from AdUnit.mediaTypes.video when available; however bidder config can override the ad unit. 
+    - First party data must be read from [getConfig('ortb2');](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-fpd).
+    - Adapters that accept a floor parameter must also support the [floors module](https://docs.prebid.org/dev-docs/modules/floors.html) -- look for a call to the `getFloor()` function.
+    - Adapters cannot accept an schain parameter. Rather, they must look for the schain parameter at bidRequest.schain.
+    - The bidderRequest.refererInfo.referer must be checked in addition to any bidder-specific parameter.
+    - If they're getting the COPPA flag, it must come from config.getConfig('coppa');
+    - Page position must come from bidrequest.mediaTypes.banner.pos or bidrequest.mediaTypes.video.pos
+    - Global OpenRTB fields should come from [getConfig('ortb2');](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-fpd):
+        - bcat, battr, badv
+    - Impression-specific OpenRTB fields should come from bidrequest.ortb2imp
+        - instl
+- Below are some examples of bidder specific updates that should require docs update (in their dev-docs/bidders/BIDDER.md file):
     - If they support the GDPR consentManagement module and TCF1, add `gdpr_supported: true`
     - If they support the GDPR consentManagement module and TCF2, add `tcf2_supported: true`
     - If they support the US Privacy consentManagementUsp module, add `usp_supported: true`
@@ -23,35 +70,71 @@ For modules and core platform updates, the initial reviewer should request an ad
     - If they support COPPA, add `coppa_supported: true`
     - If they support SChain, add `schain_supported: true`
     - If their bidder doesn't work well with safeframed creatives, add `safeframes_ok: false`. This will alert publishers to not use safeframed creatives when creating the ad server entries for their bidder.
-    - If they're a member of Prebid.org, add `prebid_member: true`
-- If all above is good, add a `LGTM` comment and request 1 additional core member to review.
-- Once there is 2 `LGTM` on the PR, merge to master
-- Ask the submitter to add a PR for documentation if applicable.
-- Add a line into the [draft release](https://github.com/prebid/Prebid.js/releases) notes for this submission. If no draft release is available, create one using [this template]( https://gist.github.com/mkendall07/c3af6f4691bed8a46738b3675cb5a479)
-- Add the PR to the appropriate project board (I.E. 1.23.0 Release) for the week, [see](https://github.com/prebid/Prebid.js/projects)
-
-### New Adapter or updates to adapter process
-- Follow steps above for general review process. In addition, please verify the following:
-- Verify that bidder has submitted valid bid params and that bids are being received.
-- Verify that bidder is not manipulating the prebid.js auction in any way or doing things that go against the principles of the project. If unsure check with the Tech Lead.
-- Verify that the bidder is being as efficient as possible, ideally not loading an external library, however if they do load a library it should be cached.
-- Verify that code re-use is being done properly and that changes introduced by a bidder don't impact other bidders.
-- If the adapter being submitted is an alias type, check with the bidder contact that is being aliased to make sure it's allowed.
-- If the adapter is triggering any user syncs make sure they are using the user sync module in the Prebid.js core.
-- Requests to the bidder should support HTTPS
-- Responses from the bidder should be compressed (such as gzip, compress, deflate)
-- Bid responses may not use JSONP: All requests must be AJAX with JSON responses
-- All user-sync (aka pixel) activity must be registered via the provided functions
-- Adapters may not use the $$PREBID_GLOBAL$$ variable
-- All adapters must support the creation of multiple concurrent instances. This means, for example, that adapters cannot rely on mutable global variables.
-- Adapters may not globally override or default the standard ad server targeting values: hb_adid, hb_bidder, hb_pb, hb_deal, or hb_size, hb_source, hb_format.
+    - If they're setting a deal ID in some scenarios, add `bidder_supports_deals: true`
+    - If they have an IAB Global Vendor List ID, add `gvl_id: ID`. There's no default.
 - After a new adapter is approved, let the submitter know they may open a PR in the [headerbid-expert repository](https://github.com/prebid/headerbid-expert) to have their adapter recognized by the [Headerbid Expert extension](https://chrome.google.com/webstore/detail/headerbid-expert/cgfkddgbnfplidghapbbnngaogeldmop). The PR should be to the [bidder patterns file](https://github.com/prebid/headerbid-expert/blob/master/bidderPatterns.js), adding an entry with their adapter's name and the url the adapter uses to send and receive bid responses.
 
+### Reviewing a New or Updated Analytics Adapter
+
+Documentation: https://docs.prebid.org/dev-docs/integrate-with-the-prebid-analytics-api.html
+
+No additional steps above the general review process and making sure it conforms to the [Module Rules](https://docs.prebid.org/dev-docs/module-rules.html).
+
+Make sure there's a docs pull request
+
+### Reviewing a New or Updated User ID Sub-Module
+
+Documentation: https://docs.prebid.org/dev-docs/modules/userId.html#id-providers
+
+Follow steps above for general review process. In addition:
+- Try running the new user ID module with a basic config and confirm it hits the endpoint and stores the results.
+- the filename should be camel case ending with `IdSystem` (e.g. `myCompanyIdSystem.js`)
+- the `const MODULE_NAME` value should be camel case ending with `Id` (e.g. `myCompanyId` )
+- the response of the `decode` method should be an object with the key being ideally camel case similar to the module name and ending in `id` or `Id`, but in some cases this value is a shortened name and sometimes with the `id` part being all lowercase, provided there are no other uppercase letters. if there's no id or it's an invalid object, the response should be `undefined`. example "valid" values (although this is more style than a requirement)
+   - `mcid`
+   - `mcId`
+   - `myCompanyId`
+- make sure they've added references of their new module everywhere required:
+  - modules/.submodules.json
+  - modules/userId/eids.js
+  - modules/userId/eids.md
+  - modules/userId/userId.md
+- tests can go either within the userId_spec.js file or in their own _spec file if they wish
+- GVLID is recommended in the *IdSystem file if they operate in EU
+- make sure example configurations align to the actual code (some modules use the userId storage settings and allow pub configuration, while others handle reading/writing cookies on their own, so should not include the storage params in examples)
+- the 3 available methods (getId, extendId, decode) should be used as they were intended
+  - decode (required method) should not be making requests to retrieve a new ID, it should just be decoding a response
+  - extendId (optional method) should not be making requests to retrieve a new ID, it should just be adding additional data to the id object
+  - getId (required method) should be the only method that gets a new ID (from ajax calls or a cookie/local storage). this ensures that decode and extend do not unnecessarily delay the auction in places where it is not expected.
+- in the eids.js file, the source should be the actual domain of the provider, not a made up domain.
+- in the eids.js file, the key in the array should be the same value as the key in the decode function
+- make sure all supported config params align in the submodule js file and the docs / examples
+- make sure there's a docs pull request
+
+### Reviewing a New or Updated Real-Time-Data Sub-Module
+
+Documentation: https://docs.prebid.org/dev-docs/add-rtd-submodule.html
+
+Follow steps above for general review process. In addition:
+
+- The RTD Provider must include a `providerRtdProvider.md` file. This file must have example parameters and document a sense of what to expect: what should change in the bidrequest, or what targeting data should be added?
+- Try running the new sub-module and confirm the provided test parameters.
+- Confirm that the module
+  - is not loading external code. If it is, escalate to the #prebid-js Slack channel. 
+  - is reading `config` from the function signature rather than calling `getConfig`.
+  - is sending data to the bid request only as either First Party Data or in bidRequest.rtd.RTDPROVIDERCODE.
+  - is making HTTPS requests as early as possible, but not more often than needed.
+  - doesn't force bid adapters to load additional code.
+- Consider whether the kind of data the module is obtaining could have privacy implications. If so, make sure they're utilizing the `consent` data passed to them.
+- Make sure there's a docs pull request
+
+### Reviewing changes to the `debugging` module
+
+The debugging module cannot import from core in the same way that other modules can. See this [warning](https://github.com/prebid/Prebid.js/blob/master/modules/debugging/WARNING.md) for more details.
+
 ## Ticket Coordinator
 
-Each week, Prebid Org assigns one person to keep an eye on incoming issues and PRs. Every Monday morning a reminder is
-sent to the prebid-js slack channel with a link to the spreadsheet. If you're on rotation, please check that list each
-Monday to see if you're on-duty.
+Each week, Prebid Org assigns one person to keep an eye on incoming issues and PRs. Every Monday morning a reminder is sent to the prebid-js slack channel with a link to the spreadsheet. If you're on rotation, please check that list each Monday to see if you're on-duty.
 
 When on-duty:
 - Review issues and PRs at least once per weekday for new items. Encourage a 48 "SLA" on PRs/issues assigned. Aim for touchpoint once every 48/hours. 
diff --git a/README.md b/README.md
index 0dd5b25a50f..bbc0d79ab41 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
 [![Build Status](https://circleci.com/gh/prebid/Prebid.js.svg?style=svg)](https://circleci.com/gh/prebid/Prebid.js)
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Percentage of issues still open")
-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Average time to resolve an issue")
-[![Code Climate](https://codeclimate.com/github/prebid/Prebid.js/badges/gpa.svg)](https://codeclimate.com/github/prebid/Prebid.js)
 [![Coverage Status](https://coveralls.io/repos/github/prebid/Prebid.js/badge.svg)](https://coveralls.io/github/prebid/Prebid.js)
-[![devDependencies Status](https://david-dm.org/prebid/Prebid.js/dev-status.svg)](https://david-dm.org/prebid/Prebid.js?type=dev)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/prebid/Prebid.js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/prebid/Prebid.js/alerts/)
 
 # Prebid.js
@@ -14,6 +11,8 @@ This README is for developers who want to contribute to Prebid.js.
 Additional documentation can be found at [the Prebid homepage](http://prebid.org).
 Working examples can be found in [the developer docs](http://prebid.org/dev-docs/getting-started.html).
 
+Prebid.js is open source software that is offered for free as a convenience. While it is designed to help companies address legal requirements associated with header bidding, we cannot and do not warrant that your use of Prebid.js will satisfy legal requirements. You are solely responsible for ensuring that your use of Prebid.js complies with all applicable laws.  We strongly encourage you to obtain legal advice when using Prebid.js to ensure your implementation complies with all laws where you operate.
+
 **Table of Contents**
 
 - [Usage](#Usage)
@@ -58,6 +57,8 @@ module.exports = {
           loader: 'babel-loader',
           // presets and plugins for Prebid.js must be manually specified separate from your other babel rule.
           // this can be accomplished by requiring prebid's .babelrc.js file (requires Babel 7 and Node v8.9.0+)
+          // as of Prebid 6, babelrc.js only targets modern browsers. One can change the targets and build for
+          // older browsers if they prefer, but integration tests on ie11 were removed in Prebid.js 6.0
           options: require('prebid.js/.babelrc.js')
         }
       }
@@ -88,15 +89,15 @@ Or for Babel 6:
             }
 ```
 
-Then you can use Prebid.js as any other npm depedendency
+Then you can use Prebid.js as any other npm dependency
 
 ```javascript
-import prebid from 'prebid.js';
+import pbjs from 'prebid.js';
 import 'prebid.js/modules/rubiconBidAdapter'; // imported modules will register themselves automatically with prebid
 import 'prebid.js/modules/appnexusBidAdapter';
-prebid.processQueue();  // required to process existing pbjs.queue blocks and setup any further pbjs.queue execution
+pbjs.processQueue();  // required to process existing pbjs.queue blocks and setup any further pbjs.queue execution
 
-prebid.requestBids({
+pbjs.requestBids({
   ...
 })
 
@@ -110,11 +111,11 @@ prebid.requestBids({
 
     $ git clone https://github.com/prebid/Prebid.js.git
     $ cd Prebid.js
-    $ npm install
+    $ npm ci
 
 *Note:* You need to have `NodeJS` 12.16.1 or greater installed.
 
-*Note:* In the 1.24.0 release of Prebid.js we have transitioned to using gulp 4.0 from using gulp 3.9.1.  To comply with gulp's recommended setup for 4.0, you'll need to have `gulp-cli` installed globally prior to running the general `npm install`.  This shouldn't impact any other projects you may work on that use an earlier version of gulp in its setup.
+*Note:* In the 1.24.0 release of Prebid.js we have transitioned to using gulp 4.0 from using gulp 3.9.1.  To comply with gulp's recommended setup for 4.0, you'll need to have `gulp-cli` installed globally prior to running the general `npm ci`.  This shouldn't impact any other projects you may work on that use an earlier version of gulp in its setup.
 
 If you have a previous version of `gulp` installed globally, you'll need to remove it before installing `gulp-cli`.  You can check if this is installed by running `gulp -v` and seeing the version that's listed in the `CLI` field of the output.  If you have the `gulp` package installed globally, it's likely the same version that you'll see in the `Local` field.  If you already have `gulp-cli` installed, it should be a lower major version (it's at version `2.0.1` at the time of the transition).
 
@@ -127,20 +128,26 @@ Once setup, run the following command to globally install the `gulp-cli` package
 
 ## Build for Development
 
-To build the project on your local machine, run:
+To build the project on your local machine we recommend, running:
 
-    $ gulp serve
+    $ gulp serve-and-test --file <spec_file.js>
 
-This runs some code quality checks, starts a web server at `http://localhost:9999` serving from the project root and generates the following files:
+This will run testing but not linting. A web server will start at `http://localhost:9999` serving from the project root and generates the following files:
 
 + `./build/dev/prebid.js` - Full source code for dev and debug
 + `./build/dev/prebid.js.map` - Source map for dev and debug
-+ `./build/dist/prebid.js` - Minified production code
-+ `./prebid.js_<version>.zip` - Distributable zip archive
++ `./build/dev/prebid-core.js`
++ `./build/dev/prebid-core.js.map`
+
+
+Development may be a bit slower but if you prefer linting and additional watch files you can also still run just:
+
+    $ gulp serve 
+
 
 ### Build Optimization
 
-The standard build output contains all the available modules from within the `modules` folder.
+The standard build output contains all the available modules from within the `modules` folder.  Note, however that there are bid adapters which support multiple bidders through aliases, so if you don't see a file in modules for a bid adapter, you may need to grep the repository to find the name of the module you need to include.
 
 You might want to exclude some/most of them from the final bundle.  To make sure the build only includes the modules you want, you can specify the modules to be included with the `--modules` CLI argument.
 
@@ -150,7 +157,7 @@ Building with just these adapters will result in a smaller bundle which should a
 
 **Build standalone prebid.js**
 
-- Clone the repo, run `npm install`
+- Clone the repo, run `npm ci`
 - Then run the build:
 
         $ gulp build --modules=openxBidAdapter,rubiconBidAdapter,sovrnBidAdapter
@@ -184,8 +191,43 @@ Most likely your custom `prebid.js` will only change when there's:
 
 Having said that, you are probably safe to check your custom bundle into your project.  You can also generate it in your build process.
 
+**Build once, bundle multiple times**
+
+If you need to generate multiple distinct bundles from the same Prebid version, you can reuse a single build with:
+
+```
+gulp build
+gulp bundle --tag one --modules=one.json
+gulp bundle --tag two --modules=two.json
+```
+
+This generates slightly larger files, but has the advantage of being much faster to run (after the initial `gulp build`). It's also the method used by [the Prebid.org download page](https://docs.prebid.org/download.html).  
+
 <a name="Run"></a>
 
+### Excluding particular features from the build
+
+Since version 7.2.0, you may instruct the build to exclude code for some features - for example, if you don't need support for native ads:
+
+```
+gulp build --disable NATIVE --modules=openxBidAdapter,rubiconBidAdapter,sovrnBidAdapter # substitute your module list
+```
+
+Or, if you are consuming Prebid through npm, with the `disableFeatures` option in your Prebid rule:
+
+```javascript
+  {
+    test: /.js$/,
+    include: new RegExp(`\\${path.sep}prebid\\.js`),
+    use: {
+      loader: 'babel-loader',
+      options: require('prebid.js/babelConfig.js')({disableFeatures: ['NATIVE']})
+    }
+  }
+```
+
+**Note**: this is still a work in progress - at the moment, `NATIVE` is the only feature that can be disabled this way, resulting in a minimal decrease in size (but you can expect that to improve over time).
+
 ## Test locally
 
 To lint the code:
@@ -200,6 +242,11 @@ To run the unit tests:
 gulp test
 ```
 
+To run the unit tests for a particular file (example for pubmaticBidAdapter_spec.js):
+```bash
+gulp test --file "test/spec/modules/pubmaticBidAdapter_spec.js"
+```
+
 To generate and view the code coverage reports:
 
 ```bash
@@ -258,7 +305,7 @@ directory you will have sourcemaps available in your browser's developer tools.
 
 To run the example file, go to:
 
-+ `http://localhost:9999/integrationExamples/gpt/pbjs_example_gpt.html`
++ `http://localhost:9999/integrationExamples/gpt/hello_world.html`
 
 As you make code changes, the bundles will be rebuilt and the page reloaded automatically.
 
@@ -266,7 +313,7 @@ As you make code changes, the bundles will be rebuilt and the page reloaded auto
 
 ## Contribute
 
-Many SSPs, bidders, and publishers have contributed to this project. [60+ Bidders](https://github.com/prebid/Prebid.js/tree/master/src/adapters) are supported by Prebid.js.
+Many SSPs, bidders, and publishers have contributed to this project. [Hundreds of bidders](https://github.com/prebid/Prebid.js/tree/master/modules) are supported by Prebid.js.
 
 For guidelines, see [Contributing](./CONTRIBUTING.md).
 
@@ -274,9 +321,7 @@ Our PR review process can be found [here](https://github.com/prebid/Prebid.js/tr
 
 ### Add a Bidder Adapter
 
-To add a bidder adapter module, see the instructions in [How to add a bidder adaptor](http://prebid.org/dev-docs/bidder-adaptor.html).
-
-Please **do NOT load Prebid.js inside your adapter**. If you do this, we will reject or remove your adapter as appropriate.
+To add a bidder adapter module, see the instructions in [How to add a bidder adapter](https://docs.prebid.org/dev-docs/bidder-adaptor.html).
 
 ### Code Quality
 
@@ -310,7 +355,7 @@ For instructions on writing tests for Prebid.js, see [Testing Prebid.js](http://
 
 ### Supported Browsers
 
-Prebid.js is supported on IE11 and modern browsers.
+Prebid.js is supported on IE11 and modern browsers until 5.x. 6.x+ transpiles to target >0.25%; not Opera Mini; not IE11. 
 
 ### Governance
 Review our governance model [here](https://github.com/prebid/Prebid.js/tree/master/governance.md).
diff --git a/RELEASE_SCHEDULE.md b/RELEASE_SCHEDULE.md
index 7b2c6244bd7..45f4e6c7dc5 100644
--- a/RELEASE_SCHEDULE.md
+++ b/RELEASE_SCHEDULE.md
@@ -1,6 +1,9 @@
 **Table of Contents**
 - [Release Schedule](#release-schedule)
 - [Release Process](#release-process)
+  - [1. Make sure that all PRs have been named and labeled properly per the PR Process](#1-make-sure-that-all-prs-have-been-named-and-labeled-properly-per-the-pr-process)
+  - [2. Make sure all browserstack tests are passing](#2-make-sure-all-browserstack-tests-are-passing)
+  - [3. Start the release](#3-start-the-release)
 - [Beta Releases](#beta-releases)
 - [FAQs](#faqs)
 
@@ -9,24 +12,28 @@
 We aim to push a new release of Prebid.js every week on Tuesday.
 
 While the releases will be available immediately for those using direct Git access,
-it will be about a week before the Prebid Org [Download Page](http://prebid.org/download.html) will be updated.  
+it will be about a week before the Prebid Org [Download Page](https://docs.prebid.org/download.html) will be updated.
 
 You can determine what is in a given build using the [releases page](https://github.com/prebid/Prebid.js/releases)
 
-Announcements regarding releases will be made to the #headerbidding-dev channel in subredditadops.slack.com.
+Announcements regarding releases will be made to the #prebid-js channel in prebid.slack.com.
 
 ## Release Process
 
-_Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for your repo, all of the following git commands will have to be modified to reference the proper remote (e.g. `upstream`)_
+### 1. Make sure that all PRs have been named and labeled properly per the [PR Process](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md#general-pr-review-process)
+   * Do this by checking the latest draft release from the [releases page](https://github.com/prebid/Prebid.js/releases) and make sure nothing appears in the first section called "In This Release". If they do, please open the PRs and add the appropriate labels.
+   * Do a quick check that all the titles/descriptions look ok, and if not, adjust the PR title.
 
-1. Make Sure all browserstack tests are passing. On PR merge to master CircleCI will run unit tests on browserstack. Checking the last CircleCI build [here](https://circleci.com/gh/prebid/Prebid.js) for master branch will show you detailed results. 
-  
-   In case of failure do following, 
+### 2. Make sure all browserstack tests are passing
+
+   On PR merge to master, CircleCI will run unit tests on browserstack. Checking the last CircleCI build [here](https://circleci.com/gh/prebid/Prebid.js) for master branch will show you detailed results.**
+
+   In case of failure do following,
      - Try to fix the failing tests.
      - If you are not able to fix tests in time. Skip the test, create issue and tag contributor.
 
-   #### How to run tests in browserstack
-   
+   **How to run tests in browserstack**
+
    _Note: the following browserstack information is only relevant for debugging purposes, if you will not be debugging then it can be skipped._
 
    Set the environment variables. You may want to add these to your `~/.bashrc` for convenience.
@@ -35,81 +42,18 @@ _Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for
    export BROWSERSTACK_USERNAME="my browserstack username"
    export BROWSERSTACK_ACCESS_KEY="my browserstack access key"
    ```
-   
-   ```
-   gulp test --browserstack >> prebid_test.log
-   
-   vim prebid_test.log // Will show the test results
-   ```
-
-
-2. Prepare Prebid Code
-
-   Update the package.json version to become the current release. Then commit your changes.
-
-   ```
-   git commit -m "Prebid 1.x.x Release"
-   git push
-   ```
-
-3. Verify Release
-
-   Make sure your there are no more merges to master branch. Prebid code is clean and up to date.
-
-4. Create a GitHub release
 
-   Edit the most recent [release notes](https://github.com/prebid/Prebid.js/releases) draft and make sure the correct tag is in the dropdown. Click `Publish`. GitHub will create release tag. 
-   
-   Pull these changes locally by running command 
    ```
-   git pull
-   git fetch --tags
-   ``` 
-   
-   and verify the tag.
-
-5. Update coveralls _(skip for legacy)_
-
-   We use https://coveralls.io/ to show parts of code covered by unit tests.
+   gulp test --browserstack >> prebid_test.log
 
-   Set the environment variables. You may want to add these to your `~/.bashrc` for convenience.
-   ```
-   export COVERALLS_SERVICE_NAME="travis-ci"
-   export COVERALLS_REPO_TOKEN="talk to Matt Kendall"
+   vim prebid_test.log // Will show the test results
    ```
 
-   Run `gulp coveralls` to update code coverage history.
-
-6. Distribute the code 
-
-   _Note: do not go to step 7 until step 6 has been verified completed._
 
-   Reach out to any of the Appnexus folks to trigger the jenkins job.
-
-   // TODO 
-   Jenkins job is moving files to appnexus cdn, pushing prebid.js to npm, purging cache and sending notification to slack.
-   Move all the files from Appnexus CDN to jsDelivr and create bash script to do above tasks.
-
-7. Post Release Version
-   
-   Update the version
-   Manually edit Prebid's package.json to become "1.x.x-pre" (using the values for the next release). Then commit your changes.
-   ```
-   git commit -m "Increment pre version"
-   git push
-   ```
-   
-8. Create new release draft
-
-   Go to [github releases](https://github.com/prebid/Prebid.js/releases) and add a new draft for the next version of Prebid.js with the following template:
-```
-## 🚀New Features
- 
-## 🛠Maintenance
- 
-## 🐛Bug Fixes
-```
+### 3. Start the release
 
+Follow the instructions at https://github.com/prebid/prebidjs-releaser. Note that you will need to be a member of the [https://github.com/orgs/prebid/teams/prebidjs-release](prebidjs-release) GitHub team.
+    
 ## Beta Releases
 
 Prebid.js features may be released as Beta or as Generally Available (GA).
@@ -129,11 +73,8 @@ Characteristics of a `GA` release:
 ## FAQs
 
 **1. Is there flexibility in the schedule?**
-
-If a major bug is found in the current release, a maintenance patch will be done as soon as possible.
-
-It is unlikely that we will put out a maintenance patch at the request of a given bid adapter or module owner.
+* If a major bug is found in the current release, a maintenance patch will be done as soon as possible.
+* It is unlikely that we will put out a maintenance patch at the request of a given bid adapter or module owner.
 
 **2. What Pull Requests make it into a release?**
-
-Every PR that's merged into master will be part of a release. Here are the [PR review guidelines](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md).
+* Every PR that's merged into master will be part of a release. Here are the [PR review guidelines](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md).
diff --git a/allowedModules.js b/allowedModules.js
index 2a521f781f9..3e6e3039fa2 100644
--- a/allowedModules.js
+++ b/allowedModules.js
@@ -1,18 +1,11 @@
 
 const sharedWhiteList = [
-  'core-js-pure/features/array/find', // no ie11
-  'core-js-pure/features/array/includes', // no ie11
-  'core-js-pure/features/set', // ie11 supports Set but not Set#values
-  'core-js-pure/features/string/includes', // no ie11
-  'core-js-pure/features/number/is-integer', // no ie11,
-  'core-js-pure/features/array/from' // no ie11
 ];
 
 module.exports = {
   'modules': [
     ...sharedWhiteList,
     'criteo-direct-rsa-validate',
-    'jsencrypt',
     'crypto-js',
     'live-connect' // Maintained by LiveIntent : https://github.com/liveintent-berlin/live-connect/
   ],
@@ -21,7 +14,9 @@ module.exports = {
     'fun-hooks/no-eval',
     'just-clone',
     'dlv',
-    'dset',
-    'deep-equal'
+    'dset'
+  ],
+  'libraries': [
+    ...sharedWhiteList // empty for now, but keep it to enable linting
   ]
 };
diff --git a/babelConfig.js b/babelConfig.js
new file mode 100644
index 00000000000..a88491c0cae
--- /dev/null
+++ b/babelConfig.js
@@ -0,0 +1,36 @@
+
+let path = require('path');
+
+function useLocal(module) {
+  return require.resolve(module, {
+    paths: [
+      __dirname
+    ]
+  })
+}
+
+module.exports = function (options = {}) {
+  return {
+    'presets': [
+      [
+        useLocal('@babel/preset-env'),
+        {
+          'useBuiltIns': 'entry',
+          'corejs': '3.13.0',
+          // a lot of tests use sinon.stub & others that stopped working on ES6 modules with webpack 5
+          'modules': options.test ? 'commonjs' : 'auto',
+        }
+      ]
+    ],
+    'plugins': (() => {
+      const plugins = [
+        [path.resolve(__dirname, './plugins/pbjsGlobals.js'), options],
+        [useLocal('@babel/plugin-transform-runtime')],
+      ];
+      if (options.codeCoverage) {
+        plugins.push([useLocal('babel-plugin-istanbul')])
+      }
+      return plugins;
+    })(),
+  }
+}
diff --git a/browsers.json b/browsers.json
index 91e0548d78a..bd6bd5772d6 100644
--- a/browsers.json
+++ b/browsers.json
@@ -1,74 +1,51 @@
 {
-  "bs_edge_17_windows_10": {
+  "bs_edge_latest_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "edge",
-    "browser_version": "17.0",
+    "browser_version": "latest",
     "device": null,
     "os": "Windows"
   },
-  "bs_edge_18_windows_10": {
-    "base": "BrowserStack",
-    "os_version": "10",
-    "browser": "edge",
-    "browser_version": "18.0",
-    "device": null,
-    "os": "Windows"
-  },
-  "bs_ie_11_windows_10": {
-    "base": "BrowserStack",
-    "os_version": "10",
-    "browser": "ie",
-    "browser_version": "11.0",
-    "device": null,
-    "os": "Windows"
-  },
-  "bs_chrome_80_windows_10": {
+  "bs_chrome_latest_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "chrome",
-    "browser_version": "80.0",
+    "browser_version": "latest",
     "device": null,
     "os": "Windows"
   },
-  "bs_chrome_79_windows_10": {
+  "bs_chrome_87_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "chrome",
-    "browser_version": "79.0",
+    "browser_version": "87.0",
     "device": null,
     "os": "Windows"
   },
-  "bs_firefox_73_windows_10": {
+  "bs_firefox_latest_windows_10": {
     "base": "BrowserStack",
     "os_version": "10",
     "browser": "firefox",
-    "browser_version": "73.0",
+    "browser_version": "latest",
     "device": null,
     "os": "Windows"
   },
-  "bs_firefox_72_windows_10": {
+  "bs_safari_latest_mac_bigsur": {
     "base": "BrowserStack",
-    "os_version": "10",
-    "browser": "firefox",
-    "browser_version": "72.0",
-    "device": null,
-    "os": "Windows"
-  },
-  "bs_safari_11_mac_catalina": {
-    "base": "BrowserStack",
-    "os_version": "Catalina",
+    "os_version": "Big Sur",
     "browser": "safari",
-    "browser_version": "13.0",
+    "browser_version": "latest",
     "device": null,
     "os": "OS X"
   },
-  "bs_safari_12_mac_mojave": {
+  "bs_safari_15_catalina": {
     "base": "BrowserStack",
-    "os_version": "Mojave",
+    "os_version": "Catalina",
     "browser": "safari",
-    "browser_version": "12.0",
+    "browser_version": "13.1",
     "device": null,
     "os": "OS X"
   }
+  
 }
diff --git a/bundle-template.txt b/bundle-template.txt
new file mode 100644
index 00000000000..2f58aedfe81
--- /dev/null
+++ b/bundle-template.txt
@@ -0,0 +1,16 @@
+/* <%= prebid.name %> v<%= prebid.version %>
+Updated: <%= (new Date()).toISOString().substring(0, 10) %>
+Modules: <%= modules %> */
+
+if (!window.<%= prebid.globalVarName %> || !window.<%= prebid.globalVarName %>.libLoaded) {
+ $$PREBID_SOURCE$$
+ <% if(enable) {%>
+   <%= prebid.globalVarName %>.processQueue();
+ <% } %>
+} else {
+ try {
+  if(window.<%= prebid.globalVarName %>.getConfig('debug')) {
+    console.warn('Attempted to load a copy of Prebid.js that clashes with the existing \'<%= prebid.globalVarName %>\' instance. Load aborted.');
+  }
+ } catch (e) {}
+}
diff --git a/features.json b/features.json
new file mode 100644
index 00000000000..c0f7e4d75a9
--- /dev/null
+++ b/features.json
@@ -0,0 +1,3 @@
+[
+  "NATIVE"
+]
diff --git a/governance.md b/governance.md
index 3d00f067194..b1446a22373 100644
--- a/governance.md
+++ b/governance.md
@@ -9,15 +9,9 @@ This document describes the governance model for the Prebid project. The Prebid
 
 ### Roles and Responsibilities:
 - **User:** Any individual who consumes / uses the Prebid.js library.
-- **Contributor:** Any individual who contributes code that is subsequently merged to the project. Contributed code is governed by the Prebid.js [license](https://github.com/prebid/Prebid.js/blob/master/LICENSE). Contributors are required to sign a CLA before any code can be committed (CLA pending).
-- **Core Team Member:** An individual contributor who has been appointed by the Tech Lead on the project to maintain it and further it’s stated goals.
-- **Tech Lead:** The Tech Lead is responsible for overall technical direction of the project. The Tech Lead will work closely with Core Team members to facilitate development and further the project goals.
+- **Contributor:** Any individual who contributes code that is subsequently merged to the project. Contributed code is governed by the Prebid.js [license](https://github.com/prebid/Prebid.js/blob/master/LICENSE).
+- **Core & Review Team Member:** An individual contributor who has been appointed by the Tech Lead on the project to maintain it and further it’s stated goals.
+- **Identity Team Member:** An individual contributor who has been appointed by the Identity PMC to review and maintain the identity modules and further the PMC stated goals.
+- **Tech Lead:** The Tech Lead is responsible for overall technical direction of the project & serves as the PMC chair. The Tech Lead will work closely with Core Team members to facilitate development and further the project goals.
 
-### Current Prebid.js Core Team
-- @mkendall07 (Tech Lead)
-- @jsnellbaker
-- @matthewlane
-- @jaiminpanchal27
-- @snapwich
-- @harpere
-- @mike-chowla
+The Core team is currently visible at https://github.com/orgs/prebid/teams/core/members to project members. 
diff --git a/gulpHelpers.js b/gulpHelpers.js
index bcaf3736f15..1eec08b7a3e 100644
--- a/gulpHelpers.js
+++ b/gulpHelpers.js
@@ -6,7 +6,7 @@ const MANIFEST = 'package.json';
 const through = require('through2');
 const _ = require('lodash');
 const gutil = require('gulp-util');
-const submodules = require('./modules/.submodules.json');
+const submodules = require('./modules/.submodules.json').parentModules;
 
 const MODULE_PATH = './modules';
 const BUILD_PATH = './build/dist';
@@ -34,7 +34,6 @@ module.exports = {
   },
 
   jsonifyHTML: function (str) {
-    console.log(arguments);
     return str.replace(/\n/g, '')
       .replace(/<\//g, '<\\/')
       .replace(/\/>/g, '\\/>');
@@ -106,16 +105,20 @@ module.exports = {
     }, internalModules));
   }),
 
+  getBuiltPath(dev, assetPath) {
+    return path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, assetPath)
+  },
+
   getBuiltModules: function(dev, externalModules) {
     var modules = this.getModuleNames(externalModules);
     if (Array.isArray(externalModules)) {
       modules = _.intersection(modules, externalModules);
     }
-    return modules.map(name => path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, name + '.js'));
+    return modules.map(name => this.getBuiltPath(dev, name + '.js'));
   },
 
   getBuiltPrebidCoreFile: function(dev) {
-    return path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, 'prebid-core' + '.js');
+    return this.getBuiltPath(dev, 'prebid-core.js')
   },
 
   getModulePaths: function(externalModules) {
@@ -170,5 +173,11 @@ module.exports = {
     }
 
     return options;
-  }
+  },
+  getDisabledFeatures() {
+    return (argv.disable || '')
+      .split(',')
+      .map((s) => s.trim())
+      .filter((s) => s);
+  },
 };
diff --git a/gulpfile.js b/gulpfile.js
index 64152baa7ba..09de874e389 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -8,16 +8,11 @@ var gutil = require('gulp-util');
 var connect = require('gulp-connect');
 var webpack = require('webpack');
 var webpackStream = require('webpack-stream');
-var uglify = require('gulp-uglify');
 var gulpClean = require('gulp-clean');
-var KarmaServer = require('karma').Server;
-var karmaConfMaker = require('./karma.conf.maker');
 var opens = require('opn');
-var webpackConfig = require('./webpack.conf');
-var helpers = require('./gulpHelpers');
+var webpackConfig = require('./webpack.conf.js');
+var helpers = require('./gulpHelpers.js');
 var concat = require('gulp-concat');
-var header = require('gulp-header');
-var footer = require('gulp-footer');
 var replace = require('gulp-replace');
 var shell = require('gulp-shell');
 var eslint = require('gulp-eslint');
@@ -28,14 +23,15 @@ var fs = require('fs');
 var jsEscape = require('gulp-js-escape');
 const path = require('path');
 const execa = require('execa');
+const {minify} = require('terser');
+const Vinyl = require('vinyl');
 
 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 { spawn } = require('child_process');
+const INTEG_SERVER_HOST = argv.host ? argv.host : 'localhost';
+const INTEG_SERVER_PORT = 4444;
+const { spawn, fork } = require('child_process');
+const TerserPlugin = require('terser-webpack-plugin');
 
 // these modules must be explicitly listed in --modules to be included in the build, won't be part of "all" modules
 var explicitModules = [
@@ -71,7 +67,15 @@ function lint(done) {
   const isFixed = function (file) {
     return file.eslint != null && file.eslint.fixed;
   }
-  return gulp.src(['src/**/*.js', 'modules/**/*.js', 'test/**/*.js'], { base: './' })
+  return gulp.src([
+    'src/**/*.js',
+    'modules/**/*.js',
+    'libraries/**/*.js',
+    'test/**/*.js',
+    'plugins/**/*.js',
+    '!plugins/**/node_modules/**',
+    './*.js'
+  ], { base: './' })
     .pipe(gulpif(argv.nolintfix, eslint(), eslint({ fix: true })))
     .pipe(eslint.format('stylish'))
     .pipe(eslint.failAfterError())
@@ -86,7 +90,8 @@ function viewCoverage(done) {
   connect.server({
     port: coveragePort,
     root: 'build/coverage/lcov-report',
-    livereload: false
+    livereload: false,
+    debug: true
   });
   opens('http://' + mylocalhost + ':' + coveragePort);
   done();
@@ -94,34 +99,34 @@ function viewCoverage(done) {
 
 viewCoverage.displayName = 'view-coverage';
 
-// Watch Task with Live Reload
-function watch(done) {
-  var mainWatcher = gulp.watch([
-    'src/**/*.js',
-    'modules/**/*.js',
-    'test/spec/**/*.js',
-    '!test/spec/loaders/**/*.js'
-  ]);
-  var loaderWatcher = gulp.watch([
-    'loaders/**/*.js',
-    'test/spec/loaders/**/*.js'
-  ]);
+// View the reviewer tools page
+function viewReview(done) {
+  var mylocalhost = (argv.host) ? argv.host : 'localhost';
+  var reviewUrl = 'http://' + mylocalhost + ':' + port + '/integrationExamples/reviewerTools/index.html'; // reuse the main port from 9999
 
-  connect.server({
-    https: argv.https,
-    port: port,
-    root: './',
-    livereload: true
-  });
+  // console.log(`stdout: opening` + reviewUrl);
 
-  mainWatcher.on('all', gulp.series(clean, gulp.parallel(lint, 'build-bundle-dev', test)));
-  loaderWatcher.on('all', gulp.series(lint));
+  opens(reviewUrl);
   done();
 };
 
+viewReview.displayName = 'view-review';
+
 function makeDevpackPkg() {
   var cloned = _.cloneDeep(webpackConfig);
-  cloned.devtool = 'source-map';
+  Object.assign(cloned, {
+    devtool: 'source-map',
+    mode: 'development'
+  })
+
+  const babelConfig = require('./babelConfig.js')({disableFeatures: helpers.getDisabledFeatures(), prebidDistUrlBase: argv.distUrlBase || '/build/dev/'});
+
+  // update babel config to set local dist url
+  cloned.module.rules
+    .flatMap((rule) => rule.use)
+    .filter((use) => use.loader === 'babel-loader')
+    .forEach((use) => use.options = Object.assign({}, use.options, babelConfig));
+
   var externalModules = helpers.getArgModules();
 
   const analyticsSources = helpers.getAnalyticsSources();
@@ -134,30 +139,40 @@ function makeDevpackPkg() {
     .pipe(connect.reload());
 }
 
-function makeWebpackPkg() {
-  var cloned = _.cloneDeep(webpackConfig);
-  delete cloned.devtool;
+function makeWebpackPkg(extraConfig = {}) {
+  var cloned = _.merge(_.cloneDeep(webpackConfig), extraConfig);
+  if (!argv.sourceMaps) {
+    delete cloned.devtool;
+  }
 
-  var externalModules = helpers.getArgModules();
+  return function buildBundle() {
+    var externalModules = helpers.getArgModules();
 
-  const analyticsSources = helpers.getAnalyticsSources();
-  const moduleSources = helpers.getModulePaths(externalModules);
+    const analyticsSources = helpers.getAnalyticsSources();
+    const moduleSources = helpers.getModulePaths(externalModules);
 
-  return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js'))
-    .pipe(helpers.nameModules(externalModules))
-    .pipe(webpackStream(cloned, webpack))
-    .pipe(uglify())
-    .pipe(gulpif(file => file.basename === 'prebid-core.js', header(banner, { prebid: prebid })))
-    .pipe(gulp.dest('build/dist'));
+    return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js'))
+      .pipe(helpers.nameModules(externalModules))
+      .pipe(webpackStream(cloned, webpack))
+      .pipe(gulp.dest('build/dist'));
+  }
+}
+
+function getModulesListToAddInBanner(modules) {
+  if (!modules || modules.length === helpers.getModuleNames().length) {
+    return 'All available modules for this version.'
+  } else {
+    return modules.join(', ')
+  }
 }
 
 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);
       })
@@ -168,9 +183,51 @@ function nodeBundle(modules) {
   });
 }
 
+function wrapWithHeaderAndFooter(dev, modules) {
+  // NOTE: gulp-header, gulp-footer & gulp-wrap do not play nice with source maps.
+  // gulp-concat does; for that reason we are prepending and appending the source stream with "fake" header & footer files.
+  function memoryVinyl(name, contents) {
+    return new Vinyl({
+      cwd: '',
+      base: 'generated',
+      path: name,
+      contents: Buffer.from(contents, 'utf-8')
+    });
+  }
+  return function wrap(stream) {
+    const wrapped = through.obj();
+    const placeholder = '$$PREBID_SOURCE$$';
+    const tpl = _.template(fs.readFileSync('./bundle-template.txt'))({
+      prebid,
+      modules: getModulesListToAddInBanner(modules),
+      enable: !argv.manualEnable
+    });
+    (dev ? Promise.resolve(tpl) : minify(tpl, {format: {comments: true}}).then((res) => res.code))
+      .then((tpl) => {
+        // wrap source placeholder in an IIFE to make it an expression (so that it works with minify output)
+        const parts = tpl.replace(placeholder, `(function(){$$${placeholder}$$})()`).split(placeholder);
+        if (parts.length !== 2) {
+          throw new Error(`Cannot parse bundle template; it must contain exactly one instance of '${placeholder}'`);
+        }
+        const [header, footer] = parts;
+        wrapped.push(memoryVinyl('prebid-header.js', header));
+        stream.pipe(wrapped, {end: false});
+        stream.on('end', () => {
+          wrapped.push(memoryVinyl('prebid-footer.js', footer));
+          wrapped.push(null);
+        });
+      })
+      .catch((err) => {
+        wrapped.destroy(err);
+      });
+    return wrapped;
+  }
+}
+
 function bundle(dev, moduleArr) {
   var modules = moduleArr || helpers.getArgModules();
   var allModules = helpers.getModuleNames(modules);
+  const sm = dev || argv.sourceMaps;
 
   if (modules.length === 0) {
     modules = allModules.filter(module => explicitModules.indexOf(module) === -1);
@@ -183,8 +240,15 @@ function bundle(dev, moduleArr) {
       });
     }
   }
+  const coreFile = helpers.getBuiltPrebidCoreFile(dev);
+  const moduleFiles = helpers.getBuiltModules(dev, modules);
+  const depGraph = require(helpers.getBuiltPath(dev, 'dependencies.json'));
+  const dependencies = new Set();
+  [coreFile].concat(moduleFiles).map(name => path.basename(name)).forEach((file) => {
+    (depGraph[file] || []).forEach((dep) => dependencies.add(helpers.getBuiltPath(dev, dep)));
+  });
 
-  var entries = [helpers.getBuiltPrebidCoreFile(dev)].concat(helpers.getBuiltModules(dev, modules));
+  const entries = [coreFile].concat(Array.from(dependencies), moduleFiles);
 
   var outputFileName = argv.bundleName ? argv.bundleName : 'prebid.js';
 
@@ -197,16 +261,11 @@ function bundle(dev, moduleArr) {
   gutil.log('Appending ' + prebid.globalVarName + '.processQueue();');
   gutil.log('Generating bundle:', outputFileName);
 
-  return gulp.src(
-    entries
-  )
-    .pipe(gulpif(dev, sourcemaps.init({ loadMaps: true })))
+  const wrap = wrapWithHeaderAndFooter(dev, modules);
+  return wrap(gulp.src(entries))
+    .pipe(gulpif(sm, sourcemaps.init({ loadMaps: true })))
     .pipe(concat(outputFileName))
-    .pipe(gulpif(!argv.manualEnable, footer('\n<%= global %>.processQueue();', {
-      global: prebid.globalVarName
-    }
-    )))
-    .pipe(gulpif(dev, sourcemaps.write('.')));
+    .pipe(gulpif(sm, sourcemaps.write('.')));
 }
 
 // Run the unit tests.
@@ -219,79 +278,78 @@ function bundle(dev, moduleArr) {
 // If --browsers is given, browsers can be chosen explicitly. e.g. --browsers=chrome,firefox,ie9
 // If --notest is given, it will immediately skip the test task (useful for developing changes with `gulp serve --notest`)
 
-function test(done) {
-  if (argv.notest) {
-    done();
-  } else if (argv.e2e) {
-    let wdioCmd = path.join(__dirname, 'node_modules/.bin/wdio');
-    let wdioConf = path.join(__dirname, 'wdio.conf.js');
-    let wdioOpts;
-
-    if (argv.file) {
-      wdioOpts = [
-        wdioConf,
-        `--spec`,
-        `${argv.file}`
-      ]
+function testTaskMaker(options = {}) {
+  ['watch', 'e2e', 'file', 'browserstack', 'notest'].forEach(opt => {
+    options[opt] = options.hasOwnProperty(opt) ? options[opt] : argv[opt];
+  })
+
+  options.disableFeatures = options.disableFeatures || helpers.getDisabledFeatures();
+
+  return function test(done) {
+    if (options.notest) {
+      done();
+    } else if (options.e2e) {
+      const integ = startIntegServer();
+      startLocalServer();
+      runWebdriver(options)
+        .then(stdout => {
+          // kill fake server
+          integ.kill('SIGINT');
+          done();
+          process.exit(0);
+        })
+        .catch(err => {
+          // kill fake server
+          integ.kill('SIGINT');
+          done(new Error(`Tests failed with error: ${err}`));
+          process.exit(1);
+        });
     } else {
-      wdioOpts = [
-        wdioConf
-      ];
+      runKarma(options, done)
     }
+  }
+}
 
-    // 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}`);
-    });
+const test = testTaskMaker();
 
-    execa(wdioCmd, wdioOpts, { stdio: 'inherit' })
-      .then(stdout => {
-        // kill fake server
-        fakeServer.kill('SIGINT');
-        done();
-        process.exit(0);
-      })
-      .catch(err => {
-        // kill fake server
-        fakeServer.kill('SIGINT');
-        done(new Error(`Tests failed with error: ${err}`));
-        process.exit(1);
-      });
-  } else {
-    var karmaConf = karmaConfMaker(false, argv.browserstack, argv.watch, argv.file);
+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;
 
-    var browserOverride = helpers.parseBrowserArgs(argv).map(helpers.toCapitalCase);
-    if (browserOverride.length > 0) {
-      karmaConf.browsers = browserOverride;
-    }
-
-    new KarmaServer(karmaConf, newKarmaCallback(done)).start();
+  if (file) {
+    wdioOpts = [
+      wdioConf,
+      `--spec`,
+      `${file}`
+    ]
+  } else {
+    wdioOpts = [
+      wdioConf
+    ];
   }
+  return execa(wdioCmd, wdioOpts, { stdio: 'inherit' });
 }
 
-function newKarmaCallback(done) {
-  return function (exitCode) {
+function runKarma(options, done) {
+  // the karma server appears to leak memory; starting it multiple times in a row will run out of heap
+  // here we run it in a separate process to bypass the problem
+  options = Object.assign({browsers: helpers.parseBrowserArgs(argv)}, options)
+  const child = fork('./karmaRunner.js');
+  child.on('exit', (exitCode) => {
     if (exitCode) {
       done(new Error('Karma tests failed with exit code ' + exitCode));
-      if (argv.browserstack) {
-        process.exit(exitCode);
-      }
     } else {
       done();
-      if (argv.browserstack) {
-        process.exit(exitCode);
-      }
     }
-  }
+  })
+  child.send(options);
 }
 
 // If --file "<path-to-test-file>" is given, the task will only run tests in the specified file.
 function testCoverage(done) {
-  new KarmaServer(karmaConfMaker(true, false, false, argv.file), newKarmaCallback(done)).start();
+  runKarma({coverage: true, browserstack: false, watch: false, file: argv.file}, done);
 }
 
 function coveralls() { // 2nd arg is a dependency: 'test' must be finished
@@ -312,43 +370,54 @@ 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();
+  const srv = spawn('node', args);
+  srv.stdout.on('data', (data) => {
+    console.log(`stdout: ${data}`);
+  });
+  srv.stderr.on('data', (data) => {
+    console.log(`stderr: ${data}`);
+  });
+  return srv;
 }
 
-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 startLocalServer(options = {}) {
+  connect.server({
+    https: argv.https,
+    port: port,
+    host: INTEG_SERVER_HOST,
+    root: './',
+    livereload: options.livereload
+  });
 }
 
-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'));
-}
+// Watch Task with Live Reload
+function watchTaskMaker(options = {}) {
+  if (options.livereload == null) {
+    options.livereload = true;
+  }
+  options.alsoWatch = options.alsoWatch || [];
 
-function startFakeServer() {
-  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}`);
-  });
+  return function watch(done) {
+    var mainWatcher = gulp.watch([
+      'src/**/*.js',
+      'modules/**/*.js',
+    ].concat(options.alsoWatch));
+
+    startLocalServer(options);
+
+    mainWatcher.on('all', options.task());
+    done();
+  }
 }
 
+const watch = watchTaskMaker({alsoWatch: ['test/**/*.js'], task: () => gulp.series(clean, gulp.parallel(lint, 'build-bundle-dev', test))});
+const watchFast = watchTaskMaker({livereload: false, task: () => gulp.series('build-bundle-dev')});
+
 // support tasks
 gulp.task(lint);
 gulp.task(watch);
@@ -358,10 +427,30 @@ gulp.task(clean);
 gulp.task(escapePostbidConfig);
 
 gulp.task('build-bundle-dev', gulp.series(makeDevpackPkg, gulpBundle.bind(null, true)));
-gulp.task('build-bundle-prod', gulp.series(makeWebpackPkg, gulpBundle.bind(null, false)));
+gulp.task('build-bundle-prod', gulp.series(makeWebpackPkg(), gulpBundle.bind(null, false)));
+// build-bundle-verbose - prod bundle except names and comments are preserved. Use this to see the effects
+// of dead code elimination.
+gulp.task('build-bundle-verbose', gulp.series(makeWebpackPkg({
+  optimization: {
+    minimizer: [
+      new TerserPlugin({
+        parallel: true,
+        terserOptions: {
+          mangle: false,
+          format: {
+            comments: 'all'
+          }
+        },
+        extractComments: false,
+      }),
+    ],
+  }
+}), gulpBundle.bind(null, false)));
 
 // public tasks (dependencies are needed for each task since they can be ran on their own)
-gulp.task('test', gulp.series(clean, lint, test));
+gulp.task('test-only', test);
+gulp.task('test-all-features-disabled', testTaskMaker({disableFeatures: require('./features.json'), oneBrowser: 'chrome', watch: false}));
+gulp.task('test', gulp.series(clean, lint, gulp.series('test-all-features-disabled', 'test-only')));
 
 gulp.task('test-coverage', gulp.series(clean, testCoverage));
 gulp.task(viewCoverage);
@@ -372,14 +461,22 @@ gulp.task('build', gulp.series(clean, 'build-bundle-prod'));
 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', watch)));
-gulp.task('serve-fake', gulp.series(clean, gulp.parallel('build-bundle-dev', watch), injectFakeServerEndpointDev, test, startFakeServer));
+gulp.task('serve-fast', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast)));
+gulp.task('serve-prod', gulp.series(clean, gulp.parallel('build-bundle-prod', startLocalServer)));
+gulp.task('serve-and-test', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast, testTaskMaker({watch: true}))));
+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, makeWebpackPkg));
+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
 
+// build task for reviewers, runs test-coverage, serves, without watching
+gulp.task(viewReview);
+gulp.task('review-start', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, testCoverage), viewReview));
+
 module.exports = nodeBundle;
diff --git a/integrationExamples/gpt/1plusXRtdProviderExample.html b/integrationExamples/gpt/1plusXRtdProviderExample.html
new file mode 100644
index 00000000000..b2c7a0037ff
--- /dev/null
+++ b/integrationExamples/gpt/1plusXRtdProviderExample.html
@@ -0,0 +1,110 @@
+<html>
+
+<head>
+
+  <script>
+    var FAILSAFE_TIMEOUT = 2000;
+
+    var adUnits = [
+      {
+        code: 'test-div',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600], [728, 90]]
+          }
+        },
+        bids: [
+          {
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370
+            }
+          }
+        ]
+      }
+    ];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+  </script>
+  <script src="../../build/dev/prebid.js" async></script>
+
+  <script>
+    var googletag = googletag || {};
+    var testAuctionDelay = 2000;
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function () {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        debug: true,
+        realTimeData: {
+          auctionDelay: testAuctionDelay, // lower in real scenario to meet publisher spec
+          dataProviders: [
+            {
+              name: "1plusX",
+              waitForIt: true,
+              params: {
+                customerId: 'acme',
+                bidders: ['appnexus'],
+                timeout: 1000
+              }
+
+            }
+          ]
+        }
+      });
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({ bidsBackHandler: sendAdserverRequest });
+    });
+
+    function sendAdserverRequest() {
+      if (pbjs.adserverRequestSent) return;
+      pbjs.adserverRequestSent = true;
+
+      googletag.cmd.push(function () {
+        pbjs.que.push(function () {
+          pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    setTimeout(function () {
+      sendAdserverRequest();
+    }, FAILSAFE_TIMEOUT);
+  </script>
+
+  <script>
+    (function () {
+      var gads = document.createElement('script');
+      gads.async = true;
+      gads.type = 'text/javascript';
+      gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
+      var node = document.getElementsByTagName('script')[0];
+      node.parentNode.insertBefore(gads, node);
+    })();
+  </script>
+
+  <script>
+    googletag.cmd.push(function () {
+      googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250], [300, 600]], 'test-div').addService(googletag.pubads());
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
+</head>
+
+<body>
+  <h2>1plusX RTD Module for Prebid</h2>
+
+  <div id='test-div'>
+    <script>
+      googletag.cmd.push(function () { googletag.display('test-div'); });
+    </script>
+  </div>
+</body>
+
+</html>
diff --git a/integrationExamples/gpt/adUnitFloors.html b/integrationExamples/gpt/adUnitFloors.html
new file mode 100644
index 00000000000..bb48a20ef78
--- /dev/null
+++ b/integrationExamples/gpt/adUnitFloors.html
@@ -0,0 +1,112 @@
+<!--
+  This page calls a single bidder for a single ad slot.
+  It is a specialized example for adding floors to bids using the priceFloors Module
+  It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
+  bids array inside the adUnits, and it will use your adapter to load an ad.
+  NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
+  set an alias in your /etc/hosts file so that you can load this page from a different domain.
+-->
+
+<html>
+
+<head>
+    <script async src="../../build/dist/prebid.js"></script>
+    <script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
+    <script>
+        var FAILSAFE_TIMEOUT = 3300;
+        var PREBID_TIMEOUT = 1000;
+        var adUnits = [{
+            code: 'div-gpt-ad-51545-0',
+            sizes: [[300, 250], [600, 500]],
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250], [600, 500]]
+                }
+            },
+            // Replace this object to test a new Adapter!
+            bids: [{
+                bidder: 'ix',
+                params: {
+                    siteId: '300',
+                    size: [300, 250]
+                }
+            }]
+        }];
+        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({
+                floors: {
+                    enforcement: {
+                        floorDeals: false, //default to false
+                        bidAdjustment: true
+                    },
+                    data: {     // default if endpoint doesn't return in time
+                        currency: 'USD',
+                        skipRate: 5,
+                        modelVersion: 'BlackBerryZap',
+                        schema: {
+                            fields: ['gptSlot', 'mediaType', 'size']
+                        },
+                        values: {
+                            '*|banner|600x500': 6.5,
+                            '*|banner|300x250': 3.25,
+                            '*|video': 3.5
+                        }
+                    }
+                }
+            });
+            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();
+                });
+            });
+        }
+
+        setTimeout(function () {
+            sendAdserverRequest();
+        }, FAILSAFE_TIMEOUT);
+
+    </script>
+
+    <script>
+        googletag.cmd.push(function () {
+            googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-51545-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-51545-0'>
+        <script type='text/javascript'>
+            googletag.cmd.push(function () { googletag.display('div-gpt-ad-51545-0'); });
+        </script>
+    </div>
+</body>
+
+</html>
+
diff --git a/integrationExamples/gpt/adloox.html b/integrationExamples/gpt/adloox.html
new file mode 100644
index 00000000000..fd61267479d
--- /dev/null
+++ b/integrationExamples/gpt/adloox.html
@@ -0,0 +1,236 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Prebid Display/Video Merged Auction with Adloox Integration</title>
+
+        <script async src="http://localhost:9999/build/dev/prebid.js"></script>
+        <!-- <script async src="https://storage.googleapis.com/adloox-ads-js-test/prebid.js"></script> -->
+        <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
+
+        <script>
+            // set to 10s (rather than 100ms) only to assist development as 'Local Overrides' stalls for >1s :-/
+            var AUCTION_DELAY = 10000;	// recommended to be set to 100 in production
+            var PREBID_TIMEOUT = 1000;
+            var FAILSAFE_TIMEOUT = AUCTION_DELAY + (3 * PREBID_TIMEOUT);
+
+            var div_1_sizes = [ [728, 90] ];
+            var div_2_sizes = [ [300, 250] ];
+            var video_1_size = [ 640, 480 ];
+
+            var adUnits = [
+                {
+                    code: 'div-1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: div_1_sizes
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'rubicon',
+                            params: {
+                                accountId: 14062,
+                                siteId: 70608,
+                                zoneId: 498816
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'div-2',
+                    mediaTypes: {
+                        banner: {
+                            sizes: div_2_sizes
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'rubicon',
+                            params: {
+                                accountId: 14062,
+                                siteId: 70608,
+                                zoneId: 498816
+                            }
+                        }
+                    ]
+                }
+            ];
+
+            var videoAdUnit = {
+                code: 'video-1',
+                mediaTypes: {
+                    video: {
+                        context: 'instream',
+                        playerSize: [ 640, 480 ]
+                    }
+                },
+                ortb2Imp: {
+                    ext: {
+                        data: {
+                            pbadslot: '/19968336/prebid_cache_video_adunit'
+                        }
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'spotx',
+                        params: {
+                            channel_id: 85394,
+                            ad_unit: 'instream'
+                        }
+                    }
+                ]
+            };
+
+            window.googletag = window.googletag || { cmd: [] };
+            googletag.cmd.push(function() {
+                googletag
+                    .defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1')
+                    .addService(googletag.pubads());
+                googletag
+                    .defineSlot('/19968336/header-bid-tag-1', div_2_sizes, 'div-2')
+                    .addService(googletag.pubads());
+                googletag.pubads().disableInitialLoad();
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+
+            var pbjs = pbjs || {};
+            pbjs.que = pbjs.que || [];
+
+            var tempTag = false;
+            var invokeVideoPlayer = function(url) {
+                tempTag = url;
+            };
+
+            function sendAdserverRequest(bids, timedOut, auctionId) {
+                if (pbjs.initAdserverSet) return;
+                pbjs.initAdserverSet = true;
+
+                googletag.cmd.push(function() {
+                    const adUnitCodes = adUnits.map(adUnit => adUnit.code);
+                    pbjs.setTargetingForGPTAsync(adUnitCodes);
+                    googletag.pubads().refresh();
+                });
+
+                var videoBids = bids[videoAdUnit.code];
+                if (videoBids) {
+// DEMO NOTES: your environment likely will use the commented section ////
+                    var videoUrl = videoBids.bids[0].vastUrl;
+//                    var videoUrl = pbjs.adServers.dfp.buildVideoUrl({
+//                        adUnit: videoAdUnit,
+//                        params: {
+//                            iu: '/19968336/prebid_cache_video_adunit',
+//                            cust_params: {
+//                                section: 'blog',
+//                                anotherKey: 'anotherValue'
+//                            },
+//                            output: 'vast'
+//                        }
+//                    });
+//////////////////////////////////////////////////////////////////////////
+                    var ret = pbjs.adServers.adloox.buildVideoUrl({
+                        adUnit: videoAdUnit,
+                        url: videoUrl
+                    }, invokeVideoPlayer);
+                    if (!ret) console.log('Error building Adloox video URL');
+                }
+            }
+
+            // optionally wrap with googletag to have gpt-pre-auction
+            // automatically populate Prebid Ad Slot (pbadslot)
+            // https://docs.prebid.org/dev-docs/modules/gpt-pre-auction.html
+            // alternatively remove wrapping and set AdUnit.ortb2Imp.ext.data.pbadslot
+            googletag.cmd.push(function() {
+                pbjs.que.push(function() {
+                    pbjs.setConfig({
+                        realTimeData: {
+                            auctionDelay: AUCTION_DELAY,
+                            dataProviders: [
+                                {
+                                    name: 'adloox',
+                                    params: {             // optional, defaults shown
+                                        thresholds: [ 50, 60, 70, 80, 90 ],
+                                        slotinpath: false
+                                    }
+                                }
+                            ]
+                        },
+                        instreamTracking: {
+                            enabled: true
+                        },
+                        rubicon: {
+                            singleRequest: true
+                        },
+                        // RTD module honors pageUrl for referrer detection and
+                        // the analytics module uses this for the 'pageurl' macro
+                        // N.B. set this to a non-example.com URL to see the video
+                        //pageUrl: 'https://yourdomain.com/some/path/to/content.html'
+                    });
+                    pbjs.enableAnalytics({
+                        provider: 'adloox',
+                        options: {
+                            client: 'adlooxtest',
+                            clientid: 127,
+                            platformid: 0,
+                            tagid: 0
+                        }
+                    });
+                    pbjs.addAdUnits(adUnits);
+                    pbjs.addAdUnits(videoAdUnit);
+                    pbjs.requestBids({
+                        bidsBackHandler: sendAdserverRequest,
+                        timeout: PREBID_TIMEOUT
+                    })
+                });
+            });
+
+            setTimeout(function() {
+                sendAdserverRequest();
+            }, FAILSAFE_TIMEOUT);
+        </script>
+    </head>
+    <body>
+        <h1>Prebid Display/Video Merged Auction with Adloox Integration</h1>
+
+        <h2>div-1</h2>
+        <div id="div-1">
+            <script>
+                googletag.cmd.push(function() {
+                    googletag.display('div-1');
+                });
+            </script>
+        </div>
+
+        <h2>div-2</h2>
+        <div id="div-2">
+            <script>
+                googletag.cmd.push(function() {
+                    googletag.display('div-2');
+                });
+            </script>
+        </div>
+
+        <h2>video-1</h2>
+        <div id="video-1"></div>
+        <script src="https://content.jwplatform.com/libraries/72xIKEe6.js"></script>
+        <script>
+            var playerInstance = jwplayer('video-1');
+            invokeVideoPlayer = function(url) {
+                playerInstance.setup({
+                    "playlist": "https://content.jwplatform.com/feeds/ae4tmw2D.json",
+                    "width": 640,
+                    "height": 480,
+                    "advertising": {
+                        "client": "vast",
+                        "tag": url
+                    }
+                });
+            };
+            if (tempTag) {
+                invokeVideoPlayer(tempTag);
+                tempTag = false;
+            }
+        </script>
+    </body>
+</html>
diff --git a/integrationExamples/gpt/afpExample.html b/integrationExamples/gpt/afpExample.html
new file mode 100644
index 00000000000..a1e6e800d69
--- /dev/null
+++ b/integrationExamples/gpt/afpExample.html
@@ -0,0 +1,242 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Prebid.js Banner Example</title>
+  <script src="../../../build/dev/prebid.js"></script>
+  <script>
+    var adUnits = [
+      {
+        code: 'iib-target',
+        mediaTypes: {
+          banner: {
+            sizes: [[0, 0]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "In-image",
+            placeId: "613221112871613d1517d181", // id from personal account
+            placeContainer: '#iib-container',
+            imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+            imageWidth: 1000,
+            imageHeight: 524,
+          }
+        }]
+      },
+      {
+        code: 'iimb-target',
+        mediaTypes: {
+          banner: {
+            sizes: [[0, 0]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "In-image Max",
+            placeId: "6139ae472871613d1517dedd", // id from personal account
+            placeContainer: '#iimb-container',
+            imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+            imageWidth: 1000,
+            imageHeight: 524,
+          }
+        }]
+      },
+      {
+        code: 'icb-target',
+        mediaTypes: {
+          banner: {
+            sizes: [[0, 0]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "In-content Banner",
+            placeId: "6139ae082871613d1517dec0", // id from personal account
+            placeContainer: '#icb-container',
+          }
+        }]
+      },
+      {
+        code: 'ics-target',
+        mediaTypes: {
+          banner: {
+            sizes: [[0, 0]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "In-content Stories",
+            placeId: "6139ae292871613d1517ded3", // id from personal account
+            placeContainer: '#ics-container',
+          }
+        }]
+      },
+      {
+        code: 'as-target',
+        mediaTypes: {
+          banner: {
+            sizes: [[0, 0]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "Action Scroller",
+            placeId: "6139adc12871613d1517deb0", // id from personal account
+            placeContainer: '#as-container',
+          }
+        }]
+      },
+      {
+        code: 'asl-target',
+        mediaTypes: {
+          banner: {
+            sizes: [[0, 0]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "Action Scroller Light",
+            placeId: "6139adda2871613d1517deb8", // id from personal account
+            placeContainer: '#asl-container',
+          }
+        }]
+      },
+      {
+        code: 'jb-target',
+        mediaTypes: {
+          banner: {
+            sizes: [[100, 100], [300, 250], [40, 50]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "Just Banner",
+            placeId: "6139ae832871613d1517dee9", // id from personal account
+            placeContainer: '#jb-container',
+          }
+        }]
+      },
+      {
+        code: 'icv-target',
+        mediaTypes: {
+          video: {
+            playerSize: [[480, 320]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "In-content Video",
+            placeId: "6139ae182871613d1517deca", // id from personal account
+            placeContainer: '#icv-container',
+          }
+        }]
+      },
+      {
+        code: 'ocv-target',
+        mediaTypes: {
+          video: {
+            playerSize: [[480, 320]],
+          }
+        },
+        bids: [{
+          bidder: "afp",
+          params: {
+            placeType: "Out-content Video",
+            placeId: "6139ae5b2871613d1517dee2", // id from personal account
+            placeContainer: '#ocv-container', // only the "body" tag is used as a container
+          }
+        }]
+      }
+    ];
+    
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+    
+    pbjs.que.push(function() {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({
+        bidsBackHandler: function (e) {
+          if (pbjs.adserverRequestSent) return;
+          pbjs.adserverRequestSent = true;
+          
+          var targets = ['iib-target', 'iimb-target', 'icb-target', 'ics-target', 'as-target', 'asl-target', 'jb-target', 'icv-target', 'ocv-target']
+  
+          targets.forEach(function(target) {
+            var params = pbjs.getAdserverTargetingForAdUnitCode(target);
+            var iframe = document.getElementById(target);
+  
+            if (params && params['hb_adid']) {
+              pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+            }
+          })
+        }
+      });
+    });
+  </script>
+</head>
+<body id="ocv-container">
+  <h2>In-image</h2>
+  <div class="container-wrapper">
+    <div id="iib-container" style="max-width: 600px;">
+      <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+    </div>
+    <iframe id="iib-target" style="display: none;"></iframe>
+  </div>
+  
+  <h2>In-image Max</h2>
+  <div class="container-wrapper">
+    <div id="iimb-container" style="max-width: 600px;">
+      <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+    </div>
+    <iframe id="iimb-target" style="display: none;"></iframe>
+  </div>
+  
+  <h2>In-content Banner</h2>
+  <div class="container-wrapper">
+    <div id="icb-container"></div>
+    <iframe id="icb-target" style="display: none;"></iframe>
+  </div>
+  
+  <h2>In-content Stories</h2>
+  <div class="container-wrapper">
+    <div id="ics-container"></div>
+    <iframe id="ics-target" style="display: none;"></iframe>
+  </div>
+  
+  <h2>Action Scroller</h2>
+  <div class="container-wrapper">
+    <div id="as-container"></div>
+    <iframe id="as-target" style="display: none;"></iframe>
+  </div>
+  
+  <h2>Action Scroller Light</h2>
+  <div class="container-wrapper">
+    <div id="asl-container"></div>
+    <iframe id="asl-target" style="display: none;"></iframe>
+  </div>
+  
+  <h2>Just Banner</h2>
+  <div class="container-wrapper">
+    <div id="jb-container"></div>
+    <iframe id="jb-target" style="display: none;"></iframe>
+  </div>
+  
+  <h2>In-content Video</h2>
+  <div class="container-wrapper">
+    <div id="icv-container"></div>
+    <iframe id="icv-target" style="display: none;"></iframe>
+  </div>
+  
+  <!-- Out-content Video -->
+  <iframe id="ocv-target" style="display: none;"></iframe>
+</body>
+</html>
diff --git a/integrationExamples/gpt/afpGamExample.html b/integrationExamples/gpt/afpGamExample.html
new file mode 100644
index 00000000000..64cb169893c
--- /dev/null
+++ b/integrationExamples/gpt/afpGamExample.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Prebid.js Banner Example</title>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script src="../../../build/dev/prebid.js"></script>
+  <script>
+    var adUnits = [{
+      code: 'div-gpt-ad-1574864639578-0',
+      mediaTypes: {
+        banner: {
+          sizes: [0, 0],
+        }
+      },
+      bids: [{
+        bidder: "afp",
+        params: {
+          placeType: "In-image",
+          placeId: "613221112871613d1517d181",
+          placeContainer: '#iib-container',
+          imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+          imageWidth: 600,
+          imageHeight: 400,
+        }
+      }]
+    },
+    {
+      code: 'div-gpt-ad-1574864639578-1',
+      mediaTypes: {
+        video: {
+          playerSize: [640, 480]
+        }
+      },
+      bids: [{
+        bidder: "afp",
+        params: {
+          placeType: "In-content Video",
+          placeId: "60e5684718047b3fae304617",
+          placeContainer: '#icv-container',
+        }
+      }]
+    },
+    {
+      code: 'div-gpt-ad-1574864639578-2',
+      mediaTypes: {
+        banner: {
+          sizes: [500, 500],
+        }
+      },
+      bids: [{
+        bidder: "afp",
+        params: {
+          placeType: "Action Scroller",
+          placeId: "60f15a8515770d5ab7c7f885",
+          placeContainer: '#as-container',
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+
+    googletag.cmd.push(() => {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    pbjs.que.push(() => {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+    });
+
+    function sendAdServerRequest() {
+      googletag.cmd.push(() => {
+        pbjs.que.push(() => {
+          pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
+          pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-1');
+          pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-2');
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    googletag.cmd.push(() => {
+      googletag
+        .defineSlot('/19968336/header-bid-tag-0', [300, 250], 'div-gpt-ad-1574864639578-0')
+        .addService(googletag.pubads());
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+
+    googletag.cmd.push(() => {
+      googletag
+        .defineSlot('/19968336/header-bid-tag-0', [300, 250], 'div-gpt-ad-1574864639578-1')
+        .addService(googletag.pubads());
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+
+    googletag.cmd.push(() => {
+      googletag
+        .defineSlot('/19968336/header-bid-tag-0', [300, 250], 'div-gpt-ad-1574864639578-2')
+        .addService(googletag.pubads());
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+
+  </script>
+</head>
+<body id="ocv-container">
+  <h2>In-image</h2>
+  <div class="container-wrapper">
+    <div id="iib-container" style="width: 600px;">
+      <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+    </div>
+    <div id="div-gpt-ad-1574864639578-0">
+      <script type="text/javascript">
+        googletag.cmd.push(function() {
+          googletag.display('div-gpt-ad-1574864639578-0');
+        });
+      </script>
+    </div>
+  </div>
+  
+  <h2>In-content Video</h2>
+  <div class="container-wrapper">
+    <div id="icv-container"></div>
+    <div id="div-gpt-ad-1574864639578-1">
+      <script type="text/javascript">
+        googletag.cmd.push(function() {
+          googletag.display('div-gpt-ad-1574864639578-1');
+        });
+      </script>
+    </div>
+  </div>
+  
+  <h2>Action Scroller</h2>
+  <div class="container-wrapper">
+    <div id="as-container"></div>
+    <div id="div-gpt-ad-1574864639578-2">
+      <script type="text/javascript">
+        googletag.cmd.push(function() {
+          googletag.display('div-gpt-ad-1574864639578-2');
+        });
+      </script>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/integrationExamples/gpt/airgridRtdProvider_example.html b/integrationExamples/gpt/airgridRtdProvider_example.html
new file mode 100644
index 00000000000..657eae8f481
--- /dev/null
+++ b/integrationExamples/gpt/airgridRtdProvider_example.html
@@ -0,0 +1,149 @@
+<html>
+  <head>
+    <script>
+      var matchedAudiences = ["sport", "travel"];
+      window.localStorage.setItem(
+        "edkt_matched_audience_ids",
+        JSON.stringify(matchedAudiences)
+      );
+    </script>
+    <script>
+      var FAILSAFE_TIMEOUT = 2000;
+
+      var adUnits = [
+        {
+          code: "test-div",
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250],
+                [300, 600],
+                [728, 90],
+              ],
+            },
+          },
+          bids: [
+            {
+              bidder: "appnexus",
+              params: {
+                placementId: 13144370,
+              },
+            },
+          ],
+        },
+      ];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+    </script>
+    <script src="../../build/dev/prebid.js" async></script>
+
+    <script>
+      var googletag = googletag || {};
+      var AUCTION_DELAY = 2000;
+      googletag.cmd = googletag.cmd || [];
+      googletag.cmd.push(function () {
+        googletag.pubads().disableInitialLoad();
+      });
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          debug: true,
+          realTimeData: {
+            auctionDelay: AUCTION_DELAY,
+            dataProviders: [
+              {
+                name: "airgrid",
+                waitForIt: true,
+                params: {
+                  apiKey: "key123",
+                  accountId: "sdk",
+                  publisherId: "pub123",
+                },
+              },
+            ],
+          },
+        });
+        pbjs.setBidderConfig({
+          bidders: ["appnexus", "pubmatic"],
+          config: {
+            ortb2: {
+              user: {
+                ext: {
+                  data: {
+                    registered: true,
+                    interests: ["cars"],
+                  },
+                },
+              },
+            },
+          },
+        });
+
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({ bidsBackHandler: sendAdserverRequest });
+      });
+
+      function sendAdserverRequest() {
+        document.getElementById("airgrid_audiences").innerHTML =
+          window.localStorage.getItem("edkt_matched_audience_ids");
+
+        if (pbjs.adserverRequestSent) return;
+        pbjs.adserverRequestSent = true;
+        googletag.cmd.push(function () {
+          pbjs.que.push(function () {
+            pbjs.setTargetingForGPTAsync();
+            googletag.pubads().refresh();
+          });
+        });
+      }
+
+      setTimeout(function () {
+        sendAdserverRequest();
+      }, FAILSAFE_TIMEOUT);
+    </script>
+
+    <script>
+      (function () {
+        var gads = document.createElement("script");
+        gads.async = true;
+        gads.type = "text/javascript";
+        gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
+        var node = document.getElementsByTagName("script")[0];
+        node.parentNode.insertBefore(gads, node);
+      })();
+    </script>
+
+    <script>
+      googletag.cmd.push(function () {
+        googletag
+          .defineSlot(
+            "/112115922/FL_PB_MedRect",
+            [
+              [300, 250],
+              [300, 600],
+            ],
+            "test-div"
+          )
+          .addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+      });
+    </script>
+  </head>
+
+  <body>
+    <h2>AirGrid RTD Prebid</h2>
+
+    <div id="test-div">
+      <script>
+        googletag.cmd.push(function () {
+          googletag.display("test-div");
+        });
+      </script>
+    </div>
+
+    AirGrid Audiences:
+    <div id="airgrid_audiences"></div>
+  </body>
+</html>
diff --git a/integrationExamples/gpt/akamaidap_segments_example.html b/integrationExamples/gpt/akamaidap_segments_example.html
new file mode 100644
index 00000000000..f44c60292ce
--- /dev/null
+++ b/integrationExamples/gpt/akamaidap_segments_example.html
@@ -0,0 +1,134 @@
+<html>
+<head>
+    <script async src="../../build/dev/prebid.js"></script>
+    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+    <script>
+        var FAILSAFE_TIMEOUT = 3300;
+        var PREBID_TIMEOUT = 2000;
+
+        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
+                }
+            },
+            {
+              bidder: 'sovrn',
+              params: {
+                tagid: 1
+              }
+            }
+            ]
+
+        }];
+
+        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.setConfig({
+              debug: true,
+              ortb2: {
+                user: {
+                  data: [
+                    // DAP segment taxonomy inserted here
+                  ]
+                },
+                site: {
+                  ext: {
+                    data: {
+                      // DAP SAID will be inserted here
+                    }
+                  }
+                },
+                imp: {
+                  ext: {
+                    data: {
+                      // DAP SAID will be inserted here
+                    }
+                  }
+                }
+              },
+              realTimeData: {
+                auctionDelay: 2000,
+                dataProviders: [
+                  {
+                    name: "dap",
+                    waitForIt: true,
+                    params: {
+                      apiHostname: "prebid.dap.akadns.net",
+                      apiVersion: "x1",
+                      domain: "prebid.org",
+                      identityType: "dap-signature:1.3.0",
+                      segtax: 504,
+                      dapEntropyUrl: 'https://dap-dist.akamaized.net/dapentropy.js',
+                      dapEntropyTimeout: 1500
+                    }
+                  }
+                ]
+              }
+            });
+            pbjs.addAdUnits(adUnits);
+            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();
+                });
+            });
+        }
+
+        setTimeout(function() {
+            sendAdserverRequest();
+        }, FAILSAFE_TIMEOUT);
+
+    </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>
+
+                              <script>!function(a){var e="https://s.go-mpulse.net/boomerang/",t="addEventListener";if("False"=="True")a.BOOMR_config=a.BOOMR_config||{},a.BOOMR_config.PageParams=a.BOOMR_config.PageParams||{},a.BOOMR_config.PageParams.pci=!0,e="https://s2.go-mpulse.net/boomerang/";if(window.BOOMR_API_key="5G3ZS-8L7PG-U23WM-5CA4K-LQ3YP",function(){function n(e){a.BOOMR_onload=e&&e.timeStamp||(new Date).getTime()}if(!a.BOOMR||!a.BOOMR.version&&!a.BOOMR.snippetExecuted){a.BOOMR=a.BOOMR||{},a.BOOMR.snippetExecuted=!0;var i,_,o,r=document.createElement("iframe");if(a[t])a[t]("load",n,!1);else if(a.attachEvent)a.attachEvent("onload",n);r.src="javascript:void(0)",r.title="",r.role="presentation",(r.frameElement||r).style.cssText="width:0;height:0;border:0;display:none;",o=document.getElementsByTagName("script")[0],o.parentNode.insertBefore(r,o);try{_=r.contentWindow.document}catch(O){i=document.domain,r.src="javascript:var d=document.open();d.domain='"+i+"';void(0);",_=r.contentWindow.document}_.open()._l=function(){var a=this.createElement("script");if(i)this.domain=i;a.id="boomr-if-as",a.src=e+"5G3ZS-8L7PG-U23WM-5CA4K-LQ3YP",BOOMR_lstart=(new Date).getTime(),this.body.appendChild(a)},_.write("<bo"+'dy onload="document._l();">'),_.close()}}(),"".length>0)if(a&&"performance"in a&&a.performance&&"function"==typeof a.performance.setResourceTimingBufferSize)a.performance.setResourceTimingBufferSize();!function(){if(BOOMR=a.BOOMR||{},BOOMR.plugins=BOOMR.plugins||{},!BOOMR.plugins.AK){var e=""=="true"?1:0,t="",n="ghh4w4yxem66iyi6ijxa-f-a8f1ed317-clientnsv4-s.akamaihd.net",i="false"=="true"?2:1,_={"ak.v":"32","ak.cp":"540505","ak.ai":parseInt("351538",10),"ak.ol":"0","ak.cr":17,"ak.ipv":4,"ak.proto":"http/1.1","ak.rid":"322de403","ak.r":36326,"ak.a2":e,"ak.m":"dscx","ak.n":"essl","ak.bpcip":"49.207.203.0","ak.cport":5172,"ak.gh":"23.47.149.85","ak.quicv":"","ak.tlsv":"tls1.2","ak.0rtt":"","ak.csrc":"-","ak.acc":"bbr","ak.t":"1629373038","ak.ak":"hOBiQwZUYzCg5VSAfCLimQ==admFPBlxVf0VKeanKFKUThzq+or23aIaVFP5DBXpeOGEuvD5mQz0UZbvK242Y8cupS91bsNaM7uJT3/O00EszGTxlFhkv439YkTWfyegvqVlJhcrZ7jcRkIoyrmjoBqDZoF0WaG4rhwmNzkKEv6T1noRYwEWwRHOG8p7osPXWy5as6KkmhOYUiYk8S5hQj+HFzhYI5YUTx+8urmHdpVIDBkramcrT2V89mb0cH5L2bSGS2hahAA3Kkf+0Dul7r5hDFQaVTf17e4oKdM1G8cKVF5LGRxRl3v4Rn6tBJ+fjrJ7XYQWV30w1LPwcAmSfRX8iTCK4xzHwG1fwDFHb5tWVsxHeEkRgNN3/KhnrCjxKtaROjJeWypJf/rjn1HWHwy7uVVsP9f/HRN3drCCkEvJBmu6yi0jzFFCoeEkbUEoq+8=","ak.pv":"396","ak.dpoabenc":"","ak.tf":i};if(""!==t)_["ak.ruds"]=t;var o={i:!1,av:function(e){var t="http.initiator";if(e&&(!e[t]||"spa_hard"===e[t]))_["ak.feo"]=void 0!==a.aFeoApplied?1:0,BOOMR.addVar(_)},rv:function(){var a=["ak.bpcip","ak.cport","ak.cr","ak.csrc","ak.gh","ak.ipv","ak.m","ak.n","ak.ol","ak.proto","ak.quicv","ak.tlsv","ak.0rtt","ak.r","ak.acc","ak.t","ak.tf"];BOOMR.removeVar(a)}};BOOMR.plugins.AK={akVars:_,akDNSPreFetchDomain:n,init:function(){if(!o.i){var a=BOOMR.subscribe;a("before_beacon",o.av,null,null),a("onbeacon",o.rv,null,null),o.i=!0}return this},is_complete:function(){return!0}}}}()}(window);</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>
+<h5>Segments Sent to Bidding Adapter</h5>
+<div id="user-segments"></div>
+</body>
+</html>
diff --git a/integrationExamples/gpt/amp/creative.html b/integrationExamples/gpt/amp/creative.html
index 86f669dd6b5..384b81107cc 100644
--- a/integrationExamples/gpt/amp/creative.html
+++ b/integrationExamples/gpt/amp/creative.html
@@ -1,38 +1,16 @@
 <!-- This script tag should be returned by your ad server -->
 
+<script src="https://cdn.jsdelivr.net/npm/prebid-universal-creative@latest/dist/creative.js"></script>
 <script>
-    // This is the `renderAd` function from Prebid.js moved within the creative iframe
-  var renderAd = function (ev) {
-    var key = ev.message ? "message" : "data";
-    var data = {};
-    try {
-      data = JSON.parse(ev[key]);
-    } catch (e) {
-      // Do nothing.  No ad found.
-    }
-    if (data.ad || data.adUrl) {
-      if (data.ad) {
-        document.write(data.ad);
-        document.close();
-      } else if (data.adUrl) {
-        document.write('<IFRAME SRC="' + data.adUrl + '" WIDTH="'+ data.width +'" HEIGHT="'+ data.height +'" FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true"></IFRAME>');
-        document.close();
-      }
-    }
-  };
+  var ucTagData = {};
+  ucTagData.adServerDomain = "";
+  ucTagData.pubUrl = "%%PATTERN:url%%";
+  ucTagData.targetingMap = "%%PATTERN:TARGETINGMAP%%";
+  ucTagData.hbPb = "%%PATTERN:hb_pb%%";
 
-  var requestAdFromPrebid = function () {
-    var message = JSON.stringify({
-      message: 'Prebid creative requested: %%PATTERN:hb_adid%%',
-      adId: '%%PATTERN:hb_adid%%'
-    });
-    window.parent.postMessage(message, '*');
-  };
-
-  var listenAdFromPrebid = function () {
-    window.addEventListener("message", renderAd, false);
-  };
-
-  listenAdFromPrebid();
-  requestAdFromPrebid();
+  try {
+    ucTag.renderAd(document, ucTagData);
+  } catch (e) {
+    console.log(e);
+  }
 </script>
diff --git a/integrationExamples/gpt/amp/remote.html b/integrationExamples/gpt/amp/remote.html
index 785d854766f..4ee2cdcb2f6 100644
--- a/integrationExamples/gpt/amp/remote.html
+++ b/integrationExamples/gpt/amp/remote.html
@@ -33,7 +33,7 @@
 
     // load Prebid.js
     (function () {
-        var d = document, pbs = d.createElement("script"), pro = d.location.protocal;
+        var d = document, pbs = d.createElement("script");
         pbs.type = "text/javascript";
         pbs.src = prebidSrc;
         var target = document.getElementsByTagName("head")[0];
diff --git a/integrationExamples/gpt/audigentSegments_example.html b/integrationExamples/gpt/audigentSegments_example.html
deleted file mode 100644
index 7739b558327..00000000000
--- a/integrationExamples/gpt/audigentSegments_example.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<html>
-<head>
-    <script>
-        (function(window, document) {
-            if (!window.__cmp) {
-                window.__cmp = (function() {
-                    var listen = window.attachEvent || window.addEventListener;
-                    listen('message', function(event) {
-                        window.__cmp.receiveMessage(event);
-                    }, false);
-
-                    function addLocatorFrame() {
-                        if (!window.frames['__cmpLocator']) {
-                            if (document.body) {
-                                var frame = document.createElement('iframe');
-                                frame.style.display = 'none';
-                                frame.name = '__cmpLocator';
-                                document.body.appendChild(frame);
-                            } else {
-                                setTimeout(addLocatorFrame, 5);
-                            }
-                        }
-                    }
-                    addLocatorFrame();
-
-                    var commandQueue = [];
-                    var cmp = function(command, parameter, callback) {
-                        if (command === 'ping') {
-                            if (callback) {
-                                callback({
-                                    gdprAppliesGlobally: !!(window.__cmp && window.__cmp.config && window.__cmp.config.storeConsentGlobally),
-                                    cmpLoaded: false
-                                });
-                            }
-                        } else {
-                            commandQueue.push({
-                                command: command,
-                                parameter: parameter,
-                                callback: callback
-                            });
-                        }
-                    };
-                    cmp.commandQueue = commandQueue;
-                    cmp.receiveMessage = function(event) {
-                        var data = event && event.data && event.data.__cmpCall;
-                        if (data) {
-                            commandQueue.push({
-                                callId: data.callId,
-                                command: data.command,
-                                parameter: data.parameter,
-                                event: event
-                            });
-                        }
-                    };
-                    cmp.config = {
-                        //
-                        // Modify config values here
-                        //
-                        // globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
-                        // customPurposeListLocation: './purposes.json',
-                        // globalConsentLocation: './portal.html',
-                        // storeConsentGlobally: false,
-                        // storePublisherData: false,
-                        logging: 'debug'//,
-                        // localization: {},
-                        // forceLocale: 'en-us'
-                    };
-                    return cmp;
-                }());
-                var t = document.createElement('script');
-                t.async = false;
-                t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js';
-                var tag = document.getElementsByTagName('head')[0];
-                tag.appendChild(t);
-            }
-        })(window, document);
-        // window.__cmp('showConsentTool');
-    </script>
-
-    <script>
-        var FAILSAFE_TIMEOUT = 2000;
-
-        var adUnits = [
-            {
-                code: 'test-div',
-                mediaTypes: {
-                   banner: {
-                       sizes: [[300,250],[300,600],[728,90]]
-                   }
-                },
-
-                bids: [
-                    {
-                        bidder: 'rubicon',
-                        params: {
-                            accountId: '1001',
-                            siteId: '113932',
-                            zoneId: '535510'
-                        }
-                    }
-                ]
-            }
-        ];
-
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-    </script>
-    <script src="../../build/dev/prebid.js" async></script>
-
-    <script>
-        var googletag = googletag || {};
-        googletag.cmd = googletag.cmd || [];
-        googletag.cmd.push(function() {
-            googletag.pubads().disableInitialLoad();
-        });
-
-        pbjs.que.push(function() {
-            pbjs.setConfig({
-                debug: true,
-                consentManagement: {
-                    cmpApi: 'iab',
-                    timeout: 1000,
-                    allowAuctionWithoutConsent: true
-                },
-                // consentManagement: {
-                //     cmpApi: 'static',
-                //     consentData: {
-                //         consentString: 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA'
-                //         vendorData: {
-                //             purposeConsents: {
-                //                 '1': true
-                //             }
-                //         }
-                //     }
-                // },
-                usersync: {
-                    userIds: [{
-                        name: "unifiedId",
-                        params: {
-                            partner: "prebid",
-                            url: "http://match.adsrvr.org/track/rid?ttd_pid=prebid&fmt=json"
-                        },
-                        storage: {
-                            type: "html5",
-                            name: "unifiedid",
-                            expires: 30
-                        },
-                    }, {
-                        name: "id5Id",
-                        params: {
-                            partner: 173 //Set your real ID5 partner ID here for production, please ask for one at http://id5.io/prebid
-                        },
-                        storage: {
-                            type: "cookie",
-                            name: "id5id",
-                            expires: 90,
-                            refreshInSeconds: 8*3600 // Refresh frequency of cookies, defaulting to 'expires'
-                        },
-
-                    }, {
-                        name: "parrableId",
-                        params: {
-                            // change to Parrable Partner Client ID(s) you received from the Parrable Partners you are using
-                            partner: '30182847-e426-4ff9-b2b5-9ca1324ea09b'
-                        }
-                    }, {
-                        name: "pubCommonId",
-                        storage: {
-                            type: "cookie",
-                            name: "pubcid",
-                            expires: 365
-                        },
-                        // value: {
-                        //     foo: '9879878907987',
-                        //     bar:'93939'
-                        // }
-                    },  {
-                      name: 'identityLink',
-                      params: {
-                        pid: '14' // Set your real identityLink placement ID here
-                      },
-                      storage: {
-                        type: 'cookie',
-                        name: 'idl_env',
-                        expires: 30
-                      }
-                    }],
-                    syncDelay: 5000,
-                    auctionDelay: 1000 
-                },
-                realTimeData: {
-                    auctionDelay: 1000,
-                    dataProviders: [{name: "audigent"}]
-                }
-            });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({bidsBackHandler: sendAdserverRequest});
-        });
-
-        function sendAdserverRequest() {
-            document.getElementById('tdid').innerHTML = adUnits[0].bids[0].userId['tdid'];
-            document.getElementById('audigent_segments').innerHTML = JSON.stringify(adUnits[0].bids[0].realTimeData.audigent_segments);
-
-            if (pbjs.adserverRequestSent) return;
-            pbjs.adserverRequestSent = true;
-            googletag.cmd.push(function() {
-                pbjs.que.push(function() {
-                    pbjs.setTargetingForGPTAsync();
-                    googletag.pubads().refresh();
-                });
-            });
-        }
-
-        setTimeout(function() {
-            sendAdserverRequest();
-        }, FAILSAFE_TIMEOUT);
-    </script>
-
-    <script>
-        (function () {
-            var gads = document.createElement('script');
-            gads.async = true;
-            gads.type = 'text/javascript';
-            var useSSL = 'https:' == document.location.protocol;
-            gads.src = (useSSL ? 'https:' : 'http:') +
-                '//www.googletagservices.com/tag/js/gpt.js';
-            var node = document.getElementsByTagName('script')[0];
-            node.parentNode.insertBefore(gads, node);
-        })();
-    </script>
-
-    <script>
-        googletag.cmd.push(function() {
-            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
-            googletag.pubads().enableSingleRequest();
-            googletag.enableServices();
-        });
-    </script>
-</head>
-
-<body>
-<h2>Audigent Segments Prebid</h2>
-
-<div id='test-div'>
-    <script>
-        googletag.cmd.push(function() { googletag.display('test-div'); });
-    </script>
-</div>
-TDID:
-<div id='tdid'>
-</div>
-
-Audigent Segments:
-<div id='audigent_segments'>
-</div>
-</body>
-</html>
diff --git a/integrationExamples/gpt/blueconicRtdProvider_example.html b/integrationExamples/gpt/blueconicRtdProvider_example.html
new file mode 100644
index 00000000000..598a7569d8e
--- /dev/null
+++ b/integrationExamples/gpt/blueconicRtdProvider_example.html
@@ -0,0 +1,121 @@
+<html>
+<head>
+    <script>
+      var testBlueconicData = `{"segment": [{"id": "176753"}], "ext": {"segtax":"123"}, "bidId": "1234", "identifier": ["test","123"]}`;
+      window.localStorage.setItem('bcPrebidData', testBlueconicData);
+    </script>
+
+    <script>
+        var FAILSAFE_TIMEOUT = 2000;
+
+        var adUnits = [
+            {
+                code: 'test-div',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300,250],[300,600],[728,90]]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'appnexus',
+                        params: {
+                            placementId: 13144370
+                        }
+                    }
+                ]
+            }
+        ];
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js" async></script>
+
+    <script>
+        var googletag = googletag || {};
+        var testAuctionDelay = 2000;
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function() {
+            googletag.pubads().disableInitialLoad();
+        });
+
+        pbjs.que.push(function() {
+            pbjs.setConfig({
+                debug: true,
+                realTimeData: {
+                    auctionDelay: testAuctionDelay, // lower in real scenario to meet publisher spec
+                    dataProviders: [
+                        {
+                            name: "blueconic",
+                            waitForIt: true,
+                            params: {
+                                requestParams: {
+                                    publisherId: 0,
+                                    coppa: true
+                                }
+                            }
+
+                        }
+                    ]
+                }
+            });
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({bidsBackHandler: sendAdserverRequest});
+        });
+
+        function sendAdserverRequest() {
+            document.getElementById('blueconic_data').innerHTML = window.localStorage.getItem('bcPrebidData');
+            
+
+            if (pbjs.adserverRequestSent) return;
+            pbjs.adserverRequestSent = true;
+            googletag.cmd.push(function() {
+                pbjs.que.push(function() {
+                    pbjs.setTargetingForGPTAsync();
+                    googletag.pubads().refresh();
+                });
+            });
+        }
+
+        setTimeout(function() {
+            sendAdserverRequest();
+        }, FAILSAFE_TIMEOUT);
+    </script>
+
+    <script>
+        (function () {
+            var gads = document.createElement('script');
+            gads.async = true;
+            gads.type = 'text/javascript';
+            gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
+            var node = document.getElementsByTagName('script')[0];
+            node.parentNode.insertBefore(gads, node);
+        })();
+    </script>
+
+    <script>
+        googletag.cmd.push(function() {
+            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
+            googletag.pubads().enableSingleRequest();
+            googletag.enableServices();
+        });
+    </script>
+</head>
+
+<body>
+<h2>BlueConic RTD Prebid</h2>
+
+<div id='test-div'>
+    <script>
+        googletag.cmd.push(function() { googletag.display('test-div'); });
+    </script>
+</div>
+
+
+
+BlueConic Real-Time Data:
+<div id='blueconic_data'>
+</div>
+</body>
+</html>
diff --git a/integrationExamples/gpt/captifyRtdProvider_example.html b/integrationExamples/gpt/captifyRtdProvider_example.html
new file mode 100644
index 00000000000..955fbf8be70
--- /dev/null
+++ b/integrationExamples/gpt/captifyRtdProvider_example.html
@@ -0,0 +1,167 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name=viewport content="width=device-width, initial-scale=1">
+    <script type="text/javascript" src="https://cache.consentframework.com/js/pa/1020/c/Y1Dhs/stub" charset="utf-8"></script>
+    <script type="text/javascript" async src="https://choices.consentframework.com/js/pa/1020/c/Y1Dhs/cmp" charset="utf-8"></script>
+</head>
+<body>
+
+<script async src="https://pagead2.googlesyndication.com/tag/js/gpt.js"></script>
+<script src="prebid.js" async></script>
+
+<script>
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+        pbjs.setConfig({
+            debug: true,
+            realTimeData: {
+                auctionDelay: 1000,
+                dataProviders: [
+                    {
+                        name: "CaptifyRTDModule",
+                        waitForIt: true,
+                        params: {
+                            pubId: 11287,
+                            bidders: ['appnexus'],
+                        }
+                    }
+                ]
+            },
+            consentManagement: {
+                usp: {
+                    cmpApi: 'iab',
+                    timeout: 100 // US Privacy timeout 100ms
+                },
+                gdpr: {
+                    cmpApi: 'iab',
+                    timeout: 8000,
+                    defaultGdprScope: true,
+                    getTCData: {
+                        tcString: 'COwK6gaOwK6gaFmAAAENAPCAAAAAAAAAAAAAAAAAAAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+                        gdprApplies: true,
+                        purpose: {
+                            consents: {
+                                0: true,
+                            },
+                            legitimateInterests: {
+                                0: true,
+                            }
+                        },
+                        vendor: {
+                            consents: {
+                                00: true,
+                            },
+                            legitimateInterests: {
+                                0: true,
+                            }
+                        }
+                    },
+                    rules: [{
+                        purpose: "storage",
+                        enforcePurpose: true,
+                        enforceVendor: true,
+                        vendorExceptions: ["appnexus"] //Can work without consent for cookies
+                    },{
+                        purpose: "basicAds",
+                        enforcePurpose: true,
+                        enforceVendor: true,
+                        vendorExceptions: ["appnexus"]
+                    }]
+                },
+            }
+        });
+    });
+
+</script>
+<script>
+    var div_1_sizes = [
+        [728, 90]
+    ];
+
+    var PREBID_TIMEOUT = 3500;
+    var FAILSAFE_TIMEOUT = 4000;
+
+    var adUnits = [
+        {
+            code: '/19968336/header-bid-tag-0',
+            mediaTypes: {
+                banner: {
+                    sizes: div_1_sizes
+                }
+            },
+            bids: [{
+                bidder: 'appnexus',
+                params: {
+                    placementId: 27445767
+                }
+            }]
+        }
+    ];
+
+    // ======== DO NOT EDIT BELOW THIS LINE =========== //
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function() {
+        googletag.pubads().disableInitialLoad();
+    });
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({
+            bidsBackHandler: initAdserver,
+            timeout: PREBID_TIMEOUT
+        });
+    });
+
+    function initAdserver() {
+        if (pbjs.initAdserverSet) return;
+        pbjs.initAdserverSet = true;
+        googletag.cmd.push(function() {
+            pbjs.que.push(function() {
+                pbjs.setTargetingForGPTAsync();
+                googletag.pubads().refresh();
+            });
+        });
+    }
+
+
+    // in case PBJS doesn't load
+    setTimeout(function() {
+        initAdserver();
+    }, FAILSAFE_TIMEOUT);
+
+    googletag.cmd.push(function() {
+        googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+    });
+
+</script>
+
+<article>
+    <p>
+        Module will add key/value pairs in ad calls.
+        Check out for captify_segments key in the payload sent to Xandr to endpoint https://ib.adnxs.com/ut/v3/prebid : keywords.key[captify_segments] should have an array of string as value.
+        This array will have Xandr RTSS segment ids.
+    </p>
+</article>
+<h2>Basic Prebid.js Example with CaptifyRTD </h2>
+<h5>Div-1</h5>
+<div id='div-1'>
+    <script type='text/javascript'>
+        googletag.cmd.push(function() {
+            googletag.display('div-1');
+        });
+
+    </script>
+</div>
+
+</body>
+</html>
diff --git a/integrationExamples/gpt/creative_rendering.html b/integrationExamples/gpt/creative_rendering.html
index aef8b7f1654..04d4736c631 100644
--- a/integrationExamples/gpt/creative_rendering.html
+++ b/integrationExamples/gpt/creative_rendering.html
@@ -1,9 +1,4 @@
-<!-- #1 deprecated method - use preferred method below  instead-->
-<script>
-    try{ window.top.$$PREBID_GLOBAL$$.renderAd(document, '%%PATTERN:hb_adid%%'); } catch(e) {/*ignore*/}
-</script>
-
-<!-- #2 preferred method for showing ad - handles cases when $$PREBID_GLOBAL$$ is not in the top window -->
+<!-- preferred method for showing ad - handles cases when $$PREBID_GLOBAL$$ is not in the top window -->
 <script>
 var w = window;
 for (i = 0; i < 10; i++) {
diff --git a/integrationExamples/gpt/digitrust_Full.html b/integrationExamples/gpt/digitrust_Full.html
deleted file mode 100644
index fc7704776f4..00000000000
--- a/integrationExamples/gpt/digitrust_Full.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<html>
-<head>
-    <title>Full DigiTrust Prebid Sample</title>
-    <script>
-        (function(window, document) {
-            if (!window.__cmp) {
-                window.__cmp = (function() {
-                    var listen = window.attachEvent || window.addEventListener;
-                    listen('message', function(event) {
-                        window.__cmp.receiveMessage(event);
-                    }, false);
-
-                    function addLocatorFrame() {
-                        if (!window.frames['__cmpLocator']) {
-                            if (document.body) {
-                                var frame = document.createElement('iframe');
-                                frame.style.display = 'none';
-                                frame.name = '__cmpLocator';
-                                document.body.appendChild(frame);
-                            } else {
-                                setTimeout(addLocatorFrame, 5);
-                            }
-                        }
-                    }
-                    addLocatorFrame();
-
-                    var commandQueue = [];
-                    var cmp = function(command, parameter, callback) {
-                        if (command === 'ping') {
-                            if (callback) {
-                                callback({
-                                    gdprAppliesGlobally: !!(window.__cmp && window.__cmp.config && window.__cmp.config.storeConsentGlobally),
-                                    cmpLoaded: false
-                                });
-                            }
-                        } else {
-                            commandQueue.push({
-                                command: command,
-                                parameter: parameter,
-                                callback: callback
-                            });
-                        }
-                    };
-                    cmp.commandQueue = commandQueue;
-                    cmp.receiveMessage = function(event) {
-                        var data = event && event.data && event.data.__cmpCall;
-                        if (data) {
-                            commandQueue.push({
-                                callId: data.callId,
-                                command: data.command,
-                                parameter: data.parameter,
-                                event: event
-                            });
-                        }
-                    };
-                    cmp.config = {
-                        //
-                        // Modify config values here
-                        //
-                        // globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
-                        // customPurposeListLocation: './purposes.json',
-                        // globalConsentLocation: './portal.html',
-                        // storeConsentGlobally: false,
-                        // storePublisherData: false,
-                        logging: 'debug'//,
-                        // localization: {},
-                        // forceLocale: 'en-us'
-                    };
-                    return cmp;
-                }());
-                var t = document.createElement('script');
-                t.async = false;
-                t.src = 'https://acdn.adnxs.com/cmp/cmp.bundle.js';
-                var tag = document.getElementsByTagName('head')[0];
-                tag.appendChild(t);
-            }
-        })(window, document);
-        // window.__cmp('showConsentTool');
-    </script>
-
-    <script>
-        var FAILSAFE_TIMEOUT = 2000;
-
-        var adUnits = [
-            {
-                code: 'test-div',
-                sizes: [[300,250],[300,600],[728,90]],
-                bids: [
-                    {
-                        bidder: 'rubicon',
-                        params: {
-                            accountId: '1001',
-                            siteId: '113932',
-                            zoneId: '535510'
-                        }
-                    }
-                ]
-            }
-        ];
-
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-    </script>
-    <script src="../../build/dev/prebid.js" async></script>
-
-    <script>
-        var googletag = googletag || {};
-        googletag.cmd = googletag.cmd || [];
-        googletag.cmd.push(function() {
-            googletag.pubads().disableInitialLoad();
-        });
-
-        pbjs.que.push(function() {
-            pbjs.setConfig({
-                debug: true,
-                consentManagement: {
-                    cmpApi: 'iab',
-                    timeout: 1000,
-                    allowAuctionWithoutConsent: true
-                },
-               usersync: {
-                    userIds: [{
-                        name: "digitrust",
-                        params: {
-                            init: {
-                                member: 'example_member_id',
-                                site: 'example_site_id'
-                            },
-                            callback: function (digiTrustResult) {
-                                // This callback can be used by publisher page to react to error conditions
-                                // Or pass the DigiTrust ID on.
-                                // If the Prebid userId system already has a managed copy of the DigiTrust ID
-                                // this callback will not be invoked.
-                                var elem = document.getElementById('idDiv');
-                                var msg;
-                                if (digiTrustResult.success) {
-                                    console.log('Success in Digitrust init');
-                                    if (digiTrustResult.identity && digiTrustResult.identity.id != null) {
-                                        msg = 'DigiTrust Id (encrypted): ' + digiTrustResult.identity.id;
-                                        elem.innerHTML = msg;
-                                        console.log(msg);
-                                    }
-                                    else {
-                                        console.error('Digitrust gave success, but no identity returned');
-                                    }
-                                }
-                                else {
-                                    console.error('Digitrust init failed');
-                                }                            }
-                        },
-                        storage: {
-                            type: "html5",
-                            name: "pbjsdigitrust",
-                            expires: 60
-                        }
-                    }]
-                }
-            });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: sendAdserverRequest
-            });
-        });
-
-        function sendAdserverRequest() {
-            if (pbjs.adserverRequestSent) return;
-            pbjs.adserverRequestSent = true;
-            googletag.cmd.push(function() {
-                pbjs.que.push(function() {
-                    pbjs.setTargetingForGPTAsync();
-                    googletag.pubads().refresh();
-                });
-            });
-        }
-
-        setTimeout(function() {
-            sendAdserverRequest();
-        }, FAILSAFE_TIMEOUT);
-    </script>
-
-    <script>
-        (function () {
-            var gads = document.createElement('script');
-            gads.async = true;
-            gads.type = 'text/javascript';
-            var useSSL = 'https:' == document.location.protocol;
-            gads.src = (useSSL ? 'https:' : 'http:') +
-                '//www.googletagservices.com/tag/js/gpt.js';
-            var node = document.getElementsByTagName('script')[0];
-            node.parentNode.insertBefore(gads, node);
-        })();
-    </script>
-
-    <script>
-        googletag.cmd.push(function() {
-            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
-            googletag.pubads().enableSingleRequest();
-            googletag.enableServices();
-        });
-    </script>
-</head>
-
-<body>
-    <h2>DigiTrust Prebid Full Sample</h2>
-
-
-    <p>
-        This sample shows the simplest integration path for using DigiTrust ID with Prebid.
-        You can use DigiTrust ID without integrating the entire DigiTrust suite.
-    </p>
-
-    <div id="idDiv"></div>
-
-    <div id='test-div'>
-        <script>
-            googletag.cmd.push(function () { googletag.display('test-div'); });
-        </script>
-    </div>
-    <script src="https://cdn.digitru.st/prod/1/digitrust.min.js"></script>
-
-</body>
-</html >
diff --git a/integrationExamples/gpt/digitrust_Simple.html b/integrationExamples/gpt/digitrust_Simple.html
deleted file mode 100644
index 2581c6ce7cc..00000000000
--- a/integrationExamples/gpt/digitrust_Simple.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<html>
-<head>
-    <title>Simple DigiTrust Prebid - No Framework</title>
-
-    <script>
-        (function (window, document) {
-            if (!window.__cmp) {
-                window.__cmp = (function () {
-                    var listen = window.attachEvent || window.addEventListener;
-                    listen('message', function (event) {
-                        window.__cmp.receiveMessage(event);
-                    }, false);
-
-                    function addLocatorFrame() {
-                        if (!window.frames['__cmpLocator']) {
-                            if (document.body) {
-                                var frame = document.createElement('iframe');
-                                frame.style.display = 'none';
-                                frame.name = '__cmpLocator';
-                                document.body.appendChild(frame);
-                            } else {
-                                setTimeout(addLocatorFrame, 5);
-                            }
-                        }
-                    }
-                    addLocatorFrame();
-
-                    var commandQueue = [];
-                    var cmp = function (command, parameter, callback) {
-                        if (command === 'ping') {
-                            if (callback) {
-                                callback({
-                                    gdprAppliesGlobally: !!(window.__cmp && window.__cmp.config && window.__cmp.config.storeConsentGlobally),
-                                    cmpLoaded: false
-                                });
-                            }
-                        } else {
-                            commandQueue.push({
-                                command: command,
-                                parameter: parameter,
-                                callback: callback
-                            });
-                        }
-                    };
-                    cmp.commandQueue = commandQueue;
-                    cmp.receiveMessage = function (event) {
-                        var data = event && event.data && event.data.__cmpCall;
-                        if (data) {
-                            commandQueue.push({
-                                callId: data.callId,
-                                command: data.command,
-                                parameter: data.parameter,
-                                event: event
-                            });
-                        }
-                    };
-                    cmp.config = {
-                        //
-                        // Modify config values here
-                        //
-                        // globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
-                        // customPurposeListLocation: './purposes.json',
-                        // globalConsentLocation: './portal.html',
-                        // storeConsentGlobally: false,
-                        // storePublisherData: false,
-                        logging: 'debug'//,
-                        // localization: {},
-                        // forceLocale: 'en-us'
-                    };
-                    return cmp;
-                }());
-                var t = document.createElement('script');
-                t.async = false;
-                t.src = 'https://acdn.adnxs.com/cmp/cmp.bundle.js';
-                var tag = document.getElementsByTagName('head')[0];
-                tag.appendChild(t);
-            }
-        })(window, document);
-        // window.__cmp('showConsentTool');
-    </script>
-
-    <script>
-        var FAILSAFE_TIMEOUT = 2000;
-
-        var adUnits = [
-            {
-                code: 'test-div',
-                sizes: [[300, 250], [300, 600], [728, 90]],
-                mediaTypes: { banner: { sizes: [400, 600], name: 'testAdUnit'}},
-                bids: [
-                    {
-                        bidder: 'rubicon',
-                        params: {
-                            accountId: '1001',
-                            siteId: '113932',
-                            zoneId: '535510'
-                        }
-                    }
-                ]
-            }
-        ];
-
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-    </script>
-    <script src="../../build/dev/prebid.js" async></script>
-
-    <script>
-        var googletag = googletag || {};
-        googletag.cmd = googletag.cmd || [];
-        googletag.cmd.push(function () {
-            googletag.pubads().disableInitialLoad();
-        });
-
-        pbjs.que.push(function () {
-            pbjs.setConfig({
-                debug: true,
-                consentManagement: {
-                    cmpApi: 'iab',
-                    timeout: 1000,
-                    allowAuctionWithoutConsent: true
-                },
-                usersync: {
-                    userIds: [{
-                        name: "digitrust",
-                        params: {
-                            init: {
-                                member: 'example_member_id',
-                                site: 'example_site_id'
-                            },
-                            callback: function (digiTrustResult) {
-                                // This callback can be used by publisher page to react to error conditions
-                                // Or pass the DigiTrust ID on.
-                                // If the Prebid userId system already has a managed copy of the DigiTrust ID
-                                // this callback will not be invoked.
-                                var elem = document.getElementById('idDiv');
-                                var msg;
-                                if (digiTrustResult.success) {
-                                    console.log('Success in Digitrust init');
-                                    if (digiTrustResult.identity && digiTrustResult.identity.id != null) {
-                                        msg = 'DigiTrust Id (encrypted): ' + digiTrustResult.identity.id;
-                                        elem.innerHTML = msg;
-                                        console.log(msg);
-                                    }
-                                    else {
-                                        console.error('Digitrust gave success, but no identity returned');
-                                    }
-                                }
-                                else {
-                                    console.error('Digitrust init failed');
-                                    if(digiTrustResult.err){
-                                        console.error(digiTrustResult.err);
-                                    }
-                                }
-                            }
-                        },
-                        storage: {
-                            type: "html5",
-                            name: "pbjsdigitrust",
-                            expires: 60
-                        }
-                    }]
-                },
-                userIdTargeting: {
-                    "GAM": true,
-                    "GAM_KEYS": {
-                        "tdid": "TTD_ID" // send tdid as TTD_ID
-                    }
-                }
-            });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: sendAdserverRequest
-            });
-        });
-
-        function sendAdserverRequest() {
-            if (pbjs.adserverRequestSent) return;
-            pbjs.adserverRequestSent = true;
-            googletag.cmd.push(function () {
-                pbjs.que.push(function () {
-                    pbjs.setTargetingForGPTAsync();
-                    googletag.pubads().refresh();
-                });
-            });
-        }
-
-        setTimeout(function () {
-            sendAdserverRequest();
-        }, FAILSAFE_TIMEOUT);
-    </script>
-
-    <script>
-        (function () {
-            var gads = document.createElement('script');
-            gads.async = true;
-            gads.type = 'text/javascript';
-            var useSSL = 'https:' == document.location.protocol;
-            gads.src = (useSSL ? 'https:' : 'http:') +
-                '//www.googletagservices.com/tag/js/gpt.js';
-            var node = document.getElementsByTagName('script')[0];
-            node.parentNode.insertBefore(gads, node);
-        })();
-    </script>
-
-    <script>
-        googletag.cmd.push(function () {
-            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250], [300, 600]], 'test-div').addService(googletag.pubads());
-            googletag.pubads().enableSingleRequest();
-            googletag.enableServices();
-        });
-    </script>
-</head>
-
-<body>
-    <h2>DigiTrust Prebid Sample - No Framework</h2>
-
-    <p>
-        This sample shows the simplest integration path for using DigiTrust ID with Prebid.
-        You can use DigiTrust ID without integrating the entire DigiTrust suite.
-    </p>
-    <div id="idDiv"></div>
-
-    <div id='test-div'>
-        <script>
-            googletag.cmd.push(function () { googletag.display('test-div'); });
-        </script>
-    </div>
-</body>
-</html>
diff --git a/integrationExamples/gpt/digitrust_cmp_test.html b/integrationExamples/gpt/digitrust_cmp_test.html
deleted file mode 100644
index 6f0a70188f3..00000000000
--- a/integrationExamples/gpt/digitrust_cmp_test.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<html>
-<head>
-    <title>CMP Simple DigiTrust Prebid - No Framework</title>
-    <script>
-        (function (window) {
-            window.__cmp = (function () {
-                window.addEventListener('message', function (event) {
-                    window.__cmp.receiveMessage(event);
-                });
-
-                var commandQueue = [];
-                var cmp = function (command, parameter, callback) {
-                    commandQueue.push({
-                        command: command,
-                        parameter: parameter,
-                        callback: callback
-                    });
-                };
-                cmp.commandQueue = commandQueue;
-                cmp.receiveMessage = function (event) {
-                    var data = event && event.data && event.data.__cmpCall;
-                    if (data) {
-                        commandQueue.push({
-                            callId: data.callId,
-                            command: data.command,
-                            parameter: data.parameter,
-                            event: event
-                        });
-                    }
-                };
-                cmp.config = {
-                    customPurposeListLocation: './cmp_files/purposes.json',
-                    globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
-                    globalConsentLocation: 'http://cmp-origin-release.digitru.st/1/docs/portal.html',
-                    storeConsentGlobally: false,
-                    storePublisherConsentGlobally: false,
-                    storePublisherData: true,
-                    layout: 'footer',
-                    logging: "debug",
-                    blockBrowsing: false,
-                    forceLocale: 'en',
-                    testingMode: 'always show',
-                    showFooterAfterSubmit: true,
-                };
-                return cmp;
-            }());
-        })(window);
-
-        window.__cmp('renderCmpIfNeeded');
-    </script>
-
-    <script>
-        var FAILSAFE_TIMEOUT = 2000;
-
-        var adUnits = [
-            {
-                code: 'test-div',
-                sizes: [[300, 250], [300, 600], [728, 90]],
-                mediaTypes: { banner: { sizes: [400, 600], name: 'testAdUnit' } },
-                bids: [
-                    {
-                        bidder: 'rubicon',
-                        params: {
-                            accountId: '1001',
-                            siteId: '113932',
-                            zoneId: '535510'
-                        }
-                    }
-                ]
-            }
-        ];
-
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-    </script>
-    <script src="../../build/dev/prebid.js" async></script>
-
-    <script>
-        var googletag = googletag || {};
-        googletag.cmd = googletag.cmd || [];
-        googletag.cmd.push(function () {
-            googletag.pubads().disableInitialLoad();
-        });
-
-        pbjs.que.push(function () {
-            pbjs.setConfig({
-                debug: true,
-                consentManagement: {
-                    cmpApi: 'iab',
-                    timeout: 1000,
-                    allowAuctionWithoutConsent: true
-                },
-                usersync: {
-                    userIds: [{
-                        name: "digitrust",
-                        params: {
-                            init: {
-                                member: 'example_member_id',
-                                site: 'example_site_id'
-                            },
-                            callback: function (digiTrustResult) {
-                                // This callback can be used by publisher page to react to error conditions
-                                // Or pass the DigiTrust ID on.
-                                // If the Prebid userId system already has a managed copy of the DigiTrust ID
-                                // this callback will not be invoked.
-                                var elem = document.getElementById('idDiv');
-                                var msg;
-                                if (digiTrustResult.success) {
-                                    console.log('Success in Digitrust init');
-                                    if (digiTrustResult.identity && digiTrustResult.identity.id != null) {
-                                        msg = 'DigiTrust Id (encrypted): ' + digiTrustResult.identity.id;
-                                        elem.innerHTML = msg;
-                                        console.log(msg);
-                                    }
-                                    else {
-                                        console.error('Digitrust gave success, but no identity returned');
-                                    }
-                                }
-                                else {
-                                    console.error('Digitrust init failed');
-                                }
-                            }
-                        },
-                        storage: {
-                            type: "html5",
-                            name: "pbjsdigitrust",
-                            expires: 60
-                        }
-                    }]
-                }
-            });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: sendAdserverRequest
-            });
-        });
-
-        function sendAdserverRequest() {
-            if (pbjs.adserverRequestSent) return;
-            pbjs.adserverRequestSent = true;
-            googletag.cmd.push(function () {
-                pbjs.que.push(function () {
-                    pbjs.setTargetingForGPTAsync();
-                    googletag.pubads().refresh();
-                });
-            });
-        }
-
-        setTimeout(function () {
-            sendAdserverRequest();
-        }, FAILSAFE_TIMEOUT);
-    </script>
-
-    <script>
-        (function () {
-            var gads = document.createElement('script');
-            gads.async = true;
-            gads.type = 'text/javascript';
-            var useSSL = 'https:' == document.location.protocol;
-            gads.src = (useSSL ? 'https:' : 'http:') +
-                '//www.googletagservices.com/tag/js/gpt.js';
-            var node = document.getElementsByTagName('script')[0];
-            node.parentNode.insertBefore(gads, node);
-        })();
-    </script>
-
-    <script>
-        googletag.cmd.push(function () {
-            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250], [300, 600]], 'test-div').addService(googletag.pubads());
-            googletag.pubads().enableSingleRequest();
-            googletag.enableServices();
-        });
-    </script>
-</head>
-
-<body>
-    <h2>DigiTrust Prebid Sample - No Framework</h2>
-
-    <p>
-        This sample tests cmp behavior with simple integration path for using DigiTrust ID with Prebid.
-        You can use DigiTrust ID without integrating the entire DigiTrust suite.
-    </p>
-    <div id="idDiv"></div>
-
-    <div id='test-div'>
-        <script>
-            googletag.cmd.push(function () { googletag.display('test-div'); });
-        </script>
-    </div>
-    <script src="https://cmp-origin-release.digitru.st/1/cmp.bundle.js"></script>
-</body>
-</html>
diff --git a/integrationExamples/gpt/esp_example.html b/integrationExamples/gpt/esp_example.html
new file mode 100644
index 00000000000..c39a67243cc
--- /dev/null
+++ b/integrationExamples/gpt/esp_example.html
@@ -0,0 +1,177 @@
+<html>
+
+<head>
+    <link rel="icon" type="image/png" href="/favicon.png">
+    <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
+    <script async src="prebid.js"></script>
+
+    <script>
+        var div_1_sizes = [
+            [300, 250],
+            [300, 600]
+        ];
+        var div_2_sizes = [
+            [728, 90],
+            [970, 250]
+        ];
+        var PREBID_TIMEOUT = 1000;
+        var FAILSAFE_TIMEOUT = 3000;
+        var adUnits = [
+            {
+                code: '/19968336/header-bid-tag-1',
+                mediaTypes: {
+                    banner: {
+                        sizes: div_2_sizes
+                    }
+                },
+                bids: [{
+                    bidder: 'appnexus',
+                    params: {
+                        placementId: 13144370
+                    }
+                }, {
+                    bidder: 'pubmatic',
+                    params: {
+                        publisherId: '5890',
+                        adSlot: '/43743431/DMDemo@728x90:0',
+                        pmzoneid: 'zone1',
+                        lat: '40.712775',
+                        lon: '-74.005973',
+                        yob: '1982',
+                        kadpageurl: 'www.yahoo.com',
+                        gender: 'M',
+                        kadfloor: '1.75',
+                        bcat: ['IAB1-1', 'IAB1-2']
+                    }
+                }]
+            }
+        ];
+
+        // ======== DO NOT EDIT BELOW THIS LINE =========== //
+        var googletag = googletag || {};
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function () {
+            googletag.pubads().disableInitialLoad();
+        });
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+
+        pbjs.que.push(function () {
+            pbjs.addAdUnits(adUnits);
+            pbjs.setConfig({
+                userSync: {
+                    filterSettings: { iframe: { bidders: '*', filter: 'include' } },
+                    enabledBidders: ['pubmatic'],
+                    syncDelay: 3000,
+                    userIds: [{
+                        name: "sharedId",
+                        storage: {
+                            type: "cookie",
+                            name: `_pubcid`,         // create a cookie with this name
+                            expires: 365             // expires in 1 years
+                        }
+                    }, {
+                        name: "criteo",
+                    }, {
+                        name: "pubCommonId",
+                        storage: {
+                            type: "cookie",
+                            name: "_pubcid",         // create a cookie with this name
+                            expires: 365             // expires in 1 years
+                        }
+                    }, {
+                        name: 'hadronId',
+                        storage: {
+                            name: 'hadronId',
+                            type: 'html5'
+                        }
+                    }],
+                    auctionDelay: 0,
+                    encryptedSignalSources: {
+                        // Eids sources for which signals needs to register. 
+                        "sources": [{
+                            source: ['sharedid.org', 'criteo.com', 'pubcid.org', 'audigent.com'],
+                            encrypt: false
+                        }, {
+                            source: ['pubmatic.com'],
+                            //Custom sources can be identified if customFunc is defined
+                            customFunc: () => {
+                                return '{"keywords":["tech","auto"]}';
+                            },
+                            encrypt: true
+                        }, {
+                            source: ['segment.com'],
+                            customFunc: () => {
+                                return '[{ "id": "1", "value": "seg1" },{ "id": "2", "value": "seg2" }]';
+                            },
+                            encrypt: true
+                        }],
+                        // To delay the Registration of function to create encrypted signals 
+                        "registerDelay": 3000
+                    }
+                }
+            });
+            pbjs.requestBids({
+                bidsBackHandler: initAdserver,
+                timeout: PREBID_TIMEOUT
+            });
+        });
+
+
+
+
+        function initAdserver() {
+            if (pbjs.initAdserverSet) return;
+            pbjs.initAdserverSet = true;
+            googletag.cmd.push(function () {
+                pbjs.que.push(function () {
+                    pbjs.setTargetingForGPTAsync();
+                    pbjs.registerSignalSources();
+                    googletag.pubads().refresh();
+                });
+            });
+        }
+        // in case PBJS doesn't load
+        setTimeout(function () {
+            initAdserver();
+        }, FAILSAFE_TIMEOUT);
+
+        googletag.cmd.push(function () {
+            googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
+            googletag.defineSlot('/19968336/header-bid-tag-1', div_2_sizes, 'div-2').addService(googletag.pubads());
+            googletag.enableServices();
+        });
+
+    </script>
+
+</head>
+
+<body>
+    <h2>Basic Prebid.js Example</h2>
+
+    <h5>Div-1</h5>
+    <div id='div-1'>
+        <script type='text/javascript'>
+            googletag.cmd.push(function () {
+                googletag.display('div-1');
+            });
+
+        </script>
+    </div>
+
+    <br>
+
+    <h5>Div-2</h5>
+    <div id='div-2'>
+        <script type='text/javascript'>
+            googletag.cmd.push(function () {
+                googletag.display('div-2');
+            });
+
+        </script>
+    </div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/integrationExamples/gpt/gdpr_hello_world.html b/integrationExamples/gpt/gdpr_hello_world.html
index de0630178f1..c62569cfc4f 100644
--- a/integrationExamples/gpt/gdpr_hello_world.html
+++ b/integrationExamples/gpt/gdpr_hello_world.html
@@ -1,88 +1,24 @@
 <html>
   <head>
-    <script async src="../../build/dev/prebid.js"></script>
-    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
     <script>
-      (function(window, document) {
-          if (!window.__cmp) {
-              window.__cmp = (function() {
-                  var listen = window.attachEvent || window.addEventListener;
-                  listen('message', function(event) {
-                      window.__cmp.receiveMessage(event);
-                  }, false);
-
-                  function addLocatorFrame() {
-                      if (!window.frames['__cmpLocator']) {
-                          if (document.body) {
-                              var frame = document.createElement('iframe');
-                              frame.style.display = 'none';
-                              frame.name = '__cmpLocator';
-                              document.body.appendChild(frame);
-                          } else {
-                              setTimeout(addLocatorFrame, 5);
-                          }
-                      }
-                  }
-                  addLocatorFrame();
-
-                  var commandQueue = [];
-                  var cmp = function(command, parameter, callback) {
-                      if (command === 'ping') {
-                          if (callback) {
-                              callback({
-                                  gdprAppliesGlobally: !!(window.__cmp && window.__cmp.config && window.__cmp.config.storeConsentGlobally),
-                                  cmpLoaded: false
-                              });
-                          }
-                      } else {
-                          commandQueue.push({
-                              command: command,
-                              parameter: parameter,
-                              callback: callback
-                          });
-                      }
-                  }
-                  cmp.commandQueue = commandQueue;
-                  cmp.receiveMessage = function(event) {
-                      var data = event && event.data && event.data.__cmpCall;
-                      if (data) {
-                          commandQueue.push({
-                              callId: data.callId,
-                              command: data.command,
-                              parameter: data.parameter,
-                              event: event
-                          });
-                      }
-                  };
-                  cmp.config = {
-                      //
-                      // Modify config values here
-                      //
-                      // globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
-                      // customPurposeListLocation: './purposes.json',
-                      // globalConsentLocation: './portal.html',
-                      // storeConsentGlobally: false,
-                      // storePublisherData: false,
-                      logging: 'debug',
-                      // localization: {},
-                      // forceLocale: 'en-us'
-                  }
-                  return cmp;
-              }());
-              var t = document.createElement('script');
-              t.async = false;
-              t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js';
-              var tag = document.getElementsByTagName('head')[0];
-              tag.appendChild(t);
-          }
-      })(window, document);
-      window.__cmp('showConsentTool');
-  </script>
+        window._iub = window._iub || {};
+        _iub.csConfiguration = {
+            cookiePolicyId: 417383,
+            siteId: 1,
+            logLevel: 'error',
+            lang: 'en',
+            enableTcf: true,
+        };
+    </script>
+    <script src="//cdn.iubenda.com/cs/tcf/beta/stub.js"></script>
+    <script async src="//cdn.iubenda.com/cs/beta/iubenda_cs.js"></script>
+    <script async src="../../build/dev/prebid.js"></script>
+    <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
 
       <script>
         var PREBID_TIMEOUT = 700;
         var FAILSAFE_TIMEOUT = 2500;
-  
+
         var adUnits = [{
           code: 'div-gpt-ad-1460505748561-0',
           mediaTypes: {
@@ -90,7 +26,7 @@
               sizes: [[300, 250], [300,600]]
             }
           },
-  
+
           // Replace this object to test a new Adapter!
           bids: [{
             bidder: 'appnexus',
@@ -98,21 +34,21 @@
               placementId: 13144370
             }
           }]
-  
+
         }];
-  
+
         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({
@@ -130,7 +66,7 @@
             timeout: PREBID_TIMEOUT
           });
         });
-  
+
         function sendAdserverRequest() {
           if (pbjs.adserverRequestSent) return;
           pbjs.adserverRequestSent = true;
@@ -141,24 +77,25 @@
             });
           });
         }
-  
+
         setTimeout(function() {
            sendAdserverRequest();
            console.log('timeout in main pbjs fired');
         }, FAILSAFE_TIMEOUT);
-  
-      </script>  
+
+      </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'>
diff --git a/integrationExamples/gpt/gpp_us_hello_world.html b/integrationExamples/gpt/gpp_us_hello_world.html
new file mode 100644
index 00000000000..28be86127fc
--- /dev/null
+++ b/integrationExamples/gpt/gpp_us_hello_world.html
@@ -0,0 +1,124 @@
+<!--
+  This page calls a single bidder for a single ad slot. It can be considered a "hello world" example for using
+  Prebid with the Google Publisher Tag.
+  It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
+  bids array inside the adUnits, and it will use your adapter to load an ad.
+  NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
+  set an alias in your /etc/hosts file so that you can load this page from a different domain.
+-->
+
+<html>
+
+<head>
+    <script type="text/javascript" data-cmp-ab="1" src="https://cdn.consentmanager.net/delivery/semiautomatic.js" 
+    data-cmp-cdid="599af61faf55" data-cmp-host="delivery.consentmanager.net" data-cmp-cdn="cdn.consentmanager.net" data-cmp-codesrc="1"></script>
+
+
+  <script async src="../../build/dev/prebid.js"></script>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script>
+    var FAILSAFE_TIMEOUT = 3300;
+    var PREBID_TIMEOUT = 1000;
+
+    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
+        }
+      }]
+
+    }];
+
+    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'],
+              filter: 'include'
+            }
+          }
+        }
+      })
+      pbjs.setConfig({
+        consentManagement: {
+          gpp: {
+            cmpApi: 'iab',
+            timeout: 5000
+          },
+          usp: {
+            cmpApi: 'static',
+            consentData: {
+              getUSPData: {
+                uspString: '1YYY'
+              }
+            }
+          }
+        }
+      })
+      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();
+        });
+      });
+    }
+
+    setTimeout(function () {
+      sendAdserverRequest();
+    }, FAILSAFE_TIMEOUT);
+
+  </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>
+  <!-- <button onclick="googletag.cmd.push(function () {googletag.pubads().refresh();});">Refresh GAM</button> -->
+  <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/integrationExamples/gpt/gpp_us_hello_world_iframe.html b/integrationExamples/gpt/gpp_us_hello_world_iframe.html
new file mode 100644
index 00000000000..c0a62f9d72e
--- /dev/null
+++ b/integrationExamples/gpt/gpp_us_hello_world_iframe.html
@@ -0,0 +1,12 @@
+<!-- start a locally ran server under a different port than 9999 and run gulp serve.
+  load this page from the local server to properly replicate loading prebid.js within a 3rd party iframe -->
+<html>
+<head>
+  <script type="text/javascript" data-cmp-ab="1" src="https://cdn.consentmanager.net/delivery/autoblocking/599af61faf55.js" 
+      data-cmp-host="delivery.consentmanager.net" data-cmp-cdn="cdn.consentmanager.net" data-cmp-codesrc="1"></script>
+</head>
+<body>
+  <iframe style="width: 100%; height: 100%;" src="http://test.localhost:9999/integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html"></iframe>
+</body>
+</html>
+
diff --git a/integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html b/integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html
new file mode 100644
index 00000000000..8c2096d614d
--- /dev/null
+++ b/integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html
@@ -0,0 +1,140 @@
+<!--
+  This page calls a single bidder for a single ad slot. It can be considered a "hello world" example for using
+  Prebid with the Google Publisher Tag.
+  It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
+  bids array inside the adUnits, and it will use your adapter to load an ad.
+  NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
+  set an alias in your /etc/hosts file so that you can load this page from a different domain.
+-->
+
+<html>
+
+<head>
+  <script async src="../../build/dev/prebid.js"></script>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script>
+    var FAILSAFE_TIMEOUT = 3300;
+    var PREBID_TIMEOUT = 1000;
+
+    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
+        }
+      }]
+
+    }];
+
+    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'],
+              filter: 'include'
+            }
+          }
+        }
+      })
+      pbjs.setConfig({
+        debug: true,
+        consentManagement: {
+          gpp: {
+            cmpApi: 'iab',
+            timeout: 5000
+          },
+          usp: {
+            cmpApi: 'static',
+            consentData: {
+              getUSPData: {
+                uspString: '1YYY'
+              }
+            }
+          }
+        }
+      })
+      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();
+        });
+      });
+    }
+
+    // setTimeout(function () {
+    //   sendAdserverRequest();
+    // }, FAILSAFE_TIMEOUT);
+
+  </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>
+  <!-- <button onclick="pbjs.que.push(function() {pbjs.setConfig({
+    consentManagement: {
+      gpp: {
+        cmpApi: 'iab',
+        timeout: 5000
+      },
+      usp: {
+        cmpApi: 'static',
+        consentData: {
+          getUSPData: {
+            uspString: '1YYY'
+          }
+        }
+      }
+    }
+  });
+  pbjs.requestBids({
+    bidsBackHandler: sendAdserverRequest,
+    timeout: PREBID_TIMEOUT
+  });})">Start Auction</button> -->
+  <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/integrationExamples/gpt/growthcode.html b/integrationExamples/gpt/growthcode.html
new file mode 100644
index 00000000000..ede51d2d869
--- /dev/null
+++ b/integrationExamples/gpt/growthcode.html
@@ -0,0 +1,134 @@
+<!--
+  GrowthCode Setup Example contact support@growthcode.io for more information.
+-->
+
+<html>
+<head>
+  <script async src="../../build/dev/prebid.js"></script>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script>
+    var FAILSAFE_TIMEOUT = 3300;
+    var PREBID_TIMEOUT = 1000;
+
+    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
+        }
+      }],
+    }];
+
+    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.requestBids({
+        bidsBackHandler: sendAdserverRequest,
+        timeout: PREBID_TIMEOUT
+      });
+      pbjs.enableAnalytics({
+        provider: 'growthCodeAnalytics',
+        options: {
+          pid: 'TEST01',
+          trackEvents: [
+            'auctionInit',
+            'auctionEnd',
+            'bidAdjustment',
+            'bidTimeout',
+            'bidTimeout',
+            'bidRequested',
+            'bidResponse',
+            'setTargeting',
+            'requestBids',
+            'addAdUnits',
+            'noBid',
+            'bidWon',
+            'bidderDone']
+        }
+      });
+      pbjs.setConfig({
+        debugging: {
+          enabled: true,
+          bids: [{
+            bidder: 'appnexus',
+            adUnitCode: '/19968336/header-bid-tag-0',
+            cpm: 1.5,
+            adId: '111111',
+            ad: '<html><body><img src="https://files.prebid.org/creatives/prebid300x250.png"></body></html>'
+          }]
+        },
+        userSync: {
+          userIds: [{
+            name: "sharedId",
+            storage: {
+              type: "html5",
+              name: "_sharedID",         // create a cookie with this name
+              expires: 365             // expires in 1 years
+            }
+          },{
+            name: 'growthCodeId',
+            params: {
+              pid: 'TEST01',
+              publisher_id: '_sharedID',
+              publisher_id_storage: 'html5',
+            }
+          }]
+        }
+      });
+    });
+
+    function sendAdserverRequest() {
+      if (pbjs.adserverRequestSent) return;
+      pbjs.adserverRequestSent = true;
+      googletag.cmd.push(function() {
+        pbjs.que.push(function() {
+          pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    setTimeout(function() {
+      sendAdserverRequest();
+    }, FAILSAFE_TIMEOUT);
+
+  </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>
diff --git a/integrationExamples/gpt/hadronRtdProvider_example.html b/integrationExamples/gpt/hadronRtdProvider_example.html
new file mode 100644
index 00000000000..f90ce21921c
--- /dev/null
+++ b/integrationExamples/gpt/hadronRtdProvider_example.html
@@ -0,0 +1,123 @@
+<html>
+<head>
+    <script>
+      var testHadronId = "030tstezbb07jv2yg08xizqr0bwpa0c0evvmq00eivtcg0nc9v970ntek210qskvk40trr7270wqxik90zq3u2d12pa5j3137rx2918nmsj905vat8b1elzfjf1hl5r1i1kkc2jl";
+      window.localStorage.setItem('auHadronId', testHadronId);
+    </script>
+
+    <script>
+        var FAILSAFE_TIMEOUT = 2000;
+
+        var adUnits = [
+            {
+                code: 'test-div',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300,250],[300,600],[728,90]]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'appnexus',
+                        params: {
+                            placementId: 13144370
+                        }
+                    }
+                ]
+            }
+        ];
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+    </script>
+    <script src="../../build/dev/prebid.js" async></script>
+
+    <script>
+        var googletag = googletag || {};
+        var testAuctionDelay = 2000;
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function() {
+            googletag.pubads().disableInitialLoad();
+        });
+
+        pbjs.que.push(function() {
+            pbjs.setConfig({
+                debug: true,
+                realTimeData: {
+                    auctionDelay: testAuctionDelay, // lower in real scenario to meet publisher spec
+                    dataProviders: [
+                        {
+                            name: "hadron",
+                            waitForIt: true,
+                            params: {
+                                segmentCache: false,
+                                requestParams: {
+                                    publisherId: 0
+                                }
+                            }
+
+                        }
+                    ]
+                }
+            });
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({bidsBackHandler: sendAdserverRequest});
+        });
+
+        function sendAdserverRequest() {
+            document.getElementById('audigent_segments').innerHTML = window.localStorage.getItem('auHadronRtd');
+            document.getElementById('hadron_id').innerHTML = testHadronId;
+
+            if (pbjs.adserverRequestSent) return;
+            pbjs.adserverRequestSent = true;
+            googletag.cmd.push(function() {
+                pbjs.que.push(function() {
+                    pbjs.setTargetingForGPTAsync();
+                    googletag.pubads().refresh();
+                });
+            });
+        }
+
+        setTimeout(function() {
+            sendAdserverRequest();
+        }, FAILSAFE_TIMEOUT);
+    </script>
+
+    <script>
+        (function () {
+            var gads = document.createElement('script');
+            gads.async = true;
+            gads.type = 'text/javascript';
+            gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
+            var node = document.getElementsByTagName('script')[0];
+            node.parentNode.insertBefore(gads, node);
+        })();
+    </script>
+
+    <script>
+        googletag.cmd.push(function() {
+            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
+            googletag.pubads().enableSingleRequest();
+            googletag.enableServices();
+        });
+    </script>
+</head>
+
+<body>
+<h2>Hadron RTD Prebid</h2>
+
+<div id='test-div'>
+    <script>
+        googletag.cmd.push(function() { googletag.display('test-div'); });
+    </script>
+</div>
+
+Hadron Id:
+<div id='hadron_id'>
+</div>
+
+Hadron Real-Time Data:
+<div id='audigent_segments'>
+</div>
+</body>
+</html>
diff --git a/integrationExamples/gpt/idImportLibrary_example.html b/integrationExamples/gpt/idImportLibrary_example.html
new file mode 100644
index 00000000000..363e8015f53
--- /dev/null
+++ b/integrationExamples/gpt/idImportLibrary_example.html
@@ -0,0 +1,342 @@
+<html>
+<head>
+    <script>
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+    </script>
+    <script src="../../build/dev/prebid.js" async></script>
+
+    <script>
+      var googletag = googletag || {};
+      googletag.cmd = googletag.cmd || [];
+      googletag.cmd.push(function() {
+        googletag.pubads().disableInitialLoad();
+      });
+
+      pbjs.que.push(function() {
+        pbjs.setConfig({
+          debug: true,
+          consentManagement: {
+            cmpApi: 'iab',
+            timeout: 1000,
+            defaultGdprScope: true
+          },
+          userSync: {
+            userIds: [
+              {
+                name: "id5Id",
+                params: {
+                  partner: 173 //Set your real ID5 partner ID here for production, please ask for one at http://id5.io/prebid
+                },
+                storage: {
+                  type: "html5",
+                  name: "id5id",
+                  expires: 90,
+                  refreshInSeconds: 8*3600 // Refresh frequency of cookies, defaulting to 'expires'
+                },
+
+              }, {
+                name: "pubCommonId",
+                storage: {
+                  type: "html5",
+                  name: "pubcid",
+                  expires: 365
+                },
+              },  {
+                name: 'identityLink',
+                params: {
+                  pid: '14', // Set your real identityLink placement ID here
+                  // notUse3P: true // true/false - If you do not want to use 3P endpoint to retrieve envelope. If you do not set this property to true, 3p endpoint will be fired. By default this propertt is undefined and 3p request will be fired.},
+                },
+                storage: {
+                  type: 'html5',
+                  name: 'idl_env',
+                  expires: 30
+                }
+              },
+               {
+                name: "liveIntentId",
+                params: {
+                  publisherId: "9896876"
+                },
+                storage: {
+                  type: "cookie",
+                  name: "_li_pbid",
+                  expires: 28
+                }
+              },
+              {
+                name: "zeotapIdPlus"
+              },
+              {
+                name: 'hadronId',
+                storage: {
+                  type: "html5",
+                  name: "hadronId",
+                  expires: 28
+                }
+              }, {
+                name: "merkleId",
+                params: {
+                  ptk: '12345678-aaaa-bbbb-cccc-123456789abc', //Set your real merkle partner key here
+                  pubid: 'EXAMPLE' //Set your real merkle publisher id here
+                },
+                storage: {
+                  type: "html5",
+                  name: "merkleId",
+                  expires: 30
+                },
+
+              },{
+                name: "unifiedId",
+                params: {
+                  partner: "prebid",
+                  url: "http://match.adsrvr.org/track/rid?ttd_pid=prebid&fmt=json"
+                },
+                storage: {
+                  type: "html5",
+                  name: "unifiedid",
+                  expires: 30
+                },
+              },{
+                name: "parrableId",
+                params: {
+                  // change to Parrable Partner Client ID(s) you received from the Parrable Partners you are using
+                  partner: '30182847-e426-4ff9-b2b5-9ca1324ea09b'
+                }
+              },{
+                name: "criteo"
+              }
+            ],
+            syncDelay: 5000,
+            auctionDelay: 1000
+          }
+        });
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({
+          bidsBackHandler: sendAdserverRequest
+        });
+      });
+
+      function sendAdserverRequest() {
+        if (pbjs.adserverRequestSent) return;
+        pbjs.adserverRequestSent = true;
+        googletag.cmd.push(function() {
+          pbjs.que.push(function() {
+            pbjs.setTargetingForGPTAsync();
+            googletag.pubads().refresh();
+          });
+        });
+      }
+      var FAILSAFE_TIMEOUT = 2000;
+
+      setTimeout(function() {
+        sendAdserverRequest();
+      }, FAILSAFE_TIMEOUT);
+    </script>
+
+    <script>
+      googletag.cmd.push(function() {
+        googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+      });
+      pbjs.que.push(function() {
+        pbjs.setConfig({
+          idImportLibrary:{
+            url: 'http://localhost:8090/sync'
+          },
+        });
+      });
+    </script>
+</head>
+
+<style>
+    body {font-family: Arial, Helvetica, sans-serif;}
+
+    /* Full-width input fields */
+    input[type=text], input[type=password] {
+        width: 100%;
+        padding: 12px 20px;
+        margin: 8px 0;
+        display: inline-block;
+        border: 1px solid #ccc;
+        box-sizing: border-box;
+    }
+
+    /* Set a style for all buttons */
+    button {
+        background-color: #4CAF50;
+        color: white;
+        padding: 14px 20px;
+        margin: 8px 0;
+        border: none;
+        cursor: pointer;
+        width: 100%;
+    }
+
+    button:hover {
+        opacity: 0.8;
+    }
+
+    /* Extra styles for the cancel button */
+    .cancelbtn {
+        width: auto;
+        padding: 10px 18px;
+        background-color: #f44336;
+    }
+
+    /* Center the image and position the close button */
+    .imgcontainer {
+        text-align: center;
+        margin: 24px 0 12px 0;
+        position: relative;
+    }
+
+    img.avatar {
+        width: 40%;
+        border-radius: 50%;
+    }
+
+    .container {
+        padding: 16px;
+    }
+
+    span.psw {
+        float: right;
+        padding-top: 16px;
+    }
+
+    /* The Modal (background) */
+    .modal {
+        display: none; /* Hidden by default */
+        position: fixed; /* Stay in place */
+        z-index: 1; /* Sit on top */
+        left: 0;
+        top: 0;
+        width: 100%; /* Full width */
+        height: 100%; /* Full height */
+        overflow: auto; /* Enable scroll if needed */
+        background-color: rgb(0,0,0); /* Fallback color */
+        background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+        padding-top: 60px;
+    }
+
+    /* Modal Content/Box */
+    .modal-content {
+        background-color: #fefefe;
+        margin: 5% auto 15% auto; /* 5% from the top, 15% from the bottom and centered */
+        border: 1px solid #888;
+        width: 80%; /* Could be more or less, depending on screen size */
+    }
+
+    /* The Close Button (x) */
+    .close {
+        position: absolute;
+        right: 25px;
+        top: 0;
+        color: #000;
+        font-size: 35px;
+        font-weight: bold;
+    }
+
+    .close:hover,
+    .close:focus {
+        color: red;
+        cursor: pointer;
+    }
+
+    /* Add Zoom Animation */
+    .animate {
+        -webkit-animation: animatezoom 0.6s;
+        animation: animatezoom 0.6s
+    }
+
+    @-webkit-keyframes animatezoom {
+        from {-webkit-transform: scale(0)}
+        to {-webkit-transform: scale(1)}
+    }
+
+    @keyframes animatezoom {
+        from {transform: scale(0)}
+        to {transform: scale(1)}
+    }
+
+    /* Change styles for span and cancel button on extra small screens */
+    @media screen and (max-width: 200px) {
+        span.psw {
+            display: block;
+            float: none;
+        }
+        .cancelbtn {
+            width: 100%;
+        }
+    }
+    table, th, td {
+        border: 1px solid black;
+        border-collapse: collapse;
+    }
+    th, td {
+        padding: 5px;
+    }
+    th {
+        text-align: left;
+    }
+</style>
+</head>
+<body>
+<img src="https://prebid.org/wp-content/uploads/2021/02/Prebid-Logo-RGB-Full-Color-Medium.svg" alt="Prebid" class="logo-img" data-no-retina="data-no-retina" width="150" data-no-lazy="1">
+
+<h2 style="color:#ff6f00;" >ID Import Library Example</h2>
+<h4> Steps before logging in:</h4>
+
+<ul style="font-size:18px;font-family:'Courier New'">
+    <li>Open console
+        <ul style="font-size:15px;font-family:'Courier New'">
+            <li>For Mac, Command+Option+J</li>
+            <li>Windows/Linux,	Control+Shift+J</li>
+        </ul>
+    </li>
+    <li>Search for 'ID-Library' in console</li>
+</ul>
+
+<button onclick="document.getElementById('id01').style.display='block'" style="width:auto;">Login</button>
+
+<div id="id01" class="modal">
+
+    <form class="modal-content animate">
+
+        <div class="container">
+            <label ><b>Username/Email</b></label>
+            <input type="text" placeholder="Enter Username/Email" name="uname" required>
+
+            <label ><b>Password</b></label>
+            <input type="password" placeholder="Enter Password" name="psw" required>
+
+            <button type="submit">Login</button>
+            <label>
+                <input type="checkbox" checked="checked" name="remember"> Remember me
+            </label>
+        </div>
+
+        <div class="container" style="background-color:#f1f1f1">
+            <button type="button" onclick="document.getElementById('id01').style.display='none'" class="cancelbtn">Cancel</button>
+            <span class="psw">Forgot <a href="#">password?</a></span>
+        </div>
+    </form>
+</div>
+
+<script>
+  // Get the modal
+  var modal = document.getElementById('id01');
+
+  // When the user clicks anywhere outside of the modal, close it
+  window.onclick = function(event) {
+    if (event.target == modal) {
+      modal.style.display = "none";
+    }
+  }
+</script>
+
+</body>
+</html>
diff --git a/integrationExamples/gpt/idward_segments_example.html b/integrationExamples/gpt/idward_segments_example.html
new file mode 100644
index 00000000000..9bc06124c77
--- /dev/null
+++ b/integrationExamples/gpt/idward_segments_example.html
@@ -0,0 +1,112 @@
+<html>
+<head>
+    <script async src="../../build/dev/prebid.js"></script>
+    <script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
+    <script>
+        var FAILSAFE_TIMEOUT = 3300;
+        var PREBID_TIMEOUT = 2000;
+
+        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: 'pubmatic',
+                params: {
+                    publisherId: '156276',         // required
+                    adSlot: 'pubmatic_test',       // required
+                }
+            }
+            ]
+
+        }];
+
+        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.setConfig({
+              debugging: {
+                    enabled: true
+                },
+              ortb2: {
+                user: {
+                  data: [
+                    // ID Ward segment taxonomy inserted here
+                  ]
+                },
+              },
+              realTimeData: {
+                dataProviders: [
+                  {
+                    name: "idWard",                    
+                    params: {
+                      cohortStorageKey: "cohort_ids",
+                      
+                    }
+                  }
+                ]
+              }
+            });
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({
+                bidsBackHandler: sendAdserverRequest,
+                timeout: PREBID_TIMEOUT
+            });
+
+            document.getElementById( "user-segments" ).innerHTML = JSON.stringify( pbjs.getConfig('ortb2') );
+        });
+
+        function sendAdserverRequest() {
+            if (pbjs.adserverRequestSent) return;
+            pbjs.adserverRequestSent = true;
+            googletag.cmd.push(function() {
+                pbjs.que.push(function() {
+                    pbjs.setTargetingForGPTAsync();
+                    googletag.pubads().refresh();
+                });
+            });
+        }
+
+        setTimeout(function() {
+            sendAdserverRequest();
+        }, FAILSAFE_TIMEOUT);
+
+    </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>
+
+                              <script>!function(a){var e="https://s.go-mpulse.net/boomerang/",t="addEventListener";if("False"=="True")a.BOOMR_config=a.BOOMR_config||{},a.BOOMR_config.PageParams=a.BOOMR_config.PageParams||{},a.BOOMR_config.PageParams.pci=!0,e="https://s2.go-mpulse.net/boomerang/";if(window.BOOMR_API_key="5G3ZS-8L7PG-U23WM-5CA4K-LQ3YP",function(){function n(e){a.BOOMR_onload=e&&e.timeStamp||(new Date).getTime()}if(!a.BOOMR||!a.BOOMR.version&&!a.BOOMR.snippetExecuted){a.BOOMR=a.BOOMR||{},a.BOOMR.snippetExecuted=!0;var i,_,o,r=document.createElement("iframe");if(a[t])a[t]("load",n,!1);else if(a.attachEvent)a.attachEvent("onload",n);r.src="javascript:void(0)",r.title="",r.role="presentation",(r.frameElement||r).style.cssText="width:0;height:0;border:0;display:none;",o=document.getElementsByTagName("script")[0],o.parentNode.insertBefore(r,o);try{_=r.contentWindow.document}catch(O){i=document.domain,r.src="javascript:var d=document.open();d.domain='"+i+"';void(0);",_=r.contentWindow.document}_.open()._l=function(){var a=this.createElement("script");if(i)this.domain=i;a.id="boomr-if-as",a.src=e+"5G3ZS-8L7PG-U23WM-5CA4K-LQ3YP",BOOMR_lstart=(new Date).getTime(),this.body.appendChild(a)},_.write("<bo"+'dy onload="document._l();">'),_.close()}}(),"".length>0)if(a&&"performance"in a&&a.performance&&"function"==typeof a.performance.setResourceTimingBufferSize)a.performance.setResourceTimingBufferSize();!function(){if(BOOMR=a.BOOMR||{},BOOMR.plugins=BOOMR.plugins||{},!BOOMR.plugins.AK){var e=""=="true"?1:0,t="",n="ghh4w4yxem66iyi6ijxa-f-a8f1ed317-clientnsv4-s.akamaihd.net",i="false"=="true"?2:1,_={"ak.v":"32","ak.cp":"540505","ak.ai":parseInt("351538",10),"ak.ol":"0","ak.cr":17,"ak.ipv":4,"ak.proto":"http/1.1","ak.rid":"322de403","ak.r":36326,"ak.a2":e,"ak.m":"dscx","ak.n":"essl","ak.bpcip":"49.207.203.0","ak.cport":5172,"ak.gh":"23.47.149.85","ak.quicv":"","ak.tlsv":"tls1.2","ak.0rtt":"","ak.csrc":"-","ak.acc":"bbr","ak.t":"1629373038","ak.ak":"hOBiQwZUYzCg5VSAfCLimQ==admFPBlxVf0VKeanKFKUThzq+or23aIaVFP5DBXpeOGEuvD5mQz0UZbvK242Y8cupS91bsNaM7uJT3/O00EszGTxlFhkv439YkTWfyegvqVlJhcrZ7jcRkIoyrmjoBqDZoF0WaG4rhwmNzkKEv6T1noRYwEWwRHOG8p7osPXWy5as6KkmhOYUiYk8S5hQj+HFzhYI5YUTx+8urmHdpVIDBkramcrT2V89mb0cH5L2bSGS2hahAA3Kkf+0Dul7r5hDFQaVTf17e4oKdM1G8cKVF5LGRxRl3v4Rn6tBJ+fjrJ7XYQWV30w1LPwcAmSfRX8iTCK4xzHwG1fwDFHb5tWVsxHeEkRgNN3/KhnrCjxKtaROjJeWypJf/rjn1HWHwy7uVVsP9f/HRN3drCCkEvJBmu6yi0jzFFCoeEkbUEoq+8=","ak.pv":"396","ak.dpoabenc":"","ak.tf":i};if(""!==t)_["ak.ruds"]=t;var o={i:!1,av:function(e){var t="http.initiator";if(e&&(!e[t]||"spa_hard"===e[t]))_["ak.feo"]=void 0!==a.aFeoApplied?1:0,BOOMR.addVar(_)},rv:function(){var a=["ak.bpcip","ak.cport","ak.cr","ak.csrc","ak.gh","ak.ipv","ak.m","ak.n","ak.ol","ak.proto","ak.quicv","ak.tlsv","ak.0rtt","ak.r","ak.acc","ak.t","ak.tf"];BOOMR.removeVar(a)}};BOOMR.plugins.AK={akVars:_,akDNSPreFetchDomain:n,init:function(){if(!o.i){var a=BOOMR.subscribe;a("before_beacon",o.av,null,null),a("onbeacon",o.rv,null,null),o.i=!0}return this},is_complete:function(){return!0}}}}()}(window);</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>
+<h5>First Party Data (ortb2) Sent to Bidding Adapter</h5>
+<div id="user-segments"></div>
+</body>
+</html>
diff --git a/integrationExamples/gpt/imRtdProvider_example.html b/integrationExamples/gpt/imRtdProvider_example.html
new file mode 100644
index 00000000000..b98f053047b
--- /dev/null
+++ b/integrationExamples/gpt/imRtdProvider_example.html
@@ -0,0 +1,115 @@
+<html>
+<head>
+    <script>
+        var FAILSAFE_TIMEOUT = 2000;
+
+        var adUnits = [
+            {
+                code: 'test-div',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300,250],[300,600],[728,90]]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'appnexus',
+                        params: {
+                            placementId: 13144370
+                        }
+                    }
+                ]
+            }
+        ];
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+    </script>
+    <script src="../../build/dev/prebid.js" async></script>
+
+    <script>
+        var googletag = googletag || {};
+        var testAuctionDelay = 2000;
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function() {
+            googletag.pubads().disableInitialLoad();
+        });
+
+        pbjs.que.push(function() {
+            pbjs.setConfig({
+                debug: true,
+                realTimeData: {
+                    auctionDelay: testAuctionDelay, // lower in real scenario to meet publisher spec
+                    dataProviders: [
+                        {
+                            name: "im",
+                            waitForIt: true,
+                            params: {
+                                cid: 5126
+                            }
+
+                        }
+                    ]
+                }
+            });
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({bidsBackHandler: sendAdserverRequest});
+        });
+
+        function sendAdserverRequest() {
+            document.getElementById('imuid').innerHTML = window.localStorage.getItem('__im_uid');
+            document.getElementById('im_segments').innerHTML = window.localStorage.getItem('__im_sids');
+
+            if (pbjs.adserverRequestSent) return;
+            pbjs.adserverRequestSent = true;
+            googletag.cmd.push(function() {
+                pbjs.que.push(function() {
+                    pbjs.setTargetingForGPTAsync();
+                    googletag.pubads().refresh();
+                });
+            });
+        }
+
+        setTimeout(function() {
+            sendAdserverRequest();
+        }, FAILSAFE_TIMEOUT);
+    </script>
+
+    <script>
+        (function () {
+            var gads = document.createElement('script');
+            gads.async = true;
+            gads.type = 'text/javascript';
+            var useSSL = 'https:' == document.location.protocol;
+            gads.src = (useSSL ? 'https:' : 'http:') +
+                '//www.googletagservices.com/tag/js/gpt.js';
+            var node = document.getElementsByTagName('script')[0];
+            node.parentNode.insertBefore(gads, node);
+        })();
+    </script>
+
+    <script>
+        googletag.cmd.push(function () {
+            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250], [300, 600], [728, 90]], 'test-div').addService(googletag.pubads());
+            googletag.pubads().enableSingleRequest();
+            googletag.enableServices();
+        });
+    </script>
+</head>
+
+<body>
+<h2>IM RTD Prebid</h2>
+
+<div id='test-div'>
+    <script>
+        googletag.cmd.push(function() { googletag.display('test-div'); });
+    </script>
+</div>
+
+Intimate Merger Universal Identifier:
+<div id='imuid'></div>
+
+Intimate Merger Real-Time Data:
+<div id='im_segments'></div>
+</body>
+</html>
diff --git a/integrationExamples/gpt/inskin_example.html b/integrationExamples/gpt/inskin_example.html
index 197a5b1ffe1..45fd448cf48 100644
--- a/integrationExamples/gpt/inskin_example.html
+++ b/integrationExamples/gpt/inskin_example.html
@@ -72,9 +72,7 @@
           var gads = document.createElement('script');
           gads.async = true;
           gads.type = 'text/javascript';
-          var useSSL = 'https:' == document.location.protocol;
-          gads.src = (useSSL ? 'https:' : 'http:') +
-            '//www.googletagservices.com/tag/js/gpt.js';
+          gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
           var node = document.getElementsByTagName('script')[0];
           node.parentNode.insertBefore(gads, node);
         })();
diff --git a/integrationExamples/gpt/ixMultiFormat.html b/integrationExamples/gpt/ixMultiFormat.html
new file mode 100644
index 00000000000..c4ed5bb9b1e
--- /dev/null
+++ b/integrationExamples/gpt/ixMultiFormat.html
@@ -0,0 +1,117 @@
+<!--
+  This page calls a single bidder for a single ad slot.
+  It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
+  bids array inside the adUnits, and it will use your adapter to load an ad.
+  NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
+  set an alias in your /etc/hosts file so that you can load this page from a different domain.
+-->
+
+<html>
+
+<head>
+    <script async src="../../build/dist/prebid.js"></script>
+    <script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
+    <script>
+        var FAILSAFE_TIMEOUT = 3300;
+        var PREBID_TIMEOUT = 1000;
+        var adUnits = [{
+            code: 'div-gpt-ad-51545-0',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250], [600, 500]]
+                },
+                video: {
+                    playerSize : [300,250],
+                    mimes :  ["video/x-ms-wmv", "video/mp4"],
+                    minduration : 0,
+                    maxduration: 3,
+                    protocols : [1,2]
+                }
+            },
+            // Replace this object to test a new Adapter!
+            bids: [{
+                bidder: 'ix',
+                params: {
+                    // only siteId required
+                    siteId: '300'
+                }
+            }]
+        }];
+        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({
+                floors: {
+                    enforcement: {
+                        floorDeals: false, //default to false
+                        bidAdjustment: true
+                    },
+                    data: {     // default if endpoint doesn't return in time
+                        currency: 'USD',
+                        skipRate: 5,
+                        modelVersion: 'BlackBerryZap',
+                        schema: {
+                            fields: ['gptSlot', 'mediaType', 'size']
+                        },
+                        values: {
+                            '*|banner|600x500': 6.5,
+                            '*|banner|300x250': 3.25,
+                            '*|video': 3.5
+                        }
+                    }
+                }
+            });
+            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();
+                });
+            });
+        }
+
+        setTimeout(function () {
+            sendAdserverRequest();
+        }, FAILSAFE_TIMEOUT);
+
+    </script>
+
+    <script>
+        googletag.cmd.push(function () {
+            googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-51545-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-51545-0'>
+        <script type='text/javascript'>
+            googletag.cmd.push(function () { googletag.display('div-gpt-ad-51545-0'); });
+        </script>
+    </div>
+</body>
+
+</html>
+
diff --git a/integrationExamples/gpt/jwplayerRtdProvider_example.html b/integrationExamples/gpt/jwplayerRtdProvider_example.html
new file mode 100644
index 00000000000..41c27b70ece
--- /dev/null
+++ b/integrationExamples/gpt/jwplayerRtdProvider_example.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <script async src="../../build/dev/prebid.js"></script>
+    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+    <meta charset="UTF-8">
+    <title>JW Player RTD Provider Example</title>
+    <script>
+      var FAILSAFE_TIMEOUT = 3300;
+      var PREBID_TIMEOUT = 1000;
+
+      var adUnits = [{
+          code: 'div-gpt-ad-1460505748561-0',
+          ortb2Imp: {
+              ext: {
+                  data: {
+                      jwTargeting: {
+                          // Note: the following Ids are placeholders and should be replaced with your Ids.
+                          playerID: '123',
+                          mediaID: 'abc'
+                      }
+                  }
+              }
+          },
+          mediaTypes: {
+              banner: {
+                  sizes: [[300, 250], [300,600]],
+              }
+          },
+          // Replace this object to test a new Adapter!
+          bids: [{
+              bidder: 'appnexus',
+              params: {
+                  placementId: 13144370
+              }
+          }]
+      }];
+
+      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.setConfig({
+          realTimeData: {
+            auctionDelay: 100,
+            dataProviders: [{
+              name: "jwplayer",
+              waitForIt: true,
+              params: {
+                // Note: the following media Ids are placeholders and should be replaced with your Ids.
+                mediaIDs: ['abc', 'def', 'ghi', 'jkl']
+              }
+            }]
+          }
+        });
+        pbjs.addAdUnits(adUnits);
+        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();
+          });
+        });
+      }
+
+      setTimeout(function() {
+        sendAdserverRequest();
+      }, FAILSAFE_TIMEOUT);
+
+    </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>
+<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>
diff --git a/integrationExamples/gpt/mgidRtdProvider_example.html b/integrationExamples/gpt/mgidRtdProvider_example.html
new file mode 100644
index 00000000000..e3e4f720586
--- /dev/null
+++ b/integrationExamples/gpt/mgidRtdProvider_example.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
+<script>
+      window.googletag = window.googletag || { cmd: [] };
+      googletag.cmd.push(function () {
+        googletag.defineSlot('/46380388/herbeauty_prebid', [[320, 100], [950, 90], [1024, 768], [120, 600], [300, 75], [970, 66], [300, 50], [300, 31], [320, 480], [750, 200], 'fluid', [250, 250], [250, 360], [120, 90], [1, 1], [292, 30], [300, 100], [768, 1024], [88, 31], [200, 200], [300, 600], [300, 1050], [960, 90], [125, 125], [180, 150], [970, 250], [168, 28], [980, 120], [120, 20], [120, 240], [480, 320], [468, 60], [120, 30], [120, 60], [750, 300], [930, 180], [728, 90], [168, 42], [980, 90], [320, 50], [750, 100], [200, 446], [336, 280], [300, 250], [580, 400], [970, 90], [160, 600]], 'div-gpt-ad-1660208650016-0').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+      });
+    </script>
+<link rel="icon" type="image/png" href="/favicon.png">
+<script src="../../build/dev/prebid.js" async></script>
+<script>
+      var sizes = [
+        [300, 250]
+      ];
+      var PREBID_TIMEOUT = 1000;
+      var FAILSAFE_TIMEOUT = 3000;
+      var adUnits = [{
+        code: '/46380388/herbeauty_prebid',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 100], [950, 90], [1024, 768], [120, 600], [300, 75], [970, 66], [300, 50], [300, 31], [320, 480], [750, 200], [250, 250], [250, 360], [120, 90], [1, 1], [292, 30], [300, 100], [768, 1024], [88, 31], [200, 200], [300, 600], [300, 1050], [960, 90], [125, 125], [180, 150], [970, 250], [168, 28], [980, 120], [120, 20], [120, 240], [480, 320], [468, 60], [120, 30], [120, 60], [750, 300], [930, 180], [728, 90], [168, 42], [980, 90], [320, 50], [750, 100], [200, 446], [336, 280], [300, 250], [580, 400], [970, 90], [160, 600]]
+          }
+        },
+        bids: [{
+          bidder: 'mgid',
+          params: {
+            accountId: '219'
+          }
+        }]
+      }];
+      // ======== DO NOT EDIT BELOW THIS LINE =========== //
+      var googletag = googletag || {};
+      googletag.cmd = googletag.cmd || [];
+      googletag.cmd.push(function () {
+        googletag.pubads().disableInitialLoad();
+      });
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+      pbjs.que.push(function () {
+        pbjs.setConfig({ priceGranularity: 'high' })
+        pbjs.setConfig({
+          debug: true,
+          realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+              name: 'mgid',
+              waitForIt: true,
+              params: {
+                clientSiteId: 1
+              }
+            }]
+          },
+          /*consentManagement: {
+            gdpr: {
+              cmpApi: 'iab',
+              timeout: 8000,
+              defaultGdprScope: true
+            }
+          }*/
+          // static data for consent management is only for test purpose - with this data we didn't get ads at the auction
+          /*consentManagement: {
+            usp: {
+              cmpApi: 'static',
+              consentData: {
+                getUSPData: {
+                  uspString: '1YNY',
+                }
+              }
+            },
+            gdpr: {
+              cmpApi: 'static',
+              consentData: {
+                getTCData: {
+                  tcString: 'COwK6gaOwK6gaFmAAAENAPCAAAAAAAAAAAAAAAAAAAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+                  gdprApplies: true,
+                  purpose: {
+                    consents: {
+                      1: true,
+                      2: true,
+                    },
+                  },
+                  vendor: {
+                    consents: {
+                      358: true,
+                    },
+                  }
+                }
+              }
+            }
+          }*/
+        });
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({
+          bidsBackHandler: initAdserver,
+          timeout: PREBID_TIMEOUT,
+          ortb2: {
+            site: {
+              content: {
+                language: 'en',
+              }
+            }
+          }
+        });
+      });
+
+      function initAdserver() {
+        if (pbjs.initAdserverSet) return;
+        pbjs.initAdserverSet = true;
+        googletag.cmd.push(function () {
+          pbjs.setTargetingForGPTAsync && pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      }
+
+      // in case PBJS doesn't load
+      setTimeout(function () {
+        initAdserver();
+      }, FAILSAFE_TIMEOUT);
+
+    </script>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width">
+<title>JS Bin</title>
+</head>
+<body>
+
+<h2>Basic Prebid.js Example</h2>
+<h5>Div-1</h5>
+
+<div id='div-gpt-ad-1660208650016-0' style='min-width: 88px; min-height: 20px;'>
+<script>
+      googletag.cmd.push(function () {
+        googletag.display('div-gpt-ad-1660208650016-0');
+      });
+    </script>
+</div>
+
+</body>
+</html>
diff --git a/integrationExamples/gpt/optimeraRtdProvider_example.html b/integrationExamples/gpt/optimeraRtdProvider_example.html
new file mode 100644
index 00000000000..109a4c2b366
--- /dev/null
+++ b/integrationExamples/gpt/optimeraRtdProvider_example.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <link rel="icon" type="image/png" href="/favicon.png">
+  <script async src="//securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
+  <script type="text/javascript" src="../../build/dev/prebid.js" async></script>
+
+  <title>Optimera RTD Example</title>
+
+  <!-- Prebid Config Section START -->
+  <script>
+    var PREBID_TIMEOUT = 1000;
+    var FAILSAFE_TIMEOUT = 3000;
+
+    var div_1_sizes = [
+        [300, 250],
+        [300, 600]
+    ];
+    var div_2_sizes = [
+        [728, 90],
+        [970, 250]
+    ];
+
+    var adUnits = [{
+      code: 'div-1',
+      mediaTypes: {
+        banner: {
+            sizes: div_1_sizes
+        }
+      },
+      bids: [{
+        bidder: 'appnexus',
+        params: {
+          placementId: '13144370'
+        }
+      }]
+    }, {
+      code: 'div-0',
+      mediaTypes: {
+        banner: {
+            sizes: div_2_sizes
+        }
+      },
+      bids: [{
+        bidder: 'appnexus',
+        params: {
+          placementId: '13144370'
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        debug: 'true',
+        realTimeData: {
+          dataProviders: [
+            {
+              name: 'optimeraRTD',
+              waitForIt: true,
+              params: {
+                clientID: '9999',
+                optimeraKeyName: 'optimera'
+              }
+            }
+          ]
+        }
+      });
+    });
+
+  </script>
+  <!-- Prebid Config Section END -->
+
+  <script>
+  // ======== DO NOT EDIT BELOW THIS LINE =========== //
+  var googletag = googletag || {};
+      googletag.cmd = googletag.cmd || [];
+      googletag.cmd.push(function() {
+          googletag.pubads().disableInitialLoad();
+      });
+
+  var pbjs = pbjs || {};
+  pbjs.que = pbjs.que || [];
+
+  pbjs.que.push(function() {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({
+          bidsBackHandler: initAdserver,
+          timeout: PREBID_TIMEOUT
+      });
+  });
+
+  function initAdserver() {
+      if (pbjs.initAdserverSet) return;
+      pbjs.initAdserverSet = true;
+      googletag.cmd.push(function() {
+          pbjs.que.push(function() {
+              pbjs.setTargetingForGPTAsync();
+              googletag.pubads().refresh();
+          });
+      });
+  }
+  // in case PBJS doesn't load
+  setTimeout(function() {
+      initAdserver();
+  }, FAILSAFE_TIMEOUT);
+
+  googletag.cmd.push(function() {
+        googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+    });
+    googletag.cmd.push(function() {
+        googletag.defineSlot('/19968336/header-bid-tag-1', div_2_sizes, 'div-0').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+    });
+
+  </script>
+
+</head>
+
+<body>
+  <h2>Basic Prebid.js Example</h2>
+  <h5>Div-1</h5>
+  <div id='div-1'>
+      <script type='text/javascript'>
+          googletag.cmd.push(function() {
+              googletag.display('div-1');
+          });
+
+      </script>
+  </div>
+
+  <br>
+
+  <h5>Div-0</h5>
+  <div id='div-0'>
+      <script type='text/javascript'>
+          googletag.cmd.push(function() {
+              googletag.display('div-0');
+          });
+
+      </script>
+  </div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/integrationExamples/gpt/permutiveRtdProvider_example.html b/integrationExamples/gpt/permutiveRtdProvider_example.html
new file mode 100644
index 00000000000..554f2081c6d
--- /dev/null
+++ b/integrationExamples/gpt/permutiveRtdProvider_example.html
@@ -0,0 +1,283 @@
+<html>
+
+    <head>
+        <link rel="icon" type="image/png" href="/favicon.png">
+        <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
+        <script src="../../build/dev/prebid.js" async></script>
+        <script>
+            window.permutive = {};
+            window.permutive.ready = () => {};
+
+            function setLocalStorageData () {
+              const data = {
+                _pdfps: ['gam1', 'gam2'],
+                _prubicons: ['rubicon1', 'rubicon2'],
+                _papns: ['appnexus1', 'appnexus2'],
+                _psegs: ['1234', '1000001', '1000002'],
+                _ppam: ['ppam1', 'ppam2'],
+                _pcrprs: ['pcrprs1', 'pcrprs2'],
+                _pssps: { ssps: ['appnexus', 'some other'], cohorts: ['abcd', 'efgh', 'ijkl'] },
+              }
+
+              for (let key in data) {
+                window.localStorage[key] = JSON.stringify(data[key])
+              }
+            }
+
+            setLocalStorageData();
+
+            var div_1_sizes = [
+                [300, 250],
+                [300, 600]
+            ];
+            var div_2_sizes = [
+                [728, 90],
+                [970, 250]
+            ];
+            var PREBID_TIMEOUT = 1000;
+            var FAILSAFE_TIMEOUT = 1500;
+
+            var adUnits = [
+              {
+                code: '/19968336/header-bid-tag-0',
+                mediaTypes: {
+                  banner: {
+                    sizes: div_1_sizes
+                  }
+                },
+                bids: [
+                  {
+                    bidder: 'ix',
+                    params: {
+                      siteId: '123456',
+                    }
+                  },
+                  {
+                    bidder: 'appnexus',
+                    params: {
+                      placementId: 13144370,
+                      keywords: {
+                        test_kv: ['true']
+                      }
+                    }
+                  },
+                  {
+                    bidder: 'rubicon',
+                    params: {
+                      accountId: '9840',
+                      siteId: '123564',
+                      zoneId: '583584',
+                      inventory: {
+                        area: ['home']
+                      },
+                      visitor: {
+                        test_kv: ['true']
+                      }
+                    }
+                  },
+                  {
+                    bidder: 'ozone',
+                    params: {
+                      publisherId: 'OZONEGMG0001',
+                      siteId: '4204204209',
+                      placementId: '0420420500',
+                      customData: [
+                        {
+                          settings: {},
+                          targeting: {
+                            test_kv: ['true']
+                          }
+                        }
+                      ],
+                      ozoneData: {}
+                    }
+                  },
+                  {
+                    bidder: 'trustx',
+                    params: {
+                      uid: 45,
+                      keywords: {
+                        test_kv: ['true']
+                      }
+                    }
+                  }
+                ]
+              },
+              {
+                code: '/19968336/header-bid-tag-1',
+                mediaTypes: {
+                  banner: {
+                    sizes: div_2_sizes
+                  }
+                },
+                bids: [
+                  {
+                    bidder: 'appnexus',
+                    params: {
+                      placementId: 13144370
+                    }
+                  },
+                  {
+                    bidder: 'ozone',
+                    params: {
+                      publisherId: 'OZONEGMG0001',
+                      siteId: '4204204209',
+                      placementId: '0420420500'
+                    }
+                  }
+                ]
+              }
+            ];
+
+
+            var googletag = googletag || {};
+            googletag.cmd = googletag.cmd || [];
+            googletag.cmd.push(function() {
+                googletag.pubads().disableInitialLoad();
+            });
+
+            var pbjs = pbjs || {};
+            pbjs.que = pbjs.que || [];
+
+            pbjs.que.push(function() {
+              pbjs.setConfig({
+                debug: true,
+                pageUrl: 'http://www.test.com/test.html',
+                realTimeData: {
+                  auctionDelay: 80, // maximum time for RTD modules to respond
+                  dataProviders: [
+                    {
+                      name: 'permutive',
+                      waitForIt: true,
+                      params: {
+                        acBidders: ['appnexus', 'rubicon', 'ozone', 'trustx', 'ix'],
+                        maxSegs: 500,
+                        transformations: [
+                          {
+                            id: 'iab',
+                            config: {
+                              segtax: 4,
+                              iabIds: {
+                                1000001: '777777',
+                                1000002: '888888'
+                              }
+                            }
+                          }
+                        ],
+                        overwrites: {
+                          rubicon: function (bid, data, acEnabled, utils, defaultFn) {
+                            if (defaultFn){
+                              bid = defaultFn(bid, data, acEnabled)
+                            }
+                            if (data.gam && data.gam.length) {
+                              utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              });
+              pbjs.setBidderConfig({
+                bidders: ['appnexus', 'rubicon', 'ix'],
+                config: {
+                  ortb2: {
+                    site: {
+                      name: "example",
+                      domain: "page.example.com",
+                      cat: ["IAB2"],
+                      sectioncat: ["IAB2-2"],
+                      pagecat: ["IAB2-2"],
+                      page: "https://page.example.com/here.html",
+                      ref: "https://ref.example.com",
+                      keywords: "power tools, drills",
+                      search: "drill",
+                      content: {}
+                    },
+                    user: {
+                      yob: 1985,
+                      gender: 'm',
+                      keywords: 'a,b',
+                      data: [
+                        {
+                          name: 'permutive.com',
+                          ext: { segtax: 6 },
+                          segment: [{ id: '1' }]
+                        }
+                      ]
+                    }
+                  }
+                }
+              });
+              pbjs.addAdUnits(adUnits);
+              requestBids();
+            });
+
+            function requestBids () {
+              pbjs.que.push(function() {
+                pbjs.requestBids({
+                  bidsBackHandler: initAdserver,
+                  timeout: PREBID_TIMEOUT
+                });
+              });
+            }
+
+            function initAdserver() {
+                if (pbjs.initAdserverSet) return;
+                pbjs.initAdserverSet = true;
+                googletag.cmd.push(function() {
+                    pbjs.que.push(function() {
+                        pbjs.setTargetingForGPTAsync();
+                        googletag.pubads().refresh();
+                    });
+                });
+            }
+            // in case PBJS doesn't load
+            setTimeout(function() {
+                initAdserver();
+            }, FAILSAFE_TIMEOUT);
+
+            googletag.cmd.push(function() {
+                googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+            googletag.cmd.push(function() {
+                googletag.defineSlot('/19968336/header-bid-tag-1', div_2_sizes, 'div-2').addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+
+        </script>
+
+    </head>
+
+    <body>
+        <p><button onclick="requestBids()">Refresh Ad Unit</button></p>
+        <h2>Basic Prebid.js Example</h2>
+        <h5>Div-1</h5>
+        <div id="div-1">
+            <script type="text/javascript">
+                googletag.cmd.push(function() {
+                    googletag.display("div-1");
+                });
+
+            </script>
+        </div>
+
+        <br>
+
+        <h5>Div-2</h5>
+        <div id="div-2">
+            <script type="text/javascript">
+                googletag.cmd.push(function() {
+                    googletag.display("div-2");
+                });
+
+            </script>
+        </div>
+
+    </body>
+
+</html>
diff --git a/integrationExamples/gpt/prebidServer_example.html b/integrationExamples/gpt/prebidServer_example.html
index 7761178efa8..f23554369bc 100644
--- a/integrationExamples/gpt/prebidServer_example.html
+++ b/integrationExamples/gpt/prebidServer_example.html
@@ -12,9 +12,7 @@
           var gads = document.createElement('script');
           gads.async = true;
           gads.type = 'text/javascript';
-          var useSSL = 'https:' == document.location.protocol;
-          gads.src = (useSSL ? 'https:' : 'http:') +
-          '//www.googletagservices.com/tag/js/gpt.js';
+          gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
           var node = document.getElementsByTagName('script')[0];
           node.parentNode.insertBefore(gads, node);
         })();
@@ -56,10 +54,10 @@
           s2sConfig : {
             accountId : '1',
             enabled : true, //default value set to false
+            defaultVendor: 'appnexus',
             bidders : ['appnexus'],
             timeout : 1000, //default value is 1000
             adapter : 'prebidServer', //if we have any other s2s adapter, default value is s2s
-            endpoint : 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
           }
         });
 
diff --git a/integrationExamples/gpt/prebidServer_native_example.html b/integrationExamples/gpt/prebidServer_native_example.html
index 16c7d38a427..c590f0bcee5 100644
--- a/integrationExamples/gpt/prebidServer_native_example.html
+++ b/integrationExamples/gpt/prebidServer_native_example.html
@@ -133,8 +133,8 @@
   <script>
     // GPT setup
     googletag.cmd.push(function () {
-      // var slot1 = googletag.defineSlot('/19968336/prebid_native_example_1', [[360, 360]], 'div-1').addService(googletag.pubads());
-      // var slot2 = googletag.defineSlot('/19968336/prebid_native_example_2', 'fluid', 'div-2').addService(googletag.pubads());
+      googletag.defineSlot('/19968336/prebid_native_example_1', [[360, 360]], 'div-1').addService(googletag.pubads());
+      googletag.defineSlot('/19968336/prebid_native_example_2', 'fluid', 'div-2').addService(googletag.pubads());
       googletag.pubads().disableInitialLoad();
       googletag.pubads().enableSingleRequest();
       googletag.enableServices();
diff --git a/integrationExamples/gpt/reconciliationRtdProvider_example.html b/integrationExamples/gpt/reconciliationRtdProvider_example.html
new file mode 100644
index 00000000000..4f9b663c22d
--- /dev/null
+++ b/integrationExamples/gpt/reconciliationRtdProvider_example.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <script async src="../../build/dev/prebid.js"></script>
+    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+    <meta charset="UTF-8">
+    <title>Reconciliation RTD Provider Example</title>
+    <script>
+      var FAILSAFE_TIMEOUT = 3300;
+      var PREBID_TIMEOUT = 1000;
+
+      var adUnits = [{
+        code: "/21834411153/rsdk-2",
+        mediaTypes: {
+        banner: {
+            sizes: [
+            [300, 250],
+            [728, 90],
+            ],
+        },
+        },
+        // Replace this object to test a new Adapter!
+        bids: [{
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370
+          }
+        }]
+
+      }];
+
+      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.setConfig({
+          realTimeData: {
+            auctionDelay: 0,
+            dataProviders: [
+              {
+                name: "reconciliation",
+                params: {
+                  publisherMemberId: "test_prebid_publisher",
+                  allowAccess: true
+                },
+              },
+            ],
+          },
+        });
+        pbjs.addAdUnits(adUnits);
+        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();
+          });
+        });
+      }
+
+      setTimeout(function() {
+        sendAdserverRequest();
+      }, FAILSAFE_TIMEOUT);
+
+    </script>
+
+    <script>
+      googletag.cmd.push(function () {
+        googletag.defineSlot('/21834411153/rsdk-2', [[300, 250], [728, 90]], 'div-gpt-ad-rsdk-1')
+          .addService(googletag.pubads())
+          .setTargeting('RSDK_VER', '2.1');
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+      });
+    </script>
+</head>
+
+<body>
+<h5>Div-1</h5>
+<div id='div-gpt-ad-rsdk-1'>
+    <script type='text/javascript'>
+      googletag.cmd.push(function() { googletag.display('div-gpt-ad-rsdk-1'); });
+    </script>
+</div>
+</body>
+</html>
diff --git a/integrationExamples/gpt/revcontent_example.html b/integrationExamples/gpt/revcontent_example.html
deleted file mode 100644
index d7a44df3014..00000000000
--- a/integrationExamples/gpt/revcontent_example.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-
-    <head>
-        <link rel="icon" type="image/png" href="/favicon.png">
-        <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
-        <script async src="../../build/dev/prebid.js"></script>
-        <script>
-            /*
-            Supported sizes:
-            ----------------
-            300x250 - Medium rectangle
-            728x90 - Leaderboard
-            300x600 - Half page or large skyscraper
-            */
-            var size = {width: 300, height: 250};
-
-            var PREBID_TIMEOUT = 10000;
-            var FAILSAFE_TIMEOUT = 30000;
-
-            var adUnits = [{
-                code: '/19968336/header-bid-tag-1',
-                mediaTypes: {
-                    native: {
-                        image: {
-                            required: false
-                        },
-                        title: {
-                            required: false,
-                            len: 140
-                        },
-                        clickUrl: {
-                            required: false
-                        },
-                        sponsoredBy: {
-                            id: 5,
-                            name: 'data',
-                            type: 1
-                        }
-                    }
-                },
-                bids: [{
-                    bidder: 'revcontent',
-                    params: {
-                        size: size,
-                        apiKey: '8a33fa9cf220ae685dcc3544f847cdda858d3b1c',
-                        userId: 673,
-                        domain: 'test.com',
-                        endpoint: 'trends.revcontent.com'
-                    }
-                }]
-            }];
-
-            // ======== DO NOT EDIT BELOW THIS LINE =========== //
-            var googletag = googletag || {};
-            googletag.cmd = googletag.cmd || [];
-            googletag.cmd.push(function() {
-                googletag.pubads().disableInitialLoad();
-            });
-
-            var pbjs = pbjs || {};
-            pbjs.que = pbjs.que || [];
-
-            pbjs.que.push(function() {
-                pbjs.addAdUnits(adUnits);
-                pbjs.requestBids({
-                    bidsBackHandler: initAdserver,
-                    timeout: PREBID_TIMEOUT
-                });
-            });
-
-            function initAdserver() {
-                if (pbjs.initAdserverSet) return;
-                pbjs.initAdserverSet = true;
-                googletag.cmd.push(function() {
-                    pbjs.setTargetingForGPTAsync && pbjs.setTargetingForGPTAsync();
-                    googletag.pubads().refresh();
-                });
-            }
-            
-            // in case PBJS doesn't load
-            setTimeout(function() {
-                initAdserver();
-            }, FAILSAFE_TIMEOUT);
-
-            googletag.cmd.push(function() {
-                googletag.defineSlot('/19968336/header-bid-tag-1', [[size.width, size.height]], 'div-1')
-                	.addService(googletag.pubads());
-                googletag.pubads().enableSingleRequest();
-                googletag.enableServices();
-            });
-
-        </script>
-
-    </head>
-
-    <body>
-        <h2>Basic Prebid.js Example</h2>
-        <h5>Div-1</h5>
-        <div id='div-1'>
-            <script type='text/javascript'>
-                googletag.cmd.push(function() {
-                    googletag.display('div-1');
-                });
-
-            </script>
-        </div>
-    </body>
-
-</html>
\ No newline at end of file
diff --git a/integrationExamples/gpt/revcontent_example_banner.html b/integrationExamples/gpt/revcontent_example_banner.html
new file mode 100644
index 00000000000..cadd2e1a0b7
--- /dev/null
+++ b/integrationExamples/gpt/revcontent_example_banner.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Prebid.js Banner Example</title>
+    <!-- Prebid.js -->
+    <!-- <script async src="prebid.js"></script> -->
+    <!-- <script async src="../../build/dist/prebid.js"></script> -->
+    <script async src="../../build/dev/prebid.js"></script>
+    <!-- Google Publisher Tag -->
+    <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+    <script>
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+        const customConfigObject = {
+            "buckets": [{
+                "max": 40,
+                "increment": 0.5
+            }]
+        };
+        // Prebid Banner Ad Unit
+        const adUnits = [{
+            code: '/21623266709/prebid-test',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [{
+                bidder: 'revcontent',
+                params: {
+                    // Your user-id and api-key
+                    apiKey: 'abababababababababababababababababababab',
+                    userId: 111111,
+                    domain: 'www.denverpost.com',
+                    endpoint: 'trends.revcontent.com',
+                    bidfloor: 0.05,
+                }
+            }]
+        },{
+            code: '/21623266709/prebid-test-2',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [{
+                bidder: 'revcontent',
+                params: {
+                    // Your user-id and api-key
+                    apiKey: 'abababababababababababababababababababab',
+                    userId: 111111,
+                    domain: 'www.denverpost.com',
+                    endpoint: 'trends.revcontent.com',
+                    bidfloor: 0.05,
+                }
+            }]
+        }
+        ];
+    </script>
+    <script>
+        var googletag = googletag || {};
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function () {
+            googletag.pubads().disableInitialLoad();
+        });
+        pbjs.que.push(function () {
+            pbjs.setConfig({
+                enableSendAllBids: false,
+                priceGranularity: customConfigObject
+            });
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+        });
+        function sendAdServerRequest() {
+            googletag.cmd.push(function () {
+                pbjs.que.push(function () {
+                    pbjs.setTargetingForGPTAsync('/21623266709/prebid-test');
+                    pbjs.setTargetingForGPTAsync('/21623266709/prebid-test-2');
+                    googletag.pubads().refresh();
+                });
+            });
+        }
+    </script>
+    <script>
+        googletag.cmd.push(function () {
+            googletag
+                .defineSlot('/21623266709/prebid-test', [[300, 250]], 'div-0')
+                .addService(googletag.pubads());
+            googletag
+                .defineSlot('/21623266709/prebid-test-2', [[300, 250]], 'div-1')
+                .addService(googletag.pubads());
+            googletag.pubads().enableSingleRequest();
+            googletag.enableServices();
+        });
+    </script>
+</head>
+<body>
+    <h2>Prebid.js Banner Example</h2>
+    <div id='div-0'>
+        <script>
+            googletag.cmd.push(function () {
+                googletag.display('div-0');
+            });
+        </script>
+    </div>
+    <br>
+    <div id='div-1'>
+        <script>
+            googletag.cmd.push(function () {
+                googletag.display('div-1');
+            });
+        </script>
+    </div>
+    <div id="targeting-keys"></div>
+</body>
diff --git a/integrationExamples/gpt/revcontent_example_native.html b/integrationExamples/gpt/revcontent_example_native.html
new file mode 100644
index 00000000000..07a06f3a25d
--- /dev/null
+++ b/integrationExamples/gpt/revcontent_example_native.html
@@ -0,0 +1,109 @@
+<html>
+    <head>
+        <title>Prebid.js Native Example</title>
+
+        <script async src="../../build/dev/prebid.js"></script>
+        <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
+        <script>
+            /*
+            Supported sizes:
+            ----------------
+            300x250 - Medium rectangle
+            728x90 - Leaderboard
+            300x600 - Half page or large skyscraper
+            */
+            var size = {width: 300, height: 250};
+
+            var PREBID_TIMEOUT = 10000;
+            var FAILSAFE_TIMEOUT = 30000;
+
+            var adUnits = [{
+                code: '/19968336/header-bid-tag-1',
+                mediaTypes: {
+                    native: {
+                        image: {
+                            required: false
+                        },
+                        title: {
+                            required: false,
+                            len: 140
+                        },
+                        clickUrl: {
+                            required: false
+                        },
+                        sponsoredBy: {
+                            id: 5,
+                            name: 'data',
+                            type: 1
+                        }
+                    }
+                },
+                bids: [{
+                    bidder: 'revcontent',
+                    params: {
+                        size: size,
+                        // Your user-id and api-key
+                        apiKey: 'abababababababababababababababababababab',
+                        userId: 111111,
+                        domain: 'test.com',
+                        endpoint: 'trends.revcontent.com'
+                    }
+                }]
+            }];
+
+            // ======== DO NOT EDIT BELOW THIS LINE =========== //
+            var googletag = googletag || {};
+            googletag.cmd = googletag.cmd || [];
+            googletag.cmd.push(function() {
+                googletag.pubads().disableInitialLoad();
+            });
+
+            var pbjs = pbjs || {};
+            pbjs.que = pbjs.que || [];
+
+            pbjs.que.push(function() {
+                pbjs.addAdUnits(adUnits);
+                pbjs.requestBids({
+                    bidsBackHandler: initAdserver,
+                    timeout: PREBID_TIMEOUT
+                });
+            });
+
+            function initAdserver() {
+                if (pbjs.initAdserverSet) return;
+                pbjs.initAdserverSet = true;
+                googletag.cmd.push(function() {
+                    pbjs.setTargetingForGPTAsync && pbjs.setTargetingForGPTAsync();
+                    googletag.pubads().refresh();
+                });
+            }
+            
+            // in case PBJS doesn't load
+            setTimeout(function() {
+                initAdserver();
+            }, FAILSAFE_TIMEOUT);
+
+            googletag.cmd.push(function() {
+                googletag.defineSlot('/19968336/header-bid-tag-1', [[size.width, size.height]], 'div-1')
+                	.addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+
+        </script>
+
+    </head>
+
+    <body>
+        <h2>Prebid.js Native Example</h2>
+        <h5>Div-1</h5>
+        <div id='div-1'>
+            <script type='text/javascript'>
+                googletag.cmd.push(function() {
+                    googletag.display('div-1');
+                });
+            </script>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/integrationExamples/gpt/serverbidServer_example.html b/integrationExamples/gpt/serverbidServer_example.html
index 3d76e963663..1bd9b39d999 100644
--- a/integrationExamples/gpt/serverbidServer_example.html
+++ b/integrationExamples/gpt/serverbidServer_example.html
@@ -13,9 +13,7 @@
           var gads = document.createElement('script');
           gads.async = true;
           gads.type = 'text/javascript';
-          var useSSL = 'https:' == document.location.protocol;
-          gads.src = (useSSL ? 'https:' : 'http:') +
-          '//www.googletagservices.com/tag/js/gpt.js';
+          gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
           var node = document.getElementsByTagName('script')[0];
           node.parentNode.insertBefore(gads, node);
         })();
diff --git a/integrationExamples/gpt/sirdataRtdProvider_example.html b/integrationExamples/gpt/sirdataRtdProvider_example.html
new file mode 100644
index 00000000000..444c9133905
--- /dev/null
+++ b/integrationExamples/gpt/sirdataRtdProvider_example.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name=viewport content="width=device-width, initial-scale=1">
+    <script type="text/javascript" src="https://cache.consentframework.com/js/pa/1020/c/Y1Dhs/stub" charset="utf-8"></script>
+    <script type="text/javascript" async src="https://choices.consentframework.com/js/pa/1020/c/Y1Dhs/cmp" charset="utf-8"></script>
+</head>
+<body>
+
+<script async src="https://pagead2.googlesyndication.com/tag/js/gpt.js"></script>
+<script src="../../build/dev/prebid.js" async></script>
+
+<script>
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+        pbjs.setConfig({
+            debug: true,
+            realTimeData: {
+                auctionDelay: 1000,
+                dataProviders: [
+                     {
+                        name: "SirdataRTDModule",
+                        waitForIt: true,
+                        params: {
+                            setGptKeyValues: true,
+                            partnerId: 1,
+                            key: 1,
+                        }
+                    }
+                ]
+            },
+            consentManagement: {
+                usp: {
+                    cmpApi: 'iab',
+                    timeout: 100 // US Privacy timeout 100ms
+                },
+                gdpr: {
+                  cmpApi: 'iab',
+                  timeout: 8000,
+                  defaultGdprScope: true,
+                  rules: [{
+                    purpose: "storage",
+                    enforcePurpose: true,
+                    enforceVendor: true,
+                    vendorExceptions: ["appnexus"] //Can work without consent for cookies
+                  },{
+                    purpose: "basicAds",
+                    enforcePurpose: true,
+                    enforceVendor: true,
+                    vendorExceptions: ["appnexus"]
+                  }]
+                },
+            }
+        });
+    });
+
+</script>
+<script>
+    var div_1_sizes = [
+        [728, 90]
+    ];
+    
+    var PREBID_TIMEOUT = 3000;
+    var FAILSAFE_TIMEOUT = 5000;
+
+    var adUnits = [
+        {
+            code: '/19968336/header-bid-tag-0',
+            mediaTypes: {
+                banner: {
+                    sizes: div_1_sizes
+                }
+            },
+            bids: [{
+                bidder: 'appnexus',
+                params: {
+                    placementId: 13144370
+                }
+            }]
+        }
+        ];
+
+    // ======== DO NOT EDIT BELOW THIS LINE =========== //
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function() {
+        googletag.pubads().disableInitialLoad();
+    });
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({
+            bidsBackHandler: initAdserver,
+            timeout: PREBID_TIMEOUT
+        });
+    });
+
+    function initAdserver() {
+        if (pbjs.initAdserverSet) return;
+        pbjs.initAdserverSet = true;
+        googletag.cmd.push(function() {
+            pbjs.que.push(function() {
+                pbjs.setTargetingForGPTAsync();
+                googletag.pubads().refresh();
+            });
+        });
+    }
+
+
+    // in case PBJS doesn't load
+    setTimeout(function() {
+        initAdserver();
+    }, FAILSAFE_TIMEOUT);
+
+    googletag.cmd.push(function() {
+        googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+    });
+
+</script>
+
+<article>
+<p>
+Give consent or make a choice in Europe. Module will add key/value pairs in ad calls. Check out for sd_rtd key in Google Ad call (https://securepubads.g.doubleclick.net/gampad/ads...) and in the payload sent to Xandr to endpoint https://ib.adnxs.com/ut/v3/prebid : tags[0].keywords.key[sd_rtd] should have an array of string as value. This array will mix user segments and/or page categories based on user's choices.
+</p>
+</article>
+        <h2>Basic Prebid.js Example</h2>
+        <h5>Div-1</h5>
+        <div id='div-1'>
+            <script type='text/javascript'>
+                googletag.cmd.push(function() {
+                    googletag.display('div-1');
+                });
+
+            </script>
+        </div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/integrationExamples/gpt/topics_frame.html b/integrationExamples/gpt/topics_frame.html
new file mode 100644
index 00000000000..7a12b030a6a
--- /dev/null
+++ b/integrationExamples/gpt/topics_frame.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Topics demo</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="favicon.ico" rel="shortcut icon">
+    <script>
+      async function getTopics() {
+        try {
+          if ('browsingTopics' in document && document.featurePolicy.allowsFeature('browsing-topics')) {
+            const topics = await document.browsingTopics();
+            console.log('Called iframe:', window.location.hostname, topics, '\nNumber of topics: ', topics.length);
+            return Promise.resolve(topics);
+          } else {
+            console.log('document.browsingTopics() not supported');
+          }
+
+        } catch (error) {
+          console.log('Error:', error);
+        }
+      }
+
+      document.addEventListener('DOMContentLoaded', async function () {
+        const topics = await getTopics()
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+        const message = JSON.stringify({
+          segment: {
+            domain: window.location.hostname,
+            topics,
+            bidder: params.get("bidder")
+          },
+          date: Date.now(),
+        });
+        window.parent.postMessage(message, '*');
+      });
+    </script>
+  </head>
+  <body>
+  </body>
+</html>
\ No newline at end of file
diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
index 69e2c713fb8..4f94c73c281 100644
--- a/integrationExamples/gpt/userId_example.html
+++ b/integrationExamples/gpt/userId_example.html
@@ -1,265 +1,344 @@
-<html>
-<head>
-    <script>
-        (function(window, document) {
-            if (!window.__cmp) {
-                window.__cmp = (function() {
-                    var listen = window.attachEvent || window.addEventListener;
-                    listen('message', function(event) {
-                        window.__cmp.receiveMessage(event);
-                    }, false);
-
-                    function addLocatorFrame() {
-                        if (!window.frames['__cmpLocator']) {
-                            if (document.body) {
-                                var frame = document.createElement('iframe');
-                                frame.style.display = 'none';
-                                frame.name = '__cmpLocator';
-                                document.body.appendChild(frame);
-                            } else {
-                                setTimeout(addLocatorFrame, 5);
-                            }
-                        }
-                    }
-                    addLocatorFrame();
+<!DOCTYPE html>
+<html lang="en">
 
-                    var commandQueue = [];
-                    var cmp = function(command, parameter, callback) {
-                        if (command === 'ping') {
-                            if (callback) {
-                                callback({
-                                    gdprAppliesGlobally: !!(window.__cmp && window.__cmp.config && window.__cmp.config.storeConsentGlobally),
-                                    cmpLoaded: false
-                                });
-                            }
-                        } else {
-                            commandQueue.push({
-                                command: command,
-                                parameter: parameter,
-                                callback: callback
-                            });
-                        }
-                    };
-                    cmp.commandQueue = commandQueue;
-                    cmp.receiveMessage = function(event) {
-                        var data = event && event.data && event.data.__cmpCall;
-                        if (data) {
-                            commandQueue.push({
-                                callId: data.callId,
-                                command: data.command,
-                                parameter: data.parameter,
-                                event: event
-                            });
-                        }
-                    };
-                    cmp.config = {
-                        //
-                        // Modify config values here
-                        //
-                        // globalVendorListLocation: 'https://vendorlist.consensu.org/vendorlist.json',
-                        // customPurposeListLocation: './purposes.json',
-                        // globalConsentLocation: './portal.html',
-                        // storeConsentGlobally: false,
-                        // storePublisherData: false,
-                        logging: 'debug'//,
-                        // localization: {},
-                        // forceLocale: 'en-us'
-                    };
-                    return cmp;
-                }());
-                var t = document.createElement('script');
-                t.async = false;
-                t.src = 'http://acdn.adnxs.com/cmp/cmp.bundle.js';
-                var tag = document.getElementsByTagName('head')[0];
-                tag.appendChild(t);
-            }
-        })(window, document);
-        // window.__cmp('showConsentTool');
-    </script>
+<head>
+  <title>User ID Modules Example</title>
 
-    <script>
-        var FAILSAFE_TIMEOUT = 2000;
+  <script>
+    var FAILSAFE_TIMEOUT = 2000;
 
-        var adUnits = [
-            {
-                code: 'test-div',
-                sizes: [[300,250],[300,600],[728,90]],
-                bids: [
-                    {
-                        bidder: 'rubicon',
-                        params: {
-                            accountId: '1001',
-                            siteId: '113932',
-                            zoneId: '535510'
-                        }
-                    }
-                ]
+    var adUnits = [
+      {
+        code: 'test-div',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600], [728, 90]]
+          }
+        },
+        bids: [
+          {
+            bidder: 'rubicon',
+            params: {
+              accountId: '1001',
+              siteId: '113932',
+              zoneId: '535510'
             }
-        ];
-
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-    </script>
-    <script src="../../build/dev/prebid.js" async></script>
+          }
+        ]
+      }
+    ];
 
-    <script>
-        var googletag = googletag || {};
-        googletag.cmd = googletag.cmd || [];
-        googletag.cmd.push(function() {
-            googletag.pubads().disableInitialLoad();
-        });
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+  </script>
+  <script src="../../build/dev/prebid.js" async></script>
 
-        pbjs.que.push(function() {
-            pbjs.setConfig({
-                debug: true,
-                consentManagement: {
-                    cmpApi: 'iab',
-                    timeout: 1000,
-                    allowAuctionWithoutConsent: true
-                },
-                // consentManagement: {
-                //     cmpApi: 'static',
-                //     consentData: {
-                //         consentString: 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA'
-                //         vendorData: {
-                //             purposeConsents: {
-                //                 '1': true
-                //             }
-                //         }
-                //     }
-                // },
-                usersync: {
-                    userIds: [{
-                        name: "unifiedId",
-                        params: {
-                            partner: "prebid",
-                            url: "http://match.adsrvr.org/track/rid?ttd_pid=prebid&fmt=json"
-                        },
-                        storage: {
-                            type: "html5",
-                            name: "unifiedid",
-                            expires: 30
-                        },
-                    }, {
-                        name: "id5Id",
-                        params: {
-                            partner: 173 //Set your real ID5 partner ID here for production, please ask for one at http://id5.io/prebid
-                        },
-                        storage: {
-                            type: "cookie",
-                            name: "id5id",
-                            expires: 90,
-                            refreshInSeconds: 8*3600 // Refresh frequency of cookies, defaulting to 'expires'
-                        },
+  <script>
+    function getHashedEmail() { }
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function () {
+      googletag.pubads().disableInitialLoad();
+    });
 
-                    }, {
-                        name: "parrableId",
-                        params: {
-                            // change to Parrable Partner Client ID(s) you received from the Parrable Partners you are using
-                            partner: '30182847-e426-4ff9-b2b5-9ca1324ea09b'
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        "debug": true,
+        // *************************************************************************
+        // ** COMMENT consentManagement BLOCK IF YOU DO NOT WANT TO SIMULATE GDPR **
+        // *************************************************************************
+        "consentManagement": {
+          "cmpApi": "static",
+          "consentData": {
+            "getTCData": {
+              "tcString": "CO-HDlqO-HDlqAKAXCENBDCsAP_AAH_AACiQHKNd_X_fb39j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vF36pq4KuR4Eu3LBIQFlHOHcTUmw6IkVqTPsak2Mr7NKJ7PEinMbe2dYGHtfn9VTuZKYr97s___z__-__v__75f_r-3_3_vp9V---_fA5QAkw1L4CLMSxwJJo0qhRAhCuJDoAQAUUIwtE1hASuCnZXAR-ggYAIDUBGBECDEFGLIIAAAAAkoiAkAPBAIgCIBAACAFSAhAARoAgsAJAwCAAUA0LACKAIQJCDI4KjlMCAiRaKCeSMASi72MMIQyigBoFH4AAAAA.cAAAAAAAAAAA",
+              "cmpId": 10,
+              "cmpVersion": 23,
+              "tcfPolicyVersion": 2,
+              "gdprApplies": true,
+              "cmpStatus": "loaded",
+              "eventStatus": "tcloaded",
+              "purpose": {
+                "consents": {
+                  "1": true,
+                  "2": true
+                }
+              },
+              "vendor": {
+                "consents": {
+                  // add your GVL ID here and set to true to give consent within pbjs
+                  "52": true,     // rubicon for adserving
+                  "21": true,     // unifiedId
+                  "131": true,    // id5Id
+                  "929": true,    // parrableId
+                  "97": true,     // identityLink
+                  "887": true,    // uid2
+                  "95": true,     // lotamePanoramaId
+                  "301": true,    // zeotapIdPlus
+                  "91": true,     // criteo
+                  "737": true,    // amxId
+                  "58": true,     // 33acrossId
+                }
+              }
+            }
+          }
+        },
+        "userSync": {
+          "userIds": [
+            {
+              "name": "pubProvidedId",
+              "params": {
+                "eids": [
+                  {
+                    "source": "domain.com",
+                    "uids": [
+                      {
+                        "id": "value read from cookie or local storage",
+                        "atype": 1,
+                        "ext": {
+                          "stype": "ppuid" // allowable options are sha256email, DMP, ppuid for now
                         }
-                    }, {
-                        name: "pubCommonId",
-                        storage: {
-                            type: "cookie",
-                            name: "pubcid",
-                            expires: 365
-                        },
-                        // value: {
-                        //     foo: '9879878907987',
-                        //     bar:'93939'
-                        // }
-                    },  {
-                      name: 'identityLink',
-                      params: {
-                        pid: '14' // Set your real identityLink placement ID here
-                      },
-                      storage: {
-                        type: 'cookie',
-                        name: 'idl_env',
-                        expires: 30
-                      }
-                    },
-                    {
-                      name: "sharedId",
-                      params: {
-                        syncTime: 60 // in seconds, default is 24 hours
-                      },
-                      storage: {
-                        type: "cookie",
-                        name: "sharedid",
-                        expires: 28
                       }
-                    },  
-                    {
-                      name: 'lotamePanoramaId'
-                    }, 
-                    {
-                      name: "liveIntentId",
-                      params: {
-                        publisherId: "9896876"
-                      },
-                      storage: {
-                        type: "cookie",
-                        name: "_li_pbid",
-                        expires: 28
+                    ]
+                  },
+                  {
+                    "source": "3rdpartyprovided.com",
+                    "uids": [
+                      {
+                        "id": "value read from cookie or local storage",
+                        "atype": 3,
+                        "ext": {
+                          "stype": "sha256email"
+                        }
                       }
-                    }],
-                    syncDelay: 5000,
-                    auctionDelay: 1000
+                    ]
+                  }
+                ],
+                "eidsFunction": getHashedEmail // any user defined function that exists in the page
+              }
+            },
+            {
+              "name": "unifiedId",
+              "params": {
+                "partner": "prebid",
+                "url": "http://match.adsrvr.org/track/rid?ttd_pid=prebid&fmt=json"
+              },
+              "storage": {
+                "type": "html5",
+                "name": "unifiedid",
+                "expires": 30
+              }
+            },
+            {
+              "name": "33acrossId",
+              "params": {
+                "pid": '0'
+              },
+              "storage": {
+                "type": 'html5',
+                "name": '33acrossId',
+                "expires": 90
+              }
+            },
+            {
+              "name": "intentIqId",
+              "params": {
+                "partner": 0 // Set your real IntentIQ partner ID here for production.
+              },
+              "storage": {
+                "type": "cookie",
+                "name": "intentIqId",
+                "expires": 30
+              }
+            },
+            {
+              "name": "id5Id",
+              "params": {
+                "partner": 173 // Set your real ID5 partner ID here for production, please ask for one at http://id5.io/prebid
+              },
+              "storage": {
+                "type": "html5",
+                "name": "id5id",
+                "expires": 90,
+                "refreshInSeconds": 10// 8*3600 // Refresh frequency of cookies
+              }
+            },
+            {
+              "name": "merkleId",
+              "params": {
+                "endpoint":  "https://test_endpoint/",
+                "vendor": "sdfg",
+                "sv_cid": "dfg",
+                "sv_pubid": "xcv",
+                "sv_domain": "zxv"
+              },
+              "storage": {
+                "type": "html5",
+                "name": "merkleId",
+                "expires": 30
+              }
+            },
+            {
+              "name": "parrableId",
+              "params": {
+                // change to Parrable Partner Client ID(s) you received from the Parrable Partners you are using
+                "partner": "30182847-e426-4ff9-b2b5-9ca1324ea09b"
+              }
+            },
+            {
+              "name": "pubCommonId",
+              "storage": {
+                "type": "cookie",
+                "name": "pubcid",
+                "expires": 365
+              }
+              // value: {
+              //     foo: '9879878907987',
+              //     bar:'93939'
+              // }
+            },
+            {
+              "name": "identityLink",
+              "params": {
+                "pid": "14" // Set your real identityLink placement ID here
+                // use3P: false // true/false - If you want to use 3P endpoint to retrieve envelope. If you do not set this property to true, 3p endpoint will not be fired. By default this property is undefined and 3p request will not be fired.
+              },
+              "storage": {
+                "type": "cookie",
+                "name": "idl_env",
+                "expires": 30
+              }
+            },
+            {
+              "name": "lotamePanoramaId"
+            },
+            {
+              "name": "liveIntentId",
+              "params": {
+                "publisherId": "9896876"
+              },
+              "storage": {
+                "type": "cookie",
+                "name": "_li_pbid",
+                "expires": 28
+              }
+            },
+            {
+              "name": "zeotapIdPlus"
+            },
+            {
+              "name": "hadronId",
+              "storage": {
+                "type": "cookie",
+                "name": "hadronId",
+                "expires": 28
+              }
+            },
+            {
+              "name": "quantcastId"
+            },
+            {
+              "name": "criteo"
+            },
+            {
+              "name": "amxId",
+              "storage": {
+                "type": "html5",
+                "name": "amxId",
+                "expires": 14
+              }
+            },
+            {
+              "name": "uid2",
+              "params": {
+                "uid2Token": {
+                  "advertising_token": "example token",
+                  "refresh_token": "aslkdjaslkjdaslkhj",
+                  "identity_expires": Date.now() + 60*1000,
+                  "refresh_from": Date.now() - 10*1000,
+                  "refresh_expires": Date.now() + 12*60*60*1000,
+                  "refresh_response_key": null
                 }
-            });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: sendAdserverRequest
-            });
-        });
-
-        function sendAdserverRequest() {
-            if (pbjs.adserverRequestSent) return;
-            pbjs.adserverRequestSent = true;
-            googletag.cmd.push(function() {
-                pbjs.que.push(function() {
-                    pbjs.setTargetingForGPTAsync();
-                    googletag.pubads().refresh();
-                });
-            });
+              }
+            }
+            ,
+            {
+              "name": "imuid",
+              "params": {
+                "cid": 5126 // Set your Intimate Merger Customer ID here for production
+              }
+            },
+            {
+              "name": "dacId"
+            },
+            {
+              "name": "gravitompId"
+            }
+          ],
+          "syncDelay": 5000,
+          "auctionDelay": 1000
         }
+      });
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({
+        bidsBackHandler: sendAdserverRequest
+      });
+    });
 
-        setTimeout(function() {
-            sendAdserverRequest();
-        }, FAILSAFE_TIMEOUT);
-    </script>
+    function sendAdserverRequest() {
+      if (pbjs.adserverRequestSent) return;
+      pbjs.adserverRequestSent = true;
+      googletag.cmd.push(function () {
+        pbjs.que.push(function () {
+          pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      });
+    }
 
-    <script>
-        (function () {
-            var gads = document.createElement('script');
-            gads.async = true;
-            gads.type = 'text/javascript';
-            var useSSL = 'https:' == document.location.protocol;
-            gads.src = (useSSL ? 'https:' : 'http:') +
-                '//www.googletagservices.com/tag/js/gpt.js';
-            var node = document.getElementsByTagName('script')[0];
-            node.parentNode.insertBefore(gads, node);
-        })();
-    </script>
+    setTimeout(function () {
+      sendAdserverRequest();
+    }, FAILSAFE_TIMEOUT);
+  </script>
 
-    <script>
-        googletag.cmd.push(function() {
-            googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250],[300,600]], 'test-div').addService(googletag.pubads());
-            googletag.pubads().enableSingleRequest();
-            googletag.enableServices();
-        });
-    </script>
+  <script>
+    (function () {
+      var gads = document.createElement('script');
+      gads.async = true;
+      gads.type = 'text/javascript';
+      gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
+      var node = document.getElementsByTagName('script')[0];
+      node.parentNode.insertBefore(gads, node);
+    })();
+  </script>
+
+  <script>
+    googletag.cmd.push(function () {
+      googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250], [300, 600], [728, 90]], 'test-div').addService(googletag.pubads());
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
 </head>
 
 <body>
-<h2>Rubicon Project Prebid</h2>
+  <h2>User ID Modules Example</h2>
+
+  <h4>Generated EIDs</h4>
+  <script>
+    pbjs.que.push(function () {
+      var idsDiv = document.getElementById('ids-div');
+      idsDiv.innerHTML = JSON.stringify(pbjs.getUserIdsAsEids(), null, ' ');
+    });
+  </script>
+  <pre id="ids-div" style="border:1px solid #333; padding:5px; overflow: scroll"></pre>
 
-<div id='test-div'>
+  <h4>Ad Slot</h4>
+  <div id="test-div" style="border:1px solid #333; padding:5px;">
     <script>
-        googletag.cmd.push(function() { googletag.display('test-div'); });
+      googletag.cmd.push(function () { googletag.display('test-div'); });
     </script>
-</div>
+  </div>
 </body>
+
 </html>
diff --git a/integrationExamples/gpt/weboramaRtdProvider_example.html b/integrationExamples/gpt/weboramaRtdProvider_example.html
new file mode 100644
index 00000000000..7e75721103f
--- /dev/null
+++ b/integrationExamples/gpt/weboramaRtdProvider_example.html
@@ -0,0 +1,187 @@
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>weborama rtd submodule example</title>
+    </head>
+<body>
+
+    <script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
+    <script src="../../build/dev/prebid.js" async></script>
+
+    <script>
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+
+        pbjs.que.push(function () {
+            pbjs.setConfig({
+                debug: true,
+                realTimeData: {
+                    auctionDelay: 1000,
+                    dataProviders: [{
+                        name: "weborama",
+                        waitForIt: true,
+                        params: {
+                            setPrebidTargeting: true, // optional
+                            sendToBidders: true,      // optional
+                            onData: function (data, meta) { // optional
+                                console.log('onData', data, meta);
+                            },
+                            weboCtxConf: {
+                                token: "to-be-defined", // mandatory
+                                targetURL: "https://prebid.org", // default is document.URL
+                                assetID: "token:identifier", // new parameter, overrides url
+                                setPrebidTargeting: true, // override param.setPrebidTargeting or default true
+                                sendToBidders: true,      // override param.sendToBidders or default true
+                                defaultProfile: {         // optional
+                                    webo_ctx: ["Rugby_Renault_c11495", "Sport_c11893"],
+                                    webo_ds: ['bar']
+                                },
+                                baseURLProfileAPI: 'ctx-preprod.weborama.com',
+                                // enabled: false,
+                                //, onData: function (data,...) { ...}
+                            },
+                            weboUserDataConf: {
+                                enabled: false,
+                                accountId: 12345,         // recommended
+                                setPrebidTargeting: true, // override param.setPrebidTargeting or default true
+                                sendToBidders: ['smartadserver'], // specify the bidder to share data
+                                defaultProfile: {         // optional
+                                    webo_cs: ['red'],
+                                    webo_audiences: ['bam']
+                                },
+                                localStorageProfileKey: 'webo_wam2gam_entry', // default
+                                // enabled: false,
+                                //, onData: function (data,...) { ...}
+                            },
+                            sfbxLiteDataConf: {
+                                enabled: false,
+                                defaultProfile: {           // optional
+                                    lite_occupation: ['gérant', 'bénévole'],
+                                    lite_hobbies: ['sport', 'cinéma'],
+                                },
+                            }
+                        }
+                    }]
+                }
+            });
+        });
+    </script>
+    <script>
+        var div_1_sizes = [
+            [300, 300]
+        ];
+        var div_2_sizes = [
+            [600, 100]
+        ];
+
+        var PREBID_TIMEOUT = 3000;
+        var FAILSAFE_TIMEOUT = 5000;
+
+        var adUnits = [
+            {
+                code: '/1056029/webo-ctx-prebid',
+                mediaTypes: {
+                    banner: {
+                        sizes: div_1_sizes
+                    }
+                },
+                bids: [{
+                    bidder: 'smartadserver',
+                    params: {
+                        siteId: 1234,
+                        pageId: 1234,
+                        formatId: 1234,
+                    }
+                }, {
+                    bidder: 'pubmatic',
+                    params: {
+                        publisherId: '32572',
+                    }
+                }, {
+                    bidder: 'appnexus',
+                    params: {
+                        placementId: 234234,
+                    }
+                }, {
+                    bidder: 'rubicon',
+                    params: {
+                        accountId: '14062',
+                        siteId: '70608',
+                        zoneId: '335918',
+                        userId: '12346',
+                    }
+                }, {
+                    bidder: 'criteo',
+                    params: {
+                        zoneId: 234234,
+                        networkId: 456456,
+                    },
+                }]
+            }
+        ];
+
+        // ======== DO NOT EDIT BELOW THIS LINE =========== //
+        var googletag = googletag || {};
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function () {
+            googletag.pubads().disableInitialLoad();
+        });
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+
+        pbjs.que.push(function () {
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({
+                bidsBackHandler: initAdserver,
+                timeout: PREBID_TIMEOUT
+            });
+        });
+
+        function initAdserver() {
+            if (pbjs.initAdserverSet) return;
+            pbjs.initAdserverSet = true;
+            googletag.cmd.push(function () {
+                pbjs.que.push(function () {
+                    pbjs.setTargetingForGPTAsync();
+                    googletag.pubads().refresh();
+                });
+            });
+        }
+
+        // in case PBJS doesn't load
+        setTimeout(function () {
+            initAdserver();
+        }, FAILSAFE_TIMEOUT);
+
+        googletag.cmd.push(function () {
+            googletag.defineSlot('/1056029/webo-ctx-prebid', div_1_sizes, 'div-gpt-ad-1620653642627-0').addService(googletag.pubads());
+            googletag.pubads().disableInitialLoad();
+            googletag.enableServices();
+        });
+
+    </script>
+
+    <article>
+        <p>
+            test webo rtd submodule with prebid.js
+        </p>
+    </article>
+    <h2>Basic Prebid.js Example</h2>
+    <h5>Div-1</h5>
+    <!-- /1056029/webo-ctx-prebid -->
+    <div id='div-gpt-ad-1620653642627-0' style='width: 300px; height: 300px;'>
+        <script type='text/javascript'>
+            googletag.cmd.push(function () {
+                googletag.display('div-gpt-ad-1620653642627-0');
+            });
+        </script>
+    </div>
+
+    <button onclick="googletag.cmd.push(function() { googletag.pubads().refresh(); });">
+        Show/Refresh Ad
+    </button>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/integrationExamples/gpt/x-domain/creative.html b/integrationExamples/gpt/x-domain/creative.html
index fce46bb380f..bea8b70b4fe 100644
--- a/integrationExamples/gpt/x-domain/creative.html
+++ b/integrationExamples/gpt/x-domain/creative.html
@@ -2,37 +2,45 @@
 // this script can be returned by an ad server delivering a cross domain iframe, into which the
 // creative will be rendered, e.g. DFP delivering a SafeFrame
 
-let windowLocation = window.location;
-var urlParser = document.createElement('a');
+const windowLocation = window.location;
+const urlParser = document.createElement('a');
 urlParser.href = '%%PATTERN:url%%';
-var publisherDomain = urlParser.protocol + '//' + urlParser.hostname;
+const publisherDomain = urlParser.protocol + '//' + urlParser.hostname;
+const adId = '%%PATTERN:hb_adid%%';
+
+function receiveMessage(ev) {
+  const origin = ev.origin || ev.originalEvent.origin;
+  if (origin === publisherDomain) {
+      renderAd(ev);
+  }
+}
 
 function renderAd(ev) {
-    var key = ev.message ? 'message' : 'data';
-    var adObject = {};
-    try {
-      adObject = JSON.parse(ev[key]);
-    } catch (e) {
-      return;
-    }
+  const key = ev.message ? 'message' : 'data';
+  let adObject = {};
+  try {
+    adObject = JSON.parse(ev[key]);
+  } catch (e) {
+    return;
+  }
 
-    var origin = ev.origin || ev.originalEvent.origin;
-    if (adObject.message && adObject.message === 'Prebid Response' &&
-        publisherDomain === origin &&
-        adObject.adId === '%%PATTERN:hb_adid%%' &&
-        (adObject.ad || adObject.adUrl)) {
-      var body = window.document.body;
-      var ad = adObject.ad;
-      var url = adObject.adUrl;
-      var width = adObject.width;
-      var height = adObject.height;
+  if (adObject.message && adObject.message === 'Prebid Response' &&
+    adObject.adId === adId) {
+    try {
+      const body = window.document.body;
+      const ad = adObject.ad;
+      const url = adObject.adUrl;
+      const width = adObject.width;
+      const height = adObject.height;
 
       if (adObject.mediaType === 'video') {
+        signalRenderResult(false, {
+          reason: 'preventWritingOnMainDocument',
+          message: `Cannot render video ad ${adId}`
+        });
         console.log('Error trying to write ad.');
-      } else
-
-      if (ad) {
-        var frame = document.createElement('iframe');
+      } else if (ad) {
+        const frame = document.createElement('iframe');
         frame.setAttribute('FRAMEBORDER', 0);
         frame.setAttribute('SCROLLING', 'no');
         frame.setAttribute('MARGINHEIGHT', 0);
@@ -46,24 +54,50 @@
         frame.contentDocument.open();
         frame.contentDocument.write(ad);
         frame.contentDocument.close();
+        signalRenderResult(true);
       } else if (url) {
         body.insertAdjacentHTML('beforeend', '<IFRAME SRC="' + url + '" FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" WIDTH="' + width + '" HEIGHT="' + height + '"></IFRAME>');
+        signalRenderResult(true);
       } else {
-        console.log('Error trying to write ad. No ad for bid response id: ' + id);
+        signalRenderResult(false, {
+          reason: 'noAd',
+          message: `No ad for ${adId}`
+        });
+        console.log(`Error trying to write ad. No ad markup or adUrl for ${adId}`);
       }
+    } catch (e) {
+      signalRenderResult(false, {reason: 'exception', message: e.message});
+      console.log(`Error in rendering ad`, e);
+    }
+  }
+
+  function signalRenderResult(success, {reason, message} = {}) {
+    const payload = {
+      message: 'Prebid Event',
+      adId,
+      event: success ? 'adRenderSucceeded' : 'adRenderFailed',
     }
+    if (!success) {
+      payload.info = {reason, message};
+    }
+    window.parent.postMessage(JSON.stringify(payload), publisherDomain);
   }
 
+}
+
+
 function requestAdFromPrebid() {
-  var message = JSON.stringify({
+  const message = JSON.stringify({
     message: 'Prebid Request',
-    adId: '%%PATTERN:hb_adid%%'
+    adId
   });
-  window.parent.postMessage(message, publisherDomain);
+  const channel = new MessageChannel();
+  channel.port1.onmessage = renderAd;
+  window.parent.postMessage(message, publisherDomain, [channel.port2]);
 }
 
 function listenAdFromPrebid() {
-  window.addEventListener('message', renderAd, false);
+  window.addEventListener('message', receiveMessage, false);
 }
 
 listenAdFromPrebid();
diff --git a/integrationExamples/mass/index.html b/integrationExamples/mass/index.html
new file mode 100644
index 00000000000..3b034957d13
--- /dev/null
+++ b/integrationExamples/mass/index.html
@@ -0,0 +1,132 @@
+<html>
+  <head>
+      <script>
+        window.massConfig = {
+          inskin: {
+            default: {
+              plr_PubfileId: '000000/mass'
+            }
+          }
+        };
+
+        var PREBID_TIMEOUT = 3300;
+  
+        var adUnits = [{
+          code: 'div-gpt-ad-1460505748561-0',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            }
+          },
+          bids: [{
+            bidder: 'ix',
+            params: {
+              siteId: '123456',
+              size: [300, 250]
+            }
+          }]
+        }];
+  
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+      </script>
+
+      <script>
+        pbjs.que.push(function() {
+          pbjs.setConfig({
+            mass: {
+              enabled: true,
+
+              // official MASS-supported config:
+              dealIdPattern: /^MASS/i,
+              renderUrl: 'https://cdn.massplatform.net/bootloader.js',
+
+              // custom configs:
+              custom: [
+                // simple:
+                {
+                  dealIdPattern: /^abc/i,
+                  renderUrl: 'https://my.domain.com/script.js'
+                },
+
+                // flexible:
+                {
+                  match: function(bid) {
+                    // return true or false, based on given bid
+                  },
+
+                  render: function(payload) {
+                    // render the ad
+                  }
+                }
+              ]
+            }
+          });
+        });
+      </script>
+  
+      <script type="text/javascript" src="/build/dev/prebid.js" async></script>
+      <script>
+        var googletag = googletag || {};
+        googletag.cmd = googletag.cmd || [];
+        googletag.cmd.push(function() {
+          googletag.pubads().disableInitialLoad();
+        });
+  
+        pbjs.que.push(function() {
+          pbjs.addAdUnits(adUnits);
+          pbjs.requestBids({
+            bidsBackHandler: sendAdserverRequest
+          });
+        });
+  
+        function sendAdserverRequest() {
+          if (pbjs.adserverRequestSent) return;
+          pbjs.adserverRequestSent = true;
+          googletag.cmd.push(function() {
+            pbjs.que.push(function() {
+              pbjs.setTargetingForGPTAsync();
+              googletag.pubads().refresh();
+            });
+          });
+        }
+  
+        setTimeout(function() {
+          sendAdserverRequest();
+        }, PREBID_TIMEOUT);
+      </script>
+  
+      <script>
+        (function () {
+          var gads = document.createElement('script');
+          gads.async = true;
+          gads.type = 'text/javascript';
+          var useSSL = 'https:' == document.location.protocol;
+          gads.src = (useSSL ? 'https:' : 'http:') +
+            '//securepubads.g.doubleclick.net/tag/js/gpt.js';
+          var node = document.getElementsByTagName('script')[0];
+          node.parentNode.insertBefore(gads, node);
+        })();
+      </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 style="margin: 0;">
+    <div id="content" style="width: 920px; padding: 20px; height: 2500px; margin: 0 auto; background-color: #222; color: #fff;">
+      <p>Note: for this example to work, you need access to a bid simulation tool from your MASS enabled Exchange partner.</p>
+      <div id="div-gpt-ad-1460505748561-0">
+        <script type="text/javascript">
+          googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
+        </script>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/integrationExamples/noadserver/basic_noadserver.html b/integrationExamples/noadserver/basic_noadserver.html
new file mode 100755
index 00000000000..ebc0e842775
--- /dev/null
+++ b/integrationExamples/noadserver/basic_noadserver.html
@@ -0,0 +1,106 @@
+<!--
+  This page runs an auction for 2 adunits, simply displaying the results
+  rather than sending targeting to an ad server.
+
+  Notes:
+
+  - this approach assumes that the adunit.code is the div name. There
+  are many other ways to match the adunit to the div.
+  - this approach won't work for refreshed adunits. For that scenario
+  you'll need to be more surgical about what's passed into the bidsbackhandler.
+  - there's not a separate failsafe timeout here. Since there's no call to
+  an ad server waiting impatiently, Prebid's the only ad game in town and its
+  timeout is sufficient.
+-->
+
+<html>
+<head>
+<script>
+    var adUnits = [
+           {
+               code: 'test-div',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300,250]]
+                    }
+               },
+               bids: [
+                   {
+                       bidder: 'appnexus',
+                       params: {
+                           placementId: 13144370
+                       }
+                   }
+               ]
+           },
+           {
+               code: 'test-div2',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[728,90]]
+                    }
+               },
+               bids: [
+                   {
+                       bidder: 'appnexus',
+                       params: {
+                           placementId: 13144370
+                       }
+                   }
+               ]
+           }
+       ];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+  </script>
+  <script type="text/javascript" src="//acdn.adnxs.com/prebid/not-for-prod/prebid.js" async></script>
+
+  <script>
+    pbjs.que.push(function() {
+        pbjs.addAdUnits(adUnits);
+    });
+
+    // you could instead pass an array of adUnits
+    // to getHighestCpmBids() if desired
+    function renderAllAdUnits() {
+        var winners=pbjs.getHighestCpmBids();
+	for (var i = 0; i < winners.length; i++) {
+	  renderOne(winners[i]);
+        }
+    }
+
+    function renderOne(winningBid) {
+	if (winningBid && winningBid.adId) {
+	    var div = document.getElementById(winningBid.adUnitCode);
+	    if (div) {
+	      let iframe = document.createElement('iframe');
+	      iframe.frameBorder = '0';
+	      div.appendChild(iframe);
+	      var iframeDoc = iframe.contentWindow.document;
+	      pbjs.renderAd(iframeDoc, winningBid.adId);
+	    }
+	}
+
+    }
+
+  </script>
+
+<script>
+	pbjs.que.push(function() {
+          pbjs.requestBids({
+	    timeout: 2000,
+            bidsBackHandler: renderAllAdUnits
+          });
+	});
+</script>
+</head>
+
+<body>
+<h2>Ad Serverless Test Page</h2>
+
+<div id='test-div'></div>
+<br/>
+<div id='test-div2'></div>
+</body>
+</html>
diff --git a/integrationExamples/postbid/bidViewabilityIO_example.html b/integrationExamples/postbid/bidViewabilityIO_example.html
new file mode 100644
index 00000000000..2703013b29a
--- /dev/null
+++ b/integrationExamples/postbid/bidViewabilityIO_example.html
@@ -0,0 +1,136 @@
+<html>
+<head>
+<script>
+  var pbjs = pbjs || {};
+  pbjs.que = pbjs.que || [];
+
+  (function() {
+    var pbjsEl = document.createElement("script");
+    pbjsEl.type = "text/javascript";
+    pbjsEl.async = true;
+    pbjsEl.src = '../../build/dev/prebid.js';
+    var pbjsTargetEl = document.getElementsByTagName("head")[0];
+    pbjsTargetEl.insertBefore(pbjsEl, pbjsTargetEl.firstChild);
+  })();
+
+  pbjs.que.push(function() {
+    var adUnits = [
+      {
+        code: 'regular_iframe',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        bids: [
+          {
+            bidder: 'appnexus',
+            params: {
+               placementId: 13144370
+            }
+          }
+        ]
+      },
+      {
+        code: 'large_iframe',
+        mediaTypes: {
+          banner: {
+            sizes: [[970, 250]]
+          }
+        },
+        bids: [
+          {
+            bidder: 'appnexus',
+            params: {
+               placementId: 13144370
+            }
+          }
+        ]
+      },
+    ];
+
+    pbjs.setConfig({
+      bidderTimeout: 1000,
+      bidViewabilityIO: {
+        enabled: true,
+      }
+    });
+
+    pbjs.onEvent('adRenderSucceeded', ({bid}) => {
+      var p = document.createElement('p');
+      p.innerHTML = bid.adUnitCode + ' was rendered';
+      document.getElementById('notes').appendChild(p);
+    });
+
+    pbjs.onEvent('bidViewable', (bid) => {
+      var p = document.createElement('p');
+      p.innerHTML = bid.adUnitCode + ' was viewed';
+      document.getElementById('notes').appendChild(p);
+    });
+
+    pbjs.addAdUnits(adUnits);
+
+    pbjs.requestBids({
+      bidsBackHandler: function(bidResponses) {
+        Object.keys(bidResponses).forEach(adUnitCode => {
+          var highestCpmBids = pbjs.getHighestCpmBids(adUnitCode);
+          var winner = highestCpmBids.pop();
+          var iframe = document.getElementById(adUnitCode);
+          var iframeDoc = iframe.contentWindow.document;
+          if (winner && winner.mediaType === 'banner') {
+            pbjs.renderAd(iframeDoc, winner.adId);
+          } else if (winner) {
+            iframe.width = 300;
+            iframe.height = 300;
+            iframeDoc.write('<head></head><body>unsupported mediaType</body>');
+            iframeDoc.close();
+          } else {
+            iframe.width = 300;
+            iframe.height = 300;
+            iframeDoc.write('<head></head><body>no winner</body>');
+            iframeDoc.close();
+          }
+        });
+      }
+    })
+  });
+
+</script>
+
+</head>
+
+<body>
+    <div id="notes" style="position: fixed; right: 0; width: 50%; height: 100%;"></div>
+
+    <div style="height: 100%"></div>
+
+    <iframe id='regular_iframe'
+            FRAMEBORDER="0"
+            SCROLLING="no"
+            MARGINHEIGHT="0"
+            MARGINWIDTH="0"
+            TOPMARGIN="0"
+            LEFTMARGIN="0"
+            ALLOWTRANSPARENCY="true"
+            WIDTH="0"
+            HEIGHT="0">
+    </iframe>
+
+    <div style="height: 100%"></div>
+
+    <iframe id='large_iframe'
+            FRAMEBORDER="0"
+            SCROLLING="no"
+            MARGINHEIGHT="0"
+            MARGINWIDTH="0"
+            TOPMARGIN="0"
+            LEFTMARGIN="0"
+            ALLOWTRANSPARENCY="true"
+            WIDTH="0"
+            HEIGHT="0">
+    </iframe>
+
+    <div style="height: 100%"></div>
+
+</body>
+</html>
diff --git a/integrationExamples/postbid/oas/postbid-config.js b/integrationExamples/postbid/oas/postbid-config.js
index f251938bc9c..7b574185288 100644
--- a/integrationExamples/postbid/oas/postbid-config.js
+++ b/integrationExamples/postbid/oas/postbid-config.js
@@ -3,10 +3,10 @@ var pbjs = pbjs || {};
 pbjs.que = pbjs.que || [];
 
 (function() {
-    var pbjsEl = document.createElement("script"); pbjsEl.type = "text/javascript";
-    pbjsEl.async = true; var isHttps = 'https:' === document.location.protocol;
-    pbjsEl.src = (isHttps ? "https" : "http") + "://acdn.adnxs.com/prebid/not-for-prod/prebid.js";
-    var pbjsTargetEl = document.getElementsByTagName("head")[0];
+    var pbjsEl = document.createElement('script'); pbjsEl.type = 'text/javascript';
+    pbjsEl.async = true;
+    pbjsEl.src = 'https://acdn.adnxs.com/prebid/not-for-prod/prebid.js'
+    var pbjsTargetEl = document.getElementsByTagName('head')[0];
     pbjsTargetEl.insertBefore(pbjsEl, pbjsTargetEl.firstChild);
 })();
 
@@ -51,4 +51,4 @@ pbjs.que.push(function() {
     });
 });
 </script>
-<iframe id='postbid_if_3' FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" WIDTH="0" HEIGHT="0"></iframe>
\ No newline at end of file
+<iframe id='postbid_if_3' FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" WIDTH="0" HEIGHT="0"></iframe>
diff --git a/integrationExamples/postbid/postbid_prebidServer_example.html b/integrationExamples/postbid/postbid_prebidServer_example.html
new file mode 100644
index 00000000000..9f4944884a0
--- /dev/null
+++ b/integrationExamples/postbid/postbid_prebidServer_example.html
@@ -0,0 +1,87 @@
+<html>
+<head>
+<script>
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+    (function() {
+        var pbjsEl = document.createElement("script");
+        pbjsEl.type = "text/javascript";
+        pbjsEl.async = true;
+        pbjsEl.src = '../../build/dev/prebid.js';
+        var pbjsTargetEl = document.getElementsByTagName("head")[0];
+        pbjsTargetEl.insertBefore(pbjsEl, pbjsTargetEl.firstChild);
+      })();
+
+    pbjs.que.push(function() {
+        var sizes = [[300, 250]];
+        var adUnits = [{
+            code: 'postbid_iframe',
+            mediaTypes: {
+              banner: {
+                sizes: sizes
+              }
+            },
+            bids: [
+              {
+                bidder: 'appnexus',
+                params: {
+                   placementId: 13144370
+                }
+              }
+            ]
+          }];
+
+        pbjs.setConfig({
+          bidderTimeout: 1000,
+          s2sConfig : {
+            accountId : '1',
+            enabled : true, //default value set to false
+            bidders : ['appnexus'],
+            timeout : 1000, //default value is 1000
+            adapter : 'prebidServer', //if we have any other s2s adapter, default value is s2s
+            endpoint : 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.requestBids({
+            bidsBackHandler: function(bidResponses) {
+                var iframe = document.getElementById('postbid_iframe');
+                var iframeDoc = iframe.contentWindow.document;
+                var adServerTargeting = pbjs.getAdserverTargetingForAdUnitCode('postbid_iframe');
+
+                // If any bidders return any creatives
+                if (adServerTargeting && adServerTargeting['hb_adid']) {
+                    pbjs.renderAd(iframeDoc, adServerTargeting['hb_adid']);
+                } else {
+                    iframe.width = sizes[0][0];
+                    iframe.height = sizes[0][1];
+                    iframeDoc.write('<head></head><body>' + passbackTagHtml + '</body>');
+                    iframeDoc.close();
+                }
+            }
+        })
+    });
+
+    var passbackTagHtml = 'TO ADD';
+</script>
+
+</head>
+
+<body>
+    <iframe id='postbid_iframe'
+            FRAMEBORDER="0"
+            SCROLLING="no"
+            MARGINHEIGHT="0"
+            MARGINWIDTH="0"
+            TOPMARGIN="0"
+            LEFTMARGIN="0"
+            ALLOWTRANSPARENCY="true"
+            WIDTH="0"
+            HEIGHT="0">
+    </iframe>
+
+</body>
+</html>
diff --git a/integrationExamples/reviewerTools/index.html b/integrationExamples/reviewerTools/index.html
new file mode 100755
index 00000000000..2732cb4fd88
--- /dev/null
+++ b/integrationExamples/reviewerTools/index.html
@@ -0,0 +1,40 @@
+<html lang="en">
+<head>
+    <!--
+        This page provides links to common reviewer tools, tips and tricks.
+    -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>Prebid Reviewer Tools</title>
+    <style>
+        .section{padding-top:40px;}
+        .container{max-width:600px;margin:0 auto;}
+    </style>
+</head>
+
+<body>
+    <div class="section">
+        <div class="container">            
+            <div class="row">
+                <h1>Reviewer Tools</h1>
+                <p>Below are links to the most common tool used by Prebid reviewers. For more info on PR review processes check out the <a href="https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md">General PR Review Process</a> page on Github.</p>
+                <h2>Common</h2>
+                <ul>
+                    <li><a href="/build/coverage/lcov-report">Code Coverage</a></li>
+                    <li><a href="/integrationExamples/gpt/hello_world.html">Hello World</a></li>        
+                </ul>
+                <h2>Other Tools</h2>
+                <ul>
+                    <li><a href="/integrationExamples/">Other Integration Examples</a></li>
+                </ul>
+                <h2>Documentation & Training Material</h2>
+                <ul>
+                    <li><a href="https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md">General PR Review Process</a></li>
+                    <li><a href="https://youtu.be/aNCJ_Ct6Q8Y">Reviewer Video</a></li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html b/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
new file mode 100644
index 00000000000..044b4295e67
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
@@ -0,0 +1,96 @@
+<html>
+
+<head>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>JW Player with Bid Marked As Used</title>
+
+    <!--This demo listens to the Video events that are fired when an ad impression or ad error came from a bid. -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // jwplayer vendorCode
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    advertising: { client: 'vast' }
+                  }
+                }
+              },
+            },]
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 25,
+                  mediaType: "video",
+                  vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                  // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', (e) => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoBidError', e => {
+          console.log('An Ad Error came from a Bid: ', e);
+        });
+
+        pbjs.onEvent('videoBidImpression', e => {
+          console.log('An Ad Impression came from a Bid: ', e);
+        });
+
+        pbjs.requestBids(adUnits);
+      });
+    </script>
+</head>
+
+<body>
+    <div id ="player"></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html b/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html
new file mode 100644
index 00000000000..620f891fa50
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html
@@ -0,0 +1,89 @@
+<html>
+
+<head>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>JW Player with Bid Request Scheduling</title>
+
+    <!--This demo configures JW Player's Player Bidding product to handle ad scheduling-->
+
+    <script>
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // JW Player vendorCode
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    advertising: {
+                      client: "googima",
+                      schedule: {
+                        adBreak1: {
+                          tag: "//pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=",
+                          offset: "pre"
+                        },
+                        adBreak2: {
+                          tag: "//pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=",
+                          offset: "10"
+                        },
+                        adBreak3: {
+                          tag: "//pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=",
+                          offset: "20"
+                        },
+                        adBreak4: {
+                          tag: "//pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=",
+                          offset: "post"
+                        }
+                      },
+                      bids: {
+                        client: "bidding",
+                        settings: {
+                          mediationLayerAdServer: "dfp",
+                          bidTimeout: 2000
+                        },
+                        bidders: [
+                          {
+                            name: "ix",
+                            siteId: "300"
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              }
+            },]
+          },
+        });
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoAdError', e => {
+          console.log('adError: ', e);
+        });
+      });
+    </script>
+</head>
+
+<body>
+    <h2>JW Player with Bid Request Scheduling</h2>
+    <h5>Div-1: Player placeholder div</h5>
+    <div id='player'></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/eventListeners.html b/integrationExamples/videoModule/jwplayer/eventListeners.html
new file mode 100644
index 00000000000..0b43ff44d6c
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/eventListeners.html
@@ -0,0 +1,249 @@
+-<!--
+
+-->
+
+<html>
+
+<head>
+    <script async src="../../../build/dev/prebid.js"></script>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+
+    <script>
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player',
+        },
+
+        // Replace this object to test a new Adapter!
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+      
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // vendorCode for jwplayer
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    mediaid: 'd9J2zcaA',
+                    advertising: { client: 'vast' }
+                  }
+                }
+              },
+            }]
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 25,
+                  mediaType: "video",
+                  vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                  // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', (e) => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoDestroyed', e => {
+          console.log('player destroyed: ', e);
+        });
+
+        pbjs.onEvent('videoPlaylist', (e) => {
+          console.log('videos pb playlist: ', e);
+        });
+
+        pbjs.onEvent('videoPlaybackRequest', (e) => {
+          console.log('videos pb playbackRequest: ', e);
+        });
+
+        pbjs.onEvent('videoAutostartBlocked', (e) => {
+          console.log('videos pb autostartBlocked: ', e);
+        });
+
+        pbjs.onEvent('videoPlayAttemptFailed', (e) => {
+          console.log('videos pb playAttemptFailed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          console.log('videos pb contentLoaded: ', e);
+        });
+
+        pbjs.onEvent('videoPlay', (e) => {
+          console.log('videos pb play: ', e);
+        });
+
+        pbjs.onEvent('videoPause', (e) => {
+          console.log('videos pb pause: ', e);
+        });
+
+        pbjs.onEvent('videoBuffer', (e) => {
+          console.log('videos pb buffer: ', e);
+        });
+
+        pbjs.onEvent('videoSeekStart', (e) => {
+          console.log('videos pb seekStart: ', e);
+        });
+
+        pbjs.onEvent('videoSeekEnd', (e) => {
+          console.log('videos pb seekEnd: ', e);
+        });
+
+        pbjs.onEvent('videoRenditionUpdate', (e) => {
+          console.log('videos pb renditionUpdate: ', e);
+        });
+
+        pbjs.onEvent('videoMute', (e) => {
+          console.log('videos pb mute: ', e);
+        });
+
+        pbjs.onEvent('videoVolume', (e) => {
+          console.log('videos pb volume: ', e);
+        });
+
+        // pbjs.onEvent('videoTime', (e) => {
+        //   console.log('videos pb time: ', e);
+        // });
+
+        pbjs.onEvent('videoComplete', (e) => {
+          console.log('videos pb complete: ', e);
+        });
+
+        pbjs.onEvent('videoPlaylistComplete', (e) => {
+          console.log('videos pb playlistComplete: ', e);
+        });
+
+        pbjs.onEvent('videoFullscreen', (e) => {
+          console.log('videos pb fullscreen: ', e);
+        });
+
+        pbjs.onEvent('videoPlayerResize', (e) => {
+          console.log('videos pb playerResize: ', e);
+        });
+
+        pbjs.onEvent('videoError', (e) => {
+          console.log('videos pb error: ', e);
+        });
+
+        pbjs.onEvent('videoViewable', (e) => {
+          console.log('videos pb viewable: ', e);
+        });
+
+        pbjs.onEvent('videoCast', (e) => {
+          console.log('videos pb cast: ', e);
+        });
+
+        pbjs.onEvent('videoAdBreakStart', e => {
+          console.log('videos pb ad break start: ', e);
+        });
+
+        pbjs.onEvent('videoAdRequest', (e) => {
+          console.log('videos pb ad request: ', e);
+        });
+
+        pbjs.onEvent('videoAdLoaded', e => {
+          console.log('videos pb ad load: ', e);
+        });
+
+        pbjs.onEvent('videoAdImpression', (e) => {
+          console.log('videos pb ad impression: ', e);
+        });
+
+        pbjs.onEvent('videoAdStarted', (e) => {
+          console.log('videos pb ad started: ', e);
+        });
+
+        pbjs.onEvent('videoAdPlay', (e) => {
+          console.log('videos pb ad play: ', e);
+        });
+
+        pbjs.onEvent('videoAdPause', (e) => {
+          console.log('videos pb ad pause: ', e);
+        });
+
+        // pbjs.onEvent('videoAdTime', (e) => {
+        //   console.log('videos pb ad time: ', e);
+        // });
+
+        pbjs.onEvent('videoAdComplete', (e) => {
+          console.log('videos pb ad complete: ', e);
+        });
+
+        pbjs.onEvent('videoAdSkipped', (e) => {
+          console.log('videos pb ad skipped: ', e);
+        });
+
+        pbjs.onEvent('videoAdClick', (e) => {
+          console.log('videos pb ad click: ', e);
+        });
+
+        pbjs.onEvent('videoAdError', (e) => {
+          console.log('videos pb ad error: ', e);
+        });
+
+        pbjs.onEvent('videoAdBreakStart', e => {
+          console.log('videos pb ad break start: ', e);
+        });
+
+        pbjs.onEvent('videoAuctionAdLoadAbort', (e) => {
+          console.log('videos pb auction ad load attempt: ', e);
+        });
+
+        pbjs.onEvent('videoAuctionAdLoadQueued', (e) => {
+          console.log('videos pb auction ad load queued: ', e);
+        });
+
+        pbjs.onEvent('videoAuctionAdLoadAttempt', event => {
+          console.log('The Video Module is attempting to load an ad into the player! \n', event);
+        });
+
+        pbjs.onEvent('videoBidImpression', event => {
+          console.log('The ad impression resulted from a bid! \n', event);
+        });
+
+        pbjs.onEvent('videoBidError', event => {
+          console.log('The ad error resulted from a bid! \n', event);
+        });
+
+        pbjs.requestBids(adUnits);
+      });
+    </script>
+</head>
+
+<body>
+    <div id ="player"></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html b/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
new file mode 100644
index 00000000000..296a3265bd1
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
@@ -0,0 +1,120 @@
+<html>
+
+<head>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>JW Player with GAM Ad Server Mediation</title>
+
+    <!--This demo configures the video provider to use GAM Ad Server as mediation. Listens to Video events that are fired when an ad impression or ad error came from a bid. -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // JW Player vendorCode
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    advertising: { client: 'googima' }
+                  }
+                }
+              },
+              // Configure your Ad Server Integration
+              adServer: {
+                vendorCode: 'gam',
+                // params: {
+                //   iu: '/19968336/prebid_cache_video_adunit',
+                //   cust_params: {
+                //     section: 'blog',
+                //     anotherKey: 'anotherValue'
+                //   },
+                //   output: 'vast'
+                // },
+                baseAdTagUrl: 'https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_preroll_skippable&sz=640x480&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator='
+                //'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=',
+              },
+            },]
+          },
+          cache: {
+            url: 'https://prebid.adnxs.com/pbc/v1/cache'
+          },
+          targetingControls: {
+            allowTargetingKeys: ['BIDDER', 'AD_ID', 'PRICE_BUCKET', 'SIZE', 'DEAL', 'SOURCE', 'FORMAT', 'UUID', 'CACHE_ID', 'CACHE_HOST', 'ADOMAIN']
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 35,
+                  mediaType: "video",
+                  vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', (e) => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoAdRequest', (e) => {
+          console.log('videos pb ad request: ', e);
+        });
+
+        pbjs.onEvent('videoBidError', e => {
+          console.log('An Ad Error came from a Bid: ', e);
+        });
+
+        pbjs.onEvent('videoBidImpression', e => {
+          console.log('An Ad Impression came from a Bid: ', e);
+        });
+
+        pbjs.requestBids(adUnits);
+      });
+    </script>
+</head>
+
+<body>
+<h2>JW Player with GAM Ad Server Mediation</h2>
+<h5>Player placeholder div</h5>
+    <div id="player"></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/mediaMetadata.html b/integrationExamples/videoModule/jwplayer/mediaMetadata.html
new file mode 100644
index 00000000000..815f5c4d6d7
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/mediaMetadata.html
@@ -0,0 +1,81 @@
+<html>
+
+<head>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>JW Player with Media Metadata</title>
+
+    <!-- This Demo loads media with metadata which is used to enrich the auction by populating the ortb site.content -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // JW Player vendorCode
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    mediaid: 'XYXYXYXY',
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    title: 'Subaru Outback On Street And Dirt',
+                    description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+                    advertising: { client: 'googima' }
+                  }
+                }
+              }
+            },]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          console.log('videos pb contentLoaded: ', e);
+        });
+
+        pbjs.requestBids(adUnits);
+      });
+    </script>
+
+</head>
+
+<body>
+<h2>JW Player with Media Metadata</h2>
+
+<div id='player'></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/playlist.html b/integrationExamples/videoModule/jwplayer/playlist.html
new file mode 100644
index 00000000000..b77a1ec05fc
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/playlist.html
@@ -0,0 +1,123 @@
+<html>
+
+<head>
+  <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+  <script async src="../../../build/dev/prebid.js"></script>
+
+  <title>JW Player with Playlist</title>
+
+  <!-- This Demo sets up the JW Player instance with a playlist and requests a bid whenever a new media item is loaded -->
+
+  <script>
+    // Setup ad units
+    var adUnits = [{
+      code: 'div-gpt-ad-51545-0',
+      mediaTypes: {
+        video: {}
+      },
+      video: {
+        divId: 'player', // required to indicate which player is being used to render this ad unit.
+      },
+
+      bids: [{
+        bidder: 'ix',
+        params: {
+          siteId: '300',
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        video: {
+          providers: [{
+            divId: 'player',
+            vendorCode: 1, // JW Player vendorCode
+            playerConfig: {
+              params: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                vendorConfig: {
+                  playlist: [{
+                    mediaid: 'XYXYXYXY',
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    title: 'Subaru Outback On Street And Dirt',
+                    description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+                  }, {
+                    mediaid: 'ZAZAZAZA',
+                    file : "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
+                    title : "Big Buck Bunny",
+                    description : "Big Buck Bunny tells the story of a giant rabbit with a heart bigger than himself. When one sunny day three rodents rudely harass him, something snaps... and the rabbit ain't no bunny anymore! In the typical cartoon tradition he prepares the nasty rodents a comical revenge.\n\nLicensed under the Creative Commons Attribution license\nhttp://www.bigbuckbunny.org",
+                  }, {
+                    mediaid: 'WSWSWSWS',
+                    file: "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/Sintel.mp4",
+                    title : "Sintel",
+                    description: "Sintel is an independently produced short film, initiated by the Blender Foundation as a means to further improve and validate the free/open source 3D creation suite Blender. With initial funding provided by 1000s of donations via the internet community, it has again proven to be a viable development model for both open 3D technology as for independent animation film.\nThis 15 minute film has been realized in the studio of the Amsterdam Blender Institute, by an international team of artists and developers. In addition to that, several crucial technical and creative targets have been realized online, by developers and artists and teams all over the world.\nwww.sintel.org",
+                  }],
+                  advertising: { client: 'vast' }
+                }
+              }
+            }
+          },]
+        },
+        debugging: {
+          enabled: true,
+          intercept: [
+            {
+              when: {
+                adUnitCode: 'div-gpt-ad-51545-0',
+              },
+              then: {
+                cpm: 25,
+                mediaType: "video",
+                vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+              }
+            },
+          ]
+        }
+      });
+      pbjs.addAdUnits(adUnits);
+
+      pbjs.onEvent('videoSetupComplete', e => {
+        console.log('player setup complete: ', e);
+      });
+
+      pbjs.onEvent('videoSetupFailed', e => {
+        console.log('player setup failed: ', e);
+      });
+
+      pbjs.onEvent('videoPlaylist', (e) => {
+        console.log('videos pb playlist: ', e);
+      });
+
+      // request a bid when media is loaded
+      pbjs.onEvent('videoContentLoaded', (e) => {
+        console.log('videos pb contentLoaded: ', e);
+      });
+
+      pbjs.onEvent('videoComplete', (e) => {
+        console.log('videos pb complete: ', e);
+      });
+
+      pbjs.onEvent('videoPlaylistComplete', (e) => {
+        console.log('videos pb playlistComplete: ', e);
+      });
+
+      pbjs.requestBids(adUnits);
+    });
+  </script>
+
+</head>
+
+<body>
+<h2>JW Player with Playlist</h2>
+
+<h5>Div-1: Player placeholder div</h5>
+<div id='player'></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html b/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
new file mode 100644
index 00000000000..b645a58a4fc
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
@@ -0,0 +1,123 @@
+<html>
+
+<head>
+    <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+          integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+          integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+    <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+            integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+            integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>VideoJS with Bid Marked As Used</title>
+
+    <!--This demo listens to the Video events that are fired when an ad impression or ad error came from a bid. -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 2, // videojs vendorCode
+              playerConfig: {
+                params: {
+                  adPluginConfig: {
+                    numRedirects: 10
+                  },
+                  vendorConfig: {
+                    controls: true,
+                    autoplay: false,
+                    preload: "auto",
+                  }
+                }
+              }
+            },]
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 25,
+                  mediaType: "video",
+                  vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                  // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          // Load media with its Metadata when the video player is done instantiating.
+          videojs('player').loadMedia({
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          });
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoBidError', e => {
+          console.log('An Ad Error came from a Bid: ', e);
+        });
+
+        pbjs.onEvent('videoBidImpression', e => {
+          console.log('An Ad Impression came from a Bid: ', e);
+        });
+
+        pbjs.requestBids(adUnits);
+      });
+    </script>
+</head>
+
+<body>
+<h2>VideoJS with Bid Marked As Used</h2>
+<h5>Div-1: Player placeholder div</h5>
+<video-js id='player' class="vjs-big-play-centered"></video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/bidRequestScheduling.html b/integrationExamples/videoModule/videojs/bidRequestScheduling.html
new file mode 100644
index 00000000000..48f8b8685e1
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/bidRequestScheduling.html
@@ -0,0 +1,132 @@
+<html>
+
+<head>
+    <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+          integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+          integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+    <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+            integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+            integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>VideoJS with Bid Request Scheduling</title>
+
+    <!--This demo listens to the Video events to create an auction at every 10 seconds. -->
+
+    <script>
+      let midrollOffset = 0;
+
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 2, // videojs vendorCode
+              playerConfig: {
+                params: {
+                  adPluginConfig: {
+                    numRedirects: 10
+                  },
+                  vendorConfig: {
+                    controls: true,
+                    autoplay: false,
+                    preload: "auto",
+                  }
+                }
+              }
+            },]
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 25,
+                  mediaType: "video",
+                  vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                  // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          // Load media with its Metadata when the video player is done instantiating.
+          videojs('player').loadMedia({
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          });
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          // reset the offset when media is loaded
+          midrollOffset = 0;
+        });
+
+        pbjs.onEvent('videoTime', (e) => {
+          // when the video reaches the midroll, request bids and update the offset.
+          if (e.position >= midrollOffset) {
+            pbjs.requestBids(adUnits);
+            midrollOffset += 10;
+          }
+        });
+
+        pbjs.onEvent('videoAdError', e => {
+          console.log('adError: ', e);
+        });
+      });
+    </script>
+</head>
+
+<body>
+    <h2>VideoJS with Bid Request Scheduling</h2>
+    <h5>Div-1: Player placeholder div</h5>
+    <video-js id='player' class="vjs-big-play-centered"></video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/eventListeners.html b/integrationExamples/videoModule/videojs/eventListeners.html
new file mode 100644
index 00000000000..16edaf4da41
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/eventListeners.html
@@ -0,0 +1,242 @@
+<html>
+
+<head>
+  <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+    integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+    crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+    integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+    crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+  <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+          integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+          integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+  <script async src="../../../build/dev/prebid.js"></script>
+
+  <title>VideoJS Event Listeners</title>
+
+  <!--  This demo listens to every video event and logs the event payload. -->
+
+  <script>
+    // setup ad units
+    var adUnits = [{
+      code: 'div-gpt-ad-51545-0',
+      mediaTypes: {
+        video: {}
+      },
+      video: {
+        divId: 'player', // required to indicate which player is being used to render this ad unit.
+      },
+
+      bids: [{
+        bidder: 'ix',
+        params: {
+          siteId: '300',
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        video: {
+          providers: [{
+            divId: 'player',
+            vendorCode: 2, // videojs vendorCode
+            playerConfig: {
+              params: {
+                adPluginConfig: {
+                  numRedirects: 10
+                },
+                vendorConfig: {
+                  controls: true,
+                  autoplay: false,
+                  preload: "auto",
+                }
+              }
+            }
+          },]
+        },
+        debugging: {
+          enabled: true,
+          intercept: [
+            {
+              when: {
+                adUnitCode: 'div-gpt-ad-51545-0',
+              },
+              then: {
+                cpm: 25,
+                mediaType: "video",
+                vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+              }
+            },
+          ]
+        }
+      });
+      pbjs.addAdUnits(adUnits);
+
+      pbjs.onEvent('videoSetupComplete', e => {
+        console.log('player setup complete: ', e);
+        // Load media with its Metadata when the video player is done instantiating.
+        videojs('player').loadMedia({
+          id: 'XYXYXYXY',
+          src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+          title: 'Subaru Outback On Street And Dirt',
+          description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+          type: 'video/mp4'
+        });
+      });
+
+      pbjs.onEvent('videoSetupFailed', e => {
+        console.log('player setup failed: ', e);
+      });
+
+      pbjs.onEvent('videoDestroyed', e => {
+        console.log('player destroyed: ', e);
+      });
+
+      pbjs.onEvent('videoPlaylist', (e) => {
+        console.log('videos pb playlist: ', e);
+      });
+
+      pbjs.onEvent('videoPlaybackRequest', (e) => {
+        console.log('videos pb playbackRequest: ', e);
+      });
+
+      pbjs.onEvent('videoContentLoaded', (e) => {
+        console.log('videos pb contentLoaded: ', e);
+      });
+
+      pbjs.onEvent('videoPlay', (e) => {
+        console.log('videos pb play: ', e);
+      });
+
+      pbjs.onEvent('videoPause', (e) => {
+        console.log('videos pb pause: ', e);
+      });
+
+      pbjs.onEvent('videoSeekStart', (e) => {
+        console.log('videos pb seekStart: ', e);
+      });
+
+      pbjs.onEvent('videoSeekEnd', (e) => {
+        console.log('videos pb seekEnd: ', e);
+      });
+
+      pbjs.onEvent('videoMute', (e) => {
+        console.log('videos pb mute: ', e);
+      });
+
+      pbjs.onEvent('videoVolume', (e) => {
+        console.log('videos pb volume: ', e);
+      });
+
+      // pbjs.onEvent('videoTime', (e) => {
+      //   console.log('videos pb time: ', e);
+      // });
+
+      pbjs.onEvent('videoComplete', (e) => {
+        console.log('videos pb complete: ', e);
+      });
+
+      pbjs.onEvent('videoFullscreen', (e) => {
+        console.log('videos pb fullscreen: ', e);
+      });
+
+      pbjs.onEvent('videoPlayerResize', (e) => {
+        console.log('videos pb playerResize: ', e);
+      });
+
+      pbjs.onEvent('videoError', (e) => {
+        console.log('videos pb error: ', e);
+      });
+
+      pbjs.onEvent('videoAdRequest', (e) => {
+        console.log('videos pb ad request: ', e);
+      });
+
+      pbjs.onEvent('videoAdLoaded', e => {
+        console.log('videos pb ad load: ', e);
+      });
+
+      pbjs.onEvent('videoAdImpression', (e) => {
+        console.log('videos pb ad impression: ', e);
+      });
+
+      pbjs.onEvent('videoAdStarted', (e) => {
+        console.log('videos pb ad started: ', e);
+      });
+
+      pbjs.onEvent('videoAdPlay', (e) => {
+        console.log('videos pb ad play: ', e);
+      });
+
+      pbjs.onEvent('videoAdPause', (e) => {
+        console.log('videos pb ad pause: ', e);
+      });
+
+      // pbjs.onEvent('videoAdTime', (e) => {
+      //   console.log('videos pb ad time: ', e);
+      // });
+
+      pbjs.onEvent('videoAdComplete', (e) => {
+        console.log('videos pb ad complete: ', e);
+      });
+
+      pbjs.onEvent('videoAdSkipped', (e) => {
+        console.log('videos pb ad skipped: ', e);
+      });
+
+      pbjs.onEvent('videoAdClick', (e) => {
+        console.log('videos pb ad click: ', e);
+      });
+
+      pbjs.onEvent('videoAdError', (e) => {
+        console.log('videos pb ad error: ', e);
+      });
+
+      pbjs.onEvent('videoAuctionAdLoadAttempt', (e) => {
+        console.log('videos pb auction ad load attempt: ', e);
+      });
+
+      pbjs.onEvent('videoAuctionAdLoadQueued', (e) => {
+        console.log('videos pb auction ad load queued: ', e);
+      });
+
+      pbjs.onEvent('videoAuctionAdLoadAbort', (e) => {
+        console.log('videos pb auction ad load attempt: ', e);
+      });
+
+      pbjs.onEvent('videoBidImpression', (e) => {
+        console.log('videos pb bid Impression: ', e);
+      });
+
+      pbjs.onEvent('videoBidError', (e) => {
+        console.log('videos pb bid Error: ', e);
+      });
+
+      pbjs.requestBids(adUnits);
+    });
+  </script>
+
+</head>
+
+<body>
+  <h2>VideoJS Event Listeners</h2>
+
+  <h5>Div-1: Player placeholder div</h5>
+  <video-js id='player' class="vjs-big-play-centered">
+  </video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/gamAdServerMediation.html b/integrationExamples/videoModule/videojs/gamAdServerMediation.html
new file mode 100644
index 00000000000..9efd77e9681
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/gamAdServerMediation.html
@@ -0,0 +1,137 @@
+<html>
+
+<head>
+    <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+          integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+          integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+    <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+            integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+            integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>VideoJS with GAM Ad Server Mediation</title>
+
+    <!--This demo configures the video provider to use GAM Ad Server as mediation. Listens to Video events that are fired when an ad impression or ad error came from a bid. -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 2, // videojs vendorCode
+              playerConfig: {
+                params: {
+                  adPluginConfig: {
+                    numRedirects: 10
+                  },
+                  vendorConfig: {
+                    controls: true,
+                    autoplay: false,
+                    preload: "auto",
+                  }
+                }
+              },
+              // Configure your Ad Server Integration
+              adServer: {
+                vendorCode: 'gam',
+                baseAdTagUrl: 'https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_preroll_skippable&sz=640x480&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator='
+                //'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=',
+              },
+            },]
+          },
+          cache: {
+            url: 'https://prebid.adnxs.com/pbc/v1/cache'
+          },
+          targetingControls: {
+            allowTargetingKeys: ['BIDDER', 'AD_ID', 'PRICE_BUCKET', 'SIZE', 'DEAL', 'SOURCE', 'FORMAT', 'UUID', 'CACHE_ID', 'CACHE_HOST', 'ADOMAIN']
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 35,
+                  mediaType: "video",
+                  vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          // Load media with its Metadata when the video player is done instantiating.
+          videojs('player').loadMedia({
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          });
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoAdRequest', (e) => {
+          console.log('videos pb ad request: ', e);
+        });
+
+        pbjs.onEvent('videoBidError', e => {
+          console.log('An Ad Error came from a Bid: ', e);
+        });
+
+        pbjs.onEvent('videoBidImpression', e => {
+          console.log('An Ad Impression came from a Bid: ', e);
+        });
+
+        pbjs.requestBids(adUnits);
+      });
+    </script>
+</head>
+
+<body>
+<h2>VideoJS with GAM Ad Server Mediation</h2>
+<h5>Div-1: Player placeholder div</h5>
+<video-js id='player' class="vjs-big-play-centered"></video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/mediaMetadata.html b/integrationExamples/videoModule/videojs/mediaMetadata.html
new file mode 100644
index 00000000000..eef12b0e19d
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/mediaMetadata.html
@@ -0,0 +1,103 @@
+<html>
+
+<head>
+    <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+          integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+          integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+    <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+            integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+            integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>VideoJS with Media Metadata</title>
+
+    <!-- This Demo loads media with metadata which is used to enrich the auction by populating the ortb site.content -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 2, // videojs vendorCode
+              playerConfig: {
+                params: {
+                  adPluginConfig: {
+                    numRedirects: 10
+                  },
+                  vendorConfig: {
+                    controls: true,
+                    autoplay: false,
+                    preload: "auto",
+                  }
+                }
+              }
+            },]
+          }
+        });
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          // Load media with its Metadata when the video player is done instantiating.
+          videojs('player').loadMedia({
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          });
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          console.log('videos pb contentLoaded: ', e);
+        });
+
+        pbjs.requestBids(adUnits);
+      });
+    </script>
+
+</head>
+
+<body>
+<h2>VideoJS with Media Metadata</h2>
+
+<h5>Div-1: Player placeholder div</h5>
+<video-js id='player' class="vjs-big-play-centered"></video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/playlist.html b/integrationExamples/videoModule/videojs/playlist.html
new file mode 100644
index 00000000000..a9e3d1bc99b
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/playlist.html
@@ -0,0 +1,151 @@
+<html>
+
+<head>
+  <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+        integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/2.1.0/videojs.ima.css"
+        integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <script src="https://vjs.zencdn.net/7.20.2/video.js"></script>
+  <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+          integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/2.1.0/videojs.ima.js"
+          integrity="sha512-SCLZezhUawfgEVvtAuWp8OpRjZVa30okAsUoUe4+wPO6BEj4dWV1rDDruNwgOUrNdKpJL0GBf0KRrslSO7nqrw=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="../../../node_modules/videojs-playlist/dist/videojs-playlist.js"></script>
+
+  <script async src="../../../build/dev/prebid.js"></script>
+
+  <title>VideoJS with Playlist</title>
+
+  <!-- This Demo sets up the videojs instance with a playlist and requests a bid whenever a new media item is loaded -->
+
+  <script>
+    // Setup ad units
+    var adUnits = [{
+      code: 'div-gpt-ad-51545-0',
+      mediaTypes: {
+        video: {}
+      },
+      video: {
+        divId: 'player', // required to indicate which player is being used to render this ad unit.
+      },
+
+      bids: [{
+        bidder: 'ix',
+        params: {
+          siteId: '300',
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        video: {
+          providers: [{
+            divId: 'player',
+            vendorCode: 2, // videojs vendorCode
+            playerConfig: {
+              params: {
+                adPluginConfig: {
+                  numRedirects: 10
+                },
+                vendorConfig: {
+                  controls: true,
+                  autoplay: false,
+                  preload: "auto",
+                }
+              }
+            }
+          },]
+        },
+        debugging: {
+          enabled: true,
+          intercept: [
+            {
+              when: {
+                adUnitCode: 'div-gpt-ad-51545-0',
+              },
+              then: {
+                cpm: 25,
+                mediaType: "video",
+                vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+              }
+            },
+          ]
+        }
+      });
+      pbjs.addAdUnits(adUnits);
+
+      pbjs.onEvent('videoSetupComplete', e => {
+        const player = videojs('player');
+        // Load the playlist items with their metadata when the video player is done instantiating.
+        player.playlist([{
+          sources: [{
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          }]
+        }, {
+          sources: [{
+            id: 'ZAZAZAZA',
+            src : "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
+            title : "Big Buck Bunny",
+            description : "Big Buck Bunny tells the story of a giant rabbit with a heart bigger than himself. When one sunny day three rodents rudely harass him, something snaps... and the rabbit ain't no bunny anymore! In the typical cartoon tradition he prepares the nasty rodents a comical revenge.\n\nLicensed under the Creative Commons Attribution license\nhttp://www.bigbuckbunny.org",
+            type: 'video/mp4'
+          }]
+        }, {
+          sources: [{
+            id: 'WSWSWSWS',
+            src: "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/Sintel.mp4",
+            title : "Sintel",
+            description: "Sintel is an independently produced short film, initiated by the Blender Foundation as a means to further improve and validate the free/open source 3D creation suite Blender. With initial funding provided by 1000s of donations via the internet community, it has again proven to be a viable development model for both open 3D technology as for independent animation film.\nThis 15 minute film has been realized in the studio of the Amsterdam Blender Institute, by an international team of artists and developers. In addition to that, several crucial technical and creative targets have been realized online, by developers and artists and teams all over the world.\nwww.sintel.org",
+            type: 'video/mp4'
+          }]
+        }]);
+
+        player.playlist.autoadvance(0);
+      });
+
+      pbjs.onEvent('videoSetupFailed', e => {
+        console.log('player setup failed: ', e);
+      });
+
+      pbjs.onEvent('videoPlaylist', (e) => {
+        console.log('videos pb playlist: ', e);
+      });
+
+      pbjs.onEvent('videoContentLoaded', (e) => {
+        console.log('videos pb contentLoaded: ', e);
+      });
+
+      pbjs.onEvent('videoComplete', (e) => {
+        console.log('videos pb complete: ', e);
+      });
+
+      pbjs.requestBids(adUnits);
+    });
+  </script>
+
+</head>
+
+<body>
+<h2>VideoJS with Playlist</h2>
+
+<h5>Div-1: Player placeholder div</h5>
+<video-js id='player' class="vjs-big-play-centered">
+</video-js>
+</body>
+
+</html>
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
index 712ef14caa1..e05d5b08afd 100644
--- a/karma.conf.maker.js
+++ b/karma.conf.maker.js
@@ -2,30 +2,29 @@
 //
 // For more information, see http://karma-runner.github.io/1.0/config/configuration-file.html
 
+const babelConfig = require('./babelConfig.js');
 var _ = require('lodash');
-var webpackConf = require('./webpack.conf');
+var webpackConf = require('./webpack.conf.js');
 var karmaConstants = require('karma').constants;
 
-function newWebpackConfig(codeCoverage) {
+function newWebpackConfig(codeCoverage, disableFeatures) {
   // Make a clone here because we plan on mutating this object, and don't want parallel tasks to trample each other.
   var webpackConfig = _.cloneDeep(webpackConf);
 
-  // remove optimize plugin for tests
-  webpackConfig.plugins.pop()
+  Object.assign(webpackConfig, {
+    mode: 'development',
+    devtool: 'inline-source-map',
+  });
 
-  webpackConfig.devtool = 'inline-source-map';
+  delete webpackConfig.entry;
+
+  webpackConfig.module.rules
+    .flatMap((r) => r.use)
+    .filter((use) => use.loader === 'babel-loader')
+    .forEach((use) => {
+      use.options = babelConfig({test: true, codeCoverage, disableFeatures});
+    });
 
-  if (codeCoverage) {
-    webpackConfig.module.rules.push({
-      enforce: 'post',
-      exclude: /(node_modules)|(test)|(integrationExamples)|(build)|polyfill.js|(src\/adapters\/analytics\/ga.js)/,
-      use: {
-        loader: '@jsdevtools/coverage-istanbul-loader',
-        options: { esModules: true }
-      },
-      test: /\.js$/
-    })
-  }
   return webpackConfig;
 }
 
@@ -107,11 +106,11 @@ function setBrowsers(karmaConf, browserstack) {
   }
 }
 
-module.exports = function(codeCoverage, browserstack, watchMode, file) {
-  var webpackConfig = newWebpackConfig(codeCoverage);
+module.exports = function(codeCoverage, browserstack, watchMode, file, disableFeatures) {
+  var webpackConfig = newWebpackConfig(codeCoverage, disableFeatures);
   var plugins = newPluginsArray(browserstack);
 
-  var files = file ? ['test/helpers/prebidGlobal.js', file] : ['test/test_index.js'];
+  var files = file ? ['test/test_deps.js', file, 'test/helpers/hookSetup.js'].flatMap(f => f) : ['test/test_index.js'];
   // This file opens the /debug.html tab automatically.
   // It has no real value unless you're running --watch, and intend to do some debugging in the browser.
   if (watchMode) {
@@ -154,6 +153,12 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
 
     reporters: ['mocha'],
 
+    client: {
+      mocha: {
+        timeout: 3000
+      }
+    },
+
     mochaReporter: {
       showDiff: true,
       output: 'minimal'
@@ -166,10 +171,20 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
     browserNoActivityTimeout: 3e5, // default 10000
     captureTimeout: 3e5, // default 60000,
     browserDisconnectTolerance: 3,
-    concurrency: 5,
+    concurrency: 5, // browserstack allows us 5 concurrent sessions
 
     plugins: plugins
+  };
+
+  // To ensure that, we are able to run single spec file
+  // here we are adding preprocessors, when file is passed
+  if (file) {
+    config.files.forEach((file) => {
+      config.preprocessors[file] = ['webpack', 'sourcemap'];
+    });
+    delete config.preprocessors['test/test_index.js'];
   }
+
   setReporters(config, codeCoverage, browserstack);
   setBrowsers(config, browserstack);
   return config;
diff --git a/karmaRunner.js b/karmaRunner.js
new file mode 100644
index 00000000000..96259069966
--- /dev/null
+++ b/karmaRunner.js
@@ -0,0 +1,23 @@
+const karma = require('karma');
+const process = require('process');
+const karmaConfMaker = require('./karma.conf.maker.js');
+
+process.on('message', function(options) {
+  try {
+    let cfg = karmaConfMaker(options.coverage, options.browserstack, options.watch, options.file, options.disableFeatures);
+    if (options.browsers && options.browsers.length) {
+      cfg.browsers = options.browsers;
+    }
+    if (options.oneBrowser) {
+      cfg.browsers = [cfg.browsers.find((b) => b.toLowerCase().includes(options.oneBrowser.toLowerCase())) || cfg.browsers[0]]
+    }
+    cfg = karma.config.parseConfig(null, cfg);
+    new karma.Server(cfg, (exitCode) => {
+      process.exit(exitCode);
+    }).start();
+  } catch (e) {
+    // eslint-disable-next-line
+    console.error(e);
+    process.exit(1);
+  }
+});
diff --git a/libraries/LIBRARIES.md b/libraries/LIBRARIES.md
new file mode 100644
index 00000000000..e4d8fcc4f98
--- /dev/null
+++ b/libraries/LIBRARIES.md
@@ -0,0 +1,5 @@
+## Cross-module libraries
+
+Each directory under this one is packaged into a "library" during the build. 
+
+Modules may share code by simply importing from a common library file; if the module is included in the build, any libraries they import from will also be included.
diff --git a/libraries/analyticsAdapter/AnalyticsAdapter.js b/libraries/analyticsAdapter/AnalyticsAdapter.js
new file mode 100644
index 00000000000..b6e270b3c3c
--- /dev/null
+++ b/libraries/analyticsAdapter/AnalyticsAdapter.js
@@ -0,0 +1,167 @@
+import CONSTANTS from '../../src/constants.json';
+import {ajax} from '../../src/ajax.js';
+import {logError, logMessage} from '../../src/utils.js';
+import * as events from '../../src/events.js';
+
+export const _internal = {
+  ajax
+};
+const ENDPOINT = 'endpoint';
+const BUNDLE = 'bundle';
+
+export const DEFAULT_INCLUDE_EVENTS = Object.values(CONSTANTS.EVENTS)
+  .filter(ev => ev !== CONSTANTS.EVENTS.AUCTION_DEBUG);
+
+let debounceDelay = 100;
+
+export function setDebounceDelay(delay) {
+  debounceDelay = delay;
+}
+
+export default function AnalyticsAdapter({ url, analyticsType, global, handler }) {
+  const queue = [];
+  let handlers;
+  let enabled = false;
+  let sampled = true;
+  let provider;
+
+  const emptyQueue = (() => {
+    let running = false;
+    let timer;
+    const clearQueue = () => {
+      if (!running) {
+        running = true; // needed to avoid recursive re-processing when analytics event handlers trigger other events
+        try {
+          let i = 0;
+          let notDecreasing = 0;
+          while (queue.length > 0) {
+            i++;
+            const len = queue.length;
+            queue.shift()();
+            if (queue.length >= len) {
+              notDecreasing++;
+            } else {
+              notDecreasing = 0
+            }
+            if (notDecreasing >= 10) {
+              logError('Detected probable infinite loop, discarding events', queue)
+              queue.length = 0;
+              return;
+            }
+          }
+          logMessage(`${provider} analytics: processed ${i} events`);
+        } finally {
+          running = false;
+        }
+      }
+    };
+    return function () {
+      if (timer != null) {
+        clearTimeout(timer);
+        timer = null;
+      }
+      debounceDelay === 0 ? clearQueue() : timer = setTimeout(clearQueue, debounceDelay);
+    }
+  })();
+
+  return Object.defineProperties({
+    track: _track,
+    enqueue: _enqueue,
+    enableAnalytics: _enable,
+    disableAnalytics: _disable,
+    getAdapterType: () => analyticsType,
+    getGlobal: () => global,
+    getHandler: () => handler,
+    getUrl: () => url
+  }, {
+    enabled: {
+      get: () => enabled
+    }
+  });
+
+  function _track({ eventType, args }) {
+    if (this.getAdapterType() === BUNDLE) {
+      window[global](handler, eventType, args);
+    }
+
+    if (this.getAdapterType() === ENDPOINT) {
+      _callEndpoint(...arguments);
+    }
+  }
+
+  function _callEndpoint({ eventType, args, callback }) {
+    _internal.ajax(url, callback, JSON.stringify({ eventType, args }));
+  }
+
+  function _enqueue({eventType, args}) {
+    queue.push(() => {
+      this.track({eventType, args});
+    });
+    emptyQueue();
+  }
+
+  function _enable(config) {
+    provider = config?.provider;
+    var _this = this;
+
+    if (typeof config === 'object' && typeof config.options === 'object') {
+      sampled = typeof config.options.sampling === 'undefined' || Math.random() < parseFloat(config.options.sampling);
+    } else {
+      sampled = true;
+    }
+
+    if (sampled) {
+      const trackedEvents = (() => {
+        const {includeEvents = DEFAULT_INCLUDE_EVENTS, excludeEvents = []} = (config || {});
+        return new Set(
+          Object.values(CONSTANTS.EVENTS)
+            .filter(ev => includeEvents.includes(ev))
+            .filter(ev => !excludeEvents.includes(ev))
+        );
+      })();
+
+      // first send all events fired before enableAnalytics called
+      events.getEvents().forEach(event => {
+        if (!event || !trackedEvents.has(event.eventType)) {
+          return;
+        }
+
+        const { eventType, args } = event;
+        _enqueue.call(_this, { eventType, args });
+      });
+
+      // Next register event listeners to send data immediately
+      handlers = Object.fromEntries(
+        Array.from(trackedEvents)
+          .map((ev) => {
+            const handler = ev === CONSTANTS.EVENTS.AUCTION_INIT
+              ? (args) => {
+                // TODO: remove this special case in v8
+                args.config = typeof config === 'object' ? config.options || {} : {};
+                this.enqueue({eventType: ev, args});
+              }
+              : (args) => this.enqueue({eventType: ev, args});
+            events.on(ev, handler);
+            return [ev, handler];
+          })
+      )
+    } else {
+      logMessage(`Analytics adapter for "${global}" disabled by sampling`);
+    }
+
+    // finally set this function to return log message, prevents multiple adapter listeners
+    this._oldEnable = this.enableAnalytics;
+    this.enableAnalytics = function _enable() {
+      return logMessage(`Analytics adapter for "${global}" already enabled, unnecessary call to \`enableAnalytics\`.`);
+    };
+    enabled = true;
+  }
+
+  function _disable() {
+    Object.entries(handlers || {}).forEach(([event, handler]) => {
+      events.off(event, handler);
+    })
+    this.enableAnalytics = this._oldEnable ? this._oldEnable : _enable;
+    enabled = false;
+  }
+}
diff --git a/libraries/analyticsAdapter/examples/example.js b/libraries/analyticsAdapter/examples/example.js
new file mode 100644
index 00000000000..c6907907b23
--- /dev/null
+++ b/libraries/analyticsAdapter/examples/example.js
@@ -0,0 +1,14 @@
+/**
+ * example.js - analytics adapter for Example Analytics Library example
+ */
+
+import adapter from '../AnalyticsAdapter.js';
+
+export default adapter(
+  {
+    url: 'http://localhost:9999/src/adapters/analytics/libraries/example.js',
+    global: 'ExampleAnalyticsGlobalObject',
+    handler: 'on',
+    analyticsType: 'library'
+  }
+);
diff --git a/libraries/analyticsAdapter/examples/example2.js b/libraries/analyticsAdapter/examples/example2.js
new file mode 100644
index 00000000000..d95a3f54283
--- /dev/null
+++ b/libraries/analyticsAdapter/examples/example2.js
@@ -0,0 +1,25 @@
+/* eslint-disable no-console */
+import { ajax } from '../../../src/ajax.js';
+
+/**
+ * example2.js - analytics adapter for Example2 Analytics Endpoint example
+ */
+
+import adapter from '../AnalyticsAdapter.js';
+
+const url = 'https://httpbin.org/post';
+const analyticsType = 'endpoint';
+
+export default Object.assign(adapter(
+  {
+    url,
+    analyticsType
+  }
+),
+{
+  // Override AnalyticsAdapter functions by supplying custom methods
+  track({ eventType, args }) {
+    console.log('track function override for Example2 Analytics');
+    ajax(url, (result) => console.log('Analytics Endpoint Example2: result = ' + result), JSON.stringify({ eventType, args }));
+  }
+});
diff --git a/libraries/analyticsAdapter/examples/libraries/example.js b/libraries/analyticsAdapter/examples/libraries/example.js
new file mode 100644
index 00000000000..f2bfd612193
--- /dev/null
+++ b/libraries/analyticsAdapter/examples/libraries/example.js
@@ -0,0 +1,59 @@
+/* eslint-disable no-console */
+/** @module example */
+
+window.ExampleAnalyticsGlobalObject = function(hander, type, data) {
+  console.log(`call to Example Analytics library: example('${hander}', '${type}', ${JSON.stringify(data)})`);
+};
+
+window[window.ExampleAnalyticsGlobalObject] = function() {};
+
+// var utils = require('utils');
+// var events = require('events');
+// var pbjsHandlers = require('prebid-event-handlers');
+var utils = { errorless: function(fn) { return fn; } };
+
+var events = { init: function() { return arguments; } };
+
+var pbjsHandlers = {
+  onBidAdjustment: args => console.log('pbjsHandlers onBidAdjustment args:', args),
+  onBidTimeout: args => console.log('pbjsHandlers bidTimeout args:', args),
+  onBidRequested: args => console.log('pbjsHandlers bidRequested args:', args),
+  onBidResponse: args => console.log('pbjsHandlers bidResponse args:', args),
+  onBidWon: args => console.log('pbjsHandlers bidWon args:', args)
+};
+
+// init
+var example = window[window.ExampleAnalyticsGlobalObject];
+var bufferedQueries = example.q || [];
+
+events.init();
+
+// overwrite example object and handle 'on' callbacks
+window[window.ExampleAnalyticsGlobalObject] = example = utils.errorless(function() {
+  if (arguments[0] && arguments[0] === 'on') {
+    var eventName = arguments[1];
+    var args = arguments[2];
+    if (eventName && args) {
+      if (eventName === 'bidAdjustment') {
+        pbjsHandlers.onBidAdjustment.apply(this, [args]);
+      }
+      if (eventName === 'bidTimeout') {
+        pbjsHandlers.onBidTimeout.apply(this, [args]);
+      }
+      if (eventName === 'bidRequested') {
+        pbjsHandlers.onBidRequested.apply(this, [args]);
+      }
+      if (eventName === 'bidResponse') {
+        pbjsHandlers.onBidResponse.apply(this, [args]);
+      }
+      if (eventName === 'bidWon') {
+        pbjsHandlers.onBidWon.apply(this, [args]);
+      }
+    }
+  }
+});
+
+// apply bufferedQueries
+bufferedQueries.forEach(function(args) {
+  example.apply(this, args);
+});
diff --git a/libraries/analyticsAdapter/examples/libraries/example2.js b/libraries/analyticsAdapter/examples/libraries/example2.js
new file mode 100644
index 00000000000..9a7106a48e0
--- /dev/null
+++ b/libraries/analyticsAdapter/examples/libraries/example2.js
@@ -0,0 +1,59 @@
+/* eslint-disable no-console */
+/** @module example */
+
+window.ExampleAnalyticsGlobalObject2 = function(hander, type, data) {
+  console.log(`call to Example2 Analytics library: example2('${hander}', '${type}', ${JSON.stringify(data)})`);
+};
+
+window[window.ExampleAnalyticsGlobalObject2] = function() {};
+
+// var utils = require('utils');
+// var events = require('events');
+// var pbjsHandlers = require('prebid-event-handlers');
+var utils = { errorless: function(fn) { return fn; } };
+
+var events = { init: function() { return arguments; } };
+
+var pbjsHandlers = {
+  onBidAdjustment: args => console.log('pbjsHandlers onBidAdjustment args:', args),
+  onBidTimeout: args => console.log('pbjsHandlers bidTimeout args:', args),
+  onBidRequested: args => console.log('pbjsHandlers bidRequested args:', args),
+  onBidResponse: args => console.log('pbjsHandlers bidResponse args:', args),
+  onBidWon: args => console.log('pbjsHandlers bidWon args:', args)
+};
+
+// init
+var example = window[window.ExampleAnalyticsGlobalObject2];
+var bufferedQueries = example.q || [];
+
+events.init();
+
+// overwrite example object and handle 'on' callbacks
+window[window.ExampleAnalyticsGlobalObject2] = example = utils.errorless(function() {
+  if (arguments[0] && arguments[0] === 'on') {
+    var eventName = arguments[1];
+    var args = arguments[2];
+    if (eventName && args) {
+      if (eventName === 'bidAdjustment') {
+        pbjsHandlers.onBidAdjustment.apply(this, [args]);
+      }
+      if (eventName === 'bidTimeout') {
+        pbjsHandlers.onBidTimeout.apply(this, [args]);
+      }
+      if (eventName === 'bidRequested') {
+        pbjsHandlers.onBidRequested.apply(this, [args]);
+      }
+      if (eventName === 'bidResponse') {
+        pbjsHandlers.onBidResponse.apply(this, [args]);
+      }
+      if (eventName === 'bidWon') {
+        pbjsHandlers.onBidWon.apply(this, [args]);
+      }
+    }
+  }
+});
+
+// apply bufferedQueries
+bufferedQueries.forEach(function(args) {
+  example.apply(this, args);
+});
diff --git a/libraries/fpd/sua.js b/libraries/fpd/sua.js
new file mode 100644
index 00000000000..b6a46763514
--- /dev/null
+++ b/libraries/fpd/sua.js
@@ -0,0 +1,98 @@
+import {isEmptyStr, isStr, isEmpty} from '../../src/utils.js';
+import {GreedyPromise} from '../../src/utils/promise.js';
+
+export const SUA_SOURCE_UNKNOWN = 0;
+export const SUA_SOURCE_LOW_ENTROPY = 1;
+export const SUA_SOURCE_HIGH_ENTROPY = 2;
+export const SUA_SOURCE_UA_HEADER = 3;
+
+// "high entropy" (i.e. privacy-sensitive) fields that can be requested from the navigator.
+export const HIGH_ENTROPY_HINTS = [
+  'architecture',
+  'bitness',
+  'model',
+  'platformVersion',
+  'fullVersionList'
+]
+
+/**
+ * Returns low entropy UA client hints encoded as an ortb2.6 device.sua object; or null if no UA client hints are available.
+ */
+export const getLowEntropySUA = lowEntropySUAAccessor();
+
+/**
+ * Returns a promise to high entropy UA client hints encoded as an ortb2.6 device.sua object, or null if no UA client hints are available.
+ *
+ * Note that the return value is a promise because the underlying browser API returns a promise; this
+ * seems to plan for additional controls (such as alerts / permission request prompts to the user); it's unclear
+ * at the moment if this means that asking for more hints would result in slower / more expensive calls.
+ *
+ * @param {Array[String]} hints hints to request, defaults to all (HIGH_ENTROPY_HINTS).
+ */
+export const getHighEntropySUA = highEntropySUAAccessor();
+
+export function lowEntropySUAAccessor(uaData = window.navigator?.userAgentData) {
+  const sua = isEmpty(uaData) ? null : Object.freeze(uaDataToSUA(SUA_SOURCE_LOW_ENTROPY, uaData));
+  return function () {
+    return sua;
+  }
+}
+
+export function highEntropySUAAccessor(uaData = window.navigator?.userAgentData) {
+  const cache = {};
+  const keys = new WeakMap();
+  return function (hints = HIGH_ENTROPY_HINTS) {
+    if (!keys.has(hints)) {
+      const sorted = Array.from(hints);
+      sorted.sort();
+      keys.set(hints, sorted.join('|'));
+    }
+    const key = keys.get(hints);
+    if (!cache.hasOwnProperty(key)) {
+      try {
+        cache[key] = uaData.getHighEntropyValues(hints).then(result => {
+          return isEmpty(result) ? null : Object.freeze(uaDataToSUA(SUA_SOURCE_HIGH_ENTROPY, result))
+        }).catch(() => null);
+      } catch (e) {
+        cache[key] = GreedyPromise.resolve(null);
+      }
+    }
+    return cache[key];
+  }
+}
+
+/**
+ * Convert a User Agent client hints object to an ORTB 2.6 device.sua fragment
+ * https://iabtechlab.com/wp-content/uploads/2022/04/OpenRTB-2-6_FINAL.pdf
+ *
+ * @param source source of the UAData object (0 to 3)
+ * @param uaData https://developer.mozilla.org/en-US/docs/Web/API/NavigatorUAData/
+ * @return {{}}
+ */
+export function uaDataToSUA(source, uaData) {
+  function toBrandVersion(brand, version) {
+    const bv = {brand};
+    if (isStr(version) && !isEmptyStr(version)) {
+      bv.version = version.split('.');
+    }
+    return bv;
+  }
+
+  const sua = {source};
+  if (uaData.platform) {
+    sua.platform = toBrandVersion(uaData.platform, uaData.platformVersion);
+  }
+  if (uaData.fullVersionList || uaData.brands) {
+    sua.browsers = (uaData.fullVersionList || uaData.brands).map(({brand, version}) => toBrandVersion(brand, version));
+  }
+  if (uaData.hasOwnProperty('mobile')) {
+    sua.mobile = uaData.mobile ? 1 : 0;
+  }
+  ['model', 'bitness', 'architecture'].forEach(prop => {
+    const value = uaData[prop];
+    if (isStr(value)) {
+      sua[prop] = value;
+    }
+  })
+  return sua;
+}
diff --git a/libraries/getOrigin/index.js b/libraries/getOrigin/index.js
new file mode 100644
index 00000000000..c37a913db07
--- /dev/null
+++ b/libraries/getOrigin/index.js
@@ -0,0 +1,11 @@
+/**
+ * Returns the origin
+ */
+export function getOrigin() {
+  // IE10 does not have this property. https://gist.github.com/hbogs/7908703
+  if (!window.location.origin) {
+    return window.location.protocol + '//' + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
+  } else {
+    return window.location.origin;
+  }
+}
diff --git a/libraries/ortb2.5StrictTranslator/dsl.js b/libraries/ortb2.5StrictTranslator/dsl.js
new file mode 100644
index 00000000000..8f9fc79feeb
--- /dev/null
+++ b/libraries/ortb2.5StrictTranslator/dsl.js
@@ -0,0 +1,54 @@
+export const ERR_TYPE = 0; // field has wrong type (only objects, enums, and arrays of objects or enums are checked)
+export const ERR_UNKNOWN_FIELD = 1; // field is not defined in ORTB 2.5 spec
+export const ERR_ENUM = 2; // field is an enum and its value is not one of those listed in the ORTB 2.5 spec
+
+// eslint-disable-next-line symbol-description
+export const extend = Symbol();
+
+export function Obj(primitiveFields, spec = {}) {
+  const scan = (path, parent, field, value, onError) => {
+    if (value == null || typeof value !== 'object') {
+      onError(ERR_TYPE, path, parent, field, value);
+      return;
+    }
+    Object.entries(value).forEach(([k, v]) => {
+      if (v == null) return;
+      const kpath = path == null ? k : `${path}.${k}`;
+      if (spec.hasOwnProperty(k)) {
+        spec[k](kpath, value, k, v, onError);
+        return;
+      }
+      if (k !== 'ext' && !primitiveFields.includes(k)) {
+        onError(ERR_UNKNOWN_FIELD, kpath, value, k, v);
+      }
+    });
+  };
+  scan[extend] = (extraPrimitives, specOverride = {}) =>
+    Obj(primitiveFields.concat(extraPrimitives), Object.assign({}, spec, specOverride));
+  return scan;
+}
+
+export const ID = Obj(['id']);
+export const Named = ID[extend](['name']);
+
+export function Arr(def) {
+  return (path, parent, field, value, onError) => {
+    if (!Array.isArray(value)) {
+      onError(ERR_TYPE, path, parent, field, value);
+    } else {
+      value.forEach((item, i) => def(`${path}.${i}`, value, i, item, onError));
+    }
+  };
+}
+
+export function IntEnum(min, max) {
+  return (path, parent, field, value, onError) => {
+    const errno = (() => {
+      if (typeof value !== 'number') return ERR_TYPE;
+      if (isNaN(value) || value > max || value < min) return ERR_ENUM;
+    })();
+    if (errno != null) {
+      onError(errno, path, parent, field, value);
+    }
+  };
+}
diff --git a/libraries/ortb2.5StrictTranslator/spec.js b/libraries/ortb2.5StrictTranslator/spec.js
new file mode 100644
index 00000000000..0ffb17a2e72
--- /dev/null
+++ b/libraries/ortb2.5StrictTranslator/spec.js
@@ -0,0 +1,81 @@
+import {Arr, extend, ID, IntEnum, Named, Obj} from './dsl.js';
+
+const CatDomain = Named[extend](['cat', 'domain']);
+const Segment = Named[extend](['value']);
+const Data = Named[extend]([], {
+  segment: Arr(Segment)
+});
+const Content = ID[extend](['episode', 'title', 'series', 'season', 'artist', 'genre', 'album', 'isrc', 'url', 'cat', 'contentrating', 'userrating', 'keywords', 'livestream', 'sourcerelationship', 'len', 'language', 'embeddable'], {
+  producer: CatDomain,
+  data: Arr(Data),
+  prodq: IntEnum(0, 3),
+  videoquality: IntEnum(0, 3),
+  context: IntEnum(1, 7),
+  qagmediarating: IntEnum(1, 3),
+});
+
+const Client = CatDomain[extend](['sectioncat', 'pagecat', 'privacypolicy', 'keywords'], {
+  publisher: CatDomain, content: Content,
+});
+const Site = Client[extend](['page', 'ref', 'search', 'mobile']);
+const App = Client[extend](['bundle', 'storeurl', 'ver', 'paid']);
+
+const Geo = Obj(['lat', 'lon', 'accuracy', 'lastfix', 'country', 'region', 'regionfips104', 'metro', 'city', 'zip', 'utcoffset'], {
+  type: IntEnum(1, 3),
+  ipservice: IntEnum(1, 4)
+});
+const Device = Obj(['ua', 'dnt', 'lmt', 'ip', 'ipv6', 'make', 'model', 'os', 'osv', 'hwv', 'h', 'w', 'ppi', 'pxratio', 'js', 'geofetch', 'flashver', 'language', 'carrier', 'mccmnc', 'ifa', 'didsha1', 'didmd5', 'dpidsha1', 'dpidmd5', 'macsha1', 'macmd5'], {
+  geo: Geo, devicetype: IntEnum(1, 7), connectiontype: IntEnum(0, 6)
+});
+const User = ID[extend](['buyeruid', 'yob', 'gender', 'keywords', 'customdata'], {
+  geo: Geo, data: Arr(Data),
+});
+
+const Floorable = ID[extend](['bidfloor', 'bidfloorcur']);
+const Deal = Floorable[extend](['at', 'wseat', 'wadomain']);
+const Pmp = Obj(['private_auction'], {
+  deals: Arr(Deal),
+});
+const Format = Obj(['w', 'h', 'wratio', 'hratio', 'wmin']);
+const MediaType = Obj(['mimes'], {
+  api: Arr(IntEnum(1, 6)), battr: Arr(IntEnum(1, 17))
+});
+const Banner = MediaType[extend](['id', 'w', 'h', 'wmax', 'hmax', 'hmin', 'wmin', 'topframe', 'vcm'], {
+  format: Arr(Format), btype: Arr(IntEnum(1, 4)), pos: IntEnum(0, 7), expdir: Arr(IntEnum(1, 5))
+});
+const Native = MediaType[extend](['request', 'ver']);
+const RichMediaType = MediaType[extend](['minduration', 'maxduration', 'startdelay', 'sequence', 'maxextended', 'minbitrate', 'maxbitrate'], {
+  protocols: Arr(IntEnum(1, 10)),
+  delivery: Arr(IntEnum(1, 3)),
+  companionad: Arr(Banner),
+  companiontype: Arr(IntEnum(1, 3)),
+});
+/*
+const Audio = RichMediaType[extend](['maxseq', 'stitched'], {
+  feed: IntEnum(1, 3), nvol: IntEnum(0, 4),
+});
+ */
+const Video = RichMediaType[extend](['w', 'h', 'skip', 'skipmin', 'skipafter', 'boxingallowed'], {
+  pos: IntEnum(0, 7),
+  protocol: IntEnum(1, 10),
+  placement: IntEnum(1, 5),
+  linearity: IntEnum(1, 2),
+  playbackmethod: Arr(IntEnum(1, 6)),
+  playbackend: IntEnum(1, 3),
+});
+const Metric = Obj(['type', 'value', 'vendor']);
+const Imp = (() => {
+  const spec = {
+    metric: Arr(Metric), banner: Banner, video: Video, pmp: Pmp,
+  };
+  if (FEATURES.NATIVE) {
+    spec.native = Native;
+  }
+  return Floorable[extend](['displaymanager', 'displaymanagerver', 'instl', 'tagid', 'clickbrowser', 'secure', 'iframebuster', 'exp'], spec);
+})();
+
+const Regs = Obj(['coppa']);
+const Source = Obj(['fd', 'tid', 'pchain']);
+export const BidRequest = ID[extend](['test', 'at', 'tmax', 'wseat', 'bseat', 'allimps', 'cur', 'wlang', 'bcat', 'badv', 'bapp'], {
+  imp: Arr(Imp), site: Site, app: App, device: Device, user: User, source: Source, regs: Regs
+});
diff --git a/libraries/ortb2.5StrictTranslator/translator.js b/libraries/ortb2.5StrictTranslator/translator.js
new file mode 100644
index 00000000000..c6f651e2476
--- /dev/null
+++ b/libraries/ortb2.5StrictTranslator/translator.js
@@ -0,0 +1,37 @@
+import {BidRequest} from './spec.js';
+import {logWarn} from '../../src/utils.js';
+import {toOrtb25} from '../ortb2.5Translator/translator.js';
+
+function deleteField(errno, path, obj, field, value) {
+  logWarn(`${path} is not valid ORTB 2.5, field will be removed from request:`, value);
+  Array.isArray(obj) ? obj.splice(field, 1) : delete obj[field];
+}
+
+/**
+ * Translates an ortb request to 2.5, and removes from the result any field that is:
+ *  - not defined in the 2.5 spec, or
+ *  - defined as an enum, but has a value that is not listed in the 2.5 spec.
+ *
+ * `ortb2` is modified in place and returned.
+ *
+ * Note that using this utility will cause your adapter to pull in an additional ~3KB after minification.
+ * If possible, consider making your endpoint tolerant to unrecognized or invalid fields instead.
+ *
+ *
+ * @param ortb2 ORTB request
+ * @param translator translation function. The default moves 2.x fields that have a known standard location in 2.5.
+ *                   See the `ortb2.5Translator` library.
+ * @param onError a function invoked once for each field that is not valid according to the 2.5 spec; it takes
+ *        (errno, path, obj, field, value), where:
+ *         - errno is an error code (defined in dsl.js)
+ *         - path is the JSON path of the offending field, for example `regs.gdpr`
+ *         - obj is the object containing the offending field, for example `ortb2.regs`
+ *         - field is the field name, for example `'gdpr'`
+ *         - value is `obj[field]`.
+ *        The default logs a warning and deletes the offending field.
+ */
+export function toOrtb25Strict(ortb2, translator = toOrtb25, onError = deleteField) {
+  ortb2 = translator(ortb2);
+  BidRequest(null, null, null, ortb2, onError);
+  return ortb2;
+}
diff --git a/libraries/ortb2.5Translator/translator.js b/libraries/ortb2.5Translator/translator.js
new file mode 100644
index 00000000000..1afad516ef0
--- /dev/null
+++ b/libraries/ortb2.5Translator/translator.js
@@ -0,0 +1,82 @@
+import {deepAccess, deepSetValue, logError} from '../../src/utils.js';
+
+export const EXT_PROMOTIONS = [
+  'source.schain',
+  'regs.gdpr',
+  'regs.us_privacy',
+  'regs.gpp',
+  'user.consent',
+  'user.eids'
+];
+
+export function splitPath(path) {
+  const parts = path.split('.');
+  const prefix = parts.slice(0, parts.length - 1).join('.');
+  const field = parts[parts.length - 1];
+  return [prefix, field];
+}
+
+/**
+ * @param sourcePath a JSON path such as `regs.us_privacy`
+ * @param dest {function(String, String): String} a function taking (prefix, field) and returning a destination path;
+ *             for example, ('regs', 'us_privacy') => 'regs.ext.us_privacy'
+ * @return {(function({}): (function(): void|undefined))|*} a function that takes an object and, if it contains
+ *        sourcePath, copies its contents to destinationPath, returning a function that deletes the original sourcePath.
+ */
+export function moveRule(sourcePath, dest = (prefix, field) => `${prefix}.ext.${field}`) {
+  const [prefix, field] = splitPath(sourcePath);
+  dest = dest(prefix, field);
+  return (ortb2) => {
+    const obj = deepAccess(ortb2, prefix);
+    if (obj?.[field] != null) {
+      deepSetValue(ortb2, dest, obj[field]);
+      return () => delete obj[field];
+    }
+  };
+}
+
+function kwarrayRule(section) {
+  // move 2.6 `kwarray` into 2.5 comma-separated `keywords`.
+  return (ortb2) => {
+    const kwarray = ortb2[section]?.kwarray;
+    if (kwarray != null) {
+      let kw = (ortb2[section].keywords || '').split(',');
+      if (Array.isArray(kwarray)) kw.push(...kwarray);
+      ortb2[section].keywords = kw.join(',');
+      return () => delete ortb2[section].kwarray;
+    }
+  };
+}
+
+export const DEFAULT_RULES = Object.freeze([
+  ...EXT_PROMOTIONS.map((f) => moveRule(f)),
+  ...['app', 'content', 'site', 'user'].map(kwarrayRule)
+]);
+
+/**
+ * Factory for ORTB 2.5 translation functions.
+ *
+ * @param deleteFields if true, the translation function will remove fields that have been translated (transferred somewhere else within the request)
+ * @param rules translation rules; an array of functions of the type returned by `moveRule`
+ * @return {function({}): {}} a translation function that takes an ORTB object, modifies it in place, and returns it.
+ */
+export function ortb25Translator(deleteFields = true, rules = DEFAULT_RULES) {
+  return function (ortb2) {
+    rules.forEach(f => {
+      try {
+        const deleter = f(ortb2);
+        if (typeof deleter === 'function' && deleteFields) deleter();
+      } catch (e) {
+        logError('Error translating request to ORTB 2.5', e);
+      }
+    })
+    return ortb2;
+  }
+}
+
+/**
+ * Translate an ortb request to version 2.5 by moving 2.6 (and later) fields that have a standardized 2.5 extension.
+ *
+ * The request is modified in place and returned.
+ */
+export const toOrtb25 = ortb25Translator();
diff --git a/libraries/ortbConverter/README.md b/libraries/ortbConverter/README.md
new file mode 100644
index 00000000000..31f56b4c754
--- /dev/null
+++ b/libraries/ortbConverter/README.md
@@ -0,0 +1,378 @@
+# Prebid.js - ORTB conversion library
+
+This library provides methods to convert Prebid.js bid request objects to ORTB requests, 
+and ORTB responses to Prebid.js bid response objects. 
+
+## Usage
+
+The simplest way to use this from an adapter is:
+
+```javascript
+import {ortbConverter} from '../../libraries/ortbConverter/converter.js'
+
+const converter = ortbConverter({     
+    context: {
+        // `netRevenue` and `ttl` are required properties of bid responses - provide a default for them 
+        netRevenue: true,    // or false if your adapter should set bidResponse.netRevenue = false
+        ttl: 30              // default bidResponse.ttl (when not specified in ORTB response.seatbid[].bid[].exp)  
+    }
+});
+
+registerBidder({
+    // ... rest of your spec goes here ...    
+    buildRequests(bidRequests, bidderRequest) {
+        const data = converter.toORTB({bidRequests, bidderRequest})
+        // you may need to adjust `data` to suit your needs - see "customization" below
+        return [{
+            method: METHOD,
+            url: ENDPOINT_URL,
+            data
+        }]
+    },
+    interpretResponse(response, request) {
+        const bids = converter.fromORTB({response: response.body, request: request.data}).bids;
+        // likewise, you may need to adjust the bid response objects
+        return bids;
+    },
+})
+```
+
+Without any customization, the library will generate complete ORTB requests, but ignores your [bid params](#params). 
+If your endpoint sets `response.seatbid[].bid[].mtype` (part of the ORTB 2.6 spec), it will also parse the response into complete bidResponse objects. See [setting response mediaTypes](#response-mediaTypes) if that is not the case.
+
+### Module-specific conversions
+
+Prebid.js features that require a module also require it for their corresponding ORTB conversion logic. For example, `imp.bidfloor` is only populated if the `priceFloors` module is active; `request.cur` needs the `currency` module, and so on. Notably, this means that to get those fields populated from your unit tests, you must import those modules first; see [this suite](https://github.com/prebid/Prebid.js/blob/master/test/spec/modules/openxOrtbBidAdapter_spec.js) for an example.
+
+## Customization
+
+### Modifying return values directly
+
+You are free to modify the objects returned by both `toORTB` and `fromORTB`:
+
+```javascript
+const data = converter.toORTB({bidRequests, bidderRequest});
+deepSetValue(data.imp[0], 'ext.myCustomParam', bidRequests[0].params.myCustomParam);
+```
+
+However, there are two restrictions (to avoid them, use the [other customization options](#fine-customization)):
+
+ - you may not change the `imp[].id` returned by `toORTB`; they ared used internally to match responses to their requests.
+     ```javascript
+     const data = converter.toORTB({bidRequests, bidderRequest});
+     data.imp[0].id = 'custom-imp-id' // do not do this - it will cause an error later in `fromORTB`
+     ```
+   See also [overriding `imp.id`](#imp-id).
+ - the `request` argument passed to `fromORTB` must be the same object returned by `toORTB`.
+    ```javascript
+    let data = converter.toORTB({bidRequests, bidderRequest});
+   
+    data = mergeDeep(                                              // the original object is lost
+      {ext: {myCustomParam: bidRequests[0].params.myCustomParam}}, // `fromORTB` will later throw an error
+      data
+    ); 
+    
+    // do this instead:                                                                                     
+    mergeDeep(                                                     
+      data, 
+      {ext: {myCustomParam: bidRequests[0].params.myCustomParam}}, 
+      data
+    )   
+    ```
+
+<a id="fine-customization" />
+### Fine grained customization - imp, request, bidResponse, response
+
+When invoked, `toORTB({bidRequests, bidderRequest})` first loops through each request in `bidRequests`, converting them into ORTB `imp` objects.
+It then packages them into a single ORTB request, adding other parameters that are not imp-specific (such as for example `request.tmax`).
+
+Likewise, `fromORTB({request, response})` first loops through each `response.seatbid[].bid[]`, converting them into Prebid bidResponses; it then packages them into 
+a single return value.
+
+You can customize each of these steps using the `ortbConverter` arguments `imp`, `request`, `bidResponse` and `response`:
+
+### <a id="imp" />Customizing imps: `imp(buildImp, bidRequest, context)`
+
+Invoked once for each input `bidRequest`; should return the ORTB `imp` object to include in the request.
+The arguments are:
+
+- `buildImp`: a function taking `(bidRequest, context)` and returning an ORTB `imp` object;
+- `bidRequest`: the bid request object to convert;
+- `context`: a [context object](#context) that contains at least:
+   - `bidderRequest`: the `bidderRequest` argument passed to `toORTB`.
+   
+#### <a id="params" />Example: attaching custom bid params
+
+```javascript
+const converter = ortbConverter({
+   imp(buildImp, bidRequest, context) {
+       const imp = buildImp(bidRequest, context);
+       deepSetValue(imp, 'ext.params', bidRequest.params);
+       return imp;
+   }
+})
+```
+
+#### <a id="imp-id" /> Example: overriding imp.id
+
+```javascript
+const converter = ortbConverter({
+   imp(buildImp, bidRequest, context) {
+       const imp = buildImp(bidRequest, context);
+       imp.id = randomIdentifierStr();
+       return imp;
+   }
+})
+```
+
+### <a id="request" /> Customizing the request: `request(buildRequest, imps, bidderRequest, context)`
+
+Invoked once after all bidRequests have been converted into `imp`s; should return the complete ORTB request. The return value
+of this function is also the return value of `toORTB`.
+The arguments are:
+
+- `buildRequest`: a function taking `(imps, bidderRequest, context)` and returning an ORTB request object;
+- `imps` an array of ORTB `imp` objects that should be included in the request;
+- `bidderRequest`: the `bidderRequest` argument passed to `toORTB`;
+- `context`: a [context object](#context) that contains at least:
+    - `bidRequests`: the `bidRequests` argument passed to `toORTB`.
+
+#### Example: setting additional request properties
+
+```javascript
+const converter = ortbConverter({
+   request(buildRequest, imps, bidderRequest, context) {
+      const request = buildRequest(imps, bidderRequest, context);
+      deepSetValue(request, 'ext.adapterVersion', '0.0.1'); 
+      return request;
+   }
+})
+```
+
+### <a id="bidResponse" /> Customizing bid responses: `bidResponse(buildBidResponse, bid, context)`
+
+Invoked once for each `seatbid[].bid[]` in the response; should return the corresponding Prebid.js bid response object.
+The arguments are:
+- `buildBidResponse`: a function taking `(bid, context)` and returning a Prebid.js bid response object;
+- `bid`: an ORTB `seatbid[].bid[]` object;
+- `context`: a [context object](#context) that contains at least:
+    - `seatbid`: the ORTB `seatbid[]` object that encloses `bid`;
+    - `imp`: the ORTB request's `imp` object that matches `bid.impid`;
+    - `bidRequest`: the Prebid.js bid request object that was used to generate `context.imp`;
+    - `ortbRequest`: the `request` argument passed to `fromORTB`;
+    - `ortbResponse`: the `response` argument passed to `fromORTB`.
+
+#### Example: setting a custom outstream renderer
+
+```javascript
+const converter = ortbConverter({
+    bidResponse(buildBidResponse, bid, context) {
+        const bidResponse = buildBidResponse(bid, context);
+        const {bidRequest} = context;
+        if (bidResponse.mediaType === VIDEO && bidRequest.mediaTypes.video.context === 'outstream') {
+            bidResponse.renderer = Renderer.install({
+                url: RENDERER_URL,
+                id: bidRequest.bidId,  
+                adUnitCode: bidRequest.adUnitCode
+            });
+        }
+        return bidResponse;
+    }
+})
+```
+
+#### <a id="response-mediaTypes" /> Example: setting response mediaType
+
+In ORTB 2.5, bid responses do not specify their mediatype, which is something Prebid.js requires. You can provide it as
+`context.mediaType`:
+
+```javascript
+const converter = ortbConverter({
+    bidResponse(buildBidResponse, bid, context) {
+        context.mediaType =  deepAccess(bid, 'ext.mediaType'); 
+        return buildBidResponse(bid, context)
+    }
+})
+```
+
+If you know that a particular ORTB request/response pair deals with exclusively one mediaType, you may also pass it directly in the [context parameter](#context). 
+Note that - compared to the above - this has additional effects, because `context.mediaType` is also considered during `imp` generation - see [special context properties](#special-context).
+
+```javascript
+converter.toORTB({
+    bidRequests: bidRequests.filter(isVideoBid),
+    bidderRequest,
+    context: {mediaType: 'video'} // make everything in this request/response deal with video only
+})
+```
+
+Note that this will _not_ work as intended:
+
+```javascript
+
+const converter = ortbConverter({
+    bidResponse(buildBidResponse, bid, context) {
+        const bidResponse = buildBidResponse(bid, context); // this throws; buildBidResponse needs to know the 
+                                                            // mediaType to properly populate bidResponse.ad, 
+                                                            // bidResponse.native etc
+        bidResponse.mediaType = deepAccess(bid, 'ext.mediaType'); // too late, use context.mediaType
+        return bidResponse;
+    }
+});
+
+```
+
+### <a id="response" /> Customizing the response: `response(buildResponse, bidResponses, ortbResponse, context)`
+
+Invoked once, after all `seatbid[].bid[]` objects have been converted to corresponding bid responses. The value returned 
+by this function is also the value returned by `fromORTB`.
+The arguments are:
+
+- `buildResponse`: a function that takes `(bidResponses, ortbResponse, context)` and returns `{bids: bidResponses}`. In the future, this may contain additional response data not necessarily tied to any bid (for example fledge auction configuration).
+- `bidResponses`: array of Prebid.js bid response objects
+- `ortbResponse`: the `response` argument passed to `fromORTB`
+- `context`: a [context object](#context) that contains at least:
+    - `ortbRequest`: the `request` argument passed to `fromORTB`;
+    - `bidderRequest`: the `bidderRequest` argument passed to `toORTB`;
+    - `bidRequests`: the `bidRequests` argument passed to `toORTB`.
+
+#### Example: logging server-side errors
+
+```javascript
+const converter = ortbConverter({
+    response(buildResponse, bidResponses, ortbResponse, context) {
+        (deepAccess(ortbResponse, 'ext.errors') || []).forEach((e) => logWarn('Server error', e));
+        return buildResponse(bidResponses, ortbResponse, context);
+    }
+})
+```
+
+### Even finer grained customization - processor overrides
+
+Each of the four conversion steps described above - imp, request, bidResponse and response - is further broken down into
+smaller units of work (called _processors_). For example, when the currency module is included, it adds a _request processor_ 
+that sets `request.cur`; the priceFloors module adds an _imp processor_ that sets `imp.bidfloor` and `imp.bidfloorcur`, and so on.
+
+Each processor can be overridden or disabled through the `overrides` argument:
+
+#### Example: disabling currency
+```javascript
+const converter = ortbConverter({
+    overrides: {
+        request: {
+            currency: false
+        }
+    }
+})
+```
+
+The above is similar in effect to:
+
+```javascript
+const converter = ortbConverter({
+    request(buildRequest, imps, bidderRequest, context) {
+        const request = buildRequest(imps, bidderRequest, context);
+        delete request.cur;
+        return request;
+    }
+})
+```
+
+With the main difference being that setting `currency: false` will disable currency logic entirely, while the `request`
+version will still set `request.cur`, then delete it. If the currency processor is ever updated to deal with more than just `request.cur`, the `request`
+function will also need to be updated accordingly.
+
+#### Example: taking video parameters from `bidRequest.params.video`
+
+Processors can also be overridden:
+
+```javascript
+const converter = ortbConverter({
+    overrides: {
+        imp: {
+            video(orig, imp, bidRequest, context) {
+                // `orig` is the video imp processor, which looks at bidRequest.mediaTypes[VIDEO] 
+                // to populate imp.video
+                // alter its input `bidRequest` to also pick up parameters from `bidRequest.params`
+                let videoParams = bidRequest.mediaTypes[VIDEO];
+                if (videoParams) {
+                    videoParams = Object.assign({}, videoParams, bidRequest.params.video);
+                    bidRequest = {...bidRequest, mediaTypes: {[VIDEO]: videoParams}}
+                }
+                orig(imp, bidRequest, context);
+            } 
+        }
+    }
+});
+```
+
+#### Processor override functions
+
+Processor overrides are similar to the override options described above, except that they take the object to process as argument:
+
+- `imp` processor overrides take `(orig, imp, bidRequest, context)`, where:
+   - `orig` is the processor function being overridden, which itself takes `(imp, bidRequest, context)`;
+   - `imp` is the (partial) imp object to modify;
+   - `bidRequest` and `context` are the same arguments passed to [imp](#imp).
+- `request` processor overrides take `(orig, ortbRequest, bidderRequest, context)`, where:
+   - `orig` is the processor function being overridden, and takes `(ortbRequest, bidderRequest, context)`;
+   - `ortbRequest` is the partial request to modify;
+   - `bidderRequest` and `context` are the same arguments passed to [request](#reuqest).
+- `bidResponse` processor overrides take `(orig, bidResponse, bid, context)`, where: 
+   - `orig` is the processor function being overridden, and takes `(bidResponse, bid, context)`;
+   - `bidResponse` is the partial bid response to modify;
+   - `bid` and `context` are the same arguments passed to [bidResponse](#bidResponse)
+- `response` processor overrides take `(orig, response, ortbResponse, context)`, where:
+   - `orig` is the processor function being overriden, and takes `(response, ortbResponse, context)`;
+   - `response` is the partial response to modify;
+   - `ortbRespones` and `context` are the same arguments passed to [response](#response).
+
+### <a id="context" /> The `context` argument
+
+All customization functions take a `context` argument. This is a plain JS object that is shared between `request` and its corresponding `response`; and between `imp` and its corresponding `bidResponse`:
+
+```javascript
+const converter = ortbConverter({
+    imp(buildImp, bidRequest, context) {
+        // `context` here will be later passed to `bidResponse` (if one matches the imp generated here)
+        context.someData = somethingInterestingAbout(bidRequest);
+        return buildImp(bidRequest, context);
+    },
+    bidResponse(buildBidResponse, bid, context) {
+        const bidResponse = buildBidResponse(bid, context);
+        doSomethingWith(context.someData);
+        return bidResponse;
+    }
+})
+```
+
+`ortbConverter` automatically populates `context` with some values of interest, such as `bidRequest`, `bidderRequest`, etc - as detailed above. In addition, you may pass additional context properties through:
+
+- the `context` argument of `ortbConverter`: e.g. `ortbConverter({context: {ttl: 30}})`. This will set `context.ttl = 30` globally for the converter.
+- the `context` argument of `toORTB`: e.g. `converter.toORTB({bidRequests, bidderRequest, context: {ttl: 30}})`. This will set `context.ttl = 30` only for this request.
+
+### <a id="special-context"/> Special `context` properties
+
+For ease of use, the conversion logic gives special meaning to some context properties:
+
+ - `currency`: a currency string (e.g. `'EUR'`). If specified, overrides the currency to use for computing price floors and `request.cur`. If omitted, both default to `getConfig('currency.adServerCurrency')`.
+ - `mediaType`: a bid mediaType (`'banner'`, `'video'`, or `'native'`). If specified:
+    - disables `imp` generation for other media types (i.e., if `context.mediaType === 'banner'`, only `imp.banner` will be populated; `imp.video` and `imp.native` will not, even if the bid request specifies them);
+    - is passed as the `mediaType` option to `bidRequest.getFloor` when computing price floors;
+    - sets `bidResponse.mediaType`.
+ - `nativeRequest`: a plain object that serves as the base value for `imp.native.request` (and is relevant only for native bid requests).
+      If not specified, the only property that is guaranteed to be populated is `assets`, since Prebid does not require anything else to define a native adUnit. You can use `context.nativeRequest` to provide other properties; for example, you may want to signal support for native impression trackers by setting it to `{eventtrackers: [{event: 1, methods: [1, 2]}]}` (see also the [ORTB Native spec](https://www.iab.com/wp-content/uploads/2018/03/OpenRTB-Native-Ads-Specification-Final-1.2.pdf)).
+ - `netRevenue`: the value to set as `bidResponse.netRevenue`. This is a required property of bid responses that does not have a clear ORTB counterpart.
+ - `ttl`: the default value to use for `bidResponse.ttl` (if the ORTB response does not provide one in `seatbid[].bid[].exp`).
+   
+## Prebid Server extensions
+
+If your endpoint is a Prebid Server instance, you may take advantage of the `pbsExtension` companion library, which adds a number of processors that can populate and parse PBS-specific extensions (typically prefixed `ext.prebid`); these include bidder params (with `transformBidParams`), bidder aliases, targeting keys, and others. 
+
+```javascript
+import {pbsExtensions} from '../../libraries/pbsExtensions/pbsExtensions.js'
+
+const pbsConverter = ortbConverter({
+    processors: pbsExtensions
+})
+```
diff --git a/libraries/ortbConverter/converter.js b/libraries/ortbConverter/converter.js
new file mode 100644
index 00000000000..2057af8b6d3
--- /dev/null
+++ b/libraries/ortbConverter/converter.js
@@ -0,0 +1,135 @@
+import {compose} from './lib/composer.js';
+import {logError, memoize} from '../../src/utils.js';
+import {DEFAULT_PROCESSORS} from './processors/default.js';
+import {BID_RESPONSE, DEFAULT, getProcessors, IMP, REQUEST, RESPONSE} from '../../src/pbjsORTB.js';
+import {mergeProcessors} from './lib/mergeProcessors.js';
+
+export function ortbConverter({
+  context: defaultContext = {},
+  processors = defaultProcessors,
+  overrides = {},
+  imp,
+  request,
+  bidResponse,
+  response,
+} = {}) {
+  const REQ_CTX = new WeakMap();
+
+  function builder(slot, wrapperFn, builderFn, errorHandler) {
+    let build;
+    return function () {
+      if (build == null) {
+        build = (function () {
+          let delegate = builderFn.bind(this, compose(processors()[slot] || {}, overrides[slot] || {}));
+          if (wrapperFn) {
+            delegate = wrapperFn.bind(this, delegate);
+          }
+          return function () {
+            try {
+              return delegate.apply(this, arguments);
+            } catch (e) {
+              errorHandler.call(this, e, ...arguments);
+            }
+          }
+        })();
+      }
+      return build.apply(this, arguments);
+    }
+  }
+
+  const buildImp = builder(IMP, imp,
+    function (process, bidRequest, context) {
+      const imp = {};
+      process(imp, bidRequest, context);
+      return imp;
+    },
+    function (error, bidRequest, context) {
+      logError('Error while converting bidRequest to ORTB imp; request skipped.', {error, bidRequest, context});
+    }
+  );
+
+  const buildRequest = builder(REQUEST, request,
+    function (process, imps, bidderRequest, context) {
+      const ortbRequest = {imp: imps};
+      process(ortbRequest, bidderRequest, context);
+      return ortbRequest;
+    },
+    function (error, imps, bidderRequest, context) {
+      logError('Error while converting to ORTB request', {error, imps, bidderRequest, context});
+      throw error;
+    }
+  );
+
+  const buildBidResponse = builder(BID_RESPONSE, bidResponse,
+    function (process, bid, context) {
+      const bidResponse = {};
+      process(bidResponse, bid, context);
+      return bidResponse;
+    },
+    function (error, bid, context) {
+      logError('Error while converting ORTB seatbid.bid to bidResponse; bid skipped.', {error, bid, context});
+    }
+  );
+
+  const buildResponse = builder(RESPONSE, response,
+    function (process, bidResponses, ortbResponse, context) {
+      const response = {bids: bidResponses};
+      process(response, ortbResponse, context);
+      return response;
+    },
+    function (error, bidResponses, ortbResponse, context) {
+      logError('Error while converting from ORTB response', {error, bidResponses, ortbResponse, context});
+      throw error;
+    }
+  );
+
+  return {
+    toORTB({bidderRequest, bidRequests, context = {}}) {
+      bidRequests = bidRequests || bidderRequest.bids;
+      const ctx = {
+        req: Object.assign({bidRequests}, defaultContext, context),
+        imp: {}
+      }
+      const imps = bidRequests.map(bidRequest => {
+        const impContext = Object.assign({bidderRequest, reqContext: ctx.req}, defaultContext, context);
+        const result = buildImp(bidRequest, impContext);
+        if (result != null) {
+          if (result.hasOwnProperty('id')) {
+            impContext.bidRequest = bidRequest;
+            ctx.imp[result.id] = impContext;
+            return result;
+          }
+          logError('Converted ORTB imp does not specify an id, ignoring bid request', bidRequest, result);
+        }
+      }).filter(Boolean);
+
+      const request = buildRequest(imps, bidderRequest, ctx.req);
+      ctx.req.bidderRequest = bidderRequest;
+      if (request != null) {
+        REQ_CTX.set(request, ctx);
+      }
+      return request;
+    },
+    fromORTB({request, response}) {
+      const ctx = REQ_CTX.get(request);
+      if (ctx == null) {
+        throw new Error('ortbRequest passed to `fromORTB` must be the same object returned by `toORTB`')
+      }
+      function augmentContext(ctx, extraParams = {}) {
+        return Object.assign({ortbRequest: request}, extraParams, ctx);
+      }
+      const impsById = Object.fromEntries((request.imp || []).map(imp => [imp.id, imp]));
+      const bidResponses = (response.seatbid || []).flatMap(seatbid =>
+        (seatbid.bid || []).map((bid) => {
+          if (impsById.hasOwnProperty(bid.impid) && ctx.imp.hasOwnProperty(bid.impid)) {
+            return buildBidResponse(bid, augmentContext(ctx.imp[bid.impid], {imp: impsById[bid.impid], seatbid, ortbResponse: response}));
+          }
+          logError('ORTB response seatbid[].bid[].impid does not match any imp in request; ignoring bid', bid);
+        })
+      ).filter(Boolean);
+      return buildResponse(bidResponses, response, augmentContext(ctx.req));
+    }
+  }
+}
+
+export const defaultProcessors = memoize(() => mergeProcessors(DEFAULT_PROCESSORS, getProcessors(DEFAULT)));
diff --git a/libraries/ortbConverter/lib/composer.js b/libraries/ortbConverter/lib/composer.js
new file mode 100644
index 00000000000..0ceff7f9edb
--- /dev/null
+++ b/libraries/ortbConverter/lib/composer.js
@@ -0,0 +1,43 @@
+const SORTED = new WeakMap();
+
+/**
+ * @typedef {Object} Component
+ * A component function, that can be composed with other compatible functions into one.
+ * Compatible functions take the same arguments; return values are ignored.
+ *
+ * @property {function} fn the component function;
+ * @property {number} priority determines the order in which this function will run when composed with others.
+ */
+
+/**
+ *
+ * @param {Object[string, Component]} components to compose
+ * @param {Object[string, function|boolean]} overrides a map from component name, to a function that should override that component.
+ * Override functions are replacements, except that they get the original function they are overriding as their first argument. If the override
+ * is `false`, the component is disabled.
+ *
+ * @return a function that will run all components in order of priority, with functions from `overrides` taking
+ * precedence over components that match names
+ */
+export function compose(components, overrides = {}) {
+  if (!SORTED.has(components)) {
+    const sorted = Object.entries(components);
+    sorted.sort((a, b) => {
+      a = a[1].priority || 0;
+      b = b[1].priority || 0;
+      return a === b ? 0 : a > b ? -1 : 1
+    });
+    SORTED.set(components, sorted.map(([name, cmp]) => [name, cmp.fn]))
+  }
+  const fns = SORTED.get(components)
+    .filter(([name]) => !overrides.hasOwnProperty(name) || overrides[name])
+    .map(function ([name, fn]) {
+      return overrides.hasOwnProperty(name) ? overrides[name].bind(this, fn) : fn;
+    });
+  return function () {
+    const args = Array.from(arguments);
+    fns.forEach(fn => {
+      fn.apply(this, args);
+    })
+  }
+}
diff --git a/libraries/ortbConverter/lib/mergeProcessors.js b/libraries/ortbConverter/lib/mergeProcessors.js
new file mode 100644
index 00000000000..357cecd45aa
--- /dev/null
+++ b/libraries/ortbConverter/lib/mergeProcessors.js
@@ -0,0 +1,9 @@
+import {PROCESSOR_TYPES} from '../../../src/pbjsORTB.js';
+
+export function mergeProcessors(...processors) {
+  const left = processors.shift();
+  const right = processors.length > 1 ? mergeProcessors(...processors) : processors[0];
+  return Object.fromEntries(
+    PROCESSOR_TYPES.map(type => [type, Object.assign({}, left[type], right[type])])
+  )
+}
diff --git a/libraries/ortbConverter/lib/sizes.js b/libraries/ortbConverter/lib/sizes.js
new file mode 100644
index 00000000000..16b75048203
--- /dev/null
+++ b/libraries/ortbConverter/lib/sizes.js
@@ -0,0 +1,14 @@
+import {parseSizesInput} from '../../../src/utils.js';
+
+export function sizesToFormat(sizes) {
+  sizes = parseSizesInput(sizes);
+
+  // get sizes in form [{ w: <int>, h: <int> }, ...]
+  return sizes.map(size => {
+    const [width, height] = size.split('x');
+    return {
+      w: parseInt(width, 10),
+      h: parseInt(height, 10)
+    };
+  });
+}
diff --git a/libraries/ortbConverter/processors/banner.js b/libraries/ortbConverter/processors/banner.js
new file mode 100644
index 00000000000..51c93b652ef
--- /dev/null
+++ b/libraries/ortbConverter/processors/banner.js
@@ -0,0 +1,40 @@
+import {createTrackPixelHtml, deepAccess, inIframe, mergeDeep} from '../../../src/utils.js';
+import {BANNER} from '../../../src/mediaTypes.js';
+import {sizesToFormat} from '../lib/sizes.js';
+
+/**
+ * fill in a request `imp` with banner parameters from `bidRequest`.
+ */
+export function fillBannerImp(imp, bidRequest, context) {
+  if (context.mediaType && context.mediaType !== BANNER) return;
+
+  const bannerParams = deepAccess(bidRequest, 'mediaTypes.banner');
+  if (bannerParams) {
+    const banner = {
+      topframe: inIframe() === true ? 0 : 1
+    };
+    if (bannerParams.sizes) {
+      banner.format = sizesToFormat(bannerParams.sizes);
+    }
+    if (bannerParams.hasOwnProperty('pos')) {
+      banner.pos = bannerParams.pos;
+    }
+
+    imp.banner = mergeDeep(banner, imp.banner);
+  }
+}
+
+export function bannerResponseProcessor({createPixel = (url) => createTrackPixelHtml(decodeURIComponent(url))} = {}) {
+  return function fillBannerResponse(bidResponse, bid) {
+    if (bidResponse.mediaType === BANNER) {
+      if (bid.adm && bid.nurl) {
+        bidResponse.ad = bid.adm;
+        bidResponse.ad += createPixel(bid.nurl);
+      } else if (bid.adm) {
+        bidResponse.ad = bid.adm;
+      } else if (bid.nurl) {
+        bidResponse.adUrl = bid.nurl;
+      }
+    }
+  };
+}
diff --git a/libraries/ortbConverter/processors/default.js b/libraries/ortbConverter/processors/default.js
new file mode 100644
index 00000000000..8d44de00fa2
--- /dev/null
+++ b/libraries/ortbConverter/processors/default.js
@@ -0,0 +1,135 @@
+import {deepSetValue, mergeDeep} from '../../../src/utils.js';
+import {bannerResponseProcessor, fillBannerImp} from './banner.js';
+import {fillVideoImp, fillVideoResponse} from './video.js';
+import {setResponseMediaType} from './mediaType.js';
+import {fillNativeImp, fillNativeResponse} from './native.js';
+import {BID_RESPONSE, IMP, REQUEST} from '../../../src/pbjsORTB.js';
+import {config} from '../../../src/config.js';
+
+export const DEFAULT_PROCESSORS = {
+  [REQUEST]: {
+    fpd: {
+      // sets initial request to bidderRequest.ortb2
+      priority: 99,
+      fn(ortbRequest, bidderRequest) {
+        mergeDeep(ortbRequest, bidderRequest.ortb2)
+      }
+    },
+    // override FPD app, site, and device with getConfig('app'), etc if defined
+    // TODO: these should be deprecated for v8
+    appFpd: fpdFromTopLevelConfig('app'),
+    siteFpd: fpdFromTopLevelConfig('site'),
+    deviceFpd: fpdFromTopLevelConfig('device'),
+    props: {
+      // sets request properties id, tmax, test, source.tid
+      fn(ortbRequest, bidderRequest) {
+        Object.assign(ortbRequest, {
+          id: ortbRequest.id || bidderRequest.auctionId,
+          test: ortbRequest.test || 0
+        });
+        const timeout = parseInt(bidderRequest.timeout, 10);
+        if (!isNaN(timeout)) {
+          ortbRequest.tmax = timeout;
+        }
+        deepSetValue(ortbRequest, 'source.tid', ortbRequest.source?.tid || bidderRequest.auctionId);
+      }
+    }
+  },
+  [IMP]: {
+    fpd: {
+      // sets initial imp to bidRequest.ortb2Imp
+      priority: 99,
+      fn(imp, bidRequest) {
+        mergeDeep(imp, bidRequest.ortb2Imp);
+      }
+    },
+    id: {
+      // sets imp.id
+      fn(imp, bidRequest) {
+        imp.id = bidRequest.bidId;
+      }
+    },
+    banner: {
+      // populates imp.banner
+      fn: fillBannerImp
+    },
+    video: {
+      // populates imp.video
+      fn: fillVideoImp
+    },
+    pbadslot: {
+      // removes imp.ext.data.pbaslot if it's not a string
+      // TODO: is this needed?
+      fn(imp) {
+        const pbadslot = imp.ext?.data?.pbadslot;
+        if (!pbadslot || typeof pbadslot !== 'string') {
+          delete imp.ext?.data?.pbadslot;
+        }
+      }
+    }
+  },
+  [BID_RESPONSE]: {
+    mediaType: {
+      // sets bidResponse.mediaType from context.mediaType, falling back to seatbid.bid[].mtype
+      priority: 99,
+      fn: setResponseMediaType
+    },
+    banner: {
+      // sets banner response attributes if bidResponse.mediaType === BANNER
+      fn: bannerResponseProcessor(),
+    },
+    video: {
+      // sets video response attributes if bidResponse.mediaType === VIDEO
+      fn: fillVideoResponse
+    },
+    props: {
+      // sets base bidResponse properties common to all types of bids
+      fn(bidResponse, bid, context) {
+        Object.entries({
+          requestId: context.bidRequest?.bidId,
+          seatBidId: bid.id,
+          cpm: bid.price,
+          currency: context.ortbResponse.cur || context.currency,
+          width: bid.w,
+          height: bid.h,
+          dealId: bid.dealid,
+          creative_id: bid.crid,
+          creativeId: bid.crid,
+          burl: bid.burl,
+          ttl: bid.exp || context.ttl,
+          netRevenue: context.netRevenue,
+        }).filter(([k, v]) => typeof v !== 'undefined')
+          .forEach(([k, v]) => bidResponse[k] = v);
+        if (!bidResponse.meta) {
+          bidResponse.meta = {};
+        }
+        if (bid.adomain) {
+          bidResponse.meta.advertiserDomains = bid.adomain;
+        }
+      }
+    }
+  }
+}
+
+if (FEATURES.NATIVE) {
+  DEFAULT_PROCESSORS[IMP].native = {
+    // populates imp.native
+    fn: fillNativeImp
+  }
+  DEFAULT_PROCESSORS[BID_RESPONSE].native = {
+    // populates bidResponse.native if bidResponse.mediaType === NATIVE
+    fn: fillNativeResponse
+  }
+}
+
+function fpdFromTopLevelConfig(prop) {
+  return {
+    priority: 90, // after FPD from 'ortb2', before the rest
+    fn(ortbRequest) {
+      const data = config.getConfig(prop);
+      if (typeof data === 'object') {
+        ortbRequest[prop] = mergeDeep({}, ortbRequest[prop], data);
+      }
+    }
+  }
+}
diff --git a/libraries/ortbConverter/processors/mediaType.js b/libraries/ortbConverter/processors/mediaType.js
new file mode 100644
index 00000000000..67232b3ca44
--- /dev/null
+++ b/libraries/ortbConverter/processors/mediaType.js
@@ -0,0 +1,21 @@
+import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes.js';
+
+export const ORTB_MTYPES = {
+  1: BANNER,
+  2: VIDEO,
+  4: NATIVE
+}
+
+/**
+ * Sets response mediaType, using ORTB 2.6 `seatbid.bid[].mtype`.
+ *
+ * Note that this will throw away bids if there is no `mtype` in the response.
+ */
+export function setResponseMediaType(bidResponse, bid, context) {
+  if (bidResponse.mediaType) return;
+  const mediaType = context.mediaType;
+  if (!mediaType && !ORTB_MTYPES.hasOwnProperty(bid.mtype)) {
+    throw new Error('Cannot determine mediaType for response')
+  }
+  bidResponse.mediaType = mediaType || ORTB_MTYPES[bid.mtype];
+}
diff --git a/libraries/ortbConverter/processors/native.js b/libraries/ortbConverter/processors/native.js
new file mode 100644
index 00000000000..ff231ce2b55
--- /dev/null
+++ b/libraries/ortbConverter/processors/native.js
@@ -0,0 +1,37 @@
+import {isPlainObject, logWarn, mergeDeep} from '../../../src/utils.js';
+import {NATIVE} from '../../../src/mediaTypes.js';
+
+export function fillNativeImp(imp, bidRequest, context) {
+  if (context.mediaType && context.mediaType !== NATIVE) return;
+  let nativeReq = bidRequest.nativeOrtbRequest;
+  if (nativeReq) {
+    nativeReq = Object.assign({}, context.nativeRequest, nativeReq);
+    if (nativeReq.assets?.length) {
+      imp.native = mergeDeep({}, {
+        request: JSON.stringify(nativeReq),
+        ver: nativeReq.ver
+      }, imp.native)
+    } else {
+      logWarn('mediaTypes.native is set, but no assets were specified. Native request skipped.', bidRequest)
+    }
+  }
+}
+
+export function fillNativeResponse(bidResponse, bid) {
+  if (bidResponse.mediaType === NATIVE) {
+    let ortb;
+    if (typeof bid.adm === 'string') {
+      ortb = JSON.parse(bid.adm);
+    } else {
+      ortb = bid.adm;
+    }
+
+    if (isPlainObject(ortb) && Array.isArray(ortb.assets)) {
+      bidResponse.native = {
+        ortb,
+      }
+    } else {
+      throw new Error('ORTB native response contained no assets');
+    }
+  }
+}
diff --git a/libraries/ortbConverter/processors/video.js b/libraries/ortbConverter/processors/video.js
new file mode 100644
index 00000000000..5fe411e6bcf
--- /dev/null
+++ b/libraries/ortbConverter/processors/video.js
@@ -0,0 +1,66 @@
+import {deepAccess, isEmpty, logWarn, mergeDeep} from '../../../src/utils.js';
+import {VIDEO} from '../../../src/mediaTypes.js';
+import {sizesToFormat} from '../lib/sizes.js';
+
+// parameters that share the same name & semantics between pbjs adUnits and imp.video
+const ORTB_VIDEO_PARAMS = new Set([
+  'pos',
+  'placement',
+  'api',
+  'mimes',
+  'protocols',
+  'playbackmethod',
+  'minduration',
+  'maxduration',
+  'w',
+  'h',
+  'startdelay',
+  'placement',
+  'linearity',
+  'skip',
+  'skipmin',
+  'skipafter',
+  'minbitrate',
+  'maxbitrate',
+  'delivery',
+  'playbackend'
+]);
+
+const PLACEMENT = {
+  'instream': 1,
+}
+
+export function fillVideoImp(imp, bidRequest, context) {
+  if (context.mediaType && context.mediaType !== VIDEO) return;
+
+  const videoParams = deepAccess(bidRequest, 'mediaTypes.video');
+  if (!isEmpty(videoParams)) {
+    const video = Object.fromEntries(
+      Object.entries(videoParams)
+        .filter(([name]) => ORTB_VIDEO_PARAMS.has(name))
+    );
+    if (videoParams.playerSize) {
+      const format = sizesToFormat(videoParams.playerSize);
+      if (format.length > 1) {
+        logWarn('video request specifies more than one playerSize; all but the first will be ignored')
+      }
+      Object.assign(video, format[0]);
+    }
+    const placement = PLACEMENT[videoParams.context];
+    if (placement != null) {
+      video.placement = placement;
+    }
+    imp.video = mergeDeep(video, imp.video);
+  }
+}
+
+export function fillVideoResponse(bidResponse, seatbid, context) {
+  if (bidResponse.mediaType === VIDEO) {
+    if (deepAccess(context.imp, 'video.w') && deepAccess(context.imp, 'video.h')) {
+      [bidResponse.playerWidth, bidResponse.playerHeight] = [context.imp.video.w, context.imp.video.h];
+    }
+
+    if (seatbid.adm) { bidResponse.vastXml = seatbid.adm; }
+    if (seatbid.nurl) { bidResponse.vastUrl = seatbid.nurl; }
+  }
+}
diff --git a/libraries/pbsExtensions/pbsExtensions.js b/libraries/pbsExtensions/pbsExtensions.js
new file mode 100644
index 00000000000..1efded6173f
--- /dev/null
+++ b/libraries/pbsExtensions/pbsExtensions.js
@@ -0,0 +1,12 @@
+import {mergeProcessors} from '../ortbConverter/lib/mergeProcessors.js';
+import {PBS_PROCESSORS} from './processors/pbs.js';
+import {getProcessors, PBS} from '../../src/pbjsORTB.js';
+import {defaultProcessors} from '../ortbConverter/converter.js';
+import {memoize} from '../../src/utils.js';
+
+/**
+ * ORTB converter processor set that understands Prebid Server extensions.
+ *
+ * Pass this as the `processors` option to `ortbConverter` if your backend is a PBS instance.
+ */
+export const pbsExtensions = memoize(() => mergeProcessors(defaultProcessors(), PBS_PROCESSORS, getProcessors(PBS)));
diff --git a/libraries/pbsExtensions/processors/adUnitCode.js b/libraries/pbsExtensions/processors/adUnitCode.js
new file mode 100644
index 00000000000..f936e0f662f
--- /dev/null
+++ b/libraries/pbsExtensions/processors/adUnitCode.js
@@ -0,0 +1,13 @@
+import {deepSetValue} from '../../../src/utils.js';
+
+export function setImpAdUnitCode(imp, bidRequest) {
+  const adUnitCode = bidRequest.adUnitCode;
+
+  if (adUnitCode) {
+    deepSetValue(
+      imp,
+      `ext.prebid.adunitcode`,
+      adUnitCode
+    );
+  }
+}
diff --git a/libraries/pbsExtensions/processors/aliases.js b/libraries/pbsExtensions/processors/aliases.js
new file mode 100644
index 00000000000..3dcd2c4fd9b
--- /dev/null
+++ b/libraries/pbsExtensions/processors/aliases.js
@@ -0,0 +1,17 @@
+import adapterManager from '../../../src/adapterManager.js';
+import {deepSetValue} from '../../../src/utils.js';
+
+export function setRequestExtPrebidAliases(ortbRequest, bidderRequest, context, {am = adapterManager} = {}) {
+  if (am.aliasRegistry[bidderRequest.bidderCode]) {
+    const bidder = am.bidderRegistry[bidderRequest.bidderCode];
+    // adding alias only if alias source bidder exists and alias isn't configured to be standalone
+    // pbs adapter
+    if (!bidder || !bidder.getSpec().skipPbsAliasing) {
+      deepSetValue(
+        ortbRequest,
+        `ext.prebid.aliases.${bidderRequest.bidderCode}`,
+        am.aliasRegistry[bidderRequest.bidderCode]
+      );
+    }
+  }
+}
diff --git a/libraries/pbsExtensions/processors/mediaType.js b/libraries/pbsExtensions/processors/mediaType.js
new file mode 100644
index 00000000000..cbcf9a013b1
--- /dev/null
+++ b/libraries/pbsExtensions/processors/mediaType.js
@@ -0,0 +1,23 @@
+import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes.js';
+import {ORTB_MTYPES} from '../../ortbConverter/processors/mediaType.js';
+
+export const SUPPORTED_MEDIA_TYPES = {
+  // map from pbjs mediaType to its corresponding imp property
+  [BANNER]: 'banner',
+  [NATIVE]: 'native',
+  [VIDEO]: 'video'
+}
+
+/**
+ * Sets bidResponse.mediaType, using ORTB 2.6 `seatbid.bid[].mtype`, falling back to `ext.prebid.type`, falling back to 'banner'.
+ */
+export function extPrebidMediaType(bidResponse, bid, context) {
+  let mediaType = context.mediaType;
+  if (!mediaType) {
+    mediaType = ORTB_MTYPES.hasOwnProperty(bid.mtype) ? ORTB_MTYPES[bid.mtype] : bid.ext?.prebid?.type
+    if (!SUPPORTED_MEDIA_TYPES.hasOwnProperty(mediaType)) {
+      mediaType = BANNER;
+    }
+  }
+  bidResponse.mediaType = mediaType;
+}
diff --git a/libraries/pbsExtensions/processors/params.js b/libraries/pbsExtensions/processors/params.js
new file mode 100644
index 00000000000..010ffa5b372
--- /dev/null
+++ b/libraries/pbsExtensions/processors/params.js
@@ -0,0 +1,22 @@
+import {auctionManager} from '../../../src/auctionManager.js';
+import adapterManager from '../../../src/adapterManager.js';
+import {deepSetValue} from '../../../src/utils.js';
+
+export function setImpBidParams(
+  imp, bidRequest, context,
+  {adUnit, bidderRequests, index = auctionManager.index, bidderRegistry = adapterManager.bidderRegistry} = {}) {
+  let params = bidRequest.params;
+  const adapter = bidderRegistry[bidRequest.bidder];
+  if (adapter && adapter.getSpec().transformBidParams) {
+    adUnit = adUnit || index.getAdUnit(bidRequest);
+    bidderRequests = bidderRequests || [context.bidderRequest];
+    params = adapter.getSpec().transformBidParams(params, true, adUnit, bidderRequests);
+  }
+  if (params) {
+    deepSetValue(
+      imp,
+      `ext.prebid.bidder.${bidRequest.bidder}`,
+      params
+    );
+  }
+}
diff --git a/libraries/pbsExtensions/processors/pbs.js b/libraries/pbsExtensions/processors/pbs.js
new file mode 100644
index 00000000000..0ed2d12fad8
--- /dev/null
+++ b/libraries/pbsExtensions/processors/pbs.js
@@ -0,0 +1,104 @@
+import {BID_RESPONSE, IMP, REQUEST, RESPONSE} from '../../../src/pbjsORTB.js';
+import {deepAccess, isPlainObject, isStr, mergeDeep} from '../../../src/utils.js';
+import {extPrebidMediaType} from './mediaType.js';
+import {setRequestExtPrebidAliases} from './aliases.js';
+import {setImpBidParams} from './params.js';
+import {setImpAdUnitCode} from './adUnitCode.js';
+import {setRequestExtPrebid, setRequestExtPrebidChannel} from './requestExtPrebid.js';
+import {setBidResponseVideoCache} from './video.js';
+
+export const PBS_PROCESSORS = {
+  [REQUEST]: {
+    extPrebid: {
+      // set request.ext.prebid.auctiontimestamp, .debug and .targeting
+      fn: setRequestExtPrebid
+    },
+    extPrebidChannel: {
+      // sets request.ext.prebid.channel
+      fn: setRequestExtPrebidChannel
+    },
+    extPrebidAliases: {
+      // sets ext.prebid.aliases
+      fn: setRequestExtPrebidAliases
+    }
+  },
+  [IMP]: {
+    params: {
+      // sets bid ext.prebid.bidder.[bidderCode] with bidRequest.params, passed through transformBidParams if necessary
+      fn: setImpBidParams
+    },
+    adUnitCode: {
+      // sets bid ext.prebid.adunitcode
+      fn: setImpAdUnitCode
+    }
+  },
+  [BID_RESPONSE]: {
+    mediaType: {
+      // sets bidResponse.mediaType according to context.mediaType, falling back to imp.ext.prebid.type
+      fn: extPrebidMediaType,
+      priority: 99,
+    },
+    videoCache: {
+      // sets response video attributes; in addition, looks at ext.prebid.cache and .targeting to set video cache key and URL
+      fn: setBidResponseVideoCache,
+      priority: -10, // after 'video'
+    },
+    bidderCode: {
+      // sets bidderCode from on seatbid.seat
+      fn(bidResponse, bid, context) {
+        bidResponse.bidderCode = context.seatbid.seat;
+        bidResponse.adapterCode = deepAccess(bid, 'ext.prebid.meta.adaptercode') || context.bidRequest?.bidder || bidResponse.bidderCode;
+      }
+    },
+    pbsBidId: {
+      // sets bidResponse.pbsBidId from ext.prebid.bidid
+      fn(bidResponse, bid) {
+        const bidId = deepAccess(bid, 'ext.prebid.bidid');
+        if (isStr(bidId)) {
+          bidResponse.pbsBidId = bidId;
+        }
+      }
+    },
+    adserverTargeting: {
+      // sets bidResponse.adserverTargeting from ext.prebid.targeting
+      fn(bidResponse, bid) {
+        const targeting = deepAccess(bid, 'ext.prebid.targeting');
+        if (isPlainObject(targeting)) {
+          bidResponse.adserverTargeting = targeting;
+        }
+      }
+    },
+    extPrebidMeta: {
+      // sets bidResponse.meta from ext.prebid.meta
+      fn(bidResponse, bid) {
+        bidResponse.meta = mergeDeep({}, deepAccess(bid, 'ext.prebid.meta'), bidResponse.meta);
+      }
+    },
+    pbsWurl: {
+      // sets bidResponse.pbsWurl from ext.prebid.events.win
+      fn(bidResponse, bid) {
+        const wurl = deepAccess(bid, 'ext.prebid.events.win');
+        if (isStr(wurl)) {
+          bidResponse.pbsWurl = wurl;
+        }
+      }
+    },
+  },
+  [RESPONSE]: {
+    serverSideStats: {
+      // updates bidderRequest and bidRequests with serverErrors from ext.errors and serverResponseTimeMs from ext.responsetimemillis
+      fn(response, ortbResponse, context) {
+        Object.entries({
+          errors: 'serverErrors',
+          responsetimemillis: 'serverResponseTimeMs'
+        }).forEach(([serverName, clientName]) => {
+          const value = deepAccess(ortbResponse, `ext.${serverName}.${context.bidderRequest.bidderCode}`);
+          if (value) {
+            context.bidderRequest[clientName] = value;
+            context.bidRequests.forEach(bid => bid[clientName] = value);
+          }
+        })
+      }
+    },
+  }
+}
diff --git a/libraries/pbsExtensions/processors/requestExtPrebid.js b/libraries/pbsExtensions/processors/requestExtPrebid.js
new file mode 100644
index 00000000000..bbb6add45ce
--- /dev/null
+++ b/libraries/pbsExtensions/processors/requestExtPrebid.js
@@ -0,0 +1,30 @@
+import {deepSetValue, mergeDeep} from '../../../src/utils.js';
+import {config} from '../../../src/config.js';
+import {getGlobal} from '../../../src/prebidGlobal.js';
+
+export function setRequestExtPrebid(ortbRequest, bidderRequest) {
+  deepSetValue(
+    ortbRequest,
+    'ext.prebid',
+    mergeDeep(
+      {
+        auctiontimestamp: bidderRequest.auctionStart,
+        targeting: {
+          includewinners: true,
+          includebidderkeys: false
+        }
+      },
+      ortbRequest.ext?.prebid,
+    )
+  );
+  if (config.getConfig('debug')) {
+    ortbRequest.ext.prebid.debug = true;
+  }
+}
+
+export function setRequestExtPrebidChannel(ortbRequest) {
+  deepSetValue(ortbRequest, 'ext.prebid.channel', Object.assign({
+    name: 'pbjs',
+    version: getGlobal().version
+  }, ortbRequest.ext?.prebid?.channel));
+}
diff --git a/libraries/pbsExtensions/processors/video.js b/libraries/pbsExtensions/processors/video.js
new file mode 100644
index 00000000000..0a517fd0575
--- /dev/null
+++ b/libraries/pbsExtensions/processors/video.js
@@ -0,0 +1,23 @@
+import {VIDEO} from '../../../src/mediaTypes.js';
+import {deepAccess} from '../../../src/utils.js';
+
+export function setBidResponseVideoCache(bidResponse, bid) {
+  if (bidResponse.mediaType === VIDEO) {
+    // try to get cache values from 'response.ext.prebid.cache'
+    // else try 'bid.ext.prebid.targeting' as fallback
+    let {cacheId: videoCacheKey, url: vastUrl} = deepAccess(bid, 'ext.prebid.cache.vastXml') || {};
+    if (!videoCacheKey || !vastUrl) {
+      const {hb_uuid: uuid, hb_cache_host: cacheHost, hb_cache_path: cachePath} = deepAccess(bid, 'ext.prebid.targeting') || {};
+      if (uuid && cacheHost && cachePath) {
+        videoCacheKey = uuid;
+        vastUrl = `https://${cacheHost}${cachePath}?uuid=${uuid}`;
+      }
+    }
+    if (videoCacheKey && vastUrl) {
+      Object.assign(bidResponse, {
+        videoCacheKey,
+        vastUrl
+      })
+    }
+  }
+}
diff --git a/libraries/video/constants/constants.js b/libraries/video/constants/constants.js
new file mode 100644
index 00000000000..55e3785ccc2
--- /dev/null
+++ b/libraries/video/constants/constants.js
@@ -0,0 +1,7 @@
+export const videoKey = 'video';
+
+export const PLAYBACK_MODE = {
+  VOD: 0,
+  LIVE: 1,
+  DVR: 2
+};
diff --git a/libraries/video/constants/events.js b/libraries/video/constants/events.js
new file mode 100644
index 00000000000..b7932adf621
--- /dev/null
+++ b/libraries/video/constants/events.js
@@ -0,0 +1,98 @@
+// Life Cycle
+export const SETUP_COMPLETE = 'setupComplete';
+export const SETUP_FAILED = 'setupFailed';
+export const DESTROYED = 'destroyed';
+
+// Ads
+export const AD_REQUEST = 'adRequest';
+export const AD_BREAK_START = 'adBreakStart';
+export const AD_LOADED = 'adLoaded';
+export const AD_STARTED = 'adStarted';
+export const AD_IMPRESSION = 'adImpression';
+export const AD_PLAY = 'adPlay';
+export const AD_TIME = 'adTime';
+export const AD_PAUSE = 'adPause';
+export const AD_CLICK = 'adClick';
+export const AD_SKIPPED = 'adSkipped';
+export const AD_ERROR = 'adError';
+export const AD_COMPLETE = 'adComplete';
+export const AD_BREAK_END = 'adBreakEnd';
+
+// Media
+export const PLAYLIST = 'playlist';
+export const PLAYBACK_REQUEST = 'playbackRequest';
+export const AUTOSTART_BLOCKED = 'autostartBlocked';
+export const PLAY_ATTEMPT_FAILED = 'playAttemptFailed';
+export const CONTENT_LOADED = 'contentLoaded';
+export const PLAY = 'play';
+export const PAUSE = 'pause';
+export const BUFFER = 'buffer';
+export const TIME = 'time';
+export const SEEK_START = 'seekStart';
+export const SEEK_END = 'seekEnd';
+export const MUTE = 'mute';
+export const VOLUME = 'volume';
+export const RENDITION_UPDATE = 'renditionUpdate';
+export const ERROR = 'error';
+export const COMPLETE = 'complete';
+export const PLAYLIST_COMPLETE = 'playlistComplete';
+
+// Layout
+export const FULLSCREEN = 'fullscreen';
+export const PLAYER_RESIZE = 'playerResize';
+export const VIEWABLE = 'viewable';
+export const CAST = 'cast';
+
+export const allVideoEvents = [
+  SETUP_COMPLETE, SETUP_FAILED, DESTROYED, AD_REQUEST, AD_BREAK_START, AD_LOADED, AD_STARTED,
+  AD_IMPRESSION, AD_PLAY, AD_TIME, AD_PAUSE, AD_CLICK, AD_SKIPPED, AD_ERROR, AD_COMPLETE, AD_BREAK_END, PLAYLIST,
+  PLAYBACK_REQUEST, AUTOSTART_BLOCKED, PLAY_ATTEMPT_FAILED, CONTENT_LOADED, PLAY, PAUSE, BUFFER, TIME, SEEK_START,
+  SEEK_END, MUTE, VOLUME, RENDITION_UPDATE, ERROR, COMPLETE, PLAYLIST_COMPLETE, FULLSCREEN, PLAYER_RESIZE, VIEWABLE,
+  CAST
+];
+
+export const AUCTION_AD_LOAD_ATTEMPT = 'auctionAdLoadAttempt';
+export const AUCTION_AD_LOAD_QUEUED = 'auctionAdLoadQueued';
+export const AUCTION_AD_LOAD_ABORT = 'auctionAdLoadAbort';
+export const BID_IMPRESSION = 'bidImpression';
+export const BID_ERROR = 'bidError';
+
+export const videoEvents = {
+  SETUP_COMPLETE,
+  SETUP_FAILED,
+  DESTROYED,
+  AD_REQUEST,
+  AD_BREAK_START,
+  AD_LOADED,
+  AD_STARTED,
+  AD_IMPRESSION,
+  AD_PLAY,
+  AD_TIME,
+  AD_PAUSE,
+  AD_CLICK,
+  AD_SKIPPED,
+  AD_ERROR,
+  AD_COMPLETE,
+  AD_BREAK_END,
+  PLAYLIST,
+  PLAYBACK_REQUEST,
+  AUTOSTART_BLOCKED,
+  PLAY_ATTEMPT_FAILED,
+  CONTENT_LOADED,
+  PLAY,
+  PAUSE,
+  BUFFER,
+  TIME,
+  SEEK_START,
+  SEEK_END,
+  MUTE,
+  VOLUME,
+  RENDITION_UPDATE,
+  ERROR,
+  COMPLETE,
+  PLAYLIST_COMPLETE,
+  FULLSCREEN,
+  PLAYER_RESIZE,
+  VIEWABLE,
+  CAST,
+};
diff --git a/libraries/video/constants/ortb.js b/libraries/video/constants/ortb.js
new file mode 100644
index 00000000000..d67c8a5f393
--- /dev/null
+++ b/libraries/video/constants/ortb.js
@@ -0,0 +1,169 @@
+/**
+ * @typedef {Object} OrtbParams
+ * @property {OrtbVideoParamst} video
+ * @property {OrtbContentParams} content
+ */
+
+/**
+ * @typedef OrtbVideoParams
+ * @property {[string]} mimes - Content MIME types supported (e.g., “video/x-ms-wmv”, “video/mp4”).
+ * @property {number|undefined} minduration - Minimum video ad duration in seconds.
+ * @property {number|undefined} maxduration - Maximum video ad duration in seconds.
+ * @property {[number]} protocols - Supported video protocols. At least one supported protocol must be specified.
+ * @property {number} w - Width of the video player in device independent pixels (DIPS).
+ * @property {number} h - Height of the video player in device independent pixels (DIPS).
+ * @property {number|undefined} startdelay - Indicates the offset of the ad placement.
+ * @property {number|undefined} placement - Placement type for the impression.
+ * @property {number|undefined} linearity - Indicates if the impression must be linear, nonlinear, etc. If omitted, assume all are allowed.
+ * @property {number} skip - Indicates if the player can allow the video to be skipped, where 0 is no, 1 is yes.
+ * @property {number|undefined} skipmin - Only ad creatives with a duration greater than this value can be skippable; only applicable if the ad is skippable.
+ * @property {number|undefined} skipafter - Number of seconds a video must play before skipping is enabled; only applicable if the ad is skippable.
+ * @property {number|undefined} sequence - If multiple ad impressions are offered in the same bid request, the sequence number will allow for the coordinated delivery of multiple creatives.
+ * @property {[number]|undefined} battr - Blocked creative attributes. Use this to indicate which creatives the player does not support.
+ * @property {number|undefined} maxextended - Maximum extended ad duration if extension is allowed.
+ * @property {number|undefined} minbitrate - Minimum bit rate in Kbps supported by the player.
+ * @property {number|undefined} maxbitrate - Maximum bit rate in Kbps supported by the player.
+ * @property {number|undefined} boxingallowed - Indicates if letter-boxing of 4:3 content into a 16:9 window is allowed. 0 is no, 1 is yes.
+ * @property {[number]|undefined} playbackmethod - Playback methods that may be in use.
+ * @property {number|undefined} playbackend - The scenario that causes playback to end.
+ * @property {[number]|undefined} delivery - Supported delivery methods (e.g., streaming, progressive).
+ * @property {number|undefined} pos - Ad position on screen.
+ * @property {[Object]|undefined} companionad - list of companion ads. Refer to Section 3.2.6 of the oRTB v2.5 spec for the interface of the companion ad object.
+ * @property {[number]|undefined} api - List of supported API frameworks for this impression.
+ * @property {[number]|undefined} companiontype - Supported VAST companion ad types. Refer to List 5.14 of the oRTB v2.5 spec for the interface.
+ * @property {Object|undefined} ext - Placeholder for exchange-specific extensions to OpenRTB.
+ */
+
+/**
+ * @typedef OrtbContentParams
+ * @property {string} id - ID uniquely identifying the content.
+ * @property {string} url - URL of the content, for buy-side contextualization or review.
+ * @property {number|undefined} episode - Episode number.
+ * @property {string|undefined} title - Content title.
+ * @property {string|undefined} series - Content series i.e. “The Office” (television), “Star Wars” (movie).
+ * @property {string|undefined} season - Content season (e.g., “Season 3”).
+ * @property {string|undefined} artist - Artist credited with the content.
+ * @property {string|undefined} genre - Genre that best describes the content (e.g., rock, pop, etc).
+ * @property {string|undefined} album - Album to which the content belongs. Typically for audio.
+ * @property {string|undefined} isrc - International Standard Recording Code conforming to ISO3901.
+ * @property {Object|undefined} producer - Details about the content Producer. For Producer interface visit Section 3.2.17 of the oRTB v2.5 spec.
+ * @property {[string]|undefined} cat - List of IAB content categories that describe the content. Refer to List 5.1. of the oRTB v2.5 spec for the complete list.
+ * @property {number|undefined} prodq - Production quality. Refer to List 5.13 of the oRTB v2.5 spec.
+ * @property {number|undefined} context - Type of content (game, video, text, etc.). Refer to List 5.18 of the oRTB v2.5 spec.
+ * @property {string|undefined} contentrating - Content rating (e.g., MPAA).
+ * @property {string|undefined} userrating - User rating of the content (e.g., number of stars, likes, etc.).
+ * @property {number|undefined} qagmediarating - Media rating per IQG guidelines. Refer to List 5.19 of the oRTB v2.5 spec.
+ * @property {string|undefined} keywords - Comma separated list of keywords describing the content.
+ * @property {number|undefined} livestream - Whether the stream is live or not. 0 means not live (VOD), 1 means content is live streaming.
+ * @property {number|undefined} sourcerelationship - 0 means indirect, 1 means direct.
+ * @property {number} len - Duration of content in seconds.
+ * @property {string|undefined} language - Content language using ISO-639-1-alpha-2.
+ * @property {number|undefined} embeddable - Indicator of whether or not the content is embeddable (e.g., an embeddable video player). 0 means no, 1 means yes.
+ * @property {[Object]|undefined} data - Additional content data. Each Data object represents a different data source. See Section 3.2.21 of the oRTB v2.5 spec.
+ * @property {Object|undefined} ext - Placeholder for exchange-specific extensions to OpenRTB.
+ */
+
+const VIDEO_PREFIX = 'video/';
+const APPLICATION_PREFIX = 'application/';
+
+/**
+ * ORTB 2.5 section 3.2.7 - Video.mimes
+ * @enum OrtbVideoParams.mimes
+ */
+export const VIDEO_MIME_TYPE = {
+  MP4: VIDEO_PREFIX + 'mp4',
+  MPEG: VIDEO_PREFIX + 'mpeg',
+  OGG: VIDEO_PREFIX + 'ogg',
+  WEBM: VIDEO_PREFIX + 'webm',
+  AAC: VIDEO_PREFIX + 'aac',
+  HLS: APPLICATION_PREFIX + 'vnd.apple.mpegurl'
+};
+
+export const JS_APP_MIME_TYPE = APPLICATION_PREFIX + 'javascript';
+export const VPAID_MIME_TYPE = JS_APP_MIME_TYPE;
+
+/**
+ * ORTB 2.5 section 5.9 - Video Placement Types
+ * @enum OrtbVideoParams.placement
+ */
+export const PLACEMENT = {
+  INSTREAM: 1,
+  BANNER: 2,
+  ARTICLE: 3,
+  FEED: 4,
+  INTERSTITIAL: 5,
+  SLIDER: 5,
+  FLOATING: 5,
+  INTERSTITIAL_SLIDER_FLOATING: 5
+};
+
+/**
+ * ORTB 2.5 section 5.4 - Ad Position
+ * @enum OrtbVideoParams.pos
+ */
+export const AD_POSITION = {
+  UNKNOWN: 0,
+  ABOVE_THE_FOLD: 1,
+  BELOW_THE_FOLD: 3,
+  HEADER: 4,
+  FOOTER: 5,
+  SIDEBAR: 6,
+  FULL_SCREEN: 7
+}
+
+/**
+ * ORTB 2.5 section 5.11 - Playback Cessation Modes
+ * @enum OrtbVideoParams.playbackend
+ */
+export const PLAYBACK_END = {
+  VIDEO_COMPLETION: 1,
+  VIEWPORT_LEAVE: 2,
+  FLOATING: 3
+}
+
+/**
+ * ORTB 2.5 section 5.10 - Playback Methods
+ * @enum OrtbVideoParams.playbackmethod
+ */
+export const PLAYBACK_METHODS = {
+  AUTOPLAY: 1,
+  AUTOPLAY_MUTED: 2,
+  CLICK_TO_PLAY: 3,
+  CLICK_TO_PLAY_MUTED: 4,
+  VIEWABLE: 5,
+  VIEWABLE_MUTED: 6
+};
+
+/**
+ * ORTB 2.5 section 5.8 - Protocols
+ * @enum OrtbVideoParams.protocols
+ */
+export const PROTOCOLS = {
+  // VAST_1_0: 1,
+  VAST_2_0: 2,
+  VAST_3_0: 3,
+  // VAST_1_O_WRAPPER: 4,
+  VAST_2_0_WRAPPER: 5,
+  VAST_3_0_WRAPPER: 6,
+  VAST_4_0: 7,
+  VAST_4_0_WRAPPER: 8
+};
+
+/**
+ * ORTB 2.5 section 5.6 - API Frameworks
+ * @enum OrtbVideoParams.api
+ */
+export const API_FRAMEWORKS = {
+  VPAID_1_0: 1,
+  VPAID_2_0: 2,
+  OMID_1_0: 7
+};
+
+/**
+ * ORTB 2.5 section 5.18 - Content Context
+ * @enum OrtbContentParams.context
+ */
+export const CONTEXT = {
+  VIDEO: 1,
+  AUDIO: 3
+};
diff --git a/libraries/video/constants/vendorCodes.js b/libraries/video/constants/vendorCodes.js
new file mode 100644
index 00000000000..370c151b997
--- /dev/null
+++ b/libraries/video/constants/vendorCodes.js
@@ -0,0 +1,6 @@
+// Video Vendors
+export const JWPLAYER_VENDOR = 1;
+export const VIDEO_JS_VENDOR = 2;
+
+// Ad Server Vendors
+export const GAM_VENDOR = 'gam';
diff --git a/libraries/video/shared/eventHandler.js b/libraries/video/shared/eventHandler.js
new file mode 100644
index 00000000000..ee0d6b2cbfb
--- /dev/null
+++ b/libraries/video/shared/eventHandler.js
@@ -0,0 +1,18 @@
+/**
+ * Builds a standard event handler
+ * @param {String} type Event name
+ * @param {(function(String, Object): Object)} callback Callback defined by publisher to be executed when the event occurs
+ * @param {Object} payload Base payload defined when the event is registered
+ * @param {(function(*): Object)|null|undefined} getExtraPayload Parses the player's event payload to return a normalized payload
+ * @returns {(function(*): void)|*} event handler
+ */
+export function getEventHandler(type, callback, payload, getExtraPayload) {
+  return event => {
+    if (getExtraPayload) {
+      const extraPayload = getExtraPayload(event);
+      Object.assign(payload, extraPayload);
+    }
+
+    callback(type, payload);
+  };
+}
diff --git a/libraries/video/shared/helpers.js b/libraries/video/shared/helpers.js
new file mode 100644
index 00000000000..1b87f3bf1f3
--- /dev/null
+++ b/libraries/video/shared/helpers.js
@@ -0,0 +1,5 @@
+import { videoKey } from '../constants/constants.js'
+
+export function getExternalVideoEventName(eventName) {
+  return videoKey + eventName.replace(/^./, eventName[0].toUpperCase());
+}
diff --git a/libraries/video/shared/parentModule.js b/libraries/video/shared/parentModule.js
new file mode 100644
index 00000000000..06c71ebd75b
--- /dev/null
+++ b/libraries/video/shared/parentModule.js
@@ -0,0 +1,81 @@
+/**
+ * @typedef {Object} ParentModule
+ * @summary abstraction for any module to store and reference its submodules
+ * @param {SubmoduleBuilder} submoduleBuilder_
+ * @returns {ParentModule}
+ * @constructor
+ */
+export function ParentModule(submoduleBuilder_) {
+  const submoduleBuilder = submoduleBuilder_;
+  const submodules = {};
+
+  /**
+   * @function ParentModule#registerSubmodule
+   * @summary Stores a submodule
+   * @param {String} id - unique identifier of the submodule instance
+   * @param {String} vendorCode - identifier to the submodule type that must be built
+   * @param {Object} config - additional information necessary to instantiate the submodule
+   */
+  function registerSubmodule(id, vendorCode, config) {
+    if (submodules[id]) {
+      return;
+    }
+
+    let submodule;
+    try {
+      submodule = submoduleBuilder.build(vendorCode, config);
+    } catch (e) {
+      throw e;
+    }
+    submodules[id] = submodule;
+  }
+
+  /**
+   * @function ParentModule#getSubmodule
+   * @summary Stores a submodule
+   * @param {String} id - unique identifier of the submodule instance
+   * @returns {Object} - a submodule instance
+   */
+  function getSubmodule(id) {
+    return submodules[id];
+  }
+
+  return {
+    registerSubmodule,
+    getSubmodule
+  }
+}
+
+/**
+ * @typedef {Object} SubmoduleBuilder
+ * @summary Instantiates submodules
+ * @param {vendorSubmoduleDirectory} submoduleDirectory_
+ * @param {Object|null|undefined} sharedUtils_
+ * @returns {SubmoduleBuilder}
+ * @constructor
+ */
+export function SubmoduleBuilder(submoduleDirectory_, sharedUtils_) {
+  const submoduleDirectory = submoduleDirectory_;
+  const sharedUtils = sharedUtils_;
+
+  /**
+   * @function SubmoduleBuilder#build
+   * @param vendorCode - identifier to the submodule type that must be instantiated
+   * @param config - additional information necessary to instantiate the submodule
+   * @throws
+   * @returns {{init}|*} - a submodule instance
+   */
+  function build(vendorCode, config) {
+    const submoduleFactory = submoduleDirectory[vendorCode];
+    if (!submoduleFactory) {
+      throw new Error('Unrecognized submodule vendor code: ' + vendorCode);
+    }
+
+    const submodule = submoduleFactory(config, sharedUtils);
+    return submodule;
+  }
+
+  return {
+    build
+  };
+}
diff --git a/libraries/video/shared/state.js b/libraries/video/shared/state.js
new file mode 100644
index 00000000000..b84cff8f997
--- /dev/null
+++ b/libraries/video/shared/state.js
@@ -0,0 +1,47 @@
+/**
+ * @typedef {Object} State
+ * @summary simple state object. Can be subclassed
+ * @function updateState
+ * @function getState
+ * @function clearState
+ */
+
+/**
+ * @summary factory to create a simple state object
+ * @returns {State}
+ */
+export default function stateFactory() {
+  let state = {};
+
+  /**
+   * @function State#updateState
+   * @summary updates the state
+   * @param {Object} stateUpdate
+   */
+  function updateState(stateUpdate) {
+    Object.assign(state, stateUpdate);
+  }
+
+  /**
+   * @function State#getState
+   * @summary provides the current state
+   * @returns {Object} the current state
+   */
+  function getState() {
+    return state;
+  }
+
+  /**
+   * @function State#clearState
+   * @summary erases the current state
+   */
+  function clearState() {
+    state = {};
+  }
+
+  return {
+    updateState,
+    getState,
+    clearState
+  };
+}
diff --git a/libraries/video/shared/vastXmlBuilder.js b/libraries/video/shared/vastXmlBuilder.js
new file mode 100644
index 00000000000..35547acc479
--- /dev/null
+++ b/libraries/video/shared/vastXmlBuilder.js
@@ -0,0 +1,77 @@
+import { getGlobal } from '../../../src/prebidGlobal.js';
+
+export function buildVastWrapper(adId, adTagUrl, impressionUrl, impressionId, errorUrl) {
+  let wrapperBody = getAdSystemNode('Prebid org', getGlobal().version);
+
+  if (adTagUrl) {
+    wrapperBody += getAdTagUriNode(adTagUrl);
+  }
+
+  if (impressionUrl) {
+    wrapperBody += getImpressionNode(impressionUrl, impressionId);
+  }
+
+  if (errorUrl) {
+    wrapperBody += getErrorNode(errorUrl);
+  }
+
+  return getVastNode(getAdNode(getWrapperNode(wrapperBody), adId), '4.2');
+}
+
+export function getVastNode(body, vastVersion) {
+  return getNode('VAST', body, { version: vastVersion });
+}
+
+export function getAdNode(body, adId) {
+  return getNode('Ad', body, { id: adId });
+}
+
+export function getWrapperNode(body) {
+  return getNode('Wrapper', body);
+}
+
+export function getAdSystemNode(system, version) {
+  return getNode('AdSystem', system, { version });
+}
+
+export function getAdTagUriNode(adTagUrl) {
+  return getUrlNode('VASTAdTagURI', adTagUrl);
+}
+
+export function getImpressionNode(pingUrl, id) {
+  return getUrlNode('Impression', pingUrl, { id });
+}
+
+export function getErrorNode(pingUrl) {
+  return getUrlNode('Error', pingUrl);
+}
+
+// Helpers
+
+function getUrlNode(labelName, url, attributes) {
+  const body = `<![CDATA[${url}]]>`;
+  return getNode(labelName, body, attributes);
+}
+
+function getNode(labelName, body, attributes) {
+  const openingLabel = getOpeningLabel(labelName, attributes);
+  return `<${openingLabel}>${body}</${labelName}>`;
+}
+
+/*
+attributes is a KVP Object.
+ */
+function getOpeningLabel(name, attributes) {
+  if (!attributes) {
+    return name;
+  }
+
+  return Object.keys(attributes).reduce((label, key) => {
+    const value = attributes[key];
+    if (!value) {
+      return label;
+    }
+
+    return label + ` ${key}="${value}"`;
+  }, name);
+}
diff --git a/libraries/video/shared/vastXmlEditor.js b/libraries/video/shared/vastXmlEditor.js
new file mode 100644
index 00000000000..b586e5b4c29
--- /dev/null
+++ b/libraries/video/shared/vastXmlEditor.js
@@ -0,0 +1,115 @@
+import { getErrorNode, getImpressionNode, buildVastWrapper } from './vastXmlBuilder.js';
+
+export const XML_MIME_TYPE = 'application/xml';
+
+export function VastXmlEditor(xmlUtil_) {
+  const xmlUtil = xmlUtil_;
+
+  function getVastXmlWithTracking(vastXml, adId, impressionUrl, impressionId, errorUrl) {
+    const impressionDoc = getImpressionDoc(impressionUrl, impressionId);
+    const errorDoc = getErrorDoc(errorUrl);
+    if (!adId && !impressionDoc && !errorDoc) {
+      return vastXml;
+    }
+
+    const vastXmlDoc = xmlUtil.parse(vastXml);
+    appendTrackingNodes(vastXmlDoc, impressionDoc, errorDoc);
+    replaceAdId(vastXmlDoc, adId);
+    return xmlUtil.serialize(vastXmlDoc);
+  }
+
+  function appendTrackingNodes(vastXmlDoc, impressionDoc, errorDoc) {
+    const nodes = vastXmlDoc.querySelectorAll('InLine,Wrapper');
+    const nodeCount = nodes.length;
+    for (let i = 0; i < nodeCount; i++) {
+      const node = nodes[i];
+      // A copy of the child is required until we reach the last node.
+      const requiresCopy = i < nodeCount - 1;
+      appendChild(node, impressionDoc, requiresCopy);
+      appendChild(node, errorDoc, requiresCopy);
+    }
+  }
+
+  function replaceAdId(vastXmlDoc, adId) {
+    if (!adId) {
+      return;
+    }
+
+    const adNode = vastXmlDoc.querySelector('Ad');
+    if (!adNode) {
+      return;
+    }
+
+    adNode.id = adId;
+  }
+
+  return {
+    getVastXmlWithTracking,
+    buildVastWrapper
+  }
+
+  function getImpressionDoc(impressionUrl, impressionId) {
+    if (!impressionUrl) {
+      return;
+    }
+
+    const impressionNode = getImpressionNode(impressionUrl, impressionId);
+    return xmlUtil.parse(impressionNode);
+  }
+
+  function getErrorDoc(errorUrl) {
+    if (!errorUrl) {
+      return;
+    }
+
+    const errorNode = getErrorNode(errorUrl);
+    return xmlUtil.parse(errorNode);
+  }
+
+  function appendChild(node, child, copy) {
+    if (!child) {
+      return;
+    }
+
+    const doc = copy ? child.cloneNode(true) : child;
+    node.appendChild(doc.documentElement);
+  }
+}
+
+function XMLUtil() {
+  let parser;
+  let serializer;
+
+  function getParser() {
+    if (!parser) {
+      // DOMParser instantiation is costly; instantiate only once throughout Prebid lifecycle.
+      parser = new DOMParser();
+    }
+    return parser;
+  }
+
+  function getSerializer() {
+    if (!serializer) {
+      // XMLSerializer instantiation is costly; instantiate only once throughout Prebid lifecycle.
+      serializer = new XMLSerializer();
+    }
+    return serializer;
+  }
+
+  function parse(xmlString) {
+    return getParser().parseFromString(xmlString, XML_MIME_TYPE);
+  }
+
+  function serialize(xmlDoc) {
+    return getSerializer().serializeToString(xmlDoc);
+  }
+
+  return {
+    parse,
+    serialize
+  };
+}
+
+export function vastXmlEditorFactory() {
+  return VastXmlEditor(XMLUtil());
+}
diff --git a/modules/.submodules.json b/modules/.submodules.json
index ba8af4e6550..deeee91e247 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -1,23 +1,88 @@
 {
-  "userId": [
-    "unifiedIdSystem",
-    "pubCommonIdSystem",
-    "digiTrustIdSystem",
-    "id5IdSystem",
-    "parrableIdSystem",
-    "britepoolIdSystem",
-    "liveIntentIdSystem",
-    "lotamePanoramaId",
-    "criteoIdSystem",
-    "netIdSystem",
-    "identityLinkIdSystem",
-    "sharedIdSystem"
-  ],
-  "adpod": [
-    "freeWheelAdserverVideo",
-    "dfpAdServerVideo"
-  ],
-  "rtdModule": [
-    "browsiRtdProvider"
-  ]
+  "parentModules": {
+    "userId": [
+      "33acrossIdSystem",
+      "admixerIdSystem",
+      "adtelligentIdSystem",
+      "amxIdSystem",
+      "britepoolIdSystem",
+      "connectIdSystem",
+      "cpexIdSystem",
+      "criteoIdSystem",
+      "dacIdSystem",
+      "deepintentDpesIdSystem",
+      "dmdIdSystem",
+      "fabrickIdSystem",
+      "hadronIdSystem",
+      "id5IdSystem",
+      "ftrackIdSystem",
+      "identityLinkIdSystem",
+      "idxIdSystem",
+      "imuIdSystem",
+      "intentIqIdSystem",
+      "justIdSystem",
+      "kinessoIdSystem",
+      "liveIntentIdSystem",
+      "lotamePanoramaIdSystem",
+      "merkleIdSystem",
+      "mwOpenLinkIdSystem",
+      "naveggIdSystem",
+      "netIdSystem",
+      "novatiqIdSystem",
+      "oneKeyIdSystem",
+      "parrableIdSystem",
+      "pubProvidedIdSystem",
+      "publinkIdSystem",
+      "quantcastIdSystem",
+      "sharedIdSystem",
+      "tapadIdSystem",
+      "teadsIdSystem",
+      "tncIdSystem",
+      "trustpidSystem",
+      "uid2IdSystem",
+      "unifiedIdSystem",
+      "verizonMediaIdSystem",
+      "zeotapIdPlusIdSystem",
+      "adqueryIdSystem",
+      "gravitoIdSystem"
+    ],
+    "adpod": [
+      "freeWheelAdserverVideo",
+      "dfpAdServerVideo"
+    ],
+    "rtdModule": [
+      "1plusXRtdProvider",
+      "aaxBlockmeterRtdProvider",
+      "airgridRtdProvider",
+      "akamaiDapRtdProvider",
+      "blueconicRtdProvider",
+      "browsiRtdProvider",
+      "captifyRtdProvider",
+      "confiantRtdProvider",
+      "dgkeywordRtdProvider",
+      "geoedgeRtdProvider",
+      "hadronRtdProvider",
+      "haloRtdProvider",
+      "iasRtdProvider",
+      "jwplayerRtdProvider",
+      "medianetRtdProvider",
+      "mgidRtdProvider",
+      "oneKeyRtdProvider",
+      "optimeraRtdProvider",
+      "permutiveRtdProvider",
+      "reconciliationRtdProvider",
+      "sirdataRtdProvider",
+      "timeoutRtdProvider",
+      "weboramaRtdProvider", 
+      "zeusPrimeRtdProvider"
+    ],
+    "fpdModule": [
+      "validationFpdModule",
+      "topicsFpdModule"
+    ],
+    "videoModule": [
+      "jwplayerVideoProvider",
+      "videojsVideoProvider"
+    ]
+  }
 }
diff --git a/modules/1ad4goodBidAdapter.js b/modules/1ad4goodBidAdapter.js
deleted file mode 100644
index 178f3765587..00000000000
--- a/modules/1ad4goodBidAdapter.js
+++ /dev/null
@@ -1,399 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const BIDDER_CODE = '1ad4good';
-const URL = 'https://hb.1ad4good.org/prebid';
-const VIDEO_TARGETING = ['id', 'mimes', 'minduration', 'maxduration',
-  'startdelay', 'skippable', 'playback_method', 'frameworks'];
-const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
-const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
-const SOURCE = 'pbjs';
-const MAX_IMPS_PER_REQUEST = 15;
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['adsforgood', 'ads4good', '1adsforgood'],
-  supportedMediaTypes: [BANNER, VIDEO],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    return !!(bid.params.placementId);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(bidRequests, bidderRequest) {
-    const tags = bidRequests.map(bidToTag);
-    const userObjBid = find(bidRequests, hasUserInfo);
-    let userObj;
-    if (userObjBid) {
-      userObj = {};
-      Object.keys(userObjBid.params.user)
-        .filter(param => includes(USER_PARAMS, param))
-        .forEach(param => userObj[param] = userObjBid.params.user[param]);
-    }
-
-    const appDeviceObjBid = find(bidRequests, hasAppDeviceInfo);
-    let appDeviceObj;
-    if (appDeviceObjBid && appDeviceObjBid.params && appDeviceObjBid.params.app) {
-      appDeviceObj = {};
-      Object.keys(appDeviceObjBid.params.app)
-        .filter(param => includes(APP_DEVICE_PARAMS, param))
-        .forEach(param => appDeviceObj[param] = appDeviceObjBid.params.app[param]);
-    }
-
-    const appIdObjBid = find(bidRequests, hasAppId);
-    let appIdObj;
-    if (appIdObjBid && appIdObjBid.params && appDeviceObjBid.params.app && appDeviceObjBid.params.app.id) {
-      appIdObj = {
-        appid: appIdObjBid.params.app.id
-      };
-    }
-
-    const payload = {
-      tags: [...tags],
-      user: userObj,
-      sdk: {
-        source: SOURCE,
-        version: '$prebid.version$'
-      }
-    };
-
-    if (appDeviceObjBid) {
-      payload.device = appDeviceObj
-    }
-    if (appIdObjBid) {
-      payload.app = appIdObj;
-    }
-
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      // note - objects for impbus use underscore instead of camelCase
-      payload.gdpr_consent = {
-        consent_string: bidderRequest.gdprConsent.consentString,
-        consent_required: bidderRequest.gdprConsent.gdprApplies
-      };
-    }
-
-    if (bidderRequest && bidderRequest.refererInfo) {
-      let refererinfo = {
-        rd_ref: encodeURIComponent(bidderRequest.refererInfo.referer),
-        rd_top: bidderRequest.refererInfo.reachedTop,
-        rd_ifs: bidderRequest.refererInfo.numIframes,
-        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
-      }
-      payload.referrer_detection = refererinfo;
-    }
-
-    const request = formatRequest(payload, bidderRequest);
-    return request;
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, {bidderRequest}) {
-    serverResponse = serverResponse.body;
-    const bids = [];
-    if (!serverResponse || serverResponse.error) {
-      let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
-      if (serverResponse && serverResponse.error) { errorMessage += `: ${serverResponse.error}`; }
-      utils.logError(errorMessage);
-      return bids;
-    }
-
-    if (serverResponse.tags) {
-      serverResponse.tags.forEach(serverBid => {
-        const rtbBid = getRtbBid(serverBid);
-        if (rtbBid) {
-          if (rtbBid.cpm !== 0 && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
-            const bid = newBid(serverBid, rtbBid, bidderRequest);
-            bid.mediaType = parseMediaType(rtbBid);
-            bids.push(bid);
-          }
-        }
-      });
-    }
-
-    return bids;
-  },
-
-  transformBidParams: function(params, isOpenRtb) {
-    params = utils.convertTypes({
-      'placementId': 'number',
-      'keywords': utils.transformBidderParamKeywords
-    }, params);
-
-    if (isOpenRtb) {
-      params.use_pmt_rule = (typeof params.usePaymentRule === 'boolean') ? params.usePaymentRule : false;
-      if (params.usePaymentRule) { delete params.usePaymentRule; }
-
-      if (isPopulatedArray(params.keywords)) {
-        params.keywords.forEach(deleteValues);
-      }
-
-      Object.keys(params).forEach(paramKey => {
-        let convertedKey = utils.convertCamelToUnderscore(paramKey);
-        if (convertedKey !== paramKey) {
-          params[convertedKey] = params[paramKey];
-          delete params[paramKey];
-        }
-      });
-    }
-
-    return params;
-  },
-
-  /**
-   * Add element selector to javascript tracker to improve native viewability
-   * @param {Bid} bid
-   */
-  onBidWon: function(bid) {
-  }
-}
-
-function isPopulatedArray(arr) {
-  return !!(utils.isArray(arr) && arr.length > 0);
-}
-
-function deleteValues(keyPairObj) {
-  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
-    delete keyPairObj.value;
-  }
-}
-
-function formatRequest(payload, bidderRequest) {
-  let request = [];
-
-  if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
-    const clonedPayload = utils.deepClone(payload);
-
-    utils.chunk(payload.tags, MAX_IMPS_PER_REQUEST).forEach(tags => {
-      clonedPayload.tags = tags;
-      const payloadString = JSON.stringify(clonedPayload);
-      request.push({
-        method: 'POST',
-        url: URL,
-        data: payloadString,
-        bidderRequest
-      });
-    });
-  } else {
-    const payloadString = JSON.stringify(payload);
-    request = {
-      method: 'POST',
-      url: URL,
-      data: payloadString,
-      bidderRequest
-    };
-  }
-
-  return request;
-}
-
-/**
- * Unpack the Server's Bid into a Prebid-compatible one.
- * @param serverBid
- * @param rtbBid
- * @param bidderRequest
- * @return Bid
- */
-function newBid(serverBid, rtbBid, bidderRequest) {
-  const bidRequest = utils.getBidRequest(serverBid.uuid, [bidderRequest]);
-  const bid = {
-    requestId: serverBid.uuid,
-    cpm: rtbBid.cpm,
-    creativeId: rtbBid.creative_id,
-    dealId: rtbBid.deal_id,
-    currency: 'USD',
-    netRevenue: true,
-    ttl: 300,
-    adUnitCode: bidRequest.adUnitCode,
-    ads4good: {
-      buyerMemberId: rtbBid.buyer_member_id,
-      dealPriority: rtbBid.deal_priority,
-      dealCode: rtbBid.deal_code
-    }
-  };
-
-  if (rtbBid.advertiser_id) {
-    bid.meta = Object.assign({}, bid.meta, { advertiserId: rtbBid.advertiser_id });
-  }
-
-  if (rtbBid.rtb.video) {
-    Object.assign(bid, {
-      width: rtbBid.rtb.video.player_width,
-      height: rtbBid.rtb.video.player_height,
-      vastUrl: rtbBid.rtb.video.asset_url,
-      vastImpUrl: rtbBid.notify_url,
-      ttl: 3600
-    });
-  } else {
-    Object.assign(bid, {
-      width: rtbBid.rtb.banner.width,
-      height: rtbBid.rtb.banner.height,
-      ad: rtbBid.rtb.banner.content
-    });
-    try {
-      const url = rtbBid.rtb.trackers[0].impression_urls[0];
-      const tracker = utils.createTrackPixelHtml(url);
-      bid.ad += tracker;
-    } catch (error) {
-      utils.logError('Error appending tracking pixel', error);
-    }
-  }
-
-  return bid;
-}
-
-function bidToTag(bid) {
-  const tag = {};
-  tag.sizes = transformSizes(bid.sizes);
-  tag.primary_size = tag.sizes[0];
-  tag.ad_types = [];
-  tag.uuid = bid.bidId;
-  if (bid.params.placementId) {
-    tag.id = parseInt(bid.params.placementId, 10);
-  }
-  if (bid.params.cpm) {
-    tag.cpm = bid.params.cpm;
-  }
-  tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
-  tag.use_pmt_rule = bid.params.usePaymentRule || false
-  tag.prebid = true;
-  tag.disable_psa = true;
-  if (bid.params.reserve) {
-    tag.reserve = bid.params.reserve;
-  }
-  if (bid.params.position) {
-    tag.position = {'above': 1, 'below': 2}[bid.params.position] || 0;
-  }
-  if (bid.params.trafficSourceCode) {
-    tag.traffic_source_code = bid.params.trafficSourceCode;
-  }
-  if (bid.params.privateSizes) {
-    tag.private_sizes = transformSizes(bid.params.privateSizes);
-  }
-  if (bid.params.supplyType) {
-    tag.supply_type = bid.params.supplyType;
-  }
-  if (bid.params.pubClick) {
-    tag.pubclick = bid.params.pubClick;
-  }
-  if (bid.params.extInvCode) {
-    tag.ext_inv_code = bid.params.extInvCode;
-  }
-  if (bid.params.externalImpId) {
-    tag.external_imp_id = bid.params.externalImpId;
-  }
-  if (!utils.isEmpty(bid.params.keywords)) {
-    let keywords = utils.transformBidderParamKeywords(bid.params.keywords);
-
-    if (keywords.length > 0) {
-      keywords.forEach(deleteValues);
-    }
-    tag.keywords = keywords;
-  }
-
-  const videoMediaType = utils.deepAccess(bid, `mediaTypes.${VIDEO}`);
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
-
-  if (bid.mediaType === VIDEO || videoMediaType) {
-    tag.ad_types.push(VIDEO);
-  }
-
-  // instream gets vastUrl, outstream gets vastXml
-  if (bid.mediaType === VIDEO || (videoMediaType && context !== 'outstream')) {
-    tag.require_asset_url = true;
-  }
-
-  if (bid.params.video) {
-    tag.video = {};
-    // place any valid video params on the tag
-    Object.keys(bid.params.video)
-      .filter(param => includes(VIDEO_TARGETING, param))
-      .forEach(param => tag.video[param] = bid.params.video[param]);
-  }
-
-  if (bid.renderer) {
-    tag.video = Object.assign({}, tag.video, {custom_renderer_present: true});
-  }
-
-  if (
-    (utils.isEmpty(bid.mediaType) && utils.isEmpty(bid.mediaTypes)) ||
-    (bid.mediaType === BANNER || (bid.mediaTypes && bid.mediaTypes[BANNER]))
-  ) {
-    tag.ad_types.push(BANNER);
-  }
-
-  return tag;
-}
-
-/* Turn bid request sizes into ut-compatible format */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  let sizeObj = {};
-
-  if (utils.isArray(requestSizes) && requestSizes.length === 2 &&
-    !utils.isArray(requestSizes[0])) {
-    sizeObj.width = parseInt(requestSizes[0], 10);
-    sizeObj.height = parseInt(requestSizes[1], 10);
-    sizes.push(sizeObj);
-  } else if (typeof requestSizes === 'object') {
-    for (let i = 0; i < requestSizes.length; i++) {
-      let size = requestSizes[i];
-      sizeObj = {};
-      sizeObj.width = parseInt(size[0], 10);
-      sizeObj.height = parseInt(size[1], 10);
-      sizes.push(sizeObj);
-    }
-  }
-
-  return sizes;
-}
-
-function hasUserInfo(bid) {
-  return !!bid.params.user;
-}
-
-function hasAppDeviceInfo(bid) {
-  if (bid.params) {
-    return !!bid.params.app
-  }
-}
-
-function hasAppId(bid) {
-  if (bid.params && bid.params.app) {
-    return !!bid.params.app.id
-  }
-  return !!bid.params.app
-}
-
-function getRtbBid(tag) {
-  return tag && tag.ads && tag.ads.length && find(tag.ads, ad => ad.rtb);
-}
-
-function parseMediaType(rtbBid) {
-  const adType = rtbBid.ad_type;
-  if (adType === VIDEO) {
-    return VIDEO;
-  } else {
-    return BANNER;
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/1ad4goodBidAdapter.md b/modules/1ad4goodBidAdapter.md
deleted file mode 100644
index 1e9dfe5e04c..00000000000
--- a/modules/1ad4goodBidAdapter.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Overview
-
-```
-Module Name:  1ad4good Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer: info@1ad4good.org
-```
-
-# Description
-
-Connects to 1ad4good exchange for bids.
-
-1ad4good bid adapter supports Banner and Video (instream).
-
-# Test Parameters
-```
-var adUnits = [
-   // Banner adUnit
-   {
-      code: 'banner-div',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300,600]]
-        }
-      },
-      bids: [{
-         bidder: '1ad4good',
-         params: {
-           placementId: 13144370
-         }
-       }]
-   },
-   // Video instream adUnit
-   {
-      code: 'video-instream',
-      sizes: [[640, 480]],
-      mediaTypes: {
-        video: {
-          playerSize: [[640, 480]],
-          context: 'instream'
-        },
-      },
-      bids: [{
-        bidder: '1ad4good',
-        params: {
-          placementId: 13232361,
-          video: {
-            skippable: true,
-            playback_methods: ['auto_play_sound_off']
-          }
-        }
-      }]
-   },
-
-   // Banner adUnit in a App Webview
-   // Only use this for situations where prebid.js is in a webview of an App
-   // See Prebid Mobile for displaying ads via an SDK
-   {
-     code: 'banner-div',
-     mediaTypes: {
-       banner: {
-         sizes: [[300, 250], [300,600]]
-       }
-     }
-     bids: [{
-       bidder: '1ad4good',
-       params: {
-         placementId: 13144370,
-         app: {
-           id: "B1O2W3M4AN.com.prebid.webview",
-           geo: {
-             lat: 40.0964439,
-             lng: -75.3009142
-           },
-           device_id: {
-             idfa: "4D12078D-3246-4DA4-AD5E-7610481E7AE", // Apple advertising identifier
-             aaid: "38400000-8cf0-11bd-b23e-10b96e40000d", // Android advertising identifier
-             md5udid: "5756ae9022b2ea1e47d84fead75220c8", // MD5 hash of the ANDROID_ID
-             sha1udid: "4DFAA92388699AC6539885AEF1719293879985BF", // SHA1 hash of the ANDROID_ID
-             windowsadid: "750c6be243f1c4b5c9912b95a5742fc5" // Windows advertising identifier
-           }
-         }
-       }
-     }]
-   }
-];
-```
diff --git a/modules/1plusXRtdProvider.js b/modules/1plusXRtdProvider.js
new file mode 100644
index 00000000000..390f4f4cd81
--- /dev/null
+++ b/modules/1plusXRtdProvider.js
@@ -0,0 +1,298 @@
+import { submodule } from '../src/hook.js';
+import { config } from '../src/config.js';
+import { ajax } from '../src/ajax.js';
+import {
+  logMessage, logError,
+  deepAccess, mergeDeep,
+  isNumber, isArray, deepSetValue
+} from '../src/utils.js';
+
+// Constants
+const REAL_TIME_MODULE = 'realTimeData';
+const MODULE_NAME = '1plusX';
+const ORTB2_NAME = '1plusX.com'
+const PAPI_VERSION = 'v1.0';
+const LOG_PREFIX = '[1plusX RTD Module]: ';
+const OPE_FPID = 'ope_fpid'
+const LEGACY_SITE_KEYWORDS_BIDDERS = ['appnexus'];
+export const segtaxes = {
+  // cf. https://github.com/InteractiveAdvertisingBureau/openrtb/pull/108
+  AUDIENCE: 526,
+  CONTENT: 527,
+};
+// Functions
+/**
+ * Extracts the parameters for 1plusX RTD module from the config object passed at instanciation
+ * @param {Object} moduleConfig Config object passed to the module
+ * @param {Object} reqBidsConfigObj Config object for the bidders; each adapter has its own entry
+ * @returns {Object} Extracted configuration parameters for the module
+ */
+export const extractConfig = (moduleConfig, reqBidsConfigObj) => {
+  // CustomerId
+  const customerId = deepAccess(moduleConfig, 'params.customerId');
+  if (!customerId) {
+    throw new Error('Missing parameter customerId in moduleConfig');
+  }
+  // Timeout
+  const tempTimeout = deepAccess(moduleConfig, 'params.timeout');
+  const timeout = isNumber(tempTimeout) && tempTimeout > 300 ? tempTimeout : 1000;
+
+  // Bidders
+  const biddersTemp = deepAccess(moduleConfig, 'params.bidders');
+  if (!isArray(biddersTemp) || !biddersTemp.length) {
+    throw new Error('Missing parameter bidders in moduleConfig');
+  }
+
+  const adUnitBidders = reqBidsConfigObj.adUnits
+    .flatMap(({ bids }) => bids.map(({ bidder }) => bidder))
+    .filter((e, i, a) => a.indexOf(e) === i);
+  if (!isArray(adUnitBidders) || !adUnitBidders.length) {
+    throw new Error('Missing parameter bidders in bidRequestConfig');
+  }
+
+  const bidders = biddersTemp.filter(bidder => adUnitBidders.includes(bidder));
+  if (!bidders.length) {
+    throw new Error('No bidRequestConfig bidder found in moduleConfig bidders');
+  }
+
+  return { customerId, timeout, bidders };
+}
+
+/**
+ * Extracts consent from the prebid consent object and translates it
+ * into a 1plusX profile api query parameter parameter dict
+ * @param {object} prebid gdpr object
+ * @returns dictionary of papi gdpr query parameters
+ */
+export const extractConsent = ({ gdpr }) => {
+  if (!gdpr) {
+    return null
+  }
+  const { gdprApplies, consentString } = gdpr
+  if (!(gdprApplies == '0' || gdprApplies == '1')) {
+    throw 'TCF Consent: gdprApplies has wrong format'
+  }
+  if (consentString && typeof consentString != 'string') {
+    throw 'TCF Consent: consentString must be string if defined'
+  }
+  const result = {
+    'gdpr_applies': gdprApplies,
+    'consent_string': consentString
+  }
+  return result
+}
+
+/**
+ * Extracts the OPE first party id field from local storage
+ * @returns fpid string if found, else null
+ */
+export const extractFpid = () => {
+  try {
+    const fpid = window.localStorage.getItem(OPE_FPID);
+    if (fpid) {
+      return fpid;
+    }
+    return null;
+  } catch (error) {
+    return null;
+  }
+}
+/**
+ * Gets the URL of Profile Api from which targeting data will be fetched
+ * @param {string} config.customerId
+ * @param {object} consent query params as dict
+ * @param {string} oneplusx first party id (nullable)
+ * @returns {string} URL to access 1plusX Profile API
+ */
+export const getPapiUrl = (customerId, consent, fpid) => {
+  // https://[yourClientId].profiles.tagger.opecloud.com/[VERSION]/targeting?url=
+  const currentUrl = encodeURIComponent(window.location.href);
+  var papiUrl = `https://${customerId}.profiles.tagger.opecloud.com/${PAPI_VERSION}/targeting?url=${currentUrl}`;
+  if (consent) {
+    Object.entries(consent).forEach(([key, value]) => {
+      papiUrl += `&${key}=${value}`
+    })
+  }
+  if (fpid) {
+    papiUrl += `&fpid=${fpid}`
+  }
+
+  return papiUrl;
+}
+
+/**
+ * Fetches targeting data. It contains the audience segments & the contextual topics
+ * @param {string} papiUrl URL of profile API
+ * @returns {Promise} Promise object resolving with data fetched from Profile API
+ */
+const getTargetingDataFromPapi = (papiUrl) => {
+  return new Promise((resolve, reject) => {
+    const requestOptions = {
+      customHeaders: {
+        'Accept': 'application/json'
+      }
+    }
+    const callbacks = {
+      success(responseText, response) {
+        resolve(JSON.parse(response.response));
+      },
+      error(error) {
+        reject(error);
+      }
+    };
+    ajax(papiUrl, callbacks, null, requestOptions)
+  })
+}
+
+/**
+ * Prepares the update for the ORTB2 object
+ * @param {Object} targetingData Targeting data fetched from Profile API
+ * @param {string[]} segments Represents the audience segments of the user
+ * @param {string[]} topics Represents the topics of the page
+ * @returns {Object} Object describing the updates to make on bidder configs
+ */
+export const buildOrtb2Updates = ({ segments = [], topics = [] }, bidder) => {
+  // Currently appnexus bidAdapter doesn't support topics in `site.content.data.segment`
+  // Therefore, writing them in `site.keywords` until it's supported
+  // Other bidAdapters do fine with `site.content.data.segment`
+  const writeToLegacySiteKeywords = LEGACY_SITE_KEYWORDS_BIDDERS.includes(bidder);
+  if (writeToLegacySiteKeywords) {
+    const site = {
+      keywords: topics.join(',')
+    };
+    return { site };
+  }
+
+  const userData = {
+    name: ORTB2_NAME,
+    segment: segments.map((segmentId) => ({ id: segmentId }))
+  };
+  const siteContentData = {
+    name: ORTB2_NAME,
+    segment: topics.map((topicId) => ({ id: topicId })),
+    ext: { segtax: segtaxes.CONTENT }
+  }
+  return { userData, siteContentData };
+}
+
+/**
+ * Merges the targeting data with the existing config for bidder and updates
+ * @param {string} bidder Bidder for which to set config
+ * @param {Object} ortb2Updates Updates to be applied to bidder config
+ * @param {Object} bidderConfigs All current bidder configs
+ * @returns {Object} Updated bidder config
+ */
+export const updateBidderConfig = (bidder, ortb2Updates, bidderConfigs) => {
+  const { site, siteContentData, userData } = ortb2Updates;
+  const bidderConfigCopy = mergeDeep({}, bidderConfigs[bidder]);
+
+  if (site) {
+    // Legacy : cf. comment on buildOrtb2Updates first lines
+    const currentSite = deepAccess(bidderConfigCopy, 'ortb2.site');
+    const updatedSite = mergeDeep(currentSite, site);
+    deepSetValue(bidderConfigCopy, 'ortb2.site', updatedSite);
+  }
+
+  if (siteContentData) {
+    const siteDataPath = 'ortb2.site.content.data';
+    const currentSiteContentData = deepAccess(bidderConfigCopy, siteDataPath) || [];
+    const updatedSiteContentData = [
+      ...currentSiteContentData.filter(({ name }) => name != siteContentData.name),
+      siteContentData
+    ];
+    deepSetValue(bidderConfigCopy, siteDataPath, updatedSiteContentData);
+  }
+
+  if (userData) {
+    const userDataPath = 'ortb2.user.data';
+    const currentUserData = deepAccess(bidderConfigCopy, userDataPath) || [];
+    const updatedUserData = [
+      ...currentUserData.filter(({ name }) => name != userData.name),
+      userData
+    ];
+    deepSetValue(bidderConfigCopy, userDataPath, updatedUserData);
+  }
+
+  return bidderConfigCopy;
+};
+
+const setAppnexusAudiences = (audiences) => {
+  config.setConfig({
+    appnexusAuctionKeywords: {
+      '1plusX': audiences,
+    },
+  });
+}
+
+/**
+ * Updates bidder configs with the targeting data retreived from Profile API
+ * @param {Object} papiResponse Response from Profile API
+ * @param {Object} config Module configuration
+ * @param {string[]} config.bidders Bidders specified in module's configuration
+ */
+export const setTargetingDataToConfig = (papiResponse, { bidders }) => {
+  const bidderConfigs = config.getBidderConfig();
+  const { s: segments, t: topics } = papiResponse;
+
+  for (const bidder of bidders) {
+    const ortb2Updates = buildOrtb2Updates({ segments, topics }, bidder);
+    const updatedBidderConfig = updateBidderConfig(bidder, ortb2Updates, bidderConfigs);
+    if (updatedBidderConfig) {
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: updatedBidderConfig
+      });
+    }
+    if (bidder === 'appnexus') {
+      // Do the legacy stuff for appnexus with segments
+      setAppnexusAudiences(segments);
+    }
+  }
+}
+
+// Functions exported in submodule object
+/**
+ * Init
+ * @param {Object} config Module configuration
+ * @param {boolean} userConsent
+ * @returns true
+ */
+const init = (config, userConsent) => {
+  return true;
+}
+
+/**
+ *
+ * @param {Object} reqBidsConfigObj Bid request configuration object
+ * @param {Function} callback Called on completion
+ * @param {Object} moduleConfig Configuration for 1plusX RTD module
+ * @param {Object} userConsent
+ */
+const getBidRequestData = (reqBidsConfigObj, callback, moduleConfig, userConsent) => {
+  try {
+    // Get the required config
+    const { customerId, bidders } = extractConfig(moduleConfig, reqBidsConfigObj);
+    // Get PAPI URL
+    const papiUrl = getPapiUrl(customerId, extractConsent(userConsent) || {}, extractFpid())
+    // Call PAPI
+    getTargetingDataFromPapi(papiUrl)
+      .then((papiResponse) => {
+        logMessage(LOG_PREFIX, 'Get targeting data request successful');
+        setTargetingDataToConfig(papiResponse, { bidders });
+        callback();
+      })
+  } catch (error) {
+    logError(LOG_PREFIX, error);
+    callback();
+  }
+}
+
+// The RTD submodule object to be exported
+export const onePlusXSubmodule = {
+  name: MODULE_NAME,
+  init,
+  getBidRequestData
+}
+
+// Register the onePlusXSubmodule as submodule of realTimeData
+submodule(REAL_TIME_MODULE, onePlusXSubmodule);
diff --git a/modules/1plusXRtdProvider.md b/modules/1plusXRtdProvider.md
new file mode 100644
index 00000000000..6a6211b37cc
--- /dev/null
+++ b/modules/1plusXRtdProvider.md
@@ -0,0 +1,65 @@
+# 1plusX Real-time Data Submodule
+
+## Overview
+
+    Module Name: 1plusX Rtd Provider
+    Module Type: Rtd Provider
+    Maintainer: dc-team-1px@triplelift.com
+
+## Description
+
+The 1plusX RTD module appends User and Contextual segments to the bidding object.
+
+## Usage
+
+### Build
+```
+gulp build --modules="rtdModule,1plusXRtdProvider,appnexusBidAdapter,..."  
+```
+
+> Note that the global RTD module, `rtdModule`, is a prerequisite of the 1plusX RTD module.
+
+### Configuration
+
+Use `setConfig` to instruct Prebid.js to initilize the 1plusX RTD module, as specified below. 
+
+This module is configured as part of the `realTimeData.dataProviders`
+
+```javascript
+var TIMEOUT = 1000;
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: TIMEOUT,
+        dataProviders: [{
+            name: '1plusX',
+            waitForIt: true,
+            params: {
+                customerId: 'acme',
+                bidders: ['appnexus', 'rubicon'],
+                timeout: TIMEOUT
+            }
+        }]
+    }
+});
+```
+
+### Parameters 
+
+| Name              | Type          | Description                                                      | Default           |
+| :---------------- | :------------ | :--------------------------------------------------------------- |:----------------- |
+| name              | String        | Real time data module name                                       | Always '1plusX'   |
+| waitForIt         | Boolean       | Should be `true` if there's an `auctionDelay` defined (optional) | `false`           |
+| params            | Object        |                                                                  |                   |
+| params.customerId | String        | Your 1plusX customer id                                          |                   |
+| params.bidders    | Array<string> | List of bidders for which you would like data to be set          |                   |
+| params.timeout    | Integer       | timeout (ms)                                                     | 1000ms            |
+
+## Testing 
+
+To view an example of how the 1plusX RTD module works :
+
+`gulp serve --modules=rtdModule,1plusXRtdProvider,appnexusBidAdapter,rubiconBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/1plusXRtdProvider_example.html`
diff --git a/modules/33acrossBidAdapter.js b/modules/33acrossBidAdapter.js
index 5df2af7f32e..d9524a281f8 100644
--- a/modules/33acrossBidAdapter.js
+++ b/modules/33acrossBidAdapter.js
@@ -1,12 +1,52 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
-import * as utils from '../src/utils.js';
-
+import {
+  deepAccess,
+  uniques,
+  isArray,
+  getWindowTop,
+  isGptPubadsDefined,
+  isSlotMatchingAdUnitCode,
+  logInfo,
+  logWarn,
+  getWindowSelf,
+  mergeDeep,
+  pick
+} from '../src/utils.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+// **************************** UTILS *************************** //
 const BIDDER_CODE = '33across';
+const BIDDER_ALIASES = ['33across_mgni'];
 const END_POINT = 'https://ssc.33across.com/api/v1/hb';
 const SYNC_ENDPOINT = 'https://ssc-cms.33across.com/ps/?m=xch&rt=html&ru=deb';
-const MEDIA_TYPE = 'banner';
+
 const CURRENCY = 'USD';
+const GVLID = 58;
+const GUID_PATTERN = /^[a-zA-Z0-9_-]{22}$/;
+
+const PRODUCT = {
+  SIAB: 'siab',
+  INVIEW: 'inview',
+  INSTREAM: 'instream'
+};
+
+const VIDEO_ORTB_PARAMS = [
+  'mimes',
+  'minduration',
+  'maxduration',
+  'placement',
+  'protocols',
+  'startdelay',
+  'skip',
+  'skipafter',
+  'minbitrate',
+  'maxbitrate',
+  'delivery',
+  'playbackmethod',
+  'api',
+  'linearity'
+];
 
 const adapterState = {
   uniqueSiteIds: []
@@ -14,126 +54,238 @@ const adapterState = {
 
 const NON_MEASURABLE = 'nm';
 
-// All this assumes that only one bid is ever returned by ttx
-function _createBidResponse(response) {
-  return {
-    requestId: response.id,
-    bidderCode: BIDDER_CODE,
-    cpm: response.seatbid[0].bid[0].price,
-    width: response.seatbid[0].bid[0].w,
-    height: response.seatbid[0].bid[0].h,
-    ad: response.seatbid[0].bid[0].adm,
-    ttl: response.seatbid[0].bid[0].ttl || 60,
-    creativeId: response.seatbid[0].bid[0].crid,
-    currency: response.cur,
-    netRevenue: true
+function getTTXConfig() {
+  const ttxSettings = Object.assign({},
+    config.getConfig('ttxSettings')
+  );
+
+  return ttxSettings;
+}
+
+// **************************** VALIDATION *************************** //
+function isBidRequestValid(bid) {
+  return (
+    _validateBasic(bid) &&
+    _validateBanner(bid) &&
+    _validateVideo(bid)
+  );
+}
+
+function _validateBasic(bid) {
+  const invalidBidderName = bid.bidder !== BIDDER_CODE && !BIDDER_ALIASES.includes(bid.bidder);
+
+  if (invalidBidderName || !bid.params) {
+    return false;
   }
+
+  if (!_validateGUID(bid)) {
+    return false;
+  }
+
+  return true;
 }
 
-function _isViewabilityMeasurable(element) {
-  return !_isIframe() && element !== null;
+function _validateGUID(bid) {
+  const siteID = deepAccess(bid, 'params.siteId', '') || '';
+  if (siteID.trim().match(GUID_PATTERN) === null) {
+    return false;
+  }
+
+  return true;
 }
 
-function _getViewability(element, topWin, { w, h } = {}) {
-  return topWin.document.visibilityState === 'visible'
-    ? _getPercentInView(element, topWin, { w, h })
-    : 0;
+function _validateBanner(bid) {
+  const banner = deepAccess(bid, 'mediaTypes.banner');
+
+  // If there's no banner no need to validate against banner rules
+  if (banner === undefined) {
+    return true;
+  }
+
+  if (!Array.isArray(banner.sizes)) {
+    return false;
+  }
+
+  return true;
 }
 
-function _mapAdUnitPathToElementId(adUnitCode) {
-  if (utils.isGptPubadsDefined()) {
-    // eslint-disable-next-line no-undef
-    const adSlots = googletag.pubads().getSlots();
-    const isMatchingAdSlot = utils.isSlotMatchingAdUnitCode(adUnitCode);
+function _validateVideo(bid) {
+  const videoAdUnit = deepAccess(bid, 'mediaTypes.video');
+  const videoBidderParams = deepAccess(bid, 'params.video', {});
 
-    for (let i = 0; i < adSlots.length; i++) {
-      if (isMatchingAdSlot(adSlots[i])) {
-        const id = adSlots[i].getSlotElementId();
+  // If there's no video no need to validate against video rules
+  if (videoAdUnit === undefined) {
+    return true;
+  }
 
-        utils.logInfo(`[33Across Adapter] Map ad unit path to HTML element id: '${adUnitCode}' -> ${id}`);
+  if (!Array.isArray(videoAdUnit.playerSize)) {
+    return false;
+  }
 
-        return id;
-      }
-    }
+  if (!videoAdUnit.context) {
+    return false;
+  }
+
+  const videoParams = {
+    ...videoAdUnit,
+    ...videoBidderParams
+  };
+
+  if (!Array.isArray(videoParams.mimes) || videoParams.mimes.length === 0) {
+    return false;
   }
 
-  utils.logWarn(`[33Across Adapter] Unable to locate element for ad unit code: '${adUnitCode}'`);
+  if (!Array.isArray(videoParams.protocols) || videoParams.protocols.length === 0) {
+    return false;
+  }
 
-  return null;
+  // If placement if defined, it must be a number
+  if (
+    typeof videoParams.placement !== 'undefined' &&
+    typeof videoParams.placement !== 'number'
+  ) {
+    return false;
+  }
+
+  // If startdelay is defined it must be a number
+  if (
+    videoAdUnit.context === 'instream' &&
+    typeof videoParams.startdelay !== 'undefined' &&
+    typeof videoParams.startdelay !== 'number'
+  ) {
+    return false;
+  }
+
+  return true;
 }
 
-function _getAdSlotHTMLElement(adUnitCode) {
-  return document.getElementById(adUnitCode) ||
-    document.getElementById(_mapAdUnitPathToElementId(adUnitCode));
+// **************************** BUILD REQUESTS *************************** //
+// NOTE: With regards to gdrp consent data, the server will independently
+// infer the gdpr applicability therefore, setting the default value to false
+function buildRequests(bidRequests, bidderRequest) {
+  const {
+    ttxSettings,
+    gdprConsent,
+    uspConsent,
+    pageUrl
+  } = _buildRequestParams(bidRequests, bidderRequest);
+
+  const groupedRequests = _buildRequestGroups(ttxSettings, bidRequests);
+
+  const serverRequests = [];
+
+  for (const key in groupedRequests) {
+    serverRequests.push(
+      _createServerRequest({
+        bidRequests: groupedRequests[key],
+        gdprConsent,
+        uspConsent,
+        pageUrl,
+        ttxSettings
+      })
+    )
+  }
+
+  return serverRequests;
 }
 
-// Infer the necessary data from valid bid for a minimal ttxRequest and create HTTP request
-// NOTE: At this point, TTX only accepts request for a single impression
-function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl}) {
-  const ttxRequest = {};
-  const params = bidRequest.params;
-  const element = _getAdSlotHTMLElement(bidRequest.adUnitCode);
-  const sizes = _transformSizes(bidRequest.sizes);
+function _buildRequestParams(bidRequests, bidderRequest) {
+  const ttxSettings = getTTXConfig();
 
-  let format;
+  const gdprConsent = Object.assign({
+    consentString: undefined,
+    gdprApplies: false
+  }, bidderRequest && bidderRequest.gdprConsent);
 
-  // We support size based bidfloors so obtain one if there's a rule associated
-  if (typeof bidRequest.getFloor === 'function') {
-    let getFloor = bidRequest.getFloor.bind(bidRequest);
+  const uspConsent = bidderRequest && bidderRequest.uspConsent;
 
-    format = sizes.map((size) => {
-      const formatExt = _getBidFloors(getFloor, size);
+  const pageUrl = bidderRequest?.refererInfo?.page
 
-      return Object.assign({}, size, formatExt);
-    });
-  } else {
-    format = sizes;
+  adapterState.uniqueSiteIds = bidRequests.map(req => req.params.siteId).filter(uniques);
+
+  return {
+    ttxSettings,
+    gdprConsent,
+    uspConsent,
+    pageUrl
   }
+}
 
-  const minSize = _getMinSize(sizes);
+function _buildRequestGroups(ttxSettings, bidRequests) {
+  const bidRequestsComplete = bidRequests.map(_inferProduct);
+  const enableSRAMode = ttxSettings && ttxSettings.enableSRAMode;
+  const keyFunc = (enableSRAMode === true) ? _getSRAKey : _getMRAKey;
 
-  const viewabilityAmount = _isViewabilityMeasurable(element)
-    ? _getViewability(element, utils.getWindowTop(), minSize)
-    : NON_MEASURABLE;
+  return _groupBidRequests(bidRequestsComplete, keyFunc);
+}
+
+function _groupBidRequests(bidRequests, keyFunc) {
+  const groupedRequests = {};
 
-  const contributeViewability = ViewabilityContributor(viewabilityAmount);
+  bidRequests.forEach((req) => {
+    const key = keyFunc(req);
+
+    groupedRequests[key] = groupedRequests[key] || [];
+    groupedRequests[key].push(req);
+  });
+
+  return groupedRequests;
+}
+
+function _getSRAKey(bidRequest) {
+  return `${bidRequest.params.siteId}:${bidRequest.params.productId}`;
+}
+
+function _getMRAKey(bidRequest) {
+  return `${bidRequest.bidId}`;
+}
+
+// Infer the necessary data from valid bid for a minimal ttxRequest and create HTTP request
+function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageUrl, ttxSettings }) {
+  const ttxRequest = {};
+  const firstBidRequest = bidRequests[0];
+  const { siteId, test } = firstBidRequest.params;
 
   /*
    * Infer data for the request payload
    */
   ttxRequest.imp = [];
-  ttxRequest.imp[0] = {
-    banner: {
-      format
-    },
-    ext: {
-      ttx: {
-        prod: params.productId
-      }
-    }
-  };
-  ttxRequest.site = { id: params.siteId };
+
+  bidRequests.forEach((req) => {
+    ttxRequest.imp.push(_buildImpORTB(req));
+  });
+
+  ttxRequest.site = { id: siteId };
+  ttxRequest.device = _buildDeviceORTB(firstBidRequest.ortb2?.device);
 
   if (pageUrl) {
     ttxRequest.site.page = pageUrl;
   }
 
-  // Go ahead send the bidId in request to 33exchange so it's kept track of in the bid response and
-  // therefore in ad targetting process
-  ttxRequest.id = bidRequest.bidId;
+  ttxRequest.id = firstBidRequest.auctionId;
+
+  if (gdprConsent.consentString) {
+    ttxRequest.user = setExtensions(ttxRequest.user, {
+      'consent': gdprConsent.consentString
+    });
+  }
+
+  if (Array.isArray(firstBidRequest.userIdAsEids) && firstBidRequest.userIdAsEids.length > 0) {
+    ttxRequest.user = setExtensions(ttxRequest.user, {
+      'eids': firstBidRequest.userIdAsEids
+    });
+  }
+
+  ttxRequest.regs = setExtensions(ttxRequest.regs, {
+    'gdpr': Number(gdprConsent.gdprApplies)
+  });
+
+  if (uspConsent) {
+    ttxRequest.regs = setExtensions(ttxRequest.regs, {
+      'us_privacy': uspConsent
+    });
+  }
 
-  // Set GDPR related fields
-  ttxRequest.user = {
-    ext: {
-      consent: gdprConsent.consentString
-    }
-  };
-  ttxRequest.regs = {
-    ext: {
-      gdpr: (gdprConsent.gdprApplies === true) ? 1 : 0,
-      us_privacy: uspConsent || null
-    }
-  };
   ttxRequest.ext = {
     ttx: {
       prebidStartedAt: Date.now(),
@@ -144,16 +296,14 @@ function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl
     }
   };
 
-  if (bidRequest.schain) {
-    ttxRequest.source = {
-      ext: {
-        schain: bidRequest.schain
-      }
-    }
+  if (firstBidRequest.schain) {
+    ttxRequest.source = setExtensions(ttxRequest.source, {
+      'schain': firstBidRequest.schain
+    });
   }
 
   // Finally, set the openRTB 'test' param if this is to be a test bid
-  if (params.test === 1) {
+  if (test === 1) {
     ttxRequest.test = 1;
   }
 
@@ -166,60 +316,236 @@ function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl
   };
 
   // Allow the ability to configure the HB endpoint for testing purposes.
-  const ttxSettings = config.getConfig('ttxSettings');
-  const url = (ttxSettings && ttxSettings.url) || END_POINT;
+  const url = (ttxSettings && ttxSettings.url) || `${END_POINT}?guid=${siteId}`;
 
   // Return the server request
   return {
     'method': 'POST',
     'url': url,
-    'data': JSON.stringify(contributeViewability(ttxRequest)),
+    'data': JSON.stringify(ttxRequest),
     'options': options
+  };
+}
+
+// BUILD REQUESTS: SET EXTENSIONS
+function setExtensions(obj = {}, extFields) {
+  return mergeDeep({}, obj, {
+    'ext': extFields
+  });
+}
+
+// BUILD REQUESTS: IMP
+function _buildImpORTB(bidRequest) {
+  const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid');
+
+  const imp = {
+    id: bidRequest.bidId,
+    ext: {
+      ttx: {
+        prod: deepAccess(bidRequest, 'params.productId')
+      },
+      ...(gpid ? { gpid } : {})
+    }
+  };
+
+  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
+    imp.banner = {
+      ..._buildBannerORTB(bidRequest)
+    }
+  }
+
+  if (deepAccess(bidRequest, 'mediaTypes.video')) {
+    imp.video = _buildVideoORTB(bidRequest);
   }
+
+  return imp;
 }
 
-// Sync object will always be of type iframe for TTX
-function _createSync({ siteId = 'zzz000000000003zzz', gdprConsent = {}, uspConsent }) {
-  const ttxSettings = config.getConfig('ttxSettings');
-  const syncUrl = (ttxSettings && ttxSettings.syncUrl) || SYNC_ENDPOINT;
+// BUILD REQUESTS: SIZE INFERENCE
+function _transformSizes(sizes) {
+  if (isArray(sizes) && sizes.length === 2 && !isArray(sizes[0])) {
+    return [ _getSize(sizes) ];
+  }
 
-  const { consentString, gdprApplies } = gdprConsent;
+  return sizes.map(_getSize);
+}
 
-  const sync = {
-    type: 'iframe',
-    url: `${syncUrl}&id=${siteId}&gdpr_consent=${encodeURIComponent(consentString)}&us_privacy=${encodeURIComponent(uspConsent)}`
+function _getSize(size) {
+  return {
+    w: parseInt(size[0], 10),
+    h: parseInt(size[1], 10)
+  }
+}
+
+// BUILD REQUESTS: PRODUCT INFERENCE
+function _inferProduct(bidRequest) {
+  return mergeDeep({}, bidRequest, {
+    params: {
+      productId: _getProduct(bidRequest)
+    }
+  });
+}
+
+function _getProduct(bidRequest) {
+  const { params, mediaTypes } = bidRequest;
+
+  const { banner, video } = mediaTypes;
+
+  if ((video && !banner) && video.context === 'instream') {
+    return PRODUCT.INSTREAM;
+  }
+
+  return (params.productId === PRODUCT.INVIEW) ? (params.productId) : PRODUCT.SIAB;
+}
+
+// BUILD REQUESTS: BANNER
+function _buildBannerORTB(bidRequest) {
+  const bannerAdUnit = deepAccess(bidRequest, 'mediaTypes.banner', {});
+  const element = _getAdSlotHTMLElement(bidRequest.adUnitCode);
+
+  const sizes = _transformSizes(bannerAdUnit.sizes);
+
+  let format;
+
+  // We support size based bidfloors so obtain one if there's a rule associated
+  if (typeof bidRequest.getFloor === 'function') {
+    format = sizes.map((size) => {
+      const bidfloors = _getBidFloors(bidRequest, size, BANNER);
+
+      let formatExt;
+      if (bidfloors) {
+        formatExt = {
+          ext: {
+            ttx: {
+              bidfloors: [ bidfloors ]
+            }
+          }
+        }
+      }
+
+      return Object.assign({}, size, formatExt);
+    });
+  } else {
+    format = sizes;
+  }
+
+  const minSize = _getMinSize(sizes);
+
+  const viewabilityAmount = _isViewabilityMeasurable(element)
+    ? _getViewability(element, getWindowTop(), minSize)
+    : NON_MEASURABLE;
+
+  const ext = contributeViewability(viewabilityAmount);
+
+  return {
+    format,
+    ext
   };
+}
 
-  if (typeof gdprApplies === 'boolean') {
-    sync.url += `&gdpr=${Number(gdprApplies)}`;
+// BUILD REQUESTS: VIDEO
+// eslint-disable-next-line no-unused-vars
+function _buildVideoORTB(bidRequest) {
+  const videoAdUnit = deepAccess(bidRequest, 'mediaTypes.video', {});
+  const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
+
+  const videoParams = {
+    ...videoAdUnit,
+    ...videoBidderParams // Bidder Specific overrides
+  };
+
+  const video = {};
+
+  const { w, h } = _getSize(videoParams.playerSize[0]);
+  video.w = w;
+  video.h = h;
+
+  // Obtain all ORTB params related video from Ad Unit
+  VIDEO_ORTB_PARAMS.forEach((param) => {
+    if (videoParams.hasOwnProperty(param)) {
+      video[param] = videoParams[param];
+    }
+  });
+
+  const product = _getProduct(bidRequest);
+
+  // Placement Inference Rules:
+  // - If no placement is defined then default to 2 (In Banner)
+  // - If product is instream (for instream context) then override placement to 1
+  video.placement = video.placement || 2;
+
+  if (product === PRODUCT.INSTREAM) {
+    video.startdelay = video.startdelay || 0;
+    video.placement = 1;
   }
 
-  return sync;
+  // bidfloors
+  if (typeof bidRequest.getFloor === 'function') {
+    const bidfloors = _getBidFloors(bidRequest, { w: video.w, h: video.h }, VIDEO);
+
+    if (bidfloors) {
+      Object.assign(video, {
+        ext: {
+          ttx: {
+            bidfloors: [ bidfloors ]
+          }
+        }
+      });
+    }
+  }
+
+  return video;
 }
 
-function _getBidFloors(getFloor, size) {
-  const bidFloors = getFloor({
+// BUILD REQUESTS: BIDFLOORS
+function _getBidFloors(bidRequest, size, mediaType) {
+  const bidFloors = bidRequest.getFloor({
     currency: CURRENCY,
-    mediaType: MEDIA_TYPE,
+    mediaType,
     size: [ size.w, size.h ]
   });
 
   if (!isNaN(bidFloors.floor) && (bidFloors.currency === CURRENCY)) {
-    return {
-      ext: {
-        ttx: {
-          bidfloors: [ bidFloors.floor ]
-        }
+    return bidFloors.floor;
+  }
+}
+
+// BUILD REQUESTS: VIEWABILITY
+function _isViewabilityMeasurable(element) {
+  return !_isIframe() && element !== null;
+}
+
+function _getViewability(element, topWin, { w, h } = {}) {
+  return topWin.document.visibilityState === 'visible'
+    ? _getPercentInView(element, topWin, { w, h })
+    : 0;
+}
+
+function _mapAdUnitPathToElementId(adUnitCode) {
+  if (isGptPubadsDefined()) {
+    // eslint-disable-next-line no-undef
+    const adSlots = googletag.pubads().getSlots();
+    const isMatchingAdSlot = isSlotMatchingAdUnitCode(adUnitCode);
+
+    for (let i = 0; i < adSlots.length; i++) {
+      if (isMatchingAdSlot(adSlots[i])) {
+        const id = adSlots[i].getSlotElementId();
+
+        logInfo(`[33Across Adapter] Map ad unit path to HTML element id: '${adUnitCode}' -> ${id}`);
+
+        return id;
       }
     }
   }
+
+  logWarn(`[33Across Adapter] Unable to locate element for ad unit code: '${adUnitCode}'`);
+
+  return null;
 }
 
-function _getSize(size) {
-  return {
-    w: parseInt(size[0], 10),
-    h: parseInt(size[1], 10)
-  }
+function _getAdSlotHTMLElement(adUnitCode) {
+  return document.getElementById(adUnitCode) ||
+    document.getElementById(_mapAdUnitPathToElementId(adUnitCode));
 }
 
 function _getMinSize(sizes) {
@@ -239,14 +565,6 @@ function _getBoundingBox(element, { w, h } = {}) {
   return { width, height, left, top, right, bottom };
 }
 
-function _transformSizes(sizes) {
-  if (utils.isArray(sizes) && sizes.length === 2 && !utils.isArray(sizes[0])) {
-    return [ _getSize(sizes) ];
-  }
-
-  return sizes.map(_getSize);
-}
-
 function _getIntersectionOfRects(rects) {
   const bbox = {
     left: rects[0].left,
@@ -307,77 +625,85 @@ function _getPercentInView(element, topWin, { w, h } = {}) {
 /**
  * Viewability contribution to request..
  */
-function ViewabilityContributor(viewabilityAmount) {
-  function contributeViewability(ttxRequest) {
-    const req = Object.assign({}, ttxRequest);
-    const imp = req.imp = req.imp.map(impItem => Object.assign({}, impItem));
-    const banner = imp[0].banner = Object.assign({}, imp[0].banner);
-    const ext = banner.ext = Object.assign({}, banner.ext);
-    const ttx = ext.ttx = Object.assign({}, ext.ttx);
-
-    ttx.viewability = { amount: isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount) };
+function contributeViewability(viewabilityAmount) {
+  const amount = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
 
-    return req;
-  }
-
-  return contributeViewability;
+  return {
+    ttx: {
+      viewability: {
+        amount
+      }
+    }
+  };
 }
 
 function _isIframe() {
   try {
-    return utils.getWindowSelf() !== utils.getWindowTop();
+    return getWindowSelf() !== getWindowTop();
   } catch (e) {
     return true;
   }
 }
 
-function isBidRequestValid(bid) {
-  if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
-    return false;
-  }
+// **************************** INTERPRET RESPONSE ******************************** //
+function interpretResponse(serverResponse, bidRequest) {
+  const { seatbid, cur = 'USD' } = serverResponse.body;
 
-  if (typeof bid.params.siteId === 'undefined' || typeof bid.params.productId === 'undefined') {
-    return false;
+  if (!isArray(seatbid)) {
+    return [];
   }
 
-  return true;
+  // Pick seats with valid bids and convert them into an Array of responses
+  // in format expected by Prebid Core
+  return seatbid
+    .filter((seat) => (
+      isArray(seat.bid) &&
+      seat.bid.length > 0
+    ))
+    .reduce((acc, seat) => {
+      return acc.concat(
+        seat.bid.map((bid) => _createBidResponse(bid, cur))
+      );
+    }, []);
 }
 
-// NOTE: With regards to gdrp consent data,
-// - the server independently infers gdpr applicability therefore, setting the default value to false
-function buildRequests(bidRequests, bidderRequest) {
-  const gdprConsent = Object.assign({
-    consentString: undefined,
-    gdprApplies: false
-  }, bidderRequest && bidderRequest.gdprConsent);
-
-  const uspConsent = bidderRequest && bidderRequest.uspConsent;
-  const pageUrl = (bidderRequest && bidderRequest.refererInfo) ? (bidderRequest.refererInfo.referer) : (undefined);
-
-  adapterState.uniqueSiteIds = bidRequests.map(req => req.params.siteId).filter(utils.uniques);
+function _createBidResponse(bid, cur) {
+  const isADomainPresent =
+    bid.adomain && bid.adomain.length;
+  const bidResponse = {
+    requestId: bid.impid,
+    bidderCode: BIDDER_CODE,
+    cpm: bid.price,
+    width: bid.w,
+    height: bid.h,
+    ad: bid.adm,
+    ttl: bid.ttl || 60,
+    creativeId: bid.crid,
+    mediaType: deepAccess(bid, 'ext.ttx.mediaType', BANNER),
+    currency: cur,
+    netRevenue: true
+  }
 
-  return bidRequests.map(bidRequest => _createServerRequest(
-    {
-      bidRequest,
-      gdprConsent,
-      uspConsent,
-      pageUrl
-    })
-  );
-}
+  if (isADomainPresent) {
+    bidResponse.meta = {
+      advertiserDomains: bid.adomain
+    };
+  }
 
-// NOTE: At this point, the response from 33exchange will only ever contain one bid i.e. the highest bid
-function interpretResponse(serverResponse, bidRequest) {
-  const bidResponses = [];
+  if (bidResponse.mediaType === VIDEO) {
+    const vastType = deepAccess(bid, 'ext.ttx.vastType', 'xml');
 
-  // If there are bids, look at the first bid of the first seatbid (see NOTE above for assumption about ttx)
-  if (serverResponse.body.seatbid.length > 0 && serverResponse.body.seatbid[0].bid.length > 0) {
-    bidResponses.push(_createBidResponse(serverResponse.body));
+    if (vastType === 'xml') {
+      bidResponse.vastXml = bidResponse.ad;
+    } else {
+      bidResponse.vastUrl = bidResponse.ad;
+    }
   }
 
-  return bidResponses;
+  return bidResponse;
 }
 
+// **************************** USER SYNC *************************** //
 // Register one sync per unique guid so long as iframe is enable
 // Else no syncs
 // For logic on how we handle gdpr data see _createSyncs and module's unit tests
@@ -395,11 +721,105 @@ function getUserSyncs(syncOptions, responses, gdprConsent, uspConsent) {
   return syncUrls;
 }
 
+// Sync object will always be of type iframe for TTX
+function _createSync({ siteId = 'zzz000000000003zzz', gdprConsent = {}, uspConsent }) {
+  const ttxSettings = config.getConfig('ttxSettings');
+  const syncUrl = (ttxSettings && ttxSettings.syncUrl) || SYNC_ENDPOINT;
+
+  const { consentString, gdprApplies } = gdprConsent;
+
+  const sync = {
+    type: 'iframe',
+    url: `${syncUrl}&id=${siteId}&gdpr_consent=${encodeURIComponent(consentString)}&us_privacy=${encodeURIComponent(uspConsent)}`
+  };
+
+  if (typeof gdprApplies === 'boolean') {
+    sync.url += `&gdpr=${Number(gdprApplies)}`;
+  }
+
+  return sync;
+}
+
+// BUILD REQUESTS: DEVICE
+function _buildDeviceORTB(device = {}) {
+  const win = getWindowSelf();
+  const deviceProps = {
+    ext: {
+      ttx: {
+        ...getScreenDimensions(),
+        pxr: win.devicePixelRatio,
+        vp: getViewportDimensions(),
+        ah: win.screen.availHeight,
+        mtp: win.navigator.maxTouchPoints
+      }
+    }
+  }
+
+  if (device.sua) {
+    deviceProps.sua = pick(device.sua, [ 'browsers', 'platform', 'model' ]);
+  }
+
+  return deviceProps;
+}
+
+function getTopMostAccessibleWindow() {
+  let mostAccessibleWindow = getWindowSelf();
+
+  try {
+    while (mostAccessibleWindow.parent !== mostAccessibleWindow &&
+      mostAccessibleWindow.parent.document) {
+      mostAccessibleWindow = mostAccessibleWindow.parent;
+    }
+  } catch (err) {
+    // Do not throw an exception if we can't access the topmost frame.
+  }
+
+  return mostAccessibleWindow;
+}
+
+function getViewportDimensions() {
+  const topWin = getTopMostAccessibleWindow();
+  const documentElement = topWin.document.documentElement;
+
+  return {
+    w: documentElement.clientWidth,
+    h: documentElement.clientHeight,
+  };
+}
+
+function getScreenDimensions() {
+  const {
+    innerWidth: windowWidth,
+    innerHeight: windowHeight,
+    screen
+  } = getWindowSelf();
+
+  const [biggerDimension, smallerDimension] = [
+    Math.max(screen.width, screen.height),
+    Math.min(screen.width, screen.height),
+  ];
+
+  if (windowHeight > windowWidth) { // Portrait mode
+    return {
+      w: smallerDimension,
+      h: biggerDimension,
+    };
+  }
+
+  // Landscape mode
+  return {
+    w: biggerDimension,
+    h: smallerDimension,
+  };
+}
+
 export const spec = {
   NON_MEASURABLE,
 
   code: BIDDER_CODE,
-
+  aliases: BIDDER_ALIASES,
+  supportedMediaTypes: [ BANNER, VIDEO ],
+  gvlid: GVLID,
   isBidRequestValid,
   buildRequests,
   interpretResponse,
diff --git a/modules/33acrossBidAdapter.md b/modules/33acrossBidAdapter.md
index c313f3b6e0b..c01c04251e5 100644
--- a/modules/33acrossBidAdapter.md
+++ b/modules/33acrossBidAdapter.md
@@ -10,23 +10,145 @@ Maintainer: headerbidding@33across.com
 
 Connects to 33Across's exchange for bids.
 
-33Across bid adapter supports only Banner at present and follows MRA
+33Across bid adapter supports Banner and Video at present and follows MRA
 
 # Sample Ad Unit: For Publishers
+## Sample Banner only Ad Unit
 ```
 var adUnits = [
 {
-    code: '33across-hb-ad-123456-1', // ad slot HTML element ID   
-    sizes: [
-        [300, 250], 
-        [728, 90]
-    ],     
-    bids: [{
-        bidder: '33across',
-        params: {
-            siteId: 'cxBE0qjUir6iopaKkGJozW',     
-            productId: 'siab'     
+  code: '33across-hb-ad-123456-1', // ad slot HTML element ID  
+  mediaTypes: {
+    banner: {  
+      sizes: [
+          [300, 250], 
+          [728, 90]
+      ]
+    }   
+  } 
+  bids: [{
+    bidder: '33across',
+    params: {
+        siteId: 'sample33xGUID123456789',     
+        productId: 'siab'     
+    }
+  }]
+}
+```
+
+## Sample Video only Ad Unit: Outstream
+```
+var adUnits = [
+{
+  code: '33across-hb-ad-123456-1', // ad slot HTML element ID  
+  mediaTypes: {
+    video: {  
+      playerSize: [300, 250],
+      context: 'outstream',
+      placement: 2
+      ... // Aditional ORTB video params
+    }   
+  },
+  renderer: {
+    url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+    render: function (bid) {
+        adResponse = {
+            ad: {
+                video: {
+                    content: bid.vastXml,
+                    player_height: bid.playerHeight,
+                    player_width: bid.playerWidth
+                }
+            }
         }
-    }]
+        // push to render queue because ANOutstreamVideo may not be loaded yet.
+        bid.renderer.push(() => {
+            ANOutstreamVideo.renderAd({
+                targetId: bid.adUnitCode, // target div id to render video.
+                adResponse: adResponse
+            });
+        });
+    }
+  }, 
+  bids: [{
+    bidder: '33across',
+    params: {
+        siteId: 'sample33xGUID123456789',     
+        productId: 'siab'     
+    }
+  }]
+}
+```
+
+## Sample Multi-Format Ad Unit: Outstream
+```
+var adUnits = [
+{
+  code: '33across-hb-ad-123456-1', // ad slot HTML element ID  
+  mediaTypes: {
+    banner: {  
+      sizes: [
+          [300, 250], 
+          [728, 90]
+      ]
+    },
+    video: {  
+      playerSize: [300, 250],
+      context: 'outstream',
+      placement: 2
+      ... // Aditional ORTB video params
+    }   
+  },
+  renderer: {
+    url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+    render: function (bid) {
+        adResponse = {
+            ad: {
+                video: {
+                    content: bid.vastXml,
+                    player_height: bid.playerHeight,
+                    player_width: bid.playerWidth
+                }
+            }
+        }
+        // push to render queue because ANOutstreamVideo may not be loaded yet.
+        bid.renderer.push(() => {
+            ANOutstreamVideo.renderAd({
+                targetId: bid.adUnitCode, // target div id to render video.
+                adResponse: adResponse
+            });
+        });
+    }
+  },
+  bids: [{
+    bidder: '33across',
+    params: {
+        siteId: 'sample33xGUID123456789',     
+        productId: 'siab'     
+    }
+  }]
+}
+```
+
+## Sample Video only Ad Unit: Instream
+```
+var adUnits = [
+{
+  code: '33across-hb-ad-123456-1', // ad slot HTML element ID  
+  mediaTypes: {
+    video: {  
+      playerSize: [300, 250],
+      context: 'intstream',
+      placement: 1
+      ... // Aditional ORTB video params
+    }   
+  } 
+  bids: [{
+    bidder: '33across',
+    params: {
+        siteId: 'sample33xGUID123456789',     
+        productId: 'instream'     
+    }
+  }]
 }
 ```
diff --git a/modules/33acrossIdSystem.js b/modules/33acrossIdSystem.js
new file mode 100644
index 00000000000..5e07fe9523d
--- /dev/null
+++ b/modules/33acrossIdSystem.js
@@ -0,0 +1,118 @@
+/**
+ * This module adds 33acrossId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/33acrossIdSystem
+ * @requires module:modules/userId
+ */
+
+import { logMessage, logError } from '../src/utils.js';
+import { ajaxBuilder } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { uspDataHandler } from '../src/adapterManager.js';
+
+const MODULE_NAME = '33acrossId';
+const API_URL = 'https://lexicon.33across.com/v1/envelope';
+const AJAX_TIMEOUT = 10000;
+const CALLER_NAME = 'pbjs';
+
+function getEnvelope(response) {
+  if (!response.succeeded) {
+    logError(`${MODULE_NAME}: Unsuccessful response`);
+
+    return;
+  }
+
+  if (!response.data.envelope) {
+    logMessage(`${MODULE_NAME}: No envelope was received`);
+
+    return;
+  }
+
+  return response.data.envelope;
+}
+
+function calculateQueryStringParams(pid, gdprConsentData) {
+  const uspString = uspDataHandler.getConsentData();
+  const gdprApplies = Boolean(gdprConsentData?.gdprApplies);
+  const params = {
+    pid,
+    gdpr: Number(gdprApplies),
+    src: CALLER_NAME,
+    ver: '$prebid.version$'
+  };
+
+  if (uspString) {
+    params.us_privacy = uspString;
+  }
+
+  if (gdprApplies) {
+    params.gdpr_consent = gdprConsentData.consentString || '';
+  }
+
+  return params;
+}
+
+/** @type {Submodule} */
+export const thirthyThreeAcrossIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  gvlid: 58,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} id
+   * @returns {{'33acrossId':{ envelope: string}}}
+   */
+  decode(id) {
+    return {
+      [MODULE_NAME]: {
+        envelope: id
+      }
+    };
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
+  getId({ params = { } }, gdprConsentData) {
+    if (typeof params.pid !== 'string') {
+      logError(`${MODULE_NAME}: Submodule requires a partner ID to be defined`);
+
+      return;
+    }
+
+    const { pid, apiUrl = API_URL } = params;
+
+    return {
+      callback(cb) {
+        ajaxBuilder(AJAX_TIMEOUT)(apiUrl, {
+          success(response) {
+            let envelope;
+
+            try {
+              envelope = getEnvelope(JSON.parse(response))
+            } catch (err) {
+              logError(`${MODULE_NAME}: ID reading error:`, err);
+            }
+            cb(envelope);
+          },
+          error(err) {
+            logError(`${MODULE_NAME}: ID error response`, err);
+
+            cb();
+          }
+        }, calculateQueryStringParams(pid, gdprConsentData), { method: 'GET', withCredentials: true });
+      }
+    };
+  }
+};
+
+submodule('userId', thirthyThreeAcrossIdSubmodule);
diff --git a/modules/33acrossIdSystem.md b/modules/33acrossIdSystem.md
new file mode 100644
index 00000000000..1e4af89344f
--- /dev/null
+++ b/modules/33acrossIdSystem.md
@@ -0,0 +1,53 @@
+# 33ACROSS ID
+
+For help adding this submodule, please contact [PrebidUIM@33across.com](PrebidUIM@33across.com).
+
+### Prebid Configuration
+
+You can configure this submodule in your `userSync.userIds[]` configuration:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [
+      {
+        name: "33acrossId",
+        storage: {
+          name: "33acrossId",
+          type: "html5",
+          expires: 90,
+          refreshInSeconds: 8*3600
+        },
+        params: {
+          pid: "0010b00002GYU4eBAH",
+        },
+      },
+    ],
+  },
+});
+```
+
+| Parameters under `userSync.userIds[]` | Scope    | Type   | Description                 | Example                                   |
+| ---| --- | --- | --- | --- |
+| name | Required | String | Name for the 33Across ID submodule | `"33acrossId"` |                                 |
+| storage                          | Required | Object | Configures how to cache User IDs locally in the browser | See [storage settings](#storage-settings) |
+| params                           | Required | Object | Parameters for 33Across ID submodule | See [params](#params)                     |
+
+### Storage Settings
+
+The following settings are available for the `storage` property in the `userSync.userIds[]` object:
+
+| Param name | Scope | Type | Description | Example   |
+| --- | --- | --- | --- | --- |
+| name | Required | String| Name of the cookie or HTML5 local storage where the user ID will be stored | `"33acrossId"` |
+| type | Required | String | `"html5"` (preferred)  or `"cookie"` | `"html5"` |
+| expires | Strongly Recommended | Number | How long (in days) the user ID information will be stored. 33Across recommends `90`. | `90` |
+| refreshInSeconds | Strongly Recommended | Number | The interval (in seconds) for refreshing the user ID. 33Across recommends no more than 8 hours between refreshes. | `8*3600` |
+
+### Params
+
+The following settings are available in the `params` property in `userSync.userIds[]` object:
+
+| Param name | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| pid | Required | String | Partner ID provided by 33Across | `"0010b00002GYU4eBAH"` |
diff --git a/modules/7xbidBidAdapter.js b/modules/7xbidBidAdapter.js
deleted file mode 100644
index b925912a399..00000000000
--- a/modules/7xbidBidAdapter.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = '7xbid';
-const BIDDER_ALIAS = '7xb';
-const ENDPOINT_BANNER = '//bidder.7xbid.com/api/v1/prebid/banner';
-const ENDPOINT_NATIVE = '//bidder.7xbid.com/api/v1/prebid/native';
-const COOKIE_SYNC_URL = '//bidder.7xbid.com/api/v1/cookie/gen';
-const SUPPORTED_MEDIA_TYPES = ['banner', 'native'];
-const SUPPORTED_CURRENCIES = ['USD', 'JPY'];
-const DEFAULT_CURRENCY = 'JPY';
-const NET_REVENUE = true;
-
-/**
-  * updated to support prebid 3.0 - remove utils.getTopWindowUrl()
-  */
-
-const _encodeURIComponent = function(a) {
-  let b = window.encodeURIComponent(a);
-  b = b.replace(/'/g, '%27');
-  return b;
-}
-
-export const _getUrlVars = function(url) {
-  var hash;
-  var myJson = {};
-  var hashes = url.slice(url.indexOf('?') + 1).split('&');
-  for (var i = 0; i < hashes.length; i++) {
-    hash = hashes[i].split('=');
-    myJson[hash[0]] = hash[1];
-  }
-  return myJson;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: [BIDDER_ALIAS], // short code
-  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
-  isBidRequestValid: function(bid) {
-    if (!(bid.params.placementId)) {
-      return false;
-    }
-
-    if (bid.params.hasOwnProperty('currency') &&
-      SUPPORTED_CURRENCIES.indexOf(bid.params.currency) === -1) {
-      utils.logInfo('Invalid currency type, we support only JPY and USD!')
-      return false;
-    }
-
-    return true;
-  },
-  /**
-    * Make a server request from the list of BidRequests.
-    *
-    * @param {validBidRequests[]} - an array of bids
-    * @return ServerRequest Info describing the request to the server.
-    */
-  buildRequests: function(validBidRequests, bidderRequest) {
-    let serverRequests = [];
-    var refererInfo;
-    if (bidderRequest && bidderRequest.refererInfo) {
-      refererInfo = bidderRequest.refererInfo;
-    }
-    validBidRequests.forEach((bid, i) => {
-      let endpoint = ENDPOINT_BANNER
-      let data = {
-        'placementid': bid.params.placementId,
-        'cur': bid.params.hasOwnProperty('currency') ? bid.params.currency : DEFAULT_CURRENCY,
-        'ua': navigator.userAgent,
-        'loc': utils.deepAccess(bidderRequest, 'refererInfo.referer'),
-        'topframe': (window.parent === window.self) ? 1 : 0,
-        'sw': screen && screen.width,
-        'sh': screen && screen.height,
-        'cb': Math.floor(Math.random() * 99999999999),
-        'tpaf': 1,
-        'cks': 1,
-        'requestid': bid.bidId
-      };
-
-      if (bid.hasOwnProperty('nativeParams')) {
-        endpoint = ENDPOINT_NATIVE
-        data.tkf = 1 // return url tracker
-        data.ad_track = '1'
-        data.apiv = '1.1.0'
-      }
-
-      if (refererInfo && refererInfo.referer) {
-        data.referer = refererInfo.referer;
-      } else {
-        data.referer = '';
-      }
-
-      serverRequests.push({
-        method: 'GET',
-        url: endpoint,
-        data: utils.parseQueryStringParameters(data)
-      })
-    })
-
-    return serverRequests;
-  },
-  interpretResponse: function(serverResponse, request) {
-    const data = _getUrlVars(request.data)
-    const successBid = serverResponse.body || {};
-    let bidResponses = [];
-    if (successBid.hasOwnProperty(data.placementid)) {
-      let bid = successBid[data.placementid]
-      let bidResponse = {
-        requestId: bid.requestid,
-        cpm: bid.price,
-        creativeId: bid.creativeId,
-        currency: bid.cur,
-        netRevenue: NET_REVENUE,
-        ttl: 700
-      };
-
-      if (bid.hasOwnProperty('title')) { // it is native ad response
-        bidResponse.mediaType = 'native'
-        bidResponse.native = {
-          title: bid.title,
-          body: bid.description,
-          cta: bid.cta,
-          sponsoredBy: bid.advertiser,
-          clickUrl: _encodeURIComponent(bid.landingURL),
-          impressionTrackers: bid.trackings,
-        }
-        if (bid.screenshots) {
-          bidResponse.native.image = {
-            url: bid.screenshots.url,
-            height: bid.screenshots.height,
-            width: bid.screenshots.width,
-          }
-        }
-        if (bid.icon) {
-          bidResponse.native.icon = {
-            url: bid.icon.url,
-            height: bid.icon.height,
-            width: bid.icon.width,
-          }
-        }
-      } else {
-        bidResponse.ad = bid.adm
-        bidResponse.width = bid.width
-        bidResponse.height = bid.height
-      }
-
-      bidResponses.push(bidResponse);
-    }
-
-    return bidResponses;
-  },
-  getUserSyncs: function(syncOptions, serverResponses) {
-    return [{
-      type: 'image',
-      url: COOKIE_SYNC_URL
-    }];
-  }
-}
-registerBidder(spec);
diff --git a/modules/7xbidBidAdapter.md b/modules/7xbidBidAdapter.md
deleted file mode 100644
index 692428332f0..00000000000
--- a/modules/7xbidBidAdapter.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Overview
-
-Module Name: 7xbid Bid Adapter
-
-Maintainer: 7xbid.com@gmail.com
-
-# Description
-
-Module that connects to 7xbid's demand sources
-
-# Test Parameters
-```javascript
-	var adUnits = [
-    {
-      code: 'test',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300,600]],
-        }
-      },
-      bids: [
-        {
-          bidder: '7xbid',
-          params: {
-            placementId: 1425292,
-            currency: 'USD'
-          }
-        }
-      ]
-    },
-    {
-      code: 'test',
-      mediaTypes: {
-        native: {
-          title: {
-            required: true,
-            len: 80
-          },
-          image: {
-            required: true,
-            sizes: [150, 50]
-          },
-          sponsoredBy: {
-            required: true
-          }
-        }
-      },
-      bids: [
-        {
-          bidder: '7xbid',
-          params: {
-            placementId: 1429695,
-            currency: 'USD'
-          }
-        },
-      ],
-    }
-  ];
-```
\ No newline at end of file
diff --git a/modules/a4gBidAdapter.js b/modules/a4gBidAdapter.js
new file mode 100644
index 00000000000..f0c7a5f5af1
--- /dev/null
+++ b/modules/a4gBidAdapter.js
@@ -0,0 +1,92 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { _each } from '../src/utils.js';
+
+const A4G_BIDDER_CODE = 'a4g';
+const A4G_CURRENCY = 'USD';
+const A4G_DEFAULT_BID_URL = 'https://ads.ad4game.com/v1/bid';
+const A4G_TTL = 120;
+
+const LOCATION_PARAM_NAME = 'siteurl';
+const ID_PARAM_NAME = 'id';
+const IFRAME_PARAM_NAME = 'if';
+const ZONE_ID_PARAM_NAME = 'zoneId';
+const SIZE_PARAM_NAME = 'size';
+
+const ARRAY_PARAM_SEPARATOR = ';';
+const ARRAY_SIZE_SEPARATOR = ',';
+const SIZE_SEPARATOR = 'x';
+
+export const spec = {
+  code: A4G_BIDDER_CODE,
+  isBidRequestValid: function(bid) {
+    return bid.params && !!bid.params.zoneId;
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let deliveryUrl = '';
+    const idParams = [];
+    const sizeParams = [];
+    const zoneIds = [];
+
+    _each(validBidRequests, function(bid) {
+      if (!deliveryUrl && typeof bid.params.deliveryUrl === 'string') {
+        deliveryUrl = bid.params.deliveryUrl;
+      }
+      idParams.push(bid.bidId);
+      let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
+      sizeParams.push(bidSizes.map(size => size.join(SIZE_SEPARATOR)).join(ARRAY_SIZE_SEPARATOR));
+      zoneIds.push(bid.params.zoneId);
+    });
+
+    if (!deliveryUrl) {
+      deliveryUrl = A4G_DEFAULT_BID_URL;
+    }
+
+    let data = {
+      [IFRAME_PARAM_NAME]: 0,
+      [LOCATION_PARAM_NAME]: bidderRequest.refererInfo?.page,
+      [SIZE_PARAM_NAME]: sizeParams.join(ARRAY_PARAM_SEPARATOR),
+      [ID_PARAM_NAME]: idParams.join(ARRAY_PARAM_SEPARATOR),
+      [ZONE_ID_PARAM_NAME]: zoneIds.join(ARRAY_PARAM_SEPARATOR)
+    };
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      data.gdpr = {
+        applies: bidderRequest.gdprConsent.gdprApplies,
+        consent: bidderRequest.gdprConsent.consentString
+      };
+    }
+
+    return {
+      method: 'GET',
+      url: deliveryUrl,
+      data: data
+    };
+  },
+
+  interpretResponse: function(serverResponses, request) {
+    const bidResponses = [];
+    _each(serverResponses.body, function(response) {
+      if (response.cpm > 0) {
+        const bidResponse = {
+          requestId: response.id,
+          creativeId: response.crid || response.id,
+          cpm: response.cpm,
+          width: response.width,
+          height: response.height,
+          currency: A4G_CURRENCY,
+          netRevenue: true,
+          ttl: A4G_TTL,
+          ad: response.ad,
+          meta: {
+            advertiserDomains: response.adomain && response.adomain.length > 0 ? response.adomain : []
+          }
+        };
+        bidResponses.push(bidResponse);
+      }
+    });
+    return bidResponses;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/a4gBidAdapter.md b/modules/a4gBidAdapter.md
index dcab312ed29..70f110724b0 100644
--- a/modules/a4gBidAdapter.md
+++ b/modules/a4gBidAdapter.md
@@ -6,32 +6,40 @@ Maintainer: devops@ad4game.com
 
 # Description
 
-Ad4Game Bidder Adapter for Prebid.js. It should be tested on real domain. `localhost` should be rewritten (ex. example.com). 
+Ad4Game Bidder Adapter for Prebid.js. It should be tested on real domain. `localhost` should be rewritten (ex. example.com).
 
 # Test Parameters
 ```
     var adUnits = [
        {
            code: 'test-div',
-           sizes: [[300, 250]],  // a display size
+           mediaTypes: {
+               banner: {
+                   sizes: [[300, 250]],  // a display size
+               }
+           },
            bids: [
                {
                     bidder: 'a4g',
                     params: {
                         zoneId: 59304,
-                        deliveryUrl: 'http://dev01.ad4game.com/v1/bid'
+                        deliveryUrl: 'https://dev01.ad4game.com/v1/bid'
                     }
                }
            ]
        },{
            code: 'test-div',
-           sizes: [[300, 50]],   // a mobile size
+           mediaTypes: {
+              banner: {
+                  sizes: [[300, 50]],  // a mobile size
+              }
+          },
            bids: [
                {
                     bidder: 'a4g',
                     params: {
                         zoneId: 59354,
-                        deliveryUrl: 'http://dev01.ad4game.com/v1/bid'
+                        deliveryUrl: 'https://dev01.ad4game.com/v1/bid'
                     }
                }
            ]
diff --git a/modules/aardvarkBidAdapter.js b/modules/aardvarkBidAdapter.js
deleted file mode 100644
index 0b864286868..00000000000
--- a/modules/aardvarkBidAdapter.js
+++ /dev/null
@@ -1,262 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'aardvark';
-const DEFAULT_ENDPOINT = 'bidder.rtk.io';
-const SYNC_ENDPOINT = 'sync.rtk.io';
-const AARDVARK_TTL = 300;
-const AARDVARK_CURRENCY = 'USD';
-
-let hasSynced = false;
-
-export function resetUserSync() {
-  hasSynced = false;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  gvlid: 52,
-  aliases: ['adsparc', 'safereach'],
-
-  isBidRequestValid: function(bid) {
-    return ((typeof bid.params.ai === 'string') && !!bid.params.ai.length &&
-      (typeof bid.params.sc === 'string') && !!bid.params.sc.length);
-  },
-
-  buildRequests: function(validBidRequests, bidderRequest) {
-    var auctionCodes = [];
-    var requests = [];
-    var requestsMap = {};
-    var referer = bidderRequest.refererInfo.referer;
-    var pageCategories = [];
-    var tdId = '';
-    var width = window.innerWidth;
-    var height = window.innerHeight;
-    var schain = '';
-
-    // This reference to window.top can cause issues when loaded in an iframe if not protected with a try/catch.
-    try {
-      var topWin = utils.getWindowTop();
-      if (topWin.rtkcategories && Array.isArray(topWin.rtkcategories)) {
-        pageCategories = topWin.rtkcategories;
-      }
-      width = topWin.innerWidth;
-      height = topWin.innerHeight;
-    } catch (e) {}
-
-    if (utils.isStr(utils.deepAccess(validBidRequests, '0.userId.tdid'))) {
-      tdId = validBidRequests[0].userId.tdid;
-    }
-
-    schain = spec.serializeSupplyChain(utils.deepAccess(validBidRequests, '0.schain'));
-
-    utils._each(validBidRequests, function(b) {
-      var rMap = requestsMap[b.params.ai];
-      if (!rMap) {
-        rMap = {
-          shortCodes: [],
-          payload: {
-            version: 1,
-            jsonp: false,
-            rtkreferer: referer,
-            w: width,
-            h: height
-          },
-          endpoint: DEFAULT_ENDPOINT
-        };
-
-        if (tdId) {
-          rMap.payload.tdid = tdId;
-        }
-        if (schain) {
-          rMap.payload.schain = schain;
-        }
-
-        if (pageCategories && pageCategories.length) {
-          rMap.payload.categories = pageCategories.slice(0);
-        }
-
-        if (b.params.categories && b.params.categories.length) {
-          rMap.payload.categories = rMap.payload.categories || []
-          utils._each(b.params.categories, function(cat) {
-            rMap.payload.categories.push(cat);
-          });
-        }
-
-        if (bidderRequest.gdprConsent) {
-          rMap.payload.gdpr = false;
-          if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') {
-            rMap.payload.gdpr = bidderRequest.gdprConsent.gdprApplies;
-          }
-          if (rMap.payload.gdpr) {
-            rMap.payload.consent = bidderRequest.gdprConsent.consentString;
-          }
-        }
-
-        requestsMap[b.params.ai] = rMap;
-        auctionCodes.push(b.params.ai);
-      }
-
-      if (bidderRequest.uspConsent) {
-        rMap.payload.us_privacy = bidderRequest.uspConsent
-      }
-
-      rMap.shortCodes.push(b.params.sc);
-      rMap.payload[b.params.sc] = b.bidId;
-
-      if ((typeof b.params.host === 'string') && b.params.host.length &&
-        (b.params.host !== rMap.endpoint)) {
-        rMap.endpoint = b.params.host;
-      }
-    });
-
-    utils._each(auctionCodes, function(auctionId) {
-      var req = requestsMap[auctionId];
-      requests.push({
-        method: 'GET',
-        url: `https://${req.endpoint}/${auctionId}/${req.shortCodes.join('_')}/aardvark`,
-        data: req.payload,
-        bidderRequest
-      });
-    });
-
-    return requests;
-  },
-
-  interpretResponse: function(serverResponse, bidRequest) {
-    var bidResponses = [];
-
-    if (!Array.isArray(serverResponse.body)) {
-      serverResponse.body = [serverResponse.body];
-    }
-
-    utils._each(serverResponse.body, function(rawBid) {
-      var cpm = +(rawBid.cpm || 0);
-
-      if (!cpm) {
-        return;
-      }
-
-      var bidResponse = {
-        requestId: rawBid.cid,
-        cpm: cpm,
-        width: rawBid.width || 0,
-        height: rawBid.height || 0,
-        currency: rawBid.currency ? rawBid.currency : AARDVARK_CURRENCY,
-        netRevenue: rawBid.netRevenue ? rawBid.netRevenue : true,
-        ttl: rawBid.ttl ? rawBid.ttl : AARDVARK_TTL,
-        creativeId: rawBid.creativeId || 0
-      };
-
-      if (rawBid.hasOwnProperty('dealId')) {
-        bidResponse.dealId = rawBid.dealId
-      }
-
-      if (rawBid.hasOwnProperty('ex')) {
-        bidResponse.ex = rawBid.ex;
-      }
-
-      switch (rawBid.media) {
-        case 'banner':
-          bidResponse.ad = rawBid.adm + utils.createTrackPixelHtml(decodeURIComponent(rawBid.nurl));
-          break;
-
-        default:
-          return utils.logError('bad Aardvark response (media)', rawBid);
-      }
-
-      bidResponses.push(bidResponse);
-    });
-
-    return bidResponses;
-  },
-
-  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
-    const syncs = [];
-    const params = [];
-    var gdprApplies = false;
-    if (gdprConsent && (typeof gdprConsent.gdprApplies === 'boolean')) {
-      gdprApplies = gdprConsent.gdprApplies;
-    }
-
-    if (!syncOptions.iframeEnabled) {
-      utils.logWarn('Aardvark: Please enable iframe based user sync.');
-      return syncs;
-    }
-
-    if (hasSynced) {
-      return syncs;
-    }
-
-    hasSynced = true;
-    if (gdprApplies) {
-      params.push(['g', '1']);
-      params.push(['c', gdprConsent.consentString]);
-    }
-
-    if (uspConsent) {
-      params.push(['us_privacy', uspConsent]);
-    }
-
-    var queryStr = '';
-    if (params.length) {
-      queryStr = '?' + params.map(p => p[0] + '=' + encodeURIComponent(p[1])).join('&')
-    }
-
-    syncs.push({
-      type: 'iframe',
-      url: `https://${SYNC_ENDPOINT}/cs${queryStr}`
-    });
-    return syncs;
-  },
-
-  /**
-   * Serializes schain params according to OpenRTB requirements
-   * @param {Object} supplyChain
-   * @returns {String}
-   */
-  serializeSupplyChain: function (supplyChain) {
-    if (!hasValidSupplyChainParams(supplyChain)) {
-      return '';
-    }
-
-    return `${supplyChain.ver},${supplyChain.complete}!${spec.serializeSupplyChainNodes(supplyChain.nodes)}`;
-  },
-
-  /**
-   * Properly sorts schain object params
-   * @param {Array} nodes
-   * @returns {String}
-   */
-  serializeSupplyChainNodes: function (nodes) {
-    const nodePropOrder = ['asi', 'sid', 'hp', 'rid', 'name', 'domain'];
-    return nodes.map(node => {
-      return nodePropOrder.map(prop => encodeURIComponent(node[prop] || '')).join(',');
-    }).join('!');
-  },
-};
-
-/**
- * Make sure the required params are present
- * @param {Object} schain
- * @param {Bool}
- */
-export function hasValidSupplyChainParams(schain) {
-  if (!schain || !schain.nodes) {
-    return false;
-  }
-  const requiredFields = ['asi', 'sid', 'hp'];
-
-  let isValid = schain.nodes.reduce((status, node) => {
-    if (!status) {
-      return status;
-    }
-    return requiredFields.every(field => node[field]);
-  }, true);
-  if (!isValid) {
-    utils.logError('Aardvark: required schain params missing');
-  }
-  return isValid;
-}
-
-registerBidder(spec);
diff --git a/modules/aardvarkBidAdapter.md b/modules/aardvarkBidAdapter.md
deleted file mode 100644
index 9f7a128b6f3..00000000000
--- a/modules/aardvarkBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-**Module Name**: Aardvark Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**: chris@rtk.io
-
-# Description
-
-Module that connects to a RTK.io Ad Units to fetch bids.
-
-# Test Parameters
-```
-    var adUnits = [{
-      mediaTypes: {
-          banner: {
-              sizes: [[300, 250]],
-          }
-      },
-      code: 'div-gpt-ad-1460505748561-0',
-
-      bids: [{
-        bidder: 'aardvark',
-        params: {
-          ai: '0000',
-          sc: '1234'
-        }
-      }]
-
-    }];
-```
diff --git a/modules/aaxBlockmeterRtdProvider.js b/modules/aaxBlockmeterRtdProvider.js
new file mode 100644
index 00000000000..a3b7b4812a7
--- /dev/null
+++ b/modules/aaxBlockmeterRtdProvider.js
@@ -0,0 +1,59 @@
+import {isEmptyStr, isStr, logError, isFn, logWarn} from '../src/utils.js';
+import {submodule} from '../src/hook.js';
+import { loadExternalScript } from '../src/adloader.js';
+
+export const _config = {
+  MODULE: 'aaxBlockmeter',
+  ADSERVER_TARGETING_KEY: 'atk',
+  BLOCKMETER_URL: 'c.aaxads.com/aax.js',
+  VERSION: '1.2'
+};
+
+window.aax = window.aax || {};
+
+function loadBlockmeter(_rtdConfig) {
+  if (!(_rtdConfig.params && _rtdConfig.params.pub) || !isStr(_rtdConfig.params && _rtdConfig.params.pub) || isEmptyStr(_rtdConfig.params && _rtdConfig.params.pub)) {
+    logError(`${_config.MODULE}: params.pub should be a string`);
+    return false;
+  }
+
+  const params = [];
+  params.push(`pub=${_rtdConfig.params.pub}`);
+  params.push(`dn=${window.location.hostname}`);
+
+  let url = _rtdConfig.params.url;
+  if (!url || isEmptyStr(url)) {
+    logWarn(`${_config.MODULE}: params.url is missing, using default url.`);
+    url = `${_config.BLOCKMETER_URL}?ver=${_config.VERSION}`;
+  }
+
+  const scriptUrl = `https://${url}&${params.join('&')}`;
+  loadExternalScript(scriptUrl, _config.MODULE);
+  return true;
+}
+
+function markAdBlockInventory(codes, _rtdConfig, _userConsent) {
+  return codes.reduce((targets, code) => {
+    targets[code] = targets[code] || {};
+    const getAaxTargets = () => isFn(window.aax.getTargetingData)
+      ? window.aax.getTargetingData(code, _rtdConfig, _userConsent)
+      : {};
+    targets[code] = {
+      [_config.ADSERVER_TARGETING_KEY]: code,
+      ...getAaxTargets()
+    };
+    return targets;
+  }, {});
+}
+
+export const aaxBlockmeterRtdModule = {
+  name: _config.MODULE,
+  init: loadBlockmeter,
+  getTargetingData: markAdBlockInventory,
+};
+
+function registerSubModule() {
+  submodule('realTimeData', aaxBlockmeterRtdModule);
+}
+
+registerSubModule();
diff --git a/modules/aaxBlockmeterRtdProvider.md b/modules/aaxBlockmeterRtdProvider.md
new file mode 100644
index 00000000000..0a317f85b85
--- /dev/null
+++ b/modules/aaxBlockmeterRtdProvider.md
@@ -0,0 +1,48 @@
+## Overview
+
+Module Name: AAX Blockmeter Realtime Data Module  
+Module Type: Rtd Provider  
+Maintainer: product@aax.media  
+
+## Description
+
+The module enables publishers to measure traffic coming from visitors using adblockers. 
+
+AAX can also help publishers monetize this traffic by allowing them to serve [acceptable ads](https://acceptableads.com/about/) to these adblock visitors and recover their lost revenue. [Reach out to us](https://www.aax.media/try-blockmeter/) to know more.
+
+## Integration
+
+Build the AAX Blockmeter Realtime Data Module into the Prebid.js package with:
+
+```
+gulp build --modules=aaxBlockmeterRtdProvider,rtdModule
+```
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders` object.
+
+|    Name    |  Scope   | Description                  |     Example     |  Type  |
+|:----------:|:--------:|:-----------------------------|:---------------:|:------:|
+|    `name`    | required | Real time data module name   | `'aaxBlockmeter'` | `string` |
+|   `params`   | required |                              |                 | `Object` |
+| `params.pub` | required | AAX to share pub ID, [Reach out to us](https://www.aax.media/try-blockmeter/) to know more! |   `'AAX00000'`    | `string` |
+| `params.url`     | optional | AAX Blockmeter Script Url. Defaults to `'c.aaxads.com/aax.js?ver=1.2'` | `'c.aaxads.com/aax.js?ver=1.2'`   | `string` |
+
+### Example
+
+```javascript
+pbjs.setConfig({
+        "realTimeData": {
+             "dataProviders": [
+                {
+                    "name": "aaxBlockmeter",
+                    "params": {
+                        "pub": "AAX00000",
+                        "url": "c.aaxads.com/aax.js?ver=1.2",
+                    }
+                }
+             ]
+        }
+})
+```
diff --git a/modules/ablidaBidAdapter.js b/modules/ablidaBidAdapter.js
index 9bd22ef1f0d..ca489a10a90 100644
--- a/modules/ablidaBidAdapter.js
+++ b/modules/ablidaBidAdapter.js
@@ -1,13 +1,15 @@
-import * as utils from '../src/utils.js';
+import { triggerPixel } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {ajax} from '../src/ajax.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'ablida';
 const ENDPOINT_URL = 'https://bidder.ablida.net/prebid';
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -27,24 +29,33 @@ export const spec = {
    * @param bidderRequest
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if (validBidRequests.length === 0) {
       return [];
     }
     return validBidRequests.map(bidRequest => {
-      const sizes = utils.parseSizesInput(bidRequest.sizes)[0];
-      const size = sizes.split('x');
+      let sizes = []
+      if (bidRequest.mediaTypes && bidRequest.mediaTypes[BANNER] && bidRequest.mediaTypes[BANNER].sizes) {
+        sizes = bidRequest.mediaTypes[BANNER].sizes;
+      } else if (bidRequest.mediaTypes[VIDEO] && bidRequest.mediaTypes[VIDEO].playerSize) {
+        sizes = bidRequest.mediaTypes[VIDEO].playerSize
+      }
       const jaySupported = 'atob' in window && 'currentScript' in document;
       const device = getDevice();
       const payload = {
         placementId: bidRequest.params.placementId,
-        width: size[0],
-        height: size[1],
+        sizes: sizes,
         bidId: bidRequest.bidId,
         categories: bidRequest.params.categories,
-        referer: bidderRequest.refererInfo.referer,
+        // TODO: should referer be 'ref'?
+        referer: bidderRequest.refererInfo.page,
         jaySupported: jaySupported,
         device: device,
-        adapterVersion: 2
+        adapterVersion: 5,
+        mediaTypes: bidRequest.mediaTypes,
+        gdprConsent: bidderRequest.gdprConsent
       };
       return {
         method: 'POST',
@@ -72,9 +83,8 @@ export const spec = {
     return bidResponses;
   },
   onBidWon: function (bid) {
-    if (!bid['nurl']) { return false; }
-    ajax(bid['nurl'], null);
-    return true;
+    if (!bid['nurl']) { return; }
+    triggerPixel(bid['nurl']);
   }
 };
 
diff --git a/modules/ablidaBidAdapter.md b/modules/ablidaBidAdapter.md
index 70e6576cd30..e0a9f3f9405 100644
--- a/modules/ablidaBidAdapter.md
+++ b/modules/ablidaBidAdapter.md
@@ -27,6 +27,46 @@ Module that connects to Ablida's bidder for bids.
                        }
                    }
                ]
+           }, {
+               code: 'native-ad-div',
+               mediaTypes: {
+                   native: {
+                       image: {
+                           sendId: true,
+                           required: true
+                       },
+                       title: {
+                           required: true
+                       },
+                       body: {
+                           required: true
+                       }
+                   }
+               },
+               bids: [
+                   {
+                       bidder: 'ablida',
+                       params: {
+                           placementId: 'native-demo'
+                       }
+                   }
+               ]
+           }, {
+               code: 'video-ad',
+               mediaTypes: {
+                   video: {
+                       playerSize: [[640, 360]],
+                       context: 'instream'
+                  }
+               },
+               bids: [
+                   {
+                       bidder: 'ablida',
+                       params: {
+                           placementId: 'instream-demo'
+                       }
+                   }
+               ]
            }
-       ];
+    ];
 ```
diff --git a/modules/acuityAdsBidAdapter.js b/modules/acuityAdsBidAdapter.js
new file mode 100644
index 00000000000..f469fe48c60
--- /dev/null
+++ b/modules/acuityAdsBidAdapter.js
@@ -0,0 +1,207 @@
+import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'acuityads';
+const AD_URL = 'https://prebid.admanmedia.com/pbjs';
+const SYNC_URL = 'https://cs.admanmedia.com';
+
+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 || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  placement.placementId = placementId;
+  placement.type = 'publisher';
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+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 (err) {
+    logError(err);
+    return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && params.placementId);
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    } else {
+      valid = false;
+    }
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+    // TODO: does the fallback make sense here?
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/acuityAdsBidAdapter.md b/modules/acuityAdsBidAdapter.md
new file mode 100644
index 00000000000..a19e0a6b0ba
--- /dev/null
+++ b/modules/acuityAdsBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: AcuityAds Bidder Adapter
+Module Type: AcuityAds Bidder Adapter
+Maintainer: sa-support@brightcom.com
+```
+
+# Description
+
+Connects to AcuityAds exchange for bids.
+AcuityAds bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'acuityads',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'acuityads',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'acuityads',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/adWMGAnalyticsAdapter.js b/modules/adWMGAnalyticsAdapter.js
index 8183187eb73..dd0340071d1 100644
--- a/modules/adWMGAnalyticsAdapter.js
+++ b/modules/adWMGAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
diff --git a/modules/adWMGBidAdapter.js b/modules/adWMGBidAdapter.js
new file mode 100644
index 00000000000..12dc36d694c
--- /dev/null
+++ b/modules/adWMGBidAdapter.js
@@ -0,0 +1,320 @@
+'use strict';
+
+import { tryAppendQueryString } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'adWMG';
+const ENDPOINT = 'https://hb.adwmg.com/hb';
+let SYNC_ENDPOINT = 'https://hb.adwmg.com/cphb.html?';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['wmg'],
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: (bid) => {
+    if (bid.bidder !== BIDDER_CODE) {
+      return false;
+    }
+
+    if (!(bid.params.publisherId)) {
+      return false;
+    }
+
+    return true;
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const timeout = bidderRequest.timeout || 0;
+    const debug = config.getConfig('debug') || false;
+    // TODO: is 'page' the right value here?
+    const referrer = bidderRequest.refererInfo.page;
+    const locale = window.navigator.language && window.navigator.language.length > 0 ? window.navigator.language.substr(0, 2) : '';
+    const domain = bidderRequest.refererInfo.domain || '';
+    const ua = window.navigator.userAgent.toLowerCase();
+    const additional = spec.parseUserAgent(ua);
+
+    return validBidRequests.map(bidRequest => {
+      const checkFloorValue = (value) => {
+        if (isNaN(parseFloat(value))) {
+          return 0;
+        } else return parseFloat(value);
+      }
+
+      const adUnit = {
+        code: bidRequest.adUnitCode,
+        bids: {
+          bidder: bidRequest.bidder,
+          params: {
+            publisherId: bidRequest.params.publisherId,
+            IABCategories: bidRequest.params.IABCategories || [],
+            floorCPM: bidRequest.params.floorCPM ? checkFloorValue(bidRequest.params.floorCPM) : 0
+          }
+        },
+        mediaTypes: bidRequest.mediaTypes
+      };
+
+      if (bidRequest.hasOwnProperty('sizes') && bidRequest.sizes.length > 0) {
+        adUnit.sizes = bidRequest.sizes;
+      }
+
+      const request = {
+        auctionId: bidRequest.auctionId,
+        requestId: bidRequest.bidId,
+        bidRequestsCount: bidRequest.bidRequestsCount,
+        bidderRequestId: bidRequest.bidderRequestId,
+        transactionId: bidRequest.transactionId,
+        referrer: referrer,
+        timeout: timeout,
+        adUnit: adUnit,
+        locale: locale,
+        domain: domain,
+        os: additional.os,
+        osv: additional.osv,
+        devicetype: additional.devicetype
+      };
+
+      if (bidderRequest.gdprConsent) {
+        request.gdpr = {
+          applies: bidderRequest.gdprConsent.gdprApplies,
+          consentString: bidderRequest.gdprConsent.consentString
+        };
+      }
+
+      /*       if (bidderRequest.uspConsent) {
+        request.uspConsent = bidderRequest.uspConsent;
+      }
+ */
+      if (bidRequest.userId && bidRequest.userId.pubcid) {
+        request.userId = {
+          pubcid: bidRequest.userId.pubcid
+        };
+      }
+
+      if (debug) {
+        request.debug = debug;
+      }
+
+      return {
+        method: 'POST',
+        url: ENDPOINT,
+        data: JSON.stringify(request)
+      }
+    });
+  },
+  interpretResponse: (serverResponse) => {
+    const bidResponses = [];
+
+    if (serverResponse.body) {
+      const response = serverResponse.body;
+      const bidResponse = {
+        requestId: response.requestId,
+        cpm: response.cpm,
+        width: response.width,
+        height: response.height,
+        creativeId: response.creativeId,
+        currency: response.currency,
+        netRevenue: response.netRevenue,
+        ttl: response.ttl,
+        ad: response.ad,
+        meta: {
+          advertiserDomains: response.adomain && response.adomain.length ? response.adomain : [],
+          mediaType: 'banner'
+        }
+      };
+      bidResponses.push(bidResponse);
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    if (gdprConsent && SYNC_ENDPOINT.indexOf('gdpr') === -1) {
+      SYNC_ENDPOINT = tryAppendQueryString(SYNC_ENDPOINT, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    if (gdprConsent && typeof gdprConsent.consentString === 'string' && SYNC_ENDPOINT.indexOf('gdpr_consent') === -1) {
+      SYNC_ENDPOINT = tryAppendQueryString(SYNC_ENDPOINT, 'gdpr_consent', gdprConsent.consentString);
+    }
+
+    if (SYNC_ENDPOINT.slice(-1) === '&') {
+      SYNC_ENDPOINT = SYNC_ENDPOINT.slice(0, -1);
+    }
+
+    /*     if (uspConsent) {
+      SYNC_ENDPOINT = tryAppendQueryString(SYNC_ENDPOINT, 'us_privacy', uspConsent);
+    } */
+    let syncs = [];
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: SYNC_ENDPOINT
+      });
+    }
+    return syncs;
+  },
+  parseUserAgent: (ua) => {
+    function detectDevice() {
+      if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
+        .test(ua.toLowerCase())) {
+        return 5;
+      }
+      if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
+        .test(ua.toLowerCase())) {
+        return 4;
+      }
+      if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
+        .test(ua.toLowerCase())) {
+        return 3;
+      }
+      return 2;
+    }
+
+    function detectOs() {
+      const module = {
+        options: [],
+        header: [navigator.platform, ua, navigator.appVersion, navigator.vendor, window.opera],
+        dataos: [{
+          name: 'Windows Phone',
+          value: 'Windows Phone',
+          version: 'OS'
+        },
+        {
+          name: 'Windows',
+          value: 'Win',
+          version: 'NT'
+        },
+        {
+          name: 'iOS',
+          value: 'iPhone',
+          version: 'OS'
+        },
+        {
+          name: 'iOS',
+          value: 'iPad',
+          version: 'OS'
+        },
+        {
+          name: 'Kindle',
+          value: 'Silk',
+          version: 'Silk'
+        },
+        {
+          name: 'Android',
+          value: 'Android',
+          version: 'Android'
+        },
+        {
+          name: 'PlayBook',
+          value: 'PlayBook',
+          version: 'OS'
+        },
+        {
+          name: 'BlackBerry',
+          value: 'BlackBerry',
+          version: '/'
+        },
+        {
+          name: 'Macintosh',
+          value: 'Mac',
+          version: 'OS X'
+        },
+        {
+          name: 'Linux',
+          value: 'Linux',
+          version: 'rv'
+        },
+        {
+          name: 'Palm',
+          value: 'Palm',
+          version: 'PalmOS'
+        }
+        ],
+        init: function () {
+          var agent = this.header.join(' ');
+          var os = this.matchItem(agent, this.dataos);
+          return {
+            os
+          };
+        },
+
+        getVersion: function (name, version) {
+          if (name === 'Windows') {
+            switch (parseFloat(version).toFixed(1)) {
+              case '5.0':
+                return '2000';
+              case '5.1':
+                return 'XP';
+              case '5.2':
+                return 'Server 2003';
+              case '6.0':
+                return 'Vista';
+              case '6.1':
+                return '7';
+              case '6.2':
+                return '8';
+              case '6.3':
+                return '8.1';
+              default:
+                return version || 'other';
+            }
+          } else return version || 'other';
+        },
+
+        matchItem: function (string, data) {
+          var i = 0;
+          var j = 0;
+          var regex, regexv, match, matches, version;
+
+          for (i = 0; i < data.length; i += 1) {
+            regex = new RegExp(data[i].value, 'i');
+            match = regex.test(string);
+            if (match) {
+              regexv = new RegExp(data[i].version + '[- /:;]([\\d._]+)', 'i');
+              matches = string.match(regexv);
+              version = '';
+              if (matches) {
+                if (matches[1]) {
+                  matches = matches[1];
+                }
+              }
+              if (matches) {
+                matches = matches.split(/[._]+/);
+                for (j = 0; j < matches.length; j += 1) {
+                  if (j === 0) {
+                    version += matches[j] + '.';
+                  } else {
+                    version += matches[j];
+                  }
+                }
+              } else {
+                version = 'other';
+              }
+              return {
+                name: data[i].name,
+                version: this.getVersion(data[i].name, version)
+              };
+            }
+          }
+          return {
+            name: 'unknown',
+            version: 'other'
+          };
+        }
+      };
+
+      var e = module.init();
+
+      return {
+        os: e.os.name || '',
+        osv: e.os.version || ''
+      }
+    }
+
+    return {
+      devicetype: detectDevice(),
+      os: detectOs().os,
+      osv: detectOs().osv
+    }
+  }
+};
+registerBidder(spec);
diff --git a/modules/adWMGBidAdapter.md b/modules/adWMGBidAdapter.md
new file mode 100644
index 00000000000..ec5541e6168
--- /dev/null
+++ b/modules/adWMGBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: adWMG Adapter
+Module Type: Bidder Adapter
+Maintainer: wbid@adwmg.com
+```
+
+# Description
+
+Module that connects to adWMG demand sources to fetch bids. Supports 'banner' ad format.
+
+# Bid Parameters
+
+| Key             | Required | Example                      | Description                     |
+| --------------- | -------- | -----------------------------| ------------------------------- |
+| `publisherId`   | yes      | `'5cebea3c9eea646c7b623d5e'` | publisher ID from WMG Dashboard |
+| `IABCategories` | no       | `['IAB1', 'IAB5']`           | IAB ad categories for adUnit    |
+| `floorCPM`      | no       | `0.5`                        | Floor price for adUnit          |
+
+
+# Test Parameters
+
+```javascript
+var adUnits = [{
+  code: 'wmg-test-div',
+  sizes: [[300, 250]],
+  bids: [{
+    bidder: 'adWMG',
+    params: {
+      publisherId: '5cebea3c9eea646c7b623d5e',
+      IABCategories: ['IAB1', 'IAB5']
+    },
+  }]
+}]
\ No newline at end of file
diff --git a/modules/adagioAnalyticsAdapter.js b/modules/adagioAnalyticsAdapter.js
index fd7a742d9e7..96f3f089cbd 100644
--- a/modules/adagioAnalyticsAdapter.js
+++ b/modules/adagioAnalyticsAdapter.js
@@ -2,10 +2,10 @@
  * Analytics Adapter for Adagio
  */
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import * as utils from '../src/utils.js';
+import { getWindowTop } from '../src/utils.js';
 
 const emptyUrl = '';
 const analyticsType = 'endpoint';
@@ -13,12 +13,12 @@ const events = Object.keys(CONSTANTS.EVENTS).map(key => CONSTANTS.EVENTS[key]);
 const VERSION = '2.0.0';
 
 const adagioEnqueue = function adagioEnqueue(action, data) {
-  utils.getWindowTop().ADAGIO.queue.push({ action, data, ts: Date.now() });
+  getWindowTop().ADAGIO.queue.push({ action, data, ts: Date.now() });
 }
 
 function canAccessTopWindow() {
   try {
-    if (utils.getWindowTop().location.href) {
+    if (getWindowTop().location.href) {
       return true;
     }
   } catch (error) {
@@ -41,7 +41,7 @@ adagioAdapter.enableAnalytics = config => {
     return;
   }
 
-  const w = utils.getWindowTop();
+  const w = getWindowTop();
 
   w.ADAGIO = w.ADAGIO || {};
   w.ADAGIO.queue = w.ADAGIO.queue || [];
diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index b2ef5dafb41..12fd50c6636 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -1,70 +1,203 @@
-import find from 'core-js-pure/features/array/find.js';
-import * as utils from '../src/utils.js';
+import {find} from '../src/polyfill.js';
+import {
+  _map,
+  cleanObj,
+  deepAccess,
+  deepClone,
+  generateUUID,
+  getDNT,
+  getGptSlotInfoForAdUnitCode,
+  getUniqueIdentifierStr,
+  getWindowSelf,
+  getWindowTop,
+  inIframe,
+  isArray,
+  isFn,
+  isInteger,
+  isNumber,
+  logError,
+  logInfo,
+  logWarn,
+  mergeDeep,
+} from '../src/utils.js';
+import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { loadExternalScript } from '../src/adloader.js'
-import JSEncrypt from 'jsencrypt/bin/jsencrypt.js';
-import sha256 from 'crypto-js/sha256.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {loadExternalScript} from '../src/adloader.js';
+import {verify} from 'criteo-direct-rsa-validate/build/verify.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {getRefererInfo, parseDomain} from '../src/refererDetection.js';
+import {createEidsArray} from './userId/eids.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {Renderer} from '../src/Renderer.js';
+import {OUTSTREAM} from '../src/video.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adagio';
-const VERSION = '2.2.2';
+const LOG_PREFIX = 'Adagio:';
 const FEATURES_VERSION = '1';
-const ENDPOINT = 'https://mp.4dex.io/prebid';
-const SUPPORTED_MEDIA_TYPES = ['banner'];
+export const ENDPOINT = 'https://mp.4dex.io/prebid';
+const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE, VIDEO];
 const ADAGIO_TAG_URL = 'https://script.4dex.io/localstore.js';
 const ADAGIO_LOCALSTORAGE_KEY = 'adagioScript';
 const GVLID = 617;
-const storage = getStorageManager(GVLID, 'adagio');
+export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
+export const RENDERER_URL = 'https://script.4dex.io/outstream-player.js';
+const MAX_SESS_DURATION = 30 * 60 * 1000;
+const ADAGIO_PUBKEY = 'AL16XT44Sfp+8SHVF1UdC7hydPSMVLMhsYknKDdwqq+0ToDSJrP0+Qh0ki9JJI2uYm/6VEYo8TJED9WfMkiJ4vf02CW3RvSWwc35bif2SK1L8Nn/GfFYr/2/GG/Rm0vUsv+vBHky6nuuYls20Og0HDhMgaOlXoQ/cxMuiy5QSktp';
+const ADAGIO_PUBKEY_E = 65537;
+const CURRENCY = 'USD';
+
+// This provide a whitelist and a basic validation
+// of OpenRTB 2.5 options used by the Adagio SSP.
+// https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf
+export const ORTB_VIDEO_PARAMS = {
+  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
+  'minduration': (value) => isInteger(value),
+  'maxduration': (value) => isInteger(value),
+  'protocols': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].indexOf(v) !== -1),
+  'w': (value) => isInteger(value),
+  'h': (value) => isInteger(value),
+  'startdelay': (value) => isInteger(value),
+  'placement': (value) => [1, 2, 3, 4, 5].indexOf(value) !== -1,
+  'linearity': (value) => [1, 2].indexOf(value) !== -1,
+  'skip': (value) => [0, 1].indexOf(value) !== -1,
+  'skipmin': (value) => isInteger(value),
+  'skipafter': (value) => isInteger(value),
+  'sequence': (value) => isInteger(value),
+  'battr': (value) => Array.isArray(value) && value.every(v => Array.from({length: 17}, (_, i) => i + 1).indexOf(v) !== -1),
+  'maxextended': (value) => isInteger(value),
+  'minbitrate': (value) => isInteger(value),
+  'maxbitrate': (value) => isInteger(value),
+  'boxingallowed': (value) => [0, 1].indexOf(value) !== -1,
+  'playbackmethod': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6].indexOf(v) !== -1),
+  'playbackend': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'delivery': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'pos': (value) => [0, 1, 2, 3, 4, 5, 6, 7].indexOf(value) !== -1,
+  'api': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6].indexOf(v) !== -1)
+};
+
+let currentWindow;
+
+export const GlobalExchange = (function() {
+  let features;
+  let exchangeData = {};
+
+  return {
+    clearFeatures: function() {
+      features = undefined;
+    },
+
+    clearExchangeData: function() {
+      exchangeData = {};
+    },
+
+    getOrSetGlobalFeatures: function () {
+      if (!features) {
+        features = {
+          page_dimensions: getPageDimensions().toString(),
+          viewport_dimensions: getViewPortDimensions().toString(),
+          user_timestamp: getTimestampUTC().toString(),
+          dom_loading: getDomLoadingDuration().toString(),
+        }
+      }
+      return features;
+    },
+
+    prepareExchangeData(storageValue) {
+      const adagioStorage = JSON.parse(storageValue, function(name, value) {
+        if (name.charAt(0) !== '_' || name === '') {
+          return value;
+        }
+      });
+      let random = deepAccess(adagioStorage, 'session.rnd');
+      let newSession = false;
 
-export const ADAGIO_PUBKEY = `-----BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9el0+OEn6fvEh1RdVHQu4cnT0
-jFSzIbGJJyg3cKqvtE6A0iaz9PkIdJIvSSSNrmJv+lRGKPEyRA/VnzJIieL39Ngl
-t0b0lsHN+W4n9kitS/DZ/xnxWK/9vxhv0ZtL1LL/rwR5Mup7rmJbNtDoNBw4TIGj
-pV6EP3MTLosuUEpLaQIDAQAB
------END PUBLIC KEY-----`;
+      if (internal.isNewSession(adagioStorage)) {
+        newSession = true;
+        random = Math.random();
+      }
+
+      const data = {
+        session: {
+          new: newSession,
+          rnd: random
+        }
+      }
+
+      mergeDeep(exchangeData, adagioStorage, data);
+
+      internal.enqueue({
+        action: 'session',
+        ts: Date.now(),
+        data: exchangeData
+      });
+    },
+
+    getExchangeData() {
+      return exchangeData
+    }
+  };
+})();
 
 export function adagioScriptFromLocalStorageCb(ls) {
   try {
     if (!ls) {
-      utils.logWarn('Adagio Script not found');
+      logWarn(`${LOG_PREFIX} script not found.`);
       return;
     }
 
     const hashRgx = /^(\/\/ hash: (.+)\n)(.+\n)$/;
 
     if (!hashRgx.test(ls)) {
-      utils.logWarn('No hash found in Adagio script');
+      logWarn(`${LOG_PREFIX} no hash found.`);
       storage.removeDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY);
     } else {
       const r = ls.match(hashRgx);
       const hash = r[2];
       const content = r[3];
 
-      var jsEncrypt = new JSEncrypt();
-      jsEncrypt.setPublicKey(ADAGIO_PUBKEY);
-
-      if (jsEncrypt.verify(content, hash, sha256)) {
-        utils.logInfo('Start Adagio script');
+      if (verify(content, hash, ADAGIO_PUBKEY, ADAGIO_PUBKEY_E)) {
+        logInfo(`${LOG_PREFIX} start script.`);
         Function(ls)(); // eslint-disable-line no-new-func
       } else {
-        utils.logWarn('Invalid Adagio script found');
+        logWarn(`${LOG_PREFIX} invalid script found.`);
         storage.removeDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY);
       }
     }
   } catch (err) {
-    //
+    logError(LOG_PREFIX, err);
   }
 }
 
 export function getAdagioScript() {
   storage.getDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY, (ls) => {
-    adagioScriptFromLocalStorageCb(ls)
+    internal.adagioScriptFromLocalStorageCb(ls);
+  });
+
+  storage.localStorageIsEnabled(isValid => {
+    if (isValid) {
+      loadExternalScript(ADAGIO_TAG_URL, BIDDER_CODE);
+    } else {
+      // Try-catch to avoid error when 3rd party cookies is disabled (e.g. in privacy mode)
+      try {
+        // ensure adagio removing for next time.
+        // It's an antipattern regarding the TCF2 enforcement logic
+        // but it's the only way to respect the user choice update.
+        window.localStorage.removeItem(ADAGIO_LOCALSTORAGE_KEY);
+        // Extra data from external script.
+        // This key is removed only if localStorage is not accessible.
+        window.localStorage.removeItem('adagio');
+      } catch (e) {
+        logInfo(`${LOG_PREFIX} unable to clear Adagio scripts from localstorage.`);
+      }
+    }
   });
 }
 
 function canAccessTopWindow() {
   try {
-    if (utils.getWindowTop().location.href) {
+    if (getWindowTop().location.href) {
       return true;
     }
   } catch (error) {
@@ -72,436 +205,849 @@ function canAccessTopWindow() {
   }
 }
 
+function getCurrentWindow() {
+  return currentWindow || getWindowSelf();
+}
+
+function isSafeFrameWindow() {
+  const ws = getWindowSelf();
+  return !!(ws.$sf && ws.$sf.ext);
+}
+
 function initAdagio() {
-  const w = utils.getWindowTop();
+  if (canAccessTopWindow()) {
+    currentWindow = (canAccessTopWindow()) ? getWindowTop() : getWindowSelf();
+  }
+
+  const w = internal.getCurrentWindow();
 
   w.ADAGIO = w.ADAGIO || {};
+  w.ADAGIO.adUnits = w.ADAGIO.adUnits || {};
+  w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits || [];
   w.ADAGIO.queue = w.ADAGIO.queue || [];
   w.ADAGIO.versions = w.ADAGIO.versions || {};
-  w.ADAGIO.versions.adagioBidderAdapter = VERSION;
+  w.ADAGIO.versions.pbjs = '$prebid.version$';
+  w.ADAGIO.isSafeFrameWindow = isSafeFrameWindow();
 
-  getAdagioScript();
+  storage.getDataFromLocalStorage('adagio', (storageData) => {
+    try {
+      GlobalExchange.prepareExchangeData(storageData);
+    } catch (e) {
+      logError(LOG_PREFIX, e);
+    }
+  });
 
-  loadExternalScript(ADAGIO_TAG_URL, BIDDER_CODE)
+  getAdagioScript();
 }
 
-if (canAccessTopWindow()) {
-  initAdagio();
-}
+function enqueue(ob) {
+  const w = internal.getCurrentWindow();
 
-export const _features = {
-  getPrintNumber: function (adUnitCode) {
-    const adagioAdUnit = _getOrAddAdagioAdUnit(adUnitCode);
-    return adagioAdUnit.printNumber || 1;
-  },
+  w.ADAGIO = w.ADAGIO || {};
+  w.ADAGIO.queue = w.ADAGIO.queue || [];
+  w.ADAGIO.queue.push(ob);
+};
 
-  getPageDimensions: function () {
-    const viewportDims = _features.getViewPortDimensions().split('x');
-    const w = utils.getWindowTop();
-    const body = w.document.body;
-    if (!body) {
-      return ''
-    }
-    const html = w.document.documentElement;
-    const pageHeight = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight);
+function getPageviewId() {
+  const w = internal.getCurrentWindow();
 
-    return viewportDims[0] + 'x' + pageHeight;
-  },
+  w.ADAGIO = w.ADAGIO || {};
+  w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || generateUUID();
 
-  getViewPortDimensions: function () {
-    let viewPortWidth;
-    let viewPortHeight;
-    const w = utils.getWindowTop();
-    const d = w.document;
+  return w.ADAGIO.pageviewId;
+};
 
-    if (w.innerWidth) {
-      viewPortWidth = w.innerWidth;
-      viewPortHeight = w.innerHeight;
-    } else {
-      viewPortWidth = d.getElementsByTagName('body')[0].clientWidth;
-      viewPortHeight = d.getElementsByTagName('body')[0].clientHeight;
-    }
+function getDevice() {
+  const language = navigator.language ? 'language' : 'userLanguage';
+  return {
+    userAgent: navigator.userAgent,
+    language: navigator[language],
+    dnt: getDNT() ? 1 : 0,
+    geo: {},
+    js: 1
+  };
+};
 
-    return viewPortWidth + 'x' + viewPortHeight;
-  },
+function getSite(bidderRequest) {
+  const { refererInfo } = bidderRequest;
+  return {
+    domain: parseDomain(refererInfo.topmostLocation) || '',
+    page: refererInfo.topmostLocation || '',
+    referrer: refererInfo.ref || getWindowSelf().document.referrer || '',
+    top: refererInfo.reachedTop
+  };
+};
 
-  isDomLoading: function () {
-    const w = utils.getWindowTop();
-    let performance = w.performance || w.msPerformance || w.webkitPerformance || w.mozPerformance;
-    let domLoading = -1;
+function getElementFromTopWindow(element, currentWindow) {
+  try {
+    if (getWindowTop() === currentWindow) {
+      if (!element.getAttribute('id')) {
+        element.setAttribute('id', `adg-${getUniqueIdentifierStr()}`);
+      }
+      return element;
+    } else {
+      const frame = currentWindow.frameElement;
+      const frameClientRect = frame.getBoundingClientRect();
+      const elementClientRect = element.getBoundingClientRect();
 
-    if (performance && performance.timing && performance.timing.navigationStart > 0) {
-      const val = performance.timing.domLoading - performance.timing.navigationStart;
-      if (val > 0) domLoading = val;
-    }
-    return domLoading;
-  },
+      if (frameClientRect.width !== elementClientRect.width || frameClientRect.height !== elementClientRect.height) {
+        return false;
+      }
 
-  getSlotPosition: function (element) {
-    if (!element) return '';
-
-    const w = utils.getWindowTop();
-    const d = w.document;
-    const el = element;
-
-    let box = el.getBoundingClientRect();
-    const docEl = d.documentElement;
-    const body = d.body;
-    const clientTop = d.clientTop || body.clientTop || 0;
-    const clientLeft = d.clientLeft || body.clientLeft || 0;
-    const scrollTop = w.pageYOffset || docEl.scrollTop || body.scrollTop;
-    const scrollLeft = w.pageXOffset || docEl.scrollLeft || body.scrollLeft;
-
-    const elComputedStyle = w.getComputedStyle(el, null);
-    const elComputedDisplay = elComputedStyle.display || 'block';
-    const mustDisplayElement = elComputedDisplay === 'none';
-
-    if (mustDisplayElement) {
-      el.style = el.style || {};
-      el.style.display = 'block';
-      box = el.getBoundingClientRect();
-      el.style.display = elComputedDisplay;
+      return getElementFromTopWindow(frame, currentWindow.parent);
     }
+  } catch (err) {
+    logWarn(`${LOG_PREFIX}`, err);
+    return false;
+  }
+};
 
-    const position = {
-      x: Math.round(box.left + scrollLeft - clientLeft),
-      y: Math.round(box.top + scrollTop - clientTop)
-    };
+function autoDetectAdUnitElementIdFromGpt(adUnitCode) {
+  const autoDetectedAdUnit = getGptSlotInfoForAdUnitCode(adUnitCode);
 
-    return position.x + 'x' + position.y;
-  },
+  if (autoDetectedAdUnit.divId) {
+    return autoDetectedAdUnit.divId;
+  }
+};
 
-  getTimestamp: function () {
-    return Math.floor(new Date().getTime() / 1000) - new Date().getTimezoneOffset() * 60;
-  },
+function isRendererPreferredFromPublisher(bidRequest) {
+  // renderer defined at adUnit level
+  const adUnitRenderer = deepAccess(bidRequest, 'renderer');
+  const hasValidAdUnitRenderer = !!(adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render);
 
-  getDevice: function () {
-    if (!canAccessTopWindow()) return false;
-    const w = utils.getWindowTop();
-    const ua = w.navigator.userAgent;
+  // renderer defined at adUnit.mediaTypes level
+  const mediaTypeRenderer = deepAccess(bidRequest, 'mediaTypes.video.renderer');
+  const hasValidMediaTypeRenderer = !!(mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render);
 
-    if ((/(tablet|ipad|playbook|silk)|(android(?!.*mobi))/i).test(ua)) {
-      return 5; // "tablet"
-    }
-    if ((/Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/).test(ua)) {
-      return 4; // "phone"
-    }
-    return 2; // personal computers
-  },
+  return !!(
+    (hasValidAdUnitRenderer && !(adUnitRenderer.backupOnly === true)) ||
+    (hasValidMediaTypeRenderer && !(mediaTypeRenderer.backupOnly === true))
+  );
+}
 
-  getBrowser: function () {
-    const w = utils.getWindowTop();
-    const ua = w.navigator.userAgent;
-    const uaLowerCase = ua.toLowerCase();
-    return /Edge\/\d./i.test(ua) ? 'edge' : uaLowerCase.indexOf('chrome') > 0 ? 'chrome' : uaLowerCase.indexOf('firefox') > 0 ? 'firefox' : uaLowerCase.indexOf('safari') > 0 ? 'safari' : uaLowerCase.indexOf('opera') > 0 ? 'opera' : uaLowerCase.indexOf('msie') > 0 || w.MSStream ? 'ie' : 'unknow';
-  },
+/**
+ *
+ * @param {object} adagioStorage
+ * @returns {boolean}
+ */
+function isNewSession(adagioStorage) {
+  const now = Date.now();
+  const { lastActivityTime, vwSmplg } = deepAccess(adagioStorage, 'session', {});
+  return (
+    !isNumber(lastActivityTime) ||
+    !isNumber(vwSmplg) ||
+    (now - lastActivityTime) > MAX_SESS_DURATION
+  )
+}
 
-  getOS: function () {
-    const w = window.top;
-    const ua = w.navigator.userAgent;
-    const uaLowerCase = ua.toLowerCase();
-    return uaLowerCase.indexOf('linux') > 0 ? 'linux' : uaLowerCase.indexOf('mac') > 0 ? 'mac' : uaLowerCase.indexOf('win') > 0 ? 'windows' : '';
+function setPlayerName(bidRequest) {
+  const playerName = (internal.isRendererPreferredFromPublisher(bidRequest)) ? 'other' : 'adagio';
+
+  if (playerName === 'other') {
+    logWarn(`${LOG_PREFIX} renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.`);
   }
+
+  return playerName;
 }
 
-function _pushInAdagioQueue(ob) {
-  try {
-    if (!canAccessTopWindow()) return;
-    const w = utils.getWindowTop();
-    w.ADAGIO.queue.push(ob);
-  } catch (e) {}
+export const internal = {
+  enqueue,
+  getPageviewId,
+  getDevice,
+  getSite,
+  getElementFromTopWindow,
+  getRefererInfo,
+  adagioScriptFromLocalStorageCb,
+  getCurrentWindow,
+  canAccessTopWindow,
+  isRendererPreferredFromPublisher,
+  isNewSession
 };
 
-function _getOrAddAdagioAdUnit(adUnitCode) {
-  const w = utils.getWindowTop();
-  if (w.ADAGIO.adUnits[adUnitCode]) {
-    return w.ADAGIO.adUnits[adUnitCode]
+function _getGdprConsent(bidderRequest) {
+  if (!deepAccess(bidderRequest, 'gdprConsent')) {
+    return false;
   }
-  return w.ADAGIO.adUnits[adUnitCode] = {};
-}
 
-function _computePrintNumber(adUnitCode) {
-  let printNumber = 1;
-  const w = utils.getWindowTop();
-  if (
-    w.ADAGIO &&
-    w.ADAGIO.adUnits && w.ADAGIO.adUnits[adUnitCode] &&
-    w.ADAGIO.adUnits[adUnitCode].pageviewId === _getPageviewId() &&
-    w.ADAGIO.adUnits[adUnitCode].printNumber
-  ) {
-    printNumber = parseInt(w.ADAGIO.adUnits[adUnitCode].printNumber, 10) + 1;
-  }
-  return printNumber;
+  const {
+    apiVersion,
+    gdprApplies,
+    consentString,
+    allowAuctionWithoutConsent
+  } = bidderRequest.gdprConsent;
+
+  return cleanObj({
+    apiVersion,
+    consentString,
+    consentRequired: gdprApplies ? 1 : 0,
+    allowAuctionWithoutConsent: allowAuctionWithoutConsent ? 1 : 0
+  });
 }
 
-function _getDevice() {
-  const language = navigator.language ? 'language' : 'userLanguage';
+function _getCoppa() {
   return {
-    userAgent: navigator.userAgent,
-    language: navigator[language],
-    deviceType: _features.getDevice(),
-    dnt: utils.getDNT() ? 1 : 0,
-    geo: {},
-    js: 1
+    required: config.getConfig('coppa') === true ? 1 : 0
   };
-};
+}
 
-function _getSite() {
-  const w = utils.getWindowTop();
-  return {
-    domain: w.location.hostname,
-    page: w.location.href,
-    referrer: w.document.referrer || ''
+function _getUspConsent(bidderRequest) {
+  return (deepAccess(bidderRequest, 'uspConsent')) ? { uspConsent: bidderRequest.uspConsent } : false;
+}
+
+function _getSchain(bidRequest) {
+  return deepAccess(bidRequest, 'schain');
+}
+
+function _getEids(bidRequest) {
+  if (deepAccess(bidRequest, 'userId')) {
+    return createEidsArray(bidRequest.userId);
+  }
+}
+
+function _buildVideoBidRequest(bidRequest) {
+  const videoAdUnitParams = deepAccess(bidRequest, 'mediaTypes.video', {});
+  const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
+  const computedParams = {};
+
+  // Special case for playerSize.
+  // Eeach props will be overrided if they are defined in config.
+  if (Array.isArray(videoAdUnitParams.playerSize)) {
+    const tempSize = (Array.isArray(videoAdUnitParams.playerSize[0])) ? videoAdUnitParams.playerSize[0] : videoAdUnitParams.playerSize;
+    computedParams.w = tempSize[0];
+    computedParams.h = tempSize[1];
+  }
+
+  const videoParams = {
+    ...computedParams,
+    ...videoAdUnitParams,
+    ...videoBidderParams
   };
-};
 
-function _getPageviewId() {
-  if (!canAccessTopWindow()) return false;
-  const w = utils.getWindowTop();
-  w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || utils.generateUUID();
-  return w.ADAGIO.pageviewId;
-};
+  if (videoParams.context && videoParams.context === OUTSTREAM) {
+    bidRequest.mediaTypes.video.playerName = setPlayerName(bidRequest);
+  }
+
+  // Only whitelisted OpenRTB options need to be validated.
+  // Other options will still remain in the `mediaTypes.video` object
+  // sent in the ad-request, but will be ignored by the SSP.
+  Object.keys(ORTB_VIDEO_PARAMS).forEach(paramName => {
+    if (videoParams.hasOwnProperty(paramName)) {
+      if (ORTB_VIDEO_PARAMS[paramName](videoParams[paramName])) {
+        bidRequest.mediaTypes.video[paramName] = videoParams[paramName];
+      } else {
+        delete bidRequest.mediaTypes.video[paramName];
+        logWarn(`${LOG_PREFIX} The OpenRTB video param ${paramName} has been skipped due to misformating. Please refer to OpenRTB 2.5 spec.`);
+      }
+    }
+  });
+}
 
-function _getElementFromTopWindow(element, currentWindow) {
-  if (utils.getWindowTop() === currentWindow) {
-    if (!element.getAttribute('id')) {
-      element.setAttribute('id', `adg-${utils.getUniqueIdentifierStr()}`);
+function _renderer(bid) {
+  bid.renderer.push(() => {
+    if (typeof window.ADAGIO.outstreamPlayer === 'function') {
+      window.ADAGIO.outstreamPlayer(bid);
+    } else {
+      logError(`${LOG_PREFIX} Adagio outstream player is not defined`);
     }
-    return element;
+  });
+}
+
+function _parseNativeBidResponse(bid) {
+  if (!bid.admNative || !Array.isArray(bid.admNative.assets)) {
+    logError(`${LOG_PREFIX} Invalid native response`);
+    return;
+  }
+
+  const native = {}
+
+  function addAssetDataValue(data) {
+    const map = {
+      1: 'sponsoredBy', // sponsored
+      2: 'body', // desc
+      3: 'rating',
+      4: 'likes',
+      5: 'downloads',
+      6: 'price',
+      7: 'salePrice',
+      8: 'phone',
+      9: 'address',
+      10: 'body2', // desc2
+      11: 'displayUrl',
+      12: 'cta'
+    }
+    if (map.hasOwnProperty(data.type) && typeof data.value === 'string') {
+      native[map[data.type]] = data.value;
+    }
+  }
+
+  // assets
+  bid.admNative.assets.forEach(asset => {
+    if (asset.title) {
+      native.title = asset.title.text
+    } else if (asset.data) {
+      addAssetDataValue(asset.data)
+    } else if (asset.img) {
+      switch (asset.img.type) {
+        case 1:
+          native.icon = {
+            url: asset.img.url,
+            width: asset.img.w,
+            height: asset.img.h
+          };
+          break;
+        default:
+          native.image = {
+            url: asset.img.url,
+            width: asset.img.w,
+            height: asset.img.h
+          };
+          break;
+      }
+    }
+  });
+
+  if (bid.admNative.link) {
+    if (bid.admNative.link.url) {
+      native.clickUrl = bid.admNative.link.url;
+    }
+    if (Array.isArray(bid.admNative.link.clicktrackers)) {
+      native.clickTrackers = bid.admNative.link.clicktrackers
+    }
+  }
+
+  if (Array.isArray(bid.admNative.eventtrackers)) {
+    native.impressionTrackers = [];
+    bid.admNative.eventtrackers.forEach(tracker => {
+      // Only Impression events are supported. Prebid does not support Viewability events yet.
+      if (tracker.event !== 1) {
+        return;
+      }
+
+      // methods:
+      // 1: image
+      // 2: js
+      // note: javascriptTrackers is a string. If there's more than one JS tracker in bid response, the last script will be used.
+      switch (tracker.method) {
+        case 1:
+          native.impressionTrackers.push(tracker.url);
+          break;
+        case 2:
+          const script = `<script async src=\"${tracker.url}\"></script>`;
+          if (!native.javascriptTrackers) {
+            native.javascriptTrackers = script;
+          } else {
+            native.javascriptTrackers += `\n${script}`;
+          }
+          break;
+      }
+    });
   } else {
-    const frame = currentWindow.frameElement;
-    return _getElementFromTopWindow(frame, currentWindow.parent);
+    native.impressionTrackers = Array.isArray(bid.admNative.imptrackers) ? bid.admNative.imptrackers : [];
+    if (bid.admNative.jstracker) {
+      native.javascriptTrackers = bid.admNative.jstracker;
+    }
+  }
+
+  if (bid.admNative.privacy) {
+    native.privacyLink = bid.admNative.privacy;
   }
-}
 
-export function _autoDetectAdUnitElementId(adUnitCode) {
-  const autoDetectedAdUnit = utils.getGptSlotInfoForAdUnitCode(adUnitCode)
-  let adUnitElementId = null;
+  if (bid.admNative.ext) {
+    native.ext = {}
 
-  if (autoDetectedAdUnit && autoDetectedAdUnit.divId) {
-    adUnitElementId = autoDetectedAdUnit.divId;
+    if (bid.admNative.ext.bvw) {
+      native.ext.adagio_bvw = bid.admNative.ext.bvw;
+    }
   }
 
-  return adUnitElementId;
+  bid.native = native
 }
 
-function _autoDetectEnvironment() {
-  const device = _features.getDevice();
-  let environment;
-  switch (device) {
-    case 2:
-      environment = 'desktop'
-      break;
-    case 4:
-      environment = 'mobile'
-      break;
-    case 5:
-      environment = 'tablet'
-      break;
-  };
-  return environment
+function _getFloors(bidRequest) {
+  if (!isFn(bidRequest.getFloor)) {
+    return false;
+  }
+
+  const floors = [];
+
+  const getAndPush = (mediaType, size) => {
+    const info = bidRequest.getFloor({
+      currency: CURRENCY,
+      mediaType,
+      size
+    });
+
+    floors.push(cleanObj({
+      mt: mediaType,
+      s: isArray(size) ? `${size[0]}x${size[1]}` : undefined,
+      f: (!isNaN(info.floor) && info.currency === CURRENCY) ? info.floor : undefined
+    }));
+  }
+
+  Object.keys(bidRequest.mediaTypes).forEach(mediaType => {
+    if (SUPPORTED_MEDIA_TYPES.indexOf(mediaType) !== -1) {
+      const sizeProp = mediaType === VIDEO ? 'playerSize' : 'sizes';
+
+      if (bidRequest.mediaTypes[mediaType][sizeProp] && bidRequest.mediaTypes[mediaType][sizeProp].length) {
+        if (isArray(bidRequest.mediaTypes[mediaType][sizeProp][0])) {
+          bidRequest.mediaTypes[mediaType][sizeProp].forEach(size => {
+            getAndPush(mediaType, [size[0], size[1]]);
+          });
+        } else {
+          getAndPush(mediaType, [bidRequest.mediaTypes[mediaType][sizeProp][0], bidRequest.mediaTypes[mediaType][sizeProp][1]]);
+        }
+      } else {
+        getAndPush(mediaType, '*');
+      }
+    }
+  });
+
+  return floors;
 }
 
 /**
- * Returns all features for a specific adUnit element
+ * Try to find the value of `paramName` and set it to adUnit.params if
+ * it has not already been set.
+ * This function will check through:
+ * - bidderSettings object
+ * - ortb2.site.ext.data FPD…
  *
- * @param {Object} bidRequest
- * @returns {Object} features for an element (see specs)
+ * @param {*} bid
+ * @param {String} paramName
  */
-function _getFeatures(bidRequest) {
-  if (!canAccessTopWindow()) return;
-  const w = utils.getWindowTop();
-  const adUnitCode = bidRequest.adUnitCode;
-  const adUnitElementId = bidRequest.params.adUnitElementId || _autoDetectAdUnitElementId(adUnitCode);
-  let element;
+export function setExtraParam(bid, paramName) {
+  bid.params = bid.params || {};
 
-  if (!adUnitElementId) {
-    utils.logWarn('Unable to detect adUnitElementId. Adagio measures won\'t start');
-  } else {
-    if (bidRequest.params.postBid === true) {
-      window.document.getElementById(adUnitElementId);
-      element = _getElementFromTopWindow(element, window);
-      w.ADAGIO.pbjsAdUnits.map((adUnit) => {
-        if (adUnit.code === adUnitCode) {
-          const outerElementId = element.getAttribute('id');
-          adUnit.outerAdUnitElementId = outerElementId;
-          bidRequest.params.outerAdUnitElementId = outerElementId;
-        }
-      });
+  // eslint-disable-next-line
+  if (!!(bid.params[paramName])) {
+    return;
+  }
+
+  const adgGlobalConf = config.getConfig('adagio') || {};
+  const ortb2Conf = bid.ortb2;
+
+  const detected = adgGlobalConf[paramName] || deepAccess(ortb2Conf, `site.ext.data.${paramName}`, null);
+  if (detected) {
+    // First Party Data can be an array.
+    // As we consider that params detected from FPD are fallbacks, we just keep the 1st value.
+    if (Array.isArray(detected)) {
+      if (detected.length) {
+        bid.params[paramName] = detected[0].toString();
+      }
+      return;
+    }
+
+    bid.params[paramName] = detected.toString();
+  }
+}
+
+function autoFillParams(bid) {
+  // adUnitElementId …
+  const adgGlobalConf = config.getConfig('adagio') || {};
+
+  bid.params = bid.params || {};
+
+  // adgGlobalConf.siteId is a shortcut to facilitate the integration for publisher.
+  if (adgGlobalConf.siteId) {
+    bid.params.organizationId = adgGlobalConf.siteId.split(':')[0];
+    bid.params.site = adgGlobalConf.siteId.split(':')[1];
+  }
+
+  // Edge case. Useful when Prebid Manager cannot handle properly params setting…
+  if (adgGlobalConf.useAdUnitCodeAsPlacement === true || bid.params.useAdUnitCodeAsPlacement === true) {
+    bid.params.placement = bid.adUnitCode;
+  }
+
+  bid.params.adUnitElementId = deepAccess(bid, 'ortb2Imp.ext.data.elementId', null) || bid.params.adUnitElementId;
+
+  if (!bid.params.adUnitElementId) {
+    if (adgGlobalConf.useAdUnitCodeAsAdUnitElementId === true || bid.params.useAdUnitCodeAsAdUnitElementId === true) {
+      bid.params.adUnitElementId = bid.adUnitCode;
     } else {
-      element = w.document.getElementById(adUnitElementId);
+      bid.params.adUnitElementId = autoDetectAdUnitElementIdFromGpt(bid.adUnitCode);
     }
   }
 
-  const features = {
-    print_number: _features.getPrintNumber(bidRequest.adUnitCode).toString(),
-    page_dimensions: _features.getPageDimensions().toString(),
-    viewport_dimensions: _features.getViewPortDimensions().toString(),
-    dom_loading: _features.isDomLoading().toString(),
-    // layout: features.getLayout().toString(),
-    adunit_position: _features.getSlotPosition(element).toString(),
-    user_timestamp: _features.getTimestamp().toString(),
-    device: _features.getDevice().toString(),
-    url: w.location.origin + w.location.pathname,
-    browser: _features.getBrowser(),
-    os: _features.getOS()
-  };
+  // extra params
+  setExtraParam(bid, 'pagetype');
+  setExtraParam(bid, 'category');
+}
 
-  const adUnitFeature = {};
+function getPageDimensions() {
+  if (isSafeFrameWindow() || !canAccessTopWindow()) {
+    return '';
+  }
 
-  adUnitFeature[adUnitElementId] = {
-    features: features,
-    version: FEATURES_VERSION
-  };
+  // the page dimension can be computed on window.top only.
+  const wt = getWindowTop();
+  const body = wt.document.querySelector('body');
 
-  _pushInAdagioQueue({
-    action: 'features',
-    ts: Date.now(),
-    data: adUnitFeature
-  });
+  if (!body) {
+    return '';
+  }
+  const html = wt.document.documentElement;
+  const pageWidth = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
+  const pageHeight = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight);
 
-  return features;
-};
+  return `${pageWidth}x${pageHeight}`;
+}
 
-function _getGdprConsent(bidderRequest) {
-  const consent = {};
-  if (utils.deepAccess(bidderRequest, 'gdprConsent')) {
-    if (bidderRequest.gdprConsent.consentString !== undefined) {
-      consent.consentString = bidderRequest.gdprConsent.consentString;
+/**
+* @todo Move to prebid Core as Utils.
+* @returns
+*/
+function getViewPortDimensions() {
+  if (!isSafeFrameWindow() && !canAccessTopWindow()) {
+    return '';
+  }
+
+  const viewportDims = { w: 0, h: 0 };
+
+  if (isSafeFrameWindow()) {
+    const ws = getWindowSelf();
+
+    if (typeof ws.$sf.ext.geom !== 'function') {
+      logWarn(LOG_PREFIX, 'Unable to compute from safeframe api.');
+      return '';
     }
-    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
-      consent.consentRequired = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+
+    const sfGeom = ws.$sf.ext.geom();
+
+    if (!sfGeom || !sfGeom.win) {
+      logWarn(LOG_PREFIX, 'Unable to compute from safeframe api. Missing `geom().win` property');
+      return '';
     }
-    if (bidderRequest.gdprConsent.allowAuctionWithoutConsent !== undefined) {
-      consent.allowAuctionWithoutConsent = bidderRequest.gdprConsent.allowAuctionWithoutConsent ? 1 : 0;
+
+    viewportDims.w = Math.round(sfGeom.w);
+    viewportDims.h = Math.round(sfGeom.h);
+  } else {
+    // window.top based computing
+    const wt = getWindowTop();
+    viewportDims.w = wt.innerWidth;
+    viewportDims.h = wt.innerHeight;
+  }
+
+  return `${viewportDims.w}x${viewportDims.h}`;
+}
+
+function getSlotPosition(adUnitElementId) {
+  if (!adUnitElementId) {
+    return '';
+  }
+
+  if (!isSafeFrameWindow() && !canAccessTopWindow()) {
+    return '';
+  }
+
+  const position = { x: 0, y: 0 };
+
+  if (isSafeFrameWindow()) {
+    const ws = getWindowSelf();
+
+    if (typeof ws.$sf.ext.geom !== 'function') {
+      logWarn(LOG_PREFIX, 'Unable to compute from safeframe api.');
+      return '';
     }
-    if (bidderRequest.gdprConsent.apiVersion !== undefined) {
-      consent.apiVersion = bidderRequest.gdprConsent.apiVersion;
+
+    const sfGeom = ws.$sf.ext.geom();
+
+    if (!sfGeom || !sfGeom.self) {
+      logWarn(LOG_PREFIX, 'Unable to compute from safeframe api. Missing `geom().self` property');
+      return '';
     }
+
+    position.x = Math.round(sfGeom.t);
+    position.y = Math.round(sfGeom.l);
+  } else if (canAccessTopWindow()) {
+    try {
+      // window.top based computing
+      const wt = getWindowTop();
+      const d = wt.document;
+
+      let domElement;
+
+      if (inIframe() === true) {
+        const ws = getWindowSelf();
+        const currentElement = ws.document.getElementById(adUnitElementId);
+        domElement = internal.getElementFromTopWindow(currentElement, ws);
+      } else {
+        domElement = wt.document.getElementById(adUnitElementId);
+      }
+
+      if (!domElement) {
+        return '';
+      }
+
+      let box = domElement.getBoundingClientRect();
+
+      const docEl = d.documentElement;
+      const body = d.body;
+      const clientTop = d.clientTop || body.clientTop || 0;
+      const clientLeft = d.clientLeft || body.clientLeft || 0;
+      const scrollTop = wt.pageYOffset || docEl.scrollTop || body.scrollTop;
+      const scrollLeft = wt.pageXOffset || docEl.scrollLeft || body.scrollLeft;
+
+      const elComputedStyle = wt.getComputedStyle(domElement, null);
+      const elComputedDisplay = elComputedStyle.display || 'block';
+      const mustDisplayElement = elComputedDisplay === 'none';
+
+      if (mustDisplayElement) {
+        domElement.style = domElement.style || {};
+        const originalDisplay = domElement.style.display;
+        domElement.style.display = 'block';
+        box = domElement.getBoundingClientRect();
+        domElement.style.display = originalDisplay || null;
+      }
+      position.x = Math.round(box.left + scrollLeft - clientLeft);
+      position.y = Math.round(box.top + scrollTop - clientTop);
+    } catch (err) {
+      logError(LOG_PREFIX, err);
+      return '';
+    }
+  } else {
+    return '';
   }
-  return consent;
+
+  return `${position.x}x${position.y}`;
 }
 
-function _getSchain(bidRequest) {
-  if (utils.deepAccess(bidRequest, 'schain')) {
-    return bidRequest.schain;
+function getTimestampUTC() {
+  // timestamp returned in seconds
+  return Math.floor(new Date().getTime() / 1000) - new Date().getTimezoneOffset() * 60;
+}
+
+function getPrintNumber(adUnitCode, bidderRequest) {
+  if (!bidderRequest.bids || !bidderRequest.bids.length) {
+    return 1;
   }
+  const adagioBid = find(bidderRequest.bids, bid => bid.adUnitCode === adUnitCode);
+  return adagioBid.bidderRequestsCount || 1;
+}
+
+/**
+  * domLoading feature is computed on window.top if reachable.
+  */
+function getDomLoadingDuration() {
+  let domLoadingDuration = -1;
+  let performance;
+
+  performance = (canAccessTopWindow()) ? getWindowTop().performance : getWindowSelf().performance;
+
+  if (performance && performance.timing && performance.timing.navigationStart > 0) {
+    const val = performance.timing.domLoading - performance.timing.navigationStart;
+    if (val > 0) {
+      domLoadingDuration = val;
+    }
+  }
+
+  return domLoadingDuration;
+}
+
+function storeRequestInAdagioNS(bidRequest) {
+  const w = getCurrentWindow();
+  // Store adUnits config.
+  // If an adUnitCode has already been stored, it will be replaced.
+  w.ADAGIO = w.ADAGIO || {};
+  w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits.filter((adUnit) => adUnit.code !== bidRequest.adUnitCode);
+
+  let printNumber
+  if (bidRequest.features && bidRequest.features.print_number) {
+    printNumber = bidRequest.features.print_number;
+  } else if (bidRequest.params.features && bidRequest.params.features.print_number) {
+    printNumber = bidRequest.params.features.print_number;
+  }
+
+  w.ADAGIO.pbjsAdUnits.push({
+    code: bidRequest.adUnitCode,
+    mediaTypes: bidRequest.mediaTypes || {},
+    sizes: (bidRequest.mediaTypes && bidRequest.mediaTypes.banner && Array.isArray(bidRequest.mediaTypes.banner.sizes)) ? bidRequest.mediaTypes.banner.sizes : bidRequest.sizes,
+    bids: [{
+      bidder: bidRequest.bidder,
+      params: bidRequest.params // use the updated bid.params object with auto-detected params
+    }],
+    auctionId: bidRequest.auctionId,
+    pageviewId: internal.getPageviewId(),
+    printNumber,
+    localPbjs: '$$PREBID_GLOBAL$$',
+    localPbjsRef: getGlobal()
+  });
+
+  // (legacy) Store internal adUnit information
+  w.ADAGIO.adUnits[bidRequest.adUnitCode] = {
+    auctionId: bidRequest.auctionId,
+    pageviewId: internal.getPageviewId(),
+    printNumber,
+  };
 }
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  supportedMediaType: SUPPORTED_MEDIA_TYPES,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
 
-  isBidRequestValid: function (bid) {
-    const { adUnitCode, auctionId, sizes, bidder, params, mediaTypes } = bid;
-    const { organizationId, site, placement } = bid.params;
-    const adUnitElementId = bid.params.adUnitElementId || _autoDetectAdUnitElementId(adUnitCode);
-    const environment = bid.params.environment || _autoDetectEnvironment();
-    let isValid = false;
+  isBidRequestValid(bid) {
+    bid.params = bid.params || {};
 
-    utils.logInfo('adUnitElementId', adUnitElementId)
-
-    try {
-      if (canAccessTopWindow()) {
-        const w = utils.getWindowTop();
-        w.ADAGIO = w.ADAGIO || {};
-        w.ADAGIO.adUnits = w.ADAGIO.adUnits || {};
-        w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits || [];
-        isValid = !!(organizationId && site && placement);
-
-        const tempAdUnits = w.ADAGIO.pbjsAdUnits.filter((adUnit) => adUnit.code !== adUnitCode);
-
-        bid.params = {
-          ...bid.params,
-          adUnitElementId,
-          environment
-        }
+    autoFillParams(bid);
 
-        tempAdUnits.push({
-          code: adUnitCode,
-          sizes: (mediaTypes && mediaTypes.banner && Array.isArray(mediaTypes.banner.sizes)) ? mediaTypes.banner.sizes : sizes,
-          bids: [{
-            bidder,
-            params
-          }]
-        });
-        w.ADAGIO.pbjsAdUnits = tempAdUnits;
-
-        if (isValid === true) {
-          let printNumber = _computePrintNumber(adUnitCode);
-          w.ADAGIO.adUnits[adUnitCode] = {
-            auctionId: auctionId,
-            pageviewId: _getPageviewId(),
-            printNumber
-          };
-        }
-      }
-    } catch (e) {
-      return isValid;
+    if (!(bid.params.organizationId && bid.params.site && bid.params.placement)) {
+      logWarn(`${LOG_PREFIX} at least one required param is missing.`);
+      // internal.enqueue(debugData());
+      return false;
     }
-    return isValid;
+
+    return true;
   },
 
-  buildRequests: function (validBidRequests, bidderRequest) {
-    // AdagioBidAdapter works when window.top can be reached only
-    if (!bidderRequest.refererInfo.reachedTop) return [];
+  buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
 
     const secure = (location.protocol === 'https:') ? 1 : 0;
-    const device = _getDevice();
-    const site = _getSite();
-    const pageviewId = _getPageviewId();
-    const gdprConsent = _getGdprConsent(bidderRequest);
+    const device = internal.getDevice();
+    const site = internal.getSite(bidderRequest);
+    const pageviewId = internal.getPageviewId();
+    const gdprConsent = _getGdprConsent(bidderRequest) || {};
+    const uspConsent = _getUspConsent(bidderRequest) || {};
+    const coppa = _getCoppa();
     const schain = _getSchain(validBidRequests[0]);
-    const adUnits = utils._map(validBidRequests, (bidRequest) => {
-      bidRequest.features = _getFeatures(bidRequest);
+    const eids = _getEids(validBidRequests[0]) || [];
+
+    const adUnits = _map(validBidRequests, (bidRequest) => {
+      const globalFeatures = GlobalExchange.getOrSetGlobalFeatures();
+      const features = {
+        ...globalFeatures,
+        print_number: getPrintNumber(bidRequest.adUnitCode, bidderRequest).toString(),
+        adunit_position: getSlotPosition(bidRequest.params.adUnitElementId) // adUnitElementId à déplacer ???
+      };
+
+      Object.keys(features).forEach((prop) => {
+        if (features[prop] === '') {
+          delete features[prop];
+        }
+      });
+
+      bidRequest.features = features;
+
+      internal.enqueue({
+        action: 'features',
+        ts: Date.now(),
+        data: {
+          features: bidRequest.features,
+          params: bidRequest.params,
+          adUnitCode: bidRequest.adUnitCode
+        }
+      });
+
+      // Handle priceFloors module
+      const computedFloors = _getFloors(bidRequest);
+      if (isArray(computedFloors) && computedFloors.length) {
+        bidRequest.floors = computedFloors
+
+        if (deepAccess(bidRequest, 'mediaTypes.banner')) {
+          const bannerObj = bidRequest.mediaTypes.banner
+
+          const computeNewSizeArray = (sizeArr = []) => {
+            const size = { size: sizeArr, floor: null }
+            const bannerFloors = bidRequest.floors.filter(floor => floor.mt === BANNER)
+            const BannerSizeFloor = bannerFloors.find(floor => floor.s === sizeArr.join('x'))
+            size.floor = (bannerFloors) ? (BannerSizeFloor) ? BannerSizeFloor.f : bannerFloors[0].f : null
+            return size
+          }
+
+          // `bannerSizes`, internal property name
+          bidRequest.mediaTypes.banner.bannerSizes = (isArray(bannerObj.sizes[0]))
+            ? bannerObj.sizes.map(sizeArr => {
+              return computeNewSizeArray(sizeArr)
+            })
+            : computeNewSizeArray(bannerObj.sizes)
+        }
+
+        if (deepAccess(bidRequest, 'mediaTypes.video')) {
+          const videoObj = bidRequest.mediaTypes.video
+          const videoFloors = bidRequest.floors.filter(floor => floor.mt === VIDEO);
+          const playerSize = (videoObj.playerSize && isArray(videoObj.playerSize[0])) ? videoObj.playerSize[0] : videoObj.playerSize
+          const videoSizeFloor = (playerSize) ? videoFloors.find(floor => floor.s === playerSize.join('x')) : undefined
+
+          bidRequest.mediaTypes.video.floor = (videoFloors) ? videoSizeFloor ? videoSizeFloor.f : videoFloors[0].f : null
+        }
+
+        if (deepAccess(bidRequest, 'mediaTypes.native')) {
+          const nativeFloors = bidRequest.floors.filter(floor => floor.mt === NATIVE);
+          if (nativeFloors.length) {
+            bidRequest.mediaTypes.native.floor = nativeFloors[0].f
+          }
+        }
+      }
+
+      if (deepAccess(bidRequest, 'mediaTypes.video')) {
+        _buildVideoBidRequest(bidRequest);
+      }
+
+      storeRequestInAdagioNS(bidRequest);
+
       return bidRequest;
     });
 
-    // Regroug ad units by siteId
+    // Group ad units by organizationId
     const groupedAdUnits = adUnits.reduce((groupedAdUnits, adUnit) => {
-      if (adUnit.params && adUnit.params.organizationId) {
-        adUnit.params.organizationId = adUnit.params.organizationId.toString();
-      }
-      (groupedAdUnits[adUnit.params.organizationId] = groupedAdUnits[adUnit.params.organizationId] || []).push(adUnit);
+      const adUnitCopy = deepClone(adUnit);
+      adUnitCopy.params.organizationId = adUnitCopy.params.organizationId.toString();
+
+      // remove useless props
+      delete adUnitCopy.floorData;
+      delete adUnitCopy.params.siteId;
+      delete adUnitCopy.userId
+      delete adUnitCopy.userIdAsEids
+
+      groupedAdUnits[adUnitCopy.params.organizationId] = groupedAdUnits[adUnitCopy.params.organizationId] || [];
+      groupedAdUnits[adUnitCopy.params.organizationId].push(adUnitCopy);
+
       return groupedAdUnits;
     }, {});
 
-    // Build one request per siteId
-    const requests = utils._map(Object.keys(groupedAdUnits), (organizationId) => {
+    // Build one request per organizationId
+    const requests = _map(Object.keys(groupedAdUnits), organizationId => {
       return {
         method: 'POST',
         url: ENDPOINT,
         data: {
-          id: utils.generateUUID(),
+          id: generateUUID(),
           organizationId: organizationId,
           secure: secure,
           device: device,
           site: site,
           pageviewId: pageviewId,
           adUnits: groupedAdUnits[organizationId],
-          gdpr: gdprConsent,
+          data: GlobalExchange.getExchangeData(),
+          regs: {
+            gdpr: gdprConsent,
+            coppa: coppa,
+            ccpa: uspConsent
+          },
           schain: schain,
+          user: {
+            eids: eids
+          },
           prebidVersion: '$prebid.version$',
-          adapterVersion: VERSION,
           featuresVersion: FEATURES_VERSION
         },
         options: {
           contentType: 'text/plain'
         }
-      }
+      };
     });
 
     return requests;
   },
 
-  interpretResponse: function (serverResponse, bidRequest) {
+  interpretResponse(serverResponse, bidRequest) {
     let bidResponses = [];
     try {
       const response = serverResponse.body;
       if (response) {
         if (response.data) {
-          _pushInAdagioQueue({
+          internal.enqueue({
             action: 'ssp-data',
             ts: Date.now(),
             data: response.data
@@ -510,36 +1056,106 @@ export const spec = {
         if (response.bids) {
           response.bids.forEach(bidObj => {
             const bidReq = (find(bidRequest.data.adUnits, bid => bid.bidId === bidObj.requestId));
+
             if (bidReq) {
+              bidObj.meta = deepAccess(bidObj, 'meta', {});
+              bidObj.meta.mediaType = bidObj.mediaType;
+              bidObj.meta.advertiserDomains = (Array.isArray(bidObj.aDomain) && bidObj.aDomain.length) ? bidObj.aDomain : [];
+
+              if (bidObj.mediaType === VIDEO) {
+                const mediaTypeContext = deepAccess(bidReq, 'mediaTypes.video.context');
+                // Adagio SSP returns a `vastXml` only. No `vastUrl` nor `videoCacheKey`.
+                if (!bidObj.vastUrl && bidObj.vastXml) {
+                  bidObj.vastUrl = 'data:text/xml;charset=utf-8;base64,' + btoa(bidObj.vastXml.replace(/\\"/g, '"'));
+                }
+
+                if (mediaTypeContext === OUTSTREAM) {
+                  bidObj.renderer = Renderer.install({
+                    id: bidObj.requestId,
+                    adUnitCode: bidObj.adUnitCode,
+                    url: bidObj.urlRenderer || RENDERER_URL,
+                    config: {
+                      ...deepAccess(bidReq, 'mediaTypes.video'),
+                      ...deepAccess(bidObj, 'outstream', {})
+                    }
+                  });
+
+                  bidObj.renderer.setRender(_renderer);
+                }
+              }
+
+              if (bidObj.mediaType === NATIVE) {
+                _parseNativeBidResponse(bidObj);
+              }
+
               bidObj.site = bidReq.params.site;
               bidObj.placement = bidReq.params.placement;
               bidObj.pagetype = bidReq.params.pagetype;
               bidObj.category = bidReq.params.category;
-              bidObj.subcategory = bidReq.params.subcategory;
-              bidObj.environment = bidReq.params.environment;
             }
             bidResponses.push(bidObj);
           });
         }
       }
     } catch (err) {
-      utils.logError(err);
+      logError(err);
     }
     return bidResponses;
   },
 
-  getUserSyncs: function (syncOptions, serverResponses) {
+  getUserSyncs(syncOptions, serverResponses) {
     if (!serverResponses.length || serverResponses[0].body === '' || !serverResponses[0].body.userSyncs) {
       return false;
     }
-    const syncs = serverResponses[0].body.userSyncs.map((sync) => {
-      return {
-        type: sync.t === 'p' ? 'image' : 'iframe',
-        url: sync.u
-      }
-    })
+
+    const syncs = serverResponses[0].body.userSyncs.map(sync => ({
+      type: sync.t === 'p' ? 'image' : 'iframe',
+      url: sync.u
+    }));
+
     return syncs;
+  },
+
+  /**
+   * Handle custom logic in s2s context
+   *
+   * @param {*} params
+   * @param {boolean} isOrtb Is an s2s context
+   * @param {*} adUnit
+   * @param {*} bidRequests
+   * @returns {object} updated params
+   */
+  transformBidParams(params, isOrtb, adUnit, bidRequests) {
+    const adagioBidderRequest = find(bidRequests, bidRequest => bidRequest.bidderCode === 'adagio');
+    const adagioBid = find(adagioBidderRequest.bids, bid => bid.adUnitCode === adUnit.code);
+
+    if (isOrtb) {
+      autoFillParams(adagioBid);
+
+      adagioBid.params.auctionId = deepAccess(adagioBidderRequest, 'auctionId');
+
+      const globalFeatures = GlobalExchange.getOrSetGlobalFeatures();
+      adagioBid.params.features = {
+        ...globalFeatures,
+        print_number: getPrintNumber(adagioBid.adUnitCode, adagioBidderRequest).toString(),
+        adunit_position: getSlotPosition(adagioBid.params.adUnitElementId) // adUnitElementId à déplacer ???
+      };
+
+      adagioBid.params.pageviewId = internal.getPageviewId();
+      adagioBid.params.prebidVersion = '$prebid.version$';
+      adagioBid.params.data = GlobalExchange.getExchangeData();
+
+      if (deepAccess(adagioBid, 'mediaTypes.video.context') === OUTSTREAM) {
+        adagioBid.params.playerName = setPlayerName(adagioBid);
+      }
+
+      storeRequestInAdagioNS(adagioBid);
+    }
+
+    return adagioBid.params;
   }
-}
+};
+
+initAdagio();
 
 registerBidder(spec);
diff --git a/modules/adagioBidAdapter.md b/modules/adagioBidAdapter.md
index b34cc3fe37a..b804a72fea9 100644
--- a/modules/adagioBidAdapter.md
+++ b/modules/adagioBidAdapter.md
@@ -8,85 +8,219 @@ Maintainer: dev@adagio.io
 
 Connects to Adagio demand source to fetch bids.
 
-## Test Parameters
+## Configuration
+
+Adagio require several params. These params must be set at Prebid.js BidderConfig config level or at adUnit level.
+
+Below, the list of Adagio params and where they can be set.
+
+| Param name | Global config | AdUnit config |
+| ---------- | ------------- | ------------- |
+| siteId | x |
+| organizationId * | | x
+| site * | | x
+| pagetype | x | x
+| category | x | x
+| useAdUnitCodeAsAdUnitElementId | x | x
+| useAdUnitCodeAsPlacement | x | x
+| placement | | x
+| adUnitElementId | | x
+| debug | | x
+| video | | x
+| native | | x
+
+_* These params are deprecated in favor the Global configuration setup, see below._
+
+### Global configuration
+
+The global configuration is used to store params once instead of duplicate them to each adUnit. The values will be used as "params" in the ad-request.
 
 ```javascript
-    var adUnits = [
-      {
-        code: 'dfp_banniere_atf',
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250], [300, 600]],
-          }
+pbjs.setConfig({
+  debug: false,
+  // …,
+  adagio: {
+    siteId: '1002:adagio-io', // Required. Provided by Adagio
+
+    // The following params are limited to 30 characters,
+    // and can only contain the following characters:
+    // - alphanumeric (A-Z+a-z+0-9, case-insensitive)
+    // - dashes `-`
+    // - underscores `_`
+    // Also, each param can have at most 50 unique active values (case-insensitive).
+    pagetype: 'article', // Highly recommended. The pagetype describes what kind of content will be present in the page.
+    category: 'sport', // Recommended. Category of the content displayed in the page.
+    useAdUnitCodeAsAdUnitElementId: false, // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+    useAdUnitCodeAsPlacement: false, // Optional. Use it to by-pass placement and use the adUnit code as value
+  },
+});
+```
+
+#### Note on FPD support
+
+Adagio will use FPD data as fallback for the params below:
+- pagetype
+- category
+
+If the FPD value is an array, the 1st value of this array will be used.
+
+### adUnit configuration
+
+```javascript
+var adUnits = [
+  {
+    code: 'dfp_banniere_atf',
+    bids: [{
+      bidder: 'adagio',
+      params: {
+        placement: 'in_article', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
+        adUnitElementId: 'article_outstream', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
+        // Optional debug mode, used to get a bid response with expected cpm.
+        debug: {
+          enabled: true,
+          cpm: 3.00 // default to 1.00
+        },
+        video: {
+          skip: 0
+          // OpenRTB 2.5 video options defined here override ones defined in mediaTypes.
+        },
+        native: {
+          // Optional OpenRTB Native 1.2 request object. Only `context`, `plcmttype` fields are supported.
+          context: 1,
+          plcmttype: 2
         },
-        bids: [{
-          bidder: 'adagio', // Required
-          params: {
-            organizationId: '0', // Required - Organization ID provided by Adagio.
-            site: 'news-of-the-day', // Required - Site Name provided by Adagio.
-            placement: 'ban_atf', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
-            adUnitElementId: 'dfp_banniere_atf', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
-
-            // The following params are limited to 30 characters,
-            // and can only contain the following characters:
-            // - alphanumeric (A-Z+a-z+0-9, case-insensitive)
-            // - dashes `-`
-            // - underscores `_`
-            // Also, each param can have at most 50 unique active values (case-insensitive).
-            pagetype: 'article', // Highly recommended. The pagetype describes what kind of content will be present in the page.
-            environment: 'mobile', // Recommended. Environment where the page is displayed.
-            category: 'sport', // Recommended. Category of the content displayed in the page.
-            subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
-            postBid: false // Optional. Use it in case of Post-bid integration only.
-          }
-        }]
       }
-    ];
-
-    pbjs.addAdUnits(adUnits);
-
-    pbjs.bidderSettings = {
-      adagio: {
-        alwaysUseBid: true,
-        adserverTargeting: [
-          {
-            key: "site",
-            val: function (bidResponse) {
-              return bidResponse.site;
-            }
-          },
-          {
-            key: "environment",
-            val: function (bidResponse) {
-              return bidResponse.environment;
-            }
-          },
-          {
-            key: "placement",
-            val: function (bidResponse) {
-              return bidResponse.placement;
-            }
+    }]
+  }
+];
+```
+
+## Test Parameters
+
+```javascript
+
+  pbjs.setConfig({
+    debug: true,
+    adagio: {
+      pagetype: 'article',
+      category: 'sport',
+      useAdUnitCodeAsAdUnitElementId: false,
+      useAdUnitCodeAsPlacement: false,
+    }
+  });
+
+  var adUnits = [
+    {
+      code: 'dfp_banniere_atf',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]],
+        }
+      },
+      bids: [{
+        bidder: 'adagio', // Required
+        params: {
+          placement: 'in_article',
+          adUnitElementId: 'article_outstream',
+          debug: {
+            enabled: true,
+            cpm: 3.00 // default to 1.00
+          }
+        }
+      }]
+    },
+    {
+      code: 'article_outstream',
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [640, 480],
+          mimes: ['video/mp4'],
+          skip: 1
+        }
+      },
+      bids: [{
+        bidder: 'adagio',
+        params: {
+          placement: 'in_article',
+          adUnitElementId: 'article_outstream',
+          video: {
+            skip: 0
           },
-          {
-            key: "pagetype",
-            val: function (bidResponse) {
-              return bidResponse.pagetype;
-            }
+          debug: {
+            enabled: true,
+            cpm: 3.00
+          }
+        }
+      }]
+    },
+    {
+      code: 'article_native',
+      mediaTypes: {
+        native: {
+          // generic Prebid options
+          title: {
+              required: true,
+              len: 80
           },
-          {
-            key: "category",
-            val: function (bidResponse) {
-              return bidResponse.category;
+          // …
+          // Custom Adagio data assets
+          ext: {
+            adagio_bvw: {
+              required: false
             }
+          }
+        }
+      },
+      bids: [{
+        bidder: 'adagio',
+        params: {
+          placement: 'in_article',
+          adUnitElementId: 'article_native',
+          native: {
+            context: 1,
+            plcmttype: 2
           },
-          {
-            key: "subcategory",
-            val: function (bidResponse) {
-              return bidResponse.subcategory;
-            }
+          debug: {
+            enabled: true,
+            cpm: 3.00
           }
-        ]
-      }
+        }
+      }]
     }
+  ];
+
+  pbjs.addAdUnits(adUnits);
 
+  pbjs.bidderSettings = {
+    adagio: {
+      alwaysUseBid: true,
+      adserverTargeting: [
+        {
+          key: "site",
+          val: function (bidResponse) {
+            return bidResponse.site;
+          }
+        },
+        {
+          key: "placement",
+          val: function (bidResponse) {
+            return bidResponse.placement;
+          }
+        },
+        {
+          key: "pagetype",
+          val: function (bidResponse) {
+            return bidResponse.pagetype;
+          }
+        },
+        {
+          key: "category",
+          val: function (bidResponse) {
+            return bidResponse.category;
+          }
+        }
+      ]
+    }
+  }
 ```
diff --git a/modules/adbookpspBidAdapter.js b/modules/adbookpspBidAdapter.js
new file mode 100644
index 00000000000..917d18e9fae
--- /dev/null
+++ b/modules/adbookpspBidAdapter.js
@@ -0,0 +1,830 @@
+import {find, includes} from '../src/polyfill.js';
+import {config} from '../src/config.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {
+  deepAccess,
+  deepSetValue,
+  flatten,
+  generateUUID,
+  inIframe,
+  isArray,
+  isEmptyStr,
+  isNumber,
+  isPlainObject,
+  isStr,
+  logError,
+  logWarn,
+  triggerPixel,
+  uniques
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+/**
+ * CONSTANTS
+ */
+
+export const VERSION = '1.0.0';
+const EXCHANGE_URL = 'https://ex.fattail.com/openrtb2';
+const WIN_TRACKING_URL = 'https://ev.fattail.com/wins';
+const BIDDER_CODE = 'adbookpsp';
+const USER_ID_KEY = 'hb_adbookpsp_uid';
+const USER_ID_COOKIE_EXP = 2592000000; // lasts 30 days
+const BID_TTL = 300;
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
+const DEFAULT_CURRENCY = 'USD';
+const VIDEO_PARAMS = [
+  'mimes',
+  'minduration',
+  'maxduration',
+  'protocols',
+  'w',
+  'h',
+  'startdelay',
+  'placement',
+  'linearity',
+  'skip',
+  'skipmin',
+  'skipafter',
+  'sequence',
+  'battr',
+  'maxextended',
+  'minbitrate',
+  'maxbitrate',
+  'boxingallowed',
+  'playbackmethod',
+  'playbackend',
+  'delivery',
+  'pos',
+  'companionad',
+  'api',
+  'companiontype',
+  'ext',
+];
+const TARGETING_VALUE_SEPARATOR = ',';
+
+export const DEFAULT_BIDDER_CONFIG = {
+  bidTTL: BID_TTL,
+  defaultCurrency: DEFAULT_CURRENCY,
+  exchangeUrl: EXCHANGE_URL,
+  winTrackingEnabled: true,
+  winTrackingUrl: WIN_TRACKING_URL,
+  orgId: null,
+};
+
+config.setDefaults({
+  adbookpsp: DEFAULT_BIDDER_CONFIG,
+});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+
+  buildRequests,
+  getUserSyncs,
+  interpretResponse,
+  isBidRequestValid,
+  onBidWon,
+};
+
+registerBidder(spec);
+
+/**
+ * BID REQUEST
+ */
+
+function isBidRequestValid(bidRequest) {
+  return (
+    hasRequiredParams(bidRequest) &&
+    (isValidBannerRequest(bidRequest) || isValidVideoRequest(bidRequest))
+  );
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  // convert Native ORTB definition to old-style prebid native definition
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+  const requests = [];
+
+  if (validBidRequests.length > 0) {
+    requests.push({
+      method: 'POST',
+      url: getBidderConfig('exchangeUrl'),
+      options: {
+        contentType: 'application/json',
+        withCredentials: true,
+      },
+      data: buildRequest(validBidRequests, bidderRequest),
+    });
+  }
+
+  return requests;
+}
+
+function buildRequest(validBidRequests, bidderRequest) {
+  const request = {
+    id: bidderRequest.bidderRequestId,
+    tmax: bidderRequest.timeout,
+    site: {
+      domain: bidderRequest.refererInfo.domain,
+      page: bidderRequest.refererInfo.page,
+      ref: bidderRequest.refererInfo.ref,
+    },
+    source: buildSource(validBidRequests, bidderRequest),
+    device: buildDevice(),
+    regs: buildRegs(bidderRequest),
+    user: buildUser(bidderRequest),
+    imp: validBidRequests.map(buildImp),
+    ext: {
+      adbook: {
+        config: getBidderConfig(),
+        version: {
+          prebid: '$prebid.version$',
+          adapter: VERSION,
+        },
+      },
+    },
+  };
+
+  return JSON.stringify(request);
+}
+
+function buildDevice() {
+  const { innerWidth, innerHeight } = common.getWindowDimensions();
+
+  const device = {
+    w: innerWidth,
+    h: innerHeight,
+    js: true,
+    ua: navigator.userAgent,
+    dnt:
+      navigator.doNotTrack === 'yes' ||
+      navigator.doNotTrack == '1' ||
+      navigator.msDoNotTrack == '1'
+        ? 1
+        : 0,
+  };
+
+  const deviceConfig = common.getConfig('device');
+
+  if (isPlainObject(deviceConfig)) {
+    return { ...device, ...deviceConfig };
+  }
+
+  return device;
+}
+
+function buildRegs(bidderRequest) {
+  const regs = {
+    coppa: common.getConfig('coppa') === true ? 1 : 0,
+  };
+
+  if (bidderRequest.gdprConsent) {
+    deepSetValue(
+      regs,
+      'ext.gdpr',
+      bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+    );
+    deepSetValue(
+      regs,
+      'ext.gdprConsentString',
+      bidderRequest.gdprConsent.consentString || ''
+    );
+  }
+
+  if (bidderRequest.uspConsent) {
+    deepSetValue(regs, 'ext.us_privacy', bidderRequest.uspConsent);
+  }
+
+  return regs;
+}
+
+function buildSource(bidRequests, bidderRequest) {
+  const source = {
+    fd: 1,
+    tid: bidderRequest.auctionId,
+  };
+  const schain = deepAccess(bidRequests, '0.schain');
+
+  if (schain) {
+    deepSetValue(source, 'ext.schain', schain);
+  }
+
+  return source;
+}
+
+function buildUser(bidderRequest) {
+  const user = {
+    id: getUserId(),
+  };
+
+  if (bidderRequest.gdprConsent) {
+    user.gdprConsentString = bidderRequest.gdprConsent.consentString || '';
+  }
+
+  return user;
+}
+
+function buildImp(bidRequest) {
+  let impBase = {
+    id: bidRequest.bidId,
+    tagid: bidRequest.adUnitCode,
+    ext: buildImpExt(bidRequest),
+  };
+
+  return Object.keys(bidRequest.mediaTypes)
+    .filter((mediaType) => includes(SUPPORTED_MEDIA_TYPES, mediaType))
+    .reduce((imp, mediaType) => {
+      return {
+        ...imp,
+        [mediaType]: buildMediaTypeObject(mediaType, bidRequest),
+      };
+    }, impBase);
+}
+
+function buildMediaTypeObject(mediaType, bidRequest) {
+  switch (mediaType) {
+    case BANNER:
+      return buildBannerObject(bidRequest);
+    case VIDEO:
+      return buildVideoObject(bidRequest);
+    default:
+      logWarn(`${BIDDER_CODE}: Unsupported media type ${mediaType}!`);
+  }
+}
+
+function buildBannerObject(bidRequest) {
+  const format = bidRequest.mediaTypes.banner.sizes.map((size) => {
+    const [w, h] = size;
+
+    return { w, h };
+  });
+  const { w, h } = format[0];
+
+  return {
+    pos: 0,
+    topframe: inIframe() ? 0 : 1,
+    format,
+    w,
+    h,
+  };
+}
+
+function buildVideoObject(bidRequest) {
+  const { w, h } = getVideoSize(bidRequest);
+  let videoObj = {
+    w,
+    h,
+  };
+
+  for (const param of VIDEO_PARAMS) {
+    const paramsValue = deepAccess(bidRequest, `params.video.${param}`);
+    const mediaTypeValue = deepAccess(
+      bidRequest,
+      `mediaTypes.video.${param}`
+    );
+
+    if (paramsValue || mediaTypeValue) {
+      videoObj[param] = paramsValue || mediaTypeValue;
+    }
+  }
+
+  return videoObj;
+}
+
+function getVideoSize(bidRequest) {
+  const playerSize = deepAccess(bidRequest, 'mediaTypes.video.playerSize', [[]]);
+  const { w, h } = deepAccess(bidRequest, 'mediaTypes.video', {});
+
+  if (isNumber(w) && isNumber(h)) {
+    return { w, h };
+  }
+
+  return {
+    w: playerSize[0][0],
+    h: playerSize[0][1],
+  }
+}
+
+function buildImpExt(validBidRequest) {
+  const defaultOrgId = getBidderConfig('orgId');
+  const { orgId, placementId } = validBidRequest.params || {};
+  const effectiverOrgId = orgId || defaultOrgId;
+  const ext = {};
+
+  if (placementId) {
+    deepSetValue(ext, 'adbook.placementId', placementId);
+  }
+
+  if (effectiverOrgId) {
+    deepSetValue(ext, 'adbook.orgId', effectiverOrgId);
+  }
+
+  return ext;
+}
+
+/**
+ * BID RESPONSE
+ */
+
+function interpretResponse(bidResponse, bidderRequest) {
+  const bidderRequestBody = safeJSONparse(bidderRequest.data);
+
+  if (
+    deepAccess(bidderRequestBody, 'id') !=
+    deepAccess(bidResponse, 'body.id')
+  ) {
+    logError(
+      `${BIDDER_CODE}: Bid response id does not match bidder request id`
+    );
+
+    return [];
+  }
+
+  const referrer = deepAccess(bidderRequestBody, 'site.ref', '');
+  const incomingBids = deepAccess(bidResponse, 'body.seatbid', [])
+    .filter((seat) => isArray(seat.bid))
+    .reduce((bids, seat) => bids.concat(seat.bid), [])
+    .filter(validateBid(bidderRequestBody));
+  const targetingMap = buildTargetingMap(incomingBids);
+
+  return impBidsToPrebidBids(
+    incomingBids,
+    bidderRequestBody,
+    bidResponse.body.cur,
+    referrer,
+    targetingMap
+  );
+}
+
+function impBidsToPrebidBids(
+  incomingBids,
+  bidderRequestBody,
+  bidResponseCurrency,
+  referrer,
+  targetingMap
+) {
+  return incomingBids
+    .map(
+      impToPrebidBid(
+        bidderRequestBody,
+        bidResponseCurrency,
+        referrer,
+        targetingMap
+      )
+    )
+    .filter((i) => i !== null);
+}
+
+const impToPrebidBid =
+  (bidderRequestBody, bidResponseCurrency, referrer, targetingMap) => (bid, bidIndex) => {
+    try {
+      const bidRequest = findBidRequest(bidderRequestBody, bid);
+
+      if (!bidRequest) {
+        logError(`${BIDDER_CODE}: Could not match bid to bid request`);
+
+        return null;
+      }
+      const categories = deepAccess(bid, 'cat', []);
+      const mediaType = getMediaType(bid.adm);
+      let prebidBid = {
+        ad: bid.adm,
+        adId: bid.adid,
+        adserverTargeting: targetingMap[bidIndex],
+        adUnitCode: bidRequest.tagid,
+        bidderRequestId: bidderRequestBody.id,
+        bidId: bid.id,
+        cpm: bid.price,
+        creativeId: bid.crid || bid.id,
+        currency: bidResponseCurrency || getBidderConfig('defaultCurrency'),
+        height: bid.h,
+        lineItemId: deepAccess(bid, 'ext.liid'),
+        mediaType,
+        meta: {
+          advertiserDomains: bid.adomain,
+          mediaType,
+          primaryCatId: categories[0],
+          secondaryCatIds: categories.slice(1),
+        },
+        netRevenue: true,
+        nurl: bid.nurl,
+        referrer: referrer,
+        requestId: bid.impid,
+        ttl: getBidderConfig('bidTTL'),
+        width: bid.w,
+      };
+
+      if (mediaType === VIDEO) {
+        prebidBid = {
+          ...prebidBid,
+          ...getVideoSpecificParams(bidRequest, bid),
+        };
+      }
+
+      if (deepAccess(bid, 'ext.pa_win') === true) {
+        prebidBid.auctionWinner = true;
+      }
+      return prebidBid;
+    } catch (error) {
+      logError(`${BIDDER_CODE}: Error while building bid`, error);
+
+      return null;
+    }
+  };
+
+function getVideoSpecificParams(bidRequest, bid) {
+  return {
+    height: bid.h || bidRequest.video.h,
+    vastXml: bid.adm,
+    width: bid.w || bidRequest.video.w,
+  };
+}
+
+function buildTargetingMap(bids) {
+  const impIds = bids.map(({ impid }) => impid).filter(uniques);
+  const values = impIds.reduce((result, id) => {
+    result[id] = {
+      lineItemIds: [],
+      orderIds: [],
+      dealIds: [],
+      adIds: [],
+      adAndOrderIndexes: []
+    };
+
+    return result;
+  }, {});
+
+  bids.forEach((bid, bidIndex) => {
+    let impId = bid.impid;
+    values[impId].lineItemIds.push(bid.ext.liid);
+    values[impId].dealIds.push(bid.dealid);
+    values[impId].adIds.push(bid.adid);
+
+    if (deepAccess(bid, 'ext.ordid')) {
+      values[impId].orderIds.push(bid.ext.ordid);
+      bid.ext.ordid.split(TARGETING_VALUE_SEPARATOR).forEach((ordid, ordIndex) => {
+        let adIdIndex = values[impId].adIds.indexOf(bid.adid);
+        values[impId].adAndOrderIndexes.push(adIdIndex + '_' + ordIndex)
+      })
+    }
+  });
+
+  const targetingMap = {};
+
+  bids.forEach((bid, bidIndex) => {
+    let id = bid.impid;
+
+    targetingMap[bidIndex] = {
+      hb_liid_adbookpsp: values[id].lineItemIds.join(TARGETING_VALUE_SEPARATOR),
+      hb_deal_adbookpsp: values[id].dealIds.join(TARGETING_VALUE_SEPARATOR),
+      hb_ad_ord_adbookpsp: values[id].adAndOrderIndexes.join(TARGETING_VALUE_SEPARATOR),
+      hb_adid_c_adbookpsp: values[id].adIds.join(TARGETING_VALUE_SEPARATOR),
+      hb_ordid_adbookpsp: values[id].orderIds.join(TARGETING_VALUE_SEPARATOR),
+    };
+  })
+  return targetingMap;
+}
+
+/**
+ * VALIDATION
+ */
+
+function hasRequiredParams(bidRequest) {
+  const value =
+    deepAccess(bidRequest, 'params.placementId') != null ||
+    deepAccess(bidRequest, 'params.orgId') != null ||
+    getBidderConfig('orgId') != null;
+
+  if (!value) {
+    logError(`${BIDDER_CODE}: missing orgId and placementId parameter`);
+  }
+
+  return value;
+}
+
+function isValidBannerRequest(bidRequest) {
+  const value = validateSizes(
+    deepAccess(bidRequest, 'mediaTypes.banner.sizes', [])
+  );
+
+  return value;
+}
+
+function isValidVideoRequest(bidRequest) {
+  const value =
+    isArray(deepAccess(bidRequest, 'mediaTypes.video.mimes')) &&
+    validateVideoSizes(bidRequest);
+
+  return value;
+}
+
+function validateSize(size) {
+  return isArray(size) && size.length === 2 && size.every(isNumber);
+}
+
+function validateSizes(sizes) {
+  return isArray(sizes) && sizes.length > 0 && sizes.every(validateSize);
+}
+
+function validateVideoSizes(bidRequest) {
+  const { w, h } = deepAccess(bidRequest, 'mediaTypes.video', {});
+
+  return (
+    validateSizes(
+      deepAccess(bidRequest, 'mediaTypes.video.playerSize')
+    ) ||
+    (isNumber(w) && isNumber(h))
+  );
+}
+
+function validateBid(bidderRequestBody) {
+  return function (bid) {
+    const mediaType = getMediaType(bid.adm);
+    const bidRequest = findBidRequest(bidderRequestBody, bid);
+    let validators = commonBidValidators;
+
+    if (mediaType === BANNER) {
+      validators = [...commonBidValidators, ...bannerBidValidators];
+    }
+
+    const value = validators.every((validator) => validator(bid, bidRequest));
+
+    if (!value) {
+      logWarn(`${BIDDER_CODE}: Invalid bid`, bid);
+    }
+
+    return value;
+  };
+}
+
+const commonBidValidators = [
+  (bid) => isPlainObject(bid),
+  (bid) => isNonEmptyStr(bid.adid),
+  (bid) => isNonEmptyStr(bid.adm),
+  (bid) => isNonEmptyStr(bid.id),
+  (bid) => isNonEmptyStr(bid.impid),
+  (bid) => isNonEmptyStr(deepAccess(bid, 'ext.liid')),
+  (bid) => isNumber(bid.price),
+];
+
+const bannerBidValidators = [
+  validateBannerDimension('w'),
+  validateBannerDimension('h'),
+];
+
+function validateBannerDimension(dimension) {
+  return function (bid, bidRequest) {
+    if (bid[dimension] == null) {
+      return bannerHasSingleSize(bidRequest);
+    }
+
+    return isNumber(bid[dimension]);
+  };
+}
+
+function bannerHasSingleSize(bidRequest) {
+  return deepAccess(bidRequest, 'banner.format', []).length === 1;
+}
+
+/**
+ * USER SYNC
+ */
+
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+function getUserSyncs(syncOptions, responses, gdprConsent, uspConsent) {
+  return responses
+    .map((response) => deepAccess(response, 'body.ext.sync'))
+    .filter(isArray)
+    .reduce(flatten, [])
+    .filter(validateSync(syncOptions))
+    .map(applyConsents(gdprConsent, uspConsent));
+}
+
+const validateSync = (syncOptions) => (sync) => {
+  return (
+    ((sync.type === 'image' && syncOptions.pixelEnabled) ||
+      (sync.type === 'iframe' && syncOptions.iframeEnabled)) &&
+    sync.url
+  );
+};
+
+const applyConsents = (gdprConsent, uspConsent) => (sync) => {
+  const url = getUrlBuilder(sync.url);
+
+  if (gdprConsent) {
+    url.set('gdpr', gdprConsent.gdprApplies ? 1 : 0);
+    url.set('consentString', gdprConsent.consentString || '');
+  }
+  if (uspConsent) {
+    url.set('us_privacy', encodeURIComponent(uspConsent));
+  }
+  if (common.getConfig('coppa') === true) {
+    url.set('coppa', 1);
+  }
+
+  return { ...sync, url: url.toString() };
+};
+
+function getUserId() {
+  const id = getUserIdFromStorage() || common.generateUUID();
+
+  setUserId(id);
+
+  return id;
+}
+
+function getUserIdFromStorage() {
+  const id = storage.localStorageIsEnabled()
+    ? storage.getDataFromLocalStorage(USER_ID_KEY)
+    : storage.getCookie(USER_ID_KEY);
+
+  if (!validateUUID(id)) {
+    return;
+  }
+
+  return id;
+}
+
+function setUserId(userId) {
+  if (storage.localStorageIsEnabled()) {
+    storage.setDataInLocalStorage(USER_ID_KEY, userId);
+  }
+
+  if (storage.cookiesAreEnabled()) {
+    const expires = new Date(Date.now() + USER_ID_COOKIE_EXP).toISOString();
+
+    storage.setCookie(USER_ID_KEY, userId, expires);
+  }
+}
+
+function validateUUID(uuid) {
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(
+    uuid
+  );
+}
+
+/**
+ * EVENT TRACKING
+ */
+
+function onBidWon(bid) {
+  if (!getBidderConfig('winTrackingEnabled')) {
+    return;
+  }
+
+  const wurl = buildWinUrl(bid);
+
+  if (wurl !== null) {
+    triggerPixel(wurl);
+  }
+
+  if (isStr(bid.nurl)) {
+    triggerPixel(bid.nurl);
+  }
+}
+
+function buildWinUrl(bid) {
+  try {
+    const url = getUrlBuilder(getBidderConfig('winTrackingUrl'));
+
+    url.set('impId', bid.requestId);
+    url.set('reqId', bid.bidderRequestId);
+    url.set('bidId', bid.bidId);
+
+    return url.toString();
+  } catch (_) {
+    logError(
+      `${BIDDER_CODE}: Could not build win tracking URL with %s`,
+      getBidderConfig('winTrackingUrl')
+    );
+
+    return null;
+  }
+}
+
+/**
+ * COMMON
+ */
+
+const VAST_REGEXP = /VAST\s+version/;
+
+function getMediaType(adm) {
+  const videoRegex = new RegExp(VAST_REGEXP);
+
+  if (videoRegex.test(adm)) {
+    return VIDEO;
+  }
+
+  const markup = safeJSONparse(adm.replace(/\\/g, ''));
+
+  if (markup && isPlainObject(markup.native)) {
+    return NATIVE;
+  }
+
+  return BANNER;
+}
+
+function safeJSONparse(...args) {
+  try {
+    return JSON.parse(...args);
+  } catch (_) {
+    return undefined;
+  }
+}
+
+function isNonEmptyStr(value) {
+  return isStr(value) && !isEmptyStr(value);
+}
+
+function findBidRequest(bidderRequest, bid) {
+  return find(bidderRequest.imp, (imp) => imp.id === bid.impid);
+}
+
+function getBidderConfig(property) {
+  if (!property) {
+    return common.getConfig(`${BIDDER_CODE}`);
+  }
+
+  return common.getConfig(`${BIDDER_CODE}.${property}`);
+}
+
+const getUrlBase = function (url) {
+  return url.split('?')[0];
+};
+
+const getUrlQuery = function (url) {
+  const query = url.split('?')[1];
+
+  if (!query) {
+    return;
+  }
+
+  return '?' + query.split('#')[0];
+};
+
+const getUrlHash = function (url) {
+  const hash = url.split('#')[1];
+
+  if (!hash) {
+    return;
+  }
+
+  return '#' + hash;
+};
+
+const getUrlBuilder = function (url) {
+  const hash = getUrlHash(url);
+  const base = getUrlBase(url);
+  const query = getUrlQuery(url);
+  const pairs = [];
+
+  function set(key, value) {
+    pairs.push([key, value]);
+
+    return {
+      set,
+      toString,
+    };
+  }
+
+  function toString() {
+    if (!pairs.length) {
+      return url;
+    }
+
+    const queryString = pairs
+      .map(function (pair) {
+        return pair.join('=');
+      })
+      .join('&');
+
+    if (!query) {
+      return base + '?' + queryString + (hash || '');
+    }
+
+    return base + query + '&' + queryString + (hash || '');
+  }
+
+  return {
+    set,
+    toString,
+  };
+};
+
+export const common = {
+  generateUUID: function () {
+    return generateUUID();
+  },
+  getConfig: function (property) {
+    return config.getConfig(property);
+  },
+  getWindowDimensions: function () {
+    return {
+      innerWidth: window.innerWidth,
+      innerHeight: window.innerHeight,
+    };
+  },
+};
diff --git a/modules/adbookpspBidAdapter.md b/modules/adbookpspBidAdapter.md
new file mode 100644
index 00000000000..e258b1fd7c3
--- /dev/null
+++ b/modules/adbookpspBidAdapter.md
@@ -0,0 +1,191 @@
+### Overview
+
+```
+Module Name: AdbookPSP Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: hbsupport@fattail.com
+```
+
+### Description
+
+Prebid.JS adapter that connects to the AdbookPSP demand sources.
+
+*NOTE*: The AdBookPSP Bidder Adapter requires setup and approval before use. The adapter uses custom targeting keys that require a dedicated Google Ad Manager setup to work. Please reach out to your AdbookPSP representative for more details. 
+
+### Bidder parameters
+
+Each adUnit with `adbookpsp` adapter has to have either `placementId` or `orgId` set.
+
+```js
+var adUnits = [
+  {
+    bids: [
+      {
+        bidder: 'adbookpsp',
+        params: {
+          placementId: 'example-placement-id',
+          orgId: 'example-org-id',
+        },
+      },
+    ],
+  },
+];
+```
+
+Alternatively, `orgId` can be set globally while configuring prebid.js:
+
+```js
+pbjs.setConfig({
+  adbookpsp: {
+    orgId: 'example-org-id',
+  },
+});
+```
+
+*NOTE*: adUnit orgId will take precedence over the globally set orgId.
+
+#### Banner parameters
+
+Required:
+
+- sizes
+
+Example configuration:
+
+```js
+var adUnits = [
+  {
+    code: 'div-1',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      },
+    }
+  },
+];
+```
+
+#### Video parameters
+
+Required:
+
+- context
+- mimes
+- playerSize
+
+Additionaly, all `Video` object parameters described in chapter `3.2.7` of the [OpenRTB 2.5 specification](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf) can be passed as bidder params.
+
+Example configuration:
+
+```js
+var adUnits = [
+  {
+    code: 'div-1',
+    mediaTypes: {
+      video: {
+        context: 'outstream',
+        mimes: ['video/mp4', 'video/x-flv'],
+        playerSize: [400, 300],
+        protocols: [2, 3],
+      },
+    },
+    bids: [
+      {
+        bidder: 'adbookpsp',
+        params: {
+          placementId: 'example-placement-id',
+          video: {
+            placement: 2,
+          },
+        },
+      },
+    ],
+  },
+];
+```
+
+*NOTE*: Supporting outstream video requires the publisher to set up a renderer as described [in the Prebid docs](https://docs.prebid.org/dev-docs/show-outstream-video-ads.html).
+
+#### Testing params
+
+To test the adapter, either `placementId: 'example-placement-id'` or `orgId: 'example-org-id'` can be used. 
+
+*NOTE*: If any adUnit uses the testing params, all adUnits will receive testing responses.
+
+Example adUnit configuration:
+
+```js
+var adUnits = [
+  {
+    code: 'div-1',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      },
+    },
+    bids: [
+      {
+        bidder: 'adbookpsp',
+        params: {
+          placementId: 'example-placement-id',
+        },
+      },
+    ],
+  },
+];
+```
+
+Example google publisher tag configuration:
+
+```js
+googletag
+  .defineSlot('/22094606581/example-adbookPSP', sizes, 'div-1')
+  .addService(googletag.pubads());
+```
+
+### Configuration
+
+Setting of the `orgId` can be done in the `pbjs.setConfig()` call. If this is the case, both `orgId` and `placementId` become optional. Remember to only call `pbjs.setConfig()` once as each call overwrites anything set in previous calls.
+
+Enabling iframe based user syncs is also encouraged.
+
+```javascript
+pbjs.setConfig({
+  adbookpsp: {
+    orgId: 'example-org-id',
+    winTrackingEnabled: true,
+  },
+  userSync: {
+    filterSettings: {
+      iframe: {
+        bidders: '*',
+        filter: 'include',
+      },
+    },
+  },
+});
+```
+
+### Privacy
+
+GDPR and US Privacy are both supported by default.
+
+#### Event tracking
+
+This adapter tracks win events for it’s bids. This functionality can be disabled by adding `winTrackingEnabled: false` to the adapter configuration:
+
+```js
+pbjs.setConfig({
+  adbookpsp: {
+    winTrackingEnabled: false,
+  },
+});
+```
+
+#### COPPA support
+
+COPPA support can be enabled for all the visitors by changing the config value:
+
+```js
+config.setConfig({ coppa: true });
+```
diff --git a/modules/adbutlerBidAdapter.js b/modules/adbutlerBidAdapter.js
deleted file mode 100644
index 47162aa2445..00000000000
--- a/modules/adbutlerBidAdapter.js
+++ /dev/null
@@ -1,131 +0,0 @@
-'use strict';
-
-import * as utils from '../src/utils.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'adbutler';
-
-export const spec = {
-  code: BIDDER_CODE,
-  pageID: Math.floor(Math.random() * 10e6),
-  aliases: ['divreach'],
-
-  isBidRequestValid: function (bid) {
-    return !!(bid.params.accountID && bid.params.zoneID);
-  },
-
-  buildRequests: function (validBidRequests) {
-    let i;
-    let zoneID;
-    let bidRequest;
-    let accountID;
-    let keyword;
-    let domain;
-    let requestURI;
-    let serverRequests = [];
-    let zoneCounters = {};
-
-    for (i = 0; i < validBidRequests.length; i++) {
-      bidRequest = validBidRequests[i];
-      zoneID = utils.getBidIdParameter('zoneID', bidRequest.params);
-      accountID = utils.getBidIdParameter('accountID', bidRequest.params);
-      keyword = utils.getBidIdParameter('keyword', bidRequest.params);
-      domain = utils.getBidIdParameter('domain', bidRequest.params);
-
-      if (!(zoneID in zoneCounters)) {
-        zoneCounters[zoneID] = 0;
-      }
-
-      if (typeof domain === 'undefined' || domain.length === 0) {
-        domain = 'servedbyadbutler.com';
-      }
-
-      requestURI = 'https://' + domain + '/adserve/;type=hbr;';
-      requestURI += 'ID=' + encodeURIComponent(accountID) + ';';
-      requestURI += 'setID=' + encodeURIComponent(zoneID) + ';';
-      requestURI += 'pid=' + encodeURIComponent(spec.pageID) + ';';
-      requestURI += 'place=' + encodeURIComponent(zoneCounters[zoneID]) + ';';
-
-      // append the keyword for targeting if one was passed in
-      if (keyword !== '') {
-        requestURI += 'kw=' + encodeURIComponent(keyword) + ';';
-      }
-
-      zoneCounters[zoneID]++;
-      serverRequests.push({
-        method: 'GET',
-        url: requestURI,
-        data: {},
-        bidRequest: bidRequest
-      });
-    }
-    return serverRequests;
-  },
-
-  interpretResponse: function (serverResponse, bidRequest) {
-    const bidObj = bidRequest.bidRequest;
-    let bidResponses = [];
-    let bidResponse = {};
-    let isCorrectSize = false;
-    let isCorrectCPM = true;
-    let CPM;
-    let minCPM;
-    let maxCPM;
-    let width;
-    let height;
-
-    serverResponse = serverResponse.body;
-    if (serverResponse && serverResponse.status === 'SUCCESS' && bidObj) {
-      CPM = serverResponse.cpm;
-      minCPM = utils.getBidIdParameter('minCPM', bidObj.params);
-      maxCPM = utils.getBidIdParameter('maxCPM', bidObj.params);
-      width = parseInt(serverResponse.width);
-      height = parseInt(serverResponse.height);
-
-      // Ensure response CPM is within the given bounds
-      if (minCPM !== '' && CPM < parseFloat(minCPM)) {
-        isCorrectCPM = false;
-      }
-      if (maxCPM !== '' && CPM > parseFloat(maxCPM)) {
-        isCorrectCPM = false;
-      }
-
-      // Ensure that response ad matches one of the placement sizes.
-      utils._each(utils.deepAccess(bidObj, 'mediaTypes.banner.sizes', []), function (size) {
-        if (width === size[0] && height === size[1]) {
-          isCorrectSize = true;
-        }
-      });
-      if (isCorrectCPM && isCorrectSize) {
-        bidResponse.requestId = bidObj.bidId;
-        bidResponse.bidderCode = bidObj.bidder;
-        bidResponse.creativeId = serverResponse.placement_id;
-        bidResponse.cpm = CPM;
-        bidResponse.width = width;
-        bidResponse.height = height;
-        bidResponse.ad = serverResponse.ad_code;
-        bidResponse.ad += spec.addTrackingPixels(serverResponse.tracking_pixels);
-        bidResponse.currency = 'USD';
-        bidResponse.netRevenue = true;
-        bidResponse.ttl = config.getConfig('_bidderTimeout');
-        bidResponse.referrer = utils.deepAccess(bidObj, 'refererInfo.referer');
-        bidResponses.push(bidResponse);
-      }
-    }
-    return bidResponses;
-  },
-
-  addTrackingPixels: function (trackingPixels) {
-    let trackingPixelMarkup = '';
-    utils._each(trackingPixels, function (pixelURL) {
-      let trackingPixel = '<img height="0" width="0" border="0" style="display:none;" src="';
-      trackingPixel += pixelURL;
-      trackingPixel += '">';
-
-      trackingPixelMarkup += trackingPixel;
-    });
-    return trackingPixelMarkup;
-  }
-};
-registerBidder(spec);
diff --git a/modules/adbutlerBidAdapter.md b/modules/adbutlerBidAdapter.md
deleted file mode 100644
index 5905074270a..00000000000
--- a/modules/adbutlerBidAdapter.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Overview
-
-**Module Name**: AdButler Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**: dan@sparklit.com
-
-# Description
-
-Module that connects to an AdButler zone to fetch bids.
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'display-div',
-               sizes: [[300, 250]],  // a display size
-               bids: [
-                   {
-                       bidder: "adbutler",
-                       params: {
-                           accountID: '167283',
-                           zoneID: '210093',
-                           keyword: 'red', //optional
-                           minCPM: '1.00', //optional
-                           maxCPM: '5.00' //optional
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/addefendBidAdapter.js b/modules/addefendBidAdapter.js
new file mode 100644
index 00000000000..f0a6852b084
--- /dev/null
+++ b/modules/addefendBidAdapter.js
@@ -0,0 +1,81 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'addefend';
+
+export const spec = {
+  code: BIDDER_CODE,
+  hostname: 'https://addefend-platform.com',
+
+  getHostname() {
+    return this.hostname;
+  },
+  isBidRequestValid: function(bid) {
+    return (bid.sizes !== undefined && bid.bidId !== undefined && bid.params !== undefined &&
+              (bid.params.pageId !== undefined && (typeof bid.params.pageId === 'string')) &&
+              (bid.params.placementId !== undefined && (typeof bid.params.placementId === 'string')));
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let bid = {
+      v: $$PREBID_GLOBAL$$.version,
+      auctionId: false,
+      pageId: false,
+      gdpr_applies: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? bidderRequest.gdprConsent.gdprApplies : 'true',
+      gdpr_consent: bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : '',
+      // TODO: is 'page' the correct item here?
+      referer: bidderRequest.refererInfo.page,
+      bids: [],
+    };
+
+    for (var i = 0; i < validBidRequests.length; i++) {
+      let vb = validBidRequests[i];
+      let o = vb.params;
+      bid.auctionId = vb.auctionId;
+      o.bidId = vb.bidId;
+      o.transactionId = vb.transactionId;
+      o.sizes = [];
+      if (o.trafficTypes) {
+        bid.trafficTypes = o.trafficTypes;
+      }
+      delete o.trafficTypes;
+
+      bid.pageId = o.pageId;
+      delete o.pageId;
+
+      if (vb.sizes && Array.isArray(vb.sizes)) {
+        for (var j = 0; j < vb.sizes.length; j++) {
+          let s = vb.sizes[j];
+          if (Array.isArray(s) && s.length == 2) {
+            o.sizes.push(s[0] + 'x' + s[1]);
+          }
+        }
+      }
+      bid.bids.push(o);
+    }
+    return [{
+      method: 'POST',
+      url: this.getHostname() + '/bid',
+      options: { withCredentials: true },
+      data: bid
+    }];
+  },
+  interpretResponse: function(serverResponse, request) {
+    const requiredKeys = ['requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId', 'netRevenue', 'currency', 'advertiserDomains'];
+    const validBidResponses = [];
+    serverResponse = serverResponse.body;
+    if (serverResponse && (serverResponse.length > 0)) {
+      serverResponse.forEach((bid) => {
+        const bidResponse = {};
+        for (const requiredKey of requiredKeys) {
+          if (!bid.hasOwnProperty(requiredKey)) {
+            return [];
+          }
+          bidResponse[requiredKey] = bid[requiredKey];
+        }
+        validBidResponses.push(bidResponse);
+      });
+    }
+    return validBidResponses;
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/addefendBidAdapter.md b/modules/addefendBidAdapter.md
new file mode 100644
index 00000000000..f1ac3ff2c46
--- /dev/null
+++ b/modules/addefendBidAdapter.md
@@ -0,0 +1,43 @@
+# Overview
+
+```
+Module Name: AdDefend Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@addefend.com
+```
+
+# Description
+
+Module that connects to AdDefend as a demand source. 
+
+## Parameters
+| Param        | Description           | Optional  | Default  |
+| ------------- | ------------- | ----- | ----- |
+| pageId | id assigned to the website in the AdDefend system. (ask AdDefend support) | no | - |
+| placementId | id of the placement in the AdDefend system.  (ask AdDefend support) | no | - |
+| trafficTypes | comma seperated list of the following traffic types:<br/>ADBLOCK - user has a activated adblocker<br/>PM - user has firefox private mode activated<br/>NC - user has not given consent<br/>NONE - user traffic is none of the above, this usually means this is a "normal" user.<br/>| yes | ADBLOCK |
+
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[970, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "addefend",
+                    params: {
+                        pageId: "887",
+                        placementId: "9398",
+                        trafficTypes: "ADBLOCK"
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/adfBidAdapter.js b/modules/adfBidAdapter.js
new file mode 100644
index 00000000000..d8e598deb8f
--- /dev/null
+++ b/modules/adfBidAdapter.js
@@ -0,0 +1,325 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict';
+
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {_map, deepAccess, deepSetValue, mergeDeep, parseSizesInput} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {Renderer} from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const { getConfig } = config;
+
+const BIDDER_CODE = 'adf';
+const GVLID = 50;
+const BIDDER_ALIAS = [
+  { code: 'adformOpenRTB', gvlid: GVLID },
+  { code: 'adform', gvlid: GVLID }
+];
+const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
+const NATIVE_PARAMS = {
+  title: {
+    id: 0,
+    name: 'title'
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img'
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1
+  },
+  body: {
+    id: 4,
+    name: 'data',
+    type: 2
+  },
+  cta: {
+    id: 1,
+    type: 12,
+    name: 'data'
+  }
+};
+const OUTSTREAM_RENDERER_URL = 'https://s2.adform.net/banners/scripts/video/outstream/render.js';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: BIDDER_ALIAS,
+  gvlid: GVLID,
+  supportedMediaTypes: [ NATIVE, BANNER, VIDEO ],
+  isBidRequestValid: (bid) => {
+    const params = bid.params || {};
+    const { mid, inv, mname } = params;
+    return !!(mid || (inv && mname));
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let app, site;
+
+    const commonFpd = bidderRequest.ortb2 || {};
+    let { user } = commonFpd;
+
+    if (typeof getConfig('app') === 'object') {
+      app = getConfig('app') || {};
+      if (commonFpd.app) {
+        mergeDeep(app, commonFpd.app);
+      }
+    } else {
+      site = getConfig('site') || {};
+      if (commonFpd.site) {
+        mergeDeep(site, commonFpd.site);
+      }
+
+      if (!site.page) {
+        site.page = bidderRequest.refererInfo.page;
+      }
+    }
+
+    const device = getConfig('device') || {};
+    device.w = device.w || window.innerWidth;
+    device.h = device.h || window.innerHeight;
+    device.ua = device.ua || navigator.userAgent;
+
+    const adxDomain = setOnAny(validBidRequests, 'params.adxDomain') || 'adx.adform.net';
+
+    const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
+    const tid = bidderRequest.auctionId;
+    const test = setOnAny(validBidRequests, 'params.test');
+    const currency = getConfig('currency.adServerCurrency');
+    const cur = currency && [ currency ];
+    const eids = setOnAny(validBidRequests, 'userIdAsEids');
+    const schain = setOnAny(validBidRequests, 'schain');
+
+    const imp = validBidRequests.map((bid, id) => {
+      bid.netRevenue = pt;
+
+      const floorInfo = bid.getFloor ? bid.getFloor({
+        currency: currency || 'USD'
+      }) : {};
+      const bidfloor = floorInfo.floor;
+      const bidfloorcur = floorInfo.currency;
+      const { mid, inv, mname } = bid.params;
+
+      const imp = {
+        id: id + 1,
+        tagid: mid,
+        bidfloor,
+        bidfloorcur,
+        ext: {
+          bidder: {
+            inv,
+            mname
+          }
+        }
+      };
+
+      const assets = _map(bid.nativeParams, (bidParams, key) => {
+        const props = NATIVE_PARAMS[key];
+        const asset = {
+          required: bidParams.required & 1,
+        };
+        if (props) {
+          asset.id = props.id;
+          let wmin, hmin, w, h;
+          let aRatios = bidParams.aspect_ratios;
+
+          if (aRatios && aRatios[0]) {
+            aRatios = aRatios[0];
+            wmin = aRatios.min_width || 0;
+            hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+          }
+
+          if (bidParams.sizes) {
+            const sizes = flatten(bidParams.sizes);
+            w = sizes[0];
+            h = sizes[1];
+          }
+
+          asset[props.name] = {
+            len: bidParams.len,
+            type: props.type,
+            wmin,
+            hmin,
+            w,
+            h
+          };
+
+          return asset;
+        }
+      }).filter(Boolean);
+
+      if (assets.length) {
+        imp.native = {
+          request: {
+            assets
+          }
+        };
+      }
+
+      const bannerParams = deepAccess(bid, 'mediaTypes.banner');
+
+      if (bannerParams && bannerParams.sizes) {
+        const sizes = parseSizesInput(bannerParams.sizes);
+        const format = sizes.map(size => {
+          const [ width, height ] = size.split('x');
+          const w = parseInt(width, 10);
+          const h = parseInt(height, 10);
+          return { w, h };
+        });
+
+        imp.banner = {
+          format
+        };
+      }
+
+      const videoParams = deepAccess(bid, 'mediaTypes.video');
+      if (videoParams) {
+        imp.video = videoParams;
+      }
+
+      return imp;
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site,
+      app,
+      user,
+      device,
+      source: { tid, fd: 1 },
+      ext: { pt },
+      cur,
+      imp
+    };
+
+    if (test) {
+      request.is_debug = !!test;
+      request.test = 1;
+    }
+
+    if (config.getConfig('coppa')) {
+      deepSetValue(request, 'regs.coppa', 1);
+    }
+
+    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
+      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1);
+    }
+
+    if (bidderRequest.uspConsent) {
+      deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    if (eids) {
+      deepSetValue(request, 'user.ext.eids', eids);
+    }
+
+    if (schain) {
+      deepSetValue(request, 'source.ext.schain', schain);
+    }
+
+    return {
+      method: 'POST',
+      url: 'https://' + adxDomain + '/adx/openrtb',
+      data: JSON.stringify(request),
+      bids: validBidRequests
+    };
+  },
+  interpretResponse: function(serverResponse, { bids }) {
+    if (!serverResponse.body) {
+      return;
+    }
+    const { seatbid, cur } = serverResponse.body;
+
+    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
+      result[bid.impid - 1] = bid;
+      return result;
+    }, []);
+
+    return bids.map((bid, id) => {
+      const bidResponse = bidResponses[id];
+      if (bidResponse) {
+        const mediaType = deepAccess(bidResponse, 'ext.prebid.type');
+        const result = {
+          requestId: bid.bidId,
+          cpm: bidResponse.price,
+          creativeId: bidResponse.crid,
+          ttl: 360,
+          netRevenue: bid.netRevenue === 'net',
+          currency: cur,
+          mediaType,
+          width: bidResponse.w,
+          height: bidResponse.h,
+          dealId: bidResponse.dealid,
+          meta: {
+            mediaType,
+            advertiserDomains: bidResponse.adomain
+          }
+        };
+
+        if (bidResponse.native) {
+          result.native = parseNative(bidResponse);
+        } else {
+          result[ mediaType === VIDEO ? 'vastXml' : 'ad' ] = bidResponse.adm;
+        }
+
+        if (!bid.renderer && mediaType === VIDEO && deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
+          result.renderer = Renderer.install({id: bid.bidId, url: OUTSTREAM_RENDERER_URL, adUnitCode: bid.adUnitCode});
+          result.renderer.setRender(renderer);
+        }
+
+        return result;
+      }
+    }).filter(Boolean);
+  }
+};
+
+registerBidder(spec);
+
+function parseNative(bid) {
+  const { assets, link, imptrackers, jstracker } = bid.native;
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined,
+    impressionTrackers: imptrackers || undefined,
+    javascriptTrackers: jstracker ? [ jstracker ] : undefined
+  };
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+
+  return result;
+}
+
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function flatten(arr) {
+  return [].concat(...arr);
+}
+
+function renderer(bid) {
+  bid.renderer.push(() => {
+    window.Adform.renderOutstream(bid);
+  });
+}
diff --git a/modules/adfBidAdapter.md b/modules/adfBidAdapter.md
new file mode 100644
index 00000000000..10264e6f486
--- /dev/null
+++ b/modules/adfBidAdapter.md
@@ -0,0 +1,76 @@
+# Overview
+
+Module Name: Adf Adapter
+Module Type: Bidder Adapter
+Maintainer: Scope.FL.Scripts@adform.com
+
+# Description
+
+Module that connects to Adform demand sources to fetch bids.
+Banner, video and native formats are supported. Using OpenRTB standard. Previous adapter name - adformOpenRTB.
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: '/19968336/prebid_native_example_1',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: false,
+                    sizes: [100, 50]
+                },
+                title: {
+                    required: false,
+                    len: 140
+                },
+                sponsoredBy: {
+                    required: false
+                },
+                clickUrl: {
+                    required: false
+                },
+                body: {
+                    required: false
+                },
+                icon: {
+                    required: false,
+                    sizes: [50, 50]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'adf',
+            params: {
+                mid: 606169,                 // required
+                adxDomain: 'adx.adform.net'  // optional
+            }
+        }]
+    }, {
+        code: '/19968336/prebid_banner_example_1',
+        mediaTypes: {
+            banner: {
+                sizes: [[ 300, 250 ]]
+            }
+        }
+        bids: [{
+            bidder: 'adf',
+            params: {
+                mid: 1038466
+            }
+        }]
+    }, {
+        code: '/19968336/prebid_video_example_1',
+        mediaTypes: {
+            video: {
+                context: 'outstream',
+                mimes: ['video/mp4']
+            }
+        }
+        bids: [{
+            bidder: 'adf',
+            params: {
+                mid: 822732
+            }
+        }]
+    }];
+```
diff --git a/modules/adfinityBidAdapter.js b/modules/adfinityBidAdapter.js
deleted file mode 100644
index ebf1198fba2..00000000000
--- a/modules/adfinityBidAdapter.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-
-const BIDDER_CODE = 'adfinity';
-const AD_URL = 'https://stat.adfinity.pro/?c=o&m=multi';
-const SYNC_URL = 'https://stat.adfinity.pro/?c=o&m=cookie'
-
-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:
-      const n = bid.native
-      return Boolean(n) && Boolean(n.title) && Boolean(n.body) && Boolean(n.image) && Boolean(n.impression_trackers);
-    default:
-      return false;
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(bid.params.placement_id));
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: (validBidRequests, bidderRequest) => {
-    let winTop = window;
-    let location;
-    try {
-      location = new URL(bidderRequest.refererInfo.referer)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      utils.logMessage(e);
-    };
-    let placements = [];
-    let request = {
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language : '',
-      'secure': 1,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements
-    };
-
-    if (bidderRequest) {
-      if (bidderRequest.gdprConsent) {
-        request.gdpr_consent = bidderRequest.gdprConsent.consentString || 'ALL'
-        request.gdpr_require = bidderRequest.gdprConsent.gdprApplies ? 1 : 0
-      }
-    }
-
-    for (let i = 0; i < validBidRequests.length; i++) {
-      let bid = validBidRequests[i];
-      let traff = bid.params.traffic || BANNER
-      let placement = {
-        placementId: bid.params.placement_id,
-        bidId: bid.bidId,
-        sizes: bid.mediaTypes[traff].sizes,
-        traffic: traff
-      };
-      if (bid.schain) {
-        placement.schain = bid.schain;
-      }
-      placements.push(placement);
-    }
-    return {
-      method: 'POST',
-      url: AD_URL,
-      data: request
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: (serverResponse) => {
-    let response = [];
-    try {
-      serverResponse = serverResponse.body;
-      for (let i = 0; i < serverResponse.length; i++) {
-        let resItem = serverResponse[i];
-        if (isBidResponseValid(resItem)) {
-          response.push(resItem);
-        }
-      }
-    } catch (e) {
-      utils.logMessage(e);
-    };
-    return response;
-  },
-
-  getUserSyncs: () => {
-    return [{
-      type: 'image',
-      url: SYNC_URL
-    }];
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/adfinityBidAdapter.md b/modules/adfinityBidAdapter.md
deleted file mode 100644
index f67d4fddfe7..00000000000
--- a/modules/adfinityBidAdapter.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Overview
-
-```
-Module Name: Adfinity Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: adfinity_prebid@i.ua
-```
-
-# Description
-
-Module that connects to Adfinity demand sources
-
-# Test Parameters
-```
-    var adUnits = [
-                {
-                    code: 'placementid_0',
-                    mediaTypes: {
-                        banner: {
-                            sizes: [[300, 250], [300,600]]
-                        }
-                    },
-                    bids: [{
-                            bidder: 'adfinity',
-                            params: {
-                                placement_id: 0,
-                                traffic: 'banner'
-                            }
-                        }
-                    ]
-                },
-                {
-                    code: 'placementid_0',
-                    mediaTypes: {
-                        native: {
-                            
-                        }
-                    },
-                    bids: [
-                        {
-                            bidder: 'adfinity',
-                            params: {
-                                placement_id: 0,
-                                traffic: 'native'
-                            }
-                        }
-                    ]
-                },
-                {
-                    code: 'placementid_0',
-                    mediaTypes: {
-                        video: {
-                            sizes: [[300, 250], [300,600]]
-                        }
-                    },
-                    bids: [
-                        {
-                            bidder: 'adfinity',
-                            params: {
-                                placement_id: 0,
-                                traffic: 'video'
-                            }
-                        }
-                    ]
-                }
-            ];
-```
\ No newline at end of file
diff --git a/modules/adformBidAdapter.js b/modules/adformBidAdapter.js
deleted file mode 100644
index 48000e082b2..00000000000
--- a/modules/adformBidAdapter.js
+++ /dev/null
@@ -1,186 +0,0 @@
-'use strict';
-
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { Renderer } from '../src/Renderer.js';
-import * as utils from '../src/utils.js';
-
-const OUTSTREAM_RENDERER_URL = 'https://s2.adform.net/banners/scripts/video/outstream/render.js';
-
-const BIDDER_CODE = 'adform';
-const GVLID = 50;
-export const spec = {
-  code: BIDDER_CODE,
-  gvlid: GVLID,
-  supportedMediaTypes: [ BANNER, VIDEO ],
-  isBidRequestValid: function (bid) {
-    return !!(bid.params.mid);
-  },
-  buildRequests: function (validBidRequests, bidderRequest) {
-    var i, l, j, k, bid, _key, _value, reqParams, netRevenue, gdprObject;
-    const currency = config.getConfig('currency.adServerCurrency');
-    const eids = getEncodedEIDs(utils.deepAccess(validBidRequests, '0.userIdAsEids'));
-
-    var request = [];
-    var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], [ 'fd', 1 ], [ 'url', null ], [ 'tid', null ] ];
-    var bids = JSON.parse(JSON.stringify(validBidRequests));
-    var bidder = (bids[0] && bids[0].bidder) || BIDDER_CODE;
-    for (i = 0, l = bids.length; i < l; i++) {
-      bid = bids[i];
-      if ((bid.params.priceType === 'net') || (bid.params.pt === 'net')) {
-        netRevenue = 'net';
-      }
-      for (j = 0, k = globalParams.length; j < k; j++) {
-        _key = globalParams[j][0];
-        _value = bid[_key] || bid.params[_key];
-        if (_value) {
-          bid[_key] = bid.params[_key] = null;
-          globalParams[j][1] = _value;
-        }
-      }
-      reqParams = bid.params;
-      reqParams.transactionId = bid.transactionId;
-      reqParams.rcur = reqParams.rcur || currency;
-      request.push(formRequestUrl(reqParams));
-    }
-
-    request.unshift('https://' + globalParams[0][1] + '/adx/?rp=4');
-    netRevenue = netRevenue || 'gross';
-    request.push('pt=' + netRevenue);
-    request.push('stid=' + validBidRequests[0].auctionId);
-
-    const gdprApplies = utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
-    const consentString = utils.deepAccess(bidderRequest, 'gdprConsent.consentString');
-    if (gdprApplies !== undefined) {
-      gdprObject = {
-        gdpr: gdprApplies,
-        gdpr_consent: consentString
-      };
-      request.push('gdpr=' + (gdprApplies & 1));
-      request.push('gdpr_consent=' + consentString);
-    }
-
-    if (bidderRequest && bidderRequest.uspConsent) {
-      request.push('us_privacy=' + bidderRequest.uspConsent);
-    }
-
-    if (eids) {
-      request.push('eids=' + eids);
-    }
-
-    for (i = 1, l = globalParams.length; i < l; i++) {
-      _key = globalParams[i][0];
-      _value = globalParams[i][1];
-      if (_value) {
-        request.push(_key + '=' + encodeURIComponent(_value));
-      }
-    }
-
-    return {
-      method: 'GET',
-      url: request.join('&'),
-      bids: validBidRequests,
-      netRevenue: netRevenue,
-      bidder,
-      gdpr: gdprObject
-    };
-
-    function formRequestUrl(reqData) {
-      var key;
-      var url = [];
-
-      for (key in reqData) {
-        if (reqData.hasOwnProperty(key) && reqData[key]) { url.push(key, '=', reqData[key], '&'); }
-      }
-
-      return encodeURIComponent(btoa(url.join('').slice(0, -1)));
-    }
-
-    function getEncodedEIDs(eids) {
-      if (utils.isArray(eids) && eids.length > 0) {
-        const parsed = parseEIDs(eids);
-        return encodeURIComponent(btoa(JSON.stringify(parsed)));
-      }
-    }
-
-    function parseEIDs(eids) {
-      return eids.reduce((result, eid) => {
-        const source = eid.source;
-        result[source] = result[source] || {};
-
-        eid.uids.forEach(value => {
-          const id = value.id + '';
-          result[source][id] = result[source][id] || [];
-          result[source][id].push(value.atype);
-        });
-
-        return result;
-      }, {});
-    }
-  },
-  interpretResponse: function (serverResponse, bidRequest) {
-    const VALID_RESPONSES = {
-      banner: 1,
-      vast_content: 1,
-      vast_url: 1
-    };
-    var bidObject, response, bid, type;
-    var bidRespones = [];
-    var bids = bidRequest.bids;
-    var responses = serverResponse.body;
-    for (var i = 0; i < responses.length; i++) {
-      response = responses[i];
-      type = response.response === 'banner' ? BANNER : VIDEO;
-      bid = bids[i];
-      if (VALID_RESPONSES[response.response] && (verifySize(response, utils.getAdUnitSizes(bid)) || type === VIDEO)) {
-        bidObject = {
-          requestId: bid.bidId,
-          cpm: response.win_bid,
-          width: response.width,
-          height: response.height,
-          creativeId: bid.bidId,
-          dealId: response.deal_id,
-          currency: response.win_cur,
-          netRevenue: bidRequest.netRevenue !== 'gross',
-          ttl: 360,
-          ad: response.banner,
-          bidderCode: bidRequest.bidder,
-          transactionId: bid.transactionId,
-          vastUrl: response.vast_url,
-          vastXml: response.vast_content,
-          mediaType: type
-        };
-
-        if (!bid.renderer && type === VIDEO && utils.deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
-          bidObject.renderer = Renderer.install({id: bid.bidId, url: OUTSTREAM_RENDERER_URL});
-          bidObject.renderer.setRender(renderer);
-        }
-
-        if (bidRequest.gdpr) {
-          bidObject.gdpr = bidRequest.gdpr.gdpr;
-          bidObject.gdpr_consent = bidRequest.gdpr.gdpr_consent;
-        }
-        bidRespones.push(bidObject);
-      }
-    }
-    return bidRespones;
-
-    function renderer(bid) {
-      bid.renderer.push(() => {
-        window.Adform.renderOutstream(bid);
-      });
-    }
-
-    function verifySize(adItem, validSizes) {
-      for (var j = 0, k = validSizes.length; j < k; j++) {
-        if (adItem.width == validSizes[j][0] &&
-            adItem.height == validSizes[j][1]) {
-          return true;
-        }
-      }
-      return false;
-    }
-  }
-};
-registerBidder(spec);
diff --git a/modules/adformBidAdapter.md b/modules/adformBidAdapter.md
deleted file mode 100644
index 10ebec37e08..00000000000
--- a/modules/adformBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-Module Name: Adform Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: Scope.FL.Scripts@adform.com
-
-# Description
-
-Module that connects to Adform demand sources to fetch bids.
-Banner and video formats are supported.
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'div-gpt-ad-1460505748561-0',
-               sizes: [[300, 250], [250, 300], [300, 600], [600, 300]],  // a display size
-               bids: [
-                   {
-                       bidder: "adform",
-                       params: {
-                           adxDomain: 'adx.adform.net', //optional
-                           mid: '292063',
-                           priceType: 'net' // default is 'gross'
-                       }
-                   }
-               ]
-           },
-       ];
-```
diff --git a/modules/adformOpenRTBBidAdapter.js b/modules/adformOpenRTBBidAdapter.js
deleted file mode 100644
index 3270fb5865a..00000000000
--- a/modules/adformOpenRTBBidAdapter.js
+++ /dev/null
@@ -1,213 +0,0 @@
-// jshint esversion: 6, es3: false, node: true
-'use strict';
-
-import {
-  registerBidder
-} from '../src/adapters/bidderFactory.js';
-import {
-  NATIVE
-} from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-
-const BIDDER_CODE = 'adformOpenRTB';
-const GVLID = 50;
-const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
-const NATIVE_PARAMS = {
-  title: {
-    id: 0,
-    name: 'title'
-  },
-  icon: {
-    id: 2,
-    type: 1,
-    name: 'img'
-  },
-  image: {
-    id: 3,
-    type: 3,
-    name: 'img'
-  },
-  sponsoredBy: {
-    id: 5,
-    name: 'data',
-    type: 1
-  },
-  body: {
-    id: 4,
-    name: 'data',
-    type: 2
-  },
-  cta: {
-    id: 1,
-    type: 12,
-    name: 'data'
-  }
-};
-
-export const spec = {
-  code: BIDDER_CODE,
-  gvlid: GVLID,
-  supportedMediaTypes: [ NATIVE ],
-  isBidRequestValid: bid => !!bid.params.mid,
-  buildRequests: (validBidRequests, bidderRequest) => {
-    const page = bidderRequest.refererInfo.referer;
-    const adxDomain = setOnAny(validBidRequests, 'params.adxDomain') || 'adx.adform.net';
-    const ua = navigator.userAgent;
-    const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
-    const tid = validBidRequests[0].transactionId; // ??? check with ssp
-    const test = setOnAny(validBidRequests, 'params.test');
-    const publisher = setOnAny(validBidRequests, 'params.publisher');
-    const siteId = setOnAny(validBidRequests, 'params.siteId');
-    const currency = config.getConfig('currency.adServerCurrency');
-    const cur = currency && [ currency ];
-    const eids = setOnAny(validBidRequests, 'userIdAsEids');
-
-    const imp = validBidRequests.map((bid, id) => {
-      bid.netRevenue = pt;
-      const assets = utils._map(bid.nativeParams, (bidParams, key) => {
-        const props = NATIVE_PARAMS[key];
-        const asset = {
-          required: bidParams.required & 1,
-        };
-        if (props) {
-          asset.id = props.id;
-          let wmin, hmin, w, h;
-          let aRatios = bidParams.aspect_ratios;
-
-          if (aRatios && aRatios[0]) {
-            aRatios = aRatios[0];
-            wmin = aRatios.min_width || 0;
-            hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
-          }
-
-          if (bidParams.sizes) {
-            const sizes = flatten(bidParams.sizes);
-            w = sizes[0];
-            h = sizes[1];
-          }
-
-          asset[props.name] = {
-            len: bidParams.len,
-            type: props.type,
-            wmin,
-            hmin,
-            w,
-            h
-          };
-
-          return asset;
-        }
-      }).filter(Boolean);
-
-      return {
-        id: id + 1,
-        tagid: bid.params.mid,
-        native: {
-          request: {
-            assets
-          }
-        }
-      };
-    });
-
-    const request = {
-      id: bidderRequest.auctionId,
-      site: { id: siteId, page, publisher },
-      device: { ua },
-      source: { tid, fd: 1 },
-      ext: { pt },
-      cur,
-      imp
-    };
-
-    if (test) {
-      request.is_debug = !!test;
-      request.test = 1;
-    }
-    if (utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
-      request.user = { ext: { consent: bidderRequest.gdprConsent.consentString } };
-      request.regs = { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies & 1 } };
-    }
-
-    if (bidderRequest.uspConsent) {
-      utils.deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-    }
-
-    if (eids) {
-      utils.deepSetValue(request, 'user.ext.eids', eids);
-    }
-
-    return {
-      method: 'POST',
-      url: 'https://' + adxDomain + '/adx/openrtb',
-      data: JSON.stringify(request),
-      options: {
-        contentType: 'application/json'
-      },
-      bids: validBidRequests
-    };
-  },
-  interpretResponse: function(serverResponse, { bids }) {
-    if (!serverResponse.body) {
-      return;
-    }
-    const { seatbid, cur } = serverResponse.body;
-
-    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
-      result[bid.impid - 1] = bid;
-      return result;
-    }, []);
-
-    return bids.map((bid, id) => {
-      const bidResponse = bidResponses[id];
-      if (bidResponse) {
-        return {
-          requestId: bid.bidId,
-          cpm: bidResponse.price,
-          creativeId: bidResponse.crid,
-          ttl: 360,
-          netRevenue: bid.netRevenue === 'net',
-          currency: cur,
-          mediaType: NATIVE,
-          bidderCode: BIDDER_CODE,
-          native: parseNative(bidResponse)
-        };
-      }
-    }).filter(Boolean);
-  }
-};
-
-registerBidder(spec);
-
-function parseNative(bid) {
-  const { assets, link, imptrackers, jstracker } = bid.native;
-  const result = {
-    clickUrl: link.url,
-    clickTrackers: link.clicktrackers || undefined,
-    impressionTrackers: imptrackers || undefined,
-    javascriptTrackers: jstracker ? [ jstracker ] : undefined
-  };
-  assets.forEach(asset => {
-    const kind = NATIVE_ASSET_IDS[asset.id];
-    const content = kind && asset[NATIVE_PARAMS[kind].name];
-    if (content) {
-      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
-    }
-  });
-
-  return result;
-}
-
-function setOnAny(collection, key) {
-  for (let i = 0, result; i < collection.length; i++) {
-    result = utils.deepAccess(collection[i], key);
-    if (result) {
-      return result;
-    }
-  }
-}
-
-function flatten(arr) {
-  return [].concat(...arr);
-}
diff --git a/modules/adformOpenRTBBidAdapter.md b/modules/adformOpenRTBBidAdapter.md
deleted file mode 100644
index 0dd98ad07b8..00000000000
--- a/modules/adformOpenRTBBidAdapter.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Overview
-
-Module Name: Adform OpenRTB Adapter
-Module Type: Bidder Adapter
-Maintainer: Scope.FL.Scripts@adform.com
-
-# Description
-
-Module that connects to Adform demand sources to fetch bids.
-Only native format is supported. Using OpenRTB standard.
-
-# Test Parameters
-```
-    var adUnits = [
-        code: '/19968336/prebid_native_example_1',
-        sizes: [
-            [360, 360]
-        ],
-        mediaTypes: {
-            native: {
-                image: {
-                    required: false,
-                    sizes: [100, 50]
-                },
-                title: {
-                    required: false,
-                    len: 140
-                },
-                sponsoredBy: {
-                    required: false
-                },
-                clickUrl: {
-                    required: false
-                },
-                body: {
-                    required: false
-                },
-                icon: {
-                    required: false,
-                    sizes: [50, 50]
-                }
-            }
-        },
-        bids: [{
-            bidder: 'adformOpenRTB',
-            params: {
-                mid: 606169,                  // required
-                adxDomain: 'adx.adform.net',  // optional
-                siteId: '23455',              // optional
-                priceType: 'gross'            // optional, default is 'net'
-                publisher: {                  // optional block
-                  id: "2706",
-                  name: "Publishers Name",
-                  domain: "publisher.com"
-                }
-            }
-        }]
-    ];
-```
diff --git a/modules/adgenerationBidAdapter.js b/modules/adgenerationBidAdapter.js
index 7f92ab483f6..0e4e9ef6805 100644
--- a/modules/adgenerationBidAdapter.js
+++ b/modules/adgenerationBidAdapter.js
@@ -1,7 +1,9 @@
-import * as utils from '../src/utils.js';
+import {tryAppendQueryString, getBidIdParameter, escapeUnsafeChars} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
 const ADG_BIDDER_CODE = 'adgeneration';
 
 export const spec = {
@@ -24,31 +26,47 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    const ADGENE_PREBID_VERSION = '1.0.1';
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const ADGENE_PREBID_VERSION = '1.4.0';
     let serverRequests = [];
     for (let i = 0, len = validBidRequests.length; i < len; i++) {
       const validReq = validBidRequests[i];
       const DEBUG_URL = 'https://api-test.scaleout.jp/adsv/v1';
       const URL = 'https://d.socdm.com/adsv/v1';
       const url = validReq.params.debug ? DEBUG_URL : URL;
+      const criteoId = getCriteoId(validReq);
+      const id5id = getId5Id(validReq);
+      const id5LinkType = getId5LinkType(validReq);
       let data = ``;
-      data = utils.tryAppendQueryString(data, 'posall', 'SSPLOC');
-      const id = utils.getBidIdParameter('id', validReq.params);
-      data = utils.tryAppendQueryString(data, 'id', id);
-      data = utils.tryAppendQueryString(data, 'sdktype', '0');
-      data = utils.tryAppendQueryString(data, 'hb', 'true');
-      data = utils.tryAppendQueryString(data, 't', 'json3');
-      data = utils.tryAppendQueryString(data, 'transactionid', validReq.transactionId);
-      data = utils.tryAppendQueryString(data, 'sizes', getSizes(validReq));
-      data = utils.tryAppendQueryString(data, 'currency', getCurrencyType());
-      data = utils.tryAppendQueryString(data, 'pbver', '$prebid.version$');
-      data = utils.tryAppendQueryString(data, 'sdkname', 'prebidjs');
-      data = utils.tryAppendQueryString(data, 'adapterver', ADGENE_PREBID_VERSION);
+      data = tryAppendQueryString(data, 'posall', 'SSPLOC');
+      const id = getBidIdParameter('id', validReq.params);
+      data = tryAppendQueryString(data, 'id', id);
+      data = tryAppendQueryString(data, 'sdktype', '0');
+      data = tryAppendQueryString(data, 'hb', 'true');
+      data = tryAppendQueryString(data, 't', 'json3');
+      data = tryAppendQueryString(data, 'transactionid', validReq.transactionId);
+      data = tryAppendQueryString(data, 'sizes', getSizes(validReq));
+      data = tryAppendQueryString(data, 'currency', getCurrencyType());
+      data = tryAppendQueryString(data, 'pbver', '$prebid.version$');
+      data = tryAppendQueryString(data, 'sdkname', 'prebidjs');
+      data = tryAppendQueryString(data, 'adapterver', ADGENE_PREBID_VERSION);
+      data = tryAppendQueryString(data, 'adgext_criteo_id', criteoId);
+      data = tryAppendQueryString(data, 'adgext_id5_id', id5id);
+      data = tryAppendQueryString(data, 'adgext_id5_id_link_type', id5LinkType);
       // native以外にvideo等の対応が入った場合は要修正
       if (!validReq.mediaTypes || !validReq.mediaTypes.native) {
-        data = utils.tryAppendQueryString(data, 'imark', '1');
+        data = tryAppendQueryString(data, 'imark', '1');
+      }
+
+      // TODO: is 'page' the right value here?
+      data = tryAppendQueryString(data, 'tp', bidderRequest.refererInfo.page);
+      if (isIos()) {
+        const hyperId = getHyperId(validReq);
+        if (hyperId != null) {
+          data = tryAppendQueryString(data, 'hyper_id', hyperId);
+        }
       }
-      data = utils.tryAppendQueryString(data, 'tp', bidderRequest.refererInfo.referer);
       // remove the trailing "&"
       if (data.lastIndexOf('&') === data.length - 1) {
         data = data.substring(0, data.length - 1);
@@ -86,6 +104,11 @@ export const spec = {
       netRevenue: true,
       ttl: body.ttl || 10,
     };
+    if (body.adomain && Array.isArray(body.adomain) && body.adomain.length) {
+      bidResponse.meta = {
+        advertiserDomains: body.adomain
+      }
+    }
     if (isNative(body)) {
       bidResponse.native = createNativeAd(body);
       bidResponse.mediaType = NATIVE;
@@ -112,13 +135,25 @@ export const spec = {
 function createAd(body, bidRequest) {
   let ad = body.ad;
   if (body.vastxml && body.vastxml.length > 0) {
-    ad = `<body><div id="apvad-${bidRequest.bidId}"></div>${createAPVTag()}${insertVASTMethod(bidRequest.bidId, body.vastxml)}</body>`;
+    if (isUpperBillboard(body)) {
+      const marginTop = bidRequest.params.marginTop ? bidRequest.params.marginTop : '0';
+      ad = `<body>${createADGBrowserMTag()}${insertVASTMethodForADGBrowserM(body.vastxml, marginTop)}</body>`;
+    } else {
+      ad = `<body><div id="apvad-${bidRequest.bidId}"></div>${createAPVTag()}${insertVASTMethodForAPV(bidRequest.bidId, body.vastxml)}</body>`;
+    }
   }
   ad = appendChildToBody(ad, body.beacon);
   if (removeWrapper(ad)) return removeWrapper(ad);
   return ad;
 }
 
+function isUpperBillboard(body) {
+  if (body.location_params && body.location_params.option && body.location_params.option.ad_type) {
+    return body.location_params.option.ad_type === 'upper_billboard';
+  }
+  return false;
+}
+
 function isNative(body) {
   if (!body) return false;
   return body.native_ad && body.native_ad.assets.length > 0;
@@ -165,7 +200,7 @@ function createNativeAd(body) {
     native.clickTrackers = body.native_ad.link.clicktrackers || [];
     native.impressionTrackers = body.native_ad.imptrackers || [];
     if (body.beaconurl && body.beaconurl != '') {
-      native.impressionTrackers.push(body.beaconurl)
+      native.impressionTrackers.push(body.beaconurl);
     }
   }
   return native;
@@ -184,13 +219,25 @@ function createAPVTag() {
   return apvScript.outerHTML;
 }
 
-function insertVASTMethod(targetId, vastXml) {
+function createADGBrowserMTag() {
+  const ADGBrowserMURL = 'https://i.socdm.com/sdk/js/adg-browser-m.js';
+  return `<script type="text/javascript" src="${ADGBrowserMURL}"></script>`;
+}
+
+function insertVASTMethodForAPV(targetId, vastXml) {
   let apvVideoAdParam = {
     s: targetId
   };
   let script = document.createElement(`script`);
   script.type = 'text/javascript';
-  script.innerHTML = `(function(){ new APV.VideoAd(${JSON.stringify(apvVideoAdParam)}).load('${vastXml.replace(/\r?\n/g, '')}'); })();`;
+  script.innerHTML = `(function(){ new APV.VideoAd(${escapeUnsafeChars(JSON.stringify(apvVideoAdParam))}).load('${vastXml.replace(/\r?\n/g, '')}'); })();`;
+  return script.outerHTML;
+}
+
+function insertVASTMethodForADGBrowserM(vastXml, marginTop) {
+  const script = document.createElement(`script`);
+  script.type = 'text/javascript';
+  script.innerHTML = `window.ADGBrowserM.init({vastXml: '${vastXml.replace(/\r?\n/g, '')}', marginTop: '${marginTop}'});`;
   return script.outerHTML;
 }
 
@@ -233,4 +280,36 @@ function getCurrencyType() {
   return 'JPY';
 }
 
+/**
+ *
+ * @param validReq request
+ * @return {null|string}
+ */
+function getCriteoId(validReq) {
+  return (validReq.userId && validReq.userId.criteoId) ? validReq.userId.criteoId : null
+}
+
+function getId5Id(validReq) {
+  return validId5(validReq) ? validReq.userId.id5id.uid : null
+}
+
+function getId5LinkType(validReq) {
+  return validId5(validReq) ? validReq.userId.id5id.ext.linkType : null
+}
+
+function validId5(validReq) {
+  return validReq.userId && validReq.userId.id5id && validReq.userId.id5id.uid && validReq.userId.id5id.ext.linkType
+}
+
+function getHyperId(validReq) {
+  if (validReq.userId && validReq.userId.novatiq && validReq.userId.novatiq.snowflake.syncResponse === 1) {
+    return validReq.userId.novatiq.snowflake.id;
+  }
+  return null;
+}
+
+function isIos() {
+  return (/(ios|ipod|ipad|iphone)/i).test(window.navigator.userAgent);
+}
+
 registerBidder(spec);
diff --git a/modules/adglareBidAdapter.js b/modules/adglareBidAdapter.js
deleted file mode 100644
index d66a38482ec..00000000000
--- a/modules/adglareBidAdapter.js
+++ /dev/null
@@ -1,90 +0,0 @@
-'use strict';
-
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'adglare';
-
-export const spec = {
-  code: BIDDER_CODE,
-  isBidRequestValid: function (bid) {
-    let p = bid.params;
-    if (typeof p.domain === 'string' && !!p.domain.length && p.zID && !isNaN(p.zID) && p.type == 'banner') return true;
-    return false;
-  },
-  buildRequests: function (validBidRequests, bidderRequest) {
-    let i;
-    let j;
-    let bidRequest;
-    let zID;
-    let domain;
-    let keywords;
-    let url;
-    let type;
-    let availscreen = window.innerWidth + 'x' + window.innerHeight;
-    let pixelRatio = window.devicePixelRatio || 1;
-    let screen = (pixelRatio * window.screen.width) + 'x' + (pixelRatio * window.screen.height);
-    let sizes = [];
-    let serverRequests = [];
-    let timeout = bidderRequest.timeout || 0;
-    let referer = bidderRequest.refererInfo.referer || '';
-    let reachedtop = bidderRequest.refererInfo.reachedTop || '';
-    for (i = 0; i < validBidRequests.length; i++) {
-      bidRequest = validBidRequests[i];
-      zID = bidRequest.params.zID;
-      domain = bidRequest.params.domain;
-      keywords = bidRequest.params.keywords || '';
-      type = bidRequest.params.type;
-
-      // Build ad unit sizes
-      if (bidRequest.mediaTypes && bidRequest.mediaTypes[type]) {
-        for (j in bidRequest.mediaTypes[type].sizes) {
-          sizes.push(bidRequest.mediaTypes[type].sizes[j].join('x'));
-        }
-      }
-
-      // Build URL
-      url = 'https://' + domain + '/?' + encodeURIComponent(zID) + '&pbjs&pbjs_version=1';
-      url += '&pbjs_type=' + encodeURIComponent(type);
-      url += '&pbjs_timeout=' + encodeURIComponent(timeout);
-      url += '&pbjs_reachedtop=' + encodeURIComponent(reachedtop);
-      url += '&sizes=' + encodeURIComponent(sizes.join(','));
-      url += '&screen=' + encodeURIComponent(screen);
-      url += '&availscreen=' + encodeURIComponent(availscreen);
-      url += '&referer=' + encodeURIComponent(referer);
-      if (keywords !== '') {
-        url += '&keywords=' + encodeURIComponent(keywords);
-      }
-
-      // Push server request
-      serverRequests.push({
-        method: 'GET',
-        url: url,
-        data: {},
-        bidRequest: bidRequest
-      });
-    }
-    return serverRequests;
-  },
-  interpretResponse: function (serverResponse, request) {
-    const bidObj = request.bidRequest;
-    let bidResponses = [];
-    let bidResponse = {};
-    serverResponse = serverResponse.body;
-
-    if (serverResponse && serverResponse.status == 'OK' && bidObj) {
-      bidResponse.requestId = bidObj.bidId;
-      bidResponse.bidderCode = bidObj.bidder;
-      bidResponse.cpm = serverResponse.cpm;
-      bidResponse.width = serverResponse.width;
-      bidResponse.height = serverResponse.height;
-      bidResponse.ad = serverResponse.adhtml;
-      bidResponse.ttl = serverResponse.ttl;
-      bidResponse.creativeId = serverResponse.crID;
-      bidResponse.netRevenue = true;
-      bidResponse.currency = serverResponse.currency;
-      bidResponses.push(bidResponse);
-    }
-    return bidResponses;
-  },
-};
-registerBidder(spec);
diff --git a/modules/adglareBidAdapter.md b/modules/adglareBidAdapter.md
deleted file mode 100644
index 845564473c7..00000000000
--- a/modules/adglareBidAdapter.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Overview
-
-```
-Module Name: AdGlare Ad Server Adapter
-Module Type: Bidder Adapter
-Maintainer: prebid@adglare.com
-```
-
-# Description
-
-Adapter that connects to your AdGlare Ad Server.
-Including support for your white label ad serving domain.
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: 'your-div-id',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300,250], [728,90]],
-                }
-            },
-            bids: [
-               {
-                   bidder: 'adglare',
-                   params: {
-                        domain: 'try.engine.adglare.net',
-                        zID: '475579334',
-                        type: 'banner'
-                   }
-               }
-           ]
-        }
-    ];
-```
diff --git a/modules/adhashBidAdapter.js b/modules/adhashBidAdapter.js
new file mode 100644
index 00000000000..33a85a81525
--- /dev/null
+++ b/modules/adhashBidAdapter.js
@@ -0,0 +1,269 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { includes } from '../src/polyfill.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const VERSION = '3.2';
+const BAD_WORD_STEP = 0.1;
+const BAD_WORD_MIN = 0.2;
+const ADHASH_BIDDER_CODE = 'adhash';
+
+/**
+ * Function that checks the page where the ads are being served for brand safety.
+ * If unsafe words are found the scoring of that page increases.
+ * If it becomes greater than the maximum allowed score false is returned.
+ * The rules may vary based on the website language or the publisher.
+ * The AdHash bidder will not bid on unsafe pages (according to 4A's).
+ * @param badWords list of scoring rules to chech against
+ * @param maxScore maximum allowed score for that bidding
+ * @returns boolean flag is the page safe
+ */
+function brandSafety(badWords, maxScore) {
+  /**
+   * Performs the ROT13 encoding on the string argument and returns the resulting string.
+   * The Adhash bidder uses ROT13 so that the response is not blocked by:
+   *  - ad blocking software
+   *  - parental control software
+   *  - corporate firewalls
+   * due to the bad words contained in the response.
+   * @param value The input string.
+   * @returns string Returns the ROT13 version of the given string.
+   */
+  const rot13 = value => {
+    const input = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+    const output = 'NOPQRSTUVWXYZABCDEFGHIJKLMnopqrstuvwxyzabcdefghijklm';
+    const index = x => input.indexOf(x);
+    const translate = x => index(x) > -1 ? output[index(x)] : x;
+    return value.split('').map(translate).join('');
+  };
+
+  /**
+   * Calculates the scoring for each bad word with dimishing returns
+   * @param {integer} points points that this word costs
+   * @param {integer} occurances number of occurances
+   * @returns {float} final score
+   */
+  const scoreCalculator = (points, occurances) => {
+    let positive = true;
+    if (points < 0) {
+      points *= -1;
+      positive = false;
+    }
+    let result = 0;
+    for (let i = 0; i < occurances; i++) {
+      result += Math.max(points - i * BAD_WORD_STEP, BAD_WORD_MIN);
+    }
+    return positive ? result : -result;
+  };
+
+  /**
+   * Checks what rule will match in the given array with words
+   * @param {string} rule rule type (full, partial, starts, ends, regexp)
+   * @param {string} decodedWord decoded word
+   * @param {array} wordsToMatch array to find a match
+   * @returns {object|boolean} matched rule and occurances. If nothing is matched returns false
+   */
+  const wordsMatchedWithRule = function (rule, decodedWord, wordsToMatch) {
+    if (rule === 'full' && wordsToMatch && wordsToMatch.includes(decodedWord)) {
+      return { rule, occurances: wordsToMatch.filter(element => element === decodedWord).length };
+    } else if (rule === 'partial' && wordsToMatch && wordsToMatch.some(element => element.indexOf(decodedWord) > -1)) {
+      return { rule, occurances: wordsToMatch.filter(element => element.indexOf(decodedWord) > -1).length };
+    } else if (rule === 'starts' && wordsToMatch && wordsToMatch.some(word => word.startsWith(decodedWord))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.startsWith(decodedWord)).length };
+    } else if (rule === 'ends' && wordsToMatch && wordsToMatch.some(word => word.endsWith(decodedWord))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.endsWith(decodedWord)).length };
+    } else if (rule === 'regexp' && wordsToMatch && wordsToMatch.some(element => element.match(new RegExp(decodedWord, 'i')))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.match(new RegExp(decodedWord, 'i'))).length };
+    }
+    return false;
+  };
+
+  // Default parameters if the bidder is unable to send some of them
+  badWords = badWords || [];
+  maxScore = parseInt(maxScore) || 10;
+
+  try {
+    let score = 0;
+    const decodedUrl = decodeURI(window.top.location.href.substring(window.top.location.origin.length));
+    const wordsAndNumbersInUrl = decodedUrl
+      .replaceAll(/[-,\._/\?=&#%]/g, ' ')
+      .replaceAll(/\s\s+/g, ' ')
+      .toLowerCase()
+      .trim();
+    const content = window.top.document.body.innerText.toLowerCase();
+    const contentWords = content.trim().split(/\s+/).length;
+    // \p{L} matches a single unicode code point in the category 'letter'. Matches any kind of letter from any language.
+    const regexp = new RegExp('[\\p{L}]+', 'gu');
+    const words = content.match(regexp);
+    const wordsInUrl = wordsAndNumbersInUrl.match(regexp);
+
+    for (const [word, rule, points] of badWords) {
+      const decodedWord = rot13(word.toLowerCase());
+
+      // Checks the words in the url of the page only for negative words. Don't serve any ad when at least one match is found
+      if (points > 0) {
+        const matchedRuleInUrl = wordsMatchedWithRule(rule, decodedWord, wordsInUrl);
+        if (matchedRuleInUrl.rule) {
+          return false;
+        }
+      }
+
+      // Check if site content's words match any of our brand safety rules
+      const matchedRule = wordsMatchedWithRule(rule, decodedWord, words);
+      if (matchedRule.rule === 'full') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'partial') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'starts') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'ends') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'regexp') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      }
+    }
+    return score < (maxScore * contentWords) / 1000;
+  } catch (e) {
+    return true;
+  }
+}
+
+export const spec = {
+  code: ADHASH_BIDDER_CODE,
+  supportedMediaTypes: [ BANNER ],
+
+  isBidRequestValid: (bid) => {
+    try {
+      const { publisherId, platformURL, bidderURL } = bid.params;
+      return (
+        includes(Object.keys(bid.mediaTypes), BANNER) &&
+        typeof publisherId === 'string' &&
+        publisherId.length === 42 &&
+        typeof platformURL === 'string' &&
+        platformURL.length >= 13 &&
+        (!bidderURL || bidderURL.indexOf('https://') === 0)
+      );
+    } catch (error) {
+      return false;
+    }
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const storage = getStorageManager({ bidderCode: ADHASH_BIDDER_CODE });
+    const { gdprConsent } = bidderRequest;
+    const bidRequests = [];
+    const body = document.body;
+    const html = document.documentElement;
+    const pageHeight = Math.max(
+      body.scrollHeight,
+      body.offsetHeight,
+      html.clientHeight,
+      html.scrollHeight,
+      html.offsetHeight
+    );
+    const pageWidth = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
+
+    for (let i = 0; i < validBidRequests.length; i++) {
+      const bidderURL = validBidRequests[i].params.bidderURL || 'https://bidder.adhash.com';
+      const url = `${bidderURL}/rtb?version=${VERSION}&prebid=true`;
+      const index = Math.floor(Math.random() * validBidRequests[i].sizes.length);
+      const size = validBidRequests[i].sizes[index].join('x');
+
+      let recentAds = [];
+      if (storage.localStorageIsEnabled()) {
+        const prefix = validBidRequests[i].params.prefix || 'adHash';
+        recentAds = JSON.parse(storage.getDataFromLocalStorage(prefix + 'recentAds') || '[]');
+      }
+
+      // Needed for the ad density calculation
+      var adHeight = validBidRequests[i].sizes[index][1];
+      var adWidth = validBidRequests[i].sizes[index][0];
+      if (!window.adsCount) {
+        window.adsCount = 0;
+      }
+      if (!window.adsTotalSurface) {
+        window.adsTotalSurface = 0;
+      }
+      window.adsTotalSurface += adHeight * adWidth;
+      window.adsCount++;
+
+      bidRequests.push({
+        method: 'POST',
+        url: url + '&publisher=' + validBidRequests[i].params.publisherId,
+        bidRequest: validBidRequests[i],
+        data: {
+          timezone: new Date().getTimezoneOffset() / 60,
+          location: bidderRequest.refererInfo ? bidderRequest.refererInfo.topmostLocation : '',
+          publisherId: validBidRequests[i].params.publisherId,
+          size: {
+            screenWidth: window.screen.width,
+            screenHeight: window.screen.height
+          },
+          navigator: {
+            platform: window.navigator.platform,
+            language: window.navigator.language,
+            userAgent: window.navigator.userAgent
+          },
+          creatives: [{
+            size: size,
+            position: validBidRequests[i].adUnitCode
+          }],
+          blockedCreatives: [],
+          currentTimestamp: (new Date().getTime() / 1000) | 0,
+          recentAds: recentAds,
+          GDPRApplies: gdprConsent ? gdprConsent.gdprApplies : null,
+          GDPR: gdprConsent ? gdprConsent.consentString : null,
+          servedAdsCount: window.adsCount,
+          adsTotalSurface: window.adsTotalSurface,
+          pageHeight: pageHeight,
+          pageWidth: pageWidth
+        },
+        options: {
+          withCredentials: false,
+          crossOrigin: true
+        },
+      });
+    }
+    return bidRequests;
+  },
+
+  interpretResponse: (serverResponse, request) => {
+    const responseBody = serverResponse ? serverResponse.body : {};
+
+    if (
+      !responseBody.creatives ||
+      responseBody.creatives.length === 0 ||
+      !brandSafety(responseBody.badWords, responseBody.maxScore)
+    ) {
+      return [];
+    }
+
+    const publisherURL = JSON.stringify(request.bidRequest.params.platformURL);
+    const bidderURL = request.bidRequest.params.bidderURL || 'https://bidder.adhash.com';
+    const oneTimeId = request.bidRequest.adUnitCode + Math.random().toFixed(16).replace('0.', '.');
+    const globalScript = !request.bidRequest.params.globalScript
+      ? `<script src="${bidderURL}/static/scripts/creative.min.js"></script>`
+      : '';
+    const bidderResponse = JSON.stringify({ responseText: JSON.stringify(responseBody) });
+    const requestData = JSON.stringify(request.data);
+
+    return [{
+      requestId: request.bidRequest.bidId,
+      cpm: responseBody.creatives[0].costEUR,
+      ad:
+        `<div id="${oneTimeId}"></div>${globalScript}
+        <script>callAdvertiser(${bidderResponse},['${oneTimeId}'],${requestData},${publisherURL})</script>`,
+      width: request.bidRequest.sizes[0][0],
+      height: request.bidRequest.sizes[0][1],
+      creativeId: request.bidRequest.adUnitCode,
+      netRevenue: true,
+      currency: 'EUR',
+      ttl: 60,
+      meta: {
+        advertiserDomains: responseBody.advertiserDomains ? [responseBody.advertiserDomains] : []
+      }
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/adhashBidAdapter.md b/modules/adhashBidAdapter.md
new file mode 100644
index 00000000000..acca5a1e651
--- /dev/null
+++ b/modules/adhashBidAdapter.md
@@ -0,0 +1,41 @@
+# Overview
+
+```
+Module Name: AdHash Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: damyan@adhash.com
+```
+
+# Description
+
+Here is what you need for Prebid integration with AdHash:
+1. Register with AdHash.
+2. Once registered and approved, you will receive a Publisher ID and Platform URL.
+3. Use the Publisher ID and Platform URL as parameters in params.
+
+Please note that a number of AdHash functionalities are not supported in the Prebid.js integration:
+* Price floors and passback tags, as they are not needed in the Prebid.js setup;
+* Reservation for direct deals only, as bids are evaluated based on their price.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: '/19968336/header-bid-tag-1',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]]
+                }
+            },
+            bids: [
+                {
+                    bidder: 'adhash',
+                    params: {
+                        publisherId: '0x1234567890123456789012345678901234567890',
+                        platformURL: 'https://adhash.org/p/example/'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/adheseBidAdapter.js b/modules/adheseBidAdapter.js
index 3c129d1bee1..2d1426a2cda 100644
--- a/modules/adheseBidAdapter.js
+++ b/modules/adheseBidAdapter.js
@@ -2,12 +2,15 @@
 
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'adhese';
+const GVLID = 553;
 const USER_SYNC_BASE_URL = 'https://user-sync.adhese.com/iframe/user_sync.html';
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: function(bid) {
@@ -18,23 +21,44 @@ export const spec = {
     if (validBidRequests.length === 0) {
       return null;
     }
+
     const { gdprConsent, refererInfo } = bidderRequest;
 
+    const adheseConfig = config.getConfig('adhese');
+    const gdprParams = (gdprConsent && gdprConsent.consentString) ? { xt: [gdprConsent.consentString] } : {};
+    // TODO: is 'page' the right value here?
+    const refererParams = (refererInfo && refererInfo.page) ? { xf: [base64urlEncode(refererInfo.page)] } : {};
+    const globalCustomParams = (adheseConfig && adheseConfig.globalTargets) ? cleanTargets(adheseConfig.globalTargets) : {};
+    const commonParams = { ...globalCustomParams, ...gdprParams, ...refererParams };
+    const vastContentAsUrl = !(adheseConfig && adheseConfig.vastContentAsUrl == false);
+
+    const slots = validBidRequests.map(bid => ({
+      slotname: bidToSlotName(bid),
+      parameters: cleanTargets(bid.params.data)
+    }));
+
+    const payload = {
+      slots: slots,
+      parameters: commonParams,
+      vastContentAsUrl: vastContentAsUrl,
+      user: {
+        ext: {
+          eids: getEids(validBidRequests),
+        }
+      }
+    };
+
     const account = getAccount(validBidRequests);
-    const targets = validBidRequests.map(bid => bid.params.data).reduce(mergeTargets, {});
-    const gdprParams = (gdprConsent && gdprConsent.consentString) ? [`xt${gdprConsent.consentString}`] : [];
-    const refererParams = (refererInfo && refererInfo.referer) ? [`xf${base64urlEncode(refererInfo.referer)}`] : [];
-    const id5Params = (getId5Id(validBidRequests)) ? [`x5${getId5Id(validBidRequests)}`] : [];
-    const targetsParams = Object.keys(targets).map(targetCode => targetCode + targets[targetCode].join(';'));
-    const slotsParams = validBidRequests.map(bid => 'sl' + bidToSlotName(bid));
-    const params = [...slotsParams, ...targetsParams, ...gdprParams, ...refererParams, ...id5Params].map(s => `/${s}`).join('');
-    const cacheBuster = '?t=' + new Date().getTime();
-    const uri = 'https://ads-' + account + '.adhese.com/json' + params + cacheBuster;
+    const uri = 'https://ads-' + account + '.adhese.com/json';
 
     return {
-      method: 'GET',
+      method: 'POST',
       url: uri,
-      bids: validBidRequests
+      data: JSON.stringify(payload),
+      bids: validBidRequests,
+      options: {
+        contentType: 'application/json'
+      }
     };
   },
 
@@ -78,7 +102,7 @@ function adResponse(bid, ad) {
 
   const bidResponse = getbaseAdResponse({
     requestId: bid.bidId,
-    mediaType: getMediaType(markup),
+    mediaType: ad.extension.mediaType,
     cpm: Number(price.amount),
     currency: price.currency,
     width: Number(ad.width),
@@ -89,11 +113,18 @@ function adResponse(bid, ad) {
       originData: adDetails.originData,
       origin: adDetails.origin,
       originInstance: adDetails.originInstance
+    },
+    meta: {
+      advertiserDomains: ad.adomain || []
     }
   });
 
   if (bidResponse.mediaType === VIDEO) {
-    bidResponse.vastXml = markup;
+    if (ad.cachedBodyUrl) {
+      bidResponse.vastUrl = ad.cachedBodyUrl
+    } else {
+      bidResponse.vastXml = markup;
+    }
   } else {
     const counter = ad.impressionCounter ? "<img src='" + ad.impressionCounter + "' style='height:1px; width:1px; margin: -1px -1px; display:none;'/>" : '';
     bidResponse.ad = markup + counter;
@@ -101,16 +132,20 @@ function adResponse(bid, ad) {
   return bidResponse;
 }
 
-function mergeTargets(targets, target) {
+function cleanTargets(target) {
+  const targets = {};
   if (target) {
     Object.keys(target).forEach(function (key) {
       const val = target[key];
-      const values = Array.isArray(val) ? val : [val];
-      if (targets[key]) {
-        const distinctValues = values.filter(v => targets[key].indexOf(v) < 0);
-        targets[key].push.apply(targets[key], distinctValues);
-      } else {
-        targets[key] = values;
+      const dirtyValues = Array.isArray(val) ? val : [val];
+      const values = dirtyValues.filter(v => v === 0 || v);
+      if (values.length > 0) {
+        if (targets[key]) {
+          const distinctValues = values.filter(v => targets[key].indexOf(v) < 0);
+          targets[key].push.apply(targets[key], distinctValues);
+        } else {
+          targets[key] = values;
+        }
       }
     });
   }
@@ -137,9 +172,9 @@ function getAccount(validBidRequests) {
   return validBidRequests[0].params.account;
 }
 
-function getId5Id(validBidRequests) {
-  if (validBidRequests[0] && validBidRequests[0].userId && validBidRequests[0].userId.id5id) {
-    return validBidRequests[0].userId.id5id;
+function getEids(validBidRequests) {
+  if (validBidRequests[0] && validBidRequests[0].userIdAsEids) {
+    return validBidRequests[0].userIdAsEids;
   }
 }
 
@@ -148,12 +183,7 @@ function getbaseAdResponse(response) {
 }
 
 function isAdheseAd(ad) {
-  return !ad.origin || ad.origin === 'JERLICIA' || ad.origin === 'DALE';
-}
-
-function getMediaType(markup) {
-  const isVideo = markup.trim().toLowerCase().match(/<\?xml|<vast/);
-  return isVideo ? VIDEO : BANNER;
+  return !ad.origin || ad.origin === 'JERLICIA';
 }
 
 function getAdMarkup(ad) {
diff --git a/modules/adkernelAdnAnalyticsAdapter.js b/modules/adkernelAdnAnalyticsAdapter.js
index b6db6fc22de..901c0d2fd98 100644
--- a/modules/adkernelAdnAnalyticsAdapter.js
+++ b/modules/adkernelAdnAnalyticsAdapter.js
@@ -1,14 +1,16 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
-import * as utils from '../src/utils.js';
+import { logError, parseUrl, _each } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {config} from '../src/config.js';
 
-const ANALYTICS_VERSION = '1.0.1';
+const GVLID = 14;
+const ANALYTICS_VERSION = '1.0.2';
 const DEFAULT_QUEUE_TIMEOUT = 4000;
 const DEFAULT_HOST = 'tag.adkernel.com';
-const storageObj = getStorageManager();
+const storageObj = getStorageManager({gvlid: GVLID});
 
 const ADK_HB_EVENTS = {
   AUCTION_INIT: 'auctionInit',
@@ -34,6 +36,7 @@ function buildRequestTemplate(pubId) {
       },
       lang: navigator.language
     },
+    user: {},
     src: getUmtSource(loc.href, ref)
   }
 }
@@ -50,6 +53,7 @@ let analyticsAdapter = Object.assign(adapter({analyticsType: 'endpoint'}),
           if (analyticsAdapter.context.queue) {
             analyticsAdapter.context.queue.init();
           }
+          initPrivacy(analyticsAdapter.context.requestTemplate, args.bidderRequests);
           handler = trackAuctionInit;
           break;
         case CONSTANTS.EVENTS.BID_REQUESTED:
@@ -86,7 +90,7 @@ analyticsAdapter.originEnableAnalytics = analyticsAdapter.enableAnalytics;
 
 analyticsAdapter.enableAnalytics = (config) => {
   if (!config.options.pubId) {
-    utils.logError('PubId is not defined. Analytics won\'t work');
+    logError('PubId is not defined. Analytics won\'t work');
     return;
   }
   analyticsAdapter.context = {
@@ -100,7 +104,8 @@ analyticsAdapter.enableAnalytics = (config) => {
 
 adapterManager.registerAnalyticsAdapter({
   adapter: analyticsAdapter,
-  code: 'adkernelAdn'
+  code: 'adkernelAdn',
+  gvlid: GVLID
 });
 
 export default analyticsAdapter;
@@ -210,7 +215,7 @@ export function getUmtSource(pageUrl, referrer) {
       if (se) {
         return asUtm(se, ORGANIC, ORGANIC);
       }
-      let parsedUrl = utils.parseUrl(pageUrl);
+      let parsedUrl = parseUrl(pageUrl);
       let [refHost, refPath] = getReferrer(referrer);
       if (refHost && refHost !== parsedUrl.hostname) {
         return asUtm(refHost, REFERRAL, REFERRAL, '', refPath);
@@ -237,17 +242,17 @@ export function getUmtSource(pageUrl, referrer) {
   }
 
   function getReferrer(referrer) {
-    let ref = utils.parseUrl(referrer);
+    let ref = parseUrl(referrer);
     return [ref.hostname, ref.pathname];
   }
 
   function getUTM(pageUrl) {
-    let urlParameters = utils.parseUrl(pageUrl).search;
+    let urlParameters = parseUrl(pageUrl).search;
     if (!urlParameters['utm_campaign'] || !urlParameters['utm_source']) {
       return;
     }
     let utmArgs = [];
-    utils._each(UTM_TAGS, (utmTagName) => {
+    _each(UTM_TAGS, (utmTagName) => {
       let utmValue = urlParameters[utmTagName] || '';
       utmArgs.push(utmValue);
     });
@@ -376,6 +381,7 @@ export function ExpiringQueue(callback, ttl) {
   }
 }
 
+// TODO: this should reuse logic from refererDetection
 function getNavigationInfo() {
   try {
     return getLocationAndReferrer(self.top);
@@ -390,3 +396,19 @@ function getLocationAndReferrer(win) {
     loc: win.location
   };
 }
+
+function initPrivacy(template, requests) {
+  let consent = requests[0].gdprConsent;
+  if (consent && consent.gdprApplies) {
+    template.user.gdpr = ~~consent.gdprApplies;
+  }
+  if (consent && consent.consentString) {
+    template.user.gdpr_consent = consent.consentString;
+  }
+  if (requests[0].uspConsent) {
+    template.user.us_privacy = requests[0].uspConsent;
+  }
+  if (config.getConfig('coppa')) {
+    template.user.coppa = 1;
+  }
+}
diff --git a/modules/adkernelAdnBidAdapter.js b/modules/adkernelAdnBidAdapter.js
index 483d6de52b9..3e348e0795d 100644
--- a/modules/adkernelAdnBidAdapter.js
+++ b/modules/adkernelAdnBidAdapter.js
@@ -1,14 +1,16 @@
-import * as utils from '../src/utils.js';
+import { deepAccess, parseSizesInput, isArray, deepSetValue, isStr, isNumber, logInfo } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
 
 const DEFAULT_ADKERNEL_DSP_DOMAIN = 'tag.adkernel.com';
 const DEFAULT_MIMES = ['video/mp4', 'video/webm', 'application/x-shockwave-flash', 'application/javascript'];
 const DEFAULT_PROTOCOLS = [2, 3, 5, 6];
 const DEFAULT_APIS = [1, 2];
+const GVLID = 14;
 
 function isRtbDebugEnabled(refInfo) {
-  return refInfo.referer.indexOf('adk_debug=true') !== -1;
+  return refInfo.topmostLocation?.indexOf('adk_debug=true') !== -1;
 }
 
 function buildImp(bidRequest) {
@@ -16,13 +18,15 @@ function buildImp(bidRequest) {
     id: bidRequest.bidId,
     tagid: bidRequest.adUnitCode
   };
-  let bannerReq = utils.deepAccess(bidRequest, `mediaTypes.banner`);
-  let videoReq = utils.deepAccess(bidRequest, `mediaTypes.video`);
+  let mediaType;
+  let bannerReq = deepAccess(bidRequest, `mediaTypes.banner`);
+  let videoReq = deepAccess(bidRequest, `mediaTypes.video`);
   if (bannerReq) {
     let sizes = canonicalizeSizesArray(bannerReq.sizes);
     imp.banner = {
-      format: utils.parseSizesInput(sizes)
-    }
+      format: parseSizesInput(sizes)
+    };
+    mediaType = BANNER;
   } else if (videoReq) {
     let size = canonicalizeSizesArray(videoReq.playerSize)[0];
     imp.video = {
@@ -32,6 +36,11 @@ function buildImp(bidRequest) {
       protocols: videoReq.protocols || DEFAULT_PROTOCOLS,
       api: videoReq.api || DEFAULT_APIS
     };
+    mediaType = VIDEO;
+  }
+  let bidFloor = getBidFloor(bidRequest, mediaType, '*');
+  if (bidFloor) {
+    imp.bidfloor = bidFloor;
   }
   return imp;
 }
@@ -42,41 +51,43 @@ function buildImp(bidRequest) {
  * @return Array[Array[Number]]
  */
 function canonicalizeSizesArray(sizes) {
-  if (sizes.length === 2 && !utils.isArray(sizes[0])) {
+  if (sizes.length === 2 && !isArray(sizes[0])) {
     return [sizes];
   }
   return sizes;
 }
 
-function buildRequestParams(tags, auctionId, transactionId, gdprConsent, uspConsent, refInfo) {
+function buildRequestParams(tags, bidderRequest) {
+  let {auctionId, gdprConsent, uspConsent, transactionId, refererInfo} = bidderRequest;
   let req = {
     id: auctionId,
+    // TODO: transactionId is undefined here, should this be auctionId? see #8573
     tid: transactionId,
-    site: buildSite(refInfo),
+    site: buildSite(refererInfo),
     imp: tags
   };
   if (gdprConsent) {
     if (gdprConsent.gdprApplies !== undefined) {
-      utils.deepSetValue(req, 'user.gdpr', ~~gdprConsent.gdprApplies);
+      deepSetValue(req, 'user.gdpr', ~~gdprConsent.gdprApplies);
     }
     if (gdprConsent.consentString !== undefined) {
-      utils.deepSetValue(req, 'user.consent', gdprConsent.consentString);
+      deepSetValue(req, 'user.consent', gdprConsent.consentString);
     }
   }
   if (uspConsent) {
-    utils.deepSetValue(req, 'user.us_privacy', uspConsent);
+    deepSetValue(req, 'user.us_privacy', uspConsent);
+  }
+  if (config.getConfig('coppa')) {
+    deepSetValue(req, 'user.coppa', 1);
   }
   return req;
 }
 
 function buildSite(refInfo) {
-  let loc = utils.parseUrl(refInfo.referer);
-  let result = {
-    page: `${loc.protocol}://${loc.hostname}${loc.pathname}`,
-    secure: ~~(loc.protocol === 'https')
-  };
-  if (self === top && document.referrer) {
-    result.ref = document.referrer;
+  const result = {
+    page: refInfo.page,
+    secure: ~~(refInfo.page && refInfo.page.startsWith('https')),
+    ref: refInfo.ref
   }
   let keywords = document.getElementsByTagName('meta')['keywords'];
   if (keywords && keywords.content) {
@@ -90,13 +101,17 @@ function buildBid(tag) {
     requestId: tag.impid,
     bidderCode: spec.code,
     cpm: tag.bid,
-    width: tag.w,
-    height: tag.h,
     creativeId: tag.crid,
     currency: 'USD',
     ttl: 720,
     netRevenue: true
   };
+  if (tag.w) {
+    bid.width = tag.w;
+  }
+  if (tag.h) {
+    bid.height = tag.h;
+  }
   if (tag.tag) {
     bid.ad = tag.tag;
     bid.mediaType = BANNER;
@@ -104,11 +119,46 @@ function buildBid(tag) {
     bid.vastUrl = tag.vast_url;
     bid.mediaType = VIDEO;
   }
+  fillBidMeta(bid, tag);
   return bid;
 }
 
+function fillBidMeta(bid, tag) {
+  if (isStr(tag.agencyName)) {
+    deepSetValue(bid, 'meta.agencyName', tag.agencyName);
+  }
+  if (isNumber(tag.advertiserId)) {
+    deepSetValue(bid, 'meta.advertiserId', tag.advertiserId);
+  }
+  if (isStr(tag.advertiserName)) {
+    deepSetValue(bid, 'meta.advertiserName', tag.advertiserName);
+  }
+  if (isArray(tag.advertiserDomains)) {
+    deepSetValue(bid, 'meta.advertiserDomains', tag.advertiserDomains);
+  }
+  if (isStr(tag.primaryCatId)) {
+    deepSetValue(bid, 'meta.primaryCatId', tag.primaryCatId);
+  }
+  if (isArray(tag.secondaryCatIds)) {
+    deepSetValue(bid, 'meta.secondaryCatIds', tag.secondaryCatIds);
+  }
+}
+
+function getBidFloor(bid, mediaType, sizes) {
+  var floor;
+  var size = sizes.length === 1 ? sizes[0] : '*';
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({currency: 'USD', mediaType, size});
+    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+      floor = parseFloat(floorInfo.floor);
+    }
+  }
+  return floor;
+}
+
 export const spec = {
   code: 'adkernelAdn',
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO],
   aliases: ['engagesimply'],
 
@@ -132,14 +182,13 @@ export const spec = {
         return acc;
       }, {});
 
-    let {auctionId, gdprConsent, uspConsent, transactionId, refererInfo} = bidderRequest;
     let requests = [];
     Object.keys(dispatch).forEach(host => {
       Object.keys(dispatch[host]).forEach(pubId => {
-        let request = buildRequestParams(dispatch[host][pubId], auctionId, transactionId, gdprConsent, uspConsent, refererInfo);
+        let request = buildRequestParams(dispatch[host][pubId], bidderRequest);
         requests.push({
           method: 'POST',
-          url: `https://${host}/tag?account=${pubId}&pb=1${isRtbDebugEnabled(refererInfo) ? '&debug=1' : ''}`,
+          url: `https://${host}/tag?account=${pubId}&pb=1${isRtbDebugEnabled(bidderRequest.refererInfo) ? '&debug=1' : ''}`,
           data: JSON.stringify(request)
         })
       });
@@ -153,20 +202,30 @@ export const spec = {
       return [];
     }
     if (response.debug) {
-      utils.logInfo(`ADKERNEL DEBUG:\n${response.debug}`);
+      logInfo(`ADKERNEL DEBUG:\n${response.debug}`);
     }
     return response.tags.map(buildBid);
   },
 
   getUserSyncs: function(syncOptions, serverResponses) {
-    if (!syncOptions.iframeEnabled || !serverResponses || serverResponses.length === 0) {
+    if (!serverResponses || serverResponses.length === 0) {
+      return [];
+    }
+    if (syncOptions.iframeEnabled) {
+      return buildSyncs(serverResponses, 'syncpages', 'iframe');
+    } else if (syncOptions.pixelEnabled) {
+      return buildSyncs(serverResponses, 'syncpixels', 'image');
+    } else {
       return [];
     }
-    return serverResponses.filter(rps => rps.body && rps.body.syncpages)
-      .map(rsp => rsp.body.syncpages)
-      .reduce((a, b) => a.concat(b), [])
-      .map(syncUrl => ({type: 'iframe', url: syncUrl}));
   }
 };
 
+function buildSyncs(serverResponses, propName, type) {
+  return serverResponses.filter(rps => rps.body && rps.body[propName])
+    .map(rsp => rsp.body[propName])
+    .reduce((a, b) => a.concat(b), [])
+    .map(syncUrl => ({type: type, url: syncUrl}));
+}
+
 registerBidder(spec);
diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index d069af7d56e..5736c7c19ba 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -1,9 +1,27 @@
-import * as utils from '../src/utils.js';
+import {
+  _each,
+  cleanObj,
+  contains,
+  createTrackPixelHtml,
+  deepAccess,
+  deepSetValue,
+  getAdUnitSizes,
+  getDNT,
+  isArray,
+  isArrayOfNums,
+  isEmpty,
+  isNumber,
+  isPlainObject,
+  isStr,
+  mergeDeep,
+  parseGPTSingleSizeArrayToRtbSize,
+  getDefinedParams
+} from '../src/utils.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {find} from '../src/polyfill.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 /*
  * In case you're AdKernel whitelable platform's client who needs branded adapter to
@@ -11,17 +29,19 @@ import {config} from '../src/config.js';
  *
  * Please contact prebid@adkernel.com and we'll add your adapter as an alias.
  */
-
-const VIDEO_TARGETING = Object.freeze(['mimes', 'minduration', 'maxduration', 'protocols',
-  'startdelay', 'linearity', 'boxingallowed', 'playbackmethod', 'delivery',
-  'pos', 'api', 'ext']);
-const VERSION = '1.5';
+const VIDEO_PARAMS = ['pos', 'context', 'placement', 'api', 'mimes', 'protocols', 'playbackmethod', 'minduration', 'maxduration',
+  'startdelay', 'linearity', 'skip', 'skipmin', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackend', 'boxingallowed'];
+const VIDEO_FPD = ['battr', 'pos'];
+const NATIVE_FPD = ['battr', 'api'];
+const BANNER_FPD = ['btype', 'battr', 'pos', 'api'];
+const VERSION = '1.6';
 const SYNC_IFRAME = 1;
 const SYNC_IMAGE = 2;
 const SYNC_TYPES = Object.freeze({
   1: 'iframe',
   2: 'image'
 });
+const GVLID = 14;
 
 const NATIVE_MODEL = [
   {name: 'title', assetType: 'title'},
@@ -50,9 +70,36 @@ const NATIVE_INDEX = NATIVE_MODEL.reduce((acc, val, idx) => {
  * Adapter for requesting bids from AdKernel white-label display platform
  */
 export const spec = {
-
   code: 'adkernel',
-  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon'],
+  gvlid: GVLID,
+  aliases: [
+    {code: 'headbidding'},
+    {code: 'adsolut'},
+    {code: 'oftmediahb'},
+    {code: 'audiencemedia'},
+    {code: 'waardex_ak'},
+    {code: 'roqoon'},
+    {code: 'adbite'},
+    {code: 'houseofpubs'},
+    {code: 'torchad'},
+    {code: 'stringads'},
+    {code: 'bcm'},
+    {code: 'engageadx'},
+    {code: 'converge', gvlid: 248},
+    {code: 'adomega'},
+    {code: 'denakop'},
+    {code: 'rtbanalytica'},
+    {code: 'unibots'},
+    {code: 'catapultx'},
+    {code: 'ergadx'},
+    {code: 'turktelekom'},
+    {code: 'felixads'},
+    {code: 'motionspots'},
+    {code: 'sonic_twist'},
+    {code: 'displayioads'},
+    {code: 'rtbdemand_com'},
+    {code: 'bidbuddy'}
+  ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
@@ -77,16 +124,19 @@ export const spec = {
    * @returns {ServerRequest[]}
    */
   buildRequests: function (bidRequests, bidderRequest) {
-    let impDispatch = dispatchImps(bidRequests, bidderRequest.refererInfo);
-    const requests = [];
-    Object.keys(impDispatch).forEach(host => {
-      Object.keys(impDispatch[host]).forEach(zoneId => {
-        const request = buildRtbRequest(impDispatch[host][zoneId], bidderRequest);
-        requests.push({
-          method: 'POST',
-          url: `https://${host}/hb?zone=${zoneId}&v=${VERSION}`,
-          data: JSON.stringify(request)
-        });
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
+    let impGroups = groupImpressionsByHostZone(bidRequests, bidderRequest.refererInfo);
+    let requests = [];
+    let schain = bidRequests[0].schain;
+    _each(impGroups, impGroup => {
+      let {host, zoneId, imps} = impGroup;
+      const request = buildRtbRequest(imps, bidderRequest, schain);
+      requests.push({
+        method: 'POST',
+        url: `https://${host}/hb?zone=${zoneId}&v=${VERSION}`,
+        data: JSON.stringify(request)
       });
     });
     return requests;
@@ -115,7 +165,7 @@ export const spec = {
         requestId: rtbBid.impid,
         cpm: rtbBid.price,
         creativeId: rtbBid.crid,
-        currency: 'USD',
+        currency: response.cur || 'USD',
         ttl: 360,
         netRevenue: true
       };
@@ -133,6 +183,27 @@ export const spec = {
         prBid.mediaType = NATIVE;
         prBid.native = buildNativeAd(JSON.parse(rtbBid.adm));
       }
+      if (isStr(rtbBid.dealid)) {
+        prBid.dealId = rtbBid.dealid;
+      }
+      if (isArray(rtbBid.adomain)) {
+        deepSetValue(prBid, 'meta.advertiserDomains', rtbBid.adomain);
+      }
+      if (isArray(rtbBid.cat)) {
+        deepSetValue(prBid, 'meta.secondaryCatIds', rtbBid.cat);
+      }
+      if (isPlainObject(rtbBid.ext)) {
+        if (isNumber(rtbBid.ext.advertiser_id)) {
+          deepSetValue(prBid, 'meta.advertiserId', rtbBid.ext.advertiser_id);
+        }
+        if (isStr(rtbBid.ext.advertiser_name)) {
+          deepSetValue(prBid, 'meta.advertiserName', rtbBid.ext.advertiser_name);
+        }
+        if (isStr(rtbBid.ext.agency_name)) {
+          deepSetValue(prBid, 'meta.agencyName', rtbBid.ext.agency_name);
+        }
+      }
+
       return prBid;
     });
   },
@@ -161,17 +232,31 @@ registerBidder(spec);
  * @param bidRequests {BidRequest[]}
  * @param refererInfo {refererInfo}
  */
-function dispatchImps(bidRequests, refererInfo) {
-  let secure = (refererInfo && refererInfo.referer.indexOf('https:') === 0);
-  return bidRequests.map(bidRequest => buildImp(bidRequest, secure))
-    .reduce((acc, curr, index) => {
-      let bidRequest = bidRequests[index];
-      let {zoneId, host} = bidRequest.params;
-      acc[host] = acc[host] || {};
-      acc[host][zoneId] = acc[host][zoneId] || [];
-      acc[host][zoneId].push(curr);
-      return acc;
-    }, {});
+function groupImpressionsByHostZone(bidRequests, refererInfo) {
+  let secure = (refererInfo && refererInfo.page?.indexOf('https:') === 0);
+  return Object.values(
+    bidRequests.map(bidRequest => buildImp(bidRequest, secure))
+      .reduce((acc, curr, index) => {
+        let bidRequest = bidRequests[index];
+        let {zoneId, host} = bidRequest.params;
+        let key = `${host}_${zoneId}`;
+        acc[key] = acc[key] || {host: host, zoneId: zoneId, imps: []};
+        acc[key].imps.push(curr);
+        return acc;
+      }, {})
+  );
+}
+
+function getBidFloor(bid, mediaType, sizes) {
+  var floor;
+  var size = sizes.length === 1 ? sizes[0] : '*';
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({currency: 'USD', mediaType, size});
+    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+      floor = parseFloat(floorInfo.floor);
+    }
+  }
+  return floor;
 }
 
 /**
@@ -184,27 +269,43 @@ function buildImp(bidRequest, secure) {
     'id': bidRequest.bidId,
     'tagid': bidRequest.adUnitCode
   };
+  var mediaType;
+  var sizes = [];
 
-  if (utils.deepAccess(bidRequest, `mediaTypes.banner`)) {
-    let sizes = utils.getAdUnitSizes(bidRequest);
+  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
+    sizes = getAdUnitSizes(bidRequest);
     imp.banner = {
-      format: sizes.map(wh => utils.parseGPTSingleSizeArrayToRtbSize(wh)),
+      format: sizes.map(wh => parseGPTSingleSizeArrayToRtbSize(wh)),
       topframe: 0
     };
-  } else if (utils.deepAccess(bidRequest, 'mediaTypes.video')) {
-    let sizes = bidRequest.mediaTypes.video.playerSize || [];
-    imp.video = utils.parseGPTSingleSizeArrayToRtbSize(sizes[0]) || {};
-    if (bidRequest.params.video) {
-      Object.keys(bidRequest.params.video)
-        .filter(key => includes(VIDEO_TARGETING, key))
-        .forEach(key => imp.video[key] = bidRequest.params.video[key]);
+    populateImpFpd(imp.banner, bidRequest, BANNER_FPD);
+    mediaType = BANNER;
+  } else if (deepAccess(bidRequest, 'mediaTypes.video')) {
+    let video = deepAccess(bidRequest, 'mediaTypes.video');
+    imp.video = getDefinedParams(video, VIDEO_PARAMS);
+    populateImpFpd(imp.video, bidRequest, VIDEO_FPD);
+    if (video.playerSize) {
+      sizes = video.playerSize[0];
+      imp.video = Object.assign(imp.video, parseGPTSingleSizeArrayToRtbSize(sizes) || {});
+    } else if (video.w && video.h) {
+      imp.video.w = video.w;
+      imp.video.h = video.h;
     }
-  } else if (utils.deepAccess(bidRequest, 'mediaTypes.native')) {
+    mediaType = VIDEO;
+  } else if (deepAccess(bidRequest, 'mediaTypes.native')) {
     let nativeRequest = buildNativeRequest(bidRequest.mediaTypes.native);
     imp.native = {
       ver: '1.1',
       request: JSON.stringify(nativeRequest)
-    }
+    };
+    populateImpFpd(imp.native, bidRequest, NATIVE_FPD);
+    mediaType = NATIVE;
+  } else {
+    throw new Error('Unsupported bid received');
+  }
+  let floor = getBidFloor(bidRequest, mediaType, sizes);
+  if (floor) {
+    imp.bidfloor = floor;
   }
   if (secure) {
     imp.secure = 1;
@@ -230,7 +331,7 @@ function buildNativeRequest(nativeReq) {
     if (desc.assetType === 'img') {
       assetRoot[desc.assetType] = buildImageAsset(desc, v);
     } else if (desc.assetType === 'data') {
-      assetRoot.data = utils.cleanObj({type: desc.type, len: v.len});
+      assetRoot.data = cleanObj({type: desc.type, len: v.len});
     } else if (desc.assetType === 'title') {
       assetRoot.title = {len: v.len || 90};
     } else {
@@ -241,6 +342,19 @@ function buildNativeRequest(nativeReq) {
   return request;
 }
 
+/**
+ * Populate impression-level FPD from bid request
+ * @param target {Object}
+ * @param bidRequest {BidRequest}
+ * @param props {String[]}
+ */
+function populateImpFpd(target, bidRequest, props) {
+  if (bidRequest.ortb2Imp === undefined) {
+    return;
+  }
+  Object.assign(target, getDefinedParams(bidRequest.ortb2Imp, props));
+}
+
 /**
  *  Builds image asset request
  */
@@ -254,7 +368,7 @@ function buildImageAsset(desc, val) {
     img.wmin = val.aspect_ratios[0].min_width;
     img.hmin = val.aspect_ratios[0].min_height;
   }
-  return utils.cleanObj(img);
+  return cleanObj(img);
 }
 
 /**
@@ -267,9 +381,9 @@ function isSyncMethodAllowed(syncRule, bidderCode) {
   if (!syncRule) {
     return false;
   }
-  let bidders = utils.isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
+  let bidders = isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
   let rule = syncRule.filter === 'include';
-  return utils.contains(bidders, bidderCode) === rule;
+  return contains(bidders, bidderCode) === rule;
 }
 
 /**
@@ -290,44 +404,141 @@ function getAllowedSyncMethod(bidderCode) {
 }
 
 /**
- * Builds complete rtb request
- * @param imps {Object} Collection of rtb impressions
+ * Create device object from fpd and host-collected data
+ * @param fpd {Object}
+ * @returns {{device: Object}}
+ */
+function makeDevice(fpd) {
+  let device = mergeDeep({
+    'ip': 'caller',
+    'ipv6': 'caller',
+    'ua': 'caller',
+    'js': 1,
+    'language': getLanguage()
+  }, fpd.device || {});
+  if (getDNT()) {
+    device.dnt = 1;
+  }
+  return {device: device};
+}
+
+/**
+ * Create site or app description object
  * @param bidderRequest {BidderRequest}
- * @return {Object} Complete rtb request
+ * @param fpd {Object}
+ * @returns {{site: Object}|{app: Object}}
  */
-function buildRtbRequest(imps, bidderRequest) {
-  let {bidderCode, gdprConsent, auctionId, refererInfo, timeout, uspConsent} = bidderRequest;
+function makeSiteOrApp(bidderRequest, fpd) {
+  let {refererInfo} = bidderRequest;
+  let appConfig = config.getConfig('app');
+  if (isEmpty(appConfig)) {
+    return {site: createSite(refererInfo, fpd)}
+  } else {
+    return {app: appConfig};
+  }
+}
 
-  let req = {
-    'id': auctionId,
-    'imp': imps,
-    'site': createSite(refererInfo),
-    'at': 1,
-    'device': {
-      'ip': 'caller',
-      'ua': 'caller',
-      'js': 1,
-      'language': getLanguage()
-    },
-    'tmax': parseInt(timeout)
-  };
-  if (utils.getDNT()) {
-    req.device.dnt = 1;
+/**
+ * Create user description object
+ * @param bidderRequest {BidderRequest}
+ * @param fpd {Object}
+ * @returns {{user: Object} | undefined}
+ */
+function makeUser(bidderRequest, fpd) {
+  let {gdprConsent} = bidderRequest;
+  let user = fpd.user || {};
+  if (gdprConsent && gdprConsent.consentString !== undefined) {
+    deepSetValue(user, 'ext.consent', gdprConsent.consentString);
+  }
+  let eids = getExtendedUserIds(bidderRequest);
+  if (eids) {
+    deepSetValue(user, 'ext.eids', eids);
   }
+  if (!isEmpty(user)) { return {user: user}; }
+}
+
+/**
+ * Create privacy regulations object
+ * @param bidderRequest {BidderRequest}
+ * @returns {{regs: Object} | undefined}
+ */
+function makeRegulations(bidderRequest) {
+  let {gdprConsent, uspConsent} = bidderRequest;
+  let regs = {};
   if (gdprConsent) {
     if (gdprConsent.gdprApplies !== undefined) {
-      utils.deepSetValue(req, 'regs.ext.gdpr', ~~gdprConsent.gdprApplies);
-    }
-    if (gdprConsent.consentString !== undefined) {
-      utils.deepSetValue(req, 'user.ext.consent', gdprConsent.consentString);
+      deepSetValue(regs, 'regs.ext.gdpr', ~~gdprConsent.gdprApplies);
     }
   }
   if (uspConsent) {
-    utils.deepSetValue(req, 'regs.ext.us_privacy', uspConsent);
+    deepSetValue(regs, 'regs.ext.us_privacy', uspConsent);
+  }
+  if (config.getConfig('coppa')) {
+    deepSetValue(regs, 'regs.coppa', 1);
+  }
+  if (!isEmpty(regs)) {
+    return regs;
+  }
+}
+
+/**
+ * Create top-level request object
+ * @param bidderRequest {BidderRequest}
+ * @param imps {Object} Impressions
+ * @param fpd {Object} First party data
+ * @returns
+ */
+function makeBaseRequest(bidderRequest, imps, fpd) {
+  let {auctionId, timeout} = bidderRequest;
+  let request = {
+    'id': auctionId,
+    'imp': imps,
+    'at': 1,
+    'tmax': parseInt(timeout)
+  };
+  if (!isEmpty(fpd.bcat)) {
+    request.bcat = fpd.bcat;
+  }
+  if (!isEmpty(fpd.badv)) {
+    request.badv = fpd.badv;
   }
+  return request;
+}
+
+/**
+ * Initialize sync capabilities
+ * @param bidderRequest {BidderRequest}
+ */
+function makeSyncInfo(bidderRequest) {
+  let {bidderCode} = bidderRequest;
   let syncMethod = getAllowedSyncMethod(bidderCode);
   if (syncMethod) {
-    utils.deepSetValue(req, 'ext.adk_usersync', syncMethod);
+    let res = {};
+    deepSetValue(res, 'ext.adk_usersync', syncMethod);
+    return res;
+  }
+}
+
+/**
+ * Builds complete rtb request
+ * @param imps {Object} Collection of rtb impressions
+ * @param bidderRequest {BidderRequest}
+ * @param schain {Object=} Supply chain config
+ * @return {Object} Complete rtb request
+ */
+function buildRtbRequest(imps, bidderRequest, schain) {
+  let fpd = bidderRequest.ortb2 || {};
+
+  let req = mergeDeep(
+    makeBaseRequest(bidderRequest, imps, fpd),
+    makeDevice(fpd),
+    makeSiteOrApp(bidderRequest, fpd),
+    makeUser(bidderRequest, fpd),
+    makeRegulations(bidderRequest),
+    makeSyncInfo(bidderRequest)
+  );
+  if (schain) {
+    deepSetValue(req, 'source.ext.schain', schain);
   }
   return req;
 }
@@ -344,22 +555,27 @@ function getLanguage() {
 /**
  * Creates site description object
  */
-function createSite(refInfo) {
-  let url = utils.parseUrl(refInfo.referer);
+function createSite(refInfo, fpd) {
   let site = {
-    'domain': url.hostname,
-    'page': `${url.protocol}://${url.hostname}${url.pathname}`
+    'domain': refInfo.domain,
+    'page': refInfo.page
   };
-  if (self === top && document.referrer) {
-    site.ref = document.referrer;
-  }
-  let keywords = document.getElementsByTagName('meta')['keywords'];
-  if (keywords && keywords.content) {
-    site.keywords = keywords.content;
+  mergeDeep(site, fpd.site);
+  if (refInfo.ref != null) {
+    site.ref = refInfo.ref;
+  } else {
+    delete site.ref;
   }
   return site;
 }
 
+function getExtendedUserIds(bidderRequest) {
+  let eids = deepAccess(bidderRequest, 'bids.0.userIdAsEids');
+  if (isArray(eids)) {
+    return eids;
+  }
+}
+
 /**
  *  Format creative with optional nurl call
  *  @param bid rtb Bid object
@@ -367,7 +583,7 @@ function createSite(refInfo) {
 function formatAdMarkup(bid) {
   let adm = bid.adm;
   if ('nurl' in bid) {
-    adm += utils.createTrackPixelHtml(`${bid.nurl}&px=1`);
+    adm += createTrackPixelHtml(`${bid.nurl}&px=1`);
   }
   return adm;
 }
@@ -377,8 +593,8 @@ function formatAdMarkup(bid) {
  */
 function validateNativeAdUnit(adUnit) {
   return validateNativeImageSize(adUnit.image) && validateNativeImageSize(adUnit.icon) &&
-    !utils.deepAccess(adUnit, 'privacyLink.required') && // not supported yet
-    !utils.deepAccess(adUnit, 'privacyIcon.required'); // not supported yet
+    !deepAccess(adUnit, 'privacyLink.required') && // not supported yet
+    !deepAccess(adUnit, 'privacyIcon.required'); // not supported yet
 }
 
 /**
@@ -389,9 +605,9 @@ function validateNativeImageSize(img) {
     return true;
   }
   if (img.sizes) {
-    return utils.isArrayOfNums(img.sizes, 2);
+    return isArrayOfNums(img.sizes, 2);
   }
-  if (utils.isArray(img.aspect_ratios)) {
+  if (isArray(img.aspect_ratios)) {
     return img.aspect_ratios.length > 0 && img.aspect_ratios[0].min_height && img.aspect_ratios[0].min_width;
   }
   return true;
@@ -408,14 +624,14 @@ function buildNativeAd(nativeResp) {
     javascriptTrackers: jstracker ? [jstracker] : undefined,
     privacyLink: privacy,
   };
-  utils._each(assets, asset => {
+  _each(assets, asset => {
     let assetName = NATIVE_MODEL[asset.id].name;
     let assetType = NATIVE_MODEL[asset.id].assetType;
-    nativeAd[assetName] = asset[assetType].text || asset[assetType].value || utils.cleanObj({
+    nativeAd[assetName] = asset[assetType].text || asset[assetType].value || cleanObj({
       url: asset[assetType].url,
       width: asset[assetType].w,
       height: asset[assetType].h
     });
   });
-  return utils.cleanObj(nativeAd);
+  return cleanObj(nativeAd);
 }
diff --git a/modules/adliveBidAdapter.js b/modules/adliveBidAdapter.js
deleted file mode 100644
index 4c703628c4d..00000000000
--- a/modules/adliveBidAdapter.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'adlive';
-const ENDPOINT_URL = 'https://api.publishers.adlive.io/get?pbjs=1';
-
-const CURRENCY = 'USD';
-const TIME_TO_LIVE = 360;
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-
-  isBidRequestValid: function(bid) {
-    return !!(bid.params.hashes && utils.isArray(bid.params.hashes));
-  },
-
-  buildRequests: function(validBidRequests) {
-    let requests = [];
-
-    utils._each(validBidRequests, function(bid) {
-      requests.push({
-        method: 'POST',
-        url: ENDPOINT_URL,
-        options: {
-          contentType: 'application/json',
-          withCredentials: true
-        },
-        data: JSON.stringify({
-          transaction_id: bid.bidId,
-          hashes: utils.getBidIdParameter('hashes', bid.params)
-        }),
-        bidId: bid.bidId
-      });
-    });
-
-    return requests;
-  },
-
-  interpretResponse: function(serverResponse, bidRequest) {
-    try {
-      const response = serverResponse.body;
-      const bidResponses = [];
-
-      utils._each(response, function(bidResponse) {
-        if (!bidResponse.is_passback) {
-          bidResponses.push({
-            requestId: bidRequest.bidId,
-            cpm: bidResponse.price,
-            width: bidResponse.size[0],
-            height: bidResponse.size[1],
-            creativeId: bidResponse.hash,
-            currency: CURRENCY,
-            netRevenue: false,
-            ttl: TIME_TO_LIVE,
-            ad: bidResponse.content
-          });
-        }
-      });
-
-      return bidResponses;
-    } catch (err) {
-      utils.logError(err);
-      return [];
-    }
-  }
-};
-registerBidder(spec);
diff --git a/modules/adliveBidAdapter.md b/modules/adliveBidAdapter.md
deleted file mode 100644
index 4fc6a112e82..00000000000
--- a/modules/adliveBidAdapter.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Overview
-```
-Module Name: Adlive Bid Adapter
-Module Type: Bidder Adapter
-Maintainer: traffic@adlive.io
-```
-
-# Description
-Module that connects to Adlive's server for bids.
-Currently module supports only banner mediaType.
-
-# Test Parameters
-```
-    var adUnits = [{
-        code: '/test/div',
-        mediaTypes: {
-            banner: {
-                sizes: [[300, 250]]
-            }
-        },
-        bids: [{
-            bidder: 'adlive',
-            params: {
-                hashes: ['1e100887dd614b0909bf6c49ba7f69fdd1360437']
-            }
-        }]
-    }];
-```
\ No newline at end of file
diff --git a/modules/adlivetechBidAdapter.md b/modules/adlivetechBidAdapter.md
new file mode 100644
index 00000000000..612e669ea1a
--- /dev/null
+++ b/modules/adlivetechBidAdapter.md
@@ -0,0 +1,61 @@
+# Overview
+
+Module Name: Adlivetech Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: grid-tech@themediagrid.com
+
+# Description
+
+Module that connects to Grid demand source to fetch bids.
+The adapter is GDPR compliant and supports banner and video (instream and outstream).
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+               code: 'test-div',
+               sizes: [[300, 250]],
+               bids: [
+                   {
+                       bidder: "adlivetech",
+                       params: {
+                           uid: '1',
+                           bidFloor: 0.5
+                       }
+                   }
+               ]
+           },{
+               code: 'test-div',
+               sizes: [[728, 90]],
+               bids: [
+                   {
+                       bidder: "adlivetech",
+                       params: {
+                           uid: 2,
+                           keywords: {
+                               brandsafety: ['disaster'],
+                               topic: ['stress', 'fear']
+                           }
+                       }
+                   }
+               ]
+           },
+           {
+               code: 'test-div',
+               sizes: [[728, 90]],
+               mediaTypes: { video: {
+                   context: 'instream',
+                   playerSize: [728, 90],
+                   mimes: ['video/mp4']
+               },
+               bids: [
+                   {
+                       bidder: "adlivetech",
+                       params: {
+                           uid: 11
+                       }
+                   }
+               ]
+          }
+       ];
+```
diff --git a/modules/adlooxAdServerVideo.js b/modules/adlooxAdServerVideo.js
new file mode 100644
index 00000000000..bd715cb34f3
--- /dev/null
+++ b/modules/adlooxAdServerVideo.js
@@ -0,0 +1,223 @@
+/**
+ * This module adds [Adloox]{@link https://www.adloox.com/} Ad Server support for Video to Prebid
+ * @module modules/adlooxAdServerVideo
+ * @requires module:modules/adlooxAnalyticsAdapter
+ */
+
+/* eslint prebid/validate-imports: "off" */
+
+import { registerVideoSupport } from '../src/adServerManager.js';
+import { command as analyticsCommand, COMMAND } from './adlooxAnalyticsAdapter.js';
+import { ajax } from '../src/ajax.js';
+import CONSTANTS from '../src/constants.json';
+import { targeting } from '../src/targeting.js';
+import { logInfo, isFn, logError, isPlainObject, isStr, isBoolean, deepSetValue, deepClone, timestamp, logWarn } from '../src/utils.js';
+
+const MODULE = 'adlooxAdserverVideo';
+
+const URL_VAST = 'https://j.adlooxtracking.com/ads/vast/tag.php';
+
+export function buildVideoUrl(options, callback) {
+  logInfo(MODULE, 'buildVideoUrl', options);
+
+  if (!isFn(callback)) {
+    logError(MODULE, 'invalid callback');
+    return false;
+  }
+  if (!isPlainObject(options)) {
+    logError(MODULE, 'missing options');
+    return false;
+  }
+  if (!(options.url_vast === undefined || isStr(options.url_vast))) {
+    logError(MODULE, 'invalid url_vast options value');
+    return false;
+  }
+  if (!(isPlainObject(options.adUnit) || isPlainObject(options.bid))) {
+    logError(MODULE, "requires either 'adUnit' or 'bid' options value");
+    return false;
+  }
+  if (!isStr(options.url)) {
+    logError(MODULE, 'invalid url options value');
+    return false;
+  }
+  if (!(options.wrap === undefined || isBoolean(options.wrap))) {
+    logError(MODULE, 'invalid wrap options value');
+    return false;
+  }
+  if (!(options.blob === undefined || isBoolean(options.blob))) {
+    logError(MODULE, 'invalid blob options value');
+    return false;
+  }
+
+  // same logic used in modules/dfpAdServerVideo.js
+  options.bid = options.bid || targeting.getWinningBids(options.adUnit.code)[0];
+
+  deepSetValue(options.bid, 'ext.adloox.video.adserver', true);
+
+  if (options.wrap !== false) {
+    VASTWrapper(options, callback);
+  } else {
+    track(options, callback);
+  }
+
+  return true;
+}
+
+registerVideoSupport('adloox', {
+  buildVideoUrl: buildVideoUrl
+});
+
+function track(options, callback) {
+  callback(options.url);
+
+  const bid = deepClone(options.bid);
+  bid.ext.adloox.video.adserver = false;
+
+  analyticsCommand(COMMAND.TRACK, {
+    eventType: CONSTANTS.EVENTS.BID_WON,
+    args: bid
+  });
+}
+
+function VASTWrapper(options, callback) {
+  const chain = [];
+
+  function process(result) {
+    function getAd(xml) {
+      if (!xml || xml.documentElement.tagName != 'VAST') {
+        logError(MODULE, 'not a VAST tag, using non-wrapped tracking');
+        return;
+      }
+
+      const ads = xml.querySelectorAll('Ad');
+      if (!ads.length) {
+        logError(MODULE, 'no VAST ads, using non-wrapped tracking');
+        return;
+      }
+
+      // get first Ad (VAST may be an Ad Pod so sort on sequence and pick lowest sequence number)
+      const ad = Array.prototype.slice.call(ads).sort(function(a, b) {
+        return parseInt(a.getAttribute('sequence'), 10) - parseInt(b.getAttribute('sequence'), 10);
+      }).shift();
+
+      return ad;
+    }
+
+    function getWrapper(ad) {
+      return ad.querySelector('VASTAdTagURI');
+    }
+
+    function durationToSeconds(duration) {
+      return Date.parse('1970-01-01 ' + duration + 'Z') / 1000;
+    }
+
+    function blobify() {
+      if (!(chain.length > 0 && options.blob !== false)) return;
+
+      const urls = [];
+
+      function toBlob(r) {
+        const text = new XMLSerializer().serializeToString(r.xml);
+        const url = URL.createObjectURL(new Blob([text], { type: r.type }));
+        urls.push(url);
+        return url;
+      }
+
+      let n = chain.length - 1; // do not process the linear
+      while (n-- > 0) {
+        const ad = getAd(chain[n].xml);
+        const wrapper = getWrapper(ad);
+        wrapper.textContent = toBlob(chain[n + 1]);
+      }
+
+      options.url = toBlob(chain[0]);
+
+      const epoch = timestamp() - new Date().getTimezoneOffset() * 60 * 1000;
+      const expires0 = options.bid.ttl * 1000 - (epoch - options.bid.responseTimestamp);
+      const expires = Math.max(30 * 1000, expires0);
+      setTimeout(function() { urls.forEach(u => URL.revokeObjectURL(u)) }, expires);
+    }
+
+    if (!result) {
+      blobify();
+      return track(options, callback);
+    }
+
+    const ad = getAd(result.xml);
+    if (!ad) {
+      blobify();
+      return track(options, callback);
+    }
+
+    chain.push(result);
+
+    const wrapper = getWrapper(ad);
+    if (wrapper) {
+      if (chain.length > 5) {
+        logWarn(MODULE, `got wrapped tag at depth ${chain.length}, not continuing`);
+        blobify();
+        return track(options, callback);
+      }
+      return fetch(wrapper.textContent.trim());
+    }
+
+    blobify();
+
+    const version = chain[0].xml.documentElement.getAttribute('version');
+
+    const vpaid = ad.querySelector("MediaFiles > MediaFile[apiFramework='VPAID'][type='application/javascript']");
+
+    const duration = durationToSeconds(ad.querySelector('Duration').textContent.trim());
+
+    let skip;
+    const skipd = ad.querySelector('Linear').getAttribute('skipoffset');
+    if (skipd) skip = durationToSeconds(skipd.trim());
+
+    const args = [
+      [ 'client', '%%client%%' ],
+      [ 'platform_id', '%%platformid%%' ],
+      [ 'scriptname', 'adl_%%clientid%%' ],
+      [ 'tag_id', '%%tagid%%' ],
+      [ 'fwtype', 4 ],
+      [ 'vast', options.url ],
+      [ 'id11', 'video' ],
+      [ 'id12', '$ADLOOX_WEBSITE' ],
+      [ 'id18', (!skip || skip >= duration) ? 'fd' : 'od' ],
+      [ 'id19', 'na' ],
+      [ 'id20', 'na' ]
+    ];
+    if (version && version != 3) args.push([ 'version', version ]);
+    if (vpaid) args.push([ 'vpaid', 1 ]);
+    if (duration != 15) args.push([ 'duration', duration ]);
+    if (skip) args.push([ 'skip', skip ]);
+
+    logInfo(MODULE, `processed VAST tag chain of depth ${chain.depth}, running callback`);
+
+    analyticsCommand(COMMAND.URL, {
+      url: (options.url_vast || URL_VAST) + '?',
+      args: args,
+      bid: options.bid,
+      ids: true
+    }, callback);
+  }
+
+  function fetch(url, withoutcredentials) {
+    logInfo(MODULE, `fetching VAST ${url}`);
+
+    ajax(url, {
+      success: function(responseText, q) {
+        process({ type: q.getResponseHeader('content-type'), xml: q.responseXML });
+      },
+      error: function(statusText, q) {
+        if (!withoutcredentials) {
+          logWarn(MODULE, `unable to download (${statusText}), suspected CORS withCredentials problem, retrying without`);
+          return fetch(url, true);
+        }
+        logError(MODULE, `failed to fetch (${statusText}), using non-wrapped tracking`);
+        process();
+      }
+    }, undefined, { withCredentials: !withoutcredentials });
+  }
+
+  fetch(options.url);
+}
diff --git a/modules/adlooxAdServerVideo.md b/modules/adlooxAdServerVideo.md
new file mode 100644
index 00000000000..db8e3cfb295
--- /dev/null
+++ b/modules/adlooxAdServerVideo.md
@@ -0,0 +1,92 @@
+# Overview
+
+    Module Name: Adloox Ad Server Video
+    Module Type: Ad Server Video
+    Maintainer: contact@adloox.com
+
+# Description
+
+Ad Server Video for adloox.com. Contact contact@adloox.com for information.
+
+This module pairs with the [Adloox Analytics Adapter](./adlooxAnalyticsAdapter.md) to provide video tracking and measurement.
+
+Prebid.js does not support [`bidWon` events for video](https://github.com/prebid/prebid.github.io/issues/1320) without the [Instream Video Ads Tracking](https://docs.prebid.org/dev-docs/modules/instreamTracking.html) module that has the limitations:
+
+ * works only with instream video
+ * viewability metrics are *not* [MRC accredited](http://mediaratingcouncil.org/)
+
+This module has two modes of operation configurable with the `wrap` parameter below:
+
+ * **`true` [default]:**
+     * provides MRC accredited viewability measurement of your [IAB](https://www.iab.com/) [VPAID](https://iabtechlab.com/standards/video-player-ad-interface-definition-vpaid/) and [OM SDK](https://iabtechlab.com/standards/open-measurement-sdk/) enabled inventory
+     * VAST tracking is collected by Adloox
+     * wraps the winning bid VAST URL with the Adloox VAST/VPAID wrapper (`https://j.adlooxtracking.com/ads/vast/tag.php?...`)
+ * **`false`:**
+     * sends a `bidWon` event *only* to the Adloox Analytics Adapter
+     * inventory is measured
+     * viewability metrics are *not* MRC accredited.
+     * VAST tracking is *not* collected by Adloox
+
+**N.B.** this module is compatible for use alongside the Instream Video Ads Tracking module though not required in order to function
+
+## Example
+
+To view an example of an Adloox integration look at the example provided in the [Adloox Analytics Adapter documentation](./adlooxAnalyticsAdapter.md#example).
+
+# Integration
+
+To use this, you *must* also integrate the [Adloox Analytics Adapter](./adlooxAnalyticsAdapter.md) (and optionally the Instream Video Ads Tracking module) as shown below:
+
+    function sendAdserverRequest(bids, timedOut, auctionId) {
+      if (pbjs.initAdserverSet) return;
+      pbjs.initAdserverSet = true;
+
+      // handle display tags as usual
+      googletag.cmd.push(function() {
+        pbjs.setTargetingForGPTAsync && pbjs.setTargetingForGPTAsync(adUnits);
+        googletag.pubads().refresh();
+      });
+
+      // handle the bids on the video adUnit
+      var videoBids = bids[videoAdUnit.code];
+      if (videoBids) {
+        var videoUrl = pbjs.adServers.dfp.buildVideoUrl({
+          adUnit: videoAdUnit,
+          params: {
+            iu: '/19968336/prebid_cache_video_adunit',
+            cust_params: {
+              section: 'blog',
+              anotherKey: 'anotherValue'
+            },
+            output: 'vast'
+          }
+        });
+        pbjs.adServers.adloox.buildVideoUrl({
+          adUnit: videoAdUnit,
+          url: videoUrl
+        }, invokeVideoPlayer);
+      }
+    }
+
+The helper function takes the form:
+
+    pbjs.adServers.adloox.buildVideoUrl(options, callback)
+
+Where:
+
+ * **`options`:** configuration object:
+     * **`adUnit`:** ad unit that is being filled
+     * **`bid` [optional]:** if you override the hardcoded `pbjs.adServers.dfp.buildVideoUrl(...)` logic that picks the first bid you *must* pass in the `bid` object you select
+     * **`url`:** VAST tag URL, typically the value returned by `pbjs.adServers.dfp.buildVideoUrl(...)`
+     * **`wrap`:**
+         * **`true` [default]:** VAST tag is be converted to an Adloox VAST wrapped tag
+         * **`false`:** VAST tag URL is returned as is
+     * **`blob`:**
+         * **`true` [default]:** [Blob URL](https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL) is returned so that the VAST tag is only fetched once
+             * only has an affect when `wrap` is set to `true`
+         * **`false`:** VAST tag may be fetched twice depending on your Ad Server and video player configuration
+             * use when the ad is served into a cross-origin (non-friendly) IFRAME
+             * use if during QAing you discover your video player does not supports Blob URLs; widely supported (including JW Player) so contact your player vendor to resolve this where possible for the best user and device experience
+ * **`callback`:** function you use to pass the VAST tag URL to your video player
+
+**N.B.** call `pbjs.adServers.adloox.buildVideoUrl(...)` as close as possible to starting the ad to reduce impression discrepancies
diff --git a/modules/adlooxAnalyticsAdapter.js b/modules/adlooxAnalyticsAdapter.js
new file mode 100644
index 00000000000..5db75c656bb
--- /dev/null
+++ b/modules/adlooxAnalyticsAdapter.js
@@ -0,0 +1,322 @@
+/**
+ * This module provides [Adloox]{@link https://www.adloox.com/} Analytics
+ * The module will inject Adloox's verification JS tag alongside slot at bidWin
+ * @module modules/adlooxAnalyticsAdapter
+ */
+
+import adapterManager from '../src/adapterManager.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import {loadExternalScript} from '../src/adloader.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {AUCTION_COMPLETED} from '../src/auction.js';
+import CONSTANTS from '../src/constants.json';
+import {find} from '../src/polyfill.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {
+  deepAccess,
+  getGptSlotInfoForAdUnitCode,
+  getUniqueIdentifierStr,
+  insertElement,
+  isFn,
+  isNumber,
+  isPlainObject,
+  isStr,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  mergeDeep,
+  parseUrl
+} from '../src/utils.js';
+
+const MODULE = 'adlooxAnalyticsAdapter';
+
+const URL_JS = 'https://j.adlooxtracking.com/ads/js/tfav_adl_%%clientid%%.js';
+
+const ADLOOX_VENDOR_ID = 93;
+
+const ADLOOX_MEDIATYPE = {
+  DISPLAY: 2,
+  VIDEO: 6
+};
+
+const MACRO = {};
+MACRO['client'] = function(b, c) {
+  return c.client;
+};
+MACRO['clientid'] = function(b, c) {
+  return c.clientid;
+};
+MACRO['tagid'] = function(b, c) {
+  return c.tagid;
+};
+MACRO['platformid'] = function(b, c) {
+  return c.platformid;
+};
+MACRO['targetelt'] = function(b, c) {
+  return c.toselector(b);
+};
+MACRO['creatype'] = function(b, c) {
+  return b.mediaType == 'video' ? ADLOOX_MEDIATYPE.VIDEO : ADLOOX_MEDIATYPE.DISPLAY;
+};
+MACRO['pageurl'] = function(b, c) {
+  const refererInfo = getRefererInfo();
+  return (refererInfo.page || '').substr(0, 300).split(/[?#]/)[0];
+};
+MACRO['gpid'] = function(b, c) {
+  const adUnit = find(auctionManager.getAdUnits(), a => b.adUnitCode === a.code);
+  return deepAccess(adUnit, 'ortb2Imp.ext.gpid') || deepAccess(adUnit, 'ortb2Imp.ext.data.pbadslot') || getGptSlotInfoForAdUnitCode(b.adUnitCode).gptSlot || b.adUnitCode;
+};
+MACRO['pbAdSlot'] = MACRO['pbadslot'] = MACRO['gpid']; // legacy
+
+const PARAMS_DEFAULT = {
+  'id1': function(b) { return b.adUnitCode },
+  'id2': '%%gpid%%',
+  'id3': function(b) { return b.bidder },
+  'id4': function(b) { return b.adId },
+  'id5': function(b) { return b.dealId },
+  'id6': function(b) { return b.creativeId },
+  'id7': function(b) { return b.size },
+  'id11': '$ADLOOX_WEBSITE'
+};
+
+const NOOP = function() {};
+
+let analyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoint' }), {
+  track({ eventType, args }) {
+    if (!analyticsAdapter[`handle_${eventType}`]) return;
+
+    logInfo(MODULE, 'track', eventType, args);
+
+    analyticsAdapter[`handle_${eventType}`](args);
+  }
+});
+
+analyticsAdapter.context = null;
+
+analyticsAdapter.originEnableAnalytics = analyticsAdapter.enableAnalytics;
+analyticsAdapter.enableAnalytics = function(config) {
+  analyticsAdapter.context = null;
+
+  logInfo(MODULE, 'config', config);
+
+  if (!isPlainObject(config.options)) {
+    logError(MODULE, 'missing options');
+    return;
+  }
+  if (!(config.options.js === undefined || isStr(config.options.js))) {
+    logError(MODULE, 'invalid js options value');
+    return;
+  }
+  if (!(config.options.toselector === undefined || isFn(config.options.toselector))) {
+    logError(MODULE, 'invalid toselector options value');
+    return;
+  }
+  if (!isStr(config.options.client)) {
+    logError(MODULE, 'invalid client options value');
+    return;
+  }
+  if (!isNumber(config.options.clientid)) {
+    logError(MODULE, 'invalid clientid options value');
+    return;
+  }
+  if (!isNumber(config.options.tagid)) {
+    logError(MODULE, 'invalid tagid options value');
+    return;
+  }
+  if (!isNumber(config.options.platformid)) {
+    logError(MODULE, 'invalid platformid options value');
+    return;
+  }
+  if (!(config.options.params === undefined || isPlainObject(config.options.params))) {
+    logError(MODULE, 'invalid params options value');
+    return;
+  }
+
+  analyticsAdapter.context = {
+    js: config.options.js || URL_JS,
+    toselector: config.options.toselector || function(bid) {
+      let code = getGptSlotInfoForAdUnitCode(bid.adUnitCode).divId || bid.adUnitCode;
+      // https://mathiasbynens.be/notes/css-escapes
+      try {
+        code = CSS.escape(code);
+      } catch (_) {
+        code = code.replace(/^\d/, '\\3$& ');
+      }
+      return `#${code}`
+    },
+    client: config.options.client,
+    clientid: config.options.clientid,
+    tagid: config.options.tagid,
+    platformid: config.options.platformid,
+    params: []
+  };
+
+  config.options.params = mergeDeep({}, PARAMS_DEFAULT, config.options.params || {});
+  Object
+    .keys(config.options.params)
+    .forEach(k => {
+      if (!Array.isArray(config.options.params[k])) {
+        config.options.params[k] = [ config.options.params[k] ];
+      }
+      config.options.params[k].forEach(v => analyticsAdapter.context.params.push([ k, v ]));
+    });
+
+  Object.keys(COMMAND_QUEUE).forEach(commandProcess);
+
+  analyticsAdapter.originEnableAnalytics(config);
+}
+
+analyticsAdapter.originDisableAnalytics = analyticsAdapter.disableAnalytics;
+analyticsAdapter.disableAnalytics = function() {
+  analyticsAdapter.context = null;
+
+  analyticsAdapter.originDisableAnalytics();
+}
+
+analyticsAdapter.url = function(url, args, bid) {
+  // utils.formatQS outputs PHP encoded querystrings... (╯°□°)╯ ┻━┻
+  function a2qs(a) {
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
+    function fixedEncodeURIComponent(str) {
+      return encodeURIComponent(str).replace(/[!'()*]/g, function(c) {
+        return '%' + c.charCodeAt(0).toString(16);
+      });
+    }
+
+    const args = [];
+    let n = a.length;
+    while (n-- > 0) {
+      if (!(a[n][1] === undefined || a[n][1] === null || a[n][1] === false)) {
+        args.unshift(fixedEncodeURIComponent(a[n][0]) + (a[n][1] !== true ? ('=' + fixedEncodeURIComponent(a[n][1])) : ''));
+      }
+    }
+
+    return args.join('&');
+  }
+
+  const macros = (str) => {
+    return str.replace(/%%([a-z]+)%%/gi, (match, p1) => MACRO[p1] ? MACRO[p1](bid, analyticsAdapter.context) : match);
+  };
+
+  url = macros(url);
+  args = args || [];
+
+  let n = args.length;
+  while (n-- > 0) {
+    if (isFn(args[n][1])) {
+      try {
+        args[n][1] = args[n][1](bid);
+      } catch (_) {
+        logError(MODULE, 'macro', args[n][0], _.message);
+        args[n][1] = `ERROR: ${_.message}`;
+      }
+    }
+    if (isStr(args[n][1])) {
+      args[n][1] = macros(args[n][1]);
+    }
+  }
+
+  return url + a2qs(args);
+}
+
+analyticsAdapter[`handle_${CONSTANTS.EVENTS.AUCTION_END}`] = function(auctionDetails) {
+  if (!(auctionDetails.auctionStatus == AUCTION_COMPLETED && auctionDetails.bidsReceived.length > 0)) return;
+  analyticsAdapter[`handle_${CONSTANTS.EVENTS.AUCTION_END}`] = NOOP;
+
+  logMessage(MODULE, 'preloading verification JS');
+
+  const uri = parseUrl(analyticsAdapter.url(`${analyticsAdapter.context.js}#`));
+
+  const link = document.createElement('link');
+  link.setAttribute('href', `${uri.protocol}://${uri.host}${uri.pathname}`);
+  link.setAttribute('rel', 'preload');
+  link.setAttribute('as', 'script');
+  insertElement(link);
+}
+
+analyticsAdapter[`handle_${CONSTANTS.EVENTS.BID_WON}`] = function(bid) {
+  if (deepAccess(bid, 'ext.adloox.video.adserver')) {
+    logMessage(MODULE, `measuring '${bid.mediaType}' ad unit code '${bid.adUnitCode}' via Ad Server module`);
+    return;
+  }
+
+  const sl = analyticsAdapter.context.toselector(bid);
+  let el;
+  try {
+    el = document.querySelector(sl);
+  } catch (_) { }
+  if (!el) {
+    logWarn(MODULE, `unable to find ad unit code '${bid.adUnitCode}' slot using selector '${sl}' (use options.toselector to change), ignoring`);
+    return;
+  }
+
+  logMessage(MODULE, `measuring '${bid.mediaType}' unit at '${bid.adUnitCode}'`);
+
+  const params = analyticsAdapter.context.params.concat([
+    [ 'tagid', '%%tagid%%' ],
+    [ 'platform', '%%platformid%%' ],
+    [ 'fwtype', 4 ],
+    [ 'targetelt', '%%targetelt%%' ],
+    [ 'creatype', '%%creatype%%' ]
+  ]);
+
+  loadExternalScript(analyticsAdapter.url(`${analyticsAdapter.context.js}#`, params, bid), 'adloox');
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: analyticsAdapter,
+  code: 'adloox',
+  gvlid: ADLOOX_VENDOR_ID
+});
+
+export default analyticsAdapter;
+
+// src/events.js does not support custom events or handle races... (╯°□°)╯ ┻━┻
+const COMMAND_QUEUE = {};
+export const COMMAND = {
+  CONFIG: 'config',
+  TOSELECTOR: 'toselector',
+  URL: 'url',
+  TRACK: 'track'
+};
+export function command(cmd, data, callback0) {
+  const cid = getUniqueIdentifierStr();
+  const callback = function() {
+    delete COMMAND_QUEUE[cid];
+    if (callback0) callback0.apply(null, arguments);
+  };
+  COMMAND_QUEUE[cid] = { cmd, data, callback };
+  if (analyticsAdapter.context) commandProcess(cid);
+}
+function commandProcess(cid) {
+  const { cmd, data, callback } = COMMAND_QUEUE[cid];
+
+  logInfo(MODULE, 'command', cmd, data);
+
+  switch (cmd) {
+    case COMMAND.CONFIG:
+      const response = {
+        client: analyticsAdapter.context.client,
+        clientid: analyticsAdapter.context.clientid,
+        tagid: analyticsAdapter.context.tagid,
+        platformid: analyticsAdapter.context.platformid
+      };
+      callback(response);
+      break;
+    case COMMAND.TOSELECTOR:
+      callback(analyticsAdapter.context.toselector(data.bid));
+      break;
+    case COMMAND.URL:
+      if (data.ids) data.args = data.args.concat(analyticsAdapter.context.params.filter(p => /^id([1-9]|10)$/.test(p[0]))); // not >10
+      callback(analyticsAdapter.url(data.url, data.args, data.bid));
+      break;
+    case COMMAND.TRACK:
+      analyticsAdapter.track(data);
+      callback(); // drain queue
+      break;
+    default:
+      logWarn(MODULE, 'command unknown', cmd);
+      // do not callback as arguments are unknown and to aid debugging
+  }
+}
diff --git a/modules/adlooxAnalyticsAdapter.md b/modules/adlooxAnalyticsAdapter.md
new file mode 100644
index 00000000000..203b118652e
--- /dev/null
+++ b/modules/adlooxAnalyticsAdapter.md
@@ -0,0 +1,156 @@
+# Overview
+
+    Module Name: Adloox Analytics Adapter
+    Module Type: Analytics Adapter
+    Maintainer: contact@adloox.com
+
+# Description
+
+Analytics adapter for adloox.com. Contact contact@adloox.com for information.
+
+This module can be used to track:
+
+ * Display
+ * Native
+ * Video (see below for further instructions)
+
+The adapter adds an HTML `<script>` tag to load Adloox's post-buy verification JavaScript (`https://j.adlooxtracking.com/ads/js/tfav_adl_X.js` at ~25kiB gzipped) when the [`bidWon` event](https://docs.prebid.org/dev-docs/publisher-api-reference.html#module_pbjs.onEvent) is fired for each ad slot.
+
+## Video
+
+When tracking video you have two options:
+
+ * [Instream Video Ads Tracking](https://docs.prebid.org/dev-docs/modules/instreamTracking.html)
+     * only suitable for instream video bids
+     * VAST events are not collected by Adloox
+     * viewability metrics are *not* [MRC accredited](http://mediaratingcouncil.org/)
+ * [Adloox Ad Server Video](./adlooxAdServerVideo.md)
+     * works by by wrapping the Ad Server VAST URL
+     * viewability metrics are MRC accredited for [IAB](https://www.iab.com/) [VPAID](https://iabtechlab.com/standards/video-player-ad-interface-definition-vpaid/) and [OM SDK](https://iabtechlab.com/standards/open-measurement-sdk/) enable inventory
+     * compatible for use alongside the Instream Video Ads Tracking module though not required in order to function
+     * slightly more complicated though straight forward to implement
+
+## Example
+
+To view an [example of an Adloox integration](../integrationExamples/gpt/adloox.html):
+
+    gulp serve --nolint --notest --modules=gptPreAuction,categoryTranslation,dfpAdServerVideo,rtdModule,instreamTracking,rubiconBidAdapter,spotxBidAdapter,adlooxAnalyticsAdapter,adlooxAdServerVideo,adlooxRtdProvider
+
+**N.B.** `categoryTranslation` is required by `dfpAdServerVideo` that otherwise causes a JavaScript console warning
+
+Now point your browser at: http://localhost:9999/integrationExamples/gpt/adloox.html?pbjs_debug=true
+
+### Public Example
+
+The example is published publically at: https://storage.googleapis.com/adloox-ads-js-test/prebid.html?pbjs_debug=true
+
+**N.B.** this will show a [CORS error](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS/Errors) for the request `https://p.adlooxtracking.com/q?...` that is safe to ignore on the public example page; it is related to the [RTD integration](./adlooxRtdProvider.md) which requires pre-registration of your sites
+
+It is recommended you use [Google Chrome's 'Local Overrides' located in the Developer Tools panel](https://www.trysmudford.com/blog/chrome-local-overrides/) to explore the example without the inconvience of having to run your own web server.
+
+#### Pre-built `prebid.js`
+
+If you are unable to build code on your system, then you may wish to experiment with a full (all modules enabled) version of the `prebid.js` script with the above three Adloox modules included published at:
+
+    https://storage.googleapis.com/adloox-ads-js-test/prebid.js
+
+You should be able to use this during the QA process of your own internal testing sites.
+
+**N.B.** do *not* use this link or the code at it in production
+
+### Testing
+
+The main Prebid.js documentation is a bit opaque on this but you can use the following to test only Adloox's modules:
+
+    gulp lint
+    gulp test-coverage --file 'test/spec/modules/adloox{AnalyticsAdapter,AdServerVideo,RtdProvider}_spec.js'
+    gulp view-coverage
+
+# Integration
+
+    pbjs.enableAnalytics({
+      provider: 'adloox',
+      options: {
+        //toselector: function(bid) { return '#' + bid.adUnitCode },
+        client: 'adlooxtest',
+        clientid: 127,
+        platformid: 0,
+        tagid: 0
+      }
+    });
+
+The options `client`, `clientid`, `platformid` and `tagid` are supplied by Adloox to you and *must* be provided in the configuration.
+
+### `toselector` Option
+
+For non-GPT integrations, the module expects the value of `adUnitCode` from the [bid object](https://docs.prebid.org/dev-docs/publisher-api-reference.html#module_pbjs.getBidResponses) to match the div ID of the unit to facilitate measurements made against it.
+
+**N.B.** for GPT integrations the div ID is automatically discovered and you should *not* use this option
+
+When not true for your environment (you will see a warning stating 'unable to find ad unit code') you should provide a function through the option `toselector` that when passed the bid object it returns the [selector](https://www.javascripttutorial.net/javascript-dom/javascript-queryselector/) for the slot; internally the module will pass this value to [`document.querySelector()`](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelector) to obtain the actual slot.
+
+By example, the default handler used for `options.toselector` when not supplied is shown above though internally some [basic escaping](https://mathiasbynens.be/notes/css-escapes) is applied but omitted here for reasons of clarity; your own handler will need to provide its own escaping where necessary.
+
+## Parameters
+
+The Adloox 'Impression JavaScript Tag Integration Guidelines' provide details on parameters (for the `params` block) you can pass that configure the Adloox verification JavaScript for your inventory.
+
+For example, you have a number of reporting breakdown slots available in the form of `id{1->10}` that are configurable with:
+
+    pbjs.enableAnalytics({
+      provider: 'adloox',
+      options: {
+        client: 'adlooxtest',
+        clientid: 127,
+        platformid: 0,
+        tagid: 0,
+        params: {
+          id1: function(b) { return b.adUnitCode },  // do not change when using the Adloox RTD Provider
+          id2: '%%gpid%%',                           // do not change when using the Adloox RTD Provider
+          id3: function(b) { return b.bidder },
+          id4: function(b) { return b.adId },
+          id5: function(b) { return b.dealId },
+          id6: function(b) { return b.creativeId },
+          id7: function(b) { return b.size },
+          id11: '$ADLOOX_WEBSITE'                    // do not change, Adloox internal use only
+        }
+      }
+    });
+
+**N.B.** `params` shown above is the default and may be omitted altogether if you wish to make no changes
+
+**N.B.** values that return `false`, `null`, or `undefined` are not sent whilst values of `true` return just the key
+
+### Macros
+
+The following macros are available
+
+ * **`%%gpid%%` (alias `%%pbadslot%%`**): [Prebid Ad Slot](https://docs.prebid.org/features/pbAdSlot.html) returns [`AdUnit.code`](https://docs.prebid.org/features/pbAdSlot.html) if set otherwise returns [`AdUnit.code`](https://docs.prebid.org/dev-docs/adunit-reference.html#adunit)
+     * it is recommended you read the [Prebid Ad Slot section in the Adloox RTD Provider documentation](./adlooxRtdProvider.md#prebid-ad-slot)
+ * **`%%pageurl%%`**: [`canonicalUrl`](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-Page-URL) from the [`refererInfo` object](https://docs.prebid.org/dev-docs/bidder-adaptor.html#referrers) otherwise uses `referer`
+
+### Functions
+
+You may also supply a function to dynamically generate the value of the parameter from the bid response; the function is passed a single argument that corresponds to the [BidResponse](https://docs.prebid.org/dev-docs/publisher-api-reference.html#module_pbjs.getBidResponses) object seen at the `bidWon` event.
+
+You can look to the default `params` section above for examples of how to use this.
+
+If your function throws an exception, it will be caught and the value set (and observable in Adloox's reporting) to:
+
+    ERROR: <Error>
+
+Where `<Error>` is the value from [`Error.prototype.message`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/message).
+
+### Multi-value
+
+Some parameters, such as `px_imp` and `bridge`, can take multiple values and can be described by providing an array:
+
+    params: {
+      ...
+      px_imp: [
+        'https://example.com/some/third/party/pixel.gif',
+        'https://example.net/other/third/party/pixel.png',
+        function(b){ return 'https://example.org/' + b.bidder + '/pixel.jpg' }
+      ],
+      ...
+    }
diff --git a/modules/adlooxRtdProvider.js b/modules/adlooxRtdProvider.js
new file mode 100644
index 00000000000..8862ac8ac47
--- /dev/null
+++ b/modules/adlooxRtdProvider.js
@@ -0,0 +1,405 @@
+/**
+ * This module adds the Adloox provider to the real time data module
+ * This module adds the [Adloox]{@link https://www.adloox.com/} provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch segments from Adloox's server
+ * @module modules/adlooxRtdProvider
+ * @requires module:modules/realTimeData
+ * @requires module:modules/adlooxAnalyticsAdapter
+ */
+
+/* eslint standard/no-callback-literal: "off" */
+/* eslint prebid/validate-imports: "off" */
+
+import {command as analyticsCommand, COMMAND} from './adlooxAnalyticsAdapter.js';
+import {submodule} from '../src/hook.js';
+import {ajax} from '../src/ajax.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {
+  _each,
+  deepAccess,
+  deepSetValue,
+  getAdUnitSizes,
+  getGptSlotInfoForAdUnitCode,
+  isArray,
+  isBoolean,
+  isInteger,
+  isPlainObject,
+  isStr,
+  logError,
+  logInfo,
+  logWarn,
+  mergeDeep
+} from '../src/utils.js';
+import {includes} from '../src/polyfill.js';
+
+const MODULE_NAME = 'adloox';
+const MODULE = `${MODULE_NAME}RtdProvider`;
+
+const API_ORIGIN = 'https://p.adlooxtracking.com';
+const SEGMENT_HISTORIC = { 'a': 'aud', 'd': 'dis', 'v': 'vid' };
+const SEGMENT_HISTORIC_VALUES = Object.keys(SEGMENT_HISTORIC).map(k => SEGMENT_HISTORIC[k]);
+
+const ADSERVER_TARGETING_PREFIX = 'adl_';
+
+const CREATIVE_WIDTH_MIN = 20;
+const CREATIVE_HEIGHT_MIN = 20;
+const CREATIVE_AREA_MIN = CREATIVE_WIDTH_MIN * CREATIVE_HEIGHT_MIN;
+// try to avoid using IntersectionObserver as it has unbounded (observed multi-second) latency
+let intersectionObserver = window == top ? false : undefined;
+const intersectionObserverElements = [];
+// .map/.findIndex are safe here as they are only used for intersectionObserver
+function atf(adUnit, cb) {
+  analyticsCommand(COMMAND.TOSELECTOR, { bid: { adUnitCode: adUnit.code } }, function(selector) {
+    const element = document.querySelector(selector);
+    if (!element) return cb(null);
+
+    if (window.getComputedStyle(element)['display'] == 'none') return cb(NaN);
+
+    try {
+      // short circuit for cross-origin
+      if (intersectionObserver) throw false;
+
+      // Google's advice is to collapse slots on no fill but
+      // we have to cater to clients that grow slots on fill
+      const rect = (function(rect) {
+        const sizes = getAdUnitSizes(adUnit);
+
+        if (sizes.length == 0) return false;
+        // interstitial (0x0, 1x1)
+        if (sizes.length == 1 && (sizes[0][0] * sizes[0][1]) <= 1) return true;
+        // try to catch premium slots (coord=0,0) as they will likely bounce into view
+        if (rect.top <= -window.pageYOffset && rect.left <= -window.pageXOffset && rect.top == rect.bottom) return true;
+
+        // pick the smallest creative size as many publishers will just leave the element unbounded in the vertical
+        let width = Infinity;
+        let height = Infinity;
+        for (let i = 0; i < sizes.length; i++) {
+          const area = sizes[i][0] * sizes[i][1];
+          if (area < CREATIVE_AREA_MIN) continue;
+          if (area < (width * height)) {
+            width = sizes[i][0];
+            height = sizes[i][1];
+          }
+        }
+        // we also scale the smallest size to the size of the slot as publishers resize units depending on viewport
+        const scale = Math.min(1, (rect.right - rect.left) / width);
+
+        return {
+          left: rect.left,
+          right: rect.left + Math.max(CREATIVE_WIDTH_MIN, scale * width),
+          top: rect.top,
+          bottom: rect.top + Math.max(CREATIVE_HEIGHT_MIN, scale * height)
+        };
+      })(element.getBoundingClientRect());
+
+      if (rect === false) return cb(NaN);
+      if (rect === true) return cb(1);
+
+      const W = rect.right - rect.left;
+      const H = rect.bottom - rect.top;
+
+      if (W * H < CREATIVE_AREA_MIN) return cb(NaN);
+
+      let el;
+      let win = window;
+      while (1) {
+        // https://stackoverflow.com/a/8876069
+        const vw = Math.max(win.document.documentElement.clientWidth || 0, win.innerWidth || 0);
+        const vh = Math.max(win.document.documentElement.clientHeight || 0, win.innerHeight || 0);
+
+        // cut to viewport
+        rect.left = Math.min(Math.max(rect.left, 0), vw);
+        rect.right = Math.min(Math.max(rect.right, 0), vw);
+        rect.top = Math.min(Math.max(rect.top, 0), vh);
+        rect.bottom = Math.min(Math.max(rect.bottom, 0), vh);
+
+        if (win == top) return cb(((rect.right - rect.left) * (rect.bottom - rect.top)) / (W * H));
+        el = win.frameElement;
+        if (!el) throw false; // cross-origin
+        win = win.parent;
+
+        // transpose to frame element
+        const frameElementRect = el.getBoundingClientRect();
+        rect.left += frameElementRect.left;
+        rect.right = Math.min(rect.right + frameElementRect.left, frameElementRect.right);
+        rect.top += frameElementRect.top;
+        rect.bottom = Math.min(rect.bottom + frameElementRect.top, frameElementRect.bottom);
+      }
+    } catch (_) {
+      if (intersectionObserver === undefined) {
+        try {
+          intersectionObserver = new IntersectionObserver(function(entries) {
+            entries.forEach(entry => {
+              const ratio = entry.intersectionRect.width * entry.intersectionRect.height < CREATIVE_AREA_MIN ? NaN : entry.intersectionRatio;
+              const idx = intersectionObserverElements.findIndex(x => x.element == entry.target);
+              intersectionObserverElements[idx].cb.forEach(cb => cb(ratio));
+              intersectionObserverElements.splice(idx, 1);
+              intersectionObserver.unobserve(entry.target);
+            });
+          });
+        } catch (_) {
+          intersectionObserver = false;
+        }
+      }
+      if (!intersectionObserver) return cb(null);
+      const idx = intersectionObserverElements.findIndex(x => x.element == element);
+      if (idx == -1) {
+        intersectionObserverElements.push({ element, cb: [ cb ] });
+        intersectionObserver.observe(element);
+      } else {
+        intersectionObserverElements[idx].cb.push(cb);
+      }
+    }
+  });
+}
+
+function init(config, userConsent) {
+  logInfo(MODULE, 'init', config, userConsent);
+
+  if (!isPlainObject(config)) {
+    logError(MODULE, 'missing config');
+    return false;
+  }
+  if (config.params === undefined) config.params = {};
+  if (!(isPlainObject(config.params))) {
+    logError(MODULE, 'invalid params');
+    return false;
+  }
+  if (!(config.params.api_origin === undefined || isStr(config.params.api_origin))) {
+    logError(MODULE, 'invalid api_origin params value');
+    return false;
+  }
+  if (!(config.params.imps === undefined || (isInteger(config.params.imps) && config.params.imps > 0))) {
+    logError(MODULE, 'invalid imps params value');
+    return false;
+  }
+  if (!(config.params.freqcap_ip === undefined || (isInteger(config.params.freqcap_ip) && config.params.freqcap_ip >= 0))) {
+    logError(MODULE, 'invalid freqcap_ip params value');
+    return false;
+  }
+  if (!(config.params.freqcap_ipua === undefined || (isInteger(config.params.freqcap_ipua) && config.params.freqcap_ipua >= 0))) {
+    logError(MODULE, 'invalid freqcap_ipua params value');
+    return false;
+  }
+  if (!(config.params.thresholds === undefined || (isArray(config.params.thresholds) && config.params.thresholds.every(x => isInteger(x) && x > 0 && x <= 100)))) {
+    logError(MODULE, 'invalid thresholds params value');
+    return false;
+  }
+  if (!(config.params.slotinpath === undefined || isBoolean(config.params.slotinpath))) {
+    logError(MODULE, 'invalid slotinpath params value');
+    return false;
+  }
+  // legacy/deprecated configuration code path
+  if (!(config.params.params === undefined || (isPlainObject(config.params.params) && isInteger(config.params.params.clientid) && isInteger(config.params.params.tagid) && isInteger(config.params.params.platformid)))) {
+    logError(MODULE, 'invalid subsection params block');
+    return false;
+  }
+
+  config.params.thresholds = config.params.thresholds || [ 50, 60, 70, 80, 90 ];
+
+  function analyticsConfigCallback(data) {
+    config = mergeDeep(config.params, data);
+  }
+  if (config.params.params) {
+    logWarn(MODULE, `legacy/deprecated configuration (please migrate to ${MODULE_NAME}AnalyticsAdapter)`);
+    analyticsConfigCallback(config.params.params);
+  } else {
+    analyticsCommand(COMMAND.CONFIG, null, analyticsConfigCallback);
+  }
+
+  return true;
+}
+
+function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
+  // gptPreAuction runs *after* RTD so pbadslot may not be populated... (╯°□°)╯ ┻━┻
+  const adUnits = (reqBidsConfigObj.adUnits || getGlobal().adUnits).map(adUnit => {
+    return {
+      gpid: deepAccess(adUnit, 'ortb2Imp.ext.gpid') || deepAccess(adUnit, 'ortb2Imp.ext.data.pbadslot') || getGptSlotInfoForAdUnitCode(adUnit.code).gptSlot || adUnit.code,
+      unit: adUnit
+    };
+  }).filter(adUnit => !!adUnit.gpid);
+
+  let response = {};
+  function setSegments() {
+    function val(v, k) {
+      if (!((SEGMENT_HISTORIC[k] || k == 'atf') && v >= 0)) return v;
+      return config.params.thresholds.filter(t => t <= v);
+    }
+
+    const ortb2 = reqBidsConfigObj.ortb2Fragments?.global || {};
+    const dataSite = deepAccess(ortb2, 'site.ext.data') || {};
+    const dataUser = deepAccess(ortb2, 'user.ext.data') || {};
+
+    _each(response, (v0, k0) => {
+      if (k0 == '_') return;
+      const k = SEGMENT_HISTORIC[k0] || k0;
+      const v = val(v0, k0);
+      deepSetValue(k == k0 ? dataUser : dataSite, `${MODULE_NAME}_rtd.${k}`, v);
+    });
+    deepSetValue(dataSite, `${MODULE_NAME}_rtd.ok`, true);
+
+    deepSetValue(ortb2, 'site.ext.data', dataSite);
+    deepSetValue(ortb2, 'user.ext.data', dataUser);
+    deepSetValue(reqBidsConfigObj, 'ortb2Fragments.global', ortb2);
+
+    adUnits.forEach((adUnit, i) => {
+      _each(response['_'][i], (v0, k0) => {
+        const k = SEGMENT_HISTORIC[k0] || k0;
+        const v = val(v0, k0);
+        deepSetValue(adUnit.unit, `ortb2Imp.ext.data.${MODULE_NAME}_rtd.${k}`, v);
+      });
+    });
+  };
+
+  // mergeDeep does not handle merging deep arrays... (╯°□°)╯ ┻━┻
+  function mergeDeep(target, ...sources) {
+    function emptyValue(v) {
+      if (isPlainObject(v)) {
+        return {};
+      } else if (isArray(v)) {
+        return [];
+      } else {
+        return undefined;
+      }
+    }
+
+    if (!sources.length) return target;
+    const source = sources.shift();
+
+    if (isPlainObject(target) && isPlainObject(source)) {
+      Object.keys(source).forEach(key => {
+        if (!(key in target)) target[key] = emptyValue(source[key]);
+        target[key] = target[key] !== undefined ? mergeDeep(target[key], source[key]) : source[key];
+      });
+    } else if (isArray(target) && isArray(source)) {
+      source.forEach((v, i) => {
+        if (!(i in target)) target[i] = emptyValue(v);
+        target[i] = target[i] !== undefined ? mergeDeep(target[i], v) : v;
+      });
+    } else {
+      target = source;
+    }
+
+    return mergeDeep(target, ...sources);
+  }
+
+  let semaphore = 1;
+  function semaphoreInc(inc) {
+    if (semaphore == 0) return;
+    semaphore += inc;
+    if (semaphore == 0) {
+      setSegments()
+      callback();
+    }
+  }
+
+  const refererInfo = getRefererInfo();
+  const args = [
+    [ 'v', `pbjs-${getGlobal().version}` ],
+    [ 'c', config.params.clientid ],
+    [ 'p', config.params.platformid ],
+    [ 't', config.params.tagid ],
+    [ 'imp', config.params.imps ],
+    [ 'fc_ip', config.params.freqcap_ip ],
+    [ 'fc_ipua', config.params.freqcap_ipua ],
+    [ 'pn', (refererInfo.page || '').substr(0, 300).split(/[?#]/)[0] ]
+  ];
+
+  if (!adUnits.length) {
+    logWarn(MODULE, 'no suitable adUnits (missing pbadslot?)');
+  }
+  const atfQueue = [];
+  adUnits.map((adUnit, i) => {
+    const ref = [ adUnit.gpid ];
+    if (!config.params.slotinpath) ref.push(adUnit.unit.code);
+    args.push(['s', ref.join('\t')]);
+
+    semaphoreInc(1);
+    atfQueue.push(function() {
+      atf(adUnit.unit, function(x) {
+        let viewable = document.visibilityState === undefined || document.visibilityState == 'visible';
+        try { viewable = viewable && top.document.hasFocus() } catch (_) {}
+        logInfo(MODULE, `atf code=${adUnit.unit.code} has area=${x}, viewable=${viewable}`);
+        const atfList = []; atfList[i] = { atf: parseInt(x * 100) };
+        response = mergeDeep(response, { _: atfList });
+        semaphoreInc(-1);
+      });
+    });
+  });
+  function atfCb() {
+    atfQueue.forEach(x => x());
+  }
+  if (document.readyState == 'loading') {
+    document.addEventListener('DOMContentLoaded', atfCb, false);
+  } else {
+    atfCb();
+  }
+
+  analyticsCommand(COMMAND.URL, {
+    url: (config.params.api_origin || API_ORIGIN) + '/q?',
+    args: args
+  }, function(url) {
+    ajax(url, {
+      success: function(responseText, q) {
+        try {
+          if (q.getResponseHeader('content-type') == 'application/json') {
+            response = mergeDeep(response, JSON.parse(responseText));
+          } else {
+            throw false;
+          }
+        } catch (_) {
+          logError(MODULE, 'unexpected response');
+        }
+        semaphoreInc(-1);
+      },
+      error: function(statusText, q) {
+        logError(MODULE, 'request failed');
+        semaphoreInc(-1);
+      }
+    });
+  });
+}
+
+function getTargetingData(adUnitArray, config, userConsent, auction) {
+  function targetingNormalise(v) {
+    if (isArray(v) && v.length == 0) return undefined;
+    if (isBoolean(v)) v = ~~v;
+    if (!v) return undefined; // empty string and zero
+    return v;
+  }
+
+  const ortb2 = auction.getFPD().global || {};
+  const dataSite = deepAccess(ortb2, `site.ext.data.${MODULE_NAME}_rtd`) || {};
+  if (!dataSite.ok) return {};
+
+  const dataUser = deepAccess(ortb2, `user.ext.data.${MODULE_NAME}_rtd`) || {};
+  return getGlobal().adUnits.filter(adUnit => includes(adUnitArray, adUnit.code)).reduce((a, adUnit) => {
+    a[adUnit.code] = {};
+
+    _each(dataSite, (v0, k) => {
+      if (includes(SEGMENT_HISTORIC_VALUES, k)) return; // ignore site average viewability
+      const v = targetingNormalise(v0);
+      if (v) a[adUnit.code][ADSERVER_TARGETING_PREFIX + k] = v;
+    });
+
+    const adUnitSegments = deepAccess(adUnit, `ortb2Imp.ext.data.${MODULE_NAME}_rtd`, {});
+    _each(Object.assign({}, dataUser, adUnitSegments), (v0, k) => {
+      const v = targetingNormalise(v0);
+      if (v) a[adUnit.code][ADSERVER_TARGETING_PREFIX + k] = v;
+    });
+
+    return a;
+  }, {});
+}
+
+export const subModuleObj = {
+  name: MODULE_NAME,
+  init,
+  getBidRequestData,
+  getTargetingData,
+  atf // used by adlooxRtdProvider_spec.js
+};
+
+submodule('realTimeData', subModuleObj);
diff --git a/modules/adlooxRtdProvider.md b/modules/adlooxRtdProvider.md
new file mode 100644
index 00000000000..466f8ed1ba2
--- /dev/null
+++ b/modules/adlooxRtdProvider.md
@@ -0,0 +1,105 @@
+# Overview
+
+    Module Name: Adloox RTD Provider
+    Module Type: RTD Provider
+    Maintainer: contact@adloox.com
+
+# Description
+
+RTD provider for adloox.com. Contact contact@adloox.com for information.
+
+This provider fetches segments and populates the [First Party Data](https://docs.prebid.org/features/firstPartyData.html) attributes, some examples of the segments as described by the Adloox 'Google Publisher Tag Targeting Guidelines' and where they are placed are:
+
+ * Page segments are placed into `ortb2.site.ext.data.adloox_rtd`:
+     * **`ok`:** boolean (use to capture if our module successfully ran)
+ * Device segments are placed into `ortb2.user.ext.data.adloox_rtd`:
+     * **`ivt`:** boolean
+     * **`ua_old`:** boolean
+     * **`ip`:** list of strings describing classification of IP (eg. `rfc-special`, `iab-dc`, ...)
+ * AdUnit segments are placed into `AdUnit.ortb2Imp.ext.data.adloox_rtd`:
+     * **`{dis,vid,aud}`:** an list of integers describing the likelihood the AdUnit will be visible
+     * **`atf`:** an list of integers describing the percentage of pixels visible at auction
+         * measured only once at pre-auction
+         * usable when the publisher uses the strategy of collapsing ad slots on no-fill
+             * using the reverse strategy, growing ad slots on fill, invalidates the measurement the position of all content (including the slots) changes post-auction
+             * works best when your page loads your ad slots have their actual size rendered (ie. not zero height)
+         * uses the smallest ad unit (above a threshold area of 20x20) supplied by the [publisher to Prebid.js](https://docs.prebid.org/dev-docs/examples/basic-example.html) and measures viewability as if that size to be used
+         * when used in cross-origin (unfriendly) IFRAME environments the ad slot is directly measured as is (ignoring publisher provided sizes) due to limitations in using [IntersectionObserver](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserver)
+
+**N.B.** this provider does not offer or utilise any user orientated data
+
+These segments are also sent to your ad server but are translated using the following rules:
+
+ * prepended the segment name with `adl_`
+ * segments are filtered out when their value is either:
+     * empty string ("")
+     * zero (`0`)
+     * boolean `false`
+     * empty list/array
+
+For example:
+
+ * `ortb2.site.ext.data.adloox_rtd.ok` is translated to `adl_ok`
+ * `ortb2.user.ext.data.adloox_rtd.ivt` is translated to `adl_ivt`
+ * `AdUnit.ortb2Imp.ext.data.adloox_rtd.dis` is translated to `adl_dis`
+
+## Example
+
+To view an example of an Adloox integration look at the example provided in the [Adloox Analytics Adapter documentation](./adlooxAnalyticsAdapter.md#example).
+
+# Integration
+
+To use this, you *must* also integrate the [Adloox Analytics Adapter](./adlooxAnalyticsAdapter.md) as shown below:
+
+    pbjs.setConfig({
+      ...
+
+      realTimeData: {
+        auctionDelay: 100,             // see below for guidance
+        dataProviders: [
+          {
+            name: 'adloox',
+            params: {                  // optional, defaults shown
+              thresholds: [ 50, 60, 70, 80, 90 ],
+              slotinpath: false
+            }
+          }
+        ]
+      },
+
+      ...
+    });
+    pbjs.enableAnalytics({
+      provider: 'adloox',
+      options: {
+        client: 'adlooxtest',
+        clientid: 127,
+        platformid: 0,
+        tagid: 0
+      }
+    });
+
+You may optionally pass a subsection `params` in the `params` block to the Adloox RTD Provider, these will be passed through to the segment handler as is and as described by the integration guidelines.
+
+**N.B.** If you pass `params` to the Adloox Analytics Adapter, `id1` (`AdUnit.code`) and `id2` (`%%gpid%%`) *must* describe a stable identifier otherwise no usable segments will be served and so they *must not* be changed; if `id1` for your inventory could contain a non-stable random number please consult with us before continuing
+
+Though our segment technology is fast (less than 10ms) the time it takes for the users device to connect to our service and fetch the segments may not be. For this reason we recommend setting `auctionDelay` no lower than 100ms and if possible you should explore using user-agent sourced information such as [NetworkInformation.{rtt,downlink,...}](https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation) to dynamically tune this for each user.
+
+## Prebid Ad Slot
+
+To create reliable segments, a stable description for slots on your inventory needs to be supplied which is typically solved by using the [Prebid Ad Slot](https://docs.prebid.org/features/pbAdSlot.html).
+
+You may use one of two ways to do achieve this:
+
+ * for display inventory [using GPT](https://developers.google.com/publisher-tag/guides/get-started) you may configure Prebid.js to automatically use the [full ad unit path](https://developers.google.com/publisher-tag/reference#googletag.Slot_getAdUnitPath)
+     1. include the [`gptPreAuction` module](https://docs.prebid.org/dev-docs/modules/gpt-pre-auction.html)
+     1. wrap both `pbjs.setConfig({...})` and `pbjs.enableAnalytics({...})` with `googletag.cmd.push(function() { ... })`
+ * set `gpid` (or `pbadslot`) in the [first party data](https://docs.prebid.org/dev-docs/adunit-reference.html#first-party-data) variable `AdUnit.ortb2Imp.ext.gpid` (or `AdUnit.ortb2Imp.ext.data.pbadslot`) for all your ad units
+
+## Timeouts
+
+It is strongly recommended you increase any [failsafe timeout](https://docs.prebid.org/dev-docs/faq.html#when-starting-out-what-should-my-timeouts-be) you use by at least the value you supply to `auctionDelay` above.
+
+Adloox recommends you use the following (based on [examples provided on the Prebid.js website](https://docs.prebid.org/dev-docs/examples/basic-example.html))
+
+    FAILSAFE_TIMEOUT = AUCTION_DELAY + (3 * PREBID_TIMEOUT)
diff --git a/modules/admanBidAdapter.js b/modules/admanBidAdapter.js
index 5dc3412ee66..ed984645d0d 100644
--- a/modules/admanBidAdapter.js
+++ b/modules/admanBidAdapter.js
@@ -1,10 +1,12 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
+import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adman';
 const AD_URL = 'https://pub.admanmedia.com/?c=o&m=multi';
-const URL_SYNC = 'https://pub.admanmedia.com/?c=o&m=sync';
+const URL_SYNC = 'https://sync.admanmedia.com';
 
 function isBidResponseValid(bid) {
   if (!bid.requestId || !bid.cpm || !bid.creativeId ||
@@ -23,6 +25,36 @@ function isBidResponseValid(bid) {
   }
 }
 
+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
+  }
+}
+
+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],
@@ -32,14 +64,18 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
+    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
     try {
-      location = new URL(bidderRequest.refererInfo.referer)
+      location = new URL(bidderRequest.refererInfo.page)
       winTop = window.top;
     } catch (e) {
       location = winTop.location;
-      utils.logMessage(e);
+      logMessage(e);
     };
     let placements = [];
     let request = {
@@ -65,16 +101,40 @@ export const spec = {
     for (let i = 0; i < len; i++) {
       let bid = validBidRequests[i];
       let traff = bid.params.traffic || BANNER
-
-      placements.push({
+      const placement = {
         placementId: bid.params.placementId,
         bidId: bid.bidId,
         sizes: bid.mediaTypes && bid.mediaTypes[traff] && bid.mediaTypes[traff].sizes ? bid.mediaTypes[traff].sizes : [],
-        traffic: traff
-      });
+        traffic: traff,
+        eids: [],
+        bidFloor: getBidFloor(bid)
+      }
       if (bid.schain) {
-        placements.schain = bid.schain;
+        placement.schain = bid.schain;
+      }
+      if (bid.userId) {
+        getUserId(placement.eids, bid.userId.uid2 && bid.userId.uid2.id, 'uidapi.com');
+        getUserId(placement.eids, bid.userId.lotamePanoramaId, 'lotame.com');
+        getUserId(placement.eids, bid.userId.idx, 'idx.lat');
       }
+      if (traff === VIDEO) {
+        placement.playerSize = bid.mediaTypes[VIDEO].playerSize;
+        placement.minduration = bid.mediaTypes[VIDEO].minduration;
+        placement.maxduration = bid.mediaTypes[VIDEO].maxduration;
+        placement.mimes = bid.mediaTypes[VIDEO].mimes;
+        placement.protocols = bid.mediaTypes[VIDEO].protocols;
+        placement.startdelay = bid.mediaTypes[VIDEO].startdelay;
+        placement.placement = bid.mediaTypes[VIDEO].placement;
+        placement.skip = bid.mediaTypes[VIDEO].skip;
+        placement.skipafter = bid.mediaTypes[VIDEO].skipafter;
+        placement.minbitrate = bid.mediaTypes[VIDEO].minbitrate;
+        placement.maxbitrate = bid.mediaTypes[VIDEO].maxbitrate;
+        placement.delivery = bid.mediaTypes[VIDEO].delivery;
+        placement.playbackmethod = bid.mediaTypes[VIDEO].playbackmethod;
+        placement.api = bid.mediaTypes[VIDEO].api;
+        placement.linearity = bid.mediaTypes[VIDEO].linearity;
+      }
+      placements.push(placement);
     }
     return {
       method: 'POST',
@@ -89,16 +149,35 @@ export const spec = {
     for (let i = 0; i < serverResponse.length; i++) {
       let resItem = serverResponse[i];
       if (isBidResponseValid(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
         response.push(resItem);
       }
     }
     return response;
   },
 
-  getUserSyncs: (syncOptions, serverResponses) => {
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = URL_SYNC + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
     return [{
-      type: 'image',
-      url: URL_SYNC
+      type: syncType,
+      url: syncUrl
     }];
   }
 
diff --git a/modules/admaruBidAdapter.js b/modules/admaruBidAdapter.js
new file mode 100644
index 00000000000..65f62c77e26
--- /dev/null
+++ b/modules/admaruBidAdapter.js
@@ -0,0 +1,81 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const ADMARU_ENDPOINT = 'https://p1.admaru.net/AdCall';
+const BIDDER_CODE = 'admaru';
+
+const DEFAULT_BID_TTL = 360;
+
+function parseBid(rawBid, currency) {
+  const bid = {};
+
+  bid.cpm = rawBid.price;
+  bid.impid = rawBid.impid;
+  bid.requestId = rawBid.impid;
+  bid.netRevenue = true;
+  bid.dealId = '';
+  bid.creativeId = rawBid.crid;
+  bid.currency = currency;
+  bid.ad = rawBid.adm;
+  bid.width = rawBid.w;
+  bid.height = rawBid.h;
+  bid.mediaType = BANNER;
+  bid.ttl = DEFAULT_BID_TTL;
+
+  return bid;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    return !!(bid && bid.params && bid.params.pub_id && bid.params.adspace_id);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map(bid => {
+      const payload = {
+        pub_id: bid.params.pub_id,
+        adspace_id: bid.params.adspace_id,
+        bidderRequestId: bid.bidderRequestId,
+        bidId: bid.bidId
+      };
+
+      return {
+        method: 'GET',
+        url: ADMARU_ENDPOINT,
+        data: payload,
+      }
+    })
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = [];
+    let bid = null;
+
+    if (!serverResponse.hasOwnProperty('body') || !serverResponse.body.hasOwnProperty('seatbid')) {
+      return bidResponses;
+    }
+
+    const serverBody = serverResponse.body;
+    const seatbid = serverBody.seatbid;
+
+    for (let i = 0; i < seatbid.length; i++) {
+      if (!seatbid[i].hasOwnProperty('bid')) {
+        continue;
+      }
+
+      const innerBids = seatbid[i].bid;
+      for (let j = 0; j < innerBids.length; j++) {
+        bid = parseBid(innerBids[j], serverBody.cur);
+
+        bidResponses.push(bid);
+      }
+    }
+
+    return bidResponses;
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/admaruBidAdapter.md b/modules/admaruBidAdapter.md
new file mode 100644
index 00000000000..9985a660ac6
--- /dev/null
+++ b/modules/admaruBidAdapter.md
@@ -0,0 +1,34 @@
+# Overview
+
+```
+Module Name: Admaru Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@admaru.com
+```
+
+# Description
+
+Module that connects to Admaru demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+               {
+                   bidder: "admaru",
+                   params: {
+                        pub_id: '1234', // string - required
+                        adspace_id: '1234' // string - required
+                    }
+               }
+           ]
+        }
+    ];
+```
diff --git a/modules/admaticBidAdapter.js b/modules/admaticBidAdapter.js
index d46c01f7f48..148424c0a98 100644
--- a/modules/admaticBidAdapter.js
+++ b/modules/admaticBidAdapter.js
@@ -1,147 +1,205 @@
-import * as utils from '../src/utils.js';
+import { getValue, logError, deepAccess, getBidIdParameter, isArray } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+let SYNC_URL = '';
 const BIDDER_CODE = 'admatic';
-const ENDPOINT_URL = 'https://ads4.admatic.com.tr/prebid/v3/bidrequest';
-
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['admatic'], // short code
-  /**
-  * Determines whether or not the given bid request is valid.
-  *
-  * @param {BidRequest} bid The bid params to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
-  isBidRequestValid: function (bid) {
-    return !!(bid.params.pid && bid.params.wid && bid.params.url);
+  aliases: [
+    {code: 'pixad'}
+  ],
+  supportedMediaTypes: [BANNER, VIDEO],
+  /** f
+   * @param {object} bid
+   * @return {boolean}
+   */
+  isBidRequestValid: (bid) => {
+    let isValid = false;
+    if (bid?.params) {
+      const isValidNetworkId = _validateId(getValue(bid.params, 'networkId'));
+      const isValidHost = _validateString(getValue(bid.params, 'host'));
+      isValid = isValidNetworkId && isValidHost;
+    }
+
+    if (!isValid) {
+      logError(`${bid.bidder} networkId and host parameters are required. Bid aborted.`);
+    }
+    return isValid;
   },
+
   /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param {validBidRequests[]} - an array of bids
-  * @return ServerRequest Info describing the request to the server.
-  */
-  buildRequests: function (validBidRequests) {
+   * @param {BidRequest[]} validBidRequests
+   * @return {ServerRequest}
+   */
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const bids = validBidRequests.map(buildRequestObject);
+    const networkId = getValue(validBidRequests[0].params, 'networkId');
+    const host = getValue(validBidRequests[0].params, 'host');
+    const currency = getValue(validBidRequests[0].params, 'currency') || 'TRY';
+    const bidderName = validBidRequests[0].bidder;
+
     const payload = {
-      request: []
+      user: {
+        ua: navigator.userAgent
+      },
+      blacklist: [],
+      site: {
+        page: location.href,
+        ref: location.origin,
+        publisher: {
+          name: location.hostname,
+          publisherId: networkId
+        }
+      },
+      imp: bids,
+      ext: {
+        cur: currency,
+        bidder: bidderName
+      }
     };
 
-    for (var i = 0; i < validBidRequests.length; i++) {
-      var validBidRequest = validBidRequests[i];
-      payload.auctionId = validBidRequest.auctionId;
-      payload.bidder = validBidRequest.bidder;
-      payload.bidderRequestId = validBidRequest.bidderRequestId;
-      payload.pid = validBidRequest.params.pid;
-      payload.wid = validBidRequest.params.wid;
-      payload.url = validBidRequest.params.url;
-
-      var request = {
-        adUnitCode: validBidRequest.adUnitCode,
-        bidId: validBidRequest.bidId,
-        transactionId: validBidRequest.transactionId,
-        priceType: validBidRequest.params.priceType,
-        sizes: transformSizes(validBidRequest.sizes)
+    if (payload) {
+      switch (bidderName) {
+        case 'pixad':
+          SYNC_URL = 'https://static.pixad.com.tr/sync.html';
+          break;
+        default:
+          SYNC_URL = 'https://cdn.serve.admatic.com.tr/showad/sync.html';
+          break;
       }
 
-      payload.request.push(request);
+      return { method: 'POST', url: `https://${host}/pb?bidder=${bidderName}`, data: payload, options: { contentType: 'application/json' } };
     }
+  },
 
-    const payloadString = JSON.stringify(payload);
-
-    return {
-      method: 'POST',
-      url: ENDPOINT_URL,
-      data: payloadString,
-      bidder: 'admatic',
-      bids: validBidRequests
-    };
+  getUserSyncs: function (syncOptions, responses) {
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: SYNC_URL
+      }];
+    }
   },
 
   /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {ServerResponse} serverResponse A successful response from the server.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  */
-  interpretResponse: function (serverResponse, bidRequest) {
-    const serverBody = serverResponse.body;
+   * @param {*} response
+   * @param {ServerRequest} request
+   * @return {Bid[]}
+   */
+  interpretResponse: (response, request) => {
+    const body = response.body || response;
     const bidResponses = [];
+    if (body && body?.data && isArray(body.data)) {
+      body.data.forEach(bid => {
+        const resbid = {
+          requestId: bid.id,
+          cpm: bid.price,
+          width: bid.width,
+          height: bid.height,
+          currency: body.cur || 'TRY',
+          netRevenue: true,
+          ad: bid.party_tag,
+          creativeId: bid.creative_id,
+          meta: {
+            advertiserDomains: bid && bid.adomain ? bid.adomain : []
+          },
+          ttl: 360,
+          bidder: bid.bidder
+        };
+
+        bidResponses.push(resbid);
+      });
+    }
+    return bidResponses;
+  }
+};
 
-    if (serverBody) {
-      if (serverBody.tags && serverBody.tags.length > 0) {
-        serverBody.tags.forEach(serverBid => {
-          if (serverBid != null) {
-            if (serverBid.cpm !== 0) {
-              const bidResponse = {
-                requestId: serverBid.bidId,
-                cpm: serverBid.cpm,
-                width: serverBid.width,
-                height: serverBid.height,
-                creativeId: serverBid.creativeId,
-                dealId: serverBid.dealId,
-                currency: serverBid.currency,
-                netRevenue: serverBid.netRevenue,
-                ttl: serverBid.ttl,
-                referrer: serverBid.referrer,
-                ad: serverBid.ad
-              };
-
-              bidResponses.push(bidResponse);
-            }
-          }
-        });
+function enrichSlotWithFloors(slot, bidRequest) {
+  try {
+    const slotFloors = {};
+
+    if (bidRequest.getFloor) {
+      if (bidRequest.mediaTypes?.banner) {
+        slotFloors.banner = {};
+        const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = bidRequest.getFloor({ size: bannerSize, mediaType: BANNER }));
       }
-    }
 
-    return bidResponses;
-  },
-  /**
-  * Register the user sync pixels which should be dropped after the auction.
-  *
-  * @param {SyncOptions} syncOptions Which user syncs are allowed?
-  * @param {ServerResponse[]} serverResponses List of server's responses.
-  * @return {UserSync[]} The user syncs which should be dropped.
-  */
-  getUserSyncs: function (syncOptions, serverResponses) {
-    const syncs = [];
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: 'https://ads4.admatic.com.tr/prebid/static/usersync/v3/async_usersync.html'
-      });
-    }
+      if (bidRequest.mediaTypes?.video) {
+        slotFloors.video = {};
+        const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({ size: videoSize, mediaType: VIDEO }));
+      }
 
-    if (syncOptions.pixelEnabled && serverResponses.length > 0) {
-      syncs.push({
-        type: 'image',
-        url: 'https://ads5.admatic.com.tr/prebid/v3/bidrequest/usersync'
-      });
+      if (Object.keys(slotFloors).length > 0) {
+        if (!slot) {
+          slot = {}
+        }
+        Object.assign(slot, {
+          floors: slotFloors
+        });
+      }
     }
-    return syncs;
+  } catch (e) {
+    logError('Could not parse floors from Prebid: ' + e);
   }
 }
 
-/* Turn bid request sizes into ut-compatible format */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  let sizeObj = {};
-
-  if (utils.isArray(requestSizes) && requestSizes.length === 2 && !utils.isArray(requestSizes[0])) {
-    sizeObj.width = parseInt(requestSizes[0], 10);
-    sizeObj.height = parseInt(requestSizes[1], 10);
-    sizes.push(sizeObj);
-  } else if (typeof requestSizes === 'object') {
-    for (let i = 0; i < requestSizes.length; i++) {
-      let size = requestSizes[i];
-      sizeObj = {};
-      sizeObj.width = parseInt(size[0], 10);
-      sizeObj.height = parseInt(size[1], 10);
-      sizes.push(sizeObj);
-    }
+function parseSizes(sizes, parser = s => s) {
+  if (sizes == undefined) {
+    return [];
+  }
+  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
+    return sizes.map(size => parser(size));
   }
+  return [parser(sizes)]; // or a single one ? (ie. [728,90])
+}
+
+function parseSize(size) {
+  return size[0] + 'x' + size[1];
+}
+
+function buildRequestObject(bid) {
+  const reqObj = {};
+  reqObj.size = getSizes(bid);
+  reqObj.id = getBidIdParameter('bidId', bid);
+
+  enrichSlotWithFloors(reqObj, bid);
+
+  return reqObj;
+}
+
+function getSizes(bid) {
+  return concatSizes(bid);
+}
+
+function concatSizes(bid) {
+  let playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
+  let videoSizes = deepAccess(bid, 'mediaTypes.video.sizes');
+  let bannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
+
+  if (isArray(bannerSizes) || isArray(playerSize) || isArray(videoSizes)) {
+    let mediaTypesSizes = [bannerSizes, videoSizes, playerSize];
+    return mediaTypesSizes
+      .reduce(function(acc, currSize) {
+        if (isArray(currSize)) {
+          if (isArray(currSize[0])) {
+            currSize.forEach(function (childSize) {
+              acc.push({ w: childSize[0], h: childSize[1] });
+            })
+          }
+        }
+        return acc;
+      }, []);
+  }
+}
+
+function _validateId(id) {
+  return (parseInt(id) > 0);
+}
 
-  return sizes;
+function _validateString(str) {
+  return (typeof str == 'string');
 }
 
 registerBidder(spec);
diff --git a/modules/admaticBidAdapter.md b/modules/admaticBidAdapter.md
index f6e822b9c06..2bf9afb3cdc 100644
--- a/modules/admaticBidAdapter.md
+++ b/modules/admaticBidAdapter.md
@@ -1,54 +1,48 @@
 # Overview
 
-```
-Module Name: AdMatic Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: prebid@admatic.com.tr
-```
+**Module Name**: Admatic Bidder Adapter  
+**Module Type**: Bidder Adapter  
+**Maintainer**: prebid@admatic.com.tr
 
 # Description
 
-Module that connects to AdMatic demand sources
+Use `admatic` as bidder.
+
+`networkId` is required and must be integer.
+
+## AdUnits configuration example
+```
+    var adUnits = [{
+      code: 'your-slot_1-div', //use exactly the same code as your slot div id.
+      sizes: [[300, 250]],
+      bids: [{
+          bidder: 'admatic',
+          params: { 
+              networkId: 12345,
+              host: 'layer.serve.admatic.com.tr'
+          }
+      }]
+    },{
+      code: 'your-slot_2-div', //use exactly the same code as your slot div id.
+      sizes: [[600, 800]],
+      bids: [{
+          bidder: 'admatic',
+          params: { 
+              networkId: 12345,
+              host: 'layer.serve.admatic.com.tr'
+          }
+      }]
+    }];
+```
+
+## UserSync example
 
-# Test Parameters
 ```
-    var adUnits = [
-        {
-            code: 'test-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300, 250]],  // a display size
-                }
-            },
-            bids: [
-               {
-                   bidder: "admatic",
-                   params: {
-                        pid: 193937152158, // publisher id without "adm-pub-" prefix 
-                        wid: 104276324971, // website id
-                        priceType: 'gross', // default is net
-                        url: window.location.href || window.top.location.href //page url from js
-                    }
-               }
-           ]
-        },{
-            code: 'test-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[320, 50]],   // a mobile size
-                }
-            },
-            bids: [
-               {
-                   bidder: "admatic",
-                   params: {
-                        pid: 193937152158, // publisher id without "adm-pub-" prefix 
-                        wid: 104276324971, // website id
-                        priceType: 'gross', // default is net
-                        url: window.location.href || window.top.location.href //page url from js
-                    }
-               }
-           ]
-        }
-    ];
+pbjs.setConfig({
+  userSync: {
+    iframeEnabled: true,
+    syncEnabled: true,
+    syncDelay: 1
+  }
+});
 ```
diff --git a/modules/admediaBidAdapter.js b/modules/admediaBidAdapter.js
deleted file mode 100644
index 0a9e510843c..00000000000
--- a/modules/admediaBidAdapter.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'admedia';
-const ENDPOINT_URL = 'https://prebid.admedia.com/bidder/';
-
-export const spec = {
-  code: BIDDER_CODE,
-
-  isBidRequestValid: function (bid) {
-    return bid.params && !!bid.params.aid;
-  },
-
-  buildRequests: function (validBidRequests, bidderRequest) {
-    let payload = {};
-
-    if (bidderRequest && bidderRequest.refererInfo) {
-      payload.referer = encodeURIComponent(bidderRequest.refererInfo.referer);
-    }
-
-    payload.tags = [];
-
-    utils._each(validBidRequests, function (bid) {
-      const tag = {
-        id: bid.bidId,
-        sizes: bid.sizes,
-        aid: bid.params.aid
-      };
-      payload.tags.push(tag);
-    });
-
-    const payloadString = JSON.stringify(payload);
-    return {
-      method: 'POST',
-      url: ENDPOINT_URL,
-      data: payloadString,
-    };
-  },
-
-  interpretResponse: function (serverResponse, bidRequest) {
-    const bidResponses = [];
-
-    if (!serverResponse.body.tags) {
-      return bidResponses;
-    }
-
-    utils._each(serverResponse.body.tags, function (response) {
-      if (!response.error && response.cpm > 0) {
-        const bidResponse = {
-          requestId: response.id,
-          cpm: response.cpm,
-          width: response.width,
-          height: response.height,
-          creativeId: response.id,
-          dealId: response.id,
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 120,
-          // referrer: REFERER,
-          ad: response.ad
-        };
-
-        bidResponses.push(bidResponse);
-      }
-    });
-
-    return bidResponses;
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/admediaBidAdapter.md b/modules/admediaBidAdapter.md
deleted file mode 100644
index a03a7b49529..00000000000
--- a/modules/admediaBidAdapter.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Overview
-
-```
-Module Name: Admedia Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: developers@admedia.com
-```
-
-# Description
-
-Admedia Bidder Adapter for Prebid.js. 
-Only Banner format is supported.
-
-# Test Parameters
-```
-    var adUnits = [
-       {
-           code: 'test-div-0',
-           sizes: [[300, 250]],  // a display size
-           bids: [
-               {
-                    bidder: 'admedia',
-                    params: {
-                        aid: 86858
-                    }
-               }
-           ]
-       },
-       {
-           code: 'test-div-1',
-           sizes: [[300, 50]],   // a mobile size
-           bids: [
-               {
-                    bidder: 'admedia',
-                    params: {
-                        aid: 86858
-                    }
-               }
-           ]
-       }
-    ];
-```
diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index b2f24cfa910..90031ed7f5d 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -1,13 +1,16 @@
-import * as utils from '../src/utils.js';
+import { logError } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'admixer';
-const ALIASES = ['go2net'];
-const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.0.aspx';
+const ALIASES = ['go2net', 'adblender', 'adsyield', 'futureads', 'smn'];
+const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.2.aspx';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ALIASES,
-  supportedMediaTypes: ['banner', 'video'],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   /**
    * Determines whether or not the given bid request is valid.
    */
@@ -18,32 +21,52 @@ export const spec = {
    * Make a server request from the list of BidRequests.
    */
   buildRequests: function (validRequest, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validRequest = convertOrtbRequestToProprietaryNative(validRequest);
+
+    let w;
+    let docRef;
+    do {
+      w = w ? w.parent : window;
+      try {
+        docRef = w.document.referrer;
+      } catch (e) {
+        break;
+      }
+    } while (w !== window.top);
     const payload = {
       imps: [],
+      ortb2: bidderRequest.ortb2,
+      docReferrer: docRef,
     };
+    let endpointUrl;
     if (bidderRequest) {
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        payload.referrer = encodeURIComponent(bidderRequest.refererInfo.referer);
+      const {bidderCode} = bidderRequest;
+      endpointUrl = config.getConfig(`${bidderCode}.endpoint_url`);
+      // TODO: is 'page' the right value here?
+      if (bidderRequest.refererInfo?.page) {
+        payload.referrer = encodeURIComponent(bidderRequest.refererInfo.page);
       }
       if (bidderRequest.gdprConsent) {
         payload.gdprConsent = {
           consentString: bidderRequest.gdprConsent.consentString,
           // will check if the gdprApplies field was populated with a boolean value (ie from page config).  If it's undefined, then default to true
           gdprApplies: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
-        }
+        };
       }
       if (bidderRequest.uspConsent) {
         payload.uspConsent = bidderRequest.uspConsent;
       }
     }
     validRequest.forEach((bid) => {
-      payload.imps.push(bid);
+      let imp = {};
+      Object.keys(bid).forEach(key => imp[key] = bid[key]);
+      payload.imps.push(imp);
     });
-    const payloadString = JSON.stringify(payload);
     return {
-      method: 'GET',
-      url: ENDPOINT_URL,
-      data: `data=${payloadString}`,
+      method: 'POST',
+      url: endpointUrl || ENDPOINT_URL,
+      data: payload,
     };
   },
   /**
@@ -51,28 +74,26 @@ export const spec = {
    */
   interpretResponse: function (serverResponse, bidRequest) {
     const bidResponses = [];
-    // loop through serverResponses {
     try {
-      serverResponse = serverResponse.body;
-      serverResponse.forEach((bidResponse) => {
-        const bidResp = {
-          requestId: bidResponse.bidId,
-          cpm: bidResponse.cpm,
-          width: bidResponse.width,
-          height: bidResponse.height,
-          ad: bidResponse.ad,
-          ttl: bidResponse.ttl,
-          creativeId: bidResponse.creativeId,
-          netRevenue: bidResponse.netRevenue,
-          currency: bidResponse.currency,
-          vastUrl: bidResponse.vastUrl,
-        };
-        bidResponses.push(bidResp);
-      });
+      const {body: {ads = []} = {}} = serverResponse;
+      ads.forEach((ad) => bidResponses.push(ad));
     } catch (e) {
-      utils.logError(e);
+      logError(e);
     }
     return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
+    const pixels = [];
+    serverResponses.forEach(({body: {cm = {}} = {}}) => {
+      const {pixels: img = [], iframes: frm = []} = cm;
+      if (syncOptions.pixelEnabled) {
+        img.forEach((url) => pixels.push({type: 'image', url}));
+      }
+      if (syncOptions.iframeEnabled) {
+        frm.forEach((url) => pixels.push({type: 'iframe', url}));
+      }
+    });
+    return pixels;
   }
 };
 registerBidder(spec);
diff --git a/modules/admixerIdSystem.js b/modules/admixerIdSystem.js
new file mode 100644
index 00000000000..49ffe4f4680
--- /dev/null
+++ b/modules/admixerIdSystem.js
@@ -0,0 +1,92 @@
+/**
+ * This module adds AdmixerId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/admixerIdSubmodule
+ * @requires module:modules/userId
+ */
+
+import { logError, logInfo } from '../src/utils.js'
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import {getStorageManager} from '../src/storageManager.js';
+
+export const storage = getStorageManager();
+
+/** @type {Submodule} */
+export const admixerIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'admixerId',
+  /**
+   * used to specify vendor id
+   * @type {number}
+   */
+  gvlid: 511,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {{admixerId:string}}
+   */
+  decode(value) {
+    return { 'admixerId': value }
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData) {
+    const {e, p, pid} = (config && config.params) || {};
+    if (!pid || typeof pid !== 'string') {
+      logError('admixerId submodule requires partner id to be defined');
+      return;
+    }
+    const gdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
+    const consentString = gdpr ? consentData.consentString : '';
+    if (gdpr && !consentString) {
+      logInfo('Consent string is required to call admixer id.');
+      return;
+    }
+    const url = `https://inv-nets.admixer.net/cntcm.aspx?ssp=${pid}${e ? `&e=${e}` : ''}${p ? `&p=${p}` : ''}${consentString ? `&cs=${consentString}` : ''}`;
+    const resp = function(callback) {
+      if (window.admixTMLoad && window.admixTMLoad.push) {
+        window.admixTMLoad.push(function() {
+          window.admixTM.retrieveVisitorId(function(visitorId) {
+            if (visitorId) {
+              callback(visitorId);
+            } else {
+              callback();
+            }
+          });
+        });
+      } else {
+        retrieveVisitorId(url, callback);
+      }
+    };
+
+    return { callback: resp };
+  }
+};
+function retrieveVisitorId(url, callback) {
+  ajax(url, {
+    success: response => {
+      const {setData: {visitorid} = {}} = JSON.parse(response || '{}');
+      if (visitorid) {
+        callback(visitorid);
+      } else {
+        callback();
+      }
+    },
+    error: error => {
+      logInfo(`admixerId: fetch encountered an error`, error);
+      callback();
+    }
+  }, undefined, { method: 'GET', withCredentials: true });
+}
+
+submodule('userId', admixerIdSubmodule);
diff --git a/modules/adnowBidAdapter.js b/modules/adnowBidAdapter.js
new file mode 100644
index 00000000000..f83dbf68a1f
--- /dev/null
+++ b/modules/adnowBidAdapter.js
@@ -0,0 +1,182 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import {deepAccess, parseQueryStringParameters, parseSizesInput} from '../src/utils.js';
+import {includes} from '../src/polyfill.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'adnow';
+const ENDPOINT = 'https://n.ads3-adnow.com/a';
+
+/**
+ * @typedef {object} CommonBidData
+ *
+ * @property {string} requestId The specific BidRequest which this bid is aimed at.
+ *   This should match the BidRequest.bidId which this Bid targets.
+ * @property {string} currency The currency code for the cpm value
+ * @property {number} cpm The bid price, in US cents per thousand impressions.
+ * @property {string} creativeId The id of ad content
+ * @property {number} ttl Time-to-live - how long (in seconds) Prebid can use this bid.
+ * @property {boolean} netRevenue Boolean defining whether the bid is Net or Gross.  The default is true (Net).
+ * @property {object} [meta] Object for storing bid meta data
+ * @property {string} [meta.mediaType] banner or native
+ */
+
+/** @type {BidderSpec} */
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [ NATIVE, BANNER ],
+
+  /**
+   * @param {object} bid
+   * @return {boolean}
+   */
+  isBidRequestValid(bid) {
+    if (!bid || !bid.params) return false;
+
+    const codeId = parseInt(bid.params.codeId, 10);
+    if (!codeId) {
+      return false;
+    }
+
+    const mediaType = bid.params.mediaType || NATIVE;
+
+    return includes(this.supportedMediaTypes, mediaType);
+  },
+
+  /**
+   * @param {BidRequest[]} validBidRequests
+   * @param {*} bidderRequest
+   * @return {ServerRequest}
+   */
+  buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    return validBidRequests.map(req => {
+      const mediaType = this._isBannerRequest(req) ? BANNER : NATIVE;
+      const codeId = parseInt(req.params.codeId, 10);
+
+      const data = {
+        Id: codeId,
+        mediaType: mediaType,
+        out: 'prebid',
+        d_user_agent: navigator.userAgent,
+        requestid: req.bidId
+      };
+
+      if (mediaType === BANNER) {
+        data.sizes = parseSizesInput(
+          req.mediaTypes && req.mediaTypes.banner && req.mediaTypes.banner.sizes
+        ).join('|');
+      } else {
+        data.width = data.height = 200;
+
+        let sizes = deepAccess(req, 'mediaTypes.native.image.sizes', []);
+
+        if (sizes.length > 0) {
+          const size = Array.isArray(sizes[0]) ? sizes[0] : sizes;
+
+          data.width = size[0] || data.width;
+          data.height = size[1] || data.height;
+        }
+      }
+
+      /** @type {ServerRequest} */
+      return {
+        method: 'GET',
+        url: ENDPOINT,
+        data: parseQueryStringParameters(data),
+        options: {
+          withCredentials: false,
+          crossOrigin: true
+        },
+        bidRequest: req
+      };
+    });
+  },
+
+  /**
+   * @param {*} response
+   * @param {ServerRequest} request
+   * @return {Bid[]}
+   */
+  interpretResponse(response, request) {
+    const bidObj = request.bidRequest;
+    let bid = response.body;
+
+    if (!bid || !bid.currency || !bid.cpm) {
+      return [];
+    }
+
+    const mediaType = bid.meta.mediaType || NATIVE;
+    if (!includes(this.supportedMediaTypes, mediaType)) {
+      return [];
+    }
+
+    bid.requestId = bidObj.bidId;
+
+    if (mediaType === BANNER) {
+      return [ this._getBannerBid(bid) ];
+    }
+
+    if (mediaType === NATIVE) {
+      return [ this._getNativeBid(bid) ];
+    }
+
+    return [];
+  },
+
+  /**
+   * @private
+   * @param {object} bid
+   * @return {CommonBidData}
+   */
+  _commonBidData(bid) {
+    return {
+      requestId: bid.requestId,
+      currency: bid.currency || 'USD',
+      cpm: bid.cpm || 0.00,
+      creativeId: bid.creativeId || 'undefined-creative',
+      netRevenue: bid.netRevenue || true,
+      ttl: bid.ttl || 360,
+      meta: bid.meta || {}
+    };
+  },
+
+  /**
+   * @param {BidRequest} req
+   * @return {boolean}
+   * @private
+   */
+  _isBannerRequest(req) {
+    return !!(req.mediaTypes && req.mediaTypes.banner);
+  },
+
+  /**
+   * @private
+   * @param {object} bid
+   * @return {Bid}
+   */
+  _getBannerBid(bid) {
+    return {
+      ...this._commonBidData(bid),
+      width: bid.width || 300,
+      height: bid.height || 250,
+      ad: bid.ad || '<div>Empty Ad</div>'
+    };
+  },
+
+  /**
+   * @private
+   * @param {object} bid
+   * @return {Bid}
+   */
+  _getNativeBid(bid) {
+    return {
+      ...this._commonBidData(bid),
+      native: bid.native || {}
+    };
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/adnowBidAdapter.md b/modules/adnowBidAdapter.md
new file mode 100644
index 00000000000..9ad99a67fc5
--- /dev/null
+++ b/modules/adnowBidAdapter.md
@@ -0,0 +1,46 @@
+# Overview
+
+```
+Module Name: AdNow Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@adnow.com
+```
+
+# Description
+
+AdNow Bidder Adapter for Prebid.js. 
+Banner and Native format are supported.
+Please use ```adnow``` as the bidder code.
+
+# Test Parameters
+```javascript
+    const adUnits = [{
+      code: 'test',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bids: [{
+        bidder: 'adnow',
+        params: {
+          codeId: 794934
+        }
+      }]
+    }, {
+      code: 'test',
+      mediaTypes: {
+        native: {
+          image: {
+            sizes: [200, 200]
+          }
+        }
+      },
+      bids: [{
+        bidder: 'adnow',
+        params: {
+          codeId: 794934
+        }
+      }]
+    }];
+```
diff --git a/modules/adnuntiusBidAdapter.js b/modules/adnuntiusBidAdapter.js
index 16594b3453c..5ad5436e732 100644
--- a/modules/adnuntiusBidAdapter.js
+++ b/modules/adnuntiusBidAdapter.js
@@ -1,37 +1,139 @@
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
+import { isStr, deepAccess, logInfo } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
+
 const BIDDER_CODE = 'adnuntius';
-const ENDPOINT_URL = 'https://delivery.adnuntius.com/i?tzo=-60&format=json';
+const ENDPOINT_URL = 'https://ads.adnuntius.delivery/i';
+const GVLID = 855;
+const DEFAULT_VAST_VERSION = 'vast4'
+const DEFAULT_NATIVE = 'native'
+
+const checkSegment = function (segment) {
+  if (isStr(segment)) return segment;
+  if (segment.id) return segment.id
+}
+
+const getSegmentsFromOrtb = function (ortb2) {
+  const userData = deepAccess(ortb2, 'user.data');
+  let segments = [];
+  if (userData) {
+    userData.forEach(userdat => {
+      if (userdat.segment) {
+        segments.push(...userdat.segment.filter(checkSegment).map(checkSegment));
+      }
+    });
+  }
+  return segments
+}
+
+function createNative(ad) {
+  const native = {};
+  const assets = ad.assets
+  native.title = ad.text.title.content;
+  native.image = {
+    url: assets.image.cdnId,
+    height: assets.image.height,
+    width: assets.image.width,
+  };
+  if (assets.icon) {
+    native.icon = {
+      url: assets.icon.cdnId,
+      height: assets.icon.height,
+      width: assets.icon.width,
+    };
+  }
+
+  native.sponsoredBy = ad.text.sponsoredBy?.content || '';
+  native.body = ad.text.body?.content || '';
+  native.cta = ad.text.cta?.content || '';
+  native.clickUrl = ad.destinationUrls.destination || '';
+  native.impressionTrackers = ad.impressionTrackingUrls || [ad.renderedPixel];
+
+  return native;
+}
+
+const handleMeta = function () {
+  const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE })
+  let adnMeta = null
+  if (storage.localStorageIsEnabled()) {
+    adnMeta = JSON.parse(storage.getDataFromLocalStorage('adn.metaData'))
+  }
+  const meta = (adnMeta !== null) ? adnMeta.reduce((acc, cur) => { return { ...acc, [cur.key]: cur.value } }, {}) : {}
+  return meta
+}
+
+const getUsi = function (meta, ortb2, bidderRequest) {
+  let usi = (meta !== null && meta.usi) ? meta.usi : false;
+  if (ortb2 && ortb2.user && ortb2.user.id) { usi = ortb2.user.id }
+  return usi
+}
 
 export const spec = {
   code: BIDDER_CODE,
-
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   isBidRequestValid: function (bid) {
-    return !!(bid.params.auId || (bid.params.member && bid.params.invCode));
+    return !!(bid.bidId || (bid.params.member && bid.params.invCode));
   },
 
-  buildRequests: function (validBidRequests) {
+  buildRequests: function (validBidRequests, bidderRequest) {
     const networks = {};
     const bidRequests = {};
     const requests = [];
+    const request = [];
+    const ortb2 = bidderRequest.ortb2 || {};
+    const bidderConfig = config.getConfig();
 
+    const adnMeta = handleMeta()
+    const usi = getUsi(adnMeta, ortb2, bidderRequest)
+    const segments = getSegmentsFromOrtb(ortb2);
+    const tzo = new Date().getTimezoneOffset();
+    const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
+    const consentString = deepAccess(bidderRequest, 'gdprConsent.consentString');
+
+    request.push('tzo=' + tzo)
+    request.push('format=json')
+
+    if (gdprApplies !== undefined) request.push('consentString=' + consentString);
+    if (segments.length > 0) request.push('segments=' + segments.join(','));
+    if (usi) request.push('userId=' + usi);
+    if (bidderConfig.useCookie === false) request.push('noCookies=true')
     for (var i = 0; i < validBidRequests.length; i++) {
       const bid = validBidRequests[i]
-      const network = bid.params.network || 'network';
+      let network = bid.params.network || 'network';
+      const targeting = bid.params.targeting || {};
+
+      if (bid.mediaTypes && bid.mediaTypes.video && bid.mediaTypes.video.context !== 'outstream') {
+        network += '_video'
+      }
+
+      if (bid.mediaTypes && bid.mediaTypes.native) {
+        network += '_native'
+      }
+
       bidRequests[network] = bidRequests[network] || [];
       bidRequests[network].push(bid);
 
       networks[network] = networks[network] || {};
       networks[network].adUnits = networks[network].adUnits || [];
-      networks[network].adUnits.push({ ...bid.params.targeting, auId: bid.params.auId });
+      if (bidderRequest && bidderRequest.refererInfo) networks[network].context = bidderRequest.refererInfo.page;
+      if (adnMeta) networks[network].metaData = adnMeta;
+      const adUnit = { ...targeting, auId: bid.params.auId, targetId: bid.bidId }
+      if (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) adUnit.dimensions = bid.mediaTypes.banner.sizes
+      networks[network].adUnits.push(adUnit);
     }
 
     const networkKeys = Object.keys(networks)
     for (var j = 0; j < networkKeys.length; j++) {
       const network = networkKeys[j];
+      const networkRequest = [...request]
+      if (network.indexOf('_video') > -1) { networkRequest.push('tt=' + DEFAULT_VAST_VERSION) }
+      if (network.indexOf('_native') > -1) { networkRequest.push('tt=' + DEFAULT_NATIVE) }
       requests.push({
         method: 'POST',
-        url: ENDPOINT_URL,
+        url: ENDPOINT_URL + '?' + networkRequest.join('&'),
         data: JSON.stringify(networks[network]),
         bid: bidRequests[network]
       });
@@ -41,27 +143,52 @@ export const spec = {
   },
 
   interpretResponse: function (serverResponse, bidRequest) {
-    const bidResponses = [];
-    const serverBody = serverResponse.body;
-
-    for (var k = 0; k < serverBody.adUnits.length; k++) {
-      const adUnit = serverBody.adUnits[k]
-      if (adUnit.matchedAdCount > 0) {
-        const bid = adUnit.ads[0];
-        bidResponses.push({
-          requestId: bidRequest.bid[k].bidId,
-          cpm: (bid.cpm) ? bid.cpm.amount : 0,
-          width: Number(bid.creativeWidth),
-          height: Number(bid.creativeHeight),
-          creativeId: bid.creativeId,
-          currency: (bid.cpm) ? bid.cpm.currency : 'EUR',
-          netRevenue: false,
-          ttl: 360,
-          ad: adUnit.html
-        });
-      }
-    }
-    return bidResponses;
+    const adUnits = serverResponse.body.adUnits;
+    const bidResponsesById = adUnits.reduce((response, adUnit) => {
+      if (adUnit.matchedAdCount >= 1) {
+        const ad = adUnit.ads[0];
+        const effectiveCpm = (ad.bid) ? ad.bid.amount * 1000 : 0;
+        const adResponse = {
+          ...response,
+          [adUnit.targetId]: {
+            requestId: adUnit.targetId,
+            cpm: effectiveCpm,
+            width: Number(ad.creativeWidth),
+            height: Number(ad.creativeHeight),
+            creativeId: ad.creativeId,
+            currency: (ad.bid) ? ad.bid.currency : 'EUR',
+            dealId: ad.dealId || '',
+            meta: {
+              advertiserDomains: (ad.destinationUrls.destination) ? [ad.destinationUrls.destination.split('/')[2]] : []
+
+            },
+            netRevenue: false,
+            ttl: 360,
+          }
+        }
+
+        if (adUnit.vastXml) {
+          adResponse[adUnit.targetId].vastXml = adUnit.vastXml
+          adResponse[adUnit.targetId].mediaType = VIDEO
+        } else if (ad.assets && ad.assets.image && ad.text && ad.text.title && ad.text.body && ad.destinationUrls && ad.destinationUrls.destination) {
+          adResponse[adUnit.targetId].native = createNative(ad);
+          adResponse[adUnit.targetId].mediaType = NATIVE;
+        } else {
+          adResponse[adUnit.targetId].ad = adUnit.html
+        }
+
+        logInfo('BID', adResponse)
+
+        return adResponse
+      } else return response
+    }, {});
+
+    const bidResponse = bidRequest.bid.map(bid => bid.bidId).reduce((request, adunitId) => {
+      if (bidResponsesById[adunitId]) { request.push(bidResponsesById[adunitId]) }
+      return request
+    }, []);
+
+    return bidResponse
   },
 
 }
diff --git a/modules/adnuntiusRtdProvider.js b/modules/adnuntiusRtdProvider.js
new file mode 100644
index 00000000000..9234a30aa33
--- /dev/null
+++ b/modules/adnuntiusRtdProvider.js
@@ -0,0 +1,96 @@
+
+import { submodule } from '../src/hook.js'
+import { logError, logInfo } from '../src/utils.js'
+import { ajax } from '../src/ajax.js';
+
+import { config as sourceConfig } from '../src/config.js';
+
+const GVLID = 855;
+
+function init(config, userConsent) {
+  if (!config.params || !config.params.providers) return false
+  logInfo(userConsent)
+  return true;
+}
+
+// Make sure that ajax has a function as callback
+function prepProvider(provider) {
+  // Map parameter to something that adnuntius endpoint understands.
+  const mappedParameters = {
+    siteId: 's',
+    userId: 'browserId',
+    browserId: 'browserId',
+    folderId: 'folderId'
+  }
+
+  const tzo = new Date().getTimezoneOffset();
+  const URL = ['https://data.adnuntius.com/usr?tzo=' + tzo]
+  Object.keys(provider).forEach(key => {
+    URL.push(`${mappedParameters[key]}=${provider[key]}`)
+  })
+
+  return new Promise((resolve, reject) => {
+    ajax(URL.join('&'), {
+      success: function (res) {
+        const response = JSON.parse(res)
+        resolve(response)
+      },
+      error: function (err) { reject(err) }
+    });
+  });
+}
+
+function setGlobalConfig(config, segments) {
+  const ortbSegments = {
+    ortb2: {
+      user: {
+        data: [{
+          name: 'adnuntius',
+          segment: segments
+        }]
+      }
+    }
+  }
+  if (config.params && config.params.bidders) {
+    sourceConfig.mergeBidderConfig({
+      bidders: config.params.bidders,
+      config: ortbSegments
+    })
+  } else {
+    sourceConfig.mergeConfig(ortbSegments)
+  }
+}
+
+function alterBidRequests(reqBidsConfigObj, callback, config, userConsent) {
+  const gdpr = userConsent && userConsent.gdpr;
+  let allowedToRun = true
+  if (gdpr) {
+    if (userConsent.gdpr.gdprApplies) {
+      if (gdpr.gdprApplies && !gdpr.vendorData.vendorConsents[GVLID]) allowedToRun = false;
+    }
+  }
+  if (allowedToRun) {
+    const providerRequests = config.params.providers.map(provider => prepProvider(provider))
+
+    Promise.allSettled(providerRequests).then((values) => {
+      const segments = values.reduce((segments, array) => (array.status === 'fulfilled') ? segments.concat(array.value.segments) : [], []).map(segmentId => ({ id: segmentId }))
+      setGlobalConfig(config, segments)
+      callback();
+    })
+      .catch(err => logError('ADN: err', err));
+  } else callback();
+}
+
+/** @type {RtdSubmodule} */
+export const adnuntiusSubmodule = {
+  name: 'adnuntius',
+  init: init,
+  getBidRequestData: alterBidRequests,
+  setGlobalConfig: setGlobalConfig,
+};
+
+export function beforeInit() {
+  submodule('realTimeData', adnuntiusSubmodule);
+}
+
+beforeInit();
diff --git a/modules/adnuntiusRtdProvider.md b/modules/adnuntiusRtdProvider.md
new file mode 100644
index 00000000000..e62eba13e2c
--- /dev/null
+++ b/modules/adnuntiusRtdProvider.md
@@ -0,0 +1,41 @@
+### Overview
+
+The Adnuntius Real Time Data Provider will request segments from adnuntius data, based on what is defined in the realTimeData object. It uses the siteId and userId that a publisher provides. These will have to correspond to a previously uploaded user to Adnuntius Data.
+
+### Integration
+
+1.  Build the adnuntiusRTD module into the Prebid.js package with:
+
+```
+gulp build --modules=adnuntiusRtdProvider,...
+```
+
+2.  Use `setConfig` to instruct Prebid.js to initilaize the adnuntiusRtdProvider module, as specified below.
+
+### Configuration
+
+```
+var pbjs = pbjs || { que: [] }
+pbjs.que.push(function () {
+	pbjs.setConfig({
+		realTimeData: {
+			auctionDelay: 300,
+			dataProviders: [
+				{
+					name: 'adnuntius',
+					waitForIt: true,
+					params: {
+						bidders: ['adnuntius'],
+						providers: [{
+							siteId: 'site123',
+							userId: 'user123'
+						}]
+					}
+				}
+			]
+		},
+	});
+});
+```
+
+Please reach out to Adnuntius if you need more info about this: prebid@adnuntius.com
diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index b75d1972f5a..d74a78270b2 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -1,12 +1,16 @@
-import * as utils from '../src/utils.js';
+import { _each, parseSizesInput, isStr, isArray } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'adocean';
+const URL_SAFE_FIELDS = {
+  schain: true,
+  slaves: true
+};
 
 function buildEndpointUrl(emiter, payloadMap) {
   const payload = [];
-  utils._each(payloadMap, function(v, k) {
-    payload.push(k + '=' + encodeURIComponent(v));
+  _each(payloadMap, function(v, k) {
+    payload.push(k + '=' + (URL_SAFE_FIELDS[k] ? v : encodeURIComponent(v)));
   });
 
   const randomizedPart = Math.random().toString().slice(2);
@@ -17,28 +21,35 @@ function buildRequest(masterBidRequests, masterId, gdprConsent) {
   let emiter;
   const payload = {
     id: masterId,
-    aosspsizes: []
+    aosspsizes: [],
+    slaves: []
   };
   if (gdprConsent) {
     payload.gdpr_consent = gdprConsent.consentString || undefined;
     payload.gdpr = gdprConsent.gdprApplies ? 1 : 0;
   }
+  const anyKey = Object.keys(masterBidRequests)[0];
+  if (masterBidRequests[anyKey].schain) {
+    payload.schain = serializeSupplyChain(masterBidRequests[anyKey].schain);
+  }
 
   const bidIdMap = {};
-
-  utils._each(masterBidRequests, function(bid, slaveId) {
+  const uniquePartLength = 10;
+  _each(masterBidRequests, function(bid, slaveId) {
     if (!emiter) {
       emiter = bid.params.emiter;
     }
 
-    const slaveSizes = utils.parseSizesInput(bid.mediaTypes.banner.sizes).join('_');
+    const slaveSizes = parseSizesInput(bid.mediaTypes.banner.sizes).join('_');
     const rawSlaveId = bid.params.slaveId.replace('adocean', '');
     payload.aosspsizes.push(rawSlaveId + '~' + slaveSizes);
+    payload.slaves.push(rawSlaveId.slice(-uniquePartLength));
 
     bidIdMap[slaveId] = bid.bidId;
   });
 
   payload.aosspsizes = payload.aosspsizes.join('-');
+  payload.slaves = payload.slaves.join(',');
 
   return {
     method: 'GET',
@@ -48,6 +59,30 @@ function buildRequest(masterBidRequests, masterId, gdprConsent) {
   };
 }
 
+const SCHAIN_FIELDS = ['asi', 'sid', 'hp', 'rid', 'name', 'domain', 'ext'];
+function serializeSupplyChain(schain) {
+  const header = `${schain.ver},${schain.complete}!`;
+
+  const serializedNodes = [];
+  _each(schain.nodes, function(node) {
+    const serializedNode = SCHAIN_FIELDS
+      .map(fieldName => {
+        if (fieldName === 'ext') {
+          // do not serialize ext data, just mark if it was available
+          return ('ext' in node ? '1' : '0');
+        }
+        if (fieldName in node) {
+          return encodeURIComponent(node[fieldName]).replace(/!/g, '%21');
+        }
+        return '';
+      })
+      .join(',');
+    serializedNodes.push(serializedNode);
+  });
+
+  return header + serializedNodes.join('!');
+}
+
 function assignToMaster(bidRequest, bidRequestsByMaster) {
   const masterId = bidRequest.params.masterId;
   const slaveId = bidRequest.params.slaveId;
@@ -80,7 +115,10 @@ function interpretResponse(placementResponse, bidRequest, bids) {
       width: parseInt(placementResponse.width, 10),
       netRevenue: false,
       ttl: parseInt(placementResponse.ttl),
-      creativeId: placementResponse.crid
+      creativeId: placementResponse.crid,
+      meta: {
+        advertiserDomains: placementResponse.adomain || []
+      }
     };
 
     bids.push(bid);
@@ -92,7 +130,7 @@ export const spec = {
 
   isBidRequestValid: function(bid) {
     const requiredParams = ['slaveId', 'masterId', 'emiter'];
-    if (requiredParams.some(name => !utils.isStr(bid.params[name]) || !bid.params[name].length)) {
+    if (requiredParams.some(name => !isStr(bid.params[name]) || !bid.params[name].length)) {
       return false;
     }
 
@@ -103,12 +141,12 @@ export const spec = {
     const bidRequestsByMaster = {};
     let requests = [];
 
-    utils._each(validBidRequests, function(bidRequest) {
+    _each(validBidRequests, function(bidRequest) {
       assignToMaster(bidRequest, bidRequestsByMaster);
     });
 
-    utils._each(bidRequestsByMaster, function(masterRequests, masterId) {
-      utils._each(masterRequests, function(instanceRequests) {
+    _each(bidRequestsByMaster, function(masterRequests, masterId) {
+      _each(masterRequests, function(instanceRequests) {
         requests.push(buildRequest(instanceRequests, masterId, bidderRequest.gdprConsent));
       });
     });
@@ -119,8 +157,8 @@ export const spec = {
   interpretResponse: function(serverResponse, bidRequest) {
     let bids = [];
 
-    if (utils.isArray(serverResponse.body)) {
-      utils._each(serverResponse.body, function(placementResponse) {
+    if (isArray(serverResponse.body)) {
+      _each(serverResponse.body, function(placementResponse) {
         interpretResponse(placementResponse, bidRequest, bids);
       });
     }
diff --git a/modules/adomikAnalyticsAdapter.js b/modules/adomikAnalyticsAdapter.js
index 5bbee86df54..27a6821d9f5 100644
--- a/modules/adomikAnalyticsAdapter.js
+++ b/modules/adomikAnalyticsAdapter.js
@@ -1,17 +1,19 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
-import { logInfo } from '../src/utils.js';
-import find from 'core-js-pure/features/array/find.js';
-import findIndex from 'core-js-pure/features/array/find-index.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;
 const bidResponse = CONSTANTS.EVENTS.BID_RESPONSE;
 const bidWon = CONSTANTS.EVENTS.BID_WON;
 const bidTimeout = CONSTANTS.EVENTS.BID_TIMEOUT;
+const ua = navigator.userAgent;
+
+var _sampled = true;
 
 let adomikAdapter = Object.assign(adapter({}),
   {
@@ -28,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:
@@ -47,7 +45,7 @@ let adomikAdapter = Object.assign(adapter({}),
               type: 'request',
               event: {
                 bidder: bid.bidder.toUpperCase(),
-                placementCode: bid.placementCode
+                placementCode: bid.adUnitCode
               }
             });
           });
@@ -67,13 +65,32 @@ 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: testId,
+    testValue: testValue,
     uid: adomikAdapter.currentContext.uid,
     ahbaid: adomikAdapter.currentContext.id,
     hostname: window.location.hostname,
+    sampling: adomikAdapter.currentContext.sampling,
     eventsByPlacementCode: groupedTypedEvents.map(function(typedEventsByType) {
       let sizes = [];
       const eventKeys = ['request', 'response', 'winner'];
@@ -105,12 +122,11 @@ 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 in 1600 characters max (+endpoint length)
   const encodedUri = encodeURIComponent(encodedBuf);
-  const splittedUrl = encodedUri.match(/.{1,1600}/g);
+  const maxLength = adomikAdapter.maxPartLength();
+  const splittedUrl = encodedUri.match(new RegExp(`.{1,${maxLength}}`, 'g'));
 
   splittedUrl.forEach((split, i) => {
     const partUrl = `${split}&id=${adomikAdapter.currentContext.id}&part=${i}&on=${splittedUrl.length - 1}`;
@@ -120,14 +136,18 @@ adomikAdapter.sendTypedEvent = function() {
 };
 
 adomikAdapter.sendWonEvent = function (wonEvent) {
-  const stringWonEvent = JSON.stringify(wonEvent)
-  logInfo('Won event sent to adomik prebid analytic ' + 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) {
@@ -189,22 +209,49 @@ adomikAdapter.buildTypedEvents = function () {
   return groupedTypedEvents;
 }
 
-adomikAdapter.adapterEnableAnalytics = adomikAdapter.enableAnalytics;
-
-adomikAdapter.enableAnalytics = function (config) {
-  adomikAdapter.currentContext = {};
+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]
+}
 
-  const initOptions = config.options;
-  if (initOptions) {
-    adomikAdapter.currentContext = {
-      uid: initOptions.id,
-      url: initOptions.url,
-      id: '',
-      timeouted: false,
-    }
-    logInfo('Adomik Analytics enabled with config', initOptions);
-    adomikAdapter.adapterEnableAnalytics(config);
+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 911da416cfe..c34af4d3d17 100644
--- a/modules/adotBidAdapter.js
+++ b/modules/adotBidAdapter.js
@@ -1,540 +1,447 @@
 import {Renderer} from '../src/Renderer.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {isStr, isArray, isNumber, isPlainObject, isBoolean, logError} from '../src/utils.js';
-import find from 'core-js-pure/features/array/find.js';
-
-const ADAPTER_VERSION = 'v1.0.0';
+import {isArray, isBoolean, isFn, isPlainObject, isStr, logError, replaceAuctionPrice} from '../src/utils.js';
+import {find} from '../src/polyfill.js';
+import {config} from '../src/config.js';
+import {OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'adot';
+const ADAPTER_VERSION = 'v2.0.0';
 const BID_METHOD = 'POST';
-const BIDDER_URL = 'https://dsp.adotmob.com/headerbidding/bidrequest';
-const SUPPORTED_VIDEO_CONTEXTS = ['instream', 'outstream'];
-const SUPPORTED_INSTREAM_CONTEXTS = ['pre-roll', 'mid-roll', 'post-roll'];
+const BIDDER_URL = 'https://dsp.adotmob.com/headerbidding{PUBLISHER_PATH}/bidrequest';
+const REQUIRED_VIDEO_PARAMS = ['mimes', 'protocols'];
+const FIRST_PRICE = 1;
+const IMP_BUILDER = { banner: buildBanner, video: buildVideo, native: buildNative };
 const NATIVE_PLACEMENTS = {
-  title: {id: 1, name: 'title'},
-  icon: {id: 2, type: 1, name: 'img'},
-  image: {id: 3, type: 3, name: 'img'},
-  sponsoredBy: {id: 4, name: 'data', type: 1},
-  body: {id: 5, name: 'data', type: 2},
-  cta: {id: 6, type: 12, name: 'data'}
+  title: { id: 1, name: 'title' },
+  icon: { id: 2, type: 1, name: 'img' },
+  image: { id: 3, type: 3, name: 'img' },
+  sponsoredBy: { id: 4, name: 'data', type: 1 },
+  body: { id: 5, name: 'data', type: 2 },
+  cta: { id: 6, type: 12, name: 'data' }
 };
-const NATIVE_ID_MAPPING = {1: 'title', 2: 'icon', 3: 'image', 4: 'sponsoredBy', 5: 'body', 6: 'cta'};
-const SUPPORTED_VIDEO_MIMES = ['video/mp4'];
-const DOMAIN_REGEX = new RegExp('//([^/]*)');
-const FIRST_PRICE = 1;
-const BID_SUPPORTED_MEDIA_TYPES = ['banner', 'video', 'native'];
-const TTL = 10;
-const NET_REVENUE = true;
-// eslint-disable-next-line no-template-curly-in-string
-const AUCTION_PRICE = '${AUCTION_PRICE}';
+const NATIVE_ID_MAPPING = { 1: 'title', 2: 'icon', 3: 'image', 4: 'sponsoredBy', 5: 'body', 6: 'cta' };
 const OUTSTREAM_VIDEO_PLAYER_URL = 'https://adserver.adotmob.com/video/player.min.js';
-
-function isNone(value) {
-  return (value === null) || (value === undefined);
-}
-
-function groupBy(values, key) {
-  const groups = values.reduce((acc, value) => {
-    const groupId = value[key];
-
-    if (!acc[groupId]) acc[groupId] = [];
-    acc[groupId].push(value);
-
-    return acc;
-  }, {});
-
-  return Object
-    .keys(groups)
-    .map(id => ({id, key, values: groups[id]}));
-}
-
-function validateMediaTypes(mediaTypes, allowedMediaTypes) {
-  if (!isPlainObject(mediaTypes)) return false;
-  if (!allowedMediaTypes.some(mediaType => mediaType in mediaTypes)) return false;
-
-  if (isBanner(mediaTypes)) {
-    if (!validateBanner(mediaTypes.banner)) return false;
-  }
-
-  if (isVideo(mediaTypes)) {
-    if (!validateVideo(mediaTypes.video)) return false;
-  }
-
-  return true;
-}
-
-function isBanner(mediaTypes) {
-  return isPlainObject(mediaTypes) && isPlainObject(mediaTypes.banner);
-}
-
-function isVideo(mediaTypes) {
-  return isPlainObject(mediaTypes) && isPlainObject(mediaTypes.video);
-}
-
-function validateBanner(banner) {
-  return isPlainObject(banner) &&
-    isArray(banner.sizes) &&
-    (banner.sizes.length > 0) &&
-    banner.sizes.every(validateMediaSizes);
-}
-
-function validateVideo(video) {
-  if (!isPlainObject(video)) return false;
-  if (!isStr(video.context)) return false;
-  if (SUPPORTED_VIDEO_CONTEXTS.indexOf(video.context) === -1) return false;
-
-  if (!video.playerSize) return true;
-  if (!isArray(video.playerSize)) return false;
-
-  return video.playerSize.every(validateMediaSizes);
-}
-
-function validateMediaSizes(mediaSize) {
-  return isArray(mediaSize) &&
-    (mediaSize.length === 2) &&
-    mediaSize.every(size => (isNumber(size) && size >= 0));
-}
-
-function validateParameters(parameters, adUnit) {
-  if (isVideo(adUnit.mediaTypes)) {
-    if (!isPlainObject(parameters)) return false;
-    if (!validateVideoParameters(parameters.video, adUnit)) return false;
-  }
-
-  return true;
-}
-
-function validateVideoParameters(video, adUnit) {
-  if (!video) return false;
-
-  if (!isArray(video.mimes)) return false;
-  if (video.mimes.length === 0) return false;
-  if (!video.mimes.every(isStr)) return false;
-
-  if (video.minDuration && !isNumber(video.minDuration)) return false;
-  if (video.maxDuration && !isNumber(video.maxDuration)) return false;
-
-  if (!isArray(video.protocols)) return false;
-  if (video.protocols.length === 0) return false;
-  if (!video.protocols.every(isNumber)) return false;
-
-  if (isInstream(adUnit.mediaTypes.video)) {
-    if (!video.instreamContext) return false;
-    if (SUPPORTED_INSTREAM_CONTEXTS.indexOf(video.instreamContext) === -1) return false;
-  }
-
-  return true;
-}
-
-function validateServerRequest(serverRequest) {
-  return isPlainObject(serverRequest) &&
-    isPlainObject(serverRequest.data) &&
-    isArray(serverRequest.data.imp) &&
-    isPlainObject(serverRequest._adot_internal) &&
-    isArray(serverRequest._adot_internal.impressions)
-}
-
-function createServerRequestFromAdUnits(adUnits, bidRequestId, adUnitContext) {
-  return {
-    method: BID_METHOD,
-    url: BIDDER_URL,
-    data: generateBidRequestsFromAdUnits(adUnits, bidRequestId, adUnitContext),
-    _adot_internal: generateAdotInternal(adUnits)
+const BID_RESPONSE_NET_REVENUE = true;
+const BID_RESPONSE_TTL = 10;
+const DEFAULT_CURRENCY = 'USD';
+
+/**
+ * Parse string in plain object
+ *
+ * @param {string} data
+ * @returns {object|null} Parsed object or null
+ */
+function tryParse(data) {
+  try {
+    return JSON.parse(data);
+  } catch (err) {
+    logError(err);
+    return null;
   }
 }
 
-function generateAdotInternal(adUnits) {
-  const impressions = adUnits.reduce((acc, adUnit) => {
-    const {bidId, mediaTypes, adUnitCode, params} = adUnit;
-    const base = {bidId, adUnitCode, container: params.video && params.video.container};
-
-    const imps = Object
-      .keys(mediaTypes)
-      .reduce((acc, mediaType, index) => {
-        const data = mediaTypes[mediaType];
-        const impressionId = `${bidId}_${index}`;
+/**
+ * Create and return site OpenRtb object from given bidderRequest
+ *
+ * @param {BidderRequest} bidderRequest
+ * @returns {Site|null} Formatted Site OpenRtb object or null
+ */
+function getOpenRTBSiteObject(bidderRequest) {
+  const refererInfo = (bidderRequest && bidderRequest.refererInfo) || null;
 
-        if (mediaType !== 'banner') return acc.concat({...base, impressionId});
+  const domain = refererInfo ? refererInfo.domain : window.location.hostname;
+  const publisherId = config.getConfig('adot.publisherId');
 
-        const bannerImps = data.sizes.map((item, i) => ({...base, impressionId: `${impressionId}_${i}`}));
-
-        return acc.concat(bannerImps);
-      }, []);
-
-    return acc.concat(imps);
-  }, []);
-
-  return {impressions};
-}
+  if (!domain) return null;
 
-function generateBidRequestsFromAdUnits(adUnits, bidRequestId, adUnitContext) {
   return {
-    id: bidRequestId,
-    imp: adUnits.reduce(generateImpressionsFromAdUnit, []),
-    site: generateSiteFromAdUnitContext(adUnitContext),
-    device: getDeviceInfo(),
-    user: getUserInfoFromAdUnitContext(adUnitContext),
-    regs: getRegulationFromAdUnitContext(adUnitContext),
-    at: FIRST_PRICE,
-    ext: generateBidRequestExtension()
+    page: refererInfo ? refererInfo.page : window.location.href,
+    domain: domain,
+    name: domain,
+    publisher: {
+      id: publisherId
+    },
+    ext: {
+      schain: bidderRequest.schain
+    }
   };
 }
 
-function generateImpressionsFromAdUnit(acc, adUnit) {
-  const {bidId, mediaTypes, params} = adUnit;
-  const {placementId} = params;
-  const pmp = {};
-
-  if (placementId) pmp.deals = [{id: placementId}]
-
-  const imps = Object
-    .keys(mediaTypes)
-    .reduce((acc, mediaType, index) => {
-      const data = mediaTypes[mediaType];
-      const impId = `${bidId}_${index}`;
-
-      if (mediaType === 'banner') return acc.concat(generateBannerFromAdUnit(impId, data, params));
-      if (mediaType === 'video') return acc.concat({id: impId, video: generateVideoFromAdUnit(data, params), pmp});
-      if (mediaType === 'native') return acc.concat({id: impId, native: generateNativeFromAdUnit(data, params), pmp});
-    }, []);
-
-  return acc.concat(imps);
+/**
+ * Create and return Device OpenRtb object
+ *
+ * @returns {Device} Formatted Device OpenRtb object or null
+ */
+function getOpenRTBDeviceObject() {
+  return { ua: navigator.userAgent, language: navigator.language };
 }
 
-function isImpressionAVideo(impression) {
-  return isPlainObject(impression) && isPlainObject(impression.video);
-}
-
-function generateBannerFromAdUnit(impId, data, params) {
-  const {position, placementId} = params;
-  const pos = position || 0;
-  const pmp = {};
-
-  if (placementId) pmp.deals = [{id: placementId}]
-
-  return data.sizes.map(([w, h], index) => ({id: `${impId}_${index}`, banner: {format: [{w, h}], w, h, pos}, pmp}));
-}
-
-function generateVideoFromAdUnit(data, params) {
-  const {playerSize} = data;
-  const hasPlayerSize = isArray(playerSize) && playerSize.length > 0;
-  const {position, video = {}} = params;
-  const {minDuration, maxDuration, protocols} = video;
-
-  const size = {width: hasPlayerSize ? playerSize[0][0] : null, height: hasPlayerSize ? playerSize[0][1] : null};
-  const duration = {min: isNumber(minDuration) ? minDuration : null, max: isNumber(maxDuration) ? maxDuration : null};
+/**
+ * Create and return User OpenRtb object
+ *
+ * @param {BidderRequest} bidderRequest
+ * @returns {User|null} Formatted User OpenRtb object or null
+ */
+function getOpenRTBUserObject(bidderRequest) {
+  if (!bidderRequest || !bidderRequest.gdprConsent || !isStr(bidderRequest.gdprConsent.consentString)) return null;
 
   return {
-    mimes: SUPPORTED_VIDEO_MIMES,
-    w: size.width,
-    h: size.height,
-    startdelay: computeStartDelay(data, params),
-    minduration: duration.min,
-    maxduration: duration.max,
-    protocols,
-    pos: position || 0
+    ext: {
+      consent: bidderRequest.gdprConsent.consentString,
+      pubProvidedId: bidderRequest.userId && bidderRequest.userId.pubProvidedId,
+    },
   };
 }
 
-function isInstream(video) {
-  return isPlainObject(video) && (video.context === 'instream');
-}
-
-function isOutstream(video) {
-  return isPlainObject(video) && (video.startdelay === null)
+/**
+ * Create and return Regs OpenRtb object
+ *
+ * @param {BidderRequest} bidderRequest
+ * @returns {Regs|null} Formatted Regs OpenRtb object or null
+ */
+function getOpenRTBRegsObject(bidderRequest) {
+  if (!bidderRequest || !bidderRequest.gdprConsent || !isBoolean(bidderRequest.gdprConsent.gdprApplies)) return null;
+  return { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies } };
+}
+
+/**
+ * Create and return Ext OpenRtb object
+ *
+ * @param {BidderRequest} bidderRequest
+ * @returns {Ext|null} Formatted Ext OpenRtb object or null
+ */
+function getOpenRTBExtObject() {
+  return {
+    adot: { adapter_version: ADAPTER_VERSION },
+    should_use_gzip: true
+  };
 }
 
-function computeStartDelay(data, params) {
-  if (isInstream(data)) {
-    if (params.video.instreamContext === 'pre-roll') return 0;
-    if (params.video.instreamContext === 'mid-roll') return -1;
-    if (params.video.instreamContext === 'post-roll') return -2;
-  }
-
+/**
+ * Return MediaType from MediaTypes object
+ *
+ * @param {MediaType} mediaTypes Prebid MediaTypes
+ * @returns {string|null} Mediatype or null if not found
+ */
+function getMediaType(mediaTypes) {
+  if (mediaTypes.banner) return 'banner';
+  if (mediaTypes.video) return 'video';
+  if (mediaTypes.native) return 'native';
   return null;
 }
 
-function generateNativeFromAdUnit(data, params) {
-  const placements = NATIVE_PLACEMENTS;
-  const assets = Object
-    .keys(data)
-    .reduce((acc, placement) => {
-      const placementData = data[placement];
-      const assetInfo = placements[placement];
-
-      if (!assetInfo) return acc;
-
-      const {id, name, type} = assetInfo;
-      const {required, len, sizes} = placementData;
-      const wmin = sizes && sizes[0];
-      const hmin = sizes && sizes[1];
-      const content = {};
-
-      if (type) content.type = type;
-      if (len) content.len = len;
-      if (wmin) content.wmin = wmin;
-      if (hmin) content.hmin = hmin;
-
-      acc.push({id, required, [name]: content});
-
-      return acc;
-    }, []);
+/**
+ * Build OpenRtb imp banner from given bidderRequest and media
+ *
+ * @param {Banner} banner MediaType Banner Object
+ * @param {BidderRequest} bidderRequest
+ * @returns {OpenRtbBanner} OpenRtb banner object
+ */
+function buildBanner(banner, bidderRequest) {
+  const pos = bidderRequest.position || 0;
+  const format = (banner.sizes || []).map(([w, h]) => ({ w, h }));
+  return { format, pos };
+}
+
+/**
+ * Build object with w and h value depending on given video media
+ *
+ * @param {Video} video MediaType Video Object
+ * @returns {Object} Size as { w: number; h: number }
+ */
+function getVideoSize(video) {
+  const sizes = video.playerSize || [];
+  const format = sizes.length > 0 ? sizes[0] : [];
 
   return {
-    request: JSON.stringify({assets})
+    w: format[0] || null,
+    h: format[1] || null
   };
 }
 
-function generateSiteFromAdUnitContext(adUnitContext) {
-  if (!adUnitContext || !adUnitContext.refererInfo) return null;
-
-  const domain = extractSiteDomainFromURL(adUnitContext.refererInfo.referer);
-
-  if (!domain) return null;
+/**
+ * Build OpenRtb imp video from given bidderRequest and media
+ *
+ * @param {Video} video MediaType Video Object
+ * @returns {OpenRtbVideo} OpenRtb video object
+ */
+function buildVideo(video) {
+  const { w, h } = getVideoSize(video);
 
   return {
-    page: adUnitContext.refererInfo.referer,
-    domain: domain,
-    name: domain
+    api: video.api,
+    w,
+    h,
+    linearity: video.linearity || null,
+    mimes: video.mimes,
+    minduration: video.minduration,
+    maxduration: video.maxduration,
+    placement: video.placement,
+    playbackmethod: video.playbackmethod,
+    pos: video.position || 0,
+    protocols: video.protocols,
+    skip: video.skip || 0,
+    startdelay: video.startdelay
   };
 }
 
-function extractSiteDomainFromURL(url) {
-  if (!url || !isStr(url)) return null;
-
-  const domain = url.match(DOMAIN_REGEX);
-
-  if (isArray(domain) && domain.length === 2) return domain[1];
-
-  return null;
-}
-
-function getDeviceInfo() {
-  return {ua: navigator.userAgent, language: navigator.language};
-}
-
-function getUserInfoFromAdUnitContext(adUnitContext) {
-  if (!adUnitContext || !adUnitContext.gdprConsent) return null;
-  if (!isStr(adUnitContext.gdprConsent.consentString)) return null;
+/**
+ * Check if given Native Media is an asset of type Image.
+ *
+ * Return default native assets if given media is an asset
+ * Return given native assets if given media is not an asset
+ *
+ * @param {NativeMedia} native Native Mediatype
+ * @returns {OpenRtbNativeAssets}
+ */
+function cleanNativeMedia(native) {
+  if (native.type !== 'image') return native;
 
   return {
-    ext: {
-      consent: adUnitContext.gdprConsent.consentString
-    }
+    image: { required: true, sizes: native.sizes },
+    title: { required: true },
+    sponsoredBy: { required: true },
+    body: { required: false },
+    cta: { required: false },
+    icon: { required: false }
   };
 }
 
-function getRegulationFromAdUnitContext(adUnitContext) {
-  if (!adUnitContext || !adUnitContext.gdprConsent) return null;
-  if (!isBoolean(adUnitContext.gdprConsent.gdprApplies)) return null;
+/**
+ * Build Native OpenRtb Imp from Native Mediatype
+ *
+ * @param {NativeMedia} native Native Mediatype
+ * @returns {OpenRtbNative}
+ */
+function buildNative(native) {
+  native = cleanNativeMedia(native);
 
-  return {
-    ext: {
-      gdpr: adUnitContext.gdprConsent.gdprApplies
-    }
-  };
-}
-
-function generateBidRequestExtension() {
-  return {
-    adot: {adapter_version: ADAPTER_VERSION},
-    should_use_gzip: true
-  };
-}
+  const assets = Object.keys(native)
+    .reduce((nativeAssets, assetKey) => {
+      const asset = native[assetKey];
+      const assetInfo = NATIVE_PLACEMENTS[assetKey];
 
-function validateServerResponse(serverResponse) {
-  return isPlainObject(serverResponse) &&
-    isPlainObject(serverResponse.body) &&
-    isStr(serverResponse.body.cur) &&
-    isArray(serverResponse.body.seatbid);
-}
+      if (!assetInfo) return nativeAssets;
 
-function seatBidsToAds(seatBid, bidResponse, serverRequest) {
-  return seatBid.bid
-    .filter(bid => validateBids(bid, serverRequest))
-    .map(bid => generateAdFromBid(bid, bidResponse, serverRequest));
-}
+      const { id, name, type } = assetInfo;
+      const { required, len, sizes = [] } = asset;
 
-function validateBids(bid, serverRequest) {
-  if (!isPlainObject(bid)) return false;
-  if (!isStr(bid.impid)) return false;
-  if (!isStr(bid.crid)) return false;
-  if (!isNumber(bid.price)) return false;
-
-  if (!isPlainObject(bid.ext)) return false;
-  if (!isPlainObject(bid.ext.adot)) return false;
-  if (!isStr(bid.ext.adot.media_type)) return false;
-  if (BID_SUPPORTED_MEDIA_TYPES.indexOf(bid.ext.adot.media_type) === -1) return false;
-
-  if (!bid.adm && !bid.nurl) return false;
-  if (bid.adm) {
-    if (!isStr(bid.adm)) return false;
-    if (bid.adm.indexOf(AUCTION_PRICE) === -1) return false;
-  }
-  if (bid.nurl) {
-    if (!isStr(bid.nurl)) return false;
-    if (bid.nurl.indexOf(AUCTION_PRICE) === -1) return false;
-  }
+      let wmin;
+      let hmin;
 
-  if (isBidABanner(bid)) {
-    if (!isNumber(bid.h)) return false;
-    if (!isNumber(bid.w)) return false;
-  }
-  if (isBidAVideo(bid)) {
-    if (!(isNone(bid.h) || isNumber(bid.h))) return false;
-    if (!(isNone(bid.w) || isNumber(bid.w))) return false;
-  }
+      if (isArray(sizes[0])) {
+        wmin = sizes[0][0];
+        hmin = sizes[0][1];
+      } else {
+        wmin = sizes[0];
+        hmin = sizes[1];
+      }
 
-  const impression = getImpressionData(serverRequest, bid.impid);
+      const newAsset = {};
 
-  if (!isPlainObject(impression.openRTB)) return false;
-  if (!isPlainObject(impression.internal)) return false;
-  if (!isStr(impression.internal.adUnitCode)) return false;
+      if (type) newAsset.type = type;
+      if (len) newAsset.len = len;
+      if (wmin) newAsset.wmin = wmin;
+      if (hmin) newAsset.hmin = hmin;
 
-  if (isBidABanner(bid)) {
-    if (!isPlainObject(impression.openRTB.banner)) return false;
-  }
-  if (isBidAVideo(bid)) {
-    if (!isPlainObject(impression.openRTB.video)) return false;
-  }
-  if (isBidANative(bid)) {
-    if (!isPlainObject(impression.openRTB.native) || !tryParse(bid.adm)) return false;
-  }
+      nativeAssets.push({ id, required, [name]: newAsset });
 
-  return true;
-}
+      return nativeAssets;
+    }, []);
 
-function isBidABanner(bid) {
-  return isPlainObject(bid) &&
-    isPlainObject(bid.ext) &&
-    isPlainObject(bid.ext.adot) &&
-    bid.ext.adot.media_type === 'banner';
+  return { request: JSON.stringify({ assets }) };
 }
 
-function isBidAVideo(bid) {
-  return isPlainObject(bid) &&
-    isPlainObject(bid.ext) &&
-    isPlainObject(bid.ext.adot) &&
-    bid.ext.adot.media_type === 'video';
-}
+/**
+ * Build OpenRtb Imp object from given Adunit and Context
+ *
+ * @param {AdUnit} adUnit PrebidJS Adunit
+ * @param {BidderRequest} bidderRequest PrebidJS Bidder Request
+ * @returns {Imp} OpenRtb Impression
+ */
+function buildImpFromAdUnit(adUnit, bidderRequest) {
+  const { bidId, mediaTypes, params, adUnitCode } = adUnit;
+  const mediaType = getMediaType(mediaTypes);
 
-function isBidANative(bid) {
-  return isPlainObject(bid) &&
-    isPlainObject(bid.ext) &&
-    isPlainObject(bid.ext.adot) &&
-    bid.ext.adot.media_type === 'native';
-}
+  if (!mediaType) return null;
 
-function getImpressionData(serverRequest, impressionId) {
-  const openRTBImpression = find(serverRequest.data.imp, imp => imp.id === impressionId);
-  const internalImpression = find(serverRequest._adot_internal.impressions, imp => imp.impressionId === impressionId);
+  const media = IMP_BUILDER[mediaType](mediaTypes[mediaType], bidderRequest, adUnit)
+  const currency = config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY;
+  const bidfloor = getMainFloor(adUnit, media.format, mediaType, currency);
 
   return {
-    id: impressionId,
-    openRTB: openRTBImpression || null,
-    internal: internalImpression || null
+    id: bidId,
+    ext: {
+      placementId: params.placementId,
+      adUnitCode,
+      container: params.video && params.video.container
+    },
+    [mediaType]: media,
+    bidfloorcur: currency,
+    bidfloor
   };
 }
 
-function generateAdFromBid(bid, bidResponse, serverRequest) {
-  const impressionData = getImpressionData(serverRequest, bid.impid);
-  const isVideo = isBidAVideo(bid);
-  const base = {
-    requestId: impressionData.internal.bidId,
-    cpm: bid.price,
-    currency: bidResponse.cur,
-    ttl: TTL,
-    creativeId: bid.crid,
-    netRevenue: NET_REVENUE,
-    mediaType: bid.ext.adot.media_type,
-  };
-
-  if (isBidANative(bid)) return {...base, native: formatNativeData(bid.adm)};
-
-  const size = getSizeFromBid(bid, impressionData);
-  const creative = getCreativeFromBid(bid, impressionData);
+/**
+ * Return if given video is Valid.
+ * A video is defined as valid if it contains all required fields
+ *
+ * @param {VideoMedia} video
+ * @returns {boolean}
+ */
+function isValidVideo(video) {
+  if (REQUIRED_VIDEO_PARAMS.some((param) => video[param] === undefined)) return false;
+  return true;
+}
 
+/**
+ * Return if given bid is Valid.
+ * A bid is defined as valid if it media is a valid video or other media
+ *
+ * @param {Bid} bid
+ * @returns {boolean}
+ */
+function isBidRequestValid(bid) {
+  const video = bid.mediaTypes.video;
+  return !video || isValidVideo(video);
+}
+
+/**
+ * Build OpenRtb request from Prebid AdUnits and Bidder request
+ *
+ * @param {Array<AdUnit>} adUnits Array of PrebidJS Adunit
+ * @param {BidderRequest} bidderRequest PrebidJS BidderRequest
+ * @param {string} requestId Request ID
+ *
+ * @returns {OpenRTBBidRequest} OpenRTB bid request
+ */
+function buildBidRequest(adUnits, bidderRequest, requestId) {
+  const data = {
+    id: requestId,
+    imp: adUnits.map((adUnit) => buildImpFromAdUnit(adUnit, bidderRequest)).filter((item) => !!item),
+    site: getOpenRTBSiteObject(bidderRequest),
+    device: getOpenRTBDeviceObject(),
+    user: getOpenRTBUserObject(bidderRequest),
+    regs: getOpenRTBRegsObject(bidderRequest),
+    ext: getOpenRTBExtObject(),
+    at: FIRST_PRICE
+  };
+  return data;
+}
+
+/**
+ * Build PrebidJS Ajax request
+ *
+ * @param {Array<AdUnit>} adUnits Array of PrebidJS Adunit
+ * @param {BidderRequest} bidderRequest PrebidJS BidderRequest
+ * @param {string} bidderUrl Adot Bidder URL
+ * @param {string} requestId Request ID
+ * @returns
+ */
+function buildAjaxRequest(adUnits, bidderRequest, bidderUrl, requestId) {
   return {
-    ...base,
-    height: size.height,
-    width: size.width,
-    ad: creative.markup,
-    adUrl: creative.markupUrl,
-    vastXml: isVideo && !isStr(creative.markupUrl) ? creative.markup : null,
-    vastUrl: isVideo && isStr(creative.markupUrl) ? creative.markupUrl : null,
-    renderer: creative.renderer
+    method: BID_METHOD,
+    url: bidderUrl,
+    data: buildBidRequest(adUnits, bidderRequest, requestId)
   };
 }
 
-function formatNativeData(adm) {
+/**
+ * Split given PrebidJS Request in Dictionnary
+ *
+ * @param {Array<PrebidBidRequest>} validBidRequests
+ * @returns {Dictionnary<PrebidBidRequest>}
+ */
+function splitAdUnits(validBidRequests) {
+  return validBidRequests.reduce((adUnits, adUnit) => {
+    const bidderRequestId = adUnit.bidderRequestId;
+    if (!adUnits[bidderRequestId]) {
+      adUnits[bidderRequestId] = [];
+    }
+    adUnits[bidderRequestId].push(adUnit);
+    return adUnits;
+  }, {});
+}
+
+/**
+ * Build Ajax request Array
+ *
+ * @param {Array<PrebidBidRequest>} validBidRequests
+ * @param {BidderRequest} bidderRequest
+ * @returns {Array<AjaxRequest>}
+ */
+function buildRequests(validBidRequests, bidderRequest) {
+  // convert Native ORTB definition to old-style prebid native definition
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+  const adUnits = splitAdUnits(validBidRequests);
+  const publisherPathConfig = config.getConfig('adot.publisherPath');
+  const publisherPath = publisherPathConfig === undefined ? '' : '/' + publisherPathConfig;
+  const bidderUrl = BIDDER_URL.replace('{PUBLISHER_PATH}', publisherPath);
+
+  return Object.keys(adUnits).map((requestId) => buildAjaxRequest(adUnits[requestId], bidderRequest, bidderUrl, requestId));
+}
+
+/**
+ * Build Native PrebidJS Response grom OpenRtb Response
+ *
+ * @param {OpenRtbBid} bid
+ *
+ * @returns {NativeAssets} Native PrebidJS
+ */
+function buildNativeBidData(bid) {
+  const { adm, price } = bid;
   const parsedAdm = tryParse(adm);
-  const {assets, link: {url, clicktrackers}, imptrackers, jstracker} = parsedAdm.native;
-  const placements = NATIVE_PLACEMENTS;
-  const placementIds = NATIVE_ID_MAPPING;
+  const { assets, link: { url, clicktrackers }, imptrackers, jstracker } = parsedAdm.native;
 
   return assets.reduce((acc, asset) => {
-    const placementName = placementIds[asset.id];
-    const content = placementName && asset[placements[placementName].name];
+    const placementName = NATIVE_ID_MAPPING[asset.id];
+    const content = placementName && asset[NATIVE_PLACEMENTS[placementName].name];
     if (!content) return acc;
-    acc[placementName] = content.text || content.value || {url: content.url, width: content.w, height: content.h};
+    acc[placementName] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
     return acc;
   }, {
     clickUrl: url,
     clickTrackers: clicktrackers,
-    impressionTrackers: imptrackers,
+    impressionTrackers: imptrackers && imptrackers.map(impTracker => replaceAuctionPrice(impTracker, price)),
     javascriptTrackers: jstracker && [jstracker]
   });
 }
 
-function getSizeFromBid(bid, impressionData) {
-  if (isNumber(bid.w) && isNumber(bid.h)) {
-    return { width: bid.w, height: bid.h };
-  }
-
-  if (isImpressionAVideo(impressionData.openRTB)) {
-    const { video } = impressionData.openRTB;
-
-    if (isNumber(video.w) && isNumber(video.h)) {
-      return { width: video.w, height: video.h };
-    }
-  }
-
-  return { width: null, height: null };
-}
-
-function getCreativeFromBid(bid, impressionData) {
-  const shouldUseAdMarkup = !!bid.adm;
-
-  return {
-    markup: shouldUseAdMarkup ? bid.adm : null,
-    markupUrl: !shouldUseAdMarkup ? bid.nurl : null,
-    renderer: getRendererFromBid(bid, impressionData)
-  };
-}
-
-function getRendererFromBid(bid, impressionData) {
-  const isOutstreamImpression = isBidAVideo(bid) &&
-    isImpressionAVideo(impressionData.openRTB) &&
-    isOutstream(impressionData.openRTB.video);
+/**
+ * Return Adot Renderer if given Bid is a video one
+ *
+ * @param {OpenRtbBid} bid
+ * @param {string} mediaType
+ * @returns {any|null}
+ */
+function buildRenderer(bid, mediaType) {
+  if (!(mediaType === VIDEO &&
+    bid.ext &&
+    bid.ext.adot &&
+    bid.ext.adot.container &&
+    bid.ext.adot.adUnitCode &&
+    bid.ext.adot.video &&
+    bid.ext.adot.video.type === OUTSTREAM)) return null;
+
+  const container = bid.ext.adot.container
+  const adUnitCode = bid.ext.adot.adUnitCode
 
-  return isOutstreamImpression
-    ? buildOutstreamRenderer(impressionData)
-    : null;
-}
-
-function buildOutstreamRenderer(impressionData) {
   const renderer = Renderer.install({
     url: OUTSTREAM_VIDEO_PLAYER_URL,
     loaded: false,
-    adUnitCode: impressionData.internal.adUnitCode
+    adUnitCode: adUnitCode
   });
 
   renderer.setRender((ad) => {
     ad.renderer.push(() => {
-      const container = impressionData.internal.container
-        ? document.querySelector(impressionData.internal.container)
-        : document.getElementById(impressionData.internal.adUnitCode);
+      const domContainer = container
+        ? document.querySelector(container)
+        : document.getElementById(adUnitCode);
 
-      const player = new window.VASTPlayer(container);
+      const player = new window.VASTPlayer(domContainer);
 
       player.on('ready', () => {
         player.adVolume = 0;
@@ -554,54 +461,181 @@ function buildOutstreamRenderer(impressionData) {
   return renderer;
 }
 
-function tryParse(data) {
-  try {
-    return JSON.parse(data);
-  } catch (err) {
-    logError(err);
-    return null;
-  }
+/**
+ * Build PrebidJS response from OpenRtbBid
+ *
+ * @param {OpenRtbBid} bid
+ * @param {string} mediaType
+ * @returns {Object}
+ */
+function buildCreativeBidData(bid, mediaType) {
+  const adm = bid.adm ? replaceAuctionPrice(bid.adm, bid.price) : null;
+  const nurl = (!bid.adm && bid.nurl) ? replaceAuctionPrice(bid.nurl, bid.price) : null;
+
+  return {
+    width: bid.ext.adot.size && bid.ext.adot.size.w,
+    height: bid.ext.adot.size && bid.ext.adot.size.h,
+    ad: adm,
+    adUrl: nurl,
+    vastXml: mediaType === VIDEO && !isStr(nurl) ? adm : null,
+    vastUrl: mediaType === VIDEO && isStr(nurl) ? nurl : null,
+    renderer: buildRenderer(bid, mediaType)
+  };
 }
 
-const adotBidderSpec = {
-  code: 'adot',
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-  isBidRequestValid(adUnit) {
-    const allowedBidderCodes = [this.code];
-
-    return isPlainObject(adUnit) &&
-      allowedBidderCodes.indexOf(adUnit.bidder) !== -1 &&
-      isStr(adUnit.adUnitCode) &&
-      isStr(adUnit.bidderRequestId) &&
-      isStr(adUnit.bidId) &&
-      validateMediaTypes(adUnit.mediaTypes, this.supportedMediaTypes) &&
-      validateParameters(adUnit.params, adUnit);
-  },
-  buildRequests(adUnits, adUnitContext) {
-    if (!adUnits) return null;
-
-    return groupBy(adUnits, 'bidderRequestId').map(group => {
-      const bidRequestId = group.id;
-      const adUnits = groupBy(group.values, 'bidId').map((group) => {
-        const length = group.values.length;
-        return length > 0 && group.values[length - 1]
-      });
+/**
+ * Return if given bid and imp are valid
+ *
+ * @param {OpenRtbBid} bid OpenRtb Bid
+ * @param {Imp} imp OpenRtb Imp
+ * @returns {boolean}
+ */
+function isBidImpInvalid(bid, imp) {
+  return !bid || !imp;
+}
+
+/**
+ * Build PrebidJS Bid Response from given OpenRTB Bid
+ *
+ * @param {OpenRtbBid} bid
+ * @param {OpenRtbBidResponse} bidResponse
+ * @param {OpenRtbBid} imp
+ * @returns {PrebidJSResponse}
+ */
+function buildBidResponse(bid, bidResponse, imp) {
+  if (isBidImpInvalid(bid, imp)) return null;
+  const mediaType = bid.ext.adot.media_type;
+  const baseBid = {
+    requestId: bid.impid,
+    cpm: bid.price,
+    currency: bidResponse.cur,
+    ttl: BID_RESPONSE_TTL,
+    creativeId: bid.crid,
+    netRevenue: BID_RESPONSE_NET_REVENUE,
+    mediaType
+  };
 
-      return createServerRequestFromAdUnits(adUnits, bidRequestId, adUnitContext)
+  if (bid.dealid) baseBid.dealId = bid.dealid;
+  if (bid.adomain) baseBid.meta = { advertiserDomains: bid.adomain };
+
+  if (mediaType === NATIVE) return { ...baseBid, native: buildNativeBidData(bid) };
+  return { ...baseBid, ...buildCreativeBidData(bid, mediaType) };
+}
+
+/**
+ * Find OpenRtb Imp from request with same id that given bid
+ *
+ * @param {OpenRtbBid} bid
+ * @param {OpenRtbRequest} bidRequest
+ * @returns {Imp} OpenRtb Imp
+ */
+function getImpfromBid(bid, bidRequest) {
+  if (!bidRequest || !bidRequest.imp) return null;
+  const imps = bidRequest.imp;
+  return find(imps, (imp) => imp.id === bid.impid);
+}
+
+/**
+ * Return if given response is valid
+ *
+ * @param {OpenRtbBidResponse} response
+ * @returns {boolean}
+ */
+function isValidResponse(response) {
+  return isPlainObject(response) &&
+    isPlainObject(response.body) &&
+    isStr(response.body.cur) &&
+    isArray(response.body.seatbid);
+}
+
+/**
+ * Return if given request is valid
+ *
+ * @param {OpenRtbRequest} request
+ * @returns {boolean}
+ */
+function isValidRequest(request) {
+  return isPlainObject(request) &&
+    isPlainObject(request.data) &&
+    isArray(request.data.imp);
+}
+
+/**
+ * Interpret given OpenRtb Response to build PrebidJS Response
+ *
+ * @param {OpenRtbBidResponse} serverResponse
+ * @param {OpenRtbRequest} request
+ * @returns {PrebidJSResponse}
+ */
+function interpretResponse(serverResponse, request) {
+  if (!isValidResponse(serverResponse) || !isValidRequest(request)) return [];
+
+  const bidsResponse = serverResponse.body;
+  const bidRequest = request.data;
+
+  return bidsResponse.seatbid.reduce((pbsResponse, seatbid) => {
+    if (!seatbid || !isArray(seatbid.bid)) return pbsResponse;
+    seatbid.bid.forEach((bid) => {
+      const imp = getImpfromBid(bid, bidRequest);
+      const bidResponse = buildBidResponse(bid, bidsResponse, imp);
+      if (bidResponse) pbsResponse.push(bidResponse);
     });
-  },
-  interpretResponse(serverResponse, serverRequest) {
-    if (!validateServerRequest(serverRequest)) return [];
-    if (!validateServerResponse(serverResponse)) return [];
-
-    const bidResponse = serverResponse.body;
+    return pbsResponse;
+  }, []);
+}
 
-    return bidResponse.seatbid
-      .filter(seatBid => isPlainObject(seatBid) && isArray(seatBid.bid))
-      .reduce((acc, seatBid) => acc.concat(seatBidsToAds(seatBid, bidResponse, serverRequest)), []);
-  }
+/**
+ * Call Adunit getFloor function with given argument to get specific floor.
+ * Return 0 by default
+ *
+ * @param {AdUnit} adUnit
+ * @param {Array<number>|string} size Adunit size or *
+ * @param {string} mediaType
+ * @param {string} currency USD by default
+ *
+ * @returns {number} Floor price
+ */
+function getFloor(adUnit, size, mediaType, currency) {
+  if (!isFn(adUnit.getFloor)) return 0;
+
+  const floorResult = adUnit.getFloor({ currency, mediaType, size });
+
+  return floorResult.currency === currency ? floorResult.floor : 0;
+}
+
+/**
+ * Call getFloor for each format and return the lower floor
+ * Return 0 by default
+ *
+ * interface Format { w: number; h: number }
+ *
+ * @param {AdUnit} adUnit
+ * @param {Array<Format>} formats Media formats
+ * @param {string} mediaType
+ * @param {string} currency USD by default
+ *
+ * @returns {number} Lower floor.
+ */
+function getMainFloor(adUnit, formats, mediaType, currency) {
+  if (!formats) return getFloor(adUnit, '*', mediaType, currency);
+
+  return formats.reduce((bidFloor, format) => {
+    const floor = getFloor(adUnit, [format.w, format.h], mediaType, currency)
+    const maxFloor = bidFloor || Number.MAX_SAFE_INTEGER;
+    return floor !== 0 && floor < maxFloor ? floor : bidFloor;
+  }, null) || 0;
+}
+
+/**
+ * Adot PrebidJS Adapter
+ */
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getFloor
 };
 
-registerBidder(adotBidderSpec);
-
-export {adotBidderSpec as spec};
+registerBidder(spec);
diff --git a/modules/adotBidAdapter.md b/modules/adotBidAdapter.md
index 88c8fb0b936..d1622e5f901 100644
--- a/modules/adotBidAdapter.md
+++ b/modules/adotBidAdapter.md
@@ -6,7 +6,7 @@ Adot Bidder Adapter is a module that enables the communication between the Prebi
 
 - Module name: Adot Bidder Adapter
 - Module type: Bidder Adapter
-- Maintainer: `maxime.lequain@we-are-adot.com`
+- Maintainer: `alexandre.lorin@adotmob.com`
 - Supported media types: `banner`, `video`, `native`
 
 ## Example ad units
@@ -34,9 +34,9 @@ const adUnit = {
 
 ### Video ad unit
 
-#### Outstream video ad unit
+#### Video ad unit
 
-Adot Bidder Adapter accepts outstream video ad units using the following ad unit format:
+Adot Bidder Adapter accepts video ad units using the following ad unit format:
 
 ```javascript
 const adUnit = {
@@ -47,61 +47,21 @@ const adUnit = {
             context: 'outstream',
             // Video dimensions supported by the video ad unit.
             // Each ad unit size is formatted as follows: [width, height].
-            playerSize: [[300, 250]]
+            playerSize: [[300, 250]],
+            // Content MIME types supported by the ad unit.
+            mimes: ['video/mp4'],
+            // Minimum accepted video ad duration (in seconds).
+            minduration: 5,
+            // Maximum accepted video ad duration (in seconds).
+            maxduration: 35,
+            // Video protocols supported by the ad unit (see the OpenRTB 2.5 specifications,
+            // section 5.8).
+            protocols: [2, 3]
         }
     },
     bids: [{
         bidder: 'adot',
-        params: {
-            video: {
-                // Content MIME types supported by the ad unit.
-                mimes: ['video/mp4'],
-                // Minimum accepted video ad duration (in seconds).
-                minDuration: 5,
-                // Maximum accepted video ad duration (in seconds).
-                maxDuration: 35,
-                // Video protocols supported by the ad unit (see the OpenRTB 2.5 specifications,
-                // section 5.8).
-                protocols: [2, 3]
-            }
-        }
-    }]
-}
-```
-
-#### Instream video ad unit
-
-Adot Bidder Adapter accepts instream video ad units using the following ad unit format:
-
-```javascript
-const adUnit = {
-    code: 'test-div',
-    mediaTypes: {
-        video: {
-            // Video context. Must be 'instream'.
-            context: 'instream',
-            // Video dimensions supported by the video ad unit.
-            // Each ad unit size is formatted as follows: [width, height].
-            playerSize: [[300, 250]]
-        }
-    },
-    bids: [{
-        bidder: 'adot',
-        params: {
-            video: {
-                // Content MIME types supported by the ad unit.
-                mimes: ['video/mp4'],
-                // Minimum accepted video ad duration (in seconds).
-                minDuration: 5,
-                // Maximum accepted video ad duration (in seconds).
-                maxDuration: 35,
-                // Video protocols supported by the ad unit (see the OpenRTB 2.5 specifications,
-                // section 5.8).
-                protocols: [2, 3],
-                // Instream video context. Must be either 'pre-roll', 'mid-roll' or 'post-roll'.
-                instreamContext: 'pre-roll'
-            }
-        }
+        params: {}
     }]
 }
 ```
@@ -114,39 +74,37 @@ const adUnit = {
     code: 'test-div',
     mediaTypes: {
         native: {
-            native: {
-                image: {
-                    // Field required status
-                    required: false,
-                    // Image dimensions supported by the native ad unit.
-                    // Each ad unit size is formatted as follows: [width, height].
-                    sizes: [100, 50]
-                },
-                title: {
-                    // Field required status
-                    required: false,
-                    // Maximum length of the title
-                    len: 140
-                },
-                sponsoredBy: {
-                    // Field required status
-                    required: false
-                },
-                clickUrl: {
-                    // Field required status
-                    required: false
-                },
-                body: {
-                    // Field required status
-                    required: false
-                },
-                icon: {
-                    // Field required status
-                    required: false,
-                    // Icon dimensions supported by the native ad unit.
-                    // Each ad unit size is formatted as follows: [width, height].
-                    sizes: [50, 50]
-                }
+            image: {
+                // Field required status
+                required: false,
+                // Image dimensions supported by the native ad unit.
+                // Each ad unit size is formatted as follows: [width, height].
+                sizes: [100, 50]
+            },
+            title: {
+                // Field required status
+                required: false,
+                // Maximum length of the title
+                len: 140
+            },
+            sponsoredBy: {
+                // Field required status
+                required: false
+            },
+            clickUrl: {
+                // Field required status
+                required: false
+            },
+            body: {
+                // Field required status
+                required: false
+            },
+            icon: {
+                // Field required status
+                required: false,
+                // Icon dimensions supported by the native ad unit.
+                // Each ad unit size is formatted as follows: [width, height].
+                sizes: [50, 50]
             }
         }
     },
@@ -216,3 +174,38 @@ const adUnit = {
     }]
 }
 ```
+
+### PublisherId
+
+You can set a publisherId using `pbjs.setBidderConfig` for the bidder `adot`
+
+#### Example
+
+```javascript
+pbjs.setBidderConfig({
+    bidders: ['adot'],
+    config: {
+        adot: {
+            publisherId: '__MY_PUBLISHER_ID__'
+        }
+    }
+});
+```
+
+### Specific publisher path
+
+You can set a specific publisher path using `pbjs.setBidderConfig` for the bidder `adot`
+The bidrequest will add this path to the bidder endpoint
+
+#### Example
+
+```javascript
+pbjs.setBidderConfig({
+    bidders: ['adot'],
+    config: {
+        adot: {
+            publisherPath: '__MY_PUBLISHER_PATH__'
+        }
+    }
+});
+```
\ No newline at end of file
diff --git a/modules/adpartnerBidAdapter.js b/modules/adpartnerBidAdapter.js
index 2180b472120..471a0bba64a 100644
--- a/modules/adpartnerBidAdapter.js
+++ b/modules/adpartnerBidAdapter.js
@@ -1,5 +1,5 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js'
+import { buildUrl } from '../src/utils.js'
 import {ajax} from '../src/ajax.js';
 
 const BIDDER_CODE = 'adpartner';
@@ -11,42 +11,56 @@ export const spec = {
   code: BIDDER_CODE,
 
   isBidRequestValid: function (bidRequest) {
-    return !!parseInt(bidRequest.params.unitId);
+    return !!parseInt(bidRequest.params.unitId) || !!parseInt(bidRequest.params.partnerId);
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
-    let referer = window.location.href;
-    try {
-      referer = typeof bidderRequest.refererInfo === 'undefined'
-        ? window.top.location.href
-        : bidderRequest.refererInfo.referer;
-    } catch (e) {}
+    // TODO does it make sense to fall back to window.location.href?
+    const referer = bidderRequest?.refererInfo?.page || window.location.href;
 
     let bidRequests = [];
     let beaconParams = {
       tag: [],
+      partner: [],
       sizes: [],
       referer: ''
     };
 
     validBidRequests.forEach(function(validBidRequest) {
-      bidRequests.push({
-        unitId: parseInt(validBidRequest.params.unitId),
+      let bidRequestObject = {
         adUnitCode: validBidRequest.adUnitCode,
         sizes: validBidRequest.sizes,
         bidId: validBidRequest.bidId,
         referer: referer
-      });
+      };
+
+      if (parseInt(validBidRequest.params.unitId)) {
+        bidRequestObject.unitId = parseInt(validBidRequest.params.unitId);
+        beaconParams.tag.push(validBidRequest.params.unitId);
+      }
+
+      if (parseInt(validBidRequest.params.partnerId)) {
+        bidRequestObject.unitId = 0;
+        bidRequestObject.partnerId = parseInt(validBidRequest.params.partnerId);
+        beaconParams.partner.push(validBidRequest.params.partnerId);
+      }
+
+      bidRequests.push(bidRequestObject);
 
-      beaconParams.tag.push(validBidRequest.params.unitId);
       beaconParams.sizes.push(spec.joinSizesToString(validBidRequest.sizes));
       beaconParams.referer = encodeURIComponent(referer);
     });
 
+    if (beaconParams.partner.length > 0) {
+      beaconParams.partner = beaconParams.partner.join(',');
+    } else {
+      delete beaconParams.partner;
+    }
+
     beaconParams.tag = beaconParams.tag.join(',');
     beaconParams.sizes = beaconParams.sizes.join(',');
 
-    let adPartnerRequestUrl = utils.buildUrl({
+    let adPartnerRequestUrl = buildUrl({
       protocol: ENDPOINT_PROTOCOL,
       hostname: ENDPOINT_DOMAIN,
       pathname: ENDPOINT_PATH,
@@ -86,7 +100,7 @@ export const spec = {
   },
 
   adResponse: function(bid, ad) {
-    return {
+    const bidObject = {
       requestId: bid.bidId,
       ad: ad.ad,
       cpm: ad.cpm,
@@ -97,12 +111,19 @@ export const spec = {
       netRevenue: ad.netRevenue,
       currency: ad.currency,
       winNotification: ad.winNotification
-    };
+    }
+
+    bidObject.meta = {};
+    if (ad.adomain && ad.adomain.length > 0) {
+      bidObject.meta.advertiserDomains = ad.adomain;
+    }
+
+    return bidObject;
   },
 
   onBidWon: function(data) {
     data.winNotification.forEach(function(unitWon) {
-      let adPartnerBidWonUrl = utils.buildUrl({
+      let adPartnerBidWonUrl = buildUrl({
         protocol: ENDPOINT_PROTOCOL,
         hostname: ENDPOINT_DOMAIN,
         pathname: unitWon.path
@@ -118,7 +139,73 @@ export const spec = {
 
   postRequest(endpoint, data) {
     ajax(endpoint, null, data, {method: 'POST'});
-  }
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+
+    if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
+      return syncs;
+    }
+
+    let appendGdprParams = function (url, gdprParams) {
+      if (gdprParams === null) {
+        return url;
+      }
+
+      return url + (url.indexOf('?') >= 0 ? '&' : '?') + gdprParams;
+    };
+
+    let gdprParams = null;
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    serverResponses.forEach(resp => {
+      if (resp.body) {
+        Object.keys(resp.body).map(function(key, index) {
+          let respObject = resp.body[key];
+          if (respObject['syncs'] !== undefined &&
+            Array.isArray(respObject.syncs) &&
+            respObject.syncs.length > 0) {
+            if (syncOptions.iframeEnabled) {
+              respObject.syncs.filter(function (syncIframeObject) {
+                if (syncIframeObject['type'] !== undefined &&
+                  syncIframeObject['link'] !== undefined &&
+                  syncIframeObject.type === 'iframe') { return true; }
+                return false;
+              }).forEach(function (syncIframeObject) {
+                syncs.push({
+                  type: 'iframe',
+                  url: appendGdprParams(syncIframeObject.link, gdprParams)
+                });
+              });
+            }
+            if (syncOptions.pixelEnabled) {
+              respObject.syncs.filter(function (syncImageObject) {
+                if (syncImageObject['type'] !== undefined &&
+                  syncImageObject['link'] !== undefined &&
+                  syncImageObject.type === 'image') { return true; }
+                return false;
+              }).forEach(function (syncImageObject) {
+                syncs.push({
+                  type: 'image',
+                  url: appendGdprParams(syncImageObject.link, gdprParams)
+                });
+              });
+            }
+          }
+        });
+      }
+    });
+
+    return syncs;
+  },
+
 }
 
 registerBidder(spec);
diff --git a/modules/adpartnerBidAdapter.md b/modules/adpartnerBidAdapter.md
index ad105c43a8a..2dc1c31c4c3 100644
--- a/modules/adpartnerBidAdapter.md
+++ b/modules/adpartnerBidAdapter.md
@@ -23,7 +23,19 @@ About us : https://adpartner.pro
                 {
                     bidder: "adpartner",
                     params: {
-                        unitId: 5809
+                        unitId: 6698
+                    }
+                }
+            ]
+        },
+        {
+            code: 'div-adpartner-example-2',
+            sizes: [[300, 250]],
+            bids: [
+                {
+                    bidder: "adpartner",
+                    params: {
+                        partnerId: 6698
                     }
                 }
             ]
diff --git a/modules/adplusBidAdapter.js b/modules/adplusBidAdapter.js
new file mode 100644
index 00000000000..6fbe1fe1dde
--- /dev/null
+++ b/modules/adplusBidAdapter.js
@@ -0,0 +1,204 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+// #region Constants
+export const BIDDER_CODE = 'adplus';
+export const ADPLUS_ENDPOINT = 'https://ssp.ad-plus.com.tr/server/headerBidding';
+export const DGID_CODE = 'adplus_dg_id';
+export const SESSION_CODE = 'adplus_s_id';
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+const COOKIE_EXP = 1000 * 60 * 60 * 24; // 1 day
+// #endregion
+
+// #region Helpers
+export function isValidUuid (uuid) {
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(
+    uuid
+  );
+}
+
+function getSessionId() {
+  let sid = storage.cookiesAreEnabled() && storage.getCookie(SESSION_CODE);
+
+  if (
+    !sid || !isValidUuid(sid)
+  ) {
+    sid = utils.generateUUID();
+    setSessionId(sid);
+  }
+
+  return sid;
+}
+
+function setSessionId(sid) {
+  if (storage.cookiesAreEnabled()) {
+    const expires = new Date(Date.now() + COOKIE_EXP).toISOString();
+
+    storage.setCookie(SESSION_CODE, sid, expires);
+  }
+}
+// #endregion
+
+// #region Bid request validation
+function isBidRequestValid(bid) {
+  if (!bid) {
+    utils.logError(BIDDER_CODE, 'bid, can not be empty', bid);
+    return false;
+  }
+
+  if (!bid.params) {
+    utils.logError(BIDDER_CODE, 'bid.params is required.');
+    return false;
+  }
+
+  if (!bid.params.adUnitId || typeof bid.params.adUnitId !== 'string') {
+    utils.logError(
+      BIDDER_CODE,
+      'bid.params.adUnitId is missing or has wrong type.'
+    );
+    return false;
+  }
+
+  if (!bid.params.inventoryId || typeof bid.params.inventoryId !== 'string') {
+    utils.logError(
+      BIDDER_CODE,
+      'bid.params.inventoryId is missing or has wrong type.'
+    );
+    return false;
+  }
+
+  if (
+    !bid.mediaTypes ||
+    !bid.mediaTypes[BANNER] ||
+    !utils.isArray(bid.mediaTypes[BANNER].sizes) ||
+    bid.mediaTypes[BANNER].sizes.length <= 0 ||
+    !utils.isArrayOfNums(bid.mediaTypes[BANNER].sizes[0])
+  ) {
+    utils.logError(BIDDER_CODE, 'Wrong or missing size parameters.');
+    return false;
+  }
+
+  return true;
+}
+// #endregion
+
+// #region Building the bid requests
+/**
+ *
+ * @param {object} bid
+ * @returns
+ */
+function createBidRequest(bid) {
+  // Developer Params
+  const {
+    inventoryId,
+    adUnitId,
+    extraData,
+    yearOfBirth,
+    gender,
+    categories,
+    latitude,
+    longitude,
+    sdkVersion,
+  } = bid.params;
+
+  return {
+    method: 'GET',
+    url: ADPLUS_ENDPOINT,
+    data: utils.cleanObj({
+      bidId: bid.bidId,
+      inventoryId,
+      adUnitId,
+      adUnitWidth: bid.mediaTypes[BANNER].sizes[0][0],
+      adUnitHeight: bid.mediaTypes[BANNER].sizes[0][1],
+      extraData,
+      yearOfBirth,
+      gender,
+      categories,
+      latitude,
+      longitude,
+      sdkVersion: sdkVersion || '1',
+      session: getSessionId(),
+      interstitial: 0,
+      token: typeof window.top === 'object' && window.top[DGID_CODE] ? window.top[DGID_CODE] : undefined,
+      secure: window.location.protocol === 'https:' ? 1 : 0,
+      screenWidth: screen.width,
+      screenHeight: screen.height,
+      language: window.navigator.language || 'en-US',
+      // TODO: these should probably look at refererInfo
+      pageUrl: window.location.href,
+      domain: window.location.hostname,
+      referrer: window.location.referrer,
+    }),
+  };
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  return validBidRequests.map((req) => createBidRequest(req));
+}
+// #endregion
+
+// #region Interpreting Responses
+/**
+ *
+ * @param {HeaderBiddingResponse} responseData
+ * @param { object } bidParams
+ * @returns
+ */
+function createAdResponse(responseData, bidParams) {
+  return {
+    requestId: responseData.requestID,
+    cpm: responseData.cpm,
+    currency: responseData.currency,
+    width: responseData.width,
+    height: responseData.height,
+    creativeId: responseData.creativeID,
+    dealId: responseData.dealID,
+    netRevenue: responseData.netRevenue,
+    ttl: responseData.ttl,
+    ad: responseData.ad,
+    mediaType: responseData.mediaType,
+    meta: {
+      advertiserDomains: responseData.advertiserDomains,
+      primaryCatId: utils.isArray(responseData.categoryIDs) && responseData.categoryIDs.length > 0
+        ? responseData.categoryIDs[0] : undefined,
+      secondaryCatIds: responseData.categoryIDs,
+    },
+  };
+}
+
+function interpretResponse(response, request) {
+  // In case of empty response
+  if (
+    response.body == null ||
+    !utils.isArray(response.body) ||
+    response.body.length === 0
+  ) {
+    return [];
+  }
+  const bids = response.body.map((bid) => createAdResponse(bid));
+  return bids;
+}
+// #endregion
+
+// #region Bidder
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  onTimeout(timeoutData) {
+    utils.logError('Adplus adapter timed out for the auction.', timeoutData);
+  },
+  onBidWon(bid) {
+    utils.logInfo(
+      `Adplus adapter won the auction. Bid id: ${bid.bidId}, Ad Unit Id: ${bid.adUnitId}, Inventory Id: ${bid.inventoryId}`
+    );
+  },
+};
+
+registerBidder(spec);
+// #endregion
diff --git a/modules/adplusBidAdapter.md b/modules/adplusBidAdapter.md
new file mode 100644
index 00000000000..dce9e4a312f
--- /dev/null
+++ b/modules/adplusBidAdapter.md
@@ -0,0 +1,39 @@
+# Overview
+
+Module Name: AdPlus Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: adplus.destek@yaani.com.tr
+
+# Description
+
+AdPlus Prebid.js Bidder Adapter. Only banner formats are supported.
+
+About us : https://ssp.ad-plus.com.tr/
+
+# Test Parameters
+
+```javascript
+var adUnits = [
+  {
+    code: "div-adplus",
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+        ],
+      },
+    },
+    bids: [
+      {
+        bidder: "adplus",
+        params: {
+          inventoryId: "-1",
+          adUnitId: "-3",
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/modules/adpod.js b/modules/adpod.js
index 57baf5b5fc6..f1ab4bd2ef1 100644
--- a/modules/adpod.js
+++ b/modules/adpod.js
@@ -12,21 +12,37 @@
  * module that designed to support adpod video type ads.  This import process allows this module to effectively act as a sub-module.
  */
 
-import * as utils from '../src/utils.js';
-import { addBidToAuction, doCallbacksIfTimedout, AUCTION_IN_PROGRESS, callPrebidCache, getPriceByGranularity, getPriceGranularity } from '../src/auction.js';
-import { checkAdUnitSetup } from '../src/prebid.js';
-import { checkVideoBidSetup } from '../src/video.js';
-import { setupBeforeHookFnOnce, module } from '../src/hook.js';
-import { store } from '../src/videoCache.js';
-import { config } from '../src/config.js';
-import { ADPOD } from '../src/mediaTypes.js';
-import Set from 'core-js-pure/features/set';
-import find from 'core-js-pure/features/array/find.js';
-import { auctionManager } from '../src/auctionManager.js';
+import {
+  compareOn,
+  deepAccess,
+  generateUUID,
+  groupBy,
+  isArray,
+  isArrayOfNums,
+  isNumber,
+  isPlainObject,
+  logError,
+  logInfo,
+  logWarn
+} from '../src/utils.js';
+import {
+  addBidToAuction,
+  AUCTION_IN_PROGRESS,
+  callPrebidCache,
+  doCallbacksIfTimedout,
+  getPriceByGranularity,
+  getPriceGranularity
+} from '../src/auction.js';
+import {checkAdUnitSetup} from '../src/prebid.js';
+import {checkVideoBidSetup} from '../src/video.js';
+import {module, setupBeforeHookFnOnce} from '../src/hook.js';
+import {store} from '../src/videoCache.js';
+import {config} from '../src/config.js';
+import {ADPOD} from '../src/mediaTypes.js';
+import {find, arrayFrom as from} from '../src/polyfill.js';
+import {auctionManager} from '../src/auctionManager.js';
 import CONSTANTS from '../src/constants.json';
 
-const from = require('core-js-pure/features/array/from.js');
-
 const TARGETING_KEY_PB_CAT_DUR = 'hb_pb_cat_dur';
 const TARGETING_KEY_CACHE_ID = 'hb_cache_id';
 
@@ -45,7 +61,7 @@ function createBidCacheRegistry() {
     registry[auctionId] = {};
     registry[auctionId].bidStorage = new Set();
     registry[auctionId].queueDispatcher = createDispatcher(queueTimeDelay);
-    registry[auctionId].initialCacheKey = utils.generateUUID();
+    registry[auctionId].initialCacheKey = generateUUID();
   }
 
   return {
@@ -68,7 +84,7 @@ function createBidCacheRegistry() {
     setupInitialCacheKey: function (bid) {
       if (!registry[bid.auctionId]) {
         registry[bid.auctionId] = {};
-        registry[bid.auctionId].initialCacheKey = utils.generateUUID();
+        registry[bid.auctionId].initialCacheKey = generateUUID();
       }
     },
     getInitialCacheKey: function (bid) {
@@ -115,11 +131,11 @@ function createDispatcher(timeoutDuration) {
 function getPricePartForAdpodKey(bid) {
   let pricePart
   let prioritizeDeals = config.getConfig('adpod.prioritizeDeals');
-  if (prioritizeDeals && utils.deepAccess(bid, 'video.dealTier')) {
+  if (prioritizeDeals && deepAccess(bid, 'video.dealTier')) {
     const adpodDealPrefix = config.getConfig(`adpod.dealTier.${bid.bidderCode}.prefix`);
-    pricePart = (adpodDealPrefix) ? adpodDealPrefix + utils.deepAccess(bid, 'video.dealTier') : utils.deepAccess(bid, 'video.dealTier');
+    pricePart = (adpodDealPrefix) ? adpodDealPrefix + deepAccess(bid, 'video.dealTier') : deepAccess(bid, 'video.dealTier');
   } else {
-    const granularity = getPriceGranularity(bid.mediaType);
+    const granularity = getPriceGranularity(bid);
     pricePart = getPriceByGranularity(granularity)(bid);
   }
   return pricePart
@@ -132,12 +148,12 @@ function getPricePartForAdpodKey(bid) {
  */
 function attachPriceIndustryDurationKeyToBid(bid, brandCategoryExclusion) {
   let initialCacheKey = bidCacheRegistry.getInitialCacheKey(bid);
-  let duration = utils.deepAccess(bid, 'video.durationBucket');
+  let duration = deepAccess(bid, 'video.durationBucket');
   const pricePart = getPricePartForAdpodKey(bid);
   let pcd;
 
   if (brandCategoryExclusion) {
-    let category = utils.deepAccess(bid, 'meta.adServerCatId');
+    let category = deepAccess(bid, 'meta.adServerCatId');
     pcd = `${pricePart}_${category}_${duration}s`;
   } else {
     pcd = `${pricePart}_${duration}s`;
@@ -168,7 +184,7 @@ function updateBidQueue(auctionInstance, bidResponse, afterBidAdded) {
     let killQueue = !!(auctionInstance.getAuctionStatus() !== AUCTION_IN_PROGRESS);
     callDispatcher(auctionInstance, bidListArr, afterBidAdded, killQueue);
   } else {
-    utils.logWarn('Attempted to cache a bid from an unknown auction. Bid:', bidResponse);
+    logWarn('Attempted to cache a bid from an unknown auction. Bid:', bidResponse);
   }
 }
 
@@ -196,7 +212,7 @@ function firePrebidCacheCall(auctionInstance, bidList, afterBidAdded) {
 
   store(bidList, function (error, cacheIds) {
     if (error) {
-      utils.logWarn(`Failed to save to the video cache: ${error}. Video bid(s) must be discarded.`);
+      logWarn(`Failed to save to the video cache: ${error}. Video bid(s) must be discarded.`);
       for (let i = 0; i < bidList.length; i++) {
         doCallbacksIfTimedout(auctionInstance, bidList[i]);
       }
@@ -206,7 +222,7 @@ function firePrebidCacheCall(auctionInstance, bidList, afterBidAdded) {
         if (cacheIds[i].uuid !== '') {
           addBidToAuction(auctionInstance, bidList[i]);
         } else {
-          utils.logInfo(`Detected a bid was not cached because the custom key was already registered.  Attempted to use key: ${bidList[i].customCacheKey}. Bid was: `, bidList[i]);
+          logInfo(`Detected a bid was not cached because the custom key was already registered.  Attempted to use key: ${bidList[i].customCacheKey}. Bid was: `, bidList[i]);
         }
         afterBidAdded();
       }
@@ -220,15 +236,14 @@ function firePrebidCacheCall(auctionInstance, bidList, afterBidAdded) {
  * @param {*} auctionInstance running context of the auction
  * @param {Object} bidResponse incoming bid; if adpod, will be processed through hook function.  If not adpod, returns to original function.
  * @param {Function} afterBidAdded callback function used when Prebid Cache responds
- * @param {Object} bidderRequest copy of bid's associated bidderRequest object
+ * @param {Object} videoConfig mediaTypes.video from the bid's adUnit
  */
-export function callPrebidCacheHook(fn, auctionInstance, bidResponse, afterBidAdded, bidderRequest) {
-  let videoConfig = utils.deepAccess(bidderRequest, 'mediaTypes.video');
+export function callPrebidCacheHook(fn, auctionInstance, bidResponse, afterBidAdded, videoConfig) {
   if (videoConfig && videoConfig.context === ADPOD) {
     let brandCategoryExclusion = config.getConfig('adpod.brandCategoryExclusion');
-    let adServerCatId = utils.deepAccess(bidResponse, 'meta.adServerCatId');
+    let adServerCatId = deepAccess(bidResponse, 'meta.adServerCatId');
     if (!adServerCatId && brandCategoryExclusion) {
-      utils.logWarn('Detected a bid without meta.adServerCatId while setConfig({adpod.brandCategoryExclusion}) was enabled.  This bid has been rejected:', bidResponse)
+      logWarn('Detected a bid without meta.adServerCatId while setConfig({adpod.brandCategoryExclusion}) was enabled.  This bid has been rejected:', bidResponse);
       afterBidAdded();
     } else {
       if (config.getConfig('adpod.deferCaching') === false) {
@@ -247,7 +262,7 @@ export function callPrebidCacheHook(fn, auctionInstance, bidResponse, afterBidAd
       }
     }
   } else {
-    fn.call(this, auctionInstance, bidResponse, afterBidAdded, bidderRequest);
+    fn.call(this, auctionInstance, bidResponse, afterBidAdded, videoConfig);
   }
 }
 
@@ -260,12 +275,12 @@ export function callPrebidCacheHook(fn, auctionInstance, bidResponse, afterBidAd
  */
 export function checkAdUnitSetupHook(fn, adUnits) {
   let goodAdUnits = adUnits.filter(adUnit => {
-    let mediaTypes = utils.deepAccess(adUnit, 'mediaTypes');
-    let videoConfig = utils.deepAccess(mediaTypes, 'video');
+    let mediaTypes = deepAccess(adUnit, 'mediaTypes');
+    let videoConfig = deepAccess(mediaTypes, 'video');
     if (videoConfig && videoConfig.context === ADPOD) {
       // run check to see if other mediaTypes are defined (ie multi-format); reject adUnit if so
       if (Object.keys(mediaTypes).length > 1) {
-        utils.logWarn(`Detected more than one mediaType in adUnitCode: ${adUnit.code} while attempting to define an 'adpod' video adUnit.  'adpod' adUnits cannot be mixed with other mediaTypes.  This adUnit will be removed from the auction.`);
+        logWarn(`Detected more than one mediaType in adUnitCode: ${adUnit.code} while attempting to define an 'adpod' video adUnit.  'adpod' adUnits cannot be mixed with other mediaTypes.  This adUnit will be removed from the auction.`);
         return false;
       }
 
@@ -274,20 +289,20 @@ export function checkAdUnitSetupHook(fn, adUnits) {
       let playerSize = !!(
         (
           videoConfig.playerSize && (
-            utils.isArrayOfNums(videoConfig.playerSize, 2) || (
-              utils.isArray(videoConfig.playerSize) && videoConfig.playerSize.every(sz => utils.isArrayOfNums(sz, 2))
+            isArrayOfNums(videoConfig.playerSize, 2) || (
+              isArray(videoConfig.playerSize) && videoConfig.playerSize.every(sz => isArrayOfNums(sz, 2))
             )
           )
         ) || (videoConfig.sizeConfig)
       );
-      let adPodDurationSec = !!(videoConfig.adPodDurationSec && utils.isNumber(videoConfig.adPodDurationSec) && videoConfig.adPodDurationSec > 0);
-      let durationRangeSec = !!(videoConfig.durationRangeSec && utils.isArrayOfNums(videoConfig.durationRangeSec) && videoConfig.durationRangeSec.every(range => range > 0));
+      let adPodDurationSec = !!(videoConfig.adPodDurationSec && isNumber(videoConfig.adPodDurationSec) && videoConfig.adPodDurationSec > 0);
+      let durationRangeSec = !!(videoConfig.durationRangeSec && isArrayOfNums(videoConfig.durationRangeSec) && videoConfig.durationRangeSec.every(range => range > 0));
 
       if (!playerSize || !adPodDurationSec || !durationRangeSec) {
         errMsg += (!playerSize) ? '\nmediaTypes.video.playerSize' : '';
         errMsg += (!adPodDurationSec) ? '\nmediaTypes.video.adPodDurationSec' : '';
         errMsg += (!durationRangeSec) ? '\nmediaTypes.video.durationRangeSec' : '';
-        utils.logWarn(errMsg);
+        logWarn(errMsg);
         return false;
       }
     }
@@ -307,31 +322,30 @@ export function checkAdUnitSetupHook(fn, adUnits) {
  *      (eg if range was [5, 15, 30] -> 2s is rounded to 5s; 17s is rounded back to 15s; 18s is rounded up to 30s)
  *  - if the bid is above the range of the listed durations (and outside the buffer), reject the bid
  *  - set the rounded duration value in the `bid.video.durationBucket` field for accepted bids
- * @param {Object} bidderRequest copy of the bidderRequest object associated to bidResponse
+ * @param {Object} videoMediaType 'mediaTypes.video' associated to bidResponse
  * @param {Object} bidResponse incoming bidResponse being evaluated by bidderFactory
  * @returns {boolean} return false if bid duration is deemed invalid as per adUnit configuration; return true if fine
 */
-function checkBidDuration(bidderRequest, bidResponse) {
+function checkBidDuration(videoMediaType, bidResponse) {
   const buffer = 2;
-  let bidDuration = utils.deepAccess(bidResponse, 'video.durationSeconds');
-  let videoConfig = utils.deepAccess(bidderRequest, 'mediaTypes.video');
-  let adUnitRanges = videoConfig.durationRangeSec;
+  let bidDuration = deepAccess(bidResponse, 'video.durationSeconds');
+  let adUnitRanges = videoMediaType.durationRangeSec;
   adUnitRanges.sort((a, b) => a - b); // ensure the ranges are sorted in numeric order
 
-  if (!videoConfig.requireExactDuration) {
+  if (!videoMediaType.requireExactDuration) {
     let max = Math.max(...adUnitRanges);
     if (bidDuration <= (max + buffer)) {
       let nextHighestRange = find(adUnitRanges, range => (range + buffer) >= bidDuration);
       bidResponse.video.durationBucket = nextHighestRange;
     } else {
-      utils.logWarn(`Detected a bid with a duration value outside the accepted ranges specified in adUnit.mediaTypes.video.durationRangeSec.  Rejecting bid: `, bidResponse);
+      logWarn(`Detected a bid with a duration value outside the accepted ranges specified in adUnit.mediaTypes.video.durationRangeSec.  Rejecting bid: `, bidResponse);
       return false;
     }
   } else {
     if (find(adUnitRanges, range => range === bidDuration)) {
       bidResponse.video.durationBucket = bidDuration;
     } else {
-      utils.logWarn(`Detected a bid with a duration value not part of the list of accepted ranges specified in adUnit.mediaTypes.video.durationRangeSec.  Exact match durations must be used for this adUnit. Rejecting bid: `, bidResponse);
+      logWarn(`Detected a bid with a duration value not part of the list of accepted ranges specified in adUnit.mediaTypes.video.durationRangeSec.  Exact match durations must be used for this adUnit. Rejecting bid: `, bidResponse);
       return false;
     }
   }
@@ -343,34 +357,34 @@ function checkBidDuration(bidderRequest, bidResponse) {
  * If it's found to not be an adpod bid, it will return to original function via hook logic
  * @param {Function} fn reference to original function (used by hook logic)
  * @param {Object} bid incoming bid object
- * @param {Object} bidRequest bidRequest object of associated bid
+ * @param {Object} adUnit adUnit object of associated bid
  * @param {Object} videoMediaType copy of the `bidRequest.mediaTypes.video` object; used in original function
  * @param {String} context value of the `bidRequest.mediaTypes.video.context` field; used in original function
  * @returns {boolean} this return is only used for adpod bids
  */
-export function checkVideoBidSetupHook(fn, bid, bidRequest, videoMediaType, context) {
+export function checkVideoBidSetupHook(fn, bid, adUnit, videoMediaType, context) {
   if (context === ADPOD) {
     let result = true;
     let brandCategoryExclusion = config.getConfig('adpod.brandCategoryExclusion');
-    if (brandCategoryExclusion && !utils.deepAccess(bid, 'meta.primaryCatId')) {
+    if (brandCategoryExclusion && !deepAccess(bid, 'meta.primaryCatId')) {
       result = false;
     }
 
-    if (utils.deepAccess(bid, 'video')) {
-      if (!utils.deepAccess(bid, 'video.context') || bid.video.context !== ADPOD) {
+    if (deepAccess(bid, 'video')) {
+      if (!deepAccess(bid, 'video.context') || bid.video.context !== ADPOD) {
         result = false;
       }
 
-      if (!utils.deepAccess(bid, 'video.durationSeconds') || bid.video.durationSeconds <= 0) {
+      if (!deepAccess(bid, 'video.durationSeconds') || bid.video.durationSeconds <= 0) {
         result = false;
       } else {
-        let isBidGood = checkBidDuration(bidRequest, bid);
+        let isBidGood = checkBidDuration(videoMediaType, bid);
         if (!isBidGood) result = false;
       }
     }
 
     if (!config.getConfig('cache.url') && bid.vastXml && !bid.vastUrl) {
-      utils.logError(`
+      logError(`
         This bid contains only vastXml and will not work when a prebid cache url is not specified.
         Try enabling prebid cache with pbjs.setConfig({ cache: {url: "..."} });
       `);
@@ -379,7 +393,7 @@ export function checkVideoBidSetupHook(fn, bid, bidRequest, videoMediaType, cont
 
     fn.bail(result);
   } else {
-    fn.call(this, bid, bidRequest, videoMediaType, context);
+    fn.call(this, bid, adUnit, videoMediaType, context);
   }
 }
 
@@ -392,7 +406,7 @@ export function adpodSetConfig(config) {
     if (typeof config.bidQueueTimeDelay === 'number' && config.bidQueueTimeDelay > 0) {
       queueTimeDelay = config.bidQueueTimeDelay;
     } else {
-      utils.logWarn(`Detected invalid value for adpod.bidQueueTimeDelay in setConfig; must be a positive number.  Using default: ${queueTimeDelay}`)
+      logWarn(`Detected invalid value for adpod.bidQueueTimeDelay in setConfig; must be a positive number.  Using default: ${queueTimeDelay}`)
     }
   }
 
@@ -400,7 +414,7 @@ export function adpodSetConfig(config) {
     if (typeof config.bidQueueSizeLimit === 'number' && config.bidQueueSizeLimit > 0) {
       queueSizeLimit = config.bidQueueSizeLimit;
     } else {
-      utils.logWarn(`Detected invalid value for adpod.bidQueueSizeLimit in setConfig; must be a positive number.  Using default: ${queueSizeLimit}`)
+      logWarn(`Detected invalid value for adpod.bidQueueSizeLimit in setConfig; must be a positive number.  Using default: ${queueSizeLimit}`)
     }
   }
 }
@@ -464,7 +478,7 @@ export function sortByPricePerSecond(a, b) {
  */
 export function getTargeting({ codes, callback } = {}) {
   if (!callback) {
-    utils.logError('No callback function was defined in the getTargeting call.  Aborting getTargeting().');
+    logError('No callback function was defined in the getTargeting call.  Aborting getTargeting().');
     return;
   }
   codes = codes || [];
@@ -480,7 +494,7 @@ export function getTargeting({ codes, callback } = {}) {
   let prioritizeDeals = config.getConfig('adpod.prioritizeDeals');
   if (prioritizeDeals) {
     let [otherBids, highPriorityDealBids] = bids.reduce((partitions, bid) => {
-      let bidDealTier = utils.deepAccess(bid, 'video.dealTier');
+      let bidDealTier = deepAccess(bid, 'video.dealTier');
       let minDealTier = config.getConfig(`adpod.dealTier.${bid.bidderCode}.minDealTier`);
       if (minDealTier && bidDealTier) {
         if (bidDealTier >= minDealTier) {
@@ -506,7 +520,7 @@ export function getTargeting({ codes, callback } = {}) {
   if (deferCachingEnabled === false) {
     adPodAdUnits.forEach((adUnit) => {
       let adPodTargeting = [];
-      let adPodDurationSeconds = utils.deepAccess(adUnit, 'mediaTypes.video.adPodDurationSec');
+      let adPodDurationSeconds = deepAccess(adUnit, 'mediaTypes.video.adPodDurationSec');
 
       bids
         .filter((bid) => bid.adUnitCode === adUnit.code)
@@ -530,7 +544,7 @@ export function getTargeting({ codes, callback } = {}) {
   } else {
     let bidsToCache = [];
     adPodAdUnits.forEach((adUnit) => {
-      let adPodDurationSeconds = utils.deepAccess(adUnit, 'mediaTypes.video.adPodDurationSec');
+      let adPodDurationSeconds = deepAccess(adUnit, 'mediaTypes.video.adPodDurationSec');
 
       bids
         .filter((bid) => bid.adUnitCode === adUnit.code)
@@ -546,7 +560,7 @@ export function getTargeting({ codes, callback } = {}) {
       if (error) {
         callback(error, null);
       } else {
-        let groupedBids = utils.groupBy(bidsSuccessfullyCached, 'adUnitCode');
+        let groupedBids = groupBy(bidsSuccessfullyCached, 'adUnitCode');
         Object.keys(groupedBids).forEach((adUnitCode) => {
           let adPodTargeting = [];
 
@@ -578,7 +592,7 @@ export function getTargeting({ codes, callback } = {}) {
  */
 function getAdPodAdUnits(codes) {
   return auctionManager.getAdUnits()
-    .filter((adUnit) => utils.deepAccess(adUnit, 'mediaTypes.video.context') === ADPOD)
+    .filter((adUnit) => deepAccess(adUnit, 'mediaTypes.video.context') === ADPOD)
     .filter((adUnit) => (codes.length > 0) ? codes.indexOf(adUnit.code) != -1 : true);
 }
 
@@ -590,10 +604,10 @@ function getAdPodAdUnits(codes) {
 function getExclusiveBids(bidsReceived) {
   let bids = bidsReceived
     .map((bid) => Object.assign({}, bid, { [TARGETING_KEY_PB_CAT_DUR]: bid.adserverTargeting[TARGETING_KEY_PB_CAT_DUR] }));
-  bids = utils.groupBy(bids, TARGETING_KEY_PB_CAT_DUR);
+  bids = groupBy(bids, TARGETING_KEY_PB_CAT_DUR);
   let filteredBids = [];
   Object.keys(bids).forEach((targetingKey) => {
-    bids[targetingKey].sort(utils.compareOn('responseTimestamp'));
+    bids[targetingKey].sort(compareOn('responseTimestamp'));
     filteredBids.push(bids[targetingKey][0]);
   });
   return filteredBids;
@@ -619,8 +633,8 @@ const sharedMethods = {
 Object.freeze(sharedMethods);
 
 module('adpod', function shareAdpodUtilities(...args) {
-  if (!utils.isPlainObject(args[0])) {
-    utils.logError('Adpod module needs plain object to share methods with submodule');
+  if (!isPlainObject(args[0])) {
+    logError('Adpod module needs plain object to share methods with submodule');
     return;
   }
   function addMethods(object, func) {
diff --git a/modules/adponeBidAdapter.js b/modules/adponeBidAdapter.js
index f128785afff..49c0365fc87 100644
--- a/modules/adponeBidAdapter.js
+++ b/modules/adponeBidAdapter.js
@@ -4,34 +4,20 @@ import {triggerPixel} from '../src/utils.js';
 
 const ADPONE_CODE = 'adpone';
 const ADPONE_ENDPOINT = 'https://rtb.adpone.com/bid-request';
-const ADPONE_SYNC_ENDPOINT = 'https://eu-ads.adpone.com';
 const ADPONE_REQUEST_METHOD = 'POST';
 const ADPONE_CURRENCY = 'EUR';
 
-function _createSync() {
-  return {
-    type: 'iframe',
-    url: ADPONE_SYNC_ENDPOINT
-  }
-}
-
-function getUserSyncs(syncOptions) {
-  return (syncOptions && syncOptions.iframeEnabled) ? _createSync() : ([]);
-}
-
 export const spec = {
   code: ADPONE_CODE,
   supportedMediaTypes: [BANNER],
 
-  getUserSyncs,
-
   isBidRequestValid: bid => {
     return !!bid.params.placementId && !!bid.bidId && bid.bidder === 'adpone'
   },
 
-  buildRequests: bidRequests => {
+  buildRequests: (bidRequests, bidderRequest) => {
     return bidRequests.map(bid => {
-      const url = ADPONE_ENDPOINT + '?pid=' + bid.params.placementId;
+      let url = ADPONE_ENDPOINT + '?pid=' + bid.params.placementId;
       const data = {
         at: 1,
         id: bid.bidId,
@@ -49,6 +35,11 @@ export const spec = {
         withCredentials: true
       };
 
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        url += '&gdpr_applies=' + bidderRequest.gdprConsent.gdprApplies;
+        url += '&consentString=' + bidderRequest.gdprConsent.consentString;
+      }
+
       return {
         method: ADPONE_REQUEST_METHOD,
         url,
@@ -67,18 +58,27 @@ export const spec = {
 
     serverResponse.body.seatbid.forEach(seatbid => {
       if (seatbid.bid.length) {
-        answer = [...answer, ...seatbid.bid.filter(bid => bid.price > 0).map(bid => ({
-          id: bid.id,
-          requestId: bidRequest.data.id,
-          cpm: bid.price,
-          ad: bid.adm,
-          width: bid.w || 0,
-          height: bid.h || 0,
-          currency: serverResponse.body.cur || ADPONE_CURRENCY,
-          netRevenue: true,
-          ttl: 300,
-          creativeId: bid.crid || 0
-        }))];
+        answer = [...answer, ...seatbid.bid.filter(bid => bid.price > 0).map(adponeBid => {
+          const bid = {
+            id: adponeBid.id,
+            requestId: bidRequest.data.id,
+            cpm: adponeBid.price,
+            ad: adponeBid.adm,
+            width: adponeBid.w || 0,
+            height: adponeBid.h || 0,
+            currency: serverResponse.body.cur || ADPONE_CURRENCY,
+            netRevenue: true,
+            ttl: 300,
+            creativeId: adponeBid.crid || 0
+          };
+
+          if (adponeBid.meta && adponeBid.meta.adomain && adponeBid.meta.adomain.length > 0) {
+            bid.meta = {};
+            bid.meta.advertiserDomains = adponeBid.meta.adomain;
+          }
+
+          return bid
+        })];
       }
     });
 
diff --git a/modules/adprimeBidAdapter.js b/modules/adprimeBidAdapter.js
index 306ab76f512..49c18c2d067 100644
--- a/modules/adprimeBidAdapter.js
+++ b/modules/adprimeBidAdapter.js
@@ -1,13 +1,16 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
+import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adprime';
-const AD_URL = 'https://delta.adprime.com/?c=o&m=multi';
+const AD_URL = 'https://delta.adprime.com/pbjs';
+const SYNC_URL = 'https://sync.adprime.com';
 
 function isBidResponseValid(bid) {
   if (!bid.requestId || !bid.cpm || !bid.creativeId ||
-    !bid.ttl || !bid.currency) {
+    !bid.ttl || !bid.currency || !bid.meta) {
     return false;
   }
   switch (bid.mediaType) {
@@ -22,33 +25,54 @@ function isBidResponseValid(bid) {
   }
 }
 
+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 && !isNaN(parseInt(bid.params.placementId)));
+    return Boolean(bid.bidId && bid.params && bid.params.placementId);
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
+    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
     try {
-      location = new URL(bidderRequest.refererInfo.referer)
+      location = new URL(bidderRequest.refererInfo.page)
       winTop = window.top;
     } catch (e) {
       location = winTop.location;
-      utils.logMessage(e);
+      logMessage(e);
     };
     let placements = [];
     let 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
+      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) {
@@ -62,24 +86,52 @@ export const spec = {
 
     for (let i = 0; i < len; i++) {
       let bid = validBidRequests[i];
+      const { mediaTypes } = bid;
+      const placement = {};
       let sizes
-      if (bid.mediaTypes) {
-        if (bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
-          sizes = bid.mediaTypes[BANNER].sizes
-        } else if (bid.mediaTypes[VIDEO] && bid.mediaTypes[VIDEO].playerSize) {
-          sizes = bid.mediaTypes[VIDEO].playerSize
+      let identeties = {}
+      if (mediaTypes) {
+        if (mediaTypes[BANNER] && mediaTypes[BANNER].sizes) {
+          placement.adFormat = BANNER;
+          sizes = mediaTypes[BANNER].sizes
+        } else if (mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize) {
+          placement.adFormat = VIDEO;
+          sizes = mediaTypes[VIDEO].playerSize
+          placement.minduration = mediaTypes[VIDEO].minduration;
+          placement.maxduration = mediaTypes[VIDEO].maxduration;
+          placement.mimes = mediaTypes[VIDEO].mimes;
+          placement.protocols = mediaTypes[VIDEO].protocols;
+          placement.startdelay = mediaTypes[VIDEO].startdelay;
+          placement.placement = mediaTypes[VIDEO].placement;
+          placement.skip = mediaTypes[VIDEO].skip;
+          placement.skipafter = mediaTypes[VIDEO].skipafter;
+          placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+          placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+          placement.delivery = mediaTypes[VIDEO].delivery;
+          placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+          placement.api = mediaTypes[VIDEO].api;
+          placement.linearity = mediaTypes[VIDEO].linearity;
+        } else {
+          placement.adFormat = NATIVE;
+          placement.native = mediaTypes[NATIVE];
         }
       }
+      if (bid.userId && bid.userId.idl_env) {
+        identeties.identityLink = bid.userId.idl_env
+      }
 
       placements.push({
+        ...placement,
         placementId: bid.params.placementId,
         bidId: bid.bidId,
         sizes: sizes || [],
         wPlayer: sizes ? sizes[0] : 0,
         hPlayer: sizes ? sizes[1] : 0,
-        traffic: bid.params.traffic || BANNER,
         schain: bid.schain || {},
-        keywords: bid.params.keywords || []
+        keywords: bid.params.keywords || [],
+        audiences: bid.params.audiences || [],
+        identeties,
+        bidFloor: getBidFloor(bid)
       });
     }
     return {
@@ -94,11 +146,37 @@ export const spec = {
     for (let i = 0; i < serverResponse.body.length; i++) {
       let resItem = serverResponse.body[i];
       if (isBidResponseValid(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
         response.push(resItem);
       }
     }
     return response;
   },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
 };
 
 registerBidder(spec);
diff --git a/modules/adprimeBidAdapter.md b/modules/adprimeBidAdapter.md
index 913b768d8e9..c8651ef1fd4 100644
--- a/modules/adprimeBidAdapter.md
+++ b/modules/adprimeBidAdapter.md
@@ -24,10 +24,9 @@ Module that connects to adprime demand sources
                         {
                             bidder: 'adprime',
                             params: {
-                                placementId: 0,
-                                traffic: 'banner',
-                                keywords: ['cat_1', 'cat_2']
-
+                                placementId: 'testBanner',
+                                keywords: ['cat_1', 'cat_2'],
+                                audiences: ['aud_1', 'aud_2']
                             }
                         }
                     ]
@@ -45,10 +44,9 @@ Module that connects to adprime demand sources
                         {
                             bidder: 'adprime',
                             params: {
-                                placementId: 0,
-                                traffic: 'video',
-                                keywords: ['cat_1', 'cat_2']
-
+                                placementId: 'testVideo',
+                                keywords: ['cat_1', 'cat_2'],
+                                audiences: ['aud_1', 'aud_2']
                             }
                         }
                     ]
diff --git a/modules/adqueryBidAdapter.js b/modules/adqueryBidAdapter.js
new file mode 100644
index 00000000000..be5ca4b1057
--- /dev/null
+++ b/modules/adqueryBidAdapter.js
@@ -0,0 +1,210 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import { logInfo, buildUrl, triggerPixel, parseSizesInput } from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const ADQUERY_GVLID = 902;
+const ADQUERY_BIDDER_CODE = 'adquery';
+const ADQUERY_BIDDER_DOMAIN_PROTOCOL = 'https';
+const ADQUERY_BIDDER_DOMAIN = 'bidder.adquery.io';
+const ADQUERY_USER_SYNC_DOMAIN = ADQUERY_BIDDER_DOMAIN_PROTOCOL + '://' + ADQUERY_BIDDER_DOMAIN + '/prebid/userSync?1=1';
+const ADQUERY_DEFAULT_CURRENCY = 'PLN';
+const ADQUERY_NET_REVENUE = true;
+const ADQUERY_TTL = 360;
+const storage = getStorageManager({gvlid: ADQUERY_GVLID, bidderCode: ADQUERY_BIDDER_CODE});
+
+/** @type {BidderSpec} */
+export const spec = {
+  code: ADQUERY_BIDDER_CODE,
+  gvlid: ADQUERY_GVLID,
+  supportedMediaTypes: [BANNER],
+
+  /** f
+   * @param {object} bid
+   * @return {boolean}
+   */
+  isBidRequestValid: (bid) => {
+    return !!(bid && bid.params && bid.params.placementId && bid.mediaTypes.banner.sizes)
+  },
+
+  /**
+   * @param {BidRequest[]} bidRequests
+   * @param {*} bidderRequest
+   * @return {ServerRequest}
+   */
+  buildRequests: (bidRequests, bidderRequest) => {
+    const requests = [];
+    for (let i = 0, len = bidRequests.length; i < len; i++) {
+      const request = {
+        method: 'POST',
+        url: ADQUERY_BIDDER_DOMAIN_PROTOCOL + '://' + ADQUERY_BIDDER_DOMAIN + '/prebid/bid',
+        data: buildRequest(bidRequests[i], bidderRequest),
+        options: {
+          withCredentials: false,
+          crossOrigin: true
+        }
+      };
+      requests.push(request);
+    }
+    return requests;
+  },
+
+  /**
+   * @param {*} response
+   * @param {ServerRequest} request
+   * @return {Bid[]}
+   */
+  interpretResponse: (response, request) => {
+    logInfo(request);
+    logInfo(response);
+
+    let qid = null;
+    const res = response && response.body && response.body.data;
+    let bidResponses = [];
+
+    if (!res) {
+      return [];
+    }
+
+    const bidResponse = {
+      requestId: res.requestId,
+      cpm: res.cpm,
+      width: res.mediaType.width,
+      height: res.mediaType.height,
+      creativeId: res.creationId,
+      dealId: res.dealid || '',
+      currency: res.currency || ADQUERY_DEFAULT_CURRENCY,
+      netRevenue: ADQUERY_NET_REVENUE,
+      ttl: ADQUERY_TTL,
+      referrer: '',
+      ad: '<script src="' + res.adqLib + '"></script>' + res.tag,
+      mediaType: res.mediaType.name || 'banner',
+      meta: {
+        advertiserDomains: res.adDomains && res.adDomains.length ? res.adDomains : [],
+        mediaType: res.mediaType.name || 'banner',
+      }
+    };
+    bidResponses.push(bidResponse);
+    logInfo('bidResponses', bidResponses);
+
+    if (res && res.qid) {
+      if (storage.getDataFromLocalStorage('qid')) {
+        qid = storage.getDataFromLocalStorage('qid');
+        if (qid && qid.includes('%7B%22')) {
+          storage.setDataInLocalStorage('qid', res.qid);
+        }
+      } else {
+        storage.setDataInLocalStorage('qid', res.qid);
+      }
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * @param {TimedOutBid} timeoutData
+   */
+  onTimeout: (timeoutData) => {
+    if (timeoutData == null) {
+      return;
+    }
+    logInfo('onTimeout ', timeoutData);
+    let params = {
+      bidder: timeoutData.bidder,
+      bId: timeoutData.bidId,
+      adUnitCode: timeoutData.adUnitCode,
+      timeout: timeoutData.timeout,
+      auctionId: timeoutData.auctionId,
+    };
+    let adqueryRequestUrl = buildUrl({
+      protocol: ADQUERY_BIDDER_DOMAIN_PROTOCOL,
+      hostname: ADQUERY_BIDDER_DOMAIN,
+      pathname: '/prebid/eventTimeout',
+      search: params
+    });
+    triggerPixel(adqueryRequestUrl);
+  },
+
+  /**
+   * @param {Bid} bid
+   */
+  onBidWon: (bid) => {
+    logInfo('onBidWon', bid);
+    const bidString = JSON.stringify(bid);
+    const encodedBuf = window.btoa(bidString);
+
+    let params = {
+      q: encodedBuf,
+    };
+    let adqueryRequestUrl = buildUrl({
+      protocol: ADQUERY_BIDDER_DOMAIN_PROTOCOL,
+      hostname: ADQUERY_BIDDER_DOMAIN,
+      pathname: '/prebid/eventBidWon',
+      search: params
+    });
+    triggerPixel(adqueryRequestUrl);
+  },
+
+  /**
+   * @param {Bid} bid
+   */
+  onSetTargeting: (bid) => {
+    logInfo('onSetTargeting', bid);
+
+    let params = {
+      bidder: bid.bidder,
+      width: bid.width,
+      height: bid.height,
+      bid: bid.adId,
+      mediaType: bid.mediaType,
+      cpm: bid.cpm,
+      requestId: bid.requestId,
+      adUnitCode: bid.adUnitCode
+    };
+
+    let adqueryRequestUrl = buildUrl({
+      protocol: ADQUERY_BIDDER_DOMAIN_PROTOCOL,
+      hostname: ADQUERY_BIDDER_DOMAIN,
+      pathname: '/prebid/eventSetTargeting',
+      search: params
+    });
+    triggerPixel(adqueryRequestUrl);
+  },
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncUrl = ADQUERY_USER_SYNC_DOMAIN;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+    return [{
+      type: 'image',
+      url: syncUrl
+    }];
+  }
+
+};
+function buildRequest(validBidRequests, bidderRequest) {
+  let bid = validBidRequests;
+  return {
+    placementCode: bid.params.placementId,
+    auctionId: bid.auctionId,
+    type: bid.params.type,
+    adUnitCode: bid.adUnitCode,
+    bidQid: storage.getDataFromLocalStorage('qid') || null,
+    bidId: bid.bidId,
+    bidder: bid.bidder,
+    bidderRequestId: bid.bidderRequestId,
+    bidRequestsCount: bid.bidRequestsCount,
+    bidderRequestsCount: bid.bidderRequestsCount,
+    sizes: parseSizesInput(bid.mediaTypes.banner.sizes).toString(),
+
+  };
+}
+
+registerBidder(spec);
diff --git a/modules/adqueryBidAdapter.md b/modules/adqueryBidAdapter.md
new file mode 100644
index 00000000000..e8b68e30406
--- /dev/null
+++ b/modules/adqueryBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+Module Name: Adquery Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@adquery.com
+
+# Description
+
+Module that connects to Adquery's demand sources.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'banner-adquery-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [
+                {
+                    bidder: 'adquery',
+                    params: {
+                        placementId: '6d93f2a0e5f0fe2cc3a6e9e3ade964b43b07f897',
+                        type: 'banner300x250'
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/adqueryIdSystem.js b/modules/adqueryIdSystem.js
new file mode 100644
index 00000000000..d9552a470d0
--- /dev/null
+++ b/modules/adqueryIdSystem.js
@@ -0,0 +1,103 @@
+/**
+ * This module adds Adquery QID to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/adqueryIdSystem
+ * @requires module:modules/userId
+ */
+
+import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import { isFn, isStr, isPlainObject, logError } from '../src/utils.js';
+
+const MODULE_NAME = 'qid';
+const AU_GVLID = 902;
+
+export const storage = getStorageManager({gvlid: AU_GVLID, moduleName: 'qid'});
+
+/**
+ * Param or default.
+ * @param {String} param
+ * @param {String} defaultVal
+ */
+function paramOrDefault(param, defaultVal, arg) {
+  if (isFn(param)) {
+    return param(arg);
+  } else if (isStr(param)) {
+    return param;
+  }
+  return defaultVal;
+}
+
+/** @type {Submodule} */
+export const adqueryIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * IAB TCF Vendor ID
+   * @type {string}
+   */
+  gvlid: AU_GVLID,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {{value:string}} value
+   * @returns {{qid:Object}}
+   */
+  decode(value) {
+    let qid = storage.getDataFromLocalStorage('qid');
+    if (isStr(qid)) {
+      return {qid: qid};
+    }
+    return (value && typeof value['qid'] === 'string') ? { 'qid': value['qid'] } : undefined;
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config) {
+    if (!isPlainObject(config.params)) {
+      config.params = {};
+    }
+    const url = paramOrDefault(config.params.url,
+      `https://bidder.adquery.io/prebid/qid`,
+      config.params.urlArg);
+
+    const resp = function (callback) {
+      let qid = storage.getDataFromLocalStorage('qid');
+      if (isStr(qid)) {
+        const responseObj = {qid: qid};
+        callback(responseObj);
+      } else {
+        const callbacks = {
+          success: response => {
+            let responseObj;
+            if (response) {
+              try {
+                responseObj = JSON.parse(response);
+              } catch (error) {
+                logError(error);
+              }
+            }
+            callback(responseObj);
+          },
+          error: error => {
+            logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+            callback();
+          }
+        };
+        ajax(url, callbacks, undefined, {method: 'GET'});
+      }
+    };
+    return {callback: resp};
+  }
+};
+
+submodule('userId', adqueryIdSubmodule);
diff --git a/modules/adqueryIdSystem.md b/modules/adqueryIdSystem.md
new file mode 100644
index 00000000000..3a49ffbe4da
--- /dev/null
+++ b/modules/adqueryIdSystem.md
@@ -0,0 +1,35 @@
+# Adquery QID
+
+Adquery QID Module. For assistance setting up your module please contact us at [prebid@adquery.io](prebid@adquery.io).
+
+### Prebid Params
+
+Individual params may be set for the Adquery ID Submodule. At least one identifier must be set in the params.
+
+```
+pbjs.setConfig({
+    usersync: {
+        userIds: [{
+            name: 'qid',
+            storage: {
+                name: 'qid',
+                type: 'html5'
+            }
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the Adquery User ID Module integration.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the Adquery ID module - `"qid"` | `"qid"` |
+| storage | Required | Object | The publisher must specify the local storage in which to store the results of the call to get the user ID. | |
+| storage.type | Required | String | This is where the results of the user ID will be stored. The recommended method is `localStorage` by specifying `html5`. | `"html5"` |
+| storage.name | Required | String | The name of the html5 local storage where the user ID will be stored. | `"qid"` |
+| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. | `365` |
+| value | Optional | Object | Used only if the page has a separate mechanism for storing the Adquery ID. The value is an object containing the values to be sent to the adapters. In this scenario, no URL is called and nothing is added to local storage | `{"qid": "2abf9f001fcd81241b67"}` |
+| params | Optional | Object | Used to store params for the id system |
+| params.url | Optional | String | Set an alternate GET url for qid with this parameter |
+| params.urlArg | Optional | Object | Optional url parameter for params.url |
diff --git a/modules/adrelevantisBidAdapter.js b/modules/adrelevantisBidAdapter.js
new file mode 100644
index 00000000000..40cfe18f025
--- /dev/null
+++ b/modules/adrelevantisBidAdapter.js
@@ -0,0 +1,626 @@
+import {Renderer} from '../src/Renderer.js';
+import {
+  chunk,
+  convertCamelToUnderscore,
+  convertTypes,
+  createTrackPixelHtml,
+  deepAccess,
+  deepClone,
+  getBidRequest,
+  isArray,
+  isArrayOfNums,
+  isEmpty,
+  isStr,
+  logError,
+  logMessage,
+  logWarn,
+  transformBidderParamKeywords
+} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {find, includes} from '../src/polyfill.js';
+import {INSTREAM, OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'adrelevantis';
+const URL = 'https://ssp.adrelevantis.com/prebid';
+const VIDEO_TARGETING = ['id', 'mimes', 'minduration', 'maxduration',
+  'startdelay', 'skippable', 'playback_method', 'frameworks'];
+const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
+const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
+const SOURCE = 'pbjs';
+const MAX_IMPS_PER_REQUEST = 15;
+
+const NATIVE_MAPPING = {
+  body: 'description',
+  body2: 'desc2',
+  cta: 'ctatext',
+  image: {
+    serverName: 'main_image',
+    requiredParams: { required: true }
+  },
+  icon: {
+    serverName: 'icon',
+    requiredParams: { required: true }
+  },
+  sponsoredBy: 'sponsored_by',
+  privacyLink: 'privacy_link',
+  salePrice: 'saleprice',
+  displayUrl: 'displayurl'
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['adr', 'adsmart', 'compariola'],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    return !!(bid.params.placementId);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
+    const tags = bidRequests.map(bidToTag);
+    const userObjBid = find(bidRequests, hasUserInfo);
+    let userObj;
+    if (config.getConfig('coppa') === true) {
+      userObj = {'coppa': true};
+    }
+    if (userObjBid) {
+      userObj = {};
+      Object.keys(userObjBid.params.user)
+        .filter(param => includes(USER_PARAMS, param))
+        .forEach(param => userObj[param] = userObjBid.params.user[param]);
+    }
+
+    const appDeviceObjBid = find(bidRequests, hasAppDeviceInfo);
+    let appDeviceObj;
+    if (appDeviceObjBid && appDeviceObjBid.params && appDeviceObjBid.params.app) {
+      appDeviceObj = {};
+      Object.keys(appDeviceObjBid.params.app)
+        .filter(param => includes(APP_DEVICE_PARAMS, param))
+        .forEach(param => appDeviceObj[param] = appDeviceObjBid.params.app[param]);
+    }
+
+    const appIdObjBid = find(bidRequests, hasAppId);
+    let appIdObj;
+    if (appIdObjBid && appIdObjBid.params && appDeviceObjBid.params.app && appDeviceObjBid.params.app.id) {
+      appIdObj = {
+        appid: appIdObjBid.params.app.id
+      };
+    }
+
+    const payload = {
+      tags: [...tags],
+      user: userObj,
+      sdk: {
+        source: SOURCE,
+        version: '$prebid.version$'
+      }
+    };
+
+    if (appDeviceObjBid) {
+      payload.device = appDeviceObj
+    }
+    if (appIdObjBid) {
+      payload.app = appIdObj;
+    }
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      // note - objects for impbus use underscore instead of camelCase
+      payload.gdpr_consent = {
+        consent_string: bidderRequest.gdprConsent.consentString,
+        consent_required: bidderRequest.gdprConsent.gdprApplies
+      };
+    }
+
+    if (bidderRequest && bidderRequest.refererInfo) {
+      let refererinfo = {
+        // TODO: this sends everything it finds to the backend, except for canonicalUrl
+        rd_ref: encodeURIComponent(bidderRequest.refererInfo.topmostLocation),
+        rd_top: bidderRequest.refererInfo.reachedTop,
+        rd_ifs: bidderRequest.refererInfo.numIframes,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      }
+      payload.referrer_detection = refererinfo;
+    }
+
+    const ortb2Site = bidderRequest.ortb2?.site;
+    if (ortb2Site) {
+      payload.fpd = {
+        keywords: ortb2Site.keywords || '',
+        category: deepAccess(ortb2Site, 'ext.data.category') || ''
+      }
+    }
+
+    const request = formatRequest(payload, bidderRequest);
+    return request;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, {bidderRequest}) {
+    serverResponse = serverResponse.body;
+    const bids = [];
+    if (!serverResponse || serverResponse.error) {
+      let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
+      if (serverResponse && serverResponse.error) { errorMessage += `: ${serverResponse.error}`; }
+      logError(errorMessage);
+      return bids;
+    }
+
+    if (serverResponse.tags) {
+      serverResponse.tags.forEach(serverBid => {
+        const rtbBid = getRtbBid(serverBid);
+        if (rtbBid) {
+          if (rtbBid.cpm !== 0 && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
+            const bid = newBid(serverBid, rtbBid, bidderRequest);
+            bid.mediaType = parseMediaType(rtbBid);
+            bids.push(bid);
+          }
+        }
+      });
+    }
+
+    return bids;
+  },
+
+  transformBidParams: function(params, isOpenRtb) {
+    params = convertTypes({
+      'placementId': 'number',
+      'keywords': transformBidderParamKeywords
+    }, params);
+
+    if (isOpenRtb) {
+      params.use_pmt_rule = (typeof params.usePaymentRule === 'boolean') ? params.usePaymentRule : false;
+      if (params.usePaymentRule) { delete params.usePaymentRule; }
+
+      if (isPopulatedArray(params.keywords)) {
+        params.keywords.forEach(deleteValues);
+      }
+
+      Object.keys(params).forEach(paramKey => {
+        let convertedKey = convertCamelToUnderscore(paramKey);
+        if (convertedKey !== paramKey) {
+          params[convertedKey] = params[paramKey];
+          delete params[paramKey];
+        }
+      });
+    }
+
+    return params;
+  }
+};
+
+function isPopulatedArray(arr) {
+  return !!(isArray(arr) && arr.length > 0);
+}
+
+function deleteValues(keyPairObj) {
+  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
+    delete keyPairObj.value;
+  }
+}
+
+function formatRequest(payload, bidderRequest) {
+  let request = [];
+
+  if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
+    const clonedPayload = deepClone(payload);
+
+    chunk(payload.tags, MAX_IMPS_PER_REQUEST).forEach(tags => {
+      clonedPayload.tags = tags;
+      const payloadString = JSON.stringify(clonedPayload);
+      request.push({
+        method: 'POST',
+        url: URL,
+        data: payloadString,
+        bidderRequest
+      });
+    });
+  } else {
+    const payloadString = JSON.stringify(payload);
+    request = {
+      method: 'POST',
+      url: URL,
+      data: payloadString,
+      bidderRequest
+    };
+  }
+
+  return request;
+}
+
+function newRenderer(adUnitCode, rtbBid, rendererOptions = {}) {
+  const renderer = Renderer.install({
+    id: rtbBid.renderer_id,
+    url: rtbBid.renderer_url,
+    config: rendererOptions,
+    loaded: false,
+    adUnitCode
+  });
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  renderer.setEventHandlers({
+    impression: () => logMessage('AdRelevantis outstream video impression event'),
+    loaded: () => logMessage('AdRelevantis outstream video loaded event'),
+    ended: () => {
+      logMessage('AdRelevantis outstream renderer video event');
+      document.querySelector(`#${adUnitCode}`).style.display = 'none';
+    }
+  });
+  return renderer;
+}
+
+/**
+ * This function hides google div container for outstream bids to remove unwanted space on page. Appnexus renderer creates a new iframe outside of google iframe to render the outstream creative.
+ * @param {string} elementId element id
+ */
+function hidedfpContainer(elementId) {
+  var el = document.getElementById(elementId).querySelectorAll("div[id^='google_ads']");
+  if (el[0]) {
+    el[0].style.setProperty('display', 'none');
+  }
+}
+
+function outstreamRender(bid) {
+  // push to render queue because ANOutstreamVideo may not be loaded yet
+  hidedfpContainer(bid.adUnitCode);
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      tagId: bid.adResponse.tag_id,
+      sizes: [bid.getSize().split('x')],
+      targetId: bid.adUnitCode, // target div id to render video
+      uuid: bid.adResponse.uuid,
+      adResponse: bid.adResponse,
+      rendererOptions: bid.renderer.getConfig()
+    }, handleOutstreamRendererEvents.bind(null, bid));
+  });
+}
+
+function handleOutstreamRendererEvents(bid, id, eventName) {
+  bid.renderer.handleVideoEvent({ id, eventName });
+}
+
+/**
+ * Unpack the Server's Bid into a Prebid-compatible one.
+ * @param serverBid
+ * @param rtbBid
+ * @param bidderRequest
+ * @return Bid
+ */
+function newBid(serverBid, rtbBid, bidderRequest) {
+  const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
+  const bid = {
+    requestId: serverBid.uuid,
+    cpm: rtbBid.cpm,
+    creativeId: rtbBid.creative_id,
+    dealId: rtbBid.deal_id,
+    currency: 'USD',
+    netRevenue: true,
+    ttl: 300,
+    adUnitCode: bidRequest.adUnitCode,
+    adrelevantis: {
+      buyerMemberId: rtbBid.buyer_member_id,
+      dealPriority: rtbBid.deal_priority,
+      dealCode: rtbBid.deal_code
+    }
+  };
+
+  if (rtbBid.advertiser_id) {
+    bid.meta = Object.assign({}, bid.meta, { advertiserId: rtbBid.advertiser_id });
+  }
+
+  if (rtbBid.rtb.video) {
+    Object.assign(bid, {
+      width: rtbBid.rtb.video.player_width,
+      height: rtbBid.rtb.video.player_height,
+      vastImpUrl: rtbBid.notify_url,
+      ttl: 3600
+    });
+
+    const videoContext = deepAccess(bidRequest, 'mediaTypes.video.context');
+    switch (videoContext) {
+      case OUTSTREAM:
+        bid.adResponse = serverBid;
+        bid.adResponse.ad = bid.adResponse.ads[0];
+        bid.adResponse.ad.video = bid.adResponse.ad.rtb.video;
+        bid.vastXml = rtbBid.rtb.video.content;
+
+        if (rtbBid.renderer_url) {
+          const videoBid = find(bidderRequest.bids, bid => bid.bidId === serverBid.uuid);
+          const rendererOptions = deepAccess(videoBid, 'renderer.options');
+          bid.renderer = newRenderer(bid.adUnitCode, rtbBid, rendererOptions);
+        }
+        break;
+      case INSTREAM:
+        bid.vastUrl = rtbBid.notify_url + '&redir=' + encodeURIComponent(rtbBid.rtb.video.asset_url);
+        break;
+    }
+  } else if (rtbBid.rtb[NATIVE]) {
+    const nativeAd = rtbBid.rtb[NATIVE];
+
+    // setting up the jsTracker:
+    // we put it as a data-src attribute so that the tracker isn't called
+    // until we have the adId (see onBidWon)
+    let jsTrackerDisarmed = rtbBid.viewability.config.replace('src=', 'data-src=');
+
+    let jsTrackers = nativeAd.javascript_trackers;
+
+    if (jsTrackers == undefined) {
+      jsTrackers = jsTrackerDisarmed;
+    } else if (isStr(jsTrackers)) {
+      jsTrackers = [jsTrackers, jsTrackerDisarmed];
+    } else {
+      jsTrackers.push(jsTrackerDisarmed);
+    }
+
+    bid[NATIVE] = {
+      title: nativeAd.title,
+      body: nativeAd.desc,
+      body2: nativeAd.desc2,
+      cta: nativeAd.ctatext,
+      rating: nativeAd.rating,
+      sponsoredBy: nativeAd.sponsored,
+      privacyLink: nativeAd.privacy_link,
+      address: nativeAd.address,
+      downloads: nativeAd.downloads,
+      likes: nativeAd.likes,
+      phone: nativeAd.phone,
+      price: nativeAd.price,
+      salePrice: nativeAd.saleprice,
+      clickUrl: nativeAd.link.url,
+      displayUrl: nativeAd.displayurl,
+      clickTrackers: nativeAd.link.click_trackers,
+      impressionTrackers: nativeAd.impression_trackers,
+      javascriptTrackers: jsTrackers
+    };
+    if (nativeAd.main_img) {
+      bid['native'].image = {
+        url: nativeAd.main_img.url,
+        height: nativeAd.main_img.height,
+        width: nativeAd.main_img.width,
+      };
+    }
+    if (nativeAd.icon) {
+      bid['native'].icon = {
+        url: nativeAd.icon.url,
+        height: nativeAd.icon.height,
+        width: nativeAd.icon.width,
+      };
+    }
+  } else {
+    Object.assign(bid, {
+      width: rtbBid.rtb.banner.width,
+      height: rtbBid.rtb.banner.height,
+      ad: rtbBid.rtb.banner.content
+    });
+    try {
+      const url = rtbBid.rtb.trackers[0].impression_urls[0];
+      const tracker = createTrackPixelHtml(url);
+      bid.ad += tracker;
+    } catch (error) {
+      logError('Error appending tracking pixel', error);
+    }
+  }
+
+  return bid;
+}
+
+function bidToTag(bid) {
+  const tag = {};
+  tag.sizes = transformSizes(bid.sizes);
+  tag.primary_size = tag.sizes[0];
+  tag.ad_types = [];
+  tag.uuid = bid.bidId;
+  if (bid.params.placementId) {
+    tag.id = parseInt(bid.params.placementId, 10);
+  }
+  if (bid.params.cpm) {
+    tag.cpm = bid.params.cpm;
+  }
+  tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
+  tag.prebid = true;
+  tag.disable_psa = true;
+  if (bid.params.position) {
+    tag.position = {'above': 1, 'below': 2}[bid.params.position] || 0;
+  } else {
+    let mediaTypePos = deepAccess(bid, `mediaTypes.banner.pos`) || deepAccess(bid, `mediaTypes.video.pos`);
+    // only support unknown, atf, and btf values for position at this time
+    if (mediaTypePos === 0 || mediaTypePos === 1 || mediaTypePos === 3) {
+      // ortb spec treats btf === 3, but our system interprets btf === 2; so converting the ortb value here for consistency
+      tag.position = (mediaTypePos === 3) ? 2 : mediaTypePos;
+    }
+  }
+  if (bid.params.trafficSourceCode) {
+    tag.traffic_source_code = bid.params.trafficSourceCode;
+  }
+  if (bid.params.privateSizes) {
+    tag.private_sizes = transformSizes(bid.params.privateSizes);
+  }
+  if (bid.params.supplyType) {
+    tag.supply_type = bid.params.supplyType;
+  }
+  if (bid.params.pubClick) {
+    tag.pubclick = bid.params.pubClick;
+  }
+  if (bid.params.extInvCode) {
+    tag.ext_inv_code = bid.params.extInvCode;
+  }
+  if (bid.params.externalImpId) {
+    tag.external_imp_id = bid.params.externalImpId;
+  }
+  if (!isEmpty(bid.params.keywords)) {
+    let keywords = transformBidderParamKeywords(bid.params.keywords);
+
+    if (keywords.length > 0) {
+      keywords.forEach(deleteValues);
+    }
+    tag.keywords = keywords;
+  }
+  if (bid.params.category) {
+    tag.category = bid.params.category;
+  }
+
+  if (bid.mediaType === NATIVE || deepAccess(bid, `mediaTypes.${NATIVE}`)) {
+    tag.ad_types.push(NATIVE);
+    if (tag.sizes.length === 0) {
+      tag.sizes = transformSizes([1, 1]);
+    }
+
+    if (bid.nativeParams) {
+      const nativeRequest = buildNativeRequest(bid.nativeParams);
+      tag[NATIVE] = {layouts: [nativeRequest]};
+    }
+  }
+
+  const videoMediaType = deepAccess(bid, `mediaTypes.${VIDEO}`);
+  const context = deepAccess(bid, 'mediaTypes.video.context');
+
+  tag.hb_source = 1;
+  if (bid.mediaType === VIDEO || videoMediaType) {
+    tag.ad_types.push(VIDEO);
+  }
+
+  // instream gets vastUrl, outstream gets vastXml
+  if (bid.mediaType === VIDEO || (videoMediaType && context !== 'outstream')) {
+    tag.require_asset_url = true;
+  }
+
+  if (bid.params.video) {
+    tag.video = {};
+    // place any valid video params on the tag
+    Object.keys(bid.params.video)
+      .filter(param => includes(VIDEO_TARGETING, param))
+      .forEach(param => tag.video[param] = bid.params.video[param]);
+  }
+
+  if (bid.renderer) {
+    tag.video = Object.assign({}, tag.video, {custom_renderer_present: true});
+  }
+
+  if (
+    (isEmpty(bid.mediaType) && isEmpty(bid.mediaTypes)) ||
+    (bid.mediaType === BANNER || (bid.mediaTypes && bid.mediaTypes[BANNER]))
+  ) {
+    tag.ad_types.push(BANNER);
+  }
+
+  return tag;
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (isArray(requestSizes) && requestSizes.length === 2 &&
+    !isArray(requestSizes[0])) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+function hasUserInfo(bid) {
+  return !!bid.params.user;
+}
+
+function hasAppDeviceInfo(bid) {
+  if (bid.params) {
+    return !!bid.params.app
+  }
+}
+
+function hasAppId(bid) {
+  if (bid.params && bid.params.app) {
+    return !!bid.params.app.id
+  }
+  return !!bid.params.app
+}
+
+function getRtbBid(tag) {
+  return tag && tag.ads && tag.ads.length && find(tag.ads, ad => ad.rtb);
+}
+
+function buildNativeRequest(params) {
+  const request = {};
+
+  // map standard prebid native asset identifier to /ut parameters
+  // e.g., tag specifies `body` but /ut only knows `description`.
+  // mapping may be in form {tag: '<server name>'} or
+  // {tag: {serverName: '<server name>', requiredParams: {...}}}
+  Object.keys(params).forEach(key => {
+    // check if one of the <server name> forms is used, otherwise
+    // a mapping wasn't specified so pass the key straight through
+    const requestKey =
+      (NATIVE_MAPPING[key] && NATIVE_MAPPING[key].serverName) ||
+      NATIVE_MAPPING[key] ||
+      key;
+
+    // required params are always passed on request
+    const requiredParams = NATIVE_MAPPING[key] && NATIVE_MAPPING[key].requiredParams;
+    request[requestKey] = Object.assign({}, requiredParams, params[key]);
+
+    // convert the sizes of image/icon assets to proper format (if needed)
+    const isImageAsset = !!(requestKey === NATIVE_MAPPING.image.serverName || requestKey === NATIVE_MAPPING.icon.serverName);
+    if (isImageAsset && request[requestKey].sizes) {
+      let sizes = request[requestKey].sizes;
+      if (isArrayOfNums(sizes) || (isArray(sizes) && sizes.length > 0 && sizes.every(sz => isArrayOfNums(sz)))) {
+        request[requestKey].sizes = transformSizes(request[requestKey].sizes);
+      }
+    }
+
+    if (requestKey === NATIVE_MAPPING.privacyLink) {
+      request.privacy_supported = true;
+    }
+  });
+
+  return request;
+}
+
+function parseMediaType(rtbBid) {
+  const adType = rtbBid.ad_type;
+  if (adType === VIDEO) {
+    return VIDEO;
+  } else {
+    return BANNER;
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/adrelevantisBidAdapter.md b/modules/adrelevantisBidAdapter.md
new file mode 100644
index 00000000000..a60a47508ff
--- /dev/null
+++ b/modules/adrelevantisBidAdapter.md
@@ -0,0 +1,120 @@
+# Overview
+
+```
+Module Name:  Adrelevantis Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: info@adrelevantis.com
+```
+
+# Description
+
+Connects to Adrelevantis exchange for bids.
+
+Adrelevantis bid adapter supports Banner, Video (outstream) and Native.
+
+# Test Parameters
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'adrelevantis',
+         params: {
+           placementId: 13144370,
+           cpm: 0.50
+         }
+       }]
+   },
+   // Native adUnit
+   {
+      code: 'native-div',
+      sizes: [[1, 1]],
+      mediaTypes: {
+        native: {
+          title: {
+            required: true
+          },
+          body: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          },
+          icon: {
+            required: false
+          }
+        }
+      },
+      bids: [{
+        bidder: 'adrelevantis',
+        params: {
+          placementId: 13232354,
+          allowSmallerSizes: true
+        }
+      }]
+   },
+   // Video outstream adUnit
+   {
+     code: 'video-outstream',
+     mediaTypes: {
+       video: {
+         playerSize: [[640, 360]],
+         context: 'outstream'
+       }
+     },
+     bids: [
+       {
+         bidder: 'adrelevantis',
+         params: {
+           placementId: 13232385,
+           video: {
+             skippable: true,
+             playback_method: ['auto_play_sound_off']
+           }
+         }
+       }
+     ]
+   },
+
+   // Banner adUnit in a App Webview
+   // Only use this for situations where prebid.js is in a webview of an App
+   // See Prebid Mobile for displaying ads via an SDK
+   {
+     code: 'banner-div',
+     mediaTypes: {
+       banner: {
+         sizes: [[300, 250], [300,600]]
+       }
+     }
+     bids: [{
+       bidder: 'adrelevantis',
+       params: {
+         placementId: 13144370,
+         app: {
+           id: "B1O2W3M4AN.com.prebid.webview",
+           geo: {
+             lat: 40.0964439,
+             lng: -75.3009142
+           },
+           device_id: {
+             idfa: "4D12078D-3246-4DA4-AD5E-7610481E7AE", // Apple advertising identifier
+             aaid: "38400000-8cf0-11bd-b23e-10b96e40000d", // Android advertising identifier
+             md5udid: "5756ae9022b2ea1e47d84fead75220c8", // MD5 hash of the ANDROID_ID
+             sha1udid: "4DFAA92388699AC6539885AEF1719293879985BF", // SHA1 hash of the ANDROID_ID
+             windowsadid: "750c6be243f1c4b5c9912b95a5742fc5" // Windows advertising identifier
+           }
+         }
+       }
+     }]
+   }
+];
+```
diff --git a/modules/adrinoBidAdapter.js b/modules/adrinoBidAdapter.js
new file mode 100644
index 00000000000..2a5588eeb8c
--- /dev/null
+++ b/modules/adrinoBidAdapter.js
@@ -0,0 +1,86 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {triggerPixel} from '../src/utils.js';
+import {NATIVE} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'adrino';
+const REQUEST_METHOD = 'POST';
+const BIDDER_HOST = 'https://prd-prebid-bidder.adrino.io';
+const GVLID = 1072;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [NATIVE],
+
+  getBidderConfig: function (property) {
+    return config.getConfig(`${BIDDER_CODE}.${property}`);
+  },
+
+  isBidRequestValid: function (bid) {
+    return !!(bid.bidId) &&
+      !!(bid.params) &&
+      !!(bid.params.hash) &&
+      (typeof bid.params.hash === 'string') &&
+      !!(bid.mediaTypes) &&
+      Object.keys(bid.mediaTypes).includes(NATIVE) &&
+      (bid.bidder === BIDDER_CODE);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const bidRequests = [];
+
+    for (let i = 0; i < validBidRequests.length; i++) {
+      let host = this.getBidderConfig('host') || BIDDER_HOST;
+
+      let requestData = {
+        bidId: validBidRequests[i].bidId,
+        nativeParams: validBidRequests[i].nativeParams,
+        placementHash: validBidRequests[i].params.hash,
+        userId: validBidRequests[i].userId,
+        referer: bidderRequest.refererInfo.page,
+        userAgent: navigator.userAgent,
+      }
+
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        requestData.gdprConsent = {
+          consentString: bidderRequest.gdprConsent.consentString,
+          consentRequired: bidderRequest.gdprConsent.gdprApplies
+        }
+      }
+
+      bidRequests.push({
+        method: REQUEST_METHOD,
+        url: host + '/bidder/bid/',
+        data: requestData,
+        options: {
+          contentType: 'application/json',
+          withCredentials: false,
+        }
+      });
+    }
+
+    return bidRequests;
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const response = serverResponse.body;
+    const bidResponses = [];
+    if (!response.noAd) {
+      bidResponses.push(response);
+    }
+    return bidResponses;
+  },
+
+  onBidWon: function (bid) {
+    if (bid['requestId']) {
+      let host = this.getBidderConfig('host') || BIDDER_HOST;
+      triggerPixel(host + '/bidder/won/' + bid['requestId']);
+    }
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/adrinoBidAdapter.md b/modules/adrinoBidAdapter.md
new file mode 100644
index 00000000000..ab655f700fc
--- /dev/null
+++ b/modules/adrinoBidAdapter.md
@@ -0,0 +1,51 @@
+# Overview
+
+```
+Module Name: Adrino Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: dev@adrino.pl
+```
+
+# Description
+
+Module connects to Adrino bidder to fetch bids. Only native format is supported.
+
+# Test Parameters
+
+```
+pbjs.setConfig({
+    adrino: {
+        host: 'https://custom-domain.adrino.io'
+    }
+});
+
+var adUnits = [
+    code: '/12345678/prebid_native_example_1',
+    mediaTypes: {
+        native: {
+            image: {
+                required: true,
+                sizes: [[300, 210],[300,150],[140,100]]
+            },
+            title: {
+                required: true
+            },
+            sponsoredBy: {
+                required: false
+            },
+            body: {
+                required: false
+            },
+            icon: {
+                required: false
+            }
+        }
+    },
+    bids: [{
+        bidder: 'adrino',
+        params: {
+            hash: 'abcdef123456'
+        }
+    }]
+];
+```
diff --git a/modules/adriverBidAdapter.js b/modules/adriverBidAdapter.js
new file mode 100644
index 00000000000..1af0cffa700
--- /dev/null
+++ b/modules/adriverBidAdapter.js
@@ -0,0 +1,213 @@
+// ADRIVER BID ADAPTER for Prebid 1.13
+import { logInfo, getWindowLocation, getBidIdParameter, _each } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const BIDDER_CODE = 'adriver';
+const ADRIVER_BID_URL = 'https://pb.adriver.ru/cgi-bin/bid.cgi';
+const TIME_TO_LIVE = 3000;
+
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+export const spec = {
+  code: BIDDER_CODE,
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!bid.params.siteid;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let win = getWindowLocation();
+    let customID = Math.round(Math.random() * 999999999) + '-' + Math.round(new Date() / 1000) + '-1-46-';
+    let siteId = getBidIdParameter('siteid', validBidRequests[0].params) + '';
+    let currency = getBidIdParameter('currency', validBidRequests[0].params);
+    currency = 'RUB';
+
+    let timeout = null;
+    if (bidderRequest) {
+      timeout = bidderRequest.timeout;
+    }
+
+    const payload = {
+      'at': 1,
+      'cur': [currency],
+      'tmax': timeout,
+      'site': {
+        'name': win.origin,
+        'domain': win.hostname,
+        'id': siteId,
+        'page': win.href
+      },
+      'id': customID,
+      'user': {
+        'buyerid': 0,
+        'ext': {
+          'eids': getUserIdAsEids(validBidRequests)
+        }
+      },
+      'device': {
+        'ip': '195.209.111.14',
+        'ua': window.navigator.userAgent
+      },
+      'imp': []
+    };
+
+    _each(validBidRequests, (bid) => {
+      _each(bid.sizes, (sizes) => {
+        let width;
+        let height;
+        let par;
+
+        let floorAndCurrency = _getFloor(bid, currency, sizes);
+
+        let bidFloor = floorAndCurrency.floor;
+        let dealId = getBidIdParameter('dealid', bid.params);
+        if (typeof sizes[0] === 'number' && typeof sizes[1] === 'number') {
+          width = sizes[0];
+          height = sizes[1];
+        }
+        par = {
+          'id': bid.params.placementId,
+          'ext': {'query': 'bn=15&custom=111=' + bid.bidId},
+          'banner': {
+            'w': width || undefined,
+            'h': height || undefined
+          },
+          'bidfloor': bidFloor || 0,
+          'bidfloorcur': floorAndCurrency.currency,
+          'secure': 0
+        };
+        if (dealId) {
+          par.pmp = {
+            'private_auction': 1,
+            'deals': [{
+              'id': dealId,
+              'bidfloor': bidFloor || 0,
+              'bidfloorcur': currency
+            }]
+          };
+        }
+        logInfo('par', par);
+        payload.imp.push(par);
+      });
+    });
+
+    let adrcidCookie = storage.getDataFromLocalStorage('adrcid') || validBidRequests[0].userId?.adrcid;
+    if (adrcidCookie) {
+      payload.user.buyerid = adrcidCookie;
+    }
+    const payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: ADRIVER_BID_URL,
+      data: payloadString
+    };
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    logInfo('serverResponse.body.seatbid', serverResponse.body.seatbid);
+    const bidResponses = [];
+    let nurl = 0;
+    _each(serverResponse.body.seatbid, (seatbid) => {
+      logInfo('_each', seatbid);
+      var bid = seatbid.bid[0];
+      if (bid.nurl !== undefined) {
+        nurl = bid.nurl.split('://');
+        nurl = window.location.protocol + '//' + nurl[1];
+        nurl = nurl.replace(/\$\{AUCTION_PRICE\}/, bid.price);
+      }
+
+      if (bid.price >= 0 && bid.impid !== undefined && nurl !== 0 && bid.dealid === undefined) {
+        let bidResponse = {
+          requestId: bid.ext || undefined,
+          cpm: bid.price,
+          width: bid.w,
+          height: bid.h,
+          creativeId: bid.impid || undefined,
+          currency: serverResponse.body.cur,
+          netRevenue: true,
+          ttl: TIME_TO_LIVE,
+          meta: {
+            advertiserDomains: bid.adomain
+          },
+          ad: '<IFRAME SRC="' + bid.nurl + '" FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" STYLE ="WIDTH:' + bid.w + 'px; HEIGHT:' + bid.h + 'px"></IFRAME>'
+        };
+        logInfo('bidResponse', bidResponse);
+        bidResponses.push(bidResponse);
+      }
+    });
+    return bidResponses;
+  }
+};
+registerBidder(spec);
+
+/**
+ * get first userId from validBidRequests
+ * @param validBidRequests
+ * @returns {Array|*} userIdAsEids
+ */
+function getUserIdAsEids(validBidRequests) {
+  if (validBidRequests && validBidRequests.length > 0 && validBidRequests[0].userIdAsEids &&
+    validBidRequests[0].userIdAsEids.length > 0) {
+    return validBidRequests[0].userIdAsEids;
+  } else {
+    return [];
+  }
+}
+
+/**
+ * Gets bidfloor
+ * @param {Object} bid
+ * @param currencyPar
+ * @param sizes
+ * @returns {Object} floor
+ */
+function _getFloor(bid, currencyPar, sizes) {
+  const curMediaType = bid.mediaTypes && bid.mediaTypes.video ? 'video' : 'banner';
+  let floor = 0;
+  const currency = currencyPar || 'RUB';
+
+  let currencyResult = '';
+
+  let isSize = false;
+
+  if (typeof sizes[0] === 'number' && typeof sizes[1] === 'number') {
+    isSize = true;
+  }
+
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: currency,
+      mediaType: curMediaType,
+      size: isSize ? sizes : '*'
+    });
+
+    if (typeof floorInfo === 'object' &&
+      !isNaN(parseFloat(floorInfo.floor))) {
+      floor = floorInfo.floor;
+    }
+
+    if (typeof floorInfo === 'object' && floorInfo.currency) {
+      currencyResult = floorInfo.currency;
+    }
+  }
+
+  if (!currencyResult) {
+    currencyResult = currency;
+  }
+
+  if (floor == null) {
+    floor = 0;
+  }
+
+  return {
+    floor: floor,
+    currency: currencyResult
+  };
+}
diff --git a/modules/adriverBidAdapter.md b/modules/adriverBidAdapter.md
new file mode 100644
index 00000000000..e5a8af28647
--- /dev/null
+++ b/modules/adriverBidAdapter.md
@@ -0,0 +1,20 @@
+# Overview
+
+Module Name: AdRiver Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@adriver.ru
+
+# Description
+
+Module that connects to AdRiver's demand sources.
+
+# Test Parameters
+
+bids: [{
+   bidder: 'adriver',
+      params: {
+          siteid: '216200',
+          placementId: '55:test_placement',
+          dealid: 'dealidTest'
+      }
+}]
diff --git a/modules/adriverIdSystem.js b/modules/adriverIdSystem.js
new file mode 100644
index 00000000000..fb8ce99ec16
--- /dev/null
+++ b/modules/adriverIdSystem.js
@@ -0,0 +1,84 @@
+/**
+ * This module adds AdriverId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/adriverIdSubmodule
+ * @requires module:modules/userId
+ */
+
+import { logError, isPlainObject } from '../src/utils.js'
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'adriverId';
+
+export const storage = getStorageManager();
+
+/** @type {Submodule} */
+export const adriverIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {{adriverId:string}}
+   */
+  decode(value) {
+    return { adrcid: value }
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config) {
+    if (!isPlainObject(config.params)) {
+      config.params = {};
+    }
+    const url = 'https://ad.adriver.ru/cgi-bin/json.cgi?sid=1&ad=719473&bt=55&pid=3198680&bid=7189165&bn=7189165&tuid=1';
+    const resp = function (callback) {
+      let creationDate = storage.getDataFromLocalStorage('adrcid_cd') || storage.getCookie('adrcid_cd');
+      let cookie = storage.getDataFromLocalStorage('adrcid') || storage.getCookie('adrcid');
+
+      if (cookie && creationDate && ((new Date().getTime() - creationDate) < 86400000)) {
+        const responseObj = cookie;
+        callback(responseObj);
+      } else {
+        const callbacks = {
+          success: response => {
+            let responseObj;
+            if (response) {
+              try {
+                responseObj = JSON.parse(response).adrcid;
+              } catch (error) {
+                logError(error);
+              }
+              let now = new Date();
+              now.setTime(now.getTime() + 86400 * 1825 * 1000);
+              storage.setCookie('adrcid', responseObj, now.toUTCString(), 'Lax');
+              storage.setDataInLocalStorage('adrcid', responseObj);
+              storage.setCookie('adrcid_cd', new Date().getTime(), now.toUTCString(), 'Lax');
+              storage.setDataInLocalStorage('adrcid_cd', new Date().getTime());
+            }
+            callback(responseObj);
+          },
+          error: error => {
+            logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+            callback();
+          }
+        };
+        let newUrl = url + '&cid=' + (storage.getDataFromLocalStorage('adrcid') || storage.getCookie('adrcid'));
+        ajax(newUrl, callbacks, undefined, {method: 'GET'});
+      }
+    };
+    return {callback: resp};
+  }
+};
+
+submodule('userId', adriverIdSubmodule);
diff --git a/modules/adriverIdSystem.md b/modules/adriverIdSystem.md
new file mode 100644
index 00000000000..797318ba977
--- /dev/null
+++ b/modules/adriverIdSystem.md
@@ -0,0 +1,19 @@
+# Overview
+
+Module Name: AdRiver Id System
+Module Type: User Id System
+Maintainer: support@adriver.ru
+
+# Description
+
+Adriver user identification system
+
+## Example configuration for publishers:
+
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'adriverId'
+        }]
+    }
+});
\ No newline at end of file
diff --git a/modules/adspendBidAdapter.js b/modules/adspendBidAdapter.js
deleted file mode 100644
index 9fe70885eeb..00000000000
--- a/modules/adspendBidAdapter.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import * as utils from '../src/utils.js';
-import { ajax } from '../src/ajax.js'
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const storage = getStorageManager();
-const BIDDER_CODE = 'adspend';
-const BID_URL = 'https://rtb.com.ru/headerbidding-bid';
-const SYNC_URL = 'https://rtb.com.ru/headerbidding-sync?uid={UUID}';
-const COOKIE_NAME = 'hb-adspend-id';
-const TTL = 10000;
-const RUB = 'RUB';
-const FIRST_PRICE = 1;
-const NET_REVENUE = true;
-
-const winEventURLs = {};
-const placementToBidMap = {};
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['as'],
-  supportedMediaTypes: [BANNER],
-
-  onBidWon: function(winObj) {
-    const requestId = winObj.requestId;
-    const cpm = winObj.cpm;
-    const event = winEventURLs[requestId].replace(
-      /\$\{AUCTION_PRICE\}/,
-      cpm
-    );
-
-    ajax(event, null);
-  },
-
-  isBidRequestValid: function(bid) {
-    const adServerCur = config.getConfig('currency.adServerCurrency') === RUB;
-
-    return !!(adServerCur &&
-      bid.params &&
-      bid.params.bidfloor &&
-      bid.crumbs.pubcid &&
-      utils.checkCookieSupport() &&
-      storage.cookiesAreEnabled()
-    );
-  },
-
-  buildRequests: function(bidRequests, bidderRequest) {
-    const req = bidRequests[Math.floor(Math.random() * bidRequests.length)];
-    const bidId = req.bidId;
-    const at = FIRST_PRICE;
-    const site = { id: req.crumbs.pubcid, domain: document.domain };
-    const device = { ua: navigator.userAgent, ip: '' };
-    const user = { id: getUserID() }
-    const cur = [ RUB ];
-    const tmax = bidderRequest.timeout;
-
-    const imp = bidRequests.map(req => {
-      const params = req.params;
-
-      const tagId = params.tagId;
-      const id = params.placement;
-      const banner = { 'format': getFormats(req.sizes) };
-      const bidfloor = params.bidfloor !== undefined
-        ? Number(params.bidfloor) : 1;
-      const bidfloorcur = RUB;
-
-      placementToBidMap[id] = bidId;
-
-      return {
-        id,
-        tagId,
-        banner,
-        bidfloor,
-        bidfloorcur,
-        secure: 0,
-      };
-    });
-
-    const payload = {
-      bidId,
-      at,
-      site,
-      device,
-      user,
-      imp,
-      cur,
-      tmax,
-    };
-
-    return {
-      method: 'POST',
-      url: BID_URL,
-      data: JSON.stringify(payload),
-    };
-  },
-
-  interpretResponse: function(resp, {bidderRequest}) {
-    if (resp.body === '') return [];
-
-    const bids = resp.body.seatbid[0].bid.map(bid => {
-      const cpm = bid.price;
-      const impid = bid.impid;
-      const requestId = placementToBidMap[impid];
-      const width = bid.w;
-      const height = bid.h;
-      const creativeId = bid.adid;
-      const dealId = bid.dealid;
-      const currency = resp.body.cur;
-      const netRevenue = NET_REVENUE;
-      const ttl = TTL;
-      const ad = bid.adm;
-
-      return {
-        cpm,
-        requestId,
-        width,
-        height,
-        creativeId,
-        dealId,
-        currency,
-        netRevenue,
-        ttl,
-        ad,
-      };
-    });
-
-    return bids;
-  },
-
-  getUserSyncs: function(syncOptions, resps) {
-    let syncs = [];
-
-    resps.forEach(resp => {
-      if (syncOptions.pixelEnabled && resp.body === '') {
-        const uuid = getUserID();
-        syncs.push({
-          type: 'image',
-          url: SYNC_URL.replace('{UUID}', uuid),
-        });
-      }
-    });
-
-    return syncs
-  }
-}
-
-const getUserID = () => {
-  const i = storage.getCookie(COOKIE_NAME);
-
-  if (i === null) {
-    const uuid = utils.generateUUID();
-    storage.setCookie(COOKIE_NAME, uuid);
-    return uuid;
-  }
-  return i;
-};
-
-const getFormats = arr => arr.map((s) => {
-  return { w: s[0], h: s[1] };
-});
-
-registerBidder(spec);
diff --git a/modules/adspendBidAdapter.md b/modules/adspendBidAdapter.md
deleted file mode 100644
index dc3409b0057..00000000000
--- a/modules/adspendBidAdapter.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Overview
-
-```
-Module Name: AdSpend Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: gaffoonster@gmail.com
-```
-
-# Description
-
-Connects to AdSpend bidder.
-AdSpend adapter supports only Banner at the moment. Video and Native will be add soon.
-
-# Test Parameters
-```
-var adUnits = [
-    // Banner
-    {
-        code: 'div-gpt-ad-1460505748561-0',
-        mediaTypes: {
-            banner: {
-                // You can choose one of them
-                sizes: [
-                  [300, 250],
-                  [300, 600],
-                  [240, 400],
-                  [728, 90],
-                ]
-            }
-        },
-        bids: [
-            {
-                bidder: "adspend",
-                params: {
-                    bidfloor: 1,
-                    placement: 'test',
-                    tagId: 'test-ad',
-                }
-            }
-        ]
-    }
-];
-
-pbjs.que.push(() => {
-  pbjs.setConfig({
-    userSync: {
-      syncEnabled: true,
-      enabledBidders: ['adspend'],
-      pixelEnabled: true,
-      syncsPerBidder: 200,
-      syncDelay: 100,
-    },
-    currency: {
-      adServerCurrency: 'RUB' // We work only with rubles for now
-    }
-  });
-});
-```
-
-**It's a test banner, so you'll see some errors in console cause it will be trying to call our system's events.**
diff --git a/modules/adspiritBidAdapter.md b/modules/adspiritBidAdapter.md
deleted file mode 100644
index 688d0814882..00000000000
--- a/modules/adspiritBidAdapter.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Overview
-
-**Module Name**: AdSpirit Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**: prebid@adspirit.de
-
-# Description
-
-Module that connects to an AdSpirit zone to fetch bids. 
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'display-div',
-               sizes: [[300, 250]],  // a display size
-               bids: [
-                   {
-                       bidder: "adspirit",
-                       params: {
-                           placementId: '5',
-                           host: 'n1test.adspirit.de'
-                       }
-                   }
-               ]
-           }
-       ];
-```
diff --git a/modules/adtargetBidAdapter.js b/modules/adtargetBidAdapter.js
index b22addec54f..89ba4878acf 100644
--- a/modules/adtargetBidAdapter.js
+++ b/modules/adtargetBidAdapter.js
@@ -1,8 +1,8 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-import find from 'core-js-pure/features/array/find.js';
+import {_map, chunk, deepAccess, flatten, isArray, logError, parseSizesInput} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {find} from '../src/polyfill.js';
 
 const ENDPOINT = 'https://ghb.console.adtarget.com.tr/v2/auction/';
 const BIDDER_CODE = 'adtarget';
@@ -13,7 +13,7 @@ export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
-    return !!utils.deepAccess(bid, 'params.aid');
+    return !!deepAccess(bid, 'params.aid');
   },
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
@@ -42,9 +42,9 @@ export const spec = {
     }
 
     if (syncOptions.pixelEnabled || syncOptions.iframeEnabled) {
-      utils.isArray(serverResponses) && serverResponses.forEach((response) => {
+      isArray(serverResponses) && serverResponses.forEach((response) => {
         if (response.body) {
-          if (utils.isArray(response.body)) {
+          if (isArray(response.body)) {
             response.body.forEach(b => {
               addSyncs(b);
             })
@@ -59,10 +59,10 @@ export const spec = {
 
   buildRequests: function (bidRequests, adapterRequest) {
     const adapterSettings = config.getConfig(adapterRequest.bidderCode)
-    const chunkSize = utils.deepAccess(adapterSettings, 'chunkSize', 10);
+    const chunkSize = deepAccess(adapterSettings, 'chunkSize', 10);
     const { tag, bids } = bidToTag(bidRequests, adapterRequest);
-    const bidChunks = utils.chunk(bids, chunkSize);
-    return utils._map(bidChunks, (bids) => {
+    const bidChunks = chunk(bids, chunkSize);
+    return _map(bidChunks, (bids) => {
       return {
         data: Object.assign({}, tag, { BidRequests: bids }),
         adapterRequest,
@@ -75,12 +75,12 @@ export const spec = {
     serverResponse = serverResponse.body;
     let bids = [];
 
-    if (!utils.isArray(serverResponse)) {
+    if (!isArray(serverResponse)) {
       return parseResponse(serverResponse, adapterRequest);
     }
 
     serverResponse.forEach(serverBidResponse => {
-      bids = utils.flatten(bids, parseResponse(serverBidResponse, adapterRequest));
+      bids = flatten(bids, parseResponse(serverBidResponse, adapterRequest));
     });
 
     return bids;
@@ -88,14 +88,14 @@ export const spec = {
 };
 
 function parseResponse(serverResponse, adapterRequest) {
-  const isInvalidValidResp = !serverResponse || !utils.isArray(serverResponse.bids);
+  const isInvalidValidResp = !serverResponse || !isArray(serverResponse.bids);
   const bids = [];
 
   if (isInvalidValidResp) {
     const extMessage = serverResponse && serverResponse.ext && serverResponse.ext.message ? `: ${serverResponse.ext.message}` : '';
     const errorMessage = `in response for ${adapterRequest.bidderCode} adapter ${extMessage}`;
 
-    utils.logError(errorMessage);
+    logError(errorMessage);
 
     return bids;
   }
@@ -117,26 +117,27 @@ function parseResponse(serverResponse, adapterRequest) {
 
 function bidToTag(bidRequests, adapterRequest) {
   const tag = {
-    Domain: utils.deepAccess(adapterRequest, 'refererInfo.referer')
+    // TODO: is 'page' the right value here?
+    Domain: deepAccess(adapterRequest, 'refererInfo.page')
   };
   if (config.getConfig('coppa') === true) {
     tag.Coppa = 1;
   }
-  if (utils.deepAccess(adapterRequest, 'gdprConsent.gdprApplies')) {
+  if (deepAccess(adapterRequest, 'gdprConsent.gdprApplies')) {
     tag.GDPR = 1;
-    tag.GDPRConsent = utils.deepAccess(adapterRequest, 'gdprConsent.consentString');
+    tag.GDPRConsent = deepAccess(adapterRequest, 'gdprConsent.consentString');
   }
-  if (utils.deepAccess(adapterRequest, 'uspConsent')) {
-    tag.USP = utils.deepAccess(adapterRequest, 'uspConsent');
+  if (deepAccess(adapterRequest, 'uspConsent')) {
+    tag.USP = deepAccess(adapterRequest, 'uspConsent');
   }
-  if (utils.deepAccess(bidRequests[0], 'schain')) {
-    tag.Schain = utils.deepAccess(bidRequests[0], 'schain');
+  if (deepAccess(bidRequests[0], 'schain')) {
+    tag.Schain = deepAccess(bidRequests[0], 'schain');
   }
-  if (utils.deepAccess(bidRequests[0], 'userId')) {
-    tag.UserIds = utils.deepAccess(bidRequests[0], 'userId');
+  if (deepAccess(bidRequests[0], 'userId')) {
+    tag.UserIds = deepAccess(bidRequests[0], 'userId');
   }
 
-  const bids = []
+  const bids = [];
 
   for (let i = 0, length = bidRequests.length; i < length; i++) {
     const bid = prepareBidRequests(bidRequests[i]);
@@ -147,19 +148,19 @@ function bidToTag(bidRequests, adapterRequest) {
 }
 
 function prepareBidRequests(bidReq) {
-  const mediaType = utils.deepAccess(bidReq, 'mediaTypes.video') ? VIDEO : DISPLAY;
-  const sizes = mediaType === VIDEO ? utils.deepAccess(bidReq, 'mediaTypes.video.playerSize') : utils.deepAccess(bidReq, 'mediaTypes.banner.sizes');
+  const mediaType = deepAccess(bidReq, 'mediaTypes.video') ? VIDEO : DISPLAY;
+  const sizes = mediaType === VIDEO ? deepAccess(bidReq, 'mediaTypes.video.playerSize') : deepAccess(bidReq, 'mediaTypes.banner.sizes');
   const bidReqParams = {
     'CallbackId': bidReq.bidId,
     'Aid': bidReq.params.aid,
     'AdType': mediaType,
-    'Sizes': utils.parseSizesInput(sizes).join(',')
+    'Sizes': parseSizesInput(sizes).join(',')
   };
   return bidReqParams;
 }
 
 function getMediaType(bidderRequest) {
-  return utils.deepAccess(bidderRequest, 'mediaTypes.video') ? VIDEO : BANNER;
+  return deepAccess(bidderRequest, 'mediaTypes.video') ? VIDEO : BANNER;
 }
 
 function createBid(bidResponse, bidRequest) {
@@ -173,7 +174,10 @@ function createBid(bidResponse, bidRequest) {
     cpm: bidResponse.cpm,
     netRevenue: true,
     mediaType,
-    ttl: 300
+    ttl: 300,
+    meta: {
+      advertiserDomains: bidResponse.adomain || []
+    }
   };
 
   if (mediaType === BANNER) {
diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index e22aafb73fc..a7c83d9c190 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -1,17 +1,35 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { ADPOD, BANNER, VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-import { Renderer } from '../src/Renderer.js';
-import find from 'core-js-pure/features/array/find.js';
+import {_map, chunk, convertTypes, deepAccess, flatten, isArray, parseSizesInput} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {ADPOD, BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {Renderer} from '../src/Renderer.js';
+import {find} from '../src/polyfill.js';
 
 const subdomainSuffixes = ['', 1, 2];
-const getUri = (function () {
-  let num = 0;
-  return function () {
-    return 'https://ghb' + subdomainSuffixes[num++ % subdomainSuffixes.length] + '.adtelligent.com/v2/auction/'
-  }
-}())
+const AUCTION_PATH = '/v2/auction/';
+const PROTOCOL = 'https://';
+const HOST_GETTERS = {
+  default: (function () {
+    let num = 0;
+    return function () {
+      return 'ghb' + subdomainSuffixes[num++ % subdomainSuffixes.length] + '.adtelligent.com';
+    }
+  }()),
+  navelix: () => 'ghb.hb.navelix.com',
+  appaloosa: () => 'ghb.hb.appaloosa.media',
+  onefiftytwomedia: () => 'ghb.ads.152media.com',
+  bidsxchange: () => 'ghb.hbd.bidsxchange.com',
+  streamkey: () => 'ghb.hb.streamkey.net',
+  janet: () => 'ghb.bidder.jmgads.com',
+  pgam: () => 'ghb.pgamssp.com',
+  ocm: () => 'ghb.cenarius.orangeclickmedia.com',
+  vidcrunchllc: () => 'ghb.platform.vidcrunch.com',
+}
+const getUri = function (bidderCode) {
+  let bidderWithoutSuffix = bidderCode.split('_')[0];
+  let getter = HOST_GETTERS[bidderWithoutSuffix] || HOST_GETTERS['default'];
+  return PROTOCOL + getter() + AUCTION_PATH
+}
 const OUTSTREAM_SRC = 'https://player.adtelligent.com/outstream-unit/2.01/outstream.min.js';
 const BIDDER_CODE = 'adtelligent';
 const OUTSTREAM = 'outstream';
@@ -21,10 +39,16 @@ const syncsCache = {};
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 410,
-  aliases: ['onefiftytwomedia', 'selectmedia'],
+  aliases: ['onefiftytwomedia', 'appaloosa', 'bidsxchange', 'streamkey', 'janet',
+    { code: 'selectmedia', gvlid: 775 },
+    { code: 'navelix', gvlid: 380 },
+    'pgam',
+    { code: 'ocm', gvlid: 1148 },
+    { code: 'vidcrunchllc', gvlid: 1145 },
+  ],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
-    return !!utils.deepAccess(bid, 'params.aid');
+    return !!deepAccess(bid, 'params.aid');
   },
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
@@ -53,9 +77,9 @@ export const spec = {
     }
 
     if (syncOptions.pixelEnabled || syncOptions.iframeEnabled) {
-      utils.isArray(serverResponses) && serverResponses.forEach((response) => {
+      isArray(serverResponses) && serverResponses.forEach((response) => {
         if (response.body) {
-          if (utils.isArray(response.body)) {
+          if (isArray(response.body)) {
             response.body.forEach(b => {
               addSyncs(b);
             })
@@ -74,15 +98,15 @@ export const spec = {
    */
   buildRequests: function (bidRequests, adapterRequest) {
     const adapterSettings = config.getConfig(adapterRequest.bidderCode)
-    const chunkSize = utils.deepAccess(adapterSettings, 'chunkSize', 10);
+    const chunkSize = deepAccess(adapterSettings, 'chunkSize', 10);
     const { tag, bids } = bidToTag(bidRequests, adapterRequest);
-    const bidChunks = utils.chunk(bids, chunkSize);
-    return utils._map(bidChunks, (bids) => {
+    const bidChunks = chunk(bids, chunkSize);
+    return _map(bidChunks, (bids) => {
       return {
         data: Object.assign({}, tag, { BidRequests: bids }),
         adapterRequest,
         method: 'POST',
-        url: getUri()
+        url: getUri(adapterRequest.bidderCode)
       };
     })
   },
@@ -97,26 +121,26 @@ export const spec = {
     serverResponse = serverResponse.body;
     let bids = [];
 
-    if (!utils.isArray(serverResponse)) {
+    if (!isArray(serverResponse)) {
       return parseRTBResponse(serverResponse, adapterRequest);
     }
 
     serverResponse.forEach(serverBidResponse => {
-      bids = utils.flatten(bids, parseRTBResponse(serverBidResponse, adapterRequest));
+      bids = flatten(bids, parseRTBResponse(serverBidResponse, adapterRequest));
     });
 
     return bids;
   },
 
   transformBidParams(params) {
-    return utils.convertTypes({
+    return convertTypes({
       'aid': 'number',
     }, params);
   }
 };
 
 function parseRTBResponse(serverResponse, adapterRequest) {
-  const isEmptyResponse = !serverResponse || !utils.isArray(serverResponse.bids);
+  const isEmptyResponse = !serverResponse || !isArray(serverResponse.bids);
   const bids = [];
 
   if (isEmptyResponse) {
@@ -141,26 +165,34 @@ function parseRTBResponse(serverResponse, adapterRequest) {
 function bidToTag(bidRequests, adapterRequest) {
   // start publisher env
   const tag = {
-    Domain: utils.deepAccess(adapterRequest, 'refererInfo.referer')
+    // TODO: is 'page' the right value here?
+    Domain: deepAccess(adapterRequest, 'refererInfo.page')
   };
   if (config.getConfig('coppa') === true) {
     tag.Coppa = 1;
   }
-  if (utils.deepAccess(adapterRequest, 'gdprConsent.gdprApplies')) {
+  if (deepAccess(adapterRequest, 'gdprConsent.gdprApplies')) {
     tag.GDPR = 1;
-    tag.GDPRConsent = utils.deepAccess(adapterRequest, 'gdprConsent.consentString');
+    tag.GDPRConsent = deepAccess(adapterRequest, 'gdprConsent.consentString');
+  }
+  if (deepAccess(adapterRequest, 'uspConsent')) {
+    tag.USP = deepAccess(adapterRequest, 'uspConsent');
+  }
+  if (deepAccess(bidRequests[0], 'schain')) {
+    tag.Schain = deepAccess(bidRequests[0], 'schain');
   }
-  if (utils.deepAccess(adapterRequest, 'uspConsent')) {
-    tag.USP = utils.deepAccess(adapterRequest, 'uspConsent');
+  if (deepAccess(bidRequests[0], 'userId')) {
+    tag.UserIds = deepAccess(bidRequests[0], 'userId');
   }
-  if (utils.deepAccess(bidRequests[0], 'schain')) {
-    tag.Schain = utils.deepAccess(bidRequests[0], 'schain');
+  if (deepAccess(bidRequests[0], 'userIdAsEids')) {
+    tag.UserEids = deepAccess(bidRequests[0], 'userIdAsEids');
   }
-  if (utils.deepAccess(bidRequests[0], 'userId')) {
-    tag.UserIds = utils.deepAccess(bidRequests[0], 'userId');
+  if (window.adtDmp && window.adtDmp.ready) {
+    tag.DMPId = window.adtDmp.getUID();
   }
+
   // end publisher env
-  const bids = []
+  const bids = [];
 
   for (let i = 0, length = bidRequests.length; i < length; i++) {
     const bid = prepareBidRequests(bidRequests[i]);
@@ -176,18 +208,26 @@ function bidToTag(bidRequests, adapterRequest) {
  * @returns {object}
  */
 function prepareBidRequests(bidReq) {
-  const mediaType = utils.deepAccess(bidReq, 'mediaTypes.video') ? VIDEO : DISPLAY;
-  const sizes = mediaType === VIDEO ? utils.deepAccess(bidReq, 'mediaTypes.video.playerSize') : utils.deepAccess(bidReq, 'mediaTypes.banner.sizes');
+  const mediaType = deepAccess(bidReq, 'mediaTypes.video') ? VIDEO : DISPLAY;
+  const sizes = mediaType === VIDEO ? deepAccess(bidReq, 'mediaTypes.video.playerSize') : deepAccess(bidReq, 'mediaTypes.banner.sizes');
   const bidReqParams = {
     'CallbackId': bidReq.bidId,
     'Aid': bidReq.params.aid,
     'AdType': mediaType,
-    'Sizes': utils.parseSizesInput(sizes).join(',')
+    'Sizes': parseSizesInput(sizes).join(',')
   };
+
+  bidReqParams.PlacementId = bidReq.adUnitCode;
+  if (bidReq.params.iframe) {
+    bidReqParams.AdmType = 'iframe';
+  }
+  if (bidReq.params.vpb_placement_id) {
+    bidReqParams.PlacementId = bidReq.params.vpb_placement_id;
+  }
   if (mediaType === VIDEO) {
-    const context = utils.deepAccess(bidReq, 'mediaTypes.video.context');
+    const context = deepAccess(bidReq, 'mediaTypes.video.context');
     if (context === ADPOD) {
-      bidReqParams.Adpod = utils.deepAccess(bidReq, 'mediaTypes.video');
+      bidReqParams.Adpod = deepAccess(bidReq, 'mediaTypes.video');
     }
   }
   return bidReqParams;
@@ -199,7 +239,7 @@ function prepareBidRequests(bidReq) {
  * @returns {object}
  */
 function getMediaType(bidderRequest) {
-  return utils.deepAccess(bidderRequest, 'mediaTypes.video') ? VIDEO : BANNER;
+  return deepAccess(bidderRequest, 'mediaTypes.video') ? VIDEO : BANNER;
 }
 
 /**
@@ -210,7 +250,7 @@ function getMediaType(bidderRequest) {
  */
 function createBid(bidResponse, bidRequest) {
   const mediaType = getMediaType(bidRequest)
-  const context = utils.deepAccess(bidRequest, 'mediaTypes.video.context');
+  const context = deepAccess(bidRequest, 'mediaTypes.video.context');
   const bid = {
     requestId: bidResponse.requestId,
     creativeId: bidResponse.cmpId,
@@ -220,12 +260,16 @@ function createBid(bidResponse, bidRequest) {
     cpm: bidResponse.cpm,
     netRevenue: true,
     mediaType,
-    ttl: 300
+    ttl: 300,
+    meta: {
+      advertiserDomains: bidResponse.adomain || []
+    }
   };
 
   if (mediaType === BANNER) {
     return Object.assign(bid, {
-      ad: bidResponse.ad
+      ad: bidResponse.ad,
+      adUrl: bidResponse.adUrl,
     });
   }
   if (context === ADPOD) {
diff --git a/modules/adtelligentIdSystem.js b/modules/adtelligentIdSystem.js
new file mode 100644
index 00000000000..fb3b5f6fe2a
--- /dev/null
+++ b/modules/adtelligentIdSystem.js
@@ -0,0 +1,91 @@
+/**
+ * This module adds Adtelligent DMP Tokens to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/adtelligentIdSystem
+ * @requires module:modules/userId
+ */
+
+import * as ajax from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+
+const gvlid = 410;
+const moduleName = 'adtelligent';
+const syncUrl = 'https://idrs.adtelligent.com/get';
+
+function buildUrl(opts) {
+  const queryPairs = [];
+  for (let key in opts) {
+    queryPairs.push(`${key}=${encodeURIComponent(opts[key])}`);
+  }
+  return `${syncUrl}?${queryPairs.join('&')}`;
+}
+
+function requestRemoteIdAsync(url, cb) {
+  ajax.ajaxBuilder()(
+    url,
+    {
+      success: response => {
+        const jsonResponse = JSON.parse(response);
+        const { u: dmpId } = jsonResponse;
+        cb(dmpId);
+      },
+      error: () => {
+        cb();
+      }
+    },
+    null,
+    {
+      method: 'GET',
+      contentType: 'application/json',
+      withCredentials: true
+    }
+  );
+}
+
+/** @type {Submodule} */
+export const adtelligentIdModule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: moduleName,
+  gvlid: gvlid,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{adtelligentId: string}}
+   */
+  decode(uid) {
+    return { adtelligentId: uid };
+  },
+  /**
+   * get the Adtelligent Id from local storages and initiate a new user sync
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse}
+   */
+  getId(config, consentData) {
+    const gdpr = consentData && consentData.gdprApplies ? 1 : 0;
+    const gdprConsent = gdpr ? consentData.consentString : '';
+    const url = buildUrl({
+      gdpr,
+      gdprConsent
+    });
+
+    if (window.adtDmp && window.adtDmp.ready) {
+      return { id: window.adtDmp.getUID() }
+    }
+
+    return {
+      callback: (cb) => {
+        requestRemoteIdAsync(url, (id) => {
+          cb(id);
+        });
+      }
+
+    }
+  }
+};
+
+submodule('userId', adtelligentIdModule);
diff --git a/modules/adtelligentIdSystem.md b/modules/adtelligentIdSystem.md
new file mode 100644
index 00000000000..291a5e70bde
--- /dev/null
+++ b/modules/adtelligentIdSystem.md
@@ -0,0 +1,33 @@
+### Adtelligent Id Sytem
+
+The [Adtelligent](https://adtelligent.com) ID system is a uniq per-session user identifier for providing high quality DMP data for advertisers
+
+#### Adtelligent Id Sytem Configuration Example
+ 
+{% highlight javascript %}
+ pbjs.setConfig({
+     userSync: {
+         userIds: [{
+             name: 'adtelligent'
+         }]
+     }
+ });
+{% endhighlight %}
+
+Example with a short storage for ~10 minutes and refresh in 5 minutes: 
+
+{% highlight javascript %}
+    pbjs.setConfig({
+        userSync: {
+            userIds: [{
+                name: 'adtelligent',
+                storage: {
+                    type: "html5",
+                    name: "adt_id",
+                    expires:0.003,
+                    refreshInSeconds: 60 * 5
+                }
+            }]
+        }
+    });
+{% endhighlight %}
diff --git a/modules/adtrgtmeBidAdapter.js b/modules/adtrgtmeBidAdapter.js
new file mode 100644
index 00000000000..4dc95ce6bc1
--- /dev/null
+++ b/modules/adtrgtmeBidAdapter.js
@@ -0,0 +1,333 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { deepAccess, isFn, isStr, isNumber, isArray, isEmpty, isPlainObject, generateUUID, logWarn } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { hasPurpose1Consent } from '../src/utils/gpdr.js';
+
+const INTEGRATION_METHOD = 'prebid.js';
+const BIDDER_CODE = 'adtrgtme';
+const ENDPOINT = 'https://z.cdn.adtarget.market/ssp?prebid&s=';
+const ADAPTER_VERSION = '1.0.0';
+const PREBID_VERSION = '$prebid.version$';
+const DEFAULT_BID_TTL = 300;
+const DEFAULT_CURRENCY = 'USD';
+
+function transformSizes(sizes) {
+  const getSize = (size) => {
+    return {
+      w: parseInt(size[0]),
+      h: parseInt(size[1])
+    }
+  }
+  if (isArray(sizes) && sizes.length === 2 && !isArray(sizes[0])) {
+    return [ getSize(sizes) ];
+  }
+  return sizes.map(getSize);
+}
+
+function extractUserSyncUrls(syncOptions, pixels) {
+  let itemsRegExp = /(img|iframe)[\s\S]*?src\s*=\s*("|')(.*?)\2/gi;
+  let tagNameRegExp = /\w*(?=\s)/;
+  let srcRegExp = /src=("|')(.*?)\1/;
+  let userSyncObjects = [];
+
+  if (pixels) {
+    let matchedItems = pixels.match(itemsRegExp);
+    if (matchedItems) {
+      matchedItems.forEach(item => {
+        let tagName = item.match(tagNameRegExp)[0];
+        let url = item.match(srcRegExp)[2];
+        if (tagName && url) {
+          let tagType = tagName.toLowerCase() === 'img' ? 'image' : 'iframe';
+          if ((!syncOptions.iframeEnabled && tagType === 'iframe') ||
+                (!syncOptions.pixelEnabled && tagType === 'image')) {
+            return;
+          }
+          userSyncObjects.push({
+            type: tagType,
+            url: url
+          });
+        }
+      });
+    }
+  }
+  return userSyncObjects;
+}
+
+function isSecure(bid) {
+  return deepAccess(bid, 'params.bidOverride.imp.secure') || (document.location.protocol === 'https:') ? 1 : 0;
+};
+
+function getMediaType(bid) {
+  return deepAccess(bid, 'mediaTypes.banner') ? BANNER : false;
+}
+
+function validateAppendObject(validationFunction, allowedKeys, inputObject, appendToObject) {
+  const outputObject = {
+    ...appendToObject
+  };
+  if (allowedKeys.length > 0 && typeof validationFunction === 'function') {
+    for (const objectKey in inputObject) {
+      if (allowedKeys.indexOf(objectKey) !== -1 && validationFunction(inputObject[objectKey])) {
+        outputObject[objectKey] = inputObject[objectKey]
+      }
+    }
+  }
+  return outputObject;
+};
+
+function getTtl(bidderRequest) {
+  const ttl = config.getConfig('adtrgtme.ttl');
+  const validateTTL = (ttl) => {
+    return (isNumber(ttl) && ttl > 0 && ttl < 3600) ? ttl : DEFAULT_BID_TTL
+  };
+  return ttl ? validateTTL(ttl) : validateTTL(deepAccess(bidderRequest, 'params.ttl'));
+};
+
+function getFloorModuleData(bid) {
+  const getFloorRequestObject = {
+    currency: deepAccess(bid, 'params.bidOverride.cur') || DEFAULT_CURRENCY,
+    mediaType: BANNER,
+    size: '*'
+  };
+  return (isFn(bid.getFloor)) ? bid.getFloor(getFloorRequestObject) : false;
+};
+
+function generateOpenRtbObject(bidderRequest, bid) {
+  if (bidderRequest) {
+    let outBoundBidRequest = {
+      id: generateUUID(),
+      cur: [getFloorModuleData(bidderRequest).currency || deepAccess(bid, 'params.bidOverride.cur') || DEFAULT_CURRENCY],
+      imp: [],
+      site: {
+        page: deepAccess(bidderRequest, 'refererInfo.page')
+      },
+      device: {
+        dnt: 0,
+        ua: navigator.userAgent,
+        ip: deepAccess(bid, 'params.bidOverride.device.ip') || deepAccess(bid, 'params.ext.ip') || undefined
+      },
+      regs: {
+        ext: {
+          'us_privacy': bidderRequest.uspConsent ? bidderRequest.uspConsent : '',
+          gdpr: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+        }
+      },
+      source: {
+        ext: {
+          hb: 1,
+          adapterver: ADAPTER_VERSION,
+          prebidver: PREBID_VERSION,
+          integration: {
+            name: INTEGRATION_METHOD,
+            ver: PREBID_VERSION
+          }
+        },
+        fd: 1
+      },
+      user: {
+        ext: {
+          consent: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies
+            ? bidderRequest.gdprConsent.consentString : ''
+        }
+      }
+    };
+
+    outBoundBidRequest.site.id = bid.params.sid;
+
+    if (bidderRequest.ortb2) {
+      outBoundBidRequest = appendFirstPartyData(outBoundBidRequest, bid);
+    };
+
+    if (deepAccess(bid, 'schain')) {
+      outBoundBidRequest.source.ext.schain = bid.schain;
+      outBoundBidRequest.source.ext.schain.nodes[0].rid = outBoundBidRequest.id;
+    };
+
+    return outBoundBidRequest;
+  };
+};
+
+function appendImpObject(bid, openRtbObject) {
+  const mediaTypeMode = getMediaType(bid);
+
+  if (openRtbObject && bid) {
+    const impObject = {
+      id: bid.bidId,
+      secure: isSecure(bid),
+      bidfloor: getFloorModuleData(bid).floor || deepAccess(bid, 'params.bidOverride.imp.bidfloor') || 0.000001
+    };
+
+    if (mediaTypeMode === BANNER) {
+      impObject.banner = {
+        mimes: bid.mediaTypes.banner.mimes || ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: transformSizes(bid.sizes)
+      };
+      if (bid.mediaTypes.banner.pos) {
+        impObject.banner.pos = bid.mediaTypes.banner.pos;
+      };
+    };
+
+    impObject.ext = {
+      dfp_ad_unit_code: bid.adUnitCode
+    };
+
+    if (deepAccess(bid, 'params.zid')) {
+      impObject.tagid = bid.params.zid;
+    }
+
+    if (deepAccess(bid, 'ortb2Imp.ext.data') && isPlainObject(bid.ortb2Imp.ext.data)) {
+      impObject.ext.data = bid.ortb2Imp.ext.data;
+    };
+
+    if (deepAccess(bid, 'ortb2Imp.instl') && isNumber(bid.ortb2Imp.instl) && (bid.ortb2Imp.instl === 1)) {
+      impObject.instl = bid.ortb2Imp.instl;
+    };
+
+    openRtbObject.imp.push(impObject);
+  };
+};
+
+function appendFirstPartyData(outBoundBidRequest, bid) {
+  const ortb2Object = bid.ortb2;
+  const siteObject = deepAccess(ortb2Object, 'site') || undefined;
+  const siteContentObject = deepAccess(siteObject, 'content') || undefined;
+  const userObject = deepAccess(ortb2Object, 'user') || undefined;
+
+  if (siteObject && isPlainObject(siteObject)) {
+    const allowedSiteStringKeys = ['name', 'domain', 'page', 'ref', 'keywords'];
+    const allowedSiteArrayKeys = ['cat', 'sectioncat', 'pagecat'];
+    const allowedSiteObjectKeys = ['ext'];
+    outBoundBidRequest.site = validateAppendObject(isStr, allowedSiteStringKeys, siteObject, outBoundBidRequest.site);
+    outBoundBidRequest.site = validateAppendObject(isArray, allowedSiteArrayKeys, siteObject, outBoundBidRequest.site);
+    outBoundBidRequest.site = validateAppendObject(isPlainObject, allowedSiteObjectKeys, siteObject, outBoundBidRequest.site);
+  };
+
+  if (siteContentObject && isPlainObject(siteContentObject)) {
+    const allowedContentStringKeys = ['id', 'title', 'language'];
+    const allowedContentArrayKeys = ['cat'];
+    outBoundBidRequest.site.content = validateAppendObject(isStr, allowedContentStringKeys, siteContentObject, outBoundBidRequest.site.content);
+    outBoundBidRequest.site.content = validateAppendObject(isArray, allowedContentArrayKeys, siteContentObject, outBoundBidRequest.site.content);
+  };
+
+  if (userObject && isPlainObject(userObject)) {
+    const allowedUserStrings = ['id', 'buyeruid', 'gender', 'keywords', 'customdata'];
+    const allowedUserObjects = ['ext'];
+    outBoundBidRequest.user = validateAppendObject(isStr, allowedUserStrings, userObject, outBoundBidRequest.user);
+    outBoundBidRequest.user.ext = validateAppendObject(isPlainObject, allowedUserObjects, userObject, outBoundBidRequest.user.ext);
+  };
+
+  return outBoundBidRequest;
+};
+
+function generateServerRequest({payload, requestOptions, bidderRequest}) {
+  return {
+    url: (config.getConfig('adtrgtme.endpoint') || ENDPOINT) + (payload.site.id || ''),
+    method: 'POST',
+    data: payload,
+    options: requestOptions,
+    bidderRequest: bidderRequest
+  };
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: [],
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function(bid) {
+    const params = bid.params;
+    if (isPlainObject(params) && isNumber(params.sid)) {
+      return true;
+    } else {
+      logWarn('Adtrgtme bidder params missing or incorrect');
+      return false;
+    }
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    if (isEmpty(validBidRequests) || isEmpty(bidderRequest)) {
+      logWarn('Adtrgtme Adapter: buildRequests called with empty request');
+      return undefined;
+    };
+
+    const requestOptions = {
+      contentType: 'application/json',
+      customHeaders: {
+        'x-openrtb-version': '2.5'
+      }
+    };
+
+    requestOptions.withCredentials = hasPurpose1Consent(bidderRequest.gdprConsent);
+
+    if (config.getConfig('adtrgtme.singleRequestMode') === true) {
+      const payload = generateOpenRtbObject(bidderRequest, validBidRequests[0]);
+      validBidRequests.forEach(bid => {
+        appendImpObject(bid, payload);
+      });
+
+      return generateServerRequest({payload, requestOptions, bidderRequest});
+    }
+
+    return validBidRequests.map(bid => {
+      const payloadClone = generateOpenRtbObject(bidderRequest, bid);
+      appendImpObject(bid, payloadClone);
+
+      return generateServerRequest({payload: payloadClone, requestOptions, bidderRequest: bid});
+    });
+  },
+
+  interpretResponse: function(serverResponse, { data, bidderRequest }) {
+    const response = [];
+    if (!serverResponse.body || !Array.isArray(serverResponse.body.seatbid)) {
+      return response;
+    }
+
+    let seatbids = serverResponse.body.seatbid;
+    seatbids.forEach(seatbid => {
+      let bid;
+
+      try {
+        bid = seatbid.bid[0];
+      } catch (e) {
+        return response;
+      }
+
+      let cpm = bid.price;
+
+      let bidResponse = {
+        adId: deepAccess(bid, 'adId') ? bid.adId : bid.impid || bid.crid,
+        ad: bid.adm,
+        adUnitCode: bidderRequest.adUnitCode,
+        requestId: bid.impid,
+        cpm: cpm,
+        width: bid.w,
+        height: bid.h,
+        creativeId: bid.crid || 0,
+        currency: bid.cur || DEFAULT_CURRENCY,
+        dealId: bid.dealid ? bid.dealid : null,
+        netRevenue: true,
+        ttl: getTtl(bidderRequest),
+        mediaType: BANNER,
+        meta: {
+          advertiserDomains: bid.adomain,
+          mediaType: BANNER,
+        }
+      };
+
+      response.push(bidResponse);
+    });
+
+    return response;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '') {
+    const bidResponse = !isEmpty(serverResponses) && serverResponses[0].body;
+    if (bidResponse && bidResponse.ext && bidResponse.ext.pixels) {
+      return extractUserSyncUrls(syncOptions, bidResponse.ext.pixels);
+    }
+    return [];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/adtrgtmeBidAdapter.md b/modules/adtrgtmeBidAdapter.md
new file mode 100644
index 00000000000..d136b17067d
--- /dev/null
+++ b/modules/adtrgtmeBidAdapter.md
@@ -0,0 +1,69 @@
+# Overview
+
+**Module Name**: adtrgtme Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: info@adtarget.me
+
+# Description
+The Adtrgtme Bid Adapter is an OpenRTB interface that support display demand from Adtarget 
+
+# Supported Features:
+* Media Types: Banner 
+* Multi-format adUnits
+* Price floors module
+* Advertiser domains
+
+# Mandatory Bidder Parameters
+The minimal requirements for the 'adtrgtme' bid adapter to generate an outbound bid-request to our Adtrgtme are:
+1. At least 1 banner adUnit 
+2. Your Adtrgtme site id **bidder.params**.**sid**
+
+## Example:
+```javascript
+const adUnits = [{
+    code: 'your-placement',
+    mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+    bids: [
+        {
+            bidder: 'adtrgtme',
+            params: {
+                sid: 1220291391, // Site/App ID provided from SSP
+            }
+        }
+    ]
+}];
+```
+
+# Optional: Price floors module & bidfloor
+The adtargerme adapter supports the Prebid.org Price Floors module and will use it to define the outbound bidfloor and currency.
+By default the adapter will always check the existance of Module price floor.
+If a module price floor does not exist you can set a custom bid floor for your impression using "params.bidOverride.imp.bidfloor".
+
+```javascript
+const adUnits = [{
+    code: 'your-placement',
+    mediaTypes: {
+        banner: {
+            sizes: [
+                [300, 250]
+            ]
+        }
+    },
+    bids: [{
+        bidder: 'adtrgtme',
+        params: {
+            sid: 1220291391,
+            bidOverride :{
+                imp: {
+                    bidfloor: 5.00 // bidOverride bidfloor
+                }
+            }
+            }
+        }
+    }]
+}];
+```
\ No newline at end of file
diff --git a/modules/adtrueBidAdapter.js b/modules/adtrueBidAdapter.js
new file mode 100644
index 00000000000..2ec5cd59e1d
--- /dev/null
+++ b/modules/adtrueBidAdapter.js
@@ -0,0 +1,635 @@
+import { logWarn, isArray, inIframe, isNumber, isStr, deepClone, deepSetValue, logError, deepAccess, isBoolean } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {getStorageManager} from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'adtrue';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+const ADTRUE_CURRENCY = 'USD';
+const ENDPOINT_URL = 'https://hb.adtrue.com/prebid/auction';
+const LOG_WARN_PREFIX = 'AdTrue: ';
+const AUCTION_TYPE = 1;
+const UNDEFINED = undefined;
+const DEFAULT_WIDTH = 0;
+const DEFAULT_HEIGHT = 0;
+const NET_REVENUE = false;
+let publisherId = 0;
+let zoneId = 0;
+let NATIVE_ASSET_ID_TO_KEY_MAP = {};
+const DATA_TYPES = {
+  'NUMBER': 'number',
+  'STRING': 'string',
+  'BOOLEAN': 'boolean',
+  'ARRAY': 'array',
+  'OBJECT': 'object'
+};
+const SYNC_TYPES = Object.freeze({
+  1: 'iframe',
+  2: 'image'
+});
+
+const VIDEO_CUSTOM_PARAMS = {
+  'mimes': DATA_TYPES.ARRAY,
+  'minduration': DATA_TYPES.NUMBER,
+  'maxduration': DATA_TYPES.NUMBER,
+  'startdelay': DATA_TYPES.NUMBER,
+  'playbackmethod': DATA_TYPES.ARRAY,
+  'api': DATA_TYPES.ARRAY,
+  'protocols': DATA_TYPES.ARRAY,
+  'w': DATA_TYPES.NUMBER,
+  'h': DATA_TYPES.NUMBER,
+  'battr': DATA_TYPES.ARRAY,
+  'linearity': DATA_TYPES.NUMBER,
+  'placement': DATA_TYPES.NUMBER,
+  'minbitrate': DATA_TYPES.NUMBER,
+  'maxbitrate': DATA_TYPES.NUMBER
+};
+
+const NATIVE_ASSETS = {
+  'TITLE': {ID: 1, KEY: 'title', TYPE: 0},
+  'IMAGE': {ID: 2, KEY: 'image', TYPE: 0},
+  'ICON': {ID: 3, KEY: 'icon', TYPE: 0},
+  'SPONSOREDBY': {ID: 4, KEY: 'sponsoredBy', TYPE: 1}, // please note that type of SPONSORED is also 1
+  'BODY': {ID: 5, KEY: 'body', TYPE: 2}, // please note that type of DESC is also set to 2
+  'CLICKURL': {ID: 6, KEY: 'clickUrl', TYPE: 0},
+  'VIDEO': {ID: 7, KEY: 'video', TYPE: 0},
+  'EXT': {ID: 8, KEY: 'ext', TYPE: 0},
+  'DATA': {ID: 9, KEY: 'data', TYPE: 0},
+  'LOGO': {ID: 10, KEY: 'logo', TYPE: 0},
+  'SPONSORED': {ID: 11, KEY: 'sponsored', TYPE: 1}, // please note that type of SPONSOREDBY is also set to 1
+  'DESC': {ID: 12, KEY: 'data', TYPE: 2}, // please note that type of BODY is also set to 2
+  'RATING': {ID: 13, KEY: 'rating', TYPE: 3},
+  'LIKES': {ID: 14, KEY: 'likes', TYPE: 4},
+  'DOWNLOADS': {ID: 15, KEY: 'downloads', TYPE: 5},
+  'PRICE': {ID: 16, KEY: 'price', TYPE: 6},
+  'SALEPRICE': {ID: 17, KEY: 'saleprice', TYPE: 7},
+  'PHONE': {ID: 18, KEY: 'phone', TYPE: 8},
+  'ADDRESS': {ID: 19, KEY: 'address', TYPE: 9},
+  'DESC2': {ID: 20, KEY: 'desc2', TYPE: 10},
+  'DISPLAYURL': {ID: 21, KEY: 'displayurl', TYPE: 11},
+  'CTA': {ID: 22, KEY: 'cta', TYPE: 12}
+};
+
+function _getDomainFromURL(url) {
+  let anchor = document.createElement('a');
+  anchor.href = url;
+  return anchor.hostname;
+}
+
+let platform = (function getPlatform() {
+  var ua = navigator.userAgent;
+  if (ua.indexOf('Android') > -1 || ua.indexOf('Adr') > -1) {
+    return 'Android'
+  }
+  if (ua.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
+    return 'iOS'
+  }
+  return 'windows'
+})();
+
+function _generateGUID() {
+  var d = new Date().getTime();
+  var guid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = (d + Math.random() * 16) % 16 | 0;
+    d = Math.floor(d / 16);
+    return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+  })
+  return guid;
+}
+
+function _isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
+}
+
+function _isConnectedTV() {
+  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
+}
+
+function _parseAdSlot(bid) {
+  bid.params.width = 0;
+  bid.params.height = 0;
+  // check if size is mentioned in sizes array. in that case do not check for @ in adslot
+  if (bid.hasOwnProperty('mediaTypes') &&
+    bid.mediaTypes.hasOwnProperty(BANNER) &&
+    bid.mediaTypes.banner.hasOwnProperty('sizes')) {
+    var i = 0;
+    var sizeArray = [];
+    for (; i < bid.mediaTypes.banner.sizes.length; i++) {
+      if (bid.mediaTypes.banner.sizes[i].length === 2) { // sizes[i].length will not be 2 in case where size is set as fluid, we want to skip that entry
+        sizeArray.push(bid.mediaTypes.banner.sizes[i]);
+      }
+    }
+    bid.mediaTypes.banner.sizes = sizeArray;
+    if (bid.mediaTypes.banner.sizes.length >= 1) {
+      // set the first size in sizes array in bid.params.width and bid.params.height. These will be sent as primary size.
+      // The rest of the sizes will be sent in format array.
+      bid.params.width = bid.mediaTypes.banner.sizes[0][0];
+      bid.params.height = bid.mediaTypes.banner.sizes[0][1];
+      bid.mediaTypes.banner.sizes = bid.mediaTypes.banner.sizes.splice(1, bid.mediaTypes.banner.sizes.length - 1);
+    }
+  }
+}
+
+function _initConf(refererInfo) {
+  return {
+    // TODO: do the fallbacks make sense here?
+    pageURL: refererInfo?.page || window.location.href,
+    refURL: refererInfo?.ref || window.document.referrer
+  };
+}
+
+function _getLanguage() {
+  const language = navigator.language ? 'language' : 'userLanguage';
+  return navigator[language].split('-')[0];
+}
+
+function _createOrtbTemplate(conf) {
+  var guid;
+  if (storage.getDataFromLocalStorage('adtrue_user_id') == null) {
+    storage.setDataInLocalStorage('adtrue_user_id', _generateGUID())
+  }
+  guid = storage.getDataFromLocalStorage('adtrue_user_id')
+
+  return {
+    id: '' + new Date().getTime(),
+    at: AUCTION_TYPE,
+    cur: [ADTRUE_CURRENCY],
+    imp: [],
+    site: {
+      page: conf.pageURL,
+      ref: conf.refURL,
+      publisher: {}
+    },
+    device: {
+      ip: '',
+      ua: navigator.userAgent,
+      os: platform,
+      js: 1,
+      dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+      h: screen.height,
+      w: screen.width,
+      language: _getLanguage(),
+      devicetype: _isMobile() ? 1 : _isConnectedTV() ? 3 : 2,
+      geo: {
+        country: '{country_code}',
+        type: 0,
+        ipservice: 1,
+        region: '',
+        city: '',
+      },
+    },
+    user: {
+      id: guid
+    },
+    ext: {}
+  };
+}
+
+function _checkParamDataType(key, value, datatype) {
+  var errMsg = 'Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value;
+  var functionToExecute;
+  switch (datatype) {
+    case DATA_TYPES.BOOLEAN:
+      functionToExecute = isBoolean;
+      break;
+    case DATA_TYPES.NUMBER:
+      functionToExecute = isNumber;
+      break;
+    case DATA_TYPES.STRING:
+      functionToExecute = isStr;
+      break;
+    case DATA_TYPES.ARRAY:
+      functionToExecute = isArray;
+      break;
+  }
+  if (functionToExecute(value)) {
+    return value;
+  }
+  logWarn(LOG_WARN_PREFIX + errMsg);
+  return UNDEFINED;
+}
+
+function _parseNativeResponse(bid, newBid) {
+  newBid.native = {};
+  if (bid.hasOwnProperty('adm')) {
+    var adm = '';
+    try {
+      adm = JSON.parse(bid.adm.replace(/\\/g, ''));
+    } catch (ex) {
+      // logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + newBid.adm);
+      return;
+    }
+    if (adm && adm.native && adm.native.assets && adm.native.assets.length > 0) {
+      newBid.mediaType = NATIVE;
+      for (let i = 0, len = adm.native.assets.length; i < len; i++) {
+        switch (adm.native.assets[i].id) {
+          case NATIVE_ASSETS.TITLE.ID:
+            newBid.native.title = adm.native.assets[i].title && adm.native.assets[i].title.text;
+            break;
+          case NATIVE_ASSETS.IMAGE.ID:
+            newBid.native.image = {
+              url: adm.native.assets[i].img && adm.native.assets[i].img.url,
+              height: adm.native.assets[i].img && adm.native.assets[i].img.h,
+              width: adm.native.assets[i].img && adm.native.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.ICON.ID:
+            newBid.native.icon = {
+              url: adm.native.assets[i].img && adm.native.assets[i].img.url,
+              height: adm.native.assets[i].img && adm.native.assets[i].img.h,
+              width: adm.native.assets[i].img && adm.native.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.SPONSOREDBY.ID:
+          case NATIVE_ASSETS.BODY.ID:
+          case NATIVE_ASSETS.LIKES.ID:
+          case NATIVE_ASSETS.DOWNLOADS.ID:
+          case NATIVE_ASSETS.PRICE:
+          case NATIVE_ASSETS.SALEPRICE.ID:
+          case NATIVE_ASSETS.PHONE.ID:
+          case NATIVE_ASSETS.ADDRESS.ID:
+          case NATIVE_ASSETS.DESC2.ID:
+          case NATIVE_ASSETS.CTA.ID:
+          case NATIVE_ASSETS.RATING.ID:
+          case NATIVE_ASSETS.DISPLAYURL.ID:
+            newBid.native[NATIVE_ASSET_ID_TO_KEY_MAP[adm.native.assets[i].id]] = adm.native.assets[i].data && adm.native.assets[i].data.value;
+            break;
+        }
+      }
+      newBid.native.clickUrl = adm.native.link && adm.native.link.url;
+      newBid.native.clickTrackers = (adm.native.link && adm.native.link.clicktrackers) || [];
+      newBid.native.impressionTrackers = adm.native.imptrackers || [];
+      newBid.native.jstracker = adm.native.jstracker || [];
+      if (!newBid.width) {
+        newBid.width = DEFAULT_WIDTH;
+      }
+      if (!newBid.height) {
+        newBid.height = DEFAULT_HEIGHT;
+      }
+    }
+  }
+}
+
+function _createBannerRequest(bid) {
+  var sizes = bid.mediaTypes.banner.sizes;
+  var format = [];
+  var bannerObj;
+  if (sizes !== UNDEFINED && isArray(sizes)) {
+    bannerObj = {};
+    if (!bid.params.width && !bid.params.height) {
+      if (sizes.length === 0) {
+        // i.e. since bid.params does not have width or height, and length of sizes is 0, need to ignore this banner imp
+        bannerObj = UNDEFINED;
+        logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+        return bannerObj;
+      } else {
+        bannerObj.w = parseInt(sizes[0][0], 10);
+        bannerObj.h = parseInt(sizes[0][1], 10);
+        sizes = sizes.splice(1, sizes.length - 1);
+      }
+    } else {
+      bannerObj.w = bid.params.width;
+      bannerObj.h = bid.params.height;
+    }
+    if (sizes.length > 0) {
+      format = [];
+      sizes.forEach(function (size) {
+        if (size.length > 1) {
+          format.push({w: size[0], h: size[1]});
+        }
+      });
+      if (format.length > 0) {
+        bannerObj.format = format;
+      }
+    }
+    bannerObj.pos = 0;
+    bannerObj.topframe = inIframe() ? 0 : 1;
+  } else {
+    logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+    bannerObj = UNDEFINED;
+  }
+  return bannerObj;
+}
+
+function _createVideoRequest(bid) {
+  var videoData = bid.params.video;
+  var videoObj;
+
+  if (videoData !== UNDEFINED) {
+    videoObj = {};
+    for (var key in VIDEO_CUSTOM_PARAMS) {
+      if (videoData.hasOwnProperty(key)) {
+        videoObj[key] = _checkParamDataType(key, videoData[key], VIDEO_CUSTOM_PARAMS[key]);
+      }
+    }
+    // read playersize and assign to h and w.
+    if (isArray(bid.mediaTypes.video.playerSize[0])) {
+      videoObj.w = parseInt(bid.mediaTypes.video.playerSize[0][0], 10);
+      videoObj.h = parseInt(bid.mediaTypes.video.playerSize[0][1], 10);
+    } else if (isNumber(bid.mediaTypes.video.playerSize[0])) {
+      videoObj.w = parseInt(bid.mediaTypes.video.playerSize[0], 10);
+      videoObj.h = parseInt(bid.mediaTypes.video.playerSize[1], 10);
+    }
+    if (bid.params.video.hasOwnProperty('skippable')) {
+      videoObj.ext = {
+        'video_skippable': bid.params.video.skippable ? 1 : 0
+      };
+    }
+  } else {
+    videoObj = UNDEFINED;
+    logWarn(LOG_WARN_PREFIX + 'Error: Video config params missing for adunit: ' + bid.params.adUnit + ' with mediaType set as video. Ignoring video impression in the adunit.');
+  }
+  return videoObj;
+}
+
+function _checkMediaType(adm, newBid) {
+  var admStr = '';
+  var videoRegex = new RegExp(/VAST\s+version/);
+  newBid.mediaType = BANNER;
+  if (videoRegex.test(adm)) {
+    newBid.mediaType = VIDEO;
+  } else {
+    try {
+      admStr = JSON.parse(adm.replace(/\\/g, ''));
+      if (admStr && admStr.native) {
+        newBid.mediaType = NATIVE;
+      }
+    } catch (e) {
+      logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + adm);
+    }
+  }
+}
+
+function _createImpressionObject(bid, conf) {
+  var impObj = {};
+  var bannerObj;
+  var videoObj;
+  var sizes = bid.hasOwnProperty('sizes') ? bid.sizes : [];
+  var mediaTypes = '';
+  var format = [];
+
+  impObj = {
+    id: bid.bidId,
+    tagid: String(bid.params.zoneId || undefined),
+    bidfloor: 0,
+    secure: 1,
+    ext: {},
+    bidfloorcur: ADTRUE_CURRENCY
+  };
+
+  if (bid.hasOwnProperty('mediaTypes')) {
+    for (mediaTypes in bid.mediaTypes) {
+      switch (mediaTypes) {
+        case BANNER:
+          bannerObj = _createBannerRequest(bid);
+          if (bannerObj !== UNDEFINED) {
+            impObj.banner = bannerObj;
+          }
+          break;
+        case VIDEO:
+          videoObj = _createVideoRequest(bid);
+          if (videoObj !== UNDEFINED) {
+            impObj.video = videoObj;
+          }
+          break;
+      }
+    }
+  } else {
+    // mediaTypes is not present, so this is a banner only impression
+    // this part of code is required for older testcases with no 'mediaTypes' to run succesfully.
+    bannerObj = {
+      pos: 0,
+      w: bid.params.width,
+      h: bid.params.height,
+      topframe: inIframe() ? 0 : 1
+    };
+    if (isArray(sizes) && sizes.length > 1) {
+      sizes = sizes.splice(1, sizes.length - 1);
+      sizes.forEach(size => {
+        format.push({
+          w: size[0],
+          h: size[1]
+        });
+      });
+      bannerObj.format = format;
+    }
+    impObj.banner = bannerObj;
+  }
+
+  return impObj.hasOwnProperty(BANNER) ||
+  impObj.hasOwnProperty(NATIVE) ||
+  impObj.hasOwnProperty(VIDEO) ? impObj : UNDEFINED;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: ['banner', 'video'],
+
+  isBidRequestValid: function (bid) {
+    if (bid && bid.params) {
+      if (!bid.params.zoneId) {
+        logWarn(LOG_WARN_PREFIX + 'Error: missing zoneId');
+        return false;
+      }
+      if (!bid.params.publisherId) {
+        logWarn(LOG_WARN_PREFIX + 'Error: missing publisherId');
+        return false;
+      }
+      if (!isStr(bid.params.publisherId)) {
+        logWarn(LOG_WARN_PREFIX + 'Error: publisherId is mandatory and cannot be numeric');
+        return false;
+      }
+      if (!isStr(bid.params.zoneId)) {
+        logWarn(LOG_WARN_PREFIX + 'Error: zoneId is mandatory and cannot be numeric');
+        return false;
+      }
+      return true;
+    }
+    return false;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let refererInfo;
+    if (bidderRequest && bidderRequest.refererInfo) {
+      refererInfo = bidderRequest.refererInfo;
+    }
+    let conf = _initConf(refererInfo);
+    let payload = _createOrtbTemplate(conf);
+    let bidCurrency = '';
+    let bid;
+    validBidRequests.forEach(originalBid => {
+      bid = deepClone(originalBid);
+      _parseAdSlot(bid);
+
+      conf.zoneId = conf.zoneId || bid.params.zoneId;
+      conf.pubId = conf.pubId || bid.params.publisherId;
+
+      conf.transactionId = bid.transactionId;
+      if (bidCurrency === '') {
+        bidCurrency = bid.params.currency || UNDEFINED;
+      } else if (bid.params.hasOwnProperty('currency') && bidCurrency !== bid.params.currency) {
+        logWarn(LOG_WARN_PREFIX + 'Currency specifier ignored. Only one currency permitted.');
+      }
+      bid.params.currency = bidCurrency;
+
+      var impObj = _createImpressionObject(bid, conf);
+      if (impObj) {
+        payload.imp.push(impObj);
+      }
+    });
+    if (payload.imp.length == 0) {
+      return;
+    }
+    publisherId = conf.pubId.trim();
+    zoneId = conf.zoneId.trim();
+
+    payload.site.publisher.id = conf.pubId.trim();
+    payload.ext.wrapper = {};
+
+    payload.ext.wrapper.transactionId = conf.transactionId;
+    payload.ext.wrapper.wiid = conf.wiid || bidderRequest.auctionId;
+    payload.ext.wrapper.wp = 'pbjs';
+
+    payload.user.geo = {};
+    payload.device.geo = payload.user.geo;
+    payload.site.page = conf.pageURL;
+    payload.site.domain = _getDomainFromURL(payload.site.page);
+
+    if (typeof config.getConfig('content') === 'object') {
+      payload.site.content = config.getConfig('content');
+    }
+
+    if (typeof config.getConfig('device') === 'object') {
+      payload.device = Object.assign(payload.device, config.getConfig('device'));
+    }
+    deepSetValue(payload, 'source.tid', conf.transactionId);
+    // test bids
+    if (window.location.href.indexOf('adtrueTest=true') !== -1) {
+      payload.test = 1;
+    }
+    // adding schain object
+    if (validBidRequests[0].schain) {
+      deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
+    }
+    // Attaching GDPR Consent Params
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // CCPA
+    if (bidderRequest && bidderRequest.uspConsent) {
+      deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+    // coppa compliance
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(payload, 'regs.coppa', 1);
+    }
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: JSON.stringify(payload),
+      bidderRequests: bidderRequest
+    };
+  },
+  interpretResponse: function (serverResponses, bidderRequest) {
+    const bidResponses = [];
+    var respCur = ADTRUE_CURRENCY;
+    let parsedRequest = JSON.parse(bidderRequest.data);
+    let parsedReferrer = parsedRequest.site && parsedRequest.site.ref ? parsedRequest.site.ref : '';
+    try {
+      if (serverResponses.body && serverResponses.body.seatbid && isArray(serverResponses.body.seatbid)) {
+        // Supporting multiple bid responses for same adSize
+        respCur = serverResponses.body.cur || respCur;
+        serverResponses.body.seatbid.forEach(seatbidder => {
+          seatbidder.bid &&
+          isArray(seatbidder.bid) &&
+          seatbidder.bid.forEach(bid => {
+            let newBid = {
+              requestId: bid.impid,
+              cpm: (parseFloat(bid.price) || 0).toFixed(2),
+              width: bid.w,
+              height: bid.h,
+              creativeId: bid.crid || bid.id,
+              dealId: bid.dealid,
+              currency: respCur,
+              netRevenue: NET_REVENUE,
+              ttl: 300,
+              referrer: parsedReferrer,
+              ad: bid.adm,
+              partnerImpId: bid.id || '' // partner impression Id
+            };
+            if (parsedRequest.imp && parsedRequest.imp.length > 0) {
+              parsedRequest.imp.forEach(req => {
+                if (bid.impid === req.id) {
+                  _checkMediaType(bid.adm, newBid);
+                  switch (newBid.mediaType) {
+                    case BANNER:
+                      break;
+                    case VIDEO:
+                      break;
+                    case NATIVE:
+                      _parseNativeResponse(bid, newBid);
+                      break;
+                  }
+                }
+              });
+            }
+            newBid.meta = {};
+            if (bid.ext && bid.ext.dspid) {
+              newBid.meta.networkId = bid.ext.dspid;
+            }
+            if (bid.ext && bid.ext.advid) {
+              newBid.meta.buyerId = bid.ext.advid;
+            }
+            if (bid.adomain && bid.adomain.length > 0) {
+              newBid.meta.advertiserDomains = bid.adomain;
+              newBid.meta.clickUrl = bid.adomain[0];
+            }
+            // adserverTargeting
+            if (seatbidder.ext && seatbidder.ext.buyid) {
+              newBid.adserverTargeting = {
+                'hb_buyid_adtrue': seatbidder.ext.buyid
+              };
+            }
+            bidResponses.push(newBid);
+          });
+        });
+      }
+    } catch (error) {
+      logError(error);
+    }
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+    if (!responses || responses.length === 0 || (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled)) {
+      return [];
+    }
+    return responses.reduce((accum, rsp) => {
+      let cookieSyncs = deepAccess(rsp, 'body.ext.cookie_sync');
+      if (cookieSyncs) {
+        let cookieSyncObjects = cookieSyncs.map(cookieSync => {
+          return {
+            type: SYNC_TYPES[cookieSync.type],
+            url: cookieSync.url +
+              '&publisherId=' + publisherId +
+              '&zoneId=' + zoneId +
+              '&gdpr=' + (gdprConsent && gdprConsent.gdprApplies ? 1 : 0) +
+              '&gdpr_consent=' + encodeURIComponent((gdprConsent ? gdprConsent.consentString : '')) +
+              '&us_privacy=' + encodeURIComponent((uspConsent || '')) +
+              '&coppa=' + (config.getConfig('coppa') === true ? 1 : 0)
+          };
+        });
+        return accum.concat(cookieSyncObjects);
+      }
+    }, []);
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/adtrueBidAdapter.md b/modules/adtrueBidAdapter.md
new file mode 100644
index 00000000000..6d0c6f2c125
--- /dev/null
+++ b/modules/adtrueBidAdapter.md
@@ -0,0 +1,36 @@
+# Overview
+
+```
+Module Name: AdTrue Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: ssp@adtrue.com
+```
+
+# Description
+
+Connects to AdTrue exchange for bids.
+AdTrue bid adapter supports Banner currently.
+
+# Test Parameters
+```
+var adUnits = [
+  {
+    code: 'banner-div',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    bids: [
+      {
+          bidder: 'adtrue',
+          params: {
+              zoneId: '21423', // required, Zone Id provided by AdTrue
+              publisherId: '1491', // required, Publisher Id provided by AdTrue  
+              reserve: 0.1         // optional  
+          }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/aduptechBidAdapter.js b/modules/aduptechBidAdapter.js
index d5b348ee29b..c39d9e14f17 100644
--- a/modules/aduptechBidAdapter.js
+++ b/modules/aduptechBidAdapter.js
@@ -1,20 +1,200 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js'
-import * as utils from '../src/utils.js';
+import {getAdUnitSizes, isArray, isBoolean, isEmpty, isFn, isPlainObject} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 export const BIDDER_CODE = 'aduptech';
-export const PUBLISHER_PLACEHOLDER = '{PUBLISHER}';
-export const ENDPOINT_URL = 'https://rtb.d.adup-tech.com/prebid/' + PUBLISHER_PLACEHOLDER + '_bid';
+export const ENDPOINT_URL_PUBLISHER_PLACEHOLDER = '{PUBLISHER}';
+export const ENDPOINT_URL = 'https://rtb.d.adup-tech.com/prebid/' + ENDPOINT_URL_PUBLISHER_PLACEHOLDER + '_bid';
 export const ENDPOINT_METHOD = 'POST';
 
+/**
+ * Internal utitlity functions
+ */
+export const internal = {
+
+  /**
+   * Extracts the GDPR information from given bidderRequest
+   *
+   * @param {BidderRequest} bidderRequest
+   * @returns {null|Object.<string, string|boolean>}
+   */
+  extractGdpr: (bidderRequest) => {
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      return {
+        consentString: bidderRequest.gdprConsent.consentString,
+        consentRequired: (isBoolean(bidderRequest.gdprConsent.gdprApplies)) ? bidderRequest.gdprConsent.gdprApplies : true
+      };
+    }
+
+    return null;
+  },
+
+  /**
+   * Extracts the pageUrl from given bidderRequest.refererInfo or gobal "pageUrl" config or from (top) window location
+   *
+   * @param {BidderRequest} bidderRequest
+   * @returns {string}
+   */
+  extractPageUrl: (bidderRequest) => {
+    // TODO: does it make sense to fall back here?
+    return bidderRequest?.refererInfo?.page || window.location.href;
+  },
+
+  /**
+   * Extracts the referrer based on given bidderRequest.refererInfo or from (top) document referrer
+   *
+   * @param {BidderRequest} bidderRequest
+   * @returns {string}
+   */
+  extractReferrer: (bidderRequest) => {
+    // TODO: does it make sense to fall back here?
+    return bidderRequest?.refererInfo?.ref || window.document.referrer;
+  },
+
+  /**
+   * Extracts banner config from given bidRequest
+   *
+   * @param {BidRequest} bidRequest
+   * @returns {null|Object.<string, *>}
+   */
+  extractBannerConfig: (bidRequest) => {
+    const sizes = getAdUnitSizes(bidRequest);
+    if (isArray(sizes) && !isEmpty(sizes)) {
+      const banner = { sizes: sizes };
+
+      // try to add floor for each banner size
+      banner.sizes.forEach(size => {
+        const floor = internal.getFloor(bidRequest, { mediaType: BANNER, size });
+        if (floor) {
+          size.push(floor.floor);
+          size.push(floor.currency);
+        }
+      });
+
+      // try to add default floor for banner
+      const floor = internal.getFloor(bidRequest, { mediaType: BANNER, size: '*' });
+      if (floor) {
+        banner.floorPrice = floor.floor;
+        banner.floorCurrency = floor.currency;
+      }
+
+      return banner;
+    }
+
+    return null;
+  },
+
+  /**
+   * Extracts native config from given bidRequest
+   *
+   * @param {BidRequest} bidRequest
+   * @returns {null|Object.<string, *>}
+   */
+  extractNativeConfig: (bidRequest) => {
+    if (bidRequest?.mediaTypes?.native) {
+      const native = bidRequest.mediaTypes.native;
+
+      // try to add default floor for native
+      const floor = internal.getFloor(bidRequest, { mediaType: NATIVE, size: '*' });
+      if (floor) {
+        native.floorPrice = floor.floor;
+        native.floorCurrency = floor.currency;
+      }
+
+      return native;
+    }
+
+    return null;
+  },
+
+  /**
+   * Extracts the bidder params from given bidRequest
+   *
+   * @param {BidRequest} bidRequest
+   * @returns {null|Object.<string, *>}
+   */
+  extractParams: (bidRequest) => {
+    if (bidRequest && bidRequest.params) {
+      return bidRequest.params
+    }
+
+    return null;
+  },
+
+  /**
+   * Try to get floor information via bidRequest.getFloor()
+   *
+   * @param {BidRequest} bidRequest
+   * @param {Object<string, *>} options
+   * @returns {null|Object.<string, *>}
+   */
+  getFloor: (bidRequest, options) => {
+    if (!isFn(bidRequest?.getFloor)) {
+      return null;
+    }
+
+    try {
+      const floor = bidRequest.getFloor(options);
+      if (isPlainObject(floor) && !isNaN(floor.floor)) {
+        return floor;
+      }
+    } catch {}
+
+    return null;
+  },
+
+  /**
+   * Group given array of bidRequests by params.publisher
+   *
+   * @param {BidRequest[]} bidRequests
+   * @returns {Object.<string, BidRequest>}
+   */
+  groupBidRequestsByPublisher: (bidRequests) => {
+    const groupedBidRequests = {};
+
+    if (!bidRequests || isEmpty(bidRequests)) {
+      return groupedBidRequests;
+    }
+
+    bidRequests.forEach(bidRequest => {
+      const publisher = internal.extractParams(bidRequest).publisher;
+      if (!publisher) {
+        return;
+      }
+
+      if (!groupedBidRequests[publisher]) {
+        groupedBidRequests[publisher] = [];
+      }
+
+      groupedBidRequests[publisher].push(bidRequest);
+    });
+
+    return groupedBidRequests;
+  },
+
+  /**
+   * Build ednpoint url based on given publisher code
+   *
+   * @param {string} publisher
+   * @returns {string}
+   */
+  buildEndpointUrl: (publisher) => {
+    return ENDPOINT_URL.replace(ENDPOINT_URL_PUBLISHER_PLACEHOLDER, encodeURIComponent(publisher));
+  },
+}
+
+/**
+ * The bid adapter definition
+ */
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, NATIVE],
 
   /**
    * Validate given bid request
    *
-   * @param {*} bidRequest
+   * @param {BidRequest[]} bidRequest
    * @returns {boolean}
    */
   isBidRequestValid: (bidRequest) => {
@@ -22,12 +202,13 @@ export const spec = {
       return false;
     }
 
-    const sizes = extractSizesFromBidRequest(bidRequest);
-    if (!sizes || sizes.length === 0) {
+    // banner or native config has to be set
+    if (!internal.extractBannerConfig(bidRequest) && !internal.extractNativeConfig(bidRequest)) {
       return false;
     }
 
-    const params = extractParamsFromBidRequest(bidRequest);
+    // publisher and placement param has to be set
+    const params = internal.extractParams(bidRequest);
     if (!params || !params.publisher || !params.placement) {
       return false;
     }
@@ -38,152 +219,134 @@ export const spec = {
   /**
    * Build real bid requests
    *
-   * @param {*} validBidRequests
-   * @param {*} bidderRequest
-   * @returns {*[]}
+   * @param {BidRequest[]} validBidRequests
+   * @param {BidderRequest} bidderRequest
+   * @returns {Object[]}
    */
   buildRequests: (validBidRequests, bidderRequest) => {
-    const bidRequests = [];
-    const gdpr = extractGdprFromBidderRequest(bidderRequest);
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
 
-    validBidRequests.forEach((bidRequest) => {
-      bidRequests.push({
-        url: ENDPOINT_URL.replace(PUBLISHER_PLACEHOLDER, encodeURIComponent(bidRequest.params.publisher)),
+    const requests = [];
+
+    // stop here on invalid or empty data
+    if (!bidderRequest || !validBidRequests || isEmpty(validBidRequests)) {
+      return requests;
+    }
+
+    // collect required data
+    const auctionId = bidderRequest.auctionId;
+    const pageUrl = internal.extractPageUrl(bidderRequest);
+    const referrer = internal.extractReferrer(bidderRequest);
+    const gdpr = internal.extractGdpr(bidderRequest);
+
+    // group bid requests by publisher
+    const groupedBidRequests = internal.groupBidRequestsByPublisher(validBidRequests);
+
+    // build requests
+    for (const publisher in groupedBidRequests) {
+      const request = {
+        url: internal.buildEndpointUrl(publisher),
         method: ENDPOINT_METHOD,
         data: {
+          auctionId: auctionId,
+          pageUrl: pageUrl,
+          referrer: referrer,
+          imp: []
+        }
+      };
+
+      // add gdpr data
+      if (gdpr) {
+        request.data.gdpr = gdpr;
+      }
+
+      // handle multiple bids per request
+      groupedBidRequests[publisher].forEach(bidRequest => {
+        const bid = {
           bidId: bidRequest.bidId,
-          auctionId: bidRequest.auctionId,
           transactionId: bidRequest.transactionId,
           adUnitCode: bidRequest.adUnitCode,
-          pageUrl: extractTopWindowUrlFromBidRequest(bidRequest),
-          referrer: extractTopWindowReferrerFromBidRequest(bidRequest),
-          sizes: extractSizesFromBidRequest(bidRequest),
-          params: extractParamsFromBidRequest(bidRequest),
-          gdpr: gdpr
+          params: internal.extractParams(bidRequest)
+        };
+
+        // add banner config
+        const bannerConfig = internal.extractBannerConfig(bidRequest);
+        if (bannerConfig) {
+          bid.banner = bannerConfig;
+        }
+
+        // add native config
+        const nativeConfig = internal.extractNativeConfig(bidRequest);
+        if (nativeConfig) {
+          bid.native = nativeConfig;
+        }
+
+        // try to add default floor
+        const floor = internal.getFloor(bidRequest, { mediaType: '*', size: '*' });
+        if (floor) {
+          bid.floorPrice = floor.floor;
+          bid.floorCurrency = floor.currency;
         }
+
+        request.data.imp.push(bid);
       });
-    });
 
-    return bidRequests;
+      requests.push(request);
+    }
+
+    return requests;
   },
 
   /**
    * Handle bid response
    *
-   * @param {*} response
-   * @returns {*[]}
+   * @param {Object} response
+   * @returns {Object[]}
    */
   interpretResponse: (response) => {
     const bidResponses = [];
 
-    if (!response.body || !response.body.bid || !response.body.creative) {
+    // stop here on invalid or empty data
+    if (!response?.body?.bids || isEmpty(response.body.bids)) {
       return bidResponses;
     }
 
-    bidResponses.push({
-      requestId: response.body.bid.bidId,
-      cpm: response.body.bid.price,
-      netRevenue: response.body.bid.net,
-      currency: response.body.bid.currency,
-      ttl: response.body.bid.ttl,
-      creativeId: response.body.creative.id,
-      width: response.body.creative.width,
-      height: response.body.creative.height,
-      ad: response.body.creative.html
-    });
-
-    return bidResponses;
-  }
-};
-
-/**
- * Extracts the possible ad unit sizes from given bid request
- *
- * @param {*} bidRequest
- * @returns {number[]}
- */
-export function extractSizesFromBidRequest(bidRequest) {
-  // since pbjs 3.0
-  if (bidRequest && utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes')) {
-    return bidRequest.mediaTypes.banner.sizes;
-
-  // for backward compatibility
-  } else if (bidRequest && bidRequest.sizes) {
-    return bidRequest.sizes;
-
-  // fallback
-  } else {
-    return [];
-  }
-}
+    // parse multiple bids per response
+    response.body.bids.forEach(bid => {
+      if (!bid || !bid.bid || !bid.creative) {
+        return;
+      }
 
-/**
- * Extracts the custom params from given bid request
- *
- * @param {*} bidRequest
- * @returns {*}
- */
-export function extractParamsFromBidRequest(bidRequest) {
-  if (bidRequest && bidRequest.params) {
-    return bidRequest.params
-  } else {
-    return null;
-  }
-}
-
-/**
- * Extracts the GDPR information from given bidder request
- *
- * @param {*} bidderRequest
- * @returns {*}
- */
-export function extractGdprFromBidderRequest(bidderRequest) {
-  let gdpr = null;
-
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    gdpr = {
-      consentString: bidderRequest.gdprConsent.consentString,
-      consentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
-    };
-  }
-
-  return gdpr;
-}
+      const bidResponse = {
+        requestId: bid.bid.bidId,
+        cpm: bid.bid.price,
+        netRevenue: bid.bid.net,
+        currency: bid.bid.currency,
+        ttl: bid.bid.ttl,
+        creativeId: bid.creative.id,
+        meta: {
+          advertiserDomains: bid.creative.advertiserDomains
+        }
+      }
 
-/**
- * Extracts the page url from given bid request or use the (top) window location as fallback
- *
- * @param {*} bidRequest
- * @returns {string}
- */
-export function extractTopWindowUrlFromBidRequest(bidRequest) {
-  if (bidRequest && utils.deepAccess(bidRequest, 'refererInfo.canonicalUrl')) {
-    return bidRequest.refererInfo.canonicalUrl;
-  }
+      if (bid.creative.html) {
+        bidResponse.mediaType = BANNER;
+        bidResponse.ad = bid.creative.html;
+        bidResponse.width = bid.creative.width;
+        bidResponse.height = bid.creative.height;
+      }
 
-  try {
-    return window.top.location.href;
-  } catch (e) {
-    return window.location.href;
-  }
-}
+      if (bid.creative.native) {
+        bidResponse.mediaType = NATIVE;
+        bidResponse.native = bid.creative.native;
+      }
 
-/**
- * Extracts the referrer from given bid request or use the (top) document referrer as fallback
- *
- * @param {*} bidRequest
- * @returns {string}
- */
-export function extractTopWindowReferrerFromBidRequest(bidRequest) {
-  if (bidRequest && utils.deepAccess(bidRequest, 'refererInfo.referer')) {
-    return bidRequest.refererInfo.referer;
-  }
+      bidResponses.push(bidResponse);
+    });
 
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return window.document.referrer;
+    return bidResponses;
   }
-}
+};
 
 registerBidder(spec);
diff --git a/modules/aduptechBidAdapter.md b/modules/aduptechBidAdapter.md
index 281fe24cf9d..25034cecbe8 100644
--- a/modules/aduptechBidAdapter.md
+++ b/modules/aduptechBidAdapter.md
@@ -1,35 +1,86 @@
-# Overview
-```
-Module Name: AdUp Technology Bid Adapter
-Module Type: Bidder Adapter
-Maintainers:
-  - steffen.anders@adup-tech.com
-  - sebastian.briesemeister@adup-tech.com
-  - marten.lietz@adup-tech.com
-```
+# AdUp Technology Bid Adapter
 
-# Description
+## Description
 Connects to AdUp Technology demand sources to fetch bids.
-Please use ```aduptech``` as  bidder code. Only banner formats are supported.
 
-The AdUp Technology bidding adapter requires setup and approval before beginning.
-For more information visit [www.adup-tech.com](https://www.adup-tech.com/en) or contact [info@adup-tech.com](mailto:info@adup-tech.com).
+**Note:** The bid adapter requires correct setup and approval, including an existing publisher account. For more information visit [www.adup-tech.com](https://www.adup-tech.com/en) or contact [info@adup-tech.com](mailto:info@adup-tech.com).
+
+
+## Overview
+- Module Name: AdUp Technology Bid Adapter
+- Module Type: Bidder Adapter
+- Maintainers:
+  - [steffen.anders@adup-tech.com](mailto:steffen.anders@adup-tech.com)
+  - [sebastian.briesemeister@adup-tech.com](mailto:sebastian.briesemeister@adup-tech.com)
+  - [marten.lietz@adup-tech.com](mailto:marten.lietz@adup-tech.com)
+- Bidder code: `aduptech`
+- Supported media types: `banner`, `native`
+
+## Paramters
+| Name | Scope | Description | Example |
+| :--- | :---- | :---------- | :------ |
+| `publisher` | required | Unique publisher identifier | `'prebid'` |
+| `placement` | required | Unique placement identifier per publisher | `'1234'` |
+| `query` | optional | Semicolon separated list of keywords | `'urlaub;ibiza;mallorca'` |
+| `adtest` | optional | Deactivates tracking of impressions and clicks. **Should only be used for testing purposes!** | `true` |
+
 
-# Test Parameters
+## Examples
+
+### Banner
 ```js
 var adUnits = [
    {
-        code: 'banner',
+        code: "example1",
         mediaTypes: {
             banner: {
                 sizes: [[300, 250], [300, 600]],
             }
         },
         bids: [{
-            bidder: 'aduptech',
+            bidder: "aduptech",
+            params: {
+                publisher: "prebid",
+                placement: "12345"
+            }
+        }]
+   }
+];
+```
+
+### Native
+```js
+var adUnits = [
+   {
+        code: "example2",
+        mediaTypes: {
+            native: {
+                image: {
+                    required: true,
+                    sizes: [150, 150]
+                },
+                title: {
+                    required: true
+                },
+                body: {
+                    required: true
+                },
+                clickUrl: {
+                    required: true
+                },
+                displayUrl: {
+                    required: true
+                },
+                sponsoredBy: {
+                    required: true
+                }
+            }
+        },
+        bids: [{
+            bidder: "aduptech",
             params: {
-                publisher: 'prebid',
-                placement: '12345'
+                publisher: "prebid",
+                placement: "12345"
             }
         }]
    }
diff --git a/modules/advangelistsBidAdapter.js b/modules/advangelistsBidAdapter.js
index 746baa9ae35..4963150caed 100755
--- a/modules/advangelistsBidAdapter.js
+++ b/modules/advangelistsBidAdapter.js
@@ -1,9 +1,7 @@
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {deepAccess, generateUUID, isEmpty, isFn, parseSizesInput, parseUrl} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {find, includes} from '../src/polyfill.js';
 
 const ADAPTER_VERSION = '1.0';
 const BIDDER_CODE = 'advangelists';
@@ -11,7 +9,7 @@ const BIDDER_CODE = 'advangelists';
 export const VIDEO_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';// 0cf8d6d643e13d86a5b6374148a4afac';
 export const BANNER_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';// 0cf8d6d643e13d86a5b6374148a4afac';
 export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/loader/outstream.js';
-export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'skip'];
+export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'skip', 'playerSize', 'context'];
 export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
 
 let pubid = '';
@@ -56,7 +54,7 @@ export const spec = {
 
   interpretResponse(serverResponse, {bidRequest}) {
     let response = serverResponse.body;
-    if (response !== null && utils.isEmpty(response) == false) {
+    if (response !== null && isEmpty(response) == false) {
       if (isVideoBid(bidRequest)) {
         let bidResponse = {
           requestId: response.id,
@@ -66,6 +64,7 @@ export const spec = {
           height: response.seatbid[0].bid[0].h,
           ttl: response.seatbid[0].bid[0].ttl || 60,
           creativeId: response.seatbid[0].bid[0].crid,
+          meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
           currency: response.cur,
           mediaType: VIDEO,
           netRevenue: true
@@ -92,6 +91,7 @@ export const spec = {
           ttl: response.seatbid[0].bid[0].ttl || 60,
           creativeId: response.seatbid[0].bid[0].crid,
           currency: response.cur,
+          meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
           mediaType: BANNER,
           netRevenue: true
         }
@@ -101,11 +101,21 @@ export const spec = {
 };
 
 function isBannerBid(bid) {
-  return utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
+  return deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
 }
 
 function isVideoBid(bid) {
-  return utils.deepAccess(bid, 'mediaTypes.video');
+  return deepAccess(bid, 'mediaTypes.video');
+}
+
+function getBannerBidFloor(bid) {
+  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'banner', size: '*' }) : {};
+  return floorInfo.floor || getBannerBidParam(bid, 'bidfloor');
+}
+
+function getVideoBidFloor(bid) {
+  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'video', size: '*' }) : {};
+  return floorInfo.floor || getVideoBidParam(bid, 'bidfloor');
 }
 
 function isVideoBidValid(bid) {
@@ -117,11 +127,11 @@ function isBannerBidValid(bid) {
 }
 
 function getVideoBidParam(bid, key) {
-  return utils.deepAccess(bid, 'params.video.' + key) || utils.deepAccess(bid, 'params.' + key);
+  return deepAccess(bid, 'params.video.' + key) || deepAccess(bid, 'params.' + key);
 }
 
 function getBannerBidParam(bid, key) {
-  return utils.deepAccess(bid, 'params.banner.' + key) || utils.deepAccess(bid, 'params.' + key);
+  return deepAccess(bid, 'params.banner.' + key) || deepAccess(bid, 'params.' + key);
 }
 
 function isMobile() {
@@ -172,7 +182,7 @@ function getFirstSize(sizes) {
 }
 
 function parseSizes(sizes) {
-  return utils.parseSizesInput(sizes).map(size => {
+  return parseSizesInput(sizes).map(size => {
     let [ width, height ] = size.split('x');
     return {
       w: parseInt(width, 10) || undefined,
@@ -182,37 +192,40 @@ function parseSizes(sizes) {
 }
 
 function getVideoSizes(bid) {
-  return parseSizes(utils.deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
+  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
 }
 
 function getBannerSizes(bid) {
-  return parseSizes(utils.deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
+  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
 }
 
-function getTopWindowReferrer() {
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return '';
-  }
+function getTopWindowReferrer(bidderRequest) {
+  return bidderRequest?.refererInfo?.ref || '';
 }
 
 function getVideoTargetingParams(bid) {
-  return Object.keys(Object(bid.params.video))
-    .filter(param => includes(VIDEO_TARGETING, param))
-    .reduce((obj, param) => {
-      obj[ param ] = bid.params.video[ param ];
-      return obj;
-    }, {});
+  const result = {};
+  const excludeProps = ['playerSize', 'context', 'w', 'h'];
+  Object.keys(Object(bid.mediaTypes.video))
+    .filter(key => !includes(excludeProps, key))
+    .forEach(key => {
+      result[ key ] = bid.mediaTypes.video[ key ];
+    });
+  Object.keys(Object(bid.params.video))
+    .filter(key => includes(VIDEO_TARGETING, key))
+    .forEach(key => {
+      result[ key ] = bid.params.video[ key ];
+    });
+  return result;
 }
 
 function createVideoRequestData(bid, bidderRequest) {
   let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
+  let topReferrer = getTopWindowReferrer(bidderRequest);
 
   let sizes = getVideoSizes(bid);
   let firstSize = getFirstSize(sizes);
-
+  let bidfloor = (getVideoBidFloor(bid) == null || typeof getVideoBidFloor(bid) == 'undefined') ? 2 : getVideoBidFloor(bid);
   let video = getVideoTargetingParams(bid);
   const o = {
     'device': {
@@ -267,11 +280,11 @@ function createVideoRequestData(bid, bidderRequest) {
       'displaymanager': '' + BIDDER_CODE,
       'displaymanagerver': '' + ADAPTER_VERSION,
       'tagId': placement,
-      'bidfloor': 2.0,
+      'bidfloor': bidfloor,
       'bidfloorcur': 'USD',
       'secure': secure,
       'video': Object.assign({
-        'id': utils.generateUUID(),
+        'id': generateUUID(),
         'pos': 0,
         'w': firstSize.w,
         'h': firstSize.h,
@@ -291,15 +304,15 @@ function createVideoRequestData(bid, bidderRequest) {
 }
 
 function getTopWindowLocation(bidderRequest) {
-  let url = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
-  return utils.parseUrl(config.getConfig('pageUrl') || url, { decodeSearchAsString: true });
+  return parseUrl(bidderRequest?.refererInfo?.page, {decodeSearchAsString: true});
 }
 
 function createBannerRequestData(bid, bidderRequest) {
   let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
+  let topReferrer = getTopWindowReferrer(bidderRequest);
 
   let sizes = getBannerSizes(bid);
+  let bidfloor = (getBannerBidFloor(bid) == null || typeof getBannerBidFloor(bid) == 'undefined') ? 2 : getBannerBidFloor(bid);
 
   const o = {
     'device': {
@@ -354,11 +367,11 @@ function createBannerRequestData(bid, bidderRequest) {
       'displaymanager': '' + BIDDER_CODE,
       'displaymanagerver': '' + ADAPTER_VERSION,
       'tagId': placement,
-      'bidfloor': 2.0,
+      'bidfloor': bidfloor,
       'bidfloorcur': 'USD',
       'secure': secure,
       'banner': {
-        'id': utils.generateUUID(),
+        'id': generateUUID(),
         'pos': 0,
         'w': size['w'],
         'h': size['h']
diff --git a/modules/advangelistsBidAdapter.md b/modules/advangelistsBidAdapter.md
index 1765241eaf3..04537ff677d 100755
--- a/modules/advangelistsBidAdapter.md
+++ b/modules/advangelistsBidAdapter.md
@@ -42,7 +42,11 @@ var videoAdUnit = {
 	mediaTypes: {
 	  video: {
 	  	playerSize : [[320, 480]], 
-	  	context: 'instream'
+	  	context: 'instream',
+		  skip: 1,
+      mimes : ['video/mp4', 'application/javascript'],
+      playbackmethod : [2,6],
+      maxduration: 30
 	  }
 	},
     bids: [
@@ -50,14 +54,7 @@ var videoAdUnit = {
       	bidder: 'advangelists',
       	params: {
         	pubid: '8537f00948fc37cc03c5f0f88e198a76',
-        	placement: 1234,
-        	video: {
-            	id: 123,
-            	skip: 1,
-            	mimes : ['video/mp4', 'application/javascript'],
-            	playbackmethod : [2,6],
-            	maxduration: 30
-          	}
+        	placement: 1234
       	}
       }
     ]
diff --git a/modules/advenueBidAdapter.js b/modules/advenueBidAdapter.js
deleted file mode 100644
index d7fa614b0a7..00000000000
--- a/modules/advenueBidAdapter.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-
-const BIDDER_CODE = 'advenue';
-const URL_MULTI = 'https://ssp.advenuemedia.co.uk/?c=o&m=multi';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId &&
-        bid.params &&
-        !isNaN(bid.params.placementId) &&
-        spec.supportedMediaTypes.indexOf(bid.params.traffic) !== -1
-    );
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: (validBidRequests, bidderRequest) => {
-    let winTop;
-    try {
-      winTop = window.top;
-      winTop.location.toString();
-    } catch (e) {
-      utils.logMessage(e);
-      winTop = window;
-    };
-
-    const location = bidderRequest ? new URL(bidderRequest.refererInfo.referer) : winTop.location;
-    const placements = [];
-    const request = {
-      'secure': (location.protocol === 'https:') ? 1 : 0,
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements
-    };
-
-    for (let i = 0; i < validBidRequests.length; i++) {
-      const bid = validBidRequests[i];
-      const params = bid.params;
-      placements.push({
-        placementId: params.placementId,
-        bidId: bid.bidId,
-        sizes: bid.sizes,
-        traffic: params.traffic
-      });
-    }
-    return {
-      method: 'POST',
-      url: URL_MULTI,
-      data: request
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: (serverResponse) => {
-    try {
-      serverResponse = serverResponse.body;
-    } catch (e) {
-      utils.logMessage(e);
-    };
-    return serverResponse;
-  },
-};
-
-registerBidder(spec);
diff --git a/modules/advenueBidAdapter.md b/modules/advenueBidAdapter.md
deleted file mode 100644
index ec5287330db..00000000000
--- a/modules/advenueBidAdapter.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Overview
-
-```
-Module Name: Advenue SSP Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: dev.advenue@gmail.com
-```
-
-# Description
-
-Module that connects to Advenue SSP demand sources
-
-# Test Parameters
-```
-    var adUnits = [{
-                code: 'placementCode',
-                sizes: [[300, 250]],
-                bids: [{
-                        bidder: 'advenue',
-                        params: {
-                            placementId: 0,
-                            traffic: 'banner'
-                        }
-                    }]
-                }
-            ];
-```
diff --git a/modules/advertlyBidAdapter.js b/modules/advertlyBidAdapter.js
deleted file mode 100755
index 973b6dd0742..00000000000
--- a/modules/advertlyBidAdapter.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import * as utils from '../src/utils.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import { ajax } from '../src/ajax.js';
-import {Renderer} from '../src/Renderer.js';
-
-const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
-const BIDDER_CODE = 'advertly';
-const DOMAIN = 'https://api.advertly.com/';
-const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
-
-function isBidRequestValid(bid) {
-  return (typeof bid.params !== 'undefined' && parseInt(utils.getValue(bid.params, 'publisherId')) > 0);
-}
-
-function buildRequests(validBidRequests) {
-  return {
-    method: 'POST',
-    url: DOMAIN + 'www/admin/plugins/Prebid/getAd.php',
-    options: {
-      withCredentials: false,
-      crossOrigin: true
-    },
-    data: validBidRequests,
-  };
-}
-
-function interpretResponse(serverResponse, request) {
-  const response = serverResponse.body;
-  const bidResponses = [];
-  var bidRequestResponses = [];
-  utils._each(response, function(bidAd) {
-    let bnd = {};
-    Object.assign(bnd, bidAd);
-    bnd.adResponse = {
-      content: bidAd.vastXml,
-      height: bidAd.height,
-      width: bidAd.width
-    };
-    bnd.ttl = config.getConfig('_bidderTimeout')
-    bnd.renderer = bidAd.context === 'outstream' ? createRenderer(bidAd, RENDERER_URL) : undefined;
-    bidResponses.push(bnd);
-  });
-
-  bidRequestResponses.push({
-    function: 'saveResponses',
-    request: request,
-    response: bidResponses
-  });
-  sendResponseToServer(bidRequestResponses);
-  return bidResponses;
-}
-
-function outstreamRender(bidAd) {
-  bidAd.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      sizes: [bidAd.width, bidAd.height],
-      width: bidAd.width,
-      height: bidAd.height,
-      targetId: bidAd.adUnitCode,
-      adResponse: bidAd.adResponse,
-      rendererOptions: {
-        showVolume: false,
-        allowFullscreen: false
-      }
-    });
-  });
-}
-
-function createRenderer(bidAd, url) {
-  const renderer = Renderer.install({
-    id: bidAd.adUnitCode,
-    url: url,
-    loaded: false,
-    config: {'player_height': bidAd.height, 'player_width': bidAd.width},
-    adUnitCode: bidAd.adUnitCode
-  });
-  try {
-    renderer.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-  return renderer;
-}
-
-function onBidWon(bid) {
-  let wonBids = [];
-  wonBids.push(bid);
-  wonBids[0].function = 'onBidWon';
-  sendResponseToServer(wonBids);
-}
-
-function onTimeout(details) {
-  details.unshift({ 'function': 'onTimeout' });
-  sendResponseToServer(details);
-}
-
-function sendResponseToServer(data) {
-  ajax(DOMAIN + 'www/admin/plugins/Prebid/tracking/track.php', null, JSON.stringify(data), {
-    withCredentials: false,
-    method: 'POST',
-    crossOrigin: true
-  });
-}
-
-function getUserSyncs(syncOptions) {
-  if (syncOptions.iframeEnabled) {
-    return [{
-      type: 'iframe',
-      url: DOMAIN + 'www/admin/plugins/Prebid/userSync.php'
-    }];
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: SUPPORTED_AD_TYPES,
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs,
-  onBidWon,
-  onTimeout
-};
-
-registerBidder(spec);
diff --git a/modules/advertlyBidAdapter.md b/modules/advertlyBidAdapter.md
deleted file mode 100755
index b6cc3bfe71d..00000000000
--- a/modules/advertlyBidAdapter.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Overview
-
-```
-Module Name:  Advertly Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer :  support@advertly.com
-```
-
-# Description
-
-Connects to Advertly Ad Server for bids.
-
-advertly bid adapter supports Banner and Video.
-
-# Test Parameters
-```
- var adUnits = [
-   //bannner object
-   {
-          code: 'banner-ad-slot',
-          mediaTypes: {
-            banner: {
-              sizes: [[300, 250], [300,600]],
-            }
-          },
-          bids: [{
-            bidder: 'advertly',
-            params: {
-              publisherId: 2
-            }
-          }]
-  
-        },
-      //video object
-      {
-         code: 'video-ad-slot',
-         mediaTypes: {
-              video: {
-                context: 'instream',
-                playerSize: [640, 480],
-              },
-            },
-            bids: [{
-              bidder: "advertly",
-              params: {
-                publisherId: 2
-              }
-            }]
-          }];
-```
diff --git a/modules/adxcgAnalyticsAdapter.js b/modules/adxcgAnalyticsAdapter.js
index 9f514c545a1..f3bb1270334 100644
--- a/modules/adxcgAnalyticsAdapter.js
+++ b/modules/adxcgAnalyticsAdapter.js
@@ -1,8 +1,8 @@
+import { parseSizesInput, uniques, buildUrl, logError } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import * as utils from '../src/utils.js';
 
 /**
  * Analytics adapter from adxcg.com
@@ -32,7 +32,7 @@ var adxcgAnalyticsAdapter = Object.assign(adapter(
       case CONSTANTS.EVENTS.BID_ADJUSTMENT:
         break;
       case CONSTANTS.EVENTS.BID_TIMEOUT:
-        adxcgAnalyticsAdapter.context.events.bidTimeout = args.map(item => item.bidder).filter(utils.uniques);
+        adxcgAnalyticsAdapter.context.events.bidTimeout = args.map(item => item.bidder).filter(uniques);
         break;
       case CONSTANTS.EVENTS.BIDDER_DONE:
         break;
@@ -67,7 +67,7 @@ function mapBidRequested (bidRequests) {
         adUnitCode: bid.adUnitCode,
         bidId: bid.bidId,
         start: bid.startTime,
-        sizes: utils.parseSizesInput(bid.sizes).toString(),
+        sizes: parseSizesInput(bid.sizes).toString(),
         params: bid.params
       };
     }),
@@ -112,7 +112,7 @@ function mapBidWon (bidResponse) {
 }
 
 function send (data) {
-  let adxcgAnalyticsRequestUrl = utils.buildUrl({
+  let adxcgAnalyticsRequestUrl = buildUrl({
     protocol: 'https',
     hostname: adxcgAnalyticsAdapter.context.host,
     pathname: '/pbrx/v2',
@@ -143,7 +143,7 @@ adxcgAnalyticsAdapter.context = {};
 adxcgAnalyticsAdapter.originEnableAnalytics = adxcgAnalyticsAdapter.enableAnalytics;
 adxcgAnalyticsAdapter.enableAnalytics = function (config) {
   if (!config.options.publisherId) {
-    utils.logError('PublisherId option is not defined. Analytics won\'t work');
+    logError('PublisherId option is not defined. Analytics won\'t work');
     return;
   }
 
diff --git a/modules/adxcgBidAdapter.js b/modules/adxcgBidAdapter.js
index 2d5c64dfe53..564960cf2c9 100644
--- a/modules/adxcgBidAdapter.js
+++ b/modules/adxcgBidAdapter.js
@@ -1,303 +1,366 @@
-import { config } from '../src/config.js'
-import * as utils from '../src/utils.js'
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'
-import includes from 'core-js-pure/features/array/includes.js'
-
-/**
- * Adapter for requesting bids from adxcg.net
- * updated to latest prebid repo on 2017.10.20
- * updated for gdpr compliance on 2018.05.22 -requires gdpr compliance module
- * updated to pass aditional auction and impression level parameters. added pass for video targeting parameters
- * updated to fix native support for image width/height and icon 2019.03.17
- * updated support for userid - pubcid,ttid 2019.05.28
- * updated to support prebid 3.0 -  remove non https, move to banner.xx.sizes, remove utils.getTopWindowLocation,remove utils.getTopWindowUrl(),remove utils.getTopWindowReferrer()
- */
-
-const BIDDER_CODE = 'adxcg'
-const SUPPORTED_AD_TYPES = [BANNER, VIDEO, NATIVE]
-const SOURCE = 'pbjs10'
-const VIDEO_TARGETING = ['id', 'mimes', 'minduration', 'maxduration', 'startdelay', 'skippable', 'playback_method', 'frameworks']
-const USER_PARAMS_AUCTION = ['forcedDspIds', 'forcedCampaignIds', 'forcedCreativeIds', 'gender', 'dnt', 'language']
-const USER_PARAMS_BID = ['lineparam1', 'lineparam2', 'lineparam3']
-const BIDADAPTERVERSION = 'r20191128PB30'
+// jshint esversion: 6, es3: false, node: true
+'use strict';
+
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {
+  _map,
+  deepAccess,
+  deepSetValue,
+  getDNT,
+  isArray,
+  isPlainObject,
+  isStr,
+  mergeDeep,
+  parseSizesInput,
+  replaceAuctionPrice,
+  triggerPixel
+} from '../src/utils.js';
+import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const { getConfig } = config;
+
+const BIDDER_CODE = 'adxcg';
+const SECURE_BID_URL = 'https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1';
+
+const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
+const NATIVE_PARAMS = {
+  title: {
+    id: 0,
+    name: 'title'
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img'
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1
+  },
+  body: {
+    id: 4,
+    name: 'data',
+    type: 2
+  },
+  cta: {
+    id: 1,
+    type: 12,
+    name: 'data'
+  }
+};
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: SUPPORTED_AD_TYPES,
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bid) {
-    if (!bid || !bid.params) {
-      utils.logWarn(BIDDER_CODE + ': Missing bid parameters')
-      return false
-    }
+  supportedMediaTypes: [ NATIVE, BANNER, VIDEO ],
+  isBidRequestValid: (bid) => {
+    const params = bid.params || {};
+    const { adzoneid } = params;
+    return !!(adzoneid);
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
 
-    if (!utils.isStr(bid.params.adzoneid)) {
-      utils.logWarn(BIDDER_CODE + ': adzoneid must be specified as a string')
-      return false
-    }
+    let app, site;
+
+    const commonFpd = bidderRequest.ortb2 || {};
+    let { user } = commonFpd;
 
-    if (isVideoRequest(bid)) {
-      if (!bid.params.video.mimes) {
-        // Give a warning but let it pass
-        utils.logWarn(BIDDER_CODE + ': mimes should be specified for videos')
-      } else if (!utils.isArray(bid.params.video.mimes) || !bid.params.video.mimes.every(s => utils.isStr(s))) {
-        utils.logWarn(BIDDER_CODE + ': mimes must be an array of strings')
-        return false
+    if (typeof getConfig('app') === 'object') {
+      app = getConfig('app') || {};
+      if (commonFpd.app) {
+        mergeDeep(app, commonFpd.app);
+      }
+    } else {
+      site = getConfig('site') || {};
+      if (commonFpd.site) {
+        mergeDeep(site, commonFpd.site);
       }
 
-      const context = utils.deepAccess(bid, 'mediaTypes.video.context')
-      if (context !== 'instream') {
-        utils.logWarn(BIDDER_CODE + ': video context must be valid - instream')
-        return false
+      if (!site.page) {
+        site.page = bidderRequest.refererInfo.page;
+        site.domain = bidderRequest.refererInfo.domain;
       }
     }
 
-    return true
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * an array of validBidRequests
-   * Info describing the request to the server.
-   */
-  buildRequests: function (validBidRequests, bidderRequest) {
-    utils.logMessage(`buildRequests: ${JSON.stringify(validBidRequests)}`)
-
-    let dt = new Date()
-    let ratio = window.devicePixelRatio || 1
-    let iobavailable = window && window.IntersectionObserver && window.IntersectionObserverEntry && window.IntersectionObserverEntry.prototype && 'intersectionRatio' in window.IntersectionObserverEntry.prototype
-
-    let bt = config.getConfig('bidderTimeout')
-    if (window.PREBID_TIMEOUT) {
-      bt = Math.min(window.PREBID_TIMEOUT, bt)
-    }
+    const device = getConfig('device') || {};
+    device.w = device.w || window.innerWidth;
+    device.h = device.h || window.innerHeight;
+    device.ua = device.ua || navigator.userAgent;
+    device.dnt = getDNT() ? 1 : 0;
+    device.language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+
+    const tid = bidderRequest.auctionId;
+    const test = setOnAny(validBidRequests, 'params.test');
+    const currency = getConfig('currency.adServerCurrency');
+    const cur = currency && [ currency ];
+    const eids = setOnAny(validBidRequests, 'userIdAsEids');
+    const schain = setOnAny(validBidRequests, 'schain');
+
+    const imp = validBidRequests.map((bid, id) => {
+      const floorInfo = bid.getFloor ? bid.getFloor({
+        currency: currency || 'USD'
+      }) : {};
+      const bidfloor = floorInfo.floor;
+      const bidfloorcur = floorInfo.currency;
+      const { adzoneid } = bid.params;
+
+      const imp = {
+        id: id + 1,
+        tagid: adzoneid,
+        secure: 1,
+        bidfloor,
+        bidfloorcur,
+        ext: {
+        }
+      };
+
+      const assets = _map(bid.nativeParams, (bidParams, key) => {
+        const props = NATIVE_PARAMS[key];
+        const asset = {
+          required: bidParams.required & 1,
+        };
+        if (props) {
+          asset.id = props.id;
+          let wmin, hmin, w, h;
+          let aRatios = bidParams.aspect_ratios;
+
+          if (aRatios && aRatios[0]) {
+            aRatios = aRatios[0];
+            wmin = aRatios.min_width || 0;
+            hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+          }
 
-    // add common parameters
-    let beaconParams = {
-      renderformat: 'javascript',
-      ver: BIDADAPTERVERSION,
-      secure: '1',
-      source: SOURCE,
-      uw: window.screen.width,
-      uh: window.screen.height,
-      dpr: ratio,
-      bt: bt,
-      isinframe: utils.inIframe(),
-      cookies: utils.checkCookieSupport() ? '1' : '0',
-      tz: dt.getTimezoneOffset(),
-      dt: utils.timestamp(),
-      iob: iobavailable ? '1' : '0',
-      pbjs: '$prebid.version$',
-      rndid: Math.floor(Math.random() * (999999 - 100000 + 1)) + 100000
-    }
+          if (bidParams.sizes) {
+            const sizes = flatten(bidParams.sizes);
+            w = sizes[0];
+            h = sizes[1];
+          }
 
-    const referrer = utils.deepAccess(bidderRequest, 'refererInfo.referer');
-    const page = utils.deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || config.getConfig('pageUrl') || utils.deepAccess(window, 'location.href');
-    beaconParams.ref = encodeURIComponent(referrer);
-    beaconParams.url = encodeURIComponent(page);
+          asset[props.name] = {
+            len: bidParams.len,
+            type: props.type,
+            wmin,
+            hmin,
+            w,
+            h
+          };
 
-    if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
-      beaconParams.gdpr = bidderRequest.gdprConsent.gdprApplies ? '1' : '0'
-      beaconParams.gdpr_consent = bidderRequest.gdprConsent.consentString
-    }
+          return asset;
+        }
+      }).filter(Boolean);
 
-    let biddercustom = config.getConfig(BIDDER_CODE)
-    if (biddercustom) {
-      Object.keys(biddercustom)
-        .filter(param => includes(USER_PARAMS_AUCTION, param))
-        .forEach(param => beaconParams[param] = encodeURIComponent(biddercustom[param]))
-    }
+      if (assets.length) {
+        imp.native = {
+          request: JSON.stringify({assets: assets})
+        };
+      }
 
-    // per impression parameters
-    let adZoneIds = []
-    let prebidBidIds = []
-    let sizes = []
-    let bidfloors = []
+      const bannerParams = deepAccess(bid, 'mediaTypes.banner');
 
-    validBidRequests.forEach((bid, index) => {
-      adZoneIds.push(utils.getBidIdParameter('adzoneid', bid.params))
-      prebidBidIds.push(bid.bidId)
+      if (bannerParams && bannerParams.sizes) {
+        const sizes = parseSizesInput(bannerParams.sizes);
+        const format = sizes.map(size => {
+          const [ width, height ] = size.split('x');
+          const w = parseInt(width, 10);
+          const h = parseInt(height, 10);
+          return { w, h };
+        });
 
-      if (isBannerRequest(bid)) {
-        sizes.push(utils.parseSizesInput(bid.mediaTypes.banner.sizes).join('|'))
+        imp.banner = {
+          format
+        };
       }
 
-      if (isNativeRequest(bid)) {
-        sizes.push('0x0')
+      const videoParams = deepAccess(bid, 'mediaTypes.video');
+      if (videoParams) {
+        imp.video = videoParams;
       }
 
-      let bidfloor = utils.getBidIdParameter('bidfloor', bid.params) || 0
-      bidfloors.push(bidfloor)
-      // copy video params
-      if (isVideoRequest(bid)) {
-        if (bid.params.video) {
-          Object.keys(bid.params.video)
-            .filter(param => includes(VIDEO_TARGETING, param))
-            .forEach(param => beaconParams['video.' + param + '.' + index] = encodeURIComponent(bid.params.video[param]))
+      return imp;
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site,
+      app,
+      user,
+      geo: { utcoffset: new Date().getTimezoneOffset() },
+      device,
+      source: { tid, fd: 1 },
+      ext: {
+        prebid: {
+          channel: {
+            name: 'pbjs',
+            version: '$prebid.version$'
+          }
         }
-        // copy video context params
-        beaconParams['video.context' + '.' + index] = utils.deepAccess(bid, 'mediaTypes.video.context')
-        sizes.push(utils.parseSizesInput(bid.mediaTypes.video.playerSize).join('|'))
-      }
-
-      // copy all custom parameters impression level parameters not supported above
-      let customBidParams = utils.getBidIdParameter('custom', bid.params) || {}
-      if (customBidParams) {
-        Object.keys(customBidParams)
-          .filter(param => includes(USER_PARAMS_BID, param))
-          .forEach(param => beaconParams[param + '.' + index] = encodeURIComponent(customBidParams[param]))
-      }
-    })
-
-    beaconParams.adzoneid = adZoneIds.join(',')
-    beaconParams.format = sizes.join(',')
-    beaconParams.prebidBidIds = prebidBidIds.join(',')
-    beaconParams.bidfloors = bidfloors.join(',')
-
-    if (utils.isStr(utils.deepAccess(validBidRequests, '0.userId.pubcid'))) {
-      beaconParams.pubcid = validBidRequests[0].userId.pubcid;
+      },
+      cur,
+      imp
+    };
+
+    if (test) {
+      request.is_debug = !!test;
+      request.test = 1;
     }
-
-    if (utils.isStr(utils.deepAccess(validBidRequests, '0.userId.tdid'))) {
-      beaconParams.tdid = validBidRequests[0].userId.tdid;
+    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
+      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1);
     }
 
-    if (utils.isStr(utils.deepAccess(validBidRequests, '0.userId.id5id'))) {
-      beaconParams.id5id = validBidRequests[0].userId.id5id;
+    if (bidderRequest.uspConsent) {
+      deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     }
 
-    if (utils.isStr(utils.deepAccess(validBidRequests, '0.userId.idl_env'))) {
-      beaconParams.idl_env = validBidRequests[0].userId.idl_env;
+    if (eids) {
+      deepSetValue(request, 'user.ext.eids', eids);
     }
 
-    let adxcgRequestUrl = utils.buildUrl({
-      protocol: 'https',
-      hostname: 'hbps.adxcg.net',
-      pathname: '/get/adi',
-      search: beaconParams
-    })
+    if (schain) {
+      deepSetValue(request, 'source.ext.schain', schain);
+    }
 
     return {
-      contentType: 'text/plain',
-      method: 'GET',
-      url: adxcgRequestUrl,
-      withCredentials: true
-    }
+      method: 'POST',
+      url: SECURE_BID_URL,
+      data: JSON.stringify(request),
+      options: {
+        contentType: 'application/json'
+      },
+      bids: validBidRequests
+    };
   },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {bidRequests[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse:
-
-    function (serverResponse, bidRequests) {
-      let bids = []
-
-      serverResponse = serverResponse.body
-      if (serverResponse) {
-        serverResponse.forEach(serverResponseOneItem => {
-          let bid = {}
-
-          bid.requestId = serverResponseOneItem.bidId
-          bid.cpm = serverResponseOneItem.cpm
-          bid.creativeId = parseInt(serverResponseOneItem.creativeId)
-          bid.currency = serverResponseOneItem.currency ? serverResponseOneItem.currency : 'USD'
-          bid.netRevenue = serverResponseOneItem.netRevenue ? serverResponseOneItem.netRevenue : true
-          bid.ttl = serverResponseOneItem.ttl ? serverResponseOneItem.ttl : 300
-
-          if (serverResponseOneItem.deal_id != null && serverResponseOneItem.deal_id.trim().length > 0) {
-            bid.dealId = serverResponseOneItem.deal_id
-          }
+  interpretResponse: function(serverResponse, { bids }) {
+    if (!serverResponse.body) {
+      return;
+    }
+    const { seatbid, cur } = serverResponse.body;
+
+    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
+      result[bid.impid - 1] = bid;
+      return result;
+    }, []);
+
+    return bids.map((bid, id) => {
+      const bidResponse = bidResponses[id];
+      if (bidResponse) {
+        const mediaType = deepAccess(bidResponse, 'ext.crType');
+        const result = {
+          requestId: bid.bidId,
+          cpm: bidResponse.price,
+          creativeId: bidResponse.crid,
+          ttl: bidResponse.ttl ? bidResponse.ttl : 300,
+          netRevenue: bid.netRevenue === 'net',
+          currency: cur,
+          burl: bid.burl || '',
+          mediaType: mediaType,
+          width: bidResponse.w,
+          height: bidResponse.h,
+          dealId: bidResponse.dealid,
+        };
+
+        deepSetValue(result, 'meta.mediaType', mediaType);
+        if (isArray(bidResponse.adomain)) {
+          deepSetValue(result, 'meta.advertiserDomains', bidResponse.adomain);
+        }
 
-          if (serverResponseOneItem.ad) {
-            bid.ad = serverResponseOneItem.ad
-          } else if (serverResponseOneItem.vastUrl) {
-            bid.vastUrl = serverResponseOneItem.vastUrl
-            bid.mediaType = 'video'
-          } else if (serverResponseOneItem.nativeResponse) {
-            bid.mediaType = 'native'
-
-            let nativeResponse = serverResponseOneItem.nativeResponse
-
-            bid['native'] = {
-              clickUrl: nativeResponse.link.url,
-              impressionTrackers: nativeResponse.imptrackers,
-              clickTrackers: nativeResponse.clktrackers,
-              javascriptTrackers: nativeResponse.jstrackers
-            }
-
-            nativeResponse.assets.forEach(asset => {
-              if (asset.title && asset.title.text) {
-                bid['native'].title = asset.title.text
-              }
-
-              if (asset.img && asset.img.url) {
-                let nativeImage = {}
-                nativeImage.url = asset.img.url
-                nativeImage.height = asset.img.h
-                nativeImage.width = asset.img.w
-                bid['native'].image = nativeImage
-              }
-
-              if (asset.icon && asset.icon.url) {
-                let nativeIcon = {}
-                nativeIcon.url = asset.icon.url
-                nativeIcon.height = asset.icon.h
-                nativeIcon.width = asset.icon.w
-                bid['native'].icon = nativeIcon
-              }
-
-              if (asset.data && asset.data.label === 'DESC' && asset.data.value) {
-                bid['native'].body = asset.data.value
-              }
-
-              if (asset.data && asset.data.label === 'SPONSORED' && asset.data.value) {
-                bid['native'].sponsoredBy = asset.data.value
-              }
-            })
+        if (isPlainObject(bidResponse.ext)) {
+          if (isStr(bidResponse.ext.mediaType)) {
+            deepSetValue(result, 'meta.mediaType', mediaType);
+          }
+          if (isStr(bidResponse.ext.advertiser_id)) {
+            deepSetValue(result, 'meta.advertiserId', bidResponse.ext.advertiser_id);
+          }
+          if (isStr(bidResponse.ext.advertiser_name)) {
+            deepSetValue(result, 'meta.advertiserName', bidResponse.ext.advertiser_name);
           }
+          if (isStr(bidResponse.ext.agency_name)) {
+            deepSetValue(result, 'meta.agencyName', bidResponse.ext.agency_name);
+          }
+        }
+        if (mediaType === BANNER) {
+          result.ad = bidResponse.adm;
+        } else if (mediaType === NATIVE) {
+          result.native = parseNative(bidResponse);
+          result.width = 0;
+          result.height = 0;
+        } else if (mediaType === VIDEO) {
+          result.vastUrl = bidResponse.nurl;
+          result.vastXml = bidResponse.adm;
+        }
 
-          bid.width = serverResponseOneItem.width
-          bid.height = serverResponseOneItem.height
-          utils.logMessage(`submitting bid[${serverResponseOneItem.bidId}]: ${JSON.stringify(bid)}`)
-          bids.push(bid)
-        })
-      } else {
-        utils.logMessage(`empty bid response`)
+        return result;
       }
-      return bids
-    },
-
-  getUserSyncs: function (syncOptions) {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: 'https://cdn.adxcg.net/pb-sync.html'
-      }]
+    }).filter(Boolean);
+  },
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+    const syncs = [];
+    let syncUrl = config.getConfig('adxcg.usersyncUrl');
+
+    let query = [];
+    if (syncOptions.pixelEnabled && syncUrl) {
+      if (gdprConsent) {
+        query.push('gdpr=' + (gdprConsent.gdprApplies & 1));
+        query.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || ''));
+      }
+      if (uspConsent) {
+        query.push('us_privacy=' + encodeURIComponent(uspConsent));
+      }
+
+      syncs.push({
+        type: 'image',
+        url: syncUrl + (query.length ? '?' + query.join('&') : '')
+      });
+    }
+    return syncs;
+  },
+  onBidWon: (bid) => {
+    // for native requests we put the nurl as an imp tracker, otherwise if the auction takes place on prebid server
+    // the server JS adapter puts the nurl in the adm as a tracking pixel and removes the attribute
+    if (bid.nurl) {
+      triggerPixel(replaceAuctionPrice(bid.nurl, bid.originalCpm))
     }
   }
+};
+
+registerBidder(spec);
+
+function parseNative(bid) {
+  const { assets, link, imptrackers, jstracker } = JSON.parse(bid.adm);
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined,
+    impressionTrackers: imptrackers || undefined,
+    javascriptTrackers: jstracker ? [ jstracker ] : undefined
+  };
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+  return result;
 }
 
-function isVideoRequest (bid) {
-  return bid.mediaType === 'video' || !!utils.deepAccess(bid, 'mediaTypes.video')
-}
-
-function isBannerRequest (bid) {
-  return bid.mediaType === 'banner' || !!utils.deepAccess(bid, 'mediaTypes.banner')
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
 }
 
-function isNativeRequest (bid) {
-  return bid.mediaType === 'native' || !!utils.deepAccess(bid, 'mediaTypes.native')
+function flatten(arr) {
+  return [].concat(...arr);
 }
-
-registerBidder(spec)
diff --git a/modules/adxcgBidAdapter.md b/modules/adxcgBidAdapter.md
index 39f27adf163..1e4ef9cd6f9 100644
--- a/modules/adxcgBidAdapter.md
+++ b/modules/adxcgBidAdapter.md
@@ -9,74 +9,89 @@
 Module that connects to an Adxcg.com zone to fetch bids.
 
 # Test Parameters
+
 ```
-var adUnits = [{
-            code: 'banner-ad-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [
-                        [300, 250],
-                        [300, 600]
-                    ]
-                }
-            },
-            bids: [{
-                bidder: 'adxcg',
-                params: {
-                    adzoneid: '1'
-                }
-            }]
-        }, {
-            code: 'native-ad-div',
-            mediaTypes: {
-                native: {
-                    image: {
-                        sendId: false,
-                        required: true,
-                        sizes: [80, 80]
-                    },
-                    title: {
-                        required: true,
-                        len: 75
+
+
+
+        var adUnits = [{
+                    code: 'banner-ad-div',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [
+                                [300, 250],
+                                [300, 600]
+                            ]
+                        }
                     },
-                    body: {
-                        required: true,
-                        len: 200
+                    bids: [{
+                        bidder: 'adxcg',
+                        params: {
+                            adzoneid: '1'
+                        }
+                    }]
+                }, {
+                    code: 'native-ad-div',
+                    mediaTypes: {
+                        native: {
+                             image: {
+                                sendId: false,
+                                required: false,
+                                sizes: [127, 83]
+                            },
+                            icon: {
+                                sizes: [80, 80],
+                                required: false,
+                                sendId: true,
+                            },
+                            title: {
+                                sendId: false,
+                                required: false,
+                                len: 75
+                            },
+                            body: {
+                                sendId: false,
+                                required: false,
+                                len: 200
+                            },
+                            cta: {
+                                sendId: false,
+                                required: false,
+                                len: 75
+                            },
+                            sponsoredBy: {
+                                sendId: false,
+                                required: false
+                            }
+                        }
                     },
-                    sponsoredBy: {
-                        required: false,
-                        len: 20
-                    }
-                }
+                    bids: [{
+                            bidder: 'adxcg',
+                            params: {
+                                adzoneid: '2379'
+                            }                        
+                    }]
             },
-            bids: [{
+            {
+                code: 'video-div',
+                mediaTypes: {
+                    video: {
+                            playerSize: [640, 480],
+                            context: 'instream',
+                            mimes: ['video/mp4'],
+                            protocols: [2, 3, 5, 6, 8],
+                            playback_method: ['auto_play_sound_off'],
+			                maxduration: 100,
+                            skip: 1
+                        }
+                },
+                bids: [{
                     bidder: 'adxcg',
                     params: {
-                        adzoneid: '2379'
+                        adzoneid: '20'                       
                     }
-                }
-            }]
-    },
-    {
-        code: 'video-div',
-        mediaTypes: {
-            video: {
-                playerSize: [640, 480],
-                context: 'instream'
+                }]
             }
-        },
-        bids: [{
-            bidder: 'adxcg',
-            params: {
-                adzoneid: '20',
-                video: {
-                    maxduration: 100,
-                    mimes: ['video/mp4'],
-                    skippable: true,
-                    playback_method: ['auto_play_sound_off']
-                }
-            }
-        }]
-    }
-    ];
+        ];
+
 ```
diff --git a/modules/adxpremiumAnalyticsAdapter.js b/modules/adxpremiumAnalyticsAdapter.js
index 0aa0ca32374..9161c6338f4 100644
--- a/modules/adxpremiumAnalyticsAdapter.js
+++ b/modules/adxpremiumAnalyticsAdapter.js
@@ -1,8 +1,9 @@
-import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import {deepClone, logError, logInfo} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import * as utils from '../src/utils.js';
+import {includes} from '../src/polyfill.js';
 
 const analyticsType = 'endpoint';
 const defaultUrl = 'https://adxpremium.services/graphql';
@@ -94,7 +95,8 @@ function auctionInit(args) {
 
   completeObject.auction_id = args.auctionId;
   completeObject.publisher_id = adxpremiumAnalyticsAdapter.initOptions.pubId;
-  try { completeObject.referer = encodeURI(args.bidderRequests[0].refererInfo.referer.split('?')[0]); } catch (e) { utils.logError('AdxPremium Analytics - ' + e.message); }
+  // TODO: is 'page' the right value here?
+  try { completeObject.referer = encodeURI(args.bidderRequests[0].refererInfo.page.split('?')[0]); } catch (e) { logError('AdxPremium Analytics - ' + e.message); }
   if (args.adUnitCodes && args.adUnitCodes.length > 0) {
     elementIds = args.adUnitCodes;
   }
@@ -139,20 +141,20 @@ function bidWon(args) {
     if (requestDelivered) {
       if (completeObject.events[eventIndex]) {
         // do the upgrade
-        utils.logInfo('AdxPremium Analytics - Upgrading request');
+        logInfo('AdxPremium Analytics - Upgrading request');
         completeObject.events[eventIndex].is_winning = true;
         completeObject.events[eventIndex].is_upgrade = true;
-        upgradedObject = utils.deepClone(completeObject);
+        upgradedObject = deepClone(completeObject);
         upgradedObject.events = [completeObject.events[eventIndex]];
         sendEvent(upgradedObject); // send upgrade
       } else {
-        utils.logInfo('AdxPremium Analytics - CANNOT FIND INDEX FOR REQUEST ' + args.requestId);
+        logInfo('AdxPremium Analytics - CANNOT FIND INDEX FOR REQUEST ' + args.requestId);
       }
     } else {
       completeObject.events[eventIndex].is_winning = true;
     }
   } else {
-    utils.logInfo('AdxPremium Analytics - Response not found, creating new one.');
+    logInfo('AdxPremium Analytics - Response not found, creating new one.');
     let tmpObject = {
       type: 'RESPONSE',
       bidder_code: args.bidderCode,
@@ -166,14 +168,14 @@ function bidWon(args) {
       is_winning: true,
       is_lost: true
     };
-    let lostObject = utils.deepClone(completeObject);
+    let lostObject = deepClone(completeObject);
     lostObject.events = [tmpObject];
     sendEvent(lostObject); // send lost object
   }
 }
 
 function bidTimeout(args) {
-  let timeoutObject = utils.deepClone(completeObject);
+  let timeoutObject = deepClone(completeObject);
   timeoutObject.events = [];
   let usedRequestIds = [];
 
@@ -190,12 +192,12 @@ function bidTimeout(args) {
 
   if (timeoutObject.events.length > 0) {
     sendEvent(timeoutObject); // send timeouted
-    utils.logInfo('AdxPremium Analytics - Sending timeouted requests');
+    logInfo('AdxPremium Analytics - Sending timeouted requests');
   }
 }
 
 function auctionEnd(args) {
-  utils.logInfo('AdxPremium Analytics - Auction Ended at ' + Date.now());
+  logInfo('AdxPremium Analytics - Auction Ended at ' + Date.now());
   if (timeoutBased) { setTimeout(function () { requestSent = true; sendEvent(completeObject); }, 3500); } else { sendEventFallback(); }
 }
 
@@ -211,26 +213,27 @@ function deviceType() {
 }
 
 function clearSlot(elementId) {
-  if (elementIds.includes(elementId)) { elementIds.splice(elementIds.indexOf(elementId), 1); utils.logInfo('AdxPremium Analytics - Done with: ' + elementId); }
+  if (includes(elementIds, elementId)) { elementIds.splice(elementIds.indexOf(elementId), 1); logInfo('AdxPremium Analytics - Done with: ' + elementId); }
   if (elementIds.length == 0 && !requestSent && !timeoutBased) {
     requestSent = true;
     sendEvent(completeObject);
-    utils.logInfo('AdxPremium Analytics - Everything ready');
+    logInfo('AdxPremium Analytics - Everything ready');
   }
 }
 
 export function testSend() {
   sendEvent(completeObject);
-  utils.logInfo('AdxPremium Analytics - Sending without any conditions, used for testing');
+  logInfo('AdxPremium Analytics - Sending without any conditions, used for testing');
 }
 
 function sendEventFallback() {
   setTimeout(function () {
-    if (!requestSent) { requestSent = true; sendEvent(completeObject); utils.logInfo('AdxPremium Analytics - Sending event using fallback method.'); }
+    if (!requestSent) { requestSent = true; sendEvent(completeObject); logInfo('AdxPremium Analytics - Sending event using fallback method.'); }
   }, 2000);
 }
 
 function sendEvent(completeObject) {
+  if (!adxpremiumAnalyticsAdapter.enabled) return;
   requestDelivered = true;
   try {
     let responseEvents = btoa(JSON.stringify(completeObject));
@@ -240,11 +243,11 @@ function sendEvent(completeObject) {
     if (adxpremiumAnalyticsAdapter.initOptions.sid) {
       ajaxEndpoint = 'https://' + adxpremiumAnalyticsAdapter.initOptions.sid + '.adxpremium.services/graphql'
     }
-    ajax(ajaxEndpoint, function () { utils.logInfo('AdxPremium Analytics - Sending complete events at ' + Date.now()) }, dataToSend, {
+    ajax(ajaxEndpoint, function () { logInfo('AdxPremium Analytics - Sending complete events at ' + Date.now()) }, dataToSend, {
       contentType: 'application/json',
       method: 'POST'
     });
-  } catch (err) { utils.logError('AdxPremium Analytics - Sending event error: ' + err); }
+  } catch (err) { logError('AdxPremium Analytics - Sending event error: ' + err); }
 }
 
 // save the base class function
@@ -255,12 +258,12 @@ adxpremiumAnalyticsAdapter.enableAnalytics = function (config) {
   adxpremiumAnalyticsAdapter.initOptions = config.options;
 
   if (!config.options.pubId) {
-    utils.logError('AdxPremium Analytics - Publisher ID (pubId) option is not defined. Analytics won\'t work');
+    logError('AdxPremium Analytics - Publisher ID (pubId) option is not defined. Analytics won\'t work');
     return;
   }
 
   adxpremiumAnalyticsAdapter.originEnableAnalytics(config); // call the base class function
-}
+};
 
 adapterManager.registerAnalyticsAdapter({
   adapter: adxpremiumAnalyticsAdapter,
diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index 725ee0f5626..f7473b3bad4 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -1,13 +1,44 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import find from 'core-js-pure/features/array/find.js';
+import {buildUrl, deepAccess, parseSizesInput} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {createEidsArray} from './userId/eids.js';
+import {find} from '../src/polyfill.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const VERSION = '1.0';
 const BIDDER_CODE = 'adyoulike';
 const DEFAULT_DC = 'hb-api';
+const CURRENCY = 'USD';
+const GVLID = 259;
+
+const NATIVE_IMAGE = {
+  image: {
+    required: true
+  },
+  title: {
+    required: true
+  },
+  sponsoredBy: {
+    required: true
+  },
+  clickUrl: {
+    required: true
+  },
+  body: {
+    required: false
+  },
+  icon: {
+    required: false
+  },
+  cta: {
+    required: false
+  }
+};
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
   aliases: ['ayl'], // short code
   /**
    * Determines whether or not the given bid request is valid.
@@ -17,10 +48,11 @@ export const spec = {
    */
   isBidRequestValid: function (bid) {
     const sizes = getSize(getSizeArray(bid));
-    if (!bid.params || !bid.params.placement || !sizes.width || !sizes.height) {
-      return false;
-    }
-    return true;
+    const sizeValid = sizes.width > 0 && sizes.height > 0;
+
+    // allows no size for native only
+    return (bid.params && bid.params.placement &&
+            (sizeValid || (bid.mediaTypes && bid.mediaTypes.native)));
   },
   /**
    * Make a server request from the list of BidRequests.
@@ -29,33 +61,71 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+    let hasVideo = false;
     const payload = {
       Version: VERSION,
-      Bids: bidRequests.reduce((accumulator, bid) => {
-        let sizesArray = getSizeArray(bid);
+      Bids: bidRequests.reduce((accumulator, bidReq) => {
+        let mediatype = getMediatype(bidReq);
+        let sizesArray = getSizeArray(bidReq);
         let size = getSize(sizesArray);
-        accumulator[bid.bidId] = {};
-        accumulator[bid.bidId].PlacementID = bid.params.placement;
-        accumulator[bid.bidId].TransactionID = bid.transactionId;
-        accumulator[bid.bidId].Width = size.width;
-        accumulator[bid.bidId].Height = size.height;
-        accumulator[bid.bidId].AvailableSizes = sizesArray.join(',');
+        accumulator[bidReq.bidId] = {};
+        accumulator[bidReq.bidId].PlacementID = bidReq.params.placement;
+        accumulator[bidReq.bidId].TransactionID = bidReq.transactionId;
+        accumulator[bidReq.bidId].Width = size.width;
+        accumulator[bidReq.bidId].Height = size.height;
+        accumulator[bidReq.bidId].AvailableSizes = sizesArray.join(',');
+        if (typeof bidReq.getFloor === 'function') {
+          accumulator[bidReq.bidId].Pricing = getFloor(bidReq, size, mediatype);
+        }
+        if (bidReq.schain) {
+          accumulator[bidReq.bidId].SChain = bidReq.schain;
+        }
+        if (mediatype === NATIVE) {
+          let nativeReq = bidReq.mediaTypes.native;
+          if (nativeReq.type === 'image') {
+            nativeReq = Object.assign({}, NATIVE_IMAGE, nativeReq);
+          }
+          // click url is always mandatory even if not specified by publisher
+          nativeReq.clickUrl = {
+            required: true
+          };
+          accumulator[bidReq.bidId].Native = nativeReq;
+        }
+        if (mediatype === VIDEO) {
+          hasVideo = true;
+          accumulator[bidReq.bidId].Video = bidReq.mediaTypes.video;
+
+          const size = bidReq.mediaTypes.video.playerSize;
+          if (Array.isArray(size) && !Array.isArray(size[0])) {
+            accumulator[bidReq.bidId].Video.playerSize = [size];
+          }
+        }
         return accumulator;
       }, {}),
       PageRefreshed: getPageRefreshed()
     };
 
-    if (bidderRequest && bidderRequest.gdprConsent) {
+    if (bidderRequest.gdprConsent) {
       payload.gdprConsent = {
         consentString: bidderRequest.gdprConsent.consentString,
         consentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : null
       };
     }
 
-    if (bidderRequest && bidderRequest.uspConsent) {
+    if (bidderRequest.uspConsent) {
       payload.uspConsent = bidderRequest.uspConsent;
     }
 
+    if (bidderRequest.ortb2) {
+      payload.ortb2 = bidderRequest.ortb2;
+    }
+
+    if (deepAccess(bidderRequest, 'userId')) {
+      payload.userId = createEidsArray(bidderRequest.userId);
+    }
+
     const data = JSON.stringify(payload);
     const options = {
       withCredentials: true
@@ -63,7 +133,7 @@ export const spec = {
 
     return {
       method: 'POST',
-      url: createEndpoint(bidRequests, bidderRequest),
+      url: createEndpoint(bidRequests, bidderRequest, hasVideo),
       data,
       options
     };
@@ -104,30 +174,30 @@ function getHostname(bidderRequest) {
   return '';
 }
 
-/* Get current page referrer url */
-function getReferrerUrl(bidderRequest) {
-  let referer = '';
-  if (bidderRequest && bidderRequest.refererInfo) {
-    referer = bidderRequest.refererInfo.referer;
+/* Get mediatype from bidRequest */
+function getMediatype(bidRequest) {
+  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
+    return BANNER;
+  }
+  if (deepAccess(bidRequest, 'mediaTypes.video')) {
+    return VIDEO;
+  }
+  if (deepAccess(bidRequest, 'mediaTypes.native')) {
+    return NATIVE;
   }
-  return referer;
 }
 
-/* Get current page canonical url */
-function getCanonicalUrl() {
-  let link;
-  if (window.self !== window.top) {
-    try {
-      link = window.top.document.head.querySelector('link[rel="canonical"][href]');
-    } catch (e) { }
-  } else {
-    link = document.head.querySelector('link[rel="canonical"][href]');
-  }
+/* Get Floor price information */
+function getFloor(bidRequest, size, mediaType) {
+  const bidFloors = bidRequest.getFloor({
+    currency: CURRENCY,
+    mediaType,
+    size: [ size.width, size.height ]
+  });
 
-  if (link) {
-    return link.href;
+  if (!isNaN(bidFloors.floor) && (bidFloors.currency === CURRENCY)) {
+    return bidFloors.floor;
   }
-  return '';
 }
 
 /* Get information on page refresh */
@@ -141,12 +211,13 @@ function getPageRefreshed() {
 }
 
 /* Create endpoint url */
-function createEndpoint(bidRequests, bidderRequest) {
+function createEndpoint(bidRequests, bidderRequest, hasVideo) {
   let host = getHostname(bidRequests);
-  return utils.buildUrl({
+  const endpoint = hasVideo ? '/hb-api/prebid-video/v1' : '/hb-api/prebid/v1';
+  return buildUrl({
     protocol: 'https',
     host: `${DEFAULT_DC}${host}.omnitagjs.com`,
-    pathname: '/hb-api/prebid/v1',
+    pathname: endpoint,
     search: createEndpointQS(bidderRequest)
   });
 }
@@ -154,13 +225,30 @@ function createEndpoint(bidRequests, bidderRequest) {
 /* Create endpoint query string */
 function createEndpointQS(bidderRequest) {
   const qs = {};
+  if (bidderRequest) {
+    const ref = bidderRequest.refererInfo;
+    if (ref) {
+      if (ref.location) {
+        // RefererUrl will be removed in a future version.
+        qs.RefererUrl = encodeURIComponent(ref.location);
+        if (!ref.reachedTop) {
+          qs.SafeFrame = true;
+        }
+      }
 
-  const ref = getReferrerUrl(bidderRequest);
-  if (ref) {
-    qs.RefererUrl = encodeURIComponent(ref);
+      qs.PageUrl = encodeURIComponent(ref.topmostLocation);
+      qs.PageReferrer = encodeURIComponent(ref.location);
+    }
+
+    // retreive info from ortb2 object if present (prebid7)
+    const siteInfo = bidderRequest.ortb2?.site;
+    if (siteInfo) {
+      qs.PageUrl = encodeURIComponent(siteInfo.page || ref?.topmostLocation);
+      qs.PageReferrer = encodeURIComponent(siteInfo.ref || ref?.location);
+    }
   }
 
-  const can = getCanonicalUrl();
+  const can = bidderRequest?.refererInfo?.canonicalUrl;
   if (can) {
     qs.CanonicalUrl = encodeURIComponent(can);
   }
@@ -169,12 +257,21 @@ function createEndpointQS(bidderRequest) {
 }
 
 function getSizeArray(bid) {
-  let inputSize = bid.sizes;
+  let inputSize = bid.sizes || [];
+
   if (bid.mediaTypes && bid.mediaTypes.banner) {
-    inputSize = bid.mediaTypes.banner.sizes;
+    inputSize = bid.mediaTypes.banner.sizes || [];
   }
 
-  return utils.parseSizesInput(inputSize);
+  // handle size in bid.params in formats: [w, h] and [[w,h]].
+  if (bid.params && Array.isArray(bid.params.size)) {
+    inputSize = bid.params.size;
+    if (!Array.isArray(inputSize[0])) {
+      inputSize = [inputSize]
+    }
+  }
+
+  return parseSizesInput(inputSize);
 }
 
 /* Get parsed size from request size */
@@ -201,34 +298,202 @@ function getSize(sizesArray) {
   return parsed;
 }
 
+function getInternalImgUrl(uid) {
+  if (!uid) return '';
+  return 'https://blobs.omnitagjs.com/blobs/' + uid.substr(16, 2) + '/' + uid.substr(16) + '/' + uid;
+}
+
+function getImageUrl(config, resource, width, height) {
+  let url = '';
+  if (resource && resource.Kind) {
+    switch (resource.Kind) {
+      case 'INTERNAL':
+        url = getInternalImgUrl(resource.Data.Internal.BlobReference.Uid);
+
+        break;
+
+      case 'EXTERNAL':
+        const dynPrefix = config.DynamicPrefix;
+        let extUrl = resource.Data.External.Url;
+        extUrl = extUrl.replace(/\[height\]/i, '' + height);
+        extUrl = extUrl.replace(/\[width\]/i, '' + width);
+
+        if (extUrl.indexOf(dynPrefix) >= 0) {
+          const urlmatch = (/.*url=([^&]*)/gm).exec(extUrl);
+          url = urlmatch ? urlmatch[1] : '';
+          if (!url) {
+            url = getInternalImgUrl((/.*key=([^&]*)/gm).exec(extUrl)[1]);
+          }
+        } else {
+          url = extUrl;
+        }
+
+        break;
+    }
+  }
+
+  return url;
+}
+
+function getTrackers(eventsArray, jsTrackers) {
+  const result = [];
+
+  if (!eventsArray) return result;
+
+  eventsArray.map((item, index) => {
+    if ((jsTrackers && item.Kind === 'JAVASCRIPT_URL') ||
+        (!jsTrackers && item.Kind === 'PIXEL_URL')) {
+      result.push(item.Url);
+    }
+  });
+  return result;
+}
+
+function getNativeAssets(response, nativeConfig) {
+  if (typeof response.Native === 'object') {
+    return response.Native;
+  }
+  const native = {};
+
+  var adJson = {};
+  var textsJson = {};
+  if (typeof response.Ad === 'string') {
+    adJson = JSON.parse(response.Ad.match(/\/\*PREBID\*\/(.*)\/\*PREBID\*\//)[1]);
+    textsJson = adJson.Content.Preview.Text;
+
+    var impressionUrl = adJson.TrackingPrefix +
+            '/pixel?event_kind=IMPRESSION&attempt=' + adJson.Attempt;
+    var insertionUrl = adJson.TrackingPrefix +
+            '/pixel?event_kind=INSERTION&attempt=' + adJson.Attempt;
+
+    if (adJson.Campaign) {
+      impressionUrl += '&campaign=' + adJson.Campaign;
+      insertionUrl += '&campaign=' + adJson.Campaign;
+    }
+
+    native.clickUrl = adJson.TrackingPrefix + '/ar?event_kind=CLICK&attempt=' + adJson.Attempt +
+      '&campaign=' + adJson.Campaign + '&url=' + encodeURIComponent(adJson.Content.Landing.Url);
+
+    if (adJson.OnEvents) {
+      native.clickTrackers = getTrackers(adJson.OnEvents['CLICK']);
+      native.impressionTrackers = getTrackers(adJson.OnEvents['IMPRESSION']);
+      native.javascriptTrackers = getTrackers(adJson.OnEvents['IMPRESSION'], true);
+    } else {
+      native.impressionTrackers = [];
+    }
+
+    native.impressionTrackers.push(impressionUrl, insertionUrl);
+  }
+
+  Object.keys(nativeConfig).map(function(key, index) {
+    switch (key) {
+      case 'title':
+        native[key] = textsJson.TITLE;
+        break;
+      case 'body':
+        native[key] = textsJson.DESCRIPTION;
+        break;
+      case 'cta':
+        native[key] = textsJson.CALLTOACTION;
+        break;
+      case 'sponsoredBy':
+        native[key] = adJson.Content.Preview.Sponsor.Name;
+        break;
+      case 'image':
+        // main image requested size
+        const imgSize = nativeConfig.image.sizes || [];
+        if (!imgSize.length) {
+          imgSize[0] = response.Width || 300;
+          imgSize[1] = response.Height || 250;
+        }
+
+        const url = getImageUrl(adJson, deepAccess(adJson, 'Content.Preview.Thumbnail.Image'), imgSize[0], imgSize[1]);
+        if (url) {
+          native[key] = {
+            url,
+            width: imgSize[0],
+            height: imgSize[1]
+          };
+        }
+
+        break;
+      case 'icon':
+        // icon requested size
+        const iconSize = nativeConfig.icon.sizes || [];
+        if (!iconSize.length) {
+          iconSize[0] = 50;
+          iconSize[1] = 50;
+        }
+
+        const icurl = getImageUrl(adJson, deepAccess(adJson, 'Content.Preview.Sponsor.Logo.Resource'), iconSize[0], iconSize[1]);
+
+        if (icurl) {
+          native[key] = {
+            url: icurl,
+            width: iconSize[0],
+            height: iconSize[1]
+          };
+        }
+        break;
+      case 'privacyIcon':
+        native[key] = getImageUrl(adJson, deepAccess(adJson, 'Content.Preview.Credit.Logo.Resource'), 25, 25);
+        break;
+      case 'privacyLink':
+        native[key] = deepAccess(adJson, 'Content.Preview.Credit.Url');
+        break;
+    }
+  });
+
+  return native;
+}
+
 /* Create bid from response */
 function createBid(response, bidRequests) {
-  if (!response || !response.Ad) {
-    return
+  if (!response || (!response.Ad && !response.Native && !response.Vast)) {
+    return;
   }
 
+  const request = bidRequests && bidRequests[response.BidID];
+
   // In case we don't retreive the size from the adserver, use the given one.
-  if (bidRequests && bidRequests[response.BidID]) {
+  if (request) {
     if (!response.Width || response.Width === '0') {
-      response.Width = bidRequests[response.BidID].Width;
+      response.Width = request.Width;
     }
 
     if (!response.Height || response.Height === '0') {
-      response.Height = bidRequests[response.BidID].Height;
+      response.Height = request.Height;
     }
   }
 
-  return {
+  const bid = {
     requestId: response.BidID,
-    width: response.Width,
-    height: response.Height,
-    ad: response.Ad,
     ttl: 3600,
     creativeId: response.CreativeID,
     cpm: response.Price,
     netRevenue: true,
-    currency: 'USD'
+    currency: CURRENCY,
+    meta: response.Meta || { advertiserDomains: [] }
   };
+
+  // retreive video response if present
+  const vast64 = response.Vast;
+  if (vast64) {
+    bid.width = response.Width;
+    bid.height = response.Height;
+    bid.vastXml = window.atob(vast64);
+    bid.mediaType = 'video';
+  } else if (request.Native) {
+    // format Native response if Native was requested
+    bid.native = getNativeAssets(response, request.Native);
+    bid.mediaType = 'native';
+  } else {
+    bid.width = response.Width;
+    bid.height = response.Height;
+    bid.ad = response.Ad;
+  }
+
+  return bid;
 }
 
 registerBidder(spec);
diff --git a/modules/adyoulikeBidAdapter.md b/modules/adyoulikeBidAdapter.md
index 120bee3bcbb..edb47d25637 100644
--- a/modules/adyoulikeBidAdapter.md
+++ b/modules/adyoulikeBidAdapter.md
@@ -7,23 +7,57 @@ Maintainer: prebid@adyoulike.com
 # Description
 
 Module that connects to Adyoulike demand sources.
-Banner formats are supported.
+Banner, Native and Video ad formats are supported.
 
 # Test Parameters
 ```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "adyoulike",
-                       params: {
-                           placement: 194f787b85c829fb8822cdaf1ae64435,
-                           DC: 'fra01', // Optional for set the data center name
-                       }
-                   }
-               ]
-           }
-       ];
+  var adUnits = {
+    "code": "test-div",
+    "mediaTypes": {
+      "banner": {
+        "sizes": ["300x250"]
+      },
+      "video": {
+        context: "instream",
+        playerSize: [[640, 480]]
+      },
+      "native": {
+        "image": {
+          "required": true,
+        },
+        "title": {
+          "required": true,
+          "len": 80
+        },
+        "cta": {
+          "required": false
+        },
+        "sponsoredBy": {
+          "required": true
+        },
+        "clickUrl": {
+          "required": true
+        },
+        "privacyIcon": {
+          "required": false
+        },
+        "privacyLink": {
+          "required": false
+        },
+        "body": {
+          "required": true
+        },
+        "icon": {
+          "required": true,
+          "sizes": []
+        }
+      }
+    },
+    bids: [{
+      bidder: "adyoulike",
+      params: {
+        placement: "e622af275681965d3095808561a1e510"
+      }
+    }]
+  };
 ```
diff --git a/modules/afpBidAdapter.js b/modules/afpBidAdapter.js
new file mode 100644
index 00000000000..f690b70973d
--- /dev/null
+++ b/modules/afpBidAdapter.js
@@ -0,0 +1,167 @@
+import {includes} from '../src/polyfill.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {Renderer} from '../src/Renderer.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+
+export const IS_DEV = location.hostname === 'localhost'
+export const BIDDER_CODE = 'afp'
+export const SSP_ENDPOINT = 'https://ssp.afp.ai/api/prebid'
+export const REQUEST_METHOD = 'POST'
+// TODO: test code should be kept in tests
+export const TEST_PAGE_URL = 'https://rtbinsight.ru/smiert-bolshikh-dannykh-kto-na-novienkogo/'
+const SDK_PATH = 'https://cdn.afp.ai/ssp/sdk.js?auto_initialization=false&deploy_to_parent_window=true'
+const TTL = 60
+export const IN_IMAGE_BANNER_TYPE = 'In-image'
+export const IN_IMAGE_MAX_BANNER_TYPE = 'In-image Max'
+export const IN_CONTENT_BANNER_TYPE = 'In-content Banner'
+export const IN_CONTENT_VIDEO_TYPE = 'In-content Video'
+export const OUT_CONTENT_VIDEO_TYPE = 'Out-content Video'
+export const IN_CONTENT_STORY_TYPE = 'In-content Stories'
+export const ACTION_SCROLLER_TYPE = 'Action Scroller'
+export const ACTION_SCROLLER_LIGHT_TYPE = 'Action Scroller Light'
+export const JUST_BANNER_TYPE = 'Just Banner'
+
+export const mediaTypeByPlaceType = {
+  [IN_IMAGE_BANNER_TYPE]: BANNER,
+  [IN_IMAGE_MAX_BANNER_TYPE]: BANNER,
+  [IN_CONTENT_BANNER_TYPE]: BANNER,
+  [IN_CONTENT_STORY_TYPE]: BANNER,
+  [ACTION_SCROLLER_TYPE]: BANNER,
+  [ACTION_SCROLLER_LIGHT_TYPE]: BANNER,
+  [JUST_BANNER_TYPE]: BANNER,
+  [IN_CONTENT_VIDEO_TYPE]: VIDEO,
+  [OUT_CONTENT_VIDEO_TYPE]: VIDEO,
+}
+
+const wrapAd = (dataToCreatePlace) => {
+  return `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <style>html, body {width: 100%; height: 100%; margin: 0;}</style>
+        <script src="${SDK_PATH}"></script>
+    </head>
+    <body>
+        <script>
+            window.afp.createPlaceByData(JSON.parse(decodeURIComponent("${encodeURIComponent(JSON.stringify(dataToCreatePlace))}")))
+        </script>
+    </body>
+  </html>`
+}
+
+const bidRequestMap = {}
+
+const createRenderer = (bid, dataToCreatePlace) => {
+  const renderer = new Renderer({
+    targetId: bid.adUnitCode,
+    url: SDK_PATH,
+    callback() {
+      renderer.loaded = true
+      window.afp.createPlaceByData(dataToCreatePlace)
+    }
+  })
+
+  return renderer
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid({mediaTypes, params}) {
+    if (typeof params !== 'object' || typeof mediaTypes !== 'object') {
+      return false
+    }
+
+    const {placeId, placeType, imageUrl, imageWidth, imageHeight} = params
+    const media = mediaTypes[mediaTypeByPlaceType[placeType]]
+
+    if (placeId && media) {
+      if (mediaTypeByPlaceType[placeType] === VIDEO) {
+        if (!media.playerSize) {
+          return false
+        }
+      } else if (mediaTypeByPlaceType[placeType] === BANNER) {
+        if (!media.sizes) {
+          return false
+        }
+      }
+      if (includes([IN_IMAGE_BANNER_TYPE, IN_IMAGE_MAX_BANNER_TYPE], placeType)) {
+        if (imageUrl && imageWidth && imageHeight) {
+          return true
+        }
+      } else {
+        return true
+      }
+    }
+    return false
+  },
+  buildRequests(validBidRequests, {refererInfo, gdprConsent}) {
+    const payload = {
+      pageUrl: IS_DEV ? TEST_PAGE_URL : refererInfo.page,
+      gdprConsent: gdprConsent,
+      bidRequests: validBidRequests.map(validBidRequest => {
+        const {bidId, transactionId, sizes, params: {
+          placeId, placeType, imageUrl, imageWidth, imageHeight
+        }} = validBidRequest
+        bidRequestMap[bidId] = validBidRequest
+        const bidRequest = {
+          bidId,
+          transactionId,
+          sizes,
+          placeId,
+        }
+        if (includes([IN_IMAGE_BANNER_TYPE, IN_IMAGE_MAX_BANNER_TYPE], placeType)) {
+          Object.assign(bidRequest, {
+            imageUrl,
+            imageWidth: Math.floor(imageWidth),
+            imageHeight: Math.floor(imageHeight),
+          })
+        }
+        return bidRequest
+      })
+    }
+
+    return {
+      method: REQUEST_METHOD,
+      url: SSP_ENDPOINT,
+      data: payload,
+      options: {
+        contentType: 'application/json'
+      }
+    }
+  },
+  interpretResponse(serverResponse) {
+    let bids = serverResponse.body && serverResponse.body.bids
+    bids = Array.isArray(bids) ? bids : []
+
+    return bids.map(({bidId, cpm, width, height, creativeId, currency, netRevenue, adSettings, placeSettings}, index) => {
+      const bid = {
+        requestId: bidId,
+        cpm,
+        width,
+        height,
+        creativeId,
+        currency,
+        netRevenue,
+        meta: {
+          mediaType: mediaTypeByPlaceType[placeSettings.placeType],
+        },
+        ttl: TTL
+      }
+
+      const bidRequest = bidRequestMap[bidId]
+      const placeContainer = bidRequest.params.placeContainer
+      const dataToCreatePlace = { adSettings, placeSettings, placeContainer, isPrebid: true }
+
+      if (mediaTypeByPlaceType[placeSettings.placeType] === BANNER) {
+        bid.ad = wrapAd(dataToCreatePlace)
+      } else if (mediaTypeByPlaceType[placeSettings.placeType] === VIDEO) {
+        bid.vastXml = adSettings.content
+        bid.renderer = createRenderer(bid, dataToCreatePlace)
+      }
+      return bid
+    })
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/afpBidAdapter.md b/modules/afpBidAdapter.md
new file mode 100644
index 00000000000..75ebf2bce48
--- /dev/null
+++ b/modules/afpBidAdapter.md
@@ -0,0 +1,348 @@
+# Overview
+
+
+**Module Name**: AFP Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: devops@astraone.io
+
+# Description
+
+You can use this adapter to get a bid from AFP.
+Please reach out to your AFP account team before using this plugin to get placeId.
+The code below returns a demo ad.
+
+About us: https://afp.ai
+
+# Test Parameters
+```js
+var adUnits = [{
+  code: 'iib-target',
+  mediaTypes: {
+    banner: {
+      sizes: [[0, 0]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "In-image",
+      placeId: "613221112871613d1517d181", // id from personal account
+      placeContainer: '#iib-container',
+      imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+      imageWidth: 1000,
+      imageHeight: 524,
+    }
+  }]
+}];
+
+var adUnits = [{
+  code: 'iimb-target',
+  mediaTypes: {
+    banner: {
+      sizes: [[0, 0]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "In-image Max",
+      placeId: "6139ae472871613d1517dedd", // id from personal account
+      placeContainer: '#iimb-container',
+      imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+      imageWidth: 1000,
+      imageHeight: 524,
+    }
+  }]
+}];
+
+var adUnits = [{
+  code: 'icb-target',
+  mediaTypes: {
+    banner: {
+      sizes: [[0, 0]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "In-content Banner",
+      placeId: "6139ae082871613d1517dec0", // id from personal account
+      placeContainer: '#icb-container',
+    }
+  }]
+}];
+
+var adUnits = [{
+  code: 'ics-target',
+  mediaTypes: {
+    banner: {
+      sizes: [[0, 0]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "In-content Stories",
+      placeId: "6139ae292871613d1517ded3", // id from personal account
+      placeContainer: '#ics-container',
+    }
+  }]
+}];
+
+var adUnits = [{
+  code: 'as-target',
+  mediaTypes: {
+    banner: {
+      sizes: [[0, 0]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "Action Scroller",
+      placeId: "6139adc12871613d1517deb0", // id from personal account
+      placeContainer: '#as-container',
+    }
+  }]
+}];
+
+var adUnits = [{
+  code: 'asl-target',
+  mediaTypes: {
+    banner: {
+      sizes: [[0, 0]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "Action Scroller Light",
+      placeId: "6139adda2871613d1517deb8", // id from personal account
+      placeContainer: '#asl-container',
+    }
+  }]
+}];
+
+var adUnits = [{
+  code: 'jb-target',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "Just Banner",
+      placeId: "6139ae832871613d1517dee9", // id from personal account
+      placeContainer: '#jb-container',
+    }
+  }]
+}];
+
+var adUnits = [{
+  code: 'icv-target',
+  mediaTypes: {
+    video: {
+      playerSize: [[480, 320]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "In-content Video",
+      placeId: "6139ae182871613d1517deca", // id from personal account
+      placeContainer: '#icv-container',
+    }
+  }]
+}];
+
+var adUnits = [{
+  code: 'ocv-target',
+  mediaTypes: {
+    video: {
+      playerSize: [[480, 320]],
+    }
+  },
+  bids: [{
+    bidder: "afp",
+    params: {
+      placeType: "Out-content Video",
+      placeId: "6139ae5b2871613d1517dee2", // id from personal account
+      placeContainer: '#ocv-container', // only the "body" tag is used as a container
+    }
+  }]
+}];
+```
+
+# Example page
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js In-image Example</title>
+	<script async src="prebid.js"></script>
+	<script>
+		var adUnits = [{
+			code: 'iib-target',
+			mediaTypes: {
+				banner: {
+					sizes: [0, 0],
+				}
+			},
+			bids: [{
+				bidder: "afp",
+				params: {
+					placeType: "In-image",
+					placeId: "613221112871613d1517d181",
+					placeContainer: '#iib-container',
+					imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+					imageWidth: 1000,
+					imageHeight: 524,
+				}
+			}]
+		},{
+            code: 'jb-target',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [{
+                bidder: "afp",
+                params: {
+                    placeType: "Just Banner",
+                    placeId: "6139ae832871613d1517dee9", // id from personal account
+                    placeContainer: '#jb-container',
+                }
+            }]
+        }];
+		
+		var pbjs = pbjs || {};
+		pbjs.que = pbjs.que || [];
+		
+		pbjs.que.push(function() {
+			pbjs.addAdUnits(adUnits);
+			pbjs.requestBids({
+				bidsBackHandler: function (e) {
+					if (pbjs.adserverRequestSent) return;
+					pbjs.adserverRequestSent = true;
+					var params = pbjs.getAdserverTargetingForAdUnitCode("iib-target");
+					var iframe = document.getElementById("iib-target");
+					
+					if (params && params['hb_adid']) {
+						pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+					}
+									
+                    params = pbjs.getAdserverTargetingForAdUnitCode("jb-target");
+                    iframe = document.getElementById("jb-target");
+                    
+                    if (params && params['hb_adid']) {
+                        pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+                    }
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+    <h2>In-image</h2>
+    <div class="container-wrapper">
+        <div id="iib-container" style="max-width: 600px;">
+            <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+        </div>
+        <iframe id="iib-target" style="display: none;"></iframe>
+    </div>
+
+    <h2>Just Banner</h2>
+    <div class="container-wrapper">
+        <div id="jb-container"></div>
+        <iframe id="jb-target" style="display: none;"></iframe>
+    </div>
+</body>
+</html>
+
+```
+# Example page with GPT
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js In-image Example</title>
+	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+	<script async src="prebid.js"></script>
+	<script>
+		var adUnits = [{
+			code: 'div-gpt-ad-1574864639578-0',
+			mediaTypes: {
+				banner: {
+					sizes: [0, 0],
+				}
+			},
+			bids: [{
+				bidder: "afp",
+				params: {
+					placeType: "In-image",
+					placeId: "613221112871613d1517d181",
+					placeContainer: '#iib-container',
+					imageUrl: "https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png",
+					imageWidth: 600,
+					imageHeight: 400,
+				}
+			}]
+		}];
+		
+		var pbjs = pbjs || {};
+		pbjs.que = pbjs.que || [];
+		
+		var googletag = googletag || {};
+		googletag.cmd = googletag.cmd || [];
+		
+		googletag.cmd.push(() => {
+			googletag.pubads().disableInitialLoad();
+		});
+		
+		pbjs.que.push(() => {
+			pbjs.addAdUnits(adUnits);
+			pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+		});
+		
+		function sendAdServerRequest() {
+			googletag.cmd.push(() => {
+				pbjs.que.push(() => {
+					pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
+					googletag.pubads().refresh();
+				});
+			});
+		}
+		
+		googletag.cmd.push(() => {
+			googletag
+				.defineSlot('/19968336/header-bid-tag-0', [300, 250], 'div-gpt-ad-1574864639578-0')
+				.addService(googletag.pubads());
+			googletag.pubads().enableSingleRequest();
+			googletag.enableServices();
+		});
+	</script>
+</head>
+<body>
+    <h2>In-image</h2>
+    <div class="container-wrapper">
+        <div id="iib-container" style="max-width: 600px;">
+            <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+        </div>
+        <div id="div-gpt-ad-1574864639578-0">
+            <script type="text/javascript">
+                googletag.cmd.push(function() {
+                    googletag.display('div-gpt-ad-1574864639578-0');
+                });
+            </script>
+        </div>
+    </div>
+</body>
+</html>
+```
diff --git a/modules/aidemBidAdapter.js b/modules/aidemBidAdapter.js
new file mode 100644
index 00000000000..081a0324ddb
--- /dev/null
+++ b/modules/aidemBidAdapter.js
@@ -0,0 +1,496 @@
+import {_each, contains, deepAccess, deepSetValue, getDNT, isBoolean, isStr, logError, logInfo} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {ajax} from '../src/ajax.js';
+
+const BIDDER_CODE = 'aidem';
+const BASE_URL = 'https://zero.aidemsrv.com';
+const LOCAL_BASE_URL = 'http://127.0.0.1:8787';
+
+const AVAILABLE_CURRENCIES = ['USD'];
+const DEFAULT_CURRENCY = ['USD']; // NOTE - USD is the only supported currency right now; Hardcoded for bids
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
+const REQUIRED_VIDEO_PARAMS = [ 'mimes', 'protocols', 'context' ];
+
+export const ERROR_CODES = {
+  BID_SIZE_INVALID_FORMAT: 1,
+  BID_SIZE_NOT_INCLUDED: 2,
+  PROPERTY_NOT_INCLUDED: 3,
+  SITE_ID_INVALID_VALUE: 4,
+  MEDIA_TYPE_NOT_SUPPORTED: 5,
+  PUBLISHER_ID_INVALID_VALUE: 6,
+};
+
+const endpoints = {
+  request: `${BASE_URL}/bid/request`,
+  notice: {
+    win: `${BASE_URL}/notice/win`,
+    timeout: `${BASE_URL}/notice/timeout`,
+    error: `${BASE_URL}/notice/error`,
+  }
+}
+
+export function setEndPoints(env = null, path = '', mediaType = BANNER) {
+  switch (env) {
+    case 'local':
+      endpoints.request = mediaType === BANNER ? `${LOCAL_BASE_URL}${path}/bid/request` : `${LOCAL_BASE_URL}${path}/bid/videorequest`
+      endpoints.notice.win = `${LOCAL_BASE_URL}${path}/notice/win`
+      endpoints.notice.error = `${LOCAL_BASE_URL}${path}/notice/error`
+      endpoints.notice.timeout = `${LOCAL_BASE_URL}${path}/notice/timeout`
+      break;
+    case 'main':
+      endpoints.request = mediaType === BANNER ? `${BASE_URL}${path}/bid/request` : `${BASE_URL}${path}/bid/videorequest`
+      endpoints.notice.win = `${BASE_URL}${path}/notice/win`
+      endpoints.notice.error = `${BASE_URL}${path}/notice/error`
+      endpoints.notice.timeout = `${BASE_URL}${path}/notice/timeout`
+      break;
+  }
+  return endpoints
+}
+
+config.getConfig('aidem', function (config) {
+  if (config.aidem.env) { setEndPoints(config.aidem.env, config.aidem.path, config.aidem.mediaType) }
+})
+
+// AIDEM Custom FN
+function recur(obj) {
+  var result = {}; var _tmp;
+  for (var i in obj) {
+    // enabledPlugin is too nested, also skip functions
+    if (!(i === 'enabledPlugin' || typeof obj[i] === 'function')) {
+      if (typeof obj[i] === 'object' && obj[i] !== null) {
+        // get props recursively
+        _tmp = recur(obj[i]);
+        // if object is not {}
+        if (Object.keys(_tmp).length) {
+          result[i] = _tmp;
+        }
+      } else {
+        // string, number or boolean
+        result[i] = obj[i];
+      }
+    }
+  }
+  return result;
+}
+
+// =================================================================================
+function getConnectionType() {
+  const connection = navigator.connection || navigator.webkitConnection;
+  if (!connection) {
+    return 0;
+  }
+  switch (connection.type) {
+    case 'ethernet':
+      return 1;
+    case 'wifi':
+      return 2;
+    case 'cellular':
+      switch (connection.effectiveType) {
+        case 'slow-2g':
+          return 4;
+        case '2g':
+          return 4;
+        case '3g':
+          return 5;
+        case '4g':
+          return 6;
+        case '5g':
+          return 7;
+        default:
+          return 3;
+      }
+    default:
+      return 0;
+  }
+}
+
+function getDevice() {
+  const language = navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage;
+  return {
+    ua: navigator.userAgent,
+    dnt: !!getDNT(),
+    language: language,
+    connectiontype: getConnectionType(),
+    screen_width: screen.width,
+    screen_height: screen.height
+  };
+}
+
+function getRegs() {
+  let regs = {};
+  const consentManagement = config.getConfig('consentManagement')
+  const coppa = config.getConfig('coppa')
+  if (consentManagement && !!(consentManagement.gdpr)) {
+    deepSetValue(regs, 'gdpr_applies', !!consentManagement.gdpr);
+  } else {
+    deepSetValue(regs, 'gdpr_applies', false);
+  }
+  if (consentManagement && deepAccess(consentManagement, 'usp.cmpApi') === 'static') {
+    deepSetValue(regs, 'usp_applies', !!deepAccess(consentManagement, 'usp'));
+    deepSetValue(regs, 'us_privacy', deepAccess(consentManagement, 'usp.consentData.getUSPData.uspString'));
+  } else {
+    deepSetValue(regs, 'usp_applies', false);
+  }
+
+  if (isBoolean(coppa)) {
+    deepSetValue(regs, 'coppa_applies', !!coppa);
+  } else {
+    deepSetValue(regs, 'coppa_applies', false);
+  }
+
+  return regs;
+}
+
+function getPageUrl(bidderRequest) {
+  return bidderRequest?.refererInfo?.page
+}
+
+function buildWinNotice(bid) {
+  return {
+    burl: deepAccess(bid, 'meta.burl'),
+    cpm: bid.cpm,
+    currency: bid.currency,
+    impid: deepAccess(bid, 'meta.impid'),
+    dsp_id: deepAccess(bid, 'meta.dsp_id'),
+    adUnitCode: bid.adUnitCode,
+    auctionId: bid.auctionId,
+    transactionId: bid.transactionId,
+    ttl: bid.ttl,
+    requestTimestamp: bid.requestTimestamp,
+    responseTimestamp: bid.responseTimestamp,
+  }
+}
+
+function buildErrorNotice(prebidErrorResponse) {
+  return {
+    message: `Prebid.js: Server call for ${prebidErrorResponse.bidderCode} failed.`,
+    url: encodeURIComponent(getPageUrl(prebidErrorResponse)),
+    auctionId: prebidErrorResponse.auctionId,
+    bidderRequestId: prebidErrorResponse.bidderRequestId,
+    metrics: {}
+  }
+}
+
+function hasValidFloor(obj) {
+  if (!obj) return false
+  const hasValue = !isNaN(Number(obj.value))
+  const hasCurrency = contains(AVAILABLE_CURRENCIES, obj.currency)
+  return hasValue && hasCurrency
+}
+
+function getMediaType(bidRequest) {
+  if ((bidRequest.mediaTypes && bidRequest.mediaTypes.hasOwnProperty('video')) || bidRequest.params.hasOwnProperty('video')) { return VIDEO }
+  return BANNER
+}
+
+function getPrebidRequestFields(bidderRequest, bidRequests) {
+  const payload = {}
+  // Base Payload Data
+  deepSetValue(payload, 'id', bidderRequest.auctionId);
+  // Impressions
+  setPrebidImpressionObject(bidRequests, payload)
+  // Device
+  deepSetValue(payload, 'device', getDevice())
+  // Timeout
+  deepSetValue(payload, 'tmax', bidderRequest.timeout);
+  // Currency
+  deepSetValue(payload, 'cur', DEFAULT_CURRENCY);
+  // Timezone
+  deepSetValue(payload, 'tz', new Date().getTimezoneOffset());
+  // Privacy Regs
+  deepSetValue(payload, 'regs', getRegs());
+  // Site
+  setPrebidSiteObject(bidderRequest, payload)
+  // Environment
+  setPrebidRequestEnvironment(payload)
+  // AT auction type
+  deepSetValue(payload, 'at', 1);
+
+  return payload
+}
+
+function setPrebidImpressionObject(bidRequests, payload) {
+  payload.imp = [];
+  _each(bidRequests, function (bidRequest) {
+    const impressionObject = {};
+    // Placement or ad tag used to initiate the auction
+    deepSetValue(impressionObject, 'id', bidRequest.bidId);
+    // Transaction id
+    deepSetValue(impressionObject, 'tid', deepAccess(bidRequest, 'transactionId'));
+    // Placement id
+    deepSetValue(impressionObject, 'tagid', deepAccess(bidRequest, 'params.placementId', null));
+    // Publisher id
+    deepSetValue(payload, 'site.publisher.id', deepAccess(bidRequest, 'params.publisherId'));
+    // Site id
+    deepSetValue(payload, 'site.id', deepAccess(bidRequest, 'params.siteId'));
+    const mediaType = getMediaType(bidRequest)
+    switch (mediaType) {
+      case 'banner':
+        setPrebidImpressionObjectBanner(bidRequest, impressionObject)
+        break;
+      case 'video':
+        setPrebidImpressionObjectVideo(bidRequest, impressionObject)
+        break;
+    }
+
+    // Floor (optional)
+    setPrebidImpressionObjectFloor(bidRequest, impressionObject)
+
+    impressionObject.imp_ext = {};
+
+    payload.imp.push(impressionObject);
+  });
+}
+
+function setPrebidSiteObject(bidderRequest, payload) {
+  deepSetValue(payload, 'site.domain', deepAccess(bidderRequest, 'refererInfo.domain'));
+  deepSetValue(payload, 'site.page', deepAccess(bidderRequest, 'refererInfo.page'));
+  deepSetValue(payload, 'site.referer', deepAccess(bidderRequest, 'refererInfo.ref'));
+  deepSetValue(payload, 'site.cat', deepAccess(bidderRequest, 'ortb2.site.cat'));
+  deepSetValue(payload, 'site.sectioncat', deepAccess(bidderRequest, 'ortb2.site.sectioncat'));
+  deepSetValue(payload, 'site.keywords', deepAccess(bidderRequest, 'ortb2.site.keywords'));
+  deepSetValue(payload, 'site.site_ext', deepAccess(bidderRequest, 'ortb2.site.ext')); // see https://docs.prebid.org/features/firstPartyData.html
+}
+
+function setPrebidRequestEnvironment(payload) {
+  const __navigator = JSON.parse(JSON.stringify(recur(navigator)));
+  delete __navigator.plugins;
+  deepSetValue(payload, 'environment.ri', getRefererInfo());
+  deepSetValue(payload, 'environment.hl', window.history.length);
+  deepSetValue(payload, 'environment.nav', __navigator);
+  deepSetValue(payload, 'environment.inp.euc', window.encodeURIComponent.name === 'encodeURIComponent' && typeof window.encodeURIComponent.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.eu', window.encodeURI.name === 'encodeURI' && typeof window.encodeURI.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.js', window.JSON.stringify.name === 'stringify' && typeof window.JSON.stringify.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.jp', window.JSON.parse.name === 'parse' && typeof window.JSON.parse.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.ofe', window.Object.fromEntries.name === 'fromEntries' && typeof window.Object.fromEntries.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.oa', window.Object.assign.name === 'assign' && typeof window.Object.assign.prototype === 'undefined');
+  deepSetValue(payload, 'environment.wpar.innerWidth', window.innerWidth);
+  deepSetValue(payload, 'environment.wpar.innerHeight', window.innerHeight);
+}
+
+function setPrebidImpressionObjectFloor(bidRequest, impressionObject) {
+  const floor = deepAccess(bidRequest, 'params.floor')
+  if (hasValidFloor(floor)) {
+    deepSetValue(impressionObject, 'floor.value', floor.value)
+    deepSetValue(impressionObject, 'floor.currency', floor.currency)
+  }
+}
+
+function setPrebidImpressionObjectBanner(bidRequest, impressionObject) {
+  deepSetValue(impressionObject, 'mediatype', BANNER);
+  deepSetValue(impressionObject, 'banner.topframe', 1);
+  deepSetValue(impressionObject, 'banner.format', []);
+  _each(bidRequest.mediaTypes.banner.sizes, function (bannerFormat) {
+    const format = {};
+    deepSetValue(format, 'w', bannerFormat[0]);
+    deepSetValue(format, 'h', bannerFormat[1]);
+    deepSetValue(format, 'format_ext', {});
+    impressionObject.banner.format.push(format);
+  });
+}
+
+function setPrebidImpressionObjectVideo(bidRequest, impressionObject) {
+  deepSetValue(impressionObject, 'mediatype', VIDEO);
+  deepSetValue(impressionObject, 'video.format', []);
+  deepSetValue(impressionObject, 'video.mimes', bidRequest.mediaTypes.video.mimes);
+  deepSetValue(impressionObject, 'video.minDuration', bidRequest.mediaTypes.video.minduration);
+  deepSetValue(impressionObject, 'video.maxDuration', bidRequest.mediaTypes.video.maxduration);
+  deepSetValue(impressionObject, 'video.protocols', bidRequest.mediaTypes.video.protocols);
+  deepSetValue(impressionObject, 'video.context', bidRequest.mediaTypes.video.context);
+  deepSetValue(impressionObject, 'video.playbackmethod', bidRequest.mediaTypes.video.playbackmethod);
+  deepSetValue(impressionObject, 'skip', bidRequest.mediaTypes.video.skip);
+  deepSetValue(impressionObject, 'skipafter', bidRequest.mediaTypes.video.skipafter);
+  deepSetValue(impressionObject, 'video.pos', bidRequest.mediaTypes.video.pos);
+  _each(bidRequest.mediaTypes.video.playerSize, function (videoPlayerSize) {
+    const format = {};
+    deepSetValue(format, 'w', videoPlayerSize[0]);
+    deepSetValue(format, 'h', videoPlayerSize[1]);
+    deepSetValue(format, 'format_ext', {});
+    impressionObject.video.format.push(format);
+  });
+}
+
+function getPrebidResponseBidObject(openRTBResponseBidObject) {
+  const prebidResponseBidObject = {};
+  // Common properties
+  deepSetValue(prebidResponseBidObject, 'requestId', openRTBResponseBidObject.impid);
+  deepSetValue(prebidResponseBidObject, 'cpm', parseFloat(openRTBResponseBidObject.price));
+  deepSetValue(prebidResponseBidObject, 'creativeId', openRTBResponseBidObject.crid);
+  deepSetValue(prebidResponseBidObject, 'currency', openRTBResponseBidObject.cur ? openRTBResponseBidObject.cur.toUpperCase() : DEFAULT_CURRENCY);
+  deepSetValue(prebidResponseBidObject, 'width', openRTBResponseBidObject.w);
+  deepSetValue(prebidResponseBidObject, 'height', openRTBResponseBidObject.h);
+  deepSetValue(prebidResponseBidObject, 'dealId', openRTBResponseBidObject.dealid)
+  deepSetValue(prebidResponseBidObject, 'netRevenue', true);
+  deepSetValue(prebidResponseBidObject, 'ttl', 60000);
+
+  if (openRTBResponseBidObject.mediatype === VIDEO) {
+    logInfo('bidObject.mediatype == VIDEO');
+    deepSetValue(prebidResponseBidObject, 'mediaType', VIDEO);
+    deepSetValue(prebidResponseBidObject, 'vastUrl', openRTBResponseBidObject.adm);
+  } else {
+    logInfo('bidObject.mediatype == BANNER');
+    deepSetValue(prebidResponseBidObject, 'mediaType', BANNER);
+    deepSetValue(prebidResponseBidObject, 'ad', openRTBResponseBidObject.adm);
+  }
+  setPrebidResponseBidObjectMeta(prebidResponseBidObject, openRTBResponseBidObject)
+  return prebidResponseBidObject
+}
+
+function setPrebidResponseBidObjectMeta(prebidResponseBidObject, openRTBResponseBidObject) {
+  logInfo('AIDEM Bid Adapter meta', openRTBResponseBidObject);
+  deepSetValue(prebidResponseBidObject, 'meta.advertiserDomains', openRTBResponseBidObject.adomain);
+  if (openRTBResponseBidObject.cat && Array.isArray(openRTBResponseBidObject.cat)) {
+    const primaryCatId = openRTBResponseBidObject.cat.shift();
+    deepSetValue(prebidResponseBidObject, 'meta.primaryCatId', primaryCatId);
+    deepSetValue(prebidResponseBidObject, 'meta.secondaryCatIds', openRTBResponseBidObject.cat);
+  }
+  deepSetValue(prebidResponseBidObject, 'meta.id', openRTBResponseBidObject.id);
+  deepSetValue(prebidResponseBidObject, 'meta.dsp_id', openRTBResponseBidObject.dsp_id);
+  deepSetValue(prebidResponseBidObject, 'meta.adid', openRTBResponseBidObject.adid);
+  deepSetValue(prebidResponseBidObject, 'meta.burl', openRTBResponseBidObject.burl);
+  deepSetValue(prebidResponseBidObject, 'meta.impid', openRTBResponseBidObject.impid);
+  deepSetValue(prebidResponseBidObject, 'meta.cat', openRTBResponseBidObject.cat);
+  deepSetValue(prebidResponseBidObject, 'meta.cid', openRTBResponseBidObject.cid);
+}
+
+function hasValidMediaType(bidRequest) {
+  const supported = hasBannerMediaType(bidRequest) || hasVideoMediaType(bidRequest)
+  if (!supported) {
+    logError('AIDEM Bid Adapter: media type not supported', { bidder: BIDDER_CODE, code: ERROR_CODES.MEDIA_TYPE_NOT_SUPPORTED });
+  }
+  return supported
+}
+
+function hasBannerMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.banner')
+}
+
+function hasVideoMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.video')
+}
+
+function hasValidBannerMediaType(bidRequest) {
+  const sizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes')
+  if (!sizes) {
+    logError('AIDEM Bid Adapter: media type sizes missing', { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
+    return false;
+  }
+  return true
+}
+
+function hasValidVideoMediaType(bidRequest) {
+  const sizes = deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+  if (!sizes) {
+    logError('AIDEM Bid Adapter: media type playerSize missing', { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
+    return false;
+  }
+  return true
+}
+
+function hasValidVideoParameters(bidRequest) {
+  let valid = true
+  const adUnitsParameters = deepAccess(bidRequest, 'mediaTypes.video');
+  const bidderParameter = deepAccess(bidRequest, 'params.video');
+  for (let property of REQUIRED_VIDEO_PARAMS) {
+    const hasAdUnitParameter = adUnitsParameters.hasOwnProperty(property)
+    const hasBidderParameter = bidderParameter && bidderParameter.hasOwnProperty(property)
+    if (!hasAdUnitParameter && !hasBidderParameter) {
+      logError(`AIDEM Bid Adapter: ${property} is not included in either the adunit or params level`, { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
+      valid = false
+    }
+  }
+
+  return valid
+}
+
+function hasValidParameters(bidRequest) {
+  // Assigned from AIDEM to a publisher website
+  const siteId = deepAccess(bidRequest, 'params.siteId');
+  const publisherId = deepAccess(bidRequest, 'params.publisherId');
+
+  if (!isStr(siteId)) {
+    logError('AIDEM Bid Adapter: siteId must valid string', { bidder: BIDDER_CODE, code: ERROR_CODES.SITE_ID_INVALID_VALUE });
+    return false;
+  }
+
+  if (!isStr(publisherId)) {
+    logError('AIDEM Bid Adapter: publisherId must valid string', { bidder: BIDDER_CODE, code: ERROR_CODES.PUBLISHER_ID_INVALID_VALUE });
+    return false;
+  }
+
+  return true
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+  isBidRequestValid: function(bidRequest) {
+    logInfo('bid: ', bidRequest);
+
+    // check if request has valid mediaTypes
+    if (!hasValidMediaType(bidRequest)) return false
+
+    // check if request has valid media type parameters at adUnit level
+    if (hasBannerMediaType(bidRequest) && !hasValidBannerMediaType(bidRequest)) {
+      return false
+    }
+
+    if (hasVideoMediaType(bidRequest) && !hasValidVideoMediaType(bidRequest)) {
+      return false
+    }
+
+    if (hasVideoMediaType(bidRequest) && !hasValidVideoParameters(bidRequest)) {
+      return false
+    }
+
+    return hasValidParameters(bidRequest)
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    logInfo('validBidRequests: ', validBidRequests);
+    logInfo('bidderRequest: ', bidderRequest);
+    const prebidRequest = getPrebidRequestFields(bidderRequest, validBidRequests)
+    const payloadString = JSON.stringify(prebidRequest);
+
+    return {
+      method: 'POST',
+      url: endpoints.request,
+      data: payloadString,
+      options: {
+        withCredentials: true
+      }
+    };
+  },
+
+  interpretResponse: function (serverResponse) {
+    const bids = [];
+    logInfo('serverResponse: ', serverResponse);
+    _each(serverResponse.body.bid, function (bidObject) {
+      logInfo('bidObject: ', bidObject);
+      if (!bidObject.price || !bidObject.adm) {
+        return;
+      }
+      logInfo('CPM OK');
+      const bid = getPrebidResponseBidObject(bidObject)
+      bids.push(bid);
+    });
+    return bids;
+  },
+
+  onBidWon: function(bid) {
+    // Bidder specific code
+    logInfo('onBidWon bid: ', bid);
+    const notice = buildWinNotice(bid)
+    ajax(endpoints.notice.win, null, JSON.stringify(notice), { method: 'POST', withCredentials: true });
+  },
+
+  onBidderError: function({ bidderRequest }) {
+    // Bidder specific code
+    const notice = buildErrorNotice(bidderRequest)
+    ajax(endpoints.notice.error, null, JSON.stringify(notice), { method: 'POST', withCredentials: true });
+  },
+}
+registerBidder(spec);
diff --git a/modules/aidemBidAdapter.md b/modules/aidemBidAdapter.md
new file mode 100644
index 00000000000..342a264da01
--- /dev/null
+++ b/modules/aidemBidAdapter.md
@@ -0,0 +1,188 @@
+# Overview
+
+```
+name: AIDEM Adapter
+type: Bidder Adapter
+support: prebid@aidem.com
+biddercode: aidem
+```
+
+# Description
+This module connects publishers to AIDEM demand.
+
+This module is GDPR and CCPA compliant, and no 3rd party userIds are allowed.
+
+
+## Global Bid Params
+| Name          | Scope    | Description         | Example       | Type     |
+|---------------|----------|---------------------|---------------|----------|
+| `siteId`      | required | Unique site ID      | `'ABCDEF'`    | `String` |
+| `publisherId` | required | Unique publisher ID | `'ABCDEF'`    | `String` |
+| `placementId` | optional | Unique publisher tag ID | `'ABCDEF'`    | `String` |
+
+
+### Banner Bid Params
+| Name       | Scope    | Description              | Example                   | Type    |
+|------------|----------|--------------------------|---------------------------|---------|
+| `sizes`    | required | List of the sizes wanted | `[[300, 250], [300,600]]` | `Array` |
+
+
+### Video Bid Params
+| Name          | Scope    | Description                             | Example         | Type      |
+|---------------|----------|-----------------------------------------|-----------------|-----------|
+| `context`     | required | One of instream, outstream, adpod       | `'instream'`    | `String`  |
+| `playerSize`  | required | Width and height of the player          | `'[640, 480]'`  | `Array`   |
+| `maxduration` | required | Maximum video ad duration, in seconds   | `30`            | `Integer` |
+| `minduration` | required | Minimum video ad duration, in seconds   | `5`             | `Integer` |
+| `mimes`       | required | List of the content MIME types supported by the player    | `["video/mp4"]` | `Array`   |
+| `protocols`   | required | An array of supported video protocols. At least one supported protocol must be specified, where: `2` = VAST 2.0 `3` = VAST 3.0 `5` = VAST 2.0 wrapper `6` = VAST 3.0 wrapper | `2`             | `Array`   |
+
+
+### Additional Config
+| Name                | Scope    | Description                                             | Example | Type      |
+|---------------------|----------|---------------------------------------------------------|---------|-----------|
+| `coppa`             | optional | Child Online Privacy Protection Act                     | `true`  | `Boolean` |
+| `consentManagement` | optional | [Consent Management Object](#consent-management-object) | `{}`    | `Object`  |
+
+
+### Consent Management Object
+| Name   | Scope    | Description                                                                                      | Example | Type     |
+|--------|----------|--------------------------------------------------------------------------------------------------|---------|----------|
+| `gdpr` | optional | GDPR Object see [Prebid.js doc](https://docs.prebid.org/dev-docs/modules/consentManagement.html) | `{}`    | `Object` |
+| `usp`  | optional | USP Object see [Prebid.js doc](https://docs.prebid.org/dev-docs/modules/consentManagementUsp.html)                                                                     | `{}`    | `Object` |
+
+
+### Example Banner ad unit
+```javascript
+var adUnits = [{
+    code: 'banner-prebid-test-site',
+    mediaTypes: {
+        banner: {
+            sizes: [
+                [300, 600],
+                [300, 250]
+            ]
+        }
+    },
+    bids: [{
+          bidder: 'aidem',
+          params: {
+            siteId: 'prebid-test-site',
+          },
+    }]
+}];
+```
+
+### Example Video ad unit
+```javascript
+var adUnits = [{
+    code: 'video-prebid-test-site',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        maxduration: 30,
+        minduration: 5,
+        mimes: ["video/mp4"],
+        protocols: 2
+      }
+    },
+    bids: [{
+          bidder: 'aidem',
+          params: {
+            siteId: 'prebid-test-site',
+          },
+    }]
+}];
+```
+
+### Example GDPR Consent Management
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function (){
+  pbjs.setConfig({
+    consentManagement: {
+      gdpr:{
+        cmpApi: 'iab'
+      }
+    }
+  });
+})
+```
+
+
+### Example USP Consent Management
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function (){
+  pbjs.setConfig({
+    consentManagement: {
+      usp:{
+        cmpApi: 'static',
+        consentData:{
+          getUSPData:{
+            uspString: '1YYY'
+          }
+        }
+      }
+    }
+  });
+})
+```
+
+
+### Setting First Party Data (FPD)
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function (){
+  pbjs.setConfig({
+    ortb2: {
+      site: {
+        cat: ['IAB2'],
+        sectioncat: ['IAB2-2'],
+        keywords: 'power tools, drills'
+      },
+    }
+  });
+})
+```
+
+### Supported Media Types
+| Type   | Support                                                            |
+|--------|--------------------------------------------------------------------|
+| Banner | Support all [AIDEM Sizes](https://kb.aidem.com/ssp/lists/adsizes/) | 
+| Video  | Support all [AIDEM Sizes](https://kb.aidem.com/ssp/lists/adsizes/) | 
+
+
+# Setup / Dev Guide
+```shell
+nvm use
+
+npm install
+
+gulp build --modules=aidemBidAdapter
+
+gulp serve --modules=aidemBidAdapter
+
+# Open a chrome browser with no ad blockers enabled, and paste in this URL. The `pbjs_debug=true` is needed if you want to enable `loggerInfo` output on the `console` tab of Chrome Developer Tools.
+http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true
+```
+
+If you need to run the tests suite but do *not* want to have to build the full adapter and serve it, simply run:
+```shell
+gulp test --file "test/spec/modules/aidemBidAdapter_spec.js"
+```
+
+
+For video: gulp serve --modules=aidemBidAdapter,dfpAdServerVideo
+
+# FAQs
+### How do I view AIDEM bid request?
+Navigate to a page where AIDEM is setup to bid. In the network tab,
+search for requests to `zero.aidemsrv.com/bid/request`.
diff --git a/modules/airgridRtdProvider.js b/modules/airgridRtdProvider.js
new file mode 100644
index 00000000000..3578cc4b87e
--- /dev/null
+++ b/modules/airgridRtdProvider.js
@@ -0,0 +1,149 @@
+/**
+ * This module adds the AirGrid provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch real-time audience data from AirGrid
+ * @module modules/airgridRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import { config } from '../src/config.js';
+import { submodule } from '../src/hook.js';
+import {
+  mergeDeep,
+  deepSetValue,
+  deepAccess,
+} from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'airgrid';
+const AG_TCF_ID = 782;
+export const AG_AUDIENCE_IDS_KEY = 'edkt_matched_audience_ids';
+
+export const storage = getStorageManager({
+  gvlid: AG_TCF_ID,
+  moduleName: SUBMODULE_NAME,
+});
+
+/**
+ * Attach script tag to DOM
+ * @param {Object} rtdConfig
+ * @return {void}
+ */
+export function attachScriptTagToDOM(rtdConfig) {
+  var edktInitializor = (window.edktInitializor = window.edktInitializor || {});
+  if (!edktInitializor.invoked) {
+    edktInitializor.invoked = true;
+    edktInitializor.accountId = rtdConfig.params.accountId;
+    edktInitializor.publisherId = rtdConfig.params.publisherId;
+    edktInitializor.apiKey = rtdConfig.params.apiKey;
+    edktInitializor.load = function (e) {
+      var p = e || 'sdk';
+      var n = document.createElement('script');
+      n.type = 'module';
+      n.async = true;
+      n.src = 'https://cdn.edkt.io/' + p + '/edgekit.min.js';
+      document.getElementsByTagName('head')[0].appendChild(n);
+    };
+    edktInitializor.load(edktInitializor.accountId);
+  }
+}
+
+/**
+ * Fetch audiences from localStorage
+ * @return {Array}
+ */
+export function getMatchedAudiencesFromStorage() {
+  const audiences = storage.getDataFromLocalStorage(AG_AUDIENCE_IDS_KEY);
+  if (!audiences) return [];
+  try {
+    return JSON.parse(audiences);
+  } catch (e) {
+    return [];
+  }
+}
+
+/**
+ * Mutates the adUnits object
+ * @param {Object} adUnits
+ * @param {Array} audiences
+ * @return {void}
+ */
+function setAudiencesToAppNexusAdUnits(adUnits, audiences) {
+  adUnits.forEach((adUnit) => {
+    adUnit.bids.forEach((bid) => {
+      if (bid.bidder && bid.bidder === 'appnexus') {
+        deepSetValue(bid, 'params.keywords.perid', audiences || []);
+      }
+    });
+  });
+}
+
+/**
+ * Pass audience data to configured bidders, using ORTB2
+ * @param {Object} rtdConfig
+ * @param {Array} audiences
+ * @return {{}} a map from bidder code to ORTB2 config
+ */
+export function getAudiencesAsBidderOrtb2(rtdConfig, audiences) {
+  const bidders = deepAccess(rtdConfig, 'params.bidders');
+  if (!bidders || bidders.length === 0) return {};
+  const agOrtb2 = {}
+  deepSetValue(agOrtb2, 'ortb2.user.ext.data.airgrid', audiences || []);
+
+  return Object.fromEntries(bidders.map(bidder => [bidder, agOrtb2]));
+}
+
+export function setAudiencesUsingAppNexusAuctionKeywords(audiences) {
+  config.setConfig({
+    appnexusAuctionKeywords: {
+      perid: audiences,
+    },
+  });
+}
+
+/**
+ * Module init
+ * @param {Object} rtdConfig
+ * @param {Object} userConsent
+ * @return {boolean}
+ */
+function init(rtdConfig, userConsent) {
+  attachScriptTagToDOM(rtdConfig);
+  return true;
+}
+
+/**
+ * Real-time data retrieval from AirGrid
+ * @param {Object} reqBidsConfigObj
+ * @param {function} onDone
+ * @param {Object} rtdConfig
+ * @param {Object} userConsent
+ * @return {void}
+ */
+export function passAudiencesToBidders(
+  bidConfig,
+  onDone,
+  rtdConfig,
+  userConsent
+) {
+  const adUnits = bidConfig.adUnits || getGlobal().adUnits;
+  const audiences = getMatchedAudiencesFromStorage();
+  if (audiences.length > 0) {
+    setAudiencesUsingAppNexusAuctionKeywords(audiences);
+    mergeDeep(bidConfig?.ortb2Fragments?.bidder, getAudiencesAsBidderOrtb2(rtdConfig, audiences));
+    if (adUnits) {
+      setAudiencesToAppNexusAdUnits(adUnits, audiences);
+    }
+  }
+  onDone();
+}
+
+/** @type {RtdSubmodule} */
+export const airgridSubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  getBidRequestData: passAudiencesToBidders,
+};
+
+submodule(MODULE_NAME, airgridSubmodule);
diff --git a/modules/airgridRtdProvider.md b/modules/airgridRtdProvider.md
new file mode 100644
index 00000000000..6251c63fce9
--- /dev/null
+++ b/modules/airgridRtdProvider.md
@@ -0,0 +1,102 @@
+---
+layout: page_v2
+title: AirGrid RTD Provider
+display_name: AirGrid RTD Provider
+description: Client-side, cookieless and privacy-first audiences.
+page_type: module
+module_type: rtd
+module_code : airgridRtdProvider
+enable_download : true
+vendor_specific: true
+sidebarType : 1
+---
+
+# AirGrid RTD Provider
+
+AirGrid is a privacy-first, cookie-less audience platform. Designed to help publishers increase inventory yield,
+whilst providing audience signal to buyers in the bid request, without exposing raw user level data to any party.
+
+This real-time data module provides quality first-party data, contextual data, site-level data and more that is 
+injected into bid request objects destined for different bidders in order to optimize targeting.
+
+{:.no_toc}
+* TOC
+{:toc}
+
+## Usage
+
+Compile the AirGrid RTD module (`airgridRtdProvider`) into your Prebid build, along with the parent RTD Module (`rtdModule`):
+
+`gulp build --modules=rtdModule,airgridRtdProvider,appnexusBidAdapter`
+
+Next we configure the module, via `pbjs.setConfig`. See the **Parameter Descriptions** below for more detailed information of the configuration parameters. 
+
+```js
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: 'airgrid',
+                waitForIt: true,
+                params: {
+                    // These are unique values for each account.
+                    apiKey: 'apiKey',
+                    accountId: 'accountId',
+                    publisherId: 'publisherId',
+                    bidders: ['appnexus', 'pubmatic']
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Parameter Descriptions
+
+{: .table .table-bordered .table-striped }
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | `String` | RTD sub module name | Always 'airgrid' |
+| waitForIt | `Boolean` | Wether to delay auction for module response | Optional. Defaults to false |
+| params.apiKey | `Boolean` | Publisher partner specific API key | Required |
+| params.accountId | `String` | Publisher partner specific account ID | Required |
+| params.publisherId | `String` | Publisher partner specific publisher ID | Required |
+| params.bidders | `Array` | Bidders with which to share segment information | Optional |
+
+_Note: Although the module supports passing segment data to any bidder using the ORTB2 spec, there is no way for this to be currently monetised. Please reach out to support, to discuss using bidders other than Xandr/AppNexus._
+
+If you do not have your own `apiKey`, `accountId` & `publisherId` please reach out to [support@airgrid.io](mailto:support@airgrid.io) or you can sign up via the [AirGrid platform](https://app.airgrid.io).
+
+## Testing
+
+To view an example of the on page setup required:
+
+```bash
+gulp serve-fast --modules=rtdModule,airgridRtdProvider,appnexusBidAdapter
+```
+
+Then in your browser access:
+
+```
+http://localhost:9999/integrationExamples/gpt/airgridRtdProvider_example.html
+```
+
+Run the unit tests, just on the AirGrid RTD module test file:
+
+```bash
+gulp test --file "test/spec/modules/airgridRtdProvider_spec.js" 
+```
+
+## Support
+
+If you require further assistance or are interested in discussing the module functionality please reach out to:
+- [hello@airgrid.io](mailto:hello@airgrid.io) for general questions.
+- [support@airgrid.io](mailto:support@airgrid.io) for technical questions.
+
+You are also able to find more examples and other integration routes on the [AirGrid docs site](https://docs.airgrid.io), or learn more on our [site](https://airgrid.io)!
+
+Happy Coding! 😊
+The AirGrid Team.
diff --git a/modules/ajaBidAdapter.js b/modules/ajaBidAdapter.js
index ce4196fe249..121dc2ef96f 100644
--- a/modules/ajaBidAdapter.js
+++ b/modules/ajaBidAdapter.js
@@ -1,7 +1,8 @@
+import { getBidIdParameter, tryAppendQueryString, createTrackPixelHtml, logError, logWarn } from '../src/utils.js';
 import { Renderer } from '../src/Renderer.js';
-import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO, BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'aja';
 const URL = 'https://ad.as.amanad.adtdp.com/v2/prebid';
@@ -16,23 +17,51 @@ export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [VIDEO, BANNER, NATIVE],
 
-  isBidRequestValid: function(bid) {
-    return !!(bid.params.asi);
+  /**
+   * Determines whether or not the given bid has all the params needed to make a valid request.
+   *
+   * @param {BidRequest} bidRequest
+   * @returns {boolean}
+   */
+  isBidRequestValid: function(bidRequest) {
+    return !!(bidRequest.params.asi);
   },
 
+  /**
+   * Build the request to the Server which requests Bids for the given array of Requests.
+   * Each BidRequest in the argument array is guaranteed to have passed the isBidRequestValid() test.
+   *
+   * @param {BidRequest[]} validBidRequests
+   * @param {*} bidderRequest
+   * @returns {ServerRequest|ServerRequest[]}
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
-    var bidRequests = [];
-    for (var i = 0, len = validBidRequests.length; i < len; i++) {
-      var bid = validBidRequests[i];
-      var queryString = '';
-      const asi = utils.getBidIdParameter('asi', bid.params);
-      queryString = utils.tryAppendQueryString(queryString, 'asi', asi);
-      queryString = utils.tryAppendQueryString(queryString, 'skt', SDK_TYPE);
-      queryString = utils.tryAppendQueryString(queryString, 'prebid_id', bid.bidId);
-      queryString = utils.tryAppendQueryString(queryString, 'prebid_ver', '$prebid.version$');
-
-      if (bidderRequest && bidderRequest.refererInfo) {
-        queryString = utils.tryAppendQueryString(queryString, 'page_url', bidderRequest.refererInfo.referer);
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    const bidRequests = [];
+    const pageUrl = bidderRequest?.refererInfo?.page || undefined;
+
+    for (let i = 0, len = validBidRequests.length; i < len; i++) {
+      const bidRequest = validBidRequests[i];
+      let queryString = '';
+
+      const asi = getBidIdParameter('asi', bidRequest.params);
+      queryString = tryAppendQueryString(queryString, 'asi', asi);
+      queryString = tryAppendQueryString(queryString, 'skt', SDK_TYPE);
+      queryString = tryAppendQueryString(queryString, 'tid', bidRequest.transactionId)
+      queryString = tryAppendQueryString(queryString, 'prebid_id', bidRequest.bidId);
+      queryString = tryAppendQueryString(queryString, 'prebid_ver', '$prebid.version$');
+
+      if (pageUrl) {
+        queryString = tryAppendQueryString(queryString, 'page_url', pageUrl);
+      }
+
+      const eids = bidRequest.userIdAsEids;
+      if (eids && eids.length) {
+        queryString = tryAppendQueryString(queryString, 'eids', JSON.stringify({
+          'eids': eids,
+        }))
       }
 
       bidRequests.push({
@@ -45,7 +74,7 @@ export const spec = {
     return bidRequests;
   },
 
-  interpretResponse: function(bidderResponse, request) {
+  interpretResponse: function(bidderResponse) {
     const bidderResponseBody = bidderResponse.body;
 
     if (!bidderResponseBody.is_ad_return) {
@@ -62,6 +91,9 @@ export const spec = {
       currency: ad.currency || 'USD',
       netRevenue: true,
       ttl: 300, // 5 minutes
+      meta: {
+        advertiserDomains: []
+      },
     }
 
     if (AD_TYPE.VIDEO === ad.ad_type) {
@@ -74,6 +106,8 @@ export const spec = {
         adResponse: bidderResponseBody,
         mediaType: VIDEO
       });
+
+      Array.prototype.push.apply(bid.meta.advertiserDomains, videoAd.adomain)
     } else if (AD_TYPE.BANNER === ad.ad_type) {
       const bannerAd = bidderResponseBody.ad.banner;
       Object.assign(bid, {
@@ -84,48 +118,54 @@ export const spec = {
       });
       try {
         bannerAd.imps.forEach(impTracker => {
-          const tracker = utils.createTrackPixelHtml(impTracker);
+          const tracker = createTrackPixelHtml(impTracker);
           bid.ad += tracker;
         });
       } catch (error) {
-        utils.logError('Error appending tracking pixel', error);
+        logError('Error appending tracking pixel', error);
       }
+
+      Array.prototype.push.apply(bid.meta.advertiserDomains, bannerAd.adomain)
     } else if (AD_TYPE.NATIVE === ad.ad_type) {
       const nativeAds = ad.native.template_and_ads.ads;
+      if (nativeAds.length === 0) {
+        return [];
+      }
 
-      nativeAds.forEach(nativeAd => {
-        const assets = nativeAd.assets;
+      const nativeAd = nativeAds[0];
+      const assets = nativeAd.assets;
 
-        Object.assign(bid, {
-          mediaType: NATIVE
-        });
+      Object.assign(bid, {
+        mediaType: NATIVE
+      });
+
+      bid.native = {
+        title: assets.title,
+        body: assets.description,
+        cta: assets.cta_text,
+        sponsoredBy: assets.sponsor,
+        clickUrl: assets.lp_link,
+        impressionTrackers: nativeAd.imps,
+        privacyLink: assets.adchoice_url
+      };
+
+      if (assets.img_main !== undefined) {
+        bid.native.image = {
+          url: assets.img_main,
+          width: parseInt(assets.img_main_width, 10),
+          height: parseInt(assets.img_main_height, 10)
+        };
+      }
 
-        bid.native = {
-          title: assets.title,
-          body: assets.description,
-          cta: assets.cta_text,
-          sponsoredBy: assets.sponsor,
-          clickUrl: assets.lp_link,
-          impressionTrackers: nativeAd.imps,
-          privacyLink: assets.adchoice_url,
+      if (assets.img_icon !== undefined) {
+        bid.native.icon = {
+          url: assets.img_icon,
+          width: parseInt(assets.img_icon_width, 10),
+          height: parseInt(assets.img_icon_height, 10)
         };
+      }
 
-        if (assets.img_main !== undefined) {
-          bid.native.image = {
-            url: assets.img_main,
-            width: parseInt(assets.img_main_width, 10),
-            height: parseInt(assets.img_main_height, 10)
-          };
-        }
-
-        if (assets.img_icon !== undefined) {
-          bid.native.icon = {
-            url: assets.img_icon,
-            width: parseInt(assets.img_icon_width, 10),
-            height: parseInt(assets.img_icon_height, 10)
-          };
-        }
-      });
+      Array.prototype.push.apply(bid.meta.advertiserDomains, nativeAd.adomain)
     }
 
     return [bid];
@@ -171,7 +211,7 @@ function newRenderer(bidderResponse) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on newRenderer', err);
+    logWarn('Prebid Error calling setRender on newRenderer', err);
   }
 
   return renderer;
@@ -179,7 +219,7 @@ function newRenderer(bidderResponse) {
 
 function outstreamRender(bid) {
   bid.renderer.push(() => {
-    window.aja_vast_player.init({
+    window['aja_vast_player'].init({
       vast_tag: bid.adResponse.ad.video.vtag,
       ad_unit_code: bid.adUnitCode, // target div id to render video
       width: bid.width,
diff --git a/modules/akamaiDapRtdProvider.js b/modules/akamaiDapRtdProvider.js
new file mode 100644
index 00000000000..1c2af70d737
--- /dev/null
+++ b/modules/akamaiDapRtdProvider.js
@@ -0,0 +1,802 @@
+/**
+ * This module adds the Akamai DAP RTD provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch real-time data from DAP
+ * @module modules/akamaiDapRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import {isPlainObject, mergeDeep, logMessage, logInfo, logError} from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'dap';
+const MODULE_CODE = 'akamaidap';
+
+export const DAP_TOKEN = 'async_dap_token';
+export const DAP_MEMBERSHIP = 'async_dap_membership';
+export const DAP_ENCRYPTED_MEMBERSHIP = 'encrypted_dap_membership';
+export const DAP_SS_ID = 'dap_ss_id';
+export const DAP_DEFAULT_TOKEN_TTL = 3600; // in seconds
+export const DAP_MAX_RETRY_TOKENIZE = 1;
+export const DAP_CLIENT_ENTROPY = 'dap_client_entropy'
+
+export const storage = getStorageManager({gvlid: null, moduleName: SUBMODULE_NAME});
+let dapRetryTokenize = 0;
+
+/**
+ * Lazy merge objects.
+ * @param {String} target
+ * @param {String} source
+ */
+function mergeLazy(target, source) {
+  if (!isPlainObject(target)) {
+    target = {};
+  }
+  if (!isPlainObject(source)) {
+    source = {};
+  }
+  return mergeDeep(target, source);
+}
+
+/**
+ * Add real-time data & merge segments.
+ * @param {Object} ortb2 destionation object to merge RTD into
+ * @param {Object} rtd
+ * @param {Object} rtdConfig
+ */
+export function addRealTimeData(ortb2, rtd) {
+  logInfo('DEBUG(addRealTimeData) - ENTER');
+  if (isPlainObject(rtd.ortb2)) {
+    logMessage('DEBUG(addRealTimeData): merging original: ', ortb2);
+    logMessage('DEBUG(addRealTimeData): merging in: ', rtd.ortb2);
+    mergeLazy(ortb2, rtd.ortb2);
+  }
+  logInfo('DEBUG(addRealTimeData) - EXIT');
+}
+
+/**
+ * Real-time data retrieval from Audigent
+ * @param {Object} reqBidsConfigObj
+ * @param {function} onDone
+ * @param {Object} rtdConfig
+ * @param {Object} userConsent
+ */
+export function getRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
+  let entropyDict = JSON.parse(storage.getDataFromLocalStorage(DAP_CLIENT_ENTROPY));
+  let loadScriptPromise = new Promise((resolve, reject) => {
+    if (rtdConfig && rtdConfig.params && rtdConfig.params.dapEntropyTimeout && Number.isInteger(rtdConfig.params.dapEntropyTimeout)) {
+      setTimeout(reject, rtdConfig.params.dapEntropyTimeout, Error('DapEntropy script could not be loaded'));
+    }
+    if (entropyDict && entropyDict.expires_at > Math.round(Date.now() / 1000.0)) {
+      logMessage('Using cached entropy');
+      resolve();
+    } else {
+      if (typeof window.dapCalculateEntropy === 'function') {
+        window.dapCalculateEntropy(resolve, reject);
+      } else {
+        if (rtdConfig && rtdConfig.params && dapUtils.isValidHttpsUrl(rtdConfig.params.dapEntropyUrl)) {
+          loadExternalScript(rtdConfig.params.dapEntropyUrl, MODULE_CODE, () => { dapUtils.dapGetEntropy(resolve, reject) });
+        } else {
+          reject(Error('Please check if dapEntropyUrl is specified and is valid under config.params'));
+        }
+      }
+    }
+  });
+  loadScriptPromise
+    .catch((error) => {
+      logError('Entropy could not be calculated due to: ', error.message);
+    })
+    .finally(() => {
+      generateRealTimeData(bidConfig, onDone, rtdConfig, userConsent);
+    });
+}
+
+export function generateRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
+  logInfo('DEBUG(generateRealTimeData) - ENTER');
+  logMessage('  - apiHostname: ' + rtdConfig.params.apiHostname);
+  logMessage('  - apiVersion:  ' + rtdConfig.params.apiVersion);
+  dapRetryTokenize = 0;
+  var jsonData = null;
+  if (rtdConfig && isPlainObject(rtdConfig.params)) {
+    if (rtdConfig.params.segtax == 504) {
+      let encMembership = dapUtils.dapGetEncryptedMembershipFromLocalStorage();
+      if (encMembership) {
+        jsonData = dapUtils.dapGetEncryptedRtdObj(encMembership, rtdConfig.params.segtax)
+      }
+    } else {
+      let membership = dapUtils.dapGetMembershipFromLocalStorage();
+      if (membership) {
+        jsonData = dapUtils.dapGetRtdObj(membership, rtdConfig.params.segtax)
+      }
+    }
+  }
+  if (jsonData) {
+    if (jsonData.rtd) {
+      addRealTimeData(bidConfig.ortb2Fragments?.global, jsonData.rtd);
+      onDone();
+      logInfo('DEBUG(generateRealTimeData) - 1');
+      // Don't return - ensure the data is always fresh.
+    }
+  }
+  // Calling setTimeout to release the main thread so that the bid request could be sent.
+  setTimeout(dapUtils.callDapAPIs, 0, bidConfig, onDone, rtdConfig, userConsent);
+}
+
+/**
+ * Module init
+ * @param {Object} provider
+ * @param {Object} userConsent
+ * @return {boolean}
+ */
+function init(provider, userConsent) {
+  if (dapUtils.checkConsent(userConsent) === false) {
+    return false;
+  }
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const akamaiDapRtdSubmodule = {
+  name: SUBMODULE_NAME,
+  getBidRequestData: getRealTimeData,
+  init: init
+};
+
+submodule(MODULE_NAME, akamaiDapRtdSubmodule);
+export const dapUtils = {
+
+  callDapAPIs: function(bidConfig, onDone, rtdConfig, userConsent) {
+    if (rtdConfig && isPlainObject(rtdConfig.params)) {
+      let config = {
+        api_hostname: rtdConfig.params.apiHostname,
+        api_version: rtdConfig.params.apiVersion,
+        domain: rtdConfig.params.domain,
+        segtax: rtdConfig.params.segtax,
+        identity: {type: rtdConfig.params.identityType}
+      };
+      let refreshMembership = true;
+      let token = dapUtils.dapGetTokenFromLocalStorage();
+      const ortb2 = bidConfig.ortb2Fragments.global;
+      logMessage('token is: ', token);
+      if (token !== null) { // If token is not null then check the membership in storage and add the RTD object
+        if (config.segtax == 504) { // Follow the encrypted membership path
+          dapUtils.dapRefreshEncryptedMembership(ortb2, config, token, onDone) // Get the encrypted membership from server
+          refreshMembership = false;
+        } else {
+          dapUtils.dapRefreshMembership(ortb2, config, token, onDone) // Get the membership from server
+          refreshMembership = false;
+        }
+      }
+      dapUtils.dapRefreshToken(ortb2, config, refreshMembership, onDone) // Refresh Token and membership in all the cases
+    }
+  },
+  dapGetEntropy: function(resolve, reject) {
+    if (typeof window.dapCalculateEntropy === 'function') {
+      window.dapCalculateEntropy(resolve, reject);
+    } else {
+      reject(Error('window.dapCalculateEntropy function is not defined'))
+    }
+  },
+
+  dapGetTokenFromLocalStorage: function(ttl) {
+    let now = Math.round(Date.now() / 1000.0); // in seconds
+    let token = null;
+    let item = JSON.parse(storage.getDataFromLocalStorage(DAP_TOKEN));
+    if (item) {
+      if (now < item.expires_at) {
+        token = item.token;
+      }
+    }
+    return token;
+  },
+
+  dapRefreshToken: function(ortb2, config, refreshMembership, onDone) {
+    dapUtils.dapLog('Token missing or expired, fetching a new one...');
+    // Trigger a refresh
+    let now = Math.round(Date.now() / 1000.0); // in seconds
+    let item = {}
+    let configAsync = {...config};
+    dapUtils.dapTokenize(configAsync, config.identity, onDone,
+      function(token, status, xhr, onDone) {
+        item.expires_at = now + DAP_DEFAULT_TOKEN_TTL;
+        let exp = dapUtils.dapExtractExpiryFromToken(token);
+        if (typeof exp == 'number') {
+          item.expires_at = exp - 10;
+        }
+        item.token = token;
+        storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(item));
+        dapUtils.dapLog('Successfully updated and stored token; expires at ' + item.expires_at);
+        let dapSSID = xhr.getResponseHeader('Akamai-DAP-SS-ID');
+        if (dapSSID) {
+          storage.setDataInLocalStorage(DAP_SS_ID, JSON.stringify(dapSSID));
+        }
+        let deviceId100 = xhr.getResponseHeader('Akamai-DAP-100');
+        if (deviceId100 != null) {
+          storage.setDataInLocalStorage('dap_deviceId100', deviceId100);
+          dapUtils.dapLog('Successfully stored DAP 100 Device ID: ' + deviceId100);
+        }
+        if (refreshMembership) {
+          if (config.segtax == 504) {
+            dapUtils.dapRefreshEncryptedMembership(ortb2, config, token, onDone);
+          } else {
+            dapUtils.dapRefreshMembership(ortb2, config, token, onDone);
+          }
+        }
+      },
+      function(xhr, status, error, onDone) {
+        logError('ERROR(' + error + '): failed to retrieve token! ' + status);
+        onDone()
+      }
+    );
+  },
+
+  dapGetMembershipFromLocalStorage: function() {
+    let now = Math.round(Date.now() / 1000.0); // in seconds
+    let membership = null;
+    let item = JSON.parse(storage.getDataFromLocalStorage(DAP_MEMBERSHIP));
+    if (item) {
+      if (now < item.expires_at) {
+        membership = {
+          said: item.said,
+          cohorts: item.cohorts,
+          attributes: null
+        };
+      }
+    }
+    return membership;
+  },
+
+  dapRefreshMembership: function(ortb2, config, token, onDone) {
+    let now = Math.round(Date.now() / 1000.0); // in seconds
+    let item = {}
+    let configAsync = {...config};
+    dapUtils.dapMembership(configAsync, token, onDone,
+      function(membership, status, xhr, onDone) {
+        item.expires_at = now + DAP_DEFAULT_TOKEN_TTL;
+        let exp = dapUtils.dapExtractExpiryFromToken(membership.said)
+        if (typeof exp == 'number') {
+          item.expires_at = exp - 10;
+        }
+        item.said = membership.said;
+        item.cohorts = membership.cohorts;
+        storage.setDataInLocalStorage(DAP_MEMBERSHIP, JSON.stringify(item));
+        dapUtils.dapLog('Successfully updated and stored membership:');
+        dapUtils.dapLog(item);
+
+        let data = dapUtils.dapGetRtdObj(item, config.segtax)
+        dapUtils.checkAndAddRealtimeData(ortb2, data, config.segtax);
+        onDone();
+      },
+      function(xhr, status, error, onDone) {
+        logError('ERROR(' + error + '): failed to retrieve membership! ' + status);
+        if (status == 403 && dapRetryTokenize < DAP_MAX_RETRY_TOKENIZE) {
+          dapRetryTokenize++;
+          dapUtils.dapRefreshToken(ortb2, config, true, onDone);
+        } else {
+          onDone();
+        }
+      }
+    );
+  },
+
+  dapGetEncryptedMembershipFromLocalStorage: function() {
+    let now = Math.round(Date.now() / 1000.0); // in seconds
+    let encMembership = null;
+    let item = JSON.parse(storage.getDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP));
+    if (item) {
+      if (now < item.expires_at) {
+        encMembership = {
+          encryptedSegments: item.encryptedSegments
+        };
+      }
+    }
+    return encMembership;
+  },
+
+  dapRefreshEncryptedMembership: function(ortb2, config, token, onDone) {
+    let now = Math.round(Date.now() / 1000.0); // in seconds
+    let item = {};
+    let configAsync = {...config};
+    dapUtils.dapEncryptedMembership(configAsync, token, onDone,
+      function(encToken, status, xhr, onDone) {
+        item.expires_at = now + DAP_DEFAULT_TOKEN_TTL;
+        let exp = dapUtils.dapExtractExpiryFromToken(encToken);
+        if (typeof exp == 'number') {
+          item.expires_at = exp - 10;
+        }
+        item.encryptedSegments = encToken;
+        storage.setDataInLocalStorage(DAP_ENCRYPTED_MEMBERSHIP, JSON.stringify(item));
+        dapUtils.dapLog('Successfully updated and stored encrypted membership:');
+        dapUtils.dapLog(item);
+
+        let encData = dapUtils.dapGetEncryptedRtdObj(item, config.segtax);
+        dapUtils.checkAndAddRealtimeData(ortb2, encData, config.segtax);
+        onDone();
+      },
+      function(xhr, status, error, onDone) {
+        logError('ERROR(' + error + '): failed to retrieve encrypted membership! ' + status);
+        if (status == 403 && dapRetryTokenize < DAP_MAX_RETRY_TOKENIZE) {
+          dapRetryTokenize++;
+          dapUtils.dapRefreshToken(ortb2, config, true, onDone);
+        } else {
+          onDone();
+        }
+      }
+    );
+  },
+
+  /**
+   * DESCRIPTION
+   * Extract expiry value from a token
+   */
+  dapExtractExpiryFromToken: function(token) {
+    let exp = null;
+    if (token) {
+      const tokenArray = token.split('..');
+      if (tokenArray && tokenArray.length > 0) {
+        let decode = atob(tokenArray[0])
+        let header = JSON.parse(decode.replace(/&quot;/g, '"'));
+        exp = header.exp;
+      }
+    }
+    return exp
+  },
+
+  /**
+   * DESCRIPTION
+   *
+   *  Convert a DAP membership response to an OpenRTB2 segment object suitable
+   *  for insertion into user.data.segment or site.data.segment and add it to the rtd obj.
+   */
+  dapGetRtdObj: function(membership, segtax) {
+    let segment = {
+      name: 'dap.akamai.com',
+      ext: {
+        'segtax': segtax
+      },
+      segment: []
+    };
+    if (membership != null) {
+      for (const i of membership.cohorts) {
+        segment.segment.push({ id: i });
+      }
+    }
+    let data = {
+      rtd: {
+        ortb2: {
+          user: {
+            data: [
+              segment
+            ]
+          },
+          site: {
+            ext: {
+              data: {
+                dapSAID: membership.said
+              }
+            }
+          }
+        }
+      }
+    };
+    return data;
+  },
+
+  /**
+   * DESCRIPTION
+   *
+   *  Convert a DAP membership response to an OpenRTB2 segment object suitable
+   *  for insertion into user.data.segment or site.data.segment and add it to the rtd obj.
+   */
+  dapGetEncryptedRtdObj: function(encToken, segtax) {
+    let segment = {
+      name: 'dap.akamai.com',
+      ext: {
+        'segtax': segtax
+      },
+      segment: []
+    };
+    if (encToken != null) {
+      segment.segment.push({ id: encToken.encryptedSegments });
+    }
+    let encData = {
+      rtd: {
+        ortb2: {
+          user: {
+            data: [
+              segment
+            ]
+          }
+        }
+      }
+    };
+    return encData;
+  },
+
+  checkAndAddRealtimeData: function(ortb2, data, segtax) {
+    if (data.rtd) {
+      if (segtax == 504 && dapUtils.checkIfSegmentsAlreadyExist(ortb2, data.rtd, 504)) {
+        logMessage('DEBUG(handleInit): rtb Object already added');
+      } else {
+        addRealTimeData(ortb2, data.rtd);
+      }
+      logInfo('DEBUG(checkAndAddRealtimeData) - 1');
+    }
+  },
+
+  checkIfSegmentsAlreadyExist: function(ortb2, rtd, segtax) {
+    let segmentsExist = false
+    if (ortb2.user && ortb2.user.data && ortb2.user.data.length > 0) {
+      for (let i = 0; i < ortb2.user.data.length; i++) {
+        let element = ortb2.user.data[i]
+        if (element.ext && element.ext.segtax == segtax) {
+          segmentsExist = true
+          logMessage('DEBUG(checkIfSegmentsAlreadyExist): rtb Object already added: ', ortb2.user.data);
+          break;
+        }
+      }
+    }
+    return segmentsExist
+  },
+
+  dapLog: function(args) {
+    let css = '';
+    css += 'display: inline-block;';
+    css += 'color: #fff;';
+    css += 'background: #F28B20;';
+    css += 'padding: 1px 4px;';
+    css += 'border-radius: 3px';
+
+    logInfo('%cDAP Client', css, args);
+  },
+
+  isValidHttpsUrl: function(urlString) {
+    let url;
+    try {
+      url = new URL(urlString);
+    } catch (_) {
+      return false;
+    }
+    return url.protocol === 'https:';
+  },
+
+  checkConsent: function(userConsent) {
+    let consent = true;
+
+    if (userConsent && userConsent.gdpr && userConsent.gdpr.gdprApplies) {
+      const gdpr = userConsent.gdpr;
+      const hasGdpr = (gdpr && typeof gdpr.gdprApplies === 'boolean' && gdpr.gdprApplies) ? 1 : 0;
+      const gdprConsentString = hasGdpr ? gdpr.consentString : '';
+      if (hasGdpr && (!gdprConsentString || gdprConsentString === '')) {
+        logError('akamaiDapRtd submodule requires consent string to call API');
+        consent = false;
+      }
+    } else if (userConsent && userConsent.usp) {
+      const usp = userConsent.usp;
+      consent = usp[1] !== 'N' && usp[2] !== 'Y';
+    }
+
+    return consent;
+  },
+
+  /*******************************************************************************
+   *
+   * V2 (And Beyond) API
+   *
+   ******************************************************************************/
+
+  /**
+   * SYNOPSIS
+   *
+   *  dapTokenize( config, identity );
+   *
+   * DESCRIPTION
+   *
+   *  Tokenize an identity into a secure, privacy safe pseudonymiziation.
+   *
+   * PARAMETERS
+   *
+   *  config: an array of system configuration parameters
+   *
+   *  identity: an array of identity parameters passed to the tokenizing system
+   *
+   * EXAMPLE
+   *
+   *  config = {
+   *      api_hostname:   "prebid.dap.akadns.net", // required
+   *      domain:         "prebid.org",            // required
+   *      api_version:    "x1",             // optional, default "x1"
+   *      };
+   *
+   *  token = null;
+   *  identity_email = {
+   *      type:           "email",
+   *      identity:       "obiwan@jedi.com"
+   *      attributes:     { cohorts: [ "100:1641013200", "101:1641013200", "102":3:1641013200" ] },
+   *      };
+   *  dap_x1_tokenize( config, identity_email,
+   *      function( response, status, xhr ) { token = response; },
+   *      function( xhr, status, error ) { ; } // handle error
+   *
+   *  token = null;
+   *  identity_signature = { type: "signature:1.0.0" };
+   *  dap_x1_tokenize( config, identity_signature,
+   *      function( response, status, xhr } { token = response; },
+   *      function( xhr, status, error ) { ; } // handle error
+   */
+  dapTokenize: function(config, identity, onDone, onSuccess = null, onError = null) {
+    if (onError == null) {
+      onError = function(xhr, status, error, onDone) {};
+    }
+
+    if (config == null || typeof (config) == typeof (undefined)) {
+      onError(null, 'Invalid config object', 'ClientError', onDone);
+      return;
+    }
+
+    if (typeof (config.domain) != 'string') {
+      onError(null, 'Invalid config.domain: must be a string', 'ClientError', onDone);
+      return;
+    }
+
+    if (config.domain.length <= 0) {
+      onError(null, 'Invalid config.domain: must have non-zero length', 'ClientError', onDone);
+      return;
+    }
+
+    if (!('api_version' in config) || (typeof (config.api_version) == 'string' && config.api_version.length == 0)) {
+      config.api_version = 'x1';
+    }
+
+    if (typeof (config.api_version) != 'string') {
+      onError(null, "Invalid api_version: must be a string like 'x1', etc.", 'ClientError', onDone);
+      return;
+    }
+
+    if (!(('api_hostname') in config) || typeof (config.api_hostname) != 'string' || config.api_hostname.length == 0) {
+      onError(null, 'Invalid api_hostname: must be a non-empty string', 'ClientError', onDone);
+      return;
+    }
+
+    if (identity == null || typeof (identity) == typeof (undefined)) {
+      onError(null, 'Invalid identity object', 'ClientError', onDone);
+      return;
+    }
+
+    if (!('type' in identity) || typeof (identity.type) != 'string' || identity.type.length <= 0) {
+      onError(null, "Identity must contain a valid 'type' field", 'ClientError', onDone);
+      return;
+    }
+
+    let apiParams = {
+      'type': identity.type,
+    };
+
+    if (typeof (identity.identity) != typeof (undefined)) {
+      apiParams.identity = identity.identity;
+    }
+    if (typeof (identity.attributes) != typeof (undefined)) {
+      apiParams.attributes = identity.attributes;
+    }
+
+    let entropyDict = JSON.parse(storage.getDataFromLocalStorage(DAP_CLIENT_ENTROPY));
+    if (entropyDict && entropyDict.entropy) {
+      apiParams.entropy = entropyDict.entropy;
+    }
+
+    let method;
+    let body;
+    let path;
+    switch (config.api_version) {
+      case 'x1':
+      case 'x1-dev':
+        method = 'POST';
+        path = '/data-activation/' + config.api_version + '/domain/' + config.domain + '/identity/tokenize';
+        body = JSON.stringify(apiParams);
+        break;
+      default:
+        onError(null, 'Invalid api_version: ' + config.api_version, 'ClientError', onDone);
+        return;
+    }
+
+    let customHeaders = {'Content-Type': 'application/json'};
+    let dapSSID = JSON.parse(storage.getDataFromLocalStorage(DAP_SS_ID));
+    if (dapSSID) {
+      customHeaders['Akamai-DAP-SS-ID'] = dapSSID;
+    }
+
+    let url = 'https://' + config.api_hostname + path;
+    let cb = {
+      success: (response, request) => {
+        let token = null;
+        switch (config.api_version) {
+          case 'x1':
+          case 'x1-dev':
+            token = request.getResponseHeader('Akamai-DAP-Token');
+            break;
+        }
+        onSuccess(token, request.status, request, onDone);
+      },
+      error: (request, error) => {
+        onError(request, request.statusText, error, onDone);
+      }
+    };
+
+    ajax(url, cb, body, {
+      method: method,
+      customHeaders: customHeaders
+    });
+  },
+
+  /**
+   * SYNOPSIS
+   *
+   *  dapMembership( config, token, onSuccess, onError );
+   *
+   * DESCRIPTION
+   *
+   *  Return the audience segment membership along with a new Secure Advertising
+   *  ID for this token.
+   *
+   * PARAMETERS
+   *
+   *  config: an array of system configuration parameters
+   *
+   *  token: the token previously returned from the tokenize API
+   *
+   * EXAMPLE
+   *
+   *  config = {
+   *      api_hostname: 'api.dap.akadns.net',
+   *      };
+   *
+   *  // token from dap_tokenize
+   *
+   *  dapMembership( config, token,
+   *      function( membership, status, xhr ) {
+   *          // Run auction with membership.segments and membership.said
+   *      },
+   *      function( xhr, status, error ) {
+   *          // error
+   *      } );
+   *
+   */
+  dapMembership: function(config, token, onDone, onSuccess = null, onError = null) {
+    if (onError == null) {
+      onError = function(xhr, status, error, onDone) {};
+    }
+
+    if (config == null || typeof (config) == typeof (undefined)) {
+      onError(null, 'Invalid config object', 'ClientError', onDone);
+      return;
+    }
+
+    if (!('api_version' in config) || (typeof (config.api_version) == 'string' && config.api_version.length == 0)) {
+      config.api_version = 'x1';
+    }
+
+    if (typeof (config.api_version) != 'string') {
+      onError(null, "Invalid api_version: must be a string like 'x1', etc.", 'ClientError', onDone);
+      return;
+    }
+
+    if (!(('api_hostname') in config) || typeof (config.api_hostname) != 'string' || config.api_hostname.length == 0) {
+      onError(null, 'Invalid api_hostname: must be a non-empty string', 'ClientError', onDone);
+      return;
+    }
+
+    if (token == null || typeof (token) != 'string') {
+      onError(null, 'Invalid token: must be a non-null string', 'ClientError', onDone);
+      return;
+    }
+    let path = '/data-activation/' +
+      config.api_version +
+      '/token/' + token +
+      '/membership';
+
+    let url = 'https://' + config.api_hostname + path;
+
+    let cb = {
+      success: (response, request) => {
+        onSuccess(JSON.parse(response), request.status, request, onDone);
+      },
+      error: (error, request) => {
+        onError(request, request.status, error, onDone);
+      }
+    };
+
+    ajax(url, cb, undefined, {
+      method: 'GET',
+      customHeaders: {}
+    });
+  },
+
+  /**
+   * SYNOPSIS
+   *
+   *  dapEncryptedMembership( config, token, onSuccess, onError );
+   *
+   * DESCRIPTION
+   *
+   *  Return the audience segment membership along with a new Secure Advertising
+   *  ID for this token in encrypted format.
+   *
+   * PARAMETERS
+   *
+   *  config: an array of system configuration parameters
+   *
+   *  token: the token previously returned from the tokenize API
+   *
+   * EXAMPLE
+   *
+   *  config = {
+   *      api_hostname: 'api.dap.akadns.net',
+   *      };
+   *
+   *  // token from dap_tokenize
+   *
+   *  dapEncryptedMembership( config, token,
+   *      function( membership, status, xhr ) {
+   *          // Run auction with membership.segments and membership.said after decryption
+   *      },
+   *      function( xhr, status, error ) {
+   *          // error
+   *      } );
+   *
+   */
+  dapEncryptedMembership: function(config, token, onDone, onSuccess = null, onError = null) {
+    if (onError == null) {
+      onError = function(xhr, status, error, onDone) {};
+    }
+
+    if (config == null || typeof (config) == typeof (undefined)) {
+      onError(null, 'Invalid config object', 'ClientError', onDone);
+      return;
+    }
+
+    if (!('api_version' in config) || (typeof (config.api_version) == 'string' && config.api_version.length == 0)) {
+      config.api_version = 'x1';
+    }
+
+    if (typeof (config.api_version) != 'string') {
+      onError(null, "Invalid api_version: must be a string like 'x1', etc.", 'ClientError', onDone);
+      return;
+    }
+
+    if (!(('api_hostname') in config) || typeof (config.api_hostname) != 'string' || config.api_hostname.length == 0) {
+      onError(null, 'Invalid api_hostname: must be a non-empty string', 'ClientError', onDone);
+      return;
+    }
+
+    if (token == null || typeof (token) != 'string') {
+      onError(null, 'Invalid token: must be a non-null string', 'ClientError', onDone);
+      return;
+    }
+    let path = '/data-activation/' +
+      config.api_version +
+      '/token/' + token +
+      '/membership/encrypt';
+
+    let url = 'https://' + config.api_hostname + path;
+
+    let cb = {
+      success: (response, request) => {
+        let encToken = request.getResponseHeader('Akamai-DAP-Token');
+        onSuccess(encToken, request.status, request, onDone);
+      },
+      error: (error, request) => {
+        onError(request, request.status, error, onDone);
+      }
+    };
+    ajax(url, cb, undefined, {
+      method: 'GET',
+      customHeaders: {
+        'Content-Type': 'application/json',
+        'Pragma': 'akamai-x-get-extracted-values'
+      }
+    });
+  }
+}
diff --git a/modules/akamaiDapRtdProvider.md b/modules/akamaiDapRtdProvider.md
new file mode 100644
index 00000000000..efd93db3a51
--- /dev/null
+++ b/modules/akamaiDapRtdProvider.md
@@ -0,0 +1,49 @@
+### Overview
+
+ Akamai DAP Real time data Provider automatically invokes the DAP APIs and submit audience segments and the SAID to the bid-stream.
+
+### Integration
+
+ 1) Build the akamaiDapRTD module into the Prebid.js package with:
+
+ ```
+ gulp build --modules=akamaiDapRtdProvider,...
+ ```
+
+ 2) Use `setConfig` to instruct Prebid.js to initilaize the akamaiDapRtdProvider module, as specified below.
+
+### Configuration
+
+```
+ pbjs.setConfig({
+   realTimeData: {
+     auctionDelay: 2000,
+     dataProviders: [
+       {
+         name: "dap",
+         waitForIt: true,
+         params: {
+           apiHostname: '<see your Akamai account rep>',
+           apiVersion: "x1",
+           domain: 'your-domain.com',
+           identityType: 'email' | 'mobile' | ... | 'dap-signature:1.3.0',
+           segtax: 504,
+           dapEntropyUrl: 'https://dap-dist.akamaized.net/dapentropy.js',
+           dapEntropyTimeout: 1500       // Maximum time for dapentropy to run
+         }
+       }
+     ]
+   }
+ });
+ ```
+
+Please reach out to your Akamai account representative(Prebid@akamai.com) to get provisioned on the DAP platform.
+
+
+### Testing
+To view an example of available segments returned by dap:
+```
+‘gulp serve --modules=rtdModule,akamaiDapRtdProvider,appnexusBidAdapter,sovrnBidAdapter’
+```
+and then point your browser at:
+"http://localhost:9999/integrationExamples/gpt/akamaidap_segments_example.html"
diff --git a/modules/alkimiBidAdapter.js b/modules/alkimiBidAdapter.js
new file mode 100644
index 00000000000..fe5a050f436
--- /dev/null
+++ b/modules/alkimiBidAdapter.js
@@ -0,0 +1,141 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { deepClone, deepAccess } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'alkimi';
+export const ENDPOINT = 'https://exchange.alkimi-onboarding.com/bid?prebid=true';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: ['banner', 'video'],
+
+  isBidRequestValid: function (bid) {
+    return !!(bid.params && bid.params.bidFloor && bid.params.token);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let bids = [];
+    let bidIds = [];
+    let eids;
+    validBidRequests.forEach(bidRequest => {
+      let sizes = prepareSizes(bidRequest.sizes)
+
+      if (bidRequest.userIdAsEids) {
+        eids = eids || bidRequest.userIdAsEids
+      }
+      bids.push({
+        token: bidRequest.params.token,
+        pos: bidRequest.params.pos,
+        bidFloor: bidRequest.params.bidFloor,
+        width: sizes[0].width,
+        height: sizes[0].height,
+        impMediaType: getFormatType(bidRequest),
+        adUnitCode: bidRequest.adUnitCode
+      })
+      bidIds.push(bidRequest.bidId)
+    })
+
+    const alkimiConfig = config.getConfig('alkimi');
+
+    let payload = {
+      requestId: bidderRequest.auctionId,
+      signRequest: { bids, randomUUID: alkimiConfig && alkimiConfig.randomUUID },
+      bidIds,
+      referer: bidderRequest.refererInfo.page,
+      signature: alkimiConfig && alkimiConfig.signature,
+      schain: validBidRequests[0].schain,
+      cpp: config.getConfig('coppa') ? 1 : 0
+    }
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdprConsent = {
+        consentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : false,
+        consentString: bidderRequest.gdprConsent.consentString
+      }
+    }
+
+    if (bidderRequest.uspConsent) {
+      payload.uspConsent = bidderRequest.uspConsent;
+    }
+
+    if (eids) {
+      payload.eids = eids
+    }
+
+    const options = {
+      contentType: 'application/json',
+      customHeaders: {
+        'Rtb-Direct': true
+      }
+    }
+
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: payload,
+      options
+    };
+  },
+
+  interpretResponse: function (serverResponse, request) {
+    const serverBody = serverResponse.body;
+    if (!serverBody || typeof serverBody !== 'object') {
+      return [];
+    }
+
+    const { prebidResponse } = serverBody;
+    if (!prebidResponse || typeof prebidResponse !== 'object') {
+      return [];
+    }
+
+    let bids = [];
+    prebidResponse.forEach(bidResponse => {
+      let bid = deepClone(bidResponse);
+      bid.cpm = parseFloat(bidResponse.cpm);
+
+      // banner or video
+      if (VIDEO === bid.mediaType) {
+        bid.vastXml = bid.ad;
+      }
+
+      bid.meta = {};
+      bid.meta.advertiserDomains = bid.adomain || [];
+
+      bids.push(bid);
+    })
+
+    return bids;
+  },
+
+  onBidWon: function (bid) {
+    let winUrl;
+    if (bid.winUrl || bid.vastUrl) {
+      winUrl = bid.winUrl ? bid.winUrl : bid.vastUrl;
+      winUrl = winUrl.replace(/\$\{AUCTION_PRICE\}/, bid.cpm);
+    } else if (bid.ad) {
+      let trackImg = bid.ad.match(/(?!^)<img src=".+dsp-win.+">/);
+      bid.ad = bid.ad.replace(trackImg[0], '');
+      winUrl = trackImg[0].split('"')[1];
+      winUrl = winUrl.replace(/\$%7BAUCTION_PRICE%7D/, bid.cpm);
+    } else {
+      return false;
+    }
+
+    ajax(winUrl, null);
+    return true;
+  }
+}
+
+function prepareSizes(sizes) {
+  return sizes && sizes.map(size => ({ width: size[0], height: size[1] }));
+}
+
+const getFormatType = bidRequest => {
+  if (deepAccess(bidRequest, 'mediaTypes.banner')) return 'Banner'
+  if (deepAccess(bidRequest, 'mediaTypes.video')) return 'Video'
+  if (deepAccess(bidRequest, 'mediaTypes.audio')) return 'Audio'
+}
+
+registerBidder(spec);
diff --git a/modules/alkimiBidAdapter.md b/modules/alkimiBidAdapter.md
new file mode 100644
index 00000000000..2d1fd42c70f
--- /dev/null
+++ b/modules/alkimiBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Alkimi Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: kalidas@alkimiexchange.com
+```
+
+# Description
+
+Connects to Alkimi Bidder for bids.
+Alkimi bid adapter supports Banner and Video ads.
+
+# Test Parameters
+```
+const adUnits = [
+  {
+      code: 'banner1',
+      mediaTypes: {
+          banner: {   // Media Type can be banner or video or ...
+              sizes: [[300, 250]],
+          }
+      },
+      bids: [
+      {
+          bidder: 'alkimi',
+          params: {
+              bidFloor: 0.5,
+              token: 'a6b042a5-2d68-4170-a051-77fbaf00203a', // Publisher Token(Id) provided by Alkimi
+          }
+      }
+    ]
+  }
+]
+```
diff --git a/modules/amxBidAdapter.js b/modules/amxBidAdapter.js
index 90fcf878d62..c7bc99b6aa6 100644
--- a/modules/amxBidAdapter.js
+++ b/modules/amxBidAdapter.js
@@ -1,53 +1,87 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { parseUrl, deepAccess, _each, formatQS, getUniqueIdentifierStr, triggerPixel } from '../src/utils.js';
+import {
+  parseUrl,
+  deepAccess,
+  _each,
+  formatQS,
+  getUniqueIdentifierStr,
+  triggerPixel,
+  isFn,
+  logError,
+} from '../src/utils.js';
+import { config } from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'amx';
-const SIMPLE_TLD_TEST = /\.co\.\w{2,4}$/;
+const storage = getStorageManager({ gvlid: 737, bidderCode: BIDDER_CODE });
+const SIMPLE_TLD_TEST = /\.com?\.\w{2,4}$/;
 const DEFAULT_ENDPOINT = 'https://prebid.a-mo.net/a/c';
-const VERSION = 'pba1.0';
-const xmlDTDRxp = /^\s*<\?xml[^\?]+\?>/;
+const VERSION = 'pba1.3.2';
 const VAST_RXP = /^\s*<\??(?:vast|xml)/i;
 const TRACKING_ENDPOINT = 'https://1x1.a-mo.net/hbx/';
+const AMUID_KEY = '__amuidpb';
 
-const getLocation = (request) =>
-  parseUrl(deepAccess(request, 'refererInfo.canonicalUrl', location.href))
+function getLocation(request) {
+  return parseUrl(request.refererInfo?.topmostLocation || window.location.href);
+}
 
 const largestSize = (sizes, mediaTypes) => {
   const allSizes = sizes
     .concat(deepAccess(mediaTypes, `${BANNER}.sizes`, []) || [])
-    .concat(deepAccess(mediaTypes, `${VIDEO}.sizes`, []) || [])
+    .concat(deepAccess(mediaTypes, `${VIDEO}.sizes`, []) || []);
 
-  return allSizes.sort((a, b) => (b[0] * b[1]) - (a[0] * a[1]))[0];
-}
+  return allSizes.sort((a, b) => b[0] * b[1] - a[0] * a[1])[0];
+};
 
 function flatMap(input, mapFn) {
   if (input == null) {
-    return []
+    return [];
   }
-  return input.map(mapFn)
-    .reduce((acc, item) => item != null && acc.concat(item), [])
+  return input
+    .map(mapFn)
+    .reduce((acc, item) => item != null && acc.concat(item), []);
 }
 
-const generateDTD = (xmlDocument) =>
-  `<?xml version="${xmlDocument.xmlVersion}" encoding="${xmlDocument.xmlEncoding}" ?>`;
-
 const isVideoADM = (html) => html != null && VAST_RXP.test(html);
-const getMediaType = (bid) => isVideoADM(bid.adm) ? VIDEO : BANNER;
-const nullOrType = (value, type) =>
-  value == null || (typeof value) === type // eslint-disable-line valid-typeof
+
+function getMediaType(bid) {
+  if (isVideoADM(bid.adm)) {
+    return VIDEO;
+  }
+
+  return BANNER;
+}
+
+const nullOrType = (value, type) => value == null || typeof value === type; // eslint-disable-line valid-typeof
 
 function getID(loc) {
   const host = loc.hostname.split('.');
-  const short = host.slice(
-    host.length - (SIMPLE_TLD_TEST.test(loc.host) ? 3 : 2)
-  ).join('.');
+  const short = host
+    .slice(host.length - (SIMPLE_TLD_TEST.test(loc.hostname) ? 3 : 2))
+    .join('.');
   return btoa(short).replace(/=+$/, '');
 }
 
 const enc = encodeURIComponent;
 
-function nestedQs (qsData) {
+function getUIDSafe() {
+  try {
+    return storage.getDataFromLocalStorage(AMUID_KEY);
+  } catch (e) {
+    return null;
+  }
+}
+
+function setUIDSafe(uid) {
+  try {
+    storage.setDataInLocalStorage(AMUID_KEY, uid);
+  } catch (e) {
+    // do nothing
+  }
+}
+
+function nestedQs(qsData) {
   const out = [];
   Object.keys(qsData || {}).forEach((key) => {
     out.push(enc(key) + '=' + enc(String(qsData[key])));
@@ -59,30 +93,84 @@ function nestedQs (qsData) {
 function createBidMap(bids) {
   const out = {};
   _each(bids, (bid) => {
-    out[bid.bidId] = convertRequest(bid)
-  })
+    out[bid.bidId] = convertRequest(bid);
+  });
   return out;
 }
 
 const trackEvent = (eventName, data) =>
-  triggerPixel(`${TRACKING_ENDPOINT}g_${eventName}?${formatQS({
-    ...data,
-    ts: Date.now(),
-    eid: getUniqueIdentifierStr(),
-  })}`);
+  triggerPixel(
+    `${TRACKING_ENDPOINT}g_${eventName}?${formatQS({
+      ...data,
+      ts: Date.now(),
+      eid: getUniqueIdentifierStr(),
+    })}`
+  );
+
+const DEFAULT_MIN_FLOOR = 0;
+
+function ensureFloor(floorValue) {
+  return typeof floorValue === 'number' &&
+    isFinite(floorValue) &&
+    floorValue > 0.0
+    ? floorValue
+    : DEFAULT_MIN_FLOOR;
+}
+
+function getFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.floor', DEFAULT_MIN_FLOOR);
+  }
+
+  try {
+    const floor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+      bidRequest: bid,
+    });
+    return floor.floor;
+  } catch (e) {
+    logError('call to getFloor failed: ', e);
+    return DEFAULT_MIN_FLOOR;
+  }
+}
+
+function refInfo(bidderRequest, subKey, defaultValue) {
+  return deepAccess(bidderRequest, 'refererInfo.' + subKey, defaultValue);
+}
 
 function convertRequest(bid) {
   const size = largestSize(bid.sizes, bid.mediaTypes) || [0, 0];
-  const isVideoBid = bid.mediaType === VIDEO || VIDEO in bid.mediaTypes
+  const isVideoBid = bid.mediaType === VIDEO || VIDEO in bid.mediaTypes;
   const av = isVideoBid || size[1] > 100;
-  const tid = deepAccess(bid, 'params.tagId')
+  const tid = deepAccess(bid, 'params.tagId');
+
+  const au =
+    bid.params != null && typeof bid.params.adUnitId === 'string' && bid.params.adUnitId !== ''
+      ? bid.params.adUnitId
+      : bid.adUnitCode;
+
+  const multiSizes = [
+    bid.sizes,
+    deepAccess(bid, `mediaTypes.${BANNER}.sizes`, []) || [],
+    deepAccess(bid, `mediaTypes.${VIDEO}.sizes`, []) || [],
+  ];
+
+  const videoData = deepAccess(bid, `mediaTypes.${VIDEO}`, {}) || {};
 
   const params = {
+    au,
     av,
+    vd: videoData,
     vr: isVideoBid,
+    ms: multiSizes,
     aw: size[0],
     ah: size[1],
     tf: 0,
+    sc: bid.schain || {},
+    f: ensureFloor(getFloor(bid)),
+    rtb: bid.ortb2Imp,
   };
 
   if (typeof tid === 'string' && tid.length > 0) {
@@ -91,61 +179,6 @@ function convertRequest(bid) {
   return params;
 }
 
-function decorateADM(bid) {
-  const impressions = deepAccess(bid, 'ext.himp', [])
-    .concat(bid.nurl != null ? [bid.nurl] : [])
-    .filter((imp) => imp != null && imp.length > 0)
-    .map((src) => `<img src="${src}" width="0" height="0"/>`)
-    .join('');
-  return bid.adm + impressions;
-}
-
-function transformXmlSimple(bid) {
-  const pixels = []
-  _each([bid.nurl].concat(bid.ext != null && bid.ext.himp != null ? bid.ext.himp : []), (pixel) => {
-    if (pixel != null) {
-      pixels.push(`<Impression><![CDATA[${pixel}]]></Impression>`)
-    }
-  });
-  // find the current "Impression" here & slice ours in
-  const impressionIndex = bid.adm.indexOf('<Impression')
-  return bid.adm.slice(0, impressionIndex) + pixels.join('') + bid.adm.slice(impressionIndex)
-}
-
-function getOuterHTML(node) {
-  return 'outerHTML' in node && node.outerHTML != null
-    ? node.outerHTML : (new XMLSerializer()).serializeToString(node)
-}
-
-function decorateVideoADM(bid) {
-  if (typeof DOMParser === 'undefined' || DOMParser.prototype.parseFromString == null) {
-    return transformXmlSimple(bid)
-  }
-
-  const doc = new DOMParser().parseFromString(bid.adm, 'text/xml');
-  if (doc == null || doc.querySelector('parsererror') != null) {
-    return null;
-  }
-
-  const root = doc.querySelector('InLine,Wrapper')
-  if (root == null) {
-    return null;
-  }
-
-  const pixels = [bid.nurl].concat(bid.ext != null && bid.ext.himp != null ? bid.ext.himp : [])
-    .filter((url) => url != null);
-
-  _each(pixels, (pxl) => {
-    const imagePixel = doc.createElement('Impression');
-    const cdata = doc.createCDATASection(pxl);
-    imagePixel.appendChild(cdata);
-    root.appendChild(imagePixel);
-  });
-
-  const dtdMatch = xmlDTDRxp.exec(bid.adm);
-  return (dtdMatch != null ? dtdMatch[0] : generateDTD(doc)) + getOuterHTML(doc.documentElement);
-}
-
 function resolveSize(bid, request, bidId) {
   if (bid.w != null && bid.w > 1 && bid.h != null && bid.h > 1) {
     return [bid.w, bid.h];
@@ -159,43 +192,91 @@ function resolveSize(bid, request, bidId) {
   return [bidRequest.aw, bidRequest.ah];
 }
 
+function values(source) {
+  if (Object.values != null) {
+    return Object.values(source);
+  }
+
+  return Object.keys(source).map((key) => {
+    return source[key];
+  });
+}
+
+const isTrue = (boolValue) =>
+  boolValue === true || boolValue === 1 || boolValue === 'true';
+
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 737,
   supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid(bid) {
-    return nullOrType(deepAccess(bid, 'params.endpoint', null), 'string') &&
-      nullOrType(deepAccess(bid, 'params.tagId', null), 'string') &&
-      nullOrType(deepAccess(bid, 'params.testMode', null), 'boolean');
+    return (
+      nullOrType(deepAccess(bid, 'params.endpoint', null), 'string') &&
+      nullOrType(deepAccess(bid, 'params.tagId', null), 'string')
+    );
   },
 
   buildRequests(bidRequests, bidderRequest) {
     const loc = getLocation(bidderRequest);
     const tagId = deepAccess(bidRequests[0], 'params.tagId', null);
     const testMode = deepAccess(bidRequests[0], 'params.testMode', 0);
+    const fbid =
+      bidRequests[0] != null
+        ? bidRequests[0]
+        : {
+          bidderRequestsCount: 0,
+          bidderWinsCount: 0,
+          bidRequestsCount: 0,
+        };
 
     const payload = {
       a: bidderRequest.auctionId,
       B: 0,
       b: loc.host,
-      tm: testMode,
+      brc: fbid.bidderRequestsCount || 0,
+      bwc: fbid.bidderWinsCount || 0,
+      trc: fbid.bidRequestsCount || 0,
+      tm: isTrue(testMode),
       V: '$prebid.version$',
-      i: (testMode && tagId != null) ? tagId : getID(loc),
+      vg: '$$PREBID_GLOBAL$$',
+      i: testMode && tagId != null ? tagId : getID(loc),
       l: {},
       f: 0.01,
       cv: VERSION,
       st: 'prebid',
       h: screen.height,
       w: screen.width,
-      gs: deepAccess(bidderRequest, 'gdprConsent.gdprApplies', '0'),
+      gs: deepAccess(bidderRequest, 'gdprConsent.gdprApplies', ''),
       gc: deepAccess(bidderRequest, 'gdprConsent.consentString', ''),
-      u: deepAccess(bidderRequest, 'refererInfo.canonicalUrl', loc.href),
-      do: loc.host,
-      re: deepAccess(bidderRequest, 'refererInfo.referer'),
+      u: refInfo(bidderRequest, 'page', loc.href),
+      do: refInfo(bidderRequest, 'site', loc.hostname),
+      re: refInfo(bidderRequest, 'ref'),
+      am: getUIDSafe(),
       usp: bidderRequest.uspConsent || '1---',
       smt: 1,
       d: '',
       m: createBidMap(bidRequests),
+      cpp: config.getConfig('coppa') ? 1 : 0,
+      fpd2: bidderRequest.ortb2,
+      tmax: config.getConfig('bidderTimeout'),
+      amp: refInfo(bidderRequest, 'isAmp', null),
+      eids: values(
+        bidRequests.reduce((all, bid) => {
+          // we only want unique ones in here
+          if (bid == null || bid.userIdAsEids == null) {
+            return all;
+          }
+
+          _each(bid.userIdAsEids, (value) => {
+            if (value == null) {
+              return;
+            }
+            all[value.source] = value;
+          });
+          return all;
+        }, {})
+      ),
     };
 
     return {
@@ -208,13 +289,14 @@ export const spec = {
 
   getUserSyncs(syncOptions, serverResponses) {
     if (serverResponses == null || serverResponses.length === 0) {
-      return []
+      return [];
     }
-    const output = []
+    const output = [];
     _each(serverResponses, function ({ body: response }) {
       if (response != null && response.p != null && response.p.hreq) {
         _each(response.p.hreq, function (syncPixel) {
-          const pixelType = syncPixel.indexOf('__st=iframe') !== -1 ? 'iframe' : 'image';
+          const pixelType =
+            syncPixel.indexOf('__st=iframe') !== -1 ? 'iframe' : 'image';
           if (syncOptions.iframeEnabled || pixelType === 'image') {
             output.push({
               url: syncPixel,
@@ -228,25 +310,29 @@ export const spec = {
   },
 
   interpretResponse(serverResponse, request) {
-    // validate the body/response
     const response = serverResponse.body;
     if (response == null || typeof response === 'string') {
       return [];
     }
 
+    if (response.am && typeof response.am === 'string') {
+      setUIDSafe(response.am);
+    }
+
     return flatMap(Object.keys(response.r), (bidID) => {
       return flatMap(response.r[bidID], (siteBid) =>
         siteBid.b.map((bid) => {
           const mediaType = getMediaType(bid);
-          // let ad = null;
-          let ad = mediaType === BANNER ? decorateADM(bid) : decorateVideoADM(bid);
+          const ad = bid.adm;
+
           if (ad == null) {
             return null;
           }
 
           const size = resolveSize(bid, request.data, bidID);
+          const defaultExpiration = mediaType === BANNER ? 240 : 300;
 
-          return ({
+          return {
             requestId: bidID,
             cpm: bid.price,
             width: size[0],
@@ -259,9 +345,11 @@ export const spec = {
               advertiserDomains: bid.adomain,
               mediaType,
             },
-            ttl: mediaType === VIDEO ? 90 : 70
-          });
-        })).filter((possibleBid) => possibleBid != null);
+            mediaType,
+            ttl: typeof bid.exp === 'number' ? bid.exp : defaultExpiration,
+          };
+        })
+      ).filter((possibleBid) => possibleBid != null);
     });
   },
 
diff --git a/modules/amxBidAdapter.md b/modules/amxBidAdapter.md
index 5526ef8b6b9..2c38955028f 100644
--- a/modules/amxBidAdapter.md
+++ b/modules/amxBidAdapter.md
@@ -4,7 +4,7 @@ Overview
 ```
 Module Name: AMX Adapter
 Module Type: Bidder Adapter
-Maintainer: prebid.support@amxrtb.com
+Maintainer: prebid@amxrtb.com
 ```
 
 Description
@@ -16,9 +16,9 @@ This module connects web publishers to AMX RTB video and display demand.
 
 | Key | Required | Example | Description |
 | --- | -------- | ------- | ----------- |
-| `endpoint`  | **yes** | `https://prebid.a-mo.net/a/c` | The url including https:// and any path |
 | `testMode` | no | `true` | this will activate test mode / 100% fill with sample ads |
 | `tagId` | no | `"cHJlYmlkLm9yZw"` | can be used for more specific targeting of inventory. Your account manager will provide this ID if needed |
+| `adUnitId` | no | `"sticky_banner"` | optional. To override the bid.adUnitCode provided by prebid. For use in ad-unit level reporting |
 
 # Test Parameters
 
diff --git a/modules/amxIdSystem.js b/modules/amxIdSystem.js
new file mode 100644
index 00000000000..9dbab496f2c
--- /dev/null
+++ b/modules/amxIdSystem.js
@@ -0,0 +1,154 @@
+/**
+ * This module adds AMX to the User ID Module
+ * The {@link module:modules/userId} is required
+ *
+ * @module modules/amxIdSystem
+ * @requires module:modules/userId
+ */
+import {uspDataHandler} from '../src/adapterManager.js';
+import {ajaxBuilder} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {deepAccess, logError} from '../src/utils.js';
+
+const NAME = 'amxId';
+const GVL_ID = 737;
+const ID_KEY = NAME;
+const version = '1.0';
+const SYNC_URL = 'https://id.a-mx.com/sync/';
+const AJAX_TIMEOUT = 300;
+
+function validateConfig(config) {
+  if (config == null || config.storage == null) {
+    logError(`${NAME}: config.storage is required.`);
+    return false;
+  }
+
+  if (config.storage.type !== 'html5') {
+    logError(
+      `${NAME} only supports storage.type "html5". ${config.storage.type} was provided`
+    );
+    return false;
+  }
+
+  if (
+    typeof config.storage.expires === 'number' &&
+    config.storage.expires > 30
+  ) {
+    logError(
+      `${NAME}: storage.expires must be <= 30. ${config.storage.expires} was provided`
+    );
+    return false;
+  }
+
+  return true;
+}
+
+function handleSyncResponse(client, response, callback) {
+  if (response.id != null && response.id.length > 0) {
+    callback(response.id);
+    return;
+  }
+
+  if (response.u == null || response.u.length === 0) {
+    callback(null);
+    return;
+  }
+
+  client(response.u, {
+    error(e) {
+      logError(`${NAME} failed on ${response.u}`, e);
+      callback(null);
+    },
+    success(complete) {
+      if (complete != null && complete.length > 0) {
+        const value = JSON.parse(complete);
+        if (value.id != null) {
+          callback(value.id);
+          return;
+        }
+      }
+
+      logError(`${NAME} invalid value`, complete);
+      callback(null);
+    },
+  });
+}
+
+export const amxIdSubmodule = {
+  /**
+   * @type {string}
+   */
+  name: NAME,
+
+  /**
+   * @type {string}
+   */
+  version,
+
+  /**
+   * IAB TCF Vendor ID
+   * @type {string}
+   */
+  gvlid: GVL_ID,
+
+  decode: (value) =>
+    value != null && value.length > 0
+      ? { [ID_KEY]: value }
+      : undefined,
+
+  getId(config, consentData, _extant) {
+    if (!validateConfig(config)) {
+      return undefined;
+    }
+
+    const consent = consentData || { gdprApplies: false, consentString: '' };
+    const client = ajaxBuilder(AJAX_TIMEOUT);
+    const usp = uspDataHandler.getConsentData();
+    const ref = getRefererInfo();
+
+    const params = {
+      tagId: deepAccess(config, 'params.tagId', ''),
+      // TODO: are these referer values correct?
+      ref: ref.ref,
+      u: ref.location,
+      v: '$prebid.version$',
+      vg: '$$PREBID_GLOBAL$$',
+      us_privacy: usp,
+      gdpr: consent.gdprApplies ? 1 : 0,
+      gdpr_consent: consent.consentString,
+    };
+
+    const callback = (done) =>
+      client(
+        SYNC_URL,
+        {
+          error(e) {
+            logError(`${NAME} failed to load`, e);
+            done(null);
+          },
+          success(responseText) {
+            if (responseText != null && responseText.length > 0) {
+              try {
+                const parsed = JSON.parse(responseText);
+                handleSyncResponse(client, parsed, done);
+                return;
+              } catch (e) {
+                logError(`${NAME} invalid response`, responseText);
+              }
+            }
+
+            done(null);
+          },
+        },
+        params,
+        {
+          method: 'GET'
+        }
+      );
+
+    return { callback };
+  },
+};
+
+submodule('userId', amxIdSubmodule);
diff --git a/modules/amxIdSystem.md b/modules/amxIdSystem.md
new file mode 100644
index 00000000000..9de93c761a1
--- /dev/null
+++ b/modules/amxIdSystem.md
@@ -0,0 +1,51 @@
+# AMX RTB ID
+
+For help adding this module, please contact [prebid@amxrtb.com](prebid@amxrtb.com).
+
+### Prebid Configuration
+
+You can configure this module in your `userSync.userIds[]` configuration:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [
+      {
+        name: "amxId",
+        storage: {
+          name: "amxId",
+          type: "html5",
+          expires: 14,
+        },
+        params: {
+          tagId: "cHJlYmlkLm9yZw",
+        },
+      },
+    ],
+  },
+});
+```
+
+| Param under `userSync.userIds[]` | Scope    | Type   | Description                 | Example                                   |
+| -------------------------------- | -------- | ------ | --------------------------- | ----------------------------------------- |
+| name                             | Required | string | ID for the amxId module     | `"amxId"`                                 |
+| storage                          | Required | Object | Settings for amxId storage  | See [storage settings](#storage-settings) |
+| params                           | Optional | Object | Parameters for amxId module | See [params](#params)                     |
+
+### Storage Settings
+
+The following settings are available for the `storage` property in the `userSync.userIds[]` object:
+
+| Param under `storage` | Scope    | Type         | Description                                                                      | Example   |
+| --------------------- | -------- | ------------ | -------------------------------------------------------------------------------- | --------- |
+| name                  | Required | String       | Where the ID will be stored                                                      | `"amxId"` |
+| type                  | Required | String       | This must be `"html5"`                                                           | `"html5"` |
+| expires               | Required | Number <= 30 | number of days until the stored ID expires. **Must be less than or equal to 30** | `14`      |
+
+### Params
+
+The following options are available in the `params` property in `userSync.userIds[]`:
+
+| Param under `params` | Scope    | Type   | Description                                                               | Example          |
+| -------------------- | -------- | ------ | ------------------------------------------------------------------------- | ---------------- |
+| tagId                | Optional | String | Your AMX tagId (optional)                                                 | `cHJlYmlkLm9yZw` |
diff --git a/modules/andbeyondBidAdapter.md b/modules/andbeyondBidAdapter.md
deleted file mode 100644
index 7d58bac0abc..00000000000
--- a/modules/andbeyondBidAdapter.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Overview
-
-```
-Module Name: andbeyond Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: shreyanschopra@rtbdemand.com
-```
-
-# Description
-
-Connects to andbeyond whitelabel platform.
-Banner formats are supported.
-
-
-# Test Parameters
-```
-    var adUnits = [
-      {
-        code: 'banner-ad-div',
-        sizes: [[300, 250]],  // banner size
-        bids: [
-          {
-            bidder: 'andbeyond',
-            params: {
-              zoneId: '30164',  //required parameter
-              host: 'cpm.metaadserving.com' //required parameter
-            }
-          }
-        ]
-      }
-    ];
-```
diff --git a/modules/aniviewBidAdapter.js b/modules/aniviewBidAdapter.js
index f0fab83aeea..84552638421 100644
--- a/modules/aniviewBidAdapter.js
+++ b/modules/aniviewBidAdapter.js
@@ -1,8 +1,10 @@
-import { VIDEO } from '../src/mediaTypes.js';
+import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
+import { logError } from '../src/utils.js';
 
 const BIDDER_CODE = 'aniview';
+const GVLID = 780;
 const TTL = 600;
 
 function avRenderer(bid) {
@@ -24,10 +26,28 @@ function avRenderer(bid) {
 }
 
 function newRenderer(bidRequest) {
-  let playerDomain = bidRequest && bidRequest.bidRequest && bidRequest.bidRequest.params && bidRequest.bidRequest.params.playerDomain ? bidRequest.bidRequest.params.playerDomain : 'player.aniview.com';
+  let playerDomain = 'player.aniview.com';
+  const config = {};
+
+  if (bidRequest && bidRequest.bidRequest && bidRequest.bidRequest.params) {
+    const params = bidRequest.bidRequest.params
+
+    if (params.playerDomain) {
+      playerDomain = params.playerDomain;
+    }
+
+    if (params.AV_PUBLISHERID) {
+      config.AV_PUBLISHERID = params.AV_PUBLISHERID;
+    }
+
+    if (params.AV_CHANNELID) {
+      config.AV_CHANNELID = params.AV_CHANNELID;
+    }
+  }
+
   const renderer = Renderer.install({
     url: 'https://' + playerDomain + '/script/6.1/prebidRenderer.js',
-    config: {},
+    config: config,
     loaded: false,
   });
 
@@ -86,11 +106,8 @@ function buildRequests(validBidRequests, bidderRequest) {
 
       if (s2sParams.AV_APPPKGNAME && !s2sParams.AV_URL) { s2sParams.AV_URL = s2sParams.AV_APPPKGNAME; }
       if (!s2sParams.AV_IDFA && !s2sParams.AV_URL) {
-        if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-          s2sParams.AV_URL = bidderRequest.refererInfo.referer;
-        } else {
-          s2sParams.AV_URL = window.location.href;
-        }
+        // TODO: does it make sense to fall back to window.location here?
+        s2sParams.AV_URL = bidderRequest?.refererInfo?.page || window.location.href;
       }
       if (s2sParams.AV_IDFA && !s2sParams.AV_AID) { s2sParams.AV_AID = s2sParams.AV_IDFA; }
       if (s2sParams.AV_AID && !s2sParams.AV_IDFA) { s2sParams.AV_IDFA = s2sParams.AV_AID; }
@@ -153,6 +170,22 @@ function getCpmData(xml) {
   }
   return ret;
 }
+function buildBanner(xmlStr, bidRequest, bidResponse) {
+  var rendererData = JSON.stringify({
+    id: bidRequest.adUnitCode,
+    debug: window.location.href.indexOf('pbjsDebug') >= 0,
+    placement: bidRequest.bidRequest.adUnitCode,
+    width: bidResponse.width,
+    height: bidResponse.height,
+    vastXml: xmlStr,
+    bid: bidResponse,
+    config: bidRequest.bidRequest.params.rendererConfig
+  });
+  var playerDomain = bidRequest.bidRequest.params.playerDomain || 'player.aniview.com';
+  var ad = '<script src="https://' + playerDomain + '/script/6.1/prebidRenderer.js"></script>';
+  ad += '<script> window.aniviewRenderer.renderAd(' + rendererData + ') </script>'
+  return ad;
+}
 function interpretResponse(serverResponse, bidRequest) {
   let bidResponses = [];
   if (serverResponse && serverResponse.body) {
@@ -162,11 +195,15 @@ function interpretResponse(serverResponse, bidRequest) {
       try {
         let bidResponse = {};
         if (bidRequest && bidRequest.data && bidRequest.data.bidId && bidRequest.data.bidId !== '') {
+          let mediaType = VIDEO;
+          if (bidRequest.bidRequest && bidRequest.bidRequest.mediaTypes && !bidRequest.bidRequest.mediaTypes[VIDEO]) {
+            mediaType = BANNER;
+          }
           let xmlStr = serverResponse.body;
           let xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
           if (xml && xml.getElementsByTagName('parsererror').length == 0) {
             let cpmData = getCpmData(xml);
-            if (cpmData && cpmData.cpm > 0) {
+            if (cpmData.cpm > 0) {
               bidResponse.requestId = bidRequest.data.bidId;
               bidResponse.ad = '';
               bidResponse.cpm = cpmData.cpm;
@@ -176,13 +213,26 @@ function interpretResponse(serverResponse, bidRequest) {
               bidResponse.creativeId = xml.getElementsByTagName('Ad') && xml.getElementsByTagName('Ad')[0] && xml.getElementsByTagName('Ad')[0].getAttribute('id') ? xml.getElementsByTagName('Ad')[0].getAttribute('id') : 'creativeId';
               bidResponse.currency = cpmData.currency;
               bidResponse.netRevenue = true;
-              var blob = new Blob([xmlStr], {
-                type: 'application/xml'
-              });
-              bidResponse.vastUrl = window.URL.createObjectURL(blob);
-              bidResponse.vastXml = xmlStr;
-              bidResponse.mediaType = VIDEO;
-              if (bidRequest.bidRequest && bidRequest.bidRequest.mediaTypes && bidRequest.bidRequest.mediaTypes.video && bidRequest.bidRequest.mediaTypes.video.context === 'outstream') { bidResponse.renderer = newRenderer(bidRequest); }
+              bidResponse.mediaType = mediaType;
+              if (mediaType === VIDEO) {
+                try {
+                  var blob = new Blob([xmlStr], {
+                    type: 'application/xml'
+                  });
+                  bidResponse.vastUrl = window.URL.createObjectURL(blob);
+                } catch (ex) {
+                  logError('Aniview Debug create vastXml error:\n\n' + ex);
+                }
+                bidResponse.vastXml = xmlStr;
+                if (bidRequest.bidRequest && bidRequest.bidRequest.mediaTypes && bidRequest.bidRequest.mediaTypes.video && bidRequest.bidRequest.mediaTypes.video.context === 'outstream') {
+                  bidResponse.renderer = newRenderer(bidRequest);
+                }
+              } else {
+                bidResponse.ad = buildBanner(xmlStr, bidRequest, bidResponse);
+              }
+              bidResponse.meta = {
+                advertiserDomains: []
+              };
 
               bidResponses.push(bidResponse);
             }
@@ -211,7 +261,10 @@ function getSyncData(xml, options) {
                 if (data && data.trackers && data.trackers.length) {
                   data = data.trackers;
                   for (var j = 0; j < data.length; j++) {
-                    if (typeof data[j] === 'object' && typeof data[j].url === 'string' && data[j].e === 'inventory') {
+                    if (typeof data[j] === 'object' &&
+                      typeof data[j].url === 'string' &&
+                      (data[j].e === 'inventory' || data[j].e === 'sync')
+                    ) {
                       if (data[j].t == 1 && options.pixelEnabled) {
                         ret.push({url: data[j].url, type: 'image'});
                       } else {
@@ -252,8 +305,9 @@ function getUserSyncs(syncOptions, serverResponses) {
 
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['selectmediavideo'],
-  supportedMediaTypes: [VIDEO],
+  gvlid: GVLID,
+  aliases: ['avantisvideo', 'selectmediavideo', 'vidcrunch', 'openwebvideo', 'didnavideo', 'ottadvisors', 'pgammedia'],
+  supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid,
   buildRequests,
   interpretResponse,
diff --git a/modules/aniviewBidAdapter.md b/modules/aniviewBidAdapter.md
index cfa87bb2d28..63c91ca009a 100644
--- a/modules/aniviewBidAdapter.md
+++ b/modules/aniviewBidAdapter.md
@@ -10,7 +10,7 @@ Maintainer: support@aniview.com
 
 Connects to ANIVIEW Ad server for bids.
 
-ANIVIEW bid adapter supports Video ads currently.
+ANIVIEW bid adapter supports Banner and Video currently.
 
 For more information about [Aniview](http://www.aniview.com), please contact [support@aniview.com](support@aniview.com).
 
diff --git a/modules/aolBidAdapter.js b/modules/aolBidAdapter.js
index d7ff7453870..6b471ac6de2 100644
--- a/modules/aolBidAdapter.js
+++ b/modules/aolBidAdapter.js
@@ -1,9 +1,10 @@
-import * as utils from '../src/utils.js';
+import { isInteger, logError, isEmpty, logWarn, getUniqueIdentifierStr, _each, deepSetValue } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 
 const AOL_BIDDERS_CODES = {
   AOL: 'aol',
+  VERIZON: 'verizon',
   ONEMOBILE: 'onemobile',
   ONEDISPLAY: 'onedisplay'
 };
@@ -29,6 +30,41 @@ const SYNC_TYPES = {
   }
 };
 
+const SUPPORTED_USER_ID_SOURCES = [
+  'admixer.net',
+  'adserver.org',
+  'adtelligent.com',
+  'akamai.com',
+  'amxrtb.com',
+  'audigent.com',
+  'britepool.com',
+  'criteo.com',
+  'crwdcntrl.net',
+  'deepintent.com',
+  'epsilon.com',
+  'hcn.health',
+  'id5-sync.com',
+  'idx.lat',
+  'intentiq.com',
+  'intimatemerger.com',
+  'liveintent.com',
+  'liveramp.com',
+  'mediawallahscript.com',
+  'merkleinc.com',
+  'netid.de',
+  'neustar.biz',
+  'nextroll.com',
+  'novatiq.com',
+  'parrable.com',
+  'pubcid.org',
+  'quantcast.com',
+  'tapad.com',
+  'uidapi.com',
+  'verizonmedia.com',
+  'yahoo.com',
+  'zeotap.com'
+];
+
 const pubapiTemplate = template`${'host'}/pubapi/3.0/${'network'}/${'placement'}/${'pageid'}/${'sizeid'}/ADTECH;v=2;cmd=bid;cors=yes;alias=${'alias'};misc=${'misc'};${'dynamicParams'}`;
 const nexageBaseApiTemplate = template`${'host'}/bidRequest?`;
 const nexageGetApiTemplate = template`dcn=${'dcn'}&pos=${'pos'}&cmd=bid${'dynamicParams'}`;
@@ -48,31 +84,33 @@ const NUMERIC_VALUES = {
 };
 
 function template(strings, ...keys) {
-  return function(...values) {
+  return function (...values) {
     let dict = values[values.length - 1] || {};
     let result = [strings[0]];
-    keys.forEach(function(key, i) {
-      let value = utils.isInteger(key) ? values[key] : dict[key];
+    keys.forEach(function (key, i) {
+      let value = isInteger(key) ? values[key] : dict[key];
       result.push(value, strings[i + 1]);
     });
     return result.join('');
   };
 }
 
-function _isMarketplaceBidder(bidder) {
-  return bidder === AOL_BIDDERS_CODES.AOL || bidder === AOL_BIDDERS_CODES.ONEDISPLAY;
+function _isMarketplaceBidder(bidderCode) {
+  return bidderCode === AOL_BIDDERS_CODES.AOL ||
+    bidderCode === AOL_BIDDERS_CODES.VERIZON ||
+    bidderCode === AOL_BIDDERS_CODES.ONEDISPLAY;
 }
 
 function _isOneMobileBidder(bidderCode) {
-  return bidderCode === AOL_BIDDERS_CODES.AOL || bidderCode === AOL_BIDDERS_CODES.ONEMOBILE;
+  return bidderCode === AOL_BIDDERS_CODES.AOL ||
+    bidderCode === AOL_BIDDERS_CODES.VERIZON ||
+    bidderCode === AOL_BIDDERS_CODES.ONEMOBILE;
 }
 
 function _isNexageRequestPost(bid) {
   if (_isOneMobileBidder(bid.bidder) && bid.params.id && bid.params.imp && bid.params.imp[0]) {
     let imp = bid.params.imp[0];
-    return imp.id && imp.tagid &&
-      ((imp.banner && imp.banner.w && imp.banner.h) ||
-        (imp.video && imp.video.mimes && imp.video.minduration && imp.video.maxduration));
+    return imp.id && imp.tagid && imp.banner && imp.banner.w && imp.banner.h;
   }
 }
 
@@ -98,10 +136,20 @@ function resolveEndpointCode(bid) {
   }
 }
 
+function getSupportedEids(bid) {
+  return bid.userIdAsEids.filter(eid => {
+    return SUPPORTED_USER_ID_SOURCES.indexOf(eid.source) !== -1
+  });
+}
+
 export const spec = {
   code: AOL_BIDDERS_CODES.AOL,
   gvlid: 25,
-  aliases: [AOL_BIDDERS_CODES.ONEMOBILE, AOL_BIDDERS_CODES.ONEDISPLAY],
+  aliases: [
+    AOL_BIDDERS_CODES.ONEMOBILE,
+    AOL_BIDDERS_CODES.ONEDISPLAY,
+    AOL_BIDDERS_CODES.VERIZON
+  ],
   supportedMediaTypes: [BANNER],
   isBidRequestValid(bid) {
     return isMarketplaceBid(bid) || isMobileBid(bid);
@@ -111,6 +159,13 @@ export const spec = {
     if (bidderRequest) {
       consentData.gdpr = bidderRequest.gdprConsent;
       consentData.uspConsent = bidderRequest.uspConsent;
+      consentData.gppConsent = bidderRequest.gppConsent;
+      if (!consentData.gppConsent && bidderRequest.ortb2?.regs?.gpp) {
+        consentData.gppConsent = {
+          gppString: bidderRequest.ortb2.regs.gpp,
+          applicableSections: bidderRequest.ortb2.regs.gpp_sid
+        }
+      }
     }
 
     return bids.map(bid => {
@@ -121,9 +176,9 @@ export const spec = {
       }
     });
   },
-  interpretResponse({body}, bidRequest) {
+  interpretResponse({ body }, bidRequest) {
     if (!body) {
-      utils.logError('Empty bid response', bidRequest.bidderCode, body);
+      logError('Empty bid response', bidRequest.bidderCode, body);
     } else {
       let bid = this._parseBidResponse(body, bidRequest);
 
@@ -133,7 +188,7 @@ export const spec = {
     }
   },
   getUserSyncs(options, serverResponses) {
-    const bidResponse = !utils.isEmpty(serverResponses) && serverResponses[0].body;
+    const bidResponse = !isEmpty(serverResponses) && serverResponses[0].body;
 
     if (bidResponse && bidResponse.ext && bidResponse.ext.pixels) {
       return this.parsePixelItems(bidResponse.ext.pixels);
@@ -191,7 +246,7 @@ export const spec = {
     let server;
 
     if (!MP_SERVER_MAP.hasOwnProperty(regionParam)) {
-      utils.logWarn(`Unknown region '${regionParam}' for AOL bidder.`);
+      logWarn(`Unknown region '${regionParam}' for AOL bidder.`);
       regionParam = 'us'; // Default region.
     }
 
@@ -210,17 +265,24 @@ export const spec = {
       placement: parseInt(params.placement),
       pageid: params.pageId || 0,
       sizeid: params.sizeId || 0,
-      alias: params.alias || utils.getUniqueIdentifierStr(),
+      alias: params.alias || getUniqueIdentifierStr(),
       misc: new Date().getTime(), // cache busting
       dynamicParams: this.formatMarketplaceDynamicParams(params, consentData)
     }));
   },
   buildOneMobileGetUrl(bid, consentData) {
-    let {dcn, pos, ext} = bid.params;
+    let { dcn, pos, ext } = bid.params;
+    if (typeof bid.userId === 'object') {
+      ext = ext || {};
+      let eids = getSupportedEids(bid);
+      eids.forEach(eid => {
+        ext['eid' + eid.source] = eid.uids[0].id;
+      });
+    }
     let nexageApi = this.buildOneMobileBaseUrl(bid);
     if (dcn && pos) {
       let dynamicParams = this.formatOneMobileDynamicParams(ext, consentData);
-      nexageApi += nexageGetApiTemplate({dcn, pos, dynamicParams});
+      nexageApi += nexageGetApiTemplate({ dcn, pos, dynamicParams });
     }
     return nexageApi;
   },
@@ -238,15 +300,11 @@ export const spec = {
   formatMarketplaceDynamicParams(params = {}, consentData = {}) {
     let queryParams = {};
 
-    if (params.bidFloor) {
-      queryParams.bidfloor = params.bidFloor;
-    }
-
     Object.assign(queryParams, this.formatKeyValues(params.keyValues));
     Object.assign(queryParams, this.formatConsentData(consentData));
 
     let paramsFormatted = '';
-    utils._each(queryParams, (value, key) => {
+    _each(queryParams, (value, key) => {
       paramsFormatted += `${key}=${encodeURIComponent(value)};`;
     });
 
@@ -260,7 +318,7 @@ export const spec = {
     Object.assign(params, this.formatConsentData(consentData));
 
     let paramsFormatted = '';
-    utils._each(params, (value, key) => {
+    _each(params, (value, key) => {
       paramsFormatted += `&${key}=${encodeURIComponent(value)}`;
     });
 
@@ -273,14 +331,24 @@ export const spec = {
     };
 
     if (this.isEUConsentRequired(consentData)) {
-      utils.deepSetValue(openRtbObject, 'regs.ext.gdpr', NUMERIC_VALUES.TRUE);
+      deepSetValue(openRtbObject, 'regs.ext.gdpr', NUMERIC_VALUES.TRUE);
       if (consentData.gdpr.consentString) {
-        utils.deepSetValue(openRtbObject, 'user.ext.consent', consentData.gdpr.consentString);
+        deepSetValue(openRtbObject, 'user.ext.consent', consentData.gdpr.consentString);
       }
     }
 
     if (consentData.uspConsent) {
-      utils.deepSetValue(openRtbObject, 'regs.ext.us_privacy', consentData.uspConsent);
+      deepSetValue(openRtbObject, 'regs.ext.us_privacy', consentData.uspConsent);
+    }
+
+    if (typeof bid.userId === 'object') {
+      openRtbObject.user = openRtbObject.user || {};
+      openRtbObject.user.ext = openRtbObject.user.ext || {};
+
+      let eids = getSupportedEids(bid);
+      if (eids.length > 0) {
+        openRtbObject.user.ext.eids = eids
+      }
     }
 
     return openRtbObject;
@@ -291,7 +359,7 @@ export const spec = {
   formatKeyValues(keyValues) {
     let keyValuesHash = {};
 
-    utils._each(keyValues, (value, key) => {
+    _each(keyValues, (value, key) => {
       keyValuesHash[`kv${key}`] = value;
     });
 
@@ -312,6 +380,11 @@ export const spec = {
       params.us_privacy = consentData.uspConsent;
     }
 
+    if (consentData.gppConsent && consentData.gppConsent.gppString) {
+      params.gpp = consentData.gppConsent.gppString;
+      params.gpp_sid = consentData.gppConsent.applicableSections;
+    }
+
     return params;
   },
   parsePixelItems(pixels) {
@@ -327,7 +400,7 @@ export const spec = {
           let tagName = item.match(tagNameRegExp)[0];
           let url = item.match(srcRegExp)[2];
 
-          if (tagName && tagName) {
+          if (tagName && url) {
             pixelsItems.push({
               type: tagName === SYNC_TYPES.IMAGE.TAG ? SYNC_TYPES.IMAGE.TYPE : SYNC_TYPES.IFRAME.TYPE,
               url: url
@@ -357,7 +430,7 @@ export const spec = {
       cpm = bidData.price;
 
       if (cpm === null || isNaN(cpm)) {
-        utils.logError('Invalid price in bid response', AOL_BIDDERS_CODES.AOL, bidData);
+        logError('Invalid price in bid response', AOL_BIDDERS_CODES.AOL, bidData);
         return;
       }
     }
@@ -374,6 +447,9 @@ export const spec = {
       currency: response.cur || 'USD',
       dealId: bidData.dealid,
       netRevenue: true,
+      meta: {
+        advertiserDomains: bidData && bidData.adomain ? bidData.adomain : []
+      },
       ttl: bidRequest.ttl
     };
   },
diff --git a/modules/apacdexBidAdapter.js b/modules/apacdexBidAdapter.js
new file mode 100644
index 00000000000..10593855c59
--- /dev/null
+++ b/modules/apacdexBidAdapter.js
@@ -0,0 +1,348 @@
+import { deepAccess, isPlainObject, isArray, replaceAuctionPrice, isFn } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {parseDomain} from '../src/refererDetection.js';
+const BIDDER_CODE = 'apacdex';
+const ENDPOINT = 'https://useast.quantumdex.io/auction/pbjs'
+const USERSYNC = 'https://sync.quantumdex.io/usersync/pbjs'
+
+var bySlotTargetKey = {};
+var bySlotSizesCount = {}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: ['banner', 'video'],
+  aliases: ['quantumdex', 'valueimpression'],
+  isBidRequestValid: function (bid) {
+    if (!bid.params) {
+      return false;
+    }
+    if (!bid.params.siteId && !bid.params.placementId) {
+      return false;
+    }
+    if (!deepAccess(bid, 'mediaTypes.banner') && !deepAccess(bid, 'mediaTypes.video')) {
+      return false;
+    }
+    if (deepAccess(bid, 'mediaTypes.banner')) { // Not support multi type bids, favor banner over video
+      if (!deepAccess(bid, 'mediaTypes.banner.sizes')) {
+        // sizes at the banner is required.
+        return false;
+      }
+    } else if (deepAccess(bid, 'mediaTypes.video')) {
+      if (!deepAccess(bid, 'mediaTypes.video.playerSize')) {
+        // playerSize is required for instream adUnits.
+        return false;
+      }
+    }
+    return true;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let schain;
+    let eids;
+    let geo;
+    let test;
+    let bids = [];
+
+    test = config.getConfig('debug');
+
+    validBidRequests.forEach(bidReq => {
+      if (bidReq.schain) {
+        schain = schain || bidReq.schain
+      }
+
+      if (bidReq.userIdAsEids) {
+        eids = eids || bidReq.userIdAsEids
+      }
+
+      if (bidReq.params && bidReq.params.geo) {
+        if (validateGeoObject(bidReq.params.geo)) {
+          geo = bidReq.params.geo;
+        }
+      }
+
+      var targetKey = 0;
+      if (bySlotTargetKey[bidReq.adUnitCode] != undefined) {
+        targetKey = bySlotTargetKey[bidReq.adUnitCode];
+      } else {
+        var biggestSize = _getBiggestSize(bidReq.sizes);
+        if (biggestSize) {
+          if (bySlotSizesCount[biggestSize] != undefined) {
+            bySlotSizesCount[biggestSize]++
+            targetKey = bySlotSizesCount[biggestSize];
+          } else {
+            bySlotSizesCount[biggestSize] = 0;
+            targetKey = 0
+          }
+        }
+      }
+      bySlotTargetKey[bidReq.adUnitCode] = targetKey;
+      bidReq.targetKey = targetKey;
+
+      let bidFloor = getBidFloor(bidReq);
+      if (bidFloor) {
+        bidReq.bidFloor = bidFloor;
+      }
+
+      bids.push(JSON.parse(JSON.stringify(bidReq)));
+    });
+
+    const payload = {};
+    payload.tmax = bidderRequest.timeout;
+    if (test) {
+      payload.test = 1;
+    }
+
+    payload.device = {};
+    payload.device.ua = navigator.userAgent;
+    payload.device.height = window.screen.width;
+    payload.device.width = window.screen.height;
+    payload.device.dnt = _getDoNotTrack();
+    payload.device.language = navigator.language;
+
+    var pageUrl = _extractTopWindowUrlFromBidderRequest(bidderRequest);
+    payload.site = {};
+    payload.site.page = pageUrl;
+    payload.site.referrer = _extractTopWindowReferrerFromBidderRequest(bidderRequest);
+    // TODO: does it make sense to fall back to window.location for the domain?
+    payload.site.hostname = bidderRequest.refererInfo?.domain || parseDomain(pageUrl);
+
+    // Apply GDPR parameters to request.
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdpr = {};
+      payload.gdpr.gdprApplies = !!bidderRequest.gdprConsent.gdprApplies;
+      if (bidderRequest.gdprConsent.consentString) {
+        payload.gdpr.consentString = bidderRequest.gdprConsent.consentString;
+      }
+    }
+
+    // Apply us_privacy.
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    // Apply schain.
+    if (schain) {
+      payload.schain = schain;
+    }
+
+    // Apply eids.
+    if (eids) {
+      payload.eids = eids;
+    }
+
+    // Apply geo
+    if (geo) {
+      payload.geo = geo;
+    }
+
+    payload.bids = bids.map(function (bid) {
+      return {
+        params: bid.params,
+        mediaTypes: bid.mediaTypes,
+        transactionId: bid.transactionId,
+        sizes: bid.sizes,
+        bidId: bid.bidId,
+        adUnitCode: bid.adUnitCode,
+        bidFloor: bid.bidFloor
+      }
+    });
+
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: payload,
+      withCredentials: true,
+      bidderRequests: bids
+    };
+  },
+  interpretResponse: function (serverResponse, bidRequest) {
+    const serverBody = serverResponse.body;
+    if (!serverBody || !isPlainObject(serverBody)) {
+      return [];
+    }
+
+    const serverBids = serverBody.bids;
+    if (!serverBids || !isArray(serverBids)) {
+      return [];
+    }
+
+    const bidResponses = [];
+    serverBids.forEach(bid => {
+      const dealId = bid.dealId || '';
+      const bidResponse = {
+        requestId: bid.requestId,
+        cpm: bid.cpm,
+        width: bid.width,
+        height: bid.height,
+        creativeId: bid.creativeId,
+        currency: bid.currency,
+        netRevenue: bid.netRevenue,
+        ttl: bid.ttl,
+        mediaType: bid.mediaType
+      };
+      if (dealId.length > 0) {
+        bidResponse.dealId = dealId;
+      }
+      if (bid.vastXml) {
+        bidResponse.vastXml = replaceAuctionPrice(bid.vastXml, bid.cpm);
+      } else {
+        bidResponse.ad = replaceAuctionPrice(bid.ad, bid.cpm);
+      }
+      bidResponse.meta = {};
+      if (bid.meta && bid.meta.advertiserDomains && isArray(bid.meta.advertiserDomains)) {
+        bidResponse.meta.advertiserDomains = bid.meta.advertiserDomains;
+      }
+      bidResponses.push(bidResponse);
+    });
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    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 (uspConsent) {
+        params += `${params ? '&' : '?'}us_privacy=${encodeURIComponent(uspConsent)}`;
+      }
+
+      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;
+  }
+};
+
+function _getBiggestSize(sizes) {
+  if (sizes.length <= 0) return false
+  var acreage = 0;
+  var index = 0;
+  for (var i = 0; i < sizes.length; i++) {
+    var currentAcreage = sizes[i][0] * sizes[i][1];
+    if (currentAcreage >= acreage) {
+      acreage = currentAcreage;
+      index = i;
+    }
+  }
+  return sizes[index][0] + 'x' + sizes[index][1];
+}
+
+function _getDoNotTrack() {
+  try {
+    if (window.top.doNotTrack && window.top.doNotTrack == '1') {
+      return 1;
+    }
+  } catch (e) { }
+
+  try {
+    if (navigator.doNotTrack && (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1')) {
+      return 1;
+    }
+  } catch (e) { }
+
+  try {
+    if (navigator.msDoNotTrack && navigator.msDoNotTrack == '1') {
+      return 1;
+    }
+  } catch (e) { }
+
+  return 0
+}
+
+/**
+ * Extracts the page url from given bid request or use the (top) window location as fallback
+ *
+ * @param {*} bidderRequest
+ * @returns {string}
+ */
+function _extractTopWindowUrlFromBidderRequest(bidderRequest) {
+  // TODO: does it make sense to fall back to window.location?
+  return bidderRequest?.refererInfo?.page || window.location.href;
+}
+
+/**
+ * Extracts the referrer from given bid request or use the (top) document referrer as fallback
+ *
+ * @param {*} bidderRequest
+ * @returns {string}
+ */
+function _extractTopWindowReferrerFromBidderRequest(bidderRequest) {
+  // TODO: does it make sense to fall back to window.document.referrer?
+  return bidderRequest?.refererInfo?.ref || window.document.referrer;
+}
+
+/**
+ * Validate geo object
+ *
+ * @param {Object} geo
+ * @returns {boolean}
+ */
+export function validateGeoObject(geo) {
+  if (!isPlainObject(geo)) {
+    return false;
+  }
+  if (!geo.lat) {
+    return false;
+  }
+  if (!geo.lon) {
+    return false;
+  }
+  if (!geo.accuracy) {
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Get bid floor from Price Floors Module
+ *
+ * @param {Object} bid
+ * @returns {float||null}
+ */
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.floorPrice) ? bid.params.floorPrice : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
+registerBidder(spec);
diff --git a/modules/apacdexBidAdapter.md b/modules/apacdexBidAdapter.md
new file mode 100644
index 00000000000..fa8c727d709
--- /dev/null
+++ b/modules/apacdexBidAdapter.md
@@ -0,0 +1,104 @@
+# Overview
+
+```
+Module Name: APAC Digital Exchange Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: ken@apacdex.com
+```
+
+# Description
+
+Connects to APAC Digital Exchange for bids.
+Apacdex bid adapter supports Banner and Video (Instream and Outstream) ads.
+
+# Sample Banner Ad Unit
+```
+var adUnits = [
+  {
+    code: 'test-div',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300,600]]
+      }
+    },
+    bids: [
+      {
+          bidder: 'apacdex',
+          params: {
+              siteId: 'apacdex1234', // siteId provided by Apacdex
+              floorPrice: 0.01, // default is 0.01 if not declared
+          }
+      }
+    ]
+  }
+];
+```
+
+# Sample Video Ad Unit: Instream
+```
+var videoAdUnit = {
+  code: 'test-div',
+  sizes: [[640, 480]],
+  mediaTypes: {
+    video: {
+      playerSize: [[640, 480]],
+      context: "instream"
+      api: [2],
+      placement: 1,
+      skip: 1,
+      linearity: 1,
+      minduration: 1,
+      maxduration: 120,
+      mimes: ["video/mp4", "video/x-flv", "video/x-ms-wmv", "application/vnd.apple.mpegurl", "application/x-mpegurl", "video/3gpp", "video/mpeg", "video/ogg", "video/quicktime", "video/webm", "video/x-m4v", "video/ms-asf", video/x-msvideo"],
+      playbackmethod: [6],
+      startdelay: 0,
+      protocols: [1, 2, 3, 4, 5, 6]
+    },
+  },
+  bids: [
+    {
+      bidder: 'apacdex',
+      params: {
+        siteId: 'apacdex1234', // siteId provided by Apacdex
+        floorPrice: 0.01, // default is 0.01 if not declared
+      }
+    }
+  ]
+};
+```
+mediaTypes.video object reference to section 3.2.7 Object: Video in the OpenRTB 2.5 document
+You must review all video parameters to ensure validity for your player and DSPs
+
+# Sample Video Ad Unit: Outstream
+```
+var videoAdUnit = {
+  code: 'test-div',
+  sizes: [[410, 231]],
+  mediaTypes: {
+    video: {
+      playerSize: [[410, 231]],
+      context: "outstream"
+      api: [2],
+      placement: 5,
+      linearity: 1,
+      minduration: 1,
+      maxduration: 120,
+      mimes: ["video/mp4", "video/x-flv", "video/x-ms-wmv", "application/vnd.apple.mpegurl", "application/x-mpegurl", "video/3gpp", "video/mpeg", "video/ogg", "video/quicktime", "video/webm", "video/x-m4v", "video/ms-asf", video/x-msvideo"],
+      playbackmethod: [6],
+      startdelay: 0,
+      protocols: [1, 2, 3, 4, 5, 6]
+    },
+  },
+  bids: [
+    {
+      bidder: 'apacdex',
+      params: {
+        siteId: 'apacdex1234', // siteId provided by Apacdex
+        floorPrice: 0.01, // default is 0.01 if not declared
+      }
+    }
+  ]
+};
+```
+mediaTypes.video object reference to section 3.2.7 Object: Video in the OpenRTB 2.5 document
+You must review all video parameters to ensure validity for your player and DSPs
\ No newline at end of file
diff --git a/modules/appierAnalyticsAdapter.js b/modules/appierAnalyticsAdapter.js
index afcf63ef2c1..b4081feaf92 100644
--- a/modules/appierAnalyticsAdapter.js
+++ b/modules/appierAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {getGlobal} from '../src/prebidGlobal.js';
diff --git a/modules/appierBidAdapter.js b/modules/appierBidAdapter.js
index 1940233a0b4..12346d15130 100644
--- a/modules/appierBidAdapter.js
+++ b/modules/appierBidAdapter.js
@@ -43,7 +43,8 @@ export const spec = {
     const bidderApiUrl = `//${server}${BIDDER_API_ENDPOINT}`
     const payload = {
       'bids': bidRequests,
-      'refererInfo': bidderRequest.refererInfo,
+      // TODO: please do not pass internal data structures over to the network
+      'refererInfo': bidderRequest.refererInfo.legacy,
       'version': ADAPTER_VERSION
     };
     return [{
diff --git a/modules/appnexusAnalyticsAdapter.js b/modules/appnexusAnalyticsAdapter.js
deleted file mode 100644
index d697d31cdd3..00000000000
--- a/modules/appnexusAnalyticsAdapter.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * appnexus.js - AppNexus Prebid Analytics Adapter
- */
-
-import adapter from '../src/AnalyticsAdapter.js';
-import adapterManager from '../src/adapterManager.js';
-
-var appnexusAdapter = adapter({
-  global: 'AppNexusPrebidAnalytics',
-  handler: 'on',
-  analyticsType: 'bundle'
-});
-
-adapterManager.registerAnalyticsAdapter({
-  adapter: appnexusAdapter,
-  code: 'appnexus'
-});
-
-export default appnexusAdapter;
diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index f853d9b597b..b64334b0d77 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -1,21 +1,57 @@
-import { Renderer } from '../src/Renderer.js';
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { registerBidder, getIabSubCategory } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO, ADPOD } from '../src/mediaTypes.js';
-import { auctionManager } from '../src/auctionManager.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import { OUTSTREAM, INSTREAM } from '../src/video.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {
+  chunk,
+  convertCamelToUnderscore,
+  convertTypes,
+  createTrackPixelHtml,
+  deepAccess,
+  deepClone,
+  fill,
+  getBidRequest,
+  getMaxValueFromArray,
+  getMinValueFromArray,
+  getParameterByName,
+  getUniqueIdentifierStr,
+  getWindowFromDocument,
+  isArray,
+  isArrayOfNums,
+  isEmpty,
+  isFn,
+  isNumber,
+  isPlainObject,
+  isStr,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  mergeDeep,
+  transformBidderParamKeywords
+} from '../src/utils.js';
+import {Renderer} from '../src/Renderer.js';
+import {config} from '../src/config.js';
+import {getIabSubCategory, registerBidder} from '../src/adapters/bidderFactory.js';
+import {ADPOD, BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {find, includes} from '../src/polyfill.js';
+import {INSTREAM, OUTSTREAM} from '../src/video.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {bidderSettings} from '../src/bidderSettings.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'appnexus';
 const URL = 'https://ib.adnxs.com/ut/v3/prebid';
+const URL_SIMPLE = 'https://ib.adnxs-simple.com/ut/v3/prebid';
 const VIDEO_TARGETING = ['id', 'minduration', 'maxduration',
   'skippable', 'playback_method', 'frameworks', 'context', 'skipoffset'];
+const VIDEO_RTB_TARGETING = ['minduration', 'maxduration', 'skip', 'skipafter', 'playbackmethod', 'api', 'startdelay'];
 const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
 const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
 const DEBUG_PARAMS = ['enabled', 'dongle', 'member_id', 'debug_timeout'];
+const DEBUG_QUERY_PARAM_MAP = {
+  'apn_debug_dongle': 'dongle',
+  'apn_debug_member_id': 'member_id',
+  'apn_debug_timeout': 'debug_timeout'
+};
 const VIDEO_MAPPING = {
   playback_method: {
     'unknown': 0,
@@ -53,17 +89,28 @@ const NATIVE_MAPPING = {
 };
 const SOURCE = 'pbjs';
 const MAX_IMPS_PER_REQUEST = 15;
-const mappingFileUrl = 'https://acdn.adnxs.com/prebid/appnexus-mapping/mappings.json';
+const mappingFileUrl = 'https://acdn.adnxs-simple.com/prebid/appnexus-mapping/mappings.json';
 const SCRIPT_TAG_START = '<script';
-const VIEWABILITY_URL_START = /\/\/cdn\.adnxs\.com\/v/;
+const VIEWABILITY_URL_START = /\/\/cdn\.adnxs\.com\/v|\/\/cdn\.adnxs\-simple\.com\/v/;
 const VIEWABILITY_FILE_NAME = 'trk.js';
 const GVLID = 32;
-const storage = getStorageManager(GVLID, BIDDER_CODE);
+const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  aliases: ['appnexusAst', 'brealtime', 'emxdigital', 'pagescience', 'defymedia', 'gourmetads', 'matomy', 'featureforward', 'oftmedia', 'districtm', 'adasta', 'beintoo'],
+  aliases: [
+    { code: 'appnexusAst', gvlid: 32 },
+    { code: 'emxdigital', gvlid: 183 },
+    { code: 'pagescience' },
+    { code: 'defymedia' },
+    { code: 'gourmetads' },
+    { code: 'matomy' },
+    { code: 'featureforward' },
+    { code: 'oftmedia' },
+    { code: 'adasta' },
+    { code: 'beintoo', gvlid: 618 },
+  ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
@@ -72,7 +119,7 @@ export const spec = {
    * @param {object} bid The bid to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
    */
-  isBidRequestValid: function(bid) {
+  isBidRequestValid: function (bid) {
     return !!(bid.params.placementId || (bid.params.member && bid.params.invCode));
   },
 
@@ -82,19 +129,34 @@ export const spec = {
    * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
    * @return ServerRequest Info describing the request to the server.
    */
-  buildRequests: function(bidRequests, bidderRequest) {
+  buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const tags = bidRequests.map(bidToTag);
     const userObjBid = find(bidRequests, hasUserInfo);
     let userObj = {};
     if (config.getConfig('coppa') === true) {
-      userObj = {'coppa': true};
+      userObj = { 'coppa': true };
     }
     if (userObjBid) {
       Object.keys(userObjBid.params.user)
         .filter(param => includes(USER_PARAMS, param))
         .forEach((param) => {
-          let uparam = utils.convertCamelToUnderscore(param);
-          userObj[uparam] = userObjBid.params.user[param]
+          let uparam = convertCamelToUnderscore(param);
+          if (param === 'segments' && isArray(userObjBid.params.user[param])) {
+            let segs = [];
+            userObjBid.params.user[param].forEach(val => {
+              if (isNumber(val)) {
+                segs.push({'id': val});
+              } else if (isPlainObject(val)) {
+                segs.push(val);
+              }
+            });
+            userObj[uparam] = segs;
+          } else if (param !== 'segments') {
+            userObj[uparam] = userObjBid.params.user[param];
+          }
         });
     }
 
@@ -124,9 +186,21 @@ export const spec = {
       try {
         debugObj = JSON.parse(debugCookie);
       } catch (e) {
-        utils.logError('AppNexus Debug Auction Cookie Error:\n\n' + e);
+        logError('AppNexus Debug Auction Cookie Error:\n\n' + e);
       }
     } else {
+      Object.keys(DEBUG_QUERY_PARAM_MAP).forEach(qparam => {
+        let qval = getParameterByName(qparam);
+        if (isStr(qval) && qval !== '') {
+          debugObj[DEBUG_QUERY_PARAM_MAP[qparam]] = qval;
+          debugObj.enabled = true;
+        }
+      });
+      debugObj = convertTypes({
+        'member_id': 'number',
+        'debug_timeout': 'number'
+      }, debugObj);
+
       const debugBidRequest = find(bidRequests, hasDebug);
       if (debugBidRequest && debugBidRequest.debug) {
         debugObj = debugBidRequest.debug;
@@ -144,6 +218,7 @@ export const spec = {
     const memberIdBid = find(bidRequests, hasMemberId);
     const member = memberIdBid ? parseInt(memberIdBid.params.member, 10) : 0;
     const schain = bidRequests[0].schain;
+    const omidSupport = find(bidRequests, hasOmidSupport);
 
     const payload = {
       tags: [...tags],
@@ -155,24 +230,59 @@ export const spec = {
       schain: schain
     };
 
+    if (omidSupport) {
+      payload['iab_support'] = {
+        omidpn: 'Appnexus',
+        omidpv: '$prebid.version$'
+      };
+    }
+
     if (member > 0) {
       payload.member_id = member;
     }
 
     if (appDeviceObjBid) {
-      payload.device = appDeviceObj
+      payload.device = appDeviceObj;
     }
     if (appIdObjBid) {
       payload.app = appIdObj;
     }
 
+    function grabOrtb2Keywords(ortb2Obj) {
+      const fields = ['site.keywords', 'site.content.keywords', 'user.keywords', 'app.keywords', 'app.content.keywords'];
+      let result = [];
+
+      fields.forEach(path => {
+        let keyStr = deepAccess(ortb2Obj, path);
+        if (isStr(keyStr)) result.push(keyStr);
+      });
+      return result;
+    }
+
+    // grab the ortb2 keyword data (if it exists) and convert from the comma list string format to object format
+    let ortb2 = deepClone(bidderRequest && bidderRequest.ortb2);
+    let ortb2KeywordsObjList = grabOrtb2Keywords(ortb2).map(keyStr => convertStringToKeywordsObj(keyStr));
+
+    let anAuctionKeywords = deepClone(config.getConfig('appnexusAuctionKeywords')) || {};
+    // need to convert the string values into array of strings, to properly merge values with other existing keys later
+    Object.keys(anAuctionKeywords).forEach(k => { if (isStr(anAuctionKeywords[k]) || isNumber(anAuctionKeywords[k])) anAuctionKeywords[k] = [anAuctionKeywords[k]] });
+    // combine all sources of keywords (converted from string comma list to object format) into one object (that combines the values for shared keys)
+    let mergedAuctionKeywords = mergeDeep({}, anAuctionKeywords, ...ortb2KeywordsObjList);
+
+    // convert to final format used by adserver
+    let auctionKeywords = transformBidderParamKeywords(mergedAuctionKeywords);
+    if (auctionKeywords.length > 0) {
+      auctionKeywords.forEach(deleteValues);
+      payload.keywords = auctionKeywords;
+    }
+
     if (config.getConfig('adpod.brandCategoryExclusion')) {
       payload.brand_category_uniqueness = true;
     }
 
     if (debugObjParams.enabled) {
       payload.debug = debugObjParams;
-      utils.logInfo('AppNexus Debug Auction Settings:\n\n' + JSON.stringify(debugObjParams, null, 4));
+      logInfo('AppNexus Debug Auction Settings:\n\n' + JSON.stringify(debugObjParams, null, 4));
     }
 
     if (bidderRequest && bidderRequest.gdprConsent) {
@@ -181,18 +291,42 @@ export const spec = {
         consent_string: bidderRequest.gdprConsent.consentString,
         consent_required: bidderRequest.gdprConsent.gdprApplies
       };
+
+      if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+        let ac = bidderRequest.gdprConsent.addtlConsent;
+        // pull only the ids from the string (after the ~) and convert them to an array of ints
+        let acStr = ac.substring(ac.indexOf('~') + 1);
+        payload.gdpr_consent.addtl_consent = acStr.split('.').map(id => parseInt(id, 10));
+      }
     }
 
     if (bidderRequest && bidderRequest.uspConsent) {
-      payload.us_privacy = bidderRequest.uspConsent
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    if (bidderRequest?.gppConsent) {
+      payload.privacy = {
+        gpp: bidderRequest.gppConsent.gppString,
+        gpp_sid: bidderRequest.gppConsent.applicableSections
+      }
+    } else if (bidderRequest?.ortb2?.regs?.gpp) {
+      payload.privacy = {
+        gpp: bidderRequest.ortb2.regs.gpp,
+        gpp_sid: bidderRequest.ortb2.regs.gpp_sid
+      }
     }
 
     if (bidderRequest && bidderRequest.refererInfo) {
       let refererinfo = {
-        rd_ref: encodeURIComponent(bidderRequest.refererInfo.referer),
+        // TODO: are these the correct referer values?
+        rd_ref: encodeURIComponent(bidderRequest.refererInfo.topmostLocation),
         rd_top: bidderRequest.refererInfo.reachedTop,
         rd_ifs: bidderRequest.refererInfo.numIframes,
         rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      };
+      let pubPageUrl = bidderRequest.refererInfo.canonicalUrl;
+      if (isStr(pubPageUrl) && pubPageUrl !== '') {
+        refererinfo.rd_can = pubPageUrl;
       }
       payload.referrer_detection = refererinfo;
     }
@@ -207,26 +341,25 @@ export const spec = {
       });
     }
 
-    let eids = [];
-    const criteoId = utils.deepAccess(bidRequests[0], `userId.criteoId`);
-    if (criteoId) {
-      eids.push({
-        source: 'criteo.com',
-        id: criteoId
-      });
-    }
-
-    const tdid = utils.deepAccess(bidRequests[0], `userId.tdid`);
-    if (tdid) {
-      eids.push({
-        source: 'adserver.org',
-        id: tdid,
-        rti_partner: 'TDID'
-      });
-    }
+    if (bidRequests[0].userId) {
+      let eids = [];
+
+      addUserId(eids, deepAccess(bidRequests[0], `userId.criteoId`), 'criteo.com', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.netId`), 'netid.de', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.idl_env`), 'liveramp.com', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.tdid`), 'adserver.org', 'TDID');
+      addUserId(eids, deepAccess(bidRequests[0], `userId.uid2.id`), 'uidapi.com', 'UID2');
+      if (bidRequests[0].userId.pubProvidedId) {
+        bidRequests[0].userId.pubProvidedId.forEach(ppId => {
+          ppId.uids.forEach(uid => {
+            eids.push({ source: ppId.source, id: uid.id });
+          });
+        });
+      }
 
-    if (eids.length) {
-      payload.eids = eids;
+      if (eids.length) {
+        payload.eids = eids;
+      }
     }
 
     if (tags[0].publisher_id) {
@@ -243,13 +376,13 @@ export const spec = {
    * @param {*} serverResponse A successful response from the server.
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
-  interpretResponse: function(serverResponse, {bidderRequest}) {
+  interpretResponse: function (serverResponse, { bidderRequest }) {
     serverResponse = serverResponse.body;
     const bids = [];
     if (!serverResponse || serverResponse.error) {
       let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
       if (serverResponse && serverResponse.error) { errorMessage += `: ${serverResponse.error}`; }
-      utils.logError(errorMessage);
+      logError(errorMessage);
       return bids;
     }
 
@@ -257,7 +390,8 @@ export const spec = {
       serverResponse.tags.forEach(serverBid => {
         const rtbBid = getRtbBid(serverBid);
         if (rtbBid) {
-          if (rtbBid.cpm !== 0 && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
+          const cpmCheck = (bidderSettings.get(bidderRequest.bidderCode, 'allowZeroCpmBids') === true) ? rtbBid.cpm >= 0 : rtbBid.cpm > 0;
+          if (cpmCheck && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
             const bid = newBid(serverBid, rtbBid, bidderRequest);
             bid.mediaType = parseMediaType(rtbBid);
             bids.push(bid);
@@ -277,8 +411,8 @@ export const spec = {
         .replace(/<h1>(.*)<\/h1>/gm, '\n\n===== $1 =====\n\n') // Header H1
         .replace(/<h[2-6]>(.*)<\/h[2-6]>/gm, '\n\n*** $1 ***\n\n') // Headers
         .replace(/(<([^>]+)>)/igm, ''); // Remove any other tags
-      utils.logMessage('https://console.appnexus.com/docs/understanding-the-debug-auction');
-      utils.logMessage(debugText);
+      logMessage('https://console.appnexus.com/docs/understanding-the-debug-auction');
+      logMessage(debugText);
     }
 
     return bids;
@@ -295,15 +429,24 @@ export const spec = {
    * Returns mapping file info. This info will be used by bidderFactory to preload mapping file and store data in local storage
    * @returns {mappingFileInfo}
    */
-  getMappingFileInfo: function() {
+  getMappingFileInfo: function () {
     return {
       url: mappingFileUrl,
       refreshInDays: 2
     }
   },
 
-  getUserSyncs: function(syncOptions) {
-    if (syncOptions.iframeEnabled) {
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
+    function checkGppStatus(gppConsent) {
+      // this is a temporary measure to supress usersync in US-based GPP regions
+      // this logic will be revised when proper signals (akin to purpose1 from TCF2) can be determined for US GPP
+      if (gppConsent && Array.isArray(gppConsent.applicableSections)) {
+        return gppConsent.applicableSections.every(sec => typeof sec === 'number' && sec <= 5);
+      }
+      return true;
+    }
+
+    if (syncOptions.iframeEnabled && hasPurpose1Consent(gdprConsent) && checkGppStatus(gppConsent)) {
       return [{
         type: 'iframe',
         url: 'https://acdn.adnxs.com/dmp/async_usersync.html'
@@ -311,12 +454,32 @@ export const spec = {
     }
   },
 
-  transformBidParams: function(params, isOpenRtb) {
-    params = utils.convertTypes({
+  transformBidParams: function (params, isOpenRtb, adUnit, bidRequests) {
+    let conversionFn = transformBidderParamKeywords;
+    if (isOpenRtb === true) {
+      let s2sEndpointUrl = null;
+      let s2sConfig = config.getConfig('s2sConfig');
+
+      if (isPlainObject(s2sConfig)) {
+        s2sEndpointUrl = deepAccess(s2sConfig, 'endpoint.p1Consent');
+      } else if (isArray(s2sConfig)) {
+        s2sConfig.forEach(s2sCfg => {
+          if (includes(s2sCfg.bidders, adUnit.bids[0].bidder)) {
+            s2sEndpointUrl = deepAccess(s2sCfg, 'endpoint.p1Consent');
+          }
+        });
+      }
+
+      if (s2sEndpointUrl && s2sEndpointUrl.match('/openrtb2/prebid')) {
+        conversionFn = convertKeywordsToString;
+      }
+    }
+
+    params = convertTypes({
       'member': 'string',
       'invCode': 'string',
       'placementId': 'number',
-      'keywords': utils.transformBidderParamKeywords,
+      'keywords': conversionFn,
       'publisherId': 'number'
     }, params);
 
@@ -329,7 +492,7 @@ export const spec = {
       }
 
       Object.keys(params).forEach(paramKey => {
-        let convertedKey = utils.convertCamelToUnderscore(paramKey);
+        let convertedKey = convertCamelToUnderscore(paramKey);
         if (convertedKey !== paramKey) {
           params[convertedKey] = params[paramKey];
           delete params[paramKey];
@@ -338,21 +501,11 @@ export const spec = {
     }
 
     return params;
-  },
-
-  /**
-   * Add element selector to javascript tracker to improve native viewability
-   * @param {Bid} bid
-   */
-  onBidWon: function(bid) {
-    if (bid.native) {
-      reloadViewabilityScriptWithCorrectParameters(bid);
-    }
   }
-}
+};
 
 function isPopulatedArray(arr) {
-  return !!(utils.isArray(arr) && arr.length > 0);
+  return !!(isArray(arr) && arr.length > 0);
 }
 
 function deleteValues(keyPairObj) {
@@ -361,58 +514,9 @@ function deleteValues(keyPairObj) {
   }
 }
 
-function reloadViewabilityScriptWithCorrectParameters(bid) {
-  let viewJsPayload = getAppnexusViewabilityScriptFromJsTrackers(bid.native.javascriptTrackers);
-
-  if (viewJsPayload) {
-    let prebidParams = 'pbjs_adid=' + bid.adId + ';pbjs_auc=' + bid.adUnitCode;
-
-    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload)
-
-    let newJsTrackerSrc = jsTrackerSrc.replace('dom_id=%native_dom_id%', prebidParams);
-
-    // find iframe containing script tag
-    let frameArray = document.getElementsByTagName('iframe');
-
-    // boolean var to modify only one script. That way if there are muliple scripts,
-    // they won't all point to the same creative.
-    let modifiedAScript = false;
-
-    // first, loop on all ifames
-    for (let i = 0; i < frameArray.length && !modifiedAScript; i++) {
-      let currentFrame = frameArray[i];
-      try {
-        // IE-compatible, see https://stackoverflow.com/a/3999191/2112089
-        let nestedDoc = currentFrame.contentDocument || currentFrame.contentWindow.document;
-
-        if (nestedDoc) {
-          // if the doc is present, we look for our jstracker
-          let scriptArray = nestedDoc.getElementsByTagName('script');
-          for (let j = 0; j < scriptArray.length && !modifiedAScript; j++) {
-            let currentScript = scriptArray[j];
-            if (currentScript.getAttribute('data-src') == jsTrackerSrc) {
-              currentScript.setAttribute('src', newJsTrackerSrc);
-              currentScript.setAttribute('data-src', '');
-              if (currentScript.removeAttribute) {
-                currentScript.removeAttribute('data-src');
-              }
-              modifiedAScript = true;
-            }
-          }
-        }
-      } catch (exception) {
-        // trying to access a cross-domain iframe raises a SecurityError
-        // this is expected and ignored
-        if (!(exception instanceof DOMException && exception.name === 'SecurityError')) {
-          // all other cases are raised again to be treated by the calling function
-          throw exception;
-        }
-      }
-    }
-  }
-}
-
 function strIsAppnexusViewabilityScript(str) {
+  if (!str || str === '') return false;
+
   let regexMatchUrlStart = str.match(VIEWABILITY_URL_START);
   let viewUrlStartInStr = regexMatchUrlStart != null && regexMatchUrlStart.length >= 1;
 
@@ -422,58 +526,33 @@ function strIsAppnexusViewabilityScript(str) {
   return str.startsWith(SCRIPT_TAG_START) && fileNameInStr && viewUrlStartInStr;
 }
 
-function getAppnexusViewabilityScriptFromJsTrackers(jsTrackerArray) {
-  let viewJsPayload;
-  if (utils.isStr(jsTrackerArray) && strIsAppnexusViewabilityScript(jsTrackerArray)) {
-    viewJsPayload = jsTrackerArray;
-  } else if (utils.isArray(jsTrackerArray)) {
-    for (let i = 0; i < jsTrackerArray.length; i++) {
-      let currentJsTracker = jsTrackerArray[i];
-      if (strIsAppnexusViewabilityScript(currentJsTracker)) {
-        viewJsPayload = currentJsTracker;
-      }
-    }
-  }
-  return viewJsPayload;
-}
+function formatRequest(payload, bidderRequest) {
+  let request = [];
+  let options = {
+    withCredentials: true
+  };
 
-function getViewabilityScriptUrlFromPayload(viewJsPayload) {
-  // extracting the content of the src attribute
-  // -> substring between src=" and "
-  let indexOfFirstQuote = viewJsPayload.indexOf('src="') + 5; // offset of 5: the length of 'src=' + 1
-  let indexOfSecondQuote = viewJsPayload.indexOf('"', indexOfFirstQuote);
-  let jsTrackerSrc = viewJsPayload.substring(indexOfFirstQuote, indexOfSecondQuote);
-  return jsTrackerSrc;
-}
+  let endpointUrl = URL;
 
-function hasPurpose1Consent(bidderRequest) {
-  let result = true;
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    if (bidderRequest.gdprConsent.gdprApplies && bidderRequest.gdprConsent.apiVersion === 2) {
-      result = !!(utils.deepAccess(bidderRequest.gdprConsent, 'vendorData.purpose.consents.1') === true);
-    }
+  if (!hasPurpose1Consent(bidderRequest?.gdprConsent)) {
+    endpointUrl = URL_SIMPLE;
   }
-  return result;
-}
 
-function formatRequest(payload, bidderRequest) {
-  let request = [];
-  let options = {};
-  if (!hasPurpose1Consent(bidderRequest)) {
-    options = {
-      withCredentials: false
-    }
+  if (getParameterByName('apn_test').toUpperCase() === 'TRUE' || config.getConfig('apn_test') === true) {
+    options.customHeaders = {
+      'X-Is-Test': 1
+    };
   }
 
   if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
-    const clonedPayload = utils.deepClone(payload);
+    const clonedPayload = deepClone(payload);
 
-    utils.chunk(payload.tags, MAX_IMPS_PER_REQUEST).forEach(tags => {
+    chunk(payload.tags, MAX_IMPS_PER_REQUEST).forEach(tags => {
       clonedPayload.tags = tags;
       const payloadString = JSON.stringify(clonedPayload);
       request.push({
         method: 'POST',
-        url: URL,
+        url: endpointUrl,
         data: payloadString,
         bidderRequest,
         options
@@ -483,7 +562,7 @@ function formatRequest(payload, bidderRequest) {
     const payloadString = JSON.stringify(payload);
     request = {
       method: 'POST',
-      url: URL,
+      url: endpointUrl,
       data: payloadString,
       bidderRequest,
       options
@@ -505,14 +584,14 @@ function newRenderer(adUnitCode, rtbBid, rendererOptions = {}) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
+    logWarn('Prebid Error calling setRender on renderer', err);
   }
 
   renderer.setEventHandlers({
-    impression: () => utils.logMessage('AppNexus outstream video impression event'),
-    loaded: () => utils.logMessage('AppNexus outstream video loaded event'),
+    impression: () => logMessage('AppNexus outstream video impression event'),
+    loaded: () => logMessage('AppNexus outstream video loaded event'),
     ended: () => {
-      utils.logMessage('AppNexus outstream renderer video event');
+      logMessage('AppNexus outstream renderer video event');
       document.querySelector(`#${adUnitCode}`).style.display = 'none';
     }
   });
@@ -527,8 +606,10 @@ function newRenderer(adUnitCode, rtbBid, rendererOptions = {}) {
  * @return Bid
  */
 function newBid(serverBid, rtbBid, bidderRequest) {
-  const bidRequest = utils.getBidRequest(serverBid.uuid, [bidderRequest]);
+  const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
+  const adId = getUniqueIdentifierStr();
   const bid = {
+    adId: adId,
     requestId: serverBid.uuid,
     cpm: rtbBid.cpm,
     creativeId: rtbBid.creative_id,
@@ -544,10 +625,34 @@ function newBid(serverBid, rtbBid, bidderRequest) {
     }
   };
 
+  if (rtbBid.adomain) {
+    bid.meta = Object.assign({}, bid.meta, { advertiserDomains: [rtbBid.adomain] });
+  }
+
   if (rtbBid.advertiser_id) {
     bid.meta = Object.assign({}, bid.meta, { advertiserId: rtbBid.advertiser_id });
   }
 
+  // temporary function; may remove at later date if/when adserver fully supports dchain
+  function setupDChain(rtbBid) {
+    let dchain = {
+      ver: '1.0',
+      complete: 0,
+      nodes: [{
+        bsid: rtbBid.buyer_member_id.toString()
+      }],
+    };
+
+    return dchain;
+  }
+  if (rtbBid.buyer_member_id) {
+    bid.meta = Object.assign({}, bid.meta, {dchain: setupDChain(rtbBid)});
+  }
+
+  if (rtbBid.brand_id) {
+    bid.meta = Object.assign({}, bid.meta, { brandId: rtbBid.brand_id });
+  }
+
   if (rtbBid.rtb.video) {
     // shared video properties used for all 3 contexts
     Object.assign(bid, {
@@ -557,7 +662,7 @@ function newBid(serverBid, rtbBid, bidderRequest) {
       ttl: 3600
     });
 
-    const videoContext = utils.deepAccess(bidRequest, 'mediaTypes.video.context');
+    const videoContext = deepAccess(bidRequest, 'mediaTypes.video.context');
     switch (videoContext) {
       case ADPOD:
         const primaryCatId = getIabSubCategory(bidRequest.bidder, rtbBid.brand_category_id);
@@ -578,7 +683,10 @@ function newBid(serverBid, rtbBid, bidderRequest) {
 
         if (rtbBid.renderer_url) {
           const videoBid = find(bidderRequest.bids, bid => bid.bidId === serverBid.uuid);
-          const rendererOptions = utils.deepAccess(videoBid, 'renderer.options');
+          let rendererOptions = deepAccess(videoBid, 'mediaTypes.video.renderer.options'); // mediaType definition has preference (shouldn't options be .config?)
+          if (!rendererOptions) {
+            rendererOptions = deepAccess(videoBid, 'renderer.options'); // second the adUnit definition has preference (shouldn't options be .config?)
+          }
           bid.renderer = newRenderer(bid.adUnitCode, rtbBid, rendererOptions);
         }
         break;
@@ -586,22 +694,22 @@ function newBid(serverBid, rtbBid, bidderRequest) {
         bid.vastUrl = rtbBid.notify_url + '&redir=' + encodeURIComponent(rtbBid.rtb.video.asset_url);
         break;
     }
-  } else if (rtbBid.rtb[NATIVE]) {
+  } else if (FEATURES.NATIVE && rtbBid.rtb[NATIVE]) {
     const nativeAd = rtbBid.rtb[NATIVE];
+    let viewScript;
 
-    // setting up the jsTracker:
-    // we put it as a data-src attribute so that the tracker isn't called
-    // until we have the adId (see onBidWon)
-    let jsTrackerDisarmed = rtbBid.viewability.config.replace('src=', 'data-src=');
+    if (strIsAppnexusViewabilityScript(rtbBid.viewability.config)) {
+      let prebidParams = 'pbjs_adid=' + adId + ';pbjs_auc=' + bidRequest.adUnitCode;
+      viewScript = rtbBid.viewability.config.replace('dom_id=%native_dom_id%', prebidParams);
+    }
 
     let jsTrackers = nativeAd.javascript_trackers;
-
     if (jsTrackers == undefined) {
-      jsTrackers = jsTrackerDisarmed;
-    } else if (utils.isStr(jsTrackers)) {
-      jsTrackers = [jsTrackers, jsTrackerDisarmed];
+      jsTrackers = viewScript;
+    } else if (isStr(jsTrackers)) {
+      jsTrackers = [jsTrackers, viewScript];
     } else {
-      jsTrackers.push(jsTrackerDisarmed);
+      jsTrackers.push(viewScript);
     }
 
     bid[NATIVE] = {
@@ -622,6 +730,7 @@ function newBid(serverBid, rtbBid, bidderRequest) {
       displayUrl: nativeAd.displayurl,
       clickTrackers: nativeAd.link.click_trackers,
       impressionTrackers: nativeAd.impression_trackers,
+      video: nativeAd.video,
       javascriptTrackers: jsTrackers
     };
     if (nativeAd.main_img) {
@@ -645,11 +754,15 @@ function newBid(serverBid, rtbBid, bidderRequest) {
       ad: rtbBid.rtb.banner.content
     });
     try {
-      const url = rtbBid.rtb.trackers[0].impression_urls[0];
-      const tracker = utils.createTrackPixelHtml(url);
-      bid.ad += tracker;
+      if (rtbBid.rtb.trackers) {
+        for (let i = 0; i < rtbBid.rtb.trackers[0].impression_urls.length; i++) {
+          const url = rtbBid.rtb.trackers[0].impression_urls[i];
+          const tracker = createTrackPixelHtml(url);
+          bid.ad += tracker;
+        }
+      }
     } catch (error) {
-      utils.logError('Error appending tracking pixel', error);
+      logError('Error appending tracking pixel', error);
     }
   }
 
@@ -668,14 +781,22 @@ function bidToTag(bid) {
     tag.code = bid.params.invCode;
   }
   tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
-  tag.use_pmt_rule = bid.params.usePaymentRule || false
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
   tag.prebid = true;
   tag.disable_psa = true;
-  if (bid.params.reserve) {
-    tag.reserve = bid.params.reserve;
+  let bidFloor = getBidFloor(bid);
+  if (bidFloor) {
+    tag.reserve = bidFloor;
   }
   if (bid.params.position) {
-    tag.position = {'above': 1, 'below': 2}[bid.params.position] || 0;
+    tag.position = { 'above': 1, 'below': 2 }[bid.params.position] || 0;
+  } else {
+    let mediaTypePos = deepAccess(bid, `mediaTypes.banner.pos`) || deepAccess(bid, `mediaTypes.video.pos`);
+    // only support unknown, atf, and btf values for position at this time
+    if (mediaTypePos === 0 || mediaTypePos === 1 || mediaTypePos === 3) {
+      // ortb spec treats btf === 3, but our system interprets btf === 2; so converting the ortb value here for consistency
+      tag.position = (mediaTypePos === 3) ? 2 : mediaTypePos;
+    }
   }
   if (bid.params.trafficSourceCode) {
     tag.traffic_source_code = bid.params.trafficSourceCode;
@@ -698,16 +819,33 @@ function bidToTag(bid) {
   if (bid.params.externalImpId) {
     tag.external_imp_id = bid.params.externalImpId;
   }
-  if (!utils.isEmpty(bid.params.keywords)) {
-    let keywords = utils.transformBidderParamKeywords(bid.params.keywords);
 
-    if (keywords.length > 0) {
-      keywords.forEach(deleteValues);
+  let ortb2ImpKwStr = deepAccess(bid, 'ortb2Imp.ext.data.keywords');
+  if ((isStr(ortb2ImpKwStr) && ortb2ImpKwStr !== '') || !isEmpty(bid.params.keywords)) {
+    // convert ortb2 from comma list string format to bid param object format
+    let ortb2ImpKwObj = convertStringToKeywordsObj(ortb2ImpKwStr);
+
+    let bidParamsKwObj = (isPlainObject(bid.params.keywords)) ? deepClone(bid.params.keywords) : {};
+    // need to convert the string values into an array of strings, to properly merge values with other existing keys later
+    Object.keys(bidParamsKwObj).forEach(k => { if (isStr(bidParamsKwObj[k]) || isNumber(bidParamsKwObj[k])) bidParamsKwObj[k] = [bidParamsKwObj[k]] });
+
+    // combine both sources of keywords into one merged object (that combines the values for shared keys)
+    let keywordsObj = mergeDeep({}, bidParamsKwObj, ortb2ImpKwObj);
+
+    // convert to final format used by adserver
+    let keywordsUt = transformBidderParamKeywords(keywordsObj);
+    if (keywordsUt.length > 0) {
+      keywordsUt.forEach(deleteValues);
+      tag.keywords = keywordsUt;
     }
-    tag.keywords = keywords;
   }
 
-  if (bid.mediaType === NATIVE || utils.deepAccess(bid, `mediaTypes.${NATIVE}`)) {
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  if (gpid) {
+    tag.gpid = gpid;
+  }
+
+  if (FEATURES.NATIVE && (bid.mediaType === NATIVE || deepAccess(bid, `mediaTypes.${NATIVE}`))) {
     tag.ad_types.push(NATIVE);
     if (tag.sizes.length === 0) {
       tag.sizes = transformSizes([1, 1]);
@@ -715,12 +853,12 @@ function bidToTag(bid) {
 
     if (bid.nativeParams) {
       const nativeRequest = buildNativeRequest(bid.nativeParams);
-      tag[NATIVE] = {layouts: [nativeRequest]};
+      tag[NATIVE] = { layouts: [nativeRequest] };
     }
   }
 
-  const videoMediaType = utils.deepAccess(bid, `mediaTypes.${VIDEO}`);
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
+  const videoMediaType = deepAccess(bid, `mediaTypes.${VIDEO}`);
+  const context = deepAccess(bid, 'mediaTypes.video.context');
 
   if (videoMediaType && context === 'adpod') {
     tag.hb_source = 7;
@@ -746,17 +884,84 @@ function bidToTag(bid) {
           case 'context':
           case 'playback_method':
             let type = bid.params.video[param];
-            type = (utils.isArray(type)) ? type[0] : type;
+            type = (isArray(type)) ? type[0] : type;
             tag.video[param] = VIDEO_MAPPING[param][type];
             break;
+          // Deprecating tags[].video.frameworks in favor of tags[].video_frameworks
+          case 'frameworks':
+            break;
           default:
             tag.video[param] = bid.params.video[param];
         }
       });
+
+    if (bid.params.video.frameworks && isArray(bid.params.video.frameworks)) {
+      tag['video_frameworks'] = bid.params.video.frameworks;
+    }
+  }
+
+  // use IAB ORTB values if the corresponding values weren't already set by bid.params.video
+  if (videoMediaType) {
+    tag.video = tag.video || {};
+    Object.keys(videoMediaType)
+      .filter(param => includes(VIDEO_RTB_TARGETING, param))
+      .forEach(param => {
+        switch (param) {
+          case 'minduration':
+          case 'maxduration':
+            if (typeof tag.video[param] !== 'number') tag.video[param] = videoMediaType[param];
+            break;
+          case 'skip':
+            if (typeof tag.video['skippable'] !== 'boolean') tag.video['skippable'] = (videoMediaType[param] === 1);
+            break;
+          case 'skipafter':
+            if (typeof tag.video['skipoffset'] !== 'number') tag.video['skippoffset'] = videoMediaType[param];
+            break;
+          case 'playbackmethod':
+            if (typeof tag.video['playback_method'] !== 'number') {
+              let type = videoMediaType[param];
+              type = (isArray(type)) ? type[0] : type;
+
+              // we only support iab's options 1-4 at this time.
+              if (type >= 1 && type <= 4) {
+                tag.video['playback_method'] = type;
+              }
+            }
+            break;
+          case 'api':
+            if (!tag['video_frameworks'] && isArray(videoMediaType[param])) {
+              // need to read thru array; remove 6 (we don't support it), swap 4 <> 5 if found (to match our adserver mapping for these specific values)
+              let apiTmp = videoMediaType[param].map(val => {
+                let v = (val === 4) ? 5 : (val === 5) ? 4 : val;
+
+                if (v >= 1 && v <= 5) {
+                  return v;
+                }
+              }).filter(v => v);
+              tag['video_frameworks'] = apiTmp;
+            }
+            break;
+
+          case 'startdelay':
+          case 'placement':
+            const contextKey = 'context';
+            if (typeof tag.video[contextKey] !== 'number') {
+              const placement = videoMediaType['placement'];
+              const startdelay = videoMediaType['startdelay'];
+              const context = getContextFromPlacement(placement) || getContextFromStartDelay(startdelay);
+              tag.video[contextKey] = VIDEO_MAPPING[contextKey][context];
+            }
+            break;
+        }
+      });
   }
 
   if (bid.renderer) {
-    tag.video = Object.assign({}, tag.video, {custom_renderer_present: true});
+    tag.video = Object.assign({}, tag.video, { custom_renderer_present: true });
+  }
+
+  if (bid.params.frameworks && isArray(bid.params.frameworks)) {
+    tag['banner_frameworks'] = bid.params.frameworks;
   }
 
   let adUnit = find(auctionManager.getAdUnits(), au => bid.transactionId === au.transactionId);
@@ -776,8 +981,8 @@ function transformSizes(requestSizes) {
   let sizes = [];
   let sizeObj = {};
 
-  if (utils.isArray(requestSizes) && requestSizes.length === 2 &&
-    !utils.isArray(requestSizes[0])) {
+  if (isArray(requestSizes) && requestSizes.length === 2 &&
+    !isArray(requestSizes[0])) {
     sizeObj.width = parseInt(requestSizes[0], 10);
     sizeObj.height = parseInt(requestSizes[1], 10);
     sizes.push(sizeObj);
@@ -794,6 +999,32 @@ function transformSizes(requestSizes) {
   return sizes;
 }
 
+function getContextFromPlacement(ortbPlacement) {
+  if (!ortbPlacement) {
+    return;
+  }
+
+  if (ortbPlacement === 2) {
+    return 'in-banner';
+  } else if (ortbPlacement > 2) {
+    return 'outstream';
+  }
+}
+
+function getContextFromStartDelay(ortbStartDelay) {
+  if (!ortbStartDelay) {
+    return;
+  }
+
+  if (ortbStartDelay === 0) {
+    return 'pre_roll';
+  } else if (ortbStartDelay === -1) {
+    return 'mid_roll';
+  } else if (ortbStartDelay === -2) {
+    return 'post_roll';
+  }
+}
+
 function hasUserInfo(bid) {
   return !!bid.params.user;
 }
@@ -827,6 +1058,19 @@ function hasAdPod(bid) {
   );
 }
 
+function hasOmidSupport(bid) {
+  let hasOmid = false;
+  const bidderParams = bid.params;
+  const videoParams = bid.params.video;
+  if (bidderParams.frameworks && isArray(bidderParams.frameworks)) {
+    hasOmid = includes(bid.params.frameworks, 6);
+  }
+  if (!hasOmid && videoParams && videoParams.frameworks && isArray(videoParams.frameworks)) {
+    hasOmid = includes(bid.params.video.frameworks, 6);
+  }
+  return hasOmid;
+}
+
 /**
  * Expand an adpod placement into a set of request objects according to the
  * total adpod duration and the range of duration seconds. Sets minduration/
@@ -836,14 +1080,14 @@ function createAdPodRequest(tags, adPodBid) {
   const { durationRangeSec, requireExactDuration } = adPodBid.mediaTypes.video;
 
   const numberOfPlacements = getAdPodPlacementNumber(adPodBid.mediaTypes.video);
-  const maxDuration = utils.getMaxValueFromArray(durationRangeSec);
+  const maxDuration = getMaxValueFromArray(durationRangeSec);
 
   const tagToDuplicate = tags.filter(tag => tag.uuid === adPodBid.bidId);
-  let request = utils.fill(...tagToDuplicate, numberOfPlacements);
+  let request = fill(...tagToDuplicate, numberOfPlacements);
 
   if (requireExactDuration) {
     const divider = Math.ceil(numberOfPlacements / durationRangeSec.length);
-    const chunked = utils.chunk(request, divider);
+    const chunked = chunk(request, divider);
 
     // each configured duration is set as min/maxduration for a subset of requests
     durationRangeSec.forEach((duration, index) => {
@@ -862,7 +1106,7 @@ function createAdPodRequest(tags, adPodBid) {
 
 function getAdPodPlacementNumber(videoParams) {
   const { adPodDurationSec, durationRangeSec, requireExactDuration } = videoParams;
-  const minAllowedDuration = utils.getMinValueFromArray(durationRangeSec);
+  const minAllowedDuration = getMinValueFromArray(durationRangeSec);
   const numberOfPlacements = Math.floor(adPodDurationSec / minAllowedDuration);
 
   return requireExactDuration
@@ -871,7 +1115,7 @@ function getAdPodPlacementNumber(videoParams) {
 }
 
 function setVideoProperty(tag, key, value) {
-  if (utils.isEmpty(tag.video)) { tag.video = {}; }
+  if (isEmpty(tag.video)) { tag.video = {}; }
   tag.video[key] = value;
 }
 
@@ -902,7 +1146,7 @@ function buildNativeRequest(params) {
     const isImageAsset = !!(requestKey === NATIVE_MAPPING.image.serverName || requestKey === NATIVE_MAPPING.icon.serverName);
     if (isImageAsset && request[requestKey].sizes) {
       let sizes = request[requestKey].sizes;
-      if (utils.isArrayOfNums(sizes) || (utils.isArray(sizes) && sizes.length > 0 && sizes.every(sz => utils.isArrayOfNums(sz)))) {
+      if (isArrayOfNums(sizes) || (isArray(sizes) && sizes.length > 0 && sizes.every(sz => isArrayOfNums(sz)))) {
         request[requestKey].sizes = transformSizes(request[requestKey].sizes);
       }
     }
@@ -920,17 +1164,35 @@ function buildNativeRequest(params) {
  * @param {string} elementId element id
  */
 function hidedfpContainer(elementId) {
-  var el = document.getElementById(elementId).querySelectorAll("div[id^='google_ads']");
-  if (el[0]) {
-    el[0].style.setProperty('display', 'none');
+  try {
+    const el = document.getElementById(elementId).querySelectorAll("div[id^='google_ads']");
+    if (el[0]) {
+      el[0].style.setProperty('display', 'none');
+    }
+  } catch (e) {
+    // element not found!
   }
 }
 
-function outstreamRender(bid) {
-  // push to render queue because ANOutstreamVideo may not be loaded yet
+function hideSASIframe(elementId) {
+  try {
+    // find script tag with id 'sas_script'. This ensures it only works if you're using Smart Ad Server.
+    const el = document.getElementById(elementId).querySelectorAll("script[id^='sas_script']");
+    if (el[0].nextSibling && el[0].nextSibling.localName === 'iframe') {
+      el[0].nextSibling.style.setProperty('display', 'none');
+    }
+  } catch (e) {
+    // element not found!
+  }
+}
+
+function outstreamRender(bid, doc) {
   hidedfpContainer(bid.adUnitCode);
+  hideSASIframe(bid.adUnitCode);
+  // push to render queue because ANOutstreamVideo may not be loaded yet
   bid.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
+    const win = getWindowFromDocument(doc) || window;
+    win.ANOutstreamVideo.renderAd({
       tagId: bid.adResponse.tag_id,
       sizes: [bid.getSize().split('x')],
       targetId: bid.adUnitCode, // target div id to render video
@@ -956,4 +1218,91 @@ function parseMediaType(rtbBid) {
   }
 }
 
+function addUserId(eids, id, source, rti) {
+  if (id) {
+    if (rti) {
+      eids.push({ source, id, rti_partner: rti });
+    } else {
+      eids.push({ source, id });
+    }
+  }
+  return eids;
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.reserve) ? bid.params.reserve : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
+// keywords: { 'genre': ['rock', 'pop'], 'pets': ['dog'] } goes to 'genre=rock,genre=pop,pets=dog'
+function convertKeywordsToString(keywords) {
+  let result = '';
+  Object.keys(keywords).forEach(key => {
+    // if 'text' or ''
+    if (isStr(keywords[key])) {
+      if (keywords[key] !== '') {
+        result += `${key}=${keywords[key]},`
+      } else {
+        result += `${key},`;
+      }
+    } else if (isArray(keywords[key])) {
+      if (keywords[key][0] === '') {
+        result += `${key},`
+      } else {
+        keywords[key].forEach(val => {
+          result += `${key}=${val},`
+        });
+      }
+    }
+  });
+
+  // remove last trailing comma
+  result = result.substring(0, result.length - 1);
+  return result;
+}
+
+// converts a comma separated list of keywords into the standard keyword object format used in appnexus bid params
+// 'genre=rock,genre=pop,pets=dog,music' goes to { 'genre': ['rock', 'pop'], 'pets': ['dog'], 'music': [''] }
+function convertStringToKeywordsObj(keyStr) {
+  let result = {};
+
+  if (isStr(keyStr) && keyStr !== '') {
+    // will split based on commas and will eat white space before/after the comma
+    let keywordList = keyStr.split(/\s*(?:,)\s*/);
+    keywordList.forEach(kw => {
+      // if = exists, then split
+      if (kw.indexOf('=') !== -1) {
+        let kwPair = kw.split('=');
+        let key = kwPair[0];
+        let val = kwPair[1];
+
+        // then check for existing key in result > if so add value to the array > if not, add new key and create value array
+        if (result.hasOwnProperty(key)) {
+          result[key].push(val);
+        } else {
+          result[key] = [val];
+        }
+      } else {
+        // make a key with '' value; if key already exists > don't add
+        if (!result.hasOwnProperty(kw)) {
+          result[kw] = [''];
+        }
+      }
+    });
+  }
+
+  return result;
+}
+
 registerBidder(spec);
diff --git a/modules/appnexusBidAdapter.md b/modules/appnexusBidAdapter.md
index 6ec40e83b41..7ac70e67584 100644
--- a/modules/appnexusBidAdapter.md
+++ b/modules/appnexusBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name:  Appnexus Bid Adapter
 Module Type:  Bidder Adapter
-Maintainer: info@prebid.org
+Maintainer: prebid-js@xandr.com
 ```
 
 # Description
@@ -89,7 +89,18 @@ var adUnits = [
      mediaTypes: {
        video: {
          playerSize: [[300, 250]],
-         context: 'outstream'
+         context: 'outstream',
+         // Certain ORTB 2.5 video values can be read from the mediatypes object; below are examples of supported params.
+         // To note - appnexus supports additional values for our system that are not part of the ORTB spec.  If you want
+         // to use these values, they will have to be declared in the bids[].params.video object instead using the appnexus syntax.
+         // Between the corresponding values of the mediaTypes.video and params.video objects, the properties in params.video will 
+         // take precedence if declared; eg in the example below, the `skippable: true` setting will be used instead of the `skip: 0`.
+         minduration: 1,
+         maxduration: 60,
+         skip: 0,   // 1 - true, 0 - false
+         skipafter: 5,
+         playbackmethod: [2], // note - we only support options 1-4 at this time
+         api: [1,2,3]   // note - option 6 is not supported at this time
        }
      },
      bids: [
diff --git a/modules/apstreamBidAdapter.js b/modules/apstreamBidAdapter.js
new file mode 100644
index 00000000000..30abb17bfde
--- /dev/null
+++ b/modules/apstreamBidAdapter.js
@@ -0,0 +1,493 @@
+import { generateUUID, deepAccess, createTrackPixelHtml, getDNT } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const CONSTANTS = {
+  DSU_KEY: 'apr_dsu',
+  BIDDER_CODE: 'apstream',
+  GVLID: 394
+};
+const storage = getStorageManager({gvlid: CONSTANTS.GVLID, bidderCode: CONSTANTS.BIDDER_CODE});
+
+var dsuModule = (function() {
+  'use strict';
+
+  var DSU_KEY = 'apr_dsu';
+  var DSU_VERSION_NUMBER = '1';
+  var SIGNATURE_SALT = 'YicAu6ZpNG';
+  var DSU_CREATOR = {'USERREPORT': '1'};
+
+  function stringToU8(str) {
+    if (typeof TextEncoder === 'function') {
+      return new TextEncoder().encode(str);
+    }
+    str = unescape(encodeURIComponent(str));
+    var bytes = new Uint8Array(str.length);
+    for (var i = 0, j = str.length; i < j; i++) {
+      bytes[i] = str.charCodeAt(i);
+    }
+    return bytes;
+  }
+
+  function _add(a, b) {
+    var rl = a.l + b.l;
+    var a2 = {
+      h: a.h + b.h + (rl / 2 >>> 31) >>> 0,
+      l: rl >>> 0
+    };
+    a.h = a2.h;
+    a.l = a2.l;
+  }
+  function _xor(a, b) {
+    a.h ^= b.h;
+    a.h >>>= 0;
+    a.l ^= b.l;
+    a.l >>>= 0;
+  }
+  function _rotl(a, n) {
+    var a2 = {
+      h: a.h << n | a.l >>> (32 - n),
+      l: a.l << n | a.h >>> (32 - n)
+    };
+    a.h = a2.h;
+    a.l = a2.l;
+  }
+  function _rotl32(a) {
+    var al = a.l;
+    a.l = a.h;
+    a.h = al;
+  }
+
+  function _compress(v0, v1, v2, v3) {
+    _add(v0, v1);
+    _add(v2, v3);
+    _rotl(v1, 13);
+    _rotl(v3, 16);
+    _xor(v1, v0);
+    _xor(v3, v2);
+    _rotl32(v0);
+    _add(v2, v1);
+    _add(v0, v3);
+    _rotl(v1, 17);
+    _rotl(v3, 21);
+    _xor(v1, v2);
+    _xor(v3, v0);
+    _rotl32(v2);
+  }
+  function _getInt(a, offset) {
+    return a[offset + 3] << 24 |
+          a[offset + 2] << 16 |
+          a[offset + 1] << 8 |
+          a[offset];
+  }
+
+  function hash(key, m) {
+    if (typeof m === 'string') {
+      m = stringToU8(m);
+    }
+    var k0 = {
+      h: key[1] >>> 0,
+      l: key[0] >>> 0
+    };
+    var k1 = {
+      h: key[3] >>> 0,
+      l: key[2] >>> 0
+    };
+    var v0 = {
+      h: k0.h,
+      l: k0.l
+    };
+    var v2 = k0;
+    var v1 = {
+      h: k1.h,
+      l: k1.l
+    };
+    var v3 = k1;
+    var ml = m.length;
+    var ml7 = ml - 7;
+    var buf = new Uint8Array(new ArrayBuffer(8));
+    _xor(v0, {
+      h: 0x736f6d65,
+      l: 0x70736575
+    });
+    _xor(v1, {
+      h: 0x646f7261,
+      l: 0x6e646f6d
+    });
+    _xor(v2, {
+      h: 0x6c796765,
+      l: 0x6e657261
+    });
+    _xor(v3, {
+      h: 0x74656462,
+      l: 0x79746573
+    });
+    var mp = 0;
+    while (mp < ml7) {
+      var mi = {
+        h: _getInt(m, mp + 4),
+        l: _getInt(m, mp)
+      };
+      _xor(v3, mi);
+      _compress(v0, v1, v2, v3);
+      _compress(v0, v1, v2, v3);
+      _xor(v0, mi);
+      mp += 8;
+    }
+    buf[7] = ml;
+    var ic = 0;
+    while (mp < ml) {
+      buf[ic++] = m[mp++];
+    }
+    while (ic < 7) {
+      buf[ic++] = 0;
+    }
+    var mil = {
+      h: buf[7] << 24 | buf[6] << 16 | buf[5] << 8 | buf[4],
+      l: buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0]
+    };
+    _xor(v3, mil);
+    _compress(v0, v1, v2, v3);
+    _compress(v0, v1, v2, v3);
+    _xor(v0, mil);
+    _xor(v2, {
+      h: 0,
+      l: 0xff
+    });
+    _compress(v0, v1, v2, v3);
+    _compress(v0, v1, v2, v3);
+    _compress(v0, v1, v2, v3);
+    _compress(v0, v1, v2, v3);
+    var h = v0;
+    _xor(h, v1);
+    _xor(h, v2);
+    _xor(h, v3);
+    return h;
+  }
+
+  function hashHex(key, m) {
+    var r = hash(key, m);
+    return ('0000000' + r.h.toString(16)).substr(-8) +
+            ('0000000' + r.l.toString(16)).substr(-8);
+  }
+
+  var SIPHASH_KEY = [0x86395a57, 0x6b5ba7f7, 0x69732c07, 0x2a6ef48d];
+  var hashWithKey = hashHex.bind(null, SIPHASH_KEY);
+
+  var parseUrlRegex = new RegExp('^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?');
+  var overwrite = null;
+  var cache = {};
+  function parseUrl(url) {
+    var addscheme =
+    url.indexOf('/') !== 0 &&
+    url.indexOf('/') !== -1 &&
+    (url.indexOf(':') === -1 || url.indexOf(':') > url.indexOf('/'));
+
+    var match = parseUrlRegex.exec(addscheme ? 'noscheme://' + url : url);
+    var res = {
+      scheme: addscheme ? '' : match[2] || '',
+      host: match[4] || '',
+      hostname: match[4] ? match[4].split(':')[0] : '',
+      pathname: match[5] || '',
+      search: match[7] || '',
+      hash: match[9] || '',
+      toString: function () {
+        return url;
+      }
+    };
+
+    res.origin = res.scheme + '://' + res.host;
+    return res;
+  }
+
+  function location() {
+    var url = overwrite || window.location.toString();
+    url = url.replace(/\.demo\.audienceproject\.com\//, '/');
+
+    if (cache.url === url) {
+      return cache.parsed;
+    }
+    var parsed = parseUrl(url);
+    cache.url = url;
+    cache.parsed = parsed;
+    return parsed;
+  }
+
+  function getDaysSinceApEpoch() {
+    var timeDiff = (new Date()).getTime() - (new Date(2019, 0, 1)).getTime();
+    var daysSinceApEpoch = Math.floor(timeDiff / (1000 * 3600 * 24));
+    return daysSinceApEpoch;
+  }
+
+  function generateDsu() {
+    var dsuId = generateUUID();
+    var loc = location();
+
+    var dsuIdSuffix = hashWithKey(dsuId + loc.toString());
+    var suffix4 = dsuIdSuffix.substr(0, 4);
+    var suffix8 = dsuIdSuffix.substr(4);
+
+    dsuId = dsuId.substr(0, 19) + suffix4 + '-' + suffix8;
+
+    var daysSinceApEpoch = getDaysSinceApEpoch();
+    var originHash = hashWithKey(loc.origin);
+
+    var metadata = [
+      DSU_CREATOR.USERREPORT,
+      daysSinceApEpoch,
+      originHash
+    ].join('.');
+    var signature = hashWithKey(dsuId + metadata + SIGNATURE_SALT);
+
+    return [DSU_VERSION_NUMBER, signature, dsuId, metadata].join('.');
+  }
+
+  function readOrCreateDsu() {
+    var dsu;
+    try {
+      dsu = storage.getDataFromLocalStorage(DSU_KEY);
+    } catch (err) {
+      return null;
+    }
+
+    if (!dsu) {
+      dsu = generateDsu();
+    }
+
+    try {
+      storage.setDataInLocalStorage(DSU_KEY, dsu);
+    } catch (err) {
+      return null;
+    }
+
+    return dsu;
+  }
+
+  return {
+    readOrCreateDsu: readOrCreateDsu
+  };
+})();
+
+function serializeSizes(sizes) {
+  if (Array.isArray(sizes[0]) === false) {
+    sizes = [sizes];
+  }
+
+  return sizes.map(s => s[0] + 'x' + s[1]).join('_');
+}
+
+function getRawConsentString(gdprConsentConfig) {
+  if (!gdprConsentConfig || gdprConsentConfig.gdprApplies === false) {
+    return null;
+  }
+
+  return gdprConsentConfig.consentString;
+}
+
+function getConsentStringFromPrebid(gdprConsentConfig) {
+  const consentString = getRawConsentString(gdprConsentConfig);
+  if (!consentString) {
+    return null;
+  }
+
+  let isIab = config.getConfig('consentManagement.cmpApi') != 'static';
+  let vendorConsents = (
+    gdprConsentConfig.vendorData.vendorConsents ||
+    (gdprConsentConfig.vendorData.vendor || {}).consents ||
+    {}
+  );
+  let isConsentGiven = !!vendorConsents[CONSTANTS.GVLID.toString(10)];
+
+  return isIab && isConsentGiven ? consentString : null;
+}
+
+function getIabConsentString(bidderRequest) {
+  if (deepAccess(bidderRequest, 'gdprConsent')) {
+    return getConsentStringFromPrebid(bidderRequest.gdprConsent);
+  }
+
+  return 'disabled';
+}
+
+function injectPixels(ad, pixels, scripts) {
+  if (!pixels && !scripts) {
+    return ad;
+  }
+
+  let trackedAd = ad;
+  if (pixels) {
+    pixels.forEach(pixel => {
+      const tracker = createTrackPixelHtml(pixel);
+      trackedAd += tracker;
+    });
+  }
+
+  if (scripts) {
+    scripts.forEach(script => {
+      const tracker = `<script src="${script}"></script>`;
+      trackedAd += tracker;
+    });
+  }
+
+  return trackedAd;
+}
+
+function getScreenParams() {
+  return `${window.screen.width}x${window.screen.height}@${window.devicePixelRatio}`;
+}
+
+function getBids(bids) {
+  const bidArr = bids.map(bid => {
+    const bidId = bid.bidId;
+
+    let mediaType = '';
+    const mediaTypes = Object.keys(bid.mediaTypes);
+    switch (mediaTypes[0]) {
+      case 'video':
+        mediaType = 'v';
+        break;
+
+      case 'native':
+        mediaType = 'n';
+        break;
+
+      case 'audio':
+        mediaType = 'a';
+        break;
+
+      default:
+        mediaType = 'b';
+        break;
+    }
+
+    let adUnitCode = `,c=${bid.adUnitCode}`;
+    if (bid.params.code) {
+      adUnitCode = `,c=${encodeURIComponent(bid.params.code)}`;
+    }
+    if (bid.params.adunitId) {
+      adUnitCode = `,u=${encodeURIComponent(bid.params.adunitId)}`;
+    }
+
+    return `${bidId}:t=${mediaType},s=${serializeSizes(bid.sizes)}${adUnitCode}`;
+  });
+
+  return bidArr.join(';');
+};
+
+function getEndpointsGroups(bidRequests) {
+  let endpoints = [];
+  const getEndpoint = bid => {
+    const publisherId = bid.params.publisherId || config.getConfig('apstream.publisherId');
+    const isTestConfig = bid.params.test || config.getConfig('apstream.test');
+
+    if (isTestConfig) {
+      return `https://mock-bapi.userreport.com/v2/${publisherId}/bid`;
+    }
+
+    if (bid.params.endpoint) {
+      return `${bid.params.endpoint}${publisherId}/bid`;
+    }
+
+    return `https://bapi.userreport.com/v2/${publisherId}/bid`;
+  }
+  bidRequests.forEach(bid => {
+    const endpoint = getEndpoint(bid);
+    const exist = endpoints.filter(item => item.endpoint.indexOf(endpoint) > -1)[0];
+    if (exist) {
+      exist.bids.push(bid);
+    } else {
+      endpoints.push({
+        endpoint: endpoint,
+        bids: [bid]
+      });
+    }
+  });
+
+  return endpoints;
+}
+
+function isBidRequestValid(bid) {
+  const publisherId = config.getConfig('apstream.publisherId');
+  const isPublisherIdExist = !!(publisherId || bid.params.publisherId);
+  const isOneMediaType = Object.keys(bid.mediaTypes).length === 1;
+
+  return isPublisherIdExist && isOneMediaType;
+}
+
+function buildRequests(bidRequests, bidderRequest) {
+  // convert Native ORTB definition to old-style prebid native definition
+  bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+  const data = {
+    med: encodeURIComponent(window.location.href),
+    auid: bidderRequest.auctionId,
+    ref: document.referrer,
+    dnt: getDNT() ? 1 : 0,
+    sr: getScreenParams()
+  };
+
+  const consentData = getRawConsentString(bidderRequest.gdprConsent);
+  data.iab_consent = consentData;
+
+  const options = {
+    withCredentials: true
+  };
+
+  const isConsent = getIabConsentString(bidderRequest);
+  const noDsu = config.getConfig('apstream.noDsu');
+  if (!isConsent || noDsu) {
+    data.dsu = '';
+  } else {
+    data.dsu = dsuModule.readOrCreateDsu();
+  }
+
+  if (!isConsent || isConsent === 'disabled') {
+    options.withCredentials = false;
+  }
+
+  const endpoints = getEndpointsGroups(bidRequests);
+  const serverRequests = endpoints.map(item => ({
+    method: 'GET',
+    url: item.endpoint,
+    data: {
+      ...data,
+      bids: getBids(item.bids),
+      rnd: Math.random()
+    },
+    options: options
+  }));
+
+  return serverRequests;
+}
+
+function interpretResponse(serverResponse) {
+  let bidResponses = serverResponse && serverResponse.body;
+
+  if (!bidResponses || !bidResponses.length) {
+    return [];
+  }
+
+  return bidResponses.map(x => ({
+    requestId: x.bidId,
+    cpm: x.bidDetails.cpm,
+    width: x.bidDetails.width,
+    height: x.bidDetails.height,
+    creativeId: x.bidDetails.creativeId,
+    currency: x.bidDetails.currency || 'USD',
+    netRevenue: x.bidDetails.netRevenue,
+    dealId: x.bidDetails.dealId,
+    ad: injectPixels(x.bidDetails.ad, x.bidDetails.noticeUrls, x.bidDetails.impressionScripts),
+    ttl: x.bidDetails.ttl,
+  }));
+}
+
+export const spec = {
+  code: CONSTANTS.BIDDER_CODE,
+  gvlid: CONSTANTS.GVLID,
+  isBidRequestValid: isBidRequestValid,
+  buildRequests: buildRequests,
+  interpretResponse: interpretResponse
+}
+
+registerBidder(spec);
diff --git a/modules/apstreamBidAdapter.md b/modules/apstreamBidAdapter.md
new file mode 100644
index 00000000000..6b87b33489a
--- /dev/null
+++ b/modules/apstreamBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name: AP Stream Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: tech@audienceproject.com
+gdpr_supported: true
+tcf2_supported: true
+```
+
+# Description
+
+Module that connects to AP Stream source
+
+# Inherit from prebid.js
+```
+    var adUnits = [
+      {
+        code: '/19968336/header-bid-tag-1',
+        mediaTypes: { // mandatory and should be only one
+            banner: {
+                sizes: [[920,180], [920, 130]]
+            }
+        },
+        bids: [{
+            bidder: 'apstream',
+            params: {
+                publisherId: STREAM_PIBLISHER_ID // mandatory
+            }
+        }]
+      }
+    ];
+```
+
+# Explicit ad-unit code
+```
+    var website = null;
+    switch (location.hostname) { 
+      case "site1.com": 
+        website = "S1"; 
+        break;
+      case "site2.com":
+        website = "S2";
+        break;
+    }
+    
+    var adUnits = [
+      {
+        code: '/19968336/header-bid-tag-1',
+        mediaTypes: { // mandatory and should be only one
+            banner: {
+                sizes: [[920,180], [920, 130]]
+            }
+        },
+        bids: [{
+            bidder: 'apstream',
+            params: {
+                publisherId: STREAM_PIBLISHER_ID, // mandatory
+                code: website + '_Leaderboard'
+            }
+        }]
+      }
+    ];
+```
+
+# Explicit ad-unit ID
+```
+    var adUnits = [
+      {
+        code: '/19968336/header-bid-tag-1',
+        mediaTypes: { // mandatory and should be only one
+            banner: {
+                sizes: [[920,180], [920, 130]]
+            }
+        },
+        bids: [{
+            bidder: 'apstream',
+            params: {
+                publisherId: STREAM_PIBLISHER_ID, // mandatory
+                adunitId: 1234
+            }
+        }]
+      }
+    ];
+```
+
+# DSU
+
+To disable DSU use config option:
+
+```
+    pbjs.setConfig({
+        apstream: {
+            noDsu: true
+        }
+    });
+```
+
+To set `test` and `publisherId` parameters globally use config options (it can be overrided if set in specific bid):
+
+```
+pbjs.setBidderConfig({
+    bidders: ["apstream"],
+    config: {
+        appstream: {
+            publisherId: '1234
+            test: true
+        }
+    }
+});
+```
diff --git a/modules/arteebeeBidAdapter.md b/modules/arteebeeBidAdapter.md
deleted file mode 100644
index 4c178d722b1..00000000000
--- a/modules/arteebeeBidAdapter.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Overview
-
-```
-Module Name: Arteebee Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: jeffyecn@gmail.com
-```
-
-# Description
-
-Module that connects to Arteebee's demand source
-
-# Test Parameters
-```
-    var adUnits = [
-      {
-        code: 'banner-ad-div',
-        sizes: [[300, 250]],
-        bids: [
-          {
-            bidder: 'arteebee',
-            params: {
-              ssp: 'mock',
-              pub: 'prebidtest',
-              source: 'prebidtest',
-              test: true
-            }
-          }
-        ]
-      }
-    ];
-```
\ No newline at end of file
diff --git a/modules/asealBidAdapter.js b/modules/asealBidAdapter.js
new file mode 100644
index 00000000000..abe0cf907ed
--- /dev/null
+++ b/modules/asealBidAdapter.js
@@ -0,0 +1,107 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { generateUUID, getWindowTop, getWindowSelf } from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+export const BIDDER_CODE = 'aseal';
+export const SUPPORTED_AD_TYPES = [BANNER];
+export const API_ENDPOINT = 'https://tkprebid.aotter.net/prebid/adapter';
+export const WEB_SESSION_ID_KEY = '__tkwsid';
+export const HEADER_AOTTER_VERSION = 'prebid_0.0.2';
+
+export const storage = getStorageManager({ bidderCode: BIDDER_CODE });
+
+const getTrekWebSessionId = () => {
+  let wsid =
+    storage.localStorageIsEnabled() &&
+    storage.getDataFromLocalStorage(WEB_SESSION_ID_KEY);
+
+  if (!wsid) {
+    wsid = generateUUID();
+    setTrekWebSessionId(wsid);
+  }
+
+  return wsid;
+};
+
+const setTrekWebSessionId = (wsid) => {
+  if (storage.localStorageIsEnabled()) {
+    storage.setDataInLocalStorage(WEB_SESSION_ID_KEY, wsid);
+  }
+};
+
+const canAccessTopWindow = () => {
+  try {
+    return !!getWindowTop().location.href;
+  } catch (errro) {
+    return false;
+  }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['aotter', 'trek'],
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: (bid) =>
+    !!bid.params.placeUid && typeof bid.params.placeUid === 'string',
+  buildRequests: (validBidRequests, bidderRequest) => {
+    if (validBidRequests.length === 0) {
+      return [];
+    }
+
+    const clientId = config.getConfig('aseal.clientId') || '';
+
+    const windowTop = getWindowTop();
+    const windowSelf = getWindowSelf();
+
+    const w = canAccessTopWindow() ? windowTop : windowSelf;
+
+    const data = {
+      bids: validBidRequests,
+      // TODO: please do not pass internal data structures over to the network
+      refererInfo: bidderRequest.refererInfo?.legacy,
+      device: {
+        webSessionId: getTrekWebSessionId(),
+      },
+      payload: {
+        meta: {
+          dr: w.document.referrer,
+          drs: windowSelf.document.referrer,
+          drt: (canAccessTopWindow() && windowTop.document.referrer) || '',
+          dt: w.document.title,
+          dl: w.location.href,
+        },
+      },
+    };
+
+    const options = {
+      contentType: 'application/json',
+      withCredentials: true,
+      customHeaders: {
+        'x-aotter-clientid': clientId,
+        'x-aotter-version': HEADER_AOTTER_VERSION,
+      },
+    };
+
+    return [
+      {
+        method: 'POST',
+        url: API_ENDPOINT,
+        data,
+        options,
+      },
+    ];
+  },
+  interpretResponse: (serverResponse, bidRequest) => {
+    if (!Array.isArray(serverResponse.body)) {
+      return [];
+    }
+
+    const bidResponses = serverResponse.body;
+
+    return bidResponses;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/asealBidAdapter.md b/modules/asealBidAdapter.md
new file mode 100644
index 00000000000..d13b802f736
--- /dev/null
+++ b/modules/asealBidAdapter.md
@@ -0,0 +1,52 @@
+# Overview
+
+```
+Module Name:  Aseal Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:   tech-service@aotter.net
+```
+
+# Description
+
+Module that connects to Aseal server for bids.
+Supported Ad Formats:
+
+- Banner
+
+# Configuration
+
+Following configuration is required:
+
+```js
+pbjs.setConfig({
+  aseal: {
+    clientId: "YOUR_CLIENT_ID"
+  }
+});
+```
+
+# Ad Unit Example
+
+```js
+var adUnits = [
+  {
+    code: "banner-div",
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 600]
+        ]
+      }
+    },
+    bids: [
+      {
+        bidder: "aseal",
+        params: {
+          placeUid: "f4a74f73-9a74-4a87-91c9-545c6316c23d"
+        }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/asoBidAdapter.js b/modules/asoBidAdapter.js
new file mode 100644
index 00000000000..39c42f193b2
--- /dev/null
+++ b/modules/asoBidAdapter.js
@@ -0,0 +1,355 @@
+import {
+  _each,
+  deepAccess,
+  deepSetValue,
+  getDNT,
+  inIframe,
+  isArray,
+  isFn,
+  logWarn,
+  parseSizesInput,
+  tryAppendQueryString
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
+import { parseDomain } from '../src/refererDetection.js';
+
+const BIDDER_CODE = 'aso';
+const DEFAULT_SERVER_URL = 'https://srv.aso1.net';
+const DEFAULT_SERVER_PATH = '/prebid/bidder';
+const OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+const VERSION = '$prebid.version$_1.1';
+const TTL = 300;
+
+export const spec = {
+
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  aliases: [
+    {code: 'bcmint'}
+  ],
+
+  isBidRequestValid: bid => {
+    return !!bid.params && !!bid.params.zone;
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    let serverRequests = [];
+
+    _each(validBidRequests, bidRequest => {
+      const payload = createBasePayload(bidRequest, bidderRequest);
+
+      const bannerParams = deepAccess(bidRequest, 'mediaTypes.banner');
+      const videoParams = deepAccess(bidRequest, 'mediaTypes.video');
+
+      let imp;
+
+      if (bannerParams && videoParams) {
+        logWarn('Please note, multiple mediaTypes are not supported. The only banner will be used.')
+      }
+
+      if (bannerParams) {
+        imp = createBannerImp(bidRequest, bannerParams)
+      } else if (videoParams) {
+        imp = createVideoImp(bidRequest, videoParams)
+      }
+
+      if (imp) {
+        payload.imp.push(imp);
+      } else {
+        return;
+      }
+
+      serverRequests.push({
+        method: 'POST',
+        url: getEndpoint(bidRequest),
+        data: payload,
+        options: {
+          withCredentials: true,
+          crossOrigin: true
+        },
+        bidRequest: bidRequest
+      });
+    });
+
+    return serverRequests;
+  },
+
+  interpretResponse: (serverResponse, {bidRequest}) => {
+    const response = serverResponse && serverResponse.body;
+
+    if (!response) {
+      return [];
+    }
+
+    const serverBids = response.seatbid.reduce((acc, seatBid) => acc.concat(seatBid.bid), []);
+    const serverBid = serverBids[0];
+
+    let bids = [];
+
+    const bid = {
+      requestId: serverBid.impid,
+      cpm: serverBid.price,
+      width: serverBid.w,
+      height: serverBid.h,
+      ttl: TTL,
+      creativeId: serverBid.crid,
+      netRevenue: true,
+      currency: response.cur,
+      mediaType: bidRequest.mediaType,
+      meta: {
+        mediaType: bidRequest.mediaType,
+        advertiserDomains: serverBid.adomain ? serverBid.adomain : []
+      }
+    };
+
+    if (bid.mediaType === BANNER) {
+      bid.ad = serverBid.adm;
+    } else if (bid.mediaType === VIDEO) {
+      bid.vastXml = serverBid.adm;
+      if (deepAccess(bidRequest, 'mediaTypes.video.context') === 'outstream') {
+        bid.adResponse = {
+          content: bid.vastXml,
+        };
+        bid.renderer = createRenderer(bidRequest, OUTSTREAM_RENDERER_URL);
+      }
+    }
+
+    bids.push(bid);
+
+    return bids;
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const urls = [];
+
+    if (serverResponses && serverResponses.length !== 0) {
+      let query = '';
+      if (gdprConsent) {
+        query = tryAppendQueryString(query, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
+        query = tryAppendQueryString(query, 'consents_str', gdprConsent.consentString);
+        const consentsIds = getConsentsIds(gdprConsent);
+        if (consentsIds) {
+          query = tryAppendQueryString(query, 'consents', consentsIds);
+        }
+      }
+
+      if (uspConsent) {
+        query = tryAppendQueryString(query, 'us_privacy', uspConsent);
+      }
+
+      _each(serverResponses, resp => {
+        const userSyncs = deepAccess(resp, 'body.ext.user_syncs');
+        if (!userSyncs) {
+          return;
+        }
+
+        _each(userSyncs, us => {
+          urls.push({
+            type: us.type,
+            url: us.url + (query ? '?' + query : '')
+          });
+        });
+      });
+    }
+
+    return urls;
+  }
+};
+
+function outstreamRender(bid) {
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      sizes: [bid.width, bid.height],
+      targetId: bid.adUnitCode,
+      adResponse: bid.adResponse,
+      rendererOptions: bid.renderer.getConfig()
+    });
+  });
+}
+
+function createRenderer(bid, url) {
+  const renderer = Renderer.install({
+    id: bid.bidId,
+    url: url,
+    loaded: false,
+    config: deepAccess(bid, 'renderer.options'),
+    adUnitCode: bid.adUnitCode
+  });
+  renderer.setRender(outstreamRender);
+  return renderer;
+}
+
+function getUrlsInfo(bidderRequest) {
+  const {page, domain, ref} = bidderRequest.refererInfo;
+  return {
+    // TODO: do the fallbacks make sense here?
+    page: page || bidderRequest.refererInfo?.topmostLocation,
+    referrer: ref || '',
+    domain: domain || parseDomain(bidderRequest?.refererInfo?.topmostLocation)
+  }
+}
+
+function getSize(paramSizes) {
+  const parsedSizes = parseSizesInput(paramSizes);
+  const sizes = parsedSizes.map(size => {
+    const [width, height] = size.split('x');
+    const w = parseInt(width, 10);
+    const h = parseInt(height, 10);
+    return {w, h};
+  });
+
+  return sizes[0] || null;
+}
+
+function getBidFloor(bidRequest, size) {
+  if (!isFn(bidRequest.getFloor)) {
+    return null;
+  }
+
+  const bidFloor = bidRequest.getFloor({
+    mediaType: bidRequest.mediaType,
+    size: size ? [size.w, size.h] : '*'
+  });
+
+  if (!isNaN(bidFloor.floor)) {
+    return bidFloor;
+  }
+
+  return null;
+}
+
+function createBaseImp(bidRequest, size) {
+  const imp = {
+    id: bidRequest.bidId,
+    tagid: bidRequest.adUnitCode,
+    secure: 1
+  };
+
+  const bidFloor = getBidFloor(bidRequest, size);
+  if (bidFloor !== null) {
+    imp.bidfloor = bidFloor.floor;
+    imp.bidfloorcur = bidFloor.currency;
+  }
+
+  return imp;
+}
+
+function createBannerImp(bidRequest, bannerParams) {
+  bidRequest.mediaType = BANNER;
+
+  const size = getSize(bannerParams.sizes);
+  const imp = createBaseImp(bidRequest, size);
+
+  imp.banner = {
+    w: size.w,
+    h: size.h,
+    topframe: inIframe() ? 0 : 1
+  }
+
+  return imp;
+}
+
+function createVideoImp(bidRequest, videoParams) {
+  bidRequest.mediaType = VIDEO;
+  const size = getSize(videoParams.playerSize);
+  const imp = createBaseImp(bidRequest, size);
+
+  imp.video = {
+    mimes: videoParams.mimes,
+    minduration: videoParams.minduration,
+    startdelay: videoParams.startdelay,
+    linearity: videoParams.linearity,
+    maxduration: videoParams.maxduration,
+    skip: videoParams.skip,
+    protocols: videoParams.protocols,
+    skipmin: videoParams.skipmin,
+    api: videoParams.api
+  }
+
+  if (size) {
+    imp.video.w = size.w;
+    imp.video.h = size.h;
+  }
+
+  return imp;
+}
+
+function getEndpoint(bidRequest) {
+  const serverUrl = bidRequest.params.server || DEFAULT_SERVER_URL;
+  return serverUrl + DEFAULT_SERVER_PATH + '?zid=' + bidRequest.params.zone + '&pbjs=' + VERSION;
+}
+
+function getConsentsIds(gdprConsent) {
+  const consents = deepAccess(gdprConsent, 'vendorData.purpose.consents', []);
+  let consentsIds = [];
+
+  Object.keys(consents).forEach(function (key) {
+    if (consents[key] === true) {
+      consentsIds.push(key);
+    }
+  });
+
+  return consentsIds.join(',');
+}
+
+function createBasePayload(bidRequest, bidderRequest) {
+  const urlsInfo = getUrlsInfo(bidderRequest);
+
+  const payload = {
+    id: bidRequest.auctionId + '_' + bidRequest.bidId,
+    at: 1,
+    tmax: bidderRequest.timeout,
+    site: {
+      id: urlsInfo.domain,
+      domain: urlsInfo.domain,
+      page: urlsInfo.page,
+      ref: urlsInfo.referrer
+    },
+    device: {
+      dnt: getDNT() ? 1 : 0,
+      h: window.innerHeight,
+      w: window.innerWidth,
+    },
+    imp: [],
+    ext: {},
+    user: {}
+  };
+
+  if (bidRequest.params.attr) {
+    deepSetValue(payload, 'site.ext.attr', bidRequest.params.attr);
+  }
+
+  if (bidderRequest.gdprConsent) {
+    deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+    const consentsIds = getConsentsIds(bidderRequest.gdprConsent);
+    if (consentsIds) {
+      deepSetValue(payload, 'user.ext.consents', consentsIds);
+    }
+    deepSetValue(payload, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1);
+  }
+
+  if (bidderRequest.uspConsent) {
+    deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+
+  if (config.getConfig('coppa')) {
+    deepSetValue(payload, 'regs.coppa', 1);
+  }
+
+  const eids = deepAccess(bidRequest, 'userIdAsEids');
+  if (eids && eids.length) {
+    deepSetValue(payload, 'user.ext.eids', eids);
+  }
+
+  const schainData = deepAccess(bidRequest, 'schain.nodes');
+  if (isArray(schainData) && schainData.length > 0) {
+    deepSetValue(payload, 'source.ext.schain', bidRequest.schain);
+  }
+
+  return payload;
+}
+
+registerBidder(spec);
diff --git a/modules/asoBidAdapter.md b/modules/asoBidAdapter.md
new file mode 100644
index 00000000000..f187389c5b5
--- /dev/null
+++ b/modules/asoBidAdapter.md
@@ -0,0 +1,77 @@
+# Overview
+
+```
+Module Name: Adserver.Online Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@adsrv.org
+```
+
+# Description
+
+Adserver.Online Bidder Adapter for Prebid.js.
+
+For more information, please visit [Adserver.Online](https://adserver.online).
+
+# Parameters
+
+| Name      | Scope    | Description             | Example                | Type       |
+|-----------|----------|-------------------------|------------------------|------------|
+| `zone`    | required | Zone ID                 | `73815`                | `Integer`  |
+| `attr`    | optional | Custom targeting params | `{foo: ["a", "b"]}`    | `Object`   |
+| `server`  | optional | Custom bidder endpoint  | `https://endpoint.url` | `String`   |
+
+# Test parameters for banner
+```js
+var adUnits = [
+    {
+        code: 'banner1',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]],
+            }
+        },
+        bids: [
+            {
+                bidder: 'aso',
+                params: {
+                    zone: 73815
+                }
+            }
+        ]
+    }
+];
+```
+
+# Test parameters for video
+```js
+var videoAdUnit = [
+    {
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                playerSize: [[640, 480]],
+                context: 'instream' // or 'outstream'
+            }
+        },
+        bids: [{
+            bidder: 'aso',
+            params: {
+                zone: 34668
+            }
+        }]
+    }
+];
+```
+
+# Configuration
+
+The Adserver.Online Bid Adapter expects Prebid Cache (for video) to be enabled.
+
+```
+pbjs.setConfig({
+    usePrebidCache: true,
+    cache: {
+        url: 'https://prebid.adnxs.com/pbc/v1/cache'
+    }
+});
+```
diff --git a/modules/astraoneBidAdapter.js b/modules/astraoneBidAdapter.js
index 7e98c1022d2..d6bfa4b93ee 100644
--- a/modules/astraoneBidAdapter.js
+++ b/modules/astraoneBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js'
+import { _map } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { BANNER } from '../src/mediaTypes.js'
 
@@ -7,7 +7,7 @@ const SSP_ENDPOINT = 'https://ssp.astraone.io/auction/prebid';
 const TTL = 60;
 
 function buildBidRequests(validBidRequests) {
-  return utils._map(validBidRequests, function(validBidRequest) {
+  return _map(validBidRequests, function(validBidRequest) {
     const params = validBidRequest.params;
     const bidRequest = {
       bidId: validBidRequest.bidId,
@@ -31,7 +31,9 @@ function buildBid(bidData) {
     creativeId: bidData.content.seanceId,
     currency: bidData.currency,
     netRevenue: true,
-    mediaType: BANNER,
+    meta: {
+      mediaType: BANNER,
+    },
     ttl: TTL,
     content: bidData.content
   };
@@ -62,7 +64,7 @@ function wrapAd(bid, bidData) {
                 parentDocument.style.height = "100%";
                 parentDocument.style.width = "100%";
             }
-            var _html = "${encodeURIComponent(JSON.stringify(bid))}";
+            var _html = "${encodeURIComponent(JSON.stringify({...bid, content: bidData.content}))}";
             window._ao_ssp.registerInImage(JSON.parse(decodeURIComponent(_html)));
         </script>
     </body>
@@ -97,7 +99,7 @@ export const spec = {
    */
   buildRequests(validBidRequests, bidderRequest) {
     const payload = {
-      url: bidderRequest.refererInfo.referer,
+      url: bidderRequest.refererInfo.page,
       cmp: !!bidderRequest.gdprConsent,
       bidRequests: buildBidRequests(validBidRequests)
     };
@@ -126,14 +128,9 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: function(serverResponse) {
-    const serverBody = serverResponse.body;
-    if (serverBody && utils.isArray(serverBody)) {
-      return utils._map(serverBody, function(bid) {
-        return buildBid(bid);
-      });
-    } else {
-      return [];
-    }
+    const bids = serverResponse.body && serverResponse.body.bids;
+
+    return Array.isArray(bids) ? bids.map(bid => buildBid(bid)) : []
   }
 
 }
diff --git a/modules/astraoneBidAdapter.md b/modules/astraoneBidAdapter.md
index a7eaeeef5a4..e090cfe1e54 100644
--- a/modules/astraoneBidAdapter.md
+++ b/modules/astraoneBidAdapter.md
@@ -18,17 +18,17 @@ About us: https://astraone.io
 var adUnits = [{
     code: 'test-div',
     mediaTypes: {
-        banner: {
-            sizes: [1, 1]
-        }
+      banner: {
+        sizes: [1, 1],
+      }
     },
     bids: [{
-        bidder: "astraone",
-        params: {
-            placement: "inImage",
-            placeId: "5af45ad34d506ee7acad0c26",
-            imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
-        }
+      bidder: "astraone",
+      params: {
+        placement: "inImage",
+        placeId: "5f477bf94d506ebe2c4240f3",
+        imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
+      }
     }]
 }];
 ```
@@ -39,66 +39,69 @@ var adUnits = [{
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="UTF-8">
-	<title>Prebid.js Banner Example</title>
-	<script async src="prebid.js"></script>
-	<style>
-        .banner-block {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-            top: 0;
-            left: 0;
-            z-index: 1;
-            border: none;
-            overflow: hidden;
+  <meta charset="UTF-8">
+  <title>Prebid.js Banner Example</title>
+  <script src="../../../build/dev/prebid.js"></script>
+  <style>
+    .banner-block {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      border: none;
+      overflow: hidden;
+    }
+  </style>
+  <script>
+    var adUnits = [{
+      code: 'test-div',
+      mediaTypes: {
+        banner: {
+          sizes: [1, 1],
         }
-    </style>
-    <script>
-        var adUnits = [{
-            code: 'test-div',
-            sizes: [1, 1],
-            bids: [{
-                bidder: "astraone",
-                params: {
-                    placement: "inImage",
-                    placeId: "5af45ad34d506ee7acad0c26",
-                    imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
-                }
-            }]
-        }];
-
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-
-        pbjs.que.push(function() {
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: function (e) {
-                    if (pbjs.adserverRequestSent) return;
-                    pbjs.adserverRequestSent = true;
-
-                    var params = pbjs.getAdserverTargetingForAdUnitCode("test-div");
-                    var iframe = document.getElementById('test-div');
-
-                    if (params && params['hb_adid']) {
-                        iframe.parentElement.style.position = "relative";
-                        iframe.style.display = "block";
-                        pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
-                    }
-                }
-            });
-        });
-    </script>
+      },
+      bids: [{
+        bidder: "astraone",
+        params: {
+          placement: "inImage",
+          placeId: "5f477bf94d506ebe2c4240f3",
+          imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({
+        bidsBackHandler: function (e) {
+          if (pbjs.adserverRequestSent) return;
+          pbjs.adserverRequestSent = true;
+          var params = pbjs.getAdserverTargetingForAdUnitCode("test-div");
+          var iframe = document.getElementById('test-div');
+
+          if (params && params['hb_adid']) {
+            iframe.parentElement.style.position = "relative";
+            iframe.style.display = "block";
+            pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+          }
+        }
+      });
+    });
+  </script>
 </head>
 
 <body>
-	<h2>Prebid.js InImage Banner Test</h2>
+<h2>Prebid.js InImage Banner Test</h2>
 
-	<div style="width: 600px;">
-        <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" />
-        <iframe id='test-div' class="banner-block" style="display: none;"></iframe>
-    </div>
+<div style="width: 600px;">
+  <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" width="100%" />
+  <iframe id='test-div' class="banner-block" style="display: none;"></iframe>
+</div>
 </body>
 
 </html>
@@ -109,90 +112,91 @@ var adUnits = [{
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="UTF-8">
-	<title>Prebid.js Banner Example</title>
-	<script async src="prebid.js"></script>
-	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
-	<style>
-		.banner-block {
-			position: absolute;
-			width: 100%;
-			height: 100%;
-			top: 0;
-			left: 0;
-			z-index: 1;
-			border: none;
-			overflow: hidden;
-		}
-		.banner-block div {
-			width: 100%;
-			height: 100%;
-		}
-	</style>
-	<script>
-		var pbjs = pbjs || {};
-		pbjs.que = pbjs.que || [];
-
-		var adUnits = [{
-			code: 'div-gpt-ad-1574864639578-0',
-			mediaTypes: {
-				banner: {
-					sizes: [1, 1]
-				}
-			},
-			bids: [{
-				bidder: "astraone",
-				params: {
-					placement: "inImage",
-					placeId: "5af45ad34d506ee7acad0c26",
-					imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
-				}
-			}]
-		}];
-
-		var googletag = googletag || {};
-		googletag.cmd = googletag.cmd || [];
-
-		googletag.cmd.push(() => {
-			googletag.pubads().disableInitialLoad();
-		});
-
-		pbjs.que.push(() => {
-			pbjs.addAdUnits(adUnits);
-			pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
-		});
-
-		function sendAdServerRequest() {
-			googletag.cmd.push(() => {
-				pbjs.que.push(() => {
-					pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
-					googletag.pubads().refresh();
-				});
-			});
-		}
-
-		googletag.cmd.push(() => {
-			googletag
-				.defineSlot('/21877108735/rtb-pbjs', [1, 1], 'div-gpt-ad-1574864639578-0')
-				.addService(googletag.pubads());
-
-			googletag.pubads().enableSingleRequest();
-			googletag.enableServices();
-		});
-	</script>
+  <meta charset="UTF-8">
+  <title>Prebid.js Banner gpt Example</title>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script async src="../../../build/dev/prebid.js"></script>
+  <style>
+    .banner-block {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      border: none;
+      overflow: hidden;
+    }
+    .banner-block div {
+      width: 100%;
+      height: 100%;
+    }
+  </style>
+  <script>
+    var sizes = [1, 1];
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    var adUnits = [{
+      code: 'div-gpt-ad-1574864639578-0',
+      mediaTypes: {
+        banner: {
+          sizes: sizes,
+        }
+      },
+      bids: [{
+        bidder: "astraone",
+        params: {
+          placement: "inImage",
+          placeId: "5f477bf94d506ebe2c4240f3",
+          imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
+        }
+      }]
+    }];
+
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+
+    googletag.cmd.push(() => {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    pbjs.que.push(() => {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+    });
+
+    function sendAdServerRequest() {
+      googletag.cmd.push(() => {
+        pbjs.que.push(() => {
+          pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    googletag.cmd.push(() => {
+      googletag
+        .defineSlot('/21877108735/rtb-pbjs', sizes, 'div-gpt-ad-1574864639578-0')
+        .addService(googletag.pubads());
+
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
 </head>
 <body>
-	<h2>Prebid.js Banner Ad Unit Test</h2>
+<h2>Prebid.js InImage Banner gpt Test</h2>
 
-	<div style="width: 600px; position: relative">
-		<img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" />
+<div style="width: 600px; position: relative">
+  <img src="https://creative.astraone.io/files/default_image-1-600x400.jpg" />
 
-		<div id='div-gpt-ad-1574864639578-0' class="banner-block">
-			<script>
-				googletag.cmd.push(() => { googletag.display('div-gpt-ad-1574864639578-0'); });
-			</script>
-		</div>
-	</div>
+  <div id='div-gpt-ad-1574864639578-0' class="banner-block">
+    <script>
+      googletag.cmd.push(() => { googletag.display('div-gpt-ad-1574864639578-0'); });
+    </script>
+  </div>
+</div>
 </body>
 </html>
 ```
diff --git a/modules/atomxBidAdapter.js b/modules/atomxBidAdapter.js
deleted file mode 100644
index e9f15218c4c..00000000000
--- a/modules/atomxBidAdapter.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'atomx';
-
-function getDomain() {
-  var domain = '';
-
-  try {
-    if ((domain === '') && (window.top == window)) {
-      domain = window.location.href;
-    }
-
-    if ((domain === '') && (window.top == window.parent)) {
-      domain = document.referrer;
-    }
-
-    if (domain == '') {
-      var atomxt = 'atomxtest';
-
-      // It should be impossible to change the window.location.ancestorOrigins.
-      window.location.ancestorOrigins[0] = atomxt;
-      if (window.location.ancestorOrigins[0] != atomxt) {
-        var ancestorOrigins = window.location.ancestorOrigins;
-
-        // If the length is 0 we are a javascript tag running in the main domain.
-        // But window.top != window or window.location.hostname is empty.
-        if (ancestorOrigins.length == 0) {
-          // This browser is so fucked up, just return an empty string.
-          return '';
-        }
-
-        // ancestorOrigins is an array where [0] is our own window.location
-        // and [length-1] is the top window.location.
-        domain = ancestorOrigins[ancestorOrigins.length - 1];
-      }
-    }
-  } catch (unused) {
-  }
-
-  if (domain === '') {
-    domain = document.referrer;
-  }
-
-  if (domain === '') {
-    domain = window.location.href;
-  }
-
-  return domain.substr(0, 512);
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-
-  isBidRequestValid: function(bid) {
-    return bid.params && (!!bid.params.id);
-  },
-
-  buildRequests: function(validBidRequests) {
-    return validBidRequests.map(bidRequest => {
-      return {
-        method: 'GET',
-        url: 'https://p.ato.mx/placement',
-        data: {
-          v: 12,
-          id: bidRequest.params.id,
-          size: utils.parseSizesInput(bidRequest.sizes)[0],
-          prebid: bidRequest.bidId,
-          b: 0,
-          h: '7t3y9',
-          type: 'javascript',
-          screen: window.screen.width + 'x' + window.screen.height + 'x' + window.screen.colorDepth,
-          timezone: new Date().getTimezoneOffset(),
-          domain: getDomain(),
-          r: document.referrer.substr(0, 512),
-        },
-      };
-    });
-  },
-
-  interpretResponse: function (serverResponse, bidRequest) {
-    const body = serverResponse.body;
-    const res = {
-      requestId: body.code,
-      cpm: body.cpm * 1000,
-      width: body.width,
-      height: body.height,
-      creativeId: body.creative_id,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 60,
-    };
-
-    if (body.adm) {
-      res.ad = body.adm;
-    } else {
-      res.adUrl = body.url;
-    }
-
-    return [res];
-  },
-
-  getUserSyncs: function(syncOptions, serverResponses) {
-    return [];
-  },
-};
-registerBidder(spec);
diff --git a/modules/atomxBidAdapter.md b/modules/atomxBidAdapter.md
deleted file mode 100644
index 7f32b12fdfe..00000000000
--- a/modules/atomxBidAdapter.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Overview
-Module Name: Atomx Bidder Adapter Module 
-Type: Bidder Adapter 
-Maintainer: erik@atomx.com
-
-# Description
-Atomx Bidder Adapter for Prebid.js.
-
-# Test Parameters
-```
-var adUnits = [
-{
-    code: 'test-div',
-    sizes: [[300, 250]],
-    bids: [
-        {
-             bidder: 'atomx',
-             params: {
-                 id: 4025860,
-             }
-        }
-    ]
-}
-];
-```
diff --git a/modules/atsAnalyticsAdapter.js b/modules/atsAnalyticsAdapter.js
index 7bf2ca75c17..0c0227ea34a 100644
--- a/modules/atsAnalyticsAdapter.js
+++ b/modules/atsAnalyticsAdapter.js
@@ -1,28 +1,229 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import { logError, logInfo } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adaptermanager from '../src/adapterManager.js';
-import * as utils from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+
+export const storage = getStorageManager();
+
+/**
+ * Analytics adapter for - https://liveramp.com
+ * Maintainer - prebid@liveramp.com
+ */
 
 const analyticsType = 'endpoint';
 
+const preflightUrl = 'https://check.analytics.rlcdn.com/check/';
+export const analyticsUrl = 'https://analytics.rlcdn.com';
+
 let handlerRequest = [];
 let handlerResponse = [];
-let host = '';
+
+let atsAnalyticsAdapterVersion = 3;
+
+let browsersList = [
+  /* Googlebot */
+  {
+    test: /googlebot/i,
+    name: 'Googlebot'
+  },
+
+  /* Opera < 13.0 */
+  {
+    test: /opera/i,
+    name: 'Opera',
+  },
+
+  /* Opera > 13.0 */
+  {
+    test: /opr\/|opios/i,
+    name: 'Opera'
+  },
+  {
+    test: /SamsungBrowser/i,
+    name: 'Samsung Internet for Android',
+  },
+  {
+    test: /Whale/i,
+    name: 'NAVER Whale Browser',
+  },
+  {
+    test: /MZBrowser/i,
+    name: 'MZ Browser'
+  },
+  {
+    test: /focus/i,
+    name: 'Focus',
+  },
+  {
+    test: /swing/i,
+    name: 'Swing',
+  },
+  {
+    test: /coast/i,
+    name: 'Opera Coast',
+  },
+  {
+    test: /opt\/\d+(?:.?_?\d+)+/i,
+    name: 'Opera Touch',
+  },
+  {
+    test: /yabrowser/i,
+    name: 'Yandex Browser',
+  },
+  {
+    test: /ucbrowser/i,
+    name: 'UC Browser',
+  },
+  {
+    test: /Maxthon|mxios/i,
+    name: 'Maxthon',
+  },
+  {
+    test: /epiphany/i,
+    name: 'Epiphany',
+  },
+  {
+    test: /puffin/i,
+    name: 'Puffin',
+  },
+  {
+    test: /sleipnir/i,
+    name: 'Sleipnir',
+  },
+  {
+    test: /k-meleon/i,
+    name: 'K-Meleon',
+  },
+  {
+    test: /micromessenger/i,
+    name: 'WeChat',
+  },
+  {
+    test: /qqbrowser/i,
+    name: (/qqbrowserlite/i).test(window.navigator.userAgent) ? 'QQ Browser Lite' : 'QQ Browser',
+  },
+  {
+    test: /msie|trident/i,
+    name: 'Internet Explorer',
+  },
+  {
+    test: /\sedg\//i,
+    name: 'Microsoft Edge',
+  },
+  {
+    test: /edg([ea]|ios)/i,
+    name: 'Microsoft Edge',
+  },
+  {
+    test: /vivaldi/i,
+    name: 'Vivaldi',
+  },
+  {
+    test: /seamonkey/i,
+    name: 'SeaMonkey',
+  },
+  {
+    test: /sailfish/i,
+    name: 'Sailfish',
+  },
+  {
+    test: /silk/i,
+    name: 'Amazon Silk',
+  },
+  {
+    test: /phantom/i,
+    name: 'PhantomJS',
+  },
+  {
+    test: /slimerjs/i,
+    name: 'SlimerJS',
+  },
+  {
+    test: /blackberry|\bbb\d+/i,
+    name: 'BlackBerry',
+  },
+  {
+    test: /(web|hpw)[o0]s/i,
+    name: 'WebOS Browser',
+  },
+  {
+    test: /bada/i,
+    name: 'Bada',
+  },
+  {
+    test: /tizen/i,
+    name: 'Tizen',
+  },
+  {
+    test: /qupzilla/i,
+    name: 'QupZilla',
+  },
+  {
+    test: /firefox|iceweasel|fxios/i,
+    name: 'Firefox',
+  },
+  {
+    test: /electron/i,
+    name: 'Electron',
+  },
+  {
+    test: /MiuiBrowser/i,
+    name: 'Miui',
+  },
+  {
+    test: /chromium/i,
+    name: 'Chromium',
+  },
+  {
+    test: /chrome|crios|crmo/i,
+    name: 'Chrome',
+  },
+  {
+    test: /GSA/i,
+    name: 'Google Search',
+  },
+
+  /* Android Browser */
+  {
+    test: /android/i,
+    name: 'Android Browser',
+  },
+
+  /* PlayStation 4 */
+  {
+    test: /playstation 4/i,
+    name: 'PlayStation 4',
+  },
+
+  /* Safari */
+  {
+    test: /safari|applewebkit/i,
+    name: 'Safari',
+  },
+];
+
+let listOfSupportedBrowsers = ['Safari', 'Chrome', 'Firefox', 'Microsoft Edge'];
 
 function bidRequestedHandler(args) {
+  let envelopeSourceCookieValue = storage.getCookie('_lr_env_src_ats');
+  let envelopeSource = envelopeSourceCookieValue === 'true';
   let requests;
   requests = args.bids.map(function(bid) {
     return {
+      envelope_source: envelopeSource,
       has_envelope: bid.userId ? !!bid.userId.idl_env : false,
       bidder: bid.bidder,
       bid_id: bid.bidId,
       auction_id: args.auctionId,
-      user_browser: (browserIsFirefox() || browserIsEdge() || browserIsChrome() || browserIsSafari()),
+      user_browser: parseBrowser(),
       user_platform: navigator.platform,
       auction_start: new Date(args.auctionStart).toJSON(),
       domain: window.location.hostname,
       pid: atsAnalyticsAdapter.context.pid,
+      adapter_version: atsAnalyticsAdapterVersion,
+      bid_won: false
     };
   });
   return requests;
@@ -38,84 +239,64 @@ function bidResponseHandler(args) {
   };
 }
 
-export function browserIsFirefox() {
-  if (typeof InstallTrigger !== 'undefined') {
-    return 'Firefox';
-  } else {
-    return false;
-  }
-}
-
-export function browserIsIE() {
-  return !!document.documentMode;
-}
-
-export function browserIsEdge() {
-  if (!browserIsIE() && !!window.StyleMedia) {
-    return 'Edge';
-  } else {
-    return false;
-  }
-}
-
-export function browserIsChrome() {
-  if ((!!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime)) || (/Android/i.test(navigator.userAgent) && !!window.chrome)) {
-    return 'Chrome';
-  } else {
-    return false;
+export function parseBrowser() {
+  let ua = atsAnalyticsAdapter.getUserAgent();
+  try {
+    let result = browsersList.filter(function(obj) {
+      return obj.test.test(ua);
+    });
+    let browserName = result && result.length ? result[0].name : '';
+    return (listOfSupportedBrowsers.indexOf(browserName) >= 0) ? browserName : 'Unknown';
+  } catch (err) {
+    logError('ATS Analytics - Error while checking user browser!', err);
   }
 }
 
-export function browserIsSafari() {
-  if (navigator.vendor.indexOf('Apple')) {
-    return 'Safari'
-  } else {
-    return false;
+function sendDataToAnalytic (events) {
+  // send data to ats analytic endpoint
+  try {
+    let dataToSend = {'Data': events};
+    let strJSON = JSON.stringify(dataToSend);
+    logInfo('ATS Analytics - tried to send analytics data!');
+    ajax(analyticsUrl, function () {
+      logInfo('ATS Analytics - events sent successfully!');
+    }, strJSON, {method: 'POST', contentType: 'application/json'});
+  } catch (err) {
+    logError('ATS Analytics - request encounter an error: ', err);
   }
 }
 
-function callHandler(evtype, args) {
-  if (evtype === CONSTANTS.EVENTS.BID_REQUESTED) {
-    handlerRequest = handlerRequest.concat(bidRequestedHandler(args));
-  } else if (evtype === CONSTANTS.EVENTS.BID_RESPONSE) {
-    handlerResponse.push(bidResponseHandler(args));
-  }
-  if (evtype === CONSTANTS.EVENTS.AUCTION_END) {
-    if (handlerRequest.length) {
-      let events = [];
-      if (handlerResponse.length) {
-        events = handlerRequest.filter(request => handlerResponse.filter(function(response) {
-          if (request.bid_id === response.bid_id) {
-            Object.assign(request, response);
-          }
-        }));
-      } else {
-        events = handlerRequest;
+// preflight request, to check did publisher have permission to send data to analytics endpoint
+function preflightRequest (events) {
+  logInfo('ATS Analytics - preflight request!');
+  ajax(preflightUrl + atsAnalyticsAdapter.context.pid,
+    {
+      success: function (data) {
+        let samplingRateObject = JSON.parse(data);
+        logInfo('ATS Analytics - Sampling Rate: ', samplingRateObject);
+        let samplingRate = samplingRateObject.samplingRate;
+        atsAnalyticsAdapter.setSamplingCookie(samplingRate);
+        let samplingRateNumber = Number(samplingRate);
+        if (data && samplingRate && atsAnalyticsAdapter.shouldFireRequest(samplingRateNumber)) {
+          logInfo('ATS Analytics - events to send: ', events);
+          sendDataToAnalytic(events);
+        }
+      },
+      error: function () {
+        atsAnalyticsAdapter.setSamplingCookie(0);
+        logInfo('ATS Analytics - Sampling Rate Request Error!');
       }
-      atsAnalyticsAdapter.context.events = events;
-    }
-  }
+    }, undefined, {method: 'GET', crossOrigin: true});
 }
 
 let atsAnalyticsAdapter = Object.assign(adapter(
   {
-    host,
     analyticsType
   }),
 {
   track({eventType, args}) {
     if (typeof args !== 'undefined') {
-      callHandler(eventType, args);
-    }
-    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
-      // send data to ats analytic endpoint
-      try {
-        let dataToSend = {'Data': atsAnalyticsAdapter.context.events};
-        let strJSON = JSON.stringify(dataToSend);
-        ajax(atsAnalyticsAdapter.context.host, function () {
-        }, strJSON, {method: 'POST', contentType: 'application/json'});
-      } catch (err) {
-      }
+      atsAnalyticsAdapter.callHandler(eventType, args);
     }
   }
 });
@@ -123,31 +304,102 @@ let atsAnalyticsAdapter = Object.assign(adapter(
 // save the base class function
 atsAnalyticsAdapter.originEnableAnalytics = atsAnalyticsAdapter.enableAnalytics;
 
+// add check to not fire request every time, but instead to send 1/100
+atsAnalyticsAdapter.shouldFireRequest = function (samplingRate) {
+  if (samplingRate !== 0) {
+    let shouldFireRequestValue = (Math.floor((Math.random() * 100 + 1)) === 100);
+    logInfo('ATS Analytics - Should Fire Request: ', shouldFireRequestValue);
+    return shouldFireRequestValue;
+  } else {
+    logInfo('ATS Analytics - Should Fire Request: ', false);
+    return false;
+  }
+};
+
+atsAnalyticsAdapter.getUserAgent = function () {
+  return window.navigator.userAgent;
+};
+
+atsAnalyticsAdapter.setSamplingCookie = function (samplRate) {
+  const now = new Date();
+  now.setTime(now.getTime() + 86400000);
+  storage.setCookie('_lr_sampling_rate', samplRate, now.toUTCString());
+}
+
 // override enableAnalytics so we can get access to the config passed in from the page
 atsAnalyticsAdapter.enableAnalytics = function (config) {
   if (!config.options.pid) {
-    utils.logError('Publisher ID (pid) option is not defined. Analytics won\'t work');
-    return;
-  }
-
-  if (!config.options.host) {
-    utils.logError('Host option is not defined. Analytics won\'t work');
+    logError('ATS Analytics - Publisher ID (pid) option is not defined. Analytics won\'t work');
     return;
   }
-
-  host = config.options.host;
   atsAnalyticsAdapter.context = {
     events: [],
-    host: config.options.host,
-    pid: config.options.pid
+    pid: config.options.pid,
+    bidWonTimeout: config.options.bidWonTimeout
   };
   let initOptions = config.options;
+  logInfo('ATS Analytics - adapter enabled! ');
   atsAnalyticsAdapter.originEnableAnalytics(initOptions); // call the base class function
 };
 
+atsAnalyticsAdapter.callHandler = function (evtype, args) {
+  if (evtype === CONSTANTS.EVENTS.BID_REQUESTED) {
+    handlerRequest = handlerRequest.concat(bidRequestedHandler(args));
+  } else if (evtype === CONSTANTS.EVENTS.BID_RESPONSE) {
+    handlerResponse.push(bidResponseHandler(args));
+  }
+  if (evtype === CONSTANTS.EVENTS.AUCTION_END) {
+    let bidWonTimeout = atsAnalyticsAdapter.context.bidWonTimeout ? atsAnalyticsAdapter.context.bidWonTimeout : 2000;
+    let events = [];
+    setTimeout(() => {
+      let winningBids = $$PREBID_GLOBAL$$.getAllWinningBids();
+      logInfo('ATS Analytics - winning bids: ', winningBids)
+      // prepare format data for sending to analytics endpoint
+      if (handlerRequest.length) {
+        let wonEvent = {};
+        if (handlerResponse.length) {
+          events = handlerRequest.filter(request => handlerResponse.filter(function (response) {
+            if (request.bid_id === response.bid_id) {
+              Object.assign(request, response);
+            }
+          }));
+          if (winningBids.length) {
+            events = events.filter(event => winningBids.filter(function (won) {
+              wonEvent.bid_id = won.requestId;
+              wonEvent.bid_won = true;
+              if (event.bid_id === wonEvent.bid_id) {
+                Object.assign(event, wonEvent);
+              }
+            }))
+          }
+        } else {
+          events = handlerRequest;
+        }
+        // check should we send data to analytics or not, check first cookie value _lr_sampling_rate
+        try {
+          let samplingRateCookie = storage.getCookie('_lr_sampling_rate');
+          if (!samplingRateCookie) {
+            preflightRequest(events);
+          } else {
+            if (atsAnalyticsAdapter.shouldFireRequest(parseInt(samplingRateCookie))) {
+              logInfo('ATS Analytics - events to send: ', events);
+              sendDataToAnalytic(events);
+            }
+          }
+          // empty events array to not send duplicate events
+          events = [];
+        } catch (err) {
+          logError('ATS Analytics - preflight request encounter an error: ', err);
+        }
+      }
+    }, bidWonTimeout);
+  }
+}
+
 adaptermanager.registerAnalyticsAdapter({
   adapter: atsAnalyticsAdapter,
-  code: 'atsAnalytics'
+  code: 'atsAnalytics',
+  gvlid: 97
 });
 
 export default atsAnalyticsAdapter;
diff --git a/modules/atsAnalyticsAdapter.md b/modules/atsAnalyticsAdapter.md
index 560ad237aa0..17819ac61b3 100644
--- a/modules/atsAnalyticsAdapter.md
+++ b/modules/atsAnalyticsAdapter.md
@@ -17,7 +17,7 @@ Analytics adapter for Authenticated Traffic Solution(ATS), provided by LiveRamp.
   provider: 'atsAnalytics',
   options: {
      pid: '999', // publisher ID
-     host: 'https://example.com' // host is provided to publisher
+     bidWonTimeout: 2000 // on auction end for how long to wait for bid_won events, by default it's 2000 miliseconds, if it's not set it will be 2000 miliseconds.  
   }
 }
 ```
diff --git a/modules/audienceNetworkBidAdapter.js b/modules/audienceNetworkBidAdapter.js
deleted file mode 100644
index 816a6abd0e8..00000000000
--- a/modules/audienceNetworkBidAdapter.js
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * @file AudienceNetwork adapter.
- */
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { generateUUID, deepAccess, convertTypes, formatQS } from '../src/utils.js';
-import findIndex from 'core-js-pure/features/array/find-index.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const code = 'audienceNetwork';
-const currency = 'USD';
-const method = 'GET';
-const url = 'https://an.facebook.com/v2/placementbid.json';
-const supportedMediaTypes = ['banner', 'video'];
-const netRevenue = true;
-const hbBidder = 'fan';
-const ttl = 600;
-const videoTtl = 3600;
-const platver = '$prebid.version$';
-const platform = '241394079772386';
-const adapterver = '1.3.0';
-
-/**
- * Does this bid request contain valid parameters?
- * @param {Object} bid
- * @returns {Boolean}
- */
-const isBidRequestValid = bid =>
-  typeof bid.params === 'object' &&
-  typeof bid.params.placementId === 'string' &&
-  bid.params.placementId.length > 0 &&
-  Array.isArray(bid.sizes) && bid.sizes.length > 0 &&
-  (isFullWidth(bid.params.format) ? bid.sizes.map(flattenSize).some(size => size === '300x250') : true) &&
-  (isValidNonSizedFormat(bid.params.format) || bid.sizes.map(flattenSize).some(isValidSize));
-
-/**
- * Flattens a 2-element [W, H] array as a 'WxH' string,
- * otherwise passes value through.
- * @param {Array|String} size
- * @returns {String}
- */
-const flattenSize = size =>
-  (Array.isArray(size) && size.length === 2) ? `${size[0]}x${size[1]}` : size;
-
-/**
- * Expands a 'WxH' string as a 2-element [W, H] array
- * @param {String} size
- * @returns {Array}
- */
-const expandSize = size => size.split('x').map(Number);
-
-/**
- * Is this a valid slot size?
- * @param {String} size
- * @returns {Boolean}
- */
-const isValidSize = size => includes(['300x250', '320x50'], size);
-
-/**
- * Is this a valid, non-sized format?
- * @param {String} size
- * @returns {Boolean}
- */
-const isValidNonSizedFormat = format => includes(['video', 'native'], format);
-
-/**
- * Is this a valid size and format?
- * @param {String} size
- * @returns {Boolean}
- */
-const isValidSizeAndFormat = (size, format) =>
-  (isFullWidth(format) && flattenSize(size) === '300x250') ||
-  isValidNonSizedFormat(format) ||
-  isValidSize(flattenSize(size));
-
-/**
- * Find a preferred entry, if any, from an array of valid sizes.
- * @param {Array<String>} acc
- * @param {String} cur
- */
-const sortByPreferredSize = (acc, cur) =>
-  (cur === '300x250') ? [cur, ...acc] : [...acc, cur];
-
-/**
- * Map any deprecated size/formats to new values.
- * @param {String} size
- * @param {String} format
- */
-const mapDeprecatedSizeAndFormat = (size, format) =>
-  isFullWidth(format) ? ['300x250', null] : [size, format];
-
-/**
- * Is this a video format?
- * @param {String} format
- * @returns {Boolean}
- */
-const isVideo = format => format === 'video';
-
-/**
- * Is this a fullwidth format?
- * @param {String} format
- * @returns {Boolean}
- */
-const isFullWidth = format => format === 'fullwidth';
-
-/**
- * Which SDK version should be used for this format?
- * @param {String} format
- * @returns {String}
- */
-const sdkVersion = format => isVideo(format) ? '' : '6.0.web';
-
-/**
- * Which platform identifier should be used?
- * @param {Array<String>} platforms Possible platform identifiers
- * @returns {String} First valid platform found, or default if none found
- */
-const findPlatform = platforms => [...platforms.filter(Boolean), platform][0];
-
-/**
- * Does the search part of the URL contain "anhb_testmode"
- * and therefore indicate testmode should be used?
- * @returns {String} "true" or "false"
- */
-const isTestmode = () => Boolean(
-  window && window.location &&
-  typeof window.location.search === 'string' &&
-  window.location.search.indexOf('anhb_testmode') !== -1
-).toString();
-
-/**
- * Generate ad HTML for injection into an iframe
- * @param {String} placementId
- * @param {String} format
- * @param {String} bidId
- * @returns {String} HTML
- */
-const createAdHtml = (placementId, format, bidId) => {
-  const nativeStyle = format === 'native' ? '<script>window.onload=function(){if(parent){var o=document.getElementsByTagName("head")[0];var s=parent.document.getElementsByTagName("style");for(var i=0;i<s.length;i++)o.appendChild(s[i].cloneNode(true));}}</script>' : '';
-  const nativeContainer = format === 'native' ? '<div class="thirdPartyRoot"><a class="fbAdLink"><div class="fbAdMedia thirdPartyMediaClass"></div><div class="fbAdSubtitle thirdPartySubtitleClass"></div><div class="fbDefaultNativeAdWrapper"><div class="fbAdCallToAction thirdPartyCallToActionClass"></div><div class="fbAdTitle thirdPartyTitleClass"></div></div></a></div>' : '';
-  return `<html>
-  <head>${nativeStyle}</head>
-  <body>
-    <div style="display:none;position:relative;">
-      <script type="text/javascript" src="https://connect.facebook.net/en_US/fbadnw60-tag.js" async></script>
-      <script type="text/javascript">
-        window.ADNW = window.ADNW || {};
-        window.ADNW.v60 = window.ADNW.v60 || {};
-        window.ADNW.v60.slots = window.ADNW.v60.slots || [];
-        window.ADNW.v60.slots.push({
-          rootElement: document.currentScript.parentElement,
-          placementid: '${placementId}',
-          format: '${format}',
-          bidid: '${bidId}',
-          testmode: false,
-          onAdLoaded: function(rootElement) {
-            console.log('Audience Network [${placementId}] ad loaded');
-            rootElement.style.display = 'block';
-          },
-          onAdError: function(errorCode, errorMessage) {
-            console.log('Audience Network [${placementId}] error (' + errorCode + ') ' + errorMessage);
-          }
-        });
-      </script>
-      ${nativeContainer}
-    </div>
-  </body>
-</html>`;
-};
-
-/**
- * Convert each bid request to a single URL to fetch those bids.
- * @param {Array} bids - list of bids
- * @param {String} bids[].placementCode - Prebid placement identifier
- * @param {Object} bids[].params
- * @param {String} bids[].params.placementId - Audience Network placement identifier
- * @param {String} bids[].params.platform - Audience Network platform identifier (optional)
- * @param {String} bids[].params.format - Optional format, one of 'video' or 'native' if set
- * @param {Array} bids[].sizes - list of desired advert sizes
- * @param {Array} bids[].sizes[] - Size arrays [h,w]: should include one of [300, 250], [320, 50]
- * @returns {Array<Object>} List of URLs to fetch, plus formats and sizes for later use with interpretResponse
- */
-const buildRequests = (bids, bidderRequest) => {
-  // Build lists of placementids, adformats, sizes and SDK versions
-  const placementids = [];
-  const adformats = [];
-  const sizes = [];
-  const sdk = [];
-  const platforms = [];
-  const requestIds = [];
-
-  bids.forEach(bid => bid.sizes
-    .map(flattenSize)
-    .filter(size => isValidSizeAndFormat(size, bid.params.format))
-    .reduce(sortByPreferredSize, [])
-    .slice(0, 1)
-    .forEach(preferredSize => {
-      const [size, format] = mapDeprecatedSizeAndFormat(preferredSize, bid.params.format);
-      placementids.push(bid.params.placementId);
-      adformats.push(format || size);
-      sizes.push(size);
-      sdk.push(sdkVersion(format));
-      platforms.push(bid.params.platform);
-      requestIds.push(bid.bidId);
-    })
-  );
-  // Build URL
-  const testmode = isTestmode();
-  const pageurl = encodeURIComponent(deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || deepAccess(bidderRequest, 'refererInfo.referer'));
-  const platform = findPlatform(platforms);
-  const cb = generateUUID();
-  const search = {
-    placementids,
-    adformats,
-    testmode,
-    pageurl,
-    sdk,
-    adapterver,
-    platform,
-    platver,
-    cb
-  };
-  const video = findIndex(adformats, isVideo);
-  if (video !== -1) {
-    [search.playerwidth, search.playerheight] = expandSize(sizes[video]);
-  }
-  const data = formatQS(search);
-
-  return [{ adformats, data, method, requestIds, sizes, url, pageurl }];
-};
-
-/**
- * Convert a server response to a bid response.
- * @param {Object} response - object representing the response
- * @param {Object} response.body - response body, already converted from JSON
- * @param {Object} bidRequests - the original bid requests
- * @param {Array} bidRequest.adformats - list of formats for the original bid requests
- * @param {Array} bidRequest.sizes - list of sizes fot the original bid requests
- * @returns {Array<Object>} A list of bid response objects
- */
-const interpretResponse = ({ body }, { adformats, requestIds, sizes, pageurl }) => {
-  const { bids = {} } = body;
-  return Object.keys(bids)
-    // extract Array of bid responses
-    .map(placementId => bids[placementId])
-    // flatten
-    .reduce((a, b) => a.concat(b), [])
-    // transform to bidResponse
-    .map((bid, i) => {
-      const {
-        bid_id: fbBidid,
-        placement_id: creativeId,
-        bid_price_cents: cpm
-      } = bid;
-
-      const format = adformats[i];
-      const [width, height] = expandSize(flattenSize(sizes[i]));
-      const ad = createAdHtml(creativeId, format, fbBidid);
-      const requestId = requestIds[i];
-
-      const bidResponse = {
-        // Prebid attributes
-        requestId,
-        cpm: cpm / 100,
-        width,
-        height,
-        ad,
-        ttl,
-        creativeId,
-        netRevenue,
-        currency,
-        // Audience Network attributes
-        hb_bidder: hbBidder,
-        fb_bidid: fbBidid,
-        fb_format: format,
-        fb_placementid: creativeId
-      };
-      // Video attributes
-      if (isVideo(format)) {
-        bidResponse.mediaType = 'video';
-        bidResponse.vastUrl = `https://an.facebook.com/v1/instream/vast.xml?placementid=${creativeId}&pageurl=${pageurl}&playerwidth=${width}&playerheight=${height}&bidid=${fbBidid}`;
-        bidResponse.ttl = videoTtl;
-      }
-      return bidResponse;
-    });
-};
-
-/**
- * Covert bid param types for S2S
- * @param {Object} params bid params
- * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
- * @return {Object} params bid params
- */
-const transformBidParams = (params, isOpenRtb) => {
-  return convertTypes({
-    'placementId': 'string'
-  }, params);
-}
-
-export const spec = {
-  code,
-  supportedMediaTypes,
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  transformBidParams
-};
-
-registerBidder(spec);
diff --git a/modules/audienceNetworkBidAdapter.md b/modules/audienceNetworkBidAdapter.md
deleted file mode 100644
index 6147191f4b7..00000000000
--- a/modules/audienceNetworkBidAdapter.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Overview
-
-Module Name: Audience Network Bid Adapter
-
-Module Type: Bidder Adapter
-
-Maintainer: Lovell Fuller
-
-# Parameters
-
-| Name          | Scope    | Description                                     | Example                           |
-| :------------ | :------- | :---------------------------------------------- | :--------------------------------- |
-| `placementId` | required | The Placement ID from Audience Network          | "555555555555555\_555555555555555" |
-| `format`      | optional | Format, one of "native" or "video"              | "native"                           |
-
-# Example ad units
-
-```javascript
-const adUnits = [{
-  code: "test-iab",
-  sizes: [[300, 250]],
-  bids: [{
-    bidder: "audienceNetwork",
-    params: {
-      placementId: "555555555555555_555555555555555"
-    }
-  }]
-}, {
-  code: "test-native",
-  sizes: [[300, 250]],
-  bids: [{
-    bidder: "audienceNetwork",
-    params: {
-      format: "native",
-      placementId: "555555555555555_555555555555555"
-    }
-  }]
-}, {
-  code: "test-video",
-  sizes: [[640, 360]],
-  bids: [{
-    bidder: "audienceNetwork",
-    params: {
-      format: "video",
-      placementId: "555555555555555_555555555555555"
-    }
-  }]
-}];
-```
diff --git a/modules/audiencerunBidAdapter.js b/modules/audiencerunBidAdapter.js
index b90471ee21a..754a48ede75 100644
--- a/modules/audiencerunBidAdapter.js
+++ b/modules/audiencerunBidAdapter.js
@@ -1,26 +1,95 @@
-import * as utils 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 ENDPOINT_URL = 'https://d.audiencerun.com/prebid';
+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 = [];
+
+/**
+ * Returns bidfloor through floors module if available.
+ *
+ * @param {Object} bid
+ * @returns {number}
+ */
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: DEFAULT_CURRENCY,
+      mediaType: BANNER,
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (_) {
+    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 bidderRequest?.refererInfo?.page
+}
 
 export const spec = {
-  version: '1.0.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) {
     let isValid = true;
-    if (!utils.deepAccess(bid, 'params.zoneId')) {
-      utils.logError('AudienceRun zoneId parameter is required. Bid aborted.');
+    if (!deepAccess(bid, 'params.zoneId')) {
+      logError('AudienceRun zoneId parameter is required. Bid aborted.');
       isValid = false;
     }
     return isValid;
@@ -33,50 +102,62 @@ export const spec = {
    * @param {*} bidderRequest
    * @return {ServerRequest} Info describing the request to the server.
    */
-  buildRequests: function(bidRequests, bidderRequest) {
-    const bids = bidRequests.map(bid => {
-      const sizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes', []);
+  buildRequests: function (bidRequests, bidderRequest) {
+    const bids = bidRequests.map((bid) => {
+      const sizes = deepAccess(bid, 'mediaTypes.banner.sizes', []);
       return {
-        zoneId: utils.getValue(bid.params, 'zoneId'),
-        sizes: sizes.map(size => ({
+        zoneId: getValue(bid.params, 'zoneId'),
+        sizes: sizes.map((size) => ({
           w: size[0],
-          h: size[1]
+          h: size[1],
         })),
-        bidfloor: bid.params.bidfloor || 0.0,
+        bidfloor: getBidFloor(bid),
         bidId: bid.bidId,
-        bidderRequestId: utils.getBidIdParameter('bidderRequestId', bid),
-        adUnitCode: utils.getBidIdParameter('adUnitCode', bid),
-        auctionId: utils.getBidIdParameter('auctionId', bid),
-        transactionId: utils.getBidIdParameter('transactionId', bid)
+        bidderRequestId: getBidIdParameter('bidderRequestId', bid),
+        adUnitCode: getBidIdParameter('adUnitCode', bid),
+        auctionId: getBidIdParameter('auctionId', bid),
+        transactionId: getBidIdParameter('transactionId', bid),
       };
     });
 
     const payload = {
       libVersion: this.version,
-      referer: bidderRequest.refererInfo ? bidderRequest.refererInfo.referer || null : null,
+      pageUrl: bidderRequest?.refererInfo?.page,
+      // TODO: does it make sense to find a half-way referer? what should these parameters pick
+      pageReferer: getPageReferer(),
+      referer: deepAccess(bidderRequest, 'refererInfo.topmostLocation'),
+      // TODO: please do not send internal data structures over the network
+      refererInfo: deepAccess(bidderRequest, 'refererInfo.legacy'),
       currencyCode: config.getConfig('currency.adServerCurrency'),
       timeout: config.getConfig('bidderTimeout'),
-      bids
+      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,
-        applies: bidderRequest.gdprConsent.gdprApplies
+        applies: bidderRequest.gdprConsent.gdprApplies,
+        version: bidderRequest.gdprConsent.apiVersion,
       };
     } else {
       payload.gdpr = {
-        consent: ''
-      }
+        consent: '',
+      };
     }
 
+    requestedBids = bids;
+
     return {
       method: 'POST',
-      url: ENDPOINT_URL,
+      url: deepAccess(bidRequests, '0.params.auctionUrl', AUCTION_URL),
       data: JSON.stringify(payload),
       options: {
-        withCredentials: true
-      }
+        withCredentials: true,
+      },
     };
   },
 
@@ -88,7 +169,7 @@ export const spec = {
    */
   interpretResponse: function (serverResponse, bidRequest) {
     const bids = [];
-    utils._each(serverResponse.body.bid, function (bidObject) {
+    _each(serverResponse.body.bid, function (bidObject) {
       if (!bidObject.cpm || bidObject.cpm === null || !bidObject.adm) {
         return;
       }
@@ -100,15 +181,22 @@ export const spec = {
 
       // Common properties
       bid.requestId = bidObject.bidId;
-      bid.adId = bidObject.zoneId;
       bid.cpm = parseFloat(bidObject.cpm);
       bid.creativeId = bidObject.crid;
-      bid.currency = bidObject.currency ? bidObject.currency.toUpperCase() : 'USD';
+      bid.currency = bidObject.currency
+        ? bidObject.currency.toUpperCase()
+        : DEFAULT_CURRENCY;
 
       bid.height = bidObject.h;
       bid.width = bidObject.w;
       bid.netRevenue = bidObject.isNet ? bidObject.isNet : false;
       bid.ttl = 300;
+      bid.meta = {
+        advertiserDomains:
+          bidObject.adomain && Array.isArray(bidObject.adomain)
+            ? bidObject.adomain
+            : [],
+      };
 
       bids.push(bid);
     });
@@ -122,21 +210,56 @@ export const spec = {
    * @param {ServerResponse[]} serverResponses List of server's responses.
    * @return {UserSync[]} The user syncs which should be dropped.
    */
-  getUserSyncs: function(syncOptions, serverResponses) {
+  getUserSyncs: function (syncOptions, serverResponses) {
     if (!serverResponses || !serverResponses.length) return [];
 
     const syncs = [];
-    serverResponses.forEach(response => {
-      response.body.bid.forEach(bidObject => {
+    serverResponses.forEach((response) => {
+      response.body.bid.forEach((bidObject) => {
         syncs.push({
           type: 'iframe',
-          url: bidObject.syncUrl
+          url: bidObject.syncUrl,
         });
       });
     });
 
     return syncs;
-  }
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   *
+   * @param {Array} timeoutData timeout specific data
+   */
+  onTimeout: function (timeoutData) {
+    if (!isArray(timeoutData)) {
+      return;
+    }
+
+    timeoutData.forEach((bid) => {
+      const bidOnTimeout = requestedBids.find(
+        (requestedBid) => requestedBid.bidId === bid.bidId
+      );
+
+      if (bidOnTimeout) {
+        triggerPixel(
+          `${TIMEOUT_EVENT_URL}/${bidOnTimeout.zoneId}/${bidOnTimeout.bidId}`
+        );
+      }
+    });
+  },
+
+  /**
+   * 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/audiencerunBidAdapter.md b/modules/audiencerunBidAdapter.md
index 3704922fdd5..2257e939f3b 100644
--- a/modules/audiencerunBidAdapter.md
+++ b/modules/audiencerunBidAdapter.md
@@ -2,7 +2,7 @@
 
 **Module Name**: AudienceRun Bidder Adapter  
 **Module Type**: Bidder Adapter  
-**Maintainer**: prebid@audiencerun.com 
+**Maintainer**: github@audiencerun.com
 
 # Description
 
diff --git a/modules/audigentRtdProvider.js b/modules/audigentRtdProvider.js
deleted file mode 100644
index 0f32c84962f..00000000000
--- a/modules/audigentRtdProvider.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * This module adds audigent provider to the real time data module
- * The {@link module:modules/realTimeData} module is required
- * The module will fetch segments from audigent server
- * @module modules/audigentRtdProvider
- * @requires module:modules/realTimeData
- */
-
-/**
- * @typedef {Object} ModuleParams
- * @property {string} siteKey
- * @property {string} pubKey
- * @property {string} url
- * @property {?string} keyName
- * @property {number} auctionDelay
- */
-
-import {config} from '../src/config.js';
-import {getGlobal} from '../src/prebidGlobal.js';
-import * as utils from '../src/utils.js';
-import {submodule} from '../src/hook.js';
-import {ajax} from '../src/ajax.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const storage = getStorageManager();
-
-/** @type {string} */
-const MODULE_NAME = 'realTimeData';
-
-/** @type {ModuleParams} */
-let _moduleParams = {};
-
-/**
- * XMLHttpRequest to get data form audigent server
- * @param {string} url server url with query params
- */
-
-export function setData(data) {
-  storage.setDataInLocalStorage('__adgntseg', JSON.stringify(data));
-}
-
-function getSegments(adUnits, onDone) {
-  try {
-    let jsonData = storage.getDataFromLocalStorage('__adgntseg');
-    if (jsonData) {
-      let data = JSON.parse(jsonData);
-      if (data.audigent_segments) {
-        let dataToReturn = adUnits.reduce((rp, cau) => {
-          const adUnitCode = cau && cau.code;
-          if (!adUnitCode) { return rp }
-          rp[adUnitCode] = data;
-          return rp;
-        }, {});
-
-        onDone(dataToReturn);
-        return;
-      }
-    }
-    getSegmentsAsync(adUnits, onDone);
-  } catch (e) {
-    getSegmentsAsync(adUnits, onDone);
-  }
-}
-
-function getSegmentsAsync(adUnits, onDone) {
-  const userIds = (getGlobal()).getUserIds();
-  let tdid = null;
-
-  if (userIds && userIds['tdid']) {
-    tdid = userIds['tdid'];
-  } else {
-    onDone({});
-  }
-
-  const url = `https://seg.ad.gt/api/v1/rtb_segments?tdid=${tdid}`;
-
-  ajax(url, {
-    success: function (response, req) {
-      if (req.status === 200) {
-        try {
-          const data = JSON.parse(response);
-          if (data && data.audigent_segments) {
-            setData(data);
-            let dataToReturn = adUnits.reduce((rp, cau) => {
-              const adUnitCode = cau && cau.code;
-              if (!adUnitCode) { return rp }
-              rp[adUnitCode] = data;
-              return rp;
-            }, {});
-
-            onDone(dataToReturn);
-          } else {
-            onDone({});
-          }
-        } catch (err) {
-          utils.logError('unable to parse audigent segment data');
-          onDone({})
-        }
-      } else if (req.status === 204) {
-        // unrecognized site key
-        onDone({});
-      }
-    },
-    error: function () {
-      onDone({});
-      utils.logError('unable to get audigent segment data');
-    }
-  }
-  );
-}
-
-/** @type {RtdSubmodule} */
-export const audigentSubmodule = {
-  /**
-   * used to link submodule with realTimeData
-   * @type {string}
-   */
-  name: 'audigent',
-  /**
-   * get data and send back to realTimeData module
-   * @function
-   * @param {adUnit[]} adUnits
-   * @param {function} onDone
-   */
-  getData: getSegments
-};
-
-export function init(config) {
-  const confListener = config.getConfig(MODULE_NAME, ({realTimeData}) => {
-    try {
-      _moduleParams = realTimeData.dataProviders && realTimeData.dataProviders.filter(pr => pr.name && pr.name.toLowerCase() === 'audigent')[0].params;
-      _moduleParams.auctionDelay = realTimeData.auctionDelay;
-    } catch (e) {
-      _moduleParams = {};
-    }
-    confListener();
-  });
-}
-
-submodule('realTimeData', audigentSubmodule);
-init(config);
diff --git a/modules/audigentRtdProvider.md b/modules/audigentRtdProvider.md
deleted file mode 100644
index 47bcbbbf951..00000000000
--- a/modules/audigentRtdProvider.md
+++ /dev/null
@@ -1,52 +0,0 @@
-Audigent is a next-generation data management platform and a first-of-a-kind 
-"data agency" containing some of the most exclusive content-consuming audiences 
-across desktop, mobile and social platforms.
-
-This real-time data module provides first-party Audigent segments that can be 
-attached to bid request objects destined for different SSPs in order to optimize 
-targeting. Audigent maintains a large database of first-party Tradedesk Unified 
-ID to third party segment mappings that can now be queried at bid-time.
-
-Usage:
-
-Compile the audigent RTD module into your Prebid build:
-
-`gulp build --modules=userId,unifiedIdSystem,rtdModule,audigentRtdProvider,rubiconBidAdapter`
-
-Audigent segments will then be attached to each bid request objects in
-`bid.realTimeData.audigent_segments`
-
-The format of the segments is a per-SSP mapping:
-
-```
-{
-	'appnexus': ['anseg1', 'anseg2'],
-	'google': ['gseg1', 'gseg2']
-}
-```
-
-If a given SSP's API backend supports segment fields, they can then be
-attached prior to the bid request being sent:
-
-```
-pbjs.requestBids({bidsBackHandler: addAudigentSegments});
-
-function addAudigentSegments() {
-	for (i = 0; i < adUnits.length; i++) {
-		let adUnit = adUnits[i];
-		for (j = 0; j < adUnit.bids.length; j++) {
-			adUnit.bids[j].userId.lipb.segments = adUnit.bids[j].realTimeData.audigent_segments['rubicon'];
-		}
-	}
-}
-```
-
-To view an example of the segments returned by Audigent's backends:
-
-`gulp serve --modules=userId,unifiedIdSystem,rtdModule,audigentRtdProvider,rubiconBidAdapter`
-
-and then point your browser at:
-
-`http://localhost:9999/integrationExamples/gpt/audigentSegments_example.html`
-
-
diff --git a/modules/automatadBidAdapter.js b/modules/automatadBidAdapter.js
index 95d225cb5f7..1174c2a9f38 100644
--- a/modules/automatadBidAdapter.js
+++ b/modules/automatadBidAdapter.js
@@ -1,11 +1,11 @@
+import { logInfo } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js'
-import * as utils from '../src/utils.js'
 import {BANNER} from '../src/mediaTypes.js'
 import {ajax} from '../src/ajax.js'
 
 const BIDDER = 'automatad'
 
-const ENDPOINT_URL = 'https://rtb2.automatad.com/ortb2'
+const ENDPOINT_URL = 'https://bid.atmtd.com'
 
 const DEFAULT_BID_TTL = 30
 const DEFAULT_CURRENCY = 'USD'
@@ -18,7 +18,7 @@ export const spec = {
 
   isBidRequestValid: function (bid) {
     // will receive request bid. check if have necessary params for bidding
-    return (bid && bid.hasOwnProperty('params') && bid.params.hasOwnProperty('siteId') && bid.params.hasOwnProperty('placementId') && bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty('banner'))
+    return (bid && bid.hasOwnProperty('params') && bid.params.hasOwnProperty('siteId') && bid.params.siteId != null && bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty('banner') && typeof bid.mediaTypes.banner == 'object')
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
@@ -27,17 +27,33 @@ export const spec = {
     }
 
     const siteId = validBidRequests[0].params.siteId
-    const placementId = validBidRequests[0].params.placementId
 
-    const impressions = validBidRequests.map(bidRequest => ({
-      id: bidRequest.bidId,
-      banner: {
-        format: bidRequest.sizes.map(sizeArr => ({
-          w: sizeArr[0],
-          h: sizeArr[1],
-        }))
-      },
-    }))
+    const impressions = validBidRequests.map(bidRequest => {
+      if (bidRequest.params.hasOwnProperty('placementId')) {
+        return {
+          id: bidRequest.bidId,
+          adUnitCode: bidRequest.adUnitCode,
+          placement: bidRequest.params.placementId,
+          banner: {
+            format: bidRequest.sizes.map(sizeArr => ({
+              w: sizeArr[0],
+              h: sizeArr[1],
+            }))
+          },
+        }
+      } else {
+        return {
+          id: bidRequest.bidId,
+          adUnitCode: bidRequest.adUnitCode,
+          banner: {
+            format: bidRequest.sizes.map(sizeArr => ({
+              w: sizeArr[0],
+              h: sizeArr[1],
+            }))
+          },
+        }
+      }
+    })
 
     // params from bid request
     const openrtbRequest = {
@@ -45,21 +61,20 @@ export const spec = {
       imp: impressions,
       site: {
         id: siteId,
-        placement: placementId,
-        domain: window.location.hostname,
-        page: window.location.href,
-        ref: bidderRequest.refererInfo ? bidderRequest.refererInfo.referer || null : null,
+        domain: bidderRequest.refererInfo?.domain,
+        page: bidderRequest.refererInfo?.page,
+        ref: bidderRequest.refererInfo?.ref
       },
     }
 
     const payloadString = JSON.stringify(openrtbRequest)
     return {
       method: 'POST',
-      url: ENDPOINT_URL + '/resp',
+      url: ENDPOINT_URL + '/request',
       data: payloadString,
       options: {
         contentType: 'application/json',
-        withCredentials: false,
+        withCredentials: true,
         crossOrigin: true,
       },
     }
@@ -69,33 +84,37 @@ export const spec = {
     const bidResponses = []
     const response = (serverResponse || {}).body
 
-    if (response && response.seatbid && response.seatbid.length === 1 && response.seatbid[0].bid && response.seatbid[0].bid.length) {
-      response.seatbid[0].bid.forEach(bid => {
-        bidResponses.push({
-          requestId: bid.impid,
-          cpm: bid.price,
-          ad: bid.adm,
-          adDomain: bid.adomain[0],
-          currency: DEFAULT_CURRENCY,
-          ttl: DEFAULT_BID_TTL,
-          creativeId: bid.crid,
-          width: bid.w,
-          height: bid.h,
-          netRevenue: DEFAULT_NET_REVENUE,
-          nurl: bid.nurl,
+    if (response && response.seatbid && response.seatbid[0].bid && response.seatbid[0].bid.length) {
+      var bidid = response.bidid
+      response.seatbid.forEach(bidObj => {
+        bidObj.bid.forEach(bid => {
+          bidResponses.push({
+            requestId: bid.impid,
+            cpm: bid.price,
+            ad: bid.adm,
+            meta: {
+              advertiserDomains: bid.adomain
+            },
+            currency: DEFAULT_CURRENCY,
+            ttl: DEFAULT_BID_TTL,
+            creativeId: bid.crid,
+            width: bid.w,
+            height: bid.h,
+            netRevenue: DEFAULT_NET_REVENUE,
+            nurl: bid.nurl,
+            bidId: bidid
+          })
         })
       })
     } else {
-      utils.logInfo('automatad :: no valid responses to interpret')
+      logInfo('automatad :: no valid responses to interpret')
     }
 
     return bidResponses
   },
-  getUserSyncs: function(syncOptions, serverResponse) {
-    return [{
-      type: 'iframe',
-      url: 'https://rtb2.automatad.com/ortb2/async_usersync'
-    }]
+  onTimeout: function(timeoutData) {
+    const timeoutUrl = ENDPOINT_URL + '/timeout'
+    spec.ajaxCall(timeoutUrl, null, JSON.stringify(timeoutData), {method: 'POST', withCredentials: true})
   },
   onBidWon: function(bid) {
     if (!bid.nurl) { return }
@@ -110,15 +129,22 @@ export const spec = {
     ).replace(
       /\$\{AUCTION_CURRENCY\}/,
       winCurr
+    ).replace(
+      /\$\{AUCTON_BID_ID\}/,
+      bid.bidId
     ).replace(
       /\$\{AUCTION_ID\}/,
       bid.auctionId
     )
-    spec.ajaxCall(winUrl, null)
+    spec.ajaxCall(winUrl, null, null, {method: 'GET', withCredentials: true})
     return true
   },
-  ajaxCall: function(endpoint, data) {
-    ajax(endpoint, data)
+
+  ajaxCall: function(endpoint, callback, data, options = {}) {
+    if (data) {
+      options.contentType = 'application/json'
+    }
+    ajax(endpoint, callback, data, options)
   },
 
 }
diff --git a/modules/automatadBidAdapter.md b/modules/automatadBidAdapter.md
index 56a4b53c067..94bc707c75b 100644
--- a/modules/automatadBidAdapter.md
+++ b/modules/automatadBidAdapter.md
@@ -25,8 +25,8 @@ var adUnits = [
         bids: [{
             bidder: 'automatad',
             params: {
-                siteId: 'someValue',
-                placementId: 'someValue'
+                siteId: 'someValue',                // required
+                placementId: 'someValue'            // optional
             }
         }]
     }
diff --git a/modules/avocetBidAdapter.js b/modules/avocetBidAdapter.js
deleted file mode 100644
index 1163ac830ba..00000000000
--- a/modules/avocetBidAdapter.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'avct';
-const DEFAULT_BASE_URL = 'https://ads.avct.cloud';
-const DEFAULT_PREBID_PATH = '/prebid';
-
-function getPrebidURL() {
-  let host = config.getConfig('avct.baseUrl');
-  if (host && typeof host === 'string') {
-    return `${host}${getPrebidPath()}`;
-  }
-  return `${DEFAULT_BASE_URL}${getPrebidPath()}`;
-}
-
-function getPrebidPath() {
-  let prebidPath = config.getConfig('avct.prebidPath');
-  if (prebidPath && typeof prebidPath === 'string') {
-    return prebidPath;
-  }
-  return DEFAULT_PREBID_PATH;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid with params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bid) {
-    return (
-      !!bid.params &&
-      !!bid.params.placement &&
-      typeof bid.params.placement === 'string' &&
-      bid.params.placement.length === 24
-    );
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function (bidRequests, bidderRequest) {
-    // Get currency from config
-    const currency = config.getConfig('currency.adServerCurrency');
-
-    // Publisher domain from config
-    const publisherDomain = config.getConfig('publisherDomain');
-
-    // First-party data from config
-    const fpd = config.getConfig('fpd');
-
-    // GDPR status and TCF consent string
-    let tcfConsentString;
-    let gdprApplies = false;
-    if (bidderRequest.gdprConsent) {
-      tcfConsentString = bidderRequest.gdprConsent.consentString;
-      gdprApplies = !!bidderRequest.gdprConsent.gdprApplies;
-    }
-
-    // US privacy string
-    let usPrivacyString;
-    if (bidderRequest.uspConsent) {
-      usPrivacyString = bidderRequest.uspConsent;
-    }
-
-    // Supply chain
-    let schain;
-    if (bidderRequest.schain) {
-      schain = bidderRequest.schain;
-    }
-
-    // ID5 identifier
-    let id5id;
-    if (bidRequests[0].userId && bidRequests[0].userId.id5id) {
-      id5id = bidRequests[0].userId.id5id;
-    }
-
-    // Build the avocet ext object
-    const ext = {
-      currency,
-      tcfConsentString,
-      gdprApplies,
-      usPrivacyString,
-      schain,
-      publisherDomain,
-      fpd,
-      id5id,
-    };
-
-    // Extract properties from bidderRequest
-    const {
-      auctionId,
-      auctionStart,
-      bidderCode,
-      bidderRequestId,
-      refererInfo,
-      timeout,
-    } = bidderRequest;
-
-    // Construct payload
-    const payload = JSON.stringify({
-      auctionId,
-      auctionStart,
-      bidderCode,
-      bidderRequestId,
-      refererInfo,
-      timeout,
-      bids: bidRequests,
-      ext,
-    });
-
-    return {
-      method: 'POST',
-      url: getPrebidURL(),
-      data: payload,
-    };
-  },
-  interpretResponse: function (serverResponse, bidRequest) {
-    if (
-      !serverResponse ||
-      !serverResponse.body ||
-      typeof serverResponse.body !== 'object'
-    ) {
-      return [];
-    }
-    if (Array.isArray(serverResponse.body)) {
-      return serverResponse.body;
-    }
-    if (Array.isArray(serverResponse.body.responses)) {
-      return serverResponse.body.responses;
-    }
-    return [];
-  },
-};
-registerBidder(spec);
diff --git a/modules/avocetBidAdapter.md b/modules/avocetBidAdapter.md
deleted file mode 100644
index 95cb29303f2..00000000000
--- a/modules/avocetBidAdapter.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Overview
-
-```
-Module Name: Avocet Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: developers@avocet.io
-```
-
-# Description
-
-Module that connects to the Avocet advertising platform.
-
-# Parameters
-
-| Name          | Scope    | Description                         | Example                    |
-| :------------ | :------- | :---------------------------------- | :------------------------- |
-| `placement`   | required | A Placement ID from Avocet.         | "5ebd27607781b9af3ccc3332" |
-
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: 'test-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300, 250]],  // a display size
-                }
-            },
-            bids: [
-                {
-                    bidder: "avct",
-                    params: {
-                        placement: "5ebd27607781b9af3ccc3332"
-                    }
-                }
-            ]
-        }
-    ];
-```
\ No newline at end of file
diff --git a/modules/axonixBidAdapter.js b/modules/axonixBidAdapter.js
new file mode 100644
index 00000000000..5435bf09059
--- /dev/null
+++ b/modules/axonixBidAdapter.js
@@ -0,0 +1,184 @@
+import { isArray, logError, deepAccess, isEmpty, triggerPixel, replaceAuctionPrice } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { ajax } from '../src/ajax.js';
+
+const BIDDER_CODE = 'axonix';
+const BIDDER_VERSION = '1.0.2';
+
+const CURRENCY = 'USD';
+const DEFAULT_REGION = 'us-east-1';
+
+function getBidFloor(bidRequest) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: CURRENCY,
+      mediaType: '*',
+      size: '*'
+    });
+  }
+
+  return floorInfo.floor || 0;
+}
+
+function getPageUrl(bidRequest, bidderRequest) {
+  let pageUrl;
+  if (bidRequest.params.referrer) {
+    pageUrl = bidRequest.params.referrer;
+  } else {
+    pageUrl = bidderRequest.refererInfo.page;
+  }
+
+  return bidRequest.params.secure ? pageUrl.replace(/^http:/i, 'https:') : pageUrl;
+}
+
+function isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
+}
+
+function isConnectedTV() {
+  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
+}
+
+function getURL(params, path) {
+  let { supplyId, region, endpoint } = params;
+  let url;
+
+  if (endpoint) {
+    url = endpoint;
+  } else if (region) {
+    url = `https://openrtb-${region}.axonix.com/supply/${path}/${supplyId}`;
+  } else {
+    url = `https://openrtb-${DEFAULT_REGION}.axonix.com/supply/${path}/${supplyId}`
+  }
+
+  return url;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: function(bid) {
+    // video bid request validation
+    if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
+      if (!bid.mediaTypes[VIDEO].hasOwnProperty('mimes') ||
+        !isArray(bid.mediaTypes[VIDEO].mimes) ||
+        bid.mediaTypes[VIDEO].mimes.length === 0) {
+        logError('mimes are mandatory for video bid request. Ad Unit: ', JSON.stringify(bid));
+
+        return false;
+      }
+    }
+
+    return !!(bid.params && bid.params.supplyId);
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    // device.connectiontype
+    let connection = window.navigator && (window.navigator.connection || window.navigator.mozConnection || window.navigator.webkitConnection)
+    let connectionType = 'unknown';
+    let effectiveType = '';
+
+    if (connection) {
+      if (connection.type) {
+        connectionType = connection.type;
+      }
+
+      if (connection.effectiveType) {
+        effectiveType = connection.effectiveType;
+      }
+    }
+
+    const requests = validBidRequests.map(validBidRequest => {
+      // app/site
+      let app;
+      let site;
+
+      if (typeof config.getConfig('app') === 'object') {
+        app = config.getConfig('app');
+      } else {
+        site = {
+          page: getPageUrl(validBidRequest, bidderRequest)
+        }
+      }
+
+      const data = {
+        app,
+        site,
+        validBidRequest,
+        connectionType,
+        effectiveType,
+        devicetype: isMobile() ? 1 : isConnectedTV() ? 3 : 2,
+        bidfloor: getBidFloor(validBidRequest),
+        dnt: (navigator.doNotTrack === 'yes' || navigator.doNotTrack === '1' || navigator.msDoNotTrack === '1') ? 1 : 0,
+        language: navigator.language,
+        prebidVersion: '$prebid.version$',
+        screenHeight: screen.height,
+        screenWidth: screen.width,
+        tmax: config.getConfig('bidderTimeout'),
+        ua: navigator.userAgent,
+      };
+
+      return {
+        method: 'POST',
+        url: getURL(validBidRequest.params, 'prebid'),
+        options: {
+          withCredentials: false,
+          contentType: 'application/json'
+        },
+        data
+      };
+    });
+
+    return requests;
+  },
+
+  interpretResponse: function(serverResponse) {
+    const response = serverResponse ? serverResponse.body : [];
+
+    if (!isArray(response)) {
+      return [];
+    }
+
+    const responses = [];
+
+    for (const resp of response) {
+      if (resp.requestId) {
+        responses.push(Object.assign(resp, {
+          ttl: config.getConfig('_bidderTimeout')
+        }));
+      }
+    }
+
+    return responses;
+  },
+
+  onTimeout: function(timeoutData) {
+    const params = deepAccess(timeoutData, '0.params.0');
+
+    if (!isEmpty(params)) {
+      ajax(getURL(params, 'prebid/timeout'), null, timeoutData[0], {
+        method: 'POST',
+        options: {
+          withCredentials: false,
+          contentType: 'application/json'
+        }
+      });
+    }
+  },
+
+  onBidWon: function(bid) {
+    const { nurl } = bid || {};
+
+    if (bid.nurl) {
+      triggerPixel(replaceAuctionPrice(nurl, bid.originalCpm || bid.cpm));
+    };
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/axonixBidAdapter.md b/modules/axonixBidAdapter.md
new file mode 100644
index 00000000000..acbaae1d4b0
--- /dev/null
+++ b/modules/axonixBidAdapter.md
@@ -0,0 +1,140 @@
+# Overview
+
+```
+Module Name : Axonix Bidder Adapter
+Module Type : Bidder Adapter
+Maintainer  : support.axonix@emodoinc.com
+```
+
+# Description
+
+Module that connects to Axonix's exchange for bids.
+
+# Parameters
+
+| Name          | Scope    | Description                                     | Example                                |
+| :------------ | :------- | :---------------------------------------------- | :------------------------------------- |
+| `supplyId`    | required | Supply UUID                                     | `"2c426f78-bb18-4a16-abf4-62c6cd0ee8de"` |
+| `region`      | optional | Cloud region                                    | `"us-east-1"`                            |
+| `endpoint`    | optional | Supply custom endpoint                          | `"https://open-rtb.axonix.com/custom"`   |
+| `instl`       | optional | Set to 1 if using interstitial (default: 0)     | `1`   |
+
+# Test Parameters
+
+## Banner
+
+```javascript
+var bannerAdUnit = {
+  code: 'test-banner',
+  mediaTypes: {
+    banner: {
+      sizes: [[120, 600], [300, 250], [320, 50], [468, 60], [728, 90]]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Video
+
+```javascript
+var videoAdUnit = {
+  code: 'test-video',
+  mediaTypes: {
+    video: {
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Native
+
+```javascript
+var nativeAdUnit = {
+  code: 'test-native',
+  mediaTypes: {
+    native: {
+
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Multiformat
+
+```javascript
+var adUnits = [
+{
+  code: 'test-banner',
+  mediaTypes: {
+    banner: {
+      sizes: [[120, 600], [300, 250], [320, 50], [468, 60], [728, 90]]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+},
+{
+  code: 'test-video',
+  mediaTypes: {
+    video: {
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+},
+{
+  code: 'test-native',
+  mediaTypes: {
+    native: {
+
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+}
+];
+```
diff --git a/modules/beachfrontBidAdapter.js b/modules/beachfrontBidAdapter.js
index 12e78c684ad..f80481d66c8 100644
--- a/modules/beachfrontBidAdapter.js
+++ b/modules/beachfrontBidAdapter.js
@@ -1,22 +1,38 @@
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const ADAPTER_VERSION = '1.11';
+import {
+  deepAccess,
+  deepClone,
+  deepSetValue,
+  getUniqueIdentifierStr,
+  isArray,
+  isFn,
+  logWarn,
+  parseSizesInput,
+  parseUrl
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {Renderer} from '../src/Renderer.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {find, includes} from '../src/polyfill.js';
+
+const ADAPTER_VERSION = '1.19';
 const ADAPTER_NAME = 'BFIO_PREBID';
 const OUTSTREAM = 'outstream';
+const CURRENCY = 'USD';
 
 export const VIDEO_ENDPOINT = 'https://reachms.bfmio.com/bid.json?exchange_id=';
 export const BANNER_ENDPOINT = 'https://display.bfmio.com/prebid_display';
 export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/loader/outstream.js';
 
-export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'placement'];
+export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'placement', 'skip', 'skipmin', 'skipafter'];
 export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
 
+export const SUPPORTED_USER_IDS = [
+  { key: 'tdid', source: 'adserver.org', rtiPartner: 'TDID', queryParam: 'tdid' },
+  { key: 'idl_env', source: 'liveramp.com', rtiPartner: 'idl', queryParam: 'idl' },
+  { key: 'uid2.id', source: 'uidapi.com', rtiPartner: 'UID2', queryParam: 'uid2' },
+  { key: 'hadronId', source: 'audigent.com', atype: 1, queryParam: 'hadronid' }
+];
+
 let appId = '';
 
 export const spec = {
@@ -24,7 +40,27 @@ export const spec = {
   supportedMediaTypes: [ VIDEO, BANNER ],
 
   isBidRequestValid(bid) {
-    return !!(isVideoBidValid(bid) || isBannerBidValid(bid));
+    if (isVideoBid(bid)) {
+      if (!getVideoBidParam(bid, 'appId')) {
+        logWarn('Beachfront: appId param is required for video bids.');
+        return false;
+      }
+      if (!getVideoBidParam(bid, 'bidfloor')) {
+        logWarn('Beachfront: bidfloor param is required for video bids.');
+        return false;
+      }
+    }
+    if (isBannerBid(bid)) {
+      if (!getBannerBidParam(bid, 'appId')) {
+        logWarn('Beachfront: appId param is required for banner bids.');
+        return false;
+      }
+      if (!getBannerBidParam(bid, 'bidfloor')) {
+        logWarn('Beachfront: bidfloor param is required for banner bids.');
+        return false;
+      }
+    }
+    return true;
   },
 
   buildRequests(bids, bidderRequest) {
@@ -56,37 +92,49 @@ export const spec = {
     response = response.body;
 
     if (isVideoBid(bidRequest)) {
-      if (!response || !response.url || !response.bidPrice) {
-        utils.logWarn(`No valid video bids from ${spec.code} bidder`);
+      if (!response || !response.bidPrice) {
+        logWarn(`No valid video bids from ${spec.code} bidder`);
         return [];
       }
       let sizes = getVideoSizes(bidRequest);
       let firstSize = getFirstSize(sizes);
-      let context = utils.deepAccess(bidRequest, 'mediaTypes.video.context');
-      return {
+      let context = deepAccess(bidRequest, 'mediaTypes.video.context');
+      let responseType = getVideoBidParam(bidRequest, 'responseType') || 'both';
+      let responseMeta = Object.assign({ mediaType: VIDEO, advertiserDomains: [] }, response.meta);
+      let bidResponse = {
         requestId: bidRequest.bidId,
         bidderCode: spec.code,
-        vastUrl: response.url,
-        vastXml: response.vast,
         cpm: response.bidPrice,
         width: firstSize.w,
         height: firstSize.h,
         creativeId: response.crid || response.cmpId,
+        meta: responseMeta,
         renderer: context === OUTSTREAM ? createRenderer(bidRequest) : null,
         mediaType: VIDEO,
-        currency: 'USD',
+        currency: CURRENCY,
         netRevenue: true,
         ttl: 300
       };
+
+      if (responseType === 'nurl' || responseType === 'both') {
+        bidResponse.vastUrl = response.url;
+      }
+
+      if (responseType === 'adm' || responseType === 'both') {
+        bidResponse.vastXml = response.vast;
+      }
+
+      return bidResponse;
     } else {
       if (!response || !response.length) {
-        utils.logWarn(`No valid banner bids from ${spec.code} bidder`);
+        logWarn(`No valid banner bids from ${spec.code} bidder`);
         return [];
       }
       return response
         .filter(bid => bid.adm)
         .map((bid) => {
           let request = find(bidRequest, req => req.adUnitCode === bid.slot);
+          let responseMeta = Object.assign({ mediaType: BANNER, advertiserDomains: [] }, bid.meta);
           return {
             requestId: request.bidId,
             bidderCode: spec.code,
@@ -95,8 +143,9 @@ export const spec = {
             cpm: bid.price,
             width: bid.w,
             height: bid.h,
+            meta: responseMeta,
             mediaType: BANNER,
-            currency: 'USD',
+            currency: CURRENCY,
             netRevenue: true,
             ttl: 300
           };
@@ -107,7 +156,7 @@ export const spec = {
   getUserSyncs(syncOptions, serverResponses = [], gdprConsent = {}, uspConsent = '') {
     let syncs = [];
     let { gdprApplies, consentString = '' } = gdprConsent;
-    let bannerResponse = find(serverResponses, (res) => utils.isArray(res.body));
+    let bannerResponse = find(serverResponses, (res) => isArray(res.body));
 
     if (bannerResponse) {
       if (syncOptions.iframeEnabled) {
@@ -165,7 +214,7 @@ function getFirstSize(sizes) {
 }
 
 function parseSizes(sizes) {
-  return utils.parseSizesInput(sizes).map(size => {
+  return parseSizesInput(sizes).map(size => {
     let [ width, height ] = size.split('x');
     return {
       w: parseInt(width, 10) || undefined,
@@ -175,11 +224,11 @@ function parseSizes(sizes) {
 }
 
 function getVideoSizes(bid) {
-  return parseSizes(utils.deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
+  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
 }
 
 function getBannerSizes(bid) {
-  return parseSizes(utils.deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
+  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
 }
 
 function getOsVersion() {
@@ -216,26 +265,36 @@ function getDoNotTrack() {
 }
 
 function isVideoBid(bid) {
-  return utils.deepAccess(bid, 'mediaTypes.video');
+  return deepAccess(bid, 'mediaTypes.video');
 }
 
 function isBannerBid(bid) {
-  return utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
+  return deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
 }
 
 function getVideoBidParam(bid, key) {
-  return utils.deepAccess(bid, 'params.video.' + key) || utils.deepAccess(bid, 'params.' + key);
+  return deepAccess(bid, 'params.video.' + key) || deepAccess(bid, 'params.' + key);
 }
 
 function getBannerBidParam(bid, key) {
-  return utils.deepAccess(bid, 'params.banner.' + key) || utils.deepAccess(bid, 'params.' + key);
+  return deepAccess(bid, 'params.banner.' + key) || deepAccess(bid, 'params.' + key);
 }
 
 function getPlayerBidParam(bid, key, defaultValue) {
-  let param = utils.deepAccess(bid, 'params.player.' + key);
+  let param = deepAccess(bid, 'params.player.' + key);
   return param === undefined ? defaultValue : param;
 }
 
+function getBannerBidFloor(bid) {
+  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: CURRENCY, mediaType: 'banner', size: '*' }) : {};
+  return floorInfo.floor || getBannerBidParam(bid, 'bidfloor');
+}
+
+function getVideoBidFloor(bid) {
+  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: CURRENCY, mediaType: 'video', size: '*' }) : {};
+  return floorInfo.floor || getVideoBidParam(bid, 'bidfloor');
+}
+
 function isVideoBidValid(bid) {
   return isVideoBid(bid) && getVideoBidParam(bid, 'appId') && getVideoBidParam(bid, 'bidfloor');
 }
@@ -245,25 +304,50 @@ function isBannerBidValid(bid) {
 }
 
 function getTopWindowLocation(bidderRequest) {
-  let url = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
-  return utils.parseUrl(config.getConfig('pageUrl') || url, { decodeSearchAsString: true });
+  return parseUrl(bidderRequest?.refererInfo?.page, { decodeSearchAsString: true });
 }
 
-function getTopWindowReferrer() {
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return '';
+function getEids(bid) {
+  return SUPPORTED_USER_IDS
+    .map(getUserId(bid))
+    .filter(x => x);
+}
+
+function getUserId(bid) {
+  return ({ key, source, rtiPartner, atype }) => {
+    let id = deepAccess(bid, `userId.${key}`);
+    return id ? formatEid(id, source, rtiPartner, atype) : null;
+  };
+}
+
+function formatEid(id, source, rtiPartner, atype) {
+  let uid = { id };
+  if (rtiPartner) {
+    uid.ext = { rtiPartner };
+  }
+  if (atype) {
+    uid.atype = atype;
   }
+  return {
+    source,
+    uids: [uid]
+  };
 }
 
 function getVideoTargetingParams(bid) {
-  return Object.keys(Object(bid.params.video))
-    .filter(param => includes(VIDEO_TARGETING, param))
-    .reduce((obj, param) => {
-      obj[ param ] = bid.params.video[ param ];
-      return obj;
-    }, {});
+  const result = {};
+  const excludeProps = ['playerSize', 'context', 'w', 'h'];
+  Object.keys(Object(bid.mediaTypes.video))
+    .filter(key => !includes(excludeProps, key))
+    .forEach(key => {
+      result[ key ] = bid.mediaTypes.video[ key ];
+    });
+  Object.keys(Object(bid.params.video))
+    .filter(key => includes(VIDEO_TARGETING, key))
+    .forEach(key => {
+      result[ key ] = bid.params.video[ key ];
+    });
+  return result;
 }
 
 function createVideoRequestData(bid, bidderRequest) {
@@ -271,14 +355,16 @@ function createVideoRequestData(bid, bidderRequest) {
   let firstSize = getFirstSize(sizes);
   let video = getVideoTargetingParams(bid);
   let appId = getVideoBidParam(bid, 'appId');
-  let bidfloor = getVideoBidParam(bid, 'bidfloor');
+  let bidfloor = getVideoBidFloor(bid);
   let tagid = getVideoBidParam(bid, 'tagid');
   let topLocation = getTopWindowLocation(bidderRequest);
+  let eids = getEids(bid);
+  let ortb2 = deepClone(bidderRequest.ortb2);
   let payload = {
     isPrebid: true,
     appId: appId,
     domain: document.location.hostname,
-    id: utils.getUniqueIdentifierStr(),
+    id: getUniqueIdentifierStr(),
     imp: [{
       video: Object.assign({
         w: firstSize.w,
@@ -292,6 +378,7 @@ function createVideoRequestData(bid, bidderRequest) {
       displaymanagerver: ADAPTER_VERSION
     }],
     site: {
+      ...deepAccess(ortb2, 'site', {}),
       page: topLocation.href,
       domain: topLocation.hostname
     },
@@ -303,40 +390,32 @@ function createVideoRequestData(bid, bidderRequest) {
       js: 1,
       geo: {}
     },
-    regs: {
-      ext: {}
-    },
-    user: {
-      ext: {}
-    },
-    cur: ['USD']
+    app: deepAccess(ortb2, 'app'),
+    user: deepAccess(ortb2, 'user'),
+    cur: [CURRENCY]
   };
 
   if (bidderRequest && bidderRequest.uspConsent) {
-    payload.regs.ext.us_privacy = bidderRequest.uspConsent;
+    deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
   }
 
   if (bidderRequest && bidderRequest.gdprConsent) {
     let { gdprApplies, consentString } = bidderRequest.gdprConsent;
-    payload.regs.ext.gdpr = gdprApplies ? 1 : 0;
-    payload.user.ext.consent = consentString;
+    deepSetValue(payload, 'regs.ext.gdpr', gdprApplies ? 1 : 0);
+    deepSetValue(payload, 'user.ext.consent', consentString);
+  }
+
+  if (bid.schain) {
+    deepSetValue(payload, 'source.ext.schain', bid.schain);
   }
 
-  if (bid.userId && bid.userId.tdid) {
-    payload.user.ext.eids = [{
-      source: 'adserver.org',
-      uids: [{
-        id: bid.userId.tdid,
-        ext: {
-          rtiPartner: 'TDID'
-        }
-      }]
-    }];
+  if (eids.length > 0) {
+    deepSetValue(payload, 'user.ext.eids', eids);
   }
 
   let connection = navigator.connection || navigator.webkitConnection;
   if (connection && connection.effectiveType) {
-    payload.device.connectiontype = connection.effectiveType;
+    deepSetValue(payload, 'device.connectiontype', connection.effectiveType);
   }
 
   return payload;
@@ -344,17 +423,20 @@ function createVideoRequestData(bid, bidderRequest) {
 
 function createBannerRequestData(bids, bidderRequest) {
   let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
+  let topReferrer = bidderRequest.refererInfo?.ref;
   let slots = bids.map(bid => {
     return {
       slot: bid.adUnitCode,
       id: getBannerBidParam(bid, 'appId'),
-      bidfloor: getBannerBidParam(bid, 'bidfloor'),
+      bidfloor: getBannerBidFloor(bid),
+      tagid: getBannerBidParam(bid, 'tagid'),
       sizes: getBannerSizes(bid)
     };
   });
+  let ortb2 = deepClone(bidderRequest.ortb2);
   let payload = {
     slots: slots,
+    ortb2: ortb2,
     page: topLocation.href,
     domain: topLocation.hostname,
     search: topLocation.search,
@@ -378,10 +460,17 @@ function createBannerRequestData(bids, bidderRequest) {
     payload.gdprConsent = consentString;
   }
 
-  if (bids[0] && bids[0].userId && bids[0].userId.tdid) {
-    payload.tdid = bids[0].userId.tdid;
+  if (bids[0] && bids[0].schain) {
+    payload.schain = bids[0].schain;
   }
 
+  SUPPORTED_USER_IDS.forEach(({ key, queryParam }) => {
+    let id = deepAccess(bids, `0.userId.${key}`)
+    if (id) {
+      payload[queryParam] = id;
+    }
+  });
+
   return payload;
 }
 
diff --git a/modules/beachfrontBidAdapter.md b/modules/beachfrontBidAdapter.md
index 0a6b8b73da4..9de415f8fc5 100644
--- a/modules/beachfrontBidAdapter.md
+++ b/modules/beachfrontBidAdapter.md
@@ -4,7 +4,7 @@ Module Name: Beachfront Bid Adapter
 
 Module Type: Bidder Adapter
 
-Maintainer: john@beachfront.com
+Maintainer: prebid@beachfront.com
 
 # Description
 
@@ -18,7 +18,8 @@ Module that connects to Beachfront's demand sources
             mediaTypes: {
                 video: {
                     context: 'instream',
-                    playerSize: [ 640, 360 ]
+                    playerSize: [640, 360],
+                    mimes: ['video/mp4', 'application/javascript']
                 }
             },
             bids: [
@@ -26,10 +27,7 @@ Module that connects to Beachfront's demand sources
                     bidder: 'beachfront',
                     params: {
                         bidfloor: 0.01,
-                        appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-                        video: {
-                            mimes: [ 'video/mp4', 'application/javascript' ]
-                        }
+                        appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76'
                     }
                 }
             ]
@@ -37,7 +35,7 @@ Module that connects to Beachfront's demand sources
             code: 'test-banner',
             mediaTypes: {
                 banner: {
-                    sizes: [ 300, 250 ]
+                    sizes: [300, 250]
                 }
             },
             bids: [
@@ -61,10 +59,11 @@ Module that connects to Beachfront's demand sources
             mediaTypes: {
                 video: {
                     context: 'outstream',
-                    playerSize: [ 640, 360 ]
+                    playerSize: [640, 360],
+                    mimes: ['video/mp4', 'application/javascript']
                 },
                 banner: {
-                    sizes: [ 300, 250 ]
+                    sizes: [300, 250]
                 }
             },
             bids: [
@@ -74,7 +73,6 @@ Module that connects to Beachfront's demand sources
                         video: {
                             bidfloor: 0.01,
                             appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-                            mimes: [ 'video/mp4', 'application/javascript' ]
                         },
                         banner: {
                             bidfloor: 0.01,
@@ -95,7 +93,8 @@ Module that connects to Beachfront's demand sources
             mediaTypes: {
                 video: {
                     context: 'outstream',
-                    playerSize: [ 640, 360 ]
+                    playerSize: [ 640, 360 ],
+                    mimes: ['video/mp4', 'application/javascript']
                 }
             },
             bids: [
@@ -104,8 +103,7 @@ Module that connects to Beachfront's demand sources
                     params: {
                         video: {
                             bidfloor: 0.01,
-                            appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-                            mimes: [ 'video/mp4', 'application/javascript' ]
+                            appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76'
                         },
                         player: {
                             progressColor: '#50A8FA',
diff --git a/modules/beopBidAdapter.js b/modules/beopBidAdapter.js
new file mode 100644
index 00000000000..4ee5aaec5be
--- /dev/null
+++ b/modules/beopBidAdapter.js
@@ -0,0 +1,203 @@
+import { deepAccess, isArray, isStr, logWarn, triggerPixel, buildUrl, logInfo, getValue, getBidIdParameter } from '../src/utils.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+const BIDDER_CODE = 'beop';
+const ENDPOINT_URL = 'https://hb.beop.io/bid';
+const TCF_VENDOR_ID = 666;
+
+const validIdRegExp = /^[0-9a-fA-F]{24}$/
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: TCF_VENDOR_ID,
+  aliases: ['bp'],
+  /**
+    * Test if the bid request is valid.
+    *
+    * @param {bid} : The Bid params
+    * @return boolean true if the bid request is valid (aka contains a valid accountId or networkId and is open for BANNER), false otherwise.
+    */
+  isBidRequestValid: function(bid) {
+    const id = bid.params.accountId || bid.params.networkId;
+    if (id === null || typeof id === 'undefined') {
+      return false
+    }
+    if (!validIdRegExp.test(id)) {
+      return false
+    }
+    return bid.mediaTypes.banner !== null && typeof bid.mediaTypes.banner !== 'undefined';
+  },
+  /**
+    * Create a BeOp server request from a list of BidRequest
+    *
+    * @param {validBidRequests[], ...} : The array of validated bidRequests
+    * @param {... , bidderRequest} : Common params for each bidRequests
+    * @return ServerRequest Info describing the request to the BeOp's server
+    */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const slots = validBidRequests.map(beOpRequestSlotsMaker);
+    const pageUrl = getPageUrl(bidderRequest.refererInfo, window);
+    const gdpr = bidderRequest.gdprConsent;
+    const firstSlot = slots[0];
+    const kwdsFromRequest = firstSlot.kwds;
+    let keywords = [];
+    if (kwdsFromRequest) {
+      if (isArray(kwdsFromRequest)) {
+        keywords = kwdsFromRequest;
+      } else if (isStr(kwdsFromRequest)) {
+        if (kwdsFromRequest.indexOf(',') != -1) {
+          keywords = kwdsFromRequest.split(',').map((e) => { return e.trim() });
+        } else {
+          keywords.push(kwdsFromRequest);
+        }
+      }
+    }
+    const payloadObject = {
+      at: new Date().toString(),
+      nid: firstSlot.nid,
+      nptnid: firstSlot.nptnid,
+      pid: firstSlot.pid,
+      url: pageUrl,
+      lang: (window.navigator.language || window.navigator.languages[0]),
+      kwds: keywords,
+      dbg: false,
+      slts: slots,
+      is_amp: deepAccess(bidderRequest, 'referrerInfo.isAmp'),
+      tc_string: (gdpr && gdpr.gdprApplies) ? gdpr.consentString : null,
+    };
+
+    const payloadString = JSON.stringify(payloadObject);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payloadString
+    }
+  },
+  interpretResponse: function(serverResponse, request) {
+    if (serverResponse && serverResponse.body && isArray(serverResponse.body.bids) && serverResponse.body.bids.length > 0) {
+      return serverResponse.body.bids;
+    }
+    return [];
+  },
+  onTimeout: function(timeoutData) {
+    if (timeoutData === null || typeof timeoutData === 'undefined' || Object.keys(timeoutData).length === 0) {
+      return;
+    }
+
+    let trackingParams = buildTrackingParams(timeoutData, 'timeout', timeoutData.timeout);
+
+    logWarn(BIDDER_CODE + ': timed out request');
+    triggerPixel(buildUrl({
+      protocol: 'https',
+      hostname: 't.beop.io',
+      pathname: '/bid',
+      search: trackingParams
+    }));
+  },
+  onBidWon: function(bid) {
+    if (bid === null || typeof bid === 'undefined' || Object.keys(bid).length === 0) {
+      return;
+    }
+    let trackingParams = buildTrackingParams(bid, 'won', bid.cpm);
+
+    logInfo(BIDDER_CODE + ': won request');
+    triggerPixel(buildUrl({
+      protocol: 'https',
+      hostname: 't.beop.io',
+      pathname: '/bid',
+      search: trackingParams
+    }));
+  },
+  onSetTargeting: function(bid) {}
+}
+
+function buildTrackingParams(data, info, value) {
+  let params = Array.isArray(data.params) ? data.params[0] : data.params;
+  const pageUrl = getPageUrl(null, window);
+  return {
+    pid: params.accountId === undefined ? data.ad.match(/account: \“([a-f\d]{24})\“/)[1] : params.accountId,
+    nid: params.networkId,
+    nptnid: params.networkPartnerId,
+    bid: data.bidId || data.requestId,
+    sl_n: data.adUnitCode,
+    aid: data.auctionId,
+    se_ca: 'bid',
+    se_ac: info,
+    se_va: value,
+    url: pageUrl
+  };
+}
+
+function beOpRequestSlotsMaker(bid) {
+  const bannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
+  const publisherCurrency = config.getConfig('currency.adServerCurrency') || getValue(bid.params, 'currency') || 'EUR';
+  let floor;
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({currency: publisherCurrency, mediaType: 'banner', size: [1, 1]});
+    if (typeof floorInfo === 'object' && floorInfo.currency === publisherCurrency && !isNaN(parseFloat(floorInfo.floor))) {
+      floor = parseFloat(floorInfo.floor);
+    }
+  }
+  return {
+    sizes: isArray(bannerSizes) ? bannerSizes : bid.sizes,
+    flr: floor,
+    pid: getValue(bid.params, 'accountId'),
+    kwds: getValue(bid.params, 'keywords'),
+    nid: getValue(bid.params, 'networkId'),
+    nptnid: getValue(bid.params, 'networkPartnerId'),
+    bid: getBidIdParameter('bidId', bid),
+    brid: getBidIdParameter('bidderRequestId', bid),
+    name: getBidIdParameter('adUnitCode', bid),
+    aid: getBidIdParameter('auctionId', bid),
+    tid: getBidIdParameter('transactionId', bid),
+    brc: getBidIdParameter('bidRequestsCount', bid),
+    bdrc: getBidIdParameter('bidderRequestCount', bid),
+    bwc: getBidIdParameter('bidderWinsCount', bid),
+  }
+}
+
+const protocolRelativeRegExp = /^\/\//
+function isProtocolRelativeUrl(url) {
+  return url && url.match(protocolRelativeRegExp) != null;
+}
+
+const withProtocolRegExp = /[a-z]{1,}:\/\//
+function isNoProtocolUrl(url) {
+  return url && url.match(withProtocolRegExp) == null;
+}
+
+function ensureProtocolInUrl(url, defaultProtocol) {
+  if (isProtocolRelativeUrl(url)) {
+    return `${defaultProtocol}${url}`;
+  } else if (isNoProtocolUrl(url)) {
+    return `${defaultProtocol}//${url}`;
+  }
+  return url;
+}
+
+/**
+ * sometimes trying to access a field (protected?) triggers an exception
+ * Ex deepAccess(window, 'top.location.href') might throw if it crosses origins
+ * so here is a lenient version
+ */
+function safeDeepAccess(obj, path) {
+  try {
+    return deepAccess(obj, path)
+  } catch (_e) {
+    return null;
+  }
+}
+
+function getPageUrl(refererInfo, window) {
+  refererInfo = refererInfo || getRefererInfo();
+  let pageUrl = refererInfo.canonicalUrl || safeDeepAccess(window, 'top.location.href') || deepAccess(window, 'location.href');
+  // Ensure the protocol is present (looks like sometimes the extracted pageUrl misses it)
+  if (pageUrl != null) {
+    const defaultProtocol = safeDeepAccess(window, 'top.location.protocol') || deepAccess(window, 'location.protocol');
+    pageUrl = ensureProtocolInUrl(pageUrl, defaultProtocol);
+  }
+  return pageUrl;
+}
+
+registerBidder(spec);
diff --git a/modules/beopBidAdapter.md b/modules/beopBidAdapter.md
new file mode 100644
index 00000000000..c0e88cb1ceb
--- /dev/null
+++ b/modules/beopBidAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+**Module Name** : BeOp Bidder Adapter  
+**Module Type** : Bidder Adapter  
+**Maintainer** : tech@beop.io
+
+# Description
+
+Module that connects to BeOp's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'in-article',
+            mediaTypes: {
+                banner: {
+                    sizes: [[1,1]], 
+                }
+            },
+            bids: [
+                {
+                    bidder: "beop",
+                    params: {
+                        accountId: '5a8af500c9e77c00017e4cad',
+                        currency: 'EUR'
+                    }
+                }
+            ]
+        }
+    ];
+```
+
diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index c435a5a993e..ea28420481d 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -1,11 +1,15 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { getAdUnitSizes, parseSizesInput } from '../src/utils.js';
+import {getAdUnitSizes, parseSizesInput} from '../src/utils.js';
+import {includes} from '../src/polyfill.js';
+
 const BIDDER_CODE = 'between';
+let ENDPOINT = 'https://ads.betweendigital.com/adjson?t=prebid';
+const CODE_TYPES = ['inpage', 'preroll', 'midroll', 'postroll'];
 
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['btw'],
-  supportedMediaTypes: ['banner'],
+  supportedMediaTypes: ['banner', 'video'],
   /**
    * Determines whether or not the given bid request is valid.
    *
@@ -18,32 +22,46 @@ export const spec = {
   /**
    * Make a server request from the list of BidRequests.
    *
-   * @param {validBidRequests[]} - an array of bids
+   * @param {validBidRequest?pbjs_debug=trues[]} - an array of bids
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
     let requests = [];
     const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
+    const refInfo = bidderRequest?.refererInfo;
+
+    validBidRequests.forEach((i) => {
+      const video = i.mediaTypes && i.mediaTypes.video;
 
-    validBidRequests.forEach(i => {
       let params = {
-        sizes: parseSizesInput(getAdUnitSizes(i)).join('%2C'),
+        eids: getUsersIds(i),
+        sizes: parseSizesInput(getAdUnitSizes(i)),
         jst: 'hb',
         ord: Math.random() * 10000000000000000,
         tz: getTz(),
         fl: getFl(),
         rr: getRr(),
-        s: i.params.s,
+        s: i.params && i.params.s,
         bidid: i.bidId,
         transactionid: i.transactionId,
         auctionid: i.auctionId
       };
+
+      if (video) {
+        params.mediaType = 2;
+        params.maxd = video.maxd;
+        params.mind = video.mind;
+        params.pos = 'atf';
+        params.jst = 'pvc';
+        params.codeType = includes(CODE_TYPES, video.codeType) ? video.codeType : 'inpage';
+      }
+
       if (i.params.itu !== undefined) {
         params.itu = i.params.itu;
       }
-      if (i.params.cur !== undefined) {
-        params.cur = i.params.cur;
-      }
+
+      params.cur = i.params.cur || 'USD';
+
       if (i.params.subid !== undefined) {
         params.subid = i.params.subid;
       }
@@ -56,6 +74,13 @@ export const spec = {
         }
       }
 
+      if (i.schain) {
+        params.schain = encodeToBase64WebSafe(JSON.stringify(i.schain));
+      }
+
+      // TODO: is 'page' the right value here?
+      if (refInfo && refInfo.page) params.ref = refInfo.page;
+
       if (gdprConsent) {
         if (typeof gdprConsent.gdprApplies !== 'undefined') {
           params.gdprApplies = !!gdprConsent.gdprApplies;
@@ -65,9 +90,14 @@ export const spec = {
         }
       }
 
-      requests.push({method: 'GET', url: 'https://ads.betweendigital.com/adjson', data: params})
+      requests.push({data: params});
     })
-    return requests;
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: JSON.stringify(requests)
+    }
+    // return requests;
   },
   /**
    * Unpack the response from the server into a list of bids.
@@ -77,18 +107,25 @@ export const spec = {
    */
   interpretResponse: function(serverResponse, bidRequest) {
     const bidResponses = [];
+
     for (var i = 0; i < serverResponse.body.length; i++) {
       let bidResponse = {
         requestId: serverResponse.body[i].bidid,
         cpm: serverResponse.body[i].cpm || 0,
         width: serverResponse.body[i].w,
         height: serverResponse.body[i].h,
+        vastXml: serverResponse.body[i].vastXml,
+        mediaType: serverResponse.body[i].mediaType,
         ttl: serverResponse.body[i].ttl,
         creativeId: serverResponse.body[i].creativeid,
-        currency: serverResponse.body[i].currency || 'RUB',
+        currency: serverResponse.body[i].currency || 'USD',
         netRevenue: serverResponse.body[i].netRevenue || true,
-        ad: serverResponse.body[i].ad
+        ad: serverResponse.body[i].ad,
+        meta: {
+          advertiserDomains: serverResponse.body[i].adomain ? serverResponse.body[i].adomain : []
+        }
       };
+
       bidResponses.push(bidResponse);
     }
     return bidResponses;
@@ -121,14 +158,24 @@ export const spec = {
     //   type: 'iframe',
     //   url: 'https://acdn.adnxs.com/dmp/async_usersync.html'
     // });
-    syncs.push({
-      type: 'iframe',
-      url: 'https://ads.betweendigital.com/sspmatch-iframe'
-    });
+    syncs.push(
+      {
+        type: 'iframe',
+        url: 'https://ads.betweendigital.com/sspmatch-iframe'
+      },
+      {
+        type: 'image',
+        url: 'https://ads.betweendigital.com/sspmatch'
+      }
+    );
     return syncs;
   }
 }
 
+function getUsersIds({ userIdAsEids }) {
+  return (userIdAsEids && userIdAsEids.length !== 0) ? userIdAsEids : [];
+}
+
 function getRr() {
   try {
     var td = top.document;
@@ -161,6 +208,10 @@ function getTz() {
   return new Date().getTimezoneOffset();
 }
 
+function encodeToBase64WebSafe(string) {
+  return btoa(string).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+}
+
 /*
 function get_pubdata(adds) {
   if (adds !== undefined && adds.pubdata !== undefined) {
diff --git a/modules/beyondmediaBidAdapter.js b/modules/beyondmediaBidAdapter.js
new file mode 100644
index 00000000000..57c141dc2aa
--- /dev/null
+++ b/modules/beyondmediaBidAdapter.js
@@ -0,0 +1,202 @@
+import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'beyondmedia';
+const AD_URL = 'https://backend.andbeyond.media/pbjs';
+const SYNC_URL = 'https://cookies.andbeyond.media';
+
+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 || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  placement.placementId = placementId;
+  placement.type = 'publisher';
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+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 (err) {
+    logError(err);
+    return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && params.placementId);
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    }
+
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/beyondmediaBidAdapter.md b/modules/beyondmediaBidAdapter.md
new file mode 100644
index 00000000000..e828bdfd808
--- /dev/null
+++ b/modules/beyondmediaBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: AndBeyond.Media Bidder Adapter
+Module Type: AndBeyond.Media Bidder Adapter
+Maintainer: sysengg@andbeyond.media
+```
+
+# Description
+
+Connects to AndBeyond.Media exchange for bids.
+AndBeyond.Media bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'beyondmedia',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'beyondmedia',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'beyondmedia',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/bidViewability.js b/modules/bidViewability.js
new file mode 100644
index 00000000000..a5cab99b1a7
--- /dev/null
+++ b/modules/bidViewability.js
@@ -0,0 +1,102 @@
+// This module, when included, will trigger a BID_VIEWABLE event which can be consumed by Bidders and Analytics adapters
+// GPT API is used to find when a bid is viewable, https://developers.google.com/publisher-tag/reference#googletag.events.impressionviewableevent
+// Does not work with other than GPT integration
+
+import {config} from '../src/config.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+import {isFn, logWarn, triggerPixel} from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import adapterManager, {gdprDataHandler, uspDataHandler, gppDataHandler} from '../src/adapterManager.js';
+import {find} from '../src/polyfill.js';
+
+const MODULE_NAME = 'bidViewability';
+const CONFIG_ENABLED = 'enabled';
+const CONFIG_FIRE_PIXELS = 'firePixels';
+const CONFIG_CUSTOM_MATCH = 'customMatchFunction';
+const BID_VURL_ARRAY = 'vurls';
+const GPT_IMPRESSION_VIEWABLE_EVENT = 'impressionViewable';
+
+export let isBidAdUnitCodeMatchingSlot = (bid, slot) => {
+  return (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode);
+}
+
+export let getMatchingWinningBidForGPTSlot = (globalModuleConfig, slot) => {
+  return find(getGlobal().getAllWinningBids(),
+    // supports custom match function from config
+    bid => isFn(globalModuleConfig[CONFIG_CUSTOM_MATCH])
+      ? globalModuleConfig[CONFIG_CUSTOM_MATCH](bid, slot)
+      : isBidAdUnitCodeMatchingSlot(bid, slot)
+  ) || null;
+};
+
+export let fireViewabilityPixels = (globalModuleConfig, bid) => {
+  if (globalModuleConfig[CONFIG_FIRE_PIXELS] === true && bid.hasOwnProperty(BID_VURL_ARRAY)) {
+    let queryParams = {};
+
+    const gdprConsent = gdprDataHandler.getConsentData();
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
+      if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
+      if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
+    }
+
+    const uspConsent = uspDataHandler.getConsentData();
+    if (uspConsent) { queryParams.us_privacy = uspConsent; }
+
+    const gppConsent = gppDataHandler.getConsentData();
+    if (gppConsent) {
+      // TODO - need to know what to set here for queryParams...
+    }
+
+    bid[BID_VURL_ARRAY].forEach(url => {
+      // add '?' if not present in URL
+      if (Object.keys(queryParams).length > 0 && url.indexOf('?') === -1) {
+        url += '?';
+      }
+      // append all query params, `&key=urlEncoded(value)`
+      url += Object.keys(queryParams).reduce((prev, key) => prev += `&${key}=${encodeURIComponent(queryParams[key])}`, '');
+      triggerPixel(url)
+    });
+  }
+};
+
+export let logWinningBidNotFound = (slot) => {
+  logWarn(`bid details could not be found for ${slot.getSlotElementId()}, probable reasons: a non-prebid bid is served OR check the prebid.AdUnit.code to GPT.AdSlot relation.`);
+};
+
+export let impressionViewableHandler = (globalModuleConfig, slot, event) => {
+  let respectiveBid = getMatchingWinningBidForGPTSlot(globalModuleConfig, slot);
+  if (respectiveBid === null) {
+    logWinningBidNotFound(slot);
+  } else {
+    // if config is enabled AND VURL array is present then execute each pixel
+    fireViewabilityPixels(globalModuleConfig, respectiveBid);
+    // trigger respective bidder's onBidViewable handler
+    adapterManager.callBidViewableBidder(respectiveBid.adapterCode || respectiveBid.bidder, respectiveBid);
+    // emit the BID_VIEWABLE event with bid details, this event can be consumed by bidders and analytics pixels
+    events.emit(CONSTANTS.EVENTS.BID_VIEWABLE, respectiveBid);
+  }
+};
+
+export let init = () => {
+  events.on(CONSTANTS.EVENTS.AUCTION_INIT, () => {
+    // read the config for the module
+    const globalModuleConfig = config.getConfig(MODULE_NAME) || {};
+    // do nothing if module-config.enabled is not set to true
+    // this way we are adding a way for bidders to know (using pbjs.getConfig('bidViewability').enabled === true) whether this module is added in build and is enabled
+    if (globalModuleConfig[CONFIG_ENABLED] !== true) {
+      return;
+    }
+    // add the GPT event listener
+    window.googletag = window.googletag || {};
+    window.googletag.cmd = window.googletag.cmd || [];
+    window.googletag.cmd.push(() => {
+      window.googletag.pubads().addEventListener(GPT_IMPRESSION_VIEWABLE_EVENT, function(event) {
+        impressionViewableHandler(globalModuleConfig, event.slot, event);
+      });
+    });
+  });
+}
+
+init()
diff --git a/modules/bidViewability.md b/modules/bidViewability.md
new file mode 100644
index 00000000000..78a1539fb1a
--- /dev/null
+++ b/modules/bidViewability.md
@@ -0,0 +1,49 @@
+# Overview
+
+Module Name: bidViewability
+
+Purpose: Track when a bid is viewable
+
+Maintainer: harshad.mane@pubmatic.com
+
+# Description
+- This module, when included, will trigger a BID_VIEWABLE event which can be consumed by Analytics adapters, bidders will need to implement `onBidViewable` method to capture this event
+- Bidderes can check if this module is part of the final build and whether it is enabled or not by accessing ```pbjs.getConfig('bidViewability')```
+- GPT API is used to find when a bid is viewable, https://developers.google.com/publisher-tag/reference#googletag.events.impressionviewableevent . This event is fired when an impression becomes viewable, according to the Active View criteria.
+Refer: https://support.google.com/admanager/answer/4524488
+- The module does not work with adserver other than GAM with GPT integration
+- Logic used to find a matching pbjs-bid for a GPT slot is ``` (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode) ``` this logic can be changed by using param ```customMatchFunction```
+- When a rendered PBJS bid is viewable the module will trigger BID_VIEWABLE event, which can be consumed by bidders and analytics adapters
+- For the viewable bid if ```bid.vurls type array``` param is and module config ``` firePixels: true ``` is set then the URLs mentioned in bid.vurls will be executed. Please note that GDPR and USP related parameters will be added to the given URLs
+
+# Params
+- enabled [required] [type: boolean, default: false], when set to true, the module will emit BID_VIEWABLE when applicable
+- firePixels [optional] [type: boolean], when set to true, will fire the urls mentioned in bid.vurls which should be array of urls
+- customMatchFunction [optional] [type: function(bid, slot)], when passed this function will be used to `find` the matching winning bid for the GPT slot. Default value is ` (bid, slot) => (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode) `
+
+# Example of consuming BID_VIEWABLE event
+```
+	pbjs.onEvent('bidViewable', function(bid){
+		console.log('got bid details in bidViewable event', bid);
+	});
+
+```
+
+# Example of using config
+```
+	pbjs.setConfig({
+        bidViewability: {
+            enabled: true,
+            firePixels: true,
+            customMatchFunction: function(bid, slot){
+                console.log('using custom match function....');
+                return bid.adUnitCode === slot.getAdUnitPath();
+            }
+        }
+    });
+```
+
+# Please Note:
+- Doesn't seems to work with Instream Video, https://docs.prebid.org/dev-docs/examples/instream-banner-mix.html as GPT's impressionViewable event is not triggered for instream-video-creative
+- Works with Banner, Outsteam, Native creatives
+
diff --git a/modules/bidViewabilityIO.js b/modules/bidViewabilityIO.js
new file mode 100644
index 00000000000..ff7ec70e32c
--- /dev/null
+++ b/modules/bidViewabilityIO.js
@@ -0,0 +1,91 @@
+import { logMessage } from '../src/utils.js';
+import { config } from '../src/config.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+
+const MODULE_NAME = 'bidViewabilityIO';
+const CONFIG_ENABLED = 'enabled';
+
+// IAB numbers from: https://support.google.com/admanager/answer/4524488?hl=en
+const IAB_VIEWABLE_DISPLAY_TIME = 1000;
+const IAB_VIEWABLE_DISPLAY_LARGE_PX = 242000;
+export const IAB_VIEWABLE_DISPLAY_THRESHOLD = 0.5
+export const IAB_VIEWABLE_DISPLAY_LARGE_THRESHOLD = 0.3;
+
+const CLIENT_SUPPORTS_IO = window.IntersectionObserver && window.IntersectionObserverEntry && window.IntersectionObserverEntry.prototype &&
+    'intersectionRatio' in window.IntersectionObserverEntry.prototype;
+
+const supportedMediaTypes = [
+  'banner'
+];
+
+export let isSupportedMediaType = (bid) => {
+  return supportedMediaTypes.indexOf(bid.mediaType) > -1;
+}
+
+let _logMessage = (message) => {
+  return logMessage(`${MODULE_NAME}: ${message}`);
+}
+
+// returns options for the iO that detects if the ad is viewable
+export let getViewableOptions = (bid) => {
+  if (bid.mediaType === 'banner') {
+    return {
+      root: null,
+      rootMargin: '0px',
+      threshold: bid.width * bid.height > IAB_VIEWABLE_DISPLAY_LARGE_PX ? IAB_VIEWABLE_DISPLAY_LARGE_THRESHOLD : IAB_VIEWABLE_DISPLAY_THRESHOLD
+    }
+  }
+}
+
+// markViewed returns a function what will be executed when an ad satisifes the viewable iO
+export let markViewed = (bid, entry, observer) => {
+  return () => {
+    observer.unobserve(entry.target);
+    events.emit(CONSTANTS.EVENTS.BID_VIEWABLE, bid);
+    _logMessage(`id: ${entry.target.getAttribute('id')} code: ${bid.adUnitCode} was viewed`);
+  }
+}
+
+// viewCallbackFactory creates the callback used by the viewable IntersectionObserver.
+// When an ad comes into view, it sets a timeout for a function to be executed
+// when that ad would be considered viewed per the IAB specs. The bid that was rendered
+// is passed into the factory, so it can pass it into markViewed, so that it can be included
+// in the BID_VIEWABLE event data. If the ad leaves view before the timer goes off, the setTimeout
+// is cancelled, an the bid will not be marked as viewed. There's probably some kind of race-ish
+// thing going on between IO and setTimeout but this isn't going to be perfect, it's just going to
+// be pretty good.
+export let viewCallbackFactory = (bid) => {
+  return (entries, observer) => {
+    entries.forEach(entry => {
+      if (entry.isIntersecting) {
+        _logMessage(`viewable timer starting for id: ${entry.target.getAttribute('id')} code: ${bid.adUnitCode}`);
+        entry.target.view_tracker = setTimeout(markViewed(bid, entry, observer), IAB_VIEWABLE_DISPLAY_TIME);
+      } else {
+        _logMessage(`id: ${entry.target.getAttribute('id')} code: ${bid.adUnitCode} is out of view`);
+        if (entry.target.view_tracker) {
+          clearTimeout(entry.target.view_tracker);
+          _logMessage(`viewable timer stopped for id: ${entry.target.getAttribute('id')} code: ${bid.adUnitCode}`);
+        }
+      }
+    });
+  };
+};
+
+export let init = () => {
+  config.getConfig(MODULE_NAME, conf => {
+    if (conf[MODULE_NAME][CONFIG_ENABLED] && CLIENT_SUPPORTS_IO) {
+      // if the module is enabled and the browser supports Intersection Observer,
+      // then listen to AD_RENDER_SUCCEEDED to setup IO's for supported mediaTypes
+      events.on(CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED, ({doc, bid, id}) => {
+        if (isSupportedMediaType(bid)) {
+          let viewable = new IntersectionObserver(viewCallbackFactory(bid), getViewableOptions(bid));
+          let element = document.getElementById(bid.adUnitCode);
+          viewable.observe(element);
+        }
+      });
+    }
+  });
+}
+
+init()
diff --git a/modules/bidViewabilityIO.md b/modules/bidViewabilityIO.md
new file mode 100644
index 00000000000..ad04cf38681
--- /dev/null
+++ b/modules/bidViewabilityIO.md
@@ -0,0 +1,41 @@
+# Overview
+
+Module Name: bidViewabilityIO
+
+Purpose: Emit a BID_VIEWABLE event when a bid becomes viewable using the browsers IntersectionObserver API
+
+Maintainer: adam.prime@alum.utoronto.ca
+
+# Description
+- This module will trigger a BID_VIEWABLE event which other modules, adapters or publisher code can use to get a sense of viewability
+- You can check if this module is part of the final build and whether it is enabled or not by accessing ```pbjs.getConfig('bidViewabilityIO')```
+- Viewability, as measured by this module is not perfect, nor should it be expected to be. 
+- The module does not require any specific ad server, or an adserver at all.
+
+# Limitations
+
+- Currently only supports the banner mediaType
+- Assumes that the adUnitCode of the ad is also the id attribute of the element that the ad is rendered into.
+- Does not make any attempt to ensure that the ad inside that element is itself visible. It assumes that the publisher is operating in good faith.
+
+# Params
+- enabled [required] [type: boolean, default: false], when set to true, the module will emit BID_VIEWABLE when applicable
+
+# Example of consuming BID_VIEWABLE event
+```
+	pbjs.onEvent('bidViewable', function(bid){
+		console.log('got bid details in bidViewable event', bid);
+	});
+
+```
+
+# Example of using config
+```
+	pbjs.setConfig({
+        bidViewabilityIO: {
+            enabled: true,
+        }
+    });
+```
+
+An example implmentation without an ad server can be found in integrationExamples/postbid/bidViewabilityIO_example.html
diff --git a/modules/biddoBidAdapter.js b/modules/biddoBidAdapter.js
new file mode 100644
index 00000000000..5512ca60f8e
--- /dev/null
+++ b/modules/biddoBidAdapter.js
@@ -0,0 +1,92 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'biddo';
+const ENDPOINT_URL = 'https://ad.adopx.net/delivery/impress';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bidRequest The bid request params to validate.
+   * @return boolean True if this is a valid bid request, and false otherwise.
+   */
+  isBidRequestValid: function(bidRequest) {
+    return !!bidRequest.params.zoneId;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Array<BidRequest>} validBidRequests an array of bid requests
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests) {
+    let serverRequests = [];
+
+    validBidRequests.forEach(bidRequest => {
+      const sizes = bidRequest.mediaTypes.banner.sizes;
+
+      sizes.forEach(([width, height]) => {
+        bidRequest.params.requestedSizes = [width, height];
+
+        const payload = {
+          ctype: 'div',
+          pzoneid: bidRequest.params.zoneId,
+          width,
+          height,
+        };
+
+        const payloadString = Object.keys(payload).map(k => k + '=' + encodeURIComponent(payload[k])).join('&');
+
+        serverRequests.push({
+          method: 'GET',
+          url: ENDPOINT_URL,
+          data: payloadString,
+          bidderRequest: bidRequest,
+        });
+      });
+    });
+
+    return serverRequests;
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidderRequest A matched bid request for this response.
+   * @return Array<BidResponse> An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, {bidderRequest}) {
+    const response = serverResponse.body;
+    const bidResponses = [];
+
+    if (response && response.template && response.template.html) {
+      const {bidId} = bidderRequest;
+      const [width, height] = bidderRequest.params.requestedSizes;
+
+      const bidResponse = {
+        requestId: bidId,
+        cpm: response.hb.cpm,
+        creativeId: response.banner.hash,
+        currency: 'USD',
+        netRevenue: response.hb.netRevenue,
+        ttl: 600,
+        ad: response.template.html,
+        mediaType: 'banner',
+        meta: {
+          advertiserDomains: response.hb.adomains || [],
+        },
+        width,
+        height,
+      };
+
+      bidResponses.push(bidResponse);
+    }
+
+    return bidResponses;
+  },
+}
+
+registerBidder(spec);
diff --git a/modules/biddoBidAdapter.md b/modules/biddoBidAdapter.md
new file mode 100644
index 00000000000..baea44b22f2
--- /dev/null
+++ b/modules/biddoBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name: Biddo Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: contact@biddo.net
+```
+
+# Description
+
+Module that connects to Invamia demand sources.
+
+# Test Parameters
+
+```
+    const adUnits = [{
+      code: 'test-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        },
+      },
+      bids: [{
+        bidder: 'biddo',
+        params: {
+          zoneId: 7254,
+        },
+      }],
+    }];
+```
diff --git a/modules/bidfluenceBidAdapter.js b/modules/bidfluenceBidAdapter.js
deleted file mode 100644
index f8a1f9ac92f..00000000000
--- a/modules/bidfluenceBidAdapter.js
+++ /dev/null
@@ -1,131 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const storage = getStorageManager();
-const BIDDER_CODE = 'bidfluence';
-
-function stdTimezoneOffset(t) {
-  const jan = new Date(t.getFullYear(), 0, 1);
-  const jul = new Date(t.getFullYear(), 6, 1);
-  return Math.max(jan.getTimezoneOffset(), jul.getTimezoneOffset());
-}
-function dst(t) {
-  return t.getTimezoneOffset() < stdTimezoneOffset(t);
-}
-function getBdfTz(d) {
-  let tz = d.getTimezoneOffset();
-  if (dst(d)) {
-    tz += 60;
-  }
-  return tz.toString();
-}
-function getUTCDate() {
-  var m = new Date();
-  var dateString = m.getUTCFullYear() + '/' +
-    ('0' + (m.getUTCMonth() + 1)).slice(-2) + '/' +
-    ('0' + m.getUTCDate()).slice(-2) + ' ' +
-    ('0' + m.getUTCHours()).slice(-2) + ':' +
-    ('0' + m.getUTCMinutes()).slice(-2) + ':' +
-    ('0' + m.getUTCSeconds()).slice(-2);
-
-  return dateString;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  isBidRequestValid: function (bid) {
-    return !!bid.params.placementId || !!bid.params.publisherId;
-  },
-
-  buildRequests: function (validBidRequests, bidderRequest) {
-    const body = document.getElementsByTagName('body')[0];
-    const refInfo = bidderRequest.refererInfo;
-    const gdpr = bidderRequest.gdprConsent;
-    const vpW = Math.max(window.innerWidth || body.clientWidth || 0) + 2;
-    const vpH = Math.max(window.innerHeight || body.clientHeight || 0) + 2;
-    const sr = screen.height > screen.width ? screen.height + 'x' + screen.width + 'x' + screen.colorDepth : screen.width + 'x' + screen.height + 'x' + screen.colorDepth;
-
-    var payload = {
-      v: '2.0',
-      azr: true,
-      ck: storage.cookiesAreEnabled(),
-      re: refInfo ? refInfo.referer : '',
-      st: refInfo ? refInfo.stack : [],
-      tz: getBdfTz(new Date()),
-      sr: sr,
-      tm: bidderRequest.timeout,
-      vp: vpW + 'x' + vpH,
-      sdt: getUTCDate(),
-      top: refInfo ? refInfo.reachedTop : false,
-      gdpr: gdpr ? gdpr.gdprApplies : false,
-      gdprc: gdpr ? gdpr.consentString : '',
-      bids: []
-    };
-
-    utils._each(validBidRequests, function (bidRequest) {
-      var params = bidRequest.params;
-      var sizes = utils.parseSizesInput(bidRequest.sizes)[0];
-      var width = sizes.split('x')[0];
-      var height = sizes.split('x')[1];
-
-      var currentBidPayload = {
-        bid: bidRequest.bidId,
-        tid: params.placementId,
-        pid: params.publisherId,
-        rp: params.reservePrice || 0,
-        w: width,
-        h: height
-      };
-
-      payload.bids.push(currentBidPayload);
-    });
-
-    const payloadString = JSON.stringify(payload);
-    return {
-      method: 'POST',
-      url: `https://bdf${payload.bids[0].pid}.bidfluence.com/Prebid`,
-      data: payloadString,
-      options: { contentType: 'text/plain' }
-    };
-  },
-
-  interpretResponse: function (serverResponse, bidRequest) {
-    const bidResponses = [];
-    const response = serverResponse.body;
-
-    utils._each(response.Bids, function (currentResponse) {
-      var cpm = currentResponse.Cpm || 0;
-
-      if (cpm > 0) {
-        const bidResponse = {
-          requestId: currentResponse.BidId,
-          cpm: cpm,
-          width: currentResponse.Width,
-          height: currentResponse.Height,
-          creativeId: currentResponse.CreativeId,
-          ad: currentResponse.Ad,
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 360
-        };
-        bidResponses.push(bidResponse);
-      }
-    });
-
-    return bidResponses;
-  },
-
-  getUserSyncs: function (serverResponses) {
-    if (serverResponses.userSyncs) {
-      const syncs = serverResponses.UserSyncs.map((sync) => {
-        return {
-          type: sync.Type === 'ifr' ? 'iframe' : 'image',
-          url: sync.Url
-        };
-      });
-      return syncs;
-    }
-  }
-};
-registerBidder(spec);
diff --git a/modules/bidfluenceBidAdapter.md b/modules/bidfluenceBidAdapter.md
deleted file mode 100644
index 34dbb3d3a1c..00000000000
--- a/modules/bidfluenceBidAdapter.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Overview
-
-```
-Module Name: Bidfluence Adapter
-Module Type: Bidder Adapter
-Maintainer: integrations@bidfluence.com
-prebid_1_0_supported : true
-gdpr_supported: true
-```
-
-# Description
-
-Bidfluence adapter for prebid.
-
-# Test Parameters
-
-```
-var adUnits = [
-  {
-    code: 'test-prebid',
-    sizes: [[300, 250]],
-    bids: [{
-      bidder: 'bidfluence',
-      params: {
-        placementId: '1000',
-        publisherId: '1000'
-      }
-    }]
-  }
-]
-```
diff --git a/modules/bidglassBidAdapter.js b/modules/bidglassBidAdapter.js
index 6db35f184ca..3184372881b 100644
--- a/modules/bidglassBidAdapter.js
+++ b/modules/bidglassBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { _each, isArray, getBidIdParameter, deepClone, getUniqueIdentifierStr } from '../src/utils.js';
 // import {config} from 'src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
@@ -46,7 +46,7 @@ export const spec = {
       return window === window.top ? window.location.href : window.parent === window.top ? document.referrer : null;
     };
     let getOrigins = function() {
-      var ori = ['https://' + window.location.hostname];
+      var ori = [window.location.protocol + '//' + window.location.hostname];
 
       if (window.location.ancestorOrigins) {
         for (var i = 0; i < window.location.ancestorOrigins.length; i++) {
@@ -56,7 +56,7 @@ export const spec = {
         // Derive the parent origin
         var parts = document.referrer.split('/');
 
-        ori.push('https://' + parts[2]);
+        ori.push(parts[0] + '//' + parts[2]);
 
         if (window.parent !== window.top) {
           // Additional unknown origins exist
@@ -67,21 +67,36 @@ export const spec = {
       return ori;
     };
 
-    utils._each(validBidRequests, function(bid) {
-      bid.sizes = ((utils.isArray(bid.sizes) && utils.isArray(bid.sizes[0])) ? bid.sizes : [bid.sizes]);
-      bid.sizes = bid.sizes.filter(size => utils.isArray(size));
+    let bidglass = window['bidglass'];
 
-      // Stuff to send: [bid id, sizes, adUnitId]
+    _each(validBidRequests, function(bid) {
+      bid.sizes = ((isArray(bid.sizes) && isArray(bid.sizes[0])) ? bid.sizes : [bid.sizes]);
+      bid.sizes = bid.sizes.filter(size => isArray(size));
+
+      var adUnitId = getBidIdParameter('adUnitId', bid.params);
+      var options = deepClone(bid.params);
+
+      delete options.adUnitId;
+
+      // Merge externally set targeting params
+      if (typeof bidglass === 'object' && bidglass.getTargeting) {
+        let targeting = bidglass.getTargeting(adUnitId, options.targeting);
+
+        if (targeting && Object.keys(targeting).length > 0) options.targeting = targeting;
+      }
+
+      // Stuff to send: [bid id, sizes, adUnitId, options]
       imps.push({
         bidId: bid.bidId,
         sizes: bid.sizes,
-        adUnitId: utils.getBidIdParameter('adUnitId', bid.params)
+        adUnitId: adUnitId,
+        options: options
       });
     });
 
     // Stuff to send: page URL
     const bidReq = {
-      reqId: utils.getUniqueIdentifierStr(),
+      reqId: getUniqueIdentifierStr(),
       imps: imps,
       ref: getReferer(),
       ori: getOrigins()
@@ -110,20 +125,31 @@ export const spec = {
   interpretResponse: function(serverResponse) {
     const bidResponses = [];
 
-    utils._each(serverResponse.body.bidResponses, function(bid) {
-      bidResponses.push({
-        requestId: bid.requestId,
-        cpm: parseFloat(bid.cpm),
-        width: parseInt(bid.width, 10),
-        height: parseInt(bid.height, 10),
-        creativeId: bid.creativeId,
-        dealId: bid.dealId || null,
-        currency: bid.currency || 'USD',
-        mediaType: bid.mediaType || 'banner',
+    _each(serverResponse.body.bidResponses, function(serverBid) {
+      const bidResponse = {
+        requestId: serverBid.requestId,
+        cpm: parseFloat(serverBid.cpm),
+        width: parseInt(serverBid.width, 10),
+        height: parseInt(serverBid.height, 10),
+        creativeId: serverBid.creativeId,
+        dealId: serverBid.dealId || null,
+        currency: serverBid.currency || 'USD',
+        mediaType: serverBid.mediaType || 'banner',
         netRevenue: true,
-        ttl: bid.ttl || 10,
-        ad: bid.ad
-      });
+        ttl: serverBid.ttl || 10,
+        ad: serverBid.ad,
+        meta: {}
+      };
+
+      if (serverBid.meta) {
+        let meta = serverBid.meta;
+
+        if (meta.advertiserDomains && meta.advertiserDomains.length) {
+          bidResponse.meta.advertiserDomains = meta.advertiserDomains;
+        }
+      }
+
+      bidResponses.push(bidResponse);
     });
 
     return bidResponses;
diff --git a/modules/bidlabBidAdapter.js b/modules/bidlabBidAdapter.js
deleted file mode 100644
index 8f501505a6d..00000000000
--- a/modules/bidlabBidAdapter.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-
-const BIDDER_CODE = 'bidlab';
-const AD_URL = 'https://service.bidlab.ai/?c=o&m=multi';
-const URL_SYNC = 'https://service.bidlab.ai/?c=o&m=sync';
-const NO_SYNC = true;
-
-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.title && bid.native.image && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-  noSync: NO_SYNC,
-
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.placementId)));
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    let winTop = window;
-    let location;
-    try {
-      location = new URL(bidderRequest.refererInfo.referer)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      utils.logMessage(e);
-    };
-    let placements = [];
-    let 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
-    };
-    request.language.indexOf('-') != -1 && (request.language = request.language.split('-')[0])
-    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++) {
-      let bid = validBidRequests[i];
-      let traff = bid.params.traffic || BANNER
-
-      placements.push({
-        placementId: bid.params.placementId,
-        bidId: bid.bidId,
-        sizes: bid.mediaTypes && bid.mediaTypes[traff] && bid.mediaTypes[traff].sizes ? bid.mediaTypes[traff].sizes : [],
-        traffic: traff
-      });
-      if (bid.schain) {
-        placements.schain = bid.schain;
-      }
-    }
-    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)) {
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-
-  getUserSyncs: (syncOptions, serverResponses) => {
-    if (NO_SYNC) {
-      return false
-    } else {
-      return [{
-        type: 'image',
-        url: URL_SYNC
-      }];
-    }
-  }
-
-};
-
-registerBidder(spec);
diff --git a/modules/bidlabBidAdapter.md b/modules/bidlabBidAdapter.md
deleted file mode 100644
index 3e5fe3128ed..00000000000
--- a/modules/bidlabBidAdapter.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Overview
-
-```
-Module Name: bidlab Bidder Adapter
-Module Type: bidlab Bidder Adapter
-```
-
-# Description
-
-Module that connects to bidlab demand sources
-
-# Test Parameters
-```
-    var adUnits = [
-                // Will return static test banner
-                {
-                    code: 'placementId_0',
-                    mediaTypes: {
-                        banner: {
-                            sizes: [[300, 250]],
-                        }
-                    },
-                    bids: [
-                        {
-                            bidder: 'bidlab',
-                            params: {
-                                placementId: 0,
-                                traffic: 'banner'
-                            }
-                        }
-                    ]
-                },
-                // Will return test vast xml. All video params are stored under placement in publishers UI
-                {
-                    code: 'placementId_0',
-                    mediaTypes: {
-                        video: {
-                            playerSize: [640, 480],
-                            context: 'instream'
-                        }
-                    },
-                    bids: [
-                        {
-                            bidder: 'bidlab',
-                            params: {
-                                placementId: 0,
-                                traffic: 'video'
-                            }
-                        }
-                    ]
-                }
-            ];
-```
diff --git a/modules/bidphysicsBidAdapter.js b/modules/bidphysicsBidAdapter.js
deleted file mode 100644
index b6b5690ede5..00000000000
--- a/modules/bidphysicsBidAdapter.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
-import {BANNER} from '../src/mediaTypes.js';
-
-const ENDPOINT_URL = 'https://exchange.bidphysics.com/auction';
-
-const DEFAULT_BID_TTL = 30;
-const DEFAULT_CURRENCY = 'USD';
-const DEFAULT_NET_REVENUE = true;
-
-export const spec = {
-  code: 'bidphysics',
-  aliases: ['yieldlift'],
-  supportedMediaTypes: [BANNER],
-
-  isBidRequestValid: function (bid) {
-    return (!!bid.params.unitId && typeof bid.params.unitId === 'string') ||
-      (!!bid.params.networkId && typeof bid.params.networkId === 'string') ||
-      (!!bid.params.publisherId && typeof bid.params.publisherId === 'string');
-  },
-
-  buildRequests: function (validBidRequests, bidderRequest) {
-    if (!validBidRequests || !bidderRequest) {
-      return;
-    }
-    const publisherId = validBidRequests[0].params.publisherId;
-    const networkId = validBidRequests[0].params.networkId;
-    const impressions = validBidRequests.map(bidRequest => ({
-      id: bidRequest.bidId,
-      banner: {
-        format: bidRequest.sizes.map(sizeArr => ({
-          w: sizeArr[0],
-          h: sizeArr[1]
-        }))
-      },
-      ext: {
-        bidphysics: {
-          unitId: bidRequest.params.unitId
-        }
-      }
-    }));
-
-    const openrtbRequest = {
-      id: bidderRequest.auctionId,
-      imp: impressions,
-      site: {
-        domain: window.location.hostname,
-        page: window.location.href,
-        ref: bidderRequest.refererInfo ? bidderRequest.refererInfo.referer || null : null
-      },
-      ext: {
-        bidphysics: {
-          publisherId: publisherId,
-          networkId: networkId,
-        }
-      }
-    };
-
-    // apply gdpr
-    if (bidderRequest.gdprConsent) {
-      openrtbRequest.regs = {ext: {gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0}};
-      openrtbRequest.user = {ext: {consent: bidderRequest.gdprConsent.consentString}};
-    }
-
-    const payloadString = JSON.stringify(openrtbRequest);
-    return {
-      method: 'POST',
-      url: ENDPOINT_URL,
-      data: payloadString,
-    };
-  },
-
-  interpretResponse: function (serverResponse, request) {
-    const bidResponses = [];
-    const response = (serverResponse || {}).body;
-    // response is always one seat (bidphysics) with (optional) bids for each impression
-    if (response && response.seatbid && response.seatbid.length === 1 && response.seatbid[0].bid && response.seatbid[0].bid.length) {
-      response.seatbid[0].bid.forEach(bid => {
-        bidResponses.push({
-          requestId: bid.impid,
-          cpm: bid.price,
-          width: bid.w,
-          height: bid.h,
-          ad: bid.adm,
-          ttl: DEFAULT_BID_TTL,
-          creativeId: bid.crid,
-          netRevenue: DEFAULT_NET_REVENUE,
-          currency: DEFAULT_CURRENCY,
-        })
-      })
-    } else {
-      utils.logInfo('bidphysics.interpretResponse :: no valid responses to interpret');
-    }
-    return bidResponses;
-  },
-  getUserSyncs: function (syncOptions, serverResponses) {
-    utils.logInfo('bidphysics.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses);
-    let syncs = [];
-
-    if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
-      return syncs;
-    }
-
-    serverResponses.forEach(resp => {
-      const userSync = utils.deepAccess(resp, 'body.ext.usersync');
-      if (userSync) {
-        let syncDetails = [];
-        Object.keys(userSync).forEach(key => {
-          const value = userSync[key];
-          if (value.syncs && value.syncs.length) {
-            syncDetails = syncDetails.concat(value.syncs);
-          }
-        });
-        syncDetails.forEach(syncDetails => {
-          syncs.push({
-            type: syncDetails.type === 'iframe' ? 'iframe' : 'image',
-            url: syncDetails.url
-          });
-        });
-
-        if (!syncOptions.iframeEnabled) {
-          syncs = syncs.filter(s => s.type !== 'iframe')
-        }
-        if (!syncOptions.pixelEnabled) {
-          syncs = syncs.filter(s => s.type !== 'image')
-        }
-      }
-    });
-    utils.logInfo('bidphysics.getUserSyncs result=%o', syncs);
-    return syncs;
-  },
-
-};
-registerBidder(spec);
diff --git a/modules/bidphysicsBidAdapter.md b/modules/bidphysicsBidAdapter.md
deleted file mode 100644
index d7d8b355027..00000000000
--- a/modules/bidphysicsBidAdapter.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Overview
-
-```
-Module Name:  BidPhysics Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer:   info@bidphysics.com
-```
-
-# Description
-
-Connects to BidPhysics exchange for bids.
-
-BidPhysics bid adapter supports Banner ads.
-
-# Test Parameters
-```
-var adUnits = [
-    {
-        code: 'banner-ad-div',
-        mediaTypes: {
-            banner: {
-                sizes: [[300, 250], [300,600]]
-            }
-        },
-        bids: [{
-            bidder: 'bidphysics',
-            params: {
-                unitId: 'bidphysics-test'
-            }
-        }]
-    }
-];
-```
diff --git a/modules/bidscubeBidAdapter.js b/modules/bidscubeBidAdapter.js
new file mode 100644
index 00000000000..6cdbba61c75
--- /dev/null
+++ b/modules/bidscubeBidAdapter.js
@@ -0,0 +1,94 @@
+import { logMessage, getWindowLocation } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'bidscube'
+const URL = 'https://supply.bidscube.com/?c=o&m=multi'
+const URL_SYNC = 'https://supply.bidscube.com/?c=o&m=cookie'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: function (opts) {
+    return Boolean(opts.bidId && opts.params && !isNaN(parseInt(opts.params.placementId)))
+  },
+
+  buildRequests: function (validBidRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    validBidRequests = validBidRequests || []
+    let winTop = window
+    try {
+      window.top.location.toString()
+      winTop = window.top
+    } catch (e) { logMessage(e) }
+
+    const location = getWindowLocation()
+    const placements = []
+
+    for (let i = 0; i < validBidRequests.length; i++) {
+      const p = validBidRequests[i]
+
+      placements.push({
+        placementId: p.params.placementId,
+        bidId: p.bidId,
+        traffic: p.params.traffic || BANNER,
+        allParams: JSON.stringify(p)
+      })
+    }
+
+    return {
+      method: 'POST',
+      url: URL,
+      data: {
+        deviceWidth: winTop.screen.width,
+        deviceHeight: winTop.screen.height,
+        language: (navigator && navigator.language) ? navigator.language : '',
+        secure: +(location.protocol === 'https:'),
+        host: location.hostname,
+        page: location.pathname,
+        placements: placements
+      }
+    }
+  },
+
+  interpretResponse: function (opts) {
+    const body = opts.body
+    const response = []
+
+    for (let i = 0; i < body.length; i++) {
+      const item = body[i]
+      if (isBidResponseValid(item)) {
+        response.push(item)
+      }
+    }
+
+    return response
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses) {
+    return [{ type: 'image', url: URL_SYNC }]
+  }
+}
+
+registerBidder(spec)
+
+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.title && bid.image && bid.impressionTrackers)
+    default:
+      return false
+  }
+}
diff --git a/modules/bidscubeBidAdapter.md b/modules/bidscubeBidAdapter.md
new file mode 100644
index 00000000000..5f3972726ec
--- /dev/null
+++ b/modules/bidscubeBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name: BidsCube Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: publishers@bidscube.com
+```
+
+# Description
+
+Module that connects to BidsCube' demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: 'placementId_0',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'bidscube',
+            params: {
+                placementId: 0,
+                traffic: 'banner'
+            }
+        }]
+    }];
+```
diff --git a/modules/bidwatchAnalyticsAdapter.js b/modules/bidwatchAnalyticsAdapter.js
new file mode 100644
index 00000000000..0908b02de2e
--- /dev/null
+++ b/modules/bidwatchAnalyticsAdapter.js
@@ -0,0 +1,210 @@
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
+import { ajax } from '../src/ajax.js';
+
+const analyticsType = 'endpoint';
+const url = 'URL_TO_SERVER_ENDPOINT';
+
+const {
+  EVENTS: {
+    AUCTION_END,
+    BID_WON,
+    BID_RESPONSE,
+    BID_REQUESTED,
+    BID_TIMEOUT,
+  }
+} = CONSTANTS;
+
+let saveEvents = {}
+let allEvents = {}
+let auctionEnd = {}
+let initOptions = {}
+let endpoint = 'https://default'
+let requestsAttributes = ['adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'params', 'userId', 'labelAny', 'bids', 'adId'];
+
+function getAdapterNameForAlias(aliasName) {
+  return adapterManager.aliasRegistry[aliasName] || aliasName;
+}
+
+function filterAttributes(arg, removead) {
+  let response = {};
+  if (typeof arg == 'object') {
+    if (typeof arg['bidderCode'] == 'string') {
+      response['originalBidder'] = getAdapterNameForAlias(arg['bidderCode']);
+    } else if (typeof arg['bidder'] == 'string') {
+      response['originalBidder'] = getAdapterNameForAlias(arg['bidder']);
+    }
+    if (!removead && typeof arg['ad'] != 'undefined') {
+      response['ad'] = arg['ad'];
+    }
+    if (typeof arg['gdprConsent'] != 'undefined') {
+      response['gdprConsent'] = {};
+      if (typeof arg['gdprConsent']['consentString'] != 'undefined') { response['gdprConsent']['consentString'] = arg['gdprConsent']['consentString']; }
+    }
+    if (typeof arg['meta'] == 'object' && typeof arg['meta']['advertiserDomains'] != 'undefined') {
+      response['meta'] = {'advertiserDomains': arg['meta']['advertiserDomains']};
+    }
+    requestsAttributes.forEach((attr) => {
+      if (typeof arg[attr] != 'undefined') { response[attr] = arg[attr]; }
+    });
+    if (typeof response['creativeId'] == 'number') { response['creativeId'] = response['creativeId'].toString(); }
+  }
+  return response;
+}
+
+function cleanAuctionEnd(args) {
+  let response = {};
+  let filteredObj;
+  let objects = ['bidderRequests', 'bidsReceived', 'noBids', 'adUnits'];
+  objects.forEach((attr) => {
+    if (Array.isArray(args[attr])) {
+      response[attr] = [];
+      args[attr].forEach((obj) => {
+        filteredObj = filterAttributes(obj, true);
+        if (typeof obj['bids'] == 'object') {
+          filteredObj['bids'] = [];
+          obj['bids'].forEach((bid) => {
+            filteredObj['bids'].push(filterAttributes(bid, true));
+          });
+        }
+        response[attr].push(filteredObj);
+      });
+    }
+  });
+  return response;
+}
+
+function cleanCreatives(args) {
+  return filterAttributes(args, false);
+}
+
+function enhanceMediaType(arg) {
+  saveEvents['bidRequested'].forEach((bidRequested) => {
+    if (bidRequested['auctionId'] == arg['auctionId'] && Array.isArray(bidRequested['bids'])) {
+      bidRequested['bids'].forEach((bid) => {
+        if (bid['transactionId'] == arg['transactionId'] && bid['bidId'] == arg['requestId']) { arg['mediaTypes'] = bid['mediaTypes']; }
+      });
+    }
+  });
+  return arg;
+}
+
+function addBidResponse(args) {
+  let eventType = BID_RESPONSE;
+  let argsCleaned = cleanCreatives(JSON.parse(JSON.stringify(args))); ;
+  if (allEvents[eventType] == undefined) { allEvents[eventType] = [] }
+  allEvents[eventType].push(argsCleaned);
+}
+
+function addBidRequested(args) {
+  let eventType = BID_REQUESTED;
+  let argsCleaned = filterAttributes(args, true);
+  if (saveEvents[eventType] == undefined) { saveEvents[eventType] = [] }
+  saveEvents[eventType].push(argsCleaned);
+}
+
+function addTimeout(args) {
+  let eventType = BID_TIMEOUT;
+  if (saveEvents[eventType] == undefined) { saveEvents[eventType] = [] }
+  saveEvents[eventType].push(args);
+  let argsCleaned = [];
+  let argsDereferenced = JSON.parse(JSON.stringify(args));
+  argsDereferenced.forEach((attr) => {
+    argsCleaned.push(filterAttributes(JSON.parse(JSON.stringify(attr)), false));
+  });
+  if (auctionEnd[eventType] == undefined) { auctionEnd[eventType] = [] }
+  auctionEnd[eventType].push(argsCleaned);
+}
+
+function addAuctionEnd(args) {
+  let eventType = AUCTION_END;
+  if (saveEvents[eventType] == undefined) { saveEvents[eventType] = [] }
+  saveEvents[eventType].push(args);
+  let argsCleaned = cleanAuctionEnd(JSON.parse(JSON.stringify(args)));
+  if (auctionEnd[eventType] == undefined) { auctionEnd[eventType] = [] }
+  auctionEnd[eventType].push(argsCleaned);
+}
+
+function handleBidWon(args) {
+  args = enhanceMediaType(filterAttributes(JSON.parse(JSON.stringify(args)), true));
+  let increment = args['cpm'];
+  if (typeof saveEvents['auctionEnd'] == 'object') {
+    saveEvents['auctionEnd'].forEach((auction) => {
+      if (auction['auctionId'] == args['auctionId'] && typeof auction['bidsReceived'] == 'object') {
+        auction['bidsReceived'].forEach((bid) => {
+          if (bid['transactionId'] == args['transactionId'] && bid['adId'] != args['adId']) {
+            if (args['cpm'] < bid['cpm']) {
+              increment = 0;
+            } else if (increment > args['cpm'] - bid['cpm']) {
+              increment = args['cpm'] - bid['cpm'];
+            }
+          }
+        });
+      }
+    });
+  }
+  args['cpmIncrement'] = increment;
+  if (typeof saveEvents.bidRequested == 'object' && saveEvents.bidRequested.length > 0 && saveEvents.bidRequested[0].gdprConsent) { args.gdpr = saveEvents.bidRequested[0].gdprConsent; }
+  ajax(endpoint + '.bidwatch.io/analytics/bid_won', null, JSON.stringify(args), {method: 'POST', withCredentials: true});
+}
+
+function handleAuctionEnd() {
+  ajax(endpoint + '.bidwatch.io/analytics/auctions', function (data) {
+    let list = JSON.parse(data);
+    if (Array.isArray(list) && typeof allEvents['bidResponse'] != 'undefined') {
+      let alreadyCalled = [];
+      allEvents['bidResponse'].forEach((bidResponse) => {
+        let tmpId = bidResponse['originalBidder'] + '_' + bidResponse['creativeId'];
+        if (list.includes(tmpId) && !alreadyCalled.includes(tmpId)) {
+          alreadyCalled.push(tmpId);
+          ajax(endpoint + '.bidwatch.io/analytics/creatives', null, JSON.stringify(bidResponse), {method: 'POST', withCredentials: true});
+        }
+      });
+    }
+    allEvents = {};
+  }, JSON.stringify(auctionEnd), {method: 'POST', withCredentials: true});
+  auctionEnd = {};
+}
+
+let bidwatchAnalytics = Object.assign(adapter({url, analyticsType}), {
+  track({
+    eventType,
+    args
+  }) {
+    switch (eventType) {
+      case AUCTION_END:
+        addAuctionEnd(args);
+        handleAuctionEnd();
+        break;
+      case BID_WON:
+        handleBidWon(args);
+        break;
+      case BID_RESPONSE:
+        addBidResponse(args);
+        break;
+      case BID_REQUESTED:
+        addBidRequested(args);
+        break;
+      case BID_TIMEOUT:
+        addTimeout(args);
+        break;
+    }
+  }});
+
+// save the base class function
+bidwatchAnalytics.originEnableAnalytics = bidwatchAnalytics.enableAnalytics;
+
+// override enableAnalytics so we can get access to the config passed in from the page
+bidwatchAnalytics.enableAnalytics = function (config) {
+  bidwatchAnalytics.originEnableAnalytics(config); // call the base class function
+  initOptions = config.options;
+  if (initOptions.domain) { endpoint = 'https://' + initOptions.domain; }
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: bidwatchAnalytics,
+  code: 'bidwatch'
+});
+
+export default bidwatchAnalytics;
diff --git a/modules/bidwatchAnalyticsAdapter.md b/modules/bidwatchAnalyticsAdapter.md
new file mode 100644
index 00000000000..bfa453640b8
--- /dev/null
+++ b/modules/bidwatchAnalyticsAdapter.md
@@ -0,0 +1,21 @@
+# Overview
+Module Name: bidwatch Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: tech@bidwatch.io
+
+# Description
+
+Analytics adapter for bidwatch.io.
+
+# Test Parameters
+
+```
+{
+  provider: 'bidwatch',
+    options : {
+          domain: 'test.endpoint'
+    }
+}
+```
diff --git a/modules/big-richmediaBidAdapter.js b/modules/big-richmediaBidAdapter.js
new file mode 100644
index 00000000000..8a03aac1ace
--- /dev/null
+++ b/modules/big-richmediaBidAdapter.js
@@ -0,0 +1,125 @@
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {spec as baseAdapter} from './appnexusBidAdapter.js'; // eslint-disable-line prebid/validate-imports
+
+const BIDDER_CODE = 'big-richmedia';
+
+const metadataByRequestId = {};
+
+export const spec = {
+  version: '1.5.1',
+  code: BIDDER_CODE,
+  gvlid: baseAdapter.GVLID, // use base adapter gvlid
+  supportedMediaTypes: [ BANNER, VIDEO ],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    if (!baseAdapter.isBidRequestValid) { return true; }
+    return baseAdapter.isBidRequestValid(bid);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (bidRequests, bidderRequest) {
+    if (!baseAdapter.buildRequests) { return []; }
+
+    const publisherId = config.getConfig('bigRichmedia.publisherId');
+    if (typeof publisherId !== 'string') { return []; }
+
+    bidRequests.forEach(bidRequest => {
+      if (bidRequest.params.format === 'skin' && bidRequest.mediaTypes.banner) {
+        bidRequest.mediaTypes.banner.sizes.push([1800, 1000]);
+      }
+      metadataByRequestId[bidRequest.bidId] = { placementId: bidRequest.adUnitCode, bidder: bidRequest.bidder };
+    });
+    return baseAdapter.buildRequests(bidRequests, bidderRequest);
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, params) {
+    const publisherId = config.getConfig('bigRichmedia.publisherId');
+    if (typeof publisherId !== 'string') { return []; }
+
+    const bids = baseAdapter.interpretResponse(serverResponse, params);
+    bids.forEach(bid => {
+      const { placementId, bidder } = metadataByRequestId[bid.requestId] || {};
+      const { width = 1, height = 1, ad, creativeId = '', cpm, vastXml, vastUrl } = bid;
+      const bidRequest = params.bidderRequest.bids.find(({ bidId }) => bidId === bid.requestId);
+      const format = (bidRequest && bidRequest.params && bidRequest.params.format) || 'video-sticky-footer';
+      const isReplayable = bidRequest && bidRequest.params && bidRequest.params.isReplayable;
+      const customSelector = bidRequest && bidRequest.params && bidRequest.params.customSelector;
+      const renderParams = {
+        adm: ad,
+        vastXml,
+        vastUrl,
+        width,
+        height,
+        placementId,
+        bidId: bid.requestId,
+        creativeId: `${creativeId}`,
+        bidder,
+        cpm,
+        format,
+        customSelector,
+        isReplayable
+      };
+
+      // This is a workaround needed for the rendering step (so that the adserver iframe does not get resized to 1800x1000
+      // when there is skin demand
+      if (format === 'skin') {
+        bid.width = 1
+        bid.height = 1
+      }
+
+      const encoded = window.btoa(JSON.stringify(renderParams));
+      bid.ad = `<script src="//cdn.hubvisor.io/wrapper/${publisherId}/richmedia-renderer.js" async="true"></script>
+      <script>var hbvrm = hbvrm || {}; hbvrm.cmd = hbvrm.cmd || []; hbvrm.cmd.push(function() { hbvrm.render('${encoded}'); });</script>`;
+
+      if (bid.mediaType !== 'banner') { // in case this is a video
+        bid.mediaType = 'banner';
+        delete bid.renderer;
+        delete bid.vastUrl;
+        delete bid.vastXml;
+        bid.width = 1;
+        bid.height = 1;
+      }
+    });
+    return bids;
+  },
+
+  getUserSyncs: function (syncOptions, responses, gdprConsent) {
+    if (!baseAdapter.getUserSyncs) { return []; }
+    return baseAdapter.getUserSyncs(syncOptions, responses, gdprConsent);
+  },
+
+  transformBidParams: function (params, isOpenRtb) {
+    if (!baseAdapter.transformBidParams) { return params; }
+    return baseAdapter.transformBidParams(params, isOpenRtb);
+  },
+
+  /**
+   * Add element selector to javascript tracker to improve native viewability
+   * @param {Bid} bid
+   */
+  onBidWon: function (bid) {
+    if (!baseAdapter.onBidWon) { return; }
+    baseAdapter.onBidWon(bid);
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/big-richmediaBidAdapter.md b/modules/big-richmediaBidAdapter.md
new file mode 100644
index 00000000000..26f77e527fb
--- /dev/null
+++ b/modules/big-richmediaBidAdapter.md
@@ -0,0 +1,82 @@
+# Overview
+
+```
+Module Name: BI.Garage Rich Media
+Module Type: Bidder Adapter
+Maintainer: mediaconsortium-develop@bi.garage.co.jp
+```
+
+# Description
+
+Module which renders richmedia demand from a Xandr seat
+
+### Global configuration
+
+```javascript
+pbjs.setConfig({
+  debug: false,
+  // …,
+  bigRichmedia: {
+    publisherId: 'A7FN99NZ98F5ZD4G', // Required
+  },
+});
+```
+
+# AdUnit Configuration
+```javascript
+var adUnits = [
+   // Skin adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'big-richmedia',
+         params: {
+           placementId: 12345,
+           format: 'skin' // This will automatically add 1800x1000 size to banner mediaType
+         }
+       }]
+   },
+   // Video outstream adUnit
+   {
+     code: 'video-outstream',
+     sizes: [[300, 250]],
+     mediaTypes: {
+       video: {
+         playerSize: [[300, 250]],
+         context: 'outstream',
+         // Certain ORTB 2.5 video values can be read from the mediatypes object; below are examples of supported params.
+         // To note - appnexus supports additional values for our system that are not part of the ORTB spec.  If you want
+         // to use these values, they will have to be declared in the bids[].params.video object instead using the appnexus syntax.
+         // Between the corresponding values of the mediaTypes.video and params.video objects, the properties in params.video will 
+         // take precedence if declared; eg in the example below, the `skippable: true` setting will be used instead of the `skip: 0`.
+         minduration: 1,
+         maxduration: 60,
+         skip: 0,   // 1 - true, 0 - false
+         skipafter: 5,
+         playbackmethod: [2], // note - we only support options 1-4 at this time
+         api: [1,2,3]   // note - option 6 is not supported at this time
+       }
+     },
+     bids: [
+       {
+         bidder: 'big-richmedia',
+         params: {
+           placementId: 12345,
+           video: {
+             skippable: true,
+             playback_method: 'auto_play_sound_off'
+           },
+           format: 'video-sticky-footer', // or 'video-sticky-top'
+           isReplayable: true // Default to false - choose if the video should be replayable or not. 
+           customSelector: '#nav-bar' // custom selector for navbar
+         }
+       }
+     ]
+   }
+];
+```
diff --git a/modules/bizzclickBidAdapter.js b/modules/bizzclickBidAdapter.js
new file mode 100644
index 00000000000..4ef2b6dd9f8
--- /dev/null
+++ b/modules/bizzclickBidAdapter.js
@@ -0,0 +1,319 @@
+import { logMessage, getDNT, deepSetValue, deepAccess, _map, logWarn } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+const BIDDER_CODE = 'bizzclick';
+const ACCOUNTID_MACROS = '[account_id]';
+const URL_ENDPOINT = `https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=${ACCOUNTID_MACROS}`;
+const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
+const NATIVE_PARAMS = {
+  title: {
+    id: 0,
+    name: 'title'
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img'
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1
+  },
+  body: {
+    id: 4,
+    name: 'data',
+    type: 2
+  },
+  cta: {
+    id: 1,
+    type: 12,
+    name: 'data'
+  }
+};
+const NATIVE_VERSION = '1.2';
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.params.accountId) && Boolean(bid.params.placementId)
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    if (validBidRequests && validBidRequests.length === 0) return []
+    let accuontId = validBidRequests[0].params.accountId;
+    const endpointURL = URL_ENDPOINT.replace(ACCOUNTID_MACROS, accuontId);
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.page)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      logMessage(e);
+    };
+    let bids = [];
+    for (let bidRequest of validBidRequests) {
+      let impObject = prepareImpObject(bidRequest);
+      let data = {
+        id: bidRequest.bidId,
+        test: config.getConfig('debug') ? 1 : 0,
+        at: 1,
+        cur: ['USD'],
+        device: {
+          w: winTop.screen.width,
+          h: winTop.screen.height,
+          dnt: getDNT() ? 1 : 0,
+          language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
+        },
+        site: {
+          page: location.pathname,
+          host: location.host
+        },
+        source: {
+          tid: bidRequest.transactionId,
+          ext: {
+            schain: {}
+          }
+        },
+        regs: {
+          coppa: config.getConfig('coppa') === true ? 1 : 0,
+          ext: {}
+        },
+        user: {
+          ext: {}
+        },
+        ext: {
+          ts: Date.now()
+        },
+        tmax: bidRequest.timeout,
+        imp: [impObject],
+      };
+
+      let connection = navigator.connection || navigator.webkitConnection;
+      if (connection && connection.effectiveType) {
+        data.device.connectiontype = connection.effectiveType;
+      }
+      if (bidRequest) {
+        if (bidRequest.schain) {
+          deepSetValue(data, 'source.ext.schain', bidRequest.schain);
+        }
+
+        if (bidRequest.gdprConsent && bidRequest.gdprConsent.gdprApplies) {
+          deepSetValue(data, 'regs.ext.gdpr', bidRequest.gdprConsent.gdprApplies ? 1 : 0);
+          deepSetValue(data, 'user.ext.consent', bidRequest.gdprConsent.consentString);
+        }
+
+        if (bidRequest.uspConsent !== undefined) {
+          deepSetValue(data, 'regs.ext.us_privacy', bidRequest.uspConsent);
+        }
+      }
+      bids.push(data)
+    }
+    return {
+      method: 'POST',
+      url: endpointURL,
+      data: bids
+    };
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (serverResponse) => {
+    if (!serverResponse || !serverResponse.body) return []
+    let bizzclickResponse = serverResponse.body;
+    let bids = [];
+    for (let response of bizzclickResponse) {
+      let mediaType = response.seatbid[0].bid[0].ext && response.seatbid[0].bid[0].ext.mediaType ? response.seatbid[0].bid[0].ext.mediaType : BANNER;
+      let bid = {
+        requestId: response.id,
+        cpm: response.seatbid[0].bid[0].price,
+        width: response.seatbid[0].bid[0].w,
+        height: response.seatbid[0].bid[0].h,
+        ttl: response.ttl || 1200,
+        currency: response.cur || 'USD',
+        netRevenue: true,
+        creativeId: response.seatbid[0].bid[0].crid,
+        dealId: response.seatbid[0].bid[0].dealid,
+        mediaType: mediaType
+      };
+
+      bid.meta = {};
+      if (response.seatbid[0].bid[0].adomain && response.seatbid[0].bid[0].adomain.length > 0) {
+        bid.meta.advertiserDomains = response.seatbid[0].bid[0].adomain;
+      }
+
+      switch (mediaType) {
+        case VIDEO:
+          bid.vastXml = response.seatbid[0].bid[0].adm
+          bid.vastUrl = response.seatbid[0].bid[0].ext.vastUrl
+          break
+        case NATIVE:
+          bid.native = parseNative(response.seatbid[0].bid[0].adm)
+          break
+        default:
+          bid.ad = response.seatbid[0].bid[0].adm
+      }
+      bids.push(bid);
+    }
+    return bids;
+  },
+};
+/**
+ * Determine type of request
+ *
+ * @param bidRequest
+ * @param type
+ * @returns {boolean}
+ */
+const checkRequestType = (bidRequest, type) => {
+  return (typeof deepAccess(bidRequest, `mediaTypes.${type}`) !== 'undefined');
+}
+const parseNative = admObject => {
+  const { assets, link, imptrackers, jstracker } = admObject.native;
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined,
+    impressionTrackers: imptrackers || undefined,
+    javascriptTrackers: jstracker ? [ jstracker ] : undefined
+  };
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+  return result;
+}
+const prepareImpObject = (bidRequest) => {
+  let impObject = {
+    id: bidRequest.transactionId,
+    secure: 1,
+    ext: {
+      placementId: bidRequest.params.placementId
+    }
+  };
+  if (checkRequestType(bidRequest, BANNER)) {
+    impObject.banner = addBannerParameters(bidRequest);
+  }
+  if (checkRequestType(bidRequest, VIDEO)) {
+    impObject.video = addVideoParameters(bidRequest);
+  }
+  if (checkRequestType(bidRequest, NATIVE)) {
+    impObject.native = {
+      ver: NATIVE_VERSION,
+      request: addNativeParameters(bidRequest)
+    };
+  }
+  return impObject
+};
+const addNativeParameters = bidRequest => {
+  let impObject = {
+    id: bidRequest.transactionId,
+    ver: NATIVE_VERSION,
+  };
+  const assets = _map(bidRequest.mediaTypes.native, (bidParams, key) => {
+    const props = NATIVE_PARAMS[key];
+    const asset = {
+      required: bidParams.required & 1,
+    };
+    if (props) {
+      asset.id = props.id;
+      let wmin, hmin;
+      let aRatios = bidParams.aspect_ratios;
+      if (aRatios && aRatios[0]) {
+        aRatios = aRatios[0];
+        wmin = aRatios.min_width || 0;
+        hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+      }
+      if (bidParams.sizes) {
+        const sizes = flatten(bidParams.sizes);
+        wmin = sizes[0];
+        hmin = sizes[1];
+      }
+      asset[props.name] = {};
+      if (bidParams.len) asset[props.name]['len'] = bidParams.len;
+      if (props.type) asset[props.name]['type'] = props.type;
+      if (wmin) asset[props.name]['wmin'] = wmin;
+      if (hmin) asset[props.name]['hmin'] = hmin;
+      return asset;
+    }
+  }).filter(Boolean);
+  impObject.assets = assets;
+  return impObject
+}
+const addBannerParameters = (bidRequest) => {
+  let bannerObject = {};
+  const size = parseSizes(bidRequest, 'banner');
+  bannerObject.w = size[0];
+  bannerObject.h = size[1];
+  return bannerObject;
+};
+const parseSizes = (bid, mediaType) => {
+  let mediaTypes = bid.mediaTypes;
+  if (mediaType === 'video') {
+    let size = [];
+    if (mediaTypes.video && mediaTypes.video.w && mediaTypes.video.h) {
+      size = [
+        mediaTypes.video.w,
+        mediaTypes.video.h
+      ];
+    } else if (Array.isArray(deepAccess(bid, 'mediaTypes.video.playerSize')) && bid.mediaTypes.video.playerSize.length === 1) {
+      size = bid.mediaTypes.video.playerSize[0];
+    } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0 && Array.isArray(bid.sizes[0]) && bid.sizes[0].length > 1) {
+      size = bid.sizes[0];
+    }
+    return size;
+  }
+  let sizes = [];
+  if (Array.isArray(mediaTypes.banner.sizes)) {
+    sizes = mediaTypes.banner.sizes[0];
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizes = bid.sizes
+  } else {
+    logWarn('no sizes are setup or found');
+  }
+  return sizes
+}
+const addVideoParameters = (bidRequest) => {
+  let videoObj = {};
+  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity']
+  for (let param of supportParamsList) {
+    if (bidRequest.mediaTypes.video[param] !== undefined) {
+      videoObj[param] = bidRequest.mediaTypes.video[param];
+    }
+  }
+  const size = parseSizes(bidRequest, 'video');
+  videoObj.w = size[0];
+  videoObj.h = size[1];
+  return videoObj;
+}
+const flatten = arr => {
+  return [].concat(...arr);
+}
+registerBidder(spec);
diff --git a/modules/bizzclickBidAdapter.md b/modules/bizzclickBidAdapter.md
index 7dfa458b34c..6fc1bebf546 100644
--- a/modules/bizzclickBidAdapter.md
+++ b/modules/bizzclickBidAdapter.md
@@ -14,14 +14,91 @@ Module that connects to BizzClick SSP demand sources
 ```
     var adUnits = [{
                 code: 'placementId',
-                sizes: [[300, 250]],
+                      mediaTypes: {
+                          banner: {
+                              sizes: [[300, 250], [300,600]]
+                              }
+                              },
                 bids: [{
                         bidder: 'bizzclick',
                         params: {
-                            placementId: 0,
-                            type: 'banner'
+                            placementId: 'hash',
+                            accountId: 'accountId'
                         }
                     }]
+                },
+                {
+                    code: 'native_example',
+                    // sizes: [[1, 1]],
+                    mediaTypes: {
+                      native: {
+                        title: {
+                          required: true,
+                          len: 800
+                        },
+                        image: {
+                          required: true,
+                            len: 80
+                        },
+                        sponsoredBy: {
+                            required: true
+                        },
+                        clickUrl: {
+                            required: true
+                        },
+                        privacyLink: {
+                            required: false
+                        },
+                        body: {
+                            required: true
+                        },
+                        icon: {
+                            required: true,
+                            sizes: [50, 50]
+                        }
+                    }
+
+                    },
+                    bids: [    {
+                            bidder: 'bizzclick',
+                            params: {
+                                  placementId: 'hash',
+                            accountId: 'accountId'
+                            }
+                        }]
+            }, 
+            {
+    code: 'video1',
+    sizes: [640,480],
+    mediaTypes: { video: {
+      minduration:0,
+                maxduration:999,
+                boxingallowed:1,
+                skip:0,
+                mimes:[
+                    'application/javascript',
+                    'video/mp4'
+                ],
+                w:1920,
+                h:1080,
+                protocols:[
+                    2
+                ],
+                linearity:1,
+                api:[
+                    1,
+                    2
+                ]
+    } },
+    bids: [
+    {
+                bidder: 'bizzclick',
+                params: {
+                      placementId: 'hash',
+                            accountId: 'accountId'
                 }
+            }
+    ]
+  }
             ];
 ```
\ No newline at end of file
diff --git a/modules/bliinkBidAdapter.js b/modules/bliinkBidAdapter.js
new file mode 100644
index 00000000000..127b534c989
--- /dev/null
+++ b/modules/bliinkBidAdapter.js
@@ -0,0 +1,264 @@
+// eslint-disable-next-line prebid/validate-imports
+// eslint-disable-next-line prebid/validate-imports
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { config } from '../src/config.js'
+import {_each, deepAccess, deepSetValue} from '../src/utils.js'
+export const BIDDER_CODE = 'bliink'
+export const BLIINK_ENDPOINT_ENGINE = 'https://engine.bliink.io/prebid'
+
+export const BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME = 'https://tag.bliink.io/usersync.html'
+export const META_KEYWORDS = 'keywords'
+export const META_DESCRIPTION = 'description'
+
+const VIDEO = 'video'
+const BANNER = 'banner'
+
+const supportedMediaTypes = [BANNER, VIDEO]
+const aliasBidderCode = ['bk']
+
+/**
+ * @description get coppa value from config
+ */
+function getCoppa() {
+  return config.getConfig('coppa') === true ? 1 : 0;
+}
+
+export function getMetaList(name) {
+  if (!name || name.length === 0) return []
+
+  return [
+    {
+      key: 'name',
+      value: name,
+    },
+    {
+      key: 'name*',
+      value: name,
+    },
+    {
+      key: 'itemprop*',
+      value: name,
+    },
+    {
+      key: 'property',
+      value: `'og:${name}'`,
+    },
+    {
+      key: 'property',
+      value: `'twitter:${name}'`,
+    },
+    {
+      key: 'property',
+      value: `'article:${name}'`,
+    },
+  ]
+}
+
+export function getOneMetaValue(query) {
+  const metaEl = document.querySelector(query)
+
+  if (metaEl && metaEl.content) {
+    return metaEl.content
+  }
+
+  return null;
+}
+
+export function getMetaValue(name) {
+  const metaList = getMetaList(name)
+  for (let i = 0; i < metaList.length; i++) {
+    const meta = metaList[i];
+    const metaValue = getOneMetaValue(`meta[${meta.key}=${meta.value}]`);
+    if (metaValue) {
+      return metaValue
+    }
+  }
+  return ''
+}
+
+export function getKeywords() {
+  const metaKeywords = getMetaValue(META_KEYWORDS)
+  if (metaKeywords) {
+    const keywords = [
+      ...metaKeywords.split(','),
+    ]
+
+    if (keywords && keywords.length > 0) {
+      return keywords.filter((value) => value).map((value) => value.trim());
+    }
+  }
+
+  return [];
+}
+
+/**
+ * @param bidRequest
+ * @return {({cpm, netRevenue: boolean, requestId, width: number, currency, ttl: number, creativeId, height: number}&{mediaType: string, vastXml})|null}
+ */
+export const buildBid = (bidResponse) => {
+  const mediaType = deepAccess(bidResponse, 'creative.media_type');
+  if (!mediaType) return null;
+
+  let bid;
+  switch (mediaType) {
+    case VIDEO:
+      const vastXml = deepAccess(bidResponse, 'creative.video.content');
+      bid = {
+        vastXml,
+        mediaType: 'video',
+        vastUrl: 'data:text/xml;charset=utf-8;base64,' + btoa(vastXml.replace(/\\"/g, '"'))
+      };
+      break;
+    case BANNER:
+      bid = {
+        ad: deepAccess(bidResponse, 'creative.banner.adm'),
+        mediaType: 'banner',
+      };
+      break;
+    default:
+      return null;
+  }
+  return Object.assign(bid, {
+    cpm: bidResponse.price,
+    currency: bidResponse.currency || 'EUR',
+    creativeId: deepAccess(bidResponse, 'extras.deal_id'),
+    requestId: deepAccess(bidResponse, 'extras.transaction_id'),
+    width: deepAccess(bidResponse, `creative.${bid.mediaType}.width`) || 1,
+    height: deepAccess(bidResponse, `creative.${bid.mediaType}.height`) || 1,
+    ttl: 3600,
+    netRevenue: true,
+  });
+};
+
+/**
+ * @description Verify the the AdUnits.bids, respond with true (valid) or false (invalid).
+ *
+ * @param bid
+ * @return boolean
+ */
+export const isBidRequestValid = (bid) => {
+  return !!deepAccess(bid, 'params.tagId');
+};
+
+/**
+ * @description Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
+ *
+ * @param validBidRequests
+ * @param bidderRequest
+ * @returns {null|{method: string, data: {gdprConsent: string, keywords: string, pageTitle: string, pageDescription: (*|string), pageUrl, gdpr: boolean, tags: *}, url: string}}
+ */
+export const buildRequests = (validBidRequests, bidderRequest) => {
+  if (!validBidRequests || !bidderRequest || !bidderRequest.bids) return null
+
+  const tags = bidderRequest.bids.map((bid) => {
+    return {
+      sizes: bid.sizes.map((size) => ({ w: size[0], h: size[1] })),
+      id: bid.params.tagId,
+      transactionId: bid.bidId,
+      mediaTypes: Object.keys(bid.mediaTypes),
+      imageUrl: deepAccess(bid, 'params.imageUrl', ''),
+    };
+  });
+
+  let request = {
+    tags,
+    pageTitle: document.title,
+    pageUrl: deepAccess(bidderRequest, 'refererInfo.page'),
+    pageDescription: getMetaValue(META_DESCRIPTION),
+    keywords: getKeywords().join(','),
+  };
+  const schain = deepAccess(validBidRequests[0], 'schain')
+  if (schain) {
+    request.schain = schain
+  }
+  const gdprConsent = deepAccess(bidderRequest, 'gdprConsent');
+  if (!!gdprConsent && gdprConsent.gdprApplies) {
+    request.gdpr = true
+    deepSetValue(request, 'gdprConsent', gdprConsent.consentString);
+  }
+  if (config.getConfig('coppa')) {
+    request.coppa = 1
+  }
+  if (bidderRequest.uspConsent) {
+    deepSetValue(request, 'uspConsent', bidderRequest.uspConsent);
+  }
+
+  return {
+    method: 'POST',
+    url: BLIINK_ENDPOINT_ENGINE,
+    data: request,
+  };
+};
+
+/**
+ * @description Parse the response (from buildRequests) and generate one or more bid objects.
+ *
+ * @param serverResponse
+ * @param request
+ * @return
+ */
+const interpretResponse = (serverResponse) => {
+  const bodyResponse = deepAccess(serverResponse, 'body.bids')
+  if (!serverResponse.body || !bodyResponse) return []
+  const bidResponses = [];
+  _each(bodyResponse, function (response) {
+    return bidResponses.push(buildBid(response));
+  });
+  return bidResponses.filter(bid => !!bid)
+};
+
+/**
+ * @description  If the publisher allows user-sync activity, the platform will call this function and the adapter may register pixels and/or iframe user syncs. For more information, see Registering User Syncs below
+ * @param syncOptions
+ * @param serverResponses
+ * @param gdprConsent
+ * @return {[{type: string, url: string}]|*[]}
+ */
+const getUserSyncs = (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+  let syncs = [];
+  if (syncOptions.pixelEnabled && serverResponses.length > 0) {
+    let gdprParams = ''
+    let uspConsentStr = ''
+    let apiVersion
+    let gdpr = false
+    if (gdprConsent) {
+      gdprParams = `&gdprConsent=${gdprConsent.consentString}`;
+      apiVersion = `&apiVersion=${gdprConsent.apiVersion}`
+      gdpr = Number(
+        gdprConsent.gdprApplies)
+    }
+    if (uspConsent) {
+      uspConsentStr = `&uspConsent=${uspConsent}`;
+    }
+    let sync;
+    if (syncOptions.iframeEnabled) {
+      sync = [
+        {
+          type: 'iframe',
+          url: `${BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME}?gdpr=${gdpr}&coppa=${getCoppa()}${uspConsentStr}${gdprParams}${apiVersion}`,
+        },
+      ];
+    } else {
+      sync = deepAccess(serverResponses[0], 'body.userSyncs');
+    }
+
+    return sync;
+  }
+
+  return syncs;
+};
+
+/**
+ * @type {{interpretResponse: interpretResponse, code: string, aliases: string[], getUserSyncs: getUserSyncs, buildRequests: buildRequests, onTimeout: onTimeout, onSetTargeting: onSetTargeting, isBidRequestValid: isBidRequestValid, onBidWon: onBidWon}}
+ */
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: aliasBidderCode,
+  supportedMediaTypes: supportedMediaTypes,
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
+};
+
+registerBidder(spec);
diff --git a/modules/bliinkBidAdapter.md b/modules/bliinkBidAdapter.md
new file mode 100644
index 00000000000..48b95a10ebb
--- /dev/null
+++ b/modules/bliinkBidAdapter.md
@@ -0,0 +1,91 @@
+# Overview
+
+```
+Module Name: BLIINK Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: samuel@bliink.io | ibrahima@bliink.io
+gdpr_supported: true
+tcf2_supported: true
+media_types: banner, video
+```
+
+# Description
+
+Module that connects to BLIINK demand sources to fetch bids.
+
+# Test Parameters
+
+## Sample Banner Ad Unit
+
+```js
+const adUnits = [
+  {
+    code: '/19968336/test',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    bids: [
+      {
+        bidder: 'bliink',
+        params: {
+          tagId: '41'
+        }
+      }
+    ]
+  }
+]
+```
+
+## Sample Instream Video Ad Unit
+
+```js
+const adUnits = [
+  {
+    code: '/19968336/prebid_cache_video_adunit',
+    sizes: [[640,480]],
+    mediaType: 'video',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [[640,480]],
+      }
+    },
+    bids: [
+      {
+        bidder: 'bliink',
+        params: {
+          tagId: '41',
+        }
+      }
+    ]
+  }
+]
+```
+
+## Sample outstream Video Ad Unit
+
+```js
+const adUnits = [
+  {
+    code: '/19968336/prebid_cache_video_adunit',
+    sizes: [[640,480]],
+    mediaType: 'video',
+    mediaTypes: {
+      video: {
+        context: 'outstream',
+        playerSize: [[640,480]],
+      }
+    },
+    bids: [
+      {
+        bidder: 'bliink',
+        params: {
+          tagId: '41',
+        }
+      }
+    ]
+  }
+]
+```
diff --git a/modules/bluebillywigBidAdapter.js b/modules/bluebillywigBidAdapter.js
index 4d40d931e1d..27e310177f6 100644
--- a/modules/bluebillywigBidAdapter.js
+++ b/modules/bluebillywigBidAdapter.js
@@ -1,13 +1,14 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { VIDEO } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-import { Renderer } from '../src/Renderer.js';
-import { createEidsArray } from './userId/eids.js';
+import {deepAccess, deepClone, deepSetValue, logError, logWarn} from '../src/utils.js';
+import {find} from '../src/polyfill.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {Renderer} from '../src/Renderer.js';
+import {createEidsArray} from './userId/eids.js';
 
 const DEV_MODE = window.location.search.match(/bbpbs_debug=true/);
 
-// Blue Billywig Constants
+// Blue Billywig  Constants
 const BB_CONSTANTS = {
   BIDDER_CODE: 'bluebillywig',
   AUCTION_URL: '$$URL_STARTpbs.bluebillywig.com/openrtb2/auction?pub=$$PUBLICATION',
@@ -17,17 +18,18 @@ const BB_CONSTANTS = {
   DEFAULT_TTL: 300,
   DEFAULT_WIDTH: 768,
   DEFAULT_HEIGHT: 432,
-  DEFAULT_NET_REVENUE: true
+  DEFAULT_NET_REVENUE: true,
+  VIDEO_PARAMS: ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin',
+    'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad',
+    'api', 'companiontype', 'ext']
 };
 
 // Aliasing
 const getConfig = config.getConfig;
 
 // Helper Functions
-export const BB_HELPERS = {
+const BB_HELPERS = {
   addSiteAppDevice: function(request, pageUrl) {
-    if (!request) return;
-
     if (typeof getConfig('app') === 'object') request.app = getConfig('app');
     else {
       request.site = {};
@@ -41,32 +43,22 @@ export const BB_HELPERS = {
     if (!request.device.h) request.device.h = window.innerHeight;
   },
   addSchain: function(request, validBidRequests) {
-    if (!request) return;
-
-    const schain = utils.deepAccess(validBidRequests, '0.schain');
+    const schain = deepAccess(validBidRequests, '0.schain');
     if (schain) request.source.ext = { schain: schain };
   },
   addCurrency: function(request) {
-    if (!request) return;
-
     const adServerCur = getConfig('currency.adServerCurrency');
     if (adServerCur && typeof adServerCur === 'string') request.cur = [adServerCur];
     else if (Array.isArray(adServerCur) && adServerCur.length) request.cur = [adServerCur[0]];
   },
   addUserIds: function(request, validBidRequests) {
-    if (!request) return;
-
-    const bidUserId = utils.deepAccess(validBidRequests, '0.userId');
+    const bidUserId = deepAccess(validBidRequests, '0.userId');
     const eids = createEidsArray(bidUserId);
 
     if (eids.length) {
-      utils.deepSetValue(request, 'user.ext.eids', eids);
+      deepSetValue(request, 'user.ext.eids', eids);
     }
   },
-  addDigiTrust: function(request, bidRequests) {
-    const digiTrust = BB_HELPERS.getDigiTrustParams(bidRequests && bidRequests[0]);
-    if (digiTrust) utils.deepSetValue(request, 'user.ext.digitrust', digiTrust);
-  },
   substituteUrl: function (url, publication, renderer) {
     return url.replace('$$URL_START', (DEV_MODE) ? 'https://dev.' : 'https://').replace('$$PUBLICATION', publication).replace('$$RENDERER', renderer);
   },
@@ -79,41 +71,60 @@ export const BB_HELPERS = {
   getRendererUrl: function(publication, renderer) {
     return BB_HELPERS.substituteUrl(BB_CONSTANTS.RENDERER_URL, publication, renderer);
   },
-  getDigiTrustParams: function(bidRequest) {
-    const digiTrustId = BB_HELPERS.getDigiTrustId(bidRequest);
+  transformVideoParams: function(videoParams, videoParamsExt) {
+    videoParams = deepClone(videoParams);
 
-    if (!digiTrustId || (digiTrustId.privacy && digiTrustId.privacy.optout)) return null;
-    return {
-      id: digiTrustId.id,
-      keyv: digiTrustId.keyv
-    }
-  },
-  getDigiTrustId: function(bidRequest) {
-    const bidRequestDigiTrust = utils.deepAccess(bidRequest, 'userId.digitrustid.data');
-    if (bidRequestDigiTrust) return bidRequestDigiTrust;
+    let playerSize = videoParams.playerSize || [BB_CONSTANTS.DEFAULT_WIDTH, BB_CONSTANTS.DEFAULT_HEIGHT];
+    if (Array.isArray(playerSize[0])) playerSize = playerSize[0];
+
+    videoParams.w = playerSize[0];
+    videoParams.h = playerSize[1];
+    videoParams.placement = 3;
 
-    const digiTrustUser = getConfig('digiTrustId');
-    return (digiTrustUser && digiTrustUser.success && digiTrustUser.identity) || null;
+    if (videoParamsExt) videoParams = Object.assign(videoParams, videoParamsExt);
+
+    const videoParamsProperties = Object.keys(videoParams);
+
+    videoParamsProperties.forEach(property => {
+      if (BB_CONSTANTS.VIDEO_PARAMS.indexOf(property) === -1) delete videoParams[property];
+    });
+
+    return videoParams;
   },
   transformRTBToPrebidProps: function(bid, serverResponse) {
-    bid.cpm = bid.price; delete bid.price;
-    bid.bidId = bid.impid;
-    bid.requestId = bid.impid; delete bid.impid;
-    bid.width = bid.w || BB_CONSTANTS.DEFAULT_WIDTH;
-    bid.height = bid.h || BB_CONSTANTS.DEFAULT_HEIGHT;
+    const bidObject = {
+      cpm: bid.price,
+      currency: serverResponse.cur,
+      netRevenue: BB_CONSTANTS.DEFAULT_NET_REVENUE,
+      bidId: bid.impid,
+      requestId: bid.impid,
+      creativeId: bid.crid,
+      mediaType: VIDEO,
+      width: bid.w || BB_CONSTANTS.DEFAULT_WIDTH,
+      height: bid.h || BB_CONSTANTS.DEFAULT_HEIGHT,
+      ttl: BB_CONSTANTS.DEFAULT_TTL
+    };
+
+    const extPrebidTargeting = deepAccess(bid, 'ext.prebid.targeting');
+    const extPrebidCache = deepAccess(bid, 'ext.prebid.cache');
+
+    if (extPrebidCache && typeof extPrebidCache.vastXml === 'object' && extPrebidCache.vastXml.cacheId && extPrebidCache.vastXml.url) {
+      bidObject.videoCacheKey = extPrebidCache.vastXml.cacheId;
+      bidObject.vastUrl = extPrebidCache.vastXml.url;
+    } else if (extPrebidTargeting && extPrebidTargeting.hb_uuid && extPrebidTargeting.hb_cache_host && extPrebidTargeting.hb_cache_path) {
+      bidObject.videoCacheKey = extPrebidTargeting.hb_uuid;
+      bidObject.vastUrl = `https://${extPrebidTargeting.hb_cache_host}${extPrebidTargeting.hb_cache_path}?uuid=${extPrebidTargeting.hb_uuid}`;
+    }
     if (bid.adm) {
-      bid.ad = bid.adm;
-      bid.vastXml = bid.adm;
-      delete bid.adm;
+      bidObject.ad = bid.adm;
+      bidObject.vastXml = bid.adm;
     }
-    if (bid.nurl && !bid.adm) { // ad markup is on win notice url, and adm is ommited according to OpenRTB 2.5
-      bid.vastUrl = bid.nurl;
-      delete bid.nurl;
+    if (!bidObject.vastUrl && bid.nurl && !bid.adm) { // ad markup is on win notice url, and adm is ommited according to OpenRTB 2.5
+      bidObject.vastUrl = bid.nurl;
     }
-    bid.netRevenue = BB_CONSTANTS.DEFAULT_NET_REVENUE;
-    bid.creativeId = bid.crid; delete bid.crid;
-    bid.currency = serverResponse.cur;
-    bid.ttl = BB_CONSTANTS.DEFAULT_TTL;
+    bidObject.meta = bid.meta || {};
+    if (bid.adomain) { bidObject.meta.advertiserDomains = bid.adomain; }
+    return bidObject;
   },
 };
 
@@ -128,25 +139,21 @@ const BB_RENDERER = {
     else if (bid.vastUrl) config.vastUrl = bid.vastUrl;
 
     if (!bid.vastXml && !bid.vastUrl) {
-      utils.logWarn(`${BB_CONSTANTS.BIDDER_CODE}: No vastXml or vastUrl on bid, bailing...`);
+      logWarn(`${BB_CONSTANTS.BIDDER_CODE}: No vastXml or vastUrl on bid, bailing...`);
       return;
     }
 
-    const rendererId = BB_RENDERER.getRendererId(bid.publicationName, bid.rendererCode);
+    if (!(window.bluebillywig && window.bluebillywig.renderers)) {
+      logWarn(`${BB_CONSTANTS.BIDDER_CODE}: renderer code failed to initialize...`);
+      return;
+    }
 
+    const rendererId = BB_RENDERER.getRendererId(bid.publicationName, bid.rendererCode);
     const ele = document.getElementById(bid.adUnitCode); // NB convention
+    const renderer = find(window.bluebillywig.renderers, r => r._id === rendererId);
 
-    let renderer;
-
-    for (let rendererIndex = 0; rendererIndex < window.bluebillywig.renderers.length; rendererIndex++) {
-      if (window.bluebillywig.renderers[rendererIndex]._id === rendererId) {
-        renderer = window.bluebillywig.renderers[rendererIndex];
-        break;
-      }
-    }
-
-    if (renderer) renderer.bootstrap(config, ele);
-    else utils.logWarn(`${BB_CONSTANTS.BIDDER_CODE}: Couldn't find a renderer with ${rendererId}`);
+    if (renderer) renderer.bootstrap(config, ele, bid.rendererSettings || {});
+    else logWarn(`${BB_CONSTANTS.BIDDER_CODE}: Couldn't find a renderer with ${rendererId}`);
   },
   newRenderer: function(rendererUrl, adUnitCode) {
     const renderer = Renderer.install({
@@ -158,7 +165,7 @@ const BB_RENDERER = {
     try {
       renderer.setRender(BB_RENDERER.outstreamRender);
     } catch (err) {
-      utils.logWarn(`${BB_CONSTANTS.BIDDER_CODE}: Error tying to setRender on renderer`, err);
+      logWarn(`${BB_CONSTANTS.BIDDER_CODE}: Error tying to setRender on renderer`, err);
     }
 
     return renderer;
@@ -182,61 +189,70 @@ export const spec = {
     const rendererRegex = /^[\w+_]+$/;
 
     if (!bid.params) {
-      utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: no params set on bid. Rejecting bid: `, bid);
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: no params set on bid. Rejecting bid: `, bid);
       return false;
     }
 
     if (!bid.params.hasOwnProperty('publicationName') || typeof bid.params.publicationName !== 'string') {
-      utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: no publicationName specified in bid params, or it's not a string. Rejecting bid: `, bid);
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: no publicationName specified in bid params, or it's not a string. Rejecting bid: `, bid);
       return false;
     } else if (!publicationNameRegex.test(bid.params.publicationName)) {
-      utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: publicationName must be in format 'publication' or 'publication.environment'. Rejecting bid: `, bid);
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: publicationName must be in format 'publication' or 'publication.environment'. Rejecting bid: `, bid);
       return false;
     }
 
     if ((!bid.params.hasOwnProperty('rendererCode') || typeof bid.params.rendererCode !== 'string')) {
-      utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: no rendererCode was specified in bid params. Rejecting bid: `, bid);
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: no rendererCode was specified in bid params. Rejecting bid: `, bid);
       return false;
     } else if (!rendererRegex.test(bid.params.rendererCode)) {
-      utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: rendererCode must be alphanumeric, including underscores. Rejecting bid: `, bid);
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: rendererCode must be alphanumeric, including underscores. Rejecting bid: `, bid);
       return false;
     }
 
     if (!bid.params.accountId) {
-      utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: no accountId specified in bid params. Rejecting bid: `, bid);
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: no accountId specified in bid params. Rejecting bid: `, bid);
       return false;
     }
 
     if (bid.params.hasOwnProperty('connections')) {
       if (!Array.isArray(bid.params.connections)) {
-        utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: connections is not of type array. Rejecting bid: `, bid);
+        logError(`${BB_CONSTANTS.BIDDER_CODE}: connections is not of type array. Rejecting bid: `, bid);
         return false;
       } else {
-        for (let connectionIndex = 0; connectionIndex < bid.params.connections.length; connectionIndex++) {
-          const connection = bid.params.connections[connectionIndex];
-          if (!bid.params.hasOwnProperty(connection)) {
-            utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: connection specified in params.connections, but not configured in params. Rejecting bid: `, bid);
+        for (let i = 0; i < bid.params.connections.length; i++) {
+          if (!bid.params.hasOwnProperty(bid.params.connections[i])) {
+            logError(`${BB_CONSTANTS.BIDDER_CODE}: connection specified in params.connections, but not configured in params. Rejecting bid: `, bid);
             return false;
           }
         }
       }
     } else {
-      utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: no connections specified in bid. Rejecting bid: `, bid);
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: no connections specified in bid. Rejecting bid: `, bid);
+      return false;
+    }
+
+    if (bid.params.hasOwnProperty('video') && (bid.params.video === null || typeof bid.params.video !== 'object')) {
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: params.video must be of type object. Rejecting bid: `, bid);
+      return false;
+    }
+
+    if (bid.params.hasOwnProperty('rendererSettings') && (bid.params.rendererSettings === null || typeof bid.params.rendererSettings !== 'object')) {
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: params.rendererSettings must be of type object. Rejecting bid: `, bid);
       return false;
     }
 
     if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
       if (!bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
-        utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: no context specified in bid. Rejecting bid: `, bid);
+        logError(`${BB_CONSTANTS.BIDDER_CODE}: no context specified in bid. Rejecting bid: `, bid);
         return false;
       }
 
       if (bid.mediaTypes[VIDEO].context !== 'outstream') {
-        utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: video.context is invalid, must be "outstream". Rejecting bid: `, bid);
+        logError(`${BB_CONSTANTS.BIDDER_CODE}: video.context is invalid, must be "outstream". Rejecting bid: `, bid);
         return false;
       }
     } else {
-      utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: mediaTypes or mediaTypes.video is not specified. Rejecting bid: `, bid);
+      logError(`${BB_CONSTANTS.BIDDER_CODE}: mediaTypes or mediaTypes.video is not specified. Rejecting bid: `, bid);
       return false;
     }
 
@@ -245,20 +261,21 @@ export const spec = {
   buildRequests(validBidRequests, bidderRequest) {
     const imps = [];
 
-    for (let validBidRequestIndex = 0; validBidRequestIndex < validBidRequests.length; validBidRequestIndex++) {
-      const validBidRequest = validBidRequests[validBidRequestIndex];
-      const _this = this;
+    validBidRequests.forEach(validBidRequest => {
+      if (!this.syncStore.publicationName) this.syncStore.publicationName = validBidRequest.params.publicationName;
+      if (!this.syncStore.accountId) this.syncStore.accountId = validBidRequest.params.accountId;
 
-      const ext = validBidRequest.params.connections.reduce(function(extBuilder, connection) {
+      const ext = validBidRequest.params.connections.reduce((extBuilder, connection) => {
         extBuilder[connection] = validBidRequest.params[connection];
 
-        if (_this.syncStore.bidders.indexOf(connection) === -1) _this.syncStore.bidders.push(connection);
+        if (this.syncStore.bidders.indexOf(connection) === -1) this.syncStore.bidders.push(connection);
 
         return extBuilder;
       }, {});
 
-      imps.push({ id: validBidRequest.bidId, ext, secure: window.location.protocol === 'https' ? 1 : 0, video: utils.deepAccess(validBidRequest, 'mediaTypes.video') });
-    }
+      const videoParams = BB_HELPERS.transformVideoParams(deepAccess(validBidRequest, 'mediaTypes.video'), deepAccess(validBidRequest, 'params.video'));
+      imps.push({ id: validBidRequest.bidId, ext, secure: window.location.protocol === 'https' ? 1 : 0, video: videoParams });
+    });
 
     const request = {
       id: bidderRequest.auctionId,
@@ -277,23 +294,22 @@ export const spec = {
     if (bidderRequest.gdprConsent) {
       let gdprApplies = 0;
       if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') gdprApplies = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
-      utils.deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
-      utils.deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
+      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
     }
 
     if (bidderRequest.uspConsent) {
-      utils.deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+      deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
       this.syncStore.uspConsent = bidderRequest.uspConsent;
     }
 
-    if (getConfig('coppa') == true) utils.deepSetValue(request, 'regs.coppa', 1);
+    if (getConfig('coppa') == true) deepSetValue(request, 'regs.coppa', 1);
 
     // Enrich the request with any external data we may have
-    BB_HELPERS.addSiteAppDevice(request, bidderRequest.refererInfo && bidderRequest.refererInfo.referer);
+    BB_HELPERS.addSiteAppDevice(request, bidderRequest.refererInfo && bidderRequest.refererInfo.page);
     BB_HELPERS.addSchain(request, validBidRequests);
     BB_HELPERS.addCurrency(request);
     BB_HELPERS.addUserIds(request, validBidRequests);
-    BB_HELPERS.addDigiTrust(request, validBidRequests);
 
     return {
       method: 'POST',
@@ -311,74 +327,44 @@ export const spec = {
 
     const bids = [];
 
-    for (let seatbidIndex = 0; seatbidIndex < serverResponse.seatbid.length; seatbidIndex++) {
-      const seatbid = serverResponse.seatbid[seatbidIndex];
-      if (!seatbid.bid || !Array.isArray(seatbid.bid)) continue;
-      for (let bidIndex = 0; bidIndex < seatbid.bid.length; bidIndex++) {
-        const bid = seatbid.bid[bidIndex];
-        BB_HELPERS.transformRTBToPrebidProps(bid, serverResponse);
-
-        let bidParams;
-        for (let bidderRequestBidsIndex = 0; bidderRequestBidsIndex < request.bidderRequest.bids.length; bidderRequestBidsIndex++) {
-          if (request.bidderRequest.bids[bidderRequestBidsIndex].bidId === bid.bidId) {
-            bidParams = request.bidderRequest.bids[bidderRequestBidsIndex].params;
-          }
-        }
+    serverResponse.seatbid.forEach(seatbid => {
+      if (!seatbid.bid || !Array.isArray(seatbid.bid)) return;
+      seatbid.bid.forEach(bid => {
+        bid = BB_HELPERS.transformRTBToPrebidProps(bid, serverResponse);
 
-        if (bidParams) {
-          bid.publicationName = bidParams.publicationName;
-          bid.rendererCode = bidParams.rendererCode;
-          bid.accountId = bidParams.accountId;
-        }
+        const bidParams = find(request.bidderRequest.bids, bidderRequestBid => bidderRequestBid.bidId === bid.bidId).params;
+        bid.publicationName = bidParams.publicationName;
+        bid.rendererCode = bidParams.rendererCode;
+        bid.accountId = bidParams.accountId;
+        bid.rendererSettings = bidParams.rendererSettings;
 
         const rendererUrl = BB_HELPERS.getRendererUrl(bid.publicationName, bid.rendererCode);
-
         bid.renderer = BB_RENDERER.newRenderer(rendererUrl, bid.adUnitCode);
 
         bids.push(bid);
-      }
-    }
+      });
+    });
 
     return bids;
   },
   getUserSyncs(syncOptions, serverResponses, gdpr) {
-    if (!serverResponses || !serverResponses.length) return [];
     if (!syncOptions.iframeEnabled) return [];
 
     const queryString = [];
-    let accountId;
-    let publication;
-
-    const serverResponse = serverResponses[0];
-    if (!serverResponse.body || !serverResponse.body.seatbid) return [];
-
-    for (let seatbidIndex = 0; seatbidIndex < serverResponse.body.seatbid.length; seatbidIndex++) {
-      const seatbid = serverResponse.body.seatbid[seatbidIndex];
-      for (let bidIndex = 0; bidIndex < seatbid.bid.length; bidIndex++) {
-        const bid = seatbid.bid[bidIndex];
-        accountId = bid.accountId || null;
-        publication = bid.publicationName || null;
-
-        if (publication && accountId) break;
-      }
-      if (publication && accountId) break;
-    }
-
-    if (!publication || !accountId) return [];
 
     if (gdpr.gdprApplies) queryString.push(`gdpr=${gdpr.gdprApplies ? 1 : 0}`);
     if (gdpr.gdprApplies && gdpr.consentString) queryString.push(`gdpr_consent=${gdpr.consentString}`);
 
     if (this.syncStore.uspConsent) queryString.push(`usp_consent=${this.syncStore.uspConsent}`);
 
-    queryString.push(`accountId=${accountId}`);
+    queryString.push(`accountId=${this.syncStore.accountId}`);
     queryString.push(`bidders=${btoa(JSON.stringify(this.syncStore.bidders))}`);
     queryString.push(`cb=${Date.now()}-${Math.random().toString().replace('.', '')}`);
 
     if (DEV_MODE) queryString.push('bbpbs_debug=true');
 
     // NB syncUrl by default starts with ?pub=$$PUBLICATION
-    const syncUrl = `${BB_HELPERS.getSyncUrl(publication)}&${queryString.join('&')}`;
+    const syncUrl = `${BB_HELPERS.getSyncUrl(this.syncStore.publicationName)}&${queryString.join('&')}`;
 
     return [{
       type: 'iframe',
diff --git a/modules/blueconicRtdProvider.js b/modules/blueconicRtdProvider.js
new file mode 100644
index 00000000000..9a7f5984637
--- /dev/null
+++ b/modules/blueconicRtdProvider.js
@@ -0,0 +1,94 @@
+/**
+ * This module adds the blueconic provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch real-time data from Blueconic
+ * @module modules/blueconicRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import {mergeDeep, isPlainObject, logMessage, logError} from '../src/utils.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'blueconic';
+
+export const RTD_LOCAL_NAME = 'bcPrebidData';
+
+export const storage = getStorageManager({moduleName: SUBMODULE_NAME});
+
+/**
+* Try parsing stringified array of data.
+* @param {String} data
+*/
+function parseJson(data) {
+  try {
+    return JSON.parse(data);
+  } catch (err) {
+    logError(`blueconicRtdProvider: failed to parse json:`, data);
+    return null;
+  }
+}
+
+/**
+ * Add real-time data & merge segments.
+ * @param {Object} bidConfig
+ * @param {Object} rtd
+ * @param {Object} rtdConfig
+ */
+export function addRealTimeData(ortb2, rtd) {
+  if (isPlainObject(rtd.ortb2)) {
+    mergeDeep(ortb2, rtd.ortb2);
+  }
+}
+
+/**
+ * Real-time data retrieval from BlueConic
+ * @param {Object} reqBidsConfigObj
+ * @param {function} onDone
+ * @param {Object} rtdConfig
+ * @param {Object} userConsent
+ */
+export function getRealTimeData(reqBidsConfigObj, onDone, rtdConfig, userConsent) {
+  if (rtdConfig && isPlainObject(rtdConfig.params)) {
+    const jsonData = storage.getDataFromLocalStorage(RTD_LOCAL_NAME);
+    if (jsonData) {
+      const parsedData = parseJson(jsonData);
+      if (!parsedData) {
+        return;
+      }
+      const userData = {name: 'blueconic', ...parsedData}
+      logMessage('blueconicRtdProvider: userData: ', userData);
+      const data = {
+        ortb2: {
+          user: {
+            data: [
+              userData
+            ]
+          }
+        }
+      }
+      addRealTimeData(reqBidsConfigObj.ortb2Fragments?.global, data);
+      onDone();
+    }
+  }
+}
+
+/**
+ * Module init
+ * @param {Object} provider
+ * @param {Objkect} userConsent
+ * @return {boolean}
+ */
+function init(provider, userConsent) {
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const blueconicSubmodule = {
+  name: SUBMODULE_NAME,
+  getBidRequestData: getRealTimeData,
+  init: init
+};
+
+submodule(MODULE_NAME, blueconicSubmodule);
diff --git a/modules/blueconicRtdProvider.md b/modules/blueconicRtdProvider.md
new file mode 100644
index 00000000000..b28bc6468fb
--- /dev/null
+++ b/modules/blueconicRtdProvider.md
@@ -0,0 +1,90 @@
+# Overview
+
+coppa_supported: true  (COPPA support)
+
+Module Name: BlueConic Rtd Provider
+Module Type: Rtd Provider
+Maintainer: connectors@blueconic.com
+
+
+## BlueConic Real-time Data Submodule
+
+The BlueConic real-time data module in Prebid has been built so that publishers
+can maximize the power of their first-party audiences, user-level and contextual data.
+This module provides both an integrated BlueConic identity with real-time
+contextual and audience segmentation solution that seamlessly and easily
+integrates into your existing Prebid deployment.
+
+BlueConic's Real-time Data Provider automatically obtains segmentation data and other user level data from the BlueConic script (via `localStorage`) and passes them to the bid-stream. Please reach out to BlueConic team(info@blueconic.com) or visit our [website](https://support.blueconic.com/hc/en-us) if you have any questions or need further help to integrate Prebid or blueconicRtdProvider.
+
+### Publisher Usage
+
+Compile the BlueConic RTD module into your Prebid build:
+
+`gulp build --modules=rtdModule,blueconicRtdProvider,appnexusBidAdapter`
+
+Add the BlueConic RTD provider to your Prebid config. In this example we will configure
+publisher 1234 to retrieve segments, profile data from BlueConic. See the
+"Parameter Descriptions" below for more detailed information of the
+configuration parameters. Please work with your BlueConic Prebid support team
+(info@blueconic.com) on which version of Prebid.js supports different bidder
+and segment configurations.
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "blueconic",
+                waitForIt: true,
+                params: {
+                    requestParams: {
+                        publisherId: 1234,
+                        coppa: true
+                    }
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Parameter Descriptions for the Blueconic Configuration Section
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Real time data module name | Always 'blueconic' |
+| waitForIt | Boolean | Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false |
+| params | Object | | |
+| params.requestParams | Object | Publisher partner specific configuration options, such as optional publisher id, coppa config and other segment query related metadata  | Optional |
+
+
+Please see the examples available in the blueconicRtdProvider_spec.js
+tests and work with your Blueconic Prebid integration team (connectors@blueconic.com).
+
+#### COPPA support
+
+COPPA support can be enabled for all the visitors by changing the config value:
+
+```js
+config.setConfig({ coppa: true });
+```
+
+### Testing 
+
+To run test suite for blueconic:
+
+`gulp test --modules=rtdModule,blueconicRtdProvider,appnexusBidAdapter`
+
+### Example
+
+To view an example of available segments:
+
+`gulp serve --modules=rtdModule,blueconicRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/blueconicRtdProvider_example.html`
diff --git a/modules/boldwinBidAdapter.js b/modules/boldwinBidAdapter.js
new file mode 100644
index 00000000000..3915df8b976
--- /dev/null
+++ b/modules/boldwinBidAdapter.js
@@ -0,0 +1,166 @@
+import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'boldwin';
+const AD_URL = 'https://ssp.videowalldirect.com/pbjs';
+const SYNC_URL = 'https://cs.videowalldirect.com'
+
+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.title && bid.native.image && 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 || bid.params.endpointId));
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let winTop = window;
+    let location;
+    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
+    try {
+      location = new URL(bidderRequest.refererInfo.page);
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      logMessage(e);
+    };
+    let placements = [];
+    let 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++) {
+      let bid = validBidRequests[i];
+      const { mediaTypes, params } = bid;
+      const placement = {};
+      let sizes;
+      if (mediaTypes) {
+        if (mediaTypes[BANNER] && mediaTypes[BANNER].sizes) {
+          placement.adFormat = BANNER;
+          sizes = mediaTypes[BANNER].sizes;
+        } else if (mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize) {
+          placement.adFormat = VIDEO;
+          sizes = mediaTypes[VIDEO].playerSize;
+          placement.minduration = mediaTypes[VIDEO].minduration;
+          placement.maxduration = mediaTypes[VIDEO].maxduration;
+          placement.mimes = mediaTypes[VIDEO].mimes;
+          placement.protocols = mediaTypes[VIDEO].protocols;
+          placement.startdelay = mediaTypes[VIDEO].startdelay;
+          placement.placement = mediaTypes[VIDEO].placement;
+          placement.skip = mediaTypes[VIDEO].skip;
+          placement.skipafter = mediaTypes[VIDEO].skipafter;
+          placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+          placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+          placement.delivery = mediaTypes[VIDEO].delivery;
+          placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+          placement.api = mediaTypes[VIDEO].api;
+          placement.linearity = mediaTypes[VIDEO].linearity;
+        } else {
+          placement.adFormat = NATIVE;
+          placement.native = mediaTypes[NATIVE];
+        }
+      }
+
+      const { placementId, endpointId } = params;
+      if (placementId) {
+        placement.placementId = placementId;
+        placement.type = 'publisher';
+      } else if (endpointId) {
+        placement.endpointId = endpointId;
+        placement.type = 'network';
+      }
+
+      placements.push({
+        ...placement,
+        bidId: bid.bidId,
+        sizes: sizes || [],
+        wPlayer: sizes ? sizes[0] : 0,
+        hPlayer: sizes ? sizes[1] : 0,
+        schain: bid.schain || {},
+        bidFloor: getBidFloor(bid),
+      });
+    }
+    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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: () => {
+    return [{
+      type: 'image',
+      url: SYNC_URL
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/boldwinBidAdapter.md b/modules/boldwinBidAdapter.md
new file mode 100644
index 00000000000..47f4b4ffe78
--- /dev/null
+++ b/modules/boldwinBidAdapter.md
@@ -0,0 +1,68 @@
+# Overview
+
+```
+Module Name: boldwin Bidder Adapter
+Module Type: boldwin Bidder Adapter
+```
+
+# Description
+
+Module that connects to boldwin demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'placementId_0',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'boldwin',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                // Will return test vast xml. All video params are stored under placement in publishers UI
+                {
+                    code: 'placementId_0',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'boldwin',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                }
+                // Will return static test banner
+                {
+                    code: 'endpointId_0',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'boldwin',
+                            params: {
+                                endpointId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+            ];
+```
diff --git a/modules/brainyBidAdapter.md b/modules/brainyBidAdapter.md
deleted file mode 100644
index 0f8308f6cc3..00000000000
--- a/modules/brainyBidAdapter.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Overview
-
-```
-Module Name: brainy Bid Adapter
-Module Type: Bidder Adapter
-Maintainer: support@mg.brainy-inc.co.jp
-```
-
-# Description
-This module connects to brainy's demand sources. It supports display, and rich media formats.
-brainy will provide ``accountID`` and ``slotID`` that are specific to your ad type.
-Please reach out to ``support@mg.brainy-inc.co.jp`` to set up an brainy account and above ids.
-Use bidder code ```brainy``` for all brainy traffic.
-
-
-# Test Parameters
-
-```
- var adUnits = [{
-   code: 'test-div',
-   sizes: [[300, 250],
-   bids: [{
-       bidder: 'brainy',
-       params: {
-         accountID: "3481",
-         slotID: "5569"
-       }
-     }]
-   }
- ];
-```
diff --git a/modules/brandmetricsRtdProvider.js b/modules/brandmetricsRtdProvider.js
new file mode 100644
index 00000000000..53868eccc4c
--- /dev/null
+++ b/modules/brandmetricsRtdProvider.js
@@ -0,0 +1,165 @@
+/**
+ * This module adds brandmetrics provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will load load the brandmetrics script and set survey- targeting to ad units of specific bidders.
+ * @module modules/brandmetricsRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {submodule} from '../src/hook.js';
+import {deepAccess, deepSetValue, logError, mergeDeep} from '../src/utils.js';
+import {loadExternalScript} from '../src/adloader.js';
+
+const MODULE_NAME = 'brandmetrics'
+const MODULE_CODE = MODULE_NAME
+const RECEIVED_EVENTS = []
+const GVL_ID = 422
+const TCF_PURPOSES = [1, 7]
+
+function init (config, userConsent) {
+  const hasConsent = checkConsent(userConsent)
+
+  if (hasConsent) {
+    const moduleConfig = getMergedConfig(config)
+    initializeBrandmetrics(moduleConfig.params.scriptId)
+  }
+  return hasConsent
+}
+
+/**
+ * Checks TCF and USP consents
+ * @param {Object} userConsent
+ * @returns {boolean}
+ */
+function checkConsent (userConsent) {
+  let consent = false
+
+  if (userConsent && userConsent.gdpr && userConsent.gdpr.gdprApplies) {
+    const gdpr = userConsent.gdpr
+
+    if (gdpr.vendorData) {
+      const vendor = gdpr.vendorData.vendor
+      const purpose = gdpr.vendorData.purpose
+
+      let vendorConsent = false
+      if (vendor.consents) {
+        vendorConsent = vendor.consents[GVL_ID]
+      }
+
+      if (vendor.legitimateInterests) {
+        vendorConsent = vendorConsent || vendor.legitimateInterests[GVL_ID]
+      }
+
+      const purposes = TCF_PURPOSES.map(id => {
+        return (purpose.consents && purpose.consents[id]) || (purpose.legitimateInterests && purpose.legitimateInterests[id])
+      })
+      const purposesValid = purposes.filter(p => p === true).length === TCF_PURPOSES.length
+      consent = vendorConsent && purposesValid
+    }
+  } else if (userConsent.usp) {
+    const usp = userConsent.usp
+    consent = usp[1] !== 'N' && usp[2] !== 'Y'
+  }
+
+  return consent
+}
+
+/**
+* Add event- listeners to hook in to brandmetrics events
+* @param {Object} reqBidsConfigObj
+* @param {function} callback
+*/
+function processBrandmetricsEvents (reqBidsConfigObj, moduleConfig, callback) {
+  const callBidTargeting = (event) => {
+    if (event.available && event.conf) {
+      const targetingConf = event.conf.displayOption || {}
+      if (targetingConf.type === 'pbjs') {
+        setBidderTargeting(reqBidsConfigObj, moduleConfig, targetingConf.targetKey || 'brandmetrics_survey', event.survey.measurementId)
+      }
+    }
+    callback()
+  }
+
+  if (RECEIVED_EVENTS.length > 0) {
+    callBidTargeting(RECEIVED_EVENTS[RECEIVED_EVENTS.length - 1])
+  } else {
+    window._brandmetrics = window._brandmetrics || []
+    window._brandmetrics.push({
+      cmd: '_addeventlistener',
+      val: {
+        event: 'surveyloaded',
+        reEmitLast: true,
+        handler: (ev) => {
+          RECEIVED_EVENTS.push(ev)
+          if (RECEIVED_EVENTS.length === 1) {
+            // Call bid targeting only for the first received event, if called subsequently, last event from the RECEIVED_EVENTS array is used
+            callBidTargeting(ev)
+          }
+        },
+      }
+    })
+  }
+}
+
+/**
+ * Sets bid targeting of specific bidders
+ * @param {Object} reqBidsConfigObj
+ * @param {string} key Targeting key
+ * @param {string} val Targeting value
+ */
+function setBidderTargeting (reqBidsConfigObj, moduleConfig, key, val) {
+  const bidders = deepAccess(moduleConfig, 'params.bidders')
+  if (bidders && bidders.length > 0) {
+    bidders.forEach(bidder => {
+      deepSetValue(reqBidsConfigObj, `ortb2Fragments.bidder.${bidder}.user.ext.data.${key}`, val);
+    })
+  }
+}
+
+/**
+ * Add the brandmetrics script to the page.
+ * @param {string} scriptId - The script- id provided by brandmetrics or brandmetrics partner
+ */
+function initializeBrandmetrics(scriptId) {
+  if (scriptId) {
+    const path = 'https://cdn.brandmetrics.com/survey/script/'
+    const file = scriptId + '.js'
+    const url = path + file
+
+    loadExternalScript(url, MODULE_CODE)
+  }
+}
+
+/**
+ * Merges a provided config with default values
+ * @param {Object} customConfig
+ * @returns
+ */
+function getMergedConfig(customConfig) {
+  return mergeDeep({
+    waitForIt: false,
+    params: {
+      bidders: [],
+      scriptId: undefined,
+    }
+  }, customConfig)
+}
+
+/** @type {RtdSubmodule} */
+export const brandmetricsSubmodule = {
+  name: MODULE_NAME,
+  getBidRequestData: function (reqBidsConfigObj, callback, customConfig) {
+    try {
+      const moduleConfig = getMergedConfig(customConfig)
+      if (moduleConfig.waitForIt) {
+        processBrandmetricsEvents(reqBidsConfigObj, moduleConfig, callback)
+      } else {
+        callback()
+      }
+    } catch (e) {
+      logError(e)
+    }
+  },
+  init: init
+}
+
+submodule('realTimeData', brandmetricsSubmodule)
diff --git a/modules/brandmetricsRtdProvider.md b/modules/brandmetricsRtdProvider.md
new file mode 100644
index 00000000000..89ee6bb75cf
--- /dev/null
+++ b/modules/brandmetricsRtdProvider.md
@@ -0,0 +1,40 @@
+# Brandmetrics Real-time Data Submodule
+This module is intended to be used by brandmetrics (https://brandmetrics.com) partners and sets targeting keywords to bids if the browser is eligeble to see a brandmetrics survey.
+The module hooks in to brandmetrics events and requires a brandmetrics script to be running. The module can optionally load and initialize brandmetrics by providing the 'scriptId'- parameter.
+
+## Usage
+Compile the Brandmetrics RTD module into your Prebid build:
+```
+gulp build --modules=rtdModule,brandmetricsRtdProvider
+```
+
+> Note that the global RTD module, `rtdModule`, is a prerequisite of the Brandmetrics RTD module.
+
+Enable the Brandmetrics RTD in your Prebid configuration, using the below format:
+
+```javascript
+pbjs.setConfig({
+  ...,
+  realTimeData: {
+    auctionDelay: 500, // auction delay
+    dataProviders: [{
+      name: 'brandmetrics',
+      waitForIt: true // should be true if there's an `auctionDelay`,
+      params: {
+        scriptId: '00000000-0000-0000-0000-000000000000',
+        bidders: ['ozone']
+      }
+    }]
+  },
+  ...
+})
+```
+
+## Parameters
+| Name              | Type                 | Description        | Default        |
+| ----------------- | -------------------- | ------------------ | ------------------ |
+| name              | String               | This should always be `brandmetrics` | - |
+| waitForIt         | Boolean              | Should be `true` if there's an `auctionDelay` defined (recommended) | `false` |
+| params            | Object               |                 | - |
+| params.bidders    | String[]             | An array of bidders which should receive targeting keys. | `[]` |
+| params.scriptId   | String               | A script- id GUID if the brandmetrics- script should be initialized. | `undefined` |
diff --git a/modules/braveBidAdapter.js b/modules/braveBidAdapter.js
new file mode 100644
index 00000000000..2e087b41868
--- /dev/null
+++ b/modules/braveBidAdapter.js
@@ -0,0 +1,257 @@
+import { parseUrl, isEmpty, isStr, triggerPixel } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'brave';
+const DEFAULT_CUR = 'USD';
+const ENDPOINT_URL = `https://point.bravegroup.tv/?t=2&partner=hash`;
+
+const NATIVE_ASSETS_IDS = { 1: 'title', 2: 'icon', 3: 'image', 4: 'body', 5: 'sponsoredBy', 6: 'cta' };
+const NATIVE_ASSETS = {
+  title: { id: 1, name: 'title' },
+  icon: { id: 2, type: 1, name: 'img' },
+  image: { id: 3, type: 3, name: 'img' },
+  body: { id: 4, type: 2, name: 'data' },
+  sponsoredBy: { id: 5, type: 1, name: 'data' },
+  cta: { id: 6, type: 12, name: 'data' }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: (bid) => {
+    return !!(bid.params.placementId && bid.params.placementId.toString().length === 32);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    if (validBidRequests.length === 0 || !bidderRequest) return [];
+
+    const endpointURL = ENDPOINT_URL.replace('hash', validBidRequests[0].params.placementId);
+
+    let imp = validBidRequests.map(br => {
+      let impObject = {
+        id: br.bidId,
+        secure: 1
+      };
+
+      if (br.mediaTypes.banner) {
+        impObject.banner = createBannerRequest(br);
+      } else if (br.mediaTypes.video) {
+        impObject.video = createVideoRequest(br);
+      } else if (br.mediaTypes.native) {
+        impObject.native = {
+          id: br.transactionId,
+          ver: '1.2',
+          request: createNativeRequest(br)
+        };
+      }
+      return impObject;
+    });
+
+    // TODO: do these values make sense?
+    let page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+    let r = bidderRequest.refererInfo.ref;
+
+    let data = {
+      id: bidderRequest.bidderRequestId,
+      cur: [ DEFAULT_CUR ],
+      device: {
+        w: screen.width,
+        h: screen.height,
+        language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
+        ua: navigator.userAgent,
+      },
+      site: {
+        domain: parseUrl(page).hostname,
+        page: page,
+      },
+      tmax: bidderRequest.timeout || config.getConfig('bidderTimeout') || 500,
+      imp
+    };
+
+    if (r) {
+      data.site.ref = r;
+    }
+
+    if (bidderRequest.gdprConsent) {
+      data['regs'] = {'ext': {'gdpr': bidderRequest.gdprConsent.gdprApplies ? 1 : 0}};
+      data['user'] = {'ext': {'consent': bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : ''}};
+    }
+
+    if (bidderRequest.uspConsent !== undefined) {
+      if (!data['regs'])data['regs'] = {'ext': {}};
+      data['regs']['ext']['us_privacy'] = bidderRequest.uspConsent;
+    }
+
+    if (config.getConfig('coppa') === true) {
+      if (!data['regs'])data['regs'] = {'coppa': 1};
+      else data['regs']['coppa'] = 1;
+    }
+
+    if (validBidRequests[0].schain) {
+      data['source'] = {'ext': {'schain': validBidRequests[0].schain}};
+    }
+
+    return {
+      method: 'POST',
+      url: endpointURL,
+      data: data
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (serverResponse) => {
+    if (!serverResponse || isEmpty(serverResponse.body)) return [];
+
+    let bids = [];
+    serverResponse.body.seatbid.forEach(response => {
+      response.bid.forEach(bid => {
+        let mediaType = bid.ext && bid.ext.mediaType ? bid.ext.mediaType : 'banner';
+
+        let bidObj = {
+          requestId: bid.impid,
+          cpm: bid.price,
+          width: bid.w,
+          height: bid.h,
+          ttl: 1200,
+          currency: DEFAULT_CUR,
+          netRevenue: true,
+          creativeId: bid.crid,
+          dealId: bid.dealid || null,
+          mediaType: mediaType
+        };
+
+        switch (mediaType) {
+          case 'video':
+            bidObj.vastUrl = bid.adm;
+            break;
+          case 'native':
+            bidObj.native = parseNative(bid.adm);
+            break;
+          default:
+            bidObj.ad = bid.adm;
+        }
+
+        bids.push(bidObj);
+      });
+    });
+
+    return bids;
+  },
+
+  onBidWon: (bid) => {
+    if (isStr(bid.nurl) && bid.nurl !== '') {
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+const parseNative = adm => {
+  let bid = {
+    clickUrl: adm.native.link && adm.native.link.url,
+    impressionTrackers: adm.native.imptrackers || [],
+    clickTrackers: (adm.native.link && adm.native.link.clicktrackers) || [],
+    jstracker: adm.native.jstracker || []
+  };
+  adm.native.assets.forEach(asset => {
+    let kind = NATIVE_ASSETS_IDS[asset.id];
+    let content = kind && asset[NATIVE_ASSETS[kind].name];
+    if (content) {
+      bid[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+
+  return bid;
+}
+
+const createNativeRequest = br => {
+  let impObject = {
+    ver: '1.2',
+    assets: []
+  };
+
+  let keys = Object.keys(br.mediaTypes.native);
+
+  for (let key of keys) {
+    const props = NATIVE_ASSETS[key];
+    if (props) {
+      const asset = {
+        required: br.mediaTypes.native[key].required ? 1 : 0,
+        id: props.id,
+        [props.name]: {}
+      };
+
+      if (props.type) asset[props.name]['type'] = props.type;
+      if (br.mediaTypes.native[key].len) asset[props.name]['len'] = br.mediaTypes.native[key].len;
+      if (br.mediaTypes.native[key].sizes && br.mediaTypes.native[key].sizes[0]) {
+        asset[props.name]['w'] = br.mediaTypes.native[key].sizes[0];
+        asset[props.name]['h'] = br.mediaTypes.native[key].sizes[1];
+      }
+
+      impObject.assets.push(asset);
+    }
+  }
+
+  return impObject;
+}
+
+const createBannerRequest = br => {
+  let size = [];
+
+  if (br.mediaTypes.banner.sizes && Array.isArray(br.mediaTypes.banner.sizes)) {
+    if (Array.isArray(br.mediaTypes.banner.sizes[0])) { size = br.mediaTypes.banner.sizes[0]; } else { size = br.mediaTypes.banner.sizes; }
+  } else size = [300, 250];
+
+  return { id: br.transactionId, w: size[0], h: size[1] };
+};
+
+const createVideoRequest = br => {
+  let videoObj = {id: br.transactionId};
+  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'skip', 'minbitrate', 'maxbitrate', 'api', 'linearity'];
+
+  for (let param of supportParamsList) {
+    if (br.mediaTypes.video[param] !== undefined) {
+      videoObj[param] = br.mediaTypes.video[param];
+    }
+  }
+
+  if (br.mediaTypes.video.playerSize && Array.isArray(br.mediaTypes.video.playerSize)) {
+    if (Array.isArray(br.mediaTypes.video.playerSize[0])) {
+      videoObj.w = br.mediaTypes.video.playerSize[0][0];
+      videoObj.h = br.mediaTypes.video.playerSize[0][1];
+    } else {
+      videoObj.w = br.mediaTypes.video.playerSize[0];
+      videoObj.h = br.mediaTypes.video.playerSize[1];
+    }
+  } else {
+    videoObj.w = 640;
+    videoObj.h = 480;
+  }
+
+  return videoObj;
+}
+
+registerBidder(spec);
diff --git a/modules/braveBidAdapter.md b/modules/braveBidAdapter.md
new file mode 100644
index 00000000000..77d2338ff16
--- /dev/null
+++ b/modules/braveBidAdapter.md
@@ -0,0 +1,135 @@
+# Overview
+
+```
+Module Name: Brave Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@thebrave.io
+```
+
+# Description
+
+Module which connects to Brave SSP demand sources
+
+# Test Parameters
+
+
+250x300 banner test
+```
+var adUnits = [{
+  code: 'brave-prebid',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]]
+    }
+  },
+  bids: [{
+    bidder: 'brave',
+    params : {
+      placementId : "to0QI2aPgkbBZq6vgf0oHitouZduz0qw" // test placementId, please replace after test
+    }
+  }]
+}];
+```
+
+native test
+```
+var adUnits = [{
+  code: 'brave-native-prebid',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+          required: true
+      },
+      clickUrl: {
+          required: true
+      },
+      privacyLink: {
+          required: false
+      },
+      body: {
+          required: true
+      },
+      icon: {
+          required: true,
+          sizes: [50, 50]
+      }
+    }
+  },
+  bids: [{
+      bidder: 'brave',
+      params: {
+        placementId : "to0QI2aPgkbBZq6vgf0oHitouZduz0qw" // test placementId, please replace after test
+      }
+  }]
+}];
+```
+
+video test
+```
+var adUnits = [{
+  code: 'brave-video-prebid',
+  mediaTypes: {
+    video: {
+      minduration:1,
+      maxduration:999,
+      boxingallowed:1,
+      skip:0,
+      mimes:[
+          'application/javascript',
+          'video/mp4'
+      ],
+      playerSize: [[768, 1024]],
+      protocols:[
+          2,3
+      ],
+      linearity:1,
+      api:[
+          1,
+          2
+      ]
+    }
+  },
+  bids: [{
+      bidder: 'brave',
+      params: {
+        placementId : "to0QI2aPgkbBZq6vgf0oHitouZduz0qw" // test placementId, please replace after test
+      }
+  }]
+}];
+```
+
+# Bid Parameters
+## Banner
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `placementId` | required | String | The placement ID from Brave  | "to0QI2aPgkbBZq6vgf0oHitouZduz0qw"
+
+
+# Ad Unit and page Setup:
+
+```html
+ <!-- Prebid Config section -->
+ <script>
+     var PREBID_TIMEOUT = 700;
+     var adUnits = [{
+         code: 'brave-prebid',
+         sizes: [[300, 250]],
+         bids: [{
+            bidder: 'brave'
+            placementId : "PUT_YOUR_brave_placementId",
+         }]
+     }];
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+</script>
+<!-- End Prebid Config section -->
+```
diff --git a/modules/bridgewellBidAdapter.js b/modules/bridgewellBidAdapter.js
index 0303e4f74bd..6088cefaa55 100644
--- a/modules/bridgewellBidAdapter.js
+++ b/modules/bridgewellBidAdapter.js
@@ -1,11 +1,12 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
-import find from 'core-js-pure/features/array/find.js';
+import {_each, deepSetValue, inIframe} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import {find} from '../src/polyfill.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'bridgewell';
-const REQUEST_ENDPOINT = 'https://prebid.scupio.com/recweb/prebid.aspx?cb=' + Math.random();
-const BIDDER_VERSION = '0.0.2';
+const REQUEST_ENDPOINT = 'https://prebid.scupio.com/recweb/prebid.aspx?cb=';
+const BIDDER_VERSION = '1.1.0';
 
 export const spec = {
   code: BIDDER_CODE,
@@ -19,11 +20,13 @@ export const spec = {
    */
   isBidRequestValid: function (bid) {
     let valid = false;
-
-    if (bid && bid.params && bid.params.ChannelID) {
-      valid = true;
+    if (bid && bid.params) {
+      if ((bid.params.cid) && (typeof bid.params.cid === 'number')) {
+        valid = true;
+      } else if (bid.params.ChannelID) {
+        valid = true;
+      }
     }
-
     return valid;
   },
 
@@ -34,36 +37,62 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const adUnits = [];
-    utils._each(validBidRequests, function (bid) {
-      adUnits.push({
-        ChannelID: bid.params.ChannelID,
-        adUnitCode: bid.adUnitCode,
-        mediaTypes: bid.mediaTypes || {
-          banner: {
-            sizes: bid.sizes
-          }
-        }
-      });
+    var bidderUrl = REQUEST_ENDPOINT + Math.random();
+    var userIds;
+
+    _each(validBidRequests, function (bid) {
+      userIds = bid.userId;
+
+      if (bid.params.cid) {
+        adUnits.push({
+          cid: bid.params.cid,
+          adUnitCode: bid.adUnitCode,
+          requestId: bid.bidId,
+          mediaTypes: bid.mediaTypes || {
+            banner: {
+              sizes: bid.sizes
+            }
+          },
+          userIds: userIds || {}
+        });
+      } else {
+        adUnits.push({
+          ChannelID: bid.params.ChannelID,
+          adUnitCode: bid.adUnitCode,
+          requestId: bid.bidId,
+          mediaTypes: bid.mediaTypes || {
+            banner: {
+              sizes: bid.sizes
+            }
+          },
+          userIds: userIds || {}
+        });
+      }
     });
 
     let topUrl = '';
     if (bidderRequest && bidderRequest.refererInfo) {
-      topUrl = bidderRequest.refererInfo.referer;
+      topUrl = bidderRequest.refererInfo.page;
     }
 
     return {
       method: 'POST',
-      url: REQUEST_ENDPOINT,
+      url: bidderUrl,
       data: {
         version: {
           prebid: '$prebid.version$',
           bridgewell: BIDDER_VERSION
         },
-        inIframe: utils.inIframe(),
+        inIframe: inIframe(),
         url: topUrl,
-        referrer: getTopWindowReferrer(),
-        adUnits: adUnits
+        referrer: bidderRequest.refererInfo.ref,
+        adUnits: adUnits,
+        // TODO: please do not send internal data structures over the network
+        refererInfo: bidderRequest.refererInfo.legacy,
       },
       validBidRequests: validBidRequests
     };
@@ -80,7 +109,7 @@ export const spec = {
     const bidResponses = [];
 
     // map responses to requests
-    utils._each(bidRequest.validBidRequests, function (req) {
+    _each(bidRequest.validBidRequests, function (req) {
       const bidResponse = {};
 
       if (!serverResponse.body) {
@@ -143,6 +172,10 @@ export const spec = {
         bidResponse.currency = matchedResponse.currency;
         bidResponse.mediaType = matchedResponse.mediaType;
 
+        if (matchedResponse.adomain) {
+          deepSetValue(bidResponse, 'meta.advertiserDomains', Array.isArray(matchedResponse.adomain) ? matchedResponse.adomain : [matchedResponse.adomain]);
+        }
+
         // check required parameters by matchedResponse.mediaType
         switch (matchedResponse.mediaType) {
           case BANNER:
@@ -261,12 +294,4 @@ export const spec = {
   }
 };
 
-function getTopWindowReferrer() {
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return '';
-  }
-}
-
 registerBidder(spec);
diff --git a/modules/bridgewellBidAdapter.md b/modules/bridgewellBidAdapter.md
index 6bcab4b8820..97e11f6eaf9 100644
--- a/modules/bridgewellBidAdapter.md
+++ b/modules/bridgewellBidAdapter.md
@@ -20,7 +20,7 @@ Module that connects to Bridgewell demand source to fetch bids.
         bids: [{
             bidder: 'bridgewell',
             params: {
-                ChannelID: 'CgUxMjMzOBIBNiIFcGVubnkqCQisAhD6ARoBOQ'
+                cid: 12345
             }
         }]
     }, {
@@ -33,7 +33,7 @@ Module that connects to Bridgewell demand source to fetch bids.
         bids: [{
             bidder: 'bridgewell',
             params: {
-                ChannelID: 'CgUxMjMzOBIBNiIGcGVubnkzKggI2AUQWhoBOQ'
+                cid: 56789
             }
         }]
     }, {
@@ -70,7 +70,7 @@ Module that connects to Bridgewell demand source to fetch bids.
         bids: [{
             bidder: 'bridgewell',
             params: {
-                ChannelID: 'CgUxMjMzOBIBNiIGcGVubnkzKggI2AUQWhoBOQ'
+                cid: 2394
             }
         }]
     }];
diff --git a/modules/brightMountainMediaBidAdapter.js b/modules/brightMountainMediaBidAdapter.js
new file mode 100644
index 00000000000..6db06744c24
--- /dev/null
+++ b/modules/brightMountainMediaBidAdapter.js
@@ -0,0 +1,254 @@
+import { generateUUID, deepAccess, logWarn, deepSetValue } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'bmtm';
+const AD_URL = 'https://one.elitebidder.com/api/hb?sid=';
+const SYNC_URL = 'https://console.brightmountainmedia.com:8443/cookieSync';
+const CURRENCY = 'USD';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['brightmountainmedia'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: (bid) => {
+    if (bid.bidId && bid.bidder && bid.params && bid.params.placement_id) {
+      return true;
+    }
+    if (bid.params.placement_id == 0 && bid.params.test === 1) {
+      return true;
+    }
+    return false;
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    let requestData = [];
+    let size = [0, 0];
+    let oRTBRequest = {
+      at: 2,
+      site: buildSite(bidderRequest),
+      device: buildDevice(),
+      cur: [CURRENCY],
+      tmax: 1000,
+      regs: buildRegs(bidderRequest),
+      user: {},
+      source: {},
+    };
+
+    validBidRequests.forEach((bid) => {
+      oRTBRequest['id'] = generateUUID();
+      oRTBRequest['imp'] = [
+        {
+          id: '1',
+          bidfloor: 0,
+          bidfloorcur: CURRENCY,
+          secure: document.location.protocol === 'https:' ? 1 : 0,
+          ext: {
+            placement_id: bid.params.placement_id,
+            prebidVersion: '$prebid.version$',
+          }
+        },
+      ];
+
+      if (deepAccess(bid, 'mediaTypes.banner')) {
+        if (bid.mediaTypes.banner.sizes) {
+          size = bid.mediaTypes.banner.sizes[0];
+        }
+
+        oRTBRequest.imp[0].banner = {
+          h: size[0],
+          w: size[1],
+        }
+      } else {
+        if (bid.mediaTypes.video.playerSize) {
+          size = bid.mediaTypes.video.playerSize[0];
+        }
+
+        oRTBRequest.imp[0].video = {
+          h: size[0],
+          w: size[1],
+          mimes: bid.mediaTypes.video.mimes ? bid.mediaTypes.video.mimes : [],
+          skip: bid.mediaTypes.video.skip ? 1 : 0,
+          playbackmethod: bid.mediaTypes.video.playbackmethod ? bid.mediaTypes.video.playbackmethod : [],
+          protocols: bid.mediaTypes.video.protocols ? bid.mediaTypes.video.protocols : [],
+          api: bid.mediaTypes.video.api ? bid.mediaTypes.video.api : [],
+          minduration: bid.mediaTypes.video.minduration ? bid.mediaTypes.video.minduration : 1,
+          maxduration: bid.mediaTypes.video.maxduration ? bid.mediaTypes.video.maxduration : 999,
+        }
+      }
+
+      oRTBRequest.imp[0].bidfloor = getFloor(bid, size);
+      oRTBRequest.user = getUserIdAsEids(bid.userIdAsEids)
+      oRTBRequest.source = getSchain(bid.schain)
+
+      requestData.push({
+        method: 'POST',
+        url: `${AD_URL}${bid.params.placement_id}`,
+        data: JSON.stringify(oRTBRequest),
+        bidRequest: bid,
+      })
+    });
+    return requestData;
+  },
+
+  interpretResponse: (serverResponse, { bidRequest }) => {
+    let bidResponse = [];
+    let bid;
+    let response;
+
+    try {
+      response = serverResponse.body;
+      bid = response.seatbid[0].bid[0];
+    } catch (e) {
+      response = null;
+    }
+
+    if (!response || !bid || !bid.adm || !bid.price) {
+      logWarn(`Bidder ${spec.code} no valid bid`);
+      return [];
+    }
+
+    let tempResponse = {
+      requestId: bidRequest.bidId,
+      cpm: bid.price,
+      currency: response.cur,
+      width: bid.w,
+      height: bid.h,
+      creativeId: bid.crid,
+      mediaType: deepAccess(bidRequest, 'mediaTypes.banner') ? BANNER : VIDEO,
+      ttl: 3000,
+      netRevenue: true,
+      meta: {
+        advertiserDomains: bid.adomain
+      }
+    };
+
+    if (tempResponse.mediaType === BANNER) {
+      tempResponse.ad = replaceAuctionPrice(bid.adm, bid.price);
+    } else {
+      tempResponse.vastXml = replaceAuctionPrice(bid.adm, bid.price);
+    }
+
+    bidResponse.push(tempResponse);
+    return bidResponse;
+  },
+
+  getUserSyncs: (syncOptions) => {
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: SYNC_URL
+      }];
+    }
+  },
+
+};
+
+registerBidder(spec);
+
+function buildSite(bidderRequest) {
+  // TODO: should name/domain be the domain?
+  let site = {
+    name: window.location.hostname,
+    publisher: {
+      domain: window.location.hostname,
+    }
+  };
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    deepSetValue(
+      site,
+      'page',
+      bidderRequest.refererInfo.page
+    );
+    deepSetValue(
+      site,
+      'ref',
+      bidderRequest.refererInfo.ref
+    );
+  }
+  return site;
+}
+
+function buildDevice() {
+  return {
+    ua: navigator.userAgent,
+    w: window.top.screen.width,
+    h: window.top.screen.height,
+    js: 1,
+    language: navigator.language,
+    dnt: navigator.doNotTrack === 'yes' || navigator.doNotTrack == '1' ||
+      navigator.msDoNotTrack == '1' ? 1 : 0,
+  }
+}
+
+function buildRegs(bidderRequest) {
+  let regs = {
+    coppa: config.getConfig('coppa') == true ? 1 : 0,
+  };
+
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    deepSetValue(
+      regs,
+      'ext.gdpr',
+      bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
+    );
+    deepSetValue(
+      regs,
+      'ext.gdprConsentString',
+      bidderRequest.gdprConsent.consentString || 'ALL',
+    );
+  }
+
+  if (bidderRequest && bidderRequest.uspConsent) {
+    deepSetValue(regs,
+      'ext.us_privacy',
+      bidderRequest.uspConsent);
+  }
+  return regs;
+}
+
+function replaceAuctionPrice(str, cpm) {
+  if (!str) return;
+  return str.replace(/\$\{AUCTION_PRICE\}/g, cpm);
+}
+
+function getFloor(bid, size) {
+  if (typeof bid.getFloor === 'function') {
+    let floorInfo = {};
+    floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: 'banner',
+      size: size,
+    });
+
+    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD') {
+      return parseFloat(floorInfo.floor);
+    }
+  }
+  return 0;
+}
+
+function getUserIdAsEids(userIds) {
+  if (userIds) {
+    return {
+      ext: {
+        eids: userIds,
+      }
+    }
+  };
+  return {};
+}
+
+function getSchain(schain) {
+  if (schain) {
+    return {
+      ext: {
+        schain: schain,
+      }
+    }
+  }
+  return {};
+}
diff --git a/modules/brightMountainMediaBidAdapter.md b/modules/brightMountainMediaBidAdapter.md
new file mode 100644
index 00000000000..97cebe5b633
--- /dev/null
+++ b/modules/brightMountainMediaBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name:  Bright Mountain Media Bidder Adapter
+Module Type:  Bidder Adapter
+Maintainer: dev@brightmountainmedia.com
+```
+
+# Description
+
+Connects to Bright Mountain Media exchange for bids.
+
+Bright Mountain Media bid adapter currently supports Banner and Video.
+
+# Sample Ad Unit: For Publishers
+
+## Sample Banner only Ad Unit
+
+```
+var adUnits = [
+      {
+        code: 'postbid_iframe',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        bids: [
+          {
+            "bidder": "bmtm",
+            "params": {
+              "placement_id": 1
+            }
+          }
+        ]
+      }
+    ];
+```
+
+## Sample Video only Ad Unit: Outstream
+
+```
+var adUnits = [
+    {
+        code: 'postbid_iframe_video',
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'outstream'
+            ... // Additional ORTB video params 
+          }
+        },
+        bids: [
+          {
+            bidder: "bmtm",
+            params: {
+              placement_id: 1
+            }
+          }
+        ],
+        renderer: {
+          url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+          render: function (bid) {
+            adResponse = {
+              ad: {
+                video: {
+                  content: bid.vastXml,
+                  player_height: bid.height,
+                  player_width: bid.width
+                }
+              }
+            }
+            // push to render queue because ANOutstreamVideo may not be loaded yet.
+            bid.renderer.push(() => {
+              ANOutstreamVideo.renderAd({
+                targetId: bid.adUnitCode,
+                adResponse: adResponse
+              });
+            });
+          }
+        }
+      }
+];
+
+```
+
+## Sample Video only Ad Unit: Instream
+
+```
+var adUnits = [
+    {
+        code: 'postbid_iframe_video',
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'instream'
+            ... // Additional ORTB video params 
+          },
+        },
+        bids: [
+          {
+            bidder: "bmtm",
+            params: {
+              placement_id: 1
+            }
+          }
+        ]
+      }
+];
+
+```
diff --git a/modules/brightcomBidAdapter.js b/modules/brightcomBidAdapter.js
index a4b013a2fe2..bbe0203772a 100644
--- a/modules/brightcomBidAdapter.js
+++ b/modules/brightcomBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { getBidIdParameter, _each, isArray, getWindowTop, getUniqueIdentifierStr, deepSetValue, logError, logWarn, createTrackPixelHtml, getWindowSelf, isFn, isPlainObject } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
@@ -19,20 +19,20 @@ function buildRequests(bidReqs, bidderRequest) {
   try {
     let referrer = '';
     if (bidderRequest && bidderRequest.refererInfo) {
-      referrer = bidderRequest.refererInfo.referer;
+      referrer = bidderRequest.refererInfo.page;
     }
     const brightcomImps = [];
-    const publisherId = utils.getBidIdParameter('publisherId', bidReqs[0].params);
-    utils._each(bidReqs, function (bid) {
+    const publisherId = getBidIdParameter('publisherId', bidReqs[0].params);
+    _each(bidReqs, function (bid) {
       let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
-      bidSizes = ((utils.isArray(bidSizes) && utils.isArray(bidSizes[0])) ? bidSizes : [bidSizes]);
-      bidSizes = bidSizes.filter(size => utils.isArray(size));
+      bidSizes = ((isArray(bidSizes) && isArray(bidSizes[0])) ? bidSizes : [bidSizes]);
+      bidSizes = bidSizes.filter(size => isArray(size));
       const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}));
 
       const element = document.getElementById(bid.adUnitCode);
       const minSize = _getMinSize(processedSizes);
       const viewabilityAmount = _isViewabilityMeasurable(element)
-        ? _getViewability(element, utils.getWindowTop(), minSize)
+        ? _getViewability(element, getWindowTop(), minSize)
         : 'na';
       const viewabilityAmountRounded = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
 
@@ -46,17 +46,17 @@ function buildRequests(bidReqs, bidderRequest) {
         },
         tagid: String(bid.adUnitCode)
       };
-      const bidFloor = utils.getBidIdParameter('bidFloor', bid.params);
+      const bidFloor = _getBidFloor(bid);
       if (bidFloor) {
         imp.bidfloor = bidFloor;
       }
       brightcomImps.push(imp);
     });
     const brightcomBidReq = {
-      id: utils.getUniqueIdentifierStr(),
+      id: getUniqueIdentifierStr(),
       imp: brightcomImps,
       site: {
-        domain: utils.parseUrl(referrer).host,
+        domain: bidderRequest?.refererInfo?.domain || '',
         page: referrer,
         publisher: {
           id: publisherId
@@ -70,6 +70,31 @@ function buildRequests(bidReqs, bidderRequest) {
       tmax: config.getConfig('bidderTimeout')
     };
 
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      deepSetValue(brightcomBidReq, 'regs.ext.gdpr', +bidderRequest.gdprConsent.gdprApplies);
+      deepSetValue(brightcomBidReq, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+    }
+
+    if (bidderRequest && bidderRequest.uspConsent) {
+      deepSetValue(brightcomBidReq, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(brightcomBidReq, 'regs.coppa', 1);
+    }
+
+    if (bidReqs[0] && bidReqs[0].schain) {
+      deepSetValue(brightcomBidReq, 'source.ext.schain', bidReqs[0].schain)
+    }
+
+    if (bidReqs[0] && bidReqs[0].userIdAsEids) {
+      deepSetValue(brightcomBidReq, 'user.ext.eids', bidReqs[0].userIdAsEids || [])
+    }
+
+    if (bidReqs[0] && bidReqs[0].userId) {
+      deepSetValue(brightcomBidReq, 'user.ext.ids', bidReqs[0].userId || [])
+    }
+
     return {
       method: 'POST',
       url: URL,
@@ -77,7 +102,7 @@ function buildRequests(bidReqs, bidderRequest) {
       options: {contentType: 'text/plain', withCredentials: false}
     };
   } catch (e) {
-    utils.logError(e, {bidReqs, bidderRequest});
+    logError(e, {bidReqs, bidderRequest});
   }
 }
 
@@ -95,10 +120,10 @@ function isBidRequestValid(bid) {
 
 function interpretResponse(serverResponse) {
   if (!serverResponse.body || typeof serverResponse.body != 'object') {
-    utils.logWarn('Brightcom server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
+    logWarn('Brightcom server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
     return [];
   }
-  const { body: {id, seatbid} } = serverResponse;
+  const {body: {id, seatbid}} = serverResponse;
   try {
     const brightcomBidResponses = [];
     if (id &&
@@ -117,13 +142,16 @@ function interpretResponse(serverResponse) {
           netRevenue: true,
           mediaType: BANNER,
           ad: _getAdMarkup(brightcomBid),
-          ttl: 60
+          ttl: 60,
+          meta: {
+            advertiserDomains: brightcomBid && brightcomBid.adomain ? brightcomBid.adomain : []
+          }
         });
       });
     }
     return brightcomBidResponses;
   } catch (e) {
-    utils.logError(e, {id, seatbid});
+    logError(e, {id, seatbid});
   }
 }
 
@@ -147,7 +175,7 @@ function _getDeviceType() {
 function _getAdMarkup(bid) {
   let adm = bid.adm;
   if ('nurl' in bid) {
-    adm += utils.createTrackPixelHtml(bid.nurl);
+    adm += createTrackPixelHtml(bid.nurl);
   }
   return adm;
 }
@@ -156,15 +184,15 @@ function _isViewabilityMeasurable(element) {
   return !_isIframe() && element !== null;
 }
 
-function _getViewability(element, topWin, { w, h } = {}) {
-  return utils.getWindowTop().document.visibilityState === 'visible'
-    ? _getPercentInView(element, topWin, { w, h })
+function _getViewability(element, topWin, {w, h} = {}) {
+  return getWindowTop().document.visibilityState === 'visible'
+    ? _getPercentInView(element, topWin, {w, h})
     : 0;
 }
 
 function _isIframe() {
   try {
-    return utils.getWindowSelf() !== utils.getWindowTop();
+    return getWindowSelf() !== getWindowTop();
   } catch (e) {
     return true;
   }
@@ -174,8 +202,8 @@ function _getMinSize(sizes) {
   return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
 }
 
-function _getBoundingBox(element, { w, h } = {}) {
-  let { width, height, left, top, right, bottom } = element.getBoundingClientRect();
+function _getBoundingBox(element, {w, h} = {}) {
+  let {width, height, left, top, right, bottom} = element.getBoundingClientRect();
 
   if ((width === 0 || height === 0) && w && h) {
     width = w;
@@ -184,7 +212,7 @@ function _getBoundingBox(element, { w, h } = {}) {
     bottom = top + h;
   }
 
-  return { width, height, left, top, right, bottom };
+  return {width, height, left, top, right, bottom};
 }
 
 function _getIntersectionOfRects(rects) {
@@ -217,16 +245,16 @@ function _getIntersectionOfRects(rects) {
   return bbox;
 }
 
-function _getPercentInView(element, topWin, { w, h } = {}) {
-  const elementBoundingBox = _getBoundingBox(element, { w, h });
+function _getPercentInView(element, topWin, {w, h} = {}) {
+  const elementBoundingBox = _getBoundingBox(element, {w, h});
 
   // Obtain the intersection of the element and the viewport
-  const elementInViewBoundingBox = _getIntersectionOfRects([ {
+  const elementInViewBoundingBox = _getIntersectionOfRects([{
     left: 0,
     top: 0,
     right: topWin.innerWidth,
     bottom: topWin.innerHeight
-  }, elementBoundingBox ]);
+  }, elementBoundingBox]);
 
   let elementInViewArea, elementTotalArea;
 
@@ -243,4 +271,20 @@ function _getPercentInView(element, topWin, { w, h } = {}) {
   return 0;
 }
 
+function _getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidFloor ? bid.params.bidFloor : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 registerBidder(spec);
diff --git a/modules/britepoolIdSystem.js b/modules/britepoolIdSystem.js
index 17a39e96aad..2316fbb732d 100644
--- a/modules/britepoolIdSystem.js
+++ b/modules/britepoolIdSystem.js
@@ -5,9 +5,10 @@
  * @requires module:modules/userId
  */
 
-import * as utils from '../src/utils.js'
+import { isEmpty, triggerPixel, logError } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import {submodule} from '../src/hook.js';
+const PIXEL = 'https://px.britepool.com/new?partner_id=t';
 
 /** @type {Submodule} */
 export const britepoolIdSubmodule = {
@@ -28,10 +29,12 @@ export const britepoolIdSubmodule = {
   /**
    * Performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [submoduleConfig]
+   * @param {ConsentData|undefined} consentData
    * @returns {function(callback:function)}
    */
-  getId(submoduleConfigParams, consentData) {
+  getId(submoduleConfig, consentData) {
+    const submoduleConfigParams = (submoduleConfig && submoduleConfig.params) || {};
     const { params, headers, url, getter, errors } = britepoolIdSubmodule.createParams(submoduleConfigParams, consentData);
     let getterResponse = null;
     if (typeof getter === 'function') {
@@ -44,11 +47,14 @@ export const britepoolIdSubmodule = {
         };
       }
     }
+    if (isEmpty(params)) {
+      triggerPixel(PIXEL);
+    }
     // Return for async operation
     return {
       callback: function(callback) {
         if (errors.length > 0) {
-          errors.forEach(error => utils.logError(error));
+          errors.forEach(error => logError(error));
           callback();
           return;
         }
@@ -59,7 +65,7 @@ export const britepoolIdSubmodule = {
               callback(britepoolIdSubmodule.normalizeValue(response));
             });
           } catch (error) {
-            if (error !== '') utils.logError(error);
+            if (error !== '') logError(error);
             callback();
           }
         } else {
@@ -69,7 +75,7 @@ export const britepoolIdSubmodule = {
               callback(responseObj ? { primaryBPID: responseObj.primaryBPID } : null);
             },
             error: error => {
-              if (error !== '') utils.logError(error);
+              if (error !== '') logError(error);
               callback();
             }
           }, JSON.stringify(params), { customHeaders: headers, contentType: 'application/json', method: 'POST', withCredentials: true });
@@ -79,13 +85,17 @@ export const britepoolIdSubmodule = {
   },
   /**
    * Helper method to create params for our API call
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleParams} [submoduleConfigParams]
+   * @param {ConsentData|undefined} consentData
    * @returns {object} Object with parsed out params
    */
   createParams(submoduleConfigParams, consentData) {
+    const hasGdprData = consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies;
+    const gdprConsentString = hasGdprData ? consentData.consentString : undefined;
     let errors = [];
     const headers = {};
-    let params = Object.assign({}, submoduleConfigParams);
+    const dynamicVars = typeof britepool_pubparams !== 'undefined' ? britepool_pubparams : {}; // eslint-disable-line camelcase, no-undef
+    let params = Object.assign({}, submoduleConfigParams, dynamicVars);
     if (params.getter) {
       // Custom getter will not require other params
       if (typeof params.getter !== 'function') {
@@ -98,7 +108,7 @@ export const britepoolIdSubmodule = {
         headers['x-api-key'] = params.api_key;
       }
     }
-    const url = params.url || 'https://api.britepool.com/v1/britepool/id';
+    const url = params.url || `https://api.britepool.com/v1/britepool/id${gdprConsentString ? '?gdprString=' + encodeURIComponent(gdprConsentString) : ''}`;
     const getter = params.getter;
     delete params.api_key;
     delete params.url;
@@ -122,7 +132,7 @@ export const britepoolIdSubmodule = {
       try {
         valueObj = JSON.parse(value);
       } catch (error) {
-        utils.logError(error);
+        logError(error);
       }
     }
     return valueObj;
diff --git a/modules/britepoolIdSystem.md b/modules/britepoolIdSystem.md
index 89287aed7ca..72edbe2324b 100644
--- a/modules/britepoolIdSystem.md
+++ b/modules/britepoolIdSystem.md
@@ -4,10 +4,10 @@ BritePool User ID Module. For assistance setting up your module please contact u
 
 ### Prebid Params
 
-Individual params may be set for the BritePool User ID Submodule. At least one identifier must be set in the params.
+Individual params may be set for the BritePool User ID Submodule. 
 ```
 pbjs.setConfig({
-    usersync: {
+    userSync: {
         userIds: [{
             name: 'britepoolId',
             storage: {
diff --git a/modules/browsiRtdProvider.js b/modules/browsiRtdProvider.js
index 9317786fb8d..31b2d709f35 100644
--- a/modules/browsiRtdProvider.js
+++ b/modules/browsiRtdProvider.js
@@ -13,30 +13,30 @@
  * @property {string} pubKey
  * @property {string} url
  * @property {?string} keyName
- * @property {?number} auctionDelay
- * @property {?number} timeout
  */
 
-import {config} from '../src/config.js';
-import * as utils from '../src/utils.js';
+import {deepClone, deepSetValue, isFn, isGptPubadsDefined, isNumber, logError, logInfo, generateUUID} from '../src/utils.js';
 import {submodule} from '../src/hook.js';
 import {ajaxBuilder} from '../src/ajax.js';
 import {loadExternalScript} from '../src/adloader.js';
-import { getStorageManager } from '../src/storageManager.js';
-import find from 'core-js-pure/features/array/find.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {find, includes} from '../src/polyfill.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
 
 const storage = getStorageManager();
 
-/** @type {string} */
-const MODULE_NAME = 'realTimeData';
-/** @type {number} */
-const DEF_TIMEOUT = 1000;
 /** @type {ModuleParams} */
 let _moduleParams = {};
 /** @type {null|Object} */
-let _data = null;
+let _browsiData = null;
+/** @type {string} */
+const DEF_KEYNAME = 'browsiViewability';
 /** @type {null | function} */
 let _dataReadyCallback = null;
+/** @type {null|Object} */
+let _ic = {};
 
 /**
  * add browsi script to page
@@ -50,25 +50,37 @@ export function addBrowsiTag(data) {
   script.setAttribute('prebidbpt', 'true');
   script.setAttribute('id', 'browsi-tag');
   script.setAttribute('src', data.u);
-  script.prebidData = utils.deepClone(data);
+  script.prebidData = deepClone(data);
   if (_moduleParams.keyName) {
     script.prebidData.kn = _moduleParams.keyName;
   }
   return script;
 }
 
+export function sendPageviewEvent(eventType) {
+  if (eventType === 'PAGEVIEW') {
+    window.addEventListener('browsi_pageview', () => {
+      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+        vendor: 'browsi',
+        type: 'pageview',
+        billingId: generateUUID()
+      })
+    })
+  }
+}
+
 /**
  * collect required data from page
  * send data to browsi server to get predictions
  */
-function collectData() {
+export function collectData() {
   const win = window.top;
   const doc = win.document;
   let browsiData = null;
   try {
     browsiData = storage.getDataFromLocalStorage('__brtd');
   } catch (e) {
-    utils.logError('unable to parse __brtd');
+    logError('unable to parse __brtd');
   }
 
   let predictorData = {
@@ -85,63 +97,81 @@ function collectData() {
   getPredictionsFromServer(`//${_moduleParams.url}/prebid?${toUrlParams(predictorData)}`);
 }
 
-export function setData(data) {
-  _data = data;
-
-  if (typeof _dataReadyCallback === 'function') {
-    _dataReadyCallback(_data);
-    _dataReadyCallback = null;
-  }
-}
-
 /**
  * wait for data from server
  * call callback when data is ready
  * @param {function} callback
  */
 function waitForData(callback) {
-  if (_data) {
+  if (_browsiData) {
     _dataReadyCallback = null;
-    callback(_data);
+    callback();
   } else {
     _dataReadyCallback = callback;
   }
 }
 
-/**
- * filter server data according to adUnits received
- * call callback (onDone) when data is ready
- * @param {adUnit[]} adUnits
- * @param {function} onDone callback function
- */
-function sendDataToModule(adUnits, onDone) {
+export function setData(data) {
+  _browsiData = data;
+  if (isFn(_dataReadyCallback)) {
+    _dataReadyCallback();
+    _dataReadyCallback = null;
+  }
+}
+
+function getRTD(auc) {
+  logInfo(`Browsi RTD provider is fetching data for ${auc}`);
   try {
-    waitForData(_predictionsData => {
-      const _predictions = _predictionsData.p;
-      if (!_predictions || !Object.keys(_predictions).length) {
-        return onDone({});
+    const _bp = (_browsiData && _browsiData.p) || {};
+    return auc.reduce((rp, uc) => {
+      _ic[uc] = _ic[uc] || 0;
+      const _c = _ic[uc];
+      if (!uc) {
+        return rp
       }
-      let dataToReturn = adUnits.reduce((rp, cau) => {
-        const adUnitCode = cau && cau.code;
-        if (!adUnitCode) { return rp }
-        const adSlot = getSlotByCode(adUnitCode);
-        const identifier = adSlot ? getMacroId(_predictionsData.pmd, adSlot) : adUnitCode;
-        const predictionData = _predictions[identifier];
-        if (!predictionData) { return rp }
-
-        if (predictionData.p) {
-          if (!isIdMatchingAdUnit(adSlot, predictionData.w)) {
-            return rp;
-          }
-          rp[adUnitCode] = getKVObject(predictionData.p, _predictionsData.kn);
+      const adSlot = getSlotByCode(uc);
+      const identifier = adSlot ? getMacroId(_browsiData['pmd'], adSlot) : uc;
+      const _pd = _bp[identifier];
+      rp[uc] = getKVObject(-1);
+      if (!_pd) {
+        return rp
+      }
+      if (_pd.ps) {
+        if (!isIdMatchingAdUnit(adSlot, _pd.w)) {
+          return rp;
         }
-        return rp;
-      }, {});
-      return onDone(dataToReturn);
-    });
+        rp[uc] = getKVObject(getCurrentData(_pd.ps, _c));
+      }
+      return rp;
+    }, {});
   } catch (e) {
-    onDone({});
+    return {};
+  }
+}
+
+/**
+ * get prediction
+ * return -1 if prediction not found
+ * @param {object} predictionObject
+ * @param {number} _c
+ * @return {number}
+ */
+export function getCurrentData(predictionObject, _c) {
+  if (!predictionObject || !isNumber(_c)) {
+    return -1;
+  }
+  if (isNumber(predictionObject[_c])) {
+    return predictionObject[_c];
+  }
+  if (Object.keys(predictionObject).length > 1) {
+    while (_c > 0) {
+      _c--;
+      if (isNumber(predictionObject[_c])) {
+        return predictionObject[_c];
+      }
+    }
   }
+  return -1;
 }
 
 /**
@@ -149,7 +179,7 @@ function sendDataToModule(adUnits, onDone) {
  * @return {Object[]} slot GoogleTag slots
  */
 function getAllSlots() {
-  return utils.isGptPubadsDefined() && window.googletag.pubads().getSlots();
+  return isGptPubadsDefined() && window.googletag.pubads().getSlots();
 }
 /**
  * get prediction and return valid object for key value set
@@ -157,12 +187,16 @@ function getAllSlots() {
  * @param {string?} keyName
  * @return {Object} key:value
  */
-function getKVObject(p, keyName) {
+function getKVObject(p) {
   const prValue = p < 0 ? 'NA' : (Math.floor(p * 10) / 10).toFixed(2);
   let prObject = {};
-  prObject[((_moduleParams['keyName'] || keyName).toString())] = prValue.toString();
+  prObject[getKey()] = prValue.toString();
   return prObject;
 }
+
+function getKey() {
+  return ((_moduleParams['keyName'] || (_browsiData && _browsiData['kn']) || DEF_KEYNAME).toString())
+}
 /**
  * check if placement id matches one of given ad units
  * @param {Object} slot google slot
@@ -204,7 +238,7 @@ export function getMacroId(macro, slot) {
       });
       return macroResult;
     } catch (e) {
-      utils.logError(`failed to evaluate: ${macro}`);
+      logError(`failed to evaluate: ${macro}`);
     }
   }
   return slot.getSlotElementId();
@@ -231,7 +265,7 @@ function evaluate(macro, divId, adUnit, replacer) {
  * @param {string} url server url with query params
  */
 function getPredictionsFromServer(url) {
-  let ajax = ajaxBuilder(_moduleParams.auctionDelay || _moduleParams.timeout || DEF_TIMEOUT);
+  let ajax = ajaxBuilder();
 
   ajax(url,
     {
@@ -240,13 +274,14 @@ function getPredictionsFromServer(url) {
           try {
             const data = JSON.parse(response);
             if (data && data.p && data.kn) {
-              setData({p: data.p, kn: data.kn, pmd: data.pmd});
+              setData({p: data.p, kn: data.kn, pmd: data.pmd, bet: data.bet});
             } else {
               setData({});
             }
+            sendPageviewEvent(data.bet);
             addBrowsiTag(data);
           } catch (err) {
-            utils.logError('unable to parse data');
+            logError('unable to parse data');
             setData({})
           }
         } else if (req.status === 204) {
@@ -256,7 +291,7 @@ function getPredictionsFromServer(url) {
       },
       error: function () {
         setData({});
-        utils.logError('unable to get prediction data');
+        logError('unable to get prediction data');
       }
     }
   );
@@ -273,6 +308,28 @@ function toUrlParams(data) {
     .join('&');
 }
 
+function setBidRequestsData(bidObj, callback) {
+  let adUnitCodes = bidObj.adUnitCodes;
+  let adUnits = bidObj.adUnits || getGlobal().adUnits || [];
+  if (adUnitCodes) {
+    adUnits = adUnits.filter(au => includes(adUnitCodes, au.code));
+  } else {
+    adUnitCodes = adUnits.map(au => au.code);
+  }
+  waitForData(() => {
+    const data = getRTD(adUnitCodes);
+    if (data) {
+      adUnits.forEach(adUnit => {
+        const adUnitCode = adUnit.code;
+        if (data[adUnitCode]) {
+          deepSetValue(adUnit, 'ortb2Imp.ext.data.browsi', {[getKey()]: data[adUnitCode][getKey()]});
+        }
+      });
+    }
+    callback();
+  })
+}
+
 /** @type {RtdSubmodule} */
 export const browsiSubmodule = {
   /**
@@ -283,30 +340,47 @@ export const browsiSubmodule = {
   /**
    * get data and send back to realTimeData module
    * @function
-   * @param {adUnit[]} adUnits
-   * @param {function} onDone
+   * @param {string[]} adUnitsCodes
    */
-  getData: sendDataToModule
+  getTargetingData: getTargetingData,
+  init: init,
+  getBidRequestData: setBidRequestsData
 };
 
-export function init(config) {
-  const confListener = config.getConfig(MODULE_NAME, ({realTimeData}) => {
-    try {
-      _moduleParams = realTimeData.dataProviders && realTimeData.dataProviders.filter(
-        pr => pr.name && pr.name.toLowerCase() === 'browsi')[0].params;
-      _moduleParams.auctionDelay = realTimeData.auctionDelay;
-      _moduleParams.timeout = realTimeData.timeout;
-    } catch (e) {
-      _moduleParams = {};
+function getTargetingData(uc, c, us, a) {
+  const targetingData = getRTD(uc);
+  const auctionId = a.auctionId;
+  const sendAdRequestEvent = (_browsiData && _browsiData['bet'] === 'AD_REQUEST');
+  uc.forEach(auc => {
+    if (isNumber(_ic[auc])) {
+      _ic[auc] = _ic[auc] + 1;
     }
-    if (_moduleParams.siteKey && _moduleParams.pubKey && _moduleParams.url) {
-      confListener();
-      collectData();
-    } else {
-      utils.logError('missing params for Browsi provider');
+    if (sendAdRequestEvent) {
+      const transactionId = a.adUnits.find(adUnit => adUnit.code === auc).transactionId;
+      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+        vendor: 'browsi',
+        type: 'adRequest',
+        billingId: generateUUID(),
+        transactionId: transactionId,
+        auctionId: auctionId
+      })
     }
   });
+  logInfo('Browsi RTD provider returned targeting data', targetingData, 'for', uc)
+  return targetingData;
+}
+
+function init(moduleConfig) {
+  _moduleParams = moduleConfig.params;
+  if (_moduleParams && _moduleParams.siteKey && _moduleParams.pubKey && _moduleParams.url) {
+    collectData();
+  } else {
+    logError('missing params for Browsi provider');
+  }
+  return true;
 }
 
-submodule('realTimeData', browsiSubmodule);
-init(config);
+function registerSubModule() {
+  submodule('realTimeData', browsiSubmodule);
+}
+registerSubModule();
diff --git a/modules/browsiRtdProvider.md b/modules/browsiRtdProvider.md
new file mode 100644
index 00000000000..9eed4b2b2d4
--- /dev/null
+++ b/modules/browsiRtdProvider.md
@@ -0,0 +1,55 @@
+# Overview
+
+The Browsi RTD module provides viewability predictions for ad slots on the page.
+To use this module, you’ll need to work with [Browsi](https://gobrowsi.com/) to get an account and receive instructions on how to set up your pages and ad server.
+
+# Configurations
+
+Compile the Browsi RTD Provider into your Prebid build:
+
+`gulp build --modules=browsiRtdProvider`
+
+
+Configuration example for using RTD module with `browsi` provider
+```javascript
+    pbjs.setConfig({
+        "realTimeData": {
+            "auctionDelay": 1000,
+            dataProviders:[{
+                "name": "browsi",
+                "waitForIt": "true"
+                "params": {
+                    "url": "yield-manager.browsiprod.com",
+                    "siteKey": "browsidemo",
+                    "pubKey": "browsidemo"
+                    "keyName":"bv"
+                }  
+            }]
+        }
+    });
+```  
+
+#Params
+
+Contact Browsi to get required params
+
+|  param name | type  |Scope | Description |
+| :------------ | :------------ | :------- | :------- |
+| url  | string  | required | Browsi server URL |
+| siteKey  | string  | required | Site key |
+| pubKey  | string  | required | Publisher key |
+| keyName  | string  | optional | Ad unit targeting key |
+
+
+#Output
+`getTargetingData` function will return expected viewability prediction in the following structure:
+```json
+{
+  "adUnitCode":{
+      "browsiViewability":"0.6"
+  },
+  "adUnitCode2":{
+      "browsiViewability":"0.9"
+  }
+}
+``` 
diff --git a/modules/bucksenseBidAdapter.js b/modules/bucksenseBidAdapter.js
index 3f327e62121..7b6c3911ea1 100644
--- a/modules/bucksenseBidAdapter.js
+++ b/modules/bucksenseBidAdapter.js
@@ -1,10 +1,10 @@
+import { logInfo } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
 
 const WHO = 'BKSHBID-005';
 const BIDDER_CODE = 'bucksense';
-const URL = 'https://prebid.bksn.se/prebidjs/';
+const URL = 'https://directo.prebidserving.com/prebidjs/';
 
 export const spec = {
   code: BIDDER_CODE,
@@ -17,7 +17,7 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
   */
   isBidRequestValid: function (bid) {
-    utils.logInfo(WHO + ' isBidRequestValid() - INPUT bid:', bid);
+    logInfo(WHO + ' isBidRequestValid() - INPUT bid:', bid);
     if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
       return false;
     }
@@ -34,7 +34,7 @@ export const spec = {
     * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    utils.logInfo(WHO + ' buildRequests() - INPUT validBidRequests:', validBidRequests, 'INPUT bidderRequest:', bidderRequest);
+    logInfo(WHO + ' buildRequests() - INPUT validBidRequests:', validBidRequests, 'INPUT bidderRequest:', bidderRequest);
     let requests = [];
     const len = validBidRequests.length;
     for (let i = 0; i < len; i++) {
@@ -64,7 +64,7 @@ export const spec = {
         data: sendData
       });
     }
-    utils.logInfo(WHO + ' buildRequests() - requests:', requests);
+    logInfo(WHO + ' buildRequests() - requests:', requests);
     return requests;
   },
 
@@ -75,7 +75,7 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
   */
   interpretResponse: function (serverResponse, request) {
-    utils.logInfo(WHO + ' interpretResponse() - INPUT serverResponse:', serverResponse, 'INPUT request:', request);
+    logInfo(WHO + ' interpretResponse() - INPUT serverResponse:', serverResponse, 'INPUT request:', request);
 
     const bidResponses = [];
     if (serverResponse.body) {
@@ -90,14 +90,15 @@ export const spec = {
       var sCurrency = oResponse.currency || 'USD';
       var bNetRevenue = oResponse.netRevenue || true;
       var sAd = oResponse.ad || '';
+      var sAdomains = oResponse.adomains || [];
 
       if (request && sRequestID.length == 0) {
-        utils.logInfo(WHO + ' interpretResponse() - use RequestID from Placments');
+        logInfo(WHO + ' interpretResponse() - use RequestID from Placments');
         sRequestID = request.data.bid_id || '';
       }
 
       if (request && request.data.params.hasOwnProperty('testcpm')) {
-        utils.logInfo(WHO + ' interpretResponse() - use Test CPM ');
+        logInfo(WHO + ' interpretResponse() - use Test CPM ');
         nCPM = request.data.params.testcpm;
       }
 
@@ -110,13 +111,16 @@ export const spec = {
         creativeId: sCreativeID,
         currency: sCurrency,
         netRevenue: bNetRevenue,
-        ad: sAd
+        ad: sAd,
+        meta: {
+          advertiserDomains: sAdomains
+        }
       };
       bidResponses.push(bidResponse);
     } else {
-      utils.logInfo(WHO + ' interpretResponse() - serverResponse not valid');
+      logInfo(WHO + ' interpretResponse() - serverResponse not valid');
     }
-    utils.logInfo(WHO + ' interpretResponse() - return', bidResponses);
+    logInfo(WHO + ' interpretResponse() - return', bidResponses);
     return bidResponses;
   },
 
diff --git a/modules/buzzoolaBidAdapter.js b/modules/buzzoolaBidAdapter.js
index f87607657c3..b5ea6227f58 100644
--- a/modules/buzzoolaBidAdapter.js
+++ b/modules/buzzoolaBidAdapter.js
@@ -1,8 +1,9 @@
-import * as utils from '../src/utils.js';
+import { deepAccess, deepClone } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
 import {OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'buzzoola';
 const ENDPOINT = 'https://exchange.buzzoola.com/ssp/prebidjs';
@@ -11,7 +12,7 @@ const RENDERER_SRC = 'https://tube.buzzoola.com/new/build/buzzlibrary.js';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['buzzoolaAdapter'],
-  supportedMediaTypes: [BANNER, VIDEO],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -21,7 +22,7 @@ export const spec = {
    */
   isBidRequestValid: function (bid) {
     let types = bid.mediaTypes;
-    return !!(bid && bid.mediaTypes && (types.banner || types.video) && bid.params && bid.params.placementId);
+    return !!(bid && bid.mediaTypes && (types.banner || types.video || types.native) && bid.params && bid.params.placementId);
   },
 
   /**
@@ -32,6 +33,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidderRequest.bids = convertOrtbRequestToProprietaryNative(bidderRequest.bids);
+
     return {
       url: ENDPOINT,
       method: 'POST',
@@ -62,8 +66,8 @@ export const spec = {
 
     return response.map(bid => {
       let requestBid = requestBids[bid.requestId];
-      let context = utils.deepAccess(requestBid, 'mediaTypes.video.context');
-      let validBid = utils.deepClone(bid);
+      let context = deepAccess(requestBid, 'mediaTypes.video.context');
+      let validBid = deepClone(bid);
 
       if (validBid.mediaType === VIDEO && context === OUTSTREAM) {
         let renderer = Renderer.install({
@@ -88,7 +92,7 @@ export const spec = {
  */
 function setOutstreamRenderer(bid) {
   let adData = JSON.parse(bid.ad);
-  let unitSettings = utils.deepAccess(adData, 'placement.unit_settings');
+  let unitSettings = deepAccess(adData, 'placement.unit_settings');
   let extendedSettings = {
     width: '' + bid.width,
     height: '' + bid.height,
diff --git a/modules/buzzoolaBidAdapter.md b/modules/buzzoolaBidAdapter.md
index aec3eda6c58..87f5262af4f 100644
--- a/modules/buzzoolaBidAdapter.md
+++ b/modules/buzzoolaBidAdapter.md
@@ -26,7 +26,7 @@ var adUnits = [
         bids: [{
             bidder: 'buzzoola',
             params: {
-                placementId: 417846
+                placementId: 417845
             }
         }]
     },
@@ -45,7 +45,7 @@ var adUnits = [
         bids: [{
             bidder: 'buzzoola',
             params: {
-                placementId: 417845
+                placementId: 417846
             }
         }]
     },
@@ -67,6 +67,44 @@ var adUnits = [
                 placementId: 417845
             }
         }]
+    },
+    // Native adUnit
+    {
+        code: '/21737252144/prebid_test_native',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: true,
+                    sizes: [640, 134]
+                },
+                title: {
+                    required: true,
+                    len: 80
+                },
+                sponsoredBy: {
+                    required: true
+                },
+                clickUrl: {
+                    required: true
+                },
+                privacyLink: {
+                    required: false
+                },
+                body: {
+                    required: true
+                },
+                icon: {
+                    required: true,
+                    sizes: [50, 50]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'buzzoola',
+            params: {
+                placementId: 417845
+            }
+        }]
     }
 ];
 ```
diff --git a/modules/byDataAnalyticsAdapter.js b/modules/byDataAnalyticsAdapter.js
new file mode 100644
index 00000000000..84479ee618b
--- /dev/null
+++ b/modules/byDataAnalyticsAdapter.js
@@ -0,0 +1,409 @@
+import { deepClone, logInfo, logError } from '../src/utils.js';
+import Base64 from 'crypto-js/enc-base64';
+import hmacSHA512 from 'crypto-js/hmac-sha512';
+import enc from 'crypto-js/enc-utf8';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { auctionManager } from '../src/auctionManager.js';
+import { ajax } from '../src/ajax.js';
+
+const versionCode = '4.4.1'
+const secretKey = 'bydata@123456'
+const { EVENTS: { NO_BID, BID_TIMEOUT, AUCTION_END, AUCTION_INIT, BID_WON } } = CONSTANTS
+const DEFAULT_EVENT_URL = 'https://pbjs-stream.bydata.com/topics/prebid'
+const analyticsType = 'endpoint'
+const isBydata = isKeyInUrl('bydata_debug')
+const adunitsMap = {}
+const storage = getStorageManager();
+let initOptions = {}
+var payload = {}
+var winPayload = {}
+var isDataSend = window.asc_data || false
+var bdNbTo = { 'to': [], 'nb': [] }
+
+/* method used for testing parameters */
+function isKeyInUrl(name) {
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+  const param = urlParams.get(name)
+  return param
+}
+
+/* return ad unit full path wrt custom ad unit code */
+function getAdunitName(code) {
+  var name = code;
+  for (const [key, value] of Object.entries(adunitsMap)) {
+    if (key === code) { name = value; }
+  }
+  return name;
+}
+
+/* EVENT: auction init */
+function onAuctionStart(t) {
+  /* map of ad unit code - ad unit full path */
+  t.adUnits && t.adUnits.length && t.adUnits.forEach((adu) => {
+    const { code, adunit } = adu
+    adunitsMap[code] = adunit
+  });
+}
+
+/* EVENT: bid timeout */
+function onBidTimeout(t) {
+  if (payload['visitor_data'] && t && t.length > 0) {
+    bdNbTo['to'] = t
+  }
+}
+
+/* EVENT: no bid */
+function onNoBidData(t) {
+  if (payload['visitor_data'] && t) {
+    bdNbTo['nb'].push(t)
+  }
+}
+
+/* EVENT: bid won */
+function onBidWon(t) {
+  const { isCorrectOption } = initOptions
+  if (isCorrectOption && (isDataSend || isBydata)) {
+    ascAdapter.getBidWonData(t)
+    ascAdapter.sendPayload(winPayload)
+  }
+}
+
+/* EVENT: auction end */
+function onAuctionEnd(t) {
+  const { isCorrectOption } = initOptions;
+  setTimeout(() => {
+    if (isCorrectOption && (isDataSend || isBydata)) {
+      ascAdapter.dataProcess(t);
+      ascAdapter.sendPayload(payload);
+    }
+  }, 500);
+}
+
+const ascAdapter = Object.assign(adapter({ url: DEFAULT_EVENT_URL, analyticsType: analyticsType }), {
+  track({ eventType, args }) {
+    switch (eventType) {
+      case AUCTION_INIT:
+        onAuctionStart(args);
+        break;
+      case NO_BID:
+        onNoBidData(args);
+        break;
+      case BID_TIMEOUT:
+        onBidTimeout(args);
+        break;
+      case AUCTION_END:
+        onAuctionEnd(args);
+        break;
+      case BID_WON:
+        onBidWon(args);
+        break;
+      default:
+        break;
+    }
+  }
+});
+
+// save the base class function
+ascAdapter.originEnableAnalytics = ascAdapter.enableAnalytics;
+// override enableAnalytics so we can get access to the config passed in from the page
+ascAdapter.enableAnalytics = function (config) {
+  if (this.initConfig(config)) {
+    initOptions.isCorrectOption && ascAdapter.getVisitorData();
+    ascAdapter.originEnableAnalytics(config);
+  }
+};
+
+ascAdapter.initConfig = function (config) {
+  let isCorrectOption = true;
+  initOptions = {};
+  var rndNum = Math.floor(Math.random() * 10000 + 1);
+  initOptions.options = deepClone(config.options);
+  initOptions.clientId = initOptions.options.clientId || null;
+  initOptions.logFrequency = initOptions.options.logFrequency;
+  if (!initOptions.clientId) {
+    _logError('"options.clientId" should not empty!!');
+    isCorrectOption = false;
+  }
+  if (rndNum <= initOptions.logFrequency) { window.asc_data = isDataSend = true; }
+  initOptions.isCorrectOption = isCorrectOption;
+  this.initOptions = initOptions;
+  return isCorrectOption;
+};
+
+ascAdapter.getBidWonData = function(t) {
+  const { auctionId, adUnitCode, size, requestId, bidder, timeToRespond, currency, mediaType, cpm } = t
+  const aun = getAdunitName(adUnitCode)
+  winPayload['aid'] = auctionId
+  winPayload['as'] = '';
+  winPayload['auctionData'] = [];
+  var data = {}
+  data['au'] = aun
+  data['auc'] = adUnitCode
+  data['aus'] = size
+  data['bid'] = requestId
+  data['bidadv'] = bidder
+  data['br_pb_mg'] = cpm
+  data['br_tr'] = timeToRespond
+  data['bradv'] = bidder
+  data['brid'] = requestId
+  data['brs'] = size
+  data['cur'] = currency
+  data['inb'] = 0
+  data['ito'] = 0
+  data['ipwb'] = 1
+  data['iwb'] = 1
+  data['mt'] = mediaType
+  winPayload['auctionData'].push(data)
+  return winPayload
+}
+
+ascAdapter.getVisitorData = function (data = {}) {
+  var ua = data.uid ? data : {};
+  var module = {
+    options: [],
+    header: [window.navigator.platform, window.navigator.userAgent, window.navigator.appVersion, window.navigator.vendor, window.opera],
+    dataos: [
+      { name: 'Windows Phone', value: 'Windows Phone', version: 'OS' },
+      { name: 'Windows', value: 'Win', version: 'NT' },
+      { name: 'iPhone', value: 'iPhone', version: 'OS' },
+      { name: 'iPad', value: 'iPad', version: 'OS' },
+      { name: 'Kindle', value: 'Silk', version: 'Silk' },
+      { name: 'Android', value: 'Android', version: 'Android' },
+      { name: 'PlayBook', value: 'PlayBook', version: 'OS' },
+      { name: 'BlackBerry', value: 'BlackBerry', version: '/' },
+      { name: 'Macintosh', value: 'Mac', version: 'OS X' },
+      { name: 'Linux', value: 'Linux', version: 'rv' },
+      { name: 'Palm', value: 'Palm', version: 'PalmOS' }
+    ],
+    databrowser: [
+      { name: 'Chrome', value: 'Chrome', version: 'Chrome' },
+      { name: 'Firefox', value: 'Firefox', version: 'Firefox' },
+      { name: 'Safari', value: 'Safari', version: 'Version' },
+      { name: 'Internet Explorer', value: 'MSIE', version: 'MSIE' },
+      { name: 'Opera', value: 'Opera', version: 'Opera' },
+      { name: 'BlackBerry', value: 'CLDC', version: 'CLDC' },
+      { name: 'Mozilla', value: 'Mozilla', version: 'Mozilla' }
+    ],
+    init: function () { var agent = this.header.join(' '); var os = this.matchItem(agent, this.dataos); var browser = this.matchItem(agent, this.databrowser); return { os: os, browser: browser }; },
+    matchItem: function (string, data) {
+      var i = 0; var j = 0; var regex; var regexv; var match; var matches; var version;
+      for (i = 0; i < data.length; i += 1) {
+        regex = new RegExp(data[i].value, 'i');
+        match = regex.test(string);
+        if (match) {
+          regexv = new RegExp(data[i].version + '[- /:;]([\\d._]+)', 'i');
+          matches = string.match(regexv);
+          version = '';
+          if (matches) { if (matches[1]) { matches = matches[1]; } }
+          if (matches) {
+            matches = matches.split(/[._]+/);
+            for (j = 0; j < matches.length; j += 1) {
+              if (j === 0) {
+                version += matches[j] + '.';
+              } else {
+                version += matches[j];
+              }
+            }
+          } else {
+            version = '0';
+          }
+          return {
+            name: data[i].name,
+            version: parseFloat(version)
+          };
+        }
+      }
+      return { name: 'unknown', version: 0 };
+    }
+  };
+
+  function generateUid() {
+    try {
+      var buffer = new Uint8Array(16);
+      crypto.getRandomValues(buffer);
+      buffer[6] = (buffer[6] & ~176) | 64;
+      buffer[8] = (buffer[8] & ~64) | 128;
+      var hex = Array.prototype.map.call(new Uint8Array(buffer), function (x) {
+        return ('00' + x.toString(16)).slice(-2);
+      }).join('');
+      return hex.slice(0, 5) + '-' + hex.slice(5, 9) + '-' + hex.slice(9, 13) + '-' + hex.slice(13, 18);
+    } catch (e) {
+      return '';
+    }
+  }
+  function base64url(source) {
+    var encodedSource = Base64.stringify(source);
+    encodedSource = encodedSource.replace(/=+$/, '');
+    encodedSource = encodedSource.replace(/\+/g, '-');
+    encodedSource = encodedSource.replace(/\//g, '_');
+    return encodedSource;
+  }
+  function getJWToken(data) {
+    var header = {
+      'alg': 'HS256',
+      'typ': 'JWT'
+    };
+    var stringifiedHeader = enc.parse(JSON.stringify(header));
+    var encodedHeader = base64url(stringifiedHeader);
+    var stringifiedData = enc.parse(JSON.stringify(data));
+    var encodedData = base64url(stringifiedData);
+    var token = encodedHeader + '.' + encodedData;
+    var signature = hmacSHA512(token, secretKey);
+    signature = base64url(signature);
+    var signedToken = token + '.' + signature;
+    return signedToken;
+  }
+  function detectWidth() {
+    return window.screen.width || (window.innerWidth && document.documentElement.clientWidth) ? Math.min(window.innerWidth, document.documentElement.clientWidth) : window.innerWidth || document.documentElement.clientWidth || document.getElementsByTagName('body')[0].clientWidth;
+  }
+  function giveDeviceTypeOnScreenSize() {
+    var _dWidth = detectWidth();
+    return _dWidth > 1024 ? 'Desktop' : (_dWidth <= 1024 && _dWidth >= 768) ? 'Tablet' : 'Mobile';
+  }
+
+  const { clientId } = initOptions;
+  var userId = storage.getDataFromLocalStorage('userId');
+  if (!userId) {
+    userId = generateUid();
+    storage.setDataInLocalStorage('userId', userId);
+  }
+  var screenSize = { width: window.screen.width, height: window.screen.height };
+  var deviceType = giveDeviceTypeOnScreenSize();
+  var e = module.init();
+  if (!ua['uid']) {
+    ua['uid'] = userId;
+    ua['cid'] = clientId;
+    ua['pid'] = window.location.hostname;
+    ua['os'] = e.os.name;
+    ua['osv'] = e.os.version;
+    ua['br'] = e.browser.name;
+    ua['brv'] = e.browser.version;
+    ua['ss'] = screenSize;
+    ua['de'] = deviceType;
+    ua['tz'] = window.Intl.DateTimeFormat().resolvedOptions().timeZone;
+  }
+  var signedToken = getJWToken(ua);
+  payload['visitor_data'] = signedToken;
+  winPayload['visitor_data'] = signedToken;
+  return signedToken;
+}
+
+ascAdapter.dataProcess = function (t) {
+  if (isBydata) { payload['bydata_debug'] = 'true'; }
+  _logInfo('fulldata - ', t);
+  payload['aid'] = t.auctionId;
+  payload['as'] = t.timestamp;
+  payload['auctionData'] = [];
+  var bidderRequestsData = []; var bidsReceivedData = [];
+  t.bidderRequests && t.bidderRequests.forEach(bidReq => {
+    var pObj = {}; pObj['bids'] = [];
+    bidReq.bids.forEach(bid => {
+      var data = {};
+      data['adUnitCode'] = bid.adUnitCode;
+      data['sizes'] = bid.sizes;
+      data['bidder'] = bid.bidder;
+      data['bidId'] = bid.bidId;
+      data['mediaTypes'] = [];
+      var mt = bid.mediaTypes.banner ? 'display' : 'video';
+      data['mediaTypes'].push(mt);
+      pObj['bids'].push(data);
+    })
+    bidderRequestsData.push(pObj);
+  });
+  t.bidsReceived && t.bidsReceived.forEach(bid => {
+    const { requestId, bidder, width, height, cpm, currency, timeToRespond, adUnitCode } = bid;
+    bidsReceivedData.push({ requestId, bidder, width, height, cpm, currency, timeToRespond, adUnitCode });
+  });
+  bidderRequestsData.length > 0 && bidderRequestsData.forEach(bdObj => {
+    var bdsArray = bdObj['bids'];
+    bdsArray.forEach(bid => {
+      const { adUnitCode, sizes, bidder, bidId, mediaTypes } = bid;
+      sizes.forEach(size => {
+        var sstr = size[0] + 'x' + size[1]
+        payload['auctionData'].push({ au: getAdunitName(adUnitCode), auc: adUnitCode, aus: sstr, mt: mediaTypes[0], bidadv: bidder, bid: bidId, inb: 0, ito: 0, ipwb: 0, iwb: 0 });
+      });
+    });
+  });
+
+  bidsReceivedData.length > 0 && bidsReceivedData.forEach(bdRecived => {
+    const { requestId, bidder, width, height, cpm, currency, timeToRespond } = bdRecived;
+    payload['auctionData'].forEach(rwData => {
+      if (rwData['bid'] === requestId && rwData['aus'] === width + 'x' + height) {
+        rwData['brid'] = requestId; rwData['bradv'] = bidder; rwData['br_pb_mg'] = cpm;
+        rwData['cur'] = currency; rwData['br_tr'] = timeToRespond; rwData['brs'] = width + 'x' + height;
+      }
+    })
+  });
+
+  var prebidWinningBids = auctionManager.getBidsReceived().filter(bid => bid.status === CONSTANTS.BID_STATUS.BID_TARGETING_SET);
+  prebidWinningBids && prebidWinningBids.length > 0 && prebidWinningBids.forEach(pbbid => {
+    payload['auctionData'] && payload['auctionData'].forEach(rwData => {
+      if (rwData['bid'] === pbbid.requestId && rwData['brs'] === pbbid.size) {
+        rwData['ipwb'] = 1;
+      }
+    });
+  })
+
+  var winningBids = auctionManager.getAllWinningBids();
+  winningBids && winningBids.length > 0 && winningBids.forEach(wBid => {
+    payload['auctionData'] && payload['auctionData'].forEach(rwData => {
+      if (rwData['bid'] === wBid.requestId && rwData['brs'] === wBid.size) {
+        rwData['iwb'] = 1;
+      }
+    });
+  })
+
+  payload['auctionData'] && payload['auctionData'].length > 0 && payload['auctionData'].forEach(u => {
+    bdNbTo['to'].forEach(i => {
+      if (u.bid === i.bidId) u.ito = 1;
+    });
+    bdNbTo['nb'].forEach(i => {
+      if (u.bidadv === i.bidder && u.bid === i.bidId) { u.inb = 1; }
+    })
+  });
+  return payload;
+}
+
+ascAdapter.sendPayload = function (data) {
+  var obj = { 'records': [{ 'value': data }] };
+  let strJSON = JSON.stringify(obj);
+  sendDataOnKf(strJSON);
+}
+
+function sendDataOnKf(dataObj) {
+  ajax(DEFAULT_EVENT_URL, {
+    success: function () {
+      _logInfo('send data success');
+    },
+    error: function (e) {
+      _logInfo('send data error', e);
+    }
+  }, dataObj, {
+    contentType: 'application/vnd.kafka.json.v2+json',
+    method: 'POST',
+    withCredentials: true
+  });
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: ascAdapter,
+  code: 'bydata'
+});
+
+function _logInfo(message, meta) {
+  logInfo(buildLogMessage(message), meta);
+}
+
+function _logError(message) {
+  logError(buildLogMessage(message));
+}
+
+function buildLogMessage(message) {
+  return 'Bydata Prebid Analytics ' + versionCode + ':' + message;
+}
+
+export default ascAdapter;
diff --git a/modules/byDataAnalyticsAdapter.md b/modules/byDataAnalyticsAdapter.md
new file mode 100644
index 00000000000..a0780ecb514
--- /dev/null
+++ b/modules/byDataAnalyticsAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+layout: Analytics Adapter
+title: byData. (https://bydata.com/)
+description: Bydata Analytics Adapter
+modulecode: byDataAnalyticsAdapter
+gdpr_supported: false   (EU GDPR support)
+usp_supported: false    (US Privacy support)
+coppa_supported: false  (COPPA support)
+prebid_member: false
+gvl_id:                      (IAB Global Vendor List ID)
+enable_download: false       (in case you don't want users of the website to download your adapter)
+
+Module Name: Bydata Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: byData
+
+# Description
+
+Analytics adapter for https://bydata.com/. Contact admin@byData.com for information.
+
+
+# Test Parameters
+
+```
+{
+  provider: 'bydata',
+    options : {
+        clientId: "please contact byData team to get a clientId",   
+        logFrequency : 100, // Sample Rate Default - 1%   
+    }
+}
+```
diff --git a/modules/byplayBidAdapter.js b/modules/byplayBidAdapter.js
deleted file mode 100644
index 6133cdfa647..00000000000
--- a/modules/byplayBidAdapter.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
-import { VIDEO } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'byplay';
-const ENDPOINT_URL = 'https://prebid.byplay.net/bidder';
-const VIDEO_PLAYER_URL = 'https://cdn.byplay.net/prebid-byplay-v2.js';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [VIDEO],
-  isBidRequestValid: (bid) => {
-    return !!bid.params.sectionId;
-  },
-  buildRequests: function(validBidRequests) {
-    return validBidRequests.map(req => {
-      const payload = {
-        requestId: req.bidId,
-        sectionId: req.params.sectionId,
-        ...(req.params.env ? { env: req.params.env } : {})
-      };
-
-      return {
-        method: 'POST',
-        url: ENDPOINT_URL,
-        data: JSON.stringify(payload),
-        options: {
-          withCredentials: false
-        }
-      };
-    });
-  },
-  interpretResponse: (serverResponse, bidderRequest) => {
-    const response = serverResponse.body;
-    const data = JSON.parse(bidderRequest.data);
-    const bidResponse = {
-      requestId: data.requestId,
-      cpm: response.cpm,
-      width: response.width,
-      height: response.height,
-      creativeId: response.creativeId || '0',
-      ttl: config.getConfig('_bidderTimeout'),
-      currency: 'JPY',
-      netRevenue: response.netRevenue,
-      mediaType: VIDEO,
-      vastXml: response.vastXml,
-      renderer: createRenderer()
-    };
-
-    return [bidResponse];
-  }
-};
-
-function createRenderer() {
-  const renderer = Renderer.install({ url: VIDEO_PLAYER_URL });
-
-  renderer.setRender(bid => {
-    bid.renderer.push(() => {
-      window.adtagRender(bid);
-    });
-  });
-
-  return renderer;
-}
-
-registerBidder(spec);
diff --git a/modules/byplayBidAdapter.md b/modules/byplayBidAdapter.md
deleted file mode 100644
index 67fb9c40d35..00000000000
--- a/modules/byplayBidAdapter.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Overview
-
-```
-Module Name: ByPlay Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: byplayers@tsumikiinc.com
-```
-
-# Description
-
-Connects to ByPlay exchange for bids.
-
-ByPlay bid adapter supports Video.
-
-# Test Parameters
-```
-  const adUnits = [
-    {
-      code: 'byplay-ad',
-      mediaTypes: {
-        video: {
-          playerSize: [400, 225],
-          context: 'outstream'
-        }
-      },
-      bids: [
-        {
-          bidder: 'byplay',
-          params: {
-            sectionId: '7986',
-            env: 'dev'
-          }
-        }
-      ]
-    }
-  ];
-```
diff --git a/modules/c1xBidAdapter.js b/modules/c1xBidAdapter.js
index 8e1f1487ba7..8c9407825ba 100644
--- a/modules/c1xBidAdapter.js
+++ b/modules/c1xBidAdapter.js
@@ -1,10 +1,10 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
-import { userSync } from '../src/userSync.js';
+import { logInfo, logError } from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'c1x';
-const URL = 'https://ht.c1exchange.com/ht';
-const PIXEL_ENDPOINT = 'https://px.c1exchange.com/pubpixel/';
+const URL = 'https://hb-stg.c1exchange.com/ht';
+// const PIXEL_ENDPOINT = '//px.c1exchange.com/pubpixel/';
 const LOG_MSG = {
   invalidBid: 'C1X: [ERROR] bidder returns an invalid bid',
   noSite: 'C1X: [ERROR] no site id supplied',
@@ -19,35 +19,49 @@ const LOG_MSG = {
 
 export const c1xAdapter = {
   code: BIDDER_CODE,
-
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   // check the bids sent to c1x bidder
-  isBidRequestValid: function(bid) {
-    const siteId = bid.params.siteId || '';
-    if (!siteId) {
-      utils.logError(LOG_MSG.noSite);
+  isBidRequestValid: function (bid) {
+    if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
+      return false;
+    }
+    if (typeof bid.params.placementId === 'undefined') {
+      return false;
     }
-    return !!(bid.adUnitCode && siteId);
+    return true;
   },
 
-  buildRequests: function(bidRequests, bidderRequest) {
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
     let payload = {};
     let tagObj = {};
-    let pixelUrl = '';
-    const adunits = bidRequests.length;
+    let bidRequest = [];
+    const adunits = validBidRequests.length;
     const rnd = new Date().getTime();
-    const c1xTags = bidRequests.map(bidToTag);
-    const bidIdTags = bidRequests.map(bidToShortTag); // include only adUnitCode and bidId from request obj
+    const c1xTags = validBidRequests.map(bidToTag);
+    const bidIdTags = validBidRequests.map(bidToShortTag); // include only adUnitCode and bidId from request obj
 
     // flattened tags in a tag object
     tagObj = c1xTags.reduce((current, next) => Object.assign(current, next));
-    const pixelId = tagObj.pixelId;
 
     payload = {
       adunits: adunits.toString(),
       rnd: rnd.toString(),
       response: 'json',
       compress: 'gzip'
-    }
+    };
 
     // for GDPR support
     if (bidderRequest && bidderRequest.gdprConsent) {
@@ -56,28 +70,19 @@ export const c1xAdapter = {
       ;
     }
 
-    if (pixelId) {
-      pixelUrl = PIXEL_ENDPOINT + pixelId;
-      if (payload.consent_required) {
-        pixelUrl += '&gdpr=' + (bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
-        pixelUrl += '&consent=' + encodeURIComponent(bidderRequest.gdprConsent.consentString || '');
-      }
-      userSync.registerSync('image', BIDDER_CODE, pixelUrl);
-    }
-
     Object.assign(payload, tagObj);
-
     let payloadString = stringifyPayload(payload);
     // ServerRequest object
-    return {
+    bidRequest.push({
       method: 'GET',
       url: URL,
       data: payloadString,
       bids: bidIdTags
-    };
+    });
+    return bidRequest;
   },
 
-  interpretResponse: function(serverResponse, requests) {
+  interpretResponse: function (serverResponse, requests) {
     serverResponse = serverResponse.body;
     requests = requests.bids || [];
     const currency = 'USD';
@@ -86,15 +91,17 @@ export const c1xAdapter = {
 
     if (!serverResponse || serverResponse.error) {
       let errorMessage = serverResponse.error;
-      utils.logError(LOG_MSG.invalidBid + errorMessage);
+      logError(LOG_MSG.invalidBid + errorMessage);
       return bidResponses;
     } else {
       serverResponse.forEach(bid => {
+        logInfo(bid)
         if (bid.bid) {
           if (bid.bidType === 'NET_BID') {
             netRevenue = !netRevenue;
           }
           const curBid = {
+            requestId: bid.bidId,
             width: bid.width,
             height: bid.height,
             cpm: bid.cpm,
@@ -105,22 +112,27 @@ export const c1xAdapter = {
             netRevenue: netRevenue
           };
 
+          if (bid.dealId) {
+            curBid['dealId'] = bid.dealId
+          }
+
           for (let i = 0; i < requests.length; i++) {
             if (bid.adId === requests[i].adUnitCode) {
               curBid.requestId = requests[i].bidId;
             }
           }
-          utils.logInfo(LOG_MSG.bidWin + bid.adId + ' size: ' + curBid.width + 'x' + curBid.height);
+          logInfo(LOG_MSG.bidWin + bid.adId + ' size: ' + curBid.width + 'x' + curBid.height);
           bidResponses.push(curBid);
         } else {
           // no bid
-          utils.logInfo(LOG_MSG.noBid + bid.adId);
+          logInfo(LOG_MSG.noBid + bid.adId);
         }
       });
     }
 
     return bidResponses;
   }
+
 }
 
 function bidToTag(bid, index) {
@@ -128,20 +140,20 @@ function bidToTag(bid, index) {
   const adIndex = 'a' + (index + 1).toString(); // ad unit id for c1x
   const sizeKey = adIndex + 's';
   const priceKey = adIndex + 'p';
+  const dealKey = adIndex + 'd';
   // TODO: Multiple Floor Prices
 
   const sizesArr = bid.sizes;
-  const floorPriceMap = bid.params.floorPriceMap || '';
-  tag['site'] = bid.params.siteId || '';
+  const floorPriceMap = getBidFloor(bid);
 
-  // prevent pixelId becoming undefined when publishers don't fill this param in ad units they have on the same page
-  if (bid.params.pixelId) {
-    tag['pixelId'] = bid.params.pixelId
+  const dealId = bid.params.dealId || '';
+
+  if (dealId) {
+    tag[dealKey] = dealId;
   }
 
   tag[adIndex] = bid.adUnitCode;
   tag[sizeKey] = sizesArr.reduce((prev, current) => prev + (prev === '' ? '' : ',') + current.join('x'), '');
-
   const newSizeArr = tag[sizeKey].split(',');
   if (floorPriceMap) {
     newSizeArr.forEach(size => {
@@ -157,22 +169,41 @@ function bidToTag(bid, index) {
   return tag;
 }
 
+function getBidFloor(bidRequest) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: 'USD',
+      mediaType: 'banner',
+      size: '*',
+    });
+  }
+
+  let floor =
+    floorInfo.floor ||
+    bidRequest.params.bidfloor ||
+    bidRequest.params.floorPriceMap ||
+    0;
+
+  return floor;
+}
+
 function bidToShortTag(bid) {
   const tag = {};
   tag.adUnitCode = bid.adUnitCode;
   tag.bidId = bid.bidId;
-
   return tag;
 }
 
 function stringifyPayload(payload) {
-  let payloadString = '';
-  payloadString = JSON.stringify(payload).replace(/":"|","|{"|"}/g, (foundChar) => {
-    if (foundChar == '":"') return '=';
-    else if (foundChar == '","') return '&';
-    else return '';
-  });
-  return payloadString;
+  let payloadString = [];
+  for (var key in payload) {
+    if (payload.hasOwnProperty(key)) {
+      payloadString.push(key + '=' + payload[key]);
+    }
+  }
+  return payloadString.join('&');
 }
 
 registerBidder(c1xAdapter);
diff --git a/modules/c1xBidAdapter.md b/modules/c1xBidAdapter.md
index 83a4ff1ea81..9a7cef486d2 100644
--- a/modules/c1xBidAdapter.md
+++ b/modules/c1xBidAdapter.md
@@ -2,7 +2,7 @@
 
 Module Name: C1X Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: cathy@c1exchange.com
+Maintainer: vishnu@c1exchange.com
 
 # Description
 
@@ -10,23 +10,61 @@ Module that connects to C1X's demand sources
 
 # Test Parameters
 ```
-  var adUnits = [
-     {
-         code: 'test-div',
-         sizes: [[300, 600], [300, 250]],
-         bids: [
-             {
-                 bidder: 'c1x',
-                 params: {
-                    siteId: '9999',
-                    pixelId: '12345',
-                    floorPriceMap: {
-                      '300x250': 0.20,
-                      '300x600': 0.30
-                    }, //optional
-                 }
-             }
-         ]
-     },
-   ];
+  var adUnits = [{
+    code: 'test-div-1',
+    mediaTypes: {
+        banner: {
+            sizes: [[750, 200]],
+        }
+    },
+    bids: [{
+        bidder: 'c1x',
+        params: {
+            placementId: 'div-gpt-ad-1654594619717-0',
+            'floorPriceMap': {
+                    '300x250': 4.35
+            }
+        }
+    }]
+  }, {
+    code: 'test-div-2',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250], [750, 200]],
+        }
+    },
+    bids: [{
+        bidder: 'c1x',
+        params: {
+            placementId: 'div-gpt-ad-1654940683355-0',
+            'floorPriceMap': {
+                    '300x250': 4.35
+            }
+            dealId: '1233' // optional parameter
+        }
+    }]
+  }];
+
+
+  pbjs.bidderSettings = {
+    c1x: {
+      siteId: 999,
+      adserverTargeting: [{
+          key: "hb_bidder",
+          val: function(bidResponse) {
+              return bidResponse.bidderCode;
+          }
+      }, {
+          key: "hb_adid",
+          val: function(bidResponse) {
+              return bidResponse.adId;
+          }
+      }, {
+          key: "hb_pb",
+          val: function(bidResponse) {
+              return bidResponse.pbLg;
+          }
+      }]
+    }
+  }
 ```
\ No newline at end of file
diff --git a/modules/captifyRtdProvider.js b/modules/captifyRtdProvider.js
new file mode 100644
index 00000000000..b97aa49a48e
--- /dev/null
+++ b/modules/captifyRtdProvider.js
@@ -0,0 +1,146 @@
+/**
+ * This module adds Captify real time data provider module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch segments (page-centric) from Captify live-classification server
+ * @module modules/captifyRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import { submodule } from '../src/hook.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import {deepAccess, isArray, isEmptyStr, isNumber, logError} from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'CaptifyRTDModule';
+const DEFAULT_LC_URL = 'https://live-classification.cpx.to/prebid-segments';
+
+const STATUS = {
+  SUCCESS: 200,
+  ACCEPTED: 202,
+};
+
+/**
+ * Set `appnexusAuctionKeywords` that appnexus bidder will read and send in request to Xandr
+ * @param {Array<number>} segments captify segments for Appnexus(Xandr) system, in form of [id1, id2, id3]
+ *                 where id1, id2, id3 - actual Xandr segment ids with keywords enabled
+ */
+export function setAppnexusSegments(segments) {
+  config.setConfig({
+    appnexusAuctionKeywords: {
+      'captify_segments': segments,
+    },
+  })
+}
+
+/**
+ * Function returns only bidders that contained both, in moduleConfig and at least one adUnit.
+ * @param {Array<string>} bidders Contains list of bidders, to set targeting for
+ * @param {Object} data Response of live-classification service
+ */
+export function addSegmentData(bidders, data) {
+  for (const bidder of bidders) {
+    if (bidder === 'appnexus') { setAppnexusSegments(data['xandr']) }
+  }
+}
+
+/**
+ * Function returns only bidders that contained in both, moduleConfig and at least one adUnit.
+ * @param {Object} moduleConfig Config object passed to the module
+ * @param {Object} reqBidsConfigObj Config object for the bidders; each adapter has its own entry
+ */
+export function getMatchingBidders(moduleConfig, reqBidsConfigObj) {
+  const biddersFromConf = deepAccess(moduleConfig, 'params.bidders');
+
+  const adUnitBidders = reqBidsConfigObj.adUnits
+    .flatMap(({bids}) => bids.map(({bidder}) => bidder))
+    .filter((e, i, a) => a.indexOf(e) === i);
+
+  if (!isArray(adUnitBidders) || !adUnitBidders.length) {
+    logError(SUBMODULE_NAME, 'Missing parameter bidders in bidRequestConfig');
+    return [];
+  }
+
+  return biddersFromConf.filter(bidder => adUnitBidders.includes(bidder));
+}
+
+/**
+ * Main function that sets Captify targeting for various bidders
+ * @param {Object} moduleConfig Config object passed to the module
+ * @param {Function} onDone callback function that executed when everything is done
+ * @param {Object} reqBidsConfigObj Config object for the bidders; each adapter has its own entry
+ * @param {Object} gcv contains data related to user consent, if applies
+ */
+export function setCaptifyTargeting(reqBidsConfigObj, onDone, moduleConfig, gcv) {
+  const pbjsVer = getGlobal();
+  const ref = getRefererInfo().referer;
+  const url = document.URL;
+  const pubId = moduleConfig.params.pubId;
+  const bidders = getMatchingBidders(moduleConfig, reqBidsConfigObj)
+  const requestBody = {
+    pubId,
+    ref,
+    url,
+    pbjsVer,
+    gcv
+  };
+  let requestUrl = moduleConfig.params.url;
+  if (!requestUrl || isEmptyStr(requestUrl)) {
+    requestUrl = DEFAULT_LC_URL;
+  }
+
+  if (!bidders.length) {
+    logError(SUBMODULE_NAME, 'There are no matched bidders to work with');
+    return;
+  }
+
+  ajax(requestUrl, {
+    success: function (response, req) {
+      if (req.status === STATUS.SUCCESS) {
+        try {
+          const data = JSON.parse(response);
+          if (data) {
+            addSegmentData(bidders, data);
+          }
+        } catch (e) {
+          logError(SUBMODULE_NAME, 'Unable to parse live-classification data' + e);
+        }
+      }
+      onDone();
+    },
+    error: function () {
+      onDone();
+      logError(SUBMODULE_NAME, 'Unable to get live-classification data');
+    }
+  },
+  JSON.stringify(requestBody),
+  {
+    contentType: 'application/json',
+    method: 'POST',
+  });
+}
+
+export function init(moduleConfig, userConsent) {
+  // Validate bidders
+  const biddersFromConf = deepAccess(moduleConfig, 'params.bidders');
+  if (!isArray(biddersFromConf) || !biddersFromConf.length) {
+    logError(SUBMODULE_NAME, 'Missing parameter bidders in moduleConfig');
+    return false
+  }
+  const publisherId = deepAccess(moduleConfig, 'params.pubId');
+  // Publisher Id
+  if (!isNumber(publisherId)) {
+    logError(SUBMODULE_NAME, 'Missing parameter pubId in moduleConfig');
+    return false
+  }
+  return true
+}
+
+export const captifySubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  setCaptifyTargeting
+};
+
+submodule(MODULE_NAME, captifySubmodule);
diff --git a/modules/captifyRtdProvider.md b/modules/captifyRtdProvider.md
new file mode 100644
index 00000000000..a1a8e9c273f
--- /dev/null
+++ b/modules/captifyRtdProvider.md
@@ -0,0 +1,68 @@
+# Captify Real-Time Data Submodule
+
+# Overview
+
+    Module Name: Captify Rtd Provider
+    Module Type: Rtd Provider
+	Layout: integrationExamples/gpt/captifyRtdProvider_example.html
+    Maintainer: prebid@captify.tech
+
+# Description
+
+Captify uses publisher first-party on-site search data to power machine learning algorithms to create a suite of
+contextual based targeting solutions that activate in a cookieless environment.
+
+The RTD submodule allows bid requests to be classified by our live-classification service on the first ad call,
+maximising value for publishers by increasing scale for advertisers.
+
+Segments will be attached to bid request objects sent to different SSPs in order to optimize targeting.
+
+Contact prebid@captify.tech for information.
+
+### Publisher Usage
+
+Compile the Captify RTD module into your Prebid build:
+
+`npm ci && gulp build --modules=rtdModule,appnexusBidAdapter,captifyRtdProvider`
+
+Add the Captify RTD provider to your Prebid config.
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "CaptifyRTDModule",
+                waitForIt: true,
+                params: {
+                    pubId: 123456,
+                    bidders: ['appnexus'],
+                }
+            }
+        ]
+    }
+});
+```
+
+### Parameter Description
+This module is configured as part of the `realTimeData.dataProviders` object.
+
+| Name           |Type           | Description                                                         |Mandatory | Notes  |
+| :------------- | :------------ | :------------------------------------------------------------------ |:---------|:------------ |
+| name           | String        | Real time data module name                                          | yes     | Always 'CaptifyRTDModule' |
+| waitForIt      | Boolean       | Should be `true` if there's an `auctionDelay` defined (recommended) | no      | Default `false` |
+| params         | Object        | |  | |
+| params.pubId   | Integer       | Partner ID, required to get results and provided by Captify         | yes      | Use 123456 for tests and speak to your Captify account manager to receive your pubId |
+| params.bidders | Array<String> | List of bidders for which you would like data to be set             | yes      | Currently only 'appnexus' supported |
+| params.url     | String        | Captify live-classification service url                             | no       | Defaults to `https://live-classification.cpx.to/prebid-segments`
+
+### Testing
+
+To view an example of available segments returned by Captify:
+
+`gulp serve --modules=rtdModule,captifyRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/captifyRtdProvider_example.html?pbjs_debug=true`
diff --git a/modules/carodaBidAdapter.js b/modules/carodaBidAdapter.js
new file mode 100644
index 00000000000..7267452dd4c
--- /dev/null
+++ b/modules/carodaBidAdapter.js
@@ -0,0 +1,217 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict'
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  deepAccess,
+  deepSetValue,
+  logError,
+  mergeDeep,
+  parseSizesInput
+} from '../src/utils.js';
+import { config } from '../src/config.js';
+
+const { getConfig } = config;
+
+const BIDDER_CODE = 'caroda';
+const GVLID = 954;
+
+// some state info is required to synchronize with Caroda ad server
+const topUsableWindow = getTopUsableWindow();
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid: bid => {
+    const params = bid.params || {};
+    const { ctok, placementId, priceType } = params;
+    return typeof ctok === 'string' && (
+      typeof placementId === 'string' ||
+      typeof placementId === 'undefined'
+    ) && (
+      typeof priceType === 'undefined' ||
+      priceType === 'gross' ||
+      priceType === 'net'
+    );
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    topUsableWindow.carodaPageViewId = topUsableWindow.carodaPageViewId || Math.floor(Math.random() * 1e9);
+    const pageViewId = topUsableWindow.carodaPageViewId;
+    const ortbCommon = getORTBCommon(bidderRequest);
+    const priceType =
+      getFirstWithKey(validBidRequests, 'params.priceType') ||
+      'net';
+    const test = getFirstWithKey(validBidRequests, 'params.test');
+    const currency = getConfig('currency.adServerCurrency');
+    const eids = getFirstWithKey(validBidRequests, 'userIdAsEids');
+    const schain = getFirstWithKey(validBidRequests, 'schain');
+    const request = {
+      auctionId: bidderRequest.auctionId,
+      currency,
+      hb_version: '$prebid.version$',
+      ...ortbCommon,
+      price_type: priceType
+    };
+    if (test) {
+      request.test = 1;
+    }
+    if (schain) {
+      request.schain = schain;
+    }
+    if (config.getConfig('coppa')) {
+      deepSetValue(request, 'privacy.coppa', 1);
+    }
+    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
+      deepSetValue(
+        request,
+        'privacy.gdpr_consent',
+        bidderRequest.gdprConsent.consentString
+      );
+      deepSetValue(
+        request,
+        'privacy.gdpr',
+        bidderRequest.gdprConsent.gdprApplies & 1
+      );
+    }
+    if (bidderRequest.uspConsent) {
+      deepSetValue(request, 'privacy.us_privacy', bidderRequest.uspConsent);
+    }
+    if (eids) {
+      deepSetValue(request, 'user.eids', eids);
+    }
+    return getImps(validBidRequests, request).map(imp => ({
+      method: 'POST',
+      url: 'https://prebid.caroda.io/api/hb?entry_id=' + pageViewId,
+      data: JSON.stringify(imp)
+    }));
+  },
+  interpretResponse: (serverResponse) => {
+    if (!serverResponse.body) {
+      return;
+    }
+    const { ok, error } = serverResponse.body
+    if (error) {
+      logError(BIDDER_CODE, ': server caught', error.message);
+      return;
+    }
+    try {
+      return JSON.parse(ok.value)
+        .map((bid) => {
+          const ret = {
+            requestId: bid.bid_id,
+            cpm: bid.cpm,
+            creativeId: bid.creative_id,
+            ttl: 300,
+            netRevenue: true,
+            currency: bid.currency,
+            width: bid.w,
+            height: bid.h,
+            meta: {
+              advertiserDomains: bid.adomain || []
+            },
+            ad: bid.ad,
+            placementId: bid.placement_id
+          }
+          if (bid.adserver_targeting) {
+            ret.adserverTargeting = bid.adserver_targeting
+          }
+          return ret
+        })
+        .filter(Boolean);
+    } catch (e) {
+      logError(BIDDER_CODE, ': caught', e);
+    }
+  }
+}
+
+registerBidder(spec)
+
+function getFirstWithKey (collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function getTopUsableWindow () {
+  let res = window;
+  try {
+    while (window.top !== res && res.parent.location.href.length) {
+      res = res.parent;
+    }
+  } catch (e) {}
+  return res;
+}
+
+function getORTBCommon (bidderRequest) {
+  let app, site;
+  const commonFpd = bidderRequest.ortb2 || {};
+  let { user } = commonFpd;
+  if (typeof getConfig('app') === 'object') {
+    app = getConfig('app') || {}
+    if (commonFpd.app) {
+      mergeDeep(app, commonFpd.app);
+    }
+  } else {
+    site = getConfig('site') || {};
+    if (commonFpd.site) {
+      mergeDeep(site, commonFpd.site);
+    }
+    if (!site.page) {
+      site.page = bidderRequest.refererInfo.page;
+    }
+  }
+  const device = getConfig('device') || {};
+  device.w = device.w || window.innerWidth;
+  device.h = device.h || window.innerHeight;
+  device.ua = device.ua || navigator.userAgent;
+  return {
+    app,
+    site,
+    user,
+    device
+  };
+}
+
+function getImps (validBidRequests, common) {
+  return validBidRequests.map((bid) => {
+    const floorInfo = bid.getFloor
+      ? bid.getFloor({ currency: common.currency || 'EUR' })
+      : {};
+    const bidfloor = floorInfo.floor;
+    const bidfloorcur = floorInfo.currency;
+    const { ctok, placementId } = bid.params;
+    const imp = {
+      bid_id: bid.bidId,
+      ctok,
+      bidfloor,
+      bidfloorcur,
+      ...common
+    };
+    const bannerParams = deepAccess(bid, 'mediaTypes.banner');
+    if (bannerParams && bannerParams.sizes) {
+      const sizes = parseSizesInput(bannerParams.sizes);
+      const format = sizes.map(size => {
+        const [width, height] = size.split('x');
+        const w = parseInt(width, 10);
+        const h = parseInt(height, 10);
+        return { w, h };
+      });
+      imp.banner = {
+        format
+      };
+    }
+    if (placementId) {
+      imp.placement_id = placementId;
+    }
+    const videoParams = deepAccess(bid, 'mediaTypes.video');
+    if (videoParams) {
+      imp.video = videoParams;
+    }
+    return imp;
+  })
+}
diff --git a/modules/carodaBidAdapter.md b/modules/carodaBidAdapter.md
new file mode 100644
index 00000000000..35785525038
--- /dev/null
+++ b/modules/carodaBidAdapter.md
@@ -0,0 +1,43 @@
+# Overview
+
+Module Name: Caroda Adapter
+Module Type: Bidder Adapter
+Maintainer: dev@caroda.io
+
+# Description
+
+Module that connects to Caroda demand sources to fetch bids.
+Banner and video formats are supported. 
+Use `caroda` as bidder.
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: '/19968336/prebid_banner_example_1',
+        mediaTypes: {
+            banner: {
+                sizes: [[ 300, 250 ]]
+            }
+        }
+        bids: [{
+            bidder: 'caroda',
+            params: {
+                ctok: '230ce9490c5434354'
+            }
+        }]
+    }, {
+        code: '/19968336/prebid_video_example_1',
+        mediaTypes: {
+            video: {
+                context: 'outstream',
+                mimes: ['video/mp4']
+            }
+        }
+        bids: [{
+            bidder: 'caroda',
+            params: {
+                ctok: '230ce9490c5434354'
+            }
+        }]
+    }];
+```
diff --git a/modules/categoryTranslation.js b/modules/categoryTranslation.js
index 9a9289fcd73..ba73aa01b85 100644
--- a/modules/categoryTranslation.js
+++ b/modules/categoryTranslation.js
@@ -11,12 +11,13 @@
  * If publisher has not defined translation file than prebid will use default prebid translation file provided here //cdn.jsdelivr.net/gh/prebid/category-mapping-file@1/freewheel-mapping.json
  */
 
-import { config } from '../src/config.js';
-import { setupBeforeHookFnOnce, hook } from '../src/hook.js';
-import { ajax } from '../src/ajax.js';
-import { timestamp, logError } from '../src/utils.js';
-import { addBidResponse } from '../src/auction.js';
-import { getCoreStorageManager } from '../src/storageManager.js';
+import {config} from '../src/config.js';
+import {hook, setupBeforeHookFnOnce} from '../src/hook.js';
+import {ajax} from '../src/ajax.js';
+import {logError, timestamp} from '../src/utils.js';
+import {addBidResponse} from '../src/auction.js';
+import {getCoreStorageManager} from '../src/storageManager.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
 export const storage = getCoreStorageManager('categoryTranslation');
 const DEFAULT_TRANSLATION_FILE_URL = 'https://cdn.jsdelivr.net/gh/prebid/category-mapping-file@1/freewheel-mapping.json';
@@ -33,13 +34,13 @@ export const registerAdserver = hook('async', function(adServer) {
 }, 'registerAdserver');
 registerAdserver();
 
-export function getAdserverCategoryHook(fn, adUnitCode, bid) {
+export const getAdserverCategoryHook = timedBidResponseHook('categoryTranslation', function getAdserverCategoryHook(fn, adUnitCode, bid, reject) {
   if (!bid) {
-    return fn.call(this, adUnitCode); // if no bid, call original and let it display warnings
+    return fn.call(this, adUnitCode, bid, reject); // if no bid, call original and let it display warnings
   }
 
   if (!config.getConfig('adpod.brandCategoryExclusion')) {
-    return fn.call(this, adUnitCode, bid);
+    return fn.call(this, adUnitCode, bid, reject);
   }
 
   let localStorageKey = (config.getConfig('brandCategoryTranslation.translationFile')) ? DEFAULT_IAB_TO_FW_MAPPING_KEY_PUB : DEFAULT_IAB_TO_FW_MAPPING_KEY;
@@ -62,8 +63,8 @@ export function getAdserverCategoryHook(fn, adUnitCode, bid) {
       logError('Translation mapping data not found in local storage');
     }
   }
-  fn.call(this, adUnitCode, bid);
-}
+  fn.call(this, adUnitCode, bid, reject);
+});
 
 export function initTranslation(url, localStorageKey) {
   setupBeforeHookFnOnce(addBidResponse, getAdserverCategoryHook, 50);
diff --git a/modules/ccxBidAdapter.js b/modules/ccxBidAdapter.js
index ee15d6bb3ec..28f3fe3a166 100644
--- a/modules/ccxBidAdapter.js
+++ b/modules/ccxBidAdapter.js
@@ -1,11 +1,11 @@
-import * as utils from '../src/utils.js'
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { config } from '../src/config.js'
-import { getStorageManager } from '../src/storageManager.js';
+import {_each, deepAccess, isArray, isEmpty, logWarn} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getStorageManager} from '../src/storageManager.js';
 
-const storage = getStorageManager();
 const BIDDER_CODE = 'ccx'
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
 const BID_URL = 'https://delivery.clickonometrics.pl/ortb/prebid/bid'
+const GVLID = 773;
 const SUPPORTED_VIDEO_PROTOCOLS = [2, 3, 5, 6]
 const SUPPORTED_VIDEO_MIMES = ['video/mp4', 'video/x-flv']
 const SUPPORTED_VIDEO_PLAYBACK_METHODS = [1, 2, 3, 4]
@@ -20,7 +20,7 @@ function _getDeviceObj () {
 
 function _getSiteObj (bidderRequest) {
   let site = {}
-  let url = config.getConfig('pageUrl') || utils.deepAccess(window, 'location.href');
+  let url = bidderRequest?.refererInfo?.page || ''
   if (url.length > 0) {
     url = url.split('?')[0]
   }
@@ -30,19 +30,19 @@ function _getSiteObj (bidderRequest) {
 }
 
 function _validateSizes (sizeObj, type) {
-  if (!utils.isArray(sizeObj) || typeof sizeObj[0] === 'undefined') {
+  if (!isArray(sizeObj) || typeof sizeObj[0] === 'undefined') {
     return false
   }
 
-  if (type === 'video' && (!utils.isArray(sizeObj[0]) || sizeObj[0].length !== 2)) {
+  if (type === 'video' && (!isArray(sizeObj[0]) || sizeObj[0].length !== 2)) {
     return false
   }
 
   let result = true
 
   if (type === 'banner') {
-    utils._each(sizeObj, function (size) {
-      if (!utils.isArray(size) || (size.length !== 2)) {
+    _each(sizeObj, function (size) {
+      if (!isArray(size) || (size.length !== 2)) {
         result = false
       }
     })
@@ -50,11 +50,11 @@ function _validateSizes (sizeObj, type) {
   }
 
   if (type === 'old') {
-    if (!utils.isArray(sizeObj[0]) && sizeObj.length !== 2) {
+    if (!isArray(sizeObj[0]) && sizeObj.length !== 2) {
       result = false
-    } else if (utils.isArray(sizeObj[0])) {
-      utils._each(sizeObj, function (size) {
-        if (!utils.isArray(size) || (size.length !== 2)) {
+    } else if (isArray(sizeObj[0])) {
+      _each(sizeObj, function (size) {
+        if (!isArray(size) || (size.length !== 2)) {
           result = false
         }
       })
@@ -70,22 +70,22 @@ function _buildBid (bid) {
   placement.id = bid.bidId
   placement.secure = 1
 
-  let sizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes') || utils.deepAccess(bid, 'mediaTypes.video.playerSize') || utils.deepAccess(bid, 'sizes')
+  let sizes = deepAccess(bid, 'mediaTypes.banner.sizes') || deepAccess(bid, 'mediaTypes.video.playerSize') || deepAccess(bid, 'sizes')
 
-  if (utils.deepAccess(bid, 'mediaTypes.banner') || utils.deepAccess(bid, 'mediaType') === 'banner' || (!utils.deepAccess(bid, 'mediaTypes.video') && !utils.deepAccess(bid, 'mediaType'))) {
+  if (deepAccess(bid, 'mediaTypes.banner') || deepAccess(bid, 'mediaType') === 'banner' || (!deepAccess(bid, 'mediaTypes.video') && !deepAccess(bid, 'mediaType'))) {
     placement.banner = {'format': []}
-    if (utils.isArray(sizes[0])) {
-      utils._each(sizes, function (size) {
+    if (isArray(sizes[0])) {
+      _each(sizes, function (size) {
         placement.banner.format.push({'w': size[0], 'h': size[1]})
       })
     } else {
       placement.banner.format.push({'w': sizes[0], 'h': sizes[1]})
     }
-  } else if (utils.deepAccess(bid, 'mediaTypes.video') || utils.deepAccess(bid, 'mediaType') === 'video') {
+  } else if (deepAccess(bid, 'mediaTypes.video') || deepAccess(bid, 'mediaType') === 'video') {
     placement.video = {}
 
     if (typeof sizes !== 'undefined') {
-      if (utils.isArray(sizes[0])) {
+      if (isArray(sizes[0])) {
         placement.video.w = sizes[0][0]
         placement.video.h = sizes[0][1]
       } else {
@@ -94,12 +94,12 @@ function _buildBid (bid) {
       }
     }
 
-    placement.video.protocols = utils.deepAccess(bid, 'params.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS
-    placement.video.mimes = utils.deepAccess(bid, 'params.video.mimes') || SUPPORTED_VIDEO_MIMES
-    placement.video.playbackmethod = utils.deepAccess(bid, 'params.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS
-    placement.video.skip = utils.deepAccess(bid, 'params.video.skip') || 0
-    if (placement.video.skip === 1 && utils.deepAccess(bid, 'params.video.skipafter')) {
-      placement.video.skipafter = utils.deepAccess(bid, 'params.video.skipafter')
+    placement.video.protocols = deepAccess(bid, 'mediaTypes.video.protocols') || deepAccess(bid, 'params.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS
+    placement.video.mimes = deepAccess(bid, 'mediaTypes.video.mimes') || deepAccess(bid, 'params.video.mimes') || SUPPORTED_VIDEO_MIMES
+    placement.video.playbackmethod = deepAccess(bid, 'mediaTypes.video.playbackmethod') || deepAccess(bid, 'params.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS
+    placement.video.skip = deepAccess(bid, 'mediaTypes.video.skip') || deepAccess(bid, 'params.video.skip') || 0
+    if (placement.video.skip === 1 && (deepAccess(bid, 'mediaTypes.video.skipafter') || deepAccess(bid, 'params.video.skipafter'))) {
+      placement.video.skipafter = deepAccess(bid, 'mediaTypes.video.skipafter') || deepAccess(bid, 'params.video.skipafter')
     }
   }
 
@@ -120,13 +120,18 @@ function _buildResponse (bid, currency, ttl) {
     currency: currency
   }
 
+  resp.meta = {};
+  if (bid.adomain && bid.adomain.length > 0) {
+    resp.meta.advertiserDomains = bid.adomain;
+  }
+
   if (bid.ext.type === 'video') {
     resp.vastXml = bid.adm
   } else {
     resp.ad = bid.adm
   }
 
-  if (utils.deepAccess(bid, 'dealid')) {
+  if (deepAccess(bid, 'dealid')) {
     resp.dealId = bid.dealid
   }
 
@@ -135,33 +140,34 @@ function _buildResponse (bid, currency, ttl) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {
-    if (!utils.deepAccess(bid, 'params.placementId')) {
-      utils.logWarn('placementId param is reqeuired.')
+    if (!deepAccess(bid, 'params.placementId')) {
+      logWarn('placementId param is reqeuired.')
       return false
     }
-    if (utils.deepAccess(bid, 'mediaTypes.banner.sizes')) {
+    if (deepAccess(bid, 'mediaTypes.banner.sizes')) {
       let isValid = _validateSizes(bid.mediaTypes.banner.sizes, 'banner')
       if (!isValid) {
-        utils.logWarn('Bid sizes are invalid.')
+        logWarn('Bid sizes are invalid.')
       }
       return isValid
-    } else if (utils.deepAccess(bid, 'mediaTypes.video.playerSize')) {
+    } else if (deepAccess(bid, 'mediaTypes.video.playerSize')) {
       let isValid = _validateSizes(bid.mediaTypes.video.playerSize, 'video')
       if (!isValid) {
-        utils.logWarn('Bid sizes are invalid.')
+        logWarn('Bid sizes are invalid.')
       }
       return isValid
-    } else if (utils.deepAccess(bid, 'sizes')) {
+    } else if (deepAccess(bid, 'sizes')) {
       let isValid = _validateSizes(bid.sizes, 'old')
       if (!isValid) {
-        utils.logWarn('Bid sizes are invalid.')
+        logWarn('Bid sizes are invalid.')
       }
       return isValid
     } else {
-      utils.logWarn('Bid sizes are required.')
+      logWarn('Bid sizes are required.')
       return false
     }
   },
@@ -190,7 +196,7 @@ export const spec = {
         };
       }
 
-      utils._each(validBidRequests, function (bid) {
+      _each(validBidRequests, function (bid) {
         requestBody.imp.push(_buildBid(bid))
       })
       // Return the server request
@@ -205,9 +211,9 @@ export const spec = {
     const bidResponses = []
 
     // response is not empty (HTTP 204)
-    if (!utils.isEmpty(serverResponse.body)) {
-      utils._each(serverResponse.body.seatbid, function (seatbid) {
-        utils._each(seatbid.bid, function (bid) {
+    if (!isEmpty(serverResponse.body)) {
+      _each(serverResponse.body.seatbid, function (seatbid) {
+        _each(seatbid.bid, function (bid) {
           bidResponses.push(_buildResponse(bid, serverResponse.body.cur, serverResponse.body.ext.ttl))
         })
       })
@@ -218,8 +224,8 @@ export const spec = {
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = []
 
-    if (utils.deepAccess(serverResponses[0], 'body.ext.usersync') && !utils.isEmpty(serverResponses[0].body.ext.usersync)) {
-      utils._each(serverResponses[0].body.ext.usersync, function (match) {
+    if (deepAccess(serverResponses[0], 'body.ext.usersync') && !isEmpty(serverResponses[0].body.ext.usersync)) {
+      _each(serverResponses[0].body.ext.usersync, function (match) {
         if ((syncOptions.iframeEnabled && match.type === 'iframe') || (syncOptions.pixelEnabled && match.type === 'image')) {
           syncs.push({
             type: match.type,
diff --git a/modules/ccxBidAdapter.md b/modules/ccxBidAdapter.md
index 740457dd099..7d86507bccb 100644
--- a/modules/ccxBidAdapter.md
+++ b/modules/ccxBidAdapter.md
@@ -32,67 +32,21 @@ Module that connects to Clickonometrics's demand sources
 	    mediaTypes: {
 		video: {
 		    playerSize: [1920, 1080]
-
+		    protocols: [2, 3, 5, 6], //default
+		    mimes: ["video/mp4", "video/x-flv"], //default 
+		    playbackmethod: [1, 2, 3, 4], //default
+		    skip: 1, //default 0
+		    skipafter: 5 //delete this key if skip = 0
 		}
 	    },
 	    bids: [
 		{
 		    bidder: "ccx",
 		    params: {
-			placementId: 3287742,
-			//following options are not required, default values will be used. Uncomment if you want to use custom values
-			/*video: {
-			    //check OpenRTB documentation for following options description
-			    protocols: [2, 3, 5, 6], //default
-			    mimes: ["video/mp4", "video/x-flv"], //default 
-			    playbackmethod: [1, 2, 3, 4], //default
-			    skip: 1, //default 0
-			    skipafter: 5 //delete this key if skip = 0
-			}*/
+			placementId: 3287742
 		    }
 		}
 	    ]
 	}
 
     ];
-
-# Pre 1.0 Support
-
-    var adUnits = [
-	{
-	    code: 'test-banner',
-	    mediaType: 'banner',
-	    sizes: [300, 250],
-	    bids: [
-		{
-		    bidder: "ccx",
-		    params: {
-			placementId: 3286844
-		    }
-		}
-	    ]
-	},
-	{
-	    code: 'test-video',
-	    mediaType: 'video',
-	    sizes: [1920, 1080]
-	    bids: [
-		{
-		    bidder: "ccx",
-		    params: {
-			placementId: 3287742,
-			//following options are not required, default values will be used. Uncomment if you want to use custom values
-			/*video: {
-			    //check OpenRTB documentation for following options description
-			    protocols: [2, 3, 5, 6], //default
-			    mimes: ["video/mp4", "video/x-flv"], //default 
-			    playbackmethod: [1, 2, 3, 4], //default
-			    skip: 1, //default 0
-			    skipafter: 5 //delete this key if skip = 0
-			}*/
-		    }
-		}
-	    ]
-	}
-
-    ];
\ No newline at end of file
diff --git a/modules/cedatoBidAdapter.js b/modules/cedatoBidAdapter.js
deleted file mode 100644
index ab381698f01..00000000000
--- a/modules/cedatoBidAdapter.js
+++ /dev/null
@@ -1,229 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const storage = getStorageManager();
-
-const BIDDER_CODE = 'cedato';
-const BID_URL = 'https://h.cedatoplayer.com/hb';
-const SYNC_URL = 'https://h.cedatoplayer.com/hb_usync';
-const TTL = 10000;
-const CURRENCY = 'USD';
-const NET_REVENUE = true;
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
-
-  isBidRequestValid: function(bid) {
-    return !!(
-      bid &&
-      bid.params &&
-      bid.params.player_id &&
-      utils.checkCookieSupport() &&
-      storage.cookiesAreEnabled()
-    );
-  },
-
-  buildRequests: function(bidRequests, bidderRequest) {
-    const site = { domain: document.domain };
-    const device = { ua: navigator.userAgent, w: screen.width, h: screen.height };
-    const currency = CURRENCY;
-    const tmax = bidderRequest.timeout;
-    const auctionId = bidderRequest.auctionId;
-    const auctionStart = bidderRequest.auctionStart;
-    const bidderRequestId = bidderRequest.bidderRequestId;
-
-    const imp = bidRequests.map(req => {
-      const banner = getMediaType(req, 'banner');
-      const video = getMediaType(req, 'video');
-      const params = req.params;
-      const bidId = req.bidId;
-      const adUnitCode = req.adUnitCode;
-      const bidRequestsCount = req.bidRequestsCount;
-      const bidderWinsCount = req.bidderWinsCount;
-      const transactionId = req.transactionId;
-
-      return {
-        bidId,
-        banner,
-        video,
-        adUnitCode,
-        bidRequestsCount,
-        bidderWinsCount,
-        transactionId,
-        params
-      };
-    });
-
-    const payload = {
-      version: '$prebid.version$',
-      site,
-      device,
-      imp,
-      currency,
-      tmax,
-      auctionId,
-      auctionStart,
-      bidderRequestId
-    };
-
-    if (bidderRequest) {
-      payload.referer_info = bidderRequest.refererInfo;
-      payload.us_privacy = bidderRequest.uspConsent;
-
-      if (bidderRequest.gdprConsent) {
-        payload.gdpr_consent = {
-          consent_string: bidderRequest.gdprConsent.consentString,
-          consent_required: bidderRequest.gdprConsent.gdprApplies
-        };
-      }
-    }
-
-    return formatRequest(payload, bidderRequest);
-  },
-
-  interpretResponse: function(resp, {bidderRequest}) {
-    resp = resp.body;
-    const bids = [];
-
-    if (!resp) {
-      return bids;
-    }
-
-    resp.seatbid[0].bid.map(serverBid => {
-      const bid = newBid(serverBid, bidderRequest);
-      bid.currency = resp.cur;
-      bids.push(bid);
-    });
-
-    return bids;
-  },
-
-  getUserSyncs: function(syncOptions, resps, gdprConsent, uspConsent) {
-    const syncs = [];
-    if (syncOptions.iframeEnabled) {
-      syncs.push(getSync('iframe', gdprConsent, uspConsent));
-    } else if (syncOptions.pixelEnabled) {
-      syncs.push(getSync('image', gdprConsent, uspConsent));
-    }
-    return syncs;
-  }
-}
-
-function getMediaType(req, type) {
-  const { mediaTypes } = req;
-
-  if (!mediaTypes) {
-    return;
-  }
-
-  switch (type) {
-    case 'banner':
-      if (mediaTypes.banner) {
-        const { sizes } = mediaTypes.banner;
-        return {
-          format: getFormats(sizes)
-        };
-      }
-      break;
-
-    case 'video':
-      if (mediaTypes.video) {
-        const { playerSize, context } = mediaTypes.video;
-        return {
-          context: context,
-          format: getFormats(playerSize)
-        };
-      }
-  }
-}
-
-function newBid(serverBid, bidderRequest) {
-  const bidRequest = utils.getBidRequest(serverBid.uuid, [bidderRequest]);
-
-  const cpm = serverBid.price;
-  const requestId = serverBid.uuid;
-  const width = serverBid.w;
-  const height = serverBid.h;
-  const creativeId = serverBid.crid;
-  const dealId = serverBid.dealid;
-  const mediaType = serverBid.media_type;
-  const netRevenue = NET_REVENUE;
-  const ttl = TTL;
-
-  const bid = {
-    cpm,
-    requestId,
-    width,
-    height,
-    mediaType,
-    creativeId,
-    dealId,
-    netRevenue,
-    ttl,
-  };
-
-  if (mediaType == 'video') {
-    const videoContext = utils.deepAccess(bidRequest, 'mediaTypes.video.context');
-
-    if (videoContext == 'instream') {
-      bid.vastUrl = serverBid.vast_url;
-      bid.vastImpUrl = serverBid.notify_url;
-    }
-  } else {
-    bid.ad = serverBid.adm;
-  }
-
-  return bid;
-}
-
-function formatRequest(payload, bidderRequest) {
-  const payloadByUrl = {};
-  const requests = [];
-
-  payload.imp.forEach(imp => {
-    const url = imp.params.bid_url || BID_URL;
-    if (!payloadByUrl[url]) {
-      payloadByUrl[url] = {
-        ...payload,
-        imp: []
-      };
-    }
-    payloadByUrl[url].imp.push(imp);
-  });
-
-  for (const url in payloadByUrl) {
-    requests.push({
-      url,
-      method: 'POST',
-      data: JSON.stringify(payloadByUrl[url]),
-      bidderRequest
-    });
-  }
-
-  return requests;
-}
-
-const getSync = (type, gdprConsent, uspConsent = '') => {
-  const syncUrl = SYNC_URL;
-  let params = '?type=' + type + '&us_privacy=' + uspConsent;
-  if (gdprConsent && typeof gdprConsent.consentString === 'string') {
-    if (typeof gdprConsent.gdprApplies === 'boolean') {
-      params += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-    } else {
-      params += `&gdpr_consent=${gdprConsent.consentString}`;
-    }
-  }
-  return {
-    type: type,
-    url: syncUrl + params,
-  };
-}
-
-const getFormats = arr => arr.map((s) => {
-  return { w: s[0], h: s[1] };
-});
-
-registerBidder(spec);
diff --git a/modules/cedatoBidAdapter.md b/modules/cedatoBidAdapter.md
deleted file mode 100644
index 088f8a4baef..00000000000
--- a/modules/cedatoBidAdapter.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Overview
-
-```
-Module Name: Cedato Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: alexk@cedato.com
-```
-
-# Description
-
-Connects to Cedato Bidder. 
-Player ID must be replaced. You can approach your Cedato account manager to get one.
-
-# Test Parameters
-```
-var adUnits = [
-    // Banner
-    {
-        code: 'div-gpt-ad-1460505748561-0',
-        mediaTypes: {
-            banner: {
-                // You can choose one of them
-                sizes: [
-                  [300, 250],
-                  [300, 600],
-                  [240, 400],
-                  [728, 90],
-                ]
-            }
-        },
-        bids: [
-            {
-                bidder: "cedato",
-                params: {
-                    player_id: 1450133326,
-                }
-            }
-        ]
-    }
-];
-
-pbjs.que.push(() => {
-  pbjs.setConfig({
-    userSync: {
-      syncEnabled: true,
-      enabledBidders: ['cedato'],
-      pixelEnabled: true,
-      syncsPerBidder: 200,
-      syncDelay: 100,
-    },
-  });
-});
-```
diff --git a/modules/chtnwBidAdapter.js b/modules/chtnwBidAdapter.js
new file mode 100644
index 00000000000..5f77cec018a
--- /dev/null
+++ b/modules/chtnwBidAdapter.js
@@ -0,0 +1,110 @@
+import {
+  generateUUID,
+  getDNT,
+  _each,
+} from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
+import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
+const ENDPOINT_URL = 'https://prebid.cht.hinet.net/api/v1';
+const BIDDER_CODE = 'chtnw';
+const COOKIE_NAME = '__htid';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+const { getConfig } = config;
+
+function _isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+  isBidRequestValid: function(bid = {}) {
+    return !!(bid && bid.params);
+  },
+  buildRequests: function(validBidRequests = [], bidderRequest = {}) {
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const chtnwId = (storage.getCookie(COOKIE_NAME) != undefined) ? storage.getCookie(COOKIE_NAME) : generateUUID();
+    if (storage.cookiesAreEnabled()) {
+      storage.setCookie(COOKIE_NAME, chtnwId);
+    }
+    const device = getConfig('device') || {};
+    device.w = device.w || window.innerWidth;
+    device.h = device.h || window.innerHeight;
+    device.ua = device.ua || navigator.userAgent;
+    device.dnt = getDNT() ? 1 : 0;
+    device.language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const bidParams = [];
+    _each(validBidRequests, function(bid) {
+      bidParams.push({
+        bidId: bid.bidId,
+        placement: bid.params.placementId,
+        sizes: bid.sizes,
+        adSlot: bid.adUnitCode
+      });
+    });
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL + '/request/prebid.json',
+      data: {
+        bids: bidParams,
+        uuid: chtnwId,
+        device: device,
+        version: {
+          prebid: '$prebid.version$',
+          adapter: '1.0.0',
+        },
+        site: {
+          numIframes: bidderRequest.refererInfo?.numIframes || 0,
+          isAmp: bidderRequest.refererInfo?.isAmp || false,
+          pageUrl: bidderRequest.refererInfo?.page || '',
+          ref: bidderRequest.refererInfo?.ref || '',
+        },
+      },
+      bids: validBidRequests
+    };
+  },
+  interpretResponse: function(serverResponse) {
+    const bidResponses = []
+    _each(serverResponse.body, function(response, i) {
+      bidResponses.push({
+        ...response
+      });
+    });
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    if (syncOptions.pixelEnabled) {
+      const chtnwId = generateUUID()
+      const uuid = chtnwId
+      const type = (_isMobile()) ? 'dot' : 'pixel';
+      syncs.push({
+        type: 'image',
+        url: `https://t.ssp.hinet.net/${type}?bd=${uuid}&t=chtnw`
+      })
+    }
+    return syncs
+  },
+  onTimeout: function(timeoutData) {
+    if (timeoutData === null) {
+      return;
+    }
+    ajax(ENDPOINT_URL + '/trace/timeout/bid', null, JSON.stringify(timeoutData), {
+      method: 'POST',
+      withCredentials: false
+    });
+  },
+  onBidWon: function(bid) {
+    if (bid.nurl) {
+      ajax(bid.nurl, null);
+    }
+  },
+  onSetTargeting: function(bid) {
+  },
+}
+registerBidder(spec);
diff --git a/modules/chtnwBidAdapter.md b/modules/chtnwBidAdapter.md
new file mode 100644
index 00000000000..08e634d577d
--- /dev/null
+++ b/modules/chtnwBidAdapter.md
@@ -0,0 +1,31 @@
+# Overview
+
+```
+Module Name: CHT Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: chtdsp@cht.com.tw
+```
+
+# Description
+
+Module that connects to CHT's demand sources
+
+# Test Parameters
+```
+var adUnits = [
+   {
+        code: 'adunit-code',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'chtnw',
+            params: {
+                placementId: '38EL412LO82XR9O6'
+            }
+        }]
+   }
+];
+```
diff --git a/modules/cleanioRtdProvider.js b/modules/cleanioRtdProvider.js
new file mode 100644
index 00000000000..09c5f722d7f
--- /dev/null
+++ b/modules/cleanioRtdProvider.js
@@ -0,0 +1,220 @@
+/**
+ * This module adds clean.io provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will wrap bid responses markup in clean.io agent script for protection
+ * @module modules/cleanioRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { submodule } from '../src/hook.js';
+import { logError, generateUUID, insertElement } from '../src/utils.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+
+// ============================ MODULE STATE ===============================
+
+/**
+ * @type {function(): void}
+ * Page-wide initialization step / strategy
+ */
+let onModuleInit = () => {};
+
+/**
+ * @type {function(Object): void}
+ * Bid response mutation step / strategy.
+ */
+let onBidResponse = () => {};
+
+/**
+ * @type {number}
+ * 0 for unknown, 1 for preloaded, -1 for error.
+ */
+let preloadStatus = 0;
+
+// ============================ MODULE LOGIC ===============================
+
+/**
+ * Page initialization step which just preloads the script, to be available whenever we start processing the bids.
+ * @param {string} scriptURL The script URL to preload
+ */
+function pageInitStepPreloadScript(scriptURL) {
+  const linkElement = document.createElement('link');
+  linkElement.rel = 'preload';
+  linkElement.as = 'script';
+  linkElement.href = scriptURL;
+  linkElement.onload = () => { preloadStatus = 1; };
+  linkElement.onerror = () => { preloadStatus = -1; };
+  insertElement(linkElement);
+}
+
+/**
+ * Page initialization step which adds the protector script to the whole page. With that, there is no need wrapping bids, and the coverage is better.
+ * @param {string} scriptURL The script URL to add to the page for protection
+ */
+function pageInitStepProtectPage(scriptURL) {
+  const scriptElement = document.createElement('script');
+  scriptElement.type = 'text/javascript';
+  scriptElement.src = scriptURL;
+  insertElement(scriptElement);
+}
+
+/**
+ * Bid processing step which alters the ad HTML to contain bid-specific information, which can be used to identify the creative later.
+ * @param {Object} bidResponse Bid response data
+ */
+function bidWrapStepAugmentHtml(bidResponse) {
+  bidResponse.ad = `<!-- pbad://creativeId=${bidResponse.creativeId || ''}&bidderCode=${bidResponse.bidderCode || ''}&cpm=${bidResponse.cpm || ''} -->\n${bidResponse.ad}`;
+}
+
+/**
+ * Bid processing step which applies creative protection by wrapping the ad HTML.
+ * @param {string} scriptURL
+ * @param {number} requiredPreload
+ * @param {Object} bidResponse
+ */
+function bidWrapStepProtectByWrapping(scriptURL, requiredPreload, bidResponse) {
+  // Still prepend bid info, it's always helpful to have creative data in its payload
+  bidWrapStepAugmentHtml(bidResponse);
+
+  // If preloading failed, or if configuration requires us to finish preloading -
+  // we should not process this bid any further
+  if (preloadStatus < requiredPreload) {
+    return;
+  }
+
+  const sid = generateUUID();
+  bidResponse.ad = `
+    <script type="text/javascript"
+      src="${scriptURL}"
+      data-api-integration-mode="prebid"
+      data-api-session-uuid="${sid}">
+    </script>
+    <script type="text/javascript">
+      var ad = "${encodeURIComponent(bidResponse.ad)}";
+      var agent = window["${sid}"];
+      if (agent && typeof agent.put === "function") {
+        agent.put(ad);
+      }
+      else {
+        document.open();
+        document.write(decodeURIComponent(ad));
+        document.close();
+      }
+    </script>
+  `;
+}
+
+/**
+ * Custom error class to differentiate validation errors
+ */
+class ConfigError extends Error { }
+
+/**
+ * The function to be called upon module init. Depending on the passed config, initializes properly init/bid steps or throws ConfigError.
+ * @param {Object} config
+ */
+function readConfig(config) {
+  if (!config.params) {
+    throw new ConfigError('Missing config parameters for clean.io RTD module provider.');
+  }
+
+  if (typeof config.params.cdnUrl !== 'string' || !/^https?:\/\//.test(config.params.cdnUrl)) {
+    throw new ConfigError('Parameter "cdnUrl" is a required string parameter, which should start with "http(s)://".');
+  }
+
+  if (typeof config.params.protectionMode !== 'string') {
+    throw new ConfigError('Parameter "protectionMode" is a required string parameter.');
+  }
+
+  const scriptURL = config.params.cdnUrl;
+
+  switch (config.params.protectionMode) {
+    case 'full':
+      onModuleInit = () => pageInitStepProtectPage(scriptURL);
+      onBidResponse = (bidResponse) => bidWrapStepAugmentHtml(bidResponse);
+      break;
+
+    case 'bids':
+      onModuleInit = () => pageInitStepPreloadScript(scriptURL);
+      onBidResponse = (bidResponse) => bidWrapStepProtectByWrapping(scriptURL, 0, bidResponse);
+      break;
+
+    case 'bids-nowait':
+      onModuleInit = () => pageInitStepPreloadScript(scriptURL);
+      onBidResponse = (bidResponse) => bidWrapStepProtectByWrapping(scriptURL, 1, bidResponse);
+      break;
+
+    default:
+      throw new ConfigError('Parameter "protectionMode" must be one of "full" | "bids" | "bids-nowait".');
+  }
+}
+
+/**
+ * The function to be called upon module init
+ * Defined as a variable to be able to reset it naturally
+ */
+let startBillableEvents = function() {
+  // Upon clean.io submodule initialization, every winner bid is considered to be protected
+  // and therefore, subjected to billing
+  events.on(CONSTANTS.EVENTS.BID_WON, winnerBidResponse => {
+    events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+      vendor: 'clean.io',
+      billingId: generateUUID(),
+      type: 'impression',
+      auctionId: winnerBidResponse.auctionId,
+      transactionId: winnerBidResponse.transactionId,
+      bidId: winnerBidResponse.requestId,
+    });
+  });
+}
+
+// ============================ MODULE REGISTRATION ===============================
+
+/**
+ * The function which performs submodule registration.
+ */
+function beforeInit() {
+  submodule('realTimeData', /** @type {RtdSubmodule} */ ({
+    name: 'clean.io',
+
+    init: (config, userConsent) => {
+      try {
+        readConfig(config);
+        onModuleInit();
+
+        // Subscribing once to ensure no duplicate events
+        // in case module initialization code runs multiple times
+        // This should have been a part of submodule definition, but well...
+        // The assumption here is that in production init() will be called exactly once
+        startBillableEvents();
+        startBillableEvents = () => {};
+        return true;
+      } catch (err) {
+        if (err instanceof ConfigError) {
+          logError(err.message);
+        }
+        return false;
+      }
+    },
+
+    onBidResponseEvent: (bidResponse, config, userConsent) => {
+      onBidResponse(bidResponse);
+    }
+  }));
+}
+
+/**
+ * Exporting local (and otherwise encapsulated to this module) functions
+ * for testing purposes
+ */
+export const __TEST__ = {
+  pageInitStepPreloadScript,
+  pageInitStepProtectPage,
+  bidWrapStepAugmentHtml,
+  bidWrapStepProtectByWrapping,
+  ConfigError,
+  readConfig,
+  beforeInit,
+}
+
+beforeInit();
diff --git a/modules/cleanioRtdProvider.md b/modules/cleanioRtdProvider.md
new file mode 100644
index 00000000000..7870a2719b6
--- /dev/null
+++ b/modules/cleanioRtdProvider.md
@@ -0,0 +1,59 @@
+# Overview
+
+```
+Module Name: clean.io Rtd provider
+Module Type: Rtd Provider
+Maintainer: nick@clean.io
+```
+
+The clean.io Realtime module provides effective anti-malvertising solution for publishers, including, but not limited to,
+blocking unwanted 0- and 1-click redirects, deceptive ads or those with malicious landing pages, and various types of affiliate fraud.
+
+Using this module requires prior agreement with [clean.io](https://clean.io) to obtain the necessary distribution key.
+
+
+# Integration
+
+clean.io Realtime module can be built just like any other prebid module:
+
+```
+gulp build --modules=cleanioRtdProvider,...
+```
+
+
+# Configuration
+
+When built into prebid.js, this module can be configured through the following `pbjs.setConfig` call:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'clean.io',
+            params: {
+                cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', ///< Contact clean.io to get your own CDN URL
+                protectionMode: 'full', ///< Supported modes are 'full', 'bids' and 'bids-nowait', see below.
+            }
+        }]
+    }
+});
+```
+
+
+## Configuration parameters
+
+{: .table .table-bordered .table-striped }
+| Name | Type  | Scope | Description |
+| :------------ | :------------ | :------------ |:------------ |
+| ``cdnUrl`` | ``string`` | Required | CDN URL of the script, which is to be used for protection. |
+| ``protectionMode`` | ``'full' \| 'bids' \| 'bids-nowait'`` | Required | Integration mode. Please refer to the "Integration modes" section for details. |
+
+
+## Integration modes
+
+{: .table .table-bordered .table-striped }
+| Integration Mode | Parameter Value | Description |
+| :------------ | :------------ | :------------ |
+| Full page protection | ``'full'`` | Preferred mode. The module will add the protector agent script directly to the page, and it will protect all placements. This mode will make the most out of various behavioral detection mechanisms, and will also prevent typical malicious behaviors. Please note that in this mode, depending on Prebid library naming, Chrome may mistakenly tag non-ad-related content as ads: https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/ad_tagging.md. |
+| Bids-only protection | ``'bids'`` | The module will protect specific bid responses, more specifically, the HTML representing ad payload, by wrapping it into the agent script. Please note that in this mode, ads delivered directly, outside of Prebid integration, will not be protected, since the module can only access the ads coming through Prebid. |
+| Bids-only protection with no delay on bid rendering | ``'bids-nowait'`` | Same as above, but in this mode, the script will also *not* wrap those bid responses, which arrived prior to successful preloading of agent script. |
diff --git a/modules/cleanmedianetBidAdapter.js b/modules/cleanmedianetBidAdapter.js
index a8f37450d68..ba72eec3d95 100644
--- a/modules/cleanmedianetBidAdapter.js
+++ b/modules/cleanmedianetBidAdapter.js
@@ -1,8 +1,8 @@
-import * as utils from '../src/utils.js';
+import {deepAccess, getDNT, inIframe, isArray, isNumber, logError, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {includes} from '../src/polyfill.js';
 
 export const helper = {
   getTopWindowDomain: function (url) {
@@ -63,19 +63,18 @@ export const spec = {
           params.supplyPartnerId
         }/bidr?rformat=open_rtb&reqformat=rtb_json&bidder=prebid` +
         (params.query ? '&' + params.query : '');
-      let url =
-        config.getConfig('pageUrl') || bidderRequest.refererInfo.referer;
+      let url = bidderRequest.refererInfo.page;
 
       const rtbBidRequest = {
         id: auctionId,
         site: {
-          domain: helper.getTopWindowDomain(url),
+          domain: bidderRequest.refererInfo.domain,
           page: url,
-          ref: bidderRequest.refererInfo.referer
+          ref: bidderRequest.refererInfo.ref
         },
         device: {
           ua: navigator.userAgent,
-          dnt: utils.getDNT() ? 1 : 0,
+          dnt: getDNT() ? 1 : 0,
           h: screen.height,
           w: screen.width,
           language: navigator.language
@@ -105,21 +104,21 @@ export const spec = {
           ext: {
             consent: bidderRequest.gdprConsent.consentString
           }
-        }
+        };
       }
 
       const imp = {
         id: transactionId,
-        instl: params.instl === 1 ? 1 : 0,
+        instl: deepAccess(bidRequest.ortb2Imp, 'instl') === 1 || params.instl === 1 ? 1 : 0,
         tagid: adUnitCode,
-        bidfloor: params.bidfloor || 0,
+        bidfloor: 0,
         bidfloorcur: 'USD',
         secure: 1
       };
 
       const hasFavoredMediaType =
         params.favoredMediaType &&
-        this.supportedMediaTypes.includes(params.favoredMediaType);
+        includes(this.supportedMediaTypes, params.favoredMediaType);
 
       if (!mediaTypes || mediaTypes.banner) {
         if (!hasFavoredMediaType || params.favoredMediaType === BANNER) {
@@ -128,7 +127,7 @@ export const spec = {
               w: sizes.length ? sizes[0][0] : 300,
               h: sizes.length ? sizes[0][1] : 250,
               pos: params.pos || 0,
-              topframe: utils.inIframe() ? 0 : 1
+              topframe: inIframe() ? 0 : 1
             }
           });
           rtbBidRequest.imp.push(bannerImp);
@@ -146,10 +145,10 @@ export const spec = {
           };
 
           let playerSize = mediaTypes.video.playerSize || sizes;
-          if (utils.isArray(playerSize[0])) {
+          if (isArray(playerSize[0])) {
             videoImp.video.w = playerSize[0][0];
             videoImp.video.h = playerSize[0][1];
-          } else if (utils.isNumber(playerSize[0])) {
+          } else if (isNumber(playerSize[0])) {
             videoImp.video.w = playerSize[0];
             videoImp.video.h = playerSize[1];
           } else {
@@ -178,7 +177,7 @@ export const spec = {
   interpretResponse: function (serverResponse, bidRequest) {
     const response = serverResponse && serverResponse.body;
     if (!response) {
-      utils.logError('empty response');
+      logError('empty response');
       return [];
     }
 
@@ -202,7 +201,7 @@ export const spec = {
       };
 
       if (
-        utils.deepAccess(
+        deepAccess(
           bidRequest.bidRequest,
           'mediaTypes.' + outBid.mediaType
         )
@@ -210,7 +209,7 @@ export const spec = {
         if (outBid.mediaType === BANNER) {
           outBids.push(Object.assign({}, outBid, {ad: bid.adm}));
         } else if (outBid.mediaType === VIDEO) {
-          const context = utils.deepAccess(
+          const context = deepAccess(
             bidRequest.bidRequest,
             'mediaTypes.video.context'
           );
@@ -286,7 +285,7 @@ function newRenderer(bidRequest, bid, rendererOptions = {}) {
   try {
     renderer.setRender(renderOutstream);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
+    logWarn('Prebid Error calling setRender on renderer', err);
   }
   return renderer;
 }
diff --git a/modules/clickforceBidAdapter.js b/modules/clickforceBidAdapter.js
index 20408fe9177..92bc9b1bad2 100644
--- a/modules/clickforceBidAdapter.js
+++ b/modules/clickforceBidAdapter.js
@@ -1,6 +1,7 @@
-import * as utils from '../src/utils.js';
+import { _each } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 const BIDDER_CODE = 'clickforce';
 const ENDPOINT_URL = 'https://ad.holmesmind.com/adserver/prebid.json?cb=' + new Date().getTime() + '&hb=1&ver=1.21';
 
@@ -24,8 +25,11 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const bidParams = [];
-    utils._each(validBidRequests, function(bid) {
+    _each(validBidRequests, function(bid) {
       bidParams.push({
         z: bid.params.zone,
         bidId: bid.bidId
@@ -51,12 +55,12 @@ export const spec = {
     const bidRequestList = [];
 
     if (typeof bidRequest != 'undefined') {
-      utils._each(bidRequest.validBidRequests, function(req) {
+      _each(bidRequest.validBidRequests, function(req) {
         bidRequestList[req.bidId] = req;
       });
     }
 
-    utils._each(serverResponse.body, function(response) {
+    _each(serverResponse.body, function(response) {
       if (response.requestId != null) {
         // native ad size
         if (response.width == 3) {
@@ -88,6 +92,9 @@ export const spec = {
               impressionTrackers: response.tag.iu,
             },
             mediaType: 'native',
+            meta: {
+              advertiserDomains: response.adomain || []
+            },
           });
         } else {
           // display ad
@@ -102,6 +109,9 @@ export const spec = {
             ttl: response.ttl,
             ad: response.tag,
             mediaType: 'banner',
+            meta: {
+              advertiserDomains: response.adomain || []
+            },
           });
         }
       }
diff --git a/modules/clicktripzBidAdapter.js b/modules/clicktripzBidAdapter.js
deleted file mode 100644
index 2149cbe4527..00000000000
--- a/modules/clicktripzBidAdapter.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import {logError, _each} from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'clicktripz';
-const ENDPOINT_URL = 'https://www.clicktripz.com/x/prebid/v1';
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['ctz'], // short code
-
-  isBidRequestValid: function (bid) {
-    if (bid && bid.params && bid.params.placementId && bid.params.siteId) {
-      return true;
-    }
-
-    return false;
-  },
-
-  buildRequests: function (validBidRequests) {
-    let bidRequests = [];
-
-    _each(validBidRequests, function (bid) {
-      bidRequests.push({
-        bidId: bid.bidId,
-        placementId: bid.params.placementId,
-        siteId: bid.params.siteId,
-        sizes: bid.sizes.map(function (size) {
-          return size.join('x')
-        })
-      });
-    });
-    return {
-      method: 'POST',
-      url: ENDPOINT_URL,
-      data: bidRequests
-    };
-  },
-
-  interpretResponse: function (serverResponse) {
-    let bidResponses = [];
-
-    if (serverResponse && serverResponse.body) {
-      _each(serverResponse.body, function (bid) {
-        if (bid.errors) {
-          logError(bid.errors);
-          return;
-        }
-
-        const size = bid.size.split('x');
-        bidResponses.push({
-          requestId: bid.bidId,
-          cpm: bid.cpm,
-          width: size[0],
-          height: size[1],
-          creativeId: bid.creativeId,
-          currency: bid.currency,
-          netRevenue: bid.netRevenue,
-          ttl: bid.ttl,
-          adUrl: bid.adUrl
-        });
-      });
-    }
-    return bidResponses;
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/clicktripzBidAdapter.md b/modules/clicktripzBidAdapter.md
deleted file mode 100644
index 1de1e26f37a..00000000000
--- a/modules/clicktripzBidAdapter.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Overview
-
-```
-Module Name: Clicktripz Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: integration-support@clicktripz.com
-```
-
-# Description
-Our module makes it easy to integrate Clicktripz demand sources into your website.
-
-Supported Ad Fortmats:
-* Banner
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: 'test-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300, 250], [300,600]],
-                }
-            },
-            bids: [
-                {
-                    bidder: "clicktripz",
-                    params: {
-                        placementId: '4312c63f',
-                        siteId: 'prebid',
-                    }
-                }
-            ]
-        }
-    ];
diff --git a/modules/codefuelBidAdapter.js b/modules/codefuelBidAdapter.js
new file mode 100644
index 00000000000..bde168a79e3
--- /dev/null
+++ b/modules/codefuelBidAdapter.js
@@ -0,0 +1,176 @@
+import {deepAccess, isArray} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'codefuel';
+const CURRENCY = 'USD';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [ BANNER ],
+  aliases: ['ex'], // short code
+  /**
+         * Determines whether or not the given bid request is valid.
+         *
+         * @param {BidRequest} bid The bid params to validate.
+         * @return boolean True if this is a valid bid, and false otherwise.
+         */
+  isBidRequestValid: function(bid) {
+    if (bid.nativeParams) {
+      return false;
+    }
+    return !!(bid.params.placementId || (bid.params.member && bid.params.invCode));
+  },
+  /**
+         * Make a server request from the list of BidRequests.
+         *
+         * @param {validBidRequests[]} - an array of bids
+         * @return ServerRequest Info describing the request to the server.
+         */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const page = bidderRequest.refererInfo.page;
+    const domain = bidderRequest.refererInfo.domain;
+    const ua = navigator.userAgent;
+    const devicetype = getDeviceType()
+    const publisher = setOnAny(validBidRequests, 'params.publisher');
+    const cur = CURRENCY;
+    const endpointUrl = 'https://ai-p-codefuel-ds-rtb-us-east-1-k8s.seccint.com/prebid'
+    const timeout = bidderRequest.timeout;
+
+    validBidRequests.forEach(bid => bid.netRevenue = 'net');
+
+    const imps = validBidRequests.map((bid, idx) => {
+      const imp = {
+        id: idx + 1 + ''
+      }
+
+      if (bid.params.tagid) {
+        imp.tagid = bid.params.tagid
+      }
+
+      if (bid.sizes) {
+        imp.banner = {
+          format: transformSizes(bid.sizes)
+        }
+      }
+
+      return imp;
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site: { page, domain, publisher },
+      device: { ua, devicetype },
+      source: { fd: 1 },
+      cur: [cur],
+      tmax: timeout,
+      imp: imps,
+    };
+
+    return {
+      method: 'POST',
+      url: endpointUrl,
+      data: request,
+      bids: validBidRequests,
+      options: {
+        withCredentials: false
+      }
+    };
+  },
+  /**
+         * Unpack the response from the server into a list of bids.
+         *
+         * @param {ServerResponse} serverResponse A successful response from the server.
+         * @return {Bid[]} An array of bids which were nested inside the server.
+         */
+  interpretResponse: (serverResponse, { bids }) => {
+    if (!serverResponse.body) {
+      return [];
+    }
+    const { seatbid, cur } = serverResponse.body;
+
+    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
+      result[bid.impid - 1] = bid;
+      return result;
+    }, []);
+
+    return bids.map((bid, id) => {
+      const bidResponse = bidResponses[id];
+      if (bidResponse) {
+        const bidObject = {
+          requestId: bid.bidId,
+          cpm: bidResponse.price,
+          creativeId: bidResponse.crid,
+          ttl: 360,
+          netRevenue: true,
+          currency: cur,
+          mediaType: BANNER,
+          ad: bidResponse.adm,
+          width: bidResponse.w,
+          height: bidResponse.h,
+          meta: { advertiserDomains: bid.adomain ? bid.adomain : [] }
+        };
+        return bidObject;
+      }
+    }).filter(Boolean);
+  },
+
+  /**
+     * Register the user sync pixels which should be dropped after the auction.
+     *
+     * @param {SyncOptions} syncOptions Which user syncs are allowed?
+     * @param {ServerResponse[]} serverResponses List of server's responses.
+     * @return {UserSync[]} The user syncs which should be dropped.
+     */
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    return [];
+  }
+
+}
+registerBidder(spec);
+
+function getDeviceType() {
+  if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(navigator.userAgent.toLowerCase()))) {
+    return 5; // 'tablet'
+  }
+  if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(navigator.userAgent.toLowerCase()))) {
+    return 4; // 'mobile'
+  }
+  return 2; // 'desktop'
+}
+
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function flatten(arr) {
+  return [].concat(...arr);
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  if (!isArray(requestSizes)) {
+    return [];
+  }
+
+  if (requestSizes.length === 2 && !isArray(requestSizes[0])) {
+    return [{
+      w: parseInt(requestSizes[0], 10),
+      h: parseInt(requestSizes[1], 10)
+    }];
+  } else if (isArray(requestSizes[0])) {
+    return requestSizes.map(item =>
+      ({
+        w: parseInt(item[0], 10),
+        h: parseInt(item[1], 10)
+      })
+    );
+  }
+
+  return [];
+}
diff --git a/modules/codefuelBidAdapter.md b/modules/codefuelBidAdapter.md
new file mode 100644
index 00000000000..4e1a0dd6409
--- /dev/null
+++ b/modules/codefuelBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name: Codefuel Adapter
+Module Type: Bidder Adapter
+Maintainer: hayimm@codefuel.com
+```
+
+# Description
+
+Module that connects to Codefuel bidder to fetch bids.
+Display format is supported but not native format. Using OpenRTB standard.
+
+# Configuration
+
+## Bidder and usersync URLs
+
+The Codefuel adapter does not work without setting the correct bidder.
+You will receive the URLs when contacting us.
+
+```
+pbjs.setConfig({
+    codefuel: {
+      bidderUrl: 'https://ai-p-codefuel-ds-rtb-us-east-1-k8s.seccint.com/prebid',
+      usersyncUrl: 'https://usersync-url.com'
+    }
+});
+```
+
+
+# Test Native Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_native_example_1',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: false,
+                    sizes: [100, 50]
+                },
+                title: {
+                    required: false,
+                    len: 140
+                },
+                sponsoredBy: {
+                    required: false
+                },
+                clickUrl: {
+                    required: false
+                },
+                body: {
+                    required: false
+                },
+                icon: {
+                    required: false,
+                    sizes: [50, 50]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'codefuel',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id',
+                bcat: ['IAB1-1'],
+                badv: ['example.com']
+            }
+        }]
+    ];
+
+    pbjs.setConfig({
+        codefuel: {
+          bidderUrl: 'https://ai-p-codefuel-ds-rtb-us-east-1-k8s.seccint.com/prebid'
+        }
+    });
+```
+
+# Test Display Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_display_example_1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        bids: [{
+            bidder: 'codefuel',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id',
+                bcat: ['IAB1-1'],
+                badv: ['example.com']
+            },
+        }]
+    ];
+
+    pbjs.setConfig({
+        codefuel: {
+          bidderUrl: 'https://ai-p-codefuel-ds-rtb-us-east-1-k8s.seccint.com/prebid'
+        }
+    });
+```
diff --git a/modules/cointrafficBidAdapter.js b/modules/cointrafficBidAdapter.js
new file mode 100644
index 00000000000..ce366cbecc8
--- /dev/null
+++ b/modules/cointrafficBidAdapter.js
@@ -0,0 +1,102 @@
+import { parseSizesInput, logError, isEmpty } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js'
+import { config } from '../src/config.js'
+
+const BIDDER_CODE = 'cointraffic';
+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',
+  'AUD', 'BRL', 'CAD', 'CNY', 'HKD', 'IDR', 'ILS', 'INR', 'KRW', 'MXN', 'MYR', 'NZD', 'PHP', 'SGD', 'THB', 'ZAR',
+];
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.placementId);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param validBidRequests
+   * @param bidderRequest
+   * @return Array Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map(bidRequest => {
+      const sizes = parseSizesInput(bidRequest.params.size || bidRequest.sizes);
+      const currency =
+        config.getConfig(`currency.bidderCurrencyDefault.${BIDDER_CODE}`) ||
+        config.getConfig('currency.adServerCurrency') ||
+        DEFAULT_CURRENCY;
+
+      if (ALLOWED_CURRENCIES.indexOf(currency) === -1) {
+        logError('Currency is not supported - ' + currency);
+        return;
+      }
+
+      const payload = {
+        placementId: bidRequest.params.placementId,
+        currency: currency,
+        sizes: sizes,
+        bidId: bidRequest.bidId,
+        // TODO: is 'page' the right value here?
+        referer: bidderRequest.refererInfo.page,
+      };
+
+      return {
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: payload
+      };
+    });
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param bidRequest
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = [];
+    const response = serverResponse.body;
+
+    if (isEmpty(response)) {
+      return bidResponses;
+    }
+
+    const bidResponse = {
+      requestId: response.requestId,
+      cpm: response.cpm,
+      currency: response.currency,
+      netRevenue: response.netRevenue,
+      width: response.width,
+      height: response.height,
+      creativeId: response.creativeId,
+      ttl: response.ttl,
+      ad: response.ad,
+      meta: {
+        advertiserDomains: response.adomain && response.adomain.length ? response.adomain : [],
+        mediaType: response.mediaType
+      }
+    };
+
+    bidResponses.push(bidResponse);
+
+    return bidResponses;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/cointrafficBidAdapter.md b/modules/cointrafficBidAdapter.md
new file mode 100644
index 00000000000..fcbcad1cad7
--- /dev/null
+++ b/modules/cointrafficBidAdapter.md
@@ -0,0 +1,31 @@
+# Overview
+
+```
+Module Name: Cointraffic Bidder Adapter
+Module Type: Cointraffic Adapter
+Maintainer: tech@cointraffic.io
+```
+
+# Description
+The Cointraffic client module makes it easy to implement Cointraffic directly into your website. To get started, simply replace the ``placementId`` with your assigned tracker key. This is dependent on the size required by your account dashboard. 
+We support response in different currencies. Supported currencies listed [here](https://www.ecb.europa.eu/stats/policy_and_exchange_rates/euro_reference_exchange_rates/html/index.en.html).
+
+For additional information on this module, please contact us at ``support@cointraffic.io``.
+
+# Test Parameters
+```
+  var adUnits = [{
+    code: 'test-ad-div',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250]],
+        }
+    },
+    bids: [{
+    bidder: 'cointraffic',
+      params: { 
+        placementId: 'testPlacementId'
+      }
+    }]
+  }];
+```
diff --git a/modules/coinzillaBidAdapter.js b/modules/coinzillaBidAdapter.js
index 240a3f1fcde..7e9fb964a87 100644
--- a/modules/coinzillaBidAdapter.js
+++ b/modules/coinzillaBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { parseSizesInput } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
@@ -31,7 +31,7 @@ export const spec = {
       return [];
     }
     return validBidRequests.map(bidRequest => {
-      const sizes = utils.parseSizesInput(bidRequest.params.size || bidRequest.sizes)[0];
+      const sizes = parseSizesInput(bidRequest.params.size || bidRequest.sizes)[0];
       const width = sizes.split('x')[0];
       const height = sizes.split('x')[1];
       const payload = {
@@ -39,7 +39,8 @@ export const spec = {
         width: width,
         height: height,
         bidId: bidRequest.bidId,
-        referer: bidderRequest.refererInfo.referer,
+        // TODO: is 'page' the right value here?
+        referer: bidderRequest.refererInfo.page,
       };
       return {
         method: 'POST',
@@ -79,7 +80,11 @@ export const spec = {
         netRevenue: netRevenue,
         ttl: config.getConfig('_bidderTimeout'),
         referrer: referrer,
-        ad: response.ad
+        ad: response.ad,
+        mediaType: response.mediaType,
+        meta: {
+          advertiserDomains: response.advertiserDomain || []
+        }
       };
       bidResponses.push(bidResponse);
     }
diff --git a/modules/collectcentBidAdapter.js b/modules/collectcentBidAdapter.js
deleted file mode 100644
index add3e06430d..00000000000
--- a/modules/collectcentBidAdapter.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-
-const BIDDER_CODE = 'collectcent';
-const URL_MULTI = 'https://publishers.motionspots.com/?c=o&m=multi';
-const URL_SYNC = 'https://publishers.motionspots.com/?c=o&m=cookie';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId &&
-        bid.params &&
-        !isNaN(bid.params.placementId) &&
-        spec.supportedMediaTypes.indexOf(bid.params.traffic) !== -1
-    );
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: (validBidRequests, bidderRequest) => {
-    let winTop;
-    try {
-      winTop = window.top;
-    } catch (e) {
-      utils.logMessage(e);
-      winTop = window;
-    };
-
-    const placements = [];
-    const location = bidderRequest ? new URL(bidderRequest.refererInfo.referer) : winTop.location;
-    const request = {
-      'secure': (location.protocol === 'https:') ? 1 : 0,
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements
-    };
-
-    for (let i = 0; i < validBidRequests.length; i++) {
-      const bid = validBidRequests[i];
-      const params = bid.params;
-      placements.push({
-        placementId: params.placementId,
-        bidId: bid.bidId,
-        sizes: bid.sizes,
-        traffic: params.traffic
-      });
-    }
-    return {
-      method: 'POST',
-      url: URL_MULTI,
-      data: request
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: (serverResponse) => {
-    try {
-      serverResponse = serverResponse.body;
-    } catch (e) {
-      utils.logMessage(e);
-    };
-    return serverResponse;
-  },
-
-  getUserSyncs: () => {
-    return [{
-      type: 'image',
-      url: URL_SYNC
-    }];
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/collectcentBidAdapter.md b/modules/collectcentBidAdapter.md
deleted file mode 100644
index 938bdc420cd..00000000000
--- a/modules/collectcentBidAdapter.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Overview
-
-```
-Module Name: Collectcent SSP Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: dev.collectcent@gmail.com
-```
-
-# Description
-
-Module that connects to Collectcent SSP demand sources
-
-# Test Parameters
-```
-    var adUnits = [{
-                code: 'placementCode',
-                sizes: [[300, 250]],
-                bids: [{
-                        bidder: 'collectcent',
-                        params: {
-                            placementId: 0,
-                            traffic: 'banner'
-                        }
-                    }]
-                }
-            ];
-```
diff --git a/modules/colombiaBidAdapter.js b/modules/colombiaBidAdapter.js
deleted file mode 100644
index 55109dbaab2..00000000000
--- a/modules/colombiaBidAdapter.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import * as utils from '../src/utils.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-const BIDDER_CODE = 'colombia';
-const ENDPOINT_URL = 'https://ade.clmbtech.com/cde/prebid.htm';
-const HOST_NAME = document.location.protocol + '//' + window.location.host;
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['clmb'],
-  supportedMediaTypes: [BANNER],
-  isBidRequestValid: function(bid) {
-    return !!(bid.params.placementId);
-  },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    return validBidRequests.map(bidRequest => {
-      const params = bidRequest.params;
-      const sizes = utils.parseSizesInput(bidRequest.sizes)[0];
-      const width = sizes.split('x')[0];
-      const height = sizes.split('x')[1];
-      const placementId = params.placementId;
-      const cb = Math.floor(Math.random() * 99999999999);
-      const bidId = bidRequest.bidId;
-      const referrer = (bidderRequest && bidderRequest.refererInfo) ? bidderRequest.refererInfo.referer : '';
-      const payload = {
-        v: 'hb1',
-        p: placementId,
-        w: width,
-        h: height,
-        cb: cb,
-        r: referrer,
-        uid: bidId,
-        t: 'i',
-        d: HOST_NAME,
-      };
-      return {
-        method: 'POST',
-        url: ENDPOINT_URL,
-        data: payload,
-      }
-    });
-  },
-  interpretResponse: function(serverResponse, bidRequest) {
-    const bidResponses = [];
-    const response = serverResponse.body;
-    const crid = response.creativeId || 0;
-    const width = response.width || 0;
-    const height = response.height || 0;
-    let cpm = response.cpm || 0;
-    if (width == 300 && height == 250) {
-      cpm = cpm * 0.2;
-    }
-    if (width == 320 && height == 50) {
-      cpm = cpm * 0.55;
-    }
-    if (cpm <= 0) {
-      return bidResponses;
-    }
-    if (width !== 0 && height !== 0 && cpm !== 0 && crid !== 0) {
-      const dealId = response.dealid || '';
-      const currency = response.currency || 'USD';
-      const netRevenue = (response.netRevenue === undefined) ? true : response.netRevenue;
-      const bidResponse = {
-        requestId: bidRequest.data.uid,
-        cpm: cpm,
-        width: response.width,
-        height: response.height,
-        creativeId: crid,
-        dealId: dealId,
-        currency: currency,
-        netRevenue: netRevenue,
-        ttl: config.getConfig('_bidderTimeout'),
-        referrer: bidRequest.data.r,
-        ad: response.ad
-      };
-      bidResponses.push(bidResponse);
-    }
-    return bidResponses;
-  }
-}
-registerBidder(spec);
diff --git a/modules/colombiaBidAdapter.md b/modules/colombiaBidAdapter.md
deleted file mode 100644
index c754e49771d..00000000000
--- a/modules/colombiaBidAdapter.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Overview
-
-```
-Module Name: COLOMBIA Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: colombiaonline@timesinteret.in
-```
-
-# Description
-
-Connect to COLOMBIA for bids.
-
-COLOMBIA adapter requires setup and approval from the COLOMBIA team. Please reach out to your account team or colombiaonline@timesinteret.in for more information.
-
-# Test Parameters
-```
-  var adUnits = [{
-    code: 'test-ad-div',
-    mediaTypes: {
-       banner: {
-         sizes: [[300, 250],[728,90],[320,50]]
-       }
-    },
-    bids: [{
-    bidder: 'colombia',
-      params: { 
-        placementId: '307466'
-      }
-    }]
-  }];
-```
diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index baa60a76a0d..082fb0ac4db 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -1,10 +1,13 @@
+import { getWindowTop, deepAccess, logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'colossusssp';
 const G_URL = 'https://colossusssp.com/?c=o&m=multi';
-const G_URL_SYNC = 'https://colossusssp.com/?c=o&m=cookie';
+const G_URL_SYNC = 'https://sync.colossusssp.com';
 
 function isBidResponseValid(bid) {
   if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
@@ -46,7 +49,10 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(bid.params.placement_id));
+    const validPlacamentId = bid.params && !isNaN(bid.params.placement_id);
+    const validGroupId = bid.params && !isNaN(bid.params.group_id);
+
+    return Boolean(bid.bidId && (validPlacamentId || validGroupId));
   },
 
   /**
@@ -56,24 +62,50 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
-    let winTop = window;
-    let location;
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+    let winLocation;
+
     try {
-      location = new URL(bidderRequest.refererInfo.referer)
-      winTop = window.top;
+      const winTop = getWindowTop();
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
     } catch (e) {
-      location = winTop.location;
-      utils.logMessage(e);
-    };
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo?.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+
+    const firstPartyData = bidderRequest.ortb2 || {};
+    const userObj = firstPartyData.user;
+    const siteObj = firstPartyData.site;
+    const appObj = firstPartyData.app;
+
+    // TODO: does the fallback to window.location make sense?
+    const location = refferLocation || winLocation;
     let placements = [];
     let request = {
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'language': (navigator && navigator.language) ? navigator.language : '',
-      'secure': location.protocol === 'https:' ? 1 : 0,
-      'host': location.host,
-      'page': location.pathname,
-      'placements': placements,
+      deviceWidth,
+      deviceHeight,
+      language: (navigator && navigator.language) ? navigator.language : '',
+      secure: location.protocol === 'https:' ? 1 : 0,
+      host: location.host,
+      page: location.pathname,
+      userObj,
+      siteObj,
+      appObj,
+      placements: placements
     };
 
     if (bidderRequest) {
@@ -81,32 +113,80 @@ export const spec = {
         request.ccpa = bidderRequest.uspConsent;
       }
       if (bidderRequest.gdprConsent) {
-        request.gdpr_consent = bidderRequest.gdprConsent.consentString || 'ALL'
-        request.gdpr_require = bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+        request.gdpr_consent = bidderRequest.gdprConsent.consentString || 'ALL';
+        request.gdpr_require = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
       }
     }
 
     for (let i = 0; i < validBidRequests.length; i++) {
       let bid = validBidRequests[i];
-      let traff = bid.params.traffic || BANNER
+      const { mediaTypes } = bid;
       let placement = {
         placementId: bid.params.placement_id,
+        groupId: bid.params.group_id,
         bidId: bid.bidId,
-        sizes: bid.mediaTypes[traff].sizes,
-        traffic: traff,
-        eids: []
+        tid: bid.transactionId,
+        eids: [],
+        floor: {}
       };
+
       if (bid.schain) {
         placement.schain = bid.schain;
       }
+      let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+      if (gpid) {
+        placement.gpid = gpid;
+      }
       if (bid.userId) {
         getUserId(placement.eids, bid.userId.britepoolid, 'britepool.com');
         getUserId(placement.eids, bid.userId.idl_env, 'identityLink');
-        getUserId(placement.eids, bid.userId.id5id, 'id5-sync.com')
+        getUserId(placement.eids, bid.userId.id5id, 'id5-sync.com');
+        getUserId(placement.eids, bid.userId.uid2 && bid.userId.uid2.id, 'uidapi.com');
         getUserId(placement.eids, bid.userId.tdid, 'adserver.org', {
           rtiPartner: 'TDID'
         });
       }
+
+      if (mediaTypes && mediaTypes[BANNER]) {
+        placement.traffic = BANNER;
+        placement.sizes = mediaTypes[BANNER].sizes;
+      } else if (mediaTypes && mediaTypes[VIDEO]) {
+        placement.traffic = VIDEO;
+        placement.sizes = mediaTypes[VIDEO].playerSize;
+        placement.playerSize = mediaTypes[VIDEO].playerSize;
+        placement.minduration = mediaTypes[VIDEO].minduration;
+        placement.maxduration = mediaTypes[VIDEO].maxduration;
+        placement.mimes = mediaTypes[VIDEO].mimes;
+        placement.protocols = mediaTypes[VIDEO].protocols;
+        placement.startdelay = mediaTypes[VIDEO].startdelay;
+        placement.placement = mediaTypes[VIDEO].placement;
+        placement.skip = mediaTypes[VIDEO].skip;
+        placement.skipafter = mediaTypes[VIDEO].skipafter;
+        placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+        placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+        placement.delivery = mediaTypes[VIDEO].delivery;
+        placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+        placement.api = mediaTypes[VIDEO].api;
+        placement.linearity = mediaTypes[VIDEO].linearity;
+      } else if (mediaTypes && mediaTypes[NATIVE]) {
+        placement.traffic = NATIVE;
+        placement.native = mediaTypes[NATIVE];
+      }
+
+      if (typeof bid.getFloor === 'function') {
+        let tmpFloor = {};
+        for (let size of placement.sizes) {
+          tmpFloor = bid.getFloor({
+            currency: 'USD',
+            mediaType: placement.traffic,
+            size: size
+          });
+          if (tmpFloor) {
+            placement.floor[`${size[0]}x${size[1]}`] = tmpFloor.floor;
+          }
+        }
+      }
+
       placements.push(placement);
     }
     return {
@@ -129,20 +209,45 @@ export const spec = {
       for (let i = 0; i < serverResponse.length; i++) {
         let resItem = serverResponse[i];
         if (isBidResponseValid(resItem)) {
+          const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+          resItem.meta = { ...resItem.meta, advertiserDomains };
+
           response.push(resItem);
         }
       }
     } catch (e) {
-      utils.logMessage(e);
+      logMessage(e);
     };
     return response;
   },
 
-  getUserSyncs: () => {
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = G_URL_SYNC + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
     return [{
-      type: 'image',
-      url: G_URL_SYNC
+      type: syncType,
+      url: syncUrl
     }];
+  },
+
+  onBidWon: (bid) => {
+    if (bid.nurl) {
+      ajax(bid.nurl, null);
+    }
   }
 };
 
diff --git a/modules/colossussspBidAdapter.md b/modules/colossussspBidAdapter.md
index d95080546c2..45af89580c1 100644
--- a/modules/colossussspBidAdapter.md
+++ b/modules/colossussspBidAdapter.md
@@ -13,19 +13,55 @@ Module that connects to Colossus SSP demand sources
 # Test Parameters
 ```
     var adUnits = [{
-                code: 'placementid_0',
-                mediaTypes: {
-                    banner: {
-                        sizes: [[300, 250], [300,600]]
-                    }
+        code: 'placementid_0',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250], [300,600]]
+            }
+        },
+        bids: [{
+            bidder: 'colossusssp',
+            params: {
+                placement_id: 0
+            }
+        }]
+    }, {
+        code: 'placementid_1',
+        mediaTypes: {
+            video: {
+                playerSize: [ [640, 480] ],
+                context: 'instream',
+                minduration: 5,
+                maxduration: 60,
+            }
+        },
+        bids: [{
+            bidder: 'colossusssp',
+            params: {
+                group_id: 0
+            }
+        }]
+    }, {
+        code: 'placementid_2',
+        mediaTypes: {
+            native: {
+                title: {
+                    required: true
                 },
-                bids: [{
-                        bidder: 'colossusssp',
-                        params: {
-                            placement_id: 0,
-                            traffic: 'banner'
-                        }
-                    }]
+                body: {
+                    required: true
+                },
+                icon: {
+                    required: true,
+                    size: [64, 64]
                 }
-            ];
+            }
+        },
+        bids: [{
+            bidder: 'colossusssp',
+            params: {
+                placement_id: 0,
+            }
+        }]
+    }];
 ```
diff --git a/modules/compassBidAdapter.js b/modules/compassBidAdapter.js
new file mode 100644
index 00000000000..a89c4c617b6
--- /dev/null
+++ b/modules/compassBidAdapter.js
@@ -0,0 +1,212 @@
+import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'compass';
+const AD_URL = 'https://sa-lb.deliverimp.com/pbjs';
+const SYNC_URL = 'https://sa-cs.deliverimp.com';
+
+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 || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId, endpointId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  if (placementId) {
+    placement.placementId = placementId;
+    placement.type = 'publisher';
+  } else if (endpointId) {
+    placement.endpointId = endpointId;
+    placement.type = 'network';
+  }
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+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 (err) {
+    logError(err);
+    return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    } else {
+      valid = false;
+    }
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+    // TODO: does the fallback make sense here?
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/compassBidAdapter.md b/modules/compassBidAdapter.md
new file mode 100644
index 00000000000..18d52c12384
--- /dev/null
+++ b/modules/compassBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: Compass Bidder Adapter
+Module Type: Compass Bidder Adapter
+Maintainer: sa-support@brightcom.com
+```
+
+# Description
+
+Connects to Compass exchange for bids.
+Compass bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'compass',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'compass',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'compass',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/concertAnalyticsAdapter.js b/modules/concertAnalyticsAdapter.js
new file mode 100644
index 00000000000..210d1898338
--- /dev/null
+++ b/modules/concertAnalyticsAdapter.js
@@ -0,0 +1,120 @@
+import { logMessage } from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+
+const analyticsType = 'endpoint';
+
+// We only want to send about 1% of events for sampling purposes
+const SAMPLE_RATE_PERCENTAGE = 1 / 100;
+const pageIncludedInSample = sampleAnalytics();
+
+const url = 'https://bids.concert.io/analytics';
+
+const {
+  EVENTS: {
+    BID_RESPONSE,
+    BID_WON,
+    AUCTION_END
+  }
+} = CONSTANTS;
+
+let queue = [];
+
+let concertAnalytics = Object.assign(adapter({url, analyticsType}), {
+  track({ eventType, args }) {
+    switch (eventType) {
+      case BID_RESPONSE:
+        if (args.bidder !== 'concert') break;
+        queue.push(mapBidEvent(eventType, args));
+        break;
+
+      case BID_WON:
+        if (args.bidder !== 'concert') break;
+        queue.push(mapBidEvent(eventType, args));
+        break;
+
+      case AUCTION_END:
+        // Set a delay, as BID_WON events will come after AUCTION_END events
+        setTimeout(() => sendEvents(), 3000);
+        break;
+
+      default:
+        break;
+    }
+  }
+});
+
+function mapBidEvent(eventType, args) {
+  const { adId, auctionId, cpm, creativeId, width, height, timeToRespond } = args;
+  const [gamCreativeId, concertRequestId] = getConcertRequestId(creativeId);
+
+  const payload = {
+    event: eventType,
+    concert_rid: concertRequestId,
+    adId,
+    auctionId,
+    creativeId: gamCreativeId,
+    position: args.adUnitCode,
+    url: window.location.href,
+    cpm,
+    width,
+    height,
+    timeToRespond
+  }
+
+  return payload;
+}
+
+/**
+ * In order to pass back the concert_rid from CBS, it is tucked into the `creativeId`
+ * slot in the bid response and combined with a pipe `|`. This method splits the creative ID
+ * and the concert_rid.
+ *
+ * @param {string} creativeId
+ */
+function getConcertRequestId(creativeId) {
+  if (!creativeId || creativeId.indexOf('|') < 0) return [null, null];
+
+  return creativeId.split('|');
+}
+
+function sampleAnalytics() {
+  return Math.random() <= SAMPLE_RATE_PERCENTAGE;
+}
+
+function sendEvents() {
+  concertAnalytics.eventsStorage = queue;
+
+  if (!queue.length) return;
+
+  if (!pageIncludedInSample) {
+    logMessage('Page not included in sample for Concert Analytics');
+    return;
+  }
+
+  try {
+    const body = JSON.stringify(queue);
+    ajax(url, () => queue = [], body, {
+      contentType: 'application/json',
+      method: 'POST'
+    });
+  } catch (err) { logMessage('Concert Analytics error') }
+}
+
+// save the base class function
+concertAnalytics.originEnableAnalytics = concertAnalytics.enableAnalytics;
+concertAnalytics.eventsStorage = [];
+
+// override enableAnalytics so we can get access to the config passed in from the page
+concertAnalytics.enableAnalytics = function (config) {
+  concertAnalytics.originEnableAnalytics(config);
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: concertAnalytics,
+  code: 'concert'
+});
+
+export default concertAnalytics;
diff --git a/modules/concertAnalyticsAdapter.md b/modules/concertAnalyticsAdapter.md
new file mode 100644
index 00000000000..7c9b6d22703
--- /dev/null
+++ b/modules/concertAnalyticsAdapter.md
@@ -0,0 +1,11 @@
+# Overview
+
+```
+Module Name: Concert Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: support@concert.io
+```
+
+# Description
+
+Analytics adapter for concert.
\ No newline at end of file
diff --git a/modules/concertBidAdapter.js b/modules/concertBidAdapter.js
new file mode 100644
index 00000000000..dcea60d5231
--- /dev/null
+++ b/modules/concertBidAdapter.js
@@ -0,0 +1,274 @@
+import { logWarn, logMessage, debugTurnedOn, generateUUID, deepAccess } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { hasPurpose1Consent } from '../src/utils/gpdr.js';
+
+const BIDDER_CODE = 'concert';
+const CONCERT_ENDPOINT = 'https://bids.concert.io';
+const USER_SYNC_URL = 'https://cdn.concert.io/lib/bids/sync.html';
+
+export const spec = {
+  code: BIDDER_CODE,
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    if (!bid.params.partnerId) {
+      logWarn('Missing partnerId bid parameter');
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @param {bidderRequest} -
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    logMessage(validBidRequests);
+    logMessage(bidderRequest);
+
+    const eids = [];
+
+    let payload = {
+      meta: {
+        prebidVersion: '$prebid.version$',
+        pageUrl: bidderRequest.refererInfo.page,
+        screen: [window.screen.width, window.screen.height].join('x'),
+        debug: debugTurnedOn(),
+        uid: getUid(bidderRequest),
+        optedOut: hasOptedOutOfPersonalization(),
+        adapterVersion: '1.1.1',
+        uspConsent: bidderRequest.uspConsent,
+        gdprConsent: bidderRequest.gdprConsent
+      }
+    };
+
+    payload.slots = validBidRequests.map(bidRequest => {
+      collectEid(eids, bidRequest);
+      const adUnitElement = document.getElementById(bidRequest.adUnitCode)
+      const coordinates = getOffset(adUnitElement)
+
+      let slot = {
+        name: bidRequest.adUnitCode,
+        bidId: bidRequest.bidId,
+        transactionId: bidRequest.transactionId,
+        sizes: bidRequest.params.sizes || bidRequest.sizes,
+        partnerId: bidRequest.params.partnerId,
+        slotType: bidRequest.params.slotType,
+        adSlot: bidRequest.params.slot || bidRequest.adUnitCode,
+        placementId: bidRequest.params.placementId || '',
+        site: bidRequest.params.site || bidderRequest.refererInfo.page,
+        ref: bidderRequest.refererInfo.ref,
+        offsetCoordinates: { x: coordinates?.left, y: coordinates?.top }
+      }
+
+      return slot;
+    });
+
+    payload.meta.eids = eids.filter(Boolean);
+
+    logMessage(payload);
+
+    return {
+      method: 'POST',
+      url: `${CONCERT_ENDPOINT}/bids/prebid`,
+      data: JSON.stringify(payload)
+    };
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, bidRequest) {
+    logMessage(serverResponse);
+    logMessage(bidRequest);
+
+    const serverBody = serverResponse.body;
+
+    if (!serverBody || typeof serverBody !== 'object') {
+      return [];
+    }
+
+    let bidResponses = [];
+
+    bidResponses = serverBody.bids.map(bid => {
+      return {
+        requestId: bid.bidId,
+        cpm: bid.cpm,
+        width: bid.width,
+        height: bid.height,
+        ad: bid.ad,
+        ttl: bid.ttl,
+        meta: { advertiserDomains: bid && bid.adomain ? bid.adomain : [] },
+        creativeId: bid.creativeId,
+        netRevenue: bid.netRevenue,
+        currency: bid.currency
+      };
+    });
+
+    if (debugTurnedOn() && serverBody.debug) {
+      logMessage(`CONCERT`, serverBody.debug);
+    }
+
+    logMessage(bidResponses);
+    return bidResponses;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @param {gdprConsent} object GDPR consent object.
+   * @param {uspConsent} string US Privacy String.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    if (syncOptions.iframeEnabled && !hasOptedOutOfPersonalization()) {
+      let params = [];
+
+      if (gdprConsent && (typeof gdprConsent.gdprApplies === 'boolean')) {
+        params.push(`gdpr_applies=${gdprConsent.gdprApplies ? '1' : '0'}`);
+      }
+      if (gdprConsent && (typeof gdprConsent.consentString === 'string')) {
+        params.push(`gdpr_consent=${gdprConsent.consentString}`);
+      }
+      if (uspConsent && (typeof uspConsent === 'string')) {
+        params.push(`usp_consent=${uspConsent}`);
+      }
+
+      syncs.push({
+        type: 'iframe',
+        url: USER_SYNC_URL + (params.length > 0 ? `?${params.join('&')}` : '')
+      });
+    }
+    return syncs;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  onTimeout: function(data) {
+    logMessage('concert bidder timed out');
+    logMessage(data);
+  },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
+  onBidWon: function(bid) {
+    logMessage('concert bidder won bid');
+    logMessage(bid);
+  }
+
+}
+
+registerBidder(spec);
+
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+/**
+ * Check or generate a UID for the current user.
+ */
+function getUid(bidderRequest) {
+  if (hasOptedOutOfPersonalization() || !consentAllowsPpid(bidderRequest)) {
+    return false;
+  }
+
+  const sharedId = deepAccess(bidderRequest, 'userId._sharedid.id');
+
+  if (sharedId) {
+    return sharedId;
+  }
+
+  const LEGACY_CONCERT_UID_KEY = 'c_uid';
+  const CONCERT_UID_KEY = 'vmconcert_uid';
+
+  const legacyUid = storage.getDataFromLocalStorage(LEGACY_CONCERT_UID_KEY);
+  let uid = storage.getDataFromLocalStorage(CONCERT_UID_KEY);
+
+  if (legacyUid) {
+    uid = legacyUid;
+    storage.setDataInLocalStorage(CONCERT_UID_KEY, uid);
+    storage.removeDataFromLocalStorage(LEGACY_CONCERT_UID_KEY);
+  }
+
+  if (!uid) {
+    uid = generateUUID();
+    storage.setDataInLocalStorage(CONCERT_UID_KEY, uid);
+  }
+
+  return uid;
+}
+
+/**
+ * Whether the user has opted out of personalization.
+ */
+function hasOptedOutOfPersonalization() {
+  const CONCERT_NO_PERSONALIZATION_KEY = 'c_nap';
+
+  return storage.getDataFromLocalStorage(CONCERT_NO_PERSONALIZATION_KEY) === 'true';
+}
+
+/**
+ * Whether the privacy consent strings allow personalization.
+ *
+ * @param {BidderRequest} bidderRequest Object which contains any data consent signals
+ */
+function consentAllowsPpid(bidderRequest) {
+  /* NOTE: We can't easily test GDPR consent, without the
+   * `consent-string` npm module; so will have to rely on that
+   * happening on the bid-server. */
+  const uspConsent = !(bidderRequest?.uspConsent === 'string' &&
+    bidderRequest?.uspConsent[0] === '1' &&
+    bidderRequest?.uspConsent[2].toUpperCase() === 'Y');
+
+  const gdprConsent = bidderRequest?.gdprConsent && hasPurpose1Consent(bidderRequest?.gdprConsent);
+
+  return (uspConsent || gdprConsent);
+}
+
+function collectEid(eids, bid) {
+  if (bid.userId) {
+    const eid = getUserId(bid.userId.uid2 && bid.userId.uid2.id, 'uidapi.com', undefined, 3)
+    eids.push(eid)
+  }
+}
+
+function getUserId(id, source, uidExt, atype) {
+  if (id) {
+    const uid = { id, atype };
+
+    if (uidExt) {
+      uid.ext = uidExt;
+    }
+
+    return {
+      source,
+      uids: [ uid ]
+    };
+  }
+}
+
+function getOffset(el) {
+  if (el) {
+    const rect = el.getBoundingClientRect();
+    return {
+      left: rect.left + window.scrollX,
+      top: rect.top + window.scrollY
+    };
+  }
+}
diff --git a/modules/concertBidAdapter.md b/modules/concertBidAdapter.md
new file mode 100644
index 00000000000..d8736082e5c
--- /dev/null
+++ b/modules/concertBidAdapter.md
@@ -0,0 +1,37 @@
+# Overview
+
+```
+Module Name: Concert Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: support@concert.io
+```
+
+# Description
+
+Module that connects to Concert demand sources
+
+# Test Paramters
+```
+  var adUnits = [
+    {
+      code: 'desktop_leaderboard_variable',
+      mediaTypes: {
+        banner: {
+          sizes: [[1030, 590]]
+        }
+      }
+      bids: [
+        {
+          bidder: "concert",
+          params: {
+            partnerId: 'test_partner',
+            site: 'site_name',
+            placementId: 1234567,
+            slot: 'slot_name',
+            sizes: [[1030, 590]]
+          }
+        }
+      ]
+    }
+  ];
+```
diff --git a/modules/confiantRtdProvider.js b/modules/confiantRtdProvider.js
new file mode 100644
index 00000000000..2c13ad87d75
--- /dev/null
+++ b/modules/confiantRtdProvider.js
@@ -0,0 +1,128 @@
+/**
+ * This module provides comprehensive detection of security, quality, and privacy threats by Confiant Inc,
+ * the industry leader in real-time detecting and blocking of bad ads
+ *
+ * The {@link module:modules/realTimeData} module is required
+ * The module will inject a Confiant Inc. script into the page to monitor ad impressions
+ * @module modules/confiantRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { submodule } from '../src/hook.js';
+import { logError, generateUUID } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+
+/**
+ * Injects the Confiant Inc. configuration script into the page, based on proprtyId provided
+ * @param {string} propertyId
+ */
+function injectConfigScript(propertyId) {
+  const scriptSrc = `https://cdn.confiant-integrations.net/${propertyId}/gpt_and_prebid/config.js`;
+
+  loadExternalScript(scriptSrc, 'confiant', () => {});
+}
+
+/**
+ * Set up page with Confiant integration
+ * @param {Object} config
+ */
+function setupPage(config) {
+  const propertyId = config?.params?.propertyId;
+  if (!propertyId) {
+    logError('Confiant pbjs module: no propertyId provided');
+    return false;
+  }
+
+  const confiant = window.confiant || Object.create(null);
+  confiant[propertyId] = confiant[propertyId] || Object.create(null);
+  confiant[propertyId].clientSettings = confiant[propertyId].clientSettings || Object.create(null);
+  confiant[propertyId].clientSettings.isMGBL = true;
+  confiant[propertyId].clientSettings.prebidExcludeBidders = config?.params?.prebidExcludeBidders;
+  confiant[propertyId].clientSettings.prebidNameSpace = config?.params?.prebidNameSpace;
+
+  if (config?.params?.shouldEmitBillableEvent) {
+    if (window.frames['cnftComm']) {
+      subscribeToConfiantCommFrame(window);
+    } else {
+      setUpMutationObserver();
+    }
+  }
+
+  injectConfigScript(propertyId);
+  return true;
+}
+
+/**
+ * Subscribe to window's message events to report Billable events
+ * @param {Window} targetWindow window instance to subscribe to
+ */
+function subscribeToConfiantCommFrame(targetWindow) {
+  targetWindow.addEventListener('message', reportBillableEvents);
+}
+
+let mutationObserver;
+/**
+ * Set up mutation observer to subscribe to Confiant's communication channel ASAP
+ */
+function setUpMutationObserver() {
+  mutationObserver = new MutationObserver((mutations) => {
+    mutations.forEach((mutation) => {
+      mutation.addedNodes.forEach((addedNode) => {
+        if (addedNode.nodeName === 'IFRAME' && addedNode.name === 'cnftComm' && !addedNode.pbjsModuleSubscribed) {
+          addedNode.pbjsModuleSubscribed = true;
+          mutationObserver.disconnect();
+          mutationObserver = null;
+          const iframeWindow = addedNode.contentWindow;
+          subscribeToConfiantCommFrame(iframeWindow);
+        }
+      });
+    });
+  });
+  mutationObserver.observe(document.head, { childList: true, subtree: true });
+}
+
+/**
+ * Emit billable event when Confiant integration reports that it has monitored an impression
+ */
+function reportBillableEvents (e) {
+  events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+    auctionId: e.data.auctionId,
+    billingId: generateUUID(),
+    transactionId: e.data.transactionId,
+    type: 'impression',
+    vendor: 'confiant'
+  });
+}
+
+/**
+ * Confiant submodule registration
+ */
+function registerConfiantSubmodule() {
+  submodule('realTimeData', {
+    name: 'confiant',
+    init: (config) => {
+      try {
+        return setupPage(config);
+      } catch (err) {
+        logError(err.message);
+        if (mutationObserver) {
+          mutationObserver.disconnect();
+        }
+        return false;
+      }
+    }
+  });
+}
+
+registerConfiantSubmodule();
+
+export default {
+  injectConfigScript,
+  setupPage,
+  subscribeToConfiantCommFrame,
+  setUpMutationObserver,
+  reportBillableEvents,
+  registerConfiantSubmodule
+};
diff --git a/modules/confiantRtdProvider.md b/modules/confiantRtdProvider.md
new file mode 100644
index 00000000000..e92c0aabcba
--- /dev/null
+++ b/modules/confiantRtdProvider.md
@@ -0,0 +1,45 @@
+# Overview
+
+```
+Module Name: Confiant Inc. Rtd provider
+Module Type: Rtd Provider
+Maintainer: 
+```
+
+Confiant’s module provides comprehensive detection of security, quality, and privacy threats across your ad stack.
+Confiant is the industry leader in real-time detecting and blocking of bad ads when it comes to protecting your users and brand reputation.
+
+To start using this module, please contact [Confiant](https://www.confiant.com/contact) to get an account and customer key.
+
+
+# Integration
+
+1) Build Prebid bundle with Confiant module included:
+
+
+```
+gulp build --modules=confiantRtdProvider,...
+```
+
+2) Include the resulting bundle on your page.
+
+# Configuration
+
+Configuration of Confiant module is plain simple:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'confiant',
+            params: {
+                // so please get in touch with us so we could help you to set up the module with proper parameters
+                propertyId: '', // required, string param, obtained from Confiant Inc.
+                prebidExcludeBidders: '', // optional, comma separated list of bidders to exclude from Confiant's prebid.js integration
+                prebidNameSpace: '', // optional, string param, namespace for prebid.js integration
+                shouldEmitBillableEvent: false, // optional, boolean param, upon being set to true enables firing of the BillableEvent upon Confiant's impression scanning
+            }
+        }]
+    }
+});
+```
diff --git a/modules/connectIdSystem.js b/modules/connectIdSystem.js
new file mode 100644
index 00000000000..38c9c00b0ed
--- /dev/null
+++ b/modules/connectIdSystem.js
@@ -0,0 +1,146 @@
+/**
+ * This module adds support for Yahoo ConnectID to the user ID module system.
+ * The {@link module:modules/userId} module is required
+ * @module modules/connectIdSystem
+ * @requires module:modules/userId
+ */
+
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {includes} from '../src/polyfill.js';
+import {formatQS, logError} from '../src/utils.js';
+
+const MODULE_NAME = 'connectId';
+const VENDOR_ID = 25;
+const PLACEHOLDER = '__PIXEL_ID__';
+const UPS_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PLACEHOLDER}/fed`;
+const OVERRIDE_OPT_OUT_KEY = 'connectIdOptOut';
+const INPUT_PARAM_KEYS = ['pixelId', 'he', 'puid'];
+
+/** @type {Submodule} */
+export const connectIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * @type {Number}
+   */
+  gvlid: VENDOR_ID,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{connectId: string} | undefined}
+   */
+  decode(value) {
+    if (connectIdSubmodule.userHasOptedOut()) {
+      return undefined;
+    }
+    return (typeof value === 'object' && value.connectid)
+      ? {connectId: value.connectid} : undefined;
+  },
+  /**
+   * Gets the Yahoo ConnectID
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData) {
+    if (connectIdSubmodule.userHasOptedOut()) {
+      return;
+    }
+    const params = config.params || {};
+    if (!params || (typeof params.he !== 'string' && typeof params.puid !== 'string') ||
+        (typeof params.pixelId === 'undefined' && typeof params.endpoint === 'undefined')) {
+      logError('The connectId submodule requires the \'pixelId\' and at least one of the \'he\' ' +
+               'or \'puid\' parameters to be defined.');
+      return;
+    }
+
+    const data = {
+      '1p': includes([1, '1', true], params['1p']) ? '1' : '0',
+      gdpr: connectIdSubmodule.isEUConsentRequired(consentData) ? '1' : '0',
+      gdpr_consent: connectIdSubmodule.isEUConsentRequired(consentData) ? consentData.gdpr.consentString : '',
+      us_privacy: consentData && consentData.uspConsent ? consentData.uspConsent : ''
+    };
+
+    if (connectIdSubmodule.isUnderGPPJurisdiction(consentData)) {
+      data.gpp = consentData.gppConsent.gppString;
+      data.gpp_sid = encodeURIComponent(consentData.gppConsent.applicableSections.join(','));
+    }
+
+    INPUT_PARAM_KEYS.forEach(key => {
+      if (typeof params[key] != 'undefined') {
+        data[key] = params[key];
+      }
+    });
+
+    const resp = function (callback) {
+      const callbacks = {
+        success: response => {
+          let responseObj;
+          if (response) {
+            try {
+              responseObj = JSON.parse(response);
+            } catch (error) {
+              logError(error);
+            }
+          }
+          callback(responseObj);
+        },
+        error: error => {
+          logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+          callback();
+        }
+      };
+      const endpoint = UPS_ENDPOINT.replace(PLACEHOLDER, params.pixelId);
+      let url = `${params.endpoint || endpoint}?${formatQS(data)}`;
+      connectIdSubmodule.getAjaxFn()(url, callbacks, null, {method: 'GET', withCredentials: true});
+    };
+    return {callback: resp};
+  },
+
+  /**
+   * Utility function that returns a boolean flag indicating if the opportunity
+   * is subject to GDPR
+   * @returns {Boolean}
+   */
+  isEUConsentRequired(consentData) {
+    return !!(consentData && consentData.gdpr && consentData.gdpr.gdprApplies);
+  },
+
+  /**
+   * Utility function that returns a boolean flag indicating if the opportunity
+   * is subject to GPP jurisdiction.
+   * @returns {Boolean}
+   */
+  isUnderGPPJurisdiction(consentData) {
+    return !!(consentData && consentData.gppConsent && consentData.gppConsent.gppString);
+  },
+
+  /**
+   * Utility function that returns a boolean flag indicating if the user
+   * has opeted out via the Yahoo easy-opt-out mechanism.
+   * @returns {Boolean}
+   */
+  userHasOptedOut() {
+    try {
+      return localStorage.getItem(OVERRIDE_OPT_OUT_KEY) === '1';
+    } catch {
+      return false;
+    }
+  },
+
+  /**
+   * Return the function used to perform XHR calls.
+   * Utilised for each of testing.
+   * @returns {Function}
+   */
+  getAjaxFn() {
+    return ajax;
+  }
+};
+
+submodule('userId', connectIdSubmodule);
diff --git a/modules/connectIdSystem.md b/modules/connectIdSystem.md
new file mode 100644
index 00000000000..c671c036b77
--- /dev/null
+++ b/modules/connectIdSystem.md
@@ -0,0 +1,34 @@
+## Yahoo ConnectID User ID Submodule
+
+Yahoo ConnectID user ID Module.
+
+### Prebid Params
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'connectId',
+            storage: {
+                name: 'connectId',
+                type: 'html5',
+                expires: 15
+            },
+            params: {
+                pixelId: 58776,
+                he: '0bef996248d63cea1529cb86de31e9547a712d9f380146e98bbd39beec70355a'
+            }
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the Yahoo ConnectID user ID Module.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the Yahoo ConnectID module - `"connectId"` | `"connectId"` |
+| params | Required | Object | Data for Yahoo ConnectID initialization. | |
+| params.pixelId | Required | Number | The Yahoo supplied publisher specific pixel Id.  | `8976` |
+| params.he | Optional | String | The SHA-256 hashed user email address. One of either the `he` parameter or the `puid` parameter must be supplied. | `"529cb86de31e9547a712d9f380146e98bbd39beec"` |
+| params.puid | Optional | String | The publisher-supplied user identifier. One of either the `he` parameter or the `puid` parameter must be supplied. | `"P-975484817"` |
diff --git a/modules/connectadBidAdapter.js b/modules/connectadBidAdapter.js
index 3dcb8da9838..5185308eab0 100644
--- a/modules/connectadBidAdapter.js
+++ b/modules/connectadBidAdapter.js
@@ -1,7 +1,8 @@
-import * as utils from '../src/utils.js';
+import { deepSetValue, convertTypes, tryAppendQueryString, logWarn } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js'
 import {config} from '../src/config.js';
+import {createEidsArray} from './userId/eids.js';
 
 const BIDDER_CODE = 'connectad';
 const BIDDER_CODE_ALIAS = 'connectadrealtime';
@@ -10,6 +11,7 @@ const SUPPORTED_MEDIA_TYPES = [BANNER];
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 138,
   aliases: [ BIDDER_CODE_ALIAS ],
   supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
 
@@ -18,8 +20,6 @@ export const spec = {
   },
 
   buildRequests: function(validBidRequests, bidderRequest) {
-    let digitrust;
-
     let ret = {
       method: 'POST',
       url: '',
@@ -35,23 +35,26 @@ export const spec = {
       placements: [],
       time: Date.now(),
       user: {},
-      url: (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) ? bidderRequest.refererInfo.referer : window.location.href,
-      referrer: window.document.referrer,
-      referrer_info: bidderRequest.refererInfo,
+      // TODO: does the fallback to window.location make sense?
+      url: bidderRequest.refererInfo?.page || window.location.href,
+      referrer: bidderRequest.refererInfo?.ref,
+      // TODO: please do not send internal data structures over the network
+      referrer_info: bidderRequest.refererInfo?.legacy,
       screensize: getScreenSize(),
       dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
       language: navigator.language,
-      ua: navigator.userAgent
+      ua: navigator.userAgent,
+      pversion: '$prebid.version$'
     });
 
     // coppa compliance
     if (config.getConfig('coppa') === true) {
-      utils.deepSetValue(data, 'user.coppa', 1);
+      deepSetValue(data, 'user.coppa', 1);
     }
 
     // adding schain object
     if (validBidRequests[0].schain) {
-      utils.deepSetValue(data, 'source.ext.schain', validBidRequests[0].schain);
+      deepSetValue(data, 'source.ext.schain', validBidRequests[0].schain);
     }
 
     // Attaching GDPR Consent Params
@@ -60,90 +63,31 @@ export const spec = {
       if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') {
         gdprApplies = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
       }
-      utils.deepSetValue(data, 'user.ext.gdpr', gdprApplies);
-      utils.deepSetValue(data, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(data, 'user.ext.gdpr', gdprApplies);
+      deepSetValue(data, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
     }
 
     // CCPA
     if (bidderRequest.uspConsent) {
-      utils.deepSetValue(data, 'user.ext.us_privacy', bidderRequest.uspConsent);
-    }
-
-    // Digitrust Support
-    const bidRequestDigitrust = utils.deepAccess(validBidRequests[0], 'userId.digitrustid.data');
-    if (bidRequestDigitrust && (!bidRequestDigitrust.privacy || !bidRequestDigitrust.privacy.optout)) {
-      digitrust = {
-        id: bidRequestDigitrust.id,
-        keyv: bidRequestDigitrust.keyv
-      }
-    }
-
-    if (digitrust) {
-      utils.deepSetValue(data, 'user.ext.digitrust', {
-        id: digitrust.id,
-        keyv: digitrust.keyv
-      })
+      deepSetValue(data, 'user.ext.us_privacy', bidderRequest.uspConsent);
     }
 
-    if (validBidRequests[0].userId && typeof validBidRequests[0].userId === 'object' && (validBidRequests[0].userId.tdid || validBidRequests[0].userId.pubcid || validBidRequests[0].userId.lipb || validBidRequests[0].userId.id5id || validBidRequests[0].userId.parrableid)) {
-      utils.deepSetValue(data, 'user.ext.eids', []);
-
-      if (validBidRequests[0].userId.tdid) {
-        data.user.ext.eids.push({
-          source: 'adserver.org',
-          uids: [{
-            id: validBidRequests[0].userId.tdid,
-            ext: {
-              rtiPartner: 'TDID'
-            }
-          }]
-        });
-      }
-
-      if (validBidRequests[0].userId.pubcid) {
-        data.user.ext.eids.push({
-          source: 'pubcommon',
-          uids: [{
-            id: validBidRequests[0].userId.pubcid,
-          }]
-        });
-      }
-
-      if (validBidRequests[0].userId.id5id) {
-        data.user.ext.eids.push({
-          source: 'id5-sync.com',
-          uids: [{
-            id: validBidRequests[0].userId.id5id,
-          }]
-        });
-      }
-
-      if (validBidRequests[0].userId.parrableid) {
-        data.user.ext.eids.push({
-          source: 'parrable.com',
-          uids: [{
-            id: validBidRequests[0].userId.parrableid,
-          }]
-        });
-      }
-
-      if (validBidRequests[0].userId.lipb && validBidRequests[0].userId.lipb.lipbid) {
-        data.user.ext.eids.push({
-          source: 'liveintent.com',
-          uids: [{
-            id: validBidRequests[0].userId.lipb.lipbid
-          }]
-        });
-      }
+    // EIDS Support
+    if (validBidRequests[0].userId) {
+      deepSetValue(data, 'user.ext.eids', createEidsArray(validBidRequests[0].userId));
     }
 
     validBidRequests.map(bid => {
       const placement = Object.assign({
         id: bid.transactionId,
         divName: bid.bidId,
+        pisze: bid.mediaTypes.banner.sizes[0] || bid.sizes[0],
         sizes: bid.mediaTypes.banner.sizes,
-        adTypes: getSize(bid.mediaTypes.banner.sizes || bid.sizes)
-      }, bid.params);
+        adTypes: getSize(bid.mediaTypes.banner.sizes || bid.sizes),
+        bidfloor: getBidFloor(bid),
+        siteId: bid.params.siteId,
+        networkId: bid.params.networkId
+      });
 
       if (placement.networkId && placement.siteId) {
         data.placements.push(placement);
@@ -182,6 +126,7 @@ export const spec = {
           bid.width = decision.width;
           bid.height = decision.height;
           bid.dealid = decision.dealid || null;
+          bid.meta = { advertiserDomains: decision && decision.adomain ? decision.adomain : [] };
           bid.ad = retrieveAd(decision);
           bid.currency = 'USD';
           bid.creativeId = decision.adId;
@@ -195,23 +140,30 @@ export const spec = {
     return bidResponses;
   },
 
+  transformBidParams: function (params, isOpenRtb) {
+    return convertTypes({
+      'siteId': 'number',
+      'networkId': 'number'
+    }, params);
+  },
+
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
     let syncEndpoint = 'https://cdn.connectad.io/connectmyusers.php?';
 
     if (gdprConsent) {
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
     }
 
     if (gdprConsent && typeof gdprConsent.consentString === 'string') {
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'gdpr_consent', gdprConsent.consentString);
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'gdpr_consent', gdprConsent.consentString);
     }
 
     if (uspConsent) {
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'us_privacy', uspConsent);
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'us_privacy', uspConsent);
     }
 
     if (config.getConfig('coppa') === true) {
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'coppa', 1);
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'coppa', 1);
     }
 
     if (syncOptions.iframeEnabled) {
@@ -220,7 +172,7 @@ export const spec = {
         url: syncEndpoint
       }];
     } else {
-      utils.logWarn('Bidder ConnectAd: Please activate iFrame Sync');
+      logWarn('Bidder ConnectAd: Please activate iFrame Sync');
     }
   }
 };
@@ -277,6 +229,22 @@ sizeMap[331] = '320x250';
 sizeMap[3301] = '320x267';
 sizeMap[2730] = '728x250';
 
+function getBidFloor(bidRequest) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: 'USD',
+      mediaType: 'banner',
+      size: '*'
+    });
+  }
+
+  let floor = floorInfo.floor || bidRequest.params.bidfloor || bidRequest.params.floorprice || 0;
+
+  return floor;
+}
+
 function getSize(sizes) {
   const result = [];
   sizes.forEach(function(size) {
diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index 53e97006bd1..217ceecb1c4 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -4,25 +4,26 @@
  * and make it available for any GDPR supported adapters to read/pass this information to
  * their system.
  */
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { gdprDataHandler } from '../src/adapterManager.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import strIncludes from 'core-js-pure/features/string/includes.js';
+import {deepSetValue, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {gdprDataHandler} from '../src/adapterManager.js';
+import {includes} from '../src/polyfill.js';
+import {timedAuctionHook} from '../src/utils/perfMetrics.js';
+import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
+import {enrichFPD} from '../src/fpd/enrichment.js';
 
 const DEFAULT_CMP = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 10000;
-const DEFAULT_ALLOW_AUCTION_WO_CONSENT = true;
+const CMP_VERSION = 2;
 
 export let userCMP;
 export let consentTimeout;
-export let allowAuction;
 export let gdprScope;
 export let staticConsentData;
 
-let cmpVersion = 0;
 let consentData;
 let addedConsentHook = false;
+let provisionalConsent;
 
 // add new CMPs here, with their dedicated lookup function
 const cmpCallMap = {
@@ -32,37 +33,28 @@ const cmpCallMap = {
 
 /**
  * This function reads the consent string from the config to obtain the consent information of the user.
- * @param {function(string)} cmpSuccess acts as a success callback when the value is read from config; pass along consentObject (string) from CMP
- * @param {function(string)} cmpError acts as an error callback while interacting with the config string; pass along an error message (string)
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
+ * @param {function({})} onSuccess acts as a success callback when the value is read from config; pass along consentObject from CMP
  */
-function lookupStaticConsentData(cmpSuccess, cmpError, hookConfig) {
-  cmpSuccess(staticConsentData, hookConfig);
+function lookupStaticConsentData({onSuccess, onError}) {
+  processCmpData(staticConsentData, {onSuccess, onError})
 }
 
 /**
  * This function handles interacting with an IAB compliant CMP to obtain the consent information of the user.
  * Given the async nature of the CMP's API, we pass in acting success/error callback functions to exit this function
  * based on the appropriate result.
- * @param {function(string)} cmpSuccess acts as a success callback when CMP returns a value; pass along consentObject (string) from CMP
- * @param {function(string)} cmpError acts as an error callback while interacting with CMP; pass along an error message (string)
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
+ * @param {function({})} onSuccess acts as a success callback when CMP returns a value; pass along consentObjectfrom CMP
+ * @param {function(string, ...{}?)} cmpError acts as an error callback while interacting with CMP; pass along an error message (string) and any extra error arguments (purely for logging)
  */
-function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
+function lookupIabConsent({onSuccess, onError}) {
   function findCMP() {
     let f = window;
     let cmpFrame;
     let cmpFunction;
-    while (!cmpFrame) {
+    while (true) {
       try {
-        if (typeof f.__tcfapi === 'function' || typeof f.__cmp === 'function') {
-          if (typeof f.__tcfapi === 'function') {
-            cmpVersion = 2;
-            cmpFunction = f.__tcfapi;
-          } else {
-            cmpVersion = 1;
-            cmpFunction = f.__cmp;
-          }
+        if (typeof f.__tcfapi === 'function') {
+          cmpFunction = f.__tcfapi;
           cmpFrame = f;
           break;
         }
@@ -71,15 +63,6 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
       // need separate try/catch blocks due to the exception errors thrown when trying to check for a frame that doesn't exist in 3rd party env
       try {
         if (f.frames['__tcfapiLocator']) {
-          cmpVersion = 2;
-          cmpFrame = f;
-          break;
-        }
-      } catch (e) { }
-
-      try {
-        if (f.frames['__cmpLocator']) {
-          cmpVersion = 1;
           cmpFrame = f;
           break;
         }
@@ -94,47 +77,24 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
     };
   }
 
-  function v2CmpResponseCallback(tcfData, success) {
-    utils.logInfo('Received a response from CMP', tcfData);
+  function cmpResponseCallback(tcfData, success) {
+    logInfo('Received a response from CMP', tcfData);
     if (success) {
-      if (tcfData.eventStatus === 'tcloaded' || tcfData.eventStatus === 'useractioncomplete') {
-        cmpSuccess(tcfData, hookConfig);
-      } else if (tcfData.eventStatus === 'cmpuishown' && tcfData.tcString && tcfData.purposeOneTreatment === true) {
-        cmpSuccess(tcfData, hookConfig);
+      if (tcfData.gdprApplies === false || tcfData.eventStatus === 'tcloaded' || tcfData.eventStatus === 'useractioncomplete') {
+        processCmpData(tcfData, {onSuccess, onError});
+      } else {
+        provisionalConsent = tcfData;
       }
     } else {
-      cmpError('CMP unable to register callback function.  Please check CMP setup.', hookConfig);
+      onError('CMP unable to register callback function.  Please check CMP setup.');
     }
   }
 
-  function handleV1CmpResponseCallbacks() {
-    const cmpResponse = {};
-
-    function afterEach() {
-      if (cmpResponse.getConsentData && cmpResponse.getVendorConsents) {
-        utils.logInfo('Received all requested responses from CMP', cmpResponse);
-        cmpSuccess(cmpResponse, hookConfig);
-      }
-    }
-
-    return {
-      consentDataCallback: function (consentResponse) {
-        cmpResponse.getConsentData = consentResponse;
-        afterEach();
-      },
-      vendorConsentsCallback: function (consentResponse) {
-        cmpResponse.getVendorConsents = consentResponse;
-        afterEach();
-      }
-    }
-  }
-
-  let v1CallbackHandler = handleV1CmpResponseCallbacks();
-  let cmpCallbacks = {};
-  let { cmpFrame, cmpFunction } = findCMP();
+  const cmpCallbacks = {};
+  const { cmpFrame, cmpFunction } = findCMP();
 
   if (!cmpFrame) {
-    return cmpError('CMP not found.', hookConfig);
+    return onError('TCF2 CMP not found.');
   }
   // to collect the consent information from the user, we perform two calls to the CMP in parallel:
   // first to collect the user's consent choices represented in an encoded string (via getConsentData)
@@ -146,71 +106,31 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
   // else assume prebid may be inside an iframe and use the IAB CMP locator code to see if CMP's located in a higher parent window. this works in cross domain iframes
   // if the CMP is not found, the iframe function will call the cmpError exit callback to abort the rest of the CMP workflow
 
-  if (utils.isFn(cmpFunction)) {
-    utils.logInfo('Detected CMP API is directly accessible, calling it now...');
-    if (cmpVersion === 1) {
-      cmpFunction('getConsentData', null, v1CallbackHandler.consentDataCallback);
-      cmpFunction('getVendorConsents', null, v1CallbackHandler.vendorConsentsCallback);
-    } else if (cmpVersion === 2) {
-      cmpFunction('addEventListener', cmpVersion, v2CmpResponseCallback);
-    }
-  } else if (cmpVersion === 1 && inASafeFrame() && typeof window.$sf.ext.cmp === 'function') {
-    // this safeframe workflow is only supported with TCF v1 spec; the v2 recommends to use the iframe postMessage route instead (even if you are in a safeframe).
-    utils.logInfo('Detected Prebid.js is encased in a SafeFrame and CMP is registered, calling it now...');
-    callCmpWhileInSafeFrame('getConsentData', v1CallbackHandler.consentDataCallback);
-    callCmpWhileInSafeFrame('getVendorConsents', v1CallbackHandler.vendorConsentsCallback);
+  if (typeof cmpFunction === 'function') {
+    logInfo('Detected CMP API is directly accessible, calling it now...');
+    cmpFunction('addEventListener', CMP_VERSION, cmpResponseCallback);
   } else {
-    utils.logInfo('Detected CMP is outside the current iframe where Prebid.js is located, calling it now...');
-    if (cmpVersion === 1) {
-      callCmpWhileInIframe('getConsentData', cmpFrame, v1CallbackHandler.consentDataCallback);
-      callCmpWhileInIframe('getVendorConsents', cmpFrame, v1CallbackHandler.vendorConsentsCallback);
-    } else if (cmpVersion === 2) {
-      callCmpWhileInIframe('addEventListener', cmpFrame, v2CmpResponseCallback);
-    }
-  }
-
-  function inASafeFrame() {
-    return !!(window.$sf && window.$sf.ext);
-  }
-
-  function callCmpWhileInSafeFrame(commandName, callback) {
-    function sfCallback(msgName, data) {
-      if (msgName === 'cmpReturn') {
-        let responseObj = (commandName === 'getConsentData') ? data.vendorConsentData : data.vendorConsents;
-        callback(responseObj);
-      }
-    }
-
-    // find sizes from adUnits object
-    let adUnits = hookConfig.adUnits;
-    let width = 1;
-    let height = 1;
-    if (Array.isArray(adUnits) && adUnits.length > 0) {
-      let sizes = utils.getAdUnitSizes(adUnits[0]);
-      width = sizes[0][0];
-      height = sizes[0][1];
-    }
-
-    window.$sf.ext.register(width, height, sfCallback);
-    window.$sf.ext.cmp(commandName);
+    logInfo('Detected CMP is outside the current iframe where Prebid.js is located, calling it now...');
+    callCmpWhileInIframe('addEventListener', cmpFrame, cmpResponseCallback);
   }
 
   function callCmpWhileInIframe(commandName, cmpFrame, moduleCallback) {
-    let apiName = (cmpVersion === 2) ? '__tcfapi' : '__cmp';
+    const apiName = '__tcfapi';
+
+    const callName = `${apiName}Call`;
 
     /* Setup up a __cmp function to do the postMessage and stash the callback.
-      This function behaves (from the caller's perspective identicially to the in-frame __cmp call */
-    window[apiName] = function (cmd, arg, callback) {
-      let callId = Math.random() + '';
-      let callName = `${apiName}Call`;
-      let msg = {
+    This function behaves (from the caller's perspective identicially to the in-frame __cmp call */
+    window[apiName] = function (cmd, cmpVersion, callback, arg) {
+      const callId = Math.random() + '';
+      const msg = {
         [callName]: {
           command: cmd,
+          version: cmpVersion,
           parameter: arg,
           callId: callId
         }
       };
-      if (cmpVersion !== 1) msg[callName].version = cmpVersion;
 
       cmpCallbacks[callId] = callback;
       cmpFrame.postMessage(msg, '*');
@@ -220,15 +140,15 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
     window.addEventListener('message', readPostMessageResponse, false);
 
     // call CMP
-    window[apiName](commandName, null, moduleCallback);
+    window[apiName](commandName, CMP_VERSION, moduleCallback);
 
     function readPostMessageResponse(event) {
-      let cmpDataPkgName = `${apiName}Return`;
-      let json = (typeof event.data === 'string' && strIncludes(event.data, cmpDataPkgName)) ? JSON.parse(event.data) : event.data;
+      const cmpDataPkgName = `${apiName}Return`;
+      const json = (typeof event.data === 'string' && includes(event.data, cmpDataPkgName)) ? JSON.parse(event.data) : event.data;
       if (json[cmpDataPkgName] && json[cmpDataPkgName].callId) {
-        let payload = json[cmpDataPkgName];
+        const payload = json[cmpDataPkgName];
         // TODO - clean up this logic (move listeners?); we have duplicate messages responses because 2 eventlisteners are active from the 2 cmp requests running in parallel
-        if (typeof cmpCallbacks[payload.callId] !== 'undefined') {
+        if (cmpCallbacks.hasOwnProperty(payload.callId)) {
           cmpCallbacks[payload.callId](payload.returnValue, payload.success);
         }
       }
@@ -237,190 +157,146 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
 }
 
 /**
- * If consentManagement module is enabled (ie included in setConfig), this hook function will attempt to fetch the
- * user's encoded consent string from the supported CMP.  Once obtained, the module will store this
- * data as part of a gdprConsent object which gets transferred to adapterManager's gdprDataHandler object.
- * This information is later added into the bidRequest object for any supported adapters to read/pass along to their system.
- * @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
+ * Look up consent data and store it in the `consentData` global as well as `adapterManager.js`' gdprDataHandler.
+ *
+ * @param cb A callback that takes: a boolean that is true if the auction should be canceled; an error message and extra
+ * error arguments that will be undefined if there's no error.
  */
-export function requestBidsHook(fn, reqBidsConfigObj) {
-  // preserves all module related variables for the current auction instance (used primiarily for concurrent auctions)
-  const hookConfig = {
-    context: this,
-    args: [reqBidsConfigObj],
-    nextFn: fn,
-    adUnits: reqBidsConfigObj.adUnits || $$PREBID_GLOBAL$$.adUnits,
-    bidsBackHandler: reqBidsConfigObj.bidsBackHandler,
-    haveExited: false,
-    timer: null
-  };
+function loadConsentData(cb) {
+  let isDone = false;
+  let timer = null;
 
-  // in case we already have consent (eg during bid refresh)
-  if (consentData) {
-    utils.logInfo('User consent information already known.  Pulling internally stored information...');
-    return exitModule(null, hookConfig);
+  function done(consentData, shouldCancelAuction, errMsg, ...extraArgs) {
+    if (timer != null) {
+      clearTimeout(timer);
+    }
+    isDone = true;
+    gdprDataHandler.setConsentData(consentData);
+    if (typeof cb === 'function') {
+      cb(shouldCancelAuction, errMsg, ...extraArgs);
+    }
   }
 
   if (!includes(Object.keys(cmpCallMap), userCMP)) {
-    utils.logWarn(`CMP framework (${userCMP}) is not a supported framework.  Aborting consentManagement module and resuming auction.`);
-    return hookConfig.nextFn.apply(hookConfig.context, hookConfig.args);
+    done(null, false, `CMP framework (${userCMP}) is not a supported framework.  Aborting consentManagement module and resuming auction.`);
+    return;
   }
 
-  cmpCallMap[userCMP].call(this, processCmpData, cmpFailed, hookConfig);
+  const callbacks = {
+    onSuccess: (data) => done(data, false),
+    onError: function (msg, ...extraArgs) {
+      done(null, true, msg, ...extraArgs);
+    }
+  }
+  cmpCallMap[userCMP](callbacks);
 
-  // only let this code run if module is still active (ie if the callbacks used by CMPs haven't already finished)
-  if (!hookConfig.haveExited) {
+  if (!isDone) {
+    const onTimeout = () => {
+      const continueToAuction = (data) => {
+        done(data, false, 'CMP did not load, continuing auction...');
+      }
+      processCmpData(provisionalConsent, {
+        onSuccess: continueToAuction,
+        onError: () => continueToAuction(storeConsentData(undefined))
+      })
+    }
     if (consentTimeout === 0) {
-      processCmpData(undefined, hookConfig);
+      onTimeout();
     } else {
-      hookConfig.timer = setTimeout(cmpTimedOut.bind(null, hookConfig), consentTimeout);
+      timer = setTimeout(onTimeout, consentTimeout);
     }
   }
 }
 
 /**
- * This function checks the consent data provided by CMP to ensure it's in an expected state.
- * If it's bad, we exit the module depending on config settings.
- * If it's good, then we store the value and exits the module.
- * @param {object} consentObject required; object returned by CMP that contains user's consent choices
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
+ * Like `loadConsentData`, but cache and re-use previously loaded data.
+ * @param cb
  */
-function processCmpData(consentObject, hookConfig) {
-  function checkV1Data(consentObject) {
-    let gdprApplies = consentObject && consentObject.getConsentData && consentObject.getConsentData.gdprApplies;
-    return !!(
-      (typeof gdprApplies !== 'boolean') ||
-      (gdprApplies === true &&
-        !(utils.isStr(consentObject.getConsentData.consentData) &&
-          utils.isPlainObject(consentObject.getVendorConsents) &&
-          Object.keys(consentObject.getVendorConsents).length > 1
-        )
-      )
-    );
+function loadIfMissing(cb) {
+  if (consentData) {
+    logInfo('User consent information already known.  Pulling internally stored information...');
+    // eslint-disable-next-line standard/no-callback-literal
+    cb(false);
+  } else {
+    loadConsentData(cb);
   }
+}
+
+/**
+ * If consentManagement module is enabled (ie included in setConfig), this hook function will attempt to fetch the
+ * user's encoded consent string from the supported CMP.  Once obtained, the module will store this
+ * data as part of a gdprConsent object which gets transferred to adapterManager's gdprDataHandler object.
+ * This information is later added into the bidRequest object for any supported adapters to read/pass along to their system.
+ * @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 const requestBidsHook = timedAuctionHook('gdpr', function requestBidsHook(fn, reqBidsConfigObj) {
+  loadIfMissing(function (shouldCancelAuction, errMsg, ...extraArgs) {
+    if (errMsg) {
+      let log = logWarn;
+      if (shouldCancelAuction) {
+        log = logError;
+        errMsg = `${errMsg} Canceling auction as per consentManagement config.`;
+      }
+      log(errMsg, ...extraArgs);
+    }
 
-  function checkV2Data() {
+    if (shouldCancelAuction) {
+      fn.stopTiming();
+      if (typeof reqBidsConfigObj.bidsBackHandler === 'function') {
+        reqBidsConfigObj.bidsBackHandler();
+      } else {
+        logError('Error executing bidsBackHandler');
+      }
+    } else {
+      fn.call(this, reqBidsConfigObj);
+    }
+  });
+});
+
+/**
+ * This function checks the consent data provided by CMP to ensure it's in an expected state.
+ * If it's bad, we call `onError`
+ * If it's good, then we store the value and call `onSuccess`
+ */
+function processCmpData(consentObject, {onSuccess, onError}) {
+  function checkData() {
     // if CMP does not respond with a gdprApplies boolean, use defaultGdprScope (gdprScope)
-    let gdprApplies = consentObject && typeof consentObject.gdprApplies === 'boolean' ? consentObject.gdprApplies : gdprScope;
-    let tcString = consentObject && consentObject.tcString;
+    const gdprApplies = consentObject && typeof consentObject.gdprApplies === 'boolean' ? consentObject.gdprApplies : gdprScope;
+    const tcString = consentObject && consentObject.tcString;
     return !!(
       (typeof gdprApplies !== 'boolean') ||
-      (gdprApplies === true && !utils.isStr(tcString))
+      (gdprApplies === true && (!tcString || !isStr(tcString)))
     );
   }
 
   // do extra things for static config
   if (userCMP === 'static') {
-    cmpVersion = (consentObject.getConsentData) ? 1 : (consentObject.getTCData) ? 2 : 0;
-    // remove extra layer in static v2 data object so it matches normal v2 CMP object for processing step
-    if (cmpVersion === 2) {
-      consentObject = consentObject.getTCData;
-    }
+    consentObject = consentObject.getTCData;
   }
 
-  // determine which set of checks to run based on cmpVersion
-  let checkFn = (cmpVersion === 1) ? checkV1Data : (cmpVersion === 2) ? checkV2Data : null;
-
-  if (utils.isFn(checkFn)) {
-    if (checkFn(consentObject)) {
-      cmpFailed(`CMP returned unexpected value during lookup process.`, hookConfig, consentObject);
-    } else {
-      clearTimeout(hookConfig.timer);
-      storeConsentData(consentObject);
-      exitModule(null, hookConfig);
-    }
+  if (checkData()) {
+    onError(`CMP returned unexpected value during lookup process.`, consentObject);
   } else {
-    cmpFailed('Unable to derive CMP version to process data.  Consent object does not conform to TCF v1 or v2 specs.', hookConfig, consentObject);
-  }
-}
-
-/**
- * General timeout callback when interacting with CMP takes too long.
- */
-function cmpTimedOut(hookConfig) {
-  cmpFailed('CMP workflow exceeded timeout threshold.', hookConfig);
-}
-
-/**
- * This function contains the controlled steps to perform when there's a problem with CMP.
- * @param {string} errMsg required; should be a short descriptive message for why the failure/issue happened.
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
- * @param {object} extraArgs contains additional data that's passed along in the error/warning messages for easier debugging
-*/
-function cmpFailed(errMsg, hookConfig, extraArgs) {
-  clearTimeout(hookConfig.timer);
-
-  // still set the consentData to undefined when there is a problem as per config options
-  if (allowAuction) {
-    storeConsentData(undefined);
+    onSuccess(storeConsentData(consentObject));
   }
-  exitModule(errMsg, hookConfig, extraArgs);
 }
 
 /**
- * Stores CMP data locally in module and then invokes gdprDataHandler.setConsentData() to make information available in adaptermanger.js for later in the auction
+ * Stores CMP data locally in module to make information available in adaptermanager.js for later in the auction
  * @param {object} cmpConsentObject required; an object representing user's consent choices (can be undefined in certain use-cases for this function only)
  */
 function storeConsentData(cmpConsentObject) {
-  if (cmpVersion === 1) {
-    consentData = {
-      consentString: (cmpConsentObject) ? cmpConsentObject.getConsentData.consentData : undefined,
-      vendorData: (cmpConsentObject) ? cmpConsentObject.getVendorConsents : undefined,
-      gdprApplies: (cmpConsentObject) ? cmpConsentObject.getConsentData.gdprApplies : gdprScope
-    };
-  } else {
-    consentData = {
-      consentString: (cmpConsentObject) ? cmpConsentObject.tcString : undefined,
-      vendorData: (cmpConsentObject) || undefined,
-      gdprApplies: cmpConsentObject && typeof cmpConsentObject.gdprApplies === 'boolean' ? cmpConsentObject.gdprApplies : gdprScope
-    };
-  }
-  consentData.apiVersion = cmpVersion;
-  gdprDataHandler.setConsentData(consentData);
-}
-
-/**
- * This function handles the exit logic for the module.
- * While there are several paths in the module's logic to call this function, we only allow 1 of the 3 potential exits to happen before suppressing others.
- *
- * We prevent multiple exits to avoid conflicting messages in the console depending on certain scenarios.
- * One scenario could be auction was canceled due to timeout with CMP being reached.
- * While the timeout is the accepted exit and runs first, the CMP's callback still tries to process the user's data (which normally leads to a good exit).
- * In this case, the good exit will be suppressed since we already decided to cancel the auction.
- *
- * Three exit paths are:
- * 1. good exit where auction runs (CMP data is processed normally).
- * 2. bad exit but auction still continues (warning message is logged, CMP data is undefined and still passed along).
- * 3. bad exit with auction canceled (error message is logged).
- * @param {string} errMsg optional; only to be used when there was a 'bad' exit.  String is a descriptive message for the failure/issue encountered.
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
- * @param {object} extraArgs contains additional data that's passed along in the error/warning messages for easier debugging
- */
-function exitModule(errMsg, hookConfig, extraArgs) {
-  if (hookConfig.haveExited === false) {
-    hookConfig.haveExited = true;
-
-    let context = hookConfig.context;
-    let args = hookConfig.args;
-    let nextFn = hookConfig.nextFn;
-
-    if (errMsg) {
-      if (allowAuction) {
-        utils.logWarn(errMsg + ' Resuming auction without consent data as per consentManagement config.', extraArgs);
-        nextFn.apply(context, args);
-      } else {
-        utils.logError(errMsg + ' Canceling auction as per consentManagement config.', extraArgs);
-        if (typeof hookConfig.bidsBackHandler === 'function') {
-          hookConfig.bidsBackHandler();
-        } else {
-          utils.logError('Error executing bidsBackHandler');
-        }
-      }
-    } else {
-      nextFn.apply(context, args);
-    }
+  consentData = {
+    consentString: (cmpConsentObject) ? cmpConsentObject.tcString : undefined,
+    vendorData: (cmpConsentObject) || undefined,
+    gdprApplies: cmpConsentObject && typeof cmpConsentObject.gdprApplies === 'boolean' ? cmpConsentObject.gdprApplies : gdprScope
+  };
+  if (cmpConsentObject && cmpConsentObject.addtlConsent && isStr(cmpConsentObject.addtlConsent)) {
+    consentData.addtlConsent = cmpConsentObject.addtlConsent;
   }
+  consentData.apiVersion = CMP_VERSION;
+  return consentData;
 }
 
 /**
@@ -429,8 +305,8 @@ function exitModule(errMsg, hookConfig, extraArgs) {
 export function resetConsentData() {
   consentData = undefined;
   userCMP = undefined;
-  cmpVersion = 0;
-  gdprDataHandler.setConsentData(null);
+  consentTimeout = undefined;
+  gdprDataHandler.reset();
 }
 
 /**
@@ -438,50 +314,70 @@ export function resetConsentData() {
  * @param {{cmp:string, timeout:number, allowAuctionWithoutConsent:boolean, defaultGdprScope:boolean}} config required; consentManagement module config settings; cmp (string), timeout (int), allowAuctionWithoutConsent (boolean)
  */
 export function setConsentConfig(config) {
-  // if `config.gdpr` or `config.usp` exist, assume new config format.
+  // if `config.gdpr`, `config.usp` or `config.gpp` exist, assume new config format.
   // else for backward compatability, just use `config`
-  config = config.gdpr || config.usp ? config.gdpr : config;
+  config = config && (config.gdpr || config.usp || config.gpp ? config.gdpr : config);
   if (!config || typeof config !== 'object') {
-    utils.logWarn('consentManagement config not defined, exiting consent manager');
+    logWarn('consentManagement (gdpr) config not defined, exiting consent manager');
     return;
   }
-  if (utils.isStr(config.cmpApi)) {
+  if (isStr(config.cmpApi)) {
     userCMP = config.cmpApi;
   } else {
     userCMP = DEFAULT_CMP;
-    utils.logInfo(`consentManagement config did not specify cmp.  Using system default setting (${DEFAULT_CMP}).`);
+    logInfo(`consentManagement config did not specify cmp.  Using system default setting (${DEFAULT_CMP}).`);
   }
 
-  if (utils.isNumber(config.timeout)) {
+  if (isNumber(config.timeout)) {
     consentTimeout = config.timeout;
   } else {
     consentTimeout = DEFAULT_CONSENT_TIMEOUT;
-    utils.logInfo(`consentManagement config did not specify timeout.  Using system default setting (${DEFAULT_CONSENT_TIMEOUT}).`);
-  }
-
-  if (typeof config.allowAuctionWithoutConsent === 'boolean') {
-    allowAuction = config.allowAuctionWithoutConsent;
-  } else {
-    allowAuction = DEFAULT_ALLOW_AUCTION_WO_CONSENT;
-    utils.logInfo(`consentManagement config did not specify allowAuctionWithoutConsent.  Using system default setting (${DEFAULT_ALLOW_AUCTION_WO_CONSENT}).`);
+    logInfo(`consentManagement config did not specify timeout.  Using system default setting (${DEFAULT_CONSENT_TIMEOUT}).`);
   }
 
   // if true, then gdprApplies should be set to true
   gdprScope = config.defaultGdprScope === true;
 
-  utils.logInfo('consentManagement module has been activated...');
+  logInfo('consentManagement module has been activated...');
 
   if (userCMP === 'static') {
-    if (utils.isPlainObject(config.consentData)) {
+    if (isPlainObject(config.consentData)) {
       staticConsentData = config.consentData;
       consentTimeout = 0;
     } else {
-      utils.logError(`consentManagement config with cmpApi: 'static' did not specify consentData. No consents will be available to adapters.`);
+      logError(`consentManagement config with cmpApi: 'static' did not specify consentData. No consents will be available to adapters.`);
     }
   }
   if (!addedConsentHook) {
     $$PREBID_GLOBAL$$.requestBids.before(requestBidsHook, 50);
   }
   addedConsentHook = true;
+  gdprDataHandler.enable();
+  loadConsentData(); // immediately look up consent data to make it available without requiring an auction
 }
 config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
+
+export function enrichFPDHook(next, fpd) {
+  return next(fpd.then(ortb2 => {
+    const consent = gdprDataHandler.getConsentData();
+    if (consent) {
+      if (typeof consent.gdprApplies === 'boolean') {
+        deepSetValue(ortb2, 'regs.ext.gdpr', consent.gdprApplies ? 1 : 0);
+      }
+      deepSetValue(ortb2, 'user.ext.consent', consent.consentString);
+    }
+    return ortb2;
+  }));
+}
+
+enrichFPD.before(enrichFPDHook);
+
+export function setOrtbAdditionalConsent(ortbRequest, bidderRequest) {
+  // this is not a standardized name for addtlConsent, so keep this as an ORTB library processor rather than an FPD enrichment
+  const addtl = bidderRequest.gdprConsent?.addtlConsent;
+  if (addtl && typeof addtl === 'string') {
+    deepSetValue(ortbRequest, 'user.ext.ConsentedProvidersSettings.consented_providers', addtl);
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'gdprAddtlConsent', fn: setOrtbAdditionalConsent})
diff --git a/modules/consentManagementGpp.js b/modules/consentManagementGpp.js
new file mode 100644
index 00000000000..8a9c3f999f0
--- /dev/null
+++ b/modules/consentManagementGpp.js
@@ -0,0 +1,386 @@
+/**
+ * This module adds GPP consentManagement support to prebid.js.  It interacts with
+ * supported CMPs (Consent Management Platforms) to grab the user's consent information
+ * and make it available for any GPP supported adapters to read/pass this information to
+ * their system and for various other features/modules in Prebid.js.
+ */
+import {deepSetValue, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {gppDataHandler} from '../src/adapterManager.js';
+import {includes} from '../src/polyfill.js';
+import {timedAuctionHook} from '../src/utils/perfMetrics.js';
+import { enrichFPD } from '../src/fpd/enrichment.js';
+
+const DEFAULT_CMP = 'iab';
+const DEFAULT_CONSENT_TIMEOUT = 10000;
+const CMP_VERSION = 1;
+
+export let userCMP;
+export let consentTimeout;
+export let staticConsentData;
+
+let consentData;
+let addedConsentHook = false;
+
+// add new CMPs here, with their dedicated lookup function
+const cmpCallMap = {
+  'iab': lookupIabConsent,
+  'static': lookupStaticConsentData
+};
+
+/**
+ * This function checks the state of the IAB gppData's applicableSection field (to ensure it's populated and has a valid value).
+ * section === 0 represents a CMP's default value when CMP is loading, it shoud not be used a real user's section.
+ *
+ * TODO --- The initial version of the GPP CMP API spec used this naming convention, but it was later changed as an update to the spec.
+ * CMPs should adjust their logic to use the new format (applicableSecctions), but that may not be the case with the initial release.
+ * Added support just in case for this transition period, can likely be removed at a later date...
+ * @param gppData represents the IAB gppData object
+ * @returns true|false
+ */
+function checkApplicableSectionIsReady(gppData) {
+  return gppData && Array.isArray(gppData.applicableSection) && gppData.applicableSection.length > 0 && gppData.applicableSection[0] !== 0;
+}
+
+/**
+ * This function checks the state of the IAB gppData's applicableSections field (to ensure it's populated and has a valid value).
+ * section === 0 represents a CMP's default value when CMP is loading, it shoud not be used a real user's section.
+ * @param gppData represents the IAB gppData object
+ * @returns true|false
+ */
+function checkApplicableSectionsIsReady(gppData) {
+  return gppData && Array.isArray(gppData.applicableSections) && gppData.applicableSections.length > 0 && gppData.applicableSections[0] !== 0;
+}
+
+/**
+ * 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, onError}) {
+  processCmpData(staticConsentData, {onSuccess, onError});
+}
+
+/**
+ * This function handles interacting with an IAB compliant CMP to obtain the consent information of the user.
+ * Given the async nature of the CMP's API, we pass in acting success/error callback functions to exit this function
+ * based on the appropriate result.
+ * @param {function({})} onSuccess acts as a success callback when CMP returns a value; pass along consentObjectfrom CMP
+ * @param {function(string, ...{}?)} cmpError acts as an error callback while interacting with CMP; pass along an error message (string) and any extra error arguments (purely for logging)
+ */
+function lookupIabConsent({onSuccess, onError}) {
+  const cmpApiName = '__gpp';
+  const cmpCallbacks = {};
+  let registeredPostMessageResponseListener = false;
+
+  function findCMP() {
+    let f = window;
+    let cmpFrame;
+    let cmpDirectAccess = false;
+    while (true) {
+      try {
+        if (typeof f[cmpApiName] === 'function') {
+          cmpFrame = f;
+          cmpDirectAccess = true;
+          break;
+        }
+      } catch (e) {}
+
+      // need separate try/catch blocks due to the exception errors thrown when trying to check for a frame that doesn't exist in 3rd party env
+      try {
+        if (f.frames['__gppLocator']) {
+          cmpFrame = f;
+          break;
+        }
+      } catch (e) {}
+
+      if (f === window.top) break;
+      f = f.parent;
+    }
+
+    return {
+      cmpFrame,
+      cmpDirectAccess
+    };
+  }
+
+  const {cmpFrame, cmpDirectAccess} = findCMP();
+
+  if (!cmpFrame) {
+    return onError('GPP CMP not found.');
+  }
+
+  const invokeCMP = (cmpDirectAccess) ? invokeCMPDirect : invokeCMPFrame;
+
+  function invokeCMPDirect({command, callback, parameter, version = CMP_VERSION}, resultCb) {
+    if (typeof resultCb === 'function') {
+      resultCb(cmpFrame[cmpApiName](command, callback, parameter, version));
+    } else {
+      cmpFrame[cmpApiName](command, callback, parameter, version);
+    }
+  }
+
+  function invokeCMPFrame({command, callback, parameter, version = CMP_VERSION}, resultCb) {
+    const callName = `${cmpApiName}Call`;
+    if (!registeredPostMessageResponseListener) {
+      // when we get the return message, call the stashed callback;
+      window.addEventListener('message', readPostMessageResponse, false);
+      registeredPostMessageResponseListener = true;
+    }
+
+    // call CMP via postMessage
+    const callId = Math.random().toString();
+    const msg = {
+      [callName]: {
+        command: command,
+        parameter,
+        version,
+        callId: callId
+      }
+    };
+
+    // TODO? - add logic to check if random was already used in the same session, and roll another if so?
+    cmpCallbacks[callId] = (typeof callback === 'function') ? callback : resultCb;
+    cmpFrame.postMessage(msg, '*');
+
+    function readPostMessageResponse(event) {
+      const cmpDataPkgName = `${cmpApiName}Return`;
+      const json = (typeof event.data === 'string' && event.data.includes(cmpDataPkgName)) ? JSON.parse(event.data) : event.data;
+      if (json[cmpDataPkgName] && json[cmpDataPkgName].callId) {
+        const payload = json[cmpDataPkgName];
+
+        if (cmpCallbacks.hasOwnProperty(payload.callId)) {
+          cmpCallbacks[payload.callId](payload.returnValue);
+        }
+      }
+    }
+  }
+
+  const startupMsg = (cmpDirectAccess) ? 'Detected GPP CMP API is directly accessible, calling it now...'
+    : 'Detected GPP CMP is outside the current iframe where Prebid.js is located, calling it now...';
+  logInfo(startupMsg);
+
+  invokeCMP({
+    command: 'addEventListener',
+    callback: function (evt) {
+      if (evt) {
+        logInfo(`Received a ${(cmpDirectAccess ? 'direct' : 'postmsg')} response from GPP CMP for event`, evt);
+        if (evt.eventName === 'sectionChange' || evt.pingData.cmpStatus === 'loaded') {
+          invokeCMP({command: 'getGPPData'}, function (gppData) {
+            logInfo(`Received a ${cmpDirectAccess ? 'direct' : 'postmsg'} response from GPP CMP for getGPPData`, gppData);
+            processCmpData(gppData, {onSuccess, onError});
+          });
+        } else if (evt.pingData.cmpStatus === 'error') {
+          onError('CMP returned with a cmpStatus:error response.  Please check CMP setup.');
+        }
+      }
+    }
+  });
+}
+
+/**
+ * Look up consent data and store it in the `consentData` global as well as `adapterManager.js`' gdprDataHandler.
+ *
+ * @param cb A callback that takes: a boolean that is true if the auction should be canceled; an error message and extra
+ * error arguments that will be undefined if there's no error.
+ */
+function loadConsentData(cb) {
+  let isDone = false;
+  let timer = null;
+
+  function done(consentData, shouldCancelAuction, errMsg, ...extraArgs) {
+    if (timer != null) {
+      clearTimeout(timer);
+    }
+    isDone = true;
+    gppDataHandler.setConsentData(consentData);
+    if (typeof cb === 'function') {
+      cb(shouldCancelAuction, errMsg, ...extraArgs);
+    }
+  }
+
+  if (!includes(Object.keys(cmpCallMap), userCMP)) {
+    done(null, false, `GPP CMP framework (${userCMP}) is not a supported framework.  Aborting consentManagement module and resuming auction.`);
+    return;
+  }
+
+  const callbacks = {
+    onSuccess: (data) => done(data, false),
+    onError: function (msg, ...extraArgs) {
+      done(null, true, msg, ...extraArgs);
+    }
+  }
+  cmpCallMap[userCMP](callbacks);
+
+  if (!isDone) {
+    const onTimeout = () => {
+      const continueToAuction = (data) => {
+        done(data, false, 'GPP CMP did not load, continuing auction...');
+      }
+      processCmpData(consentData, {
+        onSuccess: continueToAuction,
+        onError: () => continueToAuction(storeConsentData(undefined))
+      })
+    }
+    if (consentTimeout === 0) {
+      onTimeout();
+    } else {
+      timer = setTimeout(onTimeout, consentTimeout);
+    }
+  }
+}
+
+/**
+ * Like `loadConsentData`, but cache and re-use previously loaded data.
+ * @param cb
+ */
+function loadIfMissing(cb) {
+  if (consentData) {
+    logInfo('User consent information already known.  Pulling internally stored information...');
+    // eslint-disable-next-line standard/no-callback-literal
+    cb(false);
+  } else {
+    loadConsentData(cb);
+  }
+}
+
+/**
+ * If consentManagement module is enabled (ie included in setConfig), this hook function will attempt to fetch the
+ * user's encoded consent string from the supported CMP.  Once obtained, the module will store this
+ * data as part of a gppConsent object which gets transferred to adapterManager's gppDataHandler object.
+ * This information is later added into the bidRequest object for any supported adapters to read/pass along to their system.
+ * @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 const requestBidsHook = timedAuctionHook('gpp', function requestBidsHook(fn, reqBidsConfigObj) {
+  loadIfMissing(function (shouldCancelAuction, errMsg, ...extraArgs) {
+    if (errMsg) {
+      let log = logWarn;
+      if (shouldCancelAuction) {
+        log = logError;
+        errMsg = `${errMsg} Canceling auction as per consentManagement config.`;
+      }
+      log(errMsg, ...extraArgs);
+    }
+
+    if (shouldCancelAuction) {
+      fn.stopTiming();
+      if (typeof reqBidsConfigObj.bidsBackHandler === 'function') {
+        reqBidsConfigObj.bidsBackHandler();
+      } else {
+        logError('Error executing bidsBackHandler');
+      }
+    } else {
+      fn.call(this, reqBidsConfigObj);
+    }
+  });
+});
+
+/**
+ * This function checks the consent data provided by CMP to ensure it's in an expected state.
+ * If it's bad, we call `onError`
+ * If it's good, then we store the value and call `onSuccess`
+ */
+function processCmpData(consentObject, {onSuccess, onError}) {
+  function checkData() {
+    const gppString = consentObject && consentObject.gppString;
+    const gppSection = (checkApplicableSectionsIsReady(consentObject)) ? consentObject.applicableSections
+      : (checkApplicableSectionIsReady(consentObject)) ? consentObject.applicableSection : [];
+
+    return !!(
+      (!Array.isArray(gppSection)) ||
+      (Array.isArray(gppSection) && (!gppString || !isStr(gppString)))
+    );
+  }
+
+  if (checkData()) {
+    onError(`CMP returned unexpected value during lookup process.`, consentObject);
+  } else {
+    onSuccess(storeConsentData(consentObject));
+  }
+}
+
+/**
+ * Stores CMP data locally in module to make information available in adaptermanager.js for later in the auction
+ * @param {object} cmpConsentObject required; an object representing user's consent choices (can be undefined in certain use-cases for this function only)
+ */
+function storeConsentData(cmpConsentObject) {
+  consentData = {
+    gppString: (cmpConsentObject) ? cmpConsentObject.gppString : undefined,
+
+    fullGppData: (cmpConsentObject) || undefined,
+  };
+  consentData.applicableSections = (checkApplicableSectionsIsReady(cmpConsentObject)) ? cmpConsentObject.applicableSections
+    : (checkApplicableSectionIsReady(cmpConsentObject)) ? cmpConsentObject.applicableSection : [];
+  consentData.apiVersion = CMP_VERSION;
+  return consentData;
+}
+
+/**
+ * Simply resets the module's consentData variable back to undefined, mainly for testing purposes
+ */
+export function resetConsentData() {
+  consentData = undefined;
+  userCMP = undefined;
+  consentTimeout = undefined;
+  gppDataHandler.reset();
+}
+
+/**
+ * A configuration function that initializes some module variables, as well as add a hook into the requestBids function
+ * @param {{cmp:string, timeout:number, allowAuctionWithoutConsent:boolean, defaultGdprScope:boolean}} config required; consentManagement module config settings; cmp (string), timeout (int), allowAuctionWithoutConsent (boolean)
+ */
+export function setConsentConfig(config) {
+  config = config && config.gpp;
+  if (!config || typeof config !== 'object') {
+    logWarn('consentManagement.gpp config not defined, exiting consent manager module');
+    return;
+  }
+
+  if (isStr(config.cmpApi)) {
+    userCMP = config.cmpApi;
+  } else {
+    userCMP = DEFAULT_CMP;
+    logInfo(`consentManagement.gpp config did not specify cmp.  Using system default setting (${DEFAULT_CMP}).`);
+  }
+
+  if (isNumber(config.timeout)) {
+    consentTimeout = config.timeout;
+  } else {
+    consentTimeout = DEFAULT_CONSENT_TIMEOUT;
+    logInfo(`consentManagement.gpp config did not specify timeout.  Using system default setting (${DEFAULT_CONSENT_TIMEOUT}).`);
+  }
+
+  if (userCMP === 'static') {
+    if (isPlainObject(config.consentData)) {
+      staticConsentData = config.consentData;
+      consentTimeout = 0;
+    } else {
+      logError(`consentManagement.gpp config with cmpApi: 'static' did not specify consentData. No consents will be available to adapters.`);
+    }
+  }
+
+  logInfo('consentManagement.gpp module has been activated...');
+
+  if (!addedConsentHook) {
+    $$PREBID_GLOBAL$$.requestBids.before(requestBidsHook, 50);
+  }
+  addedConsentHook = true;
+  gppDataHandler.enable();
+  loadConsentData(); // immediately look up consent data to make it available without requiring an auction
+}
+config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
+
+export function enrichFPDHook(next, fpd) {
+  return next(fpd.then(ortb2 => {
+    const consent = gppDataHandler.getConsentData();
+    if (consent) {
+      if (Array.isArray(consent.applicableSections)) {
+        deepSetValue(ortb2, 'regs.gpp_sid', consent.applicableSections);
+      }
+      deepSetValue(ortb2, 'regs.gpp', consent.gppString);
+    }
+    return ortb2;
+  }));
+}
+
+enrichFPD.before(enrichFPDHook);
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 1a5879a40ff..0a99ec4a913 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -4,20 +4,23 @@
  * information and make it available for any USP (CCPA) supported adapters to
  * read/pass this information to their system.
  */
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { uspDataHandler } from '../src/adapterManager.js';
+import {deepSetValue, isFn, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
+import {config} from '../src/config.js';
+import adapterManager, {uspDataHandler} from '../src/adapterManager.js';
+import {timedAuctionHook} from '../src/utils/perfMetrics.js';
+import {getHook} from '../src/hook.js';
+import {enrichFPD} from '../src/fpd/enrichment.js';
 
 const DEFAULT_CONSENT_API = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 50;
 const USPAPI_VERSION = 1;
 
-export let consentAPI;
-export let consentTimeout;
+export let consentAPI = DEFAULT_CONSENT_API;
+export let consentTimeout = DEFAULT_CONSENT_TIMEOUT;
 export let staticConsentData;
 
 let consentData;
-let addedConsentHook = false;
+let enabled = false;
 
 // consent APIs
 const uspCallMap = {
@@ -27,31 +30,54 @@ const uspCallMap = {
 
 /**
  * This function reads the consent string from the config to obtain the consent information of the user.
- * @param {function(string)} cmpSuccess acts as a success callback when the value is read from config; pass along consentObject (string) from CMP
- * @param {function(string)} cmpError acts as an error callback while interacting with the config string; pass along an error message (string)
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
  */
-function lookupStaticConsentData(cmpSuccess, cmpError, hookConfig) {
-  cmpSuccess(staticConsentData, hookConfig);
+function lookupStaticConsentData({onSuccess, onError}) {
+  processUspData(staticConsentData, {onSuccess, onError});
 }
 
 /**
  * This function handles interacting with an USP compliant consent manager to obtain the consent information of the user.
  * Given the async nature of the USP's API, we pass in acting success/error callback functions to exit this function
  * based on the appropriate result.
- * @param {function(string)} uspSuccess acts as a success callback when USPAPI returns a value; pass along consentObject (string) from USPAPI
- * @param {function(string)} uspError acts as an error callback while interacting with USPAPI; pass along an error message (string)
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
  */
-function lookupUspConsent(uspSuccess, uspError, hookConfig) {
+function lookupUspConsent({onSuccess, onError}) {
+  function findUsp() {
+    let f = window;
+    let uspapiFrame;
+    let uspapiFunction;
+
+    while (true) {
+      try {
+        if (typeof f.__uspapi === 'function') {
+          uspapiFunction = f.__uspapi;
+          uspapiFrame = f;
+          break;
+        }
+      } catch (e) {}
+
+      try {
+        if (f.frames['__uspapiLocator']) {
+          uspapiFrame = f;
+          break;
+        }
+      } catch (e) {}
+      if (f === window.top) break;
+      f = f.parent;
+    }
+    return {
+      uspapiFrame,
+      uspapiFunction,
+    };
+  }
+
   function handleUspApiResponseCallbacks() {
     const uspResponse = {};
 
     function afterEach() {
       if (uspResponse.usPrivacy) {
-        uspSuccess(uspResponse, hookConfig);
+        processUspData(uspResponse, {onSuccess, onError})
       } else {
-        uspError('Unable to get USP consent string.', hookConfig);
+        onError('Unable to get USP consent string.');
       }
     }
 
@@ -61,202 +87,183 @@ function lookupUspConsent(uspSuccess, uspError, hookConfig) {
           uspResponse.usPrivacy = consentResponse.uspString;
         }
         afterEach();
-      }
+      },
     };
   }
 
   let callbackHandler = handleUspApiResponseCallbacks();
   let uspapiCallbacks = {};
 
+  let { uspapiFrame, uspapiFunction } = findUsp();
+
+  if (!uspapiFrame) {
+    return onError('USP CMP not found.');
+  }
+
   // to collect the consent information from the user, we perform a call to USPAPI
   // to collect the user's consent choices represented as a string (via getUSPData)
 
   // the following code also determines where the USPAPI is located and uses the proper workflow to communicate with it:
-  // - use the USPAPI locator code to see if USP's located in the current window or an ancestor window. This works in friendly or cross domain iframes
+  // - use the USPAPI locator code to see if USP's located in the current window or an ancestor window.
+  // - else assume prebid is in an iframe, and use the locator to see if the CMP is located in a higher parent window. This works in cross domain iframes.
   // - if USPAPI is not found, the iframe function will call the uspError exit callback to abort the rest of the USPAPI workflow
-  // - try to call the __uspapi() function directly, otherwise use the postMessage() api
-  // find the CMP frame/window
-
-  try {
-    // try to call __uspapi directly
-    window.__uspapi('getUSPData', USPAPI_VERSION, callbackHandler.consentDataCallback);
-  } catch (e) {
-    // must not have been accessible, try using postMessage() api
-    let f = window;
-    let uspapiFrame;
-    while (!uspapiFrame) {
-      try {
-        if (f.frames['__uspapiLocator']) uspapiFrame = f;
-      } catch (e) { }
-      if (f === window.top) break;
-      f = f.parent;
-    }
 
-    if (!uspapiFrame) {
-      return uspError('USP CMP not found.', hookConfig);
-    }
-    callUspApiWhileInIframe('getUSPData', uspapiFrame, callbackHandler.consentDataCallback);
+  if (isFn(uspapiFunction)) {
+    logInfo('Detected USP CMP is directly accessible, calling it now...');
+    uspapiFunction(
+      'getUSPData',
+      USPAPI_VERSION,
+      callbackHandler.consentDataCallback
+    );
+    uspapiFunction(
+      'registerDeletion',
+      USPAPI_VERSION,
+      adapterManager.callDataDeletionRequest
+    )
+  } else {
+    logInfo(
+      'Detected USP CMP is outside the current iframe where Prebid.js is located, calling it now...'
+    );
+    callUspApiWhileInIframe(
+      'getUSPData',
+      uspapiFrame,
+      callbackHandler.consentDataCallback
+    );
+    callUspApiWhileInIframe(
+      'registerDeletion',
+      uspapiFrame,
+      adapterManager.callDataDeletionRequest
+    );
   }
 
+  let listening = false;
+
   function callUspApiWhileInIframe(commandName, uspapiFrame, moduleCallback) {
-    /* Setup up a __uspapi function to do the postMessage and stash the callback.
-      This function behaves, from the caller's perspective, identicially to the in-frame __uspapi call (although it is not synchronous) */
-    window.__uspapi = function (cmd, ver, callback) {
+    function callUsp(cmd, ver, callback) {
       let callId = Math.random() + '';
       let msg = {
         __uspapiCall: {
           command: cmd,
           version: ver,
-          callId: callId
-        }
+          callId: callId,
+        },
       };
 
       uspapiCallbacks[callId] = callback;
       uspapiFrame.postMessage(msg, '*');
-    }
+    };
 
     /** when we get the return message, call the stashed callback */
-    window.addEventListener('message', readPostMessageResponse, false);
+    if (!listening) {
+      window.addEventListener('message', readPostMessageResponse, false);
+      listening = true;
+    }
 
     // call uspapi
-    window.__uspapi(commandName, USPAPI_VERSION, uspapiCallback);
+    callUsp(commandName, USPAPI_VERSION, moduleCallback);
 
     function readPostMessageResponse(event) {
       const res = event && event.data && event.data.__uspapiReturn;
       if (res && res.callId) {
-        if (typeof uspapiCallbacks[res.callId] !== 'undefined') {
+        if (uspapiCallbacks.hasOwnProperty(res.callId)) {
           uspapiCallbacks[res.callId](res.returnValue, res.success);
           delete uspapiCallbacks[res.callId];
         }
       }
     }
-
-    function uspapiCallback(consentObject, success) {
-      window.removeEventListener('message', readPostMessageResponse, false);
-      moduleCallback(consentObject, success);
-    }
   }
 }
 
 /**
- * If consentManagementUSP module is enabled (ie included in setConfig), this hook function will attempt to fetch the
- * user's encoded consent string from the supported USPAPI. Once obtained, the module will store this
- * data as part of a uspConsent object which gets transferred to adapterManager's uspDataHandler object.
- * This information is later added into the bidRequest object for any supported adapters to read/pass along to their system.
- * @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
+ * Lookup consent data and store it in the `consentData` global as well as `adapterManager.js`' uspDataHanlder.
+ *
+ * @param cb a callback that takes an error message and extra error arguments; all args will be undefined if consent
+ * data was retrieved successfully.
  */
-export function requestBidsHook(fn, reqBidsConfigObj) {
-  // preserves all module related variables for the current auction instance (used primiarily for concurrent auctions)
-  const hookConfig = {
-    context: this,
-    args: [reqBidsConfigObj],
-    nextFn: fn,
-    adUnits: reqBidsConfigObj.adUnits || $$PREBID_GLOBAL$$.adUnits,
-    bidsBackHandler: reqBidsConfigObj.bidsBackHandler,
-    haveExited: false,
-    timer: null
-  };
-
-  // in case we already have consent (eg during bid refresh)
-  if (consentData) {
-    return exitModule(null, hookConfig);
+function loadConsentData(cb) {
+  let timer = null;
+  let isDone = false;
+
+  function done(consentData, errMsg, ...extraArgs) {
+    if (timer != null) {
+      clearTimeout(timer);
+    }
+    isDone = true;
+    uspDataHandler.setConsentData(consentData);
+    if (cb != null) {
+      cb(errMsg, ...extraArgs)
+    }
   }
 
   if (!uspCallMap[consentAPI]) {
-    utils.logWarn(`USP framework (${consentAPI}) is not a supported framework. Aborting consentManagement module and resuming auction.`);
-    return hookConfig.nextFn.apply(hookConfig.context, hookConfig.args);
+    done(null, `USP framework (${consentAPI}) is not a supported framework. Aborting consentManagement module and resuming auction.`);
+    return;
+  }
+
+  const callbacks = {
+    onSuccess: done,
+    onError: function (errMsg, ...extraArgs) {
+      done(null, `${errMsg} Resuming auction without consent data as per consentManagement config.`, ...extraArgs);
+    }
   }
 
-  uspCallMap[consentAPI].call(this, processUspData, uspapiFailed, hookConfig);
+  uspCallMap[consentAPI](callbacks);
 
-  // only let this code run if module is still active (ie if the callbacks used by USPs haven't already finished)
-  if (!hookConfig.haveExited) {
+  if (!isDone) {
     if (consentTimeout === 0) {
-      processUspData(undefined, hookConfig);
+      processUspData(undefined, callbacks);
     } else {
-      hookConfig.timer = setTimeout(uspapiTimeout.bind(null, hookConfig), consentTimeout);
+      timer = setTimeout(callbacks.onError.bind(null, 'USPAPI workflow exceeded timeout threshold.'), consentTimeout)
     }
   }
 }
 
+/**
+ * If consentManagementUSP module is enabled (ie included in setConfig), this hook function will attempt to fetch the
+ * user's encoded consent string from the supported USPAPI. Once obtained, the module will store this
+ * data as part of a uspConsent object which gets transferred to adapterManager's uspDataHandler object.
+ * This information is later added into the bidRequest object for any supported adapters to read/pass along to their system.
+ * @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 const requestBidsHook = timedAuctionHook('usp', function requestBidsHook(fn, reqBidsConfigObj) {
+  if (!enabled) {
+    enableConsentManagement();
+  }
+  loadConsentData((errMsg, ...extraArgs) => {
+    if (errMsg != null) {
+      logWarn(errMsg, ...extraArgs);
+    }
+    fn.call(this, reqBidsConfigObj);
+  });
+});
+
 /**
  * This function checks the consent data provided by USPAPI to ensure it's in an expected state.
  * If it's bad, we exit the module depending on config settings.
  * If it's good, then we store the value and exits the module.
  * @param {object} consentObject required; object returned by USPAPI that contains user's consent choices
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
+ * @param {function(string)} onSuccess callback accepting the resolved consent USP consent string
+ * @param {function(string, ...{}?)} onError callback accepting error message and any extra error arguments (used purely for logging)
  */
-function processUspData(consentObject, hookConfig) {
+function processUspData(consentObject, {onSuccess, onError}) {
   const valid = !!(consentObject && consentObject.usPrivacy);
   if (!valid) {
-    uspapiFailed(`USPAPI returned unexpected value during lookup process.`, hookConfig, consentObject);
+    onError(`USPAPI returned unexpected value during lookup process.`, consentObject);
     return;
   }
 
-  clearTimeout(hookConfig.timer);
   storeUspConsentData(consentObject);
-  exitModule(null, hookConfig);
-}
-
-/**
- * General timeout callback when interacting with USPAPI takes too long.
- */
-function uspapiTimeout(hookConfig) {
-  uspapiFailed('USPAPI workflow exceeded timeout threshold.', hookConfig);
-}
-
-/**
- * This function contains the controlled steps to perform when there's a problem with USPAPI.
- * @param {string} errMsg required; should be a short descriptive message for why the failure/issue happened.
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
- * @param {object} extraArgs contains additional data that's passed along in the error/warning messages for easier debugging
-*/
-function uspapiFailed(errMsg, hookConfig, extraArgs) {
-  clearTimeout(hookConfig.timer);
-
-  exitModule(errMsg, hookConfig, extraArgs);
+  onSuccess(consentData);
 }
 
 /**
  * Stores USP data locally in module and then invokes uspDataHandler.setConsentData() to make information available in adaptermanger.js for later in the auction
- * @param {object} cmpConsentObject required; an object representing user's consent choices (can be undefined in certain use-cases for this function only)
+ * @param {object} consentObject required; an object representing user's consent choices (can be undefined in certain use-cases for this function only)
  */
 function storeUspConsentData(consentObject) {
   if (consentObject && consentObject.usPrivacy) {
     consentData = consentObject.usPrivacy;
-    uspDataHandler.setConsentData(consentData);
-  }
-}
-
-/**
- * This function handles the exit logic for the module.
- * There are a couple paths in the module's logic to call this function and we only allow 1 of the 2 potential exits to happen before suppressing others.
- *
- * We prevent multiple exits to avoid conflicting messages in the console depending on certain scenarios.
- * One scenario could be auction was canceled due to timeout with USPAPI being reached.
- * While the timeout is the accepted exit and runs first, the USP's callback still tries to process the user's data (which normally leads to a good exit).
- * In this case, the good exit will be suppressed since we already decided to cancel the auction.
- *
- * Three exit paths are:
- * 1. good exit where auction runs (USPAPI data is processed normally).
- * 2. bad exit but auction still continues (warning message is logged, USPAPI data is undefined and still passed along).
- * @param {string} errMsg optional; only to be used when there was a 'bad' exit.  String is a descriptive message for the failure/issue encountered.
- * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
- * @param {object} extraArgs contains additional data that's passed along in the error/warning messages for easier debugging
- */
-function exitModule(errMsg, hookConfig, extraArgs) {
-  if (hookConfig.haveExited === false) {
-    hookConfig.haveExited = true;
-
-    let context = hookConfig.context;
-    let args = hookConfig.args;
-    let nextFn = hookConfig.nextFn;
-
-    if (errMsg) {
-      utils.logWarn(errMsg + ' Resuming auction without consent data as per consentManagement config.', extraArgs);
-    }
-    nextFn.apply(context, args);
   }
 }
 
@@ -266,7 +273,9 @@ function exitModule(errMsg, hookConfig, extraArgs) {
 export function resetConsentData() {
   consentData = undefined;
   consentAPI = undefined;
-  uspDataHandler.setConsentData(null);
+  consentTimeout = undefined;
+  uspDataHandler.reset();
+  enabled = false;
 }
 
 /**
@@ -274,38 +283,54 @@ export function resetConsentData() {
  * @param {object} config required; consentManagementUSP module config settings; usp (string), timeout (int), allowAuctionWithoutConsent (boolean)
  */
 export function setConsentConfig(config) {
-  config = config.usp;
+  config = config && config.usp;
   if (!config || typeof config !== 'object') {
-    utils.logWarn('consentManagement.usp config not defined, exiting usp consent manager');
-    return;
+    logWarn('consentManagement.usp config not defined, using defaults');
   }
-  if (utils.isStr(config.cmpApi)) {
+  if (config && isStr(config.cmpApi)) {
     consentAPI = config.cmpApi;
   } else {
     consentAPI = DEFAULT_CONSENT_API;
-    utils.logInfo(`consentManagement.usp config did not specify cmpApi. Using system default setting (${DEFAULT_CONSENT_API}).`);
+    logInfo(`consentManagement.usp config did not specify cmpApi. Using system default setting (${DEFAULT_CONSENT_API}).`);
   }
 
-  if (utils.isNumber(config.timeout)) {
+  if (config && isNumber(config.timeout)) {
     consentTimeout = config.timeout;
   } else {
     consentTimeout = DEFAULT_CONSENT_TIMEOUT;
-    utils.logInfo(`consentManagement.usp config did not specify timeout. Using system default setting (${DEFAULT_CONSENT_TIMEOUT}).`);
+    logInfo(`consentManagement.usp config did not specify timeout. Using system default setting (${DEFAULT_CONSENT_TIMEOUT}).`);
   }
-
-  utils.logInfo('USPAPI consentManagement module has been activated...');
-
   if (consentAPI === 'static') {
-    if (utils.isPlainObject(config.consentData) && utils.isPlainObject(config.consentData.getUSPData)) {
+    if (isPlainObject(config.consentData) && isPlainObject(config.consentData.getUSPData)) {
       if (config.consentData.getUSPData.uspString) staticConsentData = { usPrivacy: config.consentData.getUSPData.uspString };
       consentTimeout = 0;
     } else {
-      utils.logError(`consentManagement config with cmpApi: 'static' did not specify consentData. No consents will be available to adapters.`);
+      logError(`consentManagement config with cmpApi: 'static' did not specify consentData. No consents will be available to adapters.`);
     }
   }
-  if (!addedConsentHook) {
-    $$PREBID_GLOBAL$$.requestBids.before(requestBidsHook, 50);
+  enableConsentManagement(true);
+}
+
+function enableConsentManagement(configFromUser = false) {
+  if (!enabled) {
+    logInfo(`USPAPI consentManagement module has been activated${configFromUser ? '' : ` using default values (api: '${consentAPI}', timeout: ${consentTimeout}ms)`}`);
+    enabled = true;
+    uspDataHandler.enable();
   }
-  addedConsentHook = true;
+  loadConsentData(); // immediately look up consent data to make it available without requiring an auction
 }
 config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
+
+getHook('requestBids').before(requestBidsHook, 50);
+
+export function enrichFPDHook(next, fpd) {
+  return next(fpd.then(ortb2 => {
+    const consent = uspDataHandler.getConsentData();
+    if (consent) {
+      deepSetValue(ortb2, 'regs.ext.us_privacy', consent)
+    }
+    return ortb2;
+  }))
+}
+
+enrichFPD.before(enrichFPDHook);
diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index 8eb56f7d0c2..c91f1a7f906 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -1,15 +1,18 @@
-import * as utils from '../src/utils.js';
+import { logWarn, deepAccess, isArray, deepSetValue, isFn, isPlainObject } from '../src/utils.js';
+import {config} from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'consumable';
 
-const BASE_URI = 'https://e.serverbid.com/api/v2'
+const BASE_URI = 'https://e.serverbid.com/api/v2';
 
 let siteId = 0;
 let bidder = 'consumable';
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -47,8 +50,8 @@ export const spec = {
     const data = Object.assign({
       placements: [],
       time: Date.now(),
-      url: bidderRequest.refererInfo.referer,
-      referrer: document.referrer,
+      url: bidderRequest.refererInfo.page,
+      referrer: bidderRequest.refererInfo.ref,
       source: [{
         'name': 'prebidjs',
         'version': '$prebid.version$'
@@ -66,6 +69,14 @@ export const spec = {
       data.ccpa = bidderRequest.uspConsent;
     }
 
+    if (bidderRequest && bidderRequest.schain) {
+      data.schain = bidderRequest.schain;
+    }
+
+    if (config.getConfig('coppa')) {
+      data.coppa = true;
+    }
+
     validBidRequests.map(bid => {
       const sizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes || [];
       const placement = Object.assign({
@@ -73,11 +84,19 @@ export const spec = {
         adTypes: bid.adTypes || getSize(sizes)
       }, bid.params);
 
+      placement.bidfloor = getBidFloor(bid, sizes);
+
+      if (bid.mediaTypes.video && bid.mediaTypes.video.playerSize) {
+        placement.video = bid.mediaTypes.video;
+      }
+
       if (placement.networkId && placement.siteId && placement.unitId && placement.unitName) {
         data.placements.push(placement);
       }
     });
 
+    handleEids(data, validBidRequests);
+
     ret.data = JSON.stringify(data);
     ret.bidRequest = validBidRequests;
     ret.bidderRequest = bidderRequest;
@@ -123,7 +142,35 @@ export const spec = {
           bid.creativeId = decision.adId;
           bid.ttl = 30;
           bid.netRevenue = true;
-          bid.referrer = bidRequest.bidderRequest.refererInfo.referer;
+          bid.referrer = bidRequest.bidderRequest.refererInfo.page;
+
+          bid.meta = {
+            advertiserDomains: decision.adomain || []
+          };
+
+          if (decision.cats) {
+            if (decision.cats.length > 0) {
+              bid.meta.primaryCatId = decision.cats[0];
+              if (decision.cats.length > 1) {
+                bid.meta.secondaryCatIds = decision.cats.slice(1);
+              }
+            }
+          }
+
+          if (decision.networkId) {
+            bid.meta.networkId = decision.networkId;
+          }
+
+          if (decision.mediaType) {
+            bid.meta.mediaType = decision.mediaType;
+
+            if (decision.mediaType === 'video') {
+              bid.mediaType = 'video';
+              bid.vastUrl = decision.vastUrl || undefined;
+              bid.vastXml = decision.vastXml || undefined;
+              bid.videoCacheKey = decision.uuid || undefined;
+            }
+          }
 
           bidResponses.push(bid);
         }
@@ -135,16 +182,18 @@ export const spec = {
 
   getUserSyncs: function(syncOptions, serverResponses) {
     if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: 'https://sync.serverbid.com/ss/' + siteId + '.html'
-      }];
+      if (!serverResponses || serverResponses.length === 0 || !serverResponses[0].body.bdr || serverResponses[0].body.bdr !== 'cx') {
+        return [{
+          type: 'iframe',
+          url: 'https://sync.serverbid.com/ss/' + siteId + '.html'
+        }];
+      }
     }
 
-    if (syncOptions.pixelEnabled && serverResponses.length > 0) {
+    if (syncOptions.pixelEnabled && serverResponses && serverResponses.length > 0) {
       return serverResponses[0].body.pixels;
     } else {
-      utils.logWarn(bidder + ': Please enable iframe based user syncing.');
+      logWarn(bidder + ': Please enable iframe based user syncing.');
     }
   }
 };
@@ -206,9 +255,43 @@ function getSize(sizes) {
 }
 
 function retrieveAd(decision, unitId, unitName) {
-  let ad = decision.contents && decision.contents[0] && decision.contents[0].body + utils.createTrackPixelHtml(decision.impressionUrl);
-
+  let ad;
+  if (decision.contents && decision.contents[0]) {
+    ad = decision.contents[0].body;
+  }
+  if (decision.vastXml) {
+    ad = decision.vastXml;
+  }
   return ad;
 }
 
+function handleEids(data, validBidRequests) {
+  let bidUserIdAsEids = deepAccess(validBidRequests, '0.userIdAsEids');
+  if (isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
+    deepSetValue(data, 'user.eids', bidUserIdAsEids);
+  } else {
+    deepSetValue(data, 'user.eids', undefined);
+  }
+}
+
+function getBidFloor(bid, sizes) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidFloor ? bid.params.bidFloor : null;
+  }
+
+  let floor;
+
+  let floorInfo = bid.getFloor({
+    currency: 'USD',
+    mediaType: bid.mediaTypes.video ? 'video' : 'banner',
+    size: sizes.length === 1 ? sizes[0] : '*'
+  });
+
+  if (isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+    floor = parseFloat(floorInfo.floor);
+  }
+
+  return floor;
+}
+
 registerBidder(spec);
diff --git a/modules/consumableBidAdapter.md b/modules/consumableBidAdapter.md
index 2189494ebd4..ba472899c49 100644
--- a/modules/consumableBidAdapter.md
+++ b/modules/consumableBidAdapter.md
@@ -4,7 +4,7 @@ Module Name: Consumable Bid Adapter
 
 Module Type: Consumable Adapter
 
-Maintainer: naffis@consumable.com
+Maintainer: prebid@consumable.com
 
 # Description
 
diff --git a/modules/contentexchangeBidAdapter.js b/modules/contentexchangeBidAdapter.js
new file mode 100644
index 00000000000..becc21555e3
--- /dev/null
+++ b/modules/contentexchangeBidAdapter.js
@@ -0,0 +1,214 @@
+import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'contentexchange';
+const AD_URL = 'https://eu2.adnetwork.agency/pbjs';
+const SYNC_URL = 'https://sync2.adnetwork.agency';
+
+function isBidResponseValid (bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency || !bid.meta) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData (bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId, adFormat } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    placementId,
+    bidId,
+    adFormat,
+    schain,
+    bidfloor
+  };
+
+  switch (adFormat) {
+    case BANNER:
+      placement.sizes = mediaTypes[BANNER].sizes;
+      break;
+    case VIDEO:
+      placement.playerSize = mediaTypes[VIDEO].playerSize;
+      placement.minduration = mediaTypes[VIDEO].minduration;
+      placement.maxduration = mediaTypes[VIDEO].maxduration;
+      placement.mimes = mediaTypes[VIDEO].mimes;
+      placement.protocols = mediaTypes[VIDEO].protocols;
+      placement.startdelay = mediaTypes[VIDEO].startdelay;
+      placement.placement = mediaTypes[VIDEO].placement;
+      placement.skip = mediaTypes[VIDEO].skip;
+      placement.skipafter = mediaTypes[VIDEO].skipafter;
+      placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+      placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+      placement.delivery = mediaTypes[VIDEO].delivery;
+      placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+      placement.api = mediaTypes[VIDEO].api;
+      placement.linearity = mediaTypes[VIDEO].linearity;
+      break;
+    case NATIVE:
+      placement.native = mediaTypes[NATIVE];
+      break;
+  }
+
+  return placement;
+}
+
+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 = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId &&
+      params &&
+      params.placementId &&
+      params.adFormat
+    );
+    switch (params.adFormat) {
+      case BANNER:
+        valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+        break;
+      case VIDEO:
+        valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+        break;
+      case NATIVE:
+        valid = valid && Boolean(mediaTypes[NATIVE]);
+        break;
+      default:
+        valid = false;
+    }
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+
+    // TODO: does the fallback to 'window.location' make sense?
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/contentexchangeBidAdapter.md b/modules/contentexchangeBidAdapter.md
new file mode 100644
index 00000000000..445d9c928bf
--- /dev/null
+++ b/modules/contentexchangeBidAdapter.md
@@ -0,0 +1,83 @@
+# Overview
+
+```
+Module Name: Contentexchange Bidder Adapter
+Module Type: Contentexchange Bidder Adapter
+Maintainer: no-reply@vsn.si
+```
+
+# Description
+
+Connects to Contentexchange exchange for bids.
+
+Contentexchange bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'contentexchange',
+                            params: {
+                                placementId: '0',
+                                adFormat: 'banner'
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'contentexchange',
+                            params: {
+                                placementId: '0',
+                                adFormat: 'video'
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'contentexchange',
+                            params: {
+                                placementId: '0',
+                                adFormat: 'native'
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/contentigniteBidAdapter.md b/modules/contentigniteBidAdapter.md
deleted file mode 100644
index 1f3a543b621..00000000000
--- a/modules/contentigniteBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-```
-Module Name: Content Ignite Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: jamie@contentignite.com
-```
-
-# Description
-
-Module that connects to Content Ignites bidder application.
-
-# Test Parameters
-
-```
-    var adUnits = [{
-        code: 'display-div',
-        sizes: [[728, 90]],  // a display size
-        bids: [{
-            bidder: "contentignite",
-            params: {
-                accountID: '168237',
-                zoneID: '299680',
-                keyword: 'business', //optional
-                minCPM: '0.10', //optional
-                maxCPM: '1.00' //optional
-            }
-        }]
-    }];
-```
diff --git a/modules/convergeBidAdapter.js b/modules/convergeBidAdapter.js
deleted file mode 100644
index bea3b6cb1ab..00000000000
--- a/modules/convergeBidAdapter.js
+++ /dev/null
@@ -1,313 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'converge';
-const ENDPOINT_URL = 'https://tech.convergd.com/hb';
-const TIME_TO_LIVE = 360;
-const SYNC_URL = 'https://tech.convergd.com/push_sync';
-const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
-
-let hasSynced = false;
-
-const LOG_ERROR_MESS = {
-  noAuid: 'Bid from response has no auid parameter - ',
-  noAdm: 'Bid from response has no adm parameter - ',
-  noBid: 'Array of bid objects is empty',
-  noPlacementCode: "Can't find in requested bids the bid with auid - ",
-  emptyUids: 'Uids should be not empty',
-  emptySeatbid: 'Seatbid array from response has empty item',
-  emptyResponse: 'Response is empty',
-  hasEmptySeatbidArray: 'Response has empty seatbid array',
-  hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - '
-};
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [ BANNER, VIDEO ],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    return !!bid.params.uid;
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests - an array of bids
-   * @param {bidderRequest} bidderRequest - bidder request object
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(validBidRequests, bidderRequest) {
-    const auids = [];
-    const bidsMap = {};
-    const slotsMapByUid = {};
-    const sizeMap = {};
-    const bids = validBidRequests || [];
-    let priceType = 'net';
-    let pageKeywords;
-    let reqId;
-
-    bids.forEach(bid => {
-      if (bid.params.priceType === 'gross') {
-        priceType = 'gross';
-      }
-      reqId = bid.bidderRequestId;
-      const {params: {uid}, adUnitCode} = bid;
-      auids.push(uid);
-      const sizesId = utils.parseSizesInput(bid.sizes);
-
-      if (!pageKeywords && !utils.isEmpty(bid.params.keywords)) {
-        const keywords = utils.transformBidderParamKeywords(bid.params.keywords);
-
-        if (keywords.length > 0) {
-          keywords.forEach(deleteValues);
-        }
-        pageKeywords = keywords;
-      }
-
-      if (!slotsMapByUid[uid]) {
-        slotsMapByUid[uid] = {};
-      }
-      const slotsMap = slotsMapByUid[uid];
-      if (!slotsMap[adUnitCode]) {
-        slotsMap[adUnitCode] = {adUnitCode, bids: [bid], parents: []};
-      } else {
-        slotsMap[adUnitCode].bids.push(bid);
-      }
-      const slot = slotsMap[adUnitCode];
-
-      sizesId.forEach((sizeId) => {
-        sizeMap[sizeId] = true;
-        if (!bidsMap[uid]) {
-          bidsMap[uid] = {};
-        }
-
-        if (!bidsMap[uid][sizeId]) {
-          bidsMap[uid][sizeId] = [slot];
-        } else {
-          bidsMap[uid][sizeId].push(slot);
-        }
-        slot.parents.push({parent: bidsMap[uid], key: sizeId, uid});
-      });
-    });
-
-    const payload = {
-      pt: priceType,
-      auids: auids.join(','),
-      sizes: utils.getKeys(sizeMap).join(','),
-      r: reqId,
-      wrapperType: 'Prebid_js',
-      wrapperVersion: '$prebid.version$'
-    };
-
-    if (pageKeywords) {
-      payload.keywords = JSON.stringify(pageKeywords);
-    }
-
-    if (bidderRequest) {
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        payload.u = bidderRequest.refererInfo.referer;
-      }
-      if (bidderRequest.timeout) {
-        payload.wtimeout = bidderRequest.timeout;
-      }
-      if (bidderRequest.gdprConsent) {
-        if (bidderRequest.gdprConsent.consentString) {
-          payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
-        }
-        payload.gdpr_applies =
-          (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
-            ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
-      }
-      if (bidderRequest.uspConsent) {
-        payload.us_privacy = bidderRequest.uspConsent;
-      }
-    }
-
-    return {
-      method: 'GET',
-      url: ENDPOINT_URL,
-      data: utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
-      bidsMap: bidsMap,
-    };
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @param {*} bidRequest
-   * @param {Renderer} RendererConst
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, bidRequest, RendererConst = Renderer) {
-    serverResponse = serverResponse && serverResponse.body;
-    const bidResponses = [];
-    const bidsMap = bidRequest.bidsMap;
-    const priceType = bidRequest.data.pt;
-
-    let errorMessage;
-
-    if (!serverResponse) errorMessage = LOG_ERROR_MESS.emptyResponse;
-    else if (serverResponse.seatbid && !serverResponse.seatbid.length) {
-      errorMessage = LOG_ERROR_MESS.hasEmptySeatbidArray;
-    }
-
-    if (!errorMessage && serverResponse.seatbid) {
-      serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidsMap, priceType, bidResponses, RendererConst);
-      });
-    }
-    if (errorMessage) utils.logError(errorMessage);
-    return bidResponses;
-  },
-  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
-    if (!hasSynced && syncOptions.pixelEnabled) {
-      let params = '';
-
-      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
-        if (typeof gdprConsent.gdprApplies === 'boolean') {
-          params += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-        } else {
-          params += `&gdpr_consent=${gdprConsent.consentString}`;
-        }
-      }
-      if (uspConsent) {
-        params += `&us_privacy=${uspConsent}`;
-      }
-
-      hasSynced = true;
-      return {
-        type: 'image',
-        url: SYNC_URL + params
-      };
-    }
-  }
-};
-
-function isPopulatedArray(arr) {
-  return !!(utils.isArray(arr) && arr.length > 0);
-}
-
-function deleteValues(keyPairObj) {
-  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
-    delete keyPairObj.value;
-  }
-}
-
-function _getBidFromResponse(respItem) {
-  if (!respItem) {
-    utils.logError(LOG_ERROR_MESS.emptySeatbid);
-  } else if (!respItem.bid) {
-    utils.logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
-  } else if (!respItem.bid[0]) {
-    utils.logError(LOG_ERROR_MESS.noBid);
-  }
-  return respItem && respItem.bid && respItem.bid[0];
-}
-
-function _addBidResponse(serverBid, bidsMap, priceType, bidResponses, RendererConst) {
-  if (!serverBid) return;
-  let errorMessage;
-  if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
-  if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
-  else {
-    const awaitingBids = bidsMap[serverBid.auid];
-    if (awaitingBids) {
-      const sizeId = `${serverBid.w}x${serverBid.h}`;
-      if (awaitingBids[sizeId]) {
-        const slot = awaitingBids[sizeId][0];
-
-        const bid = slot.bids.shift();
-        const bidResponse = {
-          requestId: bid.bidId, // bid.bidderRequestId,
-          bidderCode: spec.code,
-          cpm: serverBid.price,
-          width: serverBid.w,
-          height: serverBid.h,
-          creativeId: serverBid.auid, // bid.bidId,
-          currency: 'EUR',
-          netRevenue: priceType !== 'gross',
-          ttl: TIME_TO_LIVE,
-          dealId: serverBid.dealid
-        };
-        if (serverBid.content_type === 'video' || (!serverBid.content_type && bid.mediaTypes && bid.mediaTypes.video)) {
-          bidResponse.vastXml = serverBid.adm;
-          bidResponse.mediaType = VIDEO;
-          bidResponse.adResponse = {
-            content: bidResponse.vastXml
-          };
-          if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
-            bidResponse.renderer = createRenderer(bidResponse, {
-              id: bid.bidId,
-              url: RENDERER_URL
-            }, RendererConst);
-          }
-        } else {
-          bidResponse.ad = serverBid.adm;
-          bidResponse.mediaType = BANNER;
-        }
-
-        bidResponses.push(bidResponse);
-
-        if (!slot.bids.length) {
-          slot.parents.forEach(({parent, key, uid}) => {
-            const index = parent[key].indexOf(slot);
-            if (index > -1) {
-              parent[key].splice(index, 1);
-            }
-            if (!parent[key].length) {
-              delete parent[key];
-              if (!utils.getKeys(parent).length) {
-                delete bidsMap[uid];
-              }
-            }
-          });
-        }
-      }
-    } else {
-      errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
-    }
-  }
-  if (errorMessage) {
-    utils.logError(errorMessage);
-  }
-}
-
-function outstreamRender (bid) {
-  bid.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      targetId: bid.adUnitCode,
-      adResponse: bid.adResponse
-    });
-  });
-}
-
-function createRenderer (bid, rendererParams, RendererConst) {
-  const rendererInst = RendererConst.install({
-    id: rendererParams.id,
-    url: rendererParams.url,
-    loaded: false
-  });
-
-  try {
-    rendererInst.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-
-  return rendererInst;
-}
-
-export function resetUserSync() {
-  hasSynced = false;
-}
-
-export function getSyncUrl() {
-  return SYNC_URL;
-}
-
-registerBidder(spec);
diff --git a/modules/convergeBidAdapter.md b/modules/convergeBidAdapter.md
deleted file mode 100644
index ab916a8b3b6..00000000000
--- a/modules/convergeBidAdapter.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Overview
-
-Module Name: Converge Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: support@converge-digital.com
-
-# Description
-
-Module that connects to Converge demand source to fetch bids.
-Converge Bid Adapter supports Banner and Video (instream and outstream).
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "converge",
-                       params: {
-                           uid: '59',
-                           priceType: 'gross' // by default is 'net'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[728, 90]],
-               bids: [
-                   {
-                       bidder: "converge",
-                       params: {
-                           uid: 1,
-                           priceType: 'gross',
-                           keywords: {
-                               brandsafety: ['disaster'],
-                               topic: ['stress', 'fear']
-                           }
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[640, 360]],
-               mediaTypes: { video: {} },
-               bids: [
-                   {
-                       bidder: "converge",
-                       params: {
-                           uid: 60
-                       }
-                   }
-               ]
-           }
-       ];
-```
diff --git a/modules/conversantAnalyticsAdapter.js b/modules/conversantAnalyticsAdapter.js
new file mode 100644
index 00000000000..6e88f403bae
--- /dev/null
+++ b/modules/conversantAnalyticsAdapter.js
@@ -0,0 +1,560 @@
+import {ajax} from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import {getGlobal} from '../src/prebidGlobal.js';
+import adapterManager from '../src/adapterManager.js';
+import {logInfo, logError, logMessage, deepAccess, isInteger} from '../src/utils.js';
+
+const {
+  EVENTS: { AUCTION_END, AD_RENDER_FAILED, BID_TIMEOUT, BID_WON }
+} = CONSTANTS;
+const GVLID = 24;
+const ANALYTICS_TYPE = 'endpoint';
+
+// for local testing set domain to 127.0.0.1:8290
+const URL = 'https://web.hb.ad.cpe.dotomi.com/cvx/event/prebidanalytics';
+const ANALYTICS_CODE = 'conversant';
+
+export const CNVR_CONSTANTS = {
+  LOG_PREFIX: 'Conversant analytics adapter: ',
+  // Maximum time to keep an item in the cache before it gets purged
+  MAX_MILLISECONDS_IN_CACHE: 30000,
+  // How often cache cleanup will run
+  CACHE_CLEANUP_TIME_IN_MILLIS: 30000,
+  // Should be float from 0-1, 0 is turned off, 1 is sample every instance
+  DEFAULT_SAMPLE_RATE: 1,
+
+  // BID STATUS CODES
+  WIN: 10,
+  BID: 20,
+  NO_BID: 30,
+  TIMEOUT: 40,
+  RENDER_FAILED: 50
+};
+
+// Saves passed in options from the bid adapter
+const initOptions = {};
+
+// Simple flag to help handle any tear down needed on disable
+let conversantAnalyticsEnabled = false;
+
+export const cnvrHelper = {
+  // Turns on sampling for an instance of prebid analytics.
+  doSample: true,
+
+  /**
+   * Used to hold data for RENDER FAILED events so we can send a payload back that will match our original auction data.
+   * Contains the following key/value data:
+   * <adId> => {
+   *     'bidderCode': <bidderCode>,
+   *     'adUnitCode': <adUnitCode>,
+   *     'auctionId': <auctionId>,
+   *     'timeReceived': Date.now()  //For cache cleaning
+   * }
+   */
+  adIdLookup: {},
+
+  /**
+   * Time out events happen before AUCTION END so we can save them in a cache and report them at the same time as the
+   * AUCTION END event.  Has the following data and key is based off of auctionId, adUnitCode, bidderCode from
+   * keyStr = getLookupKey(auctionId, adUnitCode, bidderCode);
+   * <keyStr> => {
+   *     timeReceived: Date.now() //so cache can be purged in case it doesn't get cleaned out at auctionEnd
+   * }
+   */
+  timeoutCache: {},
+
+  /**
+   * Lookup of auction IDs to auction start timestamps
+   */
+  auctionIdTimestampCache: {}
+};
+
+/**
+ * Cleanup timer for the adIdLookup and timeoutCache caches. If all works properly then the caches are self-cleaning
+ * but in case something goes sideways we poll periodically to cleanup old values to prevent a memory leak
+ */
+let cacheCleanupInterval;
+
+let conversantAnalytics = Object.assign(
+  adapter({URL, ANALYTICS_TYPE}),
+  {
+    track({eventType, args}) {
+      if (cnvrHelper.doSample) {
+        logMessage(CNVR_CONSTANTS.LOG_PREFIX + ' track(): ' + eventType, args);
+        switch (eventType) {
+          case AUCTION_END:
+            onAuctionEnd(args);
+            break;
+          case AD_RENDER_FAILED:
+            onAdRenderFailed(args);
+            break;
+          case BID_WON:
+            onBidWon(args);
+            break;
+          case BID_TIMEOUT:
+            onBidTimeout(args);
+            break;
+        } // END switch
+      } else {
+        logMessage(CNVR_CONSTANTS.LOG_PREFIX + ' - ' + eventType + ': skipped due to sampling');
+      }// END IF(cnvrHelper.doSample)
+    } // END track()
+  }
+);
+
+// ================================================== EVENT HANDLERS ===================================================
+/**
+ * We get the list of timeouts before the endAution, cache them temporarily in a global cache and the endAuction event
+ * will pick them up.  Uses getLookupKey() to create the key to the entry from auctionId, adUnitCode and bidderCode.
+ * Saves a single value of timeReceived so we can do cache purging periodically.
+ *
+ * Current assumption is that the timeout will always be an array even if it is just one object in the array.
+ * @param args  [{
+    "bidId": "80882409358b8a8",
+    "bidder": "conversant",
+    "adUnitCode": "MedRect",
+    "auctionId": "afbd6e0b-e45b-46ab-87bf-c0bac0cb8881"
+  }, {
+    "bidId": "9da4c107a6f24c8",
+    "bidder": "conversant",
+    "adUnitCode": "Leaderboard",
+    "auctionId": "afbd6e0b-e45b-46ab-87bf-c0bac0cb8881"
+  }
+ ]
+ */
+function onBidTimeout(args) {
+  args.forEach(timedOutBid => {
+    const timeoutCacheKey = cnvrHelper.getLookupKey(timedOutBid.auctionId, timedOutBid.adUnitCode, timedOutBid.bidder);
+    cnvrHelper.timeoutCache[timeoutCacheKey] = {
+      timeReceived: Date.now()
+    }
+  });
+}
+
+/**
+ * Bid won occurs after auctionEnd so we need to send this separately. We also save an entry in the adIdLookup cache
+ * so that if the render fails we can match up important data so we can send a valid RENDER FAILED event back.
+ * @param args bidWon args
+ */
+function onBidWon(args) {
+  const bidderCode = args.bidderCode;
+  const adUnitCode = args.adUnitCode;
+  const auctionId = args.auctionId;
+  let timestamp = args.requestTimestamp ? args.requestTimestamp : Date.now();
+
+  // Make sure we have all the data we need
+  if (!bidderCode || !adUnitCode || !auctionId) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onBidWon() did not get all the necessary data to process the event.');
+    return;
+  }
+
+  if (cnvrHelper.auctionIdTimestampCache[auctionId]) {
+    timestamp = cnvrHelper.auctionIdTimestampCache[auctionId].timeReceived; // Don't delete, could be multiple winners/auction, allow cleanup to handle
+  }
+
+  const bidWonPayload = cnvrHelper.createPayload('bid_won', auctionId, timestamp);
+
+  const adUnitPayload = cnvrHelper.createAdUnit();
+  bidWonPayload.adUnits[adUnitCode] = adUnitPayload;
+
+  const bidPayload = cnvrHelper.createBid(CNVR_CONSTANTS.WIN, args.timeToRespond);
+  bidPayload.adSize = cnvrHelper.createAdSize(args.width, args.height);
+  bidPayload.cpm = args.cpm;
+  bidPayload.originalCpm = args.originalCpm;
+  bidPayload.currency = args.currency;
+  bidPayload.mediaType = args.mediaType;
+  adUnitPayload.bids[bidderCode] = [bidPayload];
+
+  if (!cnvrHelper.adIdLookup[args.adId]) {
+    cnvrHelper.adIdLookup[args.adId] = {
+      'bidderCode': bidderCode,
+      'adUnitCode': adUnitCode,
+      'auctionId': auctionId,
+      'timeReceived': Date.now() // For cache cleaning
+    };
+  }
+
+  sendData(bidWonPayload);
+}
+
+/**
+ * RENDER FAILED occurs after AUCTION END and BID WON, the payload does not have all the data we need so we use
+ * adIdLookup to pull data from a BID WON event to populate our payload
+ * @param args = {
+ *  reason: <value>
+ *  message: <value>
+ *  adId: <value> --optional
+ *  bid: {object?} --optional: unsure what this looks like but guessing it is {bidder: <value>, params: {object}}
+ *    }
+ */
+function onAdRenderFailed(args) {
+  const adId = args.adId;
+  // Make sure we have all the data we need, adId is optional so it's not guaranteed, without that we can't match it up
+  // to our adIdLookup data.
+  if (!adId || !cnvrHelper.adIdLookup[adId]) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + "onAdRenderFailed(): Unable to process RENDER FAILED because adId is missing or doesn't match a record in our cache.");
+    return; // Either no adId to match against a bidWon event, or no data saved from a bidWon event that matches the adId
+  }
+  const adIdObj = cnvrHelper.adIdLookup[adId];
+  const adUnitCode = adIdObj['adUnitCode'];
+  const bidderCode = adIdObj['bidderCode'];
+  const auctionId = adIdObj['auctionId'];
+  delete cnvrHelper.adIdLookup[adId]; // cleanup our cache
+
+  if (!bidderCode || !adUnitCode || !auctionId) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAdRenderFailed(): Unable to process RENDER FAILED because lookup cache did not have all the data we required.');
+    return;
+  }
+
+  let timestamp = Date.now();
+  if (cnvrHelper.auctionIdTimestampCache[auctionId]) {
+    timestamp = cnvrHelper.auctionIdTimestampCache[auctionId].timeReceived; // Don't delete, could be multiple winners/auction, allow cleanup to handle
+  }
+
+  const renderFailedPayload = cnvrHelper.createPayload('render_failed', auctionId, timestamp);
+  const adUnitPayload = cnvrHelper.createAdUnit();
+  adUnitPayload.bids[bidderCode] = [cnvrHelper.createBid(CNVR_CONSTANTS.RENDER_FAILED, 0)];
+  adUnitPayload.bids[bidderCode][0].message = 'REASON: ' + args.reason + '. MESSAGE: ' + args.message;
+  renderFailedPayload.adUnits[adUnitCode] = adUnitPayload;
+  sendData(renderFailedPayload);
+}
+
+/**
+ * AUCTION END contains bid and no bid info and all of the auction info we need. This sends the bulk of the information
+ * about the auction back to the servers.  It will also check the timeoutCache for any matching bids, if any are found
+ * then they will be removed from the cache and send back with this payload.
+ * @param args AUCTION END payload, fairly large data structure, main objects are 'adUnits[]', 'bidderRequests[]',
+ * 'noBids[]', 'bidsReceived[]'... 'winningBids[]' seems to be always blank.
+ */
+function onAuctionEnd(args) {
+  const auctionId = args.auctionId;
+  if (!auctionId) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): No auctionId in args supplied so unable to process event.');
+    return;
+  }
+
+  const auctionTimestamp = args.timestamp ? args.timestamp : Date.now();
+  cnvrHelper.auctionIdTimestampCache[auctionId] = { timeReceived: auctionTimestamp };
+
+  const auctionEndPayload = cnvrHelper.createPayload('auction_end', auctionId, auctionTimestamp);
+  // Get bid request information from adUnits
+  if (!Array.isArray(args.adUnits)) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): adUnits not defined in arguments.');
+    return;
+  }
+
+  args.adUnits.forEach(adUnit => {
+    const cnvrAdUnit = cnvrHelper.createAdUnit();
+    // Initialize bids with bidderCode
+    adUnit.bids.forEach(bid => {
+      cnvrAdUnit.bids[bid.bidder] = []; // support multiple bids from a bidder for different sizes/media types //cnvrHelper.initializeBidDefaults();
+
+      // Check for cached timeout responses
+      const timeoutKey = cnvrHelper.getLookupKey(auctionId, adUnit.code, bid.bidder);
+      if (cnvrHelper.timeoutCache[timeoutKey]) {
+        cnvrAdUnit.bids[bid.bidder].push(cnvrHelper.createBid(CNVR_CONSTANTS.TIMEOUT, args.timeout));
+        delete cnvrHelper.timeoutCache[timeoutKey];
+      }
+    });
+
+    // Ad media types for the ad slot
+    if (cnvrHelper.keyExistsAndIsObject(adUnit, 'mediaTypes')) {
+      Object.entries(adUnit.mediaTypes).forEach(([mediaTypeName]) => {
+        cnvrAdUnit.mediaTypes.push(mediaTypeName);
+      });
+    }
+
+    // Ad sizes listed under the size key
+    if (Array.isArray(adUnit.sizes) && adUnit.sizes.length >= 1) {
+      adUnit.sizes.forEach(size => {
+        if (!Array.isArray(size) || size.length !== 2) {
+          logMessage(CNVR_CONSTANTS.LOG_PREFIX + 'Unknown object while retrieving adUnit sizes.', adUnit);
+          return; // skips to next item
+        }
+        cnvrAdUnit.sizes.push(cnvrHelper.createAdSize(size[0], size[1]));
+      });
+    }
+
+    // If the Ad Slot is not unique then ad sizes and media types merge them together
+    if (auctionEndPayload.adUnits[adUnit.code]) {
+      // Merge ad sizes
+      Array.prototype.push.apply(auctionEndPayload.adUnits[adUnit.code].sizes, cnvrAdUnit.sizes);
+      // Merge mediaTypes
+      Array.prototype.push.apply(auctionEndPayload.adUnits[adUnit.code].mediaTypes, cnvrAdUnit.mediaTypes);
+    } else {
+      auctionEndPayload.adUnits[adUnit.code] = cnvrAdUnit;
+    }
+  });
+
+  if (Array.isArray(args.noBids)) {
+    args.noBids.forEach(noBid => {
+      const bidPayloadArray = deepAccess(auctionEndPayload, 'adUnits.' + noBid.adUnitCode + '.bids.' + noBid.bidder);
+
+      if (bidPayloadArray) {
+        bidPayloadArray.push(cnvrHelper.createBid(CNVR_CONSTANTS.NO_BID, 0)); // no time to respond info for this, would have to capture event and save it there
+      } else {
+        logMessage(CNVR_CONSTANTS.LOG_PREFIX + 'Unable to locate bid object via adUnitCode/bidderCode in payload for noBid reply in END_AUCTION', Object.assign({}, noBid));
+      }
+    });
+  } else {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): noBids not defined in arguments.');
+  }
+
+  // Get bid data from bids sent
+  if (Array.isArray(args.bidsReceived)) {
+    args.bidsReceived.forEach(bid => {
+      const bidPayloadArray = deepAccess(auctionEndPayload, 'adUnits.' + bid.adUnitCode + '.bids.' + bid.bidderCode);
+      if (bidPayloadArray) {
+        const bidPayload = cnvrHelper.createBid(CNVR_CONSTANTS.BID, bid.timeToRespond);
+        bidPayload.originalCpm = bid.originalCpm;
+        bidPayload.cpm = bid.cpm;
+        bidPayload.currency = bid.currency;
+        bidPayload.mediaType = bid.mediaType;
+        bidPayload.adSize = {
+          'w': bid.width,
+          'h': bid.height
+        };
+        bidPayloadArray.push(bidPayload);
+      } else {
+        logMessage(CNVR_CONSTANTS.LOG_PREFIX + 'Unable to locate bid object via adUnitCode/bidderCode in payload for bid reply in END_AUCTION', Object.assign({}, bid));
+      }
+    });
+  } else {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): bidsReceived not defined in arguments.');
+  }
+  // We need to remove any duplicate ad sizes from merging ad-slots or overlap in different media types and also
+  // media-types from merged ad-slots in twin bids.
+  Object.keys(auctionEndPayload.adUnits).forEach(function(adCode) {
+    auctionEndPayload.adUnits[adCode].sizes = cnvrHelper.deduplicateArray(auctionEndPayload.adUnits[adCode].sizes);
+    auctionEndPayload.adUnits[adCode].mediaTypes = cnvrHelper.deduplicateArray(auctionEndPayload.adUnits[adCode].mediaTypes);
+  });
+
+  sendData(auctionEndPayload);
+}
+
+// =============================================== START OF HELPERS ===================================================
+
+/**
+ * Helper to verify a key exists and is a data type of Object (not a function, or array)
+ * @param parent The parent that we want to check the key for
+ * @param key The key which we want to check
+ * @returns {boolean} True if it's an object and exists, false otherwise (null, array, primitive, function)
+ */
+cnvrHelper.keyExistsAndIsObject = function (parent, key) {
+  if (!parent.hasOwnProperty(key)) {
+    return false;
+  }
+  return typeof parent[key] === 'object' &&
+    !Array.isArray(parent[key]) &&
+    parent[key] !== null;
+}
+
+/**
+ * De-duplicate an array that could contain primitives or objects/associative arrays.
+ * A temporary array is used to store a string representation of each object that we look at.  If an object matches
+ * one found in the temp array then it is ignored.
+ * @param array An array
+ * @returns {*} A de-duplicated array.
+ */
+cnvrHelper.deduplicateArray = function(array) {
+  if (!array || !Array.isArray(array)) {
+    return array;
+  }
+
+  const tmpArray = [];
+  return array.filter(function (tmpObj) {
+    if (tmpArray.indexOf(JSON.stringify(tmpObj)) < 0) {
+      tmpArray.push(JSON.stringify(tmpObj));
+      return tmpObj;
+    }
+  });
+};
+
+/**
+ * Generic method to look at each key/value pair of a cache object and looks at the 'timeReceived' key, if more than
+ * the max wait time has passed then just delete the key.
+ * @param cacheObj one of our cache objects [adIdLookup or timeoutCache]
+ * @param currTime the current timestamp at the start of the most recent timer execution.
+ */
+cnvrHelper.cleanCache = function(cacheObj, currTime) {
+  Object.keys(cacheObj).forEach(key => {
+    const timeInCache = currTime - cacheObj[key].timeReceived;
+    if (timeInCache >= CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE) {
+      delete cacheObj[key];
+    }
+  });
+};
+
+/**
+ * Helper to create an object lookup key for our timeoutCache
+ * @param auctionId id of the auction
+ * @param adUnitCode ad unit code
+ * @param bidderCode bidder code
+ * @returns string concatenation of all the params into a string key for timeoutCache
+ */
+cnvrHelper.getLookupKey = function(auctionId, adUnitCode, bidderCode) {
+  return auctionId + '-' + adUnitCode + '-' + bidderCode;
+};
+
+/**
+ * Creates our root payload object that gets sent back to the server
+ * @param payloadType string type of payload (AUCTION_END, BID_WON, RENDER_FAILED)
+ * @param auctionId id for the auction
+ * @param timestamp timestamp in milliseconds of auction start time.
+ * @returns
+ *  {{
+ *    requestType: *,
+ *    adUnits: {},
+ *    auction: {
+ *      auctionId: *,
+ *      preBidVersion: *,
+ *      sid: *}
+ * }}  Basic structure of our object that we return to the server.
+ */
+cnvrHelper.createPayload = function(payloadType, auctionId, timestamp) {
+  return {
+    requestType: payloadType,
+    globalSampleRate: initOptions.global_sample_rate,
+    cnvrSampleRate: initOptions.cnvr_sample_rate,
+    auction: {
+      auctionId: auctionId,
+      preBidVersion: getGlobal().version,
+      sid: initOptions.site_id,
+      auctionTimestamp: timestamp
+    },
+    adUnits: {}
+  };
+};
+
+/**
+ * Helper to create an adSize object, if the value passed in is not an int then set it to -1
+ * @param width in pixels (must be an int)
+ * @param height in peixl (must be an int)
+ * @returns {{w: *, h: *}} a fully valid adSize object
+ */
+cnvrHelper.createAdSize = function(width, height) {
+  if (!isInteger(width)) {
+    width = -1;
+  }
+  if (!isInteger(height)) {
+    height = -1;
+  }
+  return {
+    'w': width,
+    'h': height
+  };
+};
+
+/**
+ * Helper to create the basic structure of our adUnit payload
+ * @returns {{sizes: [], bids: {}}} Basic adUnit payload structure as follows
+ */
+cnvrHelper.createAdUnit = function() {
+  return {
+    sizes: [],
+    mediaTypes: [],
+    bids: {}
+  };
+};
+
+/**
+ * Helper to create a basic bid payload object.
+ */
+cnvrHelper.createBid = function (eventCode, timeToRespond) {
+  return {
+    'eventCodes': [eventCode],
+    'timeToRespond': timeToRespond
+  };
+};
+
+/**
+ * Helper to get the sampling rates from an object and validate the result.
+ * @param parentObj Parent object that has the sampling property
+ * @param propNm Name of the sampling property
+ * @param defaultSampleRate A default value to apply if there is a problem
+ * @returns {number} returns a float number from 0 (always off) to 1 (always on)
+ */
+cnvrHelper.getSampleRate = function(parentObj, propNm, defaultSampleRate) {
+  let sampleRate = defaultSampleRate;
+  if (parentObj && typeof parentObj[propNm] !== 'undefined') {
+    sampleRate = parseFloat(parentObj[propNm]);
+    if (Number.isNaN(sampleRate) || sampleRate > 1) {
+      sampleRate = defaultSampleRate;
+    } else if (sampleRate < 0) {
+      sampleRate = 0;
+    }
+  }
+  return sampleRate;
+}
+
+/**
+ * Helper function to send data back to server.  Need to make sure we don't trigger a CORS preflight by not adding
+ * extra header params.
+ * @param payload our JSON payload from either AUCTION END, BID WIN, RENDER FAILED
+ */
+function sendData(payload) {
+  ajax(URL, function () {}, JSON.stringify(payload), {contentType: 'text/plain'});
+}
+
+// =============================== BOILERPLATE FOR PRE-BID ANALYTICS SETUP  ============================================
+// save the base class function
+conversantAnalytics.originEnableAnalytics = conversantAnalytics.enableAnalytics;
+conversantAnalytics.originDisableAnalytics = conversantAnalytics.disableAnalytics;
+
+// override enableAnalytics so we can get access to the config passed in from the page
+conversantAnalytics.enableAnalytics = function (config) {
+  if (!config || !config.options || !config.options.site_id) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'siteId is required.');
+    return;
+  }
+
+  cacheCleanupInterval = setInterval(
+    function() {
+      const currTime = Date.now();
+      cnvrHelper.cleanCache(cnvrHelper.adIdLookup, currTime);
+      cnvrHelper.cleanCache(cnvrHelper.timeoutCache, currTime);
+      cnvrHelper.cleanCache(cnvrHelper.auctionIdTimestampCache, currTime);
+    },
+    CNVR_CONSTANTS.CACHE_CLEANUP_TIME_IN_MILLIS
+  );
+
+  Object.assign(initOptions, config.options);
+
+  initOptions.global_sample_rate = cnvrHelper.getSampleRate(initOptions, 'sampling', 1);
+  initOptions.cnvr_sample_rate = cnvrHelper.getSampleRate(initOptions, 'cnvr_sampling', CNVR_CONSTANTS.DEFAULT_SAMPLE_RATE);
+
+  logInfo(CNVR_CONSTANTS.LOG_PREFIX + 'Conversant sample rate set to ' + initOptions.cnvr_sample_rate);
+  logInfo(CNVR_CONSTANTS.LOG_PREFIX + 'Global sample rate set to ' + initOptions.global_sample_rate);
+  // Math.random() pseudo-random number in the range 0 to less than 1 (inclusive of 0, but not 1)
+  cnvrHelper.doSample = Math.random() < initOptions.cnvr_sample_rate;
+
+  conversantAnalyticsEnabled = true;
+  conversantAnalytics.originEnableAnalytics(config); // call the base class function
+};
+
+/**
+ * Cleanup code for any timers and caches.
+ */
+conversantAnalytics.disableAnalytics = function () {
+  if (!conversantAnalyticsEnabled) {
+    return;
+  }
+
+  // Cleanup our caches and disable our timer
+  clearInterval(cacheCleanupInterval);
+  cnvrHelper.timeoutCache = {};
+  cnvrHelper.adIdLookup = {};
+  cnvrHelper.auctionIdTimestampCache = {};
+
+  conversantAnalyticsEnabled = false;
+  conversantAnalytics.originDisableAnalytics();
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: conversantAnalytics,
+  code: ANALYTICS_CODE,
+  gvlid: GVLID
+});
+
+export default conversantAnalytics;
diff --git a/modules/conversantAnalyticsAdapter.md b/modules/conversantAnalyticsAdapter.md
new file mode 100644
index 00000000000..2f026cbcbb9
--- /dev/null
+++ b/modules/conversantAnalyticsAdapter.md
@@ -0,0 +1,46 @@
+# Overview
+- Module Name: Epsilon Analytics Adapter
+- Module Type: Analytics Adapter
+- Maintainer: mediapsr@epsilon.com
+
+## Description
+
+Analytics adapter for Epsilon (formerly Conversant) is used to track performance of Prebid auctions.  See the usage below for how to 
+configure the adapter for your webpage. To enable analytics and gain access to the data publishers will need
+ to contact their Epsilon representative (publishersupport@epsilon.com).
+
+## Setup
+
+Before any analytics are recorded for your website you will need to have an Epsilon representative turn
+on Prebid analytics for your website.  
+
+The simplest configuration to add Epsilon Prebid analytics to your page is as follows:
+
+```
+    pbjs.que.push(function() {
+        pbjs.enableAnalytics({
+            provider: 'conversant',
+            options: {
+                site_id: <YOUR_SITE_ID>
+            }
+        })
+    });
+```
+
+Additionally, the following options are supported:
+
+- **cnvr_sampling**: Sample rate for analytics data. Value should be between 0 and 1 (inclusive), 0 == never sample, 
+1 == always sample, 0.5 == send analytics 50% of the time.
+
+### Complete Example
+```
+    pbjs.que.push(function() {
+        pbjs.enableAnalytics({
+            provider: 'conversant',
+            options: {
+                site_id: 1234,
+                cnvr_sampling: 0.9
+            }
+        })
+    });
+```
diff --git a/modules/conversantBidAdapter.js b/modules/conversantBidAdapter.js
index 3b3d04dc498..41a8200c6ea 100644
--- a/modules/conversantBidAdapter.js
+++ b/modules/conversantBidAdapter.js
@@ -1,12 +1,12 @@
-import * as utils from '../src/utils.js';
+import { logWarn, isStr, deepAccess, isArray, getBidIdParameter, deepSetValue, isEmpty, _each, convertTypes, parseUrl, mergeDeep, buildUrl, _map, logError, isFn, isPlainObject } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
 
 const GVLID = 24;
-export const storage = getStorageManager(GVLID);
 
 const BIDDER_CODE = 'conversant';
+export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 const URL = 'https://web.hb.ad.cpe.dotomi.com/cvx/client/hb/ortb/25';
 
 export const spec = {
@@ -23,21 +23,22 @@ export const spec = {
    */
   isBidRequestValid: function(bid) {
     if (!bid || !bid.params) {
-      utils.logWarn(BIDDER_CODE + ': Missing bid parameters');
+      logWarn(BIDDER_CODE + ': Missing bid parameters');
       return false;
     }
 
-    if (!utils.isStr(bid.params.site_id)) {
-      utils.logWarn(BIDDER_CODE + ': site_id must be specified as a string');
+    if (!isStr(bid.params.site_id)) {
+      logWarn(BIDDER_CODE + ': site_id must be specified as a string');
       return false;
     }
 
     if (isVideoRequest(bid)) {
-      if (!bid.params.mimes) {
+      const mimes = bid.params.mimes || deepAccess(bid, 'mediaTypes.video.mimes');
+      if (!mimes) {
         // Give a warning but let it pass
-        utils.logWarn(BIDDER_CODE + ': mimes should be specified for videos');
-      } else if (!utils.isArray(bid.params.mimes) || !bid.params.mimes.every(s => utils.isStr(s))) {
-        utils.logWarn(BIDDER_CODE + ': mimes must be an array of strings');
+        logWarn(BIDDER_CODE + ': mimes should be specified for videos');
+      } else if (!isArray(mimes) || !mimes.every(s => isStr(s))) {
+        logWarn(BIDDER_CODE + ': mimes must be an array of strings');
         return false;
       }
     }
@@ -53,7 +54,7 @@ export const spec = {
    * @return {ServerRequest} Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
-    const page = (bidderRequest && bidderRequest.refererInfo) ? bidderRequest.refererInfo.referer : '';
+    const page = (bidderRequest && bidderRequest.refererInfo) ? bidderRequest.refererInfo.page : '';
     let siteId = '';
     let requestId = '';
     let pubcid = null;
@@ -61,10 +62,10 @@ export const spec = {
     let bidurl = URL;
 
     const conversantImps = validBidRequests.map(function(bid) {
-      const bidfloor = utils.getBidIdParameter('bidfloor', bid.params);
+      const bidfloor = getBidFloor(bid);
 
-      siteId = utils.getBidIdParameter('site_id', bid.params) || siteId;
-      pubcidName = utils.getBidIdParameter('pubcid_name', bid.params) || pubcidName;
+      siteId = getBidIdParameter('site_id', bid.params) || siteId;
+      pubcidName = getBidIdParameter('pubcid_name', bid.params) || pubcidName;
 
       requestId = bid.auctionId;
 
@@ -75,11 +76,14 @@ export const spec = {
         displaymanager: 'Prebid.js',
         displaymanagerver: '$prebid.version$'
       };
+      if (bid.ortb2Imp) {
+        mergeDeep(imp, bid.ortb2Imp);
+      }
 
       copyOptProperty(bid.params.tag_id, imp, 'tagid');
 
       if (isVideoRequest(bid)) {
-        const videoData = utils.deepAccess(bid, 'mediaTypes.video') || {};
+        const videoData = deepAccess(bid, 'mediaTypes.video') || {};
         const format = convertSizes(videoData.playerSize || bid.sizes);
         const video = {};
 
@@ -88,19 +92,19 @@ export const spec = {
           copyOptProperty(format[0].h, video, 'h');
         }
 
-        copyOptProperty(bid.params.position, video, 'pos');
+        copyOptProperty(bid.params.position || videoData.pos, video, 'pos');
         copyOptProperty(bid.params.mimes || videoData.mimes, video, 'mimes');
-        copyOptProperty(bid.params.maxduration, video, 'maxduration');
+        copyOptProperty(bid.params.maxduration || videoData.maxduration, video, 'maxduration');
         copyOptProperty(bid.params.protocols || videoData.protocols, video, 'protocols');
         copyOptProperty(bid.params.api || videoData.api, video, 'api');
 
         imp.video = video;
       } else {
-        const bannerData = utils.deepAccess(bid, 'mediaTypes.banner') || {};
+        const bannerData = deepAccess(bid, 'mediaTypes.banner') || {};
         const format = convertSizes(bannerData.sizes || bid.sizes);
         const banner = {format: format};
 
-        copyOptProperty(bid.params.position, banner, 'pos');
+        copyOptProperty(bid.params.position || bannerData.pos, banner, 'pos');
 
         imp.banner = banner;
       }
@@ -131,18 +135,24 @@ export const spec = {
 
     let userExt = {};
 
+    // pass schain object if it is present
+    const schain = deepAccess(validBidRequests, '0.schain');
+    if (schain) {
+      deepSetValue(payload, 'source.ext.schain', schain);
+    }
+
     if (bidderRequest) {
       // Add GDPR flag and consent string
       if (bidderRequest.gdprConsent) {
         userExt.consent = bidderRequest.gdprConsent.consentString;
 
         if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') {
-          utils.deepSetValue(payload, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
+          deepSetValue(payload, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
         }
       }
 
       if (bidderRequest.uspConsent) {
-        utils.deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+        deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
       }
     }
 
@@ -162,10 +172,13 @@ export const spec = {
     }
 
     // Only add the user object if it's not empty
-    if (!utils.isEmpty(userExt)) {
+    if (!isEmpty(userExt)) {
       payload.user = {ext: userExt};
     }
 
+    const firstPartyData = bidderRequest.ortb2 || {};
+    mergeDeep(payload, firstPartyData);
+
     return {
       method: 'POST',
       url: bidurl,
@@ -185,12 +198,12 @@ export const spec = {
     serverResponse = serverResponse.body;
 
     if (bidRequest && bidRequest.data && bidRequest.data.imp) {
-      utils._each(bidRequest.data.imp, imp => requestMap[imp.id] = imp);
+      _each(bidRequest.data.imp, imp => requestMap[imp.id] = imp);
     }
 
-    if (serverResponse && utils.isArray(serverResponse.seatbid)) {
-      utils._each(serverResponse.seatbid, function(bidList) {
-        utils._each(bidList.bid, function(conversantBid) {
+    if (serverResponse && isArray(serverResponse.seatbid)) {
+      _each(serverResponse.seatbid, function(bidList) {
+        _each(bidList.bid, function(conversantBid) {
           const responseCPM = parseFloat(conversantBid.price);
           if (responseCPM > 0.0 && conversantBid.impid) {
             const responseAd = conversantBid.adm || '';
@@ -205,6 +218,10 @@ export const spec = {
               ttl: 300,
               netRevenue: true
             };
+            bid.meta = {};
+            if (conversantBid.adomain && conversantBid.adomain.length > 0) {
+              bid.meta.advertiserDomains = conversantBid.adomain;
+            }
 
             if (request.video) {
               if (responseAd.charAt(0) === '<') {
@@ -238,11 +255,53 @@ export const spec = {
    * @return {Object} params bid params
    */
   transformBidParams: function(params, isOpenRtb) {
-    return utils.convertTypes({
+    return convertTypes({
       'site_id': 'string',
       'secure': 'number',
       'mobile': 'number'
     }, params);
+  },
+
+  /**
+   * Register User Sync.
+   */
+  getUserSyncs: function(syncOptions, responses, gdprConsent, uspConsent) {
+    let params = {};
+    const syncs = [];
+
+    // Attaching GDPR Consent Params in UserSync url
+    if (gdprConsent) {
+      params.gdpr = (gdprConsent.gdprApplies) ? 1 : 0;
+      params.gdpr_consent = encodeURIComponent(gdprConsent.consentString || '');
+    }
+
+    // CCPA
+    if (uspConsent) {
+      params.us_privacy = encodeURIComponent(uspConsent);
+    }
+
+    if (responses && responses.ext) {
+      const pixels = [{urls: responses.ext.fsyncs, type: 'iframe'}, {urls: responses.ext.psyncs, type: 'image'}]
+        .filter((entry) => {
+          return entry.urls &&
+            ((entry.type === 'iframe' && syncOptions.iframeEnabled) ||
+            (entry.type === 'image' && syncOptions.pixelEnabled));
+        })
+        .map((entry) => {
+          return entry.urls.map((endpoint) => {
+            let urlInfo = parseUrl(endpoint);
+            mergeDeep(urlInfo.search, params);
+            if (Object.keys(urlInfo.search).length === 0) {
+              delete urlInfo.search; // empty search object causes buildUrl to add a trailing ? to the url
+            }
+            return {type: entry.type, url: buildUrl(urlInfo)};
+          })
+            .reduce((x, y) => x.concat(y), []);
+        })
+        .reduce((x, y) => x.concat(y), []);
+      syncs.push(...pixels);
+    }
+    return syncs;
   }
 };
 
@@ -286,7 +345,7 @@ function convertSizes(bidSizes) {
     if (bidSizes.length === 2 && typeof bidSizes[0] === 'number' && typeof bidSizes[1] === 'number') {
       format = [{w: bidSizes[0], h: bidSizes[1]}];
     } else {
-      format = utils._map(bidSizes, d => { return {w: d[0], h: d[1]}; });
+      format = _map(bidSizes, d => { return {w: d[0], h: d[1]}; });
     }
   }
 
@@ -300,7 +359,7 @@ function convertSizes(bidSizes) {
  * @returns {boolean} True if it's a video bid
  */
 function isVideoRequest(bid) {
-  return bid.mediaType === 'video' || !!utils.deepAccess(bid, 'mediaTypes.video');
+  return bid.mediaType === 'video' || !!deepAccess(bid, 'mediaTypes.video');
 }
 
 /**
@@ -323,15 +382,15 @@ function copyOptProperty(src, dst, dstName) {
 function collectEids(bidRequests) {
   const request = bidRequests[0]; // bidRequests have the same userId object
   const eids = [];
-  if (utils.isArray(request.userIdAsEids) && request.userIdAsEids.length > 0) {
+  if (isArray(request.userIdAsEids) && request.userIdAsEids.length > 0) {
     // later following white-list can be converted to block-list if needed
     const requiredSourceValues = {
+      'epsilon.com': 1,
       'adserver.org': 1,
       'liveramp.com': 1,
       'criteo.com': 1,
       'id5-sync.com': 1,
       'parrable.com': 1,
-      'digitru.st': 1,
       'liveintent.com': 1
     };
     request.userIdAsEids.forEach(function(eid) {
@@ -364,14 +423,38 @@ function readStoredValue(key) {
     }
 
     // deserialize JSON if needed
-    if (utils.isStr(storedValue) && storedValue.charAt(0) === '{') {
+    if (isStr(storedValue) && storedValue.charAt(0) === '{') {
       storedValue = JSON.parse(storedValue);
     }
   } catch (e) {
-    utils.logError(e);
+    logError(e);
   }
 
   return storedValue;
 }
 
+/**
+ * Get the floor price from bid.params for backward compatibility.
+ * If not found, then check floor module.
+ * @param bid A valid bid object
+ * @returns {*|number} floor price
+ */
+function getBidFloor(bid) {
+  let floor = getBidIdParameter('bidfloor', bid.params);
+
+  if (!floor && isFn(bid.getFloor)) {
+    const floorObj = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (isPlainObject(floorObj) && !isNaN(floorObj.floor) && floorObj.currency === 'USD') {
+      floor = floorObj.floor;
+    }
+  }
+
+  return floor
+}
+
 registerBidder(spec);
diff --git a/modules/conversantBidAdapter.md b/modules/conversantBidAdapter.md
index fba793adad2..baf8b756aca 100644
--- a/modules/conversantBidAdapter.md
+++ b/modules/conversantBidAdapter.md
@@ -1,12 +1,12 @@
 # Overview
 
-- Module Name: Conversant Bidder Adapter
+- Module Name: Epsilon Bidder Adapter
 - Module Type: Bidder Adapter
-- Maintainer: mediapsr@conversantmedia.com
+- Maintainer: mediapsr@epsilon.com
 
 # Description
 
-Module that connects to Conversant's demand sources.  Supports banners and videos.
+Module that connects to Epsilon's (formerly Conversant) demand sources.  Supports banners and videos.
 
 # Test Parameters
 ```
@@ -29,17 +29,17 @@ var adUnits = [
         mediaTypes: {
             video: {
                 context: 'instream',
-                playerSize: [640, 480]
+                playerSize: [640, 480],
+                api: [2],
+                protocols: [1, 2],
+                mimes: ['video/mp4']
             }
         },
         bids: [{
             bidder: "conversant",
             params: {
                 site_id: '108060',
-                api: [2],
-                protocols: [1, 2],
-                white_label_url: 'https://web.hb.ad.cpe.dotomi.com/s2s/header/24',
-                mimes: ['video/mp4']
+                white_label_url: 'https://web.hb.ad.cpe.dotomi.com/s2s/header/24'
             }
         }]
     }];
diff --git a/modules/cosmosBidAdapter.js b/modules/cosmosBidAdapter.js
deleted file mode 100644
index 73ee5c223b3..00000000000
--- a/modules/cosmosBidAdapter.js
+++ /dev/null
@@ -1,392 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-
-const BIDDER_CODE = 'cosmos';
-const BID_ENDPOINT = 'https://bid.cosmoshq.com/openrtb2/bids';
-const USER_SYNC_ENDPOINT = 'https://sync.cosmoshq.com/js/v1/usersync.html';
-const HTTP_POST = 'POST';
-const LOG_PREFIX = 'COSMOS: ';
-const DEFAULT_CURRENCY = 'USD';
-const HTTPS = 'https:';
-const MEDIA_TYPES = 'mediaTypes';
-const MIMES = 'mimes';
-const DEFAULT_NET_REVENUE = false;
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
-
-  /**
-   * generate UUID
-   **/
-  _createUUID: function () {
-    return ('' + new Date().getTime());
-  },
-
-  /**
-   * copy object if not null
-   **/
-  _copyObject: function (src, dst) {
-    if (src) {
-      // copy complete object
-      Object.keys(src).forEach(param => dst[param] = src[param]);
-    }
-  },
-
-  /**
-   * parse object
-   **/
-  _parse: function (rawPayload) {
-    try {
-      if (rawPayload) {
-        return JSON.parse(rawPayload);
-      }
-    } catch (ex) {
-      utils.logError(LOG_PREFIX, 'Exception: ', ex);
-    }
-    return null;
-  },
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   **/
-  isBidRequestValid: function (bid) {
-    if (!bid || !bid.params) {
-      utils.logError(LOG_PREFIX, 'nil/empty bid object');
-      return false;
-    }
-
-    if (!utils.isEmpty(bid.params.publisherId) ||
-      !utils.isNumber(bid.params.publisherId)) {
-      utils.logError(LOG_PREFIX, 'publisherId is mandatory and must be numeric. Ad Unit: ', JSON.stringify(bid));
-      return false;
-    }
-    // video bid request validation
-    if (bid.hasOwnProperty(MEDIA_TYPES) && bid.mediaTypes.hasOwnProperty(VIDEO)) {
-      if (!bid.mediaTypes.video.hasOwnProperty(MIMES) ||
-        !utils.isArray(bid.mediaTypes.video.mimes) ||
-        bid.mediaTypes.video.mimes.length === 0) {
-        utils.logError(LOG_PREFIX, 'mimes are mandatory for video bid request. Ad Unit: ', JSON.stringify(bid));
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   **/
-  buildRequests: function (validBidRequests, bidderRequest) {
-    if (validBidRequests.length === 0) {
-      return [];
-    }
-
-    var refererInfo;
-    if (bidderRequest && bidderRequest.refererInfo) {
-      refererInfo = bidderRequest.refererInfo;
-    }
-
-    let clonedBidRequests = utils.deepClone(validBidRequests);
-    return clonedBidRequests.map(bidRequest => {
-      const oRequest = spec._createRequest(bidRequest, refererInfo);
-      if (oRequest) {
-        spec._setGDPRParams(bidderRequest, oRequest);
-        return {
-          method: HTTP_POST,
-          url: BID_ENDPOINT,
-          data: JSON.stringify(oRequest)
-        };
-      }
-    });
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {ServerResponse} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   **/
-  interpretResponse: function (serverResponse, request) {
-    let response = serverResponse.body;
-    var bidResponses = [];
-    try {
-      if (response.seatbid) {
-        var currency = response.cur ? response.cur : DEFAULT_CURRENCY;
-        response.seatbid.forEach(seatbid => {
-          var bids = seatbid.bid ? seatbid.bid : [];
-          bids.forEach(bid => {
-            var bidResponse = {
-              requestId: bid.impid,
-              cpm: (parseFloat(bid.price) || 0).toFixed(2),
-              width: bid.w,
-              height: bid.h,
-              creativeId: bid.crid,
-              currency: currency,
-              netRevenue: DEFAULT_NET_REVENUE,
-              ttl: 300
-            };
-            if (bid.dealid) {
-              bidResponse.dealId = bid.dealid;
-            }
-
-            var req = spec._parse(request.data);
-            if (req.imp && req.imp.length > 0) {
-              req.imp.forEach(impr => {
-                if (impr.id === bid.impid) {
-                  if (impr.banner) {
-                    bidResponse.ad = bid.adm;
-                    bidResponse.mediaType = BANNER;
-                  } else {
-                    bidResponse.width = bid.hasOwnProperty('w') ? bid.w : impr.video.w;
-                    bidResponse.height = bid.hasOwnProperty('h') ? bid.h : impr.video.h;
-                    bidResponse.vastXml = bid.adm;
-                    bidResponse.mediaType = VIDEO;
-                  }
-                }
-              });
-            }
-            bidResponses.push(bidResponse);
-          });
-        });
-      }
-    } catch (ex) {
-      utils.logError(LOG_PREFIX, 'Exception: ', ex);
-    }
-    return bidResponses;
-  },
-
-  /**
-   * Register the user sync pixels which should be dropped after the auction.
-   * @param {SyncOptions} syncOptions Which user syncs are allowed?
-   * @param {ServerResponse[]} serverResponses List of server's responses.
-   * @return {UserSync[]} The user syncs which should be dropped.
-   **/
-  getUserSyncs: function (syncOptions, serverResponses) {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: USER_SYNC_ENDPOINT
-      }];
-    } else {
-      utils.logWarn(LOG_PREFIX + 'Please enable iframe based user sync.');
-    }
-  },
-
-  /**
-   * create IAB standard OpenRTB bid request
-   **/
-  _createRequest: function (bidRequests, refererInfo) {
-    var oRequest = {};
-    try {
-      oRequest = {
-        id: spec._createUUID(),
-        imp: spec._createImpressions(bidRequests),
-        user: {},
-        ext: {}
-      };
-      var site = spec._createSite(bidRequests, refererInfo);
-      var app = spec._createApp(bidRequests);
-      var device = spec._createDevice(bidRequests);
-      if (app) {
-        oRequest.app = app;
-      }
-      if (site) {
-        oRequest.site = site;
-      }
-      if (device) {
-        oRequest.device = device;
-      }
-    } catch (ex) {
-      utils.logError(LOG_PREFIX, 'Exception: ', ex);
-      oRequest = null;
-    }
-    return oRequest;
-  },
-
-  /**
-   * create impression array objects
-   **/
-  _createImpressions: function (request) {
-    var impressions = [];
-    var impression = spec._creatImpression(request);
-    if (impression) {
-      impressions.push(impression);
-    }
-    return impressions;
-  },
-
-  /**
-   * create impression (single) object
-   **/
-  _creatImpression: function (request) {
-    if (!request.hasOwnProperty(MEDIA_TYPES)) {
-      return undefined;
-    }
-
-    var params = request && request.params ? request.params : null;
-    var impression = {
-      id: request.bidId ? request.bidId : spec._createUUID(),
-      secure: window.location.protocol === HTTPS ? 1 : 0,
-      bidfloorcur: request.params.currency ? request.params.currency : DEFAULT_CURRENCY
-    };
-    if (params.bidFloor) {
-      impression.bidfloor = params.bidFloor;
-    }
-
-    if (params.tagId) {
-      impression.tagid = params.tagId.toString();
-    }
-
-    var banner;
-    var video;
-    var mediaType;
-    for (mediaType in request.mediaTypes) {
-      switch (mediaType) {
-        case BANNER:
-          banner = spec._createBanner(request);
-          if (banner) {
-            impression.banner = banner;
-          }
-          break;
-        case VIDEO:
-          video = spec._createVideo(request);
-          if (video) {
-            impression.video = video;
-          }
-          break;
-      }
-    }
-
-    return impression.hasOwnProperty(BANNER) ||
-      impression.hasOwnProperty(VIDEO) ? impression : undefined;
-  },
-
-  /**
-   * create the banner object
-   **/
-  _createBanner: function (request) {
-    if (utils.deepAccess(request, 'mediaTypes.banner')) {
-      var banner = {};
-      var sizes = request.mediaTypes.banner.sizes;
-      if (sizes && utils.isArray(sizes) && sizes.length > 0) {
-        var format = [];
-        banner.w = sizes[0][0];
-        banner.h = sizes[0][1];
-        sizes.forEach(size => {
-          format.push({
-            w: size[0],
-            h: size[1]
-          });
-        });
-        banner.format = format;
-      }
-
-      spec._copyObject(request.mediaTypes.banner, banner);
-      spec._copyObject(request.params.banner, banner);
-      return banner;
-    }
-    return undefined;
-  },
-
-  /**
-   * create video object
-   **/
-  _createVideo: function (request) {
-    if (utils.deepAccess(request, 'mediaTypes.video')) {
-      var video = {};
-      var sizes = request.mediaTypes.video.playerSize;
-      if (sizes && utils.isArray(sizes) && sizes.length > 1) {
-        video.w = sizes[0];
-        video.h = sizes[1];
-      }
-      spec._copyObject(request.mediaTypes.video, video);
-      spec._copyObject(request.params.video, video);
-      return video;
-    }
-    return undefined;
-  },
-
-  /**
-   * create site object
-   **/
-  _createSite: function (request, refererInfo) {
-    var rSite = request.params.site;
-    if (rSite || !request.params.app) {
-      var site = {};
-      spec._copyObject(rSite, site);
-
-      if (refererInfo) {
-        if (refererInfo.referer) {
-          site.ref = encodeURIComponent(refererInfo.referer);
-        }
-        if (utils.isArray(refererInfo.stack) && refererInfo.stack.length > 0) {
-          site.page = encodeURIComponent(refererInfo.stack[0]);
-          let anchrTag = document.createElement('a');
-          anchrTag.href = site.page;
-          site.domain = anchrTag.hostname;
-        }
-      }
-
-      // override publisher object
-      site.publisher = {
-        id: request.params.publisherId.toString()
-      };
-      return site;
-    }
-    return undefined;
-  },
-
-  /**
-   * create app object
-   **/
-  _createApp: function (request) {
-    var rApp = request.params.app;
-    if (rApp) {
-      var app = {};
-      spec._copyObject(rApp, app);
-      // override publisher object
-      app.publisher = {
-        id: request.params.publisherId.toString()
-      };
-      return app;
-    }
-    return undefined;
-  },
-
-  /**
-   * create device obejct
-   **/
-  _createDevice: function (request) {
-    var device = {};
-    var rDevice = request.params.device;
-    spec._copyObject(rDevice, device);
-    device.dnt = utils.getDNT() ? 1 : 0;
-    device.ua = navigator.userAgent;
-    device.language = (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage);
-    device.w = (window.screen.width || window.innerWidth);
-    device.h = (window.screen.height || window.innerHeigh);
-    return device;
-  },
-
-  /**
-   * set GDPR parameters
-   **/
-  _setGDPRParams: function (bidderRequest, oRequest) {
-    if (!bidderRequest || !bidderRequest.gdprConsent) {
-      return;
-    }
-
-    oRequest.regs = { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0 } };
-    oRequest.user = { ext: { consent: bidderRequest.gdprConsent.consentString } };
-  },
-
-}
-registerBidder(spec);
diff --git a/modules/cosmosBidAdapter.md b/modules/cosmosBidAdapter.md
deleted file mode 100644
index 187a19ba17a..00000000000
--- a/modules/cosmosBidAdapter.md
+++ /dev/null
@@ -1,80 +0,0 @@
-# Overview
-
-```
-Module Name:  Cosmos Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer:   dev@cosmoshq.com
-```
-
-# Description
-
-Module that connects to Cosmos server for bids.
-Supported Ad Fortmats:
-* Banner
-* Video
-
-# Configuration
-## Following configuration required for enabling user sync.
-```javascript
-pbjs.setConfig({
-   userSync: {
-    iframeEnabled: true,
-    enabledBidders: ['cosmos'],
-    syncDelay: 6000
- }});
-```
-## For Video ads, enable prebid cache
-```javascript
-pbjs.setConfig({
-    cache: {
-        url: 'https://prebid.adnxs.com/pbc/v1/cache'
-    }
-});
-```
-
-# Test Parameters
-```
-    var adUnits = [
-           // Banner adUnit
-           {
-               code: 'banner-div',
-               mediaTypes: {
-                   banner: { //supported as per the openRTB spec
-                       sizes: [[300, 250]]                            // required
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "cosmos",
-                       params: {
-                           publisherId: 1001, // required
-                           tagId: 1           // optional
-                       }
-                   }
-               ]
-           },
-           // Video adUnit
-           {
-               code: 'video-div',
-               mediaTypes: {
-                   video: { // supported as per the openRTB spec
-                       sizes: [[300, 50]],                              // required
-					  mimes : ['video/mp4', 'application/javascript'],   // required
-                       context: 'instream'                              // optional
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "cosmos",
-                       params: {
-                           publisherId: 1001, // required
-                           tagId: 1,          // optional
-                           video: {           // supported as per the openRTB spec
-                               
-                           }
-                       }
-                   }
-               ]
-           }
-       ];
-```
diff --git a/modules/cpexIdSystem.js b/modules/cpexIdSystem.js
new file mode 100644
index 00000000000..5c2e6bc212d
--- /dev/null
+++ b/modules/cpexIdSystem.js
@@ -0,0 +1,47 @@
+/**
+ * This module adds 'caid' to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/cpexIdSystem
+ * @requires module:modules/userId
+ */
+
+import { submodule } from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js'
+
+// Returns StorageManager
+export const storage = getStorageManager({ gvlid: 570, moduleName: 'cpexId' })
+
+// Returns the id string from either cookie or localstorage
+const readId = () => { return storage.getCookie('czaid') || storage.getDataFromLocalStorage('czaid') }
+
+/** @type {Submodule} */
+export const cpexIdSubmodule = {
+  version: '0.0.5',
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'cpexId',
+  /**
+   * Vendor ID of Czech Publisher Exchange
+   * @type {Number}
+   */
+  gvlid: 570,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function decode
+   * @returns {(Object|undefined)}
+   */
+  decode () { return { cpexId: readId() } },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @returns {IdResponse|undefined}
+   */
+  getId () {
+    const id = readId()
+    return id ? { id: id } : undefined
+  }
+}
+
+submodule('userId', cpexIdSubmodule)
diff --git a/modules/cpexIdSystem.md b/modules/cpexIdSystem.md
new file mode 100644
index 00000000000..8aceb7fe4ec
--- /dev/null
+++ b/modules/cpexIdSystem.md
@@ -0,0 +1,27 @@
+## CPEx User ID Submodule
+
+CPExID is provided by [Czech Publisher Exchange](https://www.cpex.cz/), or CPEx. It is a user ID for ad targeting by using first party cookie, or localStorage mechanism. Please contact CPEx before using this ID.
+
+## Building Prebid with CPExID Support
+
+First, make sure to add the cpexId to your Prebid.js package with:
+
+```
+gulp build --modules=cpexIdSystem
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'cpexId'
+        }]
+    }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module. | `"cpexId"` |
diff --git a/modules/cpmstarBidAdapter.js b/modules/cpmstarBidAdapter.js
index b416c00c2d0..9e237ef2558 100755
--- a/modules/cpmstarBidAdapter.js
+++ b/modules/cpmstarBidAdapter.js
@@ -13,6 +13,12 @@ const ENDPOINT_PRODUCTION = 'https://server.cpmstar.com/view.aspx';
 const DEFAULT_TTL = 300;
 const DEFAULT_CURRENCY = 'USD';
 
+function fixedEncodeURIComponent(str) {
+  return encodeURIComponent(str).replace(/[!'()*]/g, function(c) {
+    return '%' + c.charCodeAt(0).toString(16);
+  });
+}
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
@@ -41,19 +47,36 @@ export const spec = {
 
     for (var i = 0; i < validBidRequests.length; i++) {
       var bidRequest = validBidRequests[i];
-      var referer = encodeURIComponent(bidderRequest.refererInfo.referer);
+      var referer = bidderRequest.refererInfo.page ? bidderRequest.refererInfo.page : bidderRequest.refererInfo.domain;
+      referer = encodeURIComponent(referer);
       var e = utils.getBidIdParameter('endpoint', bidRequest.params);
       var ENDPOINT = e == 'dev' ? ENDPOINT_DEV : e == 'staging' ? ENDPOINT_STAGING : ENDPOINT_PRODUCTION;
       var mediaType = spec.getMediaType(bidRequest);
       var playerSize = spec.getPlayerSize(bidRequest);
       var videoArgs = '&fv=0' + (playerSize ? ('&w=' + playerSize[0] + '&h=' + playerSize[1]) : '');
-
       var url = ENDPOINT + '?media=' + mediaType + (mediaType == VIDEO ? videoArgs : '') +
         '&json=c_b&mv=1&poolid=' + utils.getBidIdParameter('placementId', bidRequest.params) +
         '&reachedTop=' + encodeURIComponent(bidderRequest.refererInfo.reachedTop) +
         '&requestid=' + bidRequest.bidId +
         '&referer=' + encodeURIComponent(referer);
 
+      if (bidRequest.schain && bidRequest.schain.nodes) {
+        var schain = bidRequest.schain;
+        var schainString = '';
+        schainString += schain.ver + ',' + schain.complete;
+        for (var i2 = 0; i2 < schain.nodes.length; i2++) {
+          var node = schain.nodes[i2];
+          schainString += '!' +
+            fixedEncodeURIComponent(node.asi || '') + ',' +
+            fixedEncodeURIComponent(node.sid || '') + ',' +
+            fixedEncodeURIComponent(node.hp || '') + ',' +
+            fixedEncodeURIComponent(node.rid || '') + ',' +
+            fixedEncodeURIComponent(node.name || '') + ',' +
+            fixedEncodeURIComponent(node.domain || '');
+        }
+        url += '&schain=' + schainString;
+      }
+
       if (bidderRequest.gdprConsent) {
         if (bidderRequest.gdprConsent.consentString != null) {
           url += '&gdpr_consent=' + bidderRequest.gdprConsent.consentString;
@@ -71,10 +94,20 @@ export const spec = {
         url += '&tfcd=' + (config.getConfig('coppa') ? 1 : 0);
       }
 
+      let body = {};
+      let adUnitCode = bidRequest.adUnitCode;
+      if (adUnitCode) {
+        body.adUnitCode = adUnitCode;
+      }
+      if (mediaType == VIDEO) {
+        body.video = utils.deepAccess(bidRequest, 'mediaTypes.video');
+      }
+
       requests.push({
-        method: 'GET',
+        method: 'POST',
         url: url,
         bidRequest: bidRequest,
+        data: body
       });
     }
 
@@ -101,7 +134,7 @@ export const spec = {
       var cpm = (parseFloat(rawBid.cpm) || 0);
 
       if (!cpm) {
-        utils.logWarn('cpmstarBidAdapter: server response failed check. Missing cpm')
+        utils.logWarn('cpmstarBidAdapter: server response failed check. Missing cpm');
         return;
       }
 
@@ -114,10 +147,13 @@ export const spec = {
         netRevenue: rawBid.netRevenue ? rawBid.netRevenue : true,
         ttl: rawBid.ttl ? rawBid.ttl : DEFAULT_TTL,
         creativeId: rawBid.creativeid || 0,
+        meta: {
+          advertiserDomains: rawBid.adomain ? rawBid.adomain : []
+        }
       };
 
       if (rawBid.hasOwnProperty('dealId')) {
-        bidResponse.dealId = rawBid.dealId
+        bidResponse.dealId = rawBid.dealId;
       }
 
       if (mediaType == BANNER && rawBid.code) {
@@ -138,6 +174,21 @@ export const spec = {
     }
 
     return bidResponses;
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    if (serverResponses.length == 0 || !serverResponses[0].body) return syncs;
+    var usersyncs = serverResponses[0].body[0].syncs;
+    if (!usersyncs || usersyncs.length < 0) return syncs;
+    for (var i = 0; i < usersyncs.length; i++) {
+      var us = usersyncs[i];
+      if ((us.type === 'image' && syncOptions.pixelEnabled) || (us.type == 'iframe' && syncOptions.iframeEnabled)) {
+        syncs.push(us);
+      }
+    }
+    return syncs;
   }
+
 };
 registerBidder(spec);
diff --git a/modules/craftBidAdapter.js b/modules/craftBidAdapter.js
index 3838f5dee59..519c4dd9b6f 100644
--- a/modules/craftBidAdapter.js
+++ b/modules/craftBidAdapter.js
@@ -1,15 +1,25 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import { auctionManager } from '../src/auctionManager.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {
+  convertCamelToUnderscore,
+  convertTypes,
+  getBidRequest,
+  isArray,
+  isEmpty,
+  logError,
+  transformBidderParamKeywords
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {find, includes} from '../src/polyfill.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {ajax} from '../src/ajax.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'craft';
-const URL = 'https://gacraft.jp/prebid-v3';
+const URL_BASE = 'https://gacraft.jp/prebid-v3';
 const TTL = 360;
-const storage = getStorageManager();
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
@@ -21,6 +31,9 @@ export const spec = {
   },
 
   buildRequests: function(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const tags = bidRequests.map(bidToTag);
     const schain = bidRequests[0].schain;
     const payload = {
@@ -42,7 +55,8 @@ export const spec = {
     }
     if (bidderRequest && bidderRequest.refererInfo) {
       let refererinfo = {
-        rd_ref: bidderRequest.refererInfo.referer,
+        // TODO: this collects everything it finds, except for the canonical URL
+        rd_ref: bidderRequest.refererInfo.topmostLocation,
         rd_top: bidderRequest.refererInfo.reachedTop,
         rd_ifs: bidderRequest.refererInfo.numIframes,
       };
@@ -67,7 +81,7 @@ export const spec = {
         if (serverResponse.error) {
           errorMessage += `: ${serverResponse.error}`;
         }
-        utils.logError(errorMessage);
+        logError(errorMessage);
         return bids;
       }
       if (serverResponse.tags) {
@@ -89,17 +103,17 @@ export const spec = {
   },
 
   transformBidParams: function(params, isOpenRtb) {
-    params = utils.convertTypes({
+    params = convertTypes({
       'sitekey': 'string',
       'placementId': 'string',
-      'keywords': utils.transformBidderParamKeywords
+      'keywords': transformBidderParamKeywords
     }, params);
     if (isOpenRtb) {
       if (isPopulatedArray(params.keywords)) {
         params.keywords.forEach(deleteValues);
       }
       Object.keys(params).forEach(paramKey => {
-        let convertedKey = utils.convertCamelToUnderscore(paramKey);
+        let convertedKey = convertCamelToUnderscore(paramKey);
         if (convertedKey !== paramKey) {
           params[convertedKey] = params[paramKey];
           delete params[paramKey];
@@ -110,14 +124,15 @@ export const spec = {
   },
 
   onBidWon: function(bid) {
-    var xhr = new XMLHttpRequest();
-    xhr.open('POST', bid._prebidWon);
-    xhr.send();
+    ajax(bid._prebidWon, null, null, {
+      method: 'POST',
+      contentType: 'application/json'
+    });
   }
 };
 
 function isPopulatedArray(arr) {
-  return !!(utils.isArray(arr) && arr.length > 0);
+  return !!(isArray(arr) && arr.length > 0);
 }
 
 function deleteValues(keyPairObj) {
@@ -126,27 +141,18 @@ function deleteValues(keyPairObj) {
   }
 }
 
-function hasPurpose1Consent(bidderRequest) {
-  let result = true;
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    if (bidderRequest.gdprConsent.gdprApplies && bidderRequest.gdprConsent.apiVersion === 2) {
-      result = !!(utils.deepAccess(bidderRequest.gdprConsent, 'vendorData.purpose.consents.1') === true);
-    }
-  }
-  return result;
-}
-
 function formatRequest(payload, bidderRequest) {
   let options = {};
-  if (!hasPurpose1Consent(bidderRequest)) {
+  if (!hasPurpose1Consent(bidderRequest?.gdprConsent)) {
     options = {
       withCredentials: false
     };
   }
+
   const payloadString = JSON.stringify(payload);
   return {
     method: 'POST',
-    url: URL,
+    url: `${URL_BASE}/${payload.tags[0].sitekey}`,
     data: payloadString,
     bidderRequest,
     options
@@ -154,7 +160,7 @@ function formatRequest(payload, bidderRequest) {
 }
 
 function newBid(serverBid, rtbBid, bidderRequest) {
-  const bidRequest = utils.getBidRequest(serverBid.uuid, [bidderRequest]);
+  const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
   const bid = {
     requestId: serverBid.uuid,
     cpm: rtbBid.cpm,
@@ -189,8 +195,8 @@ function bidToTag(bid) {
   tag.primary_size = tag.sizes[0];
   tag.ad_types = [];
   tag.uuid = bid.bidId;
-  if (!utils.isEmpty(bid.params.keywords)) {
-    let keywords = utils.transformBidderParamKeywords(bid.params.keywords);
+  if (!isEmpty(bid.params.keywords)) {
+    let keywords = transformBidderParamKeywords(bid.params.keywords);
     if (keywords.length > 0) {
       keywords.forEach(deleteValues);
     }
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 3dabe911884..5567103db69 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -1,34 +1,145 @@
-import {loadExternalScript} from '../src/adloader.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
-import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-import find from 'core-js-pure/features/array/find.js';
-import { verify } from 'criteo-direct-rsa-validate/build/verify.js';
+import { deepAccess, isArray, logError, logInfo, logWarn, parseUrl } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { find } from '../src/polyfill.js';
+import { verify } from 'criteo-direct-rsa-validate/build/verify.js'; // ref#2
 import { getStorageManager } from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { hasPurpose1Consent } from '../src/utils/gpdr.js';
 
 const GVLID = 91;
-export const ADAPTER_VERSION = 32;
+export const ADAPTER_VERSION = 34;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = 'https://bidder.criteo.com/cdb';
 const PROFILE_ID_INLINE = 207;
 export const PROFILE_ID_PUBLISHERTAG = 185;
-const storage = getStorageManager(GVLID);
+export const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE });
 const LOG_PREFIX = 'Criteo: ';
 
-// Unminified source code can be found in: https://github.com/Prebid-org/prebid-js-external-js-criteo/blob/master/dist/prod.js
-const PUBLISHER_TAG_URL = 'https://static.criteo.net/js/ld/publishertag.prebid.js';
-
+/*
+  If you don't want to use the FastBid adapter feature, you can lighten criteoBidAdapter size by :
+  1. commenting the tryGetCriteoFastBid function inner content (see ref#1)
+  2. removing the line 'verify' function import line (see ref#2)
+
+  Unminified source code can be found in the privately shared repo: https://github.com/Prebid-org/prebid-js-external-js-criteo/blob/master/dist/prod.js
+*/
+const FAST_BID_VERSION_PLACEHOLDER = '%FAST_BID_VERSION%';
+export const FAST_BID_VERSION_CURRENT = 132;
+const FAST_BID_VERSION_LATEST = 'latest';
+const FAST_BID_VERSION_NONE = 'none';
+const PUBLISHER_TAG_URL_TEMPLATE = 'https://static.criteo.net/js/ld/publishertag.prebid' + FAST_BID_VERSION_PLACEHOLDER + '.js';
 const FAST_BID_PUBKEY_E = 65537;
 const FAST_BID_PUBKEY_N = 'ztQYwCE5BU7T9CDM5he6rKoabstXRmkzx54zFPZkWbK530dwtLBDeaWBMxHBUT55CYyboR/EZ4efghPi3CoNGfGWezpjko9P6p2EwGArtHEeS4slhu/SpSIFMjG6fdrpRoNuIAMhq1Z+Pr/+HOd1pThFKeGFr2/NhtAg+TXAzaU=';
 
+const SID_COOKIE_NAME = 'cto_sid';
+const IDCPY_COOKIE_NAME = 'cto_idcpy';
+const LWID_COOKIE_NAME = 'cto_lwid';
+const OPTOUT_COOKIE_NAME = 'cto_optout';
+const BUNDLE_COOKIE_NAME = 'cto_bundle';
+const GUID_RETENTION_TIME_HOUR = 24 * 30 * 13; // 13 months
+const OPTOUT_RETENTION_TIME_HOUR = 5 * 12 * 30 * 24; // 5 years
+
 /** @type {BidderSpec} */
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  supportedMediaTypes: [ BANNER, VIDEO, NATIVE ],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
-  /**
+  getUserSyncs: function (syncOptions, _, gdprConsent, uspConsent) {
+    const fastBidVersion = config.getConfig('criteo.fastBidVersion');
+    if (canFastBid(fastBidVersion)) {
+      return [];
+    }
+
+    const refererInfo = getRefererInfo();
+    const origin = 'criteoPrebidAdapter';
+
+    if (syncOptions.iframeEnabled && hasPurpose1Consent(gdprConsent)) {
+      const queryParams = [];
+      queryParams.push(`origin=${origin}`);
+      queryParams.push(`topUrl=${refererInfo.domain}`);
+      if (gdprConsent) {
+        if (gdprConsent.gdprApplies) {
+          queryParams.push(`gdpr=${gdprConsent.gdprApplies == true ? 1 : 0}`);
+        }
+        if (gdprConsent.consentString) {
+          queryParams.push(`gdpr_consent=${gdprConsent.consentString}`);
+        }
+      }
+      if (uspConsent) {
+        queryParams.push(`us_privacy=${uspConsent}`);
+      }
+
+      const requestId = Math.random().toString();
+
+      const jsonHash = {
+        bundle: readFromAllStorages(BUNDLE_COOKIE_NAME),
+        cw: storage.cookiesAreEnabled(),
+        localWebId: readFromAllStorages(LWID_COOKIE_NAME),
+        lsw: storage.localStorageIsEnabled(),
+        optoutCookie: readFromAllStorages(OPTOUT_COOKIE_NAME),
+        origin: origin,
+        requestId: requestId,
+        secureIdCookie: readFromAllStorages(SID_COOKIE_NAME),
+        tld: refererInfo.domain,
+        topUrl: refererInfo.domain,
+        uid: readFromAllStorages(IDCPY_COOKIE_NAME),
+        version: '$prebid.version$'.replace(/\./g, '_'),
+      };
+
+      window.addEventListener('message', function handler(event) {
+        if (!event.data || event.origin != 'https://gum.criteo.com') {
+          return;
+        }
+
+        if (event.data.requestId !== requestId) {
+          return;
+        }
+
+        this.removeEventListener('message', handler);
+
+        event.stopImmediatePropagation();
+
+        const response = event.data;
+
+        if (response.optout) {
+          deleteFromAllStorages(IDCPY_COOKIE_NAME);
+          deleteFromAllStorages(SID_COOKIE_NAME);
+          deleteFromAllStorages(BUNDLE_COOKIE_NAME);
+          deleteFromAllStorages(LWID_COOKIE_NAME);
+
+          saveOnAllStorages(OPTOUT_COOKIE_NAME, true, OPTOUT_RETENTION_TIME_HOUR);
+        } else {
+          if (response.uid) {
+            saveOnAllStorages(IDCPY_COOKIE_NAME, response.uid, GUID_RETENTION_TIME_HOUR);
+          }
+
+          if (response.bundle) {
+            saveOnAllStorages(BUNDLE_COOKIE_NAME, response.bundle, GUID_RETENTION_TIME_HOUR);
+          }
+
+          if (response.removeSid) {
+            deleteFromAllStorages(SID_COOKIE_NAME);
+          } else if (response.sid) {
+            saveOnAllStorages(SID_COOKIE_NAME, response.sid, GUID_RETENTION_TIME_HOUR);
+          }
+        }
+      }, true);
+
+      const jsonHashSerialized = JSON.stringify(jsonHash).replace(/"/g, '%22');
+
+      return [{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?${queryParams.join('&')}#${jsonHashSerialized}`
+      }];
+    }
+    return [];
+  },
+
+  /** f
    * @param {object} bid
    * @return {boolean}
    */
@@ -54,35 +165,39 @@ export const spec = {
    * @return {ServerRequest}
    */
   buildRequests: (bidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     let url;
     let data;
+    let fpd = bidderRequest.ortb2 || {};
 
     Object.assign(bidderRequest, {
-      publisherExt: config.getConfig('fpd.context'),
-      userExt: config.getConfig('fpd.user'),
-      ceh: config.getConfig('criteo.ceh')
+      publisherExt: fpd.site?.ext,
+      userExt: fpd.user?.ext,
+      ceh: config.getConfig('criteo.ceh'),
+      coppa: config.getConfig('coppa')
     });
 
     // If publisher tag not already loaded try to get it from fast bid
-    if (!publisherTagAvailable()) {
+    const fastBidVersion = config.getConfig('criteo.fastBidVersion');
+    const canLoadPublisherTag = canFastBid(fastBidVersion);
+    if (!publisherTagAvailable() && canLoadPublisherTag) {
       window.Criteo = window.Criteo || {};
       window.Criteo.usePrebidEvents = false;
 
       tryGetCriteoFastBid();
 
+      const fastBidUrl = getFastBidUrl(fastBidVersion);
       // Reload the PublisherTag after the timeout to ensure FastBid is up-to-date and tracking done properly
       setTimeout(() => {
-        loadExternalScript(PUBLISHER_TAG_URL, BIDDER_CODE);
+        loadExternalScript(fastBidUrl, BIDDER_CODE);
       }, bidderRequest.timeout);
     }
 
     if (publisherTagAvailable()) {
       // eslint-disable-next-line no-undef
       const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID_PUBLISHERTAG, ADAPTER_VERSION, bidRequests, bidderRequest, '$prebid.version$');
-      const enableSendAllBids = config.getConfig('enableSendAllBids');
-      if (adapter.setEnableSendAllBids && typeof adapter.setEnableSendAllBids === 'function' && typeof enableSendAllBids === 'boolean') {
-        adapter.setEnableSendAllBids(enableSendAllBids);
-      }
       url = adapter.buildCdbUrl();
       data = adapter.buildCdbRequest();
     } else {
@@ -114,27 +229,34 @@ export const spec = {
 
     const bids = [];
 
-    if (body && body.slots && utils.isArray(body.slots)) {
+    if (body && body.slots && isArray(body.slots)) {
       body.slots.forEach(slot => {
         const bidRequest = find(request.bidRequests, b => b.adUnitCode === slot.impid && (!b.params.zoneId || parseInt(b.params.zoneId) === slot.zoneid));
         const bidId = bidRequest.bidId;
         const bid = {
           requestId: bidId,
-          adId: slot.bidId || utils.getUniqueIdentifierStr(),
           cpm: slot.cpm,
           currency: slot.currency,
           netRevenue: true,
           ttl: slot.ttl || 60,
-          creativeId: bidId,
+          creativeId: slot.creativecode,
           width: slot.width,
           height: slot.height,
           dealId: slot.dealCode,
         };
+        if (body.ext?.paf?.transmission && slot.ext?.paf?.content_id) {
+          const pafResponseMeta = {
+            content_id: slot.ext.paf.content_id,
+            transmission: response.ext.paf.transmission
+          };
+          bid.meta = Object.assign({}, bid.meta, { paf: pafResponseMeta });
+        }
+        if (slot.adomain) {
+          bid.meta = Object.assign({}, bid.meta, { advertiserDomains: slot.adomain });
+        }
         if (slot.native) {
           if (bidRequest.params.nativeCallback) {
             bid.ad = createNativeAd(bidId, slot.native, bidRequest.params.nativeCallback);
-          } else if (config.getConfig('enableSendAllBids') === true) {
-            return;
           } else {
             bid.native = createPrebidNativeAd(slot.native);
             bid.mediaType = NATIVE;
@@ -192,6 +314,27 @@ export const spec = {
   },
 };
 
+function readFromAllStorages(name) {
+  const fromCookie = storage.getCookie(name);
+  const fromLocalStorage = storage.getDataFromLocalStorage(name);
+
+  return fromCookie || fromLocalStorage || undefined;
+}
+
+function saveOnAllStorages(name, value, expirationTimeHours) {
+  const date = new Date();
+  date.setTime(date.getTime() + (expirationTimeHours * 60 * 60 * 1000));
+  const expires = `expires=${date.toUTCString()}`;
+
+  storage.setCookie(name, value, expires);
+  storage.setDataInLocalStorage(name, value);
+}
+
+function deleteFromAllStorages(name) {
+  storage.setCookie(name, '', 0);
+  storage.removeDataFromLocalStorage(name);
+}
+
 /**
  * @return {boolean}
  */
@@ -207,9 +350,9 @@ function publisherTagAvailable() {
 function buildContext(bidRequests, bidderRequest) {
   let referrer = '';
   if (bidderRequest && bidderRequest.refererInfo) {
-    referrer = bidderRequest.refererInfo.referer;
+    referrer = bidderRequest.refererInfo.page;
   }
-  const queryString = utils.parseUrl(referrer).search;
+  const queryString = parseUrl(bidderRequest?.refererInfo?.topmostLocation).search;
 
   const context = {
     url: referrer,
@@ -238,6 +381,12 @@ function buildCdbUrl(context) {
   url += '&wv=' + encodeURIComponent('$prebid.version$');
   url += '&cb=' + String(Math.floor(Math.random() * 99999999999));
 
+  if (storage.localStorageIsEnabled()) {
+    url += '&lsavail=1';
+  } else {
+    url += '&lsavail=0';
+  }
+
   if (context.amp) {
     url += '&im=1';
   }
@@ -248,17 +397,39 @@ function buildCdbUrl(context) {
     url += '&nolog=1';
   }
 
+  const bundle = readFromAllStorages(BUNDLE_COOKIE_NAME);
+  if (bundle) {
+    url += `&bundle=${bundle}`;
+  }
+
+  const optout = readFromAllStorages(OPTOUT_COOKIE_NAME);
+  if (optout) {
+    url += `&optout=1`;
+  }
+
+  const sid = readFromAllStorages(SID_COOKIE_NAME);
+  if (sid) {
+    url += `&sid=${sid}`;
+  }
+
+  const idcpy = readFromAllStorages(IDCPY_COOKIE_NAME);
+  if (idcpy) {
+    url += `&idcpy=${idcpy}`;
+  }
+
   return url;
 }
 
 function checkNativeSendId(bidRequest) {
   return !(bidRequest.nativeParams &&
-    ((bidRequest.nativeParams.image && bidRequest.nativeParams.image.sendId !== true) ||
-      (bidRequest.nativeParams.icon && bidRequest.nativeParams.icon.sendId !== true) ||
-      (bidRequest.nativeParams.clickUrl && bidRequest.nativeParams.clickUrl.sendId !== true) ||
-      (bidRequest.nativeParams.displayUrl && bidRequest.nativeParams.displayUrl.sendId !== true) ||
-      (bidRequest.nativeParams.privacyLink && bidRequest.nativeParams.privacyLink.sendId !== true) ||
-      (bidRequest.nativeParams.privacyIcon && bidRequest.nativeParams.privacyIcon.sendId !== true)));
+    (
+      (bidRequest.nativeParams.image && ((bidRequest.nativeParams.image.sendId !== true || bidRequest.nativeParams.image.sendTargetingKeys === true))) ||
+      (bidRequest.nativeParams.icon && ((bidRequest.nativeParams.icon.sendId !== true || bidRequest.nativeParams.icon.sendTargetingKeys === true))) ||
+      (bidRequest.nativeParams.clickUrl && ((bidRequest.nativeParams.clickUrl.sendId !== true || bidRequest.nativeParams.clickUrl.sendTargetingKeys === true))) ||
+      (bidRequest.nativeParams.displayUrl && ((bidRequest.nativeParams.displayUrl.sendId !== true || bidRequest.nativeParams.displayUrl.sendTargetingKeys === true))) ||
+      (bidRequest.nativeParams.privacyLink && ((bidRequest.nativeParams.privacyLink.sendId !== true || bidRequest.nativeParams.privacyLink.sendTargetingKeys === true))) ||
+      (bidRequest.nativeParams.privacyIcon && ((bidRequest.nativeParams.privacyIcon.sendId !== true || bidRequest.nativeParams.privacyIcon.sendTargetingKeys === true)))
+    ));
 }
 
 /**
@@ -269,13 +440,18 @@ function checkNativeSendId(bidRequest) {
  */
 function buildCdbRequest(context, bidRequests, bidderRequest) {
   let networkId;
+  let schain;
   const request = {
     publisher: {
       url: context.url,
-      ext: bidderRequest.publisherExt
+      ext: bidderRequest.publisherExt,
+    },
+    regs: {
+      coppa: bidderRequest.coppa === true ? 1 : (bidderRequest.coppa === false ? 0 : undefined)
     },
     slots: bidRequests.map(bidRequest => {
       networkId = bidRequest.params.networkId || networkId;
+      schain = bidRequest.schain || schain;
       const slot = {
         impid: bidRequest.adUnitCode,
         transactionid: bidRequest.transactionId,
@@ -284,8 +460,8 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
       if (bidRequest.params.zoneId) {
         slot.zoneid = bidRequest.params.zoneId;
       }
-      if (bidRequest.fpd && bidRequest.fpd.context) {
-        slot.ext = bidRequest.fpd.context;
+      if (deepAccess(bidRequest, 'ortb2Imp.ext')) {
+        slot.ext = bidRequest.ortb2Imp.ext;
       }
       if (bidRequest.params.ext) {
         slot.ext = Object.assign({}, slot.ext, bidRequest.params.ext);
@@ -293,38 +469,60 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
       if (bidRequest.params.publisherSubId) {
         slot.publishersubid = bidRequest.params.publisherSubId;
       }
-      if (bidRequest.params.nativeCallback || utils.deepAccess(bidRequest, `mediaTypes.${NATIVE}`)) {
+
+      if (bidRequest.params.nativeCallback || hasNativeMediaType(bidRequest)) {
         slot.native = true;
         if (!checkNativeSendId(bidRequest)) {
-          utils.logWarn(LOG_PREFIX + 'all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)');
+          logWarn(LOG_PREFIX + 'all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)');
         }
-        slot.sizes = parseSizes(retrieveBannerSizes(bidRequest), parseNativeSize);
+      }
+
+      if (hasBannerMediaType(bidRequest)) {
+        slot.sizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'), parseSize);
       } else {
-        slot.sizes = parseSizes(retrieveBannerSizes(bidRequest), parseSize);
+        slot.sizes = [];
       }
+
       if (hasVideoMediaType(bidRequest)) {
         const video = {
-          playersizes: parseSizes(utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize'), parseSize),
+          playersizes: parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'), parseSize),
           mimes: bidRequest.mediaTypes.video.mimes,
           protocols: bidRequest.mediaTypes.video.protocols,
           maxduration: bidRequest.mediaTypes.video.maxduration,
-          api: bidRequest.mediaTypes.video.api
+          api: bidRequest.mediaTypes.video.api,
+          skip: bidRequest.mediaTypes.video.skip,
+          placement: bidRequest.mediaTypes.video.placement,
+          minduration: bidRequest.mediaTypes.video.minduration,
+          playbackmethod: bidRequest.mediaTypes.video.playbackmethod,
+          startdelay: bidRequest.mediaTypes.video.startdelay
         };
-
-        video.skip = bidRequest.params.video.skip;
-        video.placement = bidRequest.params.video.placement;
-        video.minduration = bidRequest.params.video.minduration;
-        video.playbackmethod = bidRequest.params.video.playbackmethod;
-        video.startdelay = bidRequest.params.video.startdelay;
+        const paramsVideo = bidRequest.params.video;
+        if (paramsVideo !== undefined) {
+          video.skip = video.skip || paramsVideo.skip || 0;
+          video.placement = video.placement || paramsVideo.placement;
+          video.minduration = video.minduration || paramsVideo.minduration;
+          video.playbackmethod = video.playbackmethod || paramsVideo.playbackmethod;
+          video.startdelay = video.startdelay || paramsVideo.startdelay || 0;
+        }
 
         slot.video = video;
       }
+
+      enrichSlotWithFloors(slot, bidRequest);
+
       return slot;
     }),
   };
   if (networkId) {
     request.publisher.networkid = networkId;
   }
+  if (schain) {
+    request.source = {
+      ext: {
+        schain: schain
+      }
+    };
+  };
   request.user = {
     ext: bidderRequest.userExt
   };
@@ -347,11 +545,10 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
   return request;
 }
 
-function retrieveBannerSizes(bidRequest) {
-  return utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes') || bidRequest.sizes;
-}
-
-function parseSizes(sizes, parser) {
+function parseSizes(sizes, parser = s => s) {
+  if (sizes == undefined) {
+    return [];
+  }
   if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
     return sizes.map(size => parser(size));
   }
@@ -362,46 +559,36 @@ function parseSize(size) {
   return size[0] + 'x' + size[1];
 }
 
-function parseNativeSize(size) {
-  if (size[0] === undefined && size[1] === undefined) {
-    return '2x2';
-  }
-  return size[0] + 'x' + size[1];
+function hasVideoMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.video') !== undefined;
 }
 
-function hasVideoMediaType(bidRequest) {
-  if (utils.deepAccess(bidRequest, 'params.video') === undefined) {
-    return false;
-  }
-  return utils.deepAccess(bidRequest, 'mediaTypes.video') !== undefined;
+function hasBannerMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.banner') !== undefined;
+}
+
+function hasNativeMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.native') !== undefined;
 }
 
 function hasValidVideoMediaType(bidRequest) {
   let isValid = true;
 
-  var requiredMediaTypesParams = ['mimes', 'playerSize', 'maxduration', 'protocols', 'api'];
+  var requiredMediaTypesParams = ['mimes', 'playerSize', 'maxduration', 'protocols', 'api', 'skip', 'placement', 'playbackmethod'];
 
-  requiredMediaTypesParams.forEach(function(param) {
-    if (utils.deepAccess(bidRequest, 'mediaTypes.video.' + param) === undefined) {
+  requiredMediaTypesParams.forEach(function (param) {
+    if (deepAccess(bidRequest, 'mediaTypes.video.' + param) === undefined && deepAccess(bidRequest, 'params.video.' + param) === undefined) {
       isValid = false;
-      utils.logError('Criteo Bid Adapter: mediaTypes.video.' + param + ' is required');
-    }
-  });
-
-  var requiredParams = ['skip', 'placement', 'playbackmethod'];
-
-  requiredParams.forEach(function(param) {
-    if (utils.deepAccess(bidRequest, 'params.video.' + param) === undefined) {
-      isValid = false;
-      utils.logError('Criteo Bid Adapter: params.video.' + param + ' is required');
+      logError('Criteo Bid Adapter: mediaTypes.video.' + param + ' is required');
     }
   });
 
   if (isValid) {
+    const videoPlacement = bidRequest.mediaTypes.video.placement || bidRequest.params.video.placement;
     // We do not support long form for now, also we have to check that context & placement are consistent
-    if (bidRequest.mediaTypes.video.context == 'instream' && bidRequest.params.video.placement === 1) {
+    if (bidRequest.mediaTypes.video.context == 'instream' && videoPlacement === 1) {
       return true;
-    } else if (bidRequest.mediaTypes.video.context == 'outstream' && bidRequest.params.video.placement !== 1) {
+    } else if (bidRequest.mediaTypes.video.context == 'outstream' && videoPlacement !== 1) {
       return true;
     }
   }
@@ -416,6 +603,7 @@ function hasValidVideoMediaType(bidRequest) {
  */
 function createPrebidNativeAd(payload) {
   return {
+    sendTargetingKeys: false, // no key is added to KV by default
     title: payload.products[0].title,
     body: payload.products[0].description,
     sponsoredBy: payload.advertiser.description,
@@ -456,7 +644,85 @@ for (var i = 0; i < 10; ++i) {
 </script>`;
 }
 
+function pickAvailableGetFloorFunc(bidRequest) {
+  if (bidRequest.getFloor) {
+    return bidRequest.getFloor;
+  }
+  if (bidRequest.params.bidFloor && bidRequest.params.bidFloorCur) {
+    try {
+      const floor = parseFloat(bidRequest.params.bidFloor);
+      return () => {
+        return {
+          currency: bidRequest.params.bidFloorCur,
+          floor: floor
+        };
+      };
+    } catch { }
+  }
+  return undefined;
+}
+
+function enrichSlotWithFloors(slot, bidRequest) {
+  try {
+    const slotFloors = {};
+
+    const getFloor = pickAvailableGetFloorFunc(bidRequest);
+
+    if (getFloor) {
+      if (bidRequest.mediaTypes?.banner) {
+        slotFloors.banner = {};
+        const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = getFloor.call(bidRequest, { size: bannerSize, mediaType: BANNER }));
+      }
+
+      if (bidRequest.mediaTypes?.video) {
+        slotFloors.video = {};
+        const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = getFloor.call(bidRequest, { size: videoSize, mediaType: VIDEO }));
+      }
+
+      if (bidRequest.mediaTypes?.native) {
+        slotFloors.native = {};
+        slotFloors.native['*'] = getFloor.call(bidRequest, { size: '*', mediaType: NATIVE });
+      }
+
+      if (Object.keys(slotFloors).length > 0) {
+        if (!slot.ext) {
+          slot.ext = {}
+        }
+        Object.assign(slot.ext, {
+          floors: slotFloors
+        });
+      }
+    }
+  } catch (e) {
+    logError('Could not parse floors from Prebid: ' + e);
+  }
+}
+
+export function canFastBid(fastBidVersion) {
+  return fastBidVersion !== FAST_BID_VERSION_NONE;
+}
+
+export function getFastBidUrl(fastBidVersion) {
+  let version;
+  if (fastBidVersion === FAST_BID_VERSION_LATEST) {
+    version = '';
+  } else if (fastBidVersion) {
+    let majorVersion = String(fastBidVersion).split('.')[0];
+    if (majorVersion < 102) {
+      logWarn('Specifying a Fastbid version which is not supporting version selection.')
+    }
+    version = '.' + fastBidVersion;
+  } else {
+    version = '.' + FAST_BID_VERSION_CURRENT;
+  }
+
+  return PUBLISHER_TAG_URL_TEMPLATE.replace(FAST_BID_VERSION_PLACEHOLDER, version);
+}
+
 export function tryGetCriteoFastBid() {
+  // begin ref#1
   try {
     const fastBidStorageKey = 'criteo_fast_bid';
     const hashPrefix = '// Hash: ';
@@ -468,7 +734,7 @@ export function tryGetCriteoFastBid() {
       const firstLine = fastBidFromStorage.substr(0, firstLineEndPosition).trim();
 
       if (firstLine.substr(0, hashPrefix.length) !== hashPrefix) {
-        utils.logWarn('No hash found in FastBid');
+        logWarn('No hash found in FastBid');
         storage.removeDataFromLocalStorage(fastBidStorageKey);
       } else {
         // Remove the hash part from the locally stored value
@@ -476,10 +742,10 @@ export function tryGetCriteoFastBid() {
         const publisherTag = fastBidFromStorage.substr(firstLineEndPosition + 1);
 
         if (verify(publisherTag, publisherTagHash, FAST_BID_PUBKEY_N, FAST_BID_PUBKEY_E)) {
-          utils.logInfo('Using Criteo FastBid');
+          logInfo('Using Criteo FastBid');
           eval(publisherTag); // eslint-disable-line no-eval
         } else {
-          utils.logWarn('Invalid Criteo FastBid found');
+          logWarn('Invalid Criteo FastBid found');
           storage.removeDataFromLocalStorage(fastBidStorageKey);
         }
       }
@@ -487,6 +753,7 @@ export function tryGetCriteoFastBid() {
   } catch (e) {
     // Unable to get fast bid
   }
+  // end ref#1
 }
 
 registerBidder(spec);
diff --git a/modules/criteoBidAdapter.md b/modules/criteoBidAdapter.md
index e4c441c758d..30ae3d97fac 100644
--- a/modules/criteoBidAdapter.md
+++ b/modules/criteoBidAdapter.md
@@ -2,7 +2,7 @@
 
 Module Name: Criteo Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: pi-direct@criteo.com
+Maintainer: prebid@criteo.com
 
 # Description
 
@@ -27,11 +27,7 @@ Module that connects to Criteo's demand sources.
 ```
 
 # Additional Config (Optional)
-Set the "ceh" property to provides the user's hashed email if available
-```
-  pbjs.setConfig({
-    criteo: {
-      ceh: 'hashed mail'
-    }
-  });
-```
\ No newline at end of file
+
+Criteo Bid Adapter supports the collection of the user's hashed email, if available.
+
+Please consider passing it to the adapter, following [these guidelines](https://publisherdocs.criteotilt.com/prebid/#hashed-emails).
diff --git a/modules/criteoIdSystem.js b/modules/criteoIdSystem.js
index c44f0c843ae..867e4315945 100644
--- a/modules/criteoIdSystem.js
+++ b/modules/criteoIdSystem.js
@@ -5,31 +5,26 @@
  * @requires module:modules/userId
  */
 
-import * as utils from '../src/utils.js'
-import * as ajax from '../src/ajax.js'
-import { getRefererInfo } from '../src/refererDetection.js'
+import { timestamp, parseUrl, triggerPixel, logError } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { getRefererInfo } from '../src/refererDetection.js';
 import { submodule } from '../src/hook.js';
 import { getStorageManager } from '../src/storageManager.js';
 
-export const storage = getStorageManager();
+const gvlid = 91;
+const bidderCode = 'criteo';
+export const storage = getStorageManager({ gvlid: gvlid, moduleName: bidderCode });
 
 const bididStorageKey = 'cto_bidid';
 const bundleStorageKey = 'cto_bundle';
-const cookieWriteableKey = 'cto_test_cookie';
+const dnaBundleStorageKey = 'cto_dna_bundle';
 const cookiesMaxAge = 13 * 30 * 24 * 60 * 60 * 1000;
 
 const pastDateString = new Date(0).toString();
-const expirationString = new Date(utils.timestamp() + cookiesMaxAge).toString();
+const expirationString = new Date(timestamp() + cookiesMaxAge).toString();
 
-function areCookiesWriteable() {
-  storage.setCookie(cookieWriteableKey, '1');
-  const canWrite = storage.getCookie(cookieWriteableKey) === '1';
-  storage.setCookie(cookieWriteableKey, '', pastDateString);
-  return canWrite;
-}
-
-function extractProtocolHost (url, returnOnlyHost = false) {
-  const parsedUrl = utils.parseUrl(url)
+function extractProtocolHost(url, returnOnlyHost = false) {
+  const parsedUrl = parseUrl(url, { noDecodeWholeURL: true })
   return returnOnlyHost
     ? `${parsedUrl.hostname}`
     : `${parsedUrl.protocol}://${parsedUrl.hostname}${parsedUrl.port ? ':' + parsedUrl.port : ''}/`;
@@ -39,40 +34,89 @@ function getFromAllStorages(key) {
   return storage.getCookie(key) || storage.getDataFromLocalStorage(key);
 }
 
-function saveOnAllStorages(key, value) {
+function saveOnAllStorages(key, value, hostname) {
   if (key && value) {
-    storage.setCookie(key, value, expirationString);
     storage.setDataInLocalStorage(key, value);
+    setCookieOnAllDomains(key, value, expirationString, hostname, true);
   }
 }
 
-function deleteFromAllStorages(key) {
-  storage.setCookie(key, '', pastDateString);
+function setCookieOnAllDomains(key, value, expiration, hostname, stopOnSuccess) {
+  const subDomains = hostname.split('.');
+  for (let i = 0; i < subDomains.length; ++i) {
+    // Try to write the cookie on this subdomain (we want it to be stored only on the TLD+1)
+    const domain = subDomains.slice(subDomains.length - i - 1, subDomains.length).join('.');
+
+    try {
+      storage.setCookie(key, value, expiration, null, '.' + domain);
+
+      if (stopOnSuccess) {
+        // Try to read the cookie to check if we wrote it
+        const ck = storage.getCookie(key);
+        if (ck && ck === value) {
+          break;
+        }
+      }
+    } catch (error) {
+
+    }
+  }
+}
+
+function deleteFromAllStorages(key, hostname) {
+  setCookieOnAllDomains(key, '', pastDateString, hostname, true);
   storage.removeDataFromLocalStorage(key);
 }
 
 function getCriteoDataFromAllStorages() {
   return {
     bundle: getFromAllStorages(bundleStorageKey),
+    dnaBundle: getFromAllStorages(dnaBundleStorageKey),
     bidId: getFromAllStorages(bididStorageKey),
   }
 }
 
-function buildCriteoUsersyncUrl(topUrl, domain, bundle, areCookiesWriteable, isPublishertagPresent, gdprString) {
+function buildCriteoUsersyncUrl(topUrl, domain, bundle, dnaBundle, areCookiesWriteable, isLocalStorageWritable, isPublishertagPresent, gdprString) {
   const url = 'https://gum.criteo.com/sid/json?origin=prebid' +
     `${topUrl ? '&topUrl=' + encodeURIComponent(topUrl) : ''}` +
     `${domain ? '&domain=' + encodeURIComponent(domain) : ''}` +
     `${bundle ? '&bundle=' + encodeURIComponent(bundle) : ''}` +
+    `${dnaBundle ? '&info=' + encodeURIComponent(dnaBundle) : ''}` +
     `${gdprString ? '&gdprString=' + encodeURIComponent(gdprString) : ''}` +
     `${areCookiesWriteable ? '&cw=1' : ''}` +
-    `${isPublishertagPresent ? '&pbt=1' : ''}`
+    `${isPublishertagPresent ? '&pbt=1' : ''}` +
+    `${isLocalStorageWritable ? '&lsw=1' : ''}`;
 
   return url;
 }
 
-function callCriteoUserSync(parsedCriteoData, gdprString) {
-  const cw = areCookiesWriteable();
-  const topUrl = extractProtocolHost(getRefererInfo().referer);
+function callSyncPixel(domain, pixel) {
+  if (pixel.writeBundleInStorage && pixel.bundlePropertyName && pixel.storageKeyName) {
+    ajax(
+      pixel.pixelUrl,
+      {
+        success: response => {
+          if (response) {
+            const jsonResponse = JSON.parse(response);
+            if (jsonResponse && jsonResponse[pixel.bundlePropertyName]) {
+              saveOnAllStorages(pixel.storageKeyName, jsonResponse[pixel.bundlePropertyName], domain);
+            }
+          }
+        }
+      },
+      undefined,
+      { method: 'GET', withCredentials: true }
+    );
+  } else {
+    triggerPixel(pixel.pixelUrl);
+  }
+}
+
+function callCriteoUserSync(parsedCriteoData, gdprString, callback) {
+  const cw = storage.cookiesAreEnabled();
+  const lsw = storage.localStorageIsEnabled();
+  const topUrl = extractProtocolHost(getRefererInfo().page);
+  // TODO: should domain really be extracted from the current frame?
   const domain = extractProtocolHost(document.location.href, true);
   const isPublishertagPresent = typeof criteo_pubtag !== 'undefined'; // eslint-disable-line camelcase
 
@@ -80,29 +124,44 @@ function callCriteoUserSync(parsedCriteoData, gdprString) {
     topUrl,
     domain,
     parsedCriteoData.bundle,
+    parsedCriteoData.dnaBundle,
     cw,
+    lsw,
     isPublishertagPresent,
     gdprString
   );
 
-  ajax.ajaxBuilder()(
-    url,
-    response => {
+  const callbacks = {
+    success: response => {
       const jsonResponse = JSON.parse(response);
-      if (jsonResponse.bidId) {
-        saveOnAllStorages(bididStorageKey, jsonResponse.bidId);
-      } else {
-        deleteFromAllStorages(bididStorageKey);
+
+      if (jsonResponse.pixels) {
+        jsonResponse.pixels.forEach(pixel => callSyncPixel(domain, pixel));
       }
 
       if (jsonResponse.acwsUrl) {
         const urlsToCall = typeof jsonResponse.acwsUrl === 'string' ? [jsonResponse.acwsUrl] : jsonResponse.acwsUrl;
-        urlsToCall.forEach(url => utils.triggerPixel(url));
+        urlsToCall.forEach(url => triggerPixel(url));
       } else if (jsonResponse.bundle) {
-        saveOnAllStorages(bundleStorageKey, jsonResponse.bundle);
+        saveOnAllStorages(bundleStorageKey, jsonResponse.bundle, domain);
       }
+
+      if (jsonResponse.bidId) {
+        saveOnAllStorages(bididStorageKey, jsonResponse.bidId, domain);
+        const criteoId = { criteoId: jsonResponse.bidId };
+        callback(criteoId);
+      } else {
+        deleteFromAllStorages(bididStorageKey, domain);
+        callback();
+      }
+    },
+    error: error => {
+      logError(`criteoIdSystem: unable to sync user id`, error);
+      callback();
     }
-  );
+  };
+
+  ajax(url, callbacks, undefined, { method: 'GET', contentType: 'application/json', withCredentials: true });
 }
 
 /** @type {Submodule} */
@@ -111,7 +170,8 @@ export const criteoIdSubmodule = {
    * used to link submodule with config
    * @type {string}
    */
-  name: 'criteo',
+  name: bidderCode,
+  gvlid: gvlid,
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -123,18 +183,22 @@ export const criteoIdSubmodule = {
   /**
    * get the Criteo Id from local storages and initiate a new user sync
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
    * @returns {{id: {criteoId: string} | undefined}}}
    */
-  getId(configParams, consentData) {
+  getId(config, consentData) {
     const hasGdprData = consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies;
     const gdprConsentString = hasGdprData ? consentData.consentString : undefined;
 
     let localData = getCriteoDataFromAllStorages();
-    callCriteoUserSync(localData, gdprConsentString);
 
-    return { id: localData.bidId ? { criteoId: localData.bidId } : undefined }
+    const result = (callback) => callCriteoUserSync(localData, gdprConsentString, callback);
+
+    return {
+      id: localData.bidId ? { criteoId: localData.bidId } : undefined,
+      callback: result
+    }
   }
 };
 
diff --git a/modules/currency.js b/modules/currency.js
index 0464d9b5cdb..9272a507d05 100644
--- a/modules/currency.js
+++ b/modules/currency.js
@@ -1,10 +1,12 @@
-import { getGlobal } from '../src/prebidGlobal.js';
-import { createBid } from '../src/bidfactory.js';
-import { STATUS } from '../src/constants.json';
-import { ajax } from '../src/ajax.js';
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { getHook } from '../src/hook.js';
+import {logError, logInfo, logMessage, logWarn} from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import CONSTANTS from '../src/constants.json';
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import {getHook} from '../src/hook.js';
+import {defer} from '../src/utils/promise.js';
+import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
 const DEFAULT_CURRENCY_RATE_URL = 'https://cdn.jsdelivr.net/gh/prebid/currency-file@1/latest.json?date=$$TODAY$$';
 const CURRENCY_RATE_PRECISION = 4;
@@ -20,6 +22,15 @@ export var currencyRates = {};
 var bidderCurrencyDefault = {};
 var defaultRates;
 
+export const ready = (() => {
+  let ctl;
+  function reset() {
+    ctl = defer();
+  }
+  reset();
+  return {done: () => ctl.resolve(), reset, promise: () => ctl.promise}
+})();
+
 /**
  * Configuration function for currency
  * @param  {string} [config.adServerCurrency = 'USD']
@@ -70,11 +81,11 @@ export function setConfig(config) {
   }
 
   if (typeof config.adServerCurrency === 'string') {
-    utils.logInfo('enabling currency support', arguments);
+    logInfo('enabling currency support', arguments);
 
     adServerCurrency = config.adServerCurrency;
     if (config.conversionRateFile) {
-      utils.logInfo('currency using override conversionRateFile:', config.conversionRateFile);
+      logInfo('currency using override conversionRateFile:', config.conversionRateFile);
       url = config.conversionRateFile;
     }
 
@@ -99,7 +110,7 @@ export function setConfig(config) {
     initCurrency(url);
   } else {
     // currency support is disabled, setting defaults
-    utils.logInfo('disabling currency support');
+    logInfo('disabling currency support');
     resetCurrency();
   }
   if (typeof config.bidderCurrencyDefault === 'object') {
@@ -110,10 +121,10 @@ config.getConfig('currency', config => setConfig(config.currency));
 
 function errorSettingsRates(msg) {
   if (defaultRates) {
-    utils.logWarn(msg);
-    utils.logWarn('Currency failed loading rates, falling back to currency.defaultRates');
+    logWarn(msg);
+    logWarn('Currency failed loading rates, falling back to currency.defaultRates');
   } else {
-    utils.logError(msg);
+    logError(msg);
   }
 }
 
@@ -121,7 +132,7 @@ function initCurrency(url) {
   conversionCache = {};
   currencySupportEnabled = true;
 
-  utils.logInfo('Installing addBidResponse decorator for currency module', arguments);
+  logInfo('Installing addBidResponse decorator for currency module', arguments);
 
   // Adding conversion function to prebid global for external module and on page use
   getGlobal().convertCurrency = (cpm, fromCurrency, toCurrency) => parseFloat(cpm) * getCurrencyConversion(fromCurrency, toCurrency);
@@ -135,21 +146,28 @@ function initCurrency(url) {
         success: function (response) {
           try {
             currencyRates = JSON.parse(response);
-            utils.logInfo('currencyRates set to ' + JSON.stringify(currencyRates));
+            logInfo('currencyRates set to ' + JSON.stringify(currencyRates));
+            conversionCache = {};
             currencyRatesLoaded = true;
             processBidResponseQueue();
+            ready.done();
           } catch (e) {
             errorSettingsRates('Failed to parse currencyRates response: ' + response);
           }
         },
-        error: errorSettingsRates
+        error: function (...args) {
+          errorSettingsRates(...args);
+          ready.done();
+        }
       }
     );
+  } else {
+    ready.done();
   }
 }
 
 function resetCurrency() {
-  utils.logInfo('Uninstalling addBidResponse decorator for currency module', arguments);
+  logInfo('Uninstalling addBidResponse decorator for currency module', arguments);
 
   getHook('addBidResponse').getHooks({hook: addBidResponseHook}).remove();
   delete getGlobal().convertCurrency;
@@ -163,16 +181,16 @@ function resetCurrency() {
   bidderCurrencyDefault = {};
 }
 
-export function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('currency', function addBidResponseHook(fn, adUnitCode, bid, reject) {
   if (!bid) {
-    return fn.call(this, adUnitCode); // if no bid, call original and let it display warnings
+    return fn.call(this, adUnitCode, bid, reject); // if no bid, call original and let it display warnings
   }
 
   let bidder = bid.bidderCode || bid.bidder;
   if (bidderCurrencyDefault[bidder]) {
     let currencyDefault = bidderCurrencyDefault[bidder];
     if (bid.currency && currencyDefault !== bid.currency) {
-      utils.logWarn(`Currency default '${bidder}: ${currencyDefault}' ignored. adapter specified '${bid.currency}'`);
+      logWarn(`Currency default '${bidder}: ${currencyDefault}' ignored. adapter specified '${bid.currency}'`);
     } else {
       bid.currency = currencyDefault;
     }
@@ -180,7 +198,7 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
 
   // default to USD if currency not set
   if (!bid.currency) {
-    utils.logWarn('Currency not specified on bid.  Defaulted to "USD"');
+    logWarn('Currency not specified on bid.  Defaulted to "USD"');
     bid.currency = 'USD';
   }
 
@@ -191,14 +209,16 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
 
   // execute immediately if the bid is already in the desired currency
   if (bid.currency === adServerCurrency) {
-    return fn.call(this, adUnitCode, bid);
+    return fn.call(this, adUnitCode, bid, reject);
   }
 
-  bidResponseQueue.push(wrapFunction(fn, this, [adUnitCode, bid]));
+  bidResponseQueue.push(wrapFunction(fn, this, [adUnitCode, bid, reject]));
   if (!currencySupportEnabled || currencyRatesLoaded) {
     processBidResponseQueue();
+  } else {
+    fn.untimed.bail(ready.promise());
   }
-}
+});
 
 function processBidResponseQueue() {
   while (bidResponseQueue.length > 0) {
@@ -218,11 +238,9 @@ function wrapFunction(fn, context, params) {
           bid.currency = adServerCurrency;
         }
       } catch (e) {
-        utils.logWarn('Returning NO_BID, getCurrencyConversion threw error: ', e);
-        params[1] = createBid(STATUS.NO_BID, {
-          bidder: bid.bidderCode || bid.bidder,
-          bidId: bid.requestId
-        });
+        logWarn('Returning NO_BID, getCurrencyConversion threw error: ', e);
+        // TODO: in v8, this should not continue with a "NO_BID"
+        params[1] = params[2](CONSTANTS.REJECTION_REASON.CANNOT_CONVERT_CURRENCY);
       }
     }
     return fn.apply(context, params);
@@ -235,7 +253,7 @@ function getCurrencyConversion(fromCurrency, toCurrency = adServerCurrency) {
   let cacheKey = `${fromCurrency}->${toCurrency}`;
   if (cacheKey in conversionCache) {
     conversionRate = conversionCache[cacheKey];
-    utils.logMessage('Using conversionCache value ' + conversionRate + ' for ' + cacheKey);
+    logMessage('Using conversionCache value ' + conversionRate + ' for ' + cacheKey);
   } else if (currencySupportEnabled === false) {
     if (fromCurrency === 'USD') {
       conversionRate = 1;
@@ -253,7 +271,7 @@ function getCurrencyConversion(fromCurrency, toCurrency = adServerCurrency) {
         throw new Error('Specified adServerCurrency in config \'' + toCurrency + '\' not found in the currency rates file');
       }
       conversionRate = rates[toCurrency];
-      utils.logInfo('getCurrencyConversion using direct ' + fromCurrency + ' to ' + toCurrency + ' conversionRate ' + conversionRate);
+      logInfo('getCurrencyConversion using direct ' + fromCurrency + ' to ' + toCurrency + ' conversionRate ' + conversionRate);
     } else if (toCurrency in currencyRates.conversions) {
       // using reciprocal of conversion rate from toCurrency to fromCurrency
       rates = currencyRates.conversions[toCurrency];
@@ -262,7 +280,7 @@ function getCurrencyConversion(fromCurrency, toCurrency = adServerCurrency) {
         throw new Error('Specified fromCurrency \'' + fromCurrency + '\' not found in the currency rates file');
       }
       conversionRate = roundFloat(1 / rates[fromCurrency], CURRENCY_RATE_PRECISION);
-      utils.logInfo('getCurrencyConversion using reciprocal ' + fromCurrency + ' to ' + toCurrency + ' conversionRate ' + conversionRate);
+      logInfo('getCurrencyConversion using reciprocal ' + fromCurrency + ' to ' + toCurrency + ' conversionRate ' + conversionRate);
     } else {
       // first defined currency base used as intermediary
       var anyBaseCurrency = Object.keys(currencyRates.conversions)[0];
@@ -280,11 +298,11 @@ function getCurrencyConversion(fromCurrency, toCurrency = adServerCurrency) {
       var fromIntermediateConversionRate = currencyRates.conversions[anyBaseCurrency][toCurrency];
 
       conversionRate = roundFloat(toIntermediateConversionRate * fromIntermediateConversionRate, CURRENCY_RATE_PRECISION);
-      utils.logInfo('getCurrencyConversion using intermediate ' + fromCurrency + ' thru ' + anyBaseCurrency + ' to ' + toCurrency + ' conversionRate ' + conversionRate);
+      logInfo('getCurrencyConversion using intermediate ' + fromCurrency + ' thru ' + anyBaseCurrency + ' to ' + toCurrency + ' conversionRate ' + conversionRate);
     }
   }
   if (!(cacheKey in conversionCache)) {
-    utils.logMessage('Adding conversionCache value ' + conversionRate + ' for ' + cacheKey);
+    logMessage('Adding conversionCache value ' + conversionRate + ' for ' + cacheKey);
     conversionCache[cacheKey] = conversionRate;
   }
   return conversionRate;
@@ -297,3 +315,11 @@ function roundFloat(num, dec) {
   }
   return Math.round(num * d) / d;
 }
+
+export function setOrtbCurrency(ortbRequest, bidderRequest, context) {
+  if (currencySupportEnabled) {
+    ortbRequest.cur = ortbRequest.cur || [context.currency || adServerCurrency];
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'currency', fn: setOrtbCurrency});
diff --git a/modules/cwireBidAdapter.js b/modules/cwireBidAdapter.js
new file mode 100644
index 00000000000..a11899609bc
--- /dev/null
+++ b/modules/cwireBidAdapter.js
@@ -0,0 +1,307 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {OUTSTREAM} from '../src/video.js';
+import {
+  deepAccess,
+  generateUUID,
+  getBidIdParameter,
+  getParameterByName,
+  getValue,
+  isArray,
+  isNumber,
+  isStr,
+  logError,
+  logWarn,
+  parseSizesInput,
+} from '../src/utils.js';
+import {Renderer} from '../src/Renderer.js';
+import {find} from '../src/polyfill.js';
+
+// ------------------------------------
+const BIDDER_CODE = 'cwire';
+export const ENDPOINT_URL = 'https://embed.cwi.re/delivery/prebid';
+export const RENDERER_URL = 'https://cdn.cwi.re/prebid/renderer/LATEST/renderer.min.js';
+// ------------------------------------
+export const CW_PAGE_VIEW_ID = generateUUID();
+const LS_CWID_KEY = 'cw_cwid';
+const CW_GROUPS_QUERY = 'cwgroups';
+const CW_CREATIVE_QUERY = 'cwcreative';
+
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+/**
+ * ------------------------------------
+ * ------------------------------------
+ * @param bid
+ * @returns {Array<string>}
+ */
+export function getSlotSizes(bid) {
+  return parseSizesInput(getAllMediaSizes(bid));
+}
+
+/**
+ * ------------------------------------
+ * ------------------------------------
+ * @param bid
+ * @returns {*[]}
+ */
+export function getAllMediaSizes(bid) {
+  let playerSizes = deepAccess(bid, 'mediaTypes.video.playerSize');
+  let videoSizes = deepAccess(bid, 'mediaTypes.video.sizes');
+  let bannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
+
+  const sizes = [];
+
+  if (isArray(playerSizes)) {
+    playerSizes.forEach((s) => {
+      sizes.push(s);
+    })
+  }
+
+  if (isArray(videoSizes)) {
+    videoSizes.forEach((s) => {
+      sizes.push(s);
+    })
+  }
+
+  if (isArray(bannerSizes)) {
+    bannerSizes.forEach((s) => {
+      sizes.push(s);
+    })
+  }
+  return sizes;
+}
+
+const getQueryVariable = (variable) => {
+  let value = getParameterByName(variable);
+  if (value === '') {
+    value = null;
+  }
+  return value;
+};
+
+/**
+ * ------------------------------------
+ * ------------------------------------
+ * @param validBidRequests
+ * @returns {*[]}
+ */
+export const mapSlotsData = function(validBidRequests) {
+  const slots = [];
+  validBidRequests.forEach(bid => {
+    const bidObj = {};
+    // get testing / debug params
+    let cwcreative = getValue(bid.params, 'cwcreative');
+    let refgroups = getValue(bid.params, 'refgroups');
+    let cwapikey = getValue(bid.params, 'cwapikey');
+
+    // get the pacement and page ids
+    let placementId = getValue(bid.params, 'placementId');
+    let pageId = getValue(bid.params, 'pageId');
+    // get the rest of the auction/bid/transaction info
+    bidObj.auctionId = getBidIdParameter('auctionId', bid);
+    bidObj.adUnitCode = getBidIdParameter('adUnitCode', bid);
+    bidObj.bidId = getBidIdParameter('bidId', bid);
+    bidObj.bidderRequestId = getBidIdParameter('bidderRequestId', bid);
+    bidObj.placementId = placementId;
+    bidObj.pageId = pageId;
+    bidObj.mediaTypes = getBidIdParameter('mediaTypes', bid);
+    bidObj.transactionId = getBidIdParameter('transactionId', bid);
+    bidObj.sizes = getSlotSizes(bid);
+    bidObj.cwcreative = cwcreative;
+    bidObj.refgroups = refgroups;
+    bidObj.cwapikey = cwapikey;
+    slots.push(bidObj);
+  });
+
+  return slots;
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    bid.params = bid.params || {};
+
+    if (bid.params.cwcreative && !isStr(bid.params.cwcreative)) {
+      logError('cwcreative must be of type string!');
+      return false;
+    }
+
+    if (!bid.params.placementId || !isNumber(bid.params.placementId)) {
+      logError('placementId not provided or invalid');
+      return false;
+    }
+
+    if (!bid.params.pageId || !isNumber(bid.params.pageId)) {
+      logError('pageId not provided');
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * ------------------------------------
+   * itterate trough slots array and try
+   * to extract first occurence of a given
+   * key, if not found - return null
+   * ------------------------------------
+   */
+  getFirstValueOrNull: function(slots, key) {
+    const found = slots.find((item) => {
+      return (typeof item[key] !== 'undefined');
+    });
+
+    return (found) ? found[key] : null;
+  },
+
+  /**
+   * ------------------------------------
+   * Make a server request from the
+   * list of BidRequests.
+   * ------------------------------------
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let slots = [];
+    let referer;
+    try {
+      referer = bidderRequest?.refererInfo?.page;
+      slots = mapSlotsData(validBidRequests);
+    } catch (e) {
+      logWarn(e);
+    }
+
+    let refgroups = [];
+
+    const cwCreative = getQueryVariable(CW_CREATIVE_QUERY) || null;
+    const cwCreativeIdFromConfig = this.getFirstValueOrNull(slots, 'cwcreative');
+    const refGroupsFromConfig = this.getFirstValueOrNull(slots, 'refgroups');
+    const cwApiKeyFromConfig = this.getFirstValueOrNull(slots, 'cwapikey');
+    const rgQuery = getQueryVariable(CW_GROUPS_QUERY);
+
+    if (refGroupsFromConfig !== null) {
+      refgroups = refGroupsFromConfig.split(',');
+    }
+
+    if (rgQuery !== null) {
+      // override if query param is present
+      refgroups = [];
+      refgroups = rgQuery.split(',');
+    }
+
+    const localStorageCWID = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(LS_CWID_KEY) : null;
+
+    const payload = {
+      cwid: localStorageCWID,
+      refgroups,
+      cwcreative: cwCreative || cwCreativeIdFromConfig,
+      slots: slots,
+      cwapikey: cwApiKeyFromConfig,
+      httpRef: referer || '',
+      pageViewId: CW_PAGE_VIEW_ID,
+    };
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payload
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+
+    try {
+      if (typeof bidRequest.data === 'string') {
+        bidRequest.data = JSON.parse(bidRequest.data);
+      }
+      const serverBody = serverResponse.body;
+      serverBody.bids.forEach((br) => {
+        const bidReq = find(bidRequest.data.slots, bid => bid.bidId === br.requestId);
+
+        let mediaType = BANNER;
+
+        const bidResponse = {
+          requestId: br.requestId,
+          cpm: br.cpm,
+          bidderCode: BIDDER_CODE,
+          width: br.dimensions[0],
+          height: br.dimensions[1],
+          creativeId: br.creativeId,
+          currency: br.currency,
+          netRevenue: br.netRevenue,
+          ttl: br.ttl,
+          meta: {
+            advertiserDomains: br.adomains ? br.advertiserDomains : [],
+          },
+
+        };
+
+        // ------------------------------------
+        // IF BANNER
+        // ------------------------------------
+
+        if (deepAccess(bidReq, 'mediaTypes.banner')) {
+          bidResponse.ad = br.html;
+        }
+        // ------------------------------------
+        // IF VIDEO
+        // ------------------------------------
+        if (deepAccess(bidReq, 'mediaTypes.video')) {
+          mediaType = VIDEO;
+          bidResponse.vastXml = br.vastXml;
+          bidResponse.videoScript = br.html;
+          const mediaTypeContext = deepAccess(bidReq, 'mediaTypes.video.context');
+          if (mediaTypeContext === OUTSTREAM) {
+            const r = Renderer.install({
+              id: bidResponse.requestId,
+              adUnitCode: bidReq.adUnitCode,
+              url: RENDERER_URL,
+              loaded: false,
+              config: {
+                ...deepAccess(bidReq, 'mediaTypes.video'),
+                ...deepAccess(br, 'outstream', {})
+              }
+            });
+
+            // set renderer
+            try {
+              bidResponse.renderer = r;
+              bidResponse.renderer.setRender(function(bid) {
+                if (window.CWIRE && window.CWIRE.outstream) {
+                  window.CWIRE.outstream.renderAd(bid);
+                }
+              });
+            } catch (err) {
+              logWarn('Prebid Error calling setRender on newRenderer', err);
+            }
+          }
+        }
+
+        bidResponse.mediaType = mediaType;
+        bidResponses.push(bidResponse);
+      });
+    } catch (e) {
+      logWarn(e);
+    }
+
+    return bidResponses;
+  },
+};
+registerBidder(spec);
diff --git a/modules/cwireBidAdapter.md b/modules/cwireBidAdapter.md
new file mode 100644
index 00000000000..188894cd202
--- /dev/null
+++ b/modules/cwireBidAdapter.md
@@ -0,0 +1,48 @@
+# Overview
+
+Module Name: C-WIRE Bid Adapter
+Module Type: Adagio Adapter
+Maintainer: publishers@cwire.ch
+
+## Description
+
+Connects to C-WIRE demand source to fetch bids.
+
+## Configuration
+
+
+Below, the list of C-WIRE params and where they can be set.
+
+| Param name | Global config | AdUnit config | Type   | Required |
+| ---------- | ------------- | ------------- |--------| ---------|
+| pageId |  | x | number | YES |
+| placementId |  | x | number | YES |
+| refgroups | | x | string | NO |
+| cwcreative |  | x | string | NO |
+| cwapikey | | x | string | NO |
+
+
+### adUnit configuration
+
+```javascript
+var adUnits = [
+  {
+    code: 'target_div_id', // REQUIRED 
+    bids: [{
+      bidder: 'cwire',
+      mediaTypes: {
+        banner: {
+          sizes: [[1, 1]],
+        }
+      },
+      params: {
+        pageId: 1422,                 // required - number
+        placementId: 2211521,         // required - number
+        cwcreative: '42',             // optional - id of creative to force
+        refgroups: 'test-user',       // optional - name of group or coma separated list of groups to force
+        cwapikey: 'api_key_xyz',      // optional - api key for integration testing        
+      }
+    }]
+  }
+];
+```
diff --git a/modules/dacIdSystem.js b/modules/dacIdSystem.js
new file mode 100644
index 00000000000..856e1976bb1
--- /dev/null
+++ b/modules/dacIdSystem.js
@@ -0,0 +1,175 @@
+/**
+ * This module adds dacId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/dacIdSystem
+ * @requires module:modules/userId
+ */
+
+import {
+  logError,
+  logInfo,
+  logWarn
+} from '../src/utils.js';
+import {
+  ajax
+} from '../src/ajax.js'
+import {
+  submodule
+} from '../src/hook.js';
+import {
+  getStorageManager
+} from '../src/storageManager.js';
+
+export const storage = getStorageManager();
+
+export const FUUID_COOKIE_NAME = '_a1_f';
+export const AONEID_COOKIE_NAME = '_a1_d';
+export const API_URL = 'https://penta.a.one.impact-ad.jp/aud';
+const COOKIES_EXPIRES = 60 * 60 * 24 * 1000; // 24h
+const LOG_PREFIX = 'User ID - dacId submodule: ';
+
+/**
+ * @returns {{fuuid: string, uid: string}} -
+ */
+function getCookieId() {
+  return {
+    fuuid: storage.getCookie(FUUID_COOKIE_NAME),
+    uid: storage.getCookie(AONEID_COOKIE_NAME)
+  };
+}
+
+/**
+ * set uid to cookie.
+ * @param {string} uid -
+ * @returns {void} -
+ */
+function setAoneidToCookie(uid) {
+  if (uid) {
+    const expires = new Date(Date.now() + COOKIES_EXPIRES).toUTCString();
+    storage.setCookie(
+      AONEID_COOKIE_NAME,
+      uid,
+      expires,
+      'none'
+    );
+  }
+}
+
+/**
+ * @param {string} oid -
+ * @param {string} fuuid -
+ * @returns {string} -
+ */
+function getApiUrl(oid, fuuid) {
+  return `${API_URL}?oid=${oid}&fu=${fuuid}`;
+}
+
+/**
+ * @param {string} oid -
+ * @param {string} fuuid -
+ * @returns {{callback: function}} -
+ */
+function fetchAoneId(oid, fuuid) {
+  return {
+    callback: (callback) => {
+      const ret = {
+        fuuid,
+        uid: undefined
+      };
+      const callbacks = {
+        success: (response) => {
+          if (response) {
+            try {
+              const responseObj = JSON.parse(response);
+              if (responseObj.error) {
+                logWarn(LOG_PREFIX + 'There is no permission to use API: ' + responseObj.error);
+                return callback(ret);
+              }
+              if (!responseObj.uid) {
+                logWarn(LOG_PREFIX + 'AoneId is null');
+                return callback(ret);
+              }
+              ret.uid = responseObj.uid;
+              setAoneidToCookie(ret.uid);
+            } catch (error) {
+              logError(LOG_PREFIX + error);
+            }
+          }
+          callback(ret);
+        },
+        error: (error) => {
+          logError(LOG_PREFIX + error);
+          callback(ret);
+        }
+      };
+      const apiUrl = getApiUrl(oid, fuuid);
+      ajax(apiUrl, callbacks, undefined, {
+        method: 'GET',
+        withCredentials: true
+      });
+    },
+  };
+}
+
+export const dacIdSystemSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'dacId',
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @param { {fuuid: string, uid: string} } id
+   * @returns { {dacId: {fuuid: string, dacId: string} } | undefined }
+   */
+  decode(id) {
+    if (id && typeof id === 'object') {
+      return {
+        dacId: {
+          fuuid: id.fuuid,
+          id: id.uid
+        }
+      }
+    }
+  },
+
+  /**
+   * performs action to obtain id
+   * @function
+   * @returns { {id: {fuuid: string, uid: string}} | undefined }
+   */
+  getId(config) {
+    const cookie = getCookieId();
+
+    if (!cookie.fuuid) {
+      logInfo(LOG_PREFIX + 'There is no fuuid in cookie')
+      return undefined;
+    }
+
+    if (cookie.fuuid && cookie.uid) {
+      logInfo(LOG_PREFIX + 'There is fuuid and AoneId in cookie')
+      return {
+        id: {
+          fuuid: cookie.fuuid,
+          uid: cookie.uid
+        }
+      };
+    }
+
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.oid !== 'string') {
+      logWarn(LOG_PREFIX + 'oid is not defined');
+      return {
+        id: {
+          fuuid: cookie.fuuid,
+          uid: undefined
+        }
+      };
+    }
+
+    return fetchAoneId(configParams.oid, cookie.fuuid);
+  }
+};
+
+submodule('userId', dacIdSystemSubmodule);
diff --git a/modules/dacIdSystem.md b/modules/dacIdSystem.md
new file mode 100644
index 00000000000..c78b8ff2741
--- /dev/null
+++ b/modules/dacIdSystem.md
@@ -0,0 +1,33 @@
+## AudienceOne User ID Submodule
+
+AudienceOne ID, provided by [D.A.Consortium Inc.](https://www.dac.co.jp/), is ID for ad targeting by using 1st party cookie.
+Please visit [https://solutions.dac.co.jp/audienceone](https://solutions.dac.co.jp/audienceone) and request your Owner ID to get started.
+
+## Building Prebid with AudienceOne ID Support
+
+First, make sure to add the AudienceOne ID submodule to your Prebid.js package with:
+
+```
+gulp build --modules=dacIdSystem
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'dacId',
+            params: {
+                'oid': '55h67qm4ck37vyz5'
+            }
+        }]
+    }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module. | `"dacId"` |
+| params | Required | Object | Details of module params. | |
+| params.oid | Required | String | This is the Owner ID value obtained via D.A.Consortium Inc. | `"55h67qm4ck37vyz5"` |
\ No newline at end of file
diff --git a/modules/dailyhuntBidAdapter.js b/modules/dailyhuntBidAdapter.js
index 1018417300a..5ae8ee3ea21 100644
--- a/modules/dailyhuntBidAdapter.js
+++ b/modules/dailyhuntBidAdapter.js
@@ -1,9 +1,10 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
 import * as mediaTypes from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
-import find from 'core-js-pure/features/array/find.js';
-import { OUTSTREAM, INSTREAM } from '../src/video.js';
+import {_map, deepAccess, isEmpty} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import {find} from '../src/polyfill.js';
+import {INSTREAM, OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'dailyhunt';
 const BIDDER_ALIAS = 'dh';
@@ -80,7 +81,7 @@ const _encodeURIComponent = function (a) {
 // Extract key from collections.
 const extractKeyInfo = (collection, key) => {
   for (let i = 0, result; i < collection.length; i++) {
-    result = utils.deepAccess(collection[i].params, key);
+    result = deepAccess(collection[i].params, key);
     if (result) {
       return result;
     }
@@ -96,7 +97,7 @@ const flatten = (arr) => {
 const createOrtbRequest = (validBidRequests, bidderRequest) => {
   let device = createOrtbDeviceObj(validBidRequests);
   let user = createOrtbUserObj(validBidRequests)
-  let site = createOrtbSiteObj(validBidRequests, bidderRequest.refererInfo.referer)
+  let site = createOrtbSiteObj(validBidRequests, bidderRequest.refererInfo.page)
   return {
     id: bidderRequest.auctionId,
     imp: [],
@@ -117,7 +118,7 @@ const createOrtbUserObj = (validBidRequests) => ({ ...extractKeyInfo(validBidReq
 const createOrtbSiteObj = (validBidRequests, page) => {
   let site = { ...extractKeyInfo(validBidRequests, `site`), page };
   let publisher = createOrtbPublisherObj(validBidRequests);
-  if (publisher) {
+  if (!site.publisher) {
     site.publisher = publisher
   }
   return site
@@ -125,18 +126,23 @@ const createOrtbSiteObj = (validBidRequests, page) => {
 
 const createOrtbPublisherObj = (validBidRequests) => ({ ...extractKeyInfo(validBidRequests, `publisher`) })
 
+// get bidFloor Function for different creatives
+function getBidFloor(bid, creative) {
+  let floorInfo = typeof (bid.getFloor) == 'function' ? bid.getFloor({ currency: 'USD', mediaType: creative, size: '*' }) : {};
+  return Math.floor(floorInfo.floor || (bid.params.bidfloor ? bid.params.bidfloor : 0.0));
+}
+
 const createOrtbImpObj = (bid) => {
   let params = bid.params
   let testMode = !!bid.params.test_mode
 
   // Validate Banner Request.
-  let bannerObj = utils.deepAccess(bid.mediaTypes, `banner`);
-  let nativeObj = utils.deepAccess(bid.mediaTypes, `native`);
-  let videoObj = utils.deepAccess(bid.mediaTypes, `video`);
+  let bannerObj = deepAccess(bid.mediaTypes, `banner`);
+  let nativeObj = deepAccess(bid.mediaTypes, `native`);
+  let videoObj = deepAccess(bid.mediaTypes, `video`);
 
   let imp = {
     id: bid.bidId,
-    bidfloor: params.bidfloor ? params.bidfloor : 0,
     ext: {
       dailyhunt: {
         placement_id: params.placement_id,
@@ -155,14 +161,17 @@ const createOrtbImpObj = (bid) => {
     imp.banner = {
       ...createOrtbImpBannerObj(bid, bannerObj)
     }
+    imp.bidfloor = getBidFloor(bid, 'banner');
   } else if (nativeObj) {
     imp.native = {
       ...createOrtbImpNativeObj(bid, nativeObj)
     }
+    imp.bidfloor = getBidFloor(bid, 'native');
   } else if (videoObj) {
     imp.video = {
       ...createOrtbImpVideoObj(bid, videoObj)
     }
+    imp.bidfloor = getBidFloor(bid, 'video');
   }
   return imp;
 }
@@ -178,7 +187,7 @@ const createOrtbImpBannerObj = (bid, bannerObj) => {
 }
 
 const createOrtbImpNativeObj = (bid, nativeObj) => {
-  const assets = utils._map(bid.nativeParams, (bidParams, key) => {
+  const assets = _map(bid.nativeParams, (bidParams, key) => {
     const props = ORTB_NATIVE_PARAMS[key];
     const asset = {
       required: bidParams.required & 1,
@@ -215,10 +224,18 @@ const createOrtbImpNativeObj = (bid, nativeObj) => {
 const createOrtbImpVideoObj = (bid, videoObj) => {
   let obj = {};
   let params = bid.params
-  if (!utils.isEmpty(bid.params.video)) {
+  if (!isEmpty(bid.params.video)) {
     obj = {
-      ...params.video,
-    }
+      topframe: 1,
+      skip: params.video.skippable || 0,
+      linearity: params.video.linearity || 1,
+      minduration: params.video.minduration || 5,
+      maxduration: params.video.maxduration || 60,
+      mimes: params.video.mimes || ['video/mp4'],
+      protocols: getProtocols(params.video),
+      w: params.video.playerSize[0][0],
+      h: params.video.playerSize[0][1],
+    };
   } else {
     obj = {
       mimes: ['video/mp4'],
@@ -230,6 +247,27 @@ const createOrtbImpVideoObj = (bid, videoObj) => {
   return obj;
 }
 
+export function getProtocols({protocols}) {
+  let defaultValue = [2, 3, 5, 6, 7, 8];
+  let listProtocols = [
+    {key: 'VAST_1_0', value: 1},
+    {key: 'VAST_2_0', value: 2},
+    {key: 'VAST_3_0', value: 3},
+    {key: 'VAST_1_0_WRAPPER', value: 4},
+    {key: 'VAST_2_0_WRAPPER', value: 5},
+    {key: 'VAST_3_0_WRAPPER', value: 6},
+    {key: 'VAST_4_0', value: 7},
+    {key: 'VAST_4_0_WRAPPER', value: 8}
+  ];
+  if (protocols) {
+    return listProtocols.filter(p => {
+      return protocols.indexOf(p.key) !== -1
+    }).map(p => p.value);
+  } else {
+    return defaultValue;
+  }
+}
+
 const createServerRequest = (ortbRequest, validBidRequests, isTestMode = 'false') => ({
   method: 'POST',
   url: isTestMode === 'true' ? PROD_PREBID_TEST_ENDPOINT_URL + validBidRequests[0].params.partner_name : PROD_PREBID_ENDPOINT_URL + validBidRequests[0].params.partner_name,
@@ -252,7 +290,8 @@ const createPrebidBannerBid = (bid, bidResponse) => ({
   currency: 'USD',
   ad: bidResponse.adm,
   mediaType: 'banner',
-  winUrl: bidResponse.nurl
+  winUrl: bidResponse.nurl,
+  adomain: bidResponse.adomain
 })
 
 const createPrebidNativeBid = (bid, bidResponse) => ({
@@ -267,6 +306,7 @@ const createPrebidNativeBid = (bid, bidResponse) => ({
   winUrl: bidResponse.nurl,
   width: bidResponse.w,
   height: bidResponse.h,
+  adomain: bidResponse.adomain
 })
 
 const parseNative = (bid) => {
@@ -279,15 +319,15 @@ const parseNative = (bid) => {
     javascriptTrackers: jstracker ? [ jstracker ] : []
   };
   assets.forEach(asset => {
-    if (!utils.isEmpty(asset.title)) {
+    if (!isEmpty(asset.title)) {
       result.title = asset.title.text
-    } else if (!utils.isEmpty(asset.img)) {
+    } else if (!isEmpty(asset.img)) {
       result[ORTB_NATIVE_TYPE_MAPPING.img[asset.img.type]] = {
         url: asset.img.url,
         height: asset.img.h,
         width: asset.img.w
       }
-    } else if (!utils.isEmpty(asset.data)) {
+    } else if (!isEmpty(asset.data)) {
       result[ORTB_NATIVE_TYPE_MAPPING.data[asset.data.type]] = asset.data.value
     }
   });
@@ -307,6 +347,7 @@ const createPrebidVideoBid = (bid, bidResponse) => {
     currency: 'USD',
     mediaType: 'video',
     winUrl: bidResponse.nurl,
+    adomain: bidResponse.adomain
   };
 
   let videoContext = bid.mediaTypes.video.context;
@@ -344,6 +385,9 @@ export const spec = {
   isBidRequestValid: bid => !!bid.params.placement_id && !!bid.params.publisher_id && !!bid.params.partner_name,
 
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let serverRequests = [];
 
     // ORTB Request.
diff --git a/modules/dailyhuntBidAdapter.md b/modules/dailyhuntBidAdapter.md
index acfd20a4de0..a08b66fb826 100644
--- a/modules/dailyhuntBidAdapter.md
+++ b/modules/dailyhuntBidAdapter.md
@@ -99,3 +99,7 @@ Dailyhunt bid adapter supports Banner, Native and Video.
         }
     ];
 ```
+
+## latest commit has all the required support for latest version of prebid above 6.x
+## Dailyhunt adapter was there till 4.x and then removed in version 5.x of prebid.
+## this doc has been also submitted to https://github.com/prebid/prebid.github.io
\ No newline at end of file
diff --git a/modules/danmarketBidAdapter.md b/modules/danmarketBidAdapter.md
deleted file mode 100644
index 8ddc83d2cf6..00000000000
--- a/modules/danmarketBidAdapter.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Overview
-
-Module Name: Dentsu Aegis Network Marketplace Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: niels@baarsma.net
-
-# Description
-
-Module that connects to DAN Marketplace demand source to fetch bids.
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "danmarket",
-                       params: {
-                           uid: '4',
-                           priceType: 'gross' // by default is 'net'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[728, 90]],
-               bids: [
-                   {
-                       bidder: "danmarket",
-                       params: {
-                           uid: 5,
-                           priceType: 'gross'
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/dataControllerModule/index.js b/modules/dataControllerModule/index.js
new file mode 100644
index 00000000000..b1866e3783f
--- /dev/null
+++ b/modules/dataControllerModule/index.js
@@ -0,0 +1,196 @@
+/**
+ * This module validates the configuration and filters data accordingly
+ * @module modules/dataController
+ */
+import {config} from '../../src/config.js';
+import {getHook, module} from '../../src/hook.js';
+import {deepAccess, deepSetValue, prefixLog} from '../../src/utils.js';
+import {startAuction} from '../../src/prebid.js';
+import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
+
+const LOG_PRE_FIX = 'Data_Controller : ';
+const ALL = '*';
+const MODULE_NAME = 'dataController';
+const GLOBAL = {};
+let _dataControllerConfig;
+
+const _logger = prefixLog(LOG_PRE_FIX);
+
+/**
+ * BidderRequests hook to intiate module and reset data object
+ */
+export const filterBidData = timedAuctionHook('dataController', function filterBidData(fn, req) {
+  if (_dataControllerConfig.filterEIDwhenSDA) {
+    filterEIDs(req.adUnits, req.ortb2Fragments);
+  }
+
+  if (_dataControllerConfig.filterSDAwhenEID) {
+    filterSDA(req.adUnits, req.ortb2Fragments);
+  }
+  fn.call(this, req);
+  return req;
+});
+
+function containsConfiguredEIDS(eidSourcesMap, bidderCode) {
+  if (_dataControllerConfig.filterSDAwhenEID.includes(ALL)) {
+    return true;
+  }
+  let bidderEIDs = eidSourcesMap.get(bidderCode);
+  if (bidderEIDs == undefined) {
+    return false;
+  }
+  let containsEIDs = false;
+  _dataControllerConfig.filterSDAwhenEID.some(source => {
+    if (bidderEIDs.has(source)) {
+      containsEIDs = true;
+    }
+  });
+  return containsEIDs;
+}
+
+function containsConfiguredSDA(segementMap, bidderCode) {
+  if (_dataControllerConfig.filterEIDwhenSDA.includes(ALL)) {
+    return true;
+  }
+  return hasValue(segementMap.get(bidderCode)) || hasValue(segementMap.get(GLOBAL))
+}
+
+function hasValue(bidderSegement) {
+  let containsSDA = false;
+  if (bidderSegement == undefined) {
+    return false;
+  }
+  _dataControllerConfig.filterEIDwhenSDA.some(segment => {
+    if (bidderSegement.has(segment)) {
+      containsSDA = true;
+    }
+  });
+  return containsSDA;
+}
+
+function getSegmentConfig(ortb2Fragments) {
+  let bidderSDAMap = new Map();
+  let globalObject = deepAccess(ortb2Fragments, 'global') || {};
+
+  collectSegments(bidderSDAMap, GLOBAL, globalObject);
+  if (ortb2Fragments.bidder) {
+    for (const [key, value] of Object.entries(ortb2Fragments.bidder)) {
+      collectSegments(bidderSDAMap, key, value);
+    }
+  }
+  return bidderSDAMap;
+}
+
+function collectSegments(bidderSDAMap, key, data) {
+  let segmentSet = constructSegment(deepAccess(data, 'user.data') || []);
+  if (segmentSet && segmentSet.size > 0) bidderSDAMap.set(key, segmentSet);
+}
+
+function constructSegment(userData) {
+  let segmentSet;
+  if (userData) {
+    segmentSet = new Set();
+    for (let i = 0; i < userData.length; i++) {
+      let segments = userData[i].segment;
+      let segmentPrefix = '';
+      if (userData[i].name) {
+        segmentPrefix = userData[i].name + ':';
+      }
+
+      if (userData[i].ext && userData[i].ext.segtax) {
+        segmentPrefix += userData[i].ext.segtax + ':';
+      }
+      for (let j = 0; j < segments.length; j++) {
+        segmentSet.add(segmentPrefix + segments[j].id);
+      }
+    }
+  }
+
+  return segmentSet;
+}
+
+function getEIDsSource(adUnits) {
+  let bidderEIDSMap = new Map();
+  adUnits.forEach(adUnit => {
+    (adUnit.bids || []).forEach(bid => {
+      let userEIDs = deepAccess(bid, 'userIdAsEids') || [];
+
+      if (userEIDs) {
+        let sourceSet = new Set();
+        for (let i = 0; i < userEIDs.length; i++) {
+          let source = userEIDs[i].source;
+          sourceSet.add(source);
+        }
+        bidderEIDSMap.set(bid.bidder, sourceSet);
+      }
+    });
+  });
+
+  return bidderEIDSMap;
+}
+
+function filterSDA(adUnits, ortb2Fragments) {
+  let bidderEIDSMap = getEIDsSource(adUnits);
+  let resetGlobal = false;
+  for (const [key, value] of Object.entries(ortb2Fragments.bidder)) {
+    let resetSDA = containsConfiguredEIDS(bidderEIDSMap, key);
+    if (resetSDA) {
+      deepSetValue(value, 'user.data', []);
+      resetGlobal = true;
+    }
+  }
+  if (resetGlobal) {
+    deepSetValue(ortb2Fragments, 'global.user.data', [])
+  }
+}
+
+function filterEIDs(adUnits, ortb2Fragments) {
+  let segementMap = getSegmentConfig(ortb2Fragments);
+  let globalEidUpdate = false;
+  adUnits.forEach(adUnit => {
+    adUnit.bids.forEach(bid => {
+      let resetEID = containsConfiguredSDA(segementMap, bid.bidder);
+      if (resetEID) {
+        globalEidUpdate = true;
+        bid.userIdAsEids = [];
+        bid.userId = {};
+        if (ortb2Fragments.bidder) {
+          let bidderFragment = ortb2Fragments.bidder[bid.bidder];
+          let userExt = deepAccess(bidderFragment, 'user.ext.eids') || [];
+          if (userExt) {
+            deepSetValue(bidderFragment, 'user.ext.eids', [])
+          }
+        }
+      }
+    });
+  });
+
+  if (globalEidUpdate) {
+    deepSetValue(ortb2Fragments, 'global.user.ext.eids', [])
+  }
+  return adUnits;
+}
+
+export function init() {
+  const confListener = config.getConfig(MODULE_NAME, dataControllerConfig => {
+    const dataController = dataControllerConfig && dataControllerConfig.dataController;
+    if (!dataController) {
+      _logger.logInfo(`Data Controller is not configured`);
+      startAuction.getHooks({hook: filterBidData}).remove();
+      return;
+    }
+
+    if (dataController.filterEIDwhenSDA && dataController.filterSDAwhenEID) {
+      _logger.logInfo(`Data Controller can be configured with either filterEIDwhenSDA or filterSDAwhenEID`);
+      startAuction.getHooks({hook: filterBidData}).remove();
+      return;
+    }
+    confListener(); // unsubscribe config listener
+    _dataControllerConfig = dataController;
+
+    getHook('startAuction').before(filterBidData);
+  });
+}
+
+init();
+module(MODULE_NAME, init);
diff --git a/modules/dataControllerModule/index.md b/modules/dataControllerModule/index.md
new file mode 100644
index 00000000000..8714b886b0e
--- /dev/null
+++ b/modules/dataControllerModule/index.md
@@ -0,0 +1,29 @@
+# Overview
+
+```
+Module Name: Data Controller Module
+```
+
+# Description
+
+This module will filter EIDs and SDA based on the configurations.
+
+Sub module object with the following keys:
+
+|  param name | type  | Scope | Description | Params |
+| :------------ | :------------ | :------ | :------ | :------ |
+|  filterEIDwhenSDA  | function | optional | Filters user EIDs based on SDA | bidrequest |
+|  filterSDAwhenEID  | function | optional | Filters SDA based on configured EIDs | bidrequest  |
+
+# Module Control Configuration
+
+```
+
+pbjs.setConfig({
+    dataController: {
+       filterEIDwhenSDA: ['*']
+       filterSDAwhenEID: ['id5-sync.com'] 
+    }
+});
+
+```
diff --git a/modules/datablocksAnalyticsAdapter.js b/modules/datablocksAnalyticsAdapter.js
index 5e977155284..61933cc45e9 100644
--- a/modules/datablocksAnalyticsAdapter.js
+++ b/modules/datablocksAnalyticsAdapter.js
@@ -2,7 +2,7 @@
  * Analytics Adapter for Datablocks
  */
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 var datablocksAdapter = adapter({
diff --git a/modules/datablocksBidAdapter.js b/modules/datablocksBidAdapter.js
index b00a3eae659..4e21e08ba57 100644
--- a/modules/datablocksBidAdapter.js
+++ b/modules/datablocksBidAdapter.js
@@ -1,330 +1,632 @@
-import * as utils from '../src/utils.js';
+import { getWindowTop, isGptPubadsDefined, deepAccess, getAdUnitSizes, isEmpty } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-const NATIVE_MAP = {
-  'body': 2,
-  'body2': 10,
-  'price': 6,
-  'displayUrl': 11,
-  'cta': 12
-};
-const NATIVE_IMAGE = [{
-  id: 1,
-  required: 1,
+import { config } from '../src/config.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+export const storage = getStorageManager({bidderCode: 'datablocks'});
+
+const NATIVE_ID_MAP = {};
+const NATIVE_PARAMS = {
   title: {
-    len: 140
-  }
-}, {
-  id: 2,
-  required: 1,
-  img: { type: 3 }
-}, {
-  id: 3,
-  required: 1,
-  data: {
-    type: 11
-  }
-}, {
-  id: 4,
-  required: 0,
-  data: {
+    id: 1,
+    name: 'title'
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img'
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+  body: {
+    id: 4,
+    name: 'data',
     type: 2
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1
+  },
+  cta: {
+    id: 6,
+    type: 12,
+    name: 'data'
+  },
+  body2: {
+    id: 7,
+    name: 'data',
+    type: 10
+  },
+  rating: {
+    id: 8,
+    name: 'data',
+    type: 3
+  },
+  likes: {
+    id: 9,
+    name: 'data',
+    type: 4
+  },
+  downloads: {
+    id: 10,
+    name: 'data',
+    type: 5
+  },
+  displayUrl: {
+    id: 11,
+    name: 'data',
+    type: 11
+  },
+  price: {
+    id: 12,
+    name: 'data',
+    type: 6
+  },
+  salePrice: {
+    id: 13,
+    name: 'data',
+    type: 7
+  },
+  address: {
+    id: 14,
+    name: 'data',
+    type: 9
+  },
+  phone: {
+    id: 15,
+    name: 'data',
+    type: 8
   }
-}, {
-  id: 5,
-  required: 0,
-  img: { type: 1 }
-}, {
-  id: 6,
-  required: 0,
-  data: {
-    type: 12
-  }
-}];
+};
 
-const VIDEO_PARAMS = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay',
-  'placement', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended',
-  'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery',
-  'pos', 'companionad', 'api', 'companiontype', 'ext'];
+Object.keys(NATIVE_PARAMS).forEach((key) => {
+  NATIVE_ID_MAP[NATIVE_PARAMS[key].id] = key;
+});
 
+// DEFINE THE PREBID BIDDER SPEC
 export const spec = {
-  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  supportedMediaTypes: [BANNER, NATIVE],
   code: 'datablocks',
+
+  // DATABLOCKS SCOPED OBJECT
+  db_obj: {metrics_host: 'prebid.dblks.net', metrics: [], metrics_timer: null, metrics_queue_time: 1000, vis_optout: false, source_id: 0},
+
+  // STORE THE DATABLOCKS BUYERID IN STORAGE
+  store_dbid: function(dbid) {
+    let stored = false;
+
+    // CREATE 1 YEAR EXPIRY DATE
+    let d = new Date();
+    d.setTime(Date.now() + (365 * 24 * 60 * 60 * 1000));
+
+    // TRY TO STORE IN COOKIE
+    if (storage.cookiesAreEnabled) {
+      storage.setCookie('_db_dbid', dbid, d.toUTCString(), 'None', null);
+      stored = true;
+    }
+
+    // TRY TO STORE IN LOCAL STORAGE
+    if (storage.localStorageIsEnabled) {
+      storage.setDataInLocalStorage('_db_dbid', dbid);
+      stored = true;
+    }
+
+    return stored;
+  },
+
+  // FETCH DATABLOCKS BUYERID FROM STORAGE
+  get_dbid: function() {
+    let dbId = '';
+    if (storage.cookiesAreEnabled) {
+      dbId = storage.getCookie('_db_dbid') || '';
+    }
+
+    if (!dbId && storage.localStorageIsEnabled) {
+      dbId = storage.getDataFromLocalStorage('_db_dbid') || '';
+    }
+    return dbId;
+  },
+
+  // STORE SYNCS IN STORAGE
+  store_syncs: function(syncs) {
+    if (storage.localStorageIsEnabled) {
+      let syncObj = {};
+      syncs.forEach(sync => {
+        syncObj[sync.id] = sync.uid;
+      });
+
+      // FETCH EXISTING SYNCS AND MERGE NEW INTO STORAGE
+      let storedSyncs = this.get_syncs();
+      storage.setDataInLocalStorage('_db_syncs', JSON.stringify(Object.assign(storedSyncs, syncObj)));
+
+      return true;
+    }
+  },
+
+  // GET SYNCS FROM STORAGE
+  get_syncs: function() {
+    if (storage.localStorageIsEnabled) {
+      let syncData = storage.getDataFromLocalStorage('_db_syncs');
+      if (syncData) {
+        return JSON.parse(syncData);
+      } else {
+        return {};
+      }
+    } else {
+      return {};
+    }
+  },
+
+  // ADD METRIC DATA TO THE METRICS RESPONSE QUEUE
+  queue_metric: function(metric) {
+    if (typeof metric === 'object') {
+      // PUT METRICS IN THE QUEUE
+      this.db_obj.metrics.push(metric);
+
+      // RESET PREVIOUS TIMER
+      if (this.db_obj.metrics_timer) {
+        clearTimeout(this.db_obj.metrics_timer);
+      }
+
+      // SETUP THE TIMER TO FIRE BACK THE DATA
+      let scope = this;
+      this.db_obj.metrics_timer = setTimeout(function() {
+        scope.send_metrics();
+      }, this.db_obj.metrics_queue_time);
+
+      return true;
+    } else {
+      return false;
+    }
+  },
+
+  // POST CONSOLIDATED METRICS BACK TO SERVER
+  send_metrics: function() {
+    // POST TO SERVER
+    ajax(`https://${this.db_obj.metrics_host}/a/pb/`, null, JSON.stringify(this.db_obj.metrics), {method: 'POST', withCredentials: true});
+
+    // RESET THE QUEUE OF METRIC DATA
+    this.db_obj.metrics = [];
+
+    return true;
+  },
+
+  // GET BASIC CLIENT INFORMATION
+  get_client_info: function () {
+    let botTest = new BotClientTests();
+    let win = getWindowTop();
+    return {
+      'wiw': win.innerWidth,
+      'wih': win.innerHeight,
+      'saw': screen ? screen.availWidth : null,
+      'sah': screen ? screen.availHeight : null,
+      'scd': screen ? screen.colorDepth : null,
+      'sw': screen ? screen.width : null,
+      'sh': screen ? screen.height : null,
+      'whl': win.history.length,
+      'wxo': win.pageXOffset,
+      'wyo': win.pageYOffset,
+      'wpr': win.devicePixelRatio,
+      'is_bot': botTest.doTests(),
+      'is_hid': win.document.hidden,
+      'vs': win.document.visibilityState
+    };
+  },
+
+  // LISTEN FOR GPT VIEWABILITY EVENTS
+  get_viewability: function(bid) {
+    // ONLY RUN ONCE IF PUBLISHER HAS OPTED IN
+    if (!this.db_obj.vis_optout && !this.db_obj.vis_run) {
+      this.db_obj.vis_run = true;
+
+      // ADD GPT EVENT LISTENERS
+      let scope = this;
+      if (isGptPubadsDefined()) {
+        if (typeof window['googletag'].pubads().addEventListener == 'function') {
+          window['googletag'].pubads().addEventListener('impressionViewable', function(event) {
+            scope.queue_metric({type: 'slot_view', source_id: scope.db_obj.source_id, auction_id: bid.auctionId, div_id: event.slot.getSlotElementId(), slot_id: event.slot.getSlotId().getAdUnitPath()});
+          });
+          window['googletag'].pubads().addEventListener('slotRenderEnded', function(event) {
+            scope.queue_metric({type: 'slot_render', source_id: scope.db_obj.source_id, auction_id: bid.auctionId, div_id: event.slot.getSlotElementId(), slot_id: event.slot.getSlotId().getAdUnitPath()});
+          })
+        }
+      }
+    }
+  },
+
+  // VALIDATE THE BID REQUEST
   isBidRequestValid: function(bid) {
-    return !!(bid.params.host && bid.params.sourceId &&
-      bid.mediaTypes && (bid.mediaTypes.banner || bid.mediaTypes.native || bid.mediaTypes.video));
+    // SET GLOBAL VARS FROM BIDDER CONFIG
+    this.db_obj.source_id = bid.params.source_id;
+    if (bid.params.vis_optout) {
+      this.db_obj.vis_optout = true;
+    }
+
+    return !!(bid.params.source_id && bid.mediaTypes && (bid.mediaTypes.banner || bid.mediaTypes.native));
   },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    if (!validBidRequests.length) { return []; }
 
-    let imps = {};
-    let site = {};
-    let device = {};
-    let refurl = utils.parseUrl(bidderRequest.referrer);
-    let requests = [];
+  // GENERATE THE RTB REQUEST
+  buildRequests: function(validRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validRequests = convertOrtbRequestToProprietaryNative(validRequests);
+
+    // RETURN EMPTY IF THERE ARE NO VALID REQUESTS
+    if (!validRequests.length) {
+      return [];
+    }
 
-    validBidRequests.forEach(bidRequest => {
+    // CONVERT PREBID NATIVE REQUEST OBJ INTO RTB OBJ
+    function createNativeRequest(bid) {
+      const assets = [];
+      if (bid.nativeParams) {
+        Object.keys(bid.nativeParams).forEach((key) => {
+          if (NATIVE_PARAMS[key]) {
+            const {name, type, id} = NATIVE_PARAMS[key];
+            const assetObj = type ? {type} : {};
+            let {len, sizes, required, aspect_ratios: aRatios} = bid.nativeParams[key];
+            if (len) {
+              assetObj.len = len;
+            }
+            if (aRatios && aRatios[0]) {
+              aRatios = aRatios[0];
+              let wmin = aRatios.min_width || 0;
+              let hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+              assetObj.wmin = wmin;
+              assetObj.hmin = hmin;
+            }
+            if (sizes && sizes.length) {
+              sizes = [].concat(...sizes);
+              assetObj.w = sizes[0];
+              assetObj.h = sizes[1];
+            }
+            const asset = {required: required ? 1 : 0, id};
+            asset[name] = assetObj;
+            assets.push(asset);
+          }
+        });
+      }
+      return {
+        ver: '1.2',
+        request: {
+          assets: assets,
+          context: 1,
+          plcmttype: 1,
+          ver: '1.2'
+        }
+      }
+    }
+    let imps = [];
+    // ITERATE THE VALID REQUESTS AND GENERATE IMP OBJECT
+    validRequests.forEach(bidRequest => {
+      // BUILD THE IMP OBJECT
       let imp = {
         id: bidRequest.bidId,
-        tagid: bidRequest.adUnitCode,
-        secure: window.location.protocol == 'https:'
+        tagid: bidRequest.params.tagid || bidRequest.adUnitCode,
+        placement_id: bidRequest.params.placement_id || 0,
+        secure: window.location.protocol == 'https:',
+        ortb2: deepAccess(bidRequest, `ortb2Imp`) || {},
+        floor: {}
+      }
+
+      // CHECK FOR FLOORS
+      if (typeof bidRequest.getFloor === 'function') {
+        imp.floor = bidRequest.getFloor({
+          currency: 'USD',
+          mediaType: '*',
+          size: '*'
+        });
       }
 
-      if (utils.deepAccess(bidRequest, `mediaTypes.banner`)) {
-        let sizes = bidRequest.mediaTypes.banner.sizes;
-        if (sizes.length == 1) {
+      // BUILD THE SIZES
+      if (deepAccess(bidRequest, `mediaTypes.banner`)) {
+        let sizes = getAdUnitSizes(bidRequest);
+        if (sizes.length) {
           imp.banner = {
             w: sizes[0][0],
-            h: sizes[0][1]
-          }
-        } else if (sizes.length > 1) {
-          imp.banner = {
+            h: sizes[0][1],
             format: sizes.map(size => ({ w: size[0], h: size[1] }))
           };
-        } else {
-          return;
-        }
-      } else if (utils.deepAccess(bidRequest, 'mediaTypes.native')) {
-        let nativeImp = bidRequest.mediaTypes.native;
-
-        if (nativeImp.type) {
-          let nativeAssets = [];
-          switch (nativeImp.type) {
-            case 'image':
-              nativeAssets = NATIVE_IMAGE;
-              break;
-            default:
-              return;
-          }
-          imp.native = JSON.stringify({ assets: nativeAssets });
-        } else {
-          let nativeAssets = [];
-          let nativeKeys = Object.keys(nativeImp);
-          nativeKeys.forEach((nativeKey, index) => {
-            let required = !!nativeImp[nativeKey].required;
-            let assetId = index + 1;
-            switch (nativeKey) {
-              case 'title':
-                nativeAssets.push({
-                  id: assetId,
-                  required: required,
-                  title: {
-                    len: nativeImp[nativeKey].len || 140
-                  }
-                });
-                break;
-              case 'body': // desc
-              case 'body2': // desc2
-              case 'price':
-              case 'display_url':
-                let data = {
-                  id: assetId,
-                  required: required,
-                  data: {
-                    type: NATIVE_MAP[nativeKey]
-                  }
-                }
-                if (nativeImp[nativeKey].data && nativeImp[nativeKey].data.len) { data.data.len = nativeImp[nativeKey].data.len; }
-
-                nativeAssets.push(data);
-                break;
-              case 'image':
-                if (nativeImp[nativeKey].sizes && nativeImp[nativeKey].sizes.length) {
-                  nativeAssets.push({
-                    id: assetId,
-                    required: required,
-                    image: {
-                      type: 3,
-                      w: nativeImp[nativeKey].sizes[0],
-                      h: nativeImp[nativeKey].sizes[1]
-                    }
-                  })
-                }
-            }
-          });
-          imp.native = {
-            request: JSON.stringify({native: {assets: nativeAssets}})
-          };
-        }
-      } else if (utils.deepAccess(bidRequest, 'mediaTypes.video')) {
-        let video = bidRequest.mediaTypes.video;
-        let sizes = video.playerSize || bidRequest.sizes || [];
-        if (sizes.length && Array.isArray(sizes[0])) {
-          imp.video = {
-            w: sizes[0][0],
-            h: sizes[0][1]
-          };
-        } else if (sizes.length == 2 && !Array.isArray(sizes[0])) {
-          imp.video = {
-            w: sizes[0],
-            h: sizes[1]
-          };
-        } else {
-          return;
-        }
-
-        if (video.durationRangeSec) {
-          if (Array.isArray(video.durationRangeSec)) {
-            if (video.durationRangeSec.length == 1) {
-              imp.video.maxduration = video.durationRangeSec[0];
-            } else if (video.durationRangeSec.length == 2) {
-              imp.video.minduration = video.durationRangeSec[0];
-              imp.video.maxduration = video.durationRangeSec[1];
-            }
-          } else {
-            imp.video.maxduration = video.durationRangeSec;
-          }
-        }
 
-        if (bidRequest.params.video) {
-          Object.keys(bidRequest.params.video).forEach(k => {
-            if (VIDEO_PARAMS.indexOf(k) > -1) {
-              imp.video[k] = bidRequest.params.video[k];
-            }
-          })
+          // ADD TO THE LIST OF IMP REQUESTS
+          imps.push(imp);
         }
+      } else if (deepAccess(bidRequest, `mediaTypes.native`)) {
+        // ADD TO THE LIST OF IMP REQUESTS
+        imp.native = createNativeRequest(bidRequest);
+        imps.push(imp);
       }
-      let host = bidRequest.params.host;
-      let sourceId = bidRequest.params.sourceId;
-      imps[host] = imps[host] || {};
-      let hostImp = imps[host][sourceId] = imps[host][sourceId] || { imps: [] };
-      hostImp.imps.push(imp);
-      hostImp.subid = hostImp.imps.subid || bidRequest.params.subid || 'blank';
-      hostImp.path = 'search';
-      hostImp.idParam = 'sid';
-      hostImp.protocol = '//';
     });
 
-    // Generate Site obj
-    site.domain = refurl.hostname;
-    site.page = refurl.protocol + '://' + refurl.hostname + refurl.pathname;
+    // RETURN EMPTY IF THERE WERE NO PROPER ADUNIT REQUESTS TO BE MADE
+    if (!imps.length) {
+      return [];
+    }
+
+    // GENERATE SITE OBJECT
+    let site = {
+      domain: window.location.host,
+      // TODO: is 'page' the right value here?
+      page: bidderRequest.refererInfo.page,
+      schain: validRequests[0].schain || {},
+      ext: {
+        p_domain: bidderRequest.refererInfo.domain,
+        rt: bidderRequest.refererInfo.reachedTop,
+        frames: bidderRequest.refererInfo.numIframes,
+        stack: bidderRequest.refererInfo.stack,
+        timeout: config.getConfig('bidderTimeout')
+      },
+    };
+
+    // ADD REF URL IF FOUND
     if (self === top && document.referrer) {
       site.ref = document.referrer;
     }
+
+    // ADD META KEYWORDS IF FOUND
     let keywords = document.getElementsByTagName('meta')['keywords'];
     if (keywords && keywords.content) {
       site.keywords = keywords.content;
     }
 
-    // Generate Device obj.
-    device.ip = 'peer';
-    device.ua = window.navigator.userAgent;
-    device.js = 1;
-    device.language = ((navigator.language || navigator.userLanguage || '').split('-'))[0] || 'en';
-
-    RtbRequest(device, site, imps).forEach(formatted => {
-      requests.push({
-        method: 'POST',
-        url: formatted.url,
-        data: formatted.body,
-        options: {
-          withCredentials: false
+    // GENERATE DEVICE OBJECT
+    let device = {
+      ip: 'peer',
+      ua: window.navigator.userAgent,
+      js: 1,
+      language: ((navigator.language || navigator.userLanguage || '').split('-'))[0] || 'en',
+      buyerid: this.get_dbid() || 0,
+      ext: {
+        pb_eids: validRequests[0].userIdAsEids || {},
+        syncs: this.get_syncs() || {},
+        coppa: config.getConfig('coppa') || 0,
+        gdpr: bidderRequest.gdprConsent || {},
+        usp: bidderRequest.uspConsent || {},
+        client_info: this.get_client_info(),
+        ortb2: bidderRequest.ortb2 || {}
+      }
+    };
+
+    let sourceId = validRequests[0].params.source_id || 0;
+    let host = validRequests[0].params.host || 'prebid.dblks.net';
+
+    // RETURN WITH THE REQUEST AND PAYLOAD
+    return {
+      method: 'POST',
+      url: `https://${host}/openrtb/?sid=${sourceId}`,
+      data: {
+        id: bidderRequest.auctionId,
+        imp: imps,
+        site: site,
+        device: device
+      },
+      options: {
+        withCredentials: true
+      }
+    };
+  },
+
+  // INITIATE USER SYNCING
+  getUserSyncs: function(options, rtbResponse, gdprConsent) {
+    const syncs = [];
+    let bidResponse = rtbResponse[0].body;
+    let scope = this;
+
+    // LISTEN FOR SYNC DATA FROM IFRAME TYPE SYNC
+    window.addEventListener('message', function (event) {
+      if (event.data.sentinel && event.data.sentinel === 'dblks_syncData') {
+        // STORE FOUND SYNCS
+        if (event.data.syncs) {
+          scope.store_syncs(event.data.syncs);
         }
-      })
+      }
     });
-    return requests;
-
-    function RtbRequest(device, site, imps) {
-      let collection = [];
-      Object.keys(imps).forEach(host => {
-        let sourceIds = imps[host];
-        Object.keys(sourceIds).forEach(sourceId => {
-          let impObj = sourceIds[sourceId];
-          collection.push({
-            url: `https://${host}/${impObj.path}/?${impObj.idParam}=${sourceId}`,
-            body: {
-              id: bidderRequest.auctionId,
-              imp: impObj.imps,
-              site: Object.assign({ id: impObj.subid || 'blank' }, site),
-              device: Object.assign({}, device)
-            }
-          })
-        })
+
+    // POPULATE GDPR INFORMATION
+    let gdprData = {
+      gdpr: 0,
+      gdprConsent: ''
+    }
+    if (typeof gdprConsent === 'object') {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprData.gdpr = Number(gdprConsent.gdprApplies);
+        gdprData.gdprConsent = gdprConsent.consentString;
+      } else {
+        gdprData.gdprConsent = gdprConsent.consentString;
+      }
+    }
+
+    // EXTRACT BUYERID COOKIE VALUE FROM BID RESPONSE AND PUT INTO STORAGE
+    let dbBuyerId = this.get_dbid() || '';
+    if (bidResponse.ext && bidResponse.ext.buyerid) {
+      dbBuyerId = bidResponse.ext.buyerid;
+      this.store_dbid(dbBuyerId);
+    }
+
+    // EXTRACT USERSYNCS FROM BID RESPONSE
+    if (bidResponse.ext && bidResponse.ext.syncs) {
+      bidResponse.ext.syncs.forEach(sync => {
+        if (checkValid(sync)) {
+          syncs.push(addParams(sync));
+        }
       })
+    }
+
+    // APPEND PARAMS TO SYNC URL
+    function addParams(sync) {
+      // PARSE THE URL
+      try {
+        let url = new URL(sync.url);
+        let urlParams = {};
+        for (const [key, value] of url.searchParams.entries()) {
+          urlParams[key] = value;
+        };
+
+        // APPLY EXTRA VARS
+        urlParams.gdpr = gdprData.gdpr;
+        urlParams.gdprConsent = gdprData.gdprConsent;
+        urlParams.bidid = bidResponse.bidid;
+        urlParams.id = bidResponse.id;
+        urlParams.uid = dbBuyerId;
 
-      return collection;
+        // REBUILD URL
+        sync.url = `${url.origin}${url.pathname}?${Object.keys(urlParams).map(key => key + '=' + encodeURIComponent(urlParams[key])).join('&')}`;
+      } catch (e) {};
+
+      // RETURN THE REBUILT URL
+      return sync;
+    }
+
+    // ENSURE THAT THE SYNC TYPE IS VALID AND HAS PERMISSION
+    function checkValid(sync) {
+      if (!sync.type || !sync.url) {
+        return false;
+      }
+      switch (sync.type) {
+        case 'iframe':
+          return options.iframeEnabled;
+        case 'image':
+          return options.pixelEnabled;
+        default:
+          return false;
+      }
     }
+    return syncs;
   },
-  interpretResponse: function(serverResponse, bidRequest) {
-    if (!serverResponse || !serverResponse.body || !serverResponse.body.seatbid) {
-      return [];
+
+  // DATABLOCKS WON THE AUCTION - REPORT SUCCESS
+  onBidWon: function(bid) {
+    this.queue_metric({type: 'bid_won', source_id: bid.params[0].source_id, req_id: bid.requestId, slot_id: bid.adUnitCode, auction_id: bid.auctionId, size: bid.size, cpm: bid.cpm, pb: bid.adserverTargeting.hb_pb, rt: bid.timeToRespond, ttl: bid.ttl});
+  },
+
+  // TARGETING HAS BEEN SET
+  onSetTargeting: function(bid) {
+    // LISTEN FOR VIEWABILITY EVENTS
+    this.get_viewability(bid);
+  },
+
+  // PARSE THE RTB RESPONSE AND RETURN FINAL RESULTS
+  interpretResponse: function(rtbResponse, bidRequest) {
+    // CONVERT NATIVE RTB RESPONSE INTO PREBID RESPONSE
+    function parseNative(native) {
+      const {assets, link, imptrackers, jstracker} = native;
+      const result = {
+        clickUrl: link.url,
+        clickTrackers: link.clicktrackers || [],
+        impressionTrackers: imptrackers || [],
+        javascriptTrackers: jstracker ? [jstracker] : []
+      };
+
+      (assets || []).forEach((asset) => {
+        const {id, img, data, title} = asset;
+        const key = NATIVE_ID_MAP[id];
+        if (key) {
+          if (!isEmpty(title)) {
+            result.title = title.text
+          } else if (!isEmpty(img)) {
+            result[key] = {
+              url: img.url,
+              height: img.h,
+              width: img.w
+            }
+          } else if (!isEmpty(data)) {
+            result[key] = data.value;
+          }
+        }
+      });
+
+      return result;
     }
-    let body = serverResponse.body;
-
-    let bids = body.seatbid
-      .map(seatbid => seatbid.bid)
-      .reduce((memo, bid) => memo.concat(bid), []);
-    let req = bidRequest.data;
-    let reqImps = req.imp;
-
-    return bids.map(rtbBid => {
-      let imp;
-      for (let i in reqImps) {
-        let testImp = reqImps[i]
-        if (testImp.id == rtbBid.impid) {
-          imp = testImp;
+
+    let bids = [];
+    let resBids = deepAccess(rtbResponse, 'body.seatbid') || [];
+    resBids.forEach(bid => {
+      let resultItem = {requestId: bid.id, cpm: bid.price, creativeId: bid.crid, currency: bid.currency || 'USD', netRevenue: true, ttl: bid.ttl || 360, meta: {advertiserDomains: bid.adomain}};
+
+      let mediaType = deepAccess(bid, 'ext.mtype') || '';
+      switch (mediaType) {
+        case 'banner':
+          bids.push(Object.assign({}, resultItem, {mediaType: BANNER, width: bid.w, height: bid.h, ad: bid.adm}));
+          break;
+
+        case 'native':
+          let nativeResult = JSON.parse(bid.adm);
+          bids.push(Object.assign({}, resultItem, {mediaType: NATIVE, native: parseNative(nativeResult.native)}));
+          break;
+
+        default:
           break;
-        }
       }
-      let br = {
-        requestId: rtbBid.impid,
-        cpm: rtbBid.price,
-        creativeId: rtbBid.crid,
-        currency: rtbBid.currency || 'USD',
-        netRevenue: true,
-        ttl: 360
-      };
-      if (!imp) {
-        return br;
-      } else if (imp.banner) {
-        br.mediaType = BANNER;
-        br.width = rtbBid.w;
-        br.height = rtbBid.h;
-        br.ad = rtbBid.adm;
-      } else if (imp.native) {
-        br.mediaType = NATIVE;
-
-        let reverseNativeMap = {};
-        let nativeKeys = Object.keys(NATIVE_MAP);
-        nativeKeys.forEach(k => {
-          reverseNativeMap[NATIVE_MAP[k]] = k;
-        });
+    })
+
+    return bids;
+  }
+};
+
+// DETECT BOTS
+export class BotClientTests {
+  constructor() {
+    this.tests = {
+      headless_chrome: function() {
+        if (self.navigator) {
+          if (self.navigator.webdriver) {
+            return true;
+          }
+        }
+
+        return false;
+      },
 
-        let idMap = {};
-        let nativeReq = JSON.parse(imp.native.request);
-        if (nativeReq.native && nativeReq.native.assets) {
-          nativeReq.native.assets.forEach(asset => {
-            if (asset.data) { idMap[asset.id] = reverseNativeMap[asset.data.type]; }
+      selenium: function () {
+        let response = false;
+
+        if (window && document) {
+          let results = [
+            'webdriver' in window,
+            '_Selenium_IDE_Recorder' in window,
+            'callSelenium' in window,
+            '_selenium' in window,
+            '__webdriver_script_fn' in document,
+            '__driver_evaluate' in document,
+            '__webdriver_evaluate' in document,
+            '__selenium_evaluate' in document,
+            '__fxdriver_evaluate' in document,
+            '__driver_unwrapped' in document,
+            '__webdriver_unwrapped' in document,
+            '__selenium_unwrapped' in document,
+            '__fxdriver_unwrapped' in document,
+            '__webdriver_script_func' in document,
+            document.documentElement.getAttribute('selenium') !== null,
+            document.documentElement.getAttribute('webdriver') !== null,
+            document.documentElement.getAttribute('driver') !== null
+          ];
+
+          results.forEach(result => {
+            if (result === true) {
+              response = true;
+            }
           })
         }
 
-        const nativeResponse = JSON.parse(rtbBid.adm);
-        const { assets, link, imptrackers, jstrackers } = nativeResponse.native;
-        const result = {
-          clickUrl: link.url,
-          clickTrackers: link.clicktrackers || undefined,
-          impressionTrackers: imptrackers || undefined,
-          javascriptTrackers: jstrackers ? [jstrackers] : undefined
-        };
-        assets.forEach(asset => {
-          if (asset.title) {
-            result.title = asset.title.text;
-          } else if (asset.img) {
-            result.image = asset.img.url;
-          } else if (idMap[asset.id]) {
-            result[idMap[asset.id]] = asset.data.value;
-          }
-        })
-        br.native = result;
-      } else if (imp.video) {
-        br.mediaType = VIDEO;
-        br.width = rtbBid.w;
-        br.height = rtbBid.h;
-        if (rtbBid.adm) { br.vastXml = rtbBid.adm; } else if (rtbBid.nurl) { br.vastUrl = rtbBid.nurl; }
+        return response;
+      },
+    }
+  }
+  doTests() {
+    let response = false;
+    for (const i of Object.keys(this.tests)) {
+      if (this.tests[i]() === true) {
+        response = true;
       }
-      return br;
-    });
+    }
+    return response;
   }
+}
 
-};
+// INIT OUR BIDDER WITH PREBID
 registerBidder(spec);
diff --git a/modules/datablocksBidAdapter.md b/modules/datablocksBidAdapter.md
index e30cd361974..ad2eb4afc53 100644
--- a/modules/datablocksBidAdapter.md
+++ b/modules/datablocksBidAdapter.md
@@ -8,8 +8,8 @@ Maintainer: support@datablocks.net
 
 # Description
 
-Connects to Datablocks Version 5 Platform
-Banner Native and Video
+Connects to Datablocks Exchange
+Banner and Native
 
 
 # Test Parameters
@@ -27,12 +27,13 @@ Banner Native and Video
           {
             bidder: 'datablocks',
             params: {
-              sourceId: 12345,
+              source_id: 12345,
               host: 'prebid.datablocks.net'
             }
           }
         ]
-      }, {
+      },
+      {
         code: 'native-div',
         mediaTypes : {
           native: {
@@ -44,30 +45,11 @@ Banner Native and Video
           {
             bidder: 'datablocks',
             params: {
-              sourceId: 12345,
+              source_id: 12345,
               host: 'prebid.datablocks.net'
             }
-          }, {
-        code: 'video-div',
-        mediaTypes : {
-          video: {
-            playerSize:[500,400],
-            durationRangeSec:[15,30],
-            context: "linear"
-          }
-        },
-        bids: [
-          {
-            bidder: 'datablocks',
-            params: {
-              sourceId: 12345,
-              host: 'prebid.datablocks.net',
-              video: {
-                mimes:["video/flv"]
-              }
-            }
           }
         ]
       }
     ];
-```
\ No newline at end of file
+```
diff --git a/modules/datawrkzBidAdapter.js b/modules/datawrkzBidAdapter.js
new file mode 100644
index 00000000000..193a1723403
--- /dev/null
+++ b/modules/datawrkzBidAdapter.js
@@ -0,0 +1,653 @@
+import { deepAccess, getBidIdParameter, isArray, getUniqueIdentifierStr, contains, isFn, isPlainObject } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { Renderer } from '../src/Renderer.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { createBid } from '../src/bidfactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import CONSTANTS from '../src/constants.json';
+import { OUTSTREAM, INSTREAM } from '../src/video.js';
+
+const BIDDER_CODE = 'datawrkz';
+const ALIASES = [];
+const ENDPOINT_URL = 'https://at.datawrkz.com/exchange/openrtb23/';
+const RENDERER_URL = 'https://js.datawrkz.com/prebid/osRenderer.min.js';
+const OUTSTREAM_TYPES = ['inline', 'slider_top_left', 'slider_top_right', 'slider_bottom_left', 'slider_bottom_right', 'interstitial_close', 'listicle']
+const OUTSTREAM_MIMES = ['video/mp4']
+const SUPPORTED_AD_TYPES = [BANNER, NATIVE, VIDEO];
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ALIASES,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    return !!(bid.params && bid.params.site_id && (deepAccess(bid, 'mediaTypes.video.context') != 'adpod'));
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let requests = [];
+
+    if (validBidRequests.length > 0) {
+      validBidRequests.forEach(bidRequest => {
+        if (!bidRequest.mediaTypes) return;
+        if (bidRequest.mediaTypes.banner && ((bidRequest.mediaTypes.banner.sizes && bidRequest.mediaTypes.banner.sizes.length != 0) ||
+          (bidRequest.sizes))) {
+          requests.push(buildBannerRequest(bidRequest, bidderRequest));
+        } else if (bidRequest.mediaTypes.native) {
+          requests.push(buildNativeRequest(bidRequest, bidderRequest));
+        } else if (bidRequest.mediaTypes.video) {
+          requests.push(buildVideoRequest(bidRequest, bidderRequest));
+        }
+      });
+    }
+    return requests;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, request) {
+    var bidResponses = [];
+    let bidRequest = request.bidRequest
+    let bidResponse = serverResponse.body;
+
+    // valid object?
+    if ((!bidResponse || !bidResponse.id) || (!bidResponse.seatbid || bidResponse.seatbid.length === 0 ||
+     !bidResponse.seatbid[0].bid || bidResponse.seatbid[0].bid.length === 0)) {
+      return [];
+    }
+
+    if (getMediaTypeOfResponse(bidRequest) == BANNER) {
+      bidResponses = buildBannerResponse(bidRequest, bidResponse);
+    } else if (getMediaTypeOfResponse(bidRequest) == NATIVE) {
+      bidResponses = buildNativeResponse(bidRequest, bidResponse);
+    } else if (getMediaTypeOfResponse(bidRequest) == VIDEO) {
+      bidResponses = buildVideoResponse(bidRequest, bidResponse);
+    }
+    return bidResponses;
+  },
+}
+
+/* Generate bid request for banner adunit */
+function buildBannerRequest(bidRequest, bidderRequest) {
+  let bidFloor = getBidFloor(bidRequest);
+
+  let adW = 0;
+  let adH = 0;
+
+  let bannerSizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes');
+  let bidSizes = isArray(bannerSizes) ? bannerSizes : bidRequest.sizes;
+  if (isArray(bidSizes)) {
+    if (bidSizes.length === 2 && typeof bidSizes[0] === 'number' && typeof bidSizes[1] === 'number') {
+      adW = parseInt(bidSizes[0]);
+      adH = parseInt(bidSizes[1]);
+    } else {
+      adW = parseInt(bidSizes[0][0]);
+      adH = parseInt(bidSizes[0][1]);
+    }
+  }
+
+  var deals = [];
+  if (bidRequest.params.deals && bidRequest.params.deals.length > 0) {
+    deals = bidRequest.params.deals;
+  }
+
+  const imp = [{
+    id: bidRequest.bidId,
+    banner: {
+      w: adW,
+      h: adH
+    },
+    bidfloor: bidFloor,
+    pmp: {
+      deals: deals
+    }
+  }];
+
+  bidRequest.requestedMediaType = BANNER;
+  const scriptUrl = generateScriptUrl(bidRequest);
+  const payloadString = generatePayload(imp, bidderRequest);
+
+  return {
+    method: 'POST',
+    url: scriptUrl,
+    data: payloadString,
+    bidRequest
+  };
+}
+
+/* Generate bid request for native adunit */
+function buildNativeRequest(bidRequest, bidderRequest) {
+  let counter = 0;
+  let assets = [];
+
+  let bidFloor = getBidFloor(bidRequest);
+
+  let title = deepAccess(bidRequest, 'mediaTypes.native.title');
+  if (title && title.len) {
+    assets.push(generateNativeTitleObj(title, ++counter));
+  }
+  let image = deepAccess(bidRequest, 'mediaTypes.native.image');
+  if (image) {
+    assets.push(generateNativeImgObj(image, 'image', ++counter));
+  }
+  let icon = deepAccess(bidRequest, 'mediaTypes.native.icon');
+  if (icon) {
+    assets.push(generateNativeImgObj(icon, 'icon', ++counter));
+  }
+  let sponsoredBy = deepAccess(bidRequest, 'mediaTypes.native.sponsoredBy');
+  if (sponsoredBy) {
+    assets.push(generateNativeDataObj(sponsoredBy, 'sponsored', ++counter));
+  }
+  let cta = deepAccess(bidRequest, 'mediaTypes.native.cta');
+  if (cta) {
+    assets.push(generateNativeDataObj(cta, 'cta', ++counter));
+  }
+  let body = deepAccess(bidRequest, 'mediaTypes.native.body');
+  if (body) {
+    assets.push(generateNativeDataObj(body, 'desc', ++counter));
+  }
+
+  let request = JSON.stringify({assets: assets});
+  const native = {
+    request: request
+  };
+
+  var deals = [];
+  if (bidRequest.params.deals && bidRequest.params.deals.length > 0) {
+    deals = bidRequest.params.deals;
+  }
+
+  const imp = [{
+    id: bidRequest.bidId,
+    native: native,
+    bidfloor: bidFloor,
+    pmp: {
+      deals: deals
+    }
+  }];
+
+  bidRequest.requestedMediaType = NATIVE;
+  bidRequest.assets = assets;
+  const scriptUrl = generateScriptUrl(bidRequest);
+  const payloadString = generatePayload(imp, bidderRequest);
+
+  return {
+    method: 'POST',
+    url: scriptUrl,
+    data: payloadString,
+    bidRequest
+  };
+}
+
+/* Generate bid request for video adunit */
+function buildVideoRequest(bidRequest, bidderRequest) {
+  let bidFloor = getBidFloor(bidRequest);
+
+  let sizeObj = getVideoAdUnitSize(bidRequest);
+
+  const video = {
+    w: sizeObj.adW,
+    h: sizeObj.adH,
+    api: deepAccess(bidRequest, 'mediaTypes.video.api'),
+    mimes: deepAccess(bidRequest, 'mediaTypes.video.mimes'),
+    protocols: deepAccess(bidRequest, 'mediaTypes.video.protocols'),
+    playbackmethod: deepAccess(bidRequest, 'mediaTypes.video.playbackmethod'),
+    minduration: deepAccess(bidRequest, 'mediaTypes.video.minduration'),
+    maxduration: deepAccess(bidRequest, 'mediaTypes.video.maxduration'),
+    startdelay: deepAccess(bidRequest, 'mediaTypes.video.startdelay'),
+    minbitrate: deepAccess(bidRequest, 'mediaTypes.video.minbitrate'),
+    maxbitrate: deepAccess(bidRequest, 'mediaTypes.video.maxbitrate'),
+    delivery: deepAccess(bidRequest, 'mediaTypes.video.delivery'),
+    linearity: deepAccess(bidRequest, 'mediaTypes.video.linearity'),
+    placement: deepAccess(bidRequest, 'mediaTypes.video.placement'),
+    skip: deepAccess(bidRequest, 'mediaTypes.video.skip'),
+    skipafter: deepAccess(bidRequest, 'mediaTypes.video.skipafter')
+  };
+
+  let context = deepAccess(bidRequest, 'mediaTypes.video.context');
+  if (context == 'outstream' && !bidRequest.renderer) video.mimes = OUTSTREAM_MIMES;
+
+  var imp = [];
+  var deals = [];
+  if (bidRequest.params.deals && bidRequest.params.deals.length > 0) {
+    deals = bidRequest.params.deals;
+  }
+
+  if (context != 'adpod') {
+    imp.push({
+      id: bidRequest.bidId,
+      video: video,
+      bidfloor: bidFloor,
+      pmp: {
+        deals: deals
+      }
+    });
+  }
+  bidRequest.requestedMediaType = VIDEO;
+  const scriptUrl = generateScriptUrl(bidRequest);
+  const payloadString = generatePayload(imp, bidderRequest);
+
+  return {
+    method: 'POST',
+    url: scriptUrl,
+    data: payloadString,
+    bidRequest
+  };
+}
+
+/* Convert video player size to bid request compatible format */
+function getVideoAdUnitSize(bidRequest) {
+  var adH = 0;
+  var adW = 0;
+  let playerSize = deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+  if (isArray(playerSize)) {
+    if (playerSize.length === 2 && typeof playerSize[0] === 'number' && typeof playerSize[1] === 'number') {
+      adW = parseInt(playerSize[0]);
+      adH = parseInt(playerSize[1]);
+    } else {
+      adW = parseInt(playerSize[0][0]);
+      adH = parseInt(playerSize[0][1]);
+    }
+  }
+  return {adH: adH, adW: adW}
+}
+
+/* Get mediatype of the adunit from request */
+function getMediaTypeOfResponse(bidRequest) {
+  if (bidRequest.requestedMediaType == BANNER) return BANNER;
+  else if (bidRequest.requestedMediaType == NATIVE) return NATIVE;
+  else if (bidRequest.requestedMediaType == VIDEO) return VIDEO;
+  else return '';
+}
+
+/* Generate endpoint url */
+function generateScriptUrl(bidRequest) {
+  let queryParams = 'hb=1';
+  let siteId = getBidIdParameter('site_id', bidRequest.params);
+  return ENDPOINT_URL + siteId + '?' + queryParams;
+}
+
+/* Generate request payload for the adunit */
+function generatePayload(imp, bidderRequest) {
+  let domain = window.location.host;
+  let page = window.location.host + window.location.pathname + location.search + location.hash;
+
+  const site = {
+    domain: domain,
+    page: page,
+    publisher: {}
+  };
+
+  let regs = {ext: {}};
+
+  if (bidderRequest.uspConsent) {
+    regs.ext.us_privacy = bidderRequest.uspConsent;
+  }
+  if (bidderRequest.gdprConsent && typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') {
+    regs.ext.gdpr = bidderRequest.gdprConsent.gdprApplies ? '1' : '0';
+  }
+
+  if (config.getConfig('coppa') === true) {
+    regs.coppa = '1';
+  }
+
+  const device = {
+    ua: window.navigator.userAgent
+  };
+
+  const payload = {
+    id: getUniqueIdentifierStr(),
+    imp: imp,
+    site: site,
+    device: device,
+    regs: regs
+  };
+
+  return JSON.stringify(payload);
+}
+
+/* Generate image asset object */
+function generateNativeImgObj(obj, type, id) {
+  let adW = 0;
+  let adH = 0;
+  let bidSizes = obj.sizes;
+
+  var typeId;
+  if (type == 'icon') typeId = 1;
+  else if (type == 'image') typeId = 3;
+
+  if (isArray(bidSizes)) {
+    if (bidSizes.length === 2 && typeof bidSizes[0] === 'number' && typeof bidSizes[1] === 'number') {
+      adW = parseInt(bidSizes[0]);
+      adH = parseInt(bidSizes[1]);
+    } else {
+      adW = parseInt(bidSizes[0][0]);
+      adH = parseInt(bidSizes[0][1]);
+    }
+  }
+
+  let required = obj.required ? 1 : 0;
+  let image = {
+    type: parseInt(typeId),
+    w: adW,
+    h: adH
+  };
+  return {
+    id: id,
+    required: required,
+    img: image
+  };
+}
+
+/* Generate title asset object */
+function generateNativeTitleObj(obj, id) {
+  let required = obj.required ? 1 : 0;
+  let title = {
+    len: obj.len
+  };
+  return {
+    id: id,
+    required: required,
+    title: title
+  };
+}
+
+/* Generate data asset object */
+function generateNativeDataObj(obj, type, id) {
+  var typeId;
+  switch (type) {
+    case 'sponsored': typeId = 1;
+      break;
+    case 'desc' : typeId = 2;
+      break;
+    case 'cta' : typeId = 12;
+      break;
+  }
+
+  let required = obj.required ? 1 : 0;
+  let data = {
+    type: typeId
+  };
+  if (typeId == 2 && obj.len) {
+    data.len = parseInt(obj.len);
+  }
+  return {
+    id: id,
+    required: required,
+    data: data
+  };
+}
+
+/* Convert banner bid response to compatible format */
+function buildBannerResponse(bidRequest, bidResponse) {
+  const bidResponses = [];
+  bidResponse.seatbid[0].bid.forEach(function (bidderBid) {
+    let responseCPM;
+    let placementCode = '';
+
+    if (bidRequest) {
+      let bidResponse = createBid(1);
+      placementCode = bidRequest.placementCode;
+      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      responseCPM = parseFloat(bidderBid.price);
+      if (responseCPM === 0 || isNaN(responseCPM)) {
+        let bid = createBid(2);
+        bid.requestId = bidRequest.bidId;
+        bid.bidderCode = bidRequest.bidder;
+        bidResponses.push(bid);
+        return;
+      }
+      let bidSizes = (deepAccess(bidRequest, 'mediaTypes.banner.sizes')) ? deepAccess(bidRequest, 'mediaTypes.banner.sizes') : bidRequest.sizes;
+      bidResponse.requestId = bidRequest.bidId;
+      bidResponse.auctionId = bidRequest.auctionId;
+      bidResponse.transactionId = bidRequest.transactionId;
+      bidResponse.placementCode = placementCode;
+      bidResponse.cpm = responseCPM;
+      bidResponse.size = bidSizes;
+      bidResponse.width = parseInt(bidderBid.w);
+      bidResponse.height = parseInt(bidderBid.h);
+      let responseAd = bidderBid.adm;
+      let responseNurl = '<img src="' + bidderBid.nurl + '" height="0px" width="0px">';
+      bidResponse.ad = decodeURIComponent(responseAd + responseNurl);
+      bidResponse.creativeId = bidderBid.id;
+      bidResponse.bidderCode = bidRequest.bidder;
+      bidResponse.ttl = 300;
+      bidResponse.netRevenue = true;
+      bidResponse.currency = 'USD';
+      bidResponse.mediaType = BANNER;
+      bidResponses.push(bidResponse);
+    }
+  });
+  return bidResponses;
+}
+
+/* Convert native bid response to compatible format */
+function buildNativeResponse(bidRequest, response) {
+  const bidResponses = [];
+  response.seatbid[0].bid.forEach(function (bidderBid) {
+    let responseCPM;
+    let placementCode = '';
+
+    if (bidRequest) {
+      let bidResponse = createBid(1);
+      placementCode = bidRequest.placementCode;
+      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      responseCPM = parseFloat(bidderBid.price);
+      if (responseCPM === 0 || isNaN(responseCPM)) {
+        let bid = createBid(2);
+        bid.requestId = bidRequest.bidId;
+        bid.bidderCode = bidRequest.bidder;
+        bidResponses.push(bid);
+        return;
+      }
+      bidResponse.requestId = bidRequest.bidId;
+      bidResponse.auctionId = bidRequest.auctionId;
+      bidResponse.transactionId = bidRequest.transactionId;
+      bidResponse.placementCode = placementCode;
+      bidResponse.cpm = responseCPM;
+
+      let nativeResponse = JSON.parse(bidderBid.adm).native;
+
+      const native = {
+        clickUrl: nativeResponse.link.url,
+        impressionTrackers: nativeResponse.imptrackers
+      };
+
+      nativeResponse.assets.forEach(function(asset) {
+        let keyVal = getNativeAssestObj(asset, bidRequest.assets);
+        native[keyVal.key] = keyVal.value;
+      });
+
+      bidResponse.creativeId = bidderBid.id;
+      bidResponse.bidderCode = bidRequest.bidder;
+      bidResponse.ttl = 300;
+      if (bidRequest.sizes) { bidResponse.size = bidRequest.sizes; }
+      bidResponse.netRevenue = true;
+      bidResponse.currency = 'USD';
+      bidResponse.native = native;
+      bidResponse.mediaType = NATIVE;
+      bidResponses.push(bidResponse);
+    }
+  });
+  return bidResponses;
+}
+
+/* Convert video bid response to compatible format */
+function buildVideoResponse(bidRequest, response) {
+  const bidResponses = [];
+  response.seatbid[0].bid.forEach(function (bidderBid) {
+    let responseCPM;
+    let placementCode = '';
+
+    if (bidRequest) {
+      let bidResponse = createBid(1);
+      placementCode = bidRequest.placementCode;
+      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      responseCPM = parseFloat(bidderBid.price);
+      if (responseCPM === 0 || isNaN(responseCPM)) {
+        let bid = createBid(2);
+        bid.requestId = bidRequest.bidId;
+        bid.bidderCode = bidRequest.bidder;
+        bidResponses.push(bid);
+        return;
+      }
+      let context = bidRequest.mediaTypes.video.context;
+
+      bidResponse.requestId = bidRequest.bidId;
+      bidResponse.auctionId = bidRequest.auctionId;
+      bidResponse.transactionId = bidRequest.transactionId;
+      bidResponse.placementCode = placementCode;
+      bidResponse.cpm = responseCPM;
+
+      let vastXml = decodeURIComponent(bidderBid.adm);
+
+      bidResponse.creativeId = bidderBid.id;
+      bidResponse.bidderCode = bidRequest.bidder;
+      bidResponse.ttl = 300;
+      bidResponse.netRevenue = true;
+      bidResponse.currency = 'USD';
+      var ext = bidderBid.ext;
+      var vastUrl = '';
+      if (ext) {
+        vastUrl = ext.vast_url;
+      }
+      var adUnitCode = bidRequest.adUnitCode;
+      var sizeObj = getVideoAdUnitSize(bidRequest);
+
+      bidResponse.height = sizeObj.adH;
+      bidResponse.width = sizeObj.adW;
+
+      switch (context) {
+        case OUTSTREAM:
+          var outstreamType = contains(OUTSTREAM_TYPES, bidRequest.params.outstreamType) ? bidRequest.params.outstreamType : '';
+          bidResponse.outstreamType = outstreamType;
+          bidResponse.ad = vastXml;
+          if (!bidRequest.renderer) {
+            const renderer = Renderer.install({
+              id: bidderBid.id,
+              url: RENDERER_URL,
+              config: bidRequest.params.outstreamConfig || {},
+              loaded: false,
+              adUnitCode
+            });
+            renderer.setRender(outstreamRender);
+            bidResponse.renderer = renderer;
+          } else { bidResponse.adResponse = vastXml; }
+          break;
+        case INSTREAM:
+          bidResponse.vastUrl = vastUrl;
+          bidResponse.adserverTargeting = setTargeting(vastUrl);
+          break;
+      }
+      bidResponse.mediaType = VIDEO;
+      bidResponses.push(bidResponse);
+    }
+  });
+  return bidResponses;
+}
+
+/* Generate renderer for outstream ad unit */
+function outstreamRender(bid) {
+  bid.renderer.push(() => {
+    window.osRenderer({
+      adResponse: bid.ad,
+      height: bid.height,
+      width: bid.width,
+      targetId: bid.adUnitCode, // target div id to render video
+      outstreamType: bid.outstreamType,
+      options: bid.renderer.getConfig(),
+    });
+  });
+}
+
+/* Set targeting params used for instream video that is required to generate cache url  */
+function setTargeting(query) {
+  var targeting = {};
+  var hash;
+  var hashes = query.slice(query.indexOf('?') + 1).split('&');
+  for (var i = 0; i < hashes.length; i++) {
+    hash = hashes[i].split('=');
+    targeting['hb_' + hash[0]] = hash[1];
+  }
+  return targeting;
+}
+
+/* Get image type with respect to the id */
+function getAssetImageType(id, assets) {
+  for (var i = 0; i < assets.length; i++) {
+    if (assets[i].id == id) {
+      if (assets[i].img.type == 1) { return 'icon'; } else if (assets[i].img.type == 3) { return 'image'; }
+    }
+  }
+  return '';
+}
+
+/* Get type of data asset with respect to the id */
+function getAssetDataType(id, assets) {
+  for (var i = 0; i < assets.length; i++) {
+    if (assets[i].id == id) {
+      if (assets[i].data.type == 1) { return 'sponsored'; } else if (assets[i].data.type == 2) { return 'desc'; } else if (assets[i].data.type == 12) { return 'cta'; }
+    }
+  }
+  return '';
+}
+
+/* Convert response assests to compatible format */
+function getNativeAssestObj(obj, assets) {
+  if (obj.title) {
+    return {
+      key: 'title',
+      value: obj.title.text
+    }
+  }
+  if (obj.data) {
+    return {
+      key: getAssetDataType(obj.id, assets),
+      value: obj.data.value
+    }
+  }
+  if (obj.img) {
+    return {
+      key: getAssetImageType(obj.id, assets),
+      value: {
+        url: obj.img.url,
+        height: obj.img.h,
+        width: obj.img.w
+      }
+    }
+  }
+}
+
+// BUILD REQUESTS: BIDFLOORS
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.bidfloor) ? bid.params.bidfloor : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
+registerBidder(spec);
diff --git a/modules/datawrkzBidAdapter.md b/modules/datawrkzBidAdapter.md
new file mode 100644
index 00000000000..85ea43e6dd3
--- /dev/null
+++ b/modules/datawrkzBidAdapter.md
@@ -0,0 +1,160 @@
+# Overview
+
+```
+Module Name:  Datawrkz Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:  pubops@datawrkz.com
+```
+
+# Description
+
+Module that connects to Datawrkz's demand sources. 
+Datawrkz bid adapter supports Banner, Video (instream and outstream) and Native ad units.
+
+# Bid Parameters
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `site_id` | required | String | Site id  | "test_site_id"
+| `deals` | optional | Array<Deal> | Array of deal objects | `[{id: "deal_1"},{id: "deal_2"}]`
+| `bidfloor` | optional | Float | Minimum bid for this impression expressed in CPM | `0.5`
+| `outstreamType` | optional | String | Type of outstream video to the played. Available options: inline, slider_top_left, slider_top_right, slider_bottom_left, slider_bottom_right, interstitial_close, and listicle | "inline"
+| `outstreamConfig` | optional | Object | Configuration settings for outstream ad unit | `{ad_unit_audio: 1, show_player_close_button_after: 5, hide_player_control: 0}`
+
+# Deal Object
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `id` | required | String | Deal id  | "test_deal_id"
+
+# outstreamConfig
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `ad_unit_audio` | optional | Integer | Set default audio option for the player. 0 to play audio on hover and 2 to mute | `0` or `2`
+| `show_player_close_button_after` | optional | Integer | Show player close button after specified seconds | `5`
+| `hide_player_control` | optional | Integer | Show/hide player controls. 0 to show player controls and 1 to hide | `1`
+
+# Test Parameters
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'datawrkz',
+         params: {
+           site_id: 'site_id',
+           bidfloor: 0.5
+         }
+       }]
+   },
+   // Native adUnit
+   {
+      code: 'native-div',
+      sizes: [[1, 1]],
+      mediaTypes: {
+        native: {
+          title: {
+            required: true,
+            len: 80
+          },
+          image: {
+            required: true,
+            sizes: [300, 250]
+          },
+          icon: {
+            required: true,
+            sizes: [50, 50]
+          },
+          body: {
+            required: true,
+            len: 800
+          },
+          sponsoredBy: {
+            required: true
+          },
+          cta: {
+            required: true
+          }
+        }
+      },
+      bids: [{
+        bidder: 'datawrkz',
+        params: {
+          site_id: 'site_id',
+           bidfloor: 0.5
+        }
+      }]
+   },
+   // Video instream adUnit
+   {
+      code: 'video-instream',
+      sizes: [[640, 480]],
+      mediaTypes: {
+        video: {
+          playerSize: [[640, 480]],
+          context: 'instream',
+          api: [1, 2],
+          mimes: ["video/x-ms-wmv", "video/mp4"],
+          protocols: [1, 2, 3],
+          playbackmethod: [1, 2],
+          minduration: 20,
+          maxduration: 30,
+          startdelay: 5,
+          minbitrate: 300,
+          maxbitrate: 1500,
+          delivery: [2],
+          linearity: 1
+        },
+      },
+      bids: [{
+        bidder: 'datawrkz',
+        params: {
+          site_id: 'site_id',
+          bidfloor: 0.5
+        }
+      }]
+   },
+   // Video outstream adUnit
+   {
+     code: 'video-outstream',
+     sizes: [[300, 250]],
+     mediaTypes: {
+       video: {
+         playerSize: [[300, 250]],
+         context: 'outstream',
+         api: [1, 2],
+         mimes: ["video/mp4"],
+         protocols: [1, 2, 3],
+         playbackmethod: [1, 2],
+         minduration: 20,
+         maxduration: 30,
+         startdelay: 5,
+         minbitrate: 300,
+         maxbitrate: 1500,
+         delivery: [2],
+         linearity: 1
+       }
+     },
+     bids: [
+       {
+         bidder: 'datawrkz',
+         params: {
+           site_id: 'site_id',
+           bidfloor: 0.5,
+           outstreamType: 'slider_top_left',          //Supported types : inline, slider_top_left, slider_top_right, slider_bottom_left, slider_bottom_right, interstitial_close, listicle
+           outstreamConfig: {
+            ad_unit_audio: 1,                       // 0: audio on hover, 2: always muted
+            show_player_close_button_after: 5,     // show close button after 5 seconds
+            hide_player_control: 0                // 0 to show/ 1 to hide
+           }
+         }
+       }
+     ]
+   }
+];
+```
diff --git a/modules/dchain.js b/modules/dchain.js
new file mode 100644
index 00000000000..daf97a7551f
--- /dev/null
+++ b/modules/dchain.js
@@ -0,0 +1,150 @@
+import {includes} from '../src/polyfill.js';
+import {config} from '../src/config.js';
+import {getHook} from '../src/hook.js';
+import {_each, deepAccess, deepClone, hasOwn, isArray, isPlainObject, isStr, logError, logWarn} from '../src/utils.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
+
+const shouldBeAString = ' should be a string';
+const shouldBeAnObject = ' should be an object';
+const shouldBeAnArray = ' should be an Array';
+const shouldBeValid = ' is not a valid dchain property';
+const MODE = {
+  STRICT: 'strict',
+  RELAXED: 'relaxed',
+  OFF: 'off'
+};
+const MODES = []; // an array of modes
+_each(MODE, mode => MODES.push(mode));
+
+export function checkDchainSyntax(bid, mode) {
+  let dchainObj = deepClone(bid.meta.dchain);
+  let failPrefix = 'Detected something wrong in bid.meta.dchain object for bid:';
+  let failMsg = '';
+  const dchainPropList = ['ver', 'complete', 'nodes', 'ext'];
+
+  function appendFailMsg(msg) {
+    failMsg += '\n' + msg;
+  }
+
+  function printFailMsg() {
+    if (mode === MODE.STRICT) {
+      logError(failPrefix, bid, '\n', dchainObj, failMsg);
+    } else {
+      logWarn(failPrefix, bid, `\n`, dchainObj, failMsg);
+    }
+  }
+
+  let dchainProps = Object.keys(dchainObj);
+  dchainProps.forEach(prop => {
+    if (!includes(dchainPropList, prop)) {
+      appendFailMsg(`dchain.${prop}` + shouldBeValid);
+    }
+  });
+
+  if (dchainObj.complete !== 0 && dchainObj.complete !== 1) {
+    appendFailMsg(`dchain.complete should be 0 or 1`);
+  }
+
+  if (!isStr(dchainObj.ver)) {
+    appendFailMsg(`dchain.ver` + shouldBeAString);
+  }
+
+  if (hasOwn(dchainObj, 'ext')) {
+    if (!isPlainObject(dchainObj.ext)) {
+      appendFailMsg(`dchain.ext` + shouldBeAnObject);
+    }
+  }
+
+  if (!isArray(dchainObj.nodes)) {
+    appendFailMsg(`dchain.nodes` + shouldBeAnArray);
+    printFailMsg();
+    if (mode === MODE.STRICT) return false;
+  } else {
+    const nodesPropList = ['asi', 'bsid', 'rid', 'name', 'domain', 'ext'];
+    dchainObj.nodes.forEach((node, index) => {
+      if (!isPlainObject(node)) {
+        appendFailMsg(`dchain.nodes[${index}]` + shouldBeAnObject);
+      } else {
+        let nodeProps = Object.keys(node);
+        nodeProps.forEach(prop => {
+          if (!includes(nodesPropList, prop)) {
+            appendFailMsg(`dchain.nodes[${index}].${prop}` + shouldBeValid);
+          }
+
+          if (prop === 'ext') {
+            if (!isPlainObject(node.ext)) {
+              appendFailMsg(`dchain.nodes[${index}].ext` + shouldBeAnObject);
+            }
+          } else {
+            if (!isStr(node[prop])) {
+              appendFailMsg(`dchain.nodes[${index}].${prop}` + shouldBeAString);
+            }
+          }
+        });
+      }
+    });
+  }
+
+  if (failMsg.length > 0) {
+    printFailMsg();
+    if (mode === MODE.STRICT) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function isValidDchain(bid) {
+  let mode = MODE.STRICT;
+  const dchainConfig = config.getConfig('dchain');
+
+  if (dchainConfig && isStr(dchainConfig.validation) && MODES.indexOf(dchainConfig.validation) != -1) {
+    mode = dchainConfig.validation;
+  }
+
+  if (mode === MODE.OFF) {
+    return true;
+  } else {
+    return checkDchainSyntax(bid, mode);
+  }
+}
+
+export const addBidResponseHook = timedBidResponseHook('dchain', function addBidResponseHook(fn, adUnitCode, bid, reject) {
+  const basicDchain = {
+    ver: '1.0',
+    complete: 0,
+    nodes: []
+  };
+
+  if (deepAccess(bid, 'meta.networkId') && deepAccess(bid, 'meta.networkName')) {
+    basicDchain.nodes.push({ name: bid.meta.networkName, bsid: bid.meta.networkId.toString() });
+  }
+  basicDchain.nodes.push({ name: bid.bidderCode });
+
+  let bidDchain = deepAccess(bid, 'meta.dchain');
+  if (bidDchain && isPlainObject(bidDchain)) {
+    let result = isValidDchain(bid);
+
+    if (result) {
+      // extra check in-case mode is OFF and there is a setup issue
+      if (isArray(bidDchain.nodes)) {
+        bid.meta.dchain.nodes.push({ asi: bid.bidderCode });
+      } else {
+        logWarn('bid.meta.dchain.nodes did not exist or was not an array; did not append prebid dchain.', bid);
+      }
+    } else {
+      // remove invalid dchain
+      delete bid.meta.dchain;
+    }
+  } else {
+    bid.meta.dchain = basicDchain;
+  }
+
+  fn(adUnitCode, bid, reject);
+});
+
+export function init() {
+  getHook('addBidResponse').before(addBidResponseHook, 35);
+}
+
+init();
diff --git a/modules/dchain.md b/modules/dchain.md
new file mode 100644
index 00000000000..f01b3483f3c
--- /dev/null
+++ b/modules/dchain.md
@@ -0,0 +1,45 @@
+# dchain module
+
+Refer:
+- https://iabtechlab.com/buyers-json-demand-chain/
+
+## Sample code for dchain setConfig and dchain object
+```
+pbjs.setConfig({
+  "dchain": {
+    "validation": "strict"
+  }
+});
+```
+
+```
+bid.meta.dchain: {
+  "complete": 0,
+  "ver": "1.0",
+  "ext": {...},
+  "nodes": [{
+    "asi": "abc",
+    "bsid": "123",
+    "rid": "d4e5f6",
+    "name": "xyz",
+    "domain": "mno",
+    "ext": {...}
+  }, ...]
+}
+```
+
+## Workflow
+The dchain module is not enabled by default as it may not be necessary for all publishers.
+If required, dchain module can be included as following
+```
+    $ gulp build --modules=dchain,pubmaticBidAdapter,openxBidAdapter,rubiconBidAdapter,sovrnBidAdapter
+```
+
+The dchain module will validate a bidder's dchain object (if it was defined).  Bidders should assign their dchain object into `bid.meta` field.  If the dchain object is valid, it will remain in the bid object for later use.
+
+If it was not defined, the dchain will create a default dchain object for prebid.
+
+## Validation modes
+- ```strict```: It is the default validation mode. In this mode, dchain object will not be accpeted from adapters if it is invalid. Errors are thrown for invalid dchain object.
+- ```relaxed```: In this mode, errors are thrown for an invalid dchain object but the invalid dchain object is still accepted from adapters.
+- ```off```: In this mode, no validations are performed and dchain object is accepted as is from adapters.
\ No newline at end of file
diff --git a/modules/debugging/WARNING.md b/modules/debugging/WARNING.md
new file mode 100644
index 00000000000..109d6db7704
--- /dev/null
+++ b/modules/debugging/WARNING.md
@@ -0,0 +1,9 @@
+## Warning
+
+This module is also packaged as a "standalone" .js file and loaded dynamically by prebid-core when debugging configuration is passed to `setConfig` or loaded from session storage.
+
+"Standalone" means that it does not have a compile-time dependency on `prebid-core.js` and can therefore work even if it was not built together with it (as would be the case when Prebid is pulled from npm).
+
+Because of this, **this module cannot freely import symbols from core**: anything that depends on Prebid global state (which includes, but is not limited to, `config`, `auctionManager`, `adapterManager`, etc) would *not* work as expected. 
+
+Imports must be limited to logic that is stateless and free of side effects; symbols from `utils.js` are mostly OK, with the notable exception of logging functions (which have a dependency on `config`).
diff --git a/modules/debugging/bidInterceptor.js b/modules/debugging/bidInterceptor.js
new file mode 100644
index 00000000000..775f8fc3da2
--- /dev/null
+++ b/modules/debugging/bidInterceptor.js
@@ -0,0 +1,228 @@
+import {
+  deepAccess,
+  deepClone,
+  deepEqual,
+  delayExecution,
+  mergeDeep
+} from '../../src/utils.js';
+
+/**
+ * @typedef {Number|String|boolean|null|undefined} Scalar
+ */
+
+export function BidInterceptor(opts = {}) {
+  ({setTimeout: this.setTimeout = window.setTimeout.bind(window)} = opts);
+  this.logger = opts.logger;
+  this.rules = [];
+}
+
+Object.assign(BidInterceptor.prototype, {
+  DEFAULT_RULE_OPTIONS: {
+    delay: 0
+  },
+  serializeConfig(ruleDefs) {
+    const isSerializable = (ruleDef, i) => {
+      const serializable = deepEqual(ruleDef, JSON.parse(JSON.stringify(ruleDef)), {checkTypes: true});
+      if (!serializable && !deepAccess(ruleDef, 'options.suppressWarnings')) {
+        this.logger.logWarn(`Bid interceptor rule definition #${i + 1} is not serializable and will be lost after a refresh. Rule definition: `, ruleDef);
+      }
+      return serializable;
+    }
+    return ruleDefs.filter(isSerializable);
+  },
+  updateConfig(config) {
+    this.rules = (config.intercept || []).map((ruleDef, i) => this.rule(ruleDef, i + 1))
+  },
+  /**
+   * @typedef {Object} RuleOptions
+   * @property {Number} [delay=0] delay between bid interception and mocking of response (to simulate network delay)
+   * @property {boolean} [suppressWarnings=false] if enabled, do not warn about unserializable rules
+   *
+   * @typedef {Object} Rule
+   * @property {Number} no rule number (used only as an identifier for logging)
+   * @property {function({}, {}): boolean} match a predicate function that tests a bid against this rule
+   * @property {ReplacerFn} replacer generator function for mock bid responses
+   * @property {RuleOptions} options
+   */
+
+  /**
+   * @param {{}} ruleDef
+   * @param {Number} ruleNo
+   * @returns {Rule}
+   */
+  rule(ruleDef, ruleNo) {
+    return {
+      no: ruleNo,
+      match: this.matcher(ruleDef.when, ruleNo),
+      replace: this.replacer(ruleDef.then || {}, ruleNo),
+      options: Object.assign({}, this.DEFAULT_RULE_OPTIONS, ruleDef.options),
+    }
+  },
+  /**
+   * @typedef {Function} MatchPredicate
+   * @param {*} candidate a bid to match, or a portion of it if used inside an ObjectMather.
+   * e.g. matcher((bid, bidRequest) => ....) or matcher({property: (property, bidRequest) => ...})
+   * @param {BidRequest} bidRequest the request `candidate` belongs to
+   * @returns {boolean}
+   *
+   * @typedef {{[key]: Scalar|RegExp|MatchPredicate|ObjectMatcher}} ObjectMatcher
+   */
+
+  /**
+   * @param {MatchPredicate|ObjectMatcher} matchDef matcher definition
+   * @param {Number} ruleNo
+   * @returns {MatchPredicate} a predicate function that matches a bid against the given `matchDef`
+   */
+  matcher(matchDef, ruleNo) {
+    if (typeof matchDef === 'function') {
+      return matchDef;
+    }
+    if (typeof matchDef !== 'object') {
+      this.logger.logError(`Invalid 'when' definition for debug bid interceptor (in rule #${ruleNo})`);
+      return () => false;
+    }
+    function matches(candidate, {ref = matchDef, args = []}) {
+      return Object.entries(ref).map(([key, val]) => {
+        const cVal = candidate[key];
+        if (val instanceof RegExp) {
+          return val.exec(cVal) != null;
+        }
+        if (typeof val === 'function') {
+          return !!val(cVal, ...args);
+        }
+        if (typeof val === 'object') {
+          return matches(cVal, {ref: val, args});
+        }
+        return cVal === val;
+      }).every((i) => i);
+    }
+    return (candidate, ...args) => matches(candidate, {args});
+  },
+  /**
+   * @typedef {Function} ReplacerFn
+   * @param {*} bid a bid that was intercepted
+   * @param {BidRequest} bidRequest the request `bid` belongs to
+   * @returns {*} the response to mock for `bid`, or a portion of it if used inside an ObjectReplacer.
+   * e.g. replacer((bid, bidRequest) => mockResponse) or replacer({property: (bid, bidRequest) => mockProperty})
+   *
+   * @typedef {{[key]: ReplacerFn|ObjectReplacer|*}} ObjectReplacer
+   */
+
+  /**
+   * @param {ReplacerFn|ObjectReplacer} replDef replacer definition
+   * @param ruleNo
+   * @return {ReplacerFn}
+   */
+  replacer(replDef, ruleNo) {
+    let replFn;
+    if (typeof replDef === 'function') {
+      replFn = ({args}) => replDef(...args);
+    } else if (typeof replDef !== 'object') {
+      this.logger.logError(`Invalid 'then' definition for debug bid interceptor (in rule #${ruleNo})`);
+      replFn = () => ({});
+    } else {
+      replFn = ({args, ref = replDef}) => {
+        const result = Array.isArray(ref) ? [] : {};
+        Object.entries(ref).forEach(([key, val]) => {
+          if (typeof val === 'function') {
+            result[key] = val(...args);
+          } else if (val != null && typeof val === 'object') {
+            result[key] = replFn({args, ref: val})
+          } else {
+            result[key] = val;
+          }
+        });
+        return result;
+      }
+    }
+    return (bid, ...args) => {
+      const response = this.responseDefaults(bid);
+      mergeDeep(response, replFn({args: [bid, ...args]}));
+      if (!response.hasOwnProperty('ad') && !response.hasOwnProperty('adUrl')) {
+        response.ad = this.defaultAd(bid, response);
+      }
+      response.isDebug = true;
+      return response;
+    }
+  },
+  responseDefaults(bid) {
+    return {
+      requestId: bid.bidId,
+      cpm: 3.5764,
+      currency: 'EUR',
+      width: 300,
+      height: 250,
+      ttl: 360,
+      creativeId: 'mock-creative-id',
+      netRevenue: false,
+      meta: {}
+    };
+  },
+  defaultAd(bid, bidResponse) {
+    return `<html><head><style>#ad {width: ${bidResponse.width}px;height: ${bidResponse.height}px;background-color: #f6f6ae;color: #85144b;padding: 5px;text-align: center;display: flex;flex-direction: column;align-items: center;justify-content: center;}#bidder {font-family: monospace;font-weight: normal;}#title {font-size: x-large;font-weight: bold;margin-bottom: 5px;}#body {font-size: large;margin-top: 5px;}</style></head><body><div id="ad"><div id="title">Mock ad: <span id="bidder">${bid.bidder}</span></div><div id="body">${bidResponse.width}x${bidResponse.height}</div></div></body></html>`;
+  },
+  /**
+   * Match a candidate bid against all registered rules.
+   *
+   * @param {{}} candidate
+   * @param args
+   * @returns {Rule|undefined} the first matching rule, or undefined if no match was found.
+   */
+  match(candidate, ...args) {
+    return this.rules.find((rule) => rule.match(candidate, ...args));
+  },
+  /**
+   * Match a set of bids against all registered rules.
+   *
+   * @param bids
+   * @param bidRequest
+   * @returns {[{bid: *, rule: Rule}[], *[]]} a 2-tuple for matching bids (decorated with the matching rule) and
+   * non-matching bids.
+   */
+  matchAll(bids, bidRequest) {
+    const [matches, remainder] = [[], []];
+    bids.forEach((bid) => {
+      const rule = this.match(bid, bidRequest);
+      if (rule != null) {
+        matches.push({rule: rule, bid: bid});
+      } else {
+        remainder.push(bid);
+      }
+    })
+    return [matches, remainder];
+  },
+  /**
+   * Run a set of bids against all registered rules, filter out those that match,
+   * and generate mock responses for them.
+   *
+   * @param {{}[]} bids?
+   * @param {BidRequest} bidRequest
+   * @param {function(*)} addBid called once for each mock response
+   * @param {function()} done called once after all mock responses have been run through `addBid`
+   * @returns {{bids: {}[], bidRequest: {}} remaining bids that did not match any rule (this applies also to
+   * bidRequest.bids)
+   */
+  intercept({bids, bidRequest, addBid, done}) {
+    if (bids == null) {
+      bids = bidRequest.bids;
+    }
+    const [matches, remainder] = this.matchAll(bids, bidRequest);
+    if (matches.length > 0) {
+      const callDone = delayExecution(done, matches.length);
+      matches.forEach((match) => {
+        const mockResponse = match.rule.replace(match.bid, bidRequest);
+        const delay = match.rule.options.delay;
+        this.logger.logMessage(`Intercepted bid request (matching rule #${match.rule.no}), mocking response in ${delay}ms. Request, response:`, match.bid, mockResponse)
+        this.setTimeout(() => {
+          addBid(mockResponse, match.bid);
+          callDone();
+        }, delay)
+      });
+      bidRequest = deepClone(bidRequest);
+      bids = bidRequest.bids = remainder;
+    } else {
+      this.setTimeout(done, 0);
+    }
+    return {bids, bidRequest};
+  }
+});
diff --git a/modules/debugging/debugging.js b/modules/debugging/debugging.js
new file mode 100644
index 00000000000..8a4ad7a9545
--- /dev/null
+++ b/modules/debugging/debugging.js
@@ -0,0 +1,117 @@
+import {deepClone, delayExecution} from '../../src/utils.js';
+import {BidInterceptor} from './bidInterceptor.js';
+import {makePbsInterceptor} from './pbsInterceptor.js';
+import {addHooks, removeHooks} from './legacy.js';
+
+const interceptorHooks = [];
+let bidInterceptor;
+let enabled = false;
+
+function enableDebugging(debugConfig, {fromSession = false, config, hook, logger}) {
+  config.setConfig({debug: true});
+  bidInterceptor.updateConfig(debugConfig);
+  resetHooks(true);
+  // also enable "legacy" overrides
+  removeHooks({hook});
+  addHooks(debugConfig, {hook, logger});
+  if (!enabled) {
+    enabled = true;
+    logger.logMessage(`Debug overrides enabled${fromSession ? ' from session' : ''}`);
+  }
+}
+
+export function disableDebugging({hook, logger}) {
+  bidInterceptor.updateConfig(({}));
+  resetHooks(false);
+  // also disable "legacy" overrides
+  removeHooks({hook});
+  if (enabled) {
+    enabled = false;
+    logger.logMessage('Debug overrides disabled');
+  }
+}
+
+function saveDebuggingConfig(debugConfig, {sessionStorage = window.sessionStorage, DEBUG_KEY} = {}) {
+  if (!debugConfig.enabled) {
+    try {
+      sessionStorage.removeItem(DEBUG_KEY);
+    } catch (e) {
+    }
+  } else {
+    if (debugConfig.intercept) {
+      debugConfig = deepClone(debugConfig);
+      debugConfig.intercept = bidInterceptor.serializeConfig(debugConfig.intercept);
+    }
+    try {
+      sessionStorage.setItem(DEBUG_KEY, JSON.stringify(debugConfig));
+    } catch (e) {
+    }
+  }
+}
+
+export function getConfig(debugging, {getStorage = () => window.sessionStorage, DEBUG_KEY, config, hook, logger} = {}) {
+  if (debugging == null) return;
+  let sessionStorage;
+  try {
+    sessionStorage = getStorage();
+  } catch (e) {
+    logger.logError(`sessionStorage is not available: debugging configuration will not persist on page reload`, e);
+  }
+  if (sessionStorage != null) {
+    saveDebuggingConfig(debugging, {sessionStorage, DEBUG_KEY});
+  }
+  if (!debugging.enabled) {
+    disableDebugging({hook, logger});
+  } else {
+    enableDebugging(debugging, {config, hook, logger});
+  }
+}
+
+export function sessionLoader({DEBUG_KEY, storage, config, hook, logger}) {
+  let overrides;
+  try {
+    storage = storage || window.sessionStorage;
+    overrides = JSON.parse(storage.getItem(DEBUG_KEY));
+  } catch (e) {
+  }
+  if (overrides) {
+    enableDebugging(overrides, {fromSession: true, config, hook, logger});
+  }
+}
+
+function resetHooks(enable) {
+  interceptorHooks.forEach(([getHookFn, interceptor]) => {
+    getHookFn().getHooks({hook: interceptor}).remove();
+  });
+  if (enable) {
+    interceptorHooks.forEach(([getHookFn, interceptor]) => {
+      getHookFn().before(interceptor);
+    });
+  }
+}
+
+function registerBidInterceptor(getHookFn, interceptor) {
+  const interceptBids = (...args) => bidInterceptor.intercept(...args);
+  interceptorHooks.push([getHookFn, function (next, ...args) {
+    interceptor(next, interceptBids, ...args);
+  }]);
+}
+
+export function bidderBidInterceptor(next, interceptBids, spec, bids, bidRequest, ajax, wrapCallback, cbs) {
+  const done = delayExecution(cbs.onCompletion, 2);
+  ({bids, bidRequest} = interceptBids({bids, bidRequest, addBid: cbs.onBid, done}));
+  if (bids.length === 0) {
+    done();
+  } else {
+    next(spec, bids, bidRequest, ajax, wrapCallback, {...cbs, onCompletion: done});
+  }
+}
+
+export function install({DEBUG_KEY, config, hook, createBid, logger}) {
+  bidInterceptor = new BidInterceptor({logger});
+  const pbsBidInterceptor = makePbsInterceptor({createBid});
+  registerBidInterceptor(() => hook.get('processBidderRequests'), bidderBidInterceptor);
+  registerBidInterceptor(() => hook.get('processPBSRequest'), pbsBidInterceptor);
+  sessionLoader({DEBUG_KEY, config, hook, logger});
+  config.getConfig('debugging', ({debugging}) => getConfig(debugging, {DEBUG_KEY, config, hook, logger}), {init: true});
+}
diff --git a/modules/debugging/index.js b/modules/debugging/index.js
new file mode 100644
index 00000000000..424200b2029
--- /dev/null
+++ b/modules/debugging/index.js
@@ -0,0 +1,8 @@
+import {config} from '../../src/config.js';
+import {hook} from '../../src/hook.js';
+import {install} from './debugging.js';
+import {prefixLog} from '../../src/utils.js';
+import {createBid} from '../../src/bidfactory.js';
+import {DEBUG_KEY} from '../../src/debugging.js';
+
+install({DEBUG_KEY, config, hook, createBid, logger: prefixLog('DEBUG:')});
diff --git a/modules/debugging/legacy.js b/modules/debugging/legacy.js
new file mode 100644
index 00000000000..e83b99c5194
--- /dev/null
+++ b/modules/debugging/legacy.js
@@ -0,0 +1,100 @@
+export let addBidResponseBound;
+export let addBidderRequestsBound;
+
+export function addHooks(overrides, {hook, logger}) {
+  addBidResponseBound = addBidResponseHook.bind({overrides, logger});
+  hook.get('addBidResponse').before(addBidResponseBound, 5);
+
+  addBidderRequestsBound = addBidderRequestsHook.bind({overrides, logger});
+  hook.get('addBidderRequests').before(addBidderRequestsBound, 5);
+}
+
+export function removeHooks({hook}) {
+  hook.get('addBidResponse').getHooks({hook: addBidResponseBound}).remove();
+  hook.get('addBidderRequests').getHooks({hook: addBidderRequestsBound}).remove();
+}
+
+/**
+ * @param {{bidder:string, adUnitCode:string}} overrideObj
+ * @param {string} bidderCode
+ * @param {string} adUnitCode
+ * @returns {boolean}
+ */
+export function bidExcluded(overrideObj, bidderCode, adUnitCode) {
+  if (overrideObj.bidder && overrideObj.bidder !== bidderCode) {
+    return true;
+  }
+  if (overrideObj.adUnitCode && overrideObj.adUnitCode !== adUnitCode) {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * @param {string[]} bidders
+ * @param {string} bidderCode
+ * @returns {boolean}
+ */
+export function bidderExcluded(bidders, bidderCode) {
+  return (Array.isArray(bidders) && bidders.indexOf(bidderCode) === -1);
+}
+
+/**
+ * @param {Object} overrideObj
+ * @param {Object} bidObj
+ * @param {Object} bidType
+ * @returns {Object} bidObj with overridden properties
+ */
+export function applyBidOverrides(overrideObj, bidObj, bidType, logger) {
+  return Object.keys(overrideObj).filter(key => (['adUnitCode', 'bidder'].indexOf(key) === -1)).reduce(function(result, key) {
+    logger.logMessage(`bidder overrides changed '${result.adUnitCode}/${result.bidderCode}' ${bidType}.${key} from '${result[key]}.js' to '${overrideObj[key]}'`);
+    result[key] = overrideObj[key];
+    result.isDebug = true;
+    return result;
+  }, bidObj);
+}
+
+export function addBidResponseHook(next, adUnitCode, bid, reject) {
+  const {overrides, logger} = this;
+
+  if (bidderExcluded(overrides.bidders, bid.bidderCode)) {
+    logger.logWarn(`bidder '${bid.bidderCode}' excluded from auction by bidder overrides`);
+    return;
+  }
+
+  if (Array.isArray(overrides.bids)) {
+    overrides.bids.forEach(function(overrideBid) {
+      if (!bidExcluded(overrideBid, bid.bidderCode, adUnitCode)) {
+        applyBidOverrides(overrideBid, bid, 'bidder', logger);
+      }
+    });
+  }
+
+  next(adUnitCode, bid, reject);
+}
+
+export function addBidderRequestsHook(next, bidderRequests) {
+  const {overrides, logger} = this;
+
+  const includedBidderRequests = bidderRequests.filter(function (bidderRequest) {
+    if (bidderExcluded(overrides.bidders, bidderRequest.bidderCode)) {
+      logger.logWarn(`bidRequest '${bidderRequest.bidderCode}' excluded from auction by bidder overrides`);
+      return false;
+    }
+    return true;
+  });
+
+  if (Array.isArray(overrides.bidRequests)) {
+    includedBidderRequests.forEach(function(bidderRequest) {
+      overrides.bidRequests.forEach(function(overrideBid) {
+        bidderRequest.bids.forEach(function(bid) {
+          if (!bidExcluded(overrideBid, bidderRequest.bidderCode, bid.adUnitCode)) {
+            applyBidOverrides(overrideBid, bid, 'bidRequest', logger);
+          }
+        });
+      });
+    });
+  }
+
+  next(includedBidderRequests);
+}
diff --git a/modules/debugging/pbsInterceptor.js b/modules/debugging/pbsInterceptor.js
new file mode 100644
index 00000000000..1ca13eb4927
--- /dev/null
+++ b/modules/debugging/pbsInterceptor.js
@@ -0,0 +1,39 @@
+import {deepClone, delayExecution} from '../../src/utils.js';
+import CONSTANTS from '../../src/constants.json';
+
+export function makePbsInterceptor({createBid}) {
+  return function pbsBidInterceptor(next, interceptBids, s2sBidRequest, bidRequests, ajax, {
+    onResponse,
+    onError,
+    onBid
+  }) {
+    let responseArgs;
+    const done = delayExecution(() => onResponse(...responseArgs), bidRequests.length + 1)
+    function signalResponse(...args) {
+      responseArgs = args;
+      done();
+    }
+    function addBid(bid, bidRequest) {
+      onBid({
+        adUnit: bidRequest.adUnitCode,
+        bid: Object.assign(createBid(CONSTANTS.STATUS.GOOD, bidRequest), bid)
+      })
+    }
+    bidRequests = bidRequests
+      .map((req) => interceptBids({bidRequest: req, addBid, done}).bidRequest)
+      .filter((req) => req.bids.length > 0)
+
+    if (bidRequests.length > 0) {
+      const bidIds = new Set();
+      bidRequests.forEach((req) => req.bids.forEach((bid) => bidIds.add(bid.bidId)));
+      s2sBidRequest = deepClone(s2sBidRequest);
+      s2sBidRequest.ad_units.forEach((unit) => {
+        unit.bids = unit.bids.filter((bid) => bidIds.has(bid.bid_id));
+      })
+      s2sBidRequest.ad_units = s2sBidRequest.ad_units.filter((unit) => unit.bids.length > 0);
+      next(s2sBidRequest, bidRequests, ajax, {onResponse: signalResponse, onError, onBid});
+    } else {
+      signalResponse(true, []);
+    }
+  }
+}
diff --git a/modules/debugging/standalone.js b/modules/debugging/standalone.js
new file mode 100644
index 00000000000..b3b539f5aa2
--- /dev/null
+++ b/modules/debugging/standalone.js
@@ -0,0 +1,7 @@
+import {install} from './debugging.js';
+
+window._pbjsGlobals.forEach((name) => {
+  if (window[name] && window[name]._installDebugging === true) {
+    window[name]._installDebugging = install;
+  }
+})
diff --git a/modules/decenteradsBidAdapter.md b/modules/decenteradsBidAdapter.md
deleted file mode 100644
index 04260a9da58..00000000000
--- a/modules/decenteradsBidAdapter.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Overview
-
-```
-Module Name: DecenterAds Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: publishers@decenterads.com
-```
-
-# Description
-
-Module that connects to DecenterAds' demand sources
-
-# Test Parameters
-```
-    var adUnits = [{
-                code: 'placementId_0',
-                sizes: [[300, 250]],
-                bids: [{
-                        bidder: 'decenterads',
-                        params: {
-                            placementId: 0,
-                            traffic: 'banner'
-                        }
-                    }]
-                }
-            ];
-```
diff --git a/modules/deepintentBidAdapter.js b/modules/deepintentBidAdapter.js
index c4dc23cf912..e062686b320 100644
--- a/modules/deepintentBidAdapter.js
+++ b/modules/deepintentBidAdapter.js
@@ -1,13 +1,38 @@
+import { generateUUID, deepSetValue, deepAccess, isArray, isInteger, logError, logWarn } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 const BIDDER_CODE = 'deepintent';
 const BIDDER_ENDPOINT = 'https://prebid.deepintent.com/prebid';
 const USER_SYNC_URL = 'https://cdn.deepintent.com/syncpixel.html';
 const DI_M_V = '1.0.0';
+export const ORTB_VIDEO_PARAMS = {
+  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
+  'minduration': (value) => isInteger(value),
+  'maxduration': (value) => isInteger(value),
+  'protocols': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 10),
+  'w': (value) => isInteger(value),
+  'h': (value) => isInteger(value),
+  'startdelay': (value) => isInteger(value),
+  'placement': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 5),
+  'linearity': (value) => [1, 2].indexOf(value) !== -1,
+  'skip': (value) => [0, 1].indexOf(value) !== -1,
+  'skipmin': (value) => isInteger(value),
+  'skipafter': (value) => isInteger(value),
+  'sequence': (value) => isInteger(value),
+  'battr': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 17),
+  'maxextended': (value) => isInteger(value),
+  'minbitrate': (value) => isInteger(value),
+  'maxbitrate': (value) => isInteger(value),
+  'boxingallowed': (value) => [0, 1].indexOf(value) !== -1,
+  'playbackmethod': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6),
+  'playbackend': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'delivery': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'pos': (value) => [0, 1, 2, 3, 4, 5, 6, 7].indexOf(value) !== -1,
+  'api': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6)
+};
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
   aliases: [],
 
   // tagId is mandatory param
@@ -15,16 +40,38 @@ export const spec = {
     let valid = false;
     if (bid && bid.params && bid.params.tagId) {
       if (typeof bid.params.tagId === 'string' || bid.params.tagId instanceof String) {
-        valid = true;
+        if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
+          if (bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
+            valid = true;
+          }
+        } else {
+          valid = true;
+        }
       }
     }
     return valid;
   },
-  interpretResponse: function(bidResponse, request) {
+  interpretResponse: function(bidResponse, bidRequest) {
     let responses = [];
     if (bidResponse && bidResponse.body) {
-      let bids = bidResponse.body.seatbid && bidResponse.body.seatbid[0] ? bidResponse.body.seatbid[0].bid : [];
-      responses = bids.map(bid => formatResponse(bid))
+      try {
+        let bids = bidResponse.body.seatbid && bidResponse.body.seatbid[0] ? bidResponse.body.seatbid[0].bid : [];
+        if (bids) {
+          bids.forEach(bidObj => {
+            let newBid = formatResponse(bidObj);
+            let mediaType = _checkMediaType(bidObj);
+            if (mediaType === BANNER) {
+              newBid.mediaType = BANNER;
+            } else if (mediaType === VIDEO) {
+              newBid.mediaType = VIDEO;
+              newBid.vastXml = bidObj.adm;
+            }
+            responses.push(newBid);
+          });
+        }
+      } catch (err) {
+        logError(err);
+      }
     }
     return responses;
   },
@@ -32,7 +79,7 @@ export const spec = {
     var user = validBidRequests.map(bid => buildUser(bid));
     clean(user);
     const openRtbBidRequest = {
-      id: utils.generateUUID(),
+      id: generateUUID(),
       at: 1,
       imp: validBidRequests.map(bid => buildImpression(bid)),
       site: buildSite(bidderRequest),
@@ -41,14 +88,16 @@ export const spec = {
     };
 
     if (bidderRequest && bidderRequest.uspConsent) {
-      utils.deepSetValue(openRtbBidRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+      deepSetValue(openRtbBidRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     }
 
     if (bidderRequest && bidderRequest.gdprConsent) {
-      utils.deepSetValue(openRtbBidRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-      utils.deepSetValue(openRtbBidRequest, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+      deepSetValue(openRtbBidRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(openRtbBidRequest, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
     }
 
+    injectEids(openRtbBidRequest, validBidRequests);
+
     return {
       method: 'POST',
       url: BIDDER_ENDPOINT,
@@ -71,6 +120,17 @@ export const spec = {
   }
 
 };
+function _checkMediaType(bid) {
+  let videoRegex = new RegExp(/VAST\s+version/);
+  let mediaType;
+  if (bid.adm && bid.adm.indexOf('deepintent_wrapper') >= 0) {
+    mediaType = BANNER;
+  } else if (videoRegex.test(bid.adm)) {
+    mediaType = VIDEO;
+  }
+  return mediaType;
+}
+
 function clean(obj) {
   for (let propName in obj) {
     if (obj[propName] === null || obj[propName] === undefined) {
@@ -86,6 +146,9 @@ function formatResponse(bid) {
     width: bid && bid.w ? bid.w : 0,
     height: bid && bid.h ? bid.h : 0,
     ad: bid && bid.adm ? bid.adm : '',
+    meta: {
+      advertiserDomains: bid && bid.adomain ? bid.adomain : []
+    },
     creativeId: bid && bid.crid ? bid.crid : undefined,
     netRevenue: false,
     currency: bid && bid.cur ? bid.cur : 'USD',
@@ -95,16 +158,55 @@ function formatResponse(bid) {
 }
 
 function buildImpression(bid) {
-  return {
+  let impression = {};
+  impression = {
     id: bid.bidId,
     tagid: bid.params.tagId || '',
-    secure: window.location.protocol === 'https' ? 1 : 0,
-    banner: buildBanner(bid),
+    secure: window.location.protocol === 'https:' ? 1 : 0,
     displaymanager: 'di_prebid',
     displaymanagerver: DI_M_V,
     ext: buildCustomParams(bid)
   };
+  if (deepAccess(bid, 'mediaTypes.banner')) {
+    impression['banner'] = buildBanner(bid);
+  }
+  if (deepAccess(bid, 'mediaTypes.video')) {
+    impression['video'] = _buildVideo(bid);
+  }
+  return impression;
 }
+
+function _buildVideo(bid) {
+  const videoObj = {};
+  const videoAdUnitParams = deepAccess(bid, 'mediaTypes.video', {});
+  const videoBidderParams = deepAccess(bid, 'params.video', {});
+  const computedParams = {};
+
+  if (Array.isArray(videoAdUnitParams.playerSize)) {
+    const tempSize = (Array.isArray(videoAdUnitParams.playerSize[0])) ? videoAdUnitParams.playerSize[0] : videoAdUnitParams.playerSize;
+    computedParams.w = tempSize[0];
+    computedParams.h = tempSize[1];
+  }
+
+  const videoParams = {
+    ...computedParams,
+    ...videoAdUnitParams,
+    ...videoBidderParams
+  };
+
+  Object.keys(ORTB_VIDEO_PARAMS).forEach(paramName => {
+    if (videoParams.hasOwnProperty(paramName)) {
+      if (ORTB_VIDEO_PARAMS[paramName](videoParams[paramName])) {
+        videoObj[paramName] = videoParams[paramName];
+      } else {
+        logWarn(`The OpenRTB video param ${paramName} has been skipped due to misformating. Please refer to OpenRTB 2.5 spec.`);
+      }
+    }
+  });
+
+  return videoObj;
+};
+
 function buildCustomParams(bid) {
   if (bid.params && bid.params.custom) {
     return {
@@ -128,12 +230,20 @@ function buildUser(bid) {
   }
 }
 
+function injectEids(openRtbBidRequest, validBidRequests) {
+  const bidUserIdAsEids = deepAccess(validBidRequests, '0.userIdAsEids');
+  if (isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
+    deepSetValue(openRtbBidRequest, 'user.eids', bidUserIdAsEids);
+    deepSetValue(openRtbBidRequest, 'user.ext.eids', bidUserIdAsEids);
+  }
+}
+
 function buildBanner(bid) {
-  if (utils.deepAccess(bid, 'mediaTypes.banner')) {
+  if (deepAccess(bid, 'mediaTypes.banner')) {
     // Get Sizes from MediaTypes Object, Will always take first size, will be overrided by params for exact w,h
-    if (utils.deepAccess(bid, 'mediaTypes.banner.sizes') && !bid.params.height && !bid.params.width) {
-      let sizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes');
-      if (utils.isArray(sizes) && sizes.length > 0) {
+    if (deepAccess(bid, 'mediaTypes.banner.sizes') && !bid.params.height && !bid.params.width) {
+      let sizes = deepAccess(bid, 'mediaTypes.banner.sizes');
+      if (isArray(sizes) && sizes.length > 0) {
         return {
           h: sizes[0][1],
           w: sizes[0][0],
@@ -152,21 +262,13 @@ function buildBanner(bid) {
 
 function buildSite(bidderRequest) {
   let site = {};
-  if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-    site.page = bidderRequest.refererInfo.referer;
-    site.domain = getDomain(bidderRequest.refererInfo.referer);
+  if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
+    site.page = bidderRequest.refererInfo.page;
+    site.domain = bidderRequest.refererInfo.domain;
   }
   return site;
 }
 
-function getDomain(referer) {
-  if (referer) {
-    let domainA = document.createElement('a');
-    domainA.href = referer;
-    return domainA.hostname;
-  }
-}
-
 function buildDevice() {
   return {
     ua: navigator.userAgent,
diff --git a/modules/deepintentBidAdapter.md b/modules/deepintentBidAdapter.md
index 79a6a1679e2..84c375d69a4 100644
--- a/modules/deepintentBidAdapter.md
+++ b/modules/deepintentBidAdapter.md
@@ -8,7 +8,7 @@ Maintainer: prebid@deepintent.com
 
 # Description
 
-Deepintent currently supports the BANNER type ads through prebid js
+Deepintent currently supports the BANNER and VIDEO type ads through prebid js
 
 Module that connects to Deepintent's demand sources.
 
@@ -40,6 +40,41 @@ Module that connects to Deepintent's demand sources.
   ];
 ```
 
+# Sample Video Ad Unit
+```
+var adVideoAdUnits = [
+{
+    code: 'test-div-video',
+    mediaTypes: {
+        video: {
+            playerSize: [640, 480],           // required
+            context: 'instream'               //required
+        }
+    },
+    bids: [{
+      bidder: 'deepintent',
+      params: {
+        tagId: '1300',  // Required parameter                 // required
+        video: {
+          mimes: ['video/mp4','video/x-flv'],   // required
+          skippable: true,                      // optional
+          minduration: 5,                       // optional
+          maxduration: 30,                      // optional
+          startdelay: 5,                        // optional
+          playbackmethod: [1,3],                // optional
+          api: [ 1, 2 ],                        // optional
+          protocols: [ 2, 3 ],                  // optional
+          battr: [ 13, 14 ],                    // optional
+          linearity: 1,                         // optional
+          placement: 2,                         // optional
+          minbitrate: 10,                       // optional
+          maxbitrate: 10                        // optional
+        }
+      }
+    }]
+}]
+```
+
 ###Recommended User Sync Configuration
 
 ```javascript
diff --git a/modules/deepintentDpesIdSystem.js b/modules/deepintentDpesIdSystem.js
new file mode 100644
index 00000000000..43c7af1b3cc
--- /dev/null
+++ b/modules/deepintentDpesIdSystem.js
@@ -0,0 +1,45 @@
+/**
+ * This module adds DPES to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/deepintentDpesSystem
+ * @requires module:modules/userId
+ */
+
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'deepintentId';
+export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME});
+
+/** @type {Submodule} */
+export const deepintentDpesSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {{value:string}} value
+   * @returns {{deepintentId:Object}}
+   */
+  decode(value, config) {
+    return value ? { 'deepintentId': value } : undefined;
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} config
+   * @param {ConsentData|undefined} consentData
+   * @param {Object} cacheIdObj - existing id, if any
+   * @return {{id: string | undefined} | undefined}
+   */
+  getId(config, consentData, cacheIdObj) {
+    return cacheIdObj;
+  }
+
+};
+
+submodule('userId', deepintentDpesSubmodule);
diff --git a/modules/deepintentDpesIdSystem.md b/modules/deepintentDpesIdSystem.md
new file mode 100644
index 00000000000..2af0fe7446e
--- /dev/null
+++ b/modules/deepintentDpesIdSystem.md
@@ -0,0 +1,43 @@
+# Deepintent DPES ID
+
+The Deepintent Id  is a shared, healthcare identifier which helps publisher in absence of the 3rd Party cookie matching. This lets publishers set and bid with healthcare identity . Deepintent lets users protect their privacy through advertising value chain, where Healthcare identity when setting the identity takes in consideration of users choices, as well as when passing identity on the cookie itself privacy consent strings are checked. The healthcare identity when set is not stored on Deepintent's servers but is stored on users browsers itself. User can still opt out of the ads by https://option.deepintent.com/adchoices. 
+
+## Deepintent DPES ID Registration
+
+The Deepintent DPES ID is free to use, but requires a simple registration with Deepintent. Please reach to prebid@deepintent.com to get started.
+Once publisher registers with deepintents platform for healthcare identity Deepintent provides the Tag code to be placed on the page, this tag code works to capture and store information as per publishers and users agreement. DPES User ID module uses this stored id and passes it on the deepintent prebid adapter.
+
+
+## Deepintent DPES ID Configuration
+
+First, make sure to add the Deepintent submodule to your Prebid.js package with:
+
+```
+gulp build --modules=deepintentDpesIdSystem,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'deepintentId',
+      storage: {
+        type: 'cookie',          
+        name: '_dpes_id',        
+        expires: 90             // storage lasts for 90 days, optional if storage type is html5
+      }
+    }],
+    auctionDelay: 50             // 50ms maximum auction delay, applies to all userId modules
+  }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module: `"deepintentId"` | `"deepintentId"` |
+| storage | Required | Object | Storage settings for how the User Id module will cache the Deepintent ID locally | |
+| storage.type | Required | String | This is where the results of the user ID will be stored. Deepintent`"html5"` or `"cookie"`. | `"html5"` |
+| storage.name | Required | String | The name of the local storage where the user ID will be stored. | `"_dpes_id"` |
+| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. Deepintent recommends `90`. | `90` |
\ No newline at end of file
diff --git a/modules/deltaprojectsBidAdapter.js b/modules/deltaprojectsBidAdapter.js
new file mode 100644
index 00000000000..e40ec58461c
--- /dev/null
+++ b/modules/deltaprojectsBidAdapter.js
@@ -0,0 +1,249 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {_each, _map, createTrackPixelHtml, deepAccess, isFn, isNumber, logError, logWarn} from '../src/utils.js';
+import {config} from '../src/config.js';
+
+export const BIDDER_CODE = 'deltaprojects';
+export const BIDDER_ENDPOINT_URL = 'https://d5p.de17a.com/dogfight/prebid';
+export const USERSYNC_URL = 'https://userservice.de17a.com/getuid/prebid';
+
+/** -- isBidRequestValid --**/
+function isBidRequestValid(bid) {
+  if (!bid) return false;
+
+  if (bid.bidder !== BIDDER_CODE) return false;
+
+  // publisher id is required
+  const publisherId = deepAccess(bid, 'params.publisherId')
+  if (!publisherId) {
+    logError('Invalid bid request, missing publisher id in params');
+    return false;
+  }
+
+  return true;
+}
+
+/** -- Build requests --**/
+function buildRequests(validBidRequests, bidderRequest) {
+  /** == shared ==**/
+  // -- build id
+  const id = bidderRequest.auctionId;
+
+  // -- build site
+  const publisherId = setOnAny(validBidRequests, 'params.publisherId');
+  const siteId = setOnAny(validBidRequests, 'params.siteId');
+  const site = {
+    id: siteId,
+    domain: bidderRequest.refererInfo.domain,
+    page: bidderRequest.refererInfo.page,
+    ref: bidderRequest.refererInfo.ref,
+    publisher: { id: publisherId },
+  };
+
+  // -- build device
+  const ua = navigator.userAgent;
+  const device = {
+    ua,
+    w: screen.width,
+    h: screen.height
+  }
+
+  // -- build user, reg
+  let user = { ext: {} };
+  const regs = { ext: {} };
+  const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
+  if (gdprConsent) {
+    user.ext = { consent: gdprConsent.consentString };
+    if (typeof gdprConsent.gdprApplies == 'boolean') {
+      regs.ext.gdpr = gdprConsent.gdprApplies ? 1 : 0
+    }
+  }
+
+  // -- build tmax
+  let tmax = (bidderRequest && bidderRequest.timeout > 0) ? bidderRequest.timeout : undefined;
+
+  // build bid specific
+  return validBidRequests.map(validBidRequest => {
+    const openRTBRequest = buildOpenRTBRequest(validBidRequest, id, site, device, user, tmax, regs);
+    return {
+      method: 'POST',
+      url: BIDDER_ENDPOINT_URL,
+      data: openRTBRequest,
+      options: { contentType: 'application/json' },
+      bids: [validBidRequest],
+    };
+  });
+}
+
+function buildOpenRTBRequest(validBidRequest, id, site, device, user, tmax, regs) {
+  // build cur
+  const currency = config.getConfig('currency.adServerCurrency') || deepAccess(validBidRequest, 'params.currency');
+  const cur = currency && [currency];
+
+  // build impression
+  const impression = buildImpression(validBidRequest, currency);
+
+  // build test
+  const test = deepAccess(validBidRequest, 'params.test') ? 1 : 0
+
+  const at = 1
+
+  // build source
+  const source = {
+    tid: validBidRequest.transactionId,
+    fd: 1,
+  }
+
+  return {
+    id,
+    at,
+    imp: [impression],
+    site,
+    device,
+    user,
+    test,
+    tmax,
+    cur,
+    source,
+    regs,
+    ext: {},
+  };
+}
+
+function buildImpression(bid, currency) {
+  const impression = {
+    id: bid.bidId,
+    tagid: bid.params.tagId,
+    ext: {},
+  };
+
+  const bannerMediaType = deepAccess(bid, `mediaTypes.${BANNER}`);
+  impression.banner = buildImpressionBanner(bid, bannerMediaType);
+
+  // bid floor
+  const bidFloor = getBidFloor(bid, BANNER, '*', currency);
+  if (bidFloor) {
+    impression.bidfloor = bidFloor.floor;
+    impression.bidfloorcur = bidFloor.currency;
+  }
+
+  return impression;
+}
+
+function buildImpressionBanner(bid, bannerMediaType) {
+  const bannerSizes = (bannerMediaType && bannerMediaType.sizes) || bid.sizes;
+  return {
+    format: _map(bannerSizes, ([width, height]) => ({ w: width, h: height })),
+  };
+}
+
+/** -- Interpret response --**/
+function interpretResponse(serverResponse) {
+  if (!serverResponse.body) {
+    logWarn('Response body is invalid, return !!');
+    return [];
+  }
+
+  const { body: { id, seatbid, cur } } = serverResponse;
+  if (!id || !seatbid) {
+    logWarn('Id / seatbid of response is invalid, return !!');
+    return [];
+  }
+
+  const bidResponses = [];
+
+  _each(seatbid, seatbid => {
+    _each(seatbid.bid, bid => {
+      const bidObj = {
+        requestId: bid.impid,
+        cpm: parseFloat(bid.price),
+        width: parseInt(bid.w),
+        height: parseInt(bid.h),
+        creativeId: bid.crid || bid.id,
+        dealId: bid.dealid || null,
+        currency: cur,
+        netRevenue: true,
+        ttl: 60,
+      };
+
+      bidObj.mediaType = BANNER;
+      bidObj.ad = bid.adm;
+      if (bid.nurl) {
+        bidObj.ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
+      }
+      if (bid.ext) {
+        bidObj[BIDDER_CODE] = bid.ext;
+      }
+      bidResponses.push(bidObj);
+    });
+  });
+  return bidResponses;
+}
+
+/** -- On Bid Won -- **/
+function onBidWon(bid) {
+  let cpm = bid.cpm;
+  if (bid.currency && bid.currency !== bid.originalCurrency && typeof bid.getCpmInNewCurrency === 'function') {
+    cpm = bid.getCpmInNewCurrency(bid.originalCurrency);
+  }
+  const wonPrice = Math.round(cpm * 1000000);
+  const wonPriceMacroPatten = /\$\{AUCTION_PRICE:B64\}/g;
+  bid.ad = bid.ad.replace(wonPriceMacroPatten, wonPrice);
+}
+
+/** -- Get user syncs --**/
+function getUserSyncs(syncOptions, serverResponses, gdprConsent) {
+  const syncs = []
+
+  if (syncOptions.pixelEnabled) {
+    let gdprParams;
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `?gdpr_consent=${gdprConsent.consentString}`;
+      }
+    } else {
+      gdprParams = '';
+    }
+    syncs.push({
+      type: 'image',
+      url: USERSYNC_URL + gdprParams
+    });
+  }
+  return syncs;
+}
+
+/** -- Get bid floor --**/
+export function getBidFloor(bid, mediaType, size, currency) {
+  if (isFn(bid.getFloor)) {
+    const bidFloorCurrency = currency || 'USD';
+    const bidFloor = bid.getFloor({currency: bidFloorCurrency, mediaType: mediaType, size: size});
+    if (isNumber(bidFloor.floor)) {
+      return bidFloor;
+    }
+  }
+}
+
+/** -- Helper methods --**/
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+/** -- Register -- */
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  onBidWon,
+  getUserSyncs,
+};
+
+registerBidder(spec);
diff --git a/modules/deltaprojectsBidAdapter.md b/modules/deltaprojectsBidAdapter.md
new file mode 100644
index 00000000000..97cef4dd228
--- /dev/null
+++ b/modules/deltaprojectsBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+```
+Module Name:  Delta Projects Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:   dev@deltaprojects.com
+```
+
+# Description
+
+Connects to Delta Projects DSP for bids.
+
+# Test Parameters
+```
+// define banner unit
+var bannerUnit = {
+  code: 'div-gpt-ad-1460505748561-0',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300,600]],
+    }
+  },
+  // Replace this object to test a new Adapter!
+  bids: [{
+    bidder: 'deltaprojects',
+    params: {
+      publisherId: '4'   //required
+    }
+  }]
+};
+```
+
diff --git a/modules/dfpAdServerVideo.js b/modules/dfpAdServerVideo.js
index 71a8471d554..71c9c7aa341 100644
--- a/modules/dfpAdServerVideo.js
+++ b/modules/dfpAdServerVideo.js
@@ -8,6 +8,10 @@ import { deepAccess, isEmpty, logError, parseSizesInput, formatQS, parseUrl, bui
 import { config } from '../src/config.js';
 import { getHook, submodule } from '../src/hook.js';
 import { auctionManager } from '../src/auctionManager.js';
+import { gdprDataHandler, uspDataHandler, gppDataHandler } from '../src/adapterManager.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+import {getPPID} from '../src/adserver.js';
 
 /**
  * @typedef {Object} DfpVideoParams
@@ -42,7 +46,7 @@ import { auctionManager } from '../src/auctionManager.js';
 const defaultParamConstants = {
   env: 'vp',
   gdfp_req: 1,
-  output: 'xml_vast3',
+  output: 'vast',
   unviewed_position_start: 1,
 };
 
@@ -82,10 +86,17 @@ export function buildDfpVideoUrl(options) {
 
   const derivedParams = {
     correlator: Date.now(),
-    sz: parseSizesInput(adUnit.sizes).join('|'),
+    sz: parseSizesInput(deepAccess(adUnit, 'mediaTypes.video.playerSize')).join('|'),
     url: encodeURIComponent(location.href),
   };
-  const encodedCustomParams = getCustParams(bid, options);
+
+  const urlSearchComponent = urlComponents.search;
+  const urlSzParam = urlSearchComponent && urlSearchComponent.sz;
+  if (urlSzParam) {
+    derivedParams.sz = urlSzParam + '|' + derivedParams.sz;
+  }
+
+  let encodedCustomParams = getCustParams(bid, options, urlSearchComponent && urlSearchComponent.cust_params);
 
   const queryParams = Object.assign({},
     defaultParamConstants,
@@ -98,19 +109,40 @@ export function buildDfpVideoUrl(options) {
   const descriptionUrl = getDescriptionUrl(bid, options, 'params');
   if (descriptionUrl) { queryParams.description_url = descriptionUrl; }
 
-  return buildUrl({
+  const gdprConsent = gdprDataHandler.getConsentData();
+  if (gdprConsent) {
+    if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
+    if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
+    if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
+  }
+
+  const uspConsent = uspDataHandler.getConsentData();
+  if (uspConsent) { queryParams.us_privacy = uspConsent; }
+
+  const gppConsent = gppDataHandler.getConsentData();
+  if (gppConsent) {
+    // TODO - need to know what to set here for queryParams...
+  }
+
+  if (!queryParams.ppid) {
+    const ppid = getPPID();
+    if (ppid != null) {
+      queryParams.ppid = ppid;
+    }
+  }
+
+  return buildUrl(Object.assign({
     protocol: 'https',
     host: 'securepubads.g.doubleclick.net',
-    pathname: '/gampad/ads',
-    search: queryParams
-  });
+    pathname: '/gampad/ads'
+  }, urlComponents, { search: queryParams }));
 }
 
 export function notifyTranslationModule(fn) {
   fn.call(this, 'dfp');
 }
 
-getHook('registerAdserver').before(notifyTranslationModule);
+if (config.getConfig('brandCategoryTranslation.translationFile')) { getHook('registerAdserver').before(notifyTranslationModule); }
 
 /**
  * @typedef {Object} DfpAdpodOptions
@@ -159,7 +191,7 @@ export function buildAdpodVideoUrl({code, params, callback} = {}) {
     let initialValue = {
       [adpodUtils.TARGETING_KEY_PB_CAT_DUR]: undefined,
       [adpodUtils.TARGETING_KEY_CACHE_ID]: undefined
-    }
+    };
     let customParams = {};
     if (targeting[code]) {
       customParams = targeting[code].reduce((acc, curValue) => {
@@ -181,6 +213,16 @@ export function buildAdpodVideoUrl({code, params, callback} = {}) {
       { cust_params: encodedCustomParams }
     );
 
+    const gdprConsent = gdprDataHandler.getConsentData();
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') { queryParams.gdpr = Number(gdprConsent.gdprApplies); }
+      if (gdprConsent.consentString) { queryParams.gdpr_consent = gdprConsent.consentString; }
+      if (gdprConsent.addtlConsent) { queryParams.addtl_consent = gdprConsent.addtlConsent; }
+    }
+
+    const uspConsent = uspDataHandler.getConsentData();
+    if (uspConsent) { queryParams.us_privacy = uspConsent; }
+
     const masterTag = buildUrl({
       protocol: 'https',
       host: 'securepubads.g.doubleclick.net',
@@ -204,9 +246,7 @@ function buildUrlFromAdserverUrlComponents(components, bid, options) {
   const descriptionUrl = getDescriptionUrl(bid, components, 'search');
   if (descriptionUrl) { components.search.description_url = descriptionUrl; }
 
-  const encodedCustomParams = getCustParams(bid, options);
-  components.search.cust_params = (components.search.cust_params) ? components.search.cust_params + '%26' + encodedCustomParams : encodedCustomParams;
-
+  components.search.cust_params = getCustParams(bid, options, components.search.cust_params);
   return buildUrl(components);
 }
 
@@ -235,7 +275,7 @@ function getDescriptionUrl(bid, components, prop) {
  * @param {Object} options this is the options passed in from the `buildDfpVideoUrl` function
  * @return {Object} Encoded key value pairs for cust_params
  */
-function getCustParams(bid, options) {
+function getCustParams(bid, options, urlCustParams) {
   const adserverTargeting = (bid && bid.adserverTargeting) || {};
 
   let allTargetingData = {};
@@ -245,17 +285,25 @@ function getCustParams(bid, options) {
     allTargetingData = (allTargeting) ? allTargeting[adUnit.code] : {};
   }
 
-  const optCustParams = deepAccess(options, 'params.cust_params');
-  let customParams = Object.assign({},
+  const prebidTargetingSet = Object.assign({},
     // Why are we adding standard keys here ? Refer https://github.com/prebid/Prebid.js/issues/3664
     { hb_uuid: bid && bid.videoCacheKey },
-    // hb_uuid will be deprecated and replaced by hb_cache_id
+    // hb_cache_id became optional in prebid 5.0 after 4.x enabled the concept of optional keys. Discussion led to reversing the prior expectation of deprecating hb_uuid
     { hb_cache_id: bid && bid.videoCacheKey },
     allTargetingData,
     adserverTargeting,
-    optCustParams,
   );
-  return encodeURIComponent(formatQS(customParams));
+  events.emit(CONSTANTS.EVENTS.SET_TARGETING, {[adUnit.code]: prebidTargetingSet});
+
+  // merge the prebid + publisher targeting sets
+  const publisherTargetingSet = deepAccess(options, 'params.cust_params');
+  const targetingSet = Object.assign({}, prebidTargetingSet, publisherTargetingSet);
+  let encodedParams = encodeURIComponent(formatQS(targetingSet));
+  if (urlCustParams) {
+    encodedParams = urlCustParams + '%26' + encodedParams;
+  }
+
+  return encodedParams;
 }
 
 registerVideoSupport('dfp', {
diff --git a/modules/dgadsBidAdapter.md b/modules/dgadsBidAdapter.md
deleted file mode 100644
index b1544007a43..00000000000
--- a/modules/dgadsBidAdapter.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Overview
-
-```
-Module Name: Digital Garage Ads Platform Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer:dgads-support@garage.co.jp
-```
-
-# Description
-
-Connect to Digital Garage Ads Platform for bids.  
-This adapter supports Banner and Native.
-
-# Test Parameters
-```
-  var adUnits = [
-  // Banner
-  {
-    code: 'banner-div',
-    sizes: [[300, 250]],
-    bids: [{
-      bidder: 'dgads',
-      mediaTypes: 'banner',
-      params: {
-        location_id: '1',
-        site_id: '1'
-      }
-    }]
-  },
-  // Native
-  {
-     code: 'native-div',
-     sizes: [[300, 250]],
-     mediaTypes: {
-       native: {
-         title: {
-           required: true,
-           len: 25
-         },
-         body: {
-           required: true,
-           len: 140
-         },
-         sponsoredBy: {
-           required: true,
-           len: 40
-         },
-         image: {
-           required: true
-         },
-         clickUrl: {
-           required: true
-         },
-       }
-     },
-     bids: [{
-       bidder: 'dgads',
-       params: {
-         location_id: '10',
-         site_id: '1'
-       }
-     }]
-    },
-  ];
-```
diff --git a/modules/dgkeywordRtdProvider.js b/modules/dgkeywordRtdProvider.js
new file mode 100644
index 00000000000..99df3b18a39
--- /dev/null
+++ b/modules/dgkeywordRtdProvider.js
@@ -0,0 +1,159 @@
+/**
+ * This module adds dgkeyword provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will get keywords from 1plux profile api.
+ * This module can work only with AppNexusBidAdapter.
+ * @module modules/dgkeywordProvider
+ * @requires module:modules/realTimeData
+ */
+
+import {logMessage, deepSetValue, logError, logInfo, mergeDeep} from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+
+/**
+ * get keywords from api server. and set keywords.
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {Object} moduleConfig
+ * @param {Object} userConsent
+ */
+export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, userConsent) {
+  const PROFILE_TIMEOUT_MS = 1000;
+  const timeout = (moduleConfig && moduleConfig.params && moduleConfig.params.timeout && Number(moduleConfig.params.timeout) > 0) ? Number(moduleConfig.params.timeout) : PROFILE_TIMEOUT_MS;
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+  callback = (function(cb) {
+    let done = false;
+    return function () {
+      if (!done) {
+        done = true;
+        return cb.apply(this, arguments);
+      }
+    }
+  })(callback);
+  let isFinish = false;
+  logMessage('[dgkeyword sub module]', adUnits, timeout);
+  let setKeywordTargetBidders = getTargetBidderOfDgKeywords(adUnits);
+  if (setKeywordTargetBidders.length <= 0) {
+    logMessage('[dgkeyword sub module] no dgkeyword targets.');
+    callback();
+  } else {
+    logMessage('[dgkeyword sub module] dgkeyword targets:', setKeywordTargetBidders);
+    logMessage('[dgkeyword sub module] get targets from profile api start.');
+    ajax(getProfileApiUrl(moduleConfig?.params?.url, moduleConfig?.params?.enableReadFpid), {
+      success: function(response) {
+        const res = JSON.parse(response);
+        if (!isFinish) {
+          logMessage('[dgkeyword sub module] get targets from profile api end.');
+          if (res) {
+            let keywords = {};
+            if (res['s'] != null && res['s'].length > 0) {
+              keywords['opeaud'] = res['s'];
+            }
+            if (res['t'] != null && res['t'].length > 0) {
+              keywords['opectx'] = res['t'];
+            }
+            if (Object.keys(keywords).length > 0) {
+              const targetBidKeys = {};
+              for (let bid of setKeywordTargetBidders) {
+                // set keywords to params
+                bid.params.keywords = keywords;
+                if (!targetBidKeys[bid.bidder]) {
+                  targetBidKeys[bid.bidder] = true;
+                }
+              }
+
+              if (!reqBidsConfigObj._ignoreSetOrtb2) {
+                // set keywrods to ortb2
+                let addOrtb2 = {};
+                deepSetValue(addOrtb2, 'site.keywords', keywords);
+                deepSetValue(addOrtb2, 'user.keywords', keywords);
+                mergeDeep(reqBidsConfigObj.ortb2Fragments.bidder, Object.fromEntries(Object.keys(targetBidKeys).map(bidder => [bidder, addOrtb2])));
+              }
+            }
+          }
+          isFinish = true;
+        }
+        callback();
+      },
+      error: function(errorStatus) {
+        // error occur
+        logError('[dgkeyword sub module] profile api access error.', errorStatus);
+        callback();
+      }
+    }, null, {
+      withCredentials: true,
+    });
+    setTimeout(function () {
+      if (!isFinish) {
+        // profile api timeout
+        logInfo('[dgkeyword sub module] profile api timeout. [timeout: ' + timeout + 'ms]');
+        isFinish = true;
+      }
+      callback();
+    }, timeout);
+  }
+}
+
+export function getProfileApiUrl(customeUrl, enableReadFpid) {
+  const URL = 'https://mediaconsortium.profiles.tagger.opecloud.com/api/v1';
+  const fpid = (enableReadFpid) ? readFpidFromLocalStrage() : '';
+  let url = customeUrl || URL;
+  url = url + '?url=' + encodeURIComponent(window.location.href) + ((fpid) ? `&fpid=${fpid}` : '');
+  return url;
+}
+
+export function readFpidFromLocalStrage() {
+  try {
+    const fpid = window.localStorage.getItem('ope_fpid');
+    if (fpid) {
+      return fpid;
+    }
+    return null;
+  } catch (error) {
+    return null;
+  }
+}
+
+/**
+ * get all bidder which hava {dgkeyword: true} in params
+ * @param {Object} adUnits
+ */
+export function getTargetBidderOfDgKeywords(adUnits) {
+  let setKeywordTargetBidders = [];
+  for (let adUnit of adUnits) {
+    for (let bid of adUnit.bids) {
+      if (bid.params && bid.params['dgkeyword'] === true) {
+        delete bid.params['dgkeyword'];
+        setKeywordTargetBidders.push(bid);
+      }
+    }
+  }
+  return setKeywordTargetBidders;
+}
+
+/** @type {RtdSubmodule} */
+export const dgkeywordSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: 'dgkeyword',
+  /**
+   * get data and send back to realTimeData module
+   * @function
+   * @param {string[]} adUnitsCodes
+   */
+  getBidRequestData: getDgKeywordsAndSet,
+  init: init,
+};
+
+function init(moduleConfig) {
+  return true;
+}
+
+function registerSubModule() {
+  submodule('realTimeData', dgkeywordSubmodule);
+}
+registerSubModule();
diff --git a/modules/dgkeywordRtdProvider.md b/modules/dgkeywordRtdProvider.md
new file mode 100644
index 00000000000..314475b45a8
--- /dev/null
+++ b/modules/dgkeywordRtdProvider.md
@@ -0,0 +1,29 @@
+ ## Integration
+
+1) Compile the Digital Garage Keyword Module and Appnexus Bid Adapter into your Prebid build:  
+
+```
+gulp build --modules="dgkeywordRtdProvider,appnexusBidAdapter,..."  
+```
+
+2) Use `setConfig` to instruct Prebid.js to initilize the dgkeyword module, as specified below.  
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders`  
+
+```javascript
+var DGKEYWORD_TIMEOUT = 1000;
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: DGKEYWORD_TIMEOUT,
+        dataProviders: [{
+            name: 'dgkeyword',
+            waitForIt: true,
+            params: {
+                timeout: DGKEYWORD_TIMEOUT
+            }
+        }]
+    }
+});
+```
diff --git a/modules/dianomiBidAdapter.js b/modules/dianomiBidAdapter.js
new file mode 100644
index 00000000000..f8f47df1239
--- /dev/null
+++ b/modules/dianomiBidAdapter.js
@@ -0,0 +1,375 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { NATIVE, BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  mergeDeep,
+  _map,
+  deepAccess,
+  parseSizesInput,
+  deepSetValue,
+  formatQS,
+} from '../src/utils.js';
+import { config } from '../src/config.js';
+import { Renderer } from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const { getConfig } = config;
+
+const BIDDER_CODE = 'dianomi';
+const GVLID = 885;
+const BIDDER_ALIAS = [{ code: 'dia', gvlid: GVLID }];
+const NATIVE_ASSET_IDS = {
+  0: 'title',
+  2: 'icon',
+  3: 'image',
+  5: 'sponsoredBy',
+  4: 'body',
+  1: 'cta',
+};
+const NATIVE_PARAMS = {
+  title: {
+    id: 0,
+    name: 'title',
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img',
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img',
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1,
+  },
+  body: {
+    id: 4,
+    name: 'data',
+    type: 2,
+  },
+  cta: {
+    id: 1,
+    type: 12,
+    name: 'data',
+  },
+};
+let endpoint = 'www-prebid.dianomi.com';
+
+const OUTSTREAM_RENDERER_URL = (hostname) => `https://${hostname}/prebid/outstream/renderer.js`;
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: BIDDER_ALIAS,
+  gvlid: GVLID,
+  supportedMediaTypes: [NATIVE, BANNER, VIDEO],
+  isBidRequestValid: (bid) => {
+    const params = bid.params || {};
+    const { smartadId } = params;
+    return !!smartadId;
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    let app, site;
+
+    const commonFpd = bidderRequest.ortb2 || {};
+    let { user } = commonFpd;
+
+    if (typeof getConfig('app') === 'object') {
+      app = getConfig('app') || {};
+      if (commonFpd.app) {
+        mergeDeep(app, commonFpd.app);
+      }
+    } else {
+      site = getConfig('site') || {};
+      if (commonFpd.site) {
+        mergeDeep(site, commonFpd.site);
+      }
+
+      if (!site.page) {
+        site.page = bidderRequest.refererInfo.page;
+      }
+    }
+
+    const device = getConfig('device') || {};
+    device.w = device.w || window.innerWidth;
+    device.h = device.h || window.innerHeight;
+    device.ua = device.ua || navigator.userAgent;
+
+    const paramsEndpoint = setOnAny(validBidRequests, 'params.endpoint');
+
+    if (paramsEndpoint) {
+      endpoint = paramsEndpoint;
+    }
+
+    const pt =
+      setOnAny(validBidRequests, 'params.pt') ||
+      setOnAny(validBidRequests, 'params.priceType') ||
+      'net';
+    const tid = bidderRequest.auctionId;
+    const currency = getConfig('currency.adServerCurrency');
+    const cur = currency && [currency];
+    const eids = setOnAny(validBidRequests, 'userIdAsEids');
+    const schain = setOnAny(validBidRequests, 'schain');
+
+    const imp = validBidRequests.map((bid, id) => {
+      bid.netRevenue = pt;
+
+      const floorInfo = bid.getFloor
+        ? bid.getFloor({
+          currency: currency || 'USD',
+        })
+        : {};
+      const bidfloor = floorInfo.floor;
+      const bidfloorcur = floorInfo.currency;
+      const { smartadId } = bid.params;
+
+      const imp = {
+        id: id + 1,
+        tagid: smartadId,
+        bidfloor,
+        bidfloorcur,
+        ext: {
+          bidder: {
+            smartadId: smartadId,
+          },
+        },
+      };
+
+      const assets = _map(bid.nativeParams, (bidParams, key) => {
+        const props = NATIVE_PARAMS[key];
+        const asset = {
+          required: bidParams.required & 1,
+        };
+        if (props) {
+          asset.id = props.id;
+          let wmin, hmin, w, h;
+          let aRatios = bidParams.aspect_ratios;
+
+          if (aRatios && aRatios[0]) {
+            aRatios = aRatios[0];
+            wmin = aRatios.min_width || 0;
+            hmin = ((aRatios.ratio_height * wmin) / aRatios.ratio_width) | 0;
+          }
+
+          if (bidParams.sizes) {
+            const sizes = flatten(bidParams.sizes);
+            w = sizes[0];
+            h = sizes[1];
+          }
+
+          asset[props.name] = {
+            len: bidParams.len,
+            type: props.type,
+            wmin,
+            hmin,
+            w,
+            h,
+          };
+
+          return asset;
+        }
+      }).filter(Boolean);
+
+      if (assets.length) {
+        imp.native = {
+          assets,
+        };
+      }
+
+      const bannerParams = deepAccess(bid, 'mediaTypes.banner');
+
+      if (bannerParams && bannerParams.sizes) {
+        const sizes = parseSizesInput(bannerParams.sizes);
+        const format = sizes.map((size) => {
+          const [width, height] = size.split('x');
+          const w = parseInt(width, 10);
+          const h = parseInt(height, 10);
+          return { w, h };
+        });
+
+        imp.banner = {
+          format,
+        };
+      }
+
+      const videoParams = deepAccess(bid, 'mediaTypes.video');
+      if (videoParams) {
+        imp.video = videoParams;
+      }
+
+      return imp;
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site,
+      app,
+      user,
+      device,
+      source: { tid, fd: 1 },
+      ext: { pt },
+      cur,
+      imp,
+    };
+
+    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
+      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1);
+    }
+
+    if (bidderRequest.uspConsent) {
+      deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    if (eids) {
+      deepSetValue(request, 'user.ext.eids', eids);
+    }
+
+    if (schain) {
+      deepSetValue(request, 'source.ext.schain', schain);
+    }
+
+    return {
+      method: 'POST',
+      url: 'https://' + endpoint + '/cgi-bin/smartads_prebid.pl',
+      data: JSON.stringify(request),
+      bids: validBidRequests,
+    };
+  },
+  interpretResponse: function (serverResponse, { bids }) {
+    if (!serverResponse.body || serverResponse?.body?.nbr) {
+      return;
+    }
+    const { seatbid, cur } = serverResponse.body;
+
+    const bidResponses = flatten(seatbid.map((seat) => seat.bid)).reduce((result, bid) => {
+      result[bid.impid - 1] = bid;
+      return result;
+    }, []);
+
+    return bids
+      .map((bid, id) => {
+        const bidResponse = bidResponses[id];
+        if (bidResponse) {
+          const mediaType = deepAccess(bidResponse, 'ext.prebid.type');
+          const result = {
+            requestId: bid.bidId,
+            cpm: bidResponse.price,
+            creativeId: bidResponse.crid,
+            ttl: 360,
+            netRevenue: bid.netRevenue === 'net',
+            currency: cur,
+            mediaType,
+            width: bidResponse.w,
+            height: bidResponse.h,
+            dealId: bidResponse.dealid,
+            meta: {
+              mediaType,
+              advertiserDomains: bidResponse.adomain,
+            },
+          };
+
+          if (bidResponse.native) {
+            result.native = parseNative(bidResponse);
+          } else {
+            result[mediaType === VIDEO ? 'vastXml' : 'ad'] = bidResponse.adm;
+          }
+
+          if (
+            !bid.renderer &&
+            mediaType === VIDEO &&
+            deepAccess(bid, 'mediaTypes.video.context') === 'outstream'
+          ) {
+            result.renderer = Renderer.install({
+              id: bid.bidId,
+              url: OUTSTREAM_RENDERER_URL(endpoint),
+              adUnitCode: bid.adUnitCode,
+            });
+            result.renderer.setRender(renderer);
+          }
+
+          return result;
+        }
+      })
+      .filter(Boolean);
+  },
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+    const params = {};
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        params['gdpr'] = Number(gdprConsent.gdprApplies);
+      }
+      if (typeof gdprConsent.consentString === 'string') {
+        params['gdpr_consent'] = gdprConsent.consentString;
+      }
+    }
+
+    if (uspConsent) {
+      params['us_privacy'] = encodeURIComponent(uspConsent);
+    }
+    if (syncOptions.iframeEnabled) {
+      // data is only assigned if params are available to pass to syncEndpoint
+      return {
+        type: 'iframe',
+        url: `https://${endpoint}/prebid/usersync/index.html?${formatQS(params)}`,
+      };
+    } else if (syncOptions.pixelEnabled) {
+      return {
+        type: 'image',
+        url: `https://${endpoint.includes('dev') ? 'dev-' : ''}data.dianomi.com/frontend/usync?${formatQS(params)}`,
+      };
+    }
+  },
+};
+
+registerBidder(spec);
+
+function parseNative(bid) {
+  const { assets, link, imptrackers, jstracker } = bid.native;
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined,
+    impressionTrackers: imptrackers || undefined,
+    javascriptTrackers: jstracker ? [jstracker] : undefined,
+  };
+  assets.forEach((asset) => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text ||
+        content.value || {
+        url: content.url,
+        width: content.w,
+        height: content.h,
+      };
+    }
+  });
+
+  return result;
+}
+
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function flatten(arr) {
+  return [].concat(...arr);
+}
+
+function renderer(bid) {
+  bid.renderer.push(() => {
+    window.Dianomi.renderOutstream(bid);
+  });
+}
diff --git a/modules/dianomiBidAdapter.md b/modules/dianomiBidAdapter.md
new file mode 100644
index 00000000000..d530475ce65
--- /dev/null
+++ b/modules/dianomiBidAdapter.md
@@ -0,0 +1,73 @@
+# Overview
+
+```
+Module Name: Dianomi Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid-maintainer@dianomi.com
+```
+
+# Description
+
+Module that connects to Dianomi's demand sources. Both Native and Banner formats supported. Using oRTB standard.
+
+# Test Parameters
+
+```js
+    var adUnits = [
+        {
+            code: 'test-div-1',
+            mediaTypes: {
+                native: {
+                    rendererUrl: "https://dev.dianomi.com/chris/prebid/dianomiRenderer.js",
+                    image: {
+                        required: true,
+                        sizes: [360, 360]
+                    },
+                    title: {
+                        required: true,
+                        len: 800
+                    },
+                    sponsoredBy: {
+                        required: true
+                    },
+                    clickUrl: {
+                        required: true
+                    },
+                    privacyLink: {
+                        required: false
+                    },
+                    body: {
+                        required: false
+                    },
+                    icon: {
+                        required: false,
+                        sizes: [75, 75]
+                    },
+                }
+            },
+            bids: [
+                {
+                    bidder: "dianomi",
+                    params: {
+                        smartadId: 12345   // required, provided by Account Manager
+                    }
+                }
+            ]
+        },{
+            code: 'test-div-2',
+            mediaTypes: {
+                banner: {
+                    sizes: [750, 650],   // a below-article size
+                }
+            },
+            bids: [
+                {
+                    bidder: "dianomi",
+                    params: {
+                        smartadId: 23456,  // required provided by Account Manager
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/digiTrustIdSystem.js b/modules/digiTrustIdSystem.js
deleted file mode 100644
index d8aa8be9376..00000000000
--- a/modules/digiTrustIdSystem.js
+++ /dev/null
@@ -1,460 +0,0 @@
-/**
- * This module adds DigiTrust ID support to the User ID module
- * The {@link module:modules/userId} module is required
- * If the full DigiTrust Id library is included the standard functions
- * will be invoked to obtain the user's DigiTrust Id.
- * When the full library is not included this will fall back to the
- * DigiTrust Identity API and generate a mock DigiTrust object.
- * @module modules/digiTrustIdSystem
- * @requires module:modules/userId
- */
-
-import * as utils from '../src/utils.js'
-import { ajax } from '../src/ajax.js';
-import { submodule } from '../src/hook.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const DT_VENDOR_ID = 64; // cmp gvlVendorId
-const storage = getStorageManager(DT_VENDOR_ID);
-
-var fallbackTimeout = 1550; // timeout value that allows userId system to execute first
-var fallbackTimer = 0; // timer Id for fallback init so we don't double call
-
-/**
- * Checks to see if the DigiTrust framework is initialized.
- * @function
- */
-function isInitialized() {
-  if (window.DigiTrust == null) {
-    return false;
-  }
-  // eslint-disable-next-line no-undef
-  return DigiTrust.isClient; // this is set to true after init
-}
-
-/**
- * Tests for presence of the DigiTrust object
- * */
-function isPresent() {
-  return (window.DigiTrust != null);
-}
-
-var noop = function () {
-};
-
-const MAX_RETRIES = 2;
-const DT_ID_SVC = 'https://prebid.digitru.st/id/v1';
-
-var isFunc = function (fn) {
-  return typeof (fn) === 'function';
-}
-
-var _savedId = null; // closure variable for storing Id to avoid additional requests
-
-function callApi(options) {
-  var ajaxOptions = {
-    method: 'GET',
-    withCredentials: true
-  };
-
-  ajax(
-    DT_ID_SVC,
-    {
-      success: options.success,
-      error: options.fail
-    },
-    null,
-    ajaxOptions
-  );
-}
-
-/**
- * Encode the Id per DigiTrust lib
- * @param {any} id
- */
-function encId(id) {
-  try {
-    if (typeof (id) !== 'string') {
-      id = JSON.stringify(id);
-    }
-    return btoa(id);
-  } catch (ex) {
-    return id;
-  }
-}
-
-/**
- * Writes the Identity into the expected DigiTrust cookie
- * @param {any} id
- */
-function writeDigiId(id) {
-  var key = 'DigiTrust.v1.identity';
-  var date = new Date();
-  date.setTime(date.getTime() + 604800000);
-  storage.setCookie(key, encId(id), date.toUTCString(), 'none');
-}
-
-/**
- * Tests to see if the current browser is FireFox
- */
-function isFirefoxBrowser(ua) {
-  ua = ua || navigator.userAgent;
-  ua = ua.toLowerCase();
-  if (ua.indexOf('firefox') !== -1) {
-    return true;
-  }
-  return false;
-}
-
-/**
- * Test to see if the user has a browser that is disallowed for making AJAX
- * requests due to the behavior not supported DigiTrust ID Cookie.
- */
-function isDisallowedBrowserForApiCall() {
-  if (utils.isSafariBrowser()) {
-    return true;
-  } else if (isFirefoxBrowser()) {
-    return true;
-  }
-  return false;
-}
-
-/**
- * Set up a DigiTrust facade object to mimic the API
- *
- */
-function initDigitrustFacade(config) {
-  clearTimeout(fallbackTimer);
-  fallbackTimer = 0;
-
-  var facade = {
-    isClient: true,
-    isMock: true,
-    _internals: {
-      callCount: 0,
-      initCallback: null
-    },
-    getUser: function (obj, callback) {
-      var isAsync = !!isFunc(callback);
-      var cb = isAsync ? callback : noop;
-      var errResp = { success: false };
-      var inter = facade._internals;
-      inter.callCount++;
-
-      // wrap the initializer callback, if present
-      var checkAndCallInitializeCb = function (idResponse) {
-        if (inter.callCount <= 1 && isFunc(inter.initCallback)) {
-          try {
-            inter.initCallback(idResponse);
-          } catch (ex) {
-            utils.logError('Exception in passed DigiTrust init callback', ex);
-          }
-        }
-      }
-
-      if (!isMemberIdValid(obj.member)) {
-        if (!isAsync) {
-          return errResp
-        } else {
-          cb(errResp);
-          return;
-        }
-      }
-
-      if (_savedId != null) {
-        if (isAsync) {
-          checkAndCallInitializeCb(_savedId);
-          //          cb(_savedId);
-          return;
-        } else {
-          return _savedId;
-        }
-      }
-
-      var opts = {
-        success: function (respText, result) {
-          var idResult = {
-            success: true
-          }
-          try {
-            idResult.identity = JSON.parse(respText);
-            _savedId = idResult; // Save result to the cache variable
-            writeDigiId(respText);
-          } catch (ex) {
-            idResult.success = false;
-            delete idResult.identity;
-          }
-          checkAndCallInitializeCb(idResult);
-        },
-        fail: function (statusErr, result) {
-          utils.logError('DigiTrustId API error: ' + statusErr);
-        }
-      }
-
-      // check gdpr vendor here. Full DigiTrust library has vendor check built in
-      gdprConsent.hasConsent(null, function (hasConsent) {
-        if (hasConsent) {
-          if (isDisallowedBrowserForApiCall()) {
-            let resultObj = {
-              success: false,
-              err: 'Your browser does not support DigiTrust Identity'
-            }
-            checkAndCallInitializeCb(resultObj);
-            return;
-          }
-          callApi(opts);
-        }
-      })
-
-      if (!isAsync) {
-        return errResp; // even if it will be successful later, without a callback we report a "failure in this moment"
-      }
-    }
-  }
-
-  if (config && isFunc(config.callback)) {
-    facade._internals.initCallback = config.callback;
-  }
-
-  if (window && window.DigiTrust == null) {
-    window.DigiTrust = facade;
-  }
-}
-
-/**
- * Tests to see if a member ID is valid within facade
- * @param {any} memberId
- */
-var isMemberIdValid = function (memberId) {
-  if (memberId && memberId.length > 0) {
-    return true;
-  } else {
-    utils.logError('[DigiTrust Prebid Client Error] Missing member ID, add the member ID to the function call options');
-    return false;
-  }
-};
-
-/**
- * DigiTrust consent handler for GDPR and __cmp.
- * */
-var gdprConsent = {
-  hasConsent: function (options, consentCb) {
-    options = options || { consentTimeout: 1500 };
-    var stopTimer;
-    var processed = false;
-    var consentAnswer = false;
-    if (typeof (window.__cmp) !== 'undefined') {
-      stopTimer = setTimeout(function () {
-        consentAnswer = false;
-        processed = true;
-        consentCb(consentAnswer);
-      }, options.consentTimeout);
-
-      window.__cmp('ping', null, function(pingAnswer) {
-        if (pingAnswer.gdprAppliesGlobally) {
-          window.__cmp('getVendorConsents', [DT_VENDOR_ID], function (result) {
-            if (processed) { return; } // timeout before cmp answer, cancel
-            clearTimeout(stopTimer);
-            var myconsent = result.vendorConsents[DT_VENDOR_ID];
-            consentCb(myconsent);
-          });
-        } else {
-          if (processed) { return; } // timeout before cmp answer, cancel
-          clearTimeout(stopTimer);
-          consentAnswer = true;
-          consentCb(consentAnswer);
-        }
-      });
-    } else {
-      // __cmp library is not preset.
-      // ignore this check and rely on id system GDPR consent management
-      consentAnswer = true;
-      consentCb(consentAnswer);
-    }
-  }
-}
-
-/**
- * Encapsulation of needed info for the callback return.
- *
- * @param {any} opts
- */
-var ResultWrapper = function (opts) {
-  var me = this;
-  this.idObj = null;
-
-  var idSystemFn = null;
-
-  /**
-   * Callback method that is passed back to the userId module.
-   *
-   * @param {function} callback
-   */
-  this.userIdCallback = function (callback) {
-    idSystemFn = callback;
-    if (me.idObj == null) {
-      me.idObj = _savedId;
-    }
-
-    if (me.idObj != null && isFunc(callback)) {
-      callback(wrapIdResult());
-    }
-  }
-
-  /**
-   * Return a wrapped result formatted for userId system
-   */
-  function wrapIdResult() {
-    if (me.idObj == null) {
-      me.idObj = _savedId;
-    }
-
-    if (me.idObj == null) {
-      return null;
-    }
-
-    var cp = me.configParams;
-    var exp = (cp && cp.storage && cp.storage.expires) || 60;
-
-    var rslt = {
-      data: null,
-      expires: exp
-    };
-    if (me.idObj && me.idObj.success && me.idObj.identity) {
-      rslt.data = me.idObj.identity;
-    } else {
-      rslt.err = 'Failure getting id';
-    }
-
-    return rslt;
-  }
-
-  this.retries = 0;
-  this.retryId = 0;
-
-  this.executeIdRequest = function (configParams) {
-    // eslint-disable-next-line no-undef
-    DigiTrust.getUser({ member: 'prebid' }, function (idResult) {
-      me.idObj = idResult;
-      var cb = function () {
-        if (isFunc(idSystemFn)) {
-          idSystemFn(wrapIdResult());
-        }
-      }
-
-      cb();
-      if (configParams && configParams.callback && isFunc(configParams.callback)) {
-        try {
-          configParams.callback(idResult);
-        } catch (ex) {
-          utils.logError('Failure in DigiTrust executeIdRequest', ex);
-        }
-      }
-    });
-  }
-}
-
-// An instance of the result wrapper object.
-var resultHandler = new ResultWrapper();
-
-/*
- * Internal implementation to get the Id and trigger callback
- */
-function getDigiTrustId(configParams) {
-  if (resultHandler.configParams == null) {
-    resultHandler.configParams = configParams;
-  }
-
-  // First see if we should initialize DigiTrust framework
-  if (isPresent() && !isInitialized()) {
-    initializeDigiTrust(configParams);
-    resultHandler.retryId = setTimeout(function () {
-      getDigiTrustId(configParams);
-    }, 100 * (1 + resultHandler.retries++));
-    return resultHandler.userIdCallback;
-  } else if (!isInitialized()) { // Second see if we should build a facade object
-    if (resultHandler.retries >= MAX_RETRIES) {
-      initDigitrustFacade(configParams); // initialize a facade object that relies on the AJAX call
-      resultHandler.executeIdRequest(configParams);
-    } else {
-      // use expanding envelope
-      if (resultHandler.retryId != 0) {
-        clearTimeout(resultHandler.retryId);
-      }
-      resultHandler.retryId = setTimeout(function () {
-        getDigiTrustId(configParams);
-      }, 100 * (1 + resultHandler.retries++));
-    }
-    return resultHandler.userIdCallback;
-  } else { // Third get the ID
-    resultHandler.executeIdRequest(configParams);
-    return resultHandler.userIdCallback;
-  }
-}
-
-function initializeDigiTrust(config) {
-  utils.logInfo('Digitrust Init');
-  var dt = window.DigiTrust;
-  if (dt && !dt.isClient && config != null) {
-    dt.initialize(config.init, config.callback);
-  } else if (dt == null) {
-    // Assume we are already on a delay and DigiTrust is not on page
-    initDigitrustFacade(config);
-  }
-}
-
-var testHook = {};
-
-/**
- * Exposes the test hook object by attaching to the digitrustIdModule.
- * This method is called in the unit tests to surface internals.
- */
-export function surfaceTestHook() {
-  digiTrustIdSubmodule['_testHook'] = testHook;
-  return testHook;
-}
-
-testHook.initDigitrustFacade = initDigitrustFacade; // expose for unit tests
-testHook.gdpr = gdprConsent;
-
-/** @type {Submodule} */
-export const digiTrustIdSubmodule = {
-  /**
-   * used to link submodule with config
-   * @type {string}
-   */
-  name: 'digitrust',
-  /**
-   * decode the stored id value for passing to bid requests
-   * @function
-   * @param {string} value
-   * @returns {{pubcid:string}}
-   */
-  decode: function (idData) {
-    try {
-      return { 'digitrustid': idData };
-    } catch (e) {
-      utils.logError('DigiTrust ID submodule decode error');
-    }
-  },
-  getId: function (configParams) {
-    return {callback: getDigiTrustId(configParams)};
-  },
-  _testInit: surfaceTestHook
-};
-
-// check for fallback init of DigiTrust
-function fallbackInit() {
-  if (resultHandler.retryId == 0 && !isInitialized()) {
-    // this triggers an init
-    var conf = {
-      member: 'fallback',
-      callback: noop
-    };
-    getDigiTrustId(conf);
-  }
-}
-
-fallbackTimer = setTimeout(fallbackInit, fallbackTimeout);
-
-submodule('userId', digiTrustIdSubmodule);
diff --git a/modules/digiTrustIdSystem.md b/modules/digiTrustIdSystem.md
deleted file mode 100644
index c0b274d3292..00000000000
--- a/modules/digiTrustIdSystem.md
+++ /dev/null
@@ -1,156 +0,0 @@
-## DigiTrust Universal Id Integration
-
-Setup
------
-The DigiTrust Id integration for Prebid may be used with or without the full
-DigiTrust library. This is an optional module that must be used in conjunction
-with the userId module.
-
-See the [Prebid Integration Guide for DigiTrust](https://github.com/digi-trust/dt-cdn/wiki/Prebid-Integration-for-DigiTrust-Id)
-and the [DigiTrust wiki](https://github.com/digi-trust/dt-cdn/wiki)
-for further instructions.
-
-
-## Example Prebid Configuration for Digitrust Id
-```
-        pbjs.que.push(function() {
-            pbjs.setConfig({
-                usersync: {
-                    userIds: [{
-						name: "digitrust",
-						params: {
-							init: {
-								member: 'example_member_id',
-								site: 'example_site_id'
-							},
-							callback: function (digiTrustResult) {
-							// This callback method is optional and used for error handling
-							// in many if not most cases.
-							/*
-								if (digiTrustResult.success) {
-									// Success in Digitrust init;
-									// 'DigiTrust Id (encrypted): ' + digiTrustResult.identity.id;
-								}
-								else {
-									// Digitrust init failed
-								}
-							*/
-							}
-						},
-						storage: {
-							type: "html5",
-							name: "pbjsdigitrust",
-							expires: 60
-						}
-					}]
-                }
-            });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: sendAdserverRequest
-            });
-        });
-
-```
-
-
-## Building Prebid with DigiTrust Support
-Your Prebid build must include the modules for both **userId** and **digitrustIdLoader**. Follow the build instructions for Prebid as
-explained in the top level README.md file of the Prebid source tree.
-
-ex: $ gulp build --modules=userId,digitrustIdLoader
-
-### Step by step Prebid build instructions for DigiTrust 
-
-1. Download the Prebid source from [Prebid Git Repo](https://github.com/prebid/Prebid.js)
-2. Set up your environment as outlined in the [Readme File](https://github.com/prebid/Prebid.js/blob/master/README.md#Build)
-3. Execute the build command either with all modules or with the `userId` and `digitrustIdLoader` modules.
-   ```
-   $ gulp build --modules=userId,digitrustIdLoader
-   ```
-4. (Optional) Concatenate the DigiTrust source code to the end of your `prebid.js` file for a single source distribution.
-5. Upload the resulting source file to your CDN.
-
-
-## Deploying Prebid with DigiTrust ID support
-**Precondition:** You must be a DigiTrust member and have registered through the [DigiTrust Signup Process](http://www.digitru.st/signup/).
-Your assigned publisher ID will be required in the configuration settings for all deployment scenarios.
-
-There are three supported approaches to deploying the Prebid-integrated DigiTrust package:
-
-* "Bare bones" deployment using only the integrated DigiTrust module code.
-* Full DigiTrust with CDN referenced DigiTrust.js library.
-* Full DigiTrust packaged with Prebid or site js.
-
-### Bare Bones Deployment
-
-This deployment results in the smallest Javascript package and is the simplest deployment. 
-It is appropriate for testing or deployments where simplicity is key. This approach
-utilizes the REST API for ID generation. While there is less Javascript in use,
-the user may experience more network requests than the scenarios that include the full
-DigiTrust library.
-
-1. Build your Prebid package as above, skipping step 4.
-2. Add the DigiTrust initializer section to your Prebid initialization object as below, 
-   using your Member ID and Site ID.
-3. Add a reference to your Prebid package and the initialization code on all pages you wish
-   to utilize Prebid with integrated DigiTrust ID.
-
-
-
-
-### Full DigiTrust with CDN referenced DigiTrust library
-
-Both "Full DigiTrust" deployments will result in a larger initial Javascript payload.
-The end user may experience fewer overall network requests as the encrypted and anonymous
-DigiTrust ID can often be generated fully in client-side code. Utilizing the CDN reference
-to the official DigiTrust distribution insures you will be running the latest version of the library.
-
-The Full DigiTrust deployment is designed to work with both new DigiTrust with Prebid deployments, and with
-Prebid deployments by existing DigiTrust members. This allows you to migrate your code more slowly
-without losing DigiTrust support in the process.
-
-1. Deploy your built copy of `prebid.js` to your CDN.
-2. On each page reference both your `prebid.js` and a copy of the **DigiTrust** library. 
-   This may either be a copy downloaded from the [DigiTrust CDN](https://cdn.digitru.st/prod/1/digitrust.min.js) to your CDN, 
-   or directly referenced from the URL https://cdn.digitru.st/prod/1/digitrust.min.js. These may be added to the page in any order.
-3. Add a configuration section for Prebid that includes the `usersync` settings and the `digitrust` settings.
-
-### Full DigiTrust packaged with Prebid
-
-
-1. Deploy your built copy of `prebid.js` to your CDN. Be sure to perform *Step 4* of the build to concatenate or 
-   integrate the full DigiTrust library code with your Prebid package.
-2. On each page reference your `prebid.js`
-3. Add a configuration section for Prebid that includes the `usersync` settings and the `digitrust` settings. 
-   This code may also be appended to your Prebid package or placed in other initialization methods.
-
-
-
-## Parameter Descriptions for the `usersync` Configuration Section
-The below parameters apply only to the DigiTrust ID integration.
-
-| Param under usersync.userIds[] | Scope | Type | Description | Example |
-| --- | --- | --- | --- | --- |
-| name | Required | String | ID value for the DigiTrust module - `"digitrust"` | `"digitrust"` |
-| params | Required | Object | Details for DigiTrust initialization. | |
-| params.init | Required | Object | Initialization parameters, including the DigiTrust Publisher ID and Site ID. |  |
-| params.init.member | Required | String | DigiTrust Publisher Id | "A897dTzB" |
-| params.init.site | Required | String | DigiTrust Site Id | "MM2123" |
-| params.callback | Optional | Function | Callback method to fire after initialization of the DigiTrust framework. The argument indicates failure and success and the identity object upon success. |  |
-| storage | Required | Object | The publisher must specify the local storage in which to store the results of the call to get the user ID. This can be either cookie or HTML5 storage. | |
-| storage.type | Required | String | This is where the results of the user ID will be stored. The recommended method is `localStorage` by specifying `html5`. | `"html5"` |
-| storage.name | Required | String | The name of the cookie or html5 local storage where the user ID will be stored. | `"pbjsdigitrust"` |
-| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. Default is 30 for UnifiedId and 1825 for PubCommonID | `365` |
-| value | Optional | Object | Used only if the page has a separate mechanism for storing the Unified ID. The value is an object containing the values to be sent to the adapters. In this scenario, no URL is called and nothing is added to local storage | `{"tdid": "D6885E90-2A7A-4E0F-87CB-7734ED1B99A3"}` |
-
-
-
-## Further Reading
-
-+ [DigiTrust Home Page](http://digitru.st)
-
-+ [DigiTrust integration guide](https://github.com/digi-trust/dt-cdn/wiki/Integration-Guide)
-
-+ [DigiTrust ID Encryption](https://github.com/digi-trust/dt-cdn/wiki/ID-encryption)
-
diff --git a/modules/discoveryBidAdapter.js b/modules/discoveryBidAdapter.js
new file mode 100644
index 00000000000..0c536892716
--- /dev/null
+++ b/modules/discoveryBidAdapter.js
@@ -0,0 +1,491 @@
+import * as utils from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'discovery';
+const ENDPOINT_URL = 'https://rtb-jp.mediago.io/api/bid?tn=';
+const TIME_TO_LIVE = 500;
+const storage = getStorageManager();
+let globals = {};
+let itemMaps = {};
+const MEDIATYPE = [BANNER, NATIVE];
+
+/* ----- _ss_pp_id:start ------ */
+const COOKIE_KEY_SSPPID = '_ss_pp_id';
+const COOKIE_KEY_MGUID = '__mguid_';
+
+const NATIVERET = {
+  id: 'id',
+  bidfloor: 0,
+  // TODO Dynamic parameters
+  native: {
+    ver: '1.2',
+    plcmtcnt: 1,
+    assets: [
+      {
+        id: 1,
+        required: 1,
+        img: {
+          type: 3,
+          w: 300,
+          wmin: 300,
+          h: 174,
+          hmin: 174,
+        },
+      },
+      {
+        id: 2,
+        required: 1,
+        title: {
+          len: 75,
+        },
+      }
+    ],
+    plcmttype: 1,
+    privacy: 1,
+    eventtrackers: [
+      {
+        event: 1,
+        methods: [1, 2],
+      },
+    ],
+  },
+  ext: {},
+};
+
+/**
+ * 获取用户id
+ * @return {string}
+ */
+const getUserID = () => {
+  let idd = storage.getCookie(COOKIE_KEY_SSPPID);
+  let idm = storage.getCookie(COOKIE_KEY_MGUID);
+
+  if (idd && !idm) {
+    idm = idd
+  } else if (idm && !idd) {
+    idd = idm
+  } else if (!idd && !idm) {
+    const uuid = utils.generateUUID();
+    storage.setCookie(COOKIE_KEY_MGUID, uuid);
+    storage.setCookie(COOKIE_KEY_SSPPID, uuid);
+    return uuid;
+  }
+  return idd;
+};
+
+/* ----- _ss_pp_id:end ------ */
+
+/**
+ * get object key -> value
+ * @param  {Object}    obj  对象
+ * @param  {...string} keys 键名
+ * @return {any}
+ */
+function getKv(obj, ...keys) {
+  let o = obj;
+
+  for (let key of keys) {
+    if (o && o[key]) {
+      o = o[key];
+    } else {
+      return '';
+    }
+  }
+  return o;
+}
+
+/**
+ * get device
+ * @return {boolean}
+ */
+function getDevice() {
+  let check = false;
+  (function (a) {
+    let reg1 = new RegExp(
+      [
+        '(android|bbd+|meego)',
+        '.+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)',
+        '|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone',
+        '|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up.(browser|link)|vodafone|wap',
+        '|windows ce|xda|xiino|android|ipad|playbook|silk',
+      ].join(''),
+      'i'
+    );
+    let reg2 = new RegExp(
+      [
+        '1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)',
+        '|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )',
+        '|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell',
+        '|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)',
+        '|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene',
+        '|gf-5|g-mo|go(.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c',
+        '|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom',
+        '|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)',
+        '|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)',
+        '|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]',
+        '|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)',
+        '|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio',
+        '|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms',
+        '|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al',
+        '|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)',
+        '|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(.b|g1|si)|utst|',
+        'v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)',
+        '|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-',
+        '|your|zeto|zte-',
+      ].join(''),
+      'i'
+    );
+    if (reg1.test(a) || reg2.test(a.substr(0, 4))) {
+      check = true;
+    }
+  })(navigator.userAgent || navigator.vendor || window.opera);
+  return check;
+}
+
+/**
+ * get BidFloor
+ * @param {*} bid
+ * @param {*} mediaType
+ * @param {*} sizes
+ * @returns
+ */
+function getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return utils.deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (_) {
+    return 0;
+  }
+}
+
+/**
+ * get sizes for rtb
+ * @param  {Array|Object} requestSizes
+ * @return {Object}
+ */
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (
+    utils.isArray(requestSizes) &&
+    requestSizes.length === 2 &&
+    !utils.isArray(requestSizes[0])
+  ) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+// Support sizes
+const popInAdSize = [
+  { w: 300, h: 250 },
+  { w: 300, h: 600 },
+  { w: 728, h: 90 },
+  { w: 970, h: 250 },
+  { w: 320, h: 50 },
+  { w: 160, h: 600 },
+  { w: 320, h: 180 },
+  { w: 320, h: 100 },
+  { w: 336, h: 280 },
+];
+
+/**
+ * get aditem setting
+ * @param {Array}  validBidRequests an an array of bids
+ * @param {Object} bidderRequest  The master bidRequest object
+ * @return {Object}
+ */
+function getItems(validBidRequests, bidderRequest) {
+  let items = [];
+  items = validBidRequests.map((req, i) => {
+    let ret = {};
+    // eslint-disable-next-line no-debugger
+    let mediaTypes = getKv(req, 'mediaTypes');
+
+    const bidFloor = getBidFloor(req);
+    let id = '' + (i + 1);
+
+    if (mediaTypes.native) {
+      ret = { ...NATIVERET, ...{ id, bidFloor } }
+    }
+    // banner
+    if (mediaTypes.banner) {
+      let sizes = transformSizes(getKv(req, 'sizes'));
+      let matchSize;
+
+      for (let size of sizes) {
+        matchSize = popInAdSize.find(
+          (item) => size.width === item.w && size.height === item.h
+        );
+        if (matchSize) {
+          break;
+        }
+      }
+      if (!matchSize) {
+        return {};
+      }
+      ret = {
+        id: id,
+        bidfloor: bidFloor,
+        banner: {
+          h: matchSize.h,
+          w: matchSize.w,
+          pos: 1,
+        },
+        ext: {},
+        tagid: globals['tagid'],
+      };
+    }
+    itemMaps[id] = {
+      req,
+      ret,
+    };
+    return ret;
+  });
+  return items;
+}
+
+/**
+ * get rtb qequest params
+ *
+ * @param {Array}  validBidRequests an an array of bids
+ * @param {Object} bidderRequest  The master bidRequest object
+ * @return {Object}
+ */
+function getParam(validBidRequests, bidderRequest) {
+  const pubcid = utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
+  let isMobile = getDevice() ? 1 : 0;
+  // input test status by Publisher. more frequently for test true req
+  let isTest = validBidRequests[0].params.test || 0;
+  let auctionId = getKv(bidderRequest, 'auctionId');
+  let items = getItems(validBidRequests, bidderRequest);
+
+  const timeout = bidderRequest.timeout || 2000;
+
+  const domain = utils.deepAccess(bidderRequest, 'refererInfo.domain') || document.domain;
+  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+  const page = utils.deepAccess(bidderRequest, 'refererInfo.page');
+  const referer = utils.deepAccess(bidderRequest, 'refererInfo.ref');
+
+  if (items && items.length) {
+    let c = {
+      id: 'pp_hbjs_' + auctionId,
+      test: +isTest,
+      at: 1,
+      bcat: globals['bcat'],
+      badv: globals['adv'],
+      cur: ['USD'],
+      device: {
+        connectiontype: 0,
+        js: 1,
+        os: navigator.platform || '',
+        ua: navigator.userAgent,
+        language: /en/.test(navigator.language) ? 'en' : navigator.language,
+      },
+      user: {
+        buyeruid: getUserID(),
+        id: pubcid,
+      },
+      tmax: timeout,
+      site: {
+        name: domain,
+        domain: domain,
+        page: page || location,
+        ref: referer,
+        mobile: isMobile,
+        cat: [], // todo
+        publisher: {
+          id: globals['publisher']
+          // todo
+          // name: xxx
+        },
+      },
+      imp: items,
+    };
+    return c;
+  } else {
+    return null;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: MEDIATYPE,
+  // aliases: ['ex'], // short code
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    if (bid.params.token) {
+      globals['token'] = bid.params.token;
+    }
+    if (bid.params.publisher) {
+      globals['publisher'] = bid.params.publisher;
+    }
+    if (bid.params.tagid) {
+      globals['tagid'] = bid.params.tagid;
+    }
+    if (bid.params.bcat) {
+      globals['bcat'] = Array.isArray(bid.params.bcat) ? bid.params.bcat : [];
+    }
+    if (bid.params.badv) {
+      globals['badv'] = Array.isArray(bid.params.badv) ? bid.params.badv : [];
+    }
+    return !!(bid.params.token && bid.params.publisher && bid.params.tagid);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Array}  validBidRequests an an array of bids
+   * @param {Object} bidderRequest  The master bidRequest object
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let payload = getParam(validBidRequests, bidderRequest);
+
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL + globals['token'],
+      data: payloadString,
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bids = getKv(serverResponse, 'body', 'seatbid', 0, 'bid');
+    const cur = getKv(serverResponse, 'body', 'cur');
+    const bidResponses = [];
+    for (let bid of bids) {
+      let impid = getKv(bid, 'impid');
+      if (itemMaps[impid]) {
+        let bidId = getKv(itemMaps[impid], 'req', 'bidId');
+        const mediaType = getKv(bid, 'w') ? 'banner' : 'native';
+        let bidResponse = {
+          requestId: bidId,
+          cpm: getKv(bid, 'price'),
+          creativeId: getKv(bid, 'cid'),
+          mediaType,
+          currency: cur,
+          netRevenue: true,
+          nurl: getKv(bid, 'nurl'),
+          ttl: TIME_TO_LIVE,
+          meta: {
+            advertiserDomains: getKv(bid, 'adomain') || []
+          }
+        };
+        if (mediaType === 'native') {
+          const adm = getKv(bid, 'adm');
+          const admObj = JSON.parse(adm);
+          var native = {};
+          admObj.assets.forEach((asset) => {
+            if (asset.title) {
+              native.title = asset.title.text;
+            } else if (asset.data) {
+              native.data = asset.data.value;
+            } else if (asset.img) {
+              switch (asset.img.type) {
+                case 1:
+                  native.icon = {
+                    url: asset.img.url,
+                    width: asset.img.w,
+                    height: asset.img.h,
+                  };
+                  break;
+                default:
+                  native.image = {
+                    url: asset.img.url,
+                    width: asset.img.w,
+                    height: asset.img.h,
+                  };
+                  break;
+              }
+            }
+          });
+          if (admObj.link) {
+            if (admObj.link.url) {
+              native.clickUrl = admObj.link.url;
+            }
+          }
+          if (Array.isArray(admObj.eventtrackers)) {
+            native.impressionTrackers = [];
+            admObj.eventtrackers.forEach((tracker) => {
+              if (tracker.event !== 1) {
+                return;
+              }
+              switch (tracker.method) {
+                case 1:
+                  native.impressionTrackers.push(tracker.url);
+                  break;
+                // case 2:
+                //   native.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
+                //   break;
+              }
+            });
+          }
+          if (admObj.purl) {
+            native.purl = admObj.purl;
+          }
+          bidResponse['native'] = native;
+        } else {
+          bidResponse['width'] = getKv(bid, 'w');
+          bidResponse['height'] = getKv(bid, 'h');
+          bidResponse['ad'] = getKv(bid, 'adm');
+        }
+        bidResponses.push(bidResponse);
+      }
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  onTimeout: function (data) {
+    utils.logError('DiscoveryDSP adapter timed out for the auction.');
+    // TODO send request timeout to serve, the interface is not ready
+  },
+
+  /**
+   * Register bidder specific code, which  will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    if (bid['nurl']) {
+      utils.triggerPixel(bid['nurl'])
+    }
+  }
+};
+registerBidder(spec);
diff --git a/modules/discoveryBidAdapter.md b/modules/discoveryBidAdapter.md
new file mode 100644
index 00000000000..e951b0b7448
--- /dev/null
+++ b/modules/discoveryBidAdapter.md
@@ -0,0 +1,61 @@
+# Overview
+
+```
+Module Name: discovery Bid Adapter
+Module Type: Bidder Adapter
+```
+
+# Description
+
+Module that connects to popIn's demand sources.
+
+The discovery Bidding adapter requires setup before beginning. Please contact us at <media-support@popin.cc>
+
+# Test Parameters
+```
+    var adUnits = [
+      // native
+      {
+        code: "test-div-1",
+        mediaTypes: {
+          native: {
+            title: {
+              required: true
+            },
+            image: {
+              required: true
+            }
+          }
+        },
+        bids: [
+          {
+            bidder: "discovery",
+            params: {
+              token: "a1b067897e4ae093d1f94261e0ddc6c9",
+              tagid: 'test_tagid',
+              publisher: 'test_publisher'
+            },
+          },
+        ],
+      },
+      // banner
+      {
+        code: "test-div-2",
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bids: [
+          {
+            bidder: "discovery",
+            params: {
+              token: "d0f4902b616cc5c38cbe0a08676d0ed9",
+              tagid: 'test_tagid',
+              publisher: 'test_publisher'
+            },
+          },
+        ],
+      },
+    ];
+```
diff --git a/modules/displayioBidAdapter.js b/modules/displayioBidAdapter.js
new file mode 100644
index 00000000000..c3c6597dd1b
--- /dev/null
+++ b/modules/displayioBidAdapter.js
@@ -0,0 +1,153 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {Renderer} from '../src/Renderer.js';
+import {getWindowFromDocument, logWarn} from '../src/utils.js';
+
+const ADAPTER_VERSION = '1.1.0';
+const BIDDER_CODE = 'displayio';
+const BID_TTL = 300;
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const DEFAULT_CURRENCY = 'USD';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function(bid) {
+    return !!(bid.params && bid.params.placementId && bid.params.siteId &&
+      bid.params.adsSrvDomain && bid.params.cdnDomain);
+  },
+  buildRequests: function (bidRequests, bidderRequest) {
+    return bidRequests.map(bid => {
+      let url = '//' + bid.params.adsSrvDomain + '/srv?method=getPlacement&app=' +
+        bid.params.siteId + '&placement=' + bid.params.placementId;
+      const data = getPayload(bid, bidderRequest);
+      return {
+        method: 'POST',
+        headers: {'Content-Type': 'application/json;charset=utf-8'},
+        url,
+        data
+      };
+    });
+  },
+  interpretResponse: function (serverResponse, serverRequest) {
+    const ads = serverResponse.body.data.ads;
+    const bidResponses = [];
+    const { data } = serverRequest.data;
+    if (ads.length) {
+      const adData = ads[0].ad.data;
+      const bidResponse = {
+        requestId: data.id,
+        cpm: adData.ecpm,
+        width: adData.w,
+        height: adData.h,
+        netRevenue: true,
+        ttl: BID_TTL,
+        creativeId: adData.adId || 1,
+        currency: adData.cur || DEFAULT_CURRENCY,
+        referrer: data.data.ref,
+        mediaType: ads[0].ad.subtype === 'videoVast' ? VIDEO : BANNER,
+        ad: adData.markup,
+        adUnitCode: data.adUnitCode,
+        renderURL: data.renderURL,
+        adData: adData
+      };
+
+      if (bidResponse.mediaType === VIDEO) {
+        bidResponse.vastUrl = adData.videos[0] && adData.videos[0].url
+      }
+
+      if (bidResponse.renderURL) {
+        bidResponse.renderer = newRenderer(bidResponse);
+      }
+      bidResponses.push(bidResponse);
+    }
+    return bidResponses;
+  }
+};
+
+function getPayload (bid, bidderRequest) {
+  const connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection;
+  const userSession = 'us_web_xxxxxxxxxxxx'.replace(/[x]/g, c => {
+    let r = Math.random() * 16 | 0;
+    let v = c === 'x' ? r : (r & 0x3 | 0x8);
+    return v.toString(16);
+  });
+  const { params, adUnitCode, bidId } = bid;
+  const { siteId, placementId, renderURL, pageCategory, keywords } = params;
+  const { refererInfo, uspConsent, gdprConsent } = bidderRequest;
+  const mediation = {consent: '-1', gdpr: '-1'};
+  if (gdprConsent && 'gdprApplies' in gdprConsent) {
+    if (gdprConsent.consentString !== undefined) {
+      mediation.consent = gdprConsent.consentString;
+    }
+    if (gdprConsent.gdprApplies !== undefined) {
+      mediation.gdpr = gdprConsent.gdprApplies ? '1' : '0';
+    }
+  }
+  return {
+    userSession,
+    data: {
+      id: bidId,
+      action: 'getPlacement',
+      app: siteId,
+      placement: placementId,
+      adUnitCode,
+      renderURL,
+      data: {
+        pagecat: pageCategory ? pageCategory.split(',').map(k => k.trim()) : [],
+        keywords: keywords ? keywords.split(',').map(k => k.trim()) : [],
+        lang_content: document.documentElement.lang,
+        lang: window.navigator.language,
+        domain: refererInfo.domain,
+        page: refererInfo.page,
+        ref: refererInfo.referer,
+        userids: bid.userIdAsEids || {},
+        geo: '',
+      },
+      complianceData: {
+        child: '-1',
+        us_privacy: uspConsent,
+        dnt: window.doNotTrack === '1' || window.navigator.doNotTrack === '1' || false,
+        iabConsent: {},
+        mediation: {
+          consent: mediation.consent,
+          gdpr: mediation.gdpr,
+        }
+      },
+      integration: 'JS',
+      omidpn: 'Displayio',
+      mediationPlatform: 0,
+      prebidVersion: ADAPTER_VERSION,
+      device: {
+        w: window.screen.width,
+        h: window.screen.height,
+        connection_type: connection ? connection.effectiveType : '',
+      }
+    }
+  }
+}
+
+function newRenderer(bid) {
+  const renderer = Renderer.install({
+    id: bid.requestId,
+    url: bid.renderURL,
+    adUnitCode: bid.adUnitCode
+  });
+
+  try {
+    renderer.setRender(webisRender);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
+}
+
+function webisRender(bid, doc) {
+  bid.renderer.push(() => {
+    const win = getWindowFromDocument(doc) || window;
+    win.webis.init(bid.adData, bid.adUnitCode, bid.params);
+  })
+}
+
+registerBidder(spec);
diff --git a/modules/displayioBidAdapter.md b/modules/displayioBidAdapter.md
new file mode 100644
index 00000000000..41505ee966e
--- /dev/null
+++ b/modules/displayioBidAdapter.md
@@ -0,0 +1,148 @@
+# Overview
+
+```
+Module Name: DisplayIO Bidder Adapter
+Module Type: Bidder Adapter
+```
+
+# Description
+
+Module that connects to display.io's demand sources.
+Web mobile (not relevant for web desktop).
+
+
+#Features
+| Feature       |                                                         | Feature               |     |
+|---------------|---------------------------------------------------------|-----------------------|-----|
+| Bidder Code   | displayio                                               | Prebid member         | no  |
+| Media Types   | Banner, video. <br/>Sizes (display 320x480 / vertical video) | GVL ID                | no  | 
+| GDPR Support  | yes                                                     | Prebid.js Adapter     | yes |
+| USP Support   | yes                                                     | Prebid Server Adapter | no  |
+
+
+#Global configuration
+```javascript
+<head>
+  <script src="https://cdn.display.io/webis/webis.min.js"></script>
+</head>
+<script>
+    ......................................  
+    var CMP_TIMEOUT = 8000;
+    var consentManagement = {
+    gdpr: {
+       cmpApi: 'iab',
+       timeout: CMP_TIMEOUT,
+       defaultGdprScope: true
+    },
+    usp: {
+       cmpApi: 'iab',
+       timeout: CMP_TIMEOUT
+     }
+    }
+    
+    if (typeof __tcfapi !== 'function') {
+       delete consentManagement.gdpr;
+    }
+    
+    pbjs.que.push(function() {
+       pbjs.setConfig({consentManagement})
+    });
+    
+    
+    ......................................
+    
+    function initAdserver(bidResponses) {
+      if (pbjs.initAdserverSet) return;
+      pbjs.initAdserverSet = true;
+    
+      ...........................
+    
+      const displayioBids = getDisplayioBid(bidResponses)
+      displayioBids.forEach(b => {
+          const {adData, placement} = b[1].bids[0];
+          webis.init(adData, b[0], {placement})
+      })
+    
+    }
+    
+    function getDisplayioBid(bidResponses) {
+      const codes = adUnits.map(u => u.code);
+      const bids = Object.entries(bidResponses);
+      bids.filter(([key, value]) => codes.includes(key) && value.bids[0].bidderCode === 'displayio');
+      return bids;
+    }
+
+    ......................................
+
+```
+
+
+# Bid Parameters
+
+| Name  | Scope | Type | Description                            | Example                       |
+|----------------| ----- | ---- |----------------------------------------|-------------------------------|
+| `siteId`       | required | Number | SiteId and PlacementID are your inventory IDs on the display.io platform (please ask your Account Manager for your site and placement IDs). | 7753                          |
+| `placementId`  | required | Number | SiteId and PlacementID are your inventory IDs on the display.io platform (please ask your Account Manager for your site and placement IDs).                                       | 5375                          |
+| `adsSrvDomain` | required | String |                                        | "appsrv.display.io"           |
+| `cdnDomain`    | required | String |                                        | "cdn.display.io"              |
+| `pageCategory` | optional | String | Comma-separated list of IAB content categories that describe the current page or view of the site, list of available values. | "pageCategory1, pageCategory2" |
+| `keywords`     | optional | String | Comma-separated list of keywords describing the content. | "keyword1, keyword2, keyword3" |
+| `custom`       | optional | Object | User-defined targeting key-value pairs. custom applies to a specific unit. | `{headerTextColor: "red", fixedHeaderSelector: '.site-header'}` |
+| `custom.headerText`| optional | String | Ad container header text. By default, text is "Scroll to continue with content". Limited to 50 characters. | "Our awesome advertisement"|
+| `custom.headerTextColor`| optional | String | Ad container header text color, "white" by default | "#2196f3"|
+| `custom.headerBackgroundColor`| optional | String | Ad container header background color, "black" by default | "#fff" |
+| `custom.adContainerBackgroundColor`| optional | String | Ad container body background color, "transparent" by default | "#000"|
+| `custom.fixedHeaderSelector`| optional | String | In case your webpage has a fixed header – the header Id attribute or header class attribute should be defined as a value for parameter fixedHeaderSelector. | ".site-header"|
+
+# adUnit configuration example
+```javascript
+var adUnits = [
+  {
+    code: 'ad-tag-1',
+    mediaTypes: {
+      banner: {
+        sizes: [[320, 480]]
+      },
+      video: {
+        sizes: [[360, 640]]
+      },
+    },
+    bids: [
+      {
+        bidder: 'displayio',
+        params: {
+          siteId: 1,
+          placementId: 1,
+          adsSrvDomain: 'appsrv.display.io',
+          cdnDomain: 'cdn.display.io',
+          pageCategory: 'pageCategory1, pageCategory2', //comma separated
+          keywords: 'keyword1, keyword2, keyword3', //comma separated
+          custom: {
+            headerText: 'Our awesome advertisement',
+            headerTextColor: '#2196f3',
+            headerBackgroundColor: 'black',
+            adContainerBackgroundColor: 'transparent',
+            fixedHeaderSelector: '.site-header',
+          },
+        }
+      }
+    ]
+  },
+  // minimal required options
+  {
+    code: 'ad-tag-2',
+    bids: [{
+      bidder: 'displayio',
+      params: {
+        siteId: 1,
+        placementId: 1,
+        adsSrvDomain: 'appsrv.display.io',
+        cdnDomain: 'cdn.display.io',
+      }
+    }]
+  }
+];
+```
+
+# Additional Details
+[Mobile web prebid.js integration](https://www.display.io/documentation/mobile-web-prebid-js-integration/)
diff --git a/modules/districtmDMXBidAdapter.js b/modules/districtmDMXBidAdapter.js
deleted file mode 100644
index 03dca0b607d..00000000000
--- a/modules/districtmDMXBidAdapter.js
+++ /dev/null
@@ -1,313 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
-
-const BIDDER_CODE = 'districtmDMX';
-
-const DMXURI = 'https://dmx.districtm.io/b/v1';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedFormat: ['banner'],
-  isBidRequestValid(bid) {
-    return !!(bid.params.dmxid && bid.params.memberid);
-  },
-  interpretResponse(response, bidRequest) {
-    response = response.body || {};
-    if (response.seatbid) {
-      if (utils.isArray(response.seatbid)) {
-        const {seatbid} = response;
-        let winners = seatbid.reduce((bid, ads) => {
-          let ad = ads.bid.reduce(function(oBid, nBid) {
-            if (oBid.price < nBid.price) {
-              const bid = matchRequest(nBid.impid, bidRequest);
-              const {width, height} = defaultSize(bid);
-              nBid.cpm = parseFloat(nBid.price).toFixed(2);
-              nBid.bidId = nBid.impid;
-              nBid.requestId = nBid.impid;
-              nBid.width = nBid.w || width;
-              nBid.height = nBid.h || height;
-              if (nBid.dealid) {
-                nBid.dealId = nBid.dealid;
-              }
-              nBid.ad = nBid.adm;
-              nBid.netRevenue = true;
-              nBid.creativeId = nBid.crid;
-              nBid.currency = 'USD';
-              nBid.ttl = 60;
-              return nBid;
-            } else {
-              oBid.cpm = oBid.price;
-              return oBid;
-            }
-          }, {price: 0});
-          if (ad.adm) {
-            bid.push(ad)
-          }
-          return bid;
-        }, [])
-        let winnersClean = winners.filter(w => {
-          if (w.bidId) {
-            return true;
-          }
-          return false;
-        });
-        return winnersClean;
-      } else {
-        return [];
-      }
-    } else {
-      return [];
-    }
-  },
-  buildRequests(bidRequest, bidderRequest) {
-    let timeout = config.getConfig('bidderTimeout');
-    let schain = null;
-    let dmxRequest = {
-      id: utils.generateUUID(),
-      cur: ['USD'],
-      tmax: (timeout - 300),
-      test: this.test() || 0,
-      site: {
-        publisher: { id: String(bidRequest[0].params.memberid) || null }
-      }
-    }
-
-    try {
-      let params = config.getConfig('dmx');
-      dmxRequest.user = params.user || {};
-      let site = params.site || {};
-      dmxRequest.site = {...dmxRequest.site, ...site}
-    } catch (e) {
-
-    }
-
-    let eids = [];
-    if (bidRequest && bidRequest.userId) {
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.idl_env`), 'liveramp.com', 1);
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.digitrustid.data.id`), 'digitru.st', 1);
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.id5id`), 'id5-sync.com', 1);
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcid.org', 1);
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.tdid`), 'adserver.org', 1);
-      dmxRequest.user = dmxRequest.user || {};
-      dmxRequest.user.ext = dmxRequest.user.ext || {};
-      dmxRequest.user.ext.eids = eids;
-    }
-    if (!dmxRequest.test) {
-      delete dmxRequest.test;
-    }
-    if (bidderRequest.gdprConsent) {
-      dmxRequest.regs = {};
-      dmxRequest.regs.ext = {};
-      dmxRequest.regs.ext.gdpr = bidderRequest.gdprConsent.gdprApplies === true ? 1 : 0;
-      dmxRequest.user = {};
-      dmxRequest.user.ext = {};
-      dmxRequest.user.ext.consent = bidderRequest.gdprConsent.consentString;
-    }
-    dmxRequest.regs = dmxRequest.regs || {};
-    dmxRequest.regs.coppa = config.getConfig('coppa') === true ? 1 : 0;
-    if (bidderRequest && bidderRequest.uspConsent) {
-      dmxRequest.regs = dmxRequest.regs || {};
-      dmxRequest.regs.ext = dmxRequest.regs.ext || {};
-      dmxRequest.regs.ext.us_privacy = bidderRequest.uspConsent;
-    }
-    try {
-      schain = bidRequest[0].schain;
-      dmxRequest.source = {};
-      dmxRequest.source.ext = {};
-      dmxRequest.source.ext.schain = schain || {}
-    } catch (e) {}
-    let tosendtags = bidRequest.map(dmx => {
-      var obj = {};
-      obj.id = dmx.bidId;
-      obj.tagid = String(dmx.params.dmxid);
-      obj.secure = 1;
-      obj.banner = {
-        topframe: 1,
-        w: cleanSizes(dmx.sizes, 'w'),
-        h: cleanSizes(dmx.sizes, 'h'),
-        format: cleanSizes(dmx.sizes).map(s => {
-          return {w: s[0], h: s[1]};
-        }).filter(obj => typeof obj.w === 'number' && typeof obj.h === 'number')
-      };
-      return obj;
-    });
-
-    if (tosendtags.length <= 5) {
-      dmxRequest.imp = tosendtags;
-      return {
-        method: 'POST',
-        url: DMXURI,
-        data: JSON.stringify(dmxRequest),
-        bidderRequest
-      }
-    } else {
-      return upto5(tosendtags, dmxRequest, bidderRequest, DMXURI);
-    }
-  },
-  test() {
-    return window.location.href.indexOf('dmTest=true') !== -1 ? 1 : 0;
-  },
-  getUserSyncs(optionsType, serverResponses, gdprConsent, uspConsent) {
-    let query = [];
-    let url = 'https://cdn.districtm.io/ids/index.html'
-    if (gdprConsent && gdprConsent.gdprApplies && typeof gdprConsent.consentString === 'string') {
-      query.push(['gdpr', gdprConsent.consentString])
-    }
-    if (uspConsent) {
-      query.push(['ccpa', uspConsent])
-    }
-    if (query.length > 0) {
-      url += '?' + query.map(q => q.join('=')).join('&')
-    }
-    if (optionsType.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: url
-      }];
-    }
-  }
-}
-
-export function cleanSizes(sizes, value) {
-  const supportedSize = [
-    {
-      size: [300, 250],
-      s: 100
-    },
-    {
-      size: [728, 90],
-      s: 95
-    },
-    {
-      size: [320, 50],
-      s: 90
-    },
-    {
-      size: [160, 600],
-      s: 88
-    },
-    {
-      size: [300, 600],
-      s: 85
-    },
-    {
-      size: [300, 50],
-      s: 80
-    },
-    {
-      size: [970, 250],
-      s: 75
-    },
-    {
-      size: [970, 90],
-      s: 60
-    },
-  ];
-  let newArray = shuffle(sizes, supportedSize);
-  switch (value) {
-    case 'w':
-      return newArray[0][0] || 0;
-    case 'h':
-      return newArray[0][1] || 0;
-    case 'size':
-      return newArray;
-    default:
-      return newArray;
-  }
-}
-
-export function shuffle(sizes, list) {
-  let removeSizes = sizes.filter(size => {
-    return list.map(l => `${l.size[0]}x${l.size[1]}`).indexOf(`${size[0]}x${size[1]}`) === -1
-  })
-  let reOrder = sizes.reduce((results, current) => {
-    if (results.length === 0) {
-      results.push(current);
-      return results;
-    }
-    results.push(current);
-    results = list.filter(l => results.map(r => `${r[0]}x${r[1]}`).indexOf(`${l.size[0]}x${l.size[1]}`) !== -1);
-    results = results.sort(function(a, b) {
-      return b.s - a.s;
-    })
-    return results.map(r => r.size);
-  }, [])
-  return removeDuplicate([...reOrder, ...removeSizes]);
-}
-
-export function removeDuplicate(arrayValue) {
-  return arrayValue.filter((elem, index) => {
-    return arrayValue.map(e => `${e[0]}x${e[1]}`).indexOf(`${elem[0]}x${elem[1]}`) === index
-  })
-}
-
-export function upto5(allimps, dmxRequest, bidderRequest, DMXURI) {
-  let start = 0;
-  let step = 5;
-  let req = [];
-  while (allimps.length !== 0) {
-    if (allimps.length >= 5) {
-      req.push(allimps.splice(start, step))
-    } else {
-      req.push(allimps.splice(start, allimps.length))
-    }
-  }
-  return req.map(r => {
-    dmxRequest.imp = r;
-    return {
-      method: 'POST',
-      url: DMXURI,
-      data: JSON.stringify(dmxRequest),
-      bidderRequest
-    }
-  })
-}
-
-/**
- * Function matchRequest(id: string, BidRequest: object)
- * @param id
- * @type string
- * @param bidRequest
- * @type Object
- * @returns Object
- *
- */
-export function matchRequest(id, bidRequest) {
-  const {bids} = bidRequest.bidderRequest;
-  const [returnValue] = bids.filter(bid => bid.bidId === id);
-  return returnValue;
-}
-export function checkDeepArray(Arr) {
-  if (Array.isArray(Arr)) {
-    if (Array.isArray(Arr[0])) {
-      return Arr[0];
-    } else {
-      return Arr;
-    }
-  } else {
-    return Arr;
-  }
-}
-export function defaultSize(thebidObj) {
-  const {sizes} = thebidObj;
-  const returnObject = {};
-  returnObject.width = checkDeepArray(sizes)[0];
-  returnObject.height = checkDeepArray(sizes)[1];
-  return returnObject;
-}
-
-export function bindUserId(eids, value, source, atype) {
-  if (utils.isStr(value) && Array.isArray(eids)) {
-    eids.push({
-      source,
-      uids: [
-        {
-          id: value,
-          atype
-        }
-      ]
-    })
-  }
-}
-registerBidder(spec);
diff --git a/modules/districtmDmxBidAdapter.md b/modules/districtmDmxBidAdapter.md
deleted file mode 100644
index 792cf2e7305..00000000000
--- a/modules/districtmDmxBidAdapter.md
+++ /dev/null
@@ -1,144 +0,0 @@
-```
-Module Name: district m Bid Adapter
-Module Type: Bidder Adapter
-Maintainer: Steve Alliance (steve@districtm.net)
-```
-
-# Overview
-
-The `districtmDmxAdapter` module allows publishers to include DMX Exchange demand using Prebid 1.0+.
-
-## Attributes
-
-* Single Request
-* Multi-Size Support
-* GDPR Compliant
-* CCPA Compliant
-* COPPA Compliant
-* Bids returned in **NET**
-
- ## Media Types
- 
-* Banner
-
-## Bidder Parameters
-
-| Key | Scope | Type | Description
-| --- | --- | --- | ---
-| `dmxid` | Mandatory | Integer | Unique identifier of the placement, dmxid can be obtained in the district m Boost platform.
-| `memberid` | Mandatory | Integer | Unique identifier for your account, memberid can be obtained in the district m Boost platform.
-
-# Ad Unit Configuration Example
-
-```javascript
-    var adUnits = [{
-        code: 'div-gpt-ad-1460505748561-0',
-        mediaTypes: {
-            banner: {
-                sizes: [[300, 250], [300,600]],
-            }
-        },
-        bids: [{
-            bidder: 'districtmDMX',
-            params: {
-                dmxid: 100001,
-                memberid:  100003
-            }
-        }]
-    }];
-```
-
-
-# Ad Unit Configuration when COPPA is needed
-
-
-# Quick Start Guide
-
-###### 1. Including the `districtmDmxAdapter` in your build process.
-
-Add the adapter as an argument to gulp build.
-
-```
-gulp build --modules=districtmDmxAdapter,ixBidAdapter,appnexusBidAdapter
-```
-
-*Adding `"districtmDmxAdapter"` as an entry in a JSON file with your bidders is also acceptable.*
-
-```
-[
-	"districtmDmxAdapter",
-	"ixBidAdapter",
-	"appnexusBidAdapter"
-]
-```
-
-*Proceed to build with the JSON file.*
-
-```
-gulp build --modules=bidderModules.json
-```
-
-###### 2. Configure the ad unit object
-
-Once Prebid is ready you may use the below example to create the adUnits object and begin building the configuration.
-
-```javascript
-var adUnits = [{
-		code: 'div-gpt-ad-1460505748561-0',
-		mediaTypes: {
-			banner: {
-				sizes: [[300, 250], [300, 600], [728, 90]],
-			}
-		},
-		bids: []
-	}
-];
-```
-
-###### 3. Add the bidder
-
-Our demand and adapter supports multiple sizes per placement, as such a single dmxid may be used for all sizes of a single domain.
-
-```javascript
-    var adUnits = [{
-        code: 'div-gpt-ad-1460505748561-0',
-        mediaTypes: {
-            banner: {
-                sizes: [[300, 250], [300, 600], [728, 90]],
-            }
-        },
-        bids: [{
-            bidder: 'districtmDMX',
-            params: {
-                dmxid: 100001,
-                memberid:  100003
-            }
-        }]
-    }];
-```
-
-###### 4. Implementation Checking
-
-Once the bidder is live in your Prebid configuration you may confirm it is making requests to our end point by looking for requests to `https://dmx.districtm.io/b/v1`. 
-
-
-###### 5. Setting first party data 
-
-```code
-pbjs.setConfig({
-    dmx: {
-        user: {
-            'gender': 'M',
-            'yob': 1992,
-            // keywords example
-            'keywords': 'automotive,dodge,engine,car'
-            
-        },
-        site: {
-            cat: ['IAB-12'],
-            pagecat: ['IAB-14'],
-            sectioncat: ['IAB-24']
-        }
-    }
-});
-```
diff --git a/modules/distroscaleBidAdapter.js b/modules/distroscaleBidAdapter.js
new file mode 100644
index 00000000000..005dd3e67d6
--- /dev/null
+++ b/modules/distroscaleBidAdapter.js
@@ -0,0 +1,263 @@
+import { logWarn, isPlainObject, isStr, isArray, isFn, inIframe, mergeDeep, deepSetValue, logError, deepClone } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER } from '../src/mediaTypes.js';
+const BIDDER_CODE = 'distroscale';
+const SHORT_CODE = 'ds';
+const LOG_WARN_PREFIX = 'DistroScale: ';
+const ENDPOINT = 'https://hb.jsrdn.com/hb?from=pbjs';
+const DEFAULT_CURRENCY = 'USD';
+const AUCTION_TYPE = 1;
+const GVLID = 754;
+const UNDEF = undefined;
+
+const SUPPORTED_MEDIATYPES = [ BANNER ];
+
+function _getHost(url) {
+  let a = document.createElement('a');
+  a.href = url;
+  return a.hostname;
+}
+
+function _getBidFloor(bid, mType, sz) {
+  if (isFn(bid.getFloor)) {
+    let floor = bid.getFloor({
+      currency: DEFAULT_CURRENCY,
+      mediaType: mType || '*',
+      size: sz || '*'
+    });
+    if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY) {
+      return floor.floor;
+    }
+  }
+  return null;
+}
+
+function _createImpressionObject(bid) {
+  var impObj = UNDEF;
+  var i;
+  var sizes = {};
+  var sizesCount = 0;
+
+  function addSize(arr) {
+    var w, h;
+    if (arr && arr.length > 1) {
+      w = parseInt(arr[0]);
+      h = parseInt(arr[1]);
+    }
+    sizes[w + 'x' + h] = {
+      w: w,
+      h: h,
+      area: w * h,
+      idx:
+        ({
+          '970x250': 1,
+          '300x250': 2
+        })[w + 'x' + h] || Math.max(w * h, 200)
+    };
+    sizesCount++;
+  }
+
+  // Gather all sizes
+  if (isArray(bid.sizes)) {
+    for (i = 0; i < bid.sizes.length; i++) {
+      addSize(bid.sizes[i]);
+    }
+  }
+  if (bid.params && bid.params.width && bid.params.height) {
+    addSize([bid.params.width, bid.params.height]);
+  }
+  if (bid.mediaTypes && BANNER in bid.mediaTypes && bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
+    for (i = 0; i < bid.mediaTypes[BANNER].sizes.length; i++) {
+      addSize(bid.mediaTypes[BANNER].sizes[i]);
+    }
+  }
+  if (sizesCount == 0) {
+    logWarn(LOG_WARN_PREFIX + 'Error: missing sizes: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+  } else {
+    // Use the first preferred size
+    var keys = Object.keys(sizes);
+    keys.sort(function(a, b) {
+      return sizes[a].idx - sizes[b].idx
+    });
+    var bannerObj = {
+      pos: 0,
+      w: sizes[keys[0]].w,
+      h: sizes[keys[0]].h,
+      topframe: inIframe() ? 0 : 1,
+      format: [{
+        'w': sizes[keys[0]].w,
+        'h': sizes[keys[0]].h
+      }]
+    };
+
+    impObj = {
+      id: bid.bidId,
+      tagid: bid.params.zoneid || '',
+      secure: 1,
+      ext: {
+        pubid: bid.params.pubid || '',
+        zoneid: bid.params.zoneid || ''
+      }
+    };
+
+    var floor = _getBidFloor(bid, BANNER, [sizes[keys[0]].w, sizes[keys[0]].h]);
+    if (floor > 0) {
+      impObj.bidfloor = floor;
+      impObj.bidfloorcur = DEFAULT_CURRENCY;
+    }
+
+    impObj[BANNER] = bannerObj;
+  }
+
+  return impObj;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: SUPPORTED_MEDIATYPES,
+  aliases: [SHORT_CODE],
+
+  isBidRequestValid: bid => {
+    if (bid && bid.params && bid.params.pubid && isStr(bid.params.pubid)) {
+      return true;
+    } else {
+      logWarn(LOG_WARN_PREFIX + 'Error: pubid is mandatory and cannot be numeric');
+    }
+    return false;
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // TODO: does the fallback to window.location make sense?
+    var pageUrl = bidderRequest?.refererInfo?.page || window.location.href;
+
+    var payload = {
+      id: '' + (new Date()).getTime(),
+      at: AUCTION_TYPE,
+      cur: [DEFAULT_CURRENCY],
+      site: {
+        page: pageUrl
+      },
+      device: {
+        ua: navigator.userAgent,
+        js: 1,
+        h: screen.height,
+        w: screen.width,
+        language: (navigator.language && navigator.language.replace(/-.*/, '')) || 'en',
+        dnt: (navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1' || navigator.doNotTrack == 'yes') ? 1 : 0
+      },
+      imp: [],
+      user: {},
+      ext: {}
+    };
+
+    validBidRequests.forEach(b => {
+      var bid = deepClone(b);
+      var impObj = _createImpressionObject(bid);
+      if (impObj) {
+        payload.imp.push(impObj);
+      }
+    });
+
+    if (payload.imp.length == 0) {
+      return;
+    }
+
+    payload.site.domain = _getHost(payload.site.page);
+
+    // add the content object from config in request
+    if (typeof config.getConfig('content') === 'object') {
+      payload.site.content = config.getConfig('content');
+    }
+
+    // merge the device from config.getConfig('device')
+    if (typeof config.getConfig('device') === 'object') {
+      payload.device = Object.assign(payload.device, config.getConfig('device'));
+    }
+
+    // adding schain object
+    if (validBidRequests[0].schain) {
+      deepSetValue(payload, 'source.schain', validBidRequests[0].schain);
+    }
+
+    // Attaching GDPR Consent Params
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      deepSetValue(payload, 'user.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // CCPA
+    if (bidderRequest && bidderRequest.uspConsent) {
+      deepSetValue(payload, 'regs.us_privacy', bidderRequest.uspConsent);
+    }
+
+    // coppa compliance
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(payload, 'regs.coppa', 1);
+    }
+
+    // First Party Data
+    const commonFpd = bidderRequest.ortb2 || {};
+    if (commonFpd.site) {
+      mergeDeep(payload, {site: commonFpd.site});
+    }
+    if (commonFpd.user) {
+      mergeDeep(payload, {user: commonFpd.user});
+    }
+
+    // User IDs
+    if (validBidRequests[0].userIdAsEids && validBidRequests[0].userIdAsEids.length > 0) {
+      // Standard ORTB structure
+      deepSetValue(payload, 'user.eids', validBidRequests[0].userIdAsEids);
+    } else if (validBidRequests[0].userId && Object.keys(validBidRequests[0].userId).length > 0) {
+      // Fallback to non-ortb structure
+      deepSetValue(payload, 'user.ext.userId', validBidRequests[0].userId);
+    }
+
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: payload,
+      bidderRequest: bidderRequest
+    };
+  },
+
+  interpretResponse: (response, request) => {
+    const bidResponses = [];
+    try {
+      if (response.body && response.body.seatbid && isArray(response.body.seatbid)) {
+        // Supporting multiple bid responses for same adSize
+        response.body.seatbid.forEach(seatbidder => {
+          seatbidder.bid &&
+            isArray(seatbidder.bid) &&
+            seatbidder.bid.forEach(bid => {
+              let newBid = {
+                requestId: bid.impid,
+                cpm: (parseFloat(bid.price) || 0),
+                currency: DEFAULT_CURRENCY,
+                width: parseInt(bid.w),
+                height: parseInt(bid.h),
+                creativeId: bid.crid || bid.id,
+                netRevenue: true,
+                ttl: 300,
+                ad: bid.adm,
+                meta: {
+                  advertiserDomains: []
+                }
+              };
+              if (isArray(bid.adomain) && bid.adomain.length > 0) {
+                newBid.meta.advertiserDomains = bid.adomain;
+              }
+              bidResponses.push(newBid);
+            });
+        });
+      }
+    } catch (error) {
+      logError(error);
+    }
+    return bidResponses;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/distroscaleBidAdapter.md b/modules/distroscaleBidAdapter.md
new file mode 100644
index 00000000000..1d7948b2a02
--- /dev/null
+++ b/modules/distroscaleBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name:  DistroScale Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:   prebid@distroscale.com
+```
+
+# Description
+
+Connects to DistroScale exchange for bids.  DistroScale bid adapter supports Banner currently.
+
+# Test Parameters
+```
+var adUnits = [{
+	code: 'banner-1',
+	mediaTypes: {
+		banner: {
+			sizes: [[970, 250]],
+		}
+	},
+	bids: [{
+		bidder: 'distroscale',
+		params: {
+			pubid: '12345'   // required, must be a string
+			,zoneid: '67890' // optional, must be a string
+		}
+	}]
+}];
+```
diff --git a/modules/divreachBidAdapter.md b/modules/divreachBidAdapter.md
deleted file mode 100644
index 643845782b8..00000000000
--- a/modules/divreachBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-Module Name: DivReach Bidder Adapter  
-Module Type: Bidder Adapter  
-Maintainer: Zeke@divreach.com  
-
-# Description
-
-Connects to DivReach demand source to fetch bids.  
-Please use ```divreach``` as the bidder code.  
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'desktop-banner-ad-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "divreach",
-                       params: {
-                           accountID: '167283',
-                           zoneID: '335105',
-                           domain: 'ad.divreach.com',
-                       }
-                   }
-               ]
-           },
-       ];
-```
diff --git a/modules/djaxBidAdapter.js b/modules/djaxBidAdapter.js
deleted file mode 100644
index ffaf61a3f15..00000000000
--- a/modules/djaxBidAdapter.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import * as utils from '../src/utils.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import { ajax } from '../src/ajax.js';
-import {Renderer} from '../src/Renderer.js';
-
-const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
-const BIDDER_CODE = 'djax';
-const DOMAIN = 'https://demo.reviveadservermod.com/headerbidding_adminshare/';
-const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
-
-function isBidRequestValid(bid) {
-  return (typeof bid.params !== 'undefined' && parseInt(utils.getValue(bid.params, 'publisherId')) > 0);
-}
-
-function buildRequests(validBidRequests) {
-  return {
-    method: 'POST',
-    url: DOMAIN + 'www/admin/plugins/Prebid/getAd.php',
-    options: {
-      withCredentials: false,
-      crossOrigin: true
-    },
-    data: validBidRequests,
-  };
-}
-
-function interpretResponse(serverResponse, request) {
-  const response = serverResponse.body;
-  const bidResponses = [];
-  var bidRequestResponses = [];
-
-  utils._each(response, function(bidAd) {
-    bidAd.adResponse = {
-      content: bidAd.vastXml,
-      height: bidAd.height,
-      width: bidAd.width
-    };
-    bidAd.ttl = config.getConfig('_bidderTimeout')
-    bidAd.renderer = bidAd.context === 'outstream' ? createRenderer(bidAd, {
-      id: bidAd.adUnitCode,
-      url: RENDERER_URL
-    }, bidAd.adUnitCode) : undefined;
-    bidResponses.push(bidAd);
-  });
-
-  bidRequestResponses.push({
-    function: 'saveResponses',
-    request: request,
-    response: bidResponses
-  });
-  sendResponseToServer(bidRequestResponses);
-  return bidResponses;
-}
-
-function outstreamRender(bidAd) {
-  bidAd.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      sizes: [bidAd.width, bidAd.height],
-      width: bidAd.width,
-      height: bidAd.height,
-      targetId: bidAd.adUnitCode,
-      adResponse: bidAd.adResponse,
-      rendererOptions: {
-        showVolume: false,
-        allowFullscreen: false
-      }
-    });
-  });
-}
-
-function createRenderer(bidAd, rendererParams, adUnitCode) {
-  const renderer = Renderer.install({
-    id: rendererParams.id,
-    url: rendererParams.url,
-    loaded: false,
-    config: {'player_height': bidAd.height, 'player_width': bidAd.width},
-    adUnitCode
-  });
-  try {
-    renderer.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-  return renderer;
-}
-
-function onBidWon(bid) {
-  let wonBids = [];
-  wonBids.push(bid);
-  wonBids[0].function = 'onBidWon';
-  sendResponseToServer(wonBids);
-}
-
-function onTimeout(details) {
-  details.unshift({ 'function': 'onTimeout' });
-  sendResponseToServer(details);
-}
-
-function sendResponseToServer(data) {
-  ajax(DOMAIN + 'www/admin/plugins/Prebid/tracking/track.php', null, JSON.stringify(data), {
-    withCredentials: false,
-    method: 'POST',
-    crossOrigin: true
-  });
-}
-
-function getUserSyncs(syncOptions) {
-  if (syncOptions.iframeEnabled) {
-    return [{
-      type: 'iframe',
-      url: DOMAIN + 'www/admin/plugins/Prebid/userSync.php'
-    }];
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: SUPPORTED_AD_TYPES,
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs,
-  onBidWon,
-  onTimeout
-};
-
-registerBidder(spec);
diff --git a/modules/djaxBidAdapter.md b/modules/djaxBidAdapter.md
deleted file mode 100644
index d597eb59b58..00000000000
--- a/modules/djaxBidAdapter.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Overview
-
-```
-Module Name:  djax Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer :  support@djaxtech.com
-```
-
-# Description
-
-Connects to Djax Ad Server for bids.
-
-djax bid adapter supports Banner and Video.
-
-# Test Parameters
-```
- var adUnits = [
-   //bannner object
-   {
-          code: 'banner-ad-slot',
-          mediaTypes: {
-            banner: {
-              sizes: [[300, 250], [300,600]],
-            }
-          },
-          bids: [{
-            bidder: 'djax',
-            params: {
-              publisherId: 2
-            }
-          }]
-  
-        },
-      //video object
-      {
-         code: 'video-ad-slot',
-         mediaTypes: {
-              video: {
-                context: 'instream',
-                playerSize: [640, 480],
-              },
-            },
-            bids: [{
-              bidder: "djax",
-              params: {
-                publisherId: 2
-              }
-            }]
-          }];
-```
\ No newline at end of file
diff --git a/modules/dmdIdSystem.js b/modules/dmdIdSystem.js
new file mode 100644
index 00000000000..b42315d66ee
--- /dev/null
+++ b/modules/dmdIdSystem.js
@@ -0,0 +1,91 @@
+/**
+ * This module adds dmdId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/dmdIdSystem
+ * @requires module:modules/userId
+ */
+
+import { logError, getWindowLocation } from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+
+const MODULE_NAME = 'dmdId';
+
+/** @type {Submodule} */
+export const dmdIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function decode
+   * @param {(Object|string)} value
+   * @returns {(Object|undefined)}
+   */
+  decode(value) {
+    return value && typeof value === 'string'
+      ? { 'dmdId': value }
+      : undefined;
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function getId
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData}
+   * @param {Object} cacheIdObj - existing id, if any consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData, cacheIdObj) {
+    const configParams = (config && config.params) || {};
+    if (
+      !configParams ||
+      !configParams.api_key ||
+      typeof configParams.api_key !== 'string'
+    ) {
+      logError('dmd submodule requires an api_key.');
+      return;
+    }
+    // If cahceIdObj is null or undefined - calling AIX-API
+    if (cacheIdObj) {
+      return cacheIdObj;
+    } else {
+      const url = configParams && configParams.api_url
+        ? configParams.api_url
+        : `https://aix.hcn.health/api/v1/auths`;
+      // Setting headers
+      const headers = {};
+      headers['x-api-key'] = configParams.api_key;
+      headers['x-domain'] = getWindowLocation();
+      // Response callbacks
+      const resp = function (callback) {
+        const callbacks = {
+          success: response => {
+            let responseObj;
+            let responseId;
+            try {
+              responseObj = JSON.parse(response);
+              if (responseObj && responseObj.dgid) {
+                responseId = responseObj.dgid;
+              }
+            } catch (error) {
+              logError(error);
+            }
+            callback(responseId);
+          },
+          error: error => {
+            logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+            callback();
+          }
+        };
+        ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true, customHeaders: headers });
+      };
+      return { callback: resp };
+    }
+  }
+};
+
+submodule('userId', dmdIdSubmodule);
diff --git a/modules/dmdIdSystem.md b/modules/dmdIdSystem.md
new file mode 100644
index 00000000000..f2a5b76ade7
--- /dev/null
+++ b/modules/dmdIdSystem.md
@@ -0,0 +1,26 @@
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'dmdId',
+            storage: {
+                name: 'dmd-dgid',
+                type: 'cookie',
+                expires: 30
+            },
+            params: {
+                api_key: '3fdbe297-3690-4f5c-9e11-ee9186a6d77c', // provided by DMD
+            }
+        }]
+    }
+});
+
+#### DMD ID Configuration
+
+{: .table .table-bordered .table-striped }
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of Module | `"dmdId"` |
+| storage | Required | Object |  |
+| storage.name | Required | String | `dmd-dgid` |
+| params | Required | Object | Container of all module params. |  |
+| params.api_key | Required | String | This is your `api_key` as provided by DMD Marketing Corp. | `3fdbe297-3690-4f5c-9e11-ee9186a6d77c` |
\ No newline at end of file
diff --git a/modules/docereeBidAdapter.js b/modules/docereeBidAdapter.js
new file mode 100644
index 00000000000..524f464cee3
--- /dev/null
+++ b/modules/docereeBidAdapter.js
@@ -0,0 +1,75 @@
+import { tryAppendQueryString } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER } from '../src/mediaTypes.js';
+const BIDDER_CODE = 'doceree';
+const END_POINT = 'https://bidder.doceree.com'
+
+export const spec = {
+  code: BIDDER_CODE,
+  url: '',
+  supportedMediaTypes: [ BANNER ],
+
+  isBidRequestValid: (bid) => {
+    const { placementId } = bid.params;
+    return !!placementId
+  },
+  isGdprConsentPresent: (bid) => {
+    const { gdpr, gdprConsent } = bid.params;
+    if (gdpr == '1') {
+      return !!gdprConsent
+    }
+    return true
+  },
+  buildRequests: (validBidRequests) => {
+    const serverRequests = [];
+    const { data } = config.getConfig('doceree.user')
+    // TODO: this should probably look at refererInfo
+    const { page, domain, token } = config.getConfig('doceree.context')
+    const encodedUserInfo = window.btoa(encodeURIComponent(JSON.stringify(data)))
+
+    validBidRequests.forEach(function(validBidRequest) {
+      const { publisherUrl, placementId, gdpr, gdprConsent } = validBidRequest.params;
+      const url = publisherUrl || page
+      let queryString = '';
+      queryString = tryAppendQueryString(queryString, 'id', placementId);
+      queryString = tryAppendQueryString(queryString, 'publisherDomain', domain);
+      queryString = tryAppendQueryString(queryString, 'pubRequestedURL', encodeURIComponent(url));
+      queryString = tryAppendQueryString(queryString, 'loggedInUser', encodedUserInfo);
+      queryString = tryAppendQueryString(queryString, 'currentUrl', url);
+      queryString = tryAppendQueryString(queryString, 'prebidjs', true);
+      queryString = tryAppendQueryString(queryString, 'token', token);
+      queryString = tryAppendQueryString(queryString, 'requestId', validBidRequest.bidId);
+      queryString = tryAppendQueryString(queryString, 'gdpr', gdpr);
+      queryString = tryAppendQueryString(queryString, 'gdpr_consent', gdprConsent);
+
+      serverRequests.push({
+        method: 'GET',
+        url: END_POINT + '/v1/adrequest?' + queryString
+      })
+    })
+    return serverRequests;
+  },
+  interpretResponse: (serverResponse, request) => {
+    const responseJson = serverResponse ? serverResponse.body : {};
+    const placementId = responseJson.DIVID;
+    const bidResponse = {
+      ad: responseJson.sourceHTML,
+      width: Number(responseJson.width),
+      height: Number(responseJson.height),
+      requestId: responseJson.guid,
+      netRevenue: true,
+      ttl: 30,
+      cpm: responseJson.cpmBid,
+      currency: responseJson.currency,
+      mediaType: 'banner',
+      creativeId: placementId,
+      meta: {
+        advertiserDomains: [responseJson.advertiserDomain]
+      }
+    };
+    return [bidResponse];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/docereeBidAdapter.md b/modules/docereeBidAdapter.md
new file mode 100644
index 00000000000..9072fb374b6
--- /dev/null
+++ b/modules/docereeBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Doceree Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: sourbh.gupta@doceree.com
+```
+
+<!-- # Description -->
+Connects to Doceree demand source to fetch bids.  
+Please use ```doceree``` as the bidder code. 
+
+
+# Test Parameters
+```
+var adUnits = [
+   {
+       code: 'doceree',
+       sizes: [
+          [300, 250]
+       ],
+       bids: [
+           {
+               bidder: "doceree",
+               params: {
+                    placementId: 'DOC_7jm9j5eqkl0xvc5w', //required
+                    publisherUrl: document.URL || window.location.href, //optional
+                    gdpr: '1', //optional
+                    gdprConsent:'CPQfU1jPQfU1jG0AAAENAwCAAAAAAAAAAAAAAAAAAAAA.IGLtV_T9fb2vj-_Z99_tkeYwf95y3p-wzhheMs-8NyZeH_B4Wv2MyvBX4JiQKGRgksjLBAQdtHGlcTQgBwIlViTLMYk2MjzNKJrJEilsbO2dYGD9Pn8HT3ZCY70-vv__7v3ff_3g', //optional
+               }
+            }
+       ]
+   }
+];
+```
diff --git a/modules/dspxBidAdapter.js b/modules/dspxBidAdapter.js
index d05549601e1..8850eb282b5 100644
--- a/modules/dspxBidAdapter.js
+++ b/modules/dspxBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { deepAccess } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
@@ -6,11 +6,12 @@ import { BANNER, VIDEO } from '../src/mediaTypes.js';
 const BIDDER_CODE = 'dspx';
 const ENDPOINT_URL = 'https://buyer.dspx.tv/request/';
 const ENDPOINT_URL_DEV = 'https://dcbuyer.dspx.tv/request/';
-const DEFAULT_VAST_FORMAT = 'vast2';
+const GVLID = 602;
 
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['dspx'],
+  gvlid: GVLID,
+  aliases: [],
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bid) {
     return !!(bid.params.placement);
@@ -19,44 +20,35 @@ export const spec = {
     return validBidRequests.map(bidRequest => {
       const params = bidRequest.params;
 
-      const videoData = utils.deepAccess(bidRequest, 'mediaTypes.video') || {};
-      const sizes = utils.parseSizesInput(videoData.playerSize || bidRequest.sizes)[0];
-      const [width, height] = sizes.split('x');
-
       const placementId = params.placement;
       const rnd = Math.floor(Math.random() * 99999999999);
-      const referrer = bidderRequest.refererInfo.referer;
+      const referrer = bidderRequest.refererInfo.page;
       const bidId = bidRequest.bidId;
       const isDev = params.devMode || false;
+      const pbcode = bidRequest.adUnitCode || false; // div id
+      const auctionId = bidRequest.auctionId || false;
 
       let endpoint = isDev ? ENDPOINT_URL_DEV : ENDPOINT_URL;
-      let payload = {};
-
-      if (isVideoRequest(bidRequest)) {
-        let vastFormat = params.vastFormat || DEFAULT_VAST_FORMAT;
-        payload = {
-          _f: vastFormat,
-          alternative: 'prebid_js',
-          inventory_item_id: placementId,
-          srw: width,
-          srh: height,
-          idt: 100,
-          rnd: rnd,
-          ref: referrer,
-          bid_id: bidId,
-        };
-      } else {
-        payload = {
-          _f: 'html',
-          alternative: 'prebid_js',
-          inventory_item_id: placementId,
-          srw: width,
-          srh: height,
-          idt: 100,
-          rnd: rnd,
-          ref: referrer,
-          bid_id: bidId,
-        };
+
+      let mediaTypesInfo = getMediaTypesInfo(bidRequest);
+      let type = isBannerRequest(bidRequest) ? BANNER : VIDEO;
+      let sizes = mediaTypesInfo[type];
+
+      let payload = {
+        _f: 'auto',
+        alternative: 'prebid_js',
+        inventory_item_id: placementId,
+        srw: sizes ? sizes[0].width : 0,
+        srh: sizes ? sizes[0].height : 0,
+        idt: 100,
+        rnd: rnd,
+        ref: referrer,
+        bid_id: bidId,
+        pbver: '$prebid.version$'
+      };
+
+      if (mediaTypesInfo[VIDEO] !== undefined && params.vastFormat !== undefined) {
+        payload.vf = params.vastFormat;
       }
 
       if (params.pfilter !== undefined) {
@@ -78,7 +70,7 @@ export const spec = {
       }
 
       if (params.bcat !== undefined) {
-        payload.bcat = params.bcat;
+        payload.bcat = deepAccess(bidderRequest.ortb2Imp, 'bcat') || params.bcat;
       }
       if (params.dvt !== undefined) {
         payload.dvt = params.dvt;
@@ -86,11 +78,28 @@ export const spec = {
       if (isDev) {
         payload.prebidDevMode = 1;
       }
+
+      if (bidRequest.userId && bidRequest.userId.netId) {
+        payload.did_netid = bidRequest.userId.netId;
+      }
+      if (bidRequest.userId && bidRequest.userId.uid2) {
+        payload.did_uid2 = bidRequest.userId.uid2;
+      }
+
+      if (auctionId) {
+        payload.auctionId = auctionId;
+      }
+      if (pbcode) {
+        payload.pbcode = pbcode;
+      }
+
+      payload.media_types = convertMediaInfoForRequest(mediaTypesInfo);
+
       return {
         method: 'GET',
         url: endpoint,
         data: objectToQueryString(payload),
-      }
+      };
     });
   },
   interpretResponse: function(serverResponse, bidRequest) {
@@ -112,7 +121,10 @@ export const spec = {
         currency: currency,
         netRevenue: netRevenue,
         type: response.type,
-        ttl: config.getConfig('_bidderTimeout')
+        ttl: config.getConfig('_bidderTimeout'),
+        meta: {
+          advertiserDomains: response.adomain || []
+        }
       };
       if (response.vastXml) {
         bidResponse.vastXml = response.vastXml;
@@ -120,12 +132,52 @@ export const spec = {
       } else {
         bidResponse.ad = response.adTag;
       }
+
       bidResponses.push(bidResponse);
     }
     return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    if (!serverResponses || serverResponses.length === 0) {
+      return [];
+    }
+
+    const syncs = []
+
+    let gdprParams = '';
+    if (gdprConsent) {
+      if ('gdprApplies' in gdprConsent && typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    if (serverResponses.length > 0 && serverResponses[0].body.userSync) {
+      if (syncOptions.iframeEnabled) {
+        serverResponses[0].body.userSync.iframeUrl.forEach((url) => syncs.push({
+          type: 'iframe',
+          url: appendToUrl(url, gdprParams)
+        }));
+      }
+      if (syncOptions.pixelEnabled) {
+        serverResponses[0].body.userSync.imageUrl.forEach((url) => syncs.push({
+          type: 'image',
+          url: appendToUrl(url, gdprParams)
+        }));
+      }
+    }
+    return syncs;
   }
 }
 
+function appendToUrl(url, what) {
+  if (!what) {
+    return url;
+  }
+  return url + (url.indexOf('?') !== -1 ? '&' : '?') + what;
+}
+
 function objectToQueryString(obj, prefix) {
   let str = [];
   let p;
@@ -141,6 +193,16 @@ function objectToQueryString(obj, prefix) {
   return str.join('&');
 }
 
+/**
+ * Check if it's a banner bid request
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {boolean} True if it's a banner bid
+ */
+function isBannerRequest(bid) {
+  return bid.mediaType === 'banner' || !!deepAccess(bid, 'mediaTypes.banner') || !isVideoRequest(bid);
+}
+
 /**
  * Check if it's a video bid request
  *
@@ -148,7 +210,90 @@ function objectToQueryString(obj, prefix) {
  * @returns {boolean} True if it's a video bid
  */
 function isVideoRequest(bid) {
-  return bid.mediaType === 'video' || !!utils.deepAccess(bid, 'mediaTypes.video');
+  return bid.mediaType === 'video' || !!deepAccess(bid, 'mediaTypes.video');
+}
+
+/**
+ * Get video sizes
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {object} True if it's a video bid
+ */
+function getVideoSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
+}
+
+/**
+ * Get banner sizes
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {object} True if it's a video bid
+ */
+function getBannerSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
+}
+
+/**
+ * Parse size
+ * @param sizes
+ * @returns {width: number, h: height}
+ */
+function parseSize(size) {
+  let sizeObj = {}
+  sizeObj.width = parseInt(size[0], 10);
+  sizeObj.height = parseInt(size[1], 10);
+  return sizeObj;
+}
+
+/**
+ * Parse sizes
+ * @param sizes
+ * @returns {{width: number , height: number }[]}
+ */
+function parseSizes(sizes) {
+  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
+    return sizes.map(size => parseSize(size));
+  }
+  return [parseSize(sizes)]; // or a single one ? (ie. [728,90])
+}
+
+/**
+ * Get MediaInfo object for server request
+ *
+ * @param mediaTypesInfo
+ * @returns {*}
+ */
+function convertMediaInfoForRequest(mediaTypesInfo) {
+  let requestData = {};
+  Object.keys(mediaTypesInfo).forEach(mediaType => {
+    requestData[mediaType] = mediaTypesInfo[mediaType].map(size => {
+      return size.width + 'x' + size.height;
+    }).join(',');
+  });
+  return requestData;
+}
+
+/**
+ * Get media types info
+ *
+ * @param bid
+ */
+function getMediaTypesInfo(bid) {
+  let mediaTypesInfo = {};
+
+  if (bid.mediaTypes) {
+    Object.keys(bid.mediaTypes).forEach(mediaType => {
+      if (mediaType === BANNER) {
+        mediaTypesInfo[mediaType] = getBannerSizes(bid);
+      }
+      if (mediaType === VIDEO) {
+        mediaTypesInfo[mediaType] = getVideoSizes(bid);
+      }
+    });
+  } else {
+    mediaTypesInfo[BANNER] = getBannerSizes(bid);
+  }
+  return mediaTypesInfo;
 }
 
 registerBidder(spec);
diff --git a/modules/dspxBidAdapter.md b/modules/dspxBidAdapter.md
index 8733aff698c..50e3cd98278 100644
--- a/modules/dspxBidAdapter.md
+++ b/modules/dspxBidAdapter.md
@@ -57,7 +57,8 @@ DSPx adapter for Prebid.
             bids: [{
                 bidder: 'dspx',
                 params: {
-                    placement: '106'
+                    placement: '106',
+                    vastFormat: 'vast2|vast4' // set vast format
                 }
             }]
         }
diff --git a/modules/e_volutionBidAdapter.js b/modules/e_volutionBidAdapter.js
index 9fc7035db32..5f1b46ff9eb 100644
--- a/modules/e_volutionBidAdapter.js
+++ b/modules/e_volutionBidAdapter.js
@@ -1,6 +1,7 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
+import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'e_volution';
 const AD_URL = 'https://service.e-volution.ai/?c=o&m=multi';
@@ -24,6 +25,36 @@ function isBidResponseValid(bid) {
   }
 }
 
+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
+  }
+}
+
+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],
@@ -34,14 +65,18 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
+    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
     try {
-      location = new URL(bidderRequest.refererInfo.referer)
+      location = new URL(bidderRequest.refererInfo.page);
       winTop = window.top;
     } catch (e) {
       location = winTop.location;
-      utils.logMessage(e);
+      logMessage(e);
     };
     let placements = [];
     let request = {
@@ -58,24 +93,56 @@ export const spec = {
         request.ccpa = bidderRequest.uspConsent;
       }
       if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
+        request.gdpr = bidderRequest.gdprConsent;
       }
     }
     const len = validBidRequests.length;
 
     for (let i = 0; i < len; i++) {
       let bid = validBidRequests[i];
-      let traff = bid.params.traffic || BANNER
 
-      placements.push({
+      const placement = {
         placementId: bid.params.placementId,
         bidId: bid.bidId,
-        sizes: bid.mediaTypes && bid.mediaTypes[traff] && bid.mediaTypes[traff].sizes ? bid.mediaTypes[traff].sizes : [],
-        traffic: traff
-      });
+        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) {
+        placement.traffic = BANNER;
+        placement.sizes = bid.mediaTypes[BANNER].sizes;
+      } else if (bid.mediaTypes && bid.mediaTypes[VIDEO] && bid.mediaTypes[VIDEO].playerSize) {
+        placement.traffic = VIDEO;
+        placement.wPlayer = bid.mediaTypes[VIDEO].playerSize[0];
+        placement.hPlayer = bid.mediaTypes[VIDEO].playerSize[1];
+        placement.minduration = bid.mediaTypes[VIDEO].minduration;
+        placement.maxduration = bid.mediaTypes[VIDEO].maxduration;
+        placement.mimes = bid.mediaTypes[VIDEO].mimes;
+        placement.protocols = bid.mediaTypes[VIDEO].protocols;
+        placement.startdelay = bid.mediaTypes[VIDEO].startdelay;
+        placement.placement = bid.mediaTypes[VIDEO].placement;
+        placement.skip = bid.mediaTypes[VIDEO].skip;
+        placement.skipafter = bid.mediaTypes[VIDEO].skipafter;
+        placement.minbitrate = bid.mediaTypes[VIDEO].minbitrate;
+        placement.maxbitrate = bid.mediaTypes[VIDEO].maxbitrate;
+        placement.delivery = bid.mediaTypes[VIDEO].delivery;
+        placement.playbackmethod = bid.mediaTypes[VIDEO].playbackmethod;
+        placement.api = bid.mediaTypes[VIDEO].api;
+        placement.linearity = bid.mediaTypes[VIDEO].linearity;
+      } else if (bid.mediaTypes && bid.mediaTypes[NATIVE]) {
+        placement.traffic = NATIVE;
+        placement.native = bid.mediaTypes[NATIVE];
+      }
+
       if (bid.schain) {
         placements.schain = bid.schain;
       }
+
+      placements.push(placement);
     }
     return {
       method: 'POST',
@@ -89,6 +156,9 @@ export const spec = {
     for (let i = 0; i < serverResponse.body.length; i++) {
       let resItem = serverResponse.body[i];
       if (isBidResponseValid(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
         response.push(resItem);
       }
     }
diff --git a/modules/ebdrBidAdapter.js b/modules/ebdrBidAdapter.js
index c30c10d8a90..a7b1991df9b 100644
--- a/modules/ebdrBidAdapter.js
+++ b/modules/ebdrBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { logInfo, getBidIdParameter } from '../src/utils.js';
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 const BIDDER_CODE = 'ebdr';
@@ -18,11 +18,11 @@ export const spec = {
     let zoneid = '';
     let requestId = '';
     bids.forEach(bid => {
-      utils.logInfo('Log bid', bid);
-      let bidFloor = utils.getBidIdParameter('bidfloor', bid.params);
+      logInfo('Log bid', bid);
+      let bidFloor = getBidIdParameter('bidfloor', bid.params);
       let whArr = getWidthAndHeight(bid);
       let _mediaTypes = (bid.mediaTypes && bid.mediaTypes.video) ? VIDEO : BANNER;
-      zoneid = utils.getBidIdParameter('zoneid', bid.params);
+      zoneid = getBidIdParameter('zoneid', bid.params);
       requestId = bid.bidderRequestId;
       ebdrImps.push({
         id: bid.bidId,
@@ -31,14 +31,14 @@ export const spec = {
           h: whArr[1]
         },
         bidfloor: bidFloor
-      })
+      });
       ebdrReq[bid.bidId] = {mediaTypes: _mediaTypes,
         w: whArr[0],
         h: whArr[1]
       };
-      ebdrParams['latitude'] = utils.getBidIdParameter('latitude', bid.params);
-      ebdrParams['longitude'] = utils.getBidIdParameter('longitude', bid.params);
-      ebdrParams['ifa'] = (utils.getBidIdParameter('IDFA', bid.params).length > utils.getBidIdParameter('ADID', bid.params).length) ? utils.getBidIdParameter('IDFA', bid.params) : utils.getBidIdParameter('ADID', bid.params);
+      ebdrParams['latitude'] = getBidIdParameter('latitude', bid.params);
+      ebdrParams['longitude'] = getBidIdParameter('longitude', bid.params);
+      ebdrParams['ifa'] = (getBidIdParameter('IDFA', bid.params).length > getBidIdParameter('ADID', bid.params).length) ? getBidIdParameter('IDFA', bid.params) : getBidIdParameter('ADID', bid.params);
     });
     let ebdrBidReq = {
       id: requestId,
@@ -62,8 +62,8 @@ export const spec = {
     };
   },
   interpretResponse: function(serverResponse, bidRequest) {
-    utils.logInfo('Log serverResponse', serverResponse);
-    utils.logInfo('Log bidRequest', bidRequest);
+    logInfo('Log serverResponse', serverResponse);
+    logInfo('Log bidRequest', bidRequest);
     let ebdrResponseImps = [];
     const ebdrResponseObj = serverResponse.body;
     if (!ebdrResponseObj || !ebdrResponseObj.seatbid || ebdrResponseObj.seatbid.length === 0 || !ebdrResponseObj.seatbid[0].bid || ebdrResponseObj.seatbid[0].bid.length === 0) {
@@ -98,7 +98,11 @@ export const spec = {
         height: ebdrBid.h,
         currency: 'USD',
         netRevenue: true,
-        ttl: 3600 }
+        ttl: 3600,
+        meta: {
+          advertiserDomains: ebdrBid.adomain || []
+        }
+      };
       if (vastURL) {
         response.vastUrl = vastURL;
       }
diff --git a/modules/edgequeryxBidAdapter.js b/modules/edgequeryxBidAdapter.js
deleted file mode 100644
index ee50946ee18..00000000000
--- a/modules/edgequeryxBidAdapter.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'edgequeryx';
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['eqx'], // short code
-  supportedMediaTypes: [BANNER, VIDEO],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bid) {
-    return !!(bid.params && bid.params.accountId && bid.params.widgetId);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests an array of bids
-   * @param {BidderRequest} bidderRequest bidder request object
-   * @return {ServerRequest[]} Info describing the request to the server.
-   */
-  buildRequests: function (validBidRequests, bidderRequest) {
-    // use bidderRequest.bids[] to get bidder-dependent request info
-    // if your bidder supports multiple currencies, use config.getConfig(currency)
-    // to find which one the ad server needs
-
-    // pull requested transaction ID from bidderRequest.bids[].transactionId
-    return validBidRequests.map(bid => {
-      // Common bid request attributes for banner, outstream and instream.
-      let payload = {
-        accountId: bid.params.accountId,
-        widgetId: bid.params.widgetId,
-        currencyCode: 'EUR',
-        tagId: bid.adUnitCode,
-        transactionId: bid.transactionId,
-        timeout: config.getConfig('bidderTimeout'),
-        bidId: bid.bidId,
-        prebidVersion: '$prebid.version$'
-      };
-
-      const bannerMediaType = utils.deepAccess(bid, 'mediaTypes.banner');
-      payload.sizes = bannerMediaType.sizes.map(size => ({
-        w: size[0],
-        h: size[1]
-      }));
-
-      var payloadString = JSON.stringify(payload);
-
-      return {
-        method: 'POST',
-        url: (bid.params.domain !== undefined ? bid.params.domain : 'https://deep.edgequery.io') + '/prebid/x',
-        data: payloadString,
-      };
-    });
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @param {*} bidRequestString
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function (serverResponse, bidRequestString) {
-    const bidResponses = [];
-    let response = serverResponse.body;
-    try {
-      if (response) {
-        let bidResponse = {
-          requestId: response.requestId,
-          cpm: response.cpm,
-          currency: response.currency,
-          width: response.width,
-          height: response.height,
-          ad: response.ad,
-          ttl: response.ttl,
-          creativeId: response.creativeId,
-          netRevenue: response.netRevenue
-        };
-
-        bidResponses.push(bidResponse);
-      }
-    } catch (error) {
-      utils.logError('Error while parsing Edge Query X response', error);
-    }
-    return bidResponses;
-  }
-
-};
-
-registerBidder(spec);
diff --git a/modules/edgequeryxBidAdapter.md b/modules/edgequeryxBidAdapter.md
deleted file mode 100644
index 265120dfaba..00000000000
--- a/modules/edgequeryxBidAdapter.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Overview
-
-```
-Module Name: Edge Query X Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: contact@edgequery.com
-```
-
-# Description
-
-Connect to Edge Query X for bids.
-
-The Edge Query X adapter requires setup and approval from the Edge Query team.
-Please reach out to your Technical account manager for more information.
-
-# Test Parameters
-
-## Web
-```
-    var adUnits = [
-        {
-            code: 'test-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[1, 1]]
-                }
-            },
-            bids: [
-                {
-                    bidder: "edgequeryx",
-                    params: {
-                        accountId: "test",
-                        widgetId: "test"
-                    }
-                }
-            ]
-        }
-    ];
-```
\ No newline at end of file
diff --git a/modules/emoteevBidAdapter.js b/modules/emoteevBidAdapter.js
deleted file mode 100644
index e0f88725d8a..00000000000
--- a/modules/emoteevBidAdapter.js
+++ /dev/null
@@ -1,525 +0,0 @@
-/**
- * This file contains Emoteev bid adpater.
- *
- * It is organised as follows:
- *   - Constants values;
- *   - Spec API functions, which should be pristine pure;
- *   - Ancillary functions, which should be as pure as possible;
- *   - Adapter API, where unpure side-effects happen.
- *
- * The code style is « functional core, imperative shell ».
- *
- * @link   https://www.emoteev.io
- * @file   This files defines the spec of EmoteevBidAdapter.
- * @author Emoteev Engineering <engineering@emoteev.io>.
- */
-
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
-import {
-  triggerPixel,
-  getUniqueIdentifierStr,
-  contains,
-  deepAccess,
-  isArray,
-  isInteger,
-  getParameterByName,
-  buildUrl
-} from '../src/utils.js';
-import {config} from '../src/config.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-export const storage = getStorageManager();
-
-export const BIDDER_CODE = 'emoteev';
-
-/**
- * Version number of the adapter API.
- */
-export const ADAPTER_VERSION = '1.35.0';
-
-export const DOMAIN = 'prebid.emoteev.xyz';
-export const DOMAIN_STAGING = 'prebid-staging.emoteev.xyz';
-export const DOMAIN_DEVELOPMENT = 'localhost:3000';
-
-/**
- * Path of Emoteev endpoint for events.
- */
-export const EVENTS_PATH = '/api/ad_event.json';
-
-/**
- * Path of Emoteev bidder.
- */
-export const BIDDER_PATH = '/api/prebid/bid';
-export const USER_SYNC_IFRAME_PATH = '/api/prebid/sync-iframe';
-export const USER_SYNC_IMAGE_PATH = '/api/prebid/sync-image';
-
-export const PRODUCTION = 'production';
-export const STAGING = 'staging';
-export const DEVELOPMENT = 'development';
-export const DEFAULT_ENV = PRODUCTION;
-
-export const ON_ADAPTER_CALLED = 'on_adapter_called';
-export const ON_BID_WON = 'on_bid_won';
-export const ON_BIDDER_TIMEOUT = 'on_bidder_timeout';
-
-export const IN_CONTENT = 'content';
-export const FOOTER = 'footer';
-export const OVERLAY = 'overlay';
-export const WALLPAPER = 'wallpaper';
-
-/**
- * Vendor ID assigned to Emoteev from the Global Vendor & CMP List.
- *
- * See https://vendorlist.consensu.org/vendorinfo.json for more information.
- * @type {number}
- */
-export const VENDOR_ID = 15;
-
-/**
- * Pure function. See http://prebid.org/dev-docs/bidder-adaptor.html#valid-build-requests-array for detailed semantic.
- *
- * @param {AdUnit.bidRequest} bidRequest
- * @returns {boolean} Is this bidRequest valid?
- */
-export const isBidRequestValid = (bidRequest) => {
-  return !!(
-    bidRequest &&
-    bidRequest.params &&
-    deepAccess(bidRequest, 'params.adSpaceId') &&
-    validateContext(deepAccess(bidRequest, 'params.context')) &&
-    validateExternalId(deepAccess(bidRequest, 'params.externalId')) &&
-    bidRequest.bidder === BIDDER_CODE &&
-    validateSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes')));
-};
-
-/**
- * Pure function. See http://prebid.org/dev-docs/bidder-adaptor.html#serverrequest-objects for detailed semantic.
- *
- * @param {string} env Emoteev environment parameter
- * @param {boolean} debug Pbjs debug parameter.
- * @param {string} currency See http://prebid.org/dev-docs/modules/currency.html for detailed semantic.
- * @param {Array<BidRequest>} validBidRequests Takes an array of bid requests, which are guaranteed to have passed the isBidRequestValid() test.
- * @param  bidderRequest General context for a bidder request being constructed
- * @returns {ServerRequest}
- */
-export const buildRequests = (env, debug, currency, validBidRequests, bidderRequest) => {
-  return {
-    method: 'POST',
-    url: bidderUrl(env),
-    data: JSON.stringify(requestsPayload(debug, currency, validBidRequests, bidderRequest)) // Keys with undefined values will be filtered out.
-  };
-};
-
-/**
- * Pure function. See http://prebid.org/dev-docs/bidder-adaptor.html#interpreting-the-response for detailed semantic.
- *
- * @param {Array} serverResponse.body The body of the server response is an array of bid objects.
- * @returns {Array}
- */
-export const interpretResponse = (serverResponse) => serverResponse.body;
-
-/**
- * Pure function. See http://prebid.org/dev-docs/bidder-adaptor.html#registering-on-set-targeting for detailed semantic.
- *
- * @param {string} env Emoteev environment parameter.
- * @param {BidRequest} bidRequest
- * @returns {UrlObject}
- */
-export function onAdapterCalled(env, bidRequest) {
-  return {
-    protocol: 'https',
-    hostname: domain(env),
-    pathname: EVENTS_PATH,
-    search: {
-      eventName: ON_ADAPTER_CALLED,
-      pubcId: deepAccess(bidRequest, 'crumbs.pubcid'),
-      bidId: bidRequest.bidId,
-      adSpaceId: deepAccess(bidRequest, 'params.adSpaceId'),
-      cache_buster: getUniqueIdentifierStr()
-    }
-  };
-}
-
-/**
- * Pure function. See http://prebid.org/dev-docs/bidder-adaptor.html#registering-on-bid-won for detailed semantic.
- *
- * @param {string} env Emoteev environment parameter.
- * @param {string} pubcId Publisher common id. See http://prebid.org/dev-docs/modules/pubCommonId.html for detailed semantic.
- * @param bidObject
- * @returns {UrlObject}
- */
-export const onBidWon = (env, pubcId, bidObject) => {
-  const bidId = bidObject.requestId;
-  return {
-    protocol: 'https',
-    hostname: domain(env),
-    pathname: EVENTS_PATH,
-    search: {
-      eventName: ON_BID_WON,
-      pubcId,
-      bidId,
-      cache_buster: getUniqueIdentifierStr()
-    }
-  };
-};
-
-/**
- * Pure function. See http://prebid.org/dev-docs/bidder-adaptor.html#registering-on-timeout for detailed semantic.
- *
- * @param {string} env Emoteev environment parameter.
- * @param {BidRequest} bidRequest
- * @returns {UrlObject}
- */
-export const onTimeout = (env, bidRequest) => {
-  return {
-    protocol: 'https',
-    hostname: domain(env),
-    pathname: EVENTS_PATH,
-    search: {
-      eventName: ON_BIDDER_TIMEOUT,
-      pubcId: deepAccess(bidRequest, 'crumbs.pubcid'),
-      bidId: bidRequest.bidId,
-      adSpaceId: deepAccess(bidRequest, 'params.adSpaceId'),
-      timeout: bidRequest.timeout,
-      cache_buster: getUniqueIdentifierStr()
-    }
-  }
-};
-
-/**
- * Pure function. See http://prebid.org/dev-docs/bidder-adaptor.html#registering-user-syncs for detailed semantic.
- *
- * @param {string} env Emoteev environment parameter
- * @param {SyncOptions} syncOptions
- * @returns userSyncs
- */
-export const getUserSyncs = (env, syncOptions) => {
-  let syncs = [];
-  if (syncOptions.pixelEnabled) {
-    syncs.push({
-      type: 'image',
-      url: userSyncImageUrl(env),
-    });
-  }
-  if (syncOptions.iframeEnabled) {
-    syncs.push({
-      type: 'iframe',
-      url: userSyncIframeUrl(env),
-    });
-  }
-  return syncs;
-};
-
-/**
- * Pure function.
- *
- * @param {string} env Emoteev environment parameter
- * @returns {string} The domain for network calls to Emoteev.
- */
-export const domain = (env) => {
-  switch (env) {
-    case DEVELOPMENT:
-      return DOMAIN_DEVELOPMENT;
-    case STAGING:
-      return DOMAIN_STAGING;
-    default:
-      return DOMAIN;
-  }
-};
-
-/**
- * Pure function.
- *
- * @param {string} env Emoteev environment parameter
- * @returns {string} The full URL which events is sent to.
- */
-export const eventsUrl = env => buildUrl({
-  protocol: (env === DEVELOPMENT) ? 'http' : 'https',
-  hostname: domain(env),
-  pathname: EVENTS_PATH
-});
-
-/**
- * Pure function.
- *
- * @param {string} env Emoteev environment parameter
- * @returns {string} The full URL which bidderRequest is sent to.
- */
-export const bidderUrl = env => buildUrl({
-  protocol: (env === DEVELOPMENT) ? 'http' : 'https',
-  hostname: domain(env),
-  pathname: BIDDER_PATH
-});
-
-/**
- * Pure function.
- *
- * @param {string} env Emoteev environment parameter
- * @returns {string} The full URL called for iframe-based user sync
- */
-export const userSyncIframeUrl = env => buildUrl({
-  protocol: (env === DEVELOPMENT) ? 'http' : 'https',
-  hostname: domain(env),
-  pathname: USER_SYNC_IFRAME_PATH
-});
-
-/**
- * Pure function.
- *
- * @param {string} env Emoteev environment parameter
- * @returns {string} The full URL called for image-based user sync
- */
-export const userSyncImageUrl = env => buildUrl({
-  protocol: (env === DEVELOPMENT) ? 'http' : 'https',
-  hostname: domain(env),
-  pathname: USER_SYNC_IMAGE_PATH
-});
-
-/**
- * Pure function.
- *
- * @param {Array<Array<int>>} sizes
- * @returns {boolean} are sizes valid?
- */
-export const validateSizes = sizes => isArray(sizes) && sizes.length > 0 && sizes.every(size => isArray(size) && size.length === 2);
-
-/**
- * Pure function.
- *
- * @param {string} context
- * @returns {boolean} is param `context` valid?
- */
-export const validateContext = context => contains([IN_CONTENT, FOOTER, OVERLAY, WALLPAPER], context);
-
-/**
- * Pure function.
- *
- * @param {(number|null|undefined)} externalId
- * @returns {boolean} is param `externalId` valid?
- */
-export const validateExternalId = externalId => externalId === undefined || externalId === null || (isInteger(externalId) && externalId > 0);
-
-/**
- * Pure function.
- *
- * @param {BidRequest} bidRequest
- * @returns {object} An object which represents a BidRequest for Emoteev server side.
- */
-export const conformBidRequest = bidRequest => {
-  return {
-    params: bidRequest.params,
-    crumbs: bidRequest.crumbs,
-    sizes: bidRequest.sizes,
-    bidId: bidRequest.bidId,
-    bidderRequestId: bidRequest.bidderRequestId,
-  };
-};
-
-/**
- * Pure function.
- *
- * @param {object} bidderRequest
- * @returns {(boolean|undefined)} raw consent data.
- */
-export const gdprConsent = (bidderRequest) => (deepAccess(bidderRequest, 'gdprConsent.vendorData.vendorConsents') || {})[VENDOR_ID];
-
-/**
- * Pure function.
- *
- * @param {boolean} debug Pbjs debug parameter
- * @param {string} currency See http://prebid.org/dev-docs/modules/currency.html for detailed information
- * @param {BidRequest} validBidRequests
- * @param {object} bidderRequest
- * @returns
- */
-export const requestsPayload = (debug, currency, validBidRequests, bidderRequest) => {
-  return {
-    akPbjsVersion: ADAPTER_VERSION,
-    bidRequests: validBidRequests.map(conformBidRequest),
-    currency: currency,
-    debug: debug,
-    language: navigator.language,
-    refererInfo: bidderRequest.refererInfo,
-    deviceInfo: getDeviceInfo(
-      getDeviceDimensions(window),
-      getViewDimensions(window, document),
-      getDocumentDimensions(document),
-      isWebGLEnabled(document)),
-    userAgent: navigator.userAgent,
-    gdprApplies: deepAccess(bidderRequest, 'gdprConsent.gdprApplies'),
-    gdprConsent: gdprConsent(bidderRequest),
-  };
-};
-
-/**
- * Pure function
- * @param {Window} window
- * @param {Document} document
- * @returns {{width: number, height: number}} View dimensions
- */
-export const getViewDimensions = (window, document) => {
-  let w = window;
-  let prefix = 'inner';
-
-  if (window.innerWidth === undefined || window.innerWidth === null) {
-    w = document.documentElement || document.body;
-    prefix = 'client';
-  }
-
-  return {
-    width: w[`${prefix}Width`],
-    height: w[`${prefix}Height`],
-  };
-};
-
-/**
- * Pure function
- * @param {Window} window
- * @returns {{width: number, height: number}} Device dimensions
- */
-export const getDeviceDimensions = (window) => {
-  return {
-    width: window.screen ? window.screen.width : '',
-    height: window.screen ? window.screen.height : '',
-  };
-};
-
-/**
- * Pure function
- * @param {Document} document
- * @returns {{width: number, height: number}} Document dimensions
- */
-export const getDocumentDimensions = (document) => {
-  const de = document.documentElement;
-  const be = document.body;
-
-  const bodyHeight = be ? Math.max(be.offsetHeight, be.scrollHeight) : 0;
-
-  const w = Math.max(de.clientWidth, de.offsetWidth, de.scrollWidth);
-  const h = Math.max(
-    de.clientHeight,
-    de.offsetHeight,
-    de.scrollHeight,
-    bodyHeight
-  );
-
-  return {
-    width: isNaN(w) ? '' : w,
-    height: isNaN(h) ? '' : h,
-  };
-};
-
-/**
- * Unpure function
- * @param {Document} document
- * @returns {boolean} Is WebGL enabled?
- */
-export const isWebGLEnabled = (document) => {
-  // Create test canvas
-  let canvas = document.createElement('canvas');
-
-  // The gl context
-  let gl = null;
-
-  // Try to get the regular WebGL
-  try {
-    gl = canvas.getContext('webgl');
-  } catch (ex) {
-    canvas = undefined;
-    return false;
-  }
-
-  // No regular WebGL found
-  if (!gl) {
-    // Try experimental WebGL
-    try {
-      gl = canvas.getContext('experimental-webgl');
-    } catch (ex) {
-      canvas = undefined;
-      return false;
-    }
-  }
-
-  return !!gl;
-};
-
-/**
- * Pure function
- * @param {{width: number, height: number}} deviceDimensions
- * @param {{width: number, height: number}} viewDimensions
- * @param {{width: number, height: number}} documentDimensions
- * @param {boolean} webGL
- * @returns {object} Device information
- */
-export const getDeviceInfo = (deviceDimensions, viewDimensions, documentDimensions, webGL) => {
-  return {
-    browserWidth: viewDimensions.width,
-    browserHeight: viewDimensions.height,
-    deviceWidth: deviceDimensions.width,
-    deviceHeight: deviceDimensions.height,
-    documentWidth: documentDimensions.width,
-    documentHeight: documentDimensions.height,
-    webGL: webGL,
-  };
-};
-
-/**
- * Pure function
- * @param {object} config pbjs config value
- * @param {string} parameter Environment override from URL query param.
- * @returns {string} One of [PRODUCTION, STAGING, DEVELOPMENT].
- */
-export const resolveEnv = (config, parameter) => {
-  const configEnv = deepAccess(config, 'emoteev.env');
-
-  if (contains([PRODUCTION, STAGING, DEVELOPMENT], parameter)) return parameter;
-  else if (contains([PRODUCTION, STAGING, DEVELOPMENT], configEnv)) return configEnv;
-  else return DEFAULT_ENV;
-};
-
-/**
- * Pure function
- * @param {object} config pbjs config value
- * @param {string} parameter Debug override from URL query param.
- * @returns {boolean}
- */
-export const resolveDebug = (config, parameter) => {
-  if (parameter && parameter.length && parameter.length > 0) return JSON.parse(parameter);
-  else if (config.debug) return config.debug;
-  else return false;
-};
-
-/**
- * EmoteevBidAdapter spec
- * @access public
- * @type {BidderSpec}
- */
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-  isBidRequestValid: isBidRequestValid,
-  buildRequests: (validBidRequests, bidderRequest) =>
-    buildRequests(
-      resolveEnv(config.getConfig(), getParameterByName('emoteevEnv')),
-      resolveDebug(config.getConfig(), getParameterByName('debug')),
-      config.getConfig('currency'),
-      validBidRequests,
-      bidderRequest),
-  interpretResponse: interpretResponse,
-  onBidWon: (bidObject) =>
-    triggerPixel(buildUrl(onBidWon(
-      resolveEnv(config.getConfig(), getParameterByName('emoteevEnv')),
-      storage.getCookie('_pubcid'),
-      bidObject))),
-  onTimeout: (bidRequest) =>
-    triggerPixel(buildUrl(onTimeout(
-      resolveEnv(config.getConfig(), getParameterByName('emoteevEnv')),
-      bidRequest))),
-  getUserSyncs: (syncOptions) =>
-    getUserSyncs(
-      resolveEnv(config.getConfig(), getParameterByName('emoteevEnv')),
-      syncOptions),
-};
-
-registerBidder(spec);
diff --git a/modules/emoteevBidAdapter.md b/modules/emoteevBidAdapter.md
deleted file mode 100644
index 226a8374369..00000000000
--- a/modules/emoteevBidAdapter.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Overview
-
-```
-Module Name: Emoteev Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: engineering@emoteev.io
-```
-
-# Description
-
-Module that connects to Emoteev's demand sources
-
-# Test Parameters
-
-``` javascript
-    var adUnits = [
-        {
-            code: 'test-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[720, 90]],
-                }
-            },
-            bids: [
-                {
-                    bidder: 'emoteev',
-                    params: {
-                        adSpaceId: 5084,
-                        context: 'footer',
-                        externalId: 42,
-                    }
-                }
-            ]
-        }
-    ];
-```
diff --git a/modules/emx_digitalBidAdapter.js b/modules/emx_digitalBidAdapter.js
index 6688d15d8e9..eb69e76a837 100644
--- a/modules/emx_digitalBidAdapter.js
+++ b/modules/emx_digitalBidAdapter.js
@@ -1,9 +1,19 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { Renderer } from '../src/Renderer.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import find from 'core-js-pure/features/array/find.js';
+import {
+  _each,
+  deepAccess,
+  getBidIdParameter,
+  isArray,
+  isFn,
+  isPlainObject,
+  isStr,
+  logError,
+  logWarn
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {Renderer} from '../src/Renderer.js';
+import {find, includes} from '../src/polyfill.js';
+import {parseDomain} from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'emx_digital';
 const ENDPOINT = 'hb.emxdgt.com';
@@ -11,13 +21,18 @@ const RENDERER_URL = 'https://js.brealtime.com/outstream/1.30.0/bundle.js';
 const ADAPTER_VERSION = '1.5.1';
 const DEFAULT_CUR = 'USD';
 
+const EIDS_SUPPORTED = [
+  { key: 'idl_env', source: 'liveramp.com', rtiPartner: 'idl', queryParam: 'idl' },
+  { key: 'uid2.id', source: 'uidapi.com', rtiPartner: 'UID2', queryParam: 'uid2' }
+];
+
 export const emxAdapter = {
   validateSizes: (sizes) => {
-    if (!utils.isArray(sizes) || typeof sizes[0] === 'undefined') {
-      utils.logWarn(BIDDER_CODE + ': Sizes should be an array');
+    if (!isArray(sizes) || typeof sizes[0] === 'undefined') {
+      logWarn(BIDDER_CODE + ': Sizes should be an array');
       return false;
     }
-    return sizes.every(size => utils.isArray(size) && size.length === 2);
+    return sizes.every(size => isArray(size) && size.length === 2);
   },
   checkVideoContext: (bid) => {
     return ((bid && bid.mediaTypes && bid.mediaTypes.video && bid.mediaTypes.video.context) && ((bid.mediaTypes.video.context === 'instream') || (bid.mediaTypes.video.context === 'outstream')));
@@ -26,7 +41,7 @@ export const emxAdapter = {
     let sizes = [];
     bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes ? sizes = bid.mediaTypes.banner.sizes : sizes = bid.sizes;
     if (!emxAdapter.validateSizes(sizes)) {
-      utils.logWarn(BIDDER_CODE + ': could not detect mediaType banner sizes. Assigning to bid sizes instead');
+      logWarn(BIDDER_CODE + ': could not detect mediaType banner sizes. Assigning to bid sizes instead');
       sizes = bid.sizes
     }
     return {
@@ -73,7 +88,7 @@ export const emxAdapter = {
   cleanProtocols: (video) => {
     if (video.protocols && includes(video.protocols, 7)) {
       // not supporting VAST protocol 7 (VAST 4.0);
-      utils.logWarn(BIDDER_CODE + ': VAST 4.0 is currently not supported. This protocol has been filtered out of the request.');
+      logWarn(BIDDER_CODE + ': VAST 4.0 is currently not supported. This protocol has been filtered out of the request.');
       video.protocols = video.protocols.filter(protocol => protocol !== 7);
     }
     return video;
@@ -101,7 +116,7 @@ export const emxAdapter = {
     try {
       renderer.setRender(emxAdapter.outstreamRender);
     } catch (err) {
-      utils.logWarn('Prebid Error calling setRender on renderer', err);
+      logWarn('Prebid Error calling setRender on renderer', err);
     }
 
     return renderer;
@@ -109,7 +124,7 @@ export const emxAdapter = {
   buildVideo: (bid) => {
     let videoObj = Object.assign(bid.mediaTypes.video, bid.params.video);
 
-    if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
+    if (isArray(bid.mediaTypes.video.playerSize[0])) {
       videoObj['w'] = bid.mediaTypes.video.playerSize[0][0];
       videoObj['h'] = bid.mediaTypes.video.playerSize[0][1];
     } else {
@@ -122,22 +137,15 @@ export const emxAdapter = {
     try {
       return decodeURIComponent(bidResponseAdm.replace(/%(?![0-9][0-9a-fA-F]+)/g, '%25'));
     } catch (err) {
-      utils.logError('emx_digitalBidAdapter', 'error', err);
-    }
-  },
-  getReferrer: () => {
-    try {
-      return window.top.document.referrer;
-    } catch (err) {
-      return document.referrer;
+      logError('emx_digitalBidAdapter', 'error', err);
     }
   },
   getSite: (refInfo) => {
-    let url = utils.parseUrl(refInfo.referer);
+    // TODO: do the fallbacks make sense?
     return {
-      domain: url.hostname,
-      page: refInfo.referer,
-      ref: emxAdapter.getReferrer()
+      domain: refInfo.domain || parseDomain(refInfo.topmostLocation),
+      page: refInfo.page || refInfo.topmostLocation,
+      ref: refInfo.ref || window.document.referrer
     }
   },
   getGdpr: (bidRequests, emxData) => {
@@ -157,25 +165,58 @@ export const emxAdapter = {
     }
 
     return emxData;
+  },
+  getSupplyChain: (bidderRequest, emxData) => {
+    if (bidderRequest.bids[0] && bidderRequest.bids[0].schain) {
+      emxData.source = {
+        ext: {
+          schain: bidderRequest.bids[0].schain
+        }
+      };
+    }
+
+    return emxData;
+  },
+  // supporting eids
+  getEids(bidRequests) {
+    return EIDS_SUPPORTED
+      .map(emxAdapter.getUserId(bidRequests))
+      .filter(x => x);
+  },
+  getUserId(bidRequests) {
+    return ({ key, source, rtiPartner }) => {
+      let id = deepAccess(bidRequests, `userId.${key}`);
+      return id ? emxAdapter.formatEid(id, source, rtiPartner) : null;
+    };
+  },
+  formatEid(id, source, rtiPartner) {
+    return {
+      source,
+      uids: [{
+        id,
+        ext: { rtiPartner }
+      }]
+    };
   }
 };
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 183,
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function (bid) {
     if (!bid || !bid.params) {
-      utils.logWarn(BIDDER_CODE + ': Missing bid or bid params.');
+      logWarn(BIDDER_CODE + ': Missing bid or bid params.');
       return false;
     }
 
     if (bid.bidder !== BIDDER_CODE) {
-      utils.logWarn(BIDDER_CODE + ': Must use "emx_digital" as bidder code.');
+      logWarn(BIDDER_CODE + ': Must use "emx_digital" as bidder code.');
       return false;
     }
 
-    if (!bid.params.tagid || !utils.isStr(bid.params.tagid)) {
-      utils.logWarn(BIDDER_CODE + ': Missing tagid param or tagid present and not type String.');
+    if (!bid.params.tagid || !isStr(bid.params.tagid)) {
+      logWarn(BIDDER_CODE + ': Missing tagid param or tagid present and not type String.');
       return false;
     }
 
@@ -183,17 +224,17 @@ export const spec = {
       let sizes;
       bid.mediaTypes.banner.sizes ? sizes = bid.mediaTypes.banner.sizes : sizes = bid.sizes;
       if (!emxAdapter.validateSizes(sizes)) {
-        utils.logWarn(BIDDER_CODE + ': Missing sizes in bid');
+        logWarn(BIDDER_CODE + ': Missing sizes in bid');
         return false;
       }
     } else if (bid.mediaTypes && bid.mediaTypes.video) {
       if (!emxAdapter.checkVideoContext(bid)) {
-        utils.logWarn(BIDDER_CODE + ': Missing video context: instream or outstream');
+        logWarn(BIDDER_CODE + ': Missing video context: instream or outstream');
         return false;
       }
 
       if (!bid.mediaTypes.video.playerSize) {
-        utils.logWarn(BIDDER_CODE + ': Missing video playerSize');
+        logWarn(BIDDER_CODE + ': Missing video playerSize');
         return false;
       }
     }
@@ -209,9 +250,9 @@ export const spec = {
     const device = emxAdapter.getDevice();
     const site = emxAdapter.getSite(bidderRequest.refererInfo);
 
-    utils._each(validBidRequests, function (bid) {
-      let tagid = utils.getBidIdParameter('tagid', bid.params);
-      let bidfloor = parseFloat(utils.getBidIdParameter('bidfloor', bid.params)) || 0;
+    _each(validBidRequests, function (bid) {
+      let tagid = getBidIdParameter('tagid', bid.params);
+      let bidfloor = parseFloat(getBidFloor(bid)) || 0;
       let isVideo = !!bid.mediaTypes.video;
       let data = {
         id: bid.bidId,
@@ -219,10 +260,18 @@ export const spec = {
         tagid,
         secure
       };
+
+      // adding gpid support
+      let gpid = deepAccess(bid, 'ortb2Imp.ext.data.adserver.adslot');
+      if (!gpid) {
+        gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+      }
+      if (gpid) {
+        data.ext = {gpid: gpid.toString()};
+      }
       let typeSpecifics = isVideo ? { video: emxAdapter.buildVideo(bid) } : { banner: emxAdapter.buildBanner(bid) };
       let bidfloorObj = bidfloor > 0 ? { bidfloor, bidfloorcur: DEFAULT_CUR } : {};
       let emxBid = Object.assign(data, typeSpecifics, bidfloorObj);
-
       emxImps.push(emxBid);
     });
 
@@ -236,9 +285,25 @@ export const spec = {
     };
 
     emxData = emxAdapter.getGdpr(bidderRequest, Object.assign({}, emxData));
+    emxData = emxAdapter.getSupplyChain(bidderRequest, Object.assign({}, emxData));
     if (bidderRequest && bidderRequest.uspConsent) {
-      emxData.us_privacy = bidderRequest.uspConsent
+      emxData.us_privacy = bidderRequest.uspConsent;
     }
+
+    // adding eid support
+    if (bidderRequest.userId) {
+      let eids = emxAdapter.getEids(bidderRequest);
+      if (eids.length > 0) {
+        if (emxData.user && emxData.user.ext) {
+          emxData.user.ext.eids = eids;
+        } else {
+          emxData.user = {
+            ext: {eids}
+          };
+        }
+      }
+    }
+
     return {
       method: 'POST',
       url,
@@ -274,20 +339,55 @@ export const spec = {
           bidResponse = emxAdapter.formatVideoResponse(bidResponse, Object.assign({}, emxBid), bidRequest);
         }
         bidResponse.mediaType = (isVideo ? VIDEO : BANNER);
+
+        // support for adomain in prebid 5.0
+        if (emxBid.adomain && emxBid.adomain.length) {
+          bidResponse.meta = {
+            advertiserDomains: emxBid.adomain
+          };
+        }
+
         emxBidResponses.push(bidResponse);
       });
     }
     return emxBidResponses;
   },
-  getUserSyncs: function (syncOptions) {
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
     const syncs = [];
     if (syncOptions.iframeEnabled) {
+      let url = 'https://biddr.brealtime.com/check.html';
+      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+        // add 'gdpr' only if 'gdprApplies' is defined
+        if (typeof gdprConsent.gdprApplies === 'boolean') {
+          url += `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+        } else {
+          url += `?gdpr_consent=${gdprConsent.consentString}`;
+        }
+      }
       syncs.push({
         type: 'iframe',
-        url: 'https://biddr.brealtime.com/check.html'
+        url: url
       });
     }
     return syncs;
   }
 };
+
+// support floors module in prebid 5.0
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return parseFloat(getBidIdParameter('bidfloor', bid.params));
+  }
+
+  let floor = bid.getFloor({
+    currency: DEFAULT_CUR,
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 registerBidder(spec);
diff --git a/modules/engageyaBidAdapter.js b/modules/engageyaBidAdapter.js
new file mode 100644
index 00000000000..a66e825e5df
--- /dev/null
+++ b/modules/engageyaBidAdapter.js
@@ -0,0 +1,186 @@
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { createTrackPixelHtml } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'engageya';
+const ENDPOINT_URL = 'https://recs.engageya.com/rec-api/getrecs.json';
+const ENDPOINT_METHOD = 'GET';
+const MAX_DEVIATION = 0.05;
+const SUPPORTED_SIZES = [
+  [100, 75], [236, 202], [100, 100], [130, 130], [200, 200], [250, 250], [300, 272], [300, 250], [300, 230], [300, 214], [300, 187], [300, 166], [300, 150], [300, 133], [300, 120], [400, 200], [300, 200], [250, 377], [620, 410], [207, 311], [310, 166], [310, 333], [190, 106], [228, 132], [300, 174], [80, 60], [600, 500], [600, 600], [1080, 610], [1080, 610], [624, 350], [650, 1168], [1080, 1920], [300, 374], [336, 280]
+];
+
+function getPageUrl(bidRequest, bidderRequest) {
+  if (bidRequest.params.pageUrl && bidRequest.params.pageUrl != '[PAGE_URL]') {
+    return bidRequest.params.pageUrl;
+  }
+  if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
+    return bidderRequest.refererInfo.page;
+  }
+  // TODO: does this fallback make sense?
+  const pageUrl = (isInIframe() && document.referrer)
+    ? document.referrer
+    : window.location.href;
+  return encodeURIComponent(pageUrl);
+}
+
+function isInIframe() {
+  try {
+    var isInIframe = (window.self !== window.top);
+  } catch (e) {
+    isInIframe = true;
+  }
+  return isInIframe;
+}
+
+function getImageSrc(rec) {
+  return rec.thumbnail_path.indexOf('http') === -1 ? 'https:' + rec.thumbnail_path : rec.thumbnail_path;
+}
+
+function getImpressionTrackers(rec, response) {
+  const responseTrackers = [response.viewPxl];
+  if (!rec.trackers) {
+    return responseTrackers;
+  }
+  const impressionTrackers = rec.trackers.impressionPixels || [];
+  const viewTrackers = rec.trackers.viewPixels || [];
+  return [...impressionTrackers, ...viewTrackers, ...responseTrackers];
+}
+
+function parseNativeResponse(rec, response) {
+  return {
+    title: rec.title,
+    body: '',
+    image: {
+      url: getImageSrc(rec),
+      width: response.imageWidth,
+      height: response.imageHeight
+    },
+    privacyLink: '',
+    clickUrl: rec.clickUrl,
+    displayUrl: rec.url,
+    cta: '',
+    sponsoredBy: rec.displayName,
+    impressionTrackers: getImpressionTrackers(rec, response),
+  };
+}
+
+function parseBannerResponse(rec, response) {
+  if (rec.tag) {
+    return rec.tag;
+  }
+  let style;
+  try {
+    let additionalData = JSON.parse(response.widget.additionalData);
+    const css = additionalData.css || '';
+    style = css ? `<style>${css}</style>` : '';
+  } catch (e) {
+    style = '';
+  }
+  const title = rec.title && rec.title.trim() ? `<div class="eng_tag_ttl" style="display: none">${rec.title}</div>` : '';
+  const displayName = rec.displayName && title ? `<div class="eng_tag_brnd" style="display: none">${rec.displayName}</div>` : '';
+  const trackers = getImpressionTrackers(rec, response)
+    .map(createTrackPixelHtml)
+    .join('');
+  return `<html><body>${style}<div id="ENG_TAG"><a href="${rec.clickUrl}" target=_blank><img class="eng_tag_img" src="${getImageSrc(rec)}" style="width:${response.imageWidth}px;height:${response.imageHeight}px;" alt="${rec.title}"/>${displayName}${title}</a>${trackers}</div></body></html>`;
+}
+
+function getImageSize(bidRequest) {
+  if (bidRequest.sizes && bidRequest.sizes.length > 0) {
+    return bidRequest.sizes[0];
+  } else if (bidRequest.nativeParams && bidRequest.nativeParams.image && bidRequest.nativeParams.image.sizes) {
+    return bidRequest.nativeParams.image.sizes;
+  }
+  return [-1, -1];
+}
+
+function isValidSize([width, height]) {
+  if (!width || !height) {
+    return false;
+  }
+  return SUPPORTED_SIZES.some(([supportedWidth, supportedHeight]) => {
+    if (supportedWidth === width && supportedHeight === height) {
+      return true;
+    }
+    const supportedRatio = supportedWidth / supportedHeight;
+    const ratioDeviation = supportedRatio / width * height;
+    if (Math.abs(ratioDeviation - 1) > MAX_DEVIATION) {
+      return false;
+    }
+    return supportedWidth > width ||
+      (width - supportedWidth) / width <= MAX_DEVIATION;
+  });
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
+
+  isBidRequestValid: function (bidRequest) {
+    return bidRequest &&
+      bidRequest.params &&
+      bidRequest.params.hasOwnProperty('widgetId') &&
+      bidRequest.params.hasOwnProperty('websiteId') &&
+      !isNaN(bidRequest.params.widgetId) &&
+      !isNaN(bidRequest.params.websiteId) &&
+      isValidSize(getImageSize(bidRequest));
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    if (!validBidRequests) {
+      return [];
+    }
+    return validBidRequests.map(bidRequest => {
+      if (bidRequest.params) {
+        const mediaType = bidRequest.hasOwnProperty('nativeParams') ? 1 : 2;
+        const [imageWidth, imageHeight] = getImageSize(bidRequest);
+        const widgetId = bidRequest.params.widgetId;
+        const websiteId = bidRequest.params.websiteId;
+        const pageUrl = getPageUrl(bidRequest, bidderRequest);
+        const bidId = bidRequest.bidId;
+        let finalUrl = ENDPOINT_URL + '?pubid=0&webid=' + websiteId + '&wid=' + widgetId + '&url=' + pageUrl + '&ireqid=' + bidId + '&pbtpid=' + mediaType + '&imw=' + imageWidth + '&imh=' + imageHeight;
+        if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprApplies && bidderRequest.consentString) {
+          finalUrl += '&is_gdpr=1&gdpr_consent=' + bidderRequest.consentString;
+        }
+        return {
+          url: finalUrl,
+          method: ENDPOINT_METHOD,
+          data: ''
+        };
+      }
+    }).filter(Boolean);
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (!serverResponse.body || !serverResponse.body.recs || !serverResponse.body.recs.length) {
+      return [];
+    }
+    var response = serverResponse.body;
+    var isNative = response.pbtypeId == 1;
+    return response.recs.map(rec => {
+      let bid = {
+        requestId: response.ireqId,
+        width: response.imageWidth,
+        height: response.imageHeight,
+        creativeId: rec.postId,
+        cpm: rec.pecpm || (rec.ecpm / 100),
+        currency: 'USD',
+        netRevenue: !!rec.pecpm,
+        ttl: 360,
+        meta: { advertiserDomains: rec.domain ? [rec.domain] : [] },
+      }
+      if (isNative) {
+        bid.native = parseNativeResponse(rec, response);
+      } else {
+        bid.ad = parseBannerResponse(rec, response);
+      }
+      return bid;
+    });
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/engageyaBidAdapter.md b/modules/engageyaBidAdapter.md
new file mode 100644
index 00000000000..67205350f71
--- /dev/null
+++ b/modules/engageyaBidAdapter.md
@@ -0,0 +1,68 @@
+# Overview
+
+```
+Module Name: Engageya's Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@engageya.com
+```
+
+# Description
+
+Module that connects to Engageya's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "engageya",
+                    params: {
+						widgetId: '<put here widget id>',
+						websiteId: '<put here website id>',
+						pageUrl:'[PAGE_URL]'
+					}
+                }
+            ]
+        },{
+            code: 'test-div',
+            mediaTypes: {
+                native: {
+					image: {
+						required: true,
+						sizes: [236, 202]
+					},
+					title: {
+						required: true,
+						len: 80
+					},
+					sponsoredBy: {
+						required: true
+					},
+					clickUrl: {
+						required: true
+					},
+					body: {
+						required: true
+					}
+				}
+            },
+            bids: [
+                {
+                    bidder: "engageya",
+                    params: {
+                        widgetId: '<put here widget id>',
+						websiteId: '<put here website id>',
+						pageUrl:'[PAGE_URL]'
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/enrichmentFpdModule.js b/modules/enrichmentFpdModule.js
new file mode 100644
index 00000000000..59d5d326109
--- /dev/null
+++ b/modules/enrichmentFpdModule.js
@@ -0,0 +1,2 @@
+// Logic from this module was moved into core since approx. 7.27
+// TODO: remove this in v8
diff --git a/modules/envivoBidAdapter.js b/modules/envivoBidAdapter.js
deleted file mode 100644
index b9c80ffd468..00000000000
--- a/modules/envivoBidAdapter.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import * as utils from '../src/utils.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import { ajax } from '../src/ajax.js';
-import {Renderer} from '../src/Renderer.js';
-
-const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
-const BIDDER_CODE = 'envivo';
-const DOMAIN = 'https://ad.nvivo.tv/';
-const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
-
-function isBidRequestValid(bid) {
-  return (typeof bid.params !== 'undefined' && parseInt(utils.getValue(bid.params, 'publisherId')) > 0);
-}
-
-function buildRequests(validBidRequests) {
-  return {
-    method: 'POST',
-    url: DOMAIN + 'ads/www/admin/plugins/Prebid/getAd.php',
-    options: {
-      withCredentials: false,
-      crossOrigin: true
-    },
-    data: validBidRequests,
-  };
-}
-
-function interpretResponse(serverResponse, request) {
-  const response = serverResponse.body;
-  const bidResponses = [];
-  var bidRequestResponses = [];
-
-  utils._each(response, function(bidAd) {
-    bidAd.adResponse = {
-      content: bidAd.vastXml,
-      height: bidAd.height,
-      width: bidAd.width
-    };
-    bidAd.ttl = config.getConfig('_bidderTimeout')
-    bidAd.renderer = bidAd.context === 'outstream' ? createRenderer(bidAd, {
-      id: bidAd.adUnitCode,
-      url: RENDERER_URL
-    }, bidAd.adUnitCode) : undefined;
-    bidResponses.push(bidAd);
-  });
-
-  bidRequestResponses.push({
-    function: 'saveResponses',
-    request: request,
-    response: bidResponses
-  });
-  sendResponseToServer(bidRequestResponses);
-  return bidResponses;
-}
-
-function outstreamRender(bidAd) {
-  bidAd.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      sizes: [bidAd.width, bidAd.height],
-      width: bidAd.width,
-      height: bidAd.height,
-      targetId: bidAd.adUnitCode,
-      adResponse: bidAd.adResponse,
-      rendererOptions: {
-        showVolume: false,
-        allowFullscreen: false
-      }
-    });
-  });
-}
-
-function createRenderer(bidAd, rendererParams, adUnitCode) {
-  const renderer = Renderer.install({
-    id: rendererParams.id,
-    url: rendererParams.url,
-    loaded: false,
-    config: {'player_height': bidAd.height, 'player_width': bidAd.width},
-    adUnitCode
-  });
-  try {
-    renderer.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-  return renderer;
-}
-
-function onBidWon(bid) {
-  let wonBids = [];
-  wonBids.push(bid);
-  wonBids[0].function = 'onBidWon';
-  sendResponseToServer(wonBids);
-}
-
-function onTimeout(details) {
-  details.unshift({ 'function': 'onTimeout' });
-  sendResponseToServer(details);
-}
-
-function sendResponseToServer(data) {
-  ajax(DOMAIN + 'ads/www/admin/plugins/Prebid/tracking/track.php', null, JSON.stringify(data), {
-    withCredentials: false,
-    method: 'POST',
-    crossOrigin: true
-  });
-}
-
-function getUserSyncs(syncOptions) {
-  if (syncOptions.iframeEnabled) {
-    return [{
-      type: 'iframe',
-      url: DOMAIN + 'ads/www/admin/plugins/Prebid/userSync.php'
-    }];
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: SUPPORTED_AD_TYPES,
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs,
-  onBidWon,
-  onTimeout
-};
-
-registerBidder(spec);
diff --git a/modules/envivoBidAdapter.md b/modules/envivoBidAdapter.md
deleted file mode 100644
index 3ecc8a251f3..00000000000
--- a/modules/envivoBidAdapter.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Overview
-
-```
-Module Name:  envivo Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer :  adtech@nvivo.tv
-```
-
-# Description
-
-Connects to Envivo Ad Server for bids.
-
-envivo bid adapter supports Banner and Video.
-
-# Test Parameters
-```
- var adUnits = [
-   //bannner object
-   {
-          code: 'banner-ad-slot',
-          mediaTypes: {
-            banner: {
-              sizes: [[300, 250]],
-            }
-          },
-          bids: [{
-            bidder: 'envivo',
-            params: {
-              publisherId: 14
-            }
-          }]
-  
-        },
-      //video object
-      {
-         code: 'video-ad-slot',
-         mediaTypes: {
-              video: {
-                context: 'instream',
-                playerSize: [640, 480],
-              },
-            },
-            bids: [{
-              bidder: "envivo",
-              params: {
-                publisherId: 14
-              }
-            }]
-          }];
-```
diff --git a/modules/eplanningAnalyticsAdapter.js b/modules/eplanningAnalyticsAdapter.js
index 08db2f2ca9d..9eb701b8ecc 100644
--- a/modules/eplanningAnalyticsAdapter.js
+++ b/modules/eplanningAnalyticsAdapter.js
@@ -1,9 +1,8 @@
+import { logError } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import * as utils from '../src/utils.js';
-
-const CONSTANTS = require('../src/constants.json');
+import CONSTANTS from '../src/constants.json';
 
 const analyticsType = 'endpoint';
 const EPL_HOST = 'https://ads.us.e-planning.net/hba/1/';
@@ -110,7 +109,7 @@ eplAnalyticsAdapter.originEnableAnalytics = eplAnalyticsAdapter.enableAnalytics;
 
 eplAnalyticsAdapter.enableAnalytics = function (config) {
   if (!config.options.ci) {
-    utils.logError('Client ID (ci) option is not defined. Analytics won\'t work');
+    logError('Client ID (ci) option is not defined. Analytics won\'t work');
     return;
   }
 
diff --git a/modules/eplanningBidAdapter.js b/modules/eplanningBidAdapter.js
index ac5ba659ad7..e230858487f 100644
--- a/modules/eplanningBidAdapter.js
+++ b/modules/eplanningBidAdapter.js
@@ -1,24 +1,33 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-export const storage = getStorageManager();
+import {getWindowSelf, isEmpty, parseSizesInput, isGptPubadsDefined, isSlotMatchingAdUnitCode} from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'eplanning';
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 const rnd = Math.random();
-const DEFAULT_SV = 'ads.us.e-planning.net';
+const DEFAULT_SV = 'pbjs.e-planning.net';
 const DEFAULT_ISV = 'i.e-planning.net';
-const PARAMS = ['ci', 'sv', 't', 'ml'];
-const DOLLARS = 'USD';
+const PARAMS = ['ci', 'sv', 't', 'ml', 'sn'];
+const DOLLAR_CODE = 'USD';
 const NET_REVENUE = true;
 const TTL = 120;
 const NULL_SIZE = '1x1';
 const FILE = 'file';
 const STORAGE_RENDER_PREFIX = 'pbsr_';
 const STORAGE_VIEW_PREFIX = 'pbvi_';
+const mobileUserAgent = isMobileUserAgent();
+const PRIORITY_ORDER_FOR_MOBILE_SIZES_ASC = ['1x1', '300x50', '320x50', '300x250'];
+const PRIORITY_ORDER_FOR_DESKTOP_SIZES_ASC = ['1x1', '970x90', '970x250', '160x600', '300x600', '728x90', '300x250'];
+const VAST_INSTREAM = 1;
+const VAST_OUTSTREAM = 2;
+const VAST_VERSION_DEFAULT = 3;
+const DEFAULT_SIZE_VAST = '640x480';
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: function(bid) {
     return Boolean(bid.params.ci) || Boolean(bid.params.t);
@@ -33,18 +42,16 @@ export const spec = {
     const urlConfig = getUrlConfig(bidRequests);
     const pcrs = getCharset();
     const spaces = getSpaces(bidRequests, urlConfig.ml);
-    const pageUrl = bidderRequest.refererInfo.referer;
-    const getDomain = (url) => {
-      let anchor = document.createElement('a');
-      anchor.href = url;
-      return anchor.hostname;
-    }
+    // TODO: do the fallbacks make sense here?
+    const pageUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+    const domain = bidderRequest.refererInfo.domain || window.location.host;
     if (urlConfig.t) {
       url = 'https://' + urlConfig.isv + '/layers/t_pbjs_2.json';
       params = {};
     } else {
-      url = 'https://' + (urlConfig.sv || DEFAULT_SV) + '/hb/1/' + urlConfig.ci + '/' + dfpClientId + '/' + getDomain(pageUrl) + '/' + sec;
-      const referrerUrl = bidderRequest.refererInfo.referer.reachedTop ? window.top.document.referrer : bidderRequest.refererInfo.referer;
+      url = 'https://' + (urlConfig.sv || DEFAULT_SV) + '/pbjs/1/' + urlConfig.ci + '/' + dfpClientId + '/' + domain + '/' + sec;
+      // TODO: does the fallback make sense here?
+      const referrerUrl = bidderRequest.refererInfo.ref || bidderRequest.refererInfo.topmostLocation;
 
       if (storage.hasLocalStorage()) {
         registerViewabilityAllBids(bidRequests);
@@ -54,7 +61,6 @@ export const spec = {
         rnd: rnd,
         e: spaces.str,
         ur: pageUrl || FILE,
-        r: 'pbjs',
         pbv: '$prebid.version$',
         ncb: '1',
         vs: spaces.vs
@@ -79,6 +85,17 @@ export const spec = {
       if (bidderRequest && bidderRequest.uspConsent) {
         params.ccpa = bidderRequest.uspConsent;
       }
+
+      if ((getGlobal()).getUserIds && typeof (getGlobal()).getUserIds === 'function') {
+        const userIds = (getGlobal()).getUserIds();
+        for (var id in userIds) {
+          params['e_' + id] = (typeof userIds[id] === 'object') ? encodeURIComponent(JSON.stringify(userIds[id])) : encodeURIComponent(userIds[id]);
+        }
+      }
+      if (spaces.impType) {
+        params.vctx = spaces.impType & VAST_INSTREAM ? VAST_INSTREAM : VAST_OUTSTREAM;
+        params.vv = VAST_VERSION_DEFAULT;
+      }
     }
 
     return {
@@ -92,21 +109,32 @@ export const spec = {
     const response = serverResponse.body;
     let bidResponses = [];
 
-    if (response && !utils.isEmpty(response.sp)) {
+    if (response && !isEmpty(response.sp)) {
       response.sp.forEach(space => {
-        if (!utils.isEmpty(space.a)) {
+        if (!isEmpty(space.a)) {
           space.a.forEach(ad => {
             const bidResponse = {
               requestId: request.adUnitToBidId[space.k],
               cpm: ad.pr,
               width: ad.w,
               height: ad.h,
-              ad: ad.adm,
               ttl: TTL,
               creativeId: ad.crid,
               netRevenue: NET_REVENUE,
-              currency: DOLLARS,
+              currency: DOLLAR_CODE,
             };
+            if (ad.adom) {
+              bidResponse.meta = {
+                advertiserDomains: ad.adom
+              };
+            }
+            if (request && request.data && request.data.vv) {
+              bidResponse.vastXml = ad.adm;
+              bidResponse.mediaType = VIDEO;
+            } else {
+              bidResponse.ad = ad.adm;
+            }
+
             bidResponses.push(bidResponse);
           });
         }
@@ -117,9 +145,9 @@ export const spec = {
   },
   getUserSyncs: function(syncOptions, serverResponses) {
     const syncs = [];
-    const response = !utils.isEmpty(serverResponses) && serverResponses[0].body;
+    const response = !isEmpty(serverResponses) && serverResponses[0].body;
 
-    if (response && !utils.isEmpty(response.cs)) {
+    if (response && !isEmpty(response.cs)) {
       const responseSyncs = response.cs;
       responseSyncs.forEach(sync => {
         if (typeof sync === 'string' && syncOptions.pixelEnabled) {
@@ -138,8 +166,20 @@ export const spec = {
 
     return syncs;
   },
-}
+};
 
+function getUserAgent() {
+  return window.navigator.userAgent;
+}
+function getInnerWidth() {
+  return getWindowSelf().innerWidth;
+}
+function isMobileUserAgent() {
+  return getUserAgent().match(/(mobile)|(ip(hone|ad))|(android)|(blackberry)|(nokia)|(phone)|(opera\smini)/i);
+}
+function isMobileDevice() {
+  return (getInnerWidth() <= 1024) || window.orientation || mobileUserAgent;
+}
 function getUrlConfig(bidRequests) {
   if (isTestRequest(bidRequests)) {
     return getTestConfig(bidRequests.filter(br => br.params.t));
@@ -173,8 +213,32 @@ function getTestConfig(bidRequests) {
   };
 }
 
+function compareSizesByPriority(size1, size2) {
+  var priorityOrderForSizesAsc = isMobileDevice() ? PRIORITY_ORDER_FOR_MOBILE_SIZES_ASC : PRIORITY_ORDER_FOR_DESKTOP_SIZES_ASC;
+  var index1 = priorityOrderForSizesAsc.indexOf(size1);
+  var index2 = priorityOrderForSizesAsc.indexOf(size2);
+  if (index1 > -1) {
+    if (index2 > -1) {
+      return (index1 < index2) ? 1 : -1;
+    } else {
+      return -1;
+    }
+  } else {
+    return (index2 > -1) ? 1 : 0;
+  }
+}
+
+function getSizesSortedByPriority(sizes) {
+  return parseSizesInput(sizes).sort(compareSizesByPriority);
+}
+
 function getSize(bid, first) {
-  return bid.sizes && bid.sizes.length ? utils.parseSizesInput(first ? bid.sizes[0] : bid.sizes).join(',') : NULL_SIZE;
+  var arraySizes = bid.sizes && bid.sizes.length ? getSizesSortedByPriority(bid.sizes) : [];
+  if (arraySizes.length) {
+    return first ? arraySizes[0] : arraySizes.join(',');
+  } else {
+    return NULL_SIZE;
+  }
 }
 
 function getSpacesStruct(bids) {
@@ -188,16 +252,48 @@ function getSpacesStruct(bids) {
   return e;
 }
 
+function getFirstSizeVast(sizes) {
+  if (sizes == undefined || !Array.isArray(sizes)) {
+    return undefined;
+  }
+
+  let size = Array.isArray(sizes[0]) ? sizes[0] : sizes;
+
+  return (Array.isArray(size) && size.length == 2) ? size : undefined;
+}
+
 function cleanName(name) {
   return name.replace(/_|\.|-|\//g, '').replace(/\)\(|\(|\)|:/g, '_').replace(/^_+|_+$/g, '');
 }
 
 function getSpaces(bidRequests, ml) {
+  let impType = bidRequests.reduce((previousBits, bid) => (bid.mediaTypes && bid.mediaTypes[VIDEO]) ? (bid.mediaTypes[VIDEO].context == 'outstream' ? (previousBits | 2) : (previousBits | 1)) : previousBits, 0);
+  // Only one type of auction is supported at a time
+  if (impType) {
+    bidRequests = bidRequests.filter((bid) => bid.mediaTypes && bid.mediaTypes[VIDEO] && (impType & VAST_INSTREAM ? (!bid.mediaTypes[VIDEO].context || bid.mediaTypes[VIDEO].context == 'instream') : (bid.mediaTypes[VIDEO].context == 'outstream')));
+  }
+
   let spacesStruct = getSpacesStruct(bidRequests);
-  let es = {str: '', vs: '', map: {}};
+  let es = {str: '', vs: '', map: {}, impType: impType};
   es.str = Object.keys(spacesStruct).map(size => spacesStruct[size].map((bid, i) => {
     es.vs += getVs(bid);
-    let name = ml ? cleanName(bid.adUnitCode) : getSize(bid, true) + '_' + i;
+
+    let name;
+
+    if (impType) {
+      let firstSize = getFirstSizeVast(bid.mediaTypes[VIDEO].playerSize);
+      let sizeVast = firstSize ? firstSize.join('x') : DEFAULT_SIZE_VAST;
+      name = 'video_' + sizeVast + '_' + i;
+      es.map[name] = bid.bidId;
+      return name + ':' + sizeVast + ';1';
+    }
+
+    if (ml) {
+      name = cleanName(bid.adUnitCode);
+    } else {
+      name = (bid.params && bid.params.sn) || (getSize(bid, true) + '_' + i);
+    }
+
     es.map[name] = bid.bidId;
     return name + ':' + getSize(bid);
   }).join('+')).join('+');
@@ -236,13 +332,25 @@ function getCharset() {
 
 function waitForElementsPresent(elements) {
   const observer = new MutationObserver(function (mutationList, observer) {
+    let index;
+    let adView;
     if (mutationList && Array.isArray(mutationList)) {
       mutationList.forEach(mr => {
         if (mr && mr.addedNodes && Array.isArray(mr.addedNodes)) {
           mr.addedNodes.forEach(ad => {
-            let index = elements.indexOf(ad.id);
+            index = elements.indexOf(ad.id);
+            adView = ad;
+            if (index < 0) {
+              elements.forEach(code => {
+                let div = _getAdSlotHTMLElement(code);
+                if (div && div.contains(ad) && div.getBoundingClientRect().width > 0) {
+                  index = elements.indexOf(div.id);
+                  adView = div;
+                }
+              });
+            }
             if (index >= 0) {
-              registerViewability(ad);
+              registerViewability(adView, elements[index]);
               elements.splice(index, 1);
               if (!elements.length) {
                 observer.disconnect();
@@ -263,19 +371,41 @@ function waitForElementsPresent(elements) {
   });
 }
 
-function registerViewability(div) {
+function registerViewability(div, name) {
   visibilityHandler({
-    name: div.id,
+    name: name,
     div: div
   });
 }
 
+function _mapAdUnitPathToElementId(adUnitCode) {
+  if (isGptPubadsDefined()) {
+    // eslint-disable-next-line no-undef
+    const adSlots = googletag.pubads().getSlots();
+    const isMatchingAdSlot = isSlotMatchingAdUnitCode(adUnitCode);
+
+    for (let i = 0; i < adSlots.length; i++) {
+      if (isMatchingAdSlot(adSlots[i])) {
+        const id = adSlots[i].getSlotElementId();
+        return id;
+      }
+    }
+  }
+
+  return null;
+}
+
+function _getAdSlotHTMLElement(adUnitCode) {
+  return document.getElementById(adUnitCode) ||
+    document.getElementById(_mapAdUnitPathToElementId(adUnitCode));
+}
+
 function registerViewabilityAllBids(bids) {
   let elementsNotPresent = [];
   bids.forEach(bid => {
-    let div = document.getElementById(bid.adUnitCode);
+    let div = _getAdSlotHTMLElement(bid.adUnitCode);
     if (div) {
-      registerViewability(div);
+      registerViewability(div, bid.adUnitCode);
     } else {
       elementsNotPresent.push(bid.adUnitCode);
     }
@@ -290,114 +420,65 @@ function getViewabilityTracker() {
   let VIEWABILITY_TIME = 1000;
   let VIEWABILITY_MIN_RATIO = 0.5;
   let publicApi;
-  let context;
-
-  function segmentIsOutsideTheVisibleRange(visibleRangeEnd, p1, p2) {
-    return p1 > visibleRangeEnd || p2 < 0;
-  }
-
-  function segmentBeginsBeforeTheVisibleRange(p1) {
-    return p1 < 0;
-  }
-
-  function segmentEndsAfterTheVisibleRange(visibleRangeEnd, p2) {
-    return p2 < visibleRangeEnd;
-  }
-
-  function axialVisibilityRatio(visibleRangeEnd, p1, p2) {
-    let visibilityRatio = 0;
-    if (!segmentIsOutsideTheVisibleRange(visibleRangeEnd, p1, p2)) {
-      if (segmentBeginsBeforeTheVisibleRange(p1)) {
-        visibilityRatio = p2 / (p2 - p1);
+  let observer;
+  let visibilityAds = {};
+
+  function intersectionCallback(entries) {
+    entries.forEach(function(entry) {
+      var adBox = entry.target;
+      if (entry.isIntersecting) {
+        if (entry.intersectionRatio >= VIEWABILITY_MIN_RATIO && entry.boundingClientRect && entry.boundingClientRect.height > 0 && entry.boundingClientRect.width > 0) {
+          visibilityAds[adBox.id] = true;
+        }
       } else {
-        visibilityRatio = segmentEndsAfterTheVisibleRange(visibleRangeEnd, p2) ? 1 : (visibleRangeEnd - p1) / (p2 - p1);
+        visibilityAds[adBox.id] = false;
       }
-    }
-    return visibilityRatio;
-  }
-
-  function isNotHiddenByNonFriendlyIframe() {
-    try { return (window === window.top) || window.frameElement; } catch (e) {}
-  }
-
-  function defineContext(e) {
-    try {
-      context = e && window.document.body.contains(e) ? window : (window.top.document.body.contains(e) ? top : undefined);
-    } catch (err) {}
-    return context;
-  }
-
-  function getContext(e) {
-    return context;
-  }
-
-  function verticalVisibilityRatio(position) {
-    return axialVisibilityRatio(getContext().innerHeight, position.top, position.bottom);
-  }
-
-  function horizontalVisibilityRatio(position) {
-    return axialVisibilityRatio(getContext().innerWidth, position.left, position.right);
-  }
-
-  function itIsNotHiddenByBannerAreaPosition(e) {
-    let position = e.getBoundingClientRect();
-    return (verticalVisibilityRatio(position) * horizontalVisibilityRatio(position)) > VIEWABILITY_MIN_RATIO;
-  }
-
-  function itIsNotHiddenByDisplayStyleCascade(e) {
-    return e.offsetHeight > 0 && e.offsetWidth > 0;
-  }
-
-  function itIsNotHiddenByOpacityStyleCascade(e) {
-    let s = e.style;
-    let p = e.parentNode;
-    return !(s && parseFloat(s.opacity) === 0) && (!p || itIsNotHiddenByOpacityStyleCascade(p));
-  }
-
-  function itIsNotHiddenByVisibilityStyleCascade(e) {
-    return getContext().getComputedStyle(e).visibility !== 'hidden';
-  }
-
-  function itIsNotHiddenByTabFocus() {
-    try { return getContext().top.document.hasFocus(); } catch (e) {}
-  }
-
-  function isDefined(e) {
-    return (e !== null) && (typeof e !== 'undefined');
+    });
   }
 
-  function itIsNotHiddenByOrphanBranch() {
-    return isDefined(getContext());
+  function observedElementIsVisible(element) {
+    return visibilityAds[element.id] && document.visibilityState && document.visibilityState === 'visible';
   }
 
-  function isContextInAnIframe() {
-    return isDefined(getContext().frameElement);
+  function defineObserver() {
+    if (!observer) {
+      var observerConfig = {
+        root: null,
+        rootMargin: '0px',
+        threshold: [VIEWABILITY_MIN_RATIO]
+      };
+      observer = new IntersectionObserver(intersectionCallback.bind(this), observerConfig);
+    }
   }
-
   function processIntervalVisibilityStatus(elapsedVisibleIntervals, element, callback) {
-    let visibleIntervals = isVisible(element) ? (elapsedVisibleIntervals + 1) : 0;
+    let visibleIntervals = observedElementIsVisible(element) ? (elapsedVisibleIntervals + 1) : 0;
     if (visibleIntervals === TIME_PARTITIONS) {
+      stopObserveViewability(element)
       callback();
     } else {
       setTimeout(processIntervalVisibilityStatus.bind(this, visibleIntervals, element, callback), VIEWABILITY_TIME / TIME_PARTITIONS);
     }
   }
 
-  function isVisible(element) {
-    defineContext(element);
-    return isNotHiddenByNonFriendlyIframe() &&
-      itIsNotHiddenByOrphanBranch() &&
-      itIsNotHiddenByTabFocus() &&
-      itIsNotHiddenByDisplayStyleCascade(element) &&
-      itIsNotHiddenByVisibilityStyleCascade(element) &&
-      itIsNotHiddenByOpacityStyleCascade(element) &&
-      itIsNotHiddenByBannerAreaPosition(element) &&
-      (!isContextInAnIframe() || isVisible(getContext().frameElement));
+  function stopObserveViewability(element) {
+    delete visibilityAds[element.id];
+    observer.unobserve(element);
+  }
+
+  function observeAds(element) {
+    observer.observe(element);
+  }
+
+  function initAndVerifyVisibility(element, callback) {
+    if (element) {
+      defineObserver();
+      observeAds(element);
+      processIntervalVisibilityStatus(0, element, callback);
+    }
   }
 
   publicApi = {
-    isVisible: isVisible,
-    onView: processIntervalVisibilityStatus.bind(this, 0)
+    onView: initAndVerifyVisibility.bind(this)
   };
 
   return publicApi;
@@ -422,4 +503,5 @@ function registerAuction(storageID) {
 
   return true;
 }
+
 registerBidder(spec);
diff --git a/modules/etargetBidAdapter.js b/modules/etargetBidAdapter.js
index 5e07561044a..b290a62420c 100644
--- a/modules/etargetBidAdapter.js
+++ b/modules/etargetBidAdapter.js
@@ -1,5 +1,4 @@
-'use strict';
-
+import { deepSetValue, isFn, isPlainObject } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
@@ -29,6 +28,7 @@ export const spec = {
     var request = [];
     var bids = JSON.parse(JSON.stringify(validBidRequests));
     var lastCountry = 'sk';
+    var floors = [];
     for (i = 0, l = bids.length; i < l; i++) {
       bid = bids[i];
       if (countryMap[bid.params.country]) {
@@ -37,18 +37,25 @@ export const spec = {
       reqParams = bid.params;
       reqParams.transactionId = bid.transactionId;
       request.push(formRequestUrl(reqParams));
+      floors[i] = getBidFloor(bid);
     }
 
     request.unshift('https://' + lastCountry + '.search.etargetnet.com/hb/?hbget=1');
     netRevenue = 'net';
 
-    if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
-      gdprObject = {
-        gdpr: bidderRequest.gdprConsent.gdprApplies,
-        gdpr_consent: bidderRequest.gdprConsent.consentString
-      };
-      request.push('gdpr=' + gdprObject.gdpr);
-      request.push('gdpr_consent=' + gdprObject.gdpr_consent);
+    if (bidderRequest) {
+      if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+        gdprObject = {
+          gdpr: bidderRequest.gdprConsent.gdprApplies,
+          gdpr_consent: bidderRequest.gdprConsent.consentString
+        };
+        request.push('gdpr=' + gdprObject.gdpr);
+        request.push('gdpr_consent=' + gdprObject.gdpr_consent);
+      }
+      bidderRequest.metaData = getMetaData();
+      if (floors.length > 0) {
+        bidderRequest.floors = floors;
+      }
     }
 
     return {
@@ -61,6 +68,35 @@ export const spec = {
       gdpr: gdprObject
     };
 
+    function getMetaData() {
+      var mts = {};
+      var hmetas = document.getElementsByTagName('meta');
+      var wnames = ['title', 'og:title', 'description', 'og:description', 'og:url', 'base', 'keywords'];
+      try {
+        for (var k in hmetas) {
+          if (typeof hmetas[k] == 'object') {
+            var mname = hmetas[k].name || hmetas[k].getAttribute('property');
+            var mcont = hmetas[k].content;
+            if (!!mname && mname != 'null' && !!mcont) {
+              if (wnames.indexOf(mname) >= 0) {
+                if (!mts[mname]) {
+                  mts[mname] = [];
+                }
+                mts[mname].push(mcont);
+              }
+            }
+          }
+        }
+        mts['title'] = [(document.getElementsByTagName('title')[0] || []).innerHTML];
+        mts['base'] = [(document.getElementsByTagName('base')[0] || {}).href];
+        mts['referer'] = [document.location.href];
+        mts['ortb2'] = (bidderRequest.ortb2 || {});
+      } catch (e) {
+        mts.error = e;
+      }
+      return mts;
+    }
+
     function formRequestUrl(reqData) {
       var key;
       var url = [];
@@ -96,6 +132,7 @@ export const spec = {
           currency: data.win_cur,
           netRevenue: true,
           ttl: 360,
+          reason: data.reason ? data.reason : 'none',
           ad: data.banner,
           vastXml: data.vast_content,
           vastUrl: data.vast_link,
@@ -106,9 +143,13 @@ export const spec = {
           bidObject.gdpr = bidRequest.gdpr.gdpr;
           bidObject.gdpr_consent = bidRequest.gdpr.gdpr_consent;
         }
+        if (bid.adomain) {
+          deepSetValue(bidObject, 'meta.advertiserDomains', Array.isArray(bid.adomain) ? bid.adomain : [bid.adomain]);
+        }
         bidRespones.push(bidObject);
       }
     }
+
     return bidRespones;
 
     function verifySize(adItem, validSizes) {
@@ -122,4 +163,18 @@ export const spec = {
     }
   }
 };
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return null;
+  }
+  let floor = bid.getFloor({
+    currency: 'EUR',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor)) {
+    return floor.floor;
+  }
+  return null;
+}
 registerBidder(spec);
diff --git a/modules/express.js b/modules/express.js
index f4a76daefdf..0b1780e3c26 100644
--- a/modules/express.js
+++ b/modules/express.js
@@ -1,5 +1,4 @@
-
-import * as utils from '../src/utils.js';
+import { logMessage, logWarn, logError, logInfo } from '../src/utils.js';
 
 const MODULE_NAME = 'express';
 
@@ -14,10 +13,10 @@ const MODULE_NAME = 'express';
  * @param {Object[]} [adUnits = pbjs.adUnits] - an array of adUnits for express to operate on.
  */
 $$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
-  utils.logMessage('loading ' + MODULE_NAME);
+  logMessage('loading ' + MODULE_NAME);
 
   if (adUnits.length === 0) {
-    utils.logWarn('no valid adUnits found, not loading ' + MODULE_NAME);
+    logWarn('no valid adUnits found, not loading ' + MODULE_NAME);
   }
 
   // store gpt slots in a more performant hash lookup by elementId (adUnit code)
@@ -27,7 +26,7 @@ $$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
     if (adUnit.code && adUnit.bids) {
       cache[adUnit.code] = adUnit;
     } else {
-      utils.logError('misconfigured adUnit', null, adUnit);
+      logError('misconfigured adUnit', null, adUnit);
     }
     return cache;
   }, {});
@@ -39,10 +38,10 @@ $$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
     var gpt = window.googletag;
     var pads = gpt.pubads;
     if (!gpt.display || !gpt.enableServices || typeof pads !== 'function' || !pads().refresh || !pads().disableInitialLoad || !pads().getSlots || !pads().enableSingleRequest) {
-      utils.logError('could not bind to gpt googletag api');
+      logError('could not bind to gpt googletag api');
       return;
     }
-    utils.logMessage('running');
+    logMessage('running');
 
     // function to convert google tag slot sizes to [[w,h],...]
     function mapGptSlotSizes(aGPTSlotSizes) {
@@ -51,7 +50,7 @@ $$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
         try {
           aSlotSizes.push([aGPTSlotSizes[i].getWidth(), aGPTSlotSizes[i].getHeight()]);
         } catch (e) {
-          utils.logWarn('slot size ' + aGPTSlotSizes[i].toString() + ' not supported by' + MODULE_NAME);
+          logWarn('slot size ' + aGPTSlotSizes[i].toString() + ' not supported by' + MODULE_NAME);
         }
       }
       return aSlotSizes;
@@ -110,7 +109,7 @@ $$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
     //  - else run an auction and call the real fGptRefresh() to
     //       initiate the DFP request
     gpt.display = function (sElementId) {
-      utils.logInfo('display:', sElementId);
+      logInfo('display:', sElementId);
       // call original gpt display() function
       fGptDisplay.apply(gpt, arguments);
 
@@ -157,7 +156,7 @@ $$PREBID_GLOBAL$$.express = function(adUnits = $$PREBID_GLOBAL$$.adUnits) {
     // override gpt refresh() function
     // - run auctions for provided gpt slots, then initiate ad-server call
     pads().refresh = function (aGptSlots, options) {
-      utils.logInfo('refresh:', aGptSlots);
+      logInfo('refresh:', aGptSlots);
       // get already displayed adUnits from aGptSlots if provided, else all defined gptSlots
       aGptSlots = defaultSlots(aGptSlots);
       var adUnits = pickAdUnits(/* mutated: */ aGptSlots).filter(function (adUnit) {
diff --git a/modules/eywamediaBidAdapter.md b/modules/eywamediaBidAdapter.md
deleted file mode 100644
index 76b9b032c1b..00000000000
--- a/modules/eywamediaBidAdapter.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Overview
-
-```
-Module Name:  Eywamedia Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer: sharath@eywamedia.com
-Note: Our ads will only render in mobile and desktop
-```
-
-# Description
-
-Connects to Eywamedia Ad Server for bids.
-
-Eywamedia bid adapter supports Banners.
-
-# Test Parameters
-```
-var adUnits = [
-   // Banner adUnit
-   {
-       code: 'div-gpt-ad-1460505748561-0', 
-       sizes: [[300, 250], [300,600]],
-       bids: [{
-         bidder: 'eywamedia',
-         params: {
-           publisherId: 'f63a2362-5aa4-4829-bbd2-2678ced8b63e', //Required - GUID (may include numbers and characters) 
-           bidFloor: 0.50, // optional
-           cats: ["iab1-1","iab23-2"], // optional
-           keywords: ["sports", "cricket"],  // optional
-           lat: 12.33333, // optional
-           lon: 77.32322, // optional
-           locn: "country$region$city$zip"  // optional
-         }
-       }]
-   }
-];
-```
diff --git a/modules/fabrickIdSystem.js b/modules/fabrickIdSystem.js
new file mode 100644
index 00000000000..dfc2985b0db
--- /dev/null
+++ b/modules/fabrickIdSystem.js
@@ -0,0 +1,183 @@
+/**
+ * This module adds neustar's fabrickId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/fabrickIdSystem
+ * @requires module:modules/userId
+ */
+
+import { logError } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+
+/** @type {Submodule} */
+export const fabrickIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'fabrickId',
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function decode
+   * @param {(Object|string)} value
+   * @returns {(Object|undefined)}
+   */
+  decode(value) {
+    if (value && value.fabrickId) {
+      return { 'fabrickId': value.fabrickId };
+    } else {
+      return undefined;
+    }
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function getId
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData}
+   * @param {Object} cacheIdObj - existing id, if any consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData, cacheIdObj) {
+    try {
+      const configParams = (config && config.params) || {};
+      if (window.fabrickMod1) {
+        window.fabrickMod1(configParams, consentData, cacheIdObj);
+      }
+      if (!configParams || !configParams.apiKey || typeof configParams.apiKey !== 'string') {
+        logError('fabrick submodule requires an apiKey.');
+        return;
+      }
+      try {
+        let url = _getBaseUrl(configParams);
+        let keysArr = Object.keys(configParams);
+        for (let i in keysArr) {
+          let k = keysArr[i];
+          if (k === 'url' || k === 'refererInfo' || (k.length > 3 && k.substring(0, 3) === 'max')) {
+            continue;
+          }
+          let v = configParams[k];
+          if (Array.isArray(v)) {
+            for (let j in v) {
+              if (typeof v[j] === 'string' || typeof v[j] === 'number') {
+                url += `${k}=${v[j]}&`;
+              }
+            }
+          } else if (typeof v === 'string' || typeof v === 'number') {
+            url += `${k}=${v}&`;
+          }
+        }
+        // pull off the trailing &
+        url = url.slice(0, -1);
+        const referer = _getRefererInfo(configParams);
+        const refs = new Map();
+        _setReferrer(refs, referer.topmostLocation);
+        if (referer.stack && referer.stack[0]) {
+          _setReferrer(refs, referer.stack[0]);
+        }
+        _setReferrer(refs, referer.canonicalUrl);
+        _setReferrer(refs, window.location.href);
+
+        refs.forEach(v => {
+          url = appendUrl(url, 'r', v, configParams);
+        });
+
+        const resp = function (callback) {
+          const callbacks = {
+            success: response => {
+              if (window.fabrickMod2) {
+                return window.fabrickMod2(
+                  callback, response, configParams, consentData, cacheIdObj);
+              } else {
+                let responseObj;
+                if (response) {
+                  try {
+                    responseObj = JSON.parse(response);
+                  } catch (error) {
+                    logError(error);
+                    responseObj = {};
+                  }
+                }
+                callback(responseObj);
+              }
+            },
+            error: error => {
+              logError(`fabrickId fetch encountered an error`, error);
+              callback();
+            }
+          };
+          ajax(url, callbacks, null, {method: 'GET', withCredentials: true});
+        };
+        return {callback: resp};
+      } catch (e) {
+        logError(`fabrickIdSystem encountered an error`, e);
+      }
+    } catch (e) {
+      logError(`fabrickIdSystem encountered an error`, e);
+    }
+  }
+};
+
+function _getRefererInfo(configParams) {
+  if (configParams.refererInfo) {
+    return configParams.refererInfo;
+  } else {
+    return getRefererInfo();
+  }
+}
+
+function _getBaseUrl(configParams) {
+  if (configParams.url) {
+    return configParams.url;
+  } else {
+    return `https://fid.agkn.com/f?`;
+  }
+}
+
+function _setReferrer(refs, s) {
+  if (s) {
+    // store the longest one for the same URI
+    const url = s.split('?')[0];
+    // OR store the longest one for the same domain
+    // const url = s.split('?')[0].replace('http://','').replace('https://', '').split('/')[0];
+    if (refs.has(url)) {
+      const prevRef = refs.get(url);
+      if (s.length > prevRef.length) {
+        refs.set(url, s);
+      }
+    } else {
+      refs.set(url, s);
+    }
+  }
+}
+
+export function appendUrl(url, paramName, s, configParams) {
+  const maxUrlLen = (configParams && configParams.maxUrlLen) || 2000;
+  const maxRefLen = (configParams && configParams.maxRefLen) || 1000;
+  const maxSpaceAvailable = (configParams && configParams.maxSpaceAvailable) || 50;
+  //                     make sure we have enough space left to make it worthwhile
+  if (s && url.length < (maxUrlLen - maxSpaceAvailable)) {
+    let thisMaxRefLen = maxUrlLen - url.length;
+    if (thisMaxRefLen > maxRefLen) {
+      thisMaxRefLen = maxRefLen;
+    }
+
+    s = `&${paramName}=${encodeURIComponent(s)}`;
+
+    if (s.length >= thisMaxRefLen) {
+      s = s.substring(0, thisMaxRefLen);
+      if (s.charAt(s.length - 1) === '%') {
+        s = s.substring(0, thisMaxRefLen - 1);
+      } else if (s.charAt(s.length - 2) === '%') {
+        s = s.substring(0, thisMaxRefLen - 2);
+      }
+    }
+    return `${url}${s}`;
+  } else {
+    return url;
+  }
+}
+
+submodule('userId', fabrickIdSubmodule);
diff --git a/modules/fabrickIdSystem.md b/modules/fabrickIdSystem.md
new file mode 100644
index 00000000000..268c861710a
--- /dev/null
+++ b/modules/fabrickIdSystem.md
@@ -0,0 +1,24 @@
+## Neustar Fabrick User ID Submodule
+
+Fabrick ID Module - https://www.home.neustar/fabrick
+Product and Sales Inquiries: 1-855-898-0036
+
+## Example configuration for publishers:
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'fabrickId',
+            storage: {
+                name: 'pbjs_fabrickId',
+                type: 'cookie',
+                expires: 7
+            },
+            params: {
+                apiKey: 'your apiKey', // provided to you by Neustar
+                e: '31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66' // example hash identifier (sha256)
+            }
+        }]
+    }
+});
+```
diff --git a/modules/fairtradeBidAdapter.md b/modules/fairtradeBidAdapter.md
deleted file mode 100644
index 56abb84d15a..00000000000
--- a/modules/fairtradeBidAdapter.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Overview
-
-Module Name: FairTrade Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: Tammy.l@VaticDigital.com
-
-# Description
-
-Module that connects to FairTrade demand source to fetch bids.
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "fairtrade",
-                       params: {
-                           uid: '166',
-                           priceType: 'gross' // by default is 'net'
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/feedadBidAdapter.js b/modules/feedadBidAdapter.js
index 3992f2db5e0..7b684efab3c 100644
--- a/modules/feedadBidAdapter.js
+++ b/modules/feedadBidAdapter.js
@@ -1,13 +1,13 @@
-import * as utils from '../src/utils.js';
+import {deepAccess, isArray, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {BANNER} from '../src/mediaTypes.js';
 import {ajax} from '../src/ajax.js';
 
 /**
  * Version of the FeedAd bid adapter
  * @type {string}
  */
-const VERSION = '1.0.0';
+const VERSION = '1.0.5';
 
 /**
  * @typedef {object} FeedAdApiBidRequest
@@ -16,7 +16,8 @@ const VERSION = '1.0.0';
  * @property {number} ad_type
  * @property {string} client_token
  * @property {string} placement_id
- * @property {string} sdk_version
+ * @property {string} prebid_adapter_version
+ * @property {string} prebid_sdk_version
  * @property {boolean} app_hybrid
  *
  * @property {string} [app_bundle_id]
@@ -31,7 +32,7 @@ const VERSION = '1.0.0';
  * @typedef {object} FeedAdApiBidResponse
  * @inner
  *
- * @property {string} ad - Ad HTML payload
+ * @property {string} [ad] - Ad HTML payload
  * @property {number} cpm - number / float
  * @property {string} creativeId - ID of creative for tracking
  * @property {string} currency - 3-letter ISO 4217 currency-code
@@ -40,6 +41,7 @@ const VERSION = '1.0.0';
  * @property {string} requestId - bids[].bidId
  * @property {number} ttl - Time to live for this ad
  * @property {number} width - Width of creative returned in [].ad
+ * @property {object} [ext] - an extension object
  */
 
 /**
@@ -61,6 +63,11 @@ const VERSION = '1.0.0';
  * @property [device_platform] {1|2|3} 1 - Android | 2 - iOS | 3 - Windows
  */
 
+/**
+ * The IAB TCF 2.0 vendor ID for the FeedAd GmbH
+ */
+const TCF_VENDOR_ID = 781;
+
 /**
  * Bidder network identity code
  * @type {string}
@@ -71,7 +78,7 @@ const BIDDER_CODE = 'feedad';
  * The media types supported by FeedAd
  * @type {MediaType[]}
  */
-const MEDIA_TYPES = [VIDEO, BANNER];
+const MEDIA_TYPES = [BANNER];
 
 /**
  * Tag for logging
@@ -102,15 +109,15 @@ const BID_METADATA = {};
  * @return {boolean} true if the bid is valid
  */
 function isBidRequestValid(bid) {
-  const clientToken = utils.deepAccess(bid, 'params.clientToken');
+  const clientToken = deepAccess(bid, 'params.clientToken');
   if (!clientToken || !isValidClientToken(clientToken)) {
-    utils.logWarn(TAG, "missing or invalid parameter 'clientToken'. found value:", clientToken);
+    logWarn(TAG, "missing or invalid parameter 'clientToken'. found value:", clientToken);
     return false;
   }
 
-  const placementId = utils.deepAccess(bid, 'params.placementId');
+  const placementId = deepAccess(bid, 'params.placementId');
   if (!placementId || !isValidPlacementId(placementId)) {
-    utils.logWarn(TAG, "missing or invalid parameter 'placementId'. found value:", placementId);
+    logWarn(TAG, "missing or invalid parameter 'placementId'. found value:", placementId);
     return false;
   }
 
@@ -171,13 +178,14 @@ function isMediaTypesEmpty(mediaTypes) {
  * @return {FeedAdApiBidRequest}
  */
 function createApiBidRParams(request) {
-  return {
+  return Object.assign({}, request.params, {
     ad_type: 0,
     client_token: request.params.clientToken,
     placement_id: request.params.placementId,
-    sdk_version: `prebid_${VERSION}`,
+    prebid_adapter_version: VERSION,
+    prebid_sdk_version: '$prebid.version$',
     app_hybrid: false,
-  };
+  });
 }
 
 /**
@@ -201,9 +209,13 @@ function buildRequests(validBidRequests, bidderRequest) {
     })
   });
   data.bids.forEach(bid => BID_METADATA[bid.bidId] = {
-    referer: data.refererInfo.referer,
+    referer: data.refererInfo.page,
     transactionId: bid.transactionId
   });
+  if (bidderRequest.gdprConsent) {
+    data.consentIabTcf = bidderRequest.gdprConsent.consentString;
+    data.gdprApplies = bidderRequest.gdprConsent.gdprApplies;
+  }
   return {
     method: 'POST',
     url: `${API_ENDPOINT}${API_PATH_BID_REQUEST}`,
@@ -221,10 +233,16 @@ function buildRequests(validBidRequests, bidderRequest) {
  * @returns {Bid[]} the FeedAd bids
  */
 function interpretResponse(serverResponse, request) {
-  /**
-   * @type FeedAdApiBidResponse[]
-   */
-  return typeof serverResponse.body === 'string' ? JSON.parse(serverResponse.body) : serverResponse.body;
+  const response = typeof serverResponse.body === 'string' ? JSON.parse(serverResponse.body) : serverResponse.body;
+  if (!isArray(response)) {
+    return [];
+  }
+  return response.filter(bid => Object.prototype.hasOwnProperty.call(bid, 'ad'))
+    .map(bid => {
+      const copy = Object.assign({}, bid);
+      delete copy.ext;
+      return copy;
+    });
 }
 
 /**
@@ -249,7 +267,8 @@ function createTrackingParams(data, klass) {
     prebid_bid_id: bidId,
     prebid_transaction_id: transactionId,
     referer,
-    sdk_version: VERSION
+    prebid_adapter_version: VERSION,
+    prebid_sdk_version: '$prebid.version$',
   };
 }
 
@@ -274,17 +293,51 @@ function trackingHandlerFactory(klass) {
   }
 }
 
+/**
+ * Reads the user syncs off the server responses and converts them into Prebid.JS format
+ * @param {SyncOptions} syncOptions
+ * @param {ServerResponse[]} serverResponses
+ * @param gdprConsent
+ * @param uspConsent
+ */
+function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+  return serverResponses.map(response => {
+    // validate response format
+    const ext = deepAccess(response, 'body.ext', []);
+    if (ext == null) {
+      return null;
+    }
+    return ext;
+  })
+    .filter(ext => ext != null)
+    .flatMap(extension => {
+      // extract user syncs from extension
+      const pixels = syncOptions.pixelEnabled && extension.pixels ? extension.pixels : [];
+      const iframes = syncOptions.iframeEnabled && extension.iframes ? extension.iframes : [];
+      return pixels.concat(...iframes);
+    })
+    .reduce((syncs, sync) => {
+      // remove duplicates
+      if (!syncs.find(it => it.type === sync.type && it.url === sync.url)) {
+        syncs.push(sync);
+      }
+      return syncs;
+    }, []);
+}
+
 /**
  * @type {BidderSpec}
  */
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: TCF_VENDOR_ID,
   supportedMediaTypes: MEDIA_TYPES,
   isBidRequestValid,
   buildRequests,
   interpretResponse,
   onTimeout: trackingHandlerFactory('prebid_bidTimeout'),
-  onBidWon: trackingHandlerFactory('prebid_bidWon')
+  onBidWon: trackingHandlerFactory('prebid_bidWon'),
+  getUserSyncs
 };
 
 registerBidder(spec);
diff --git a/modules/feedadBidAdapter.md b/modules/feedadBidAdapter.md
index fd57025c29e..fc3537ec331 100644
--- a/modules/feedadBidAdapter.md
+++ b/modules/feedadBidAdapter.md
@@ -18,9 +18,6 @@ Prebid.JS adapter that connects to the FeedAd demand sources.
             mediaTypes: {
                 banner: { // supports all banner sizes
                     sizes: [[300, 250]],
-                },
-                video: { // supports only outstream video
-                    context: 'outstream'
                 }
             },
             bids: [
@@ -29,6 +26,7 @@ Prebid.JS adapter that connects to the FeedAd demand sources.
                     params: {
                         clientToken: 'your-client-token' // see below for more info
                         placementId: 'your-placement-id' // see below for more info
+                        decoration: 'decoration parameters' // optional, see below for info
                     }
                 }
             ]
@@ -38,7 +36,8 @@ Prebid.JS adapter that connects to the FeedAd demand sources.
 
 # Required Parameters
 
-| Parameter | Description |
-| --------- | ----------- |
+| Parameter     | Description |
+|---------------| ----------- |
 | `clientToken` | Your FeedAd web client token. You can view your client token inside the FeedAd admin panel. |
 | `placementId` | You can choose placement IDs yourself. A placement ID should be named after the ad position inside your product. For example, if you want to display an ad inside a list of news articles, you could name it "ad-news-overview".<br> A placement ID may consist of lowercase `a-z`, `0-9`, `-` and `_`. You do not have to manually create the placement IDs before using them. Just specify them within the code, and they will appear in the FeedAd admin panel after the first request. <br> [Learn more](/concept/feed_ad/index.html) about Placement IDs and how they are grouped to play the same Creative. |
+| `decoration`  | Optional. If you want to apply a [decoration](https://docs.feedad.com/web/feed_ad/#decorations) to the ad.
diff --git a/modules/fidelityBidAdapter.js b/modules/fidelityBidAdapter.js
deleted file mode 100644
index baf5384fbfe..00000000000
--- a/modules/fidelityBidAdapter.js
+++ /dev/null
@@ -1,147 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'fidelity';
-const BIDDER_SERVER = 'x.fidelity-media.com';
-const FIDELITY_VENDOR_ID = 408;
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['kubient'],
-  gvlid: 408,
-  isBidRequestValid: function isBidRequestValid(bid) {
-    return !!(bid && bid.params && bid.params.zoneid);
-  },
-  buildRequests: function buildRequests(validBidRequests, bidderRequest) {
-    return validBidRequests.map(bidRequest => {
-      var server = bidRequest.params.server || BIDDER_SERVER;
-
-      const payload = {
-        from: 'hb',
-        v: '1.0',
-        requestid: bidRequest.bidderRequestId,
-        impid: bidRequest.bidId,
-        zoneid: bidRequest.params.zoneid,
-        floor: parseFloat(bidRequest.params.floor) > 0 ? bidRequest.params.floor : 0,
-        charset: document.charSet || document.characterSet,
-        subid: 'hb',
-        flashver: getFlashVersion(),
-        tmax: bidderRequest.timeout,
-        defloc: bidderRequest.refererInfo.referer,
-        referrer: getTopWindowReferrer(),
-        schain: getSupplyChain(bidRequest.schain),
-      };
-      setConsentParams(bidderRequest.gdprConsent, bidderRequest.uspConsent, payload);
-
-      return {
-        method: 'GET',
-        url: 'https://' + server + '/delivery/hb.php',
-        data: payload
-      };
-    });
-  },
-  interpretResponse: function interpretResponse(serverResponse) {
-    serverResponse = serverResponse.body;
-    const bidResponses = [];
-    if (serverResponse && serverResponse.seatbid) {
-      serverResponse.seatbid.forEach(seatBid => seatBid.bid.forEach(bid => {
-        const bidResponse = {
-          requestId: bid.impid,
-          creativeId: bid.impid,
-          cpm: bid.price,
-          width: bid.width,
-          height: bid.height,
-          ad: bid.adm,
-          netRevenue: bid.netRevenue,
-          currency: bid.cur,
-          ttl: bid.ttl,
-        };
-
-        bidResponses.push(bidResponse);
-      }));
-    }
-    return bidResponses;
-  },
-  getUserSyncs: function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
-    if (syncOptions.iframeEnabled) {
-      var url = 'https://' + BIDDER_SERVER + '/delivery/matches.php';
-      var payload = {
-        type: 'iframe'
-      };
-      setConsentParams(gdprConsent, uspConsent, payload);
-
-      return [{
-        type: 'iframe',
-        url: url + '?' + utils.parseQueryStringParameters(payload).replace(/\&$/, '')
-      }];
-    }
-  }
-}
-
-function getFlashVersion() {
-  var plugins, plugin, result;
-
-  if (navigator.plugins && navigator.plugins.length > 0) {
-    plugins = navigator.plugins;
-    for (var i = 0; i < plugins.length && !result; i++) {
-      plugin = plugins[i];
-      if (plugin.name.indexOf('Shockwave Flash') > -1) {
-        result = plugin.description.split('Shockwave Flash ')[1];
-      }
-    }
-  }
-  return result || '';
-}
-
-function getTopWindowReferrer() {
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return '';
-  }
-}
-
-function setConsentParams(gdprConsent, uspConsent, payload) {
-  if (gdprConsent) {
-    payload.gdpr = 0;
-    payload.consent_str = '';
-    payload.consent_given = 0;
-    if (typeof gdprConsent.gdprApplies !== 'undefined') {
-      payload.gdpr = gdprConsent.gdprApplies ? 1 : 0;
-    }
-    if (typeof gdprConsent.consentString !== 'undefined') {
-      payload.consent_str = gdprConsent.consentString;
-    }
-    if (gdprConsent.apiVersion === 1 && gdprConsent.vendorData && gdprConsent.vendorData.vendorConsents && typeof gdprConsent.vendorData.vendorConsents[FIDELITY_VENDOR_ID.toString(10)] !== 'undefined') {
-      payload.consent_given = gdprConsent.vendorData.vendorConsents[FIDELITY_VENDOR_ID.toString(10)] ? 1 : 0;
-    }
-    if (gdprConsent.apiVersion === 2 && gdprConsent.vendorData && gdprConsent.vendorData.vendor && gdprConsent.vendorData.vendor.consents && typeof gdprConsent.vendorData.vendor.consents[FIDELITY_VENDOR_ID.toString(10)] !== 'undefined') {
-      payload.consent_given = gdprConsent.vendorData.vendor.consents[FIDELITY_VENDOR_ID.toString(10)] ? 1 : 0;
-    }
-  }
-  if (typeof uspConsent !== 'undefined') {
-    payload.us_privacy = uspConsent;
-  }
-}
-
-function getSupplyChain(schain) {
-  var supplyChain = '';
-  if (schain != null && schain.nodes) {
-    supplyChain = schain.ver + ',' + schain.complete;
-    for (let i = 0; i < schain.nodes.length; i++) {
-      supplyChain += '!';
-      supplyChain += (schain.nodes[i].asi) ? encodeURIComponent(schain.nodes[i].asi) : '';
-      supplyChain += ',';
-      supplyChain += (schain.nodes[i].sid) ? encodeURIComponent(schain.nodes[i].sid) : '';
-      supplyChain += ',';
-      supplyChain += (schain.nodes[i].hp) ? encodeURIComponent(schain.nodes[i].hp) : '';
-      supplyChain += ',';
-      supplyChain += (schain.nodes[i].rid) ? encodeURIComponent(schain.nodes[i].rid) : '';
-      supplyChain += ',';
-      supplyChain += (schain.nodes[i].name) ? encodeURIComponent(schain.nodes[i].name) : '';
-      supplyChain += ',';
-      supplyChain += (schain.nodes[i].domain) ? encodeURIComponent(schain.nodes[i].domain) : '';
-    }
-  }
-  return supplyChain;
-}
-registerBidder(spec);
diff --git a/modules/fidelityBidAdapter.md b/modules/fidelityBidAdapter.md
deleted file mode 100644
index 0af75689bd6..00000000000
--- a/modules/fidelityBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-​
-**Module Name**: Fidelity Media fmxSSP Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**:  on@fidelity-media.com
-​
-# Description
-​
-Connects to Fidelity Media fmxSSP demand source to fetch bids.  
-​
-# Test Parameters
-```
-    var adUnits = [{
-      code: 'banner-ad-div',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250]],
-        }
-      },
-      bids: [{
-        bidder: 'fidelity',
-        params: {
-          zoneid: '27248',
-          floor: 0.005,
-          server: 'x.fidelity-media.com'
-        }
-      }]
-    }];
-	
-```
\ No newline at end of file
diff --git a/modules/finativeBidAdapter.js b/modules/finativeBidAdapter.js
new file mode 100644
index 00000000000..b236ddb3d95
--- /dev/null
+++ b/modules/finativeBidAdapter.js
@@ -0,0 +1,238 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { NATIVE } from '../src/mediaTypes.js';
+import { _map, deepSetValue, isEmpty, deepAccess } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'finative';
+const DEFAULT_CUR = 'EUR';
+const ENDPOINT_URL = 'https://b.finative.cloud/cds/rtb/bid?format=openrtb2.5&ssp=pb';
+
+const NATIVE_ASSET_IDS = {0: 'title', 1: 'body', 2: 'sponsoredBy', 3: 'image', 4: 'cta', 5: 'icon'};
+
+const NATIVE_PARAMS = {
+  title: {
+    id: 0,
+    name: 'title'
+  },
+
+  body: {
+    id: 1,
+    name: 'data',
+    type: 2
+  },
+
+  sponsoredBy: {
+    id: 2,
+    name: 'data',
+    type: 1
+  },
+
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+
+  cta: {
+    id: 4,
+    type: 12,
+    name: 'data'
+  },
+
+  icon: {
+    id: 5,
+    type: 1,
+    name: 'img'
+  }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  supportedMediaTypes: [NATIVE],
+
+  isBidRequestValid: function(bid) {
+    return !!bid.params.adUnitId;
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
+    const tid = bidderRequest.auctionId;
+    const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
+    let url = bidderRequest.refererInfo.referer;
+
+    const imp = validBidRequests.map((bid, id) => {
+      const assets = _map(bid.nativeParams, (bidParams, key) => {
+        const props = NATIVE_PARAMS[key];
+
+        const asset = {
+          required: bidParams.required & 1
+        };
+
+        if (props) {
+          asset.id = props.id;
+
+          let w, h;
+
+          if (bidParams.sizes) {
+            w = bidParams.sizes[0];
+            h = bidParams.sizes[1];
+          }
+
+          asset[props.name] = {
+            len: bidParams.len,
+            type: props.type,
+            w,
+            h
+          };
+
+          return asset;
+        }
+      })
+        .filter(Boolean);
+
+      if (bid.params.url) {
+        url = bid.params.url;
+      }
+
+      return {
+        id: String(id + 1),
+        tagid: bid.params.adUnitId,
+        tid: tid,
+        pt: pt,
+        native: {
+          request: {
+            assets
+          }
+        }
+      };
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site: {
+        page: url
+      },
+      device: {
+        ua: navigator.userAgent
+      },
+      cur,
+      imp,
+      user: {},
+      regs: {
+        ext: {
+          gdpr: 0,
+          pb_ver: '$prebid.version$'
+        }
+      }
+    };
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(request, 'regs.ext.gdpr', (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean' && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0);
+    }
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: JSON.stringify(request),
+      options: {
+        contentType: 'application/json'
+      },
+      bids: validBidRequests
+    };
+  },
+
+  interpretResponse: function(serverResponse, { bids }) {
+    if (isEmpty(serverResponse.body)) {
+      return [];
+    }
+
+    const { seatbid, cur } = serverResponse.body;
+
+    const bidResponses = (typeof seatbid != 'undefined') ? flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
+      result[bid.impid - 1] = bid;
+      return result;
+    }, []) : [];
+
+    return bids
+      .map((bid, id) => {
+        const bidResponse = bidResponses[id];
+
+        if (bidResponse) {
+          return {
+            requestId: bid.bidId,
+            cpm: bidResponse.price,
+            creativeId: bidResponse.crid,
+            ttl: 1000,
+            netRevenue: (!bid.netRevenue || bid.netRevenue === 'net'),
+            currency: cur,
+            mediaType: NATIVE,
+            bidderCode: BIDDER_CODE,
+            native: parseNative(bidResponse),
+            meta: {
+              advertiserDomains: bidResponse.adomain && bidResponse.adomain.length > 0 ? bidResponse.adomain : []
+            }
+          };
+        }
+      })
+      .filter(Boolean);
+  }
+};
+
+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);
+    });
+  }
+
+  const result = {
+    url: clickUrl,
+    clickUrl: clickUrl,
+    clickTrackers: link.clicktrackers || undefined,
+    impressionTrackers: imptrackers || undefined
+  };
+
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+
+    if (content) {
+      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+
+  return result;
+}
+
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function flatten(arr) {
+  return [].concat(...arr);
+}
diff --git a/modules/finativeBidAdapter.md b/modules/finativeBidAdapter.md
new file mode 100644
index 00000000000..74479150fe4
--- /dev/null
+++ b/modules/finativeBidAdapter.md
@@ -0,0 +1,45 @@
+# Overview
+Module Name: Finative Bidder Adapter
+Type: Finative Adapter
+Maintainer: tech@finative.cloud
+
+# Description
+Finative Bidder Adapter for Prebid.js.
+
+# Test Parameters
+```
+var adUnits = [{
+    code: 'test-div',
+
+    mediaTypes: {
+        native: {
+            title: {
+                required: true,
+                len: 50
+            },
+            body: {
+                required: true,
+                len: 350
+            },
+            url: {
+                required: true
+            },
+            image: {
+                required: true,
+                sizes : [300, 175]
+            },
+            sponsoredBy: {
+                required: true
+            }
+        }
+    },
+    bids: [{
+        bidder: 'finative',
+        params: {
+	    	url  : "https://mockup.finative.cloud",
+	    	adUnitId: "1uyo"
+        }
+    }]
+}];
+```
+
diff --git a/modules/fintezaAnalyticsAdapter.js b/modules/fintezaAnalyticsAdapter.js
index 8729035491f..88c5f85f15d 100644
--- a/modules/fintezaAnalyticsAdapter.js
+++ b/modules/fintezaAnalyticsAdapter.js
@@ -1,11 +1,11 @@
+import { parseUrl, logError } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import * as utils from '../src/utils.js';
 import { getStorageManager } from '../src/storageManager.js';
+import CONSTANTS from '../src/constants.json';
 
 const storage = getStorageManager();
-const CONSTANTS = require('../src/constants.json');
 
 const ANALYTICS_TYPE = 'endpoint';
 const FINTEZA_HOST = 'https://content.mql5.com/tr';
@@ -28,23 +28,15 @@ function getPageInfo() {
   }
 
   if (document.referrer) {
-    pageInfo.referrerDomain = utils.parseUrl(document.referrer).hostname;
+    pageInfo.referrerDomain = parseUrl(document.referrer).hostname;
   }
 
   return pageInfo;
 }
 
 function getUniqId() {
-  let cookies;
-
-  try {
-    cookies = parseCookies(document.cookie);
-  } catch (a) {
-    cookies = {};
-  }
-
   let isUniqFromLS;
-  let uniq = cookies[ UNIQ_ID_KEY ];
+  let uniq = storage.getCookie(UNIQ_ID_KEY);
   if (!uniq) {
     try {
       if (storage.hasLocalStorage()) {
@@ -189,7 +181,7 @@ function initSession() {
       !checkSessionByExpires() ||
       !checkSessionByReferer() ||
       !checkSessionByDay()) {
-    sessionId = '' + timestamp + getRandAsStr(SESSION_RAND_PART);
+    sessionId = '' + timestamp + getRandAsStr(SESSION_RAND_PART); // lgtm [js/insecure-randomness]
     begin = timestamp;
 
     isNew = true;
@@ -399,7 +391,7 @@ function sendTrackRequest(trackData) {
     );
     saveTrackRequestTime();
   } catch (err) {
-    utils.logError('Error on send data: ', err);
+    logError('Error on send data: ', err);
   }
 }
 
@@ -424,7 +416,7 @@ fntzAnalyticsAdapter.originEnableAnalytics = fntzAnalyticsAdapter.enableAnalytic
 
 fntzAnalyticsAdapter.enableAnalytics = function (config) {
   if (!config.options.id) {
-    utils.logError('Client ID (id) option is not defined. Analytics won\'t work');
+    logError('Client ID (id) option is not defined. Analytics won\'t work');
     return;
   }
 
diff --git a/modules/fledgeForGpt.js b/modules/fledgeForGpt.js
new file mode 100644
index 00000000000..0f7092baf03
--- /dev/null
+++ b/modules/fledgeForGpt.js
@@ -0,0 +1,52 @@
+/**
+ * Fledge modules is responsible for registering fledged auction configs into the GPT slot;
+ * GPT is resposible to run the fledge auction.
+ */
+import { config } from '../src/config.js';
+import { getHook } from '../src/hook.js';
+import { getGptSlotForAdUnitCode, logInfo, logWarn } from '../src/utils.js';
+
+const MODULE = 'fledgeForGpt'
+
+export let isEnabled = false;
+
+config.getConfig('fledgeForGpt', config => init(config.fledgeForGpt));
+
+/**
+  * Module init.
+  */
+export function init(cfg) {
+  if (cfg && cfg.enabled === true) {
+    if (!isEnabled) {
+      getHook('addComponentAuction').before(addComponentAuctionHook);
+      isEnabled = true;
+    }
+    logInfo(MODULE, `isEnabled`, cfg);
+  } else {
+    if (isEnabled) {
+      getHook('addComponentAuction').getHooks({hook: addComponentAuctionHook}).remove();
+      isEnabled = false;
+    }
+    logInfo(MODULE, `isDisabled`, cfg);
+  }
+}
+
+export function addComponentAuctionHook(next, bidRequest, componentAuctionConfig) {
+  const seller = componentAuctionConfig.seller;
+  const adUnitCode = bidRequest.adUnitCode;
+  const gptSlot = getGptSlotForAdUnitCode(adUnitCode);
+  if (gptSlot && gptSlot.setConfig) {
+    delete componentAuctionConfig.bidId;
+    gptSlot.setConfig({
+      componentAuction: [{
+        configKey: seller,
+        auctionConfig: componentAuctionConfig
+      }]
+    });
+    logInfo(MODULE, `register component auction config for: ${adUnitCode} x ${seller}: ${gptSlot.getAdUnitPath()}`, componentAuctionConfig);
+  } else {
+    logWarn(MODULE, `unable to register component auction config for: ${adUnitCode} x ${seller}.`);
+  }
+
+  next(bidRequest, componentAuctionConfig);
+}
diff --git a/modules/fledgeForGpt.md b/modules/fledgeForGpt.md
new file mode 100644
index 00000000000..3bb86cd5946
--- /dev/null
+++ b/modules/fledgeForGpt.md
@@ -0,0 +1,138 @@
+# Overview
+This module allows Prebid.js to support FLEDGE by integrating it with GPT's [experimental FLEDGE
+support](https://github.com/google/ads-privacy/tree/master/proposals/fledge-multiple-seller-testing).
+
+To learn more about FLEDGE in general, go [here](https://github.com/WICG/turtledove/blob/main/FLEDGE.md).
+
+This document covers the steps necessary for publishers to enable FLEDGE on their inventory. It also describes
+the changes Bid Adapters need to implement in order to support FLEDGE.
+
+## Publisher Integration
+Publishers wishing to enable FLEDGE support must do two things. First, they must compile Prebid.js with support for this module.
+This is accomplished by adding the `fledgeForGpt` module to the list of modules they are already using:
+
+```
+gulp build --modules=fledgeForGpt,...
+```
+
+Second, they must enable FLEDGE in their Prebid.js configuration. To provide a high degree of flexiblity for testing, FLEDGE
+settings exist at the module level, the bidder level, and the slot level.
+
+### Module Configuration
+This module exposes the following settings:
+
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+|enabled | Boolean |Enable/disable the module |Defaults to `false` |
+
+As noted above, FLEDGE support is disabled by default. To enable it, set the `enabled` value to `true` for this module
+using the `setConfig` method of Prebid.js:
+
+```js
+pbjs.que.push(function() {
+  pbjs.setConfig({
+    fledgeForGpt: {
+      enabled: true
+    }
+  });
+});
+```
+
+### Bidder Configuration
+This module adds the following setting for bidders:
+
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+| fledgeEnabled | Boolean | Enable/disable a bidder to participate in FLEDGE | Defaults to `false` |
+
+In addition to enabling FLEDGE at the module level, individual bidders must also be enabled. This allows publishers to
+selectively test with one or more bidders as they desire. To enable one or more bidders, use the `setBidderConfig` method
+of Prebid.js:
+
+```js
+pbjs.setBidderConfig({
+    bidders: ["openx"],
+    config: {
+        fledgeEnabled: true
+    }
+});
+```
+
+### AdUnit Configuration
+Enabling an adunit for FLEDGE eligibility is accomplished by setting an attribute of the `ortb2Imp` object for that
+adunit.
+
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+| ortb2Imp.ext.ae | Integer | Auction Environment: 1 indicates FLEDGE eligible, 0 indicates it is not | Absence indicates this is not FLEDGE eligible |
+
+The `ae` field stands for Auction Environment and was chosen to be consistent with the field that GAM passes to bidders
+in their Open Bidding and Exchange Bidding APIs. More details on that can be found
+[here](https://github.com/google/ads-privacy/tree/master/proposals/fledge-rtb#bid-request-changes-indicating-interest-group-auction-support)
+In practice, this looks as follows:
+
+```js
+pbjs.addAdUnits({
+    code: "my-adunit-div",
+    // other config here
+    ortb2Imp: {
+        ext: {
+            ae: 1
+        }
+    }
+});
+```
+
+## Bid Adapter Integration
+Chrome has enabled a two-tier auction in FLEDGE. This allows multiple sellers (frequently SSPs) to act on behalf of the publisher with
+a single entity serving as the final decision maker. In their [current approach](https://github.com/google/ads-privacy/tree/master/proposals/fledge-multiple-seller-testing),
+GPT has opted to run the final auction layer while allowing other SSPs/sellers to participate as
+[Component Auctions](https://github.com/WICG/turtledove/blob/main/FLEDGE.md#21-initiating-an-on-device-auction) which feed their
+bids to the final layer. To learn more about Component Auctions, go [here](https://github.com/WICG/turtledove/blob/main/FLEDGE.md#24-scoring-bids-in-component-auctions).
+
+The FLEDGE auction, including Component Auctions, are configured via an `AuctionConfig` object that defines the parameters of the auction for a given
+seller. This module enables FLEDGE support by allowing bid adaptors to return `AuctionConfig` objects in addition to bids. If a bid adaptor returns an
+`AuctionConfig` object, Prebid.js will register it with the appropriate GPT ad slot so the bidder can participate as a Component Auction in the overall
+FLEDGE auction for that slot. More details on the GPT API can be found [here](https://developers.google.com/publisher-tag/reference#googletag.config.componentauctionconfig).
+
+Modifying a bid adapter to support FLEDGE is a straightforward process and consists of the following steps:
+1. Detecting when a bid request is FLEDGE eligible
+2. Responding with AuctionConfig
+
+FLEDGE eligibility is made available to bid adapters through the `bidderRequest.fledgeEnabled` field.
+The [`bidderRequest`](https://docs.prebid.org/dev-docs/bidder-adaptor.html#bidderrequest-parameters) object is passed to
+the [`buildRequests`](https://docs.prebid.org/dev-docs/bidder-adaptor.html#building-the-request) method of an adapter. Bid adapters
+who wish to participate should read this flag and pass it to their server. FLEDGE eligibility depends on a number of parameters:
+
+1. Chrome enablement
+2. Publisher participatipon in the [Origin Trial](https://developer.chrome.com/docs/privacy-sandbox/unified-origin-trial/#configure)
+3. Publisher Prebid.js configuration (detailed above)
+
+When a bid request is FLEDGE enabled, a bid adapter can return a tuple consisting of bids and AuctionConfig objects rather than just a list of bids:
+
+```js
+function interpretResponse(resp, req) {
+    // Load the bids from the response - this is adapter specific
+    const bids = parseBids(resp);
+
+    // Load the auctionConfigs from the response - also adapter specific
+    const auctionConfigs = parseAuctionConfigs(resp);
+
+    if (auctionConfigs) {
+        // Return a tuple of bids and auctionConfigs. It is possible that bids could be null.
+        return {bids, auctionConfigs};
+    } else {
+        return bids;
+    }
+}
+```
+
+An AuctionConfig must be associated with an adunit and auction, and this is accomplished using the value in the `bidId` field from the objects in the
+`validBidRequests` array passed to the `buildRequests` function - see [here](https://docs.prebid.org/dev-docs/bidder-adaptor.html#ad-unit-params-in-the-validbidrequests-array)
+for more details. This means that the AuctionConfig objects returned from `interpretResponse` must contain a `bidId` field whose value corresponds to
+the request it should be associated with. This may raise the question: why isn't the AuctionConfig object returned as part of the bid? The
+answer is that it's possible to participate in the FLEDGE auction without returning a contextual bid.
+
+An example of this can be seen in the OpenX OpenRTB bid adapter [here](https://github.com/prebid/Prebid.js/blob/master/modules/openxOrtbBidAdapter.js#L327).
+
+Other than the addition of the `bidId` field, the AuctionConfig object should adhere to the requirements set forth in FLEDGE. The details of creating an   AuctionConfig object are beyond the scope of this document.
diff --git a/test/spec/adapters/adbutler_spec.js b/modules/flocIdSystem.js
similarity index 100%
rename from test/spec/adapters/adbutler_spec.js
rename to modules/flocIdSystem.js
diff --git a/modules/fluctBidAdapter.js b/modules/fluctBidAdapter.js
index 420fe04ddcb..004d44e6737 100644
--- a/modules/fluctBidAdapter.js
+++ b/modules/fluctBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { _each, isEmpty } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'fluct';
@@ -7,6 +7,16 @@ const VERSION = '1.2';
 const NET_REVENUE = true;
 const TTL = 300;
 
+/**
+ * See modules/userId/eids.js for supported sources
+ */
+const SUPPORTED_USER_ID_SOURCES = [
+  'adserver.org',
+  'criteo.com',
+  'intimatemerger.com',
+  'liveramp.com',
+];
+
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['adingo'],
@@ -29,18 +39,22 @@ export const spec = {
    */
   buildRequests: (validBidRequests, bidderRequest) => {
     const serverRequests = [];
-    const referer = bidderRequest.refererInfo.referer;
+    // TODO: is 'page' the right value here?
+    const referer = bidderRequest.refererInfo.page;
 
-    utils._each(validBidRequests, (request) => {
+    _each(validBidRequests, (request) => {
       const data = Object();
 
       data.referer = referer;
       data.adUnitCode = request.adUnitCode;
       data.bidId = request.bidId;
       data.transactionId = request.transactionId;
+      data.user = {
+        eids: (request.userIdAsEids || []).filter((eid) => SUPPORTED_USER_ID_SOURCES.indexOf(eid.source) !== -1)
+      };
 
       data.sizes = [];
-      utils._each(request.sizes, (size) => {
+      _each(request.sizes, (size) => {
         data.sizes.push({
           w: size[0],
           h: size[1]
@@ -49,9 +63,19 @@ export const spec = {
 
       data.params = request.params;
 
+      if (request.schain) {
+        data.schain = request.schain;
+      }
+
+      const searchParams = new URLSearchParams({
+        dfpUnitCode: request.params.dfpUnitCode,
+        tagId: request.params.tagId,
+        groupId: request.params.groupId,
+      });
+
       serverRequests.push({
         method: 'POST',
-        url: END_POINT,
+        url: END_POINT + '?' + searchParams.toString(),
         options: {
           contentType: 'application/json',
           withCredentials: true,
@@ -78,7 +102,7 @@ export const spec = {
     const bidResponses = [];
 
     const res = serverResponse.body;
-    if (!utils.isEmpty(res) && !utils.isEmpty(res.seatbid) && !utils.isEmpty(res.seatbid[0].bid)) {
+    if (!isEmpty(res) && !isEmpty(res.seatbid) && !isEmpty(res.seatbid[0].bid)) {
       const bid = res.seatbid[0].bid[0];
       const dealId = bid.dealid;
       const beaconUrl = bid.burl;
@@ -96,8 +120,11 @@ export const spec = {
         creativeId: bid.crid,
         ttl: TTL,
         ad: bid.adm + callImpBeacon,
+        meta: {
+          advertiserDomains: bid.adomain || [],
+        },
       };
-      if (!utils.isEmpty(dealId)) {
+      if (!isEmpty(dealId)) {
         data.dealId = dealId;
       }
       bidResponses.push(data);
diff --git a/modules/fpdModule/index.js b/modules/fpdModule/index.js
new file mode 100644
index 00000000000..0b0c0906f84
--- /dev/null
+++ b/modules/fpdModule/index.js
@@ -0,0 +1,53 @@
+/**
+ * This module sets default values and validates ortb2 first part data
+ * @module modules/firstPartyData
+ */
+import { config } from '../../src/config.js';
+import { module, getHook } from '../../src/hook.js';
+import {logError} from '../../src/utils.js';
+import {GreedyPromise} from '../../src/utils/promise.js';
+import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
+
+let submodules = [];
+
+export function registerSubmodules(submodule) {
+  submodules.push(submodule);
+}
+
+export function reset() {
+  submodules.length = 0;
+}
+
+export function processFpd({global = {}, bidder = {}} = {}) {
+  let modConf = config.getConfig('firstPartyData') || {};
+  let result = GreedyPromise.resolve({global, bidder});
+  submodules.sort((a, b) => {
+    return ((a.queue || 1) - (b.queue || 1));
+  }).forEach(submodule => {
+    result = result.then(
+      ({global, bidder}) => GreedyPromise.resolve(submodule.processFpd(modConf, {global, bidder}))
+        .catch((err) => {
+          logError(`Error in FPD module ${submodule.name}`, err);
+          return {};
+        })
+        .then((result) => ({global: result.global || global, bidder: result.bidder || bidder}))
+    );
+  });
+  return result;
+}
+
+export const startAuctionHook = timedAuctionHook('fpd', function startAuctionHook(fn, req) {
+  processFpd(req.ortb2Fragments).then((ortb2Fragments) => {
+    Object.assign(req.ortb2Fragments, ortb2Fragments);
+    fn.call(this, req);
+  })
+});
+
+function setupHook() {
+  getHook('startAuction').before(startAuctionHook, 10);
+}
+
+module('firstPartyData', registerSubmodules);
+
+// Runs setupHook on initial load
+setupHook();
diff --git a/modules/fpdModule/index.md b/modules/fpdModule/index.md
new file mode 100644
index 00000000000..638c966883a
--- /dev/null
+++ b/modules/fpdModule/index.md
@@ -0,0 +1,46 @@
+# Overview
+
+```
+Module Name: First Party Data Module
+```
+
+# Description
+
+Module to perform the following functions to allow for consistent set of first party data using the following submodules.
+
+Enrichment Submodule:
+- populate available data into object: referer, meta-keywords, cur
+
+Validation Submodule:
+- verify OpenRTB datatypes, remove/warn any that are likely to choke downstream readers
+- verify that certain OpenRTB attributes are not specified
+- optionally suppress user FPD based on the existence of _pubcid_optout
+
+
+1. Module initializes on first load and set bidRequestHook 
+2. When hook runs, corresponding submodule init functions are run to perform enrichments/validations dependant on submodule
+3. After hook complete, it is disabled - meaning module only runs on first auction
+4. To reinitiate the module, run pbjs.refreshFPD(), which allows module to rerun as if initial load
+
+
+This module will automatically run first party data enrichments and validations dependant on which submodules are included. There is no configuration required. In order to load the module and submodule(s) and opt out of either enrichements or validations, use the below opt out configuration
+
+# Module Control Configuration
+
+```
+
+pbjs.setConfig({
+    firstPartyData: {
+        skipValidations: true, // default to false
+        skipEnrichments: true // default to false
+    }
+});
+
+```
+
+# Requirements
+
+At least one of the submodules must be included in order to successfully run the corresponding above operations.
+
+enrichmentFpdModule
+validationFpdModule
\ No newline at end of file
diff --git a/modules/freewheel-sspBidAdapter.js b/modules/freewheel-sspBidAdapter.js
index 5e3717ce1fe..764e3d6e6c0 100644
--- a/modules/freewheel-sspBidAdapter.js
+++ b/modules/freewheel-sspBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { logWarn, isArray } from '../src/utils.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
@@ -72,12 +72,45 @@ function getPricing(xmlNode) {
       price: priceNode.textContent || priceNode.innerText
     };
   } else {
-    utils.logWarn('PREBID - ' + BIDDER_CODE + ': Can\'t get pricing data. Is price awareness enabled?');
+    logWarn('PREBID - ' + BIDDER_CODE + ': No bid received or missing pricing extension.');
   }
 
   return princingData;
 }
 
+/*
+* Read the StickyBrand extension with this format:
+* <Extension type='StickyBrand'>
+*   <Domain><![CDATA[minotaur.com]]></Domain>
+*   <Sector><![CDATA[BEAUTY & HYGIENE]]></Sector>
+*   <Advertiser><![CDATA[James Bond Trademarks]]></Advertiser>
+*   <Brand><![CDATA[007 Seven]]></Brand>
+* </Extension>
+* @return {object} pricing data in format: {currency: "EUR", price:"1.000"}
+*/
+function getAdvertiserDomain(xmlNode) {
+  var domain = [];
+  var brandExtNode;
+  var extensions = xmlNode.querySelectorAll('Extension');
+  // Nodelist.forEach is not supported in IE and Edge
+  // Workaround given here https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10638731/
+  Array.prototype.forEach.call(extensions, function(node) {
+    if (node.getAttribute('type') === 'StickyBrand') {
+      brandExtNode = node;
+    }
+  });
+
+  // Currently we only return one Domain
+  if (brandExtNode) {
+    var domainNode = brandExtNode.querySelector('Domain');
+    domain.push(domainNode.textContent || domainNode.innerText);
+  } else {
+    logWarn('PREBID - ' + BIDDER_CODE + ': No bid received or missing StickyBrand extension.');
+  }
+
+  return domain;
+}
+
 function hashcode(inputString) {
   var hash = 0;
   var char;
@@ -102,22 +135,49 @@ function getCreativeId(xmlNode) {
   return creaId;
 }
 
-function getDealId(xmlNode) {
-  var dealId = '';
+function getValueFromKeyInImpressionNode(xmlNode, key) {
+  var value = '';
   var impNodes = xmlNode.querySelectorAll('Impression'); // Nodelist.forEach is not supported in IE and Edge
-  // Workaround given here https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10638731/
-
+  var isRootViewKeyPresent = false;
+  var isAdsDisplayStartedPresent = false;
   Array.prototype.forEach.call(impNodes, function (el) {
-    var queries = el.textContent.substring(el.textContent.indexOf('?') + 1).split('&');
+    if (isRootViewKeyPresent && isAdsDisplayStartedPresent) {
+      return value;
+    }
+    isRootViewKeyPresent = false;
+    isAdsDisplayStartedPresent = false;
+    var text = el.textContent;
+    var queries = text.substring(el.textContent.indexOf('?') + 1).split('&');
+    var tempValue = '';
     Array.prototype.forEach.call(queries, function (item) {
       var split = item.split('=');
-      if (split[0] == 'dealId') {
-        dealId = split[1];
+      if (split[0] == key) {
+        tempValue = split[1];
+      }
+      if (split[0] == 'reqType' && split[1] == 'AdsDisplayStarted') {
+        isAdsDisplayStartedPresent = true;
+      }
+      if (split[0] == 'rootViewKey') {
+        isRootViewKeyPresent = true;
       }
     });
+    if (isAdsDisplayStartedPresent) {
+      value = tempValue;
+    }
   });
+  return value;
+}
+
+function getDealId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'dealId');
+}
+
+function getBannerId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'adId');
+}
 
-  return dealId;
+function getCampaignId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'campaignId');
 }
 
 /**
@@ -162,7 +222,7 @@ function formatAdHTML(bid, size) {
   var libUrl = '';
   if (integrationType && integrationType !== 'inbanner') {
     libUrl = PRIMETIME_URL + getComponentId(bid.params.format) + '.min.js';
-    script = getOutstreamScript(bid, size);
+    script = getOutstreamScript(bid);
   } else {
     libUrl = MUSTANG_URL;
     script = getInBannerScript(bid, size);
@@ -233,7 +293,7 @@ var getOutstreamScript = function(bid) {
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
-  aliases: ['stickyadstv'], //  former name for freewheel-ssp
+  aliases: ['stickyadstv', 'freewheelssp'], //  aliases for freewheel-ssp
   /**
   * Determines whether or not the given bid request is valid.
   *
@@ -285,6 +345,12 @@ export const spec = {
         requestParams._fw_us_privacy = bidderRequest.uspConsent;
       }
 
+      // Add schain object
+      var schain = currentBidRequest.schain;
+      if (schain) {
+        requestParams.schain = schain;
+      }
+
       var vastParams = currentBidRequest.params.vastUrlParams;
       if (typeof vastParams === 'object') {
         for (var key in vastParams) {
@@ -294,7 +360,7 @@ export const spec = {
         }
       }
 
-      var location = (bidderRequest && bidderRequest.refererInfo) ? bidderRequest.refererInfo.referer : getTopMostWindow().location.href;
+      var location = bidderRequest?.refererInfo?.page;
       if (isValidUrl(location)) {
         requestParams.loc = location;
       }
@@ -302,7 +368,7 @@ export const spec = {
       var playerSize = [];
       if (currentBidRequest.mediaTypes.video && currentBidRequest.mediaTypes.video.playerSize) {
         // If mediaTypes is video, get size from mediaTypes.video.playerSize per http://prebid.org/blog/pbjs-3
-        if (utils.isArray(currentBidRequest.mediaTypes.video.playerSize[0])) {
+        if (isArray(currentBidRequest.mediaTypes.video.playerSize[0])) {
           playerSize = currentBidRequest.mediaTypes.video.playerSize[0];
         } else {
           playerSize = currentBidRequest.mediaTypes.video.playerSize;
@@ -344,7 +410,7 @@ export const spec = {
     var playerSize = [];
     if (bidrequest.mediaTypes.video && bidrequest.mediaTypes.video.playerSize) {
       // If mediaTypes is video, get size from mediaTypes.video.playerSize per http://prebid.org/blog/pbjs-3
-      if (utils.isArray(bidrequest.mediaTypes.video.playerSize[0])) {
+      if (isArray(bidrequest.mediaTypes.video.playerSize[0])) {
         playerSize = bidrequest.mediaTypes.video.playerSize[0];
       } else {
         playerSize = bidrequest.mediaTypes.video.playerSize;
@@ -366,15 +432,18 @@ export const spec = {
       var parser = new DOMParser();
       xmlDoc = parser.parseFromString(serverResponse, 'application/xml');
     } catch (err) {
-      utils.logWarn('Prebid.js - ' + BIDDER_CODE + ' : ' + err);
+      logWarn('Prebid.js - ' + BIDDER_CODE + ' : ' + err);
       return;
     }
 
     const princingData = getPricing(xmlDoc);
     const creativeId = getCreativeId(xmlDoc);
     const dealId = getDealId(xmlDoc);
-
+    const campaignId = getCampaignId(xmlDoc);
+    const bannerId = getBannerId(xmlDoc);
     const topWin = getTopMostWindow();
+    const advertiserDomains = getAdvertiserDomain(xmlDoc);
+
     if (!topWin.freewheelssp_cache) {
       topWin.freewheelssp_cache = {};
     }
@@ -392,7 +461,10 @@ export const spec = {
         currency: princingData.currency,
         netRevenue: true,
         ttl: 360,
-        dealId: dealId
+        meta: { advertiserDomains: advertiserDomains },
+        dealId: dealId,
+        campaignId: campaignId,
+        bannerId: bannerId
       };
 
       if (bidrequest.mediaTypes.video) {
@@ -407,16 +479,31 @@ export const spec = {
     return bidResponses;
   },
 
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, responses, gdprConsent, usPrivacy) {
+    var gdprParams = '';
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `?gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    const syncs = [];
     if (syncOptions && syncOptions.pixelEnabled) {
-      return [{
+      syncs.push({
         type: 'image',
-        url: USER_SYNC_URL
-      }];
-    } else {
-      return [];
+        url: USER_SYNC_URL + gdprParams
+      });
+    } else if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: USER_SYNC_URL + gdprParams
+      });
     }
+
+    return syncs;
   },
+};
 
-}
 registerBidder(spec);
diff --git a/modules/freewheel-sspBidAdapter.md b/modules/freewheel-sspBidAdapter.md
index 0086aac6567..a445280f2b0 100644
--- a/modules/freewheel-sspBidAdapter.md
+++ b/modules/freewheel-sspBidAdapter.md
@@ -22,7 +22,7 @@ Module that connects to Freewheel ssp's demand sources
 
                bids: [
                    {
-                       bidder: "freewheel-ssp",
+                       bidder: "freewheelssp", // or use alias "freewheel-ssp"
                        params: {
                            zoneId : '277225'
                        }
diff --git a/modules/ftrackIdSystem.js b/modules/ftrackIdSystem.js
new file mode 100644
index 00000000000..244807a3164
--- /dev/null
+++ b/modules/ftrackIdSystem.js
@@ -0,0 +1,227 @@
+/**
+ * This module adds ftrack to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/ftrack
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { uspDataHandler } from '../src/adapterManager.js';
+import { loadExternalScript } from '../src/adloader.js';
+
+const MODULE_NAME = 'ftrackId';
+const LOG_PREFIX = 'FTRACK - ';
+const LOCAL_STORAGE_EXP_DAYS = 30;
+const VENDOR_ID = null;
+const LOCAL_STORAGE = 'html5';
+const FTRACK_STORAGE_NAME = 'ftrackId';
+const FTRACK_PRIVACY_STORAGE_NAME = `${FTRACK_STORAGE_NAME}_privacy`;
+const storage = getStorageManager({gvlid: VENDOR_ID, moduleName: MODULE_NAME});
+
+let consentInfo = {
+  gdpr: {
+    applies: 0,
+    consentString: null,
+    pd: null
+  },
+  usPrivacy: {
+    value: null
+  }
+};
+
+/** @type {Submodule} */
+export const ftrackIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: `ftrack`,
+
+  /**
+   * Decodes the 'value'
+   * @function decode (required method)
+   * @param {(Object|string)} value
+   * @param {SubmoduleConfig|undefined} config
+   * @returns {(Object|undefined)} an object with the key being ideally camel case
+   *   similar to the module name and ending in id or Id
+   */
+  decode (value, config) {
+    if (!value) {
+      return;
+    };
+
+    const DECODE_RESPONSE = {
+      ftrackId: {
+        uid: '',
+        ext: {}
+      }
+    }
+
+    // Loop over the value's properties:
+    // -- if string, assign value as is.
+    // -- if array, convert to string then assign value.
+    // -- If neither type, assign value as empty string
+    for (var key in value) {
+      let keyValue = value[key];
+      if (Array.isArray(keyValue)) {
+        keyValue = keyValue.join('|');
+      } else if (typeof value[key] !== 'string') {
+        // Unexpected value type, should be string or array
+        keyValue = '';
+      }
+
+      DECODE_RESPONSE.ftrackId.ext[key] = keyValue;
+    }
+
+    // If we have DeviceId value, assign it to the uid property
+    if (DECODE_RESPONSE.ftrackId.ext.hasOwnProperty('DeviceID')) {
+      DECODE_RESPONSE.ftrackId.uid = DECODE_RESPONSE.ftrackId.ext.DeviceID;
+    }
+
+    return DECODE_RESPONSE;
+  },
+
+  /**
+   * performs action(s) to obtain ids from D9 and return the Device IDs
+   * should be the only method that gets a new ID (from ajax calls or a cookie/local storage)
+   * @function getId (required method)
+   * @param {SubmoduleConfig} config
+   * @param {ConsentData} consentData
+   * @param {(Object|undefined)} cacheIdObj
+   * @returns {IdResponse|undefined} A response object that contains id and/or callback.
+   */
+  getId (config, consentData, cacheIdObj) {
+    if (this.isConfigOk(config) === false || this.isThereConsent(consentData) === false) return undefined;
+
+    return {
+      callback: function (cb) {
+        window.D9v = {
+          UserID: '99999999999999',
+          CampID: '3175',
+          CCampID: '148556'
+        };
+        window.D9r = {
+          callback: function(response) {
+            if (response) {
+              storage.setDataInLocalStorage(`${FTRACK_STORAGE_NAME}_exp`, (new Date(Date.now() + (1000 * 60 * 60 * 24 * LOCAL_STORAGE_EXP_DAYS))).toUTCString());
+              storage.setDataInLocalStorage(`${FTRACK_STORAGE_NAME}`, JSON.stringify(response));
+
+              storage.setDataInLocalStorage(`${FTRACK_PRIVACY_STORAGE_NAME}_exp`, (new Date(Date.now() + (1000 * 60 * 60 * 24 * LOCAL_STORAGE_EXP_DAYS))).toUTCString());
+              storage.setDataInLocalStorage(`${FTRACK_PRIVACY_STORAGE_NAME}`, JSON.stringify(consentInfo));
+            };
+
+            if (typeof cb === 'function') cb(response);
+
+            return response;
+          }
+        };
+
+        // 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;
+          }
+        }
+
+        // Creates an async script element and appends it to the document
+        loadExternalScript(config.params.url, MODULE_NAME);
+      }
+    };
+  },
+
+  /**
+   * Called when IDs are already in localStorage
+   * should just be adding additional data to the cacheIdObj object
+   * @function extendId (optional method)
+   * @param {SubmoduleConfig} config
+   * @param {ConsentData} consentData
+   * @param {(Object|undefined)} cacheIdObj
+   * @returns {IdResponse|undefined}
+   */
+  extendId (config, consentData, cacheIdObj) {
+    this.isConfigOk(config);
+    return cacheIdObj;
+  },
+
+  /*
+   * Validates the config, if it is not correct, then info cannot be saved in localstorage
+   * @function isConfigOk
+   * @param {SubmoduleConfig} config from HTML
+   * @returns {true|false}
+   */
+  isConfigOk: function(config) {
+    if (!config.storage || !config.storage.type || !config.storage.name) {
+      utils.logError(LOG_PREFIX + 'config.storage required to be set.');
+      return false;
+    }
+
+    // in a future release, we may return false if storage type or name are not set as required
+    if (config.storage.type !== LOCAL_STORAGE) {
+      utils.logWarn(LOG_PREFIX + 'config.storage.type recommended to be "' + LOCAL_STORAGE + '".');
+    }
+    // in a future release, we may return false if storage type or name are not set as required
+    if (config.storage.name !== FTRACK_STORAGE_NAME) {
+      utils.logWarn(LOG_PREFIX + 'config.storage.name recommended to be "' + FTRACK_STORAGE_NAME + '".');
+    }
+
+    if (!config.hasOwnProperty('params') || !config.params.hasOwnProperty('url')) {
+      utils.logWarn(LOG_PREFIX + 'config.params.url is required for ftrack to run.');
+      return false;
+    }
+
+    return true;
+  },
+
+  isThereConsent: function(consentData) {
+    let consentValue = true;
+
+    /*
+     * Scenario 1: GDPR
+     *   if GDPR Applies is true|1, we do not have consent
+     *   if GDPR Applies does not exist or is false|0, we do not NOT have consent
+     */
+    if (consentData && consentData.gdprApplies && (consentData.gdprApplies === true || consentData.gdprApplies === 1)) {
+      consentInfo.gdpr.applies = 1;
+      consentValue = false;
+    }
+    // If consentString exists, then we store it even though we are not using it
+    if (consentData && consentData.consentString !== 'undefined' && !utils.isEmpty(consentData.consentString) && !utils.isEmptyStr(consentData.consentString)) {
+      consentInfo.gdpr.consentString = consentData.consentString;
+    }
+
+    /*
+     * Scenario 2: CCPA/us_privacy
+     *   if usp exists (assuming this check determines the location of the device to be within the California)
+     *     parse the us_privacy string to see if we have consent
+     *     for version 1 of us_privacy strings, if 'Opt-Out Sale' is 'Y' we do not track
+     */
+    const usp = uspDataHandler.getConsentData();
+    let usPrivacyVersion;
+    // let usPrivacyOptOut;
+    let usPrivacyOptOutSale;
+    // let usPrivacyLSPA;
+    if (typeof usp !== 'undefined' && !utils.isEmpty(usp) && !utils.isEmptyStr(usp)) {
+      consentInfo.usPrivacy.value = usp;
+      usPrivacyVersion = usp[0];
+      // usPrivacyOptOut = usp[1];
+      usPrivacyOptOutSale = usp[2];
+      // usPrivacyLSPA = usp[3];
+    }
+    if (usPrivacyVersion == 1 && usPrivacyOptOutSale === 'Y') consentValue = false;
+
+    return consentValue;
+  }
+};
+
+submodule('userId', ftrackIdSubmodule);
diff --git a/modules/ftrackIdSystem.md b/modules/ftrackIdSystem.md
new file mode 100644
index 00000000000..24a8dbd08b6
--- /dev/null
+++ b/modules/ftrackIdSystem.md
@@ -0,0 +1,97 @@
+# Flashtalking's FTrack Identity Framework User ID Module
+
+*The FTrack Identity Framework User ID Module allows publishers to take advantage of Flashtalking's FTrack ID during the bidding process.*
+
+### [FTrack](https://www.flashtalking.com/identity-framework#FTrack)
+
+Flashtalking’s cookieless tracking technology uses probabilistic device recognition to derive a privacy-friendly persistent ID for each device.
+
+**ANTI-FINGERPRINTING**  
+FTrack operates in strict compliance with [Google’s definition of anti-fingerprinting](https://blog.google/products/ads-commerce/2021-01-privacy-sandbox/). FTrack does not access PII or sensitive information and provides consumers with notification and choice on every impression. We do not participate in the types of activities that most concern privacy advocates (profiling consumers, building audience segments, and/or monetizing consumer data).
+
+**GDPR COMPLIANT**  
+Flashtalking is integrated with the IAB EU’s Transparency & Consent Framework (TCF) and operates on a Consent legal basis where required.  As a Data Processor under GDPR, Flashtalking does not combine data across customers nor sell data to third parties.
+
+---
+
+### Support or Maintenance:
+
+Questions? Comments? Bugs? Praise? Please contact FlashTalking's Prebid Support at [prebid-support@flashtalking.com](mailto:prebid-support@flashtalking.com)
+
+---
+
+### FTrack User ID Configuration
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'FTrack',
+      params: {
+        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
+        name: 'FTrackId',        // "FTrackId" is the required storage name
+        expires: 90,             // storage lasts for 90 days
+        refreshInSeconds: 8*3600 // refresh ID every 8 hours to ensure it's fresh
+      }
+    }],
+    auctionDelay: 50             // 50ms maximum auction delay, applies to all userId modules
+  }
+});
+```
+
+| 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"` |
+| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. FTrack recommends `90`. | `90` |
+| storage.refreshInSeconds | Optional | Integer | How many seconds until the FTrack ID will be refreshed. FTrack strongly recommends 8 hours between refreshes | `8*3600` |
+
+---
+
+### Privacy Policies.
+
+Complete information available on the Flashtalking [privacy policy page](https://www.flashtalking.com/privacypolicy).
+
+#### OPTING OUT OF INTEREST-BASED ADVERTISING & COLLECTION OF PERSONAL INFORMATION
+
+Please visit our [Opt Out Page](https://www.flashtalking.com/optout).
+
+#### REQUEST REMOVAL OF YOUR PERSONAL DATA (WHERE APPLICABLE)
+
+You may request by emailing [mailto:privacy@flashtalking.com](privacy@flashtalking.com).
+
+#### GDPR
+
+In its current state, Flashtalking’s FTrack Identity Framework User ID Module does not create an ID if a user's consentData is "truthy" (true, 1). In other words, if GDPR applies in any way to a user, FTrack does not create an ID. 
+
+---
+
+### If you are using pbjs.getUserIdsAsEids():
+
+Please note that the `uids` value is a stringified object of the IDs so publishers will need to `JSON.parse()` the value in order to use it:
+
+```
+{
+    "HHID": ["<USERS HH ID>"],
+    "DeviceID": ["<USERS DEVICE ID>"],
+    "SingleDeviceID": ["USERS SINGLE DEVICE ID"]
+}
+```
\ No newline at end of file
diff --git a/modules/fyberBidAdapter.md b/modules/fyberBidAdapter.md
deleted file mode 100644
index c394addadfe..00000000000
--- a/modules/fyberBidAdapter.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Overview
-
-```
-Module Name: Fyber Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: uri@inner-active.com
-```
-
-# Description
-
-Module that connects to Fyber's demand sources
-
-# Test Parameters
-```
-var adUnits = [
-{
-code: 'test-div',
-mediaTypes: {
-banner: {
-sizes: [[300, 250]],  // a display rectangle size
-}
-},
-bids: [
-{
-bidder: 'fyber',
-    params: {
-        APP_ID: 'MyCompany_MyApp',
-        spotType: 'rectangle',
-        customParams: {
-            portal: 7002
-        }
-    }
-}
-]
-},{
-code: 'test-div',
-mediaTypes: {
-banner: {
-sizes: [[320, 50]],   // a banner size
-}
-},
-bids: [
-{
-bidder: 'fyber',
-    params: {
-        APP_ID: 'MyCompany_MyApp',
-        spotType: 'banner',
-        customParams: {
-            portal: 7001
-        }
-    }
-}
-]
-}
-];
-```
diff --git a/modules/gammaBidAdapter.js b/modules/gammaBidAdapter.js
index 5fd3c56b2c6..279eb78812e 100644
--- a/modules/gammaBidAdapter.js
+++ b/modules/gammaBidAdapter.js
@@ -27,7 +27,7 @@ export const spec = {
    */
   buildRequests: function(bidRequests, bidderRequest) {
     const serverRequests = [];
-    const bidderRequestReferer = (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) || '';
+    const bidderRequestReferer = bidderRequest?.refererInfo?.page || '';
     for (var i = 0, len = bidRequests.length; i < len; i++) {
       const gaxObjParams = bidRequests[i];
       serverRequests.push({
@@ -84,7 +84,10 @@ function newBid(serverBid) {
     mediaType: serverBid.type,
     netRevenue: true,
     requestId: serverBid.id,
-    ttl: serverBid.seatbid[0].bid[0].ttl || 300
+    ttl: serverBid.seatbid[0].bid[0].ttl || 300,
+    meta: {
+      advertiserDomains: serverBid.seatbid[0].bid[0].adomain && serverBid.seatbid[0].bid[0].adomain.length ? serverBid.seatbid[0].bid[0].adomain : []
+    }
   };
 
   if (serverBid.type == 'video') {
diff --git a/modules/gamoshiBidAdapter.js b/modules/gamoshiBidAdapter.js
index 1316d74e430..ae320db1251 100644
--- a/modules/gamoshiBidAdapter.js
+++ b/modules/gamoshiBidAdapter.js
@@ -1,8 +1,20 @@
-import * as utils from '../src/utils.js';
+import {
+  deepAccess,
+  deepSetValue,
+  getDNT,
+  inIframe,
+  isArray,
+  isFn,
+  isNumber,
+  isPlainObject,
+  isStr,
+  logError,
+  logWarn
+} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {includes} from '../src/polyfill.js';
 
 const ENDPOINTS = {
   'gamoshi': 'https://rtb.gamoshi.io'
@@ -21,11 +33,6 @@ export const helper = {
   startsWith: function (str, search) {
     return str.substr(0, search.length) === search;
   },
-  getTopWindowDomain: function (url) {
-    const domainStart = url.indexOf('://') + '://'.length;
-    return url.substring(domainStart, url.indexOf('/', domainStart) < 0 ? url.length : url.indexOf('/', domainStart));
-  },
-
   getMediaType: function (bid) {
     if (bid.ext) {
       if (bid.ext.media_type) {
@@ -37,19 +44,36 @@ export const helper = {
       }
     }
     return BANNER;
+  },
+  getBidFloor(bid) {
+    if (!isFn(bid.getFloor)) {
+      return bid.params.bidfloor ? bid.params.bidfloor : null;
+    }
+
+    let bidFloor = bid.getFloor({
+      mediaType: '*',
+      size: '*',
+      currency: 'USD'
+    });
+
+    if (isPlainObject(bidFloor) && !isNaN(bidFloor.floor) && bidFloor.currency === 'USD') {
+      return bidFloor.floor;
+    }
+
+    return null;
   }
 };
 
 export const spec = {
   code: 'gamoshi',
-  aliases: ['gambid', 'cleanmedia', '9MediaOnline'],
+  aliases: ['gambid', '9MediaOnline'],
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {
-    return !!bid.params.supplyPartnerId && utils.isStr(bid.params.supplyPartnerId) &&
-      (!bid.params['rtbEndpoint'] || utils.isStr(bid.params['rtbEndpoint'])) &&
-      (!bid.params.bidfloor || utils.isNumber(bid.params.bidfloor)) &&
-      (!bid.params['adpos'] || utils.isNumber(bid.params['adpos'])) &&
+    return !!bid.params.supplyPartnerId && isStr(bid.params.supplyPartnerId) &&
+      (!bid.params['rtbEndpoint'] || isStr(bid.params['rtbEndpoint'])) &&
+      (!bid.params.bidfloor || isNumber(bid.params.bidfloor)) &&
+      (!bid.params['adpos'] || isNumber(bid.params['adpos'])) &&
       (!bid.params['protocols'] || Array.isArray(bid.params['protocols'])) &&
       (!bid.params.instl || bid.params.instl === 0 || bid.params.instl === 1);
   },
@@ -59,18 +83,16 @@ export const spec = {
       const {adUnitCode, auctionId, mediaTypes, params, sizes, transactionId} = bidRequest;
       const baseEndpoint = params['rtbEndpoint'] || ENDPOINTS['gamoshi'];
       const rtbEndpoint = `${baseEndpoint}/r/${params.supplyPartnerId}/bidr?rformat=open_rtb&reqformat=rtb_json&bidder=prebid` + (params.query ? '&' + params.query : '');
-      let url = config.getConfig('pageUrl') || bidderRequest.refererInfo.referer;
-
       const rtbBidRequest = {
         id: auctionId,
         site: {
-          domain: helper.getTopWindowDomain(url),
-          page: url,
-          ref: bidderRequest.refererInfo.referer
+          domain: bidderRequest.refererInfo.domain,
+          page: bidderRequest.refererInfo.page,
+          ref: bidderRequest.refererInfo.ref
         },
         device: {
           ua: navigator.userAgent,
-          dnt: utils.getDNT() ? 1 : 0,
+          dnt: getDNT() ? 1 : 0,
           h: screen.height,
           w: screen.width,
           language: navigator.language
@@ -81,37 +103,31 @@ export const spec = {
         source: {ext: {}},
         regs: {ext: {}}
       };
-      const gdprConsent = bidderRequest.gdprConsent;
 
-      if (gdprConsent && gdprConsent.consentString && gdprConsent.gdprApplies) {
-        rtbBidRequest.ext.gdpr_consent = {
-          consent_string: gdprConsent.consentString,
-          consent_required: gdprConsent.gdprApplies
-        };
-
-        utils.deepSetValue(rtbBidRequest, 'regs.ext.gdpr', gdprConsent.gdprApplies === true ? 1 : 0);
-        utils.deepSetValue(rtbBidRequest, 'user.ext.consent', gdprConsent.consentString);
-      }
+      const gdprConsent = getGdprConsent(bidderRequest);
+      rtbBidRequest.ext.gdpr_consent = gdprConsent;
+      deepSetValue(rtbBidRequest, 'regs.ext.gdpr', gdprConsent.consent_required === true ? 1 : 0);
+      deepSetValue(rtbBidRequest, 'user.ext.consent', gdprConsent.consent_string);
 
       if (validBidRequests[0].schain) {
-        utils.deepSetValue(rtbBidRequest, 'source.ext.schain', validBidRequests[0].schain);
+        deepSetValue(rtbBidRequest, 'source.ext.schain', validBidRequests[0].schain);
       }
 
       if (bidderRequest && bidderRequest.uspConsent) {
-        utils.deepSetValue(rtbBidRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+        deepSetValue(rtbBidRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
       }
 
       const imp = {
         id: transactionId,
-        instl: params.instl === 1 ? 1 : 0,
+        instl: deepAccess(bidderRequest.ortb2Imp, 'instl') === 1 || params.instl === 1 ? 1 : 0,
         tagid: adUnitCode,
-        bidfloor: params.bidfloor || 0,
+        bidfloor: helper.getBidFloor(bidRequest) || 0,
         bidfloorcur: 'USD',
         secure: 1
       };
 
       const hasFavoredMediaType =
-        params.favoredMediaType && this.supportedMediaTypes.includes(params.favoredMediaType);
+        params.favoredMediaType && includes(this.supportedMediaTypes, params.favoredMediaType);
 
       if (!mediaTypes || mediaTypes.banner) {
         if (!hasFavoredMediaType || params.favoredMediaType === BANNER) {
@@ -119,8 +135,8 @@ export const spec = {
             banner: {
               w: sizes.length ? sizes[0][0] : 300,
               h: sizes.length ? sizes[0][1] : 250,
-              pos: params.pos || 0,
-              topframe: utils.inIframe() ? 0 : 1
+              pos: deepAccess(bidderRequest, 'mediaTypes.banner.pos') || params.pos || 0,
+              topframe: inIframe() ? 0 : 1
             }
           });
           rtbBidRequest.imp.push(bannerImp);
@@ -132,18 +148,26 @@ export const spec = {
           const playerSize = mediaTypes.video.playerSize || sizes;
           const videoImp = Object.assign({}, imp, {
             video: {
-              protocols: params.protocols || [1, 2, 3, 4, 5, 6],
-              pos: params.pos || 0,
+              protocols: bidRequest.mediaTypes.video.protocols || params.protocols || [1, 2, 3, 4, 5, 6],
+              pos: deepAccess(bidRequest, 'mediaTypes.video.pos') || params.pos || 0,
               ext: {
                 context: mediaTypes.video.context
-              }
+              },
+              mimes: bidRequest.mediaTypes.video.mimes,
+              maxduration: bidRequest.mediaTypes.video.maxduration,
+              api: bidRequest.mediaTypes.video.api,
+              skip: bidRequest.mediaTypes.video.skip || bidRequest.params.video.skip,
+              placement: bidRequest.mediaTypes.video.placement || bidRequest.params.video.placement,
+              minduration: bidRequest.mediaTypes.video.minduration || bidRequest.params.video.minduration,
+              playbackmethod: bidRequest.mediaTypes.video.playbackmethod || bidRequest.params.video.playbackmethod,
+              startdelay: bidRequest.mediaTypes.video.startdelay || bidRequest.params.video.startdelay
             }
           });
 
-          if (utils.isArray(playerSize[0])) {
+          if (isArray(playerSize[0])) {
             videoImp.video.w = playerSize[0][0];
             videoImp.video.h = playerSize[0][1];
-          } else if (utils.isNumber(playerSize[0])) {
+          } else if (isNumber(playerSize[0])) {
             videoImp.video.w = playerSize[0];
             videoImp.video.h = playerSize[1];
           } else {
@@ -157,8 +181,9 @@ export const spec = {
 
       let eids = [];
       if (bidRequest && bidRequest.userId) {
-        addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id`), 'id5-sync.com', 'ID5ID');
-        addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.tdid`), 'adserver.org', 'TDID');
+        addExternalUserId(eids, deepAccess(bidRequest, `userId.id5id.uid`), 'id5-sync.com', 'ID5ID');
+        addExternalUserId(eids, deepAccess(bidRequest, `userId.tdid`), 'adserver.org', 'TDID');
+        addExternalUserId(eids, deepAccess(bidRequest, `userId.idl_env`), 'liveramp.com', 'idl');
       }
       if (eids.length > 0) {
         rtbBidRequest.user.ext.eids = eids;
@@ -180,7 +205,7 @@ export const spec = {
   interpretResponse: function (serverResponse, bidRequest) {
     const response = serverResponse && serverResponse.body;
     if (!response) {
-      utils.logError('empty response');
+      logError('empty response');
       return [];
     }
 
@@ -197,14 +222,20 @@ export const spec = {
         creativeId: bid.crid || bid.adid,
         netRevenue: true,
         currency: bid.cur || response.cur,
-        mediaType: helper.getMediaType(bid)
+        mediaType: helper.getMediaType(bid),
       };
 
-      if (utils.deepAccess(bidRequest.bidRequest, 'mediaTypes.' + outBid.mediaType)) {
+      if (bid.adomain && bid.adomain.length) {
+        outBid.meta = {
+          advertiserDomains: bid.adomain
+        }
+      }
+
+      if (deepAccess(bidRequest.bidRequest, 'mediaTypes.' + outBid.mediaType)) {
         if (outBid.mediaType === BANNER) {
           outBids.push(Object.assign({}, outBid, {ad: bid.adm}));
         } else if (outBid.mediaType === VIDEO) {
-          const context = utils.deepAccess(bidRequest.bidRequest, 'mediaTypes.video.context');
+          const context = deepAccess(bidRequest.bidRequest, 'mediaTypes.video.context');
           outBids.push(Object.assign({}, outBid, {
             vastUrl: bid.ext.vast_url,
             vastXml: bid.adm,
@@ -228,7 +259,7 @@ export const spec = {
     let gdpr = gdprApplies ? 1 : 0;
 
     if (gdprApplies && gdprConsent.consentString) {
-      consentString = encodeURIComponent(gdprConsent.consentString)
+      consentString = encodeURIComponent(gdprConsent.consentString);
     }
 
     if (uspConsent) {
@@ -283,7 +314,7 @@ function newRenderer(bidRequest, bid, rendererOptions = {}) {
   try {
     renderer.setRender(renderOutstream);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
+    logWarn('Prebid Error calling setRender on renderer', err);
   }
   return renderer;
 }
@@ -309,7 +340,7 @@ function renderOutstream(bid) {
 }
 
 function addExternalUserId(eids, value, source, rtiPartner) {
-  if (utils.isStr(value)) {
+  if (isStr(value)) {
     eids.push({
       source,
       uids: [{
@@ -329,4 +360,20 @@ function replaceMacros(url, macros) {
     .replace('[US_PRIVACY]', macros.uspConsent);
 }
 
+function getGdprConsent(bidderRequest) {
+  const gdprConsent = bidderRequest.gdprConsent;
+
+  if (gdprConsent && gdprConsent.consentString && gdprConsent.gdprApplies) {
+    return {
+      consent_string: gdprConsent.consentString,
+      consent_required: gdprConsent.gdprApplies
+    };
+  }
+
+  return {
+    consent_required: false,
+    consent_string: '',
+  };
+}
+
 registerBidder(spec);
diff --git a/modules/gamoshiBidAdapter.md b/modules/gamoshiBidAdapter.md
index 6e930375059..49b727cecae 100644
--- a/modules/gamoshiBidAdapter.md
+++ b/modules/gamoshiBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name:  Gamoshi Bid Adapter
 Module Type:  Bidder Adapter
-Maintainer:   salomon@gamoshi.com
+Maintainer:   dev@gamoshi.com
 ```
 
 # Description
diff --git a/modules/gdprEnforcement.js b/modules/gdprEnforcement.js
index 6a3fbdce1f2..9553ad0586a 100644
--- a/modules/gdprEnforcement.js
+++ b/modules/gdprEnforcement.js
@@ -2,48 +2,184 @@
  * This module gives publishers extra set of features to enforce individual purposes of TCF v2
  */
 
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { hasDeviceAccess } from '../src/utils.js';
-import adapterManager, { gdprDataHandler } from '../src/adapterManager.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import { registerSyncInner } from '../src/adapters/bidderFactory.js';
-import { getHook } from '../src/hook.js';
-import { validateStorageEnforcement } from '../src/storageManager.js';
-
-const purpose1 = 'storage';
-
-let addedDeviceAccessHook = false;
-let enforcementRules;
-
-function getGvlid() {
-  let gvlid;
-  const bidderCode = config.getCurrentBidder();
+import {deepAccess, hasDeviceAccess, isArray, logError, logWarn} from '../src/utils.js';
+import {config} from '../src/config.js';
+import adapterManager, {gdprDataHandler} from '../src/adapterManager.js';
+import {find, includes} from '../src/polyfill.js';
+import {registerSyncInner} from '../src/adapters/bidderFactory.js';
+import {getHook} from '../src/hook.js';
+import {validateStorageEnforcement} from '../src/storageManager.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
+
+export const STRICT_STORAGE_ENFORCEMENT = 'strictStorageEnforcement';
+
+const TCF2 = {
+  'purpose1': { id: 1, name: 'storage' },
+  'purpose2': { id: 2, name: 'basicAds' },
+  'purpose7': { id: 7, name: 'measurement' }
+}
+
+/*
+  These rules would be used if `consentManagement.gdpr.rules` is undefined by the publisher.
+*/
+const DEFAULT_RULES = [{
+  purpose: 'storage',
+  enforcePurpose: true,
+  enforceVendor: true,
+  vendorExceptions: []
+}, {
+  purpose: 'basicAds',
+  enforcePurpose: true,
+  enforceVendor: true,
+  vendorExceptions: []
+}];
+
+export let purpose1Rule;
+export let purpose2Rule;
+export let purpose7Rule;
+
+export let enforcementRules;
+
+const storageBlocked = [];
+const biddersBlocked = [];
+const analyticsBlocked = [];
+
+let hooksAdded = false;
+let strictStorageEnforcement = false;
+
+// Helps in stubbing these functions in unit tests.
+export const internal = {
+  getGvlidForBidAdapter,
+  getGvlidForUserIdModule,
+  getGvlidForAnalyticsAdapter
+};
+
+/**
+ * Returns GVL ID for a Bid adapter / an USERID submodule / an Analytics adapter.
+ * If modules of different types have the same moduleCode: For example, 'appnexus' is the code for both Bid adapter and Analytics adapter,
+ * then, we assume that their GVL IDs are same. This function first checks if GVL ID is defined for a Bid adapter, if not found, tries to find User ID
+ * submodule's GVL ID, if not found, tries to find Analytics adapter's GVL ID. In this process, as soon as it finds a GVL ID, it returns it
+ * without going to the next check.
+ * @param {{string|Object}} - module
+ * @return {number} - GVL ID
+ */
+export function getGvlid(module, ...args) {
+  let gvlid = null;
+  if (module) {
+    // Check user defined GVL Mapping in pbjs.setConfig()
+    const gvlMapping = config.getConfig('gvlMapping');
+
+    // For USER ID Module, we pass the submodule object itself as the "module" parameter, this check is required to grab the module code
+    const moduleCode = typeof module === 'string' ? module : module.name;
+
+    // Return GVL ID from user defined gvlMapping
+    if (gvlMapping && gvlMapping[moduleCode]) {
+      gvlid = gvlMapping[moduleCode];
+      return gvlid;
+    }
+
+    gvlid = internal.getGvlidForBidAdapter(moduleCode) || internal.getGvlidForUserIdModule(module) || internal.getGvlidForAnalyticsAdapter(moduleCode, ...args);
+  }
+  return gvlid;
+}
+
+/**
+ * Returns GVL ID for a bid adapter. If the adapter does not have an associated GVL ID, it returns 'null'.
+ * @param  {string=} bidderCode - The 'code' property of the Bidder spec.
+ * @return {number} GVL ID
+ */
+function getGvlidForBidAdapter(bidderCode) {
+  let gvlid = null;
+  bidderCode = bidderCode || config.getCurrentBidder();
   if (bidderCode) {
     const bidder = adapterManager.getBidAdapter(bidderCode);
-    gvlid = bidder.getSpec().gvlid;
-  } else {
-    utils.logWarn('Current module not found');
+    if (bidder && bidder.getSpec) {
+      gvlid = bidder.getSpec().gvlid;
+    }
   }
   return gvlid;
 }
 
 /**
- * This function takes in rules and consentData as input and validates against the consentData provided. If it returns true Prebid will allow the next call else it will log a warning
- * @param {Object} rules enforcement rules set in config
- * @param {Object} consentData gdpr consent data
+ * Returns GVL ID for an userId submodule. If an userId submodules does not have an associated GVL ID, it returns 'null'.
+ * @param {Object} userIdModule
+ * @return {number} GVL ID
+ */
+function getGvlidForUserIdModule(userIdModule) {
+  return (typeof userIdModule === 'object' ? userIdModule.gvlid : null);
+}
+
+/**
+ * Returns GVL ID for an analytics adapter. If an analytics adapter does not have an associated GVL ID, it returns 'null'.
+ * @param {string} code - 'provider' property on the analytics adapter config
+ * @param {{}} config - analytics configuration object
+ * @return {number} GVL ID
+ */
+function getGvlidForAnalyticsAdapter(code, config) {
+  const adapter = adapterManager.getAnalyticsAdapter(code);
+  return adapter?.gvlid || ((gvlid) => {
+    if (typeof gvlid !== 'function') return gvlid;
+    try {
+      return gvlid.call(adapter.adapter, config);
+    } catch (e) {
+      logError(`Error invoking ${code} adapter.gvlid()`, e)
+    }
+  })(adapter?.adapter?.gvlid)
+}
+
+export function shouldEnforce(consentData, purpose, name) {
+  if (consentData == null && gdprDataHandler.enabled) {
+    // there is no consent data, but the GDPR module has been installed and configured
+    // NOTE: this check is not foolproof, as when Prebid first loads, enforcement hooks have not been attached yet
+    // This piece of code would not run at all, and `gdprDataHandler.enabled` would be false, until the first
+    // `setConfig({consentManagement})`
+    logWarn(`Attempting operation that requires purpose ${purpose} consent while consent data is not available${name ? ` (module: ${name})` : ''}. Assuming no consent was given.`)
+    return true;
+  }
+  return consentData && consentData.gdprApplies;
+}
+
+/**
+ * This function takes in a rule and consentData and validates against the consentData provided. Depending on what it returns,
+ * the caller may decide to suppress a TCF-sensitive activity.
+ * @param {Object} rule - enforcement rules set in config
+ * @param {Object} consentData - gdpr consent data
+ * @param {string=} currentModule - Bidder code of the current module
+ * @param {number=} gvlId - GVL ID for the module
  * @returns {boolean}
  */
-function validateRules(rule, consentData, currentModule, gvlid) {
-  // if vendor has exception => always true
-  if (includes(rule.vendorExceptions || [], currentModule)) {
+export function validateRules(rule, consentData, currentModule, gvlId) {
+  const purposeId = TCF2[Object.keys(TCF2).filter(purposeName => TCF2[purposeName].name === rule.purpose)[0]].id;
+
+  // return 'true' if vendor present in 'vendorExceptions'
+  if ((rule.vendorExceptions || []).includes(currentModule)) {
     return true;
   }
-  // if enforcePurpose is false or purpose was granted isAllowed is true, otherwise false
-  const purposeAllowed = rule.enforcePurpose === false || utils.deepAccess(consentData, 'vendorData.purpose.consents.1') === true;
-  // if enforceVendor is false or vendor was granted isAllowed is true, otherwise false
-  const vendorAllowed = rule.enforceVendor === false || utils.deepAccess(consentData, `vendorData.vendor.consents.${gvlid}`) === true;
+  const vendorConsentRequred = !((gvlId === VENDORLESS_GVLID || (rule.softVendorExceptions || []).includes(currentModule)))
+
+  // get data from the consent string
+  const purposeConsent = deepAccess(consentData, `vendorData.purpose.consents.${purposeId}`);
+  const vendorConsent = vendorConsentRequred ? deepAccess(consentData, `vendorData.vendor.consents.${gvlId}`) : true;
+  const liTransparency = deepAccess(consentData, `vendorData.purpose.legitimateInterests.${purposeId}`);
+
+  /*
+    Since vendor exceptions have already been handled, the purpose as a whole is allowed if it's not being enforced
+    or the user has consented. Similar with vendors.
+  */
+  const purposeAllowed = rule.enforcePurpose === false || purposeConsent === true;
+  const vendorAllowed = rule.enforceVendor === false || vendorConsent === true;
+
+  /*
+    Few if any vendors should be declaring Legitimate Interest for Device Access (Purpose 1), but some are claiming
+    LI for Basic Ads (Purpose 2). Prebid.js can't check to see who's declaring what legal basis, so if LI has been
+    established for Purpose 2, allow the auction to take place and let the server sort out the legal basis calculation.
+  */
+  if (purposeId === 2) {
+    return (purposeAllowed && vendorAllowed) || (liTransparency === true);
+  }
+
   return purposeAllowed && vendorAllowed;
 }
 
@@ -52,43 +188,42 @@ function validateRules(rule, consentData, currentModule, gvlid) {
  * @param {Function} fn reference to original function (used by hook logic)
  * @param {Number=} gvlid gvlid of the module
  * @param {string=} moduleName name of the module
+ * @param result
  */
-export function deviceAccessHook(fn, gvlid, moduleName, result) {
+export function deviceAccessHook(fn, gvlid, moduleName, result, {validate = validateRules} = {}) {
   result = Object.assign({}, {
     hasEnforcementHook: true
   });
   if (!hasDeviceAccess()) {
-    utils.logWarn('Device access is disabled by Publisher');
+    logWarn('Device access is disabled by Publisher');
     result.valid = false;
-    fn.call(this, gvlid, moduleName, result);
+  } else if (gvlid === VENDORLESS_GVLID && !strictStorageEnforcement) {
+    // for vendorless (core) storage, do not enforce rules unless strictStorageEnforcement is set
+    result.valid = true;
   } else {
     const consentData = gdprDataHandler.getConsentData();
-    if (consentData && consentData.gdprApplies) {
-      if (consentData.apiVersion === 2) {
-        if (!gvlid) {
-          gvlid = getGvlid();
-        }
-        const curModule = moduleName || config.getCurrentBidder();
-        const purpose1Rule = find(enforcementRules, hasPurpose1);
-        let isAllowed = validateRules(purpose1Rule, consentData, curModule, gvlid);
-        if (isAllowed) {
-          result.valid = true;
-          fn.call(this, gvlid, moduleName, result);
-        } else {
-          utils.logWarn(`User denied Permission for Device access for ${curModule}`);
-          result.valid = false;
-          fn.call(this, gvlid, moduleName, result);
-        }
+    if (shouldEnforce(consentData, 1, moduleName)) {
+      const curBidder = config.getCurrentBidder();
+      // Bidders have a copy of storage object with bidder code binded. Aliases will also pass the same bidder code when invoking storage functions and hence if alias tries to access device we will try to grab the gvl id for alias instead of original bidder
+      if (curBidder && (curBidder !== moduleName) && adapterManager.aliasRegistry[curBidder] === moduleName) {
+        gvlid = getGvlid(curBidder);
       } else {
-        utils.logInfo('Enforcing TCF2 only');
+        gvlid = getGvlid(moduleName) || gvlid;
+      }
+      const curModule = moduleName || curBidder;
+      let isAllowed = validate(purpose1Rule, consentData, curModule, gvlid,);
+      if (isAllowed) {
         result.valid = true;
-        fn.call(this, gvlid, moduleName, result);
+      } else {
+        curModule && logWarn(`TCF2 denied device access for ${curModule}`);
+        result.valid = false;
+        storageBlocked.push(curModule);
       }
     } else {
       result.valid = true;
-      fn.call(this, gvlid, moduleName, result);
     }
   }
+  fn.call(this, gvlid, moduleName, result);
 }
 
 /**
@@ -98,24 +233,15 @@ export function deviceAccessHook(fn, gvlid, moduleName, result) {
  */
 export function userSyncHook(fn, ...args) {
   const consentData = gdprDataHandler.getConsentData();
-  if (consentData && consentData.gdprApplies) {
-    if (consentData.apiVersion === 2) {
-      const gvlid = getGvlid();
-      const curBidder = config.getCurrentBidder();
-      if (gvlid) {
-        const purpose1Rule = find(enforcementRules, hasPurpose1);
-        let isAllowed = validateRules(purpose1Rule, consentData, curBidder, gvlid);
-        if (isAllowed) {
-          fn.call(this, ...args);
-        } else {
-          utils.logWarn(`User sync not allowed for ${curBidder}`);
-        }
-      } else {
-        utils.logWarn(`User sync not allowed for ${curBidder}`);
-      }
-    } else {
-      utils.logInfo('Enforcing TCF2 only');
+  const curBidder = config.getCurrentBidder();
+  if (shouldEnforce(consentData, 1, curBidder)) {
+    const gvlid = getGvlid(curBidder);
+    let isAllowed = validateRules(purpose1Rule, consentData, curBidder, gvlid);
+    if (isAllowed) {
       fn.call(this, ...args);
+    } else {
+      logWarn(`User sync not allowed for ${curBidder}`);
+      storageBlocked.push(curBidder);
     }
   } else {
     fn.call(this, ...args);
@@ -129,56 +255,159 @@ export function userSyncHook(fn, ...args) {
  * @param {Object} consentData GDPR consent data
  */
 export function userIdHook(fn, submodules, consentData) {
-  if (consentData && consentData.gdprApplies) {
-    if (consentData.apiVersion === 2) {
-      let userIdModules = submodules.map((submodule) => {
-        const gvlid = submodule.submodule.gvlid;
-        const moduleName = submodule.submodule.name;
-        if (gvlid) {
-          const purpose1Rule = find(enforcementRules, hasPurpose1);
-          let isAllowed = validateRules(purpose1Rule, consentData, moduleName, gvlid);
-          if (isAllowed) {
-            return submodule;
-          } else {
-            utils.logWarn(`User denied permission to fetch user id for ${moduleName} User id module`);
-          }
-        } else {
-          utils.logWarn(`User denied permission to fetch user id for ${moduleName} User id module`);
+  if (shouldEnforce(consentData, 1, 'User ID')) {
+    let userIdModules = submodules.map((submodule) => {
+      const gvlid = getGvlid(submodule.submodule);
+      const moduleName = submodule.submodule.name;
+      let isAllowed = validateRules(purpose1Rule, consentData, moduleName, gvlid);
+      if (isAllowed) {
+        return submodule;
+      } else {
+        logWarn(`User denied permission to fetch user id for ${moduleName} User id module`);
+        storageBlocked.push(moduleName);
+      }
+      return undefined;
+    }).filter(module => module)
+    fn.call(this, userIdModules, { ...consentData, hasValidated: true });
+  } else {
+    fn.call(this, submodules, consentData);
+  }
+}
+
+/**
+ * Checks if bidders are allowed in the auction.
+ * Enforces "purpose 2 (Basic Ads)" of TCF v2.0 spec
+ * @param {Function} fn - Function reference to the original function.
+ * @param {Array<adUnits>} adUnits
+ */
+export function makeBidRequestsHook(fn, adUnits, ...args) {
+  const consentData = gdprDataHandler.getConsentData();
+  if (shouldEnforce(consentData, 2)) {
+    adUnits.forEach(adUnit => {
+      adUnit.bids = adUnit.bids.filter(bid => {
+        const currBidder = bid.bidder;
+        const gvlId = getGvlid(currBidder);
+        if (includes(biddersBlocked, currBidder)) return false;
+        const isAllowed = !!validateRules(purpose2Rule, consentData, currBidder, gvlId);
+        if (!isAllowed) {
+          logWarn(`TCF2 blocked auction for ${currBidder}`);
+          biddersBlocked.push(currBidder);
         }
-        return undefined;
-      }).filter(module => module)
-      fn.call(this, userIdModules, {...consentData, hasValidated: true});
-    } else {
-      utils.logInfo('Enforcing TCF2 only');
-      fn.call(this, submodules, consentData);
+        return isAllowed;
+      });
+    });
+    fn.call(this, adUnits, ...args);
+  } else {
+    fn.call(this, adUnits, ...args);
+  }
+}
+
+/**
+ * Checks if Analytics adapters are allowed to send data to their servers for furhter processing.
+ * Enforces "purpose 7 (Measurement)" of TCF v2.0 spec
+ * @param {Function} fn - Function reference to the original function.
+ * @param {Array<AnalyticsAdapterConfig>} config - Configuration object passed to pbjs.enableAnalytics()
+ */
+export function enableAnalyticsHook(fn, config) {
+  const consentData = gdprDataHandler.getConsentData();
+  if (shouldEnforce(consentData, 7, 'Analytics')) {
+    if (!isArray(config)) {
+      config = [config]
     }
+    config = config.filter(conf => {
+      const analyticsAdapterCode = conf.provider;
+      const gvlid = getGvlid(analyticsAdapterCode, conf);
+      const isAllowed = !!validateRules(purpose7Rule, consentData, analyticsAdapterCode, gvlid);
+      if (!isAllowed) {
+        analyticsBlocked.push(analyticsAdapterCode);
+        logWarn(`TCF2 blocked analytics adapter ${conf.provider}`);
+      }
+      return isAllowed;
+    });
+    fn.call(this, config);
   } else {
-    fn.call(this, submodules, consentData);
+    fn.call(this, config);
+  }
+}
+
+/**
+ * Compiles the TCF2.0 enforcement results into an object, which is emitted as an event payload to "tcf2Enforcement" event.
+ */
+function emitTCF2FinalResults() {
+  // remove null and duplicate values
+  const formatArray = function (arr) {
+    return arr.filter((i, k) => i !== null && arr.indexOf(i) === k);
   }
+  const tcf2FinalResults = {
+    storageBlocked: formatArray(storageBlocked),
+    biddersBlocked: formatArray(biddersBlocked),
+    analyticsBlocked: formatArray(analyticsBlocked)
+  };
+
+  events.emit(CONSTANTS.EVENTS.TCF2_ENFORCEMENT, tcf2FinalResults);
 }
 
-const hasPurpose1 = (rule) => { return rule.purpose === purpose1 }
+events.on(CONSTANTS.EVENTS.AUCTION_END, emitTCF2FinalResults);
+
+/*
+  Set of callback functions used to detect presence of a TCF rule, passed as the second argument to find().
+*/
+const hasPurpose1 = (rule) => { return rule.purpose === TCF2.purpose1.name }
+const hasPurpose2 = (rule) => { return rule.purpose === TCF2.purpose2.name }
+const hasPurpose7 = (rule) => { return rule.purpose === TCF2.purpose7.name }
 
 /**
- * A configuration function that initializes some module variables, as well as add hooks
- * @param {Object} config GDPR enforcement config object
+ * A configuration function that initializes some module variables, as well as adds hooks
+ * @param {Object} config - GDPR enforcement config object
  */
 export function setEnforcementConfig(config) {
-  const rules = utils.deepAccess(config, 'gdpr.rules');
+  const rules = deepAccess(config, 'gdpr.rules');
   if (!rules) {
-    utils.logWarn('GDPR enforcement rules not defined, exiting enforcement module');
-    return;
+    logWarn('TCF2: enforcing P1 and P2 by default');
+    enforcementRules = DEFAULT_RULES;
+  } else {
+    enforcementRules = rules;
+  }
+  strictStorageEnforcement = !!deepAccess(config, STRICT_STORAGE_ENFORCEMENT);
+
+  purpose1Rule = find(enforcementRules, hasPurpose1);
+  purpose2Rule = find(enforcementRules, hasPurpose2);
+  purpose7Rule = find(enforcementRules, hasPurpose7);
+
+  if (!purpose1Rule) {
+    purpose1Rule = DEFAULT_RULES[0];
   }
 
-  enforcementRules = rules;
-  const hasDefinedPurpose1 = find(enforcementRules, hasPurpose1);
-  if (hasDefinedPurpose1 && !addedDeviceAccessHook) {
-    addedDeviceAccessHook = true;
-    validateStorageEnforcement.before(deviceAccessHook, 49);
-    registerSyncInner.before(userSyncHook, 48);
-    // Using getHook as user id and gdprEnforcement are both optional modules. Using import will auto include the file in build
-    getHook('validateGdprEnforcement').before(userIdHook, 47);
+  if (!purpose2Rule) {
+    purpose2Rule = DEFAULT_RULES[1];
   }
+
+  if (!hooksAdded) {
+    if (purpose1Rule) {
+      hooksAdded = true;
+      validateStorageEnforcement.before(deviceAccessHook, 49);
+      registerSyncInner.before(userSyncHook, 48);
+      // Using getHook as user id and gdprEnforcement are both optional modules. Using import will auto include the file in build
+      getHook('validateGdprEnforcement').before(userIdHook, 47);
+    }
+    if (purpose2Rule) {
+      getHook('makeBidRequests').before(makeBidRequestsHook);
+    }
+    if (purpose7Rule) {
+      getHook('enableAnalyticsCb').before(enableAnalyticsHook);
+    }
+  }
+}
+
+export function uninstall() {
+  [
+    validateStorageEnforcement.getHooks({hook: deviceAccessHook}),
+    registerSyncInner.getHooks({hook: userSyncHook}),
+    getHook('validateGdprEnforcement').getHooks({hook: userIdHook}),
+    getHook('makeBidRequests').getHooks({hook: makeBidRequestsHook}),
+    getHook('enableAnalyticsCb').getHooks({hook: enableAnalyticsHook}),
+  ].forEach(hook => hook.remove());
+  hooksAdded = false;
 }
 
 config.getConfig('consentManagement', config => setEnforcementConfig(config.consentManagement));
diff --git a/modules/genericAnalyticsAdapter.js b/modules/genericAnalyticsAdapter.js
new file mode 100644
index 00000000000..4909745e72b
--- /dev/null
+++ b/modules/genericAnalyticsAdapter.js
@@ -0,0 +1,157 @@
+import AnalyticsAdapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import {prefixLog, isPlainObject} from '../src/utils.js';
+import * as CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+import {ajaxBuilder} from '../src/ajax.js';
+
+const DEFAULTS = {
+  batchSize: 1,
+  batchDelay: 100,
+  method: 'POST'
+}
+
+const TYPES = {
+  handler: 'function',
+  batchSize: 'number',
+  batchDelay: 'number',
+  gvlid: 'number',
+}
+
+const MAX_CALL_DEPTH = 20;
+
+export function GenericAnalytics() {
+  const parent = AnalyticsAdapter({analyticsType: 'endpoint'});
+  const {logError, logWarn} = prefixLog('Generic analytics:');
+  let batch = [];
+  let callDepth = 0;
+  let options, handler, timer, translate;
+
+  function optionsAreValid(options) {
+    if (!options.url && !options.handler) {
+      logError('options must specify either `url` or `handler`')
+      return false;
+    }
+    if (options.hasOwnProperty('method') && !['GET', 'POST'].includes(options.method)) {
+      logError('options.method must be GET or POST');
+      return false;
+    }
+    for (const [field, type] of Object.entries(TYPES)) {
+      // eslint-disable-next-line valid-typeof
+      if (options.hasOwnProperty(field) && typeof options[field] !== type) {
+        logError(`options.${field} must be a ${type}`);
+        return false;
+      }
+    }
+    if (options.hasOwnProperty('events')) {
+      if (!isPlainObject(options.events)) {
+        logError('options.events must be an object');
+        return false;
+      }
+      for (const [event, handler] of Object.entries(options.events)) {
+        if (!CONSTANTS.EVENTS.hasOwnProperty(event)) {
+          logWarn(`options.events.${event} does not match any known Prebid event`);
+          if (typeof handler !== 'function') {
+            logError(`options.events.${event} must be a function`);
+            return false;
+          }
+        }
+      }
+    }
+    return true;
+  }
+
+  function processBatch() {
+    const currentBatch = batch;
+    batch = [];
+    callDepth++;
+    try {
+      // the pub-provided handler may inadvertently cause an infinite chain of events;
+      // even just logging an exception from it may cause an AUCTION_DEBUG event, that
+      // gets back to the handler, that throws another exception etc.
+      // to avoid the issue, put a cap on recursion
+      if (callDepth === MAX_CALL_DEPTH) {
+        logError('detected probable infinite recursion, discarding events', currentBatch);
+      }
+      if (callDepth >= MAX_CALL_DEPTH) {
+        return;
+      }
+      try {
+        handler(currentBatch);
+      } catch (e) {
+        logError('error executing options.handler', e);
+      }
+    } finally {
+      callDepth--;
+    }
+  }
+
+  function translator(eventHandlers) {
+    if (!eventHandlers) {
+      return (data) => data;
+    }
+    return function ({eventType, args}) {
+      if (eventHandlers.hasOwnProperty(eventType)) {
+        try {
+          return eventHandlers[eventType](args);
+        } catch (e) {
+          logError(`error executing options.events.${eventType}`, e);
+        }
+      }
+    }
+  }
+
+  return Object.assign(
+    Object.create(parent),
+    {
+      gvlid(config) {
+        return config?.options?.gvlid
+      },
+      enableAnalytics(config) {
+        if (optionsAreValid(config?.options || {})) {
+          options = Object.assign({}, DEFAULTS, config.options);
+          handler = options.handler || defaultHandler(options);
+          translate = translator(options.events);
+          parent.enableAnalytics.call(this, config);
+        }
+      },
+      track(event) {
+        if (event.eventType === CONSTANTS.EVENTS.AUCTION_INIT && event.args.hasOwnProperty('config')) {
+          // clean up auctionInit event
+          // TODO: remove this special case in v8
+          delete event.args.config;
+        }
+        const datum = translate(event);
+        if (datum != null) {
+          batch.push(datum);
+          if (timer != null) {
+            clearTimeout(timer);
+            timer = null;
+          }
+          if (batch.length >= options.batchSize) {
+            processBatch();
+          } else {
+            timer = setTimeout(processBatch, options.batchDelay);
+          }
+        }
+      }
+    }
+  )
+}
+
+export function defaultHandler({url, method, batchSize, ajax = ajaxBuilder()}) {
+  const callbacks = {
+    success() {},
+    error() {}
+  }
+  const extract = batchSize > 1 ? (events) => events : (events) => events[0];
+  const serialize = method === 'GET' ? (data) => ({data: JSON.stringify(data)}) : (data) => JSON.stringify(data);
+
+  return function (events) {
+    ajax(url, callbacks, serialize(extract(events)), {method})
+  }
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: GenericAnalytics(),
+  code: 'generic',
+});
diff --git a/modules/geoedgeRtdProvider.js b/modules/geoedgeRtdProvider.js
new file mode 100644
index 00000000000..6f910632fbc
--- /dev/null
+++ b/modules/geoedgeRtdProvider.js
@@ -0,0 +1,235 @@
+/**
+ * This module adds geoedge provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch creative wrapper from geoedge server
+ * The module will place geoedge RUM client on bid responses markup
+ * @module modules/geoedgeProvider
+ * @requires module:modules/realTimeData
+ */
+
+/**
+ * @typedef {Object} ModuleParams
+ * @property {string} key
+ * @property {?Object} bidders
+ * @property {?boolean} wap
+ * @property {?string} keyName
+ */
+
+import { submodule } from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+import { generateUUID, insertElement, isEmpty, logError } from '../src/utils.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+
+/** @type {string} */
+const SUBMODULE_NAME = 'geoedge';
+/** @type {string} */
+export const WRAPPER_URL = 'https://wrappers.geoedge.be/wrapper.html';
+/** @type {string} */
+/* eslint-disable no-template-curly-in-string */
+export const HTML_PLACEHOLDER = '${creative}';
+/** @type {string} */
+const PV_ID = generateUUID();
+/** @type {string} */
+const HOST_NAME = 'https://rumcdn.geoedge.be';
+/** @type {string} */
+const FILE_NAME = 'grumi.js';
+/** @type {function} */
+export let getClientUrl = (key) => `${HOST_NAME}/${key}/${FILE_NAME}`;
+/** @type {string} */
+export let wrapper
+/** @type {boolean} */;
+let wrapperReady;
+/** @type {boolean} */;
+let preloaded;
+
+/**
+ * fetches the creative wrapper
+ * @param {function} sucess - success callback
+ */
+export function fetchWrapper(success) {
+  if (wrapperReady) {
+    return success(wrapper);
+  }
+  ajax(WRAPPER_URL, success);
+}
+
+/**
+ * sets the wrapper and calls preload client
+ * @param {string} responseText
+ */
+export function setWrapper(responseText) {
+  wrapperReady = true;
+  wrapper = responseText;
+}
+
+/**
+ * preloads the client
+  * @param {string} key
+ */
+export function preloadClient(key) {
+  let link = document.createElement('link');
+  link.rel = 'preload';
+  link.as = 'script';
+  link.href = getClientUrl(key);
+  link.onload = () => { preloaded = true };
+  insertElement(link);
+}
+
+/**
+ * creates identity function for string replace without special replacement patterns
+ * @param {string} str
+ * @return {function}
+ */
+function replacer(str) {
+  return function () {
+    return str;
+  }
+}
+
+export function wrapHtml(wrapper, html) {
+  return wrapper.replace(HTML_PLACEHOLDER, replacer(html));
+}
+
+/**
+ * generate macros dictionary from bid response
+ * @param {Object} bid
+ * @param {string} key
+ * @return {Object}
+ */
+function getMacros(bid, key) {
+  return {
+    '${key}': key,
+    '%%ADUNIT%%': bid.adUnitCode,
+    '%%WIDTH%%': bid.width,
+    '%%HEIGHT%%': bid.height,
+    '%%PATTERN:hb_adid%%': bid.adId,
+    '%%PATTERN:hb_bidder%%': bid.bidderCode,
+    '%_isHb!': true,
+    '%_hbcid!': bid.creativeId || '',
+    '%_hbadomains': bid.meta && bid.meta.advertiserDomains,
+    '%%PATTERN:hb_pb%%': bid.pbHg,
+    '%%SITE%%': location.hostname,
+    '%_pimp%': PV_ID
+  };
+}
+
+/**
+ * replace macro placeholders in a string with values from a dictionary
+ * @param {string} wrapper
+ * @param {Object} macros
+ * @return {string}
+ */
+function replaceMacros(wrapper, macros) {
+  var re = new RegExp('\\' + Object.keys(macros).join('|'), 'gi');
+
+  return wrapper.replace(re, function(matched) {
+    return macros[matched];
+  });
+}
+
+/**
+ * build final creative html with creative wrapper
+ * @param {Object} bid
+ * @param {string} wrapper
+ * @param {string} html
+ * @return {string}
+ */
+function buildHtml(bid, wrapper, html, key) {
+  let macros = getMacros(bid, key);
+  wrapper = replaceMacros(wrapper, macros);
+  return wrapHtml(wrapper, html);
+}
+
+/**
+ * muatates the bid ad property
+ * @param {Object} bid
+ * @param {string} ad
+ */
+function mutateBid(bid, ad) {
+  bid.ad = ad;
+}
+
+/**
+ * wraps a bid object with the creative wrapper
+ * @param {Object} bid
+ * @param {string} key
+ */
+export function wrapBidResponse(bid, key) {
+  let wrapped = buildHtml(bid, wrapper, bid.ad, key);
+  mutateBid(bid, wrapped);
+}
+
+/**
+ * checks if bidder's bids should be monitored
+ * @param {string} bidder
+ * @return {boolean}
+ */
+function isSupportedBidder(bidder, paramsBidders) {
+  return isEmpty(paramsBidders) || paramsBidders[bidder] === true;
+}
+
+/**
+ * checks if bid should be monitored
+ * @param {Object} bid
+ * @return {boolean}
+ */
+function shouldWrap(bid, params) {
+  let supportedBidder = isSupportedBidder(bid.bidderCode, params.bidders);
+  let donePreload = params.wap ? preloaded : true;
+  return wrapperReady && supportedBidder && donePreload;
+}
+
+function conditionallyWrap(bidResponse, config, userConsent) {
+  let params = config.params;
+  if (shouldWrap(bidResponse, params)) {
+    wrapBidResponse(bidResponse, params.key);
+  }
+}
+
+/**
+ * Fire billable events for applicable bids
+ */
+function fireBillableEventsForApplicableBids(params) {
+  events.on(CONSTANTS.EVENTS.BID_WON, function (winningBid) {
+    if (shouldWrap(winningBid, params)) {
+      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+        vendor: SUBMODULE_NAME,
+        billingId: generateUUID(),
+        type: 'impression',
+        transactionId: winningBid.transactionId,
+        auctionId: winningBid.auctionId,
+        bidId: winningBid.requestId
+      });
+    }
+  });
+}
+
+function init(config, userConsent) {
+  let params = config.params;
+  if (!params || !params.key) {
+    logError('missing key for geoedge RTD module provider');
+    return false;
+  }
+  preloadClient(params.key);
+  fireBillableEventsForApplicableBids(params);
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const geoedgeSubmodule = {
+  /**
+     * used to link submodule with realTimeData
+     * @type {string}
+     */
+  name: SUBMODULE_NAME,
+  init,
+  onBidResponseEvent: conditionallyWrap
+};
+
+export function beforeInit() {
+  fetchWrapper(setWrapper);
+  submodule('realTimeData', geoedgeSubmodule);
+}
+
+beforeInit();
diff --git a/modules/geoedgeRtdProvider.md b/modules/geoedgeRtdProvider.md
new file mode 100644
index 00000000000..5414606612c
--- /dev/null
+++ b/modules/geoedgeRtdProvider.md
@@ -0,0 +1,67 @@
+## Overview
+
+Module Name: Geoedge Rtd provider
+Module Type: Rtd Provider
+Maintainer: guy.books@geoedge.com
+
+The Geoedge Realtime module lets publishers block bad ads such as automatic redirects, malware, offensive creatives and landing pages.
+To use this module, you'll need to work with [Geoedge](https://www.geoedge.com/publishers-real-time-protection/) to get an account and cutomer key.
+
+## Integration
+
+1) Build the geoedge RTD module into the Prebid.js package with:
+
+```
+gulp build --modules=geoedgeRtdProvider,...
+```
+
+2) Use `setConfig` to instruct Prebid.js to initilize the geoedge module, as specified below.
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders` object:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'geoedge',
+            params: {
+                key: '123123', 
+                bidders: {
+                    'bidderA': true, // monitor bids form this bidder
+                    'bidderB': false // do not monitor bids form this bidder.
+                },
+                wap: true
+            }
+        }]
+    }
+});
+```
+
+Parameters details:
+
+{: .table .table-bordered .table-striped }
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+|name | String | Real time data module name |Required, always 'geoedge' |
+|params | Object | | |
+|params.key | String | Customer key |Required, contact Geoedge to get your key |
+|params.bidders | Object | Bidders to monitor |Optional, list of bidder to include / exclude from monitoring. Omitting this will monitor bids from all bidders. |
+|params.wap |Boolean |Wrap after preload |Optional, defaults to `false`. Set to `true` if you want to monitor only after the module has preloaded the monitoring client. |
+
+## Example
+
+To view an integration example:
+ 
+1) in your cli run:
+
+```
+gulp serve --modules=appnexusBidAdapter,geoedgeRtdProvider
+```
+
+2) in your browser, navigate to:
+
+```
+http://localhost:9999/integrationExamples/gpt/geoedgeRtdProvider_example.html
+```
diff --git a/modules/getintentBidAdapter.js b/modules/getintentBidAdapter.js
index 134dd0b4fc9..25322d81f9b 100644
--- a/modules/getintentBidAdapter.js
+++ b/modules/getintentBidAdapter.js
@@ -1,5 +1,5 @@
+import { getBidIdParameter, isFn, isInteger } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { isInteger } from '../src/utils.js';
 
 const BIDDER_CODE = 'getintent';
 const IS_NET_REVENUE = true;
@@ -7,11 +7,25 @@ const BID_HOST = 'px.adhigh.net';
 const BID_BANNER_PATH = '/rtb/direct_banner';
 const BID_VIDEO_PATH = '/rtb/direct_vast';
 const BID_RESPONSE_TTL_SEC = 360;
-const VIDEO_PROPERTIES = [
-  'protocols', 'mimes', 'min_dur', 'max_dur', 'min_btr', 'max_btr', 'vi_format', 'api', 'skippable'
-];
+const FLOOR_PARAM = 'floor';
+const CURRENCY_PARAM = 'cur';
+const DEFAULT_CURRENCY = 'RUB';
+const VIDEO_PROPERTIES = {
+  'protocols': 'protocols',
+  'mimes': 'mimes',
+  'min_dur': 'minduration',
+  'max_dur': 'maxduration',
+  'min_btr': 'minbitrate',
+  'max_btr': 'maxbitrate',
+  'vi_format': null,
+  'api': 'api',
+  'skippable': 'skip',
+};
+const SKIPPABLE_ALLOW = 'ALLOW';
+const SKIPPABLE_NOT_ALLOW = 'NOT_ALLOW';
+
 const OPTIONAL_PROPERTIES = [
-  'cur', 'floor', 'sid'
+  'sid'
 ];
 
 export const spec = {
@@ -66,7 +80,10 @@ export const spec = {
         creativeId: responseBody.creative_id,
         cpm: responseBody.cpm,
         width: size[0],
-        height: size[1]
+        height: size[1],
+        meta: {
+          advertiserDomains: responseBody.adomain || [],
+        }
       };
       if (responseBody.vast_url) {
         bid.mediaType = 'video';
@@ -80,7 +97,7 @@ export const spec = {
     return bids;
   }
 
-}
+};
 
 function buildUrl(bid) {
   return 'https://' + BID_HOST + (bid.is_video ? BID_VIDEO_PATH : BID_BANNER_PATH);
@@ -105,19 +122,61 @@ function buildGiBidRequest(bidRequest) {
   if (bidRequest.sizes) {
     giBidRequest.size = produceSize(bidRequest.sizes);
   }
-  addVideo(bidRequest.params.video, giBidRequest);
+
+  const currency = getBidIdParameter(CURRENCY_PARAM, bidRequest.params);
+  const floorInfo = getBidFloor(bidRequest, currency);
+  if (floorInfo.floor) {
+    giBidRequest[FLOOR_PARAM] = floorInfo.floor;
+  }
+  if (floorInfo.currency) {
+    giBidRequest[CURRENCY_PARAM] = floorInfo.currency;
+  }
+
+  if (giBidRequest.is_video) {
+    addVideo(bidRequest.params.video, bidRequest.mediaTypes.video, giBidRequest);
+  }
   addOptional(bidRequest.params, giBidRequest, OPTIONAL_PROPERTIES);
   return giBidRequest;
 }
 
-function addVideo(video, giBidRequest) {
-  if (giBidRequest.is_video && video) {
-    for (let i = 0, l = VIDEO_PROPERTIES.length; i < l; i++) {
-      let key = VIDEO_PROPERTIES[i];
-      if (video.hasOwnProperty(key)) {
-        giBidRequest[key] = Array.isArray(video[key]) ? video[key].join(',') : video[key];
+function getBidFloor(bidRequest, currency) {
+  let floorInfo = {};
+
+  if (isFn(bidRequest.getFloor)) {
+    floorInfo = bidRequest.getFloor({
+      currency: currency || DEFAULT_CURRENCY,
+      mediaType: bidRequest.mediaType,
+      size: bidRequest.sizes || '*'
+    });
+  }
+
+  return {
+    floor: floorInfo.floor || bidRequest.params[FLOOR_PARAM] || 0,
+    currency: floorInfo.currency || currency || '',
+  };
+}
+
+function addVideo(videoParams, mediaTypesVideoParams, giBidRequest) {
+  videoParams = videoParams || {};
+  mediaTypesVideoParams = mediaTypesVideoParams || {};
+
+  for (let videoParam in VIDEO_PROPERTIES) {
+    let paramValue;
+
+    const mediaTypesVideoParam = VIDEO_PROPERTIES[videoParam];
+    if (videoParams.hasOwnProperty(videoParam)) {
+      paramValue = videoParams[videoParam];
+    } else if (mediaTypesVideoParam !== null && mediaTypesVideoParams.hasOwnProperty(mediaTypesVideoParam)) {
+      if (mediaTypesVideoParam === 'skip') {
+        paramValue = mediaTypesVideoParams[mediaTypesVideoParam] === 1 ? SKIPPABLE_ALLOW : SKIPPABLE_NOT_ALLOW;
+      } else {
+        paramValue = mediaTypesVideoParams[mediaTypesVideoParam];
       }
     }
+
+    if (typeof paramValue !== 'undefined') {
+      giBidRequest[videoParam] = Array.isArray(paramValue) ? paramValue.join(',') : paramValue;
+    }
   }
 }
 
diff --git a/modules/giantsBidAdapter.md b/modules/giantsBidAdapter.md
deleted file mode 100644
index 8d7cdd81184..00000000000
--- a/modules/giantsBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-```
-Module Name:  Giants Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer: info@prebid.org
-```
-
-# Description
-
-Connects to Giants exchange for bids.
-
-Giants bid adapter supports Banner.
-
-# Test Parameters
-```
-var adUnits = [
-   // Banner adUnit
-   {
-       code: 'banner-div',
-       sizes: [[300, 250], [300,600]],
-       bids: [{
-         bidder: 'giants',
-         params: {
-           zoneId: '584072408'
-         }
-       }]
-   }
-];
-```
\ No newline at end of file
diff --git a/modules/gjirafaBidAdapter.js b/modules/gjirafaBidAdapter.js
new file mode 100644
index 00000000000..91ed5c9b3fb
--- /dev/null
+++ b/modules/gjirafaBidAdapter.js
@@ -0,0 +1,128 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'gjirafa';
+const ENDPOINT_URL = 'https://central.gjirafa.com/bid';
+const DIMENSION_SEPARATOR = 'x';
+const SIZE_SEPARATOR = ';';
+const BISKO_ID = 'biskoId';
+const STORAGE_ID = 'bisko-sid';
+const SEGMENTS = 'biskoSegments';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.propertyId && bid.params.placementId);
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const storageId = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(STORAGE_ID) || '' : '';
+    const biskoId = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(BISKO_ID) || '' : '';
+    const segments = storage.localStorageIsEnabled() ? JSON.parse(storage.getDataFromLocalStorage(SEGMENTS)) || [] : [];
+
+    let propertyId = '';
+    let pageViewGuid = '';
+    let bidderRequestId = '';
+    let url = '';
+    let contents = [];
+    let data = {};
+
+    let placements = validBidRequests.map(bidRequest => {
+      if (!propertyId) { propertyId = bidRequest.params.propertyId; }
+      if (!pageViewGuid && bidRequest.params) { pageViewGuid = bidRequest.params.pageViewGuid || ''; }
+      if (!bidderRequestId) { bidderRequestId = bidRequest.bidderRequestId; }
+      if (!url && bidderRequest) { url = bidderRequest.refererInfo.page; }
+      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents; }
+      if (Object.keys(data).length === 0 && bidRequest.params.data && Object.keys(bidRequest.params.data).length !== 0) { data = bidRequest.params.data; }
+
+      let adUnitId = bidRequest.adUnitCode;
+      let placementId = bidRequest.params.placementId;
+      let sizes = generateSizeParam(bidRequest.sizes);
+
+      return {
+        sizes: sizes,
+        adUnitId: adUnitId,
+        placementId: placementId,
+        bidid: bidRequest.bidId,
+        count: bidRequest.params.count,
+        skipTime: bidRequest.params.skipTime
+      };
+    });
+
+    let body = {
+      propertyId: propertyId,
+      pageViewGuid: pageViewGuid,
+      storageId: storageId,
+      biskoId: biskoId,
+      segments: segments,
+      url: url,
+      requestid: bidderRequestId,
+      placements: placements,
+      contents: contents,
+      data: data
+    };
+
+    return [{
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: body
+    }];
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse) {
+    const responses = serverResponse.body;
+    const bidResponses = [];
+    for (var i = 0; i < responses.length; i++) {
+      const bidResponse = {
+        requestId: responses[i].BidId,
+        cpm: responses[i].CPM,
+        width: responses[i].Width,
+        height: responses[i].Height,
+        creativeId: responses[i].CreativeId,
+        currency: responses[i].Currency,
+        netRevenue: responses[i].NetRevenue,
+        ttl: responses[i].TTL,
+        referrer: responses[i].Referrer,
+        ad: responses[i].Ad,
+        vastUrl: responses[i].VastUrl,
+        mediaType: responses[i].MediaType,
+        meta: {
+          advertiserDomains: Array.isArray(responses[i].ADomain) ? responses[i].ADomain : []
+        }
+      };
+      bidResponses.push(bidResponse);
+    }
+    return bidResponses;
+  }
+};
+
+/**
+* Generate size param for bid request using sizes array
+*
+* @param {Array} sizes Possible sizes for the ad unit.
+* @return {string} Processed sizes param to be used for the bid request.
+*/
+function generateSizeParam(sizes) {
+  return sizes.map(size => size.join(DIMENSION_SEPARATOR)).join(SIZE_SEPARATOR);
+}
+
+registerBidder(spec);
diff --git a/modules/gjirafaBidAdapter.md b/modules/gjirafaBidAdapter.md
index 1ec8222d8de..fb4960d61f6 100644
--- a/modules/gjirafaBidAdapter.md
+++ b/modules/gjirafaBidAdapter.md
@@ -1,36 +1,67 @@
 # Overview
-Module Name: Gjirafa Bidder Adapter Module 
-Type: Bidder Adapter 
-Maintainer: agonq@gjirafa.com
+Module Name: Gjirafa Bidder Adapter Module
+
+Type: Bidder Adapter
+
+Maintainer: arditb@gjirafa.com
 
 # Description
 Gjirafa Bidder Adapter for Prebid.js.
 
 # Test Parameters
+```js
 var adUnits = [
-{
-    code: 'test-div',
-    sizes: [[728, 90]],  // leaderboard
-    bids: [
-        {
-             bidder: 'gjirafa',
-             params: {
-				placementId: '71-3'
-             }
-        }
-    ]
-},{
-    code: 'test-div',
-    sizes: [[300, 250]],   // mobile rectangle
-    bids: [
-        {
-             bidder: 'gjirafa',
-             params: {
-				minCPM: 0.0001,
-				minCPC: 0.001,
-				explicit: true
-             }
-        }
-    ]
-}
-];
\ No newline at end of file
+    {
+        code: 'test-div',
+        mediaTypes: {
+            banner: {
+                sizes: [
+                    [728, 90]
+                ]
+            }
+        },
+        bids: [{
+            bidder: 'gjirafa',
+            params: {
+                propertyId: '105227',   //Required
+                placementId: '846841',  //Required
+                data: {                 //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
+                }
+            }
+        }]
+    },
+    {
+        code: 'test-div',
+        mediaTypes: {
+            video: {
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'gjirafa',
+            params: {
+                propertyId: '105227',  //Required
+                placementId: '846836', //Required
+                data: {                //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
+                }
+            }
+        }]
+    }
+];
+```
diff --git a/modules/glimpseBidAdapter.js b/modules/glimpseBidAdapter.js
index 969c04bb451..bbb4dbb30cd 100644
--- a/modules/glimpseBidAdapter.js
+++ b/modules/glimpseBidAdapter.js
@@ -1,58 +1,202 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
 import { BANNER } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import {
+  isArray,
+  isEmpty,
+  isEmptyStr,
+  isStr,
+  isPlainObject,
+} from '../src/utils.js';
 
+const GVLID = 1012;
 const BIDDER_CODE = 'glimpse';
+const storageManager = getStorageManager({
+  gvlid: GVLID,
+  bidderCode: BIDDER_CODE,
+});
+const ENDPOINT = 'https://market.glimpsevault.io/public/v1/prebid';
+const LOCAL_STORAGE_KEY = {
+  vault: {
+    jwt: 'gp_vault_jwt',
+  },
+};
 
 export const spec = {
+  gvlid: GVLID,
   code: BIDDER_CODE,
-  url: 'https://api.glimpseprotocol.io/cloud/v1/vault/prebid',
   supportedMediaTypes: [BANNER],
 
+  /**
+   * Determines if the bid request is valid
+   * @param bid {BidRequest} The bid to validate
+   * @return {boolean}
+   */
   isBidRequestValid: (bid) => {
-    try {
-      const { placementId } = bid.params;
-      return typeof placementId === 'string' && placementId.length > 0;
-    } catch (error) {
-      return false;
-    }
+    const pid = bid?.params?.pid;
+    return isStr(pid) && !isEmptyStr(pid);
   },
 
+  /**
+   * Builds the http request
+   * @param validBidRequests {BidRequest[]}
+   * @param bidderRequest {BidderRequest}
+   * @returns {ServerRequest}
+   */
   buildRequests: (validBidRequests, bidderRequest) => {
-    const { url, code: bidderCode } = spec;
-
-    const bids = validBidRequests.map((request) => {
-      delete request.mediaTypes;
-      return request;
-    });
+    const url = buildQuery(bidderRequest);
+    const auth = getVaultJwt();
+    const referer = getReferer(bidderRequest);
+    const imp = validBidRequests.map(processBidRequest);
+    const fpd = getFirstPartyData(bidderRequest.ortb2);
 
-    const sdk = {
-      source: 'pbjs',
-      version: '$prebid.version$',
-    };
-
-    const payload = {
-      ...bidderRequest,
-      bidderCode,
-      bids,
-      sdk,
+    const data = {
+      auth,
+      data: {
+        referer,
+        imp,
+        fpd,
+      },
     };
 
     return {
       method: 'POST',
       url,
-      data: JSON.stringify(payload),
+      data: JSON.stringify(data),
+      options: {},
     };
   },
 
-  interpretResponse: (serverResponse, _) => {
-    const bids = [];
-    try {
-      const { body } = serverResponse;
-      bids.push(...body);
-    } catch (error) {}
-
-    return bids;
+  /**
+   * Parse http response
+   * @param response {ServerResponse}
+   * @returns {Bid[]}
+   */
+  interpretResponse: (response) => {
+    if (isValidResponse(response)) {
+      const { auth, data } = response.body;
+      setVaultJwt(auth);
+      const bids = data.bids.map(processBidResponse);
+      return bids;
+    }
+    return [];
   },
 };
 
+function setVaultJwt(auth) {
+  storageManager.setDataInLocalStorage(LOCAL_STORAGE_KEY.vault.jwt, auth);
+}
+
+function getVaultJwt() {
+  return (
+    storageManager.getDataFromLocalStorage(LOCAL_STORAGE_KEY.vault.jwt) || ''
+  );
+}
+
+function getReferer(bidderRequest) {
+  // TODO: is 'page' the right value here?
+  return bidderRequest?.refererInfo?.page || '';
+}
+
+function buildQuery(bidderRequest) {
+  let url = appendQueryParam(ENDPOINT, 'ver', '$prebid.version$');
+
+  const timeout = config.getConfig('bidderTimeout');
+  url = appendQueryParam(url, 'tmax', timeout);
+
+  if (gdprApplies(bidderRequest)) {
+    const consentString = bidderRequest.gdprConsent.consentString;
+    url = appendQueryParam(url, 'gdpr', consentString);
+  }
+
+  if (ccpaApplies(bidderRequest)) {
+    url = appendQueryParam(url, 'ccpa', bidderRequest.uspConsent);
+  }
+
+  return url;
+}
+
+function appendQueryParam(url, key, value) {
+  if (!value) {
+    return url;
+  }
+  const prefix = url.includes('?') ? '&' : '?';
+  return `${url}${prefix}${key}=${encodeURIComponent(value)}`;
+}
+
+function gdprApplies(bidderRequest) {
+  return Boolean(bidderRequest?.gdprConsent?.gdprApplies);
+}
+
+function ccpaApplies(bidderRequest) {
+  return (
+    isStr(bidderRequest.uspConsent) &&
+    !isEmptyStr(bidderRequest.uspConsent) &&
+    bidderRequest.uspConsent?.substr(1, 3) !== '---'
+  );
+}
+
+function processBidRequest(bid) {
+  const sizes = normalizeSizes(bid.sizes);
+
+  return {
+    bid: bid.bidId,
+    pid: bid.params.pid,
+    sizes,
+  };
+}
+
+function normalizeSizes(sizes) {
+  const isSingleSize =
+    isArray(sizes) &&
+    sizes.length === 2 &&
+    !isArray(sizes[0]) &&
+    !isArray(sizes[1]);
+
+  if (isSingleSize) {
+    return [sizes];
+  }
+
+  return sizes;
+}
+
+function getFirstPartyData(ortb2) {
+  let fpd = ortb2 || {};
+  optimizeObject(fpd);
+  return fpd;
+}
+
+function optimizeObject(obj) {
+  if (!isPlainObject(obj)) {
+    return;
+  }
+  for (const [key, value] of Object.entries(obj)) {
+    optimizeObject(value);
+    // only delete empty object, array, or string
+    if (
+      (isPlainObject(value) || isArray(value) || isStr(value)) &&
+      isEmpty(value)
+    ) {
+      delete obj[key];
+    }
+  }
+}
+
+function isValidResponse(bidResponse) {
+  const auth = bidResponse?.body?.auth;
+  const bids = bidResponse?.body?.data?.bids;
+  return isStr(auth) && isArray(bids) && !isEmpty(bids);
+}
+
+function processBidResponse(bid) {
+  const meta = bid.meta || {};
+  meta.advertiserDomains = bid.meta?.advertiserDomains || [];
+
+  return {
+    ...bid,
+    meta,
+  };
+}
+
 registerBidder(spec);
diff --git a/modules/glimpseBidAdapter.md b/modules/glimpseBidAdapter.md
index 024cc9ebfa7..e82c5d8f32e 100644
--- a/modules/glimpseBidAdapter.md
+++ b/modules/glimpseBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name:  Glimpse Protocol Bid Adapter
 Module Type:  Bidder Adapter
-Maintainer:   hello@glimpseprotocol.io
+Maintainer:   publisher@glimpseprotocol.io
 ```
 
 # Description
@@ -11,12 +11,12 @@ Maintainer:   hello@glimpseprotocol.io
 This module connects publishers to Glimpse Protocol's demand sources via Prebid.js. Our innovative marketplace protects
 consumer privacy while allowing precise targeting. It is compliant with GDPR, DPA and CCPA.
 
-This adapter supports Banner.
+The Glimpse Adapter supports banner formats.
 
 # Test Parameters
 
 ```javascript
-var adUnits = [
+const adUnits = [
   {
     code: 'banner-div-a',
     mediaTypes: {
@@ -28,71 +28,7 @@ var adUnits = [
       {
         bidder: 'glimpse',
         params: {
-          placementId: 'glimpse-demo-300x250',
-        },
-      },
-    ],
-  },
-  {
-    code: 'banner-div-b',
-    mediaTypes: {
-      banner: {
-        sizes: [[320, 50]],
-      },
-    },
-    bids: [
-      {
-        bidder: 'glimpse',
-        params: {
-          placementId: 'glimpse-demo-320x50',
-        },
-      },
-    ],
-  },
-  {
-    code: 'banner-div-c',
-    mediaTypes: {
-      banner: {
-        sizes: [[970, 250]],
-      },
-    },
-    bids: [
-      {
-        bidder: 'glimpse',
-        params: {
-          placementId: 'glimpse-demo-970x250',
-        },
-      },
-    ],
-  },
-  {
-    code: 'banner-div-d',
-    mediaTypes: {
-      banner: {
-        sizes: [[728, 90]],
-      },
-    },
-    bids: [
-      {
-        bidder: 'glimpse',
-        params: {
-          placementId: 'glimpse-demo-728x90',
-        },
-      },
-    ],
-  },
-  {
-    code: 'banner-div-e',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 600]],
-      },
-    },
-    bids: [
-      {
-        bidder: 'glimpse',
-        params: {
-          placementId: 'glimpse-demo-300x600',
+          pid: 'e53a7f564f8f44cc913b',
         },
       },
     ],
diff --git a/modules/globalsunBidAdapter.js b/modules/globalsunBidAdapter.js
new file mode 100644
index 00000000000..ae3407bbbdd
--- /dev/null
+++ b/modules/globalsunBidAdapter.js
@@ -0,0 +1,212 @@
+import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'globalsun';
+const AD_URL = 'https://endpoint.globalsun.io/pbjs';
+const SYNC_URL = 'https://cs.globalsun.io';
+
+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 || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId, endpointId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  if (placementId) {
+    placement.placementId = placementId;
+    placement.type = 'publisher';
+  } else if (endpointId) {
+    placement.endpointId = endpointId;
+    placement.type = 'network';
+  }
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+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 (err) {
+    logError(err);
+    return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    } else {
+      valid = false;
+    }
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+    // TODO: does the fallback make sense here?
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/globalsunBidAdapter.md b/modules/globalsunBidAdapter.md
new file mode 100644
index 00000000000..07c3ce32155
--- /dev/null
+++ b/modules/globalsunBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: Globalsun Bidder Adapter
+Module Type: Globalsun Bidder Adapter
+Maintainer: prebid@globalsun.io
+```
+
+# Description
+
+Connects to Globalsun exchange for bids.
+Globalsun bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'globalsun',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'globalsun',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'globalsun',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/glomexBidAdapter.js b/modules/glomexBidAdapter.js
new file mode 100644
index 00000000000..5c9b3c1fa28
--- /dev/null
+++ b/modules/glomexBidAdapter.js
@@ -0,0 +1,92 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {find} from '../src/polyfill.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const ENDPOINT = 'https://prebid.mes.glomex.cloud/request-bid'
+const BIDDER_CODE = 'glomex'
+const GVLID = 967
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    if (bid && bid.params && bid.params.integrationId) {
+      return true
+    }
+    return false
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest = {}) {
+    const refererInfo = bidderRequest.refererInfo || {};
+    const gdprConsent = bidderRequest.gdprConsent || {};
+
+    return {
+      method: 'POST',
+      url: `${ENDPOINT}`,
+      data: {
+        auctionId: bidderRequest.auctionId,
+        refererInfo: {
+          // TODO: this collects everything it finds, except for canonicalUrl
+          isAmp: refererInfo.isAmp,
+          numIframes: refererInfo.numIframes,
+          reachedTop: refererInfo.reachedTop,
+          referer: refererInfo.topmostLocation,
+        },
+        gdprConsent: {
+          consentString: gdprConsent.consentString,
+          gdprApplies: gdprConsent.gdprApplies
+        },
+        bidRequests: validBidRequests.map(({ params, sizes, bidId, adUnitCode }) => ({
+          bidId,
+          adUnitCode,
+          params,
+          sizes
+        }))
+      },
+      options: {
+        withCredentials: false,
+        contentType: 'application/json'
+      },
+      validBidRequests: validBidRequests,
+    }
+  },
+
+  interpretResponse: function (serverResponse, originalBidRequest) {
+    const bidResponses = []
+
+    originalBidRequest.validBidRequests.forEach(function (bidRequest) {
+      if (!serverResponse.body) {
+        return
+      }
+
+      const matchedBid = find(serverResponse.body.bids, function (bid) {
+        return String(bidRequest.bidId) === String(bid.id)
+      })
+
+      if (matchedBid) {
+        const bidResponse = {
+          requestId: bidRequest.bidId,
+          cpm: matchedBid.cpm,
+          width: matchedBid.width,
+          height: matchedBid.height,
+          creativeId: matchedBid.creativeId,
+          dealId: matchedBid.dealId,
+          currency: matchedBid.currency,
+          netRevenue: matchedBid.netRevenue,
+          ttl: matchedBid.ttl,
+          ad: matchedBid.ad,
+          meta: {
+            advertiserDomains: matchedBid.adomain ? matchedBid.adomain : []
+          }
+        }
+
+        bidResponses.push(bidResponse)
+      }
+    })
+    return bidResponses
+  }
+};
+
+registerBidder(spec)
diff --git a/modules/glomexBidAdapter.md b/modules/glomexBidAdapter.md
new file mode 100644
index 00000000000..d52ed88ff16
--- /dev/null
+++ b/modules/glomexBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+```
+Module Name: Glomex Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: integration-squad@services.glomex.com
+```
+
+# Description
+
+Module to use the Glomex Player with prebid.js
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+                code: "banner",
+                mediaTypes: {
+                    banner: {
+                        sizes: [[640, 360]]
+                    }
+                },
+                bids: [{
+                   bidder: "glomex",
+                   params: {
+                       integrationId: '4059a11hkdzuf65i',
+                       playlistId: 'v-bdui4dz7vjq9'
+                   }
+                }]
+           }
+       ];
+```
diff --git a/modules/gmosspBidAdapter.js b/modules/gmosspBidAdapter.js
index d9dc8f7641a..9bc1a15b60b 100644
--- a/modules/gmosspBidAdapter.js
+++ b/modules/gmosspBidAdapter.js
@@ -1,7 +1,17 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { BANNER } from '../src/mediaTypes.js';
+import {
+  createTrackPixelHtml,
+  deepAccess,
+  deepSetValue,
+  getBidIdParameter,
+  getDNT,
+  getWindowTop,
+  isEmpty,
+  logError,
+  tryAppendQueryString
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {BANNER} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'gmossp';
 const ENDPOINT = 'https://sp.gmossp-sp.jp/hb/prebid/query.ad';
@@ -29,9 +39,9 @@ export const spec = {
   buildRequests: function (validBidRequests, bidderRequest) {
     const bidRequests = [];
 
-    const url = bidderRequest.refererInfo.referer;
+    const urlInfo = getUrlInfo(bidderRequest.refererInfo);
     const cur = getCurrencyType();
-    const dnt = utils.getDNT() ? '1' : '0';
+    const dnt = getDNT() ? '1' : '0';
 
     for (let i = 0; i < validBidRequests.length; i++) {
       let queryString = '';
@@ -39,16 +49,24 @@ export const spec = {
       const request = validBidRequests[i];
       const tid = request.transactionId;
       const bid = request.bidId;
+      const imuid = deepAccess(request, 'userId.imuid');
+      const sharedId = deepAccess(request, 'userId.pubcid');
+      const idlEnv = deepAccess(request, 'userId.idl_env');
       const ver = '$prebid.version$';
-      const sid = utils.getBidIdParameter('sid', request.params);
-
-      queryString = utils.tryAppendQueryString(queryString, 'tid', tid);
-      queryString = utils.tryAppendQueryString(queryString, 'bid', bid);
-      queryString = utils.tryAppendQueryString(queryString, 'ver', ver);
-      queryString = utils.tryAppendQueryString(queryString, 'sid', sid);
-      queryString = utils.tryAppendQueryString(queryString, 'url', url);
-      queryString = utils.tryAppendQueryString(queryString, 'cur', cur);
-      queryString = utils.tryAppendQueryString(queryString, 'dnt', dnt);
+      const sid = getBidIdParameter('sid', request.params);
+
+      queryString = tryAppendQueryString(queryString, 'tid', tid);
+      queryString = tryAppendQueryString(queryString, 'bid', bid);
+      queryString = tryAppendQueryString(queryString, 'ver', ver);
+      queryString = tryAppendQueryString(queryString, 'sid', sid);
+      queryString = tryAppendQueryString(queryString, 'im_uid', imuid);
+      queryString = tryAppendQueryString(queryString, 'shared_id', sharedId);
+      queryString = tryAppendQueryString(queryString, 'idl_env', idlEnv);
+      queryString = tryAppendQueryString(queryString, 'url', urlInfo.url);
+      queryString = tryAppendQueryString(queryString, 'meta_url', urlInfo.canonicalLink);
+      queryString = tryAppendQueryString(queryString, 'ref', urlInfo.ref);
+      queryString = tryAppendQueryString(queryString, 'cur', cur);
+      queryString = tryAppendQueryString(queryString, 'dnt', dnt);
 
       bidRequests.push({
         method: 'GET',
@@ -68,17 +86,17 @@ export const spec = {
   interpretResponse: function (bidderResponse, requests) {
     const res = bidderResponse.body;
 
-    if (utils.isEmpty(res)) {
+    if (isEmpty(res)) {
       return [];
     }
 
     try {
       res.imps.forEach(impTracker => {
-        const tracker = utils.createTrackPixelHtml(impTracker);
+        const tracker = createTrackPixelHtml(impTracker);
         res.ad += tracker;
       });
     } catch (error) {
-      utils.logError('Error appending tracking pixel', error);
+      logError('Error appending tracking pixel', error);
     }
 
     const bid = {
@@ -93,6 +111,10 @@ export const spec = {
       ttl: res.ttl || 300
     };
 
+    if (res.adomains) {
+      deepSetValue(bid, 'meta.advertiserDomains', Array.isArray(res.adomains) ? res.adomains : [res.adomains]);
+    }
+
     return [bid];
   },
 
@@ -103,7 +125,7 @@ export const spec = {
    * @param {ServerResponse[]} serverResponses List of server's responses.
    * @return {UserSync[]} The user syncs which should be dropped.
    */
-  getUserSyncs: function(syncOptions, serverResponses) {
+  getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
     if (!serverResponses.length) {
       return syncs;
@@ -131,4 +153,32 @@ function getCurrencyType() {
   return 'JPY';
 }
 
+function getUrlInfo(refererInfo) {
+  let canonicalLink = refererInfo.canonicalUrl;
+
+  if (!canonicalLink) {
+    let metaElements = getMetaElements();
+    for (let i = 0; i < metaElements.length && !canonicalLink; i++) {
+      if (metaElements[i].getAttribute('property') == 'og:url') {
+        canonicalLink = metaElements[i].content;
+      }
+    }
+  }
+
+  return {
+    canonicalLink: canonicalLink,
+    // TODO: are these the right refererInfo values?
+    url: refererInfo.topmostLocation,
+    ref: refererInfo.ref || window.document.referrer,
+  };
+}
+
+function getMetaElements() {
+  try {
+    return getWindowTop.document.getElementsByTagName('meta');
+  } catch (e) {
+    return document.getElementsByTagName('meta');
+  }
+}
+
 registerBidder(spec);
diff --git a/modules/gnetBidAdapter.js b/modules/gnetBidAdapter.js
new file mode 100644
index 00000000000..8bab043d0db
--- /dev/null
+++ b/modules/gnetBidAdapter.js
@@ -0,0 +1,121 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { _each, isEmpty, parseSizesInput } from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import {ajax} from '../src/ajax.js';
+
+const storage = getStorageManager();
+
+const BIDDER_CODE = 'gnet';
+const ENDPOINT = 'https://service.gnetrtb.com/api';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.websiteId && bid.params.adunitId);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const bidRequests = [];
+    // TODO: is 'page' the right value?
+    const referer = bidderRequest.refererInfo.page;
+
+    _each(validBidRequests, (request) => {
+      const data = {};
+
+      data.referer = referer;
+      data.adUnitCode = request.adUnitCode;
+      data.bidId = request.bidId;
+      data.transactionId = request.transactionId;
+      data.gftuid = _getCookie();
+
+      data.sizes = parseSizesInput(request.sizes);
+
+      data.params = request.params;
+
+      const payloadString = JSON.stringify(data);
+
+      bidRequests.push({
+        method: 'POST',
+        url: ENDPOINT + '/adrequest',
+        options: {
+          withCredentials: false,
+        },
+        data: payloadString
+      });
+    });
+
+    return bidRequests;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, requests) {
+    if (typeof serverResponse !== 'object') {
+      return [];
+    }
+
+    const res = serverResponse && serverResponse.body;
+
+    if (isEmpty(res)) {
+      return [];
+    }
+
+    if (res.bids) {
+      const bids = [];
+      _each(res.bids, (bidData) => {
+        const bid = {
+          requestId: bidData.bidId,
+          cpm: bidData.cpm,
+          currency: bidData.currency,
+          width: bidData.width,
+          height: bidData.height,
+          ad: bidData.ad,
+          ttl: 300,
+          meta: {
+            advertiserDomains: bidData.adomain ? bidData.adomain : []
+          },
+          creativeId: bidData.creativeId,
+          netRevenue: true,
+        };
+        bids.push(bid);
+      });
+
+      return bids;
+    }
+
+    return [];
+  },
+
+  onBidWon: function (bid) {
+    ajax(ENDPOINT + '/bid-won', null, JSON.stringify(bid), {
+      method: 'POST',
+    });
+
+    return true;
+  },
+};
+
+function _getCookie() {
+  return storage.cookiesAreEnabled() ? storage.getCookie('gftuid') : null;
+}
+
+registerBidder(spec);
diff --git a/modules/gnetBidAdapter.md b/modules/gnetBidAdapter.md
new file mode 100644
index 00000000000..efab45a35b1
--- /dev/null
+++ b/modules/gnetBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+```
+Module Name: Gnet RTB Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: bruno.bonanho@grumft.com
+```
+
+# Description
+
+Connect to Gnet RTB exchange for bids.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: '/150790500/4_ZONA_IAB_300x250_5',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [
+                {
+                    bidder: 'gnet',
+                    params: {
+                        websiteId: '1', adunitId: '1'
+                    }
+                }
+            ]
+        }
+    ];
\ No newline at end of file
diff --git a/modules/go2net.md b/modules/go2net.md
deleted file mode 100644
index acea57b1c55..00000000000
--- a/modules/go2net.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Overview
-
-Module Name: Go2Net Bidder Adapter  
-Module Type: Bidder Adapter  
-Maintainer: vprytuzhalova@go2net.com.ua 
-
-# Description
-
-Connects to Go2Net demand source to fetch bids.  
-Banner and Video formats are supported.  
-Please use ```go2net``` as the bidder code.  
-
-# Ad Unit Example
-```
-    var adUnits = [
-           {
-               code: 'desktop-banner-ad-div',
-               sizes: [[300, 250]],  // a display size
-               bids: [
-                   {
-                       bidder: "go2net",
-                       params: {
-                           zone: 'fb3d34d0-7a88-4a4a-a5c9-8088cd7845f4'
-                       }
-                   }
-               ]
-           }
-       ];
-```
diff --git a/modules/goldbachBidAdapter.js b/modules/goldbachBidAdapter.js
new file mode 100644
index 00000000000..21c56643353
--- /dev/null
+++ b/modules/goldbachBidAdapter.js
@@ -0,0 +1,1172 @@
+import {Renderer} from '../src/Renderer.js';
+import {
+  chunk,
+  convertCamelToUnderscore,
+  convertTypes,
+  createTrackPixelHtml,
+  deepAccess,
+  deepClone,
+  fill,
+  getBidRequest,
+  getMaxValueFromArray,
+  getMinValueFromArray,
+  getParameterByName,
+  isArray,
+  isArrayOfNums,
+  isEmpty,
+  isFn,
+  isNumber,
+  isPlainObject,
+  isStr,
+  logError,
+  logInfo,
+  logMessage,
+  transformBidderParamKeywords
+} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {getIabSubCategory, registerBidder} from '../src/adapters/bidderFactory.js';
+import {ADPOD, BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {find, includes} from '../src/polyfill.js';
+import {INSTREAM, OUTSTREAM} from '../src/video.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'goldbach';
+const URL = 'https://ib.adnxs.com/ut/v3/prebid';
+const PRICING_URL = 'https://templates.da-services.ch/01_universal/burda_prebid/1.0/json/sizeCPMMapping.json';
+const URL_SIMPLE = 'https://ib.adnxs-simple.com/ut/v3/prebid';
+const VIDEO_TARGETING = ['id', 'minduration', 'maxduration',
+  'skippable', 'playback_method', 'frameworks', 'context', 'skipoffset'];
+const VIDEO_RTB_TARGETING = ['minduration', 'maxduration', 'skip', 'skipafter', 'playbackmethod', 'api'];
+const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
+const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
+const DEBUG_PARAMS = ['enabled', 'dongle', 'member_id', 'debug_timeout'];
+const DEFAULT_PRICE_MAPPING = {
+  '0x0': 2.5,
+  '300x600': 5,
+  '800x250': 6,
+  '350x600': 6
+};
+let PRICE_MAPPING;
+const VIDEO_MAPPING = {
+  playback_method: {
+    'unknown': 0,
+    'auto_play_sound_on': 1,
+    'auto_play_sound_off': 2,
+    'click_to_play': 3,
+    'mouse_over': 4,
+    'auto_play_sound_unknown': 5
+  },
+  context: {
+    'unknown': 0,
+    'pre_roll': 1,
+    'mid_roll': 2,
+    'post_roll': 3,
+    'outstream': 4,
+    'in-banner': 5
+  }
+};
+const NATIVE_MAPPING = {
+  body: 'description',
+  body2: 'desc2',
+  cta: 'ctatext',
+  image: {
+    serverName: 'main_image',
+    requiredParams: { required: true }
+  },
+  icon: {
+    serverName: 'icon',
+    requiredParams: { required: true }
+  },
+  sponsoredBy: 'sponsored_by',
+  privacyLink: 'privacy_link',
+  salePrice: 'saleprice',
+  displayUrl: 'displayurl'
+};
+const SOURCE = 'pbjs';
+const MAX_IMPS_PER_REQUEST = 15;
+const mappingFileUrl = 'https://acdn.adnxs-simple.com/prebid/appnexus-mapping/mappings.json';
+const SCRIPT_TAG_START = '<script';
+const VIEWABILITY_URL_START = /\/\/cdn\.adnxs\.com\/v|\/\/cdn\.adnxs\-simple\.com\/v/;
+const VIEWABILITY_FILE_NAME = 'trk.js';
+const GVLID = 580;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.placementId || (bid.params.member && bid.params.invCode));
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
+    let localBidRequests = [];
+    bidRequests.forEach(bid => {
+      if (Array.isArray(bid.params.placementId)) {
+        const ids = bid.params.placementId;
+        for (let i = 0; i < ids.length; i++) {
+          const newBid = Object.assign({}, bid, {params: {placementId: ids[i]}});
+          localBidRequests.push(newBid)
+        }
+      } else {
+        localBidRequests.push(bid);
+      }
+    });
+    const tags = localBidRequests.map(bidToTag);
+    const userObjBid = find(bidRequests, hasUserInfo);
+    let userObj = {};
+    if (config.getConfig('coppa') === true) {
+      userObj = { 'coppa': true };
+    }
+    if (userObjBid) {
+      Object.keys(userObjBid.params.user)
+        .filter(param => includes(USER_PARAMS, param))
+        .forEach((param) => {
+          let uparam = convertCamelToUnderscore(param);
+          if (param === 'segments' && isArray(userObjBid.params.user[param])) {
+            let segs = [];
+            userObjBid.params.user[param].forEach(val => {
+              if (isNumber(val)) {
+                segs.push({'id': val});
+              } else if (isPlainObject(val)) {
+                segs.push(val);
+              }
+            });
+            userObj[uparam] = segs;
+          } else if (param !== 'segments') {
+            userObj[uparam] = userObjBid.params.user[param];
+          }
+        });
+    }
+
+    const appDeviceObjBid = find(bidRequests, hasAppDeviceInfo);
+    let appDeviceObj;
+    if (appDeviceObjBid && appDeviceObjBid.params && appDeviceObjBid.params.app) {
+      appDeviceObj = {};
+      Object.keys(appDeviceObjBid.params.app)
+        .filter(param => includes(APP_DEVICE_PARAMS, param))
+        .forEach(param => appDeviceObj[param] = appDeviceObjBid.params.app[param]);
+    }
+
+    const appIdObjBid = find(bidRequests, hasAppId);
+    let appIdObj;
+    if (appIdObjBid && appIdObjBid.params && appDeviceObjBid.params.app && appDeviceObjBid.params.app.id) {
+      appIdObj = {
+        appid: appIdObjBid.params.app.id
+      };
+    }
+
+    let debugObj = {};
+    let debugObjParams = {};
+    const debugBidRequest = find(bidRequests, hasDebug);
+    if (debugBidRequest && debugBidRequest.debug) {
+      debugObj = debugBidRequest.debug;
+    }
+
+    if (debugObj && debugObj.enabled) {
+      Object.keys(debugObj)
+        .filter(param => includes(DEBUG_PARAMS, param))
+        .forEach(param => {
+          debugObjParams[param] = debugObj[param];
+        });
+    }
+
+    const memberIdBid = find(bidRequests, hasMemberId);
+    const member = memberIdBid ? parseInt(memberIdBid.params.member, 10) : 0;
+    const schain = bidRequests[0].schain;
+    const omidSupport = find(bidRequests, hasOmidSupport);
+
+    const payload = {
+      tags: [...tags],
+      user: userObj,
+      sdk: {
+        source: SOURCE,
+        version: '$prebid.version$'
+      },
+      schain: schain
+    };
+
+    if (omidSupport) {
+      payload['iab_support'] = {
+        omidpn: 'Appnexus',
+        omidpv: '$prebid.version$'
+      };
+    }
+
+    if (member > 0) {
+      payload.member_id = member;
+    }
+
+    if (appDeviceObjBid) {
+      payload.device = appDeviceObj;
+    }
+    if (appIdObjBid) {
+      payload.app = appIdObj;
+    }
+
+    if (config.getConfig('adpod.brandCategoryExclusion')) {
+      payload.brand_category_uniqueness = true;
+    }
+
+    if (debugObjParams.enabled) {
+      payload.debug = debugObjParams;
+      logInfo('Debug Auction Settings:\n\n' + JSON.stringify(debugObjParams, null, 4));
+    }
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      // note - objects for impbus use underscore instead of camelCase
+      payload.gdpr_consent = {
+        consent_string: bidderRequest.gdprConsent.consentString,
+        consent_required: bidderRequest.gdprConsent.gdprApplies
+      };
+
+      if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+        let ac = bidderRequest.gdprConsent.addtlConsent;
+        // pull only the ids from the string (after the ~) and convert them to an array of ints
+        let acStr = ac.substring(ac.indexOf('~') + 1);
+        payload.gdpr_consent.addtl_consent = acStr.split('.').map(id => parseInt(id, 10));
+      }
+    }
+
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    if (bidderRequest && bidderRequest.refererInfo) {
+      let refererinfo = {
+        // TODO: this collects everything it finds, except for topmostLocation
+        rd_ref: encodeURIComponent(bidderRequest.refererInfo.topmostLocation),
+        rd_top: bidderRequest.refererInfo.reachedTop,
+        rd_ifs: bidderRequest.refererInfo.numIframes,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      };
+      payload.referrer_detection = refererinfo;
+    }
+
+    const hasAdPodBid = find(bidRequests, hasAdPod);
+    if (hasAdPodBid) {
+      bidRequests.filter(hasAdPod).forEach(adPodBid => {
+        const adPodTags = createAdPodRequest(tags, adPodBid);
+        // don't need the original adpod placement because it's in adPodTags
+        const nonPodTags = payload.tags.filter(tag => tag.uuid !== adPodBid.bidId);
+        payload.tags = [...nonPodTags, ...adPodTags];
+      });
+    }
+
+    if (bidRequests[0].userId) {
+      let eids = [];
+
+      addUserId(eids, deepAccess(bidRequests[0], `userId.criteoId`), 'criteo.com', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.netId`), 'netid.de', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.idl_env`), 'liveramp.com', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.tdid`), 'adserver.org', 'TDID');
+      addUserId(eids, deepAccess(bidRequests[0], `userId.uid2.id`), 'uidapi.com', 'UID2');
+
+      if (eids.length) {
+        payload.eids = eids;
+      }
+    }
+
+    if (tags[0].publisher_id) {
+      payload.publisher_id = tags[0].publisher_id;
+    }
+
+    const request = formatRequest(payload, bidderRequest);
+    // add pricing endpoint
+    return [{method: 'GET', url: PRICING_URL, options: {withCredentials: false}}, request];
+  },
+
+  parseAndMapCpm: function(serverResponse) {
+    const responseBody = serverResponse.body;
+    if (Array.isArray(responseBody) && responseBody.length) {
+      let localData = {};
+      responseBody.forEach(cpmPerSize => {
+        Object.keys(cpmPerSize).forEach(size => {
+          let obj = {};
+          obj[size] = cpmPerSize[size];
+          localData = Object.assign({}, localData, obj)
+        })
+      })
+      PRICE_MAPPING = localData;
+      return null;
+    }
+
+    if (responseBody.version) {
+      const localPriceMapping = PRICE_MAPPING || DEFAULT_PRICE_MAPPING;
+      if (responseBody.tags && Array.isArray(responseBody.tags) && responseBody.tags.length) {
+        responseBody.tags.forEach((tag) => {
+          if (tag.ads && Array.isArray(tag.ads) && tag.ads.length) {
+            tag.ads.forEach(ad => {
+              if (ad.ad_type === 'banner') {
+                const size = `${ad.rtb.banner.width}x${ad.rtb.banner.height}`;
+                if (localPriceMapping[size]) {
+                  ad.cpm = localPriceMapping[size];
+                } else {
+                  ad.cpm = localPriceMapping['0x0'];
+                }
+              }
+            })
+          }
+        });
+      }
+    }
+    return responseBody;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, { bidderRequest }) {
+    serverResponse = this.parseAndMapCpm(serverResponse);
+    if (!serverResponse) return [];
+    const bids = [];
+    if (serverResponse.error) {
+      let errorMessage = `in response for ${bidderRequest.bidderCode} adapter : ${serverResponse.error}`;
+      logError(errorMessage);
+      return bids;
+    }
+
+    if (serverResponse.tags) {
+      serverResponse.tags.forEach(serverBid => {
+        const rtbBid = getRtbBid(serverBid);
+        if (rtbBid) {
+          if (rtbBid.cpm !== 0 && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
+            const bid = newBid(serverBid, rtbBid, bidderRequest);
+            bid.mediaType = parseMediaType(rtbBid);
+            bids.push(bid);
+          }
+        }
+      });
+    }
+
+    if (serverResponse.debug && serverResponse.debug.debug_info) {
+      let debugHeader = 'AppNexus Debug Auction for Prebid\n\n'
+      let debugText = debugHeader + serverResponse.debug.debug_info
+      debugText = debugText
+        .replace(/(<td>|<th>)/gm, '\t') // Tables
+        .replace(/(<\/td>|<\/th>)/gm, '\n') // Tables
+        .replace(/^<br>/gm, '') // Remove leading <br>
+        .replace(/(<br>\n|<br>)/gm, '\n') // <br>
+        .replace(/<h1>(.*)<\/h1>/gm, '\n\n===== $1 =====\n\n') // Header H1
+        .replace(/<h[2-6]>(.*)<\/h[2-6]>/gm, '\n\n*** $1 ***\n\n') // Headers
+        .replace(/(<([^>]+)>)/igm, ''); // Remove any other tags
+      logMessage(debugText);
+    }
+
+    return bids;
+  },
+
+  /**
+   * @typedef {Object} mappingFileInfo
+   * @property {string} url  mapping file json url
+   * @property {number} refreshInDays prebid stores mapping data in localstorage so you can return in how many days you want to update value stored in localstorage.
+   * @property {string} localStorageKey unique key to store your mapping json in localstorage
+   */
+
+  /**
+   * Returns mapping file info. This info will be used by bidderFactory to preload mapping file and store data in local storage
+   * @returns {mappingFileInfo}
+   */
+  getMappingFileInfo: function () {
+    return {
+      url: mappingFileUrl,
+      refreshInDays: 2
+    }
+  },
+
+  getUserSyncs: function (syncOptions, responses, gdprConsent) {
+    if (syncOptions.iframeEnabled && hasPurpose1Consent({gdprConsent})) {
+      return [{
+        type: 'iframe',
+        url: 'https://acdn.adnxs.com/dmp/async_usersync.html'
+      }];
+    }
+  },
+
+  transformBidParams: function (params, isOpenRtb) {
+    params = convertTypes({
+      'member': 'string',
+      'invCode': 'string',
+      'placementId': 'number',
+      'keywords': transformBidderParamKeywords,
+      'publisherId': 'number'
+    }, params);
+
+    if (isOpenRtb) {
+      params.use_pmt_rule = (typeof params.usePaymentRule === 'boolean') ? params.usePaymentRule : false;
+      if (params.usePaymentRule) { delete params.usePaymentRule; }
+
+      if (isPopulatedArray(params.keywords)) {
+        params.keywords.forEach(deleteValues);
+      }
+
+      Object.keys(params).forEach(paramKey => {
+        let convertedKey = convertCamelToUnderscore(paramKey);
+        if (convertedKey !== paramKey) {
+          params[convertedKey] = params[paramKey];
+          delete params[paramKey];
+        }
+      });
+    }
+
+    return params;
+  },
+
+  /**
+   * Add element selector to javascript tracker to improve native viewability
+   * @param {Bid} bid
+   */
+  onBidWon: function (bid) {
+    if (bid.native) {
+      reloadViewabilityScriptWithCorrectParameters(bid);
+    }
+  }
+};
+
+function isPopulatedArray(arr) {
+  return !!(isArray(arr) && arr.length > 0);
+}
+
+function deleteValues(keyPairObj) {
+  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
+    delete keyPairObj.value;
+  }
+}
+
+function reloadViewabilityScriptWithCorrectParameters(bid) {
+  let viewJsPayload = getAppnexusViewabilityScriptFromJsTrackers(bid.native.javascriptTrackers);
+
+  if (viewJsPayload) {
+    let prebidParams = 'pbjs_adid=' + bid.adId + ';pbjs_auc=' + bid.adUnitCode;
+
+    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload);
+
+    let newJsTrackerSrc = jsTrackerSrc.replace('dom_id=%native_dom_id%', prebidParams);
+
+    // find iframe containing script tag
+    let frameArray = document.getElementsByTagName('iframe');
+
+    // boolean var to modify only one script. That way if there are muliple scripts,
+    // they won't all point to the same creative.
+    let modifiedAScript = false;
+
+    // first, loop on all ifames
+    for (let i = 0; i < frameArray.length && !modifiedAScript; i++) {
+      let currentFrame = frameArray[i];
+      try {
+        // IE-compatible, see https://stackoverflow.com/a/3999191/2112089
+        let nestedDoc = currentFrame.contentDocument || currentFrame.contentWindow.document;
+
+        if (nestedDoc) {
+          // if the doc is present, we look for our jstracker
+          let scriptArray = nestedDoc.getElementsByTagName('script');
+          for (let j = 0; j < scriptArray.length && !modifiedAScript; j++) {
+            let currentScript = scriptArray[j];
+            if (currentScript.getAttribute('data-src') == jsTrackerSrc) {
+              currentScript.setAttribute('src', newJsTrackerSrc);
+              currentScript.setAttribute('data-src', '');
+              if (currentScript.removeAttribute) {
+                currentScript.removeAttribute('data-src');
+              }
+              modifiedAScript = true;
+            }
+          }
+        }
+      } catch (exception) {
+        // trying to access a cross-domain iframe raises a SecurityError
+        // this is expected and ignored
+        if (!(exception instanceof DOMException && exception.name === 'SecurityError')) {
+          // all other cases are raised again to be treated by the calling function
+          throw exception;
+        }
+      }
+    }
+  }
+}
+
+function strIsAppnexusViewabilityScript(str) {
+  let regexMatchUrlStart = str.match(VIEWABILITY_URL_START);
+  let viewUrlStartInStr = regexMatchUrlStart != null && regexMatchUrlStart.length >= 1;
+
+  let regexMatchFileName = str.match(VIEWABILITY_FILE_NAME);
+  let fileNameInStr = regexMatchFileName != null && regexMatchFileName.length >= 1;
+
+  return str.startsWith(SCRIPT_TAG_START) && fileNameInStr && viewUrlStartInStr;
+}
+
+function getAppnexusViewabilityScriptFromJsTrackers(jsTrackerArray) {
+  let viewJsPayload;
+  if (isStr(jsTrackerArray) && strIsAppnexusViewabilityScript(jsTrackerArray)) {
+    viewJsPayload = jsTrackerArray;
+  } else if (isArray(jsTrackerArray)) {
+    for (let i = 0; i < jsTrackerArray.length; i++) {
+      let currentJsTracker = jsTrackerArray[i];
+      if (strIsAppnexusViewabilityScript(currentJsTracker)) {
+        viewJsPayload = currentJsTracker;
+      }
+    }
+  }
+  return viewJsPayload;
+}
+
+function getViewabilityScriptUrlFromPayload(viewJsPayload) {
+  // extracting the content of the src attribute
+  // -> substring between src=" and "
+  let indexOfFirstQuote = viewJsPayload.indexOf('src="') + 5; // offset of 5: the length of 'src=' + 1
+  let indexOfSecondQuote = viewJsPayload.indexOf('"', indexOfFirstQuote);
+  let jsTrackerSrc = viewJsPayload.substring(indexOfFirstQuote, indexOfSecondQuote);
+  return jsTrackerSrc;
+}
+
+function formatRequest(payload, bidderRequest) {
+  let request = [];
+  let options = {
+    withCredentials: true
+  };
+
+  let endpointUrl = URL;
+
+  if (!hasPurpose1Consent(bidderRequest?.gdprConsent)) {
+    endpointUrl = URL_SIMPLE;
+  }
+
+  if (getParameterByName('apn_test').toUpperCase() === 'TRUE' || config.getConfig('apn_test') === true) {
+    options.customHeaders = {
+      'X-Is-Test': 1
+    };
+  }
+
+  if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
+    const clonedPayload = deepClone(payload);
+
+    chunk(payload.tags, MAX_IMPS_PER_REQUEST).forEach(tags => {
+      clonedPayload.tags = tags;
+      const payloadString = JSON.stringify(clonedPayload);
+      request.push({
+        method: 'POST',
+        url: endpointUrl,
+        data: payloadString,
+        bidderRequest,
+        options
+      });
+    });
+  } else {
+    const payloadString = JSON.stringify(payload);
+    request = {
+      method: 'POST',
+      url: endpointUrl,
+      data: payloadString,
+      bidderRequest,
+      options
+    };
+  }
+
+  return request;
+}
+
+function newRenderer(adUnitCode, rtbBid, rendererOptions = {}) {
+  const renderer = Renderer.install({
+    id: rtbBid.renderer_id,
+    url: rtbBid.renderer_url,
+    config: rendererOptions,
+    loaded: false,
+    adUnitCode
+  });
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    logError('Prebid Error calling setRender on renderer', err);
+  }
+
+  renderer.setEventHandlers({
+    impression: () => logMessage('Outstream video impression event'),
+    loaded: () => logMessage('Outstream video loaded event'),
+    ended: () => {
+      logMessage('Outstream renderer video event');
+      document.querySelector(`#${adUnitCode}`).style.display = 'none';
+    }
+  });
+  return renderer;
+}
+
+/**
+ * Unpack the Server's Bid into a Prebid-compatible one.
+ * @param serverBid
+ * @param rtbBid
+ * @param bidderRequest
+ * @return Bid
+ */
+function newBid(serverBid, rtbBid, bidderRequest) {
+  const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
+  const bid = {
+    requestId: serverBid.uuid,
+    cpm: rtbBid.cpm,
+    creativeId: rtbBid.creative_id,
+    dealId: rtbBid.deal_id,
+    currency: 'USD',
+    netRevenue: true,
+    ttl: 300,
+    adUnitCode: bidRequest.adUnitCode,
+    appnexus: {
+      buyerMemberId: rtbBid.buyer_member_id,
+      dealPriority: rtbBid.deal_priority,
+      dealCode: rtbBid.deal_code
+    }
+  };
+
+  // WE DON'T FULLY SUPPORT THIS ATM - future spot for adomain code; creating a stub for 5.0 compliance
+  if (rtbBid.adomain) {
+    bid.meta = Object.assign({}, bid.meta, { advertiserDomains: [] });
+  }
+
+  if (rtbBid.advertiser_id) {
+    bid.meta = Object.assign({}, bid.meta, { advertiserId: rtbBid.advertiser_id });
+  }
+
+  if (rtbBid.rtb.video) {
+    // shared video properties used for all 3 contexts
+    Object.assign(bid, {
+      width: rtbBid.rtb.video.player_width,
+      height: rtbBid.rtb.video.player_height,
+      vastImpUrl: rtbBid.notify_url,
+      ttl: 3600
+    });
+
+    const videoContext = deepAccess(bidRequest, 'mediaTypes.video.context');
+    switch (videoContext) {
+      case ADPOD:
+        const primaryCatId = getIabSubCategory(bidRequest.bidder, rtbBid.brand_category_id);
+        bid.meta = Object.assign({}, bid.meta, { primaryCatId });
+        const dealTier = rtbBid.deal_priority;
+        bid.video = {
+          context: ADPOD,
+          durationSeconds: Math.floor(rtbBid.rtb.video.duration_ms / 1000),
+          dealTier
+        };
+        bid.vastUrl = rtbBid.rtb.video.asset_url;
+        break;
+      case OUTSTREAM:
+        bid.adResponse = serverBid;
+        bid.adResponse.ad = bid.adResponse.ads[0];
+        bid.adResponse.ad.video = bid.adResponse.ad.rtb.video;
+        bid.vastXml = rtbBid.rtb.video.content;
+
+        if (rtbBid.renderer_url) {
+          const videoBid = find(bidderRequest.bids, bid => bid.bidId === serverBid.uuid);
+          const rendererOptions = deepAccess(videoBid, 'renderer.options');
+          bid.renderer = newRenderer(bid.adUnitCode, rtbBid, rendererOptions);
+        }
+        break;
+      case INSTREAM:
+        bid.vastUrl = rtbBid.notify_url + '&redir=' + encodeURIComponent(rtbBid.rtb.video.asset_url);
+        break;
+    }
+  } else if (rtbBid.rtb[NATIVE]) {
+    const nativeAd = rtbBid.rtb[NATIVE];
+
+    // setting up the jsTracker:
+    // we put it as a data-src attribute so that the tracker isn't called
+    // until we have the adId (see onBidWon)
+    let jsTrackerDisarmed = rtbBid.viewability.config.replace('src=', 'data-src=');
+
+    let jsTrackers = nativeAd.javascript_trackers;
+
+    if (jsTrackers == undefined) {
+      jsTrackers = jsTrackerDisarmed;
+    } else if (isStr(jsTrackers)) {
+      jsTrackers = [jsTrackers, jsTrackerDisarmed];
+    } else {
+      jsTrackers.push(jsTrackerDisarmed);
+    }
+
+    bid[NATIVE] = {
+      title: nativeAd.title,
+      body: nativeAd.desc,
+      body2: nativeAd.desc2,
+      cta: nativeAd.ctatext,
+      rating: nativeAd.rating,
+      sponsoredBy: nativeAd.sponsored,
+      privacyLink: nativeAd.privacy_link,
+      address: nativeAd.address,
+      downloads: nativeAd.downloads,
+      likes: nativeAd.likes,
+      phone: nativeAd.phone,
+      price: nativeAd.price,
+      salePrice: nativeAd.saleprice,
+      clickUrl: nativeAd.link.url,
+      displayUrl: nativeAd.displayurl,
+      clickTrackers: nativeAd.link.click_trackers,
+      impressionTrackers: nativeAd.impression_trackers,
+      javascriptTrackers: jsTrackers
+    };
+    if (nativeAd.main_img) {
+      bid['native'].image = {
+        url: nativeAd.main_img.url,
+        height: nativeAd.main_img.height,
+        width: nativeAd.main_img.width,
+      };
+    }
+    if (nativeAd.icon) {
+      bid['native'].icon = {
+        url: nativeAd.icon.url,
+        height: nativeAd.icon.height,
+        width: nativeAd.icon.width,
+      };
+    }
+  } else {
+    Object.assign(bid, {
+      width: rtbBid.rtb.banner.width,
+      height: rtbBid.rtb.banner.height,
+      ad: rtbBid.rtb.banner.content
+    });
+    try {
+      if (rtbBid.rtb.trackers) {
+        const url = rtbBid.rtb.trackers[0].impression_urls[0];
+        const tracker = createTrackPixelHtml(url);
+        bid.ad += tracker;
+      }
+    } catch (error) {
+      logError('Error appending tracking pixel', error);
+    }
+  }
+
+  return bid;
+}
+
+function bidToTag(bid) {
+  const tag = {};
+  tag.sizes = transformSizes(bid.sizes);
+  tag.primary_size = tag.sizes[0];
+  tag.ad_types = [];
+  tag.uuid = bid.bidId;
+  if (bid.params.placementId) {
+    tag.id = parseInt(bid.params.placementId, 10);
+  } else {
+    tag.code = bid.params.invCode;
+  }
+  tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
+  tag.prebid = true;
+  tag.disable_psa = true;
+  let bidFloor = getBidFloor(bid);
+  if (bidFloor) {
+    tag.reserve = bidFloor;
+  }
+  if (bid.params.position) {
+    tag.position = { 'above': 1, 'below': 2 }[bid.params.position] || 0;
+  }
+  if (bid.params.trafficSourceCode) {
+    tag.traffic_source_code = bid.params.trafficSourceCode;
+  }
+  if (bid.params.privateSizes) {
+    tag.private_sizes = transformSizes(bid.params.privateSizes);
+  }
+  if (bid.params.supplyType) {
+    tag.supply_type = bid.params.supplyType;
+  }
+  if (bid.params.pubClick) {
+    tag.pubclick = bid.params.pubClick;
+  }
+  if (bid.params.extInvCode) {
+    tag.ext_inv_code = bid.params.extInvCode;
+  }
+  if (bid.params.publisherId) {
+    tag.publisher_id = parseInt(bid.params.publisherId, 10);
+  }
+  if (bid.params.externalImpId) {
+    tag.external_imp_id = bid.params.externalImpId;
+  }
+  if (!isEmpty(bid.params.keywords)) {
+    let keywords = transformBidderParamKeywords(bid.params.keywords);
+
+    if (keywords.length > 0) {
+      keywords.forEach(deleteValues);
+    }
+    tag.keywords = keywords;
+  }
+
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  if (gpid) {
+    tag.gpid = gpid;
+  }
+
+  if (bid.mediaType === NATIVE || deepAccess(bid, `mediaTypes.${NATIVE}`)) {
+    tag.ad_types.push(NATIVE);
+    if (tag.sizes.length === 0) {
+      tag.sizes = transformSizes([1, 1]);
+    }
+
+    if (bid.nativeParams) {
+      const nativeRequest = buildNativeRequest(bid.nativeParams);
+      tag[NATIVE] = { layouts: [nativeRequest] };
+    }
+  }
+
+  const videoMediaType = deepAccess(bid, `mediaTypes.${VIDEO}`);
+  const context = deepAccess(bid, 'mediaTypes.video.context');
+
+  if (videoMediaType && context === 'adpod') {
+    tag.hb_source = 7;
+  } else {
+    tag.hb_source = 1;
+  }
+  if (bid.mediaType === VIDEO || videoMediaType) {
+    tag.ad_types.push(VIDEO);
+  }
+
+  // instream gets vastUrl, outstream gets vastXml
+  if (bid.mediaType === VIDEO || (videoMediaType && context !== 'outstream')) {
+    tag.require_asset_url = true;
+  }
+
+  if (bid.params.video) {
+    tag.video = {};
+    // place any valid video params on the tag
+    Object.keys(bid.params.video)
+      .filter(param => includes(VIDEO_TARGETING, param))
+      .forEach(param => {
+        switch (param) {
+          case 'context':
+          case 'playback_method':
+            let type = bid.params.video[param];
+            type = (isArray(type)) ? type[0] : type;
+            tag.video[param] = VIDEO_MAPPING[param][type];
+            break;
+          // Deprecating tags[].video.frameworks in favor of tags[].video_frameworks
+          case 'frameworks':
+            break;
+          default:
+            tag.video[param] = bid.params.video[param];
+        }
+      });
+
+    if (bid.params.video.frameworks && isArray(bid.params.video.frameworks)) {
+      tag['video_frameworks'] = bid.params.video.frameworks;
+    }
+  }
+
+  // use IAB ORTB values if the corresponding values weren't already set by bid.params.video
+  if (videoMediaType) {
+    tag.video = tag.video || {};
+    Object.keys(videoMediaType)
+      .filter(param => includes(VIDEO_RTB_TARGETING, param))
+      .forEach(param => {
+        switch (param) {
+          case 'minduration':
+          case 'maxduration':
+            if (typeof tag.video[param] !== 'number') tag.video[param] = videoMediaType[param];
+            break;
+          case 'skip':
+            if (typeof tag.video['skippable'] !== 'boolean') tag.video['skippable'] = (videoMediaType[param] === 1);
+            break;
+          case 'skipafter':
+            if (typeof tag.video['skipoffset'] !== 'number') tag.video['skippoffset'] = videoMediaType[param];
+            break;
+          case 'playbackmethod':
+            if (typeof tag.video['playback_method'] !== 'number') {
+              let type = videoMediaType[param];
+              type = (isArray(type)) ? type[0] : type;
+
+              // we only support iab's options 1-4 at this time.
+              if (type >= 1 && type <= 4) {
+                tag.video['playback_method'] = type;
+              }
+            }
+            break;
+          case 'api':
+            if (!tag['video_frameworks'] && isArray(videoMediaType[param])) {
+              // need to read thru array; remove 6 (we don't support it), swap 4 <> 5 if found (to match our adserver mapping for these specific values)
+              let apiTmp = videoMediaType[param].map(val => {
+                let v = (val === 4) ? 5 : (val === 5) ? 4 : val;
+
+                if (v >= 1 && v <= 5) {
+                  return v;
+                }
+              }).filter(v => v);
+              tag['video_frameworks'] = apiTmp;
+            }
+            break;
+        }
+      });
+  }
+
+  if (bid.renderer) {
+    tag.video = Object.assign({}, tag.video, { custom_renderer_present: true });
+  }
+
+  if (bid.params.frameworks && isArray(bid.params.frameworks)) {
+    tag['banner_frameworks'] = bid.params.frameworks;
+  }
+
+  let adUnit = find(auctionManager.getAdUnits(), au => bid.transactionId === au.transactionId);
+  if (adUnit && adUnit.mediaTypes && adUnit.mediaTypes.banner) {
+    tag.ad_types.push(BANNER);
+  }
+
+  if (tag.ad_types.length === 0) {
+    delete tag.ad_types;
+  }
+
+  return tag;
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (isArray(requestSizes) && requestSizes.length === 2 &&
+    !isArray(requestSizes[0])) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+function hasUserInfo(bid) {
+  return !!bid.params.user;
+}
+
+function hasMemberId(bid) {
+  return !!parseInt(bid.params.member, 10);
+}
+
+function hasAppDeviceInfo(bid) {
+  if (bid.params) {
+    return !!bid.params.app
+  }
+}
+
+function hasAppId(bid) {
+  if (bid.params && bid.params.app) {
+    return !!bid.params.app.id
+  }
+  return !!bid.params.app
+}
+
+function hasDebug(bid) {
+  return !!bid.debug
+}
+
+function hasAdPod(bid) {
+  return (
+    bid.mediaTypes &&
+    bid.mediaTypes.video &&
+    bid.mediaTypes.video.context === ADPOD
+  );
+}
+
+function hasOmidSupport(bid) {
+  let hasOmid = false;
+  const bidderParams = bid.params;
+  const videoParams = bid.params.video;
+  if (bidderParams.frameworks && isArray(bidderParams.frameworks)) {
+    hasOmid = includes(bid.params.frameworks, 6);
+  }
+  if (!hasOmid && videoParams && videoParams.frameworks && isArray(videoParams.frameworks)) {
+    hasOmid = includes(bid.params.video.frameworks, 6);
+  }
+  return hasOmid;
+}
+
+/**
+ * Expand an adpod placement into a set of request objects according to the
+ * total adpod duration and the range of duration seconds. Sets minduration/
+ * maxduration video property according to requireExactDuration configuration
+ */
+function createAdPodRequest(tags, adPodBid) {
+  const { durationRangeSec, requireExactDuration } = adPodBid.mediaTypes.video;
+
+  const numberOfPlacements = getAdPodPlacementNumber(adPodBid.mediaTypes.video);
+  const maxDuration = getMaxValueFromArray(durationRangeSec);
+
+  const tagToDuplicate = tags.filter(tag => tag.uuid === adPodBid.bidId);
+  let request = fill(...tagToDuplicate, numberOfPlacements);
+
+  if (requireExactDuration) {
+    const divider = Math.ceil(numberOfPlacements / durationRangeSec.length);
+    const chunked = chunk(request, divider);
+
+    // each configured duration is set as min/maxduration for a subset of requests
+    durationRangeSec.forEach((duration, index) => {
+      chunked[index].map(tag => {
+        setVideoProperty(tag, 'minduration', duration);
+        setVideoProperty(tag, 'maxduration', duration);
+      });
+    });
+  } else {
+    // all maxdurations should be the same
+    request.map(tag => setVideoProperty(tag, 'maxduration', maxDuration));
+  }
+
+  return request;
+}
+
+function getAdPodPlacementNumber(videoParams) {
+  const { adPodDurationSec, durationRangeSec, requireExactDuration } = videoParams;
+  const minAllowedDuration = getMinValueFromArray(durationRangeSec);
+  const numberOfPlacements = Math.floor(adPodDurationSec / minAllowedDuration);
+
+  return requireExactDuration
+    ? Math.max(numberOfPlacements, durationRangeSec.length)
+    : numberOfPlacements;
+}
+
+function setVideoProperty(tag, key, value) {
+  if (isEmpty(tag.video)) { tag.video = {}; }
+  tag.video[key] = value;
+}
+
+function getRtbBid(tag) {
+  return tag && tag.ads && tag.ads.length && find(tag.ads, ad => ad.rtb);
+}
+
+function buildNativeRequest(params) {
+  const request = {};
+
+  // map standard prebid native asset identifier to /ut parameters
+  // e.g., tag specifies `body` but /ut only knows `description`.
+  // mapping may be in form {tag: '<server name>'} or
+  // {tag: {serverName: '<server name>', requiredParams: {...}}}
+  Object.keys(params).forEach(key => {
+    // check if one of the <server name> forms is used, otherwise
+    // a mapping wasn't specified so pass the key straight through
+    const requestKey =
+      (NATIVE_MAPPING[key] && NATIVE_MAPPING[key].serverName) ||
+      NATIVE_MAPPING[key] ||
+      key;
+
+    // required params are always passed on request
+    const requiredParams = NATIVE_MAPPING[key] && NATIVE_MAPPING[key].requiredParams;
+    request[requestKey] = Object.assign({}, requiredParams, params[key]);
+
+    // convert the sizes of image/icon assets to proper format (if needed)
+    const isImageAsset = !!(requestKey === NATIVE_MAPPING.image.serverName || requestKey === NATIVE_MAPPING.icon.serverName);
+    if (isImageAsset && request[requestKey].sizes) {
+      let sizes = request[requestKey].sizes;
+      if (isArrayOfNums(sizes) || (isArray(sizes) && sizes.length > 0 && sizes.every(sz => isArrayOfNums(sz)))) {
+        request[requestKey].sizes = transformSizes(request[requestKey].sizes);
+      }
+    }
+
+    if (requestKey === NATIVE_MAPPING.privacyLink) {
+      request.privacy_supported = true;
+    }
+  });
+
+  return request;
+}
+
+/**
+ * This function hides google div container for outstream bids to remove unwanted space on page. Appnexus renderer creates a new iframe outside of google iframe to render the outstream creative.
+ * @param {string} elementId element id
+ */
+function hidedfpContainer(elementId) {
+  var el = document.getElementById(elementId).querySelectorAll("div[id^='google_ads']");
+  if (el[0]) {
+    el[0].style.setProperty('display', 'none');
+  }
+}
+
+function hideSASIframe(elementId) {
+  try {
+    // find script tag with id 'sas_script'. This ensures it only works if you're using Smart Ad Server.
+    const el = document.getElementById(elementId).querySelectorAll("script[id^='sas_script']");
+    if (el[0].nextSibling && el[0].nextSibling.localName === 'iframe') {
+      el[0].nextSibling.style.setProperty('display', 'none');
+    }
+  } catch (e) {
+    // element not found!
+  }
+}
+
+function outstreamRender(bid) {
+  hidedfpContainer(bid.adUnitCode);
+  hideSASIframe(bid.adUnitCode);
+  // push to render queue because ANOutstreamVideo may not be loaded yet
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      tagId: bid.adResponse.tag_id,
+      sizes: [bid.getSize().split('x')],
+      targetId: bid.adUnitCode, // target div id to render video
+      uuid: bid.adResponse.uuid,
+      adResponse: bid.adResponse,
+      rendererOptions: bid.renderer.getConfig()
+    }, handleOutstreamRendererEvents.bind(null, bid));
+  });
+}
+
+function handleOutstreamRendererEvents(bid, id, eventName) {
+  bid.renderer.handleVideoEvent({ id, eventName });
+}
+
+function parseMediaType(rtbBid) {
+  const adType = rtbBid.ad_type;
+  if (adType === VIDEO) {
+    return VIDEO;
+  } else if (adType === NATIVE) {
+    return NATIVE;
+  } else {
+    return BANNER;
+  }
+}
+
+function addUserId(eids, id, source, rti) {
+  if (id) {
+    if (rti) {
+      eids.push({ source, id, rti_partner: rti });
+    } else {
+      eids.push({ source, id });
+    }
+  }
+  return eids;
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.reserve) ? bid.params.reserve : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
+registerBidder(spec);
diff --git a/modules/goldbachBidAdapter.md b/modules/goldbachBidAdapter.md
new file mode 100644
index 00000000000..f7c9479439b
--- /dev/null
+++ b/modules/goldbachBidAdapter.md
@@ -0,0 +1,151 @@
+#Overview
+
+```
+Module Name:  Goldbach Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: dusan.veljovic@goldbach.com
+```
+
+# Description
+
+Connects to Xandr exchange for bids.
+
+Goldbach bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'goldbach',
+         params: {
+           placementId: 13144370
+         }
+       }]
+   },
+   // Native adUnit
+   {
+      code: 'native-div',
+      sizes: [[1, 1]],
+      mediaTypes: {
+        native: {
+          title: {
+            required: true
+          },
+          body: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          },
+          icon: {
+            required: false
+          }
+        }
+      },
+      bids: [{
+        bidder: 'goldbach',
+        params: {
+          placementId: 13232354,
+          allowSmallerSizes: true
+        }
+      }]
+   },
+   // Video instream adUnit
+   {
+      code: 'video-instream',
+      sizes: [[640, 480]],
+      mediaTypes: {
+        video: {
+          playerSize: [[640, 480]],
+          context: 'instream'
+        },
+      },
+      bids: [{
+        goldbach: 'goldbach',
+        params: {
+          placementId: 13232361,
+          video: {
+            skippable: true,
+            playback_methods: ['auto_play_sound_off']
+          }
+        }
+      }]
+   },
+   // Video outstream adUnit
+   {
+     code: 'video-outstream',
+     sizes: [[300, 250]],
+     mediaTypes: {
+       video: {
+         playerSize: [[300, 250]],
+         context: 'outstream',
+         // Certain ORTB 2.5 video values can be read from the mediatypes object; below are examples of supported params.
+         // To note - goldbach supports additional values for our system that are not part of the ORTB spec.  If you want
+         // to use these values, they will have to be declared in the bids[].params.video object instead using the goldbach syntax.
+         // Between the corresponding values of the mediaTypes.video and params.video objects, the properties in params.video will 
+         // take precedence if declared; eg in the example below, the `skippable: true` setting will be used instead of the `skip: 0`.
+         minduration: 1,
+         maxduration: 60,
+         skip: 0,   // 1 - true, 0 - false
+         skipafter: 5,
+         playbackmethod: [2], // note - we only support options 1-4 at this time
+         api: [1,2,3]   // note - option 6 is not supported at this time
+       }
+     },
+     bids: [
+       {
+         bidder: 'goldbach',
+         params: {
+           placementId: 13232385,
+           video: {
+             skippable: true,
+             playback_method: 'auto_play_sound_off'
+           }
+         }
+       }
+     ]
+   },
+   // Banner adUnit in a App Webview
+   // Only use this for situations where prebid.js is in a webview of an App
+   // See Prebid Mobile for displaying ads via an SDK
+   {
+     code: 'banner-div',
+     mediaTypes: {
+       banner: {
+         sizes: [[300, 250], [300,600]]
+       }
+     }
+     bids: [{
+       bidder: 'goldbach',
+       params: {
+         placementId: 13144370,
+         app: {
+           id: "B1O2W3M4AN.com.prebid.webview",
+           geo: {
+             lat: 40.0964439,
+             lng: -75.3009142
+           },
+           device_id: {
+             idfa: "4D12078D-3246-4DA4-AD5E-7610481E7AE", // Apple advertising identifier
+             aaid: "38400000-8cf0-11bd-b23e-10b96e40000d", // Android advertising identifier
+             md5udid: "5756ae9022b2ea1e47d84fead75220c8", // MD5 hash of the ANDROID_ID
+             sha1udid: "4DFAA92388699AC6539885AEF1719293879985BF", // SHA1 hash of the ANDROID_ID
+             windowsadid: "750c6be243f1c4b5c9912b95a5742fc5" // Windows advertising identifier
+           }
+         }
+       }
+     }]
+   }
+];
+```
diff --git a/modules/googleAnalyticsAdapter.js b/modules/googleAnalyticsAdapter.js
index a8fc83ae62e..88ce20d07fa 100644
--- a/modules/googleAnalyticsAdapter.js
+++ b/modules/googleAnalyticsAdapter.js
@@ -2,10 +2,10 @@
  * ga.js - analytics adapter for google analytics
  */
 
-var events = require('../src/events.js');
-var utils = require('../src/utils.js');
-var CONSTANTS = require('../src/constants.json');
-var adapterManager = require('../src/adapterManager.js').default;
+import { _each, logMessage } from '../src/utils.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
 
 var BID_REQUESTED = CONSTANTS.EVENTS.BID_REQUESTED;
 var BID_TIMEOUT = CONSTANTS.EVENTS.BID_TIMEOUT;
@@ -22,6 +22,7 @@ var _enableDistribution = false;
 var _cpmDistribution = null;
 var _trackerSend = null;
 var _sampled = true;
+var _sendFloors = false;
 
 let adapter = {};
 
@@ -46,6 +47,9 @@ adapter.enableAnalytics = function ({ provider, options }) {
   if (options && typeof options.cpmDistribution === 'function') {
     _cpmDistribution = options.cpmDistribution;
   }
+  if (options && typeof options.sendFloors !== 'undefined') {
+    _sendFloors = options.sendFloors;
+  }
 
   var bid = null;
 
@@ -54,7 +58,7 @@ adapter.enableAnalytics = function ({ provider, options }) {
 
     var existingEvents = events.getEvents();
 
-    utils._each(existingEvents, function (eventObj) {
+    _each(existingEvents, function (eventObj) {
       if (typeof eventObj !== 'object') {
         return;
       }
@@ -98,12 +102,12 @@ adapter.enableAnalytics = function ({ provider, options }) {
       sendBidWonToGa(bid);
     });
   } else {
-    utils.logMessage('Prebid.js google analytics disabled by sampling');
+    logMessage('Prebid.js google analytics disabled by sampling');
   }
 
   // finally set this function to return log message, prevents multiple adapter listeners
   this.enableAnalytics = function _enable() {
-    return utils.logMessage(`Analytics adapter already enabled, unnecessary call to \`enableAnalytics\`.`);
+    return logMessage(`Analytics adapter already enabled, unnecessary call to \`enableAnalytics\`.`);
   };
 };
 
@@ -129,7 +133,7 @@ function checkAnalytics() {
     _enableCheck = false;
   }
 
-  utils.logMessage('event count sent to GA: ' + _eventCount);
+  logMessage('event count sent to GA: ' + _eventCount);
 }
 
 function convertToCents(dollars) {
@@ -203,7 +207,17 @@ function sendBidRequestToGa(bid) {
   if (bid && bid.bidderCode) {
     _analyticsQueue.push(function () {
       _eventCount++;
-      window[_gaGlobal](_trackerSend, 'event', _category, 'Requests', bid.bidderCode, 1, _disableInteraction);
+      if (_sendFloors) {
+        var floor = 'No Floor';
+        if (bid.floorData) {
+          floor = bid.floorData.floorValue;
+        } else if (bid.bids.length) {
+          floor = bid.bids[0].getFloor().floor;
+        }
+        window[_gaGlobal](_trackerSend, 'event', _category, 'Requests by Floor=' + floor, bid.bidderCode, 1, _disableInteraction);
+      } else {
+        window[_gaGlobal](_trackerSend, 'event', _category, 'Requests', bid.bidderCode, 1, _disableInteraction);
+      }
     });
   }
 
@@ -229,8 +243,12 @@ function sendBidResponseToGa(bid) {
           _eventCount++;
           window[_gaGlobal](_trackerSend, 'event', 'Prebid.js CPM Distribution', cpmDis, bidder, 1, _disableInteraction);
         }
-
-        window[_gaGlobal](_trackerSend, 'event', _category, 'Bids', bidder, cpmCents, _disableInteraction);
+        if (_sendFloors) {
+          var floor = (bid.floorData) ? bid.floorData.floorValue : 'No Floor';
+          window[_gaGlobal](_trackerSend, 'event', _category, 'Bids by Floor=' + floor, 'Size=' + bid.size + ',' + bidder, cpmCents, _disableInteraction);
+        } else {
+          window[_gaGlobal](_trackerSend, 'event', _category, 'Bids', bidder, cpmCents, _disableInteraction);
+        }
         window[_gaGlobal](_trackerSend, 'event', _category, 'Bid Load Time', bidder, bid.timeToRespond, _disableInteraction);
       }
     });
@@ -242,7 +260,7 @@ function sendBidResponseToGa(bid) {
 
 function sendBidTimeouts(timedOutBidders) {
   _analyticsQueue.push(function () {
-    utils._each(timedOutBidders, function (bidderCode) {
+    _each(timedOutBidders, function (bidderCode) {
       _eventCount++;
       var bidderName = bidderCode.bidder;
       window[_gaGlobal](_trackerSend, 'event', _category, 'Timeouts', bidderName, _disableInteraction);
@@ -256,7 +274,12 @@ function sendBidWonToGa(bid) {
   var cpmCents = convertToCents(bid.cpm);
   _analyticsQueue.push(function () {
     _eventCount++;
-    window[_gaGlobal](_trackerSend, 'event', _category, 'Wins', bid.bidderCode, cpmCents, _disableInteraction);
+    if (_sendFloors) {
+      var floor = (bid.floorData) ? bid.floorData.floorValue : 'No Floor';
+      window[_gaGlobal](_trackerSend, 'event', _category, 'Wins by Floor=' + floor, 'Size=' + bid.size + ',' + bid.bidderCode, cpmCents, _disableInteraction);
+    } else {
+      window[_gaGlobal](_trackerSend, 'event', _category, 'Wins', bid.bidderCode, cpmCents, _disableInteraction);
+    }
   });
 
   checkAnalytics();
diff --git a/modules/googleAnalyticsAdapter.md b/modules/googleAnalyticsAdapter.md
index 08423a1d492..8c31b07b811 100644
--- a/modules/googleAnalyticsAdapter.md
+++ b/modules/googleAnalyticsAdapter.md
@@ -30,6 +30,7 @@ Here is a full list of settings available
 - `enableDistribution` (boolean) - enables additional events that track load time and cpm distribution
   by creating buckets for load time and cpm
 - `cpmDistribution` (cpm: number => string) - customize the cpm buckets for the cpm distribution
+- `sendFloors` (boolean) - if set, will include floor data in the eventCategory field and include ad unit code in eventAction field
 
 
 ## Additional resources
diff --git a/modules/gothamadsBidAdapter.js b/modules/gothamadsBidAdapter.js
new file mode 100644
index 00000000000..6b549f347bb
--- /dev/null
+++ b/modules/gothamadsBidAdapter.js
@@ -0,0 +1,347 @@
+import { logMessage, deepSetValue, deepAccess, _map, logWarn } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'gothamads';
+const ACCOUNTID_MACROS = '[account_id]';
+const URL_ENDPOINT = `https://us-e-node1.gothamads.com/bid?pass=${ACCOUNTID_MACROS}&integration=prebidjs`;
+const NATIVE_ASSET_IDS = {
+  0: 'title',
+  2: 'icon',
+  3: 'image',
+  5: 'sponsoredBy',
+  4: 'body',
+  1: 'cta'
+};
+const NATIVE_PARAMS = {
+  title: {
+    id: 0,
+    name: 'title'
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img'
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1
+  },
+  body: {
+    id: 4,
+    name: 'data',
+    type: 2
+  },
+  cta: {
+    id: 1,
+    type: 12,
+    name: 'data'
+  }
+};
+const NATIVE_VERSION = '1.2';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.params.accountId) && Boolean(bid.params.placementId)
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    if (validBidRequests && validBidRequests.length === 0) return []
+    let accuontId = validBidRequests[0].params.accountId;
+    const endpointURL = URL_ENDPOINT.replace(ACCOUNTID_MACROS, accuontId);
+
+    let winTop = window;
+    let location;
+    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
+    try {
+      location = new URL(bidderRequest.refererInfo.page)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      logMessage(e);
+    };
+
+    let bids = [];
+    for (let bidRequest of validBidRequests) {
+      let impObject = prepareImpObject(bidRequest);
+      let data = {
+        id: bidRequest.bidId,
+        test: config.getConfig('debug') ? 1 : 0,
+        cur: ['USD'],
+        device: {
+          w: winTop.screen.width,
+          h: winTop.screen.height,
+          language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
+        },
+        site: {
+          page: location.pathname,
+          host: location.host
+        },
+        source: {
+          tid: bidRequest.transactionId
+        },
+        regs: {
+          coppa: config.getConfig('coppa') === true ? 1 : 0,
+          ext: {}
+        },
+        tmax: bidRequest.timeout,
+        imp: [impObject],
+      };
+
+      if (bidRequest.gdprConsent && bidRequest.gdprConsent.gdprApplies) {
+        deepSetValue(data, 'regs.ext.gdpr', bidRequest.gdprConsent.gdprApplies ? 1 : 0);
+        deepSetValue(data, 'user.ext.consent', bidRequest.gdprConsent.consentString);
+      }
+
+      if (bidRequest.uspConsent !== undefined) {
+        deepSetValue(data, 'regs.ext.us_privacy', bidRequest.uspConsent);
+      }
+
+      bids.push(data)
+    }
+    return {
+      method: 'POST',
+      url: endpointURL,
+      data: bids
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (serverResponse) => {
+    if (!serverResponse || !serverResponse.body) return [];
+    let GothamAdsResponse = serverResponse.body;
+
+    let bids = [];
+    for (let response of GothamAdsResponse) {
+      let mediaType = response.seatbid[0].bid[0].ext && response.seatbid[0].bid[0].ext.mediaType ? response.seatbid[0].bid[0].ext.mediaType : BANNER;
+
+      let bid = {
+        requestId: response.id,
+        cpm: response.seatbid[0].bid[0].price,
+        width: response.seatbid[0].bid[0].w,
+        height: response.seatbid[0].bid[0].h,
+        ttl: response.ttl || 1200,
+        currency: response.cur || 'USD',
+        netRevenue: true,
+        creativeId: response.seatbid[0].bid[0].crid,
+        dealId: response.seatbid[0].bid[0].dealid,
+        mediaType: mediaType
+      };
+
+      bid.meta = {};
+      if (response.seatbid[0].bid[0].adomain && response.seatbid[0].bid[0].adomain.length > 0) {
+        bid.meta.advertiserDomains = response.seatbid[0].bid[0].adomain;
+      }
+
+      switch (mediaType) {
+        case VIDEO:
+          bid.vastXml = response.seatbid[0].bid[0].adm;
+          bid.vastUrl = response.seatbid[0].bid[0].ext.vastUrl;
+          break;
+        case NATIVE:
+          bid.native = parseNative(response.seatbid[0].bid[0].adm);
+          break;
+        default:
+          bid.ad = response.seatbid[0].bid[0].adm;
+      }
+
+      bids.push(bid);
+    }
+
+    return bids;
+  },
+};
+
+/**
+ * Determine type of request
+ *
+ * @param bidRequest
+ * @param type
+ * @returns {boolean}
+ */
+const checkRequestType = (bidRequest, type) => {
+  return (typeof deepAccess(bidRequest, `mediaTypes.${type}`) !== 'undefined');
+}
+
+const parseNative = admObject => {
+  const {
+    assets,
+    link,
+    imptrackers,
+    jstracker
+  } = admObject.native;
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined,
+    impressionTrackers: imptrackers || undefined,
+    javascriptTrackers: jstracker ? [jstracker] : undefined
+  };
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text || content.value || {
+        url: content.url,
+        width: content.w,
+        height: content.h
+      };
+    }
+  });
+
+  return result;
+}
+
+const prepareImpObject = (bidRequest) => {
+  let impObject = {
+    id: bidRequest.transactionId,
+    secure: 1,
+    ext: {
+      placementId: bidRequest.params.placementId
+    }
+  };
+  if (checkRequestType(bidRequest, BANNER)) {
+    impObject.banner = addBannerParameters(bidRequest);
+  }
+  if (checkRequestType(bidRequest, VIDEO)) {
+    impObject.video = addVideoParameters(bidRequest);
+  }
+  if (checkRequestType(bidRequest, NATIVE)) {
+    impObject.native = {
+      ver: NATIVE_VERSION,
+      request: addNativeParameters(bidRequest)
+    };
+  }
+  return impObject
+};
+
+const addNativeParameters = bidRequest => {
+  let impObject = {
+    id: bidRequest.transactionId,
+    ver: NATIVE_VERSION,
+  };
+
+  const assets = _map(bidRequest.mediaTypes.native, (bidParams, key) => {
+    const props = NATIVE_PARAMS[key];
+    const asset = {
+      required: bidParams.required & 1,
+    };
+    if (props) {
+      asset.id = props.id;
+      let wmin, hmin;
+      let aRatios = bidParams.aspect_ratios;
+
+      if (aRatios && aRatios[0]) {
+        aRatios = aRatios[0];
+        wmin = aRatios.min_width || 0;
+        hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+      }
+
+      if (bidParams.sizes) {
+        const sizes = flatten(bidParams.sizes);
+        wmin = sizes[0];
+        hmin = sizes[1];
+      }
+
+      asset[props.name] = {};
+
+      if (bidParams.len) asset[props.name]['len'] = bidParams.len;
+      if (props.type) asset[props.name]['type'] = props.type;
+      if (wmin) asset[props.name]['wmin'] = wmin;
+      if (hmin) asset[props.name]['hmin'] = hmin;
+
+      return asset;
+    }
+  }).filter(Boolean);
+
+  impObject.assets = assets;
+  return impObject
+}
+
+const addBannerParameters = (bidRequest) => {
+  let bannerObject = {};
+  const size = parseSizes(bidRequest, 'banner');
+  bannerObject.w = size[0];
+  bannerObject.h = size[1];
+  return bannerObject;
+};
+
+const parseSizes = (bid, mediaType) => {
+  let mediaTypes = bid.mediaTypes;
+  if (mediaType === 'video') {
+    let size = [];
+    if (mediaTypes.video && mediaTypes.video.w && mediaTypes.video.h) {
+      size = [
+        mediaTypes.video.w,
+        mediaTypes.video.h
+      ];
+    } else if (Array.isArray(deepAccess(bid, 'mediaTypes.video.playerSize')) && bid.mediaTypes.video.playerSize.length === 1) {
+      size = bid.mediaTypes.video.playerSize[0];
+    } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0 && Array.isArray(bid.sizes[0]) && bid.sizes[0].length > 1) {
+      size = bid.sizes[0];
+    }
+    return size;
+  }
+  let sizes = [];
+  if (Array.isArray(mediaTypes.banner.sizes)) {
+    sizes = mediaTypes.banner.sizes[0];
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizes = bid.sizes
+  } else {
+    logWarn('no sizes are setup or found');
+  }
+
+  return sizes
+}
+
+const addVideoParameters = (bidRequest) => {
+  let videoObj = {};
+  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity']
+
+  for (let param of supportParamsList) {
+    if (bidRequest.mediaTypes.video[param] !== undefined) {
+      videoObj[param] = bidRequest.mediaTypes.video[param];
+    }
+  }
+
+  const size = parseSizes(bidRequest, 'video');
+  videoObj.w = size[0];
+  videoObj.h = size[1];
+  return videoObj;
+}
+
+const flatten = arr => {
+  return [].concat(...arr);
+}
+
+registerBidder(spec);
diff --git a/modules/gothamadsBidAdapter.md b/modules/gothamadsBidAdapter.md
new file mode 100644
index 00000000000..3105dff6c6c
--- /dev/null
+++ b/modules/gothamadsBidAdapter.md
@@ -0,0 +1,104 @@
+# Overview
+
+```
+Module Name: GothamAds SSP Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@gothamads.com
+```
+
+# Description
+
+Module that connects to GothamAds SSP demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+                code: 'placementId',
+                      mediaTypes: {
+                          banner: {
+                              sizes: [[300, 250], [300,600]]
+                              }
+                              },
+                bids: [{
+                        bidder: 'gothamads',
+                        params: {
+                                placementId: 'hash',
+                            accountId: 'accountId'
+                        }
+                    }]
+                },
+                {
+                    code: 'native_example',
+                    // sizes: [[1, 1]],
+                    mediaTypes: {
+                      native: {
+                        title: {
+                          required: true,
+                          len: 800
+                        },
+                        image: {
+                          required: true,
+                            len: 80
+                        },
+                        sponsoredBy: {
+                            required: true
+                        },
+                        clickUrl: {
+                            required: true
+                        },
+                        privacyLink: {
+                            required: false
+                        },
+                        body: {
+                            required: true
+                        },
+                        icon: {
+                            required: true,
+                            sizes: [50, 50]
+                        }
+                    }
+
+                    },
+                    bids: [    {
+                            bidder: 'gothamads',
+                            params: {
+                                    placementId: 'hash',
+                            accountId: 'accountId'
+                            }
+                        }]
+            }, 
+            {
+    code: 'video1',
+    sizes: [640,480],
+    mediaTypes: { video: {
+      minduration:0,
+                maxduration:999,
+                boxingallowed:1,
+                skip:0,
+                mimes:[
+                    'application/javascript',
+                    'video/mp4'
+                ],
+                w:1920,
+                h:1080,
+                protocols:[
+                    2
+                ],
+                linearity:1,
+                api:[
+                    1,
+                    2
+                ]
+    } },
+    bids: [
+    {
+                bidder: 'gothamads',
+                params: {
+                        placementId: 'hash',
+                    accountId: 'accountId'
+                }
+            }
+    ]
+  }
+            ];
+```
\ No newline at end of file
diff --git a/modules/gptPreAuction.js b/modules/gptPreAuction.js
new file mode 100644
index 00000000000..71884235b38
--- /dev/null
+++ b/modules/gptPreAuction.js
@@ -0,0 +1,167 @@
+import {deepAccess, isAdUnitCodeMatchingSlot, isGptPubadsDefined, logInfo, pick} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {getHook} from '../src/hook.js';
+import {find} from '../src/polyfill.js';
+
+const MODULE_NAME = 'GPT Pre-Auction';
+export let _currentConfig = {};
+let hooksAdded = false;
+
+export const appendGptSlots = adUnits => {
+  const { customGptSlotMatching } = _currentConfig;
+
+  if (!isGptPubadsDefined()) {
+    return;
+  }
+
+  const adUnitMap = adUnits.reduce((acc, adUnit) => {
+    acc[adUnit.code] = adUnit;
+    return acc;
+  }, {});
+
+  window.googletag.pubads().getSlots().forEach(slot => {
+    const matchingAdUnitCode = find(Object.keys(adUnitMap), customGptSlotMatching
+      ? customGptSlotMatching(slot)
+      : isAdUnitCodeMatchingSlot(slot));
+
+    if (matchingAdUnitCode) {
+      const adUnit = adUnitMap[matchingAdUnitCode];
+      adUnit.ortb2Imp = adUnit.ortb2Imp || {};
+      adUnit.ortb2Imp.ext = adUnit.ortb2Imp.ext || {};
+      adUnit.ortb2Imp.ext.data = adUnit.ortb2Imp.ext.data || {};
+
+      const context = adUnit.ortb2Imp.ext.data;
+      context.adserver = context.adserver || {};
+      context.adserver.name = 'gam';
+      context.adserver.adslot = sanitizeSlotPath(slot.getAdUnitPath());
+    }
+  });
+};
+
+const sanitizeSlotPath = (path) => {
+  const gptConfig = config.getConfig('gptPreAuction') || {};
+
+  if (gptConfig.mcmEnabled) {
+    return path.replace(/(^\/\d*),\d*\//, '$1/');
+  }
+
+  return path;
+}
+
+const defaultPreAuction = (adUnit, adServerAdSlot) => {
+  const context = adUnit.ortb2Imp.ext.data;
+
+  // use pbadslot if supplied
+  if (context.pbadslot) {
+    return context.pbadslot;
+  }
+
+  // confirm that GPT is set up
+  if (!isGptPubadsDefined()) {
+    return;
+  }
+
+  // find all GPT slots with this name
+  var gptSlots = window.googletag.pubads().getSlots().filter(slot => slot.getAdUnitPath() === adServerAdSlot);
+
+  if (gptSlots.length === 0) {
+    return; // should never happen
+  }
+
+  if (gptSlots.length === 1) {
+    return adServerAdSlot;
+  }
+
+  // else the adunit code must be div id. append it.
+  return `${adServerAdSlot}#${adUnit.code}`;
+}
+
+export const appendPbAdSlot = adUnit => {
+  const context = adUnit.ortb2Imp.ext.data;
+  const { customPbAdSlot } = _currentConfig;
+
+  // use context.pbAdSlot if set (if someone set it already, it will take precedence over others)
+  if (context.pbadslot) {
+    return;
+  }
+
+  if (customPbAdSlot) {
+    context.pbadslot = customPbAdSlot(adUnit.code, deepAccess(context, 'adserver.adslot'));
+    return;
+  }
+
+  // use data attribute 'data-adslotid' if set
+  try {
+    const adUnitCodeDiv = document.getElementById(adUnit.code);
+    if (adUnitCodeDiv.dataset.adslotid) {
+      context.pbadslot = adUnitCodeDiv.dataset.adslotid;
+      return;
+    }
+  } catch (e) {}
+  // banner adUnit, use GPT adunit if defined
+  if (deepAccess(context, 'adserver.adslot')) {
+    context.pbadslot = context.adserver.adslot;
+    return;
+  }
+  context.pbadslot = adUnit.code;
+  return true;
+};
+
+export const makeBidRequestsHook = (fn, adUnits, ...args) => {
+  appendGptSlots(adUnits);
+  const { useDefaultPreAuction, customPreAuction } = _currentConfig;
+  adUnits.forEach(adUnit => {
+    // init the ortb2Imp if not done yet
+    adUnit.ortb2Imp = adUnit.ortb2Imp || {};
+    adUnit.ortb2Imp.ext = adUnit.ortb2Imp.ext || {};
+    adUnit.ortb2Imp.ext.data = adUnit.ortb2Imp.ext.data || {};
+    const context = adUnit.ortb2Imp.ext;
+
+    // if neither new confs set do old stuff
+    if (!customPreAuction && !useDefaultPreAuction) {
+      const usedAdUnitCode = appendPbAdSlot(adUnit);
+      // gpid should be set to itself if already set, or to what pbadslot was (as long as it was not adUnit code)
+      if (!context.gpid && !usedAdUnitCode) {
+        context.gpid = context.data.pbadslot;
+      }
+    } else {
+      let adserverSlot = deepAccess(context, 'data.adserver.adslot');
+      let result;
+      if (customPreAuction) {
+        result = customPreAuction(adUnit, adserverSlot);
+      } else if (useDefaultPreAuction) {
+        result = defaultPreAuction(adUnit, adserverSlot);
+      }
+      if (result) {
+        context.gpid = context.data.pbadslot = result;
+      }
+    }
+  });
+  return fn.call(this, adUnits, ...args);
+};
+
+const handleSetGptConfig = moduleConfig => {
+  _currentConfig = pick(moduleConfig, [
+    'enabled', enabled => enabled !== false,
+    'customGptSlotMatching', customGptSlotMatching =>
+      typeof customGptSlotMatching === 'function' && customGptSlotMatching,
+    'customPbAdSlot', customPbAdSlot => typeof customPbAdSlot === 'function' && customPbAdSlot,
+    'customPreAuction', customPreAuction => typeof customPreAuction === 'function' && customPreAuction,
+    'useDefaultPreAuction', useDefaultPreAuction => useDefaultPreAuction === true,
+  ]);
+
+  if (_currentConfig.enabled) {
+    if (!hooksAdded) {
+      getHook('makeBidRequests').before(makeBidRequestsHook);
+      hooksAdded = true;
+    }
+  } else {
+    logInfo(`${MODULE_NAME}: Turning off module`);
+    _currentConfig = {};
+    getHook('makeBidRequests').getHooks({hook: makeBidRequestsHook}).remove();
+    hooksAdded = false;
+  }
+};
+
+config.getConfig('gptPreAuction', config => handleSetGptConfig(config.gptPreAuction));
+handleSetGptConfig({});
diff --git a/modules/gravitoIdSystem.js b/modules/gravitoIdSystem.js
new file mode 100644
index 00000000000..809263a1c68
--- /dev/null
+++ b/modules/gravitoIdSystem.js
@@ -0,0 +1,56 @@
+/**
+ * This module adds gravitompId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/gravitoIdSystem
+ * @requires module:modules/userId
+ */
+
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+export const storage = getStorageManager();
+
+export const cookieKey = 'gravitompId';
+
+export const gravitoIdSystemSubmodule = {
+  /**
+  * used to link submodule with config
+  * @type {string}
+  */
+  name: 'gravitompId',
+
+  /**
+  * performs action to obtain id
+  * @function
+  * @returns { {id: {gravitompId: string}} | undefined }
+  */
+  getId: function() {
+    const newId = storage.getCookie(cookieKey);
+    if (!newId) {
+      return undefined;
+    }
+    const result = {
+      gravitompId: newId
+    }
+    return {id: result};
+  },
+
+  /**
+  * decode the stored id value for passing to bid requests
+  * @function
+  * @param { {gravitompId: string} } value
+  * @returns { {gravitompId: {string} } | undefined }
+  */
+  decode: function(value) {
+    if (value && typeof value === 'object') {
+      var result = {};
+      if (value.gravitompId) {
+        result = value.gravitompId
+      }
+      return {gravitompId: result};
+    }
+    return undefined;
+  },
+}
+
+submodule('userId', gravitoIdSystemSubmodule);
diff --git a/modules/gravitoIdSystem.md b/modules/gravitoIdSystem.md
new file mode 100644
index 00000000000..af4946779c5
--- /dev/null
+++ b/modules/gravitoIdSystem.md
@@ -0,0 +1,28 @@
+## Gravito User ID Submodule
+
+Gravito ID, provided by [Gravito Ltd.](https://gravito.net), is ID for ad targeting by using 1st party cookie.
+Please contact Gravito Ltd. before using this ID.
+
+## Building Prebid with Gravito ID Support
+
+First, make sure to add the Gravito ID submodule to your Prebid.js package with:
+
+```
+gulp build --modules=gravitoIdSystem
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'gravitompId'
+        }]
+    }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module. | `"gravitompId"` |
diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index d18effa349b..aa6c0ab668f 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -1,16 +1,37 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {
+  isEmpty,
+  deepAccess,
+  logError,
+  parseGPTSingleSizeArrayToRtbSize,
+  generateUUID,
+  mergeDeep,
+  logWarn,
+  parseUrl, isArray, isNumber
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
+import { config } from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { find } from '../src/polyfill.js';
 
 const BIDDER_CODE = 'grid';
-const ENDPOINT_URL = 'https://grid.bidswitch.net/hb';
+const ENDPOINT_URL = 'https://grid.bidswitch.net/hbjson';
+
+const ADAPTER_VERSION_FOR_CRITEO_MODE = 34;
+const CDB_ENDPOINT = 'https://bidder.criteo.com/cdb';
+const PROFILE_ID_INLINE = 207;
+const SID_COOKIE_NAME = 'cto_sid';
+const IDCPY_COOKIE_NAME = 'cto_idcpy';
+const OPTOUT_COOKIE_NAME = 'cto_optout';
+const BUNDLE_COOKIE_NAME = 'cto_bundle';
+
 const SYNC_URL = 'https://x.bidswitch.net/sync?ssp=themediagrid';
 const TIME_TO_LIVE = 360;
+const USER_ID_KEY = 'tmguid';
+const GVLID = 686;
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
-
-let hasSynced = false;
+export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 
 const LOG_ERROR_MESS = {
   noAuid: 'Bid from response has no auid parameter - ',
@@ -23,8 +44,23 @@ const LOG_ERROR_MESS = {
   hasEmptySeatbidArray: 'Response has empty seatbid array',
   hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - '
 };
+
+const ALIAS_CONFIG = {
+  'trustx': {
+    endpoint: 'https://grid.bidswitch.net/hbjson?sp=trustx',
+    syncurl: 'https://x.bidswitch.net/sync?ssp=themediagrid',
+    bidResponseExternal: {
+      netRevenue: false
+    }
+  }
+};
+
+let hasSynced = false;
+
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: ['playwire', 'adlivetech', { code: 'trustx', skipPbsAliasing: true }],
   supportedMediaTypes: [ BANNER, VIDEO ],
   /**
    * Determines whether or not the given bid request is valid.
@@ -33,160 +69,418 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function(bid) {
-    return !!bid.params.uid;
+    return bid && Boolean(bid.params.uid || bid.params.secid);
   },
   /**
    * Make a server request from the list of BidRequests.
    *
    * @param {BidRequest[]} validBidRequests - an array of bids
    * @param {bidderRequest} bidderRequest bidder request object
-   * @return ServerRequest Info describing the request to the server.
+   * @return {ServerRequest[]} Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
-    const auids = [];
-    const bidsMap = {};
-    const slotsMapByUid = {};
-    const sizeMap = {};
-    const bids = validBidRequests || [];
+    if (!validBidRequests.length) {
+      return null;
+    }
     let pageKeywords = null;
-    let reqId;
+    let jwpseg = null;
+    let content = null;
+    let schain = null;
+    let userIdAsEids = null;
+    let user = null;
+    let userExt = null;
+    let endpoint = null;
+    let forceBidderName = false;
+    let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {};
 
-    bids.forEach(bid => {
-      reqId = bid.bidderRequestId;
-      const {params: {uid}, adUnitCode, mediaTypes} = bid;
-      auids.push(uid);
-      const sizesId = utils.parseSizesInput(bid.sizes);
+    const referer = refererInfo ? encodeURIComponent(refererInfo.page) : '';
+    const tmax = timeout || config.getConfig('bidderTimeout');
+    const imp = [];
+    const bidsMap = {};
+    const requests = [];
+    const criteoBidsMap = {};
+    const criteoBidRequests = [];
+    const sources = [];
+    const bidsArray = [];
 
-      if (!pageKeywords && !utils.isEmpty(bid.params.keywords)) {
-        pageKeywords = utils.transformBidderParamKeywords(bid.params.keywords);
+    validBidRequests.forEach((bid) => {
+      const bidObject = { bid, savedPrebidBid: null };
+      if (bid.params.withCriteo && criteoSpec.isBidRequestValid(bid)) {
+        criteoBidsMap[bid.bidId] = bidObject;
+        criteoBidRequests.push(bid);
       }
-
-      const addedSizes = {};
-      sizesId.forEach((sizeId) => {
-        addedSizes[sizeId] = true;
-      });
-      const bannerSizesId = utils.parseSizesInput(utils.deepAccess(mediaTypes, 'banner.sizes'));
-      const videoSizesId = utils.parseSizesInput(utils.deepAccess(mediaTypes, 'video.playerSize'));
-      bannerSizesId.concat(videoSizesId).forEach((sizeId) => {
-        if (!addedSizes[sizeId]) {
-          addedSizes[sizeId] = true;
-          sizesId.push(sizeId);
+      if (!bid.params.uid && !bid.params.secid) {
+        return;
+      }
+      if (!bidderRequestId) {
+        bidderRequestId = bid.bidderRequestId;
+      }
+      if (!auctionId) {
+        auctionId = bid.auctionId;
+      }
+      if (!schain) {
+        schain = bid.schain;
+      }
+      if (!userIdAsEids) {
+        userIdAsEids = bid.userIdAsEids;
+      }
+      if (!endpoint) {
+        endpoint = ALIAS_CONFIG[bid.bidder] && ALIAS_CONFIG[bid.bidder].endpoint;
+      }
+      const { params: { uid, keywords, forceBidder, multiRequest }, mediaTypes, bidId, adUnitCode, rtd, ortb2Imp } = bid;
+      const { pubdata, secid, pubid, source, content: bidParamsContent } = bid.params;
+      const bidFloor = _getFloor(mediaTypes || {}, bid);
+      const jwTargeting = rtd && rtd.jwplayer && rtd.jwplayer.targeting;
+      if (jwTargeting) {
+        if (!jwpseg && jwTargeting.segments) {
+          jwpseg = jwTargeting.segments;
         }
-      });
+        if (!content && jwTargeting.content) {
+          content = jwTargeting.content;
+        }
+      }
 
-      if (!slotsMapByUid[uid]) {
-        slotsMapByUid[uid] = {};
+      let impObj = {
+        id: bidId.toString(),
+        tagid: (secid || uid).toString(),
+        ext: {
+          divid: adUnitCode.toString()
+        }
+      };
+      if (ortb2Imp) {
+        if (ortb2Imp.instl) {
+          impObj.instl = ortb2Imp.instl;
+        }
+        if (ortb2Imp.ext && ortb2Imp.ext.data) {
+          impObj.ext.data = ortb2Imp.ext.data;
+          if (impObj.ext.data.adserver && impObj.ext.data.adserver.adslot) {
+            impObj.ext.gpid = impObj.ext.data.adserver.adslot.toString();
+          } else {
+            impObj.ext.gpid = ortb2Imp.ext.data.pbadslot && ortb2Imp.ext.data.pbadslot.toString();
+          }
+        }
       }
-      const slotsMap = slotsMapByUid[uid];
-      if (!slotsMap[adUnitCode]) {
-        slotsMap[adUnitCode] = {adUnitCode, bids: [bid], parents: []};
-      } else {
-        slotsMap[adUnitCode].bids.push(bid);
+      if (!isEmpty(keywords)) {
+        if (!pageKeywords) {
+          pageKeywords = keywords;
+        }
+        impObj.ext.bidder = { keywords };
       }
-      const slot = slotsMap[adUnitCode];
 
-      sizesId.forEach((sizeId) => {
-        sizeMap[sizeId] = true;
-        if (!bidsMap[uid]) {
-          bidsMap[uid] = {};
+      if (bidFloor) {
+        impObj.bidfloor = bidFloor;
+      }
+
+      if (!mediaTypes || mediaTypes[BANNER]) {
+        const banner = createBannerRequest(bid, mediaTypes ? mediaTypes[BANNER] : {});
+        if (banner) {
+          impObj.banner = banner;
+        }
+      }
+      if (mediaTypes && mediaTypes[VIDEO]) {
+        const video = createVideoRequest(bid, mediaTypes[VIDEO]);
+        if (video) {
+          impObj.video = video;
         }
+      }
 
-        if (!bidsMap[uid][sizeId]) {
-          bidsMap[uid][sizeId] = [slot];
+      if (impObj.banner || impObj.video) {
+        if (multiRequest) {
+          const reqSource = {
+            tid: bid.auctionId && bid.auctionId.toString(),
+            ext: {
+              wrapper: 'Prebid_js',
+              wrapper_version: '$prebid.version$'
+            }
+          };
+          if (bid.schain) {
+            reqSource.ext.schain = bid.schain;
+          }
+          const request = {
+            id: bid.bidderRequestId && bid.bidderRequestId.toString(),
+            site: {
+              page: referer,
+            },
+            tmax,
+            source: reqSource,
+            imp: [impObj]
+          };
+
+          if (pubid) {
+            request.site.publisher = { id: pubid };
+          }
+
+          const reqJwpseg = (pubdata && pubdata.jwpseg) || (jwTargeting && jwTargeting.segments);
+
+          const siteContent = bidParamsContent || (jwTargeting && jwTargeting.content);
+
+          if (siteContent) {
+            request.site.content = siteContent;
+          }
+
+          if (reqJwpseg && reqJwpseg.length) {
+            request.user = {
+              data: [{
+                name: 'iow_labs_pub_data',
+                segment: segmentProcessing(reqJwpseg, 'jwpseg'),
+              }]
+            };
+          }
+
+          requests.push(request);
+          sources.push(source);
+          bidsArray.push(bidObject);
         } else {
-          bidsMap[uid][sizeId].push(slot);
+          bidsMap[bidId] = bidObject;
+          imp.push(impObj);
         }
-        slot.parents.push({parent: bidsMap[uid], key: sizeId, uid});
-      });
-    });
+      }
 
-    const configKeywords = utils.transformBidderParamKeywords({
-      'user': utils.deepAccess(config.getConfig('fpd.user'), 'keywords') || null,
-      'context': utils.deepAccess(config.getConfig('fpd.context'), 'keywords') || null
+      if (!forceBidderName && forceBidder && ALIAS_CONFIG[forceBidder]) {
+        forceBidderName = forceBidder;
+      }
     });
 
-    if (configKeywords.length) {
-      pageKeywords = (pageKeywords || []).concat(configKeywords);
-    }
+    forceBidderName = config.getConfig('forceBidderName') || forceBidderName;
 
-    if (pageKeywords && pageKeywords.length > 0) {
-      pageKeywords.forEach(deleteValues);
+    if (forceBidderName && ALIAS_CONFIG[forceBidderName]) {
+      endpoint = ALIAS_CONFIG[forceBidderName].endpoint;
+      this.forceBidderName = forceBidderName;
     }
 
-    const payload = {
-      auids: auids.join(','),
-      sizes: utils.getKeys(sizeMap).join(','),
-      r: reqId,
-      wrapperType: 'Prebid_js',
-      wrapperVersion: '$prebid.version$'
+    const reqSource = {
+      tid: auctionId && auctionId.toString(),
+      ext: {
+        wrapper: 'Prebid_js',
+        wrapper_version: '$prebid.version$'
+      }
     };
 
-    if (pageKeywords) {
-      payload.keywords = JSON.stringify(pageKeywords);
+    if (schain) {
+      reqSource.ext.schain = schain;
     }
 
-    if (bidderRequest) {
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        payload.u = bidderRequest.refererInfo.referer;
+    const mainRequest = (imp.length || !requests.length) ? {
+      id: bidderRequestId && bidderRequestId.toString(),
+      site: {
+        page: referer
+      },
+      tmax,
+      source: reqSource,
+      imp
+    } : null;
+
+    if (content) {
+      mainRequest.site.content = content;
+    }
+
+    if (jwpseg && jwpseg.length) {
+      mainRequest.user = {
+        data: [{
+          name: 'iow_labs_pub_data',
+          segment: segmentProcessing(jwpseg, 'jwpseg'),
+        }]
+      };
+    }
+
+    [...requests, mainRequest].forEach((request) => {
+      if (!request) {
+        return;
+      }
+
+      const ortb2UserData = deepAccess(bidderRequest, 'ortb2.user.data');
+      if (ortb2UserData && ortb2UserData.length) {
+        user = request.user || { data: [] };
+        user = mergeDeep(user, {
+          data: [...ortb2UserData]
+        });
+      }
+
+      if (gdprConsent && gdprConsent.consentString) {
+        userExt = {consent: gdprConsent.consentString};
+      }
+
+      const ortb2UserExtDevice = deepAccess(bidderRequest, 'ortb2.user.ext.device');
+      if (ortb2UserExtDevice) {
+        userExt = userExt || {};
+        userExt.device = { ...ortb2UserExtDevice };
+      }
+
+      if (userIdAsEids && userIdAsEids.length) {
+        userExt = userExt || {};
+        userExt.eids = [...userIdAsEids];
       }
-      if (bidderRequest.timeout) {
-        payload.wtimeout = bidderRequest.timeout;
+
+      if (userExt && Object.keys(userExt).length) {
+        user = user || {};
+        user.ext = userExt;
+      }
+
+      const fpdUserId = getUserIdFromFPDStorage();
+
+      if (fpdUserId) {
+        user = user || {};
+        user.id = fpdUserId.toString();
       }
-      if (bidderRequest.gdprConsent) {
-        if (bidderRequest.gdprConsent.consentString) {
-          payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
+
+      if (user) {
+        request.user = user;
+      }
+
+      const userKeywords = deepAccess(bidderRequest, 'ortb2.user.keywords') || null;
+      const siteKeywords = deepAccess(bidderRequest, 'ortb2.site.keywords') || null;
+
+      if (userKeywords) {
+        pageKeywords = pageKeywords || {};
+        pageKeywords.user = pageKeywords.user || {};
+        pageKeywords.user.ortb2 = [
+          {
+            name: 'keywords',
+            keywords: userKeywords.split(','),
+          }
+        ];
+      }
+      if (siteKeywords) {
+        pageKeywords = pageKeywords || {};
+        pageKeywords.site = pageKeywords.site || {};
+        pageKeywords.site.ortb2 = [
+          {
+            name: 'keywords',
+            keywords: siteKeywords.split(','),
+          }
+        ];
+      }
+
+      if (pageKeywords) {
+        pageKeywords = reformatKeywords(pageKeywords);
+        if (pageKeywords) {
+          request.ext = {
+            keywords: pageKeywords
+          };
         }
-        payload.gdpr_applies =
-          (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
-            ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
       }
-      if (bidderRequest.uspConsent) {
-        payload.us_privacy = bidderRequest.uspConsent;
+
+      if (gdprConsent && gdprConsent.gdprApplies) {
+        request.regs = {
+          ext: {
+            gdpr: gdprConsent.gdprApplies ? 1 : 0
+          }
+        };
       }
+
+      if (uspConsent) {
+        if (!request.regs) {
+          request.regs = {ext: {}};
+        }
+        request.regs.ext.us_privacy = uspConsent;
+      }
+
+      if (config.getConfig('coppa') === true) {
+        if (!request.regs) {
+          request.regs = {};
+        }
+        request.regs.coppa = 1;
+      }
+
+      const site = deepAccess(bidderRequest, 'ortb2.site');
+      if (site) {
+        const pageCategory = [...(site.cat || []), ...(site.pagecat || [])].filter((category) => {
+          return category && typeof category === 'string'
+        });
+        if (pageCategory.length) {
+          request.site.cat = pageCategory;
+        }
+        const genre = deepAccess(site, 'content.genre');
+        if (genre && typeof genre === 'string') {
+          request.site.content = {...request.site.content, genre};
+        }
+        const data = deepAccess(site, 'content.data');
+        if (data && data.length) {
+          const siteContent = request.site.content || {};
+          request.site.content = mergeDeep(siteContent, { data });
+        }
+        const id = deepAccess(site, 'content.id');
+        if (id) {
+          request.site.content = {...request.site.content, id};
+        }
+      }
+    });
+
+    const criteoRequest = criteoBidRequests.length && criteoSpec.buildRequests(criteoBidRequests, bidderRequest);
+    if (criteoRequest) {
+      criteoRequest.criteoBidsMap = criteoBidsMap;
     }
 
-    return {
-      method: 'GET',
-      url: ENDPOINT_URL,
-      data: utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
-      bidsMap: bidsMap,
-    };
+    return [...requests.map((req, i) => {
+      let sp;
+      const url = (endpoint || ENDPOINT_URL).replace(/[?&]sp=([^?&=]+)/, (i, found) => {
+        if (found) {
+          sp = found;
+        }
+        return '';
+      });
+      let currentSource = sources[i] || sp;
+      const urlWithParams = url + (url.indexOf('?') > -1 ? '&' : '?') + 'no_mapping=1' + (currentSource ? `&sp=${currentSource}` : '');
+      return {
+        method: 'POST',
+        url: urlWithParams,
+        data: JSON.stringify(req),
+        bidObject: bidsArray[i],
+      };
+    }), ...(mainRequest ? [{
+      method: 'POST',
+      url: endpoint || ENDPOINT_URL,
+      data: JSON.stringify(mainRequest),
+      bidsMap
+    }] : []), ...(criteoRequest ? [criteoRequest] : [])];
   },
   /**
    * Unpack the response from the server into a list of bids.
    *
    * @param {*} serverResponse A successful response from the server.
    * @param {*} bidRequest
+   * @param {*} RendererConst
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
-  interpretResponse: function(serverResponse, bidRequest) {
-    serverResponse = serverResponse && serverResponse.body;
-    const bidResponses = [];
-    const bidsMap = bidRequest.bidsMap;
+  interpretResponse: function(serverResponse, bidRequest, RendererConst = Renderer) {
+    if (bidRequest.criteoBidsMap && bidRequest.bidRequests) {
+      const criteoBids = criteoSpec.interpretResponse(serverResponse, bidRequest);
+      return criteoBids.filter((bid) => {
+        const { savedPrebidBid } = bidRequest.criteoBidsMap[bid.requestId] || {};
+        return canPublishResponse(bid.cpm, savedPrebidBid && savedPrebidBid.cpm);
+      });
+    } else {
+      serverResponse = serverResponse && serverResponse.body;
+      const bidResponses = [];
 
-    let errorMessage;
+      let errorMessage;
 
-    if (!serverResponse) errorMessage = LOG_ERROR_MESS.emptyResponse;
-    else if (serverResponse.seatbid && !serverResponse.seatbid.length) {
-      errorMessage = LOG_ERROR_MESS.hasEmptySeatbidArray;
-    }
+      if (!serverResponse) errorMessage = LOG_ERROR_MESS.emptyResponse;
+      else if (serverResponse.seatbid && !serverResponse.seatbid.length) {
+        errorMessage = LOG_ERROR_MESS.hasEmptySeatbidArray;
+      }
 
-    if (!errorMessage && serverResponse.seatbid) {
-      serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidsMap, bidResponses);
-      });
+      const bidderCode = this.forceBidderName || this.code;
+
+      if (!errorMessage && serverResponse.seatbid) {
+        serverResponse.seatbid.forEach(respItem => {
+          _addBidResponse(_getBidFromResponse(respItem), bidRequest, bidResponses, RendererConst, bidderCode);
+        });
+      }
+      if (errorMessage) logError(errorMessage);
+      return bidResponses;
     }
-    if (errorMessage) utils.logError(errorMessage);
-    return bidResponses;
   },
-  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+  getUserSyncs: function (...args) {
+    const [syncOptions,, gdprConsent, uspConsent] = args;
     if (!hasSynced && syncOptions.pixelEnabled) {
       let params = '';
 
-      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+      if (gdprConsent) {
         if (typeof gdprConsent.gdprApplies === 'boolean') {
-          params += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-        } else {
+          params += `&gdpr=${Number(gdprConsent.gdprApplies)}`;
+        }
+        if (typeof gdprConsent.consentString === 'string') {
           params += `&gdpr_consent=${gdprConsent.consentString}`;
         }
       }
@@ -194,103 +488,232 @@ export const spec = {
         params += `&us_privacy=${uspConsent}`;
       }
 
+      const bidderCode = this.forceBidderName || this.code;
+      const syncUrl = (ALIAS_CONFIG[bidderCode] && ALIAS_CONFIG[bidderCode].syncurl) || SYNC_URL;
+
       hasSynced = true;
       return {
         type: 'image',
-        url: SYNC_URL + params
+        url: syncUrl + params
       };
     }
   }
 };
 
-function isPopulatedArray(arr) {
-  return !!(utils.isArray(arr) && arr.length > 0);
-}
+/**
+ * Gets bidfloor
+ * @param {Object} mediaTypes
+ * @param {Object} bid
+ * @returns {Number} floor
+ */
+function _getFloor (mediaTypes, bid) {
+  const curMediaType = mediaTypes.video ? 'video' : 'banner';
+  let floor = bid.params.bidFloor || bid.params.floorcpm || 0;
+
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: curMediaType,
+      size: bid.sizes.map(([w, h]) => ({w, h}))
+    });
 
-function deleteValues(keyPairObj) {
-  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
-    delete keyPairObj.value;
+    if (typeof floorInfo === 'object' &&
+      floorInfo.currency === 'USD' &&
+      !isNaN(parseFloat(floorInfo.floor))) {
+      floor = Math.max(floor, parseFloat(floorInfo.floor));
+    }
   }
+
+  return floor;
 }
 
 function _getBidFromResponse(respItem) {
   if (!respItem) {
-    utils.logError(LOG_ERROR_MESS.emptySeatbid);
+    logError(LOG_ERROR_MESS.emptySeatbid);
   } else if (!respItem.bid) {
-    utils.logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
+    logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
   } else if (!respItem.bid[0]) {
-    utils.logError(LOG_ERROR_MESS.noBid);
+    logError(LOG_ERROR_MESS.noBid);
   }
   return respItem && respItem.bid && respItem.bid[0];
 }
 
-function _addBidResponse(serverBid, bidsMap, bidResponses) {
+function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst, bidderCode) {
   if (!serverBid) return;
   let errorMessage;
   if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
-  if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
+  if (!errorMessage && !serverBid.adm && !serverBid.nurl) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
   else {
-    const awaitingBids = bidsMap[serverBid.auid];
-    if (awaitingBids) {
-      const sizeId = `${serverBid.w}x${serverBid.h}`;
-      if (awaitingBids[sizeId]) {
-        const slot = awaitingBids[sizeId][0];
-
-        const bid = slot.bids.shift();
-
-        const bidResponse = {
-          requestId: bid.bidId, // bid.bidderRequestId,
-          bidderCode: spec.code,
-          cpm: serverBid.price,
-          width: serverBid.w,
-          height: serverBid.h,
-          creativeId: serverBid.auid, // bid.bidId,
-          currency: 'USD',
-          netRevenue: false,
-          ttl: TIME_TO_LIVE,
-          dealId: serverBid.dealid
-        };
+    const bidObject = bidRequest.bidsMap ? bidRequest.bidsMap[serverBid.impid] : bidRequest.bidObject;
+    const { bid, savedPrebidBid } = bidObject || {};
+    if (bid && canPublishResponse(serverBid.price, savedPrebidBid && savedPrebidBid.cpm)) {
+      const bidResponse = {
+        requestId: bid.bidId, // bid.bidderRequestId
+        cpm: serverBid.price,
+        width: serverBid.w,
+        height: serverBid.h,
+        creativeId: serverBid.auid, // bid.bidId
+        currency: 'USD',
+        netRevenue: true,
+        ttl: TIME_TO_LIVE,
+        meta: {
+          advertiserDomains: serverBid.adomain ? serverBid.adomain : []
+        },
+        dealId: serverBid.dealid
+      };
+
+      bidObject.savedPrebidBid = bidResponse;
 
-        if (serverBid.content_type === 'video') {
+      if (serverBid.ext && serverBid.ext.bidder && serverBid.ext.bidder.grid && serverBid.ext.bidder.grid.demandSource) {
+        bidResponse.adserverTargeting = { 'hb_ds': serverBid.ext.bidder.grid.demandSource };
+        bidResponse.meta.demandSource = serverBid.ext.bidder.grid.demandSource;
+      }
+
+      if (serverBid.content_type === 'video') {
+        if (serverBid.adm) {
           bidResponse.vastXml = serverBid.adm;
-          bidResponse.mediaType = VIDEO;
           bidResponse.adResponse = {
             content: bidResponse.vastXml
           };
-          if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
-            bidResponse.renderer = createRenderer(bidResponse, {
-              id: bid.bidId,
-              url: RENDERER_URL
-            });
-          }
-        } else {
-          bidResponse.ad = serverBid.adm;
-          bidResponse.mediaType = BANNER;
+        } else if (serverBid.nurl) {
+          bidResponse.vastUrl = serverBid.nurl;
         }
-        bidResponses.push(bidResponse);
-
-        if (!slot.bids.length) {
-          slot.parents.forEach(({parent, key, uid}) => {
-            const index = parent[key].indexOf(slot);
-            if (index > -1) {
-              parent[key].splice(index, 1);
-            }
-            if (!parent[key].length) {
-              delete parent[key];
-              if (!utils.getKeys(parent).length) {
-                delete bidsMap[uid];
-              }
-            }
-          });
+        bidResponse.mediaType = VIDEO;
+        if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
+          bidResponse.renderer = createRenderer(bidResponse, {
+            id: bid.bidId,
+            url: RENDERER_URL
+          }, RendererConst);
         }
+      } else {
+        bidResponse.ad = serverBid.adm;
+        bidResponse.mediaType = BANNER;
       }
-    } else {
-      errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
+      const bidResponseExternal = (ALIAS_CONFIG[bidderCode] && ALIAS_CONFIG[bidderCode].bidResponseExternal) || {};
+      bidResponses.push(mergeDeep(bidResponse, bidResponseExternal));
     }
   }
   if (errorMessage) {
-    utils.logError(errorMessage);
+    logError(errorMessage);
+  }
+}
+
+function createVideoRequest(bid, mediaType) {
+  const { playerSize, mimes, durationRangeSec, protocols } = mediaType;
+  const size = (playerSize || bid.sizes || [])[0];
+  if (!size) return;
+
+  let result = parseGPTSingleSizeArrayToRtbSize(size);
+
+  if (mimes) {
+    result.mimes = mimes;
+  }
+
+  if (durationRangeSec && durationRangeSec.length === 2) {
+    result.minduration = durationRangeSec[0];
+    result.maxduration = durationRangeSec[1];
   }
+
+  if (protocols && protocols.length) {
+    result.protocols = protocols;
+  }
+
+  return result;
+}
+
+function createBannerRequest(bid, mediaType) {
+  const sizes = mediaType.sizes || bid.sizes;
+  if (!sizes || !sizes.length) return;
+
+  let format = sizes.map((size) => parseGPTSingleSizeArrayToRtbSize(size));
+  let result = parseGPTSingleSizeArrayToRtbSize(sizes[0]);
+
+  if (format.length) {
+    result.format = format
+  }
+  return result;
+}
+
+function makeNewUserIdInFPDStorage() {
+  if (config.getConfig('localStorageWriteAllowed')) {
+    const value = generateUUID().replace(/-/g, '');
+
+    storage.setDataInLocalStorage(USER_ID_KEY, value);
+    return value;
+  }
+  return null;
+}
+
+function getUserIdFromFPDStorage() {
+  return storage.getDataFromLocalStorage(USER_ID_KEY) || makeNewUserIdInFPDStorage();
+}
+
+function segmentProcessing(segment, forceSegName) {
+  return segment
+    .map((seg) => {
+      const value = seg && (seg.id || seg);
+      if (typeof value === 'string' || typeof value === 'number') {
+        return {
+          value: value.toString(),
+          ...(forceSegName && { name: forceSegName }),
+          ...(seg.name && { name: seg.name }),
+        };
+      }
+      return null;
+    })
+    .filter((seg) => !!seg);
+}
+
+function reformatKeywords(pageKeywords) {
+  const formatedPageKeywords = {};
+  Object.keys(pageKeywords).forEach((name) => {
+    const keywords = pageKeywords[name];
+    if (keywords) {
+      if (name === 'site' || name === 'user') {
+        const formatedKeywords = {};
+        Object.keys(keywords).forEach((pubName) => {
+          if (Array.isArray(keywords[pubName])) {
+            const formatedPublisher = [];
+            keywords[pubName].forEach((pubItem) => {
+              if (typeof pubItem === 'object' && pubItem.name) {
+                const formatedPubItem = { name: pubItem.name, segments: [] };
+                Object.keys(pubItem).forEach((key) => {
+                  if (Array.isArray(pubItem[key])) {
+                    pubItem[key].forEach((keyword) => {
+                      if (keyword) {
+                        if (typeof keyword === 'string') {
+                          formatedPubItem.segments.push({ name: key, value: keyword });
+                        } else if (key === 'segments' && typeof keyword.name === 'string' && typeof keyword.value === 'string') {
+                          formatedPubItem.segments.push(keyword);
+                        }
+                      }
+                    });
+                  }
+                });
+                if (formatedPubItem.segments.length) {
+                  formatedPublisher.push(formatedPubItem);
+                }
+              }
+            });
+            if (formatedPublisher.length) {
+              formatedKeywords[pubName] = formatedPublisher;
+            }
+          }
+        });
+        formatedPageKeywords[name] = formatedKeywords;
+      } else {
+        formatedPageKeywords[name] = keywords;
+      }
+    }
+  });
+  return Object.keys(formatedPageKeywords).length && formatedPageKeywords;
+}
+
+function canPublishResponse(price, savedPrice) {
+  if (isNumber(savedPrice)) {
+    return price > savedPrice || (price === savedPrice && Math.random() > 0.5);
+  }
+  return true;
 }
 
 function outstreamRender (bid) {
@@ -302,8 +725,8 @@ function outstreamRender (bid) {
   });
 }
 
-function createRenderer (bid, rendererParams) {
-  const renderer = Renderer.install({
+function createRenderer (bid, rendererParams, RendererConst) {
+  const renderer = RendererConst.install({
     id: rendererParams.id,
     url: rendererParams.url,
     loaded: false
@@ -312,7 +735,7 @@ function createRenderer (bid, rendererParams) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
+    logWarn('Prebid Error calling setRender on renderer', err);
   }
 
   return renderer;
@@ -326,4 +749,369 @@ export function getSyncUrl() {
   return SYNC_URL;
 }
 
+// ================ Criteo methods ==================
+
+const criteoSpec = {
+  /** f
+   * @param {object} bid
+   * @return {boolean}
+   */
+  isBidRequestValid: (bid) => {
+    // either one of zoneId or networkId should be set
+    if (!(bid && bid.params && (bid.params.zoneId || bid.params.networkId))) {
+      return false;
+    }
+
+    // video media types requires some mandatory params
+    if (hasVideoMediaType(bid)) {
+      if (!hasValidVideoMediaType(bid)) {
+        return false;
+      }
+    }
+
+    return true;
+  },
+
+  /**
+   * @param {BidRequest[]} bidRequests
+   * @param {*} bidderRequest
+   * @return {ServerRequest}
+   */
+  buildRequests: (bidRequests, bidderRequest) => {
+    let url;
+    let data;
+    let fpd = bidderRequest.ortb2 || {};
+
+    Object.assign(bidderRequest, {
+      publisherExt: fpd.site?.ext,
+      userExt: fpd.user?.ext,
+      ceh: config.getConfig('criteo.ceh'),
+      coppa: config.getConfig('coppa')
+    });
+
+    const context = buildContext(bidRequests, bidderRequest);
+    url = buildCdbUrl(context);
+    data = buildCdbRequest(context, bidRequests, bidderRequest);
+
+    if (data) {
+      return { method: 'POST', url, data, bidRequests };
+    }
+  },
+
+  /**
+   * @param {*} response
+   * @param {ServerRequest} request
+   * @return {Bid[]}
+   */
+  interpretResponse: (response, request) => {
+    const body = response.body || response;
+    const bids = [];
+
+    if (body && body.slots && isArray(body.slots)) {
+      body.slots.forEach(slot => {
+        const bidRequest = find(request.bidRequests, b => b.adUnitCode === slot.impid && (!b.params.zoneId || parseInt(b.params.zoneId) === slot.zoneid));
+        const bidId = bidRequest.bidId;
+        const bid = {
+          requestId: bidId,
+          cpm: slot.cpm,
+          currency: slot.currency,
+          netRevenue: true,
+          ttl: slot.ttl || 60,
+          creativeId: slot.creativecode,
+          width: slot.width,
+          height: slot.height,
+          dealId: slot.dealCode,
+        };
+        if (body.ext?.paf?.transmission && slot.ext?.paf?.content_id) {
+          const pafResponseMeta = {
+            content_id: slot.ext.paf.content_id,
+            transmission: response.ext.paf.transmission
+          };
+          bid.meta = Object.assign({}, bid.meta, { paf: pafResponseMeta });
+        }
+        if (slot.adomain) {
+          bid.meta = Object.assign({}, bid.meta, { advertiserDomains: slot.adomain });
+        }
+        if (slot.video) {
+          bid.vastUrl = slot.displayurl;
+          bid.mediaType = VIDEO;
+        } else {
+          bid.ad = slot.creative;
+        }
+        bids.push(bid);
+      });
+    }
+
+    return bids;
+  }
+};
+
+function readFromAllStorages(name) {
+  const fromCookie = storage.getCookie(name);
+  const fromLocalStorage = storage.getDataFromLocalStorage(name);
+
+  return fromCookie || fromLocalStorage || undefined;
+}
+
+/**
+ * @param {BidRequest[]} bidRequests
+ * @param bidderRequest
+ */
+function buildContext(bidRequests, bidderRequest) {
+  let referrer = '';
+  if (bidderRequest && bidderRequest.refererInfo) {
+    referrer = bidderRequest.refererInfo.page;
+  }
+  const queryString = parseUrl(bidderRequest?.refererInfo?.topmostLocation).search;
+
+  const context = {
+    url: referrer,
+    debug: queryString['pbt_debug'] === '1',
+    noLog: queryString['pbt_nolog'] === '1',
+    amp: false,
+  };
+
+  bidRequests.forEach(bidRequest => {
+    if (bidRequest.params.integrationMode === 'amp') {
+      context.amp = true;
+    }
+  });
+
+  return context;
+}
+
+/**
+ * @param {CriteoContext} context
+ * @return {string}
+ */
+function buildCdbUrl(context) {
+  let url = CDB_ENDPOINT;
+  url += '?profileId=' + PROFILE_ID_INLINE;
+  url += '&av=' + String(ADAPTER_VERSION_FOR_CRITEO_MODE);
+  url += '&wv=' + encodeURIComponent('$prebid.version$');
+  url += '&cb=' + String(Math.floor(Math.random() * 99999999999));
+
+  if (storage.localStorageIsEnabled()) {
+    url += '&lsavail=1';
+  } else {
+    url += '&lsavail=0';
+  }
+
+  if (context.amp) {
+    url += '&im=1';
+  }
+  if (context.debug) {
+    url += '&debug=1';
+  }
+  if (context.noLog) {
+    url += '&nolog=1';
+  }
+
+  const bundle = readFromAllStorages(BUNDLE_COOKIE_NAME);
+  if (bundle) {
+    url += `&bundle=${bundle}`;
+  }
+
+  const optout = readFromAllStorages(OPTOUT_COOKIE_NAME);
+  if (optout) {
+    url += `&optout=1`;
+  }
+
+  const sid = readFromAllStorages(SID_COOKIE_NAME);
+  if (sid) {
+    url += `&sid=${sid}`;
+  }
+
+  const idcpy = readFromAllStorages(IDCPY_COOKIE_NAME);
+  if (idcpy) {
+    url += `&idcpy=${idcpy}`;
+  }
+
+  return url;
+}
+
+/**
+ * @param {CriteoContext} context
+ * @param {BidRequest[]} bidRequests
+ * @param bidderRequest
+ * @return {*}
+ */
+function buildCdbRequest(context, bidRequests, bidderRequest) {
+  let networkId;
+  let schain;
+  const request = {
+    publisher: {
+      url: context.url,
+      ext: bidderRequest.publisherExt,
+    },
+    regs: {
+      coppa: bidderRequest.coppa === true ? 1 : (bidderRequest.coppa === false ? 0 : undefined)
+    },
+    slots: bidRequests.map(bidRequest => {
+      networkId = bidRequest.params.networkId || networkId;
+      schain = bidRequest.schain || schain;
+      const slot = {
+        impid: bidRequest.adUnitCode,
+        transactionid: bidRequest.transactionId,
+        auctionId: bidRequest.auctionId,
+      };
+      if (bidRequest.params.zoneId) {
+        slot.zoneid = bidRequest.params.zoneId;
+      }
+      if (deepAccess(bidRequest, 'ortb2Imp.ext')) {
+        slot.ext = bidRequest.ortb2Imp.ext;
+      }
+      if (bidRequest.params.ext) {
+        slot.ext = Object.assign({}, slot.ext, bidRequest.params.ext);
+      }
+      if (bidRequest.params.publisherSubId) {
+        slot.publishersubid = bidRequest.params.publisherSubId;
+      }
+
+      if (hasBannerMediaType(bidRequest)) {
+        slot.sizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'), parseSize);
+      } else {
+        slot.sizes = [];
+      }
+
+      if (hasVideoMediaType(bidRequest)) {
+        const video = {
+          playersizes: parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'), parseSize),
+          mimes: bidRequest.mediaTypes.video.mimes,
+          protocols: bidRequest.mediaTypes.video.protocols,
+          maxduration: bidRequest.mediaTypes.video.maxduration,
+          api: bidRequest.mediaTypes.video.api,
+          skip: bidRequest.mediaTypes.video.skip,
+          placement: bidRequest.mediaTypes.video.placement,
+          minduration: bidRequest.mediaTypes.video.minduration,
+          playbackmethod: bidRequest.mediaTypes.video.playbackmethod,
+          startdelay: bidRequest.mediaTypes.video.startdelay
+        };
+        const paramsVideo = bidRequest.params.video;
+        if (paramsVideo !== undefined) {
+          video.skip = video.skip || paramsVideo.skip || 0;
+          video.placement = video.placement || paramsVideo.placement;
+          video.minduration = video.minduration || paramsVideo.minduration;
+          video.playbackmethod = video.playbackmethod || paramsVideo.playbackmethod;
+          video.startdelay = video.startdelay || paramsVideo.startdelay || 0;
+        }
+
+        slot.video = video;
+      }
+
+      enrichSlotWithFloors(slot, bidRequest);
+
+      return slot;
+    }),
+  };
+  if (networkId) {
+    request.publisher.networkid = networkId;
+  }
+  if (schain) {
+    request.source = {
+      ext: {
+        schain: schain
+      }
+    };
+  }
+  request.user = {
+    ext: bidderRequest.userExt
+  };
+  if (bidderRequest && bidderRequest.ceh) {
+    request.user.ceh = bidderRequest.ceh;
+  }
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    request.gdprConsent = {};
+    if (typeof bidderRequest.gdprConsent.gdprApplies !== 'undefined') {
+      request.gdprConsent.gdprApplies = !!(bidderRequest.gdprConsent.gdprApplies);
+    }
+    request.gdprConsent.version = bidderRequest.gdprConsent.apiVersion;
+    if (typeof bidderRequest.gdprConsent.consentString !== 'undefined') {
+      request.gdprConsent.consentData = bidderRequest.gdprConsent.consentString;
+    }
+  }
+  if (bidderRequest && bidderRequest.uspConsent) {
+    request.user.uspIab = bidderRequest.uspConsent;
+  }
+  return request;
+}
+
+function parseSizes(sizes, parser = s => s) {
+  if (sizes === undefined) {
+    return [];
+  }
+  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
+    return sizes.map(size => parser(size));
+  }
+  return [parser(sizes)]; // or a single one ? (ie. [728,90])
+}
+
+function parseSize(size) {
+  return size[0] + 'x' + size[1];
+}
+
+function hasVideoMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.video') !== undefined;
+}
+
+function hasBannerMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.banner') !== undefined;
+}
+
+function hasValidVideoMediaType(bidRequest) {
+  let isValid = true;
+
+  var requiredMediaTypesParams = ['mimes', 'playerSize', 'maxduration', 'protocols', 'api', 'skip', 'placement', 'playbackmethod'];
+
+  requiredMediaTypesParams.forEach(function (param) {
+    if (deepAccess(bidRequest, 'mediaTypes.video.' + param) === undefined && deepAccess(bidRequest, 'params.video.' + param) === undefined) {
+      isValid = false;
+      logError('TheMediaGrid Bid Adapter (withCriteo mode): mediaTypes.video.' + param + ' is required');
+    }
+  });
+
+  if (isValid) {
+    const videoPlacement = bidRequest.mediaTypes.video.placement || bidRequest.params.video.placement;
+    // We do not support long form for now, also we have to check that context & placement are consistent
+    if (bidRequest.mediaTypes.video.context === 'instream' && videoPlacement === 1) {
+      return true;
+    } else if (bidRequest.mediaTypes.video.context === 'outstream' && videoPlacement !== 1) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function enrichSlotWithFloors(slot, bidRequest) {
+  try {
+    const slotFloors = {};
+
+    if (bidRequest.getFloor) {
+      if (bidRequest.mediaTypes?.banner) {
+        slotFloors.banner = {};
+        const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = bidRequest.getFloor({ size: bannerSize, mediaType: BANNER }));
+      }
+
+      if (bidRequest.mediaTypes?.video) {
+        slotFloors.video = {};
+        const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({ size: videoSize, mediaType: VIDEO }));
+      }
+
+      if (Object.keys(slotFloors).length > 0) {
+        if (!slot.ext) {
+          slot.ext = {}
+        }
+        Object.assign(slot.ext, {
+          floors: slotFloors
+        });
+      }
+    }
+  } catch (e) {
+    logError('Could not parse floors from Prebid: ' + e);
+  }
+}
+
 registerBidder(spec);
diff --git a/modules/gridBidAdapter.md b/modules/gridBidAdapter.md
index 77b9bbf0f36..d5ec747aae2 100644
--- a/modules/gridBidAdapter.md
+++ b/modules/gridBidAdapter.md
@@ -9,33 +9,51 @@ Maintainer: grid-tech@themediagrid.com
 Module that connects to Grid demand source to fetch bids.
 Grid bid adapter supports Banner and Video (instream and outstream).
 
+#Bidder Config
+You can allow writing in localStorage `pbjs.setBidderConfig` for the bidder `grid`
+```
+pbjs.setBidderConfig({
+    bidders: ["grid"],
+    config: {
+        localStorageWriteAllowed: true
+    }
+})
+```
+
 # Test Parameters
 ```
     var adUnits = [
            {
                code: 'test-div',
-               sizes: [[300, 250]],
+               mediaTypes: {
+                   banner: {
+                       sizes: [[300, 250], [300,600]],
+                   }
+               },
                bids: [
                    {
                        bidder: "grid",
                        params: {
                            uid: '1',
-                           priceType: 'gross' // by default is 'net'
+                           bidFloor: 0.5
                        }
                    }
                ]
            },{
                code: 'test-div',
-               sizes: [[728, 90]],
                bids: [
                    {
                        bidder: "grid",
                        params: {
                            uid: 2,
-                           priceType: 'gross',
                            keywords: {
-                               brandsafety: ['disaster'],
-                               topic: ['stress', 'fear']
+                               site: {
+                                  publisher: [{
+                                    name: 'someKeywordsName',
+                                    brandsafety: ['disaster'],
+                                    topic: ['stress', 'fear']
+                                  }]
+                                }
                            }
                        }
                    }
@@ -44,7 +62,12 @@ Grid bid adapter supports Banner and Video (instream and outstream).
            {
                code: 'test-div',
                sizes: [[728, 90]],
-               mediaTypes: { video: {} },
+               mediaTypes: {
+                   video: {
+                       playerSize: [1280, 720],
+                       context: 'instream'
+                   }
+               },
                bids: [
                    {
                        bidder: "grid",
diff --git a/modules/gridNMBidAdapter.js b/modules/gridNMBidAdapter.js
index ffd6c1b250c..c49b7619c07 100644
--- a/modules/gridNMBidAdapter.js
+++ b/modules/gridNMBidAdapter.js
@@ -1,10 +1,20 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {
+  isStr,
+  deepAccess,
+  isArray,
+  isNumber,
+  logError,
+  logWarn,
+  parseGPTSingleSizeArrayToRtbSize,
+  mergeDeep
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
 import { VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'gridNM';
-const ENDPOINT_URL = 'https://grid.bidswitch.net/hbnm';
+const ENDPOINT_URL = 'https://grid.bidswitch.net/hbjson';
 const SYNC_URL = 'https://x.bidswitch.net/sync?ssp=themediagrid';
 const TIME_TO_LIVE = 360;
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
@@ -35,18 +45,19 @@ export const spec = {
    */
   isBidRequestValid: function(bid) {
     let invalid =
-      !bid.params.source || !utils.isStr(bid.params.source) ||
-      !bid.params.secid || !utils.isStr(bid.params.secid) ||
-      !bid.params.pubid || !utils.isStr(bid.params.pubid);
+      !bid.params.source || !isStr(bid.params.source) ||
+      !bid.params.secid || !isStr(bid.params.secid) ||
+      !bid.params.pubid || !isStr(bid.params.pubid);
 
+    const video = deepAccess(bid, 'mediaTypes.video') || {};
+    const { protocols = video.protocols, mimes = video.mimes } = deepAccess(bid, 'params.video') || {};
     if (!invalid) {
-      invalid = !bid.params.video || !bid.params.video.protocols || !bid.params.video.mimes;
+      invalid = !protocols || !mimes;
     }
     if (!invalid) {
-      const {protocols, mimes} = bid.params.video;
-      invalid = !utils.isArray(mimes) || !mimes.length || mimes.filter((it) => !(it && utils.isStr(it))).length;
+      invalid = !isArray(mimes) || !mimes.length || mimes.filter((it) => !(it && isStr(it))).length;
       if (!invalid) {
-        invalid = !utils.isArray(protocols) || !protocols.length || protocols.filter((it) => !(utils.isNumber(it) && it > 0 && !(it % 1))).length;
+        invalid = !isArray(protocols) || !protocols.length || protocols.filter((it) => !(isNumber(it) && it > 0 && !(it % 1))).length;
       }
     }
     return !invalid;
@@ -61,41 +72,162 @@ export const spec = {
   buildRequests: function(validBidRequests, bidderRequest) {
     const bids = validBidRequests || [];
     const requests = [];
+    let { bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo } = bidderRequest || {};
+
+    const referer = refererInfo ? encodeURIComponent(refererInfo.page) : '';
 
     bids.forEach(bid => {
-      const {params, bidderRequestId, sizes} = bid;
-      const payload = {
-        sizes: utils.parseSizesInput(sizes).join(','),
-        r: bidderRequestId,
-        wrapperType: 'Prebid_js',
-        wrapperVersion: '$prebid.version$'
+      let user;
+      let userExt;
+
+      const schain = bid.schain;
+      const userIdAsEids = bid.userIdAsEids;
+
+      if (!bidderRequestId) {
+        bidderRequestId = bid.bidderRequestId;
+      }
+      if (!auctionId) {
+        auctionId = bid.auctionId;
+      }
+      const {
+        params: { floorcpm, pubdata, source, secid, pubid, content, video },
+        mediaTypes, bidId, adUnitCode, rtd, ortb2Imp, sizes
+      } = bid;
+
+      const bidFloor = _getFloor(mediaTypes || {}, bid, isNumber(floorcpm) && floorcpm);
+      const jwTargeting = rtd && rtd.jwplayer && rtd.jwplayer.targeting;
+      const jwpseg = (pubdata && pubdata.jwpseg) || (jwTargeting && jwTargeting.segments);
+
+      const siteContent = content || (jwTargeting && jwTargeting.content);
+
+      const impObj = {
+        id: bidId.toString(),
+        tagid: secid.toString(),
+        video: createVideoForImp(mergeDeep({}, video, mediaTypes && mediaTypes.video), sizes),
+        ext: {
+          divid: adUnitCode.toString()
+        }
       };
 
-      if (bidderRequest) {
-        if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-          payload.u = bidderRequest.refererInfo.referer;
+      if (ortb2Imp && ortb2Imp.ext && ortb2Imp.ext.data) {
+        impObj.ext.data = ortb2Imp.ext.data;
+        if (impObj.ext.data.adserver && impObj.ext.data.adserver.adslot) {
+          impObj.ext.gpid = impObj.ext.data.adserver.adslot.toString();
+        } else {
+          impObj.ext.gpid = ortb2Imp.ext.data.pbadslot && ortb2Imp.ext.data.pbadslot.toString();
         }
-        if (bidderRequest.timeout) {
-          payload.wtimeout = bidderRequest.timeout;
+      }
+
+      if (bidFloor) {
+        impObj.bidfloor = bidFloor;
+      }
+
+      const imp = [impObj];
+
+      const reqSource = {
+        tid: auctionId && auctionId.toString(),
+        ext: {
+          wrapper: 'Prebid_js',
+          wrapper_version: '$prebid.version$'
+        }
+      };
+
+      if (schain) {
+        reqSource.ext.schain = schain;
+      }
+
+      const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
+      const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
+
+      const request = {
+        id: bidderRequestId && bidderRequestId.toString(),
+        site: {
+          page: referer,
+          publisher: {
+            id: pubid,
+          },
+        },
+        source: reqSource,
+        tmax,
+        imp,
+      };
+
+      if (siteContent) {
+        request.site.content = siteContent;
+      }
+
+      if (jwpseg && jwpseg.length) {
+        user = {
+          data: [{
+            name: 'iow_labs_pub_data',
+            segment: segmentProcessing(jwpseg, 'jwpseg'),
+          }]
+        };
+      }
+
+      if (gdprConsent && gdprConsent.consentString) {
+        userExt = { consent: gdprConsent.consentString };
+      }
+
+      if (userIdAsEids && userIdAsEids.length) {
+        userExt = userExt || {};
+        userExt.eids = [...userIdAsEids];
+      }
+
+      if (userExt && Object.keys(userExt).length) {
+        user = user || {};
+        user.ext = userExt;
+      }
+
+      const ortb2UserData = deepAccess(bidderRequest, 'ortb2.user.data');
+      if (ortb2UserData && ortb2UserData.length) {
+        if (!user) {
+          user = { data: [] };
+        }
+        user = mergeDeep(user, {
+          data: [...ortb2UserData]
+        });
+      }
+
+      if (user) {
+        request.user = user;
+      }
+      const site = deepAccess(bidderRequest, 'ortb2.site');
+      if (site) {
+        const data = deepAccess(site, 'content.data');
+        if (data && data.length) {
+          const siteContent = request.site.content || {};
+          request.site.content = mergeDeep(siteContent, { data });
         }
-        if (bidderRequest.gdprConsent) {
-          if (bidderRequest.gdprConsent.consentString) {
-            payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
+      }
+
+      if (gdprConsent && gdprConsent.gdprApplies) {
+        request.regs = {
+          ext: {
+            gdpr: gdprConsent.gdprApplies ? 1 : 0
           }
-          payload.gdpr_applies =
-            (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
-              ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
+        };
+      }
+
+      if (uspConsent) {
+        if (!request.regs) {
+          request.regs = { ext: {} };
         }
-        if (bidderRequest.uspConsent) {
-          payload.us_privacy = bidderRequest.uspConsent;
+        request.regs.ext.us_privacy = uspConsent;
+      }
+
+      if (config.getConfig('coppa') === true) {
+        if (!request.regs) {
+          request.regs = {};
         }
+        request.regs.coppa = 1;
       }
 
       requests.push({
         method: 'POST',
-        url: ENDPOINT_URL + '?' + utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
+        url: ENDPOINT_URL + '?no_mapping=1&sp=' + source,
         bid: bid,
-        data: params // content
+        data: request
       });
     });
 
@@ -122,34 +254,36 @@ export const spec = {
     if (!errorMessage && serverResponse.seatbid) {
       const serverBid = _getBidFromResponse(serverResponse.seatbid[0]);
       if (serverBid) {
-        if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
+        if (!serverBid.adm && !serverBid.nurl) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
         else if (!serverBid.price) errorMessage = LOG_ERROR_MESS.noPrice + JSON.stringify(serverBid);
         else if (serverBid.content_type !== 'video') errorMessage = LOG_ERROR_MESS.wrongContentType + serverBid.content_type;
         if (!errorMessage) {
           const bid = bidRequest.bid;
-          if (!serverBid.w || !serverBid.h) {
-            const size = utils.parseSizesInput(bid.sizes)[0].split('x');
-            serverBid.w = size[0];
-            serverBid.h = size[1];
-          }
           const bidResponse = {
             requestId: bid.bidId,
-            bidderCode: spec.code,
             cpm: serverBid.price,
             width: serverBid.w,
             height: serverBid.h,
             creativeId: serverBid.auid || bid.bidderRequestId,
             currency: 'USD',
-            netRevenue: false,
+            netRevenue: true,
             ttl: TIME_TO_LIVE,
             dealId: serverBid.dealid,
-            vastXml: serverBid.adm,
             mediaType: VIDEO,
-            adResponse: {
-              content: serverBid.adm
+            meta: {
+              advertiserDomains: serverBid.adomain ? serverBid.adomain : []
             }
           };
 
+          if (serverBid.adm) {
+            bidResponse.vastXml = serverBid.adm;
+            bidResponse.adResponse = {
+              content: bidResponse.vastXml
+            };
+          } else if (serverBid.nurl) {
+            bidResponse.vastUrl = serverBid.nurl;
+          }
+
           if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
             bidResponse.renderer = createRenderer(bidResponse, {
               id: bid.bidId,
@@ -160,7 +294,7 @@ export const spec = {
         }
       }
     }
-    if (errorMessage) utils.logError(errorMessage);
+    if (errorMessage) logError(errorMessage);
     return bidResponses;
   },
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
@@ -187,13 +321,40 @@ export const spec = {
   }
 };
 
+/**
+ * Gets bidfloor
+ * @param {Object} mediaTypes
+ * @param {Object} bid
+ * @param {Number} floor
+ * @returns {Number} floor
+ */
+function _getFloor (mediaTypes, bid, floor) {
+  const curMediaType = mediaTypes.video ? 'video' : 'banner';
+
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: curMediaType,
+      size: bid.sizes.map(([w, h]) => ({w, h}))
+    });
+
+    if (typeof floorInfo === 'object' &&
+      floorInfo.currency === 'USD' &&
+      !isNaN(parseFloat(floorInfo.floor))) {
+      floor = Math.max(floor, parseFloat(floorInfo.floor));
+    }
+  }
+
+  return floor;
+}
+
 function _getBidFromResponse(respItem) {
   if (!respItem) {
-    utils.logError(LOG_ERROR_MESS.emptySeatbid);
+    logError(LOG_ERROR_MESS.emptySeatbid);
   } else if (!respItem.bid) {
-    utils.logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
+    logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
   } else if (!respItem.bid[0]) {
-    utils.logError(LOG_ERROR_MESS.noBid);
+    logError(LOG_ERROR_MESS.noBid);
   }
   return respItem && respItem.bid && respItem.bid[0];
 }
@@ -217,12 +378,49 @@ function createRenderer (bid, rendererParams) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
+    logWarn('Prebid Error calling setRender on renderer', err);
   }
 
   return renderer;
 }
 
+function createVideoForImp({ mind, maxd, size, ...paramsVideo }, bidSizes) {
+  if (size && isStr(size)) {
+    const sizeArray = size.split('x');
+    if (sizeArray.length === 2 && parseInt(sizeArray[0]) && parseInt(sizeArray[1])) {
+      paramsVideo.w = parseInt(sizeArray[0]);
+      paramsVideo.h = parseInt(sizeArray[1]);
+    }
+  }
+
+  if (!paramsVideo.w || !paramsVideo.h) {
+    const playerSizes = paramsVideo.playerSize && paramsVideo.playerSize.length === 2 ? paramsVideo.playerSize : bidSizes;
+    if (playerSizes) {
+      const playerSize = playerSizes[0];
+      if (playerSize) {
+        Object.assign(paramsVideo, parseGPTSingleSizeArrayToRtbSize(playerSize));
+      }
+    }
+  }
+
+  if (paramsVideo.playerSize) {
+    delete paramsVideo.playerSize;
+  }
+
+  const durationRangeSec = paramsVideo.durationRangeSec || [];
+  const minDur = mind || durationRangeSec[0] || paramsVideo.minduration;
+  const maxDur = maxd || durationRangeSec[1] || paramsVideo.maxduration;
+
+  if (minDur) {
+    paramsVideo.minduration = minDur;
+  }
+  if (maxDur) {
+    paramsVideo.maxduration = maxDur;
+  }
+
+  return paramsVideo;
+}
+
 export function resetUserSync() {
   hasSynced = false;
 }
@@ -231,4 +429,20 @@ export function getSyncUrl() {
   return SYNC_URL;
 }
 
+function segmentProcessing(segment, forceSegName) {
+  return segment
+    .map((seg) => {
+      const value = seg && (seg.id || seg);
+      if (typeof value === 'string' || typeof value === 'number') {
+        return {
+          value: value.toString(),
+          ...(forceSegName && { name: forceSegName }),
+          ...(seg.name && { name: seg.name }),
+        };
+      }
+      return null;
+    })
+    .filter((seg) => !!seg);
+}
+
 registerBidder(spec);
diff --git a/modules/growadvertisingBidAdapter.js b/modules/growadvertisingBidAdapter.js
new file mode 100644
index 00000000000..b9b256dbaff
--- /dev/null
+++ b/modules/growadvertisingBidAdapter.js
@@ -0,0 +1,167 @@
+'use strict';
+
+import { getBidIdParameter, deepAccess, _each, triggerPixel } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'growads';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
+
+  isBidRequestValid: function (bid) {
+    return bid.params && !!bid.params.zoneId;
+  },
+
+  buildRequests: function (validBidRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let zoneId;
+    let domain;
+    let requestURI;
+    let data = {};
+    const zoneCounters = {};
+
+    return validBidRequests.map(bidRequest => {
+      zoneId = getBidIdParameter('zoneId', bidRequest.params);
+      domain = getBidIdParameter('domain', bidRequest.params);
+
+      if (!(zoneId in zoneCounters)) {
+        zoneCounters[zoneId] = 0;
+      }
+
+      if (typeof domain === 'undefined' || domain.length === 0) {
+        domain = 'portal.growadvertising.com';
+      }
+
+      requestURI = 'https://' + domain + '/adserve/bid';
+      data = {
+        type: 'prebidjs',
+        zoneId: zoneId,
+        i: zoneCounters[zoneId]
+      };
+      zoneCounters[zoneId]++;
+
+      return {
+        method: 'GET',
+        url: requestURI,
+        data: data,
+        bidRequest: bidRequest
+      };
+    });
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const request = bidRequest.bidRequest;
+    let bidResponses = [];
+    let CPM;
+    let width;
+    let height;
+    let response;
+    let isCorrectSize = false;
+    let isCorrectCPM = true;
+    let minCPM;
+    let maxCPM;
+    let bid = {};
+
+    let body = serverResponse.body;
+
+    try {
+      response = JSON.parse(body);
+    } catch (ex) {
+      response = body;
+    }
+
+    if (response && response.status === 'success' && request) {
+      CPM = parseFloat(response.cpm);
+      width = parseInt(response.width);
+      height = parseInt(response.height);
+
+      minCPM = getBidIdParameter('minCPM', request.params);
+      maxCPM = getBidIdParameter('maxCPM', request.params);
+      width = parseInt(response.width);
+      height = parseInt(response.height);
+
+      // Ensure response CPM is within the given bounds
+      if (minCPM !== '' && CPM < parseFloat(minCPM)) {
+        isCorrectCPM = false;
+      }
+      if (maxCPM !== '' && CPM > parseFloat(maxCPM)) {
+        isCorrectCPM = false;
+      }
+
+      if (isCorrectCPM) {
+        bid = {
+          requestId: request.bidId,
+          bidderCode: request.bidder,
+          creativeId: response.creativeId,
+          cpm: CPM,
+          width: width,
+          height: height,
+          currency: response.currency,
+          netRevenue: true,
+          ttl: response.ttl,
+          adUnitCode: request.adUnitCode,
+          // TODO: is 'page' the right value here?
+          referrer: deepAccess(request, 'refererInfo.page')
+        };
+
+        if (response.hasOwnProperty(NATIVE)) {
+          bid[NATIVE] = {
+            title: response[NATIVE].title,
+            body: response[NATIVE].body,
+            body2: response[NATIVE].body2,
+            cta: response[NATIVE].cta,
+            sponsoredBy: response[NATIVE].sponsoredBy,
+            clickUrl: response[NATIVE].clickUrl,
+            impressionTrackers: response[NATIVE].impressionTrackers,
+          };
+
+          if (response[NATIVE].image) {
+            bid[NATIVE].image = {
+              url: response[NATIVE].image.url,
+              height: response[NATIVE].image.height,
+              width: response[NATIVE].image.width
+            };
+          }
+
+          if (response[NATIVE].icon) {
+            bid[NATIVE].icon = {
+              url: response[NATIVE].icon.url,
+              height: response[NATIVE].icon.height,
+              width: response[NATIVE].icon.width
+            };
+          }
+          bid.mediaType = NATIVE;
+          isCorrectSize = true;
+        } else {
+          bid.ad = response.ad;
+          bid.mediaType = BANNER;
+          // Ensure that response ad matches one of the placement sizes.
+          _each(deepAccess(request, 'mediaTypes.banner.sizes', []), function (size) {
+            if (width === size[0] && height === size[1]) {
+              isCorrectSize = true;
+            }
+          });
+        }
+
+        if (isCorrectSize) {
+          bidResponses.push(bid);
+        }
+      }
+    }
+
+    return bidResponses;
+  },
+
+  onBidWon: function (bid) {
+    if (bid.vurl) {
+      triggerPixel(bid.vurl);
+    }
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/growadvertisingBidAdapter.md b/modules/growadvertisingBidAdapter.md
new file mode 100644
index 00000000000..f17691e9b9f
--- /dev/null
+++ b/modules/growadvertisingBidAdapter.md
@@ -0,0 +1,70 @@
+---
+layout: bidder
+title: GrowAdvertising
+description: Prebid GrowAdvertising Bidder Adapter
+pbjs: true
+biddercode: growads
+media_types: banner
+---
+
+### Bid Params
+
+| Name          | Scope    | Description  |  Example  | Type     |
+|----------|----------|-----------|--------------------|----------|
+| `zoneId` | required | ZoneId ID | `'unique-zone-id'` | `string` |
+| `domain` | optional | Domain | `'example.org'` | `string` |
+| `minCPM` | optional | Minimum CPM | `1.5` | `float` |
+| `maxCPM` | optional | Maximum CPM | `10.8` | `float` |
+
+# Test Parameters
+```
+var adUnits = [
+       {
+           code: 'test-div',
+           mediaTypes: {
+               banner: {
+                   sizes: [[300, 250]]
+               }
+           },
+           bids: [
+               {
+                   bidder: "growads",
+                   params: {
+                       zoneId: '6WG9JK8-RvKai86-yL980YC-kQFoqXZ',
+                       domain: 'native-test.growadvertising.com'
+                   }
+               }
+           ]
+       },
+       // Native adUnit
+       {
+          code: 'native-div',
+          sizes: [[1, 1]],
+          mediaTypes: {
+              native: {
+                  title: {
+                      required: true
+                  },
+                  body: {
+                      required: true
+                  },
+                  image: {
+                      required: true
+                  },
+                  sponsoredBy: {
+                      required: true
+                  },
+              }
+          },
+          bids: [
+              {
+                  bidder: 'growads',
+                  params: {
+                      zoneId: 'YpQobqT-vEybhHx-1qaNMFx-Wj3Kwc2',
+                      domain: 'native-test.growadvertising.com'
+                  }
+              }
+          ]
+       },
+   ];
+```
diff --git a/modules/growthCodeAnalyticsAdapter.js b/modules/growthCodeAnalyticsAdapter.js
new file mode 100644
index 00000000000..1f11b891139
--- /dev/null
+++ b/modules/growthCodeAnalyticsAdapter.js
@@ -0,0 +1,176 @@
+/**
+ * growthCodeAnalyticsAdapter.js - GrowthCode Analytics Adapter
+ */
+import { ajax } from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import * as utils from '../src/utils.js';
+import CONSTANTS from '../src/constants.json';
+import { getStorageManager } from '../src/storageManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {logError, logInfo} from '../src/utils.js';
+
+const MODULE_NAME = 'growthCodeAnalytics';
+const DEFAULT_PID = 'INVALID_PID'
+const ENDPOINT_URL = 'https://p2.gcprivacy.com/v1/pb/analytics'
+
+export const storage = getStorageManager();
+
+let sessionId = utils.generateUUID();
+
+let trackEvents = [];
+let pid = DEFAULT_PID;
+let url = ENDPOINT_URL;
+
+let eventQueue = [];
+
+let startAuction = 0;
+let bidRequestTimeout = 0;
+let analyticsType = 'endpoint';
+
+let growthCodeAnalyticsAdapter = Object.assign(adapter({url: url, analyticsType}), {
+  track({eventType, eventData}) {
+    eventData = eventData ? JSON.parse(JSON.stringify(eventData)) : {};
+    let data = {};
+    if (!trackEvents.includes(eventType)) return;
+    switch (eventType) {
+      case CONSTANTS.EVENTS.AUCTION_INIT: {
+        data = eventData;
+        startAuction = data.timestamp;
+        bidRequestTimeout = data.timeout;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.AUCTION_END: {
+        data = eventData;
+        data.start = startAuction;
+        data.end = Date.now();
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_ADJUSTMENT: {
+        data.bidders = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_TIMEOUT: {
+        data.bidders = eventData;
+        data.duration = bidRequestTimeout;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_REQUESTED: {
+        data = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_RESPONSE: {
+        data = eventData;
+        delete data.ad;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_WON: {
+        data = eventData;
+        delete data.ad;
+        delete data.adUrl;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BIDDER_DONE: {
+        data = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.SET_TARGETING: {
+        data.targetings = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.REQUEST_BIDS: {
+        data = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.ADD_AD_UNITS: {
+        data = eventData;
+        break;
+      }
+
+      default:
+        return;
+    }
+
+    data.eventType = eventType;
+    data.timestamp = data.timestamp || Date.now();
+
+    sendEvent(data);
+  }
+});
+
+growthCodeAnalyticsAdapter.originEnableAnalytics = growthCodeAnalyticsAdapter.enableAnalytics;
+
+growthCodeAnalyticsAdapter.enableAnalytics = function(conf = {}) {
+  if (typeof conf.options === 'object') {
+    if (conf.options.pid) {
+      pid = conf.options.pid;
+      url = conf.options.url ? conf.options.url : ENDPOINT_URL;
+    } else {
+      logError(MODULE_NAME + ' Not a valid PartnerID')
+      return
+    }
+    if (conf.options.trackEvents) {
+      trackEvents = conf.options.trackEvents;
+    }
+  } else {
+    logError(MODULE_NAME + ' Invalid configuration');
+    return;
+  }
+
+  growthCodeAnalyticsAdapter.originEnableAnalytics(conf);
+};
+
+function logToServer() {
+  if (pid === DEFAULT_PID) return;
+  if (eventQueue.length > 1) {
+    let data = {
+      session: sessionId,
+      pid: pid,
+      timestamp: Date.now(),
+      timezoneoffset: new Date().getTimezoneOffset(),
+      url: getRefererInfo().page,
+      referer: document.referrer,
+      events: eventQueue
+    };
+
+    ajax(url, {
+      success: response => {
+        logInfo(MODULE_NAME + ' Send Data to Server')
+      },
+      error: error => {
+        logInfo(MODULE_NAME + ' Problem Send Data to Server: ' + error)
+      }
+    }, JSON.stringify(data), {method: 'POST', withCredentials: true})
+
+    eventQueue = [
+    ];
+  }
+}
+
+function sendEvent(event) {
+  eventQueue.push(event);
+  logInfo(MODULE_NAME + 'Analytics Event: ' + event);
+
+  if (event.eventType === CONSTANTS.EVENTS.AUCTION_END) {
+    logToServer();
+  }
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: growthCodeAnalyticsAdapter,
+  code: 'growthCodeAnalytics'
+});
+
+growthCodeAnalyticsAdapter.logToServer = logToServer;
+
+export default growthCodeAnalyticsAdapter;
diff --git a/modules/growthCodeAnalyticsAdapter.md b/modules/growthCodeAnalyticsAdapter.md
new file mode 100644
index 00000000000..e45cb2e9c62
--- /dev/null
+++ b/modules/growthCodeAnalyticsAdapter.md
@@ -0,0 +1,41 @@
+## GrowthCode Analytics Adapter
+
+[GrowthCode](https://growthcode.io) offers scaled infrastructure-as-a-service to 
+empower independent publishers to harness data and take control of identity and 
+audience while rapidly aligning to industry changes and margin pressure.
+
+## Building Prebid with GrowthCode Support
+
+First, make sure to add the GrowthCode submodule to your Prebid.js package with:
+
+```
+gulp build --modules=growthCodeIdSystem,growthCodeAnalyticsAdapter,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.enableAnalytics({
+  provider: 'growthCodeAnalytics',
+  options: {
+    pid: '<Contact GrowthCode>',
+    trackEvents: [
+      'auctionEnd',
+      'bidAdjustment',
+      'bidTimeout',
+      'bidRequested',
+      'bidResponse',
+      'noBid',
+      'bidWon',
+      'bidderDone']
+  }
+});
+```
+
+| Param enableAnalytics | Scope    | Type   | Description                                                 | Example                  |
+|-----------------------|----------|--------|-------------------------------------------------------------|--------------------------|
+| provider              | Required | String | The name of this Adapter.                                   | `"growthCodeAnalytics"`  |
+| params                | Required | Object | Details of module params.                                   |                          |
+| params.pid            | Required | String | This is the Customer ID value obtained via Intimate Merger. | `"<Contact GrowthCode>"` |
+| params.url            | Optional | String | Custom URL for server                                       |                          |
+| params.trackEvents    | Required | String | Name if the variable that holds your publisher ID           |                          |
diff --git a/modules/growthCodeIdSystem.js b/modules/growthCodeIdSystem.js
new file mode 100644
index 00000000000..edd7cd33012
--- /dev/null
+++ b/modules/growthCodeIdSystem.js
@@ -0,0 +1,168 @@
+/**
+ * This module adds GrowthCodeId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/growthCodeIdSystem
+ * @requires module:modules/userId
+ */
+
+import {logError, logInfo, tryAppendQueryString} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import { submodule } from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js';
+
+const GCID_EXPIRY = 7;
+const MODULE_NAME = 'growthCodeId';
+const GC_DATA_KEY = '_gc_data';
+const ENDPOINT_URL = 'https://p2.gcprivacy.com/v1/pb?'
+
+export const storage = getStorageManager({ gvlid: undefined, moduleName: MODULE_NAME });
+
+/**
+ * Read GrowthCode data from cookie or local storage
+ * @param key
+ * @return {string}
+ */
+export function readData(key) {
+  try {
+    let payload
+    if (storage.cookiesAreEnabled()) {
+      payload = tryParse(storage.getCookie(key))
+    }
+    if (storage.hasLocalStorage()) {
+      payload = tryParse(storage.getDataFromLocalStorage(key))
+    }
+    if ((payload.expire_at !== undefined) && (payload.expire_at > (Date.now() / 1000))) {
+      return payload
+    }
+  } catch (error) {
+    logError(error);
+  }
+}
+
+/**
+ * Store GrowthCode data in either cookie or local storage
+ * expiration date: 45 days
+ * @param key
+ * @param {string} value
+ */
+function storeData(key, value) {
+  try {
+    logInfo(MODULE_NAME + ': storing data: key=' + key + ' value=' + value);
+
+    if (value) {
+      if (storage.hasLocalStorage()) {
+        storage.setDataInLocalStorage(key, value);
+      }
+      const expiresStr = (new Date(Date.now() + (GCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
+      if (storage.cookiesAreEnabled()) {
+        storage.setCookie(key, value, expiresStr, 'LAX');
+      }
+    }
+  } catch (error) {
+    logError(error);
+  }
+}
+
+/**
+ * Parse json if possible, else return null
+ * @param data
+ * @param {object|null}
+ */
+function tryParse(data) {
+  try {
+    return JSON.parse(data);
+  } catch (err) {
+    logError(err);
+    return null;
+  }
+}
+
+/** @type {Submodule} */
+export const growthCodeIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {{string}} value
+   * @returns {{growthCodeId: {string}}|undefined}
+   */
+  decode(value) {
+    return value && value !== '' ? { 'growthCodeId': value } : undefined;
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData) {
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.pid !== 'string') {
+      logError('User ID - GrowthCodeID submodule requires a valid Partner ID to be defined');
+      return;
+    }
+
+    const gdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
+    const consentString = gdpr ? consentData.consentString : '';
+    if (gdpr && !consentString) {
+      logInfo('Consent string is required to call GrowthCode id.');
+      return;
+    }
+
+    let publisherId = configParams.publisher_id ? configParams.publisher_id : '_sharedID';
+
+    let sharedId;
+    if (configParams.publisher_id_storage === 'html5') {
+      sharedId = storage.getDataFromLocalStorage(publisherId, null) ? (storage.getDataFromLocalStorage(publisherId, null)) : null;
+    } else {
+      sharedId = storage.getCookie(publisherId, null) ? (storage.getCookie(publisherId, null)) : null;
+    }
+    if (!sharedId) {
+      logError('User ID - Publisher ID is not correctly setup.');
+    }
+
+    const resp = function(callback) {
+      let gcData = readData(GC_DATA_KEY);
+      if (gcData) {
+        callback(gcData);
+      } else {
+        let segment = window.location.pathname.substr(1).replace(/\/+$/, '');
+        if (segment === '') {
+          segment = 'home';
+        }
+
+        let url = configParams.url ? configParams.url : ENDPOINT_URL;
+        url = tryAppendQueryString(url, 'pid', configParams.pid);
+        url = tryAppendQueryString(url, 'uid', sharedId);
+        url = tryAppendQueryString(url, 'u', window.location.href);
+        url = tryAppendQueryString(url, 'h', window.location.hostname);
+        url = tryAppendQueryString(url, 's', segment);
+        url = tryAppendQueryString(url, 'r', document.referrer);
+
+        ajax(url, {
+          success: response => {
+            let respJson = tryParse(response);
+            // If response is a valid json and should save is true
+            if (respJson) {
+              storeData(GC_DATA_KEY, JSON.stringify(respJson))
+              callback(respJson);
+            } else {
+              callback();
+            }
+          },
+          error: error => {
+            logError(MODULE_NAME + ': ID fetch encountered an error', error);
+            callback();
+          }
+        }, undefined, {method: 'GET', withCredentials: true})
+      }
+    };
+    return { callback: resp };
+  }
+};
+
+submodule('userId', growthCodeIdSubmodule);
diff --git a/modules/growthCodeIdSystem.md b/modules/growthCodeIdSystem.md
new file mode 100644
index 00000000000..f804686a7a9
--- /dev/null
+++ b/modules/growthCodeIdSystem.md
@@ -0,0 +1,37 @@
+## GrowthCode User ID Submodule
+
+GrowthCode provides Id Enrichment for requests. 
+
+## Building Prebid with GrowthCode Support
+
+First, make sure to add the GrowthCode submodule to your Prebid.js package with:
+
+```
+gulp build --modules=growthCodeIdSystem,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'growthCodeId',
+      params: {
+          pid: 'TEST01', // Set your Partner ID here for production (obtained from Growthcode)
+          publisher_id: '_sharedID',
+          publisher_id_storage: 'html5'
+      }
+    }]
+  }
+});
+```
+
+| Param under userSync.userIds[] | Scope    | Type   | Description | Example         |
+|--------------------------------|----------|--------| --- |-----------------|
+| name                           | Required | String | The name of this module. | `"growthCodeId"` |
+| params                         | Required | Object | Details of module params. |                 |
+| params.pid                     | Required | String | This is the Parter ID value obtained from GrowthCode | `"TEST01"`        |
+| params.url | Optional | String | Custom URL for server | |
+| params.publisher_id | Optional | String | Name if the variable that holds your publisher ID | `"_sharedID"` |
+| params.publisher_id_storage | Optional | String | Publisher ID storage (cookie, html5) | `"html5"` |
diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index 54d845be7ad..93306984ab1 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -1,15 +1,13 @@
-import * as utils from '../src/utils.js'
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {_each, deepAccess, logError, logWarn, parseSizesInput} from '../src/utils.js';
 
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-
-import { config } from '../src/config.js'
-import { getStorageManager } from '../src/storageManager.js';
-import includes from 'core-js-pure/features/array/includes';
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-
-const storage = getStorageManager();
+import {config} from '../src/config.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {includes} from '../src/polyfill.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'gumgum'
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
 const ALIAS_BIDDER_CODE = ['gg']
 const BID_ENDPOINT = `https://g2.gumgum.com/hbid/imp`
 const JCSI = { t: 0, rq: 8, pbv: '$prebid.version$' }
@@ -18,32 +16,48 @@ const TIME_TO_LIVE = 60
 const DELAY_REQUEST_TIME = 1800000; // setting to 30 mins
 
 let invalidRequestIds = {};
-let browserParams = {};
-let pageViewId = null
+let pageViewId = null;
 
 // TODO: potential 0 values for browserParams sent to ad server
 function _getBrowserParams(topWindowUrl) {
-  let topWindow
-  let topScreen
-  let topUrl
-  let ggad
-  let ns
+  const paramRegex = paramName => new RegExp(`[?#&](${paramName}=(.*?))($|&)`, 'i');
+
+  let browserParams = {};
+  let topWindow;
+  let topScreen;
+  let topUrl;
+  let ggad;
+  let ggdeal;
+  let ns;
+
   function getNetworkSpeed () {
-    const connection = window.navigator && (window.navigator.connection || window.navigator.mozConnection || window.navigator.webkitConnection)
-    const Mbps = connection && (connection.downlink || connection.bandwidth)
-    return Mbps ? Math.round(Mbps * 1024) : null
+    const connection = window.navigator && (window.navigator.connection || window.navigator.mozConnection || window.navigator.webkitConnection);
+    const Mbps = connection && (connection.downlink || connection.bandwidth);
+    return Mbps ? Math.round(Mbps * 1024) : null;
   }
+
   function getOgURL () {
-    let ogURL = ''
-    const ogURLSelector = "meta[property='og:url']"
-    const head = document && document.getElementsByTagName('head')[0]
-    const ogURLElement = head.querySelector(ogURLSelector)
-    ogURL = ogURLElement ? ogURLElement.content : null
-    return ogURL
+    let ogURL = '';
+    const ogURLSelector = "meta[property='og:url']";
+    const head = document && document.getElementsByTagName('head')[0];
+    const ogURLElement = head.querySelector(ogURLSelector);
+    ogURL = ogURLElement ? ogURLElement.content : null;
+    return ogURL;
   }
-  if (browserParams.vw) {
-    // we've already initialized browserParams, just return it.
-    return browserParams
+
+  function stripGGParams (url) {
+    const params = [
+      'ggad',
+      'ggdeal'
+    ];
+
+    return params.reduce((result, param) => {
+      const matches = url.match(paramRegex(param));
+      if (!matches) return result;
+      matches[1] && (result = result.replace(matches[1], ''));
+      matches[3] && (result = result.replace(matches[3], ''));
+      return result;
+    }, url);
   }
 
   try {
@@ -51,8 +65,8 @@ function _getBrowserParams(topWindowUrl) {
     topScreen = topWindow.screen;
     topUrl = topWindowUrl || '';
   } catch (error) {
-    utils.logError(error);
-    return browserParams
+    logError(error);
+    return browserParams;
   }
 
   browserParams = {
@@ -60,37 +74,31 @@ function _getBrowserParams(topWindowUrl) {
     vh: topWindow.innerHeight,
     sw: topScreen.width,
     sh: topScreen.height,
-    pu: topUrl,
+    pu: stripGGParams(topUrl),
     ce: storage.cookiesAreEnabled(),
     dpr: topWindow.devicePixelRatio || 1,
     jcsi: JSON.stringify(JCSI),
     ogu: getOgURL()
-  }
+  };
 
-  ns = getNetworkSpeed()
+  ns = getNetworkSpeed();
   if (ns) {
-    browserParams.ns = ns
+    browserParams.ns = ns;
   }
 
-  ggad = (topUrl.match(/#ggad=(\w+)$/) || [0, 0])[1]
-  if (ggad) {
-    browserParams[isNaN(ggad) ? 'eAdBuyId' : 'adBuyId'] = ggad
-  }
-  return browserParams
+  ggad = (topUrl.match(paramRegex('ggad')) || [0, 0, 0])[2];
+  if (ggad) browserParams[isNaN(ggad) ? 'eAdBuyId' : 'adBuyId'] = ggad;
+
+  ggdeal = (topUrl.match(paramRegex('ggdeal')) || [0, 0, 0])[2];
+  if (ggdeal) browserParams.ggdeal = ggdeal;
+
+  return browserParams;
 }
 
 function getWrapperCode(wrapper, data) {
   return wrapper.replace('AD_JSON', window.btoa(JSON.stringify(data)))
 }
 
-function _getTradeDeskIDParam(userId) {
-  const unifiedIdObj = {};
-  if (userId.tdid) {
-    unifiedIdObj.tdid = userId.tdid;
-  }
-  return unifiedIdObj;
-}
-
 function _getDigiTrustQueryParams(userId) {
   let digiTrustId = userId.digitrustid && userId.digitrustid.data;
   // Verify there is an ID and this user has not opted out
@@ -130,19 +138,22 @@ function _serializeSupplyChainObj(schainObj) {
  * @param {BidRequest} bid The bid params to validate.
  * @return boolean True if this is a valid bid, and false otherwise.
  */
-function isBidRequestValid (bid) {
+function isBidRequestValid(bid) {
   const {
     params,
     adUnitCode
   } = bid;
-  const id = params.inScreen || params.inScreenPubID || params.inSlot || params.ICV || params.video || params.inVideo;
+  const legacyParamID = params.inScreen || params.inScreenPubID || params.inSlot || params.ICV || params.video || params.inVideo;
+  const id = legacyParamID || params.slot || params.native || params.zone || params.pubID;
 
   if (invalidRequestIds[id]) {
-    utils.logWarn(`[GumGum] Please check the implementation for ${id} for the placement ${adUnitCode}`);
+    logWarn(`[GumGum] Please check the implementation for ${id} for the placement ${adUnitCode}`);
     return false;
   }
 
   switch (true) {
+    case !!(params.zone): break;
+    case !!(params.pubId): break;
     case !!(params.inScreen): break;
     case !!(params.inScreenPubID): break;
     case !!(params.inSlot): break;
@@ -151,12 +162,12 @@ function isBidRequestValid (bid) {
     case !!(params.inVideo): break;
     case !!(params.videoPubID): break;
     default:
-      utils.logWarn(`[GumGum] No product selected for the placement ${adUnitCode}, please check your implementation.`);
+      logWarn(`[GumGum] No product selected for the placement ${adUnitCode}, please check your implementation.`);
       return false;
   }
 
   if (params.bidfloor && !(typeof params.bidfloor === 'number' && isFinite(params.bidfloor))) {
-    utils.logWarn('[GumGum] bidfloor must be a Number');
+    logWarn('[GumGum] bidfloor must be a Number');
     return false;
   }
 
@@ -168,7 +179,7 @@ function isBidRequestValid (bid) {
  * @param {Object} attributes
  * @returns {Object}
  */
-function _getVidParams (attributes) {
+function _getVidParams(attributes) {
   const {
     minduration: mind,
     maxduration: maxd,
@@ -178,7 +189,7 @@ function _getVidParams (attributes) {
     protocols = [],
     playerSize = []
   } = attributes;
-  const sizes = utils.parseSizesInput(playerSize);
+  const sizes = parseSizesInput(playerSize);
   const [viw, vih] = sizes[0] && sizes[0].split('x');
   let pr = '';
 
@@ -198,67 +209,175 @@ function _getVidParams (attributes) {
   };
 }
 
+/**
+ * Gets bidfloor
+ * @param {Object} mediaTypes
+ * @param {Number} bidfloor
+ * @param {Object} bid
+ * @returns {Number} floor
+ */
+function _getFloor(mediaTypes, staticBidFloor, bid) {
+  const curMediaType = Object.keys(mediaTypes)[0] || 'banner';
+  const bidFloor = { floor: 0, currency: 'USD' };
+
+  if (typeof bid.getFloor === 'function') {
+    const { currency, floor } = bid.getFloor({
+      mediaType: curMediaType,
+      size: '*'
+    });
+    floor && (bidFloor.floor = floor);
+    currency && (bidFloor.currency = currency);
+
+    if (staticBidFloor && floor && currency === 'USD') {
+      bidFloor.floor = Math.max(staticBidFloor, parseFloat(floor));
+    }
+  } else if (staticBidFloor) {
+    bidFloor.floor = staticBidFloor
+  }
+
+  return bidFloor;
+}
+
+/**
+ * loops through bannerSizes array to get greatest slot dimensions
+ * @param {number[][]} sizes
+ * @returns {number[]}
+ */
+function getGreatestDimensions(sizes) {
+  let maxw = 0;
+  let maxh = 0;
+  let greatestVal = 0;
+  sizes.forEach(bannerSize => {
+    let [width, height] = bannerSize;
+    let greaterSide = width > height ? width : height;
+    if ((greaterSide > greatestVal) || (greaterSide === greatestVal && width >= maxw && height >= maxh)) {
+      greatestVal = greaterSide;
+      maxw = width;
+      maxh = height;
+    }
+  });
+
+  return [maxw, maxh];
+}
+
+function getEids(userId) {
+  const idProperties = [
+    'uid',
+    'eid',
+    'lipbid'
+  ];
+
+  return Object.keys(userId).reduce(function (eids, provider) {
+    const eid = userId[provider];
+    switch (typeof eid) {
+      case 'string':
+        eids[provider] = eid;
+        break;
+
+      case 'object':
+        const idProp = idProperties.filter(prop => eid.hasOwnProperty(prop));
+        idProp.length && (eids[provider] = eid[idProp[0]]);
+        break;
+    }
+    return eids;
+  }, {});
+}
+
 /**
  * Make a server request from the list of BidRequests.
  *
  * @param {validBidRequests[]} - an array of bids
  * @return ServerRequest Info describing the request to the server.
  */
-function buildRequests (validBidRequests, bidderRequest) {
+function buildRequests(validBidRequests, bidderRequest) {
   const bids = [];
   const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
   const uspConsent = bidderRequest && bidderRequest.uspConsent;
   const timeout = config.getConfig('bidderTimeout');
-  const topWindowUrl = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
-  utils._each(validBidRequests, bidRequest => {
+  const coppa = config.getConfig('coppa') === true ? 1 : 0;
+  const topWindowUrl = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+  _each(validBidRequests, bidRequest => {
     const {
       bidId,
       mediaTypes = {},
       params = {},
       schain,
       transactionId,
-      userId = {}
+      userId = {},
+      ortb2Imp,
+      adUnitCode = ''
     } = bidRequest;
-    const bannerSizes = mediaTypes.banner && mediaTypes.banner.sizes;
+    const { currency, floor } = _getFloor(mediaTypes, params.bidfloor, bidRequest);
+    const eids = getEids(userId);
+    const gpid = deepAccess(ortb2Imp, 'ext.data.pbadslot') || deepAccess(ortb2Imp, 'ext.data.adserver.adslot');
+    let sizes = [1, 1];
     let data = {};
 
+    const date = new Date();
+    const lt = date.getTime();
+    const to = date.getTimezoneOffset();
+
+    // ADTS-174 Removed unnecessary checks to fix failing test
+    data.lt = lt;
+    data.to = to;
+
+    // ADTS-169 add adUnitCode to requests
+    if (adUnitCode) data.aun = adUnitCode;
+
+    // ADTS-134 Retrieve ID envelopes
+    for (const eid in eids) data[eid] = eids[eid];
+
+    // ADJS-1024 & ADSS-1297 & ADTS-175
+    gpid && (data.gpid = gpid);
+
+    if (mediaTypes.banner) {
+      sizes = mediaTypes.banner.sizes;
+    } else if (mediaTypes.video) {
+      sizes = mediaTypes.video.playerSize;
+      data = _getVidParams(mediaTypes.video);
+    }
+
     if (pageViewId) {
       data.pv = pageViewId;
     }
-    if (params.bidfloor) {
-      data.fp = params.bidfloor;
-    }
-    if (params.inScreenPubID) {
-      data.pubId = params.inScreenPubID;
-      data.pi = 2;
-    }
-    if (params.inScreen) {
-      data.t = params.inScreen;
-      data.pi = 2;
-    }
-    if (params.inSlot) {
-      data.si = parseInt(params.inSlot, 10);
-      data.pi = 3;
-    }
-    if (params.ICV) {
-      data.ni = parseInt(params.ICV, 10);
-      data.pi = 5;
+
+    if (floor) {
+      data.fp = floor;
+      data.fpc = currency;
     }
-    if (params.videoPubID) {
-      data = Object.assign(data, _getVidParams(mediaTypes.video));
-      data.pubId = params.videoPubID;
-      data.pi = 7;
+
+    if (params.iriscat && typeof params.iriscat === 'string') {
+      data.iriscat = params.iriscat;
     }
-    if (params.video) {
-      data = Object.assign(data, _getVidParams(mediaTypes.video));
-      data.t = params.video;
-      data.pi = 7;
+
+    if (params.irisid && typeof params.irisid === 'string') {
+      data.irisid = params.irisid;
     }
-    if (params.inVideo) {
-      data = Object.assign(data, _getVidParams(mediaTypes.video));
-      data.t = params.inVideo;
-      data.pi = 6;
+
+    if (params.zone || params.pubId) {
+      params.zone ? (data.t = params.zone) : (data.pubId = params.pubId);
+
+      data.pi = 2; // inscreen
+      // override pi if the following is found
+      if (params.slot) {
+        const [maxw, maxh] = getGreatestDimensions(sizes);
+        data.maxw = maxw;
+        data.maxh = maxh;
+        data.si = params.slot;
+        data.pi = 3;
+        data.bf = sizes.reduce((acc, curSlotDim) => `${acc}${acc && ','}${curSlotDim[0]}x${curSlotDim[1]}`, '');
+      } else if (params.native) {
+        data.ni = params.native;
+        data.pi = 5;
+      } else if (mediaTypes.video) {
+        data.pi = mediaTypes.video.linearity === 2 ? 6 : 7; // invideo : video
+      } else if (params.product && params.product.toLowerCase() === 'skins') {
+        data.pi = 8;
+      }
+    } else { // legacy params
+      data = { ...data, ...handleLegacyParams(params, sizes) };
     }
+
     if (gdprConsent) {
       data.gdprApplies = gdprConsent.gdprApplies ? 1 : 0;
     }
@@ -268,6 +387,9 @@ function buildRequests (validBidRequests, bidderRequest) {
     if (uspConsent) {
       data.uspConsent = uspConsent;
     }
+    if (coppa) {
+      data.coppa = coppa;
+    }
     if (schain && schain.nodes) {
       data.schain = _serializeSupplyChainObj(schain);
     }
@@ -278,45 +400,88 @@ function buildRequests (validBidRequests, bidderRequest) {
       tId: transactionId,
       pi: data.pi,
       selector: params.selector,
-      sizes: bannerSizes,
+      sizes,
       url: BID_ENDPOINT,
       method: 'GET',
-      data: Object.assign(data, _getBrowserParams(topWindowUrl), _getDigiTrustQueryParams(userId), _getTradeDeskIDParam(userId))
-    })
+      data: Object.assign(data, _getBrowserParams(topWindowUrl), _getDigiTrustQueryParams(userId))
+    });
   });
   return bids;
 }
 
+function handleLegacyParams(params, sizes) {
+  const data = {};
+  if (params.inScreenPubID) {
+    data.pubId = params.inScreenPubID;
+    data.pi = 2;
+  }
+  if (params.inScreen) {
+    data.t = params.inScreen;
+    data.pi = 2;
+  }
+  if (params.inSlot) {
+    const [maxw, maxh] = getGreatestDimensions(sizes);
+    data.maxw = maxw;
+    data.maxh = maxh;
+    data.si = params.inSlot;
+    data.pi = 3;
+    data.bf = sizes.reduce((acc, curSlotDim) => `${acc}${acc && ','}${curSlotDim[0]}x${curSlotDim[1]}`, '');
+  }
+  if (params.ICV) {
+    data.ni = params.ICV;
+    data.pi = 5;
+  }
+  if (params.videoPubID) {
+    data.pubId = params.videoPubID;
+    data.pi = 7;
+  }
+  if (params.video) {
+    data.t = params.video;
+    data.pi = 7;
+  }
+  if (params.inVideo) {
+    data.t = params.inVideo;
+    data.pi = 6;
+  }
+  return data;
+}
+
 /**
  * Unpack the response from the server into a list of bids.
  *
  * @param {*} serverResponse A successful response from the server.
  * @return {Bid[]} An array of bids which were nested inside the server.
  */
-function interpretResponse (serverResponse, bidRequest) {
+function interpretResponse(serverResponse, bidRequest) {
   const bidResponses = []
   const serverResponseBody = serverResponse.body
 
   if (!serverResponseBody || serverResponseBody.err) {
-    const data = bidRequest.data || {}
-    const id = data.t || data.si || data.ni || data.pubId;
+    const data = bidRequest.data || {};
+    const id = data.si || data.ni || data.t || data.pubId;
     const delayTime = serverResponseBody ? serverResponseBody.err.drt : DELAY_REQUEST_TIME;
     invalidRequestIds[id] = { productId: data.pi, timestamp: new Date().getTime() };
 
     setTimeout(() => {
       !!invalidRequestIds[id] && delete invalidRequestIds[id];
     }, delayTime);
-    utils.logWarn(`[GumGum] Please check the implementation for ${id}`);
+    logWarn(`[GumGum] Please check the implementation for ${id}`);
   }
 
   const defaultResponse = {
     ad: {
       price: 0,
       id: 0,
-      markup: ''
+      markup: '',
+      width: 0,
+      height: 0
     },
     pag: {
       pvid: 0
+    },
+    meta: {
+      adomain: [],
+      mediaType: ''
     }
   }
   const {
@@ -324,26 +489,47 @@ function interpretResponse (serverResponse, bidRequest) {
       price: cpm,
       id: creativeId,
       markup,
-      cur
+      cur,
+      width: responseWidth,
+      height: responseHeight,
+      maxw,
+      maxh
     },
     cw: wrapper,
     pag: {
       pvid
     },
-    jcsi
-  } = Object.assign(defaultResponse, serverResponseBody)
-  let data = bidRequest.data || {}
-  let product = data.pi
-  let isTestUnit = (product === 3 && data.si === 9)
-  let sizes = utils.parseSizesInput(bidRequest.sizes)
-  let [width, height] = sizes[0].split('x')
-
-  // return 1x1 when breakout expected
-  if ((product === 2 || product === 5) && includes(sizes, '1x1')) {
-    width = '1'
-    height = '1'
+    jcsi,
+    meta: {
+      adomain: advertiserDomains,
+      mediaType: type
+    }
+  } = Object.assign(defaultResponse, serverResponseBody);
+  let data = bidRequest.data || {};
+  let product = data.pi;
+  let mediaType = (product === 6 || product === 7) ? VIDEO : BANNER;
+  let isTestUnit = (product === 3 && data.si === 9);
+  let metaData = {
+    advertiserDomains: advertiserDomains || [],
+    mediaType: type || mediaType
+  };
+  let sizes = parseSizesInput(bidRequest.sizes);
+
+  if (maxw && maxh) {
+    sizes = [`${maxw}x${maxh}`];
+  } else if (product === 5 && includes(sizes, '1x1')) {
+    sizes = ['1x1'];
+  } else if (product === 2 && includes(sizes, '1x1')) {
+    const requestSizesThatMatchResponse = (bidRequest.sizes && bidRequest.sizes.reduce((result, current) => {
+      const [ width, height ] = current;
+      if (responseWidth === width || responseHeight === height) result.push(current.join('x'));
+      return result
+    }, [])) || [];
+    sizes = requestSizesThatMatchResponse.length ? requestSizesThatMatchResponse : parseSizesInput(bidRequest.sizes)
   }
 
+  let [width, height] = sizes[0].split('x');
+
   if (jcsi) {
     serverResponseBody.jcsi = JCSI
   }
@@ -355,9 +541,9 @@ function interpretResponse (serverResponse, bidRequest) {
     bidResponses.push({
       // dealId: DEAL_ID,
       // referrer: REFERER,
-      ...(product === 7 && { vastXml: markup }),
       ad: wrapper ? getWrapperCode(wrapper, Object.assign({}, serverResponseBody, { bidRequest })) : markup,
-      ...(product === 6 && {ad: markup}),
+      ...(mediaType === VIDEO && { ad: markup, vastXml: markup }),
+      mediaType,
       cpm: isTestUnit ? 0.1 : cpm,
       creativeId,
       currency: cur || 'USD',
@@ -365,7 +551,8 @@ function interpretResponse (serverResponse, bidRequest) {
       netRevenue: true,
       requestId: bidRequest.id,
       ttl: TIME_TO_LIVE,
-      width
+      width,
+      meta: metaData
     })
   }
   return bidResponses
@@ -378,7 +565,7 @@ function interpretResponse (serverResponse, bidRequest) {
  * @param {ServerResponse[]} serverResponses List of server's responses.
  * @return {UserSync[]} The user syncs which should be dropped.
  */
-function getUserSyncs (syncOptions, serverResponses) {
+function getUserSyncs(syncOptions, serverResponses) {
   const responses = serverResponses.map((response) => {
     return (response.body && response.body.pxs && response.body.pxs.scr) || []
   })
diff --git a/modules/gumgumBidAdapter.md b/modules/gumgumBidAdapter.md
index f47666e9628..88c9cd29f69 100644
--- a/modules/gumgumBidAdapter.md
+++ b/modules/gumgumBidAdapter.md
@@ -8,14 +8,105 @@ Maintainer: engineering@gumgum.com
 
 # Description
 
-GumGum adapter for Prebid.js 1.0
+GumGum adapter for Prebid.js
+Please note that both video and in-video products require a mediaType of video. 
+In-screen, slot, and skins products should have a mediaType of banner.
 
 # Test Parameters
 ```
+var adUnits = [
+  {
+    code: 'slot-placement',
+    sizes: [[300, 250]],
+    mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'dc9d6be1', // GumGum Zone ID given to the client
+          slot: '15901', // GumGum Slot ID given to the client,
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  },{
+    code: 'inscreen-placement',
+    sizes: [[300, 50]],
+    mediaTypes: {
+        banner: {
+          sizes: [[1, 1]],
+        }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'dc9d6be1', // GumGum Zone ID given to the client
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  },{
+    code: 'skins-placement',
+    sizes: [[300, 50]],
+    mediaTypes: {
+        banner: {
+          sizes: [[1, 1]],
+        }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'dc9d6be1', // GumGum Zone ID given to the client
+          product: 'skins',
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  },{
+    code: 'video-placement',
+    sizes: [[300, 50]],
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        minduration: 1,
+        maxduration: 2,
+        linearity: 1,
+        startdelay: 1,
+        placement: 1,
+        protocols: [1, 2]
+      }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'ggumtest', // GumGum Zone ID given to the client
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  }
+];
+```
+
+# Legacy Test Parameters
+```
 var adUnits = [
   {
     code: 'test-div',
     sizes: [[300, 250]],
+    mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+    },
     bids: [
       {
         bidder: 'gumgum',
@@ -28,6 +119,11 @@ var adUnits = [
   },{
     code: 'test-div',
     sizes: [[300, 50]],
+    mediaTypes: {
+        banner: {
+          sizes: [[1, 1]],
+        }
+    },
     bids: [
       {
         bidder: 'gumgum',
@@ -40,6 +136,18 @@ var adUnits = [
   },{
     code: 'test-div',
     sizes: [[300, 50]],
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        minduration: 1,
+        maxduration: 2,
+        linearity: 2,
+        startdelay: 1,
+        placement: 1,
+        protocols: [1, 2]
+      }
+    }
     bids: [
       {
         bidder: 'gumgum',
diff --git a/modules/gxoneBidAdapter.md b/modules/gxoneBidAdapter.md
deleted file mode 100644
index 3168d297da3..00000000000
--- a/modules/gxoneBidAdapter.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Overview
-
-Module Name: GXOne Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: olivier@geronimo.co
-
-# Description
-
-Module that connects to GXOne demand source to fetch bids.
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "gxone",
-                       params: {
-                           uid: '2',
-                           priceType: 'gross' // by default is 'net'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[728, 90]],
-               bids: [
-                   {
-                       bidder: "gxone",
-                       params: {
-                           uid: 9,
-                           priceType: 'gross'
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/h12mediaBidAdapter.js b/modules/h12mediaBidAdapter.js
index 0d2c22a3f68..c58f15c9a81 100644
--- a/modules/h12mediaBidAdapter.js
+++ b/modules/h12mediaBidAdapter.js
@@ -1,6 +1,5 @@
-import * as utils from '../src/utils.js';
+import { inIframe, logError, logMessage, deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import find from 'core-js-pure/features/array/find.js';
 const BIDDER_CODE = 'h12media';
 const DEFAULT_URL = 'https://bidder.h12-media.com/prebid/';
 const DEFAULT_CURRENCY = 'USD';
@@ -16,21 +15,31 @@ export const spec = {
   },
 
   buildRequests: function(validBidRequests, bidderRequest) {
-    const requestUrl = validBidRequests[0].params.endpointdom || DEFAULT_URL;
-    const isiframe = !((window.self === window.top) || window.frameElement);
+    const isiframe = inIframe();
     const screenSize = getClientDimensions();
     const docSize = getDocumentDimensions();
 
-    const bidrequests = validBidRequests.map((bidRequest) => {
+    return validBidRequests.map((bidRequest) => {
       const bidderParams = bidRequest.params;
-      const adUnitElement = document.getElementById(bidRequest.adUnitCode);
+      const requestUrl = bidderParams.endpointdom || DEFAULT_URL;
+      let pubsubid = bidderParams.pubsubid || '';
+      if (pubsubid && pubsubid.length > 32) {
+        logError('Bidder param \'pubsubid\' should be not more than 32 chars.');
+        pubsubid = '';
+      }
+      const pubcontainerid = bidderParams.pubcontainerid;
+      const adUnitElement = document.getElementById(pubcontainerid || bidRequest.adUnitCode);
       const ishidden = !isVisible(adUnitElement);
-      const coords = {
+      const framePos = getFramePos();
+      const coords = isiframe ? {
+        x: framePos[0],
+        y: framePos[1],
+      } : {
         x: adUnitElement && adUnitElement.getBoundingClientRect().x,
         y: adUnitElement && adUnitElement.getBoundingClientRect().y,
       };
 
-      return {
+      const bidrequest = {
         bidId: bidRequest.bidId,
         transactionId: bidRequest.transactionId,
         adunitId: bidRequest.adUnitCode,
@@ -40,33 +49,47 @@ export const spec = {
         adunitSize: bidRequest.mediaTypes.banner.sizes || [],
         coords,
         ishidden,
+        pubsubid,
+        pubcontainerid,
       };
-    });
 
-    return {
-      method: 'POST',
-      url: requestUrl,
-      options: {withCredentials: false},
-      data: {
-        gdpr: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false,
-        gdpr_cs: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? bidderRequest.gdprConsent.consentString : '',
-        topLevelUrl: window.top.location.href,
-        refererUrl: bidderRequest.refererInfo ? bidderRequest.refererInfo.referer : '',
-        isiframe,
-        version: '$prebid.version$',
-        visitorInfo: {
-          localTime: getLocalDateFormatted(),
-          dayOfWeek: new Date().getDay(),
-          screenWidth: screenSize[0],
-          screenHeight: screenSize[1],
-          docWidth: docSize[0],
-          docHeight: docSize[1],
-          scrollbarx: window.scrollX,
-          scrollbary: window.scrollY,
+      let windowTop;
+      try {
+        windowTop = window.top;
+      } catch (e) {
+        logMessage(e);
+        windowTop = window;
+      }
+
+      return {
+        method: 'POST',
+        url: requestUrl,
+        options: {withCredentials: true},
+        data: {
+          gdpr: !!deepAccess(bidderRequest, 'gdprConsent.gdprApplies', false),
+          gdpr_cs: deepAccess(bidderRequest, 'gdprConsent.consentString', ''),
+          usp: !!deepAccess(bidderRequest, 'uspConsent', false),
+          usp_cs: deepAccess(bidderRequest, 'uspConsent', ''),
+          topLevelUrl: deepAccess(bidderRequest, 'refererInfo.page', ''),
+          // TODO: does the fallback make sense here?
+          refererUrl: deepAccess(bidderRequest, 'refererInfo.ref', window.document.referrer),
+          isiframe,
+          version: '$prebid.version$',
+          ExtUserIDs: bidRequest.userId,
+          visitorInfo: {
+            localTime: getLocalDateFormatted(),
+            dayOfWeek: new Date().getDay(),
+            screenWidth: screenSize[0],
+            screenHeight: screenSize[1],
+            docWidth: docSize[0],
+            docHeight: docSize[1],
+            scrollbarx: windowTop.scrollX,
+            scrollbary: windowTop.scrollY,
+          },
+          bidrequest,
         },
-        bidrequests,
-      },
-    };
+      };
+    });
   },
 
   interpretResponse: function(serverResponse, bidRequests) {
@@ -74,78 +97,80 @@ export const spec = {
     try {
       const serverBody = serverResponse.body;
       if (serverBody) {
-        if (serverBody.bids) {
-          serverBody.bids.forEach(bidBody => {
-            const bidRequest = find(bidRequests.data.bidrequests, bid => bid.bidId === bidBody.bidId);
-            const bidResponse = {
-              currency: serverBody.currency || DEFAULT_CURRENCY,
-              netRevenue: serverBody.netRevenue || DEFAULT_NET_REVENUE,
-              ttl: serverBody.ttl || DEFAULT_TTL,
-              requestId: bidBody.bidId,
-              cpm: bidBody.cpm,
-              width: bidBody.width,
-              height: bidBody.height,
-              creativeId: bidBody.creativeId,
-              ad: bidBody.ad,
-              meta: bidBody.meta,
-              mediaType: 'banner',
-            };
-            if (bidRequest) {
-              bidResponse.pubid = bidRequest.pubid;
-              bidResponse.placementid = bidRequest.placementid;
-              bidResponse.size = bidRequest.size;
-            }
-            bidResponses.push(bidResponse);
-          });
+        if (serverBody.bid) {
+          const bidBody = serverBody.bid;
+          const bidRequest = bidRequests.data.bidrequest;
+          const bidResponse = {
+            currency: serverBody.currency || DEFAULT_CURRENCY,
+            netRevenue: serverBody.netRevenue || DEFAULT_NET_REVENUE,
+            ttl: serverBody.ttl || DEFAULT_TTL,
+            requestId: bidBody.bidId,
+            cpm: bidBody.cpm,
+            width: bidBody.width,
+            height: bidBody.height,
+            creativeId: bidBody.creativeId,
+            ad: bidBody.ad,
+            meta: bidBody.meta,
+            mediaType: 'banner',
+          };
+          if (bidRequest) {
+            bidResponse.pubid = bidRequest.pubid;
+            bidResponse.placementid = bidRequest.placementid;
+            bidResponse.size = bidRequest.size;
+          }
+          bidResponses.push(bidResponse);
         }
       }
       return bidResponses;
     } catch (err) {
-      utils.logError(err);
+      logError(err);
     }
   },
 
-  getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
-    const serverBody = serverResponses[0].body;
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, usPrivacy) {
     const syncs = [];
+    const uspApplies = !!deepAccess(usPrivacy, 'uspConsent', false);
+    const uspString = deepAccess(usPrivacy, 'uspConsent', '');
     gdprConsent = gdprConsent || {
       gdprApplies: false, consentString: '',
     };
 
-    if (serverBody) {
-      if (serverBody.bids) {
-        serverBody.bids.forEach(bidBody => {
-          const userSyncUrls = bidBody.usersync || [];
-          const userSyncUrlProcess = url => {
-            return url
-              .replace('{gdpr}', gdprConsent.gdprApplies)
-              .replace('{gdpr_cs}', gdprConsent.consentString);
-          }
+    const userSyncUrlProcess = url => {
+      return url
+        .replace('{gdpr}', gdprConsent.gdprApplies)
+        .replace('{gdpr_cs}', gdprConsent.consentString)
+        .replace('{usp}', uspApplies)
+        .replace('{usp_cs}', uspString);
+    }
 
-          userSyncUrls.forEach(sync => {
-            if (syncOptions.iframeEnabled && sync.type === 'iframe' && sync.url) {
-              syncs.push({
-                type: 'iframe',
-                url: userSyncUrlProcess(sync.url),
-              });
-            }
-            if (syncOptions.pixelEnabled && sync.type === 'image' && sync.url) {
-              syncs.push({
-                type: 'image',
-                url: userSyncUrlProcess(sync.url),
-              });
-            }
+    serverResponses.forEach(serverResponse => {
+      const userSyncUrls = serverResponse.body.usersync || [];
+      userSyncUrls.forEach(sync => {
+        if (syncOptions.iframeEnabled && sync.type === 'iframe' && sync.url) {
+          syncs.push({
+            type: 'iframe',
+            url: userSyncUrlProcess(sync.url),
           });
-        });
-      }
-    }
+        }
+        if (syncOptions.pixelEnabled && sync.type === 'image' && sync.url) {
+          syncs.push({
+            type: 'image',
+            url: userSyncUrlProcess(sync.url),
+          });
+        }
+      })
+    });
 
     return syncs;
   },
 }
 
 function getContext(elem) {
-  return elem && window.document.body.contains(elem) ? window : (window.top.document.body.contains(elem) ? top : undefined);
+  try {
+    return elem && window.document.body.contains(elem) ? window : (window.top.document.body.contains(elem) ? top : undefined);
+  } catch (e) {
+    return undefined;
+  }
 }
 
 function isDefined(val) {
@@ -173,7 +198,7 @@ function getIsHidden(elem) {
     } catch (o) {
       return false;
     }
-  } while ((m < 250) && (lastElem != null) && (elemHidden === false))
+  } while ((m < 250) && (lastElem != null) && (elemHidden === false));
   return elemHidden;
 }
 
@@ -206,4 +231,24 @@ function getLocalDateFormatted() {
   return `${d.getFullYear()}-${two(d.getMonth() + 1)}-${two(d.getDate())} ${two(d.getHours())}:${two(d.getMinutes())}:${two(d.getSeconds())}`;
 }
 
+function getFramePos() {
+  let t = window;
+  let m = 0;
+  let frmLeft = 0;
+  let frmTop = 0;
+  do {
+    m = m + 1;
+    try {
+      if (m > 1) {
+        t = t.parent
+      }
+      frmLeft = frmLeft + t.frameElement.getBoundingClientRect().left;
+      frmTop = frmTop + t.frameElement.getBoundingClientRect().top;
+    } catch (o) { /* keep looping */
+    }
+  } while ((m < 100) && (t.parent !== t.self))
+
+  return [frmLeft, frmTop];
+}
+
 registerBidder(spec);
diff --git a/modules/hadronAnalyticsAdapter.js b/modules/hadronAnalyticsAdapter.js
new file mode 100644
index 00000000000..52829cf754d
--- /dev/null
+++ b/modules/hadronAnalyticsAdapter.js
@@ -0,0 +1,200 @@
+import { ajax } from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import * as utils from '../src/utils.js';
+import CONSTANTS from '../src/constants.json';
+import { getStorageManager } from '../src/storageManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+
+/**
+ * hadronAnalyticsAdapter.js - Audigent Hadron Analytics Adapter
+ */
+
+const HADRON_ANALYTICS_URL = 'https://analytics.hadron.ad.gt/api/v1/analytics';
+const HADRONID_ANALYTICS_VER = 'pbadgt0';
+const DEFAULT_PARTNER_ID = 0;
+const AU_GVLID = 561;
+
+export const storage = getStorageManager();
+
+var viewId = utils.generateUUID();
+
+var partnerId = DEFAULT_PARTNER_ID;
+var eventsToTrack = [];
+
+var w = window;
+var d = document;
+var e = d.documentElement;
+var g = d.getElementsByTagName('body')[0];
+var x = w.innerWidth || e.clientWidth || g.clientWidth;
+var y = w.innerHeight || e.clientHeight || g.clientHeight;
+
+var pageView = {
+  eventType: 'pageView',
+  userAgent: window.navigator.userAgent,
+  timestamp: Date.now(),
+  timezoneOffset: new Date().getTimezoneOffset(),
+  language: window.navigator.language,
+  vendor: window.navigator.vendor,
+  pageUrl: getRefererInfo().page,
+  screenWidth: x,
+  screenHeight: y
+};
+
+var eventQueue = [
+  pageView
+];
+
+var startAuction = 0;
+var bidRequestTimeout = 0;
+let analyticsType = 'endpoint';
+
+let hadronAnalyticsAdapter = Object.assign(adapter({url: HADRON_ANALYTICS_URL, analyticsType}), {
+  track({eventType, args}) {
+    args = args ? JSON.parse(JSON.stringify(args)) : {};
+    var data = {};
+    if (!eventsToTrack.includes(eventType)) return;
+    switch (eventType) {
+      case CONSTANTS.EVENTS.AUCTION_INIT: {
+        data = args;
+        startAuction = data.timestamp;
+        bidRequestTimeout = data.timeout;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.AUCTION_END: {
+        data = args;
+        data.start = startAuction;
+        data.end = Date.now();
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_ADJUSTMENT: {
+        data.bidders = args;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_TIMEOUT: {
+        data.bidders = args;
+        data.duration = bidRequestTimeout;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_REQUESTED: {
+        data = args;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_RESPONSE: {
+        data = args;
+        delete data.ad;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_WON: {
+        data = args;
+        delete data.ad;
+        delete data.adUrl;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BIDDER_DONE: {
+        data = args;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.SET_TARGETING: {
+        data.targetings = args;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.REQUEST_BIDS: {
+        data = args;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.ADD_AD_UNITS: {
+        data = args;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.AD_RENDER_FAILED: {
+        data = args;
+        break;
+      }
+
+      default:
+        return;
+    }
+
+    data.eventType = eventType;
+    data.timestamp = data.timestamp || Date.now();
+
+    sendEvent(data);
+  }
+});
+
+hadronAnalyticsAdapter.originEnableAnalytics = hadronAnalyticsAdapter.enableAnalytics;
+
+hadronAnalyticsAdapter.enableAnalytics = function(conf = {}) {
+  if (typeof conf.options === 'object') {
+    if (conf.options.partnerId) {
+      partnerId = conf.options.partnerId;
+    } else {
+      partnerId = DEFAULT_PARTNER_ID;
+    }
+    if (conf.options.eventsToTrack) {
+      eventsToTrack = conf.options.eventsToTrack;
+    }
+  } else {
+    utils.logError('HADRON_ANALYTICS_NO_CONFIG_ERROR');
+    return;
+  }
+
+  hadronAnalyticsAdapter.originEnableAnalytics(conf);
+};
+
+function flush() {
+  // Don't send anything if no partner id was declared
+  if (partnerId === DEFAULT_PARTNER_ID) return;
+  if (eventQueue.length > 1) {
+    var data = {
+      pageViewId: viewId,
+      ver: HADRONID_ANALYTICS_VER,
+      partnerId: partnerId,
+      events: eventQueue
+    };
+
+    ajax(HADRON_ANALYTICS_URL,
+      () => utils.logInfo('HADRON_ANALYTICS_BATCH_SEND'),
+      JSON.stringify(data),
+      {
+        contentType: 'application/json',
+        method: 'POST'
+      }
+    );
+
+    eventQueue = [
+      pageView
+    ];
+  }
+}
+
+function sendEvent(event) {
+  eventQueue.push(event);
+  utils.logInfo(`HADRON_ANALYTICS_EVENT ${event.eventType} `, event);
+
+  if (event.eventType === CONSTANTS.EVENTS.AUCTION_END) {
+    flush();
+  }
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: hadronAnalyticsAdapter,
+  code: 'hadronAnalytics',
+  gvlid: AU_GVLID
+});
+
+hadronAnalyticsAdapter.flush = flush;
+
+export default hadronAnalyticsAdapter;
diff --git a/modules/hadronAnalyticsAdapter.md b/modules/hadronAnalyticsAdapter.md
new file mode 100644
index 00000000000..8a41be8d36e
--- /dev/null
+++ b/modules/hadronAnalyticsAdapter.md
@@ -0,0 +1,48 @@
+# Overview
+Module Name: Hadron Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: [audigent.com](https://audigent.com)
+
+# Hadron ID
+
+The Hadron ID is a container that publishers and ad tech platforms can use to 
+recognise users' segments where 3rd party cookies are not available. 
+The Hadron ID is designed to respect users' privacy choices and publishers’ 
+preferences throughout the advertising value chain. 
+For more information about the Hadron ID and detailed integration docs, please visit 
+[our brochure](https://audigent.com/hadron-id).
+
+# Hadron Analytics Registration
+
+The Hadron Analytics Adapter is free to use for our customers. 
+Please visit [audigent/hadron-id](https://audigent.com/hadron-id) to request a demo or get more info.
+
+The partners' privacy policy is at [https://audigent.com/privacypolicy/#partners](https://audigent.com/privacypolicy/#partners).
+
+## Hadron Analytics Configuration
+
+First, make sure to add the Hadron Analytics submodule to your Prebid.js package with:
+
+```
+gulp build --modules=...,hadronAnalyticsAdapter
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.enableAnalytics({
+    provider: 'hadronAnalytics',
+    options: {
+        partnerId: 1234, // change to the Partner ID you got from Audigent
+        eventsToTrack: ['auctionEnd','bidWon']
+    }
+});
+```
+
+| Parameter             | Scope    | Type             | Description                                             | Example                   |
+|-----------------------|----------|------------------|---------------------------------------------------------|---------------------------|
+| provider              | Required | String           | The name of this module: `hadronAnalytics`              | `hadronAnalytics`         |
+| options.partnerId     | Required | Number           | This is the Audigent Partner ID obtained from Audigent. | `1234`                    |
+| options.eventsToTrack | Optional | Array of strings | Overrides the set of tracked events                     | `['auctionEnd','bidWon']` |
diff --git a/modules/hadronIdSystem.js b/modules/hadronIdSystem.js
new file mode 100644
index 00000000000..2f10245cd59
--- /dev/null
+++ b/modules/hadronIdSystem.js
@@ -0,0 +1,109 @@
+/**
+ * This module adds HadronID to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/hadronIdSystem
+ * @requires module:modules/userId
+ */
+
+import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import { isFn, isStr, isPlainObject, logError } from '../src/utils.js';
+
+const MODULE_NAME = 'hadronId';
+const AU_GVLID = 561;
+const DEFAULT_HADRON_URL_ENDPOINT = 'https://id.hadron.ad.gt/api/v1/pbhid';
+
+export const storage = getStorageManager({gvlid: AU_GVLID, moduleName: 'hadron'});
+
+/**
+ * Param or default.
+ * @param {String} param
+ * @param {String} defaultVal
+ */
+function paramOrDefault(param, defaultVal, arg) {
+  if (isFn(param)) {
+    return param(arg);
+  } else if (isStr(param)) {
+    return param;
+  }
+  return defaultVal;
+}
+
+/**
+ * @param {string} url
+ * @param {string} params
+ * @returns {string}
+ */
+const urlAddParams = (url, params) => {
+  return url + (url.indexOf('?') > -1 ? '&' : '?') + params
+}
+
+/** @type {Submodule} */
+export const hadronIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {Object}
+   */
+  decode(value) {
+    let hadronId = storage.getDataFromLocalStorage('auHadronId');
+    if (isStr(hadronId)) {
+      return {hadronId: hadronId};
+    }
+    return (value && typeof value['hadronId'] === 'string') ? { 'hadronId': value['hadronId'] } : undefined;
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config) {
+    if (!isPlainObject(config.params)) {
+      config.params = {};
+    }
+    const partnerId = config.params.partnerId | 0;
+
+    const url = urlAddParams(
+      paramOrDefault(config.params.url, DEFAULT_HADRON_URL_ENDPOINT, config.params.urlArg),
+      `partner_id=${partnerId}&_it=prebid`
+    );
+
+    const resp = function (callback) {
+      let hadronId = storage.getDataFromLocalStorage('auHadronId');
+      if (isStr(hadronId)) {
+        const responseObj = {hadronId: hadronId};
+        callback(responseObj);
+      } else {
+        const callbacks = {
+          success: response => {
+            let responseObj;
+            if (response) {
+              try {
+                responseObj = JSON.parse(response);
+              } catch (error) {
+                logError(error);
+              }
+            }
+            callback(responseObj);
+          },
+          error: error => {
+            logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+            callback();
+          }
+        };
+        ajax(url, callbacks, undefined, {method: 'GET'});
+      }
+    };
+    return {callback: resp};
+  }
+};
+
+submodule('userId', hadronIdSubmodule);
diff --git a/modules/hadronIdSystem.md b/modules/hadronIdSystem.md
new file mode 100644
index 00000000000..7521cca06ac
--- /dev/null
+++ b/modules/hadronIdSystem.md
@@ -0,0 +1,39 @@
+## Audigent Hadron User ID Submodule
+
+Audigent Hadron ID Module. For assistance setting up your module please contact us at [prebid@audigent.com](prebid@audigent.com).
+
+### Prebid Params
+
+Individual params may be set for the Audigent Hadron ID Submodule. At least one identifier must be set in the params.
+
+```
+pbjs.setConfig({
+    usersync: {
+        userIds: [{
+            name: 'hadronId',
+            params: {
+                partnerId: 1234   // change it to the Partner ID you'll get from Audigent
+            },
+            storage: {
+                name: 'hadronId',
+                type: 'html5'
+            }
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the HadronID User ID Module integration.
+
+| Param under usersync.userIds[] | Scope    | Type    | Description                                                                                                                                                                                                                 | Example                                                |
+|--------------------------------|----------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------|
+| name                           | Required | String  | ID value for the HadronID module - `"hadronId"`                                                                                                                                                                             | `"hadronId"`                                           |
+| storage                        | Required | Object  | The publisher must specify the local storage in which to store the results of the call to get the user ID. This can be either cookie or HTML5 storage.                                                                      |                                                        |
+| storage.type                   | Required | String  | This is where the results of the user ID will be stored. The recommended method is `localStorage` by specifying `html5`.                                                                                                    | `"html5"`                                              |
+| storage.name                   | Required | String  | The name of the cookie or html5 local storage where the user ID will be stored.                                                                                                                                             | `"hadronid"`                                           |
+| storage.expires                | Optional | Integer | How long (in days) the user ID information will be stored.                                                                                                                                                                  | `365`                                                  |
+| value                          | Optional | Object  | Used only if the page has a separate mechanism for storing the Hadron ID. The value is an object containing the values to be sent to the adapters. In this scenario, no URL is called and nothing is added to local storage | `{"hadronId": "eb33b0cb-8d35-4722-b9c0-1a31d4064888"}` |
+| params                         | Optional | Object  | Used to store params for the id system                                                                                                                                                                                      |
+| params.partnerId               | Required | Number  | This is the Audigent Partner ID obtained from Audigent.                                                                                                                                                                     | `1234`                                                 |
+| params.url                     | Optional | String  | Set an alternate GET url for HadronId with this parameter                                                                                                                                                                   |
+| params.urlArg                  | Optional | Object  | Optional url parameter for params.url                                                                                                                                                                                       |
diff --git a/modules/hadronRtdProvider.js b/modules/hadronRtdProvider.js
new file mode 100644
index 00000000000..0bd4e6f8344
--- /dev/null
+++ b/modules/hadronRtdProvider.js
@@ -0,0 +1,257 @@
+/**
+ * This module adds the Audigent Hadron provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch real-time data from Audigent
+ * @module modules/hadronRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import {isFn, isStr, isArray, deepEqual, isPlainObject, logError, logInfo} from '../src/utils.js';
+import {loadExternalScript} from '../src/adloader.js';
+
+const LOG_PREFIX = 'User ID - HadronRtdProvider submodule: ';
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'hadron';
+const AU_GVLID = 561;
+const HADRON_ID_DEFAULT_URL = 'https://id.hadron.ad.gt/api/v1/hadronid?_it=prebid';
+const HADRON_SEGMENT_URL = 'https://seg.hadron.ad.gt/api/v1/rtd';
+export const HALOID_LOCAL_NAME = 'auHadronId';
+export const RTD_LOCAL_NAME = 'auHadronRtd';
+export const storage = getStorageManager({gvlid: AU_GVLID, moduleName: SUBMODULE_NAME});
+
+/**
+ * @param {string} url
+ * @param {string} params
+ * @returns {string}
+ */
+const urlAddParams = (url, params) => {
+  return url + (url.indexOf('?') > -1 ? '&' : '?') + params
+};
+
+/**
+ * Deep set an object unless value present.
+ * @param {Object} obj
+ * @param {String} path
+ * @param {Object} val
+ */
+function set(obj, path, val) {
+  const keys = path.split('.');
+  const lastKey = keys.pop();
+  const lastObj = keys.reduce((obj, key) => obj[key] = obj[key] || {}, obj);
+  lastObj[lastKey] = lastObj[lastKey] || val;
+}
+
+/**
+ * Deep object merging with array deduplication.
+ * @param {Object} target
+ * @param {Object} sources
+ */
+function mergeDeep(target, ...sources) {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isPlainObject(target) && isPlainObject(source)) {
+    for (const key in source) {
+      if (isPlainObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        mergeDeep(target[key], source[key]);
+      } else if (isArray(source[key])) {
+        if (!target[key]) {
+          Object.assign(target, { [key]: source[key] });
+        } else if (isArray(target[key])) {
+          source[key].forEach(obj => {
+            let e = 1;
+            for (let i = 0; i < target[key].length; i++) {
+              if (deepEqual(target[key][i], obj)) {
+                e = 0;
+                break;
+              }
+            }
+            if (e) {
+              target[key].push(obj);
+            }
+          });
+        }
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return mergeDeep(target, ...sources);
+}
+
+/**
+ * Lazy merge objects.
+ * @param {Object} target
+ * @param {Object} source
+ */
+function mergeLazy(target, source) {
+  if (!isPlainObject(target)) {
+    target = {};
+  }
+
+  if (!isPlainObject(source)) {
+    source = {};
+  }
+
+  return mergeDeep(target, source);
+}
+
+/**
+ * Param or default.
+ * @param {String|Function} param
+ * @param {String} defaultVal
+ * @param {Object} arg
+ */
+function paramOrDefault(param, defaultVal, arg) {
+  if (isFn(param)) {
+    return param(arg);
+  } else if (isStr(param)) {
+    return param;
+  }
+  return defaultVal;
+}
+
+/**
+ * Add real-time data & merge segments.
+ * @param {Object} bidConfig
+ * @param {Object} rtd
+ * @param {Object} rtdConfig
+ */
+export function addRealTimeData(bidConfig, rtd, rtdConfig) {
+  if (rtdConfig.params && rtdConfig.params.handleRtd) {
+    rtdConfig.params.handleRtd(bidConfig, rtd, rtdConfig, config);
+  } else {
+    // TODO: this and haloRtdProvider are a copy-paste of each other
+    if (isPlainObject(rtd.ortb2)) {
+      mergeLazy(bidConfig.ortb2Fragments?.global, rtd.ortb2);
+    }
+
+    if (isPlainObject(rtd.ortb2b)) {
+      mergeLazy(bidConfig.ortb2Fragments?.bidder, Object.fromEntries(Object.entries(rtd.ortb2b).map(([_, cfg]) => [_, cfg.ortb2])));
+    }
+  }
+}
+
+/**
+ * Real-time data retrieval from Audigent
+ * @param {Object} bidConfig
+ * @param {function} onDone
+ * @param {Object} rtdConfig
+ * @param {Object} userConsent
+ */
+export function getRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
+  if (rtdConfig && isPlainObject(rtdConfig.params) && rtdConfig.params.segmentCache) {
+    let jsonData = storage.getDataFromLocalStorage(RTD_LOCAL_NAME);
+
+    if (jsonData) {
+      let data = JSON.parse(jsonData);
+
+      if (data.rtd) {
+        addRealTimeData(bidConfig, data.rtd, rtdConfig);
+        onDone();
+        return;
+      }
+    }
+  }
+
+  const userIds = typeof getGlobal().getUserIds === 'function' ? (getGlobal()).getUserIds() : {};
+
+  let hadronId = storage.getDataFromLocalStorage(HALOID_LOCAL_NAME);
+  if (isStr(hadronId)) {
+    if (typeof getGlobal().refreshUserIds === 'function') {
+      (getGlobal()).refreshUserIds({submoduleNames: 'hadronId'});
+    }
+    userIds.hadronId = hadronId;
+    getRealTimeDataAsync(bidConfig, onDone, rtdConfig, userConsent, userIds);
+  } else {
+    window.pubHadronCb = (hadronId) => {
+      userIds.hadronId = hadronId;
+      getRealTimeDataAsync(bidConfig, onDone, rtdConfig, userConsent, userIds);
+    }
+    const partnerId = rtdConfig.params.partnerId | 0;
+    const hadronIdUrl = rtdConfig.params && rtdConfig.params.hadronIdUrl;
+    const scriptUrl = urlAddParams(
+      paramOrDefault(hadronIdUrl, HADRON_ID_DEFAULT_URL, userIds),
+      `partner_id=${partnerId}&_it=prebid`
+    );
+    loadExternalScript(scriptUrl, 'hadron', () => {
+      logInfo(LOG_PREFIX, 'hadronIdTag loaded', scriptUrl);
+    })
+  }
+}
+
+/**
+ * Async rtd retrieval from Audigent
+ * @param {Object} bidConfig
+ * @param {function} onDone
+ * @param {Object} rtdConfig
+ * @param {Object} userConsent
+ * @param {Object} userIds
+ */
+export function getRealTimeDataAsync(bidConfig, onDone, rtdConfig, userConsent, userIds) {
+  let reqParams = {};
+
+  if (isPlainObject(rtdConfig)) {
+    set(rtdConfig, 'params.requestParams.ortb2', bidConfig.ortb2Fragments.global);
+    reqParams = rtdConfig.params.requestParams;
+  }
+
+  if (isPlainObject(window.pubHadronPm)) {
+    reqParams.pubHadronPm = window.pubHadronPm;
+  }
+
+  ajax(HADRON_SEGMENT_URL, {
+    success: function (response, req) {
+      if (req.status === 200) {
+        try {
+          const data = JSON.parse(response);
+          if (data && data.rtd) {
+            addRealTimeData(bidConfig, data.rtd, rtdConfig);
+            onDone();
+            storage.setDataInLocalStorage(RTD_LOCAL_NAME, JSON.stringify(data));
+          } else {
+            onDone();
+          }
+        } catch (err) {
+          logError('unable to parse audigent segment data');
+          onDone();
+        }
+      } else if (req.status === 204) {
+        // unrecognized partner config
+        onDone();
+      }
+    },
+    error: function () {
+      onDone();
+      logError('unable to get audigent segment data');
+    }
+  },
+  JSON.stringify({'userIds': userIds, 'config': reqParams}),
+  {contentType: 'application/json'}
+  );
+}
+
+/**
+ * Module init
+ * @param {Object} provider
+ * @param {Object} userConsent
+ * @return {boolean}
+ */
+function init(provider, userConsent) {
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const hadronSubmodule = {
+  name: SUBMODULE_NAME,
+  getBidRequestData: getRealTimeData,
+  init: init
+};
+
+submodule(MODULE_NAME, hadronSubmodule);
diff --git a/modules/hadronRtdProvider.md b/modules/hadronRtdProvider.md
new file mode 100644
index 00000000000..5064e75dde0
--- /dev/null
+++ b/modules/hadronRtdProvider.md
@@ -0,0 +1,130 @@
+## Audigent Hadron Real-time Data Submodule
+
+Audigent is a next-generation, 1st party data management platform and the
+world’s first "data agency", powering the programmatic landscape and DTC
+eCommerce with actionable 1st party audience and contextual data from the
+world’s most influential retailers, lifestyle publishers, content creators,
+athletes and artists.
+
+The Hadron real-time data module in Prebid has been built so that publishers
+can maximize the power of their first-party audiences and contextual data.
+This module provides both an integrated cookieless Hadron identity with real-time
+contextual and audience segmentation solution that seamlessly and easily
+integrates into your existing Prebid deployment.
+
+Users, devices, content, cohorts and other features are identified and utilized
+to augment every bid request with targeted, 1st party data-derived segments
+before being submitted to supply-side platforms. Enriching the bid request with
+robust 1st party audience and contextual data, Audigent's Hadron RTD module
+optimizes targeting, increases the number of bids, increases bid value,
+and drives additional incremental revenue for publishers.
+
+### Publisher Usage
+
+Compile the Hadron RTD module into your Prebid build:
+
+`gulp build --modules=userId,unifiedIdSystem,rtdModule,hadronRtdProvider,appnexusBidAdapter`
+
+Add the Hadron RTD provider to your Prebid config. In this example we will configure
+publisher 1234 to retrieve segments from Audigent. See the
+"Parameter Descriptions" below for more detailed information of the
+configuration parameters. Please work with your Audigent Prebid support team
+(prebid@audigent.com) on which version of Prebid.js supports different bidder
+and segment configurations.
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 5000,
+        dataProviders: [
+            {
+                name: "hadron",
+                waitForIt: true,
+                params: {
+                    segmentCache: false,
+                    requestParams: {
+                        publisherId: 1234  // deprecated, use partnerId instead
+                    },
+                    partnerId: 1234
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Parameter Descriptions for the Hadron Configuration Section
+
+| Name                             | Type     | Description                                                                                                                                                                                                                          | Notes                        |
+|:---------------------------------|:---------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------------------------|
+| name                             | String   | Real time data module name                                                                                                                                                                                                           | Always 'hadron'              |
+| waitForIt                        | Boolean  | Required to ensure that the auction is delayed until prefetch is complete                                                                                                                                                            | Optional. Defaults to false  |
+| params                           | Object   |                                                                                                                                                                                                                                      |                              |
+| params.partnerId                 | Number   | This is the Audigent Partner ID obtained from Audigent.                                                                                                                                                                              | `1234`                       |
+| params.handleRtd                 | Function | A passable RTD handler that allows custom adunit and ortb2 logic to be configured. The function signature is (bidConfig, rtd, rtdConfig, pbConfig) => {}.                                                                            | Optional                     |
+| params.segmentCache              | Boolean  | This parameter tells the Hadron RTD module to attempt reading segments from a local storage cache instead of always requesting them from the Audigent server.                                                                        | Optional. Defaults to false. |
+| params.requestParams             | Object   | Publisher partner specific configuration options, such as optional publisher id and other segment query related metadata to be submitted to Audigent's backend with each request.  Contact prebid@audigent.com for more information. | Optional                     |
+| params.requestParams.publisherId | Object   | (deprecated) Publisher id and other segment query related metadata to be submitted to Audigent's backend with each request.  Contact prebid@audigent.com for more information.                                                       | Optional                     |
+| params.hadronIdUrl               | String   | Parameter to specify alternate hadronid endpoint url.                                                                                                                                                                                | Optional                     |
+
+### Publisher Customized RTD Handling
+As indicated above, it is possible to provide your own bid augmentation
+functions rather than simply merging supplied data.  This is useful if you
+want to perform custom bid augmentation and logic with Hadron real-time data
+prior to the bid request being sent. Simply add your custom logic to the
+optional handleRtd parameter and provide your custom RTD handling logic there.
+
+Please see the following example, which provides a function to modify bids for
+a bid adapter called adBuzz and perform custom logic on bidder parameters.
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: auctionDelay,
+        dataProviders: [
+            {
+                name: "hadron",
+                waitForIt: true,
+                params: {
+                    handleRtd: function(bidConfig, rtd, rtdConfig, pbConfig) {
+                        var adUnits = bidConfig.adUnits;
+                        for (var i = 0; i < adUnits.length; i++) {
+                            var adUnit = adUnits[i];
+                            for (var j = 0; j < adUnit.bids.length; j++) {
+                                var bid = adUnit.bids[j];
+                                if (bid.bidder == 'adBuzz' && rtd['adBuzz'][0].value != 'excludeSeg') {
+                                    bid.params.adBuzzCustomSegments.push(rtd['adBuzz'][0].id);
+                                }
+                            }
+                        }
+                    },
+                    segmentCache: false,
+                    requestParams: {
+                        publisherId: 1234  // deprecated, use partnerId instead
+                    },
+                    partnerId: 1234
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+The handleRtd function can also be used to configure custom ortb2 data
+processing. Please see the examples available in the hadronRtdProvider_spec.js
+tests and work with your Audigent Prebid integration team (prebid@audigent.com)
+on how to best configure your own Hadron RTD & Open RTB data handlers.
+
+### Testing
+
+To view an example of available segments returned by Audigent's backends:
+
+`gulp serve --modules=userId,unifiedIdSystem,rtdModule,hadronRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/hadronRtdProvider_example.html`
diff --git a/modules/holidBidAdapter.js b/modules/holidBidAdapter.js
new file mode 100644
index 00000000000..be5a7a044c3
--- /dev/null
+++ b/modules/holidBidAdapter.js
@@ -0,0 +1,170 @@
+import {
+  deepAccess,
+  getBidIdParameter,
+  isStr,
+  logMessage,
+  triggerPixel,
+} from '../src/utils.js'
+import * as events from '../src/events.js'
+import CONSTANTS from '../src/constants.json'
+import { BANNER } from '../src/mediaTypes.js'
+
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+
+const BIDDER_CODE = 'holid'
+const GVLID = 1177
+const ENDPOINT = 'https://helloworld.holid.io/openrtb2/auction'
+const COOKIE_SYNC_ENDPOINT = 'https://null.holid.io/sync.html'
+const TIME_TO_LIVE = 300
+let wurlMap = {}
+
+events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler)
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    return !!bid.params.adUnitID
+  },
+
+  buildRequests: function (validBidRequests, _bidderRequest) {
+    return validBidRequests.map((bid) => {
+      const requestData = {
+        ...bid.ortb2,
+        id: bid.auctionId,
+        imp: [getImp(bid)],
+      }
+
+      return {
+        method: 'POST',
+        url: ENDPOINT,
+        data: JSON.stringify(requestData),
+        bidId: bid.bidId,
+      }
+    })
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = []
+
+    if (!serverResponse.body.seatbid) {
+      return []
+    }
+
+    serverResponse.body.seatbid.map((response) => {
+      response.bid.map((bid) => {
+        const requestId = bidRequest.bidId
+        const auctionId = bidRequest.auctionId
+        const wurl = deepAccess(bid, 'ext.prebid.events.win')
+        const bidResponse = {
+          requestId,
+          cpm: bid.price,
+          width: bid.w,
+          height: bid.h,
+          ad: bid.adm,
+          creativeId: bid.crid,
+          currency: serverResponse.body.cur,
+          netRevenue: true,
+          ttl: TIME_TO_LIVE,
+        }
+
+        addWurl({ auctionId, requestId, wurl })
+
+        bidResponses.push(bidResponse)
+      })
+    })
+
+    return bidResponses
+  },
+
+  getUserSyncs(optionsType, serverResponse, gdprConsent, uspConsent) {
+    if (!serverResponse || serverResponse.length === 0) {
+      return []
+    }
+
+    const syncs = []
+
+    if (optionsType.iframeEnabled) {
+      const queryParams = []
+
+      queryParams.push('bidders=' + getBidders(serverResponse))
+      queryParams.push('gdpr=' + +gdprConsent.gdprApplies)
+      queryParams.push('gdpr_consent=' + gdprConsent.consentString)
+      queryParams.push('usp_consent=' + (uspConsent || ''))
+
+      let strQueryParams = queryParams.join('&')
+
+      if (strQueryParams.length > 0) {
+        strQueryParams = '?' + strQueryParams
+      }
+
+      syncs.push({
+        type: 'iframe',
+        url: COOKIE_SYNC_ENDPOINT + strQueryParams + '&type=iframe',
+      })
+
+      return syncs
+    }
+  },
+}
+
+function getImp(bid) {
+  const imp = {
+    ext: {
+      prebid: {
+        storedrequest: {
+          id: getBidIdParameter('adUnitID', bid.params),
+        },
+      },
+    },
+  }
+  const sizes =
+    bid.sizes && !Array.isArray(bid.sizes[0]) ? [bid.sizes] : bid.sizes
+
+  if (deepAccess(bid, 'mediaTypes.banner')) {
+    imp.banner = {
+      format: sizes.map((size) => {
+        return { w: size[0], h: size[1] }
+      }),
+    }
+  }
+
+  return imp
+}
+
+function getBidders(serverResponse) {
+  const bidders = serverResponse
+    .map((res) => Object.keys(res.body.ext.responsetimemillis))
+    .flat(1)
+
+  return encodeURIComponent(JSON.stringify([...new Set(bidders)]))
+}
+
+function addWurl(auctionId, adId, wurl) {
+  if ([auctionId, adId].every(isStr)) {
+    wurlMap[`${auctionId}${adId}`] = wurl
+  }
+}
+
+function removeWurl(auctionId, adId) {
+  delete wurlMap[`${auctionId}${adId}`]
+}
+
+function getWurl(auctionId, adId) {
+  if ([auctionId, adId].every(isStr)) {
+    return wurlMap[`${auctionId}${adId}`]
+  }
+}
+
+function bidWonHandler(bid) {
+  const wurl = getWurl(bid.auctionId, bid.adId)
+  if (wurl) {
+    logMessage(`Invoking image pixel for wurl on BID_WIN: "${wurl}"`)
+    triggerPixel(wurl)
+    removeWurl(bid.auctionId, bid.adId)
+  }
+}
+
+registerBidder(spec)
diff --git a/modules/holidBidAdapter.md b/modules/holidBidAdapter.md
new file mode 100644
index 00000000000..1d83918c00a
--- /dev/null
+++ b/modules/holidBidAdapter.md
@@ -0,0 +1,36 @@
+# Overview
+
+```
+Module Name: Holid Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: richard@holid.se
+```
+
+# Description
+
+Currently module supports only banner mediaType.
+
+# Test Parameters
+
+## Sample Banner Ad Unit
+
+```js
+var adUnits = [
+  {
+    code: 'bannerAdUnit',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      },
+    },
+    bids: [
+      {
+        bidder: 'holid',
+        params: {
+          adUnitID: '12345',
+        },
+      },
+    ],
+  },
+]
+```
diff --git a/modules/hpmdnetworkBidAdapter.js b/modules/hpmdnetworkBidAdapter.js
deleted file mode 100644
index 5cc28ab6362..00000000000
--- a/modules/hpmdnetworkBidAdapter.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'hpmdnetwork';
-const BIDDER_CODE_ALIAS = 'hpmd';
-const HPMDNETWORK_HOST = 'https://banner.hpmdnetwork.ru/bidder/request';
-const DEFAULT_TTL = 300;
-const DEFAULT_CURRENCY = 'RUB';
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: [ BIDDER_CODE_ALIAS ],
-  supportedMediaTypes: [ BANNER ],
-  isBidRequestValid: isBidRequestValid,
-  buildRequests: buildRequests,
-  interpretResponse: interpretResponse,
-};
-
-function isBidRequestValid(bid) {
-  const { placementId } = bid.params;
-  return !!placementId;
-}
-
-function buildRequests(validBidRequests, bidderRequest) {
-  const payload = {};
-  payload.places = [];
-
-  validBidRequests.forEach((bidRequest) => {
-    const place = {
-      id: bidRequest.bidId,
-      placementId: bidRequest.params.placementId + '',
-    };
-    payload.places.push(place);
-  });
-
-  payload.url = bidderRequest.refererInfo.referer;
-  payload.settings = { currency: DEFAULT_CURRENCY };
-
-  return {
-    method: 'POST',
-    url: HPMDNETWORK_HOST,
-    data: payload,
-  };
-}
-
-function interpretResponse(serverResponse) {
-  const { body } = serverResponse;
-  const bidResponses = [];
-
-  if (body.bids) {
-    body.bids.forEach((bid) => {
-      const size = getCreativeSize(bid);
-      const bidResponse = {
-        requestId: bid.id,
-        cpm: bid.cpm,
-        ad: wrapDisplayUrl(bid.displayUrl),
-        width: size.width,
-        height: size.height,
-        creativeId: bid.creativeId || generateRandomInt(),
-        currency: bid.currency || DEFAULT_CURRENCY,
-        netRevenue: true,
-        ttl: bid.ttl || DEFAULT_TTL,
-      };
-
-      bidResponses.push(bidResponse);
-    });
-  }
-
-  return bidResponses;
-}
-
-function wrapDisplayUrl(displayUrl) {
-  return `<html><head></head><body style="margin:0;width:0;height:0;"><script async src="${displayUrl}"></script></body></html>`;
-}
-
-function getCreativeSize(creativeSize) {
-  const size = {
-    width: 1,
-    height: 1,
-  };
-
-  if (!!creativeSize.width && creativeSize.width !== -1) {
-    size.width = creativeSize.width;
-  }
-  if (!!creativeSize.height && creativeSize.height !== -1) {
-    size.height = creativeSize.height;
-  }
-
-  return size;
-}
-
-function generateRandomInt() {
-  return Math.random().toString(16).substring(2);
-}
-
-registerBidder(spec);
diff --git a/modules/hpmdnetworkBidAdapter.md b/modules/hpmdnetworkBidAdapter.md
deleted file mode 100644
index b7ac51a9311..00000000000
--- a/modules/hpmdnetworkBidAdapter.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Overview
-
-Module Name: HPMD Network Bidder Adapter
-
-Module Type: Bidder Adapter
-
-Maintainer: a.fominov@hpmdnetwork.ru
-
-# Description
-
-You can use this adapter to get a bid from HPMD Network.
-
-About us : https://www.hpmdnetwork.ru/
-
-
-# Test Parameters
-```javascript
-    var adUnits = [
-        {
-            code: 'test-div',
-            bids: [
-                {
-                    bidder: "hpmdnetwork",
-                    params: {
-                        placementId: "123"
-                    }
-                }
-            ]
-        }
-    ];
-```
-
diff --git a/modules/huddledmassesBidAdapter.md b/modules/huddledmassesBidAdapter.md
deleted file mode 100644
index c743f4a2fd8..00000000000
--- a/modules/huddledmassesBidAdapter.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Overview
-
-```
-Module Name: HuddledMasses Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: supply@huddledmasses.com
-```
-
-# Description
-
-Module that connects to HuddledMasses' demand sources
-
-# Test Parameters
-```
-    var adUnits = [{
-                code: 'placementid_0',
-                sizes: [[300, 250]],
-                bids: [{
-                        bidder: 'huddledmasses',
-                        params: {
-                            placement_id: 0
-                        }
-                    }]
-                }
-            ];
-```
diff --git a/modules/hybridBidAdapter.js b/modules/hybridBidAdapter.js
index 5671756e0b2..6cedb094444 100644
--- a/modules/hybridBidAdapter.js
+++ b/modules/hybridBidAdapter.js
@@ -1,32 +1,35 @@
-import * as utils from '../src/utils.js'
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { auctionManager } from '../src/auctionManager.js'
-import { BANNER, VIDEO } from '../src/mediaTypes.js'
+import {_map, deepAccess, isArray, logWarn} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
-import find from 'core-js-pure/features/array/find.js';
+import {find} from '../src/polyfill.js';
 
 const BIDDER_CODE = 'hybrid';
 const DSP_ENDPOINT = 'https://hbe198.hybrid.ai/prebidhb';
 const TRAFFIC_TYPE_WEB = 1;
 const PLACEMENT_TYPE_BANNER = 1;
 const PLACEMENT_TYPE_VIDEO = 2;
+const PLACEMENT_TYPE_IN_IMAGE = 3;
 const TTL = 60;
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
 
 const placementTypes = {
   'banner': PLACEMENT_TYPE_BANNER,
-  'video': PLACEMENT_TYPE_VIDEO
+  'video': PLACEMENT_TYPE_VIDEO,
+  'inImage': PLACEMENT_TYPE_IN_IMAGE
 };
 
 function buildBidRequests(validBidRequests) {
-  return utils._map(validBidRequests, function(validBidRequest) {
+  return _map(validBidRequests, function(validBidRequest) {
     const params = validBidRequest.params;
     const bidRequest = {
       bidId: validBidRequest.bidId,
       transactionId: validBidRequest.transactionId,
       sizes: validBidRequest.sizes,
       placement: placementTypes[params.placement],
-      placeId: params.placeId
+      placeId: params.placeId,
+      imageUrl: params.imageUrl || ''
     };
 
     return bidRequest;
@@ -60,7 +63,7 @@ const createRenderer = (bid) => {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
+    logWarn('Prebid Error calling setRender on renderer', err);
   }
 
   return renderer;
@@ -75,7 +78,10 @@ function buildBid(bidData) {
     creativeId: bidData.bidId,
     currency: bidData.currency,
     netRevenue: true,
-    ttl: TTL
+    ttl: TTL,
+    meta: {
+      advertiserDomains: bidData.advertiserDomains || [],
+    }
   };
 
   if (bidData.placement === PLACEMENT_TYPE_VIDEO) {
@@ -94,6 +100,33 @@ function buildBid(bidData) {
         bid.renderer = createRenderer(bid);
       }
     }
+  } else if (bidData.placement === PLACEMENT_TYPE_IN_IMAGE) {
+    bid.mediaType = BANNER;
+    bid.inImageContent = {
+      content: {
+        content: bidData.content,
+        actionUrls: {}
+      }
+    };
+    let actionUrls = bid.inImageContent.content.actionUrls;
+    actionUrls.loadUrls = bidData.inImage.loadtrackers || [];
+    actionUrls.impressionUrls = bidData.inImage.imptrackers || [];
+    actionUrls.scrollActUrls = bidData.inImage.startvisibilitytrackers || [];
+    actionUrls.viewUrls = bidData.inImage.viewtrackers || [];
+    actionUrls.stopAnimationUrls = bidData.inImage.stopanimationtrackers || [];
+    actionUrls.closeBannerUrls = bidData.inImage.closebannertrackers || [];
+
+    if (bidData.inImage.but) {
+      let inImageOptions = bid.inImageContent.content.inImageOptions = {};
+      inImageOptions.hasButton = true;
+      inImageOptions.buttonLogoUrl = bidData.inImage.but_logo;
+      inImageOptions.buttonProductUrl = bidData.inImage.but_prod;
+      inImageOptions.buttonHead = bidData.inImage.but_head;
+      inImageOptions.buttonHeadColor = bidData.inImage.but_head_colour;
+      inImageOptions.dynparams = bidData.inImage.dynparams || {};
+    }
+
+    bid.ad = wrapAd(bid, bidData);
   } else {
     bid.ad = bidData.content;
     bid.mediaType = BANNER;
@@ -110,12 +143,36 @@ function hasVideoMandatoryParams(mediaTypes) {
   const isHasVideoContext = !!mediaTypes.video && (mediaTypes.video.context === 'instream' || mediaTypes.video.context === 'outstream');
 
   const isPlayerSize =
-    !!utils.deepAccess(mediaTypes, 'video.playerSize') &&
-    utils.isArray(utils.deepAccess(mediaTypes, 'video.playerSize'));
+    !!deepAccess(mediaTypes, 'video.playerSize') &&
+    isArray(deepAccess(mediaTypes, 'video.playerSize'));
 
   return isHasVideoContext && isPlayerSize;
 }
 
+function wrapAd(bid, bidData) {
+  return `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title></title>
+        <script src="https://st.hybrid.ai/prebidrenderer.js"></script>
+        <style>html, body {width: 100%; height: 100%; margin: 0;}</style>
+    </head>
+    <body>
+        <div data-hyb-ssp-in-image-overlay="${bidData.placeId}" style="width: 100%; height: 100%;"></div>
+        <script>
+            if (parent.window.frames[window.name]) {
+                var parentDocument = window.parent.document.getElementById(parent.window.frames[window.name].name);
+                parentDocument.style.height = "100%";
+                parentDocument.style.width = "100%";
+            }
+            var _content = "${encodeURIComponent(JSON.stringify(bid.inImageContent))}";
+            window._hyb_prebid_ssp.registerInImage(JSON.parse(decodeURIComponent(_content)));
+        </script>
+    </body>
+  </html>`;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
@@ -133,6 +190,7 @@ export const spec = {
       !!bid.params.placement &&
       (
         (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'banner') ||
+        (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'inImage' && !!bid.params.imageUrl) ||
         (getMediaTypeFromBid(bid) === VIDEO && bid.params.placement === 'video' && hasVideoMandatoryParams(bid.mediaTypes))
       )
     );
@@ -146,7 +204,8 @@ export const spec = {
    */
   buildRequests(validBidRequests, bidderRequest) {
     const payload = {
-      url: bidderRequest.refererInfo.referer,
+      // TODO: is 'page' the right value here?
+      url: bidderRequest.refererInfo.page,
       cmp: !!bidderRequest.gdprConsent,
       trafficType: TRAFFIC_TYPE_WEB,
       bidRequests: buildBidRequests(validBidRequests)
@@ -179,8 +238,8 @@ export const spec = {
     let bidRequests = JSON.parse(bidRequest.data).bidRequests;
     const serverBody = serverResponse.body;
 
-    if (serverBody && serverBody.bids && utils.isArray(serverBody.bids)) {
-      return utils._map(serverBody.bids, function(bid) {
+    if (serverBody && serverBody.bids && isArray(serverBody.bids)) {
+      return _map(serverBody.bids, function(bid) {
         let rawBid = find(bidRequests, function (item) {
           return item.bidId === bid.bidId;
         });
diff --git a/modules/hybridBidAdapter.md b/modules/hybridBidAdapter.md
index 245f010970a..098d8642415 100644
--- a/modules/hybridBidAdapter.md
+++ b/modules/hybridBidAdapter.md
@@ -52,3 +52,187 @@ var adUnits = [{
 }];
 ```
 
+# Sample In-Image Ad Unit
+
+```js
+var adUnits = [{
+    code: 'test-div',
+    mediaTypes: {
+        banner: {
+            sizes: [0, 0]
+        }
+    },
+    bids: [{
+        bidder: "hybrid",
+        params: {
+            placement: "inImage",
+            placeId: "102030405060708090000020",
+            imageUrl: "https://hybrid.ai/images/image.jpg"
+        }
+    }]
+}];
+```
+
+# Example page with In-Image
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js Banner Example</title>
+	<script async src="prebid.js"></script>
+	<style>
+        .banner-block {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            z-index: 1;
+            border: none;
+            overflow: hidden;
+        }
+    </style>
+    <script>
+        var adUnits = [{
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [0, 0]
+                }
+            },
+            bids: [{
+                bidder: "hybrid",
+                params: {
+                    placement: "inImage",
+                    placeId: "102030405060708090000020",
+                    imageUrl: "https://hybrid.ai/images/image.jpg"
+                }
+            }]
+        }];
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+
+        pbjs.que.push(function() {
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({
+                bidsBackHandler: function (e) {
+                    if (pbjs.adserverRequestSent) return;
+                    pbjs.adserverRequestSent = true;
+
+                    var params = pbjs.getAdserverTargetingForAdUnitCode("test-div");
+                    var iframe = document.getElementById('test-div');
+
+                    if (params && params['hb_adid']) {
+                        iframe.parentElement.style.position = "relative";
+                        iframe.style.display = "block";
+                        pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+                    }
+                }
+            });
+        });
+    </script>
+</head>
+<body>
+	<h2>Prebid.js InImage Banner Test</h2>
+	<div style="width: 600px;">
+        <img src="https://hybrid.ai/images/image.jpg" />
+        <iframe id='test-div' class="banner-block" style="display: none;"></iframe>
+    </div>
+</body>
+</html>
+```
+
+# Example page with In-Image and GPT
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js Banner Example</title>
+	<script async src="prebid.js"></script>
+	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+	<style>
+		.banner-block {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			left: 0;
+			z-index: 1;
+			border: none;
+			overflow: hidden;
+		}
+		.banner-block div {
+			width: 100%;
+			height: 100%;
+		}
+	</style>
+	<script>
+		var pbjs = pbjs || {};
+		pbjs.que = pbjs.que || [];
+
+		var adUnits = [{
+			code: 'div-gpt-ad-1574864639578-0',
+			mediaTypes: {
+				banner: {
+					sizes: [1, 1]
+				}
+			},
+			bids: [{
+				bidder: "hybrid",
+				params: {
+					placement: "inImage",
+					placeId: "102030405060708090000020",
+					imageUrl: "https://hybrid.ai/images/image.jpg"
+				}
+			}]
+		}];
+
+		var googletag = googletag || {};
+		googletag.cmd = googletag.cmd || [];
+
+		googletag.cmd.push(() => {
+			googletag.pubads().disableInitialLoad();
+		});
+
+		pbjs.que.push(() => {
+			pbjs.addAdUnits(adUnits);
+			pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+		});
+
+		function sendAdServerRequest() {
+			googletag.cmd.push(() => {
+				pbjs.que.push(() => {
+					pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
+					googletag.pubads().refresh();
+				});
+			});
+		}
+
+		googletag.cmd.push(() => {
+			googletag
+				.defineSlot('/21877108735/rtb-pbjs', [1, 1], 'div-gpt-ad-1574864639578-0')
+				.addService(googletag.pubads());
+
+			googletag.pubads().enableSingleRequest();
+			googletag.enableServices();
+		});
+	</script>
+</head>
+<body>
+	<h2>Prebid.js Banner Ad Unit Test</h2>
+	<div style="width: 600px; position: relative">
+		<img src="https://hybrid.ai/images/image.jpg" />
+		<div id='div-gpt-ad-1574864639578-0' class="banner-block">
+			<script>
+				googletag.cmd.push(() => { googletag.display('div-gpt-ad-1574864639578-0'); });
+			</script>
+		</div>
+	</div>
+</body>
+</html>
+```
diff --git a/modules/iasBidAdapter.js b/modules/iasBidAdapter.js
deleted file mode 100644
index 733c123e769..00000000000
--- a/modules/iasBidAdapter.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'ias';
-
-const otherBidIds = [];
-
-function isBidRequestValid(bid) {
-  const { pubId, adUnitPath } = bid.params;
-  return !!(pubId && adUnitPath);
-}
-
-/**
- * Converts GPT-style size array into a string
- * @param  {Array} sizes:  list of GPT-style sizes, e.g. [[300, 250], [300, 300]]
- * @return {String} a string containing sizes, e.g. '[300.250,300.300]'
- */
-function stringifySlotSizes(sizes) {
-  let result = '';
-  if (utils.isArray(sizes)) {
-    result = sizes.reduce((acc, size) => {
-      acc.push(size.join('.'));
-      return acc;
-    }, []);
-    result = '[' + result.join(',') + ']';
-  }
-  return result;
-}
-
-function stringifySlot(bidRequest) {
-  const id = bidRequest.adUnitCode;
-  const ss = stringifySlotSizes(bidRequest.sizes);
-  const p = bidRequest.params.adUnitPath;
-  const slot = { id, ss, p };
-  const keyValues = utils.getKeys(slot).map(function(key) {
-    return [key, slot[key]].join(':');
-  });
-  return '{' + keyValues.join(',') + '}';
-}
-
-function stringifyWindowSize() {
-  return [ window.innerWidth || -1, window.innerHeight || -1 ].join('.');
-}
-
-function stringifyScreenSize() {
-  return [ (window.screen && window.screen.width) || -1, (window.screen && window.screen.height) || -1 ].join('.');
-}
-
-function buildRequests(bidRequests) {
-  const IAS_HOST = 'https://pixel.adsafeprotected.com/services/pub';
-  const anId = bidRequests[0].params.pubId;
-
-  let queries = [];
-  queries.push(['anId', anId]);
-  queries = queries.concat(bidRequests.reduce(function(acc, request) {
-    acc.push(['slot', stringifySlot(request)]);
-    return acc;
-  }, []));
-
-  queries.push(['wr', stringifyWindowSize()]);
-  queries.push(['sr', stringifyScreenSize()]);
-  queries.push(['url', encodeURIComponent(window.location.href)]);
-
-  const queryString = encodeURI(queries.map(qs => qs.join('=')).join('&'));
-
-  bidRequests.forEach(function (request) {
-    if (bidRequests[0].bidId != request.bidId) {
-      otherBidIds.push(request.bidId);
-    }
-  });
-
-  return {
-    method: 'GET',
-    url: IAS_HOST,
-    data: queryString,
-    bidRequest: bidRequests[0]
-  };
-}
-
-function getPageLevelKeywords(response) {
-  let result = {};
-  shallowMerge(result, response.brandSafety);
-  result.fr = response.fr;
-  result.custom = response.custom;
-  return result;
-}
-
-function shallowMerge(dest, src) {
-  utils.getKeys(src).reduce((dest, srcKey) => {
-    dest[srcKey] = src[srcKey];
-    return dest;
-  }, dest);
-}
-
-function interpretResponse(serverResponse, request) {
-  const iasResponse = serverResponse.body;
-  const bidResponses = [];
-
-  // Keys in common bid response are not used;
-  // Necessary to get around with prebid's common bid response check
-  const commonBidResponse = {
-    requestId: request.bidRequest.bidId,
-    cpm: 0.01,
-    width: 100,
-    height: 200,
-    creativeId: 434,
-    dealId: 42,
-    currency: 'USD',
-    netRevenue: true,
-    ttl: 360
-  };
-
-  shallowMerge(commonBidResponse, getPageLevelKeywords(iasResponse));
-  commonBidResponse.slots = iasResponse.slots;
-  bidResponses.push(commonBidResponse);
-
-  otherBidIds.forEach(function (bidId) {
-    var otherResponse = Object.assign({}, commonBidResponse);
-    otherResponse.requestId = bidId;
-    bidResponses.push(otherResponse);
-  });
-
-  return bidResponses;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: [],
-  isBidRequestValid: isBidRequestValid,
-  buildRequests: buildRequests,
-  interpretResponse: interpretResponse
-};
-
-registerBidder(spec);
diff --git a/modules/iasBidAdapter.md b/modules/iasBidAdapter.md
deleted file mode 100644
index 3224fbf4a26..00000000000
--- a/modules/iasBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-```
-Module Name: Integral Ad Science(IAS) Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: kat@integralads.com
-```
-
-# Description
-
-This module is an integration with prebid.js with an IAS product, pet.js. It is not a bidder per se but works in a similar way: retrieve data that publishers might be interested in setting keyword targeting. 
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'ias-dfp-test-async',
-               sizes: [[300, 250]],  // a display size
-               bids: [
-                   {
-                       bidder: "ias",
-                       params: {
-                           pubId: '99',
-                           adUnitPath: '/57514611/news.com'
-                       }
-                   }
-               ]
-           }
-       ];
-```
diff --git a/modules/iasRtdProvider.js b/modules/iasRtdProvider.js
new file mode 100644
index 00000000000..994be7c0804
--- /dev/null
+++ b/modules/iasRtdProvider.js
@@ -0,0 +1,230 @@
+import { submodule } from '../src/hook.js';
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+
+/** @type {string} */
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'ias';
+const IAS_HOST = 'https://pixel.adsafeprotected.com/services/pub';
+export let iasTargeting = {};
+const BRAND_SAFETY_OBJECT_FIELD_NAME = 'brandSafety';
+const FRAUD_FIELD_NAME = 'fr';
+const SLOTS_OBJECT_FIELD_NAME = 'slots';
+const CUSTOM_FIELD_NAME = 'custom';
+const IAS_KW = 'ias-kw';
+const IAS_KEY_MAPPINGS = {
+  adt: 'adt',
+  alc: 'alc',
+  dlm: 'dlm',
+  hat: 'hat',
+  off: 'off',
+  vio: 'vio',
+  drg: 'drg',
+  'ias-kw': 'ias-kw',
+  fr: 'fr',
+  vw: 'vw',
+  grm: 'grm',
+  pub: 'pub',
+  vw05: 'vw05',
+  vw10: 'vw10',
+  vw15: 'vw15',
+  vw30: 'vw30',
+  vw_vv: 'vw_vv',
+  grm_vv: 'grm_vv',
+  pub_vv: 'pub_vv',
+  id: 'id'
+};
+
+/**
+ * Module init
+ * @param {Object} config
+ * @param {Object} userConsent
+ * @return {boolean}
+ */
+export function init(config, userConsent) {
+  const params = config.params;
+  if (!params || !params.pubId) {
+    utils.logError('missing pubId param for IAS provider');
+    return false;
+  }
+  if (params.hasOwnProperty('keyMappings')) {
+    const keyMappings = params.keyMappings;
+    for (let prop in keyMappings) {
+      if (IAS_KEY_MAPPINGS.hasOwnProperty(prop)) {
+        IAS_KEY_MAPPINGS[prop] = keyMappings[prop]
+      }
+    }
+  }
+  return true;
+}
+
+function stringifySlotSizes(sizes) {
+  let result = '';
+  if (utils.isArray(sizes)) {
+    result = sizes.reduce((acc, size) => {
+      acc.push(size.join('.'));
+      return acc;
+    }, []);
+    result = '[' + result.join(',') + ']';
+  }
+  return result;
+}
+
+function getAdUnitPath(adSlot, bidRequest, adUnitPath) {
+  let p = bidRequest.code;
+  if (!utils.isEmpty(adSlot)) {
+    p = adSlot.gptSlot;
+  } else {
+    if (!utils.isEmpty(adUnitPath) && utils.hasOwn(adUnitPath, bidRequest.code)) {
+      if (utils.isStr(adUnitPath[bidRequest.code]) && !utils.isEmpty(adUnitPath[bidRequest.code])) {
+        p = adUnitPath[bidRequest.code];
+      }
+    }
+  }
+  return p;
+}
+
+function stringifySlot(bidRequest, adUnitPath) {
+  const sizes = utils.getAdUnitSizes(bidRequest);
+  const id = bidRequest.code;
+  const ss = stringifySlotSizes(sizes);
+  const adSlot = utils.getGptSlotInfoForAdUnitCode(bidRequest.code);
+  const p = getAdUnitPath(adSlot, bidRequest, adUnitPath);
+  const slot = { id, ss, p };
+  const keyValues = utils.getKeys(slot).map(function (key) {
+    return [key, slot[key]].join(':');
+  });
+  return '{' + keyValues.join(',') + '}';
+}
+
+function stringifyWindowSize() {
+  return [window.innerWidth || -1, window.innerHeight || -1].join('.');
+}
+
+function stringifyScreenSize() {
+  return [(window.screen && window.screen.width) || -1, (window.screen && window.screen.height) || -1].join('.');
+}
+
+function renameKeyValues(source) {
+  let result = {};
+  for (let prop in IAS_KEY_MAPPINGS) {
+    if (source.hasOwnProperty(prop)) {
+      result[IAS_KEY_MAPPINGS[prop]] = source[prop];
+    }
+  }
+  return result;
+}
+
+function formatTargetingData(adUnit) {
+  let result = {};
+  if (iasTargeting[BRAND_SAFETY_OBJECT_FIELD_NAME]) {
+    utils.mergeDeep(result, iasTargeting[BRAND_SAFETY_OBJECT_FIELD_NAME]);
+  }
+  if (iasTargeting[FRAUD_FIELD_NAME]) {
+    result[FRAUD_FIELD_NAME] = iasTargeting[FRAUD_FIELD_NAME];
+  }
+  if (iasTargeting[CUSTOM_FIELD_NAME] && IAS_KW in iasTargeting[CUSTOM_FIELD_NAME]) {
+    result[IAS_KW] = iasTargeting[CUSTOM_FIELD_NAME][IAS_KW];
+  }
+  if (iasTargeting[SLOTS_OBJECT_FIELD_NAME] && adUnit in iasTargeting[SLOTS_OBJECT_FIELD_NAME]) {
+    utils.mergeDeep(result, iasTargeting[SLOTS_OBJECT_FIELD_NAME][adUnit]);
+  }
+  return renameKeyValues(result);
+}
+
+function constructQueryString(anId, adUnits, pageUrl, adUnitPath) {
+  let queries = [];
+  queries.push(['anId', anId]);
+
+  queries = queries.concat(adUnits.reduce(function (acc, request) {
+    acc.push(['slot', stringifySlot(request, adUnitPath)]);
+    return acc;
+  }, []));
+
+  queries.push(['wr', stringifyWindowSize()]);
+  queries.push(['sr', stringifyScreenSize()]);
+  queries.push(['url', encodeURIComponent(pageUrl)]);
+
+  return encodeURI(queries.map(qs => qs.join('=')).join('&'));
+}
+
+function parseResponse(result) {
+  let iasResponse = {};
+  try {
+    iasResponse = JSON.parse(result);
+  } catch (err) {
+    utils.logError('error', err);
+  }
+  iasTargeting = iasResponse;
+}
+
+function getTargetingData(adUnits, config, userConsent) {
+  const targeting = {};
+  try {
+    if (!utils.isEmpty(iasTargeting)) {
+      adUnits.forEach(function (adUnit) {
+        targeting[adUnit] = formatTargetingData(adUnit);
+      });
+    }
+  } catch (err) {
+    utils.logError('error', err);
+  }
+  utils.logInfo('IAS targeting', targeting);
+  return targeting;
+}
+
+function isValidHttpUrl(string) {
+  let url;
+  try {
+    url = new URL(string);
+  } catch (_) {
+    return false;
+  }
+  return url.protocol === 'http:' || url.protocol === 'https:';
+}
+
+export function getApiCallback() {
+  return {
+    success: function (response, req) {
+      if (req.status === 200) {
+        try {
+          parseResponse(response);
+        } catch (e) {
+          utils.logError('Unable to parse IAS response.', e);
+        }
+      }
+    },
+    error: function () {
+      utils.logError('failed to retrieve IAS data');
+    }
+  }
+}
+
+function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+  const { pubId } = config.params;
+  let { pageUrl } = config.params;
+  const { adUnitPath } = config.params;
+  if (!isValidHttpUrl(pageUrl)) {
+    pageUrl = document.location.href;
+  }
+  const queryString = constructQueryString(pubId, adUnits, pageUrl, adUnitPath);
+  ajax(
+    `${IAS_HOST}?${queryString}`,
+    getApiCallback(),
+    undefined,
+    { method: 'GET' }
+  );
+  callback()
+}
+
+/** @type {RtdSubmodule} */
+export const iasSubModule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  getTargetingData: getTargetingData,
+  getBidRequestData: getBidRequestData
+};
+
+submodule(MODULE_NAME, iasSubModule);
diff --git a/modules/iasRtdProvider.md b/modules/iasRtdProvider.md
new file mode 100644
index 00000000000..be47822eb58
--- /dev/null
+++ b/modules/iasRtdProvider.md
@@ -0,0 +1,9 @@
+# Overview
+
+Module Name: Integral Ad Science(IAS) Rtd Provider
+Module Type: Rtd Provider
+Maintainer: punereporting@integralads.com
+
+# Description
+
+RTD provider for Integral Ad Science(IAS) Contact raguilar@integralads.com for information.
diff --git a/modules/id5AnalyticsAdapter.js b/modules/id5AnalyticsAdapter.js
new file mode 100644
index 00000000000..d35cdf29fca
--- /dev/null
+++ b/modules/id5AnalyticsAdapter.js
@@ -0,0 +1,311 @@
+import buildAdapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+import { ajax } from '../src/ajax.js';
+import { logInfo, logError } from '../src/utils.js';
+import * as events from '../src/events.js';
+
+const {
+  EVENTS: {
+    AUCTION_END,
+    TCF2_ENFORCEMENT,
+    BID_WON,
+    BID_VIEWABLE,
+    AD_RENDER_FAILED
+  }
+} = CONSTANTS
+
+const GVLID = 131;
+
+const STANDARD_EVENTS_TO_TRACK = [
+  AUCTION_END,
+  TCF2_ENFORCEMENT,
+  BID_WON,
+];
+
+// These events cause the buffered events to be sent over
+const FLUSH_EVENTS = [
+  TCF2_ENFORCEMENT,
+  AUCTION_END,
+  BID_WON,
+  BID_VIEWABLE,
+  AD_RENDER_FAILED
+];
+
+const CONFIG_URL_PREFIX = 'https://api.id5-sync.com/analytics'
+const TZ = new Date().getTimezoneOffset();
+const PBJS_VERSION = $$PREBID_GLOBAL$$.version;
+const ID5_REDACTED = '__ID5_REDACTED__';
+const isArray = Array.isArray;
+
+let id5Analytics = Object.assign(buildAdapter({analyticsType: 'endpoint'}), {
+  // Keeps an array of events for each auction
+  eventBuffer: {},
+
+  eventsToTrack: STANDARD_EVENTS_TO_TRACK,
+
+  track: (event) => {
+    const _this = id5Analytics;
+
+    if (!event || !event.args) {
+      return;
+    }
+
+    try {
+      const auctionId = event.args.auctionId;
+      _this.eventBuffer[auctionId] = _this.eventBuffer[auctionId] || [];
+
+      // Collect events and send them in a batch when the auction ends
+      const que = _this.eventBuffer[auctionId];
+      que.push(_this.makeEvent(event.eventType, event.args));
+
+      if (FLUSH_EVENTS.indexOf(event.eventType) >= 0) {
+        // Auction ended. Send the batch of collected events
+        _this.sendEvents(que);
+
+        // From now on just send events to server side as they come
+        que.push = (pushedEvent) => _this.sendEvents([pushedEvent]);
+      }
+    } catch (error) {
+      logError('id5Analytics: ERROR', error);
+      _this.sendErrorEvent(error);
+    }
+  },
+
+  sendEvents: (eventsToSend) => {
+    const _this = id5Analytics;
+    // By giving some content this will be automatically a POST
+    eventsToSend.forEach((event) =>
+      ajax(_this.options.ingestUrl, null, JSON.stringify(event)));
+  },
+
+  makeEvent: (event, payload) => {
+    const _this = id5Analytics;
+    const filteredPayload = deepTransformingClone(payload,
+      transformFnFromCleanupRules(event));
+    return {
+      source: 'pbjs',
+      event,
+      payload: filteredPayload,
+      partnerId: _this.options.partnerId,
+      meta: {
+        sampling: _this.options.id5Sampling,
+        pbjs: PBJS_VERSION,
+        tz: TZ,
+      }
+    };
+  },
+
+  sendErrorEvent: (error) => {
+    const _this = id5Analytics;
+    _this.sendEvents([
+      _this.makeEvent('analyticsError', {
+        message: error.message,
+        stack: error.stack,
+      })
+    ]);
+  },
+
+  random: () => Math.random(),
+});
+
+const ENABLE_FUNCTION = (config) => {
+  const _this = id5Analytics;
+  _this.options = (config && config.options) || {};
+
+  const partnerId = _this.options.partnerId;
+  if (typeof partnerId !== 'number') {
+    logError('id5Analytics: partnerId in config.options must be a number representing the id5 partner ID');
+    return;
+  }
+
+  ajax(`${CONFIG_URL_PREFIX}/${partnerId}/pbjs`, (result) => {
+    logInfo('id5Analytics: Received from configuration endpoint', result);
+
+    const configFromServer = JSON.parse(result);
+
+    const sampling = _this.options.id5Sampling =
+      typeof configFromServer.sampling === 'number' ? configFromServer.sampling : 0;
+
+    if (typeof configFromServer.ingestUrl !== 'string') {
+      logError('id5Analytics: cannot find ingestUrl in config endpoint response; no analytics will be available');
+      return;
+    }
+    _this.options.ingestUrl = configFromServer.ingestUrl;
+
+    // 3-way fallback for which events to track: server > config > standard
+    _this.eventsToTrack = configFromServer.eventsToTrack || _this.options.eventsToTrack || STANDARD_EVENTS_TO_TRACK;
+    _this.eventsToTrack = isArray(_this.eventsToTrack) ? _this.eventsToTrack : STANDARD_EVENTS_TO_TRACK;
+
+    logInfo('id5Analytics: Configuration is', _this.options);
+    logInfo('id5Analytics: Tracking events', _this.eventsToTrack);
+    if (sampling > 0 && _this.random() < (1 / sampling)) {
+      // Init the module only if we got lucky
+      logInfo('id5Analytics: Selected by sampling. Starting up!');
+
+      // Clean start
+      _this.eventBuffer = {};
+
+      // Replay all events until now
+      if (!config.disablePastEventsProcessing) {
+        events.getEvents().forEach((event) => {
+          if (event && _this.eventsToTrack.indexOf(event.eventType) >= 0) {
+            _this.track(event);
+          }
+        });
+      }
+
+      // Merge in additional cleanup rules
+      if (configFromServer.additionalCleanupRules) {
+        const newRules = configFromServer.additionalCleanupRules;
+        _this.eventsToTrack.forEach((key) => {
+          // Some protective checks in case we mess up server side
+          if (
+            isArray(newRules[key]) &&
+            newRules[key].every((eventRules) =>
+              isArray(eventRules.match) &&
+              (eventRules.apply in TRANSFORM_FUNCTIONS))
+          ) {
+            logInfo('id5Analytics: merging additional cleanup rules for event ' + key);
+            CLEANUP_RULES[key].push(...newRules[key]);
+          }
+        });
+      }
+
+      // Register to the events of interest
+      _this.handlers = {};
+      _this.eventsToTrack.forEach((eventType) => {
+        const handler = _this.handlers[eventType] = (args) =>
+          _this.track({ eventType, args });
+        events.on(eventType, handler);
+      });
+    }
+  });
+
+  // Make only one init possible within a lifecycle
+  _this.enableAnalytics = () => {};
+};
+
+id5Analytics.enableAnalytics = ENABLE_FUNCTION;
+id5Analytics.disableAnalytics = () => {
+  const _this = id5Analytics;
+  // Un-register to the events of interest
+  _this.eventsToTrack.forEach((eventType) => {
+    if (_this.handlers && _this.handlers[eventType]) {
+      events.off(eventType, _this.handlers[eventType]);
+    }
+  });
+
+  // Make re-init possible. Work around the fact that past events cannot be forgotten
+  _this.enableAnalytics = (config) => {
+    config.disablePastEventsProcessing = true;
+    ENABLE_FUNCTION(config);
+  };
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: id5Analytics,
+  code: 'id5Analytics',
+  gvlid: GVLID
+});
+
+export default id5Analytics;
+
+function redact(obj, key) {
+  obj[key] = ID5_REDACTED;
+}
+
+function erase(obj, key) {
+  delete obj[key];
+}
+
+// The transform function matches against a path and applies
+// required transformation if match is found.
+function deepTransformingClone(obj, transform, currentPath = []) {
+  const result = isArray(obj) ? [] : {};
+  const recursable = typeof obj === 'object' && obj !== null;
+  if (recursable) {
+    const keys = Object.keys(obj);
+    if (keys.length > 0) {
+      keys.forEach((key) => {
+        const newPath = currentPath.concat(key);
+        result[key] = deepTransformingClone(obj[key], transform, newPath);
+        transform(newPath, result, key);
+      });
+      return result;
+    }
+  }
+  return obj;
+}
+
+// Every set of rules is an object where "match" is an array and
+// "apply" is the function to apply in case of match. The function to apply
+// takes (obj, prop) and transforms property "prop" in object "obj".
+// The "match" is an array of path parts. Each part is either a string or an array.
+// In case of array, it represents alternatives which all would match.
+// Special path part '*' matches any subproperty or array index.
+// Prefixing a part with "!" makes it negative match (doesn't work with multiple alternatives)
+const CLEANUP_RULES = {};
+CLEANUP_RULES[AUCTION_END] = [{
+  match: [['adUnits', 'bidderRequests'], '*', 'bids', '*', ['userId', 'crumbs'], '!id5id'],
+  apply: 'redact'
+}, {
+  match: [['adUnits', 'bidderRequests'], '*', 'bids', '*', ['userId', 'crumbs'], 'id5id', 'uid'],
+  apply: 'redact'
+}, {
+  match: [['adUnits', 'bidderRequests'], '*', 'bids', '*', 'userIdAsEids', '*', 'uids', '*', ['id', 'ext']],
+  apply: 'redact'
+}, {
+  match: ['bidderRequests', '*', 'gdprConsent', 'vendorData'],
+  apply: 'erase'
+}, {
+  match: ['bidsReceived', '*', ['ad', 'native']],
+  apply: 'erase'
+}, {
+  match: ['noBids', '*', ['userId', 'crumbs'], '*'],
+  apply: 'redact'
+}, {
+  match: ['noBids', '*', 'userIdAsEids', '*', 'uids', '*', ['id', 'ext']],
+  apply: 'redact'
+}];
+
+CLEANUP_RULES[BID_WON] = [{
+  match: [['ad', 'native']],
+  apply: 'erase'
+}];
+
+const TRANSFORM_FUNCTIONS = {
+  'redact': redact,
+  'erase': erase,
+};
+
+// Builds a rule function depending on the event type
+function transformFnFromCleanupRules(eventType) {
+  const rules = CLEANUP_RULES[eventType] || [];
+  return (path, obj, key) => {
+    for (let i = 0; i < rules.length; i++) {
+      let match = true;
+      const ruleMatcher = rules[i].match;
+      const transformation = rules[i].apply;
+      if (ruleMatcher.length !== path.length) {
+        continue;
+      }
+      for (let fragment = 0; fragment < ruleMatcher.length && match; fragment++) {
+        const choices = makeSureArray(ruleMatcher[fragment]);
+        match = !choices.every((choice) => choice !== '*' &&
+          (choice.charAt(0) === '!'
+            ? path[fragment] === choice.substring(1)
+            : path[fragment] !== choice));
+      }
+      if (match) {
+        const transformfn = TRANSFORM_FUNCTIONS[transformation];
+        transformfn(obj, key);
+        break;
+      }
+    }
+  };
+}
+
+function makeSureArray(object) {
+  return isArray(object) ? object : [object];
+}
diff --git a/modules/id5AnalyticsAdapter.md b/modules/id5AnalyticsAdapter.md
new file mode 100644
index 00000000000..e12784b70f6
--- /dev/null
+++ b/modules/id5AnalyticsAdapter.md
@@ -0,0 +1,42 @@
+# Overview
+Module Name: ID5 Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: [id5.io](https://id5.io)
+
+# ID5 Universal ID
+
+The ID5 Universal ID is a shared, neutral identifier that publishers and ad tech platforms can use to recognise users even in environments where 3rd party cookies are not available. The ID5 Universal ID is designed to respect users' privacy choices and publishers’ preferences throughout the advertising value chain. For more information about the ID5 Universal ID and detailed integration docs, please visit [our documentation](https://support.id5.io/portal/en/kb/articles/prebid-js-user-id-module).
+
+# ID5 Analytics Registration
+
+The ID5 Analytics Adapter is free to use during our Beta period, but requires a simple registration with ID5. Please visit [id5.io/universal-id](https://id5.io/universal-id) to sign up and request your ID5 Partner Number to get started. If you're already using the ID5 Universal ID, you may use your existing Partner Number with the analytics adapter.
+
+The ID5 privacy policy is at [https://www.id5.io/platform-privacy-policy](https://www.id5.io/platform-privacy-policy).
+
+## ID5 Analytics Configuration
+
+First, make sure to add the ID5 Analytics submodule to your Prebid.js package with:
+
+```
+gulp build --modules=...,id5AnalyticsAdapter
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.enableAnalytics({
+    provider: 'id5Analytics',
+    options: {
+        partnerId: 1234, // change to the Partner Number you received from ID5
+        eventsToTrack: ['auctionEnd','bidWon']
+    }
+});
+```
+
+| Parameter | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| provider | Required | String | The name of this module: `id5Analytics` | `id5Analytics` |
+| options.partnerId | Required | Number | This is the ID5 Partner Number obtained from registering with ID5. | `1234` |
+| options.eventsToTrack | Optional | Array of strings | Overrides the set of tracked events | `['auctionEnd','bidWon']` |
diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index 3449926c896..c2c4a97c62e 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -5,18 +5,36 @@
  * @requires module:modules/userId
  */
 
-import * as utils from '../src/utils.js'
-import { ajax } from '../src/ajax.js';
-import { submodule } from '../src/hook.js';
-import { getRefererInfo } from '../src/refererDetection.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {
+  deepAccess,
+  deepSetValue,
+  isEmpty,
+  isEmptyStr,
+  logError,
+  logInfo,
+  logWarn,
+  safeJSONParse
+} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {uspDataHandler} from '../src/adapterManager.js';
 
 const MODULE_NAME = 'id5Id';
 const GVLID = 131;
-const BASE_NB_COOKIE_NAME = 'pbjs-id5id';
-const NB_COOKIE_EXP_DAYS = (30 * 24 * 60 * 60 * 1000); // 30 days
+const NB_EXP_DAYS = 30;
+export const ID5_STORAGE_NAME = 'id5id';
+export const ID5_PRIVACY_STORAGE_NAME = `${ID5_STORAGE_NAME}_privacy`;
+const LOCAL_STORAGE = 'html5';
+const LOG_PREFIX = 'User ID - ID5 submodule: ';
+const ID5_API_CONFIG_URL = 'https://id5-sync.com/api/config/prebid';
 
-const storage = getStorageManager(GVLID, MODULE_NAME);
+// order the legacy cookie names in reverse priority order so the last
+// cookie in the array is the most preferred to use
+const LEGACY_COOKIE_NAMES = ['pbjs-id5id', 'id5id.1st', 'id5id'];
+
+export const storage = getStorageManager({gvlid: GVLID, moduleName: MODULE_NAME});
 
 /** @type {Submodule} */
 export const id5IdSubmodule = {
@@ -36,70 +54,74 @@ export const id5IdSubmodule = {
    * decode the stored id value for passing to bid requests
    * @function decode
    * @param {(Object|string)} value
+   * @param {SubmoduleConfig|undefined} config
    * @returns {(Object|undefined)}
    */
-  decode(value) {
-    if (value && typeof value.ID5ID === 'string') {
-      // don't lose our legacy value from cache
-      return { 'id5id': value.ID5ID };
-    } else if (value && typeof value.universal_uid === 'string') {
-      return { 'id5id': value.universal_uid };
+  decode(value, config) {
+    let universalUid;
+    let linkType = 0;
+
+    if (value && typeof value.universal_uid === 'string') {
+      universalUid = value.universal_uid;
+      linkType = value.link_type || linkType;
     } else {
       return undefined;
     }
+
+    let responseObj = {
+      id5id: {
+        uid: universalUid,
+        ext: {
+          linkType: linkType
+        }
+      }
+    };
+
+    const abTestingResult = deepAccess(value, 'ab_testing.result');
+    switch (abTestingResult) {
+      case 'control':
+        // A/B Testing is enabled and user is in the Control Group
+        logInfo(LOG_PREFIX + 'A/B Testing - user is in the Control Group: ID5 ID is NOT exposed');
+        deepSetValue(responseObj, 'id5id.ext.abTestingControlGroup', true);
+        break;
+      case 'error':
+        // A/B Testing is enabled, but configured improperly, so skip A/B testing
+        logError(LOG_PREFIX + 'A/B Testing ERROR! controlGroupPct must be a number >= 0 and <= 1');
+        break;
+      case 'normal':
+        // A/B Testing is enabled but user is not in the Control Group, so ID5 ID is shared
+        logInfo(LOG_PREFIX + 'A/B Testing - user is NOT in the Control Group');
+        deepSetValue(responseObj, 'id5id.ext.abTestingControlGroup', false);
+        break;
+    }
+
+    logInfo(LOG_PREFIX + 'Decoded ID', responseObj);
+
+    return responseObj;
   },
 
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function getId
-   * @param {SubmoduleParams} [configParams]
-   * @param {ConsentData} [consentData]
+   * @param {SubmoduleConfig} submoduleConfig
+   * @param {ConsentData} consentData
    * @param {(Object|undefined)} cacheIdObj
    * @returns {IdResponse|undefined}
    */
-  getId(configParams, consentData, cacheIdObj) {
-    if (!hasRequiredParams(configParams)) {
+  getId(submoduleConfig, consentData, cacheIdObj) {
+    if (!hasRequiredConfig(submoduleConfig)) {
       return undefined;
     }
-    const hasGdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
-    const gdprConsentString = hasGdpr ? consentData.consentString : '';
-    const url = `https://id5-sync.com/g/v2/${configParams.partner}.json?gdpr_consent=${gdprConsentString}&gdpr=${hasGdpr}`;
-    const referer = getRefererInfo();
-    const signature = (cacheIdObj && cacheIdObj.signature) ? cacheIdObj.signature : '';
-    const pubId = (cacheIdObj && cacheIdObj.ID5ID) ? cacheIdObj.ID5ID : ''; // TODO: remove when 1puid isn't needed
-    const data = {
-      'partner': configParams.partner,
-      '1puid': pubId, // TODO: remove when 1puid isn't needed
-      'nbPage': incrementNb(configParams),
-      'o': 'pbjs',
-      'pd': configParams.pd || '',
-      'rf': referer.referer,
-      's': signature,
-      'top': referer.reachedTop ? 1 : 0,
-      'u': referer.stack[0] || window.location.href,
-      'v': '$prebid.version$'
-    };
 
-    const resp = function (callback) {
-      const callbacks = {
-        success: response => {
-          let responseObj;
-          if (response) {
-            try {
-              responseObj = JSON.parse(response);
-              resetNb(configParams);
-            } catch (error) {
-              utils.logError(error);
-            }
-          }
-          callback(responseObj);
-        },
-        error: error => {
-          utils.logError(`id5Id: ID fetch encountered an error`, error);
-          callback();
-        }
-      };
-      ajax(url, callbacks, JSON.stringify(data), { method: 'POST', withCredentials: true });
+    const resp = function (cbFunction) {
+      new IdFetchFlow(submoduleConfig, consentData, cacheIdObj, uspDataHandler.getConsentData()).execute()
+        .then(response => {
+          cbFunction(response)
+        })
+        .catch(error => {
+          logError(LOG_PREFIX + 'getId fetch encountered an error', error);
+          cbFunction();
+        });
     };
     return {callback: resp};
   },
@@ -110,43 +132,246 @@ export const id5IdSubmodule = {
    *  If IdResponse#callback is defined, then it'll called at the end of auction.
    *  It's permissible to return neither, one, or both fields.
    * @function extendId
-   * @param {SubmoduleParams} configParams
+   * @param {SubmoduleConfig} config
+   * @param {ConsentData|undefined} consentData
    * @param {Object} cacheIdObj - existing id, if any
    * @return {(IdResponse|function(callback:function))} A response object that contains id and/or callback.
    */
-  extendId(configParams, cacheIdObj) {
-    incrementNb(configParams);
+  extendId(config, consentData, cacheIdObj) {
+    hasRequiredConfig(config);
+
+    const partnerId = (config && config.params && config.params.partner) || 0;
+    incrementNb(partnerId);
+
+    logInfo(LOG_PREFIX + 'using cached ID', cacheIdObj);
     return cacheIdObj;
   }
 };
 
-function hasRequiredParams(configParams) {
-  if (!configParams || typeof configParams.partner !== 'number') {
-    utils.logError(`User ID - ID5 submodule requires partner to be defined as a number`);
+class IdFetchFlow {
+  constructor(submoduleConfig, gdprConsentData, cacheIdObj, usPrivacyData) {
+    this.submoduleConfig = submoduleConfig
+    this.gdprConsentData = gdprConsentData
+    this.cacheIdObj = cacheIdObj
+    this.usPrivacyData = usPrivacyData
+  }
+
+  execute() {
+    return this.#callForConfig(this.submoduleConfig)
+      .then(fetchFlowConfig => {
+        return this.#callForExtensions(fetchFlowConfig.extensionsCall)
+          .then(extensionsData => {
+            return this.#callId5Fetch(fetchFlowConfig.fetchCall, extensionsData)
+          })
+      })
+      .then(fetchCallResponse => {
+        try {
+          resetNb(this.submoduleConfig.params.partner);
+          if (fetchCallResponse.privacy) {
+            storeInLocalStorage(ID5_PRIVACY_STORAGE_NAME, JSON.stringify(fetchCallResponse.privacy), NB_EXP_DAYS);
+          }
+        } catch (error) {
+          logError(LOG_PREFIX + error);
+        }
+        return fetchCallResponse;
+      })
+  }
+
+  #ajaxPromise(url, data, options) {
+    return new Promise((resolve, reject) => {
+      ajax(url,
+        {
+          success: function (res) {
+            resolve(res)
+          },
+          error: function (err) {
+            reject(err)
+          }
+        }, data, options)
+    })
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #callForConfig(submoduleConfig) {
+    let url = submoduleConfig.params.configUrl || ID5_API_CONFIG_URL; // override for debug/test purposes only
+    return this.#ajaxPromise(url, JSON.stringify(submoduleConfig), {method: 'POST'})
+      .then(response => {
+        let responseObj = JSON.parse(response);
+        logInfo(LOG_PREFIX + 'config response received from the server', responseObj);
+        return responseObj;
+      });
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #callForExtensions(extensionsCallConfig) {
+    if (extensionsCallConfig === undefined) {
+      return Promise.resolve(undefined)
+    }
+    let extensionsUrl = extensionsCallConfig.url
+    let method = extensionsCallConfig.method || 'GET'
+    let data = method === 'GET' ? undefined : JSON.stringify(extensionsCallConfig.body || {})
+    return this.#ajaxPromise(extensionsUrl, data, {'method': method})
+      .then(response => {
+        let responseObj = JSON.parse(response);
+        logInfo(LOG_PREFIX + 'extensions response received from the server', responseObj);
+        return responseObj;
+      })
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #callId5Fetch(fetchCallConfig, extensionsData) {
+    let url = fetchCallConfig.url;
+    let additionalData = fetchCallConfig.overrides || {};
+    let data = {
+      ...this.#createFetchRequestData(),
+      ...additionalData,
+      extensions: extensionsData
+    };
+    return this.#ajaxPromise(url, JSON.stringify(data), {method: 'POST', withCredentials: true})
+      .then(response => {
+        let responseObj = JSON.parse(response);
+        logInfo(LOG_PREFIX + 'fetch response received from the server', responseObj);
+        return responseObj;
+      });
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #createFetchRequestData() {
+    const params = this.submoduleConfig.params;
+    const hasGdpr = (this.gdprConsentData && typeof this.gdprConsentData.gdprApplies === 'boolean' && this.gdprConsentData.gdprApplies) ? 1 : 0;
+    const referer = getRefererInfo();
+    const signature = (this.cacheIdObj && this.cacheIdObj.signature) ? this.cacheIdObj.signature : getLegacyCookieSignature();
+    const nbPage = incrementNb(params.partner);
+    const data = {
+      'partner': params.partner,
+      'gdpr': hasGdpr,
+      'nbPage': nbPage,
+      'o': 'pbjs',
+      'rf': referer.topmostLocation,
+      'top': referer.reachedTop ? 1 : 0,
+      'u': referer.stack[0] || window.location.href,
+      'v': '$prebid.version$',
+      'storage': this.submoduleConfig.storage
+    };
+
+    // pass in optional data, but only if populated
+    if (hasGdpr && this.gdprConsentData.consentString !== undefined && !isEmpty(this.gdprConsentData.consentString) && !isEmptyStr(this.gdprConsentData.consentString)) {
+      data.gdpr_consent = this.gdprConsentData.consentString;
+    }
+    if (this.usPrivacyData !== undefined && !isEmpty(this.usPrivacyData) && !isEmptyStr(this.usPrivacyData)) {
+      data.us_privacy = this.usPrivacyData;
+    }
+    if (signature !== undefined && !isEmptyStr(signature)) {
+      data.s = signature;
+    }
+    if (params.pd !== undefined && !isEmptyStr(params.pd)) {
+      data.pd = params.pd;
+    }
+    if (params.provider !== undefined && !isEmptyStr(params.provider)) {
+      data.provider = params.provider;
+    }
+    const abTestingConfig = params.abTesting || {enabled: false};
+
+    if (abTestingConfig.enabled) {
+      data.ab_testing = {
+        enabled: true, control_group_pct: abTestingConfig.controlGroupPct // The server validates
+      };
+    }
+    return data;
+  }
+}
+
+function hasRequiredConfig(config) {
+  if (!config || !config.params || !config.params.partner || typeof config.params.partner !== 'number') {
+    logError(LOG_PREFIX + 'partner required to be defined as a number');
+    return false;
+  }
+
+  if (!config.storage || !config.storage.type || !config.storage.name) {
+    logError(LOG_PREFIX + 'storage required to be set');
     return false;
   }
+
+  // in a future release, we may return false if storage type or name are not set as required
+  if (config.storage.type !== LOCAL_STORAGE) {
+    logWarn(LOG_PREFIX + `storage type recommended to be '${LOCAL_STORAGE}'. In a future release this may become a strict requirement`);
+  }
+  // in a future release, we may return false if storage type or name are not set as required
+  if (config.storage.name !== ID5_STORAGE_NAME) {
+    logWarn(LOG_PREFIX + `storage name recommended to be '${ID5_STORAGE_NAME}'. In a future release this may become a strict requirement`);
+  }
+
   return true;
 }
-function nbCookieName(configParams) {
-  return hasRequiredParams(configParams) ? `${BASE_NB_COOKIE_NAME}-${configParams.partner}-nb` : undefined;
+
+export function expDaysStr(expDays) {
+  return (new Date(Date.now() + (1000 * 60 * 60 * 24 * expDays))).toUTCString();
 }
-function nbCookieExpStr(expDays) {
-  return (new Date(Date.now() + expDays)).toUTCString();
+
+export function nbCacheName(partnerId) {
+  return `${ID5_STORAGE_NAME}_${partnerId}_nb`;
 }
-function storeNbInCookie(configParams, nb) {
-  storage.setCookie(nbCookieName(configParams), nb, nbCookieExpStr(NB_COOKIE_EXP_DAYS), 'Lax');
+
+export function storeNbInCache(partnerId, nb) {
+  storeInLocalStorage(nbCacheName(partnerId), nb, NB_EXP_DAYS);
 }
-function getNbFromCookie(configParams) {
-  const cacheNb = storage.getCookie(nbCookieName(configParams));
+
+export function getNbFromCache(partnerId) {
+  let cacheNb = getFromLocalStorage(nbCacheName(partnerId));
   return (cacheNb) ? parseInt(cacheNb) : 0;
 }
-function incrementNb(configParams) {
-  const nb = (getNbFromCookie(configParams) + 1);
-  storeNbInCookie(configParams, nb);
+
+function incrementNb(partnerId) {
+  const nb = (getNbFromCache(partnerId) + 1);
+  storeNbInCache(partnerId, nb);
   return nb;
 }
-function resetNb(configParams) {
-  storeNbInCookie(configParams, 0);
+
+function resetNb(partnerId) {
+  storeNbInCache(partnerId, 0);
+}
+
+function getLegacyCookieSignature() {
+  let legacyStoredValue;
+  LEGACY_COOKIE_NAMES.forEach(function (cookie) {
+    if (storage.getCookie(cookie)) {
+      legacyStoredValue = safeJSONParse(storage.getCookie(cookie)) || legacyStoredValue;
+    }
+  });
+  return (legacyStoredValue && legacyStoredValue.signature) || '';
+}
+
+/**
+ * This will make sure we check for expiration before accessing local storage
+ * @param {string} key
+ */
+export function getFromLocalStorage(key) {
+  const storedValueExp = storage.getDataFromLocalStorage(`${key}_exp`);
+  // empty string means no expiration set
+  if (storedValueExp === '') {
+    return storage.getDataFromLocalStorage(key);
+  } else if (storedValueExp) {
+    if ((new Date(storedValueExp)).getTime() - Date.now() > 0) {
+      return storage.getDataFromLocalStorage(key);
+    }
+  }
+  // if we got here, then we have an expired item or we didn't set an
+  // expiration initially somehow, so we need to remove the item from the
+  // local storage
+  storage.removeDataFromLocalStorage(key);
+  return null;
+}
+
+/**
+ * Ensure that we always set an expiration in local storage since
+ * by default it's not required
+ * @param {string} key
+ * @param {any} value
+ * @param {integer} expDays
+ */
+export function storeInLocalStorage(key, value, expDays) {
+  storage.setDataInLocalStorage(`${key}_exp`, expDaysStr(expDays));
+  storage.setDataInLocalStorage(`${key}`, value);
 }
 
 submodule('userId', id5IdSubmodule);
diff --git a/modules/id5IdSystem.md b/modules/id5IdSystem.md
new file mode 100644
index 00000000000..cf90290b1d8
--- /dev/null
+++ b/modules/id5IdSystem.md
@@ -0,0 +1,70 @@
+# ID5 Universal ID
+
+The ID5 ID is a shared, neutral identifier that publishers and ad tech platforms can use to recognise users even in environments where 3rd party cookies are not available. The ID5 ID is designed to respect users' privacy choices and publishers’ preferences throughout the advertising value chain. For more information about the ID5 ID and detailed integration docs, please visit [our documentation](https://support.id5.io/portal/en/kb/articles/prebid-js-user-id-module).
+
+## ID5 ID Registration
+
+The ID5 ID is free to use, but requires a simple registration with ID5. Please visit [our website](https://id5.io/solutions/#publishers) to sign up and request your ID5 Partner Number to get started.
+
+The ID5 privacy policy is at [https://id5.io/platform-privacy-policy](https://id5.io/platform-privacy-policy).
+
+## ID5 ID Configuration
+
+First, make sure to add the ID5 submodule to your Prebid.js package with:
+
+```
+gulp build --modules=id5IdSystem,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'id5Id',
+      params: {
+        partner: 173,            // change to the Partner Number you received from ID5
+        pd: 'MT1iNTBjY...',      // optional, see table below for a link to how to generate this
+        abTesting: {             // optional
+          enabled: true,         // false by default
+          controlGroupPct: 0.1   // valid values are 0.0 - 1.0 (inclusive)
+        }, 
+        disableExtensions: false // optional
+      },
+      storage: {
+        type: 'html5',           // "html5" is the required storage type
+        name: 'id5id',           // "id5id" is the required storage name
+        expires: 90,             // storage lasts for 90 days
+        refreshInSeconds: 8*3600 // refresh ID every 8 hours to ensure it's fresh
+      }
+    }],
+    auctionDelay: 50             // 50ms maximum auction delay, applies to all userId modules
+  }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description                                                                                                                                                                                                                                                                    | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module: `"id5Id"`                                                                                                                                                                                                                                             | `"id5Id"` |
+| params | Required | Object | Details for the ID5 ID.                                                                                                                                                                                                                                                        | |
+| params.partner | Required | Number | This is the ID5 Partner Number obtained from registering with ID5.                                                                                                                                                                                                             | `173` |
+| params.pd | Optional | String | Partner-supplied data used for linking ID5 IDs across domains. See [our documentation](https://support.id5.io/portal/en/kb/articles/passing-partner-data-to-id5) for details on generating the string. Omit the parameter or leave as an empty string if no data to supply     | `"MT1iNTBjY..."` |
+| params.provider | Optional | String | An identifier provided by ID5 to technology partners who manage Prebid setups on behalf of publishers. Reach out to [ID5](mailto:prebid@id5.io) if you have questions about this parameter                                                                                     | `pubmatic-identity-hub` |
+| params.abTesting | Optional | Object | Allows publishers to easily run an A/B Test. If enabled and the user is in the Control Group, the ID5 ID will NOT be exposed to bid adapters for that request                                                                                                                  | Disabled by default |
+| params.abTesting.enabled | Optional | Boolean | Set this to `true` to turn on this feature                                                                                                                                                                                                                                     | `true` or `false` |
+| params.abTesting.controlGroupPct | Optional | Number | Must be a number between `0.0` and `1.0` (inclusive) and is used to determine the percentage of requests that fall into the control group (and thus not exposing the ID5 ID). For example, a value of `0.20` will result in 20% of requests without an ID5 ID and 80% with an ID. | `0.1` |
+| params.disableExtensions | Optional | Boolean | Set this to `true` to force turn off extensions call. Default `false`                                                                                                                                                                                                          | `true` or `false` |
+| storage | Required | Object | Storage settings for how the User ID module will cache the ID5 ID locally                                                                                                                                                                                                      | |
+| storage.type | Required | String | This is where the results of the user ID will be stored. ID5 **requires** `"html5"`.                                                                                                                                                                                           | `"html5"` |
+| storage.name | Required | String | The name of the local storage where the user ID will be stored. ID5 **requires** `"id5id"`.                                                                                                                                                                                    | `"id5id"` |
+| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. ID5 recommends `90`.                                                                                                                                                                                                | `90` |
+| storage.refreshInSeconds | Optional | Integer | How many seconds until the ID5 ID will be refreshed. ID5 strongly recommends 8 hours between refreshes                                                                                                                                                                         | `8*3600` |
+
+**ATTENTION:** As of Prebid.js v4.14.0, ID5 requires `storage.type` to be `"html5"` and `storage.name` to be `"id5id"`. Using other values will display a warning today, but in an upcoming release, it will prevent the ID5 module from loading. This change is to ensure the ID5 module in Prebid.js interoperates properly with the [ID5 API](https://github.com/id5io/id5-api.js) and to reduce the size of publishers' first-party cookies that are sent to their web servers. If you have any questions, please reach out to us at [prebid@id5.io](mailto:prebid@id5.io).
+
+### A Note on A/B Testing
+
+Publishers may want to test the value of the ID5 ID with their downstream partners. While there are various ways to do this, A/B testing is a standard approach. Instead of publishers manually enabling or disabling the ID5 User ID Module based on their control group settings (which leads to fewer calls to ID5, reducing our ability to recognize the user), we have baked this in to our module directly.
+
+To turn on A/B Testing, simply edit the configuration (see above table) to enable it and set what percentage of users you would like to set for the control group. The control group is the set of user where an ID5 ID will not be exposed in to bid adapters or in the various user id functions available on the `pbjs` global. An additional value of `ext.abTestingControlGroup` will be set to `true` or `false` that can be used to inform reporting systems that the user was in the control group or not. It's important to note that the control group is user based, and not request based. In other words, from one page view to another, a user will always be in or out of the control group.
diff --git a/modules/idImportLibrary.js b/modules/idImportLibrary.js
new file mode 100644
index 00000000000..e1847edfce4
--- /dev/null
+++ b/modules/idImportLibrary.js
@@ -0,0 +1,280 @@
+import { logInfo, logError } from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import MD5 from 'crypto-js/md5.js';
+
+let email;
+let conf;
+const LOG_PRE_FIX = 'ID-Library: ';
+const CONF_DEFAULT_OBSERVER_DEBOUNCE_MS = 250;
+const CONF_DEFAULT_FULL_BODY_SCAN = false;
+const CONF_DEFAULT_INPUT_SCAN = false;
+const OBSERVER_CONFIG = {
+  subtree: true,
+  attributes: true,
+  attributeOldValue: false,
+  childList: true,
+  attirbuteFilter: ['value'],
+  characterData: true,
+  characterDataOldValue: false
+};
+const _logInfo = createLogInfo(LOG_PRE_FIX);
+const _logError = createLogError(LOG_PRE_FIX);
+
+function createLogInfo(prefix) {
+  return function (...strings) {
+    logInfo(prefix + ' ', ...strings);
+  }
+}
+
+function createLogError(prefix) {
+  return function (...strings) {
+    logError(prefix + ' ', ...strings);
+  }
+}
+
+function getEmail(value) {
+  const matched = value.match(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+)/gi);
+  if (!matched) {
+    return null;
+  }
+  _logInfo('Email found: ' + matched[0]);
+  return matched[0];
+}
+
+function bodyAction(mutations, observer) {
+  _logInfo('BODY observer on debounce called');
+  // If the email is found in the input element, disconnect the observer
+  if (email) {
+    observer.disconnect();
+    _logInfo('Email is found, body observer disconnected');
+    return;
+  }
+
+  const body = document.body.innerHTML;
+  email = getEmail(body);
+  if (email !== null) {
+    _logInfo(`Email obtained from the body ${email}`);
+    observer.disconnect();
+    _logInfo('Post data on email found in body');
+    postData();
+  }
+}
+
+function targetAction(mutations, observer) {
+  _logInfo('Target observer called');
+  for (const mutation of mutations) {
+    for (const node of mutation.addedNodes) {
+      email = node.textContent;
+
+      if (email) {
+        _logInfo('Email obtained from the target ' + email);
+        observer.disconnect();
+        _logInfo('Post data on email found in target');
+        postData();
+        return;
+      }
+    }
+  }
+}
+
+function addInputElementsElementListner() {
+  if (doesInputElementsHaveEmail()) {
+    _logInfo('Email found in input elements ' + email);
+    _logInfo('Post data on email found in target without');
+    postData();
+    return;
+  }
+  _logInfo('Adding input element listeners');
+  const inputs = document.querySelectorAll('input[type=text], input[type=email]');
+
+  for (var i = 0; i < inputs.length; i++) {
+    _logInfo(`Original Value in Input = ${inputs[i].value}`);
+    inputs[i].addEventListener('change', event => processInputChange(event));
+    inputs[i].addEventListener('blur', event => processInputChange(event));
+  }
+}
+
+function addFormInputElementsElementListner(id) {
+  _logInfo('Adding input element listeners');
+  if (doesFormInputElementsHaveEmail(id)) {
+    _logInfo('Email found in input elements ' + email);
+    postData();
+    return;
+  }
+  _logInfo('Adding input element listeners');
+  const input = document.getElementById(id);
+  input.addEventListener('change', event => processInputChange(event));
+  input.addEventListener('blur', event => processInputChange(event));
+}
+
+function removeInputElementsElementListner() {
+  _logInfo('Removing input element listeners');
+  const inputs = document.querySelectorAll('input[type=text], input[type=email]');
+
+  for (var i = 0; i < inputs.length; i++) {
+    inputs[i].removeEventListener('change', event => processInputChange(event));
+    inputs[i].removeEventListener('blur', event => processInputChange(event));
+  }
+}
+
+function processInputChange(event) {
+  const value = event.target.value;
+  _logInfo(`Modified Value of input ${event.target.value}`);
+  email = getEmail(value);
+  if (email !== null) {
+    _logInfo('Email found in input ' + email);
+    postData();
+    removeInputElementsElementListner();
+  }
+}
+
+function debounce(func, wait, immediate) {
+  var timeout;
+  return function () {
+    const context = this;
+    const args = arguments;
+    const later = function () {
+      timeout = null;
+      if (!immediate) func.apply(context, args);
+    };
+    var callNow = immediate && !timeout;
+    clearTimeout(timeout);
+    if (callNow) {
+      func.apply(context, args);
+    } else {
+      _logInfo('Debounce wait time ' + wait);
+      timeout = setTimeout(later, wait);
+    }
+  };
+};
+
+function handleTargetElement() {
+  const targetObserver = new MutationObserver(debounce(targetAction, conf.debounce, false));
+
+  const targetElement = document.getElementById(conf.target);
+  if (targetElement) {
+    email = targetElement.innerText;
+
+    if (!email) {
+      _logInfo('Finding the email with observer');
+      targetObserver.observe(targetElement, OBSERVER_CONFIG);
+    } else {
+      _logInfo('Target found with target ' + email);
+      _logInfo('Post data on email found in target with target');
+      postData();
+    }
+  }
+}
+
+function handleBodyElements() {
+  email = getEmail(document.body.innerHTML);
+  if (email !== null) {
+    _logInfo('Email found in body ' + email);
+    _logInfo('Post data on email found in the body without observer');
+    postData();
+    return;
+  }
+
+  if (conf.fullscan === true) {
+    const bodyObserver = new MutationObserver(debounce(bodyAction, conf.debounce, false));
+    bodyObserver.observe(document.body, OBSERVER_CONFIG);
+  }
+}
+
+function doesInputElementsHaveEmail() {
+  const inputs = document.getElementsByTagName('input');
+
+  for (let index = 0; index < inputs.length; ++index) {
+    const curInput = inputs[index];
+    email = getEmail(curInput.value);
+    if (email !== null) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function doesFormInputElementsHaveEmail(formElementId) {
+  const input = document.getElementById(formElementId);
+  if (input) {
+    email = getEmail(input.value);
+    if (email !== null) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function syncCallback() {
+  return {
+    success: function () {
+      _logInfo('Data synced successfully.');
+    },
+    error: function () {
+      _logInfo('Data sync failed.');
+    }
+  }
+}
+
+function postData() {
+  (getGlobal()).refreshUserIds();
+  const userIds = (getGlobal()).getUserIds();
+  if (Object.keys(userIds).length === 0) {
+    _logInfo('No user ids');
+    return;
+  }
+  _logInfo('Users' + userIds);
+  const syncPayload = {};
+  syncPayload.hid = MD5(email).toString();
+  syncPayload.uids = userIds;
+  const payloadString = JSON.stringify(syncPayload);
+  _logInfo(payloadString);
+  ajax(conf.url, syncCallback(), payloadString, {method: 'POST', withCredentials: true});
+}
+
+function associateIds() {
+  if (window.MutationObserver || window.WebKitMutationObserver) {
+    if (conf.target) {
+      handleTargetElement();
+    } else if (conf.formElementId) {
+      addFormInputElementsElementListner(conf.formElementId);
+    } else if (conf.inputscan) {
+      addInputElementsElementListner();
+    } else {
+      handleBodyElements();
+    }
+  }
+}
+
+export function setConfig(config) {
+  if (!config) {
+    _logError('Required confirguration not provided');
+    return;
+  }
+  if (!config.url) {
+    _logError('The required url is not configured');
+    return;
+  }
+  if (typeof config.debounce !== 'number') {
+    config.debounce = CONF_DEFAULT_OBSERVER_DEBOUNCE_MS;
+    _logInfo('Set default observer debounce to ' + CONF_DEFAULT_OBSERVER_DEBOUNCE_MS);
+  }
+  if (typeof config.fullscan !== 'boolean') {
+    config.fullscan = CONF_DEFAULT_FULL_BODY_SCAN;
+    _logInfo('Set default fullscan ' + CONF_DEFAULT_FULL_BODY_SCAN);
+  }
+  if (typeof config.inputscan !== 'boolean') {
+    config.inputscan = CONF_DEFAULT_INPUT_SCAN;
+    _logInfo('Set default input scan ' + CONF_DEFAULT_INPUT_SCAN);
+  }
+
+  if (typeof config.formElementId == 'string') {
+    _logInfo('Looking for formElementId ' + config.formElementId);
+  }
+  conf = config;
+  associateIds();
+}
+
+config.getConfig('idImportLibrary', config => setConfig(config.idImportLibrary));
diff --git a/modules/idImportLibrary.md b/modules/idImportLibrary.md
new file mode 100644
index 00000000000..f91ca984bb3
--- /dev/null
+++ b/modules/idImportLibrary.md
@@ -0,0 +1,26 @@
+# ID Import Library
+
+## Configuration Options
+
+| Parameter  | Required | Type    | Default | Description |
+| :--------- | :------- | :------ | :------ | :---------- |
+| `target`   | Yes      | String  | N/A     | ID attribute of the element from which the email can be read. |
+| `url`      | Yes      | String  | N/A     | URL endpoint used to post the hashed email and user IDs. |
+| `debounce` | No       | Number  | 250     | Time in milliseconds before the email and IDs are fetched. |
+| `fullscan` | No       | Boolean | false   | Enable/disable a full page body scan to get email. |
+| `formElementId`   | No      | String  | N/A     | ID attribute of the input (type=text/email)  from which the email can be read. |
+| `inputscan`   | No      | Boolean  | N/A     | Enable/disable a input element (type=text/email) scan to get email. |
+
+## Example
+
+```javascript
+pbjs.setConfig({
+    idImportLibrary: {
+        target: 'username',
+        url: 'https://example.com',
+        debounce: 250,
+        fullscan: false,
+        inputscan: false,
+        formElementId: "userid"
+    },
+});
diff --git a/modules/idWardRtdProvider.js b/modules/idWardRtdProvider.js
new file mode 100644
index 00000000000..9678739672d
--- /dev/null
+++ b/modules/idWardRtdProvider.js
@@ -0,0 +1,103 @@
+/**
+ * This module adds the ID Ward RTD provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will poulate real-time data from ID Ward
+ * @module modules/idWardRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import {isPlainObject, mergeDeep, logMessage, logError} from '../src/utils.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'idWard';
+
+export const storage = getStorageManager({moduleName: SUBMODULE_NAME});
+/**
+ * Add real-time data & merge segments.
+ * @param ortb2 object to merge into
+ * @param {Object} rtd
+ */
+function addRealTimeData(ortb2, rtd) {
+  if (isPlainObject(rtd.ortb2)) {
+    logMessage('idWardRtdProvider: merging original: ', ortb2);
+    logMessage('idWardRtdProvider: merging in: ', rtd.ortb2);
+    mergeDeep(ortb2, rtd.ortb2);
+  }
+}
+
+/**
+  * Try parsing stringified array of segment IDs.
+  * @param {String} data
+  */
+function tryParse(data) {
+  try {
+    return JSON.parse(data);
+  } catch (err) {
+    logError(`idWardRtdProvider: failed to parse json:`, data);
+    return null;
+  }
+}
+
+/**
+  * Real-time data retrieval from ID Ward
+  * @param {Object} reqBidsConfigObj
+  * @param {function} onDone
+  * @param {Object} rtdConfig
+  * @param {Object} userConsent
+  */
+export function getRealTimeData(reqBidsConfigObj, onDone, rtdConfig, userConsent) {
+  if (rtdConfig && isPlainObject(rtdConfig.params)) {
+    const jsonData = storage.getDataFromLocalStorage(rtdConfig.params.cohortStorageKey)
+
+    if (!jsonData) {
+      return;
+    }
+
+    const segments = tryParse(jsonData);
+
+    if (segments) {
+      const udSegment = {
+        name: 'id-ward.com',
+        ext: {
+          segtax: rtdConfig.params.segtax
+        },
+        segment: segments.map(x => ({id: x}))
+      }
+
+      logMessage('idWardRtdProvider: user.data.segment: ', udSegment);
+      const data = {
+        rtd: {
+          ortb2: {
+            user: {
+              data: [
+                udSegment
+              ]
+            }
+          }
+        }
+      };
+      addRealTimeData(reqBidsConfigObj.ortb2Fragments?.global, data.rtd);
+      onDone();
+    }
+  }
+}
+
+/**
+  * Module init
+  * @param {Object} provider
+  * @param {Object} userConsent
+  * @return {boolean}
+  */
+function init(provider, userConsent) {
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const idWardRtdSubmodule = {
+  name: SUBMODULE_NAME,
+  getBidRequestData: getRealTimeData,
+  init: init
+};
+
+submodule(MODULE_NAME, idWardRtdSubmodule);
diff --git a/modules/idWardRtdProvider.md b/modules/idWardRtdProvider.md
new file mode 100644
index 00000000000..5a44bfa49f3
--- /dev/null
+++ b/modules/idWardRtdProvider.md
@@ -0,0 +1,44 @@
+### Overview
+
+ID Ward is a data anonymization technology for privacy-preserving advertising. Publishers and advertisers are able to target and retarget custom audience segments covering 100% of consented audiences. 
+ID Ward’s Real-time Data Provider automatically obtains segment IDs from the ID Ward on-domain script (via localStorage) and passes them to the bid-stream.
+
+### Integration
+
+ 1) Build the idWardRtd module into the Prebid.js package with:
+
+ ```
+ gulp build --modules=idWardRtdProvider,...
+ ```
+
+ 2) Use `setConfig` to instruct Prebid.js to initilaize the idWardRtdProvider module, as specified below.
+
+### Configuration
+
+```
+ pbjs.setConfig({
+   realTimeData: {
+     dataProviders: [
+       {
+         name: "idWard",
+         waitForIt: true,
+         params: {
+           cohortStorageKey: "cohort_ids",
+           segtax: <taxonomy_name>,           
+         }
+       }
+     ]
+   }
+ });
+ ```
+
+Please note that idWardRtdProvider should be integrated into the publisher website along with the [ID Ward Pixel](https://publishers-web.id-ward.com/pixel-integration).
+Please reach out to Id Ward representative(support@id-ward.com) if you have any questions or need further help to integrate Prebid, idWardRtdProvider, and Id Ward Pixel
+
+### Testing
+To view an example of available segments returned by Id Ward:
+```
+‘gulp serve --modules=rtdModule,idWardRtdProvider,pubmaticBidAdapter
+```
+and then point your browser at:
+"http://localhost:9999/integrationExamples/gpt/idward_segments_example.html"
diff --git a/modules/identityLinkIdSystem.js b/modules/identityLinkIdSystem.js
index c516c06d11a..df7b03b4e6e 100644
--- a/modules/identityLinkIdSystem.js
+++ b/modules/identityLinkIdSystem.js
@@ -6,8 +6,11 @@
  */
 
 import * as utils from '../src/utils.js'
-import {ajax} from '../src/ajax.js';
-import {submodule} from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import {getStorageManager} from '../src/storageManager.js';
+
+export const storage = getStorageManager();
 
 /** @type {Submodule} */
 export const identityLinkSubmodule = {
@@ -16,6 +19,11 @@ export const identityLinkSubmodule = {
    * @type {string}
    */
   name: 'identityLink',
+  /**
+   * used to specify vendor id
+   * @type {number}
+   */
+  gvlid: 97,
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -29,43 +37,49 @@ export const identityLinkSubmodule = {
    * performs action to obtain id and return a value in the callback's response argument
    * @function
    * @param {ConsentData} [consentData]
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @returns {IdResponse|undefined}
    */
-  getId(configParams, consentData) {
+  getId(config, consentData) {
+    const configParams = (config && config.params) || {};
     if (!configParams || typeof configParams.pid !== 'string') {
-      utils.logError('identityLink submodule requires partner id to be defined');
+      utils.logError('identityLink: requires partner id to be defined');
       return;
     }
     const hasGdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
     const gdprConsentString = hasGdpr ? consentData.consentString : '';
+    const tcfPolicyV2 = utils.deepAccess(consentData, 'vendorData.tcfPolicyVersion') === 2;
     // use protocol relative urls for http or https
-    const url = `https://api.rlcdn.com/api/identity/envelope?pid=${configParams.pid}${hasGdpr ? '&ct=1&cv=' + gdprConsentString : ''}`;
+    if (hasGdpr && (!gdprConsentString || gdprConsentString === '')) {
+      utils.logInfo('identityLink: Consent string is required to call envelope API.');
+      return;
+    }
+    const url = `https://api.rlcdn.com/api/identity/envelope?pid=${configParams.pid}${hasGdpr ? (tcfPolicyV2 ? '&ct=4&cv=' : '&ct=1&cv=') + gdprConsentString : ''}`;
     let resp;
-    resp = function(callback) {
+    resp = function (callback) {
       // Check ats during callback so it has a chance to initialise.
       // If ats library is available, use it to retrieve envelope. If not use standard third party endpoint
       if (window.ats) {
-        utils.logInfo('ATS exists!');
+        utils.logInfo('identityLink: ATS exists!');
         window.ats.retrieveEnvelope(function (envelope) {
           if (envelope) {
-            utils.logInfo('An envelope can be retrieved from ATS!');
+            utils.logInfo('identityLink: An envelope can be retrieved from ATS!');
+            setEnvelopeSource(true);
             callback(JSON.parse(envelope).envelope);
           } else {
-            getEnvelope(url, callback);
+            getEnvelope(url, callback, configParams);
           }
         });
       } else {
-        getEnvelope(url, callback);
+        getEnvelope(url, callback, configParams);
       }
     };
 
-    return {callback: resp};
+    return { callback: resp };
   }
 };
 // return envelope from third party endpoint
-function getEnvelope(url, callback) {
-  utils.logInfo('A 3P retrieval is attempted!');
+function getEnvelope(url, callback, configParams) {
   const callbacks = {
     success: response => {
       let responseObj;
@@ -79,11 +93,29 @@ function getEnvelope(url, callback) {
       callback((responseObj && responseObj.envelope) ? responseObj.envelope : '');
     },
     error: error => {
-      utils.logInfo(`identityLink: ID fetch encountered an error`, error);
+      utils.logInfo(`identityLink: identityLink: ID fetch encountered an error`, error);
       callback();
     }
   };
-  ajax(url, callbacks, undefined, {method: 'GET', withCredentials: true});
+
+  if (!configParams.notUse3P && !storage.getCookie('_lr_retry_request')) {
+    setRetryCookie();
+    utils.logInfo('identityLink: A 3P retrieval is attempted!');
+    setEnvelopeSource(false);
+    ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true });
+  }
+}
+
+function setRetryCookie() {
+  let now = new Date();
+  now.setTime(now.getTime() + 3600000);
+  storage.setCookie('_lr_retry_request', 'true', now.toUTCString());
+}
+
+function setEnvelopeSource(src) {
+  let now = new Date();
+  now.setTime(now.getTime() + 2592000000);
+  storage.setCookie('_lr_env_src_ats', src, now.toUTCString());
 }
 
 submodule('userId', identityLinkSubmodule);
diff --git a/modules/idxBidAdapter.js b/modules/idxBidAdapter.js
new file mode 100644
index 00000000000..48739275788
--- /dev/null
+++ b/modules/idxBidAdapter.js
@@ -0,0 +1,80 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { BANNER } from '../src/mediaTypes.js'
+import { isArray, isNumber } from '../src/utils.js'
+
+const BIDDER_CODE = 'idx'
+const ENDPOINT_URL = 'https://dev-event.dxmdp.com/rest/api/v1/bid'
+const SUPPORTED_MEDIA_TYPES = [ BANNER ]
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+  isBidRequestValid: function (bid) {
+    return isArray(bid.mediaTypes?.banner?.sizes) && bid.mediaTypes.banner.sizes.every(size => {
+      return isArray(size) && size.length === 2 && isNumber(size[0]) && isNumber(size[1])
+    })
+  },
+  buildRequests: function (bidRequests, bidderRequest) {
+    const payload = {
+      id: bidderRequest.bidderRequestId,
+      imp: bidRequests.map(request => {
+        const { bidId, sizes } = request
+
+        const item = {
+          id: bidId,
+        }
+
+        if (request.mediaTypes.banner) {
+          item.banner = {
+            format: (request.mediaTypes.banner.sizes || sizes).map(size => {
+              return { w: size[0], h: size[1] }
+            }),
+          }
+        }
+
+        return item
+      }),
+    }
+
+    const payloadString = JSON.stringify(payload)
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payloadString,
+      bidderRequest,
+      options: {
+        withCredentials: false,
+        contentType: 'application/json'
+      }
+    }
+  },
+  interpretResponse: function (serverResponse) {
+    const response = serverResponse.body
+
+    const bids = []
+
+    response.seatbid.forEach(seat => {
+      seat.bid.forEach(bid => {
+        bids.push({
+          requestId: bid.impid,
+          cpm: bid.price,
+          width: bid.w,
+          height: bid.h,
+          creativeId: bid.crid,
+          ad: bid.adm,
+          currency: 'USD',
+          netRevenue: true,
+          ttl: 300,
+          meta: {
+            advertiserDomains: bid.adomain || [],
+          },
+        })
+      })
+    })
+
+    return bids
+  },
+}
+
+registerBidder(spec)
diff --git a/modules/idxBidAdapter.md b/modules/idxBidAdapter.md
new file mode 100644
index 00000000000..4f0e35f2c24
--- /dev/null
+++ b/modules/idxBidAdapter.md
@@ -0,0 +1,28 @@
+# Overview
+
+```
+Module Name: IDX Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: dmitry@brainway.co.il
+```
+
+# Description
+
+Module that connects to the IDX solution.
+The IDX bidder need one mediaTypes parameter: banner
+
+# Test Parameters
+```
+    var adUnits = [{
+      code: 'your-slot-div-id', // This is your slot div id
+      mediaTypes: {
+          banner: {
+              sizes: [[300, 250]]
+          }
+      },
+      bids: [{
+          bidder: 'idx',
+          params: {}
+      }]
+    }]
+```
diff --git a/modules/idxIdSystem.js b/modules/idxIdSystem.js
new file mode 100644
index 00000000000..908edad4c04
--- /dev/null
+++ b/modules/idxIdSystem.js
@@ -0,0 +1,61 @@
+/**
+ * This module adds IDx to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/idxIdSystem
+ * @requires module:modules/userId
+ */
+import { isStr, isPlainObject, logError } from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const IDX_MODULE_NAME = 'idx';
+const IDX_COOKIE_NAME = '_idx';
+export const storage = getStorageManager();
+
+function readIDxFromCookie() {
+  return storage.cookiesAreEnabled ? storage.getCookie(IDX_COOKIE_NAME) : null;
+}
+
+function readIDxFromLocalStorage() {
+  return storage.localStorageIsEnabled ? storage.getDataFromLocalStorage(IDX_COOKIE_NAME) : null;
+}
+
+/** @type {Submodule} */
+export const idxIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: IDX_MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param { Object | string | undefined } value
+   * @return { Object | string | undefined }
+   */
+  decode(value) {
+    const idxVal = value ? isStr(value) ? value : isPlainObject(value) ? value.id : undefined : undefined;
+    return idxVal ? {
+      'idx': idxVal
+    } : undefined;
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} config
+   * @return {{id: string | undefined } | undefined}
+   */
+  getId() {
+    const idxString = readIDxFromLocalStorage() || readIDxFromCookie();
+    if (typeof idxString == 'string' && idxString) {
+      try {
+        const idxObj = JSON.parse(idxString);
+        return idxObj && idxObj.idx ? { id: idxObj.idx } : undefined;
+      } catch (error) {
+        logError(error);
+      }
+    }
+    return undefined;
+  }
+};
+submodule('userId', idxIdSubmodule);
diff --git a/modules/idxIdSystem.md b/modules/idxIdSystem.md
new file mode 100644
index 00000000000..363120899cb
--- /dev/null
+++ b/modules/idxIdSystem.md
@@ -0,0 +1,22 @@
+## IDx User ID Submodule
+
+For assistance setting up your module please contact us at [prebid@idx.lat](prebid@idx.lat).
+
+### Prebid Params
+
+Individual params may be set for the IDx Submodule.
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'idx',
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `userSync` Configuration Section
+The below parameters apply only to the IDx integration.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID of the module - `"idx"` | `"idx"` |
diff --git a/modules/imRtdProvider.js b/modules/imRtdProvider.js
new file mode 100644
index 00000000000..bc01896d062
--- /dev/null
+++ b/modules/imRtdProvider.js
@@ -0,0 +1,242 @@
+/**
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch real-time data from Intimate Merger
+ * @module modules/imRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import {getGlobal} from '../src/prebidGlobal.js'
+import {getStorageManager} from '../src/storageManager.js';
+import {
+  deepSetValue,
+  deepAccess,
+  timestamp,
+  mergeDeep,
+  logError,
+  logInfo,
+  isFn
+} from '../src/utils.js'
+import {submodule} from '../src/hook.js';
+
+export const imUidLocalName = '__im_uid';
+export const imVidCookieName = '_im_vid';
+export const imRtdLocalName = '__im_sids';
+export const storage = getStorageManager();
+const submoduleName = 'im';
+const segmentsMaxAge = 3600000; // 1 hour (30 * 60 * 1000)
+const uidMaxAge = 1800000; // 30 minites (30 * 60 * 1000)
+const vidMaxAge = 97200000000; // 37 months ((365 * 3 + 30) * 24 * 60 * 60 * 1000)
+
+function setImDataInCookie(value) {
+  storage.setCookie(
+    imVidCookieName,
+    value,
+    new Date(timestamp() + vidMaxAge).toUTCString(),
+    'none'
+  );
+}
+
+/**
+ * @param {Object} segments
+ * @param {Object} moduleConfig
+ */
+function getSegments(segments, moduleConfig) {
+  if (!segments) return;
+  const maxSegments = !Number.isNaN(moduleConfig.params.maxSegments) ? moduleConfig.params.maxSegments : 200;
+  return segments.slice(0, maxSegments);
+}
+
+/**
+* @param {string} bidderName
+*/
+export function getBidderFunction(bidderName) {
+  const biddersFunction = {
+    pubmatic: function (bid, data, moduleConfig) {
+      if (data.im_segments && data.im_segments.length) {
+        const segments = getSegments(data.im_segments, moduleConfig);
+        const dctr = deepAccess(bid, 'params.dctr');
+        deepSetValue(
+          bid,
+          'params.dctr',
+          `${dctr ? dctr + '|' : ''}im_segments=${segments.join(',')}`
+        );
+      }
+      return bid
+    },
+    fluct: function (bid, data, moduleConfig) {
+      if (data.im_segments && data.im_segments.length) {
+        const segments = getSegments(data.im_segments, moduleConfig);
+        deepSetValue(
+          bid,
+          'params.kv.imsids',
+          segments
+        );
+      }
+      return bid
+    }
+  }
+  return biddersFunction[bidderName] || null;
+}
+
+export function getCustomBidderFunction(config, bidder) {
+  const overwriteFn = deepAccess(config, `params.overwrites.${bidder}`)
+
+  if (overwriteFn && isFn(overwriteFn)) {
+    return overwriteFn
+  } else {
+    return null
+  }
+}
+
+/**
+ * Add real-time data.
+ * @param {Object} bidConfig
+ * @param {Object} moduleConfig
+ * @param {Object} data
+ */
+export function setRealTimeData(bidConfig, moduleConfig, data) {
+  const adUnits = bidConfig.adUnits || getGlobal().adUnits;
+  const utils = {deepSetValue, deepAccess, logInfo, logError, mergeDeep};
+
+  if (data.im_segments) {
+    const segments = getSegments(data.im_segments, moduleConfig);
+    const ortb2 = bidConfig.ortb2Fragments?.global || {};
+    deepSetValue(ortb2, 'user.ext.data.im_segments', segments);
+
+    if (moduleConfig.params.setGptKeyValues || !moduleConfig.params.hasOwnProperty('setGptKeyValues')) {
+      window.googletag = window.googletag || {cmd: []};
+      window.googletag.cmd = window.googletag.cmd || [];
+      window.googletag.cmd.push(() => {
+        window.googletag.pubads().setTargeting('im_segments', segments);
+      });
+    }
+  }
+
+  adUnits.forEach(adUnit => {
+    adUnit.bids.forEach(bid => {
+      const bidderFunction = getBidderFunction(bid.bidder);
+      const overwriteFunction = getCustomBidderFunction(moduleConfig, bid.bidder);
+      if (overwriteFunction) {
+        overwriteFunction(bid, data, utils, config);
+      } else if (bidderFunction) {
+        bidderFunction(bid, data, moduleConfig);
+      }
+    })
+  });
+}
+
+/**
+ * Real-time data retrieval from Intimate Merger
+ * @param {Object} reqBidsConfigObj
+ * @param {function} onDone
+ * @param {Object} moduleConfig
+ */
+export function getRealTimeData(reqBidsConfigObj, onDone, moduleConfig) {
+  const cid = deepAccess(moduleConfig, 'params.cid');
+  if (!cid) {
+    logError('imRtdProvider requires a valid cid to be defined');
+    onDone();
+    return;
+  }
+  const sids = storage.getDataFromLocalStorage(imRtdLocalName);
+  const parsedSids = sids ? sids.split(',') : [];
+  const mt = storage.getDataFromLocalStorage(`${imRtdLocalName}_mt`);
+  const localVid = storage.getCookie(imVidCookieName);
+  let apiUrl = `https://sync6.im-apps.net/${cid}/rtd`;
+  let expired = true;
+  let alreadyDone = false;
+
+  if (localVid) {
+    apiUrl += `?vid=${localVid}`;
+    setImDataInCookie(localVid);
+  }
+
+  if (Date.parse(mt) && Date.now() - (new Date(mt)).getTime() < segmentsMaxAge) {
+    expired = false;
+  }
+
+  if (sids !== null) {
+    setRealTimeData(reqBidsConfigObj, moduleConfig, {im_segments: parsedSids});
+    onDone();
+    alreadyDone = true;
+  }
+
+  if (expired) {
+    ajax(
+      apiUrl,
+      getApiCallback(reqBidsConfigObj, alreadyDone ? undefined : onDone, moduleConfig),
+      undefined,
+      {method: 'GET', withCredentials: true}
+    );
+  }
+}
+
+/**
+ * Api callback from Intimate Merger
+ * @param {Object} reqBidsConfigObj
+ * @param {function} onDone
+ * @param {Object} moduleConfig
+ */
+export function getApiCallback(reqBidsConfigObj, onDone, moduleConfig) {
+  return {
+    success: function (response, req) {
+      let parsedResponse = {};
+      if (req.status === 200) {
+        try {
+          parsedResponse = JSON.parse(response);
+        } catch (e) {
+          logError('unable to get Intimate Merger segment data');
+        }
+
+        if (parsedResponse.uid) {
+          const imuid = storage.getDataFromLocalStorage(imUidLocalName);
+          const imuidMt = storage.getDataFromLocalStorage(`${imUidLocalName}_mt`);
+          const imuidExpired = Date.parse(imuidMt) && Date.now() - (new Date(imuidMt)).getTime() < uidMaxAge;
+          if (!imuid || imuidExpired) {
+            storage.setDataInLocalStorage(imUidLocalName, parsedResponse.uid);
+            storage.setDataInLocalStorage(`${imUidLocalName}_mt`, new Date(timestamp()).toUTCString());
+          }
+        }
+
+        if (parsedResponse.vid) {
+          setImDataInCookie(parsedResponse.vid);
+        }
+
+        if (parsedResponse.segments) {
+          setRealTimeData(reqBidsConfigObj, moduleConfig, {im_segments: parsedResponse.segments});
+          storage.setDataInLocalStorage(imRtdLocalName, parsedResponse.segments);
+          storage.setDataInLocalStorage(`${imRtdLocalName}_mt`, new Date(timestamp()).toUTCString());
+        }
+      }
+      if (onDone) {
+        onDone();
+      }
+    },
+    error: function () {
+      if (onDone) {
+        onDone();
+      }
+      logError('unable to get Intimate Merger segment data');
+    }
+  }
+}
+
+/**
+ * Module init
+ * @param {Object} provider
+ * @param {Object} userConsent
+ * @return {boolean}
+ */
+function init(provider, userConsent) {
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const imRtdSubmodule = {
+  name: submoduleName,
+  getBidRequestData: getRealTimeData,
+  init: init
+};
+
+submodule('realTimeData', imRtdSubmodule);
diff --git a/modules/imRtdProvider.md b/modules/imRtdProvider.md
new file mode 100644
index 00000000000..8f31d3eb545
--- /dev/null
+++ b/modules/imRtdProvider.md
@@ -0,0 +1,43 @@
+## Intimate Merger Real-time Data Submodule
+
+provided by Intimate Merger.
+
+## Building Prebid with Real-time Data Support
+
+First, make sure to add the Intimate Merger submodule to your Prebid.js package with:
+
+`gulp build --modules=rtdModule,imRtdProvider`
+
+The following configuration parameters are available:
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 5000,
+        dataProviders: [
+            {
+                name: "im",
+                waitForIt: true,
+                params: {
+                    cid: 5126, // Set your Intimate Merger Customer ID here for production
+                    setGptKeyValues: true,
+                    maxSegments: 200 // maximum number is 200
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Parameter Descriptions for the im Configuration Section
+
+| Param under dataProviders | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module. | `"im"` |
+| waitForIt | Optional | Boolean | Required to ensure that the auction is delayed until prefetch is complete. Defaults to false but recommended to true | `true` |
+| params | Required | Object | Details of module params. | |
+| params.cid | Required | Number | This is the Customer ID value obtained via Intimate Merger. | `5126` |
+| params.setGptKeyValues | Optional | Boolean | This is set targeting for GPT/GAM. Default setting is true. | `true` |
+| params.maxSegments | Optional | Number | This is set maximum number of rtd segments at once. Default setting is 200. | `200` |
diff --git a/modules/imonomyBidAdapter.js b/modules/imonomyBidAdapter.js
deleted file mode 100644
index b9205943f65..00000000000
--- a/modules/imonomyBidAdapter.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'imonomy';
-const ENDPOINT = 'https://b.imonomy.com/openrtb/hb/00000';
-const USYNCURL = 'https://b.imonomy.com/UserMatching/b/';
-
-export const spec = {
-  code: BIDDER_CODE,
-
-  /**
-  * Determines whether or not the given bid request is valid. Valid bid request must have placementId and hbid
-  *
-  * @param {BidRequest} bid The bid params to validate.
-  * @return {boolean} True if this is a valid bid, and false otherwise.
-  */
-  isBidRequestValid: bid => {
-    return !!(bid && bid.params && bid.params.placementId && bid.params.hbid);
-  },
-  /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param {BidRequest[]} validBidRequests an array of bids
-  * @return ServerRequest Info describing the request to the server.
-  */
-  buildRequests: validBidRequests => {
-    const tags = validBidRequests.map(bid => {
-      // map each bid id to bid object to retrieve adUnit code in callback
-      let tag = {
-        uuid: bid.bidId,
-        sizes: bid.sizes,
-        trid: bid.transactionId,
-        hbid: bid.params.hbid,
-        placementid: bid.params.placementId
-      };
-
-      // add floor price if specified (not mandatory)
-      if (bid.params.floorPrice) {
-        tag.floorprice = bid.params.floorPrice;
-      }
-
-      return tag;
-    });
-
-    // Imonomy server config
-    const time = new Date().getTime();
-    const kbConf = {
-      ts_as: time,
-      hb_placements: [],
-      hb_placement_bidids: {},
-      hb_floors: {},
-      cb: _generateCb(time),
-      tz: new Date().getTimezoneOffset(),
-    };
-
-    validBidRequests.forEach(bid => {
-      kbConf.hdbdid = kbConf.hdbdid || bid.params.hbid;
-      kbConf.encode_bid = kbConf.encode_bid || bid.params.encode_bid;
-      kbConf.hb_placement_bidids[bid.params.placementId] = bid.bidId;
-      if (bid.params.floorPrice) {
-        kbConf.hb_floors[bid.params.placementId] = bid.params.floorPrice;
-      }
-      kbConf.hb_placements.push(bid.params.placementId);
-    });
-
-    let payload = {};
-    if (!utils.isEmpty(tags)) {
-      payload = { bids: [...tags], kbConf };
-    }
-
-    let endpointToUse = ENDPOINT;
-    if (kbConf.hdbdid) {
-      endpointToUse = endpointToUse.replace('00000', kbConf.hdbdid);
-    }
-
-    return {
-      method: 'POST',
-      url: endpointToUse,
-      data: JSON.stringify(payload)
-    };
-  },
-  /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {*} response A successful response from the server.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  */
-  interpretResponse: (response) => {
-    const bidResponses = [];
-    if (response && response.body && response.body.bids) {
-      response.body.bids.forEach(bid => {
-        // The bid ID. Used to tie this bid back to the request.
-        if (bid.uuid) {
-          bid.requestId = bid.uuid;
-        } else {
-          utils.logError('No uuid for bid');
-        }
-        // The creative payload of the returned bid.
-        if (bid.creative) {
-          bid.ad = bid.creative;
-        } else {
-          utils.logError('No creative for bid');
-        }
-        bidResponses.push(bid);
-      });
-    }
-    return bidResponses;
-  },
-  /**
-  * Register User Sync.
-  */
-  getUserSyncs: syncOptions => {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: USYNCURL
-      }];
-    }
-  }
-};
-
-/**
-* Generated cache baster value to be sent to bid server
-* @param {*} time current time to use for creating cb.
-*/
-function _generateCb(time) {
-  return Math.floor((time % 65536) + (Math.floor(Math.random() * 65536) * 65536));
-}
-
-registerBidder(spec);
diff --git a/modules/imonomyBidAdapter.md b/modules/imonomyBidAdapter.md
deleted file mode 100644
index 451eb0994d8..00000000000
--- a/modules/imonomyBidAdapter.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Overview
-
-**Module Name**: Imonomy Bidder Adapter  
-**Module Type**: Bidder Adapter  
-**Maintainer**: support@imonomy.com  
-
-# Description
-
-Connects to Imonomy demand source to fetch bids.  
-
-# Test Parameters
-```
-    var adUnits = [{
-        code: 'banner-ad-div',
-        sizes: [[300, 250]],
-
-        // Replace this object to test a new Adapter!
-        bids: [{
-          bidder: 'imonomy',
-          params: {
-            placementId: 'e69148e0ba6c4c07977dc2daae5e1577',
-			hbid: '14567718624',
-			floorPrice: 0.5
-          }
-        }]
-    }];
-```
-
-
diff --git a/modules/impactifyBidAdapter.js b/modules/impactifyBidAdapter.js
new file mode 100644
index 00000000000..04f34bdc7d9
--- /dev/null
+++ b/modules/impactifyBidAdapter.js
@@ -0,0 +1,301 @@
+import { deepAccess, deepSetValue, generateUUID } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { ajax } from '../src/ajax.js';
+import { createEidsArray } from './userId/eids.js';
+
+const BIDDER_CODE = 'impactify';
+const BIDDER_ALIAS = ['imp'];
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_VIDEO_WIDTH = 640;
+const DEFAULT_VIDEO_HEIGHT = 360;
+const ORIGIN = 'https://sonic.impactify.media';
+const LOGGER_URI = 'https://logger.impactify.media';
+const AUCTIONURI = '/bidder';
+const COOKIESYNCURI = '/static/cookie_sync.html';
+const GVLID = 606;
+const GETCONFIG = config.getConfig;
+
+const getDeviceType = () => {
+  // OpenRTB Device type
+  if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(navigator.userAgent.toLowerCase()))) {
+    return 5;
+  }
+  if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(navigator.userAgent.toLowerCase()))) {
+    return 4;
+  }
+  return 2;
+};
+
+const getFloor = (bid) => {
+  const floorInfo = bid.getFloor({
+    currency: DEFAULT_CURRENCY,
+    mediaType: '*',
+    size: '*'
+  });
+  if (typeof floorInfo === 'object' && floorInfo.currency === DEFAULT_CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
+    return parseFloat(floorInfo.floor);
+  }
+  return null;
+}
+
+const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
+  // Create request and set imp bids inside
+  let request = {
+    id: bidderRequest.auctionId,
+    validBidRequests,
+    cur: [DEFAULT_CURRENCY],
+    imp: [],
+    source: {tid: bidderRequest.auctionId}
+  };
+
+  // Get the url parameters
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+  const checkPrebid = urlParams.get('_checkPrebid');
+  // Force impactify debugging parameter
+  if (checkPrebid != null) {
+    request.test = Number(checkPrebid);
+  }
+
+  // Set Schain in request
+  let schain = deepAccess(validBidRequests, '0.schain');
+  if (schain) request.source.ext = { schain: schain };
+
+  // Set eids
+  let bidUserId = deepAccess(validBidRequests, '0.userId');
+  let eids = createEidsArray(bidUserId);
+  if (eids.length) {
+    deepSetValue(request, 'user.ext.eids', eids);
+  }
+
+  // Set device/user/site
+  if (!request.device) request.device = {};
+  if (!request.site) request.site = {};
+  request.device = {
+    w: window.innerWidth,
+    h: window.innerHeight,
+    devicetype: getDeviceType(),
+    ua: navigator.userAgent,
+    js: 1,
+    dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+    language: ((navigator.language || navigator.userLanguage || '').split('-'))[0] || 'en',
+  };
+  request.site = {page: bidderRequest.refererInfo.page};
+
+  // Handle privacy settings for GDPR/CCPA/COPPA
+  let gdprApplies = 0;
+  if (bidderRequest.gdprConsent) {
+    if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') gdprApplies = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+    deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+  }
+  deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
+
+  if (bidderRequest.uspConsent) {
+    deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    this.syncStore.uspConsent = bidderRequest.uspConsent;
+  }
+
+  if (GETCONFIG('coppa') == true) deepSetValue(request, 'regs.coppa', 1);
+
+  if (bidderRequest.uspConsent) {
+    deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+
+  // Set buyer uid
+  deepSetValue(request, 'user.buyeruid', generateUUID());
+
+  // Create imps with bids
+  validBidRequests.forEach((bid) => {
+    let imp = {
+      id: bid.bidId,
+      bidfloor: bid.params.bidfloor ? bid.params.bidfloor : 0,
+      ext: {
+        impactify: {
+          appId: bid.params.appId,
+          format: bid.params.format,
+          style: bid.params.style
+        },
+      },
+      video: {
+        playerSize: [DEFAULT_VIDEO_WIDTH, DEFAULT_VIDEO_HEIGHT],
+        context: 'outstream',
+        mimes: ['video/mp4'],
+      },
+    };
+    if (bid.params.container) {
+      imp.ext.impactify.container = bid.params.container;
+    }
+    if (typeof bid.getFloor === 'function') {
+      const floor = getFloor(bid);
+      if (floor) {
+        imp.bidfloor = floor;
+      }
+    }
+    request.imp.push(imp);
+  });
+
+  return request;
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: ['video', 'banner'],
+  aliases: BIDDER_ALIAS,
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    if (!bid.params.appId || typeof bid.params.appId != 'string' || !bid.params.format || typeof bid.params.format != 'string' || !bid.params.style || typeof bid.params.style != 'string') {
+      return false;
+    }
+    if (bid.params.format != 'screen' && bid.params.format != 'display') {
+      return false;
+    }
+    if (bid.params.style != 'inline' && bid.params.style != 'impact' && bid.params.style != 'static') {
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @param {bidderRequest} - the bidding request
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    // Create a clean openRTB request
+    let request = createOpenRtbRequest(validBidRequests, bidderRequest);
+
+    return {
+      method: 'POST',
+      url: ORIGIN + AUCTIONURI,
+      data: JSON.stringify(request),
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const serverBody = serverResponse.body;
+    let bidResponses = [];
+
+    if (!serverBody) {
+      return bidResponses;
+    }
+
+    if (!serverBody.seatbid || !serverBody.seatbid.length) {
+      return [];
+    }
+
+    serverBody.seatbid.forEach((seatbid) => {
+      if (seatbid.bid.length) {
+        bidResponses = [
+          ...bidResponses,
+          ...seatbid.bid
+            .filter((bid) => bid.price > 0)
+            .map((bid) => ({
+              id: bid.id,
+              requestId: bid.impid,
+              cpm: bid.price,
+              currency: serverBody.cur,
+              netRevenue: true,
+              ad: bid.adm,
+              width: bid.w || 0,
+              height: bid.h || 0,
+              ttl: 300,
+              creativeId: bid.crid || 0,
+              hash: bid.hash,
+              expiry: bid.expiry,
+              meta: {
+                advertiserDomains: bid.adomain && bid.adomain.length ? bid.adomain : []
+              }
+            })),
+        ];
+      }
+    });
+
+    return bidResponses;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function (
+    syncOptions,
+    serverResponses,
+    gdprConsent,
+    uspConsent
+  ) {
+    if (!serverResponses || serverResponses.length === 0) {
+      return [];
+    }
+
+    if (!syncOptions.iframeEnabled) {
+      return [];
+    }
+
+    let params = '';
+    if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        params += `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        params += `?gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    if (uspConsent) {
+      params += `${params ? '&' : '?'}us_privacy=${encodeURIComponent(uspConsent)}`;
+    }
+
+    if (document.location.search.match(/pbs_debug=true/)) params += `&pbs_debug=true`;
+
+    return [{
+      type: 'iframe',
+      url: ORIGIN + COOKIESYNCURI + params
+    }];
+  },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+  */
+  onBidWon: function(bid) {
+    ajax(`${LOGGER_URI}/log/bidder/won`, null, JSON.stringify(bid), {
+      method: 'POST',
+      contentType: 'application/json'
+    });
+
+    return true;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+  */
+  onTimeout: function(data) {
+    ajax(`${LOGGER_URI}/log/bidder/timeout`, null, JSON.stringify(data[0]), {
+      method: 'POST',
+      contentType: 'application/json'
+    });
+
+    return true;
+  }
+};
+registerBidder(spec);
diff --git a/modules/impactifyBidAdapter.md b/modules/impactifyBidAdapter.md
new file mode 100644
index 00000000000..3de9a8cfb84
--- /dev/null
+++ b/modules/impactifyBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Impactify Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: thomas.destefano@impactify.io
+```
+
+# Description
+
+Module that connects to the Impactify solution.
+The impactify bidder need 3 parameters:
+    - appId : This is your unique publisher identifier
+    - format : This is the ad format needed, can be : screen or display
+    - style : This is the ad style needed, can be : inline, impact or static
+
+# Test Parameters
+```
+    var adUnits = [{
+      code: 'your-slot-div-id', // This is your slot div id
+      mediaTypes: {
+          video: {
+              context: 'outstream'
+          }
+      },
+      bids: [{
+          bidder: 'impactify',
+          params: {
+              appId: 'example.com',
+              format: 'screen',
+              style: 'inline'
+          }
+      }]
+    }];
+```
diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index 3c000258ede..94f50094a91 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -1,18 +1,35 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import {deepAccess, deepSetValue, getBidIdParameter, getUniqueIdentifierStr, logWarn, mergeDeep} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+import {loadExternalScript} from '../src/adloader.js';
 
 const BIDDER_CODE = 'improvedigital';
-const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+const CREATIVE_TTL = 300;
+
+const AD_SERVER_BASE_URL = 'https://ad.360yield.com';
+const BASIC_ADS_BASE_URL = 'https://ad.360yield-basic.com';
+const PB_ENDPOINT = 'pb';
+const EXTEND_URL = 'https://pbs.360yield.com/openrtb2/auction';
+const IFRAME_SYNC_URL = 'https://hb.360yield.com/prebid-universal-creative/load-cookie.html';
+
+const VIDEO_PARAMS = {
+  DEFAULT_MIMES: ['video/mp4'],
+  PLACEMENT_TYPE: {
+    INSTREAM: 1,
+    OUTSTREAM: 3,
+  }
+};
 
 export const spec = {
-  version: '7.1.0',
   code: BIDDER_CODE,
   gvlid: 253,
   aliases: ['id'],
   supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  syncStore: { extendMode: false, placementId: null },
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -20,7 +37,7 @@ export const spec = {
    * @param {object} bid The bid to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
    */
-  isBidRequestValid: function (bid) {
+  isBidRequestValid(bid) {
     return !!(bid && bid.params && (bid.params.placementId || (bid.params.placementKey && bid.params.publisherId)));
   },
 
@@ -28,130 +45,24 @@ export const spec = {
    * Make a server request from the list of BidRequests.
    *
    * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @param bidderRequest
    * @return ServerRequest Info describing the request to the server.
    */
-  buildRequests: function (bidRequests, bidderRequest) {
-    let normalizedBids = bidRequests.map((bidRequest) => {
-      return getNormalizedBidRequest(bidRequest);
-    });
-
-    let idClient = new ImproveDigitalAdServerJSClient('hb');
-    let requestParameters = {
-      singleRequestMode: (config.getConfig('improvedigital.singleRequest') === true),
-      returnObjType: idClient.CONSTANTS.RETURN_OBJ_TYPE.URL_PARAMS_SPLIT,
-      libVersion: this.version
-    };
-
-    if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) {
-      requestParameters.gdpr = bidderRequest.gdprConsent.consentString;
-    }
-
-    if (bidderRequest && bidderRequest.uspConsent) {
-      requestParameters.usPrivacy = bidderRequest.uspConsent;
-    }
-
-    if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-      requestParameters.referrer = bidderRequest.refererInfo.referer;
-    }
-
-    requestParameters.schain = bidRequests[0].schain;
-
-    let requestObj = idClient.createRequest(
-      normalizedBids, // requestObject
-      requestParameters
-    );
-
-    if (requestObj.errors && requestObj.errors.length > 0) {
-      utils.logError('ID WARNING 0x01');
-    }
-    requestObj.requests.forEach(request => request.bidderRequest = bidderRequest);
-    return requestObj.requests;
+  buildRequests(bidRequests, bidderRequest) {
+    // Save a placement id to send it to the ad server when fetching the user syncs
+    this.syncStore.placementId = this.syncStore.placementId || bidRequests[0].params.placementId;
+    return ID_REQUEST.buildServerRequests(bidRequests, bidderRequest);
   },
 
   /**
    * Unpack the response from the server into a list of bids.
    *
    * @param {*} serverResponse A successful response from the server.
+   * @param bidderRequest
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
-  interpretResponse: function (serverResponse, {bidderRequest}) {
-    const bids = [];
-    utils._each(serverResponse.body.bid, function (bidObject) {
-      if (!bidObject.price || bidObject.price === null ||
-        bidObject.hasOwnProperty('errorCode') ||
-        (!bidObject.adm && !bidObject.native)) {
-        return;
-      }
-      const bidRequest = utils.getBidRequest(bidObject.id, [bidderRequest]);
-      const bid = {};
-
-      if (bidObject.native) {
-        // Native
-        bid.native = getNormalizedNativeAd(bidObject.native);
-        // Expose raw oRTB response to the client to allow parsing assets not directly supported by Prebid
-        bid.ortbNative = bidObject.native;
-        if (bidObject.nurl) {
-          bid.native.impressionTrackers.unshift(bidObject.nurl);
-        }
-        bid.mediaType = NATIVE;
-      } else if (bidObject.ad_type && bidObject.ad_type === 'video') {
-        bid.vastXml = bidObject.adm;
-        bid.mediaType = VIDEO;
-        if (isOutstreamVideo(bidRequest)) {
-          bid.adResponse = {
-            content: bid.vastXml,
-            height: bidObject.h,
-            width: bidObject.w
-          };
-          bid.renderer = createRenderer(bidRequest);
-        }
-      } else {
-        // Banner
-        let nurl = '';
-        if (bidObject.nurl && bidObject.nurl.length > 0) {
-          nurl = `<img src="${bidObject.nurl}" width="0" height="0" style="display:none">`;
-        }
-        bid.ad = `${nurl}<script>${bidObject.adm}</script>`;
-        bid.mediaType = BANNER;
-      }
-
-      // Common properties
-      bid.adId = bidObject.id;
-      bid.cpm = parseFloat(bidObject.price);
-      bid.creativeId = bidObject.crid;
-      bid.currency = bidObject.currency ? bidObject.currency.toUpperCase() : 'USD';
-
-      // Deal ID. Composite ads can have multiple line items and the ID of the first
-      // dealID line item will be used.
-      if (utils.isNumber(bidObject.lid) && bidObject.buying_type && bidObject.buying_type !== 'rtb') {
-        bid.dealId = bidObject.lid;
-      } else if (Array.isArray(bidObject.lid) &&
-        Array.isArray(bidObject.buying_type) &&
-        bidObject.lid.length === bidObject.buying_type.length) {
-        let isDeal = false;
-        bidObject.buying_type.forEach((bt, i) => {
-          if (isDeal) return;
-          if (bt && bt !== 'rtb') {
-            isDeal = true;
-            bid.dealId = bidObject.lid[i];
-          }
-        });
-      }
-
-      bid.height = bidObject.h;
-      bid.netRevenue = bidObject.isNet ? bidObject.isNet : false;
-      bid.requestId = bidObject.id;
-      bid.ttl = 300;
-      bid.width = bidObject.w;
-
-      if (!bid.width || !bid.height) {
-        bid.width = 1;
-        bid.height = 1;
-      }
-
-      bids.push(bid);
-    });
-    return bids;
+  interpretResponse(serverResponse, { ortbRequest }) {
+    return CONVERTER.fromORTB({request: ortbRequest, response: serverResponse.body}).bids;
   },
 
   /**
@@ -161,483 +72,350 @@ export const spec = {
    * @param {ServerResponse[]} serverResponses List of server's responses.
    * @return {UserSync[]} The user syncs which should be dropped.
    */
-  getUserSyncs: function(syncOptions, serverResponses) {
-    if (syncOptions.pixelEnabled) {
-      const syncs = [];
+  getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    if (config.getConfig('coppa') === true || !hasPurpose1Consent(gdprConsent)) {
+      return [];
+    }
+
+    const syncs = [];
+    if ((this.syncStore.extendMode || !syncOptions.pixelEnabled) && syncOptions.iframeEnabled) {
+      const { gdprApplies, consentString } = gdprConsent || {};
+      const bidders = new Set();
+      if (this.syncStore.extendMode && serverResponses) {
+        serverResponses.forEach(response => {
+          if (!response?.body?.ext?.responsetimemillis) return;
+          Object.keys(response.body.ext.responsetimemillis).forEach(b => bidders.add(b))
+        })
+      }
+      syncs.push({
+        type: 'iframe',
+        url: IFRAME_SYNC_URL +
+          `?placement_id=${this.syncStore.placementId}` +
+          (this.syncStore.extendMode ? '&pbs=1' : '') +
+          (typeof gdprApplies === 'boolean' ? `&gdpr=${Number(gdprApplies)}` : '') +
+          (consentString ? `&gdpr_consent=${consentString}` : '') +
+          (uspConsent ? `&us_privacy=${encodeURIComponent(uspConsent)}` : '') +
+          (bidders.size ? `&bidders=${[...bidders].join(',')}` : '')
+      });
+    } else if (syncOptions.pixelEnabled) {
       serverResponses.forEach(response => {
-        response.body.bid.forEach(bidObject => {
-          if (utils.isArray(bidObject.sync)) {
-            bidObject.sync.forEach(syncElement => {
-              if (syncs.indexOf(syncElement) === -1) {
-                syncs.push(syncElement);
-              }
-            });
+        const syncArr = deepAccess(response, `body.ext.${BIDDER_CODE}.sync`, []);
+        syncArr.forEach(url => {
+          if (!syncs.some(sync => sync.url === url)) {
+            syncs.push({ type: 'image', url });
           }
         });
       });
-      return syncs.map(sync => ({ type: 'image', url: sync }));
     }
-    return [];
+
+    return syncs;
   }
 };
 
-function isInstreamVideo(bid) {
-  const mediaTypes = Object.keys(utils.deepAccess(bid, 'mediaTypes', {}));
-  const videoMediaType = utils.deepAccess(bid, 'mediaTypes.video');
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
-  return bid.mediaType === 'video' || (mediaTypes.length === 1 && videoMediaType && context !== 'outstream');
-}
-
-function isOutstreamVideo(bid) {
-  const videoMediaType = utils.deepAccess(bid, 'mediaTypes.video');
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
-  return videoMediaType && context === 'outstream';
-}
-
-function outstreamRender(bid) {
-  bid.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      sizes: [bid.width, bid.height],
-      targetId: bid.adUnitCode,
-      adResponse: bid.adResponse,
-      rendererOptions: bid.renderer.getConfig()
-    }, handleOutstreamRendererEvents.bind(null, bid));
-  });
-}
-
-function handleOutstreamRendererEvents(bid, id, eventName) {
-  bid.renderer.handleVideoEvent({ id, eventName });
-}
-
-function createRenderer(bidRequest) {
-  const renderer = Renderer.install({
-    id: bidRequest.adUnitCode,
-    url: RENDERER_URL,
-    loaded: false,
-    config: utils.deepAccess(bidRequest, 'renderer.options'),
-    adUnitCode: bidRequest.adUnitCode
-  });
-  try {
-    renderer.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-  return renderer;
-}
-
-function getNormalizedBidRequest(bid) {
-  let adUnitId = utils.getBidIdParameter('adUnitCode', bid) || null;
-  let placementId = utils.getBidIdParameter('placementId', bid.params) || null;
-  let publisherId = null;
-  let placementKey = null;
-
-  if (placementId === null) {
-    publisherId = utils.getBidIdParameter('publisherId', bid.params) || null;
-    placementKey = utils.getBidIdParameter('placementKey', bid.params) || null;
-  }
-  const keyValues = utils.getBidIdParameter('keyValues', bid.params) || null;
-  const singleSizeFilter = utils.getBidIdParameter('size', bid.params) || null;
-  const bidId = utils.getBidIdParameter('bidId', bid);
-  const transactionId = utils.getBidIdParameter('transactionId', bid);
-  const currency = config.getConfig('currency.adServerCurrency');
-  const bidFloor = utils.getBidIdParameter('bidFloor', bid.params);
-  const bidFloorCur = utils.getBidIdParameter('bidFloorCur', bid.params);
-
-  let normalizedBidRequest = {};
-  if (isInstreamVideo(bid)) {
-    normalizedBidRequest.adTypes = [ VIDEO ];
-  }
-  if (placementId) {
-    normalizedBidRequest.placementId = placementId;
-  } else {
-    if (publisherId) {
-      normalizedBidRequest.publisherId = publisherId;
+registerBidder(spec);
+
+export const CONVERTER = ortbConverter({
+  context: {
+    ttl: CREATIVE_TTL,
+    nativeRequest: {
+      eventtrackers: [
+        {event: 1, methods: [1, 2]},
+      ]
     }
-    if (placementKey) {
-      normalizedBidRequest.placementKey = placementKey;
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    imp.secure = Number(window.location.protocol === 'https:');
+    if (!imp.bidfloor && bidRequest.params.bidFloor) {
+      imp.bidfloor = bidRequest.params.bidFloor;
+      imp.bidfloorcur = getBidIdParameter('bidFloorCur', bidRequest.params).toUpperCase() || 'USD'
+    }
+    const bidderParamsPath = context.extendMode ? 'ext.prebid.bidder.improvedigital' : 'ext.bidder';
+    const placementId = bidRequest.params.placementId;
+    if (placementId) {
+      deepSetValue(imp, `${bidderParamsPath}.placementId`, placementId);
+      if (context.extendMode) {
+        deepSetValue(imp, 'ext.prebid.storedrequest.id', '' + placementId);
+      }
+    } else {
+      deepSetValue(imp, `${bidderParamsPath}.publisherId`, getBidIdParameter('publisherId', bidRequest.params));
+      deepSetValue(imp, `${bidderParamsPath}.placementKey`, getBidIdParameter('placementKey', bidRequest.params));
     }
-  }
+    deepSetValue(imp, `${bidderParamsPath}.keyValues`, getBidIdParameter('keyValues', bidRequest.params) || undefined);
 
-  if (keyValues) {
-    normalizedBidRequest.keyValues = keyValues;
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    mergeDeep(request, {
+      id: getUniqueIdentifierStr(),
+      source: {
+        // TODO: once https://github.com/prebid/Prebid.js/issues/8573 is resolved, this should be handled by the base ortbConverter logic
+        tid: context.bidRequests[0].transactionId,
+      },
+      ext: {
+        improvedigital: {
+          sdk: {
+            name: 'pbjs',
+            version: '$prebid.version$',
+          }
+        }
+      },
+    });
+    return request;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    if (!bid.adm || !bid.price || bid.hasOwnProperty('errorCode')) {
+      return;
+    }
+    const {bidRequest} = context;
+    context.mediaType = (() => {
+      const requestMediaTypes = Object.keys(bidRequest.mediaTypes);
+      if (requestMediaTypes.length === 1) return requestMediaTypes[0];
+      // Detect media type for multi-format response
+      if (bid.adm.search(/^(<\?xml|<vast)/i) !== -1) {
+        return VIDEO;
+      } else if (bid.adm[0] === '{') {
+        return NATIVE;
+      } else {
+        return BANNER;
+      }
+    })();
+    const bidResponse = buildBidResponse(bid, context);
+    const idExt = deepAccess(bid, `ext.${BIDDER_CODE}`, {});
+    Object.assign(bidResponse, {
+      dealId: (typeof idExt.buying_type === 'string' && idExt.buying_type !== 'rtb') ? idExt.line_item_id : undefined,
+      netRevenue: idExt.is_net || false,
+    })
+    if (bidResponse.mediaType === VIDEO && ID_REQUEST.isOutstreamVideo(bidRequest)) {
+      Object.assign(bidResponse, {
+        adResponse: { content: bidResponse.vastXml },
+        renderer: ID_OUTSTREAM.createRenderer(bidRequest)
+      })
+    }
+    ID_RAZR.forwardBid({bidRequest, bid: bidResponse});
+    return bidResponse;
+  },
+  overrides: {
+    imp: {
+      banner(fillImpBanner, imp, bidRequest, context) {
+        // override to disregard banner.sizes if usePrebidSizes is not set
+        if (!bidRequest.mediaTypes[BANNER]) return;
+        if (config.getConfig('improvedigital.usePrebidSizes') !== true) {
+          const banner = Object.assign({}, bidRequest.mediaTypes[BANNER], {sizes: null});
+          bidRequest = {...bidRequest, mediaTypes: {[BANNER]: banner}}
+        }
+        fillImpBanner(imp, bidRequest, context);
+      },
+      video(fillImpVideo, imp, bidRequest, context) {
+        // override to use video params from both mediaTypes.video and bidRequest.params.video
+        if (!bidRequest.mediaTypes[VIDEO]) return;
+        const video = Object.assign(
+          {mimes: VIDEO_PARAMS.DEFAULT_MIMES},
+          bidRequest.mediaTypes[VIDEO],
+          bidRequest.params?.video
+        )
+        fillImpVideo(
+          imp,
+          {...bidRequest, mediaTypes: {[VIDEO]: video}},
+          context
+        );
+        deepSetValue(imp, 'ext.is_rewarded_inventory', (video.rewarded === 1 || deepAccess(video, 'ext.rewarded') === 1) || undefined);
+        if (!imp.video.placement && ID_REQUEST.isOutstreamVideo(bidRequest)) {
+          // fillImpVideo will have already set placement = 1 for instream
+          imp.video.placement = VIDEO_PARAMS.PLACEMENT_TYPE.OUTSTREAM;
+        }
+      }
+    },
+    request: {
+      gdprAddtlConsent(setAddtlConsent, ortbRequest, bidderRequest) {
+        const additionalConsent = bidderRequest?.gdprConsent?.addtlConsent;
+        if (!additionalConsent) {
+          return;
+        }
+        if (spec.syncStore.extendMode) {
+          setAddtlConsent(ortbRequest, bidderRequest);
+          return;
+        }
+        if (additionalConsent && additionalConsent.indexOf('~') !== -1) {
+          // Google Ad Tech Provider IDs
+          const atpIds = additionalConsent.substring(additionalConsent.indexOf('~') + 1);
+          if (atpIds) {
+            deepSetValue(
+              ortbRequest,
+              'user.ext.consented_providers_settings.consented_providers',
+              atpIds.split('.').map(id => parseInt(id, 10))
+            );
+          }
+        }
+      }
+    }
   }
+})
 
-  if (config.getConfig('improvedigital.usePrebidSizes') === true && !isInstreamVideo(bid) && !isOutstreamVideo(bid) && bid.sizes && bid.sizes.length > 0) {
-    normalizedBidRequest.format = bid.sizes;
-  } else if (singleSizeFilter && singleSizeFilter.w && singleSizeFilter.h) {
-    normalizedBidRequest.size = {};
-    normalizedBidRequest.size.h = singleSizeFilter.h;
-    normalizedBidRequest.size.w = singleSizeFilter.w;
-  }
+const ID_REQUEST = {
+  buildServerRequests(bidRequests, bidderRequest) {
+    const globalExtendMode = config.getConfig('improvedigital.extend') === true;
+    const requests = [];
+    const singleRequestMode = config.getConfig('improvedigital.singleRequest') === true;
 
-  if (bidId) {
-    normalizedBidRequest.id = bidId;
-  }
-  if (adUnitId) {
-    normalizedBidRequest.adUnitId = adUnitId;
-  }
-  if (transactionId) {
-    normalizedBidRequest.transactionId = transactionId;
-  }
-  if (currency) {
-    normalizedBidRequest.currency = currency;
-  }
-  if (bidFloor) {
-    normalizedBidRequest.bidFloor = bidFloor;
-    normalizedBidRequest.bidFloorCur = bidFloorCur ? bidFloorCur.toUpperCase() : 'USD';
-  }
-  return normalizedBidRequest;
-}
+    const extendBids = [];
+    const adServerBids = [];
 
-function getNormalizedNativeAd(rawNative) {
-  const native = {};
-  if (!rawNative || !utils.isArray(rawNative.assets)) {
-    return null;
-  }
-  // Assets
-  rawNative.assets.forEach(asset => {
-    if (asset.title) {
-      native.title = asset.title.text;
-    } else if (asset.data) {
-      switch (asset.data.type) {
-        case 1:
-          native.sponsoredBy = asset.data.value;
-          break;
-        case 2:
-          native.body = asset.data.value;
-          break;
-        case 3:
-          native.rating = asset.data.value;
-          break;
-        case 4:
-          native.likes = asset.data.value;
-          break;
-        case 5:
-          native.downloads = asset.data.value;
-          break;
-        case 6:
-          native.price = asset.data.value;
-          break;
-        case 7:
-          native.salePrice = asset.data.value;
-          break;
-        case 8:
-          native.phone = asset.data.value;
-          break;
-        case 9:
-          native.address = asset.data.value;
-          break;
-        case 10:
-          native.body2 = asset.data.value;
-          break;
-        case 11:
-          native.displayUrl = asset.data.value;
-          break;
-        case 12:
-          native.cta = asset.data.value;
-          break;
+    function adServerUrl(extendMode, publisherId) {
+      if (extendMode) {
+        return EXTEND_URL;
+      }
+      const urlSegments = [];
+      urlSegments.push(hasPurpose1Consent(bidderRequest?.gdprConsent) ? AD_SERVER_BASE_URL : BASIC_ADS_BASE_URL)
+      if (publisherId) {
+        urlSegments.push(publisherId)
       }
-    } else if (asset.img) {
-      switch (asset.img.type) {
-        case 2:
-          native.icon = {
-            url: asset.img.url,
-            width: asset.img.w,
-            height: asset.img.h
-          };
-          break;
-        case 3:
-          native.image = {
-            url: asset.img.url,
-            width: asset.img.w,
-            height: asset.img.h
-          };
-          break;
+      urlSegments.push(PB_ENDPOINT)
+      return urlSegments.join('/');
+    }
+
+    function formatRequest(bidRequests, publisherId, extendMode) {
+      const ortbRequest = CONVERTER.toORTB({bidRequests, bidderRequest, context: {extendMode}});
+      return {
+        method: 'POST',
+        url: adServerUrl(extendMode, publisherId),
+        data: JSON.stringify(ortbRequest),
+        ortbRequest,
+        bidderRequest
       }
     }
-  });
-  // Trackers
-  if (rawNative.eventtrackers) {
-    native.impressionTrackers = [];
-    rawNative.eventtrackers.forEach(tracker => {
-      // Only handle impression event. Viewability events are not supported yet.
-      if (tracker.event !== 1) return;
-      switch (tracker.method) {
-        case 1: // img
-          native.impressionTrackers.push(tracker.url);
-          break;
-        case 2: // js
-          // javascriptTrackers is a string. If there's more than one JS tracker in bid response, the last script will be used.
-          native.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
-          break;
+
+    let publisherId = null;
+    bidRequests.map((bidRequest) => {
+      const bidParamsPublisherId = bidRequest.params.publisherId;
+      const extendModeEnabled = this.isExtendModeEnabled(globalExtendMode, bidRequest.params);
+      if (singleRequestMode) {
+        if (!publisherId) {
+          publisherId = bidParamsPublisherId;
+        } else if (bidParamsPublisherId && publisherId !== bidParamsPublisherId) {
+          throw new Error(`All Improve Digital placements in a single call must have the same publisherId. Please check your 'params.publisherId' or turn off the single request mode.`);
+        }
+        extendModeEnabled ? extendBids.push(bidRequest) : adServerBids.push(bidRequest);
+      } else {
+        requests.push(formatRequest([bidRequest], bidParamsPublisherId, extendModeEnabled));
       }
     });
-  } else {
-    native.impressionTrackers = rawNative.imptrackers || [];
-    native.javascriptTrackers = rawNative.jstracker;
-  }
-  if (rawNative.link) {
-    native.clickUrl = rawNative.link.url;
-    native.clickTrackers = rawNative.link.clicktrackers;
-  }
-  if (rawNative.privacy) {
-    native.privacyLink = rawNative.privacy;
-  }
-  return native;
-}
-registerBidder(spec);
 
-export function ImproveDigitalAdServerJSClient(endPoint) {
-  this.CONSTANTS = {
-    AD_SERVER_BASE_URL: 'ice.360yield.com',
-    END_POINT: endPoint || 'hb',
-    AD_SERVER_URL_PARAM: 'jsonp=',
-    CLIENT_VERSION: 'JS-6.3.0',
-    MAX_URL_LENGTH: 2083,
-    ERROR_CODES: {
-      MISSING_PLACEMENT_PARAMS: 2,
-      LIB_VERSION_MISSING: 3
-    },
-    RETURN_OBJ_TYPE: {
-      DEFAULT: 0,
-      URL_PARAMS_SPLIT: 1
+    if (!singleRequestMode) {
+      return requests;
     }
-  };
-
-  this.getErrorReturn = function(errorCode) {
-    return {
-      idMappings: {},
-      requests: {},
-      'errorCode': errorCode
-    };
-  };
-
-  this.createRequest = function(requestObject, requestParameters, extraRequestParameters) {
-    if (!requestParameters.libVersion) {
-      return this.getErrorReturn(this.CONSTANTS.ERROR_CODES.LIB_VERSION_MISSING);
+    // In the single request mode, split imps between those going to the ad server and those going to extend server
+    if (extendBids.length) {
+      requests.push(formatRequest(extendBids, publisherId, true));
     }
-
-    requestParameters.returnObjType = requestParameters.returnObjType || this.CONSTANTS.RETURN_OBJ_TYPE.DEFAULT;
-    requestParameters.adServerBaseUrl = 'https://' + (requestParameters.adServerBaseUrl || this.CONSTANTS.AD_SERVER_BASE_URL);
-
-    let impressionObjects = [];
-    let impressionObject;
-    if (utils.isArray(requestObject)) {
-      for (let counter = 0; counter < requestObject.length; counter++) {
-        impressionObject = this.createImpressionObject(requestObject[counter]);
-        impressionObjects.push(impressionObject);
-      }
-    } else {
-      impressionObject = this.createImpressionObject(requestObject);
-      impressionObjects.push(impressionObject);
+    if (adServerBids.length) {
+      requests.push(formatRequest(adServerBids, publisherId, false));
     }
 
-    let returnIdMappings = true;
-    if (requestParameters.returnObjType === this.CONSTANTS.RETURN_OBJ_TYPE.URL_PARAMS_SPLIT) {
-      returnIdMappings = false;
-    }
+    return requests;
+  },
 
-    let returnObject = {};
-    returnObject.requests = [];
-    if (returnIdMappings) {
-      returnObject.idMappings = [];
+  isExtendModeEnabled(globalExtendMode, bidParams) {
+    const extendMode = typeof bidParams.extend === 'boolean' ? bidParams.extend : globalExtendMode;
+    if (extendMode && !spec.syncStore.extendMode) {
+      spec.syncStore.extendMode = true;
     }
-    let errors = null;
+    return extendMode;
+  },
 
-    let baseUrl = `${requestParameters.adServerBaseUrl}/${this.CONSTANTS.END_POINT}?${this.CONSTANTS.AD_SERVER_URL_PARAM}`;
+  isOutstreamVideo(bidRequest) {
+    return deepAccess(bidRequest, 'mediaTypes.video.context') === 'outstream';
+  },
 
-    let bidRequestObject = {
-      bid_request: this.createBasicBidRequestObject(requestParameters, extraRequestParameters)
-    };
-    for (let counter = 0; counter < impressionObjects.length; counter++) {
-      impressionObject = impressionObjects[counter];
-
-      if (impressionObject.errorCode) {
-        errors = errors || [];
-        errors.push({
-          errorCode: impressionObject.errorCode,
-          adUnitId: impressionObject.adUnitId
-        });
-      } else {
-        if (returnIdMappings) {
-          returnObject.idMappings.push({
-            adUnitId: impressionObject.adUnitId,
-            id: impressionObject.impressionObject.id
-          });
-        }
-        bidRequestObject.bid_request.imp = bidRequestObject.bid_request.imp || [];
-        bidRequestObject.bid_request.imp.push(impressionObject.impressionObject);
-
-        let writeLongRequest = false;
-        const outputUri = baseUrl + encodeURIComponent(JSON.stringify(bidRequestObject));
-        if (outputUri.length > this.CONSTANTS.MAX_URL_LENGTH) {
-          writeLongRequest = true;
-          if (bidRequestObject.bid_request.imp.length > 1) {
-            // Pop the current request and process it again in the next iteration
-            bidRequestObject.bid_request.imp.pop();
-            if (returnIdMappings) {
-              returnObject.idMappings.pop();
-            }
-            counter--;
-          }
-        }
+};
 
-        if (writeLongRequest ||
-            !requestParameters.singleRequestMode ||
-            counter === impressionObjects.length - 1) {
-          returnObject.requests.push(this.formatRequest(requestParameters, bidRequestObject));
-          bidRequestObject = {
-            bid_request: this.createBasicBidRequestObject(requestParameters, extraRequestParameters)
-          };
-        }
-      }
+const ID_OUTSTREAM = {
+  RENDERER_URL: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+  createRenderer(bidRequest) {
+    const renderer = Renderer.install({
+      id: bidRequest.adUnitCode,
+      url: this.RENDERER_URL,
+      config: deepAccess(bidRequest, 'renderer.options'),
+      adUnitCode: bidRequest.adUnitCode
+    });
+    try {
+      renderer.setRender(this.render);
+    } catch (err) {
+      logWarn('Prebid Error calling setRender on renderer', err);
     }
+    return renderer;
+  },
 
-    if (errors) {
-      returnObject.errors = errors;
-    }
+  render(bid) {
+    bid.renderer.push(() => {
+      window.ANOutstreamVideo.renderAd({
+        sizes: [bid.width, bid.height],
+        targetId: bid.adUnitCode,
+        adResponse: bid.adResponse,
+        rendererOptions: bid.renderer.getConfig()
+      }, ID_OUTSTREAM.handleRendererEvents.bind(null, bid));
+    });
+  },
 
-    return returnObject;
-  };
-
-  this.formatRequest = function(requestParameters, bidRequestObject) {
-    switch (requestParameters.returnObjType) {
-      case this.CONSTANTS.RETURN_OBJ_TYPE.URL_PARAMS_SPLIT:
-        return {
-          method: 'GET',
-          url: `${requestParameters.adServerBaseUrl}/${this.CONSTANTS.END_POINT}`,
-          data: `${this.CONSTANTS.AD_SERVER_URL_PARAM}${encodeURIComponent(JSON.stringify(bidRequestObject))}`
-        };
-      default:
-        const baseUrl = `${requestParameters.adServerBaseUrl}/` +
-          `${this.CONSTANTS.END_POINT}?${this.CONSTANTS.AD_SERVER_URL_PARAM}`;
-        return {
-          url: baseUrl + encodeURIComponent(JSON.stringify(bidRequestObject))
-        }
-    }
-  };
+  handleRendererEvents(bid, id, eventName) {
+    bid.renderer.handleVideoEvent({ id, eventName });
+  },
+};
 
-  this.createBasicBidRequestObject = function(requestParameters, extraRequestParameters) {
-    let impressionBidRequestObject = {};
-    impressionBidRequestObject.secure = 1;
-    if (requestParameters.requestId) {
-      impressionBidRequestObject.id = requestParameters.requestId;
-    } else {
-      impressionBidRequestObject.id = utils.getUniqueIdentifierStr();
-    }
-    if (requestParameters.domain) {
-      impressionBidRequestObject.domain = requestParameters.domain;
-    }
-    if (requestParameters.page) {
-      impressionBidRequestObject.page = requestParameters.page;
-    }
-    if (requestParameters.ref) {
-      impressionBidRequestObject.ref = requestParameters.ref;
-    }
-    if (requestParameters.callback) {
-      impressionBidRequestObject.callback = requestParameters.callback;
-    }
-    if (requestParameters.libVersion) {
-      impressionBidRequestObject.version = requestParameters.libVersion + '-' + this.CONSTANTS.CLIENT_VERSION;
-    }
-    if (requestParameters.referrer) {
-      impressionBidRequestObject.referrer = requestParameters.referrer;
-    }
-    if (requestParameters.gdpr || requestParameters.gdpr === 0) {
-      impressionBidRequestObject.gdpr = requestParameters.gdpr;
-    }
-    if (requestParameters.usPrivacy) {
-      impressionBidRequestObject.us_privacy = requestParameters.usPrivacy;
-    }
-    if (requestParameters.schain) {
-      impressionBidRequestObject.schain = requestParameters.schain;
+const ID_RAZR = {
+  RENDERER_URL: 'https://cdn.360yield.com/razr/tag.js',
+
+  forwardBid({bidRequest, bid}) {
+    if (bid.mediaType !== BANNER) {
+      return;
     }
-    if (extraRequestParameters) {
-      for (let prop in extraRequestParameters) {
-        impressionBidRequestObject[prop] = extraRequestParameters[prop];
+
+    const cfg = {
+      prebid: {
+        bidRequest,
+        bid
       }
-    }
+    };
 
-    return impressionBidRequestObject;
-  };
+    const cfgStr = JSON.stringify(cfg).replace(/<\/script>/g, '\\x3C/script>');
+    const s = `<script>window.__razr_config = ${cfgStr};</script>`;
+    bid.ad = bid.ad.replace(/<body[^>]*>/, match => match + s);
 
-  this.createImpressionObject = function(placementObject) {
-    let outputObject = {};
-    let impressionObject = {};
-    outputObject.impressionObject = impressionObject;
+    this.installListener();
+  },
 
-    if (placementObject.id) {
-      impressionObject.id = placementObject.id;
-    } else {
-      impressionObject.id = utils.getUniqueIdentifierStr();
-    }
-    if (placementObject.adTypes) {
-      impressionObject.ad_types = placementObject.adTypes;
-    }
-    if (placementObject.adUnitId) {
-      outputObject.adUnitId = placementObject.adUnitId;
-    }
-    if (placementObject.currency) {
-      impressionObject.currency = placementObject.currency.toUpperCase();
-    }
-    if (placementObject.bidFloor) {
-      impressionObject.bidfloor = placementObject.bidFloor;
+  installListener() {
+    if (this._listenerInstalled) {
+      return;
     }
-    if (placementObject.bidFloorCur) {
-      impressionObject.bidfloorcur = placementObject.bidFloorCur.toUpperCase();
-    }
-    if (placementObject.placementId) {
-      impressionObject.pid = placementObject.placementId;
-    }
-    if (placementObject.publisherId) {
-      impressionObject.pubid = placementObject.publisherId;
-    }
-    if (placementObject.placementKey) {
-      impressionObject.pkey = placementObject.placementKey;
-    }
-    if (placementObject.transactionId) {
-      impressionObject.tid = placementObject.transactionId;
-    }
-    if (placementObject.keyValues) {
-      for (let key in placementObject.keyValues) {
-        for (let valueCounter = 0; valueCounter < placementObject.keyValues[key].length; valueCounter++) {
-          impressionObject.kvw = impressionObject.kvw || {};
-          impressionObject.kvw[key] = impressionObject.kvw[key] || [];
-          impressionObject.kvw[key].push(placementObject.keyValues[key][valueCounter]);
+
+    window.addEventListener('message', function(e) {
+      const data = e.data?.razr?.load;
+      if (!data) {
+        return;
+      }
+
+      if (e.source) {
+        data.source = e.source;
+        if (data.id) {
+          e.source.postMessage({
+            razr: {
+              id: data.id
+            }
+          }, '*');
         }
       }
-    }
 
-    impressionObject.banner = {};
-    if (placementObject.size && placementObject.size.w && placementObject.size.h) {
-      impressionObject.banner.w = placementObject.size.w;
-      impressionObject.banner.h = placementObject.size.h;
-    }
+      const ns = window.razr = window.razr || {};
+      ns.q = ns.q || [];
+      ns.q.push(data);
 
-    // Set of desired creative sizes
-    // Input Format: array of pairs, i.e. [[300, 250], [250, 250]]
-    if (placementObject.format && utils.isArray(placementObject.format)) {
-      const format = placementObject.format
-        .filter(sizePair => sizePair.length === 2 &&
-            utils.isInteger(sizePair[0]) &&
-            utils.isInteger(sizePair[1]) &&
-            sizePair[0] >= 0 &&
-            sizePair[1] >= 0)
-        .map(sizePair => {
-          return { w: sizePair[0], h: sizePair[1] }
-        });
-      if (format.length > 0) {
-        impressionObject.banner.format = format;
+      if (!ns.loaded) {
+        loadExternalScript(ID_RAZR.RENDERER_URL, BIDDER_CODE);
       }
-    }
+    });
 
-    if (!impressionObject.pid &&
-    !impressionObject.pubid &&
-    !impressionObject.pkey &&
-    !(impressionObject.banner && impressionObject.banner.w && impressionObject.banner.h)) {
-      outputObject.impressionObject = null;
-      outputObject.errorCode = this.CONSTANTS.ERROR_CODES.MISSING_PLACEMENT_PARAMS;
-    }
-    return outputObject;
-  };
-}
+    this._listenerInstalled = true;
+  }
+};
diff --git a/modules/imuIdSystem.js b/modules/imuIdSystem.js
new file mode 100644
index 00000000000..41ff95b6702
--- /dev/null
+++ b/modules/imuIdSystem.js
@@ -0,0 +1,163 @@
+/**
+ * The {@link module:modules/userId} module is required
+ * @module modules/imuIdSystem
+ *
+ * @requires module:modules/userId
+ */
+
+import { timestamp, logError } from '../src/utils.js';
+import { ajax } from '../src/ajax.js'
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+export const storage = getStorageManager();
+
+export const storageKey = '__im_uid';
+export const storagePpKey = '__im_ppid';
+export const cookieKey = '_im_vid';
+export const apiDomain = 'sync6.im-apps.net';
+const storageMaxAge = 1800000; // 30 minites (30 * 60 * 1000)
+const cookiesMaxAge = 97200000000; // 37 months ((365 * 3 + 30) * 24 * 60 * 60 * 1000)
+
+function setImDataInCookie(value) {
+  storage.setCookie(
+    cookieKey,
+    value,
+    new Date(timestamp() + cookiesMaxAge).toUTCString(),
+    'none'
+  );
+}
+
+export function removeImDataFromLocalStorage() {
+  storage.removeDataFromLocalStorage(storageKey);
+  storage.removeDataFromLocalStorage(`${storageKey}_mt`);
+  storage.removeDataFromLocalStorage(storagePpKey);
+}
+
+export function getLocalData() {
+  const mt = storage.getDataFromLocalStorage(`${storageKey}_mt`);
+  let expired = true;
+  if (Date.parse(mt) && Date.now() - (new Date(mt)).getTime() < storageMaxAge) {
+    expired = false;
+  }
+  return {
+    id: storage.getDataFromLocalStorage(storageKey),
+    ppid: storage.getDataFromLocalStorage(storagePpKey),
+    vid: storage.getCookie(cookieKey),
+    expired: expired
+  };
+}
+
+export function getApiUrl(cid, url) {
+  if (url) {
+    return `${url}?cid=${cid}`;
+  }
+  return `https://${apiDomain}/${cid}/pid`;
+}
+
+export function apiSuccessProcess(jsonResponse) {
+  if (!jsonResponse) {
+    return;
+  }
+  if (jsonResponse.uid && jsonResponse.ppid) {
+    storage.setDataInLocalStorage(storageKey, jsonResponse.uid);
+    storage.setDataInLocalStorage(`${storageKey}_mt`, new Date(timestamp()).toUTCString());
+    storage.setDataInLocalStorage(storagePpKey, jsonResponse.ppid);
+    if (jsonResponse.vid) {
+      setImDataInCookie(jsonResponse.vid);
+    }
+  } else {
+    removeImDataFromLocalStorage();
+  }
+}
+
+export function getApiCallback(callback) {
+  return {
+    success: response => {
+      let responseObj = {};
+      if (response) {
+        try {
+          responseObj = JSON.parse(response);
+          apiSuccessProcess(responseObj);
+        } catch (error) {
+          logError('User ID - imuid submodule: ' + error);
+        }
+      }
+      if (callback && responseObj.uid) {
+        const callbackObj = {
+          imuid: responseObj.uid,
+          imppid: responseObj.ppid
+        };
+        callback(callbackObj);
+      }
+    },
+    error: error => {
+      logError('User ID - imuid submodule was unable to get data from api: ' + error);
+      if (callback) {
+        callback();
+      }
+    }
+  };
+}
+
+export function callImuidApi(apiUrl) {
+  return function (callback) {
+    ajax(apiUrl, getApiCallback(callback), undefined, {method: 'GET', withCredentials: true});
+  };
+}
+
+/** @type {Submodule} */
+export const imuIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'imuid',
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{imuid: string, imppid: string} | undefined}
+   */
+  decode(ids) {
+    if (ids && typeof ids === 'object') {
+      return {
+        imuid: ids.imuid,
+        imppid: ids.imppid
+      };
+    }
+    return undefined;
+  },
+  /**
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {{id:{imuid: string, imppid: string}} | undefined | {callback:function}}}
+   */
+  getId(config) {
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.cid !== 'number') {
+      logError('User ID - imuid submodule requires a valid cid to be defined');
+      return undefined;
+    }
+    let apiUrl = getApiUrl(configParams.cid, configParams.url);
+    const localData = getLocalData();
+    if (localData.vid) {
+      apiUrl += `&vid=${localData.vid}`;
+      setImDataInCookie(localData.vid);
+    }
+
+    if (!localData.id) {
+      return {callback: callImuidApi(apiUrl)};
+    }
+    if (localData.expired) {
+      callImuidApi(apiUrl)();
+    }
+    return {
+      id: {
+        imuid: localData.id,
+        imppid: localData.ppid
+      }
+    };
+  }
+};
+
+submodule('userId', imuIdSubmodule);
diff --git a/modules/imuIdSystem.md b/modules/imuIdSystem.md
new file mode 100644
index 00000000000..cda7fa6528d
--- /dev/null
+++ b/modules/imuIdSystem.md
@@ -0,0 +1,35 @@
+## Intimate Merger User ID Submodule
+
+IM-UID is a universal identifier provided by Intimate Merger.
+The integration of [IM-UID](https://intimatemerger.com/r/uid) into Prebid.js consists of this module.
+
+## Building Prebid with IM-UID Support
+
+First, make sure to add the Intimate Merger submodule to your Prebid.js package with:
+
+```
+gulp build --modules=imuIdSystem,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    ppid: 'ppid.intimatemerger.com', // GAM Publisher Provided id support
+    userIds: [{
+      name: 'imuid',
+      params: {
+        cid: 5126 // Set your Intimate Merger Customer ID here for production
+      }
+    }]
+  }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module. | `"imuid"` |
+| params | Required | Object | Details of module params. | |
+| params.cid | Required | Number | This is the Customer ID value obtained via Intimate Merger. | `5126` |
+| params.url | Optional | String | Use this to change the default endpoint URL. | `"https://example.com/some/api"` |
diff --git a/modules/incrxBidAdapter.js b/modules/incrxBidAdapter.js
new file mode 100644
index 00000000000..914ef0b904e
--- /dev/null
+++ b/modules/incrxBidAdapter.js
@@ -0,0 +1,88 @@
+import { parseSizesInput, isEmpty } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js'
+
+const BIDDER_CODE = 'incrementx';
+const ENDPOINT_URL = 'https://hb.incrementxserv.com/vzhbidder/bid';
+const DEFAULT_CURRENCY = 'USD';
+const CREATIVE_TTL = 300;
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  /**
+  * Determines whether or not the given bid request is valid.
+  *
+  * @param {BidRequest} bid The bid params to validate.
+  * @return boolean True if this is a valid bid, and false otherwise.
+  */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.placementId);
+  },
+
+  /**
+  * Make a server request from the list of BidRequests.
+  *
+  * @param validBidRequests
+  * @param bidderRequest
+  * @return Array Info describing the request to the server.
+  */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map(bidRequest => {
+      const sizes = parseSizesInput(bidRequest.params.size || bidRequest.sizes);
+
+      const requestParams = {
+        _vzPlacementId: bidRequest.params.placementId,
+        sizes: sizes,
+        _slotBidId: bidRequest.bidId,
+        // TODO: is 'page' the right value here?
+        _rqsrc: bidderRequest.refererInfo.page,
+      };
+
+      const payload = {
+        q: encodeURI(JSON.stringify(requestParams))
+      }
+
+      return {
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: payload
+      };
+    });
+  },
+
+  /**
+  * Unpack the response from the server into a list of bids.
+  *
+  * @param {ServerResponse} serverResponse A successful response from the server.
+  * @return {Bid[]} An array of bids which were nested inside the server.
+  */
+  interpretResponse: function (serverResponse) {
+    const response = serverResponse.body;
+    const bids = [];
+    if (isEmpty(response)) {
+      return bids;
+    }
+    const responseBid = {
+      requestId: response.slotBidId,
+      cpm: response.cpm,
+      currency: response.currency || DEFAULT_CURRENCY,
+      width: response.adWidth,
+      height: response.adHeight,
+      ttl: CREATIVE_TTL,
+      creativeId: response.creativeId || 0,
+      netRevenue: response.netRevenue || false,
+      meta: {
+        mediaType: response.mediaType || BANNER,
+        advertiserDomains: response.advertiserDomains || []
+      },
+      ad: response.ad
+    };
+    bids.push(responseBid);
+    return bids;
+  }
+
+};
+
+registerBidder(spec);
diff --git a/modules/inmarBidAdapter.js b/modules/inmarBidAdapter.js
new file mode 100755
index 00000000000..42bd64ee816
--- /dev/null
+++ b/modules/inmarBidAdapter.js
@@ -0,0 +1,132 @@
+import {logError, mergeDeep} from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'inmar';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['inm'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid
+   *
+   * @param {bidRequest} bid The bid params to validate.
+   * @returns {boolean} True if this is a valid bid, and false otherwise
+   */
+  isBidRequestValid: function(bid) {
+    return !!(bid.params && bid.params.partnerId);
+  },
+
+  /**
+   * Build a server request from the list of valid BidRequests
+   * @param {validBidRequests} is an array of the valid bids
+   * @param {bidderRequest} bidder request object
+   * @returns {ServerRequest} Info describing the request to the server
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    var payload = {
+      bidderCode: bidderRequest.bidderCode,
+      auctionId: bidderRequest.auctionId,
+      bidderRequestId: bidderRequest.bidderRequestId,
+      bidRequests: validBidRequests,
+      auctionStart: bidderRequest.auctionStart,
+      timeout: bidderRequest.timeout,
+      // TODO: please do not send internal data structures over the network
+      refererInfo: bidderRequest.refererInfo.legacy,
+      start: bidderRequest.start,
+      gdprConsent: bidderRequest.gdprConsent,
+      uspConsent: bidderRequest.uspConsent,
+      currencyCode: config.getConfig('currency.adServerCurrency'),
+      coppa: config.getConfig('coppa'),
+      firstPartyData: getLegacyFpd(bidderRequest.ortb2),
+      prebidVersion: '$prebid.version$'
+    };
+
+    var payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: 'https://prebid.owneriq.net:8443/bidder/pb/bid',
+      data: payloadString,
+    };
+  },
+
+  /**
+   * Read the response from the server and build a list of bids
+   * @param {serverResponse} Response from the server.
+   * @param {bidRequest} Bid request object
+   * @returns {bidResponses} Array of bids which were nested inside the server
+   */
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    var response = serverResponse.body;
+
+    try {
+      if (response) {
+        var bidResponse = {
+          requestId: response.requestId,
+          cpm: response.cpm,
+          currency: response.currency,
+          width: response.width,
+          height: response.height,
+          ad: response.ad,
+          ttl: response.ttl,
+          creativeId: response.creativeId,
+          netRevenue: response.netRevenue,
+          vastUrl: response.vastUrl,
+          dealId: response.dealId,
+          meta: response.meta
+        };
+
+        bidResponses.push(bidResponse);
+      }
+    } catch (error) {
+      logError('Error while parsing inmar response', error);
+    }
+    return bidResponses;
+  },
+
+  /**
+   * User Syncs
+   *
+   * @param {syncOptions} Publisher prebid configuration
+   * @param {serverResponses} Response from the server
+   * @returns {Array}
+   */
+  getUserSyncs: function(syncOptions, serverResponses) {
+    const syncs = [];
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: 'https://px.owneriq.net/eucm/p/pb'
+      });
+    }
+    return syncs;
+  }
+};
+
+function getLegacyFpd(ortb2) {
+  if (typeof ortb2 !== 'object') return;
+
+  let duplicate = {};
+
+  Object.keys(ortb2).forEach((type) => {
+    let prop = (type === 'site') ? 'context' : type;
+    duplicate[prop] = (prop === 'context' || prop === 'user') ? Object.keys(ortb2[type]).filter(key => key !== 'data').reduce((result, key) => {
+      if (key === 'ext') {
+        mergeDeep(result, ortb2[type][key]);
+      } else {
+        mergeDeep(result, {[key]: ortb2[type][key]});
+      }
+
+      return result;
+    }, {}) : ortb2[type];
+  });
+
+  return duplicate;
+}
+
+registerBidder(spec);
diff --git a/modules/inmarBidAdapter.md b/modules/inmarBidAdapter.md
new file mode 100644
index 00000000000..8ed6b998602
--- /dev/null
+++ b/modules/inmarBidAdapter.md
@@ -0,0 +1,44 @@
+# Overview
+
+```
+Module Name: Inmar Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: oiq_rtb@inmar.com
+```
+
+# Description
+
+Connects to Inmar for bids. This adapter supports Display and Video.
+
+The Inmar adapter requires setup and approval from the Inmar team.
+Please reach out to your account manager for more information.
+
+# Test Parameters
+
+## Web
+```
+    var adUnits = [
+                {
+                    code: 'test-div1',
+                    sizes: [[300, 250],[300, 600]],
+                    bids: [{
+                        bidder: 'inmar',
+                        params: {
+                            partnerId: 12345,
+                            position: 1
+                        }
+                    }]
+                },
+                {
+                    code: 'test-div2',
+                    sizes: [[728, 90],[970, 250]],
+                    bids: [{
+                        bidder: 'inmar',
+                        params: {
+                            partnerId: 12345,
+                            position: 0
+                        }
+                    }]
+                }
+            ];
+```
diff --git a/modules/innityBidAdapter.js b/modules/innityBidAdapter.js
index aae79818daf..71fe588441c 100644
--- a/modules/innityBidAdapter.js
+++ b/modules/innityBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { parseSizesInput, timestamp } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'innity';
@@ -10,24 +10,20 @@ export const spec = {
     return !!(bid.params && bid.params.pub && bid.params.zone);
   },
   buildRequests: function(validBidRequests, bidderRequest) {
-    let refererInfo = '';
-    if (bidderRequest && bidderRequest.refererInfo) {
-      refererInfo = bidderRequest.refererInfo.referer || '';
-    }
     return validBidRequests.map(bidRequest => {
-      let parseSized = utils.parseSizesInput(bidRequest.sizes);
+      let parseSized = parseSizesInput(bidRequest.sizes);
       let arrSize = parseSized[0].split('x');
       return {
         method: 'GET',
         url: ENDPOINT,
         data: {
-          cb: utils.timestamp(),
+          cb: timestamp(),
           ver: 2,
           hb: 1,
           output: 'js',
           pub: bidRequest.params.pub,
           zone: bidRequest.params.zone,
-          url: encodeURIComponent(refererInfo),
+          url: bidderRequest && bidderRequest.refererInfo ? encodeURIComponent(bidderRequest.refererInfo.page) : '',
           width: arrSize[0],
           height: arrSize[1],
           vpw: window.screen.width,
@@ -51,6 +47,10 @@ export const spec = {
       netRevenue: true,
       ttl: 60,
       ad: '<script src="https://cdn.innity.net/frame_util.js"></script>' + res.tag,
+      meta: {
+        advertiserDomains: res.adomain && res.adomain.length ? res.adomain : [],
+        mediaType: res.mediaType,
+      }
     };
     return [bidResponse];
   }
diff --git a/modules/inskinBidAdapter.js b/modules/inskinBidAdapter.js
index 2a55b5280db..f3464765bde 100644
--- a/modules/inskinBidAdapter.js
+++ b/modules/inskinBidAdapter.js
@@ -1,12 +1,11 @@
-import * as utils from '../src/utils.js';
+import { createTrackPixelHtml } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'inskin';
 
 const CONFIG = {
-  'inskin': {
-    'BASE_URI': 'https://mfad.inskinad.com/api/v2'
-  }
+  BASE_URI: 'https://mfad.inskinad.com/api/v2'
 };
 
 export const spec = {
@@ -51,12 +50,28 @@ export const spec = {
       placements: [],
       time: Date.now(),
       user: {},
-      url: bidderRequest.refererInfo.referer,
+      url: bidderRequest.refererInfo.page,
       enableBotFiltering: true,
       includePricingData: true,
       parallel: true
     }, validBidRequests[0].params);
 
+    if (validBidRequests[0].schain) {
+      data.rtb = {
+        schain: validBidRequests[0].schain
+      };
+    } else if (data.publisherId) {
+      data.rtb = {
+        schain: {
+          ext: {
+            sid: String(data.publisherId)
+          }
+        }
+      };
+    }
+
+    delete data.publisherId;
+
     data.keywords = data.keywords || [];
     const restrictions = [];
 
@@ -68,37 +83,34 @@ export const spec = {
         gdprConsentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
       };
 
-      if (bidderRequest.gdprConsent.apiVersion === 2) {
-        const purposes = [
-          {id: 1, kw: 'nocookies'},
-          {id: 2, kw: 'nocontext'},
-          {id: 3, kw: 'nodmp'},
-          {id: 4, kw: 'nodata'},
-          {id: 7, kw: 'noclicks'},
-          {id: 9, kw: 'noresearch'}
-        ];
-
-        const d = bidderRequest.gdprConsent.vendorData;
-
-        if (d) {
-          if (d.purposeOneTreatment) {
-            data.keywords.push('cst-nodisclosure');
-            restrictions.push('nodisclosure');
-          }
-
-          purposes.map(p => {
-            if (!checkConsent(p.id, d)) {
-              data.keywords.push('cst-' + p.kw);
-              restrictions.push(p.kw);
-            }
-          });
+      const purposes = [
+        {id: 1, kw: 'nocookies'},
+        {id: 2, kw: 'nocontext'},
+        {id: 3, kw: 'nodmp'},
+        {id: 4, kw: 'nodata'},
+        {id: 7, kw: 'noclicks'},
+        {id: 9, kw: 'noresearch'}
+      ];
+
+      const d = bidderRequest.gdprConsent.vendorData;
+
+      if (d) {
+        if (d.purposeOneTreatment) {
+          data.keywords.push('cst-nodisclosure');
+          restrictions.push('nodisclosure');
         }
+
+        purposes.map(p => {
+          if (!checkConsent(p.id, d)) {
+            data.keywords.push('cst-' + p.kw);
+            restrictions.push(p.kw);
+          }
+        });
       }
     }
 
     validBidRequests.map(bid => {
-      let config = CONFIG[bid.bidder];
-      ENDPOINT_URL = config.BASE_URI;
+      ENDPOINT_URL = CONFIG.BASE_URI;
 
       const placement = Object.assign({
         divName: bid.bidId,
@@ -108,8 +120,12 @@ export const spec = {
 
       placement.adTypes.push(5, 9, 163, 2163, 3006);
 
+      placement.properties = placement.properties || {};
+
+      placement.properties.screenWidth = screen.width;
+      placement.properties.screenHeight = screen.height;
+
       if (restrictions.length) {
-        placement.properties = placement.properties || {};
         placement.properties.restrictions = restrictions;
       }
 
@@ -168,6 +184,7 @@ export const spec = {
           bid.currency = 'USD';
           bid.creativeId = decision.adId;
           bid.ttl = 360;
+          bid.meta = { advertiserDomains: decision.adomain ? decision.adomain : [] };
           bid.netRevenue = true;
 
           bidResponses.push(bid);
@@ -188,14 +205,14 @@ export const spec = {
 
         const id = 'ism_tag_' + Math.floor((Math.random() * 10e16));
         window[id] = {
-          plr_AdSlot: e.source.frameElement,
+          plr_AdSlot: e.source && e.source.frameElement,
           bidId: e.data.bidId,
           bidPrice: bidsMap[e.data.bidId].price,
           serverResponse
         };
-        const script = document.createElement('script');
-        script.src = 'https://cdn.inskinad.com/isfe/publishercode/' + bidsMap[e.data.bidId].params.siteId + '/default.js?autoload&id=' + id;
-        document.getElementsByTagName('head')[0].appendChild(script);
+
+        const url = 'https://cdn.inskinad.com/isfe/publishercode/' + bidsMap[e.data.bidId].params.siteId + '/default.js?autoload&id=' + id;
+        loadExternalScript(url, BIDDER_CODE);
       });
     }
 
@@ -275,7 +292,7 @@ function getSize(sizes) {
 }
 
 function retrieveAd(bidId, decision) {
-  return "<script>window.top.postMessage({from: 'ism-bid', bidId: '" + bidId + "'}, '*');\x3c/script>" + utils.createTrackPixelHtml(decision.impressionUrl);
+  return "<script>window.top.postMessage({from: 'ism-bid', bidId: '" + bidId + "'}, '*');\x3c/script>" + createTrackPixelHtml(decision.impressionUrl);
 }
 
 function checkConsent(P, d) {
diff --git a/modules/inskinBidAdapter.md b/modules/inskinBidAdapter.md
index 2284124dc98..2cb19f9a0e0 100644
--- a/modules/inskinBidAdapter.md
+++ b/modules/inskinBidAdapter.md
@@ -1,14 +1,14 @@
 # Overview
 
-Module Name: InSkin Bid Adapter
+Module Name: Inskin Bid Adapter
 
 Module Type: Bid Adapter
 
-Maintainer: jgrimes@adzerk.com
+Maintainer: tech@inskinmedia.com
 
 # Description
 
-Connects to InSkin Media for receiving bids from configured demand sources.
+Connects to Inskin Media for receiving bids from configured demand sources.
 
 # Test Parameters
 ```javascript
@@ -21,7 +21,8 @@ Connects to InSkin Media for receiving bids from configured demand sources.
                     bidder: 'inskin',
                     params: {
                         networkId: '9874',
-                        siteId: '983808'
+                        siteId: '983808',
+                        publisherId: '123456'
                     }
                 }
             ]
diff --git a/modules/insticatorBidAdapter.js b/modules/insticatorBidAdapter.js
new file mode 100644
index 00000000000..150e9d3c5c2
--- /dev/null
+++ b/modules/insticatorBidAdapter.js
@@ -0,0 +1,417 @@
+import {config} from '../src/config.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {deepAccess, generateUUID, logError, isArray} from '../src/utils.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {find} from '../src/polyfill.js';
+
+const BIDDER_CODE = 'insticator';
+const ENDPOINT = 'https://ex.ingage.tech/v1/openrtb'; // production endpoint
+const USER_ID_KEY = 'hb_insticator_uid';
+const USER_ID_COOKIE_EXP = 2592000000; // 30 days
+const BID_TTL = 300; // 5 minutes
+const GVLID = 910;
+
+export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
+
+config.setDefaults({
+  insticator: {
+    endpointUrl: ENDPOINT,
+    bidTTL: BID_TTL,
+  },
+});
+
+function getUserId() {
+  let uid;
+
+  if (storage.localStorageIsEnabled()) {
+    uid = storage.getDataFromLocalStorage(USER_ID_KEY);
+  } else {
+    uid = storage.getCookie(USER_ID_KEY);
+  }
+
+  if (uid && uid.length !== 36) {
+    uid = undefined;
+  }
+
+  return uid;
+}
+
+function setUserId(userId) {
+  if (storage.localStorageIsEnabled()) {
+    storage.setDataInLocalStorage(USER_ID_KEY, userId);
+  }
+
+  if (storage.cookiesAreEnabled()) {
+    const expires = new Date(Date.now() + USER_ID_COOKIE_EXP).toUTCString();
+    storage.setCookie(USER_ID_KEY, userId, expires);
+  }
+}
+
+function buildBanner(bidRequest) {
+  const format = [];
+  const pos = deepAccess(bidRequest, 'mediaTypes.banner.pos');
+  const sizes =
+    deepAccess(bidRequest, 'mediaTypes.banner.sizes') || bidRequest.sizes;
+
+  for (const size of sizes) {
+    format.push({
+      w: size[0],
+      h: size[1],
+    });
+  }
+
+  return {
+    format,
+    pos,
+  }
+}
+
+function buildVideo(bidRequest) {
+  const w = deepAccess(bidRequest, 'mediaTypes.video.w');
+  const h = deepAccess(bidRequest, 'mediaTypes.video.h');
+  const mimes = deepAccess(bidRequest, 'mediaTypes.video.mimes');
+  const placement = deepAccess(bidRequest, 'mediaTypes.video.placement') || 3;
+
+  return {
+    placement,
+    mimes,
+    w,
+    h,
+  }
+}
+
+function buildImpression(bidRequest) {
+  const imp = {
+    id: bidRequest.bidId,
+    tagid: bidRequest.adUnitCode,
+    instl: deepAccess(bidRequest, 'ortb2Imp.instl'),
+    secure: location.protocol === 'https:' ? 1 : 0,
+    ext: {
+      gpid: deepAccess(bidRequest, 'ortb2Imp.ext.gpid'),
+      insticator: {
+        adUnitId: bidRequest.params.adUnitId,
+      },
+    },
+  }
+
+  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
+    imp.banner = buildBanner(bidRequest);
+  }
+
+  if (deepAccess(bidRequest, 'mediaTypes.video')) {
+    imp.video = buildVideo(bidRequest);
+  }
+
+  return imp;
+}
+
+function buildDevice() {
+  const deviceConfig = config.getConfig('device');
+  const device = {
+    w: window.innerWidth,
+    h: window.innerHeight,
+    js: true,
+    ext: {
+      localStorage: storage.localStorageIsEnabled(),
+      cookies: storage.cookiesAreEnabled(),
+    },
+  };
+
+  if (typeof deviceConfig === 'object') {
+    Object.assign(device, deviceConfig);
+  }
+
+  return device;
+}
+
+function buildRegs(bidderRequest) {
+  if (bidderRequest.gdprConsent) {
+    return {
+      ext: {
+        gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
+        gdprConsentString: bidderRequest.gdprConsent.consentString,
+      },
+    };
+  }
+
+  return {};
+}
+
+function buildUser(bid) {
+  const userId = getUserId() || generateUUID();
+  const yob = deepAccess(bid, 'params.user.yob')
+  const gender = deepAccess(bid, 'params.user.gender')
+
+  setUserId(userId);
+
+  return {
+    id: userId,
+    yob,
+    gender,
+  };
+}
+
+function extractSchain(bids, requestId) {
+  if (!bids || bids.length === 0 || !bids[0].schain) return;
+
+  const schain = bids[0].schain;
+  if (schain && schain.nodes && schain.nodes.length && schain.nodes[0]) {
+    schain.nodes[0].rid = requestId;
+  }
+
+  return schain;
+}
+
+function extractEids(bids) {
+  if (!bids) return;
+
+  const bid = bids.find(bid => isArray(bid.userIdAsEids) && bid.userIdAsEids.length > 0);
+  return bid ? bid.userIdAsEids : bids[0].userIdAsEids;
+}
+
+function buildRequest(validBidRequests, bidderRequest) {
+  const req = {
+    id: bidderRequest.bidderRequestId,
+    tmax: bidderRequest.timeout,
+    source: {
+      fd: 1,
+      tid: bidderRequest.auctionId,
+    },
+    site: {
+      // TODO: are these the right refererInfo values?
+      domain: bidderRequest.refererInfo.domain,
+      page: bidderRequest.refererInfo.page,
+      ref: bidderRequest.refererInfo.ref,
+    },
+    device: buildDevice(),
+    regs: buildRegs(bidderRequest),
+    user: buildUser(validBidRequests[0]),
+    imp: validBidRequests.map((bidRequest) => buildImpression(bidRequest)),
+    ext: {
+      insticator: {
+        adapter: {
+          vendor: 'prebid',
+          prebid: '$prebid.version$'
+        }
+      }
+    }
+  };
+
+  const params = config.getConfig('insticator.params');
+
+  if (params) {
+    req.ext = {
+      insticator: {...req.ext.insticator, ...params},
+    };
+  }
+
+  const schain = extractSchain(validBidRequests, bidderRequest.bidderRequestId);
+
+  if (schain) {
+    req.source.ext = { schain };
+  }
+
+  const eids = extractEids(validBidRequests);
+
+  if (eids) {
+    req.user.ext = { eids };
+  }
+
+  return req;
+}
+
+function buildBid(bid, bidderRequest) {
+  const originalBid = find(bidderRequest.bids, (b) => b.bidId === bid.impid);
+  let meta = {}
+
+  if (bid.ext && bid.ext.meta) {
+    meta = bid.ext.meta
+  }
+
+  if (bid.adomain) {
+    meta.advertiserDomains = bid.adomain
+  }
+
+  return {
+    requestId: bid.impid,
+    creativeId: bid.crid,
+    cpm: bid.price,
+    currency: 'USD',
+    netRevenue: true,
+    ttl: bid.exp || config.getConfig('insticator.bidTTL') || BID_TTL,
+    width: bid.w,
+    height: bid.h,
+    mediaType: 'banner',
+    ad: bid.adm,
+    adUnitCode: originalBid.adUnitCode,
+    ...(Object.keys(meta).length > 0 ? {meta} : {})
+  };
+}
+
+function buildBidSet(seatbid, bidderRequest) {
+  return seatbid.bid.map((bid) => buildBid(bid, bidderRequest));
+}
+
+function validateSize(size) {
+  return (
+    size instanceof Array &&
+    size.length === 2 &&
+    typeof size[0] === 'number' &&
+    typeof size[1] === 'number'
+  );
+}
+
+function validateSizes(sizes) {
+  return (
+    sizes instanceof Array &&
+    sizes.length > 0 &&
+    sizes.map(validateSize).reduce((a, b) => a && b, true)
+  );
+}
+
+function validateAdUnitId(bid) {
+  if (!bid.params.adUnitId) {
+    logError('insticator: missing adUnitId bid parameter');
+    return false;
+  }
+
+  return true;
+}
+
+function validateMediaType(bid) {
+  if (!(BANNER in bid.mediaTypes || VIDEO in bid.mediaTypes)) {
+    logError('insticator: expected banner or video in mediaTypes');
+    return false;
+  }
+
+  return true;
+}
+
+function validateBanner(bid) {
+  const banner = deepAccess(bid, 'mediaTypes.banner');
+
+  if (banner === undefined) {
+    return true;
+  }
+
+  if (
+    !validateSizes(bid.sizes) &&
+    !validateSizes(bid.mediaTypes.banner.sizes)
+  ) {
+    logError('insticator: banner sizes not specified or invalid');
+    return false;
+  }
+
+  return true;
+}
+
+function validateVideo(bid) {
+  const video = deepAccess(bid, 'mediaTypes.video');
+
+  if (video === undefined) {
+    return true;
+  }
+
+  const videoSize = [
+    deepAccess(bid, 'mediaTypes.video.w'),
+    deepAccess(bid, 'mediaTypes.video.h'),
+  ];
+
+  if (
+    !validateSize(videoSize)
+  ) {
+    logError('insticator: video size not specified or invalid');
+    return false;
+  }
+
+  const mimes = deepAccess(bid, 'mediaTypes.video.mimes');
+
+  if (!Array.isArray(mimes) || mimes.length === 0) {
+    logError('insticator: mimes not specified');
+    return false;
+  }
+
+  const placement = deepAccess(bid, 'mediaTypes.video.placement');
+
+  if (typeof placement !== 'undefined' && typeof placement !== 'number') {
+    logError('insticator: video placement is not a number');
+    return false;
+  }
+
+  return true;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [ BANNER, VIDEO ],
+
+  isBidRequestValid: function (bid) {
+    return (
+      validateAdUnitId(bid) &&
+      validateMediaType(bid) &&
+      validateBanner(bid) &&
+      validateVideo(bid)
+    );
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const requests = [];
+    let endpointUrl = config.getConfig('insticator.endpointUrl') || ENDPOINT;
+    endpointUrl = endpointUrl.replace(/^http:/, 'https:');
+
+    if (validBidRequests.length > 0) {
+      requests.push({
+        method: 'POST',
+        url: endpointUrl,
+        options: {
+          contentType: 'application/json',
+          withCredentials: true,
+        },
+        data: JSON.stringify(buildRequest(validBidRequests, bidderRequest)),
+        bidderRequest,
+      });
+    }
+
+    return requests;
+  },
+
+  interpretResponse: function (serverResponse, request) {
+    const bidderRequest = request.bidderRequest;
+    const body = serverResponse.body;
+
+    if (!body || body.id !== bidderRequest.bidderRequestId) {
+      logError('insticator: response id does not match bidderRequestId');
+      return [];
+    }
+
+    if (!body.seatbid) {
+      return [];
+    }
+
+    const bidsets = body.seatbid.map((seatbid) =>
+      buildBidSet(seatbid, bidderRequest)
+    );
+
+    return bidsets.reduce((a, b) => a.concat(b), []);
+  },
+
+  getUserSyncs: function (options, responses) {
+    const syncs = [];
+
+    for (const response of responses) {
+      if (
+        response.body &&
+        response.body.ext &&
+        response.body.ext.sync instanceof Array
+      ) {
+        syncs.push(...response.body.ext.sync);
+      }
+    }
+
+    return syncs;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/insticatorBidAdapter.md b/modules/insticatorBidAdapter.md
new file mode 100644
index 00000000000..62ee5af4a7d
--- /dev/null
+++ b/modules/insticatorBidAdapter.md
@@ -0,0 +1,53 @@
+Overview
+========
+
+```
+Module Name: Insticator Adapter
+Module Type: Bidder Adapter
+Maintainer: contact@insticator.com
+```
+
+Description
+===========
+
+This module connects publishers to Insticator exchange of demand sources through Prebid.js. 
+
+### Supported Media Types
+
+| Type | Support
+| --- | ---
+| Banner | Fully supported for all approved sizes.
+
+# Bid Parameters
+
+Each of the Insticator-specific parameters provided under the `adUnits[].bids[].params`
+object are detailed here.
+
+### Banner
+
+| Key | Scope | Type | Description
+| --- | --- | --- | ---
+| adUnitId | Required | String | The ad unit ID provided by Insticator. 
+
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+               code: 'test-div',
+               mediaTypes: {
+                   banner: {
+                       sizes: [[300, 250], [300, 600]]
+                   }
+               },
+               bids: [
+                   {
+                       bidder: 'insticator',
+                       params: {
+                           adUnitId: 'test'
+                       }
+                   }
+               ]
+           }
+	]
+```
diff --git a/modules/instreamTracking.js b/modules/instreamTracking.js
new file mode 100644
index 00000000000..ff8305c7fed
--- /dev/null
+++ b/modules/instreamTracking.js
@@ -0,0 +1,114 @@
+import { deepClone, getBidRequest, deepAccess } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { auctionManager } from '../src/auctionManager.js';
+import { INSTREAM } from '../src/video.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json'
+
+const {CACHE_ID, UUID} = CONSTANTS.TARGETING_KEYS;
+const {BID_WON, AUCTION_END} = CONSTANTS.EVENTS;
+const {RENDERED} = CONSTANTS.BID_STATUS;
+
+const INSTREAM_TRACKING_DEFAULT_CONFIG = {
+  enabled: false,
+  maxWindow: 1000 * 60, // the time in ms after which polling for instream delivery stops
+  pollingFreq: 500 // the frequency of polling
+};
+
+// Set instreamTracking default values
+config.setDefaults({
+  'instreamTracking': deepClone(INSTREAM_TRACKING_DEFAULT_CONFIG)
+});
+
+const whitelistedResources = /video|fetch|xmlhttprequest|other/;
+
+/**
+ * Here the idea is
+ * find all network entries via performance.getEntriesByType()
+ * filter it by video cache key in the url
+ * and exclude the ad server urls so that we dont match twice
+ * eg:
+ * dfp ads call: https://securepubads.g.doubleclick.net/gampad/ads?...hb_cache_id%3D55e85cd3-6ea4-4469-b890-84241816b131%26...
+ * prebid cache url: https://prebid.adnxs.com/pbc/v1/cache?uuid=55e85cd3-6ea4-4469-b890-84241816b131
+ *
+ * if the entry exists, emit the BID_WON
+ *
+ * Note: this is a workaround till a better approach is engineered.
+ *
+ * @param {Array<AdUnit>} adUnits
+ * @param {Array<Bid>} bidsReceived
+ * @param {Array<BidRequest>} bidderRequests
+ *
+ * @return {boolean} returns TRUE if tracking started
+ */
+export function trackInstreamDeliveredImpressions({adUnits, bidsReceived, bidderRequests}) {
+  const instreamTrackingConfig = config.getConfig('instreamTracking') || {};
+  // check if instreamTracking is enabled and performance api is available
+  if (!instreamTrackingConfig.enabled || !window.performance || !window.performance.getEntriesByType) {
+    return false;
+  }
+
+  // filter for video bids
+  const instreamBids = bidsReceived.filter(bid => {
+    const bidderRequest = getBidRequest(bid.requestId, bidderRequests);
+    return bidderRequest && deepAccess(bidderRequest, 'mediaTypes.video.context') === INSTREAM && bid.videoCacheKey;
+  });
+  if (!instreamBids.length) {
+    return false;
+  }
+
+  // find unique instream ad units
+  const instreamAdUnitMap = {};
+  adUnits.forEach(adUnit => {
+    if (!instreamAdUnitMap[adUnit.code] && deepAccess(adUnit, 'mediaTypes.video.context') === INSTREAM) {
+      instreamAdUnitMap[adUnit.code] = true;
+    }
+  });
+  const instreamAdUnitsCount = Object.keys(instreamAdUnitMap).length;
+
+  const start = Date.now();
+  const {maxWindow, pollingFreq, urlPattern} = instreamTrackingConfig;
+
+  let instreamWinningBidsCount = 0;
+  let lastRead = 0; // offset for performance.getEntriesByType
+
+  function poll() {
+    // get network entries using the last read offset
+    const entries = window.performance.getEntriesByType('resource').splice(lastRead);
+    for (const resource of entries) {
+      const url = resource.name;
+      // check if the resource is of whitelisted resource to avoid checking img or css or script urls
+      if (!whitelistedResources.test(resource.initiatorType)) {
+        continue;
+      }
+
+      instreamBids.forEach((bid) => {
+        // match the video cache key excluding ad server call
+        const matches = !(url.indexOf(CACHE_ID) !== -1 || url.indexOf(UUID) !== -1) && url.indexOf(bid.videoCacheKey) !== -1;
+        if (urlPattern && urlPattern instanceof RegExp && !urlPattern.test(url)) {
+          return;
+        }
+        if (matches && bid.status !== RENDERED) {
+          // video found
+          instreamWinningBidsCount++;
+          auctionManager.addWinningBid(bid);
+          events.emit(BID_WON, bid);
+        }
+      });
+    }
+    // update offset
+    lastRead += entries.length;
+
+    const timeElapsed = Date.now() - start;
+    if (timeElapsed < maxWindow && instreamWinningBidsCount < instreamAdUnitsCount) {
+      setTimeout(poll, pollingFreq);
+    }
+  }
+
+  // start polling for network entries
+  setTimeout(poll, pollingFreq);
+
+  return true;
+}
+
+events.on(AUCTION_END, trackInstreamDeliveredImpressions)
diff --git a/modules/integr8BidAdapter.js b/modules/integr8BidAdapter.js
new file mode 100644
index 00000000000..a85e9b0a55c
--- /dev/null
+++ b/modules/integr8BidAdapter.js
@@ -0,0 +1,150 @@
+import { deepAccess, isFn, isPlainObject } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'integr8';
+const ENDPOINT_URL = 'https://integr8.central.gjirafa.tech/bid';
+const DIMENSION_SEPARATOR = 'x';
+const SIZE_SEPARATOR = ';';
+const BISKO_ID = 'biskoId';
+const STORAGE_ID = 'bisko-sid';
+const SEGMENTS = 'biskoSegments';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params && bid.params.propertyId && bid.params.placementId);
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const storageId = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(STORAGE_ID) || '' : '';
+    const biskoId = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(BISKO_ID) || '' : '';
+    const segments = storage.localStorageIsEnabled() ? JSON.parse(storage.getDataFromLocalStorage(SEGMENTS)) || [] : [];
+
+    let propertyId = '';
+    let pageViewGuid = '';
+    let bidderRequestId = '';
+    let url = '';
+    let contents = [];
+    let data = {};
+
+    if (bidderRequest) {
+      bidderRequestId = bidderRequest.bidderRequestId;
+
+      if (bidderRequest.refererInfo) {
+        url = bidderRequest.refererInfo.page;
+      }
+    }
+
+    let placements = validBidRequests.map(bidRequest => {
+      if (!propertyId) { propertyId = bidRequest.params.propertyId; }
+      if (!pageViewGuid) { pageViewGuid = bidRequest.params.pageViewGuid || ''; }
+      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents; }
+      if (!Object.keys(data).length && bidRequest.params.data && Object.keys(bidRequest.params.data).length) { data = bidRequest.params.data; }
+
+      return {
+        sizes: generateSizeParam(bidRequest.sizes),
+        adUnitId: bidRequest.adUnitCode,
+        placementId: bidRequest.params.placementId,
+        bidid: bidRequest.bidId,
+        count: bidRequest.params.count,
+        skipTime: deepAccess(bidRequest, 'mediaTypes.video.skipafter', bidRequest.params.skipTime),
+        floor: getBidFloor(bidRequest)
+      };
+    });
+
+    let body = {
+      propertyId: propertyId,
+      pageViewGuid: pageViewGuid,
+      storageId: storageId,
+      biskoId: biskoId,
+      segments: segments,
+      url: url,
+      requestid: bidderRequestId,
+      placements: placements,
+      contents: contents,
+      data: data
+    };
+
+    return [{
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: body
+    }];
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse) {
+    const responses = serverResponse.body;
+    const bidResponses = [];
+    for (var i = 0; i < responses.length; i++) {
+      const bidResponse = {
+        requestId: responses[i].BidId,
+        cpm: responses[i].CPM,
+        width: responses[i].Width,
+        height: responses[i].Height,
+        creativeId: responses[i].CreativeId,
+        currency: responses[i].Currency,
+        netRevenue: responses[i].NetRevenue,
+        ttl: responses[i].TTL,
+        referrer: responses[i].Referrer,
+        ad: responses[i].Ad,
+        vastUrl: responses[i].VastUrl,
+        mediaType: responses[i].MediaType,
+        meta: {
+          advertiserDomains: Array.isArray(responses[i].ADomain) ? responses[i].ADomain : []
+        }
+      };
+      bidResponses.push(bidResponse);
+    }
+    return bidResponses;
+  }
+};
+
+/**
+* Generate size param for bid request using sizes array
+*
+* @param {Array} sizes Possible sizes for the ad unit.
+* @return {string} Processed sizes param to be used for the bid request.
+*/
+function generateSizeParam(sizes) {
+  return sizes.map(size => size.join(DIMENSION_SEPARATOR)).join(SIZE_SEPARATOR);
+}
+
+export function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'EUR',
+    mediaType: '*',
+    size: '*'
+  });
+
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'EUR') {
+    return floor.floor;
+  }
+
+  return null;
+}
+
+registerBidder(spec);
diff --git a/modules/integr8BidAdapter.md b/modules/integr8BidAdapter.md
new file mode 100644
index 00000000000..eadab7acdb3
--- /dev/null
+++ b/modules/integr8BidAdapter.md
@@ -0,0 +1,67 @@
+# Overview
+Module Name: Integr8 Bidder Adapter Module
+
+Type: Bidder Adapter
+
+Maintainer: arditb@gjirafa.com
+
+# Description
+Integr8 Bidder Adapter for Prebid.js.
+
+# Test Parameters
+```js
+var adUnits = [
+    {
+        code: 'test-div',
+        mediaTypes: {
+            banner: {
+                sizes: [
+                    [300, 250]
+                ]
+            }
+        },
+        bids: [{
+            bidder: 'integr8',
+            params: {
+                propertyId: '105109',   //Required
+                placementId: '846835',  //Required
+                data: {                 //Optional
+                    catalogs: [{
+                        catalogId: "699229",
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
+                }
+            }
+        }]
+    },
+    {
+        code: 'test-div',
+        mediaTypes: {
+            video: {
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'integr8',
+            params: {
+                propertyId: '105109',  //Required
+                placementId: '846830', //Required
+                data: {                //Optional
+                    catalogs: [{
+                        catalogId: "699229",
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
+                }
+            }
+        }]
+    }
+];
+```
diff --git a/modules/intentIqIdSystem.js b/modules/intentIqIdSystem.js
new file mode 100644
index 00000000000..563435dee65
--- /dev/null
+++ b/modules/intentIqIdSystem.js
@@ -0,0 +1,196 @@
+/**
+ * This module adds IntentIqId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/intentIqIdSystem
+ * @requires module:modules/userId
+ */
+
+import { logError, logInfo } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js';
+
+const PCID_EXPIRY = 365;
+
+const MODULE_NAME = 'intentIqId';
+export const FIRST_PARTY_KEY = '_iiq_fdata';
+export var FIRST_PARTY_DATA_KEY = '_iiq_fdata';
+
+export const storage = getStorageManager({ gvlid: undefined, moduleName: MODULE_NAME });
+
+const INVALID_ID = 'INVALID_ID';
+
+/**
+ * Generate standard UUID string
+ * @return {string}
+ */
+function generateGUID() {
+  let d = new Date().getTime();
+  const guid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    const r = (d + Math.random() * 16) % 16 | 0;
+    d = Math.floor(d / 16);
+    return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+  });
+  return guid;
+}
+
+/**
+ * Read Intent IQ data from cookie or local storage
+ * @param key
+ * @return {string}
+ */
+export function readData(key) {
+  try {
+    if (storage.hasLocalStorage()) {
+      return storage.getDataFromLocalStorage(key);
+    }
+    if (storage.cookiesAreEnabled()) {
+      return storage.getCookie(key);
+    }
+  } catch (error) {
+    logError(error);
+  }
+}
+
+/**
+ * Store Intent IQ data in either cookie or local storage
+ * expiration date: 365 days
+ * @param key
+ * @param {string} value IntentIQ ID value to sintentIqIdSystem_spec.jstore
+ */
+function storeData(key, value) {
+  try {
+    logInfo(MODULE_NAME + ': storing data: key=' + key + ' value=' + value);
+
+    if (value) {
+      if (storage.hasLocalStorage()) {
+        storage.setDataInLocalStorage(key, value);
+      }
+      const expiresStr = (new Date(Date.now() + (PCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
+      if (storage.cookiesAreEnabled()) {
+        storage.setCookie(key, value, expiresStr, 'LAX');
+      }
+    }
+  } catch (error) {
+    logError(error);
+  }
+}
+
+/**
+ * Parse json if possible, else return null
+ * @param data
+ * @param {object|null}
+ */
+function tryParse(data) {
+  try {
+    return JSON.parse(data);
+  } catch (err) {
+    logError(err);
+    return null;
+  }
+}
+
+/** @type {Submodule} */
+export const intentIqIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {{string}} value
+   * @returns {{intentIqId: {string}}|undefined}
+   */
+  decode(value) {
+    return value && value != '' && INVALID_ID != value ? { 'intentIqId': value } : undefined;
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config) {
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.partner !== 'number') {
+      logError('User ID - intentIqId submodule requires a valid partner to be defined');
+      return;
+    }
+    if (!FIRST_PARTY_DATA_KEY.includes(configParams.partner)) { FIRST_PARTY_DATA_KEY += '_' + configParams.partner; }
+    let rrttStrtTime = 0;
+
+    // Read Intent IQ 1st party id or generate it if none exists
+    let firstPartyData = tryParse(readData(FIRST_PARTY_KEY));
+    if (!firstPartyData || !firstPartyData.pcid) {
+      const firstPartyId = generateGUID();
+      firstPartyData = { 'pcid': firstPartyId };
+      storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData));
+    }
+
+    let partnerData = tryParse(readData(FIRST_PARTY_DATA_KEY));
+    if (!partnerData) partnerData = {};
+
+    // use protocol relative urls for http or https
+    let url = `https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=${configParams.partner}&pt=17&dpn=1`;
+    url += configParams.pcid ? '&pcid=' + encodeURIComponent(configParams.pcid) : '';
+    url += configParams.pai ? '&pai=' + encodeURIComponent(configParams.pai) : '';
+    url += firstPartyData.pcid ? '&iiqidtype=2&iiqpcid=' + encodeURIComponent(firstPartyData.pcid) : '';
+    url += firstPartyData.pid ? '&pid=' + encodeURIComponent(firstPartyData.pid) : '';
+    url += (partnerData.cttl) ? '&cttl=' + encodeURIComponent(partnerData.cttl) : '';
+    url += (partnerData.rrtt) ? '&rrtt=' + encodeURIComponent(partnerData.rrtt) : '';
+
+    const resp = function (callback) {
+      const callbacks = {
+        success: response => {
+          let respJson = tryParse(response);
+          // If response is a valid json and should save is true
+          if (respJson && respJson.ls) {
+            // Store pid field if found in response json
+            let shouldUpdateLs = false;
+            if ('pid' in respJson) {
+              firstPartyData.pid = respJson.pid;
+              shouldUpdateLs = true;
+            }
+            if ('cttl' in respJson) {
+              partnerData.cttl = respJson.cttl;
+              shouldUpdateLs = true;
+            }
+            // If should save and data is empty, means we should save as INVALID_ID
+            if (respJson.data == '') {
+              respJson.data = INVALID_ID;
+            } else {
+              partnerData.data = respJson.data;
+              shouldUpdateLs = true;
+            }
+            if (rrttStrtTime && rrttStrtTime > 0) {
+              partnerData.rrtt = Date.now() - rrttStrtTime;
+              shouldUpdateLs = true;
+            }
+            if (shouldUpdateLs === true) {
+              partnerData.date = Date.now();
+              storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData));
+              storeData(FIRST_PARTY_DATA_KEY, JSON.stringify(partnerData));
+            }
+            callback(respJson.data);
+          } else {
+            callback();
+          }
+        },
+        error: error => {
+          logError(MODULE_NAME + ': ID fetch encountered an error', error);
+          callback();
+        }
+      };
+      if (partnerData.date && partnerData.cttl && partnerData.data &&
+        Date.now() - partnerData.date < partnerData.cttl) { callback(partnerData.data); } else {
+        rrttStrtTime = Date.now();
+        ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true });
+      }
+    };
+    return { callback: resp };
+  }
+};
+
+submodule('userId', intentIqIdSubmodule);
diff --git a/modules/interactiveOffersBidAdapter.js b/modules/interactiveOffersBidAdapter.js
new file mode 100644
index 00000000000..1fad231dff2
--- /dev/null
+++ b/modules/interactiveOffersBidAdapter.js
@@ -0,0 +1,182 @@
+import {isNumber, logWarn} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'interactiveOffers';
+const ENDPOINT = 'https://prebid.ioadx.com/bidRequest/?partnerId=';
+
+const DEFAULT = {
+  'OpenRTBBidRequest': {},
+  'OpenRTBBidRequestSite': {},
+  'OpenRTBBidRequestSitePublisher': {},
+  'OpenRTBBidRequestSiteContent': {
+    language: navigator.language,
+  },
+  'OpenRTBBidRequestSource': {},
+  'OpenRTBBidRequestDevice': {
+    ua: navigator.userAgent,
+    language: navigator.language
+  },
+  'OpenRTBBidRequestUser': {},
+  'OpenRTBBidRequestImp': {},
+  'OpenRTBBidRequestImpBanner': {},
+  'PrebidBid': {
+    currency: 'USD',
+    ttl: 60,
+    netRevenue: false
+  }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function(bid) {
+    let ret = true;
+    if (bid && bid.params) {
+      if (!bid.params.partnerId) {
+        logWarn('partnerId must be a valid ID');
+        ret = false;
+      }
+      if (bid.params.tmax && !isNumber(bid.params.tmax)) {
+        logWarn('tmax must be a valid numeric ID');
+        ret = false;
+      }
+    } else {
+      logWarn('invalid request');
+      ret = false;
+    }
+    return ret;
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let aux = parseRequestPrebidjsToOpenRTB(bidderRequest);
+    let payload = aux.payload;
+    return {
+      method: 'POST',
+      url: ENDPOINT + aux.partnerId,
+      data: JSON.stringify(payload),
+      bidderRequest: bidderRequest
+    };
+  },
+
+  interpretResponse: function(response, request) {
+    let bidResponses = [];
+    if (response.body) {
+      if (!response.body.length) {
+        response.body = [response.body];
+      }
+      bidResponses = parseResponseOpenRTBToPrebidjs(response.body);
+    }
+    return bidResponses;
+  }
+};
+
+function parseRequestPrebidjsToOpenRTB(prebidRequest) {
+  let ret = {
+    payload: {},
+    partnerId: null
+  };
+  // TODO: these should probably look at refererInfo
+  let pageURL = window.location.href;
+  let domain = window.location.hostname;
+  let secure = (window.location.protocol == 'https:' ? 1 : 0);
+  let openRTBRequest = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequest']));
+  openRTBRequest.id = prebidRequest.auctionId;
+  openRTBRequest.ext = {
+    // TODO: please do not send internal data structures over the network
+    refererInfo: prebidRequest.refererInfo.legacy,
+    auctionId: prebidRequest.auctionId
+  };
+
+  openRTBRequest.site = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSite']));
+  openRTBRequest.site.id = domain;
+  openRTBRequest.site.name = domain;
+  openRTBRequest.site.domain = domain;
+  openRTBRequest.site.page = pageURL;
+  openRTBRequest.site.ref = prebidRequest.refererInfo.ref;
+
+  openRTBRequest.site.publisher = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSitePublisher']));
+  openRTBRequest.site.publisher.id = 0;
+  openRTBRequest.site.publisher.name = prebidRequest.refererInfo.domain;
+  openRTBRequest.site.publisher.domain = domain;
+  openRTBRequest.site.publisher.domain = domain;
+
+  openRTBRequest.site.content = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSiteContent']));
+
+  openRTBRequest.source = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSource']));
+  openRTBRequest.source.fd = 0;
+  openRTBRequest.source.tid = prebidRequest.auctionId;
+  openRTBRequest.source.pchain = '';
+
+  openRTBRequest.device = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestDevice']));
+
+  openRTBRequest.user = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestUser']));
+
+  openRTBRequest.imp = [];
+  prebidRequest.bids.forEach(function(bid) {
+    if (!ret.partnerId) {
+      ret.partnerId = bid.params.partnerId;
+    }
+    let imp = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestImp']));
+    imp.id = bid.bidId;
+    imp.secure = secure;
+    imp.tagid = bid.adUnitCode;
+    imp.ext = {
+      rawdata: bid
+    };
+
+    openRTBRequest.site.publisher.id = openRTBRequest.site.publisher.id || 0;
+    openRTBRequest.tmax = openRTBRequest.tmax || bid.params.tmax || 0;
+
+    Object.keys(bid.mediaTypes).forEach(function(mediaType) {
+      if (mediaType == 'banner') {
+        imp.banner = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestImpBanner']));
+        imp.banner.w = 0;
+        imp.banner.h = 0;
+        imp.banner.format = [];
+        bid.mediaTypes[mediaType].sizes.forEach(function(adSize) {
+          if (!imp.banner.w) {
+            imp.banner.w = adSize[0];
+            imp.banner.h = adSize[1];
+          }
+          imp.banner.format.push({w: adSize[0], h: adSize[1]});
+        });
+      }
+    });
+    openRTBRequest.imp.push(imp);
+  });
+  ret.payload = openRTBRequest;
+  return ret;
+}
+function parseResponseOpenRTBToPrebidjs(openRTBResponse) {
+  let prebidResponse = [];
+  openRTBResponse.forEach(function(response) {
+    if (response.seatbid && response.seatbid.forEach) {
+      response.seatbid.forEach(function(seatbid) {
+        if (seatbid.bid && seatbid.bid.forEach) {
+          seatbid.bid.forEach(function(bid) {
+            let prebid = JSON.parse(JSON.stringify(DEFAULT['PrebidBid']));
+            prebid.requestId = bid.impid;
+            prebid.ad = bid.adm;
+            prebid.creativeId = bid.crid;
+            prebid.cpm = bid.price;
+            prebid.width = bid.w;
+            prebid.height = bid.h;
+            prebid.mediaType = 'banner';
+            prebid.meta = {
+              advertiserDomains: bid.adomain,
+              advertiserId: bid.adid,
+              mediaType: 'banner',
+              primaryCatId: bid.cat[0] || '',
+              secondaryCatIds: bid.cat
+            };
+            prebidResponse.push(prebid);
+          });
+        }
+      });
+    }
+  });
+  return prebidResponse;
+}
+
+registerBidder(spec);
diff --git a/modules/interactiveOffersBidAdapter.md b/modules/interactiveOffersBidAdapter.md
index 7eb440c8216..b96572fbf94 100644
--- a/modules/interactiveOffersBidAdapter.md
+++ b/modules/interactiveOffersBidAdapter.md
@@ -1,14 +1,14 @@
 # Overview
-
+ 
 ```
 Module Name: interactiveOffers Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: devteam@interactiveoffers.com
+Maintainer: dev@interactiveoffers.com
 ```
 
 # Description
 
-Module that connects to interactiveOffers demand sources. Param pubId is required.
+Module that connects to interactiveOffers demand sources. Param partnerId is required.
 
 # Test Parameters
 ```
@@ -24,11 +24,11 @@ Module that connects to interactiveOffers demand sources. Param pubId is require
                    {
                        bidder: "interactiveOffers",
                        params: {
-                           pubId: '10',
-                           tmax: 5000
+                           partnerId: "abcd1234",
+                           tmax: 250
                        }
                    }
                ]
            }
        ];
-```
\ No newline at end of file
+```
diff --git a/modules/intersectionRtdProvider.js b/modules/intersectionRtdProvider.js
new file mode 100644
index 00000000000..c7d03b25b57
--- /dev/null
+++ b/modules/intersectionRtdProvider.js
@@ -0,0 +1,115 @@
+import {submodule} from '../src/hook.js';
+import {isFn, logError} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {includes} from '../src/polyfill.js';
+import '../src/adapterManager.js';
+
+let observerAvailable = true;
+function getIntersectionData(requestBidsObject, onDone, providerConfig, userConsent) {
+  const intersectionMap = {};
+  const placeholdersMap = {};
+  let done = false;
+  if (!observerAvailable) return complete();
+  const observer = new IntersectionObserver(observerCallback, {threshold: 0.5});
+  const adUnitCodes = requestBidsObject.adUnitCodes || [];
+  const auctionDelay = config.getConfig('realTimeData.auctionDelay') || 0;
+  const waitForIt = providerConfig.waitForIt;
+  let adUnits = requestBidsObject.adUnits || getGlobal().adUnits || [];
+  if (adUnitCodes.length) {
+    adUnits = adUnits.filter(unit => includes(adUnitCodes, unit.code));
+  }
+  let checkTimeoutId;
+  findAndObservePlaceholders();
+  if (auctionDelay > 0) {
+    setTimeout(complete, auctionDelay);
+  }
+  function findAndObservePlaceholders() {
+    const observed = adUnits.filter((unit) => {
+      const code = unit.code;
+      if (placeholdersMap[code]) return true;
+      const ph = document.getElementById(code);
+      if (ph) {
+        placeholdersMap[code] = ph;
+        observer.observe(ph);
+        return true;
+      }
+    });
+    if (
+      observed.length === adUnits.length ||
+      !waitForIt ||
+      auctionDelay <= 0
+    ) {
+      return;
+    }
+    checkTimeoutId = setTimeout(findAndObservePlaceholders);
+  }
+  function observerCallback(entries) {
+    let entry = entries.pop();
+    while (entry) {
+      const target = entry.target;
+      const id = target.getAttribute('id');
+      if (id) {
+        const intersection = intersectionMap[id];
+        if (!intersection || intersection.time < entry.time) {
+          intersectionMap[id] = {
+            'boundingClientRect': cloneRect(entry.boundingClientRect),
+            'intersectionRect': cloneRect(entry.intersectionRect),
+            'rootRect': cloneRect(entry.rootRect),
+            'intersectionRatio': entry.intersectionRatio,
+            'isIntersecting': entry.isIntersecting,
+            'time': entry.time
+          };
+          if (adUnits.every(unit => !!intersectionMap[unit.code])) {
+            complete();
+          }
+        }
+      }
+      entry = entries.pop();
+    }
+  }
+  function complete() {
+    if (done) return;
+    if (checkTimeoutId) clearTimeout(checkTimeoutId);
+    done = true;
+    checkTimeoutId = null;
+    observer && observer.disconnect();
+    adUnits && adUnits.forEach((unit) => {
+      const intersection = intersectionMap[unit.code];
+      if (intersection && unit.bids) {
+        unit.bids.forEach(bid => bid.intersection = intersection);
+      }
+    });
+    onDone();
+  }
+}
+function init(moduleConfig) {
+  if (!isFn(window.IntersectionObserver)) {
+    logError('IntersectionObserver is not defined');
+    observerAvailable = false;
+  } else {
+    observerAvailable = true;
+  }
+  return observerAvailable;
+}
+function cloneRect(rect) {
+  return rect ? {
+    'left': rect.left,
+    'top': rect.top,
+    'right': rect.right,
+    'bottom': rect.bottom,
+    'width': rect.width,
+    'height': rect.height,
+    'x': rect.x,
+    'y': rect.y,
+  } : rect;
+}
+export const intersectionSubmodule = {
+  name: 'intersection',
+  getBidRequestData: getIntersectionData,
+  init: init,
+};
+function registerSubModule() {
+  submodule('realTimeData', intersectionSubmodule);
+}
+registerSubModule();
diff --git a/modules/invamiaBidAdapter.js b/modules/invamiaBidAdapter.js
new file mode 100644
index 00000000000..2d36fb77e16
--- /dev/null
+++ b/modules/invamiaBidAdapter.js
@@ -0,0 +1,92 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'invamia';
+const ENDPOINT_URL = 'https://ad.invamia.com/delivery/impress';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bidRequest The bid request params to validate.
+   * @return boolean True if this is a valid bid request, and false otherwise.
+   */
+  isBidRequestValid: function(bidRequest) {
+    return !!bidRequest.params.zoneId;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Array<BidRequest>} validBidRequests an array of bid requests
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests) {
+    let serverRequests = [];
+
+    validBidRequests.forEach(bidRequest => {
+      const sizes = bidRequest.mediaTypes.banner.sizes;
+
+      sizes.forEach(([width, height]) => {
+        bidRequest.params.requestedSizes = [width, height];
+
+        const payload = {
+          ctype: 'div',
+          pzoneid: bidRequest.params.zoneId,
+          width,
+          height,
+        };
+
+        const payloadString = Object.keys(payload).map(k => k + '=' + encodeURIComponent(payload[k])).join('&');
+
+        serverRequests.push({
+          method: 'GET',
+          url: ENDPOINT_URL,
+          data: payloadString,
+          bidderRequest: bidRequest,
+        });
+      });
+    });
+
+    return serverRequests;
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidderRequest A matched bid request for this response.
+   * @return Array<BidResponse> An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, {bidderRequest}) {
+    const response = serverResponse.body;
+    const bidResponses = [];
+
+    if (response && response.template && response.template.html) {
+      const {bidId} = bidderRequest;
+      const [width, height] = bidderRequest.params.requestedSizes;
+
+      const bidResponse = {
+        requestId: bidId,
+        cpm: response.hb.cpm,
+        creativeId: response.banner.hash,
+        currency: 'USD',
+        netRevenue: response.hb.netRevenue,
+        ttl: 600,
+        ad: response.template.html,
+        mediaType: 'banner',
+        meta: {
+          advertiserDomains: response.hb.adomains || [],
+        },
+        width,
+        height,
+      };
+
+      bidResponses.push(bidResponse);
+    }
+
+    return bidResponses;
+  },
+}
+
+registerBidder(spec);
diff --git a/modules/invamiaBidAdapter.md b/modules/invamiaBidAdapter.md
new file mode 100644
index 00000000000..c8e12808123
--- /dev/null
+++ b/modules/invamiaBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name: Invamia Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: contact@invamia.com
+```
+
+# Description
+
+Module that connects to Invamia demand sources.
+
+# Test Parameters
+
+```
+    const adUnits = [{
+      code: 'test-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        },
+      },
+      bids: [{
+        bidder: 'invamia',
+        params: {
+          zoneId: 379783,
+        },
+      }],
+    }];
+```
diff --git a/modules/invibesBidAdapter.js b/modules/invibesBidAdapter.js
index 220aed47e15..c3e5cf6cca8 100644
--- a/modules/invibesBidAdapter.js
+++ b/modules/invibesBidAdapter.js
@@ -1,19 +1,23 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
+import { logInfo } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getStorageManager} from '../src/storageManager.js';
 
 const CONSTANTS = {
   BIDDER_CODE: 'invibes',
-  BID_ENDPOINT: 'https://bid.videostep.com/Bid/VideoAdContent',
+  BID_ENDPOINT: '.videostep.com/Bid/VideoAdContent',
+  BID_SUBDOMAIN: 'https://bid',
   SYNC_ENDPOINT: 'https://k.r66net.com/GetUserSync',
   TIME_TO_LIVE: 300,
   DEFAULT_CURRENCY: 'EUR',
-  PREBID_VERSION: 2,
+  PREBID_VERSION: 9,
   METHOD: 'GET',
-  INVIBES_VENDOR_ID: 436
+  INVIBES_VENDOR_ID: 436,
+  USERID_PROVIDERS: ['pubcid', 'pubProvidedId', 'uid2', 'zeotapIdPlus', 'id5id'],
+  META_TAXONOMY: ['networkId', 'networkName', 'agencyId', 'agencyName', 'advertiserId', 'advertiserName', 'advertiserDomains', 'brandId', 'brandName', 'primaryCatId', 'secondaryCatIds', 'mediaType'],
+  DISABLE_USER_SYNC: true
 };
 
-const storage = getStorageManager(CONSTANTS.INVIBES_VENDOR_ID);
+const storage = getStorageManager({gvlid: CONSTANTS.INVIBES_VENDOR_ID, bidderCode: CONSTANTS.BIDDER_CODE});
 
 export const spec = {
   code: CONSTANTS.BIDDER_CODE,
@@ -37,17 +41,7 @@ export const spec = {
   interpretResponse: function (responseObj, requestParams) {
     return handleResponse(responseObj, requestParams != null ? requestParams.bidRequests : null);
   },
-  getUserSyncs: function (syncOptions) {
-    if (syncOptions.iframeEnabled) {
-      handlePostMessage();
-      const syncUrl = buildSyncUrl();
-
-      return {
-        type: 'iframe',
-        url: syncUrl
-      };
-    }
-  }
+  getUserSyncs: getUserSync,
 };
 
 registerBidder(spec);
@@ -55,14 +49,15 @@ registerBidder(spec);
 // some state info is required: cookie info, unique user visit id
 const topWin = getTopMostWindow();
 let invibes = topWin.invibes = topWin.invibes || {};
+invibes.purposes = invibes.purposes || [false, false, false, false, false, false, false, false, false, false];
+invibes.legitimateInterests = invibes.legitimateInterests || [false, false, false, false, false, false, false, false, false, false];
+invibes.placementBids = invibes.placementBids || [];
+invibes.pushedCids = invibes.pushedCids || {};
+let preventPageViewEvent = false;
 let _customUserSync;
+let _disableUserSyncs;
 
 function isBidRequestValid(bid) {
-  if (invibes && typeof invibes.bidResponse === 'object') {
-    utils.logInfo('Invibes Adapter - Bid response already received. Invibes only responds to one bid request per user visit');
-    return false;
-  }
-
   if (typeof bid.params !== 'object') {
     return false;
   }
@@ -75,56 +70,89 @@ function isBidRequestValid(bid) {
   return true;
 }
 
+function getUserSync(syncOptions) {
+  if (syncOptions.iframeEnabled) {
+    if (!(_disableUserSyncs == null || _disableUserSyncs == undefined ? CONSTANTS.DISABLE_USER_SYNC : _disableUserSyncs)) {
+      const syncUrl = buildSyncUrl();
+      return {
+        type: 'iframe',
+        url: syncUrl
+      };
+    }
+  }
+}
+
 function buildRequest(bidRequests, bidderRequest) {
   bidderRequest = bidderRequest || {};
   const _placementIds = [];
-  let _loginId, _customEndpoint;
+  const _adUnitCodes = [];
+  let _customEndpoint, _userId, _domainId;
   let _ivAuctionStart = bidderRequest.auctionStart || Date.now();
 
   bidRequests.forEach(function (bidRequest) {
     bidRequest.startTime = new Date().getTime();
     _placementIds.push(bidRequest.params.placementId);
-    _loginId = _loginId || bidRequest.params.loginId;
+    _adUnitCodes.push(bidRequest.adUnitCode);
+    _domainId = _domainId || bidRequest.params.domainId;
     _customEndpoint = _customEndpoint || bidRequest.params.customEndpoint;
     _customUserSync = _customUserSync || bidRequest.params.customUserSync;
+    _disableUserSyncs = bidRequest?.params?.disableUserSyncs;
+    _userId = _userId || bidRequest.userId;
   });
 
-  invibes.visitId = invibes.visitId || generateRandomId();
-
-  cookieDomain = detectTopmostCookieDomain();
-  invibes.noCookies = invibes.noCookies || invibes.getCookie('ivNoCookie');
-  invibes.optIn = invibes.optIn || invibes.getCookie('ivOptIn') || readGdprConsent(bidderRequest.gdprConsent);
+  invibes.optIn = invibes.optIn || readGdprConsent(bidderRequest.gdprConsent);
 
-  initDomainId(invibes.domainOptions);
+  invibes.visitId = invibes.visitId || generateRandomId();
 
   const currentQueryStringParams = parseQueryStringParams();
-
+  let userIdModel = getUserIds(_userId);
+  let bidParamsJson = {
+    placementIds: _placementIds,
+    adUnitCodes: _adUnitCodes,
+    auctionStartTime: _ivAuctionStart,
+    bidVersion: CONSTANTS.PREBID_VERSION
+  };
+  if (userIdModel) {
+    bidParamsJson.userId = userIdModel;
+  }
   let data = {
     location: getDocumentLocation(topWin),
     videoAdHtmlId: generateRandomId(),
     showFallback: currentQueryStringParams['advs'] === '0',
-    ivbsCampIdsLocal: invibes.getCookie('IvbsCampIdsLocal'),
-
-    bidParamsJson: JSON.stringify({
-      placementIds: _placementIds,
-      loginId: _loginId,
-      auctionStartTime: _ivAuctionStart,
-      bidVersion: CONSTANTS.PREBID_VERSION
-    }),
+    ivbsCampIdsLocal: readFromLocalStorage('IvbsCampIdsLocal'),
+
+    bidParamsJson: JSON.stringify(bidParamsJson),
     capCounts: getCappedCampaignsAsString(),
+    pcids: Object.keys(invibes.pushedCids).join(','),
 
     vId: invibes.visitId,
     width: topWin.innerWidth,
     height: topWin.innerHeight,
 
-    noc: !cookieDomain,
     oi: invibes.optIn,
 
-    kw: keywords
+    kw: keywords,
+    purposes: invibes.purposes.toString(),
+    li: invibes.legitimateInterests.toString(),
+
+    tc: invibes.gdpr_consent,
+    isLocalStorageEnabled: storage.hasLocalStorage(),
+    preventPageViewEvent: preventPageViewEvent,
   };
 
-  if (invibes.dom.id) {
-    data.lId = invibes.dom.id;
+  let lid = readFromLocalStorage('ivbsdid');
+  if (!lid) {
+    let str = invibes.getCookie('ivbsdid');
+    if (str) {
+      try {
+        let cookieLid = JSON.parse(str);
+        lid = cookieLid.id ? cookieLid.id : cookieLid;
+      } catch (e) {
+      }
+    }
+  }
+  if (lid) {
+    data.lId = lid;
   }
 
   const parametersToPassForward = 'videoaddebug,advs,bvci,bvid,istop,trybvid,trybvci'.split(',');
@@ -137,11 +165,15 @@ function buildRequest(bidRequests, bidderRequest) {
     }
   }
 
+  let endpoint = createEndpoint(_customEndpoint, _domainId, _placementIds);
+
+  preventPageViewEvent = true;
+
   return {
     method: CONSTANTS.METHOD,
-    url: _customEndpoint || CONSTANTS.BID_ENDPOINT,
+    url: endpoint,
     data: data,
-    options: { withCredentials: true },
+    options: {withCredentials: true},
     // for POST: { contentType: 'application/json', withCredentials: true }
     bidRequests: bidRequests
   };
@@ -149,76 +181,190 @@ function buildRequest(bidRequests, bidderRequest) {
 
 function handleResponse(responseObj, bidRequests) {
   if (bidRequests == null || bidRequests.length === 0) {
-    utils.logInfo('Invibes Adapter - No bids have been requested');
+    logInfo('Invibes Adapter - No bids have been requested');
     return [];
   }
 
   if (!responseObj) {
-    utils.logInfo('Invibes Adapter - Bid response is empty');
+    logInfo('Invibes Adapter - Bid response is empty');
     return [];
   }
 
   responseObj = responseObj.body || responseObj;
   responseObj = responseObj.videoAdContentResult || responseObj;
 
-  let bidModel = responseObj.BidModel;
-  if (typeof bidModel !== 'object') {
-    utils.logInfo('Invibes Adapter - Bidding is not configured');
-    return [];
+  if (responseObj.ShouldSetLId && responseObj.LId) {
+    if ((!invibes.optIn || !invibes.purposes[0]) && responseObj.PrivacyPolicyRule && responseObj.TcModel && responseObj.TcModel.PurposeConsents) {
+      invibes.optIn = responseObj.PrivacyPolicyRule;
+      invibes.purposes = responseObj.TcModel.PurposeConsents;
+    }
+
+    setInLocalStorage('ivbsdid', responseObj.LId);
   }
 
   if (typeof invibes.bidResponse === 'object') {
-    utils.logInfo('Invibes Adapter - Bid response already received. Invibes only responds to one bid request per user visit');
-    return [];
+    if (responseObj.MultipositionEnabled === true) {
+      invibes.bidResponse.AdPlacements = invibes.bidResponse.AdPlacements.concat(responseObj.AdPlacements);
+    } else {
+      logInfo('Invibes Adapter - Bid response already received. Invibes only responds to one bid request per user visit');
+      return [];
+    }
+  } else {
+    invibes.bidResponse = responseObj;
   }
 
-  invibes.bidResponse = responseObj;
+  const bidResponses = [];
+  for (let i = 0; i < bidRequests.length; i++) {
+    let bidRequest = bidRequests[i];
+    let usedPlacementId = responseObj.UseAdUnitCode === true
+      ? bidRequest.params.placementId + '_' + bidRequest.adUnitCode
+      : bidRequest.params.placementId;
+
+    if (invibes.placementBids.indexOf(usedPlacementId) > -1) {
+      logInfo('Invibes Adapter - Placement was previously bid on ' + usedPlacementId);
+      continue;
+    }
 
-  let ads = responseObj.Ads;
+    let requestPlacement = null;
+    if (responseObj.AdPlacements != null) {
+      for (let j = 0; j < responseObj.AdPlacements.length; j++) {
+        let bidModel = responseObj.AdPlacements[j].BidModel;
+        if (bidModel != null && bidModel.PlacementId == usedPlacementId) {
+          requestPlacement = responseObj.AdPlacements[j];
+          break;
+        }
+      }
+    } else {
+      let bidModel = responseObj.BidModel;
+      if (bidModel != null && bidModel.PlacementId == usedPlacementId) {
+        requestPlacement = responseObj;
+      }
+    }
 
+    let bid = createBid(bidRequest, requestPlacement, responseObj.MultipositionEnabled, usedPlacementId);
+    if (bid !== null) {
+      invibes.placementBids.push(usedPlacementId);
+      bidResponses.push(bid);
+    }
+  }
+
+  return bidResponses;
+}
+
+function createBid(bidRequest, requestPlacement, multipositionEnabled, usedPlacementId) {
+  if (requestPlacement === null || requestPlacement.BidModel === null) {
+    logInfo('Invibes Adapter - Placement not configured for bidding ' + usedPlacementId);
+    return null;
+  }
+
+  let bidModel = requestPlacement.BidModel;
+  let ads = requestPlacement.Ads;
   if (!Array.isArray(ads) || ads.length < 1) {
-    if (responseObj.AdReason != null) {
-      utils.logInfo('Invibes Adapter - ' + responseObj.AdReason);
+    if (requestPlacement.AdReason != null) {
+      logInfo('Invibes Adapter - No ads ' + requestPlacement.AdReason);
     }
 
-    utils.logInfo('Invibes Adapter - No ads available');
-    return [];
+    logInfo('Invibes Adapter - No ads available');
+    return null;
   }
 
   let ad = ads[0];
+  let size = getBiggerSize(bidRequest.sizes);
+
+  if (multipositionEnabled === true) {
+    if (Object.keys(invibes.pushedCids).length > 0) {
+      if (ad.Blcids != null && ad.Blcids.length > 0) {
+        let blacklistsPushedCids = Object.keys(invibes.pushedCids).some(function(pushedCid) {
+          return ad.Blcids.indexOf(parseInt(pushedCid)) > -1;
+        });
+
+        if (blacklistsPushedCids) {
+          logInfo('Invibes Adapter - Ad blacklists pushed ids');
+          return null;
+        }
+      }
 
-  if (bidModel.PlacementId == null) {
-    utils.logInfo('Invibes Adapter - No Placement Id in response');
-    return [];
+      let isBlacklisted = Object.keys(invibes.pushedCids).some(function(pushedCid) {
+        return invibes.pushedCids[pushedCid].indexOf(ad.Cid) > -1;
+      });
+      if (isBlacklisted) {
+        logInfo('Invibes Adapter - Ad is blacklisted');
+        return null;
+      }
+    }
   }
 
-  const bidResponses = [];
-  for (let i = 0; i < bidRequests.length; i++) {
-    let bidRequest = bidRequests[i];
+  invibes.pushedCids[ad.Cid] = ad.Blcids || [];
+  const now = Date.now();
+  logInfo('Bid auction started at ' + bidModel.AuctionStartTime + ' . Invibes registered the bid at ' + now + ' ; bid request took a total of ' + (now - bidModel.AuctionStartTime) + ' ms.');
 
-    if (bidModel.PlacementId == bidRequest.params.placementId) {
-      let size = getBiggerSize(bidRequest.sizes);
-
-      bidResponses.push({
-        requestId: bidRequest.bidId,
-        cpm: ad.BidPrice,
-        width: bidModel.Width || size[0],
-        height: bidModel.Height || size[1],
-        creativeId: ad.VideoExposedId,
-        currency: bidModel.Currency || CONSTANTS.DEFAULT_CURRENCY,
-        netRevenue: true,
-        ttl: CONSTANTS.TIME_TO_LIVE,
-        ad: renderCreative(bidModel)
-      });
+  return {
+    requestId: bidRequest.bidId,
+    cpm: ad.BidPrice,
+    width: bidModel.Width || size[0],
+    height: bidModel.Height || size[1],
+    creativeId: ad.VideoExposedId,
+    currency: bidModel.Currency || CONSTANTS.DEFAULT_CURRENCY,
+    netRevenue: true,
+    ttl: CONSTANTS.TIME_TO_LIVE,
+    ad: renderCreative(bidModel),
+    meta: addMeta(bidModel.Meta)
+  };
+}
 
-      const now = Date.now();
-      ivLogger.info('Bid auction started at ' + bidModel.AuctionStartTime + ' . Invibes registered the bid at ' + now + ' ; bid request took a total of ' + (now - bidModel.AuctionStartTime) + ' ms.');
-    } else {
-      utils.logInfo('Invibes Adapter - Incorrect Placement Id: ' + bidRequest.params.placementId);
+function createEndpoint(customEndpoint, domainId, placementIds) {
+  if (customEndpoint != null) {
+    return customEndpoint;
+  }
+
+  if (domainId != null) {
+    return extractEndpointFromId(domainId - 1000);
+  }
+
+  if (placementIds.length > 0) {
+    for (var i = 0; i < placementIds.length; i++) {
+      const id = extractFromPlacement(placementIds[i]);
+      if (id != null) {
+        return extractEndpointFromId(id);
+      }
     }
   }
 
-  return bidResponses;
+  return extractEndpointFromId(1);
+}
+
+function extractEndpointFromId(domainId) {
+  if (domainId < 2) {
+    return CONSTANTS.BID_SUBDOMAIN + CONSTANTS.BID_ENDPOINT;
+  }
+
+  return CONSTANTS.BID_SUBDOMAIN + domainId + CONSTANTS.BID_ENDPOINT;
+}
+
+function extractFromPlacement(placementId) {
+  if (placementId == null) { return null; }
+
+  var pattern = /_ivbs([0-9]+)/g;
+
+  var match = pattern.exec(placementId);
+  if (match != null && match[1] != null) {
+    return parseInt(match[1]);
+  }
+
+  return null;
+}
+
+function addMeta(bidModelMeta) {
+  var meta = {};
+  if (bidModelMeta != null) {
+    for (let i = 0; i < CONSTANTS.META_TAXONOMY.length; i++) {
+      if (bidModelMeta.hasOwnProperty(CONSTANTS.META_TAXONOMY[i])) {
+        meta[CONSTANTS.META_TAXONOMY[i]] = bidModelMeta[CONSTANTS.META_TAXONOMY[i]];
+      }
+    }
+  }
+
+  return meta;
 }
 
 function generateRandomId() {
@@ -229,9 +375,29 @@ function getDocumentLocation(topWin) {
   return topWin.location.href.substring(0, 300).split(/[?#]/)[0];
 }
 
+function getUserIds(bidUserId) {
+  let userId;
+  if (bidUserId) {
+    CONSTANTS.USERID_PROVIDERS.forEach(provider => {
+      if (bidUserId[provider]) {
+        userId = userId || {};
+        userId[provider] = bidUserId[provider];
+      }
+    });
+  }
+
+  return userId;
+}
+
 function parseQueryStringParams() {
   let params = {};
-  try { params = JSON.parse(localStorage.ivbs); } catch (e) { }
+  try {
+    let storedParam = storage.getDataFromLocalStorage('ivbs');
+    if (storedParam != null) {
+      params = JSON.parse(storedParam);
+    }
+  } catch (e) {
+  }
   let re = /[\\?&]([^=]+)=([^\\?&#]+)/g;
   let m;
   while ((m = re.exec(window.location.href)) != null) {
@@ -258,9 +424,12 @@ function getTopMostWindow() {
 
   try {
     while (top !== res) {
-      if (res.parent.location.href.length) { res = res.parent; }
+      if (res.parent.location.href.length) {
+        res = res.parent;
+      }
     }
-  } catch (e) { }
+  } catch (e) {
+  }
 
   return res;
 }
@@ -275,9 +444,29 @@ function renderCreative(bidModel) {
     .replace('creativeHtml', bidModel.CreativeHtml);
 }
 
+function readFromLocalStorage(key) {
+  if (invibes.GdprModuleInstalled && (!invibes.optIn || !invibes.purposes[0])) {
+    return;
+  }
+
+  return storage.getDataFromLocalStorage(key) || '';
+}
+
+function setInLocalStorage(key, value) {
+  if (!invibes.optIn || !invibes.purposes[0]) {
+    return;
+  }
+
+  storage.setDataInLocalStorage(key, value);
+}
+
 function getCappedCampaignsAsString() {
   const key = 'ivvcap';
 
+  if (!invibes.optIn || !invibes.purposes[0]) {
+    return '';
+  }
+
   let loadData = function () {
     try {
       return JSON.parse(storage.getDataFromLocalStorage(key)) || {};
@@ -310,94 +499,126 @@ function getCappedCampaignsAsString() {
     clearExpired();
     let data = loadData();
     return Object.keys(data)
-      .filter(function (k) { return data.hasOwnProperty(k); })
+      .filter(function (k) {
+        return data.hasOwnProperty(k);
+      })
       .sort()
-      .map(function (k) { return [k, data[k][0]]; });
+      .map(function (k) {
+        return [k, data[k][0]];
+      });
   };
 
   return getCappedCampaigns()
-    .map(function (record) { return record.join('='); })
+    .map(function (record) {
+      return record.join('=');
+    })
     .join(',');
 }
 
-const noop = function () { };
-
-function initLogger() {
-  if (storage.hasLocalStorage() && localStorage.InvibesDEBUG) {
-    return window.console;
-  }
-
-  return { info: noop, error: noop, log: noop, warn: noop, debug: noop };
-}
-
 function buildSyncUrl() {
   let syncUrl = _customUserSync || CONSTANTS.SYNC_ENDPOINT;
   syncUrl += '?visitId=' + invibes.visitId;
   syncUrl += '&optIn=' + invibes.optIn;
 
-  const did = invibes.getCookie('ivbsdid');
-  if (did) {
-    syncUrl += '&ivbsdid=' + encodeURIComponent(did);
+  let did = readFromLocalStorage('ivbsdid');
+  if (!did) {
+    let str = invibes.getCookie('ivbsdid');
+    if (str) {
+      try {
+        let cookieLid = JSON.parse(str);
+        did = cookieLid.id ? cookieLid.id : cookieLid;
+      } catch (e) {
+      }
+    }
   }
 
-  const bks = invibes.getCookie('ivvbks');
-  if (bks) {
-    syncUrl += '&ivvbks=' + encodeURIComponent(bks);
+  if (did) {
+    syncUrl += '&ivbsdid=' + encodeURIComponent(did);
   }
 
   return syncUrl;
 }
 
-function handlePostMessage() {
-  try {
-    if (window.addEventListener) {
-      window.addEventListener('message', acceptPostMessage);
-    }
-  } catch (e) { }
-}
-
-function acceptPostMessage(e) {
-  let msg = e.data || {};
-  if (msg.ivbscd === 1) {
-    invibes.setCookie(msg.name, msg.value, msg.exdays, msg.domain);
-  } else if (msg.ivbscd === 2) {
-    invibes.dom.graduate();
-  }
-}
-
 function readGdprConsent(gdprConsent) {
   if (gdprConsent && gdprConsent.vendorData) {
+    invibes.GdprModuleInstalled = true;
+    invibes.gdpr_consent = getVendorConsentData(gdprConsent.vendorData);
+
     if (!gdprConsent.vendorData.gdprApplies || gdprConsent.vendorData.hasGlobalConsent) {
+      var index;
+      for (index = 0; index < invibes.purposes.length; ++index) {
+        invibes.purposes[index] = true;
+      }
+
+      for (index = 0; index < invibes.legitimateInterests.length; ++index) {
+        invibes.legitimateInterests[index] = true;
+      }
       return 2;
     }
 
     let purposeConsents = getPurposeConsents(gdprConsent.vendorData);
 
-    if (purposeConsents == null) { return 0; }
-    let properties = Object.keys(purposeConsents);
-    let purposeConsentsCounter = getPurposeConsentsCounter(gdprConsent.vendorData);
-
-    if (properties.length < purposeConsentsCounter) {
+    if (purposeConsents == null) {
       return 0;
     }
+    let purposesLength = getPurposeConsentsCounter(gdprConsent.vendorData);
 
-    for (let i = 0; i < purposeConsentsCounter; i++) {
-      if (!purposeConsents[properties[i]] || purposeConsents[properties[i]] === 'false') { return 0; }
+    if (!tryCopyValueToArray(purposeConsents, invibes.purposes, purposesLength)) {
+      return 0;
     }
 
+    let legitimateInterests = getLegitimateInterests(gdprConsent.vendorData);
+    tryCopyValueToArray(legitimateInterests, invibes.legitimateInterests, 10);
+
+    let invibesVendorId = CONSTANTS.INVIBES_VENDOR_ID.toString(10);
     let vendorConsents = getVendorConsents(gdprConsent.vendorData);
-    if (vendorConsents == null || vendorConsents[CONSTANTS.INVIBES_VENDOR_ID.toString(10)] == null) {
+    let vendorHasLegitimateInterest = getVendorLegitimateInterest(gdprConsent.vendorData)[invibesVendorId] === true;
+    if (vendorConsents == null || vendorConsents[invibesVendorId] == null) {
       return 4;
     }
 
-    if (vendorConsents[CONSTANTS.INVIBES_VENDOR_ID.toString(10)] === false) { return 0; }
+    if (vendorConsents[invibesVendorId] === false && vendorHasLegitimateInterest === false) {
+      return 0;
+    }
 
     return 2;
   }
 
+  invibes.GdprModuleInstalled = false;
   return 0;
 }
 
+function tryCopyValueToArray(value, target, length) {
+  if (value instanceof Array) {
+    for (let i = 0; i < length && i < value.length; i++) {
+      target[i] = !((value[i] === false || value[i] === 'false' || value[i] == null));
+    }
+    return true;
+  }
+  if (typeof value === 'object' && value !== null) {
+    let i = 0;
+    for (let prop in value) {
+      if (i === length) {
+        break;
+      }
+
+      if (value.hasOwnProperty(prop)) {
+        let parsedProp = parseInt(prop);
+        if (isNaN(parsedProp)) {
+          target[i] = !((value[prop] === false || value[prop] === 'false' || value[prop] == null));
+        } else {
+          target[parsedProp - 1] = !((value[prop] === false || value[prop] === 'false' || value[prop] == null));
+        }
+
+        i++;
+      }
+    }
+    return true;
+  }
+
+  return false;
+}
+
 function getPurposeConsentsCounter(vendorData) {
   if (vendorData.purpose && vendorData.purpose.consents) {
     return 10;
@@ -418,6 +639,23 @@ function getPurposeConsents(vendorData) {
   return null;
 }
 
+function getLegitimateInterests(vendorData) {
+  if (vendorData.purpose && vendorData.purpose.legitimateInterests) {
+    return vendorData.purpose.legitimateInterests;
+  }
+
+  return null;
+}
+
+function getVendorConsentData(vendorData) {
+  if (vendorData.purpose && vendorData.purpose.consents) {
+    if (vendorData.tcString != null) {
+      return vendorData.tcString;
+    }
+  }
+  return vendorData.consentData;
+};
+
 function getVendorConsents(vendorData) {
   if (vendorData.vendor && vendorData.vendor.consents) {
     return vendorData.vendor.consents;
@@ -430,144 +668,37 @@ function getVendorConsents(vendorData) {
   return null;
 }
 
-const ivLogger = initLogger();
+function getVendorLegitimateInterest(vendorData) {
+  if (vendorData.vendor && vendorData.vendor.legitimateInterests) {
+    return vendorData.vendor.legitimateInterests;
+  }
+
+  return {};
+}
 
 /// Local domain cookie management =====================
 invibes.Uid = {
   generate: function () {
     let maxRand = parseInt('zzzzzz', 36)
-    let mkRand = function () { return Math.floor(Math.random() * maxRand).toString(36); };
+    let mkRand = function () {
+      return Math.floor(Math.random() * maxRand).toString(36);
+    };
     let rand1 = mkRand();
     let rand2 = mkRand();
     return rand1 + rand2;
   }
 };
 
-let cookieDomain;
 invibes.getCookie = function (name) {
-  if (!storage.cookiesAreEnabled()) { return; }
-  let i, x, y;
-  let cookies = document.cookie.split(';');
-  for (i = 0; i < cookies.length; i++) {
-    x = cookies[i].substr(0, cookies[i].indexOf('='));
-    y = cookies[i].substr(cookies[i].indexOf('=') + 1);
-    x = x.replace(/^\s+|\s+$/g, '');
-    if (x === name) {
-      return unescape(y);
-    }
-  }
-};
-
-invibes.setCookie = function (name, value, exdays, domain) {
-  if (!storage.cookiesAreEnabled()) { return; }
-  let whiteListed = name == 'ivNoCookie' || name == 'IvbsCampIdsLocal';
-  if (invibes.noCookies && !whiteListed && (exdays || 0) >= 0) { return; }
-  if (exdays > 365) { exdays = 365; }
-  domain = domain || cookieDomain;
-  let exdate = new Date();
-  let exms = exdays * 24 * 60 * 60 * 1000;
-  exdate.setTime(exdate.getTime() + exms);
-  storage.setCookie(name, value, exdate.toUTCString(), undefined, domain);
-};
-
-let detectTopmostCookieDomain = function () {
-  let testCookie = invibes.Uid.generate();
-  let hostParts = location.hostname.split('.');
-  if (hostParts.length === 1) {
-    return location.hostname;
-  }
-  for (let i = hostParts.length - 1; i >= 0; i--) {
-    let domain = '.' + hostParts.slice(i).join('.');
-    invibes.setCookie(testCookie, testCookie, 1, domain);
-    let val = invibes.getCookie(testCookie);
-    if (val === testCookie) {
-      invibes.setCookie(testCookie, testCookie, -1, domain);
-      return domain;
-    }
+  if (!storage.cookiesAreEnabled()) {
+    return;
   }
-};
-
-let initDomainId = function (options) {
-  if (invibes.dom) { return; }
-
-  options = options || {};
-
-  let cookiePersistence = {
-    cname: 'ivbsdid',
-    load: function () {
-      let str = invibes.getCookie(this.cname) || '';
-      try {
-        return JSON.parse(str);
-      } catch (e) { }
-    },
-    save: function (obj) {
-      invibes.setCookie(this.cname, JSON.stringify(obj), 365);
-    }
-  };
 
-  let persistence = options.persistence || cookiePersistence;
-  let state;
-  let minHC = 2;
-
-  let validGradTime = function (state) {
-    if (!state.cr) { return false; }
-    let min = 151 * 10e9;
-    if (state.cr < min) {
-      return false;
-    }
-    let now = new Date().getTime();
-    let age = now - state.cr;
-    let minAge = 24 * 60 * 60 * 1000;
-    return age > minAge;
-  };
-
-  state = persistence.load() || {
-    id: invibes.Uid.generate(),
-    cr: new Date().getTime(),
-    hc: 1,
-  };
-
-  if (state.id.match(/\./)) {
-    state.id = invibes.Uid.generate();
+  if (invibes.GdprModuleInstalled && (!invibes.optIn || !invibes.purposes[0])) {
+    return;
   }
 
-  let graduate = function () {
-    if (!state.cr) { return; }
-    delete state.cr;
-    delete state.hc;
-    persistence.save(state);
-    setId();
-  };
-
-  let regenerateId = function () {
-    state.id = invibes.Uid.generate();
-    persistence.save(state);
-  };
-
-  let setId = function () {
-    invibes.dom = {
-      get id() {
-        return (!state.cr && invibes.optIn > 0) ? state.id : undefined;
-      },
-      get tempId() {
-        return (invibes.optIn > 0) ? state.id : undefined;
-      },
-      graduate: graduate,
-      regen: regenerateId
-    };
-  };
-
-  if (state.cr && !options.noVisit) {
-    if (state.hc < minHC) {
-      state.hc++;
-    }
-    if ((state.hc >= minHC && validGradTime(state)) || options.skipGraduation) {
-      graduate();
-    }
-  }
-  persistence.save(state);
-  setId();
-  ivLogger.info('Did=' + invibes.dom.id);
+  return storage.getCookie(name);
 };
 
 let keywords = (function () {
@@ -638,14 +769,16 @@ let keywords = (function () {
   }
   return kw;
 }());
-// =====================
+
+// ======================
 
 export function resetInvibes() {
   invibes.optIn = undefined;
-  invibes.noCookies = undefined;
   invibes.dom = undefined;
   invibes.bidResponse = undefined;
   invibes.domainOptions = undefined;
+  invibes.placementBids = [];
+  invibes.pushedCids = {};
 }
 
 export function stubDomainOptions(persistence) {
diff --git a/modules/invibesBidAdapter.md b/modules/invibesBidAdapter.md
index 06afba6344d..06588b6cb28 100644
--- a/modules/invibesBidAdapter.md
+++ b/modules/invibesBidAdapter.md
@@ -20,7 +20,8 @@ Connect to Invibes for bids.
                    {
                        bidder: 'invibes',
                        params: {
-                           placementId: '12345'
+                           placementId: '12345',
+                           domainId: 1001
                        }
                    }
                ]
diff --git a/modules/invisiblyAnalyticsAdapter.js b/modules/invisiblyAnalyticsAdapter.js
index d4fd3831210..a4f4eba271c 100644
--- a/modules/invisiblyAnalyticsAdapter.js
+++ b/modules/invisiblyAnalyticsAdapter.js
@@ -2,15 +2,15 @@
  * invisiblyAdapterAdapter.js - analytics adapter for Invisibly
  */
 import { ajaxBuilder } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
+import { generateUUID, logInfo } from '../src/utils.js';
+import CONSTANTS from '../src/constants.json';
+
 const DEFAULT_EVENT_URL = 'https://api.pymx5.com/v1/' + 'sites/events';
 const analyticsType = 'endpoint';
 const analyticsName = 'Invisibly Analytics Adapter:';
-
-const utils = require('../src/utils.js');
-const CONSTANTS = require('../src/constants.json');
 const ajax = ajaxBuilder(0);
 
 // Events needed
@@ -33,7 +33,7 @@ const {
 } = CONSTANTS;
 
 const _VERSION = 1;
-const _pageViewId = utils.generateUUID();
+const _pageViewId = generateUUID();
 let initOptions = null;
 let _startAuction = 0;
 let _bidRequestTimeout = 0;
@@ -122,7 +122,7 @@ function flush() {
       };
       ajax(
         initOptions.url,
-        () => utils.logInfo(`${analyticsName} sent events batch`),
+        () => logInfo(`${analyticsName} sent events batch`),
         JSON.stringify(payload),
         {
           contentType: 'application/json',
@@ -206,7 +206,7 @@ function handleEvent(eventType, eventArgs) {
 
 function sendEvent(event) {
   _eventQueue.push(event);
-  utils.logInfo(`${analyticsName}Event ${event.eventType}:`, event);
+  logInfo(`${analyticsName}Event ${event.eventType}:`, event);
 
   if (event.eventType === AUCTION_END) {
     flush();
diff --git a/modules/ipromBidAdapter.js b/modules/ipromBidAdapter.js
new file mode 100644
index 00000000000..eaf20ad3ad3
--- /dev/null
+++ b/modules/ipromBidAdapter.js
@@ -0,0 +1,80 @@
+import { logError } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'iprom';
+const ENDPOINT_URL = 'https://core.iprom.net/programmatic';
+const VERSION = 'v1.0.2';
+const DEFAULT_CURRENCY = 'EUR';
+const DEFAULT_NETREVENUE = true;
+const DEFAULT_TTL = 360;
+
+export const spec = {
+  code: BIDDER_CODE,
+  isBidRequestValid: function ({ bidder, params = {} } = {}) {
+    // id parameter checks
+    if (!params.id) {
+      logError(`${bidder}: Parameter 'id' missing`);
+      return false;
+    } else if (typeof params.id !== 'string') {
+      logError(`${bidder}: Parameter 'id' needs to be a string`);
+      return false;
+    }
+    // dimension parameter checks
+    if (!params.dimension) {
+      logError(`${bidder}: Required parameter 'dimension' missing`);
+      return false;
+    } else if (typeof params.dimension !== 'string') {
+      logError(`${bidder}: Parameter 'dimension' needs to be a string`);
+      return false;
+    }
+
+    return true;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const payload = {
+      bids: validBidRequests,
+      // TODO: please do not send internal data structures over the network
+      referer: bidderRequest.refererInfo.legacy,
+      version: VERSION
+    };
+    const payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payloadString
+    };
+  },
+
+  interpretResponse: function (serverResponse, request) {
+    let bids = serverResponse.body;
+
+    const bidResponses = [];
+
+    bids.forEach(bid => {
+      const b = {
+        ad: bid.ad,
+        requestId: bid.requestId,
+        cpm: bid.cpm,
+        width: bid.width,
+        height: bid.height,
+        creativeId: bid.creativeId,
+        currency: bid.currency || DEFAULT_CURRENCY,
+        netRevenue: bid.netRevenue || DEFAULT_NETREVENUE,
+        ttl: bid.ttl || DEFAULT_TTL,
+        meta: {},
+      };
+
+      if (bid.aDomains && bid.aDomains.length) {
+        b.meta.advertiserDomains = bid.aDomains;
+      }
+
+      bidResponses.push(b);
+    });
+
+    return bidResponses;
+  },
+}
+
+registerBidder(spec);
diff --git a/modules/ipromBidAdapter.md b/modules/ipromBidAdapter.md
new file mode 100644
index 00000000000..f7124e7c89c
--- /dev/null
+++ b/modules/ipromBidAdapter.md
@@ -0,0 +1,34 @@
+# Overview
+
+```
+Module Name: Iprom PreBid Adapter
+Module Type: Bidder Adapter
+Maintainer: support@iprom.si
+```
+
+# Description
+
+Module that connects to Iprom's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "iprom",
+                    params: {
+                        id: '1234',
+                        dimension: '300x250'
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/iqmBidAdapter.js b/modules/iqmBidAdapter.js
new file mode 100644
index 00000000000..1c36bafd3ce
--- /dev/null
+++ b/modules/iqmBidAdapter.js
@@ -0,0 +1,273 @@
+import {_each, deepAccess, getBidIdParameter, isArray} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {INSTREAM} from '../src/video.js';
+
+const BIDDER_CODE = 'iqm';
+const VERSION = 'v.1.0.0';
+const VIDEO_ORTB_PARAMS = [
+  'mimes',
+  'minduration',
+  'maxduration',
+  'placement',
+  'protocols',
+  'startdelay'
+];
+var ENDPOINT_URL = 'https://pbd.bids.iqm.com';
+
+export const spec = {
+  supportedMediaTypes: [BANNER, VIDEO],
+  code: BIDDER_CODE,
+  aliases: ['iqm'],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    const banner = deepAccess(bid, 'mediaTypes.banner');
+    const videoMediaType = deepAccess(bid, 'mediaTypes.video');
+    const context = deepAccess(bid, 'mediaTypes.video.context');
+    if ((videoMediaType && context === INSTREAM)) {
+      const videoBidderParams = deepAccess(bid, 'params.video', {});
+
+      if (!Array.isArray(videoMediaType.playerSize)) {
+        return false;
+      }
+
+      if (!videoMediaType.context) {
+        return false;
+      }
+
+      const videoParams = {
+        ...videoMediaType,
+        ...videoBidderParams
+      };
+
+      if (!Array.isArray(videoParams.mimes) || videoParams.mimes.length === 0) {
+        return false;
+      }
+
+      if (!Array.isArray(videoParams.protocols) || videoParams.protocols.length === 0) {
+        return false;
+      }
+
+      if (
+        typeof videoParams.placement !== 'undefined' &&
+        typeof videoParams.placement !== 'number'
+      ) {
+        return false;
+      }
+      if (
+        videoMediaType.context === INSTREAM &&
+        typeof videoParams.startdelay !== 'undefined' &&
+        typeof videoParams.startdelay !== 'number'
+      ) {
+        return false;
+      }
+
+      return !!(bid && bid.params && bid.params.publisherId && bid.params.placementId);
+    } else {
+      if (banner === 'undefined') {
+        return false;
+      }
+      return !!(bid && bid.params && bid.params.publisherId && bid.params.placementId);
+    }
+  },
+  /**
+   * Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
+   *It prepares a bid request with the required information for the DSP side and sends this request to alloted endpoint
+   * parameter{validBidRequests, bidderRequest} bidderRequest object is useful because it carries a couple of bid parameters that are global to all the bids.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map(bid => {
+      var finalRequest = {};
+      let bidfloor = getBidIdParameter('bidfloor', bid.params);
+
+      const imp = {
+        id: bid.bidId,
+        secure: 1,
+        bidfloor: bidfloor || 0,
+        displaymanager: 'Prebid.js',
+        displaymanagerver: VERSION,
+
+      }
+      if (deepAccess(bid, 'mediaTypes.banner')) {
+        imp.banner = getSize(bid.sizes);
+        imp.mediatype = 'banner';
+      } else if (deepAccess(bid, 'mediaTypes.video')) {
+        imp.video = _buildVideoORTB(bid);
+        imp.mediatype = 'video';
+      }
+      const site = getSite(bidderRequest);
+      let device = getDevice(bid.params);
+      finalRequest = {
+        sizes: bid.sizes,
+        id: bid.bidId,
+        publisherId: getBidIdParameter('publisherId', bid.params),
+        placementId: getBidIdParameter('placementId', bid.params),
+        device: device,
+        site: site,
+        imp: imp,
+        auctionId: bid.auctionId,
+        adUnitCode: bid.adUnitCode,
+        bidderRequestId: bid.bidderRequestId,
+        uuid: bid.bidId,
+        // TODO: please do not send internal data structures over the network
+        // I am not going to attempt to accommodate this, no way this is usable on their end, it changes way too frequently
+        bidderRequest
+      }
+      const request = {
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: finalRequest,
+        options: {
+          withCredentials: false
+        },
+
+      }
+      return request;
+    });
+  },
+  /**
+   * Takes Response from server as input and request.
+   *It parses the response from server side and generates bidresponses for with required rendering paramteres
+   * parameter{serverResponse, bidRequest} serverReponse: Response from the server side with ad creative.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = [];
+    serverResponse = serverResponse.body;
+    if (serverResponse && isArray(serverResponse.seatbid)) {
+      _each(serverResponse.seatbid, function (bidList) {
+        _each(bidList.bid, function (bid) {
+          const responseCPM = parseFloat(bid.price);
+          if (responseCPM > 0.0 && bid.impid) {
+            const bidResponse = {
+              requestId: bidRequest.data.id,
+              currency: serverResponse.cur || 'USD',
+              cpm: responseCPM,
+              netRevenue: true,
+              creativeId: bid.crid || '',
+              adUnitCode: bidRequest.data.adUnitCode,
+              auctionId: bidRequest.data.auctionId,
+              mediaType: bidRequest.data.imp.mediatype,
+
+              ttl: bid.ttl || config.getConfig('_bidderTimeout')
+            };
+
+            if (bidRequest.data.imp.mediatype === VIDEO) {
+              bidResponse.width = bid.w || bidRequest.data.imp.video.w;
+              bidResponse.height = bid.h || bidRequest.data.imp.video.h;
+              bidResponse.adResponse = {
+                content: bid.adm,
+                height: bidRequest.data.imp.video.h,
+                width: bidRequest.data.imp.video.w
+              };
+
+              if (bidRequest.data.imp.video.context === INSTREAM) {
+                bidResponse.vastUrl = bid.adm;
+              }
+            } else if (bidRequest.data.imp.mediatype === BANNER) {
+              bidResponse.ad = bid.adm;
+              bidResponse.width = bid.w || bidRequest.data.imp.banner.w;
+              bidResponse.height = bid.h || bidRequest.data.imp.banner.h;
+            }
+            bidResponses.push(bidResponse);
+          }
+        })
+      });
+    }
+    return bidResponses;
+  },
+
+};
+
+let getDevice = function (bidparams) {
+  const language = navigator.language ? 'language' : 'userLanguage';
+  return {
+    geo: bidparams.geo,
+    h: screen.height,
+    w: screen.width,
+    dnt: _getDNT() ? 1 : 0,
+    language: navigator[language].split('-')[0],
+    make: navigator.vendor ? navigator.vendor : '',
+    ua: navigator.userAgent,
+    devicetype: _isMobile() ? 1 : _isConnectedTV() ? 3 : 2
+  };
+};
+
+let _getDNT = function () {
+  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNotTrack === '1' || navigator.doNotTrack === 'yes';
+};
+
+let getSize = function (sizes) {
+  let sizeMap;
+  if (sizes.length === 2 && typeof sizes[0] === 'number' && typeof sizes[1] === 'number') {
+    sizeMap = {w: sizes[0], h: sizes[1]};
+  } else {
+    sizeMap = {w: sizes[0][0], h: sizes[0][1]};
+  }
+  return sizeMap;
+};
+
+function _isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(global.navigator.userAgent);
+}
+
+function _isConnectedTV() {
+  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(global.navigator.userAgent);
+}
+
+function getSite(bidderRequest) {
+  let domain = '';
+  let page = '';
+  let referrer = '';
+  const Id = 1;
+
+  const {refererInfo} = bidderRequest;
+
+  // TODO: are these the right refererInfo values?
+  domain = refererInfo.domain;
+  page = refererInfo.page;
+  referrer = refererInfo.ref;
+
+  return {
+    domain,
+    page,
+    Id,
+    referrer
+  };
+};
+
+function _buildVideoORTB(bidRequest) {
+  const videoAdUnit = deepAccess(bidRequest, 'mediaTypes.video');
+  const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
+  const video = {};
+
+  const videoParams = {
+    ...videoAdUnit,
+    ...videoBidderParams // Bidder Specific overrides
+  };
+  video.context = 1;
+  const {w, h} = getSize(videoParams.playerSize[0]);
+  video.w = w;
+  video.h = h;
+
+  VIDEO_ORTB_PARAMS.forEach((param) => {
+    if (videoParams.hasOwnProperty(param)) {
+      video[param] = videoParams[param];
+    }
+  });
+
+  video.placement = video.placement || 2;
+
+  video.startdelay = video.startdelay || 0;
+  video.placement = 1;
+  video.context = INSTREAM;
+
+  return video;
+}
+registerBidder(spec);
diff --git a/modules/iqmBidAdapter.md b/modules/iqmBidAdapter.md
index d6d1b4d037d..85dfdc7e078 100644
--- a/modules/iqmBidAdapter.md
+++ b/modules/iqmBidAdapter.md
@@ -10,9 +10,8 @@ Maintainer: hbteam@iqm.com
 
 | Name          | Scope    | Description               | Example              |
 | :------------ | :------- | :------------------------ | :------------------- |
-| `publisherId` | required | The Publisher ID from iQM | "df5fd732-c5f3-11e7" |
-| `tagId`       | required | The tag ID from iQM       | "1c5c9ec2-c5f4-11e7" |
-| `placementId` | required | The Placement ID from iQM | "50cc36fe-c5f4-11e7" |
+| `publisherId` | required | The Publisher ID from iQM | "df5fd732-c5f3-11e7-abc4-cec278b6b50a" |
+| `placementId` | required | The Placement ID from iQM | 23451                |
 | `bidfloor`    | optional | Bid Floor                 | 0.50                 |
 
 # Description
@@ -21,21 +20,62 @@ Module that connects to iQM demand sources
 
 # Test Parameters
 ```
-    var adUnits = [
-           {
-               code: 'test-div1',
-               sizes: [[320, 50]],  //  display 320x50
-               bids: [
-                   {
-                       bidder: 'iqm',
-                       params: {
-                           publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
-                           tagId: '1c5c9ec2-c5f4-11e7-abc4-cec278b6b50a',
-                           placementId: '50cc36fe-c5f4-11e7-abc4-cec278b6b50a',
-                           bidfloor: 0.50,
-                       }
-                   }
-               ]
-           }
-       ];
+var adUnits = [{
+        code: 'div-gpt-ad-1460505748561-0',
+        mediaTypes: {
+          banner: {
+            sizes: [[300,250]]
+          }
+        },
+
+        bids: [{
+          bidder: 'iqm',
+          params: {
+            geo:{
+              country:'USA'
+            },
+
+            publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+            placementId: 23451,
+            bidfloor: 0.50
+          }
+        }]
+
+      }]
+
+```
+
+# adUnit Video
+
+```
+ var videoAdUnit = {
+      code: 'video1',
+      mediaTypes: {
+        video: {
+          playerSize: [640, 480],
+          context: 'instream'
+        }
+      },
+      bids: [{
+        bidder: 'iqm',
+        params: {
+          // placementId: iosDevice ? 13239390 : 13232361, // Add your own placement id here. Note, skippable video is not supported on iOS
+          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+          placementId: 23451,
+          geo:{
+            country:'USA'
+          },
+
+          bidfloor: 0.05,
+          video: {
+            placement :2,
+            mimes: ['video/mp4'],
+            protocols: [2,5],
+            skipppable: true,
+            playback_method: ['auto_play_sound_off']
+          }
+        }
+      }]
+      };
+
 ```
diff --git a/modules/iqzoneBidAdapter.js b/modules/iqzoneBidAdapter.js
new file mode 100644
index 00000000000..f2de447d6a7
--- /dev/null
+++ b/modules/iqzoneBidAdapter.js
@@ -0,0 +1,211 @@
+import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'iqzone';
+const AD_URL = 'https://smartssp-us-east.iqzone.com/pbjs';
+const SYNC_URL = 'https://cs.smartssp.iqzone.com';
+
+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 || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId, endpointId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  if (placementId) {
+    placement.placementId = placementId;
+    placement.type = 'publisher';
+  } else if (endpointId) {
+    placement.endpointId = endpointId;
+    placement.type = 'network';
+  }
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+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 = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    } else {
+      valid = false;
+    }
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/iqzoneBidAdapter.md b/modules/iqzoneBidAdapter.md
new file mode 100644
index 00000000000..3808bdbabec
--- /dev/null
+++ b/modules/iqzoneBidAdapter.md
@@ -0,0 +1,96 @@
+# Overview
+
+```
+Module Name: IQZone Bidder Adapter
+Module Type: IQZone Bidder Adapter
+Maintainer: no-reply@vsn.si
+```
+
+# Description
+
+Connects to IQZone exchange for bids.
+
+IQZone bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'iqzone',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'iqzone',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'iqzone',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'iqzone',
+                            params: {
+                                endpointId: 'testBanner',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index f4c42080f58..27e6d0aee02 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -1,37 +1,174 @@
-import * as utils from '../src/utils.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  contains,
+  convertTypes,
+  deepAccess,
+  deepClone,
+  deepSetValue,
+  getGptSlotInfoForAdUnitCode,
+  inIframe,
+  isArray,
+  isEmpty,
+  isFn,
+  isInteger,
+  logError,
+  logWarn,
+  mergeDeep,
+  parseQueryStringParameters,
+  safeJSONParse
+} from '../src/utils.js';
+import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
-import find from 'core-js-pure/features/array/find.js';
-import isInteger from 'core-js-pure/features/number/is-integer.js';
+import CONSTANTS from '../src/constants.json';
+import { getStorageManager } from '../src/storageManager.js';
+import * as events from '../src/events.js';
+import { find } from '../src/polyfill.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { INSTREAM, OUTSTREAM } from '../src/video.js';
+import { Renderer } from '../src/Renderer.js';
 
 const BIDDER_CODE = 'ix';
-const SECURE_BID_URL = 'https://as-sec.casalemedia.com/cygnus';
-const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const ALIAS_BIDDER_CODE = 'roundel';
+const GLOBAL_VENDOR_ID = 10;
+const SECURE_BID_URL = 'https://htlb.casalemedia.com/openrtb/pbjs';
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO, NATIVE];
 const BANNER_ENDPOINT_VERSION = 7.2;
 const VIDEO_ENDPOINT_VERSION = 8.1;
 const CENT_TO_DOLLAR_FACTOR = 100;
 const BANNER_TIME_TO_LIVE = 300;
 const VIDEO_TIME_TO_LIVE = 3600; // 1hr
+const NATIVE_TIME_TO_LIVE = 3600; // Since native can have video, use ttl same as video
 const NET_REVENUE = true;
+const MAX_REQUEST_LIMIT = 4;
+const OUTSTREAM_MINIMUM_PLAYER_SIZE = [144, 144];
 const PRICE_TO_DOLLAR_FACTOR = {
   JPY: 1
 };
-const USER_SYNC_URL = 'https://js-sec.indexww.com/um/ixmatch.html';
+const IFRAME_USER_SYNC_URL = 'https://js-sec.indexww.com/um/ixmatch.html';
+const FLOOR_SOURCE = { PBJS: 'p', IX: 'x' };
+const IMG_USER_SYNC_URL = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid';
+export const ERROR_CODES = {
+  BID_SIZE_INVALID_FORMAT: 1,
+  BID_SIZE_NOT_INCLUDED: 2,
+  PROPERTY_NOT_INCLUDED: 3,
+  SITE_ID_INVALID_VALUE: 4,
+  BID_FLOOR_INVALID_FORMAT: 5,
+  IX_FPD_EXCEEDS_MAX_SIZE: 6,
+  EXCEEDS_MAX_SIZE: 7,
+  PB_FPD_EXCEEDS_MAX_SIZE: 8,
+  VIDEO_DURATION_INVALID: 9
+};
+const FIRST_PARTY_DATA = {
+  SITE: [
+    'id', 'name', 'domain', 'cat', 'sectioncat', 'pagecat', 'page', 'ref', 'search', 'mobile',
+    'privacypolicy', 'publisher', 'content', 'keywords', 'ext'
+  ],
+  USER: ['id', 'buyeruid', 'yob', 'gender', 'keywords', 'customdata', 'geo', 'data', 'ext']
+};
+const SOURCE_RTI_MAPPING = {
+  'liveramp.com': 'idl',
+  'netid.de': 'NETID',
+  'neustar.biz': 'fabrickId',
+  'zeotap.com': 'zeotapIdPlus',
+  'uidapi.com': 'UID2',
+  'adserver.org': 'TDID',
+  'id5-sync.com': '', // ID5 Universal ID, configured as id5Id
+  'crwdcntrl.net': '', // Lotame Panorama ID, lotamePanoramaId
+  'epsilon.com': '', // Publisher Link, publinkId
+  'audigent.com': '', // Hadron ID from Audigent, hadronId
+  'pubcid.org': '', // SharedID, pubcid
+  'trustpid.com': '' // Trustpid
+};
+const PROVIDERS = [
+  'britepoolid',
+  'lipbid',
+  'criteoId',
+  'merkleId',
+  'parrableId',
+  'connectid',
+  'tapadId',
+  'quantcastId',
+  'pubProvidedId'
+];
+const REQUIRED_VIDEO_PARAMS = ['mimes', 'minduration', 'maxduration']; // note: protocol/protocols is also reqd
+const VIDEO_PARAMS_ALLOW_LIST = [
+  'mimes', 'minduration', 'maxduration', 'protocols', 'protocol',
+  'startdelay', 'placement', 'linearity', 'skip', 'skipmin',
+  'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate',
+  'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend',
+  'delivery', 'pos', 'companionad', 'api', 'companiontype', 'ext',
+  'playerSize', 'w', 'h'
+];
+const LOCAL_STORAGE_KEY = 'ixdiag';
+export const LOCAL_STORAGE_FEATURE_TOGGLES_KEY = `${BIDDER_CODE}_features`;
+let hasRegisteredHandler = false;
+export const storage = getStorageManager({ gvlid: GLOBAL_VENDOR_ID, bidderCode: BIDDER_CODE });
+export const FEATURE_TOGGLES = {
+  featureToggles: {},
+  isFeatureEnabled: function (ft) {
+    return deepAccess(this.featureToggles, `features.${ft}.activated`)
+  },
+  getFeatureToggles: function () {
+    if (storage.localStorageIsEnabled()) {
+      const parsedToggles = safeJSONParse(storage.getDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY));
+      if (deepAccess(parsedToggles, 'expiry') && parsedToggles.expiry >= new Date().getTime()) {
+        this.featureToggles = parsedToggles
+      } else {
+        this.clearFeatureToggles();
+      }
+    }
+  },
+  setFeatureToggles: function (serverResponse) {
+    const responseBody = serverResponse.body;
+    const expiryTime = new Date();
+    const toggles = deepAccess(responseBody, 'ext.features');
+
+    if (toggles) {
+      this.featureToggles = {
+        expiry: expiryTime.setHours(expiryTime.getHours() + 1),
+        features: toggles
+      }
+      if (storage.localStorageIsEnabled()) {
+        storage.setDataInLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY, JSON.stringify(this.featureToggles));
+      }
+    }
+  },
+  clearFeatureToggles: function () {
+    this.featureToggles = {};
+    if (storage.localStorageIsEnabled()) {
+      storage.removeDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY);
+    }
+  }
+};
+let siteID = 0;
+let gdprConsent = '';
+let usPrivacy = '';
+
+// Possible values for bidResponse.seatBid[].bid[].mtype which indicates the type of the creative markup so that it can properly be associated with the right sub-object of the BidRequest.Imp.
+const MEDIA_TYPES = {
+  Banner: 1,
+  Video: 2,
+  Audio: 3,
+  Native: 4
+};
 
 /**
  * Transform valid bid request config object to banner impression object that will be sent to ad server.
  *
- * @param  {object} bid A valid bid request config object.
+ * @param  {object} bid A valid bid request config object
  * @return {object}     A impression object that will be sent to ad server.
  */
 function bidToBannerImp(bid) {
-  const imp = bidToImp(bid);
-
+  const imp = bidToImp(bid, BANNER);
   imp.banner = {};
-  imp.banner.w = bid.params.size[0];
-  imp.banner.h = bid.params.size[1];
-  imp.banner.topframe = utils.inIframe() ? 0 : 1;
+  const impSize = deepAccess(bid, 'params.size');
+  if (impSize) {
+    imp.banner.w = impSize[0];
+    imp.banner.h = impSize[1];
+  }
+
+  imp.banner.topframe = inIframe() ? 0 : 1;
+
+  _applyFloor(bid, imp, BANNER);
 
   return imp;
 }
@@ -43,49 +180,179 @@ function bidToBannerImp(bid) {
  * @return {object}     A impression object that will be sent to ad server.
  */
 function bidToVideoImp(bid) {
-  const imp = bidToImp(bid);
+  const imp = bidToImp(bid, VIDEO);
+  const videoAdUnitRef = deepAccess(bid, 'mediaTypes.video');
+  const videoParamRef = deepAccess(bid, 'params.video');
+  const videoParamErrors = checkVideoParams(videoAdUnitRef, videoParamRef);
+  if (videoParamErrors.length) {
+    return {};
+  }
+
+  imp.video = videoParamRef ? deepClone(bid.params.video) : {};
+  // populate imp level transactionId
+  imp.ext.tid = deepAccess(bid, 'ortb2Imp.ext.tid');
 
-  imp.video = utils.deepClone(bid.params.video)
-  imp.video.w = bid.params.size[0];
-  imp.video.h = bid.params.size[1];
+  // copy all video properties to imp object
+  for (const adUnitProperty in videoAdUnitRef) {
+    if (VIDEO_PARAMS_ALLOW_LIST.indexOf(adUnitProperty) !== -1 && !imp.video.hasOwnProperty(adUnitProperty)) {
+      imp.video[adUnitProperty] = videoAdUnitRef[adUnitProperty];
+    }
+  }
+
+  if (imp.video.minduration > imp.video.maxduration) {
+    logError(
+      `IX Bid Adapter: video minduration [${imp.video.minduration}] cannot be greater than video maxduration [${imp.video.maxduration}]`,
+      { bidder: BIDDER_CODE, code: ERROR_CODES.VIDEO_DURATION_INVALID }
+    );
+    return {};
+  }
+
+  const context = (videoParamRef && videoParamRef.context) || (videoAdUnitRef && videoAdUnitRef.context);
 
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
-  if (context) {
-    if (context === 'instream') {
+  // if placement not already defined, pick one based on `context`
+  if (context && !imp.video.hasOwnProperty('placement')) {
+    if (context === INSTREAM) {
       imp.video.placement = 1;
-    } else if (context === 'outstream') {
-      imp.video.placement = 4;
+    } else if (context === OUTSTREAM) {
+      if (deepAccess(videoParamRef, 'playerConfig.floatOnScroll')) {
+        imp.video.placement = 5;
+      } else {
+        imp.video.placement = 4;
+      }
     } else {
-      utils.logWarn(`ix bidder params: video context '${context}' is not supported`);
+      logWarn(`IX Bid Adapter: Video context '${context}' is not supported`);
     }
   }
 
+  if (!(imp.video.w && imp.video.h)) {
+    // Getting impression Size
+    const impSize = getFirstSize(deepAccess(imp, 'video.playerSize')) || getFirstSize(deepAccess(bid, 'params.size'));
+    if (impSize) {
+      imp.video.w = impSize[0];
+      imp.video.h = impSize[1];
+    } else {
+      logWarn('IX Bid Adapter: Video size is missing in [mediaTypes.video]');
+      return {};
+    }
+  }
+
+  _applyFloor(bid, imp, VIDEO);
+
+  return imp;
+}
+
+/**
+ * Transform valid bid request config object to native impression object that will be sent to ad server.
+ *
+ * @param  {object} bid A valid bid request config object.
+ * @return {object}     A impression object that will be sent to ad server.
+ */
+function bidToNativeImp(bid) {
+  const imp = bidToImp(bid, NATIVE);
+
+  const request = bid.nativeOrtbRequest
+  request.eventtrackers = [{
+    event: 1,
+    methods: [1, 2]
+  }];
+  request.privacy = 1;
+
+  imp.native = {
+    request: JSON.stringify(request),
+    ver: '1.2'
+  };
+
+  // populate imp level transactionId
+  imp.ext.tid = deepAccess(bid, 'ortb2Imp.ext.tid');
+
+  _applyFloor(bid, imp, NATIVE);
+
   return imp;
 }
 
-function bidToImp(bid) {
+/**
+ * Converts an incoming PBJS bid to an IX Impression
+ * @param {object} bid   PBJS bid object
+ * @returns {object}     IX impression object
+ */
+function bidToImp(bid, mediaType) {
   const imp = {};
 
   imp.id = bid.bidId;
 
   imp.ext = {};
-  imp.ext.siteID = bid.params.siteId;
 
-  if (bid.params.hasOwnProperty('id') &&
-    (typeof bid.params.id === 'string' || typeof bid.params.id === 'number')) {
-    imp.ext.sid = String(bid.params.id);
+  if (deepAccess(bid, `params.${mediaType}.siteId`) && !isNaN(Number(bid.params[mediaType].siteId))) {
+    switch (mediaType) {
+      case BANNER:
+        imp.ext.siteID = bid.params.banner.siteId.toString();
+        break;
+      case VIDEO:
+        imp.ext.siteID = bid.params.video.siteId.toString();
+        break;
+      case NATIVE:
+        imp.ext.siteID = bid.params.native.siteId.toString();
+        break;
+    }
   } else {
-    imp.ext.sid = `${bid.params.size[0]}x${bid.params.size[1]}`;
+    imp.ext.siteID = bid.params.siteId.toString();
   }
 
-  if (bid.params.hasOwnProperty('bidFloor') && bid.params.hasOwnProperty('bidFloorCur')) {
-    imp.bidfloor = bid.params.bidFloor;
-    imp.bidfloorcur = bid.params.bidFloorCur;
+  // populate imp level sid
+  if (bid.params.hasOwnProperty('id') && (typeof bid.params.id === 'string' || typeof bid.params.id === 'number')) {
+    imp.ext.sid = String(bid.params.id);
   }
 
   return imp;
 }
 
+/**
+ * Gets priceFloors floors and IX adapter floors,
+ * Validates and sets the higher one on the impression
+ * @param  {object}    bid bid object
+ * @param  {object}    imp impression object
+ * @param  {string}    mediaType the impression ad type, one of the SUPPORTED_AD_TYPES
+ */
+function _applyFloor(bid, imp, mediaType) {
+  let adapterFloor = null;
+  let moduleFloor = null;
+
+  if (bid.params.bidFloor && bid.params.bidFloorCur) {
+    adapterFloor = { floor: bid.params.bidFloor, currency: bid.params.bidFloorCur };
+  }
+
+  if (isFn(bid.getFloor)) {
+    let _mediaType = '*';
+    let _size = '*';
+
+    if (mediaType && contains(SUPPORTED_AD_TYPES, mediaType)) {
+      const { w: width, h: height } = imp[mediaType];
+      _mediaType = mediaType;
+      _size = [width, height];
+    }
+    try {
+      moduleFloor = bid.getFloor({
+        mediaType: _mediaType,
+        size: _size
+      });
+    } catch (err) {
+      // continue with no module floors
+      logWarn('priceFloors module call getFloor failed, error : ', err);
+    }
+  }
+
+  // Prioritize module floor over bidder.param floor
+  if (moduleFloor) {
+    imp.bidfloor = moduleFloor.floor;
+    imp.bidfloorcur = moduleFloor.currency;
+    imp.ext.fl = FLOOR_SOURCE.PBJS;
+  } else if (adapterFloor) {
+    imp.bidfloor = adapterFloor.floor;
+    imp.bidfloorcur = adapterFloor.currency;
+    imp.ext.fl = FLOOR_SOURCE.IX;
+  }
+}
+
 /**
  * Parses a raw bid for the relevant information.
  *
@@ -95,6 +362,8 @@ function bidToImp(bid) {
  */
 function parseBid(rawBid, currency, bidRequest) {
   const bid = {};
+  const isValidExpiry = !!((deepAccess(rawBid, 'exp') && isInteger(rawBid.exp)));
+  const dealID = deepAccess(rawBid, 'dealid') || deepAccess(rawBid, 'ext.dealid');
 
   if (PRICE_TO_DOLLAR_FACTOR.hasOwnProperty(currency)) {
     bid.cpm = rawBid.price / PRICE_TO_DOLLAR_FACTOR[currency];
@@ -104,30 +373,58 @@ function parseBid(rawBid, currency, bidRequest) {
 
   bid.requestId = rawBid.impid;
 
-  bid.dealId = utils.deepAccess(rawBid, 'ext.dealid');
+  if (dealID) {
+    bid.dealId = dealID;
+  }
+
   bid.netRevenue = NET_REVENUE;
   bid.currency = currency;
   bid.creativeId = rawBid.hasOwnProperty('crid') ? rawBid.crid : '-';
 
+  if (rawBid.mtype == MEDIA_TYPES.Video) {
+    bid.vastXml = rawBid.adm;
+  } else if (rawBid.ext && rawBid.ext.vasturl) {
+    bid.vastUrl = rawBid.ext.vasturl;
+  }
+
+  let parsedAdm = null;
+  // Detect whether the adm is (probably) JSON
+  if (typeof rawBid.adm === 'string' && rawBid.adm[0] === '{' && rawBid.adm[rawBid.adm.length - 1] === '}') {
+    try {
+      parsedAdm = JSON.parse(rawBid.adm);
+    } catch (err) {
+      logWarn('adm looks like JSON but failed to parse: ', err);
+    }
+  }
+
   // in the event of a video
-  if (utils.deepAccess(rawBid, 'ext.vasturl')) {
-    bid.vastUrl = rawBid.ext.vasturl
+  if ((rawBid.ext && rawBid.ext.vasturl) || rawBid.mtype == MEDIA_TYPES.Video) {
     bid.width = bidRequest.video.w;
     bid.height = bidRequest.video.h;
     bid.mediaType = VIDEO;
-    bid.ttl = VIDEO_TIME_TO_LIVE;
+    bid.mediaTypes = bidRequest.mediaTypes;
+    bid.ttl = isValidExpiry ? rawBid.exp : VIDEO_TIME_TO_LIVE;
+  } else if (parsedAdm && parsedAdm.native) {
+    bid.native = { ortb: parsedAdm.native };
+    bid.width = rawBid.w ? rawBid.w : 1;
+    bid.height = rawBid.h ? rawBid.h : 1;
+    bid.mediaType = NATIVE;
+    bid.ttl = isValidExpiry ? rawBid.exp : NATIVE_TIME_TO_LIVE;
   } else {
     bid.ad = rawBid.adm;
     bid.width = rawBid.w;
     bid.height = rawBid.h;
     bid.mediaType = BANNER;
-    bid.ttl = BANNER_TIME_TO_LIVE;
+    bid.ttl = isValidExpiry ? rawBid.exp : BANNER_TIME_TO_LIVE;
   }
 
   bid.meta = {};
-  bid.meta.networkId = utils.deepAccess(rawBid, 'ext.dspid');
-  bid.meta.brandId = utils.deepAccess(rawBid, 'ext.advbrandid');
-  bid.meta.brandName = utils.deepAccess(rawBid, 'ext.advbrand');
+  bid.meta.networkId = deepAccess(rawBid, 'ext.dspid');
+  bid.meta.brandId = deepAccess(rawBid, 'ext.advbrandid');
+  bid.meta.brandName = deepAccess(rawBid, 'ext.advbrand');
+  if (rawBid.adomain && rawBid.adomain.length > 0) {
+    bid.meta.advertiserDomains = rawBid.adomain;
+  }
 
   return bid;
 }
@@ -151,16 +448,65 @@ function isValidSize(size) {
  * @return {boolean}          True if the size object is an element of the size array, and false
  *                            otherwise.
  */
-function includesSize(sizeArray, size) {
+function includesSize(sizeArray = [], size = []) {
   if (isValidSize(sizeArray)) {
     return sizeArray[0] === size[0] && sizeArray[1] === size[1];
   }
-
   for (let i = 0; i < sizeArray.length; i++) {
     if (sizeArray[i][0] === size[0] && sizeArray[i][1] === size[1]) {
       return true;
     }
   }
+  return false;
+}
+
+/**
+ * Checks if all required video params are present
+ * @param {object} mediaTypeVideoRef Ad unit level mediaTypes object
+ * @param {object} paramsVideoRef    IX bidder params level video object
+ * @returns {string[]}               Are the required video params available
+ */
+function checkVideoParams(mediaTypeVideoRef, paramsVideoRef) {
+  const errorList = [];
+
+  if (!mediaTypeVideoRef) {
+    logWarn('IX Bid Adapter: mediaTypes.video is the preferred location for video params in ad unit');
+  }
+
+  for (let property of REQUIRED_VIDEO_PARAMS) {
+    const propInMediaType = mediaTypeVideoRef && mediaTypeVideoRef.hasOwnProperty(property);
+    const propInVideoRef = paramsVideoRef && paramsVideoRef.hasOwnProperty(property);
+
+    if (!propInMediaType && !propInVideoRef) {
+      errorList.push(`IX Bid Adapter: ${property} is not included in either the adunit or params level`);
+    }
+  }
+
+  // check protocols/protocol
+  const protocolMediaType = mediaTypeVideoRef && mediaTypeVideoRef.hasOwnProperty('protocol');
+  const protocolsMediaType = mediaTypeVideoRef && mediaTypeVideoRef.hasOwnProperty('protocols');
+  const protocolVideoRef = paramsVideoRef && paramsVideoRef.hasOwnProperty('protocol');
+  const protocolsVideoRef = paramsVideoRef && paramsVideoRef.hasOwnProperty('protocols');
+
+  if (!(protocolMediaType || protocolsMediaType || protocolVideoRef || protocolsVideoRef)) {
+    errorList.push('IX Bid Adapter: protocol/protcols is not included in either the adunit or params level');
+  }
+
+  return errorList;
+}
+
+/**
+ * Get One size from Size Array
+ * [[250,350]] -> [250, 350]
+ * [250, 350]  -> [250, 350]
+ * @param {array} sizes array of sizes
+ */
+function getFirstSize(sizes = []) {
+  if (isValidSize(sizes)) {
+    return sizes;
+  } else if (isValidSize(sizes[0])) {
+    return sizes[0];
+  }
 
   return false;
 }
@@ -168,9 +514,9 @@ function includesSize(sizeArray, size) {
 /**
  * Determines whether or not the given bidFloor parameters are valid.
  *
- * @param  {*}       bidFloor    The bidFloor parameter inside bid request config.
- * @param  {*}       bidFloorCur The bidFloorCur parameter inside bid request config.
- * @return {boolean}             True if this is a valid biFfloor parameters format, and false
+ * @param  {number}  bidFloor    The bidFloor parameter inside bid request config.
+ * @param  {number}  bidFloorCur The bidFloorCur parameter inside bid request config.
+ * @return {bool}                True if this is a valid bidFloor parameters format, and false
  *                               otherwise.
  */
 function isValidBidFloorParams(bidFloor, bidFloorCur) {
@@ -180,18 +526,60 @@ function isValidBidFloorParams(bidFloor, bidFloorCur) {
     bidFloorCur.match(curRegex));
 }
 
+function nativeMediaTypeValid(bid) {
+  const nativeMediaTypes = deepAccess(bid, 'mediaTypes.native');
+  if (nativeMediaTypes === undefined) {
+    return true
+  }
+
+  return bid.nativeOrtbRequest && Array.isArray(bid.nativeOrtbRequest.assets) && bid.nativeOrtbRequest.assets.length > 0
+}
+
 /**
- * Finds the impression with the associated id.
+ * Get bid request object with the associated id.
  *
  * @param  {*}      id          Id of the impression.
  * @param  {array}  impressions List of impressions sent in the request.
  * @return {object}             The impression with the associated id.
  */
-function getBidRequest(id, impressions) {
+function getBidRequest(id, impressions, validBidRequests) {
   if (!id) {
     return;
   }
-  return find(impressions, imp => imp.id === id);
+  const bidRequest = {
+    ...find(validBidRequests, bid => bid.bidId === id),
+    ...find(impressions, imp => imp.id === id)
+  }
+
+  return bidRequest;
+}
+
+/**
+ * From the userIdAsEids array, filter for the ones our adserver can use, and modify them
+ * for our purposes, e.g. add rtiPartner
+ * @param {array} allEids userIdAsEids passed in by prebid
+ * @return {object} contains toSend (eids to send to the adserver) and seenSources (used to filter
+ *                  identity info from IX Library)
+ */
+function getEidInfo(allEids) {
+  let toSend = [];
+  let seenSources = {};
+  if (isArray(allEids)) {
+    for (const eid of allEids) {
+      if (SOURCE_RTI_MAPPING.hasOwnProperty(eid.source) && deepAccess(eid, 'uids.0')) {
+        seenSources[eid.source] = true;
+        if (SOURCE_RTI_MAPPING[eid.source] != '') {
+          eid.uids[0].ext = {
+            rtiPartner: SOURCE_RTI_MAPPING[eid.source]
+          };
+        }
+        delete eid.uids[0].atype;
+        toSend.push(eid);
+      }
+    }
+  }
+
+  return { toSend, seenSources };
 }
 
 /**
@@ -199,16 +587,24 @@ function getBidRequest(id, impressions) {
  *
  * @param  {array}  validBidRequests A list of valid bid request config objects.
  * @param  {object} bidderRequest    An object containing other info like gdprConsent.
- * @param  {array}  impressions      List of impression objects describing the bids.
- * @param  {array}  version          Endpoint version denoting banner or video.
- * @return {object}                  Info describing the request to the server.
+ * @param  {object} impressions      An object containing a list of impression objects describing the bids for each transactionId
+ * @param  {array}  version          Endpoint version denoting banner, video or native.
+ * @return {array}                   List of objects describing the request to the server.
  *
  */
 function buildRequest(validBidRequests, bidderRequest, impressions, version) {
-  const userEids = [];
-
   // Always use secure HTTPS protocol.
   let baseUrl = SECURE_BID_URL;
+  // Get ids from Prebid User ID Modules
+  let eidInfo = getEidInfo(deepAccess(validBidRequests, '0.userIdAsEids'));
+  let userEids = eidInfo.toSend;
+  const pageUrl = deepAccess(bidderRequest, 'refererInfo.page');
+
+  let MAX_REQUEST_SIZE = 8000;
+  // Modify request size limit if its FT is enabeld.
+  if (FEATURE_TOGGLES.isFeatureEnabled('pbjs_use_32kb_size_limit')) {
+    MAX_REQUEST_SIZE = 32000
+  }
 
   // RTI ids will be included in the bid request if the function getIdentityInfo() is loaded
   // and if the data for the partner exist
@@ -218,31 +614,66 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       for (const partnerName in identityInfo) {
         if (identityInfo.hasOwnProperty(partnerName)) {
           let response = identityInfo[partnerName];
-          if (!response.responsePending && response.data && typeof response.data === 'object' && Object.keys(response.data).length) {
+          if (!response.responsePending && response.data && typeof response.data === 'object' &&
+            Object.keys(response.data).length && !eidInfo.seenSources[response.data.source]) {
             userEids.push(response.data);
           }
         }
       }
     }
   }
-  const r = {};
 
-  // Since bidderRequestId are the same for different bid request, just use the first one.
-  r.id = validBidRequests[0].bidderRequestId;
+  // If `roundel` alias bidder, only send requests if liveramp ids exist.
+  if (bidderRequest && bidderRequest.bidderCode === ALIAS_BIDDER_CODE && !eidInfo.seenSources['liveramp.com']) {
+    return [];
+  }
 
-  r.imp = impressions;
+  const r = {};
+  const tmax = config.getConfig('bidderTimeout');
 
+  // Since bidderRequestId are the same for different bid request, just use the first one.
+  r.id = validBidRequests[0].bidderRequestId.toString();
   r.site = {};
   r.ext = {};
   r.ext.source = 'prebid';
+  r.ext.ixdiag = {};
+  r.ext.ixdiag.ls = storage.localStorageIsEnabled();
+  r.imp = [];
+  r.at = 1;
+
+  // getting ixdiags for adunits of the video, outstream & multi format (MF) style
+  let ixdiag = buildIXDiag(validBidRequests);
+  for (var key in ixdiag) {
+    r.ext.ixdiag[key] = ixdiag[key];
+  }
+
+  if (tmax) {
+    r.ext.ixdiag.tmax = tmax;
+  }
+
+  if (config.getConfig('userSync')) {
+    r.ext.ixdiag.syncsPerBidder = config.getConfig('userSync').syncsPerBidder;
+  }
+
+  // Get cached errors stored in LocalStorage
+  const cachedErrors = getCachedErrors();
+
+  if (!isEmpty(cachedErrors)) {
+    r.ext.ixdiag.err = cachedErrors;
+  }
+
+  // Add number of available imps to ixDiag.
+  r.ext.ixdiag.imps = Object.keys(impressions).length;
+
+  // set source.tid to auctionId for outgoing request to Exchange.
+  r.source = {
+    tid: validBidRequests[0].auctionId,
+  }
 
   // if an schain is provided, send it along
   if (validBidRequests[0].schain) {
-    r.source = {
-      ext: {
-        schain: validBidRequests[0].schain
-      }
-    };
+    r.source.ext = {};
+    r.source.ext.schain = validBidRequests[0].schain;
   }
 
   if (userEids.length > 0) {
@@ -257,7 +688,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   // Apply GDPR information to the request if GDPR is enabled.
   if (bidderRequest) {
     if (bidderRequest.gdprConsent) {
-      const gdprConsent = bidderRequest.gdprConsent;
+      gdprConsent = bidderRequest.gdprConsent;
 
       if (gdprConsent.hasOwnProperty('gdprApplies')) {
         r.regs = {
@@ -272,23 +703,51 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         r.user.ext = {
           consent: gdprConsent.consentString || ''
         };
+
+        if (gdprConsent.hasOwnProperty('addtlConsent') && gdprConsent.addtlConsent) {
+          r.user.ext.consented_providers_settings = {
+            consented_providers: gdprConsent.addtlConsent
+          };
+        }
       }
     }
 
     if (bidderRequest.uspConsent) {
-      utils.deepSetValue(r, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+      deepSetValue(r, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+      usPrivacy = bidderRequest.uspConsent;
     }
 
-    if (bidderRequest.refererInfo) {
-      r.site.page = bidderRequest.refererInfo.referer;
+    if (pageUrl) {
+      r.site.page = pageUrl;
     }
   }
 
+  if (config.getConfig('coppa')) {
+    deepSetValue(r, 'regs.coppa', 1);
+  }
+
   const payload = {};
+  // Use the siteId in the first bid request as the main siteId.
+  siteID = validBidRequests[0].params.siteId;
+  payload.s = siteID;
 
   // Parse additional runtime configs.
   const bidderCode = (bidderRequest && bidderRequest.bidderCode) || 'ix';
   const otherIxConfig = config.getConfig(bidderCode);
+  const requests = [];
+  let requestSequenceNumber = 0;
+  const transactionIds = Object.keys(impressions);
+  const baseRequestSize = `${baseUrl}${parseQueryStringParameters({ ...payload, r: JSON.stringify(r) })}`.length;
+
+  if (baseRequestSize > MAX_REQUEST_SIZE) {
+    logError('IX Bid Adapter: Base request size has exceeded maximum request size.', { bidder: BIDDER_CODE, code: ERROR_CODES.EXCEEDS_MAX_SIZE });
+    return requests;
+  }
+
+  let currentRequestSize = baseRequestSize;
+  let fpdRequestSize = 0;
+  let isFpdAdded = false;
+
   if (otherIxConfig) {
     // Append firstPartyData to r.site.page if firstPartyData exists.
     if (typeof otherIxConfig.firstPartyData === 'object') {
@@ -301,36 +760,582 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       }
       firstPartyString = firstPartyString.slice(0, -1);
 
-      r.site.page += firstPartyString;
+      fpdRequestSize = encodeURIComponent(firstPartyString).length;
+
+      if (fpdRequestSize < MAX_REQUEST_SIZE) {
+        if ('page' in r.site) {
+          r.site.page += firstPartyString;
+        } else {
+          r.site.page = firstPartyString;
+        }
+        currentRequestSize += fpdRequestSize;
+      } else {
+        logError('IX Bid Adapter: IX config FPD request size has exceeded maximum request size.', { bidder: BIDDER_CODE, code: ERROR_CODES.IX_FPD_EXCEEDS_MAX_SIZE });
+      }
+    }
+  }
+
+  for (let adUnitIndex = 0; adUnitIndex < transactionIds.length; adUnitIndex++) {
+    if (currentRequestSize >= MAX_REQUEST_SIZE || requests.length >= MAX_REQUEST_LIMIT) {
+      break;
+    }
+
+    const adUnitImpressions = impressions[transactionIds[adUnitIndex]];
+    const { missingImps: missingBannerImpressions = [], ixImps = [] } = adUnitImpressions;
+    let wasAdUnitImpressionsTrimmed = false;
+    let remainingRequestSize = MAX_REQUEST_SIZE - currentRequestSize;
+    const sourceImpressions = { ixImps, missingBannerImpressions };
+    const impressionObjects = Object.keys(sourceImpressions)
+      .map((key) => sourceImpressions[key])
+      .filter(item => Array.isArray(item))
+      .reduce((acc, curr) => acc.concat(...curr), []);
+
+    let currentImpressionSize = encodeURIComponent(JSON.stringify({ impressionObjects })).length;
+
+    while (impressionObjects.length && currentImpressionSize > remainingRequestSize) {
+      wasAdUnitImpressionsTrimmed = true;
+      impressionObjects.pop();
+      currentImpressionSize = encodeURIComponent(JSON.stringify({ impressionObjects })).length;
     }
 
-    // Create t in payload if timeout is configured.
-    if (typeof otherIxConfig.timeout === 'number') {
-      payload.t = otherIxConfig.timeout;
+    const gpid = impressions[transactionIds[adUnitIndex]].gpid;
+    const dfpAdUnitCode = impressions[transactionIds[adUnitIndex]].dfp_ad_unit_code;
+    const tid = impressions[transactionIds[adUnitIndex]].tid;
+    const sid = impressions[transactionIds[adUnitIndex]].sid
+
+    if (impressionObjects.length && BANNER in impressionObjects[0]) {
+      const { id, banner: { topframe } } = impressionObjects[0];
+      const _bannerImpression = {
+        id,
+        banner: {
+          topframe,
+          format: impressionObjects.map(({ banner: { w, h }, ext }) => ({ w, h, ext }))
+        },
+      };
+
+      for (let i = 0; i < _bannerImpression.banner.format.length; i++) {
+        // We add sid in imp.ext.sid therefore, remove from banner.format[].ext
+        if (_bannerImpression.banner.format[i].ext != null && _bannerImpression.banner.format[i].ext.sid != null) {
+          delete _bannerImpression.banner.format[i].ext.sid;
+        }
+
+        // add floor per size
+        if ('bidfloor' in impressionObjects[i]) {
+          _bannerImpression.banner.format[i].ext.bidfloor = impressionObjects[i].bidfloor
+        }
+      }
+
+      const position = impressions[transactionIds[adUnitIndex]].pos;
+      if (isInteger(position)) {
+        _bannerImpression.banner.pos = position;
+      }
+
+      if (dfpAdUnitCode || gpid || tid || sid) {
+        _bannerImpression.ext = {};
+        _bannerImpression.ext.dfp_ad_unit_code = dfpAdUnitCode;
+        _bannerImpression.ext.gpid = gpid;
+        _bannerImpression.ext.tid = tid;
+        _bannerImpression.ext.sid = sid;
+      }
+
+      if ('bidfloor' in impressionObjects[0]) {
+        _bannerImpression.bidfloor = impressionObjects[0].bidfloor;
+      }
+
+      if ('bidfloorcur' in impressionObjects[0]) {
+        _bannerImpression.bidfloorcur = impressionObjects[0].bidfloorcur;
+      }
+
+      r.imp.push(_bannerImpression);
+    } else {
+      // set imp.ext.gpid to resolved gpid for each imp
+      impressionObjects.forEach(imp => deepSetValue(imp, 'ext.gpid', gpid));
+      r.imp.push(...impressionObjects);
+    }
+
+    currentRequestSize += currentImpressionSize;
+
+    const fpd = deepAccess(bidderRequest, 'ortb2') || {};
+
+    if (!isEmpty(fpd) && !isFpdAdded) {
+      r.ext.ixdiag.fpd = true;
+
+      const site = { ...(fpd.site || fpd.context) };
+
+      Object.keys(site).forEach(key => {
+        if (FIRST_PARTY_DATA.SITE.indexOf(key) === -1) {
+          delete site[key];
+        }
+      });
+
+      const user = { ...fpd.user };
+
+      Object.keys(user).forEach(key => {
+        if (FIRST_PARTY_DATA.USER.indexOf(key) === -1) {
+          delete user[key];
+        }
+      });
+
+      const clonedRObject = deepClone(r);
+
+      clonedRObject.site = mergeDeep({}, clonedRObject.site, site);
+      clonedRObject.user = mergeDeep({}, clonedRObject.user, user);
+
+      const requestSize = `${baseUrl}${parseQueryStringParameters({ ...payload, r: JSON.stringify(clonedRObject) })}`.length;
+
+      if (requestSize < MAX_REQUEST_SIZE) {
+        r.site = mergeDeep({}, r.site, site);
+        r.user = mergeDeep({}, r.user, user);
+        isFpdAdded = true;
+        const fpdRequestSize = encodeURIComponent(JSON.stringify({ ...site, ...user })).length;
+        currentRequestSize += fpdRequestSize;
+      } else {
+        logError('IX Bid Adapter: FPD request size has exceeded maximum request size.', { bidder: BIDDER_CODE, code: ERROR_CODES.PB_FPD_EXCEEDS_MAX_SIZE });
+      }
+    }
+
+    // add identifiers info to ixDiag
+    const pbaAdSlot = impressions[transactionIds[adUnitIndex]].pbadslot;
+    const tagId = impressions[transactionIds[adUnitIndex]].tagId;
+    const adUnitCode = impressions[transactionIds[adUnitIndex]].adUnitCode;
+    const divId = impressions[transactionIds[adUnitIndex]].divId;
+    if (pbaAdSlot || tagId || adUnitCode || divId) {
+      const clonedRObject = deepClone(r);
+      const requestSize = `${baseUrl}${parseQueryStringParameters({ ...payload, r: JSON.stringify(clonedRObject) })}`.length;
+      if (requestSize < MAX_REQUEST_SIZE) {
+        r.ext.ixdiag.pbadslot = pbaAdSlot;
+        r.ext.ixdiag.tagid = tagId;
+        r.ext.ixdiag.adunitcode = adUnitCode;
+        r.ext.ixdiag.divId = divId;
+      }
+    }
+
+    const isLastAdUnit = adUnitIndex === transactionIds.length - 1;
+
+    if (wasAdUnitImpressionsTrimmed || isLastAdUnit) {
+      if (!isLastAdUnit || requestSequenceNumber) {
+        r.ext.ixdiag.sn = requestSequenceNumber;
+      }
+
+      requestSequenceNumber++;
+
+      requests.push({
+        method: 'POST',
+        url: baseUrl + '?s=' + siteID,
+        data: deepClone(r),
+        option: {
+          contentType: 'text/plain',
+        },
+        validBidRequests
+      });
+
+      currentRequestSize = baseRequestSize;
+      r.imp = [];
+      isFpdAdded = false;
     }
   }
 
-  // Use the siteId in the first bid request as the main siteId.
-  payload.s = validBidRequests[0].params.siteId;
-  payload.v = version;
-  payload.r = JSON.stringify(r);
-  payload.ac = 'j';
-  payload.sd = 1;
-  if (version === VIDEO_ENDPOINT_VERSION) {
-    payload.nf = 1;
-  }
-
-  return {
-    method: 'GET',
-    url: baseUrl,
-    data: payload
+  return requests;
+}
+
+/**
+ * Return an object of user IDs stored by Prebid User ID module
+ *
+ * @returns {array} ID providers that are present in userIds
+ */
+function _getUserIds(bidRequest) {
+  const userIds = bidRequest.userId || {};
+
+  return PROVIDERS.filter(provider => userIds[provider]);
+}
+
+/**
+ * Calculates IX diagnostics values and packages them into an object
+ *
+ * @param {array} validBidRequests  The valid bid requests from prebid
+ * @return {Object} IX diag values for ad units
+ */
+function buildIXDiag(validBidRequests) {
+  var adUnitMap = validBidRequests
+    .map(bidRequest => bidRequest.transactionId)
+    .filter((value, index, arr) => arr.indexOf(value) === index);
+
+  var ixdiag = {
+    mfu: 0,
+    bu: 0,
+    iu: 0,
+    nu: 0,
+    ou: 0,
+    allu: 0,
+    ren: false,
+    version: '$prebid.version$',
+    userIds: _getUserIds(validBidRequests[0]),
+    url: window.location.href.split('?')[0]
   };
+
+  // create ad unit map and collect the required diag properties
+  for (let i = 0; i < adUnitMap.length; i++) {
+    var bid = validBidRequests.filter(bidRequest => bidRequest.transactionId === adUnitMap[i])[0];
+
+    if (deepAccess(bid, 'mediaTypes')) {
+      if (Object.keys(bid.mediaTypes).length > 1) {
+        ixdiag.mfu++;
+      }
+
+      if (deepAccess(bid, 'mediaTypes.native')) {
+        ixdiag.nu++;
+      }
+
+      if (deepAccess(bid, 'mediaTypes.banner')) {
+        ixdiag.bu++;
+      }
+
+      if (deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
+        ixdiag.ou++;
+
+        if (isIndexRendererPreferred(bid)) {
+          ixdiag.ren = true;
+        }
+      }
+
+      if (deepAccess(bid, 'mediaTypes.video.context') === 'instream') {
+        ixdiag.iu++;
+      }
+
+      ixdiag.allu++;
+    }
+  }
+
+  return ixdiag;
+}
+
+/**
+ *
+ * @param  {array}   bannerSizeList list of banner sizes
+ * @param  {array}   bannerSize the size to be removed
+ * @return {boolean} true if successfully removed, false if not found
+ */
+
+function removeFromSizes(bannerSizeList, bannerSize) {
+  if (!bannerSize) return;
+
+  for (let i = 0; i < bannerSizeList.length; i++) {
+    const size = bannerSizeList[i];
+    if (bannerSize[0] === size[0] && bannerSize[1] === size[1]) {
+      bannerSizeList.splice(i, 1);
+      break;
+    }
+  }
+}
+
+/**
+ * Creates IX Native impressions based on validBidRequests
+ * @param {object}  validBidRequest valid request provided by prebid
+ * @param {object}  nativeImps reference to created native impressions
+ */
+function createNativeImps(validBidRequest, nativeImps) {
+  const imp = bidToNativeImp(validBidRequest);
+
+  if (Object.keys(imp).length != 0) {
+    nativeImps[validBidRequest.transactionId] = {};
+    nativeImps[validBidRequest.transactionId].ixImps = [];
+    nativeImps[validBidRequest.transactionId].ixImps.push(imp);
+    nativeImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
+    nativeImps[validBidRequest.transactionId].dfp_ad_unit_code = deepAccess(validBidRequest, 'ortb2Imp.ext.data.adserver.adslot');
+    nativeImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
+    nativeImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
+
+    const adUnitCode = validBidRequest.adUnitCode;
+    const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
+    nativeImps[validBidRequest.transactionId].adUnitCode = adUnitCode;
+    nativeImps[validBidRequest.transactionId].divId = divId;
+  }
+}
+
+/**
+ * Creates IX Video impressions based on validBidRequests
+ * @param {object}  validBidRequest valid request provided by prebid
+ * @param {object}  videoImps reference to created video impressions
+ */
+function createVideoImps(validBidRequest, videoImps) {
+  const imp = bidToVideoImp(validBidRequest);
+  if (Object.keys(imp).length != 0) {
+    videoImps[validBidRequest.transactionId] = {};
+    videoImps[validBidRequest.transactionId].ixImps = [];
+    videoImps[validBidRequest.transactionId].ixImps.push(imp);
+    videoImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
+    videoImps[validBidRequest.transactionId].dfp_ad_unit_code = deepAccess(validBidRequest, 'ortb2Imp.ext.data.adserver.adslot');
+    videoImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
+    videoImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
+
+    const adUnitCode = validBidRequest.adUnitCode;
+    const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
+    videoImps[validBidRequest.transactionId].adUnitCode = adUnitCode;
+    videoImps[validBidRequest.transactionId].divId = divId;
+  }
+}
+
+/**
+ * Creates IX banner impressions based on validBidRequests
+ * @param {object}  validBidRequest valid request provided by prebid
+ * @param {object}  missingBannerSizes reference to missing banner config sizes
+ * @param {object}  bannerImps reference to created banner impressions
+ */
+function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
+  let imp = bidToBannerImp(validBidRequest);
+
+  const bannerSizeDefined = includesSize(deepAccess(validBidRequest, 'mediaTypes.banner.sizes'), deepAccess(validBidRequest, 'params.size'));
+
+  if (!bannerImps.hasOwnProperty(validBidRequest.transactionId)) {
+    bannerImps[validBidRequest.transactionId] = {};
+  }
+
+  bannerImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
+  bannerImps[validBidRequest.transactionId].dfp_ad_unit_code = deepAccess(validBidRequest, 'ortb2Imp.ext.data.adserver.adslot');
+  bannerImps[validBidRequest.transactionId].tid = deepAccess(validBidRequest, 'ortb2Imp.ext.tid');
+  bannerImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
+  bannerImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
+  bannerImps[validBidRequest.transactionId].pos = deepAccess(validBidRequest, 'mediaTypes.banner.pos');
+
+  const sid = deepAccess(validBidRequest, 'params.id');
+  if (sid && (typeof sid === 'string' || typeof sid === 'number')) {
+    bannerImps[validBidRequest.transactionId].sid = String(sid);
+  }
+
+  const adUnitCode = validBidRequest.adUnitCode;
+  const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
+  bannerImps[validBidRequest.transactionId].adUnitCode = adUnitCode;
+  bannerImps[validBidRequest.transactionId].divId = divId;
+
+  // Create IX imps from params.size
+  if (bannerSizeDefined) {
+    if (!bannerImps[validBidRequest.transactionId].hasOwnProperty('ixImps')) {
+      bannerImps[validBidRequest.transactionId].ixImps = [];
+    }
+    bannerImps[validBidRequest.transactionId].ixImps.push(imp);
+  }
+
+  updateMissingSizes(validBidRequest, missingBannerSizes, imp);
+}
+
+/**
+ * Updates the Object to track missing banner sizes.
+ *
+ * @param {object} validBidRequest    The bid request for an ad unit's with a configured size.
+ * @param {object} missingBannerSizes The object containing missing banner sizes
+ * @param {object} imp                The impression for the bidrequest
+ */
+function updateMissingSizes(validBidRequest, missingBannerSizes, imp) {
+  const transactionID = validBidRequest.transactionId;
+  if (missingBannerSizes.hasOwnProperty(transactionID)) {
+    let currentSizeList = [];
+    if (missingBannerSizes[transactionID].hasOwnProperty('missingSizes')) {
+      currentSizeList = missingBannerSizes[transactionID].missingSizes;
+    }
+    removeFromSizes(currentSizeList, validBidRequest.params.size);
+    missingBannerSizes[transactionID].missingSizes = currentSizeList;
+  } else {
+    // New Ad Unit
+    if (deepAccess(validBidRequest, 'mediaTypes.banner.sizes')) {
+      let sizeList = deepClone(validBidRequest.mediaTypes.banner.sizes);
+      removeFromSizes(sizeList, validBidRequest.params.size);
+      let newAdUnitEntry = {
+        'missingSizes': sizeList,
+        'impression': imp
+      };
+      missingBannerSizes[transactionID] = newAdUnitEntry;
+    }
+  }
+}
+
+/**
+ * @param  {object} bid      ValidBidRequest object, used to adjust floor
+ * @param  {object} imp      Impression object to be modified
+ * @param  {array}  newSize  The new size to be applied
+ * @return {object} newImp   Updated impression object
+ */
+function createMissingBannerImp(bid, imp, newSize) {
+  const newImp = deepClone(imp);
+  newImp.banner.w = newSize[0];
+  newImp.banner.h = newSize[1];
+
+  _applyFloor(bid, newImp, BANNER);
+
+  return newImp;
+}
+
+/**
+ * @typedef {Array[message: string, err: Object<bidder: string, code: number>]} ErrorData
+ * @property {string} message - The error message.
+ * @property {object} err - The error object.
+ * @property {string} err.bidder - The bidder of the error.
+ * @property {string} err.code - The error code.
+ */
+
+/**
+ * Error Event handler that receives type and arguments in a data object.
+ *
+ * @param {ErrorData} data
+ */
+function storeErrorEventData(data) {
+  if (!storage.localStorageIsEnabled()) {
+    return;
+  }
+
+  let currentStorage;
+
+  try {
+    currentStorage = JSON.parse(storage.getDataFromLocalStorage(LOCAL_STORAGE_KEY) || '{}');
+  } catch (e) {
+    logWarn('ix can not read ixdiag from localStorage.');
+  }
+
+  const todayDate = new Date();
+
+  Object.keys(currentStorage).map((errorDate) => {
+    const date = new Date(errorDate);
+
+    if (date.setDate(date.getDate() + 7) - todayDate < 0) {
+      delete currentStorage[errorDate];
+    }
+  });
+
+  if (data.type === 'ERROR' && data.arguments && data.arguments[1] && data.arguments[1].bidder === BIDDER_CODE) {
+    const todayString = todayDate.toISOString().slice(0, 10);
+
+    const errorCode = data.arguments[1].code;
+
+    if (errorCode) {
+      currentStorage[todayString] = currentStorage[todayString] || {};
+
+      if (!Number(currentStorage[todayString][errorCode])) {
+        currentStorage[todayString][errorCode] = 0;
+      }
+
+      currentStorage[todayString][errorCode]++;
+    };
+  }
+
+  storage.setDataInLocalStorage(LOCAL_STORAGE_KEY, JSON.stringify(currentStorage));
+}
+
+/**
+ * Event handler for storing data into local storage. It will only store data if
+ * local storage premissions are avaliable
+ */
+function localStorageHandler(data) {
+  if (data.type === 'ERROR' && data.arguments && data.arguments[1] && data.arguments[1].bidder === BIDDER_CODE) {
+    storeErrorEventData(data);
+  }
+}
+
+/**
+ * Get ixdiag stored in LocalStorage and format to be added to request payload
+ *
+ * @returns {Object} Object with error codes and counts
+ */
+function getCachedErrors() {
+  if (!storage.localStorageIsEnabled()) {
+    return;
+  }
+
+  const errors = {};
+  let currentStorage;
+
+  try {
+    currentStorage = JSON.parse(storage.getDataFromLocalStorage(LOCAL_STORAGE_KEY) || '{}');
+  } catch (e) {
+    logError('ix can not read ixdiag from localStorage.');
+    return null;
+  }
+
+  Object.keys(currentStorage).forEach((date) => {
+    Object.keys(currentStorage[date]).forEach((code) => {
+      if (typeof currentStorage[date][code] === 'number') {
+        errors[code] = errors[code]
+          ? errors[code] + currentStorage[date][code]
+          : currentStorage[date][code];
+      }
+    });
+  });
+
+  return errors;
+}
+
+/**
+ *
+ * Initialize IX Outstream Renderer
+ * @param {Object} bid
+ */
+function outstreamRenderer(bid) {
+  bid.renderer.push(function () {
+    const adUnitCode = bid.adUnitCode;
+    const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
+    if (!divId) {
+      logWarn(`IX Bid Adapter: adUnitCode: ${divId} not found on page.`);
+      return;
+    }
+    window.createIXPlayer(divId, bid);
+  });
+}
+
+/**
+ * Create Outstream Renderer
+ * @param {string} id
+ * @returns {Renderer}
+ */
+function createRenderer(id, renderUrl) {
+  const renderer = Renderer.install({
+    id: id,
+    url: renderUrl,
+    loaded: false
+  });
+
+  try {
+    renderer.setRender(outstreamRenderer);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+    return null;
+  }
+
+  if (!renderUrl) {
+    logWarn('Outstream renderer URL not found');
+    return null;
+  }
+
+  return renderer;
+}
+
+/**
+ * Returns whether our renderer could potentially be used.
+ * @param {*} bid bid object
+ */
+function isIndexRendererPreferred(bid) {
+  if (deepAccess(bid, 'mediaTypes.video.context') !== 'outstream') {
+    return false;
+  }
+
+  // ad unit renderer could be on the adUnit.mediaTypes.video level or adUnit level
+  let renderer = deepAccess(bid, 'mediaTypes.video.renderer');
+  if (!renderer) {
+    renderer = deepAccess(bid, 'renderer');
+  }
+
+  const isValid = !!(typeof (renderer) === 'object' && renderer.url && renderer.render);
+
+  // if renderer on the adunit is not valid or it's only a backup, our renderer may be used
+  return !isValid || renderer.backupOnly;
 }
 
 export const spec = {
 
   code: BIDDER_CODE,
-  gvlid: 10,
+  gvlid: GLOBAL_VENDOR_ID,
+  aliases: [{
+    code: ALIAS_BIDDER_CODE,
+    gvlid: GLOBAL_VENDOR_ID,
+    skipPbsAliasing: false
+  }],
   supportedMediaTypes: SUPPORTED_AD_TYPES,
 
   /**
@@ -340,40 +1345,83 @@ export const spec = {
    * @return {boolean}     True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    if (!isValidSize(bid.params.size)) {
-      utils.logError('ix bidder params: bid size has invalid format.');
-      return false;
+    if (!hasRegisteredHandler) {
+      events.on(CONSTANTS.EVENTS.AUCTION_DEBUG, localStorageHandler);
+      events.on(CONSTANTS.EVENTS.AD_RENDER_FAILED, localStorageHandler);
+      hasRegisteredHandler = true;
     }
 
-    if (!includesSize(bid.sizes, bid.params.size)) {
-      utils.logError('ix bidder params: bid size is not included in ad unit sizes.');
+    const paramsVideoRef = deepAccess(bid, 'params.video');
+    const paramsSize = deepAccess(bid, 'params.size');
+    const mediaTypeBannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
+    const mediaTypeVideoRef = deepAccess(bid, 'mediaTypes.video');
+    const mediaTypeVideoPlayerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
+    const hasBidFloor = bid.params.hasOwnProperty('bidFloor');
+    const hasBidFloorCur = bid.params.hasOwnProperty('bidFloorCur');
+
+    if (bid.hasOwnProperty('mediaType') && !(contains(SUPPORTED_AD_TYPES, bid.mediaType))) {
+      logWarn('IX Bid Adapter: media type is not supported.');
       return false;
     }
 
-    if (bid.hasOwnProperty('mediaType') && !(utils.contains(SUPPORTED_AD_TYPES, bid.mediaType))) {
+    if (deepAccess(bid, 'mediaTypes.banner') && !mediaTypeBannerSizes) {
       return false;
     }
 
-    if (bid.hasOwnProperty('mediaTypes') && !(utils.deepAccess(bid, 'mediaTypes.banner.sizes') || utils.deepAccess(bid, 'mediaTypes.video.playerSize'))) {
-      return false;
+    if (paramsSize) {
+      // since there is an ix bidder level size, make sure its valid
+      const ixSize = getFirstSize(paramsSize);
+      if (!ixSize) {
+        logError('IX Bid Adapter: size has invalid format.', { bidder: BIDDER_CODE, code: ERROR_CODES.BID_SIZE_INVALID_FORMAT });
+        return false;
+      }
+      // check if the ix bidder level size, is present in ad unit level
+      if (!includesSize(bid.sizes, ixSize) &&
+        !(includesSize(mediaTypeVideoPlayerSize, ixSize)) &&
+        !(includesSize(mediaTypeBannerSizes, ixSize))) {
+        logError('IX Bid Adapter: bid size is not included in ad unit sizes or player size.', { bidder: BIDDER_CODE, code: ERROR_CODES.BID_SIZE_NOT_INCLUDED });
+        return false;
+      }
     }
 
     if (typeof bid.params.siteId !== 'string' && typeof bid.params.siteId !== 'number') {
-      utils.logError('ix bidder params: siteId must be string or number value.');
+      logError('IX Bid Adapter: siteId must be string or number type.', { bidder: BIDDER_CODE, code: ERROR_CODES.SITE_ID_INVALID_VALUE });
       return false;
     }
 
-    const hasBidFloor = bid.params.hasOwnProperty('bidFloor');
-    const hasBidFloorCur = bid.params.hasOwnProperty('bidFloorCur');
+    if (typeof bid.params.siteId !== 'string' && isNaN(Number(bid.params.siteId))) {
+      logError('IX Bid Adapter: siteId must valid value', { bidder: BIDDER_CODE, code: ERROR_CODES.SITE_ID_INVALID_VALUE });
+      return false;
+    }
 
     if (hasBidFloor || hasBidFloorCur) {
       if (!(hasBidFloor && hasBidFloorCur && isValidBidFloorParams(bid.params.bidFloor, bid.params.bidFloorCur))) {
-        utils.logError('ix bidder params: bidFloor / bidFloorCur parameter has invalid format.');
+        logError('IX Bid Adapter: bidFloor / bidFloorCur parameter has invalid format.', { bidder: BIDDER_CODE, code: ERROR_CODES.BID_FLOOR_INVALID_FORMAT });
+        return false;
+      }
+    }
+
+    if (mediaTypeVideoRef && paramsVideoRef) {
+      const videoImp = bidToVideoImp(bid).video;
+      const errorList = checkVideoParams(mediaTypeVideoRef, paramsVideoRef);
+      if (deepAccess(bid, 'mediaTypes.video.context') === OUTSTREAM && isIndexRendererPreferred(bid) && videoImp) {
+        const outstreamPlayerSize = [deepAccess(videoImp, 'w'), deepAccess(videoImp, 'h')];
+        const isValidSize = outstreamPlayerSize[0] >= OUTSTREAM_MINIMUM_PLAYER_SIZE[0] && outstreamPlayerSize[1] >= OUTSTREAM_MINIMUM_PLAYER_SIZE[1];
+        if (!isValidSize) {
+          logError(`IX Bid Adapter: ${outstreamPlayerSize} is an invalid size for IX outstream renderer`);
+          return false;
+        }
+      }
+
+      if (errorList.length) {
+        errorList.forEach((err) => {
+          logError(err, { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
+        });
         return false;
       }
     }
 
-    return true;
+    return nativeMediaTypeValid(bid);
   },
 
   /**
@@ -384,33 +1432,65 @@ export const spec = {
    * @return {object}                  Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    let reqs = [];
-    let bannerImps = [];
-    let videoImps = [];
-    let validBidRequest = null;
+    const reqs = []; // Stores banner + video requests
+    const bannerImps = {}; // Stores created banner impressions
+    const videoImps = {}; // Stores created video impressions
+    const nativeImps = {}; // Stores created native impressions
+    const missingBannerSizes = {}; // To capture the missing sizes i.e not configured for ix
+    FEATURE_TOGGLES.getFeatureToggles();
+
+    // Step 1: Create impresssions from IX params
+    validBidRequests.forEach((validBidRequest) => {
+      const adUnitMediaTypes = Object.keys(deepAccess(validBidRequest, 'mediaTypes', {}));
+
+      for (const type in adUnitMediaTypes) {
+        switch (adUnitMediaTypes[type]) {
+          case BANNER:
+            createBannerImps(validBidRequest, missingBannerSizes, bannerImps);
+            break;
+          case VIDEO:
+            createVideoImps(validBidRequest, videoImps)
+            break;
+          case NATIVE:
+            createNativeImps(validBidRequest, nativeImps)
+            break;
+          default:
+            logWarn(`IX Bid Adapter: ad unit mediaTypes ${type} is not supported`)
+        }
+      }
+    });
 
-    for (let i = 0; i < validBidRequests.length; i++) {
-      validBidRequest = validBidRequests[i];
+    // Step 2: Update banner impressions with missing sizes
+    for (let transactionId in missingBannerSizes) {
+      if (missingBannerSizes.hasOwnProperty(transactionId)) {
+        let missingSizes = missingBannerSizes[transactionId].missingSizes;
 
-      if (validBidRequest.mediaType === VIDEO || utils.deepAccess(validBidRequest, 'mediaTypes.video')) {
-        if (validBidRequest.mediaType === VIDEO || includesSize(validBidRequest.mediaTypes.video.playerSize, validBidRequest.params.size)) {
-          videoImps.push(bidToVideoImp(validBidRequest));
-        } else {
-          utils.logError('Bid size is not included in video playerSize')
+        if (!bannerImps.hasOwnProperty(transactionId)) {
+          bannerImps[transactionId] = {};
+        }
+        if (!bannerImps[transactionId].hasOwnProperty('missingImps')) {
+          bannerImps[transactionId].missingImps = [];
+          bannerImps[transactionId].missingCount = 0;
         }
-      }
 
-      if (validBidRequest.mediaType === BANNER || utils.deepAccess(validBidRequest, 'mediaTypes.banner') ||
-          (!validBidRequest.mediaType && !validBidRequest.mediaTypes)) {
-        bannerImps.push(bidToBannerImp(validBidRequest));
+        let origImp = missingBannerSizes[transactionId].impression;
+        for (let i = 0; i < missingSizes.length; i++) {
+          let newImp = createMissingBannerImp(validBidRequests[0], origImp, missingSizes[i]);
+          bannerImps[transactionId].missingImps.push(newImp);
+          bannerImps[transactionId].missingCount++;
+        }
       }
     }
 
-    if (bannerImps.length > 0) {
-      reqs.push(buildRequest(validBidRequests, bidderRequest, bannerImps, BANNER_ENDPOINT_VERSION));
+    // Step 4: Build banner, video & native requests
+    if (Object.keys(bannerImps).length > 0) {
+      reqs.push(...buildRequest(validBidRequests, bidderRequest, bannerImps, BANNER_ENDPOINT_VERSION));
+    }
+    if (Object.keys(videoImps).length > 0) {
+      reqs.push(...buildRequest(validBidRequests, bidderRequest, videoImps, VIDEO_ENDPOINT_VERSION));
     }
-    if (videoImps.length > 0) {
-      reqs.push(buildRequest(validBidRequests, bidderRequest, videoImps, VIDEO_ENDPOINT_VERSION));
+    if (Object.keys(nativeImps).length > 0) {
+      reqs.push(...buildRequest(validBidRequests, bidderRequest, nativeImps));
     }
 
     return reqs;
@@ -428,6 +1508,7 @@ export const spec = {
     let bid = null;
 
     if (!serverResponse.hasOwnProperty('body') || !serverResponse.body.hasOwnProperty('seatbid')) {
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
       return bids;
     }
 
@@ -440,15 +1521,35 @@ export const spec = {
 
       // Transform rawBid in bid response to the format that will be accepted by prebid.
       const innerBids = seatbid[i].bid;
-      let requestBid = JSON.parse(bidderRequest.data.r);
+      const requestBid = bidderRequest.data;
 
       for (let j = 0; j < innerBids.length; j++) {
-        const bidRequest = getBidRequest(innerBids[j].impid, requestBid.imp);
+        const bidRequest = getBidRequest(innerBids[j].impid, requestBid.imp, bidderRequest.validBidRequests);
         bid = parseBid(innerBids[j], responseBody.cur, bidRequest);
+
+        if (bid.mediaType === VIDEO && isIndexRendererPreferred(bidRequest)) {
+          const renderUrl = deepAccess(responseBody, 'ext.videoplayerurl');
+          bid.renderer = createRenderer(innerBids[j].bidId, renderUrl);
+          if (!bid.renderer) {
+            continue;
+          }
+        }
+
         bids.push(bid);
       }
+
+      if (deepAccess(requestBid, 'ext.ixdiag.err')) {
+        if (storage.localStorageIsEnabled()) {
+          try {
+            storage.removeDataFromLocalStorage(LOCAL_STORAGE_KEY);
+          } catch (e) {
+            logError('ix can not clear ixdiag from localStorage.');
+          }
+        }
+      }
     }
 
+    FEATURE_TOGGLES.setFeatureToggles(serverResponse);
     return bids;
   },
 
@@ -458,8 +1559,8 @@ export const spec = {
    * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
    * @return {Object} params bid params
    */
-  transformBidParams: function(params, isOpenRtb) {
-    return utils.convertTypes({
+  transformBidParams: function (params, isOpenRtb) {
+    return convertTypes({
       'siteID': 'number'
     }, params);
   },
@@ -471,11 +1572,60 @@ export const spec = {
    * @returns {array} User sync pixels
    */
   getUserSyncs: function (syncOptions, serverResponses) {
-    return (syncOptions.iframeEnabled) ? [{
-      type: 'iframe',
-      url: USER_SYNC_URL
-    }] : [];
+    const syncs = [];
+    let publisherSyncsPerBidderOverride = null;
+    if (serverResponses.length > 0) {
+      publisherSyncsPerBidderOverride = deepAccess(serverResponses[0], 'body.ext.publishersyncsperbidderoverride');
+    }
+    if (publisherSyncsPerBidderOverride !== undefined && publisherSyncsPerBidderOverride == 0) {
+      return [];
+    }
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: IFRAME_USER_SYNC_URL
+      })
+    } else {
+      let publisherSyncsPerBidder = null;
+      if (config.getConfig('userSync')) {
+        publisherSyncsPerBidder = config.getConfig('userSync').syncsPerBidder
+      }
+      if (publisherSyncsPerBidder === 0) {
+        publisherSyncsPerBidder = publisherSyncsPerBidderOverride
+      }
+      if (publisherSyncsPerBidderOverride && (publisherSyncsPerBidder === 0 || publisherSyncsPerBidder)) {
+        publisherSyncsPerBidder = publisherSyncsPerBidderOverride > publisherSyncsPerBidder ? publisherSyncsPerBidder : publisherSyncsPerBidderOverride
+      } else {
+        publisherSyncsPerBidder = 1
+      }
+      for (let i = 0; i < publisherSyncsPerBidder; i++) {
+        syncs.push({
+          type: 'image',
+          url: buildImgSyncUrl(publisherSyncsPerBidder, i)
+        })
+      }
+    }
+    return syncs;
   }
 };
 
+/**
+   * Build img user sync url
+   * @param {int} syncsPerBidder number of syncs Per Bidder
+   * @param {int} index index to pass
+   * @returns {string} img user sync url
+   */
+function buildImgSyncUrl(syncsPerBidder, index) {
+  let consentString = '';
+  let gdprApplies = '0';
+  if (gdprConsent && gdprConsent.hasOwnProperty('gdprApplies')) {
+    gdprApplies = gdprConsent.gdprApplies ? '1' : '0';
+  }
+  if (gdprConsent && gdprConsent.hasOwnProperty('consentString')) {
+    consentString = gdprConsent.consentString || '';
+  }
+
+  return IMG_USER_SYNC_URL + '&site_id=' + siteID.toString() + '&p=' + syncsPerBidder.toString() + '&i=' + index.toString() + '&gdpr=' + gdprApplies + '&gdpr_consent=' + consentString + '&us_privacy=' + (usPrivacy || '');
+}
+
 registerBidder(spec);
diff --git a/modules/ixBidAdapter.md b/modules/ixBidAdapter.md
index fcbc4ea89e3..638cb11c5ab 100644
--- a/modules/ixBidAdapter.md
+++ b/modules/ixBidAdapter.md
@@ -13,30 +13,10 @@ Description
 This module connects publishers to Index Exchange's (IX) network of demand
 sources through Prebid.js. This module is GDPR and CCPA compliant.
 
-It is compatible with both the older ad unit format where the `sizes` and
-`mediaType` properties are placed at the top-level of the ad unit, and the newer
-format where this information is encapsulated within the `mediaTypes` object. We
-recommend that you use the newer format when possible as it will be better able
+It is compatible with the newer PrebidJS 5.0 ad unit format where the `banner`, `video` and/or `native` properties are encapsulated within the `adUnits[].mediaTypes` object. We
+recommend that you use this newer format when possible as it will be better able
 to accommodate new feature additions.
 
-If a mix of properties from both formats are present within an ad unit, the
-newer format's properties will take precedence.
-
-Here are examples of both formats.
-
-##### Older Format
-```javascript
-var adUnits = [{
-    // ...
-
-    sizes: [
-        [300, 250],
-        [300, 600]
-    ]
-
-    // ...
-}];
-```
 
 ##### Newer Format
 ```javascript
@@ -51,11 +31,19 @@ var adUnits = [{
         },
         video: {
             context: 'instream',
-            playerSize: [
-                [300, 250],
-                [300, 600]
-            ]
-        }
+            playerSize: [300, 250]
+        },
+        native: {
+            title: {
+                required: true
+            },
+            image: {
+                required: true
+            },
+            body: {
+                required: false
+            }
+        },
     },
     // ...
 }];
@@ -67,31 +55,115 @@ var adUnits = [{
 | --- | ---
 | Banner | Fully supported for all IX approved sizes.
 | Video  | Fully supported for all IX approved sizes.
-| Native | Not supported.
+| Native | Supported (render through GAM or publisher's renderer).
+
+
+
+# Ad unit or Bidder Parameters
 
-# Bid Parameters
+These params can be specified in the ad unit level `adUnits[].mediaTypes`, which will be the preferred way going forward with PBJS 5.0
 
 Each of the IX-specific parameters provided under the `adUnits[].bids[].params`
 object are detailed here.
 
-### Banner
+
+## Banner
 
 | Key | Scope | Type | Description
 | --- | --- | --- | ---
-| siteId | Required | String | An IX-specific identifier that is associated with a specific size on this ad unit. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
-| size | Required | Number[] | The single size associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].sizes` or `adUnits[].mediaTypes.banner.sizes`. Examples: `[300, 250]`, `[300, 600]`, `[728, 90]`
+| siteId | Required | String | An IX-specific identifier that is associated with this ad unit. It will be associated to the single size, if the size provided. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
+| sizes | Required | Number[Number[]] | The size / sizes associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].mediaTypes.banner.sizes`. Examples: `[300, 250]`, `[300, 600]`, `[728, 90]`
 
-### Video
+## Video
 
 | Key | Scope | Type | Description
 | --- | --- | --- | ---
-| siteId | Required | String | An IX-specific identifier that is associated with a specific size on this ad unit. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
-| size | Required | Number[] | The single size associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].sizes` or `adUnits[].mediaTypes.video.playerSize`. Examples: `[300, 250]`, `[300, 600]`
-| video | Required | Hash | The video object will serve as the properties of the video ad. You can create any field under the video object that is mentioned in the `OpenRTB Spec v2.5`. Some fields like `mimes, protocols, minduration, maxduration` are required.
-| video.mimes | Required | String[] | Array list of content MIME types supported. Popular MIME types include, but are not limited to, `"video/x-ms- wmv"` for Windows Media and `"video/x-flv"` for Flash Video.
+| siteId | Required | String | An IX-specific identifier that is associated with this ad unit. It will be associated to the single size, if the size is provided. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
+| size | Optional (Deprecated)| Number[] | The single size associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].sizes` or `adUnits[].mediaTypes.video.playerSize`. Examples: `[300, 250]`, `[300, 600]`
+| video | Optional | Hash | The video object will serve as the properties of the video ad. You can create any field under the video object that is mentioned in the `OpenRTB Spec v2.5`. Some fields like `mimes, protocols, minduration, maxduration` are required. Properties not defined at this level, will be pulled from the Adunit level.
+|video.w| Required | Integer | The width of the video player in pixels that will be passed to demand partners.<br /> *If you are using Index’s outstream player and have placed the `video` object at the `bidder` level, this is a required field. You must define the size of the video player using the `video.w` and `video.h` parameters, with a minimum video player size of 300 x 250.
+|video.h| Required | Integer | The height of the video player in pixels that will be passed to demand partners. <br />*If you are using Index’s outstream player and have placed the `video` object at the `bidder` level, this is a required field. You must define the size of the video player using the `video.w` and `video.h` parameters, with a minimum video player size of 300 x 250.
+|video.playerSize| Optional* | Array[Integer,Integer] | The video player size that will be passed to demand partners.</br /> *If you are using Index’s outstream player and have placed the `video` object at the `adUnit` level, this is a required field. You must define the size of the video player using this parameter, with a minimum video player size of 300 x 250.
+| video.mimes | Required | String[] | If you are using Index’s outstream video player and want to learn more about what is supported, see [List of supported OpenRTB bid request fields for Sellers](https://kb.indexexchange.com/publishers/openrtb_integration/list_of_supported_openrtb_bid_request_fields_for_sellers.htm#Video).
 |video.minduration| Required | Integer | Minimum video ad duration in seconds.
 |video.maxduration| Required | Integer | Maximum video ad duration in seconds.
 |video.protocol / video.protocols| Required | Integer / Integer[] | Either a single protocol provided as an integer, or protocols provided as a list of integers. `2` - VAST 2.0, `3` - VAST 3.0, `5` - VAST 2.0 Wrapper, `6` - VAST 3.0 Wrapper
+| video.playerConfig | Optional | Hash | The Index specific outstream player configurations.
+| video.playerConfig.floatOnScroll | Optional | Boolean | A boolean specifying whether you want to use the player’s floating capabilities, where: <br /> - `true`: Allow the player to float.<br /> <b>Note</b>: If you set floatOnScroll to true, Index updates the placement value to `5`. <br />- `false`: Do not allow the player to float (default).
+| video.playerConfig.floatSize | Optional | Integer[] | The height and width of the floating player in pixels. If you do not specify a float size, the player adjusts to the aspect ratio of the player size that is defined when it is not floating. Index recommends that you review and test the float size to your user experience preference.
+
+## Native
+
+| Key | Scope | Type | Description
+| --- | --- | --- | ---
+| sendTargetingKeys | Optional | Boolean | Defines whether or not to send the hb_native_ASSET targeting keys to the ad server. Defaults to true.
+| adTemplate | Optional | String | Used in the ‘AdUnit-Defined Creative Scenario’, this value controls the Native template right in the page.
+| rendererUrl | Optional | String | Used in the ‘Custom Renderer Scenario’, this points to javascript code that will produce the Native template.
+| title | Optional | Title asset | The title of the ad, usually a call to action or a brand name.
+| body | Optional | Data asset | Text of the ad copy.
+| body2 | Optional | Data asset | Additional Text of the ad copy.
+| sponsoredBy | Optional | Data asset | The name of the brand associated with the ad.
+| icon | Optional | Image asset | The brand icon that will appear with the ad.
+| image | Optional | Image asset | A picture that is associated with the brand, or grabs the user’s attention.
+| displayUrl | Optional | Data asset | Text that can be displayed instead of the raw click URL. e.g, “Example.com/Specials”
+| cta | Optional | Data asset | Call to Action text, e.g., “Click here for more information”.
+| rating | Optional | Data asset | Rating information, e.g., “4” out of 5.
+| downloads | Optional | Data asset | 	The total downloads of the advertised application/product.
+| likes | Optional | Data asset | The total number of individuals who like the advertised application/product.
+| price | Optional | Data asset | The non-sale price of the advertised application/product.
+| salePrice | Optional | Data asset | The sale price of the advertised application/product.
+| address | Optional | Data asset | 	Address of the Buyer/Store. e.g, “123 Main Street, Anywhere USA”
+| phone | Optional | Data asset | Phone Number of the Buyer/Store. e.g, “(123) 456-7890”
+
+#### Title Asset
+
+| Key | Scope | Type | Description
+| --- | --- | --- | ---
+| required | Required | Boolean | Specify whether or not a title is required.
+| len | Optional | Integer | Maximum number of characters (defaults to 25 if omitted).
+| ext | Optional | Object | Arbitrary additional parameters to send to the bidder.
+
+#### Data Asset
+
+| Key | Scope | Type | Description
+| --- | --- | --- | ---
+| required | Required | Boolean | Specify whether or not the asset is required.
+| len | Optional | Integer | Maximum number of characters.
+| ext | Optional | Object | Arbitrary additional parameters to send to the bidder.
+
+#### Image Asset
+
+| Key | Scope | Type | Description
+| --- | --- | --- | ---
+| required | Required | Boolean | Specify whether or not the asset is required.
+| sizes | Optional | Integer[] | Minimum size requested for the image, e.g., [100, 100]
+| mimes | Optional | String[] | Whitelist of content MIME types supported, e.g., ["image/jpg", "image/gif"]
+| ext | Optional | Object | Arbitrary additional parameters to send to the bidder.
+
+### Rendering Native Ad
+
+Native ad can be rendered by setting up GAM or setup custom native renderer. Reference [Prebid implementing the native template](https://docs.prebid.org/prebid/native-implementation.html#4-implementing-the-native-template) for more information.
+
+## Deprecation warning
+
+We are deprecating the older format
+of having `mediaType` and `sizes` at the ad unit level.
+
+Here are examples of the format.
+
+##### Older Deprecated Format
+```javascript
+var adUnits = [{
+    // ...
+
+    sizes: [
+        [300, 250],
+        [300, 600]
+    ]
+
+    // ...
+}];
+```
 
 
 Setup Guide
@@ -100,9 +172,12 @@ Setup Guide
 Follow these steps to configure and add the IX module to your Prebid.js
 integration.
 
+Both video and banner params will be read from the `adUnits[].mediaTypes.video` and `adUnits[].mediaTypes.banner` respectively.
+
 The examples in this guide assume the following starting configuration (you may remove banner or video, if either does not apply).
 
-In regards to video, `context` can either be `'instream'` or `'outstream'`. Note that `outstream` requires additional configuration on the adUnit.
+
+In regards to video, `context` can either be `'instream'` or `'outstream'`.
 
 ```javascript
 var adUnits = [{
@@ -134,21 +209,23 @@ var adUnits = [{
 
 ### 1. Add IX to the appropriate ad units
 
-For each size in an ad unit that IX will be bidding on, add one of the following
+For each ad unit that IX will be bidding on, add one of the following
 bid objects under `adUnits[].bids`:
+- size is optional and deprecated
 
 ```javascript
 {
     bidder: 'ix',
     params: {
         siteId: '',
-        size: []
+        size: [] // deprecated
     }
 }
 ```
 
-Set `params.siteId` and `params.size` in each bid object to the values provided
+Set `params.siteId` in the bid object to the values provided
 by your IX representative.
+- `params.size` is not required anymore
 
 **Examples**
 
@@ -167,14 +244,7 @@ var adUnits = [{
     bids: [{
         bidder: 'ix',
         params: {
-            siteId: '12345',
-            size: [300, 250]
-        }
-    }, {
-        bidder: 'ix',
-        params: {
-            siteId: '12345',
-            size: [300, 600]
+            siteId: '12345'
         }
     }]
 }];
@@ -185,35 +255,30 @@ var adUnits = [{
     code: 'video-div-a',
     mediaTypes: {
         video: {
+            // Preferred location for openrtb v2.5 compatible video obj
             context: 'instream',
-            playerSize: [
-                [300, 250],
-                [300, 600]
-            ]
+            playerSize: [300, 250],
+            mimes: [
+                'video/mp4',
+                'video/webm'
+            ],
+            minduration: 0,
+            maxduration: 60,
+            protocols: [6]
         }
     },
     bids: [{
         bidder: 'ix',
         params: {
-            siteId: '12345',
-            size: [300, 250],
-            video: {
-                mimes: [
-                    'video/mp4',
-                    'video/webm'
-                ],
-                minduration: 0,
-                maxduration: 60,
-                protocols: [6]
-            }
+            siteId: '12345'
         }
     }, {
         bidder: 'ix',
         params: {
             siteId: '12345',
-            size: [300, 600],
             video: {
                 // openrtb v2.5 compatible video obj
+                // If required, use this to override mediaTypes.video.XX properties
             }
         }
     }]
@@ -223,45 +288,53 @@ Please note that you can re-use the existing `siteId` within the same flex
 position.
 
 **Video (Outstream):**
-Note that currently, outstream video rendering must be configured by the publisher. In the adUnit, a `renderer` object must be defined, which includes a `url` pointing to the video rendering script, and a `render` function for creating the video player. See http://prebid.org/dev-docs/show-outstream-video-ads.html for more information.
+
+Publishers have two options to receive outstream video demand from Index:
+* Using Index’s outstream video player
+* In an outstream video configuration set up by the publisher. For more information, see [Prebid’s documentation on how to show video ads.](https://docs.prebid.org/dev-docs/show-outstream-video-ads.html)
+
+**Index’s outstream video player**
+Publishers who are using Index as a bidding adapter in Prebid.js can show outstream video ads on their site from us by using Index’s outstream video player. This allows a video ad to display inside of a video player and can be placed anywhere on a publisher’s site, such as in-article, in-feed, and more.
+
+Define a new `video` object for our outstream video player at either the adUnit level or the `bidder` level. If you are setting it at the bidder level, define the size of the video player using the parameters `video.h` and `video.w`. If you are setting it at the `adUnit` level, define the size using video.playerSize.
+
+For more information on how to structure the `video` object, refer to the following code example:
+
 
 ```javascript
 var adUnits = [{
-    code: 'video-div-a',
+    code: 'div-gpt-ad-1571167646410-1',
     mediaTypes: {
         video: {
+            playerSize: [640, 360],
             context: 'outstream',
-            playerSize: [[300, 250]]
-        }
-    },
-    renderer: {
-        url: 'https://test.com/my-video-player.js',
-        render: function (bid) {
-            ...
+            api: [2],
+            protocols: [2, 3, 5, 6],
+            minduration: 5,
+            maxduration: 30,
+            mimes: ['video/mp4', 'application/javascript'],
+            placement: 5
         }
     },
     bids: [{
         bidder: 'ix',
         params: {
-            siteId: '12345',
-            size: [300, 250],
+            siteId: '715964'
             video: {
-                mimes: [
-                    'video/mp4',
-                    'video/webm'
-                ],
-                minduration: 0,
-                maxduration: 60,
-                protocols: [6]
+                playerConfig: {
+                    floatOnScroll: true,
+                    floatSize: [300,250]
+                }
             }
         }
     }]
 }];
 ```
+<em>Please note that your use of the outstream video player will be governed by and subject to the terms and conditions of i) any master services or license agreement entered into by you and Index Exchange; ii) the information provided on our knowledge base linked [here](https://kb.indexexchange.com/publishers/prebid_integration/outstream_video_prebidjs.htm) and [here](https://kb.indexexchange.com/publishers/guidelines/standard_contractual_clauses.htm), and iii) our [Privacy Policy](https://www.indexexchange.com/privacy/). Your use of Index’s outstream video player constitutes your acknowledgement and acceptance of the foregoing. </em>
 
 #### Video Caching
 
-Note that the IX adapter expects a client-side Prebid Cache to be enabled for video bidding.
+Note that the IX adapter expects a client-side Prebid Cache to be enabled for instream video bidding.
 
 ```
 pbjs.setConfig({
@@ -288,6 +361,35 @@ pbjs.setConfig({
     }
 });
 ```
+#### The **detectMissingSizes** feature
+`detectMissingSize` config is now deprecated and IX bidding adapter bids on all banner sizes available in the ad unit when configured to at least one banner size.
+
+**Native**
+
+```javascript
+var adUnits = [{
+    code: 'native-div-a',
+    mediaTypes: {
+        native: {
+            title: {
+                required: true
+            },
+            image: {
+                required: true
+            },
+            sponsoredBy: {
+                required: false
+            }
+        }
+    },
+    bids: [{
+        bidder: 'ix',
+        params: {
+            siteId: '715966'
+        }
+    }]
+}];
+```
 
 ### 2. Include `ixBidAdapter` in your build process
 
@@ -382,29 +484,21 @@ to `'ix'` across all ad units that bids are being requested for does not exceed
 
 ### Time-To-Live (TTL)
 
-Banner bids from IX have a TTL of 300 seconds while video bids have a TTL of 1 hour, after which time they become
-invalid.
-
-If an invalid bid wins, and its associated ad is rendered, it will not count
-towards total impressions on IX's side.
+Banner bids from Index have a TTL of 600 seconds while video bids have a TTL of three hours, after which time they become invalid.
+**Note:** Index supports the `bid.exp` attribute in the bid response which allows our adapter to specify the maximum number of seconds allowed between the auction and billing notice. In the absence of the `bid.exp` attribute, the TTL provided above applies.
 
 FAQs
 ====
 
 ### Why do I have to input size in `adUnits[].bids[].params` for IX when the size is already in the ad unit?
 
-There are two important reasons why we require it:
-
-1. An IX site ID maps to a single size, whereas an ad unit can have multiple
-sizes. To ensure that the right site ID is mapped to the correct size in the ad
-unit we require the size to be explicitly stated.
+No, only `siteId` is required.
 
-2. An ad unit may have sizes that IX does not support. By explicitly stating the
-size, you can choose not to have IX bid on certain sizes that are invalid.
+The `size` parameter is no longer a required field, the `siteId` will now be associated with all the sizes in the ad unit.
 
 ### How do I view IX's bid request in the network?
 
 In your browser of choice, create a new tab and open the developer tools. In
 developer tools, select the network tab. Then, navigate to a page where IX is
 setup to bid. Now, in the network tab, search for requests to
-`casalemedia.com/cygnus`. These are the bid requests.
+`casalemedia.com/openrtb/pbjs`. These are the bid requests.
diff --git a/modules/jcmBidAdapter.js b/modules/jcmBidAdapter.js
deleted file mode 100644
index c8d2f8bdd52..00000000000
--- a/modules/jcmBidAdapter.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-const BIDDER_CODE = 'jcm';
-const URL = 'https://media.adfrontiers.com/pq'
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['jcarter'],
-  isBidRequestValid: function(bid) {
-    return !!(bid.params && bid.params.siteId && bid.bidId);
-  },
-
-  buildRequests: function(validBidRequests) {
-    var BidRequestStr = {
-      bids: []
-    };
-
-    for (var i = 0; i < validBidRequests.length; i++) {
-      var adSizes = '';
-      var bid = validBidRequests[i];
-      for (var x = 0; x < bid.sizes.length; x++) {
-        adSizes += utils.parseGPTSingleSizeArray(bid.sizes[x]);
-        if (x !== (bid.sizes.length - 1)) {
-          adSizes += ',';
-        }
-      }
-
-      BidRequestStr.bids.push({
-        'callbackId': bid.bidId,
-        'siteId': bid.params.siteId,
-        'adSizes': adSizes,
-      });
-    }
-
-    var JSONStr = JSON.stringify(BidRequestStr);
-    var dataStr = 't=hb&ver=1.0&compact=true&bids=' + encodeURIComponent(JSONStr);
-
-    return {
-      method: 'GET',
-      url: URL,
-      data: dataStr
-    }
-  },
-
-  interpretResponse: function(serverResponse) {
-    const bidResponses = [];
-    serverResponse = serverResponse.body;
-    // loop through serverResponses
-    if (serverResponse) {
-      if (serverResponse.bids) {
-        var bids = serverResponse.bids;
-        for (var i = 0; i < bids.length; i++) {
-          var bid = bids[i];
-          const bidResponse = {
-            requestId: bid.callbackId,
-            bidderCode: spec.code,
-            cpm: bid.cpm,
-            width: bid.width,
-            height: bid.height,
-            creativeId: bid.creativeId,
-            currency: 'USD',
-            netRevenue: bid.netRevenue,
-            ttl: bid.ttl,
-            ad: decodeURIComponent(bid.ad.replace(/\+/g, '%20'))
-          };
-          bidResponses.push(bidResponse);
-        };
-      };
-    }
-    return bidResponses;
-  },
-
-  getUserSyncs: function(syncOptions) {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: 'https://media.adfrontiers.com/hb/jcm_usersync.html'
-      }];
-    }
-    if (syncOptions.image) {
-      return [{
-        type: 'image',
-        url: 'https://media.adfrontiers.com/hb/jcm_usersync.png'
-      }];
-    }
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/jcmBidAdapter.md b/modules/jcmBidAdapter.md
deleted file mode 100644
index 53a2356df2f..00000000000
--- a/modules/jcmBidAdapter.md
+++ /dev/null
@@ -1,40 +0,0 @@
-#Overview
-
-```
-Module Name: JCM Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: george@jcartermarketing.com
-```
-
-# Description
-
-Module that connects to J Carter Marketing demand sources
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div1',
-               sizes: [[300, 250]],  //  display 300x250
-               bids: [
-                   {
-                       bidder: 'jcm',
-                       params: {
-                           siteId: '3608'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div2',
-               sizes: [[728, 90]],   // display 728x90
-               bids: [
-                   {
-                       bidder: 'jcm',
-                       params: {
-                           siteId: '3608'
-                       }
-                   }
-               ]
-           }
-       ];
-
diff --git a/modules/jixieBidAdapter.js b/modules/jixieBidAdapter.js
new file mode 100644
index 00000000000..5eeab197f3a
--- /dev/null
+++ b/modules/jixieBidAdapter.js
@@ -0,0 +1,312 @@
+import {deepAccess, getDNT, isArray, logWarn} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {ajax} from '../src/ajax.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {Renderer} from '../src/Renderer.js';
+import {createEidsArray} from './userId/eids.js';
+
+const BIDDER_CODE = 'jixie';
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+const EVENTS_URL = 'https://hbtra.jixie.io/sync/hb?';
+const JX_OUTSTREAM_RENDERER_URL = 'https://scripts.jixie.media/jxhbrenderer.1.1.min.js';
+const REQUESTS_URL = 'https://hb.jixie.io/v2/hbpost';
+const sidTTLMins_ = 30;
+
+/**
+ * Own miscellaneous support functions:
+ */
+
+function setIds_(clientId, sessionId) {
+  let dd = null;
+  try {
+    dd = window.location.hostname.match(/[^.]*\.[^.]{2,3}(?:\.[^.]{2,3})?$/mg);
+  } catch (err1) {}
+  try {
+    let expC = (new Date(new Date().setFullYear(new Date().getFullYear() + 1))).toUTCString();
+    let expS = (new Date(new Date().setMinutes(new Date().getMinutes() + sidTTLMins_))).toUTCString();
+
+    storage.setCookie('_jxx', clientId, expC, 'None', null);
+    storage.setCookie('_jxx', clientId, expC, 'None', dd);
+
+    storage.setCookie('_jxxs', sessionId, expS, 'None', null);
+    storage.setCookie('_jxxs', sessionId, expS, 'None', dd);
+
+    storage.setDataInLocalStorage('_jxx', clientId);
+    storage.setDataInLocalStorage('_jxxs', sessionId);
+  } catch (error) {}
+}
+
+function fetchIds_() {
+  let ret = {
+    client_id_c: '',
+    client_id_ls: '',
+    session_id_c: '',
+    session_id_ls: ''
+  };
+  try {
+    let tmp = storage.getCookie('_jxx');
+    if (tmp) ret.client_id_c = tmp;
+    tmp = storage.getCookie('_jxxs');
+    if (tmp) ret.session_id_c = tmp;
+
+    tmp = storage.getDataFromLocalStorage('_jxx');
+    if (tmp) ret.client_id_ls = tmp;
+    tmp = storage.getDataFromLocalStorage('_jxxs');
+    if (tmp) ret.session_id_ls = tmp;
+    tmp = storage.getCookie('_jxtoko');
+    if (tmp) ret.jxtoko_id = tmp;
+  } catch (error) {}
+  return ret;
+}
+
+// device in the payload had been a simple string ('desktop', 'mobile')
+// Now changed to an object. yes the backend is able to handle it.
+function getDevice_() {
+  const device = config.getConfig('device') || {};
+  device.w = device.w || window.innerWidth;
+  device.h = device.h || window.innerHeight;
+  device.ua = device.ua || navigator.userAgent;
+  device.dnt = getDNT() ? 1 : 0;
+  device.language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+  return device;
+}
+
+function pingTracking_(endpointOverride, qpobj) {
+  internal.ajax((endpointOverride || EVENTS_URL), null, qpobj, {
+    withCredentials: true,
+    method: 'GET',
+    crossOrigin: true
+  });
+}
+
+function jxOutstreamRender_(bidAd) {
+  bidAd.renderer.push(() => {
+    window.JixieOutstreamVideo.init({
+      sizes: [bidAd.width, bidAd.height],
+      width: bidAd.width,
+      height: bidAd.height,
+      targetId: bidAd.adUnitCode,
+      adResponse: bidAd.adResponse
+    });
+  });
+}
+
+function createRenderer_(bidAd, scriptUrl, createFcn) {
+  const renderer = Renderer.install({
+    id: bidAd.adUnitCode,
+    url: scriptUrl,
+    loaded: false,
+    config: {'player_height': bidAd.height, 'player_width': bidAd.width},
+    adUnitCode: bidAd.adUnitCode
+  });
+  try {
+    renderer.setRender(createFcn);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+  }
+  return renderer;
+}
+
+function getMiscDims_() {
+  let ret = {
+    pageurl: '',
+    domain: '',
+    device: 'unknown',
+    mkeywords: ''
+  }
+  try {
+    // TODO: this should pick refererInfo from bidderRequest
+    let refererInfo_ = getRefererInfo();
+    // TODO: does the fallback make sense here?
+    let url_ = refererInfo_?.page || window.location.href
+    ret.pageurl = url_;
+    ret.domain = refererInfo_?.domain || window.location.host
+    ret.device = getDevice_();
+    let keywords = document.getElementsByTagName('meta')['keywords'];
+    if (keywords && keywords.content) {
+      ret.mkeywords = keywords.content;
+    }
+  } catch (error) {}
+  return ret;
+}
+
+/* function addUserId(eids, id, source, rti) {
+  if (id) {
+    if (rti) {
+      eids.push({ source, id, rti_partner: rti });
+    } else {
+      eids.push({ source, id });
+    }
+  }
+  return eids;
+} */
+
+// easier for replacement in the unit test
+export const internal = {
+  getDevice: getDevice_,
+  getRefererInfo: getRefererInfo,
+  ajax: ajax,
+  getMiscDims: getMiscDims_
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  EVENTS_URL: EVENTS_URL,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid: function(bid) {
+    if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
+      return false;
+    }
+    if (typeof bid.params.unit === 'undefined') {
+      return false;
+    }
+    return true;
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const currencyObj = config.getConfig('currency');
+    const currency = (currencyObj && currencyObj.adServerCurrency) || 'USD';
+
+    let bids = [];
+    validBidRequests.forEach(function(one) {
+      bids.push({
+        bidId: one.bidId,
+        adUnitCode: one.adUnitCode,
+        mediaTypes: (one.mediaTypes === 'undefined' ? {} : one.mediaTypes),
+        sizes: (one.sizes === 'undefined' ? [] : one.sizes),
+        params: one.params,
+      });
+    });
+
+    let jixieCfgBlob = config.getConfig('jixie');
+    if (!jixieCfgBlob) {
+      jixieCfgBlob = {};
+    }
+
+    let ids = fetchIds_();
+    let eids = [];
+    let miscDims = internal.getMiscDims();
+    let schain = deepAccess(validBidRequests[0], 'schain');
+
+    // all available user ids are sent to our backend in the standard array layout:
+    if (validBidRequests[0].userId) {
+      let eids1 = createEidsArray(validBidRequests[0].userId);
+      if (eids1.length) {
+        eids = eids1;
+      }
+    }
+    // we want to send this blob of info to our backend:
+    let pg = config.getConfig('priceGranularity');
+    if (!pg) {
+      pg = {};
+    }
+
+    let transformedParams = Object.assign({}, {
+      auctionid: bidderRequest.auctionId,
+      timeout: bidderRequest.timeout,
+      currency: currency,
+      timestamp: (new Date()).getTime(),
+      device: miscDims.device,
+      domain: miscDims.domain,
+      pageurl: miscDims.pageurl,
+      mkeywords: miscDims.mkeywords,
+      bids: bids,
+      eids: eids,
+      schain: schain,
+      pricegranularity: pg,
+      cfg: jixieCfgBlob
+    }, ids);
+    return Object.assign({}, {
+      method: 'POST',
+      url: REQUESTS_URL,
+      data: JSON.stringify(transformedParams),
+      currency: currency
+    });
+  },
+
+  onTimeout: function(timeoutData) {
+    let jxCfgBlob = config.getConfig('jixie');
+    if (jxCfgBlob && jxCfgBlob.onTimeout == 'off') {
+      return;
+    }
+    let url = null;// default
+    if (jxCfgBlob && jxCfgBlob.onTimeoutUrl && typeof jxCfgBlob.onTimeoutUrl == 'string') {
+      url = jxCfgBlob.onTimeoutUrl;
+    }
+    let miscDims = internal.getMiscDims();
+    pingTracking_(url, // no overriding ping URL . just use default
+      {
+        action: 'hbtimeout',
+        device: miscDims.device,
+        pageurl: encodeURIComponent(miscDims.pageurl),
+        domain: encodeURIComponent(miscDims.domain),
+        auctionid: deepAccess(timeoutData, '0.auctionId'),
+        timeout: deepAccess(timeoutData, '0.timeout'),
+        count: timeoutData.length
+      });
+  },
+
+  onBidWon: function(bid) {
+    if (bid.notrack) {
+      return;
+    }
+    if (bid.trackingUrl) {
+      pingTracking_(bid.trackingUrl, {});
+    } else {
+      let miscDims = internal.getMiscDims();
+      pingTracking_((bid.trackingUrlBase ? bid.trackingUrlBase : null), {
+        action: 'hbbidwon',
+        device: miscDims.device,
+        pageurl: encodeURIComponent(miscDims.pageurl),
+        domain: encodeURIComponent(miscDims.domain),
+        cid: bid.cid,
+        cpid: bid.cpid,
+        jxbidid: bid.jxBidId,
+        auctionid: bid.auctionId,
+        cpm: bid.cpm,
+        requestid: bid.requestId
+      });
+    }
+  },
+
+  interpretResponse: function(response, bidRequest) {
+    if (response && response.body && isArray(response.body.bids)) {
+      const bidResponses = [];
+      response.body.bids.forEach(function(oneBid) {
+        let bnd = {};
+
+        Object.assign(bnd, oneBid);
+        if (oneBid.osplayer) {
+          bnd.adResponse = {
+            content: oneBid.vastXml,
+            parameters: oneBid.osparams,
+            height: oneBid.height,
+            width: oneBid.width
+          };
+          let rendererScript = (oneBid.osparams.script ? oneBid.osparams.script : JX_OUTSTREAM_RENDERER_URL);
+          bnd.renderer = createRenderer_(oneBid, rendererScript, jxOutstreamRender_);
+        }
+        // a note on advertiserDomains: our adserver is not responding in
+        // openRTB-type json. so there is no need to copy from 'adomain' over
+        // to meta: advertiserDomains
+        // However, we will just make sure the property is there.
+        if (!bnd.meta) {
+          bnd.meta = {};
+        }
+        if (!bnd.meta.advertiserDomains) {
+          bnd.meta.advertiserDomains = [];
+        }
+        bidResponses.push(bnd);
+      });
+      if (response.body.setids) {
+        setIds_(response.body.setids.client_id,
+          response.body.setids.session_id);
+      }
+      return bidResponses;
+    } else { return []; }
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/jixieBidAdapter.md b/modules/jixieBidAdapter.md
new file mode 100644
index 00000000000..c0a1a965e87
--- /dev/null
+++ b/modules/jixieBidAdapter.md
@@ -0,0 +1,74 @@
+# Overview
+
+Module Name: Jixie Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: contact@jixie.io
+
+# Description
+
+Module that connects to Jixie demand source to fetch bids.
+All prebid-supported user ids are sent to Jixie endpoint, if available. 
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'demoslot1-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [
+                        [300, 250]
+                    ]
+                }
+            },
+            bids: [
+                {
+                    bidder: 'jixie',
+                    params: {
+                        unit: "prebidsampleunit"
+                    }
+                }
+            ]
+        },
+        {
+            code: 'demoslot2-div',
+            sizes: [640, 360],
+            mediaTypes: {
+                video: {
+                    playerSize: [
+                        [640, 360]
+                    ],
+                    context: "outstream"
+                }
+            },
+            bids: [
+                {
+                    bidder: 'jixie',
+                    params: {
+                        unit: "prebidsampleunit"
+                    }
+                }
+            ]
+        },
+        {
+            code: 'demoslot3-div',
+            sizes: [640, 360],
+            mediaTypes: {
+                video: {
+                    playerSize: [
+                        [640, 360]
+                    ],
+                    context: "instream"
+                }
+            },
+            bids: [
+                {
+                    bidder: 'jixie',
+                    params: {
+                        unit: "prebidsampleunit"
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/justIdSystem.js b/modules/justIdSystem.js
new file mode 100644
index 00000000000..15b1c90da4e
--- /dev/null
+++ b/modules/justIdSystem.js
@@ -0,0 +1,206 @@
+/**
+ * This module adds JustId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/justIdSystem
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js'
+import { submodule } from '../src/hook.js'
+import { loadExternalScript } from '../src/adloader.js'
+import {includes} from '../src/polyfill.js';
+
+const MODULE_NAME = 'justId';
+const EXTERNAL_SCRIPT_MODULE_CODE = 'justtag';
+const LOG_PREFIX = 'User ID - JustId submodule: ';
+const GVLID = 160;
+const DEFAULT_PARTNER = 'pbjs-just-id-module';
+const DEFAULT_ATM_VAR_NAME = '__atm';
+
+const MODE_BASIC = 'BASIC';
+const MODE_COMBINED = 'COMBINED';
+const DEFAULT_MODE = MODE_BASIC;
+
+export const EX_URL_REQUIRED = new Error(`params.url is required in ${MODE_COMBINED} mode`);
+export const EX_INVALID_MODE = new Error(`Invalid params.mode. Allowed values: ${MODE_BASIC}, ${MODE_COMBINED}`);
+
+/** @type {Submodule} */
+export const justIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * required for the gdpr enforcement module
+   */
+  gvlid: GVLID,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {{uid:string}} value
+   * @returns {{justId:string}}
+   */
+  decode(value) {
+    utils.logInfo(LOG_PREFIX, 'decode', value);
+    const justId = value && value.uid;
+    return justId && {justId: justId};
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} config
+   * @param {ConsentData} consentData
+   * @param {(Object|undefined)} cacheIdObj
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData, cacheIdObj) {
+    utils.logInfo(LOG_PREFIX, 'getId', config, consentData, cacheIdObj);
+
+    var configWrapper
+    try {
+      configWrapper = new ConfigWrapper(config);
+    } catch (e) {
+      utils.logError(LOG_PREFIX, e);
+    }
+
+    return configWrapper && {
+      callback: function(cbFun) {
+        try {
+          utils.logInfo(LOG_PREFIX, 'fetching uid...');
+
+          var uidProvider = configWrapper.isCombinedMode()
+            ? new CombinedUidProvider(configWrapper, consentData, cacheIdObj)
+            : new BasicUidProvider(configWrapper);
+
+          uidProvider.getUid(justId => {
+            if (utils.isEmptyStr(justId)) {
+              utils.logError(LOG_PREFIX, 'empty uid!');
+              cbFun();
+              return;
+            }
+            cbFun({uid: justId});
+          }, err => {
+            utils.logError(LOG_PREFIX, 'error during fetching', err);
+            cbFun();
+          });
+        } catch (e) {
+          utils.logError(LOG_PREFIX, 'Error during fetching...', e);
+        }
+      }
+    };
+  }
+};
+
+export const ConfigWrapper = function(config) {
+  this.getConfig = function() {
+    return config;
+  }
+
+  this.getMode = function() {
+    return (params().mode || DEFAULT_MODE).toUpperCase();
+  }
+
+  this.getPartner = function() {
+    return params().partner || DEFAULT_PARTNER;
+  }
+
+  this.isCombinedMode = function() {
+    return this.getMode() === MODE_COMBINED;
+  }
+
+  this.getAtmVarName = function() {
+    return params().atmVarName || DEFAULT_ATM_VAR_NAME;
+  }
+
+  this.getUrl = function() {
+    const u = params().url;
+    const url = new URL(u);
+    url.searchParams.append('sourceId', this.getPartner());
+    return url.toString();
+  }
+
+  function params() {
+    return config.params || {};
+  }
+
+  // validation
+  if (!includes([MODE_BASIC, MODE_COMBINED], this.getMode())) {
+    throw EX_INVALID_MODE;
+  }
+
+  var url = params().url;
+  if (this.isCombinedMode() && (utils.isEmptyStr(url) || !utils.isStr(url))) {
+    throw EX_URL_REQUIRED;
+  }
+}
+
+const CombinedUidProvider = function(configWrapper, consentData, cacheIdObj) {
+  const url = configWrapper.getUrl();
+
+  this.getUid = function(idCallback, errCallback) {
+    const scriptTag = loadExternalScript(url, EXTERNAL_SCRIPT_MODULE_CODE, () => {
+      utils.logInfo(LOG_PREFIX, 'script loaded', url);
+
+      const eventDetails = {
+        detail: {
+          config: configWrapper.getConfig(),
+          consentData: consentData,
+          cacheIdObj: cacheIdObj
+        }
+      }
+
+      scriptTag.dispatchEvent(new CustomEvent('prebidGetId', eventDetails));
+    })
+
+    scriptTag.addEventListener('justIdReady', event => {
+      utils.logInfo(LOG_PREFIX, 'received justId', event);
+      idCallback(event.detail && event.detail.justId);
+    });
+
+    scriptTag.onerror = errCallback;
+  }
+}
+
+const BasicUidProvider = function(configWrapper) {
+  const atmVarName = configWrapper.getAtmVarName();
+
+  this.getUid = function(idCallback, errCallback) {
+    var atm = getAtm();
+    if (typeof atm !== 'function') { // it may be AsyncFunction, so we can't use utils.isFn
+      utils.logInfo(LOG_PREFIX, 'ATM function not found!', atmVarName, atm);
+      errCallback('ATM not found');
+      return
+    }
+
+    atm = function() { // stub is replaced after ATM is loaded so we must refer them directly by global variable
+      return getAtm().apply(this, arguments);
+    }
+
+    atm('getReadyState', () => {
+      Promise.resolve(atm('getVersion')) // atm('getVersion') returns string || Promise<string>
+        .then(atmVersion => {
+          utils.logInfo(LOG_PREFIX, 'ATM Version', atmVersion);
+          if (utils.isStr(atmVersion)) { // getVersion command was introduced in same ATM version as getUid command
+            atm('getUid', idCallback);
+          } else {
+            errCallback('ATM getUid not supported');
+          }
+        })
+    });
+  }
+
+  function getAtm() {
+    return jtUtils.getAtm(atmVarName);
+  }
+}
+
+export const jtUtils = {
+  getAtm(atmVarName) {
+    return window[atmVarName];
+  }
+}
+
+submodule('userId', justIdSubmodule);
diff --git a/modules/justIdSystem.md b/modules/justIdSystem.md
new file mode 100644
index 00000000000..f58deef8010
--- /dev/null
+++ b/modules/justIdSystem.md
@@ -0,0 +1,70 @@
+## Just ID User ID Submodule
+
+For assistance setting up your module please contact us at [prebid@justtag.com](prebid@justtag.com).
+
+First, make sure to add the Just ID submodule to your Prebid.js package with:
+
+```
+gulp build --modules=userId,justIdSystem
+```
+
+### Modes
+
+- **BASIC** - in this mode we rely on Justtag library that already exists on publisher page. Typicaly that library expose global variable called `__atm`
+
+- **COMBINED** - Just ID generation process may differ between various cases depends on publishers. This mode combines our js library with prebid for ease of integration
+
+### Disclosure
+
+This module in `COMBINED` mode loads external JavaScript to generate optimal quality user ID. It is possible to retrieve user ID, without loading additional script by this module in `BASIC` mode.
+
+### Just ID Example
+
+ex. 1. Mode `COMBINED`
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'justId',
+            params: {
+                mode: 'COMBINED',
+                url: 'https://id.nsaudience.pl/getId.js', // required in COMBINED mode
+                partner: 'pbjs-just-id-module'            // optional, may be required in some custom integrations with Justtag
+            }
+        }]
+    }
+});
+```
+
+ex. 2. Mode `BASIC`
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'justId',
+            params: {
+                mode: 'BASIC',       // default
+                atmVarName: '__atm'  // optional
+            }
+        }]
+    }
+});
+```
+
+### Prebid Params
+
+Individual params may be set for the Just ID Submodule.
+
+## Parameter Descriptions for the `userSync` Configuration Section
+The below parameters apply only to the Just ID integration.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID of the module - `'justId'` | `'justId'` |
+| params | Optional | Object | Details for Just ID syncing. | |
+| params.mode | Optional | String | Mode in which the module works. Available Modes: `'COMBINED'`, `'BASIC'`(default)   | `'COMBINED'` |
+| params.atmVarName | Optional | String | Name of global object property that point to Justtag ATM Library. Defaults to `'__atm'` | `'__atm'` |
+| params.url | Optional | String | API Url, **required** in `COMBINED` mode | `'https://id.nsaudience.pl/getId.js'` |
+| params.partner | Optional | String | This is the Justtag Partner Id which may be required in some custom integrations with Justtag | `'some-publisher'` |
diff --git a/modules/justpremiumBidAdapter.js b/modules/justpremiumBidAdapter.js
index 1f84feee7d1..7f154614e4d 100644
--- a/modules/justpremiumBidAdapter.js
+++ b/modules/justpremiumBidAdapter.js
@@ -2,12 +2,13 @@ import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { deepAccess } from '../src/utils.js';
 
 const BIDDER_CODE = 'justpremium'
+const GVLID = 62
 const ENDPOINT_URL = 'https://pre.ads.justpremium.com/v/2.0/t/xhr'
-const JP_ADAPTER_VERSION = '1.7'
-const pixels = []
+const JP_ADAPTER_VERSION = '1.8.3'
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   time: 60000,
 
   isBidRequestValid: (bid) => {
@@ -17,20 +18,23 @@ export const spec = {
   buildRequests: (validBidRequests, bidderRequest) => {
     const c = preparePubCond(validBidRequests)
     const dim = getWebsiteDim()
+    const ggExt = getGumGumParams()
     const payload = {
       zone: validBidRequests.map(b => {
         return parseInt(b.params.zone)
       }).filter((value, index, self) => {
         return self.indexOf(value) === index
       }),
-      referer: bidderRequest.refererInfo.referer,
+      // TODO: is 'page' the right value here?
+      referer: bidderRequest.refererInfo.page,
       sw: dim.screenWidth,
       sh: dim.screenHeight,
       ww: dim.innerWidth,
       wh: dim.innerHeight,
       c: c,
       id: validBidRequests[0].params.zone,
-      sizes: {}
+      sizes: {},
+      ggExt: ggExt
     }
     validBidRequests.forEach(b => {
       const zone = b.params.zone
@@ -63,6 +67,10 @@ export const spec = {
       jp_adapter: JP_ADAPTER_VERSION
     }
 
+    if (validBidRequests[0].schain) {
+      payload.schain = validBidRequests[0].schain;
+    }
+
     const payloadString = JSON.stringify(payload)
 
     return {
@@ -90,7 +98,15 @@ export const spec = {
           netRevenue: true,
           currency: bid.currency || 'USD',
           ttl: bid.ttl || spec.time,
-          format: bid.format
+          format: bid.format,
+          meta: {
+            advertiserDomains: bid.adomain && bid.adomain.length > 0 ? bid.adomain : []
+          }
+        }
+        if (bid.ext && bid.ext.pg) {
+          bidResponse.adserverTargeting = {
+            'hb_deal_justpremium': 'jp_pg'
+          }
         }
         bidResponses.push(bidResponse)
       }
@@ -98,8 +114,10 @@ export const spec = {
     return bidResponses
   },
 
-  getUserSyncs: function getUserSyncs(syncOptions, responses, gdprConsent, uspConsent) {
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
     let url = 'https://pre.ads.justpremium.com/v/1.0/t/sync' + '?_c=' + 'a' + Math.random().toString(36).substring(7) + Date.now();
+    let pixels = []
+
     if (gdprConsent && (typeof gdprConsent.gdprApplies === 'boolean') && gdprConsent.gdprApplies && gdprConsent.consentString) {
       url = url + '&consentString=' + encodeURIComponent(gdprConsent.consentString)
     }
@@ -112,6 +130,10 @@ export const spec = {
         url: url
       })
     }
+    if (syncOptions.pixelEnabled && serverResponses.length !== 0) {
+      const pxsFromResponse = serverResponses.map(res => res?.body?.pxs).reduce((acc, cur) => acc.concat(cur), []).filter((obj) => obj !== undefined);
+      pixels = [...pixels, ...pxsFromResponse];
+    }
     return pixels
   },
 }
@@ -239,4 +261,19 @@ function getWebsiteDim () {
   }
 }
 
+function getGumGumParams () {
+  if (!window.top) return null
+
+  const urlParams = new URLSearchParams(window.top.location.search)
+  const ggParams = {
+    'ggAdbuyid': urlParams.get('gg_adbuyid'),
+    'ggDealid': urlParams.get('gg_dealid'),
+    'ggEadbuyid': urlParams.get('gg_eadbuyid')
+  }
+
+  const checkIfEmpty = (obj) => Object.keys(obj).length === 0 ? null : obj
+  const removeNullEntries = (obj) => Object.fromEntries(Object.entries(obj).filter(([_, v]) => v != null))
+  return checkIfEmpty(removeNullEntries(ggParams))
+}
+
 registerBidder(spec)
diff --git a/modules/justpremiumBidAdapter.md b/modules/justpremiumBidAdapter.md
index 45dcb7b7f99..e107cb80958 100644
--- a/modules/justpremiumBidAdapter.md
+++ b/modules/justpremiumBidAdapter.md
@@ -2,7 +2,6 @@
 
 **Module Name**: Justpremium Bidder Adapter
 **Module Type**: Bidder Adapter
-**Maintainer**: headerbidding-dev@justpremium.com
 
 # Description
 
diff --git a/modules/jwplayerRtdProvider.js b/modules/jwplayerRtdProvider.js
new file mode 100644
index 00000000000..b79843dccfd
--- /dev/null
+++ b/modules/jwplayerRtdProvider.js
@@ -0,0 +1,373 @@
+/**
+ * This module adds the jwplayer provider to the Real Time Data module (rtdModule)
+ * The {@link module:modules/realTimeData} module is required
+ * The module will allow Ad Bidders to obtain JW Player's Video Ad Targeting information
+ * The module will fetch segments for the media ids present in the prebid config when the module loads. If any bid
+ * requests are made while the segments are being fetched, they will be blocked until all requests complete, or the
+ * timeout expires.
+ * @module modules/jwplayerRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import {submodule} from '../src/hook.js';
+import {config} from '../src/config.js';
+import {ajaxBuilder} from '../src/ajax.js';
+import {deepAccess, logError} from '../src/utils.js';
+import {find} from '../src/polyfill.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+
+const SUBMODULE_NAME = 'jwplayer';
+const JWPLAYER_DOMAIN = SUBMODULE_NAME + '.com';
+const segCache = {};
+const pendingRequests = {};
+let activeRequestCount = 0;
+let resumeBidRequest;
+
+/** @type {RtdSubmodule} */
+export const jwplayerSubmodule = {
+  /**
+     * used to link submodule with realTimeData
+     * @type {string}
+     */
+  name: SUBMODULE_NAME,
+  /**
+     * add targeting data to bids and signal completion to realTimeData module
+     * @function
+     * @param {Obj} bidReqConfig
+     * @param {function} onDone
+     */
+  getBidRequestData: enrichBidRequest,
+  init
+};
+
+config.getConfig('realTimeData', ({realTimeData}) => {
+  const providers = realTimeData.dataProviders;
+  const jwplayerProvider = providers && find(providers, pr => pr.name && pr.name.toLowerCase() === SUBMODULE_NAME);
+  const params = jwplayerProvider && jwplayerProvider.params;
+  if (!params) {
+    return;
+  }
+  fetchTargetingInformation(params);
+});
+
+submodule('realTimeData', jwplayerSubmodule);
+
+function init(provider, userConsent) {
+  return true;
+}
+
+export function fetchTargetingInformation(jwTargeting) {
+  const mediaIDs = jwTargeting.mediaIDs;
+  if (!mediaIDs) {
+    return;
+  }
+  mediaIDs.forEach(mediaID => {
+    fetchTargetingForMediaId(mediaID);
+  });
+}
+
+export function fetchTargetingForMediaId(mediaId) {
+  const ajax = ajaxBuilder();
+  // TODO: Avoid checking undefined vs null by setting a callback to pendingRequests.
+  pendingRequests[mediaId] = null;
+  ajax(`https://cdn.${JWPLAYER_DOMAIN}/v2/media/${mediaId}`, {
+    success: function (response) {
+      const segment = parseSegment(response);
+      cacheSegments(segment, mediaId);
+      onRequestCompleted(mediaId, !!segment);
+    },
+    error: function () {
+      logError('failed to retrieve targeting information');
+      onRequestCompleted(mediaId, false);
+    }
+  });
+}
+
+function parseSegment(response) {
+  let segment;
+  try {
+    const data = JSON.parse(response);
+    if (!data) {
+      throw ('Empty response');
+    }
+
+    const playlist = data.playlist;
+    if (!playlist || !playlist.length) {
+      throw ('Empty playlist');
+    }
+
+    segment = playlist[0].jwpseg;
+  } catch (err) {
+    logError(err);
+  }
+  return segment;
+}
+
+function cacheSegments(jwpseg, mediaId) {
+  if (jwpseg && mediaId) {
+    segCache[mediaId] = jwpseg;
+  }
+}
+
+function onRequestCompleted(mediaID, success) {
+  const callback = pendingRequests[mediaID];
+  if (callback) {
+    callback(success ? getVatFromCache(mediaID) : { mediaID });
+    activeRequestCount--;
+  }
+  delete pendingRequests[mediaID];
+
+  if (activeRequestCount > 0) {
+    return;
+  }
+
+  if (resumeBidRequest) {
+    resumeBidRequest();
+    resumeBidRequest = null;
+  }
+}
+
+function enrichBidRequest(bidReqConfig, onDone) {
+  activeRequestCount = 0;
+  const adUnits = bidReqConfig.adUnits || getGlobal().adUnits;
+  enrichAdUnits(adUnits, bidReqConfig.ortb2Fragments);
+  if (activeRequestCount <= 0) {
+    onDone();
+  } else {
+    resumeBidRequest = onDone;
+  }
+}
+
+/**
+ * get targeting data and write to bids
+ * @function
+ * @param {adUnit[]} adUnits
+ * @param ortb2Fragments
+ */
+export function enrichAdUnits(adUnits, ortb2Fragments = {}) {
+  const fpdFallback = deepAccess(ortb2Fragments.global, 'site.ext.data.jwTargeting');
+  adUnits.forEach(adUnit => {
+    const jwTargeting = extractPublisherParams(adUnit, fpdFallback);
+    if (!jwTargeting || !Object.keys(jwTargeting).length) {
+      return;
+    }
+
+    const onVatResponse = function (vat) {
+      if (!vat) {
+        return;
+      }
+      const mediaId = vat.mediaID;
+      const contentId = getContentId(mediaId);
+      const contentSegments = getContentSegments(vat.segments);
+      const contentData = getContentData(mediaId, contentSegments);
+      const targeting = formatTargetingResponse(vat);
+      enrichBids(adUnit.bids, targeting, contentId, contentData);
+      addOrtbSiteContent(ortb2Fragments.global, contentId, contentData);
+    };
+    loadVat(jwTargeting, onVatResponse);
+  });
+}
+
+function supportsInstreamVideo(mediaTypes) {
+  const video = mediaTypes && mediaTypes.video;
+  return video && video.context === 'instream';
+}
+
+export function extractPublisherParams(adUnit, fallback) {
+  let adUnitTargeting;
+  try {
+    adUnitTargeting = adUnit.ortb2Imp.ext.data.jwTargeting;
+  } catch (e) {}
+
+  if (!adUnitTargeting && !supportsInstreamVideo(adUnit.mediaTypes)) {
+    return;
+  }
+
+  return Object.assign({}, fallback, adUnitTargeting);
+}
+
+function loadVat(params, onCompletion) {
+  const { playerID, mediaID } = params;
+  if (pendingRequests[mediaID] !== undefined) {
+    loadVatForPendingRequest(playerID, mediaID, onCompletion);
+    return;
+  }
+
+  const vat = getVatFromCache(mediaID) || getVatFromPlayer(playerID, mediaID) || { mediaID };
+  onCompletion(vat);
+}
+
+function loadVatForPendingRequest(playerID, mediaID, callback) {
+  const vat = getVatFromPlayer(playerID, mediaID);
+  if (vat) {
+    callback(vat);
+  } else {
+    activeRequestCount++;
+    pendingRequests[mediaID] = callback;
+  }
+}
+
+export function getVatFromCache(mediaID) {
+  const segments = segCache[mediaID];
+
+  if (!segments) {
+    return null;
+  }
+
+  return {
+    segments,
+    mediaID
+  };
+}
+
+export function getVatFromPlayer(playerID, mediaID) {
+  const player = getPlayer(playerID);
+  if (!player) {
+    return null;
+  }
+
+  const item = mediaID ? find(player.getPlaylist(), item => item.mediaid === mediaID) : player.getPlaylistItem();
+  if (!item) {
+    return null;
+  }
+
+  mediaID = mediaID || item.mediaid;
+  const segments = item.jwpseg;
+  cacheSegments(segments, mediaID)
+
+  return {
+    segments,
+    mediaID
+  };
+}
+
+/*
+  deprecated
+ */
+export function formatTargetingResponse(vat) {
+  const { segments, mediaID } = vat;
+  const targeting = {};
+  if (segments && segments.length) {
+    targeting.segments = segments;
+  }
+
+  if (mediaID) {
+    targeting.content = {
+      id: getContentId(mediaID)
+    }
+  }
+  return targeting;
+}
+
+export function getContentId(mediaID) {
+  if (!mediaID) {
+    return;
+  }
+
+  return 'jw_' + mediaID;
+}
+
+export function getContentSegments(segments) {
+  if (!segments || !segments.length) {
+    return;
+  }
+
+  const formattedSegments = segments.reduce((convertedSegments, rawSegment) => {
+    convertedSegments.push({
+      id: rawSegment
+    });
+    return convertedSegments;
+  }, []);
+
+  return formattedSegments;
+}
+
+export function getContentData(mediaId, segments) {
+  if (!mediaId && !segments) {
+    return;
+  }
+
+  const contentData = {
+    name: JWPLAYER_DOMAIN,
+    ext: {}
+  };
+
+  if (mediaId) {
+    contentData.ext.cids = [mediaId];
+  }
+
+  if (segments) {
+    contentData.segment = segments;
+    contentData.ext.segtax = 502;
+  }
+
+  return contentData;
+}
+
+export function addOrtbSiteContent(ortb2, contentId, contentData) {
+  if (!contentId && !contentData) {
+    return;
+  }
+
+  if (ortb2 == null) {
+    ortb2 = {};
+  }
+
+  let site = ortb2.site = ortb2.site || {};
+  let content = site.content = site.content || {};
+
+  if (contentId) {
+    content.id = contentId;
+  }
+
+  const currentData = content.data = content.data || [];
+  // remove old jwplayer data
+  const data = currentData.filter(datum => datum.name !== JWPLAYER_DOMAIN);
+
+  if (contentData) {
+    data.push(contentData);
+  }
+
+  content.data = data;
+
+  return ortb2;
+}
+
+function enrichBids(bids, targeting, contentId, contentData) {
+  if (!bids) {
+    return;
+  }
+
+  bids.forEach(bid => {
+    addTargetingToBid(bid, targeting);
+  });
+}
+
+/*
+  deprecated
+ */
+export function addTargetingToBid(bid, targeting) {
+  if (!targeting) {
+    return;
+  }
+
+  const rtd = bid.rtd || {};
+  const jwRtd = {};
+  jwRtd[SUBMODULE_NAME] = Object.assign({}, rtd[SUBMODULE_NAME], { targeting });
+  bid.rtd = Object.assign({}, rtd, jwRtd);
+}
+
+function getPlayer(playerID) {
+  const jwplayer = window.jwplayer;
+  if (!jwplayer) {
+    logError(SUBMODULE_NAME + '.js was not found on page');
+    return;
+  }
+
+  const player = jwplayer(playerID);
+  if (!player || !player.getPlaylist) {
+    logError('player ID did not match any players');
+    return;
+  }
+  return player;
+}
diff --git a/modules/jwplayerRtdProvider.md b/modules/jwplayerRtdProvider.md
new file mode 100644
index 00000000000..479829196ed
--- /dev/null
+++ b/modules/jwplayerRtdProvider.md
@@ -0,0 +1,143 @@
+The purpose of this Real Time Data Provider is to allow publishers to target against their JW Player media without 
+having to integrate with the Player Bidding product. This prebid module makes JW Player's video ad targeting information accessible 
+to Bid Adapters.
+
+# Usage for Publishers:
+
+Compile the JW Player RTD Provider into your Prebid build:
+
+`gulp build --modules=jwplayerRtdProvider`
+
+Publishers must register JW Player as a real time data provider by setting up a Prebid Config conformant to the 
+following structure:
+
+```javascript
+const jwplayerDataProvider = {
+  name: "jwplayer"
+};
+
+pbjs.setConfig({
+    ...,
+    realTimeData: {
+      dataProviders: [
+          jwplayerDataProvider
+      ]
+    }
+});
+```
+Lastly, include the content's media ID and/or the player's ID in the matching AdUnit's `ortb2Imp.ext.data`:
+
+```javascript
+const adUnit = {
+  code: '/19968336/prebid_native_example_1',
+  ...,
+  ortb2Imp: {
+    ext: {
+      data: {
+        jwTargeting: {
+          // Note: the following Ids are placeholders and should be replaced with your Ids.
+          playerID: 'abcd',
+          mediaID: '1234'
+        }
+      }
+    }
+  }
+};
+
+pbjs.que.push(function() {
+    pbjs.addAdUnits([adUnit]);
+    pbjs.requestBids({
+        ...
+    });
+});
+``` 
+**Note**: The player ID is the ID of the HTML div element used when instantiating the player. 
+You can retrieve this ID by calling `player.id`, where player is the JW Player instance variable.
+
+**Note**: You may also include `jwTargeting` information in the prebid config's `ortb2.site.ext.data`. Information provided in the adUnit will always supersede, and information in the config will be used as a fallback.
+ 
+## Prefetching
+In order to prefetch targeting information for certain media, include the media IDs in the `jwplayerDataProvider` var and set `waitForIt` to `true`:
+
+```javascript
+const jwplayerDataProvider = {
+  name: "jwplayer",
+  waitForIt: true,
+  params: {
+    mediaIDs: ['abc', 'def', 'ghi', 'jkl']
+  }
+};
+```
+
+You must also set a value to `auctionDelay` in the config's `realTimeData` object 
+
+```javascript
+realTimeData = {
+  auctionDelay: 100,
+  ...
+};
+```
+
+# Usage for Bid Adapters:
+
+Implement the `buildRequests` function. When it is called, the `bidRequests` param will be an array of bids.
+Each bid for which targeting information was found will have a ortb2 param conforming to the [oRTB v2 object structure](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf). The `ortb2` object will contain our proprietaty targeting segments in a format compliant with the [IAB's segment taxonomy structure](https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/extensions/community_extensions/segtax.md).
+
+Example:
+
+```javascript
+{
+    adUnitCode: 'xyz',
+    bidId: 'abc',
+    ...,
+    ortb2: {
+        site: {
+            content: {
+                id: 'jw_abc123',
+                data: [{
+                    name: 'jwplayer.com',
+                    ext: {
+                        segtax: 502,
+                        cids: ['abc123']
+                    },
+                    segment: [{ 
+                        id: '123'
+                    }, { 
+                        id: '456'
+                    }]
+                }]
+            }
+        }   
+    }
+}
+```
+
+where:
+- `ortb2` is an object containing first party data
+  - `site` is an object containing page specific information
+    - `content` is an object containing metadata for the media. It may contain the following information: 
+      - `id` is a unique identifier for the specific media asset
+      - `data` is an array containing segment taxonomy objects that have the following parameters:
+        - `name` is the `jwplayer.com` string indicating the provider name
+        - `ext.segtax` whose `502` value is the unique identifier for JW Player's proprietary taxonomy
+        - `ext.cids` is an array containing the list of extended content ids as defined in [oRTB's community extensions](https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/extensions/community_extensions/extended-content-ids.md#example---content-id-and-seller-defined-context). 
+        - `segment` is an array containing the segment taxonomy values as an object where:
+          - `id` is the string representation of the data segment value. 
+  
+**Example:**
+
+To view an example:
+ 
+- in your cli run:
+
+`gulp serve --modules=jwplayerRtdProvider`
+
+- in your browser, navigate to:
+
+`http://localhost:9999/integrationExamples/gpt/jwplayerRtdProvider_example.html`
+
+**Note:** the mediaIds in the example are placeholder values; replace them with your existing IDs.
+
+# Maintainer info
+
+Maintained by JW Player. For any questions, comments or feedback please contact Karim Mourra, karim@jwplayer.com
diff --git a/modules/jwplayerVideoProvider.js b/modules/jwplayerVideoProvider.js
new file mode 100644
index 00000000000..379d8063c42
--- /dev/null
+++ b/modules/jwplayerVideoProvider.js
@@ -0,0 +1,929 @@
+import {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE, AD_POSITION
+} from '../libraries/video/constants/ortb.js';
+import {
+  SETUP_COMPLETE, SETUP_FAILED, DESTROYED, AD_REQUEST, AD_BREAK_START, AD_LOADED, AD_STARTED, AD_IMPRESSION, AD_PLAY,
+  AD_TIME, AD_PAUSE, AD_CLICK, AD_SKIPPED, AD_ERROR, AD_COMPLETE, AD_BREAK_END, PLAYLIST, PLAYBACK_REQUEST,
+  AUTOSTART_BLOCKED, PLAY_ATTEMPT_FAILED, CONTENT_LOADED, PLAY, PAUSE, BUFFER, TIME, SEEK_START, SEEK_END, MUTE, VOLUME,
+  RENDITION_UPDATE, ERROR, COMPLETE, PLAYLIST_COMPLETE, FULLSCREEN, PLAYER_RESIZE, VIEWABLE, CAST
+} from '../libraries/video/constants/events.js';
+import { PLAYBACK_MODE } from '../libraries/video/constants/constants.js';
+import stateFactory from '../libraries/video/shared/state.js';
+import { JWPLAYER_VENDOR } from '../libraries/video/constants/vendorCodes.js';
+import { getEventHandler } from '../libraries/video/shared/eventHandler.js';
+import { submodule } from '../src/hook.js';
+
+/**
+ * @constructor
+ * @param {videoProviderConfig} config
+ * @param {Object} jwplayer_ - JW Player global factory
+ * @param {State} adState_
+ * @param {State} timeState_
+ * @param {CallbackStorage} callbackStorage_
+ * @param {Object} utils
+ * @returns {VideoProvider}
+ */
+export function JWPlayerProvider(config, jwplayer_, adState_, timeState_, callbackStorage_, utils, sharedUtils) {
+  const jwplayer = jwplayer_;
+  let player = null;
+  let playerVersion = null;
+  const playerConfig = config.playerConfig;
+  const divId = config.divId;
+  let adState = adState_;
+  let timeState = timeState_;
+  let callbackStorage = callbackStorage_;
+  let pendingSeek = {};
+  let supportedMediaTypes = null;
+  let minimumSupportedPlayerVersion = '8.20.1';
+  let setupCompleteCallbacks = [];
+  let setupFailedCallbacks = [];
+  const MEDIA_TYPES = [
+    VIDEO_MIME_TYPE.MP4,
+    VIDEO_MIME_TYPE.OGG,
+    VIDEO_MIME_TYPE.WEBM,
+    VIDEO_MIME_TYPE.AAC,
+    VIDEO_MIME_TYPE.HLS
+  ];
+
+  function init() {
+    if (!jwplayer) {
+      triggerSetupFailure(-1); // TODO: come up with code for player absent
+      return;
+    }
+
+    playerVersion = jwplayer.version;
+
+    if (playerVersion < minimumSupportedPlayerVersion) {
+      triggerSetupFailure(-2); // TODO: come up with code for version not supported
+      return;
+    }
+
+    player = jwplayer(divId);
+    if (player.getState() === undefined) {
+      setupPlayer(playerConfig);
+    } else {
+      const payload = getSetupCompletePayload();
+      setupCompleteCallbacks.forEach(callback => callback(SETUP_COMPLETE, payload));
+      setupCompleteCallbacks = [];
+    }
+  }
+
+  function getId() {
+    return divId;
+  }
+
+  function getOrtbVideo() {
+    if (!player) {
+      return;
+    }
+
+    const config = player.getConfig() || {};
+    const adConfig = config.advertising || {};
+    supportedMediaTypes = supportedMediaTypes || utils.getSupportedMediaTypes(MEDIA_TYPES);
+
+    const video = {
+      mimes: supportedMediaTypes,
+      protocols: [
+        PROTOCOLS.VAST_2_0,
+        PROTOCOLS.VAST_3_0,
+        PROTOCOLS.VAST_4_0,
+        PROTOCOLS.VAST_2_0_WRAPPER,
+        PROTOCOLS.VAST_3_0_WRAPPER,
+        PROTOCOLS.VAST_4_0_WRAPPER
+      ],
+      h: player.getHeight(), // TODO does player call need optimization ?
+      w: player.getWidth(), // TODO does player call need optimization ?
+      startdelay: utils.getStartDelay(),
+      placement: utils.getPlacement(adConfig, player),
+      // linearity is omitted because both forms are supported.
+      // sequence - TODO not yet supported
+      battr: adConfig.battr,
+      maxextended: -1, // extension is allowed, and there is no time limit imposed.
+      boxingallowed: 1,
+      playbackmethod: [ utils.getPlaybackMethod(config) ],
+      playbackend: 1, // TODO: need to account for floating player - https://developer.jwplayer.com/jwplayer/docs/jw8-embed-an-outstream-player , https://developer.jwplayer.com/jwplayer/docs/jw8-player-configuration-reference#section-float-on-scroll
+      // companionad - TODO add in future version
+      // companiontype - TODO add in future version
+      // minbitrate - TODO add in future version
+      // maxbitrate - TODO add in future version
+      // delivery - omitted because all are supported.
+      // minduration - Is there value to specifying ?
+      // maxduration - Is there value to specifying ?
+      api: [
+        API_FRAMEWORKS.VPAID_2_0
+      ],
+    };
+
+    if (utils.isOmidSupported(adConfig.adClient)) {
+      video.api.push(API_FRAMEWORKS.OMID_1_0);
+    }
+
+    Object.assign(video, utils.getSkipParams(adConfig));
+
+    if (player.getFullscreen()) { // TODO does player call need optimization ?
+      // only specify ad position when in Fullscreen since computational cost is low
+      // ad position options are listed in oRTB 2.5 section 5.4
+      // https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf
+      video.pos = AD_POSITION.FULL_SCREEN; // TODO make constant in oRTB
+    }
+
+    return video;
+  }
+
+  function getOrtbContent() {
+    if (!player) {
+      return;
+    }
+
+    const item = player.getPlaylistItem() || {}; // TODO does player call need optimization ?
+    let { duration, playbackMode } = timeState.getState();
+    if (duration === undefined) {
+      duration = player.getDuration();
+    }
+
+    const content = {
+      url: item.file,
+      title: item.title,
+      cat: item.iabCategories,
+      keywords: item.tags,
+      len: duration,
+      embeddable: 1
+    };
+
+    if (playbackMode !== undefined) {
+      content.livestream = Math.min(playbackMode, 1);
+    }
+
+    const mediaId = item.mediaid;
+    if (mediaId) {
+      content.id = 'jw_' + mediaId;
+    }
+
+    const jwpseg = item.jwpseg;
+    const dataSegment = utils.getSegments(jwpseg);
+    const contentDatum = utils.getContentDatum(mediaId, dataSegment);
+    if (contentDatum) {
+      content.data = [contentDatum];
+    }
+
+    const isoLanguageCode = utils.getIsoLanguageCode(player);
+    if (isoLanguageCode) {
+      content.language = isoLanguageCode;
+    }
+
+    return content;
+  }
+
+  function setAdTagUrl(adTagUrl, options) {
+    if (!player) {
+      return;
+    }
+
+    player.playAd(adTagUrl || options.adXml, options);
+  }
+
+  function onEvent(externalEventName, callback, basePayload) {
+    if (externalEventName === SETUP_COMPLETE) {
+      setupCompleteCallbacks.push(callback);
+    } else if (externalEventName === SETUP_FAILED) {
+      setupFailedCallbacks.push(callback);
+    }
+
+    if (!player) {
+      return;
+    }
+
+    let getEventPayload;
+
+    switch (externalEventName) {
+      case SETUP_COMPLETE:
+        getEventPayload = () => {
+          setupCompleteCallbacks = [];
+          return getSetupCompletePayload();
+        };
+        break;
+
+      case SETUP_FAILED:
+        getEventPayload = e => {
+          setupFailedCallbacks = [];
+          return {
+            playerVersion,
+            errorCode: e.code,
+            errorMessage: e.message,
+            sourceError: e.sourceError
+          };
+        };
+        break;
+
+      case AD_REQUEST:
+      case AD_PLAY:
+      case AD_PAUSE:
+        getEventPayload = e => ({ adTagUrl: e.tag });
+        break;
+
+      case AD_BREAK_START:
+        getEventPayload = e => {
+          timeState.clearState();
+          return { offset: e.adPosition };
+        };
+        break;
+
+      case AD_LOADED:
+        getEventPayload = e => {
+          adState.updateForEvent(e);
+          const adConfig = player.getConfig().advertising;
+          adState.updateState(utils.getSkipParams(adConfig));
+          return adState.getState();
+        };
+        break;
+
+      case AD_STARTED:
+        // JW Player adImpression fires when the ad starts, regardless of viewability.
+        getEventPayload = () => adState.getState();
+        break;
+
+      case AD_IMPRESSION:
+      case AD_CLICK:
+        getEventPayload = () => Object.assign({}, adState.getState(), timeState.getState());
+        break;
+
+      case AD_TIME:
+        getEventPayload = e => {
+          timeState.updateForEvent(e);
+          return {
+            adTagUrl: e.tag,
+            time: e.position,
+            duration: e.duration,
+          };
+        };
+        break;
+
+      case AD_SKIPPED:
+        getEventPayload = e => {
+          adState.clearState();
+          return {
+            time: e.position,
+            duration: e.duration,
+          };
+        };
+        break;
+
+      case AD_ERROR:
+        getEventPayload = e => {
+          const extraPayload = Object.assign({
+            playerErrorCode: e.adErrorCode,
+            vastErrorCode: e.code,
+            errorMessage: e.message,
+            sourceError: e.sourceError
+            // timeout
+          }, adState.getState(), timeState.getState());
+          adState.clearState();
+          return extraPayload;
+        };
+        break;
+
+      case AD_COMPLETE:
+        getEventPayload = e => {
+          adState.clearState();
+          return { adTagUrl: e.tag };
+        };
+        break;
+
+      case AD_BREAK_END:
+        getEventPayload = e => ({ offset: e.adPosition });
+        break;
+
+      case PLAYLIST:
+        getEventPayload = e => {
+          const playlistItemCount = e.playlist.length;
+          return {
+            playlistItemCount,
+            autostart: player.getConfig().autostart
+          };
+        };
+        break;
+
+      case PLAYBACK_REQUEST:
+        getEventPayload = e => ({ playReason: e.playReason });
+        break;
+
+      case AUTOSTART_BLOCKED:
+        getEventPayload = e => ({
+          sourceError: e.error,
+          errorCode: e.code,
+          errorMessage: e.message
+        });
+        break;
+
+      case PLAY_ATTEMPT_FAILED:
+        getEventPayload = e => ({
+          playReason: e.playReason,
+          sourceError: e.sourceError,
+          errorCode: e.code,
+          errorMessage: e.message
+        });
+        break;
+
+      case CONTENT_LOADED:
+        getEventPayload = e => {
+          const { item, index } = e;
+          return {
+            contentId: item.mediaid,
+            contentUrl: item.file, // cover other sources ? util ?
+            title: item.title,
+            description: item.description,
+            playlistIndex: index,
+            contentTags: item.tags
+          };
+        };
+        break;
+
+      case BUFFER:
+        getEventPayload = () => timeState.getState();
+        break;
+
+      case TIME:
+        getEventPayload = e => {
+          timeState.updateForEvent(e);
+          return {
+            position: e.position,
+            duration: e.duration
+          };
+        };
+        break;
+
+      case SEEK_START:
+        getEventPayload = e => {
+          const duration = e.duration;
+          const offset = e.offset;
+          pendingSeek = {
+            duration,
+            offset
+          };
+          return {
+            position: e.position,
+            destination: offset,
+            duration: duration
+          };
+        }
+        break;
+
+      case SEEK_END:
+        getEventPayload = () => {
+          const extraPayload = {
+            position: pendingSeek.offset,
+            duration: pendingSeek.duration
+          };
+          pendingSeek = {};
+          return extraPayload;
+        };
+        break;
+
+      case MUTE:
+        getEventPayload = e => ({ mute: e.mute });
+        break;
+
+      case VOLUME:
+        getEventPayload = e => ({ volumePercentage: e.volume });
+        break;
+
+      case RENDITION_UPDATE:
+        getEventPayload = e => {
+          const bitrate = e.bitrate;
+          const level = e.level;
+          return {
+            videoReportedBitrate: bitrate,
+            audioReportedBitrate: bitrate,
+            encodedVideoWidth: level.width,
+            encodedVideoHeight: level.height,
+            videoFramerate: e.frameRate
+          };
+        };
+        break;
+
+      case ERROR:
+        getEventPayload = e => ({
+          sourceError: e.sourceError,
+          errorCode: e.code,
+          errorMessage: e.message,
+        });
+        break;
+
+      case COMPLETE:
+        getEventPayload = e => timeState.clearState();
+        break;
+
+      case FULLSCREEN:
+        getEventPayload = e => ({ fullscreen: e.fullscreen });
+        break;
+
+      case PLAYER_RESIZE:
+        getEventPayload = e => ({
+          height: e.height,
+          width: e.width,
+        });
+        break;
+
+      case VIEWABLE:
+        getEventPayload = e => ({
+          viewable: e.viewable,
+          viewabilityPercentage: player.getPercentViewable() * 100,
+        });
+        break;
+
+      case CAST:
+        getEventPayload = e => ({ casting: e.active });
+        break;
+
+      case PLAY:
+      case PAUSE:
+      case PLAYLIST_COMPLETE:
+      case DESTROYED:
+        break;
+
+      default:
+        return;
+    }
+
+    const jwEventName = utils.getJwEvent(externalEventName);
+    const eventHandler = getEventHandler(externalEventName, callback, basePayload, getEventPayload)
+    player.on(jwEventName, eventHandler);
+    callbackStorage.storeCallback(externalEventName, eventHandler, callback);
+  }
+
+  function offEvent(event, callback) {
+    const jwEvent = utils.getJwEvent(event);
+    if (!callback) {
+      player.off(jwEvent);
+      return;
+    }
+
+    const eventHandler = callbackStorage.getCallback(event, callback);
+    if (!eventHandler) {
+      return;
+    }
+
+    player.off(jwEvent, eventHandler);
+  }
+
+  function destroy() {
+    if (!player) {
+      return;
+    }
+    player.remove();
+    player = null;
+  }
+
+  return {
+    init,
+    getId,
+    getOrtbVideo,
+    getOrtbContent,
+    setAdTagUrl,
+    onEvent,
+    offEvent,
+    destroy
+  };
+
+  function setupPlayer(config) {
+    if (!config) {
+      return;
+    }
+    player.setup(utils.getJwConfig(config));
+  }
+
+  function getSetupCompletePayload() {
+    return {
+      divId,
+      playerVersion,
+      type: SETUP_COMPLETE,
+      viewable: player.getViewable(),
+      viewabilityPercentage: player.getPercentViewable() * 100,
+      mute: player.getMute(),
+      volumePercentage: player.getVolume()
+    };
+  }
+
+  function triggerSetupFailure(errorCode) {
+    if (!setupFailedCallbacks.length) {
+      return;
+    }
+
+    const payload = {
+      divId,
+      playerVersion,
+      type: SETUP_FAILED,
+      errorCode,
+      errorMessage: '',
+      sourceError: null
+    };
+
+    setupFailedCallbacks.forEach(callback => callback(SETUP_FAILED, payload));
+    setupFailedCallbacks = [];
+  }
+}
+
+/**
+ * @param {videoProviderConfig} config
+ * @param {sharedUtils} sharedUtils
+ * @returns {VideoProvider}
+ */
+const jwplayerSubmoduleFactory = function (config, sharedUtils) {
+  const adState = adStateFactory();
+  const timeState = timeStateFactory();
+  const callbackStorage = callbackStorageFactory();
+  return JWPlayerProvider(config, window.jwplayer, adState, timeState, callbackStorage, utils, sharedUtils);
+}
+
+jwplayerSubmoduleFactory.vendorCode = JWPLAYER_VENDOR;
+submodule('video', jwplayerSubmoduleFactory);
+export default jwplayerSubmoduleFactory;
+
+// HELPERS
+
+export const utils = {
+  getJwConfig: function(config) {
+    if (!config) {
+      return;
+    }
+
+    const params = config.params || {};
+    const jwConfig = params.vendorConfig || {};
+    if (jwConfig.autostart === undefined && config.autoStart !== undefined) {
+      jwConfig.autostart = config.autoStart;
+    }
+
+    if (jwConfig.mute === undefined && config.mute !== undefined) {
+      jwConfig.mute = config.mute;
+    }
+
+    if (!jwConfig.key && config.licenseKey !== undefined) {
+      jwConfig.key = config.licenseKey;
+    }
+
+    if (config.setupAds === false) {
+      return jwConfig;
+    }
+
+    const advertising = jwConfig.advertising || { client: 'vast' };
+    if (!jwConfig.file && !jwConfig.playlist && !jwConfig.source) {
+      // TODO verify accuracy
+      advertising.outstream = true;
+    }
+
+    const bids = advertising.bids || {};
+    bids.prebid = true;
+    advertising.bids = bids;
+
+    jwConfig.advertising = advertising;
+    return jwConfig;
+  },
+
+  getJwEvent: function(eventName) {
+    switch (eventName) {
+      case SETUP_COMPLETE:
+        return 'ready';
+
+      case SETUP_FAILED:
+        return 'setupError';
+
+      case DESTROYED:
+        return 'remove';
+
+      case AD_STARTED:
+        return AD_IMPRESSION;
+
+      case AD_IMPRESSION:
+        return 'adViewableImpression';
+
+      case PLAYBACK_REQUEST:
+        return 'playAttempt';
+
+      case AUTOSTART_BLOCKED:
+        return 'autostartNotAllowed';
+
+      case CONTENT_LOADED:
+        return 'playlistItem';
+
+      case SEEK_START:
+        return 'seek';
+
+      case SEEK_END:
+        return 'seeked';
+
+      case RENDITION_UPDATE:
+        return 'visualQuality';
+
+      case PLAYER_RESIZE:
+        return 'resize';
+
+      default:
+        return eventName;
+    }
+  },
+
+  getSkipParams: function(adConfig) {
+    const skipParams = {};
+    const skipoffset = adConfig.skipoffset;
+    if (skipoffset !== undefined) {
+      const skippable = skipoffset >= 0;
+      skipParams.skip = skippable ? 1 : 0;
+      if (skippable) {
+        skipParams.skipmin = skipoffset + 2;
+        skipParams.skipafter = skipoffset;
+      }
+    }
+    return skipParams;
+  },
+
+  getSupportedMediaTypes: function(mediaTypes = []) {
+    const el = document.createElement('video');
+    return mediaTypes
+      .filter(mediaType => el.canPlayType(mediaType))
+      .concat(VPAID_MIME_TYPE); // Always allow VPAIDs.
+  },
+
+  getStartDelay: function() {
+    // todo calculate
+    // need to know which ad we are bidding on
+    // Might have to implement and set in Pb-video ; would required ad unit as param.
+  },
+
+  /**
+   * Determine the ad placement
+   * @param {Object} adConfig
+   * @param {Object} player
+   * @return {PLACEMENT|OrtbVideoParams.placement|undefined}
+   */
+  getPlacement: function(adConfig, player) {
+    if (!adConfig.outstream) {
+      // https://developer.jwplayer.com/jwplayer/docs/jw8-embed-an-outstream-player for more info on outstream
+      return PLACEMENT.INSTREAM;
+    }
+
+    if (player.getFloating()) {
+      return PLACEMENT.FLOATING;
+    }
+
+    const placement = adConfig.placement;
+    if (!placement) {
+      return;
+    }
+
+    return PLACEMENT[placement.toUpperCase()];
+  },
+
+  getPlaybackMethod: function({ autoplay, mute, autoplayAdsMuted }) {
+    if (autoplay) {
+      // Determine whether player is going to start muted.
+      const isMuted = mute || autoplayAdsMuted; // todo autoplayAdsMuted only applies to preRoll
+      return isMuted ? PLAYBACK_METHODS.AUTOPLAY_MUTED : PLAYBACK_METHODS.AUTOPLAY;
+    }
+    /*
+     TODO
+      could support the following with float player:
+      5 Initiates on Entering Viewport with Sound On
+      6 Initiates on Entering Viewport with Sound Off by Default
+     */
+    return PLAYBACK_METHODS.CLICK_TO_PLAY;
+  },
+
+  /**
+   * Indicates if Omid is supported
+   *
+   * @param {string} adClient - The identifier of the ad plugin requesting the bid
+   * @returns {boolean} - support of omid
+   */
+  isOmidSupported: function(adClient) {
+    const omidIsLoaded = window.OmidSessionClient !== undefined;
+    return omidIsLoaded && adClient === 'vast';
+  },
+
+  /**
+   * Gets ISO 639 language code of current audio track.
+   * @param {Object} player
+   * @returns {string|undefined} ISO 639 language code.
+   */
+  getIsoLanguageCode: function(player) {
+    const audioTracks = player.getAudioTracks();
+    if (!audioTracks || !audioTracks.length) {
+      return;
+    }
+
+    const currentTrackIndex = Math.max(player.getCurrentAudioTrack() || 0, 0); // returns -1 when there are no alternative tracks.
+    const audioTrack = audioTracks[currentTrackIndex];
+    return audioTrack && audioTrack.language;
+  },
+
+  /**
+   * Converts an array of jwpsegs into an array of data segments compliant with the oRTB content.data[index].segment
+   * @param {[String]} jwpsegs - jwplayer contextual targeting segments
+   * @return {[Object]|undefined} list of data segments compliant with the oRTB content.data[index].segment spec
+   */
+  getSegments: function (jwpsegs) {
+    if (!jwpsegs || !jwpsegs.length) {
+      return;
+    }
+
+    const formattedSegments = jwpsegs.reduce((convertedSegments, rawSegment) => {
+      convertedSegments.push({
+        id: rawSegment,
+        value: rawSegment
+      });
+      return convertedSegments;
+    }, []);
+
+    return formattedSegments;
+  },
+
+  /**
+   * Creates an object compliant with the oRTB content.data[index] spec.
+   * @param {String} mediaId - content identifier
+   * @param {[Object]} segments - list of data segments compliant with the oRTB content.data[index].segment spec
+   * @return {Object} - Object compliant with the oRTB content.data[index] spec.
+   */
+  getContentDatum: function (mediaId, segments) {
+    if (!mediaId && !segments) {
+      return;
+    }
+
+    const contentData = {
+      name: 'jwplayer.com',
+      ext: {}
+    };
+
+    if (mediaId) {
+      contentData.ext.cids = [mediaId];
+    }
+
+    if (segments) {
+      contentData.segment = segments;
+      contentData.ext.segtax = 502;
+    }
+
+    return contentData;
+  }
+}
+
+/**
+ * Tracks which functions are attached to events
+ * @typedef CallbackStorage
+ * @function storeCallback
+ * @function getCallback
+ * @function clearStorage
+ */
+
+/**
+ * @returns {CallbackStorage}
+ */
+export function callbackStorageFactory() {
+  let storage = {};
+
+  function storeCallback(eventType, eventHandler, callback) {
+    let eventHandlers = storage[eventType];
+    if (!eventHandlers) {
+      eventHandlers = storage[eventType] = {};
+    }
+
+    eventHandlers[callback] = eventHandler;
+  }
+
+  function getCallback(eventType, callback) {
+    let eventHandlers = storage[eventType];
+    if (!eventHandlers) {
+      return;
+    }
+
+    const eventHandler = eventHandlers[callback];
+    delete eventHandlers[callback];
+    return eventHandler;
+  }
+
+  function clearStorage() {
+    storage = {};
+  }
+
+  return {
+    storeCallback,
+    getCallback,
+    clearStorage
+  }
+}
+
+// STATE
+
+/**
+ * @returns {State}
+ */
+export function adStateFactory() {
+  const adState = Object.assign({}, stateFactory());
+
+  function updateForEvent(event) {
+    const updates = {
+      adTagUrl: event.tag,
+      offset: event.adPosition,
+      loadTime: event.timeLoading,
+      vastAdId: event.id, // TODO: delete from spec!! seems JW Player specific
+      adDescription: event.description,
+      adServer: event.adsystem,
+      adTitle: event.adtitle,
+      advertiserId: event.advertiserId,
+      advertiserName: event.advertiser,
+      dealId: event.dealId,
+      // adCategories
+      linear: event.linear,
+      vastVersion: event.vastversion,
+      // campaignId:
+      creativeUrl: event.mediaFile, // TODO: per AP, mediafile might be object w/ file property. verify
+      adId: event.adId,
+      universalAdId: event.universalAdId,
+      creativeId: event.creativeAdId,
+      creativeType: event.creativetype,
+      redirectUrl: event.clickThroughUrl,
+      adPlacementType: convertPlacementToOrtbCode(event.placement),
+      waterfallIndex: event.witem,
+      waterfallCount: event.wcount,
+      adPodCount: event.podcount,
+      adPodIndex: event.sequence,
+      wrapperAdIds: event.wrapperAdIds
+    };
+
+    if (event.client === 'googima' && !updates.wrapperAdIds) {
+      updates.wrapperAdIds = parseImaAdWrapperIds(event);
+    }
+
+    this.updateState(updates);
+  }
+
+  adState.updateForEvent = updateForEvent;
+
+  function convertPlacementToOrtbCode(placement) {
+    switch (placement) {
+      case 'instream':
+        return PLACEMENT.INSTREAM;
+
+      case 'banner':
+        return PLACEMENT.BANNER;
+
+      case 'article':
+        return PLACEMENT.ARTICLE;
+
+      case 'feed':
+        return PLACEMENT.FEED;
+
+      case 'interstitial':
+      case 'slider':
+      case 'floating':
+        return PLACEMENT.INTERSTITIAL_SLIDER_FLOATING;
+    }
+  }
+
+  function parseImaAdWrapperIds(adEvent) {
+    const ima = adEvent.ima;
+    const ad = ima && ima.ad;
+    if (!ad) {
+      return;
+    }
+
+    const adProperties = Object.keys(ad);
+    adProperties.forEach(property => {
+      const value = ad[property];
+      const wrapperIds = value.adWrapperIds;
+      if (wrapperIds) {
+        return wrapperIds;
+      }
+    });
+  }
+
+  return adState;
+}
+
+/**
+ * @returns {State}
+ */
+export function timeStateFactory() {
+  const timeState = Object.assign({}, stateFactory());
+
+  function updateForEvent(event) {
+    const { position, duration } = event;
+    this.updateState({
+      time: position,
+      duration,
+      playbackMode: getPlaybackMode(duration)
+    });
+  }
+
+  timeState.updateForEvent = updateForEvent;
+
+  function getPlaybackMode(duration) {
+    if (duration > 0) {
+      return PLAYBACK_MODE.VOD;
+    } else if (duration < 0) {
+      return PLAYBACK_MODE.DVR;
+    }
+
+    return PLAYBACK_MODE.LIVE;
+  }
+
+  return timeState;
+}
diff --git a/modules/jwplayerVideoProvider.md b/modules/jwplayerVideoProvider.md
new file mode 100644
index 00000000000..54a9c1fb84d
--- /dev/null
+++ b/modules/jwplayerVideoProvider.md
@@ -0,0 +1,25 @@
+# Overview
+
+Module Name: JW Player Video Provider
+Module Type: Video Submodule
+Video Player: JW player
+Player website: https://www.jwplayer.com/html5-video-player/
+Maintainer: karim@jwplayer.com
+
+# Description
+
+Video provider to connect the Prebid Video Module to JW Player.
+
+# Requirements
+
+Your page must embed a build of JW Player. 
+i.e.
+```html
+<head> 
+    <script  src="https://cdn.jwplayer.com/players/UVQWMA4o-kGWxh33Q.js"></script>
+</head>
+```
+
+[Additional embed instructions](https://docs.jwplayer.com/platform/docs/players-get-started)
+
+[Obtaining a license](https://info.jwplayer.com/contact-us/) 
diff --git a/modules/kargoAnalyticsAdapter.js b/modules/kargoAnalyticsAdapter.js
index 83c20846c0d..652e105167d 100644
--- a/modules/kargoAnalyticsAdapter.js
+++ b/modules/kargoAnalyticsAdapter.js
@@ -1,14 +1,96 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import { logError } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
 
-var kargoAdapter = adapter({
-  analyticsType: 'endpoint',
-  url: 'https://krk.kargo.com/api/v1/event/prebid'
-});
+const EVENT_URL = 'https://krk.kargo.com/api/v1/event';
+const KARGO_BIDDER_CODE = 'kargo';
+
+const analyticsType = 'endpoint';
+
+let _initOptions = {};
+
+let _logBidResponseData = {
+  auctionId: '',
+  auctionTimeout: 0,
+  responseTime: 0,
+};
+
+let _bidResponseDataLogged = [];
+
+var kargoAnalyticsAdapter = Object.assign(
+  adapter({ analyticsType }), {
+    track({ eventType, args }) {
+      switch (eventType) {
+        case CONSTANTS.EVENTS.AUCTION_INIT: {
+          _logBidResponseData.auctionTimeout = args.timeout;
+          break;
+        }
+        case CONSTANTS.EVENTS.BID_RESPONSE: {
+          handleBidResponseData(args);
+          break;
+        }
+      }
+    }
+  }
+);
+
+// handleBidResponseData: Get auction data for Kargo bids and send to server
+function handleBidResponseData (bidResponse) {
+  // Verify this is Kargo and we haven't seen this auction data yet
+  if (bidResponse.bidder !== KARGO_BIDDER_CODE || _bidResponseDataLogged.includes(bidResponse.auctionId) !== false) {
+    return
+  }
+
+  _logBidResponseData.auctionId = bidResponse.auctionId;
+  _logBidResponseData.responseTime = bidResponse.timeToRespond;
+  sendAuctionData(_logBidResponseData);
+}
+
+// sendAuctionData: Send auction data to the server
+function sendAuctionData (data) {
+  try {
+    _bidResponseDataLogged.push(data.auctionId);
+
+    if (!shouldFireEventRequest()) {
+      return;
+    }
+
+    ajax(
+      `${EVENT_URL}/auction-data`,
+      null,
+      {
+        aid: data.auctionId,
+        ato: data.auctionTimeout,
+        rt: data.responseTime,
+        it: 0,
+      },
+      {
+        method: 'GET',
+      }
+    );
+  } catch (err) {
+    logError('Error sending auction data: ', err);
+  }
+}
+
+// Sampling rate out of 100
+function shouldFireEventRequest () {
+  const samplingRate = (_initOptions && _initOptions.sampling) || 100;
+  return ((Math.floor(Math.random() * 100) + 1) <= parseInt(samplingRate));
+}
+
+kargoAnalyticsAdapter.originEnableAnalytics = kargoAnalyticsAdapter.enableAnalytics;
+
+kargoAnalyticsAdapter.enableAnalytics = function (config) {
+  _initOptions = config.options;
+  kargoAnalyticsAdapter.originEnableAnalytics(config);
+};
 
 adapterManager.registerAnalyticsAdapter({
-  adapter: kargoAdapter,
+  adapter: kargoAnalyticsAdapter,
   code: 'kargo'
 });
 
-export default kargoAdapter;
+export default kargoAnalyticsAdapter;
diff --git a/modules/kargoAnalyticsAdapter.md b/modules/kargoAnalyticsAdapter.md
new file mode 100644
index 00000000000..5a1e538902a
--- /dev/null
+++ b/modules/kargoAnalyticsAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+Module Name: Kargo Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: support@kargo.com
+
+# Description
+
+Analytics adapter for Kargo. Contact support@kargo.com for information.
+
+# Usage
+
+The simplest way to enable the analytics adapter is this
+
+```javascript
+pbjs.enableAnalytics([{
+  provider: 'kargo',
+  options: {
+      sampling: 100 // value out of 100
+  }
+}]);
+```
+
+# Test Parameters
+
+```
+{
+  provider: 'kargo',
+  options: {
+      sampling: 100
+  }
+}
+```
\ No newline at end of file
diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index 31c35f4afe3..2c33c3f61d1 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -1,54 +1,79 @@
-import * as utils from '../src/utils.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { _each, buildUrl, deepAccess, pick, triggerPixel } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
-const storage = getStorageManager();
 const BIDDER_CODE = 'kargo';
 const HOST = 'https://krk.kargo.com';
-const SYNC = 'https://crb.kargo.com/api/v1/initsyncrnd/{UUID}?seed={SEED}&idx={INDEX}';
+const SYNC = 'https://crb.kargo.com/api/v1/initsyncrnd/{UUID}?seed={SEED}&idx={INDEX}&gdpr={GDPR}&gdpr_consent={GDPR_CONSENT}&us_privacy={US_PRIVACY}';
 const SYNC_COUNT = 5;
+const GVLID = 972;
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
+const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 
 let sessionId,
   lastPageUrl,
   requestCounter;
 
 export const spec = {
+  gvlid: GVLID,
   code: BIDDER_CODE,
   isBidRequestValid: function(bid) {
     if (!bid || !bid.params) {
       return false;
     }
+
     return !!bid.params.placementId;
   },
   buildRequests: function(validBidRequests, bidderRequest) {
     const currencyObj = config.getConfig('currency');
     const currency = (currencyObj && currencyObj.adServerCurrency) || 'USD';
-    const bidIds = {};
+    const bidIDs = {};
     const bidSizes = {};
-    utils._each(validBidRequests, bid => {
-      bidIds[bid.bidId] = bid.params.placementId;
+
+    _each(validBidRequests, bid => {
+      bidIDs[bid.bidId] = bid.params.placementId;
       bidSizes[bid.bidId] = bid.sizes;
     });
-    let tdid;
-    if (validBidRequests.length > 0 && validBidRequests[0].userId && validBidRequests[0].userId.tdid) {
-      tdid = validBidRequests[0].userId.tdid;
-    }
+
+    const firstBidRequest = validBidRequests[0];
+
+    const tdid = deepAccess(firstBidRequest, 'userId.tdid')
+
     const transformedParams = Object.assign({}, {
       sessionId: spec._getSessionId(),
       requestCount: spec._getRequestCount(),
       timeout: bidderRequest.timeout,
-      currency: currency,
+      currency,
       cpmGranularity: 1,
       timestamp: (new Date()).getTime(),
       cpmRange: {
         floor: 0,
         ceil: 20
       },
-      bidIDs: bidIds,
-      bidSizes: bidSizes,
+      bidIDs,
+      bidSizes,
+      device: {
+        width: window.screen.width,
+        height: window.screen.height
+      },
       prebidRawBidRequests: validBidRequests
-    }, spec._getAllMetadata(tdid, bidderRequest.uspConsent));
+    }, spec._getAllMetadata(bidderRequest, tdid));
+
+    // User Agent Client Hints / SUA
+    const uaClientHints = deepAccess(firstBidRequest, 'ortb2.device.sua');
+    if (uaClientHints) {
+      transformedParams.device.sua = pick(uaClientHints, ['browsers', 'platform', 'mobile', 'model']);
+    }
+
+    // Pull Social Canvas segments and embed URL
+    const socialCanvas = deepAccess(firstBidRequest, 'params.socialCanvas');
+    if (socialCanvas) {
+      transformedParams.socialCanvasSegments = socialCanvas.segments;
+      transformedParams.socialEmbedURL = socialCanvas.embedURL;
+    }
+
     const encodedParams = encodeURIComponent(JSON.stringify(transformedParams));
     return Object.assign({}, bidderRequest, {
       method: 'GET',
@@ -62,68 +87,81 @@ export const spec = {
     const bidResponses = [];
     for (let bidId in bids) {
       let adUnit = bids[bidId];
-      let meta;
+      let meta = {
+        mediaType: BANNER
+      };
+
       if (adUnit.metadata && adUnit.metadata.landingPageDomain) {
-        meta = {
-          clickUrl: adUnit.metadata.landingPageDomain
-        };
+        meta.clickUrl = adUnit.metadata.landingPageDomain[0];
+        meta.advertiserDomains = adUnit.metadata.landingPageDomain;
+      }
+
+      if (adUnit.mediaType && SUPPORTED_MEDIA_TYPES.includes(adUnit.mediaType)) {
+        meta.mediaType = adUnit.mediaType;
       }
-      bidResponses.push({
+
+      const bidResponse = {
+        ad: adUnit.adm,
         requestId: bidId,
         cpm: Number(adUnit.cpm),
         width: adUnit.width,
         height: adUnit.height,
-        ad: adUnit.adm,
         ttl: 300,
         creativeId: adUnit.id,
         dealId: adUnit.targetingCustom,
         netRevenue: true,
-        currency: bidRequest.currency,
+        currency: adUnit.currency || bidRequest.currency,
+        mediaType: meta.mediaType,
         meta: meta
-      });
+      };
+
+      if (meta.mediaType == VIDEO) {
+        bidResponse.vastXml = adUnit.adm;
+      }
+
+      bidResponses.push(bidResponse);
     }
+
     return bidResponses;
   },
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, responses, gdprConsent, usPrivacy) {
     const syncs = [];
     const seed = spec._generateRandomUuid();
     const clientId = spec._getClientId();
+    var gdpr = (gdprConsent && gdprConsent.gdprApplies) ? 1 : 0;
+    var gdprConsentString = (gdprConsent && gdprConsent.consentString) ? gdprConsent.consentString : '';
+    // don't sync if opted out via usPrivacy
+    if (typeof usPrivacy == 'string' && usPrivacy.length == 4 && usPrivacy[0] == 1 && usPrivacy[2] == 'Y') {
+      return syncs;
+    }
     if (syncOptions.iframeEnabled && seed && clientId) {
       for (let i = 0; i < SYNC_COUNT; i++) {
         syncs.push({
           type: 'iframe',
-          url: SYNC.replace('{UUID}', clientId).replace('{SEED}', seed).replace('{INDEX}', i)
+          url: SYNC.replace('{UUID}', clientId).replace('{SEED}', seed)
+            .replace('{INDEX}', i)
+            .replace('{GDPR}', gdpr)
+            .replace('{GDPR_CONSENT}', gdprConsentString)
+            .replace('{US_PRIVACY}', usPrivacy || '')
         });
       }
     }
     return syncs;
   },
-
-  // PRIVATE
-  _readCookie(name) {
-    if (!storage.cookiesAreEnabled()) {
-      return null;
-    }
-    let nameEquals = `${name}=`;
-    let cookies = document.cookie.split(';');
-
-    for (let i = 0; i < cookies.length; i++) {
-      let cookie = cookies[i];
-      while (cookie.charAt(0) === ' ') {
-        cookie = cookie.substring(1, cookie.length);
-      }
-
-      if (cookie.indexOf(nameEquals) === 0) {
-        return cookie.substring(nameEquals.length, cookie.length);
-      }
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+  onTimeout: function(timeoutData) {
+    if (timeoutData == null) {
+      return;
     }
 
-    return null;
+    timeoutData.forEach((bid) => {
+      this._sendTimeoutData(bid.auctionId, bid.timeout);
+    });
   },
 
   _getCrbFromCookie() {
     try {
-      const crb = JSON.parse(decodeURIComponent(spec._readCookie('krg_crb')));
+      const crb = JSON.parse(storage.getCookie('krg_crb'));
       if (crb && crb.v) {
         let vParsed = JSON.parse(atob(crb.v));
         if (vParsed) {
@@ -152,28 +190,6 @@ export const spec = {
     return spec._getCrbFromCookie();
   },
 
-  _getKruxUserId() {
-    return spec._getLocalStorageSafely('kxkar_user');
-  },
-
-  _getKruxSegments() {
-    return spec._getLocalStorageSafely('kxkar_segs');
-  },
-
-  _getKrux() {
-    const segmentsStr = spec._getKruxSegments();
-    let segments = [];
-
-    if (segmentsStr) {
-      segments = segmentsStr.split(',');
-    }
-
-    return {
-      userID: spec._getKruxUserId(),
-      segments: segments
-    };
-  },
-
   _getLocalStorageSafely(key) {
     try {
       return storage.getDataFromLocalStorage(key);
@@ -182,15 +198,25 @@ export const spec = {
     }
   },
 
-  _getUserIds(tdid, usp) {
+  _getUserIds(tdid, usp, gdpr) {
     const crb = spec._getCrb();
     const userIds = {
-      kargoID: crb.userId,
+      kargoID: crb.lexId,
       clientID: crb.clientId,
       crbIDs: crb.syncIds || {},
       optOut: crb.optOut,
       usp: usp
     };
+
+    try {
+      if (gdpr) {
+        userIds['gdpr'] = {
+          consent: gdpr.consentString || '',
+          applies: !!gdpr.gdprApplies,
+        }
+      }
+    } catch (e) {
+    }
     if (tdid) {
       userIds.tdID = tdid;
     }
@@ -202,12 +228,11 @@ export const spec = {
     return crb.clientId;
   },
 
-  _getAllMetadata(tdid, usp) {
+  _getAllMetadata(bidderRequest, tdid) {
     return {
-      userIDs: spec._getUserIds(tdid, usp),
-      krux: spec._getKrux(),
-      pageURL: window.location.href,
-      rawCRB: spec._readCookie('krg_crb'),
+      userIDs: spec._getUserIds(tdid, bidderRequest.uspConsent, bidderRequest.gdprConsent),
+      pageURL: bidderRequest?.refererInfo?.page,
+      rawCRB: storage.getCookie('krg_crb'),
       rawCRBLocalStorage: spec._getLocalStorageSafely('krg_crb')
     };
   },
@@ -241,6 +266,24 @@ export const spec = {
     } catch (e) {
       return '';
     }
+  },
+
+  _sendTimeoutData(auctionId, auctionTimeout) {
+    let params = {
+      aid: auctionId,
+      ato: auctionTimeout,
+    };
+
+    try {
+      let timeoutRequestUrl = buildUrl({
+        protocol: 'https',
+        hostname: 'krk.kargo.com',
+        pathname: '/api/v1/event/timeout',
+        search: params
+      });
+
+      triggerPixel(timeoutRequestUrl);
+    } catch (e) {}
   }
 };
 registerBidder(spec);
diff --git a/modules/kargoBidAdapter.md b/modules/kargoBidAdapter.md
index 99fe82e7f54..55e14a629d9 100644
--- a/modules/kargoBidAdapter.md
+++ b/modules/kargoBidAdapter.md
@@ -19,5 +19,25 @@ Please use `kargo` as the bidder code. Also, you *must* test on a mobile device,
         placementId: '_m1Xt2E5dez'
       }
     }]
+  },{
+    code: 'div-gpt-ad-video-1',
+    sizes: [[640,480]],
+    mediaTypes: {
+      video: {
+        playerSize: [640, 480],
+        context: 'instream'
+      }
+    },
+    bids: [{
+      bidder: 'kargo',
+      params: {
+        placementId: '_bLIt2QMYee',
+        video: {
+          skipppable: true,
+          playback_method: ['auto_play_sound_off'],
+          mimes: ['video/mp4']
+        }
+      }
+    }]
   }];
 ```
diff --git a/modules/kinessoIdSystem.js b/modules/kinessoIdSystem.js
new file mode 100644
index 00000000000..632f3a669aa
--- /dev/null
+++ b/modules/kinessoIdSystem.js
@@ -0,0 +1,241 @@
+/**
+ * This module adds KinessoId ID support to the User ID module
+ * The {@link module:modules/userId} module is required.
+ * @module modules/KinessoIdSystem
+ * @requires module:modules/userId
+ */
+
+import { logError, logInfo } from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {coppaDataHandler, uspDataHandler} from '../src/adapterManager.js';
+
+const MODULE_NAME = 'kpuid';
+const ID_SVC = 'https://id.knsso.com/id';
+// These values should NEVER change. If
+// they do, we're no longer making ulids!
+const ENCODING = '0123456789ABCDEFGHJKMNPQRSTVWXYZ'; // Crockford's Base32
+const ENCODING_LEN = ENCODING.length;
+const TIME_MAX = Math.pow(2, 48) - 1;
+const TIME_LEN = 10;
+const RANDOM_LEN = 16;
+const id = factory();
+
+/**
+ * the factory to generate unique identifier based on time and current pseudorandom number
+ * @param {string} the current pseudorandom number generator
+ * @returns {function(*=): *}
+ */
+function factory(currPrng) {
+  if (!currPrng) {
+    currPrng = detectPrng();
+  }
+  return function ulid(seedTime) {
+    if (isNaN(seedTime)) {
+      seedTime = Date.now();
+    }
+    return encodeTime(seedTime, TIME_LEN) + encodeRandom(RANDOM_LEN, currPrng);
+  };
+}
+
+/**
+ * gets a a random charcter from generated pseudorandom number
+ * @param {string} the generated pseudorandom number
+ * @returns {string}
+ */
+function randomChar(prng) {
+  let rand = Math.floor(prng() * ENCODING_LEN);
+  if (rand === ENCODING_LEN) {
+    rand = ENCODING_LEN - 1;
+  }
+  return ENCODING.charAt(rand);
+}
+
+/**
+ * encodes random character
+ * @param len
+ * @param prng
+ * @returns {string}
+ */
+function encodeRandom(len, prng) {
+  let str = '';
+  for (; len > 0; len--) {
+    str = randomChar(prng) + str;
+  }
+  return str;
+}
+
+/**
+ * encodes the time based on the length
+ * @param now
+ * @param len
+ * @returns {string} encoded time.
+ */
+function encodeTime(now, len) {
+  if (isNaN(now)) {
+    throw new Error(now + ' must be a number');
+  }
+
+  if (Number.isInteger(now) === false) {
+    throw createError('time must be an integer');
+  }
+
+  if (now > TIME_MAX) {
+    throw createError('cannot encode time greater than ' + TIME_MAX);
+  }
+  if (now < 0) {
+    throw createError('time must be positive');
+  }
+
+  if (Number.isInteger(len) === false) {
+    throw createError('length must be an integer');
+  }
+  if (len < 0) {
+    throw createError('length must be positive');
+  }
+
+  let mod;
+  let str = '';
+  for (; len > 0; len--) {
+    mod = now % ENCODING_LEN;
+    str = ENCODING.charAt(mod) + str;
+    now = (now - mod) / ENCODING_LEN;
+  }
+  return str;
+}
+
+/**
+ * creates and logs the error message
+ * @function
+ * @param {string} error message
+ * @returns {Error}
+ */
+function createError(message) {
+  logError(message);
+  const err = new Error(message);
+  err.source = 'kinessoId';
+  return err;
+}
+
+/**
+ * detects the pseudorandom number generator and generates the random number
+ * @function
+ * @param {string} error message
+ * @returns {string} a random number
+ */
+function detectPrng(root) {
+  if (!root) {
+    root = typeof window !== 'undefined' ? window : null;
+  }
+  const browserCrypto = root && (root.crypto || root.msCrypto);
+  if (browserCrypto) {
+    return () => {
+      const buffer = new Uint8Array(1);
+      browserCrypto.getRandomValues(buffer);
+      return buffer[0] / 0xff;
+    };
+  }
+  return () => Math.random();
+}
+
+/**
+ * existing id generation call back
+ * @param result
+ * @param callback
+ * @returns {{success: success, error: error}}
+ */
+function syncId(storedId) {
+  return {
+    success: function (responseBody) {
+      logInfo('KinessoId: id to be synced: ' + storedId);
+    },
+    error: function () {
+      logInfo('KinessoId: Sync error for id : ' + storedId);
+    }
+  }
+}
+
+/**
+ * Encode the id
+ * @param value
+ * @returns {string|*}
+ */
+function encodeId(value) {
+  const result = {};
+  const knssoId = (value && typeof value === 'string') ? value : undefined;
+  if (knssoId) {
+    result.kpuid = knssoId;
+    logInfo('KinessoId: Decoded value ' + JSON.stringify(result));
+    return result;
+  }
+  return knssoId;
+}
+
+/**
+ * Builds and returns the shared Id URL with attached consent data if applicable
+ * @param {Object} consentData
+ * @return {string}
+ */
+function kinessoSyncUrl(accountId, consentData) {
+  const usPrivacyString = uspDataHandler.getConsentData();
+  let kinessoSyncUrl = `${ID_SVC}?accountid=${accountId}`;
+  if (usPrivacyString) {
+    kinessoSyncUrl = `${kinessoSyncUrl}&us_privacy=${usPrivacyString}`;
+  }
+  if (!consentData || typeof consentData.gdprApplies !== 'boolean' || !consentData.gdprApplies) return kinessoSyncUrl;
+
+  kinessoSyncUrl = `${kinessoSyncUrl}&gdpr=1&gdpr_consent=${consentData.consentString}`;
+  return kinessoSyncUrl
+}
+
+/** @type {Submodule} */
+export const kinessoIdSubmodule = {
+
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {{kpuid:{ id: string}} or undefined if value doesn't exists
+   */
+  decode(value) {
+    return (value) ? encodeId(value) : undefined;
+  },
+
+  /**
+   * performs action to obtain id and return a value.
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData|undefined} consentData
+   * @returns {knssoId}
+   */
+  getId(config, consentData) {
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.accountid !== 'number') {
+      logError('User ID - KinessoId submodule requires a valid accountid to be defined');
+      return;
+    }
+    const coppa = coppaDataHandler.getCoppa();
+    if (coppa) {
+      logInfo('KinessoId: IDs not provided for coppa requests, exiting KinessoId');
+      return;
+    }
+    const accountId = configParams.accountid;
+    const knnsoId = id();
+    logInfo('KinessoId: generated id ' + knnsoId);
+    const kinessoIdPayload = {};
+    kinessoIdPayload.id = knnsoId;
+    const payloadString = JSON.stringify(kinessoIdPayload);
+    ajax(kinessoSyncUrl(accountId, consentData), syncId(knnsoId), payloadString, {method: 'POST', withCredentials: true});
+    return {'id': knnsoId};
+  }
+
+};
+
+// Register submodule for userId
+submodule('userId', kinessoIdSubmodule);
diff --git a/modules/koblerBidAdapter.js b/modules/koblerBidAdapter.js
new file mode 100644
index 00000000000..1dc22d0099a
--- /dev/null
+++ b/modules/koblerBidAdapter.js
@@ -0,0 +1,249 @@
+import {
+  deepAccess,
+  getWindowSelf,
+  isArray,
+  isStr,
+  parseQueryStringParameters,
+  replaceAuctionPrice,
+  triggerPixel
+} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+
+const BIDDER_CODE = 'kobler';
+const BIDDER_ENDPOINT = 'https://bid.essrtb.com/bid/prebid_rtb_call';
+const DEV_BIDDER_ENDPOINT = 'https://bid-service.dev.essrtb.com/bid/prebid_rtb_call';
+const TIMEOUT_NOTIFICATION_ENDPOINT = 'https://bid.essrtb.com/notify/prebid_timeout';
+const SUPPORTED_CURRENCY = 'USD';
+const DEFAULT_TIMEOUT = 1000;
+const TIME_TO_LIVE_IN_SECONDS = 10 * 60;
+
+export const isBidRequestValid = function (bid) {
+  if (!bid || !bid.bidId) {
+    return false;
+  }
+
+  const sizes = deepAccess(bid, 'mediaTypes.banner.sizes', bid.sizes);
+  return isArray(sizes) && sizes.length > 0;
+};
+
+export const buildRequests = function (validBidRequests, bidderRequest) {
+  const bidderEndpoint = isTest(validBidRequests[0]) ? DEV_BIDDER_ENDPOINT : BIDDER_ENDPOINT;
+  return {
+    method: 'POST',
+    url: bidderEndpoint,
+    data: buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest),
+    options: {
+      contentType: 'application/json'
+    }
+  };
+};
+
+export const interpretResponse = function (serverResponse) {
+  const res = serverResponse.body;
+  const bids = []
+  if (res) {
+    res.seatbid.forEach(sb => {
+      sb.bid.forEach(b => {
+        bids.push({
+          requestId: b.impid,
+          cpm: b.price,
+          currency: res.cur,
+          width: b.w,
+          height: b.h,
+          creativeId: b.crid,
+          dealId: b.dealid,
+          netRevenue: true,
+          ttl: TIME_TO_LIVE_IN_SECONDS,
+          ad: b.adm,
+          nurl: b.nurl,
+          meta: {
+            advertiserDomains: b.adomain
+          }
+        })
+      })
+    });
+  }
+  return bids;
+};
+
+export const onBidWon = function (bid) {
+  // We intentionally use the price set by the publisher to replace the ${AUCTION_PRICE} macro
+  // instead of the `originalCpm` here. This notification is not used for billing, only for extra logging.
+  const publisherPrice = bid.cpm || 0;
+  const publisherCurrency = bid.currency || config.getConfig('currency.adServerCurrency') || SUPPORTED_CURRENCY;
+  const adServerPrice = deepAccess(bid, 'adserverTargeting.hb_pb', 0);
+  const adServerPriceCurrency = config.getConfig('currency.adServerCurrency') || SUPPORTED_CURRENCY;
+  if (isStr(bid.nurl) && bid.nurl !== '') {
+    const winNotificationUrl = replaceAuctionPrice(bid.nurl, publisherPrice)
+      .replace(/\${AUCTION_PRICE_CURRENCY}/g, publisherCurrency)
+      .replace(/\${AD_SERVER_PRICE}/g, adServerPrice)
+      .replace(/\${AD_SERVER_PRICE_CURRENCY}/g, adServerPriceCurrency);
+    triggerPixel(winNotificationUrl);
+  }
+};
+
+export const onTimeout = function (timeoutDataArray) {
+  if (isArray(timeoutDataArray)) {
+    const pageUrl = getPageUrlFromRefererInfo();
+    timeoutDataArray.forEach(timeoutData => {
+      const query = parseQueryStringParameters({
+        ad_unit_code: timeoutData.adUnitCode,
+        auction_id: timeoutData.auctionId,
+        bid_id: timeoutData.bidId,
+        timeout: timeoutData.timeout,
+        page_url: pageUrl,
+      });
+      const timeoutNotificationUrl = `${TIMEOUT_NOTIFICATION_ENDPOINT}?${query}`;
+      triggerPixel(timeoutNotificationUrl);
+    });
+  }
+};
+
+function getPageUrlFromRequest(validBidRequest, bidderRequest) {
+  // pageUrl is considered only when testing to ensure that non-test requests always contain the correct URL
+  if (isTest(validBidRequest) && config.getConfig('pageUrl')) {
+    // TODO: it's not clear what the intent is here - but all adapters should always respect pageUrl.
+    // With prebid 7, using `refererInfo.page` will do that automatically.
+    return config.getConfig('pageUrl');
+  }
+
+  return (bidderRequest.refererInfo && bidderRequest.refererInfo.page)
+    ? bidderRequest.refererInfo.page
+    : window.location.href;
+}
+
+function getPageUrlFromRefererInfo() {
+  const refererInfo = getRefererInfo();
+  return (refererInfo && refererInfo.page)
+    ? refererInfo.page
+    : window.location.href;
+}
+
+function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
+  const imps = validBidRequests.map(buildOpenRtbImpObject);
+  const timeout = bidderRequest.timeout || config.getConfig('bidderTimeout') || DEFAULT_TIMEOUT;
+  const pageUrl = getPageUrlFromRequest(validBidRequests[0], bidderRequest)
+  const request = {
+    id: bidderRequest.auctionId,
+    at: 1,
+    tmax: timeout,
+    cur: [SUPPORTED_CURRENCY],
+    imp: imps,
+    device: {
+      devicetype: getDevice()
+    },
+    site: {
+      page: pageUrl,
+    },
+    test: getTestAsNumber(validBidRequests[0])
+  };
+
+  return JSON.stringify(request);
+}
+
+function buildOpenRtbImpObject(validBidRequest) {
+  const sizes = getSizes(validBidRequest);
+  const mainSize = sizes[0];
+  const floorInfo = getFloorInfo(validBidRequest, mainSize);
+
+  return {
+    id: validBidRequest.bidId,
+    banner: {
+      format: buildFormatArray(sizes),
+      w: mainSize[0],
+      h: mainSize[1]
+    },
+    bidfloor: floorInfo.floor,
+    bidfloorcur: floorInfo.currency,
+    pmp: buildPmpObject(validBidRequest)
+  };
+}
+
+function getDevice() {
+  const ws = getWindowSelf();
+  const ua = ws.navigator.userAgent;
+
+  if (/(tablet|ipad|playbook|silk|android 3.0|xoom|sch-i800|kindle)|(android(?!.*mobi))/i
+    .test(ua.toLowerCase())) {
+    return 5; // tablet
+  }
+  if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series([46])0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i
+    .test(ua.toLowerCase())) {
+    return 4; // phone
+  }
+  return 2; // personal computers
+}
+
+function getTestAsNumber(validBidRequest) {
+  return isTest(validBidRequest) ? 1 : 0;
+}
+
+function isTest(validBidRequest) {
+  return validBidRequest.params && validBidRequest.params.test === true;
+}
+
+function getSizes(validBidRequest) {
+  const sizes = deepAccess(validBidRequest, 'mediaTypes.banner.sizes', validBidRequest.sizes);
+  if (isArray(sizes) && sizes.length > 0) {
+    return sizes;
+  }
+
+  return [[0, 0]];
+}
+
+function buildFormatArray(sizes) {
+  return sizes.map(size => {
+    return {
+      w: size[0],
+      h: size[1]
+    };
+  });
+}
+
+function getFloorInfo(validBidRequest, mainSize) {
+  if (typeof validBidRequest.getFloor === 'function') {
+    const sizeParam = mainSize[0] === 0 && mainSize[1] === 0 ? '*' : mainSize;
+    return validBidRequest.getFloor({
+      currency: SUPPORTED_CURRENCY,
+      mediaType: BANNER,
+      size: sizeParam
+    });
+  } else {
+    return {
+      currency: SUPPORTED_CURRENCY,
+      floor: getFloorPrice(validBidRequest)
+    };
+  }
+}
+
+function getFloorPrice(validBidRequest) {
+  return parseFloat(deepAccess(validBidRequest, 'params.floorPrice', 0.0));
+}
+
+function buildPmpObject(validBidRequest) {
+  if (validBidRequest.params && validBidRequest.params.dealIds && isArray(validBidRequest.params.dealIds)) {
+    return {
+      deals: validBidRequest.params.dealIds.map(dealId => {
+        return {
+          id: dealId
+        };
+      })
+    };
+  }
+  return {};
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  onBidWon,
+  onTimeout
+};
+
+registerBidder(spec);
diff --git a/modules/koblerBidAdapter.md b/modules/koblerBidAdapter.md
new file mode 100644
index 00000000000..63b0c3ead68
--- /dev/null
+++ b/modules/koblerBidAdapter.md
@@ -0,0 +1,62 @@
+# Overview
+
+**Module Name**: Kobler Bidder Adapter  
+**Module Type**: Bidder Adapter  
+**Maintainer**: bidding-support@kobler.no  
+
+# Description
+
+Connects to Kobler's demand sources.
+
+This adapter currently only supports Banner Ads.
+
+# Parameters
+
+| Parameter (in `params`) | Scope    | Type             | Description                                                                                                                                                                                                            | Example                      |
+|-------------------------|----------|------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|
+| test                    | Optional | Boolean          | Whether the request is for testing only. When multiple ad units are submitted together, it is enough to set this parameter on the first one. Enables providing a custom URL through config.pageUrl. Defaults to false. | `true`                       |
+| floorPrice              | Optional | Float            | Floor price in CPM and USD. Can be used as an alternative to the [Floors module](https://docs.prebid.org/dev-docs/modules/floors.html), which is also supported by this adapter. Defaults to 0.                        | `5.0`                        |
+| dealIds                 | Optional | Array of Strings | Array of deal IDs.                                                                                                                                                                                                     | `['abc328745', 'mxw243253']` |
+
+## Implicit parameters
+
+Kobler identifies the placement using the combination of the page URL and the allowed sizes. As a result, it's important that the correct sizes are provided in `banner.sizes` in order for Kobler to correctly identify the placement. The main, desired format should be the first element of this array.
+
+# Test Parameters
+```javascript
+  const adUnits = [{
+    code: 'div-gpt-ad-1460505748561-1',
+    mediaTypes: {
+        banner: {
+            sizes: [[320, 250], [300, 250]],
+        }
+    },
+    bids: [{
+      bidder: 'kobler'
+    }]
+  }];
+```
+
+In order to see a sample bid from Kobler (without a proper setup), you have to also do the following:
+- Set the `test` parameter to `true`.
+- Set `config.pageUrl` to `'https://www.tv2.no/mening-og-analyse/14555348/'`. This is necessary because Kobler only bids on recognized articles. Kobler runs its own test campaign to make sure there is always a bid for this specific page URL.
+
+# Test Optional Parameters
+```javascript
+  const adUnits = [{
+    code: 'div-gpt-ad-1460505748561-1',
+    mediaTypes: {
+        banner: {
+            sizes: [[320, 250], [300, 250]],
+        }
+    },
+    bids: [{
+      bidder: 'kobler',
+      params: {
+        test: true,
+        floorPrice: 5.0,
+        dealIds: ['abc328745', 'mxw243253']
+      }
+    }]
+  }];
+```
diff --git a/modules/komoonaBidAdapter.js b/modules/komoonaBidAdapter.js
deleted file mode 100644
index 6adc0eb1984..00000000000
--- a/modules/komoonaBidAdapter.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'komoona';
-const ENDPOINT = 'https://bidder.komoona.com/v1/GetSBids';
-const USYNCURL = 'https://s.komoona.com/sync/usync.html';
-
-export const spec = {
-  code: BIDDER_CODE,
-
-  /**
-  * Determines whether or not the given bid request is valid. Valid bid request must have placementId and hbid
-  *
-  * @param {BidRequest} bid The bid params to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
-  isBidRequestValid: bid => {
-    return !!(bid && bid.params && bid.params.placementId && bid.params.hbid);
-  },
-  /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param {validBidRequests[]} - an array of bids
-  * @return ServerRequest Info describing the request to the server.
-  */
-  buildRequests: validBidRequests => {
-    const tags = validBidRequests.map(bid => {
-      // map each bid id to bid object to retrieve adUnit code in callback
-      let tag = {
-        uuid: bid.bidId,
-        sizes: bid.sizes,
-        trid: bid.transactionId,
-        hbid: bid.params.hbid,
-        placementid: bid.params.placementId
-      };
-
-      // add floor price if specified (not mandatory)
-      if (bid.params.floorPrice) {
-        tag.floorprice = bid.params.floorPrice;
-      }
-
-      return tag;
-    });
-
-    // Komoona server config
-    const time = new Date().getTime();
-    const kbConf = {
-      ts_as: time,
-      hb_placements: [],
-      hb_placement_bidids: {},
-      hb_floors: {},
-      cb: _generateCb(time),
-      tz: new Date().getTimezoneOffset(),
-    };
-
-    validBidRequests.forEach(bid => {
-      kbConf.hdbdid = kbConf.hdbdid || bid.params.hbid;
-      kbConf.encode_bid = kbConf.encode_bid || bid.params.encode_bid;
-      kbConf.hb_placement_bidids[bid.params.placementId] = bid.bidId;
-      if (bid.params.floorPrice) {
-        kbConf.hb_floors[bid.params.placementId] = bid.params.floorPrice;
-      }
-      kbConf.hb_placements.push(bid.params.placementId);
-    });
-
-    let payload = {};
-    if (!utils.isEmpty(tags)) {
-      payload = { bids: [...tags], kbConf: kbConf };
-    }
-
-    return {
-      method: 'POST',
-      url: ENDPOINT,
-      data: JSON.stringify(payload)
-    };
-  },
-  /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {*} response A successful response from the server.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  */
-  interpretResponse: (response, request) => {
-    const bidResponses = [];
-    try {
-      if (response.body && response.body.bids) {
-        response.body.bids.forEach(bid => {
-          // The bid ID. Used to tie this bid back to the request.
-          bid.requestId = bid.uuid;
-          // The creative payload of the returned bid.
-          bid.ad = bid.creative;
-          bidResponses.push(bid);
-        });
-      }
-    } catch (error) {
-      utils.logError(error);
-    }
-    return bidResponses;
-  },
-  /**
-  * Register User Sync.
-  */
-  getUserSyncs: syncOptions => {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: USYNCURL
-      }];
-    }
-  }
-};
-
-/**
-* Generated cache baster value to be sent to bid server
-* @param {*} time current time to use for creating cb.
-*/
-function _generateCb(time) {
-  return Math.floor((time % 65536) + (Math.floor(Math.random() * 65536) * 65536));
-}
-
-registerBidder(spec);
diff --git a/modules/komoonaBidAdapter.md b/modules/komoonaBidAdapter.md
deleted file mode 100644
index 6f88c19dfa6..00000000000
--- a/modules/komoonaBidAdapter.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Overview
-
-**Module Name**: Komoona Bidder Adapter  
-**Module Type**: Bidder Adapter  
-**Maintainer**: support@komoona.com  
-
-# Description
-
-Connects to Komoona demand source to fetch bids.  
-
-# Test Parameters
-```
-    var adUnits = [{
-        code: 'banner-ad-div',
-        sizes: [[300, 250]],
-
-        // Replace this object to test a new Adapter!
-        bids: [{
-          bidder: 'komoona',
-          params: {
-            placementId: 'e69148e0ba6c4c07977dc2daae5e1577',
-			hbid: '1f5b2c10e66e419580bd943b9af692ab',
-			floorPrice: 0.5
-          }
-        }]
-    }];
-```
-
-
diff --git a/modules/konduitAnalyticsAdapter.js b/modules/konduitAnalyticsAdapter.js
index f6b77f23d87..a1a586b25db 100644
--- a/modules/konduitAnalyticsAdapter.js
+++ b/modules/konduitAnalyticsAdapter.js
@@ -1,7 +1,7 @@
+import { parseSizesInput, logError, uniques } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import * as utils from '../src/utils.js';
 import { targeting } from '../src/targeting.js';
 import { config } from '../src/config.js';
 import CONSTANTS from '../src/constants.json';
@@ -84,7 +84,7 @@ const konduitAnalyticsAdapter = Object.assign(
 );
 
 function obtainBidTimeoutInfo (args) {
-  return args.map(item => item.bidder).filter(utils.uniques);
+  return args.map(item => item.bidder).filter(uniques);
 }
 
 function obtainAuctionInfo (auction) {
@@ -109,7 +109,7 @@ function obtainBidRequestsInfo (bidRequests) {
         adUnitCode: bid.adUnitCode,
         bidId: bid.bidId,
         startTime: bid.startTime,
-        sizes: utils.parseSizesInput(bid.sizes).toString(),
+        sizes: parseSizesInput(bid.sizes).toString(),
         params: bid.params
       };
     }),
@@ -208,7 +208,7 @@ konduitAnalyticsAdapter.enableAnalytics = function (analyticsConfig) {
   const konduitId = config.getConfig('konduit.konduitId');
 
   if (!konduitId) {
-    utils.logError('A konduitId in config is required to use konduitAnalyticsAdapter');
+    logError('A konduitId in config is required to use konduitAnalyticsAdapter');
     return;
   }
 
diff --git a/modules/konduitWrapper.js b/modules/konduitWrapper.js
index 3ce9bc7a501..f19318e3128 100644
--- a/modules/konduitWrapper.js
+++ b/modules/konduitWrapper.js
@@ -1,6 +1,6 @@
+import { logInfo, logError, isNumber, isStr, isEmpty } from '../src/utils.js';
 import { registerVideoSupport } from '../src/adServerManager.js';
 import { targeting } from '../src/targeting.js';
-import * as utils from '../src/utils.js';
 import { config } from '../src/config.js';
 import { ajaxBuilder } from '../src/ajax.js';
 import { getPriceBucketString } from '../src/cpmBucketManager.js';
@@ -49,12 +49,12 @@ function addLogLabel(args) {
   return args;
 }
 
-function logInfo() {
-  utils.logInfo(...addLogLabel(arguments));
+function _logInfo() {
+  logInfo(...addLogLabel(arguments));
 }
 
-function logError() {
-  utils.logError(...addLogLabel(arguments));
+function _logError() {
+  logError(...addLogLabel(arguments));
 }
 
 function sendRequest ({ host = SERVER_HOST, protocol = SERVER_PROTOCOL, method = 'GET', path, payload, callbacks, timeout }) {
@@ -113,7 +113,7 @@ function setDefaultKCpmToBid(bid, winnerBid, priceGranularity) {
 }
 
 function addKCpmToBid(kCpm, bid, winnerBid, priceGranularity) {
-  if (utils.isNumber(kCpm)) {
+  if (isNumber(kCpm)) {
     bid.kCpm = kCpm;
     const priceStringsObj = getPriceBucketString(
       kCpm,
@@ -134,7 +134,7 @@ function addKCpmToBid(kCpm, bid, winnerBid, priceGranularity) {
 }
 
 function addKonduitCacheKeyToBid(cacheKey, bid, winnerBid) {
-  if (utils.isStr(cacheKey)) {
+  if (isStr(cacheKey)) {
     bid.konduitCacheKey = cacheKey;
 
     if (config.getConfig(SEND_ALL_BIDS_CONFIG)) {
@@ -163,7 +163,7 @@ export function processBids(options = {}) {
   options = options || {};
 
   if (!konduitId) {
-    logError(errorMessages.NO_KONDUIT_ID);
+    _logError(errorMessages.NO_KONDUIT_ID);
 
     if (options.callback) {
       options.callback(new Error(errorMessages.NO_KONDUIT_ID), []);
@@ -184,7 +184,7 @@ export function processBids(options = {}) {
   }
 
   if (!bids.length) {
-    logError(errorMessages.NO_BIDS);
+    _logError(errorMessages.NO_BIDS);
 
     if (options.callback) {
       options.callback(new Error(errorMessages.NO_BIDS), []);
@@ -216,11 +216,11 @@ export function processBids(options = {}) {
     callbacks: {
       success: (data) => {
         let error = null;
-        logInfo('Bids processed successfully ', data);
+        _logInfo('Bids processed successfully ', data);
         try {
           const { kCpmData, cacheData } = JSON.parse(data);
 
-          if (utils.isEmpty(cacheData)) {
+          if (isEmpty(cacheData)) {
             throw new Error(errorMessages.CACHE_FAILURE);
           }
 
@@ -234,7 +234,7 @@ export function processBids(options = {}) {
           })
         } catch (err) {
           error = err;
-          logError('Error parsing JSON response for bidsProcessor data: ', err)
+          _logError('Error parsing JSON response for bidsProcessor data: ', err)
         }
 
         if (options.callback) {
@@ -242,9 +242,9 @@ export function processBids(options = {}) {
         }
       },
       error: (error) => {
-        logError('Bids were not processed successfully ', error);
+        _logError('Bids were not processed successfully ', error);
         if (options.callback) {
-          options.callback(utils.isStr(error) ? new Error(error) : error, bids);
+          options.callback(isStr(error) ? new Error(error) : error, bids);
         }
       }
     }
diff --git a/modules/krushmediaBidAdapter.js b/modules/krushmediaBidAdapter.js
new file mode 100644
index 00000000000..876f0ebabc6
--- /dev/null
+++ b/modules/krushmediaBidAdapter.js
@@ -0,0 +1,163 @@
+import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'krushmedia';
+const AD_URL = 'https://ads4.krushmedia.com/?c=rtb&m=hb';
+const SYNC_URL = 'https://cs.krushmedia.com/html?src=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 && !isNaN(parseInt(bid.params.key)));
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let winTop = window;
+    let location;
+    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
+    try {
+      location = new URL(bidderRequest.refererInfo.page);
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      logMessage(e);
+    };
+
+    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 = {
+        key: bid.params.key,
+        bidId: bid.bidId,
+        traffic: bid.params.traffic || BANNER,
+        schain: bid.schain || {},
+        bidFloor: getBidFloor(bid)
+      };
+
+      if (bid.mediaTypes && bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
+        placement.sizes = bid.mediaTypes[BANNER].sizes;
+      } else if (bid.mediaTypes && bid.mediaTypes[VIDEO] && bid.mediaTypes[VIDEO].playerSize) {
+        placement.wPlayer = bid.mediaTypes[VIDEO].playerSize[0];
+        placement.hPlayer = bid.mediaTypes[VIDEO].playerSize[1];
+        placement.minduration = bid.mediaTypes[VIDEO].minduration;
+        placement.maxduration = bid.mediaTypes[VIDEO].maxduration;
+        placement.mimes = bid.mediaTypes[VIDEO].mimes;
+        placement.protocols = bid.mediaTypes[VIDEO].protocols;
+        placement.startdelay = bid.mediaTypes[VIDEO].startdelay;
+        placement.placement = bid.mediaTypes[VIDEO].placement;
+        placement.skip = bid.mediaTypes[VIDEO].skip;
+        placement.skipafter = bid.mediaTypes[VIDEO].skipafter;
+        placement.minbitrate = bid.mediaTypes[VIDEO].minbitrate;
+        placement.maxbitrate = bid.mediaTypes[VIDEO].maxbitrate;
+        placement.delivery = bid.mediaTypes[VIDEO].delivery;
+        placement.playbackmethod = bid.mediaTypes[VIDEO].playbackmethod;
+        placement.api = bid.mediaTypes[VIDEO].api;
+        placement.linearity = bid.mediaTypes[VIDEO].linearity;
+      } else if (bid.mediaTypes && bid.mediaTypes[NATIVE]) {
+        placement.native = bid.mediaTypes[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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncUrl = SYNC_URL
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+    return [{
+      type: 'iframe',
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/krushmediaBidAdapter.md b/modules/krushmediaBidAdapter.md
new file mode 100644
index 00000000000..7bf7c4fe491
--- /dev/null
+++ b/modules/krushmediaBidAdapter.md
@@ -0,0 +1,80 @@
+# Overview
+
+```
+Module Name: krushmedia Bidder Adapter
+Module Type: krushmedia Bidder Adapter
+Maintainer: adapter@krushmedia.com
+```
+
+# Description
+
+Module that connects to krushmedia demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'krushmedia',
+                            params: {
+                                key: 0,
+                                traffic: 'banner'
+                            }
+                        }
+                    ]
+                },
+                // Will return test vast xml. All video params are stored under placement in publishers UI
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'krushmedia',
+                            params: {
+                                key: 0,
+                                traffic: 'video'
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'krushmedia',
+                            params: {
+                                key: 0,
+                                traffic: 'native'
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/kubientBidAdapter.js b/modules/kubientBidAdapter.js
new file mode 100644
index 00000000000..57cbe6acd07
--- /dev/null
+++ b/modules/kubientBidAdapter.js
@@ -0,0 +1,177 @@
+import { isArray, deepAccess } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'kubient';
+const END_POINT = 'https://kssp.kbntx.ch/kubprebidjs';
+const VERSION = '1.1';
+const VENDOR_ID = 794;
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: VENDOR_ID,
+  supportedMediaTypes: [ BANNER, VIDEO ],
+  isBidRequestValid: function (bid) {
+    return !!(
+      bid &&
+      bid.params &&
+      bid.params.zoneid &&
+      ((!bid.mediaTypes.video) || (bid.mediaTypes.video && bid.mediaTypes.video.playerSize && bid.mediaTypes.video.mimes && bid.mediaTypes.video.protocols))
+    );
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    if (!validBidRequests || !bidderRequest) {
+      return;
+    }
+    return validBidRequests.map(function (bid) {
+      let adSlot = {
+        bidId: bid.bidId,
+        zoneId: bid.params.zoneid || ''
+      };
+
+      if (typeof bid.getFloor === 'function') {
+        const mediaType = (Object.keys(bid.mediaTypes).length == 1) ? Object.keys(bid.mediaTypes)[0] : '*';
+        const sizes = bid.sizes || '*';
+        const floorInfo = bid.getFloor({currency: 'USD', mediaType: mediaType, size: sizes});
+        if (typeof floorInfo === 'object' && floorInfo.currency === 'USD') {
+          let floor = parseFloat(floorInfo.floor)
+          if (!isNaN(floor) && floor > 0) {
+            adSlot.floor = parseFloat(floorInfo.floor);
+          }
+        }
+      }
+
+      if (bid.mediaTypes.banner) {
+        adSlot.banner = bid.mediaTypes.banner;
+      }
+
+      if (bid.mediaTypes.video) {
+        adSlot.video = bid.mediaTypes.video;
+      }
+
+      if (bid.schain) {
+        adSlot.schain = bid.schain;
+      }
+
+      let data = {
+        v: VERSION,
+        requestId: bid.bidderRequestId,
+        adSlots: [adSlot],
+        tmax: bidderRequest.timeout,
+        gdpr: (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0,
+        consentGiven: kubientGetConsentGiven(bidderRequest.gdprConsent),
+        uspConsent: bidderRequest.uspConsent
+      }
+
+      if (config.getConfig('coppa') === true) {
+        data.coppa = 1
+      }
+
+      if (bidderRequest?.refererInfo?.page) {
+        // TODO: is 'page' the right value here?
+        data.referer = bidderRequest.refererInfo.page
+      }
+
+      if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) {
+        data.consent = bidderRequest.gdprConsent.consentString
+      }
+
+      return {
+        method: 'POST',
+        url: END_POINT,
+        data: JSON.stringify(data)
+      };
+    });
+  },
+  interpretResponse: function interpretResponse(serverResponse, request) {
+    if (!serverResponse || !serverResponse.body || !serverResponse.body.seatbid) {
+      return [];
+    }
+    let bidResponses = [];
+    serverResponse.body.seatbid.forEach(seatbid => {
+      let bids = seatbid.bid || [];
+      bids.forEach(bid => {
+        const bidResponse = {
+          requestId: bid.bidId,
+          cpm: bid.price,
+          currency: bid.cur,
+          width: bid.w,
+          height: bid.h,
+          creativeId: bid.creativeId,
+          netRevenue: bid.netRevenue,
+          ttl: bid.ttl,
+          ad: bid.adm,
+          meta: {}
+        };
+        if (bid.meta && bid.meta.adomain && isArray(bid.meta.adomain)) {
+          bidResponse.meta.advertiserDomains = bid.meta.adomain;
+        }
+        if (bid.mediaType === VIDEO) {
+          bidResponse.mediaType = VIDEO;
+          bidResponse.vastXml = bid.adm;
+        }
+        bidResponses.push(bidResponse);
+      });
+    });
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    let kubientSync = kubientGetSyncInclude(config);
+
+    if (!syncOptions.pixelEnabled || kubientSync.image === 'exclude') {
+      return [];
+    }
+
+    let values = {};
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        values['gdpr'] = Number(gdprConsent.gdprApplies);
+      }
+      if (typeof gdprConsent.consentString === 'string') {
+        values['consent'] = gdprConsent.consentString;
+      }
+    }
+
+    if (uspConsent) {
+      values['usp'] = uspConsent;
+    }
+
+    return [{
+      type: 'image',
+      url: 'https://matching.kubient.net/match/sp?' + encodeQueryData(values)
+    }];
+  }
+};
+
+function encodeQueryData(data) {
+  return Object.keys(data).map(function(key) {
+    return [key, data[key]].map(encodeURIComponent).join('=');
+  }).join('&');
+}
+
+function kubientGetConsentGiven(gdprConsent) {
+  let consentGiven = 0;
+  if (typeof gdprConsent !== 'undefined') {
+    consentGiven = deepAccess(gdprConsent, `vendorData.vendor.consents.${VENDOR_ID}`) ? 1 : 0;
+  }
+  return consentGiven;
+}
+
+function kubientGetSyncInclude(config) {
+  try {
+    let kubientSync = {};
+    if (config.getConfig('userSync').filterSettings != null && typeof config.getConfig('userSync').filterSettings != 'undefined') {
+      let filterSettings = config.getConfig('userSync').filterSettings
+      if (filterSettings.iframe !== null && typeof filterSettings.iframe !== 'undefined') {
+        kubientSync.iframe = ((isArray(filterSettings.image.bidders) && filterSettings.iframe.bidders.indexOf('kubient') !== -1) || filterSettings.iframe.bidders === '*') ? filterSettings.iframe.filter : 'exclude';
+      }
+      if (filterSettings.image !== null && typeof filterSettings.image !== 'undefined') {
+        kubientSync.image = ((isArray(filterSettings.image.bidders) && filterSettings.image.bidders.indexOf('kubient') !== -1) || filterSettings.image.bidders === '*') ? filterSettings.image.filter : 'exclude';
+      }
+    }
+    return kubientSync;
+  } catch (e) {
+    return null;
+  }
+}
+registerBidder(spec);
diff --git a/modules/kubientBidAdapter.md b/modules/kubientBidAdapter.md
new file mode 100644
index 00000000000..a45d26dbc31
--- /dev/null
+++ b/modules/kubientBidAdapter.md
@@ -0,0 +1,61 @@
+# Overview
+​
+**Module Name**: Kubient Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**:  artem.aleksashkin@kubient.com
+​
+# Description
+​
+Connects to Kubient KSSP demand source to fetch bids. Banners and Video supported
+​
+# Banner Test Parameters
+```
+var adUnits = [
+    {
+        code: 'banner-ad-unit',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 100]]
+            }
+        },
+        bids: [{
+            bidder: 'kubient',
+            params: {
+                zoneid: "5fbb948f1e22b",
+            }
+        }]
+    }
+];
+​
+# Video Test Parameters
+​
+var adUnits = [
+    {
+        code: 'video-ad-unit',
+        mediaTypes: {
+            video: {
+                playerSize: [300, 250],               // required
+                context: 'instream',                  // required
+                mimes: ['video/mp4','video/x-flv'],   // required
+                protocols: [ 2, 3 ],                  // required, set at least 1 value in array
+                placement: 1,                         // optional, defaults to 2 when context = outstream
+                api: [ 1, 2 ],                        // optional
+                skip: 0,                              // optional
+                minduration: 5,                       // optional
+                maxduration: 30,                      // optional
+                playbackmethod: [1,3],                // optional
+                battr: [ 13, 14 ],                    // optional
+                linearity: 1,                         // optional
+                minbitrate: 10,                       // optional
+                maxbitrate: 10                        // optional
+            }
+        },
+        bids: [{
+            bidder: 'kubient',
+            params: {
+                zoneid: "60ad1c0b35864",
+            }
+        }]
+    }
+];
+```
diff --git a/modules/kueezBidAdapter.js b/modules/kueezBidAdapter.js
new file mode 100644
index 00000000000..24d339d1938
--- /dev/null
+++ b/modules/kueezBidAdapter.js
@@ -0,0 +1,471 @@
+import { logWarn, logInfo, isArray, isFn, deepAccess, isEmpty, contains, timestamp, getBidIdParameter, triggerPixel, isInteger } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_ENDPOINT = 'https://hb.kueezssp.com/hb-kz-multi';
+const BIDDER_TEST_ENDPOINT = 'https://hb.kueezssp.com/hb-multi-kz-test'
+const BIDDER_CODE = 'kueez';
+const MAIN_CURRENCY = 'USD';
+const MEDIA_TYPES = [BANNER, VIDEO];
+const TTL = 420;
+const VERSION = '1.0.0';
+const SUPPORTED_SYNC_METHODS = {
+  IFRAME: 'iframe',
+  PIXEL: 'pixel'
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: VERSION,
+  supportedMediaTypes: MEDIA_TYPES,
+  isBidRequestValid: function (bidRequest) {
+    return validateParams(bidRequest);
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const [ sharedParams ] = validBidRequests;
+    const testMode = sharedParams.params.testMode;
+    const bidsToSend = prepareBids(validBidRequests, sharedParams, bidderRequest);
+
+    return {
+      method: 'POST',
+      url: getBidderEndpoint(testMode),
+      data: bidsToSend
+    }
+  },
+  interpretResponse: function ({body}) {
+    const bidResponses = body?.bids;
+
+    if (!bidResponses || !bidResponses.length) {
+      return [];
+    }
+
+    return parseBidResponses(bidResponses);
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.pixelEnabled && isArray(response.body.params.userSyncPixels)) {
+        const pixels = response.body.params.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        })
+        syncs.push(...pixels)
+      }
+      if (syncOptions.iframeEnabled && response.body.params.userSyncURL) {
+        syncs.push({
+          type: 'iframe',
+          url: response.body.params.userSyncURL
+        });
+      }
+    }
+    return syncs;
+  },
+  onBidWon: function (bid) {
+    if (bid == null) {
+      return;
+    }
+
+    logInfo('onBidWon:', bid);
+    if (bid.hasOwnProperty('nurl') && bid.nurl.length > 0) {
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+registerBidder(spec);
+
+/**
+ * Get schain string value
+ * @param schainObject {Object}
+ * @returns {string}
+ */
+function getSupplyChain(schainObject) {
+  if (isEmpty(schainObject)) {
+    return '';
+  }
+  let scStr = `${schainObject.ver},${schainObject.complete}`;
+  schainObject.nodes.forEach((node) => {
+    scStr += '!';
+    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
+    scStr += `${node.hp ? encodeURIComponent(node.hp) : ''},`;
+    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
+  });
+  return scStr;
+}
+
+/**
+ * Get the encoded value
+ * @param val {string}
+ * @returns {string}
+ */
+function getEncodedValIfNotEmpty(val) {
+  return !isEmpty(val) ? encodeURIComponent(val) : '';
+}
+
+/**
+ * get device type
+ * @returns {string}
+ */
+function getDeviceType() {
+  const ua = navigator.userAgent;
+  if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
+    .test(ua.toLowerCase())) {
+    return '5';
+  }
+  if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
+    .test(ua.toLowerCase())) {
+    return '4';
+  }
+  if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
+    .test(ua.toLowerCase())) {
+    return '3';
+  }
+  return '1';
+}
+
+/**
+ * Get floor price
+ * @param bid {bid}
+ * @param mediaType {string}
+ * @returns {Number}
+ */
+function getFloorPrice(bid, mediaType) {
+  let floor = 0;
+
+  if (isFn(bid.getFloor)) {
+    let floorResult = bid.getFloor({
+      currency: MAIN_CURRENCY,
+      mediaType: mediaType,
+      size: '*'
+    });
+    floor = floorResult.currency === MAIN_CURRENCY && floorResult.floor ? floorResult.floor : 0;
+  }
+
+  return floor;
+}
+
+/**
+ * Get the ad sizes array from the bid
+ * @param bid {bid}
+ * @param mediaType {string}
+ * @returns {Array}
+ */
+function getSizesArray(bid, mediaType) {
+  let sizes = []
+
+  if (deepAccess(bid, `mediaTypes.${mediaType}.sizes`)) {
+    sizes = bid.mediaTypes[mediaType].sizes;
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizes = bid.sizes;
+  }
+
+  return sizes;
+}
+
+/**
+ * Get the preferred user-sync method
+ * @param filterSettings {filterSettings}
+ * @param bidderCode {string}
+ * @returns {string}
+ */
+function getSyncMethod(filterSettings, bidderCode) {
+  const iframeConfigs = ['all', 'iframe'];
+  const pixelConfig = 'image';
+  if (filterSettings && iframeConfigs.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
+    return SUPPORTED_SYNC_METHODS.IFRAME;
+  }
+  if (!filterSettings || !filterSettings[pixelConfig] || isSyncMethodAllowed(filterSettings[pixelConfig], bidderCode)) {
+    return SUPPORTED_SYNC_METHODS.PIXEL;
+  }
+}
+
+/**
+ * Check sync rule support
+ * @param filterSetting {Object}
+ * @param bidderCode {string}
+ * @returns {boolean}
+ */
+function isSyncMethodAllowed(filterSetting, bidderCode) {
+  if (!filterSetting) {
+    return false;
+  }
+  const bidders = isArray(filterSetting.bidders) ? filterSetting.bidders : [bidderCode];
+  return filterSetting.filter === 'include' && contains(bidders, bidderCode);
+}
+
+/**
+ * Get the bidder endpoint
+ * @param testMode {boolean}
+ * @returns {string}
+ */
+function getBidderEndpoint(testMode) {
+  return testMode ? BIDDER_TEST_ENDPOINT : BIDDER_ENDPOINT;
+}
+
+/**
+ * Generates the bidder parameters
+ * @param validBidRequests {Array}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Array}
+ */
+function generateBidParams(validBidRequests, bidderRequest) {
+  const bidsArray = [];
+
+  if (validBidRequests.length) {
+    validBidRequests.forEach(bid => {
+      bidsArray.push(generateBidParameters(bid, bidderRequest));
+    });
+  }
+
+  return bidsArray;
+}
+
+/**
+ * Generate bid specific parameters
+ * @param bid {bid}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Object} bid specific params object
+ */
+function generateBidParameters(bid, bidderRequest) {
+  const {params} = bid;
+  const mediaType = isBanner(bid) ? BANNER : VIDEO;
+  const sizesArray = getSizesArray(bid, mediaType);
+  const gpid = deepAccess(bid, `ortb2Imp.ext.gpid`);
+  const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
+  const placementId = params.placementId || deepAccess(bid, `mediaTypes.${mediaType}.name`);
+  const paramsFloorPrice = isNaN(params.floorPrice) ? 0 : params.floorPrice;
+
+  const bidObject = {
+    adUnitCode: getBidIdParameter('adUnitCode', bid),
+    bidId: getBidIdParameter('bidId', bid),
+    loop: getBidIdParameter('bidderRequestsCount', bid),
+    bidderRequestId: getBidIdParameter('bidderRequestId', bid),
+    floorPrice: Math.max(getFloorPrice(bid, mediaType), paramsFloorPrice),
+    mediaType,
+    sizes: sizesArray,
+    transactionId: getBidIdParameter('transactionId', bid)
+  };
+
+  if (pos) {
+    bidObject.pos = pos;
+  }
+
+  if (gpid) {
+    bidObject.gpid = gpid;
+  }
+
+  if (placementId) {
+    bidObject.placementId = placementId;
+  }
+
+  if (mediaType === VIDEO) {
+    populateVideoParams(bidObject, bid);
+  }
+
+  return bidObject;
+}
+
+/**
+ * Checks if the media type is a banner
+ * @param bid {bid}
+ * @returns {boolean}
+ */
+function isBanner(bid) {
+  return bid.mediaTypes && bid.mediaTypes.banner;
+}
+
+/**
+ * Generate params that are common between all bids
+ * @param sharedParams {sharedParams}
+ * @param bidderRequest {bidderRequest}
+ * @returns {object} the common params object
+ */
+function generateSharedParams(sharedParams, bidderRequest) {
+  const {bidderCode} = bidderRequest;
+  const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
+  const domain = window.location.hostname;
+  const generalBidParams = getBidIdParameter('params', sharedParams);
+  const userIds = getBidIdParameter('userId', sharedParams);
+  const ortb2Metadata = bidderRequest.ortb2 || {};
+  const timeout = config.getConfig('bidderTimeout');
+
+  const params = {
+    adapter_version: VERSION,
+    auction_start: timestamp(),
+    device_type: getDeviceType(),
+    dnt: (navigator.doNotTrack === 'yes' || navigator.doNotTrack === '1' || navigator.msDoNotTrack === '1') ? 1 : 0,
+    publisher_id: generalBidParams.org,
+    publisher_name: domain,
+    session_id: getBidIdParameter('auctionId', sharedParams),
+    site_domain: domain,
+    tmax: timeout,
+    ua: navigator.userAgent,
+    wrapper_type: 'prebidjs',
+    wrapper_vendor: '$$PREBID_GLOBAL$$',
+    wrapper_version: '$prebid.version$'
+  };
+
+  if (syncEnabled) {
+    const allowedSyncMethod = getSyncMethod(filterSettings, bidderCode);
+    if (allowedSyncMethod) {
+      params.cs_method = allowedSyncMethod;
+    }
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+    params.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    params.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
+  if (bidderRequest.uspConsent) {
+    params.us_privacy = bidderRequest.uspConsent;
+  }
+
+  if (generalBidParams.ifa) {
+    params.ifa = generalBidParams.ifa;
+  }
+
+  if (ortb2Metadata.site) {
+    params.site_metadata = JSON.stringify(ortb2Metadata.site);
+  }
+
+  if (ortb2Metadata.user) {
+    params.user_metadata = JSON.stringify(ortb2Metadata.user);
+  }
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    params.referrer = deepAccess(bidderRequest, 'refererInfo.ref');
+    params.page_url = deepAccess(bidderRequest, 'refererInfo.page') || deepAccess(window, 'location.href');
+  }
+
+  if (sharedParams.schain) {
+    params.schain = getSupplyChain(sharedParams.schain);
+  }
+
+  if (userIds) {
+    params.userIds = JSON.stringify(userIds);
+  }
+
+  return params;
+}
+
+/**
+ * Validates the bidder params
+ * @param bidRequest {bidRequest}
+ * @returns {boolean}
+ */
+function validateParams(bidRequest) {
+  let isValid = true;
+
+  if (!bidRequest.params) {
+    logWarn('Kueez adapter - missing params');
+    isValid = false;
+  }
+
+  if (!bidRequest.params.org) {
+    logWarn('Kueez adapter - org is a required param');
+    isValid = false;
+  }
+
+  return isValid;
+}
+
+/**
+ * Validates the bidder params
+ * @param validBidRequests {Array}
+ * @param sharedParams {sharedParams}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Object}
+ */
+function prepareBids(validBidRequests, sharedParams, bidderRequest) {
+  return {
+    params: generateSharedParams(sharedParams, bidderRequest),
+    bids: generateBidParams(validBidRequests, bidderRequest)
+  }
+}
+
+function getPlaybackMethod(bid) {
+  const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
+
+  if (Array.isArray(playbackMethod) && isInteger(playbackMethod[0])) {
+    return playbackMethod[0];
+  } else if (isInteger(playbackMethod)) {
+    return playbackMethod;
+  }
+}
+
+function populateVideoParams(params, bid) {
+  const linearity = deepAccess(bid, `mediaTypes.video.linearity`);
+  const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
+  const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
+  const placement = deepAccess(bid, `mediaTypes.video.placement`);
+  const playbackMethod = getPlaybackMethod(bid);
+  const skip = deepAccess(bid, `mediaTypes.video.skip`);
+
+  if (linearity) {
+    params.linearity = linearity;
+  }
+
+  if (maxDuration) {
+    params.maxDuration = maxDuration;
+  }
+
+  if (minDuration) {
+    params.minDuration = minDuration;
+  }
+
+  if (placement) {
+    params.placement = placement;
+  }
+
+  if (playbackMethod) {
+    params.playbackMethod = playbackMethod;
+  }
+
+  if (skip) {
+    params.skip = skip;
+  }
+}
+
+/**
+ * Processes the bid responses
+ * @param bids {Array}
+ * @returns {Array}
+ */
+function parseBidResponses(bids) {
+  return bids.map(bid => {
+    const bidResponse = {
+      cpm: bid.cpm,
+      creativeId: bid.requestId,
+      currency: bid.currency || MAIN_CURRENCY,
+      height: bid.height,
+      mediaType: bid.mediaType,
+      meta: {
+        mediaType: bid.mediaType
+      },
+      netRevenue: bid.netRevenue || true,
+      nurl: bid.nurl,
+      requestId: bid.requestId,
+      ttl: bid.ttl || TTL,
+      width: bid.width
+    };
+
+    if (bid.adomain && bid.adomain.length) {
+      bidResponse.meta.advertiserDomains = bid.adomain;
+    }
+
+    if (bid.mediaType === VIDEO) {
+      bidResponse.vastXml = bid.vastXml;
+    } else if (bid.mediaType === BANNER) {
+      bidResponse.ad = bid.ad;
+    }
+
+    return bidResponse;
+  });
+}
diff --git a/modules/kueezBidAdapter.md b/modules/kueezBidAdapter.md
new file mode 100644
index 00000000000..8b17e40f503
--- /dev/null
+++ b/modules/kueezBidAdapter.md
@@ -0,0 +1,73 @@
+#Overview
+
+Module Name: Kueez Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: prebid@kueez.com
+
+# Description
+
+The Kueez adapter requires setup and approval from the Kueez team. Please reach out to prebid@kueez.com for more information.
+
+The adapter supports Banner and Video(instream) media types.
+
+# Bid Parameters
+
+## Video
+
+| Name          | Scope | Type | Description                                                       | Example
+|---------------| ----- | ---- |-------------------------------------------------------------------| -------
+| `org` | required | String | the organization Id provided by your Kueez representative         | "test-publisher-id"
+| `floorPrice`  | optional | Number | Minimum price in USD. Misuse of this parameter can impact revenue | 1.50
+| `placementId` | optional | String | A unique placement identifier                                     | "12345678"
+| `testMode`    | optional | Boolean | This activates the test mode                                      | false
+
+# Test Parameters
+
+```javascript
+var adUnits = [{
+  code: 'banner-div',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [728, 90]
+      ]
+    }
+  },
+  bids: [{
+    bidder: 'kueez',
+    params: {
+      org: 'test-org-id', // Required
+      floorPrice: 0.2, // Optional
+      placementId: '12345678', // Optional
+      testMode: true // Optional
+    }
+  }]
+},
+  {
+    code: 'dfp-video-div',
+    sizes: [
+      [640, 480]
+    ],
+    mediaTypes: {
+      video: {
+        playerSize: [
+          [640, 480]
+        ],
+        context: 'instream'
+      }
+    },
+    bids: [{
+      bidder: 'kueez',
+      params: {
+        org: 'test-org-id', // Required
+        floorPrice: 1.50, // Optional
+        placementId: '12345678', // Optional
+        testMode: true // Optional
+      }
+    }]
+  }
+];
+```
diff --git a/modules/kueezRtbBidAdapter.js b/modules/kueezRtbBidAdapter.js
new file mode 100644
index 00000000000..4b0e5055328
--- /dev/null
+++ b/modules/kueezRtbBidAdapter.js
@@ -0,0 +1,291 @@
+import { _each, deepAccess, parseSizesInput, parseUrl, uniques, isFn } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const GVLID = 1165;
+const DEFAULT_SUB_DOMAIN = 'exchange';
+const BIDDER_CODE = 'kueezrtb';
+const BIDDER_VERSION = '1.0.0';
+const CURRENCY = 'USD';
+const TTL_SECONDS = 60 * 5;
+const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 15;
+export const SUPPORTED_ID_SYSTEMS = {
+  'britepoolid': 1,
+  'criteoId': 1,
+  'id5id': 1,
+  'idl_env': 1,
+  'lipb': 1,
+  'netId': 1,
+  'parrableId': 1,
+  'pubcid': 1,
+  'tdid': 1,
+  'pubProvidedId': 1
+};
+const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE });
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = parseUrl(window.top.document.URL, { decodeSearchAsString: true });
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
+export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
+  return `https://${subDomain}.kueezrtb.com`;
+}
+
+export function extractCID(params) {
+  return params.cId || params.CID || params.cID || params.CId || params.cid || params.ciD || params.Cid || params.CiD;
+}
+
+export function extractPID(params) {
+  return params.pId || params.PID || params.pID || params.PId || params.pid || params.piD || params.Pid || params.PiD;
+}
+
+export function extractSubDomain(params) {
+  return params.subDomain || params.SubDomain || params.Subdomain || params.subdomain || params.SUBDOMAIN || params.subDOMAIN;
+}
+
+function isBidRequestValid(bid) {
+  const params = bid.params || {};
+  return !!(extractCID(params) && extractPID(params));
+}
+
+function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
+  const { params, bidId, userId, adUnitCode, schain, mediaTypes } = bid;
+  let { bidFloor, ext } = params;
+  const hashUrl = hashCode(topWindowUrl);
+  const uniqueDealId = getUniqueDealId(hashUrl);
+  const cId = extractCID(params);
+  const pId = extractPID(params);
+  const subDomain = extractSubDomain(params);
+
+  if (isFn(bid.getFloor)) {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (floorInfo.currency === 'USD') {
+      bidFloor = floorInfo.floor;
+    }
+  }
+
+  let data = {
+    url: encodeURIComponent(topWindowUrl),
+    uqs: getTopWindowQueryParams(),
+    cb: Date.now(),
+    bidFloor: bidFloor,
+    bidId: bidId,
+    referrer: bidderRequest.refererInfo.ref,
+    adUnitCode: adUnitCode,
+    publisherId: pId,
+    sizes: sizes,
+    uniqueDealId: uniqueDealId,
+    bidderVersion: BIDDER_VERSION,
+    prebidVersion: '$prebid.version$',
+    res: `${screen.width}x${screen.height}`,
+    schain: schain,
+    mediaTypes: mediaTypes
+  };
+
+  appendUserIdsToRequestPayload(data, userId);
+
+  if (bidderRequest.gdprConsent) {
+    if (bidderRequest.gdprConsent.consentString) {
+      data.gdprConsent = bidderRequest.gdprConsent.consentString;
+    }
+    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
+      data.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+    }
+  }
+  if (bidderRequest.uspConsent) {
+    data.usPrivacy = bidderRequest.uspConsent;
+  }
+
+  const dto = {
+    method: 'POST',
+    url: `${createDomain(subDomain)}/prebid/multi/${cId}`,
+    data: data
+  };
+
+  _each(ext, (value, key) => {
+    dto.data['ext.' + key] = value;
+  });
+
+  return dto;
+}
+
+function appendUserIdsToRequestPayload(payloadRef, userIds) {
+  let key;
+  _each(userIds, (userId, idSystemProviderName) => {
+    if (SUPPORTED_ID_SYSTEMS[idSystemProviderName]) {
+      key = `uid.${idSystemProviderName}`;
+
+      switch (idSystemProviderName) {
+        case 'digitrustid':
+          payloadRef[key] = deepAccess(userId, 'data.id');
+          break;
+        case 'lipb':
+          payloadRef[key] = userId.lipbid;
+          break;
+        case 'parrableId':
+          payloadRef[key] = userId.eid;
+          break;
+        case 'id5id':
+          payloadRef[key] = userId.uid;
+          break;
+        default:
+          payloadRef[key] = userId;
+      }
+    }
+  });
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  const topWindowUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+  const requests = [];
+  validBidRequests.forEach(validBidRequest => {
+    const sizes = parseSizesInput(validBidRequest.sizes);
+    const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest);
+    requests.push(request);
+  });
+  return requests;
+}
+
+function interpretResponse(serverResponse, request) {
+  if (!serverResponse || !serverResponse.body) {
+    return [];
+  }
+  const { bidId } = request.data;
+  const { results } = serverResponse.body;
+
+  let output = [];
+
+  try {
+    results.forEach(result => {
+      const { creativeId, ad, price, exp, width, height, currency, advertiserDomains, mediaType = BANNER } = result;
+      if (!ad || !price) {
+        return;
+      }
+
+      const response = {
+        requestId: bidId,
+        cpm: price,
+        width: width,
+        height: height,
+        creativeId: creativeId,
+        currency: currency || CURRENCY,
+        netRevenue: true,
+        ttl: exp || TTL_SECONDS,
+        meta: {
+          advertiserDomains: advertiserDomains || []
+        }
+      };
+
+      if (mediaType === BANNER) {
+        Object.assign(response, {
+          ad: ad,
+        });
+      } else {
+        Object.assign(response, {
+          vastXml: ad,
+          mediaType: VIDEO
+        });
+      }
+      output.push(response);
+    });
+    return output;
+  } catch (e) {
+    return [];
+  }
+}
+
+function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '') {
+  let syncs = [];
+  const { iframeEnabled, pixelEnabled } = syncOptions;
+  const { gdprApplies, consentString = '' } = gdprConsent;
+
+  const cidArr = responses.filter(resp => deepAccess(resp, 'body.cid')).map(resp => resp.body.cid).filter(uniques);
+  const params = `?cid=${encodeURIComponent(cidArr.join(','))}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`
+  if (iframeEnabled) {
+    syncs.push({
+      type: 'iframe',
+      url: `https://sync.kueezrtb.com/api/sync/iframe/${params}`
+    });
+  }
+  if (pixelEnabled) {
+    syncs.push({
+      type: 'image',
+      url: `https://sync.kueezrtb.com/api/sync/image/${params}`
+    });
+  }
+  return syncs;
+}
+
+export function hashCode(s, prefix = '_') {
+  const l = s.length;
+  let h = 0
+  let i = 0;
+  if (l > 0) {
+    while (i < l) { h = (h << 5) - h + s.charCodeAt(i++) | 0; }
+  }
+  return prefix + h;
+}
+
+export function getUniqueDealId(key, expiry = UNIQUE_DEAL_ID_EXPIRY) {
+  const storageKey = `u_${key}`;
+  const now = Date.now();
+  const data = getStorageItem(storageKey);
+  let uniqueId;
+
+  if (!data || !data.value || now - data.created > expiry) {
+    uniqueId = `${key}_${now.toString()}`;
+    setStorageItem(storageKey, uniqueId);
+  } else {
+    uniqueId = data.value;
+  }
+
+  return uniqueId;
+}
+
+export function getStorageItem(key) {
+  try {
+    return tryParseJSON(storage.getDataFromLocalStorage(key));
+  } catch (e) { }
+
+  return null;
+}
+
+export function setStorageItem(key, value, timestamp) {
+  try {
+    const created = timestamp || Date.now();
+    const data = JSON.stringify({ value, created });
+    storage.setDataInLocalStorage(key, data);
+  } catch (e) { }
+}
+
+export function tryParseJSON(value) {
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return value;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs
+};
+
+registerBidder(spec);
diff --git a/modules/kueezRtbBidAdapter.md b/modules/kueezRtbBidAdapter.md
new file mode 100644
index 00000000000..52d11aa362a
--- /dev/null
+++ b/modules/kueezRtbBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+**Module Name:** Kueez RTB Bidder Adapter
+
+**Module Type:** Bidder Adapter
+
+**Maintainer:** rtb@kueez.com
+
+# Description
+
+Module that connects to Kueez's demand sources.
+ 
+# Test Parameters
+```js
+var adUnits = [
+  {
+    code: 'test-ad',
+    sizes: [[300, 250]],
+    bids: [
+      {
+        bidder: 'kueezrtb',
+        params: {
+          cId: '562524b21b1c1f08117fc7f9',
+          pId: '59ac17c192832d0011283fe3',
+          bidFloor: 0.0001,
+          ext: {
+            param1: 'loremipsum',
+            param2: 'dolorsitamet'
+          }
+        }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/kummaBidAdapter.md b/modules/kummaBidAdapter.md
deleted file mode 100644
index 639e0c97d08..00000000000
--- a/modules/kummaBidAdapter.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Overview
-
-**Module Name**: Kumma Bidder Adapter  
-**Module Type**: Bidder Adapter  
-**Maintainer**: yehonatan@kumma.com  
-
-# Description
-
-Connects to Kumma demand source to fetch bids.  
-Banner, Native, Video formats are supported.  
-Please use ```kumma``` as the bidder code.
-
-# Test Parameters
-```
-  var adUnits = [{
-          code: 'dfp-native-div',
-          mediaType: 'native',
-          mediaTypes: {
-              native: {
-                  title: {
-                      required: true,
-                      len: 75
-                  },
-                  image: {
-                      required: true
-                  },
-                  body: {
-                      len: 200
-                  },
-                  icon: {
-                      required: false
-                  }
-              }
-          },
-          bids: [{
-              bidder: 'kumma',
-              params: {
-                  pubId: '29521',
-                  siteId: '26047',
-                  placementId: '123',
-                  bidFloor: '0.001', // optional
-                  ifa: 'XXX-XXX', // optional
-                  latitude: '40.712775', // optional
-                  longitude: '-74.005973', // optional
-              }
-          }]
-      },
-      {
-          code: 'dfp-banner-div',
-          mediaTypes: {
-              banner: {
-                  sizes: [
-                      [300, 250]
-                  ],
-              }
-          },
-          bids: [{
-              bidder: 'kumma',
-              params: {
-                  pubId: '29521',
-                  siteId: '26049',
-                  placementId: '123',
-              }
-          }]
-      },
-      {
-          code: 'dfp-video-div',
-          sizes: [640, 480],
-          mediaTypes: {
-              video: {
-                  context: "instream"
-              }
-          },
-          bids: [{
-              bidder: 'kumma',
-              params: {
-                  pubId: '29521',
-                  siteId: '26049',
-                  placementId: '123',
-                  video: {
-                      skipppable: true,
-                  }
-              }
-          }]
-      }
-  ];
-```
diff --git a/modules/lassoBidAdapter.js b/modules/lassoBidAdapter.js
new file mode 100644
index 00000000000..ad25cbe1e85
--- /dev/null
+++ b/modules/lassoBidAdapter.js
@@ -0,0 +1,137 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'lasso';
+const ENDPOINT_URL = 'https://trc.lhmos.com/prebid';
+const GET_IUD_URL = 'https://secure.adnxs.com/getuid?';
+const COOKIE_NAME = 'aim-xr';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+export const spec = {
+  code: BIDDER_CODE,
+  isBidRequestValid: function(bid) {
+    return !!(bid.params && bid.params.adUnitId);
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    if (validBidRequests.length === 0) {
+      return [];
+    }
+
+    let aimXR = '';
+    if (storage.cookiesAreEnabled) {
+      aimXR = storage.getCookie(COOKIE_NAME, undefined);
+    }
+
+    return validBidRequests.map(bidRequest => {
+      let sizes = []
+      if (bidRequest.mediaTypes && bidRequest.mediaTypes[BANNER] && bidRequest.mediaTypes[BANNER].sizes) {
+        sizes = bidRequest.mediaTypes[BANNER].sizes;
+      }
+
+      const payload = {
+        auctionStart: bidderRequest.auctionStart,
+        url: encodeURIComponent(window.location.href),
+        bidderRequestId: bidRequest.bidderRequestId,
+        adUnitCode: bidRequest.adUnitCode,
+        auctionId: bidRequest.auctionId,
+        bidId: bidRequest.bidId,
+        transactionId: bidRequest.transactionId,
+        device: encodeURIComponent(JSON.stringify(getDeviceData())),
+        sizes,
+        aimXR,
+        uid: '$UID',
+        params: JSON.stringify(bidRequest.params),
+        crumbs: JSON.stringify(bidRequest.crumbs),
+        prebidVersion: '$prebid.version$',
+        version: 3,
+        coppa: config.getConfig('coppa') == true ? 1 : 0,
+        ccpa: bidderRequest.uspConsent || undefined
+      }
+
+      return {
+        method: 'GET',
+        url: getBidRequestUrl(aimXR, bidRequest.params),
+        data: payload,
+        options: {
+          withCredentials: true
+        },
+      };
+    });
+  },
+
+  interpretResponse: function(serverResponse) {
+    const response = serverResponse && serverResponse.body;
+    const bidResponses = [];
+
+    if (!response || !response.bid.ad) {
+      return bidResponses;
+    }
+
+    const bidResponse = {
+      requestId: response.bidid,
+      cpm: response.bid.price,
+      currency: response.cur,
+      width: response.bid.w,
+      height: response.bid.h,
+      creativeId: response.bid.crid,
+      netRevenue: response.netRevenue,
+      ttl: response.ttl,
+      ad: response.bid.ad,
+      mediaType: response.bid.mediaType,
+      meta: {
+        secondaryCatIds: response.bid.cat,
+        advertiserDomains: response.bid.advertiserDomains,
+        advertiserName: response.meta.advertiserName,
+        mediaType: response.bid.mediaType
+      }
+    };
+    bidResponses.push(bidResponse);
+    return bidResponses;
+  },
+
+  onTimeout: function(timeoutData) {
+    if (timeoutData === null) {
+      return;
+    }
+    ajax(ENDPOINT_URL + '/timeout', null, JSON.stringify(timeoutData), {
+      method: 'POST',
+      withCredentials: false
+    });
+  },
+
+  onBidWon: function(bid) {
+    ajax(ENDPOINT_URL + '/won', null, JSON.stringify(bid), {
+      method: 'POST',
+      withCredentials: false
+    });
+  },
+
+  supportedMediaTypes: [BANNER]
+}
+
+function getBidRequestUrl(aimXR, params) {
+  let path = '/request';
+  if (params && params.dtc) {
+    path = '/dtc-request';
+  }
+  if (!aimXR) {
+    return GET_IUD_URL + ENDPOINT_URL + path;
+  }
+  return ENDPOINT_URL + path;
+}
+
+function getDeviceData() {
+  const win = window.top;
+  return {
+    ua: navigator.userAgent,
+    width: win.innerWidth || win.document.documentElement.clientWidth || win.document.body.clientWidth,
+    height: win.innerHeight || win.document.documentElement.clientHeight || win.document.body.clientHeight,
+    browserLanguage: navigator.language,
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/lassoBidAdapter.md b/modules/lassoBidAdapter.md
new file mode 100644
index 00000000000..43927fe890c
--- /dev/null
+++ b/modules/lassoBidAdapter.md
@@ -0,0 +1,29 @@
+# Overview
+
+**Module Name**: Lasso Bidder Adapter  
+**Module Type**: Bidder Adapter  
+**Maintainer**: headerbidding@lassomarketing.io
+
+# Description
+
+Connects to Lasso demand source to fetch bids.
+Only banner format supported.
+
+# Test Parameters
+
+```
+var adUnits = [{
+   code: 'banner-ad-unit',
+   mediaTypes: {
+      banner: {
+          sizes: [[300, 250]],
+      }
+   },
+   bids: [{
+     bidder: 'lasso',
+     params: {
+       adUnitId: '0'
+     }
+   }]
+}];
+```
diff --git a/modules/lemmaBidAdapter.js b/modules/lemmaBidAdapter.js
deleted file mode 100644
index 1ad660e5916..00000000000
--- a/modules/lemmaBidAdapter.js
+++ /dev/null
@@ -1,401 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-
-var BIDDER_CODE = 'lemma';
-var LOG_WARN_PREFIX = 'LEMMA: ';
-var ENDPOINT = 'https://ads.lemmatechnologies.com/lemma/servad';
-var DEFAULT_CURRENCY = 'USD';
-var AUCTION_TYPE = 2;
-var DEFAULT_TMAX = 300;
-var DEFAULT_NET_REVENUE = false;
-
-export var spec = {
-
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
-
-  isBidRequestValid: bid => {
-    if (bid && bid.params) {
-      if (!utils.isNumber(bid.params.pubId)) {
-        utils.logWarn(LOG_WARN_PREFIX + 'Error: publisherId is mandatory and cannot be string. Call to OpenBid will not be sent for ad unit: ' + JSON.stringify(bid));
-        return false;
-      }
-      if (!bid.params.adunitId) {
-        utils.logWarn(LOG_WARN_PREFIX + 'Error: adUnitId is mandatory. Call to OpenBid will not be sent for ad unit: ' + JSON.stringify(bid));
-        return false;
-      }
-      // video ad validation
-      if (bid.params.hasOwnProperty('video')) {
-        if (!bid.params.video.hasOwnProperty('mimes') || !utils.isArray(bid.params.video.mimes) || bid.params.video.mimes.length === 0) {
-          utils.logWarn(LOG_WARN_PREFIX + 'Error: For video ads, mimes is mandatory and must specify atlease 1 mime value. Call to OpenBid will not be sent for ad unit:' + JSON.stringify(bid));
-          return false;
-        }
-      }
-      return true;
-    }
-    return false;
-  },
-  buildRequests: (bidRequests, bidderRequest) => {
-    var refererInfo;
-    if (bidderRequest && bidderRequest.refererInfo) {
-      refererInfo = bidderRequest.refererInfo;
-    }
-    var conf = _initConf(refererInfo);
-    const request = oRTBTemplate(bidRequests, conf);
-    if (request.imp.length == 0) {
-      return;
-    }
-    setOtherParams(bidderRequest, request);
-    const endPoint = endPointURL(bidRequests);
-    return {
-      method: 'POST',
-      url: endPoint,
-      data: JSON.stringify(request),
-    };
-  },
-  interpretResponse: (response, request) => {
-    return parseRTBResponse(request, response.body);
-  },
-};
-
-function _initConf(refererInfo) {
-  var conf = {};
-  conf.pageURL = (refererInfo && refererInfo.referer) ? refererInfo.referer : window.location.href;
-  if (refererInfo && refererInfo.referer) {
-    conf.refURL = refererInfo.referer;
-  } else {
-    conf.refURL = '';
-  }
-  return conf;
-}
-
-function parseRTBResponse(request, response) {
-  var bidResponses = [];
-  try {
-    if (response.seatbid) {
-      var currency = response.curr || DEFAULT_CURRENCY;
-      var seatbid = response.seatbid;
-      seatbid.forEach(seatbidder => {
-        var bidder = seatbidder.bid;
-        bidder.forEach(bid => {
-          var req = parse(request.data);
-          var newBid = {
-            requestId: bid.impid,
-            cpm: parseFloat(bid.price).toFixed(2),
-            width: bid.w,
-            height: bid.h,
-            creativeId: bid.crid,
-            currency: currency,
-            netRevenue: DEFAULT_NET_REVENUE,
-            ttl: 300,
-            referrer: req.site.ref,
-            ad: bid.adm
-          };
-          if (bid.dealid) {
-            newBid.dealId = bid.dealid;
-          }
-          if (req.imp && req.imp.length > 0) {
-            newBid.mediaType = req.mediaType;
-            req.imp.forEach(robj => {
-              if (bid.impid === robj.id) {
-                switch (newBid.mediaType) {
-                  case BANNER:
-                    break;
-                  case VIDEO:
-                    newBid.width = bid.hasOwnProperty('w') ? bid.w : robj.video.w;
-                    newBid.height = bid.hasOwnProperty('h') ? bid.h : robj.video.h;
-                    newBid.vastXml = bid.adm;
-                    break;
-                }
-              }
-            });
-          }
-          bidResponses.push(newBid);
-        });
-      });
-    }
-  } catch (error) {
-    utils.logError(LOG_WARN_PREFIX, 'ERROR ', error);
-  }
-  return bidResponses;
-}
-
-function oRTBTemplate(bidRequests, conf) {
-  try {
-    var oRTBObject = {
-      id: '' + new Date().getTime(),
-      at: AUCTION_TYPE,
-      tmax: DEFAULT_TMAX,
-      cur: [DEFAULT_CURRENCY],
-      imp: _getImpressionArray(bidRequests),
-      user: {},
-      ext: {}
-    };
-    var bid = bidRequests[0];
-    var app = _getAppObject(bid);
-    var site = _getSiteObject(bid, conf);
-    var device = _getDeviceObject(bid);
-    if (app) {
-      oRTBObject.app = app;
-    }
-    if (site) {
-      oRTBObject.site = site;
-    }
-    if (device) {
-      oRTBObject.device = device;
-    }
-    return oRTBObject;
-  } catch (ex) {
-    utils.logError(LOG_WARN_PREFIX, 'ERROR ', ex);
-  }
-}
-
-function _getImpressionArray(request) {
-  var impArray = [];
-  var map = request.map(bid => _getImpressionObject(bid));
-  if (map) {
-    map.forEach(o => {
-      if (o) {
-        impArray.push(o);
-      }
-    });
-  }
-  return impArray;
-}
-
-function endPointURL(request) {
-  var params = request && request[0].params ? request[0].params : null;
-  if (params) {
-    var pubId = params.pubId ? params.pubId : 0;
-    var adunitId = params.adunitId ? params.adunitId : 0;
-    return ENDPOINT + '?pid=' + pubId + '&aid=' + adunitId;
-  }
-  return null;
-}
-
-function _getDomain(url) {
-  var a = document.createElement('a');
-  a.setAttribute('href', url);
-  return a.hostname;
-}
-
-function _getSiteObject(request, conf) {
-  var params = request && request.params ? request.params : null;
-  if (params) {
-    var pubId = params.pubId ? params.pubId : '0';
-    var siteId = params.siteId ? params.siteId : '0';
-    var appParams = params.app;
-    if (!appParams) {
-      return {
-        publisher: {
-          id: pubId.toString()
-        },
-        domain: _getDomain(conf.pageURL),
-        id: siteId.toString(),
-        ref: conf.refURL,
-        page: conf.pageURL
-      };
-    }
-  }
-  return null;
-}
-
-function _getAppObject(request) {
-  var params = request && request.params ? request.params : null;
-  if (params) {
-    var pubId = params.pubId ? params.pubId : 0;
-    var appParams = params.app;
-    if (appParams) {
-      return {
-        publisher: {
-          id: pubId.toString(),
-        },
-        id: appParams.id,
-        name: appParams.name,
-        bundle: appParams.bundle,
-        storeurl: appParams.storeUrl,
-        domain: appParams.domain,
-        cat: appParams.categories,
-        pagecat: appParams.page_category
-      };
-    }
-  }
-  return null;
-}
-
-function _getDeviceObject(request) {
-  var params = request && request.params ? request.params : null;
-  if (params) {
-    return {
-      dnt: utils.getDNT() ? 1 : 0,
-      ua: navigator.userAgent,
-      language: (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage),
-      w: (window.screen.width || window.innerWidth),
-      h: (window.screen.height || window.innerHeigh),
-      geo: {
-        country: params.country,
-        lat: params.latitude,
-        lon: params.longitude,
-        region: params.region,
-        city: params.city,
-        zip: params.zip
-      },
-      ip: params.ip,
-      devicetype: params.device_type,
-      ifa: params.ifa,
-    };
-  }
-  return null;
-}
-
-function setOtherParams(request, ortbRequest) {
-  var params = request && request.params ? request.params : null;
-  if (request && request.gdprConsent) {
-    ortbRequest.regs = { ext: { gdpr: request.gdprConsent.gdprApplies ? 1 : 0 } };
-    ortbRequest.user = { ext: { consent: request.gdprConsent.consentString } };
-  }
-  if (params) {
-    ortbRequest.tmax = params.tmax;
-    ortbRequest.bcat = params.bcat;
-  }
-}
-
-function _getSizes(request) {
-  if (request.sizes && utils.isArray(request.sizes[0]) && request.sizes[0].length > 0) {
-    return request.sizes[0];
-  }
-  return null;
-}
-
-function _getBannerRequest(bid) {
-  var bObj;
-  var adFormat = [];
-  if (bid.mediaType === 'banner' || utils.deepAccess(bid, 'mediaTypes.banner')) {
-    var params = bid ? bid.params : null;
-    var bannerData = params.banner;
-    var sizes = _getSizes(bid) || [];
-    if (sizes && sizes.length == 0) {
-      sizes = bid.mediaTypes.banner.sizes[0];
-    }
-    if (sizes && sizes.length > 0) {
-      bObj = {};
-      bObj.w = sizes[0];
-      bObj.h = sizes[1];
-      bObj.pos = 0;
-      if (bannerData) {
-        bObj = utils.deepClone(bannerData);
-      }
-      sizes = bid.mediaTypes.banner.sizes;
-      if (sizes.length > 0) {
-        adFormat = [];
-        sizes.forEach(function(size) {
-          if (size.length > 1) {
-            adFormat.push({ w: size[0], h: size[1] });
-          }
-        });
-        if (adFormat.length > 0) {
-          bObj.format = adFormat;
-        }
-      }
-    } else {
-      utils.logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.sizes missing for adunit: ' + bid.params.adunitId);
-    }
-  }
-  return bObj;
-}
-
-function _getVideoRequest(bid) {
-  var vObj;
-  if (bid.mediaType === 'video' || utils.deepAccess(bid, 'mediaTypes.video')) {
-    var params = bid ? bid.params : null;
-    var sizes = _getSizes(bid) || [];
-    if (sizes && sizes.length == 0) {
-      sizes = bid.mediaTypes && bid.mediaTypes.video ? bid.mediaTypes.video.playerSize : [];
-    }
-    if (sizes && sizes.length > 0) {
-      var videoData = params.video;
-      vObj = {};
-      if (videoData) {
-        vObj = utils.deepClone(videoData);
-      }
-      vObj.w = sizes[0];
-      vObj.h = sizes[1];
-    } else {
-      utils.logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.video.sizes missing for adunit: ' + bid.params.adunitId);
-    }
-  }
-  return vObj;
-}
-
-function _getImpressionObject(bid) {
-  var impression = {};
-  var bObj;
-  var vObj;
-  var sizes = bid.hasOwnProperty('sizes') ? bid.sizes : [];
-  var mediaTypes = '';
-  var format = [];
-  var params = bid && bid.params ? bid.params : null;
-  impression = {
-    id: bid.bidId,
-    tagid: params.adunitId ? params.adunitId.toString() : undefined,
-    secure: window.location.protocol === 'https:' ? 1 : 0,
-    bidfloorcur: params.currency ? params.currency : DEFAULT_CURRENCY
-  };
-
-  if (params.bidFloor) {
-    impression.bidfloor = params.bidFloor;
-  }
-
-  if (bid.hasOwnProperty('mediaTypes')) {
-    for (mediaTypes in bid.mediaTypes) {
-      switch (mediaTypes) {
-        case BANNER:
-          bObj = _getBannerRequest(bid);
-          if (bObj) {
-            impression.banner = bObj;
-          }
-          break;
-        case VIDEO:
-          vObj = _getVideoRequest(bid);
-          if (vObj) {
-            impression.video = vObj;
-          }
-          break;
-      }
-    }
-  } else {
-    bObj = {
-      pos: 0,
-      w: sizes && sizes[0] ? sizes[0][0] : 0,
-      h: sizes && sizes[0] ? sizes[0][1] : 0,
-    };
-    if (utils.isArray(sizes) && sizes.length > 1) {
-      sizes = sizes.splice(1, sizes.length - 1);
-      sizes.forEach(size => {
-        format.push({
-          w: size[0],
-          h: size[1]
-        });
-      });
-      bObj.format = format;
-    }
-    impression.banner = bObj;
-  }
-
-  return impression.hasOwnProperty(BANNER) ||
-        impression.hasOwnProperty(VIDEO) ? impression : undefined;
-}
-
-function parse(rawResp) {
-  try {
-    if (rawResp) {
-      return JSON.parse(rawResp);
-    }
-  } catch (ex) {
-    utils.logError(LOG_WARN_PREFIX, 'ERROR', ex);
-  }
-  return null;
-}
-
-registerBidder(spec);
diff --git a/modules/lemmaBidAdapter.md b/modules/lemmaBidAdapter.md
deleted file mode 100644
index 29e72e028b9..00000000000
--- a/modules/lemmaBidAdapter.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Overview
-
-```
-Module Name:  Lemma Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer: lemmadev@lemmatechnologies.com
-```
-
-# Description
-
-Connects to Lemma exchange for bids.
-Lemma bid adapter supports Video, Banner formats.
-
-# Sample Banner Ad Unit: For Publishers
-```
-var adUnits = [{
-  code: 'div-lemma-ad-1',
-  mediaTypes: {
-    banner: {
-      sizes: [[300, 250], [300, 600]],  // required
-    }
-  },
-  // Replace this object to test a new Adapter!
-  bids: [{
-    bidder: 'lemma',
-    params: {
-      pubId: 1, // required
-      adunitId: '3768', // required
-      latitude: 37.3230,
-      longitude: -122.0322,
-      device_type: 2,
-      banner: {
-        w: 300,
-        h: 250
-      }
-    }
-  }]
-}];
-```
-
-# Sample Video Ad Unit: For Publishers
-```
-var adUnits = [{
-  mediaType: 'video',
-  mediaTypes: {
-    video: {
-      playerSize: [640, 480], // required
-      context: 'instream'
-    }
-  },
-  // Replace this object to test a new Adapter!
-  bids: [{
-    bidder: 'lemma',
-    params: {
-      pubId: 1, // required
-      adunitId: '3769', // required
-      latitude: 37.3230,
-      longitude: -122.0322,
-      device_type: 4,
-      video: {
-        mimes: ['video/mp4','video/x-flv'],   // required
-      }
-    }
-  }]
-}];
-```
diff --git a/modules/lifestreetBidAdapter.js b/modules/lifestreetBidAdapter.js
index 4317eb8b82e..6a8b783ce21 100644
--- a/modules/lifestreetBidAdapter.js
+++ b/modules/lifestreetBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { isInteger } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
@@ -22,7 +22,7 @@ function template(strings, ...keys) {
     let dict = values[values.length - 1] || {};
     let result = [strings[0]];
     keys.forEach(function(key, i) {
-      let value = utils.isInteger(key) ? values[key] : dict[key];
+      let value = isInteger(key) ? values[key] : dict[key];
       result.push(value, strings[i + 1]);
     });
     return result.join('');
@@ -76,7 +76,7 @@ function formatBidRequest(bid, bidderRequest = {}) {
 
 function isResponseValid(response) {
   return !/^\s*\{\s*"advertisementAvailable"\s*:\s*false/i.test(response.content) &&
-    response.content.indexOf('<VAST version="2.0"></VAST>') === -1 && (typeof response.cpm !== 'undefined') &&
+    response.content.indexOf('<VAST version="2.0"></VAST>') === -1 && /* (typeof response.cpm !== 'undefined') && */
     response.status === 1;
 }
 
@@ -99,36 +99,40 @@ export const spec = {
   interpretResponse: (serverResponse, bidRequest) => {
     const bidResponses = [];
     let response = serverResponse.body;
-
     if (!isResponseValid(response)) {
       return bidResponses;
     }
 
+    const isVideo = response.content_type.indexOf('vast') > -1;
+    const mediaType = isVideo ? VIDEO : BANNER;
+
     const bidResponse = {
       requestId: bidRequest.bidId,
       cpm: response.cpm,
+      currency: response.currency ? response.currency : 'USD',
       width: response.width,
       height: response.height,
       creativeId: response.creativeId,
-      currency: response.currency ? response.currency : 'USD',
       netRevenue: response.netRevenue ? response.netRevenue : true,
-      ttl: response.ttl ? response.ttl : 86400
+      ttl: response.ttl ? response.ttl : 86400,
+      mediaType,
+      meta: {
+        mediaType,
+        advertiserDomains: response.advertiserDomains
+      }
     };
 
     if (response.hasOwnProperty('dealId')) {
       bidResponse.dealId = response.dealId;
     }
-    if (response.content_type.indexOf('vast') > -1) {
+    if (isVideo) {
       if (typeof response.vastUrl !== 'undefined') {
         bidResponse.vastUrl = response.vastUrl;
       } else {
         bidResponse.vastXml = response.content;
       }
-
-      bidResponse.mediaType = VIDEO;
     } else {
       bidResponse.ad = response.content;
-      bidResponse.mediaType = BANNER;
     }
 
     bidResponses.push(bidResponse);
diff --git a/modules/lifestreetBidAdapter.md b/modules/lifestreetBidAdapter.md
deleted file mode 100644
index a874792d84c..00000000000
--- a/modules/lifestreetBidAdapter.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Overview
-
-```
-Module Name: Lifestreet Bid Adapter
-Module Type: Lifestreet Adapter
-Maintainer: hb.tech@lifestreet.com
-```
-
-# Description
-
-Module that connects to Lifestreet's demand sources
-
-Values, listed in `ALL_BANNER_SIZES` and `ALL_VIDEO_SIZES` are all the values which our server supports.
-For `ad_size`, please use one of that values in following format: `ad_size: WIDTHxHEIGHT`
-
-# Test Parameters
-```javascript
-    const ALL_BANNER_SIZES = [
-      [120, 600], [160, 600], [300, 250], [300, 600], [320, 480],
-      [320, 50], [468, 60], [510, 510], [600, 300],
-      [720, 300], [728, 90], [760, 740], [768, 1024] 
-    ];
-
-    const ALL_VIDEO_SIZES = [
-      [640, 480], [650, 520], [970, 580]
-    ]
-```
-
-# Test Parameters (Banner)
-```
-    const adUnits = [
-        {
-            code: 'test-ad',
-            mediaTypes: {
-                banner: {
-                    sizes: [[160, 600]],
-                }
-            },
-            bids: [
-                {
-                    bidder: 'lifestreet',
-                    params: {
-                        slot: 'slot166704',
-                        adkey: '78c',
-                        ad_size: '160x600'
-                    }
-                }
-            ]
-        },
-    ];
-```
-
-# Test Parameters (Video)
-```
-    const adUnits = [
-        {
-            code: 'test-video-ad',
-            mediaTypes: {
-                video: {
-                    playerSize: [[640, 480]],
-                    context: 'instream'
-                }
-            },
-            bids: [
-                {
-                    bidder: 'lifestreet',
-                    params: {
-                        slot: 'slot1227631',
-                        adkey: 'a98',
-                        ad_size: '640x480'
-                    }
-                }
-            ]
-        }
-    ];
-```
diff --git a/modules/limelightDigitalBidAdapter.js b/modules/limelightDigitalBidAdapter.js
new file mode 100644
index 00000000000..87cf6e4fe21
--- /dev/null
+++ b/modules/limelightDigitalBidAdapter.js
@@ -0,0 +1,164 @@
+import { logMessage, groupBy, flatten, uniques } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { ajax } from '../src/ajax.js';
+
+const BIDDER_CODE = 'limelightDigital';
+
+/**
+ * Determines whether or not the given bid response is valid.
+ *
+ * @param {object} bid The bid to validate.
+ * @return boolean True if this is a valid bid, and false otherwise.
+ */
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency || !bid.meta.advertiserDomains) {
+    return false;
+  }
+  switch (bid.meta.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastXml || bid.vastUrl);
+  }
+  return false;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['pll', 'iionads'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && bid.params.host && bid.params.adUnitType &&
+      (bid.params.adUnitId || bid.params.adUnitId === 0));
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: (validBidRequests, bidderRequest) => {
+    let winTop;
+    try {
+      winTop = window.top;
+      winTop.location.toString();
+    } catch (e) {
+      logMessage(e);
+      winTop = window;
+    }
+    const placements = groupBy(validBidRequests.map(bidRequest => buildPlacement(bidRequest)), 'host')
+    return Object.keys(placements)
+      .map(host => buildRequest(winTop, host, placements[host].map(placement => placement.adUnit)));
+  },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
+  onBidWon: (bid) => {
+    const cpm = bid.pbMg;
+    if (bid.nurl !== '') {
+      bid.nurl = bid.nurl.replace(
+        /\$\{AUCTION_PRICE\}/,
+        cpm
+      );
+      ajax(bid.nurl, null);
+    }
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (serverResponse, bidRequest) => {
+    const bidResponses = [];
+    const serverBody = serverResponse.body;
+    const len = serverBody.length;
+    for (let i = 0; i < len; i++) {
+      const bidResponse = serverBody[i];
+      if (isBidResponseValid(bidResponse)) {
+        bidResponses.push(bidResponse);
+      }
+    }
+    return bidResponses;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    const iframeSyncs = [];
+    const imageSyncs = [];
+    for (let i = 0; i < serverResponses.length; i++) {
+      const serverResponseHeaders = serverResponses[i].headers;
+      const imgSync = (serverResponseHeaders != null && syncOptions.pixelEnabled) ? serverResponseHeaders.get('X-PLL-UserSync-Image') : null
+      const iframeSync = (serverResponseHeaders != null && syncOptions.iframeEnabled) ? serverResponseHeaders.get('X-PLL-UserSync-Iframe') : null
+      if (iframeSync != null) {
+        iframeSyncs.push(iframeSync)
+      } else if (imgSync != null) {
+        imageSyncs.push(imgSync)
+      }
+    }
+    return [iframeSyncs.filter(uniques).map(it => { return { type: 'iframe', url: it } }),
+      imageSyncs.filter(uniques).map(it => { return { type: 'image', url: it } })].reduce(flatten, []).filter(uniques);
+  }
+};
+
+registerBidder(spec);
+
+function buildRequest(winTop, host, adUnits) {
+  return {
+    method: 'POST',
+    url: `https://${host}/hb`,
+    data: {
+      secure: (location.protocol === 'https:'),
+      deviceWidth: winTop.screen.width,
+      deviceHeight: winTop.screen.height,
+      adUnits: adUnits
+    }
+  }
+}
+
+function buildPlacement(bidRequest) {
+  let sizes;
+  if (bidRequest.mediaTypes) {
+    switch (bidRequest.params.adUnitType) {
+      case BANNER:
+        if (bidRequest.mediaTypes.banner && bidRequest.mediaTypes.banner.sizes) {
+          sizes = bidRequest.mediaTypes.banner.sizes;
+        }
+        break;
+      case VIDEO:
+        if (bidRequest.mediaTypes.video && bidRequest.mediaTypes.video.playerSize) {
+          sizes = [bidRequest.mediaTypes.video.playerSize];
+        }
+        break;
+    }
+  }
+  sizes = (sizes || []).concat(bidRequest.sizes || []);
+  return {
+    host: bidRequest.params.host,
+    adUnit: {
+      id: bidRequest.params.adUnitId,
+      bidId: bidRequest.bidId,
+      transactionId: bidRequest.transactionId,
+      sizes: sizes.map(size => {
+        return {
+          width: size[0],
+          height: size[1]
+        }
+      }),
+      type: bidRequest.params.adUnitType.toUpperCase(),
+      publisherId: bidRequest.params.publisherId,
+      userIdAsEids: bidRequest.userIdAsEids,
+      supplyChain: bidRequest.schain
+    }
+  }
+}
diff --git a/modules/limelightDigitalBidAdapter.md b/modules/limelightDigitalBidAdapter.md
new file mode 100644
index 00000000000..a4abb6f1411
--- /dev/null
+++ b/modules/limelightDigitalBidAdapter.md
@@ -0,0 +1,60 @@
+# Overview
+
+```
+Module Name: Limelight Digital Exchange Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: engineering@project-limelight.com
+```
+
+# Description
+
+Module that connects to Limelight Digital Exchange's demand sources
+
+# Test Parameters for banner
+```
+var adUnits = [{
+    code: 'placementCode',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250]]
+        }
+    },
+    bids: [{
+        bidder: 'limelightDigital',
+        params: {
+            host: 'exchange-9qao.ortb.net',
+            adUnitId: 0,
+            adUnitType: 'banner'
+        }
+    }]
+}];
+```
+
+# Test Parameters for video
+```
+var videoAdUnit = [{
+    code: 'video1',
+    sizes: [[300, 250]],
+    bids: [{
+        bidder: 'limelightDigital',
+        params: {
+            host: 'exchange-9qao.ortb.net',
+            adUnitId: 0,
+            adUnitType: 'video'
+        }
+    }]
+}];
+```
+
+# Configuration
+
+The Limelight Digital Exchange Bidder Adapter expects Prebid Cache(for video) to be enabled so that we can store and retrieve a single vastXml.
+
+```
+pbjs.setConfig({
+    usePrebidCache: true,
+    cache: {
+        url: 'https://prebid.adnxs.com/pbc/v1/cache'
+    }
+});
+```
diff --git a/modules/liveIntentAnalyticsAdapter.js b/modules/liveIntentAnalyticsAdapter.js
new file mode 100644
index 00000000000..ffe4f8f58b0
--- /dev/null
+++ b/modules/liveIntentAnalyticsAdapter.js
@@ -0,0 +1,148 @@
+import {ajax} from '../src/ajax.js';
+import { generateUUID, logInfo, logWarn } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+import { auctionManager } from '../src/auctionManager.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+
+const ANALYTICS_TYPE = 'endpoint';
+const URL = 'https://wba.liadm.com/analytic-events';
+const GVL_ID = 148;
+const ADAPTER_CODE = 'liveintent';
+const DEFAULT_SAMPLING = 0.1;
+const DEFAULT_BID_WON_TIMEOUT = 2000;
+const { EVENTS: { AUCTION_END } } = CONSTANTS;
+let initOptions = {};
+let isSampled;
+let bidWonTimeout;
+
+function handleAuctionEnd(args) {
+  setTimeout(() => {
+    const auction = auctionManager.index.getAuction(args.auctionId);
+    const winningBids = (auction) ? auction.getWinningBids() : [];
+    const data = createAnalyticsEvent(args, winningBids);
+    sendAnalyticsEvent(data);
+  }, bidWonTimeout);
+}
+
+function getAnalyticsEventBids(bidsReceived) {
+  return bidsReceived.map(bid => {
+    return {
+      adUnitCode: bid.adUnitCode,
+      timeToRespond: bid.timeToRespond,
+      cpm: bid.cpm,
+      currency: bid.currency,
+      ttl: bid.ttl,
+      bidder: bid.bidder
+    };
+  });
+}
+
+function getBannerSizes(banner) {
+  if (banner && banner.sizes) {
+    return banner.sizes.map(size => {
+      const [width, height] = size;
+      return {w: width, h: height};
+    });
+  } else return [];
+}
+
+function getUniqueBy(arr, key) {
+  return [...new Map(arr.map(item => [item[key], item])).values()]
+}
+
+function createAnalyticsEvent(args, winningBids) {
+  let payload = {
+    instanceId: generateUUID(),
+    url: getRefererInfo().page,
+    bidsReceived: getAnalyticsEventBids(args.bidsReceived),
+    auctionStart: args.timestamp,
+    auctionEnd: args.auctionEnd,
+    adUnits: [],
+    userIds: [],
+    bidders: []
+  }
+  let allUserIds = [];
+
+  if (args.adUnits) {
+    args.adUnits.forEach(unit => {
+      if (unit.mediaTypes && unit.mediaTypes.banner) {
+        payload['adUnits'].push({
+          code: unit.code,
+          mediaType: 'banner',
+          sizes: getBannerSizes(unit.mediaTypes.banner),
+          ortb2Imp: unit.ortb2Imp
+        });
+      }
+      if (unit.bids) {
+        let userIds = unit.bids.flatMap(getAnalyticsEventUserIds);
+        allUserIds.push(...userIds);
+        let bidders = unit.bids.map(({bidder, params}) => {
+          return { bidder, params }
+        });
+
+        payload['bidders'].push(...bidders);
+      }
+    })
+    let uniqueUserIds = getUniqueBy(allUserIds, 'source');
+    payload['userIds'] = uniqueUserIds;
+  }
+  payload['winningBids'] = getAnalyticsEventBids(winningBids);
+  payload['auctionId'] = args.auctionId;
+  return payload;
+}
+
+function getAnalyticsEventUserIds(bid) {
+  if (bid && bid.userIdAsEids) {
+    return bid.userIdAsEids.map(({source, uids, ext}) => {
+      let analyticsEventUserId = {source, uids, ext};
+      return ignoreUndefined(analyticsEventUserId)
+    });
+  } else { return []; }
+}
+
+function sendAnalyticsEvent(data) {
+  ajax(URL, {
+    success: function () {
+      logInfo('LiveIntent Prebid Analytics: send data success');
+    },
+    error: function (e) {
+      logWarn('LiveIntent Prebid Analytics: send data error' + e);
+    }
+  }, JSON.stringify(data), {
+    contentType: 'application/json',
+    method: 'POST'
+  })
+}
+
+function ignoreUndefined(data) {
+  const filteredData = Object.entries(data).filter(([key, value]) => value)
+  return Object.fromEntries(filteredData)
+}
+
+let liAnalytics = Object.assign(adapter({URL, ANALYTICS_TYPE}), {
+  track({ eventType, args }) {
+    if (eventType == AUCTION_END && args && isSampled) { handleAuctionEnd(args); }
+  }
+});
+
+// save the base class function
+liAnalytics.originEnableAnalytics = liAnalytics.enableAnalytics;
+
+// override enableAnalytics so we can get access to the config passed in from the page
+liAnalytics.enableAnalytics = function (config) {
+  initOptions = config.options;
+  const sampling = (initOptions && initOptions.sampling) ?? DEFAULT_SAMPLING;
+  isSampled = Math.random() < parseFloat(sampling);
+  bidWonTimeout = (initOptions && initOptions.bidWonTimeout) ?? DEFAULT_BID_WON_TIMEOUT;
+  liAnalytics.originEnableAnalytics(config); // call the base class function
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: liAnalytics,
+  code: ADAPTER_CODE,
+  gvlid: GVL_ID
+});
+
+export default liAnalytics;
diff --git a/modules/liveIntentAnalyticsAdapter.md b/modules/liveIntentAnalyticsAdapter.md
new file mode 100644
index 00000000000..15f51006134
--- /dev/null
+++ b/modules/liveIntentAnalyticsAdapter.md
@@ -0,0 +1,22 @@
+# Overview
+Module Name: LiveIntent Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: product@liveintent.com
+
+# Description
+
+Analytics adapter for [LiveIntent](https://www.liveintent.com/). Contact product@liveintent.com for information.
+
+# Test Parameters
+
+```
+{
+  provider: 'liveintent',
+  options: {
+     bidWonTimeout: 2000,
+     sampling: 0.5 // the tracked event percentage, a number between 0 to 1
+  }
+}
+```
diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js
index bd2638e5936..de70b0eaccd 100644
--- a/modules/liveIntentIdSystem.js
+++ b/modules/liveIntentIdSystem.js
@@ -4,15 +4,33 @@
  * @module modules/liveIntentIdSystem
  * @requires module:modules/userId
  */
-import * as utils from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
+import { triggerPixel, logError } from '../src/utils.js';
+import { ajaxBuilder } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
-import { LiveConnect } from 'live-connect-js/cjs/live-connect.js';
-import { uspDataHandler } from '../src/adapterManager.js';
+import { LiveConnect } from 'live-connect-js/esm/initializer.js';
+import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const MODULE_NAME = 'liveIntentId';
-export const storage = getStorageManager(null, MODULE_NAME);
+export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME});
+const defaultRequestedAttributes = {'nonId': true}
+const calls = {
+  ajaxGet: (url, onSuccess, onError, timeout) => {
+    ajaxBuilder(timeout)(
+      url,
+      {
+        success: onSuccess,
+        error: onError
+      },
+      undefined,
+      {
+        method: 'GET',
+        withCredentials: true
+      }
+    )
+  },
+  pixelGet: (url, onload) => triggerPixel(url, onload)
+}
 
 let eventFired = false;
 let liveConnect = null;
@@ -24,29 +42,38 @@ export function reset() {
   if (window && window.liQ) {
     window.liQ = [];
   }
+  liveIntentIdSubmodule.setModuleMode(null)
   eventFired = false;
   liveConnect = null;
 }
 
 function parseLiveIntentCollectorConfig(collectConfig) {
   const config = {};
-  if (collectConfig) {
-    if (collectConfig.appId) {
-      config.appId = collectConfig.appId;
-    }
-    if (collectConfig.fpiStorageStrategy) {
-      config.storageStrategy = collectConfig.fpiStorageStrategy;
-    }
-    if (collectConfig.fpiExpirationDays) {
-      config.expirationDays = collectConfig.fpiExpirationDays;
-    }
-    if (collectConfig.collectorUrl) {
-      config.collectorUrl = collectConfig.collectorUrl;
-    }
-  }
+  collectConfig = collectConfig || {}
+  collectConfig.appId && (config.appId = collectConfig.appId);
+  collectConfig.fpiStorageStrategy && (config.storageStrategy = collectConfig.fpiStorageStrategy);
+  collectConfig.fpiExpirationDays && (config.expirationDays = collectConfig.fpiExpirationDays);
+  collectConfig.collectorUrl && (config.collectorUrl = collectConfig.collectorUrl);
   return config;
 }
 
+/**
+ * Create requestedAttributes array to pass to liveconnect
+ * @function
+ * @param {Object} overrides - object with boolean values that will override defaults { 'foo': true, 'bar': false }
+ * @returns {Array}
+ */
+function parseRequestedAttributes(overrides) {
+  function createParameterArray(config) {
+    return Object.entries(config).flatMap(([k, v]) => (typeof v === 'boolean' && v) ? [k] : []);
+  }
+  if (typeof overrides === 'object') {
+    return createParameterArray({...defaultRequestedAttributes, ...overrides})
+  } else {
+    return createParameterArray(defaultRequestedAttributes);
+  }
+}
+
 function initializeLiveConnect(configParams) {
   configParams = configParams || {};
   if (liveConnect) {
@@ -56,7 +83,8 @@ function initializeLiveConnect(configParams) {
   const publisherId = configParams.publisherId || 'any';
   const identityResolutionConfig = {
     source: 'prebid',
-    publisherId: publisherId
+    publisherId: publisherId,
+    requestedAttributes: parseRequestedAttributes(configParams.requestedAttributesOverrides)
   };
   if (configParams.url) {
     identityResolutionConfig.url = configParams.url
@@ -64,6 +92,9 @@ function initializeLiveConnect(configParams) {
   if (configParams.partner) {
     identityResolutionConfig.source = configParams.partner
   }
+  if (configParams.ajaxTimeout) {
+    identityResolutionConfig.ajaxTimeout = configParams.ajaxTimeout;
+  }
 
   const liveConnectConfig = parseLiveIntentCollectorConfig(configParams.liCollectConfig);
   liveConnectConfig.wrapperName = 'prebid';
@@ -73,9 +104,18 @@ function initializeLiveConnect(configParams) {
   if (usPrivacyString) {
     liveConnectConfig.usPrivacyString = usPrivacyString;
   }
+  const gdprConsent = gdprDataHandler.getConsentData()
+  if (gdprConsent) {
+    liveConnectConfig.gdprApplies = gdprConsent.gdprApplies;
+    liveConnectConfig.gdprConsent = gdprConsent.consentString;
+  }
 
-  // The second param is the storage object, which means that all LS & Cookie manipulation will go through PBJS utils.
-  liveConnect = LiveConnect(liveConnectConfig, storage);
+  // The second param is the storage object, LS & Cookie manipulation uses PBJS
+  // The third param is the ajax and pixel object, the ajax and pixel use PBJS
+  liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls);
+  if (configParams.emailHash) {
+    liveConnect.push({ hash: configParams.emailHash })
+  }
   return liveConnect;
 }
 
@@ -88,26 +128,50 @@ function tryFireEvent() {
 
 /** @type {Submodule} */
 export const liveIntentIdSubmodule = {
+  moduleMode: process.env.LiveConnectMode,
   /**
    * used to link submodule with config
    * @type {string}
    */
   name: MODULE_NAME,
 
+  setModuleMode(mode) {
+    this.moduleMode = mode
+  },
+  getInitializer() {
+    return (liveConnectConfig, storage, calls) => LiveConnect(liveConnectConfig, storage, calls, this.moduleMode)
+  },
+
   /**
    * decode the stored id value for passing to bid requests. Note that lipb object is a wrapper for everything, and
    * internally it could contain more data other than `lipbid`(e.g. `segments`) depending on the `partner` and
    * `publisherId` params.
    * @function
    * @param {{unifiedId:string}} value
-   * @param {SubmoduleParams|undefined} [configParams]
+   * @param {SubmoduleConfig|undefined} config
    * @returns {{lipb:Object}}
    */
-  decode(value, configParams) {
+  decode(value, config) {
+    const configParams = (config && config.params) || {};
     function composeIdObject(value) {
-      const base = { 'lipbid': value['unifiedId'] };
-      delete value.unifiedId;
-      return { 'lipb': { ...base, ...value } };
+      const result = {};
+
+      // old versions stored lipbid in unifiedId. Ensure that we can still read the data.
+      const lipbid = value.nonId || value.unifiedId
+      if (lipbid) {
+        value.lipbid = lipbid
+        delete value.unifiedId
+        result.lipb = value
+      }
+
+      // Lift usage of uid2 by exposing uid2 if we were asked to resolve it.
+      // As adapters are applied in lexicographical order, we will always
+      // be overwritten by the 'proper' uid2 module if it is present.
+      if (value.uid2) {
+        result.uid2 = { 'id': value.uid2 }
+      }
+
+      return result
     }
 
     if (!liveConnect) {
@@ -115,44 +179,35 @@ export const liveIntentIdSubmodule = {
     }
     tryFireEvent();
 
-    return (value && typeof value['unifiedId'] === 'string') ? composeIdObject(value) : undefined;
+    return composeIdObject(value);
   },
 
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @returns {IdResponse|undefined}
    */
-  getId(configParams) {
+  getId(config) {
+    const configParams = (config && config.params) || {};
     const liveConnect = initializeLiveConnect(configParams);
     if (!liveConnect) {
       return;
     }
     tryFireEvent();
-    // Don't do the internal ajax call, but use the composed url and fire it via PBJS ajax module
-    const url = liveConnect.resolutionCallUrl();
-    const result = function (callback) {
-      const callbacks = {
-        success: response => {
-          let responseObj = {};
-          if (response) {
-            try {
-              responseObj = JSON.parse(response);
-            } catch (error) {
-              utils.logError(error);
-            }
-          }
-          callback(responseObj);
+    const result = function(callback) {
+      liveConnect.resolve(
+        response => {
+          callback(response);
         },
-        error: error => {
-          utils.logError(`${MODULE_NAME}: ID fetch encountered an error: `, error);
+        error => {
+          logError(`${MODULE_NAME}: ID fetch encountered an error: `, error);
           callback();
         }
-      };
-      ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true });
-    };
-    return {callback: result};
+      )
+    }
+
+    return { callback: result };
   }
 };
 
diff --git a/modules/livewrappedAnalyticsAdapter.js b/modules/livewrappedAnalyticsAdapter.js
index b331448161e..fe69220e123 100644
--- a/modules/livewrappedAnalyticsAdapter.js
+++ b/modules/livewrappedAnalyticsAdapter.js
@@ -1,8 +1,9 @@
-import * as utils from '../src/utils.js';
+import { timestamp, logInfo, getWindowTop } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
+import { getGlobal } from '../src/prebidGlobal.js';
 
 const ANALYTICSTYPE = 'endpoint';
 const URL = 'https://lwadm.com/analytics/10';
@@ -11,8 +12,10 @@ const REQUESTSENT = 1;
 const RESPONSESENT = 2;
 const WINSENT = 4;
 const TIMEOUTSENT = 8;
+const ADRENDERFAILEDSENT = 16;
 
 let initOptions;
+let prebidGlobal = getGlobal();
 export const BID_WON_TIMEOUT = 500;
 
 const cache = {
@@ -21,45 +24,70 @@ const cache = {
 
 let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE}), {
   track({eventType, args}) {
-    const time = utils.timestamp();
-    utils.logInfo('LIVEWRAPPED_EVENT:', [eventType, args]);
+    const time = timestamp();
+    logInfo('LIVEWRAPPED_EVENT:', [eventType, args]);
 
     switch (eventType) {
       case CONSTANTS.EVENTS.AUCTION_INIT:
-        utils.logInfo('LIVEWRAPPED_AUCTION_INIT:', args);
+        logInfo('LIVEWRAPPED_AUCTION_INIT:', args);
         cache.auctions[args.auctionId] = {bids: {}, bidAdUnits: {}};
         break;
       case CONSTANTS.EVENTS.BID_REQUESTED:
-        utils.logInfo('LIVEWRAPPED_BID_REQUESTED:', args);
+        logInfo('LIVEWRAPPED_BID_REQUESTED:', args);
         cache.auctions[args.auctionId].timeStamp = args.start;
 
         args.bids.forEach(function(bidRequest) {
+          cache.auctions[args.auctionId].gdprApplies = args.gdprConsent ? args.gdprConsent.gdprApplies : undefined;
+          cache.auctions[args.auctionId].gdprConsent = args.gdprConsent ? args.gdprConsent.consentString : undefined;
+          let lwFloor;
+          let container = document.getElementById(bidRequest.adUnitCode);
+          let adUnitId = container ? container.getAttribute('data-adunitid') : undefined;
+          adUnitId = adUnitId != null ? adUnitId : undefined;
+
+          if (bidRequest.lwflr) {
+            lwFloor = bidRequest.lwflr.flr;
+
+            let buyerFloor = bidRequest.lwflr.bflrs ? bidRequest.lwflr.bflrs[bidRequest.bidder] : undefined;
+
+            lwFloor = buyerFloor || lwFloor;
+          }
+
           cache.auctions[args.auctionId].bids[bidRequest.bidId] = {
             bidder: bidRequest.bidder,
             adUnit: bidRequest.adUnitCode,
+            adUnitId: adUnitId,
             isBid: false,
             won: false,
             timeout: false,
             sendStatus: 0,
             readyToSend: 0,
-            start: args.start
-          }
-
-          utils.logInfo(bidRequest);
-        })
-        utils.logInfo(livewrappedAnalyticsAdapter.requestEvents);
+            start: args.start,
+            lwFloor: lwFloor,
+            floorData: bidRequest.floorData,
+            auc: bidRequest.auc,
+            buc: bidRequest.buc,
+            lw: bidRequest.lw
+          };
+
+          logInfo(bidRequest);
+        });
+        logInfo(livewrappedAnalyticsAdapter.requestEvents);
         break;
       case CONSTANTS.EVENTS.BID_RESPONSE:
-        utils.logInfo('LIVEWRAPPED_BID_RESPONSE:', args);
+        logInfo('LIVEWRAPPED_BID_RESPONSE:', args);
 
         let bidResponse = cache.auctions[args.auctionId].bids[args.requestId];
         bidResponse.isBid = args.getStatusCode() === CONSTANTS.STATUS.GOOD;
         bidResponse.width = args.width;
         bidResponse.height = args.height;
         bidResponse.cpm = args.cpm;
+        bidResponse.originalCpm = prebidGlobal.convertCurrency(args.originalCpm, args.originalCurrency, args.currency);
         bidResponse.ttr = args.timeToRespond;
         bidResponse.readyToSend = 1;
-        bidResponse.mediaType = args.mediaType == 'native' ? 2 : 1;
+        bidResponse.mediaType = args.mediaType == 'native' ? 2 : (args.mediaType == 'video' ? 4 : 1);
+        bidResponse.floorData = args.floorData;
+        bidResponse.meta = args.meta;
+
         if (!bidResponse.ttr) {
           bidResponse.ttr = time - bidResponse.start;
         }
@@ -67,12 +95,14 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
           cache.auctions[args.auctionId].bidAdUnits[bidResponse.adUnit] =
             {
               sent: 0,
+              lw: bidResponse.lw,
+              adUnitId: bidResponse.adUnitId,
               timeStamp: cache.auctions[args.auctionId].timeStamp
             };
         }
         break;
       case CONSTANTS.EVENTS.BIDDER_DONE:
-        utils.logInfo('LIVEWRAPPED_BIDDER_DONE:', args);
+        logInfo('LIVEWRAPPED_BIDDER_DONE:', args);
         args.bids.forEach(doneBid => {
           let bid = cache.auctions[doneBid.auctionId].bids[doneBid.bidId || doneBid.requestId];
           if (!bid.ttr) {
@@ -82,21 +112,35 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
         });
         break;
       case CONSTANTS.EVENTS.BID_WON:
-        utils.logInfo('LIVEWRAPPED_BID_WON:', args);
+        logInfo('LIVEWRAPPED_BID_WON:', args);
         let wonBid = cache.auctions[args.auctionId].bids[args.requestId];
         wonBid.won = true;
+        wonBid.floorData = args.floorData;
+        wonBid.rUp = args.rUp;
+        wonBid.meta = args.meta;
+        wonBid.dealId = args.dealId;
         if (wonBid.sendStatus != 0) {
           livewrappedAnalyticsAdapter.sendEvents();
         }
         break;
+      case CONSTANTS.EVENTS.AD_RENDER_FAILED:
+        logInfo('LIVEWRAPPED_AD_RENDER_FAILED:', args);
+        let adRenderFailedBid = cache.auctions[args.bid.auctionId].bids[args.bid.requestId];
+        adRenderFailedBid.adRenderFailed = true;
+        adRenderFailedBid.reason = args.reason;
+        adRenderFailedBid.message = args.message;
+        if (adRenderFailedBid.sendStatus != 0) {
+          livewrappedAnalyticsAdapter.sendEvents();
+        }
+        break;
       case CONSTANTS.EVENTS.BID_TIMEOUT:
-        utils.logInfo('LIVEWRAPPED_BID_TIMEOUT:', args);
+        logInfo('LIVEWRAPPED_BID_TIMEOUT:', args);
         args.forEach(timeout => {
           cache.auctions[timeout.auctionId].bids[timeout.bidId].timeout = true;
         });
         break;
       case CONSTANTS.EVENTS.AUCTION_END:
-        utils.logInfo('LIVEWRAPPED_AUCTION_END:', args);
+        logInfo('LIVEWRAPPED_AUCTION_END:', args);
         setTimeout(() => {
           livewrappedAnalyticsAdapter.sendEvents();
         }, BID_WON_TIMEOUT);
@@ -116,38 +160,48 @@ livewrappedAnalyticsAdapter.enableAnalytics = function (config) {
 };
 
 livewrappedAnalyticsAdapter.sendEvents = function() {
+  var sentRequests = getSentRequests();
   var events = {
     publisherId: initOptions.publisherId,
-    requests: getSentRequests(),
-    responses: getResponses(),
-    wins: getWins(),
-    timeouts: getTimeouts(),
+    gdpr: sentRequests.gdpr,
+    auctionIds: sentRequests.auctionIds,
+    requests: sentRequests.sentRequests,
+    responses: getResponses(sentRequests.gdpr, sentRequests.auctionIds),
+    wins: getWins(sentRequests.gdpr, sentRequests.auctionIds),
+    timeouts: getTimeouts(sentRequests.auctionIds),
     bidAdUnits: getbidAdUnits(),
+    rf: getAdRenderFailed(sentRequests.auctionIds),
     rcv: getAdblockerRecovered()
   };
 
   if (events.requests.length == 0 &&
       events.responses.length == 0 &&
       events.wins.length == 0 &&
-      events.timeouts.length == 0) {
+      events.timeouts.length == 0 &&
+      events.rf.length == 0) {
     return;
   }
 
   ajax(initOptions.endpoint || URL, undefined, JSON.stringify(events), {method: 'POST'});
-}
+};
 
 function getAdblockerRecovered() {
   try {
-    return utils.getWindowTop().I12C && utils.getWindowTop().I12C.Morph === 1;
+    return getWindowTop().I12C && getWindowTop().I12C.Morph === 1;
   } catch (e) {}
 }
 
 function getSentRequests() {
   var sentRequests = [];
+  var gdpr = [];
+  var auctionIds = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
+    let auction = cache.auctions[auctionId];
+    let gdprPos = getGdprPos(gdpr, auction);
+    let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
+
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
-      let auction = cache.auctions[auctionId];
       let bid = auction.bids[bidId];
       if (!(bid.sendStatus & REQUESTSENT)) {
         bid.sendStatus |= REQUESTSENT;
@@ -155,21 +209,30 @@ function getSentRequests() {
         sentRequests.push({
           timeStamp: auction.timeStamp,
           adUnit: bid.adUnit,
-          bidder: bid.bidder
+          adUnitId: bid.adUnitId,
+          bidder: bid.bidder,
+          gdpr: gdprPos,
+          floor: bid.lwFloor,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw
         });
       }
     });
   });
 
-  return sentRequests;
+  return {gdpr: gdpr, auctionIds: auctionIds, sentRequests: sentRequests};
 }
 
-function getResponses() {
+function getResponses(gdpr, auctionIds) {
   var responses = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
+      let gdprPos = getGdprPos(gdpr, auction);
+      let auctionIdPos = getAuctionIdPos(auctionIds, auctionId)
       let bid = auction.bids[bidId];
       if (bid.readyToSend && !(bid.sendStatus & RESPONSESENT) && !bid.timeout) {
         bid.sendStatus |= RESPONSESENT;
@@ -177,13 +240,23 @@ function getResponses() {
         responses.push({
           timeStamp: auction.timeStamp,
           adUnit: bid.adUnit,
+          adUnitId: bid.adUnitId,
           bidder: bid.bidder,
           width: bid.width,
           height: bid.height,
           cpm: bid.cpm,
+          orgCpm: bid.originalCpm,
           ttr: bid.ttr,
           IsBid: bid.isBid,
-          mediaType: bid.mediaType
+          mediaType: bid.mediaType,
+          gdpr: gdprPos,
+          floor: bid.lwFloor ? bid.lwFloor : (bid.floorData ? bid.floorData.floorValue : undefined),
+          floorCur: bid.floorData ? bid.floorData.floorCurrency : undefined,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw,
+          meta: bid.meta
         });
       }
     });
@@ -192,24 +265,39 @@ function getResponses() {
   return responses;
 }
 
-function getWins() {
+function getWins(gdpr, auctionIds) {
   var wins = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
+      let gdprPos = getGdprPos(gdpr, auction);
+      let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
       let bid = auction.bids[bidId];
+
       if (!(bid.sendStatus & WINSENT) && bid.won) {
         bid.sendStatus |= WINSENT;
 
         wins.push({
           timeStamp: auction.timeStamp,
           adUnit: bid.adUnit,
+          adUnitId: bid.adUnitId,
           bidder: bid.bidder,
           width: bid.width,
           height: bid.height,
           cpm: bid.cpm,
-          mediaType: bid.mediaType
+          orgCpm: bid.originalCpm,
+          mediaType: bid.mediaType,
+          gdpr: gdprPos,
+          floor: bid.lwFloor ? bid.lwFloor : (bid.floorData ? bid.floorData.floorValue : undefined),
+          floorCur: bid.floorData ? bid.floorData.floorCurrency : undefined,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw,
+          rUp: bid.rUp,
+          meta: bid.meta,
+          dealId: bid.dealId
         });
       }
     });
@@ -218,10 +306,42 @@ function getWins() {
   return wins;
 }
 
-function getTimeouts() {
+function getGdprPos(gdpr, auction) {
+  var gdprPos = 0;
+  for (gdprPos = 0; gdprPos < gdpr.length; gdprPos++) {
+    if (gdpr[gdprPos].gdprApplies == auction.gdprApplies &&
+        gdpr[gdprPos].gdprConsent == auction.gdprConsent) {
+      break;
+    }
+  }
+
+  if (gdprPos == gdpr.length) {
+    gdpr[gdprPos] = {gdprApplies: auction.gdprApplies, gdprConsent: auction.gdprConsent};
+  }
+
+  return gdprPos;
+}
+
+function getAuctionIdPos(auctionIds, auctionId) {
+  var auctionIdPos = 0;
+  for (auctionIdPos = 0; auctionIdPos < auctionIds.length; auctionIdPos++) {
+    if (auctionIds[auctionIdPos] == auctionId) {
+      break;
+    }
+  }
+
+  if (auctionIdPos == auctionIds.length) {
+    auctionIds[auctionIdPos] = auctionId;
+  }
+
+  return auctionIdPos;
+}
+
+function getTimeouts(auctionIds) {
   var timeouts = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
+    let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
       let bid = auction.bids[bidId];
@@ -231,7 +351,12 @@ function getTimeouts() {
         timeouts.push({
           bidder: bid.bidder,
           adUnit: bid.adUnit,
-          timeStamp: auction.timeStamp
+          adUnitId: bid.adUnitId,
+          timeStamp: auction.timeStamp,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw
         });
       }
     });
@@ -240,6 +365,36 @@ function getTimeouts() {
   return timeouts;
 }
 
+function getAdRenderFailed(auctionIds) {
+  var adRenderFails = [];
+
+  Object.keys(cache.auctions).forEach(auctionId => {
+    let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
+    Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
+      let auction = cache.auctions[auctionId];
+      let bid = auction.bids[bidId];
+      if (!(bid.sendStatus & ADRENDERFAILEDSENT) && bid.adRenderFailed) {
+        bid.sendStatus |= ADRENDERFAILEDSENT;
+
+        adRenderFails.push({
+          bidder: bid.bidder,
+          adUnit: bid.adUnit,
+          adUnitId: bid.adUnitId,
+          timeStamp: auction.timeStamp,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw,
+          rsn: bid.reason,
+          msg: bid.message
+        });
+      }
+    });
+  });
+
+  return adRenderFails;
+}
+
 function getbidAdUnits() {
   var bidAdUnits = [];
 
@@ -252,7 +407,9 @@ function getbidAdUnits() {
 
         bidAdUnits.push({
           adUnit: adUnit,
-          timeStamp: bidAdUnit.timeStamp
+          adUnitId: bidAdUnit.adUnitId,
+          timeStamp: bidAdUnit.timeStamp,
+          lw: bidAdUnit.lw
         });
       }
     });
diff --git a/modules/livewrappedAnalyticsAdapter.md b/modules/livewrappedAnalyticsAdapter.md
new file mode 100644
index 00000000000..de4f352aa19
--- /dev/null
+++ b/modules/livewrappedAnalyticsAdapter.md
@@ -0,0 +1,22 @@
+# Overview
+Module Name: Livewrapped Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: info@livewrapped.com
+
+# Description
+
+Analytics adapter for Livewrapped AB. In order to use the adapter, please contact Livewrapped AB.
+
+# Test Parameters
+
+```
+{
+  provider: 'livewrapped',
+    options : {
+      publisherId: "64c01620-fa98-4936-9794-6001d8ebfdb0"
+    }
+}
+
+```
diff --git a/modules/livewrappedBidAdapter.js b/modules/livewrappedBidAdapter.js
index 78b29ab5016..3839eb80b91 100644
--- a/modules/livewrappedBidAdapter.js
+++ b/modules/livewrappedBidAdapter.js
@@ -1,19 +1,20 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import find from 'core-js-pure/features/array/find.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-export const storage = getStorageManager();
+import {deepAccess, getWindowTop, isSafariBrowser, mergeDeep} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {find} from '../src/polyfill.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {getStorageManager} from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'livewrapped';
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 export const URL = 'https://lwadm.com/ad';
-const VERSION = '1.3';
+const VERSION = '1.4';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, NATIVE],
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  gvlid: 919,
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -46,6 +47,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const userId = find(bidRequests, hasUserId);
     const pubcid = find(bidRequests, hasPubcid);
     const publisherId = find(bidRequests, hasPublisherId);
@@ -59,11 +63,17 @@ export const spec = {
     const bundle = find(bidRequests, hasBundleParam);
     const tid = find(bidRequests, hasTidParam);
     const schain = bidRequests[0].schain;
+    let ortb2 = bidderRequest.ortb2;
+    const eids = handleEids(bidRequests);
     bidUrl = bidUrl ? bidUrl.params.bidUrl : URL;
     url = url ? url.params.url : (getAppDomain() || getTopWindowLocation(bidderRequest));
     test = test ? test.params.test : undefined;
     var adRequests = bidRequests.map(bidToAdRequest);
 
+    if (eids) {
+      ortb2 = mergeDeep(mergeDeep({}, ortb2 || {}), eids);
+    }
+
     const payload = {
       auctionId: auctionId ? auctionId.auctionId : undefined,
       publisherId: publisherId ? publisherId.params.publisherId : undefined,
@@ -80,10 +90,12 @@ export const spec = {
       version: VERSION,
       gdprApplies: bidderRequest.gdprConsent ? bidderRequest.gdprConsent.gdprApplies : undefined,
       gdprConsent: bidderRequest.gdprConsent ? bidderRequest.gdprConsent.consentString : undefined,
-      cookieSupport: !utils.isSafariBrowser() && storage.cookiesAreEnabled(),
+      coppa: getCoppa(),
+      usPrivacy: bidderRequest.uspConsent,
+      cookieSupport: !isSafariBrowser() && storage.cookiesAreEnabled(),
       rcv: getAdblockerRecovered(),
       adRequests: [...adRequests],
-      rtbData: handleEids(bidRequests),
+      rtbData: ortb2,
       schain: schain
     };
 
@@ -129,7 +141,12 @@ export const spec = {
 
       if (ad.native) {
         bidResponse.native = ad.native;
-        bidResponse.mediaType = NATIVE
+        bidResponse.mediaType = NATIVE;
+      }
+
+      if (ad.video) {
+        bidResponse.mediaType = VIDEO;
+        bidResponse.vastXml = ad.tag;
       }
 
       bidResponses.push(bidResponse);
@@ -216,9 +233,15 @@ function bidToAdRequest(bid) {
     options: bid.params.options
   };
 
-  adRequest.native = utils.deepAccess(bid, 'mediaTypes.native');
+  if (bid.auc !== undefined) {
+    adRequest.auc = bid.auc;
+  }
+
+  adRequest.native = deepAccess(bid, 'mediaTypes.native');
 
-  if (adRequest.native && utils.deepAccess(bid, 'mediaTypes.banner')) {
+  adRequest.video = deepAccess(bid, 'mediaTypes.video');
+
+  if ((adRequest.native || adRequest.video) && deepAccess(bid, 'mediaTypes.banner')) {
     adRequest.banner = true;
   }
 
@@ -226,7 +249,7 @@ function bidToAdRequest(bid) {
 }
 
 function getSizes(bid) {
-  if (utils.deepAccess(bid, 'mediaTypes.banner.sizes')) {
+  if (deepAccess(bid, 'mediaTypes.banner.sizes')) {
     return bid.mediaTypes.banner.sizes;
   } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
     return bid.sizes;
@@ -243,45 +266,21 @@ function sizeToFormat(size) {
 
 function getAdblockerRecovered() {
   try {
-    return utils.getWindowTop().I12C && utils.getWindowTop().I12C.Morph === 1;
+    return getWindowTop().I12C && getWindowTop().I12C.Morph === 1;
   } catch (e) {}
 }
 
-function AddExternalUserId(eids, value, source, atype, rtiPartner) {
-  if (utils.isStr(value)) {
-    var eid = {
-      source,
-      uids: [{
-        id: value,
-        atype
-      }]
-    };
-
-    if (rtiPartner) {
-      eid.uids[0] = {ext: {rtiPartner}};
-    }
-
-    eids.push(eid);
-  }
-}
-
 function handleEids(bidRequests) {
-  let eids = [];
   const bidRequest = bidRequests[0];
-  if (bidRequest && bidRequest.userId) {
-    AddExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcommon', 1); // Also add this to eids
-    AddExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id`), 'id5-sync.com', 1);
-  }
-  if (eids.length > 0) {
-    return {user: {ext: {eids}}};
+  if (bidRequest && bidRequest.userIdAsEids) {
+    return {user: {ext: {eids: bidRequest.userIdAsEids}}};
   }
 
   return undefined;
 }
 
 function getTopWindowLocation(bidderRequest) {
-  let url = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
-  return config.getConfig('pageUrl') || url;
+  return bidderRequest?.refererInfo?.page;
 }
 
 function getAppBundle() {
@@ -320,4 +319,9 @@ function getDeviceHeight() {
   return window.innerHeight;
 }
 
+function getCoppa() {
+  if (typeof config.getConfig('coppa') === 'boolean') {
+    return config.getConfig('coppa');
+  }
+}
 registerBidder(spec);
diff --git a/modules/livewrappedBidAdapter.md b/modules/livewrappedBidAdapter.md
index 15e3e8d533a..10fc2a4778a 100644
--- a/modules/livewrappedBidAdapter.md
+++ b/modules/livewrappedBidAdapter.md
@@ -8,7 +8,7 @@
 
 Connects to Livewrapped Header Bidding wrapper for bids.
 
-Livewrapped supports banner.
+Livewrapped supports banner, native and video.
 
 # Test Parameters
 
@@ -20,7 +20,7 @@ var adUnits = [
        bids: [{
          bidder: 'livewrapped',
          params: {
-           adUnitId: '6A32352E-BC17-4B94-B2A7-5BF1724417D7'
+           adUnitId: 'D801852A-681F-11E8-86A7-0A44794250D4'
          }
        }]
    }
diff --git a/modules/liveyieldAnalyticsAdapter.js b/modules/liveyieldAnalyticsAdapter.js
index d80a7067f2e..997c0eaace0 100644
--- a/modules/liveyieldAnalyticsAdapter.js
+++ b/modules/liveyieldAnalyticsAdapter.js
@@ -1,7 +1,7 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import { logError } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import * as utils from '../src/utils.js';
 
 const {
   EVENTS: { BID_REQUESTED, BID_TIMEOUT, BID_RESPONSE, BID_WON }
@@ -198,7 +198,7 @@ const liveyield = Object.assign(adapter({ analyticsType: 'bundle' }), {
               args.bidderCode
             );
           } catch (e) {
-            utils.logError(e);
+            logError(e);
           }
         });
         break;
@@ -220,7 +220,7 @@ const liveyield = Object.assign(adapter({ analyticsType: 'bundle' }), {
             args.statusMessage !== 'Bid available'
           );
         } catch (e) {
-          utils.logError(e);
+          logError(e);
         }
         break;
       case BID_TIMEOUT:
@@ -243,7 +243,7 @@ const liveyield = Object.assign(adapter({ analyticsType: 'bundle' }), {
             )
           );
           if (!ad) {
-            utils.logError(
+            logError(
               'Cannot find ad by unit name: ' +
                 liveyield.instanceConfig.getAdUnitName(
                   liveyield.instanceConfig.getPlacementOrAdUnitCode(
@@ -255,7 +255,7 @@ const liveyield = Object.assign(adapter({ analyticsType: 'bundle' }), {
             break;
           }
           if (!args.bidderCode || !args.cpm) {
-            utils.logError('Bidder code or cpm is not valid');
+            logError('Bidder code or cpm is not valid');
             break;
           }
           const resolution = { targetings: [] };
@@ -280,7 +280,7 @@ const liveyield = Object.assign(adapter({ analyticsType: 'bundle' }), {
             resolutionToUse
           );
         } catch (e) {
-          utils.logError(e);
+          logError(e);
         }
         break;
     }
@@ -310,27 +310,27 @@ liveyield.originEnableAnalytics = liveyield.enableAnalytics;
  */
 liveyield.enableAnalytics = function(config) {
   if (!config || !config.provider || config.provider !== 'liveyield') {
-    utils.logError('expected config.provider to equal liveyield');
+    logError('expected config.provider to equal liveyield');
     return;
   }
   if (!config.options) {
-    utils.logError('options must be defined');
+    logError('options must be defined');
     return;
   }
   if (!config.options.customerId) {
-    utils.logError('options.customerId is required');
+    logError('options.customerId is required');
     return;
   }
   if (!config.options.customerName) {
-    utils.logError('options.customerName is required');
+    logError('options.customerName is required');
     return;
   }
   if (!config.options.customerSite) {
-    utils.logError('options.customerSite is required');
+    logError('options.customerSite is required');
     return;
   }
   if (!config.options.sessionTimezoneOffset) {
-    utils.logError('options.sessionTimezoneOffset is required');
+    logError('options.sessionTimezoneOffset is required');
     return;
   }
   liveyield.instanceConfig = Object.assign(
@@ -340,7 +340,7 @@ liveyield.enableAnalytics = function(config) {
   );
 
   if (typeof window[liveyield.instanceConfig.rtaFunctionName] !== 'function') {
-    utils.logError(
+    logError(
       `Function ${liveyield.instanceConfig.rtaFunctionName} is not defined.` +
         `Make sure that LiveYield snippet in included before the Prebid Analytics configuration.`
     );
diff --git a/modules/lkqdBidAdapter.js b/modules/lkqdBidAdapter.js
index 51d5c48e1fc..1dbe89f5a49 100644
--- a/modules/lkqdBidAdapter.js
+++ b/modules/lkqdBidAdapter.js
@@ -1,274 +1,233 @@
-import * as utils from '../src/utils.js';
+import { logError, _each, generateUUID, buildUrl } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
 import { VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'lkqd';
 const BID_TTL_DEFAULT = 300;
-const ENDPOINT = 'https://v.lkqd.net/ad';
+const MIMES_TYPES = ['application/x-mpegURL', 'video/mp4', 'video/H264'];
+const PROTOCOLS = [1, 2, 3, 4, 5, 6, 7, 8];
 
-const PARAM_OUTPUT_DEFAULT = 'vast';
-const PARAM_EXECUTION_DEFAULT = 'any';
-const PARAM_SUPPORT_DEFAULT = 'html5';
-const PARAM_PLAYINIT_DEFAULT = 'auto';
 const PARAM_VOLUME_DEFAULT = '100';
+const DEFAULT_SIZES = [[640, 480]];
 
-function _validateId(id) {
-  if (id && typeof id !== 'undefined' && parseInt(id) > 0) {
-    return true;
-  }
+function calculateSizes(VIDEO_BID, bid) {
+  const userProvided = bid.sizes && Array.isArray(bid.sizes) ? (Array.isArray(bid.sizes[0]) ? bid.sizes : [bid.sizes]) : DEFAULT_SIZES;
+  const preBidProvided = VIDEO_BID.playerSize && Array.isArray(VIDEO_BID.playerSize) ? (Array.isArray(VIDEO_BID.playerSize[0]) ? VIDEO_BID.playerSize : [VIDEO_BID.playerSize]) : null;
 
-  return false;
+  return preBidProvided || userProvided;
 }
 
-function isBidRequestValid(bidRequest) {
-  if (bidRequest.bidder === BIDDER_CODE && typeof bidRequest.params !== 'undefined') {
-    if (_validateId(bidRequest.params.siteId) && _validateId(bidRequest.params.placementId)) {
-      return true;
-    }
-  }
-
-  return false;
+function isSet(value) {
+  return value != null;
 }
 
-function buildRequests(validBidRequests, bidderRequest) {
-  let bidRequests = [];
-
-  for (let i = 0; i < validBidRequests.length; i++) {
-    let bidRequest = validBidRequests[i];
-
-    let sizes = [];
-    // if width/height not provided to the ad unit for some reason then attempt request with default 640x480 size
-    let bidRequestSizes = bidRequest.sizes;
-    let bidRequestDeepSizes = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize');
-    if ((!bidRequestSizes || !bidRequestSizes.length) && (!bidRequestDeepSizes || !bidRequestDeepSizes.length)) {
-      utils.logWarn('Warning: Could not find valid width/height parameters on the provided adUnit');
-      sizes = [[640, 480]];
-    }
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: [],
+  supportedMediaTypes: [VIDEO],
+  isBidRequestValid: function(bid) {
+    return bid.bidder === BIDDER_CODE && bid.params && Object.keys(bid.params).length > 0 &&
+      ((isSet(bid.params.publisherId) && parseInt(bid.params.publisherId) > 0) || (isSet(bid.params.placementId) && parseInt(bid.params.placementId) > 0)) &&
+      bid.params.siteId != null;
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const BIDDER_REQUEST = bidderRequest || {};
+    const serverRequestObjects = [];
+    const UTC_OFFSET = new Date().getTimezoneOffset();
+    const UA = navigator.userAgent;
+    const USP = BIDDER_REQUEST.uspConsent || null;
+    // TODO: does the fallback make sense here?
+    const REFERER = BIDDER_REQUEST?.refererInfo?.domain || window.location.host;
+    const BIDDER_GDPR = BIDDER_REQUEST.gdprConsent && BIDDER_REQUEST.gdprConsent.gdprApplies ? 1 : null;
+    const BIDDER_GDPRS = BIDDER_REQUEST.gdprConsent && BIDDER_REQUEST.gdprConsent.consentString ? BIDDER_REQUEST.gdprConsent.consentString : null;
+
+    _each(validBidRequests, (bid) => {
+      const DOMAIN = bid.params.pageurl || REFERER;
+      const GDPR = BIDDER_GDPR || bid.params.gdpr || null;
+      const GDPRS = BIDDER_GDPRS || bid.params.gdprs || null;
+      const DNT = bid.params.dnt || null;
+      const BID_FLOOR = bid.params.flrd > bid.params.flrmp ? bid.params.flrd : bid.params.flrmp;
+      const VIDEO_BID = bid.video ? bid.video : {};
+
+      const requestData = {
+        id: generateUUID(),
+        imp: [],
+        site: {
+          domain: DOMAIN
+        },
+        device: {
+          ua: UA,
+          geo: {
+            utcoffset: UTC_OFFSET
+          }
+        },
+        user: {
+          ext: {}
+        },
+        test: 0,
+        at: 2,
+        tmax: bid.params.timeout || config.getConfig('bidderTimeout') || 100,
+        cur: ['USD'],
+        regs: {
+          ext: {
+            us_privacy: USP
+          }
+        }
+      };
 
-    // JWPlayer demo page uses sizes: [640,480] instead of sizes: [[640,480]] so need to handle single-layer array as well as nested arrays
-    if (bidRequestSizes && bidRequestSizes.length > 0) {
-      sizes = bidRequestSizes;
-      if (bidRequestSizes.length === 2 && typeof bidRequestSizes[0] === 'number' && typeof bidRequestSizes[1] === 'number') {
-        sizes = [bidRequestSizes];
-      }
-    } else if (bidRequestDeepSizes && bidRequestDeepSizes.length > 0) {
-      sizes = bidRequestDeepSizes;
-      if (bidRequestDeepSizes.length === 2 && typeof bidRequestDeepSizes[0] === 'number' && typeof bidRequestDeepSizes[1] === 'number') {
-        sizes = [bidRequestDeepSizes];
+      if (isSet(DNT)) {
+        requestData.device.dnt = DNT;
       }
-    }
 
-    for (let j = 0; j < sizes.length; j++) {
-      let size = sizes[j];
-      let playerWidth;
-      let playerHeight;
-      if (size && size.length == 2) {
-        playerWidth = size[0];
-        playerHeight = size[1];
-      } else {
-        utils.logWarn('Warning: Could not determine width/height from the provided adUnit');
+      if (isSet(config.getConfig('coppa'))) {
+        requestData.regs.coppa = config.getConfig('coppa') === true ? 1 : 0;
       }
 
-      let sspUrl = ENDPOINT.concat();
-      let sspData = {};
-
-      // required parameters
-      sspData.pid = bidRequest.params.placementId;
-      sspData.sid = bidRequest.params.siteId;
-      sspData.prebid = true;
-
-      // optional parameters
-      if (bidRequest.params.hasOwnProperty('output') && bidRequest.params.output != null) {
-        sspData.output = bidRequest.params.output;
-      } else {
-        sspData.output = PARAM_OUTPUT_DEFAULT;
-      }
-      if (bidRequest.params.hasOwnProperty('execution') && bidRequest.params.execution != null) {
-        sspData.execution = bidRequest.params.execution;
-      } else {
-        sspData.execution = PARAM_EXECUTION_DEFAULT;
-      }
-      if (bidRequest.params.hasOwnProperty('support') && bidRequest.params.support != null) {
-        sspData.support = bidRequest.params.support;
-      } else {
-        sspData.support = PARAM_SUPPORT_DEFAULT;
-      }
-      if (bidRequest.params.hasOwnProperty('playinit') && bidRequest.params.playinit != null) {
-        sspData.playinit = bidRequest.params.playinit;
-      } else {
-        sspData.playinit = PARAM_PLAYINIT_DEFAULT;
-      }
-      if (bidRequest.params.hasOwnProperty('volume') && bidRequest.params.volume != null) {
-        sspData.volume = bidRequest.params.volume;
-      } else {
-        sspData.volume = PARAM_VOLUME_DEFAULT;
-      }
-      if (playerWidth) {
-        sspData.width = playerWidth;
-      }
-      if (playerHeight) {
-        sspData.height = playerHeight;
-      }
-      if (bidRequest.params.hasOwnProperty('vpaidmode') && bidRequest.params.vpaidmode != null) {
-        sspData.vpaidmode = bidRequest.params.vpaidmode;
-      }
-      if (bidRequest.params.hasOwnProperty('appname') && bidRequest.params.appname != null) {
-        sspData.appname = bidRequest.params.appname;
-      }
-      if (bidRequest.params.hasOwnProperty('bundleid') && bidRequest.params.bundleid != null) {
-        sspData.bundleid = bidRequest.params.bundleid;
-      }
-      if (bidRequest.params.hasOwnProperty('aid') && bidRequest.params.aid != null) {
-        sspData.aid = bidRequest.params.aid;
-      }
-      if (bidRequest.params.hasOwnProperty('idfa') && bidRequest.params.idfa != null) {
-        sspData.idfa = bidRequest.params.idfa;
-      }
-      if (bidRequest.params.hasOwnProperty('gdpr') && bidRequest.params.gdpr != null) {
-        sspData.gdpr = bidRequest.params.gdpr;
-      }
-      if (bidRequest.params.hasOwnProperty('gdprcs') && bidRequest.params.gdprcs != null) {
-        sspData.gdprcs = bidRequest.params.gdprcs;
-      }
-      if (bidRequest.params.hasOwnProperty('flrd') && bidRequest.params.flrd != null) {
-        sspData.flrd = bidRequest.params.flrd;
-      }
-      if (bidRequest.params.hasOwnProperty('flrmp') && bidRequest.params.flrmp != null) {
-        sspData.flrmp = bidRequest.params.flrmp;
-      }
-      if (bidRequest.params.hasOwnProperty('schain') && bidRequest.params.schain != null) {
-        sspData.schain = bidRequest.params.schain;
-      }
-      if (bidRequest.params.hasOwnProperty('placement') && bidRequest.params.placement != null) {
-        sspData.placement = bidRequest.params.placement;
-      }
-      if (bidRequest.params.hasOwnProperty('timeout') && bidRequest.params.timeout != null) {
-        sspData.timeout = bidRequest.params.timeout;
-      }
-      if (bidRequest.params.hasOwnProperty('dnt') && bidRequest.params.dnt != null) {
-        sspData.dnt = bidRequest.params.dnt;
+      if (isSet(GDPR)) {
+        requestData.regs.ext.gdpr = GDPR;
+        requestData.regs.ext.gdprs = GDPRS;
       }
-      if (bidRequest.params.hasOwnProperty('pageurl') && bidRequest.params.pageurl != null) {
-        sspData.pageurl = bidRequest.params.pageurl;
-      } else if (bidderRequest && bidderRequest.refererInfo) {
-        sspData.pageurl = encodeURIComponent(encodeURIComponent(bidderRequest.refererInfo.referer));
-      }
-      if (bidRequest.params.hasOwnProperty('contentId') && bidRequest.params.contentId != null) {
-        sspData.contentid = bidRequest.params.contentId;
-      }
-      if (bidRequest.params.hasOwnProperty('contentTitle') && bidRequest.params.contentTitle != null) {
-        sspData.contenttitle = bidRequest.params.contentTitle;
-      }
-      if (bidRequest.params.hasOwnProperty('contentLength') && bidRequest.params.contentLength != null) {
-        sspData.contentlength = bidRequest.params.contentLength;
-      }
-      if (bidRequest.params.hasOwnProperty('contentUrl') && bidRequest.params.contentUrl != null) {
-        sspData.contenturl = bidRequest.params.contentUrl;
-      }
-      if (bidRequest.params.hasOwnProperty('schain') && bidRequest.params.schain) {
-        sspData.schain = bidRequest.params.schain;
-      }
-
-      // random number to prevent caching
-      sspData.rnd = Math.floor(Math.random() * 999999999);
 
-      // Prebid.js required properties
-      sspData.bidId = bidRequest.bidId;
-      sspData.bidWidth = playerWidth;
-      sspData.bidHeight = playerHeight;
+      if (isSet(bid.params.aid) || isSet(bid.params.appname) || isSet(bid.params.bundleid)) {
+        requestData.app = {
+          id: bid.params.aid,
+          name: bid.params.appname,
+          bundle: bid.params.bundleid
+        };
 
-      bidRequests.push({
-        method: 'GET',
-        url: sspUrl,
-        data: Object.keys(sspData).map(function (key) { return key + '=' + sspData[key] }).join('&') + '&'
-      });
-    }
-  }
+        if (bid.params.contentId) {
+          requestData.app.content = {
+            id: bid.params.contentId,
+            title: bid.params.contentTitle,
+            len: bid.params.contentLength,
+            url: bid.params.contentUrl
+          };
+        }
+      }
 
-  return bidRequests;
-}
+      if (isSet(bid.params.idfa) || isSet(bid.params.aid)) {
+        requestData.device.ifa = bid.params.idfa || bid.params.aid;
+      }
 
-function interpretResponse(serverResponse, bidRequest) {
-  let bidResponses = [];
-  if (serverResponse && serverResponse.body) {
-    if (serverResponse.error) {
-      utils.logError('Error: ' + serverResponse.error);
-      return bidResponses;
-    } else {
-      try {
-        let bidResponse = {};
-        if (bidRequest && bidRequest.data && typeof bidRequest.data === 'string') {
-          let sspData;
-          let sspBidId;
-          let sspBidWidth;
-          let sspBidHeight;
-          if (window.URLSearchParams) {
-            sspData = new URLSearchParams(bidRequest.data);
-            sspBidId = sspData.get('bidId');
-            sspBidWidth = sspData.get('bidWidth');
-            sspBidHeight = sspData.get('bidHeight');
-          } else {
-            if (bidRequest.data.indexOf('bidId=') >= 0) {
-              sspBidId = bidRequest.data.substr(bidRequest.data.indexOf('bidId=') + 6, bidRequest.data.length);
-              sspBidId = sspBidId.split('&')[0];
-            }
-            if (bidRequest.data.indexOf('bidWidth=') >= 0) {
-              sspBidWidth = bidRequest.data.substr(bidRequest.data.indexOf('bidWidth=') + 9, bidRequest.data.length);
-              sspBidWidth = sspBidWidth.split('&')[0];
-            }
-            if (bidRequest.data.indexOf('bidHeight=') >= 0) {
-              sspBidHeight = bidRequest.data.substr(bidRequest.data.indexOf('bidHeight=') + 10, bidRequest.data.length);
-              sspBidHeight = sspBidHeight.split('&')[0];
+      if (bid.schain) {
+        requestData.source = {
+          ext: {
+            schain: bid.schain
+          }
+        };
+      } else if (bid.params.schain) {
+        const section = bid.params.schain.split('!');
+        const verComplete = section[0].split(',');
+        const node = section[1].split(',');
+
+        requestData.source = {
+          ext: {
+            schain: {
+              validation: 'strict',
+              config: {
+                ver: verComplete[0],
+                complete: parseInt(verComplete[1]),
+                nodes: [
+                  {
+                    asi: decodeURIComponent(node[0]),
+                    sid: decodeURIComponent(node[1]),
+                    hp: parseInt(node[2]),
+                    rid: decodeURIComponent(node[3]),
+                    name: decodeURIComponent(node[4]),
+                    domain: decodeURIComponent(node[5])
+                  }
+                ]
+              }
             }
           }
+        };
+      }
+
+      _each(calculateSizes(VIDEO_BID, bid), (sizes) => {
+        const impObj = {
+          id: generateUUID(),
+          displaymanager: bid.bidder,
+          bidfloor: BID_FLOOR,
+          video: {
+            mimes: VIDEO_BID.mimes || MIMES_TYPES,
+            protocols: VIDEO_BID.protocols || PROTOCOLS,
+            nvol: bid.params.volume || PARAM_VOLUME_DEFAULT,
+            w: sizes[0],
+            h: sizes[1],
+            skip: VIDEO_BID.skip || 0,
+            playbackmethod: VIDEO_BID.playbackmethod || [1],
+            placement: (bid.params.execution === 'outstream' || VIDEO_BID.context === 'outstream') ? 5 : 1,
+            ext: {
+              lkqdcustomparameters: {}
+            },
+          },
+          bidfloorcur: 'USD',
+          secure: 1
+        };
+
+        for (let k = 1; k <= 40; k++) {
+          if (bid.params.hasOwnProperty(`c${k}`) && bid.params[`c${k}`]) {
+            impObj.video.ext.lkqdcustomparameters[`c${k}`] = bid.params[`c${k}`];
+          }
+        }
 
-          if (sspBidId) {
-            let sspXmlString = serverResponse.body;
-            let sspXml = new window.DOMParser().parseFromString(sspXmlString, 'text/xml');
-            if (sspXml && sspXml.getElementsByTagName('parsererror').length == 0) {
-              let sspUrl = bidRequest.url.concat();
-
-              bidResponse.requestId = sspBidId;
-              bidResponse.bidderCode = BIDDER_CODE;
-              bidResponse.ad = '';
-              bidResponse.cpm = parseFloat(sspXml.getElementsByTagName('Pricing')[0].textContent);
-              bidResponse.width = sspBidWidth;
-              bidResponse.height = sspBidHeight;
-              bidResponse.ttl = BID_TTL_DEFAULT;
-              bidResponse.creativeId = sspXml.getElementsByTagName('Ad')[0].getAttribute('id');
-              bidResponse.currency = sspXml.getElementsByTagName('Pricing')[0].getAttribute('currency');
-              bidResponse.netRevenue = true;
-              bidResponse.vastUrl = sspUrl;
-              bidResponse.vastXml = sspXmlString;
-              bidResponse.mediaType = VIDEO;
+        requestData.imp.push(impObj);
+      });
 
-              bidResponses.push(bidResponse);
-            } else {
-              utils.logError('Error: Server response contained invalid XML');
-            }
-          } else {
-            utils.logError('Error: Could not associate bid request to server response');
+      serverRequestObjects.push({
+        method: 'POST',
+        url: buildUrl({
+          protocol: 'https',
+          hostname: 'rtb.lkqd.net',
+          pathname: '/ad',
+          search: {
+            pid: bid.params.publisherId || bid.params.placementId,
+            sid: bid.params.siteId,
+            output: 'rtb',
+            prebid: true
           }
-        } else {
-          utils.logError('Error: Could not associate bid request to server response');
-        }
-      } catch (e) {
-        utils.logError('Error: Could not interpret server response');
-      }
+        }),
+        data: requestData
+      });
+    });
+
+    return serverRequestObjects;
+  },
+  interpretResponse: function(serverResponse, bidRequest) {
+    const serverBody = serverResponse.body;
+    const bidResponses = [];
+
+    if (serverBody && serverBody.seatbid) {
+      _each(serverBody.seatbid, (seatbid) => {
+        _each(seatbid.bid, (bid) => {
+          if (bid.price > 0) {
+            const bidResponse = {
+              requestId: bidRequest.id,
+              creativeId: bid.crid,
+              cpm: bid.price,
+              width: bid.w,
+              height: bid.h,
+              currency: serverBody.cur,
+              netRevenue: true,
+              ttl: BID_TTL_DEFAULT,
+              ad: bid.adm,
+              meta: {
+                advertiserDomains: bid.adomain && Array.isArray(bid.adomain) ? bid.adomain : [],
+                mediaType: VIDEO
+              }
+            };
+
+            bidResponses.push(bidResponse);
+          }
+        });
+      });
+    } else {
+      logError('Error: No server response or server response was empty for the requested URL');
     }
-  } else {
-    utils.logError('Error: No server response or server response was empty for the requested URL');
-  }
-
-  return bidResponses;
-}
 
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [VIDEO],
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse
+    return bidResponses;
+  }
 }
 
 registerBidder(spec);
diff --git a/modules/lkqdBidAdapter.md b/modules/lkqdBidAdapter.md
index 1bd57ced4e0..9d7d24edda7 100644
--- a/modules/lkqdBidAdapter.md
+++ b/modules/lkqdBidAdapter.md
@@ -12,7 +12,7 @@ Connects to LKQD exchange for bids.
 
 LKQD bid adapter supports Video ads currently.
 
-For more information about [LKQD Ad Serving and Management](http://www.lkqd.com/ad-serving-and-management/), please contact [info@lkqd.com](info@lkqd.com).
+For more information about [LKQD Ad Serving and Management](http://www.lkqd.com/ad-serving-and-management/), please contact [vgi-video-prebid@verve.com](vgi-video-prebid@verve.com).
 
 # Sample Ad Unit: For Publishers
 ```javascript
diff --git a/modules/lockerdomeBidAdapter.js b/modules/lockerdomeBidAdapter.js
index 80c40b39f9a..5c38753c1e2 100644
--- a/modules/lockerdomeBidAdapter.js
+++ b/modules/lockerdomeBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { getBidIdParameter } from '../src/utils.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
@@ -16,17 +16,16 @@ export const spec = {
       return {
         requestId: bid.bidId,
         adUnitCode: bid.adUnitCode,
-        adUnitId: utils.getBidIdParameter('adUnitId', bid.params),
+        adUnitId: getBidIdParameter('adUnitId', bid.params),
         sizes: bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes
       };
     });
 
-    const bidderRequestCanonicalUrl = (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.canonicalUrl) || '';
-    const bidderRequestReferer = (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) || '';
     const payload = {
       bidRequests: adUnitBidRequests,
-      url: encodeURIComponent(bidderRequestCanonicalUrl),
-      referrer: encodeURIComponent(bidderRequestReferer)
+      // TODO: are these the right refererInfo values?
+      url: encodeURIComponent(bidderRequest?.refererInfo?.canonicalUrl || ''),
+      referrer: encodeURIComponent(bidderRequest?.refererInfo?.topmostLocation || '')
     };
     if (schain) {
       payload.schain = schain;
@@ -66,7 +65,10 @@ export const spec = {
         currency: bid.currency,
         netRevenue: bid.netRevenue,
         ad: bid.ad,
-        ttl: bid.ttl
+        ttl: bid.ttl,
+        meta: {
+          advertiserDomains: bid.adomain && Array.isArray(bid.adomain) ? bid.adomain : []
+        }
       };
     });
   },
diff --git a/modules/loganBidAdapter.js b/modules/loganBidAdapter.js
new file mode 100644
index 00000000000..7aa82e3046c
--- /dev/null
+++ b/modules/loganBidAdapter.js
@@ -0,0 +1,163 @@
+import { isFn, deepAccess, getWindowTop } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'logan';
+const AD_URL = 'https://USeast2.logan.ai/pbjs';
+const SYNC_URL = 'https://ssp-cookie.logan.ai'
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency || !bid.meta) {
+    return false;
+  }
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastXml || 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) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    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.sizes = mediaType[BANNER].sizes;
+        placement.adFormat = BANNER;
+      } else if (mediaType && mediaType[VIDEO] && mediaType[VIDEO].playerSize) {
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        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;
+        placement.adFormat = VIDEO;
+      } else if (mediaType && mediaType[NATIVE]) {
+        placement.native = mediaType[NATIVE];
+        placement.adFormat = 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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/loganBidAdapter.md b/modules/loganBidAdapter.md
new file mode 100644
index 00000000000..a4e082e47c2
--- /dev/null
+++ b/modules/loganBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: logan Bidder Adapter
+Module Type: logan Bidder Adapter
+Maintainer: support@logan.ai
+```
+
+# Description
+
+Module that connects to logan demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 'testBanner'
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 'testVideo'
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 'testNative'
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/logicadBidAdapter.js b/modules/logicadBidAdapter.js
index 74c00ee39d6..034450c447f 100644
--- a/modules/logicadBidAdapter.js
+++ b/modules/logicadBidAdapter.js
@@ -1,16 +1,20 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'logicad';
 const ENDPOINT_URL = 'https://pb.ladsp.com/adrequest/prebid';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, NATIVE],
   isBidRequestValid: function (bid) {
     return !!(bid.params && bid.params.tid);
   },
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const requests = [];
     for (let i = 0, len = bidRequests.length; i < len; i++) {
       const request = {
@@ -60,8 +64,10 @@ function newBidRequest(bid, bidderRequest) {
       mediaTypes: bid.mediaTypes
     }],
     prebidJsVersion: '$prebid.version$',
-    referrer: bidderRequest.refererInfo.referer,
+    // TODO: is 'page' the right value here?
+    referrer: bidderRequest.refererInfo.page,
     auctionStartTime: bidderRequest.auctionStart,
+    eids: bid.userIdAsEids,
   };
 }
 
diff --git a/modules/logicadBidAdapter.md b/modules/logicadBidAdapter.md
index 32d40a7d3cd..de439f3f8c2 100644
--- a/modules/logicadBidAdapter.md
+++ b/modules/logicadBidAdapter.md
@@ -11,15 +11,48 @@ Currently module supports only banner mediaType.
 
 # Test Parameters
 ```
-    var adUnits = [{
-        code: 'test-code',
-        sizes: [[300, 250],[300, 600]],
-        bids: [{
-            bidder: 'logicad',
-            params: {
-                tid: 'test',
-                page: 'url',
-            }
-        }]
-    }];
+var adUnits = [
+  // Banner adUnit
+  {
+    code: 'test-code',
+    sizes: [[300, 250], [300, 600]],
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    bids: [{
+      bidder: 'logicad',
+      params: {
+        tid: 'lfp-test-banner',
+        page: 'url'
+      }
+    }]
+  },
+  // Native adUnit
+  {
+    code: 'test-native-code',
+    sizes: [[1, 1]],
+    mediaTypes: {
+      native: {
+        title: {
+          required: true
+        },
+        image: {
+          required: true
+        },
+        sponsoredBy: {
+          required: true
+        }
+      }
+    },
+    bids: [{
+      bidder: 'logicad',
+      params: {
+        tid: 'lfp-test-native',
+        page: 'url'
+      }
+    }]
+  }
+];
 ```
diff --git a/modules/loglyliftBidAdapter.js b/modules/loglyliftBidAdapter.js
new file mode 100644
index 00000000000..47f6e54485d
--- /dev/null
+++ b/modules/loglyliftBidAdapter.js
@@ -0,0 +1,84 @@
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'loglylift';
+const ENDPOINT_URL = 'https://bid.logly.co.jp/prebid/client/v1';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
+
+  isBidRequestValid: function (bid) {
+    return !!(bid.params && bid.params.adspotId);
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
+    const requests = [];
+    for (let i = 0, len = bidRequests.length; i < len; i++) {
+      const request = {
+        method: 'POST',
+        url: ENDPOINT_URL + '?adspot_id=' + bidRequests[i].params.adspotId,
+        data: JSON.stringify(newBidRequest(bidRequests[i], bidderRequest)),
+        options: {},
+        bidderRequest
+      };
+      requests.push(request);
+    }
+    return requests;
+  },
+
+  interpretResponse: function (serverResponse, { bidderRequest }) {
+    serverResponse = serverResponse.body;
+    const bidResponses = [];
+    if (!serverResponse || serverResponse.error) {
+      return bidResponses;
+    }
+    serverResponse.bids.forEach(function (bid) {
+      bidResponses.push(bid);
+    })
+    return bidResponses;
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+
+    // sync if mediaType is native because not native ad itself has a function for sync
+    if (syncOptions.iframeEnabled && serverResponses.length > 0 && serverResponses[0].body.bids[0].native) {
+      syncs.push({
+        type: 'iframe',
+        url: 'https://sync.logly.co.jp/sync/sync.html'
+      });
+    }
+    return syncs;
+  }
+
+};
+
+function newBidRequest(bid, bidderRequest) {
+  const currencyObj = config.getConfig('currency');
+  const currency = (currencyObj && currencyObj.adServerCurrency) || 'USD';
+
+  return {
+    auctionId: bid.auctionId,
+    bidderRequestId: bid.bidderRequestId,
+    transactionId: bid.transactionId,
+    adUnitCode: bid.adUnitCode,
+    bidId: bid.bidId,
+    mediaTypes: bid.mediaTypes,
+    params: bid.params,
+    prebidJsVersion: '$prebid.version$',
+    url: window.location.href,
+    domain: bidderRequest.refererInfo.domain,
+    referer: bidderRequest.refererInfo.page,
+    auctionStartTime: bidderRequest.auctionStart,
+    currency: currency,
+    timeout: config.getConfig('bidderTimeout')
+  };
+}
+
+registerBidder(spec);
diff --git a/modules/loglyliftBidAdapter.md b/modules/loglyliftBidAdapter.md
new file mode 100644
index 00000000000..5505d66957d
--- /dev/null
+++ b/modules/loglyliftBidAdapter.md
@@ -0,0 +1,71 @@
+# Overview
+```
+Module Name: LOGLY lift for Publisher
+Module Type: Bidder Adapter
+Maintainer: dev@logly.co.jp
+```
+
+# Description
+Module that connects to Logly's demand sources.
+Currently module supports only native mediaType.
+
+# Test Parameters
+```
+var adUnits = [
+  // Banner adUnit
+  {
+    code: 'test-banner-code',
+    sizes: [[300, 250], [300, 600]],
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    bids: [{
+      bidder: 'loglylift',
+      params: {
+        adspotId: 1302078
+      }
+    }]
+  },
+  // Native adUnit
+  {
+    code: 'test-native-code',
+    sizes: [[1, 1]],
+    mediaTypes: {
+      native: {
+        title: {
+          required: true
+        },
+        image: {
+          required: true
+        },
+        sponsoredBy: {
+          required: true
+        }
+      }
+    },
+    bids: [{
+      bidder: 'loglylift',
+      params: {
+        adspotId: 4302078
+      }
+    }]
+  }
+];
+```
+
+# UserSync example
+
+```
+pbjs.setConfig({
+  userSync: {
+    filterSettings: {
+      iframe: {
+        bidders: '*', // '*' represents all bidders
+        filter: 'include'
+      }
+    }
+  }
+});
+```
diff --git a/modules/loopmeBidAdapter.js b/modules/loopmeBidAdapter.js
deleted file mode 100644
index 919e0b17294..00000000000
--- a/modules/loopmeBidAdapter.js
+++ /dev/null
@@ -1,149 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { Renderer } from '../src/Renderer.js';
-
-const LOOPME_ENDPOINT = 'https://loopme.me/api/hb';
-
-const entries = (obj) => {
-  let output = [];
-  for (let key in obj) {
-    if (obj.hasOwnProperty(key)) {
-      output.push([key, obj[key]])
-    }
-  }
-  return output;
-}
-
-export const spec = {
-  code: 'loopme',
-  supportedMediaTypes: [BANNER, VIDEO],
-  /**
-   * @param {object} bid
-   * @return boolean
-   */
-  isBidRequestValid: function(bid) {
-    if (typeof bid.params !== 'object') {
-      return false;
-    }
-
-    return !!bid.params.ak;
-  },
-  /**
-   * @param {BidRequest[]} bidRequests
-   * @param bidderRequest
-   * @return ServerRequest[]
-   */
-  buildRequests: function(bidRequests, bidderRequest) {
-    return bidRequests.map(bidRequest => {
-      bidRequest.startTime = new Date().getTime();
-      let payload = bidRequest.params;
-
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        payload.user_consent = bidderRequest.gdprConsent.consentString;
-      }
-
-      let queryString = entries(payload)
-        .map(item => `${item[0]}=${encodeURI(item[1])}`)
-        .join('&');
-
-      const adUnitSizes = bidRequest.mediaTypes[BANNER]
-        ? utils.getAdUnitSizes(bidRequest)
-        : utils.deepAccess(bidRequest.mediaTypes, 'video.playerSize');
-
-      const sizes =
-        '&sizes=' +
-        adUnitSizes
-          .map(size => `${size[0]}x${size[1]}`)
-          .join('&sizes=');
-
-      queryString = `${queryString}${sizes}${bidRequest.mediaTypes[VIDEO] ? '&media_type=video' : ''}`;
-
-      return {
-        method: 'GET',
-        url: `${LOOPME_ENDPOINT}`,
-        options: { withCredentials: false },
-        bidId: bidRequest.bidId,
-        data: queryString
-      };
-    });
-  },
-  /**
-   * @param {*} responseObj
-   * @param {BidRequest} bidRequest
-   * @return {Bid[]} An array of bids which
-   */
-  interpretResponse: function(response = {}, bidRequest) {
-    const responseObj = response.body;
-    if (
-      responseObj === null ||
-      typeof responseObj !== 'object'
-    ) {
-      return [];
-    }
-
-    if (
-      !responseObj.hasOwnProperty('ad') &&
-      !responseObj.hasOwnProperty('vastUrl')
-    ) {
-      return [];
-    }
-    // responseObj.vastUrl = 'https://rawgit.com/InteractiveAdvertisingBureau/VAST_Samples/master/VAST%201-2.0%20Samples/Inline_NonLinear_Verification_VAST2.0.xml';
-    if (responseObj.vastUrl) {
-      const renderer = Renderer.install({
-        id: bidRequest.bidId,
-        url: 'https://i.loopme.me/html/vast/loopme_flex.js',
-        loaded: false
-      });
-      renderer.setRender((bid) => {
-        renderer.push(function () {
-          var adverts = [{
-            'type': 'VAST',
-            'url': bid.vastUrl,
-            'autoClose': -1
-          }];
-          var config = {
-            containerId: bid.adUnitCode,
-            vastTimeout: 250,
-            ads: adverts,
-            user_consent: '%%USER_CONSENT%%',
-          };
-          window.L.flex.loader.load(config);
-        })
-      });
-      return [
-        {
-          requestId: bidRequest.bidId,
-          cpm: responseObj.cpm,
-          width: responseObj.width,
-          height: responseObj.height,
-          ttl: responseObj.ttl,
-          currency: responseObj.currency,
-          creativeId: responseObj.creativeId,
-          dealId: responseObj.dealId,
-          netRevenue: responseObj.netRevenue,
-          vastUrl: responseObj.vastUrl,
-          mediaType: VIDEO,
-          renderer
-        }
-      ];
-    }
-
-    return [
-      {
-        requestId: bidRequest.bidId,
-        cpm: responseObj.cpm,
-        width: responseObj.width,
-        height: responseObj.height,
-        ad: responseObj.ad,
-        ttl: responseObj.ttl,
-        currency: responseObj.currency,
-        creativeId: responseObj.creativeId,
-        dealId: responseObj.dealId,
-        netRevenue: responseObj.netRevenue,
-        mediaType: BANNER
-      }
-    ];
-  }
-};
-registerBidder(spec);
diff --git a/modules/loopmeBidAdapter.md b/modules/loopmeBidAdapter.md
deleted file mode 100644
index 1b195a118f2..00000000000
--- a/modules/loopmeBidAdapter.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Overview
-
-```
-Module Name:  LoopMe Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer:   support@loopme.com
-```
-
-# Description
-
-Connect to LoopMe's exchange for bids.
-
-# Test Parameters (Banner)
-```
-var adUnits = [{
-    code: 'test-div',
-    mediaTypes: {
-        banner: {
-            sizes: [[300, 250], [300,600]],
-        }
-    },
-    bids: [{
-        bidder: 'loopme',
-        params: {
-            ak: 'cc885e3acc'
-        }
-    }]
-}];
-```
-
-# Test Parameters (Video)
-```
-var adUnits = [{
-    code: 'video1',
-    mediaTypes: {
-        video: {
-            playerSize: [640, 480],
-            context: 'outstream'
-        }
-    },
-    bids: [{
-        bidder: 'loopme',
-        params: {
-            ak: '223051e07f'
-        }
-    }]
-}];
-```
diff --git a/modules/lotamePanoramaIdSystem.js b/modules/lotamePanoramaIdSystem.js
index cdf9131dd68..832d98e4f83 100644
--- a/modules/lotamePanoramaIdSystem.js
+++ b/modules/lotamePanoramaIdSystem.js
@@ -4,10 +4,20 @@
  * @module modules/lotamePanoramaId
  * @requires module:modules/userId
  */
-import * as utils from '../src/utils.js';
+import {
+  timestamp,
+  isStr,
+  logError,
+  isBoolean,
+  buildUrl,
+  isEmpty,
+  isArray,
+  isEmptyStr
+} from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { uspDataHandler } from '../src/adapterManager.js';
 
 const KEY_ID = 'panoramaId';
 const KEY_EXPIRY = `${KEY_ID}_expiry`;
@@ -16,8 +26,12 @@ const MODULE_NAME = 'lotamePanoramaId';
 const NINE_MONTHS_MS = 23328000 * 1000;
 const DAYS_TO_CACHE = 7;
 const DAY_MS = 60 * 60 * 24 * 1000;
+const MISSING_CORE_CONSENT = 111;
+const GVLID = 95;
+const ID_HOST = 'id.crwdcntrl.net';
 
-export const storage = getStorageManager(null, MODULE_NAME);
+export const storage = getStorageManager({gvlid: GVLID, moduleName: MODULE_NAME});
+let cookieDomain;
 
 /**
  * Set the Lotame First Party Profile ID in the first party namespace
@@ -25,8 +39,15 @@ export const storage = getStorageManager(null, MODULE_NAME);
  */
 function setProfileId(profileId) {
   if (storage.cookiesAreEnabled()) {
-    let expirationDate = new Date(utils.timestamp() + NINE_MONTHS_MS).toUTCString();
-    storage.setCookie(KEY_PROFILE, profileId, expirationDate, 'Lax', undefined, undefined);
+    let expirationDate = new Date(timestamp() + NINE_MONTHS_MS).toUTCString();
+    storage.setCookie(
+      KEY_PROFILE,
+      profileId,
+      expirationDate,
+      'Lax',
+      cookieDomain,
+      undefined
+    );
   }
   if (storage.hasLocalStorage()) {
     storage.setDataInLocalStorage(KEY_PROFILE, profileId, undefined);
@@ -37,12 +58,14 @@ function setProfileId(profileId) {
  * Get the Lotame profile id by checking cookies first and then local storage
  */
 function getProfileId() {
+  let profileId;
   if (storage.cookiesAreEnabled()) {
-    return storage.getCookie(KEY_PROFILE, undefined);
+    profileId = storage.getCookie(KEY_PROFILE, undefined);
   }
-  if (storage.hasLocalStorage()) {
-    return storage.getDataFromLocalStorage(KEY_PROFILE, undefined);
+  if (!profileId && storage.hasLocalStorage()) {
+    profileId = storage.getDataFromLocalStorage(KEY_PROFILE, undefined);
   }
+  return profileId;
 }
 
 /**
@@ -58,10 +81,11 @@ function getFromStorage(key) {
     const storedValueExp = storage.getDataFromLocalStorage(
       `${key}_exp`, undefined
     );
-    if (storedValueExp === '') {
+
+    if (storedValueExp === '' || storedValueExp === null) {
       value = storage.getDataFromLocalStorage(key, undefined);
     } else if (storedValueExp) {
-      if ((new Date(storedValueExp)).getTime() - Date.now() > 0) {
+      if ((new Date(parseInt(storedValueExp, 10))).getTime() - Date.now() > 0) {
         value = storage.getDataFromLocalStorage(key, undefined);
       }
     }
@@ -78,7 +102,7 @@ function getFromStorage(key) {
 function saveLotameCache(
   key,
   value,
-  expirationTimestamp = utils.timestamp() + DAYS_TO_CACHE * DAY_MS
+  expirationTimestamp = timestamp() + DAYS_TO_CACHE * DAY_MS
 ) {
   if (key && value) {
     let expirationDate = new Date(expirationTimestamp).toUTCString();
@@ -88,7 +112,7 @@ function saveLotameCache(
         value,
         expirationDate,
         'Lax',
-        undefined,
+        cookieDomain,
         undefined
       );
     }
@@ -105,20 +129,29 @@ function saveLotameCache(
 
 /**
  * Retrieve all the cached values from cookies and/or local storage
+ * @param {Number} clientId
  */
-function getLotameLocalCache() {
+function getLotameLocalCache(clientId = undefined) {
   let cache = {
     data: getFromStorage(KEY_ID),
     expiryTimestampMs: 0,
+    clientExpiryTimestampMs: 0,
   };
 
   try {
+    if (clientId) {
+      const rawClientExpiry = getFromStorage(`${KEY_EXPIRY}_${clientId}`);
+      if (isStr(rawClientExpiry)) {
+        cache.clientExpiryTimestampMs = parseInt(rawClientExpiry, 10);
+      }
+    }
+
     const rawExpiry = getFromStorage(KEY_EXPIRY);
-    if (utils.isStr(rawExpiry)) {
-      cache.expiryTimestampMs = parseInt(rawExpiry, 0);
+    if (isStr(rawExpiry)) {
+      cache.expiryTimestampMs = parseInt(rawExpiry, 10);
     }
   } catch (error) {
-    utils.logError(error);
+    logError(error);
   }
 
   return cache;
@@ -132,7 +165,14 @@ function clearLotameCache(key) {
   if (key) {
     if (storage.cookiesAreEnabled()) {
       let expirationDate = new Date(0).toUTCString();
-      storage.setCookie(key, '', expirationDate, 'Lax', undefined, undefined);
+      storage.setCookie(
+        key,
+        '',
+        expirationDate,
+        'Lax',
+        cookieDomain,
+        undefined
+      );
     }
     if (storage.hasLocalStorage()) {
       storage.removeDataFromLocalStorage(key, undefined);
@@ -141,61 +181,116 @@ function clearLotameCache(key) {
 }
 /** @type {Submodule} */
 export const lotamePanoramaIdSubmodule = {
-
   /**
    * used to link submodule with config
    * @type {string}
    */
   name: MODULE_NAME,
 
+  /**
+   * Vendor id of Lotame
+   * @type {Number}
+   */
+  gvlid: GVLID,
+
   /**
    * Decode the stored id value for passing to bid requests
    * @function decode
    * @param {(Object|string)} value
+   * @param {SubmoduleConfig|undefined} config
    * @returns {(Object|undefined)}
    */
-  decode(value, configParams) {
-    return utils.isStr(value) ? { 'lotamePanoramaId': value } : undefined;
+  decode(value, config) {
+    return isStr(value) ? { lotamePanoramaId: value } : undefined;
   },
 
   /**
    * Retrieve the Lotame Panorama Id
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
    * @param {(Object|undefined)} cacheIdObj
    * @returns {IdResponse|undefined}
    */
-  getId(configParams, consentData, cacheIdObj) {
-    let localCache = getLotameLocalCache();
+  getId(config, consentData, cacheIdObj) {
+    cookieDomain = lotamePanoramaIdSubmodule.findRootDomain();
+    const configParams = (config && config.params) || {};
+    const clientId = configParams.clientId;
+    const hasCustomClientId = !isEmpty(clientId);
+    const localCache = getLotameLocalCache(clientId);
 
-    let refreshNeeded = Date.now() > localCache.expiryTimestampMs;
+    const hasExpiredPanoId = Date.now() > localCache.expiryTimestampMs;
 
-    if (!refreshNeeded) {
+    if (hasCustomClientId) {
+      const hasFreshClientNoConsent = Date.now() < localCache.clientExpiryTimestampMs;
+      if (hasFreshClientNoConsent) {
+        // There is no consent
+        return {
+          id: undefined,
+          reason: 'NO_CLIENT_CONSENT',
+        };
+      }
+    }
+
+    if (!hasExpiredPanoId) {
       return {
-        id: localCache.data
+        id: localCache.data,
       };
     }
 
     const storedUserId = getProfileId();
 
+    // Add CCPA Consent data handling
+    const usp = uspDataHandler.getConsentData();
+
+    let usPrivacy;
+    if (typeof usp !== 'undefined' && !isEmpty(usp) && !isEmptyStr(usp)) {
+      usPrivacy = usp;
+    }
+    if (!usPrivacy) {
+      // fallback to 1st party cookie
+      usPrivacy = getFromStorage('us_privacy');
+    }
+
     const resolveIdFunction = function (callback) {
       let queryParams = {};
       if (storedUserId) {
-        queryParams.fp = storedUserId
+        queryParams.fp = storedUserId;
       }
 
-      if (consentData && utils.isBoolean(consentData.gdprApplies)) {
-        queryParams.gdpr_applies = consentData.gdprApplies;
-        if (consentData.gdprApplies) {
-          queryParams.gdpr_consent = consentData.consentString;
+      let consentString;
+      if (consentData) {
+        if (isBoolean(consentData.gdprApplies)) {
+          queryParams.gdpr_applies = consentData.gdprApplies;
         }
+        consentString = consentData.consentString;
+      }
+      // If no consent string, try to read it from 1st party cookies
+      if (!consentString) {
+        consentString = getFromStorage('eupubconsent-v2');
+      }
+      if (!consentString) {
+        consentString = getFromStorage('euconsent-v2');
+      }
+      if (consentString) {
+        queryParams.gdpr_consent = consentString;
       }
-      const url = utils.buildUrl({
+
+      // Add usPrivacy to the url
+      if (usPrivacy) {
+        queryParams.us_privacy = usPrivacy;
+      }
+
+      // Add clientId to the url
+      if (hasCustomClientId) {
+        queryParams.c = clientId;
+      }
+
+      const url = buildUrl({
         protocol: 'https',
-        host: `id.crwdcntrl.net`,
+        host: ID_HOST,
         pathname: '/id',
-        search: utils.isEmpty(queryParams) ? undefined : queryParams,
+        search: isEmpty(queryParams) ? undefined : queryParams,
       });
       ajax(
         url,
@@ -204,12 +299,35 @@ export const lotamePanoramaIdSubmodule = {
           if (response) {
             try {
               let responseObj = JSON.parse(response);
-              saveLotameCache(KEY_EXPIRY, responseObj.expiry_ts);
+              const hasNoConsentErrors = !(
+                isArray(responseObj.errors) &&
+                responseObj.errors.indexOf(MISSING_CORE_CONSENT) !== -1
+              );
 
-              if (utils.isStr(responseObj.profile_id)) {
-                setProfileId(responseObj.profile_id);
+              if (hasCustomClientId) {
+                if (hasNoConsentErrors) {
+                  clearLotameCache(`${KEY_EXPIRY}_${clientId}`);
+                } else if (isStr(responseObj.no_consent) && responseObj.no_consent === 'CLIENT') {
+                  saveLotameCache(
+                    `${KEY_EXPIRY}_${clientId}`,
+                    responseObj.expiry_ts,
+                    responseObj.expiry_ts
+                  );
+
+                  // End Processing
+                  callback();
+                  return;
+                }
+              }
+
+              saveLotameCache(KEY_EXPIRY, responseObj.expiry_ts, responseObj.expiry_ts);
 
-                if (utils.isStr(responseObj.core_id)) {
+              if (isStr(responseObj.profile_id)) {
+                if (hasNoConsentErrors) {
+                  setProfileId(responseObj.profile_id);
+                }
+
+                if (isStr(responseObj.core_id)) {
                   saveLotameCache(
                     KEY_ID,
                     responseObj.core_id,
@@ -220,11 +338,13 @@ export const lotamePanoramaIdSubmodule = {
                   clearLotameCache(KEY_ID);
                 }
               } else {
-                clearLotameCache(KEY_PROFILE);
+                if (hasNoConsentErrors) {
+                  clearLotameCache(KEY_PROFILE);
+                }
                 clearLotameCache(KEY_ID);
               }
             } catch (error) {
-              utils.logError(error);
+              logError(error);
             }
           }
           callback(coreId);
@@ -232,7 +352,7 @@ export const lotamePanoramaIdSubmodule = {
         undefined,
         {
           method: 'GET',
-          withCredentials: true
+          withCredentials: true,
         }
       );
     };
diff --git a/modules/lunamediaBidAdapter.js b/modules/lunamediaBidAdapter.js
deleted file mode 100755
index 83be806af17..00000000000
--- a/modules/lunamediaBidAdapter.js
+++ /dev/null
@@ -1,383 +0,0 @@
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const ADAPTER_VERSION = '1.0';
-const BIDDER_CODE = 'lunamedia';
-
-export const VIDEO_ENDPOINT = 'https://api.lunamedia.io/xp/get?pubid=';// 0cf8d6d643e13d86a5b6374148a4afac';
-export const BANNER_ENDPOINT = 'https://api.lunamedia.io/xp/get?pubid=';// 0cf8d6d643e13d86a5b6374148a4afac';
-export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/loader/outstream.js';
-export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'skip'];
-export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
-
-let pubid = '';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
-
-  isBidRequestValid(bidRequest) {
-    if (typeof bidRequest != 'undefined') {
-      if (bidRequest.bidder !== BIDDER_CODE && typeof bidRequest.params === 'undefined') { return false; }
-      if (bidRequest === '' || bidRequest.params.placement === '' || bidRequest.params.pubid === '') { return false; }
-      return true;
-    } else { return false; }
-  },
-
-  buildRequests(bids, bidderRequest) {
-    let requests = [];
-    let videoBids = bids.filter(bid => isVideoBidValid(bid));
-    let bannerBids = bids.filter(bid => isBannerBidValid(bid));
-    videoBids.forEach(bid => {
-      pubid = getVideoBidParam(bid, 'pubid');
-      requests.push({
-        method: 'POST',
-        url: VIDEO_ENDPOINT + pubid,
-        data: createVideoRequestData(bid, bidderRequest),
-        bidRequest: bid
-      });
-    });
-
-    bannerBids.forEach(bid => {
-      pubid = getBannerBidParam(bid, 'pubid');
-      requests.push({
-        method: 'POST',
-        url: BANNER_ENDPOINT + pubid,
-        data: createBannerRequestData(bid, bidderRequest),
-        bidRequest: bid
-      });
-    });
-    return requests;
-  },
-
-  interpretResponse(serverResponse, {bidRequest}) {
-    let response = serverResponse.body;
-    if (response !== null && utils.isEmpty(response) == false) {
-      if (isVideoBid(bidRequest)) {
-        let bidResponse = {
-          requestId: response.id,
-          bidderCode: BIDDER_CODE,
-          cpm: response.seatbid[0].bid[0].price,
-          width: response.seatbid[0].bid[0].w,
-          height: response.seatbid[0].bid[0].h,
-          ttl: response.seatbid[0].bid[0].ttl || 60,
-          creativeId: response.seatbid[0].bid[0].crid,
-          currency: response.cur,
-          mediaType: VIDEO,
-          netRevenue: true
-        }
-
-        if (response.seatbid[0].bid[0].adm) {
-          bidResponse.vastXml = response.seatbid[0].bid[0].adm;
-          bidResponse.adResponse = {
-            content: response.seatbid[0].bid[0].adm
-          };
-        } else {
-          bidResponse.vastUrl = response.seatbid[0].bid[0].nurl;
-        }
-
-        return bidResponse;
-      } else {
-        return {
-          requestId: response.id,
-          bidderCode: BIDDER_CODE,
-          cpm: response.seatbid[0].bid[0].price,
-          width: response.seatbid[0].bid[0].w,
-          height: response.seatbid[0].bid[0].h,
-          ad: response.seatbid[0].bid[0].adm,
-          ttl: response.seatbid[0].bid[0].ttl || 60,
-          creativeId: response.seatbid[0].bid[0].crid,
-          currency: response.cur,
-          mediaType: BANNER,
-          netRevenue: true
-        }
-      }
-    }
-  }
-};
-
-function isBannerBid(bid) {
-  return utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
-}
-
-function isVideoBid(bid) {
-  return utils.deepAccess(bid, 'mediaTypes.video');
-}
-
-function isVideoBidValid(bid) {
-  return isVideoBid(bid) && getVideoBidParam(bid, 'pubid') && getVideoBidParam(bid, 'placement');
-}
-
-function isBannerBidValid(bid) {
-  return isBannerBid(bid) && getBannerBidParam(bid, 'pubid') && getBannerBidParam(bid, 'placement');
-}
-
-function getVideoBidParam(bid, key) {
-  return utils.deepAccess(bid, 'params.video.' + key) || utils.deepAccess(bid, 'params.' + key);
-}
-
-function getBannerBidParam(bid, key) {
-  return utils.deepAccess(bid, 'params.banner.' + key) || utils.deepAccess(bid, 'params.' + key);
-}
-
-function isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
-}
-
-function isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
-}
-
-function getDoNotTrack() {
-  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNoTrack === '1' || navigator.doNotTrack === 'yes';
-}
-
-function findAndFillParam(o, key, value) {
-  try {
-    if (typeof value === 'function') {
-      o[key] = value();
-    } else {
-      o[key] = value;
-    }
-  } catch (ex) {}
-}
-
-function getOsVersion() {
-  let clientStrings = [
-    { s: 'Android', r: /Android/ },
-    { s: 'iOS', r: /(iPhone|iPad|iPod)/ },
-    { s: 'Mac OS X', r: /Mac OS X/ },
-    { s: 'Mac OS', r: /(MacPPC|MacIntel|Mac_PowerPC|Macintosh)/ },
-    { s: 'Linux', r: /(Linux|X11)/ },
-    { s: 'Windows 10', r: /(Windows 10.0|Windows NT 10.0)/ },
-    { s: 'Windows 8.1', r: /(Windows 8.1|Windows NT 6.3)/ },
-    { s: 'Windows 8', r: /(Windows 8|Windows NT 6.2)/ },
-    { s: 'Windows 7', r: /(Windows 7|Windows NT 6.1)/ },
-    { s: 'Windows Vista', r: /Windows NT 6.0/ },
-    { s: 'Windows Server 2003', r: /Windows NT 5.2/ },
-    { s: 'Windows XP', r: /(Windows NT 5.1|Windows XP)/ },
-    { s: 'UNIX', r: /UNIX/ },
-    { s: 'Search Bot', r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/ }
-  ];
-  let cs = find(clientStrings, cs => cs.r.test(navigator.userAgent));
-  return cs ? cs.s : 'unknown';
-}
-
-function getFirstSize(sizes) {
-  return (sizes && sizes.length) ? sizes[0] : { w: undefined, h: undefined };
-}
-
-function parseSizes(sizes) {
-  return utils.parseSizesInput(sizes).map(size => {
-    let [ width, height ] = size.split('x');
-    return {
-      w: parseInt(width, 10) || undefined,
-      h: parseInt(height, 10) || undefined
-    };
-  });
-}
-
-function getVideoSizes(bid) {
-  return parseSizes(utils.deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
-}
-
-function getBannerSizes(bid) {
-  return parseSizes(utils.deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
-}
-
-function getTopWindowReferrer() {
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return '';
-  }
-}
-
-function getVideoTargetingParams(bid) {
-  return Object.keys(Object(bid.params.video))
-    .filter(param => includes(VIDEO_TARGETING, param))
-    .reduce((obj, param) => {
-      obj[ param ] = bid.params.video[ param ];
-      return obj;
-    }, {});
-}
-
-function createVideoRequestData(bid, bidderRequest) {
-  let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
-
-  let sizes = getVideoSizes(bid);
-  let firstSize = getFirstSize(sizes);
-
-  let video = getVideoTargetingParams(bid);
-  const o = {
-    'device': {
-      'langauge': (global.navigator.language).split('-')[0],
-      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
-      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
-      'js': 1,
-      'os': getOsVersion()
-    },
-    'at': 2,
-    'site': {},
-    'tmax': 3000,
-    'cur': ['USD'],
-    'id': bid.bidId,
-    'imp': [],
-    'regs': {
-      'ext': {
-      }
-    },
-    'user': {
-      'ext': {
-      }
-    }
-  };
-
-  o.site['page'] = topLocation.href;
-  o.site['domain'] = topLocation.hostname;
-  o.site['search'] = topLocation.search;
-  o.site['domain'] = topLocation.hostname;
-  o.site['ref'] = topReferrer;
-  o.site['mobile'] = isMobile() ? 1 : 0;
-  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
-
-  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
-
-  findAndFillParam(o.site, 'name', function() {
-    return global.top.document.title;
-  });
-
-  findAndFillParam(o.device, 'h', function() {
-    return global.screen.height;
-  });
-  findAndFillParam(o.device, 'w', function() {
-    return global.screen.width;
-  });
-
-  let placement = getVideoBidParam(bid, 'placement');
-  let floor = getVideoBidParam(bid, 'floor');
-  if (floor == null) { floor = 0.5; }
-
-  for (let j = 0; j < sizes.length; j++) {
-    o.imp.push({
-      'id': '' + j,
-      'displaymanager': '' + BIDDER_CODE,
-      'displaymanagerver': '' + ADAPTER_VERSION,
-      'tagId': placement,
-      'bidfloor': floor,
-      'bidfloorcur': 'USD',
-      'secure': secure,
-      'video': Object.assign({
-        'id': utils.generateUUID(),
-        'pos': 0,
-        'w': firstSize.w,
-        'h': firstSize.h,
-        'mimes': DEFAULT_MIMES
-      }, video)
-
-    });
-  }
-
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
-    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
-    o.user.ext = {'consent': consentString};
-  }
-
-  return o;
-}
-
-function getTopWindowLocation(bidderRequest) {
-  let url = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
-  return utils.parseUrl(config.getConfig('pageUrl') || url, { decodeSearchAsString: true });
-}
-
-function createBannerRequestData(bid, bidderRequest) {
-  let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
-
-  let sizes = getBannerSizes(bid);
-
-  const o = {
-    'device': {
-      'langauge': (global.navigator.language).split('-')[0],
-      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
-      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
-      'js': 1
-    },
-    'at': 2,
-    'site': {},
-    'tmax': 3000,
-    'cur': ['USD'],
-    'id': bid.bidId,
-    'imp': [],
-    'regs': {
-      'ext': {
-      }
-    },
-    'user': {
-      'ext': {
-      }
-    }
-  };
-
-  o.site['page'] = topLocation.href;
-  o.site['domain'] = topLocation.hostname;
-  o.site['search'] = topLocation.search;
-  o.site['domain'] = topLocation.hostname;
-  o.site['ref'] = topReferrer;
-  o.site['mobile'] = isMobile() ? 1 : 0;
-  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
-
-  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
-
-  findAndFillParam(o.site, 'name', function() {
-    return global.top.document.title;
-  });
-
-  findAndFillParam(o.device, 'h', function() {
-    return global.screen.height;
-  });
-  findAndFillParam(o.device, 'w', function() {
-    return global.screen.width;
-  });
-
-  let placement = getBannerBidParam(bid, 'placement');
-  for (let j = 0; j < sizes.length; j++) {
-    let size = sizes[j];
-
-    let floor = getBannerBidParam(bid, 'floor');
-    if (floor == null) { floor = 0.1; }
-
-    o.imp.push({
-      'id': '' + j,
-      'displaymanager': '' + BIDDER_CODE,
-      'displaymanagerver': '' + ADAPTER_VERSION,
-      'tagId': placement,
-      'bidfloor': floor,
-      'bidfloorcur': 'USD',
-      'secure': secure,
-      'banner': {
-        'id': utils.generateUUID(),
-        'pos': 0,
-        'w': size['w'],
-        'h': size['h']
-      }
-    });
-  }
-
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
-    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
-    o.user.ext = {'consent': consentString};
-  }
-
-  return o;
-}
-
-registerBidder(spec);
diff --git a/modules/lunamediaBidAdapter.md b/modules/lunamediaBidAdapter.md
deleted file mode 100755
index d0314d0fa41..00000000000
--- a/modules/lunamediaBidAdapter.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Overview
-
-```
-Module Name: LunaMedia Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: lokesh@advangelists.com
-```
-
-# Description
-
-Connects to LunaMedia exchange for bids.
-
-LunaMedia bid adapter supports Banner and Video ads currently.
-
-For more informatio
-
-# Sample Display Ad Unit: For Publishers
-```javascript
-
-var displayAdUnit = [
-{
-    code: 'display',
-    mediaTypes: {
-        banner: {
-            sizes: [[300, 250],[320, 50]]
-        }
-    }
-    bids: [{
-        bidder: 'lunamedia',
-        params: {
-            pubid: '121ab139faf7ac67428a23f1d0a9a71b',
-            placement: 1234
-        }
-    }]
-}];
-```
-
-# Sample Video Ad Unit: For Publishers
-```javascript
-
-var videoAdUnit = {
-	code: 'video',
-	sizes: [320,480],
-	mediaTypes: {
-	  video: {
-	  	playerSize : [[320, 480]], 
-	  	context: 'instream'
-	  }
-	},
-    bids: [
-      {
-      	bidder: 'lunamedia',
-      	params: {
-        	pubid: '121ab139faf7ac67428a23f1d0a9a71b',
-        	placement: 1234,
-        	video: {
-            	id: 123,
-            	skip: 1,
-            	mimes : ['video/mp4', 'application/javascript'],
-            	playbackmethod : [2,6],
-            	maxduration: 30
-          	}
-      	}
-      }
-    ]
-  };
-```
\ No newline at end of file
diff --git a/modules/lunamediahbBidAdapter.js b/modules/lunamediahbBidAdapter.js
new file mode 100644
index 00000000000..66838014e18
--- /dev/null
+++ b/modules/lunamediahbBidAdapter.js
@@ -0,0 +1,140 @@
+import { logMessage } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'lunamediahb';
+const AD_URL = 'https://balancer.lmgssp.com/?c=o&m=multi';
+const SYNC_URL = 'https://cookie.lmgssp.com';
+
+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) || Boolean(bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers);
+    default:
+      return false;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.placementId)));
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let winTop = window;
+    let location;
+    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
+    try {
+      location = new URL(bidderRequest.refererInfo.page)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      logMessage(e);
+    };
+
+    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 || {},
+      };
+      const mediaType = bid.mediaTypes
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.sizes = mediaType[BANNER].sizes;
+        placement.traffic = BANNER;
+      } else if (mediaType && mediaType[VIDEO]) {
+        if (mediaType[VIDEO].playerSize) {
+          placement.wPlayer = mediaType[VIDEO].playerSize[0];
+          placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        }
+        placement.traffic = VIDEO;
+        placement.videoContext = mediaType[VIDEO].context || 'instream'
+      } else if (mediaType && mediaType[NATIVE]) {
+        placement.native = mediaType[NATIVE];
+        placement.traffic = 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)) {
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/lunamediahbBidAdapter.md b/modules/lunamediahbBidAdapter.md
new file mode 100644
index 00000000000..184dd846a9d
--- /dev/null
+++ b/modules/lunamediahbBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: lunamedia Bidder Adapter
+Module Type: lunamedia Bidder Adapter
+Maintainer: support@lunamedia.io
+```
+
+# Description
+
+Module that connects to lunamedia demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'lunamediahb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'lunamediahb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'lunamediahb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/luponmediaBidAdapter.js b/modules/luponmediaBidAdapter.js
old mode 100644
new mode 100755
index 0a2eed0ad13..835c04ba074
--- a/modules/luponmediaBidAdapter.js
+++ b/modules/luponmediaBidAdapter.js
@@ -1,7 +1,8 @@
-import * as utils from '../src/utils.js';
+import {isArray, logMessage, deepAccess, logWarn, parseSizesInput, deepSetValue, generateUUID, isEmpty, logError, _each, isFn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER} from '../src/mediaTypes.js';
+import { ajax } from '../src/ajax.js';
 
 const BIDDER_CODE = 'luponmedia';
 const ENDPOINT_URL = 'https://rtb.adxpremium.services/openrtb2/auction';
@@ -13,6 +14,101 @@ const DIGITRUST_PROP_NAMES = {
   }
 };
 
+var sizeMap = {
+  1: '468x60',
+  2: '728x90',
+  5: '120x90',
+  7: '125x125',
+  8: '120x600',
+  9: '160x600',
+  10: '300x600',
+  13: '200x200',
+  14: '250x250',
+  15: '300x250',
+  16: '336x280',
+  17: '240x400',
+  19: '300x100',
+  31: '980x120',
+  32: '250x360',
+  33: '180x500',
+  35: '980x150',
+  37: '468x400',
+  38: '930x180',
+  39: '750x100',
+  40: '750x200',
+  41: '750x300',
+  42: '2x4',
+  43: '320x50',
+  44: '300x50',
+  48: '300x300',
+  53: '1024x768',
+  54: '300x1050',
+  55: '970x90',
+  57: '970x250',
+  58: '1000x90',
+  59: '320x80',
+  60: '320x150',
+  61: '1000x1000',
+  64: '580x500',
+  65: '640x480',
+  66: '930x600',
+  67: '320x480',
+  68: '1800x1000',
+  72: '320x320',
+  73: '320x160',
+  78: '980x240',
+  79: '980x300',
+  80: '980x400',
+  83: '480x300',
+  85: '300x120',
+  90: '548x150',
+  94: '970x310',
+  95: '970x100',
+  96: '970x210',
+  101: '480x320',
+  102: '768x1024',
+  103: '480x280',
+  105: '250x800',
+  108: '320x240',
+  113: '1000x300',
+  117: '320x100',
+  125: '800x250',
+  126: '200x600',
+  144: '980x600',
+  145: '980x150',
+  152: '1000x250',
+  156: '640x320',
+  159: '320x250',
+  179: '250x600',
+  195: '600x300',
+  198: '640x360',
+  199: '640x200',
+  213: '1030x590',
+  214: '980x360',
+  221: '1x1',
+  229: '320x180',
+  230: '2000x1400',
+  232: '580x400',
+  234: '6x6',
+  251: '2x2',
+  256: '480x820',
+  257: '400x600',
+  258: '500x200',
+  259: '998x200',
+  264: '970x1000',
+  265: '1920x1080',
+  274: '1800x200',
+  278: '320x500',
+  282: '320x400',
+  288: '640x380',
+  548: '500x1000',
+  550: '980x480',
+  552: '300x200',
+  558: '640x640'
+};
+
+_each(sizeMap, (item, key) => sizeMap[item] = key);
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER],
@@ -44,12 +140,12 @@ export const spec = {
     let parsedRequest = JSON.parse(request.data);
     let parsedReferrer = parsedRequest.site && parsedRequest.site.ref ? parsedRequest.site.ref : '';
     try {
-      if (response.body && response.body.seatbid && utils.isArray(response.body.seatbid)) {
+      if (response.body && response.body.seatbid && isArray(response.body.seatbid)) {
         // Supporting multiple bid responses for same adSize
         respCur = response.body.cur || respCur;
         response.body.seatbid.forEach(seatbidder => {
           seatbidder.bid &&
-            utils.isArray(seatbidder.bid) &&
+            isArray(seatbidder.bid) &&
             seatbidder.bid.forEach(bid => {
               let newBid = {
                 requestId: bid.impid,
@@ -70,7 +166,7 @@ export const spec = {
         });
       }
     } catch (error) {
-      utils.logError(error);
+      logError(error);
     }
     return bidResponses;
   },
@@ -80,7 +176,7 @@ export const spec = {
       responses.forEach(csResp => {
         if (csResp.body && csResp.body.ext && csResp.body.ext.usersyncs) {
           try {
-            let response = csResp.body.ext.usersyncs
+            let response = csResp.body.ext.usersyncs;
             let bidders = response.bidder_status;
             for (let synci in bidders) {
               let thisSync = bidders[synci];
@@ -89,41 +185,95 @@ export const spec = {
                 let type = thisSync.usersync.type;
 
                 if (!url) {
-                  utils.logError(`No sync url for bidder luponmedia.`);
+                  logError(`No sync url for bidder luponmedia.`);
                 } else if ((type === 'image' || type === 'redirect') && syncOptions.pixelEnabled) {
-                  utils.logMessage(`Invoking image pixel user sync for luponmedia`);
+                  logMessage(`Invoking image pixel user sync for luponmedia`);
                   allUserSyncs.push({type: 'image', url: url});
                 } else if (type == 'iframe' && syncOptions.iframeEnabled) {
-                  utils.logMessage(`Invoking iframe user sync for luponmedia`);
+                  logMessage(`Invoking iframe user sync for luponmedia`);
                   allUserSyncs.push({type: 'iframe', url: url});
                 } else {
-                  utils.logError(`User sync type "${type}" not supported for luponmedia`);
+                  logError(`User sync type "${type}" not supported for luponmedia`);
                 }
               }
             }
           } catch (e) {
-            utils.logError(e);
+            logError(e);
           }
         }
       });
     } else {
-      utils.logWarn('Luponmedia: Please enable iframe/pixel based user sync.');
+      logWarn('Luponmedia: Please enable iframe/pixel based user sync.');
     }
 
     hasSynced = true;
     return allUserSyncs;
   },
+  onBidWon: bid => {
+    const bidString = JSON.stringify(bid);
+    spec.sendWinningsToServer(bidString);
+  },
+  sendWinningsToServer: data => {
+    let mutation = `mutation {createWin(input: {win: {eventData: "${window.btoa(data)}"}}) {win {createTime } } }`;
+    let dataToSend = JSON.stringify({ query: mutation });
+
+    ajax('https://analytics.adxpremium.services/graphql', null, dataToSend, {
+      contentType: 'application/json',
+      method: 'POST'
+    });
+  }
 };
 
+export function hasValidSupplyChainParams(schain) {
+  let isValid = false;
+  const requiredFields = ['asi', 'sid', 'hp'];
+  if (!schain.nodes) return isValid;
+  isValid = schain.nodes.reduce((status, node) => {
+    if (!status) return status;
+    return requiredFields.every(field => node[field]);
+  }, true);
+  if (!isValid) logError('LuponMedia: required schain params missing');
+  return isValid;
+}
+
+var hasSynced = false;
+
+export function resetUserSync() {
+  hasSynced = false;
+}
+
+export function masSizeOrdering(sizes) {
+  const MAS_SIZE_PRIORITY = [15, 2, 9];
+
+  return sizes.sort((first, second) => {
+    // sort by MAS_SIZE_PRIORITY priority order
+    const firstPriority = MAS_SIZE_PRIORITY.indexOf(first);
+    const secondPriority = MAS_SIZE_PRIORITY.indexOf(second);
+
+    if (firstPriority > -1 || secondPriority > -1) {
+      if (firstPriority === -1) {
+        return 1;
+      }
+      if (secondPriority === -1) {
+        return -1;
+      }
+      return firstPriority - secondPriority;
+    }
+
+    // and finally ascending order
+    return first - second;
+  });
+}
+
 function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
   bidRequest.startTime = new Date().getTime();
 
-  const bannerParams = utils.deepAccess(bidRequest, 'mediaTypes.banner');
+  const bannerParams = deepAccess(bidRequest, 'mediaTypes.banner');
 
   let bannerSizes = [];
 
   if (bannerParams && bannerParams.sizes) {
-    const sizes = utils.parseSizesInput(bannerParams.sizes);
+    const sizes = parseSizesInput(bannerParams.sizes);
 
     // get banner sizes in form [{ w: <int>, h: <int> }, ...]
     const format = sizes.map(size => {
@@ -164,17 +314,33 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     },
     user: {
     }
-  }
+  };
 
-  const bidFloor = parseFloat(utils.deepAccess(bidRequest, 'params.floor'));
+  let bidFloor;
+  if (isFn(bidRequest.getFloor) && !config.getConfig('disableFloors')) {
+    let floorInfo;
+    try {
+      floorInfo = bidRequest.getFloor({
+        currency: 'USD',
+        mediaType: 'video',
+        size: parseSizes(bidRequest, 'video')
+      });
+    } catch (e) {
+      logError('LuponMedia: getFloor threw an error: ', e);
+    }
+    bidFloor = typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? parseFloat(floorInfo.floor) : undefined;
+  } else {
+    bidFloor = parseFloat(deepAccess(bidRequest, 'params.floor'));
+  }
   if (!isNaN(bidFloor)) {
     data.imp[0].bidfloor = bidFloor;
   }
+
   appendSiteAppDevice(data, bidRequest, bidderRequest);
 
   const digiTrust = _getDigiTrustQueryParams(bidRequest, 'PREBID_SERVER');
   if (digiTrust) {
-    utils.deepSetValue(data, 'user.ext.digitrust', digiTrust);
+    deepSetValue(data, 'user.ext.digitrust', digiTrust);
   }
 
   if (bidderRequest.gdprConsent) {
@@ -184,27 +350,27 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
       gdprApplies = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
     }
 
-    utils.deepSetValue(data, 'regs.ext.gdpr', gdprApplies);
-    utils.deepSetValue(data, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+    deepSetValue(data, 'regs.ext.gdpr', gdprApplies);
+    deepSetValue(data, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
   }
 
   if (bidderRequest.uspConsent) {
-    utils.deepSetValue(data, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    deepSetValue(data, 'regs.ext.us_privacy', bidderRequest.uspConsent);
   }
 
   // Set user uuid
-  utils.deepSetValue(data, 'user.id', utils.generateUUID());
+  deepSetValue(data, 'user.id', generateUUID());
 
   // set crumbs
   if (bidRequest.crumbs && bidRequest.crumbs.pubcid) {
-    utils.deepSetValue(data, 'user.buyeruid', bidRequest.crumbs.pubcid);
+    deepSetValue(data, 'user.buyeruid', bidRequest.crumbs.pubcid);
   } else {
-    utils.deepSetValue(data, 'user.buyeruid', utils.generateUUID());
+    deepSetValue(data, 'user.buyeruid', generateUUID());
   }
 
   if (bidRequest.userId && typeof bidRequest.userId === 'object' &&
         (bidRequest.userId.tdid || bidRequest.userId.pubcid || bidRequest.userId.lipb || bidRequest.userId.idl_env)) {
-    utils.deepSetValue(data, 'user.ext.eids', []);
+    deepSetValue(data, 'user.ext.eids', []);
 
     if (bidRequest.userId.tdid) {
       data.user.ext.eids.push({
@@ -242,7 +408,7 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
       };
 
       if (Array.isArray(bidRequest.userId.lipb.segments) && bidRequest.userId.lipb.segments.length) {
-        utils.deepSetValue(data, 'rp.target.LIseg', bidRequest.userId.lipb.segments);
+        deepSetValue(data, 'rp.target.LIseg', bidRequest.userId.lipb.segments);
       }
     }
 
@@ -258,17 +424,21 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
   }
 
   if (config.getConfig('coppa') === true) {
-    utils.deepSetValue(data, 'regs.coppa', 1);
+    deepSetValue(data, 'regs.coppa', 1);
   }
 
   if (bidRequest.schain && hasValidSupplyChainParams(bidRequest.schain)) {
-    utils.deepSetValue(data, 'source.ext.schain', bidRequest.schain);
+    deepSetValue(data, 'source.ext.schain', bidRequest.schain);
   }
 
+  // TODO: getConfig('fpd.context') should not have worked even with legacy FPD support - 'fpd' gets translated
+  // into 'ortb2' by `setConfig`
+  // Unclear what the intent was here - maybe `const {context: siteData, user: userData} = getLegacyFpd(config.getConfig('ortb2'))` ?
+  // (with PB7 `config.getConfig('ortb2')` should be replaced by `bidderRequest.ortb2`)
   const siteData = Object.assign({}, bidRequest.params.inventory, config.getConfig('fpd.context'));
   const userData = Object.assign({}, bidRequest.params.visitor, config.getConfig('fpd.user'));
 
-  if (!utils.isEmpty(siteData) || !utils.isEmpty(userData)) {
+  if (!isEmpty(siteData) || !isEmpty(userData)) {
     const bidderData = {
       bidders: [ bidderRequest.bidderCode ],
       config: {
@@ -276,37 +446,27 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
       }
     };
 
-    if (!utils.isEmpty(siteData)) {
+    if (!isEmpty(siteData)) {
       bidderData.config.fpd.site = siteData;
     }
 
-    if (!utils.isEmpty(userData)) {
+    if (!isEmpty(userData)) {
       bidderData.config.fpd.user = userData;
     }
 
-    utils.deepSetValue(data, 'ext.prebid.bidderconfig.0', bidderData);
+    deepSetValue(data, 'ext.prebid.bidderconfig.0', bidderData);
   }
 
-  const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
+  // TODO: bidRequest.fpd is not the right place for pbadslot - who's filling that in, if anyone?
+  // is this meant to be bidRequest.ortb2Imp.ext.data.pbadslot?
+  const pbAdSlot = deepAccess(bidRequest, 'fpd.context.pbAdSlot');
   if (typeof pbAdSlot === 'string' && pbAdSlot) {
-    utils.deepSetValue(data.imp[0].ext, 'context.data.adslot', pbAdSlot);
+    deepSetValue(data.imp[0].ext, 'context.data.adslot', pbAdSlot);
   }
 
   return data;
 }
 
-export function hasValidSupplyChainParams(schain) {
-  let isValid = false;
-  const requiredFields = ['asi', 'sid', 'hp'];
-  if (!schain.nodes) return isValid;
-  isValid = schain.nodes.reduce((status, node) => {
-    if (!status) return status;
-    return requiredFields.every(field => node[field]);
-  }, true);
-  if (!isValid) utils.logError('LuponMedia: required schain params missing');
-  return isValid;
-}
-
 function _getDigiTrustQueryParams(bidRequest = {}, endpointName) {
   if (!endpointName || !DIGITRUST_PROP_NAMES[endpointName]) {
     return null;
@@ -314,7 +474,7 @@ function _getDigiTrustQueryParams(bidRequest = {}, endpointName) {
   const propNames = DIGITRUST_PROP_NAMES[endpointName];
 
   function getDigiTrustId() {
-    const bidRequestDigitrust = utils.deepAccess(bidRequest, 'userId.digitrustid.data');
+    const bidRequestDigitrust = deepAccess(bidRequest, 'userId.digitrustid.data');
     if (bidRequestDigitrust) {
       return bidRequestDigitrust;
     }
@@ -340,11 +500,12 @@ function _getDigiTrustQueryParams(bidRequest = {}, endpointName) {
 }
 
 function _getPageUrl(bidRequest, bidderRequest) {
-  let pageUrl = config.getConfig('pageUrl');
+  // TODO: do the fallbacks make sense here?
+  let pageUrl = bidderRequest.refererInfo.page;
   if (bidRequest.params.referrer) {
     pageUrl = bidRequest.params.referrer;
   } else if (!pageUrl) {
-    pageUrl = bidderRequest.refererInfo.referer;
+    pageUrl = bidderRequest.refererInfo.topmostLocation;
   }
   return bidRequest.params.secure ? pageUrl.replace(/^http:/i, 'https:') : pageUrl;
 }
@@ -365,10 +526,52 @@ function appendSiteAppDevice(data, bidRequest, bidderRequest) {
   }
 }
 
-var hasSynced = false;
+/**
+ * @param sizes
+ * @returns {*}
+ */
+function mapSizes(sizes) {
+  return parseSizesInput(sizes)
+    // map sizes while excluding non-matches
+    .reduce((result, size) => {
+      let mappedSize = parseInt(sizeMap[size], 10);
+      if (mappedSize) {
+        result.push(mappedSize);
+      }
+      return result;
+    }, []);
+}
 
-export function resetUserSync() {
-  hasSynced = false;
+function parseSizes(bid, mediaType) {
+  let params = bid.params;
+  if (mediaType === 'video') {
+    let size = [];
+    if (params.video && params.video.playerWidth && params.video.playerHeight) {
+      size = [
+        params.video.playerWidth,
+        params.video.playerHeight
+      ];
+    } else if (Array.isArray(deepAccess(bid, 'mediaTypes.video.playerSize')) && bid.mediaTypes.video.playerSize.length === 1) {
+      size = bid.mediaTypes.video.playerSize[0];
+    } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0 && Array.isArray(bid.sizes[0]) && bid.sizes[0].length > 1) {
+      size = bid.sizes[0];
+    }
+    return size;
+  }
+
+  // Deprecated: temp legacy support
+  let sizes = [];
+  if (Array.isArray(params.sizes)) {
+    sizes = params.sizes;
+  } else if (typeof deepAccess(bid, 'mediaTypes.banner.sizes') !== 'undefined') {
+    sizes = mapSizes(bid.mediaTypes.banner.sizes);
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizes = mapSizes(bid.sizes);
+  } else {
+    logWarn('LuponMedia: no sizes are setup or found');
+  }
+
+  return masSizeOrdering(sizes);
 }
 
 registerBidder(spec);
diff --git a/modules/mabidderBidAdapter.js b/modules/mabidderBidAdapter.js
new file mode 100644
index 00000000000..12da791d2c4
--- /dev/null
+++ b/modules/mabidderBidAdapter.js
@@ -0,0 +1,60 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+const BIDDER_CODE = 'mabidder';
+export const baseUrl = 'https://prebid.ecdrsvc.com/bid';
+export const spec = {
+  supportedMediaTypes: [BANNER],
+  code: BIDDER_CODE,
+  isBidRequestValid: function(bid) {
+    if (typeof bid.params === 'undefined') {
+      return false;
+    }
+    return !!(bid.params.ppid && bid.sizes && Array.isArray(bid.sizes) && Array.isArray(bid.sizes[0]))
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const fpd = bidderRequest.ortb2;
+    const bids = [];
+    validBidRequests.forEach(bidRequest => {
+      const sizes = [];
+      bidRequest.sizes.forEach(size => {
+        sizes.push({
+          width: size[0],
+          height: size[1]
+        });
+      });
+      bids.push({
+        bidId: bidRequest.bidId,
+        sizes: sizes,
+        ppid: bidRequest.params.ppid,
+        mediaType: BANNER
+      })
+    });
+    const req = {
+      url: baseUrl,
+      method: 'POST',
+      data: {
+        v: $$PREBID_GLOBAL$$.version,
+        bids: bids,
+        url: bidderRequest.refererInfo.page || '',
+        referer: bidderRequest.refererInfo.ref || '',
+        fpd: fpd || {}
+      }
+    };
+
+    return req;
+  },
+  interpretResponse: function(serverResponse, request) {
+    const bidResponses = [];
+    if (serverResponse.body) {
+      const body = serverResponse.body;
+      if (!body || typeof body !== 'object' || !body.Responses || !(body.Responses.length > 0)) {
+        return [];
+      }
+      body.Responses.forEach((bidResponse) => {
+        bidResponses.push(bidResponse);
+      });
+    }
+    return bidResponses;
+  }
+}
+registerBidder(spec);
diff --git a/modules/mabidderBidAdapter.md b/modules/mabidderBidAdapter.md
new file mode 100644
index 00000000000..ee57cb8cab2
--- /dev/null
+++ b/modules/mabidderBidAdapter.md
@@ -0,0 +1,31 @@
+#Overview
+
+```
+Module Name: mabidder Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: lmprebidadapter@loblaw.ca
+```
+
+# Description
+
+Module that connects to MediaAisle demand sources
+
+# Test Parameters
+```
+var adUnits = [
+    {
+        code: 'test_banner',
+        mediaTypes: {
+            banner: {
+                sizes: [300, 250]
+            }
+        },
+        bids: [{
+            bidder: 'mabidder',
+            params: {
+                ppid: 'test'
+            }
+        }],
+    }
+];
+```
diff --git a/modules/madvertiseBidAdapter.js b/modules/madvertiseBidAdapter.js
index d0cafbfd6b8..457ff2409b8 100644
--- a/modules/madvertiseBidAdapter.js
+++ b/modules/madvertiseBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { parseSizesInput, _each } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 
@@ -15,7 +15,7 @@ export const spec = {
     if (typeof bid.params !== 'object') {
       return false;
     }
-    let sizes = utils.parseSizesInput(bid.sizes);
+    let sizes = parseSizesInput(bid.sizes);
     if (!sizes || sizes.length === 0) {
       return false;
     }
@@ -46,7 +46,7 @@ export const spec = {
         }
       }
 
-      utils._each(bidRequest.params, (item, key) => src = src + '&' + key + '=' + item);
+      _each(bidRequest.params, (item, key) => src = src + '&' + key + '=' + item);
 
       if (typeof bidRequest.params.u == 'undefined') {
         src = src + '&u=' + navigator.userAgent;
@@ -86,7 +86,11 @@ export const spec = {
       creativeId: responseObj.creativeId,
       netRevenue: responseObj.netRevenue,
       currency: responseObj.currency,
-      dealId: responseObj.dealId
+      dealId: responseObj.dealId,
+      meta: {
+        advertiserDomains: Array.isArray(responseObj.adomain) ? responseObj.adomain : []
+      }
+
     };
     return [bid];
   },
diff --git a/modules/madvertiseBidAdapter.md b/modules/madvertiseBidAdapter.md
index 4576e955cbd..b57925f2dc1 100644
--- a/modules/madvertiseBidAdapter.md
+++ b/modules/madvertiseBidAdapter.md
@@ -30,7 +30,7 @@ support@madvertise.com for more information.
             {
                 bidder: "madvertise",
                 params: {
-                    s: "/4543756/prebidadaptor/madvertiseHB"
+                    zoneId: "/4543756/prebidadaptor/madvertiseHB"
                 }
             }
         ]
diff --git a/modules/magniteAnalyticsAdapter.js b/modules/magniteAnalyticsAdapter.js
new file mode 100644
index 00000000000..c6911897e84
--- /dev/null
+++ b/modules/magniteAnalyticsAdapter.js
@@ -0,0 +1,915 @@
+import { generateUUID, mergeDeep, deepAccess, parseUrl, logError, pick, isEmpty, logWarn, debugTurnedOn, parseQS, getWindowLocation, isAdUnitCodeMatchingSlot, isNumber, deepSetValue, deepClone, logInfo, isGptPubadsDefined } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const RUBICON_GVL_ID = 52;
+export const storage = getStorageManager({ gvlid: RUBICON_GVL_ID, moduleName: 'magnite' });
+const COOKIE_NAME = 'mgniSession';
+const LAST_SEEN_EXPIRE_TIME = 1800000; // 30 mins
+const END_EXPIRE_TIME = 21600000; // 6 hours
+const MODULE_NAME = 'Magnite Analytics';
+const BID_REJECTED_IPF = 'rejected-ipf';
+
+// List of known rubicon aliases
+// This gets updated on auction init to account for any custom aliases present
+let rubiconAliases = ['rubicon'];
+
+const pbsErrorMap = {
+  1: 'timeout-error',
+  2: 'input-error',
+  3: 'connect-error',
+  4: 'request-error',
+  999: 'generic-error'
+}
+
+let prebidGlobal = getGlobal();
+const {
+  EVENTS: {
+    AUCTION_INIT,
+    AUCTION_END,
+    BID_REQUESTED,
+    BID_RESPONSE,
+    BIDDER_DONE,
+    BID_TIMEOUT,
+    BID_WON,
+    BILLABLE_EVENT
+  },
+  STATUS: {
+    GOOD,
+    NO_BID
+  },
+  BID_STATUS: {
+    BID_REJECTED
+  }
+} = CONSTANTS;
+
+// The saved state of rubicon specific setConfig controls
+export let rubiConf;
+// Saving state of all our data we want
+let cache;
+const resetConfs = () => {
+  cache = {
+    auctions: {},
+    auctionOrder: [],
+    timeouts: {},
+    billing: {},
+    pendingEvents: {},
+    eventPending: false,
+    elementIdMap: {},
+    sessionData: {}
+  }
+  rubiConf = {
+    pvid: generateUUID().slice(0, 8),
+    analyticsEventDelay: 500,
+    analyticsBatchTimeout: 5000,
+    analyticsProcessDelay: 1,
+    dmBilling: {
+      enabled: false,
+      vendors: [],
+      waitForAuction: true
+    }
+  }
+}
+resetConfs();
+
+config.getConfig('rubicon', config => {
+  mergeDeep(rubiConf, config.rubicon);
+  if (deepAccess(config, 'rubicon.updatePageView') === true) {
+    rubiConf.pvid = generateUUID().slice(0, 8)
+  }
+});
+
+// pbs confs
+let serverConfig;
+config.getConfig('s2sConfig', ({ s2sConfig }) => {
+  serverConfig = s2sConfig;
+});
+
+const DEFAULT_INTEGRATION = 'pbjs';
+
+const adUnitIsOnlyInstream = adUnit => {
+  return adUnit.mediaTypes && Object.keys(adUnit.mediaTypes).length === 1 && deepAccess(adUnit, 'mediaTypes.video.context') === 'instream';
+}
+
+const sendPendingEvents = () => {
+  cache.pendingEvents.trigger = `batched-${Object.keys(cache.pendingEvents).sort().join('-')}`;
+  sendEvent(cache.pendingEvents);
+  cache.pendingEvents = {};
+  cache.eventPending = false;
+}
+
+const addEventToQueue = (event, auctionId, eventName) => {
+  // If it's auction has not left yet, add it there
+  if (cache.auctions[auctionId] && !cache.auctions[auctionId].sent) {
+    cache.auctions[auctionId].pendingEvents = mergeDeep(cache.auctions[auctionId].pendingEvents, event);
+  } else if (rubiConf.analyticsEventDelay > 0) {
+    // else if we are trying to batch stuff up, add it to pending events to be fired
+    cache.pendingEvents = mergeDeep(cache.pendingEvents, event);
+
+    // If no event is pending yet, start a timer for them to be sent and attempted to be gathered together
+    if (!cache.eventPending) {
+      setTimeout(sendPendingEvents, rubiConf.analyticsEventDelay);
+      cache.eventPending = true;
+    }
+  } else {
+    // else - send it solo
+    event.trigger = `solo-${eventName}`;
+    sendEvent(event);
+  }
+}
+
+const sendEvent = payload => {
+  const event = {
+    ...getTopLevelDetails(),
+    ...payload
+  }
+  ajax(
+    endpoint,
+    null,
+    JSON.stringify(event),
+    {
+      contentType: 'application/json'
+    }
+  );
+}
+
+const sendAuctionEvent = (auctionId, trigger) => {
+  let auctionCache = cache.auctions[auctionId];
+  const auctionEvent = formatAuction(auctionCache.auction);
+
+  auctionCache.sent = true;
+  sendEvent({
+    auctions: [auctionEvent],
+    ...(auctionCache.pendingEvents || {}), // if any pending events were attached
+    trigger
+  });
+}
+
+const formatAuction = auction => {
+  const auctionEvent = deepClone(auction);
+
+  auctionEvent.samplingFactor = 1;
+
+  // We stored adUnits and bids as objects for quick lookups, now they are mapped into arrays for PBA
+  auctionEvent.adUnits = Object.entries(auctionEvent.adUnits).map(([tid, adUnit]) => {
+    adUnit.bids = Object.entries(adUnit.bids).map(([bidId, bid]) => {
+      // determine adUnit.status from its bid statuses. Use priority below to determine, higher index is better
+      let statusPriority = ['error', 'no-bid', 'success'];
+      if (statusPriority.indexOf(bid.status) > statusPriority.indexOf(adUnit.status)) {
+        adUnit.status = bid.status;
+      }
+
+      // If PBS told us to overwrite the bid ID, do so
+      if (bid.pbsBidId) {
+        bid.oldBidId = bid.bidId;
+        bid.bidId = bid.pbsBidId;
+        delete bid.pbsBidId;
+      }
+      return bid;
+    });
+    return adUnit;
+  });
+  return auctionEvent;
+}
+
+const isBillingEventValid = event => {
+  // vendor is whitelisted
+  const isWhitelistedVendor = rubiConf.dmBilling.vendors.includes(event.vendor);
+  // event is not duplicated
+  const isNotDuplicate = typeof deepAccess(cache.billing, `${event.vendor}.${event.billingId}`) !== 'boolean';
+  // billingId is defined and a string
+  return typeof event.billingId === 'string' && isWhitelistedVendor && isNotDuplicate;
+}
+
+const formatBillingEvent = event => {
+  let billingEvent = deepClone(event);
+  // Pass along type if is string and not empty else general
+  billingEvent.type = (typeof event.type === 'string' && event.type) || 'general';
+  billingEvent.accountId = accountId;
+  // mark as sent
+  deepSetValue(cache.billing, `${event.vendor}.${event.billingId}`, true);
+  return billingEvent;
+}
+
+const getBidPrice = bid => {
+  // get the cpm from bidResponse
+  let cpm;
+  let currency;
+  if (bid.status === BID_REJECTED && typeof deepAccess(bid, 'floorData.cpmAfterAdjustments') === 'number') {
+    // if bid was rejected and bid.floorData.cpmAfterAdjustments use it
+    cpm = bid.floorData.cpmAfterAdjustments;
+    currency = bid.floorData.floorCurrency;
+  } else if (typeof bid.currency === 'string' && bid.currency.toUpperCase() === 'USD') {
+    // bid is in USD use it
+    return Number(bid.cpm);
+  } else {
+    // else grab cpm
+    cpm = bid.cpm;
+    currency = bid.currency;
+  }
+  // if after this it is still going and is USD then return it.
+  if (currency === 'USD') {
+    return Number(cpm);
+  }
+  // otherwise we convert and return
+  try {
+    return Number(prebidGlobal.convertCurrency(cpm, currency, 'USD'));
+  } catch (err) {
+    logWarn(`${MODULE_NAME}: Could not determine the bidPriceUSD of the bid `, bid);
+    bid.conversionError = true;
+    bid.ogCurrency = currency;
+    bid.ogPrice = cpm;
+    return 0;
+  }
+}
+
+export const parseBidResponse = (bid, previousBidResponse) => {
+  // The current bidResponse for this matching requestId/bidRequestId
+  let responsePrice = getBidPrice(bid)
+  // we need to compare it with the previous one (if there was one) log highest only
+  // THIS WILL CHANGE WITH ALLOWING MULTIBID BETTER
+  if (previousBidResponse && previousBidResponse.bidPriceUSD > responsePrice) {
+    return previousBidResponse;
+  }
+
+  return pick(bid, [
+    'bidPriceUSD', () => responsePrice,
+    'dealId', dealId => dealId || undefined,
+    'mediaType',
+    'dimensions', () => {
+      const width = bid.width || bid.playerWidth;
+      const height = bid.height || bid.playerHeight;
+      return (width && height) ? { width, height } : undefined;
+    },
+    'floorValue', () => deepAccess(bid, 'floorData.floorValue'),
+    'floorRuleValue', () => deepAccess(bid, 'floorData.floorRuleValue'),
+    'floorRule', () => debugTurnedOn() ? deepAccess(bid, 'floorData.floorRule') : undefined,
+    'adomains', () => {
+      const adomains = deepAccess(bid, 'meta.advertiserDomains');
+      const validAdomains = Array.isArray(adomains) && adomains.filter(domain => typeof domain === 'string');
+      return validAdomains && validAdomains.length > 0 ? validAdomains.slice(0, 10) : undefined
+    },
+    'networkId', () => {
+      const networkId = deepAccess(bid, 'meta.networkId');
+      // if not a valid after this, set to undefined so it gets filtered out
+      return (networkId && networkId.toString()) || undefined;
+    },
+    'conversionError', conversionError => conversionError === true || undefined, // only pass if exactly true
+    'ogCurrency',
+    'ogPrice',
+  ]);
+}
+
+const addFloorData = floorData => {
+  if (floorData.location === 'noData') {
+    return pick(floorData, [
+      'location',
+      'fetchStatus',
+      'floorProvider as provider'
+    ]);
+  } else {
+    return pick(floorData, [
+      'location',
+      'modelVersion as modelName',
+      'modelWeight',
+      'modelTimestamp',
+      'skipped',
+      'enforcement', () => deepAccess(floorData, 'enforcements.enforceJS'),
+      'dealsEnforced', () => deepAccess(floorData, 'enforcements.floorDeals'),
+      'skipRate',
+      'fetchStatus',
+      'floorMin',
+      'floorProvider as provider'
+    ]);
+  }
+}
+
+let pageReferer;
+
+const getTopLevelDetails = () => {
+  let payload = {
+    channel: 'web',
+    integration: rubiConf.int_type || DEFAULT_INTEGRATION,
+    referrerUri: pageReferer,
+    version: '$prebid.version$',
+    referrerHostname: magniteAdapter.referrerHostname || getHostNameFromReferer(pageReferer),
+    timestamps: {
+      timeSincePageLoad: performance.now(),
+      eventTime: Date.now(),
+      prebidLoaded: magniteAdapter.MODULE_INITIALIZED_TIME
+    }
+  }
+
+  // Add DM wrapper details
+  if (rubiConf.wrapperName) {
+    payload.wrapper = {
+      name: rubiConf.wrapperName,
+      family: rubiConf.wrapperFamily,
+      rule: rubiConf.rule_name
+    }
+  }
+
+  if (cache.sessionData) {
+    // gather session info
+    payload.session = pick(cache.sessionData, [
+      'id',
+      'pvid',
+      'start',
+      'expires'
+    ]);
+    // Any FPKVS set?
+    if (!isEmpty(cache.sessionData.fpkvs)) {
+      payload.fpkvs = Object.keys(cache.sessionData.fpkvs).map(key => {
+        return { key, value: cache.sessionData.fpkvs[key] };
+      });
+    }
+  }
+  return payload;
+}
+
+export const getHostNameFromReferer = referer => {
+  try {
+    magniteAdapter.referrerHostname = parseUrl(referer, { noDecodeWholeURL: true }).hostname;
+  } catch (e) {
+    logError(`${MODULE_NAME}: Unable to parse hostname from supplied url: `, referer, e);
+    magniteAdapter.referrerHostname = '';
+  }
+  return magniteAdapter.referrerHostname
+};
+
+const getRpaCookie = () => {
+  let encodedCookie = storage.getDataFromLocalStorage(COOKIE_NAME);
+  if (encodedCookie) {
+    try {
+      return JSON.parse(window.atob(encodedCookie));
+    } catch (e) {
+      logError(`${MODULE_NAME}: Unable to decode ${COOKIE_NAME} value: `, e);
+    }
+  }
+  return {};
+}
+
+const setRpaCookie = (decodedCookie) => {
+  try {
+    storage.setDataInLocalStorage(COOKIE_NAME, window.btoa(JSON.stringify(decodedCookie)));
+  } catch (e) {
+    logError(`${MODULE_NAME}: Unable to encode ${COOKIE_NAME} value: `, e);
+  }
+}
+
+const updateRpaCookie = () => {
+  const currentTime = Date.now();
+  let decodedRpaCookie = getRpaCookie();
+  if (
+    !Object.keys(decodedRpaCookie).length ||
+    (currentTime - decodedRpaCookie.lastSeen) > LAST_SEEN_EXPIRE_TIME ||
+    decodedRpaCookie.expires < currentTime
+  ) {
+    decodedRpaCookie = {
+      id: generateUUID(),
+      start: currentTime,
+      expires: currentTime + END_EXPIRE_TIME, // six hours later,
+    }
+  }
+  // possible that decodedRpaCookie is undefined, and if it is, we probably are blocked by storage or some other exception
+  if (Object.keys(decodedRpaCookie).length) {
+    decodedRpaCookie.lastSeen = currentTime;
+    decodedRpaCookie.fpkvs = { ...decodedRpaCookie.fpkvs, ...getFpkvs() };
+    decodedRpaCookie.pvid = rubiConf.pvid;
+    setRpaCookie(decodedRpaCookie)
+  }
+  return decodedRpaCookie;
+}
+
+/*
+  Filters and converts URL Params into an object and returns only KVs that match the 'utm_KEY' format
+*/
+const getUtmParams = () => {
+  let search;
+
+  try {
+    search = parseQS(getWindowLocation().search);
+  } catch (e) {
+    search = {};
+  }
+
+  return Object.keys(search).reduce((accum, param) => {
+    if (param.match(/utm_/)) {
+      accum[param.replace(/utm_/, '')] = search[param];
+    }
+    return accum;
+  }, {});
+}
+
+const getFpkvs = () => {
+  rubiConf.fpkvs = Object.assign((rubiConf.fpkvs || {}), getUtmParams());
+
+  // convert all values to strings
+  Object.keys(rubiConf.fpkvs).forEach(key => {
+    rubiConf.fpkvs[key] = rubiConf.fpkvs[key] + '';
+  });
+
+  return rubiConf.fpkvs;
+}
+
+/*
+  Checks the alias registry for any entries of the rubicon bid adapter.
+  adds to the rubiconAliases list if found
+*/
+const setRubiconAliases = (aliasRegistry) => {
+  const otherAliases = Object.keys(aliasRegistry).filter(alias => aliasRegistry[alias] === 'rubicon');
+  rubiconAliases.push(...otherAliases);
+}
+
+const sizeToDimensions = size => {
+  return {
+    width: size.w || size[0],
+    height: size.h || size[1]
+  };
+}
+
+const findMatchingAdUnitFromAuctions = (matchesFunction, returnFirstMatch) => {
+  // finding matching adUnit / auction
+  let matches = {};
+
+  // loop through auctions in order and adunits
+  for (const auctionId of cache.auctionOrder) {
+    const auction = cache.auctions[auctionId].auction;
+    for (const transactionId in auction.adUnits) {
+      const adUnit = auction.adUnits[transactionId];
+
+      // check if this matches
+      let doesMatch;
+      try {
+        doesMatch = matchesFunction(adUnit, auction);
+      } catch (error) {
+        logWarn(`${MODULE_NAME}: Error running matches function: ${returnFirstMatch}`, error);
+        doesMatch = false;
+      }
+      if (doesMatch) {
+        matches = { adUnit, auction };
+
+        // we either return first match or we want last one matching so go to end
+        if (returnFirstMatch) return matches;
+      }
+    }
+  }
+  return matches;
+}
+
+const getRenderingIds = bidWonData => {
+  // if bid caching off -> return the bidWon auction id
+  if (!config.getConfig('useBidCache')) {
+    return {
+      renderTransactionId: bidWonData.transactionId,
+      renderAuctionId: bidWonData.auctionId
+    };
+  }
+
+  // a rendering auction id is the LATEST auction / adunit which contains GAM ID's
+  const matchingFunction = (adUnit, auction) => {
+    // does adUnit match our bidWon and gam id's are present
+    const gamHasRendered = deepAccess(cache, `auctions.${auction.auctionId}.gamRenders.${adUnit.transactionId}`);
+    return adUnit.adUnitCode === bidWonData.adUnitCode && gamHasRendered;
+  }
+  let { adUnit, auction } = findMatchingAdUnitFromAuctions(matchingFunction, false);
+  // If no match was found, we will use the actual bid won auction id
+  return {
+    renderTransactionId: (adUnit && adUnit.transactionId) || bidWonData.transactionId,
+    renderAuctionId: (auction && auction.auctionId) || bidWonData.auctionId
+  }
+}
+
+const formatBidWon = bidWonData => {
+  // get transaction and auction id of where this "rendered"
+  const { renderTransactionId, renderAuctionId } = getRenderingIds(bidWonData);
+
+  const isCachedBid = renderTransactionId !== bidWonData.transactionId;
+  logInfo(`${MODULE_NAME}: Bid Won : `, {
+    isCachedBid,
+    renderAuctionId,
+    renderTransactionId,
+    sourceAuctionId: bidWonData.auctionId,
+    sourceTransactionId: bidWonData.transactionId,
+  });
+
+  // get the bid from the source auction id
+  let bid = deepAccess(cache, `auctions.${bidWonData.auctionId}.auction.adUnits.${bidWonData.transactionId}.bids.${bidWonData.requestId}`);
+  let adUnit = deepAccess(cache, `auctions.${bidWonData.auctionId}.auction.adUnits.${bidWonData.transactionId}`);
+  let bidWon = {
+    ...bid,
+    sourceAuctionId: bidWonData.auctionId,
+    renderAuctionId,
+    transactionId: bidWonData.transactionId,
+    sourceTransactionId: bidWonData.transactionId,
+    bidId: bid.pbsBidId || bidWonData.bidId || bidWonData.requestId, // if PBS had us overwrite bidId, use that as signal
+    renderTransactionId,
+    accountId,
+    siteId: adUnit.siteId,
+    zoneId: adUnit.zoneId,
+    mediaTypes: adUnit.mediaTypes,
+    adUnitCode: adUnit.adUnitCode,
+    isCachedBid: isCachedBid || undefined // only send if it is true (save some space)
+  }
+  delete bidWon.pbsBidId; // if pbsBidId is there delete it (no need to pass it)
+  return bidWon;
+}
+
+const formatGamEvent = (slotEvent, adUnit, auction) => {
+  const gamEvent = pick(slotEvent, [
+    // these come in as `null` from Gpt, which when stringified does not get removed
+    // so set explicitly to undefined when not a number
+    'advertiserId', advertiserId => isNumber(advertiserId) ? advertiserId : undefined,
+    'creativeId', creativeId => isNumber(slotEvent.sourceAgnosticCreativeId) ? slotEvent.sourceAgnosticCreativeId : isNumber(creativeId) ? creativeId : undefined,
+    'lineItemId', lineItemId => isNumber(slotEvent.sourceAgnosticLineItemId) ? slotEvent.sourceAgnosticLineItemId : isNumber(lineItemId) ? lineItemId : undefined,
+    'adSlot', () => slotEvent.slot.getAdUnitPath(),
+    'isSlotEmpty', () => slotEvent.isEmpty || undefined
+  ]);
+  gamEvent.auctionId = auction.auctionId;
+  gamEvent.transactionId = adUnit.transactionId;
+  return gamEvent;
+}
+
+const subscribeToGamSlots = () => {
+  window.googletag.pubads().addEventListener('slotRenderEnded', event => {
+    const isMatchingAdSlot = isAdUnitCodeMatchingSlot(event.slot);
+
+    // We want to find the FIRST auction - adUnit that matches and does not have gam data yet
+    const matchingFunction = (adUnit, auction) => {
+      // first it has to match the slot
+      // if the code is present in the elementIdMap then we use the matched id as code here
+      const elementIds = cache.elementIdMap[adUnit.adUnitCode] || [adUnit.adUnitCode];
+      const matchesSlot = elementIds.some(isMatchingAdSlot);
+
+      // next it has to have NOT already been counted as gam rendered
+      const gamHasRendered = deepAccess(cache, `auctions.${auction.auctionId}.gamRenders.${adUnit.transactionId}`);
+      return matchesSlot && !gamHasRendered;
+    }
+    let { adUnit, auction } = findMatchingAdUnitFromAuctions(matchingFunction, true);
+
+    const slotName = `${event.slot.getAdUnitPath()} - ${event.slot.getSlotElementId()}`;
+
+    if (!adUnit || !auction) {
+      logInfo(`${MODULE_NAME}: Could not find matching adUnit for Gam Render: `, {
+        slotName
+      });
+      return;
+    }
+    const auctionId = auction.auctionId;
+
+    logInfo(`${MODULE_NAME}: Gam Render: `, {
+      slotName,
+      transactionId: adUnit.transactionId,
+      auctionId: auctionId,
+      adUnit: adUnit,
+    });
+
+    // if we have an adunit, then we need to make a gam event
+    const gamEvent = formatGamEvent(event, adUnit, auction);
+
+    // marking that this prebid adunit has had its matching gam render found
+    deepSetValue(cache, `auctions.${auctionId}.gamRenders.${adUnit.transactionId}`, true);
+
+    addEventToQueue({ gamRenders: [gamEvent] }, auctionId, 'gam');
+
+    // If this auction now has all gam slots rendered, fire the payload
+    if (!cache.auctions[auctionId].sent && Object.keys(cache.auctions[auctionId].gamRenders).every(tid => cache.auctions[auctionId].gamRenders[tid])) {
+      // clear the auction end timeout
+      clearTimeout(cache.timeouts[auctionId]);
+      delete cache.timeouts[auctionId];
+
+      // wait for bid wons a bit or send right away
+      if (rubiConf.analyticsEventDelay > 0) {
+        setTimeout(() => {
+          sendAuctionEvent(auctionId, 'gam-delayed');
+        }, rubiConf.analyticsEventDelay);
+      } else {
+        sendAuctionEvent(auctionId, 'gam');
+      }
+    }
+  });
+}
+
+let accountId;
+let endpoint;
+
+let magniteAdapter = adapter({ analyticsType: 'endpoint' });
+
+magniteAdapter.originEnableAnalytics = magniteAdapter.enableAnalytics;
+function enableMgniAnalytics(config = {}) {
+  let error = false;
+  // endpoint
+  endpoint = deepAccess(config, 'options.endpoint');
+  if (!endpoint) {
+    logError(`${MODULE_NAME}: required endpoint missing`);
+    error = true;
+  }
+  // accountId
+  accountId = Number(deepAccess(config, 'options.accountId'));
+  if (!accountId) {
+    logError(`${MODULE_NAME}: required accountId missing`);
+    error = true;
+  }
+  if (!error) {
+    magniteAdapter.originEnableAnalytics(config);
+  }
+  // listen to gam slot renders!
+  if (isGptPubadsDefined()) {
+    subscribeToGamSlots();
+  } else {
+    window.googletag = window.googletag || {};
+    window.googletag.cmd = window.googletag.cmd || [];
+    window.googletag.cmd.push(() => subscribeToGamSlots());
+  }
+};
+
+const handleBidWon = args => {
+  const bidWon = formatBidWon(args);
+  addEventToQueue({ bidsWon: [bidWon] }, bidWon.renderAuctionId, 'bidWon');
+}
+
+magniteAdapter.enableAnalytics = enableMgniAnalytics;
+
+magniteAdapter.originDisableAnalytics = magniteAdapter.disableAnalytics;
+magniteAdapter.disableAnalytics = function () {
+  // trick analytics module to register our enable back as main one
+  magniteAdapter._oldEnable = enableMgniAnalytics;
+  endpoint = undefined;
+  accountId = undefined;
+  resetConfs();
+  magniteAdapter.originDisableAnalytics();
+};
+
+magniteAdapter.onDataDeletionRequest = function () {
+  if (storage.localStorageIsEnabled()) {
+    storage.removeDataFromLocalStorage(COOKIE_NAME);
+  } else {
+    throw Error('Unable to access local storage, no data deleted');
+  }
+};
+
+magniteAdapter.MODULE_INITIALIZED_TIME = Date.now();
+magniteAdapter.referrerHostname = '';
+
+magniteAdapter.track = ({ eventType, args }) => {
+  switch (eventType) {
+    case AUCTION_INIT:
+      // Update session
+      cache.sessionData = storage.localStorageIsEnabled() && updateRpaCookie();
+      // set the rubicon aliases
+      setRubiconAliases(adapterManager.aliasRegistry);
+
+      // latest page "referer"
+      pageReferer = deepAccess(args, 'bidderRequests.0.refererInfo.page');
+
+      // set auction level data
+      let auctionData = pick(args, [
+        'auctionId',
+        'timestamp as auctionStart',
+        'timeout as clientTimeoutMillis',
+      ]);
+      auctionData.accountId = accountId;
+
+      // Order bidders were called
+      auctionData.bidderOrder = args.bidderRequests.map(bidderRequest => bidderRequest.bidderCode);
+
+      // Price Floors information
+      const floorData = deepAccess(args, 'bidderRequests.0.bids.0.floorData');
+      if (floorData) {
+        auctionData.floors = addFloorData(floorData);
+      }
+
+      // GDPR info
+      const gdprData = deepAccess(args, 'bidderRequests.0.gdprConsent');
+      if (gdprData) {
+        auctionData.gdpr = pick(gdprData, [
+          'gdprApplies as applies',
+          'consentString',
+          'apiVersion as version'
+        ]);
+      }
+
+      // User ID Data included in auction
+      const userIds = Object.keys(deepAccess(args, 'bidderRequests.0.bids.0.userId', {})).map(id => {
+        return { provider: id, hasId: true }
+      });
+      if (userIds.length) {
+        auctionData.user = { ids: userIds };
+      }
+
+      if (serverConfig) {
+        auctionData.serverTimeoutMillis = serverConfig.timeout;
+      }
+
+      // lets us keep a map of adunit and wether it had a gam or bid won render yet, used to track when to send events
+      let gamRenders = {};
+      // adunits saved as map of transactionIds
+      auctionData.adUnits = args.adUnits.reduce((adMap, adUnit) => {
+        let ad = pick(adUnit, [
+          'code as adUnitCode',
+          'transactionId',
+          'mediaTypes', mediaTypes => Object.keys(mediaTypes),
+          'sizes as dimensions', sizes => (sizes || [[1, 1]]).map(sizeToDimensions),
+        ]);
+        ad.pbAdSlot = deepAccess(adUnit, 'ortb2Imp.ext.data.pbadslot');
+        ad.pattern = deepAccess(adUnit, 'ortb2Imp.ext.data.aupname');
+        ad.gpid = deepAccess(adUnit, 'ortb2Imp.ext.gpid');
+        ad.bids = {};
+        adMap[adUnit.transactionId] = ad;
+        gamRenders[adUnit.transactionId] = false;
+
+        // Handle case elementId's (div Id's) are set on adUnit - PPI
+        const elementIds = deepAccess(adUnit, 'ortb2Imp.ext.data.elementid');
+        if (elementIds) {
+          cache.elementIdMap[adUnit.code] = cache.elementIdMap[adUnit.code] || [];
+          // set it to array if set to string to be careful (should be array of strings)
+          const newIds = typeof elementIds === 'string' ? [elementIds] : elementIds;
+          newIds.forEach(id => {
+            if (!cache.elementIdMap[adUnit.code].includes(id)) {
+              cache.elementIdMap[adUnit.code].push(id);
+            }
+          });
+        }
+        return adMap;
+      }, {});
+
+      // holding our pba data to send
+      cache.auctions[args.auctionId] = {
+        auction: auctionData,
+        gamRenders,
+        pendingEvents: {}
+      }
+      break;
+    case BID_REQUESTED:
+      args.bids.forEach(bid => {
+        const adUnit = deepAccess(cache, `auctions.${args.auctionId}.auction.adUnits.${bid.transactionId}`);
+        adUnit.bids[bid.bidId] = pick(bid, [
+          'bidder',
+          'bidId',
+          'source', () => bid.src === 's2s' ? 'server' : 'client',
+          'status', () => 'no-bid'
+        ]);
+        // set acct site zone id on adunit
+        if ((!adUnit.siteId || !adUnit.zoneId) && rubiconAliases.indexOf(bid.bidder) !== -1) {
+          if (deepAccess(bid, 'params.accountId') == accountId) {
+            adUnit.accountId = parseInt(accountId);
+            adUnit.siteId = parseInt(deepAccess(bid, 'params.siteId'));
+            adUnit.zoneId = parseInt(deepAccess(bid, 'params.zoneId'));
+          }
+        }
+      });
+      break;
+    case BID_RESPONSE:
+      const auctionEntry = deepAccess(cache, `auctions.${args.auctionId}.auction`);
+      const adUnit = deepAccess(auctionEntry, `adUnits.${args.transactionId}`);
+      let bid = adUnit.bids[args.requestId];
+
+      // if this came from multibid, there might now be matching bid, so check
+      // THIS logic will change when we support multibid per bid request
+      if (!bid && args.originalRequestId) {
+        let ogBid = adUnit.bids[args.originalRequestId];
+        // create new bid
+        adUnit.bids[args.requestId] = {
+          ...ogBid,
+          bidId: args.requestId,
+          bidderDetail: args.targetingBidder
+        };
+        bid = adUnit.bids[args.requestId];
+      }
+
+      // if we have not set enforcements yet set it (This is hidden from bidders until now so we have to get from here)
+      if (typeof deepAccess(auctionEntry, 'floors.enforcement') !== 'boolean' && deepAccess(args, 'floorData.enforcements')) {
+        auctionEntry.floors.enforcement = args.floorData.enforcements.enforceJS;
+        auctionEntry.floors.dealsEnforced = args.floorData.enforcements.floorDeals;
+      }
+
+      // Log error if no matching bid!
+      if (!bid) {
+        logError(`${MODULE_NAME}: Could not find associated bid request for bid response with requestId: `, args.requestId);
+        break;
+      }
+
+      // set bid status
+      switch (args.getStatusCode()) {
+        case GOOD:
+          bid.status = 'success';
+          delete bid.error; // it's possible for this to be set by a previous timeout
+          break;
+        case NO_BID:
+          bid.status = args.status === BID_REJECTED ? BID_REJECTED_IPF : 'no-bid';
+          delete bid.error;
+          break;
+        default:
+          bid.status = 'error';
+          bid.error = {
+            code: 'request-error'
+          };
+      }
+      bid.clientLatencyMillis = args.timeToRespond || Date.now() - cache.auctions[args.auctionId].auction.auctionStart;
+      bid.bidResponse = parseBidResponse(args, bid.bidResponse);
+
+      // if pbs gave us back a bidId, we need to use it and update our bidId to PBA
+      const pbsBidId = (args.pbsBidId == 0 ? generateUUID() : args.pbsBidId) || (args.seatBidId == 0 ? generateUUID() : args.seatBidId);
+      if (pbsBidId) {
+        bid.pbsBidId = pbsBidId;
+      }
+      break;
+    case BIDDER_DONE:
+      const serverError = deepAccess(args, 'serverErrors.0');
+      const serverResponseTimeMs = args.serverResponseTimeMs;
+      args.bids.forEach(bid => {
+        let cachedBid = deepAccess(cache, `auctions.${bid.auctionId}.auction.adUnits.${bid.transactionId}.bids.${bid.bidId}`);
+        if (typeof bid.serverResponseTimeMs !== 'undefined') {
+          cachedBid.serverLatencyMillis = bid.serverResponseTimeMs;
+        } else if (serverResponseTimeMs && bid.source === 's2s') {
+          cachedBid.serverLatencyMillis = serverResponseTimeMs;
+        }
+        // if PBS said we had an error, and this bid has not been processed by BID_RESPONSE YET
+        if (serverError && (!cachedBid.status || ['no-bid', 'error'].indexOf(cachedBid.status) !== -1)) {
+          cachedBid.status = 'error';
+          cachedBid.error = {
+            code: pbsErrorMap[serverError.code] || pbsErrorMap[999],
+            description: serverError.message
+          }
+        }
+
+        // set client latency if not done yet
+        if (!cachedBid.clientLatencyMillis) {
+          cachedBid.clientLatencyMillis = Date.now() - cache.auctions[args.auctionId].auction.auctionStart;
+        }
+      });
+      break;
+    case BID_WON:
+      // Allowing us to delay bidWon handling so it happens at right time
+      // we expect it to happen after gpt slotRenderEnded, but have seen it happen before when testing
+      // this will ensure it happens after if set
+      if (rubiConf.analyticsProcessDelay > 0) {
+        setTimeout(() => {
+          handleBidWon(args);
+        }, rubiConf.analyticsProcessDelay);
+      } else {
+        handleBidWon(args);
+      }
+      break;
+    case AUCTION_END:
+      let auctionCache = cache.auctions[args.auctionId];
+      // if for some reason the auction did not do its normal thing, this could be undefied so bail
+      if (!auctionCache) {
+        break;
+      }
+      // Set this auction as being done
+      auctionCache.auction.auctionEnd = args.auctionEnd;
+
+      // keeping order of auctions and if the payload has been sent or not
+      cache.auctionOrder.push(args.auctionId);
+
+      const isOnlyInstreamAuction = args.adUnits && args.adUnits.every(adUnit => adUnitIsOnlyInstream(adUnit));
+
+      // if we are not waiting OR it is instream only auction
+      if (isOnlyInstreamAuction || rubiConf.analyticsBatchTimeout === 0) {
+        sendAuctionEvent(args.auctionId, 'solo-auction');
+      } else {
+        // start timer to send batched payload just in case we don't hear any BID_WON events
+        cache.timeouts[args.auctionId] = setTimeout(() => {
+          sendAuctionEvent(args.auctionId, 'auctionEnd');
+        }, rubiConf.analyticsBatchTimeout);
+      }
+      break;
+    case BID_TIMEOUT:
+      args.forEach(badBid => {
+        let bid = deepAccess(cache, `auctions.${badBid.auctionId}.auction.adUnits.${badBid.transactionId}.bids.${badBid.bidId}`, {});
+        // might be set already by bidder-done, so do not overwrite
+        if (bid.status !== 'error') {
+          bid.status = 'error';
+          bid.error = {
+            code: 'timeout-error',
+            description: 'prebid.js timeout' // will help us diff if timeout was set by PBS or PBJS
+          };
+        }
+      });
+      break;
+    case BILLABLE_EVENT:
+      if (rubiConf.dmBilling.enabled && isBillingEventValid(args)) {
+        // add to the map indicating it has not been sent yet
+        deepSetValue(cache.billing, `${args.vendor}.${args.billingId}`, false);
+        const billingEvent = formatBillingEvent(args);
+        addEventToQueue({ billableEvents: [billingEvent] }, args.auctionId, 'billing');
+      } else {
+        logInfo(`${MODULE_NAME}: Billing event ignored`, args);
+      }
+      break;
+  }
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: magniteAdapter,
+  code: 'magnite',
+  gvlid: RUBICON_GVL_ID
+});
+
+export default magniteAdapter;
diff --git a/modules/magniteAnalyticsAdapter.md b/modules/magniteAnalyticsAdapter.md
new file mode 100644
index 00000000000..a9ad0f4345b
--- /dev/null
+++ b/modules/magniteAnalyticsAdapter.md
@@ -0,0 +1,18 @@
+# Magnite Analytics Adapter
+
+```
+Module Name:  Magnite Analytics Adapter
+Module Type:  Analytics Adapter
+Maintainer: demand-manager-support@magnite.com
+```
+
+## How to configure?
+```
+pbjs.enableAnalytics({
+    provider: 'magnite',
+    options: {
+        accountId: 12345, // The account id assigned to you by the Magnite Team
+        endpoint: 'http:localhost:9999/event' // Given by the Magnite Team
+    }
+});
+```
diff --git a/modules/malltvAnalyticsAdapter.js b/modules/malltvAnalyticsAdapter.js
new file mode 100644
index 00000000000..af903795e49
--- /dev/null
+++ b/modules/malltvAnalyticsAdapter.js
@@ -0,0 +1,188 @@
+import {ajax} from '../src/ajax.js'
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js'
+import CONSTANTS from '../src/constants.json'
+import adapterManager from '../src/adapterManager.js'
+import {getGlobal} from '../src/prebidGlobal.js'
+import {logInfo, logError, deepClone} from '../src/utils.js'
+
+const analyticsType = 'endpoint'
+export const ANALYTICS_VERSION = '1.0.0'
+export const DEFAULT_SERVER = 'https://central.mall.tv/analytics'
+
+const {
+  EVENTS: {
+    AUCTION_END,
+    BID_TIMEOUT
+  }
+} = CONSTANTS
+
+export const BIDDER_STATUS = {
+  BID: 1,
+  NO_BID: 2,
+  BID_WON: 3,
+  TIMEOUT: 4
+}
+
+export const getCpmInEur = function (bid) {
+  if (bid.currency !== 'EUR' && typeof bid.getCpmInNewCurrency === 'function') {
+    return bid.getCpmInNewCurrency('EUR');
+  }
+
+  return bid.cpm;
+}
+
+const analyticsOptions = {}
+
+export const parseBidderCode = function (bid) {
+  let bidderCode = bid.bidderCode || bid.bidder
+  return bidderCode.toLowerCase()
+}
+
+export const parseAdUnitCode = function (bidResponse) {
+  return bidResponse.adUnitCode.toLowerCase()
+}
+
+export const malltvAnalyticsAdapter = Object.assign(adapter({DEFAULT_SERVER, analyticsType}), {
+
+  cachedAuctions: {},
+
+  initConfig(config) {
+    /**
+     * Required option: propertyId
+     *
+     * Optional option: server
+     * @type {boolean}
+     */
+    analyticsOptions.options = deepClone(config.options)
+    if (typeof config.options.propertyId !== 'string' || config.options.propertyId.length < 1) {
+      logError('"options.propertyId" is required.')
+      return false
+    }
+
+    analyticsOptions.propertyId = config.options.propertyId
+    analyticsOptions.server = config.options.server || DEFAULT_SERVER
+
+    return true
+  },
+  track({eventType, args}) {
+    switch (eventType) {
+      case BID_TIMEOUT:
+        this.handleBidTimeout(args)
+        break
+      case AUCTION_END:
+        this.handleAuctionEnd(args)
+        break
+    }
+  },
+  handleBidTimeout(timeoutBids) {
+    timeoutBids.forEach((bid) => {
+      const cachedAuction = this.getCachedAuction(bid.auctionId)
+      cachedAuction.timeoutBids.push(bid)
+    })
+  },
+  handleAuctionEnd(auctionEndArgs) {
+    const cachedAuction = this.getCachedAuction(auctionEndArgs.auctionId)
+    const highestCpmBids = getGlobal().getHighestCpmBids()
+    this.sendEventMessage('end',
+      this.createBidMessage(auctionEndArgs, highestCpmBids, cachedAuction.timeoutBids)
+    )
+  },
+  createBidMessage(auctionEndArgs, winningBids, timeoutBids) {
+    const {auctionId, timestamp, timeout, auctionEnd, adUnitCodes, bidsReceived, noBids} = auctionEndArgs
+    const message = this.createCommonMessage(auctionId)
+
+    message.auctionElapsed = (auctionEnd - timestamp)
+    message.timeout = timeout
+
+    adUnitCodes.forEach((adUnitCode) => {
+      message.adUnits[adUnitCode] = {}
+    })
+
+    // We handled noBids first because when currency conversion is enabled, a bid with a foreign currency
+    // will be set to NO_BID initially, and then set to BID after the currency rate json file is fully loaded.
+    // In this situation, the bid exists in both noBids and bids arrays.
+    noBids.forEach(bid => this.addBidResponseToMessage(message, bid, BIDDER_STATUS.NO_BID))
+
+    // This array may contain some timeout bids (responses come back after auction timeout)
+    bidsReceived.forEach(bid => this.addBidResponseToMessage(message, bid, BIDDER_STATUS.BID))
+
+    // We handle timeout after bids since it's possible that a bid has a response, but the response comes back
+    // after auction end. In this case, the bid exists in both bidsReceived and timeoutBids arrays.
+    timeoutBids.forEach(bid => this.addBidResponseToMessage(message, bid, BIDDER_STATUS.TIMEOUT))
+
+    // mark the winning bids with prebidWon = true
+    winningBids.forEach(bid => {
+      const adUnitCode = parseAdUnitCode(bid)
+      const bidder = parseBidderCode(bid)
+      message.adUnits[adUnitCode][bidder].prebidWon = true
+    })
+    return message
+  },
+  createCommonMessage(auctionId) {
+    return {
+      analyticsVersion: ANALYTICS_VERSION,
+      auctionId: auctionId,
+      propertyId: analyticsOptions.propertyId,
+      referrer: window.location.href,
+      prebidVersion: '$prebid.version$',
+      adUnits: {},
+    }
+  },
+  addBidResponseToMessage(message, bid, status) {
+    const adUnitCode = parseAdUnitCode(bid)
+    message.adUnits[adUnitCode] = message.adUnits[adUnitCode] || {}
+    const bidder = parseBidderCode(bid)
+    const bidResponse = this.serializeBidResponse(bid, status)
+    message.adUnits[adUnitCode][bidder] = bidResponse
+  },
+  serializeBidResponse(bid, status) {
+    const result = {
+      prebidWon: (status === BIDDER_STATUS.BID_WON),
+      isTimeout: (status === BIDDER_STATUS.TIMEOUT),
+      status: status,
+    }
+    if (status === BIDDER_STATUS.BID || status === BIDDER_STATUS.BID_WON) {
+      Object.assign(result, {
+        time: bid.timeToRespond,
+        cpm: bid.cpm,
+        currency: bid.currency,
+        originalCpm: bid.originalCpm || bid.cpm,
+        cpmEur: getCpmInEur(bid),
+        originalCurrency: bid.originalCurrency || bid.currency,
+        vastUrl: bid.vastUrl
+      })
+    }
+    return result
+  },
+  sendEventMessage(endPoint, data) {
+    logInfo(`AJAX: ${endPoint}: ` + JSON.stringify(data))
+
+    ajax(`${analyticsOptions.server}/${endPoint}`, null, JSON.stringify(data), {
+      contentType: 'application/json'
+    })
+  },
+  getCachedAuction(auctionId) {
+    this.cachedAuctions[auctionId] = this.cachedAuctions[auctionId] || {
+      timeoutBids: [],
+    }
+    return this.cachedAuctions[auctionId]
+  },
+  getAnalyticsOptions() {
+    return analyticsOptions
+  },
+})
+
+// save the base class function
+malltvAnalyticsAdapter.originEnableAnalytics = malltvAnalyticsAdapter.enableAnalytics
+
+// override enableAnalytics so we can get access to the config passed in from the page
+malltvAnalyticsAdapter.enableAnalytics = function (config) {
+  if (this.initConfig(config)) {
+    malltvAnalyticsAdapter.originEnableAnalytics(config) // call the base class function
+  }
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: malltvAnalyticsAdapter,
+  code: 'malltv'
+})
diff --git a/modules/malltvAnalyticsAdapter.md b/modules/malltvAnalyticsAdapter.md
new file mode 100644
index 00000000000..cc62d939694
--- /dev/null
+++ b/modules/malltvAnalyticsAdapter.md
@@ -0,0 +1,25 @@
+# Overview
+
+Module Name: Malltv Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: arditb@gjirafa.com
+
+# Description
+
+Analytics adapter for Malltv
+
+# Parameters
+
+```
+{
+  provider: 'malltvAnalytics',
+  options: {
+    'propertyId': 'YOUR_PROPERTY_ID', // Required
+    'server': 'YOUR_ANALYTICS_SERVER' // Optional
+  }
+}
+```
+
+PS. [Prebid currency module](http://prebid.org/dev-docs/modules/currency.html) is required, please make sure your prebid code contains currency module code.
diff --git a/modules/malltvBidAdapter.js b/modules/malltvBidAdapter.js
new file mode 100644
index 00000000000..cee8e888986
--- /dev/null
+++ b/modules/malltvBidAdapter.js
@@ -0,0 +1,135 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'malltv';
+const ENDPOINT_URL = 'https://central.mall.tv/bid';
+const DIMENSION_SEPARATOR = 'x';
+const SIZE_SEPARATOR = ';';
+const BISKO_ID = 'biskoId';
+const STORAGE_ID = 'bisko-sid';
+const SEGMENTS = 'biskoSegments';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.propertyId && bid.params.placementId);
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const storageId = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(STORAGE_ID) || '' : '';
+    const biskoId = storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(BISKO_ID) || '' : '';
+    const segments = storage.localStorageIsEnabled() ? JSON.parse(storage.getDataFromLocalStorage(SEGMENTS)) || [] : [];
+
+    let propertyId = '';
+    let pageViewGuid = '';
+    let bidderRequestId = '';
+    let url = '';
+    let contents = [];
+    let data = {};
+    let auctionId = bidderRequest ? bidderRequest.auctionId : '';
+    let gdrpApplies = true;
+    let gdprConsent = '';
+    let placements = validBidRequests.map(bidRequest => {
+      if (!propertyId) { propertyId = bidRequest.params.propertyId; }
+      if (!pageViewGuid && bidRequest.params) { pageViewGuid = bidRequest.params.pageViewGuid || ''; }
+      if (!bidderRequestId) { bidderRequestId = bidRequest.bidderRequestId; }
+      // TODO: is 'page' the right value here?
+      if (!url && bidderRequest) { url = bidderRequest.refererInfo.page; }
+      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents; }
+      if (Object.keys(data).length === 0 && bidRequest.params.data && Object.keys(bidRequest.params.data).length !== 0) { data = bidRequest.params.data; }
+      if (bidderRequest && bidRequest.gdprConsent) { gdrpApplies = bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? bidderRequest.gdprConsent.gdprApplies : true; }
+      if (bidderRequest && bidRequest.gdprConsent) { gdprConsent = bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : ''; }
+      let adUnitId = bidRequest.adUnitCode;
+      let placementId = bidRequest.params.placementId;
+      let sizes = generateSizeParam(bidRequest.sizes);
+
+      return {
+        sizes: sizes,
+        adUnitId: adUnitId,
+        placementId: placementId,
+        bidid: bidRequest.bidId,
+        count: bidRequest.params.count,
+        skipTime: bidRequest.params.skipTime
+      };
+    });
+
+    let body = {
+      auctionId: auctionId,
+      propertyId: propertyId,
+      pageViewGuid: pageViewGuid,
+      storageId: storageId,
+      biskoId: biskoId,
+      segments: segments,
+      url: url,
+      requestid: bidderRequestId,
+      placements: placements,
+      contents: contents,
+      data: data,
+      gdpr_applies: gdrpApplies,
+      gdpr_consent: gdprConsent,
+    };
+
+    return [{
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: body
+    }];
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse) {
+    const responses = serverResponse.body;
+    const bidResponses = [];
+    for (var i = 0; i < responses.length; i++) {
+      const bidResponse = {
+        requestId: responses[i].BidId,
+        cpm: responses[i].CPM,
+        width: responses[i].Width,
+        height: responses[i].Height,
+        creativeId: responses[i].CreativeId,
+        currency: responses[i].Currency,
+        netRevenue: responses[i].NetRevenue,
+        ttl: responses[i].TTL,
+        referrer: responses[i].Referrer,
+        ad: responses[i].Ad,
+        vastUrl: responses[i].VastUrl,
+        mediaType: responses[i].MediaType,
+        meta: {
+          advertiserDomains: Array.isArray(responses[i].ADomain) ? responses[i].ADomain : []
+        }
+      };
+      bidResponses.push(bidResponse);
+    }
+    return bidResponses;
+  }
+};
+
+/**
+* Generate size param for bid request using sizes array
+*
+* @param {Array} sizes Possible sizes for the ad unit.
+* @return {string} Processed sizes param to be used for the bid request.
+*/
+function generateSizeParam(sizes) {
+  return sizes.map(size => size.join(DIMENSION_SEPARATOR)).join(SIZE_SEPARATOR);
+}
+
+registerBidder(spec);
diff --git a/modules/malltvBidAdapter.md b/modules/malltvBidAdapter.md
new file mode 100644
index 00000000000..6b695ee8526
--- /dev/null
+++ b/modules/malltvBidAdapter.md
@@ -0,0 +1,81 @@
+# Overview
+
+Module Name: MallTV Bidder Adapter Module
+
+Type: Bidder Adapter
+
+Maintainer: myhedin@gjirafa.com
+
+# Description
+
+MallTV Bidder Adapter for Prebid.js.
+
+# Test Parameters
+
+```js
+var adUnits = [
+  {
+    code: "test-div",
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 300],
+        ],
+      },
+    },
+    bids: [
+      {
+        bidder: "malltv",
+        params: {
+          propertyId: "105134", //Required
+          placementId: "846832", //Required
+          data: {
+            //Optional
+            catalogs: [
+              {
+                catalogId: 9,
+                items: ["193", "4", "1"],
+              },
+            ],
+            inventory: {
+              category: ["tech"],
+              query: ["iphone 12"],
+            },
+          },
+        },
+      },
+    ],
+  },
+  {
+    code: "test-div",
+    mediaTypes: {
+      video: {
+        context: "instream",
+      },
+    },
+    bids: [
+      {
+        bidder: "malltv",
+        params: {
+          propertyId: "105134", //Required
+          placementId: "846832", //Required
+          data: {
+            //Optional
+            catalogs: [
+              {
+                catalogId: 9,
+                items: ["193", "4", "1"],
+              },
+            ],
+            inventory: {
+              category: ["tech"],
+              query: ["iphone 12"],
+            },
+          },
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/modules/mantisBidAdapter.js b/modules/mantisBidAdapter.js
index 19e70a3e68b..4520bad0f3a 100644
--- a/modules/mantisBidAdapter.js
+++ b/modules/mantisBidAdapter.js
@@ -1,7 +1,8 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
 
-const storage = getStorageManager();
+export const storage = getStorageManager({bidderCode: 'mantis'});
 
 function inIframe() {
   try {
@@ -10,21 +11,8 @@ function inIframe() {
     return true;
   }
 }
-function pixel(url, parent) {
-  var img = document.createElement('img');
-  img.src = url;
-  img.style.cssText = 'display:none !important;';
-  (parent || document.body).appendChild(img);
-}
-function isDesktop(ignoreTouch) {
-  var supportsTouch = !ignoreTouch && ('ontouchstart' in window || navigator.msMaxTouchPoints);
-  if (inIframe()) {
-    return !supportsTouch;
-  }
-  var width = window.innerWidth || window.document.documentElement.clientWidth || window.document.body.clientWidth;
-  return !supportsTouch && (!width || width >= (window.mantis_breakpoint || 768));
-}
-function onVisible(element, doOnVisible, time, pct) {
+
+export function onVisible(win, element, doOnVisible, time, pct) {
   var started = null;
   var notified = false;
   var onNotVisible = null;
@@ -78,15 +66,15 @@ function onVisible(element, doOnVisible, time, pct) {
     });
   };
   if (isAmp()) {
-    listener = window.context.observeIntersection(function (changes) {
+    listener = win.context.observeIntersection(function (changes) {
       changes.forEach(function (change) {
         doCheck(change.rootBounds.width, change.rootBounds.height, change.boundingClientRect);
       });
     });
   }
   interval = setInterval(function () {
-    var winHeight = (window.innerHeight || document.documentElement.clientHeight);
-    var winWidth = (window.innerWidth || document.documentElement.clientWidth);
+    var winHeight = (win.innerHeight || document.documentElement.clientHeight);
+    var winWidth = (win.innerWidth || document.documentElement.clientWidth);
     doCheck(winWidth, winHeight, element.getBoundingClientRect());
   }, 100);
 }
@@ -136,9 +124,6 @@ function isArray(value) {
 }
 
 function jsonToQuery(data, chain, form) {
-  if (!data) {
-    return null;
-  }
   var parts = form || [];
   for (var key in data) {
     var queryKey = key;
@@ -152,8 +137,6 @@ function jsonToQuery(data, chain, form) {
         var aval = val[index];
         if (isObject(aval)) {
           jsonToQuery(aval, akey, parts);
-        } else if (isSendable(aval)) {
-          parts.push(akey + '=' + encodeURIComponent(aval));
         }
       }
     } else if (isObject(val) && val != data) {
@@ -173,9 +156,7 @@ function buildMantisUrl(path, data, domain) {
     secure: isSecure(),
     version: 9
   };
-  if (!inIframe() || isAmp()) {
-    params.mobile = !isAmp() && isDesktop(true) ? 'false' : 'true';
-  }
+
   if (window.mantis_uuid) {
     params.uuid = window.mantis_uuid;
   } else if (storage.hasLocalStorage()) {
@@ -206,20 +187,20 @@ function buildMantisUrl(path, data, domain) {
       params.referrer = window.context.referrer;
     }
   }
-  Object.keys(data || {}).forEach(function (key) {
+  Object.keys(data).forEach(function (key) {
     params[key] = data[key];
   });
   var query = jsonToQuery(params);
   return (window.mantis_domain === undefined ? domain || 'https://mantodea.mantisadnetwork.com' : window.mantis_domain) + path + '?' + query;
 }
 
-const spec = {
+export const spec = {
   code: 'mantis',
-  supportedMediaTypes: ['banner', 'video', 'native'],
+  supportedMediaTypes: ['banner'],
   isBidRequestValid: function (bid) {
     return !!(bid.params.property && (bid.params.code || bid.params.zoneId || bid.params.zone));
   },
-  buildRequests: function (validBidRequests) {
+  buildRequests: function (validBidRequests, bidderRequest) {
     var property = null;
     validBidRequests.some(function (bid) {
       if (bid.params.property) {
@@ -229,6 +210,7 @@ const spec = {
     });
     const query = {
       measurable: true,
+      usp: bidderRequest && bidderRequest.uspConsent,
       bids: validBidRequests.map(function (bid) {
         return {
           bidId: bid.bidId,
@@ -240,6 +222,12 @@ const spec = {
       }),
       property: property
     };
+
+    if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+      // we purposefully do not track data for users in the EU
+      query.consent = false;
+    }
+
     return {
       method: 'GET',
       url: buildMantisUrl('/prebid/display', query) + '&foo',
@@ -255,6 +243,9 @@ const spec = {
         width: ad.width,
         height: ad.height,
         ad: ad.html,
+        meta: {
+          advertiserDomains: ad.domains || []
+        },
         ttl: ad.ttl || serverResponse.body.ttl || 86400,
         creativeId: ad.view,
         netRevenue: true,
@@ -262,47 +253,54 @@ const spec = {
       };
     });
   },
-  getUserSyncs: function (syncOptions) {
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
     if (syncOptions.iframeEnabled) {
       return [{
         type: 'iframe',
-        url: buildMantisUrl('/prebid/iframe')
+        url: buildMantisUrl('/prebid/iframe', {gdpr: gdprConsent, uspConsent: uspConsent})
       }];
     }
     if (syncOptions.pixelEnabled) {
       return [{
         type: 'image',
-        url: buildMantisUrl('/prebid/pixel')
+        url: buildMantisUrl('/prebid/pixel', {gdpr: gdprConsent, uspConsent: uspConsent})
       }];
     }
   }
 };
+
+export function sfPostMessage ($sf, width, height, callback) {
+  var viewed = false;
+  // eslint-disable-next-line no-undef
+  $sf.ext.register(width, height, function () {
+    // eslint-disable-next-line no-undef
+    if ($sf.ext.inViewPercentage() < 50 || viewed) {
+      return;
+    }
+    viewed = true;
+    callback();
+  });
+};
+
+export function iframePostMessage (win, name, callback) {
+  var frames = document.getElementsByTagName('iframe');
+  for (var i = 0; i < frames.length; i++) {
+    var frame = frames[i];
+    if (frame.name == name) {
+      onVisible(win, frame, function (stop) {
+        callback();
+        stop();
+      }, 1000, 0.50);
+    }
+  }
+}
+
 onMessage('iframe', function (data) {
   if (window.$sf) {
-    var viewed = false;
-    // eslint-disable-next-line no-undef
-    $sf.ext.register(data.width, data.height, function () {
-      // eslint-disable-next-line no-undef
-      if ($sf.ext.inViewPercentage() < 50 || viewed) {
-        return;
-      }
-      viewed = true;
-      pixel(data.pixel);
-    });
+    sfPostMessage(window.$sf, data.width, data.height, () => ajax(data.pixel));
   } else {
-    var frames = document.getElementsByTagName('iframe');
-    for (var i = 0; i < frames.length; i++) {
-      var frame = frames[i];
-      if (frame.name == data.frame) {
-        onVisible(frame, function (stop) {
-          pixel(data.pixel);
-          stop();
-        }, 1000, 0.50);
-      }
-    }
+    iframePostMessage(window, data.frame, () => ajax(data.pixel));
   }
 });
 
-export { spec };
-
 registerBidder(spec);
diff --git a/modules/marsmediaAnalyticsAdapter.js b/modules/marsmediaAnalyticsAdapter.js
index 12c333631a2..c86cc4dfbc2 100644
--- a/modules/marsmediaAnalyticsAdapter.js
+++ b/modules/marsmediaAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 /****
diff --git a/modules/marsmediaBidAdapter.js b/modules/marsmediaBidAdapter.js
index 1ce2558b8de..82a25af60d1 100644
--- a/modules/marsmediaBidAdapter.js
+++ b/modules/marsmediaBidAdapter.js
@@ -1,8 +1,9 @@
-'use strict';
 
-import * as utils from '../src/utils.js';
+'use strict';
+import { deepAccess, getDNT, parseSizesInput, isArray, getWindowTop, deepSetValue, triggerPixel, getWindowSelf } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
 
 function MarsmediaAdapter() {
   this.code = 'marsmedia';
@@ -15,8 +16,7 @@ function MarsmediaAdapter() {
   let SUPPORTED_VIDEO_DELIVERY = [1];
   let SUPPORTED_VIDEO_API = [1, 2, 5];
   let slotsToBids = {};
-  let that = this;
-  let version = '2.3';
+  let version = '2.5';
 
   this.isBidRequestValid = function (bid) {
     return !!(bid.params && bid.params.zoneId);
@@ -31,6 +31,7 @@ function MarsmediaAdapter() {
     var isSecure = 0;
     if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.stack.length) {
       // clever trick to get the protocol
+      // TODO: this should probably use parseUrl
       var el = document.createElement('a');
       el.href = bidderRequest.refererInfo.stack[0];
       isSecure = (el.protocol == 'https:') ? 1 : 0;
@@ -41,18 +42,19 @@ function MarsmediaAdapter() {
       impObj.id = BRs[i].adUnitCode;
       impObj.secure = isSecure;
 
-      if (utils.deepAccess(BRs[i], 'mediaTypes.banner') || utils.deepAccess(BRs[i], 'mediaType') === 'banner') {
+      if (deepAccess(BRs[i], 'mediaTypes.banner') || deepAccess(BRs[i], 'mediaType') === 'banner') {
         let banner = frameBanner(BRs[i]);
         if (banner) {
           impObj.banner = banner;
         }
       }
-      if (utils.deepAccess(BRs[i], 'mediaTypes.video') || utils.deepAccess(BRs[i], 'mediaType') === 'video') {
+      if (deepAccess(BRs[i], 'mediaTypes.video') || deepAccess(BRs[i], 'mediaType') === 'video') {
         impObj.video = frameVideo(BRs[i]);
       }
       if (!(impObj.banner || impObj.video)) {
         continue;
       }
+      impObj.bidfloor = _getFloor(BRs[i]);
       impObj.ext = frameExt(BRs[i]);
       impList.push(impObj);
     }
@@ -67,12 +69,15 @@ function MarsmediaAdapter() {
     }
     if (bidderRequest && bidderRequest.refererInfo) {
       var ri = bidderRequest.refererInfo;
-      site.ref = ri.referer;
+      // TODO: is 'ref' the right value here?
+      site.ref = ri.ref;
 
       if (ri.stack.length) {
         site.page = ri.stack[ri.stack.length - 1];
 
         // clever trick to get the domain
+        // TODO: does this logic make sense? why should domain be set to the lowermost frame's?
+        // TODO: this should probably use parseUrl
         var el = document.createElement('a');
         el.href = ri.stack[0];
         site.domain = el.hostname;
@@ -85,7 +90,7 @@ function MarsmediaAdapter() {
     return {
       ua: navigator.userAgent,
       ip: '', // Empty Ip string is required, server gets the ip from HTTP header
-      dnt: utils.getDNT() ? 1 : 0,
+      dnt: getDNT() ? 1 : 0,
     }
   }
 
@@ -105,7 +110,7 @@ function MarsmediaAdapter() {
     if (adUnit.mediaTypes && adUnit.mediaTypes.banner) {
       sizeList = adUnit.mediaTypes.banner.sizes;
     }
-    var sizeStringList = utils.parseSizesInput(sizeList);
+    var sizeStringList = parseSizesInput(sizeList);
     var format = [];
     sizeStringList.forEach(function(size) {
       if (size) {
@@ -129,9 +134,9 @@ function MarsmediaAdapter() {
 
   function frameVideo(bid) {
     var size = [];
-    if (utils.deepAccess(bid, 'mediaTypes.video.playerSize')) {
+    if (deepAccess(bid, 'mediaTypes.video.playerSize')) {
       var dimensionSet = bid.mediaTypes.video.playerSize;
-      if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
+      if (isArray(bid.mediaTypes.video.playerSize[0])) {
         dimensionSet = bid.mediaTypes.video.playerSize[0];
       }
       var validSize = getValidSizeSet(dimensionSet)
@@ -140,22 +145,44 @@ function MarsmediaAdapter() {
       }
     }
     return {
-      mimes: utils.deepAccess(bid, 'mediaTypes.video.mimes') || SUPPORTED_VIDEO_MIMES,
-      protocols: utils.deepAccess(bid, 'mediaTypes.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS,
+      mimes: deepAccess(bid, 'mediaTypes.video.mimes') || SUPPORTED_VIDEO_MIMES,
+      protocols: deepAccess(bid, 'mediaTypes.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS,
       w: size[0],
       h: size[1],
-      startdelay: utils.deepAccess(bid, 'mediaTypes.video.startdelay') || 0,
-      skip: utils.deepAccess(bid, 'mediaTypes.video.skip') || 0,
-      playbackmethod: utils.deepAccess(bid, 'mediaTypes.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS,
-      delivery: utils.deepAccess(bid, 'mediaTypes.video.delivery') || SUPPORTED_VIDEO_DELIVERY,
-      api: utils.deepAccess(bid, 'mediaTypes.video.api') || SUPPORTED_VIDEO_API,
+      startdelay: deepAccess(bid, 'mediaTypes.video.startdelay') || 0,
+      skip: deepAccess(bid, 'mediaTypes.video.skip') || 0,
+      playbackmethod: deepAccess(bid, 'mediaTypes.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS,
+      delivery: deepAccess(bid, 'mediaTypes.video.delivery') || SUPPORTED_VIDEO_DELIVERY,
+      api: deepAccess(bid, 'mediaTypes.video.api') || SUPPORTED_VIDEO_API,
     }
   }
 
   function frameExt(bid) {
-    return {
-      bidder: {
-        zoneId: bid.params['zoneId']
+    if ((bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes)) {
+      let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
+      bidSizes = ((isArray(bidSizes) && isArray(bidSizes[0])) ? bidSizes : [bidSizes]);
+      bidSizes = bidSizes.filter(size => isArray(size));
+      const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}));
+
+      const element = document.getElementById(bid.adUnitCode);
+      const minSize = _getMinSize(processedSizes);
+      const viewabilityAmount = _isViewabilityMeasurable(element)
+        ? _getViewability(element, getWindowTop(), minSize)
+        : 'na';
+      const viewabilityAmountRounded = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
+
+      return {
+        bidder: {
+          zoneId: bid.params['zoneId']
+        },
+        viewability: viewabilityAmountRounded
+      }
+    } else {
+      return {
+        bidder: {
+          zoneId: bid.params['zoneId']
+        },
+        viewability: 'na'
       }
     }
   }
@@ -168,24 +195,27 @@ function MarsmediaAdapter() {
       device: frameDevice(),
       user: {
         ext: {
-          consent: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? bidderRequest.gdprConsent.consentString : ''
+          consent: deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? bidderRequest.gdprConsent.consentString : ''
         }
       },
       at: 1,
       tmax: 650,
       regs: {
         ext: {
-          gdpr: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false
+          gdpr: deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false
         }
       }
     };
     if (BRs[0].schain) {
-      bid.source = {
-        'ext': {
-          'schain': BRs[0].schain
-        }
-      }
+      deepSetValue(bid, 'source.ext.schain', BRs[0].schain);
+    }
+    if (bidderRequest.uspConsent) {
+      deepSetValue(bid, 'regs.ext.us_privacy', bidderRequest.uspConsent)
     }
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(bid, 'regs.coppa', config.getConfig('coppa') & 1)
+    }
+
     return bid;
   }
 
@@ -228,7 +258,7 @@ function MarsmediaAdapter() {
         /\$\{AUCTION_PRICE\}/,
         cpm
       );
-      utils.triggerPixel(bid.nurl, null);
+      triggerPixel(bid.nurl, null);
     };
     sendbeacon(bid, 17)
   };
@@ -241,12 +271,6 @@ function MarsmediaAdapter() {
     sendbeacon(bid, 20)
   };
 
-  function sendbeacon(bid, type) {
-    const bidString = JSON.stringify(bid);
-    const encodedBuf = window.btoa(bidString);
-    utils.triggerPixel('https://ping-hqx-1.go2speed.media/notification/rtb/beacon/?bt=' + type + '&bid=3mhdom&hb_j=' + encodedBuf, null);
-  }
-
   this.interpretResponse = function (serverResponse) {
     let responses = serverResponse.body || [];
     let bids = [];
@@ -267,7 +291,6 @@ function MarsmediaAdapter() {
       let bidRequest = slotsToBids[bid.impid];
       let bidResponse = {
         requestId: bidRequest.bidId,
-        bidderCode: that.code,
         cpm: parseFloat(bid.price),
         width: bid.w,
         height: bid.h,
@@ -295,6 +318,126 @@ function MarsmediaAdapter() {
 
     return bids;
   };
+
+  function sendbeacon(bid, type) {
+    const bidString = JSON.stringify(bid);
+    const encodedBuf = window.btoa(bidString);
+    triggerPixel('https://ping-hqx-1.go2speed.media/notification/rtb/beacon/?bt=' + type + '&bid=3mhdom&hb_j=' + encodedBuf, null);
+  }
+
+  /**
+   * Gets bidfloor
+   * @param {Object} bid
+   * @returns {Number} floor
+   */
+  function _getFloor (bid) {
+    const curMediaType = bid.mediaTypes.video ? 'video' : 'banner';
+    let floor = 0;
+
+    if (typeof bid.getFloor === 'function') {
+      const floorInfo = bid.getFloor({
+        currency: 'USD',
+        mediaType: curMediaType,
+        size: '*'
+      });
+
+      if (typeof floorInfo === 'object' &&
+        floorInfo.currency === 'USD' &&
+        !isNaN(parseFloat(floorInfo.floor))) {
+        floor = floorInfo.floor;
+      }
+    }
+
+    return floor;
+  }
+
+  function _getMinSize(sizes) {
+    return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
+  }
+
+  function _isViewabilityMeasurable(element) {
+    return !_isIframe() && element !== null;
+  }
+
+  function _isIframe() {
+    try {
+      return getWindowSelf() !== getWindowTop();
+    } catch (e) {
+      return true;
+    }
+  }
+
+  function _getViewability(element, topWin, { w, h } = {}) {
+    return topWin.document.visibilityState === 'visible'
+      ? _getPercentInView(element, topWin, { w, h })
+      : 0;
+  }
+
+  function _getPercentInView(element, topWin, { w, h } = {}) {
+    const elementBoundingBox = _getBoundingBox(element, { w, h });
+
+    const elementInViewBoundingBox = _getIntersectionOfRects([ {
+      left: 0,
+      top: 0,
+      right: topWin.innerWidth,
+      bottom: topWin.innerHeight
+    }, elementBoundingBox ]);
+
+    let elementInViewArea, elementTotalArea;
+
+    if (elementInViewBoundingBox !== null) {
+      // Some or all of the element is in view
+      elementInViewArea = elementInViewBoundingBox.width * elementInViewBoundingBox.height;
+      elementTotalArea = elementBoundingBox.width * elementBoundingBox.height;
+
+      return ((elementInViewArea / elementTotalArea) * 100);
+    }
+
+    return 0;
+  }
+
+  function _getBoundingBox(element, { w, h } = {}) {
+    let { width, height, left, top, right, bottom } = element.getBoundingClientRect();
+
+    if ((width === 0 || height === 0) && w && h) {
+      width = w;
+      height = h;
+      right = left + w;
+      bottom = top + h;
+    }
+
+    return { width, height, left, top, right, bottom };
+  }
+
+  function _getIntersectionOfRects(rects) {
+    const bbox = {
+      left: rects[0].left,
+      right: rects[0].right,
+      top: rects[0].top,
+      bottom: rects[0].bottom
+    };
+
+    for (let i = 1; i < rects.length; ++i) {
+      bbox.left = Math.max(bbox.left, rects[i].left);
+      bbox.right = Math.min(bbox.right, rects[i].right);
+
+      if (bbox.left >= bbox.right) {
+        return null;
+      }
+
+      bbox.top = Math.max(bbox.top, rects[i].top);
+      bbox.bottom = Math.min(bbox.bottom, rects[i].bottom);
+
+      if (bbox.top >= bbox.bottom) {
+        return null;
+      }
+    }
+
+    bbox.width = bbox.right - bbox.left;
+    bbox.height = bbox.bottom - bbox.top;
+
+    return bbox;
+  }
 }
 
 export const spec = new MarsmediaAdapter();
diff --git a/modules/mass.js b/modules/mass.js
new file mode 100644
index 00000000000..113fdce8d4f
--- /dev/null
+++ b/modules/mass.js
@@ -0,0 +1,184 @@
+/**
+ * This module adds MASS support to Prebid.js.
+ */
+
+import {config} from '../src/config.js';
+import {getHook} from '../src/hook.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
+
+const defaultCfg = {
+  dealIdPattern: /^MASS/i
+};
+let cfg;
+
+export let listenerAdded = false;
+export let isEnabled = false;
+
+const matchedBids = {};
+let renderers;
+
+config.getConfig('mass', config => init(config.mass));
+
+/**
+ * Module init.
+ */
+export function init(userCfg) {
+  cfg = Object.assign({}, defaultCfg, window.massConfig && window.massConfig.mass, userCfg);
+
+  if (cfg.enabled === false) {
+    if (isEnabled) {
+      getHook('addBidResponse').getHooks({hook: addBidResponseHook}).remove();
+      isEnabled = false;
+    }
+  } else {
+    if (!isEnabled) {
+      getHook('addBidResponse').before(addBidResponseHook);
+      isEnabled = true;
+    }
+  }
+
+  if (isEnabled) {
+    updateRenderers();
+  }
+}
+
+/**
+ * Update the list of renderers based on current config.
+ */
+export function updateRenderers() {
+  renderers = [];
+
+  // official MASS renderer:
+  if (cfg.dealIdPattern && cfg.renderUrl) {
+    renderers.push({
+      match: isMassBid,
+      render: useDefaultRender(cfg.renderUrl, 'mass')
+    });
+  }
+
+  // add any custom renderer defined in the config:
+  (cfg.custom || []).forEach(renderer => {
+    if (!renderer.match && renderer.dealIdPattern) {
+      renderer.match = useDefaultMatch(renderer.dealIdPattern);
+    }
+
+    if (!renderer.render && renderer.renderUrl && renderer.namespace) {
+      renderer.render = useDefaultRender(renderer.renderUrl, renderer.namespace);
+    }
+
+    if (renderer.match && renderer.render) {
+      renderers.push(renderer);
+    }
+  });
+
+  return renderers;
+}
+
+/**
+ * Before hook for 'addBidResponse'.
+ */
+export const addBidResponseHook = timedBidResponseHook('mass', function addBidResponseHook(next, adUnitCode, bid, reject, {index = auctionManager.index} = {}) {
+  let renderer;
+  for (let i = 0; i < renderers.length; i++) {
+    if (renderers[i].match(bid)) {
+      renderer = renderers[i];
+      break;
+    }
+  }
+
+  if (renderer) {
+    const bidRequest = index.getBidRequest(bid);
+
+    matchedBids[bid.requestId] = {
+      renderer,
+      payload: {
+        bidRequest,
+        bid,
+        adm: bid.ad
+      }
+    };
+
+    bid.ad = '<script>window.parent.postMessage({massBidId: "' + bid.requestId + '"}, "*");\x3c/script>';
+
+    addListenerOnce();
+  }
+
+  next(adUnitCode, bid, reject);
+});
+
+/**
+ * Add listener for the "message" event sent by the winning bid
+ */
+export function addListenerOnce() {
+  if (!listenerAdded) {
+    window.addEventListener('message', e => {
+      if (!e || !e.data || !e.data.massBidId) {
+        return;
+      }
+
+      const matchedBid = matchedBids[e.data.massBidId];
+      if (matchedBid) {
+        const payload = {
+          type: 'prebid',
+          event: e,
+          ...matchedBid.payload
+        };
+
+        delete payload.bid.ad;
+
+        matchedBid.renderer.render(payload);
+      }
+    });
+
+    listenerAdded = true;
+  }
+}
+
+/**
+ * Check if a bid is MASS.
+ */
+export function isMassBid(bid) {
+  // either bid.meta.mass is set or deal ID matches a publisher specified pattern:
+  if (!((bid.meta && bid.meta.mass) || (cfg.dealIdPattern && cfg.dealIdPattern.test(bid.dealId)))) {
+    return false;
+  }
+
+  // there must be a 'mass://' or 'pcreative?' in the ad markup:
+  return /mass:\/\/|\/pcreative\?/i.test(bid.ad);
+}
+
+/**
+ * Default match (factory).
+ */
+export function useDefaultMatch(dealIdPattern) {
+  return function(bid) {
+    return dealIdPattern.test(bid.dealId);
+  };
+}
+
+/**
+ * Default render (factory).
+ */
+export function useDefaultRender(renderUrl, namespace) {
+  return function render(payload) {
+    const ns = window[namespace] = window[namespace] || {};
+    ns.queue = ns.queue || [];
+
+    ns.queue.push(payload);
+
+    if (!ns.loaded) {
+      const s = document.createElement('script');
+      s.type = 'text/javascript';
+      s.async = true;
+      s.src = renderUrl;
+
+      const x = document.getElementsByTagName('script')[0];
+      x.parentNode.insertBefore(s, x);
+
+      ns.loaded = true;
+    }
+  };
+}
+
+init();
diff --git a/modules/mass.md b/modules/mass.md
new file mode 100644
index 00000000000..fc0add6a18e
--- /dev/null
+++ b/modules/mass.md
@@ -0,0 +1,137 @@
+## Overview
+
+This module enables the MASS protocol for Prebid. To use it, you'll need to
+work with a MASS enabled provider.
+
+This module scans incoming bids for the presence of a "mass" flag being set to 
+true in the bid meta or a publisher specified DealID pattern and uses 
+external resources to decypher and process the MASS:// URI found within the ad markup.
+This modules is designed to work with MASS enabled Exchanges and DSP's.
+
+This module only loads external JavaScript resources if the publisher ad server has 
+selected a MASS enabled bid as a winner. 
+
+Find out more [here](https://massplatform.net).
+
+{: .alert.alert-warning :}
+## Disclosure
+
+This module loads external JavaScript to render creatives
+
+## Custom Mode
+
+You can specify your own `dealIdPattern` and `renderUrl` by adding one or more entries into the `custom` configuration option (see [Configuration Parameters](#configuration-parameters) below). When specifying a custom renderer, quality assurance is your responsibility.
+
+## Integration
+
+Build the MASS module into the Prebid.js package with:
+
+```
+gulp build --modules=mass,...
+```
+
+
+## Module Configuration
+
+```js
+pbjs.que.push(function() {
+  pbjs.setConfig({
+    mass: {
+      enabled: true,
+      renderUrl: 'https://cdn.massplatform.net/bootloader.js',
+      dealIdPattern: /^MASS/i,
+      custom: [
+        {
+          dealIdPattern: /xyz/,
+          renderUrl: 'https://my.domain.com/render.js',
+          namespace: 'xyz'
+        }
+      ]
+    }
+  });
+});
+```
+
+### Configuration Parameters
+
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+|enabled | Boolean |Enable/disable the module |Defaults to `true` |
+|dealIdPattern | RegExp |The pattern used to identify MASS deal IDs |Defaults to `/^MASS/i` |
+|renderUrl | String |The MASS render script to load |`https://cdn.massplatform.net/bootloader.js` |
+|custom | Array |Add custom renderers | |
+|custom[].dealIdPattern | RegExp |A pattern used to identify matching deal IDs |Either this parameter or `custom[].match` must be specified |
+|custom[].renderUrl | String |The render script to load |Either this parameter or `custom[].render` must be specified |
+|custom[].namespace | String |The namespace (i.e.: object) created on `window` to pass parameters to the render script |Required with `custom[].renderUrl` |
+|custom[].match | Function(bid) |A custom function to identify matching bids |Either this parameter or `custom[].dealIdPattern` must be specified |
+|custom[].render | Function(payload) |A custom function to render the matchig/winning bid |Either this parameter or `custom[].renderUrl` must be specified. The `payload` parameter contains: `payload.bid`, `payload.bidRequest`, `payload.adm` |
+
+### Example Configurations
+
+### Only (official) MASS support enabled
+
+```js
+pbjs.que.push(function() {
+  pbjs.setConfig({
+    mass: {
+      renderUrl: 'https://cdn.massplatform.net/bootloader.js'
+    }
+  });
+});
+```
+
+### MASS support disabled, custom renderer enabled
+
+```js
+pbjs.que.push(function() {
+  pbjs.setConfig({
+    mass: {
+      custom: [
+        {
+          dealIdPattern: /xyz/,
+          renderUrl: 'https://my.domain.com/render.js',
+          namespace: 'xyz'
+        }
+      ]
+    }
+  });
+});
+```
+
+### Custom `match` and `render`
+
+```js
+pbjs.que.push(function() {
+  pbjs.setConfig({
+    mass: {
+      custom: [
+        {
+          match: function(bid) {
+            // return true/false if matching/non-matching bid
+          },
+
+          render: function(payload) {
+            console.log(payload);
+          }
+        }
+      ]
+    }
+  });
+});
+```
+
+## Integration Example
+
+To view the integration example:
+ 
+1) in your cli run:
+
+```
+gulp serve --modules=ixBidAdapter,mass
+```
+
+2) in your browser, navigate to:
+
+```
+http://localhost:9999/integrationExamples/mass/index.html
+```
diff --git a/modules/mathildeadsBidAdapter.js b/modules/mathildeadsBidAdapter.js
new file mode 100644
index 00000000000..6b886b72955
--- /dev/null
+++ b/modules/mathildeadsBidAdapter.js
@@ -0,0 +1,212 @@
+import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'mathildeads';
+const AD_URL = 'https://endpoint2.mathilde-ads.com/pbjs';
+const SYNC_URL = 'https://cs2.mathilde-ads.com';
+
+function isBidResponseValid (bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency || !bid.meta) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData (bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    placementId,
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  if (mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  }
+
+  if (mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  }
+
+  if (mediaTypes[NATIVE]) {
+    placement.adFormat = NATIVE;
+    placement.native = mediaTypes[NATIVE];
+  }
+
+  return placement;
+}
+
+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 = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && params.placementId);
+
+    if (mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    }
+
+    if (mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    }
+
+    if (mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    }
+
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest?.refererInfo?.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+
+    // TODO: does the fallback make sense here?
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/mathildeadsBidAdapter.md b/modules/mathildeadsBidAdapter.md
new file mode 100644
index 00000000000..00a03bd838c
--- /dev/null
+++ b/modules/mathildeadsBidAdapter.md
@@ -0,0 +1,80 @@
+# Overview
+
+```
+Module Name: MathildeAds Bidder Adapter
+Module Type: MathildeAds Bidder Adapter
+Maintainer: mathilde-ads@avaldigitallabs.com
+```
+
+# Description
+
+Connects to MathildeAds exchange for bids.
+
+MathildeAds bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'mathildeads',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'mathildeads',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'mathildeads',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/meazyBidAdapter.js b/modules/meazyBidAdapter.js
deleted file mode 100644
index 9640210cc12..00000000000
--- a/modules/meazyBidAdapter.js
+++ /dev/null
@@ -1,149 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'meazy';
-const PREBID_ENDPOINT = 'rtb-filter.meazy.co';
-const SYNC_ENDPOINT = 'https://sync.meazy.co/sync/iframe';
-const ENDPOINT_CONFIG = {
-  defaultCurrency: ['USD'],
-  availableSize: ['300x250', '320x480', '160x600']
-};
-
-const buildURI = (pid) => {
-  return `https://${PREBID_ENDPOINT}/pbjs?host=${utils.getOrigin()}&api_key=${pid}`;
-}
-
-const validateSize = (size) => {
-  return ENDPOINT_CONFIG.availableSize.indexOf(size.join('x')) !== -1;
-}
-
-const buildImpression = (bidRequest) => {
-  const impression = {
-    id: utils.getUniqueIdentifierStr(),
-    tagid: bidRequest.adUnitCode,
-    banner: {
-      format: bidRequest.sizes.map(size => ({ w: size[0], h: size[1] }))
-    }
-  };
-
-  return impression;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    return !!bid.params.pid && bid.sizes.some(validateSize);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(bidRequests, bidderRequest) {
-    const payload = {
-      id: bidRequests[0].bidId,
-      site: {
-        domain: utils.getOrigin()
-      },
-      device: {
-        w: window.screen.width,
-        h: window.screen.height,
-        language: navigator.language
-      },
-      cur: ENDPOINT_CONFIG.defaultCurrency,
-      imp: bidRequests.map(buildImpression),
-      user: {}
-    };
-
-    if (bidderRequest.refererInfo) {
-      if (bidderRequest.refererInfo.referer) {
-        payload.site.ref = bidderRequest.refererInfo.referer;
-      }
-
-      if (utils.isArray(bidderRequest.refererInfo) && bidderRequest.refererInfo.stack.length > 0) {
-        payload.site.page = bidderRequest.refererInfo.stack[0];
-      }
-    }
-
-    if (utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
-      payload.user.ext = {
-        consent: bidderRequest.gdprConsent.consentString,
-        gdpr: bidderRequest.gdprConsent.gdprApplies & 1
-      }
-    }
-
-    const payloadString = JSON.stringify(payload);
-
-    return {
-      method: 'POST',
-      url: buildURI(bidRequests[0].params.pid),
-      data: payloadString
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse) {
-    const bids = [];
-
-    if (!utils.isArray(serverResponse.body.seatbid) || !serverResponse.body.seatbid[0]) {
-      return bids;
-    }
-
-    serverResponse.body.seatbid[0].bid.forEach(bidResponse => {
-      const bid = {
-        requestId: serverResponse.body.id,
-        cpm: bidResponse.price,
-        width: bidResponse.w,
-        height: bidResponse.h,
-        creativeId: bidResponse.crid,
-        netRevenue: bidResponse.netRevenue !== undefined ? bidResponse.netRevenue : true,
-        dealId: bidResponse.dealid,
-        currency: ENDPOINT_CONFIG.defaultCurrency[0],
-        ttl: bidResponse.exp || 900,
-        ad: bidResponse.adm
-      }
-
-      bids.push(bid);
-    });
-
-    return bids;
-  },
-
-  getUserSyncs: function(syncOptions, serverResponses) {
-    const syncs = [];
-
-    if (syncOptions.pixelEnabled && serverResponses[0] && utils.deepAccess(serverResponses[0], 'body.ext.syncUrl')) {
-      syncs.push({
-        type: 'image',
-        url: serverResponses[0].body.ext.syncUrl
-      });
-    }
-
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: SYNC_ENDPOINT
-      });
-    }
-
-    return syncs;
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/meazyBidAdapter.md b/modules/meazyBidAdapter.md
deleted file mode 100644
index 354673bf590..00000000000
--- a/modules/meazyBidAdapter.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Overview
-
-Module Name: Meazy Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: dima@meazy.co
-
-# Description
-
-Module that connects to Meazy demand sources
-
-# Test Parameters
-```
-var adUnits = [{
- code: 'test-div',
- sizes: [[300, 250]],
-  bids: [{
-    bidder: "meazy",
-    params: {
-      pid: '6910b7344ae566a1'
-    }
-  }]
-}];
-```
\ No newline at end of file
diff --git a/modules/mediaforceBidAdapter.js b/modules/mediaforceBidAdapter.js
index fc0c44f6d82..744cf89d655 100644
--- a/modules/mediaforceBidAdapter.js
+++ b/modules/mediaforceBidAdapter.js
@@ -1,91 +1,213 @@
-import * as utils from '../src/utils.js';
+import { getDNT, deepAccess, isStr, replaceAuctionPrice, triggerPixel, parseGPTSingleSizeArrayToRtbSize, isEmpty } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'mediaforce';
 const ENDPOINT_URL = 'https://rtb.mfadsrvr.com/header_bid';
+const TEST_ENDPOINT_URL = 'https://rtb.mfadsrvr.com/header_bid?debug_key=abcdefghijklmnop';
+const NATIVE_ID_MAP = {};
+const NATIVE_PARAMS = {
+  title: {
+    id: 1,
+    name: 'title'
+  },
+  icon: {
+    id: 2,
+    type: 1,
+    name: 'img'
+  },
+  image: {
+    id: 3,
+    type: 3,
+    name: 'img'
+  },
+  body: {
+    id: 4,
+    name: 'data',
+    type: 2
+  },
+  sponsoredBy: {
+    id: 5,
+    name: 'data',
+    type: 1
+  },
+  cta: {
+    id: 6,
+    type: 12,
+    name: 'data'
+  },
+  body2: {
+    id: 7,
+    name: 'data',
+    type: 10
+  },
+  rating: {
+    id: 8,
+    name: 'data',
+    type: 3
+  },
+  likes: {
+    id: 9,
+    name: 'data',
+    type: 4
+  },
+  downloads: {
+    id: 10,
+    name: 'data',
+    type: 5
+  },
+  displayUrl: {
+    id: 11,
+    name: 'data',
+    type: 11
+  },
+  price: {
+    id: 12,
+    name: 'data',
+    type: 6
+  },
+  salePrice: {
+    id: 13,
+    name: 'data',
+    type: 7
+  },
+  address: {
+    id: 14,
+    name: 'data',
+    type: 9
+  },
+  phone: {
+    id: 15,
+    name: 'data',
+    type: 8
+  }
+};
+
+Object.keys(NATIVE_PARAMS).forEach((key) => {
+  NATIVE_ID_MAP[NATIVE_PARAMS[key].id] = key;
+});
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, NATIVE],
 
   /**
-     * Determines whether or not the given bid request is valid.
-     *
-     * @param {BidRequest} bid The bid params to validate.
-     * @return boolean True if this is a valid bid, and false otherwise.
-     */
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     return !!((typeof bid.params === 'object') && bid.params.placement_id && bid.params.publisher_id);
   },
 
   /**
-     * Make a server request from the list of BidRequests.
-     *
-     * @param {validBidRequests[]} - an array of bids
-     * @return ServerRequest Info describing the request to the server.
-     */
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests - an array of bids
+   * @param {bidderRequest} bidderRequest bidder request object
+   * @return ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if (validBidRequests.length === 0) {
       return;
     }
 
-    const referer = bidderRequest && bidderRequest.refererInfo ? encodeURIComponent(bidderRequest.refererInfo.referer) : '';
-    const dnt = utils.getDNT() ? 1 : 0;
-    let imp = [];
-    let requests = []
+    // TODO: is 'ref' the right value here?
+    const referer = bidderRequest && bidderRequest.refererInfo ? encodeURIComponent(bidderRequest.refererInfo.ref) : '';
+    const auctionId = bidderRequest && bidderRequest.auctionId;
+    const timeout = bidderRequest && bidderRequest.timeout;
+    const dnt = getDNT() ? 1 : 0;
+    const requestsMap = {};
+    const requests = [];
+    let isTest = false;
     validBidRequests.forEach(bid => {
+      isTest = isTest || bid.params.is_test;
       let tagid = bid.params.placement_id;
-      let bidfloor = bid.params.bidfloor ? parseFloat(bid.params.bidfloor) : 0;
+      let bidfloor = 0;
+      let validImp = false;
       let impObj = {
         id: bid.bidId,
         tagid: tagid,
-        secure: 1,
+        secure: window.location.protocol === 'https:' ? 1 : 0,
         bidfloor: bidfloor,
+        ext: {
+          mediaforce: {
+            transactionId: bid.transactionId
+          }
+        }
+
       };
       for (let mediaTypes in bid.mediaTypes) {
         switch (mediaTypes) {
           case BANNER:
             impObj.banner = createBannerRequest(bid);
-            imp.push(impObj);
+            validImp = true;
+            break;
+          case NATIVE:
+            impObj.native = createNativeRequest(bid);
+            validImp = true;
             break;
           default: return;
         }
       }
 
-      let request = {
-        id: bid.transactionId,
-        site: {
-          page: referer,
-          ref: referer,
-          id: bid.params.publisher_id,
-          publisher: {
-            id: bid.params.publisher_id
+      let request = requestsMap[bid.params.publisher_id];
+      if (!request) {
+        request = {
+          id: Math.round(Math.random() * 1e16).toString(16),
+          site: {
+            // TODO: this should probably look at refererInfo
+            page: window.location.href,
+            ref: referer,
+            id: bid.params.publisher_id,
+            publisher: {
+              id: bid.params.publisher_id
+            },
           },
-        },
-        device: {
-          ua: navigator.userAgent,
-          js: 1,
-          dnt: dnt,
-          language: getLanguage()
-        },
-        imp
-      };
-      requests.push({
-        method: 'POST',
-        url: ENDPOINT_URL,
-        data: JSON.stringify(request)
-      });
+          device: {
+            ua: navigator.userAgent,
+            js: 1,
+            dnt: dnt,
+            language: getLanguage()
+          },
+          ext: {
+            mediaforce: {
+              hb_key: auctionId
+            }
+          },
+          tmax: timeout,
+          imp: []
+        };
+        requestsMap[bid.params.publisher_id] = request;
+        requests.push({
+          method: 'POST',
+          url: ENDPOINT_URL,
+          data: request
+        });
+      }
+      validImp && request.imp.push(impObj);
+    });
+    requests.forEach((req) => {
+      if (isTest) {
+        req.url = TEST_ENDPOINT_URL;
+      }
+      req.data = JSON.stringify(req.data);
     });
     return requests;
   },
 
   /**
-     * Unpack the response from the server into a list of bids.
-     *
-     * @param {ServerResponse} serverResponse A successful response from the server.
-     * @return {Bid[]} An array of bids which were nested inside the server.
-     */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, bidRequest) {
     if (!serverResponse || !serverResponse.body) {
       return [];
@@ -99,15 +221,38 @@ export const spec = {
         const bid = {
           requestId: serverBid.impid,
           cpm: parseFloat(serverBid.price),
-          width: serverBid.w,
-          height: serverBid.h,
           creativeId: serverBid.adid,
           currency: cur,
           netRevenue: true,
           ttl: serverBid.ttl || 300,
-          ad: serverBid.adm,
+          meta: {
+            advertiserDomains: serverBid.adomain ? serverBid.adomain : []
+          },
           burl: serverBid.burl,
         };
+        if (serverBid.dealid) {
+          bid.dealId = serverBid.dealid;
+        }
+        let jsonAdm;
+        let adm = serverBid.adm;
+        let ext = serverBid.ext;
+        try {
+          jsonAdm = JSON.parse(adm);
+        } catch (err) {}
+        if (jsonAdm && jsonAdm.native) {
+          ext = ext || {};
+          ext.native = jsonAdm.native;
+          adm = null;
+        }
+        if (adm) {
+          bid.width = serverBid.w;
+          bid.height = serverBid.h;
+          bid.ad = adm;
+          bid.mediaType = BANNER;
+        } else if (ext && ext.native) {
+          bid.native = parseNative(ext.native);
+          bid.mediaType = NATIVE;
+        }
 
         bidResponses.push(bid);
       })
@@ -117,17 +262,18 @@ export const spec = {
   },
 
   /**
-     * Register bidder specific code, which will execute if a bid from this bidder won the auction
-     * @param {Bid} The bid that won the auction
-     */
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
   onBidWon: function(bid) {
-    const cpm = utils.deepAccess(bid, 'adserverTargeting.hb_pb') || '';
-    if (utils.isStr(bid.burl) && bid.burl !== '') {
-      bid.burl = utils.replaceAuctionPrice(bid.burl, cpm);
-      utils.triggerPixel(bid.burl);
+    const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
+    if (isStr(bid.burl) && bid.burl !== '') {
+      bid.burl = replaceAuctionPrice(bid.burl, bid.originalCpm || cpm);
+      triggerPixel(bid.burl);
     }
   },
-}
+};
+
 registerBidder(spec);
 
 function getLanguage() {
@@ -140,12 +286,82 @@ function createBannerRequest(bid) {
   if (!sizes.length) return;
 
   let format = [];
-  let r = utils.parseGPTSingleSizeArrayToRtbSize(sizes[0]);
+  let r = parseGPTSingleSizeArrayToRtbSize(sizes[0]);
   for (let f = 1; f < sizes.length; f++) {
-    format.push(utils.parseGPTSingleSizeArrayToRtbSize(sizes[f]));
+    format.push(parseGPTSingleSizeArrayToRtbSize(sizes[f]));
   }
   if (format.length) {
     r.format = format
   }
   return r
 }
+
+function parseNative(native) {
+  const {assets, link, imptrackers, jstracker} = native;
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || [],
+    impressionTrackers: imptrackers || [],
+    javascriptTrackers: jstracker ? [jstracker] : []
+  };
+
+  (assets || []).forEach((asset) => {
+    const {id, img, data, title} = asset;
+    const key = NATIVE_ID_MAP[id];
+    if (key) {
+      if (!isEmpty(title)) {
+        result.title = title.text
+      } else if (!isEmpty(img)) {
+        result[key] = {
+          url: img.url,
+          height: img.h,
+          width: img.w
+        }
+      } else if (!isEmpty(data)) {
+        result[key] = data.value;
+      }
+    }
+  });
+
+  return result;
+}
+
+function createNativeRequest(bid) {
+  const assets = [];
+  if (bid.nativeParams) {
+    Object.keys(bid.nativeParams).forEach((key) => {
+      if (NATIVE_PARAMS[key]) {
+        const {name, type, id} = NATIVE_PARAMS[key];
+        const assetObj = type ? {type} : {};
+        let {len, sizes, required, aspect_ratios: aRatios} = bid.nativeParams[key];
+        if (len) {
+          assetObj.len = len;
+        }
+        if (aRatios && aRatios[0]) {
+          aRatios = aRatios[0];
+          let wmin = aRatios.min_width || 0;
+          let hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+          assetObj.wmin = wmin;
+          assetObj.hmin = hmin;
+        }
+        if (sizes && sizes.length) {
+          sizes = [].concat(...sizes);
+          assetObj.w = sizes[0];
+          assetObj.h = sizes[1];
+        }
+        const asset = {required: required ? 1 : 0, id};
+        asset[name] = assetObj;
+        assets.push(asset);
+      }
+    });
+  }
+  return {
+    ver: '1.2',
+    request: {
+      assets: assets,
+      context: 1,
+      plcmttype: 1,
+      ver: '1.2'
+    }
+  }
+}
diff --git a/modules/mediaforceBidAdapter.md b/modules/mediaforceBidAdapter.md
index e16d4178b3f..f8e6903516f 100644
--- a/modules/mediaforceBidAdapter.md
+++ b/modules/mediaforceBidAdapter.md
@@ -33,3 +33,36 @@ Module that connects to mediaforce's demand sources
         }
     ];
 ```
+
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                native: {
+                    title: {
+                        required: true,
+                        len: 800
+                    },
+                    image: {
+                        required: true,
+                        sizes: [420, 315],
+                    },
+                    sponsoredBy: {
+                        required: false
+                    }
+                }
+            },
+            bids: [
+                {
+                    bidder: "mediaforce",
+                    params: {
+                        placement_id: 'pl12345',  // required
+                        publisher_id: 'pub111', // required
+                        is_test: true
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/mediafuseBidAdapter.js b/modules/mediafuseBidAdapter.js
new file mode 100644
index 00000000000..e61c2e65c39
--- /dev/null
+++ b/modules/mediafuseBidAdapter.js
@@ -0,0 +1,1139 @@
+import { convertCamelToUnderscore, isArray, isNumber, isPlainObject, logError, logInfo, deepAccess, logMessage, convertTypes, isStr, getParameterByName, deepClone, chunk, logWarn, getBidRequest, createTrackPixelHtml, isEmpty, transformBidderParamKeywords, getMaxValueFromArray, fill, getMinValueFromArray, isArrayOfNums, isFn } from '../src/utils.js';
+import { Renderer } from '../src/Renderer.js';
+import { config } from '../src/config.js';
+import { registerBidder, getIabSubCategory } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO, ADPOD } from '../src/mediaTypes.js';
+import { auctionManager } from '../src/auctionManager.js';
+import {find, includes} from '../src/polyfill.js';
+import { OUTSTREAM, INSTREAM } from '../src/video.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { bidderSettings } from '../src/bidderSettings.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'mediafuse';
+const URL = 'https://ib.adnxs.com/ut/v3/prebid';
+const URL_SIMPLE = 'https://ib.adnxs-simple.com/ut/v3/prebid';
+const VIDEO_TARGETING = ['id', 'minduration', 'maxduration',
+  'skippable', 'playback_method', 'frameworks', 'context', 'skipoffset'];
+const VIDEO_RTB_TARGETING = ['minduration', 'maxduration', 'skip', 'skipafter', 'playbackmethod', 'api'];
+const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
+const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
+const DEBUG_PARAMS = ['enabled', 'dongle', 'member_id', 'debug_timeout'];
+const VIDEO_MAPPING = {
+  playback_method: {
+    'unknown': 0,
+    'auto_play_sound_on': 1,
+    'auto_play_sound_off': 2,
+    'click_to_play': 3,
+    'mouse_over': 4,
+    'auto_play_sound_unknown': 5
+  },
+  context: {
+    'unknown': 0,
+    'pre_roll': 1,
+    'mid_roll': 2,
+    'post_roll': 3,
+    'outstream': 4,
+    'in-banner': 5
+  }
+};
+const NATIVE_MAPPING = {
+  body: 'description',
+  body2: 'desc2',
+  cta: 'ctatext',
+  image: {
+    serverName: 'main_image',
+    requiredParams: { required: true }
+  },
+  icon: {
+    serverName: 'icon',
+    requiredParams: { required: true }
+  },
+  sponsoredBy: 'sponsored_by',
+  privacyLink: 'privacy_link',
+  salePrice: 'saleprice',
+  displayUrl: 'displayurl'
+};
+const SOURCE = 'pbjs';
+const MAX_IMPS_PER_REQUEST = 15;
+const mappingFileUrl = 'https://acdn.adnxs-simple.com/prebid/mediafuse-mapping/mappings.json';
+const SCRIPT_TAG_START = '<script';
+const VIEWABILITY_URL_START = /\/\/cdn\.adnxs\.com\/v|\/\/cdn\.adnxs\-simple\.com\/v/;
+const VIEWABILITY_FILE_NAME = 'trk.js';
+const GVLID = 32;
+const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.placementId || (bid.params.member && bid.params.invCode));
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+    const tags = bidRequests.map(bidToTag);
+    const userObjBid = find(bidRequests, hasUserInfo);
+    let userObj = {};
+    if (config.getConfig('coppa') === true) {
+      userObj = { 'coppa': true };
+    }
+    if (userObjBid) {
+      Object.keys(userObjBid.params.user)
+        .filter(param => includes(USER_PARAMS, param))
+        .forEach((param) => {
+          let uparam = convertCamelToUnderscore(param);
+          if (param === 'segments' && isArray(userObjBid.params.user[param])) {
+            let segs = [];
+            userObjBid.params.user[param].forEach(val => {
+              if (isNumber(val)) {
+                segs.push({'id': val});
+              } else if (isPlainObject(val)) {
+                segs.push(val);
+              }
+            });
+            userObj[uparam] = segs;
+          } else if (param !== 'segments') {
+            userObj[uparam] = userObjBid.params.user[param];
+          }
+        });
+    }
+
+    const appDeviceObjBid = find(bidRequests, hasAppDeviceInfo);
+    let appDeviceObj;
+    if (appDeviceObjBid && appDeviceObjBid.params && appDeviceObjBid.params.app) {
+      appDeviceObj = {};
+      Object.keys(appDeviceObjBid.params.app)
+        .filter(param => includes(APP_DEVICE_PARAMS, param))
+        .forEach(param => appDeviceObj[param] = appDeviceObjBid.params.app[param]);
+    }
+
+    const appIdObjBid = find(bidRequests, hasAppId);
+    let appIdObj;
+    if (appIdObjBid && appIdObjBid.params && appDeviceObjBid.params.app && appDeviceObjBid.params.app.id) {
+      appIdObj = {
+        appid: appIdObjBid.params.app.id
+      };
+    }
+
+    let debugObj = {};
+    let debugObjParams = {};
+    const debugCookieName = 'apn_prebid_debug';
+    const debugCookie = storage.getCookie(debugCookieName) || null;
+
+    if (debugCookie) {
+      try {
+        debugObj = JSON.parse(debugCookie);
+      } catch (e) {
+        logError('MediaFuse Debug Auction Cookie Error:\n\n' + e);
+      }
+    } else {
+      const debugBidRequest = find(bidRequests, hasDebug);
+      if (debugBidRequest && debugBidRequest.debug) {
+        debugObj = debugBidRequest.debug;
+      }
+    }
+
+    if (debugObj && debugObj.enabled) {
+      Object.keys(debugObj)
+        .filter(param => includes(DEBUG_PARAMS, param))
+        .forEach(param => {
+          debugObjParams[param] = debugObj[param];
+        });
+    }
+
+    const memberIdBid = find(bidRequests, hasMemberId);
+    const member = memberIdBid ? parseInt(memberIdBid.params.member, 10) : 0;
+    const schain = bidRequests[0].schain;
+    const omidSupport = find(bidRequests, hasOmidSupport);
+
+    const payload = {
+      tags: [...tags],
+      user: userObj,
+      sdk: {
+        source: SOURCE,
+        version: '$prebid.version$'
+      },
+      schain: schain
+    };
+
+    if (omidSupport) {
+      payload['iab_support'] = {
+        omidpn: 'Mediafuse',
+        omidpv: '$prebid.version$'
+      };
+    }
+
+    if (member > 0) {
+      payload.member_id = member;
+    }
+
+    if (appDeviceObjBid) {
+      payload.device = appDeviceObj;
+    }
+    if (appIdObjBid) {
+      payload.app = appIdObj;
+    }
+
+    let auctionKeywords = config.getConfig('mediafuseAuctionKeywords');
+    if (isPlainObject(auctionKeywords)) {
+      let aucKeywords = transformBidderParamKeywords(auctionKeywords);
+
+      if (aucKeywords.length > 0) {
+        aucKeywords.forEach(deleteValues);
+      }
+
+      payload.keywords = aucKeywords;
+    }
+
+    if (config.getConfig('adpod.brandCategoryExclusion')) {
+      payload.brand_category_uniqueness = true;
+    }
+
+    if (debugObjParams.enabled) {
+      payload.debug = debugObjParams;
+      logInfo('MediaFuse Debug Auction Settings:\n\n' + JSON.stringify(debugObjParams, null, 4));
+    }
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      // note - objects for impbus use underscore instead of camelCase
+      payload.gdpr_consent = {
+        consent_string: bidderRequest.gdprConsent.consentString,
+        consent_required: bidderRequest.gdprConsent.gdprApplies
+      };
+
+      if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+        let ac = bidderRequest.gdprConsent.addtlConsent;
+        // pull only the ids from the string (after the ~) and convert them to an array of ints
+        let acStr = ac.substring(ac.indexOf('~') + 1);
+        payload.gdpr_consent.addtl_consent = acStr.split('.').map(id => parseInt(id, 10));
+      }
+    }
+
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    if (bidderRequest && bidderRequest.refererInfo) {
+      let refererinfo = {
+        // TODO: this collects everything it finds, except for canonicalUrl
+        rd_ref: encodeURIComponent(bidderRequest.refererInfo.topmostLocation),
+        rd_top: bidderRequest.refererInfo.reachedTop,
+        rd_ifs: bidderRequest.refererInfo.numIframes,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      };
+      payload.referrer_detection = refererinfo;
+    }
+
+    const hasAdPodBid = find(bidRequests, hasAdPod);
+    if (hasAdPodBid) {
+      bidRequests.filter(hasAdPod).forEach(adPodBid => {
+        const adPodTags = createAdPodRequest(tags, adPodBid);
+        // don't need the original adpod placement because it's in adPodTags
+        const nonPodTags = payload.tags.filter(tag => tag.uuid !== adPodBid.bidId);
+        payload.tags = [...nonPodTags, ...adPodTags];
+      });
+    }
+
+    if (bidRequests[0].userId) {
+      let eids = [];
+
+      addUserId(eids, deepAccess(bidRequests[0], `userId.criteoId`), 'criteo.com', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.netId`), 'netid.de', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.idl_env`), 'liveramp.com', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.tdid`), 'adserver.org', 'TDID');
+      addUserId(eids, deepAccess(bidRequests[0], `userId.uid2.id`), 'uidapi.com', 'UID2');
+
+      if (eids.length) {
+        payload.eids = eids;
+      }
+    }
+
+    if (tags[0].publisher_id) {
+      payload.publisher_id = tags[0].publisher_id;
+    }
+
+    const request = formatRequest(payload, bidderRequest);
+    return request;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, { bidderRequest }) {
+    serverResponse = serverResponse.body;
+    const bids = [];
+    if (!serverResponse || serverResponse.error) {
+      let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
+      if (serverResponse && serverResponse.error) { errorMessage += `: ${serverResponse.error}`; }
+      logError(errorMessage);
+      return bids;
+    }
+
+    if (serverResponse.tags) {
+      serverResponse.tags.forEach(serverBid => {
+        const rtbBid = getRtbBid(serverBid);
+        if (rtbBid) {
+          const cpmCheck = (bidderSettings.get(bidderRequest.bidderCode, 'allowZeroCpmBids') === true) ? rtbBid.cpm >= 0 : rtbBid.cpm > 0;
+          if (cpmCheck && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
+            const bid = newBid(serverBid, rtbBid, bidderRequest);
+            bid.mediaType = parseMediaType(rtbBid);
+            bids.push(bid);
+          }
+        }
+      });
+    }
+
+    if (serverResponse.debug && serverResponse.debug.debug_info) {
+      let debugHeader = 'MediaFuse Debug Auction for Prebid\n\n'
+      let debugText = debugHeader + serverResponse.debug.debug_info
+      debugText = debugText
+        .replace(/(<td>|<th>)/gm, '\t') // Tables
+        .replace(/(<\/td>|<\/th>)/gm, '\n') // Tables
+        .replace(/^<br>/gm, '') // Remove leading <br>
+        .replace(/(<br>\n|<br>)/gm, '\n') // <br>
+        .replace(/<h1>(.*)<\/h1>/gm, '\n\n===== $1 =====\n\n') // Header H1
+        .replace(/<h[2-6]>(.*)<\/h[2-6]>/gm, '\n\n*** $1 ***\n\n') // Headers
+        .replace(/(<([^>]+)>)/igm, ''); // Remove any other tags
+      // logMessage('https://console.appnexus.com/docs/understanding-the-debug-auction');
+      logMessage(debugText);
+    }
+
+    return bids;
+  },
+
+  /**
+   * @typedef {Object} mappingFileInfo
+   * @property {string} url  mapping file json url
+   * @property {number} refreshInDays prebid stores mapping data in localstorage so you can return in how many days you want to update value stored in localstorage.
+   * @property {string} localStorageKey unique key to store your mapping json in localstorage
+   */
+
+  /**
+   * Returns mapping file info. This info will be used by bidderFactory to preload mapping file and store data in local storage
+   * @returns {mappingFileInfo}
+   */
+  getMappingFileInfo: function () {
+    return {
+      url: mappingFileUrl,
+      refreshInDays: 2
+    }
+  },
+
+  getUserSyncs: function (syncOptions, responses, gdprConsent) {
+    if (syncOptions.iframeEnabled && hasPurpose1Consent({gdprConsent})) {
+      return [{
+        type: 'iframe',
+        url: 'https://acdn.adnxs.com/dmp/async_usersync.html'
+      }];
+    }
+  },
+
+  transformBidParams: function (params, isOpenRtb) {
+    params = convertTypes({
+      'member': 'string',
+      'invCode': 'string',
+      'placementId': 'number',
+      'keywords': transformBidderParamKeywords,
+      'publisherId': 'number'
+    }, params);
+
+    if (isOpenRtb) {
+      params.use_pmt_rule = (typeof params.usePaymentRule === 'boolean') ? params.usePaymentRule : false;
+      if (params.usePaymentRule) { delete params.usePaymentRule; }
+
+      if (isPopulatedArray(params.keywords)) {
+        params.keywords.forEach(deleteValues);
+      }
+
+      Object.keys(params).forEach(paramKey => {
+        let convertedKey = convertCamelToUnderscore(paramKey);
+        if (convertedKey !== paramKey) {
+          params[convertedKey] = params[paramKey];
+          delete params[paramKey];
+        }
+      });
+    }
+
+    return params;
+  },
+
+  /**
+   * Add element selector to javascript tracker to improve native viewability
+   * @param {Bid} bid
+   */
+  onBidWon: function (bid) {
+    if (bid.native) {
+      reloadViewabilityScriptWithCorrectParameters(bid);
+    }
+  }
+};
+
+function isPopulatedArray(arr) {
+  return !!(isArray(arr) && arr.length > 0);
+}
+
+function deleteValues(keyPairObj) {
+  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
+    delete keyPairObj.value;
+  }
+}
+
+function reloadViewabilityScriptWithCorrectParameters(bid) {
+  let viewJsPayload = getMediafuseViewabilityScriptFromJsTrackers(bid.native.javascriptTrackers);
+
+  if (viewJsPayload) {
+    let prebidParams = 'pbjs_adid=' + bid.adId + ';pbjs_auc=' + bid.adUnitCode;
+
+    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload);
+
+    let newJsTrackerSrc = jsTrackerSrc.replace('dom_id=%native_dom_id%', prebidParams);
+
+    // find iframe containing script tag
+    let frameArray = document.getElementsByTagName('iframe');
+
+    // boolean var to modify only one script. That way if there are muliple scripts,
+    // they won't all point to the same creative.
+    let modifiedAScript = false;
+
+    // first, loop on all ifames
+    for (let i = 0; i < frameArray.length && !modifiedAScript; i++) {
+      let currentFrame = frameArray[i];
+      try {
+        // IE-compatible, see https://stackoverflow.com/a/3999191/2112089
+        let nestedDoc = currentFrame.contentDocument || currentFrame.contentWindow.document;
+
+        if (nestedDoc) {
+          // if the doc is present, we look for our jstracker
+          let scriptArray = nestedDoc.getElementsByTagName('script');
+          for (let j = 0; j < scriptArray.length && !modifiedAScript; j++) {
+            let currentScript = scriptArray[j];
+            if (currentScript.getAttribute('data-src') == jsTrackerSrc) {
+              currentScript.setAttribute('src', newJsTrackerSrc);
+              currentScript.setAttribute('data-src', '');
+              if (currentScript.removeAttribute) {
+                currentScript.removeAttribute('data-src');
+              }
+              modifiedAScript = true;
+            }
+          }
+        }
+      } catch (exception) {
+        // trying to access a cross-domain iframe raises a SecurityError
+        // this is expected and ignored
+        if (!(exception instanceof DOMException && exception.name === 'SecurityError')) {
+          // all other cases are raised again to be treated by the calling function
+          throw exception;
+        }
+      }
+    }
+  }
+}
+
+function strIsMediafuseViewabilityScript(str) {
+  let regexMatchUrlStart = str.match(VIEWABILITY_URL_START);
+  let viewUrlStartInStr = regexMatchUrlStart != null && regexMatchUrlStart.length >= 1;
+
+  let regexMatchFileName = str.match(VIEWABILITY_FILE_NAME);
+  let fileNameInStr = regexMatchFileName != null && regexMatchFileName.length >= 1;
+
+  return str.startsWith(SCRIPT_TAG_START) && fileNameInStr && viewUrlStartInStr;
+}
+
+function getMediafuseViewabilityScriptFromJsTrackers(jsTrackerArray) {
+  let viewJsPayload;
+  if (isStr(jsTrackerArray) && strIsMediafuseViewabilityScript(jsTrackerArray)) {
+    viewJsPayload = jsTrackerArray;
+  } else if (isArray(jsTrackerArray)) {
+    for (let i = 0; i < jsTrackerArray.length; i++) {
+      let currentJsTracker = jsTrackerArray[i];
+      if (strIsMediafuseViewabilityScript(currentJsTracker)) {
+        viewJsPayload = currentJsTracker;
+      }
+    }
+  }
+  return viewJsPayload;
+}
+
+function getViewabilityScriptUrlFromPayload(viewJsPayload) {
+  // extracting the content of the src attribute
+  // -> substring between src=" and "
+  let indexOfFirstQuote = viewJsPayload.indexOf('src="') + 5; // offset of 5: the length of 'src=' + 1
+  let indexOfSecondQuote = viewJsPayload.indexOf('"', indexOfFirstQuote);
+  let jsTrackerSrc = viewJsPayload.substring(indexOfFirstQuote, indexOfSecondQuote);
+  return jsTrackerSrc;
+}
+
+function formatRequest(payload, bidderRequest) {
+  let request = [];
+  let options = {
+    withCredentials: true
+  };
+
+  let endpointUrl = URL;
+
+  if (!hasPurpose1Consent(bidderRequest?.gdprConsent)) {
+    endpointUrl = URL_SIMPLE;
+  }
+
+  if (getParameterByName('apn_test').toUpperCase() === 'TRUE' || config.getConfig('apn_test') === true) {
+    options.customHeaders = {
+      'X-Is-Test': 1
+    };
+  }
+
+  if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
+    const clonedPayload = deepClone(payload);
+
+    chunk(payload.tags, MAX_IMPS_PER_REQUEST).forEach(tags => {
+      clonedPayload.tags = tags;
+      const payloadString = JSON.stringify(clonedPayload);
+      request.push({
+        method: 'POST',
+        url: endpointUrl,
+        data: payloadString,
+        bidderRequest,
+        options
+      });
+    });
+  } else {
+    const payloadString = JSON.stringify(payload);
+    request = {
+      method: 'POST',
+      url: endpointUrl,
+      data: payloadString,
+      bidderRequest,
+      options
+    };
+  }
+
+  return request;
+}
+
+function newRenderer(adUnitCode, rtbBid, rendererOptions = {}) {
+  const renderer = Renderer.install({
+    id: rtbBid.renderer_id,
+    url: rtbBid.renderer_url,
+    config: rendererOptions,
+    loaded: false,
+    adUnitCode
+  });
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  renderer.setEventHandlers({
+    impression: () => logMessage('MediaFuse outstream video impression event'),
+    loaded: () => logMessage('MediaFuse outstream video loaded event'),
+    ended: () => {
+      logMessage('MediaFuse outstream renderer video event');
+      document.querySelector(`#${adUnitCode}`).style.display = 'none';
+    }
+  });
+  return renderer;
+}
+
+/**
+ * Unpack the Server's Bid into a Prebid-compatible one.
+ * @param serverBid
+ * @param rtbBid
+ * @param bidderRequest
+ * @return Bid
+ */
+function newBid(serverBid, rtbBid, bidderRequest) {
+  const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
+  const bid = {
+    requestId: serverBid.uuid,
+    cpm: rtbBid.cpm,
+    creativeId: rtbBid.creative_id,
+    dealId: rtbBid.deal_id,
+    currency: 'USD',
+    netRevenue: true,
+    ttl: 300,
+    adUnitCode: bidRequest.adUnitCode,
+    mediafuse: {
+      buyerMemberId: rtbBid.buyer_member_id,
+      dealPriority: rtbBid.deal_priority,
+      dealCode: rtbBid.deal_code
+    }
+  };
+
+  // WE DON'T FULLY SUPPORT THIS ATM - future spot for adomain code; creating a stub for 5.0 compliance
+  if (rtbBid.adomain) {
+    bid.meta = Object.assign({}, bid.meta, { advertiserDomains: [] });
+  }
+
+  if (rtbBid.advertiser_id) {
+    bid.meta = Object.assign({}, bid.meta, { advertiserId: rtbBid.advertiser_id });
+  }
+
+  // temporary function; may remove at later date if/when adserver fully supports dchain
+  function setupDChain(rtbBid) {
+    let dchain = {
+      ver: '1.0',
+      complete: 0,
+      nodes: [{
+        bsid: rtbBid.buyer_member_id.toString()
+      }],
+    };
+
+    return dchain;
+  }
+  if (rtbBid.buyer_member_id) {
+    bid.meta = Object.assign({}, bid.meta, {dchain: setupDChain(rtbBid)});
+  }
+
+  if (rtbBid.brand_id) {
+    bid.meta = Object.assign({}, bid.meta, { brandId: rtbBid.brand_id });
+  }
+
+  if (rtbBid.rtb.video) {
+    // shared video properties used for all 3 contexts
+    Object.assign(bid, {
+      width: rtbBid.rtb.video.player_width,
+      height: rtbBid.rtb.video.player_height,
+      vastImpUrl: rtbBid.notify_url,
+      ttl: 3600
+    });
+
+    const videoContext = deepAccess(bidRequest, 'mediaTypes.video.context');
+    switch (videoContext) {
+      case ADPOD:
+        const primaryCatId = getIabSubCategory(bidRequest.bidder, rtbBid.brand_category_id);
+        bid.meta = Object.assign({}, bid.meta, { primaryCatId });
+        const dealTier = rtbBid.deal_priority;
+        bid.video = {
+          context: ADPOD,
+          durationSeconds: Math.floor(rtbBid.rtb.video.duration_ms / 1000),
+          dealTier
+        };
+        bid.vastUrl = rtbBid.rtb.video.asset_url;
+        break;
+      case OUTSTREAM:
+        bid.adResponse = serverBid;
+        bid.adResponse.ad = bid.adResponse.ads[0];
+        bid.adResponse.ad.video = bid.adResponse.ad.rtb.video;
+        bid.vastXml = rtbBid.rtb.video.content;
+
+        if (rtbBid.renderer_url) {
+          const videoBid = find(bidderRequest.bids, bid => bid.bidId === serverBid.uuid);
+          const rendererOptions = deepAccess(videoBid, 'renderer.options');
+          bid.renderer = newRenderer(bid.adUnitCode, rtbBid, rendererOptions);
+        }
+        break;
+      case INSTREAM:
+        bid.vastUrl = rtbBid.notify_url + '&redir=' + encodeURIComponent(rtbBid.rtb.video.asset_url);
+        break;
+    }
+  } else if (rtbBid.rtb[NATIVE]) {
+    const nativeAd = rtbBid.rtb[NATIVE];
+
+    // setting up the jsTracker:
+    // we put it as a data-src attribute so that the tracker isn't called
+    // until we have the adId (see onBidWon)
+    let jsTrackerDisarmed = rtbBid.viewability.config.replace('src=', 'data-src=');
+
+    let jsTrackers = nativeAd.javascript_trackers;
+
+    if (jsTrackers == undefined) {
+      jsTrackers = jsTrackerDisarmed;
+    } else if (isStr(jsTrackers)) {
+      jsTrackers = [jsTrackers, jsTrackerDisarmed];
+    } else {
+      jsTrackers.push(jsTrackerDisarmed);
+    }
+
+    bid[NATIVE] = {
+      title: nativeAd.title,
+      body: nativeAd.desc,
+      body2: nativeAd.desc2,
+      cta: nativeAd.ctatext,
+      rating: nativeAd.rating,
+      sponsoredBy: nativeAd.sponsored,
+      privacyLink: nativeAd.privacy_link,
+      address: nativeAd.address,
+      downloads: nativeAd.downloads,
+      likes: nativeAd.likes,
+      phone: nativeAd.phone,
+      price: nativeAd.price,
+      salePrice: nativeAd.saleprice,
+      clickUrl: nativeAd.link.url,
+      displayUrl: nativeAd.displayurl,
+      clickTrackers: nativeAd.link.click_trackers,
+      impressionTrackers: nativeAd.impression_trackers,
+      javascriptTrackers: jsTrackers
+    };
+    if (nativeAd.main_img) {
+      bid['native'].image = {
+        url: nativeAd.main_img.url,
+        height: nativeAd.main_img.height,
+        width: nativeAd.main_img.width,
+      };
+    }
+    if (nativeAd.icon) {
+      bid['native'].icon = {
+        url: nativeAd.icon.url,
+        height: nativeAd.icon.height,
+        width: nativeAd.icon.width,
+      };
+    }
+  } else {
+    Object.assign(bid, {
+      width: rtbBid.rtb.banner.width,
+      height: rtbBid.rtb.banner.height,
+      ad: rtbBid.rtb.banner.content
+    });
+    try {
+      if (rtbBid.rtb.trackers) {
+        for (let i = 0; i < rtbBid.rtb.trackers[0].impression_urls.length; i++) {
+          const url = rtbBid.rtb.trackers[0].impression_urls[i];
+          const tracker = createTrackPixelHtml(url);
+          bid.ad += tracker;
+        }
+      }
+    } catch (error) {
+      logError('Error appending tracking pixel', error);
+    }
+  }
+
+  return bid;
+}
+
+function bidToTag(bid) {
+  const tag = {};
+  tag.sizes = transformSizes(bid.sizes);
+  tag.primary_size = tag.sizes[0];
+  tag.ad_types = [];
+  tag.uuid = bid.bidId;
+  if (bid.params.placementId) {
+    tag.id = parseInt(bid.params.placementId, 10);
+  } else {
+    tag.code = bid.params.invCode;
+  }
+  tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
+  tag.prebid = true;
+  tag.disable_psa = true;
+  let bidFloor = getBidFloor(bid);
+  if (bidFloor) {
+    tag.reserve = bidFloor;
+  }
+  if (bid.params.position) {
+    tag.position = { 'above': 1, 'below': 2 }[bid.params.position] || 0;
+  }
+  if (bid.params.trafficSourceCode) {
+    tag.traffic_source_code = bid.params.trafficSourceCode;
+  }
+  if (bid.params.privateSizes) {
+    tag.private_sizes = transformSizes(bid.params.privateSizes);
+  }
+  if (bid.params.supplyType) {
+    tag.supply_type = bid.params.supplyType;
+  }
+  if (bid.params.pubClick) {
+    tag.pubclick = bid.params.pubClick;
+  }
+  if (bid.params.extInvCode) {
+    tag.ext_inv_code = bid.params.extInvCode;
+  }
+  if (bid.params.publisherId) {
+    tag.publisher_id = parseInt(bid.params.publisherId, 10);
+  }
+  if (bid.params.externalImpId) {
+    tag.external_imp_id = bid.params.externalImpId;
+  }
+  if (!isEmpty(bid.params.keywords)) {
+    let keywords = transformBidderParamKeywords(bid.params.keywords);
+
+    if (keywords.length > 0) {
+      keywords.forEach(deleteValues);
+    }
+    tag.keywords = keywords;
+  }
+
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  if (gpid) {
+    tag.gpid = gpid;
+  }
+
+  if (bid.mediaType === NATIVE || deepAccess(bid, `mediaTypes.${NATIVE}`)) {
+    tag.ad_types.push(NATIVE);
+    if (tag.sizes.length === 0) {
+      tag.sizes = transformSizes([1, 1]);
+    }
+
+    if (bid.nativeParams) {
+      const nativeRequest = buildNativeRequest(bid.nativeParams);
+      tag[NATIVE] = { layouts: [nativeRequest] };
+    }
+  }
+
+  const videoMediaType = deepAccess(bid, `mediaTypes.${VIDEO}`);
+  const context = deepAccess(bid, 'mediaTypes.video.context');
+
+  if (videoMediaType && context === 'adpod') {
+    tag.hb_source = 7;
+  } else {
+    tag.hb_source = 1;
+  }
+  if (bid.mediaType === VIDEO || videoMediaType) {
+    tag.ad_types.push(VIDEO);
+  }
+
+  // instream gets vastUrl, outstream gets vastXml
+  if (bid.mediaType === VIDEO || (videoMediaType && context !== 'outstream')) {
+    tag.require_asset_url = true;
+  }
+
+  if (bid.params.video) {
+    tag.video = {};
+    // place any valid video params on the tag
+    Object.keys(bid.params.video)
+      .filter(param => includes(VIDEO_TARGETING, param))
+      .forEach(param => {
+        switch (param) {
+          case 'context':
+          case 'playback_method':
+            let type = bid.params.video[param];
+            type = (isArray(type)) ? type[0] : type;
+            tag.video[param] = VIDEO_MAPPING[param][type];
+            break;
+          // Deprecating tags[].video.frameworks in favor of tags[].video_frameworks
+          case 'frameworks':
+            break;
+          default:
+            tag.video[param] = bid.params.video[param];
+        }
+      });
+
+    if (bid.params.video.frameworks && isArray(bid.params.video.frameworks)) {
+      tag['video_frameworks'] = bid.params.video.frameworks;
+    }
+  }
+
+  // use IAB ORTB values if the corresponding values weren't already set by bid.params.video
+  if (videoMediaType) {
+    tag.video = tag.video || {};
+    Object.keys(videoMediaType)
+      .filter(param => includes(VIDEO_RTB_TARGETING, param))
+      .forEach(param => {
+        switch (param) {
+          case 'minduration':
+          case 'maxduration':
+            if (typeof tag.video[param] !== 'number') tag.video[param] = videoMediaType[param];
+            break;
+          case 'skip':
+            if (typeof tag.video['skippable'] !== 'boolean') tag.video['skippable'] = (videoMediaType[param] === 1);
+            break;
+          case 'skipafter':
+            if (typeof tag.video['skipoffset'] !== 'number') tag.video['skippoffset'] = videoMediaType[param];
+            break;
+          case 'playbackmethod':
+            if (typeof tag.video['playback_method'] !== 'number') {
+              let type = videoMediaType[param];
+              type = (isArray(type)) ? type[0] : type;
+
+              // we only support iab's options 1-4 at this time.
+              if (type >= 1 && type <= 4) {
+                tag.video['playback_method'] = type;
+              }
+            }
+            break;
+          case 'api':
+            if (!tag['video_frameworks'] && isArray(videoMediaType[param])) {
+              // need to read thru array; remove 6 (we don't support it), swap 4 <> 5 if found (to match our adserver mapping for these specific values)
+              let apiTmp = videoMediaType[param].map(val => {
+                let v = (val === 4) ? 5 : (val === 5) ? 4 : val;
+
+                if (v >= 1 && v <= 5) {
+                  return v;
+                }
+              }).filter(v => v);
+              tag['video_frameworks'] = apiTmp;
+            }
+            break;
+        }
+      });
+  }
+
+  if (bid.renderer) {
+    tag.video = Object.assign({}, tag.video, { custom_renderer_present: true });
+  }
+
+  if (bid.params.frameworks && isArray(bid.params.frameworks)) {
+    tag['banner_frameworks'] = bid.params.frameworks;
+  }
+
+  let adUnit = find(auctionManager.getAdUnits(), au => bid.transactionId === au.transactionId);
+  if (adUnit && adUnit.mediaTypes && adUnit.mediaTypes.banner) {
+    tag.ad_types.push(BANNER);
+  }
+
+  if (tag.ad_types.length === 0) {
+    delete tag.ad_types;
+  }
+
+  return tag;
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (isArray(requestSizes) && requestSizes.length === 2 &&
+    !isArray(requestSizes[0])) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+function hasUserInfo(bid) {
+  return !!bid.params.user;
+}
+
+function hasMemberId(bid) {
+  return !!parseInt(bid.params.member, 10);
+}
+
+function hasAppDeviceInfo(bid) {
+  if (bid.params) {
+    return !!bid.params.app
+  }
+}
+
+function hasAppId(bid) {
+  if (bid.params && bid.params.app) {
+    return !!bid.params.app.id
+  }
+  return !!bid.params.app
+}
+
+function hasDebug(bid) {
+  return !!bid.debug
+}
+
+function hasAdPod(bid) {
+  return (
+    bid.mediaTypes &&
+    bid.mediaTypes.video &&
+    bid.mediaTypes.video.context === ADPOD
+  );
+}
+
+function hasOmidSupport(bid) {
+  let hasOmid = false;
+  const bidderParams = bid.params;
+  const videoParams = bid.params.video;
+  if (bidderParams.frameworks && isArray(bidderParams.frameworks)) {
+    hasOmid = includes(bid.params.frameworks, 6);
+  }
+  if (!hasOmid && videoParams && videoParams.frameworks && isArray(videoParams.frameworks)) {
+    hasOmid = includes(bid.params.video.frameworks, 6);
+  }
+  return hasOmid;
+}
+
+/**
+ * Expand an adpod placement into a set of request objects according to the
+ * total adpod duration and the range of duration seconds. Sets minduration/
+ * maxduration video property according to requireExactDuration configuration
+ */
+function createAdPodRequest(tags, adPodBid) {
+  const { durationRangeSec, requireExactDuration } = adPodBid.mediaTypes.video;
+
+  const numberOfPlacements = getAdPodPlacementNumber(adPodBid.mediaTypes.video);
+  const maxDuration = getMaxValueFromArray(durationRangeSec);
+
+  const tagToDuplicate = tags.filter(tag => tag.uuid === adPodBid.bidId);
+  let request = fill(...tagToDuplicate, numberOfPlacements);
+
+  if (requireExactDuration) {
+    const divider = Math.ceil(numberOfPlacements / durationRangeSec.length);
+    const chunked = chunk(request, divider);
+
+    // each configured duration is set as min/maxduration for a subset of requests
+    durationRangeSec.forEach((duration, index) => {
+      chunked[index].map(tag => {
+        setVideoProperty(tag, 'minduration', duration);
+        setVideoProperty(tag, 'maxduration', duration);
+      });
+    });
+  } else {
+    // all maxdurations should be the same
+    request.map(tag => setVideoProperty(tag, 'maxduration', maxDuration));
+  }
+
+  return request;
+}
+
+function getAdPodPlacementNumber(videoParams) {
+  const { adPodDurationSec, durationRangeSec, requireExactDuration } = videoParams;
+  const minAllowedDuration = getMinValueFromArray(durationRangeSec);
+  const numberOfPlacements = Math.floor(adPodDurationSec / minAllowedDuration);
+
+  return requireExactDuration
+    ? Math.max(numberOfPlacements, durationRangeSec.length)
+    : numberOfPlacements;
+}
+
+function setVideoProperty(tag, key, value) {
+  if (isEmpty(tag.video)) { tag.video = {}; }
+  tag.video[key] = value;
+}
+
+function getRtbBid(tag) {
+  return tag && tag.ads && tag.ads.length && find(tag.ads, ad => ad.rtb);
+}
+
+function buildNativeRequest(params) {
+  const request = {};
+
+  // map standard prebid native asset identifier to /ut parameters
+  // e.g., tag specifies `body` but /ut only knows `description`.
+  // mapping may be in form {tag: '<server name>'} or
+  // {tag: {serverName: '<server name>', requiredParams: {...}}}
+  Object.keys(params).forEach(key => {
+    // check if one of the <server name> forms is used, otherwise
+    // a mapping wasn't specified so pass the key straight through
+    const requestKey =
+      (NATIVE_MAPPING[key] && NATIVE_MAPPING[key].serverName) ||
+      NATIVE_MAPPING[key] ||
+      key;
+
+    // required params are always passed on request
+    const requiredParams = NATIVE_MAPPING[key] && NATIVE_MAPPING[key].requiredParams;
+    request[requestKey] = Object.assign({}, requiredParams, params[key]);
+
+    // convert the sizes of image/icon assets to proper format (if needed)
+    const isImageAsset = !!(requestKey === NATIVE_MAPPING.image.serverName || requestKey === NATIVE_MAPPING.icon.serverName);
+    if (isImageAsset && request[requestKey].sizes) {
+      let sizes = request[requestKey].sizes;
+      if (isArrayOfNums(sizes) || (isArray(sizes) && sizes.length > 0 && sizes.every(sz => isArrayOfNums(sz)))) {
+        request[requestKey].sizes = transformSizes(request[requestKey].sizes);
+      }
+    }
+
+    if (requestKey === NATIVE_MAPPING.privacyLink) {
+      request.privacy_supported = true;
+    }
+  });
+
+  return request;
+}
+
+/**
+ * This function hides google div container for outstream bids to remove unwanted space on page. Mediafuse renderer creates a new iframe outside of google iframe to render the outstream creative.
+ * @param {string} elementId element id
+ */
+function hidedfpContainer(elementId) {
+  var el = document.getElementById(elementId).querySelectorAll("div[id^='google_ads']");
+  if (el[0]) {
+    el[0].style.setProperty('display', 'none');
+  }
+}
+
+function hideSASIframe(elementId) {
+  try {
+    // find script tag with id 'sas_script'. This ensures it only works if you're using Smart Ad Server.
+    const el = document.getElementById(elementId).querySelectorAll("script[id^='sas_script']");
+    if (el[0].nextSibling && el[0].nextSibling.localName === 'iframe') {
+      el[0].nextSibling.style.setProperty('display', 'none');
+    }
+  } catch (e) {
+    // element not found!
+  }
+}
+
+function outstreamRender(bid) {
+  hidedfpContainer(bid.adUnitCode);
+  hideSASIframe(bid.adUnitCode);
+  // push to render queue because ANOutstreamVideo may not be loaded yet
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      tagId: bid.adResponse.tag_id,
+      sizes: [bid.getSize().split('x')],
+      targetId: bid.adUnitCode, // target div id to render video
+      uuid: bid.adResponse.uuid,
+      adResponse: bid.adResponse,
+      rendererOptions: bid.renderer.getConfig()
+    }, handleOutstreamRendererEvents.bind(null, bid));
+  });
+}
+
+function handleOutstreamRendererEvents(bid, id, eventName) {
+  bid.renderer.handleVideoEvent({ id, eventName });
+}
+
+function parseMediaType(rtbBid) {
+  const adType = rtbBid.ad_type;
+  if (adType === VIDEO) {
+    return VIDEO;
+  } else if (adType === NATIVE) {
+    return NATIVE;
+  } else {
+    return BANNER;
+  }
+}
+
+function addUserId(eids, id, source, rti) {
+  if (id) {
+    if (rti) {
+      eids.push({ source, id, rti_partner: rti });
+    } else {
+      eids.push({ source, id });
+    }
+  }
+  return eids;
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.reserve) ? bid.params.reserve : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
+registerBidder(spec);
diff --git a/modules/mediafuseBidAdapter.md b/modules/mediafuseBidAdapter.md
new file mode 100644
index 00000000000..f9ed9835b94
--- /dev/null
+++ b/modules/mediafuseBidAdapter.md
@@ -0,0 +1,151 @@
+# Overview
+
+```
+Module Name:  Mediafuse Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: prebid-js@xandr.com
+```
+
+# Description
+
+Connects to Mediafuse exchange for bids.
+
+Mediafuse bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'mediafuse',
+         params: {
+           placementId: 13144370
+         }
+       }]
+   },
+   // Native adUnit
+   {
+      code: 'native-div',
+      sizes: [[1, 1]],
+      mediaTypes: {
+        native: {
+          title: {
+            required: true
+          },
+          body: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          },
+          icon: {
+            required: false
+          }
+        }
+      },
+      bids: [{
+        bidder: 'mediafuse',
+        params: {
+          placementId: 13232354,
+          allowSmallerSizes: true
+        }
+      }]
+   },
+   // Video instream adUnit
+   {
+      code: 'video-instream',
+      sizes: [[640, 480]],
+      mediaTypes: {
+        video: {
+          playerSize: [[640, 480]],
+          context: 'instream'
+        },
+      },
+      bids: [{
+        bidder: 'mediafuse',
+        params: {
+          placementId: 13232361,
+          video: {
+            skippable: true,
+            playback_methods: ['auto_play_sound_off']
+          }
+        }
+      }]
+   },
+   // Video outstream adUnit
+   {
+     code: 'video-outstream',
+     sizes: [[300, 250]],
+     mediaTypes: {
+       video: {
+         playerSize: [[300, 250]],
+         context: 'outstream',
+         // Certain ORTB 2.5 video values can be read from the mediatypes object; below are examples of supported params.
+         // To note - mediafuse supports additional values for our system that are not part of the ORTB spec.  If you want
+         // to use these values, they will have to be declared in the bids[].params.video object instead using the mediafuse syntax.
+         // Between the corresponding values of the mediaTypes.video and params.video objects, the properties in params.video will 
+         // take precedence if declared; eg in the example below, the `skippable: true` setting will be used instead of the `skip: 0`.
+         minduration: 1,
+         maxduration: 60,
+         skip: 0,   // 1 - true, 0 - false
+         skipafter: 5,
+         playbackmethod: [2], // note - we only support options 1-4 at this time
+         api: [1,2,3]   // note - option 6 is not supported at this time
+       }
+     },
+     bids: [
+       {
+         bidder: 'mediafuse',
+         params: {
+           placementId: 13232385,
+           video: {
+             skippable: true,
+             playback_method: 'auto_play_sound_off'
+           }
+         }
+       }
+     ]
+   },
+   // Banner adUnit in a App Webview
+   // Only use this for situations where prebid.js is in a webview of an App
+   // See Prebid Mobile for displaying ads via an SDK
+   {
+     code: 'banner-div',
+     mediaTypes: {
+       banner: {
+         sizes: [[300, 250], [300,600]]
+       }
+     }
+     bids: [{
+       bidder: 'mediafuse',
+       params: {
+         placementId: 13144370,
+         app: {
+           id: "B1O2W3M4AN.com.prebid.webview",
+           geo: {
+             lat: 40.0964439,
+             lng: -75.3009142
+           },
+           device_id: {
+             idfa: "4D12078D-3246-4DA4-AD5E-7610481E7AE", // Apple advertising identifier
+             aaid: "38400000-8cf0-11bd-b23e-10b96e40000d", // Android advertising identifier
+             md5udid: "5756ae9022b2ea1e47d84fead75220c8", // MD5 hash of the ANDROID_ID
+             sha1udid: "4DFAA92388699AC6539885AEF1719293879985BF", // SHA1 hash of the ANDROID_ID
+             windowsadid: "750c6be243f1c4b5c9912b95a5742fc5" // Windows advertising identifier
+           }
+         }
+       }
+     }]
+   }
+];
+```
diff --git a/modules/mediagoBidAdapter.js b/modules/mediagoBidAdapter.js
new file mode 100644
index 00000000000..16460b195f5
--- /dev/null
+++ b/modules/mediagoBidAdapter.js
@@ -0,0 +1,467 @@
+/**
+ * gulp serve --modules=mediagoBidAdapter,pubCommonId --nolint   --notest
+ */
+
+import * as utils from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+// import { config } from '../src/config.js';
+// import { isPubcidEnabled } from './pubCommonId.js';
+
+const BIDDER_CODE = 'mediago';
+// const PROTOCOL = window.document.location.protocol;
+const ENDPOINT_URL =
+  // ((PROTOCOL === 'https:') ? 'https' : 'http') +
+  'https://rtb-us.mediago.io/api/bid?tn=';
+const TIME_TO_LIVE = 500;
+// const ENDPOINT_URL = '/api/bid?tn=';
+const storage = getStorageManager();
+let globals = {};
+let itemMaps = {};
+
+/**
+ * 获取随机id
+ * @param  {number} a random number from 0 to 15
+ * @return {string}   random number or random string
+ */
+// function getRandomId(
+//   a // placeholder
+// ) {
+//   // if the placeholder was passed, return
+//   // a random number from 0 to 15
+//   return a
+//     ? (
+//       a ^ // unless b is 8,
+//         ((Math.random() * // in which case
+//           16) >> // a random number from
+//           (a / 4))
+//     ) // 8 to 11
+//       .toString(16) // in hexadecimal
+//     : ( // or otherwise a concatenated string:
+//       [1e7] + // 10000000 +
+//         1e3 + // -1000 +
+//         4e3 + // -4000 +
+//         8e3 + // -80000000 +
+//         1e11
+//     ) // -100000000000,
+//       .replace(
+//         // replacing
+//         /[018]/g, // zeroes, ones, and eights with
+//         getRandomId // random hex digits
+//       );
+// }
+
+/* ----- mguid:start ------ */
+const COOKIE_KEY_MGUID = '__mguid_';
+
+/**
+ * 获取用户id
+ * @return {string}
+ */
+const getUserID = () => {
+  const i = storage.getCookie(COOKIE_KEY_MGUID);
+
+  if (i === null) {
+    const uuid = utils.generateUUID();
+    storage.setCookie(COOKIE_KEY_MGUID, uuid);
+    return uuid;
+  }
+  return i;
+};
+
+/* ----- mguid:end ------ */
+
+/**
+ * 获取一个对象的某个值，如果没有则返回空字符串
+ * @param  {Object}    obj  对象
+ * @param  {...string} keys 键名
+ * @return {any}
+ */
+function getProperty(obj, ...keys) {
+  let o = obj;
+
+  for (let key of keys) {
+    // console.log(key, o);
+    if (o && o[key]) {
+      o = o[key];
+    } else {
+      return '';
+    }
+  }
+  return o;
+}
+
+/**
+ * 是不是移动设备或者平板
+ * @return {boolean}
+ */
+function isMobileAndTablet() {
+  let check = false;
+  (function (a) {
+    let reg1 = new RegExp(
+      [
+        '(android|bbd+|meego)',
+        '.+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)',
+        '|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone',
+        '|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up.(browser|link)|vodafone|wap',
+        '|windows ce|xda|xiino|android|ipad|playbook|silk',
+      ].join(''),
+      'i'
+    );
+    let reg2 = new RegExp(
+      [
+        '1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)',
+        '|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )',
+        '|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell',
+        '|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)',
+        '|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene',
+        '|gf-5|g-mo|go(.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c',
+        '|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom',
+        '|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)',
+        '|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)',
+        '|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]',
+        '|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)',
+        '|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio',
+        '|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms',
+        '|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al',
+        '|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)',
+        '|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(.b|g1|si)|utst|',
+        'v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)',
+        '|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-',
+        '|your|zeto|zte-',
+      ].join(''),
+      'i'
+    );
+    if (reg1.test(a) || reg2.test(a.substr(0, 4))) {
+      check = true;
+    }
+  })(navigator.userAgent || navigator.vendor || window.opera);
+  return check;
+}
+
+/**
+ * 获取底价
+ * @param {*} bid
+ * @param {*} mediaType
+ * @param {*} sizes
+ * @returns
+ */
+// function getBidFloor(bid, mediaType, sizes) {
+//   var floor;
+//   var size = sizes.length === 1 ? sizes[0] : "*";
+//   if (typeof bid.getFloor === "function") {
+//     const floorInfo = bid.getFloor({ currency: "USD", mediaType, size });
+//     if (
+//       typeof floorInfo === "object" &&
+//       floorInfo.currency === "USD" &&
+//       !isNaN(parseFloat(floorInfo.floor))
+//     ) {
+//       floor = parseFloat(floorInfo.floor);
+//     }
+//   }
+//   return floor;
+// }
+function getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return utils.deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (_) {
+    return 0;
+  }
+}
+
+/**
+ * 将尺寸转为RTB识别的尺寸
+ *
+ * @param  {Array|Object} requestSizes 配置尺寸
+ * @return {Object}
+ */
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (
+    utils.isArray(requestSizes) &&
+    requestSizes.length === 2 &&
+    !utils.isArray(requestSizes[0])
+  ) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+// 支持的广告尺寸
+const mediagoAdSize = [
+  { w: 300, h: 250 },
+  { w: 300, h: 600 },
+  { w: 728, h: 90 },
+  { w: 970, h: 250 },
+  { w: 320, h: 50 },
+  { w: 160, h: 600 },
+  { w: 320, h: 180 },
+  { w: 320, h: 100 },
+  { w: 336, h: 280 },
+];
+
+/**
+ * 获取广告位配置
+ * @param {Array}  validBidRequests an an array of bids
+ * @param {Object} bidderRequest  The master bidRequest object
+ * @return {Object}
+ */
+function getItems(validBidRequests, bidderRequest) {
+  let items = [];
+  items = validBidRequests.map((req, i) => {
+    let ret = {};
+    let mediaTypes = getProperty(req, 'mediaTypes');
+
+    let sizes = transformSizes(getProperty(req, 'sizes'));
+    let matchSize;
+
+    // 确认尺寸是否符合我们要求
+    for (let size of sizes) {
+      matchSize = mediagoAdSize.find(
+        (item) => size.width === item.w && size.height === item.h
+      );
+      if (matchSize) {
+        break;
+      }
+    }
+    if (!matchSize) {
+      return {};
+    }
+
+    const bidFloor = getBidFloor(req);
+    // const gpid =
+    //   utils.deepAccess(req, 'ortb2Imp.ext.gpid') ||
+    //   utils.deepAccess(req, 'ortb2Imp.ext.data.pbadslot') ||
+    //   utils.deepAccess(req, 'params.placementId', 0);
+    // console.log("wjh getItems:", req, bidFloor, gpid);
+
+    // if (mediaTypes.native) {}
+    // banner广告类型
+    if (mediaTypes.banner) {
+      let id = '' + (i + 1);
+      ret = {
+        id: id,
+        bidfloor: bidFloor,
+        banner: {
+          h: matchSize.h,
+          w: matchSize.w,
+          pos: 1,
+        },
+        ext: {
+        //   gpid: gpid, // 加入后无法返回广告
+        },
+      };
+      itemMaps[id] = {
+        req,
+        ret,
+      };
+    }
+
+    return ret;
+  });
+  return items;
+}
+
+/**
+ * 获取rtb请求参数
+ *
+ * @param {Array}  validBidRequests an an array of bids
+ * @param {Object} bidderRequest  The master bidRequest object
+ * @return {Object}
+ */
+function getParam(validBidRequests, bidderRequest) {
+  const pubcid = utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
+  const sharedid =
+    utils.deepAccess(validBidRequests[0], 'userId.sharedid.id') ||
+    utils.deepAccess(validBidRequests[0], 'userId.pubcid');
+  let isMobile = isMobileAndTablet() ? 1 : 0;
+  // input test status by Publisher. more frequently for test true req
+  let isTest = validBidRequests[0].params.test || 0;
+  let auctionId = getProperty(bidderRequest, 'auctionId');
+  let items = getItems(validBidRequests, bidderRequest);
+
+  const domain =
+    utils.deepAccess(bidderRequest, 'refererInfo.domain') || document.domain;
+  const location = utils.deepAccess(bidderRequest, 'refererInfo.location');
+  const page = utils.deepAccess(bidderRequest, 'refererInfo.page');
+  const referer = utils.deepAccess(bidderRequest, 'refererInfo.ref');
+
+  const timeout = bidderRequest.timeout || 2000;
+
+  if (items && items.length) {
+    let c = {
+      id: 'mgprebidjs_' + auctionId,
+      test: +isTest,
+      at: 1,
+      cur: ['USD'],
+      device: {
+        connectiontype: 0,
+        // ip: '64.188.178.115',
+        js: 1,
+        // language: "en",
+        // os: "Microsoft Windows",
+        // ua: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.19043",
+        os: navigator.platform || '',
+        ua: navigator.userAgent,
+        language: /en/.test(navigator.language) ? 'en' : navigator.language,
+      },
+      ext: {},
+      user: {
+        id: sharedid || pubcid || getUserID(),
+      },
+      site: {
+        name: domain,
+        domain: domain,
+        page: page || location,
+        ref: referer,
+        mobile: isMobile,
+        cat: [], // todo
+        publisher: {
+          // todo
+          id: domain,
+          name: domain,
+        },
+      },
+      imp: items,
+      tmax: timeout,
+    };
+    return c;
+  } else {
+    return null;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  // aliases: ['ex'], // short code
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    // console.log('mediago', {
+    //   bid
+    // });
+    if (bid.params.token) {
+      globals['token'] = bid.params.token;
+    }
+    return !!bid.params.token;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Array}  validBidRequests an an array of bids
+   * @param {Object} bidderRequest  The master bidRequest object
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let payload = getParam(validBidRequests, bidderRequest);
+
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL + globals['token'],
+      data: payloadString,
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bids = getProperty(serverResponse, 'body', 'seatbid', 0, 'bid');
+    const cur = getProperty(serverResponse, 'body', 'cur');
+
+    const bidResponses = [];
+    for (let bid of bids) {
+      let impid = getProperty(bid, 'impid');
+      if (itemMaps[impid]) {
+        let bidId = getProperty(itemMaps[impid], 'req', 'bidId');
+        const bidResponse = {
+          requestId: bidId,
+          cpm: getProperty(bid, 'price'),
+          width: getProperty(bid, 'w'),
+          height: getProperty(bid, 'h'),
+          creativeId: getProperty(bid, 'crid'),
+          dealId: '',
+          currency: cur,
+          netRevenue: true,
+          ttl: TIME_TO_LIVE,
+          // referrer: REFERER,
+          ad: getProperty(bid, 'adm'),
+          nurl: getProperty(bid, 'nurl'),
+          //   adserverTargeting: {
+          //     granularityMultiplier: 0.1,
+          //     priceGranularity: "pbHg",
+          //     pbMg: "0.01",
+          //   },
+          //   pbMg: "0.01",
+          //   granularityMultiplier: 0.1,
+          //   priceGranularity: "pbHg",
+        };
+        bidResponses.push(bidResponse);
+      }
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  //   onTimeout: function (data) {
+  //     // console.log('onTimeout', data);
+  //     // Bidder specifc code
+  //   },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    // console.log('onBidWon： ', bid, config.getConfig('priceGranularity'));
+    // Bidder specific code
+    if (bid['nurl']) {
+      utils.triggerPixel(bid['nurl']);
+    }
+  },
+
+  /**
+   * Register bidder specific code, which will execute when the adserver targeting has been set for a bid from this bidder
+   * @param {Bid} The bid of which the targeting has been set
+   */
+  //   onSetTargeting: function (bid) {
+  //     // console.log('onSetTargeting', bid);
+  //     // Bidder specific code
+  //   },
+};
+registerBidder(spec);
diff --git a/modules/mediagoBidAdapter.md b/modules/mediagoBidAdapter.md
new file mode 100644
index 00000000000..464ea59f11c
--- /dev/null
+++ b/modules/mediagoBidAdapter.md
@@ -0,0 +1,34 @@
+# Overview
+
+```
+Module Name: MediaGo Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: fangsimin@baidu.com
+```
+
+# Description
+
+Module that connects to MediaGo's demand sources
+
+# Test Parameters
+
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [
+                {
+                    bidder: "mediago",
+                    params: {
+                        token: ''  // required, send email to ext_mediago_am@baidu.com to get the corresponding token
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/mediakeysBidAdapter.js b/modules/mediakeysBidAdapter.js
new file mode 100644
index 00000000000..60ced650329
--- /dev/null
+++ b/modules/mediakeysBidAdapter.js
@@ -0,0 +1,775 @@
+import {arrayFrom, find} from '../src/polyfill.js';
+import {
+  cleanObj,
+  deepAccess,
+  deepClone,
+  deepSetValue,
+  getDNT,
+  inIframe,
+  isArray,
+  isEmpty,
+  isFn,
+  isInteger,
+  isNumber,
+  isStr,
+  logError,
+  logWarn,
+  mergeDeep,
+  triggerPixel
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {createEidsArray} from './userId/eids.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const AUCTION_TYPE = 1;
+const BIDDER_CODE = 'mediakeys';
+const ENDPOINT = 'https://prebid.eu-central-1.bidder.mediakeys.io/bids';
+const GVLID = 498;
+const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE, VIDEO];
+const DEFAULT_CURRENCY = 'USD';
+const NET_REVENUE = true;
+
+const NATIVE_ASSETS_MAPPING = [
+  { name: 'title', id: 1, type: 0 },
+  { name: 'image', id: 2, type: 3 },
+  { name: 'icon', id: 3, type: 1 },
+  { name: 'sponsoredBy', id: 5, type: 1 },
+  { name: 'body', id: 6, type: 2 },
+  { name: 'rating', id: 7, type: 3 },
+  { name: 'likes', id: 8, type: 4 },
+  { name: 'downloads', id: 9, type: 5 },
+  { name: 'price', id: 10, type: 6 },
+  { name: 'salePrice', id: 11, type: 7 },
+  { name: 'phone', id: 12, type: 8 },
+  { name: 'address', id: 13, type: 9 },
+  { name: 'body2', id: 14, type: 10 },
+  { name: 'displayUrl', id: 15, type: 11 },
+  { name: 'cta', id: 16, type: 12 },
+];
+
+// This provide a whitelist and a basic validation of OpenRTB native 1.2 options.
+// https://www.iab.com/wp-content/uploads/2018/03/OpenRTB-Native-Ads-Specification-Final-1.2.pdf
+const ORTB_NATIVE_PARAMS = {
+  context: value => [1, 2, 3].indexOf(value) !== -1,
+  plcmttype: value => [1, 2, 3, 4].indexOf(value) !== -1
+};
+
+// This provide a whitelist and a basic validation of OpenRTB 2.5 video options.
+// https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf
+const ORTB_VIDEO_PARAMS = {
+  mimes: value => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
+  minduration: value => isInteger(value),
+  maxduration: value => isInteger(value),
+  protocols: value => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].indexOf(v) !== -1),
+  w: value => isInteger(value),
+  h: value => isInteger(value),
+  startdelay: value => isInteger(value),
+  placement: value => [1, 2, 3, 4, 5].indexOf(value) !== -1,
+  linearity: value => [1, 2].indexOf(value) !== -1,
+  skip: value => [0, 1].indexOf(value) !== -1,
+  skipmin: value => isInteger(value),
+  skipafter: value => isInteger(value),
+  sequence: value => isInteger(value),
+  battr: value => Array.isArray(value) && value.every(v => arrayFrom({length: 17}, (_, i) => i + 1).indexOf(v) !== -1),
+  maxextended: value => isInteger(value),
+  minbitrate: value => isInteger(value),
+  maxbitrate: value => isInteger(value),
+  boxingallowed: value => [0, 1].indexOf(value) !== -1,
+  playbackmethod: value => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6].indexOf(v) !== -1),
+  playbackend: value => [1, 2, 3].indexOf(value) !== -1,
+  delivery: value => [1, 2, 3].indexOf(value) !== -1,
+  pos: value => [0, 1, 2, 3, 4, 5, 6, 7].indexOf(value) !== -1,
+  api: value => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6].indexOf(v) !== -1),
+};
+
+/**
+ * Returns the OpenRtb deviceType id detected from User Agent
+ * Voluntary limited to phone, tablet, desktop.
+ *
+ * @returns {number}
+ */
+function getDeviceType() {
+  if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(navigator.userAgent.toLowerCase()))) {
+    return 5;
+  }
+  if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(navigator.userAgent.toLowerCase()))) {
+    return 4;
+  }
+  return 2;
+}
+
+/**
+ * Returns the OS name detected from User Agent.
+ *
+ * @returns {number}
+ */
+function getOS() {
+  if (navigator.userAgent.indexOf('Android') != -1) return 'Android';
+  if (navigator.userAgent.indexOf('like Mac') != -1) return 'iOS';
+  if (navigator.userAgent.indexOf('Win') != -1) return 'Windows';
+  if (navigator.userAgent.indexOf('Mac') != -1) return 'Macintosh';
+  if (navigator.userAgent.indexOf('Linux') != -1) return 'Linux';
+  if (navigator.appVersion.indexOf('X11') != -1) return 'Unix';
+  return 'Others';
+}
+
+/**
+ * Returns floor from priceFloors module or MediaKey default value.
+ *
+ * @param {*} bid a Prebid.js bid (request) object
+ * @param {string} mediaType the mediaType or the wildcard '*'
+ * @param {string|array} size the size array or the wildcard '*'
+ * @returns {number|boolean}
+ */
+function getFloor(bid, mediaType, size = '*') {
+  if (!isFn(bid.getFloor)) {
+    return false;
+  }
+
+  if (SUPPORTED_MEDIA_TYPES.indexOf(mediaType) === -1) {
+    logWarn(`${BIDDER_CODE}: Unable to detect floor price for unsupported mediaType ${mediaType}. No floor will be used.`);
+    return false;
+  }
+
+  const floor = bid.getFloor({
+    currency: DEFAULT_CURRENCY,
+    mediaType,
+    size
+  })
+
+  return (!isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY) ? floor.floor : false
+}
+
+/**
+ * Returns the highest floor price found when a bid have
+ * several mediaTypes.
+ *
+ * @param {*} bid a Prebid.js bid (request) object
+ * @returns {number|boolean}
+ */
+function getHighestFloor(bid) {
+  const floors = [];
+
+  for (let mediaType in bid.mediaTypes) {
+    const floor = getFloor(bid, mediaType);
+
+    if (isNumber(floor)) {
+      floors.push(floor);
+    }
+  }
+
+  if (!floors.length) {
+    return false;
+  }
+
+  return floors.reduce((a, b) => {
+    return Math.max(a, b);
+  });
+}
+
+/**
+ * Returns an openRTB 2.5 object.
+ * This one will be populated at each step of the buildRequest process.
+ *
+ * @returns {object}
+ */
+function createOrtbTemplate() {
+  return {
+    id: '',
+    at: AUCTION_TYPE,
+    cur: [DEFAULT_CURRENCY],
+    imp: [],
+    site: {}, // computed in buildRequest()
+    device: {
+      ip: '',
+      js: 1,
+      dnt: getDNT(),
+      ua: navigator.userAgent,
+      devicetype: getDeviceType(),
+      os: getOS(),
+      h: screen.height,
+      w: screen.width,
+      language: navigator.language,
+      make: navigator.vendor ? navigator.vendor : ''
+    },
+    user: {},
+    regs: {
+      ext: {
+        gdpr: 0 // not applied by default
+      }
+    },
+    ext: {
+      is_secure: 1
+    }
+  };
+}
+
+/**
+ * Returns an openRtb 2.5 banner object.
+ *
+ * @param {object} bid Prebid bid object from request
+ * @returns {object}
+ */
+function createBannerImp(bid) {
+  let sizes = bid.mediaTypes.banner.sizes;
+  const params = deepAccess(bid, 'params', {});
+
+  if (!isArray(sizes) || !sizes.length) {
+    logWarn(`${BIDDER_CODE}: mediaTypes.banner.size missing for adunit: ${bid.params.adUnit}. Ignoring the banner impression in the adunit.`);
+  } else {
+    const banner = {};
+
+    banner.w = parseInt(sizes[0][0], 10);
+    banner.h = parseInt(sizes[0][1], 10);
+
+    const format = [];
+    sizes.forEach(function (size) {
+      if (size.length && size.length > 1) {
+        format.push({w: size[0], h: size[1]});
+      }
+    });
+    banner.format = format;
+
+    banner.topframe = inIframe() ? 0 : 1;
+    banner.pos = params.pos || 0;
+
+    return banner;
+  }
+}
+
+/**
+ * Returns an openRtb 2.5 native object with a native 1.2 request.
+ *
+ * @param {object} bid Prebid bid object from request
+ * @returns {object}
+ */
+function createNativeImp(bid) {
+  if (!bid.nativeParams) {
+    logWarn(`${BIDDER_CODE}: bid.nativeParams object has not been found.`);
+    return
+  }
+
+  const nativeParams = deepClone(bid.nativeParams);
+
+  const nativeAdUnitParams = deepAccess(bid, 'mediaTypes.native', {});
+  const nativeBidderParams = deepAccess(bid, 'params.native', {});
+
+  const extraParams = {
+    ...nativeAdUnitParams,
+    ...nativeBidderParams
+  };
+
+  const nativeObject = {
+    ver: '1.2',
+    context: 1, // overwrited later if needed
+    plcmttype: 1, // overwrited later if needed
+    assets: []
+  }
+
+  Object.keys(ORTB_NATIVE_PARAMS).forEach(name => {
+    if (extraParams.hasOwnProperty(name)) {
+      if (ORTB_NATIVE_PARAMS[name](extraParams[name])) {
+        nativeObject[name] = extraParams[name];
+      } else {
+        logWarn(`${BIDDER_CODE}: the OpenRTB native param ${name} has been skipped due to misformating. Please refer to OpenRTB Native spec.`);
+      }
+    }
+  });
+
+  // just a helper function
+  const setImageAssetSizes = function(asset, param) {
+    if (param.sizes && param.sizes.length) {
+      asset.img.w = param.sizes ? param.sizes[0] : undefined;
+      asset.img.h = param.sizes ? param.sizes[1] : undefined;
+    }
+
+    if (!asset.img.w) {
+      asset.img.wmin = 0;
+    }
+
+    if (!asset.img.h) {
+      asset.img.hmin = 0;
+    }
+  }
+
+  // Prebid.js "image" type support.
+  // Add some defaults to support special type provided by Prebid.js `mediaTypes.native.type: "image"`
+  const nativeImageType = deepAccess(bid, 'mediaTypes.native.type');
+  if (nativeImageType === 'image') {
+    // Default value is ones of the recommended by the spec: https://www.iab.com/wp-content/uploads/2018/03/OpenRTB-Native-Ads-Specification-Final-1.2.pdf
+    nativeParams.title.len = 90;
+  }
+
+  for (let key in nativeParams) {
+    if (nativeParams.hasOwnProperty(key)) {
+      const internalNativeAsset = find(NATIVE_ASSETS_MAPPING, ref => ref.name === key);
+      if (!internalNativeAsset) {
+        logWarn(`${BIDDER_CODE}: the asset "${key}" has not been found in Prebid assets map. Skipped for request.`);
+        continue;
+      }
+
+      const param = nativeParams[key];
+
+      const asset = {
+        id: internalNativeAsset.id,
+        required: param.required ? 1 : 0
+      }
+
+      switch (key) {
+        case 'title':
+          if (param.len || param.length) {
+            asset.title = {
+              len: param.len || param.length,
+              ext: param.ext
+            }
+          } else {
+            logWarn(`${BIDDER_CODE}: "title.length" property for native asset is required. Skipped for request.`)
+            continue;
+          }
+          break;
+
+        case 'image':
+          asset.img = {
+            type: internalNativeAsset.type,
+            mimes: param.mimes,
+            ext: param.ext,
+          }
+
+          setImageAssetSizes(asset, param);
+
+          break;
+        case 'icon':
+          asset.img = {
+            type: internalNativeAsset.type,
+            mimes: param.mimes,
+            ext: param.ext,
+          }
+
+          setImageAssetSizes(asset, param);
+          break;
+
+        case 'sponsoredBy': // sponsored
+        case 'body': // desc
+        case 'rating':
+        case 'likes':
+        case 'downloads':
+        case 'price':
+        case 'salePrice':
+        case 'phone':
+        case 'address':
+        case 'body2': // desc2
+        case 'displayUrl':
+        case 'cta':
+          // generic asset.data
+          asset.data = {
+            type: internalNativeAsset.type,
+            len: param.len,
+            ext: param.ext
+          }
+          break;
+      }
+
+      nativeObject.assets.push(asset);
+    }
+  }
+
+  if (nativeObject.assets.length) {
+    return {
+      request: nativeObject
+    }
+  }
+}
+
+/**
+ * Returns an openRtb 2.5 video object.
+ *
+ * @param {object} bid Prebid bid object from request
+ * @returns {object}
+ */
+function createVideoImp(bid) {
+  const videoAdUnitParams = deepAccess(bid, 'mediaTypes.video', {});
+  const videoBidderParams = deepAccess(bid, 'params.video', {});
+  const computedParams = {};
+
+  // Special case for playerSize.
+  // Eeach props will be overrided if they are defined in config.
+  if (Array.isArray(videoAdUnitParams.playerSize)) {
+    const tempSize = (Array.isArray(videoAdUnitParams.playerSize[0])) ? videoAdUnitParams.playerSize[0] : videoAdUnitParams.playerSize;
+    computedParams.w = tempSize[0];
+    computedParams.h = tempSize[1];
+  }
+
+  const videoParams = {
+    ...computedParams,
+    ...videoAdUnitParams,
+    ...videoBidderParams
+  };
+
+  const video = {};
+
+  // Only whitelisted OpenRTB options need to be validated.
+  Object.keys(ORTB_VIDEO_PARAMS).forEach(name => {
+    if (videoParams.hasOwnProperty(name)) {
+      if (ORTB_VIDEO_PARAMS[name](videoParams[name])) {
+        video[name] = videoParams[name];
+      } else {
+        logWarn(`${BIDDER_CODE}: the OpenRTB video param ${name} has been skipped due to misformating. Please refer to OpenRTB 2.5 spec.`);
+      }
+    }
+  });
+
+  return video;
+}
+
+/**
+ * Create the OpenRTB 2.5 imp object.
+ *
+ * @param {*} bid Prebid bid object from request
+ * @returns
+ */
+function createImp(bid) {
+  const imp = {
+    id: bid.bidId,
+    tagid: bid.params.adUnit || undefined,
+    bidfloorcur: DEFAULT_CURRENCY,
+    secure: 1,
+  };
+
+  // There is no default floor. bidfloor is set only
+  // if the priceFloors module is activated and returns a valid floor.
+  const floor = getHighestFloor(bid);
+  if (isNumber(floor)) {
+    imp.bidfloor = floor;
+  }
+
+  // Only supports proper mediaTypes definition…
+  for (let mediaType in bid.mediaTypes) {
+    switch (mediaType) {
+      case BANNER:
+        const banner = createBannerImp(bid);
+        if (banner) {
+          imp.banner = banner;
+        }
+        break;
+      case NATIVE:
+        const native = createNativeImp(bid);
+        if (native) {
+          imp.native = native;
+        }
+        break;
+      case VIDEO:
+        const video = createVideoImp(bid);
+        if (video) {
+          imp.video = video;
+        }
+        break;
+    }
+  }
+
+  // handle FPD for imp.
+  const ortb2Imp = deepAccess(bid, 'ortb2Imp.ext.data');
+  if (ortb2Imp) {
+    const fpd = { ...bid.ortb2Imp };
+    mergeDeep(imp, fpd);
+  }
+
+  return imp;
+}
+
+/**
+ * If array, extract the first IAB category from provided list
+ * If string just return it
+ *
+ * @param {string|Array} cat IAB Category
+ * @returns {string|null}
+ */
+function getPrimaryCatFromResponse(cat) {
+  if (!cat || (isArray(cat) && !cat.length)) {
+    return;
+  }
+
+  if (isArray(cat)) {
+    return cat[0];
+  } else if (isStr(cat)) {
+    return cat;
+  }
+}
+
+/**
+ * Create the Prebid.js native object from response.
+ *
+ * @param {*} bid bid object from response
+ * @returns {object} Prebid.js native object used in response
+ */
+function nativeBidResponseHandler(bid) {
+  const nativeAdm = JSON.parse(bid.adm);
+  if (!nativeAdm || !nativeAdm.assets.length) {
+    logError(`${BIDDER_CODE}: invalid native response.`);
+    return;
+  }
+
+  const native = {}
+
+  nativeAdm.assets.forEach(asset => {
+    if (asset.title) {
+      native.title = asset.title.text;
+      return;
+    }
+
+    if (asset.img) {
+      switch (asset.img.type) {
+        case 1:
+          native.icon = {
+            url: asset.img.url,
+            width: asset.img.w,
+            height: asset.img.h
+          };
+          break;
+        default:
+          native.image = {
+            url: asset.img.url,
+            width: asset.img.w,
+            height: asset.img.h
+          };
+          break;
+      }
+      return;
+    }
+
+    if (asset.data) {
+      const internalNativeAsset = find(NATIVE_ASSETS_MAPPING, ref => ref.id === asset.id);
+      if (internalNativeAsset) {
+        native[internalNativeAsset.name] = asset.data.value;
+      }
+    }
+  });
+
+  if (nativeAdm.link) {
+    if (nativeAdm.link.url) {
+      native.clickUrl = nativeAdm.link.url;
+    }
+    if (Array.isArray(nativeAdm.link.clicktrackers)) {
+      native.clickTrackers = nativeAdm.link.clicktrackers
+    }
+  }
+
+  if (Array.isArray(nativeAdm.eventtrackers)) {
+    native.impressionTrackers = [];
+    nativeAdm.eventtrackers.forEach(tracker => {
+      // Only Impression events are supported. Prebid does not support Viewability events yet.
+      if (tracker.event !== 1) {
+        return;
+      }
+
+      // methods:
+      // 1: image
+      // 2: js
+      // note: javascriptTrackers is a string. If there's more than one JS tracker in bid response, the last script will be used.
+      switch (tracker.method) {
+        case 1:
+          native.impressionTrackers.push(tracker.url);
+          break;
+        case 2:
+          const script = `<script async src=\"${tracker.url}\"></script>`;
+          if (!native.javascriptTrackers) {
+            native.javascriptTrackers = script;
+          } else {
+            native.javascriptTrackers += `\n${script}`;
+          }
+          break;
+      }
+    });
+  }
+
+  if (nativeAdm.privacy) {
+    native.privacyLink = nativeAdm.privacy;
+  }
+
+  return native;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  gvlid: GVLID,
+
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+
+  isBidRequestValid: function(bid) {
+    return !!(bid && !isEmpty(bid));
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    const payload = createOrtbTemplate();
+
+    // Pass the auctionId as ortb2 id
+    // See https://github.com/prebid/Prebid.js/issues/6563
+    deepSetValue(payload, 'id', bidderRequest.auctionId);
+    deepSetValue(payload, 'source.tid', bidderRequest.auctionId);
+
+    validBidRequests.forEach(validBid => {
+      let bid = deepClone(validBid);
+
+      // No additional params atm.
+      const imp = createImp(bid);
+
+      payload.imp.push(imp);
+    });
+
+    if (validBidRequests[0].schain) {
+      deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
+    }
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    if (bidderRequest && bidderRequest.uspConsent) {
+      deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(payload, 'regs.coppa', 1);
+    }
+
+    if (deepAccess(validBidRequests[0], 'userId')) {
+      deepSetValue(payload, 'user.ext.eids', createEidsArray(validBidRequests[0].userId));
+    }
+
+    // Assign payload.site from refererinfo
+    if (bidderRequest.refererInfo) {
+      // TODO: reachedTop is probably not the right check here - it may be false when page is available or vice-versa
+      if (bidderRequest.refererInfo.reachedTop) {
+        deepSetValue(payload, 'site.page', bidderRequest.refererInfo.page);
+        deepSetValue(payload, 'site.domain', bidderRequest.refererInfo.domain)
+        if (bidderRequest.refererInfo.ref) {
+          deepSetValue(payload, 'site.ref', bidderRequest.refererInfo.ref);
+        }
+      }
+    }
+
+    // Handle First Party Data (need publisher fpd setup)
+    const fpd = bidderRequest.ortb2 || {};
+    if (fpd.site) {
+      mergeDeep(payload, { site: fpd.site });
+    }
+    if (fpd.user) {
+      mergeDeep(payload, { user: fpd.user });
+    }
+
+    const request = {
+      method: 'POST',
+      url: ENDPOINT,
+      data: payload,
+      options: {
+        withCredentials: false
+      }
+    }
+
+    return request;
+  },
+
+  interpretResponse(serverResponse, bidRequest) {
+    const bidResponses = [];
+
+    try {
+      if (serverResponse.body && serverResponse.body.seatbid && isArray(serverResponse.body.seatbid)) {
+        const currency = serverResponse.body.cur || DEFAULT_CURRENCY;
+        const referrer = bidRequest.site && bidRequest.site.ref ? bidRequest.site.ref : '';
+
+        serverResponse.body.seatbid.forEach(bidderSeat => {
+          if (!isArray(bidderSeat.bid) || !bidderSeat.bid.length) {
+            return;
+          }
+
+          bidderSeat.bid.forEach(bid => {
+            let mediaType;
+            // Actually only BANNER is supported, but other types will be added soon.
+            switch (deepAccess(bid, 'ext.prebid.type')) {
+              case 'V':
+                mediaType = VIDEO;
+                break;
+              case 'N':
+                mediaType = NATIVE;
+                break;
+              default:
+                mediaType = BANNER;
+            }
+
+            const meta = {
+              advertiserDomains: (Array.isArray(bid.adomain) && bid.adomain.length) ? bid.adomain : [],
+              advertiserName: deepAccess(bid, 'ext.advertiser_name', null),
+              agencyName: deepAccess(bid, 'ext.agency_name', null),
+              primaryCatId: getPrimaryCatFromResponse(bid.cat),
+              mediaType
+            };
+
+            const newBid = {
+              requestId: bid.impid,
+              cpm: (parseFloat(bid.price) || 0),
+              width: bid.w,
+              height: bid.h,
+              creativeId: bid.crid || bid.id,
+              dealId: bid.dealid || null,
+              currency,
+              netRevenue: NET_REVENUE,
+              ttl: 360, // seconds. https://docs.prebid.org/dev-docs/faq.html#does-prebidjs-cache-bids
+              referrer,
+              ad: bid.adm,
+              mediaType,
+              burl: bid.burl,
+              meta: cleanObj(meta)
+            };
+
+            if (mediaType === NATIVE) {
+              const native = nativeBidResponseHandler(bid);
+              if (native) {
+                newBid.native = native;
+              }
+            }
+
+            if (mediaType === VIDEO) {
+              // Note:
+              // Mediakeys bid adapter expects a publisher has set his own video player
+              // in the `mediaTypes.video` configuration object.
+
+              // Mediakeys bidder does not provide inline XML in the bid response
+              // newBid.vastXml = bid.ext.vast_url;
+
+              // For instream video, disable server cache as vast is generated per bid request
+              newBid.videoCacheKey = 'no_cache';
+
+              // The vast URL is server independently and must be fetched before video rendering in the renderer
+              // appending '&no_cache' is safe and fast as the vast url always have parameters
+              newBid.vastUrl = bid.ext.vast_url + '&no_cache';
+            }
+
+            bidResponses.push(newBid);
+          });
+        });
+      }
+    } catch (e) {
+      logError(BIDDER_CODE, e);
+    }
+
+    return bidResponses;
+  },
+
+  onBidWon: function (bid) {
+    if (!bid.burl) {
+      return;
+    }
+
+    const url = bid.burl.replace(/\$\{AUCTION_PRICE\}/, bid.cpm);
+
+    triggerPixel(url);
+  }
+}
+
+registerBidder(spec)
diff --git a/modules/mediakeysBidAdapter.md b/modules/mediakeysBidAdapter.md
new file mode 100644
index 00000000000..b0654771d19
--- /dev/null
+++ b/modules/mediakeysBidAdapter.md
@@ -0,0 +1,149 @@
+# Overview
+
+```
+Module Name: Mediakeys Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: prebidjs@mediakeys.com
+```
+
+# Description
+
+Connects to Mediakeys demand source to fetch bids.
+
+# Test Parameters
+
+## Banner only Ad Unit
+
+The Mediakeys adapter accepts any valid OpenRTB Spec 2.5 property.
+
+```javascript
+var adUnits = [{
+    code: 'test',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250], [300, 600]],
+        }
+    },
+    bids: [{
+        bidder: 'mediakeys',
+        params: {} // no params required.
+    }]
+}]
+```
+
+## Native only Ad Unit
+
+The Mediakeys adapter accepts two optional params for native requests. Please see the [OpenRTB Native Ads Specification](https://www.iab.com/wp-content/uploads/2018/03/OpenRTB-Native-Ads-Specification-Final-1.2.pdf) for valid values.
+
+```javascript
+var adUnits = [{
+    code: 'test',
+    mediaTypes: {
+        native: {
+            title: {
+                required: true,
+                len: 120
+            },
+            image: {
+                required: true,
+                sizes: [300, 250]
+            }
+        }
+    },
+    bids: [{
+        bidder: 'mediakeys',
+        params: {
+            native: {
+                context: 1, // ORTB Native Context Type IDs. Default `1`.
+                plcmttype: 1, // ORTB Native Placement Type IDs. Default `1`.
+            }
+        }
+    }]
+}]
+```
+
+## Video only Ad Unit
+
+The Mediakeys adapter accepts any valid openRTB 2.5 video property. Properties can be defined at the adUnit `mediaTypes.video` or `bid[].params` level.
+
+### Outstream context
+
+```javascript
+var adUnits = [{
+    code: 'test',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [1280, 720],
+            // additional OpenRTB video params
+            // placement: 2,
+            // api: [1],
+            // …
+            mimes: ['video/mp4'],
+            protocols: [2, 3],
+            skip: 0
+        }
+    },
+    renderer: {
+        url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+        // the render method must fetch the vast xml document before displaying video
+        render: function (bid) {
+            var adResponse = fetch(bid.vastUrl).then(resp => resp.text()).then(text => ({
+                ad: {
+                    video: {
+                        content: text,
+                        player_height: bid.playerHeight,
+                        player_width: bid.playerWidth
+                    }
+                }
+            }))
+
+            adResponse.then((content) => {
+                bid.renderer.push(() => {
+                    ANOutstreamVideo.renderAd({
+                        targetId: bid.adUnitCode,
+                        adResponse: content
+                    });
+                });
+            })
+        }
+    },
+    bids: [{
+        bidder: 'mediakeys',
+        params: {
+            video: {
+                // additional OpenRTB video params.
+                // will be merged with params defined at mediaTypes level
+                api: [1]
+            }
+        }
+    }]
+}]
+```
+
+### Instream context
+
+For Instream Video, you have to enable the Instream Tracking Module to have Prebid emit the onBidWon required event.
+
+```javascript
+var adUnits = [{
+    code: 'test',
+    mediaTypes: {
+        video: {
+            context: 'instream',
+            playerSize: [300, 250],
+            // additional OpenRTB video params
+            // placement: 2,
+            // api: [1],
+            // …
+        }
+    },
+    bids: [{
+        bidder: 'mediakeys',
+        params: {
+            // additional OpenRTB video params.
+            // will be merged with params defined at mediaTypes level
+        }
+    }]
+}]
+```
diff --git a/modules/medianetAnalyticsAdapter.js b/modules/medianetAnalyticsAdapter.js
index 849954fa072..d2d3d2bf888 100644
--- a/modules/medianetAnalyticsAdapter.js
+++ b/modules/medianetAnalyticsAdapter.js
@@ -1,16 +1,30 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import {
+  _map,
+  deepAccess,
+  getWindowTop,
+  groupBy,
+  isEmpty,
+  isPlainObject,
+  logError,
+  logInfo,
+  triggerPixel,
+  uniques,
+  getHighestCpm
+} from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import * as utils from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
-import { getRefererInfo } from '../src/refererDetection.js';
-import { getPriceGranularity, AUCTION_IN_PROGRESS, AUCTION_COMPLETED } from '../src/auction.js'
+import {ajax} from '../src/ajax.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {AUCTION_COMPLETED, AUCTION_IN_PROGRESS, getPriceGranularity} from '../src/auction.js';
+import {includes} from '../src/polyfill.js';
 
 const analyticsType = 'endpoint';
 const ENDPOINT = 'https://pb-logs.media.net/log?logid=kfk&evtid=prebid_analytics_events_client';
 const CONFIG_URL = 'https://prebid.media.net/rtb/prebid/analytics/config';
 const EVENT_PIXEL_URL = 'https://qsearch-a.akamaihd.net/log';
 const DEFAULT_LOGGING_PERCENT = 50;
+const ANALYTICS_VERSION = '1.0.0';
 
 const PRICE_GRANULARITY = {
   'auto': 'pbAg',
@@ -26,9 +40,11 @@ const MEDIANET_BIDDER_CODE = 'medianet';
 const PREBID_VERSION = $$PREBID_GLOBAL$$.version;
 const ERROR_CONFIG_JSON_PARSE = 'analytics_config_parse_fail';
 const ERROR_CONFIG_FETCH = 'analytics_config_ajax_fail';
+const ERROR_WINNING_BID_ABSENT = 'winning_bid_absent';
 const BID_SUCCESS = 1;
 const BID_NOBID = 2;
 const BID_TIMEOUT = 3;
+const BID_FLOOR_REJECTED = 12;
 const DUMMY_BIDDER = '-2';
 
 const CONFIG_PENDING = 0;
@@ -36,12 +52,18 @@ const CONFIG_PASS = 1;
 const CONFIG_ERROR = 3;
 
 const VALID_URL_KEY = ['canonical_url', 'og_url', 'twitter_url'];
-const DEFAULT_URL_KEY = 'page';
+const DEFAULT_URL_KEY = 'topmostLocation';
+
+const LOG_TYPE = {
+  APPR: 'APPR',
+  RA: 'RA'
+};
 
 let auctions = {};
 let config;
 let pageDetails;
 let logsQueue = [];
+let errorQueue = [];
 
 class ErrorLogger {
   constructor(event, additionalData) {
@@ -51,7 +73,6 @@ class ErrorLogger {
     this.project = 'prebidanalytics';
     this.dn = pageDetails.domain || '';
     this.requrl = pageDetails.requrl || '';
-    this.event = this.event;
     this.pbversion = PREBID_VERSION;
     this.cid = config.cid || '';
     this.rd = additionalData;
@@ -59,7 +80,8 @@ class ErrorLogger {
 
   send() {
     let url = EVENT_PIXEL_URL + '?' + formatQS(this);
-    utils.triggerPixel(url);
+    errorQueue.push(url);
+    triggerPixel(url);
   }
 }
 
@@ -72,11 +94,10 @@ class Configure {
     this.urlToConsume = DEFAULT_URL_KEY;
     this.debug = false;
     this.gdprConsent = undefined;
+    this.gdprApplies = undefined;
     this.uspConsent = undefined;
-  }
-
-  set publisherLper(plper) {
-    this.pubLper = plper;
+    this.shouldBeLogged = {};
+    this.mnetDebugConfig = '';
   }
 
   getLoggingData() {
@@ -84,10 +105,12 @@ class Configure {
       cid: this.cid,
       lper: Math.round(100 / this.loggingPercent),
       plper: this.pubLper,
-      gdpr: this.gdprConsent,
+      gdpr: this.gdprApplies ? '1' : '0',
+      gdprConsent: this.gdprConsent,
       ccpa: this.uspConsent,
       ajx: this.ajaxState,
       pbv: PREBID_VERSION,
+      pbav: ANALYTICS_VERSION,
       flt: 1,
     }
   }
@@ -99,11 +122,10 @@ class Configure {
   _parseResponse(response) {
     try {
       response = JSON.parse(response);
-      if (isNaN(response.percentage)) {
-        throw new Error('not a number');
-      }
-      this.loggingPercent = response.percentage;
-      this.urlToConsume = VALID_URL_KEY.includes(response.urlKey) ? response.urlKey : this.urlToConsume;
+      this.setDataFromResponse(response);
+      this.overrideDomainLevelData(response);
+      this.overrideToDebug(this.mnetDebugConfig);
+      this.urlToConsume = includes(VALID_URL_KEY, response.urlKey) ? response.urlKey : this.urlToConsume;
       this.ajaxState = CONFIG_PASS;
     } catch (e) {
       this.ajaxState = CONFIG_ERROR;
@@ -112,6 +134,27 @@ class Configure {
     }
   }
 
+  setDataFromResponse(response) {
+    if (!isNaN(parseInt(response.percentage, 10))) {
+      this.loggingPercent = response.percentage;
+    }
+  }
+
+  overrideDomainLevelData(response) {
+    const domain = deepAccess(response, 'domain.' + pageDetails.domain);
+    if (domain) {
+      this.setDataFromResponse(domain);
+    }
+  }
+
+  overrideToDebug(response) {
+    if (response === '') return;
+    try {
+      this.setDataFromResponse(JSON.parse(decodeURIComponent(response)));
+    } catch (e) {
+    }
+  }
+
   _errorFetch() {
     this.ajaxState = CONFIG_ERROR;
     /* eslint no-new: "error" */
@@ -120,13 +163,16 @@ class Configure {
 
   init() {
     // Forces Logging % to 100%
-    let urlObj = URL.parseUrl(pageDetails.page);
-    if (utils.deepAccess(urlObj, 'search.medianet_test') || urlObj.hostname === 'localhost') {
+    let urlObj = URL.parseUrl(pageDetails.topmostLocation);
+    if (deepAccess(urlObj, 'search.medianet_test') || urlObj.hostname === 'localhost') {
       this.loggingPercent = 100;
       this.ajaxState = CONFIG_PASS;
       this.debug = true;
       return;
     }
+    if (deepAccess(urlObj, 'search.mnet_setconfig')) {
+      this.mnetDebugConfig = deepAccess(urlObj, 'search.mnet_setconfig');
+    }
     ajax(
       this._configURL(),
       {
@@ -139,27 +185,20 @@ class Configure {
 
 class PageDetail {
   constructor () {
-    const canonicalUrl = this._getUrlFromSelector('link[rel="canonical"]', 'href');
     const ogUrl = this._getUrlFromSelector('meta[property="og:url"]', 'content');
     const twitterUrl = this._getUrlFromSelector('meta[name="twitter:url"]', 'content');
     const refererInfo = getRefererInfo();
 
-    this.domain = URL.parseUrl(refererInfo.referer).host;
-    this.page = refererInfo.referer;
+    // TODO: are these the right refererInfo values?
+    this.domain = refererInfo.domain;
+    this.page = refererInfo.page;
     this.is_top = refererInfo.reachedTop;
-    this.referrer = this._getTopWindowReferrer();
-    this.canonical_url = canonicalUrl;
+    this.referrer = refererInfo.ref || window.document.referrer;
+    this.canonical_url = refererInfo.canonicalUrl;
     this.og_url = ogUrl;
     this.twitter_url = twitterUrl;
-    this.screen = this._getWindowSize()
-  }
-
-  _getTopWindowReferrer() {
-    try {
-      return window.top.document.referrer;
-    } catch (e) {
-      return document.referrer;
-    }
+    this.topmostLocation = refererInfo.topmostLocation;
+    this.screen = this._getWindowSize();
   }
 
   _getWindowSize() {
@@ -170,7 +209,7 @@ class PageDetail {
 
   _getAttributeFromSelector(selector, attribute) {
     try {
-      let doc = utils.getWindowTop().document;
+      let doc = getWindowTop().document;
       let element = doc.querySelector(selector);
       if (element !== null && element[attribute]) {
         return element[attribute];
@@ -179,7 +218,7 @@ class PageDetail {
   }
 
   _getAbsoluteUrl(url) {
-    let aTag = utils.getWindowTop().document.createElement('a');
+    let aTag = getWindowTop().document.createElement('a');
     aTag.href = url;
 
     return aTag.href;
@@ -192,7 +231,7 @@ class PageDetail {
 
   getLoggingData() {
     return {
-      requrl: this[config.urlToConsume] || this.page,
+      requrl: this[config.urlToConsume] || this.topmostLocation,
       dn: this.domain,
       ref: this.referrer,
       screen: this.screen
@@ -201,35 +240,30 @@ class PageDetail {
 }
 
 class AdSlot {
-  constructor(mediaTypes, bannerSizes, tmax, supplyAdCode, adext) {
-    this.mediaTypes = mediaTypes;
-    this.bannerSizes = bannerSizes;
+  constructor(tmax, supplyAdCode, context, adext) {
     this.tmax = tmax;
     this.supplyAdCode = supplyAdCode;
+    this.context = context;
     this.adext = adext;
-    this.logged = false;
+    this.logged = {};
     this.targeting = undefined;
     this.medianetPresent = 0;
-    // shouldBeLogged is assigned when requested,
-    // since we are waiting for logging percent response
-    this.shouldBeLogged = undefined;
   }
 
-  getShouldBeLogged() {
-    if (this.shouldBeLogged === undefined) {
-      this.shouldBeLogged = isSampled();
+  getShouldBeLogged(logType) {
+    if (!config.shouldBeLogged.hasOwnProperty(logType)) {
+      config.shouldBeLogged[logType] = isSampled();
     }
-    return this.shouldBeLogged;
+    return config.shouldBeLogged[logType];
   }
 
   getLoggingData() {
     return Object.assign({
       supcrid: this.supplyAdCode,
-      mediaTypes: this.mediaTypes && this.mediaTypes.join('|'),
-      szs: this.bannerSizes.join('|'),
       tmax: this.tmax,
       targ: JSON.stringify(this.targeting),
-      ismn: this.medianetPresent
+      ismn: this.medianetPresent,
+      vplcmtt: this.context,
     },
     this.adext && {'adext': JSON.stringify(this.adext)},
     );
@@ -237,12 +271,13 @@ class AdSlot {
 }
 
 class Bid {
-  constructor(bidId, bidder, src, start, supplyAdCode) {
+  constructor(bidId, bidder, src, start, adUnitCode, mediaType, allMediaTypeSizes) {
     this.bidId = bidId;
     this.bidder = bidder;
     this.src = src;
     this.start = start;
-    this.supplyAdCode = supplyAdCode;
+    this.adUnitCode = adUnitCode;
+    this.allMediaTypeSizes = allMediaTypeSizes;
     this.iwb = 0;
     this.winner = 0;
     this.status = bidder === DUMMY_BIDDER ? BID_SUCCESS : BID_TIMEOUT;
@@ -252,7 +287,7 @@ class Bid {
     this.dfpbd = undefined;
     this.width = undefined;
     this.height = undefined;
-    this.mediaType = undefined;
+    this.mediaType = mediaType;
     this.timeToRespond = undefined;
     this.dealId = undefined;
     this.creativeId = undefined;
@@ -261,6 +296,9 @@ class Bid {
     this.crid = undefined;
     this.pubcrid = undefined;
     this.mpvid = undefined;
+    this.floorPrice = undefined;
+    this.floorRule = undefined;
+    this.serverLatencyMillis = undefined;
   }
 
   get size() {
@@ -279,6 +317,7 @@ class Bid {
       bdp: this.cpm,
       cbdp: this.dfpbd,
       dfpbd: this.dfpbd,
+      szs: this.allMediaTypeSizes.join('|'),
       size: this.size,
       mtype: this.mediaType,
       dId: this.dealId,
@@ -290,7 +329,10 @@ class Bid {
       crid: this.crid,
       pubcrid: this.pubcrid,
       mpvid: this.mpvid,
-      ext: JSON.stringify(this.ext)
+      bidflr: this.floorPrice,
+      flrrule: this.floorRule,
+      ext: JSON.stringify(this.ext),
+      rtime: this.serverLatencyMillis,
     }
   }
 }
@@ -306,6 +348,7 @@ class Auction {
     this.setTargetingTime = undefined;
     this.auctionEndTime = undefined;
     this.bidWonTime = undefined;
+    this.floorData = {};
   }
 
   hasEnded() {
@@ -319,16 +362,23 @@ class Auction {
       tts: this.setTargetingTime - this.auctionInitTime,
       wts: this.bidWonTime - this.auctionInitTime,
       aucstatus: this.status,
-      acid: this.acid
+      acid: this.acid,
+      flrdata: this._mergeFieldsToLog({
+        ln: this.floorData.location,
+        skp: this.floorData.skipped,
+        enfj: deepAccess(this.floorData, 'enforcements.enforceJS'),
+        enfd: deepAccess(this.floorData, 'enforcements.floorDeals'),
+        sr: this.floorData.skipRate,
+        fs: this.floorData.fetchStatus
+      }),
+      flrver: this.floorData.modelVersion
     }
   }
 
-  addSlot(supplyAdCode, { mediaTypes, bannerSizes, tmax, adext }) {
-    if (supplyAdCode && this.adSlots[supplyAdCode] === undefined) {
-      this.adSlots[supplyAdCode] = new AdSlot(mediaTypes, bannerSizes, tmax, supplyAdCode, adext);
-      this.addBid(
-        new Bid('-1', DUMMY_BIDDER, 'client', '-1', supplyAdCode)
-      );
+  addSlot({ adUnitCode, supplyAdCode, mediaTypes, allMediaTypeSizes, tmax, adext, context }) {
+    if (adUnitCode && this.adSlots[adUnitCode] === undefined) {
+      this.adSlots[adUnitCode] = new AdSlot(tmax, supplyAdCode, context, adext);
+      this.addBid(new Bid('-1', DUMMY_BIDDER, 'client', '-1', adUnitCode, mediaTypes, allMediaTypeSizes));
     }
   }
 
@@ -344,57 +394,127 @@ class Auction {
 
   getAdslotBids(adslot) {
     return this.bids
-      .filter((bid) => bid.supplyAdCode === adslot)
+      .filter((bid) => bid.adUnitCode === adslot)
       .map((bid) => bid.getLoggingData());
   }
 
-  getWinnerAdslotBid(adslot) {
-    return this.getAdslotBids(adslot).filter((bid) => bid.winner);
+  _mergeFieldsToLog(objParams) {
+    let logParams = [];
+    let value;
+    for (const param of Object.keys(objParams)) {
+      value = objParams[param];
+      logParams.push(param + '=' + (value === undefined ? '' : value));
+    }
+    return logParams.join('||');
   }
 }
 
-function auctionInitHandler({auctionId, timestamp}) {
+function auctionInitHandler({auctionId, adUnits, timeout, timestamp, bidderRequests}) {
   if (auctionId && auctions[auctionId] === undefined) {
     auctions[auctionId] = new Auction(auctionId);
     auctions[auctionId].auctionInitTime = timestamp;
   }
+  addAddSlots(auctionId, adUnits, timeout);
+  const floorData = deepAccess(bidderRequests, '0.bids.0.floorData');
+  if (floorData) {
+    auctions[auctionId].floorData = {...floorData};
+  }
 }
 
-function bidRequestedHandler({ auctionId, auctionStart, bids, start, timeout, uspConsent, gdpr }) {
+function addAddSlots(auctionId, adUnits, tmax) {
+  adUnits = adUnits || [];
+  const groupedAdUnits = groupBy(adUnits, 'code');
+  Object.keys(groupedAdUnits).forEach((adUnitCode) => {
+    const adUnits = groupedAdUnits[adUnitCode];
+    const supplyAdCode = deepAccess(adUnits, '0.adUnitCode') || adUnitCode;
+    let context = '';
+    let adext = {};
+
+    const mediaTypeMap = {};
+    const oSizes = {banner: [], video: []};
+    adUnits.forEach(({mediaTypes, sizes, ext}) => {
+      mediaTypes = mediaTypes || {};
+      adext = Object.assign(adext, ext || deepAccess(mediaTypes, 'banner.ext'));
+      context = deepAccess(mediaTypes, 'video.context') || context;
+      Object.keys(mediaTypes).forEach((mediaType) => mediaTypeMap[mediaType] = 1);
+      const sizeObject = _getSizes(mediaTypes, sizes);
+      sizeObject.banner.forEach(size => oSizes.banner.push(size));
+      sizeObject.video.forEach(size => oSizes.video.push(size));
+    });
+
+    adext = isEmpty(adext) ? undefined : adext;
+    oSizes.banner = oSizes.banner.filter(uniques);
+    oSizes.video = oSizes.video.filter(uniques);
+    oSizes.native = mediaTypeMap.native === 1 ? [[1, 1].join('x')] : [];
+    const allMediaTypeSizes = [].concat(oSizes.banner, oSizes.native, oSizes.video);
+    const mediaTypes = Object.keys(mediaTypeMap).join('|');
+    auctions[auctionId].addSlot({adUnitCode, supplyAdCode, mediaTypes, allMediaTypeSizes, context, tmax, adext});
+  });
+}
+
+function bidRequestedHandler({ auctionId, auctionStart, bids, start, uspConsent, gdpr }) {
   if (!(auctions[auctionId] instanceof Auction)) {
     return;
   }
 
-  if (gdpr && gdpr.gdprApplies) {
+  config.gdprApplies = !!(gdpr && gdpr.gdprApplies);
+  if (config.gdprApplies) {
     config.gdprConsent = gdpr.consentString || '';
   }
 
   config.uspConsent = config.uspConsent || uspConsent;
 
+  auctions[auctionId].auctionStartTime = auctionStart;
   bids.forEach(bid => {
-    const { adUnitCode, bidder, mediaTypes, sizes, bidId, src } = bid;
-    if (!auctions[auctionId].adSlots[adUnitCode]) {
-      auctions[auctionId].auctionStartTime = auctionStart;
-      auctions[auctionId].addSlot(
-        adUnitCode,
-        Object.assign({},
-          (mediaTypes instanceof Object) && { mediaTypes: Object.keys(mediaTypes) },
-          { bannerSizes: utils.deepAccess(mediaTypes, 'banner.sizes') || sizes || [] },
-          { adext: utils.deepAccess(mediaTypes, 'banner.ext') || '' },
-          { tmax: timeout }
-        )
-      );
-    }
-    let bidObj = new Bid(bidId, bidder, src, start, adUnitCode);
+    const { adUnitCode, bidder, bidId, src, mediaTypes, sizes } = bid;
+    const sizeObject = _getSizes(mediaTypes, sizes);
+    const requestSizes = [].concat(sizeObject.banner, sizeObject.native, sizeObject.video);
+    const bidObj = new Bid(bidId, bidder, src, start, adUnitCode, mediaTypes && Object.keys(mediaTypes).join('|'), requestSizes);
     auctions[auctionId].addBid(bidObj);
     if (bidder === MEDIANET_BIDDER_CODE) {
-      bidObj.crid = utils.deepAccess(bid, 'params.crid');
-      bidObj.pubcrid = utils.deepAccess(bid, 'params.crid');
+      bidObj.crid = deepAccess(bid, 'params.crid');
+      bidObj.pubcrid = deepAccess(bid, 'params.crid');
       auctions[auctionId].adSlots[adUnitCode].medianetPresent = 1;
     }
   });
 }
 
+function _getSizes(mediaTypes, sizes) {
+  const banner = deepAccess(mediaTypes, 'banner.sizes') || sizes || [];
+  const native = deepAccess(mediaTypes, 'native') ? [[1, 1]] : [];
+  const playerSize = deepAccess(mediaTypes, 'video.playerSize') || [];
+  let video = [];
+  if (playerSize.length === 2) {
+    video = [playerSize]
+  }
+  return {
+    banner: banner.map(size => size.join('x')),
+    native: native.map(size => size.join('x')),
+    video: video.map(size => size.join('x'))
+  }
+}
+
+/*
+  - The code is used to determine if the current bid is higher than the previous bid.
+  - If it is, then the code will return true and if not, it will return false.
+  */
+function canSelectCurrentBid(previousBid, currentBid) {
+  if (!(previousBid instanceof Bid)) return false;
+
+  // For first bid response the previous bid will be containing bid request obj
+  // in which the cpm would be undefined so the current bid can directly be selected.
+  const isFirstBidResponse = previousBid.cpm === undefined && currentBid.cpm !== undefined;
+  if (isFirstBidResponse) return true;
+
+  // if there are 2 bids, get the highest bid
+  const selectedBid = getHighestCpm(previousBid, currentBid);
+
+  // Return true if selectedBid is currentBid,
+  // The timeToRespond field is used as an identifier for distinguishing
+  // between the current iterating bid and the previous bid.
+  return selectedBid.timeToRespond === currentBid.timeToRespond;
+}
+
 function bidResponseHandler(bid) {
   const { width, height, mediaType, cpm, requestId, timeToRespond, auctionId, dealId } = bid;
   const {originalCpm, bidderCode, creativeId, adId, currency} = bid;
@@ -403,7 +523,7 @@ function bidResponseHandler(bid) {
     return;
   }
   let bidObj = auctions[auctionId].findBid('bidId', requestId);
-  if (!(bidObj instanceof Bid)) {
+  if (!canSelectCurrentBid(bidObj, bid)) {
     return;
   }
   Object.assign(
@@ -411,15 +531,21 @@ function bidResponseHandler(bid) {
     { cpm, width, height, mediaType, timeToRespond, dealId, creativeId },
     { adId, currency }
   );
+  bidObj.floorPrice = deepAccess(bid, 'floorData.floorValue');
+  bidObj.floorRule = deepAccess(bid, 'floorData.floorRule');
   bidObj.originalCpm = originalCpm || cpm;
-  let dfpbd = utils.deepAccess(bid, 'adserverTargeting.hb_pb');
+  let dfpbd = deepAccess(bid, 'adserverTargeting.hb_pb');
   if (!dfpbd) {
-    let priceGranularity = getPriceGranularity(mediaType, bid);
+    let priceGranularity = getPriceGranularity(bid);
     let priceGranularityKey = PRICE_GRANULARITY[priceGranularity];
     dfpbd = bid[priceGranularityKey] || cpm;
   }
   bidObj.dfpbd = dfpbd;
-  bidObj.status = BID_SUCCESS;
+  if (bid.status === CONSTANTS.BID_STATUS.BID_REJECTED) {
+    bidObj.status = BID_FLOOR_REJECTED;
+  } else {
+    bidObj.status = BID_SUCCESS;
+  }
 
   if (bidderCode === MEDIANET_BIDDER_CODE && bid.ext instanceof Object) {
     Object.assign(
@@ -429,6 +555,9 @@ function bidResponseHandler(bid) {
       bid.ext.crid && { 'crid': bid.ext.crid }
     );
   }
+  if (typeof bid.serverResponseTimeMs !== 'undefined') {
+    bidObj.serverLatencyMillis = bid.serverResponseTimeMs;
+  }
 }
 
 function noBidResponseHandler({ auctionId, bidId }) {
@@ -458,7 +587,7 @@ function bidTimeoutHandler(timedOutBids) {
   })
 }
 
-function auctionEndHandler({ auctionId, auctionEnd }) {
+function auctionEndHandler({auctionId, auctionEnd}) {
   if (!(auctions[auctionId] instanceof Auction)) {
     return;
   }
@@ -477,32 +606,49 @@ function setTargetingHandler(params) {
       adunitObj.targeting = params[adunit];
       auctionObj.setTargetingTime = Date.now();
       let targetingObj = Object.keys(params[adunit]).reduce((result, key) => {
-        if (key.indexOf('hb_adid') !== -1) {
+        if (key.indexOf(CONSTANTS.TARGETING_KEYS.AD_ID) !== -1) {
           result[key] = params[adunit][key]
         }
         return result;
       }, {});
+      const winnerAdId = params[adunit][CONSTANTS.TARGETING_KEYS.AD_ID];
+      let winningBid;
       let bidAdIds = Object.keys(targetingObj).map(k => targetingObj[k]);
       auctionObj.bids.filter((bid) => bidAdIds.indexOf(bid.adId) !== -1).map(function(bid) {
         bid.iwb = 1;
+        if (bid.adId === winnerAdId) {
+          winningBid = bid;
+        }
+      });
+      auctionObj.bids.forEach(bid => {
+        if (bid.bidder === DUMMY_BIDDER && bid.adUnitCode === adunit) {
+          bid.iwb = bidAdIds.length === 0 ? 0 : 1;
+          bid.width = deepAccess(winningBid, 'width');
+          bid.height = deepAccess(winningBid, 'height');
+        }
       });
-      sendEvent(auctionId, adunit, false);
+      sendEvent(auctionId, adunit, LOG_TYPE.APPR);
     }
   }
 }
 
 function bidWonHandler(bid) {
-  const { requestId, auctionId, adUnitCode } = bid;
+  const { auctionId, adUnitCode, adId } = bid;
   if (!(auctions[auctionId] instanceof Auction)) {
     return;
   }
-  let bidObj = auctions[auctionId].findBid('bidId', requestId);
+  let bidObj = auctions[auctionId].findBid('adId', adId);
   if (!(bidObj instanceof Bid)) {
+    new ErrorLogger(ERROR_WINNING_BID_ABSENT, {
+      adId: adId,
+      acid: auctionId,
+      adUnitCode,
+    }).send();
     return;
   }
   auctions[auctionId].bidWonTime = Date.now();
   bidObj.winner = 1;
-  sendEvent(auctionId, adUnitCode, true);
+  sendEvent(auctionId, adUnitCode, LOG_TYPE.RA, bidObj.adId);
 }
 
 function isSampled() {
@@ -513,15 +659,22 @@ function isValidAuctionAdSlot(acid, adtag) {
   return (auctions[acid] instanceof Auction) && (auctions[acid].adSlots[adtag] instanceof AdSlot);
 }
 
-function sendEvent(id, adunit, isBidWonEvent) {
+function sendEvent(id, adunit, logType, adId) {
   if (!isValidAuctionAdSlot(id, adunit)) {
     return;
   }
-  if (isBidWonEvent) {
-    fireAuctionLog(id, adunit, isBidWonEvent);
-  } else if (auctions[id].adSlots[adunit].getShouldBeLogged() && !auctions[id].adSlots[adunit].logged) {
-    auctions[id].adSlots[adunit].logged = true;
-    fireAuctionLog(id, adunit, isBidWonEvent);
+  if (logType === LOG_TYPE.RA) {
+    fireAuctionLog(id, adunit, logType, adId);
+  } else {
+    fireApPrLog(id, adunit, logType)
+  }
+}
+
+function fireApPrLog(auctionId, adUnitName, logType) {
+  const adSlot = auctions[auctionId].adSlots[adUnitName];
+  if (adSlot.getShouldBeLogged(logType) && !adSlot.logged[logType]) {
+    fireAuctionLog(auctionId, adUnitName, logType);
+    adSlot.logged[logType] = true;
   }
 }
 
@@ -532,17 +685,21 @@ function getCommonLoggingData(acid, adtag) {
   return Object.assign(commonParams, adunitParams, auctionParams);
 }
 
-function fireAuctionLog(acid, adtag, isBidWonEvent) {
+function fireAuctionLog(acid, adtag, logType, adId) {
   let commonParams = getCommonLoggingData(acid, adtag);
-  let targeting = utils.deepAccess(commonParams, 'targ');
+  commonParams.lgtp = logType;
+  let targeting = deepAccess(commonParams, 'targ');
 
   Object.keys(commonParams).forEach((key) => (commonParams[key] == null) && delete commonParams[key]);
   delete commonParams.targ;
 
   let bidParams;
 
-  if (isBidWonEvent) {
-    bidParams = auctions[acid].getWinnerAdslotBid(adtag);
+  if (logType === LOG_TYPE.RA) {
+    const winningBidObj = auctions[acid].findBid('adId', adId);
+    if (!winningBidObj) return;
+    const winLogData = winningBidObj.getLoggingData();
+    bidParams = [winLogData];
     commonParams.lper = 1;
   } else {
     bidParams = auctions[acid].getAdslotBids(adtag).map(({winner, ...restParams}) => restParams);
@@ -562,11 +719,11 @@ function fireAuctionLog(acid, adtag, isBidWonEvent) {
 }
 
 function formatQS(data) {
-  return utils._map(data, (value, key) => {
+  return _map(data, (value, key) => {
     if (value === undefined) {
       return key + '=';
     }
-    if (utils.isPlainObject(value)) {
+    if (isPlainObject(value)) {
       value = JSON.stringify(value);
     }
     return key + '=' + encodeURIComponent(value);
@@ -575,7 +732,7 @@ function formatQS(data) {
 
 function firePixel(qs) {
   logsQueue.push(ENDPOINT + '&' + qs);
-  utils.triggerPixel(ENDPOINT + '&' + qs);
+  triggerPixel(ENDPOINT + '&' + qs);
 }
 
 class URL {
@@ -610,13 +767,17 @@ let medianetAnalytics = Object.assign(adapter({URL, analyticsType}), {
   getlogsQueue() {
     return logsQueue;
   },
+  getErrorQueue() {
+    return errorQueue;
+  },
   clearlogsQueue() {
     logsQueue = [];
+    errorQueue = [];
     auctions = {};
   },
   track({ eventType, args }) {
     if (config.debug) {
-      utils.logInfo(eventType, args);
+      logInfo(eventType, args);
     }
     switch (eventType) {
       case CONSTANTS.EVENTS.AUCTION_INIT: {
@@ -658,7 +819,7 @@ medianetAnalytics.originEnableAnalytics = medianetAnalytics.enableAnalytics;
 
 medianetAnalytics.enableAnalytics = function (configuration) {
   if (!configuration || !configuration.options || !configuration.options.cid) {
-    utils.logError('Media.net Analytics adapter: cid is required.');
+    logError('Media.net Analytics adapter: cid is required.');
     return;
   }
   $$PREBID_GLOBAL$$.medianetGlobals = $$PREBID_GLOBAL$$.medianetGlobals || {};
@@ -667,7 +828,7 @@ medianetAnalytics.enableAnalytics = function (configuration) {
   pageDetails = new PageDetail();
 
   config = new Configure(configuration.options.cid);
-  config.publisherLper = configuration.options.sampling || '';
+  config.pubLper = configuration.options.sampling || '';
   config.init();
   configuration.options.sampling = 1;
   medianetAnalytics.originEnableAnalytics(configuration);
@@ -675,7 +836,8 @@ medianetAnalytics.enableAnalytics = function (configuration) {
 
 adapterManager.registerAnalyticsAdapter({
   adapter: medianetAnalytics,
-  code: 'medianetAnalytics'
+  code: 'medianetAnalytics',
+  gvlid: 142,
 });
 
 export default medianetAnalytics;
diff --git a/modules/medianetBidAdapter.js b/modules/medianetBidAdapter.js
index 5cc18acb424..01652a3fac0 100644
--- a/modules/medianetBidAdapter.js
+++ b/modules/medianetBidAdapter.js
@@ -1,11 +1,26 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
-import { getRefererInfo } from '../src/refererDetection.js';
+import {
+  buildUrl,
+  deepAccess,
+  getGptSlotInfoForAdUnitCode,
+  getWindowTop,
+  isArray,
+  isEmpty,
+  isEmptyStr,
+  isStr,
+  logError,
+  logInfo,
+  triggerPixel
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {Renderer} from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'medianet';
 const BID_URL = 'https://prebid.media.net/rtb/prebid';
+const PLAYER_URL = 'https://prebid.media.net/video/bundle.js';
 const SLOT_VISIBILITY = {
   NOT_DETERMINED: 0,
   ABOVE_THE_FOLD: 1,
@@ -16,15 +31,25 @@ const EVENTS = {
   BID_WON_EVENT_NAME: 'client_bid_won'
 };
 const EVENT_PIXEL_URL = 'qsearch-a.akamaihd.net/log';
+const OUTSTREAM = 'outstream';
 
+// TODO: this should be picked from bidderRequest
 let refererInfo = getRefererInfo();
 
 let mnData = {};
+
+window.mnet = window.mnet || {};
+window.mnet.queue = window.mnet.queue || [];
+
 mnData.urlData = {
-  domain: utils.parseUrl(refererInfo.referer).host,
-  page: refererInfo.referer,
+  domain: refererInfo.domain,
+  page: refererInfo.page,
   isTop: refererInfo.reachedTop
-}
+};
+
+const aliases = [
+  { code: 'aax', gvlid: 720 },
+];
 
 $$PREBID_GLOBAL$$.medianetGlobals = $$PREBID_GLOBAL$$.medianetGlobals || {};
 
@@ -36,13 +61,15 @@ function getTopWindowReferrer() {
   }
 }
 
-function siteDetails(site) {
+function siteDetails(site, bidderRequest) {
+  const urlData = bidderRequest.refererInfo;
   site = site || {};
   let siteData = {
-    domain: site.domain || mnData.urlData.domain,
-    page: site.page || mnData.urlData.page,
+    domain: site.domain || urlData.domain,
+    page: site.page || urlData.page,
     ref: site.ref || getTopWindowReferrer(),
-    isTop: site.isTop || mnData.urlData.isTop
+    topMostLocation: urlData.topmostLocation,
+    isTop: site.isTop || urlData.reachedTop
   };
 
   return Object.assign(siteData, getPageMeta());
@@ -72,7 +99,7 @@ function getUrlFromSelector(selector, attribute) {
 
 function getAttributeFromSelector(selector, attribute) {
   try {
-    let doc = utils.getWindowTop().document;
+    let doc = getWindowTop().document;
     let element = doc.querySelector(selector);
     if (element !== null && element[attribute]) {
       return element[attribute];
@@ -81,7 +108,7 @@ function getAttributeFromSelector(selector, attribute) {
 }
 
 function getAbsoluteUrl(url) {
-  let aTag = utils.getWindowTop().document.createElement('a');
+  let aTag = getWindowTop().document.createElement('a');
   aTag.href = url;
 
   return aTag.href;
@@ -92,7 +119,7 @@ function filterUrlsByType(urls, type) {
 }
 
 function transformSizes(sizes) {
-  if (utils.isArray(sizes) && sizes.length === 2 && !utils.isArray(sizes[0])) {
+  if (isArray(sizes) && sizes.length === 2 && !isArray(sizes[0])) {
     return [getSize(sizes)];
   }
 
@@ -108,13 +135,20 @@ function getSize(size) {
 
 function getWindowSize() {
   return {
-    w: window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth || -1,
-    h: window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight || -1
+    w: window.screen.width || -1,
+    h: window.screen.height || -1
   }
 }
 
-function getCoordinates(id) {
-  const element = document.getElementById(id);
+function getCoordinates(adUnitCode) {
+  let element = document.getElementById(adUnitCode);
+  if (!element && adUnitCode.indexOf('/') !== -1) {
+    // now it means that adUnitCode is GAM AdUnitPath
+    const {divId} = getGptSlotInfoForAdUnitCode(adUnitCode);
+    if (isStr(divId)) {
+      element = document.getElementById(divId);
+    }
+  }
   if (element && element.getBoundingClientRect) {
     const rect = element.getBoundingClientRect();
     let coordinates = {};
@@ -131,11 +165,16 @@ function getCoordinates(id) {
   return null;
 }
 
-function extParams(params, gdpr, uspConsent, userId) {
-  let windowSize = spec.getWindowSize();
-  let gdprApplies = !!(gdpr && gdpr.gdprApplies);
-  let uspApplies = !!(uspConsent);
-  let coppaApplies = !!(config.getConfig('coppa'));
+function extParams(bidRequest, bidderRequests) {
+  const params = deepAccess(bidRequest, 'params');
+  const gdpr = deepAccess(bidderRequests, 'gdprConsent');
+  const uspConsent = deepAccess(bidderRequests, 'uspConsent');
+  const userId = deepAccess(bidRequest, 'userId');
+  const sChain = deepAccess(bidRequest, 'schain') || {};
+  const windowSize = spec.getWindowSize();
+  const gdprApplies = !!(gdpr && gdpr.gdprApplies);
+  const uspApplies = !!(uspConsent);
+  const coppaApplies = !!(config.getConfig('coppa'));
   return Object.assign({},
     { customer_id: params.cid },
     { prebid_version: $$PREBID_GLOBAL$$.version },
@@ -146,7 +185,8 @@ function extParams(params, gdpr, uspConsent, userId) {
     {coppa_applies: coppaApplies},
     windowSize.w !== -1 && windowSize.h !== -1 && { screen: windowSize },
     userId && { user_id: userId },
-    $$PREBID_GLOBAL$$.medianetGlobals.analyticsEnabled && { analytics: true }
+    $$PREBID_GLOBAL$$.medianetGlobals.analyticsEnabled && { analytics: true },
+    !isEmpty(sChain) && {schain: sChain}
   );
 }
 
@@ -154,13 +194,27 @@ function slotParams(bidRequest) {
   // check with Media.net Account manager for  bid floor and crid parameters
   let params = {
     id: bidRequest.bidId,
+    transactionId: bidRequest.transactionId,
     ext: {
       dfp_id: bidRequest.adUnitCode,
       display_count: bidRequest.bidRequestsCount
     },
     all: bidRequest.params
   };
-  let bannerSizes = utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes') || bidRequest.sizes || [];
+
+  if (bidRequest.ortb2Imp) {
+    params.ortb2Imp = bidRequest.ortb2Imp;
+  }
+
+  let bannerSizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes') || [];
+
+  const videoInMediaType = deepAccess(bidRequest, 'mediaTypes.video') || {};
+  const videoInParams = deepAccess(bidRequest, 'params.video') || {};
+  const videoCombinedObj = Object.assign({}, videoInParams, videoInMediaType);
+
+  if (!isEmpty(videoCombinedObj)) {
+    params.video = videoCombinedObj;
+  }
 
   if (bannerSizes.length > 0) {
     params.banner = transformSizes(bannerSizes);
@@ -169,7 +223,7 @@ function slotParams(bidRequest) {
     try {
       params.native = JSON.stringify(bidRequest.nativeParams);
     } catch (e) {
-      utils.logError((`${BIDDER_CODE} : Incorrect JSON : bidRequest.nativeParams`));
+      logError((`${BIDDER_CODE} : Incorrect JSON : bidRequest.nativeParams`));
     }
   }
 
@@ -177,7 +231,7 @@ function slotParams(bidRequest) {
     params.tagid = bidRequest.params.crid.toString();
   }
 
-  let bidFloor = parseFloat(bidRequest.params.bidfloor);
+  let bidFloor = parseFloat(bidRequest.params.bidfloor || bidRequest.params.bidFloor);
   if (bidFloor) {
     params.bidfloor = bidFloor;
   }
@@ -194,10 +248,39 @@ function slotParams(bidRequest) {
   } else {
     params.ext.visibility = SLOT_VISIBILITY.NOT_DETERMINED;
   }
+  const floorInfo = getBidFloorByType(bidRequest);
+  if (floorInfo && floorInfo.length > 0) {
+    params.bidfloors = floorInfo;
+  }
 
   return params;
 }
 
+function getBidFloorByType(bidRequest) {
+  let floorInfo = [];
+  if (typeof bidRequest.getFloor === 'function') {
+    [BANNER, VIDEO, NATIVE].forEach(mediaType => {
+      if (bidRequest.mediaTypes.hasOwnProperty(mediaType)) {
+        if (mediaType == BANNER) {
+          bidRequest.mediaTypes.banner.sizes.forEach(
+            size => {
+              setFloorInfo(bidRequest, mediaType, size, floorInfo)
+            }
+          )
+        } else {
+          setFloorInfo(bidRequest, mediaType, '*', floorInfo)
+        }
+      }
+    });
+  }
+  return floorInfo;
+}
+function setFloorInfo(bidRequest, mediaType, size, floorInfo) {
+  let floor = bidRequest.getFloor({currency: 'USD', mediaType: mediaType, size: size});
+  if (size.length > 1) floor.size = size;
+  floor.mediaType = mediaType;
+  floorInfo.push(floor);
+}
 function getMinSize(sizes) {
   return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
 }
@@ -245,10 +328,11 @@ function getBidderURL(cid) {
 
 function generatePayload(bidRequests, bidderRequests) {
   return {
-    site: siteDetails(bidRequests[0].params.site),
-    ext: extParams(bidRequests[0].params, bidderRequests.gdprConsent, bidderRequests.uspConsent, bidRequests[0].userId),
+    site: siteDetails(bidRequests[0].params.site, bidderRequests),
+    ext: extParams(bidRequests[0], bidderRequests),
     id: bidRequests[0].auctionId,
     imp: bidRequests.map(request => slotParams(request)),
+    ortb2: bidderRequests.ortb2,
     tmax: bidderRequests.timeout || config.getConfig('bidderTimeout')
   }
 }
@@ -258,8 +342,8 @@ function isValidBid(bid) {
 }
 
 function fetchCookieSyncUrls(response) {
-  if (!utils.isEmpty(response) && response[0].body &&
-    response[0].body.ext && utils.isArray(response[0].body.ext.csUrl)) {
+  if (!isEmpty(response) && response[0].body &&
+    response[0].body.ext && isArray(response[0].body.ext.csUrl)) {
     return response[0].body.ext.csUrl;
   }
 
@@ -267,15 +351,15 @@ function fetchCookieSyncUrls(response) {
 }
 
 function getLoggingData(event, data) {
-  data = (utils.isArray(data) && data) || [];
+  data = (isArray(data) && data) || [];
 
   let params = {};
   params.logid = 'kfk';
   params.evtid = 'projectevents';
   params.project = 'prebid';
-  params.acid = utils.deepAccess(data, '0.auctionId') || '';
+  params.acid = deepAccess(data, '0.auctionId') || '';
   params.cid = $$PREBID_GLOBAL$$.medianetGlobals.cid || '';
-  params.crid = data.map((adunit) => utils.deepAccess(adunit, 'params.0.crid') || adunit.adUnitCode).join('|');
+  params.crid = data.map((adunit) => deepAccess(adunit, 'params.0.crid') || adunit.adUnitCode).join('|');
   params.adunit_count = data.length || 0;
   params.dn = mnData.urlData.domain || '';
   params.requrl = mnData.urlData.page || '';
@@ -293,19 +377,53 @@ function logEvent (event, data) {
     hostname: EVENT_PIXEL_URL,
     search: getLoggingData(event, data)
   };
-  utils.triggerPixel(utils.buildUrl(getParams));
+  triggerPixel(buildUrl(getParams));
 }
 
 function clearMnData() {
   mnData = {};
 }
 
+function addRenderer(bid) {
+  const videoContext = deepAccess(bid, 'context') || '';
+  const vastTimeout = deepAccess(bid, 'vto');
+  /* Adding renderer only when the context is Outstream
+     and the provider has responded with a renderer.
+   */
+  if (videoContext == OUTSTREAM && vastTimeout) {
+    bid.renderer = newVideoRenderer(bid);
+  }
+}
+
+function newVideoRenderer(bid) {
+  const renderer = Renderer.install({
+    url: PLAYER_URL,
+  });
+  renderer.setRender(function (bid) {
+    window.mnet.queue.push(function () {
+      const obj = {
+        width: bid.width,
+        height: bid.height,
+        vastTimeout: bid.vto,
+        maxAllowedVastTagRedirects: bid.mavtr,
+        allowVpaid: bid.avp,
+        autoPlay: bid.ap,
+        preload: bid.pl,
+        mute: bid.mt
+      }
+      const adUnitCode = bid.dfp_id;
+      const divId = getGptSlotInfoForAdUnitCode(adUnitCode).divId || adUnitCode;
+      window.mnet.mediaNetoutstreamPlayer(bid, divId, obj);
+    });
+  });
+  return renderer;
+}
 export const spec = {
 
   code: BIDDER_CODE,
   gvlid: 142,
-
-  supportedMediaTypes: [BANNER, NATIVE],
+  aliases,
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -315,12 +433,12 @@ export const spec = {
    */
   isBidRequestValid: function(bid) {
     if (!bid.params) {
-      utils.logError(`${BIDDER_CODE} : Missing bid parameters`);
+      logError(`${BIDDER_CODE} : Missing bid parameters`);
       return false;
     }
 
-    if (!bid.params.cid || !utils.isStr(bid.params.cid) || utils.isEmptyStr(bid.params.cid)) {
-      utils.logError(`${BIDDER_CODE} : cid should be a string`);
+    if (!bid.params.cid || !isStr(bid.params.cid) || isEmptyStr(bid.params.cid)) {
+      logError(`${BIDDER_CODE} : cid should be a string`);
       return false;
     }
 
@@ -337,6 +455,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(bidRequests, bidderRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     let payload = generatePayload(bidRequests, bidderRequests);
     return {
       method: 'POST',
@@ -355,20 +476,21 @@ export const spec = {
     let validBids = [];
 
     if (!serverResponse || !serverResponse.body) {
-      utils.logInfo(`${BIDDER_CODE} : response is empty`);
+      logInfo(`${BIDDER_CODE} : response is empty`);
       return validBids;
     }
 
     let bids = serverResponse.body.bidList;
-    if (!utils.isArray(bids) || bids.length === 0) {
-      utils.logInfo(`${BIDDER_CODE} : no bids`);
+    if (!isArray(bids) || bids.length === 0) {
+      logInfo(`${BIDDER_CODE} : no bids`);
       return validBids;
     }
     validBids = bids.filter(bid => isValidBid(bid));
 
+    validBids.forEach(addRenderer);
+
     return validBids;
   },
-
   getUserSyncs: function(syncOptions, serverResponses) {
     let cookieSyncUrls = fetchCookieSyncUrls(serverResponses);
 
diff --git a/modules/medianetBidAdapter.md b/modules/medianetBidAdapter.md
index 8259c32c9d3..fbe967122e9 100644
--- a/modules/medianetBidAdapter.md
+++ b/modules/medianetBidAdapter.md
@@ -14,19 +14,24 @@ This adapter currently only supports Banner Ads.
 # Sample Ad Unit: For Publishers
 ```javascript
 var adUnits = [{
-    code: 'media.net-hb-ad-123456-1',
-    sizes: [
-        [300, 250],
-        [300, 600],
-    ],
-    bids: [{
-        bidder: 'medianet',
-        params: {
-            cid: '<required-customerid-provided-by-media.net>',
-            bidfloor: '<optional-float>',
-            crid: '<required-pleacementid-provided-by-media.net>'
-        }
-    }]
+	code: 'media.net-hb-ad-123456-1',
+	mediaTypes: {
+		banner: {
+			sizes: [
+				[728, 90],
+				[300, 600],
+				[300, 250]
+			],
+		}
+	},
+	bids: [{
+		bidder: 'medianet',
+		params: {
+			cid: '<required-customerid-provided-by-media.net>',
+			bidfloor: '<optional-float>',
+			crid: '<required-pleacementid-provided-by-media.net>'
+		}
+	}]
 }];
 ```
 
@@ -35,69 +40,144 @@ var adUnits = [{
 ```html
  <!-- Prebid Config section -->
  <script>
-     var PREBID_TIMEOUT = 2000;
-     var adUnits = [{
-         code: 'media.net-hb-ad-123456-1',
-         sizes: [[300, 250]],
-         bids: [{
-             bidder: 'medianet',
-             params: {
-                 cid: '8CUX0H51C',
-                 crid: '451466393',
-                 // Site member is to be used only for testing
-                 site: {
-                     page: 'http://smoketesting.net/prebidtest/',
-                     domain: 'smoketesting.net',
-                     ref: 'http://smoketesting.net/prebidtest/'
-                 }
-             }
-         }]
-     }]; 
-    var pbjs = pbjs || {};
-    pbjs.que = pbjs.que || [];
+var adUnits = [{
+  code: 'div-gpt-ad-1460505748561-0',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [728, 90],
+        [300, 600],
+        [300, 250]
+      ],
+    }
+  },
+  bids: [{
+    bidder: 'medianet',
+    params: {
+      cid: '8CUX0H51C',
+      crid: '451466393',
+      // Site member is to be used only for testing
+      site: {
+        page: 'http://smoketesting.net/prebidtest/',
+        domain: 'smoketesting.net',
+        ref: 'http://smoketesting.net/prebidtest/'
+      }
+    }
+  }]
+}];
 </script>
 <!-- End Prebid Config section -->
 ```
 
+# Ad Unit and Setup: For Testing (Video Instream)
 
-# Ad Unit and Setup: For Testing (Native)
+```html
+<!-- Prebid Config section -->
+ <script>
+var videoAdUnit = {
+  code: 'video1',
+  mediaTypes: {
+    video: {
+      context: "instream",
+      playerSize: [640, 480],
+      mimes: ['video/mp4'],
+      placement: 1
+    }
+  },
+  bids: [{
+    bidder: 'medianet',
+    params: {
+      cid: '8CUX0H51C',
+      crid: '776755783', 
+      // Site member is to be used only for testing
+      site: {
+        page: 'http://smoketesting.net/prebidtest/',
+        domain: 'smoketesting.net',
+        ref: 'http://smoketesting.net/prebidtest/'
+      }
+    }
+  }]
+};
+</script>
+<!-- End Prebid Config section -->
+```
+# Ad Unit and Setup: For Testing (Video Outstream)
 
 ```html
  <!-- Prebid Config section -->
  <script>
-    var PREBID_TIMEOUT = 2000;
-    var adUnits = [
-        {
-            code: 'div-gpt-ad-1544091247692-0',
-            mediaTypes: {
-                native: {
-                    image: {
-                        required: true,
-                        sizes: [300, 250],
-                        wmin: 50,
-                    },
-                    title: {
-                        required: true,
-                        len: 80
-                    }
-                }
-            },
-            bids: [
-                {
-                    bidder: 'medianet',
-                    params: {
-                        cid: '8CUX0H51C',
-                        crid: '776755783',
-                        // Site member is to be used only for testing
-                        site: {
-                            page: 'http://smoketesting.net/prebidtest/',
-                            domain: 'smoketesting.net',
-                            ref: 'http://smoketesting.net/prebidtest/'
-                        }
-                    }
-                }
-            ]
+var videoAdUnit = {
+    code: 'video1',
+    mediaTypes: {
+        video: {
+             context: "outstream",
+             playerSize: [640, 480],
+             mimes: ['video/mp4'],
+             placement: 1
         }
-    ];        
+    },
+    /**
+     *  At this time, since not all demand partners return a renderer with their video bid responses,
+     *  we recommend that publishers associate a renderer with their Prebid video adUnits, if possible.
+     *  By doing so, any Prebid adapter that supports video will be able to provide demand for a given outstream slot.
+     */
+    renderer: {
+        url: '<Points to a URL containing the renderer script>',
+        render: '<A function that tells Prebid.js how to invoke the renderer script>'
+    },
+    bids: [{
+        bidder: 'medianet',
+        params: {
+            cid: '8CUX0H51C',
+            crid: '776755783', 
+            // Site member is to be used only for testing
+            site: {
+                page: 'http://smoketesting.net/prebidtest/',
+                domain: 'smoketesting.net',
+                ref: 'http://smoketesting.net/prebidtest/'
+            }
+        }
+    }]
+};
 </script>
 <!-- End Prebid Config section -->
+```
+
+# Ad Unit and Setup: For Testing (Native)
+
+```html
+ <!-- Prebid Config section -->
+ <script>
+var PREBID_TIMEOUT = 2000;
+var adUnits = [{
+  code: 'div-gpt-ad-1544091247692-0',
+  mediaTypes: {
+    native: {
+      image: {
+        required: true,
+        sizes: [300, 250],
+        wmin: 50,
+      },
+      title: {
+        required: true,
+        len: 80
+      }
+    }
+  },
+  bids: [{
+    bidder: 'medianet',
+    params: {
+      cid: '8CUX0H51C',
+      crid: '776755783',
+      // Site member is to be used only for testing
+      site: {
+        page: 'http://smoketesting.net/prebidtest/',
+        domain: 'smoketesting.net',
+        ref: 'http://smoketesting.net/prebidtest/'
+      }
+    }
+  }]
+}];    
+</script>
+<!-- End Prebid Config section -->
+
diff --git a/modules/medianetRtdProvider.js b/modules/medianetRtdProvider.js
new file mode 100644
index 00000000000..5a159b39081
--- /dev/null
+++ b/modules/medianetRtdProvider.js
@@ -0,0 +1,110 @@
+import {isEmptyStr, isFn, isStr, logError, mergeDeep} from '../src/utils.js';
+import {loadExternalScript} from '../src/adloader.js';
+import {submodule} from '../src/hook.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {includes} from '../src/polyfill.js';
+
+const MODULE_NAME = 'medianet';
+const SOURCE = MODULE_NAME + 'rtd';
+const AD_UNIT_CODE_TARGETING_KEY = 'mnadc';
+const OPEN_RTB_FIELD = 'ortb2Imp';
+
+const getClientUrl = (customerId, domain) => `https://warp.media.net/js/tags/prebidrtdclient.js?cid=${customerId}&dn=${domain}`;
+
+window.mnjs = window.mnjs || {};
+window.mnjs.que = window.mnjs.que || [];
+
+function init(config) {
+  const customerId = config.params && config.params.cid;
+  if (!customerId || !isStr(customerId) || isEmptyStr(customerId)) {
+    logError(`${SOURCE}: cid should be a string`);
+    return false;
+  }
+
+  loadRtdScript(customerId);
+  executeCommand(() => window.mnjs.setData({
+    module: 'iref',
+    name: 'initIRefresh',
+    data: {config, prebidGlobal: getGlobal()},
+  }, SOURCE));
+  return true;
+}
+
+function getBidRequestData(requestBidsProps, callback, config, userConsent) {
+  executeCommand(() => {
+    let adUnits = getAdUnits(requestBidsProps.adUnits, requestBidsProps.adUnitCodes);
+    const request = window.mnjs.onPrebidRequestBid({requestBidsProps, config, userConsent});
+    if (!request) {
+      callback();
+      return;
+    }
+    const success = (adUnitProps, openRtbProps) => {
+      adUnits.forEach(adUnit => {
+        adUnit[OPEN_RTB_FIELD] = adUnit[OPEN_RTB_FIELD] || {};
+        mergeDeep(adUnit[OPEN_RTB_FIELD], openRtbProps[adUnit.code]);
+        mergeDeep(adUnit, adUnitProps[adUnit.code]);
+      });
+      callback();
+    };
+    const error = () => callback();
+    request.onComplete(error, success);
+  });
+}
+
+function onAuctionInitEvent(auctionInit) {
+  executeCommand(() => window.mnjs.setData({
+    module: 'iref',
+    name: 'auctionInit',
+    data: {auction: auctionInit},
+  }, SOURCE));
+}
+
+function getTargetingData(adUnitCodes, config, consent, auction) {
+  const adUnits = getAdUnits(auction.adUnits, adUnitCodes);
+  let targetingData = {};
+  if (window.mnjs.loaded && isFn(window.mnjs.getTargetingData)) {
+    targetingData = window.mnjs.getTargetingData(adUnitCodes, adUnits, SOURCE) || {};
+  }
+  const targeting = {};
+  adUnitCodes.forEach(adUnitCode => {
+    targeting[adUnitCode] = targeting[adUnitCode] || {};
+    targetingData[adUnitCode] = targetingData[adUnitCode] || {};
+    targeting[adUnitCode] = {
+      // we use this to find gpt slot => prebid ad unit
+      [AD_UNIT_CODE_TARGETING_KEY]: adUnitCode,
+      ...targetingData[adUnitCode]
+    };
+  });
+  return targeting;
+}
+
+function executeCommand(command) {
+  window.mnjs.que.push(command);
+}
+
+function loadRtdScript(customerId) {
+  const url = getClientUrl(customerId, window.location.hostname);
+  loadExternalScript(url, MODULE_NAME)
+}
+
+function getAdUnits(adUnits, adUnitCodes) {
+  adUnits = adUnits || getGlobal().adUnits || [];
+  if (adUnitCodes && adUnitCodes.length) {
+    adUnits = adUnits.filter(unit => includes(adUnitCodes, unit.code));
+  }
+  return adUnits;
+}
+
+export const medianetRtdModule = {
+  name: MODULE_NAME,
+  init,
+  getBidRequestData,
+  onAuctionInitEvent,
+  getTargetingData,
+};
+
+function registerSubModule() {
+  submodule('realTimeData', medianetRtdModule);
+}
+
+registerSubModule();
diff --git a/modules/medianetRtdProvider.md b/modules/medianetRtdProvider.md
new file mode 100644
index 00000000000..ed74d3bf348
--- /dev/null
+++ b/modules/medianetRtdProvider.md
@@ -0,0 +1,38 @@
+## Overview
+
+Module Name: Media.net Realtime Module  
+Module Type: Rtd Provider  
+Maintainer: prebid-support@media.net  
+
+# Description
+
+The module currently provisions Media.net's Intelligent Refresh configured by the publisher.
+
+### Intelligent Refresh
+
+Intelligent Refresh (IR) module lets publisher refresh their ad inventory without affecting page experience of visitors through configured criteria. The module optionally provides tracking of refresh inventory and appropriate targeting in GAM. Publisher configured criteria is fetched via an external JS payload.
+
+# Integration
+
+1) Build the  Media.net Intelligent Refresh RTD module into the Prebid.js package with:
+
+```
+gulp build --modules=medianetRtdProvider
+```
+
+# Configurations
+
+2) Enable Media.net Real Time Module using `pbjs.setConfig`
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'medianet',
+            params: {
+                cid: '8CUX0H51C'
+            }
+        }]
+    }
+});
+```
diff --git a/modules/mediasniperBidAdapter.js b/modules/mediasniperBidAdapter.js
new file mode 100644
index 00000000000..417642b7a6f
--- /dev/null
+++ b/modules/mediasniperBidAdapter.js
@@ -0,0 +1,319 @@
+import {
+  deepAccess,
+  deepClone,
+  deepSetValue,
+  getBidIdParameter,
+  inIframe,
+  isArray,
+  isEmpty,
+  isFn,
+  isNumber,
+  isStr,
+  logError,
+  logMessage,
+  logWarn,
+  triggerPixel,
+} from '../src/utils.js';
+
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'mediasniper';
+const DEFAULT_BID_TTL = 360;
+const DEFAULT_CURRENCY = 'RUB';
+const DEFAULT_NET_REVENUE = true;
+const ENDPOINT = 'https://sapi.bumlam.com/prebid/';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    logMessage('Hello!! bid: ', JSON.stringify(bid));
+
+    if (!bid || isEmpty(bid)) {
+      return false;
+    }
+
+    if (!bid.params || isEmpty(bid.params)) {
+      return false;
+    }
+
+    if (!isStr(bid.params.placementId) && !isNumber(bid.params.placementId)) {
+      return false;
+    }
+
+    const banner = deepAccess(bid, 'mediaTypes.banner', {});
+    if (!banner || isEmpty(banner)) {
+      return false;
+    }
+
+    const sizes = deepAccess(bid, 'mediaTypes.banner.sizes', []);
+    if (!isArray(sizes) || isEmpty(sizes)) {
+      return false;
+    }
+
+    return true;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const payload = createOrtbTemplate();
+
+    deepSetValue(payload, 'id', bidderRequest.auctionId);
+
+    validBidRequests.forEach((validBid) => {
+      let bid = deepClone(validBid);
+
+      const imp = createImp(bid);
+      payload.imp.push(imp);
+    });
+
+    // params
+    const siteId = getBidIdParameter('siteid', validBidRequests[0].params) + '';
+    deepSetValue(payload, 'site.id', siteId);
+
+    // Assign payload.site from refererinfo
+    if (bidderRequest.refererInfo) {
+      // TODO: reachedTop is probably not the right check - it may be false when page is available or vice-versa
+      if (bidderRequest.refererInfo.reachedTop) {
+        const sitePage = bidderRequest.refererInfo.page;
+        deepSetValue(payload, 'site.page', sitePage);
+        deepSetValue(
+          payload,
+          'site.domain',
+          bidderRequest.refererInfo.domain
+        );
+
+        if (bidderRequest.refererInfo?.ref) {
+          deepSetValue(payload, 'site.ref', bidderRequest.refererInfo.ref);
+        }
+      }
+    }
+
+    const request = {
+      method: 'POST',
+      url: ENDPOINT,
+      data: JSON.stringify(payload),
+    };
+
+    return request;
+  },
+
+  interpretResponse(serverResponse, bidRequest) {
+    const bidResponses = [];
+
+    try {
+      if (
+        serverResponse.body &&
+        serverResponse.body.seatbid &&
+        isArray(serverResponse.body.seatbid)
+      ) {
+        serverResponse.body.seatbid.forEach((bidderSeat) => {
+          if (!isArray(bidderSeat.bid) || !bidderSeat.bid.length) {
+            return;
+          }
+
+          bidderSeat.bid.forEach((bid) => {
+            const newBid = {
+              requestId: bid.impid,
+              bidderCode: spec.code,
+              cpm: bid.price || 0,
+              width: bid.w,
+              height: bid.h,
+              creativeId: bid.crid || bid.adid || bid.id,
+              dealId: bid.dealid || null,
+              currency: serverResponse.body.cur || DEFAULT_CURRENCY,
+              netRevenue: DEFAULT_NET_REVENUE,
+              ttl: DEFAULT_BID_TTL, // seconds. https://docs.prebid.org/dev-docs/faq.html#does-prebidjs-cache-bids
+              ad: bid.adm,
+              mediaType: BANNER,
+              burl: bid.nurl,
+              meta: {
+                advertiserDomains:
+                  Array.isArray(bid.adomain) && bid.adomain.length
+                    ? bid.adomain
+                    : [],
+                mediaType: BANNER,
+              },
+            };
+
+            logMessage('answer: ', JSON.stringify(newBid));
+
+            bidResponses.push(newBid);
+          });
+        });
+      }
+    } catch (e) {
+      logError(BIDDER_CODE, e);
+    }
+
+    return bidResponses;
+  },
+
+  onBidWon: function (bid) {
+    if (!bid.burl) {
+      return;
+    }
+
+    const url = bid.burl.replace(/\$\{AUCTION_PRICE\}/, bid.cpm);
+
+    triggerPixel(url);
+  },
+};
+registerBidder(spec);
+
+/**
+ * Returns an openRTB 2.5 object.
+ * This one will be populated at each step of the buildRequest process.
+ *
+ * @returns {object}
+ */
+function createOrtbTemplate() {
+  return {
+    id: '',
+    cur: [DEFAULT_CURRENCY],
+    imp: [],
+    site: {},
+    device: {
+      ip: '',
+      js: 1,
+      ua: navigator.userAgent,
+    },
+    user: {},
+  };
+}
+
+/**
+ * Create the OpenRTB 2.5 imp object.
+ *
+ * @param {*} bid Prebid bid object from request
+ * @returns
+ */
+function createImp(bid) {
+  let placementId = '';
+  if (isStr(bid.params.placementId)) {
+    placementId = bid.params.placementId;
+  } else if (isNumber(bid.params.placementId)) {
+    placementId = bid.params.placementId.toString();
+  }
+
+  const imp = {
+    id: bid.bidId,
+    tagid: placementId,
+    bidfloorcur: DEFAULT_CURRENCY,
+    secure: 1,
+  };
+
+  // There is no default floor. bidfloor is set only
+  // if the priceFloors module is activated and returns a valid floor.
+  const floor = getMinFloor(bid);
+  if (isNumber(floor)) {
+    imp.bidfloor = floor;
+  }
+
+  // Only supports proper mediaTypes definition…
+  for (let mediaType in bid.mediaTypes) {
+    switch (mediaType) {
+      case BANNER:
+        imp.banner = createBannerImp(bid);
+        break;
+    }
+  }
+
+  // dealid
+  const dealId = getBidIdParameter('dealid', bid.params);
+  if (dealId) {
+    imp.pmp = {
+      private_auction: 1,
+      deals: [
+        {
+          id: dealId,
+          bidfloor: floor || 0,
+          bidfloorcur: DEFAULT_CURRENCY,
+        },
+      ],
+    };
+  }
+
+  return imp;
+}
+
+/**
+ * Returns floor from priceFloors module or MediaKey default value.
+ *
+ * @param {*} bid a Prebid.js bid (request) object
+ * @param {string} mediaType the mediaType or the wildcard '*'
+ * @param {string|array} size the size array or the wildcard '*'
+ * @returns {number|boolean}
+ */
+function getFloor(bid, mediaType, size = '*') {
+  if (!isFn(bid.getFloor)) {
+    return false;
+  }
+
+  if (spec.supportedMediaTypes.indexOf(mediaType) === -1) {
+    logWarn(
+      `${BIDDER_CODE}: Unable to detect floor price for unsupported mediaType ${mediaType}. No floor will be used.`
+    );
+    return false;
+  }
+
+  const floor = bid.getFloor({
+    currency: DEFAULT_CURRENCY,
+    mediaType,
+    size,
+  });
+
+  return !isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY
+    ? floor.floor
+    : false;
+}
+
+function getMinFloor(bid) {
+  const floors = [];
+
+  for (let mediaType in bid.mediaTypes) {
+    const floor = getFloor(bid, mediaType);
+
+    if (isNumber(floor)) {
+      floors.push(floor);
+    }
+  }
+
+  if (!floors.length) {
+    return false;
+  }
+
+  return floors.reduce((a, b) => {
+    return Math.min(a, b);
+  });
+}
+
+/**
+ * Returns an openRtb 2.5 banner object.
+ *
+ * @param {object} bid Prebid bid object from request
+ * @returns {object}
+ */
+function createBannerImp(bid) {
+  let sizes = bid.mediaTypes.banner.sizes;
+  const params = deepAccess(bid, 'params', {});
+
+  const banner = {};
+
+  banner.w = parseInt(sizes[0][0], 10);
+  banner.h = parseInt(sizes[0][1], 10);
+
+  const format = [];
+  sizes.forEach(function (size) {
+    if (size.length && size.length > 1) {
+      format.push({ w: size[0], h: size[1] });
+    }
+  });
+  banner.format = format;
+
+  banner.topframe = inIframe() ? 0 : 1;
+  banner.pos = params.pos || 0;
+
+  return banner;
+}
diff --git a/modules/mediasniperBidAdapter.md b/modules/mediasniperBidAdapter.md
new file mode 100644
index 00000000000..e47513c7fb2
--- /dev/null
+++ b/modules/mediasniperBidAdapter.md
@@ -0,0 +1,31 @@
+# Overview
+
+```
+Module Name: Mediasniper Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: oleg@rtbtech.org
+```
+
+# Description
+
+Connects to Mediasniper demand source to fetch bids.
+
+# Test Parameters
+
+```
+var adUnits = [
+{
+    code: 'test',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250], [300, 600]],
+        }
+    },
+    bids: [{
+        bidder: 'mediasniper',
+        params: {
+            placementId: "123456"
+        }
+    }]
+},
+```
diff --git a/modules/mediasquareBidAdapter.js b/modules/mediasquareBidAdapter.js
index cb52c288caf..819ff280e35 100644
--- a/modules/mediasquareBidAdapter.js
+++ b/modules/mediasquareBidAdapter.js
@@ -1,19 +1,23 @@
 import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {Renderer} from '../src/Renderer.js';
 
 const BIDDER_CODE = 'mediasquare';
 const BIDDER_URL_PROD = 'https://pbs-front.mediasquare.fr/'
 const BIDDER_URL_TEST = 'https://bidder-test.mediasquare.fr/'
 const BIDDER_ENDPOINT_AUCTION = 'msq_prebid';
-const BIDDER_ENDPOINT_SYNC = 'cookie_sync';
 const BIDDER_ENDPOINT_WINNING = 'winning';
 
+const OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 791,
   aliases: ['msq'], // short code
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
   /**
          * Determines whether or not the given bid request is valid.
          *
@@ -30,12 +34,25 @@ export const spec = {
          * @return ServerRequest Info describing the request to the server.
          */
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let codes = [];
     let endpoint = document.location.search.match(/msq_test=true/) ? BIDDER_URL_TEST : BIDDER_URL_PROD;
+    let floor = {};
     const test = config.getConfig('debug') ? 1 : 0;
     let adunitValue = null;
     Object.keys(validBidRequests).forEach(key => {
+      floor = {};
       adunitValue = validBidRequests[key];
+      if (typeof adunitValue.getFloor === 'function') {
+        if (Array.isArray(adunitValue.sizes)) {
+          adunitValue.sizes.forEach(value => {
+            let tmpFloor = adunitValue.getFloor({currency: 'USD', mediaType: '*', size: value});
+            if (tmpFloor != {}) { floor[value.join('x')] = tmpFloor; }
+          });
+        }
+      }
       codes.push({
         owner: adunitValue.params.owner,
         code: adunitValue.params.code,
@@ -43,12 +60,15 @@ export const spec = {
         bidId: adunitValue.bidId,
         auctionId: adunitValue.auctionId,
         transactionId: adunitValue.transactionId,
-        mediatypes: adunitValue.mediaTypes
+        mediatypes: adunitValue.mediaTypes,
+        floor: floor
       });
     });
     const payload = {
       codes: codes,
-      referer: encodeURIComponent(bidderRequest.refererInfo.referer)
+      // TODO: is 'page' the right value here?
+      referer: encodeURIComponent(bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation),
+      pbjs: '$prebid.version$'
     };
     if (bidderRequest) { // modules informations (gdpr, ccpa, schain, userId)
       if (bidderRequest.gdprConsent) {
@@ -59,7 +79,11 @@ export const spec = {
       }
       if (bidderRequest.uspConsent) { payload.uspConsent = bidderRequest.uspConsent; }
       if (bidderRequest.schain) { payload.schain = bidderRequest.schain; }
-      if (bidderRequest.userId) { payload.userId = bidderRequest.userId; }
+      if (bidderRequest.userId) {
+        payload.userId = bidderRequest.userId;
+      } else if (bidderRequest.hasOwnProperty('bids') && typeof bidderRequest.bids == 'object' && bidderRequest.bids.length > 0 && bidderRequest.bids[0].hasOwnProperty('userId')) {
+        payload.userId = bidderRequest.bids[0].userId;
+      }
     };
     if (test) { payload.debug = true; }
     const payloadString = JSON.stringify(payload);
@@ -97,8 +121,26 @@ export const spec = {
           mediasquare: {
             'bidder': value['bidder'],
             'code': value['code']
+          },
+          meta: {
+            'advertiserDomains': value['adomain']
           }
         };
+        if ('match' in value) {
+          bidResponse['mediasquare']['match'] = value['match'];
+        }
+        if ('hasConsent' in value) {
+          bidResponse['mediasquare']['hasConsent'] = value['hasConsent'];
+        }
+        if ('native' in value) {
+          bidResponse['native'] = value['native'];
+          bidResponse['mediaType'] = 'native';
+        } else if ('video' in value) {
+          if ('url' in value['video']) { bidResponse['vastUrl'] = value['video']['url'] }
+          if ('xml' in value['video']) { bidResponse['vastXml'] = value['video']['xml'] }
+          bidResponse['mediaType'] = 'video';
+          bidResponse['renderer'] = createRenderer(value, OUTSTREAM_RENDERER_URL);
+        }
         if (value.hasOwnProperty('deal_id')) { bidResponse['dealId'] = value['deal_id']; }
         bidResponses.push(bidResponse);
       });
@@ -114,17 +156,11 @@ export const spec = {
      * @return {UserSync[]} The user syncs which should be dropped.
      */
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
-    let params = '';
-    let endpoint = document.location.search.match(/msq_test=true/) ? BIDDER_URL_TEST : BIDDER_URL_PROD;
-    if (serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
+    if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
+        serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
       return serverResponses[0].body.cookies;
     } else {
-      if (gdprConsent && typeof gdprConsent.consentString === 'string') { params += typeof gdprConsent.gdprApplies === 'boolean' ? `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}` : `&gdpr_consent=${gdprConsent.consentString}`; }
-      if (uspConsent && typeof uspConsent === 'string') { params += '&uspConsent=' + uspConsent }
-      return {
-        type: 'iframe',
-        url: endpoint + BIDDER_ENDPOINT_SYNC + '?type=iframe' + params
-      };
+      return [];
     }
   },
 
@@ -134,20 +170,55 @@ export const spec = {
      */
   onBidWon: function(bid) {
     // fires a pixel to confirm a winning bid
-    let params = [];
+    let params = {'pbjs': '$prebid.version$'};
     let endpoint = document.location.search.match(/msq_test=true/) ? BIDDER_URL_TEST : BIDDER_URL_PROD;
-    let paramsToSearchFor = ['cpm', 'size', 'mediaType', 'currency', 'creativeId', 'adUnitCode', 'timeToRespond']
+    let paramsToSearchFor = ['cpm', 'size', 'mediaType', 'currency', 'creativeId', 'adUnitCode', 'timeToRespond', 'requestId', 'auctionId', 'originalCpm', 'originalCurrency'];
     if (bid.hasOwnProperty('mediasquare')) {
-      if (bid['mediasquare'].hasOwnProperty('bidder')) { params.push('bidder=' + bid['mediasquare']['bidder']); }
-      if (bid['mediasquare'].hasOwnProperty('code')) { params.push('code=' + bid['mediasquare']['code']); }
+      if (bid['mediasquare'].hasOwnProperty('bidder')) { params['bidder'] = bid['mediasquare']['bidder']; }
+      if (bid['mediasquare'].hasOwnProperty('code')) { params['code'] = bid['mediasquare']['code']; }
+      if (bid['mediasquare'].hasOwnProperty('match')) { params['match'] = bid['mediasquare']['match']; }
+      if (bid['mediasquare'].hasOwnProperty('hasConsent')) { params['hasConsent'] = bid['mediasquare']['hasConsent']; }
     };
     for (let i = 0; i < paramsToSearchFor.length; i++) {
-      if (bid.hasOwnProperty(paramsToSearchFor[i])) { params.push(paramsToSearchFor[i] + '=' + bid[paramsToSearchFor[i]]); }
+      if (bid.hasOwnProperty(paramsToSearchFor[i])) {
+        params[paramsToSearchFor[i]] = bid[paramsToSearchFor[i]];
+        if (typeof params[paramsToSearchFor[i]] == 'number') { params[paramsToSearchFor[i]] = params[paramsToSearchFor[i]].toString() }
+      }
     }
-    if (params.length > 0) { params = '?' + params.join('&'); }
-    ajax(endpoint + BIDDER_ENDPOINT_WINNING + params, null);
+    ajax(endpoint + BIDDER_ENDPOINT_WINNING, null, JSON.stringify(params), {method: 'POST', withCredentials: true});
     return true;
   }
 
 }
+
+function outstreamRender(bid) {
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      sizes: [bid.width, bid.height],
+      targetId: bid.adUnitCode,
+      adResponse: bid.adResponse,
+      rendererOptions: {
+        showBigPlayButton: false,
+        showProgressBar: 'bar',
+        showVolume: false,
+        allowFullscreen: true,
+        skippable: false,
+        content: bid.vastXml
+      }
+    });
+  });
+}
+
+function createRenderer(bid, url) {
+  const renderer = Renderer.install({
+    id: bid.bidId,
+    url: url,
+    loaded: false,
+    adUnitCode: bid.adUnitCode,
+    targetId: bid.adUnitCode
+  });
+  renderer.setRender(outstreamRender);
+  return renderer;
+}
+
 registerBidder(spec);
diff --git a/modules/merkleIdSystem.js b/modules/merkleIdSystem.js
new file mode 100644
index 00000000000..6a10c2a94eb
--- /dev/null
+++ b/modules/merkleIdSystem.js
@@ -0,0 +1,202 @@
+/**
+ * This module adds merkleId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/merkleIdSystem
+ * @requires module:modules/userId
+ */
+
+import { logInfo, logError, logWarn } from '../src/utils.js';
+import * as ajaxLib from '../src/ajax.js';
+import {submodule} from '../src/hook.js'
+import {getStorageManager} from '../src/storageManager.js';
+
+const MODULE_NAME = 'merkleId';
+const ID_URL = 'https://prebid.sv.rkdms.com/identity/';
+const DEFAULT_REFRESH = 7 * 3600;
+const SESSION_COOKIE_NAME = '_svsid';
+
+export const storage = getStorageManager();
+
+function getSession(configParams) {
+  let session = null;
+  if (typeof configParams.sv_session === 'string') {
+    session = configParams.sv_session;
+  } else {
+    session = storage.getCookie(SESSION_COOKIE_NAME);
+  }
+  return session;
+}
+
+function setCookie(name, value, expires) {
+  let expTime = new Date();
+  expTime.setTime(expTime.getTime() + expires * 1000 * 60);
+  storage.setCookie(name, value, expTime.toUTCString(), 'Lax');
+}
+
+function setSession(storage, response) {
+  logInfo('Merkle setting ' + `${SESSION_COOKIE_NAME}`);
+  if (response && response[SESSION_COOKIE_NAME] && typeof response[SESSION_COOKIE_NAME] === 'string') {
+    setCookie(SESSION_COOKIE_NAME, response[SESSION_COOKIE_NAME], storage.expires);
+  }
+}
+
+function constructUrl(configParams) {
+  const session = getSession(configParams);
+  let url = configParams.endpoint + `?sv_domain=${configParams.sv_domain}&sv_pubid=${configParams.sv_pubid}&ssp_ids=${configParams.ssp_ids.join()}`;
+  if (session) {
+    url = `${url}&sv_session=${session}`;
+  }
+  logInfo('Merkle url :' + url);
+  return url;
+}
+
+function generateId(configParams, configStorage) {
+  const url = constructUrl(configParams);
+
+  const resp = function (callback) {
+    ajaxLib.ajaxBuilder()(
+      url,
+      response => {
+        let responseObj;
+        if (response) {
+          try {
+            responseObj = JSON.parse(response);
+            setSession(configStorage, responseObj)
+            logInfo('Merkle responseObj ' + JSON.stringify(responseObj));
+          } catch (error) {
+            logError(error);
+          }
+        }
+
+        const date = new Date().toUTCString();
+        responseObj.date = date;
+        logInfo('Merkle responseObj with date ' + JSON.stringify(responseObj));
+        callback(responseObj);
+      },
+      error => {
+        logError(`${MODULE_NAME}: merkleId fetch encountered an error`, error);
+        callback();
+      },
+      {method: 'GET', withCredentials: true}
+    );
+  };
+  return resp;
+}
+
+/** @type {Submodule} */
+export const merkleIdSubmodule = {
+  /**
+     * used to link submodule with config
+     * @type {string}
+     */
+  name: MODULE_NAME,
+
+  /**
+     * decode the stored id value for passing to bid requests
+     * @function
+     * @param {string} value
+     * @returns {{eids:arrayofields}}
+     */
+  decode(value) {
+    // Legacy support for a single id
+    const id = (value && value.pam_id && typeof value.pam_id.id === 'string') ? value.pam_id : undefined;
+    logInfo('Merkle id ' + JSON.stringify(id));
+
+    if (id) {
+      return {'merkleId': id}
+    }
+
+    // Supports multiple IDs for different SSPs
+    const merkleIds = (value && value?.merkleId && Array.isArray(value.merkleId)) ? value.merkleId : undefined;
+    logInfo('merkleIds: ' + JSON.stringify(merkleIds));
+
+    return merkleIds ? {'merkleId': merkleIds} : undefined;
+  },
+
+  /**
+     * performs action to obtain id and return a value in the callback's response argument
+     * @function
+     * @param {SubmoduleConfig} [config]
+     * @param {ConsentData} [consentData]
+     * @returns {IdResponse|undefined}
+     */
+  getId(config, consentData) {
+    logInfo('User ID - merkleId generating id');
+
+    const configParams = (config && config.params) || {};
+
+    if (typeof configParams.sv_pubid !== 'string') {
+      logError('User ID - merkleId submodule requires a valid sv_pubid string to be defined');
+      return;
+    }
+
+    if (!Array.isArray(configParams.ssp_ids)) {
+      logError('User ID - merkleId submodule requires a valid ssp_ids array to be defined');
+      return;
+    }
+
+    if (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) {
+      logError('User ID - merkleId submodule does not currently handle consent strings');
+      return;
+    }
+
+    if (typeof configParams.endpoint !== 'string') {
+      logWarn('User ID - merkleId submodule endpoint string is not defined');
+      configParams.endpoint = ID_URL
+    }
+
+    if (typeof configParams.sv_domain !== 'string') {
+      configParams.sv_domain = merkleIdSubmodule.findRootDomain();
+    }
+
+    const configStorage = (config && config.storage) || {};
+    const resp = generateId(configParams, configStorage)
+    return {callback: resp};
+  },
+  extendId: function (config = {}, consentData, storedId) {
+    logInfo('User ID - stored id ' + storedId);
+    const configParams = (config && config.params) || {};
+
+    if (typeof configParams.endpoint !== 'string') {
+      logWarn('User ID - merkleId submodule endpoint string is not defined');
+      configParams.endpoint = ID_URL;
+    }
+
+    if (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) {
+      logError('User ID - merkleId submodule does not currently handle consent strings');
+      return;
+    }
+
+    if (typeof configParams.sv_domain !== 'string') {
+      configParams.sv_domain = merkleIdSubmodule.findRootDomain();
+    }
+
+    const configStorage = (config && config.storage) || {};
+    if (configStorage && configStorage.refreshInSeconds && typeof configParams.refreshInSeconds === 'number') {
+      return {id: storedId};
+    }
+
+    let refreshInSeconds = DEFAULT_REFRESH;
+    if (configParams && configParams.refreshInSeconds && typeof configParams.refreshInSeconds === 'number') {
+      refreshInSeconds = configParams.refreshInSeconds;
+      logInfo('User ID - merkleId param refreshInSeconds' + refreshInSeconds);
+    }
+
+    const storedDate = new Date(storedId.date);
+    let refreshNeeded = false;
+    if (storedDate) {
+      refreshNeeded = storedDate && (Date.now() - storedDate.getTime() > refreshInSeconds * 1000);
+      if (refreshNeeded) {
+        logInfo('User ID - merkleId needs refreshing id');
+        const resp = generateId(configParams, configStorage);
+        return {callback: resp};
+      }
+    }
+
+    logInfo('User ID - merkleId not refreshed');
+    return {id: storedId};
+  }
+
+};
+
+submodule('userId', merkleIdSubmodule);
diff --git a/modules/mgidBidAdapter.js b/modules/mgidBidAdapter.js
index 957b9a1d703..036effecd88 100644
--- a/modules/mgidBidAdapter.js
+++ b/modules/mgidBidAdapter.js
@@ -1,12 +1,14 @@
+import { _each, deepAccess, isPlainObject, isArray, isStr, logInfo, parseUrl, isEmpty, triggerPixel, logWarn, getBidIdParameter, isFn, isNumber } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
-const storage = getStorageManager();
+const GVLID = 358;
 const DEFAULT_CUR = 'USD';
 const BIDDER_CODE = 'mgid';
+export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 const ENDPOINT_URL = 'https://prebid.mgid.com/prebid/';
 const LOG_WARN_PREFIX = '[MGID warn]: ';
 const LOG_INFO_PREFIX = '[MGID info]: ';
@@ -57,13 +59,14 @@ let _NATIVE_ASSET_ID_TO_KEY_MAP = {};
 let _NATIVE_ASSET_KEY_TO_ASSET_MAP = {};
 
 // loading _NATIVE_ASSET_ID_TO_KEY_MAP
-utils._each(NATIVE_ASSETS, anAsset => { _NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAsset.KEY });
+_each(NATIVE_ASSETS, anAsset => { _NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAsset.KEY });
 // loading _NATIVE_ASSET_KEY_TO_ASSET_MAP
-utils._each(NATIVE_ASSETS, anAsset => { _NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
+_each(NATIVE_ASSETS, anAsset => { _NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
 
 export const spec = {
-  VERSION: '1.4',
+  VERSION: '1.5',
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, NATIVE],
   reId: /^[1-9][0-9]*$/,
   NATIVE_ASSET_ID_TO_KEY_MAP: _NATIVE_ASSET_ID_TO_KEY_MAP,
@@ -75,20 +78,20 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: (bid) => {
-    const banner = utils.deepAccess(bid, 'mediaTypes.banner');
-    const native = utils.deepAccess(bid, 'mediaTypes.native');
-    let nativeOk = utils.isPlainObject(native);
+    const banner = deepAccess(bid, 'mediaTypes.banner');
+    const native = deepAccess(bid, 'mediaTypes.native');
+    let nativeOk = isPlainObject(native);
     if (nativeOk) {
-      const nativeParams = utils.deepAccess(bid, 'nativeParams');
+      const nativeParams = deepAccess(bid, 'nativeParams');
       let assetsCount = 0;
-      if (utils.isPlainObject(nativeParams)) {
+      if (isPlainObject(nativeParams)) {
         for (let k in nativeParams) {
           let v = nativeParams[k];
           const supportProp = spec.NATIVE_ASSET_KEY_TO_ASSET_MAP.hasOwnProperty(k);
           if (supportProp) {
-            assetsCount++
+            assetsCount++;
           }
-          if (!utils.isPlainObject(v) || (!supportProp && utils.deepAccess(v, 'required'))) {
+          if (!isPlainObject(v) || (!supportProp && deepAccess(v, 'required'))) {
             nativeOk = false;
             break;
           }
@@ -96,17 +99,17 @@ export const spec = {
       }
       nativeOk = nativeOk && (assetsCount > 0);
     }
-    let bannerOk = utils.isPlainObject(banner);
+    let bannerOk = isPlainObject(banner);
     if (bannerOk) {
-      const sizes = utils.deepAccess(banner, 'sizes');
-      bannerOk = utils.isArray(sizes) && sizes.length > 0;
+      const sizes = deepAccess(banner, 'sizes');
+      bannerOk = isArray(sizes) && sizes.length > 0;
       for (let f = 0; bannerOk && f < sizes.length; f++) {
         bannerOk = sizes[f].length === 2;
       }
     }
     let acc = Number(bid.params.accountId);
     let plcmt = Number(bid.params.placementId);
-    return (bannerOk || nativeOk) && utils.isPlainObject(bid.params) && !!bid.adUnitCode && utils.isStr(bid.adUnitCode) && (plcmt > 0 ? bid.params.placementId.toString().search(spec.reId) === 0 : true) &&
+    return (bannerOk || nativeOk) && isPlainObject(bid.params) && !!bid.adUnitCode && isStr(bid.adUnitCode) && (plcmt > 0 ? bid.params.placementId.toString().search(spec.reId) === 0 : true) &&
       !!acc && acc > 0 && bid.params.accountId.toString().search(spec.reId) === 0;
   },
   /**
@@ -116,34 +119,41 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
-    utils.logInfo(LOG_INFO_PREFIX + `buildRequests`);
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    logInfo(LOG_INFO_PREFIX + `buildRequests`);
     if (validBidRequests.length === 0) {
       return;
     }
     const info = pageInfo();
-    const page = info.location || utils.deepAccess(bidderRequest, 'refererInfo.referer') || utils.deepAccess(bidderRequest, 'refererInfo.canonicalUrl');
-    const hostname = utils.parseUrl(page).hostname;
+    // TODO: the fallback seems to never be used here, and probably in the wrong order
+    const page = info.location || deepAccess(bidderRequest, 'refererInfo.page')
+    const hostname = parseUrl(page).hostname;
     let domain = extractDomainFromHost(hostname) || hostname;
     const accountId = setOnAny(validBidRequests, 'params.accountId');
     const muid = getLocalStorageSafely('mgMuidn');
     let url = (setOnAny(validBidRequests, 'params.bidUrl') || ENDPOINT_URL) + accountId;
-    if (utils.isStr(muid) && muid.length > 0) {
+    if (isStr(muid) && muid.length > 0) {
       url += '?muid=' + muid;
     }
-    const cur = [setOnAny(validBidRequests, 'params.currency') || setOnAny(validBidRequests, 'params.cur') || config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
+    const cur = setOnAny(validBidRequests, 'params.currency') || setOnAny(validBidRequests, 'params.cur') || config.getConfig('currency.adServerCurrency') || DEFAULT_CUR;
     const secure = window.location.protocol === 'https:' ? 1 : 0;
     let imp = [];
     validBidRequests.forEach(bid => {
-      let tagid = utils.deepAccess(bid, 'params.placementId') || 0;
+      let tagid = deepAccess(bid, 'params.placementId') || 0;
       tagid = !tagid ? bid.adUnitCode : tagid + '/' + bid.adUnitCode;
       let impObj = {
         id: bid.bidId,
         tagid,
         secure,
       };
-      const bidFloor = utils.deepAccess(bid, 'params.bidFloor') || utils.deepAccess(bid, 'params.bidfloor') || 0;
-      if (bidFloor && utils.isNumber(bidFloor)) {
-        impObj.bidfloor = bidFloor;
+      const floorData = getBidFloor(bid, cur);
+      if (floorData.floor) {
+        impObj.bidfloor = floorData.floor;
+      }
+      if (floorData.cur) {
+        impObj.bidfloorcur = floorData.cur;
       }
       for (let mediaTypes in bid.mediaTypes) {
         switch (mediaTypes) {
@@ -168,10 +178,12 @@ export const spec = {
       return;
     }
 
+    const ortb2Data = bidderRequest?.ortb2 || {};
+
     let request = {
-      id: utils.deepAccess(bidderRequest, 'bidderRequestId'),
+      id: deepAccess(bidderRequest, 'bidderRequestId'),
       site: {domain, page},
-      cur: cur,
+      cur: [cur],
       geo: {utcoffset: info.timeOffset},
       device: {
         ua: navigator.userAgent,
@@ -181,7 +193,11 @@ export const spec = {
         w: screen.width,
         language: getLanguage()
       },
-      ext: {mgid_ver: spec.VERSION, prebid_ver: $$PREBID_GLOBAL$$.version},
+      ext: {
+        mgid_ver: spec.VERSION,
+        prebid_ver: '$prebid.version$',
+        ...ortb2Data
+      },
       imp
     };
     if (bidderRequest && bidderRequest.gdprConsent) {
@@ -191,7 +207,7 @@ export const spec = {
     if (info.referrer) {
       request.site.ref = info.referrer
     }
-    utils.logInfo(LOG_INFO_PREFIX + `buildRequest:`, request);
+    logInfo(LOG_INFO_PREFIX + `buildRequest:`, request);
     return {
       method: 'POST',
       url: url,
@@ -205,36 +221,36 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: (serverResponse, bidRequests) => {
-    utils.logInfo(LOG_INFO_PREFIX + `interpretResponse`, serverResponse);
-    if (serverResponse == null || serverResponse.body == null || serverResponse.body === '' || !utils.isArray(serverResponse.body.seatbid) || !serverResponse.body.seatbid.length) {
+    logInfo(LOG_INFO_PREFIX + `interpretResponse`, serverResponse);
+    if (serverResponse == null || serverResponse.body == null || serverResponse.body === '' || !isArray(serverResponse.body.seatbid) || !serverResponse.body.seatbid.length) {
       return;
     }
     const returnedBids = [];
-    const muidn = utils.deepAccess(serverResponse.body, 'ext.muidn')
-    if (utils.isStr(muidn) && muidn.length > 0) {
+    const muidn = deepAccess(serverResponse.body, 'ext.muidn')
+    if (isStr(muidn) && muidn.length > 0) {
       setLocalStorageSafely('mgMuidn', muidn)
     }
     serverResponse.body.seatbid.forEach((bids) => {
       bids.bid.forEach((bid) => {
         const pbid = prebidBid(bid, serverResponse.body.cur);
-        if (pbid.mediaType === NATIVE && utils.isEmpty(pbid.native)) {
+        if (pbid.mediaType === NATIVE && isEmpty(pbid.native)) {
           return;
         }
         returnedBids.push(pbid);
       })
     });
 
-    utils.logInfo(LOG_INFO_PREFIX + `interpretedResponse`, returnedBids);
+    logInfo(LOG_INFO_PREFIX + `interpretedResponse`, returnedBids);
     return returnedBids;
   },
   onBidWon: (bid) => {
-    const cpm = utils.deepAccess(bid, 'adserverTargeting.hb_pb') || '';
-    if (utils.isStr(bid.nurl) && bid.nurl !== '') {
+    const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
+    if (isStr(bid.nurl) && bid.nurl !== '') {
       bid.nurl = bid.nurl.replace(
         /\${AUCTION_PRICE}/,
         cpm
       );
-      utils.triggerPixel(bid.nurl);
+      triggerPixel(bid.nurl);
     }
     if (bid.isBurl) {
       if (bid.mediaType === BANNER) {
@@ -247,13 +263,13 @@ export const spec = {
           /\${AUCTION_PRICE}/,
           cpm
         );
-        utils.triggerPixel(bid.burl);
+        triggerPixel(bid.burl);
       }
     }
-    utils.logInfo(LOG_INFO_PREFIX + `onBidWon`);
+    logInfo(LOG_INFO_PREFIX + `onBidWon`);
   },
   getUserSyncs: (syncOptions, serverResponses) => {
-    utils.logInfo(LOG_INFO_PREFIX + `getUserSyncs`);
+    logInfo(LOG_INFO_PREFIX + `getUserSyncs`);
   }
 };
 
@@ -261,7 +277,7 @@ registerBidder(spec);
 
 function setOnAny(collection, key) {
   for (let i = 0, result; i < collection.length; i++) {
-    result = utils.deepAccess(collection[i], key);
+    result = deepAccess(collection[i], key);
     if (result) {
       return result;
     }
@@ -274,7 +290,7 @@ function setOnAny(collection, key) {
  * @return Bid
  */
 function prebidBid(serverBid, cur) {
-  if (!utils.isStr(cur) || cur === '') {
+  if (!isStr(cur) || cur === '') {
     cur = DEFAULT_CUR;
   }
   const bid = {
@@ -291,7 +307,8 @@ function prebidBid(serverBid, cur) {
     ttl: serverBid.ttl || 300,
     nurl: serverBid.nurl || '',
     burl: serverBid.burl || '',
-    isBurl: utils.isStr(serverBid.burl) && serverBid.burl.length > 0,
+    isBurl: isStr(serverBid.burl) && serverBid.burl.length > 0,
+    meta: { advertiserDomains: (isArray(serverBid.adomain) && serverBid.adomain.length > 0 ? serverBid.adomain : []) },
   };
   setMediaType(serverBid, bid);
   switch (bid.mediaType) {
@@ -305,7 +322,7 @@ function prebidBid(serverBid, cur) {
 }
 
 function setMediaType(bid, newBid) {
-  if (utils.deepAccess(bid, 'ext.crtype') === 'native') {
+  if (deepAccess(bid, 'ext.crtype') === 'native') {
     newBid.mediaType = NATIVE;
   } else {
     newBid.mediaType = BANNER;
@@ -359,7 +376,7 @@ function setLocalStorageSafely(key, val) {
 }
 
 function createBannerRequest(bid) {
-  const sizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes');
+  const sizes = deepAccess(bid, 'mediaTypes.banner.sizes');
   let format = [];
   if (sizes.length > 1) {
     for (let f = 0; f < sizes.length; f++) {
@@ -375,6 +392,10 @@ function createBannerRequest(bid) {
   if (format.length) {
     r.format = format
   }
+  const pos = deepAccess(bid, 'mediaTypes.banner.pos') || 0
+  if (pos) {
+    r.pos = pos
+  }
   return r
 }
 
@@ -398,15 +419,15 @@ function createNativeRequest(params) {
             };
             break;
           case NATIVE_ASSETS.IMAGE.KEY:
-            const wmin = params[key].wmin || params[key].minimumWidth || (utils.isArray(params[key].minsizes) && params[key].minsizes.length > 0 ? params[key].minsizes[0] : 0);
-            const hmin = params[key].hmin || params[key].minimumHeight || (utils.isArray(params[key].minsizes) && params[key].minsizes.length > 1 ? params[key].minsizes[1] : 0);
+            const wmin = params[key].wmin || params[key].minimumWidth || (isArray(params[key].minsizes) && params[key].minsizes.length > 0 ? params[key].minsizes[0] : 0);
+            const hmin = params[key].hmin || params[key].minimumHeight || (isArray(params[key].minsizes) && params[key].minsizes.length > 1 ? params[key].minsizes[1] : 0);
             assetObj = {
               id: NATIVE_ASSETS.IMAGE.ID,
               required: params[key].required ? 1 : 0,
               img: {
                 type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
-                w: params[key].w || params[key].width || (utils.isArray(params[key].sizes) && params[key].sizes.length > 0 ? params[key].sizes[0] : 0),
-                h: params[key].h || params[key].height || (utils.isArray(params[key].sizes) && params[key].sizes.length > 1 ? params[key].sizes[1] : 0),
+                w: params[key].w || params[key].width || (isArray(params[key].sizes) && params[key].sizes.length > 0 ? params[key].sizes[0] : 0),
+                h: params[key].h || params[key].height || (isArray(params[key].sizes) && params[key].sizes.length > 1 ? params[key].sizes[1] : 0),
                 mimes: params[key].mimes,
                 ext: params[key].ext,
               }
@@ -430,8 +451,8 @@ function createNativeRequest(params) {
               required: params[key].required ? 1 : 0,
               img: {
                 type: NATIVE_ASSET_IMAGE_TYPE.ICON,
-                w: params[key].w || params[key].width || (utils.isArray(params[key].sizes) && params[key].sizes.length > 0 ? params[key].sizes[0] : 0),
-                h: params[key].h || params[key].height || (utils.isArray(params[key].sizes) && params[key].sizes.length > 0 ? params[key].sizes[1] : 0),
+                w: params[key].w || params[key].width || (isArray(params[key].sizes) && params[key].sizes.length > 0 ? params[key].sizes[0] : 0),
+                h: params[key].h || params[key].height || (isArray(params[key].sizes) && params[key].sizes.length > 0 ? params[key].sizes[1] : 0),
               }
             };
             if (!assetObj.img.w) {
@@ -476,7 +497,7 @@ function createNativeRequest(params) {
         break;
       } else {
         if (ele.id === 4 && nativeRequestObject.assets[i].id === 11) {
-          if (utils.deepAccess(nativeRequestObject.assets[i], 'data.type') === ele.data.type) {
+          if (deepAccess(nativeRequestObject.assets[i], 'data.type') === ele.data.type) {
             presentrequiredAssetCount++;
             break;
           }
@@ -508,7 +529,7 @@ function parseNativeResponse(bid, newBid) {
     try {
       adm = JSON.parse(bid.adm);
     } catch (ex) {
-      utils.logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native response for ad response: ' + newBid.adm);
+      logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native response for ad response: ' + newBid.adm);
       return;
     }
     if (adm && adm.native && adm.native.assets && adm.native.assets.length > 0) {
@@ -574,3 +595,35 @@ function pageInfo() {
     timeOffset: t.getTimezoneOffset()
   };
 }
+
+/**
+ * Get the floor price from bid.params for backward compatibility.
+ * If not found, then check floor module.
+ * @param bid A valid bid object
+ * @returns {*|number} floor price
+ */
+function getBidFloor(bid, cur) {
+  let bidFloor = getBidIdParameter('bidfloor', bid.params) || getBidIdParameter('bidFloor', bid.params) || 0;
+  const reqCur = cur
+
+  if (!bidFloor && isFn(bid.getFloor)) {
+    const floorObj = bid.getFloor({
+      currency: '*',
+      mediaType: '*',
+      size: '*'
+    });
+    if (isPlainObject(floorObj) && isNumber(floorObj.floor)) {
+      if (!floorObj.currency && reqCur !== DEFAULT_CUR) {
+        floorObj.currency = DEFAULT_CUR
+      }
+      if (floorObj.currency && reqCur !== floorObj.currency) {
+        cur = floorObj.currency
+      }
+      bidFloor = floorObj.floor;
+    }
+  }
+  if (reqCur === cur) {
+    cur = ''
+  }
+  return {floor: bidFloor, cur: cur}
+}
diff --git a/modules/mgidRtdProvider.js b/modules/mgidRtdProvider.js
new file mode 100644
index 00000000000..f30f14ea528
--- /dev/null
+++ b/modules/mgidRtdProvider.js
@@ -0,0 +1,190 @@
+import { submodule } from '../src/hook.js';
+import {ajax} from '../src/ajax.js';
+import {deepAccess, logError, logInfo, mergeDeep} from '../src/utils.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'mgid';
+const MGID_RTD_API_URL = 'https://servicer.mgid.com/sda';
+const MGUID_LOCAL_STORAGE_KEY = 'mguid';
+const ORTB2_NAME = 'www.mgid.com'
+
+const GVLID = 358;
+/** @type {?Object} */
+export const storage = getStorageManager({
+  gvlid: GVLID,
+  moduleName: SUBMODULE_NAME
+});
+
+function init(moduleConfig) {
+  if (!moduleConfig?.params?.clientSiteId) {
+    logError('Mgid clientSiteId is not set!');
+    return false;
+  }
+  return true;
+}
+
+function getBidRequestData(reqBidsConfigObj, onDone, moduleConfig, userConsent) {
+  let mguid;
+  try {
+    mguid = storage.getDataFromLocalStorage(MGUID_LOCAL_STORAGE_KEY);
+  } catch (e) {
+    logInfo(`Can't get mguid from localstorage`);
+  }
+
+  const params = [
+    {
+      name: 'gdprApplies',
+      data: typeof userConsent?.gdpr?.gdprApplies !== 'undefined' ? userConsent?.gdpr?.gdprApplies + '' : undefined,
+    },
+    {
+      name: 'consentData',
+      data: userConsent?.gdpr?.consentString,
+    },
+    {
+      name: 'uspString',
+      data: userConsent?.usp,
+    },
+    {
+      name: 'cxurl',
+      data: encodeURIComponent(getContextUrl()),
+    },
+    {
+      name: 'muid',
+      data: mguid,
+    },
+    {
+      name: 'clientSiteId',
+      data: moduleConfig?.params?.clientSiteId,
+    },
+    {
+      name: 'cxlang',
+      data: deepAccess(reqBidsConfigObj.ortb2Fragments.global, 'site.content.language'),
+    },
+  ];
+
+  const url = MGID_RTD_API_URL + '?' + params.filter((p) => p.data).map((p) => p.name + '=' + p.data).join('&');
+
+  let isDone = false;
+
+  ajax(url, {
+    success: (response, req) => {
+      if (req.status === 200) {
+        try {
+          const data = JSON.parse(response);
+          const ortb2 = reqBidsConfigObj?.ortb2Fragments?.global || {};
+
+          mergeDeep(ortb2, getDataForMerge(data));
+
+          if (data?.muid) {
+            try {
+              mguid = storage.setDataInLocalStorage(MGUID_LOCAL_STORAGE_KEY, data.muid);
+            } catch (e) {
+              logInfo(`Can't set mguid to localstorage`);
+            }
+          }
+
+          onDone();
+          isDone = true;
+        } catch (e) {
+          onDone();
+          isDone = true;
+
+          logError('Unable to parse Mgid RTD data', e);
+        }
+      } else {
+        onDone();
+        isDone = true;
+
+        logError('Mgid RTD wrong response status');
+      }
+    },
+    error: () => {
+      onDone();
+      isDone = true;
+
+      logError('Unable to get Mgid RTD data');
+    }
+  },
+  null, {
+    method: 'GET',
+    withCredentials: false,
+  });
+
+  setTimeout(function () {
+    if (!isDone) {
+      onDone();
+      logInfo('Mgid RTD timeout');
+      isDone = true;
+    }
+  }, moduleConfig.params.timeout || 1000);
+}
+
+function getContextUrl() {
+  const refererInfo = getRefererInfo();
+
+  let resultUrl = refererInfo.canonicalUrl || refererInfo.topmostLocation;
+
+  const metaElements = document.getElementsByTagName('meta');
+  for (let i = 0; i < metaElements.length; i++) {
+    if (metaElements[i].getAttribute('property') === 'og:url') {
+      resultUrl = metaElements[i].content;
+    }
+  }
+
+  return resultUrl;
+}
+
+function getDataForMerge(responseData) {
+  let siteData = {
+    name: ORTB2_NAME
+  };
+  let userData = {
+    name: ORTB2_NAME
+  };
+
+  if (responseData.siteSegments) {
+    siteData.segment = responseData.siteSegments.map((segmentId) => ({ id: segmentId }));
+  }
+  if (responseData.siteSegtax) {
+    siteData.ext = {
+      segtax: responseData.siteSegtax
+    }
+  }
+
+  if (responseData.userSegments) {
+    userData.segment = responseData.userSegments.map((segmentId) => ({ id: segmentId }));
+  }
+  if (responseData.userSegtax) {
+    userData.ext = {
+      segtax: responseData.userSegtax
+    }
+  }
+
+  let result = {};
+  if (siteData.segment || siteData.ext) {
+    result.site = {
+      content: {
+        data: [siteData],
+      }
+    }
+  }
+
+  if (userData.segment || userData.ext) {
+    result.user = {
+      data: [userData],
+    }
+  }
+
+  return result;
+}
+
+/** @type {RtdSubmodule} */
+export const mgidSubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  getBidRequestData: getBidRequestData,
+};
+
+submodule(MODULE_NAME, mgidSubmodule);
diff --git a/modules/mgidRtdProvider.md b/modules/mgidRtdProvider.md
new file mode 100644
index 00000000000..58d4564e14e
--- /dev/null
+++ b/modules/mgidRtdProvider.md
@@ -0,0 +1,51 @@
+# Overview
+
+```
+Module Name: Mgid RTD Provider
+Module Type: RTD Provider
+Maintainer: prebid@mgid.com
+```
+
+# Description
+
+Mgid RTD module allows you to enrich bid data with contextual and audience signals, based on IAB taxonomies.
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders` object.
+
+{: .table .table-bordered .table-striped }
+| Name       | Scope    | Description                            | Example       | Type     |
+|------------|----------|----------------------------------------|---------------|----------|
+| `name `     | required | Real time data module name | `'mgid'`   | `string` |
+| `params`      | required |  | | `Object` |
+| `params.clientSiteId`      | required | The client site id provided by Mgid. | `'123456'` | `string` |
+| `params.timeout`      | optional | Maximum amount of milliseconds allowed for module to finish working | `1000` | `number` |
+
+#### Example
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'mgid',
+            params: {
+              clientSiteId: '123456'
+            }
+        }]
+    }
+});
+```
+
+## Integration
+To install the module, follow these instructions:
+
+#### Step 1: Prepare the base Prebid file
+
+- Option 1: Use Prebid [Download](/download.html) page to build the prebid package. Ensure that you do check *Mgid Realtime Module* module
+
+- Option 2: From the command line, run `gulp build --modules=mgidRtdProvider,...`
+
+#### Step 2: Set configuration
+
+Enable Mgid Real Time Module using `pbjs.setConfig`. Example is provided in Configuration section.
diff --git a/modules/microadBidAdapter.js b/modules/microadBidAdapter.js
index 9611946b495..13aea0f3f77 100644
--- a/modules/microadBidAdapter.js
+++ b/modules/microadBidAdapter.js
@@ -1,5 +1,8 @@
+import { deepAccess, isArray, isEmpty, isStr } from '../src/utils.js';
+import { find } from '../src/polyfill.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'microad';
 
@@ -21,6 +24,19 @@ const BANNER_CODE = 1;
 const NATIVE_CODE = 2;
 const VIDEO_CODE = 4;
 
+const AUDIENCE_IDS = [
+  {type: 6, bidKey: 'userId.imuid', source: 'intimatemerger.com'},
+  {type: 8, bidKey: 'userId.id5id.uid', source: 'id5-sync.com'},
+  {type: 9, bidKey: 'userId.tdid', source: 'adserver.org'},
+  {type: 10, bidKey: 'userId.novatiq.snowflake', source: 'novatiq.com'},
+  {type: 11, bidKey: 'userId.parrableId.eid', source: 'parrable.com'},
+  {type: 12, bidKey: 'userId.dacId.id', source: 'dac.co.jp'},
+  {type: 13, bidKey: 'userId.idl_env', source: 'liveramp.com'},
+  {type: 14, bidKey: 'userId.criteoId', source: 'criteo.com'},
+  {type: 15, bidKey: 'userId.pubcid', source: 'pubcid.org'},
+  {type: 17, bidKey: 'userId.uid2.id', source: 'uidapi.com'}
+];
+
 function createCBT() {
   const randomValue = Math.floor(Math.random() * Math.pow(10, 18)).toString(16);
   const date = new Date().getTime().toString(16);
@@ -44,14 +60,18 @@ export const spec = {
     return !!(bid && bid.params && bid.params.spot && bid.mediaTypes && (bid.mediaTypes.banner || bid.mediaTypes.native || bid.mediaTypes.video));
   },
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const requests = [];
 
     validBidRequests.forEach(bid => {
       const bidParams = bid.params;
       const params = {
         spot: bidParams.spot,
-        url: bidderRequest.refererInfo.canonicalUrl || window.location.href,
-        referrer: bidderRequest.refererInfo.referer,
+        // TODO: are these the right refererInfo values - does the fallback make sense here?
+        url: bidderRequest.refererInfo.page || window.location.href,
+        referrer: bidderRequest.refererInfo.ref,
         bid_id: bid.bidId,
         transaction_id: bid.transactionId,
         media_types: convertMediaTypes(bid),
@@ -81,6 +101,28 @@ export const spec = {
         }
       }
 
+      const aidsParams = []
+      const userIdAsEids = bid.userIdAsEids;
+      AUDIENCE_IDS.forEach((audienceId) => {
+        const bidAudienceId = deepAccess(bid, audienceId.bidKey);
+        if (!isEmpty(bidAudienceId) && isStr(bidAudienceId)) {
+          const aidParam = { type: audienceId.type, id: bidAudienceId };
+          // Set ext
+          if (isArray(userIdAsEids)) {
+            const targetEid = find(userIdAsEids, (eid) => eid.source === audienceId.source) || {};
+            if (!isEmpty(deepAccess(targetEid, 'uids.0.ext'))) {
+              aidParam.ext = targetEid.uids[0].ext;
+            }
+          }
+          aidsParams.push(aidParam);
+          // Set Ramp ID
+          if (audienceId.type === 13) params['idl_env'] = bidAudienceId;
+        }
+      })
+      if (aidsParams.length > 0) {
+        params['aids'] = JSON.stringify(aidsParams)
+      }
+
       requests.push({
         method: 'GET',
         url: ENDPOINT_URLS[ENVIRONMENT],
@@ -105,6 +147,7 @@ export const spec = {
         creativeId: body.creativeId,
         netRevenue: body.netRevenue,
         currency: body.currency,
+        meta: body.meta || { advertiserDomains: [] }
       };
 
       if (body.dealId) {
diff --git a/modules/minutemediaBidAdapter.js b/modules/minutemediaBidAdapter.js
new file mode 100644
index 00000000000..d953558bf31
--- /dev/null
+++ b/modules/minutemediaBidAdapter.js
@@ -0,0 +1,432 @@
+import { logWarn, logInfo, isArray, isFn, deepAccess, isEmpty, contains, timestamp, getBidIdParameter, triggerPixel, isInteger } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const BIDDER_CODE = 'minutemedia';
+const ADAPTER_VERSION = '6.0.0';
+const TTL = 360;
+const CURRENCY = 'USD';
+const SELLER_ENDPOINT = 'https://hb.minutemedia-prebid.com/';
+const MODES = {
+  PRODUCTION: 'hb-mm-multi',
+  TEST: 'hb-multi-mm-test'
+}
+const SUPPORTED_SYNC_METHODS = {
+  IFRAME: 'iframe',
+  PIXEL: 'pixel'
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: 918,
+  version: ADAPTER_VERSION,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params) {
+      logWarn('no params have been set to MinuteMedia adapter');
+      return false;
+    }
+
+    if (!bidRequest.params.org) {
+      logWarn('org is a mandatory param for MinuteMedia adapter');
+      return false;
+    }
+
+    return true;
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const combinedRequestsObject = {};
+
+    // use data from the first bid, to create the general params for all bids
+    const generalObject = validBidRequests[0];
+    const testMode = generalObject.params.testMode;
+
+    combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest);
+    combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
+
+    return {
+      method: 'POST',
+      url: getEndpoint(testMode),
+      data: combinedRequestsObject
+    }
+  },
+  interpretResponse: function ({body}) {
+    const bidResponses = [];
+
+    if (body.bids) {
+      body.bids.forEach(adUnit => {
+        const bidResponse = {
+          requestId: adUnit.requestId,
+          cpm: adUnit.cpm,
+          currency: adUnit.currency || CURRENCY,
+          width: adUnit.width,
+          height: adUnit.height,
+          ttl: adUnit.ttl || TTL,
+          creativeId: adUnit.requestId,
+          netRevenue: adUnit.netRevenue || true,
+          nurl: adUnit.nurl,
+          mediaType: adUnit.mediaType,
+          meta: {
+            mediaType: adUnit.mediaType
+          }
+        };
+
+        if (adUnit.mediaType === VIDEO) {
+          bidResponse.vastXml = adUnit.vastXml;
+        } else if (adUnit.mediaType === BANNER) {
+          bidResponse.ad = adUnit.ad;
+        }
+
+        if (adUnit.adomain && adUnit.adomain.length) {
+          bidResponse.meta.advertiserDomains = adUnit.adomain;
+        }
+
+        bidResponses.push(bidResponse);
+      });
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.iframeEnabled && response.body.params.userSyncURL) {
+        syncs.push({
+          type: 'iframe',
+          url: response.body.params.userSyncURL
+        });
+      }
+      if (syncOptions.pixelEnabled && isArray(response.body.params.userSyncPixels)) {
+        const pixels = response.body.params.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        })
+        syncs.push(...pixels)
+      }
+    }
+    return syncs;
+  },
+  onBidWon: function (bid) {
+    if (bid == null) {
+      return;
+    }
+
+    logInfo('onBidWon:', bid);
+    if (bid.hasOwnProperty('nurl') && bid.nurl.length > 0) {
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+registerBidder(spec);
+
+/**
+ * Get floor price
+ * @param bid {bid}
+ * @returns {Number}
+ */
+function getFloor(bid, mediaType) {
+  if (!isFn(bid.getFloor)) {
+    return 0;
+  }
+  let floorResult = bid.getFloor({
+    currency: CURRENCY,
+    mediaType: mediaType,
+    size: '*'
+  });
+  return floorResult.currency === CURRENCY && floorResult.floor ? floorResult.floor : 0;
+}
+
+/**
+ * Get the the ad sizes array from the bid
+ * @param bid {bid}
+ * @returns {Array}
+ */
+function getSizesArray(bid, mediaType) {
+  let sizesArray = []
+
+  if (deepAccess(bid, `mediaTypes.${mediaType}.sizes`)) {
+    sizesArray = bid.mediaTypes[mediaType].sizes;
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizesArray = bid.sizes;
+  }
+
+  return sizesArray;
+}
+
+/**
+ * Get schain string value
+ * @param schainObject {Object}
+ * @returns {string}
+ */
+function getSupplyChain(schainObject) {
+  if (isEmpty(schainObject)) {
+    return '';
+  }
+  let scStr = `${schainObject.ver},${schainObject.complete}`;
+  schainObject.nodes.forEach((node) => {
+    scStr += '!';
+    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
+    scStr += `${node.hp ? encodeURIComponent(node.hp) : ''},`;
+    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
+  });
+  return scStr;
+}
+
+/**
+ * Get encoded node value
+ * @param val {string}
+ * @returns {string}
+ */
+function getEncodedValIfNotEmpty(val) {
+  return !isEmpty(val) ? encodeURIComponent(val) : '';
+}
+
+/**
+ * Get preferred user-sync method based on publisher configuration
+ * @param bidderCode {string}
+ * @returns {string}
+ */
+function getAllowedSyncMethod(filterSettings, bidderCode) {
+  const iframeConfigsToCheck = ['all', 'iframe'];
+  const pixelConfigToCheck = 'image';
+  if (filterSettings && iframeConfigsToCheck.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
+    return SUPPORTED_SYNC_METHODS.IFRAME;
+  }
+  if (!filterSettings || !filterSettings[pixelConfigToCheck] || isSyncMethodAllowed(filterSettings[pixelConfigToCheck], bidderCode)) {
+    return SUPPORTED_SYNC_METHODS.PIXEL;
+  }
+}
+
+/**
+ * Check if sync rule is supported
+ * @param syncRule {Object}
+ * @param bidderCode {string}
+ * @returns {boolean}
+ */
+function isSyncMethodAllowed(syncRule, bidderCode) {
+  if (!syncRule) {
+    return false;
+  }
+  const isInclude = syncRule.filter === 'include';
+  const bidders = isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
+  return isInclude && contains(bidders, bidderCode);
+}
+
+/**
+ * Get the seller endpoint
+ * @param testMode {boolean}
+ * @returns {string}
+ */
+function getEndpoint(testMode) {
+  return testMode
+    ? SELLER_ENDPOINT + MODES.TEST
+    : SELLER_ENDPOINT + MODES.PRODUCTION;
+}
+
+/**
+ * get device type
+ * @param uad {ua}
+ * @returns {string}
+ */
+function getDeviceType(ua) {
+  if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
+    .test(ua.toLowerCase())) {
+    return '5';
+  }
+  if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
+    .test(ua.toLowerCase())) {
+    return '4';
+  }
+  if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
+    .test(ua.toLowerCase())) {
+    return '3';
+  }
+  return '1';
+}
+
+function generateBidsParams(validBidRequests, bidderRequest) {
+  const bidsArray = [];
+
+  if (validBidRequests.length) {
+    validBidRequests.forEach(bid => {
+      bidsArray.push(generateBidParameters(bid, bidderRequest));
+    });
+  }
+
+  return bidsArray;
+}
+
+/**
+ * Generate bid specific parameters
+ * @param {bid} bid
+ * @param {bidderRequest} bidderRequest
+ * @returns {Object} bid specific params object
+ */
+function generateBidParameters(bid, bidderRequest) {
+  const {params} = bid;
+  const mediaType = isBanner(bid) ? BANNER : VIDEO;
+  const sizesArray = getSizesArray(bid, mediaType);
+
+  // fix floor price in case of NAN
+  if (isNaN(params.floorPrice)) {
+    params.floorPrice = 0;
+  }
+
+  const bidObject = {
+    mediaType,
+    adUnitCode: getBidIdParameter('adUnitCode', bid),
+    sizes: sizesArray,
+    floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
+    bidId: getBidIdParameter('bidId', bid),
+    loop: getBidIdParameter('bidderRequestsCount', bid),
+    bidderRequestId: getBidIdParameter('bidderRequestId', bid),
+    transactionId: getBidIdParameter('transactionId', bid),
+  };
+
+  const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
+  if (pos) {
+    bidObject.pos = pos;
+  }
+
+  const gpid = deepAccess(bid, `ortb2Imp.ext.gpid`);
+  if (gpid) {
+    bidObject.gpid = gpid;
+  }
+
+  const placementId = params.placementId || deepAccess(bid, `mediaTypes.${mediaType}.name`);
+  if (placementId) {
+    bidObject.placementId = placementId;
+  }
+
+  if (mediaType === VIDEO) {
+    const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
+    let playbackMethodValue;
+
+    // verify playbackMethod is of type integer array, or integer only.
+    if (Array.isArray(playbackMethod) && isInteger(playbackMethod[0])) {
+      // only the first playbackMethod in the array will be used, according to OpenRTB 2.5 recommendation
+      playbackMethodValue = playbackMethod[0];
+    } else if (isInteger(playbackMethod)) {
+      playbackMethodValue = playbackMethod;
+    }
+
+    if (playbackMethodValue) {
+      bidObject.playbackMethod = playbackMethodValue;
+    }
+
+    const placement = deepAccess(bid, `mediaTypes.video.placement`);
+    if (placement) {
+      bidObject.placement = placement;
+    }
+
+    const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
+    if (minDuration) {
+      bidObject.minDuration = minDuration;
+    }
+
+    const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
+    if (maxDuration) {
+      bidObject.maxDuration = maxDuration;
+    }
+
+    const skip = deepAccess(bid, `mediaTypes.video.skip`);
+    if (skip) {
+      bidObject.skip = skip;
+    }
+
+    const linearity = deepAccess(bid, `mediaTypes.video.linearity`);
+    if (linearity) {
+      bidObject.linearity = linearity;
+    }
+  }
+
+  return bidObject;
+}
+
+function isBanner(bid) {
+  return bid.mediaTypes && bid.mediaTypes.banner;
+}
+
+/**
+ * Generate params that are common between all bids
+ * @param {single bid object} generalObject
+ * @param {bidderRequest} bidderRequest
+ * @returns {object} the common params object
+ */
+function generateGeneralParams(generalObject, bidderRequest) {
+  const domain = window.location.hostname;
+  const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
+  const {bidderCode} = bidderRequest;
+  const generalBidParams = generalObject.params;
+  const timeout = config.getConfig('bidderTimeout');
+
+  // these params are snake_case instead of camelCase to allow backwards compatability on the server.
+  // in the future, these will be converted to camelCase to match our convention.
+  const generalParams = {
+    wrapper_type: 'prebidjs',
+    wrapper_vendor: '$$PREBID_GLOBAL$$',
+    wrapper_version: '$prebid.version$',
+    adapter_version: ADAPTER_VERSION,
+    auction_start: timestamp(),
+    publisher_id: generalBidParams.org,
+    publisher_name: domain,
+    site_domain: domain,
+    dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+    device_type: getDeviceType(navigator.userAgent),
+    ua: navigator.userAgent,
+    session_id: getBidIdParameter('auctionId', generalObject),
+    tmax: timeout
+  }
+
+  const userIdsParam = getBidIdParameter('userId', generalObject);
+  if (userIdsParam) {
+    generalParams.userIds = JSON.stringify(userIdsParam);
+  }
+
+  const ortb2Metadata = bidderRequest.ortb2 || {};
+  if (ortb2Metadata.site) {
+    generalParams.site_metadata = JSON.stringify(ortb2Metadata.site);
+  }
+  if (ortb2Metadata.user) {
+    generalParams.user_metadata = JSON.stringify(ortb2Metadata.user);
+  }
+
+  if (syncEnabled) {
+    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
+    if (allowedSyncMethod) {
+      generalParams.cs_method = allowedSyncMethod;
+    }
+  }
+
+  if (bidderRequest.uspConsent) {
+    generalParams.us_privacy = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+    generalParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    generalParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
+  if (generalBidParams.ifa) {
+    generalParams.ifa = generalBidParams.ifa;
+  }
+
+  if (generalObject.schain) {
+    generalParams.schain = getSupplyChain(generalObject.schain);
+  }
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    generalParams.referrer = deepAccess(bidderRequest, 'refererInfo.ref');
+    generalParams.page_url = deepAccess(bidderRequest, 'refererInfo.page') || window.location.href
+  }
+
+  return generalParams
+}
diff --git a/modules/minutemediaBidAdapter.md b/modules/minutemediaBidAdapter.md
new file mode 100644
index 00000000000..66b54adaf0e
--- /dev/null
+++ b/modules/minutemediaBidAdapter.md
@@ -0,0 +1,76 @@
+#Overview
+
+Module Name: MinuteMedia Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: hb@minutemedia.com
+
+
+# Description
+
+Module that connects to MinuteMedia's demand sources.
+
+The MinuteMedia adapter requires setup and approval from the MinuteMedia. Please reach out to hb@minutemedia.com to create an MinuteMedia account.
+
+The adapter supports Video(instream) & Banner.
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `org` | required | String |  MinuteMedia publisher Id provided by your MinuteMedia representative  | "1234567890abcdef12345678"
+| `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
+| `placementId` | optional | String |  A unique placement identifier  | "12345678"
+| `testMode` | optional | Boolean |  This activates the test mode  | false
+
+# Test Parameters
+```javascript
+var adUnits = [{
+        code: 'dfp-video-div',
+        sizes: [
+            [640, 480]
+        ],
+        mediaTypes: {
+            video: {
+                playerSize: [
+                    [640, 480]
+                ],
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'minutemedia',
+            params: {
+                org: '1234567890abcdef12345678', // Required
+                floorPrice: 2.00, // Optional
+                placementId: 'video-test', // Optional
+                testMode: false // Optional
+            }
+        }]
+    },
+    {
+        code: 'dfp-banner-div',
+        sizes: [
+            [640, 480]
+        ],
+        mediaTypes: {
+            banner: {
+                sizes: [
+                    [640, 480]
+                ]
+            }
+        },
+        bids: [{
+            bidder: 'minutemedia',
+            params: {
+                org: '1234567890abcdef12345678', // Required
+                floorPrice: 2.00, // Optional
+                placementId: 'banner-test', // Optional
+                testMode: false // Optional
+            }
+        }]
+    }
+];
+```
diff --git a/modules/missenaBidAdapter.js b/modules/missenaBidAdapter.js
new file mode 100644
index 00000000000..2ec9d39fc5d
--- /dev/null
+++ b/modules/missenaBidAdapter.js
@@ -0,0 +1,116 @@
+import { formatQS, logInfo } from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'missena';
+const ENDPOINT_URL = 'https://bid.missena.io/';
+
+export const spec = {
+  aliases: [BIDDER_CODE],
+  code: BIDDER_CODE,
+  gvlid: 687,
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return typeof bid == 'object' && !!bid.params.apiKey;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map((bidRequest) => {
+      const payload = {
+        request_id: bidRequest.bidId,
+        timeout: bidderRequest.timeout,
+      };
+
+      if (bidderRequest && bidderRequest.refererInfo) {
+        // TODO: is 'topmostLocation' the right value here?
+        payload.referer = bidderRequest.refererInfo.topmostLocation;
+        payload.referer_canonical = bidderRequest.refererInfo.canonicalUrl;
+      }
+
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        payload.consent_string = bidderRequest.gdprConsent.consentString;
+        payload.consent_required = bidderRequest.gdprConsent.gdprApplies;
+      }
+      const baseUrl = bidRequest.params.baseUrl || ENDPOINT_URL;
+      if (bidRequest.params.test) {
+        payload.test = bidRequest.params.test;
+      }
+      return {
+        method: 'POST',
+        url: baseUrl + '?' + formatQS({ t: bidRequest.params.apiKey }),
+        data: JSON.stringify(payload),
+      };
+    });
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = [];
+    const response = serverResponse.body;
+
+    if (response && !response.timeout && !!response.ad) {
+      bidResponses.push(response);
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: function (
+    syncOptions,
+    serverResponses,
+    gdprConsent,
+    uspConsent
+  ) {
+    if (!syncOptions.iframeEnabled) {
+      return [];
+    }
+
+    let gdprParams = '';
+    if (
+      gdprConsent &&
+      'gdprApplies' in gdprConsent &&
+      typeof gdprConsent.gdprApplies === 'boolean'
+    ) {
+      gdprParams = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${
+        gdprConsent.consentString
+      }`;
+    }
+    return [
+      { type: 'iframe', url: 'https://sync.missena.io/iframe' + gdprParams },
+    ];
+  },
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  onTimeout: function onTimeout(timeoutData) {
+    logInfo('Missena - Timeout from adapter', timeoutData);
+  },
+
+  /**
+   * Register bidder specific code, which@ will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    logInfo('Missena - Bid won', bid);
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/missenaBidAdapter.md b/modules/missenaBidAdapter.md
new file mode 100644
index 00000000000..d5fcacf04ab
--- /dev/null
+++ b/modules/missenaBidAdapter.md
@@ -0,0 +1,70 @@
+# Overview
+
+```
+Module Name:  Missena Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: jney@missena.com
+```
+
+## Introduction
+
+Connects to Missena for bids.
+
+**Note:** this adapter doesn't support SafeFrame.
+
+Useful resources:
+
+- [README](../README.md#Build)
+- [https://docs.prebid.org/dev-docs/bidder-adaptor.html](https://docs.prebid.org/dev-docs/bidder-adaptor.html)
+
+## Develop
+
+Setup the missena adapter in `integrationExamples/gpt/userId_example.html`.
+
+For example:
+
+```js
+const AD_UNIT_CODE = "test-div";
+const PUBLISHER_MISSENA_TOKEN = "PA-34745704";
+
+var adUnits = [
+  {
+    code: AD_UNIT_CODE,
+    mediaTypes: {
+      banner: {
+        sizes: [1, 1],
+      },
+    },
+    bids: [
+      {
+        bidder: "missena",
+        params: {
+          apiKey: PUBLISHER_MISSENA_TOKEN,
+        },
+      },
+    ],
+  },
+];
+```
+
+Then start the demo app:
+
+```shell
+gulp serve-fast --modules=missenaBidAdapter
+```
+
+And open [http://localhost:9999/integrationExamples/gpt/userId_example.html](http://localhost:9999/integrationExamples/gpt/userId_example.html)
+
+## Test
+
+```shell
+gulp test --file test/spec/modules/missenaBidAdapter_spec.js
+```
+
+Add the `--watch` option to re-run unit tests whenever the source code changes.
+
+## Build
+
+```shell
+gulp build --modules=missenaBidAdapter
+```
diff --git a/modules/mobfoxBidAdapter.js b/modules/mobfoxBidAdapter.js
deleted file mode 100644
index 7c356e71089..00000000000
--- a/modules/mobfoxBidAdapter.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const utils = require('../src/utils.js');
-const BIDDER_CODE = 'mobfox';
-const BID_REQUEST_BASE_URL = 'https://my.mobfox.com/request.php';
-const CPM_HEADER = 'X-Pricing-CPM';
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['mf'], // short code
-  isBidRequestValid: function (bid) {
-    return bid.params.s !== null && bid.params.s !== undefined;
-  },
-  buildRequests: function (validBidRequests) {
-    if (validBidRequests.length > 1) {
-      throw ('invalid number of valid bid requests, expected 1 element')
-    }
-
-    let bidParams = validBidRequests[0].params;
-    let bid = validBidRequests[0];
-
-    let params = {
-      // -------------------- Mandatory Parameters ------------------
-      rt: bidParams.rt || 'api-fetchip',
-      r_type: bidParams.r_type || 'banner',
-      r_resp: bidParams.r_resp || 'json', // string | vast20
-      //  i: bidParams.i || undefined , // string | 69.197.148.18
-      s: bidParams.s, // string | 80187188f458cfde788d961b6882fd53
-      u: bidParams.u || window.navigator.userAgent, // string
-
-      // ------------------- Global Parameters ----------------------
-      adspace_width: bidParams.adspace_width || bid.sizes[0][0], // integer | 320
-      adspace_height: bidParams.adspace_height || bid.sizes[0][1], // integer | 48
-      r_floor: bidParams.r_floor || undefined, // 0.8
-
-      o_andadvid: bidParams.o_andadvid || undefined, // 'c6292267-56ad-4326-965d-deef6fcd5er9'
-      longitude: bidParams.longitude || undefined, // 12.12
-      latitude: bidParams.latitude || undefined, // 280.12
-      demo_age: bidParams.demo_age || undefined, // 1978
-
-      // ------------------- banner / interstitial ----------------------
-      adspace_strict: bidParams.adspace_strict || undefined,
-
-      // ------------------- interstitial / video ----------------------
-      imp_instl: bidParams.imp_instl || undefined, // integer | 1
-
-      // ------------------- mraid ----------------------
-      c_mraid: bidParams.c_mraid || undefined, // integer | 1
-
-      // ------------------- video ----------------------
-      v_dur_min: bidParams.v_dur_min || undefined, // integer | 0
-      v_dur_max: bidParams.v_dur_max || undefined, // integer | 999
-      v_autoplay: bidParams.v_autoplay || undefined, // integer | 1
-      v_startmute: bidParams.v_startmute || undefined, // integer | 0
-      v_rewarded: bidParams.v_rewarded || undefined, // integer | 0
-      v_api: bidParams.v_api || undefined, // string | vpaid20
-      n_ver: bidParams.n_ver || undefined, //
-      n_adunit: bidParams.n_adunit || undefined, //
-      n_layout: bidParams.n_layout || undefined, //
-      n_context: bidParams.n_context || undefined, //
-      n_plcmttype: bidParams.n_plcmttype || undefined, //
-      n_img_icon_req: bidParams.n_img_icon_req || undefined, // boolean0
-      n_img_icon_size: bidParams.n_img_icon_size || undefined, // string80
-      n_img_large_req: bidParams.n_img_large_req || undefined, // boolean0
-      n_img_large_w: bidParams.n_img_large_w || undefined, // integer1200
-      n_img_large_h: bidParams.n_img_large_h || undefined, // integer627
-      n_title_req: bidParams.n_title_req || undefined, // boolean0
-      n_title_len: bidParams.n_title_len || undefined, // string25
-      n_desc_req: bidParams.n_desc_req || undefined, // boolean0
-      n_desc_len: bidParams.n_desc_len || undefined, // string140
-      n_rating_req: bidParams.n_rating_req || undefined
-    };
-
-    let payloadString = buildPayloadString(params);
-
-    return {
-      method: 'GET',
-      url: BID_REQUEST_BASE_URL,
-      data: payloadString,
-      requestId: bid.bidId
-    };
-  },
-  interpretResponse: function (serverResponse, bidRequest) {
-    const bidResponses = [];
-    let serverResponseBody = serverResponse.body;
-
-    if (!serverResponseBody || serverResponseBody.error) {
-      let errorMessage = `in response for ${BIDDER_CODE} adapter`;
-      if (serverResponseBody && serverResponseBody.error) {
-        errorMessage += `: ${serverResponseBody.error}`;
-      }
-      utils.logError(errorMessage);
-      return bidResponses;
-    }
-    try {
-      let serverResponseHeaders = serverResponse.headers;
-      let bidRequestData = bidRequest.data.split('&');
-      const bidResponse = {
-        requestId: bidRequest.requestId,
-        cpm: serverResponseHeaders.get(CPM_HEADER),
-        width: bidRequestData[5].split('=')[1],
-        height: bidRequestData[6].split('=')[1],
-        creativeId: bidRequestData[3].split('=')[1],
-        currency: 'USD',
-        netRevenue: true,
-        ttl: 360,
-        referrer: serverResponseBody.request.clickurl,
-        ad: serverResponseBody.request.htmlString
-      };
-      bidResponses.push(bidResponse);
-    } catch (e) {
-      throw 'could not build bid response: ' + e;
-    }
-    return bidResponses;
-  }
-};
-
-function buildPayloadString(params) {
-  for (let key in params) {
-    if (params.hasOwnProperty(key)) {
-      if (params[key] === undefined) {
-        delete params[key];
-      } else {
-        params[key] = encodeURIComponent(params[key]);
-      }
-    }
-  }
-
-  return utils._map(Object.keys(params), key => `${key}=${params[key]}`)
-    .join('&')
-}
-
-registerBidder(spec);
diff --git a/modules/mobfoxBidAdapter.md b/modules/mobfoxBidAdapter.md
deleted file mode 100644
index 31b60606d2f..00000000000
--- a/modules/mobfoxBidAdapter.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Overview
-
-```
-Module Name: Mobfox Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: solutions-team@matomy.com
-```
-
-# Description
-
-Module that connects to Mobfox's demand sources
-
-# Test Parameters
-```
-    var adUnits = [{
-                code: 'div-gpt-ad-1460505748561-0',
-                sizes: [[320, 480], [300, 250], [300,600]],
-    
-                // Replace this object to test a new Adapter!
-                bids: [{
-                    bidder: 'mobfox',
-                    params: {
-                        s: "267d72ac3f77a3f447b32cf7ebf20673", // required - The hash of your inventory to identify which app is making the request,
-                        imp_instl: 1 // optional - set to 1 if using interstitial otherwise delete or set to 0
-                    }
-                }]
-    
-            }];
-```
diff --git a/modules/mobfoxpbBidAdapter.js b/modules/mobfoxpbBidAdapter.js
new file mode 100644
index 00000000000..9ff50e2531f
--- /dev/null
+++ b/modules/mobfoxpbBidAdapter.js
@@ -0,0 +1,138 @@
+import { isFn, deepAccess, getWindowTop } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.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) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    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
new file mode 100644
index 00000000000..f434b2792a9
--- /dev/null
+++ b/modules/mobfoxpbBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: mobfox Bidder Adapter
+Module Type: mobfox Bidder Adapter
+Maintainer: platform@mobfox.com
+```
+
+# Description
+
+Module that connects to mobfox demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 'testBanner'
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 'testVideo'
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 'testNative'
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/mobsmartBidAdapter.js b/modules/mobsmartBidAdapter.js
deleted file mode 100644
index e5ff38ec69a..00000000000
--- a/modules/mobsmartBidAdapter.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-
-const BIDDER_CODE = 'mobsmart';
-const ENDPOINT = 'https://prebid.mobsmart.net/prebid/endpoint';
-
-export const spec = {
-  code: BIDDER_CODE,
-  isBidRequestValid: function(bid) {
-    if (bid.bidder !== BIDDER_CODE) {
-      return false;
-    }
-
-    return true;
-  },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    const timeout = config.getConfig('bidderTimeout');
-    const referrer = encodeURIComponent(bidderRequest.refererInfo.referer);
-
-    return validBidRequests.map(bidRequest => {
-      const adUnit = {
-        code: bidRequest.adUnitCode,
-        bids: {
-          bidder: bidRequest.bidder,
-          params: bidRequest.params
-        },
-        mediaTypes: bidRequest.mediaTypes
-      };
-
-      if (bidRequest.hasOwnProperty('sizes') && bidRequest.sizes.length > 0) {
-        adUnit.sizes = bidRequest.sizes;
-      }
-
-      const request = {
-        auctionId: bidRequest.auctionId,
-        requestId: bidRequest.bidId,
-        bidRequestsCount: bidRequest.bidRequestsCount,
-        bidderRequestId: bidRequest.bidderRequestId,
-        transactionId: bidRequest.transactionId,
-        referrer: referrer,
-        timeout: timeout,
-        adUnit: adUnit
-      };
-
-      if (bidRequest.userId && bidRequest.userId.pubcid) {
-        request.userId = {pubcid: bidRequest.userId.pubcid};
-      }
-
-      return {
-        method: 'POST',
-        url: ENDPOINT,
-        data: JSON.stringify(request)
-      }
-    });
-  },
-  interpretResponse: function(serverResponse) {
-    const bidResponses = [];
-
-    if (serverResponse.body) {
-      const response = serverResponse.body;
-      const bidResponse = {
-        requestId: response.requestId,
-        cpm: response.cpm,
-        width: response.width,
-        height: response.height,
-        creativeId: response.creativeId,
-        currency: response.currency,
-        netRevenue: response.netRevenue,
-        ttl: response.ttl,
-        ad: response.ad,
-      };
-      bidResponses.push(bidResponse);
-    }
-
-    return bidResponses;
-  },
-  getUserSyncs: function(syncOptions, serverResponses) {
-    let syncs = [];
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: 'https://tags.mobsmart.net/tags/iframe'
-      });
-    } else if (syncOptions.pixelEnabled) {
-      syncs.push({
-        type: 'image',
-        url: 'https://tags.mobsmart.net/tags/image'
-      });
-    }
-
-    return syncs;
-  }
-}
-registerBidder(spec);
diff --git a/modules/mobsmartBidAdapter.md b/modules/mobsmartBidAdapter.md
deleted file mode 100644
index 1240d6db494..00000000000
--- a/modules/mobsmartBidAdapter.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Overview
-
-```
-Module Name: Mobsmart Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: adx@kpis.jp
-```
-
-# Description
-
-Module that connects to Mobsmart demand sources to fetch bids.
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: 'test-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300, 250]],  // a display size
-                }
-            },
-            bids: [
-                {
-                    bidder: "mobsmart",
-                    params: {
-                        floorPrice: 100,
-                        currency: 'JPY'
-                    }
-                }
-            ]
-        },{
-            code: 'test-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[320, 50]],   // a mobile size
-                }
-            },
-            bids: [
-                {
-                    bidder: "mobsmart",
-                    params: {
-                        floorPrice: 90,
-                        currency: 'JPY'
-                    }
-                }
-            ]
-        }
-    ];
-```
diff --git a/modules/multibid/index.js b/modules/multibid/index.js
new file mode 100644
index 00000000000..df77a157bee
--- /dev/null
+++ b/modules/multibid/index.js
@@ -0,0 +1,250 @@
+/**
+ * This module adds Multibid support to prebid.js
+ * @module modules/multibid
+ */
+
+import {config} from '../../src/config.js';
+import {setupBeforeHookFnOnce, getHook} from '../../src/hook.js';
+import {
+  logWarn, deepAccess, getUniqueIdentifierStr, deepSetValue, groupBy
+} from '../../src/utils.js';
+import * as events from '../../src/events.js';
+import CONSTANTS from '../../src/constants.json';
+import {addBidderRequests} from '../../src/auction.js';
+import {getHighestCpmBidsFromBidPool, sortByDealAndPriceBucketOrCpm} from '../../src/targeting.js';
+import {PBS, registerOrtbProcessor, REQUEST} from '../../src/pbjsORTB.js';
+import {timedBidResponseHook} from '../../src/utils/perfMetrics.js';
+
+const MODULE_NAME = 'multibid';
+let hasMultibid = false;
+let multiConfig = {};
+let multibidUnits = {};
+
+// Storing this globally on init for easy reference to configuration
+config.getConfig(MODULE_NAME, conf => {
+  if (!Array.isArray(conf.multibid) || !conf.multibid.length || !validateMultibid(conf.multibid)) return;
+
+  resetMultiConfig();
+  hasMultibid = true;
+
+  conf.multibid.forEach(entry => {
+    if (entry.bidder) {
+      multiConfig[entry.bidder] = {
+        maxbids: entry.maxBids,
+        prefix: entry.targetBiddercodePrefix
+      }
+    } else {
+      entry.bidders.forEach(key => {
+        multiConfig[key] = {
+          maxbids: entry.maxBids,
+          prefix: entry.targetBiddercodePrefix
+        }
+      });
+    }
+  });
+});
+
+/**
+   * @summary validates multibid configuration entries
+   * @param {Object[]} multibid - example [{bidder: 'bidderA', maxbids: 2, prefix: 'bidA'}, {bidder: 'bidderB', maxbids: 2}]
+   * @return {Boolean}
+*/
+export function validateMultibid(conf) {
+  let check = true;
+  let duplicate = conf.filter(entry => {
+    // Check if entry.bidder is not defined or typeof string, filter entry and reset configuration
+    if ((!entry.bidder || typeof entry.bidder !== 'string') && (!entry.bidders || !Array.isArray(entry.bidders))) {
+      logWarn('Filtering multibid entry. Missing required bidder or bidders property.');
+      check = false;
+      return false;
+    }
+
+    return true;
+  }).map(entry => {
+    // Check if entry.maxbids is not defined, not typeof number, or less than 1, set maxbids to 1 and reset configuration
+    // Check if entry.maxbids is greater than 9, set maxbids to 9 and reset configuration
+    if (typeof entry.maxBids !== 'number' || entry.maxBids < 1 || entry.maxBids > 9) {
+      entry.maxBids = (typeof entry.maxBids !== 'number' || entry.maxBids < 1) ? 1 : 9;
+      check = false;
+    }
+
+    return entry;
+  });
+
+  if (!check) config.setConfig({multibid: duplicate});
+
+  return check;
+}
+
+/**
+   * @summary addBidderRequests before hook
+   * @param {Function} fn reference to original function (used by hook logic)
+   * @param {Object[]} array containing copy of each bidderRequest object
+*/
+export function adjustBidderRequestsHook(fn, bidderRequests) {
+  bidderRequests.map(bidRequest => {
+    // Loop through bidderRequests and check if bidderCode exists in multiconfig
+    // If true, add bidderRequest.bidLimit to bidder request
+    if (multiConfig[bidRequest.bidderCode]) {
+      bidRequest.bidLimit = multiConfig[bidRequest.bidderCode].maxbids
+    }
+    return bidRequest;
+  })
+
+  fn.call(this, bidderRequests);
+}
+
+/**
+   * @summary addBidResponse before hook
+   * @param {Function} fn reference to original function (used by hook logic)
+   * @param {String} ad unit code for bid
+   * @param {Object} bid object
+*/
+export const addBidResponseHook = timedBidResponseHook('multibid', function addBidResponseHook(fn, adUnitCode, bid, reject) {
+  let floor = deepAccess(bid, 'floorData.floorValue');
+
+  if (!config.getConfig('multibid')) resetMultiConfig();
+  // Checks if multiconfig exists and bid bidderCode exists within config and is an adpod bid
+  // Else checks if multiconfig exists and bid bidderCode exists within config
+  // Else continue with no modifications
+  if (hasMultibid && multiConfig[bid.bidderCode] && deepAccess(bid, 'video.context') === 'adpod') {
+    fn.call(this, adUnitCode, bid, reject);
+  } else if (hasMultibid && multiConfig[bid.bidderCode]) {
+    // Set property multibidPrefix on bid
+    if (multiConfig[bid.bidderCode].prefix) bid.multibidPrefix = multiConfig[bid.bidderCode].prefix;
+    bid.originalBidder = bid.bidderCode;
+    // Check if stored bids for auction include adUnitCode.bidder and max limit not reach for ad unit
+    if (deepAccess(multibidUnits, [adUnitCode, bid.bidderCode])) {
+      // Store request id under new property originalRequestId, create new unique bidId,
+      // and push bid into multibid stored bids for auction if max not reached and bid cpm above floor
+      if (!multibidUnits[adUnitCode][bid.bidderCode].maxReached && (!floor || floor <= bid.cpm)) {
+        bid.originalRequestId = bid.requestId;
+
+        bid.requestId = getUniqueIdentifierStr();
+        multibidUnits[adUnitCode][bid.bidderCode].ads.push(bid);
+
+        let length = multibidUnits[adUnitCode][bid.bidderCode].ads.length;
+
+        if (multiConfig[bid.bidderCode].prefix) bid.targetingBidder = multiConfig[bid.bidderCode].prefix + length;
+        if (length === multiConfig[bid.bidderCode].maxbids) multibidUnits[adUnitCode][bid.bidderCode].maxReached = true;
+
+        fn.call(this, adUnitCode, bid, reject);
+      } else {
+        logWarn(`Filtering multibid received from bidder ${bid.bidderCode}: ` + ((multibidUnits[adUnitCode][bid.bidderCode].maxReached) ? `Maximum bid limit reached for ad unit code ${adUnitCode}` : 'Bid cpm under floors value.'));
+      }
+    } else {
+      if (deepAccess(bid, 'floorData.floorValue')) deepSetValue(multibidUnits, [adUnitCode, bid.bidderCode], {floor: deepAccess(bid, 'floorData.floorValue')});
+
+      deepSetValue(multibidUnits, [adUnitCode, bid.bidderCode], {ads: [bid]});
+      if (multibidUnits[adUnitCode][bid.bidderCode].ads.length === multiConfig[bid.bidderCode].maxbids) multibidUnits[adUnitCode][bid.bidderCode].maxReached = true;
+
+      fn.call(this, adUnitCode, bid, reject);
+    }
+  } else {
+    fn.call(this, adUnitCode, bid, reject);
+  }
+});
+
+/**
+* A descending sort function that will sort the list of objects based on the following:
+*  - bids without dynamic aliases are sorted before bids with dynamic aliases
+*/
+export function sortByMultibid(a, b) {
+  if (a.bidder !== a.bidderCode && b.bidder === b.bidderCode) {
+    return 1;
+  }
+
+  if (a.bidder === a.bidderCode && b.bidder !== b.bidderCode) {
+    return -1;
+  }
+
+  return 0;
+}
+
+/**
+   * @summary getHighestCpmBidsFromBidPool before hook
+   * @param {Function} fn reference to original function (used by hook logic)
+   * @param {Object[]} array of objects containing all bids from bid pool
+   * @param {Function} function to reduce to only highest cpm value for each bidderCode
+   * @param {Number} adUnit bidder targeting limit, default set to 0
+   * @param {Boolean} default set to false, this hook modifies targeting and sets to true
+*/
+export function targetBidPoolHook(fn, bidsReceived, highestCpmCallback, adUnitBidLimit = 0, hasModified = false) {
+  if (!config.getConfig('multibid')) resetMultiConfig();
+  if (hasMultibid) {
+    const dealPrioritization = config.getConfig('sendBidsControl.dealPrioritization');
+    let modifiedBids = [];
+    let buckets = groupBy(bidsReceived, 'adUnitCode');
+    let bids = [].concat.apply([], Object.keys(buckets).reduce((result, slotId) => {
+      let bucketBids = [];
+      // Get bids and group by property originalBidder
+      let bidsByBidderName = groupBy(buckets[slotId], 'originalBidder');
+      let adjustedBids = [].concat.apply([], Object.keys(bidsByBidderName).map(key => {
+        // Reset all bidderCodes to original bidder values and sort by CPM
+        return bidsByBidderName[key].sort((bidA, bidB) => {
+          if (bidA.originalBidder && bidA.originalBidder !== bidA.bidderCode) bidA.bidderCode = bidA.originalBidder;
+          if (bidA.originalBidder && bidB.originalBidder !== bidB.bidderCode) bidB.bidderCode = bidB.originalBidder;
+          return bidA.cpm > bidB.cpm ? -1 : (bidA.cpm < bidB.cpm ? 1 : 0);
+        }).map((bid, index) => {
+          // For each bid (post CPM sort), set dynamic bidderCode using prefix and index if less than maxbid amount
+          if (deepAccess(multiConfig, `${bid.bidderCode}.prefix`) && index !== 0 && index < multiConfig[bid.bidderCode].maxbids) {
+            bid.bidderCode = multiConfig[bid.bidderCode].prefix + (index + 1);
+          }
+
+          return bid
+        })
+      }));
+      // Get adjustedBids by bidderCode and reduce using highestCpmCallback
+      let bidsByBidderCode = groupBy(adjustedBids, 'bidderCode');
+      Object.keys(bidsByBidderCode).forEach(key => bucketBids.push(bidsByBidderCode[key].reduce(highestCpmCallback)));
+      // if adUnitBidLimit is set, pass top N number bids
+      if (adUnitBidLimit > 0) {
+        bucketBids = dealPrioritization ? bucketBids.sort(sortByDealAndPriceBucketOrCpm(true)) : bucketBids.sort((a, b) => b.cpm - a.cpm);
+        bucketBids.sort(sortByMultibid);
+        modifiedBids.push(...bucketBids.slice(0, adUnitBidLimit));
+      } else {
+        modifiedBids.push(...bucketBids);
+      }
+
+      return [].concat.apply([], modifiedBids);
+    }, []));
+
+    fn.call(this, bids, highestCpmCallback, adUnitBidLimit, true);
+  } else {
+    fn.call(this, bidsReceived, highestCpmCallback, adUnitBidLimit);
+  }
+}
+
+/**
+* Resets globally stored multibid configuration
+*/
+export const resetMultiConfig = () => { hasMultibid = false; multiConfig = {}; };
+
+/**
+* Resets globally stored multibid ad unit bids
+*/
+export const resetMultibidUnits = () => multibidUnits = {};
+
+/**
+* Set up hooks on init
+*/
+function init() {
+  // TODO: does this reset logic make sense - what about simultaneous auctions?
+  events.on(CONSTANTS.EVENTS.AUCTION_INIT, resetMultibidUnits);
+  setupBeforeHookFnOnce(addBidderRequests, adjustBidderRequestsHook);
+  getHook('addBidResponse').before(addBidResponseHook, 3);
+  setupBeforeHookFnOnce(getHighestCpmBidsFromBidPool, targetBidPoolHook);
+}
+
+init();
+
+export function setOrtbExtPrebidMultibid(ortbRequest) {
+  const multibid = config.getConfig('multibid');
+  if (multibid) {
+    deepSetValue(ortbRequest, 'ext.prebid.multibid', multibid.map(o =>
+      Object.fromEntries(Object.entries(o).map(([k, v]) => [k.toLowerCase(), v])))
+    )
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'extPrebidMultibid', fn: setOrtbExtPrebidMultibid, dialects: [PBS]});
diff --git a/modules/multibid/index.md b/modules/multibid/index.md
new file mode 100644
index 00000000000..a431d9b7960
--- /dev/null
+++ b/modules/multibid/index.md
@@ -0,0 +1,40 @@
+# Overview
+
+Module Name: multibid
+
+Purpose: To expand the number of key value pairs going to the ad server in the normal Prebid way by establishing the concept of a "dynamic alias" -- a bidder code that exists only on the response, not in the adunit. 
+
+
+# Description
+Allowing a single bidder to multi-bid into an auction has several use cases:
+
+1. allows a bidder to provide both outstream and banner
+2. supports the video VAST fallback scenario
+3. allows one bid to be blocked in the ad server and the second one still considered
+4. add extra high-value bids to the cache for future refreshes
+
+
+# Example of using config
+```
+    pbjs.setConfig({
+        multibid: [{
+            bidder: "bidderA",
+            maxBids: 3,
+            targetBiddercodePrefix: "bidA"
+        },{
+            bidder: "bidderB",
+            maxBids: 3,
+            targetBiddercodePrefix: "bidB"
+        },{
+            bidder: "bidderC",
+            maxBids: 3
+        },{
+            bidders: ["bidderD", "bidderE"],
+            maxBids: 2
+        }]
+    });
+```
+
+# Please Note:
+- 
+
diff --git a/modules/mwOpenLinkIdSystem.js b/modules/mwOpenLinkIdSystem.js
new file mode 100644
index 00000000000..552223fa73c
--- /dev/null
+++ b/modules/mwOpenLinkIdSystem.js
@@ -0,0 +1,142 @@
+/**
+ * This module adds MediaWallah OpenLink to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/mwOpenLinkIdSystem
+ * @requires module:modules/userId
+ */
+
+import { timestamp, logError, deepClone, generateUUID, isPlainObject } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const openLinkID = {
+  name: 'mwol',
+  cookie_expiration: (86400 * 1000 * 365 * 1) // 1 year
+}
+
+const storage = getStorageManager();
+
+function getExpirationDate() {
+  return (new Date(timestamp() + openLinkID.cookie_expiration)).toGMTString();
+}
+
+function isValidConfig(configParams) {
+  if (!configParams) {
+    logError('User ID - mwOlId submodule requires configParams');
+    return false;
+  }
+  if (!configParams.accountId) {
+    logError('User ID - mwOlId submodule requires accountId to be defined');
+    return false;
+  }
+  if (!configParams.partnerId) {
+    logError('User ID - mwOlId submodule requires partnerId to be defined');
+    return false;
+  }
+  return true;
+}
+
+function deserializeMwOlId(mwOlIdStr) {
+  const mwOlId = {};
+  const mwOlIdArr = mwOlIdStr.split(',');
+
+  mwOlIdArr.forEach(function(value) {
+    const pair = value.split(':');
+    // unpack a value of 1 as true
+    mwOlId[pair[0]] = +pair[1] === 1 ? true : pair[1];
+  });
+
+  return mwOlId;
+}
+
+function serializeMwOlId(mwOlId) {
+  let components = [];
+
+  if (mwOlId.eid) {
+    components.push('eid:' + mwOlId.eid);
+  }
+  if (mwOlId.ibaOptout) {
+    components.push('ibaOptout:1');
+  }
+  if (mwOlId.ccpaOptout) {
+    components.push('ccpaOptout:1');
+  }
+
+  return components.join(',');
+}
+
+function readCookie(name) {
+  if (!name) name = openLinkID.name;
+  const mwOlIdStr = storage.getCookie(name);
+  if (mwOlIdStr) {
+    return deserializeMwOlId(decodeURIComponent(mwOlIdStr));
+  }
+  return null;
+}
+
+function writeCookie(mwOlId) {
+  if (mwOlId) {
+    const mwOlIdStr = encodeURIComponent(serializeMwOlId(mwOlId));
+    storage.setCookie(openLinkID.name, mwOlIdStr, getExpirationDate(), 'lax');
+  }
+}
+
+function register(configParams, olid) {
+  const { accountId, partnerId, uid } = configParams;
+  const url = 'https://ol.mediawallahscript.com/?account_id=' + accountId +
+            '&partner_id=' + partnerId +
+            '&uid=' + uid +
+            '&olid=' + olid +
+            '&cb=' + Math.random()
+            ;
+  ajax(url);
+}
+
+function setID(configParams) {
+  if (!isValidConfig(configParams)) return undefined;
+  const mwOlId = readCookie();
+  const newMwOlId = mwOlId ? deepClone(mwOlId) : {eid: generateUUID()};
+  writeCookie(newMwOlId);
+  register(configParams, newMwOlId.eid);
+  return {
+    id: newMwOlId
+  };
+};
+
+/* End MW */
+
+export { writeCookie };
+
+/** @type {Submodule} */
+export const mwOpenLinkIdSubModule = {
+  /**
+     * used to link submodule with config
+     * @type {string}
+     */
+  name: 'mwOpenLinkId',
+  /**
+     * decode the stored id value for passing to bid requests
+     * @function
+     * @param {MwOlId} mwOlId
+     * @return {(Object|undefined}
+     */
+  decode(mwOlId) {
+    const id = mwOlId && isPlainObject(mwOlId) ? mwOlId.eid : undefined;
+    return id ? { 'mwOpenLinkId': id } : undefined;
+  },
+
+  /**
+     * performs action to obtain id and return a value in the callback's response argument
+     * @function
+     * @param {SubmoduleParams} [submoduleParams]
+     * @returns {id:MwOlId | undefined}
+     */
+  getId(submoduleConfig) {
+    const submoduleConfigParams = (submoduleConfig && submoduleConfig.params) || {};
+    if (!isValidConfig(submoduleConfigParams)) return undefined;
+    return setID(submoduleConfigParams);
+  }
+};
+
+submodule('userId', mwOpenLinkIdSubModule);
diff --git a/modules/mwOpenLinkIdSystem.md b/modules/mwOpenLinkIdSystem.md
new file mode 100644
index 00000000000..f55913f2983
--- /dev/null
+++ b/modules/mwOpenLinkIdSystem.md
@@ -0,0 +1,43 @@
+## MediaWallah openLink User ID Submodule
+
+OpenLink ID User ID Module generates a UUID that can be utilized to improve user matching. This module enables timely synchronization which handles MediaWallah optout. You must have a pre-existing relationship with MediaWallah prior to integrating.  
+
+### Building Prebid with openLink Id Support
+Your Prebid build must include the modules for both **userId** and **mwOpenLinkId** submodule. Follow the build instructions for Prebid as
+explained in the top level README.md file of the Prebid source tree.
+
+ex: $ gulp build --modules=userId,mwOpenLinkIdSystem
+
+##$ MediaWallah openLink ID Example Configuration
+
+When the module is included, it's automatically enabled and saves an id to both cookie with an expiration time of 1 year.  
+
+### Prebid Params
+
+Individual params may be set for the MediaWallah openLink User ID Submodule. At least accountId and partnerId must be set in the params.
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'mwOpenLinkId',
+            params: {
+                accountId: '1000',
+                partnerId: '1001',
+                uid: 'u-123xyz'
+            }
+        }]
+    }
+});
+```
+
+### Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the MediaWallah OpenLink ID User ID Module integration.
+
+| Params under usersync.userIds[]| Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module. | `'mwOpenLinkId'` |
+| params | Required | Object | Details for mwOLID syncing. | |
+| params.accountId | Required | String | The MediaWallah assigned Account Id | `1000` |
+| params.partnerId | Required | String | The MediaWallah assign Partner Id | `1001` |
+| params.uid | Optional | String | Your unique Id for the user or browser. Used for matching | `u-123xyz` |
\ No newline at end of file
diff --git a/modules/my6senseBidAdapter.js b/modules/my6senseBidAdapter.js
index 018baa37461..27eb9a9541d 100644
--- a/modules/my6senseBidAdapter.js
+++ b/modules/my6senseBidAdapter.js
@@ -1,6 +1,7 @@
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
-const {registerBidder} = require('../src/adapters/bidderFactory.js');
 const BIDDER_CODE = 'my6sense';
 const END_POINT = 'https://hb.mynativeplatform.com/pub2/web/v1.15.0/hbwidget.json';
 const END_POINT_METHOD = 'POST';
@@ -11,6 +12,7 @@ function isBidRequestValid(bid) {
 }
 
 function getUrl(url) {
+  // TODO: this should probably look at refererInfo
   if (!url) {
     url = window.location.href;// "clean" url of current web page
   }
@@ -118,6 +120,9 @@ function buildGdprServerProperty(bidderRequest) {
 }
 
 function buildRequests(validBidRequests, bidderRequest) {
+  // convert Native ORTB definition to old-style prebid native definition
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
   let requests = [];
 
   if (validBidRequests && validBidRequests.length) {
diff --git a/modules/mytargetBidAdapter.js b/modules/mytargetBidAdapter.js
index bcf8e7ad17f..b9ce8b133d1 100644
--- a/modules/mytargetBidAdapter.js
+++ b/modules/mytargetBidAdapter.js
@@ -1,9 +1,9 @@
-import * as utils from '../src/utils.js';
+import { _map } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'mytarget';
-const BIDDER_URL = 'https://ad.mail.ru/hbid_prebid/';
+const BIDDER_URL = '//ad.mail.ru/hbid_prebid/';
 const DEFAULT_CURRENCY = 'RUB';
 const DEFAULT_TTL = 180;
 
@@ -28,18 +28,14 @@ function getSiteName(referrer) {
   let sitename = config.getConfig('mytarget.sitename');
 
   if (!sitename) {
-    sitename = utils.parseUrl(referrer).hostname;
+    const parsed = document.createElement('a');
+    parsed.href = decodeURIComponent(referrer);
+    sitename = parsed.hostname;
   }
 
   return sitename;
 }
 
-function getCurrency() {
-  let currency = config.getConfig('currency.adServerCurrency');
-
-  return (currency === 'USD') ? currency : DEFAULT_CURRENCY;
-}
-
 function generateRandomId() {
   return Math.random().toString(16).substring(2);
 }
@@ -55,17 +51,17 @@ export const spec = {
     let referrer = '';
 
     if (bidderRequest && bidderRequest.refererInfo) {
-      referrer = bidderRequest.refererInfo.referer;
+      referrer = bidderRequest.refererInfo.page;
     }
 
     const payload = {
-      places: utils._map(validBidRequests, buildPlacement),
+      places: _map(validBidRequests, buildPlacement),
       site: {
         sitename: getSiteName(referrer),
         page: referrer
       },
       settings: {
-        currency: getCurrency(),
+        currency: DEFAULT_CURRENCY,
         windowSize: {
           width: window.screen.width,
           height: window.screen.height
@@ -84,7 +80,7 @@ export const spec = {
     let { body } = serverResponse;
 
     if (body.bids) {
-      return utils._map(body.bids, (bid) => {
+      return _map(body.bids, (bid) => {
         let bidResponse = {
           requestId: bid.id,
           cpm: bid.price,
@@ -93,7 +89,10 @@ export const spec = {
           ttl: bid.ttl || DEFAULT_TTL,
           currency: bid.currency || DEFAULT_CURRENCY,
           creativeId: bid.creativeId || generateRandomId(),
-          netRevenue: true
+          netRevenue: true,
+          meta: {
+            advertiserDomains: bid.adomain && bid.adomain.length > 0 ? bid.adomain : [],
+          }
         }
 
         if (bid.adm) {
diff --git a/modules/nafdigitalBidAdapter.js b/modules/nafdigitalBidAdapter.js
deleted file mode 100644
index d64e079b52a..00000000000
--- a/modules/nafdigitalBidAdapter.js
+++ /dev/null
@@ -1,245 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
-
-const BIDDER_CODE = 'nafdigital';
-const URL = 'https://nafdigitalbidder.com/hb';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs
-};
-
-function buildRequests(bidReqs, bidderRequest) {
-  try {
-    let referrer = '';
-    if (bidderRequest && bidderRequest.refererInfo) {
-      referrer = bidderRequest.refererInfo.referer;
-    }
-    const nafdigitalImps = [];
-    const publisherId = utils.getBidIdParameter('publisherId', bidReqs[0].params);
-    utils._each(bidReqs, function (bid) {
-      bid.sizes = ((utils.isArray(bid.sizes) && utils.isArray(bid.sizes[0])) ? bid.sizes : [bid.sizes]);
-      bid.sizes = bid.sizes.filter(size => utils.isArray(size));
-      const processedSizes = bid.sizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}));
-
-      const element = document.getElementById(bid.adUnitCode);
-      const minSize = _getMinSize(processedSizes);
-      const viewabilityAmount = _isViewabilityMeasurable(element)
-        ? _getViewability(element, utils.getWindowTop(), minSize)
-        : 'na';
-      const viewabilityAmountRounded = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
-
-      const imp = {
-        id: bid.bidId,
-        banner: {
-          format: processedSizes,
-          ext: {
-            viewability: viewabilityAmountRounded
-          }
-        },
-        tagid: String(bid.adUnitCode)
-      };
-      const bidFloor = utils.getBidIdParameter('bidFloor', bid.params);
-      if (bidFloor) {
-        imp.bidfloor = bidFloor;
-      }
-      nafdigitalImps.push(imp);
-    });
-    const nafdigitalBidReq = {
-      id: utils.getUniqueIdentifierStr(),
-      imp: nafdigitalImps,
-      site: {
-        domain: utils.parseUrl(referrer).host,
-        page: referrer,
-        publisher: {
-          id: publisherId
-        }
-      },
-      device: {
-        devicetype: _getDeviceType(),
-        w: screen.width,
-        h: screen.height
-      },
-      tmax: config.getConfig('bidderTimeout')
-    };
-
-    return {
-      method: 'POST',
-      url: URL,
-      data: JSON.stringify(nafdigitalBidReq),
-      options: {contentType: 'text/plain', withCredentials: false}
-    };
-  } catch (e) {
-    utils.logError(e, {bidReqs, bidderRequest});
-  }
-}
-
-function isBidRequestValid(bid) {
-  if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
-    return false;
-  }
-
-  if (typeof bid.params.publisherId === 'undefined') {
-    return false;
-  }
-
-  return true;
-}
-
-function interpretResponse(serverResponse) {
-  if (!serverResponse.body || typeof serverResponse.body != 'object') {
-    utils.logWarn('NAF digital server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
-    return [];
-  }
-  const { body: {id, seatbid} } = serverResponse;
-  try {
-    const nafdigitalBidResponses = [];
-    if (id &&
-      seatbid &&
-      seatbid.length > 0 &&
-      seatbid[0].bid &&
-      seatbid[0].bid.length > 0) {
-      seatbid[0].bid.map(nafdigitalBid => {
-        nafdigitalBidResponses.push({
-          requestId: nafdigitalBid.impid,
-          cpm: parseFloat(nafdigitalBid.price),
-          width: parseInt(nafdigitalBid.w),
-          height: parseInt(nafdigitalBid.h),
-          creativeId: nafdigitalBid.crid || nafdigitalBid.id,
-          currency: 'USD',
-          netRevenue: true,
-          mediaType: BANNER,
-          ad: _getAdMarkup(nafdigitalBid),
-          ttl: 60
-        });
-      });
-    }
-    return nafdigitalBidResponses;
-  } catch (e) {
-    utils.logError(e, {id, seatbid});
-  }
-}
-
-// Don't do user sync for now
-function getUserSyncs(syncOptions, responses, gdprConsent) {
-  return [];
-}
-
-function _isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
-}
-
-function _isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
-}
-
-function _getDeviceType() {
-  return _isMobile() ? 1 : _isConnectedTV() ? 3 : 2;
-}
-
-function _getAdMarkup(bid) {
-  let adm = bid.adm;
-  if ('nurl' in bid) {
-    adm += utils.createTrackPixelHtml(bid.nurl);
-  }
-  return adm;
-}
-
-function _isViewabilityMeasurable(element) {
-  return !_isIframe() && element !== null;
-}
-
-function _getViewability(element, topWin, { w, h } = {}) {
-  return utils.getWindowTop().document.visibilityState === 'visible'
-    ? _getPercentInView(element, topWin, { w, h })
-    : 0;
-}
-
-function _isIframe() {
-  try {
-    return utils.getWindowSelf() !== utils.getWindowTop();
-  } catch (e) {
-    return true;
-  }
-}
-
-function _getMinSize(sizes) {
-  return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
-}
-
-function _getBoundingBox(element, { w, h } = {}) {
-  let { width, height, left, top, right, bottom } = element.getBoundingClientRect();
-
-  if ((width === 0 || height === 0) && w && h) {
-    width = w;
-    height = h;
-    right = left + w;
-    bottom = top + h;
-  }
-
-  return { width, height, left, top, right, bottom };
-}
-
-function _getIntersectionOfRects(rects) {
-  const bbox = {
-    left: rects[0].left,
-    right: rects[0].right,
-    top: rects[0].top,
-    bottom: rects[0].bottom
-  };
-
-  for (let i = 1; i < rects.length; ++i) {
-    bbox.left = Math.max(bbox.left, rects[i].left);
-    bbox.right = Math.min(bbox.right, rects[i].right);
-
-    if (bbox.left >= bbox.right) {
-      return null;
-    }
-
-    bbox.top = Math.max(bbox.top, rects[i].top);
-    bbox.bottom = Math.min(bbox.bottom, rects[i].bottom);
-
-    if (bbox.top >= bbox.bottom) {
-      return null;
-    }
-  }
-
-  bbox.width = bbox.right - bbox.left;
-  bbox.height = bbox.bottom - bbox.top;
-
-  return bbox;
-}
-
-function _getPercentInView(element, topWin, { w, h } = {}) {
-  const elementBoundingBox = _getBoundingBox(element, { w, h });
-
-  // Obtain the intersection of the element and the viewport
-  const elementInViewBoundingBox = _getIntersectionOfRects([ {
-    left: 0,
-    top: 0,
-    right: topWin.innerWidth,
-    bottom: topWin.innerHeight
-  }, elementBoundingBox ]);
-
-  let elementInViewArea, elementTotalArea;
-
-  if (elementInViewBoundingBox !== null) {
-    // Some or all of the element is in view
-    elementInViewArea = elementInViewBoundingBox.width * elementInViewBoundingBox.height;
-    elementTotalArea = elementBoundingBox.width * elementBoundingBox.height;
-
-    return ((elementInViewArea / elementTotalArea) * 100);
-  }
-
-  // No overlap between element and the viewport; therefore, the element
-  // lies completely out of view
-  return 0;
-}
-
-registerBidder(spec);
diff --git a/modules/nafdigitalBidAdapter.md b/modules/nafdigitalBidAdapter.md
deleted file mode 100644
index b17b1f13e1e..00000000000
--- a/modules/nafdigitalBidAdapter.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Overview
-
-```
-Module Name: NAF Digital Bid Adapter
-Module Type: Bidder Adapter
-Maintainer: vyatsun@gmail.com
-```
-
-# Description
-
-NAF Digital adapter integration to the Prebid library.
-
-# Test Parameters
-
-```
-var adUnits = [
-  {
-    code: 'test-leaderboard',
-    sizes: [[728, 90]],
-    bids: [{
-      bidder: 'nafdigital',
-      params: {
-          publisherId: 2141020,
-          bidFloor: 0.01
-      }
-    }]
-  }, {
-    code: 'test-banner',
-    sizes: [[300, 250]],
-    bids: [{
-      bidder: 'nafdigital',
-      params: {
-        publisherId: 2141020
-      }
-    }]
-  }
-]
-```
diff --git a/modules/nanointeractiveBidAdapter.js b/modules/nanointeractiveBidAdapter.js
deleted file mode 100644
index 42a343efc03..00000000000
--- a/modules/nanointeractiveBidAdapter.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import * as utils from '../src/utils.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const storage = getStorageManager();
-
-export const BIDDER_CODE = 'nanointeractive';
-export const END_POINT_URL = 'https://ad.audiencemanager.de';
-
-export const SSP_PLACEMENT_ID = 'pid';
-export const NQ = 'nq';
-export const NQ_NAME = 'name';
-export const CATEGORY = 'category';
-export const CATEGORY_NAME = 'categoryName';
-export const SUB_ID = 'subId';
-export const REF = 'ref';
-export const LOCATION = 'loc';
-
-var nanoPid = '5a1ec660eb0a191dfa591172';
-
-export const spec = {
-
-  code: BIDDER_CODE,
-  aliases: ['ni'],
-
-  isBidRequestValid(bid) {
-    const pid = bid.params[SSP_PLACEMENT_ID];
-    return !!(pid);
-  },
-
-  buildRequests(validBidRequests, bidderRequest) {
-    let payload = [];
-    validBidRequests.forEach(
-      bid => payload.push(createSingleBidRequest(bid, bidderRequest))
-    );
-    const url = getEndpointUrl() + '/hb';
-
-    return {
-      method: 'POST',
-      url: url,
-      data: JSON.stringify(payload)
-    };
-  },
-  interpretResponse(serverResponse) {
-    const bids = [];
-    serverResponse.body.forEach(serverBid => {
-      if (isEngineResponseValid(serverBid)) {
-        bids.push(createSingleBidResponse(serverBid));
-      }
-    });
-    return bids;
-  },
-  getUserSyncs: function(syncOptions) {
-    const syncs = [];
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: getEndpointUrl() + '/hb/cookieSync/' + nanoPid
-      });
-    }
-
-    if (syncOptions.pixelEnabled) {
-      syncs.push({
-        type: 'image',
-        url: getEndpointUrl() + '/hb/cookieSync/' + nanoPid
-      });
-    }
-    return syncs;
-  }
-
-};
-
-function createSingleBidRequest(bid, bidderRequest) {
-  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
-  const origin = utils.getOrigin();
-
-  nanoPid = bid.params[SSP_PLACEMENT_ID] || nanoPid;
-
-  const data = {
-    [SSP_PLACEMENT_ID]: bid.params[SSP_PLACEMENT_ID],
-    [NQ]: [createNqParam(bid)],
-    [CATEGORY]: [createCategoryParam(bid)],
-    [SUB_ID]: createSubIdParam(bid),
-    [REF]: createRefParam(),
-    sizes: bid.sizes.map(value => value[0] + 'x' + value[1]),
-    bidId: bid.bidId,
-    cors: origin,
-    [LOCATION]: location,
-    lsUserId: getLsUserId()
-  };
-
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    data['gdprConsent'] = bidderRequest.gdprConsent.consentString;
-    data['gdprApplies'] = (bidderRequest.gdprConsent.gdprApplies) ? '1' : '0';
-  }
-
-  return data;
-}
-
-function createSingleBidResponse(serverBid) {
-  if (serverBid.userId) {
-    storage.setDataInLocalStorage('lsUserId', serverBid.userId);
-  }
-  return {
-    requestId: serverBid.id,
-    cpm: serverBid.cpm,
-    width: serverBid.width,
-    height: serverBid.height,
-    ad: serverBid.ad,
-    ttl: serverBid.ttl,
-    creativeId: serverBid.creativeId,
-    netRevenue: serverBid.netRevenue || true,
-    currency: serverBid.currency
-  };
-}
-
-function createNqParam(bid) {
-  return bid.params[NQ_NAME] ? utils.getParameterByName(bid.params[NQ_NAME]) : bid.params[NQ] || null;
-}
-
-function createCategoryParam(bid) {
-  return bid.params[CATEGORY_NAME] ? utils.getParameterByName(bid.params[CATEGORY_NAME]) : bid.params[CATEGORY] || null;
-}
-
-function createSubIdParam(bid) {
-  return bid.params[SUB_ID] || null;
-}
-
-function createRefParam() {
-  try {
-    return window.top.document.referrer;
-  } catch (ex) {
-    return document.referrer;
-  }
-}
-
-function isEngineResponseValid(response) {
-  return !!response.cpm && !!response.ad;
-}
-
-/**
- * Used mainly for debugging
- *
- * @returns string
- */
-function getEndpointUrl() {
-  const nanoConfig = config.getConfig('nano');
-  return (nanoConfig && nanoConfig['endpointUrl']) || END_POINT_URL;
-}
-
-function getLsUserId() {
-  if (storage.getDataFromLocalStorage('lsUserId') != null) {
-    return storage.getDataFromLocalStorage('lsUserId');
-  }
-  return null;
-}
-
-registerBidder(spec);
diff --git a/modules/nanointeractiveBidAdapter.md b/modules/nanointeractiveBidAdapter.md
deleted file mode 100644
index c1790ff6337..00000000000
--- a/modules/nanointeractiveBidAdapter.md
+++ /dev/null
@@ -1,152 +0,0 @@
-# Overview
-
-```
-Module Name:  Nano Interactive Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer: rade@nanointeractive.com
-```
-
-# Description
-
-Connects to Nano Interactive search retargeting Ad Server for bids.
-
-
-
-<br>
-### Requirements:
-To be able to get identification key (`pid`), please contact us at <br> 
-`https://www.nanointeractive.com/publishers` <br>
-<br><br><br>
-
-#### Send All Bids Ad Server Keys:
-(truncated to 20 chars due to [DFP limit](https://support.google.com/dfp_premium/answer/1628457?hl=en#Key-values))
-
-`hb_adid_nanointeract`
-`hb_bidder_nanointera`
-`hb_pb_nanointeractiv`
-`hb_format_nanointera`
-`hb_size_nanointeract`
-`hb_source_nanointera`
-
-#### Default Deal ID Keys:
-`hb_deal_nanointeract`
-
-### bid params
-
-{: .table .table-bordered .table-striped }
-| Name           | Scope    | Description                                      | Example                      |
-| :------------- | :------- | :----------------------------------------------- | :--------------------------- |
-| `pid`          | required | Identification key, provided by Nano Interactive | `'5afaa0280ae8996eb578de53'` |
-| `category`     | optional | Contextual taxonomy                              | `'automotive'`               |
-| `categoryName` | optional | Contextual taxonomy (from URL query param)       | `'cat_name'`                 |
-| `nq`           | optional | User search query                                | `'automobile search query'`  |
-| `name`         | optional | User search query (from URL query param)         | `'search_param'`             |
-| `subId`        | optional | Channel - used to separate traffic sources       | `'123'`                      |
-
-#### Configuration
-The `category` and `categoryName` are mutually exclusive. If you pass both, `categoryName` takes precedence.
-<br>
-The `nq` and `name` are mutually exclusive. If you pass both, `name` takes precedence.
-
-#### Example with only required field `pid`
-    var adUnits = [{
-        code: 'nano-div',
-        sizes: [[300, 250], [300,600]],
-        bids: [{
-            bidder: 'nanointeractive',
-            params: {
-                pid: '5afaa0280ae8996eb578de53'
-            }
-        }]
-    }];
-    
-#### Example with `category`
-    var adUnits = [{
-        code: 'nano-div',
-        sizes: [[300, 250], [300,600]],
-        bids: [{
-            bidder: 'nanointeractive',
-            params: {
-                pid: '5afaa0280ae8996eb578de53',
-                category: 'automotive',
-                subId: '123'
-            }
-        }]
-    }];
-    
-#### Example with `categoryName`
-    var adUnits = [{
-        code: 'nano-div',
-        sizes: [[300, 250], [300,600]],
-        bids: [{
-            bidder: 'nanointeractive',
-            params: {
-                pid: '5afaa0280ae8996eb578de53',
-                // Category "automotive" is in the URL like:
-                // https://www....?cat_name=automotive&...
-                categoryName: 'cat_name',
-                subId: '123'
-            }
-        }]
-    }];
-    
-#### Example with `nq`
-    var adUnits = [{
-        code: 'nano-div',
-        sizes: [[300, 250], [300,600]],
-        bids: [{
-            bidder: 'nanointeractive',
-            params: {
-                pid: '5afaa0280ae8996eb578de53',
-                // User searched "automobile search query" (extracted from search text field) 
-                nq: 'automobile search query',
-                subId: '123'
-            }
-        }]
-    }];
-    
-#### Example with `name`
-    var adUnits = [{
-        code: 'nano-div',
-        sizes: [[300, 250], [300,600]],
-        bids: [{
-            bidder: 'nanointeractive',
-            params: {
-                pid: '5afaa0280ae8996eb578de53',
-                // User searched "automobile search query" and it is in the URL like:
-                // https://www....?search_param=automobile%20search%20query&... 
-                name: 'search_param',
-                subId: '123'
-            }
-        }]
-    }];
-    
-#### Example with `category` and `nq`
-    var adUnits = [{
-        code: 'nano-div',
-        sizes: [[300, 250], [300,600]],
-        bids: [{
-            bidder: 'nanointeractive',
-            params: {
-                pid: '5afaa0280ae8996eb578de53',
-                category: 'automotive',
-                nq: 'automobile search query',
-                subId: '123'
-            }
-        }]
-    }];
-
-#### Example with `categoryName` and `name`
-    var adUnits = [{
-        code: 'nano-div',
-        sizes: [[300, 250], [300,600]],
-        bids: [{
-            bidder: 'nanointeractive',
-            params: {
-                pid: '5afaa0280ae8996eb578de53',
-                categoryName: 'cat_name',
-                name: 'search_param',
-                subId: '123'
-            }
-        }]
-    }];
\ No newline at end of file
diff --git a/modules/nasmediaAdmixerBidAdapter.js b/modules/nasmediaAdmixerBidAdapter.js
deleted file mode 100644
index fd7a7baa58a..00000000000
--- a/modules/nasmediaAdmixerBidAdapter.js
+++ /dev/null
@@ -1,85 +0,0 @@
-
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
-
-const ADMIXER_ENDPOINT = 'https://adn.admixer.co.kr:10443/prebid/ad_req';
-const BIDDER_CODE = 'nasmediaAdmixer';
-
-const DEFAULT_BID_TTL = 360;
-const DEFAULT_CURRENCY = 'USD';
-const DEFAULT_REVENUE = false;
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-
-  isBidRequestValid: function (bid) {
-    return !!(bid && bid.params && bid.params.media_key && bid.params.adunit_id);
-  },
-
-  buildRequests: function (validBidRequests, bidderRequest) {
-    return validBidRequests.map(bid => {
-      const payload = {
-        media_key: bid.params.media_key,
-        adunit_id: bid.params.adunit_id,
-        req_id: bid.bidId,
-        referrer: bidderRequest.refererInfo.referer,
-        os: getOs(),
-        platform: getPlatform(),
-      };
-
-      return {
-        method: 'GET',
-        url: ADMIXER_ENDPOINT,
-        data: payload,
-      }
-    })
-  },
-
-  interpretResponse: function (serverResponse, bidRequest) {
-    const serverBody = serverResponse.body;
-    const bidResponses = [];
-
-    if (serverBody && serverBody.error_code === 0 && serverBody.body && serverBody.body.length > 0) {
-      let bidData = serverBody.body[0];
-
-      const bidResponse = {
-        ad: bidData.ad,
-        requestId: serverBody.req_id,
-        creativeId: bidData.ad_id,
-        cpm: bidData.cpm,
-        width: bidData.width,
-        height: bidData.height,
-        currency: bidData.currency ? bidData.currency : DEFAULT_CURRENCY,
-        netRevenue: DEFAULT_REVENUE,
-        ttl: DEFAULT_BID_TTL
-      };
-
-      bidResponses.push(bidResponse);
-    }
-    return bidResponses;
-  }
-}
-
-function getOs() {
-  let ua = navigator.userAgent;
-  if (ua.match(/(iPhone|iPod|iPad)/)) {
-    return 'ios';
-  } else if (ua.match(/Android/)) {
-    return 'android';
-  } else if (ua.match(/Window/)) {
-    return 'windows';
-  } else {
-    return 'etc';
-  }
-}
-
-function getPlatform() {
-  return (isMobile()) ? 'm_web' : 'pc_web';
-}
-
-function isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent.toLowerCase());
-}
-
-registerBidder(spec);
diff --git a/modules/nasmediaAdmixerBidAdapter.md b/modules/nasmediaAdmixerBidAdapter.md
deleted file mode 100644
index 096acf27f61..00000000000
--- a/modules/nasmediaAdmixerBidAdapter.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Overview
-
-```
-Module Name: NasmediaAdmixer Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: prebid@nasmedia.co.kr
-```
-``
-# Description
-
-Module that connects to NasmediaAdmixer demand sources. 
-Banner formats are supported.
-The NasmediaAdmixer adapter doesn't support multiple sizes per ad-unit and will use the first one if multiple sizes are defined.
-
-# Test Parameters
-```
-    var adUnits = [
-      {
-        code: 'banner-ad-div',
-        mediaTypes: { 
-          banner: { // banner size
-            sizes: [[300, 250]]
-          }
-        },
-        bids: [
-          {
-            bidder: 'nasmediaAdmixer',
-            params: {
-              media_key: '19038695',  //required
-              adunit_id: '24190632',  //required
-            }
-          }
-        ]
-      }
-    ];
-```
diff --git a/modules/nativoBidAdapter.js b/modules/nativoBidAdapter.js
new file mode 100644
index 00000000000..a92168492d0
--- /dev/null
+++ b/modules/nativoBidAdapter.js
@@ -0,0 +1,668 @@
+import { deepAccess, isEmpty } from '../src/utils.js'
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { BANNER } from '../src/mediaTypes.js'
+// import { config } from 'src/config'
+
+const BIDDER_CODE = 'nativo'
+const BIDDER_ENDPOINT = 'https://exchange.postrelease.com/prebid'
+
+const GVLID = 263
+
+const TIME_TO_LIVE = 360
+
+const SUPPORTED_AD_TYPES = [BANNER]
+const FLOOR_PRICE_CURRENCY = 'USD'
+const PRICE_FLOOR_WILDCARD = '*'
+
+/**
+ * Keep track of bid data by keys
+ * @returns {Object} - Map of bid data that can be referenced by multiple keys
+ */
+export const BidDataMap = () => {
+  const referenceMap = {}
+  const bids = []
+
+  /**
+   * Add a refence to the index by key value
+   * @param {String} key - The key to store the index reference
+   * @param {Integer} index - The index value of the bidData
+   */
+  function addKeyReference(key, index) {
+    if (!referenceMap.hasOwnProperty(key)) {
+      referenceMap[key] = index
+    }
+  }
+
+  /**
+   * Adds a bid to the map
+   * @param {Object} bid - Bid data
+   * @param {Array/String} keys - Keys to reference the index value
+   */
+  function addBidData(bid, keys) {
+    const index = bids.length
+    bids.push(bid)
+
+    if (Array.isArray(keys)) {
+      keys.forEach((key) => {
+        addKeyReference(String(key), index)
+      })
+      return
+    }
+
+    addKeyReference(String(keys), index)
+  }
+
+  /**
+   * Get's the bid data refrerenced by the key
+   * @param {String} key - The key value to find the bid data by
+   * @returns {Object} - The bid data
+   */
+  function getBidData(key) {
+    const stringKey = String(key)
+    if (referenceMap.hasOwnProperty(stringKey)) {
+      return bids[referenceMap[stringKey]]
+    }
+  }
+
+  // Return API
+  return {
+    addBidData,
+    getBidData,
+  }
+}
+
+const bidRequestMap = {}
+const adUnitsRequested = {}
+const extData = {}
+
+// Filtering
+const adsToFilter = new Set()
+const advertisersToFilter = new Set()
+const campaignsToFilter = new Set()
+
+// Prebid adapter referrence doc: https://docs.prebid.org/dev-docs/bidder-adaptor.html
+
+// Validity checks for optionsl paramters
+const validParameter = {
+  url: (value) => typeof value === 'string',
+  placementId: (value) => {
+    const isString = typeof value === 'string'
+    const isNumber = typeof value === 'number'
+    return isString || isNumber
+  },
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: ['ntv'], // short code
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    // We don't need any specific parameters to make a bid request
+    // If not parameters are supplied just verify it's the correct bidder code
+    if (!bid.params) return bid.bidder === BIDDER_CODE
+
+    // Check if any supplied parameters are invalid
+    const hasInvalidParameters = Object.keys(bid.params).some((key) => {
+      const value = bid.params[key]
+      const validityCheck = validParameter[key]
+
+      // We don't have a test for this so it's not a paramter we care about
+      if (!validityCheck) return false
+
+      // Return if the check is not passed
+      return !validityCheck(value)
+    })
+
+    return !hasInvalidParameters
+  },
+
+  /**
+   * Called when the page asks Prebid.js for bids
+   * Make a server request from the list of BidRequests
+   *
+   * @param {Array} validBidRequests - An array of bidRequest objects, one for each AdUnit that your module is involved in. This array has been processed for special features like sizeConfig, so it’s the list that you should be looping through
+   * @param {Object} bidderRequest - The master bidRequest object. This object is useful because it carries a couple of bid parameters that are global to all the bids.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    // Parse values from bid requests
+    const placementIds = new Set()
+    const bidDataMap = BidDataMap()
+    const placementSizes = { length: 0 }
+    const floorPriceData = {}
+    let placementId, pageUrl
+    validBidRequests.forEach((bidRequest) => {
+      pageUrl =
+        getPageUrlFromBidRequest(bidRequest) ||
+        bidderRequest.refererInfo.location
+
+      placementId = deepAccess(bidRequest, 'params.placementId')
+
+      const bidDataKeys = [bidRequest.adUnitCode]
+
+      if (placementId && !placementIds.has(placementId)) {
+        placementIds.add(placementId)
+        bidDataKeys.push(placementId)
+
+        placementSizes[placementId] = bidRequest.sizes
+        placementSizes.length++
+      }
+
+      const bidData = {
+        bidId: bidRequest.bidId,
+        size: getLargestSize(bidRequest.sizes),
+      }
+      bidDataMap.addBidData(bidData, bidDataKeys)
+
+      const bidRequestFloorPriceData = parseFloorPriceData(bidRequest)
+      if (bidRequestFloorPriceData) {
+        floorPriceData[bidRequest.adUnitCode] = bidRequestFloorPriceData
+      }
+    })
+    bidRequestMap[bidderRequest.bidderRequestId] = bidDataMap
+
+    // Build adUnit data
+    const adUnitData = buildAdUnitData(validBidRequests)
+
+    // Build basic required QS Params
+    let params = [
+      // Prebid request id
+      { key: 'ntv_pb_rid', value: bidderRequest.bidderRequestId },
+      // Ad unit data
+      {
+        key: 'ntv_ppc',
+        value: btoa(JSON.stringify(adUnitData)), // Convert to Base 64
+      },
+      // Number count of requests per ad unit
+      {
+        key: 'ntv_dbr',
+        value: btoa(JSON.stringify(adUnitsRequested)), // Convert to Base 64
+      },
+      // Page url
+      {
+        key: 'ntv_url',
+        value: encodeURIComponent(pageUrl),
+      },
+    ]
+
+    // Floor pricing
+    if (Object.keys(floorPriceData).length) {
+      params.unshift({
+        key: 'ntv_ppf',
+        value: btoa(JSON.stringify(floorPriceData)),
+      })
+    }
+
+    // Add filtering
+    if (adsToFilter.size > 0) {
+      params.unshift({
+        key: 'ntv_atf',
+        value: Array.from(adsToFilter).join(','),
+      })
+    }
+
+    if (advertisersToFilter.size > 0) {
+      params.unshift({
+        key: 'ntv_avtf',
+        value: Array.from(advertisersToFilter).join(','),
+      })
+    }
+
+    if (campaignsToFilter.size > 0) {
+      params.unshift({
+        key: 'ntv_ctf',
+        value: Array.from(campaignsToFilter).join(','),
+      })
+    }
+
+    // Placement Sizes
+    if (placementSizes.length) {
+      params.unshift({
+        key: 'ntv_pas',
+        value: btoa(JSON.stringify(placementSizes)),
+      })
+    }
+
+    // Add placement IDs
+    if (placementIds.size > 0) {
+      // Convert Set to Array (IE 11 Safe)
+      const placements = []
+      placementIds.forEach((value) => placements.push(value))
+      // Append to query string paramters
+      params.unshift({ key: 'ntv_ptd', value: placements.join(',') })
+    }
+
+    // Add GDPR params
+    if (bidderRequest.gdprConsent) {
+      // Put on the beginning of the qs param array
+      params.unshift({
+        key: 'ntv_gdpr_consent',
+        value: bidderRequest.gdprConsent.consentString,
+      })
+    }
+
+    // Add USP params
+    if (bidderRequest.uspConsent) {
+      // Put on the beginning of the qs param array
+      params.unshift({ key: 'us_privacy', value: bidderRequest.uspConsent })
+    }
+
+    let serverRequest = {
+      method: 'GET',
+      url: BIDDER_ENDPOINT + arrayToQS(params),
+    }
+
+    return serverRequest
+  },
+
+  /**
+   * Will be called when the browser has received the response from your server.
+   * The function will parse the response and create a bidResponse object containing one or more bids.
+   * The adapter should indicate no valid bids by returning an empty array.
+   *
+   * @param {Object} response - Data returned from the bidding server request endpoint
+   * @param {Object} request - The request object used to call the server request endpoint
+   * @return {Array} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (response, request) {
+    // If the bid response was empty, return []
+    if (!response || !response.body || isEmpty(response.body)) return []
+
+    try {
+      const body =
+        typeof response.body === 'string'
+          ? JSON.parse(response.body)
+          : response.body
+
+      const bidResponses = []
+      const seatbids = body.seatbid
+
+      // Step through and grab pertinent data
+      let bidResponse, adUnit
+      seatbids.forEach((seatbid) => {
+        seatbid.bid.forEach((bid) => {
+          adUnit = this.getAdUnitData(body.id, bid)
+          bidResponse = {
+            requestId: adUnit.bidId,
+            cpm: bid.price,
+            currency: body.cur,
+            width: bid.w || adUnit.size[0],
+            height: bid.h || adUnit.size[1],
+            creativeId: bid.crid,
+            dealId: bid.id,
+            netRevenue: true,
+            ttl: bid.ttl || TIME_TO_LIVE,
+            ad: bid.adm,
+            meta: {
+              advertiserDomains: bid.adomain,
+            },
+          }
+
+          if (bid.ext) extData[bid.id] = bid.ext
+
+          bidResponses.push(bidResponse)
+        })
+      })
+
+      // Don't need the map anymore as it was unique for one request/response
+      delete bidRequestMap[body.id]
+
+      return bidResponses
+    } catch (error) {
+      // If there is an error, return []
+      return []
+    }
+  },
+
+  /**
+   * All user ID sync activity should be done using the getUserSyncs callback of the BaseAdapter model.
+   * Given an array of all the responses from the server, getUserSyncs is used to determine which user syncs should occur.
+   * The order of syncs in the serverResponses array matters. The most important ones should come first, since publishers may limit how many are dropped on their page.
+   * @param {Object} syncOptions - Which user syncs are allowed?
+   * @param {Array} serverResponses - Array of server's responses
+   * @param {Object} gdprConsent - GDPR consent data
+   * @param {Object} uspConsent - USP consent data
+   * @return {Array} The user syncs which should be dropped.
+   */
+  getUserSyncs: function (
+    syncOptions,
+    serverResponses,
+    gdprConsent,
+    uspConsent
+  ) {
+    // Generate consent qs string
+    let params = ''
+    // GDPR
+    if (gdprConsent) {
+      params = appendQSParamString(
+        params,
+        'gdpr',
+        gdprConsent.gdprApplies ? 1 : 0
+      )
+      params = appendQSParamString(
+        params,
+        'gdpr_consent',
+        encodeURIComponent(gdprConsent.consentString || '')
+      )
+    }
+    // CCPA
+    if (uspConsent) {
+      params = appendQSParamString(
+        params,
+        'us_privacy',
+        encodeURIComponent(uspConsent.uspConsent)
+      )
+    }
+
+    // Get sync urls from the respnse and inject cinbsent params
+    const types = {
+      iframe: syncOptions.iframeEnabled,
+      image: syncOptions.pixelEnabled,
+    }
+    const syncs = []
+
+    let body
+    serverResponses.forEach((response) => {
+      // If the bid response was empty, return []
+      if (!response || !response.body || isEmpty(response.body)) {
+        return syncs
+      }
+
+      try {
+        body =
+          typeof response.body === 'string'
+            ? JSON.parse(response.body)
+            : response.body
+      } catch (err) { return }
+
+      // Make sure we have valid content
+      if (!body || !body.seatbid || body.seatbid.length === 0) return
+
+      body.seatbid.forEach((seatbid) => {
+        // Grab the syncs for each seatbid
+        seatbid.syncUrls.forEach((sync) => {
+          if (types[sync.type]) {
+            if (sync.url.trim() !== '') {
+              syncs.push({
+                type: sync.type,
+                url: sync.url.replace('{GDPR_params}', params),
+              })
+            }
+          }
+        })
+      })
+    })
+
+    return syncs
+  },
+
+  /**
+   * Will be called when an adpater timed out for an auction.
+   * Adapter can fire a ajax or pixel call to register a timeout at thier end.
+   * @param {Object} timeoutData - Timeout specific data
+   */
+  onTimeout: function (timeoutData) {},
+
+  /**
+   * Will be called when a bid from the adapter won the auction.
+   * @param {Object} bid - The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    const ext = extData[bid.dealId]
+
+    if (!ext) return
+
+    appendFilterData(adsToFilter, ext.adsToFilter)
+    appendFilterData(advertisersToFilter, ext.advertisersToFilter)
+    appendFilterData(campaignsToFilter, ext.campaignsToFilter)
+  },
+
+  /**
+   * Will be called when the adserver targeting has been set for a bid from the adapter.
+   * @param {Object} bidder - The bid of which the targeting has been set
+   */
+  onSetTargeting: function (bid) {},
+
+  /**
+   * Maps Prebid's bidId to Nativo's placementId values per unique bidderRequestId
+   * @param {String} bidderRequestId - The unique ID value associated with the bidderRequest
+   * @param {Object} bid - The placement ID value from Nativo
+   * @returns {String} - The bidId value associated with the corresponding placementId
+   */
+  getAdUnitData: function (bidderRequestId, bid) {
+    const bidDataMap = bidRequestMap[bidderRequestId]
+
+    const placementId = bid.impid
+    const adUnitCode = deepAccess(bid, 'ext.ad_unit_id')
+
+    return (
+      bidDataMap.getBidData(adUnitCode) || bidDataMap.getBidData(placementId)
+    )
+  },
+}
+registerBidder(spec)
+
+// Utils
+export function parseFloorPriceData(bidRequest) {
+  if (typeof bidRequest.getFloor !== 'function') return
+
+  // Setup price floor data per bid request
+  let bidRequestFloorPriceData = {}
+  let bidMediaTypes = bidRequest.mediaTypes
+  let sizeOptions = new Set()
+  // Step through meach media type so we can get floor data for each media type per bid request
+  Object.keys(bidMediaTypes).forEach((mediaType) => {
+    // Setup price floor data per media type
+    let mediaTypeData = bidMediaTypes[mediaType]
+    let mediaTypeFloorPriceData = {}
+    let mediaTypeSizes = mediaTypeData.sizes || mediaTypeData.playerSize || []
+    // Step through each size of the media type so we can get floor data for each size per media type
+    mediaTypeSizes.forEach((size) => {
+      // Get floor price data per the getFloor method and respective media type / size combination
+      const priceFloorData = bidRequest.getFloor({
+        currency: FLOOR_PRICE_CURRENCY,
+        mediaType,
+        size,
+      })
+      // Save the data and track the sizes
+      mediaTypeFloorPriceData[sizeToString(size)] = priceFloorData.floor
+      sizeOptions.add(size)
+    })
+    bidRequestFloorPriceData[mediaType] = mediaTypeFloorPriceData
+
+    // Get floor price of current media type with a wildcard size
+    const sizeWildcardFloor = getSizeWildcardPrice(bidRequest, mediaType)
+    // Save the wildcard floor price if it was retrieved successfully
+    if (sizeWildcardFloor.floor > 0) {
+      mediaTypeFloorPriceData['*'] = sizeWildcardFloor.floor
+    }
+  })
+
+  // Get floor price for wildcard media type using all of the sizes present in the previous media types
+  const mediaWildCardPrices = getMediaWildcardPrices(bidRequest, [
+    PRICE_FLOOR_WILDCARD,
+    ...Array.from(sizeOptions),
+  ])
+  bidRequestFloorPriceData['*'] = mediaWildCardPrices
+
+  return bidRequestFloorPriceData
+}
+
+/**
+ * Get price floor data by always setting the size value to the wildcard for a specific size
+ * @param {Object} bidRequest - The bid request
+ * @param {String} mediaType - The media type
+ * @returns {Object} - Bid floor data
+ */
+export function getSizeWildcardPrice(bidRequest, mediaType) {
+  return bidRequest.getFloor({
+    currency: FLOOR_PRICE_CURRENCY,
+    mediaType,
+    size: PRICE_FLOOR_WILDCARD,
+  })
+}
+
+/**
+ * Get price data for a range of sizes and always setting the media type to the wildcard value
+ * @param {*} bidRequest - The bid request
+ * @param {*} sizes - The sizes to get the floor price data for
+ * @returns {Object} - Bid floor data
+ */
+export function getMediaWildcardPrices(
+  bidRequest,
+  sizes = [PRICE_FLOOR_WILDCARD]
+) {
+  const sizePrices = {}
+  sizes.forEach((size) => {
+    // MODIFY the bid request's mediaTypes property (so we can get the wildcard media type value)
+    const temp = bidRequest.mediaTypes
+    bidRequest.mediaTypes = { PRICE_FLOOR_WILDCARD: temp.sizes }
+    // Get price floor data
+    const priceFloorData = bidRequest.getFloor({
+      currency: FLOOR_PRICE_CURRENCY,
+      mediaType: PRICE_FLOOR_WILDCARD,
+      size,
+    })
+    // RESTORE initial property value
+    bidRequest.mediaTypes = temp
+
+    // Only save valid floor price data
+    const key =
+      size !== PRICE_FLOOR_WILDCARD ? sizeToString(size) : PRICE_FLOOR_WILDCARD
+    sizePrices[key] = priceFloorData.floor
+  })
+  return sizePrices
+}
+
+/**
+ * Format size array to a string
+ * @param {Array} size - Size data [width, height]
+ * @returns {String} - Formated size string
+ */
+export function sizeToString(size) {
+  if (!Array.isArray(size) || size.length < 2) return ''
+  return `${size[0]}x${size[1]}`
+}
+
+/**
+ * Build the ad unit data to send back to the request endpoint
+ * @param {Array<Object>} requests - Bid requests
+ * @returns {Array<Object>} - Array of ad unit data
+ */
+function buildAdUnitData(requests) {
+  return requests.map((request) => {
+    // Track if we've already requested for this ad unit code
+    adUnitsRequested[request.adUnitCode] =
+      adUnitsRequested[request.adUnitCode] !== undefined
+        ? adUnitsRequested[request.adUnitCode] + 1
+        : 0
+    // Return a new object with only the data we need
+    return {
+      adUnitCode: request.adUnitCode,
+      mediaTypes: request.mediaTypes,
+    }
+  })
+}
+
+/**
+ * Append QS param to existing string
+ * @param {String} str - String to append to
+ * @param {String} key - Key to append
+ * @param {String} value - Value to append
+ * @returns
+ */
+function appendQSParamString(str, key, value) {
+  return str + `${str.length ? '&' : ''}${key}=${value}`
+}
+
+/**
+ * Convert an object to query string parameters
+ * @param {Object} obj - Object to convert
+ * @returns
+ */
+function arrayToQS(arr) {
+  return (
+    '?' +
+    arr.reduce((value, obj) => {
+      return appendQSParamString(value, obj.key, obj.value)
+    }, '')
+  )
+}
+
+/**
+ * Get the largest size array
+ * @param {Array} sizes - Array of size arrays
+ * @returns Size array with the largest area
+ */
+function getLargestSize(sizes, method = area) {
+  if (!sizes || sizes.length === 0) return []
+  if (sizes.length === 1) return sizes[0]
+
+  return sizes.reduce((prev, current) => {
+    if (method(current) > method(prev)) {
+      return current
+    } else {
+      return prev
+    }
+  })
+}
+
+/**
+ * Calculate the area
+ * @param {Array} size - [width, height]
+ * @returns The calculated area
+ */
+const area = (size) => size[0] * size[1]
+
+/**
+ * Save any filter data from winning bid requests for subsequent requests
+ * @param {Array} filter - The filter data bucket currently stored
+ * @param {Array} filterData - The filter data to add
+ */
+function appendFilterData(filter, filterData) {
+  if (filterData && Array.isArray(filterData) && filterData.length) {
+    filterData.forEach((ad) => filter.add(ad))
+  }
+}
+
+export function getPageUrlFromBidRequest(bidRequest) {
+  let paramPageUrl = deepAccess(bidRequest, 'params.url')
+
+  if (paramPageUrl == undefined) return
+
+  if (hasProtocol(paramPageUrl)) return paramPageUrl
+
+  paramPageUrl = addProtocol(paramPageUrl)
+
+  try {
+    const url = new URL(paramPageUrl)
+    return url.href
+  } catch (err) {}
+}
+
+export function hasProtocol(url) {
+  const protocolRegexp = /^http[s]?\:/
+  return protocolRegexp.test(url)
+}
+
+export function addProtocol(url) {
+  if (hasProtocol(url)) {
+    return url
+  }
+
+  let protocolPrefix = 'https:'
+
+  if (url.indexOf('//') !== 0) {
+    protocolPrefix += '//'
+  }
+
+  return `${protocolPrefix}${url}`
+}
diff --git a/modules/nativoBidAdapter.md b/modules/nativoBidAdapter.md
new file mode 100644
index 00000000000..f83fb45b52e
--- /dev/null
+++ b/modules/nativoBidAdapter.md
@@ -0,0 +1,39 @@
+# Overview
+
+```
+Module Name: Nativo Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: prebiddev@nativo.com
+```
+
+# Description
+
+Module that connects to Nativo's demand sources
+
+# Dev
+
+gulp serve --modules=nativoBidAdapter
+
+# Test Parameters
+
+```
+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: 'nativo',
+                params: {
+                    url: 'https://test-sites.internal.nativo.net/testing/prebid_adpater.html'
+                }
+            }]
+
+        }
+    ];
+
+```
diff --git a/modules/naveggIdSystem.js b/modules/naveggIdSystem.js
new file mode 100644
index 00000000000..25f0afe4733
--- /dev/null
+++ b/modules/naveggIdSystem.js
@@ -0,0 +1,111 @@
+/**
+ * This module adds naveggId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/naveggId
+ * @requires module:modules/userId
+ */
+import { isStr, isPlainObject, logError } from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'naveggId';
+const OLD_NAVEGG_ID = 'nid';
+const NAVEGG_ID = 'nvggid';
+const BASE_URL = 'https://id.navegg.com/uid/';
+const DEFAULT_EXPIRE = 8 * 24 * 3600 * 1000;
+const INVALID_EXPIRE = 3600 * 1000;
+
+export const storage = getStorageManager();
+
+function getNaveggIdFromApi() {
+  const callbacks = {
+    success: response => {
+      if (response) {
+        try {
+          const responseObj = JSON.parse(response);
+          writeCookie(NAVEGG_ID, responseObj[NAVEGG_ID]);
+        } catch (error) {
+          logError(error);
+        }
+      }
+    },
+    error: error => {
+      logError('Navegg ID fetch encountered an error', error);
+    }
+  };
+  ajax(BASE_URL, callbacks, undefined, { method: 'GET', withCredentials: false });
+}
+
+function writeCookie(key, value) {
+  try {
+    if (storage.cookiesAreEnabled) {
+      let expTime = new Date();
+      const expires = value ? DEFAULT_EXPIRE : INVALID_EXPIRE;
+      expTime.setTime(expTime.getTime() + expires);
+      storage.setCookie(key, value, expTime.toUTCString(), 'none');
+    }
+  } catch (e) {
+    logError(e);
+  }
+}
+
+function readnaveggIdFromLocalStorage() {
+  return storage.localStorageIsEnabled ? storage.getDataFromLocalStorage(NAVEGG_ID) : null;
+}
+
+function readnaveggIDFromCookie() {
+  return storage.cookiesAreEnabled ? storage.getCookie(NAVEGG_ID) : null;
+}
+
+function readoldnaveggIDFromCookie() {
+  return storage.cookiesAreEnabled ? storage.getCookie(OLD_NAVEGG_ID) : null;
+}
+
+function readnvgIDFromCookie() {
+  return storage.cookiesAreEnabled ? (storage.findSimilarCookies('nvg') ? storage.findSimilarCookies('nvg')[0] : null) : null;
+}
+
+function readnavIDFromCookie() {
+  return storage.cookiesAreEnabled ? (storage.findSimilarCookies('nav') ? storage.findSimilarCookies('nav')[0] : null) : null;
+}
+
+/** @type {Submodule} */
+export const naveggIdSubmodule = {
+  /**
+  * used to link submodule with config
+  * @type {string}
+  */
+  name: MODULE_NAME,
+  /**
+  * decode the stored id value for passing to bid requests
+  * @function
+  * @param { Object | string | undefined } value
+  * @return { Object | string | undefined }
+  */
+  decode(value) {
+    const naveggIdVal = value ? isStr(value) ? value : isPlainObject(value) ? value.id : undefined : undefined;
+    return naveggIdVal ? {
+      'naveggId': naveggIdVal.split('|')[0]
+    } : undefined;
+  },
+  /**
+  * performs action to obtain id and return a value in the callback's response argument
+  * @function
+  * @param {SubmoduleConfig} config
+  * @return {{id: string | undefined } | undefined}
+  */
+  getId() {
+    const naveggIdString = readnaveggIdFromLocalStorage() || readnaveggIDFromCookie() || getNaveggIdFromApi() || readoldnaveggIDFromCookie() || readnvgIDFromCookie() || readnavIDFromCookie();
+
+    if (typeof naveggIdString == 'string' && naveggIdString) {
+      try {
+        return { id: naveggIdString };
+      } catch (error) {
+        logError(error);
+      }
+    }
+    return undefined;
+  }
+};
+submodule('userId', naveggIdSubmodule);
diff --git a/modules/naveggIdSystem.md b/modules/naveggIdSystem.md
new file mode 100644
index 00000000000..f758fbc9d5d
--- /dev/null
+++ b/modules/naveggIdSystem.md
@@ -0,0 +1,22 @@
+## Navegg User ID Submodule
+
+For assistance setting up your module please contact us at [prebid@navegg.com](prebid@navegg.com).
+
+### Prebid Params
+
+Individual params may be set for the IDx Submodule.
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'naveggId',
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `userSync` Configuration Section
+The below parameters apply only to the naveggID integration.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID of the module - `"naveggId"` | `"naveggId"` |
diff --git a/modules/netIdSystem.js b/modules/netIdSystem.js
index cfe78d9f488..90c8735c993 100644
--- a/modules/netIdSystem.js
+++ b/modules/netIdSystem.js
@@ -26,12 +26,12 @@ export const netIdSubmodule = {
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
    * @param {(Object|undefined)} cacheIdObj
    * @returns {IdResponse|undefined}
    */
-  getId(configParams) {
+  getId(config) {
     /* currently not possible */
     return {};
   }
diff --git a/modules/newborntownWebBidAdapter.js b/modules/newborntownWebBidAdapter.js
deleted file mode 100644
index 56c63e2bb4d..00000000000
--- a/modules/newborntownWebBidAdapter.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, NATIVE} from '../src/mediaTypes.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const storage = getStorageManager();
-const BIDDER_CODE = 'newborntownWeb';
-
-const REQUEST_URL = 'https://us-west.solortb.com/adx/api/rtb?from=4'
-
-function randomn(n) {
-  return parseInt((Math.random() + 1) * Math.pow(10, n - 1)) + '';
-}
-function generateGUID() {
-  var d = new Date().getTime();
-  var guid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-    var r = (d + Math.random() * 16) % 16 | 0;
-    d = Math.floor(d / 16);
-    return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
-  })
-  return guid;
-}
-function _isMobile() {
-  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
-}
-function _isConnectedTV() {
-  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
-}
-function _getDeviceType() {
-  return _isMobile() ? 1 : _isConnectedTV() ? 3 : 2;
-}
-var platform = (function getPlatform() {
-  var ua = navigator.userAgent;
-  if (ua.indexOf('Android') > -1 || ua.indexOf('Adr') > -1) {
-    return 'Android'
-  }
-  if (ua.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
-    return 'iOS'
-  }
-  return 'windows'
-})();
-function getLanguage() {
-  const language = navigator.language ? 'language' : 'userLanguage';
-  return navigator[language].split('-')[0];
-}
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, NATIVE],
-  isBidRequestValid: function(bid) {
-    return !!(bid.params.publisher_id && bid.params.slot_id && bid.params.bidfloor);
-  },
-
-  buildRequests: function(validBidRequests, bidderRequest) {
-    let requestArr = []
-    if (validBidRequests.length === 0) {
-      return null;
-    }
-    var guid;
-    if (storage.getDataFromLocalStorage('sax_user_id') == null) {
-      storage.setDataInLocalStorage('sax_user_id', generateGUID())
-    }
-    guid = storage.getDataFromLocalStorage('sax_user_id')
-    utils._each(validBidRequests, function(bidRequest) {
-      const bidRequestObj = bidRequest.params
-      var req = {
-        id: randomn(12) + randomn(12),
-        tmax: bidderRequest.timeout,
-        bidId: bidRequest.bidId,
-        user: {
-          id: guid
-        },
-        imp: [
-          {
-            id: '1',
-            bidfloor: bidRequestObj.bidfloor,
-            bidfloorcur: 'USD',
-            banner: {
-              w: 0,
-              h: 0
-            }
-          }
-        ],
-        site: {
-          domain: window.location.host,
-          id: bidRequestObj.slot_id,
-          page: window.location.href,
-          publisher: {
-            id: bidRequestObj.publisher_id
-          },
-        },
-        device: {
-          ip: '',
-          ua: navigator.userAgent,
-          os: platform,
-          geo: {
-            country: '',
-            type: 0,
-            ipservice: 1,
-            region: '',
-            city: '',
-          },
-          language: getLanguage(),
-          devicetype: _getDeviceType()
-        },
-        ext: {
-          solomath: {
-            slotid: bidRequestObj.slot_id
-          }
-        }
-      };
-      var sizes = bidRequest.sizes;
-      if (sizes) {
-        if (sizes && utils.isArray(sizes[0])) {
-          req.imp[0].banner.w = sizes[0][0];
-          req.imp[0].banner.h = sizes[0][1];
-        } else if (sizes && utils.isNumber(sizes[0])) {
-          req.imp[0].banner.w = sizes[0];
-          req.imp[0].banner.h = sizes[1];
-        }
-      } else {
-        return false;
-      }
-      const options = {
-        withCredentials: false
-      }
-      requestArr.push({
-        method: 'POST',
-        url: REQUEST_URL,
-        data: req,
-        bidderRequest,
-        options: options
-      })
-    })
-    return requestArr;
-  },
-  interpretResponse: function(serverResponse, request) {
-    var bidResponses = [];
-    if (serverResponse.body.seatbid && serverResponse.body.seatbid.length > 0 && serverResponse.body.seatbid[0].bid && serverResponse.body.seatbid[0].bid.length > 0 && serverResponse.body.seatbid[0].bid[0].adm) {
-      utils._each(serverResponse.body.seatbid[0].bid, function(bodyAds) {
-        var adstr = '';
-        adstr = bodyAds.adm;
-        var bidResponse = {
-          requestId: request.data.bidId || 0,
-          cpm: bodyAds.price || 0,
-          width: bodyAds.w ? bodyAds.w : 0,
-          height: bodyAds.h ? bodyAds.h : 0,
-          ad: adstr,
-          netRevenue: true,
-          currency: serverResponse.body.cur || 'USD',
-          ttl: 600,
-          creativeId: bodyAds.cid
-        };
-        bidResponses.push(bidResponse);
-      });
-    }
-    return bidResponses;
-  }
-}
-registerBidder(spec);
diff --git a/modules/newborntownWebBidAdapter.md b/modules/newborntownWebBidAdapter.md
deleted file mode 100644
index f607369ffb6..00000000000
--- a/modules/newborntownWebBidAdapter.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Overview
-
-```
-Module Name: NewborntownWeb Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: zhuyushuang@newborntown.com
-```
-
-# Description
-
-Integration for website
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: '/19968336/header-bid-tag-1',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300, 250]]
-                }
-            }, 
-            bids: [
-                {
-                    bidder: "newborntownWeb",
-                    params: {
-                        'publisher_id': '1238122',
-                        'slot_id': '123123',
-                        'bidfloor': 0.2
-                    }
-                }
-            ]
-        }
-    ];
-```
diff --git a/modules/newspassidBidAdapter.js b/modules/newspassidBidAdapter.js
new file mode 100644
index 00000000000..409cb55e6a0
--- /dev/null
+++ b/modules/newspassidBidAdapter.js
@@ -0,0 +1,649 @@
+import { logInfo, logError, deepAccess, logWarn, deepSetValue, isArray, contains, parseUrl } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {getPriceBucketString} from '../src/cpmBucketManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+const BIDDER_CODE = 'newspassid';
+const ORIGIN = 'https://bidder.newspassid.com' // applies only to auction & cookie
+const AUCTIONURI = '/openrtb2/auction';
+const NEWSPASSCOOKIESYNC = '/static/load-cookie.html';
+const NEWSPASSVERSION = '1.0.1';
+export const spec = {
+  version: NEWSPASSVERSION,
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  cookieSyncBag: {publisherId: null, siteId: null, userIdObject: {}}, // variables we want to make available to cookie sync
+  propertyBag: {config: null, pageId: null, buildRequestsStart: 0, buildRequestsEnd: 0, endpointOverride: null}, /* allow us to store vars in instance scope - needs to be an object to be mutable */
+  config_defaults: {
+    'logId': 'NEWSPASSID',
+    'bidder': 'newspassid',
+    'auctionUrl': ORIGIN + AUCTIONURI,
+    'cookieSyncUrl': ORIGIN + NEWSPASSCOOKIESYNC
+  },
+  loadConfiguredData(bid) {
+    if (this.propertyBag.config) { return; }
+    this.propertyBag.config = JSON.parse(JSON.stringify(this.config_defaults));
+    let bidder = bid.bidder || 'newspassid';
+    this.propertyBag.config.logId = bidder.toUpperCase();
+    this.propertyBag.config.bidder = bidder;
+    let bidderConfig = config.getConfig(bidder) || {};
+    logInfo('got bidderConfig: ', JSON.parse(JSON.stringify(bidderConfig)));
+    let arrGetParams = this.getGetParametersAsObject();
+    if (bidderConfig.endpointOverride) {
+      if (bidderConfig.endpointOverride.origin) {
+        this.propertyBag.endpointOverride = bidderConfig.endpointOverride.origin;
+        this.propertyBag.config.auctionUrl = bidderConfig.endpointOverride.origin + AUCTIONURI;
+        this.propertyBag.config.cookieSyncUrl = bidderConfig.endpointOverride.origin + NEWSPASSCOOKIESYNC;
+      }
+      if (bidderConfig.endpointOverride.cookieSyncUrl) {
+        this.propertyBag.config.cookieSyncUrl = bidderConfig.endpointOverride.cookieSyncUrl;
+      }
+      if (bidderConfig.endpointOverride.auctionUrl) {
+        this.propertyBag.endpointOverride = bidderConfig.endpointOverride.auctionUrl;
+        this.propertyBag.config.auctionUrl = bidderConfig.endpointOverride.auctionUrl;
+      }
+    }
+    try {
+      if (arrGetParams.hasOwnProperty('auction')) {
+        logInfo('GET: setting auction endpoint to: ' + arrGetParams.auction);
+        this.propertyBag.config.auctionUrl = arrGetParams.auction;
+      }
+      if (arrGetParams.hasOwnProperty('cookiesync')) {
+        logInfo('GET: setting cookiesync to: ' + arrGetParams.cookiesync);
+        this.propertyBag.config.cookieSyncUrl = arrGetParams.cookiesync;
+      }
+    } catch (e) {}
+    logInfo('set propertyBag.config to', this.propertyBag.config);
+  },
+  getAuctionUrl() {
+    return this.propertyBag.config.auctionUrl;
+  },
+  getCookieSyncUrl() {
+    return this.propertyBag.config.cookieSyncUrl;
+  },
+  isBidRequestValid(bid) {
+    this.loadConfiguredData(bid);
+    logInfo('isBidRequestValid : ', config.getConfig(), bid);
+    let adUnitCode = bid.adUnitCode; // adunit[n].code
+    let err1 = 'VALIDATION FAILED : missing {param} : siteId, placementId and publisherId are REQUIRED';
+    if (!(bid.params.hasOwnProperty('placementId'))) {
+      logError(err1.replace('{param}', 'placementId'), adUnitCode);
+      return false;
+    }
+    if (!this.isValidPlacementId(bid.params.placementId)) {
+      logError('VALIDATION FAILED : placementId must be exactly 10 numeric characters', adUnitCode);
+      return false;
+    }
+    if (!(bid.params.hasOwnProperty('publisherId'))) {
+      logError(err1.replace('{param}', 'publisherId'), adUnitCode);
+      return false;
+    }
+    if (!(bid.params.publisherId).toString().match(/^[a-zA-Z0-9\-]{12}$/)) {
+      logError('VALIDATION FAILED : publisherId must be exactly 12 alphanumeric characters including hyphens', adUnitCode);
+      return false;
+    }
+    if (!(bid.params.hasOwnProperty('siteId'))) {
+      logError(err1.replace('{param}', 'siteId'), adUnitCode);
+      return false;
+    }
+    if (!(bid.params.siteId).toString().match(/^[0-9]{10}$/)) {
+      logError('VALIDATION FAILED : siteId must be exactly 10 numeric characters', adUnitCode);
+      return false;
+    }
+    if (bid.params.hasOwnProperty('customParams')) {
+      logError('VALIDATION FAILED : customParams should be renamed to customData', adUnitCode);
+      return false;
+    }
+    if (bid.params.hasOwnProperty('customData')) {
+      if (!Array.isArray(bid.params.customData)) {
+        logError('VALIDATION FAILED : customData is not an Array', adUnitCode);
+        return false;
+      }
+      if (bid.params.customData.length < 1) {
+        logError('VALIDATION FAILED : customData is an array but does not contain any elements', adUnitCode);
+        return false;
+      }
+      if (!(bid.params.customData[0]).hasOwnProperty('targeting')) {
+        logError('VALIDATION FAILED : customData[0] does not contain "targeting"', adUnitCode);
+        return false;
+      }
+      if (typeof bid.params.customData[0]['targeting'] != 'object') {
+        logError('VALIDATION FAILED : customData[0] targeting is not an object', adUnitCode);
+        return false;
+      }
+    }
+    return true;
+  },
+  isValidPlacementId(placementId) {
+    return placementId.toString().match(/^[0-9]{10}$/);
+  },
+  buildRequests(validBidRequests, bidderRequest) {
+    this.loadConfiguredData(validBidRequests[0]);
+    this.propertyBag.buildRequestsStart = new Date().getTime();
+    logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${NEWSPASSVERSION} validBidRequests`, JSON.parse(JSON.stringify(validBidRequests)), 'bidderRequest', JSON.parse(JSON.stringify(bidderRequest)));
+    if (this.blockTheRequest()) {
+      return [];
+    }
+    let htmlParams = {'publisherId': '', 'siteId': ''};
+    if (validBidRequests.length > 0) {
+      this.cookieSyncBag.userIdObject = Object.assign(this.cookieSyncBag.userIdObject, this.findAllUserIds(validBidRequests[0]));
+      this.cookieSyncBag.siteId = deepAccess(validBidRequests[0], 'params.siteId');
+      this.cookieSyncBag.publisherId = deepAccess(validBidRequests[0], 'params.publisherId');
+      htmlParams = validBidRequests[0].params;
+    }
+    logInfo('cookie sync bag', this.cookieSyncBag);
+    let singleRequest = config.getConfig('newspassid.singleRequest');
+    singleRequest = singleRequest !== false; // undefined & true will be true
+    logInfo(`config newspassid.singleRequest : `, singleRequest);
+    let npRequest = {}; // we only want to set specific properties on this, not validBidRequests[0].params
+    logInfo('going to get ortb2 from bidder request...');
+    let fpd = deepAccess(bidderRequest, 'ortb2', null);
+    logInfo('got fpd: ', fpd);
+    if (fpd && deepAccess(fpd, 'user')) {
+      logInfo('added FPD user object');
+      npRequest.user = fpd.user;
+    }
+    const getParams = this.getGetParametersAsObject();
+    const isTestMode = getParams['nptestmode'] || null; // this can be any string, it's used for testing ads
+    npRequest.device = {'w': window.innerWidth, 'h': window.innerHeight};
+    let placementIdOverrideFromGetParam = this.getPlacementIdOverrideFromGetParam(); // null or string
+    let schain = null;
+    let tosendtags = validBidRequests.map(npBidRequest => {
+      var obj = {};
+      let placementId = placementIdOverrideFromGetParam || this.getPlacementId(npBidRequest); // prefer to use a valid override param, else the bidRequest placement Id
+      obj.id = npBidRequest.bidId; // this causes an error if we change it to something else, even if you update the bidRequest object: "WARNING: Bidder newspass made bid for unknown request ID: mb7953.859498327448. Ignoring."
+      obj.tagid = placementId;
+      let parsed = parseUrl(getRefererInfo().page);
+      obj.secure = parsed.protocol === 'https' ? 1 : 0;
+      let arrBannerSizes = [];
+      if (!npBidRequest.hasOwnProperty('mediaTypes')) {
+        if (npBidRequest.hasOwnProperty('sizes')) {
+          logInfo('no mediaTypes detected - will use the sizes array in the config root');
+          arrBannerSizes = npBidRequest.sizes;
+        } else {
+          logInfo('Cannot set sizes for banner type');
+        }
+      } else {
+        if (npBidRequest.mediaTypes.hasOwnProperty(BANNER)) {
+          arrBannerSizes = npBidRequest.mediaTypes[BANNER].sizes; /* Note - if there is a sizes element in the config root it will be pushed into here */
+          logInfo('setting banner size from the mediaTypes.banner element for bidId ' + obj.id + ': ', arrBannerSizes);
+        }
+        if (npBidRequest.mediaTypes.hasOwnProperty(NATIVE)) {
+          obj.native = npBidRequest.mediaTypes[NATIVE];
+          logInfo('setting native object from the mediaTypes.native element: ' + obj.id + ':', obj.native);
+        }
+      }
+      if (arrBannerSizes.length > 0) {
+        obj.banner = {
+          topframe: 1,
+          w: arrBannerSizes[0][0] || 0,
+          h: arrBannerSizes[0][1] || 0,
+          format: arrBannerSizes.map(s => {
+            return {w: s[0], h: s[1]};
+          })
+        };
+      }
+      obj.placementId = placementId;
+      deepSetValue(obj, 'ext.prebid', {'storedrequest': {'id': placementId}});
+      obj.ext['newspassid'] = {};
+      obj.ext['newspassid'].adUnitCode = npBidRequest.adUnitCode; // eg. 'mpu'
+      obj.ext['newspassid'].transactionId = npBidRequest.transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
+      if (npBidRequest.params.hasOwnProperty('customData')) {
+        obj.ext['newspassid'].customData = npBidRequest.params.customData;
+      }
+      logInfo(`obj.ext.newspassid is `, obj.ext['newspassid']);
+      if (isTestMode != null) {
+        logInfo('setting isTestMode to ', isTestMode);
+        if (obj.ext['newspassid'].hasOwnProperty('customData')) {
+          for (let i = 0; i < obj.ext['newspassid'].customData.length; i++) {
+            obj.ext['newspassid'].customData[i]['targeting']['nptestmode'] = isTestMode;
+          }
+        } else {
+          obj.ext['newspassid'].customData = [{'settings': {}, 'targeting': {}}];
+          obj.ext['newspassid'].customData[0].targeting['nptestmode'] = isTestMode;
+        }
+      }
+      if (fpd && deepAccess(fpd, 'site')) {
+        logInfo('adding fpd.site');
+        if (deepAccess(obj, 'ext.newspassid.customData.0.targeting', false)) {
+          obj.ext.newspassid.customData[0].targeting = Object.assign(obj.ext.newspassid.customData[0].targeting, fpd.site);
+        } else {
+          deepSetValue(obj, 'ext.newspassid.customData.0.targeting', fpd.site);
+        }
+      }
+      if (!schain && deepAccess(npBidRequest, 'schain')) {
+        schain = npBidRequest.schain;
+      }
+      return obj;
+    });
+    let extObj = {};
+    extObj['newspassid'] = {};
+    extObj['newspassid']['np_pb_v'] = NEWSPASSVERSION;
+    extObj['newspassid']['np_rw'] = placementIdOverrideFromGetParam ? 1 : 0;
+    if (validBidRequests.length > 0) {
+      let userIds = this.cookieSyncBag.userIdObject; // 2021-01-06 - slight optimisation - we've already found this info
+      if (userIds.hasOwnProperty('pubcid')) {
+        extObj['newspassid'].pubcid = userIds.pubcid;
+      }
+    }
+    extObj['newspassid'].pv = this.getPageId(); // attach the page ID that will be common to all auction calls for this page if refresh() is called
+    let whitelistAdserverKeys = config.getConfig('newspassid.np_whitelist_adserver_keys');
+    let useWhitelistAdserverKeys = isArray(whitelistAdserverKeys) && whitelistAdserverKeys.length > 0;
+    extObj['newspassid']['np_kvp_rw'] = useWhitelistAdserverKeys ? 1 : 0;
+    if (getParams.hasOwnProperty('npf')) { extObj['newspassid']['npf'] = getParams.npf === 'true' || getParams.npf === '1' ? 1 : 0; }
+    if (getParams.hasOwnProperty('nppf')) { extObj['newspassid']['nppf'] = getParams.nppf === 'true' || getParams.nppf === '1' ? 1 : 0; }
+    if (getParams.hasOwnProperty('nprp') && getParams.nprp.match(/^[0-3]$/)) { extObj['newspassid']['nprp'] = parseInt(getParams.nprp); }
+    if (getParams.hasOwnProperty('npip') && getParams.npip.match(/^\d+$/)) { extObj['newspassid']['npip'] = parseInt(getParams.npip); }
+    if (this.propertyBag.endpointOverride != null) { extObj['newspassid']['origin'] = this.propertyBag.endpointOverride; }
+    let userExtEids = deepAccess(validBidRequests, '0.userIdAsEids', []); // generate the UserIDs in the correct format for UserId module
+    npRequest.site = {
+      'publisher': {'id': htmlParams.publisherId},
+      'page': getRefererInfo().page,
+      'id': htmlParams.siteId
+    };
+    npRequest.test = config.getConfig('debug') ? 1 : 0;
+    if (bidderRequest && bidderRequest.uspConsent) {
+      logInfo('ADDING USP consent info');
+      deepSetValue(npRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    } else {
+      logInfo('WILL NOT ADD USP consent info; no bidderRequest.uspConsent.');
+    }
+    if (schain) { // we set this while iterating over the bids
+      logInfo('schain found');
+      deepSetValue(npRequest, 'source.ext.schain', schain);
+    }
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(npRequest, 'regs.coppa', 1);
+    }
+    if (singleRequest) {
+      logInfo('buildRequests starting to generate response for a single request');
+      npRequest.id = bidderRequest.auctionId; // Unique ID of the bid request, provided by the exchange.
+      npRequest.auctionId = bidderRequest.auctionId; // not sure if this should be here?
+      npRequest.imp = tosendtags;
+      npRequest.ext = extObj;
+      deepSetValue(npRequest, 'source.tid', bidderRequest.auctionId);// RTB 2.5 : tid is Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
+      deepSetValue(npRequest, 'user.ext.eids', userExtEids);
+      var ret = {
+        method: 'POST',
+        url: this.getAuctionUrl(),
+        data: JSON.stringify(npRequest),
+        bidderRequest: bidderRequest
+      };
+      logInfo('buildRequests request data for single = ', JSON.parse(JSON.stringify(npRequest)));
+      this.propertyBag.buildRequestsEnd = new Date().getTime();
+      logInfo(`buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
+      return ret;
+    }
+    let arrRet = tosendtags.map(imp => {
+      logInfo('buildRequests starting to generate non-single response, working on imp : ', imp);
+      let npRequestSingle = Object.assign({}, npRequest);
+      imp.ext['newspassid'].pageAuctionId = bidderRequest['auctionId']; // make a note in the ext object of what the original auctionId was, in the bidderRequest object
+      npRequestSingle.id = imp.ext['newspassid'].transactionId; // Unique ID of the bid request, provided by the exchange.
+      npRequestSingle.auctionId = imp.ext['newspassid'].transactionId; // not sure if this should be here?
+      npRequestSingle.imp = [imp];
+      npRequestSingle.ext = extObj;
+      deepSetValue(npRequestSingle, 'source.tid', imp.ext['newspassid'].transactionId);// RTB 2.5 : tid is Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
+      deepSetValue(npRequestSingle, 'user.ext.eids', userExtEids);
+      logInfo('buildRequests RequestSingle (for non-single) = ', npRequestSingle);
+      return {
+        method: 'POST',
+        url: this.getAuctionUrl(),
+        data: JSON.stringify(npRequestSingle),
+        bidderRequest: bidderRequest
+      };
+    });
+    this.propertyBag.buildRequestsEnd = new Date().getTime();
+    logInfo(`buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
+    return arrRet;
+  },
+  interpretResponse(serverResponse, request) {
+    if (request && request.bidderRequest && request.bidderRequest.bids) { this.loadConfiguredData(request.bidderRequest.bids[0]); }
+    let startTime = new Date().getTime();
+    logInfo(`interpretResponse time: ${startTime}. buildRequests done -> interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
+    logInfo(`serverResponse, request`, JSON.parse(JSON.stringify(serverResponse)), JSON.parse(JSON.stringify(request)));
+    serverResponse = serverResponse.body || {};
+    if (!serverResponse.hasOwnProperty('seatbid')) {
+      return [];
+    }
+    if (typeof serverResponse.seatbid !== 'object') {
+      return [];
+    }
+    let arrAllBids = [];
+    let enhancedAdserverTargeting = config.getConfig('newspassid.enhancedAdserverTargeting');
+    logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
+    if (typeof enhancedAdserverTargeting == 'undefined') {
+      enhancedAdserverTargeting = true;
+    }
+    logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
+    serverResponse.seatbid = injectAdIdsIntoAllBidResponses(serverResponse.seatbid); // we now make sure that each bid in the bidresponse has a unique (within page) adId attribute.
+    serverResponse.seatbid = this.removeSingleBidderMultipleBids(serverResponse.seatbid);
+    let whitelistAdserverKeys = config.getConfig('newspassid.np_whitelist_adserver_keys');
+    let useWhitelistAdserverKeys = isArray(whitelistAdserverKeys) && whitelistAdserverKeys.length > 0;
+    for (let i = 0; i < serverResponse.seatbid.length; i++) {
+      let sb = serverResponse.seatbid[i];
+      for (let j = 0; j < sb.bid.length; j++) {
+        let thisRequestBid = this.getBidRequestForBidId(sb.bid[j].impid, request.bidderRequest.bids);
+        logInfo(`seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
+        const {defaultWidth, defaultHeight} = defaultSize(thisRequestBid);
+        let thisBid = this.addStandardProperties(sb.bid[j], defaultWidth, defaultHeight);
+        thisBid.meta = {advertiserDomains: thisBid.adomain || []};
+        let bidType = deepAccess(thisBid, 'ext.prebid.type');
+        logInfo(`this bid type is : ${bidType}`, j);
+        let adserverTargeting = {};
+        if (enhancedAdserverTargeting) {
+          let allBidsForThisBidid = this.getAllBidsForBidId(thisBid.bidId, serverResponse.seatbid);
+          logInfo('Going to iterate allBidsForThisBidId', allBidsForThisBidid);
+          Object.keys(allBidsForThisBidid).forEach((bidderName, index, ar2) => {
+            logInfo(`adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
+            adserverTargeting['np_' + bidderName] = bidderName;
+            adserverTargeting['np_' + bidderName + '_crid'] = String(allBidsForThisBidid[bidderName].crid);
+            adserverTargeting['np_' + bidderName + '_adv'] = String(allBidsForThisBidid[bidderName].adomain);
+            adserverTargeting['np_' + bidderName + '_adId'] = String(allBidsForThisBidid[bidderName].adId);
+            adserverTargeting['np_' + bidderName + '_pb_r'] = getRoundedBid(allBidsForThisBidid[bidderName].price, allBidsForThisBidid[bidderName].ext.prebid.type);
+            if (allBidsForThisBidid[bidderName].hasOwnProperty('dealid')) {
+              adserverTargeting['np_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
+            }
+          });
+        } else {
+          logInfo(`newspassid.enhancedAdserverTargeting is set to false, no per-bid keys will be sent to adserver.`);
+        }
+        let {seat: winningSeat, bid: winningBid} = this.getWinnerForRequestBid(thisBid.bidId, serverResponse.seatbid);
+        adserverTargeting['np_auc_id'] = String(request.bidderRequest.auctionId);
+        adserverTargeting['np_winner'] = String(winningSeat);
+        adserverTargeting['np_bid'] = 'true';
+        if (enhancedAdserverTargeting) {
+          adserverTargeting['np_imp_id'] = String(winningBid.impid);
+          adserverTargeting['np_pb_r'] = getRoundedBid(winningBid.price, bidType);
+          adserverTargeting['np_adId'] = String(winningBid.adId);
+          adserverTargeting['np_size'] = `${winningBid.width}x${winningBid.height}`;
+        }
+        if (useWhitelistAdserverKeys) { // delete any un-whitelisted keys
+          logInfo('Going to filter out adserver targeting keys not in the whitelist: ', whitelistAdserverKeys);
+          Object.keys(adserverTargeting).forEach(function(key) { if (whitelistAdserverKeys.indexOf(key) === -1) { delete adserverTargeting[key]; } });
+        }
+        thisBid.adserverTargeting = adserverTargeting;
+        arrAllBids.push(thisBid);
+      }
+    }
+    let endTime = new Date().getTime();
+    logInfo(`interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`, arrAllBids);
+    return arrAllBids;
+  },
+  removeSingleBidderMultipleBids(seatbid) {
+    var ret = [];
+    for (let i = 0; i < seatbid.length; i++) {
+      let sb = seatbid[i];
+      var retSeatbid = {'seat': sb.seat, 'bid': []};
+      var bidIds = [];
+      for (let j = 0; j < sb.bid.length; j++) {
+        var candidate = sb.bid[j];
+        if (contains(bidIds, candidate.impid)) {
+          continue; // we've already fully assessed this impid, found the highest bid from this seat for it
+        }
+        bidIds.push(candidate.impid);
+        for (let k = j + 1; k < sb.bid.length; k++) {
+          if (sb.bid[k].impid === candidate.impid && sb.bid[k].price > candidate.price) {
+            candidate = sb.bid[k];
+          }
+        }
+        retSeatbid.bid.push(candidate);
+      }
+      ret.push(retSeatbid);
+    }
+    return ret;
+  },
+  getUserSyncs(optionsType, serverResponse, gdprConsent, usPrivacy) {
+    logInfo('getUserSyncs optionsType', optionsType, 'serverResponse', serverResponse, 'usPrivacy', usPrivacy, 'cookieSyncBag', this.cookieSyncBag);
+    if (!serverResponse || serverResponse.length === 0) {
+      return [];
+    }
+    if (optionsType.iframeEnabled) {
+      var arrQueryString = [];
+      if (config.getConfig('debug')) {
+        arrQueryString.push('pbjs_debug=true');
+      }
+      arrQueryString.push('usp_consent=' + (usPrivacy || ''));
+      for (let keyname in this.cookieSyncBag.userIdObject) {
+        arrQueryString.push(keyname + '=' + this.cookieSyncBag.userIdObject[keyname]);
+      }
+      arrQueryString.push('publisherId=' + this.cookieSyncBag.publisherId);
+      arrQueryString.push('siteId=' + this.cookieSyncBag.siteId);
+      arrQueryString.push('cb=' + Date.now());
+      arrQueryString.push('bidder=' + this.propertyBag.config.bidder);
+      var strQueryString = arrQueryString.join('&');
+      if (strQueryString.length > 0) {
+        strQueryString = '?' + strQueryString;
+      }
+      logInfo('getUserSyncs going to return cookie sync url : ' + this.getCookieSyncUrl() + strQueryString);
+      return [{
+        type: 'iframe',
+        url: this.getCookieSyncUrl() + strQueryString
+      }];
+    }
+  },
+  getBidRequestForBidId(bidId, arrBids) {
+    for (let i = 0; i < arrBids.length; i++) {
+      if (arrBids[i].bidId === bidId) { // bidId in the request comes back as impid in the seatbid bids
+        return arrBids[i];
+      }
+    }
+    return null;
+  },
+  findAllUserIds(bidRequest) {
+    var ret = {};
+    let searchKeysSingle = ['pubcid', 'tdid', 'idl_env', 'criteoId', 'lotamePanoramaId', 'fabrickId'];
+    if (bidRequest.hasOwnProperty('userId')) {
+      for (let arrayId in searchKeysSingle) {
+        let key = searchKeysSingle[arrayId];
+        if (bidRequest.userId.hasOwnProperty(key)) {
+          if (typeof (bidRequest.userId[key]) == 'string') {
+            ret[key] = bidRequest.userId[key];
+          } else if (typeof (bidRequest.userId[key]) == 'object') {
+            logError(`WARNING: findAllUserIds had to use first key in user object to get value for bid.userId key: ${key}. Prebid adapter should be updated.`);
+            ret[key] = bidRequest.userId[key][Object.keys(bidRequest.userId[key])[0]]; // cannot use Object.values
+          } else {
+            logError(`failed to get string key value for userId : ${key}`);
+          }
+        }
+      }
+      let lipbid = deepAccess(bidRequest.userId, 'lipb.lipbid');
+      if (lipbid) {
+        ret['lipb'] = {'lipbid': lipbid};
+      }
+      let id5id = deepAccess(bidRequest.userId, 'id5id.uid');
+      if (id5id) {
+        ret['id5id'] = id5id;
+      }
+      let parrableId = deepAccess(bidRequest.userId, 'parrableId.eid');
+      if (parrableId) {
+        ret['parrableId'] = parrableId;
+      }
+      let sharedid = deepAccess(bidRequest.userId, 'sharedid.id');
+      if (sharedid) {
+        ret['sharedid'] = sharedid;
+      }
+    }
+    if (!ret.hasOwnProperty('pubcid')) {
+      let pubcid = deepAccess(bidRequest, 'crumbs.pubcid');
+      if (pubcid) {
+        ret['pubcid'] = pubcid; // if built with old pubCommonId module
+      }
+    }
+    return ret;
+  },
+  getPlacementId(bidRequest) {
+    return (bidRequest.params.placementId).toString();
+  },
+  getPlacementIdOverrideFromGetParam() {
+    let arr = this.getGetParametersAsObject();
+    if (arr.hasOwnProperty('npstoredrequest')) {
+      if (this.isValidPlacementId(arr['npstoredrequest'])) {
+        logInfo(`using GET npstoredrequest ` + arr['npstoredrequest'] + ' to replace placementId');
+        return arr['npstoredrequest'];
+      } else {
+        logError(`GET npstoredrequest FAILED VALIDATION - will not use it`);
+      }
+    }
+    return null;
+  },
+  getGetParametersAsObject() {
+    let parsed = parseUrl(getRefererInfo().page);
+    logInfo('getGetParametersAsObject found:', parsed.search);
+    return parsed.search;
+  },
+  blockTheRequest() {
+    let npRequest = config.getConfig('newspassid.np_request');
+    if (typeof npRequest == 'boolean' && !npRequest) {
+      logWarn(`Will not allow auction : np_request is set to false`);
+      return true;
+    }
+    return false;
+  },
+  getPageId: function() {
+    if (this.propertyBag.pageId == null) {
+      let randPart = '';
+      let allowable = '0123456789abcdefghijklmnopqrstuvwxyz';
+      for (let i = 20; i > 0; i--) {
+        randPart += allowable[Math.floor(Math.random() * 36)];
+      }
+      this.propertyBag.pageId = new Date().getTime() + '_' + randPart;
+    }
+    return this.propertyBag.pageId;
+  },
+  addStandardProperties(seatBid, defaultWidth, defaultHeight) {
+    seatBid.cpm = seatBid.price;
+    seatBid.bidId = seatBid.impid;
+    seatBid.requestId = seatBid.impid;
+    seatBid.width = seatBid.w || defaultWidth;
+    seatBid.height = seatBid.h || defaultHeight;
+    seatBid.ad = seatBid.adm;
+    seatBid.netRevenue = true;
+    seatBid.creativeId = seatBid.crid;
+    seatBid.currency = 'USD';
+    seatBid.ttl = 300;
+    return seatBid;
+  },
+  getWinnerForRequestBid(requestBidId, serverResponseSeatBid) {
+    let thisBidWinner = null;
+    let winningSeat = null;
+    for (let j = 0; j < serverResponseSeatBid.length; j++) {
+      let theseBids = serverResponseSeatBid[j].bid;
+      let thisSeat = serverResponseSeatBid[j].seat;
+      for (let k = 0; k < theseBids.length; k++) {
+        if (theseBids[k].impid === requestBidId) {
+          if ((thisBidWinner == null) || (thisBidWinner.price < theseBids[k].price)) {
+            thisBidWinner = theseBids[k];
+            winningSeat = thisSeat;
+            break;
+          }
+        }
+      }
+    }
+    return {'seat': winningSeat, 'bid': thisBidWinner};
+  },
+  getAllBidsForBidId(matchBidId, serverResponseSeatBid) {
+    let objBids = {};
+    for (let j = 0; j < serverResponseSeatBid.length; j++) {
+      let theseBids = serverResponseSeatBid[j].bid;
+      let thisSeat = serverResponseSeatBid[j].seat;
+      for (let k = 0; k < theseBids.length; k++) {
+        if (theseBids[k].impid === matchBidId) {
+          if (objBids.hasOwnProperty(thisSeat)) { // > 1 bid for an adunit from a bidder - only use the one with the highest bid
+            if (objBids[thisSeat]['price'] < theseBids[k].price) {
+              objBids[thisSeat] = theseBids[k];
+            }
+          } else {
+            objBids[thisSeat] = theseBids[k];
+          }
+        }
+      }
+    }
+    return objBids;
+  }
+};
+export function injectAdIdsIntoAllBidResponses(seatbid) {
+  logInfo('injectAdIdsIntoAllBidResponses', seatbid);
+  for (let i = 0; i < seatbid.length; i++) {
+    let sb = seatbid[i];
+    for (let j = 0; j < sb.bid.length; j++) {
+      sb.bid[j]['adId'] = `${sb.bid[j]['impid']}-${i}-np-${j}`;
+    }
+  }
+  return seatbid;
+}
+export function checkDeepArray(Arr) {
+  if (Array.isArray(Arr)) {
+    if (Array.isArray(Arr[0])) {
+      return Arr[0];
+    } else {
+      return Arr;
+    }
+  } else {
+    return Arr;
+  }
+}
+export function defaultSize(thebidObj) {
+  if (!thebidObj) {
+    logInfo('defaultSize received empty bid obj! going to return fixed default size');
+    return {
+      'defaultHeight': 250,
+      'defaultWidth': 300
+    };
+  }
+  const {sizes} = thebidObj;
+  const returnObject = {};
+  returnObject.defaultWidth = checkDeepArray(sizes)[0];
+  returnObject.defaultHeight = checkDeepArray(sizes)[1];
+  return returnObject;
+}
+export function getRoundedBid(price, mediaType) {
+  const mediaTypeGranularity = config.getConfig(`mediaTypePriceGranularity.${mediaType}`); // might be string or object or nothing; if set then this takes precedence over 'priceGranularity'
+  let objBuckets = config.getConfig('customPriceBucket'); // this is always an object - {} if strBuckets is not 'custom'
+  let strBuckets = config.getConfig('priceGranularity'); // priceGranularity value, always a string ** if priceGranularity is set to an object then it's always 'custom' **
+  let theConfigObject = getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets);
+  let theConfigKey = getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets);
+  logInfo('getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
+  let priceStringsObj = getPriceBucketString(
+    price,
+    theConfigObject,
+    config.getConfig('currency.granularityMultiplier')
+  );
+  logInfo('priceStringsObj', priceStringsObj);
+  let granularityNamePriceStringsKeyMapping = {
+    'medium': 'med',
+    'custom': 'custom',
+    'high': 'high',
+    'low': 'low',
+    'dense': 'dense'
+  };
+  if (granularityNamePriceStringsKeyMapping.hasOwnProperty(theConfigKey)) {
+    let priceStringsKey = granularityNamePriceStringsKeyMapping[theConfigKey];
+    logInfo('getRoundedBid: looking for priceStringsKey:', priceStringsKey);
+    return priceStringsObj[priceStringsKey];
+  }
+  return priceStringsObj['auto'];
+}
+export function getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets) {
+  if (typeof mediaTypeGranularity === 'string') {
+    return mediaTypeGranularity;
+  }
+  if (typeof mediaTypeGranularity === 'object') {
+    return 'custom';
+  }
+  if (typeof strBuckets === 'string') {
+    return strBuckets;
+  }
+  return 'auto'; // fall back to a default key - should literally never be needed.
+}
+export function getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets) {
+  if (typeof mediaTypeGranularity === 'object') {
+    return mediaTypeGranularity;
+  }
+  if (strBuckets === 'custom') {
+    return objBuckets;
+  }
+  return '';
+}
+registerBidder(spec);
+logInfo(`*BidAdapter ${NEWSPASSVERSION} was loaded`);
diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index af1f0562ba4..b5d0e15d078 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -1,37 +1,159 @@
-import * as utils from '../src/utils.js';
+import {
+  isArray,
+  _each,
+  createTrackPixelHtml,
+  deepAccess,
+  isStr,
+  getWindowTop,
+  getBidIdParameter,
+  logMessage,
+  parseUrl,
+  triggerPixel,
+  getDefinedParams,
+  parseGPTSingleSizeArrayToRtbSize,
+} from '../src/utils.js';
+
+import CONSTANTS from '../src/constants.json';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import * as events from '../src/events.js';
+
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { getRefererInfo } from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'nextMillennium';
-const HOST = 'https://brainlyads.com';
-const CURRENCY = 'USD';
+const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
+const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
+const REPORT_ENDPOINT = 'https://report2.hb.brainlyads.com/statistics/metric';
 const TIME_TO_LIVE = 360;
+const VIDEO_PARAMS = [
+  'api', 'linearity', 'maxduration', 'mimes', 'minduration', 'placement',
+  'playbackmethod', 'protocols', 'startdelay'
+];
+
+const sendingDataStatistic = initSendingDataStatistic();
+events.on(CONSTANTS.EVENTS.AUCTION_INIT, auctionInitHandler);
+
+const EXPIRENCE_WURL = 20 * 60000;
+const wurlMap = {};
+cleanWurl();
+
+events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler);
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: function(bid) {
     return !!(
-      bid.params.placement_id && utils.isNumber(bid.params.placement_id)
+      (bid.params.placement_id && isStr(bid.params.placement_id)) || (bid.params.group_id && isStr(bid.params.group_id))
     );
   },
 
-  buildRequests: function(validBidRequests) {
-    let requests = [];
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const requests = [];
+    window.nmmRefreshCounts = window.nmmRefreshCounts || {};
+
+    _each(validBidRequests, function(bid) {
+      window.nmmRefreshCounts[bid.adUnitCode] = window.nmmRefreshCounts[bid.adUnitCode] || 0;
+      const id = getPlacementId(bid);
+      const auctionId = bid.auctionId;
+      const bidId = bid.bidId;
+      let sizes = bid.sizes;
+      if (sizes && !Array.isArray(sizes[0])) sizes = [sizes];
+
+      const site = getSiteObj();
+      const device = getDeviceObj();
+
+      const postBody = {
+        'id': bid.auctionId,
+        'ext': {
+          'prebid': {
+            'storedrequest': {
+              'id': id
+            }
+          },
+
+          'nextMillennium': {
+            'refresh_count': window.nmmRefreshCounts[bid.adUnitCode]++,
+            'elOffsets': getBoundingClient(bid),
+            'scrollTop': window.pageYOffset || document.documentElement.scrollTop
+          }
+        },
+
+        device,
+        site,
+        imp: []
+      };
+
+      const imp = {
+        ext: {
+          prebid: {
+            storedrequest: {id}
+          }
+        }
+      };
+
+      if (deepAccess(bid, 'mediaTypes.banner')) {
+        imp.banner = {
+          format: (sizes || []).map(s => { return {w: s[0], h: s[1]} })
+        };
+      };
+
+      const video = deepAccess(bid, 'mediaTypes.video');
+      if (video) {
+        imp.video = getDefinedParams(video, VIDEO_PARAMS);
+        if (video.playerSize) {
+          imp.video = Object.assign(
+            imp.video, parseGPTSingleSizeArrayToRtbSize(video.playerSize[0]) || {}
+          );
+        } else if (video.w && video.h) {
+          imp.video.w = video.w;
+          imp.video.h = video.h;
+        };
+      };
+
+      postBody.imp.push(imp);
+
+      const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
+      const uspConsent = bidderRequest && bidderRequest.uspConsent;
+
+      if (gdprConsent || uspConsent) {
+        postBody.regs = { ext: {} };
+
+        if (uspConsent) {
+          postBody.regs.ext.us_privacy = uspConsent;
+        };
+
+        if (gdprConsent) {
+          if (typeof gdprConsent.gdprApplies !== 'undefined') {
+            postBody.regs.ext.gdpr = gdprConsent.gdprApplies ? 1 : 0;
+          };
+
+          if (typeof gdprConsent.consentString !== 'undefined') {
+            postBody.user = {
+              ext: { consent: gdprConsent.consentString }
+            };
+          };
+        };
+      };
+
+      const urlParameters = parseUrl(getWindowTop().location.href).search;
+      const isTest = urlParameters['pbs'] && urlParameters['pbs'] === 'test';
+      const params = bid.params;
 
-    utils._each(validBidRequests, function(bid) {
       requests.push({
         method: 'POST',
-        url: HOST + '/hb/s2s',
+        url: isTest ? TEST_ENDPOINT : ENDPOINT,
+        data: JSON.stringify(postBody),
         options: {
-          contentType: 'application/json',
+          contentType: 'text/plain',
           withCredentials: true
         },
-        data: JSON.stringify({
-          placement_id: utils.getBidIdParameter('placement_id', bid.params)
-        }),
-        bidId: bid.bidId
+
+        bidId,
+        params,
+        auctionId,
       });
     });
 
@@ -39,47 +161,334 @@ export const spec = {
   },
 
   interpretResponse: function(serverResponse, bidRequest) {
-    try {
-      const bidResponse = serverResponse.body;
-      const bidResponses = [];
-
-      if (Number(bidResponse.cpm) > 0) {
-        bidResponses.push({
-          requestId: bidRequest.bidId,
-          cpm: bidResponse.cpm,
-          width: bidResponse.width,
-          height: bidResponse.height,
-          creativeId: bidResponse.creativeId,
-          currency: CURRENCY,
+    const response = serverResponse.body;
+    const bidResponses = [];
+
+    _each(response.seatbid, (resp) => {
+      _each(resp.bid, (bid) => {
+        const requestId = bidRequest.bidId;
+        const params = bidRequest.params;
+        const auctionId = bidRequest.auctionId;
+        const wurl = deepAccess(bid, 'ext.prebid.events.win');
+        addWurl({auctionId, requestId, wurl});
+
+        const {ad, adUrl, vastUrl, vastXml} = getAd(bid);
+
+        const bidResponse = {
+          requestId,
+          params,
+          cpm: bid.price,
+          width: bid.w,
+          height: bid.h,
+          creativeId: bid.adid,
+          currency: response.cur,
           netRevenue: false,
           ttl: TIME_TO_LIVE,
-          ad: bidResponse.ad
-        });
-      }
-
-      return bidResponses;
-    } catch (err) {
-      utils.logError(err);
-      return [];
+          meta: {
+            advertiserDomains: bid.adomain || []
+          }
+        };
+
+        if (vastUrl || vastXml) {
+          bidResponse.mediaType = VIDEO;
+
+          if (vastUrl) bidResponse.vastUrl = vastUrl;
+          if (vastXml) bidResponse.vastXml = vastXml;
+        } else {
+          bidResponse.ad = ad;
+          bidResponse.adUrl = adUrl;
+        };
+
+        bidResponses.push(bidResponse);
+      });
+    });
+
+    return bidResponses;
+  },
+
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+    const pixels = [];
+
+    if (isArray(responses)) {
+      responses.forEach(response => {
+        if (syncOptions.pixelEnabled) {
+          deepAccess(response, 'body.ext.sync.image', []).forEach(imgUrl => {
+            pixels.push({
+              type: 'image',
+              url: replaceUsersyncMacros(imgUrl, gdprConsent, uspConsent)
+            });
+          })
+        }
+
+        if (syncOptions.iframeEnabled) {
+          deepAccess(response, 'body.ext.sync.iframe', []).forEach(iframeUrl => {
+            pixels.push({
+              type: 'iframe',
+              url: replaceUsersyncMacros(iframeUrl, gdprConsent, uspConsent)
+            });
+          })
+        }
+      })
     }
+
+    return pixels;
   },
 
-  getUserSyncs: function(syncOptions) {
-    const syncs = []
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: HOST + '/hb/s2s/matching'
-      });
+  getUrlPixelMetric(eventName, bid) {
+    const bidder = bid.bidder || bid.bidderCode;
+    if (bidder != BIDDER_CODE) return;
+
+    let params;
+    if (bid.params) {
+      params = Array.isArray(bid.params) ? bid.params : [bid.params];
+    } else {
+      if (Array.isArray(bid.bids)) params = bid.bids.map(bidI => bidI.params);
+    };
+
+    if (!params.length) return;
+
+    const placementIdsArray = [];
+    const groupIdsArray = [];
+    params.forEach(paramsI => {
+      if (paramsI.group_id) {
+        groupIdsArray.push(paramsI.group_id);
+      } else {
+        if (paramsI.placement_id) placementIdsArray.push(paramsI.placement_id);
+      };
+    });
+
+    const placementIds = (placementIdsArray.length && `&placements=${placementIdsArray.join(';')}`) || '';
+    const groupIds = (groupIdsArray.length && `&groups=${groupIdsArray.join(';')}`) || '';
+
+    if (!(groupIds || placementIds)) {
+      return;
+    };
+
+    const url = `${REPORT_ENDPOINT}?event=${eventName}&bidder=${bidder}&source=pbjs${groupIds}${placementIds}`;
+
+    return url;
+  },
+};
+
+function replaceUsersyncMacros(url, gdprConsent, uspConsent) {
+  const { consentString, gdprApplies } = gdprConsent;
+
+  return url.replace(
+    '{{.GDPR}}', Number(gdprApplies)
+  ).replace(
+    '{{.GDPRConsent}}', consentString
+  ).replace(
+    '{{.USPrivacy}}', uspConsent
+  );
+};
+
+function getAdEl(bid) {
+  // best way I could think of to get El, is by matching adUnitCode to google slots...
+  const slot = window.googletag && window.googletag.pubads && window.googletag.pubads().getSlots().find(slot => slot.getAdUnitPath() === bid.adUnitCode);
+  const slotElementId = slot && slot.getSlotElementId();
+  if (!slotElementId) return null;
+  return document.querySelector('#' + slotElementId);
+}
+
+function getBoundingClient(bid) {
+  const el = getAdEl(bid);
+  if (!el) return {};
+  return el.getBoundingClientRect();
+}
+
+function getPlacementId(bid) {
+  const groupId = getBidIdParameter('group_id', bid.params);
+  const placementId = getBidIdParameter('placement_id', bid.params);
+  if (!groupId) return placementId;
+
+  let windowTop = getTopWindow(window);
+  let sizes = [];
+  if (bid.mediaTypes) {
+    if (bid.mediaTypes.banner) sizes = bid.mediaTypes.banner.sizes;
+    if (bid.mediaTypes.video) sizes = [bid.mediaTypes.video.playerSize];
+  };
+
+  const host = (windowTop && windowTop.location && windowTop.location.host) || '';
+  return `g${groupId};${sizes.map(size => size.join('x')).join('|')};${host}`;
+}
+
+function getTopWindow(curWindow, nesting = 0) {
+  if (nesting > 10) {
+    return curWindow;
+  };
+
+  try {
+    if (curWindow.parent.document) {
+      return getTopWindow(curWindow.parent.window, ++nesting);
+    };
+  } catch (err) {
+    return curWindow;
+  };
+}
+
+function getAd(bid) {
+  let ad, adUrl, vastXml, vastUrl;
+
+  switch (deepAccess(bid, 'ext.prebid.type')) {
+    case VIDEO:
+      if (bid.adm.substr(0, 4) === 'http') {
+        vastUrl = bid.adm;
+      } else {
+        vastXml = bid.adm;
+      };
+
+      break;
+    default:
+      if (bid.adm && bid.nurl) {
+        ad = bid.adm;
+        ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
+      } else if (bid.adm) {
+        ad = bid.adm;
+      } else if (bid.nurl) {
+        adUrl = bid.nurl;
+      };
+  }
+
+  return {ad, adUrl, vastXml, vastUrl};
+}
+
+function getSiteObj() {
+  const refInfo = (getRefererInfo && getRefererInfo()) || {};
+
+  return {
+    page: refInfo.page,
+    ref: refInfo.ref,
+    domain: refInfo.domain
+  };
+}
+
+function getDeviceObj() {
+  return {
+    w: window.innerWidth || window.document.documentElement.clientWidth || window.document.body.clientWidth || 0,
+    h: window.innerHeight || window.document.documentElement.clientHeight || window.document.body.clientHeight || 0,
+  };
+}
+
+function getKeyWurl({auctionId, requestId}) {
+  return `${auctionId}-${requestId}`;
+}
+
+function addWurl({wurl, requestId, auctionId}) {
+  if (!wurl) return;
+
+  const expirence = Date.now() + EXPIRENCE_WURL;
+  const key = getKeyWurl({auctionId, requestId});
+  wurlMap[key] = {wurl, expirence};
+}
+
+function removeWurl({auctionId, requestId}) {
+  const key = getKeyWurl({auctionId, requestId});
+  delete wurlMap[key];
+}
+
+function getWurl({auctionId, requestId}) {
+  const key = getKeyWurl({auctionId, requestId});
+  return wurlMap[key] && wurlMap[key].wurl;
+}
+
+function bidWonHandler(bid) {
+  const {auctionId, requestId} = bid;
+  const wurl = getWurl({auctionId, requestId});
+  if (wurl) {
+    logMessage(`(nextmillennium) Invoking image pixel for wurl on BID_WIN: "${wurl}"`);
+    triggerPixel(wurl);
+    removeWurl({auctionId, requestId});
+  };
+}
+
+function auctionInitHandler() {
+  sendingDataStatistic.initEvents();
+}
+
+function cleanWurl() {
+  const dateNow = Date.now();
+  Object.keys(wurlMap).forEach(key => {
+    if (dateNow >= wurlMap[key].expirence) {
+      delete wurlMap[key];
+    };
+  });
+
+  setTimeout(cleanWurl, 60000);
+}
+
+function initSendingDataStatistic() {
+  class SendingDataStatistic {
+    eventNames = [
+      CONSTANTS.EVENTS.BID_TIMEOUT,
+      CONSTANTS.EVENTS.BID_RESPONSE,
+      CONSTANTS.EVENTS.BID_REQUESTED,
+      CONSTANTS.EVENTS.NO_BID,
+    ];
+
+    disabledSending = false;
+    enabledSending = false;
+    eventHendlers = {};
+
+    initEvents() {
+      this.disabledSending = !!config.getBidderConfig()?.nextMillennium?.disabledSendingStatisticData;
+      if (this.disabledSending) {
+        this.removeEvents();
+      } else {
+        this.createEvents();
+      };
     }
 
-    if (syncOptions.pixelEnabled) {
-      syncs.push({
-        type: 'image',
-        url: HOST + '/hb/s2s/matching'
-      });
+    createEvents() {
+      if (this.enabledSending) return;
+
+      this.enabledSending = true;
+      for (let eventName of this.eventNames) {
+        if (!this.eventHendlers[eventName]) {
+          this.eventHendlers[eventName] = this.eventHandler(eventName);
+        };
+
+        events.on(eventName, this.eventHendlers[eventName]);
+      };
     }
-    return syncs;
-  }
-};
+
+    removeEvents() {
+      if (!this.enabledSending) return;
+
+      this.enabledSending = false;
+      for (let eventName of this.eventNames) {
+        if (!this.eventHendlers[eventName]) continue;
+
+        events.off(eventName, this.eventHendlers[eventName]);
+      };
+    }
+
+    eventHandler(eventName) {
+      const eventHandlerFunc = this.getEventHandler(eventName);
+      if (eventName == CONSTANTS.EVENTS.BID_TIMEOUT) {
+        return bids => {
+          if (this.disabledSending || !Array.isArray(bids)) return;
+
+          for (let bid of bids) {
+            eventHandlerFunc(bid);
+          };
+        }
+      };
+
+      return eventHandlerFunc;
+    }
+
+    getEventHandler(eventName) {
+      return bid => {
+        if (this.disabledSending) return;
+
+        const url = spec.getUrlPixelMetric(eventName, bid);
+        if (!url) return;
+        triggerPixel(url);
+      };
+    }
+  };
+
+  return new SendingDataStatistic();
+}
+
 registerBidder(spec);
diff --git a/modules/nextMillenniumBidAdapter.md b/modules/nextMillenniumBidAdapter.md
index c583969b4af..5374accfe35 100644
--- a/modules/nextMillenniumBidAdapter.md
+++ b/modules/nextMillenniumBidAdapter.md
@@ -2,7 +2,7 @@
 ```
 Module Name: NextMillennium Bid Adapter
 Module Type: Bidder Adapter
-Maintainer: mikhail.ivanchenko@iageengineering.net
+Maintainer: accountmanagers@nextmillennium.io
 ```
 
 # Description
@@ -21,8 +21,9 @@ Currently module supports only banner mediaType.
         bids: [{
             bidder: 'nextMillennium',
             params: {
-                placement_id: -1
+                placement_id: '-1',
+                group_id: '6731'
             }
         }]
     }];
-```
\ No newline at end of file
+```
diff --git a/modules/nextrollBidAdapter.js b/modules/nextrollBidAdapter.js
index 02ebcd3f87a..0dd4b334f6e 100644
--- a/modules/nextrollBidAdapter.js
+++ b/modules/nextrollBidAdapter.js
@@ -1,8 +1,19 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
-
-import find from 'core-js-pure/features/array/find.js';
+import {
+  deepAccess,
+  getBidIdParameter,
+  isArray,
+  isFn,
+  isNumber,
+  isPlainObject,
+  isStr,
+  parseUrl,
+  replaceAuctionPrice,
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+import {find} from '../src/polyfill.js';
 
 const BIDDER_CODE = 'nextroll';
 const BIDDER_ENDPOINT = 'https://d.adroll.com/bid/prebid/';
@@ -29,7 +40,10 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    let topLocation = utils.parseUrl(utils.deepAccess(bidderRequest, 'refererInfo.referer'));
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    // TODO: is 'page' the right value here?
+    let topLocation = parseUrl(deepAccess(bidderRequest, 'refererInfo.page'));
 
     return validBidRequests.map((bidRequest) => {
       return {
@@ -42,12 +56,12 @@ export const spec = {
           id: bidRequest.bidId,
           imp: {
             id: bidRequest.bidId,
-            bidfloor: utils.getBidIdParameter('bidfloor', bidRequest.params),
+            bidfloor: _getFloor(bidRequest),
             banner: _getBanner(bidRequest),
-            native: _getNative(utils.deepAccess(bidRequest, 'mediaTypes.native')),
+            native: _getNative(deepAccess(bidRequest, 'mediaTypes.native')),
             ext: {
               zone: {
-                id: utils.getBidIdParameter('zoneId', bidRequest.params)
+                id: getBidIdParameter('zoneId', bidRequest.params)
               },
               nextroll: {
                 adapter_version: ADAPTER_VERSION
@@ -55,7 +69,6 @@ export const spec = {
             }
           },
 
-          user: _getUser(validBidRequests),
           site: _getSite(bidRequest, topLocation),
           seller: _getSeller(bidRequest),
           device: _getDevice(bidRequest),
@@ -139,13 +152,13 @@ function _getTitleAsset(title, _assetMap) {
 }
 
 function _getMinAspectRatio(aspectRatio, property) {
-  if (!utils.isPlainObject(aspectRatio)) return 1;
+  if (!isPlainObject(aspectRatio)) return 1;
 
   const ratio = aspectRatio['ratio_' + property];
   const min = aspectRatio['min_' + property];
 
-  if (utils.isNumber(ratio)) return ratio;
-  if (utils.isNumber(min)) return min;
+  if (isNumber(ratio)) return ratio;
+  if (isNumber(min)) return min;
 
   return 1;
 }
@@ -176,20 +189,21 @@ function _getNativeAssets(mediaTypeNative) {
     .filter(asset => asset !== undefined);
 }
 
-function _getUser(requests) {
-  const id = utils.deepAccess(requests, '0.userId.nextroll');
-  if (id === undefined) {
-    return;
+function _getFloor(bidRequest) {
+  if (!isFn(bidRequest.getFloor)) {
+    return (bidRequest.params.bidfloor) ? bidRequest.params.bidfloor : null;
   }
 
-  return {
-    ext: {
-      eid: [{
-        'source': 'nextroll',
-        id
-      }]
-    }
-  };
+  let floor = bidRequest.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
 }
 
 function _buildResponse(bidResponse, bid) {
@@ -202,11 +216,14 @@ function _buildResponse(bidResponse, bid) {
     dealId: bidResponse.dealId,
     currency: 'USD',
     netRevenue: true,
-    ttl: 300
+    ttl: 300,
+    meta: {
+      advertiserDomains: bidResponse.adomain || []
+    }
   };
-  if (utils.isStr(bid.adm)) {
+  if (isStr(bid.adm)) {
     response.mediaType = BANNER;
-    response.ad = utils.replaceAuctionPrice(bid.adm, bid.price);
+    response.ad = replaceAuctionPrice(bid.adm, bid.price);
   } else {
     response.mediaType = NATIVE;
     response.native = _getNativeResponse(bid.adm, bid.price);
@@ -214,15 +231,15 @@ function _buildResponse(bidResponse, bid) {
   return response;
 }
 
-const privacyLink = 'https://info.evidon.com/pub_info/573';
-const privacyIcon = 'https://c.betrad.com/pub/icon1.png';
+const privacyLink = 'https://app.adroll.com/optout/personalized';
+const privacyIcon = 'https://s.adroll.com/j/ad-choices-small.png';
 
 function _getNativeResponse(adm, price) {
   let baseResponse = {
     clickTrackers: (adm.link && adm.link.clicktrackers) || [],
     jstracker: adm.jstracker || [],
-    clickUrl: utils.replaceAuctionPrice(adm.link.url, price),
-    impressionTrackers: adm.imptrackers.map(impTracker => utils.replaceAuctionPrice(impTracker, price)),
+    clickUrl: replaceAuctionPrice(adm.link.url, price),
+    impressionTrackers: adm.imptrackers.map(impTracker => replaceAuctionPrice(impTracker, price)),
     privacyLink: privacyLink,
     privacyIcon: privacyIcon
   };
@@ -257,19 +274,19 @@ function _getSite(bidRequest, topLocation) {
     page: topLocation.href,
     domain: topLocation.hostname,
     publisher: {
-      id: utils.getBidIdParameter('publisherId', bidRequest.params)
+      id: getBidIdParameter('publisherId', bidRequest.params)
     }
   };
 }
 
 function _getSeller(bidRequest) {
   return {
-    id: utils.getBidIdParameter('sellerId', bidRequest.params)
+    id: getBidIdParameter('sellerId', bidRequest.params)
   };
 }
 
 function _getSizes(bidRequest) {
-  if (!utils.isArray(bidRequest.sizes)) {
+  if (!isArray(bidRequest.sizes)) {
     return undefined;
   }
   return bidRequest.sizes.filter(_isValidSize).map(size => {
diff --git a/modules/nexx360BidAdapter.js b/modules/nexx360BidAdapter.js
new file mode 100644
index 00000000000..ff4ca77aac2
--- /dev/null
+++ b/modules/nexx360BidAdapter.js
@@ -0,0 +1,302 @@
+import {config} from '../src/config.js';
+import * as utils from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+
+const VIDEO_TARGETING = ['startdelay', 'mimes', 'minduration', 'maxduration', 'delivery',
+  'startdelay', 'skip', 'playbackmethod', 'api', 'protocol', 'boxingallowed', 'maxextended',
+  'linearity', 'delivery', 'protocols', 'placement', 'minbitrate', 'maxbitrate', 'battr', 'ext'];
+const BIDDER_CODE = 'nexx360';
+const REQUEST_URL = 'https://fast.nexx360.io/booster';
+
+const PAGE_VIEW_ID = utils.generateUUID();
+
+const BIDDER_VERSION = '1.0';
+
+const GVLID = 965;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: [
+    { code: 'revenuemaker' },
+    { code: 'firstid-ssp' },
+  ],
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
+  // onBidWon,
+};
+
+registerBidder(spec);
+
+/**
+         * Determines whether or not the given bid request is valid.
+         *
+         * @param {BidRequest} bid The bid params to validate.
+         * @return boolean True if this is a valid bid, and false otherwise.
+         */
+function isBidRequestValid(bid) {
+  return !!bid.params.tagId || !!bid.params.videoTagId;
+};
+
+/**
+         * Make a server request from the list of BidRequests.
+         *
+         * @param {validBidRequests[]} - an array of bids
+         * @return ServerRequest Info describing the request to the server.
+         */
+
+function buildRequests(bids, bidderRequest) {
+  const data = getBaseRequest(bids[0], bidderRequest);
+  bids.forEach((bid) => {
+    const impObject = createImpObject(bid);
+    if (isBannerBid(bid)) impObject.banner = getBannerObject(bid);
+    if (isVideoBid(bid)) impObject.video = getVideoObject(bid);
+    data.imp.push(impObject);
+  });
+  return {
+    method: 'POST',
+    url: REQUEST_URL,
+    data,
+  }
+}
+
+function createImpObject(bid) {
+  const floor = getFloor(bid, BANNER);
+  const imp = {
+    id: bid.bidId,
+    tagid: bid.adUnitCode,
+    ext: {
+      divId: bid.adUnitCode,
+      nexx360: {
+        videoTagId: bid.params.videoTagId,
+        tagId: bid.params.tagId,
+        allBids: bid.params.allBids === true,
+      }
+    }
+  };
+  if (bid.params.customParams) {
+    utils.deepSetValue(imp, 'ext.customParams', bid.params.customParams);
+  }
+  enrichImp(imp, bid, floor);
+  return imp;
+}
+
+function getBannerObject(bid) {
+  return {
+    format: toFormat(bid.mediaTypes.banner.sizes),
+    topframe: utils.inIframe() ? 0 : 1
+  };
+}
+
+function getVideoObject(bid) {
+  let width, height;
+  const videoParams = utils.deepAccess(bid, `mediaTypes.video`);
+  const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
+  // normalize config for video size
+  if (utils.isArray(bid.sizes) && bid.sizes.length === 2 && !utils.isArray(bid.sizes[0])) {
+    width = parseInt(bid.sizes[0], 10);
+    height = parseInt(bid.sizes[1], 10);
+  } else if (utils.isArray(bid.sizes) && utils.isArray(bid.sizes[0]) && bid.sizes[0].length === 2) {
+    width = parseInt(bid.sizes[0][0], 10);
+    height = parseInt(bid.sizes[0][1], 10);
+  } else if (utils.isArray(playerSize) && playerSize.length === 2) {
+    width = parseInt(playerSize[0], 10);
+    height = parseInt(playerSize[1], 10);
+  }
+  const video = {
+    playerSize: [height, width],
+    context,
+  };
+
+  Object.keys(videoParams)
+    .filter(param => VIDEO_TARGETING.includes(param))
+    .forEach(param => video[param] = videoParams[param]);
+  return video;
+}
+
+function isVideoBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.video');
+}
+
+function isBannerBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
+}
+
+function toFormat(sizes) {
+  return sizes.map((s) => {
+    return { w: s[0], h: s[1] };
+  });
+}
+
+function getFloor(bid, mediaType) {
+  let floor = 0;
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: mediaType,
+      size: '*'
+    });
+
+    if (typeof floorInfo === 'object' &&
+      floorInfo.currency === 'USD' &&
+      !isNaN(parseFloat(floorInfo.floor))) {
+      floor = Math.max(floor, parseFloat(floorInfo.floor));
+    }
+  }
+
+  return floor;
+}
+
+function enrichImp(imp, bid, floor) {
+  if (bid.params.customParams) {
+    utils.deepSetValue(imp, 'ext.customParams', bid.params.customParams);
+  }
+  if (floor > 0) {
+    imp.bidfloor = floor;
+    imp.bidfloorcur = 'USD';
+  } else if (bid.params.customFloor) {
+    imp.bidfloor = bid.params.customFloor;
+  }
+  if (bid.ortb2Imp && bid.ortb2Imp.ext && bid.ortb2Imp.ext.data) {
+    imp.ext.data = bid.ortb2Imp.ext.data;
+  }
+}
+
+function getBaseRequest(bid, bidderRequest) {
+  let req = {
+    id: bidderRequest.auctionId,
+    imp: [],
+    cur: [config.getConfig('currency.adServerCurrency') || 'USD'],
+    at: 1,
+    tmax: config.getConfig('bidderTimeout'),
+    site: {
+      page: bidderRequest.refererInfo.topmostLocation || bidderRequest.refererInfo.page,
+      domain: bidderRequest.refererInfo.domain,
+    },
+    regs: {
+      coppa: (config.getConfig('coppa') === true || bid.params.coppa) ? 1 : 0,
+    },
+    device: {
+      dnt: (utils.getDNT() || bid.params.doNotTrack) ? 1 : 0,
+      h: screen.height,
+      w: screen.width,
+      ua: window.navigator.userAgent,
+      language: window.navigator.language.split('-').shift()
+    },
+    user: {},
+    ext: {
+      source: 'prebid.js',
+      version: '$prebid.version$',
+      pageViewId: PAGE_VIEW_ID,
+      bidderVersion: BIDDER_VERSION,
+    }
+  };
+
+  if (bid.params.platform) {
+    utils.deepSetValue(req, 'ext.platform', bid.params.platform);
+  }
+  if (bid.params.response_template_name) {
+    utils.deepSetValue(req, 'ext.response_template_name', bid.params.response_template_name);
+  }
+  req.test = config.getConfig('debug') ? 1 : 0;
+  if (bidderRequest.gdprConsent) {
+    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
+      utils.deepSetValue(req, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies === true ? 1 : 0);
+    }
+    if (bidderRequest.gdprConsent.consentString !== undefined) {
+      utils.deepSetValue(req, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+    }
+    if (bidderRequest.gdprConsent.addtlConsent !== undefined) {
+      utils.deepSetValue(req, 'user.ext.ConsentedProvidersSettings.consented_providers', bidderRequest.gdprConsent.addtlConsent);
+    }
+  }
+  if (bidderRequest.uspConsent) {
+    utils.deepSetValue(req, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+  if (bid.schain) {
+    utils.deepSetValue(req, 'source.ext.schain', bid.schain);
+  }
+  if (bid.userIdAsEids) {
+    utils.deepSetValue(req, 'user.ext.eids', bid.userIdAsEids);
+  }
+  const commonFpd = bidderRequest.ortb2 || {};
+  if (commonFpd.site) {
+    utils.mergeDeep(req, {site: commonFpd.site});
+  }
+  if (commonFpd.user) {
+    utils.mergeDeep(req, {user: commonFpd.user});
+  }
+  return req;
+}
+
+/**
+         * Unpack the response from the server into a list of bids.
+         *
+         * @param {ServerResponse} serverResponse A successful response from the server.
+         * @return {Bid[]} An array of bids which were nested inside the server.
+         */
+function interpretResponse(response, req) {
+  const { bidderSettings } = getGlobal();
+  const allowAlternateBidderCodes = bidderSettings && bidderSettings.standard ? bidderSettings.standard.allowAlternateBidderCodes : false;
+  const respBody = response.body;
+  if (!respBody || !Array.isArray(respBody.seatbid)) {
+    return [];
+  }
+
+  let bids = [];
+  respBody.seatbid.forEach(seatbid => {
+    bids = [...bids, ...seatbid.bid.map(bid => {
+      const response = {
+        requestId: bid.impid,
+        cpm: bid.price,
+        width: bid.w,
+        height: bid.h,
+        creativeId: bid.crid,
+        dealId: bid.dealid,
+        currency: respBody.cur || 'USD',
+        netRevenue: true,
+        ttl: 120,
+        bidderCode: allowAlternateBidderCodes ? `n360-${bid.ssp}` : 'nexx360',
+        mediaType: bid.type === 'banner' ? 'banner' : 'video',
+        meta: { advertiserDomains: bid.adomain },
+      };
+      // if (bid.dealid) response.dealid = bid.dealid;
+
+      if (response.mediaType === 'banner') {
+        response.adUrl = bid.adUrl;
+      }
+
+      if (['instream', 'outstream'].includes(bid.type)) response.vastXml = bid.vastXml;
+
+      if (bid.ext) {
+        response.meta.networkId = bid.ext.dsp_id;
+        response.meta.advertiserId = bid.ext.buyer_id;
+        response.meta.brandId = bid.ext.brand_id;
+      }
+      return response;
+    })];
+  });
+  return bids;
+}
+
+/**
+     * Register the user sync pixels which should be dropped after the auction.
+     *
+     * @param {SyncOptions} syncOptions Which user syncs are allowed?
+     * @param {ServerResponse[]} serverResponses List of server's responses.
+     * @return {UserSync[]} The user syncs which should be dropped.
+     */
+function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+  if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
+        serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
+    return serverResponses[0].body.cookies.slice(0, 5);
+  } else {
+    return [];
+  }
+};
diff --git a/modules/nexx360BidAdapter.md b/modules/nexx360BidAdapter.md
new file mode 100644
index 00000000000..532d48418b6
--- /dev/null
+++ b/modules/nexx360BidAdapter.md
@@ -0,0 +1,59 @@
+# Overview
+
+```
+Module Name:  Nexx360 Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: gabriel@nexx360.io
+```
+
+# Description
+
+Connects to Nexx360 network for bids.
+
+To use us as a bidder you must have an account and an active "tagId" on our Nexx360 platform.
+
+# Test Parameters
+
+## Web
+
+### Display
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'nexx360',
+         params: {
+            account: '1067',
+            tagId: 'luvxjvgn'
+         }
+       }]
+   },
+];
+```
+
+### Video Instream
+```
+    var videoAdUnit = {
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'nexx360',
+            params: {
+               account: '1067',
+               tagId: 'luvxjvgn'
+            }
+        }]
+    };
+```
diff --git a/modules/nobidBidAdapter.js b/modules/nobidBidAdapter.js
index f1a9092e31d..20878b545e4 100644
--- a/modules/nobidBidAdapter.js
+++ b/modules/nobidBidAdapter.js
@@ -1,19 +1,21 @@
-import * as utils from '../src/utils.js';
+import { logInfo, deepAccess, logWarn, isArray, getParameterByName } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
 
-const storage = getStorageManager();
+const GVLID = 816;
 const BIDDER_CODE = 'nobid';
-window.nobidVersion = '1.2.6';
+const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
+window.nobidVersion = '1.3.2';
 window.nobid = window.nobid || {};
 window.nobid.bidResponses = window.nobid.bidResponses || {};
 window.nobid.timeoutTotal = 0;
 window.nobid.bidWonTotal = 0;
 window.nobid.refreshCount = 0;
 function log(msg, obj) {
-  utils.logInfo('-NoBid- ' + msg, obj)
+  logInfo('-NoBid- ' + msg, obj)
 }
 function nobidSetCookie(cname, cvalue, hours) {
   var d = new Date();
@@ -28,7 +30,7 @@ function nobidBuildRequests(bids, bidderRequest) {
   var serializeState = function(divIds, siteId, adunits) {
     var filterAdUnitsByIds = function(divIds, adUnits) {
       var filtered = [];
-      if (!divIds || !divIds.length) {
+      if (!divIds.length) {
         filtered = adUnits;
       } else if (adUnits) {
         var a = [];
@@ -78,9 +80,10 @@ function nobidBuildRequests(bids, bidderRequest) {
     }
     var topLocation = function(bidderRequest) {
       var ret = '';
-      if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        ret = bidderRequest.refererInfo.referer;
+      if (bidderRequest?.refererInfo?.page) {
+        ret = bidderRequest.refererInfo.page;
       } else {
+        // TODO: does this fallback make sense here?
         ret = (window.context && window.context.location && window.context.location.href) ? window.context.location.href : document.location.href;
       }
       return encodeURIComponent(ret.replace(/\%/g, ''));
@@ -102,7 +105,24 @@ function nobidBuildRequests(bids, bidderRequest) {
         var height = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
         return `${width}x${height}`;
       } catch (e) {
-        utils.logWarn('Could not parse screen dimensions, error details:', e);
+        logWarn('Could not parse screen dimensions, error details:', e);
+      }
+    }
+    var getEIDs = function(eids) {
+      if (isArray(eids) && eids.length > 0) {
+        let src = [];
+        eids.forEach((eid) => {
+          let ids = [];
+          if (eid.uids) {
+            eid.uids.forEach(value => {
+              ids.push({'id': value.id + ''});
+            });
+          }
+          if (eid.source && ids.length > 0) {
+            src.push({source: eid.source, uids: ids});
+          }
+        });
+        return src;
       }
     }
     var state = {};
@@ -118,12 +138,16 @@ function nobidBuildRequests(bids, bidderRequest) {
     state['ref'] = document.referrer;
     state['gdpr'] = gdprConsent(bidderRequest);
     state['usp'] = uspConsent(bidderRequest);
+    state['pjbdr'] = (bidderRequest && bidderRequest.bidderCode) ? bidderRequest.bidderCode : 'nobid';
     const sch = schain(bids);
     if (sch) state['schain'] = sch;
     const cop = coppa();
     if (cop) state['coppa'] = cop;
+    const eids = getEIDs(deepAccess(bids, '0.userIdAsEids'));
+    if (eids && eids.length > 0) state['eids'] = eids;
+    if (bidderRequest && bidderRequest.ortb2) state['ortb2'] = bidderRequest.ortb2;
     return state;
-  }
+  };
   function newAdunit(adunitObject, adunits) {
     var getAdUnit = function(divid, adunits) {
       for (var i = 0; i < adunits.length; i++) {
@@ -198,8 +222,8 @@ function nobidBuildRequests(bids, bidderRequest) {
     var placementId = bid.params['placementId'];
 
     var adType = 'banner';
-    const videoMediaType = utils.deepAccess(bid, 'mediaTypes.video');
-    const context = utils.deepAccess(bid, 'mediaTypes.video.context');
+    const videoMediaType = deepAccess(bid, 'mediaTypes.video');
+    const context = deepAccess(bid, 'mediaTypes.video.context');
     if (bid.mediaType === VIDEO || (videoMediaType && (context === 'instream' || context === 'outstream'))) {
       adType = 'video';
     }
@@ -270,6 +294,9 @@ function nobidInterpretResponse(response, bidRequest) {
     if (bid.videoCacheKey) {
       bidResponse.videoCacheKey = bid.videoCacheKey;
     }
+    if (bid.meta) {
+      bidResponse.meta = bid.meta;
+    }
 
     bidResponses.push(bidResponse);
   }
@@ -296,19 +323,7 @@ window.addEventListener('message', function (event) {
     if (window.nobid && window.nobid.bidResponses) {
       var bid = window.nobid.bidResponses['' + adId];
       if (bid && bid.adm2) {
-        var markup = null;
-        if (bid.is_combo && bid.adm_combo) {
-          for (var i in bid.adm_combo) {
-            var combo = bid.adm_combo[i];
-            if (!combo.done) {
-              markup = combo.adm;
-              combo.done = true;
-              break;
-            }
-          }
-        } else {
-          markup = bid.adm2;
-        }
+        var markup = bid.adm2;
         if (markup) {
           event.source.postMessage('nbTagRenderer.renderAdInSafeFrame|' + markup, '*');
         }
@@ -318,6 +333,10 @@ window.addEventListener('message', function (event) {
 }, false);
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: [
+    { code: 'duration', gvlid: 674 }
+  ],
   supportedMediaTypes: [BANNER, VIDEO],
   /**
  * Determines whether or not the given bid request is valid.
@@ -338,7 +357,7 @@ export const spec = {
   buildRequests: function(validBidRequests, bidderRequest) {
     function resolveEndpoint() {
       var ret = 'https://ads.servenobid.com/';
-      var env = (typeof utils.getParameterByName === 'function') && (utils.getParameterByName('nobid-env'));
+      var env = (typeof getParameterByName === 'function') && (getParameterByName('nobid-env'));
       if (!env) ret = 'https://ads.servenobid.com/';
       else if (env == 'beta') ret = 'https://beta.servenobid.com/';
       else if (env == 'dev') ret = '//localhost:8282/';
@@ -358,11 +377,18 @@ export const spec = {
     window.nobid.refreshCount++;
     const payloadString = JSON.stringify(payload).replace(/'|&|#/g, '')
     const endpoint = buildEndpoint();
+
+    let options = {};
+    if (!hasPurpose1Consent(bidderRequest?.gdprConsent)) {
+      options = { withCredentials: false };
+    }
+
     return {
       method: 'POST',
       url: endpoint,
       data: payloadString,
-      bidderRequest
+      bidderRequest,
+      options
     };
   },
   /**
@@ -412,11 +438,11 @@ export const spec = {
             type: 'image',
             url: element
           });
-        })
+        });
       }
       return syncs;
     } else {
-      utils.logWarn('-NoBid- Please enable iframe based user sync.', syncOptions);
+      logWarn('-NoBid- Please enable iframe based user sync.', syncOptions);
       return [];
     }
   },
diff --git a/modules/novatiqIdSystem.js b/modules/novatiqIdSystem.js
new file mode 100644
index 00000000000..7bd1ee8acd9
--- /dev/null
+++ b/modules/novatiqIdSystem.js
@@ -0,0 +1,251 @@
+/**
+ * This module adds novatiqId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/novatiqIdSystem
+ * @requires module:modules/userId
+ */
+
+import { logInfo, getWindowLocation } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+/** @type {Submodule} */
+export const novatiqIdSubmodule = {
+
+  /**
+ * used to link submodule with config
+ * @type {string}
+ */
+  name: 'novatiq',
+  /**
+   * used to specify vendor id
+   * @type {number}
+   */
+  gvlid: 1119,
+
+  /**
+ * decode the stored id value for passing to bid requests
+ * @function
+ * @returns {novatiq: {snowflake: string}}
+ */
+  decode(novatiqId, config) {
+    let responseObj = {
+      novatiq: {
+        snowflake: novatiqId
+      }
+    };
+    return responseObj;
+  },
+
+  /**
+ * performs action to obtain id and return a value in the callback's response argument
+ * @function
+ * @param {SubmoduleConfig} config
+ * @returns {id: string}
+ */
+  getId(config) {
+    const configParams = config.params || {};
+    const urlParams = this.getUrlParams(configParams);
+    const srcId = this.getSrcId(configParams, urlParams);
+    const sharedId = this.getSharedId(configParams);
+    const useCallbacks = this.useCallbacks(configParams);
+
+    logInfo('NOVATIQ config params: ' + JSON.stringify(configParams));
+    logInfo('NOVATIQ Sync request used sourceid param: ' + srcId);
+    logInfo('NOVATIQ Sync request Shared ID: ' + sharedId);
+
+    return this.sendSyncRequest(useCallbacks, sharedId, srcId, urlParams);
+  },
+
+  sendSyncRequest(useCallbacks, sharedId, sspid, urlParams) {
+    const syncUrl = this.getSyncUrl(sharedId, sspid, urlParams);
+    const url = syncUrl.url;
+    const novatiqId = syncUrl.novatiqId;
+
+    // for testing
+    const sharedStatus = (sharedId != undefined && sharedId != false) ? 'Found' : 'Not Found';
+
+    if (useCallbacks) {
+      let res = this.sendAsyncSyncRequest(novatiqId, url); ;
+      res.sharedStatus = sharedStatus;
+
+      return res;
+    } else {
+      this.sendSimpleSyncRequest(novatiqId, url);
+
+      return { 'id': novatiqId,
+        'sharedStatus': sharedStatus }
+    }
+  },
+
+  sendAsyncSyncRequest(novatiqId, url) {
+    logInfo('NOVATIQ Setting up ASYNC sync request');
+
+    const resp = function (callback) {
+      logInfo('NOVATIQ *** Calling ASYNC sync request');
+
+      function onSuccess(response, responseObj) {
+        let syncrc;
+        var novatiqIdJson = { syncResponse: 0 };
+        syncrc = responseObj.status;
+        logInfo('NOVATIQ Sync Response Code:' + syncrc);
+        logInfo('NOVATIQ *** ASYNC request returned ' + syncrc);
+        if (syncrc === 200) {
+          novatiqIdJson = { 'id': novatiqId, syncResponse: 1 };
+        } else {
+          if (syncrc === 204) {
+            novatiqIdJson = { 'id': novatiqId, syncResponse: 2 };
+          }
+        }
+        callback(novatiqIdJson);
+      }
+
+      ajax(url,
+        { success: onSuccess },
+        undefined, { method: 'GET', withCredentials: false });
+    }
+
+    return {callback: resp};
+  },
+
+  sendSimpleSyncRequest(novatiqId, url) {
+    logInfo('NOVATIQ Sending SIMPLE sync request');
+
+    ajax(url, undefined, undefined, { method: 'GET', withCredentials: false });
+
+    logInfo('NOVATIQ snowflake: ' + novatiqId);
+  },
+
+  getNovatiqId(urlParams) {
+    // standard uuid format
+    let uuidFormat = [1e7] + -1e3 + -4e3 + -8e3 + -1e11;
+    if (urlParams.useStandardUuid == false) {
+      // novatiq standard uuid(like) format
+      uuidFormat = uuidFormat + 1e3;
+    }
+
+    return (uuidFormat).replace(/[018]/g, c =>
+      (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+    );
+  },
+
+  getSyncUrl(sharedId, sspid, urlParams) {
+    let novatiqId = this.getNovatiqId(urlParams);
+
+    let url = 'https://spadsync.com/sync?' + urlParams.novatiqId + '=' + novatiqId;
+
+    if (urlParams.useSspId) {
+      url = url + '&sspid=' + sspid;
+    }
+
+    if (urlParams.useSspHost) {
+      let ssphost = getWindowLocation().hostname;
+      logInfo('NOVATIQ partner hostname: ' + ssphost);
+
+      url = url + '&ssphost=' + ssphost;
+    }
+
+    // append on the shared ID if we have one
+    if (sharedId != null) {
+      url = url + '&sharedId=' + sharedId;
+    }
+
+    return {
+      url: url,
+      novatiqId: novatiqId
+    }
+  },
+
+  getUrlParams(configParams) {
+    let urlParams = {
+      novatiqId: 'snowflake',
+      useStandardUuid: false,
+      useSspId: true,
+      useSspHost: true
+    }
+
+    if (typeof configParams.urlParams != 'undefined') {
+      if (configParams.urlParams.novatiqId != undefined) {
+        urlParams.novatiqId = configParams.urlParams.novatiqId;
+      }
+      if (configParams.urlParams.useStandardUuid != undefined) {
+        urlParams.useStandardUuid = configParams.urlParams.useStandardUuid;
+      }
+      if (configParams.urlParams.useSspId != undefined) {
+        urlParams.useSspId = configParams.urlParams.useSspId;
+      }
+      if (configParams.urlParams.useSspHost != undefined) {
+        urlParams.useSspHost = configParams.urlParams.useSspHost;
+      }
+    }
+
+    return urlParams;
+  },
+
+  useCallbacks(configParams) {
+    return typeof configParams.useCallbacks != 'undefined' && configParams.useCallbacks === true;
+  },
+
+  useSharedId(configParams) {
+    return typeof configParams.useSharedId != 'undefined' && configParams.useSharedId === true;
+  },
+
+  getCookieOrStorageID(configParams) {
+    let cookieOrStorageID = '_pubcid';
+
+    if (typeof configParams.sharedIdName != 'undefined' && configParams.sharedIdName != null && configParams.sharedIdName != '') {
+      cookieOrStorageID = configParams.sharedIdName;
+      logInfo('NOVATIQ sharedID name redefined: ' + cookieOrStorageID);
+    }
+
+    return cookieOrStorageID;
+  },
+
+  // return null if we aren't supposed to use one or we are but there isn't one present
+  getSharedId(configParams) {
+    let sharedId = null;
+    if (this.useSharedId(configParams)) {
+      let cookieOrStorageID = this.getCookieOrStorageID(configParams);
+      const storage = getStorageManager({gvlid: this.gvlid, moduleName: 'pubCommonId'});
+
+      // first check local storage
+      if (storage.hasLocalStorage()) {
+        sharedId = storage.getDataFromLocalStorage(cookieOrStorageID);
+        logInfo('NOVATIQ sharedID retrieved from local storage:' + sharedId);
+      }
+
+      // if nothing check the local cookies
+      if (sharedId == null) {
+        sharedId = storage.getCookie(cookieOrStorageID);
+        logInfo('NOVATIQ sharedID retrieved from cookies:' + sharedId);
+      }
+    }
+
+    logInfo('NOVATIQ sharedID returning: ' + sharedId);
+
+    return sharedId;
+  },
+
+  getSrcId(configParams, urlParams) {
+    if (urlParams.useSspId == false) {
+      logInfo('NOVATIQ Configured to NOT use sspid');
+      return '';
+    }
+
+    logInfo('NOVATIQ Configured sourceid param: ' + configParams.sourceid);
+
+    let srcId;
+    if (typeof configParams.sourceid === 'undefined' || configParams.sourceid === null || configParams.sourceid === '') {
+      srcId = '000';
+      logInfo('NOVATIQ sourceid param set to value 000 due to undefined parameter or missing value in config section');
+    } else if (configParams.sourceid.length < 3 || configParams.sourceid.length > 3) {
+      srcId = '001';
+      logInfo('NOVATIQ sourceid param set to value 001 due to wrong size in config section 3 chars max e.g. 1ab');
+    } else {
+      srcId = configParams.sourceid;
+    }
+    return srcId;
+  }
+};
+submodule('userId', novatiqIdSubmodule);
diff --git a/modules/novatiqIdSystem.md b/modules/novatiqIdSystem.md
new file mode 100644
index 00000000000..f33fc700311
--- /dev/null
+++ b/modules/novatiqIdSystem.md
@@ -0,0 +1,97 @@
+# Novatiq Hyper ID
+
+The Novatiq proprietary dynamic Hyper ID is a unique, non sequential and single use identifier for marketing activation. Our in network solution matches verification requests to telco network IDs safely and securely inside telecom infrastructure. The Novatiq Hyper ID can be used for identity validation and as a secured 1st party data delivery mechanism.
+
+## Novatiq Hyper ID Configuration
+
+Enable by adding the Novatiq submodule to your Prebid.js package with:
+
+```
+gulp build --modules=novatiqIdSystem,userId
+```
+
+Module activation and configuration:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'novatiq',
+      params: {
+        // change to the Partner Number you received from Novatiq
+        sourceid '1a3'            
+        }
+      }
+    }],
+    // 50ms maximum auction delay, applies to all userId modules
+    auctionDelay: 50             
+  }
+});
+```
+
+### Parameters for the Novatiq Module
+| Param  | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | Module identification: `"novatiq"` | `"novatiq"` |
+| params | Required | Object | Configuration specifications for the Novatiq module. | |
+| params.sourceid | Required | String | The Novatiq Partner Number obtained via Novatiq | `1a3` |
+| params.useSharedId | Optional | Boolean | Use the sharedID module if it's activated. | `true` |
+| params.sharedIdName | Optional | String | Same as the SharedID "name" parameter <br /> Defaults to "_pubcid" | `"demo_pubcid"` |
+| params.useCallbacks | Optional | Boolean | Use callbacks for custom integrations | `false` |
+| params.urlParams | Optional | Object | Sync URl configuration for custom integrations | |
+| params.urlParams.novatiqId | Optional | String | The name of the parameter used to indicate the novatiq ID uuid | `snowflake` |
+| params.urlParams.useStandardUuid | Optional | Boolean | Use a standard UUID format, or the Novatiq UUID format | `false` |
+| params.urlParams.useSspId | Optional | Boolean | Send the sspid (sourceid) along with the sync request | `false` |
+| params.urlParams.useSspHost | Optional | Boolean | Send the ssphost along with the sync request | `false` |
+
+# Novatiq Hyper ID with Prebid SharedID support
+You can make use of the Prebid.js SharedId module as follows. 
+
+## Novatiq Hyper ID Configuration
+
+Enable by adding the Novatiq and SharedId submodule to your Prebid.js package with:
+
+```
+gulp build --modules=novatiqIdSystem,userId,pubCommonId
+```
+
+Module activation and configuration:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [
+      {
+        name: "pubCommonId",
+        storage: {
+          type: "cookie",   
+          // optional: will default to _pubcid if left blank
+          name: "demo_pubcid",     
+          
+          // expires in 1 years
+          expires: 365             
+        },
+        bidders: [ 'adtarget' ]
+      },                                            
+      {
+      name: 'novatiq',
+      params: {
+        // change to the Partner Number you received from Novatiq
+        sourceid '1a3',
+
+        // Use the sharedID module
+        useSharedId: true,
+
+        // optional: will default to _pubcid if left blank. 
+        // If not left blank must match "name" in the the module above
+        sharedIdName: 'demo_pubcid'   
+        }
+      }
+    }],
+    // 50ms maximum auction delay, applies to all userId modules
+    auctionDelay: 50             
+  }
+});
+```
+
+If you have any questions, please reach out to us at prebid@novatiq.com.
diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
new file mode 100644
index 00000000000..da62ce5c0a1
--- /dev/null
+++ b/modules/oguryBidAdapter.js
@@ -0,0 +1,221 @@
+'use strict';
+
+import { BANNER } from '../src/mediaTypes.js';
+import { getAdUnitSizes, logWarn, isFn, getWindowTop, getWindowSelf } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { ajax } from '../src/ajax.js'
+
+const BIDDER_CODE = 'ogury';
+const GVLID = 31;
+const DEFAULT_TIMEOUT = 1000;
+const BID_HOST = 'https://mweb-hb.presage.io/api/header-bidding-request';
+const TIMEOUT_MONITORING_HOST = 'https://ms-ads-monitoring-events.presage.io';
+const MS_COOKIE_SYNC_DOMAIN = 'https://ms-cookie-sync.presage.io';
+const ADAPTER_VERSION = '1.4.0';
+
+function getClientWidth() {
+  const documentElementClientWidth = window.top.document.documentElement.clientWidth
+    ? window.top.document.documentElement.clientWidth
+    : 0
+  const innerWidth = window.top.innerWidth ? window.top.innerWidth : 0
+  const outerWidth = window.top.outerWidth ? window.top.outerWidth : 0
+  const screenWidth = window.top.screen.width ? window.top.screen.width : 0
+
+  return documentElementClientWidth || innerWidth || outerWidth || screenWidth
+}
+
+function getClientHeight() {
+  const documentElementClientHeight = window.top.document.documentElement.clientHeight
+    ? window.top.document.documentElement.clientHeight
+    : 0
+  const innerHeight = window.top.innerHeight ? window.top.innerHeight : 0
+  const outerHeight = window.top.outerHeight ? window.top.outerHeight : 0
+  const screenHeight = window.top.screen.height ? window.top.screen.height : 0
+
+  return documentElementClientHeight || innerHeight || outerHeight || screenHeight
+}
+
+function isBidRequestValid(bid) {
+  const adUnitSizes = getAdUnitSizes(bid);
+
+  const isValidSizes = Boolean(adUnitSizes) && adUnitSizes.length > 0;
+  const isValidAdUnitId = !!bid.params.adUnitId;
+  const isValidAssetKey = !!bid.params.assetKey;
+
+  return (isValidSizes && isValidAdUnitId && isValidAssetKey);
+}
+
+function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+  if (!syncOptions.pixelEnabled) return [];
+
+  return [
+    {
+      type: 'image',
+      url: `${MS_COOKIE_SYNC_DOMAIN}/v1/init-sync/bid-switch?iab_string=${(gdprConsent && gdprConsent.consentString) || ''}&source=prebid`
+    },
+    {
+      type: 'image',
+      url: `${MS_COOKIE_SYNC_DOMAIN}/ttd/init-sync?iab_string=${(gdprConsent && gdprConsent.consentString) || ''}&source=prebid`
+    },
+    {
+      type: 'image',
+      url: `${MS_COOKIE_SYNC_DOMAIN}/xandr/init-sync?iab_string=${(gdprConsent && gdprConsent.consentString) || ''}&source=prebid`
+    }
+  ]
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  const openRtbBidRequestBanner = {
+    id: bidderRequest.auctionId,
+    tmax: DEFAULT_TIMEOUT,
+    at: 1,
+    regs: {
+      ext: {
+        gdpr: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+      },
+    },
+    site: {
+      domain: location.hostname,
+      page: location.href
+    },
+    user: {
+      ext: {
+        consent: ''
+      }
+    },
+    imp: [],
+    ext: {
+      adapterversion: ADAPTER_VERSION,
+      prebidversion: '$prebid.version$'
+    },
+    device: {
+      w: getClientWidth(),
+      h: getClientHeight()
+    }
+  };
+
+  if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) {
+    openRtbBidRequestBanner.user.ext.consent = bidderRequest.gdprConsent.consentString
+  }
+
+  validBidRequests.forEach((bidRequest) => {
+    const sizes = getAdUnitSizes(bidRequest)
+      .map(size => ({ w: size[0], h: size[1] }));
+
+    if (bidRequest.mediaTypes &&
+      bidRequest.mediaTypes.hasOwnProperty('banner')) {
+      openRtbBidRequestBanner.site.id = bidRequest.params.assetKey;
+      const floor = getFloor(bidRequest);
+
+      openRtbBidRequestBanner.imp.push({
+        id: bidRequest.bidId,
+        tagid: bidRequest.params.adUnitId,
+        ...(floor && {bidfloor: floor}),
+        banner: {
+          format: sizes
+        },
+        ext: {
+          ...bidRequest.params,
+          timeSpentOnPage: document.timeline && document.timeline.currentTime ? document.timeline.currentTime : 0
+        }
+      });
+    }
+  });
+
+  return {
+    method: 'POST',
+    url: BID_HOST,
+    data: openRtbBidRequestBanner,
+    options: {contentType: 'application/json'},
+  };
+}
+
+function interpretResponse(openRtbBidResponse) {
+  if (!openRtbBidResponse ||
+    !openRtbBidResponse.body ||
+    typeof openRtbBidResponse.body != 'object' ||
+    Object.keys(openRtbBidResponse.body).length === 0) {
+    logWarn('no response or body is malformed');
+    return [];
+  }
+
+  const bidResponses = [];
+
+  openRtbBidResponse.body.seatbid.forEach((seatbid) => {
+    seatbid.bid.forEach((bid) => {
+      let bidResponse = {
+        requestId: bid.impid,
+        cpm: bid.price,
+        currency: 'USD',
+        width: bid.w,
+        height: bid.h,
+        creativeId: bid.id,
+        netRevenue: true,
+        ttl: 60,
+        ext: bid.ext,
+        meta: {
+          advertiserDomains: bid.adomain
+        },
+        nurl: bid.nurl,
+        adapterVersion: ADAPTER_VERSION,
+        prebidVersion: '$prebid.version$'
+      };
+
+      bidResponse.ad = bid.adm;
+
+      bidResponses.push(bidResponse);
+    });
+  });
+  return bidResponses;
+}
+
+function getFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return 0;
+  }
+  let floorResult = bid.getFloor({
+    currency: 'USD',
+    mediaType: 'banner',
+    size: '*'
+  });
+  return floorResult.currency === 'USD' ? floorResult.floor : 0;
+}
+
+function getWindowContext() {
+  try {
+    return getWindowTop()
+  } catch (e) {
+    return getWindowSelf()
+  }
+}
+
+function onBidWon(bid) {
+  const w = getWindowContext()
+  w.OG_PREBID_BID_OBJECT = {
+    ...(bid && { ...bid }),
+  }
+  if (bid && bid.nurl) ajax(bid.nurl, null);
+}
+
+function onTimeout(timeoutData) {
+  ajax(`${TIMEOUT_MONITORING_HOST}/bid_timeout`, null, JSON.stringify({...timeoutData[0], location: window.location.href}), {
+    method: 'POST',
+    contentType: 'application/json'
+  });
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  getUserSyncs,
+  buildRequests,
+  interpretResponse,
+  getFloor,
+  onBidWon,
+  getWindowContext,
+  onTimeout
+}
+
+registerBidder(spec);
diff --git a/modules/oguryBidAdapter.md b/modules/oguryBidAdapter.md
new file mode 100644
index 00000000000..7264602de14
--- /dev/null
+++ b/modules/oguryBidAdapter.md
@@ -0,0 +1,38 @@
+# Overview
+
+```
+Module Name: Ogury Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: web.inventory@ogury.co
+```
+
+# Description
+
+Module that connects to Ogury's SSP solution
+Ogury bid adapter supports Banner media type.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "ogury",
+                    params: {
+                        assetKey: 'OGY-CA41D116484F',
+                        adUnitId: '2c4d61d0-90aa-0139-0cda-0242ac120004'
+                        xMargin?: 20
+                        yMargin?: 20
+                        gravity?: 'TOP_LEFT' || 'TOP_RIGHT' || 'BOTTOM_LEFT' || 'BOTTOM_RIGHT' || 'BOTTOM_CENTER' || 'TOP_CENTER' || 'CENTER'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/oneKeyIdSystem.js b/modules/oneKeyIdSystem.js
new file mode 100644
index 00000000000..8d8d594b533
--- /dev/null
+++ b/modules/oneKeyIdSystem.js
@@ -0,0 +1,78 @@
+/**
+ * This module adds Onekey data to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/oneKeyIdSystem
+ * @requires module:modules/userId
+ */
+
+import {submodule} from '../src/hook.js';
+import { logError, logMessage } from '../src/utils.js';
+
+// Pre-init OneKey if it has not load yet.
+window.OneKey = window.OneKey || {};
+window.OneKey.queue = window.OneKey.queue || [];
+
+const logPrefix = 'OneKey.Id-Module';
+
+/**
+ * Generate callback that deserializes the result of getIdsAndPreferences.
+ */
+const onIdsAndPreferencesResult = (callback) => {
+  return (result) => {
+    logMessage(logPrefix, `Has got Ids and Prefs with status: `, result);
+    callback(result.data);
+  };
+};
+
+/**
+ * Call OneKey once it is loaded for retrieving
+ * the ids and the preferences.
+ */
+const getIdsAndPreferences = (callback) => {
+  logMessage(logPrefix, 'Queue getIdsAndPreferences call');
+  // Call OneKey in a queue so that we are sure
+  // it will be called when fully load and configured
+  // within the page.
+  window.OneKey.queue.push(() => {
+    logMessage(logPrefix, 'Get Ids and Prefs');
+    window.OneKey.getIdsAndPreferences()
+      .then(onIdsAndPreferencesResult(callback))
+      .catch(() => {
+        logError(logPrefix, 'Cannot retrieve the ids and preferences from OneKey.');
+        callback(undefined);
+      });
+  });
+};
+
+/** @type {Submodule} */
+export const oneKeyIdSubmodule = {
+  /**
+    * used to link submodule with config
+    * @type {string}
+    */
+  name: 'oneKeyData',
+  /**
+    * decode the stored data value for passing to bid requests
+    * @function decode
+    * @param {(Object|string)} value
+    * @returns {(Object|undefined)}
+    */
+  decode(data) {
+    return { oneKeyData: data };
+  },
+  /**
+    * performs action to obtain id and return a value in the callback's response argument
+    * @function
+    * @param {SubmoduleConfig} [config]
+    * @param {ConsentData} [consentData]
+    * @param {(Object|undefined)} cacheIdObj
+    * @returns {IdResponse|undefined}
+    */
+  getId(config) {
+    return {
+      callback: getIdsAndPreferences
+    };
+  }
+};
+
+submodule('userId', oneKeyIdSubmodule);
diff --git a/modules/oneKeyIdSystem.md b/modules/oneKeyIdSystem.md
new file mode 100644
index 00000000000..36caf382065
--- /dev/null
+++ b/modules/oneKeyIdSystem.md
@@ -0,0 +1,109 @@
+# OneKey
+
+The OneKey real-time data module in Prebid has been built so that publishers
+can quickly and easily setup the OneKey Addressability Framework.
+This module is used along with the oneKeyRtdProvider to pass OneKey data to your partners.
+Both modules are required. This module will pass oneKeyData to your partners
+while the oneKeyRtdProvider will pass the transmission requests.
+
+Background information:
+- [OneKey-Network/addressability-framework](https://github.com/OneKey-Network/addressability-framework)
+- [OneKey-Network/OneKey-implementation](https://github.com/OneKey-Network/OneKey-implementation)
+
+It can be added to you Prebid.js package with:
+
+{: .alert.alert-info :}
+gulp build –modules=userId,oneKeyIdSystem
+
+⚠️ This module works in association with a RTD module. See [oneKeyRtdProvider](oneKeyRtdProvider.md).
+
+#### OneKey Registration
+
+OneKey is a community based Framework with a decentralized approach.
+Go to [onekey.community](https://onekey.community/) for more details.
+
+#### OneKey Configuration
+
+{: .table .table-bordered .table-striped }
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module | `"oneKeyData"` |
+
+
+#### OneKey Exemple
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'oneKeyData'
+        }]
+    }
+});
+```
+
+Bidders will receive the data in the following format:
+
+```json
+{
+    "identifiers": [{
+        "version": "0.1",
+        "type": "paf_browser_id",
+        "value": "da135b3a-7d04-44bf-a0af-c4709f10420b",
+        "source": {
+            "domain": "crto-poc-1.onekey.network",
+            "timestamp": 1648836556881,
+            "signature": "+NF27bBvPM54z103YPExXuS834+ggAQe6JV0jPeGo764vRYiiBl5OmEXlnB7UZgxNe3KBU7rN2jk0SkI4uL0bg=="
+        }
+    }],
+    "preferences": {
+        "version": "0.1",
+        "data": {
+            "use_browsing_for_personalization": true
+        },
+        "source": {
+            "domain": "cmp.pafdemopublisher.com",
+            "timestamp": 1648836566468,
+            "signature": "ipbYhU8IbSFm2tCqAVYI2d5w4DnGF7Xa2AaiZScx2nmBPLfMmIT/FkBYGitR8Mi791DHtcy5MXr4+bs1aeZFqw=="
+        }
+    }
+}
+```
+
+If the bidder elects to use pbjs.getUserIdsAsEids() then the format will be:
+
+```json
+"user": {
+    "ext": {
+        "eids": [{
+            "source": "paf",
+            "uids": [{
+                "id": "da135b3a-7d04-44bf-a0af-c4709f10420b",
+                "atype": 1,
+                "ext": {
+                    "version": "0.1",
+                    "type": "paf_browser_id",
+                    "source": {
+                        "domain": "crto-poc-1.onekey.network",
+                        "timestamp": 1648836556881,
+                        "signature": "+NF27bBvPM54z103YPExXuS834+ggAQe6JV0jPeGo764vRYiiBl5OmEXlnB7UZgxNe3KBU7rN2jk0SkI4uL0bg=="
+                    }
+                }
+            }],
+            "ext": {
+                "preferences": {
+                    "version": "0.1",
+                    "data": {
+                        "use_browsing_for_personalization": true
+                    },
+                    "source": {
+                        "domain": "cmp.pafdemopublisher.com",
+                        "timestamp": 1648836566468,
+                        "signature": "ipbYhU8IbSFm2tCqAVYI2d5w4DnGF7Xa2AaiZScx2nmBPLfMmIT/FkBYGitR8Mi791DHtcy5MXr4+bs1aeZFqw=="
+                    }
+                }
+            }
+        }]
+    }
+}
+```
\ No newline at end of file
diff --git a/modules/oneKeyRtdProvider.js b/modules/oneKeyRtdProvider.js
new file mode 100644
index 00000000000..27511017676
--- /dev/null
+++ b/modules/oneKeyRtdProvider.js
@@ -0,0 +1,98 @@
+
+import { submodule } from '../src/hook.js';
+import { mergeDeep, logError, logMessage, deepSetValue, generateUUID } from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+
+const SUBMODULE_NAME = 'oneKey';
+const prefixLog = 'OneKey.RTD-module'
+
+// Pre-init OneKey if it has not load yet.
+window.OneKey = window.OneKey || {};
+window.OneKey.queue = window.OneKey.queue || [];
+
+/**
+ * Generate the OneKey transmission and include it in the Bid Request.
+ *
+ * Modify the AdUnit object for each auction.
+ * It’s called as part of the requestBids hook.
+ * https://docs.prebid.org/dev-docs/add-rtd-submodule.html#getbidrequestdata
+ *
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {Object} rtdConfig
+ * @param {Object} userConsent
+ */
+const getTransmissionInBidRequest = (reqBidsConfigObj, done, rtdConfig) => {
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+  const transactionIds = adUnits.map(() => generateUUID());
+
+  logMessage(prefixLog, 'Queue seed generation.');
+  window.OneKey.queue.push(() => {
+    logMessage(prefixLog, 'Generate a seed.');
+    window.OneKey.generateSeed(transactionIds)
+      .then(onGetSeed(reqBidsConfigObj, rtdConfig, adUnits, transactionIds))
+      .catch((err) => { logError(SUBMODULE_NAME, err.message); })
+      .finally(done);
+  });
+}
+
+const onGetSeed = (reqBidsConfigObj, rtdConfig, adUnits, transactionIds) => {
+  return (seed) => {
+    if (!seed) {
+      logMessage(prefixLog, 'No seed generated.');
+      return;
+    }
+
+    logMessage(prefixLog, 'Has retrieved a seed:', seed);
+    addTransactionIdsToAdUnits(adUnits, transactionIds);
+    addTransmissionToOrtb2(reqBidsConfigObj, rtdConfig, seed);
+  };
+};
+
+const addTransactionIdsToAdUnits = (adUnits, transactionIds) => {
+  adUnits.forEach((unit, index) => {
+    deepSetValue(unit, `ortb2Imp.ext.data.paf.transaction_id`, transactionIds[index]);
+  });
+};
+
+const addTransmissionToOrtb2 = (reqBidsConfigObj, rtdConfig, seed) => {
+  const okOrtb2 = {
+    ortb2: {
+      user: {
+        ext: {
+          paf: {
+            transmission: {
+              seed
+            }
+          }
+        }
+      }
+    }
+  }
+
+  const shareSeedWithAllBidders = !rtdConfig.params || !rtdConfig.params.bidders;
+  if (shareSeedWithAllBidders) {
+    // Change global first party data with OneKey
+    logMessage(prefixLog, 'set ortb2:', okOrtb2);
+    mergeDeep(reqBidsConfigObj.ortb2Fragments.global, okOrtb2.ortb2);
+  } else {
+    // Change bidder-specific first party data with OneKey
+    logMessage(prefixLog, `set ortb2 for: ${rtdConfig.params.bidders.join(',')}`, okOrtb2);
+    rtdConfig.params.bidders.forEach(bidder => {
+      mergeDeep(reqBidsConfigObj.ortb2Fragments.bidder, { [bidder]: okOrtb2.ortb2 });
+    });
+  }
+};
+
+/** @type {RtdSubmodule} */
+export const oneKeyDataSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: SUBMODULE_NAME,
+  init: () => true,
+  getBidRequestData: getTransmissionInBidRequest,
+};
+
+submodule('realTimeData', oneKeyDataSubmodule);
diff --git a/modules/oneKeyRtdProvider.md b/modules/oneKeyRtdProvider.md
new file mode 100644
index 00000000000..075e91cafda
--- /dev/null
+++ b/modules/oneKeyRtdProvider.md
@@ -0,0 +1,127 @@
+## OneKey Real-time Data Submodule
+
+The OneKey real-time data module in Prebid has been built so that publishers
+can quickly and easily setup the OneKey Addressability Framework.
+This module is used along with the oneKeyIdSystem to pass OneKey data to your partners.
+Both modules are required. This module will pass transmission requests to your partners
+while the oneKeyIdSystem will pass the oneKeyData.
+
+Background information:
+- [OneKey-Network/addressability-framework](https://github.com/OneKey-Network/addressability-framework)
+- [OneKey-Network/OneKey-implementation](https://github.com/OneKey-Network/OneKey-implementation)
+
+## Implementation for Publishers
+
+### Integration
+
+1) Compile the OneKey RTD Provider and the OneKey UserID sub-module into your Prebid build. 
+
+```
+gulp build --modules=rtdModule,oneKeyRtdProvider
+```
+
+2) Publishers must register OneKey RTD Provider as a Real Time Data provider by using `setConfig`
+to load a Prebid Config containing a `realTimeData.dataProviders` array:
+
+```javascript
+pbjs.setConfig({
+    ...,
+    realTimeData: {
+      auctionDelay: 100,
+      dataProviders: [
+            {
+              name: 'oneKey',
+              waitForIt: true
+            }
+        ]
+    }
+});
+``` 
+
+3) Configure the OneKey RTD Provider with the bidders that are part of the OneKey community. If there is no bidders specified, the RTD provider
+will share OneKey data with all adapters.
+
+⚠️ This module works in association with a RTD module. See [oneKeyIdSystem](oneKeyIdSystem.md).
+
+### Parameters
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Real time data module name | Always 'oneKey' |
+| waitForIt | Boolean | Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false |
+| params | Object | | Optional |
+| params.bidders | Array | List of bidders to restrict the data to. | Optional |
+
+## Implementation for Bidders
+
+### Bidder Requests
+
+The data will provided to the bidders using the `ortb2` object.
+The following is an example of the format of the data:
+
+```json
+"user": {
+    "ext": {
+        "paf": {
+            "transmission": {
+                "seed": {
+                    "version": "0.1",
+                    "transaction_ids": ["06df6992-691c-4342-bbb0-66d2a005d5b1", "d2cd0aa7-8810-478c-bd15-fb5bfa8138b8"],
+                    "publisher": "cmp.pafdemopublisher.com",
+                    "source": {
+                        "domain": "cmp.pafdemopublisher.com",
+                        "timestamp": 1649712888,
+                        "signature": "turzZlXh9IqD5Rjwh4vWR78pKLrVsmwQrGr6fgw8TPgQVJSC8K3HvkypTV7lm3UaCi+Zzjl+9sd7Hrv87gdI8w=="
+                    }
+                }
+            }
+        }
+    }
+}
+```
+
+```json
+"ortb2Imp": {
+    "ext": {
+        "data": {
+            "paf": {
+                "transaction_id": "52d23fed-4f50-4c17-b07a-c458143e9d09"
+            }
+        }
+    }
+}
+```
+
+### Bidder Responses
+
+Bidders who are part of the OneKey Addressability Framework and receive OneKey
+transmissions are required to return transmission responses as outlined in
+[OneKey-Network/addressability-framework]https://github.com/OneKey-Network/addressability-framework/blob/main/mvp-spec/ad-auction.md). Transmission responses should be appended to bids
+along with the releveant content_id using the meta.paf field. The paf-lib will
+be responsible for collecting all of the transmission responses.
+
+Below is an example of setting a transmission response:
+
+```javascript
+bid.meta.paf = {
+    content_id: "90141190-26fe-497c-acee-4d2b649c2112",
+    transmission: {
+        version: "0.1",
+        contents: [
+            {
+                transaction_id: "f55a401d-e8bb-4de1-a3d2-fa95619393e8",
+                content_id: "90141190-26fe-497c-acee-4d2b649c2112"
+            }
+        ],
+        status: "success",
+        details: "",
+        receiver: "dsp1.com",
+        source: {
+            domain: "dsp1.com",
+            timestamp: 1639589531,
+            signature: "d01c6e83f14b4f057c2a2a86d320e2454fc0c60df4645518d993b5f40019d24c"
+        },
+        children: []
+    }
+}
+```
diff --git a/modules/oneVideoBidAdapter.js b/modules/oneVideoBidAdapter.js
deleted file mode 100644
index 26b0a7dccc2..00000000000
--- a/modules/oneVideoBidAdapter.js
+++ /dev/null
@@ -1,333 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'oneVideo';
-export const spec = {
-  code: 'oneVideo',
-  VERSION: '3.0.3',
-  ENDPOINT: 'https://ads.adaptv.advertising.com/rtb/openrtb?ext_id=',
-  E2ETESTENDPOINT: 'https://ads-wc.v.ssp.yahoo.com/rtb/openrtb?ext_id=',
-  SYNC_ENDPOINT1: 'https://cm.g.doubleclick.net/pixel?google_nid=adaptv_dbm&google_cm&google_sc',
-  SYNC_ENDPOINT2: 'https://pr-bh.ybp.yahoo.com/sync/adaptv_ortb/{combo_uid}',
-  SYNC_ENDPOINT3: 'https://match.adsrvr.org/track/cmf/generic?ttd_pid=adaptv&ttd_tpi=1',
-  supportedMediaTypes: ['video', 'banner'],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
-      return false;
-    }
-
-    // Video validations
-    if (typeof bid.params.video === 'undefined' || typeof bid.params.video.playerWidth === 'undefined' || typeof bid.params.video.playerHeight == 'undefined' || typeof bid.params.video.mimes == 'undefined') {
-      return false;
-    }
-
-    // Prevend DAP Outstream validation, Banner DAP validation & Multi-Format adUnit support
-    if (bid.mediaTypes.video) {
-      if (bid.mediaTypes.video.context === 'outstream' && bid.params.video.display === 1) {
-        return false;
-      }
-    } else if (bid.mediaTypes.banner && !bid.params.video.display) {
-      return false;
-    }
-
-    // Pub Id validation
-    if (typeof bid.params.pubId === 'undefined') {
-      return false;
-    }
-
-    return true;
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @param bidderRequest
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(bids, bidRequest) {
-    let consentData = bidRequest ? bidRequest.gdprConsent : null;
-
-    return bids.map(bid => {
-      let url = spec.ENDPOINT
-      let pubId = bid.params.pubId;
-      if (bid.params.video.e2etest) {
-        url = spec.E2ETESTENDPOINT;
-        pubId = 'HBExchange';
-      }
-      return {
-        method: 'POST',
-        /** removing adding local protocal since we
-         * can get cookie data only if we call with https. */
-        url: url + pubId,
-        data: getRequestData(bid, consentData, bidRequest),
-        bidRequest: bid
-      }
-    })
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(response, { bidRequest }) {
-    let bid;
-    let size;
-    let bidResponse;
-    try {
-      response = response.body;
-      bid = response.seatbid[0].bid[0];
-    } catch (e) {
-      response = null;
-    }
-    if (!response || !bid || (!bid.adm && !bid.nurl) || !bid.price) {
-      utils.logWarn(`No valid bids from ${spec.code} bidder`);
-      return [];
-    }
-    size = getSize(bidRequest.sizes);
-    bidResponse = {
-      requestId: bidRequest.bidId,
-      bidderCode: spec.code,
-      cpm: bid.price,
-      adId: bid.adid,
-      creativeId: bid.crid,
-      width: size.width,
-      height: size.height,
-      currency: response.cur,
-      ttl: 100,
-      netRevenue: true,
-      adUnitCode: bidRequest.adUnitCode
-    };
-
-    bidResponse.mediaType = (bidRequest.mediaTypes.banner) ? 'banner' : 'video'
-
-    if (bid.nurl) {
-      bidResponse.vastUrl = bid.nurl;
-    } else if (bid.adm && bidRequest.params.video.display === 1) {
-      bidResponse.ad = bid.adm
-    } else if (bid.adm) {
-      bidResponse.vastXml = bid.adm;
-    }
-
-    if (bidRequest.mediaTypes.video) {
-      bidResponse.renderer = (bidRequest.mediaTypes.video.context === 'outstream') ? newRenderer(bidRequest, bidResponse) : undefined;
-    }
-
-    return bidResponse;
-  },
-  /**
-   * Register the user sync pixels which should be dropped after the auction.
-   *
-   * @param {SyncOptions} syncOptions Which user syncs are allowed?
-   * @param {ServerResponse[]} serverResponses List of server's responses.
-   * @return {UserSync[]} The user syncs which should be dropped.
-   */
-  getUserSyncs: function(syncOptions, responses, consentData = {}) {
-    let { gdprApplies, consentString = '' } = consentData;
-
-    if (syncOptions.pixelEnabled) {
-      return [{
-        type: 'image',
-        url: spec.SYNC_ENDPOINT1
-      },
-      {
-        type: 'image',
-        url: spec.SYNC_ENDPOINT2
-      },
-      {
-        type: 'image',
-        url: `https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0` + encodeURI(`&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}`)
-      },
-      {
-        type: 'image',
-        url: spec.SYNC_ENDPOINT3
-      }];
-    }
-  }
-};
-
-function getSize(sizes) {
-  let parsedSizes = utils.parseSizesInput(sizes);
-  let [ width, height ] = parsedSizes.length ? parsedSizes[0].split('x') : [];
-  return {
-    width: parseInt(width, 10) || undefined,
-    height: parseInt(height, 10) || undefined
-  };
-}
-
-function isConsentRequired(consentData) {
-  return !!(consentData && consentData.gdprApplies);
-}
-
-function getRequestData(bid, consentData, bidRequest) {
-  let loc = bidRequest.refererInfo.referer;
-  let page = (bid.params.site && bid.params.site.page) ? (bid.params.site.page) : (loc.href);
-  let ref = (bid.params.site && bid.params.site.referrer) ? bid.params.site.referrer : bidRequest.refererInfo.referer;
-  let bidData = {
-    id: utils.generateUUID(),
-    at: 2,
-    cur: bid.cur || 'USD',
-    imp: [{
-      id: '1',
-      secure: isSecure(),
-      bidfloor: bid.params.bidfloor,
-      ext: {
-        hb: 1,
-        prebidver: '$prebid.version$',
-        adapterver: spec.VERSION,
-      }
-    }],
-    site: {
-      page: page,
-      ref: ref
-    },
-    device: {
-      ua: navigator.userAgent
-    },
-    tmax: 200
-  };
-
-  if (bid.params.video.display == undefined || bid.params.video.display != 1) {
-    bidData.imp[0].video = {
-      mimes: bid.params.video.mimes,
-      w: bid.params.video.playerWidth,
-      h: bid.params.video.playerHeight,
-      pos: bid.params.video.position,
-    };
-    if (bid.params.video.maxbitrate) {
-      bidData.imp[0].video.maxbitrate = bid.params.video.maxbitrate
-    }
-    if (bid.params.video.maxduration) {
-      bidData.imp[0].video.maxduration = bid.params.video.maxduration
-    }
-    if (bid.params.video.minduration) {
-      bidData.imp[0].video.minduration = bid.params.video.minduration
-    }
-    if (bid.params.video.api) {
-      bidData.imp[0].video.api = bid.params.video.api
-    }
-    if (bid.params.video.delivery) {
-      bidData.imp[0].video.delivery = bid.params.video.delivery
-    }
-    if (bid.params.video.position) {
-      bidData.imp[0].video.pos = bid.params.video.position
-    }
-    if (bid.params.video.playbackmethod) {
-      bidData.imp[0].video.playbackmethod = bid.params.video.playbackmethod
-    }
-    if (bid.params.video.placement) {
-      bidData.imp[0].video.placement = bid.params.video.placement
-    }
-    if (bid.params.video.rewarded) {
-      bidData.imp[0].ext.rewarded = bid.params.video.rewarded
-    }
-    bidData.imp[0].video.linearity = 1;
-    bidData.imp[0].video.protocols = bid.params.video.protocols || [2, 5];
-  } else if (bid.params.video.display == 1) {
-    bidData.imp[0].banner = {
-      mimes: bid.params.video.mimes,
-      w: bid.params.video.playerWidth,
-      h: bid.params.video.playerHeight,
-      pos: bid.params.video.position,
-    };
-    if (bid.params.video.placement) {
-      bidData.imp[0].banner.placement = bid.params.video.placement
-    }
-    if (bid.params.video.maxduration) {
-      bidData.imp[0].banner.ext = bidData.imp[0].banner.ext || {}
-      bidData.imp[0].banner.ext.maxduration = bid.params.video.maxduration
-    }
-    if (bid.params.video.minduration) {
-      bidData.imp[0].banner.ext = bidData.imp[0].banner.ext || {}
-      bidData.imp[0].banner.ext.minduration = bid.params.video.minduration
-    }
-  }
-  if (bid.params.video.inventoryid) {
-    bidData.imp[0].ext.inventoryid = bid.params.video.inventoryid
-  }
-  if (bid.params.video.sid) {
-    bidData.source = {
-      ext: {
-        schain: {
-          complete: 1,
-          nodes: [{
-            sid: bid.params.video.sid,
-            rid: bidData.id,
-          }]
-        }
-      }
-    }
-    if (bid.params.video.hp == 1) {
-      bidData.source.ext.schain.nodes[0].hp = bid.params.video.hp;
-    }
-  } else if (bid.schain) {
-    bidData.source = {
-      ext: {
-        schain: bid.schain
-      }
-    }
-    bidData.source.ext.schain.nodes[0].rid = bidData.id;
-  }
-  if (bid.params.site && bid.params.site.id) {
-    bidData.site.id = bid.params.site.id
-  }
-  if (isConsentRequired(consentData) || (bidRequest && bidRequest.uspConsent)) {
-    bidData.regs = {
-      ext: {}
-    };
-    if (isConsentRequired(consentData)) {
-      bidData.regs.ext.gdpr = 1
-    }
-
-    if (consentData && consentData.consentString) {
-      bidData.user = {
-        ext: {
-          consent: consentData.consentString
-        }
-      };
-    }
-    // ccpa support
-    if (bidRequest && bidRequest.uspConsent) {
-      bidData.regs.ext.us_privacy = bidRequest.uspConsent
-    }
-  }
-  if (bid.params.video.e2etest) {
-    bidData.imp[0].bidfloor = null;
-    bidData.imp[0].video.w = 300;
-    bidData.imp[0].video.h = 250;
-    bidData.imp[0].video.mimes = ['video/mp4', 'application/javascript'];
-    bidData.imp[0].video.api = [2];
-    bidData.site.page = 'https://verizonmedia.com';
-    bidData.site.ref = 'https://verizonmedia.com';
-    bidData.tmax = 1000;
-  }
-  return bidData;
-}
-
-function isSecure() {
-  return document.location.protocol === 'https:';
-}
-/**
- * Create oneVideo renderer
- * @returns {*}
- */
-function newRenderer(bidRequest, bid) {
-  if (!bidRequest.renderer) {
-    bidRequest.renderer = {};
-    bidRequest.renderer.url = 'https://cdn.vidible.tv/prod/hb-outstream-renderer/renderer.js';
-    bidRequest.renderer.render = function(bid) {
-      setTimeout(function () {
-        // eslint-disable-next-line no-undef
-        o2PlayerRender(bid);
-      }, 700)
-    };
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/oneVideoBidAdapter.md b/modules/oneVideoBidAdapter.md
deleted file mode 100644
index 72f251aac04..00000000000
--- a/modules/oneVideoBidAdapter.md
+++ /dev/null
@@ -1,296 +0,0 @@
-# Overview
-
-**Module Name**: One Video Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**: deepthi.neeladri.sravana@verizonmedia.com
-
-# Description
-Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to fetch bids.
-
-# Integration Examples:
-## Instream Video adUnit example & parameters
-*Note:* The Video SSP ad server will respond with an VAST XML to load into your defined player.
-```
-  var adUnits = [
-    {
-        code: 'video1',
-          mediaTypes: {
-            video: {
-                  context: 'instream',
-                  playerSize: [480, 640]
-            }
-          },
-          bids: [
-            {
-              bidder: 'oneVideo',
-              params: {
-                video: {
-                  playerWidth: 480,
-                  playerHeight: 640,
-                  mimes: ['video/mp4', 'application/javascript'],
-                  protocols: [2,5],
-                  api: [2],
-                  position: 1,
-                  delivery: [2],
-                  playbackmethod: [1,5],
-                  sid: YOUR_VSSP_ORG_ID,
-                  hp: 1,
-                  rewarded: 1,
-                  placement: 1,
-                  inventoryid: 123,
-                  minduration: 10,
-                  maxduration: 30,
-                },
-                site: {
-                    id: 1,
-                    page: 'https://verizonmedia.com',
-                    referrer: 'https://verizonmedia.com'
-                  },
-                pubId: 'HBExchange'
-                }
-            }
-          ]
-      }
-  ]
-```
-## Outstream Video adUnit example & parameters
-*Note:* The Video SSP ad server will load it's own Outstream Renderer (player) as a fallback if no player is defined on the publisher page. The Outstream player will inject into the div id that has an identical adUnit code.
-```
-  var adUnits = [
-    {
-        code: 'video1',
-          mediaTypes: {
-            video: {
-                  context: 'outstream',
-                  playerSize: [480, 640]
-            }
-          },
-          bids: [
-            {
-              bidder: 'oneVideo',
-              params: {
-                video: {
-                  playerWidth: 480,
-                  playerHeight: 640,
-                  mimes: ['video/mp4', 'application/javascript'],
-                  protocols: [2,5],
-                  api: [2],
-                  position: 1,
-                  delivery: [2],
-                  playbackmethod: [1,5],
-                  sid: YOUR_VSSP_ORG_ID,
-                  hp: 1,
-                  rewarded: 1,
-                  placement: 1,
-                  inventoryid: 123,
-                  minduration: 10,
-                  maxduration: 30,
-                },
-                site: {
-                    id: 1,
-                    page: 'https://verizonmedia.com',
-                    referrer: 'https://verizonmedia.com'
-                  },
-                pubId: 'HBExchange'
-                }
-            }
-          ]
-      }
-  ]
-```
-
-## S2S / Video: Dynamic Ad Placement (DAP) adUnit example & parameters
-*Note:* The Video SSP ad server will respond with HTML embed tag to be injected into an iFrame you create.
-```
-  var adUnits = [
-    {
-      code: 'video1',
-      mediaTypes: {
-        video: {
-          context: "instream",
-          playerSize: [480, 640]
-        }
-      },
-      bids: [
-        {
-          bidder: 'oneVideo',
-          params: {
-            video: {
-              playerWidth: 480,
-              playerHeight: 640,
-              mimes: ['video/mp4', 'application/javascript'],
-              position: 1,
-              display: 1
-            },
-            site: {
-              id: 1,
-              page: 'https://verizonmedia.com',
-              referrer: 'https://verizonmedia.com'
-            },
-            pubId: 'HBExchangeDAP'
-          }
-        }
-      ]
-    }
-]
-```
-## Prebid.js / Banner: Dynamic Ad Placement (DAP) adUnit example & parameters
-*Note:* The Video SSP ad server will respond with HTML embed tag to be injected into an iFrame created by Google Ad Manager (GAM).
-```
-  var adUnits = [
-    {
-      code: 'banner-1',
-      mediaTypes: {
-        banner: {
-          sizes: [300, 250]
-        }
-      },
-      bids: [
-        {
-          bidder: 'oneVideo',
-          params: {
-            video: {
-              playerWidth: 300,
-              playerHeight: 250,
-              mimes: ['video/mp4', 'application/javascript'],
-              display: 1
-            },
-            site: {
-              id: 1,
-              page: 'https://verizonmedia.com',
-              referrer: 'https://verizonmedia.com'
-            },
-            pubId: 'HBExchangeDAP'
-          }
-        }
-      ]
-    }
-]
-```
-
-# End 2 End Testing Mode
-By passing bid.params.video.e2etest = true you will be able to receive a test creative when connecting via VPN location U.S West Coast. This will allow you to trubleshoot how your player/ad-server parses and uses the VAST XML response.
-This automatically sets default values for the outbound bid-request to respond from our test exchange.
-No need to override the site/ref urls or change your pubId
-```
-var adUnits = [
-    {
-      code: 'video-1',
-      mediaTypes: {
-        video: {
-          context: "instream",
-          playerSize: [480, 640]
-        }
-      },
-      bids: [
-        {
-          bidder: 'oneVideo',
-          params: {
-            video: {
-              playerWidth: 300,
-              playerHeight: 250,
-              mimes: ['video/mp4', 'application/javascript'],
-              e2etest: true
-            }
-            pubId: 'YOUR_PUBLISHER_ID'
-          }
-        }
-      ]
-    }
-]
-```
-
-# Supply Chain Object Support
-The oneVideoBidAdapter supports 2 methods for passing/creating an schain object.
-1. By passing your Video SSP Org ID in the bid.video.params.sid - The adapter will create a new schain object and our ad-server will fill in the data for you.
-2. Using the Prebid Supply Chain Object Module - The adapter will capture the schain object
-*Note:* You cannot pass both schain object and bid.video.params.sid together. Option 1 will always be the default.
-
-## Create new schain using bid.video.params.sid
-sid = your Video SSP Organization ID.
-This is for direct publishers only.
-```
-var adUnits = [
-    {
-        code: 'video1',
-          mediaTypes: {
-            video: {
-                  context: 'instream',
-                  playerSize: [480, 640]
-            }
-          },
-          bids: [
-            {
-              bidder: 'oneVideo',
-              params: {
-                video: {
-                  playerWidth: 480,
-                  playerHeight: 640,
-                  mimes: ['video/mp4', 'application/javascript'],
-                  protocols: [2,5],
-                  api: [2],
-                  sid:
-                },
-                site: {
-                    id: 1,
-                    page: 'https://verizonmedia.com',
-                    referrer: 'https://verizonmedia.com'
-                  },
-                pubId: 'HBExchange'
-                }
-            }
-          ]
-      }
-  ]
-```
-
-## Pass global schain using pbjs.setConfig(SCHAIN_OBJECT)
-For both Authorized resellers and direct publishers.
-```
-pbjs.setConfig({
-  "schain": {
-      "validation": "strict",
-      "config": {
-          "ver": "1.0",
-          "complete": 1,
-          "nodes": [{
-                  "asi": "some-platform.com",
-                  "sid": "111111",
-                  "hp": 1
-          }]
-      }
-  }
-});
-
-var adUnits = [
-    {
-        code: 'video1',
-          mediaTypes: {
-            video: {
-                  context: 'instream',
-                  playerSize: [480, 640]
-            }
-          },
-          bids: [
-            {
-              bidder: 'oneVideo',
-              params: {
-                video: {
-                  playerWidth: 480,
-                  playerHeight: 640,
-                  mimes: ['video/mp4', 'application/javascript'],
-                  protocols: [2,5],
-                  api: [2],
-                },
-                site: {
-                    id: 1,
-                    page: 'https://verizonmedia.com',
-                    referrer: 'https://verizonmedia.com'
-                  },
-                pubId: 'HBExchange'
-                }
-            }
-          ]
-      }
-  ]
-```
diff --git a/modules/oneplanetonlyBidAdapter.md b/modules/oneplanetonlyBidAdapter.md
deleted file mode 100644
index 973adb33efd..00000000000
--- a/modules/oneplanetonlyBidAdapter.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Overview
-
-```
-Module Name: OnePlanetOnly Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: vitaly@oneplanetonly.com
-```
-
-# Description
-
-Module that connects to OnePlanetOnly's demand sources
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: 'desktop-banner-ad-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300, 250], [300, 600]],
-                }
-            },
-            bids: [
-                {
-                    bidder: 'oneplanetonly',
-                    params: {
-                        siteId: '5',
-                        adUnitId: '5-4587544'
-                    }
-                }
-            ]
-        },{
-            code: 'mobile-banner-ad-div',
-            mediaTypes: {
-                banner: {
-                    sizes: [[320, 50], [320, 100]],
-                }
-            },
-            bids: [
-                {
-                    bidder: "oneplanetonly",
-                    params: {
-                        siteId: '5',
-                        adUnitId: '5-81037880'
-                    }
-                }
-            ]
-        }
-    ];
-```
\ No newline at end of file
diff --git a/modules/onetagBidAdapter.js b/modules/onetagBidAdapter.js
index 6280dd12268..b5217e77cd6 100644
--- a/modules/onetagBidAdapter.js
+++ b/modules/onetagBidAdapter.js
@@ -3,12 +3,17 @@
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { INSTREAM, OUTSTREAM } from '../src/video.js';
 import { Renderer } from '../src/Renderer.js';
-import find from 'core-js-pure/features/array/find.js';
-const { registerBidder } = require('../src/adapters/bidderFactory.js');
+import { find } from '../src/polyfill.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { deepClone, logError, deepAccess } from '../src/utils.js';
 
 const ENDPOINT = 'https://onetag-sys.com/prebid-request';
 const USER_SYNC_ENDPOINT = 'https://onetag-sys.com/usync/';
 const BIDDER_CODE = 'onetag';
+const GVLID = 241;
+
+const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE });
 
 /**
  * Determines whether or not the given bid request is valid.
@@ -48,7 +53,7 @@ export function isValid(type, bid) {
 function buildRequests(validBidRequests, bidderRequest) {
   const payload = {
     bids: requestsToBids(validBidRequests),
-    ...getPageInfo()
+    ...getPageInfo(bidderRequest)
   };
   if (bidderRequest && bidderRequest.gdprConsent) {
     payload.gdprConsent = {
@@ -59,17 +64,24 @@ function buildRequests(validBidRequests, bidderRequest) {
   if (bidderRequest && bidderRequest.uspConsent) {
     payload.usPrivacy = bidderRequest.uspConsent;
   }
-  if (bidderRequest && bidderRequest.userId) {
-    payload.userId = bidderRequest.userId;
+  if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].userIdAsEids) {
+    payload.userId = validBidRequests[0].userIdAsEids;
   }
-  if (window.localStorage) {
-    payload.onetagSid = window.localStorage.getItem('onetag_sid');
+  if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].schain && isSchainValid(validBidRequests[0].schain)) {
+    payload.schain = validBidRequests[0].schain;
   }
-  const payloadString = JSON.stringify(payload);
+  try {
+    if (storage.hasLocalStorage()) {
+      payload.onetagSid = storage.getDataFromLocalStorage('onetag_sid');
+    }
+  } catch (e) { }
+  const connection = navigator.connection || navigator.webkitConnection;
+  payload.networkConnectionType = (connection && connection.type) ? connection.type : null;
+  payload.networkEffectiveConnectionType = (connection && connection.effectiveType) ? connection.effectiveType : null;
   return {
     method: 'POST',
     url: ENDPOINT,
-    data: payloadString
+    data: JSON.stringify(payload)
   }
 }
 
@@ -83,47 +95,38 @@ function interpretResponse(serverResponse, bidderRequest) {
   if (!body.bids || !Array.isArray(body.bids) || body.bids.length === 0) {
     return bids;
   }
-  body.bids.forEach(({
-    requestId,
-    cpm,
-    width,
-    height,
-    creativeId,
-    dealId,
-    currency,
-    mediaType,
-    ttl,
-    rendererUrl,
-    ad,
-    vastUrl,
-    videoCacheKey
-  }) => {
+  body.bids.forEach(bid => {
     const responseBid = {
-      requestId,
-      cpm,
-      width,
-      height,
-      creativeId,
-      dealId: dealId == null ? dealId : '',
-      currency,
-      netRevenue: false,
+      requestId: bid.requestId,
+      cpm: bid.cpm,
+      width: bid.width,
+      height: bid.height,
+      creativeId: bid.creativeId,
+      dealId: bid.dealId == null ? bid.dealId : '',
+      currency: bid.currency,
+      netRevenue: bid.netRevenue || false,
+      mediaType: bid.mediaType,
       meta: {
-        mediaType
+        mediaType: bid.mediaType,
+        advertiserDomains: bid.adomain
       },
-      ttl: ttl || 300
+      ttl: bid.ttl || 300
     };
-    if (mediaType === BANNER) {
-      responseBid.ad = ad;
-    } else if (mediaType === VIDEO) {
-      const {context, adUnitCode} = find(requestData.bids, (item) => item.bidId === requestId);
+    if (bid.mediaType === BANNER) {
+      responseBid.ad = bid.ad;
+    } else if (bid.mediaType === VIDEO) {
+      const { context, adUnitCode } = find(requestData.bids, (item) =>
+        item.bidId === bid.requestId &&
+        item.type === VIDEO
+      );
       if (context === INSTREAM) {
-        responseBid.vastUrl = vastUrl;
-        responseBid.videoCacheKey = videoCacheKey;
+        responseBid.vastUrl = bid.vastUrl;
+        responseBid.videoCacheKey = bid.videoCacheKey;
       } else if (context === OUTSTREAM) {
-        responseBid.vastXml = ad;
-        responseBid.vastUrl = vastUrl;
-        if (rendererUrl) {
-          responseBid.renderer = createRenderer({requestId, rendererUrl, adUnitCode});
+        responseBid.vastXml = bid.ad;
+        responseBid.vastUrl = bid.vastUrl;
+        if (bid.rendererUrl) {
+          responseBid.renderer = createRenderer({ ...bid, adUnitCode });
         }
       }
     }
@@ -141,38 +144,36 @@ function createRenderer(bid, rendererOptions = {}) {
     loaded: false
   });
   try {
-    renderer.setRender(onetagRenderer);
+    renderer.setRender(({ renderer, width, height, vastXml, adUnitCode }) => {
+      renderer.push(() => {
+        window.onetag.Player.init({
+          ...bid,
+          width,
+          height,
+          vastXml,
+          nodeId: adUnitCode,
+          config: renderer.getConfig()
+        });
+      });
+    });
   } catch (e) {
 
   }
   return renderer;
 }
 
-function onetagRenderer({renderer, width, height, vastXml, adUnitCode}) {
-  renderer.push(() => {
-    window.onetag.Player.init({
-      width,
-      height,
-      vastXml,
-      nodeId: adUnitCode,
-      config: renderer.getConfig()
-    });
-  });
-}
-
 function getFrameNesting() {
-  let frame = window;
+  let topmostFrame = window;
+  let parent = window.parent;
   try {
-    while (frame !== frame.top) {
+    while (topmostFrame !== topmostFrame.parent) {
+      parent = topmostFrame.parent;
       // eslint-disable-next-line no-unused-expressions
-      frame.location.href;
-      frame = frame.parent;
+      parent.location.href;
+      topmostFrame = topmostFrame.parent;
     }
-  } catch (e) {}
-  return {
-    topmostFrame: frame,
-    currentFrameNesting: frame.top === frame ? 1 : 2
-  }
+  } catch (e) { }
+  return topmostFrame;
 }
 
 function getDocumentVisibility(window) {
@@ -193,14 +194,15 @@ function getDocumentVisibility(window) {
 
 /**
  * Returns information about the page needed by the server in an object to be converted in JSON
- * @returns {{location: *, referrer: (*|string), masked: *, wWidth: (*|Number), wHeight: (*|Number), sWidth, sHeight, date: string, timeOffset: number}}
+ * @returns {{location: *, referrer: (*|string), stack: (*|Array.<String>), numIframes: (*|Number), wWidth: (*|Number), wHeight: (*|Number), sWidth, sHeight, date: string, timeOffset: number}}
  */
-function getPageInfo() {
-  const { topmostFrame, currentFrameNesting } = getFrameNesting();
+function getPageInfo(bidderRequest) {
+  const topmostFrame = getFrameNesting();
   return {
-    location: encodeURIComponent(topmostFrame.location.href),
-    referrer: encodeURIComponent(topmostFrame.document.referrer) || '0',
-    masked: currentFrameNesting,
+    location: deepAccess(bidderRequest, 'refererInfo.page', null),
+    referrer: deepAccess(bidderRequest, 'refererInfo.ref', null),
+    stack: deepAccess(bidderRequest, 'refererInfo.stack', []),
+    numIframes: deepAccess(bidderRequest, 'refererInfo.numIframes', 0),
     wWidth: topmostFrame.innerWidth,
     wHeight: topmostFrame.innerHeight,
     oWidth: topmostFrame.outerWidth,
@@ -216,7 +218,11 @@ function getPageInfo() {
     docHidden: getDocumentVisibility(topmostFrame),
     docHeight: topmostFrame.document.body ? topmostFrame.document.body.scrollHeight : null,
     hLength: history.length,
-    timing: getTiming()
+    timing: getTiming(),
+    version: {
+      prebid: '$prebid.version$',
+      adapter: '1.1.1'
+    }
   };
 }
 
@@ -227,15 +233,12 @@ function requestsToBids(bidRequests) {
     // Pass parameters
     // Context: instream - outstream - adpod
     videoObj['context'] = bidRequest.mediaTypes.video.context;
-    // MIME Video Types
-    videoObj['mimes'] = bidRequest.mediaTypes.video.mimes;
     // Sizes
     videoObj['playerSize'] = parseVideoSize(bidRequest);
     // Other params
-    videoObj['protocols'] = bidRequest.mediaTypes.video.protocols;
-    videoObj['maxDuration'] = bidRequest.mediaTypes.video.maxduration;
-    videoObj['api'] = bidRequest.mediaTypes.video.api;
+    videoObj['mediaTypeInfo'] = deepClone(bidRequest.mediaTypes.video);
     videoObj['type'] = VIDEO;
+    videoObj['priceFloors'] = getBidFloor(bidRequest, VIDEO, videoObj['playerSize']);
     return videoObj;
   });
   const bannerBidRequests = bidRequests.filter(bidRequest => isValid(BANNER, bidRequest)).map(bidRequest => {
@@ -243,6 +246,8 @@ function requestsToBids(bidRequests) {
     setGeneralInfo.call(bannerObj, bidRequest);
     bannerObj['sizes'] = parseSizes(bidRequest);
     bannerObj['type'] = BANNER;
+    bannerObj['mediaTypeInfo'] = deepClone(bidRequest.mediaTypes.banner);
+    bannerObj['priceFloors'] = getBidFloor(bidRequest, BANNER, bannerObj['sizes']);
     return bannerObj;
   });
   return videoBidRequests.concat(bannerBidRequests);
@@ -255,7 +260,9 @@ function setGeneralInfo(bidRequest) {
   this['bidderRequestId'] = bidRequest.bidderRequestId;
   this['auctionId'] = bidRequest.auctionId;
   this['transactionId'] = bidRequest.transactionId;
+  this['gpid'] = deepAccess(bidRequest, 'ortb2Imp.ext.gpid') || deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
   this['pubId'] = params.pubId;
+  this['ext'] = params.ext;
   if (params.pubClick) {
     this['click'] = params.pubClick;
   }
@@ -326,9 +333,9 @@ function parseSizes(bid) {
 
 function getSizes(sizes) {
   const ret = [];
-  for (let i = 0, lenght = sizes.length; i < lenght; i++) {
+  for (let i = 0; i < sizes.length; i++) {
     const size = sizes[i];
-    ret.push({width: size[0], height: size[1]})
+    ret.push({ width: size[0], height: size[1] })
   }
   return ret;
 }
@@ -336,11 +343,13 @@ function getSizes(sizes) {
 function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
   let syncs = [];
   let params = '';
-  if (gdprConsent && typeof gdprConsent.consentString === 'string') {
-    params += '&gdpr_consent=' + gdprConsent.consentString;
+  if (gdprConsent) {
     if (typeof gdprConsent.gdprApplies === 'boolean') {
       params += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
     }
+    if (typeof gdprConsent.consentString === 'string') {
+      params += '&gdpr_consent=' + gdprConsent.consentString;
+    }
   }
   if (uspConsent && typeof uspConsent === 'string') {
     params += '&us_privacy=' + uspConsent;
@@ -360,8 +369,40 @@ function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
   return syncs;
 }
 
+function getBidFloor(bidRequest, mediaType, sizes) {
+  const priceFloors = [];
+  if (typeof bidRequest.getFloor === 'function') {
+    sizes.forEach(size => {
+      const floor = bidRequest.getFloor({
+        currency: 'EUR',
+        mediaType: mediaType || '*',
+        size: [size.width, size.height]
+      });
+      floor.size = deepClone(size);
+      if (!floor.floor) { floor.floor = null; }
+      priceFloors.push(floor);
+    });
+  }
+  return priceFloors;
+}
+
+export function isSchainValid(schain) {
+  let isValid = false;
+  const requiredFields = ['asi', 'sid', 'hp'];
+  if (!schain || !schain.nodes) return isValid;
+  isValid = schain.nodes.reduce((status, node) => {
+    if (!status) return status;
+    return requiredFields.every(field => node.hasOwnProperty(field));
+  }, true);
+  if (!isValid) {
+    logError('OneTag: required schain params missing');
+  }
+  return isValid;
+}
+
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: isBidRequestValid,
   buildRequests: buildRequests,
diff --git a/modules/onomagicBidAdapter.js b/modules/onomagicBidAdapter.js
index 55fca29fbf3..d99455f3f73 100644
--- a/modules/onomagicBidAdapter.js
+++ b/modules/onomagicBidAdapter.js
@@ -1,7 +1,19 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import {
+  _each,
+  createTrackPixelHtml,
+  getBidIdParameter,
+  getUniqueIdentifierStr,
+  getWindowSelf,
+  getWindowTop,
+  isArray,
+  isFn,
+  isPlainObject,
+  logError,
+  logWarn
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
 
 const BIDDER_CODE = 'onomagic';
 const URL = 'https://bidder.onomagic.com/hb';
@@ -19,20 +31,20 @@ function buildRequests(bidReqs, bidderRequest) {
   try {
     let referrer = '';
     if (bidderRequest && bidderRequest.refererInfo) {
-      referrer = bidderRequest.refererInfo.referer;
+      referrer = bidderRequest.refererInfo.page;
     }
     const onomagicImps = [];
-    const publisherId = utils.getBidIdParameter('publisherId', bidReqs[0].params);
-    utils._each(bidReqs, function (bid) {
+    const publisherId = getBidIdParameter('publisherId', bidReqs[0].params);
+    _each(bidReqs, function (bid) {
       let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
-      bidSizes = ((utils.isArray(bidSizes) && utils.isArray(bidSizes[0])) ? bidSizes : [bidSizes]);
-      bidSizes = bidSizes.filter(size => utils.isArray(size));
+      bidSizes = ((isArray(bidSizes) && isArray(bidSizes[0])) ? bidSizes : [bidSizes]);
+      bidSizes = bidSizes.filter(size => isArray(size));
       const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}));
 
       const element = document.getElementById(bid.adUnitCode);
       const minSize = _getMinSize(processedSizes);
       const viewabilityAmount = _isViewabilityMeasurable(element)
-        ? _getViewability(element, utils.getWindowTop(), minSize)
+        ? _getViewability(element, getWindowTop(), minSize)
         : 'na';
       const viewabilityAmountRounded = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
 
@@ -46,17 +58,18 @@ function buildRequests(bidReqs, bidderRequest) {
         },
         tagid: String(bid.adUnitCode)
       };
-      const bidFloor = utils.getBidIdParameter('bidFloor', bid.params);
+      const bidFloor = _getBidFloor(bid);
       if (bidFloor) {
         imp.bidfloor = bidFloor;
       }
       onomagicImps.push(imp);
     });
     const onomagicBidReq = {
-      id: utils.getUniqueIdentifierStr(),
+      id: getUniqueIdentifierStr(),
       imp: onomagicImps,
       site: {
-        domain: utils.parseUrl(referrer).host,
+        // TODO: does the fallback make sense here?
+        domain: bidderRequest?.refererInfo?.domain || window.location.host,
         page: referrer,
         publisher: {
           id: publisherId
@@ -77,7 +90,7 @@ function buildRequests(bidReqs, bidderRequest) {
       options: {contentType: 'text/plain', withCredentials: false}
     };
   } catch (e) {
-    utils.logError(e, {bidReqs, bidderRequest});
+    logError(e, {bidReqs, bidderRequest});
   }
 }
 
@@ -95,7 +108,7 @@ function isBidRequestValid(bid) {
 
 function interpretResponse(serverResponse) {
   if (!serverResponse.body || typeof serverResponse.body != 'object') {
-    utils.logWarn('Onomagic server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
+    logWarn('Onomagic server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
     return [];
   }
   const { body: {id, seatbid} } = serverResponse;
@@ -117,13 +130,16 @@ function interpretResponse(serverResponse) {
           netRevenue: true,
           mediaType: BANNER,
           ad: _getAdMarkup(onomagicBid),
-          ttl: 60
+          ttl: 60,
+          meta: {
+            advertiserDomains: onomagicBid && onomagicBid.adomain ? onomagicBid.adomain : []
+          }
         });
       });
     }
     return onomagicBidResponses;
   } catch (e) {
-    utils.logError(e, {id, seatbid});
+    logError(e, {id, seatbid});
   }
 }
 
@@ -147,7 +163,7 @@ function _getDeviceType() {
 function _getAdMarkup(bid) {
   let adm = bid.adm;
   if ('nurl' in bid) {
-    adm += utils.createTrackPixelHtml(bid.nurl);
+    adm += createTrackPixelHtml(bid.nurl);
   }
   return adm;
 }
@@ -157,14 +173,14 @@ function _isViewabilityMeasurable(element) {
 }
 
 function _getViewability(element, topWin, { w, h } = {}) {
-  return utils.getWindowTop().document.visibilityState === 'visible'
+  return getWindowTop().document.visibilityState === 'visible'
     ? _getPercentInView(element, topWin, { w, h })
     : 0;
 }
 
 function _isIframe() {
   try {
-    return utils.getWindowSelf() !== utils.getWindowTop();
+    return getWindowSelf() !== getWindowTop();
   } catch (e) {
     return true;
   }
@@ -243,4 +259,20 @@ function _getPercentInView(element, topWin, { w, h } = {}) {
   return 0;
 }
 
+function _getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidFloor ? bid.params.bidFloor : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 registerBidder(spec);
diff --git a/modules/ooloAnalyticsAdapter.js b/modules/ooloAnalyticsAdapter.js
new file mode 100644
index 00000000000..9bc140f0536
--- /dev/null
+++ b/modules/ooloAnalyticsAdapter.js
@@ -0,0 +1,548 @@
+import { _each, deepClone, pick, deepSetValue, logError, logInfo } from '../src/utils.js';
+import { getOrigin } from '../libraries/getOrigin/index.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js'
+import adapterManager from '../src/adapterManager.js'
+import CONSTANTS from '../src/constants.json'
+import { ajax } from '../src/ajax.js'
+import { config } from '../src/config.js'
+
+const baseUrl = 'https://pbdata.oolo.io/'
+const ENDPOINTS = {
+  CONFIG: 'https://config-pbdata.oolo.io',
+  PAGE_DATA: baseUrl + 'page',
+  AUCTION: baseUrl + 'auctionData',
+  BID_WON: baseUrl + 'bidWonData',
+  AD_RENDER_FAILED: baseUrl + 'adRenderFailedData',
+  RAW: baseUrl + 'raw',
+  HBCONFIG: baseUrl + 'hbconfig',
+}
+
+const pbModuleVersion = '1.0.0'
+const prebidVersion = '$prebid.version$'
+const analyticsType = 'endpoint'
+const ADAPTER_CODE = 'oolo'
+const AUCTION_END_SEND_TIMEOUT = 1500
+export const PAGEVIEW_ID = +generatePageViewId()
+
+const {
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_REQUESTED,
+  BID_RESPONSE,
+  NO_BID,
+  BID_WON,
+  BID_TIMEOUT,
+  AD_RENDER_FAILED
+} = CONSTANTS.EVENTS
+
+const SERVER_EVENTS = {
+  AUCTION: 'auction',
+  WON: 'bidWon',
+  AD_RENDER_FAILED: 'adRenderFailed'
+}
+
+const SERVER_BID_STATUS = {
+  NO_BID: 'noBid',
+  BID_REQUESTED: 'bidRequested',
+  BID_RECEIVED: 'bidReceived',
+  BID_TIMEDOUT: 'bidTimedOut',
+  BID_WON: 'bidWon'
+}
+
+let auctions = {}
+let initOptions = {}
+let eventsQueue = []
+
+const onAuctionInit = (args) => {
+  const { auctionId, adUnits, timestamp } = args
+
+  let auction = auctions[auctionId] = {
+    ...args,
+    adUnits: {},
+    auctionStart: timestamp,
+    _sentToServer: false
+  }
+
+  handleCustomFields(auction, AUCTION_INIT, args)
+
+  _each(adUnits, adUnit => {
+    auction.adUnits[adUnit.code] = {
+      ...adUnit,
+      auctionId,
+      adunid: adUnit.code,
+      bids: {},
+    }
+  })
+}
+
+const onBidRequested = (args) => {
+  const { auctionId, bids, start, timeout } = args
+  const _start = start || Date.now()
+  const auction = auctions[auctionId]
+  const auctionAdUnits = auction.adUnits
+
+  bids.forEach(bid => {
+    const { adUnitCode } = bid
+    const bidId = parseBidId(bid)
+
+    auctionAdUnits[adUnitCode].bids[bidId] = {
+      ...bid,
+      timeout,
+      start: _start,
+      rs: _start - auction.auctionStart,
+      bidStatus: SERVER_BID_STATUS.BID_REQUESTED,
+    }
+  })
+}
+
+const onBidResponse = (args) => {
+  const { auctionId, adUnitCode } = args
+  const auction = auctions[auctionId]
+  const bidId = parseBidId(args)
+  let bid = auction.adUnits[adUnitCode].bids[bidId]
+
+  Object.assign(bid, args, {
+    bidStatus: SERVER_BID_STATUS.BID_RECEIVED,
+    end: args.responseTimestamp,
+    re: args.responseTimestamp - auction.auctionStart
+  })
+}
+
+const onNoBid = (args) => {
+  const { auctionId, adUnitCode } = args
+  const bidId = parseBidId(args)
+  const end = Date.now()
+  const auction = auctions[auctionId]
+  let bid = auction.adUnits[adUnitCode].bids[bidId]
+
+  Object.assign(bid, args, {
+    bidStatus: SERVER_BID_STATUS.NO_BID,
+    end,
+    re: end - auction.auctionStart
+  })
+}
+
+const onBidWon = (args) => {
+  const { auctionId, adUnitCode } = args
+  const bidId = parseBidId(args)
+  const bid = auctions[auctionId].adUnits[adUnitCode].bids[bidId]
+
+  Object.assign(bid, args, {
+    bidStatus: SERVER_BID_STATUS.BID_WON,
+    isW: true,
+    isH: true
+  })
+
+  if (auctions[auctionId]._sentToServer) {
+    const payload = {
+      auctionId,
+      adunid: adUnitCode,
+      bid: mapBid(bid, BID_WON)
+    }
+
+    sendEvent(SERVER_EVENTS.WON, payload)
+  }
+}
+
+const onBidTimeout = (args) => {
+  _each(args, bid => {
+    const { auctionId, adUnitCode } = bid
+    const bidId = parseBidId(bid)
+    let bidCache = auctions[auctionId].adUnits[adUnitCode].bids[bidId]
+
+    Object.assign(bidCache, bid, {
+      bidStatus: SERVER_BID_STATUS.BID_TIMEDOUT,
+    })
+  })
+}
+
+const onAuctionEnd = (args) => {
+  const { auctionId, adUnits, ...restAuctionEnd } = args
+
+  Object.assign(auctions[auctionId], restAuctionEnd, {
+    auctionEnd: args.auctionEnd || Date.now()
+  })
+
+  // wait for bidWon before sending to server
+  setTimeout(() => {
+    auctions[auctionId]._sentToServer = true
+    const finalAuctionData = buildAuctionData(auctions[auctionId])
+
+    sendEvent(SERVER_EVENTS.AUCTION, finalAuctionData)
+  }, initOptions.serverConfig.BID_WON_TIMEOUT || AUCTION_END_SEND_TIMEOUT)
+}
+
+const onAdRenderFailed = (args) => {
+  const data = deepClone(args)
+  data.timestamp = Date.now()
+
+  if (data.bid) {
+    data.bid = mapBid(data.bid, AD_RENDER_FAILED)
+  }
+
+  sendEvent(SERVER_EVENTS.AD_RENDER_FAILED, data)
+}
+
+var ooloAdapter = Object.assign(
+  adapter({ analyticsType }), {
+    track({ eventType, args }) {
+      // wait for server configuration before processing the events
+      if (typeof initOptions.serverConfig !== 'undefined' && eventsQueue.length === 0) {
+        handleEvent(eventType, args)
+      } else {
+        eventsQueue.push({ eventType, args })
+      }
+    }
+  }
+)
+
+function handleEvent(eventType, args) {
+  try {
+    const { sendRaw } = initOptions.serverConfig.events[eventType]
+    if (sendRaw) {
+      sendEvent(eventType, args, true)
+    }
+  } catch (e) { }
+
+  switch (eventType) {
+    case AUCTION_INIT:
+      onAuctionInit(args)
+      break
+    case BID_REQUESTED:
+      onBidRequested(args)
+      break
+    case NO_BID:
+      onNoBid(args)
+      break
+    case BID_RESPONSE:
+      onBidResponse(args)
+      break
+    case BID_WON:
+      onBidWon(args)
+      break
+    case BID_TIMEOUT:
+      onBidTimeout(args)
+      break
+    case AUCTION_END:
+      onAuctionEnd(args)
+      break
+    case AD_RENDER_FAILED:
+      onAdRenderFailed(args)
+      break
+  }
+}
+
+function sendEvent(eventType, args, isRaw) {
+  let data = deepClone(args)
+
+  Object.assign(data, buildCommonDataProperties(), {
+    eventType
+  })
+
+  if (isRaw) {
+    let rawEndpoint
+    try {
+      const { endpoint, omitRawFields } = initOptions.serverConfig.events[eventType]
+      rawEndpoint = endpoint
+      handleCustomRawFields(data, omitRawFields)
+    } catch (e) { }
+    ajaxCall(rawEndpoint || ENDPOINTS.RAW, () => { }, JSON.stringify(data))
+  } else {
+    let endpoint
+    if (eventType === SERVER_EVENTS.AD_RENDER_FAILED) {
+      endpoint = ENDPOINTS.AD_RENDER_FAILED
+    } else if (eventType === SERVER_EVENTS.WON) {
+      endpoint = ENDPOINTS.BID_WON
+    } else {
+      endpoint = ENDPOINTS.AUCTION
+    }
+
+    ajaxCall(endpoint, () => { }, JSON.stringify(data))
+  }
+}
+
+function checkEventsQueue() {
+  while (eventsQueue.length) {
+    const event = eventsQueue.shift()
+    handleEvent(event.eventType, event.args)
+  }
+}
+
+function buildAuctionData(auction) {
+  const auctionData = deepClone(auction)
+  const keysToRemove = ['adUnitCodes', 'auctionStatus', 'bidderRequests', 'bidsReceived', 'noBids', 'winningBids', 'timestamp', 'config']
+
+  keysToRemove.forEach(key => {
+    delete auctionData[key]
+  })
+
+  handleCustomFields(auctionData, AUCTION_END, auction)
+
+  // turn bids object into array of objects
+  Object.keys(auctionData.adUnits).forEach(adUnit => {
+    const adUnitObj = auctionData.adUnits[adUnit]
+    adUnitObj.bids = Object.keys(adUnitObj.bids).map(key => mapBid(adUnitObj.bids[key]))
+    delete adUnitObj['adUnitCode']
+    delete adUnitObj['code']
+    delete adUnitObj['transactionId']
+  })
+
+  // turn adUnits objects into array of adUnits
+  auctionData.adUnits = Object.keys(auctionData.adUnits).map(key => auctionData.adUnits[key])
+
+  return auctionData
+}
+
+function buildCommonDataProperties() {
+  return {
+    pvid: PAGEVIEW_ID,
+    pid: initOptions.pid,
+    pbModuleVersion
+  }
+}
+
+function buildLogMessage(message) {
+  return `oolo: ${message}`
+}
+
+function parseBidId(bid) {
+  return bid.bidId || bid.requestId
+}
+
+function mapBid({
+  bidStatus,
+  start,
+  end,
+  mediaType,
+  creativeId,
+  originalCpm,
+  originalCurrency,
+  source,
+  netRevenue,
+  currency,
+  width,
+  height,
+  timeToRespond,
+  responseTimestamp,
+  ...rest
+}, eventType) {
+  const bidObj = {
+    bst: bidStatus,
+    s: start,
+    e: responseTimestamp || end,
+    mt: mediaType,
+    crId: creativeId,
+    oCpm: originalCpm,
+    oCur: originalCurrency,
+    src: source,
+    nrv: netRevenue,
+    cur: currency,
+    w: width,
+    h: height,
+    ttr: timeToRespond,
+    ...rest,
+  }
+
+  delete bidObj['bidRequestsCount']
+  delete bidObj['bidderRequestId']
+  delete bidObj['bidderRequestsCount']
+  delete bidObj['bidderWinsCount']
+  delete bidObj['schain']
+  delete bidObj['refererInfo']
+  delete bidObj['statusMessage']
+  delete bidObj['status']
+  delete bidObj['adUrl']
+  delete bidObj['ad']
+  delete bidObj['usesGenericKeys']
+  delete bidObj['requestTimestamp']
+
+  try {
+    handleCustomFields(bidObj, eventType || BID_RESPONSE, rest)
+  } catch (e) { }
+
+  return bidObj
+}
+
+function handleCustomFields(obj, eventType, args) {
+  try {
+    const { pickFields, omitFields } = initOptions.serverConfig.events[eventType]
+
+    if (pickFields && obj && args) {
+      Object.assign(obj, pick(args, pickFields))
+    }
+
+    if (omitFields && obj && args) {
+      omitFields.forEach(field => {
+        deepSetValue(obj, field, undefined)
+      })
+    }
+  } catch (e) { }
+}
+
+function handleCustomRawFields(obj, omitRawFields) {
+  try {
+    if (omitRawFields && obj) {
+      omitRawFields.forEach(field => {
+        deepSetValue(obj, field, undefined)
+      })
+    }
+  } catch (e) { }
+}
+
+function getServerConfig() {
+  const defaultConfig = { events: {} }
+
+  ajaxCall(
+    ENDPOINTS.CONFIG + '?pid=' + initOptions.pid,
+    {
+      success: function (data) {
+        try {
+          initOptions.serverConfig = JSON.parse(data) || defaultConfig
+        } catch (e) {
+          initOptions.serverConfig = defaultConfig
+        }
+        checkEventsQueue()
+      },
+      error: function () {
+        initOptions.serverConfig = defaultConfig
+        checkEventsQueue()
+      }
+    },
+    null
+  )
+}
+
+function sendPage() {
+  setTimeout(() => {
+    const payload = {
+      timestamp: Date.now(),
+      screenWidth: window.screen.width,
+      screenHeight: window.screen.height,
+      url: window.location.href,
+      protocol: window.location.protocol,
+      origin: getOrigin(),
+      referrer: getTopWindowReferrer(),
+      pbVersion: prebidVersion,
+    }
+
+    Object.assign(payload, buildCommonDataProperties(), getPagePerformance())
+    ajaxCall(ENDPOINTS.PAGE_DATA, () => { }, JSON.stringify(payload))
+  }, 0)
+}
+
+function sendHbConfigData() {
+  const conf = {}
+  const pbjsConfig = config.getConfig()
+
+  Object.keys(pbjsConfig).forEach(key => {
+    if (key[0] !== '_') {
+      conf[key] = pbjsConfig[key]
+    }
+  })
+
+  ajaxCall(ENDPOINTS.HBCONFIG, () => { }, JSON.stringify(conf))
+}
+
+function getPagePerformance() {
+  let timing
+
+  try {
+    timing = window.top.performance.timing
+  } catch (e) { }
+
+  if (!timing) {
+    return
+  }
+
+  const { navigationStart, domContentLoadedEventEnd, loadEventEnd } = timing
+  const domContentLoadTime = domContentLoadedEventEnd - navigationStart
+  const pageLoadTime = loadEventEnd - navigationStart
+
+  return {
+    domContentLoadTime,
+    pageLoadTime,
+  }
+}
+
+function getTopWindowReferrer() {
+  try {
+    return window.top.document.referrer
+  } catch (e) {
+    return ''
+  }
+}
+
+function generatePageViewId(min = 10000, max = 90000) {
+  var randomNumber = Math.floor((Math.random() * max) + min)
+  var currentdate = new Date()
+  var currentTime = {
+    getDate: currentdate.getDate(),
+    getMonth: currentdate.getMonth(),
+    getFullYear: currentdate.getFullYear(),
+    getHours: currentdate.getHours(),
+    getMinutes: currentdate.getMinutes(),
+    getSeconds: currentdate.getSeconds(),
+    getMilliseconds: currentdate.getMilliseconds()
+  }
+  return ((currentTime.getDate <= 9) ? '0' + (currentTime.getDate) : (currentTime.getDate)) + '' +
+    (currentTime.getMonth + 1 <= 9 ? '0' + (currentTime.getMonth + 1) : (currentTime.getMonth + 1)) + '' +
+    currentTime.getFullYear % 100 + '' +
+    (currentTime.getHours <= 9 ? '0' + currentTime.getHours : currentTime.getHours) + '' +
+    (currentTime.getMinutes <= 9 ? '0' + currentTime.getMinutes : currentTime.getMinutes) + '' +
+    (currentTime.getSeconds <= 9 ? '0' + currentTime.getSeconds : currentTime.getSeconds) + '' +
+    (currentTime.getMilliseconds % 100 <= 9 ? '0' + (currentTime.getMilliseconds % 100) : (currentTime.getMilliseconds % 100)) + '' +
+    (randomNumber)
+}
+
+function ajaxCall(endpoint, callback, data, options = {}) {
+  if (data) {
+    options.contentType = 'application/json'
+  }
+
+  return ajax(endpoint, callback, data, options)
+}
+
+ooloAdapter.originEnableAnalytics = ooloAdapter.enableAnalytics
+ooloAdapter.enableAnalytics = function (config) {
+  ooloAdapter.originEnableAnalytics(config)
+  initOptions = config ? config.options : {}
+
+  if (!initOptions.pid) {
+    logError(buildLogMessage('enableAnalytics missing config object with "pid"'))
+    return
+  }
+
+  getServerConfig()
+  sendHbConfigData()
+
+  if (document.readyState === 'complete') {
+    sendPage()
+  } else {
+    window.addEventListener('load', sendPage)
+  }
+
+  logInfo(buildLogMessage('enabled analytics adapter'), config)
+  ooloAdapter.enableAnalytics = function () {
+    logInfo(buildLogMessage('Analytics adapter already enabled..'))
+  }
+}
+
+ooloAdapter.originDisableAnalytics = ooloAdapter.disableAnalytics
+ooloAdapter.disableAnalytics = function () {
+  auctions = {}
+  initOptions = {}
+  ooloAdapter.originDisableAnalytics()
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: ooloAdapter,
+  code: ADAPTER_CODE
+})
+
+// export for testing
+export {
+  buildAuctionData,
+  generatePageViewId
+}
+
+export default ooloAdapter
diff --git a/modules/ooloAnalyticsAdapter.md b/modules/ooloAnalyticsAdapter.md
new file mode 100644
index 00000000000..1ffb9cbe050
--- /dev/null
+++ b/modules/ooloAnalyticsAdapter.md
@@ -0,0 +1,24 @@
+# Overview
+
+Module Name: oolo Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: admin@oolo.io
+
+# Description
+
+Analytics adapter for oolo.
+
+oolo is an anomaly detection based monitoring solution for web publishers, built by adops for adops. Its purpose is to eliminate most of the daily manual work that teams are required to do, while increasing the overall performance, due to full & faster detection of problems and opportunities.
+
+Contact admin@oolo.io for information.
+
+# Usage
+
+```javascript
+pbjs.enableAnalytics({
+  provider: 'oolo',
+  options: {
+    pid: 12345 // id provided by oolo
+  }
+})
+```
diff --git a/modules/open8BidAdapter.js b/modules/open8BidAdapter.js
index 744cce2b5f9..5fa1dd0a143 100644
--- a/modules/open8BidAdapter.js
+++ b/modules/open8BidAdapter.js
@@ -1,6 +1,6 @@
 import { Renderer } from '../src/Renderer.js';
 import {ajax} from '../src/ajax.js';
-import * as utils from '../src/utils.js';
+import { createTrackPixelHtml, getBidIdParameter, logError, logWarn, tryAppendQueryString } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
 
@@ -24,9 +24,9 @@ export const spec = {
     for (var i = 0; i < validBidRequests.length; i++) {
       var bid = validBidRequests[i];
       var queryString = '';
-      var slotKey = utils.getBidIdParameter('slotKey', bid.params);
-      queryString = utils.tryAppendQueryString(queryString, 'slot_key', slotKey);
-      queryString = utils.tryAppendQueryString(queryString, 'imp_id', generateImpId());
+      var slotKey = getBidIdParameter('slotKey', bid.params);
+      queryString = tryAppendQueryString(queryString, 'slot_key', slotKey);
+      queryString = tryAppendQueryString(queryString, 'imp_id', generateImpId());
       queryString += ('bid_id=' + bid.bidId);
 
       requests.push({
@@ -65,7 +65,10 @@ export const spec = {
       currency: ad.currency || 'JPY',
       netRevenue: true,
       ttl: 360, // 6 minutes
-    }
+      meta: {
+        advertiserDomains: ad.adomain || []
+      }
+    };
 
     if (ad.adType === AD_TYPE.VIDEO) {
       const videoAd = bidderResponse.ad.video;
@@ -88,11 +91,11 @@ export const spec = {
       if (bannerAd.imps) {
         try {
           bannerAd.imps.forEach(impTrackUrl => {
-            const tracker = utils.createTrackPixelHtml(impTrackUrl);
+            const tracker = createTrackPixelHtml(impTrackUrl);
             bid.ad += tracker;
           });
         } catch (error) {
-          utils.logError('Error appending imp tracking pixel', error);
+          logError('Error appending imp tracking pixel', error);
         }
       }
     }
@@ -156,7 +159,7 @@ function newRenderer(bidderResponse) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on newRenderer', err);
+    logWarn('Prebid Error calling setRender on newRenderer', err);
   }
 
   return renderer;
diff --git a/modules/openwebBidAdapter.js b/modules/openwebBidAdapter.js
new file mode 100644
index 00000000000..296bfc682f1
--- /dev/null
+++ b/modules/openwebBidAdapter.js
@@ -0,0 +1,248 @@
+import {convertTypes, deepAccess, flatten, isArray, isNumber, parseSizesInput} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {ADPOD, BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {find} from '../src/polyfill.js';
+
+const ENDPOINT = 'https://ghb.spotim.market/v2/auction';
+const BIDDER_CODE = 'openweb';
+const DISPLAY = 'display';
+const syncsCache = {};
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: 280,
+  supportedMediaTypes: [VIDEO, BANNER, ADPOD],
+  isBidRequestValid: function (bid) {
+    return isNumber(deepAccess(bid, 'params.aid'));
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+
+    function addSyncs(bid) {
+      const uris = bid.cookieURLs;
+      const types = bid.cookieURLSTypes || [];
+
+      if (Array.isArray(uris)) {
+        uris.forEach((uri, i) => {
+          const type = types[i] || 'image';
+
+          if ((!syncOptions.pixelEnabled && type === 'image') ||
+            (!syncOptions.iframeEnabled && type === 'iframe') ||
+            syncsCache[uri]) {
+            return;
+          }
+
+          syncsCache[uri] = true;
+          syncs.push({
+            type: type,
+            url: uri
+          })
+        })
+      }
+    }
+
+    if (syncOptions.pixelEnabled || syncOptions.iframeEnabled) {
+      isArray(serverResponses) && serverResponses.forEach((response) => {
+        if (response.body) {
+          if (isArray(response.body)) {
+            response.body.forEach(b => {
+              addSyncs(b);
+            })
+          } else {
+            addSyncs(response.body)
+          }
+        }
+      })
+    }
+    return syncs;
+  },
+  /**
+   * Make a server request from the list of BidRequests
+   * @param bidRequests
+   * @param adapterRequest
+   */
+  buildRequests: function (bidRequests, adapterRequest) {
+    const { tag, bids } = bidToTag(bidRequests, adapterRequest);
+    return [{
+      data: Object.assign({}, tag, { BidRequests: bids }),
+      adapterRequest,
+      method: 'POST',
+      url: ENDPOINT
+    }];
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids
+   * @param serverResponse
+   * @param bidderRequest
+   * @return {Bid[]} An array of bids which were nested inside the server
+   */
+  interpretResponse: function (serverResponse, { adapterRequest }) {
+    serverResponse = serverResponse.body;
+    let bids = [];
+
+    if (!isArray(serverResponse)) {
+      return parseRTBResponse(serverResponse, adapterRequest);
+    }
+
+    serverResponse.forEach(serverBidResponse => {
+      bids = flatten(bids, parseRTBResponse(serverBidResponse, adapterRequest));
+    });
+
+    return bids;
+  },
+
+  transformBidParams(params) {
+    return convertTypes({
+      'aid': 'number',
+    }, params);
+  }
+};
+
+function parseRTBResponse(serverResponse, adapterRequest) {
+  const isEmptyResponse = !serverResponse || !isArray(serverResponse.bids);
+  const bids = [];
+
+  if (isEmptyResponse) {
+    return bids;
+  }
+
+  serverResponse.bids.forEach(serverBid => {
+    const request = find(adapterRequest.bids, (bidRequest) => {
+      return bidRequest.bidId === serverBid.requestId;
+    });
+
+    if (serverBid.cpm !== 0 && request !== undefined) {
+      const bid = createBid(serverBid, request);
+
+      bids.push(bid);
+    }
+  });
+
+  return bids;
+}
+
+function bidToTag(bidRequests, adapterRequest) {
+  // start publisher env
+  const tag = {
+    // TODO: is 'page' the right value here?
+    Domain: deepAccess(adapterRequest, 'refererInfo.page')
+  };
+  if (config.getConfig('coppa') === true) {
+    tag.Coppa = 1;
+  }
+  if (deepAccess(adapterRequest, 'gdprConsent.gdprApplies')) {
+    tag.GDPR = 1;
+    tag.GDPRConsent = deepAccess(adapterRequest, 'gdprConsent.consentString');
+  }
+  if (deepAccess(adapterRequest, 'uspConsent')) {
+    tag.USP = deepAccess(adapterRequest, 'uspConsent');
+  }
+  if (deepAccess(bidRequests[0], 'schain')) {
+    tag.Schain = deepAccess(bidRequests[0], 'schain');
+  }
+  if (deepAccess(bidRequests[0], 'userId')) {
+    tag.UserIds = deepAccess(bidRequests[0], 'userId');
+  }
+  if (deepAccess(bidRequests[0], 'userIdAsEids')) {
+    tag.UserEids = deepAccess(bidRequests[0], 'userIdAsEids');
+  }
+  // end publisher env
+  const bids = [];
+
+  for (let i = 0, length = bidRequests.length; i < length; i++) {
+    const bid = prepareBidRequests(bidRequests[i]);
+    bids.push(bid);
+  }
+
+  return { tag, bids };
+}
+
+/**
+ * Parse mediaType
+ * @param bidReq {object}
+ * @returns {object}
+ */
+function prepareBidRequests(bidReq) {
+  const mediaType = deepAccess(bidReq, 'mediaTypes.video') ? VIDEO : DISPLAY;
+  const sizes = mediaType === VIDEO ? deepAccess(bidReq, 'mediaTypes.video.playerSize') : deepAccess(bidReq, 'mediaTypes.banner.sizes');
+  const bidReqParams = {
+    'CallbackId': bidReq.bidId,
+    'Aid': bidReq.params.aid,
+    'AdType': mediaType,
+    'Sizes': parseSizesInput(sizes).join(',')
+  };
+
+  bidReqParams.PlacementId = bidReq.adUnitCode;
+  if (bidReq.params.iframe) {
+    bidReqParams.AdmType = 'iframe';
+  }
+  if (mediaType === VIDEO) {
+    const context = deepAccess(bidReq, 'mediaTypes.video.context');
+    if (context === ADPOD) {
+      bidReqParams.Adpod = deepAccess(bidReq, 'mediaTypes.video');
+    }
+  }
+  return bidReqParams;
+}
+
+/**
+ * Prepare all parameters for request
+ * @param bidderRequest {object}
+ * @returns {object}
+ */
+function getMediaType(bidderRequest) {
+  return deepAccess(bidderRequest, 'mediaTypes.video') ? VIDEO : BANNER;
+}
+
+/**
+ * Configure new bid by response
+ * @param bidResponse {object}
+ * @param bidRequest {Object}
+ * @returns {object}
+ */
+function createBid(bidResponse, bidRequest) {
+  const mediaType = getMediaType(bidRequest)
+  const context = deepAccess(bidRequest, 'mediaTypes.video.context');
+  const bid = {
+    requestId: bidResponse.requestId,
+    creativeId: bidResponse.cmpId,
+    height: bidResponse.height,
+    currency: bidResponse.cur,
+    width: bidResponse.width,
+    cpm: bidResponse.cpm,
+    netRevenue: true,
+    mediaType,
+    ttl: 300,
+    meta: {
+      advertiserDomains: bidResponse.adomain || []
+    }
+  };
+
+  if (mediaType === BANNER) {
+    return Object.assign(bid, {
+      ad: bidResponse.ad,
+      adUrl: bidResponse.adUrl,
+    });
+  }
+  if (context === ADPOD) {
+    Object.assign(bid, {
+      meta: {
+        primaryCatId: bidResponse.primaryCatId,
+      },
+      video: {
+        context: ADPOD,
+        durationSeconds: bidResponse.durationSeconds
+      }
+    });
+  }
+
+  Object.assign(bid, {
+    vastUrl: bidResponse.vastUrl
+  });
+
+  return bid;
+}
+
+registerBidder(spec);
diff --git a/modules/openwebBidAdapter.md b/modules/openwebBidAdapter.md
new file mode 100644
index 00000000000..dc8bfa6c59e
--- /dev/null
+++ b/modules/openwebBidAdapter.md
@@ -0,0 +1,27 @@
+# Overview
+
+**Module Name**: OpenWeb Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: monetization@openweb.com
+
+# Description
+
+OpenWeb.com official prebid adapter. Available in both client and server side versions.
+OpenWeb header bidding adapter provides solution for accessing both Video and Display demand.
+
+# Test Parameters
+```
+    var adUnits = [
+      // Banner adUnit
+      {
+        code: 'div-test-div',
+        sizes: [[300, 250]],
+        bids: [{
+          bidder: 'openweb',
+          params: {
+            aid: 529814
+          }
+        }]
+      }
+    ];
+```
diff --git a/modules/openxAnalyticsAdapter.js b/modules/openxAnalyticsAdapter.js
index 7addfe68bc6..3c5517223af 100644
--- a/modules/openxAnalyticsAdapter.js
+++ b/modules/openxAnalyticsAdapter.js
@@ -1,255 +1,19 @@
-import adapter from '../src/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
+import {
+  logWarn
+} from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import { config } from '../src/config.js';
-import { ajax } from '../src/ajax.js';
-import * as utils from '../src/utils.js';
 
-const {
-  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, BID_TIMEOUT, BID_WON }
-} = CONSTANTS;
+let openxAdapter = Object.assign(adapter({ urlParam: '', analyticsType: 'endpoint' }));
 
-const SLOT_LOADED = 'slotOnload';
-
-const ENDPOINT = 'https://ads.openx.net/w/1.0/pban';
-
-let initOptions;
-
-let auctionMap = {};
-
-function onAuctionInit({ auctionId }) {
-  auctionMap[auctionId] = {
-    adUnitMap: {}
-  };
-}
-
-function onBidRequested({ auctionId, auctionStart, bids, start }) {
-  const adUnitMap = auctionMap[auctionId]['adUnitMap'];
-
-  bids.forEach(bid => {
-    const { adUnitCode, bidId, bidder, params, transactionId } = bid;
-
-    adUnitMap[adUnitCode] = adUnitMap[adUnitCode] || {
-      auctionId,
-      auctionStart,
-      transactionId,
-      bidMap: {}
-    };
-
-    adUnitMap[adUnitCode]['bidMap'][bidId] = {
-      bidder,
-      params,
-      requestTimestamp: start
-    };
-  });
-}
-
-function onBidResponse({
-  auctionId,
-  adUnitCode,
-  requestId: bidId,
-  cpm,
-  creativeId,
-  responseTimestamp,
-  ts,
-  adId
-}) {
-  const adUnit = auctionMap[auctionId]['adUnitMap'][adUnitCode];
-  const bid = adUnit['bidMap'][bidId];
-  bid.cpm = cpm;
-  bid.creativeId = creativeId;
-  bid.responseTimestamp = responseTimestamp;
-  bid.ts = ts;
-  bid.adId = adId;
-}
-
-function onBidTimeout(args) {
-  utils
-    ._map(args, value => value)
-    .forEach(({ auctionId, adUnitCode, bidId }) => {
-      const bid =
-        auctionMap[auctionId]['adUnitMap'][adUnitCode]['bidMap'][bidId];
-      bid.timedOut = true;
-    });
-}
-
-function onBidWon({ auctionId, adUnitCode, requestId: bidId }) {
-  const adUnit = auctionMap[auctionId]['adUnitMap'][adUnitCode];
-  const bid = adUnit['bidMap'][bidId];
-  bid.won = true;
-}
-
-function onSlotLoaded({ slot }) {
-  const targeting = slot.getTargetingKeys().reduce((targeting, key) => {
-    targeting[key] = slot.getTargeting(key);
-    return targeting;
-  }, {});
-  utils.logMessage(
-    'GPT slot is loaded. Current targeting set on slot:',
-    targeting
-  );
-
-  const adId = slot.getTargeting('hb_adid')[0];
-  if (!adId) {
-    return;
-  }
-
-  const adUnit = getAdUnitByAdId(adId);
-  if (!adUnit) {
-    return;
-  }
-
-  const adUnitData = getAdUnitData(adUnit);
-  const performanceData = getPerformanceData(adUnit.auctionStart);
-  const commonFields = {
-    'hb.asiid': slot.getAdUnitPath(),
-    'hb.cur': config.getConfig('currency.adServerCurrency'),
-    'hb.pubid': initOptions.publisherId
-  };
-
-  const data = Object.assign({}, adUnitData, performanceData, commonFields);
-  sendEvent(data);
-}
-
-function getAdUnitByAdId(adId) {
-  let result;
-
-  utils._map(auctionMap, value => value).forEach(auction => {
-    utils._map(auction.adUnitMap, value => value).forEach(adUnit => {
-      utils._map(adUnit.bidMap, value => value).forEach(bid => {
-        if (adId === bid.adId) {
-          result = adUnit;
-        }
-      })
-    });
-  });
-
-  return result;
-}
-
-function getAdUnitData(adUnit) {
-  const bids = utils._map(adUnit.bidMap, value => value);
-  const bidders = bids.map(bid => bid.bidder);
-  const requestTimes = bids.map(
-    bid => bid.requestTimestamp && bid.requestTimestamp - adUnit.auctionStart
-  );
-  const responseTimes = bids.map(
-    bid => bid.responseTimestamp && bid.responseTimestamp - adUnit.auctionStart
-  );
-  const bidValues = bids.map(bid => bid.cpm || 0);
-  const timeouts = bids.map(bid => !!bid.timedOut);
-  const creativeIds = bids.map(bid => bid.creativeId);
-  const winningBid = bids.filter(bid => bid.won)[0];
-  const winningExchangeIndex = bids.indexOf(winningBid);
-  const openxBid = bids.filter(bid => bid.bidder === 'openx')[0];
-
-  return {
-    'hb.ct': adUnit.auctionStart,
-    'hb.rid': adUnit.auctionId,
-    'hb.exn': bidders.join(','),
-    'hb.sts': requestTimes.join(','),
-    'hb.ets': responseTimes.join(','),
-    'hb.bv': bidValues.join(','),
-    'hb.to': timeouts.join(','),
-    'hb.crid': creativeIds.join(','),
-    'hb.we': winningExchangeIndex,
-    'hb.g1': winningExchangeIndex === -1,
-    dddid: adUnit.transactionId,
-    ts: openxBid && openxBid.ts,
-    auid: openxBid && openxBid.params && openxBid.params.unit
-  };
-}
-
-function getPerformanceData(auctionStart) {
-  let timing;
-  try {
-    timing = window.top.performance.timing;
-  } catch (e) {}
-
-  if (!timing) {
-    return;
-  }
-
-  const { fetchStart, domContentLoadedEventEnd, loadEventEnd } = timing;
-  const domContentLoadTime = domContentLoadedEventEnd - fetchStart;
-  const pageLoadTime = loadEventEnd - fetchStart;
-  const timeToAuction = auctionStart - fetchStart;
-  const timeToRender = Date.now() - fetchStart;
-
-  return {
-    'hb.dcl': domContentLoadTime,
-    'hb.dl': pageLoadTime,
-    'hb.tta': timeToAuction,
-    'hb.ttr': timeToRender
-  };
-}
-
-function sendEvent(data) {
-  utils._map(data, (value, key) => [key, value]).forEach(([key, value]) => {
-    if (
-      value === undefined ||
-      value === null ||
-      (typeof value === 'number' && isNaN(value))
-    ) {
-      delete data[key];
-    }
-  });
-  ajax(ENDPOINT, null, data, { method: 'GET' });
-}
-
-let googletag = window.googletag || {};
-googletag.cmd = googletag.cmd || [];
-googletag.cmd.push(function() {
-  googletag.pubads().addEventListener(SLOT_LOADED, args => {
-    openxAdapter.track({ eventType: SLOT_LOADED, args });
-  });
-});
-
-const openxAdapter = Object.assign(
-  adapter({ url: ENDPOINT, analyticsType: 'endpoint' }),
-  {
-    track({ eventType, args }) {
-      utils.logMessage(eventType, Object.assign({}, args));
-      switch (eventType) {
-        case AUCTION_INIT:
-          onAuctionInit(args);
-          break;
-        case BID_REQUESTED:
-          onBidRequested(args);
-          break;
-        case BID_RESPONSE:
-          onBidResponse(args);
-          break;
-        case BID_TIMEOUT:
-          onBidTimeout(args);
-          break;
-        case BID_WON:
-          onBidWon(args);
-          break;
-        case SLOT_LOADED:
-          onSlotLoaded(args);
-          break;
-      }
-    }
-  }
-);
-
-// save the base class function
 openxAdapter.originEnableAnalytics = openxAdapter.enableAnalytics;
 
-// override enableAnalytics so we can get access to the config passed in from the page
-openxAdapter.enableAnalytics = function(config) {
-  if (!config || !config.options || !config.options.publisherId) {
-    utils.logError('OpenX analytics adapter: publisherId is required.');
-    return;
-  }
-  initOptions = config.options;
-  openxAdapter.originEnableAnalytics(config); // call the base class function
-};
+openxAdapter.enableAnalytics = function(adapterConfig = {options: {}}) {
+  logWarn('OpenX Analytics has been deprecated, this adapter will be removed in Prebid 8');
+
+  openxAdapter.track = prebidAnalyticsEventHandler;
 
-// reset the cache for unit tests
-openxAdapter.reset = function() {
-  auctionMap = {};
+  openxAdapter.originEnableAnalytics(adapterConfig);
 };
 
 adapterManager.registerAnalyticsAdapter({
@@ -258,3 +22,6 @@ adapterManager.registerAnalyticsAdapter({
 });
 
 export default openxAdapter;
+
+function prebidAnalyticsEventHandler({eventType, args}) {
+}
diff --git a/modules/openxAnalyticsAdapter.md b/modules/openxAnalyticsAdapter.md
index ac739f36c76..357e1520eb4 100644
--- a/modules/openxAnalyticsAdapter.md
+++ b/modules/openxAnalyticsAdapter.md
@@ -5,6 +5,10 @@
 
 ---
 
+# NOTE: OPENX NO LONGER OFFERS ANALYTICS
+# THIS ADAPTER NO LONGER FUNCTIONS AND 
+# WILL BE REMOVED IN PREBID 8
+
 # About this Guide
 This implementation guide walks through the flow of onboarding an alpha Publisher to test OpenX’s new Analytics Adapter.
 
@@ -102,11 +106,13 @@ Configuration options are a follows:
 
 | Property | Type | Required? | Description | Example |
 |:---|:---|:---|:---|:---|
-| `publisherPlatformId` | `string` | Yes | Used to determine ownership of data. | `a3aece0c-9e80-4316-8deb-faf804779bd1` |
-| `publisherAccountId` | `number` | Yes | Used to determine ownership of data. | `1537143056` |
+| `orgId` | `string` | Yes | Used to determine ownership of data. | `aa1bb2cc-3dd4-4316-8deb-faf804779bd1` |
+| `publisherPlatformId` | `string` | No <br> **__Deprecated.  Please use orgId__** | Used to determine ownership of data. | `a3aece0c-9e80-4316-8deb-faf804779bd1` |
+| `publisherAccountId` | `number` | No <br> **__Deprecated.  Please use orgId__** | Used to determine ownership of data. | `1537143056` |
 | `sampling` | `number` | Yes | Sampling rate | Undefined or `1.00` - No sampling. Analytics is sent all the time.<br>0.5 - 50% of users will send analytics data. |
 | `testCode` | `string` | No | Used to label analytics data for the purposes of tests.<br>This label is treated as a dimension and can be compared against other labels. | `timeout_config_1`<br>`timeout_config_2`<br>`timeout_default` |
-
+| `campaign` | `Object` | No | Object with 5 parameters: <ul><li>content</li><li>medium</li><li>name</li><li>source</li><li>term</li></ul> Each parameter is a free-form string. Refer to metrics doc on when to use these fields.  By setting a value to one of these properties, you override the associated url utm query parameter. | |
+| `payloadWaitTime` | `number` | No | Delay after all slots of an auction renders before the payload is sent. <br> Defaults to 100ms | 1000 |
 ---
 
 # Viewing Data
@@ -114,7 +120,7 @@ The Prebid Report available in the Reporting in the Cloud tool, allows you to vi
 
 **To view your data:**
 
-1. Log in to Reporting in the Cloud.
+1. Log in to [OpenX Reporting](https://openx.sigmoid.io/app).
 
 2. In the top right, click on the **View** list and then select **Prebidreport**.
 
diff --git a/modules/openxBidAdapter.js b/modules/openxBidAdapter.js
index d5630c2fad4..14525cd0cfc 100644
--- a/modules/openxBidAdapter.js
+++ b/modules/openxBidAdapter.js
@@ -1,24 +1,62 @@
+import {
+  _each,
+  _map,
+  convertTypes,
+  deepAccess,
+  deepSetValue,
+  inIframe,
+  isArray,
+  parseSizesInput,
+  parseUrl
+} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {includes} from '../src/polyfill.js';
 
 const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const VIDEO_TARGETING = ['startdelay', 'mimes', 'minduration', 'maxduration',
+  'startdelay', 'skippable', 'playbackmethod', 'api', 'protocols', 'boxingallowed',
+  'linearity', 'delivery', 'protocol', 'placement', 'minbitrate', 'maxbitrate'];
 const BIDDER_CODE = 'openx';
 const BIDDER_CONFIG = 'hb_pb';
-const BIDDER_VERSION = '3.0.2';
+const BIDDER_VERSION = '3.0.3';
+
+const DEFAULT_CURRENCY = 'USD';
 
 export const USER_ID_CODE_TO_QUERY_ARG = {
   britepoolid: 'britepoolid', // BritePool ID
   criteoId: 'criteoid', // CriteoID
-  digitrustid: 'digitrustid', // DigiTrust
+  fabrickId: 'nuestarid', // Fabrick ID by Nuestar
+  hadronId: 'audigentid', // Hadron ID from Audigent
   id5id: 'id5id', // ID5 ID
   idl_env: 'lre', // LiveRamp IdentityLink
+  IDP: 'zeotapid', // zeotapIdPlus ID+
+  idxId: 'idxid', // idIDx,
+  intentIqId: 'intentiqid', // IntentIQ ID
   lipb: 'lipbid', // LiveIntent ID
+  lotamePanoramaId: 'lotameid', // Lotame Panorama ID
+  merkleId: 'merkleid', // Merkle ID
   netId: 'netid', // netID
-  parrableid: 'parrableid', // Parrable ID
+  parrableId: 'parrableid', // Parrable ID
   pubcid: 'pubcid', // PubCommon ID
+  quantcastId: 'quantcastid', // Quantcast ID
+  tapadId: 'tapadid', // Tapad Id
   tdid: 'ttduuid', // The Trade Desk Unified ID
+  uid2: 'uid2', // Unified ID 2.0
+  admixerId: 'admixerid', // AdMixer ID
+  deepintentId: 'deepintentid', // DeepIntent ID
+  dmdId: 'dmdid', // DMD Marketing Corp ID
+  nextrollId: 'nextrollid', // NextRoll ID
+  novatiq: 'novatiqid', // Novatiq ID
+  mwOpenLinkId: 'mwopenlinkid', // MediaWallah OpenLink ID
+  dapId: 'dapid', // Akamai DAP ID
+  amxId: 'amxid', // AMX RTB ID
+  kpuid: 'kpuid', // Kinesso ID
+  publinkId: 'publinkid', // Publisher Link
+  naveggId: 'naveggid', // Navegg ID
+  imuid: 'imuid', // IM-UID by Intimate Merger
+  adtelligentId: 'adtelligentid' // Adtelligent ID
 };
 
 export const spec = {
@@ -27,8 +65,8 @@ export const spec = {
   supportedMediaTypes: SUPPORTED_AD_TYPES,
   isBidRequestValid: function (bidRequest) {
     const hasDelDomainOrPlatform = bidRequest.params.delDomain || bidRequest.params.platform;
-    if (utils.deepAccess(bidRequest, 'mediaTypes.banner') && hasDelDomainOrPlatform) {
-      return !!bidRequest.params.unit || utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes.length') > 0;
+    if (deepAccess(bidRequest, 'mediaTypes.banner') && hasDelDomainOrPlatform) {
+      return !!bidRequest.params.unit || deepAccess(bidRequest, 'mediaTypes.banner.sizes.length') > 0;
     }
 
     return !!(bidRequest.params.unit && hasDelDomainOrPlatform);
@@ -63,8 +101,8 @@ export const spec = {
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
     if (syncOptions.iframeEnabled || syncOptions.pixelEnabled) {
       let pixelType = syncOptions.iframeEnabled ? 'iframe' : 'image';
-      let url = utils.deepAccess(responses, '0.body.ads.pixels') ||
-        utils.deepAccess(responses, '0.body.pixels') ||
+      let url = deepAccess(responses, '0.body.ads.pixels') ||
+        deepAccess(responses, '0.body.pixels') ||
         generateDefaultSyncUrl(gdprConsent, uspConsent);
 
       return [{
@@ -74,7 +112,7 @@ export const spec = {
     }
   },
   transformBidParams: function(params, isOpenRtb) {
-    return utils.convertTypes({
+    return convertTypes({
       'unit': 'string',
       'customFloor': 'number'
     }, params);
@@ -99,7 +137,7 @@ function generateDefaultSyncUrl(gdprConsent, uspConsent) {
 }
 
 function isVideoRequest(bidRequest) {
-  return (utils.deepAccess(bidRequest, 'mediaTypes.video') && !utils.deepAccess(bidRequest, 'mediaTypes.banner')) || bidRequest.mediaType === VIDEO;
+  return (deepAccess(bidRequest, 'mediaTypes.video') && !deepAccess(bidRequest, 'mediaTypes.banner')) || bidRequest.mediaType === VIDEO;
 }
 
 function createBannerBidResponses(oxResponseObj, {bids, startTime}) {
@@ -145,6 +183,12 @@ function createBannerBidResponses(oxResponseObj, {bids, startTime}) {
       bidResponse.meta.brandId = adUnit.brand_id;
     }
 
+    if (adUnit.adomain && length(adUnit.adomain) > 0) {
+      bidResponse.meta.advertiserDomains = adUnit.adomain;
+    } else {
+      bidResponse.meta.advertiserDomains = [];
+    }
+
     if (adUnit.adv_id) {
       bidResponse.meta.dspid = adUnit.adv_id;
     }
@@ -169,13 +213,11 @@ function getViewportDimensions(isIfr) {
     } catch (e) {
       return;
     }
-    docEl = tDoc.documentElement;
     body = tDoc.body;
 
     width = tWin.innerWidth || docEl.clientWidth || body.clientWidth;
     height = tWin.innerHeight || docEl.clientHeight || body.clientHeight;
   } else {
-    docEl = tDoc.documentElement;
     width = tWin.innerWidth || docEl.clientWidth;
     height = tWin.innerHeight || docEl.clientHeight;
   }
@@ -185,7 +227,7 @@ function getViewportDimensions(isIfr) {
 
 function formatCustomParms(customKey, customParams) {
   let value = customParams[customKey];
-  if (utils.isArray(value)) {
+  if (isArray(value)) {
     // if value is an array, join them with commas first
     value = value.join(',');
   }
@@ -210,11 +252,11 @@ function getMediaTypeFromRequest(serverRequest) {
 }
 
 function buildCommonQueryParamsFromBids(bids, bidderRequest) {
-  const isInIframe = utils.inIframe();
+  const isInIframe = inIframe();
   let defaultParams;
 
   defaultParams = {
-    ju: config.getConfig('pageUrl') || bidderRequest.refererInfo.referer,
+    ju: bidderRequest.refererInfo.page,
     ch: document.charSet || document.characterSet,
     res: `${screen.width}x${screen.height}x${screen.colorDepth}`,
     ifr: isInIframe,
@@ -222,10 +264,20 @@ function buildCommonQueryParamsFromBids(bids, bidderRequest) {
     tws: getViewportDimensions(isInIframe),
     be: 1,
     bc: bids[0].params.bc || `${BIDDER_CONFIG}_${BIDDER_VERSION}`,
-    dddid: utils._map(bids, bid => bid.transactionId).join(','),
+    dddid: _map(bids, bid => bid.transactionId).join(','),
     nocache: new Date().getTime()
   };
 
+  const userDataSegments = buildFpdQueryParams('user.data', bidderRequest.ortb2);
+  if (userDataSegments.length > 0) {
+    defaultParams.sm = userDataSegments;
+  }
+
+  const siteContentDataSegments = buildFpdQueryParams('site.content.data', bidderRequest.ortb2);
+  if (siteContentDataSegments.length > 0) {
+    defaultParams.scsm = siteContentDataSegments;
+  }
+
   if (bids[0].params.platform) {
     defaultParams.ph = bids[0].params.platform;
   }
@@ -251,8 +303,8 @@ function buildCommonQueryParamsFromBids(bids, bidderRequest) {
   }
 
   // normalize publisher common id
-  if (utils.deepAccess(bids[0], 'crumbs.pubcid')) {
-    utils.deepSetValue(bids[0], 'userId.pubcid', utils.deepAccess(bids[0], 'crumbs.pubcid'));
+  if (deepAccess(bids[0], 'crumbs.pubcid')) {
+    deepSetValue(bids[0], 'userId.pubcid', deepAccess(bids[0], 'crumbs.pubcid'));
   }
   defaultParams = appendUserIdsToQueryParams(defaultParams, bids[0].userId);
 
@@ -264,17 +316,55 @@ function buildCommonQueryParamsFromBids(bids, bidderRequest) {
   return defaultParams;
 }
 
+function buildFpdQueryParams(fpdPath, ortb2) {
+  const firstPartyData = deepAccess(ortb2, fpdPath);
+  if (!Array.isArray(firstPartyData) || !firstPartyData.length) {
+    return '';
+  }
+  const fpd = firstPartyData
+    .filter(
+      data => (Array.isArray(data.segment) &&
+            data.segment.length > 0 &&
+            data.name !== undefined &&
+            data.name.length > 0)
+    )
+    .reduce((acc, data) => {
+      const name = typeof data.ext === 'object' && data.ext.segtax ? `${data.name}/${data.ext.segtax}` : data.name;
+      acc[name] = (acc[name] || []).concat(data.segment.map(seg => seg.id));
+      return acc;
+    }, {})
+  return Object.keys(fpd)
+    .map((name, _) => name + ':' + fpd[name].join('|'))
+    .join(',')
+}
+
 function appendUserIdsToQueryParams(queryParams, userIds) {
-  utils._each(userIds, (userIdObjectOrValue, userIdProviderKey) => {
+  _each(userIds, (userIdObjectOrValue, userIdProviderKey) => {
     const key = USER_ID_CODE_TO_QUERY_ARG[userIdProviderKey];
 
     if (USER_ID_CODE_TO_QUERY_ARG.hasOwnProperty(userIdProviderKey)) {
       switch (userIdProviderKey) {
-        case 'digitrustid':
-          queryParams[key] = utils.deepAccess(userIdObjectOrValue, 'data.id');
+        case 'merkleId':
+          queryParams[key] = userIdObjectOrValue.id;
+          break;
+        case 'uid2':
+          queryParams[key] = userIdObjectOrValue.id;
           break;
         case 'lipb':
           queryParams[key] = userIdObjectOrValue.lipbid;
+          if (Array.isArray(userIdObjectOrValue.segments) && userIdObjectOrValue.segments.length > 0) {
+            const liveIntentSegments = 'liveintent:' + userIdObjectOrValue.segments.join('|');
+            queryParams.sm = `${queryParams.sm ? queryParams.sm + ',' : ''}${liveIntentSegments}`;
+          }
+          break;
+        case 'parrableId':
+          queryParams[key] = userIdObjectOrValue.eid;
+          break;
+        case 'id5id':
+          queryParams[key] = userIdObjectOrValue.uid;
+          break;
+        case 'novatiq':
+          queryParams[key] = userIdObjectOrValue.snowflake;
           break;
         default:
           queryParams[key] = userIdObjectOrValue;
@@ -302,10 +392,15 @@ function buildOXBannerRequest(bids, bidderRequest) {
   let customParamsForAllBids = [];
   let hasCustomParam = false;
   let queryParams = buildCommonQueryParamsFromBids(bids, bidderRequest);
-  let auids = utils._map(bids, bid => bid.params.unit);
+  let auids = _map(bids, bid => bid.params.unit);
 
-  queryParams.aus = utils._map(bids, bid => utils.parseSizesInput(bid.mediaTypes.banner.sizes).join(',')).join('|');
-  queryParams.divIds = utils._map(bids, bid => encodeURIComponent(bid.adUnitCode)).join(',');
+  queryParams.aus = _map(bids, bid => parseSizesInput(bid.mediaTypes.banner.sizes).join(',')).join('|');
+  queryParams.divids = _map(bids, bid => encodeURIComponent(bid.adUnitCode)).join(',');
+  // gpid
+  queryParams.aucs = _map(bids, function (bid) {
+    let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+    return encodeURIComponent(gpid || '')
+  }).join(',');
 
   if (auids.some(auid => auid)) {
     queryParams.auid = auids.join(',');
@@ -321,7 +416,7 @@ function buildOXBannerRequest(bids, bidderRequest) {
 
   bids.forEach(function (bid) {
     if (bid.params.customParams) {
-      let customParamsForBid = utils._map(Object.keys(bid.params.customParams), customKey => formatCustomParms(customKey, bid.params.customParams));
+      let customParamsForBid = _map(Object.keys(bid.params.customParams), customKey => formatCustomParms(customKey, bid.params.customParams));
       let formattedCustomParams = window.btoa(customParamsForBid.join('&'));
       hasCustomParam = true;
       customParamsForAllBids.push(formattedCustomParams);
@@ -333,19 +428,7 @@ function buildOXBannerRequest(bids, bidderRequest) {
     queryParams.tps = customParamsForAllBids.join(',');
   }
 
-  let customFloorsForAllBids = [];
-  let hasCustomFloor = false;
-  bids.forEach(function (bid) {
-    if (bid.params.customFloor) {
-      customFloorsForAllBids.push((Math.round(bid.params.customFloor * 100) / 100) * 1000);
-      hasCustomFloor = true;
-    } else {
-      customFloorsForAllBids.push(0);
-    }
-  });
-  if (hasCustomFloor) {
-    queryParams.aumfs = customFloorsForAllBids.join(',');
-  }
+  enrichQueryWithFloors(queryParams, BANNER, bids);
 
   let url = queryParams.ph
     ? `https://u.openx.net/w/1.0/arj`
@@ -373,35 +456,55 @@ function buildOXVideoRequest(bid, bidderRequest) {
 }
 
 function generateVideoParameters(bid, bidderRequest) {
+  const videoMediaType = deepAccess(bid, `mediaTypes.video`);
   let queryParams = buildCommonQueryParamsFromBids([bid], bidderRequest);
-  let oxVideoConfig = utils.deepAccess(bid, 'params.video') || {};
-  let context = utils.deepAccess(bid, 'mediaTypes.video.context');
-  let playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+  let oxVideoConfig = deepAccess(bid, 'params.video') || {};
+  let context = deepAccess(bid, 'mediaTypes.video.context');
+  let playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
   let width;
   let height;
 
   // normalize config for video size
-  if (utils.isArray(bid.sizes) && bid.sizes.length === 2 && !utils.isArray(bid.sizes[0])) {
+  if (isArray(bid.sizes) && bid.sizes.length === 2 && !isArray(bid.sizes[0])) {
     width = parseInt(bid.sizes[0], 10);
     height = parseInt(bid.sizes[1], 10);
-  } else if (utils.isArray(bid.sizes) && utils.isArray(bid.sizes[0]) && bid.sizes[0].length === 2) {
+  } else if (isArray(bid.sizes) && isArray(bid.sizes[0]) && bid.sizes[0].length === 2) {
     width = parseInt(bid.sizes[0][0], 10);
     height = parseInt(bid.sizes[0][1], 10);
-  } else if (utils.isArray(playerSize) && playerSize.length === 2) {
+  } else if (isArray(playerSize) && playerSize.length === 2) {
     width = parseInt(playerSize[0], 10);
     height = parseInt(playerSize[1], 10);
   }
 
-  Object.keys(oxVideoConfig).forEach(function (key) {
-    if (key === 'openrtb') {
-      oxVideoConfig[key].w = width || oxVideoConfig[key].w;
-      oxVideoConfig[key].v = height || oxVideoConfig[key].v;
-      queryParams[key] = JSON.stringify(oxVideoConfig[key]);
-    } else if (!(key in queryParams) && key !== 'url') {
-      // only allow video-related attributes
-      queryParams[key] = oxVideoConfig[key];
-    }
-  });
+  let openRtbParams = {w: width, h: height};
+
+  // legacy openrtb params could be in video, openrtb, or video.openrtb
+  let legacyParams = bid.params.video || bid.params.openrtb || {};
+  if (legacyParams.openrtb) {
+    legacyParams = legacyParams.openrtb;
+  }
+  // support for video object or full openrtb object
+  if (isArray(legacyParams.imp)) {
+    legacyParams = legacyParams.imp[0].video;
+  }
+  Object.keys(legacyParams)
+    .filter(param => includes(VIDEO_TARGETING, param))
+    .forEach(param => openRtbParams[param] = legacyParams[param]);
+
+  // 5.0 openrtb video params
+  Object.keys(videoMediaType)
+    .filter(param => includes(VIDEO_TARGETING, param))
+    .forEach(param => openRtbParams[param] = videoMediaType[param]);
+
+  let openRtbReq = {
+    imp: [
+      {
+        video: openRtbParams
+      }
+    ]
+  };
+
+  queryParams['openrtb'] = JSON.stringify(openRtbReq);
 
   queryParams.auid = bid.params.unit;
   // override prebid config with openx config if available
@@ -416,6 +519,18 @@ function generateVideoParameters(bid, bidderRequest) {
     queryParams.vmimes = oxVideoConfig.mimes;
   }
 
+  if (bid.params.test) {
+    queryParams.vtest = 1;
+  }
+
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  if (gpid) {
+    queryParams.aucs = encodeURIComponent(gpid);
+  }
+
+  // each video bid makes a separate request
+  enrichQueryWithFloors(queryParams, VIDEO, [bid]);
+
   return queryParams;
 }
 
@@ -423,9 +538,12 @@ function createVideoBidResponses(response, {bid, startTime}) {
   let bidResponses = [];
 
   if (response !== undefined && response.vastUrl !== '' && response.pub_rev > 0) {
-    let vastQueryParams = utils.parseUrl(response.vastUrl).search || {};
+    let vastQueryParams = parseUrl(response.vastUrl).search || {};
     let bidResponse = {};
     bidResponse.requestId = bid.bidId;
+    if (response.deal_id) {
+      bidResponse.dealId = response.deal_id;
+    }
     // default 5 mins
     bidResponse.ttl = 300;
     // true is net, false is gross
@@ -449,4 +567,38 @@ function createVideoBidResponses(response, {bid, startTime}) {
   return bidResponses;
 }
 
+function enrichQueryWithFloors(queryParams, mediaType, bids) {
+  let customFloorsForAllBids = [];
+  let hasCustomFloor = false;
+  bids.forEach(function (bid) {
+    let floor = getBidFloor(bid, mediaType);
+
+    if (floor) {
+      customFloorsForAllBids.push(floor);
+      hasCustomFloor = true;
+    } else {
+      customFloorsForAllBids.push(0);
+    }
+  });
+  if (hasCustomFloor) {
+    queryParams.aumfs = customFloorsForAllBids.join(',');
+  }
+}
+
+function getBidFloor(bidRequest, mediaType) {
+  let floorInfo = {};
+  const currency = config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY;
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: currency,
+      mediaType: mediaType,
+      size: '*'
+    });
+  }
+  let floor = floorInfo.floor || bidRequest.params.customFloor || 0;
+
+  return Math.round(floor * 1000); // normalize to micro currency
+}
+
 registerBidder(spec);
diff --git a/modules/openxBidAdapter.md b/modules/openxBidAdapter.md
index 965b8ee1948..0690bf6b4fc 100644
--- a/modules/openxBidAdapter.md
+++ b/modules/openxBidAdapter.md
@@ -8,28 +8,31 @@ Maintainer: team-openx@openx.com
 
 # Description
 
-Module that connects to OpenX's demand sources
+Module that connects to OpenX's demand sources.
+Note there is an updated version of the OpenX bid adapter called openxOrtbBidAdapter.
+Publishers are welcome to test the other adapter and give feedback. Please note you should only include either openxBidAdapter or openxOrtbBidAdapter in your build.
 
 # Bid Parameters
 ## Banner
 
-| Name | Scope | Type | Description | Example
-| ---- | ----- | ---- | ----------- | -------
-| `delDomain` or `platform` | required | String | OpenX delivery domain or platform id provided by your OpenX representative.  | "PUBLISHER-d.openx.net" or "555not5a-real-plat-form-id0123456789"
-| `unit` | required | String | OpenX ad unit ID provided by your OpenX representative. | "1611023122"
-| `customParams` | optional | Object | User-defined targeting key-value pairs. customParams applies to a specific unit. | `{key1: "v1", key2: ["v2","v3"]}`
-| `customFloor` | optional | Number | Minimum price in USD. customFloor applies to a specific unit. For example, use the following value to set a $1.50 floor: 1.50 <br/><br/> **WARNING:**<br/> Misuse of this parameter can impact revenue | 1.50
-| `doNotTrack` | optional | Boolean | Prevents advertiser from using data for this user. <br/><br/> **WARNING:**<br/> Request-level setting.  May impact revenue. | true
-| `coppa` | optional | Boolean | Enables Child's Online Privacy Protection Act (COPPA) regulations. | true
+| Name                            | Scope    | Type    | Description                                                                                                                                                                                                                                                                                                                                                                                                                   | Example                           |
+|---------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------|
+| `delDomain` ~~or `platform`~~** | required | String  | OpenX delivery domain provided by your OpenX representative.                                                                                                                                                                                                                                                                                                                                                                  | "PUBLISHER-d.openx.net"           |
+| `unit`                          | required | String  | OpenX ad unit ID provided by your OpenX representative.                                                                                                                                                                                                                                                                                                                                                                       | "1611023122"                      |
+| `customParams`                  | optional | Object  | User-defined targeting key-value pairs. customParams applies to a specific unit.                                                                                                                                                                                                                                                                                                                                              | `{key1: "v1", key2: ["v2","v3"]}` |
+| `customFloor`                   | optional | Number  | Minimum price in USD. customFloor applies to a specific unit. For example, use the following value to set a $1.50 floor: 1.50 <br/><br/> **WARNING:**<br/> Misuse of this parameter can impact revenue<br/><br/>Note: OpenX suggests using the [Price Floor Module](https://docs.prebid.org/dev-docs/modules/floors.html) instead of customFloor. The Price Floor Module is prioritized over customFloor if both are present. | 1.50                              |
+| `doNotTrack`                    | optional | Boolean | Prevents advertiser from using data for this user. <br/><br/> **WARNING:**<br/> Request-level setting.  May impact revenue.                                                                                                                                                                                                                                                                                                   | true                              |
+| `coppa`                         | optional | Boolean | Enables Child's Online Privacy Protection Act (COPPA) regulations.                                                                                                                                                                                                                                                                                                                                                            | true                              |
 
-## Video
+** platform is deprecated. Please use delDomain instead. If you have any questions please contact your representative. 
 
-| Name | Scope | Type | Description | Example
-| ---- | ----- | ---- | ----------- | -------
-| `unit` | required | String | OpenX ad unit ID provided by your OpenX representative. | "1611023122"
-| `delDomain` | required | String |  OpenX delivery domain provided by your OpenX representative.  | "PUBLISHER-d.openx.net"
-| `openrtb` | optional | OpenRTB Impression | An OpenRtb Impression with Video subtype properties | `{ imp: [{ video: {mimes: ['video/x-ms-wmv, video/mp4']} }] }`
+## Video
 
+| Name        | Scope    | Type               | Description                                                  | Example                                                        |
+|-------------|----------|--------------------|--------------------------------------------------------------|----------------------------------------------------------------|
+| `unit`      | required | String             | OpenX ad unit ID provided by your OpenX representative.      | "1611023122"                                                   |
+| `delDomain` | required | String             | OpenX delivery domain provided by your OpenX representative. | "PUBLISHER-d.openx.net"                                        |
+| `openrtb`   | optional | OpenRTB Impression | An OpenRtb Impression with Video subtype properties          | `{ imp: [{ video: {mimes: ['video/x-ms-wmv, video/mp4']} }] }` |
 
 # Example
 ```javascript
@@ -98,7 +101,7 @@ pbjs.setConfig({
 ```
 
 # Additional Details
-[Banner Ads](https://docs.openx.com/Content/developers/containers/prebid-adapter.html)
+[Banner Ads](https://docs.openx.com/publishers/prebid-adapter-web/)
 
-[Video Ads](https://docs.openx.com/Content/developers/containers/prebid-video-adapter.html)
+[Video Ads](https://docs.openx.com/publishers/prebid-adapter-video/)
 
diff --git a/modules/openxOrtbBidAdapter.js b/modules/openxOrtbBidAdapter.js
new file mode 100644
index 00000000000..200d2cf0fed
--- /dev/null
+++ b/modules/openxOrtbBidAdapter.js
@@ -0,0 +1,224 @@
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+import {mergeDeep} from '../src/utils.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
+
+const bidderConfig = 'hb_pb_ortb';
+const bidderVersion = '1.0';
+export const REQUEST_URL = 'https://rtb.openx.net/openrtbb/prebidjs';
+export const SYNC_URL = 'https://u.openx.net/w/1.0/pd';
+export const DEFAULT_PH = '2d1251ae-7f3a-47cf-bd2a-2f288854a0ba';
+export const spec = {
+  code: 'openx',
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
+  transformBidParams
+};
+
+registerBidder(spec);
+
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 300
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    if (bidRequest.mediaTypes[VIDEO]?.context === 'outstream') {
+      imp.video.placement = imp.video.placement || 4;
+    }
+    if (imp.ext?.ae && !context.bidderRequest.fledgeEnabled) {
+      // TODO: we may want to standardize this and move fledge logic to ortbConverter
+      delete imp.ext.ae;
+    }
+    mergeDeep(imp, {
+      tagid: bidRequest.params.unit,
+      ext: {
+        divid: bidRequest.adUnitCode
+      }
+    });
+    if (bidRequest.params.customParams) {
+      utils.deepSetValue(imp, 'ext.customParams', bidRequest.params.customParams);
+    }
+    if (bidRequest.params.customFloor && !imp.bidfloor) {
+      imp.bidfloor = bidRequest.params.customFloor;
+    }
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const req = buildRequest(imps, bidderRequest, context);
+    mergeDeep(req, {
+      at: 1,
+      ext: {
+        bc: `${bidderConfig}_${bidderVersion}`
+      }
+    })
+    const bid = context.bidRequests[0];
+    if (bid.params.doNotTrack) {
+      utils.deepSetValue(req, 'device.dnt', 1);
+    }
+    if (bid.params.platform) {
+      utils.deepSetValue(req, 'ext.platform', bid.params.platform);
+    }
+    if (bid.params.delDomain) {
+      utils.deepSetValue(req, 'ext.delDomain', bid.params.delDomain);
+    }
+    if (bid.params.response_template_name) {
+      utils.deepSetValue(req, 'ext.response_template_name', bid.params.response_template_name);
+    }
+    if (bid.params.test) {
+      req.test = 1
+    }
+    return req;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    const bidResponse = buildBidResponse(bid, context);
+    if (bid.ext) {
+      bidResponse.meta.networkId = bid.ext.dsp_id;
+      bidResponse.meta.advertiserId = bid.ext.buyer_id;
+      bidResponse.meta.brandId = bid.ext.brand_id;
+    }
+    const {ortbResponse} = context;
+    if (ortbResponse.ext && ortbResponse.ext.paf) {
+      bidResponse.meta.paf = Object.assign({}, ortbResponse.ext.paf);
+      bidResponse.meta.paf.content_id = utils.deepAccess(bid, 'ext.paf.content_id');
+    }
+    return bidResponse;
+  },
+  response(buildResponse, bidResponses, ortbResponse, context) {
+    // pass these from request to the responses for use in userSync
+    const {ortbRequest} = context;
+    if (ortbRequest.ext) {
+      if (ortbRequest.ext.delDomain) {
+        utils.deepSetValue(ortbResponse, 'ext.delDomain', ortbRequest.ext.delDomain);
+      }
+      if (ortbRequest.ext.platform) {
+        utils.deepSetValue(ortbResponse, 'ext.platform', ortbRequest.ext.platform);
+      }
+    }
+    const response = buildResponse(bidResponses, ortbResponse, context);
+    // TODO: we may want to standardize this and move fledge logic to ortbConverter
+    let fledgeAuctionConfigs = utils.deepAccess(ortbResponse, 'ext.fledge_auction_configs');
+    if (fledgeAuctionConfigs) {
+      fledgeAuctionConfigs = Object.entries(fledgeAuctionConfigs).map(([bidId, cfg]) => {
+        return Object.assign({
+          bidId,
+          auctionSignals: {}
+        }, cfg);
+      });
+      return {
+        bids: response.bids,
+        fledgeAuctionConfigs,
+      }
+    } else {
+      return response.bids
+    }
+  },
+  overrides: {
+    imp: {
+      bidfloor(setBidFloor, imp, bidRequest, context) {
+        // enforce floors should always be in USD
+        // TODO: does it make sense that request.cur can be any currency, but request.imp[].bidfloorcur must be USD?
+        const floor = {};
+        setBidFloor(floor, bidRequest, {...context, currency: 'USD'});
+        if (floor.bidfloorcur === 'USD') {
+          Object.assign(imp, floor);
+        }
+      }
+    }
+  }
+});
+
+function transformBidParams(params, isOpenRtb) {
+  return utils.convertTypes({
+    'unit': 'string',
+    'customFloor': 'number'
+  }, params);
+}
+
+function isBidRequestValid(bidRequest) {
+  const hasDelDomainOrPlatform = bidRequest.params.delDomain ||
+    bidRequest.params.platform;
+
+  if (utils.deepAccess(bidRequest, 'mediaTypes.banner') &&
+    hasDelDomainOrPlatform) {
+    return !!bidRequest.params.unit ||
+      utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes.length') > 0;
+  }
+
+  return !!(bidRequest.params.unit && hasDelDomainOrPlatform);
+}
+
+function buildRequests(bids, bidderRequest) {
+  let videoBids = bids.filter(bid => isVideoBid(bid));
+  let bannerBids = bids.filter(bid => isBannerBid(bid));
+  let requests = bannerBids.length ? [createRequest(bannerBids, bidderRequest, BANNER)] : [];
+  videoBids.forEach(bid => {
+    requests.push(createRequest([bid], bidderRequest, VIDEO));
+  });
+  return requests;
+}
+
+function createRequest(bidRequests, bidderRequest, mediaType) {
+  return {
+    method: 'POST',
+    url: config.getConfig('openxOrtbUrl') || REQUEST_URL,
+    data: converter.toORTB({bidRequests, bidderRequest, context: {mediaType}})
+  }
+}
+
+function isVideoBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.video');
+}
+
+function isBannerBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
+}
+
+function interpretResponse(resp, req) {
+  if (!resp.body) {
+    resp.body = {nbr: 0};
+  }
+  return converter.fromORTB({request: req.data, response: resp.body});
+}
+
+/**
+ * @param syncOptions
+ * @param responses
+ * @param gdprConsent
+ * @param uspConsent
+ * @return {{type: (string), url: (*|string)}[]}
+ */
+function getUserSyncs(syncOptions, responses, gdprConsent, uspConsent) {
+  if (syncOptions.iframeEnabled || syncOptions.pixelEnabled) {
+    let pixelType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let queryParamStrings = [];
+    let syncUrl = SYNC_URL;
+    if (gdprConsent) {
+      queryParamStrings.push('gdpr=' + (gdprConsent.gdprApplies ? 1 : 0));
+      queryParamStrings.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || ''));
+    }
+    if (uspConsent) {
+      queryParamStrings.push('us_privacy=' + encodeURIComponent(uspConsent));
+    }
+    if (responses.length > 0 && responses[0].body && responses[0].body.ext) {
+      const ext = responses[0].body.ext;
+      if (ext.delDomain) {
+        syncUrl = `https://${ext.delDomain}/w/1.0/pd`
+      } else if (ext.platform) {
+        queryParamStrings.push('ph=' + ext.platform)
+      }
+    } else {
+      queryParamStrings.push('ph=' + DEFAULT_PH)
+    }
+    return [{
+      type: pixelType,
+      url: `${syncUrl}${queryParamStrings.length > 0 ? '?' + queryParamStrings.join('&') : ''}`
+    }];
+  }
+}
diff --git a/modules/openxOrtbBidAdapter.md b/modules/openxOrtbBidAdapter.md
new file mode 100644
index 00000000000..fd926b27b9f
--- /dev/null
+++ b/modules/openxOrtbBidAdapter.md
@@ -0,0 +1,105 @@
+# Overview
+
+```
+Module Name: OpenX OpenRTB Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: team-openx@openx.com
+```
+
+# Description
+
+This is an updated version of the OpenX bid adapter which calls our new serving architecture.
+Publishers are welcome to test this adapter and give feedback. Please note you should only include either openxBidAdapter or openxOrtbBidAdapter in your build.
+
+# Bid Parameters
+## Banner
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `delDomain` or `platform` | required | String | OpenX delivery domain or platform id provided by your OpenX representative.  | "PUBLISHER-d.openx.net" or "555not5a-real-plat-form-id0123456789"
+| `unit` | required | String | OpenX ad unit ID provided by your OpenX representative. | "1611023122"
+| `customParams` | optional | Object | User-defined targeting key-value pairs. customParams applies to a specific unit. | `{key1: "v1", key2: ["v2","v3"]}`
+| `customFloor` | optional | Number | Minimum price in USD. customFloor applies to a specific unit. For example, use the following value to set a $1.50 floor: 1.50 <br/><br/> **WARNING:**<br/> Misuse of this parameter can impact revenue | 1.50
+| `doNotTrack` | optional | Boolean | Prevents advertiser from using data for this user. <br/><br/> **WARNING:**<br/> Request-level setting.  May impact revenue. | true
+| `coppa` | optional | Boolean | Enables Child's Online Privacy Protection Act (COPPA) regulations. | true
+
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `unit` | required | String | OpenX ad unit ID provided by your OpenX representative. | "1611023122"
+| `delDomain` | required | String |  OpenX delivery domain provided by your OpenX representative.  | "PUBLISHER-d.openx.net"
+| `video` | optional | OpenRTB video subtypes | Alternatively can be added under adUnit.mediaTypes.video | `{ video: {mimes: ['video/mp4']}`
+
+
+# Example
+```javascript
+var adUnits = [
+  {
+    code: 'test-div',
+    sizes: [[728, 90]],  // a display size
+    mediaTypes: {'banner': {}},
+    bids: [
+      {
+        bidder: 'openx',
+        params: {
+          unit: '539439964',
+          delDomain: 'se-demo-d.openx.net',
+          customParams: {
+            key1: 'v1',
+            key2: ['v2', 'v3']
+          },
+        }
+      }, {
+         bidder: 'openx',
+         params: {
+           unit: '539439964',
+           platform: 'a3aece0c-9e80-4316-8deb-faf804779bd1',
+           customParams: {
+             key1: 'v1',
+             key2: ['v2', 'v3']
+           },
+         }
+       }
+    ]
+  },
+  {
+    code: 'video1',
+    mediaTypes: {
+      video: {
+        playerSize: [640, 480],
+        context: 'instream'
+      }
+    },
+    bids: [{
+      bidder: 'openx',
+      params: {
+        unit: '1611023124',
+        delDomain: 'PUBLISHER-d.openx.net',
+        video: {
+          mimes: ['video/x-ms-wmv, video/mp4']
+        }
+      }
+    }]
+  }
+];
+```
+
+# Configuration
+Add the following code to enable user syncing. By default, Prebid.js version 0.34.0+ turns off user syncing through iframes.
+OpenX strongly recommends enabling user syncing through iframes. This functionality improves DSP user match rates and increases the
+OpenX bid rate and bid price. Be sure to call `pbjs.setConfig()` only once.
+
+```javascript
+pbjs.setConfig({
+   userSync: {
+      iframeEnabled: true
+   }
+});
+```
+
+# Additional Details
+[Banner Ads](https://docs.openx.com/publishers/prebid-adapter-web/)
+
+[Video Ads](https://docs.openx.com/publishers/prebid-adapter-video/)
+
diff --git a/modules/operaadsBidAdapter.js b/modules/operaadsBidAdapter.js
new file mode 100644
index 00000000000..aa548debf32
--- /dev/null
+++ b/modules/operaadsBidAdapter.js
@@ -0,0 +1,821 @@
+import {
+  deepAccess,
+  deepSetValue,
+  generateUUID,
+  getDNT,
+  isArray,
+  isFn,
+  isPlainObject,
+  isStr,
+  logError,
+  logWarn,
+  triggerPixel
+} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {Renderer} from '../src/Renderer.js';
+import {OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'operaads';
+
+const ENDPOINT = 'https://s.adx.opera.com/ortb/v2/';
+const USER_SYNC_ENDPOINT = 'https://s.adx.opera.com/usersync/page';
+
+const OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_LANGUAGE = 'en';
+const NET_REVENUE = true;
+
+const BANNER_DEFAULTS = {
+  SIZE: [300, 250]
+}
+
+const VIDEO_DEFAULTS = {
+  PROTOCOLS: [2, 3, 5, 6],
+  MIMES: ['video/mp4'],
+  PLAYBACK_METHODS: [1, 2, 3, 4],
+  DELIVERY: [1],
+  API: [1, 2, 5],
+  SIZE: [640, 480]
+}
+
+const NATIVE_DEFAULTS = {
+  IMAGE_TYPE: {
+    ICON: 1,
+    MAIN: 3,
+  },
+  ASSET_ID: {
+    TITLE: 1,
+    IMAGE: 2,
+    ICON: 3,
+    BODY: 4,
+    SPONSORED: 5,
+    CTA: 6
+  },
+  DATA_ASSET_TYPE: {
+    SPONSORED: 1,
+    DESC: 2,
+    CTA_TEXT: 12,
+  },
+  LENGTH: {
+    TITLE: 90,
+    BODY: 140,
+    SPONSORED: 25,
+    CTA: 20
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  // short code
+  aliases: ['opera'],
+
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid
+   * @returns boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    if (!bid) {
+      logWarn(BIDDER_CODE, 'Invalid bid,', bid);
+      return false;
+    }
+
+    if (!bid.params) {
+      logWarn(BIDDER_CODE, 'bid.params is required.')
+      return false;
+    }
+
+    if (!bid.params.placementId) {
+      logWarn(BIDDER_CODE, 'bid.params.placementId is required.')
+      return false;
+    }
+
+    if (!bid.params.endpointId) {
+      logWarn(BIDDER_CODE, 'bid.params.endpointId is required.')
+      return false;
+    }
+
+    if (!bid.params.publisherId) {
+      logWarn(BIDDER_CODE, 'bid.params.publisherId is required.')
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} validBidRequests An array of bidRequest objects
+   * @param {bidderRequest} bidderRequest The master bidRequest object.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    return validBidRequests.map(validBidRequest => (buildOpenRtbBidRequest(validBidRequest, bidderRequest)))
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    let bidResponses = [];
+
+    let serverBody;
+    if ((serverBody = serverResponse.body) && serverBody.seatbid && isArray(serverBody.seatbid)) {
+      serverBody.seatbid.forEach((seatbidder) => {
+        if (seatbidder.bid && isArray(seatbidder.bid)) {
+          bidResponses = seatbidder.bid.map((bid) => buildBidResponse(bid, bidRequest.originalBidRequest, serverBody));
+        }
+      });
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    if ('iframeEnabled' in syncOptions && syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: USER_SYNC_ENDPOINT
+      }];
+    }
+    if ('pixelEnabled' in syncOptions && syncOptions.pixelEnabled) {
+      const pixels = deepAccess(serverResponses, '0.body.pixels')
+      if (Array.isArray(pixels)) {
+        const userSyncPixels = []
+        for (const pixel of pixels) {
+          userSyncPixels.push({
+            type: 'image',
+            url: pixel
+          })
+        }
+        return userSyncPixels;
+      }
+    }
+    return [];
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   *
+   * @param {data} timeoutData Containing timeout specific data
+   */
+  onTimeout: function (timeoutData) { },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   *
+   * @param {Bid} bid The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    if (!bid || !isStr(bid.nurl)) {
+      return;
+    }
+
+    let winCpm, winCurr;
+    if (Object.prototype.hasOwnProperty.call(bid, 'originalCpm')) {
+      winCpm = bid.originalCpm;
+      winCurr = bid.originalCurrency;
+    } else {
+      winCpm = bid.cpm;
+      winCurr = bid.currency;
+    }
+
+    triggerPixel(
+      bid.nurl
+        .replace(/\$\{AUCTION_PRICE\}/g, winCpm)
+        .replace(/\$\{AUCTION_CURRENCY\}/g, winCurr)
+    );
+  },
+
+  /**
+   * Register bidder specific code, which will execute when the adserver targeting has been set for a bid from this bidder
+   *
+   * @param {Bid} bid The bid of which the targeting has been set
+   */
+  onSetTargeting: function (bid) { }
+}
+
+/**
+ * Buid openRtb request from bidRequest and bidderRequest
+ *
+ * @param {BidRequest} bidRequest
+ * @param {BidderRequest} bidderRequest
+ * @returns {Request}
+ */
+function buildOpenRtbBidRequest(bidRequest, bidderRequest) {
+  // build OpenRTB request body
+  const payload = {
+    id: bidderRequest.auctionId,
+    tmax: bidderRequest.timeout || config.getConfig('bidderTimeout'),
+    test: config.getConfig('debug') ? 1 : 0,
+    imp: createImp(bidRequest),
+    device: getDevice(),
+    site: {
+      id: String(deepAccess(bidRequest, 'params.publisherId')),
+      // TODO: does the fallback make sense here?
+      domain: bidderRequest?.refererInfo?.domain || window.location.host,
+      page: bidderRequest?.refererInfo?.page,
+      ref: bidderRequest?.refererInfo?.ref || '',
+    },
+    at: 1,
+    bcat: getBcat(bidRequest),
+    cur: [DEFAULT_CURRENCY],
+    regs: {
+      coppa: config.getConfig('coppa') ? 1 : 0,
+      ext: {}
+    },
+    user: {
+      buyeruid: getUserId(bidRequest)
+    }
+  }
+
+  const gdprConsent = deepAccess(bidderRequest, 'gdprConsent');
+  if (!!gdprConsent && gdprConsent.gdprApplies) {
+    deepSetValue(payload, 'regs.ext.gdpr', 1);
+    deepSetValue(payload, 'user.ext.consent', gdprConsent.consentString);
+  }
+
+  const uspConsent = deepAccess(bidderRequest, 'uspConsent');
+  if (uspConsent) {
+    deepSetValue(payload, 'regs.ext.us_privacy', uspConsent);
+  }
+
+  const eids = deepAccess(bidRequest, 'userIdAsEids', []);
+  if (eids.length > 0) {
+    deepSetValue(payload, 'user.eids', eids);
+  }
+
+  return {
+    method: 'POST',
+    url: ENDPOINT + String(deepAccess(bidRequest, 'params.publisherId')) +
+      '?ep=' + String(deepAccess(bidRequest, 'params.endpointId')),
+    data: JSON.stringify(payload),
+    options: {
+      contentType: 'application/json',
+      customHeaders: {
+        'x-openrtb-version': 2.5
+      }
+    },
+    // set original bid request, so we can get it from interpretResponse
+    originalBidRequest: bidRequest
+  }
+}
+
+/**
+ * Build bid response from openrtb bid response.
+ *
+ * @param {OpenRtbBid} bid
+ * @param {BidRequest} bidRequest
+ * @param {OpenRtbResponseBody} responseBody
+ * @returns {BidResponse}
+ */
+function buildBidResponse(bid, bidRequest, responseBody) {
+  let mediaType = BANNER;
+  let nativeResponse;
+
+  if (/VAST\s+version/.test(bid.adm)) {
+    mediaType = VIDEO;
+  } else {
+    let markup;
+    try {
+      markup = JSON.parse(bid.adm);
+    } catch (e) {
+      markup = null;
+    }
+
+    // OpenRtb Markup Response Object
+    // https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-Native-Ads-Specification-1-1_2016.pdf#5.1
+    if (markup && isPlainObject(markup.native)) {
+      mediaType = NATIVE;
+      nativeResponse = markup.native;
+    }
+  }
+
+  const currency = responseBody.cur || DEFAULT_CURRENCY;
+  const cpm = (parseFloat(bid.price) || 0).toFixed(2);
+
+  const categories = deepAccess(bid, 'cat', []);
+
+  const bidResponse = {
+    requestId: bid.impid,
+    cpm: cpm,
+    currency: currency,
+    mediaType: mediaType,
+    ttl: 300,
+    creativeId: bid.crid || bid.id,
+    netRevenue: NET_REVENUE,
+    nurl: bid.nurl,
+    lurl: bid.lurl,
+    meta: {
+      mediaType: mediaType,
+      primaryCatId: categories[0],
+      secondaryCatIds: categories.slice(1),
+    }
+  };
+
+  if (bid.adomain && isArray(bid.adomain) && bid.adomain.length > 0) {
+    bidResponse.meta.advertiserDomains = bid.adomain;
+    bidResponse.meta.clickUrl = bid.adomain[0];
+  }
+
+  switch (mediaType) {
+    case VIDEO: {
+      const playerSize = deepAccess(bidRequest, 'mediaTypes.video.playerSize', VIDEO_DEFAULTS.SIZE);
+      const size = canonicalizeSizesArray(playerSize)[0];
+
+      bidResponse.vastXml = bid.adm;
+
+      bidResponse.width = bid.w || size[0];
+      bidResponse.height = bid.h || size[1];
+
+      const context = deepAccess(bidRequest, 'mediaTypes.video.context');
+
+      // if outstream video, add a default render for it.
+      if (context === OUTSTREAM) {
+        // fill adResponse, will be used in ANOutstreamVideo.renderAd
+        bidResponse.adResponse = {
+          content: bidResponse.vastXml,
+          width: bidResponse.width,
+          height: bidResponse.height,
+          player_width: size[0],
+          player_height: size[1],
+        };
+        bidResponse.renderer = createRenderer(bidRequest);
+      }
+      break;
+    }
+    case NATIVE: {
+      bidResponse.native = interpretNativeAd(nativeResponse, currency, cpm);
+      break;
+    }
+    default: {
+      bidResponse.ad = bid.adm;
+
+      bidResponse.width = bid.w;
+      bidResponse.height = bid.h;
+    }
+  }
+  return bidResponse;
+}
+
+/**
+ * Convert OpenRtb native response to bid native object.
+ *
+ * @param {OpenRtbNativeResponse} nativeResponse
+ * @param {String} currency
+ * @param {String} cpm
+ * @returns {BidNative} native
+ */
+function interpretNativeAd(nativeResponse, currency, cpm) {
+  const native = {};
+
+  // OpenRtb Link Object
+  // https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-Native-Ads-Specification-1-1_2016.pdf#5.7
+  const clickUrl = deepAccess(nativeResponse, 'link.url');
+  if (clickUrl && isStr(clickUrl)) {
+    native.clickUrl = decodeURIComponent(clickUrl);
+  }
+
+  const clickTrackers = deepAccess(nativeResponse, 'link.clicktrackers');
+  if (clickTrackers && isArray(clickTrackers)) {
+    native.clickTrackers = clickTrackers
+      .filter(Boolean)
+      .map(
+        url => decodeURIComponent(url)
+          .replace(/\$\{AUCTION_PRICE\}/g, cpm)
+          .replace(/\$\{AUCTION_CURRENCY\}/g, currency)
+      );
+  }
+
+  if (nativeResponse.imptrackers && isArray(nativeResponse.imptrackers)) {
+    native.impressionTrackers = nativeResponse.imptrackers
+      .filter(Boolean)
+      .map(
+        url => decodeURIComponent(url)
+          .replace(/\$\{AUCTION_PRICE\}/g, cpm)
+          .replace(/\$\{AUCTION_CURRENCY\}/g, currency)
+      );
+  }
+
+  if (nativeResponse.jstracker && isStr(nativeResponse.jstracker)) {
+    native.javascriptTrackers = [nativeResponse.jstracker];
+  }
+
+  let assets;
+  if ((assets = nativeResponse.assets) && isArray(assets)) {
+    assets.forEach((asset) => {
+      switch (asset.id) {
+        case NATIVE_DEFAULTS.ASSET_ID.TITLE: {
+          const title = deepAccess(asset, 'title.text');
+          if (title) {
+            native.title = title;
+          }
+          break;
+        }
+        case NATIVE_DEFAULTS.ASSET_ID.IMAGE: {
+          if (asset.img) {
+            native.image = {
+              url: decodeURIComponent(asset.img.url),
+              width: asset.img.w,
+              height: asset.img.h
+            }
+          }
+          break;
+        }
+        case NATIVE_DEFAULTS.ASSET_ID.ICON: {
+          if (asset.img) {
+            native.icon = {
+              url: decodeURIComponent(asset.img.url),
+              width: asset.img.w,
+              height: asset.img.h
+            }
+          }
+          break;
+        }
+        case NATIVE_DEFAULTS.ASSET_ID.BODY: {
+          const body = deepAccess(asset, 'data.value');
+          if (body) {
+            native.body = body;
+          }
+          break;
+        }
+        case NATIVE_DEFAULTS.ASSET_ID.SPONSORED: {
+          const sponsoredBy = deepAccess(asset, 'data.value');
+          if (sponsoredBy) {
+            native.sponsoredBy = sponsoredBy;
+          }
+          break;
+        }
+        case NATIVE_DEFAULTS.ASSET_ID.CTA: {
+          const cta = deepAccess(asset, 'data.value');
+          if (cta) {
+            native.cta = cta;
+          }
+          break;
+        }
+      }
+    });
+  }
+
+  return native;
+}
+
+/**
+ * Create an imp array
+ *
+ * @param {BidRequest} bidRequest
+ * @param {Currency} cur
+ * @returns {Imp[]}
+ */
+function createImp(bidRequest) {
+  const imp = [];
+
+  const impItem = {
+    id: bidRequest.bidId,
+    tagid: String(deepAccess(bidRequest, 'params.placementId')),
+  };
+
+  let mediaType, size;
+  let bannerReq, videoReq, nativeReq;
+
+  if ((bannerReq = deepAccess(bidRequest, 'mediaTypes.banner'))) {
+    size = canonicalizeSizesArray(bannerReq.sizes || BANNER_DEFAULTS.SIZE)[0];
+
+    impItem.banner = {
+      w: size[0],
+      h: size[1],
+      pos: 0,
+    };
+
+    mediaType = BANNER;
+  } else if ((videoReq = deepAccess(bidRequest, 'mediaTypes.video'))) {
+    size = canonicalizeSizesArray(videoReq.playerSize || VIDEO_DEFAULTS.SIZE)[0];
+
+    impItem.video = {
+      w: size[0],
+      h: size[1],
+      pos: 0,
+      mimes: videoReq.mimes || VIDEO_DEFAULTS.MIMES,
+      protocols: videoReq.protocols || VIDEO_DEFAULTS.PROTOCOLS,
+      startdelay: typeof videoReq.startdelay === 'number' ? videoReq.startdelay : 0,
+      skip: typeof videoReq.skip === 'number' ? videoReq.skip : 0,
+      playbackmethod: videoReq.playbackmethod || VIDEO_DEFAULTS.PLAYBACK_METHODS,
+      delivery: videoReq.delivery || VIDEO_DEFAULTS.DELIVERY,
+      api: videoReq.api || VIDEO_DEFAULTS.API,
+      placement: videoReq.context === OUTSTREAM ? 3 : 1,
+    };
+
+    mediaType = VIDEO;
+  } else if ((nativeReq = deepAccess(bidRequest, 'mediaTypes.native'))) {
+    const params = bidRequest.nativeParams || nativeReq;
+
+    const request = {
+      native: {
+        ver: '1.1',
+        assets: createNativeAssets(params),
+      }
+    };
+
+    impItem.native = {
+      ver: '1.1',
+      request: JSON.stringify(request),
+    };
+
+    mediaType = NATIVE;
+  }
+
+  const floorDetail = getBidFloor(bidRequest, {
+    mediaType: mediaType || '*',
+    size: size || '*'
+  });
+
+  impItem.bidfloor = floorDetail.floor;
+  impItem.bidfloorcur = floorDetail.currency;
+
+  if (mediaType) {
+    imp.push(impItem);
+  }
+
+  return imp;
+}
+
+/**
+ * Convert bid sizes to size array
+ *
+ * @param {Size[]|Size[][]} sizes
+ * @returns {Size[][]}
+ */
+function canonicalizeSizesArray(sizes) {
+  if (sizes.length === 2 && !isArray(sizes[0])) {
+    return [sizes];
+  }
+  return sizes;
+}
+
+/**
+ * Create Assets Object for Native request
+ *
+ * @param {Object} params
+ * @returns {Asset[]}
+ */
+function createNativeAssets(params) {
+  const assets = [];
+
+  if (params.title) {
+    assets.push({
+      id: NATIVE_DEFAULTS.ASSET_ID.TITLE,
+      required: params.title.required ? 1 : 0,
+      title: {
+        len: params.title.len || NATIVE_DEFAULTS.LENGTH.TITLE
+      }
+    })
+  }
+
+  if (params.image) {
+    assets.push({
+      id: NATIVE_DEFAULTS.ASSET_ID.IMAGE,
+      required: params.image.required ? 1 : 0,
+      img: mapNativeImage(params.image, NATIVE_DEFAULTS.IMAGE_TYPE.MAIN)
+    })
+  }
+
+  if (params.icon) {
+    assets.push({
+      id: NATIVE_DEFAULTS.ASSET_ID.ICON,
+      required: params.icon.required ? 1 : 0,
+      img: mapNativeImage(params.icon, NATIVE_DEFAULTS.IMAGE_TYPE.ICON)
+    })
+  }
+
+  if (params.sponsoredBy) {
+    assets.push({
+      id: NATIVE_DEFAULTS.ASSET_ID.SPONSORED,
+      required: params.sponsoredBy.required ? 1 : 0,
+      data: {
+        type: NATIVE_DEFAULTS.DATA_ASSET_TYPE.SPONSORED,
+        len: params.sponsoredBy.len | NATIVE_DEFAULTS.LENGTH.SPONSORED
+      }
+    })
+  }
+
+  if (params.body) {
+    assets.push({
+      id: NATIVE_DEFAULTS.ASSET_ID.BODY,
+      required: params.body.required ? 1 : 0,
+      data: {
+        type: NATIVE_DEFAULTS.DATA_ASSET_TYPE.DESC,
+        len: params.body.len || NATIVE_DEFAULTS.LENGTH.BODY
+      }
+    })
+  }
+
+  if (params.cta) {
+    assets.push({
+      id: NATIVE_DEFAULTS.ASSET_ID.CTA,
+      required: params.cta.required ? 1 : 0,
+      data: {
+        type: NATIVE_DEFAULTS.DATA_ASSET_TYPE.CTA_TEXT,
+        len: params.cta.len || NATIVE_DEFAULTS.LENGTH.CTA
+      }
+    })
+  }
+
+  return assets;
+}
+
+/**
+ * Create native image object
+ *
+ * @param {Object} image
+ * @param {Number} type
+ * @returns {NativeImage}
+ */
+function mapNativeImage(image, type) {
+  const img = { type: type };
+
+  if (image.aspect_ratios) {
+    const ratio = image.aspect_ratios[0];
+    const minWidth = ratio.min_width || 100;
+
+    img.wmin = minWidth;
+    img.hmin = (minWidth / ratio.ratio_width * ratio.ratio_height);
+  }
+
+  if (image.sizes) {
+    const size = canonicalizeSizesArray(image.sizes)[0];
+
+    img.w = size[0];
+    img.h = size[1];
+  }
+
+  return img;
+}
+
+/**
+ * Get user id from bid request. if no user id module used, return a new uuid.
+ *
+ * @param {BidRequest} bidRequest
+ * @returns {String} userId
+ */
+function getUserId(bidRequest) {
+  let sharedId = deepAccess(bidRequest, 'userId.sharedid.id');
+  if (sharedId) {
+    return sharedId;
+  }
+
+  for (const idModule of ['pubcid', 'tdid']) {
+    let userId = deepAccess(bidRequest, `userId.${idModule}`);
+    if (userId) {
+      return userId;
+    }
+  }
+
+  return generateUUID();
+}
+
+/**
+ * Get bid floor price
+ *
+ * @param {BidRequest} bid
+ * @param {Params} params
+ * @returns {Floor} floor price
+ */
+function getBidFloor(bid, {mediaType = '*', size = '*'}) {
+  if (isFn(bid.getFloor)) {
+    const floorInfo = bid.getFloor({
+      currency: DEFAULT_CURRENCY,
+      mediaType,
+      size
+    });
+
+    if (isPlainObject(floorInfo) && !isNaN(floorInfo.floor)) {
+      return {
+        currency: floorInfo.currency || DEFAULT_CURRENCY,
+        floor: floorInfo.floor
+      };
+    }
+  }
+
+  return {
+    currency: DEFAULT_CURRENCY,
+    floor: 0.0
+  }
+}
+
+/**
+ * Get bcat
+ *
+ * @param {BidRequest} bidRequest
+ * @returns {String[]}
+ */
+function getBcat(bidRequest) {
+  let bcat = [];
+
+  const pBcat = deepAccess(bidRequest, 'params.bcat');
+  if (pBcat) {
+    bcat = bcat.concat(pBcat);
+  }
+
+  return bcat;
+}
+
+/**
+ * Get device info
+ *
+ * @returns {Object}
+ */
+function getDevice() {
+  const device = config.getConfig('device') || {};
+
+  device.w = device.w || window.screen.width;
+  device.h = device.h || window.screen.height;
+  device.ua = device.ua || navigator.userAgent;
+  device.language = device.language || getLanguage();
+  device.dnt = typeof device.dnt === 'number'
+    ? device.dnt : (getDNT() ? 1 : 0);
+
+  return device;
+}
+
+/**
+ * Get browser language
+ *
+ * @returns {String} language
+ */
+function getLanguage() {
+  const lang = (navigator.languages && navigator.languages[0]) ||
+    navigator.language || navigator.userLanguage;
+  return lang ? lang.split('-')[0] : DEFAULT_LANGUAGE;
+}
+
+/**
+ * Create render for outstream video.
+ *
+ * @param {BidRequest} bidRequest
+ * @returns
+ */
+function createRenderer(bidRequest) {
+  const globalRenderer = deepAccess(bidRequest, 'renderer');
+  const currentRenderer = deepAccess(bidRequest, 'mediaTypes.video.renderer');
+
+  let url = OUTSTREAM_RENDERER_URL;
+  let config = {};
+  let render = function (bid) {
+    bid.renderer.push(() => {
+      window.ANOutstreamVideo.renderAd({
+        sizes: [bid.width, bid.height],
+        targetId: bid.adUnitCode,
+        adResponse: bid.adResponse,
+      });
+    });
+  };
+
+  if (currentRenderer) {
+    url = currentRenderer.url;
+    config = currentRenderer.options;
+    render = currentRenderer.render;
+  } else if (globalRenderer) {
+    url = globalRenderer.url;
+    config = globalRenderer.options;
+    render = globalRenderer.render;
+  }
+
+  const renderer = Renderer.install({
+    id: bidRequest.bidId,
+    url: url,
+    loaded: false,
+    config: config,
+    adUnitCode: bidRequest.adUnitCode
+  });
+
+  try {
+    renderer.setRender(render);
+  } catch (e) {
+    logError(BIDDER_CODE, 'Error calling setRender on renderer', e);
+  }
+  return renderer;
+}
+
+registerBidder(spec);
diff --git a/modules/operaadsBidAdapter.md b/modules/operaadsBidAdapter.md
new file mode 100644
index 00000000000..709c67a04a7
--- /dev/null
+++ b/modules/operaadsBidAdapter.md
@@ -0,0 +1,154 @@
+# OperaAds Bidder Adapter
+
+## Overview
+
+```
+Module Name: OperaAds Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: adtech-prebid-group@opera.com
+```
+
+## Description
+
+Module that connects to OperaAds's demand sources
+
+## Bid Parameters
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `placementId` | required | String | The Placement Id provided by Opera Ads. | `s5340077725248`
+| `endpointId` | required | String | The Endpoint Id provided by Opera Ads. | `ep3425464070464`
+| `publisherId` | required | String | The Publisher Id provided by Opera Ads. | `pub3054952966336`
+| `bcat` | optional | String or String[] | The bcat value. | `IAB9-31`
+
+### Bid Video Parameters
+
+Set these parameters to `bid.mediaTypes.video`.
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `context` | optional | String | `instream` or `outstream`. | `instream`
+| `mimes` | optional | String[] | Content MIME types supported. | `['video/mp4']`
+| `playerSize` | optional | Number[] or Number[][] | Video player size in device independent pixels | `[[640, 480]]`
+| `protocols` | optional | Number[] | Array of supported video protocls. | `[1, 2, 3, 4, 5, 6, 7, 8]`
+| `startdelay` | optional | Number | Indicates the start delay in seconds for pre-roll, mid-roll, or post-roll ad placements. | `0`
+| `skip` | optional | Number | Indicates if the player will allow the video to be skipped, where 0 = no, 1 = yes. | `1`
+| `playbackmethod` | optional | Number[] | Playback methods that may be in use. | `[2]`
+| `delivery` | optional | Number[] | Supported delivery methods. | `[1]`
+| `api` | optional | Number[] | List of supported API frameworks for this impression. | `[1, 2, 5]`
+
+### Bid Native Parameters
+
+Set these parameters to `bid.nativeParams` or `bid.mediaTypes.native`.
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `title` | optional | Object | Config for native asset title. | `{required: true, len: 25}`
+| `image` | optional | Object | Config for native asset image. | `{required: true, sizes: [[300, 250]], aspect_ratios: [{min_width: 300, min_height: 250, ratio_width: 1, ratio_height: 1}]}`
+| `icon` | optional | Object | Config for native asset icon. | `{required: true, sizes: [[60, 60]], aspect_ratios: [{min_width: 60, min_height: 60, ratio_width: 1, ratio_height: 1}]}}`
+| `sponsoredBy` | optional | Object | Config for native asset sponsoredBy. | `{required: true, len: 20}`
+| `body` | optional | Object | Config for native asset body. | `{required: true, len: 200}`
+| `cta` | optional | Object | Config for native asset cta. | `{required: true, len: 20}`
+
+## Example
+
+### Banner Ads
+
+```javascript
+var adUnits = [{
+  code: 'banner-ad-div',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]]
+    }
+  },
+  bids: [{
+    bidder: 'operaads',
+    params: {
+      placementId: 's5340077725248',
+      endpointId: 'ep3425464070464',
+      publisherId: 'pub3054952966336'
+    }
+  }]
+}];
+```
+
+### Video Ads
+
+```javascript
+var adUnits = [{
+  code: 'video-ad-div',
+  mediaTypes: {
+    video: {
+      context: 'instream',
+      playerSize: [640, 480],
+      mimes: ['video/mp4'],
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+      playbackmethod: [2],
+      skip: 1
+    }
+  },
+  bids: [{
+    bidder: 'operaads',
+    params: {
+      placementId: 's5340077725248',
+      endpointId: 'ep3425464070464',
+      publisherId: 'pub3054952966336'
+    }
+  }]
+}];
+```
+
+* For video ads, enable prebid cache.
+
+```javascript
+pbjs.setConfig({
+  cache: {
+    url: 'https://prebid.adnxs.com/pbc/v1/cache'
+  }
+});
+```
+
+### Native Ads
+
+```javascript
+var adUnits = [{
+  code: 'native-ad-div',
+  mediaTypes: {
+    native: {
+      title: { required: true, len: 75  },
+      image: { required: true, sizes: [[300, 250]] },
+      body: { len: 200  },
+      sponsoredBy: { len: 20 }
+    }
+  },
+  bids: [{
+    bidder: 'operaads',
+    params: {
+      placementId: 's5340077725248',
+      endpointId: 'ep3425464070464',
+      publisherId: 'pub3054952966336'
+    }
+  }]
+}];
+```
+
+### User Ids
+
+Opera Ads Bid Adapter uses `sharedId`, `pubcid` or `tdid`, please config at least one.
+
+```javascript
+pbjs.setConfig({
+  ...,
+  userSync: {
+    userIds: [{
+      name: 'sharedId',
+      storage: {
+        name: '_sharedID', // name of the 1st party cookie
+        type: 'cookie',
+        expires: 30
+      }
+    }]
+  }
+});
+```
diff --git a/modules/optimaticBidAdapter.md b/modules/optimaticBidAdapter.md
deleted file mode 100644
index edaa3da90f6..00000000000
--- a/modules/optimaticBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-```
-Module Name: Optimatic Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: prebid@optimatic.com
-```
-
-# Description
-
-Optimatic Bid Adapter Module connects to Optimatic Demand Sources for Video Ads
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: 'test-div',
-            sizes: [[640,480]],  // a video size
-            bids: [
-                {
-                    bidder: "optimatic",
-                    params: {
-                        placement: "2chy7Gc2eSQL",
-                        bidfloor: 2.5
-                    }
-                }
-            ]
-        },
-    ];
-```
diff --git a/modules/optimeraBidAdapter.js b/modules/optimeraBidAdapter.js
deleted file mode 100644
index b470e901ec6..00000000000
--- a/modules/optimeraBidAdapter.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { deepAccess } from '../src/utils.js';
-
-const BIDDER_CODE = 'optimera';
-const SCORES_BASE_URL = 'https://dyv1bugovvq1g.cloudfront.net/';
-
-export const spec = {
-  code: BIDDER_CODE,
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {bidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid (bidRequest) {
-    if (typeof bidRequest.params !== 'undefined' && typeof bidRequest.params.clientID !== 'undefined') {
-      return true;
-    }
-    return false;
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * We call the existing scores data file for ad slot placement scores.
-   * These scores will be added to the dealId to be pushed to DFP.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests (validBidRequests) {
-    const optimeraHost = window.location.host;
-    const optimeraPathName = window.location.pathname;
-    if (typeof validBidRequests[0].params.clientID !== 'undefined') {
-      const { clientID } = validBidRequests[0].params;
-      const scoresURL = `${SCORES_BASE_URL + clientID}/${optimeraHost}${optimeraPathName}.js`;
-      return {
-        method: 'GET',
-        url: scoresURL,
-        payload: validBidRequests,
-      };
-    }
-    return {};
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * Some required bid params are not needed for this so default
-   * values are used.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse (serverResponse, bidRequest) {
-    const validBids = bidRequest.payload;
-    const bidResponses = [];
-    let dealId = '';
-    if (typeof serverResponse.body !== 'undefined') {
-      const scores = serverResponse.body;
-      for (let i = 0; i < validBids.length; i += 1) {
-        if (typeof validBids[i].params.clientID !== 'undefined') {
-          if (validBids[i].adUnitCode in scores) {
-            const deviceDealId = deepAccess(scores, `device.${validBids[i].params.device}.${validBids[i].adUnitCode}`);
-            dealId = deviceDealId || scores[validBids[i].adUnitCode];
-          }
-          const bidResponse = {
-            requestId: validBids[i].bidId,
-            ad: '<div></div>',
-            cpm: 0.01,
-            width: 0,
-            height: 0,
-            dealId,
-            ttl: 300,
-            creativeId: '1',
-            netRevenue: '0',
-            currency: 'USD'
-          };
-          bidResponses.push(bidResponse);
-        }
-      }
-    }
-    return bidResponses;
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/optimeraBidAdapter.md b/modules/optimeraBidAdapter.md
deleted file mode 100644
index 25da9b6236f..00000000000
--- a/modules/optimeraBidAdapter.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Overview
-
-```
-Module Name: Optimera Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: kcandiotti@optimera.nyc
-```
-
-# Description
-
-Module that adds ad placement visibility scores for DFP.
-
-# Test Parameters
-```
-    var adUnits = [{
-                code: 'div-1',
-                sizes: [[300, 250], [300,600]],
-                bids: [
-                    {
-                        bidder: 'optimera',
-                        params: {
-                              clientID: '9999',
-                              device: 'mo'
-                        }
-                    }]
-            },{
-                code: 'div-0',
-                sizes: [[728, 90]],
-                bids: [
-                    {
-                        bidder: 'optimera',
-                        params: {
-                              clientID: '9999',
-                              device: 'mo'
-                        }
-                    }]
-            }];
-```
-
-# AppNexus Issue
-There is an issue where the plugin sometimes doesn't return impressions with AppNexus.
-
-There is an open issue here: [#3597](https://github.com/prebid/Prebid.js/issues/3597)
-
-## Configuration Workaround
-
-Optimera's configuration requires the use of size 0,0 which, in some instances, causes the AppNexus ad server to respond to ad requests but not fill impressions. AppNexus and vendors using the AppNexus ad server should monitor 3rd party numbers to ensure there is no decline in fill rate.
-
-Configuration Example:
-
-```
-code: ‘leaderboard',
-mediaTypes: {
-  banner: {
-  sizes: [[970, 250],[970, 90],[970, 66],[728, 90],[320, 50],[320, 100],[300, 250],[0, 0]],
-  }
-}
-```
diff --git a/modules/optimeraRtdProvider.js b/modules/optimeraRtdProvider.js
new file mode 100644
index 00000000000..dfe8f1bfcf2
--- /dev/null
+++ b/modules/optimeraRtdProvider.js
@@ -0,0 +1,233 @@
+/**
+ * This module adds optimera provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ *
+ * The module will fetch targeting values from the Optimera server
+ * and apply the tageting to each ad request. These values are created
+ * from the Optimera Mesaurement script which is installed on the
+ * Publisher's site.
+ *
+ * @module modules/optimeraRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+/**
+ * @typedef {Object} ModuleParams
+ * @property {string} clientID
+ * @property {string} optimeraKeyName
+ * @property {string} device
+ */
+
+import { logInfo, logError } from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { ajaxBuilder } from '../src/ajax.js';
+
+/** @type {ModuleParams} */
+let _moduleParams = {};
+
+/**
+ * Default Optimera Key Name
+ * This can default to hb_deal_optimera for publishers
+ * who used the previous Optimera Bidder Adapter.
+ * @type {string} */
+export let optimeraKeyName = 'hb_deal_optimera';
+
+/**
+ * Optimera Score File Base URL.
+ * This is the base URL for the data endpoint request to fetch
+ * the targeting values.
+ * @type {string}
+ */
+export const scoresBaseURL = 'https://dyv1bugovvq1g.cloudfront.net/';
+
+/**
+ * Optimera Score File URL.
+ * @type {string}
+ */
+export let scoresURL;
+
+/**
+ * Optimera Client ID.
+ * @type {string}
+ */
+export let clientID;
+
+/**
+ * Optional device parameter.
+ * @type {string}
+ */
+export let device = 'default';
+
+/**
+ * Targeting object for all ad positions.
+ * @type {string}
+ */
+export let optimeraTargeting = {};
+
+/**
+ * Flag to indicateo if a new score file should be fetched.
+ * @type {string}
+ */
+export let fetchScoreFile = true;
+
+/**
+ * Make the request for the Score File.
+ */
+export function scoreFileRequest() {
+  logInfo('Fetch Optimera score file.');
+  const ajax = ajaxBuilder();
+  ajax(scoresURL,
+    {
+      success: (res, req) => {
+        if (req.status === 200) {
+          try {
+            setScores(res);
+          } catch (err) {
+            logError('Unable to parse Optimera Score File.', err);
+          }
+        } else if (req.status === 403) {
+          logError('Unable to fetch the Optimera Score File - 403');
+        }
+      },
+      error: () => {
+        logError('Unable to fetch the Optimera Score File.');
+      }
+    });
+}
+
+/**
+ * Apply the Optimera targeting to the ad slots.
+ */
+export function returnTargetingData(adUnits, config) {
+  const targeting = {};
+  try {
+    adUnits.forEach((adUnit) => {
+      if (optimeraTargeting[adUnit]) {
+        targeting[adUnit] = {};
+        targeting[adUnit][optimeraKeyName] = [optimeraTargeting[adUnit]];
+      }
+    });
+  } catch (err) {
+    logError('error', err);
+  }
+  logInfo('Apply Optimera targeting');
+  return targeting;
+}
+
+/**
+ * Fetch a new score file when an auction starts.
+ * Only fetch the new file if a new score file is needed.
+ */
+export function onAuctionInit(auctionDetails, config, userConsent) {
+  setScoresURL();
+  if (fetchScoreFile) {
+    scoreFileRequest();
+  }
+}
+
+/**
+ * Initialize the Module.
+ */
+export function init(moduleConfig) {
+  _moduleParams = moduleConfig.params;
+  if (_moduleParams && _moduleParams.clientID) {
+    clientID = _moduleParams.clientID;
+    if (_moduleParams.optimeraKeyName) {
+      optimeraKeyName = (_moduleParams.optimeraKeyName);
+    }
+    if (_moduleParams.device) {
+      device = _moduleParams.device;
+    }
+    setScoresURL();
+    scoreFileRequest();
+    return true;
+  }
+  if (!_moduleParams.clientID) {
+    logError('Optimera clientID is missing in the Optimera RTD configuration.');
+  }
+  return false;
+}
+
+/**
+ * Set the score file url.
+ *
+ * This fully-formed URL is for the data endpoint request to fetch
+ * the targeting values. This is not a js library, rather JSON
+ * which has the targeting values for the page.
+ *
+ * The score file url is based on the web page url. If the new score file URL
+ * has been updated, set the fetchScoreFile flag to true to is can be fetched.
+ *
+ */
+export function setScoresURL() {
+  const optimeraHost = window.location.host;
+  const optimeraPathName = window.location.pathname;
+  const newScoresURL = `${scoresBaseURL}${clientID}/${optimeraHost}${optimeraPathName}.js`;
+  if (scoresURL !== newScoresURL) {
+    scoresURL = newScoresURL;
+    fetchScoreFile = true;
+  } else {
+    fetchScoreFile = false;
+  }
+}
+
+/**
+ * Set the scores for the device if given.
+ * Add data and insights to the winddow.optimera object.
+ *
+ * @param {*} result
+ * @returns {string} JSON string of Optimera Scores.
+ */
+export function setScores(result) {
+  let scores = {};
+  try {
+    scores = JSON.parse(result);
+    if (device !== 'default' && scores.device[device]) {
+      scores = scores.device[device];
+    }
+    logInfo(scores);
+    window.optimera = window.optimera || {};
+    window.optimera.data = window.optimera.data || {};
+    window.optimera.insights = window.optimera.insights || {};
+    Object.keys(scores).map((key) => {
+      if (key !== 'insights') {
+        window.optimera.data[key] = scores[key];
+      }
+    });
+    if (scores.insights) {
+      window.optimera.insights = scores.insights;
+    }
+  } catch (e) {
+    logError('Optimera score file could not be parsed.');
+  }
+  optimeraTargeting = scores;
+}
+
+/** @type {RtdSubmodule} */
+export const optimeraSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: 'optimeraRTD',
+  /**
+   * get data when an auction starts
+   * @function
+   */
+  onAuctionInitEvent: onAuctionInit,
+  /**
+   * get data and send back to realTimeData module
+   * @function
+   */
+  getTargetingData: returnTargetingData,
+  init,
+};
+
+/**
+ * Register the Sub Module.
+ */
+function registerSubModule() {
+  submodule('realTimeData', optimeraSubmodule);
+}
+
+registerSubModule();
diff --git a/modules/optimeraRtdProvider.md b/modules/optimeraRtdProvider.md
new file mode 100644
index 00000000000..610dec537e0
--- /dev/null
+++ b/modules/optimeraRtdProvider.md
@@ -0,0 +1,44 @@
+# Overview
+```
+Module Name: Optimera Real Time Date Module
+Module Type: RTD Module
+Maintainer: mcallari@optimera.nyc
+```
+
+# Description
+
+Optimera Real Time Data Module. Provides targeting for ad requests from data collected by the Optimera Measurement script on your site. Please contact [Optimera](http://optimera.nyc/) for information. This is a port of the Optimera Bidder Adapter.
+
+# Configurations
+
+Compile the Optimera RTD Provider into your Prebid build:
+
+`gulp build --modules=optimeraRtdProvider`
+
+Configuration example for using RTD module with `optimera` provider
+```javascript
+  pbjs.setConfig({
+    realTimeData: {
+      dataProviders: [
+        {
+          name: 'optimeraRTD',
+          waitForIt: true,
+          params: {
+            clientID: '9999',
+            optimeraKeyName: 'optimera',
+            device: 'de'
+          }
+        }
+      ]
+    }
+```  
+
+#Params
+
+Contact Optimera to get assistance with the params.
+
+|  param name | type  |Scope | Description |
+| :------------ | :------------ | :------- | :------- |
+| clientID  | string  | required | Optimera Client ID |
+| optimeraKeyName  | string  | optional |  GAM key name for Optimera. If migrating from the Optimera bidder adapter this will default to hb_deal_optimera and can be ommitted from the configuration. |
+| device  | string  | optional | Device type code for mobile, tablet, or desktop. Either mo, tb, de |
diff --git a/modules/optimonAnalyticsAdapter.js b/modules/optimonAnalyticsAdapter.js
new file mode 100644
index 00000000000..82bc18f605d
--- /dev/null
+++ b/modules/optimonAnalyticsAdapter.js
@@ -0,0 +1,25 @@
+/**
+*
+*********************************************************
+*
+* Optimon.io Prebid Analytics Adapter
+*
+*********************************************************
+*
+*/
+
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+
+const optimonAnalyticsAdapter = adapter({
+  global: 'OptimonAnalyticsAdapter',
+  handler: 'on',
+  analyticsType: 'bundle'
+});
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: optimonAnalyticsAdapter,
+  code: 'optimon',
+});
+
+export default optimonAnalyticsAdapter;
diff --git a/modules/optimonAnalyticsAdapter.md b/modules/optimonAnalyticsAdapter.md
new file mode 100644
index 00000000000..4e2c00dfcab
--- /dev/null
+++ b/modules/optimonAnalyticsAdapter.md
@@ -0,0 +1,13 @@
+# Overview
+
+Module Name: Optimon.io Prebid Analytics Adapter  
+Module Type: Analytics Adapter  
+Maintainer: hello@optimon.io  
+
+# Description
+
+Start analyzing your Prebid performance by visiting our website [Optimon.io](https://optimon.io/?utm_source=prebid-org&utm_medium=analytics-adapter) or contact us directly by email: [hello@optimon.io](mailto:hello@optimon.io) to get started.
+
+# Platform Details
+
+[Optimon.io](https://optimon.io/?utm_source=prebid-org&utm_medium=analytics-adapter) is a Robust Alerting & Reporting Platform for Prebid and GAM that helps publishers make the right decisions by collecting data from your Google Ad Manager, Prebid, and other SSPs and providing smart insights and suggestions to optimize and maximize their overall yield and save manual work.
diff --git a/modules/optoutBidAdapter.js b/modules/optoutBidAdapter.js
new file mode 100644
index 00000000000..f7b5934665c
--- /dev/null
+++ b/modules/optoutBidAdapter.js
@@ -0,0 +1,76 @@
+import { deepAccess } from '../src/utils.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+
+const BIDDER_CODE = 'optout';
+
+function getDomain(bidderRequest) {
+  return deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || deepAccess(window, 'location.href');
+}
+
+function getCurrency() {
+  let cur = config.getConfig('currency');
+  if (cur === undefined) {
+    cur = {
+      adServerCurrency: 'EUR',
+      granularityMultiplier: 1
+    };
+  }
+  return cur;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  isBidRequestValid: function(bid) {
+    return !!bid.params.publisher && !!bid.params.adslot;
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    return validBidRequests.map(bidRequest => {
+      let endPoint = 'https://adscience-nocookie.nl/prebid/display';
+      let consentString = '';
+      let gdpr = 0;
+      if (bidRequest.gdprConsent) {
+        gdpr = (typeof bidRequest.gdprConsent.gdprApplies === 'boolean') ? Number(bidRequest.gdprConsent.gdprApplies) : 0;
+        consentString = bidRequest.gdprConsent.consentString;
+        if (!gdpr || hasPurpose1Consent(bidRequest.gdprConsent)) {
+          endPoint = 'https://prebid.adscience.nl/prebid/display';
+        }
+      }
+      return {
+        method: 'POST',
+        url: endPoint,
+        data: {
+          requestId: bidRequest.bidId,
+          publisher: bidRequest.params.publisher,
+          adSlot: bidRequest.params.adslot,
+          cur: getCurrency(),
+          url: getDomain(bidRequest),
+          ortb2: bidderRequest.ortb2,
+          consent: consentString,
+          gdpr: gdpr
+
+        },
+      };
+    });
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    return serverResponse.body;
+  },
+
+  getUserSyncs: function (syncOptions, responses, gdprConsent) {
+    if (gdprConsent) {
+      let gdpr = (typeof gdprConsent.gdprApplies === 'boolean') ? Number(gdprConsent.gdprApplies) : 0;
+      if (syncOptions.iframeEnabled && (!gdprConsent.gdprApplies || hasPurpose1Consent(gdprConsent))) {
+        return [{
+          type: 'iframe',
+          url: 'https://umframe.adscience.nl/matching/iframe?gdpr=' + gdpr + '&gdpr_consent=' + gdprConsent.consentString
+        }];
+      }
+    }
+  },
+};
+registerBidder(spec);
diff --git a/modules/optoutBidAdapter.md b/modules/optoutBidAdapter.md
new file mode 100644
index 00000000000..de70f3e3569
--- /dev/null
+++ b/modules/optoutBidAdapter.md
@@ -0,0 +1,27 @@
+# Overview
+Module Name: Opt Out Advertising Bidder Adapter Module 
+Type: Bidder Adapter 
+Maintainer: rob@optoutadvertising.com
+
+# Description
+Opt Out Advertising Bidder Adapter for Prebid.js.
+
+# Test Parameters
+```
+var adUnits = [
+{
+    code: 'test-div',
+    sizes: [[300, 250]],
+    bids: [
+        {
+             bidder: 'optout',
+             params: {
+                 publisher: '8',
+                 adslot: 'prebid_demo',
+             }
+        }
+    ]
+}
+];
+```
+
diff --git a/modules/orbidderBidAdapter.js b/modules/orbidderBidAdapter.js
index d14e2bebd72..9979b1fdc3b 100644
--- a/modules/orbidderBidAdapter.js
+++ b/modules/orbidderBidAdapter.js
@@ -1,36 +1,98 @@
+import { isFn, isPlainObject } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
-const storage = getStorageManager();
+const storageManager = getStorageManager({bidderCode: 'orbidder'});
+
+/**
+ * Determines whether or not the given bid response is valid.
+ *
+ * @param {object} bidResponse The bid response to validate.
+ * @return boolean True if this is a valid bid response, and false if it is not valid.
+ */
+function isBidResponseValid(bidResponse) {
+  let requiredKeys = ['requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency'];
+
+  switch (bidResponse.mediaType) {
+    case BANNER:
+      requiredKeys = requiredKeys.concat(['width', 'height', 'ad']);
+      break;
+    case NATIVE:
+      if (!bidResponse.native.hasOwnProperty('impressionTrackers')) {
+        return false
+      }
+      break;
+    default:
+      return false
+  }
+
+  for (const key of requiredKeys) {
+    if (!bidResponse.hasOwnProperty(key)) {
+      return false
+    }
+  }
+
+  return true
+}
 
 export const spec = {
   code: 'orbidder',
-  orbidderHost: (() => {
-    let ret = 'https://orbidder.otto.de';
+  gvlid: 559,
+  hostname: 'https://orbidder.otto.de',
+  supportedMediaTypes: [BANNER, NATIVE],
+
+  /**
+   * Returns a customzied hostname if 'ov_orbidder_host' is set in the browser's local storage.
+   * This is only used for integration testing.
+   *
+   * @return The hostname bid requests should be sent to.
+   */
+  getHostname() {
+    let ret = this.hostname;
     try {
-      ret = storage.getDataFromLocalStorage('ov_orbidder_host') || ret;
+      ret = storageManager.getDataFromLocalStorage('ov_orbidder_host') || ret;
     } catch (e) {
     }
     return ret;
-  })(),
+  },
 
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false if it is not valid.
+   */
   isBidRequestValid(bid) {
     return !!(bid.sizes && bid.bidId && bid.params &&
       (bid.params.accountId && (typeof bid.params.accountId === 'string')) &&
       (bid.params.placementId && (typeof bid.params.placementId === 'string')) &&
-      ((typeof bid.params.bidfloor === 'undefined') || (typeof bid.params.bidfloor === 'number')) &&
       ((typeof bid.params.profile === 'undefined') || (typeof bid.params.profile === 'object')));
   },
 
+  /**
+   * Build a request from the list of valid BidRequests that will be sent by prebid to the orbidder /bid endpoint, i.e. the server.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the orbidder /bid endpoint,
+   * i.e. the server.
+   * @return The requests for the orbidder /bid endpoint, i.e. the server.
+   */
   buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    const hostname = this.getHostname();
     return validBidRequests.map((bidRequest) => {
       let referer = '';
       if (bidderRequest && bidderRequest.refererInfo) {
-        referer = bidderRequest.refererInfo.referer || '';
+        referer = bidderRequest.refererInfo.page || '';
       }
 
-      const ret = {
-        url: `${spec.orbidderHost}/bid`,
+      bidRequest.params.bidfloor = getBidFloor(bidRequest);
+
+      let httpReq = {
+        url: `${hostname}/bid`,
         method: 'POST',
         options: { withCredentials: true },
         data: {
@@ -41,37 +103,66 @@ export const spec = {
           transactionId: bidRequest.transactionId,
           adUnitCode: bidRequest.adUnitCode,
           bidRequestCount: bidRequest.bidRequestCount,
+          params: bidRequest.params,
           sizes: bidRequest.sizes,
-          params: bidRequest.params
+          mediaTypes: bidRequest.mediaTypes
         }
       };
+
       if (bidderRequest && bidderRequest.gdprConsent) {
-        ret.data.gdprConsent = {
+        httpReq.data.gdprConsent = {
           consentString: bidderRequest.gdprConsent.consentString,
           consentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') && bidderRequest.gdprConsent.gdprApplies
         };
       }
-      return ret;
+      return httpReq;
     });
   },
 
+  /**
+   * Unpack the response from the orbidder /bid endpoint into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the orbidder /bid endpoint, i.e. the server.
+   * @return {Bid[]} An array of bids from orbidder.
+   */
   interpretResponse(serverResponse) {
     const bidResponses = [];
     serverResponse = serverResponse.body;
     if (serverResponse && (serverResponse.length > 0)) {
-      serverResponse.forEach((bid) => {
-        const bidResponse = {};
-        for (const requiredKey of ['requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId', 'netRevenue', 'currency']) {
-          if (!bid.hasOwnProperty(requiredKey)) {
-            return [];
+      serverResponse.forEach((bidResponse) => {
+        if (isBidResponseValid(bidResponse)) {
+          if (Array.isArray(bidResponse.advertiserDomains)) {
+            bidResponse.meta = {
+              advertiserDomains: bidResponse.advertiserDomains
+            }
           }
-          bidResponse[requiredKey] = bid[requiredKey];
+          bidResponses.push(bidResponse);
         }
-        bidResponses.push(bidResponse);
       });
     }
     return bidResponses;
   },
 };
 
+/**
+ * Get bid floor from Price Floors Module
+ * @param {Object} bid
+ * @returns {float||undefined}
+ */
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidfloor;
+  }
+
+  const floor = bid.getFloor({
+    currency: 'EUR',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'EUR') {
+    return floor.floor;
+  }
+  return undefined;
+}
+
 registerBidder(spec);
diff --git a/modules/orbidderBidAdapter.md b/modules/orbidderBidAdapter.md
index c7676e6774f..6b8fac5477a 100644
--- a/modules/orbidderBidAdapter.md
+++ b/modules/orbidderBidAdapter.md
@@ -12,19 +12,46 @@ Module that connects to orbidder demand sources
 
 # Test Parameters
 ```
-var adUnits = [{
-    code: '/105091519/bidder_test',
-    mediaTypes: {
-        banner: {
-            sizes: [728, 90]
-        }
+var adUnits = [
+    {
+        code: 'test_banner',
+        mediaTypes: {
+            banner: {
+                sizes: [728, 90]
+            }
+        },
+        bids: [{
+            bidder: 'orbidder',
+            params: {
+                accountId: "someAccount",
+                placementId: "somePlace"
+            }
+        }],
     },
-    bids: [{
-        bidder: 'orbidder'
-        params: {
-            accountId: "someAccount",
-            placementId: "somePlace"
-        }
-    }]
-}];
+    {
+        code: 'test_native',
+        mediaTypes: {
+            native: {
+                title: {
+                    required: true,
+                    len: 80
+                },
+                image: {
+                    required: true,
+                    sizes: [150, 50]
+                },
+                sponsoredBy: {
+                    required: true
+                }
+            },
+        },
+        bids: [{
+            bidder: 'orbidder',
+            params: {
+                accountId: "someAccount",
+                placementId: "somePlace"
+            }
+        }],
+    }
+];
 ```
diff --git a/modules/orbitsoftBidAdapter.js b/modules/orbitsoftBidAdapter.js
new file mode 100644
index 00000000000..d72a8719bd8
--- /dev/null
+++ b/modules/orbitsoftBidAdapter.js
@@ -0,0 +1,150 @@
+import * as utils from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+
+const BIDDER_CODE = 'orbitsoft';
+let styleParamsMap = {
+  'title.family': 'f1', // headerFont
+  'title.size': 'fs1', // headerFontSize
+  'title.weight': 'w1', // headerWeight
+  'title.style': 's1', // headerStyle
+  'title.color': 'c3', // headerColor
+  'description.family': 'f2', // descriptionFont
+  'description.size': 'fs2', // descriptionFontSize
+  'description.weight': 'w2', // descriptionWeight
+  'description.style': 's2', // descriptionStyle
+  'description.color': 'c4', // descriptionColor
+  'url.family': 'f3', // urlFont
+  'url.size': 'fs3', // urlFontSize
+  'url.weight': 'w3', // urlWeight
+  'url.style': 's3', // urlStyle
+  'url.color': 'c5', // urlColor
+  'colors.background': 'c2', // borderColor
+  'colors.border': 'c1', // borderColor
+  'colors.link': 'c6', // lnkColor
+};
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['oas', '152media'], // short code and customer aliases
+  isBidRequestValid: function (bid) {
+    switch (true) {
+      case !('params' in bid):
+        utils.logError(bid.bidder + ': No required params');
+        return false;
+      case !(bid.params.placementId):
+        utils.logError(bid.bidder + ': No required param placementId');
+        return false;
+      case !(bid.params.requestUrl):
+        utils.logError(bid.bidder + ': No required param requestUrl');
+        return false;
+    }
+    return true;
+  },
+  buildRequests: function (validBidRequests) {
+    let bidRequest;
+    let serverRequests = [];
+    for (let i = 0; i < validBidRequests.length; i++) {
+      bidRequest = validBidRequests[i];
+      let bidRequestParams = bidRequest.params;
+      let placementId = utils.getBidIdParameter('placementId', bidRequestParams);
+      let requestUrl = utils.getBidIdParameter('requestUrl', bidRequestParams);
+      let referrer = utils.getBidIdParameter('ref', bidRequestParams);
+      let location = utils.getBidIdParameter('loc', bidRequestParams);
+      // Append location & referrer
+      if (location === '') {
+        location = utils.getWindowLocation();
+      }
+      if (referrer === '' && bidRequest && bidRequest.refererInfo) {
+        referrer = bidRequest.refererInfo.referer;
+      }
+
+      // Styles params
+      let stylesParams = utils.getBidIdParameter('style', bidRequestParams);
+      let stylesParamsArray = {};
+      for (let currentValue in stylesParams) {
+        if (stylesParams.hasOwnProperty(currentValue)) {
+          let currentStyle = stylesParams[currentValue];
+          for (let field in currentStyle) {
+            if (currentStyle.hasOwnProperty(field)) {
+              let styleField = styleParamsMap[currentValue + '.' + field];
+              if (typeof styleField !== 'undefined') {
+                stylesParamsArray[styleField] = currentStyle[field];
+              }
+            }
+          }
+        }
+      }
+      // Custom params
+      let customParams = utils.getBidIdParameter('customParams', bidRequestParams);
+      let customParamsArray = {};
+      for (let customField in customParams) {
+        if (customParams.hasOwnProperty(customField)) {
+          customParamsArray['c.' + customField] = customParams[customField];
+        }
+      }
+
+      // Sizes params (not supports by server, for future features)
+      let sizesParams = bidRequest.sizes;
+      let parsedSizes = utils.parseSizesInput(sizesParams);
+      let requestData = Object.assign({
+        'scid': placementId,
+        'callback_uid': utils.generateUUID(),
+        'loc': location,
+        'ref': referrer,
+        'size': parsedSizes
+      }, stylesParamsArray, customParamsArray);
+
+      serverRequests.push({
+        method: 'POST',
+        url: requestUrl,
+        data: requestData,
+        options: {withCredentials: false},
+        bidRequest: bidRequest
+      });
+    }
+    return serverRequests;
+  },
+  interpretResponse: function (serverResponse, request) {
+    let bidResponses = [];
+    if (!serverResponse || serverResponse.error) {
+      utils.logError(BIDDER_CODE + ': Server response error');
+      return bidResponses;
+    }
+
+    const serverBody = serverResponse.body;
+    if (!serverBody) {
+      utils.logError(BIDDER_CODE + ': Empty bid response');
+      return bidResponses;
+    }
+
+    const CPM = serverBody.cpm;
+    const WIDTH = serverBody.width;
+    const HEIGHT = serverBody.height;
+    const CREATIVE = serverBody.content_url;
+    const CALLBACK_UID = serverBody.callback_uid;
+    const TIME_TO_LIVE = config.getConfig('_bidderTimeout');
+    const REFERER = utils.getWindowTop();
+    let bidRequest = request.bidRequest;
+    if (CPM > 0 && WIDTH > 0 && HEIGHT > 0) {
+      let bidResponse = {
+        requestId: bidRequest.bidId,
+        cpm: CPM,
+        width: WIDTH,
+        height: HEIGHT,
+        creativeId: CALLBACK_UID,
+        ttl: TIME_TO_LIVE,
+        referrer: REFERER,
+        currency: 'USD',
+        netRevenue: true,
+        adUrl: CREATIVE,
+        meta: {
+          advertiserDomains: serverBody.adomain ? serverBody.adomain : []
+        }
+      };
+      bidResponses.push(bidResponse);
+    }
+
+    return bidResponses;
+  }
+};
+registerBidder(spec);
diff --git a/modules/orbitsoftBidAdapter.md b/modules/orbitsoftBidAdapter.md
deleted file mode 100644
index a18f075b6b1..00000000000
--- a/modules/orbitsoftBidAdapter.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Overview
-
-```
-Module Name: Orbitsoft Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: support@orbitsoft.com
-```
-
-# Description
-
-Module that connects to Orbitsoft's demand sources. The “sizes” option is not supported, and the size of the ad depends on the placement settings. You can use an optional “style” parameter to set the appearance only for text ad. Specify the “requestUrl” param to your Orbitsoft ad server header bidding endpoint.  
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'orbitsoft-div',
-               bids: [
-                   {
-                       bidder: "orbitsoft",
-                       params: {
-                           placementId: '132',
-                           requestUrl: 'https://orbitsoft.com/php/ads/hb.php',
-                           style: {
-                               title: {
-                                   family: 'Tahoma',
-                                   size: 'medium',
-                                   weight: 'normal',
-                                   style: 'normal',
-                                   color: '0053F9'
-                               },
-                               description: {
-                                   family: 'Tahoma',
-                                   size: 'medium',
-                                   weight: 'normal',
-                                   style: 'normal',
-                                   color: '0053F9'
-                               },
-                               url: {
-                                   family: 'Tahoma',
-                                   size: 'medium',
-                                   weight: 'normal',
-                                   style: 'normal',
-                                   color: '0053F9'
-                               },
-                               colors: {
-                                   background: 'ffffff',
-                                   border: 'E0E0E0',
-                                   link: '5B99FE'
-                               }
-                           },
-                           customParams: {
-                                macro_name: "macro_value"
-                           }
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/otmBidAdapter.js b/modules/otmBidAdapter.js
index 23f6d434ae1..1230694fc65 100644
--- a/modules/otmBidAdapter.js
+++ b/modules/otmBidAdapter.js
@@ -1,95 +1,152 @@
-import {BANNER} from '../src/mediaTypes.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.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 DEFAULT_CURRENCY = 'RUB'
 
 export const spec = {
-  code: 'otm',
-  supportedMediaTypes: [BANNER],
+
+  code: BIDDER_CODE,
+  url: OTM_BID_URL,
+  supportedMediaTypes: [ BANNER ],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function (bid) {
-    return !!bid.params.tid;
+    return Boolean(bid.params.tid);
   },
-  buildRequests: function (bidRequests) {
-    const requests = bidRequests.map(function (bid) {
-      const size = getMaxPrioritySize(bid.sizes);
-      const params = {
-        tz: getTz(),
-        w: size[0],
-        h: size[1],
-        s: bid.params.tid,
-        bidid: bid.bidId,
-        transactionid: bid.transactionId,
-        auctionid: bid.auctionId,
-        bidfloor: bid.params.bidfloor
-      };
-
-      return {method: 'GET', url: 'https://ssp.otm-r.com/adjson', data: params}
-    });
-
-    return requests;
-  },
-  interpretResponse: function (serverResponse, bidRequest) {
-    if (!serverResponse || !serverResponse.body) {
-      return [];
-    }
 
-    const answer = [];
-
-    serverResponse.body.forEach(bid => {
-      if (bid.ad) {
-        answer.push({
-          requestId: bid.bidid,
-          cpm: bid.cpm,
-          width: bid.w,
-          height: bid.h,
-          creativeId: bid.creativeid,
-          currency: bid.currency || 'RUB',
-          netRevenue: true,
-          ad: bid.ad,
-          ttl: bid.ttl,
-          transactionId: bid.transactionid
-        });
-      }
-    });
+  /**
+   * Build bidder requests.
+   *
+   * @param validBidRequests
+   * @param bidderRequest
+   * @returns {[]}
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    logInfo('validBidRequests', validBidRequests);
+
+    const bidRequests = [];
+    const tz = new Date().getTimezoneOffset()
+    // TODO: are these the right referer values?
+    const referrer = bidderRequest?.refererInfo?.page || '';
+    const topOrigin = bidderRequest?.refererInfo?.domain || '';
+
+    _each(validBidRequests, (bid) => {
+      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)
 
-    return answer;
+      _each(bid.sizes, size => {
+        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,
+            w: width,
+            h: height,
+            domain,
+            l: referrer,
+            s: bid.params.tid,
+            cur,
+            bidid,
+            transactionid,
+            auctionid,
+            bidfloor,
+          },
+        })
+      })
+    })
+    return bidRequests;
   },
-};
 
-function getTz() {
-  return new Date().getTimezoneOffset();
-}
+  /**
+   * Generate response.
+   *
+   * @param serverResponse
+   * @returns {[]|*[]}
+   */
+  interpretResponse: function (serverResponse) {
+    logInfo('serverResponse', serverResponse.body);
 
-function getMaxPrioritySize(sizes) {
-  var maxPrioritySize = null;
-
-  const sizesByPriority = [
-    [300, 250],
-    [240, 400],
-    [728, 90],
-    [300, 600],
-    [970, 250],
-    [300, 50],
-    [320, 100]
-  ];
-
-  const sizeToString = (size) => {
-    return size[0] + 'x' + size[1];
-  };
-
-  const sizesAsString = sizes.map(sizeToString);
-
-  sizesByPriority.forEach(size => {
-    if (!maxPrioritySize) {
-      if (sizesAsString.indexOf(sizeToString(size)) !== -1) {
-        maxPrioritySize = size;
+    const responsesBody = serverResponse ? serverResponse.body : {};
+    const bidResponses = [];
+    try {
+      if (responsesBody.length === 0) {
+        return [];
       }
+
+      _each(responsesBody, (bid) => {
+        if (bid.ad) {
+          bidResponses.push({
+            requestId: bid.bidid,
+            cpm: bid.cpm,
+            width: bid.w,
+            height: bid.h,
+            creativeId: bid.creativeid,
+            currency: bid.currency || DEFAULT_CURRENCY,
+            netRevenue: true,
+            ad: bid.ad,
+            ttl: bid.ttl,
+            transactionId: bid.transactionid,
+            meta: {
+              advertiserDomains: bid.adDomain ? [bid.adDomain] : []
+            }
+          });
+        }
+      });
+    } catch (error) {
+      logError(error);
     }
-  });
 
-  if (maxPrioritySize) {
-    return maxPrioritySize;
-  } else {
-    return sizes[0];
+    return bidResponses;
+  }
+};
+
+/**
+ * Get floor value
+ * @param bid
+ * @returns {null|*}
+ * @private
+ */
+function _getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidfloor ? bid.params.bidfloor : 0;
+  }
+
+  const floor = bid.getFloor({
+    currency: DEFAULT_CURRENCY,
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === DEFAULT_CURRENCY) {
+    return floor.floor;
   }
+  return 0;
 }
 
 registerBidder(spec);
diff --git a/modules/otmBidAdapter.md b/modules/otmBidAdapter.md
index 4962d3a8052..e5834da5729 100644
--- a/modules/otmBidAdapter.md
+++ b/modules/otmBidAdapter.md
@@ -1,36 +1,37 @@
 # Overview
 
-Module Name: OTM Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: ?
+**Module Name**: OTM Bidder Adapter
+**Module Type**: Bidder Adapter  
+**Maintainer**: e.kretsu@otm-r.com
 
 # Description
 
-You can use this adapter to get a bid from otm-r.com.
+OTM Bidder Adapter for Prebid.js. About: https://otm-r.com
 
-About us : http://otm-r.com
+Use `otm` as bidder:
 
+# Params
+- `tid` required, specific id AdUnit slot.
+- `domain` optional, specific custom domain.
+- `bidfloor` optional.
 
-# Test Parameters
-```javascript
-    var adUnits = [
-        {
-            code: 'div-otm-example',
-            sizes: [[320, 480]],
-            bids: [
-                {
-                    bidder: "otm",
-                    params: {
-                        tid: "99",
-                        bidfloor: 20
-                    }
-                }
-            ]
-        }
-    ];
+## AdUnits configuration example
 ```
+    var adUnits = [{
+      code: 'your-slot', //use exactly the same code as your slot div id.
+      mediaTypes: {
+          banner: {
+              sizes: [[320, 480]]
+          }
+      },
+      bids: [{
+        bidder: 'otm',
+        params: { 
+            tid: 'XXXXX',
+            domain: 'specific custom domain, if needed',
+            bidfloor: 20
+        }
+      }]
+    }];
 
-Where:
-
-* tid - A tag id (should have low cardinality)
-* bidfloor - Floor price
+```
diff --git a/modules/outbrainBidAdapter.js b/modules/outbrainBidAdapter.js
new file mode 100644
index 00000000000..3db1da0d689
--- /dev/null
+++ b/modules/outbrainBidAdapter.js
@@ -0,0 +1,340 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict';
+
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import { NATIVE, BANNER } from '../src/mediaTypes.js';
+import { deepAccess, deepSetValue, replaceAuctionPrice, _map, isArray } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'outbrain';
+const GVLID = 164;
+const CURRENCY = 'USD';
+const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
+const NATIVE_PARAMS = {
+  title: { id: 0, name: 'title' },
+  icon: { id: 2, type: 1, name: 'img' },
+  image: { id: 3, type: 3, name: 'img' },
+  sponsoredBy: { id: 5, name: 'data', type: 1 },
+  body: { id: 4, name: 'data', type: 2 },
+  cta: { id: 1, type: 12, name: 'data' }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [ NATIVE, BANNER ],
+  isBidRequestValid: (bid) => {
+    if (typeof bid.params !== 'object') {
+      return false;
+    }
+
+    if (typeof deepAccess(bid, 'params.publisher.id') !== 'string') {
+      return false;
+    }
+
+    if (!!bid.params.tagid && typeof bid.params.tagid !== 'string') {
+      return false;
+    }
+
+    if (!!bid.params.bcat && (typeof bid.params.bcat !== 'object' || !bid.params.bcat.every(item => typeof item === 'string'))) {
+      return false;
+    }
+
+    if (!!bid.params.badv && (typeof bid.params.badv !== 'object' || !bid.params.badv.every(item => typeof item === 'string'))) {
+      return false;
+    }
+
+    return (
+      !!config.getConfig('outbrain.bidderUrl') &&
+      !!(bid.nativeParams || bid.sizes)
+    );
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const ortb2 = bidderRequest.ortb2 || {};
+    const page = bidderRequest.refererInfo.page;
+    const ua = navigator.userAgent;
+    const test = setOnAny(validBidRequests, 'params.test');
+    const publisher = setOnAny(validBidRequests, 'params.publisher');
+    const bcat = ortb2.bcat || setOnAny(validBidRequests, 'params.bcat');
+    const badv = ortb2.badv || setOnAny(validBidRequests, 'params.badv');
+    const eids = setOnAny(validBidRequests, 'userIdAsEids');
+    const wlang = ortb2.wlang;
+    const cur = CURRENCY;
+    const endpointUrl = config.getConfig('outbrain.bidderUrl');
+    const timeout = bidderRequest.timeout;
+
+    const imps = validBidRequests.map((bid, id) => {
+      bid.netRevenue = 'net';
+      const imp = {
+        id: id + 1 + ''
+      }
+
+      if (bid.params.tagid) {
+        imp.tagid = bid.params.tagid
+      }
+
+      if (bid.nativeParams) {
+        imp.native = {
+          request: JSON.stringify({
+            assets: getNativeAssets(bid)
+          })
+        }
+      } else {
+        imp.banner = {
+          format: transformSizes(bid.sizes)
+        }
+      }
+
+      if (typeof bid.getFloor === 'function') {
+        const floor = _getFloor(bid, bid.nativeParams ? NATIVE : BANNER);
+        if (floor) {
+          imp.bidfloor = floor;
+        }
+      }
+
+      return imp;
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site: { page, publisher },
+      device: { ua },
+      source: { fd: 1 },
+      cur: [cur],
+      tmax: timeout,
+      imp: imps,
+      bcat: bcat,
+      badv: badv,
+      wlang: wlang,
+      ext: {
+        prebid: {
+          channel: {
+            name: 'pbjs',
+            version: '$prebid.version$'
+          }
+        }
+      }
+    };
+
+    if (test) {
+      request.is_debug = !!test;
+      request.test = 1;
+    }
+
+    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
+      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString)
+      deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1)
+    }
+    if (bidderRequest.uspConsent) {
+      deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent)
+    }
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(request, 'regs.coppa', config.getConfig('coppa') & 1)
+    }
+
+    if (eids) {
+      deepSetValue(request, 'user.ext.eids', eids);
+    }
+
+    return {
+      method: 'POST',
+      url: endpointUrl,
+      data: JSON.stringify(request),
+      bids: validBidRequests
+    };
+  },
+  interpretResponse: (serverResponse, { bids }) => {
+    if (!serverResponse.body) {
+      return [];
+    }
+    const { seatbid, cur } = serverResponse.body;
+
+    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
+      result[bid.impid - 1] = bid;
+      return result;
+    }, []);
+
+    return bids.map((bid, id) => {
+      const bidResponse = bidResponses[id];
+      if (bidResponse) {
+        const type = bid.nativeParams ? NATIVE : BANNER;
+        const bidObject = {
+          requestId: bid.bidId,
+          cpm: bidResponse.price,
+          creativeId: bidResponse.crid,
+          ttl: 360,
+          netRevenue: bid.netRevenue === 'net',
+          currency: cur,
+          mediaType: type,
+          nurl: bidResponse.nurl,
+        };
+        if (type === NATIVE) {
+          bidObject.native = parseNative(bidResponse);
+        } else {
+          bidObject.ad = bidResponse.adm;
+          bidObject.width = bidResponse.w;
+          bidObject.height = bidResponse.h;
+        }
+        bidObject.meta = {};
+        if (bidResponse.adomain && bidResponse.adomain.length > 0) {
+          bidObject.meta.advertiserDomains = bidResponse.adomain;
+        }
+        return bidObject;
+      }
+    }).filter(Boolean);
+  },
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+    const syncs = [];
+    let syncUrl = config.getConfig('outbrain.usersyncUrl');
+
+    let query = [];
+    if (syncOptions.pixelEnabled && syncUrl) {
+      if (gdprConsent) {
+        query.push('gdpr=' + (gdprConsent.gdprApplies & 1));
+        query.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || ''));
+      }
+      if (uspConsent) {
+        query.push('us_privacy=' + encodeURIComponent(uspConsent));
+      }
+
+      syncs.push({
+        type: 'image',
+        url: syncUrl + (query.length ? '?' + query.join('&') : '')
+      });
+    }
+    return syncs;
+  },
+  onBidWon: (bid) => {
+    // for native requests we put the nurl as an imp tracker, otherwise if the auction takes place on prebid server
+    // the server JS adapter puts the nurl in the adm as a tracking pixel and removes the attribute
+    if (bid.nurl) {
+      ajax(replaceAuctionPrice(bid.nurl, bid.originalCpm))
+    }
+  }
+};
+
+registerBidder(spec);
+
+function parseNative(bid) {
+  const { assets, link, privacy, eventtrackers } = JSON.parse(bid.adm);
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || undefined
+  };
+  assets.forEach(asset => {
+    const kind = NATIVE_ASSET_IDS[asset.id];
+    const content = kind && asset[NATIVE_PARAMS[kind].name];
+    if (content) {
+      result[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+  if (privacy) {
+    result.privacyLink = privacy;
+  }
+  if (eventtrackers) {
+    result.impressionTrackers = [];
+    eventtrackers.forEach(tracker => {
+      if (tracker.event !== 1) return;
+      switch (tracker.method) {
+        case 1: // img
+          result.impressionTrackers.push(tracker.url);
+          break;
+        case 2: // js
+          result.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
+          break;
+      }
+    });
+  }
+  return result;
+}
+
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function flatten(arr) {
+  return [].concat(...arr);
+}
+
+function getNativeAssets(bid) {
+  return _map(bid.nativeParams, (bidParams, key) => {
+    const props = NATIVE_PARAMS[key];
+    const asset = {
+      required: bidParams.required & 1,
+    };
+    if (props) {
+      asset.id = props.id;
+      let wmin, hmin, w, h;
+      let aRatios = bidParams.aspect_ratios;
+
+      if (aRatios && aRatios[0]) {
+        aRatios = aRatios[0];
+        wmin = aRatios.min_width || 0;
+        hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+      }
+
+      if (bidParams.sizes) {
+        const sizes = flatten(bidParams.sizes);
+        w = parseInt(sizes[0], 10);
+        h = parseInt(sizes[1], 10);
+      }
+
+      asset[props.name] = {
+        len: bidParams.len,
+        type: props.type,
+        wmin,
+        hmin,
+        w,
+        h
+      };
+
+      return asset;
+    }
+  }).filter(Boolean);
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  if (!isArray(requestSizes)) {
+    return [];
+  }
+
+  if (requestSizes.length === 2 && !isArray(requestSizes[0])) {
+    return [{
+      w: parseInt(requestSizes[0], 10),
+      h: parseInt(requestSizes[1], 10)
+    }];
+  } else if (isArray(requestSizes[0])) {
+    return requestSizes.map(item =>
+      ({
+        w: parseInt(item[0], 10),
+        h: parseInt(item[1], 10)
+      })
+    );
+  }
+
+  return [];
+}
+
+function _getFloor(bid, type) {
+  const floorInfo = bid.getFloor({
+    currency: CURRENCY,
+    mediaType: type,
+    size: '*'
+  });
+  if (typeof floorInfo === 'object' && floorInfo.currency === CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
+    return parseFloat(floorInfo.floor);
+  }
+  return null;
+}
diff --git a/modules/outbrainBidAdapter.md b/modules/outbrainBidAdapter.md
new file mode 100644
index 00000000000..32df22ddad8
--- /dev/null
+++ b/modules/outbrainBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name: Outbrain Adapter
+Module Type: Bidder Adapter
+Maintainer: prog-ops-team@outbrain.com
+```
+
+# Description
+
+Module that connects to Outbrain bidder to fetch bids.
+Both native and display formats are supported but not at the same time. Using OpenRTB standard.
+
+# Configuration
+
+## Bidder and usersync URLs
+
+The Outbrain adapter does not work without setting the correct bidder and usersync URLs.
+You will receive the URLs when contacting us.
+
+```
+pbjs.setConfig({
+    outbrain: {
+      bidderUrl: 'https://bidder-url.com',
+      usersyncUrl: 'https://usersync-url.com'
+    }
+});
+```
+
+
+# Test Native Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_native_example_1',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: false,
+                    sizes: [100, 50]
+                },
+                title: {
+                    required: false,
+                    len: 140
+                },
+                sponsoredBy: {
+                    required: false
+                },
+                clickUrl: {
+                    required: false
+                },
+                body: {
+                    required: false
+                },
+                icon: {
+                    required: false,
+                    sizes: [50, 50]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'outbrain',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id',
+                bcat: ['IAB1-1'],
+                badv: ['example.com']
+            }
+        }]
+    ];
+
+    pbjs.setConfig({
+        outbrain: {
+          bidderUrl: 'https://prebidtest.zemanta.com/api/bidder/prebidtest/bid/'
+        }
+    });
+```
+
+# Test Display Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_display_example_1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        bids: [{
+            bidder: 'outbrain',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id',
+                bcat: ['IAB1-1'],
+                badv: ['example.com']
+            },
+        }]
+    ];
+
+    pbjs.setConfig({
+        outbrain: {
+          bidderUrl: 'https://prebidtest.zemanta.com/api/bidder/prebidtest/bid/'
+        }
+    });
+```
diff --git a/modules/outconAdapter.md b/modules/outconAdapter.md
deleted file mode 100644
index 88ed45396bc..00000000000
--- a/modules/outconAdapter.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Overview
-
-```
-Module Name: outconAdapter
-Module Type: Bidder Adapter
-Maintainer: mfolmer@dokkogroup.com.ar
-```
-
-# Description
-
-Module that connects to Outcon demand sources
-
-# Test Parameters
-```
-    var adUnits = [
-      {
-        bidder: 'outcon',
-        params: {
-          internalId: '12345678',
-          publisher: '5d5d66f2306ea4114a37c7c2',
-          bidId: '123456789',
-          env: 'test'
-        }
-      }
-    ];
-```
\ No newline at end of file
diff --git a/modules/outconBidAdapter.js b/modules/outconBidAdapter.js
deleted file mode 100644
index 0c3ac90172a..00000000000
--- a/modules/outconBidAdapter.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'outcon';
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: ['banner', 'video'],
-  isBidRequestValid: function(bid) {
-    return !!((bid.params.pod || (bid.params.internalId && bid.params.publisher)) && bid.params.env);
-  },
-  buildRequests: function(validBidRequests) {
-    for (let i = 0; i < validBidRequests.length; i++) {
-      let url = '';
-      let par = '';
-      if (validBidRequests[i].params.pod != undefined) par = 'get?pod=' + validBidRequests[i].params.pod + '&bidId=' + validBidRequests[i].bidId;
-      else par = 'get?internalId=' + validBidRequests[i].params.internalId + '&publisher=' + validBidRequests[i].params.publisher + '&bidId=' + validBidRequests[i].bidId;
-      par = par + '&vast=true';
-      switch (validBidRequests[i].params.env) {
-        case 'test':
-          par = par + '&demo=true';
-          url = 'https://test.outcondigital.com/ad/' + par;
-          break;
-        case 'api':
-          url = 'https://api.outcondigital.com/ad/' + par;
-          break;
-        case 'stg':
-          url = 'https://stg.outcondigital.com/ad/' + par;
-          break;
-      }
-      return {
-        method: 'GET',
-        url: url,
-        data: {}
-      };
-    }
-  },
-  interpretResponse: function(serverResponse, bidRequest) {
-    const bidResponses = [];
-    const bidResponse = {
-      requestId: serverResponse.body.bidId,
-      cpm: serverResponse.body.cpm,
-      width: serverResponse.body.creatives[0].width,
-      height: serverResponse.body.creatives[0].height,
-      creativeId: serverResponse.body.creatives[0].id,
-      currency: serverResponse.body.cur,
-      netRevenue: true,
-      ttl: 300,
-      ad: wrapDisplayUrl(serverResponse.body.creatives[0].url, serverResponse.body.type),
-      vastImpUrl: serverResponse.body.trackingURL,
-      mediaType: serverResponse.body.type
-    };
-    if (serverResponse.body.type == 'video') {
-      Object.assign(bidResponse, {
-        vastUrl: serverResponse.body.vastURL,
-        ttl: 3600
-      });
-    }
-    bidResponses.push(bidResponse);
-    return bidResponses;
-  },
-}
-
-function wrapDisplayUrl(displayUrl, type) {
-  if (type == 'video') return `<html><head></head><body style='margin : 0; padding: 0;'><div><video width="100%"; height="100%"; autoplay = true><source src="${displayUrl}"></video></div></body>`;
-  if (type == 'banner') return `<html><head></head><body style='margin : 0; padding: 0;'><div><img width:"100%"; height:"100%"; src="${displayUrl}"></div></body>`;
-  return null;
-}
-
-registerBidder(spec);
diff --git a/modules/oxxionRtdProvider.js b/modules/oxxionRtdProvider.js
new file mode 100644
index 00000000000..b4964818ddf
--- /dev/null
+++ b/modules/oxxionRtdProvider.js
@@ -0,0 +1,119 @@
+import { submodule } from '../src/hook.js'
+import { deepAccess, logInfo } from '../src/utils.js'
+
+const oxxionRtdSearchFor = [ 'adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'userId', 'labelAny', 'adId' ];
+const LOG_PREFIX = 'oxxionRtdProvider submodule: ';
+
+const allAdUnits = [];
+
+/** @type {RtdSubmodule} */
+export const oxxionSubmodule = {
+  name: 'oxxionRtd',
+  init: init,
+  onAuctionEndEvent: onAuctionEnd,
+  getBidRequestData: getAdUnits,
+};
+
+function init(config, userConsent) {
+  if (!config.params || !config.params.domain || !config.params.contexts || !Array.isArray(config.params.contexts) || config.params.contexts.length == 0) {
+    return false
+  }
+  return true;
+}
+
+function getAdUnits(reqBidsConfigObj, callback, config, userConsent) {
+  const reqAdUnits = reqBidsConfigObj.adUnits;
+  if (Array.isArray(reqAdUnits)) {
+    reqAdUnits.forEach(adunit => {
+      if (config.params.contexts.includes(deepAccess(adunit, 'mediaTypes.video.context'))) {
+        allAdUnits.push(adunit);
+      }
+    });
+  }
+}
+
+function insertVideoTracking(bidResponse, config, maxCpm) {
+  if (bidResponse.mediaType === 'video') {
+    const trackingUrl = getImpUrl(config, bidResponse, maxCpm);
+    if (!trackingUrl) {
+      return;
+    }
+    // Vast Impression URL
+    if (bidResponse.vastUrl) {
+      bidResponse.vastImpUrl = bidResponse.vastImpUrl
+        ? trackingUrl + '&url=' + encodeURI(bidResponse.vastImpUrl)
+        : trackingUrl
+    }
+    // Vast XML document
+    if (bidResponse.vastXml !== undefined) {
+      const doc = new DOMParser().parseFromString(bidResponse.vastXml, 'text/xml');
+      const wrappers = doc.querySelectorAll('VAST Ad Wrapper, VAST Ad InLine');
+      let hasAltered = false;
+      if (wrappers.length) {
+        wrappers.forEach(wrapper => {
+          const impression = doc.createElement('Impression');
+          impression.appendChild(doc.createCDATASection(trackingUrl));
+          wrapper.appendChild(impression)
+        });
+        bidResponse.vastXml = new XMLSerializer().serializeToString(doc);
+        hasAltered = true;
+      }
+      if (hasAltered) {
+        logInfo(LOG_PREFIX + 'insert into vastXml for adId ' + bidResponse.adId);
+      }
+    }
+  }
+}
+
+function getImpUrl(config, data, maxCpm) {
+  const adUnitCode = data.adUnitCode;
+  const adUnits = allAdUnits.find(adunit => adunit.code === adUnitCode &&
+  'mediaTypes' in adunit &&
+  'video' in adunit.mediaTypes &&
+  typeof adunit.mediaTypes.video.context === 'string');
+  const context = adUnits !== undefined
+    ? adUnits.mediaTypes.video.context
+    : 'unknown';
+  if (!config.params.contexts.includes(context)) {
+    return false;
+  }
+  let trackingImpUrl = 'https://' + config.params.domain + '.oxxion.io/analytics/vast_imp?';
+  trackingImpUrl += oxxionRtdSearchFor.reduce((acc, param) => {
+    switch (typeof data[param]) {
+      case 'string':
+      case 'number':
+        acc += param + '=' + data[param] + '&'
+        break;
+    }
+    return acc;
+  }, '');
+  const cpmIncrement = Math.round(100000 * (data.cpm - maxCpm)) / 100000;
+  return trackingImpUrl + 'cpmIncrement=' + cpmIncrement + '&context=' + context;
+}
+
+function onAuctionEnd(auctionDetails, config, userConsent) {
+  const transactionsToCheck = {}
+  auctionDetails.adUnits.forEach(adunit => {
+    if (config.params.contexts.includes(deepAccess(adunit, 'mediaTypes.video.context'))) {
+      transactionsToCheck[adunit.transactionId] = {'bids': {}, 'maxCpm': 0.0, 'secondMaxCpm': 0.0};
+    }
+  });
+  for (const key in auctionDetails.bidsReceived) {
+    if (auctionDetails.bidsReceived[key].transactionId in transactionsToCheck) {
+      transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['bids'][auctionDetails.bidsReceived[key].adId] = {'key': key, 'cpm': auctionDetails.bidsReceived[key].cpm};
+      if (auctionDetails.bidsReceived[key].cpm > transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['maxCpm']) {
+        transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['secondMaxCpm'] = transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['maxCpm'];
+        transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['maxCpm'] = auctionDetails.bidsReceived[key].cpm;
+      } else if (auctionDetails.bidsReceived[key].cpm > transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['secondMaxCpm']) {
+        transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['secondMaxCpm'] = auctionDetails.bidsReceived[key].cpm;
+      }
+    }
+  };
+  Object.keys(transactionsToCheck).forEach(transaction => {
+    Object.keys(transactionsToCheck[transaction]['bids']).forEach(bid => {
+      insertVideoTracking(auctionDetails.bidsReceived[transactionsToCheck[transaction]['bids'][bid].key], config, transactionsToCheck[transaction].secondMaxCpm);
+    });
+  });
+}
+
+submodule('realTimeData', oxxionSubmodule);
diff --git a/modules/oxxionRtdProvider.md b/modules/oxxionRtdProvider.md
new file mode 100644
index 00000000000..061acdbe11a
--- /dev/null
+++ b/modules/oxxionRtdProvider.md
@@ -0,0 +1,48 @@
+# Overview
+
+Module Name: Oxxion Rtd Provider
+Module Type: Rtd Provider
+Maintainer: tech@oxxion.io
+
+# Oxxion Real-Time-Data submodule
+
+Oxxion helps you to understand how your prebid stack performs.
+This Rtd module is to use in order to improve video events tracking.
+
+# Integration
+
+Make sure to have the following modules listed while building prebid : `rtdModule,oxxionRtdProvider`
+`rtbModule` is required to activate real-time-data submodules.
+For example :
+```
+gulp build --modules=schain,priceFloors,currency,consentManagement,appnexusBidAdapter,rubiconBidAdapter,rtdModule,oxxionRtdProvider
+```
+
+Then add the oxxion Rtd module to your prebid configuration :
+```
+pbjs.setConfig(
+  ...
+  realTimeData: {
+    auctionDelay: 200,
+    dataProviders: [
+      {
+          name: "oxxionRtd",
+          waitForIt: true,
+          params: {
+            domain: "test.endpoint",
+            contexts: ["instream"],
+          }
+       }
+    ]
+  }
+  ...
+)
+```
+
+# setConfig Parameters
+
+| Name                             | Type     | Description                                                                                                 |
+|:---------------------------------|:---------|:------------------------------------------------------------------------------------------------------------|
+| domain                           | String   | This string identifies yourself in Oxxion's systems and is provided to you by your Oxxion representative.   |
+| contexts                         | Array    | Array defining which video contexts to add tracking events into. Values can be instream and/or outstream.   |
+
diff --git a/modules/ozoneBidAdapter.js b/modules/ozoneBidAdapter.js
index 87f140556d0..3e59c2c8def 100644
--- a/modules/ozoneBidAdapter.js
+++ b/modules/ozoneBidAdapter.js
@@ -1,216 +1,255 @@
-import * as utils from '../src/utils.js';
+import {
+  logInfo,
+  logError,
+  deepAccess,
+  logWarn,
+  deepSetValue,
+  isArray,
+  contains,
+  mergeDeep,
+  parseUrl
+} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import {getPriceBucketString} from '../src/cpmBucketManager.js';
 import { Renderer } from '../src/Renderer.js';
+import {getRefererInfo} from '../src/refererDetection.js';
 const BIDDER_CODE = 'ozone';
-const ALLOWED_LOTAME_PARAMS = ['oz_lotameid', 'oz_lotamepid', 'oz_lotametpid'];
-
-// *** PROD ***
-const OZONEURI = 'https://elb.the-ozone-project.com/openrtb2/auction';
-const OZONECOOKIESYNC = 'https://elb.the-ozone-project.com/static/load-cookie.html';
+const ORIGIN = 'https://elb.the-ozone-project.com'; // applies only to auction & cookie
+const AUCTIONURI = '/openrtb2/auction';
+const OZONECOOKIESYNC = '/static/load-cookie.html';
 const OZONE_RENDERER_URL = 'https://prebid.the-ozone-project.com/ozone-renderer.js';
-
-const OZONEVERSION = '2.4.0';
+const ORIGIN_DEV = 'https://test.ozpr.net';
+const OZONEVERSION = '2.8.0';
 export const spec = {
+  gvlid: 524,
+  aliases: [{code: 'lmc', gvlid: 524}],
+  version: OZONEVERSION,
   code: BIDDER_CODE,
   supportedMediaTypes: [VIDEO, BANNER],
-  cookieSyncBag: {'publisherId': null, 'siteId': null, 'userIdObject': {}}, // variables we want to make available to cookie sync
-  propertyBag: {'lotameWasOverridden': 0, 'pageId': null, 'buildRequestsStart': 0, 'buildRequestsEnd': 0}, /* allow us to store vars in instance scope - needs to be an object to be mutable */
-
-  /**
-   * Basic check to see whether required parameters are in the request.
-   * @param bid
-   * @returns {boolean}
-   */
+  cookieSyncBag: {publisherId: null, siteId: null, userIdObject: {}}, // variables we want to make available to cookie sync
+  propertyBag: {pageId: null, buildRequestsStart: 0, buildRequestsEnd: 0, endpointOverride: null}, /* allow us to store vars in instance scope - needs to be an object to be mutable */
+  whitelabel_defaults: {
+    'logId': 'OZONE',
+    'bidder': 'ozone',
+    'keyPrefix': 'oz',
+    'auctionUrl': ORIGIN + AUCTIONURI,
+    'cookieSyncUrl': ORIGIN + OZONECOOKIESYNC,
+    'rendererUrl': OZONE_RENDERER_URL
+  },
+  loadWhitelabelData(bid) {
+    if (this.propertyBag.whitelabel) { return; }
+    this.propertyBag.whitelabel = JSON.parse(JSON.stringify(this.whitelabel_defaults));
+    let bidder = bid.bidder || 'ozone'; // eg. ozone
+    this.propertyBag.whitelabel.logId = bidder.toUpperCase();
+    this.propertyBag.whitelabel.bidder = bidder;
+    let bidderConfig = config.getConfig(bidder) || {};
+    logInfo('got bidderConfig: ', JSON.parse(JSON.stringify(bidderConfig)));
+    if (bidderConfig.kvpPrefix) {
+      this.propertyBag.whitelabel.keyPrefix = bidderConfig.kvpPrefix;
+    }
+    let arr = this.getGetParametersAsObject();
+    if (bidderConfig.endpointOverride) {
+      if (bidderConfig.endpointOverride.origin) {
+        this.propertyBag.endpointOverride = bidderConfig.endpointOverride.origin;
+        this.propertyBag.whitelabel.auctionUrl = bidderConfig.endpointOverride.origin + AUCTIONURI;
+        this.propertyBag.whitelabel.cookieSyncUrl = bidderConfig.endpointOverride.origin + OZONECOOKIESYNC;
+      }
+      if (arr.hasOwnProperty('renderer')) {
+        if (arr.renderer.match('%3A%2F%2F')) {
+          this.propertyBag.whitelabel.rendererUrl = decodeURIComponent(arr['renderer']);
+        } else {
+          this.propertyBag.whitelabel.rendererUrl = arr['renderer'];
+        }
+      } else if (bidderConfig.endpointOverride.rendererUrl) {
+        this.propertyBag.whitelabel.rendererUrl = bidderConfig.endpointOverride.rendererUrl;
+      }
+      if (bidderConfig.endpointOverride.cookieSyncUrl) {
+        this.propertyBag.whitelabel.cookieSyncUrl = bidderConfig.endpointOverride.cookieSyncUrl;
+      }
+      if (bidderConfig.endpointOverride.auctionUrl) {
+        this.propertyBag.endpointOverride = bidderConfig.endpointOverride.auctionUrl;
+        this.propertyBag.whitelabel.auctionUrl = bidderConfig.endpointOverride.auctionUrl;
+      }
+    }
+    try {
+      if (arr.hasOwnProperty('auction') && arr.auction === 'dev') {
+        logInfo('GET: auction=dev');
+        this.propertyBag.whitelabel.auctionUrl = ORIGIN_DEV + AUCTIONURI;
+      }
+      if (arr.hasOwnProperty('cookiesync') && arr.cookiesync === 'dev') {
+        logInfo('GET: cookiesync=dev');
+        this.propertyBag.whitelabel.cookieSyncUrl = ORIGIN_DEV + OZONECOOKIESYNC;
+      }
+    } catch (e) {}
+    logInfo('set propertyBag.whitelabel to', this.propertyBag.whitelabel);
+  },
+  getAuctionUrl() {
+    return this.propertyBag.whitelabel.auctionUrl;
+  },
+  getCookieSyncUrl() {
+    return this.propertyBag.whitelabel.cookieSyncUrl;
+  },
+  getRendererUrl() {
+    return this.propertyBag.whitelabel.rendererUrl;
+  },
   isBidRequestValid(bid) {
-    utils.logInfo('OZONE: isBidRequestValid : ', config.getConfig(), bid);
+    this.loadWhitelabelData(bid);
+    logInfo('isBidRequestValid : ', config.getConfig(), bid);
     let adUnitCode = bid.adUnitCode; // adunit[n].code
-
+    let err1 = 'VALIDATION FAILED : missing {param} : siteId, placementId and publisherId are REQUIRED';
     if (!(bid.params.hasOwnProperty('placementId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing placementId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      logError(err1.replace('{param}', 'placementId'), adUnitCode);
       return false;
     }
     if (!this.isValidPlacementId(bid.params.placementId)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : placementId must be exactly 10 numeric characters', adUnitCode);
+      logError('VALIDATION FAILED : placementId must be exactly 10 numeric characters', adUnitCode);
       return false;
     }
     if (!(bid.params.hasOwnProperty('publisherId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing publisherId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      logError(err1.replace('{param}', 'publisherId'), adUnitCode);
       return false;
     }
     if (!(bid.params.publisherId).toString().match(/^[a-zA-Z0-9\-]{12}$/)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : publisherId must be exactly 12 alphanumieric characters including hyphens', adUnitCode);
+      logError('VALIDATION FAILED : publisherId must be exactly 12 alphanumeric characters including hyphens', adUnitCode);
       return false;
     }
     if (!(bid.params.hasOwnProperty('siteId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing siteId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      logError(err1.replace('{param}', 'siteId'), adUnitCode);
       return false;
     }
     if (!(bid.params.siteId).toString().match(/^[0-9]{10}$/)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : siteId must be exactly 10 numeric characters', adUnitCode);
+      logError('VALIDATION FAILED : siteId must be exactly 10 numeric characters', adUnitCode);
       return false;
     }
     if (bid.params.hasOwnProperty('customParams')) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customParams should be renamed to customData', adUnitCode);
+      logError('VALIDATION FAILED : customParams should be renamed to customData', adUnitCode);
       return false;
     }
     if (bid.params.hasOwnProperty('customData')) {
       if (!Array.isArray(bid.params.customData)) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData is not an Array', adUnitCode);
+        logError('VALIDATION FAILED : customData is not an Array', adUnitCode);
         return false;
       }
       if (bid.params.customData.length < 1) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData is an array but does not contain any elements', adUnitCode);
+        logError('VALIDATION FAILED : customData is an array but does not contain any elements', adUnitCode);
         return false;
       }
       if (!(bid.params.customData[0]).hasOwnProperty('targeting')) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData[0] does not contain "targeting"', adUnitCode);
+        logError('VALIDATION FAILED : customData[0] does not contain "targeting"', adUnitCode);
         return false;
       }
       if (typeof bid.params.customData[0]['targeting'] != 'object') {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData[0] targeting is not an object', adUnitCode);
-        return false;
-      }
-    }
-    if (bid.params.hasOwnProperty('lotameData')) {
-      if (typeof bid.params.lotameData !== 'object') {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : lotameData is not an object', adUnitCode);
+        logError('VALIDATION FAILED : customData[0] targeting is not an object', adUnitCode);
         return false;
       }
     }
     if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
       if (!bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
-        utils.logError('OZONE: No video context key/value in bid. Rejecting bid: ', bid);
+        logError('No video context key/value in bid. Rejecting bid: ', bid);
         return false;
       }
       if (bid.mediaTypes[VIDEO].context !== 'instream' && bid.mediaTypes[VIDEO].context !== 'outstream') {
-        utils.logError('OZONE: video.context is invalid. Only instream/outstream video is supported. Rejecting bid: ', bid);
+        logError('video.context is invalid. Only instream/outstream video is supported. Rejecting bid: ', bid);
         return false;
       }
     }
-    // guard against hacks in GET parameters that we might allow
-    const arrLotameOverride = this.getLotameOverrideParams();
-    // lotame override, test params. All 3 must be present, or none.
-    let lotameKeys = Object.keys(arrLotameOverride);
-    if (lotameKeys.length === ALLOWED_LOTAME_PARAMS.length) {
-      utils.logInfo('OZONE: VALIDATION : arrLotameOverride', arrLotameOverride);
-      for (let i in lotameKeys) {
-        if (!arrLotameOverride[ALLOWED_LOTAME_PARAMS[i]].toString().match(/^[0-9a-zA-Z]+$/)) {
-          utils.logError('OZONE: Only letters & numbers allowed in lotame override: ' + i.toString() + ': ' + arrLotameOverride[ALLOWED_LOTAME_PARAMS[i]].toString() + '. Rejecting bid: ', bid);
-          return false;
-        }
-      }
-    } else if (lotameKeys.length > 0) {
-      utils.logInfo('OZONE: VALIDATION : arrLotameOverride', arrLotameOverride);
-      utils.logError('OZONE: lotame override params are incomplete. You must set all ' + ALLOWED_LOTAME_PARAMS.length + ': ' + JSON.stringify(ALLOWED_LOTAME_PARAMS) + ', . Rejecting bid: ', bid);
-      return false;
-    }
     return true;
   },
-
-  /**
-   * Split this out so that we can validate the placementId and also the override GET parameter ozstoredrequest
-   * @param placementId
-   */
   isValidPlacementId(placementId) {
     return placementId.toString().match(/^[0-9]{10}$/);
   },
-
   buildRequests(validBidRequests, bidderRequest) {
+    this.loadWhitelabelData(validBidRequests[0]);
     this.propertyBag.buildRequestsStart = new Date().getTime();
-    utils.logInfo(`OZONE: buildRequests time: ${this.propertyBag.buildRequestsStart} ozone v ${OZONEVERSION} validBidRequests`, validBidRequests, 'bidderRequest', bidderRequest);
-    // First check - is there any config to block this request?
+    let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
+    logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${OZONEVERSION} validBidRequests`, JSON.parse(JSON.stringify(validBidRequests)), 'bidderRequest', JSON.parse(JSON.stringify(bidderRequest)));
     if (this.blockTheRequest()) {
       return [];
     }
     let htmlParams = {'publisherId': '', 'siteId': ''};
     if (validBidRequests.length > 0) {
       this.cookieSyncBag.userIdObject = Object.assign(this.cookieSyncBag.userIdObject, this.findAllUserIds(validBidRequests[0]));
-      this.cookieSyncBag.siteId = utils.deepAccess(validBidRequests[0], 'params.siteId');
-      this.cookieSyncBag.publisherId = utils.deepAccess(validBidRequests[0], 'params.publisherId');
+      this.cookieSyncBag.siteId = deepAccess(validBidRequests[0], 'params.siteId');
+      this.cookieSyncBag.publisherId = deepAccess(validBidRequests[0], 'params.publisherId');
       htmlParams = validBidRequests[0].params;
     }
-    utils.logInfo('OZONE: cookie sync bag', this.cookieSyncBag);
-    let singleRequest = config.getConfig('ozone.singleRequest');
+    logInfo('cookie sync bag', this.cookieSyncBag);
+    let singleRequest = this.getWhitelabelConfigItem('ozone.singleRequest');
     singleRequest = singleRequest !== false; // undefined & true will be true
-    utils.logInfo('OZONE: config ozone.singleRequest : ', singleRequest);
+    logInfo(`config ${whitelabelBidder}.singleRequest : `, singleRequest);
     let ozoneRequest = {}; // we only want to set specific properties on this, not validBidRequests[0].params
-    delete ozoneRequest.test; // don't allow test to be set in the config - ONLY use $_GET['pbjs_debug']
-
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      utils.logInfo('OZONE: ADDING GDPR info');
-      let apiVersion = utils.deepAccess(bidderRequest.gdprConsent, 'apiVersion', '1');
-      ozoneRequest.regs = {ext: {gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0, apiVersion: apiVersion}};
-      if (ozoneRequest.regs.ext.gdpr) {
-        ozoneRequest.user = ozoneRequest.user || {};
-        ozoneRequest.user.ext = {'consent': bidderRequest.gdprConsent.consentString};
-      } else {
-        utils.logInfo('OZONE: **** Strange CMP info: bidderRequest.gdprConsent exists BUT bidderRequest.gdprConsent.gdprApplies is false. See bidderRequest logged above. ****');
-      }
-    } else {
-      utils.logInfo('OZONE: WILL NOT ADD GDPR info; no bidderRequest.gdprConsent object was present.');
+    logInfo('going to get ortb2 from bidder request...');
+    let fpd = deepAccess(bidderRequest, 'ortb2', null);
+    logInfo('got fpd: ', fpd);
+    if (fpd && deepAccess(fpd, 'user')) {
+      logInfo('added FPD user object');
+      ozoneRequest.user = fpd.user;
     }
     const getParams = this.getGetParametersAsObject();
-    const ozTestMode = getParams.hasOwnProperty('oztestmode') ? getParams.oztestmode : null; // this can be any string, it's used for testing ads
+    const wlOztestmodeKey = whitelabelPrefix + 'testmode';
+    const isTestMode = getParams[wlOztestmodeKey] || null; // this can be any string, it's used for testing ads
     ozoneRequest.device = {'w': window.innerWidth, 'h': window.innerHeight};
     let placementIdOverrideFromGetParam = this.getPlacementIdOverrideFromGetParam(); // null or string
-    let lotameDataSingle = {}; // we will capture lotame data once & send it to the server as ext.ozone.lotameData
-    // build the array of params to attach to `imp`
+    let schain = null;
     let tosendtags = validBidRequests.map(ozoneBidRequest => {
       var obj = {};
       let placementId = placementIdOverrideFromGetParam || this.getPlacementId(ozoneBidRequest); // prefer to use a valid override param, else the bidRequest placement Id
       obj.id = ozoneBidRequest.bidId; // this causes an error if we change it to something else, even if you update the bidRequest object: "WARNING: Bidder ozone made bid for unknown request ID: mb7953.859498327448. Ignoring."
       obj.tagid = placementId;
-      obj.secure = window.location.protocol === 'https:' ? 1 : 0;
-      // is there a banner (or nothing declared, so banner is the default)?
+      let parsed = parseUrl(getRefererInfo().page);
+      obj.secure = parsed.protocol === 'https' ? 1 : 0;
       let arrBannerSizes = [];
       if (!ozoneBidRequest.hasOwnProperty('mediaTypes')) {
         if (ozoneBidRequest.hasOwnProperty('sizes')) {
-          utils.logInfo('OZONE: no mediaTypes detected - will use the sizes array in the config root');
+          logInfo('no mediaTypes detected - will use the sizes array in the config root');
           arrBannerSizes = ozoneBidRequest.sizes;
         } else {
-          utils.logInfo('OZONE: no mediaTypes detected, no sizes array in the config root either. Cannot set sizes for banner type');
+          logInfo('no mediaTypes detected, no sizes array in the config root either. Cannot set sizes for banner type');
         }
       } else {
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(BANNER)) {
           arrBannerSizes = ozoneBidRequest.mediaTypes[BANNER].sizes; /* Note - if there is a sizes element in the config root it will be pushed into here */
-          utils.logInfo('OZONE: setting banner size from the mediaTypes.banner element for bidId ' + obj.id + ': ', arrBannerSizes);
+          logInfo('setting banner size from the mediaTypes.banner element for bidId ' + obj.id + ': ', arrBannerSizes);
         }
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(VIDEO)) {
-          utils.logInfo('OZONE: openrtb 2.5 compliant video');
-          // examine all the video attributes in the config, and either put them into obj.video if allowed by IAB2.5 or else in to obj.video.ext
+          logInfo('openrtb 2.5 compliant video');
           if (typeof ozoneBidRequest.mediaTypes[VIDEO] == 'object') {
-            let childConfig = utils.deepAccess(ozoneBidRequest, 'params.video', {});
+            let childConfig = deepAccess(ozoneBidRequest, 'params.video', {});
             obj.video = this.unpackVideoConfigIntoIABformat(ozoneBidRequest.mediaTypes[VIDEO], childConfig);
             obj.video = this.addVideoDefaults(obj.video, ozoneBidRequest.mediaTypes[VIDEO], childConfig);
           }
-          // we need to duplicate some of the video values
           let wh = getWidthAndHeightFromVideoObject(obj.video);
-          utils.logInfo('OZONE: setting video object from the mediaTypes.video element: ' + obj.id + ':', obj.video, 'wh=', wh);
+          logInfo('setting video object from the mediaTypes.video element: ' + obj.id + ':', obj.video, 'wh=', wh);
           if (wh && typeof wh === 'object') {
             obj.video.w = wh['w'];
             obj.video.h = wh['h'];
             if (playerSizeIsNestedArray(obj.video)) { // this should never happen; it was in the original spec for this change though.
-              utils.logInfo('OZONE: setting obj.video.format to be an array of objects');
+              logInfo('setting obj.video.format to be an array of objects');
               obj.video.ext.format = [wh];
             } else {
-              utils.logInfo('OZONE: setting obj.video.format to be an object');
+              logInfo('setting obj.video.format to be an object');
               obj.video.ext.format = wh;
             }
           } else {
-            utils.logWarn('OZONE: cannot set w, h & format values for video; the config is not right');
+            logWarn('cannot set w, h & format values for video; the config is not right');
           }
         }
-        // Native integration is not complete yet
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(NATIVE)) {
           obj.native = ozoneBidRequest.mediaTypes[NATIVE];
-          utils.logInfo('OZONE: setting native object from the mediaTypes.native element: ' + obj.id + ':', obj.native);
+          logInfo('setting native object from the mediaTypes.native element: ' + obj.id + ':', obj.native);
+        }
+        if (ozoneBidRequest.hasOwnProperty('getFloor')) {
+          logInfo('This bidRequest object has property: getFloor');
+          obj.floor = this.getFloorObjectForAuction(ozoneBidRequest);
+          logInfo('obj.floor is : ', obj.floor);
+        } else {
+          logInfo('This bidRequest object DOES NOT have property: getFloor');
         }
       }
       if (arrBannerSizes.length > 0) {
-        // build the banner request using banner sizes we found in either possible location:
         obj.banner = {
           topframe: 1,
           w: arrBannerSizes[0][0] || 0,
@@ -220,130 +259,170 @@ export const spec = {
           })
         };
       }
-      // these 3 MUST exist - we check them in the validation method
       obj.placementId = placementId;
-      // build the imp['ext'] object
-      obj.ext = {'prebid': {'storedrequest': {'id': placementId}}, 'ozone': {}};
-      obj.ext.ozone.adUnitCode = ozoneBidRequest.adUnitCode; // eg. 'mpu'
-      obj.ext.ozone.transactionId = ozoneBidRequest.transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
+      deepSetValue(obj, 'ext.prebid', {'storedrequest': {'id': placementId}});
+      obj.ext[whitelabelBidder] = {};
+      obj.ext[whitelabelBidder].adUnitCode = ozoneBidRequest.adUnitCode; // eg. 'mpu'
+      obj.ext[whitelabelBidder].transactionId = ozoneBidRequest.transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
       if (ozoneBidRequest.params.hasOwnProperty('customData')) {
-        obj.ext.ozone.customData = ozoneBidRequest.params.customData;
-      }
-      utils.logInfo('OZONE: obj.ext.ozone is ', obj.ext.ozone);
-      if (ozTestMode != null) {
-        utils.logInfo('OZONE: setting ozTestMode to ', ozTestMode);
-        if (obj.ext.ozone.hasOwnProperty('customData')) {
-          for (let i = 0; i < obj.ext.ozone.customData.length; i++) {
-            obj.ext.ozone.customData[i]['targeting']['oztestmode'] = ozTestMode;
+        obj.ext[whitelabelBidder].customData = ozoneBidRequest.params.customData;
+      }
+      logInfo(`obj.ext.${whitelabelBidder} is `, obj.ext[whitelabelBidder]);
+      if (isTestMode != null) {
+        logInfo('setting isTestMode to ', isTestMode);
+        if (obj.ext[whitelabelBidder].hasOwnProperty('customData')) {
+          for (let i = 0; i < obj.ext[whitelabelBidder].customData.length; i++) {
+            obj.ext[whitelabelBidder].customData[i]['targeting'][wlOztestmodeKey] = isTestMode;
           }
         } else {
-          obj.ext.ozone.customData = [{'settings': {}, 'targeting': {'oztestmode': ozTestMode}}];
+          obj.ext[whitelabelBidder].customData = [{'settings': {}, 'targeting': {}}];
+          obj.ext[whitelabelBidder].customData[0].targeting[wlOztestmodeKey] = isTestMode;
+        }
+      }
+      if (fpd && deepAccess(fpd, 'site')) {
+        logInfo('adding fpd.site');
+        if (deepAccess(obj, 'ext.' + whitelabelBidder + '.customData.0.targeting', false)) {
+          obj.ext[whitelabelBidder].customData[0].targeting = Object.assign(obj.ext[whitelabelBidder].customData[0].targeting, fpd.site);
+        } else {
+          deepSetValue(obj, 'ext.' + whitelabelBidder + '.customData.0.targeting', fpd.site);
         }
-      } else {
-        utils.logInfo('OZONE: no ozTestMode ');
       }
-      // now deal with lotame, including the optional override parameters
-      if (Object.keys(lotameDataSingle).length === 0) { // we've not yet found lotameData, see if we can get it from this bid request object
-        lotameDataSingle = this.tryGetLotameData(ozoneBidRequest);
+      if (!schain && deepAccess(ozoneBidRequest, 'schain')) {
+        schain = ozoneBidRequest.schain;
       }
       return obj;
     });
-
-    // in v 2.0.0 we moved these outside of the individual ad slots
-    let extObj = {'ozone': {'oz_pb_v': OZONEVERSION, 'oz_rw': placementIdOverrideFromGetParam ? 1 : 0, 'oz_lot_rw': this.propertyBag.lotameWasOverridden}};
+    let extObj = {};
+    extObj[whitelabelBidder] = {};
+    extObj[whitelabelBidder][whitelabelPrefix + '_pb_v'] = OZONEVERSION;
+    extObj[whitelabelBidder][whitelabelPrefix + '_rw'] = placementIdOverrideFromGetParam ? 1 : 0;
     if (validBidRequests.length > 0) {
-      let userIds = this.findAllUserIds(validBidRequests[0]);
+      let userIds = this.cookieSyncBag.userIdObject; // 2021-01-06 - slight optimisation - we've already found this info
       if (userIds.hasOwnProperty('pubcid')) {
-        extObj.ozone.pubcid = userIds.pubcid;
+        extObj[whitelabelBidder].pubcid = userIds.pubcid;
       }
     }
-    extObj.ozone.pv = this.getPageId(); // attach the page ID that will be common to all auciton calls for this page if refresh() is called
-    extObj.ozone.lotameData = lotameDataSingle; // 2.4.0 moved lotameData out of bid objects into the single ext.ozone area to remove duplication
-    let ozOmpFloorDollars = config.getConfig('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
-    utils.logInfo('OZONE: oz_omp_floor dollar value = ', ozOmpFloorDollars);
+    extObj[whitelabelBidder].pv = this.getPageId(); // attach the page ID that will be common to all auction calls for this page if refresh() is called
+    let ozOmpFloorDollars = this.getWhitelabelConfigItem('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
+    logInfo(`${whitelabelPrefix}_omp_floor dollar value = `, ozOmpFloorDollars);
     if (typeof ozOmpFloorDollars === 'number') {
-      extObj.ozone.oz_omp_floor = ozOmpFloorDollars;
+      extObj[whitelabelBidder][whitelabelPrefix + '_omp_floor'] = ozOmpFloorDollars;
     } else if (typeof ozOmpFloorDollars !== 'undefined') {
-      utils.logError('OZONE: oz_omp_floor is invalid - IF SET then this must be a number, representing dollar value eg. oz_omp_floor: 1.55. You have it set as a ' + (typeof ozOmpFloorDollars));
-    }
-    let ozWhitelistAdserverKeys = config.getConfig('ozone.oz_whitelist_adserver_keys');
-    let useOzWhitelistAdserverKeys = utils.isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
-    extObj.ozone.oz_kvp_rw = useOzWhitelistAdserverKeys ? 1 : 0;
-
-    var userExtEids = this.generateEids(validBidRequests); // generate the UserIDs in the correct format for UserId module
-
+      logError(`${whitelabelPrefix}_omp_floor is invalid - IF SET then this must be a number, representing dollar value eg. ${whitelabelPrefix}_omp_floor: 1.55. You have it set as a ` + (typeof ozOmpFloorDollars));
+    }
+    let ozWhitelistAdserverKeys = this.getWhitelabelConfigItem('ozone.oz_whitelist_adserver_keys');
+    let useOzWhitelistAdserverKeys = isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
+    extObj[whitelabelBidder][whitelabelPrefix + '_kvp_rw'] = useOzWhitelistAdserverKeys ? 1 : 0;
+    if (whitelabelBidder !== 'ozone') {
+      logInfo('setting aliases object');
+      extObj.prebid = {aliases: {'ozone': whitelabelBidder}};
+    }
+    if (getParams.hasOwnProperty('ozf')) { extObj[whitelabelBidder]['ozf'] = getParams.ozf === 'true' || getParams.ozf === '1' ? 1 : 0; }
+    if (getParams.hasOwnProperty('ozpf')) { extObj[whitelabelBidder]['ozpf'] = getParams.ozpf === 'true' || getParams.ozpf === '1' ? 1 : 0; }
+    if (getParams.hasOwnProperty('ozrp') && getParams.ozrp.match(/^[0-3]$/)) { extObj[whitelabelBidder]['ozrp'] = parseInt(getParams.ozrp); }
+    if (getParams.hasOwnProperty('ozip') && getParams.ozip.match(/^\d+$/)) { extObj[whitelabelBidder]['ozip'] = parseInt(getParams.ozip); }
+    if (this.propertyBag.endpointOverride != null) { extObj[whitelabelBidder]['origin'] = this.propertyBag.endpointOverride; }
+    let userExtEids = deepAccess(validBidRequests, '0.userIdAsEids', []); // generate the UserIDs in the correct format for UserId module
     ozoneRequest.site = {
       'publisher': {'id': htmlParams.publisherId},
-      'page': document.location.href,
+      'page': getRefererInfo().page,
       'id': htmlParams.siteId
     };
-    ozoneRequest.test = (getParams.hasOwnProperty('pbjs_debug') && getParams['pbjs_debug'] == 'true') ? 1 : 0;
-
-    // this is for 2.2.1
-    // coppa compliance
+    ozoneRequest.test = config.getConfig('debug') ? 1 : 0;
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      logInfo('ADDING GDPR info');
+      let apiVersion = deepAccess(bidderRequest, 'gdprConsent.apiVersion', 1);
+      ozoneRequest.regs = {ext: {gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0, apiVersion: apiVersion}};
+      if (deepAccess(ozoneRequest, 'regs.ext.gdpr')) {
+        deepSetValue(ozoneRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      } else {
+        logInfo('**** Strange CMP info: bidderRequest.gdprConsent exists BUT bidderRequest.gdprConsent.gdprApplies is false. See bidderRequest logged above. ****');
+      }
+    } else {
+      logInfo('WILL NOT ADD GDPR info; no bidderRequest.gdprConsent object');
+    }
+    if (bidderRequest && bidderRequest.uspConsent) {
+      logInfo('ADDING USP consent info');
+      deepSetValue(ozoneRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    } else {
+      logInfo('WILL NOT ADD USP consent info; no bidderRequest.uspConsent.');
+    }
+    if (schain) { // we set this while iterating over the bids
+      logInfo('schain found');
+      deepSetValue(ozoneRequest, 'source.ext.schain', schain);
+    }
     if (config.getConfig('coppa') === true) {
-      utils.deepSetValue(ozoneRequest, 'regs.coppa', 1);
+      deepSetValue(ozoneRequest, 'regs.coppa', 1);
     }
-
-    // return the single request object OR the array:
     if (singleRequest) {
-      utils.logInfo('OZONE: buildRequests starting to generate response for a single request');
+      logInfo('buildRequests starting to generate response for a single request');
       ozoneRequest.id = bidderRequest.auctionId; // Unique ID of the bid request, provided by the exchange.
       ozoneRequest.auctionId = bidderRequest.auctionId; // not sure if this should be here?
       ozoneRequest.imp = tosendtags;
       ozoneRequest.ext = extObj;
-      ozoneRequest.source = {'tid': bidderRequest.auctionId}; // RTB 2.5 : tid is Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
-      utils.deepSetValue(ozoneRequest, 'user.ext.eids', userExtEids);
+      deepSetValue(ozoneRequest, 'source.tid', bidderRequest.auctionId);// RTB 2.5 : tid is Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
+      deepSetValue(ozoneRequest, 'user.ext.eids', userExtEids);
       var ret = {
         method: 'POST',
-        url: OZONEURI,
+        url: this.getAuctionUrl(),
         data: JSON.stringify(ozoneRequest),
         bidderRequest: bidderRequest
       };
-      utils.logInfo('OZONE: buildRequests ozoneRequest for single = ', ozoneRequest);
+      logInfo('buildRequests request data for single = ', JSON.parse(JSON.stringify(ozoneRequest)));
       this.propertyBag.buildRequestsEnd = new Date().getTime();
-      utils.logInfo(`OZONE: buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
+      logInfo(`buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
       return ret;
     }
-    // not single request - pull apart the tosendtags array & return an array of objects each containing one element in the imp array.
     let arrRet = tosendtags.map(imp => {
-      utils.logInfo('OZONE: buildRequests starting to generate non-single response, working on imp : ', imp);
+      logInfo('buildRequests starting to generate non-single response, working on imp : ', imp);
       let ozoneRequestSingle = Object.assign({}, ozoneRequest);
-      imp.ext.ozone.pageAuctionId = bidderRequest['auctionId']; // make a note in the ext object of what the original auctionId was, in the bidderRequest object
-      ozoneRequestSingle.id = imp.ext.ozone.transactionId; // Unique ID of the bid request, provided by the exchange.
-      ozoneRequestSingle.auctionId = imp.ext.ozone.transactionId; // not sure if this should be here?
+      imp.ext[whitelabelBidder].pageAuctionId = bidderRequest['auctionId']; // make a note in the ext object of what the original auctionId was, in the bidderRequest object
+      ozoneRequestSingle.id = imp.ext[whitelabelBidder].transactionId; // Unique ID of the bid request, provided by the exchange.
+      ozoneRequestSingle.auctionId = imp.ext[whitelabelBidder].transactionId; // not sure if this should be here?
       ozoneRequestSingle.imp = [imp];
       ozoneRequestSingle.ext = extObj;
-      ozoneRequestSingle.source = {'tid': imp.ext.ozone.transactionId};
-      utils.deepSetValue(ozoneRequestSingle, 'user.ext.eids', userExtEids);
-      utils.logInfo('OZONE: buildRequests ozoneRequestSingle (for non-single) = ', ozoneRequestSingle);
+      deepSetValue(ozoneRequestSingle, 'source.tid', imp.ext[whitelabelBidder].transactionId);// RTB 2.5 : tid is Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
+      deepSetValue(ozoneRequestSingle, 'user.ext.eids', userExtEids);
+      logInfo('buildRequests RequestSingle (for non-single) = ', ozoneRequestSingle);
       return {
         method: 'POST',
-        url: OZONEURI,
+        url: this.getAuctionUrl(),
         data: JSON.stringify(ozoneRequestSingle),
         bidderRequest: bidderRequest
       };
     });
     this.propertyBag.buildRequestsEnd = new Date().getTime();
-    utils.logInfo(`OZONE: buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
+    logInfo(`buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
     return arrRet;
   },
-  /**
-   * Interpret the response if the array contains BIDDER elements, in the format: [ [bidder1 bid 1, bidder1 bid 2], [bidder2 bid 1, bidder2 bid 2] ]
-   * NOte that in singleRequest mode this will be called once, else it will be called for each adSlot's response
-   *
-   * Updated April 2019 to return all bids, not just the one we decide is the 'winner'
-   *
-   * @param serverResponse
-   * @param request
-   * @returns {*}
-   */
+  getFloorObjectForAuction(bidRequestRef) {
+    const mediaTypesSizes = {
+      banner: deepAccess(bidRequestRef, 'mediaTypes.banner.sizes', null),
+      video: deepAccess(bidRequestRef, 'mediaTypes.video.playerSize', null),
+      native: deepAccess(bidRequestRef, 'mediaTypes.native.image.sizes', null)
+    }
+    logInfo('getFloorObjectForAuction mediaTypesSizes : ', mediaTypesSizes);
+    let ret = {};
+    if (mediaTypesSizes.banner) {
+      ret.banner = bidRequestRef.getFloor({mediaType: 'banner', currency: 'USD', size: mediaTypesSizes.banner});
+    }
+    if (mediaTypesSizes.video) {
+      ret.video = bidRequestRef.getFloor({mediaType: 'video', currency: 'USD', size: mediaTypesSizes.video});
+    }
+    if (mediaTypesSizes.native) {
+      ret.native = bidRequestRef.getFloor({mediaType: 'native', currency: 'USD', size: mediaTypesSizes.native});
+    }
+    logInfo('getFloorObjectForAuction returning : ', JSON.parse(JSON.stringify(ret)));
+    return ret;
+  },
   interpretResponse(serverResponse, request) {
+    if (request && request.bidderRequest && request.bidderRequest.bids) { this.loadWhitelabelData(request.bidderRequest.bids[0]); }
     let startTime = new Date().getTime();
-    utils.logInfo(`OZONE: interpretResponse time: ${startTime} . Time between buildRequests done and interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
-    utils.logInfo(`OZONE: serverResponse, request`, serverResponse, request);
+    let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
+    logInfo(`interpretResponse time: ${startTime} . Time between buildRequests done and interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
+    logInfo(`serverResponse, request`, JSON.parse(JSON.stringify(serverResponse)), JSON.parse(JSON.stringify(request)));
     serverResponse = serverResponse.body || {};
-    // note that serverResponse.id value is the auction_id we might want to use for reporting reasons.
     if (!serverResponse.hasOwnProperty('seatbid')) {
       return [];
     }
@@ -351,91 +430,108 @@ export const spec = {
       return [];
     }
     let arrAllBids = [];
-    let enhancedAdserverTargeting = config.getConfig('ozone.enhancedAdserverTargeting');
-    utils.logInfo('OZONE: enhancedAdserverTargeting', enhancedAdserverTargeting);
+    let enhancedAdserverTargeting = this.getWhitelabelConfigItem('ozone.enhancedAdserverTargeting');
+    logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
     if (typeof enhancedAdserverTargeting == 'undefined') {
       enhancedAdserverTargeting = true;
     }
-    utils.logInfo('OZONE: enhancedAdserverTargeting', enhancedAdserverTargeting);
+    logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
     serverResponse.seatbid = injectAdIdsIntoAllBidResponses(serverResponse.seatbid); // we now make sure that each bid in the bidresponse has a unique (within page) adId attribute.
     serverResponse.seatbid = this.removeSingleBidderMultipleBids(serverResponse.seatbid);
-    let ozOmpFloorDollars = config.getConfig('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
+    let ozOmpFloorDollars = this.getWhitelabelConfigItem('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
     let addOzOmpFloorDollars = typeof ozOmpFloorDollars === 'number';
-    let ozWhitelistAdserverKeys = config.getConfig('ozone.oz_whitelist_adserver_keys');
-    let useOzWhitelistAdserverKeys = utils.isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
-
+    let ozWhitelistAdserverKeys = this.getWhitelabelConfigItem('ozone.oz_whitelist_adserver_keys');
+    let useOzWhitelistAdserverKeys = isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
     for (let i = 0; i < serverResponse.seatbid.length; i++) {
       let sb = serverResponse.seatbid[i];
       for (let j = 0; j < sb.bid.length; j++) {
         let thisRequestBid = this.getBidRequestForBidId(sb.bid[j].impid, request.bidderRequest.bids);
-        utils.logInfo(`OZONE seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
+        logInfo(`seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
         const {defaultWidth, defaultHeight} = defaultSize(thisRequestBid);
         let thisBid = ozoneAddStandardProperties(sb.bid[j], defaultWidth, defaultHeight);
+        thisBid.meta = {advertiserDomains: thisBid.adomain || []};
         let videoContext = null;
         let isVideo = false;
-        let bidType = utils.deepAccess(thisBid, 'ext.prebid.type');
-        utils.logInfo(`OZONE: this bid type is : ${bidType}`, j);
+        let bidType = deepAccess(thisBid, 'ext.prebid.type');
+        logInfo(`this bid type is : ${bidType}`, j);
+        let adserverTargeting = {};
         if (bidType === VIDEO) {
           isVideo = true;
+          this.setBidMediaTypeIfNotExist(thisBid, VIDEO);
           videoContext = this.getVideoContextForBidId(thisBid.bidId, request.bidderRequest.bids); // should be instream or outstream (or null if error)
           if (videoContext === 'outstream') {
-            utils.logInfo('OZONE: going to attach a renderer to OUTSTREAM video : ', j);
+            logInfo('going to set thisBid.mediaType = VIDEO & attach a renderer to OUTSTREAM video : ', j);
             thisBid.renderer = newRenderer(thisBid.bidId);
           } else {
-            utils.logInfo('OZONE: bid is not an outstream video, will not attach a renderer: ', j);
+            logInfo('bid is not an outstream video, will set thisBid.mediaType = VIDEO and thisBid.vastUrl and not attach a renderer: ', j);
+            thisBid.vastUrl = `https://${deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_host', 'missing_host')}${deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_path', 'missing_path')}?id=${deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_id', 'missing_id')}`; // need to see if this works ok for ozone
+            adserverTargeting['hb_cache_host'] = deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_host', 'no-host');
+            adserverTargeting['hb_cache_path'] = deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_path', 'no-path');
+            if (!thisBid.hasOwnProperty('videoCacheKey')) {
+              let videoCacheUuid = deepAccess(thisBid, 'ext.prebid.targeting.hb_uuid', 'no_hb_uuid');
+              logInfo(`Adding videoCacheKey: ${videoCacheUuid}`);
+              thisBid.videoCacheKey = videoCacheUuid;
+            } else {
+              logInfo('videoCacheKey already exists on the bid object, will not add it');
+            }
           }
+        } else {
+          this.setBidMediaTypeIfNotExist(thisBid, BANNER);
         }
-        let adserverTargeting = {};
         if (enhancedAdserverTargeting) {
           let allBidsForThisBidid = ozoneGetAllBidsForBidId(thisBid.bidId, serverResponse.seatbid);
-          // add all the winning & non-winning bids for this bidId:
-          utils.logInfo('OZONE: Going to iterate allBidsForThisBidId', allBidsForThisBidid);
-          Object.keys(allBidsForThisBidid).forEach(function (bidderName, index, ar2) {
-            utils.logInfo(`OZONE: adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
-            // let bidderName = bidderNameWH.split('_')[0];
-            adserverTargeting['oz_' + bidderName] = bidderName;
-            adserverTargeting['oz_' + bidderName + '_crid'] = String(allBidsForThisBidid[bidderName].crid);
-            adserverTargeting['oz_' + bidderName + '_adv'] = String(allBidsForThisBidid[bidderName].adomain);
-            adserverTargeting['oz_' + bidderName + '_adId'] = String(allBidsForThisBidid[bidderName].adId);
-            adserverTargeting['oz_' + bidderName + '_pb_r'] = getRoundedBid(allBidsForThisBidid[bidderName].price, allBidsForThisBidid[bidderName].ext.prebid.type);
+          logInfo('Going to iterate allBidsForThisBidId', allBidsForThisBidid);
+          Object.keys(allBidsForThisBidid).forEach((bidderName, index, ar2) => {
+            logInfo(`adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName] = bidderName;
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_crid'] = String(allBidsForThisBidid[bidderName].crid);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_adv'] = String(allBidsForThisBidid[bidderName].adomain);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_adId'] = String(allBidsForThisBidid[bidderName].adId);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_pb_r'] = getRoundedBid(allBidsForThisBidid[bidderName].price, allBidsForThisBidid[bidderName].ext.prebid.type);
             if (allBidsForThisBidid[bidderName].hasOwnProperty('dealid')) {
-              adserverTargeting['oz_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
             }
             if (addOzOmpFloorDollars) {
-              adserverTargeting['oz_' + bidderName + '_omp'] = allBidsForThisBidid[bidderName].price >= ozOmpFloorDollars ? '1' : '0';
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_omp'] = allBidsForThisBidid[bidderName].price >= ozOmpFloorDollars ? '1' : '0';
             }
             if (isVideo) {
-              adserverTargeting['oz_' + bidderName + '_vid'] = videoContext; // outstream or instream
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_vid'] = videoContext; // outstream or instream
             }
-            let flr = utils.deepAccess(allBidsForThisBidid[bidderName], 'ext.bidder.ozone.floor', null);
+            let flr = deepAccess(allBidsForThisBidid[bidderName], `ext.bidder.${whitelabelBidder}.floor`, null);
             if (flr != null) {
-              adserverTargeting['oz_' + bidderName + '_flr'] = flr;
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_flr'] = flr;
             }
-            let rid = utils.deepAccess(allBidsForThisBidid[bidderName], 'ext.bidder.ozone.ruleId', null);
+            let rid = deepAccess(allBidsForThisBidid[bidderName], `ext.bidder.${whitelabelBidder}.ruleId`, null);
             if (rid != null) {
-              adserverTargeting['oz_' + bidderName + '_rid'] = rid;
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_rid'] = rid;
             }
             if (bidderName.match(/^ozappnexus/)) {
-              adserverTargeting['oz_' + bidderName + '_sid'] = String(allBidsForThisBidid[bidderName].cid);
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_sid'] = String(allBidsForThisBidid[bidderName].cid);
             }
           });
         } else {
           if (useOzWhitelistAdserverKeys) {
-            utils.logWarn('OZONE: You have set a whitelist of adserver keys but this will be ignored because ozone.enhancedAdserverTargeting is set to false. No per-bid keys will be sent to adserver.');
+            logWarn(`You have set a whitelist of adserver keys but this will be ignored because ${whitelabelBidder}.enhancedAdserverTargeting is set to false. No per-bid keys will be sent to adserver.`);
           } else {
-            utils.logInfo('OZONE: ozone.enhancedAdserverTargeting is set to false, so no per-bid keys will be sent to adserver.');
+            logInfo(`${whitelabelBidder}.enhancedAdserverTargeting is set to false, so no per-bid keys will be sent to adserver.`);
           }
         }
-        // also add in the winning bid, to be sent to dfp
         let {seat: winningSeat, bid: winningBid} = ozoneGetWinnerForRequestBid(thisBid.bidId, serverResponse.seatbid);
-        adserverTargeting['oz_auc_id'] = String(request.bidderRequest.auctionId);
-        adserverTargeting['oz_winner'] = String(winningSeat);
+        adserverTargeting[whitelabelPrefix + '_auc_id'] = String(request.bidderRequest.auctionId);
+        adserverTargeting[whitelabelPrefix + '_winner'] = String(winningSeat);
+        adserverTargeting[whitelabelPrefix + '_bid'] = 'true';
+        adserverTargeting[whitelabelPrefix + '_cache_id'] = deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_id', 'no-id');
+        adserverTargeting[whitelabelPrefix + '_uuid'] = deepAccess(thisBid, 'ext.prebid.targeting.hb_uuid', 'no-id');
         if (enhancedAdserverTargeting) {
-          adserverTargeting['oz_imp_id'] = String(winningBid.impid);
-          adserverTargeting['oz_pb_v'] = OZONEVERSION;
+          adserverTargeting[whitelabelPrefix + '_imp_id'] = String(winningBid.impid);
+          adserverTargeting[whitelabelPrefix + '_pb_v'] = OZONEVERSION;
+          adserverTargeting[whitelabelPrefix + '_pb'] = winningBid.price;
+          adserverTargeting[whitelabelPrefix + '_pb_r'] = getRoundedBid(winningBid.price, bidType);
+          adserverTargeting[whitelabelPrefix + '_adId'] = String(winningBid.adId);
+          adserverTargeting[whitelabelPrefix + '_size'] = `${winningBid.width}x${winningBid.height}`;
         }
         if (useOzWhitelistAdserverKeys) { // delete any un-whitelisted keys
-          utils.logInfo('OZONE: Going to filter out adserver targeting keys not in the whitelist: ', ozWhitelistAdserverKeys);
+          logInfo('Going to filter out adserver targeting keys not in the whitelist: ', ozWhitelistAdserverKeys);
           Object.keys(adserverTargeting).forEach(function(key) { if (ozWhitelistAdserverKeys.indexOf(key) === -1) { delete adserverTargeting[key]; } });
         }
         thisBid.adserverTargeting = adserverTargeting;
@@ -443,13 +539,24 @@ export const spec = {
       }
     }
     let endTime = new Date().getTime();
-    utils.logInfo(`OZONE: interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`, arrAllBids);
+    logInfo(`interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`);
+    logInfo('interpretResponse arrAllBids (serialised): ', JSON.parse(JSON.stringify(arrAllBids))); // this is ok to log because the renderer has not been attached yet
     return arrAllBids;
   },
-  /**
-   * If a bidder bids for > 1 size for an adslot, allow only the highest bid
-   * @param seatbid object (serverResponse.seatbid)
-   */
+  setBidMediaTypeIfNotExist(thisBid, mediaType) {
+    if (!thisBid.hasOwnProperty('mediaType')) {
+      logInfo(`setting thisBid.mediaType = ${mediaType}`);
+      thisBid.mediaType = mediaType;
+    } else {
+      logInfo(`found value for thisBid.mediaType: ${thisBid.mediaType}`);
+    }
+  },
+  getWhitelabelConfigItem(ozoneVersion) {
+    if (this.propertyBag.whitelabel.bidder === 'ozone') { return config.getConfig(ozoneVersion); }
+    let whitelabelledSearch = ozoneVersion.replace('ozone', this.propertyBag.whitelabel.bidder);
+    whitelabelledSearch = whitelabelledSearch.replace('oz_', this.propertyBag.whitelabel.keyPrefix + '_');
+    return config.getConfig(whitelabelledSearch);
+  },
   removeSingleBidderMultipleBids(seatbid) {
     var ret = [];
     for (let i = 0; i < seatbid.length; i++) {
@@ -458,7 +565,7 @@ export const spec = {
       var bidIds = [];
       for (let j = 0; j < sb.bid.length; j++) {
         var candidate = sb.bid[j];
-        if (utils.contains(bidIds, candidate.impid)) {
+        if (contains(bidIds, candidate.impid)) {
           continue; // we've already fully assessed this impid, found the highest bid from this seat for it
         }
         bidIds.push(candidate.impid);
@@ -473,44 +580,37 @@ export const spec = {
     }
     return ret;
   },
-  // see http://prebid.org/dev-docs/bidder-adaptor.html#registering-user-syncs
-  getUserSyncs(optionsType, serverResponse, gdprConsent) {
-    utils.logInfo('OZONE: getUserSyncs optionsType, serverResponse, gdprConsent, cookieSyncBag', optionsType, serverResponse, gdprConsent, this.cookieSyncBag);
+  getUserSyncs(optionsType, serverResponse, gdprConsent, usPrivacy) {
+    logInfo('getUserSyncs optionsType', optionsType, 'serverResponse', serverResponse, 'gdprConsent', gdprConsent, 'usPrivacy', usPrivacy, 'cookieSyncBag', this.cookieSyncBag);
     if (!serverResponse || serverResponse.length === 0) {
       return [];
     }
     if (optionsType.iframeEnabled) {
       var arrQueryString = [];
-      if (document.location.search.match(/pbjs_debug=true/)) {
+      if (config.getConfig('debug')) {
         arrQueryString.push('pbjs_debug=true');
       }
-      arrQueryString.push('gdpr=' + (utils.deepAccess(gdprConsent, 'gdprApplies', false) ? '1' : '0'));
-      arrQueryString.push('gdpr_consent=' + utils.deepAccess(gdprConsent, 'consentString', ''));
-      var objKeys = Object.getOwnPropertyNames(this.cookieSyncBag.userIdObject);
-      for (let idx in objKeys) {
-        let keyname = objKeys[idx];
+      arrQueryString.push('gdpr=' + (deepAccess(gdprConsent, 'gdprApplies', false) ? '1' : '0'));
+      arrQueryString.push('gdpr_consent=' + deepAccess(gdprConsent, 'consentString', ''));
+      arrQueryString.push('usp_consent=' + (usPrivacy || ''));
+      for (let keyname in this.cookieSyncBag.userIdObject) {
         arrQueryString.push(keyname + '=' + this.cookieSyncBag.userIdObject[keyname]);
       }
       arrQueryString.push('publisherId=' + this.cookieSyncBag.publisherId);
       arrQueryString.push('siteId=' + this.cookieSyncBag.siteId);
       arrQueryString.push('cb=' + Date.now());
-
+      arrQueryString.push('bidder=' + this.propertyBag.whitelabel.bidder);
       var strQueryString = arrQueryString.join('&');
       if (strQueryString.length > 0) {
         strQueryString = '?' + strQueryString;
       }
-      utils.logInfo('OZONE: getUserSyncs going to return cookie sync url : ' + OZONECOOKIESYNC + strQueryString);
+      logInfo('getUserSyncs going to return cookie sync url : ' + this.getCookieSyncUrl() + strQueryString);
       return [{
         type: 'iframe',
-        url: OZONECOOKIESYNC + strQueryString
+        url: this.getCookieSyncUrl() + strQueryString
       }];
     }
   },
-  /**
-   * Find the bid matching the bidId in the request object
-   * get instream or outstream if this was a video request else null
-   * @return object|null
-   */
   getBidRequestForBidId(bidId, arrBids) {
     for (let i = 0; i < arrBids.length; i++) {
       if (arrBids[i].bidId === bidId) { // bidId in the request comes back as impid in the seatbid bids
@@ -519,219 +619,84 @@ export const spec = {
     }
     return null;
   },
-  /**
-   * Locate the bid inside the arrBids for this bidId, then discover the video context, and return it.
-   * IF the bid cannot be found return null, else return a string.
-   * @param bidId
-   * @param arrBids
-   * @return string|null
-   */
   getVideoContextForBidId(bidId, arrBids) {
     let requestBid = this.getBidRequestForBidId(bidId, arrBids);
     if (requestBid != null) {
-      return utils.deepAccess(requestBid, 'mediaTypes.video.context', 'unknown')
+      return deepAccess(requestBid, 'mediaTypes.video.context', 'unknown')
     }
     return null;
   },
-  /**
-   *  Look for pubcid & all the other IDs according to http://prebid.org/dev-docs/modules/userId.html
-   *  @return map
-   */
   findAllUserIds(bidRequest) {
     var ret = {};
-    let searchKeysSingle = ['pubcid', 'tdid', 'id5id', 'parrableid', 'idl_env', 'digitrustid', 'criteortus'];
+    let searchKeysSingle = ['pubcid', 'tdid', 'idl_env', 'criteoId', 'lotamePanoramaId', 'fabrickId'];
     if (bidRequest.hasOwnProperty('userId')) {
       for (let arrayId in searchKeysSingle) {
         let key = searchKeysSingle[arrayId];
         if (bidRequest.userId.hasOwnProperty(key)) {
-          ret[key] = bidRequest.userId[key];
+          if (typeof (bidRequest.userId[key]) == 'string') {
+            ret[key] = bidRequest.userId[key];
+          } else if (typeof (bidRequest.userId[key]) == 'object') {
+            logError(`WARNING: findAllUserIds had to use first key in user object to get value for bid.userId key: ${key}. Prebid adapter should be updated.`);
+            ret[key] = bidRequest.userId[key][Object.keys(bidRequest.userId[key])[0]]; // cannot use Object.values
+          } else {
+            logError(`failed to get string key value for userId : ${key}`);
+          }
         }
       }
-      var lipbid = utils.deepAccess(bidRequest.userId, 'lipb.lipbid');
+      let lipbid = deepAccess(bidRequest.userId, 'lipb.lipbid');
       if (lipbid) {
         ret['lipb'] = {'lipbid': lipbid};
       }
+      let id5id = deepAccess(bidRequest.userId, 'id5id.uid');
+      if (id5id) {
+        ret['id5id'] = id5id;
+      }
+      let parrableId = deepAccess(bidRequest.userId, 'parrableId.eid');
+      if (parrableId) {
+        ret['parrableId'] = parrableId;
+      }
+      let sharedid = deepAccess(bidRequest.userId, 'sharedid.id');
+      if (sharedid) {
+        ret['sharedid'] = sharedid;
+      }
     }
     if (!ret.hasOwnProperty('pubcid')) {
-      var pubcid = utils.deepAccess(bidRequest, 'crumbs.pubcid');
+      let pubcid = deepAccess(bidRequest, 'crumbs.pubcid');
       if (pubcid) {
         ret['pubcid'] = pubcid; // if built with old pubCommonId module
       }
     }
     return ret;
   },
-  /**
-   * get all the lotame override keys/values from the querystring.
-   * @return object containing zero or more keys/values
-   */
-  getLotameOverrideParams() {
-    const arrGet = this.getGetParametersAsObject();
-    utils.logInfo('OZONE: getLotameOverrideParams - arrGet=', arrGet);
-    let arrRet = {};
-    for (let i in ALLOWED_LOTAME_PARAMS) {
-      if (arrGet.hasOwnProperty(ALLOWED_LOTAME_PARAMS[i])) {
-        arrRet[ALLOWED_LOTAME_PARAMS[i]] = arrGet[ALLOWED_LOTAME_PARAMS[i]];
-      }
-    }
-    return arrRet;
-  },
-  /**
-   * Boolean function to check that this lotame data is valid (check Audience.id)
-   */
-  isLotameDataValid(lotameObj) {
-    if (!lotameObj.hasOwnProperty('Profile')) return false;
-    let prof = lotameObj.Profile;
-    if (!prof.hasOwnProperty('tpid')) return false;
-    if (!prof.hasOwnProperty('pid')) return false;
-    let audiences = utils.deepAccess(prof, 'Audiences.Audience');
-    if (typeof audiences != 'object') {
-      return false;
-    }
-    for (var i = 0; i < audiences.length; i++) {
-      let aud = audiences[i];
-      if (!aud.hasOwnProperty('id')) {
-        return false;
-      }
-    }
-    return true; // All Audiences objects have an 'id' key
-  },
-  /**
-   * Use the arrOverride keys/vals to update the arrExisting lotame object.
-   * Ideally we will only be using the oz_lotameid value to update the audiences id, but in the event of bad/missing
-   * pid & tpid we will also have to use substitute values for those too.
-   *
-   * @param objOverride object will contain all the ALLOWED_LOTAME_PARAMS parameters
-   * @param lotameData object might be {} or contain the lotame data
-   */
-  makeLotameObjectFromOverride(objOverride, lotameData) {
-    if ((lotameData.hasOwnProperty('Profile') && Object.keys(lotameData.Profile).length < 3) ||
-      (!lotameData.hasOwnProperty('Profile'))) { // bad or empty lotame object (should contain pid, tpid & Audiences object) - build a total replacement
-      utils.logInfo('OZONE: makeLotameObjectFromOverride will return a full default lotame object');
-      return {
-        'Profile': {
-          'tpid': objOverride['oz_lotametpid'],
-          'pid': objOverride['oz_lotamepid'],
-          'Audiences': {'Audience': [{'id': objOverride['oz_lotameid'], 'abbr': objOverride['oz_lotameid']}]}
-        }
-      };
-    }
-    if (utils.deepAccess(lotameData, 'Profile.Audiences.Audience')) {
-      utils.logInfo('OZONE: makeLotameObjectFromOverride will return the existing lotame object with updated Audience by oz_lotameid');
-      lotameData.Profile.Audiences.Audience = [{'id': objOverride['oz_lotameid'], 'abbr': objOverride['oz_lotameid']}];
-      return lotameData;
-    }
-    utils.logInfo('OZONE: makeLotameObjectFromOverride Weird error - failed to find Profile.Audiences.Audience in lotame object. Will return the object as-is');
-    return lotameData;
-  },
-  /**
-   * Convenient method to get the value we need for the placementId - ONLY from the bidRequest - NOT taking into account any GET override ID
-   * @param bidRequest
-   * @return string
-   */
   getPlacementId(bidRequest) {
     return (bidRequest.params.placementId).toString();
   },
-  /**
-   * GET parameter introduced in 2.2.0 : ozstoredrequest
-   * IF the GET parameter exists then it must validate for placementId correctly
-   * IF there's a $_GET['ozstoredrequest'] & it's valid then return this. Else return null.
-   * @returns null|string
-   */
   getPlacementIdOverrideFromGetParam() {
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
     let arr = this.getGetParametersAsObject();
-    if (arr.hasOwnProperty('ozstoredrequest')) {
-      if (this.isValidPlacementId(arr.ozstoredrequest)) {
-        utils.logInfo('OZONE: using GET ozstoredrequest ' + arr.ozstoredrequest + ' to replace placementId');
-        return arr.ozstoredrequest;
+    if (arr.hasOwnProperty(whitelabelPrefix + 'storedrequest')) {
+      if (this.isValidPlacementId(arr[whitelabelPrefix + 'storedrequest'])) {
+        logInfo(`using GET ${whitelabelPrefix}storedrequest ` + arr[whitelabelPrefix + 'storedrequest'] + ' to replace placementId');
+        return arr[whitelabelPrefix + 'storedrequest'];
       } else {
-        utils.logError('OZONE: GET ozstoredrequest FAILED VALIDATION - will not use it');
+        logError(`GET ${whitelabelPrefix}storedrequest FAILED VALIDATION - will not use it`);
       }
     }
     return null;
   },
-  /**
-   * Produces external userid object
-   */
-  addExternalUserId(eids, value, source, atype) {
-    if (utils.isStr(value)) {
-      eids.push({
-        source,
-        uids: [{
-          id: value,
-          atype
-        }]
-      });
-    }
-  },
-  /**
-   * Generate an object we can append to the auction request, containing user data formatted correctly for different ssps
-   * @param validBidRequests
-   * @return {Array}
-   */
-  generateEids(validBidRequests) {
-    let eids = [];
-    this.handleTTDId(eids, validBidRequests);
-    const bidRequest = validBidRequests[0];
-    if (bidRequest && bidRequest.userId) {
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcid', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcommon', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id`), 'id5-sync.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.criteortus.${BIDDER_CODE}.userid`), 'criteortus', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.idl_env`), 'liveramp.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.lipb.lipbid`), 'liveintent.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.parrableid`), 'parrable.com', 1);
-    }
-    return eids;
-  },
-  handleTTDId(eids, validBidRequests) {
-    let ttdId = null;
-    let adsrvrOrgId = config.getConfig('adsrvrOrgId');
-    if (utils.isStr(utils.deepAccess(validBidRequests, '0.userId.tdid'))) {
-      ttdId = validBidRequests[0].userId.tdid;
-    } else if (adsrvrOrgId && utils.isStr(adsrvrOrgId.TDID)) {
-      ttdId = adsrvrOrgId.TDID;
-    }
-    if (ttdId !== null) {
-      eids.push({
-        'source': 'adserver.org',
-        'uids': [{
-          'id': ttdId,
-          'atype': 1,
-          'ext': {
-            'rtiPartner': 'TDID'
-          }
-        }]
-      });
-    }
-  },
-  // Try to use this as the mechanism for reading GET params because it's easy to mock it for tests
   getGetParametersAsObject() {
-    let items = location.search.substr(1).split('&');
-    let ret = {};
-    let tmp = null;
-    for (let index = 0; index < items.length; index++) {
-      tmp = items[index].split('=');
-      ret[tmp[0]] = tmp[1];
-    }
-    return ret;
+    let parsed = parseUrl(getRefererInfo().page);
+    logInfo('getGetParametersAsObject found:', parsed.search);
+    return parsed.search;
   },
-  /**
-   * Do we have to block this request? Could be due to config values (no longer checking gdpr)
-   * @return {boolean|*[]} true = block the request, else false
-   */
   blockTheRequest() {
-    // if there is an ozone.oz_request = false then quit now.
-    let ozRequest = config.getConfig('ozone.oz_request');
+    let ozRequest = this.getWhitelabelConfigItem('ozone.oz_request');
     if (typeof ozRequest == 'boolean' && !ozRequest) {
-      utils.logWarn('OZONE: Will not allow auction : ozone.oz_request is set to false');
+      logWarn(`Will not allow auction : ${this.propertyBag.whitelabel.keyPrefix}_request is set to false`);
       return true;
     }
     return false;
   },
-  /**
-   * This returns a random ID for this page. It starts off with the current ms timestamp then appends a random component
-   * @return {string}
-   */
   getPageId: function() {
     if (this.propertyBag.pageId == null) {
       let randPart = '';
@@ -743,48 +708,12 @@ export const spec = {
     }
     return this.propertyBag.pageId;
   },
-  /**
-   * handle the complexity of there possibly being lotameData override (may be valid/invalid) & there may or may not be lotameData present in the bidRequest
-   * NOTE THAT this will also set this.propertyBag.lotameWasOverridden=1 if we use lotame override
-   * @param ozoneBidRequest
-   * @return object representing the absolute lotameData we need to use.
-   */
-  tryGetLotameData: function(ozoneBidRequest) {
-    const arrLotameOverride = this.getLotameOverrideParams();
-    let ret = {};
-    if (Object.keys(arrLotameOverride).length === ALLOWED_LOTAME_PARAMS.length) {
-      // all override params are present, override lotame object:
-      if (ozoneBidRequest.params.hasOwnProperty('lotameData')) {
-        ret = this.makeLotameObjectFromOverride(arrLotameOverride, ozoneBidRequest.params.lotameData);
-      } else {
-        ret = this.makeLotameObjectFromOverride(arrLotameOverride, {});
-      }
-      this.propertyBag.lotameWasOverridden = 1;
-    } else if (ozoneBidRequest.params.hasOwnProperty('lotameData')) {
-      // no lotame override, use it as-is
-      if (this.isLotameDataValid(ozoneBidRequest.params.lotameData)) {
-        ret = ozoneBidRequest.params.lotameData;
-      } else {
-        utils.logError('OZONE: INVALID LOTAME DATA FOUND - WILL NOT USE THIS AT ALL ELSE IT MIGHT BREAK THE AUCTION CALL!', ozoneBidRequest.params.lotameData);
-        ret = {};
-      }
-    }
-    return ret;
-  },
   unpackVideoConfigIntoIABformat(videoConfig, childConfig) {
     let ret = {'ext': {}};
     ret = this._unpackVideoConfigIntoIABformat(ret, videoConfig);
     ret = this._unpackVideoConfigIntoIABformat(ret, childConfig);
     return ret;
   },
-  /**
-   *
-   * look in ONE object to get video config (we need to call this multiple times, so child settings override parent)
-   * @param ret
-   * @param objConfig
-   * @return {*}
-   * @private
-   */
   _unpackVideoConfigIntoIABformat(ret, objConfig) {
     let arrVideoKeysAllowed = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad', 'api', 'companiontype'];
     for (const key in objConfig) {
@@ -799,10 +728,9 @@ export const spec = {
         ret.ext[key] = objConfig[key];
       }
     }
-    // handle ext separately, if it exists; we have probably built up an ext object already
     if (objConfig.hasOwnProperty('ext') && typeof objConfig.ext === 'object') {
       if (objConfig.hasOwnProperty('ext')) {
-        ret.ext = utils.mergeDeep(ret.ext, objConfig.ext);
+        ret.ext = mergeDeep(ret.ext, objConfig.ext);
       } else {
         ret.ext = objConfig.ext;
       }
@@ -814,23 +742,14 @@ export const spec = {
     objRet = this._addVideoDefaults(objRet, childConfig, true); // child config will override parent config
     return objRet;
   },
-  /**
-   * modify objRet, adding in default values
-   * @param objRet
-   * @param objConfig
-   * @param addIfMissing
-   * @return {*}
-   * @private
-   */
   _addVideoDefaults(objRet, objConfig, addIfMissing) {
-    // add inferred values & any default values we want.
-    let context = utils.deepAccess(objConfig, 'context');
+    let context = deepAccess(objConfig, 'context');
     if (context === 'outstream') {
       objRet.placement = 3;
     } else if (context === 'instream') {
       objRet.placement = 1;
     }
-    let skippable = utils.deepAccess(objConfig, 'skippable', null);
+    let skippable = deepAccess(objConfig, 'skippable', null);
     if (skippable == null) {
       if (addIfMissing && !objRet.hasOwnProperty('skip')) {
         objRet.skip = skippable ? 1 : 0;
@@ -839,28 +758,48 @@ export const spec = {
       objRet.skip = skippable ? 1 : 0;
     }
     return objRet;
+  },
+  getLoggableBidObject(bid) {
+    let logObj = {
+      ad: bid.ad,
+      adId: bid.adId,
+      adUnitCode: bid.adUnitCode,
+      adm: bid.adm,
+      adomain: bid.adomain,
+      adserverTargeting: bid.adserverTargeting,
+      auctionId: bid.auctionId,
+      bidId: bid.bidId,
+      bidder: bid.bidder,
+      bidderCode: bid.bidderCode,
+      cpm: bid.cpm,
+      creativeId: bid.creativeId,
+      crid: bid.crid,
+      currency: bid.currency,
+      h: bid.h,
+      w: bid.w,
+      impid: bid.impid,
+      mediaType: bid.mediaType,
+      params: bid.params,
+      price: bid.price,
+      transactionId: bid.transactionId,
+      ttl: bid.ttl
+    };
+    if (bid.hasOwnProperty('floorData')) {
+      logObj.floorData = bid.floorData;
+    }
+    return logObj;
   }
 };
-
-/**
- * add a page-level-unique adId element to all server response bids.
- * NOTE that this is destructive - it mutates the serverResponse object sent in as a parameter
- * @param seatbid  object (serverResponse.seatbid)
- * @returns seatbid object
- */
 export function injectAdIdsIntoAllBidResponses(seatbid) {
-  utils.logInfo('OZONE: injectAdIdsIntoAllBidResponses', seatbid);
+  logInfo('injectAdIdsIntoAllBidResponses', seatbid);
   for (let i = 0; i < seatbid.length; i++) {
     let sb = seatbid[i];
     for (let j = 0; j < sb.bid.length; j++) {
-      // modify the bidId per-bid, so each bid has a unique adId within this response, and dfp can select one.
-      // 2020-06 we now need a second level of ID because there might be multiple identical impid's within a seatbid!
-      sb.bid[j]['adId'] = `${sb.bid[j]['impid']}-${i}-${j}`;
+      sb.bid[j]['adId'] = `${sb.bid[j]['impid']}-${i}-${spec.propertyBag.whitelabel.keyPrefix}-${j}`;
     }
   }
   return seatbid;
 }
-
 export function checkDeepArray(Arr) {
   if (Array.isArray(Arr)) {
     if (Array.isArray(Arr[0])) {
@@ -872,10 +811,9 @@ export function checkDeepArray(Arr) {
     return Arr;
   }
 }
-
 export function defaultSize(thebidObj) {
   if (!thebidObj) {
-    utils.logInfo('OZONE: defaultSize received empty bid obj! going to return fixed default size');
+    logInfo('defaultSize received empty bid obj! going to return fixed default size');
     return {
       'defaultHeight': 250,
       'defaultWidth': 300
@@ -887,13 +825,6 @@ export function defaultSize(thebidObj) {
   returnObject.defaultHeight = checkDeepArray(sizes)[1];
   return returnObject;
 }
-
-/**
- * Do the messy searching for the best bid response in the serverResponse.seatbid array matching the requestBid.bidId
- * @param requestBid
- * @param serverResponseSeatBid
- * @returns {*} bid object
- */
 export function ozoneGetWinnerForRequestBid(requestBidId, serverResponseSeatBid) {
   let thisBidWinner = null;
   let winningSeat = null;
@@ -902,7 +833,6 @@ export function ozoneGetWinnerForRequestBid(requestBidId, serverResponseSeatBid)
     let thisSeat = serverResponseSeatBid[j].seat;
     for (let k = 0; k < theseBids.length; k++) {
       if (theseBids[k].impid === requestBidId) {
-        // we've found a matching server response bid for this request bid
         if ((thisBidWinner == null) || (thisBidWinner.price < theseBids[k].price)) {
           thisBidWinner = theseBids[k];
           winningSeat = thisSeat;
@@ -913,13 +843,6 @@ export function ozoneGetWinnerForRequestBid(requestBidId, serverResponseSeatBid)
   }
   return {'seat': winningSeat, 'bid': thisBidWinner};
 }
-
-/**
- * Get a list of all the bids, for this bidId. The keys in the response object will be {seatname} OR {seatname}{w}x{h} if seatname already exists
- * @param matchBidId
- * @param serverResponseSeatBid
- * @returns {} = {ozone|320x600:{obj}, ozone|320x250:{obj}, appnexus|300x250:{obj}, ... }
- */
 export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
   let objBids = {};
   for (let j = 0; j < serverResponseSeatBid.length; j++) {
@@ -928,7 +851,6 @@ export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
     for (let k = 0; k < theseBids.length; k++) {
       if (theseBids[k].impid === matchBidId) {
         if (objBids.hasOwnProperty(thisSeat)) { // > 1 bid for an adunit from a bidder - only use the one with the highest bid
-        //   objBids[`${thisSeat}${theseBids[k].w}x${theseBids[k].h}`] = theseBids[k];
           if (objBids[thisSeat]['price'] < theseBids[k].price) {
             objBids[thisSeat] = theseBids[k];
           }
@@ -940,28 +862,19 @@ export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
   }
   return objBids;
 }
-
-/**
- * Round the bid price down according to the granularity
- * @param price
- * @param mediaType = video, banner or native
- */
 export function getRoundedBid(price, mediaType) {
   const mediaTypeGranularity = config.getConfig(`mediaTypePriceGranularity.${mediaType}`); // might be string or object or nothing; if set then this takes precedence over 'priceGranularity'
   let objBuckets = config.getConfig('customPriceBucket'); // this is always an object - {} if strBuckets is not 'custom'
   let strBuckets = config.getConfig('priceGranularity'); // priceGranularity value, always a string ** if priceGranularity is set to an object then it's always 'custom' **
   let theConfigObject = getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets);
   let theConfigKey = getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets);
-
-  utils.logInfo('OZONE: getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
-
+  logInfo('getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
   let priceStringsObj = getPriceBucketString(
     price,
     theConfigObject,
     config.getConfig('currency.granularityMultiplier')
   );
-  utils.logInfo('OZONE: priceStringsObj', priceStringsObj);
-  // by default, without any custom granularity set, you get granularity name : 'medium'
+  logInfo('priceStringsObj', priceStringsObj);
   let granularityNamePriceStringsKeyMapping = {
     'medium': 'med',
     'custom': 'custom',
@@ -971,18 +884,11 @@ export function getRoundedBid(price, mediaType) {
   };
   if (granularityNamePriceStringsKeyMapping.hasOwnProperty(theConfigKey)) {
     let priceStringsKey = granularityNamePriceStringsKeyMapping[theConfigKey];
-    utils.logInfo('OZONE: getRoundedBid: looking for priceStringsKey:', priceStringsKey);
+    logInfo('getRoundedBid: looking for priceStringsKey:', priceStringsKey);
     return priceStringsObj[priceStringsKey];
   }
   return priceStringsObj['auto'];
 }
-
-/**
- * return the key to use to get the value out of the priceStrings object, taking into account anything at
- * config.priceGranularity level or config.mediaType.xxx level
- * I've noticed that the key specified by prebid core : config.getConfig('priceGranularity') does not properly
- * take into account the 2-levels of config
- */
 export function getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets) {
   if (typeof mediaTypeGranularity === 'string') {
     return mediaTypeGranularity;
@@ -995,11 +901,6 @@ export function getGranularityKeyName(mediaType, mediaTypeGranularity, strBucket
   }
   return 'auto'; // fall back to a default key - should literally never be needed.
 }
-
-/**
- * return the object to use to create the custom value of the priceStrings object, taking into account anything at
- * config.priceGranularity level or config.mediaType.xxx level
- */
 export function getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets) {
   if (typeof mediaTypeGranularity === 'object') {
     return mediaTypeGranularity;
@@ -1009,12 +910,6 @@ export function getGranularityObject(mediaType, mediaTypeGranularity, strBuckets
   }
   return '';
 }
-
-/**
- * We expect to be able to find a standard set of properties on winning bid objects; add them here.
- * @param seatBid
- * @returns {*}
- */
 export function ozoneAddStandardProperties(seatBid, defaultWidth, defaultHeight) {
   seatBid.cpm = seatBid.price;
   seatBid.bidId = seatBid.impid;
@@ -1028,36 +923,25 @@ export function ozoneAddStandardProperties(seatBid, defaultWidth, defaultHeight)
   seatBid.ttl = 300;
   return seatBid;
 }
-
-/**
- *
- * @param objVideo will be like {"playerSize":[640,480],"mimes":["video/mp4"],"context":"outstream"} or POSSIBLY {"playerSize":[[640,480]],"mimes":["video/mp4"],"context":"outstream"}
- * @return object {w,h} or null
- */
 export function getWidthAndHeightFromVideoObject(objVideo) {
   let playerSize = getPlayerSizeFromObject(objVideo);
   if (!playerSize) {
     return null;
   }
   if (playerSize[0] && typeof playerSize[0] === 'object') {
-    utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found nested array inside playerSize.', playerSize[0]);
+    logInfo('getWidthAndHeightFromVideoObject found nested array inside playerSize.', playerSize[0]);
     playerSize = playerSize[0];
     if (typeof playerSize[0] !== 'number' && typeof playerSize[0] !== 'string') {
-      utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found non-number/string type inside the INNER array in playerSize. This is totally wrong - cannot continue.', playerSize[0]);
+      logInfo('getWidthAndHeightFromVideoObject found non-number/string type inside the INNER array in playerSize. This is totally wrong - cannot continue.', playerSize[0]);
       return null;
     }
   }
   if (playerSize.length !== 2) {
-    utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found playerSize with length of ' + playerSize.length + '. This is totally wrong - cannot continue.');
+    logInfo('getWidthAndHeightFromVideoObject found playerSize with length of ' + playerSize.length + '. This is totally wrong - cannot continue.');
     return null;
   }
   return ({'w': playerSize[0], 'h': playerSize[1]});
 }
-
-/**
- * @param objVideo will be like {"playerSize":[640,480],"mimes":["video/mp4"],"context":"outstream"} or POSSIBLY {"playerSize":[[640,480]],"mimes":["video/mp4"],"context":"outstream"}
- * @return object {w,h} or null
- */
 export function playerSizeIsNestedArray(objVideo) {
   let playerSize = getPlayerSizeFromObject(objVideo);
   if (!playerSize) {
@@ -1068,53 +952,46 @@ export function playerSizeIsNestedArray(objVideo) {
   }
   return (playerSize[0] && typeof playerSize[0] === 'object');
 }
-
-/**
- * Common functionality when looking at a video object, to get the playerSize
- * @param objVideo
- * @returns {*}
- */
 function getPlayerSizeFromObject(objVideo) {
-  utils.logInfo('OZONE: getPlayerSizeFromObject received object', objVideo);
-  let playerSize = utils.deepAccess(objVideo, 'playerSize');
+  logInfo('getPlayerSizeFromObject received object', objVideo);
+  let playerSize = deepAccess(objVideo, 'playerSize');
   if (!playerSize) {
-    playerSize = utils.deepAccess(objVideo, 'ext.playerSize');
+    playerSize = deepAccess(objVideo, 'ext.playerSize');
   }
   if (!playerSize) {
-    utils.logError('OZONE: getPlayerSizeFromObject FAILED: no playerSize in video object or ext', objVideo);
+    logError('getPlayerSizeFromObject FAILED: no playerSize in video object or ext', objVideo);
     return null;
   }
   if (typeof playerSize !== 'object') {
-    utils.logError('OZONE: getPlayerSizeFromObject FAILED: playerSize is not an object/array', objVideo);
+    logError('getPlayerSizeFromObject FAILED: playerSize is not an object/array', objVideo);
     return null;
   }
   return playerSize;
 }
-/*
-  Rendering video ads - create a renderer instance, mark it as not loaded, set a renderer function.
-  The renderer function will not assume that the renderer script is loaded - it will push() the ultimate render function call
- */
 function newRenderer(adUnitCode, rendererOptions = {}) {
+  let isLoaded = window.ozoneVideo;
+  logInfo(`newRenderer going to set loaded to ${isLoaded ? 'true' : 'false'}`);
   const renderer = Renderer.install({
-    url: OZONE_RENDERER_URL,
+    url: spec.getRendererUrl(),
     config: rendererOptions,
-    loaded: false,
+    loaded: isLoaded,
     adUnitCode
   });
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('OZONE Prebid Error calling setRender on renderer', err);
+    logError('Prebid Error when calling setRender on renderer', renderer, err);
   }
+  logInfo('returning renderer object');
   return renderer;
 }
 function outstreamRender(bid) {
-  utils.logInfo('OZONE: outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid =', bid);
-  // push to render queue because ozoneVideo may not be loaded yet
+  logInfo('outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid = (first static, then reference)');
+  logInfo(JSON.parse(JSON.stringify(spec.getLoggableBidObject(bid))));
   bid.renderer.push(() => {
+    logInfo('Going to execute window.ozoneVideo.outstreamRender');
     window.ozoneVideo.outstreamRender(bid);
   });
 }
-
 registerBidder(spec);
-utils.logInfo('OZONE: ozoneBidAdapter was loaded');
+logInfo(`*BidAdapter ${OZONEVERSION} was loaded`);
diff --git a/modules/ozoneBidAdapter.md b/modules/ozoneBidAdapter.md
index bc8cb6a6102..6f4cf752f22 100644
--- a/modules/ozoneBidAdapter.md
+++ b/modules/ozoneBidAdapter.md
@@ -37,7 +37,6 @@ adUnits = [{
                             siteId: '4204204201', /* An ID used to identify a site within a publisher account - required */
                             placementId: '0420420421', /* an ID used to identify the piece of inventory - required - for appnexus test use 13144370. */
 							customData: [{"settings": {}, "targeting": {"key": "value", "key2": ["value1", "value2"]}}],/* optional array with 'targeting' placeholder for passing publisher specific key-values for targeting. */                            
-                            lotameData: {"Profile": {"tpid":"value","pid":"value","Audiences": {"Audience":[{"id":"value"},{"id":"value2"}]}}}, /* optional JSON placeholder for passing Lotame DMP data */
                         }
                     }]
                 }];
@@ -52,7 +51,7 @@ adUnits = [{
                     code: 'id-of-your-video-div',
                     mediaTypes: {
                         video: {
-                            playerSize: [640, 480],
+                            playerSize: [640, 360],
                             mimes: ['video/mp4'],
                             context: 'outstream',
                         }
@@ -64,7 +63,6 @@ adUnits = [{
                             siteId: '4204204201', /* An ID used to identify a site within a publisher account - required */
 							customData: [{"settings": {}, "targeting": { "key": "value", "key2": ["value1", "value2"]}}]
                             placementId: '0440440442', /* an ID used to identify the piece of inventory - required - for unruly test use 0440440442. */
-                            lotameData: {"Profile": {"tpid":"value","pid":"value","Audiences": {"Audience":[{"id":"value"},{"id":"value2"}]}}}, /* optional JSON placeholder for passing Lotame DMP data */
 							video: {
                                 skippable: true, /* optional */
                                 playback_method: ['auto_play_sound_off'], /* optional */
@@ -74,3 +72,40 @@ adUnits = [{
                     }]
                 }];
 ```
+
+//Instream Video adUnit
+
+adUnits = [{
+					code: 'video1',
+					mediaTypes: {
+						video: {
+							playerSize: [640, 480],
+							context: 'instream',
+							mimes: ['video/mp4'],
+							protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+							playbackmethod: [2]
+						}
+					},
+					bids: [{
+							bidder: 'ozone',
+							params: {
+								publisherId: 'OZONENUK0001',
+								placementId: '8000000328', // or 999
+								siteId: '4204204201',
+								video: {
+									skippable: true,
+									playback_method: ['auto_play_sound_off']
+								},
+							customData: [{
+							      "settings": {},
+							      "targeting": {
+							          "key": "value",
+								  "key2": ["value1", "value2"]
+								  }
+							}
+							]
+
+							}
+						}]
+				};
+```
diff --git a/modules/padsquadBidAdapter.js b/modules/padsquadBidAdapter.js
index 24b1d5be3be..d5fe37ef34b 100644
--- a/modules/padsquadBidAdapter.js
+++ b/modules/padsquadBidAdapter.js
@@ -1,5 +1,5 @@
+import { logInfo, deepAccess } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
 import {BANNER} from '../src/mediaTypes.js';
 
 const ENDPOINT_URL = 'https://x.padsquad.com/auction';
@@ -43,9 +43,9 @@ export const spec = {
       id: bidderRequest.auctionId,
       imp: impressions,
       site: {
-        domain: window.location.hostname,
-        page: window.location.href,
-        ref: bidderRequest.refererInfo ? bidderRequest.refererInfo.referer || null : null
+        domain: bidderRequest?.refererInfo?.domain,
+        page: bidderRequest?.refererInfo?.page,
+        ref: bidderRequest?.refererInfo?.ref,
       },
       ext: {
         exchange: {
@@ -89,12 +89,12 @@ export const spec = {
         })
       })
     } else {
-      utils.logInfo('padsquad.interpretResponse :: no valid responses to interpret');
+      logInfo('padsquad.interpretResponse :: no valid responses to interpret');
     }
     return bidResponses;
   },
   getUserSyncs: function (syncOptions, serverResponses) {
-    utils.logInfo('padsquad.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses);
+    logInfo('padsquad.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses);
     let syncs = [];
 
     if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
@@ -102,7 +102,7 @@ export const spec = {
     }
 
     serverResponses.forEach(resp => {
-      const userSync = utils.deepAccess(resp, 'body.ext.usersync');
+      const userSync = deepAccess(resp, 'body.ext.usersync');
       if (userSync) {
         let syncDetails = [];
         Object.keys(userSync).forEach(key => {
diff --git a/modules/papyrusBidAdapter.js b/modules/papyrusBidAdapter.js
deleted file mode 100644
index a27c5cf618a..00000000000
--- a/modules/papyrusBidAdapter.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const PAPYRUS_ENDPOINT = 'https://prebid.papyrus.global';
-const PAPYRUS_CODE = 'papyrus';
-
-export const spec = {
-  code: PAPYRUS_CODE,
-
-  /**
-  * Determines whether or not the given bid request is valid. Valid bid request must have placementId and hbid
-  *
-  * @param {BidRequest} bid The bid params to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
-  isBidRequestValid: bid => {
-    return !!(bid && bid.params && bid.params.address && bid.params.placementId);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(validBidRequests) {
-    const bidParams = [];
-    utils._each(validBidRequests, function(bid) {
-      bidParams.push({
-        address: bid.params.address,
-        placementId: bid.params.placementId,
-        bidId: bid.bidId,
-        transactionId: bid.transactionId,
-        sizes: utils.parseSizesInput(bid.sizes)
-      });
-    });
-
-    return {
-      method: 'POST',
-      url: PAPYRUS_ENDPOINT,
-      data: bidParams
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, request) {
-    const bidResponses = [];
-
-    if (serverResponse && serverResponse.body && serverResponse.body.bids) {
-      serverResponse.body.bids.forEach(bid => {
-        const bidResponse = {
-          requestId: bid.id,
-          creativeId: bid.id,
-          adId: bid.id,
-          transactionId: bid.transactionId,
-          cpm: bid.cpm,
-          width: bid.width,
-          height: bid.height,
-          currency: bid.currency,
-          netRevenue: true,
-          ttl: 300,
-          ad: bid.ad
-        }
-        bidResponses.push(bidResponse);
-      });
-    }
-
-    return bidResponses;
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/papyrusBidAdapter.md b/modules/papyrusBidAdapter.md
deleted file mode 100644
index 98a42e542ec..00000000000
--- a/modules/papyrusBidAdapter.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Overview
-
-```
-Module Name:  Papyrus Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer:   alexander.holodov@papyrus.global
-```
-
-# Description
-
-Connect to Papyrus system for bids.
-
-Papyrus bid adapter supports Banner.
-
-Please contact to info@papyrus.global for
-further details
-
-# Test Parameters
-```
-    var adUnits = [
-    {
-        code: 'test-div',
-        mediaTypes: {
-            banner: {
-                sizes: [
-                    [320, 50]
-                ]
-            }
-        },
-        bids: [
-            {
-                bidder: 'papyrus',
-                params: {
-                    address: '0xd7e2a771c5dcd5df7f789477356aecdaeee6c985',
-                    placementId: 'b57e55fd18614b0591893e9fff41fbea'
-                }
-            }
-        ]
-    }
-    ];
-```
diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
index ec033e62983..4a777097914 100644
--- a/modules/parrableIdSystem.js
+++ b/modules/parrableIdSystem.js
@@ -5,24 +5,28 @@
  * @requires module:modules/userId
  */
 
-import * as utils from '../src/utils.js'
-import { ajax } from '../src/ajax.js';
-import { submodule } from '../src/hook.js';
-import { getRefererInfo } from '../src/refererDetection.js';
-import { uspDataHandler } from '../src/adapterManager.js';
-import { getStorageManager } from '../src/storageManager.js';
+// ci trigger: 1
+
+import {contains, deepClone, inIframe, isEmpty, isPlainObject, logError, logWarn, timestamp} from '../src/utils.js';
+import {find} from '../src/polyfill.js';
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {uspDataHandler} from '../src/adapterManager.js';
+import {getStorageManager} from '../src/storageManager.js';
 
 const PARRABLE_URL = 'https://h.parrable.com/prebid';
 const PARRABLE_COOKIE_NAME = '_parrable_id';
+const PARRABLE_GVLID = 928;
 const LEGACY_ID_COOKIE_NAME = '_parrable_eid';
 const LEGACY_OPTOUT_COOKIE_NAME = '_parrable_optout';
 const ONE_YEAR_MS = 364 * 24 * 60 * 60 * 1000;
 const EXPIRE_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:00 GMT';
 
-const storage = getStorageManager();
+const storage = getStorageManager({gvlid: PARRABLE_GVLID});
 
 function getExpirationDate() {
-  const oneYearFromNow = new Date(utils.timestamp() + ONE_YEAR_MS);
+  const oneYearFromNow = new Date(timestamp() + ONE_YEAR_MS);
   return oneYearFromNow.toGMTString();
 }
 
@@ -32,55 +36,94 @@ function deserializeParrableId(parrableIdStr) {
 
   values.forEach(function(value) {
     const pair = value.split(':');
-    // unpack a value of 1 as true
-    parrableId[pair[0]] = +pair[1] === 1 ? true : pair[1];
+    if (pair[0] === 'ccpaOptout' || pair[0] === 'ibaOptout') { // unpack a value of 0 or 1 as boolean
+      parrableId[pair[0]] = Boolean(+pair[1]);
+    } else if (!isNaN(pair[1])) { // convert to number if is a number
+      parrableId[pair[0]] = +pair[1]
+    } else {
+      parrableId[pair[0]] = pair[1]
+    }
   });
 
   return parrableId;
 }
 
-function serializeParrableId(parrableId) {
+function serializeParrableId(parrableIdAndParams) {
   let components = [];
 
-  if (parrableId.eid) {
-    components.push('eid:' + parrableId.eid);
+  if (parrableIdAndParams.eid) {
+    components.push('eid:' + parrableIdAndParams.eid);
   }
-  if (parrableId.ibaOptout) {
+  if (parrableIdAndParams.ibaOptout) {
     components.push('ibaOptout:1');
   }
-  if (parrableId.ccpaOptout) {
+  if (parrableIdAndParams.ccpaOptout) {
     components.push('ccpaOptout:1');
   }
+  if (parrableIdAndParams.tpcSupport !== undefined) {
+    const tpcSupportComponent = parrableIdAndParams.tpcSupport === true ? 'tpc:1' : 'tpc:0';
+    const tpcUntil = `tpcUntil:${parrableIdAndParams.tpcUntil}`;
+    components.push(tpcSupportComponent);
+    components.push(tpcUntil);
+  }
+  if (parrableIdAndParams.filteredUntil) {
+    components.push(`filteredUntil:${parrableIdAndParams.filteredUntil}`);
+    components.push(`filterHits:${parrableIdAndParams.filterHits}`);
+  }
 
   return components.join(',');
 }
 
 function isValidConfig(configParams) {
   if (!configParams) {
-    utils.logError('User ID - parrableId submodule requires configParams');
+    logError('User ID - parrableId submodule requires configParams');
     return false;
   }
-  if (!configParams.partner) {
-    utils.logError('User ID - parrableId submodule requires partner list');
+  if (!configParams.partners && !configParams.partner) {
+    logError('User ID - parrableId submodule requires partner list');
     return false;
   }
   if (configParams.storage) {
-    utils.logWarn('User ID - parrableId submodule does not require a storage config');
+    logWarn('User ID - parrableId submodule does not require a storage config');
   }
   return true;
 }
 
+function encodeBase64UrlSafe(base64) {
+  const ENC = {
+    '+': '-',
+    '/': '_',
+    '=': '.'
+  };
+  return base64.replace(/[+/=]/g, (m) => ENC[m]);
+}
+
 function readCookie() {
   const parrableIdStr = storage.getCookie(PARRABLE_COOKIE_NAME);
   if (parrableIdStr) {
-    return deserializeParrableId(decodeURIComponent(parrableIdStr));
+    const parsedCookie = deserializeParrableId(decodeURIComponent(parrableIdStr));
+    const { tpc, tpcUntil, filteredUntil, filterHits, ...parrableId } = parsedCookie;
+    let { eid, ibaOptout, ccpaOptout, ...params } = parsedCookie;
+
+    if ((Date.now() / 1000) >= tpcUntil) {
+      params.tpc = undefined;
+    }
+
+    if ((Date.now() / 1000) < filteredUntil) {
+      params.shouldFilter = true;
+      params.filteredUntil = filteredUntil;
+    } else {
+      params.shouldFilter = false;
+      params.filterHits = filterHits;
+    }
+    return { parrableId, params };
   }
   return null;
 }
 
-function writeCookie(parrableId) {
-  if (parrableId) {
-    const parrableIdStr = encodeURIComponent(serializeParrableId(parrableId));
+function writeCookie(parrableIdAndParams) {
+  if (parrableIdAndParams) {
+    const parrableIdStr = encodeURIComponent(serializeParrableId(parrableIdAndParams));
     storage.setCookie(PARRABLE_COOKIE_NAME, parrableIdStr, getExpirationDate(), 'lax');
   }
 }
@@ -113,27 +156,107 @@ function migrateLegacyCookies(parrableId) {
   }
 }
 
-function fetchId(configParams) {
+function shouldFilterImpression(configParams, parrableId) {
+  const config = configParams.timezoneFilter;
+
+  if (!config) {
+    return false;
+  }
+
+  if (parrableId) {
+    return false;
+  }
+
+  const offset = (new Date()).getTimezoneOffset() / 60;
+  const zone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+  function isZoneListed(list, zone) {
+    // IE does not provide a timeZone in IANA format so zone will be empty
+    const zoneLowercase = zone && zone.toLowerCase();
+    return !!(list && zone && find(list, zn => zn.toLowerCase() === zoneLowercase));
+  }
+
+  function isAllowed() {
+    if (isEmpty(config.allowedZones) &&
+      isEmpty(config.allowedOffsets)) {
+      return true;
+    }
+    if (isZoneListed(config.allowedZones, zone)) {
+      return true;
+    }
+    if (contains(config.allowedOffsets, offset)) {
+      return true;
+    }
+    return false;
+  }
+
+  function isBlocked() {
+    if (isEmpty(config.blockedZones) &&
+      isEmpty(config.blockedOffsets)) {
+      return false;
+    }
+    if (isZoneListed(config.blockedZones, zone)) {
+      return true;
+    }
+    if (contains(config.blockedOffsets, offset)) {
+      return true;
+    }
+    return false;
+  }
+
+  return isBlocked() || !isAllowed();
+}
+
+function epochFromTtl(ttl) {
+  return Math.floor((Date.now() / 1000) + ttl);
+}
+
+function incrementFilterHits(parrableId, params) {
+  params.filterHits += 1;
+  writeCookie({ ...parrableId, ...params })
+}
+
+function fetchId(configParams, gdprConsentData) {
   if (!isValidConfig(configParams)) return;
 
-  let parrableId = readCookie();
+  let { parrableId, params } = readCookie() || {};
   if (!parrableId) {
     parrableId = readLegacyCookies();
     migrateLegacyCookies(parrableId);
   }
 
-  const eid = (parrableId) ? parrableId.eid : null;
+  if (shouldFilterImpression(configParams, parrableId)) {
+    return null;
+  }
+
+  const eid = parrableId ? parrableId.eid : null;
   const refererInfo = getRefererInfo();
+  const tpcSupport = params ? params.tpc : null;
+  const shouldFilter = params ? params.shouldFilter : null;
   const uspString = uspDataHandler.getConsentData();
+  const gdprApplies = (gdprConsentData && typeof gdprConsentData.gdprApplies === 'boolean' && gdprConsentData.gdprApplies);
+  const gdprConsentString = (gdprConsentData && gdprApplies && gdprConsentData.consentString) || '';
+  const partners = configParams.partners || configParams.partner;
+  const trackers = typeof partners === 'string'
+    ? partners.split(',')
+    : partners;
 
   const data = {
     eid,
-    trackers: configParams.partner.split(','),
-    url: refererInfo.referer
+    trackers,
+    url: refererInfo.page,
+    prebidVersion: '$prebid.version$',
+    isIframe: inIframe(),
+    tpcSupport
   };
 
+  if (shouldFilter === false) {
+    data.filterHits = params.filterHits;
+  }
+
   const searchParams = {
-    data: btoa(JSON.stringify(data)),
+    data: encodeBase64UrlSafe(btoa(JSON.stringify(data))),
+    gdpr: gdprApplies ? 1 : 0,
     _rand: Math.random()
   };
 
@@ -141,6 +264,10 @@ function fetchId(configParams) {
     searchParams.us_privacy = uspString;
   }
 
+  if (gdprApplies) {
+    searchParams.gdpr_consent = gdprConsentString;
+  }
+
   const options = {
     method: 'GET',
     withCredentials: true
@@ -149,7 +276,8 @@ function fetchId(configParams) {
   const callback = function (cb) {
     const callbacks = {
       success: response => {
-        let newParrableId = parrableId ? utils.deepClone(parrableId) : {};
+        let newParrableId = parrableId ? deepClone(parrableId) : {};
+        let newParams = {};
         if (response) {
           try {
             let responseObj = JSON.parse(response);
@@ -163,31 +291,44 @@ function fetchId(configParams) {
               if (responseObj.ibaOptout === true) {
                 newParrableId.ibaOptout = true;
               }
+              if (responseObj.tpcSupport !== undefined) {
+                newParams.tpcSupport = responseObj.tpcSupport;
+                newParams.tpcUntil = epochFromTtl(responseObj.tpcSupportTtl);
+              }
+              if (responseObj.filterTtl) {
+                newParams.filteredUntil = epochFromTtl(responseObj.filterTtl);
+                newParams.filterHits = 0;
+              }
             }
           } catch (error) {
-            utils.logError(error);
+            logError(error);
             cb();
           }
-          writeCookie(newParrableId);
+          writeCookie({ ...newParrableId, ...newParams });
           cb(newParrableId);
         } else {
-          utils.logError('parrableId: ID fetch returned an empty result');
+          logError('parrableId: ID fetch returned an empty result');
           cb();
         }
       },
       error: error => {
-        utils.logError(`parrableId: ID fetch encountered an error`, error);
+        logError(`parrableId: ID fetch encountered an error`, error);
         cb();
       }
     };
-    ajax(PARRABLE_URL, callbacks, searchParams, options);
+
+    if (shouldFilter) {
+      incrementFilterHits(parrableId, params);
+    } else {
+      ajax(PARRABLE_URL, callbacks, searchParams, options);
+    }
   };
 
   return {
     callback,
     id: parrableId
   };
-};
+}
 
 /** @type {Submodule} */
 export const parrableIdSubmodule = {
@@ -196,6 +337,12 @@ export const parrableIdSubmodule = {
    * @type {string}
    */
   name: 'parrableId',
+  /**
+   * Global Vendor List ID
+   * @type {number}
+   */
+  gvlid: PARRABLE_GVLID,
+
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -203,8 +350,8 @@ export const parrableIdSubmodule = {
    * @return {(Object|undefined}
    */
   decode(parrableId) {
-    if (parrableId && utils.isPlainObject(parrableId)) {
-      return { 'parrableid': parrableId.eid };
+    if (parrableId && isPlainObject(parrableId)) {
+      return { parrableId };
     }
     return undefined;
   },
@@ -212,12 +359,13 @@ export const parrableIdSubmodule = {
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
    * @returns {function(callback:function), id:ParrableId}
    */
-  getId(configParams, gdprConsentData, currentStoredId) {
-    return fetchId(configParams);
+  getId(config, gdprConsentData, currentStoredId) {
+    const configParams = (config && config.params) || {};
+    return fetchId(configParams, gdprConsentData);
   }
 };
 
diff --git a/modules/peak226BidAdapter.md b/modules/peak226BidAdapter.md
deleted file mode 100644
index bae15d6c99f..00000000000
--- a/modules/peak226BidAdapter.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Overview
-
-```
-Module Name: Peak226 Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: support@edge226.com
-```
-
-# Description
-
-Module that connects to Peak226's demand sources
-
-# Test Parameters
-
-```
-    var adUnits = [
-        {
-            code: "test-div",
-            sizes: [[300, 250]],
-            mediaType: "banner",
-            bids: [
-                {
-                    bidder: "peak226",
-                    params: {
-                        uid: 76131369
-                    }
-                }
-            ]
-        }
-    ];
-```
diff --git a/modules/permutiveRtdProvider.js b/modules/permutiveRtdProvider.js
new file mode 100644
index 00000000000..d62834cfcfc
--- /dev/null
+++ b/modules/permutiveRtdProvider.js
@@ -0,0 +1,397 @@
+/**
+ * This module adds permutive provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will add custom segment targeting to ad units of specific bidders
+ * @module modules/permutiveRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {getGlobal} from '../src/prebidGlobal.js';
+import {submodule} from '../src/hook.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {deepAccess, deepSetValue, isFn, logError, mergeDeep, isPlainObject, safeJSONParse} from '../src/utils.js';
+import {includes} from '../src/polyfill.js';
+
+const MODULE_NAME = 'permutive'
+
+export const PERMUTIVE_SUBMODULE_CONFIG_KEY = 'permutive-prebid-rtd'
+export const PERMUTIVE_STANDARD_AUD_KEYWORD = 'p_standard_aud'
+
+export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME})
+
+function init(moduleConfig, userConsent) {
+  readPermutiveModuleConfigFromCache()
+
+  return true
+}
+
+/**
+ * Set segment targeting from cache and then try to wait for Permutive
+ * to initialise to get realtime segment targeting
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback - Called when submodule is done
+ * @param {customModuleConfig} reqBidsConfigObj - Publisher config for module
+ */
+export function initSegments (reqBidsConfigObj, callback, customModuleConfig) {
+  const permutiveOnPage = isPermutiveOnPage()
+  const moduleConfig = getModuleConfig(customModuleConfig)
+  const segmentData = getSegments(moduleConfig.params.maxSegs)
+
+  setSegments(reqBidsConfigObj, moduleConfig, segmentData)
+
+  if (moduleConfig.waitForIt && permutiveOnPage) {
+    window.permutive.ready(function () {
+      setSegments(reqBidsConfigObj, moduleConfig, segmentData)
+      callback()
+    }, 'realtime')
+  } else {
+    callback()
+  }
+}
+
+function liftIntoParams(params) {
+  return isPlainObject(params) ? { params } : {}
+}
+
+let cachedPermutiveModuleConfig = {}
+
+/**
+ * Access the submodules RTD params that are cached to LocalStorage by the Permutive SDK. This lets the RTD submodule
+ * apply publisher defined params set in the Permutive platform, so they may still be applied if the Permutive SDK has
+ * not initialised before this submodule is initialised.
+ */
+function readPermutiveModuleConfigFromCache() {
+  const params = safeJSONParse(storage.getDataFromLocalStorage(PERMUTIVE_SUBMODULE_CONFIG_KEY))
+  return cachedPermutiveModuleConfig = liftIntoParams(params)
+}
+
+/**
+ * Access the submodules RTD params attached to the Permutive SDK.
+ *
+ * @return The Permutive config available by the Permutive SDK or null if the operation errors.
+ */
+function getParamsFromPermutive() {
+  try {
+    return liftIntoParams(window.permutive.addons.prebid.getPermutiveRtdConfig())
+  } catch (e) {
+    return null
+  }
+}
+
+/**
+ * Merges segments into existing bidder config in reverse priority order. The highest priority is 1.
+ *
+ *   1. customModuleConfig <- set by publisher with pbjs.setConfig
+ *   2. permutiveRtdConfig <- set by the publisher using the Permutive platform
+ *   3. defaultConfig
+ *
+ * As items with a higher priority will be deeply merged into the previous config, deep merges are performed by
+ * reversing the priority order.
+ *
+ * @param {Object} customModuleConfig - Publisher config for module
+ * @return {Object} Deep merges of the default, Permutive and custom config.
+ */
+export function getModuleConfig(customModuleConfig) {
+  // Use the params from Permutive if available, otherwise fallback to the cached value set by Permutive.
+  const permutiveModuleConfig = getParamsFromPermutive() || cachedPermutiveModuleConfig
+
+  return mergeDeep({
+    waitForIt: false,
+    params: {
+      maxSegs: 500,
+      acBidders: [],
+      overwrites: {},
+    },
+  },
+  permutiveModuleConfig,
+  customModuleConfig,
+  )
+}
+
+/**
+ * Sets ortb2 config for ac bidders
+ * @param {Object} bidderOrtb2
+ * @param {Object} customModuleConfig - Publisher config for module
+ */
+export function setBidderRtb (bidderOrtb2, customModuleConfig) {
+  const moduleConfig = getModuleConfig(customModuleConfig)
+  const acBidders = deepAccess(moduleConfig, 'params.acBidders')
+  const maxSegs = deepAccess(moduleConfig, 'params.maxSegs')
+  const transformationConfigs = deepAccess(moduleConfig, 'params.transformations') || []
+  const segmentData = getSegments(maxSegs)
+
+  const ssps = segmentData?.ssp?.ssps ?? []
+  const sspCohorts = segmentData?.ssp?.cohorts ?? []
+
+  const bidders = new Set([...acBidders, ...ssps])
+  bidders.forEach(function (bidder) {
+    const currConfig = { ortb2: bidderOrtb2[bidder] || {} }
+
+    const isAcBidder = acBidders.indexOf(bidder) > -1
+    const isSspBidder = ssps.indexOf(bidder) > -1
+
+    let cohorts = []
+    if (isAcBidder) cohorts = segmentData.ac
+    if (isSspBidder) cohorts = [...new Set([...cohorts, ...sspCohorts])].slice(0, maxSegs)
+
+    const nextConfig = updateOrtbConfig(currConfig, cohorts, sspCohorts, transformationConfigs)
+    bidderOrtb2[bidder] = nextConfig.ortb2;
+  })
+}
+
+/**
+ * Updates `user.data` object in existing bidder config with Permutive segments
+ * @param {Object} currConfig - Current bidder config
+ * @param {Object[]} transformationConfigs - array of objects with `id` and `config` properties, used to determine
+ *                                           the transformations on user data to include the ORTB2 object
+ * @param {string[]} segmentIDs - Permutive segment IDs
+ * @param {string[]} sspSegmentIDs - Permutive SSP segment IDs
+ * @return {Object} Merged ortb2 object
+ */
+function updateOrtbConfig (currConfig, segmentIDs, sspSegmentIDs, transformationConfigs) {
+  const name = 'permutive.com'
+
+  const permutiveUserData = {
+    name,
+    segment: segmentIDs.map(segmentId => ({ id: segmentId })),
+  }
+
+  const transformedUserData = transformationConfigs
+    .filter(({ id }) => ortb2UserDataTransformations.hasOwnProperty(id))
+    .map(({ id, config }) => ortb2UserDataTransformations[id](permutiveUserData, config))
+
+  const ortbConfig = mergeDeep({}, currConfig)
+  const currentUserData = deepAccess(ortbConfig, 'ortb2.user.data') || []
+
+  const updatedUserData = currentUserData
+    .filter(el => el.name !== name)
+    .concat(permutiveUserData, transformedUserData)
+
+  deepSetValue(ortbConfig, 'ortb2.user.data', updatedUserData)
+
+  // As of writing this, only used for AppNexus/Xandr in place of appnexusAuctionKeywords in config
+  const currentUserKeywords = deepAccess(ortbConfig, 'ortb2.user.keywords') || ''
+  const keywords = sspSegmentIDs.map(segment => `${PERMUTIVE_STANDARD_AUD_KEYWORD}=${segment}`).join(',')
+  const updatedUserKeywords = (currentUserKeywords === '') ? keywords : `${currentUserKeywords},${keywords}`
+  deepSetValue(ortbConfig, 'ortb2.user.keywords', updatedUserKeywords)
+
+  return ortbConfig
+}
+
+/**
+ * Set segments on bid request object
+ * @param {Object} reqBidsConfigObj - Bid request object
+ * @param {Object} moduleConfig - Module configuration
+ * @param {Object} segmentData - Segment object
+ */
+function setSegments (reqBidsConfigObj, moduleConfig, segmentData) {
+  const adUnits = (reqBidsConfigObj && reqBidsConfigObj.adUnits) || getGlobal().adUnits
+  const utils = { deepSetValue, deepAccess, isFn, mergeDeep }
+  const aliasMap = {
+    appnexusAst: 'appnexus'
+  }
+
+  if (!adUnits) {
+    return
+  }
+
+  adUnits.forEach(adUnit => {
+    adUnit.bids.forEach(bid => {
+      let { bidder } = bid
+      if (typeof aliasMap[bidder] !== 'undefined') {
+        bidder = aliasMap[bidder]
+      }
+      const acEnabled = isAcEnabled(moduleConfig, bidder)
+      const customFn = getCustomBidderFn(moduleConfig, bidder)
+      const defaultFn = getDefaultBidderFn(bidder)
+
+      if (customFn) {
+        customFn(bid, segmentData, acEnabled, utils, defaultFn)
+      } else if (defaultFn) {
+        defaultFn(bid, segmentData, acEnabled)
+      }
+    })
+  })
+}
+
+/**
+ * Catch and log errors
+ * @param {function} fn - Function to safely evaluate
+ */
+function makeSafe (fn) {
+  try {
+    fn()
+  } catch (e) {
+    logError(e)
+  }
+}
+
+function getCustomBidderFn (moduleConfig, bidder) {
+  const overwriteFn = deepAccess(moduleConfig, `params.overwrites.${bidder}`)
+
+  if (overwriteFn && isFn(overwriteFn)) {
+    return overwriteFn
+  } else {
+    return null
+  }
+}
+
+/**
+ * Returns a function that receives a `bid` object, a `data` object and a `acEnabled` boolean
+ * and which will set the right segment targeting keys for `bid` based on `data` and `acEnabled`
+ * @param {string} bidder - Bidder name
+ * @return {Object} Bidder function
+ */
+function getDefaultBidderFn (bidder) {
+  const isPStandardTargetingEnabled = (data, acEnabled) => {
+    return (acEnabled && data.ac && data.ac.length) || (data.ssp && data.ssp.cohorts.length)
+  }
+  const pStandardTargeting = (data, acEnabled) => {
+    const ac = (acEnabled) ? (data.ac ?? []) : []
+    const ssp = data?.ssp?.cohorts ?? []
+    return [...new Set([...ac, ...ssp])]
+  }
+  const bidderMap = {
+    appnexus: function (bid, data, acEnabled) {
+      if (isPStandardTargetingEnabled(data, acEnabled)) {
+        const segments = pStandardTargeting(data, acEnabled)
+        deepSetValue(bid, 'params.keywords.p_standard', segments)
+      }
+      if (data.appnexus && data.appnexus.length) {
+        deepSetValue(bid, 'params.keywords.permutive', data.appnexus)
+      }
+
+      return bid
+    },
+    rubicon: function (bid, data, acEnabled) {
+      if (isPStandardTargetingEnabled(data, acEnabled)) {
+        const segments = pStandardTargeting(data, acEnabled)
+        deepSetValue(bid, 'params.visitor.p_standard', segments)
+      }
+      if (data.rubicon && data.rubicon.length) {
+        deepSetValue(bid, 'params.visitor.permutive', data.rubicon.map(String))
+      }
+
+      return bid
+    },
+    ozone: function (bid, data, acEnabled) {
+      if (isPStandardTargetingEnabled(data, acEnabled)) {
+        const segments = pStandardTargeting(data, acEnabled)
+        deepSetValue(bid, 'params.customData.0.targeting.p_standard', segments)
+      }
+
+      return bid
+    }
+  }
+
+  return bidderMap[bidder]
+}
+
+/**
+ * Check whether ac is enabled for bidder
+ * @param {Object} moduleConfig - Module configuration
+ * @param {string} bidder - Bidder name
+ * @return {boolean}
+ */
+export function isAcEnabled (moduleConfig, bidder) {
+  const acBidders = deepAccess(moduleConfig, 'params.acBidders') || []
+  return includes(acBidders, bidder)
+}
+
+/**
+ * Check whether Permutive is on page
+ * @return {boolean}
+ */
+export function isPermutiveOnPage () {
+  return typeof window.permutive !== 'undefined' && typeof window.permutive.ready === 'function'
+}
+
+/**
+ * Get all relevant segment IDs in an object
+ * @param {number} maxSegs - Maximum number of segments to be included
+ * @return {Object}
+ */
+export function getSegments (maxSegs) {
+  const legacySegs = readSegments('_psegs').map(Number).filter(seg => seg >= 1000000).map(String)
+  const _ppam = readSegments('_ppam')
+  const _pcrprs = readSegments('_pcrprs')
+
+  const segments = {
+    ac: [..._pcrprs, ..._ppam, ...legacySegs],
+    rubicon: readSegments('_prubicons'),
+    appnexus: readSegments('_papns'),
+    gam: readSegments('_pdfps'),
+    ssp: readSegments('_pssps'),
+  }
+
+  for (const bidder in segments) {
+    if (bidder === 'ssp') {
+      if (segments[bidder].cohorts && Array.isArray(segments[bidder].cohorts)) {
+        segments[bidder].cohorts = segments[bidder].cohorts.slice(0, maxSegs)
+      }
+    } else {
+      segments[bidder] = segments[bidder].slice(0, maxSegs)
+    }
+  }
+
+  return segments
+}
+
+/**
+ * Gets an array of segment IDs from LocalStorage
+ * or returns an empty array
+ * @param {string} key
+ * @return {string[]|number[]}
+ */
+function readSegments (key) {
+  try {
+    return JSON.parse(storage.getDataFromLocalStorage(key) || '[]')
+  } catch (e) {
+    return []
+  }
+}
+
+const unknownIabSegmentId = '_unknown_'
+
+/**
+ * Functions to apply to ORT2B2 `user.data` objects.
+ * Each function should return an a new object containing a `name`, (optional) `ext` and `segment`
+ * properties. The result of the each transformation defined here will be appended to the array
+ * under `user.data` in the bid request.
+ */
+const ortb2UserDataTransformations = {
+  iab: (userData, config) => ({
+    name: userData.name,
+    ext: { segtax: config.segtax },
+    segment: (userData.segment || [])
+      .map(segment => ({ id: iabSegmentId(segment.id, config.iabIds) }))
+      .filter(segment => segment.id !== unknownIabSegmentId)
+  })
+}
+
+/**
+ * Transform a Permutive segment ID into an IAB audience taxonomy ID.
+ * @param {string} permutiveSegmentId
+ * @param {Object} iabIds object of mappings between Permutive and IAB segment IDs (key: permutive ID, value: IAB ID)
+ * @return {string} IAB audience taxonomy ID associated with the Permutive segment ID
+ */
+function iabSegmentId(permutiveSegmentId, iabIds) {
+  return iabIds[permutiveSegmentId] || unknownIabSegmentId
+}
+
+/** @type {RtdSubmodule} */
+export const permutiveSubmodule = {
+  name: MODULE_NAME,
+  getBidRequestData: function (reqBidsConfigObj, callback, customModuleConfig) {
+    makeSafe(function () {
+      // Legacy route with custom parameters
+      initSegments(reqBidsConfigObj, callback, customModuleConfig)
+    });
+    makeSafe(function () {
+      // Route for bidders supporting ORTB2
+      setBidderRtb(reqBidsConfigObj.ortb2Fragments?.bidder, customModuleConfig)
+    })
+  },
+  init: init
+}
+
+submodule('realTimeData', permutiveSubmodule)
diff --git a/modules/permutiveRtdProvider.md b/modules/permutiveRtdProvider.md
new file mode 100644
index 00000000000..7d8f073357c
--- /dev/null
+++ b/modules/permutiveRtdProvider.md
@@ -0,0 +1,183 @@
+## Prebid Config for Permutive RTD Module
+
+This module reads cohorts from Permutive and attaches them as targeting keys to bid requests.
+
+### _Permutive Real-time Data Submodule_
+
+#### Usage
+Compile the Permutive RTD module into your Prebid build:
+
+```
+gulp build --modules=rtdModule,permutiveRtdProvider
+```
+
+> Note that the global RTD module, `rtdModule`, is a prerequisite of the Permutive RTD module.
+
+You then need to enable the Permutive RTD in your Prebid configuration, using the below format:
+
+```javascript
+pbjs.setConfig({
+  ...,
+  realTimeData: {
+    auctionDelay: 50, // optional auction delay
+    dataProviders: [{
+      name: 'permutive',
+      waitForIt: true, // should be true if there's an `auctionDelay`
+      params: {
+        acBidders: ['appnexus']
+      }
+    }]
+  },
+  ...
+})
+```
+
+#### Parameters
+
+The parameters below provide configurability for general behaviours of the RTD submodule,
+as well as enabling settings for specific use cases mentioned above (e.g. acbidders).
+
+| Name                   | Type     | Description                                                                                   | Default |
+|------------------------|----------|-----------------------------------------------------------------------------------------------|---------|
+| name                   | String   | This should always be `permutive`                                                             | -       |
+| waitForIt              | Boolean  | Should be `true` if there's an `auctionDelay` defined (optional)                              | `false` |
+| params                 | Object   |                                                                                               | -       |
+| params.acBidders       | String[] | An array of bidders which should receive AC cohorts.                                          | `[]`    |
+| params.maxSegs         | Integer  | Maximum number of cohorts to be included in either the `permutive` or `p_standard` key-value. | `500`   |
+| params.transformations | Object[] | An array of configurations for ORTB2 user data transformations                                |         |
+| params.overwrites      | Object   | An object specifying functions for custom targeting logic for bidders.                        | -       |
+
+##### The `transformations` parameter
+
+This array contains configurations for transformations we'll apply to the Permutive object in the ORTB2 `user.data` array. The results of these transformations will be appended to the `user.data` array that's attached to ORTB2 bid requests.
+
+###### Supported transformations
+
+| Name           | ID  | Config structure                                  | Description                                                                          |
+|----------------|-----|---------------------------------------------------|--------------------------------------------------------------------------------------|
+| IAB taxonomies | iab | { segtax: number, iabIds: Object<number, number>} | Transform segment IDs from Permutive to IAB (note: alpha version, subject to change) |
+
+##### The `overwrites` parameter
+
+The keys for this object should match a bidder (e.g. `rubicon`), which then can define a function to overwrite the customer targeting logic.
+
+```javascript
+{
+  params: {
+    overwrites: {
+      rubicon: function customTargeting(bid, data, acEnabled, utils, defaultFn) {
+        if (defaultFn) {
+          bid = defaultFn(bid, data, acEnabled)
+        }
+        if (data.gam && data.gam.length) {
+          utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+        }
+      } 
+    }
+  }
+}
+```
+
+###### `customTargeting` function parameters
+
+| Name         | Description                                                                    |
+|--------------|--------------------------------------------------------------------------------|
+| `bid`        | The bid request object.                                                        |
+| `data`       | Permutive's targeting data read from localStorage.                             |
+| `acEnabled`  | Boolean stating whether Audience Connect is enabled via `acBidders`.           |
+| `utils`      | An object of helpful utilities. `(deepSetValue, deepAccess, isFn, mergeDeep)`. |
+| `defaultFn`  | The default targeting function.                                                |
+
+
+
+
+#### Context
+
+Permutive is not listed as a TCF vendor as all data collection is on behalf of the publisher and based on consent the publisher has received from the user.
+Rather than through the TCF framework, this consent is provided to Permutive when the user gives the relevant permissions on the publisher website which allow the Permutive SDK to run.
+This means that if GDPR enforcement is configured _and_ the user consent isn’t given for Permutive to fire, no cohorts will populate.
+As Prebid utilizes TCF vendor consent, for the Permutive RTD module to load, Permutive needs to be labeled within the Vendor Exceptions
+
+#### Instructions
+
+1. Publisher enables GDPR rules within Prebid.
+2. Label Permutive as an exception, as shown below.
+```javascript
+[
+  {
+    purpose: 'storage',
+    enforcePurpose: true,
+    enforceVendor: true,
+    vendorExceptions: ["permutive"]
+  },
+  {
+    purpose: 'basicAds',
+    enforcePurpose: true,
+    enforceVendor: true,
+    vendorExceptions: []
+  }
+]
+```
+
+Before making any updates to this configuration, please ensure that this approach aligns with internal policies and current regulations regarding consent.
+
+## Cohort Activation with Permutive RTD Module
+
+### _Enabling Standard Cohorts_
+
+**Note**: Publishers must be enabled on the above Permutive RTD Submodule to enable Standard Cohorts.
+
+The acbidders config in the Permutive RTD module allows publishers to determine which demand partners (SSPs) will receive standard cohorts via the <u>user.data</u> ortb2 object. Cohorts will be sent in the `p_standard` key-value.
+
+The Permutive RTD module sets standard cohort IDs as bidder-specific ortb2.user.data first-party data, following the Prebid ortb2 convention.
+
+There are **two** ways to assign which demand partner bidders (e.g. SSPs) will receive Standard Cohort information via the Audience Connector (acbidders) config:
+
+#### Option 1 - Automated
+
+New demand partner bidders may be added to the acbidders config directly within the Permutive Platform.
+
+**Permutive can do this on your behalf**. Simply contact your Permutive CSM with strategicpartnershipops@permutive.com on cc,
+indicating which bidders you would like added.
+
+Or, a publisher may do this themselves within the UI using the below instructions.
+
+##### Create Integration
+
+In order to update acbidders via the Permutive dashboard,
+it is necessary to first enable the prebid integration in the integrations page (settings).
+
+**Note on Revenue Insights:** The prebid integration includes a feature for revenue insights,
+which is not required for the purpose of updating acbidders config.
+Please see [this document](https://support.permutive.com/hc/en-us/articles/360019044079-Revenue-Insights) for more information about revenue insights.
+
+##### Update acbidders
+
+The input for the “Data Provider config” is currently a multi-input free text.
+A valid “bidder code” needs to be entered in order to enable Standard Cohorts to be passed to the desired partner.
+The [prebid Bidders page](https://docs.prebid.org/dev-docs/bidders.html) contains instructions and a link to a list of possible bidder codes.
+
+Acbidders can be added or removed from the list using this feature, however, this will not impact any acbidders that have been applied using the manual method below.
+
+#### Option 2 - Manual
+
+As a secondary option, new demand partner bidders may be added manually.
+
+To do so, a Publisher may define which bidders should receive Standard Cohorts by
+including the _bidder code_ of any bidder in the `acBidders` array.
+
+**Note:** If a Publisher ever needs to remove a manually-added bidder, the bidder will also need to be removed manually.
+
+### _Enabling Custom Cohort IDs for Targeting_
+
+Separately from Standard Cohorts - The Permutive RTD module also supports passing any of the **custom** cohorts created in the dashboard to some SSP partners for targeting
+e.g. setting up publisher deals. For these activations, cohort IDs are set in bidder-specific locations per ad unit (custom parameters).
+
+Currently, bidders with known support for custom cohort targeting are:
+
+- Xandr
+- Magnite
+
+When enabling the respective Activation for a cohort in Permutive, this module will automatically attach that cohort ID to the bid request.
+There is no need to enable individual bidders in the module configuration, it will automatically reflect which SSP integrations you have enabled in your Permutive dashboard.
+Permutive cohorts will be sent in the permutive key-value.
diff --git a/modules/pianoDmpAnalyticcsAdapter.md b/modules/pianoDmpAnalyticcsAdapter.md
new file mode 100644
index 00000000000..9bdcaaf0c7a
--- /dev/null
+++ b/modules/pianoDmpAnalyticcsAdapter.md
@@ -0,0 +1,13 @@
+# Overview
+
+Module Name: Piano DMP Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: [support@piano.com](mailto:support@piano.com)
+
+# Description
+
+Analytics adapter to be used with cx.js
+
+Visit [https://piano.io/product/dmp/](https://piano.io/product/dmp/) for more information.
diff --git a/modules/pianoDmpAnalyticsAdapter.js b/modules/pianoDmpAnalyticsAdapter.js
new file mode 100644
index 00000000000..47159475b5d
--- /dev/null
+++ b/modules/pianoDmpAnalyticsAdapter.js
@@ -0,0 +1,38 @@
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+
+const pianoDmpAnalytics = adapter({ analyticsType: 'bundle', handler: 'on' });
+
+const { enableAnalytics: _enableAnalytics } = pianoDmpAnalytics;
+
+Object.assign(pianoDmpAnalytics, {
+  /**
+   * Save event in the global array that will be consumed later by cx.js
+   */
+  track: ({ eventType, args: params }) => {
+    window.cX.callQueue.push([
+      'prebid',
+      { eventType, params, time: Date.now() },
+    ]);
+  },
+
+  /**
+   * Before forwarding the call to the original enableAnalytics function -
+   * create (if needed) the global array that is used to pass events to the cx.js library
+   * by the 'track' function above.
+   */
+  enableAnalytics: function (...args) {
+    window.cX = window.cX || {};
+    window.cX.callQueue = window.cX.callQueue || [];
+
+    return _enableAnalytics.call(this, ...args);
+  },
+});
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: pianoDmpAnalytics,
+  code: 'pianoDmp',
+  gvlid: 412,
+});
+
+export default pianoDmpAnalytics;
diff --git a/modules/pilotxBidAdapter.js b/modules/pilotxBidAdapter.js
new file mode 100644
index 00000000000..335c461e3d9
--- /dev/null
+++ b/modules/pilotxBidAdapter.js
@@ -0,0 +1,147 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+const BIDDER_CODE = 'pilotx';
+const ENDPOINT_URL = '//adn.pilotx.tv/hb'
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: ['banner', 'video'],
+  aliases: ['pilotx'], // short code
+  /**
+         * Determines whether or not the given bid request is valid.
+         *
+         * @param {BidRequest} bid The bid params to validate.
+         * @return boolean True if this is a valid bid, and false otherwise.
+         */
+  isBidRequestValid: function (bid) {
+    let sizesCheck = !!bid.sizes
+    let paramSizesCheck = !!bid.params.sizes
+    var sizeConfirmed = false
+    if (sizesCheck) {
+      if (bid.sizes.length < 1) {
+        return false
+      } else {
+        sizeConfirmed = true
+      }
+    }
+    if (paramSizesCheck) {
+      if (bid.params.sizes.length < 1 && !sizeConfirmed) {
+        return false
+      } else {
+        sizeConfirmed = true
+      }
+    }
+    if (!sizeConfirmed) {
+      return false
+    }
+    return !!(bid.params.placementId);
+  },
+  /**
+         * Make a server request from the list of BidRequests.
+         *
+         * @param {validBidRequests[]} - an array of bids
+         * @return ServerRequest Info describing the request to the server.
+         */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let payloadItems = {};
+    validBidRequests.forEach(bidRequest => {
+      let sizes = [];
+      let placementId = this.setPlacementID(bidRequest.params.placementId)
+      payloadItems[placementId] = {}
+      if (bidRequest.sizes.length > 0) {
+        if (Array.isArray(bidRequest.sizes[0])) {
+          for (let i = 0; i < bidRequest.sizes.length; i++) {
+            sizes[i] = [(bidRequest.sizes[i])[0], (bidRequest.sizes[i])[1]]
+          }
+        } else {
+          sizes[0] = [bidRequest.sizes[0], bidRequest.sizes[1]]
+        }
+        payloadItems[placementId]['sizes'] = sizes
+      }
+      if (bidRequest.mediaTypes != null) {
+        for (let i in bidRequest.mediaTypes) {
+          payloadItems[placementId][i] = {
+            ...bidRequest.mediaTypes[i]
+          }
+        }
+      }
+      let consentTemp = ''
+      let consentRequiredTemp = false
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        consentTemp = bidderRequest.gdprConsent.consentString
+        // will check if the gdprApplies field was populated with a boolean value (ie from page config).  If it's undefined, then default to true
+        consentRequiredTemp = (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
+      }
+
+      payloadItems[placementId]['gdprConsentString'] = consentTemp
+      payloadItems[placementId]['gdprConsentRequired'] = consentRequiredTemp
+      payloadItems[placementId]['bidId'] = bidRequest.bidId
+    });
+    const payload = payloadItems;
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payloadString,
+    };
+  },
+  /**
+         * Unpack the response from the server into a list of bids.
+         *
+         * @param {ServerResponse} serverResponse A successful response from the server.
+         * @return {Bid[]} An array of bids which were nested inside the server.
+         */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const serverBody = serverResponse.body;
+    const bidResponses = [];
+    if (serverBody.mediaType == 'banner') {
+      const bidResponse = {
+        requestId: serverBody.requestId,
+        cpm: serverBody.cpm,
+        width: serverBody.width,
+        height: serverBody.height,
+        creativeId: serverBody.creativeId,
+        currency: serverBody.currency,
+        netRevenue: false,
+        ttl: serverBody.ttl,
+        ad: serverBody.ad,
+        mediaType: 'banner',
+        meta: {
+          mediaType: 'banner',
+          advertiserDomains: serverBody.advertiserDomains
+        }
+      }
+      bidResponses.push(bidResponse)
+    } else if (serverBody.mediaType == 'video') {
+      const bidResponse = {
+        requestId: serverBody.requestId,
+        cpm: serverBody.cpm,
+        width: serverBody.width,
+        height: serverBody.height,
+        creativeId: serverBody.creativeId,
+        currency: serverBody.currency,
+        netRevenue: false,
+        ttl: serverBody.ttl,
+        vastUrl: serverBody.vastUrl,
+        mediaType: 'video',
+        meta: {
+          mediaType: 'video',
+          advertiserDomains: serverBody.advertiserDomains
+        }
+      }
+      bidResponses.push(bidResponse)
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * Formats placement ids for adserver ingestion purposes
+   * @param {string[]} The placement ID/s in an array
+   */
+  setPlacementID: function (placementId) {
+    if (Array.isArray(placementId)) {
+      return placementId.join('#')
+    }
+    return placementId
+  },
+}
+registerBidder(spec);
diff --git a/modules/pilotxBidAdapter.md b/modules/pilotxBidAdapter.md
new file mode 100644
index 00000000000..37489bda4a0
--- /dev/null
+++ b/modules/pilotxBidAdapter.md
@@ -0,0 +1,50 @@
+# Overview
+
+```
+Module Name:  Pilotx Prebid Adapter
+Module Type:  Bidder Adapter
+Maintainer:   tony@pilotx.tv
+```
+
+# Description
+
+Connects to Pilotx 
+
+Pilotx's bid adapter supports banner and video.
+
+# Test Parameters
+```
+// Banner adUnit
+var adUnits = [{
+    code: 'div-gpt-ad-1460505748561-0',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250], [300,600]],
+        }
+    },
+    bids: [{
+        bidder: 'pilotx',
+        params: {
+            placementId: ["1423"]
+        }
+    }]
+
+}];
+
+// Video adUnit
+var videoAdUnit = {
+    code: 'video1',
+    mediaTypes: {
+        video: {
+            context: 'instream',
+            playerSize: [640, 480],
+        }
+    },
+    bids: [{
+        bidder: 'pilotx',
+        params: {
+            placementId: '1422',
+        }
+    }]
+};
+```
\ No newline at end of file
diff --git a/modules/pixfutureBidAdapter.js b/modules/pixfutureBidAdapter.js
new file mode 100644
index 00000000000..41b1151e72a
--- /dev/null
+++ b/modules/pixfutureBidAdapter.js
@@ -0,0 +1,380 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { find, includes } from '../src/polyfill.js';
+import {
+  convertCamelToUnderscore,
+  deepAccess,
+  isArray,
+  isEmpty,
+  isFn,
+  isNumber,
+  isPlainObject,
+  transformBidderParamKeywords
+} from '../src/utils.js';
+import { auctionManager } from '../src/auctionManager.js';
+
+const SOURCE = 'pbjs';
+const storageManager = getStorageManager({bidderCode: 'pixfuture'});
+const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
+let pixID = '';
+const GVLID = 839;
+
+export const spec = {
+  code: 'pixfuture',
+  gvlid: GVLID,
+  hostname: 'https://gosrv.pixfuture.com',
+
+  getHostname() {
+    let ret = this.hostname;
+    try {
+      ret = storageManager.getDataFromLocalStorage('ov_pixbidder_host') || ret;
+    } catch (e) {
+    }
+    return ret;
+  },
+
+  isBidRequestValid(bid) {
+    return !!(bid.sizes && bid.bidId && bid.params &&
+                (bid.params.pix_id && (typeof bid.params.pix_id === 'string')));
+  },
+
+  buildRequests(validBidRequests, bidderRequest) {
+    const tags = validBidRequests.map(bidToTag);
+    const hostname = this.getHostname();
+    return validBidRequests.map((bidRequest) => {
+      if (bidRequest.params.pix_id) {
+        pixID = bidRequest.params.pix_id
+      }
+
+      let referer = '';
+      if (bidderRequest && bidderRequest.refererInfo) {
+        referer = bidderRequest.refererInfo.page || '';
+      }
+
+      const userObjBid = find(validBidRequests, hasUserInfo);
+      let userObj = {};
+      if (config.getConfig('coppa') === true) {
+        userObj = {'coppa': true};
+      }
+
+      if (userObjBid) {
+        Object.keys(userObjBid.params.user)
+          .filter(param => includes(USER_PARAMS, param))
+          .forEach((param) => {
+            let uparam = convertCamelToUnderscore(param);
+            if (param === 'segments' && isArray(userObjBid.params.user[param])) {
+              let segs = [];
+              userObjBid.params.user[param].forEach(val => {
+                if (isNumber(val)) {
+                  segs.push({'id': val});
+                } else if (isPlainObject(val)) {
+                  segs.push(val);
+                }
+              });
+              userObj[uparam] = segs;
+            } else if (param !== 'segments') {
+              userObj[uparam] = userObjBid.params.user[param];
+            }
+          });
+      }
+
+      const schain = validBidRequests[0].schain;
+
+      const payload = {
+        tags: [...tags],
+        user: userObj,
+        sdk: {
+          source: SOURCE,
+          version: '$prebid.version$'
+        },
+        schain: schain
+      };
+
+      if (bidderRequest && bidderRequest.uspConsent) {
+        payload.us_privacy = bidderRequest.uspConsent;
+      }
+
+      if (bidderRequest && bidderRequest.refererInfo) {
+        let refererinfo = {
+          // TODO: this collects everything it finds, except for canonicalUrl
+          rd_ref: encodeURIComponent(bidderRequest.refererInfo.topmostLocation),
+          rd_top: bidderRequest.refererInfo.reachedTop,
+          rd_ifs: bidderRequest.refererInfo.numIframes,
+          rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+        };
+        payload.referrer_detection = refererinfo;
+      }
+
+      if (validBidRequests[0].userId) {
+        let eids = [];
+
+        addUserId(eids, deepAccess(validBidRequests[0], `userId.criteoId`), 'criteo.com', null);
+        addUserId(eids, deepAccess(validBidRequests[0], `userId.unifiedId`), 'thetradedesk.com', null);
+        addUserId(eids, deepAccess(validBidRequests[0], `userId.id5Id`), 'id5.io', null);
+        addUserId(eids, deepAccess(validBidRequests[0], `userId.sharedId`), 'thetradedesk.com', null);
+        addUserId(eids, deepAccess(validBidRequests[0], `userId.identityLink`), 'liveramp.com', null);
+        addUserId(eids, deepAccess(validBidRequests[0], `userId.liveIntentId`), 'liveintent.com', null);
+        addUserId(eids, deepAccess(validBidRequests[0], `userId.fabrickId`), 'home.neustar', null);
+
+        if (eids.length) {
+          payload.eids = eids;
+        }
+      }
+
+      if (tags[0].publisher_id) {
+        payload.publisher_id = tags[0].publisher_id;
+      }
+
+      const ret = {
+        url: `${hostname}/pixservices`,
+        method: 'POST',
+        options: {withCredentials: true},
+        data: {
+          v: $$PREBID_GLOBAL$$.version,
+          pageUrl: referer,
+          bidId: bidRequest.bidId,
+          auctionId: bidRequest.auctionId,
+          transactionId: bidRequest.transactionId,
+          adUnitCode: bidRequest.adUnitCode,
+          bidRequestCount: bidRequest.bidRequestCount,
+          sizes: bidRequest.sizes,
+          params: bidRequest.params,
+          pubext: payload
+        }
+      };
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        ret.data.gdprConsent = {
+          consentString: bidderRequest.gdprConsent.consentString,
+          consentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') && bidderRequest.gdprConsent.gdprApplies
+        };
+      }
+      return ret;
+    });
+  },
+
+  interpretResponse: function (serverResponse, { bidderRequest }) {
+    serverResponse = serverResponse.body;
+    const bids = [];
+    if (serverResponse.creatives.bids && serverResponse.placements) {
+      serverResponse.placements.forEach(serverBid => {
+        serverBid.creatives.forEach(creative => {
+          const bid = newBid(serverBid, creative, serverBid.placement_id, serverBid.uuid);
+          bid.mediaType = BANNER;
+          bids.push(bid);
+        });
+      });
+    }
+
+    return bids;
+  },
+  getUserSyncs: function (syncOptions, bid, gdprConsent, uspConsent) {
+    const syncs = [];
+
+    let syncurl = 'pixid=' + pixID;
+    let gdpr = (gdprConsent && gdprConsent.gdprApplies) ? 1 : 0;
+    let consent = gdprConsent ? encodeURIComponent(gdprConsent.consentString || '') : '';
+
+    // Attaching GDPR Consent Params in UserSync url
+    syncurl += '&gdprconcent=' + gdpr + '&adsync=' + consent;
+
+    // CCPA
+    if (uspConsent) {
+      syncurl += '&us_privacy=' + encodeURIComponent(uspConsent);
+    }
+
+    // coppa compliance
+    if (config.getConfig('coppa') === true) {
+      syncurl += '&coppa=1';
+    }
+
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: 'https://gosrv.pixfuture.com/cookiesync?f=b&' + syncurl
+      });
+    } else {
+      syncs.push({
+        type: 'image',
+        url: 'https://gosrv.pixfuture.com/cookiesync?f=i&' + syncurl
+      });
+    }
+
+    return syncs;
+  }
+};
+
+function newBid(serverBid, rtbBid, placementId, uuid) {
+  const bid = {
+    requestId: uuid,
+    cpm: rtbBid.cpm,
+    creativeId: rtbBid.creative_id,
+    currency: 'USD',
+    netRevenue: true,
+    ttl: 300,
+    adUnitCode: placementId
+  };
+
+  if (rtbBid.adomain) {
+    bid.meta = Object.assign({}, bid.meta, { advertiserDomains: [rtbBid.adomain] });
+  };
+
+  Object.assign(bid, {
+    width: rtbBid.width,
+    height: rtbBid.height,
+    ad: rtbBid.code
+  });
+
+  return bid;
+}
+
+// Functions related optional parameters
+function bidToTag(bid) {
+  const tag = {};
+  tag.sizes = transformSizes(bid.sizes);
+  tag.primary_size = tag.sizes[0];
+  tag.ad_types = [];
+  tag.uuid = bid.bidId;
+  if (bid.params.placementId) {
+    tag.id = parseInt(bid.params.placementId, 10);
+  } else {
+    tag.code = bid.params.invCode;
+  }
+  tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
+  tag.prebid = true;
+  tag.disable_psa = true;
+  let bidFloor = getBidFloor(bid);
+  if (bidFloor) {
+    tag.reserve = bidFloor;
+  }
+  if (bid.params.position) {
+    tag.position = {'above': 1, 'below': 2}[bid.params.position] || 0;
+  } else {
+    let mediaTypePos = deepAccess(bid, `mediaTypes.banner.pos`) || deepAccess(bid, `mediaTypes.video.pos`);
+    // only support unknown, atf, and btf values for position at this time
+    if (mediaTypePos === 0 || mediaTypePos === 1 || mediaTypePos === 3) {
+      // ortb spec treats btf === 3, but our system interprets btf === 2; so converting the ortb value here for consistency
+      tag.position = (mediaTypePos === 3) ? 2 : mediaTypePos;
+    }
+  }
+  if (bid.params.trafficSourceCode) {
+    tag.traffic_source_code = bid.params.trafficSourceCode;
+  }
+  if (bid.params.privateSizes) {
+    tag.private_sizes = transformSizes(bid.params.privateSizes);
+  }
+  if (bid.params.supplyType) {
+    tag.supply_type = bid.params.supplyType;
+  }
+  if (bid.params.pubClick) {
+    tag.pubclick = bid.params.pubClick;
+  }
+  if (bid.params.extInvCode) {
+    tag.ext_inv_code = bid.params.extInvCode;
+  }
+  if (bid.params.publisherId) {
+    tag.publisher_id = parseInt(bid.params.publisherId, 10);
+  }
+  if (bid.params.externalImpId) {
+    tag.external_imp_id = bid.params.externalImpId;
+  }
+  if (!isEmpty(bid.params.keywords)) {
+    let keywords = transformBidderParamKeywords(bid.params.keywords);
+
+    if (keywords.length > 0) {
+      keywords.forEach(deleteValues);
+    }
+    tag.keywords = keywords;
+  }
+
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  if (gpid) {
+    tag.gpid = gpid;
+  }
+
+  if (bid.renderer) {
+    tag.video = Object.assign({}, tag.video, {custom_renderer_present: true});
+  }
+
+  if (bid.params.frameworks && isArray(bid.params.frameworks)) {
+    tag['banner_frameworks'] = bid.params.frameworks;
+  }
+
+  let adUnit = find(auctionManager.getAdUnits(), au => bid.transactionId === au.transactionId);
+  if (adUnit && adUnit.mediaTypes && adUnit.mediaTypes.banner) {
+    tag.ad_types.push(BANNER);
+  }
+
+  if (tag.ad_types.length === 0) {
+    delete tag.ad_types;
+  }
+
+  return tag;
+}
+
+function addUserId(eids, id, source, rti) {
+  if (id) {
+    if (rti) {
+      eids.push({source, id, rti_partner: rti});
+    } else {
+      eids.push({source, id});
+    }
+  }
+  return eids;
+}
+
+function hasUserInfo(bid) {
+  return !!bid.params.user;
+}
+
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (isArray(requestSizes) && requestSizes.length === 2 &&
+            !isArray(requestSizes[0])) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.reserve) ? bid.params.reserve : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
+function deleteValues(keyPairObj) {
+  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
+    delete keyPairObj.value;
+  }
+}
+
+function isPopulatedArray(arr) {
+  return !!(isArray(arr) && arr.length > 0);
+}
+
+registerBidder(spec);
diff --git a/modules/pixfutureBidAdapter.md b/modules/pixfutureBidAdapter.md
new file mode 100644
index 00000000000..b7911d6c9bb
--- /dev/null
+++ b/modules/pixfutureBidAdapter.md
@@ -0,0 +1,154 @@
+# Overview
+
+```
+Module Name: PixFuture Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: admin@pixfuture.net
+```
+# Description
+
+Module that connects to PixFuture demand sources
+
+# Test Parameters
+```
+var adUnits = [{
+    "bidderCode": "pixfuture",
+    "auctionId": "634c9d0e-306f-4a5c-974e-21697dfd4fcd",
+    "bidderRequestId": "5f85993da0f6be",
+    "bids": [
+        {
+            "labelAny": [
+                "display"
+            ],
+            "bidder": "pixfuture",
+            "params": {
+                "pix_id": "Abc123"
+            }];
+```
+
+# Test Example
+...
+<html>
+
+    <head>
+        <link rel="icon" type="image/png" href="/favicon.ico">
+        <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
+        <script async src="https://cdn.pixfuture.com/pixfuture_prebidjs/prebid.js"></script>
+        <script>
+            var div_1_sizes = [
+                [300, 250],
+                [300, 600]
+            ];
+            var div_2_sizes = [
+                [728, 90],
+                [970, 250]
+            ];
+            var PREBID_TIMEOUT = 1000;
+            var FAILSAFE_TIMEOUT = 3000;
+
+            var adUnits = [
+                {
+                    code: '/19968336/header-bid-tag-0',
+                    mediaTypes: {
+                        banner: {
+                            sizes: div_1_sizes
+                        }
+                    },
+                    bids: [{
+                        bidder: 'pixfuture',
+                        params: {
+                            "pix_id": "777"
+                        }
+                    }]
+                },
+                {
+                    code: '/19968336/header-bid-tag-1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: div_2_sizes
+                        }
+                    },
+                    bids: [{
+                        bidder: 'appnexus',
+                        params: {
+                            placementId: 13144370
+                        }
+                    }]
+                }
+            ];
+
+            // ======== DO NOT EDIT BELOW THIS LINE =========== //
+            var googletag = googletag || {};
+            googletag.cmd = googletag.cmd || [];
+            googletag.cmd.push(function() {
+                googletag.pubads().disableInitialLoad();
+            });
+
+            var pbjs = pbjs || {};
+            pbjs.que = pbjs.que || [];
+
+            pbjs.que.push(function() {
+                pbjs.addAdUnits(adUnits);
+                pbjs.requestBids({
+                    bidsBackHandler: initAdserver,
+                    timeout: PREBID_TIMEOUT
+                });
+            });
+
+            function initAdserver() {
+                if (pbjs.initAdserverSet) return;
+                pbjs.initAdserverSet = true;
+                googletag.cmd.push(function() {
+                    pbjs.que.push(function() {
+                        pbjs.setTargetingForGPTAsync();
+                        googletag.pubads().refresh();
+                    });
+                });
+            }
+            // in case PBJS doesn't load
+            setTimeout(function() {
+                initAdserver();
+            }, FAILSAFE_TIMEOUT);
+
+            googletag.cmd.push(function() {
+                googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+            googletag.cmd.push(function() {
+                googletag.defineSlot('/19968336/header-bid-tag-1', div_2_sizes, 'div-2').addService(googletag.pubads());
+                googletag.pubads().enableSingleRequest();
+                googletag.enableServices();
+            });
+
+        </script>
+
+    </head>
+
+    <body>
+        <h2>Basic Prebid.js Example</h2>
+        <h5>Div-1</h5>
+        <div id='div-1'>
+            <script type='text/javascript'>
+                googletag.cmd.push(function() {
+                    googletag.display('div-1');
+                });
+
+            </script>
+        </div>
+
+        <br>
+
+        <h5>Div-2</h5>
+        <div id='div-2'>
+            <script type='text/javascript'>
+                googletag.cmd.push(function() {
+                    googletag.display('div-2');
+                });
+
+            </script>
+        </div>
+
+    </body>
+
+</html>
diff --git a/modules/piximediaBidAdapter.js b/modules/piximediaBidAdapter.js
deleted file mode 100644
index 2617cc8fe42..00000000000
--- a/modules/piximediaBidAdapter.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'piximedia';
-const ENDPOINT = 'https://ad.piximedia.com/prebid';
-
-export const spec = {
-  code: BIDDER_CODE,
-  isBidRequestValid: function(bid) {
-    return !!(bid.params && bid.params.siteId && bid.params.placementId);
-  },
-  buildRequests: function(validBidRequests) {
-    return validBidRequests.map(bidRequest => {
-      let parseSized = utils.parseSizesInput(bidRequest.sizes);
-      let arrSize = parseSized[0].split('x');
-      return {
-        method: 'GET',
-        url: ENDPOINT,
-        data: {
-          timestamp: utils.timestamp(),
-          pver: '1.0',
-          pbparams: JSON.stringify(bidRequest.params),
-          pbsizes: JSON.stringify(parseSized),
-          pbwidth: arrSize[0],
-          pbheight: arrSize[1],
-          pbbidid: bidRequest.bidId,
-        },
-      };
-    });
-  },
-  interpretResponse: function(serverResponse, request) {
-    const res = serverResponse.body;
-    const bidResponse = {
-      requestId: res.bidId,
-      cpm: parseFloat(res.cpm),
-      width: res.width,
-      height: res.height,
-      creativeId: res.creative_id,
-      currency: res.currency,
-      netRevenue: true,
-      ttl: 300,
-      ad: res.adm
-    };
-    return [bidResponse];
-  }
-}
-registerBidder(spec);
diff --git a/modules/piximediaBidAdapter.md b/modules/piximediaBidAdapter.md
deleted file mode 100644
index fae014cbdff..00000000000
--- a/modules/piximediaBidAdapter.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Overview
-
-**Module Name**: Piximedia Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**:  contact@piximedia.fr
-
-# Description
-
-Piximedia Bidder Adapter for Prebid.js.
-
-# Test Parameters
-```	
-    var adUnits = [{
-      code: 'mpu',
-      sizes: [[300, 250]],
-      bids: [{
-        bidder: 'piximedia',
-        params: {
-          siteId: 'PIXIMEDIA',
-          placementId: 'PREBID'
-        }
-      }]
-    }];
-	
-```
diff --git a/modules/platformioBidAdapter.js b/modules/platformioBidAdapter.js
deleted file mode 100644
index 314f738ef81..00000000000
--- a/modules/platformioBidAdapter.js
+++ /dev/null
@@ -1,307 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const NATIVE_DEFAULTS = {
-  TITLE_LEN: 100,
-  DESCR_LEN: 200,
-  SPONSORED_BY_LEN: 50,
-  IMG_MIN: 150,
-  ICON_MIN: 50,
-};
-const DEFAULT_MIMES = ['video/mp4', 'video/webm', 'application/x-shockwave-flash', 'application/javascript'];
-const VIDEO_TARGETING = ['mimes', 'skippable', 'playback_method', 'protocols', 'api'];
-const DEFAULT_PROTOCOLS = [2, 3, 5, 6];
-const DEFAULT_APIS = [1, 2];
-
-export const spec = {
-
-  code: 'platformio',
-  supportedMediaTypes: ['banner', 'native', 'video'],
-
-  isBidRequestValid: bid => (
-    !!(bid && bid.params && bid.params.pubId && bid.params.placementId)
-  ),
-  buildRequests: (bidRequests, bidderRequest) => {
-    const request = {
-      id: bidRequests[0].bidderRequestId,
-      at: 2,
-      imp: bidRequests.map(slot => impression(slot)),
-      site: site(bidRequests),
-      app: app(bidRequests),
-      device: device(bidRequests),
-    };
-    applyGdpr(bidderRequest, request);
-    return {
-      method: 'POST',
-      url: 'https://piohbdisp.hb.adx1.com/',
-      data: JSON.stringify(request),
-    };
-  },
-  interpretResponse: (response, request) => (
-    bidResponseAvailable(request, response.body)
-  ),
-};
-
-function bidResponseAvailable(bidRequest, bidResponse) {
-  const idToImpMap = {};
-  const idToBidMap = {};
-  const ortbRequest = parse(bidRequest.data);
-  ortbRequest.imp.forEach(imp => {
-    idToImpMap[imp.id] = imp;
-  });
-  if (bidResponse) {
-    bidResponse.seatbid.forEach(seatBid => seatBid.bid.forEach(bid => {
-      idToBidMap[bid.impid] = bid;
-    }));
-  }
-  const bids = [];
-  Object.keys(idToImpMap).forEach(id => {
-    if (idToBidMap[id]) {
-      const bid = {};
-      bid.requestId = id;
-      bid.adId = id;
-      bid.creativeId = id;
-      bid.cpm = idToBidMap[id].price;
-      bid.currency = bidResponse.cur;
-      bid.ttl = 360;
-      bid.netRevenue = true;
-      if (idToImpMap[id]['native']) {
-        bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
-        let nurl = idToBidMap[id].nurl;
-        nurl = nurl.replace(/\$(%7B|\{)AUCTION_IMP_ID(%7D|\})/gi, idToBidMap[id].impid);
-        nurl = nurl.replace(/\$(%7B|\{)AUCTION_PRICE(%7D|\})/gi, idToBidMap[id].price);
-        nurl = nurl.replace(/\$(%7B|\{)AUCTION_CURRENCY(%7D|\})/gi, bidResponse.cur);
-        nurl = nurl.replace(/\$(%7B|\{)AUCTION_BID_ID(%7D|\})/gi, bidResponse.bidid);
-        bid['native']['impressionTrackers'] = [nurl];
-        bid.mediaType = 'native';
-      } else if (idToImpMap[id]['video']) {
-        bid.vastUrl = idToBidMap[id].adm;
-        bid.vastUrl = bid.vastUrl.replace(/\$(%7B|\{)AUCTION_PRICE(%7D|\})/gi, idToBidMap[id].price);
-        bid.crid = idToBidMap[id].crid;
-        bid.width = idToImpMap[id].video.w;
-        bid.height = idToImpMap[id].video.h;
-        bid.mediaType = 'video';
-      } else if (idToImpMap[id]['banner']) {
-        bid.ad = idToBidMap[id].adm;
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_IMP_ID(%7D|\})/gi, idToBidMap[id].impid);
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_AD_ID(%7D|\})/gi, idToBidMap[id].adid);
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_PRICE(%7D|\})/gi, idToBidMap[id].price);
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_CURRENCY(%7D|\})/gi, bidResponse.cur);
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_BID_ID(%7D|\})/gi, bidResponse.bidid);
-        bid.width = idToBidMap[id].w;
-        bid.height = idToBidMap[id].h;
-        bid.mediaType = 'banner';
-      }
-      bids.push(bid);
-    }
-  });
-  return bids;
-}
-function impression(slot) {
-  return {
-    id: slot.bidId,
-    secure: window.location.protocol === 'https:' ? 1 : 0,
-    'banner': banner(slot),
-    'native': nativeImpression(slot),
-    'video': videoImpression(slot),
-    bidfloor: slot.params.bidFloor || '0.000001',
-    tagid: slot.params.placementId.toString(),
-  };
-}
-
-function banner(slot) {
-  if (slot.mediaType === 'banner' || utils.deepAccess(slot, 'mediaTypes.banner')) {
-    const sizes = utils.deepAccess(slot, 'mediaTypes.banner.sizes');
-    if (sizes.length > 1) {
-      let format = [];
-      for (let f = 0; f < sizes.length; f++) {
-        format.push({'w': sizes[f][0], 'h': sizes[f][1]});
-      }
-      return {'format': format};
-    } else {
-      return {
-        w: sizes[0][0],
-        h: sizes[0][1]
-      }
-    }
-  }
-  return null;
-}
-
-function videoImpression(slot) {
-  if (slot.mediaType === 'video' || utils.deepAccess(slot, 'mediaTypes.video')) {
-    const sizes = utils.deepAccess(slot, 'mediaTypes.video.playerSize');
-    const video = {
-      w: sizes[0][0],
-      h: sizes[0][1],
-      mimes: DEFAULT_MIMES,
-      protocols: DEFAULT_PROTOCOLS,
-      api: DEFAULT_APIS,
-    };
-    if (slot.params.video) {
-      Object.keys(slot.params.video).filter(param => includes(VIDEO_TARGETING, param)).forEach(param => video[param] = slot.params.video[param]);
-    }
-    return video;
-  }
-  return null;
-}
-
-function nativeImpression(slot) {
-  if (slot.mediaType === 'native' || utils.deepAccess(slot, 'mediaTypes.native')) {
-    const assets = [];
-    addAsset(assets, titleAsset(1, slot.nativeParams.title, NATIVE_DEFAULTS.TITLE_LEN));
-    addAsset(assets, dataAsset(2, slot.nativeParams.body, 2, NATIVE_DEFAULTS.DESCR_LEN));
-    addAsset(assets, dataAsset(3, slot.nativeParams.sponsoredBy, 1, NATIVE_DEFAULTS.SPONSORED_BY_LEN));
-    addAsset(assets, imageAsset(4, slot.nativeParams.icon, 1, NATIVE_DEFAULTS.ICON_MIN, NATIVE_DEFAULTS.ICON_MIN));
-    addAsset(assets, imageAsset(5, slot.nativeParams.image, 3, NATIVE_DEFAULTS.IMG_MIN, NATIVE_DEFAULTS.IMG_MIN));
-    return {
-      request: JSON.stringify({ assets }),
-      ver: '1.1',
-    };
-  }
-  return null;
-}
-
-function addAsset(assets, asset) {
-  if (asset) {
-    assets.push(asset);
-  }
-}
-
-function titleAsset(id, params, defaultLen) {
-  if (params) {
-    return {
-      id,
-      required: params.required ? 1 : 0,
-      title: {
-        len: params.len || defaultLen,
-      },
-    };
-  }
-  return null;
-}
-
-function imageAsset(id, params, type, defaultMinWidth, defaultMinHeight) {
-  return params ? {
-    id,
-    required: params.required ? 1 : 0,
-    img: {
-      type,
-      wmin: params.wmin || defaultMinWidth,
-      hmin: params.hmin || defaultMinHeight,
-    }
-  } : null;
-}
-
-function dataAsset(id, params, type, defaultLen) {
-  return params ? {
-    id,
-    required: params.required ? 1 : 0,
-    data: {
-      type,
-      len: params.len || defaultLen,
-    }
-  } : null;
-}
-
-function site(bidderRequest) {
-  const pubId = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.pubId : '0';
-  const siteId = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.siteId : '0';
-  const appParams = bidderRequest[0].params.app;
-  if (!appParams) {
-    return {
-      publisher: {
-        id: pubId.toString(),
-        domain: window.location.hostname,
-      },
-      id: siteId.toString(),
-      ref: window.top.document.referrer,
-      page: window.location.href,
-    }
-  }
-  return null;
-}
-
-function app(bidderRequest) {
-  const pubId = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.pubId : '0';
-  const appParams = bidderRequest[0].params.app;
-  if (appParams) {
-    return {
-      publisher: {
-        id: pubId.toString(),
-      },
-      id: appParams.id,
-      name: appParams.name,
-      bundle: appParams.bundle,
-      storeurl: appParams.storeUrl,
-      domain: appParams.domain,
-    }
-  }
-  return null;
-}
-
-function device(bidderRequest) {
-  const lat = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.latitude : '';
-  const lon = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.longitude : '';
-  const ifa = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.ifa : '';
-  return {
-    dnt: utils.getDNT() ? 1 : 0,
-    ua: navigator.userAgent,
-    language: (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage),
-    w: (window.screen.width || window.innerWidth),
-    h: (window.screen.height || window.innerHeigh),
-    geo: {
-      lat: lat,
-      lon: lon,
-    },
-    ifa: ifa,
-  };
-}
-
-function parse(rawResponse) {
-  try {
-    if (rawResponse) {
-      return JSON.parse(rawResponse);
-    }
-  } catch (ex) {
-    utils.logError('platformio.parse', 'ERROR', ex);
-  }
-  return null;
-}
-
-function applyGdpr(bidderRequest, ortbRequest) {
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    ortbRequest.regs = { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0 } };
-    ortbRequest.user = { ext: { consent: bidderRequest.gdprConsent.consentString } };
-  }
-}
-
-function nativeResponse(imp, bid) {
-  if (imp['native']) {
-    const nativeAd = parse(bid.adm);
-    const keys = {};
-    keys.image = {};
-    keys.icon = {};
-    if (nativeAd && nativeAd['native'] && nativeAd['native'].assets) {
-      nativeAd['native'].assets.forEach(asset => {
-        keys.title = asset.title ? asset.title.text : keys.title;
-        keys.body = asset.data && asset.id === 2 ? asset.data.value : keys.body;
-        keys.sponsoredBy = asset.data && asset.id === 3 ? asset.data.value : keys.sponsoredBy;
-        keys.icon.url = asset.img && asset.id === 4 ? asset.img.url : keys.icon.url;
-        keys.icon.width = asset.img && asset.id === 4 ? asset.img.w : keys.icon.width;
-        keys.icon.height = asset.img && asset.id === 4 ? asset.img.h : keys.icon.height;
-        keys.image.url = asset.img && asset.id === 5 ? asset.img.url : keys.image.url;
-        keys.image.width = asset.img && asset.id === 5 ? asset.img.w : keys.image.width;
-        keys.image.height = asset.img && asset.id === 5 ? asset.img.h : keys.image.height;
-      });
-      if (nativeAd['native'].link) {
-        keys.clickUrl = encodeURIComponent(nativeAd['native'].link.url);
-      }
-      return keys;
-    }
-  }
-  return null;
-}
-
-registerBidder(spec);
diff --git a/modules/platformioBidAdapter.md b/modules/platformioBidAdapter.md
deleted file mode 100644
index 863e023f0d7..00000000000
--- a/modules/platformioBidAdapter.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Overview
-
-**Module Name**: Platform.io Bidder Adapter  
-**Module Type**: Bidder Adapter  
-**Maintainer**: siarhei.kasukhin@platform.io  
-
-# Description
-
-Connects to Platform.io demand source to fetch bids.  
-Banner, Native, Video formats are supported.  
-Please use ```platformio``` as the bidder code.
-
-# Test Parameters
-```
-  var adUnits = [{
-          code: 'dfp-native-div',
-          mediaTypes: {
-              native: {
-                  title: {
-                      required: true,
-                      len: 75
-                  },
-                  image: {
-                      required: true
-                  },
-                  body: {
-                      len: 200
-                  },
-                  icon: {
-                      required: false
-                  }
-              }
-          },
-          bids: [{
-              bidder: 'platformio',
-              params: {
-                  pubId: '29521',
-                  siteId: '26048',
-                  placementId: '123',
-                  bidFloor: '0.001', // optional
-                  ifa: 'XXX-XXX', // optional
-                  latitude: '40.712775', // optional
-                  longitude: '-74.005973', // optional
-              }
-          }]
-      },
-      {
-          code: 'dfp-banner-div',
-          mediaTypes: {
-              banner: {
-                  sizes: [
-                      [300, 250],[300,600]
-                  ],
-              }
-          },
-          bids: [{
-              bidder: 'platformio',
-              params: {
-                  pubId: '29521',
-                  siteId: '26049',
-                  placementId: '123',
-              }
-          }]
-      },
-      {
-          code: 'dfp-video-div',
-          mediaTypes: {
-              video: {
-                  playerSize: [[640, 480]],
-                  context: "instream"
-              }
-          },
-          bids: [{
-              bidder: 'platformio',
-              params: {
-                  pubId: '29521',
-                  siteId: '26049',
-                  placementId: '123',
-                  video: {
-                      skipppable: true,
-                  }
-              }
-          }]
-      }
-  ];
-```
diff --git a/modules/polluxBidAdapter.md b/modules/polluxBidAdapter.md
deleted file mode 100644
index 79bf84e79b9..00000000000
--- a/modules/polluxBidAdapter.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Overview
-
-**Module Name**: Pollux Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**: tech@polluxnetwork.com
-
-# Description
-
-Module that connects to Pollux Network LLC demand source to fetch bids.
-All bids will present CPM in EUR (Euro).
-
-# Test Parameters
-```
-    var adUnits = [{
-      code: '34f724kh32',
-      sizes: [[300, 250]], // a single size
-      bids: [{
-          bidder: 'pollux',
-          params: {
-              zone: '1806' // a single zone
-          }
-      }]
-    },{
-      code: '34f789r783',
-      sizes: [[300, 250], [728, 90]], // multiple sizes
-      bids: [{
-          bidder: 'pollux',
-          params: {
-              zone: '1806,276' // multiple zones, max 5
-          }
-      }]
-    }];
-```
diff --git a/modules/polymorphBidAdapter.md b/modules/polymorphBidAdapter.md
deleted file mode 100644
index e778b312e56..00000000000
--- a/modules/polymorphBidAdapter.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Overview
-
-```
-Module Name: Polymorph Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: kuldeep@getpolymorph.com
-```
-
-# Description
-
-Connects to Polymorph Demand Cloud (s2s header-bidding) 
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div-1',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "polymorph",
-                       params: {
-                          placementId: 'ping'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div-2',
-               sizes: [[300, 250], [300,600]]
-               bids: [
-                   {
-                       bidder: "polymorph",
-                       params: {
-                          placementId: 'ping',
-                          // In case multiple ad sizes are supported, it's recommended to specify default height and width for native ad (in case native ad is chose as a winner). In case of banner or outstream ad any one of the above sizes can be chosen depending on the highest bid.
-                          defaultWidth: 300,
-                          defaultHeight: 600
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/prebidServerBidAdapter/config.js b/modules/prebidServerBidAdapter/config.js
index 56e4fdfbfef..f6b8ac9f86a 100644
--- a/modules/prebidServerBidAdapter/config.js
+++ b/modules/prebidServerBidAdapter/config.js
@@ -3,15 +3,49 @@ export const S2S_VENDORS = {
   'appnexus': {
     adapter: 'prebidServer',
     enabled: true,
-    endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
-    syncEndpoint: 'https://prebid.adnxs.com/pbs/v1/cookie_sync',
+    endpoint: {
+      p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
+      noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/openrtb2/auction'
+    },
+    syncEndpoint: {
+      p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync',
+      noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/cookie_sync'
+    },
+    timeout: 1000
+  },
+  'appnexuspsp': {
+    adapter: 'prebidServer',
+    enabled: true,
+    endpoint: {
+      p1Consent: 'https://ib.adnxs.com/openrtb2/prebid',
+      noP1Consent: 'https://ib.adnxs-simple.com/openrtb2/prebid'
+    },
     timeout: 1000
   },
   'rubicon': {
     adapter: 'prebidServer',
     enabled: true,
-    endpoint: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
-    syncEndpoint: 'https://prebid-server.rubiconproject.com/cookie_sync',
+    endpoint: {
+      p1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+      noP1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+    },
+    syncEndpoint: {
+      p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
+      noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
+    },
     timeout: 500
+  },
+  'openx': {
+    adapter: 'prebidServer',
+    enabled: true,
+    endpoint: {
+      p1Consent: 'https://prebid.openx.net/openrtb2/auction',
+      noP1Consent: 'https://prebid.openx.net/openrtb2/auction'
+    },
+    syncEndpoint: {
+      p1Consent: 'https://prebid.openx.net/cookie_sync',
+      noP1Consent: 'https://prebid.openx.net/cookie_sync'
+    },
+    timeout: 1000
   }
 }
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 7536851f5e1..b609d1a54ec 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -1,31 +1,51 @@
 import Adapter from '../../src/adapter.js';
-import { createBid } from '../../src/bidfactory.js';
-import * as utils from '../../src/utils.js';
-import { STATUS, S2S, EVENTS } from '../../src/constants.json';
+import {
+  bind,
+  deepClone,
+  flatten,
+  generateUUID,
+  getPrebidInternal,
+  insertUserSyncIframe,
+  isNumber,
+  isPlainObject,
+  isStr,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  triggerPixel,
+  uniques,
+  deepAccess,
+} from '../../src/utils.js';
+import CONSTANTS from '../../src/constants.json';
 import adapterManager from '../../src/adapterManager.js';
-import { config } from '../../src/config.js';
-import { VIDEO, NATIVE } from '../../src/mediaTypes.js';
-import { processNativeAdUnitParams } from '../../src/native.js';
-import { isValid } from '../../src/adapters/bidderFactory.js';
-import events from '../../src/events.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import { S2S_VENDORS } from './config.js';
-import { ajax } from '../../src/ajax.js';
-import find from 'core-js-pure/features/array/find.js';
+import {config} from '../../src/config.js';
+import {isValid} from '../../src/adapters/bidderFactory.js';
+import * as events from '../../src/events.js';
+import {includes} from '../../src/polyfill.js';
+import {S2S_VENDORS} from './config.js';
+import {ajax} from '../../src/ajax.js';
+import {hook} from '../../src/hook.js';
+import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {buildPBSRequest, interpretPBSResponse} from './ortbConverter.js';
+import {useMetrics} from '../../src/utils/perfMetrics.js';
 
 const getConfig = config.getConfig;
 
-const TYPE = S2S.SRC;
-let _synced = false;
-const DEFAULT_S2S_TTL = 60;
-const DEFAULT_S2S_CURRENCY = 'USD';
-const DEFAULT_S2S_NETREVENUE = true;
+const TYPE = CONSTANTS.S2S.SRC;
+let _syncCount = 0;
+let _s2sConfigs;
 
-let _s2sConfig;
+let eidPermissions;
 
 /**
  * @typedef {Object} AdapterOptions
  * @summary s2sConfig parameter that adds arguments to resulting OpenRTB payload that goes to Prebid Server
+ * @property {string} adapter
+ * @property {boolean} enabled
+ * @property {string} endpoint
+ * @property {string} syncEndpoint
+ * @property {number} timeout
  * @example
  * // example of multiple bidder configuration
  * pbjs.setConfig({
@@ -40,23 +60,48 @@ let _s2sConfig;
 
 /**
  * @typedef {Object} S2SDefaultConfig
- * @property {boolean} enabled
- * @property {number} timeout
- * @property {number} maxBids
- * @property {string} adapter
- * @property {AdapterOptions} adapterOptions
+ * @summary Base config properties for server to server header bidding
+ * @property {string} [adapter='prebidServer'] adapter code to use for S2S
+ * @property {boolean} [allowUnknownBidderCodes=false] allow bids from bidders that were not explicitly requested
+ * @property {boolean} [enabled=false] enables S2S bidding
+ * @property {number} [timeout=1000] timeout for S2S bidders - should be lower than `pbjs.requestBids({timeout})`
+ * @property {number} [syncTimeout=1000] timeout for cookie sync iframe / image rendering
+ * @property {number} [maxBids=1]
+ * @property {AdapterOptions} [adapterOptions] adds arguments to resulting OpenRTB payload to Prebid Server
+ * @property {Object} [syncUrlModifier]
+ */
+
+/**
+ * @typedef {S2SDefaultConfig} S2SConfig
+ * @summary Configuration for server to server header bidding
+ * @property {string[]} bidders bidders to request S2S
+ * @property {string} endpoint endpoint to contact
+ * @property {string} [defaultVendor] used as key to select the bidder's default config from ßprebidServer/config.js
+ * @property {boolean} [cacheMarkup] whether to cache the adm result
+ * @property {string} [syncEndpoint] endpoint URL for syncing cookies
+ * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
+ * @property {Object} [ortbNative] base value for imp.native.request
  */
 
 /**
  * @type {S2SDefaultConfig}
  */
-const s2sDefaultConfig = {
-  enabled: false,
+export const s2sDefaultConfig = {
+  bidders: Object.freeze([]),
   timeout: 1000,
+  syncTimeout: 1000,
   maxBids: 1,
   adapter: 'prebidServer',
+  allowUnknownBidderCodes: false,
   adapterOptions: {},
-  syncUrlModifier: {}
+  syncUrlModifier: {},
+  ortbNative: {
+    context: 1,
+    plcmttype: 1,
+    eventtrackers: [
+      {event: 1, methods: [1]}
+    ],
+  }
 };
 
 config.setDefaults({
@@ -64,51 +109,100 @@ config.setDefaults({
 });
 
 /**
- * Set config for server to server header bidding
- * @typedef {Object} options - required
- * @property {boolean} enabled enables S2S bidding
- * @property {string[]} bidders bidders to request S2S
- * @property {string} endpoint endpoint to contact
- *  === optional params below ===
- * @property {number} [timeout] timeout for S2S bidders - should be lower than `pbjs.requestBids({timeout})`
- * @property {number} [defaultTtl] ttl for S2S bidders when pbs does not return a ttl on the response - defaults to 60`
- * @property {boolean} [cacheMarkup] whether to cache the adm result
- * @property {string} [adapter] adapter code to use for S2S
- * @property {string} [syncEndpoint] endpoint URL for syncing cookies
- * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
- * @property {AdapterOptions} [adapterOptions] adds arguments to resulting OpenRTB payload to Prebid Server
+ * @param {S2SConfig} option
+ * @return {boolean}
  */
-function setS2sConfig(options) {
-  if (options.defaultVendor) {
-    let vendor = options.defaultVendor;
-    let optionKeys = Object.keys(options);
+function updateConfigDefaultVendor(option) {
+  if (option.defaultVendor) {
+    let vendor = option.defaultVendor;
+    let optionKeys = Object.keys(option);
     if (S2S_VENDORS[vendor]) {
       // vendor keys will be set if either: the key was not specified by user
       // or if the user did not set their own distinct value (ie using the system default) to override the vendor
       Object.keys(S2S_VENDORS[vendor]).forEach((vendorKey) => {
-        if (s2sDefaultConfig[vendorKey] === options[vendorKey] || !includes(optionKeys, vendorKey)) {
-          options[vendorKey] = S2S_VENDORS[vendor][vendorKey];
+        if (s2sDefaultConfig[vendorKey] === option[vendorKey] || !includes(optionKeys, vendorKey)) {
+          option[vendorKey] = S2S_VENDORS[vendor][vendorKey];
         }
       });
     } else {
-      utils.logError('Incorrect or unavailable prebid server default vendor option: ' + vendor);
+      logError('Incorrect or unavailable prebid server default vendor option: ' + vendor);
       return false;
     }
   }
+  // this is how we can know if user / defaultVendor has set it, or if we should default to false
+  return option.enabled = typeof option.enabled === 'boolean' ? option.enabled : false;
+}
 
-  let keys = Object.keys(options);
-
-  if (['accountId', 'bidders', 'endpoint'].filter(key => {
+/**
+ * @param {S2SConfig} option
+ * @return {boolean}
+ */
+function validateConfigRequiredProps(option) {
+  const keys = Object.keys(option);
+  if (['accountId', 'endpoint'].filter(key => {
     if (!includes(keys, key)) {
-      utils.logError(key + ' missing in server to server config');
+      logError(key + ' missing in server to server config');
       return true;
     }
     return false;
   }).length > 0) {
+    return false;
+  }
+}
+
+// temporary change to modify the s2sConfig for new format used for endpoint URLs;
+// could be removed later as part of a major release, if we decide to not support the old format
+function formatUrlParams(option) {
+  ['endpoint', 'syncEndpoint'].forEach((prop) => {
+    if (isStr(option[prop])) {
+      let temp = option[prop];
+      option[prop] = { p1Consent: temp, noP1Consent: temp };
+    }
+    if (isPlainObject(option[prop]) && (!option[prop].p1Consent || !option[prop].noP1Consent)) {
+      ['p1Consent', 'noP1Consent'].forEach((conUrl) => {
+        if (!option[prop][conUrl]) {
+          logWarn(`s2sConfig.${prop}.${conUrl} not defined.  PBS request will be skipped in some P1 scenarios.`);
+        }
+      });
+    }
+  });
+}
+
+/**
+ * @param {(S2SConfig[]|S2SConfig)} options
+ */
+function setS2sConfig(options) {
+  if (!options) {
     return;
   }
+  const normalizedOptions = Array.isArray(options) ? options : [options];
+
+  const activeBidders = [];
+  const optionsValid = normalizedOptions.every((option, i, array) => {
+    formatUrlParams(options);
+    const updateSuccess = updateConfigDefaultVendor(option);
+    if (updateSuccess !== false) {
+      const valid = validateConfigRequiredProps(option);
+      if (valid !== false) {
+        if (Array.isArray(option['bidders'])) {
+          array[i]['bidders'] = option['bidders'].filter(bidder => {
+            if (activeBidders.indexOf(bidder) === -1) {
+              activeBidders.push(bidder);
+              return true;
+            }
+            return false;
+          });
+        }
+        return true;
+      }
+    }
+    logWarn('prebidServer: s2s config is disabled');
+    return false;
+  });
 
-  _s2sConfig = options;
+  if (optionsValid) {
+    return _s2sConfigs = normalizedOptions;
+  }
 }
 getConfig('s2sConfig', ({s2sConfig}) => setS2sConfig(s2sConfig));
 
@@ -116,53 +210,63 @@ getConfig('s2sConfig', ({s2sConfig}) => setS2sConfig(s2sConfig));
  * resets the _synced variable back to false, primiarily used for testing purposes
 */
 export function resetSyncedStatus() {
-  _synced = false;
+  _syncCount = 0;
 }
 
 /**
  * @param  {Array} bidderCodes list of bidders to request user syncs for.
  */
-function queueSync(bidderCodes, gdprConsent, uspConsent) {
-  if (_synced) {
+function queueSync(bidderCodes, gdprConsent, uspConsent, gppConsent, s2sConfig) {
+  if (_s2sConfigs.length === _syncCount) {
     return;
   }
-  _synced = true;
+  _syncCount++;
 
   const payload = {
-    uuid: utils.generateUUID(),
+    uuid: generateUUID(),
     bidders: bidderCodes,
-    account: _s2sConfig.accountId
+    account: s2sConfig.accountId
   };
 
-  let userSyncLimit = _s2sConfig.userSyncLimit;
-  if (utils.isNumber(userSyncLimit) && userSyncLimit > 0) {
+  let userSyncLimit = s2sConfig.userSyncLimit;
+  if (isNumber(userSyncLimit) && userSyncLimit > 0) {
     payload['limit'] = userSyncLimit;
   }
 
   if (gdprConsent) {
-    // only populate gdpr field if we know CMP returned consent information (ie didn't timeout or have an error)
-    if (typeof gdprConsent.consentString !== 'undefined') {
-      payload.gdpr = (gdprConsent.gdprApplies) ? 1 : 0;
-    }
+    payload.gdpr = (gdprConsent.gdprApplies) ? 1 : 0;
     // attempt to populate gdpr_consent if we know gdprApplies or it may apply
     if (gdprConsent.gdprApplies !== false) {
       payload.gdpr_consent = gdprConsent.consentString;
     }
   }
 
-  // US Privace (CCPA) support
+  // US Privacy (CCPA) support
   if (uspConsent) {
     payload.us_privacy = uspConsent;
   }
 
+  if (gppConsent) {
+    // proposing the following formatting, can adjust if needed...
+    // update - leaving this param as an array, since it's part of a POST payload where the [] characters shouldn't matter too much
+    payload.gpp_sid = gppConsent.applicableSections
+    // should we add check if applicableSections was not equal to -1 (where user was out of scope)?
+    //   this would be similar to what was done above for TCF
+    payload.gpp = gppConsent.gppString;
+  }
+
+  if (typeof s2sConfig.coopSync === 'boolean') {
+    payload.coopSync = s2sConfig.coopSync;
+  }
+
   const jsonPayload = JSON.stringify(payload);
-  ajax(_s2sConfig.syncEndpoint,
+  ajax(getMatchingConsentUrl(s2sConfig.syncEndpoint, gdprConsent),
     (response) => {
       try {
         response = JSON.parse(response);
-        doAllSyncs(response.bidder_status);
+        doAllSyncs(response.bidder_status, s2sConfig);
       } catch (e) {
-        utils.logError(e);
+        logError(e);
       }
     },
     jsonPayload,
@@ -172,16 +276,20 @@ function queueSync(bidderCodes, gdprConsent, uspConsent) {
     });
 }
 
-function doAllSyncs(bidders) {
+function doAllSyncs(bidders, s2sConfig) {
   if (bidders.length === 0) {
     return;
   }
 
-  const thisSync = bidders.pop();
+  // pull the syncs off the list in the order that prebid server sends them
+  const thisSync = bidders.shift();
+
+  // if PBS reports this bidder doesn't have an ID, then call the sync and recurse to the next sync entry
   if (thisSync.no_cookie) {
-    doPreBidderSync(thisSync.usersync.type, thisSync.usersync.url, thisSync.bidder, utils.bind.call(doAllSyncs, null, bidders));
+    doPreBidderSync(thisSync.usersync.type, thisSync.usersync.url, thisSync.bidder, bind.call(doAllSyncs, null, bidders, s2sConfig), s2sConfig);
   } else {
-    doAllSyncs(bidders);
+    // bidder already has an ID, so just recurse to the next sync entry
+    doAllSyncs(bidders, s2sConfig);
   }
 }
 
@@ -192,14 +300,13 @@ function doAllSyncs(bidders) {
  * @param {string} url the url to sync
  * @param {string} bidder name of bidder doing sync for
  * @param {function} done an exit callback; to signify this pixel has either: finished rendering or something went wrong
+ * @param {S2SConfig} s2sConfig
  */
-function doPreBidderSync(type, url, bidder, done) {
-  if (_s2sConfig.syncUrlModifier && typeof _s2sConfig.syncUrlModifier[bidder] === 'function') {
-    const newSyncUrl = _s2sConfig.syncUrlModifier[bidder](type, url, bidder);
-    doBidderSync(type, newSyncUrl, bidder, done)
-  } else {
-    doBidderSync(type, url, bidder, done)
+function doPreBidderSync(type, url, bidder, done, s2sConfig) {
+  if (s2sConfig.syncUrlModifier && typeof s2sConfig.syncUrlModifier[bidder] === 'function') {
+    url = s2sConfig.syncUrlModifier[bidder](type, url, bidder);
   }
+  doBidderSync(type, url, bidder, done, s2sConfig.syncTimeout)
 }
 
 /**
@@ -209,19 +316,20 @@ function doPreBidderSync(type, url, bidder, done) {
  * @param {string} url the url to sync
  * @param {string} bidder name of bidder doing sync for
  * @param {function} done an exit callback; to signify this pixel has either: finished rendering or something went wrong
+ * @param {number} timeout: maximum time to wait for rendering in milliseconds
  */
-function doBidderSync(type, url, bidder, done) {
+function doBidderSync(type, url, bidder, done, timeout) {
   if (!url) {
-    utils.logError(`No sync url for bidder "${bidder}": ${url}`);
+    logError(`No sync url for bidder "${bidder}": ${url}`);
     done();
   } else if (type === 'image' || type === 'redirect') {
-    utils.logMessage(`Invoking image pixel user sync for bidder: "${bidder}"`);
-    utils.triggerPixel(url, done);
-  } else if (type == 'iframe') {
-    utils.logMessage(`Invoking iframe user sync for bidder: "${bidder}"`);
-    utils.insertUserSyncIframe(url, done);
+    logMessage(`Invoking image pixel user sync for bidder: "${bidder}"`);
+    triggerPixel(url, done, timeout);
+  } else if (type === 'iframe') {
+    logMessage(`Invoking iframe user sync for bidder: "${bidder}"`);
+    insertUserSyncIframe(url, done, timeout);
   } else {
-    utils.logError(`User sync type "${type}" not supported for bidder: "${bidder}"`);
+    logError(`User sync type "${type}" not supported for bidder: "${bidder}"`);
     done();
   }
 }
@@ -231,149 +339,25 @@ function doBidderSync(type, url, bidder, done) {
  *
  * @param {Array} bidders a list of bidder names
  */
-function doClientSideSyncs(bidders) {
+function doClientSideSyncs(bidders, gdprConsent, uspConsent, gppConsent) {
   bidders.forEach(bidder => {
     let clientAdapter = adapterManager.getBidAdapter(bidder);
     if (clientAdapter && clientAdapter.registerSyncs) {
-      clientAdapter.registerSyncs([]);
+      config.runWithBidder(
+        bidder,
+        bind.call(
+          clientAdapter.registerSyncs,
+          clientAdapter,
+          [],
+          gdprConsent,
+          uspConsent,
+          gppConsent
+        )
+      );
     }
   });
 }
 
-function _getDigiTrustQueryParams(bidRequest = {}) {
-  function getDigiTrustId(bidRequest) {
-    const bidRequestDigitrust = utils.deepAccess(bidRequest, 'bids.0.userId.digitrustid.data');
-    if (bidRequestDigitrust) {
-      return bidRequestDigitrust;
-    }
-
-    const digiTrustUser = config.getConfig('digiTrustId');
-    return (digiTrustUser && digiTrustUser.success && digiTrustUser.identity) || null;
-  }
-  let digiTrustId = getDigiTrustId(bidRequest);
-  // Verify there is an ID and this user has not opted out
-  if (!digiTrustId || (digiTrustId.privacy && digiTrustId.privacy.optout)) {
-    return null;
-  }
-  return {
-    id: digiTrustId.id,
-    keyv: digiTrustId.keyv
-  };
-}
-
-function _appendSiteAppDevice(request, pageUrl) {
-  if (!request) return;
-
-  // ORTB specifies app OR site
-  if (typeof config.getConfig('app') === 'object') {
-    request.app = config.getConfig('app');
-    request.app.publisher = {id: _s2sConfig.accountId}
-  } else {
-    request.site = {};
-    if (utils.isPlainObject(config.getConfig('site'))) {
-      request.site = config.getConfig('site');
-    }
-    // set publisher.id if not already defined
-    if (!utils.deepAccess(request.site, 'publisher.id')) {
-      utils.deepSetValue(request.site, 'publisher.id', _s2sConfig.accountId);
-    }
-    // set site.page if not already defined
-    if (!request.site.page) {
-      request.site.page = pageUrl;
-    }
-  }
-  if (typeof config.getConfig('device') === 'object') {
-    request.device = config.getConfig('device');
-  }
-  if (!request.device) {
-    request.device = {};
-  }
-  if (!request.device.w) {
-    request.device.w = window.innerWidth;
-  }
-  if (!request.device.h) {
-    request.device.h = window.innerHeight;
-  }
-}
-
-function addBidderFirstPartyDataToRequest(request) {
-  const bidderConfig = config.getBidderConfig();
-  const fpdConfigs = Object.keys(bidderConfig).reduce((acc, bidder) => {
-    const currBidderConfig = bidderConfig[bidder];
-    if (currBidderConfig.fpd) {
-      const fpd = {};
-      if (currBidderConfig.fpd.context) {
-        fpd.site = currBidderConfig.fpd.context;
-      }
-      if (currBidderConfig.fpd.user) {
-        fpd.user = currBidderConfig.fpd.user;
-      }
-
-      acc.push({
-        bidders: [ bidder ],
-        config: { fpd }
-      });
-    }
-    return acc;
-  }, []);
-
-  if (fpdConfigs.length) {
-    utils.deepSetValue(request, 'ext.prebid.bidderconfig', fpdConfigs);
-  }
-}
-
-// https://iabtechlab.com/wp-content/uploads/2016/07/OpenRTB-Native-Ads-Specification-Final-1.2.pdf#page=40
-let nativeDataIdMap = {
-  sponsoredBy: 1, // sponsored
-  body: 2, // desc
-  rating: 3,
-  likes: 4,
-  downloads: 5,
-  price: 6,
-  salePrice: 7,
-  phone: 8,
-  address: 9,
-  body2: 10, // desc2
-  cta: 12 // ctatext
-};
-let nativeDataNames = Object.keys(nativeDataIdMap);
-
-let nativeImgIdMap = {
-  icon: 1,
-  image: 3
-};
-
-let nativeEventTrackerEventMap = {
-  impression: 1,
-  'viewable-mrc50': 2,
-  'viewable-mrc100': 3,
-  'viewable-video50': 4,
-};
-
-let nativeEventTrackerMethodMap = {
-  img: 1,
-  js: 2
-};
-
-// enable reverse lookup
-[
-  nativeDataIdMap,
-  nativeImgIdMap,
-  nativeEventTrackerEventMap,
-  nativeEventTrackerMethodMap
-].forEach(map => {
-  Object.keys(map).forEach(key => {
-    map[map[key]] = key;
-  });
-});
-
-/*
- * Protocol spec for OpenRTB endpoint
- * e.g., https://<prebid-server-url>/v1/openrtb2/auction
- */
-let bidIdMap = {};
-let nativeAssetCache = {}; // store processed native params to preserve
-
 /**
  * map wurl to auction id and adId for use in the BID_WON event
  */
@@ -385,7 +369,7 @@ let wurlMap = {};
  * @param {string} wurl events.winurl passed from prebidServer as wurl
  */
 function addWurl(auctionId, adId, wurl) {
-  if ([auctionId, adId].every(utils.isStr)) {
+  if ([auctionId, adId].every(isStr)) {
     wurlMap[`${auctionId}${adId}`] = wurl;
   }
 }
@@ -395,7 +379,7 @@ function addWurl(auctionId, adId, wurl) {
  * @param {string} adId generated value set to bidObject.adId by bidderFactory Bid()
  */
 function removeWurl(auctionId, adId) {
-  if ([auctionId, adId].every(utils.isStr)) {
+  if ([auctionId, adId].every(isStr)) {
     wurlMap[`${auctionId}${adId}`] = undefined;
   }
 }
@@ -405,7 +389,7 @@ function removeWurl(auctionId, adId) {
  * @return {(string|undefined)} events.winurl which was passed as wurl
  */
 function getWurl(auctionId, adId) {
-  if ([auctionId, adId].every(utils.isStr)) {
+  if ([auctionId, adId].every(isStr)) {
     return wurlMap[`${auctionId}${adId}`];
   }
 }
@@ -417,450 +401,35 @@ export function resetWurlMap() {
   wurlMap = {};
 }
 
-const OPEN_RTB_PROTOCOL = {
-  buildRequest(s2sBidRequest, bidRequests, adUnits) {
-    let imps = [];
-    let aliases = {};
-    const firstBidRequest = bidRequests[0];
-
-    // transform ad unit into array of OpenRTB impression objects
-    adUnits.forEach(adUnit => {
-      const nativeParams = processNativeAdUnitParams(utils.deepAccess(adUnit, 'mediaTypes.native'));
-      let nativeAssets;
-      if (nativeParams) {
-        try {
-          nativeAssets = nativeAssetCache[adUnit.code] = Object.keys(nativeParams).reduce((assets, type) => {
-            let params = nativeParams[type];
-
-            function newAsset(obj) {
-              return Object.assign({
-                required: params.required ? 1 : 0
-              }, obj ? utils.cleanObj(obj) : {});
-            }
-
-            switch (type) {
-              case 'image':
-              case 'icon':
-                let imgTypeId = nativeImgIdMap[type];
-                let asset = utils.cleanObj({
-                  type: imgTypeId,
-                  w: utils.deepAccess(params, 'sizes.0'),
-                  h: utils.deepAccess(params, 'sizes.1'),
-                  wmin: utils.deepAccess(params, 'aspect_ratios.0.min_width'),
-                  hmin: utils.deepAccess(params, 'aspect_ratios.0.min_height')
-                });
-                if (!((asset.w && asset.h) || (asset.hmin && asset.wmin))) {
-                  throw 'invalid img sizes (must provide sizes or min_height & min_width if using aspect_ratios)';
-                }
-                if (Array.isArray(params.aspect_ratios)) {
-                  // pass aspect_ratios as ext data I guess?
-                  asset.ext = {
-                    aspectratios: params.aspect_ratios.map(
-                      ratio => `${ratio.ratio_width}:${ratio.ratio_height}`
-                    )
-                  }
-                }
-                assets.push(newAsset({
-                  img: asset
-                }));
-                break;
-              case 'title':
-                if (!params.len) {
-                  throw 'invalid title.len';
-                }
-                assets.push(newAsset({
-                  title: {
-                    len: params.len
-                  }
-                }));
-                break;
-              default:
-                let dataAssetTypeId = nativeDataIdMap[type];
-                if (dataAssetTypeId) {
-                  assets.push(newAsset({
-                    data: {
-                      type: dataAssetTypeId,
-                      len: params.len
-                    }
-                  }))
-                }
-            }
-            return assets;
-          }, []);
-        } catch (e) {
-          utils.logError('error creating native request: ' + String(e))
-        }
-      }
-      const videoParams = utils.deepAccess(adUnit, 'mediaTypes.video');
-      const bannerParams = utils.deepAccess(adUnit, 'mediaTypes.banner');
-
-      adUnit.bids.forEach(bid => {
-        // OpenRTB response contains the adunit code and bidder name. These are
-        // combined to create a unique key for each bid since an id isn't returned
-        bidIdMap[`${adUnit.code}${bid.bidder}`] = bid.bid_id;
-
-        // check for and store valid aliases to add to the request
-        if (adapterManager.aliasRegistry[bid.bidder]) {
-          aliases[bid.bidder] = adapterManager.aliasRegistry[bid.bidder];
-        }
-      });
-
-      let mediaTypes = {};
-      if (bannerParams && bannerParams.sizes) {
-        const sizes = utils.parseSizesInput(bannerParams.sizes);
-
-        // get banner sizes in form [{ w: <int>, h: <int> }, ...]
-        const format = sizes.map(size => {
-          const [ width, height ] = size.split('x');
-          const w = parseInt(width, 10);
-          const h = parseInt(height, 10);
-          return { w, h };
-        });
-
-        mediaTypes['banner'] = {format};
-      }
-
-      if (!utils.isEmpty(videoParams)) {
-        if (videoParams.context === 'outstream' && !adUnit.renderer) {
-          // Don't push oustream w/o renderer to request object.
-          utils.logError('Outstream bid without renderer cannot be sent to Prebid Server.');
-        } else {
-          mediaTypes['video'] = videoParams;
-        }
-      }
-
-      if (nativeAssets) {
-        try {
-          mediaTypes['native'] = {
-            request: JSON.stringify({
-              // TODO: determine best way to pass these and if we allow defaults
-              context: 1,
-              plcmttype: 1,
-              eventtrackers: [
-                {event: 1, methods: [1]}
-              ],
-              // TODO: figure out how to support privacy field
-              // privacy: int
-              assets: nativeAssets
-            }),
-            ver: '1.2'
-          }
-        } catch (e) {
-          utils.logError('error creating native request: ' + String(e))
-        }
-      }
-
-      // get bidder params in form { <bidder code>: {...params} }
-      const ext = adUnit.bids.reduce((acc, bid) => {
-        const adapter = adapterManager.bidderRegistry[bid.bidder];
-        if (adapter && adapter.getSpec().transformBidParams) {
-          bid.params = adapter.getSpec().transformBidParams(bid.params, true);
-        }
-        acc[bid.bidder] = (_s2sConfig.adapterOptions && _s2sConfig.adapterOptions[bid.bidder]) ? Object.assign({}, bid.params, _s2sConfig.adapterOptions[bid.bidder]) : bid.params;
-        return acc;
-      }, {});
-
-      const imp = { id: adUnit.code, ext, secure: _s2sConfig.secure };
-
-      /**
-       * Prebid AdSlot
-       * @type {(string|undefined)}
-       */
-      const pbAdSlot = utils.deepAccess(adUnit, 'fpd.context.pbAdSlot');
-      if (typeof pbAdSlot === 'string' && pbAdSlot) {
-        utils.deepSetValue(imp, 'ext.context.data.adslot', pbAdSlot);
-      }
-
-      Object.assign(imp, mediaTypes);
-
-      // if storedAuctionResponse has been set, pass SRID
-      const storedAuctionResponseBid = find(firstBidRequest.bids, bid => (bid.adUnitCode === adUnit.code && bid.storedAuctionResponse));
-      if (storedAuctionResponseBid) {
-        utils.deepSetValue(imp, 'ext.prebid.storedauctionresponse.id', storedAuctionResponseBid.storedAuctionResponse.toString());
-      }
-
-      if (imp.banner || imp.video || imp.native) {
-        imps.push(imp);
-      }
-    });
-
-    if (!imps.length) {
-      utils.logError('Request to Prebid Server rejected due to invalid media type(s) in adUnit.');
-      return;
-    }
-    const request = {
-      id: s2sBidRequest.tid,
-      source: {tid: s2sBidRequest.tid},
-      tmax: _s2sConfig.timeout,
-      imp: imps,
-      test: getConfig('debug') ? 1 : 0,
-      ext: {
-        prebid: {
-          // set ext.prebid.auctiontimestamp with the auction timestamp. Data type is long integer.
-          auctiontimestamp: firstBidRequest.auctionStart,
-          targeting: {
-            // includewinners is always true for openrtb
-            includewinners: true,
-            // includebidderkeys always false for openrtb
-            includebidderkeys: false
-          }
-        }
-      }
-    };
-
-    // s2sConfig video.ext.prebid is passed through openrtb to PBS
-    if (_s2sConfig.extPrebid && typeof _s2sConfig.extPrebid === 'object') {
-      request.ext.prebid = Object.assign(request.ext.prebid, _s2sConfig.extPrebid);
-    }
-
-    /**
-     * @type {(string[]|string|undefined)} - OpenRTB property 'cur', currencies available for bids
-     */
-    const adServerCur = config.getConfig('currency.adServerCurrency');
-    if (adServerCur && typeof adServerCur === 'string') {
-      // if the value is a string, wrap it with an array
-      request.cur = [adServerCur];
-    } else if (Array.isArray(adServerCur) && adServerCur.length) {
-      // if it's an array, get the first element
-      request.cur = [adServerCur[0]];
-    }
-
-    _appendSiteAppDevice(request, firstBidRequest.refererInfo.referer);
-
-    const digiTrust = _getDigiTrustQueryParams(firstBidRequest);
-    if (digiTrust) {
-      utils.deepSetValue(request, 'user.ext.digitrust', digiTrust);
-    }
-
-    // pass schain object if it is present
-    const schain = utils.deepAccess(bidRequests, '0.bids.0.schain');
-    if (schain) {
-      request.source.ext = {
-        schain: schain
-      };
-    }
-
-    if (!utils.isEmpty(aliases)) {
-      request.ext.prebid.aliases = aliases;
-    }
-
-    const bidUserIdAsEids = utils.deepAccess(bidRequests, '0.bids.0.userIdAsEids');
-    if (utils.isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
-      utils.deepSetValue(request, 'user.ext.eids', bidUserIdAsEids);
-    }
-
-    if (bidRequests) {
-      if (firstBidRequest.gdprConsent) {
-        // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
-        let gdprApplies;
-        if (typeof firstBidRequest.gdprConsent.gdprApplies === 'boolean') {
-          gdprApplies = firstBidRequest.gdprConsent.gdprApplies ? 1 : 0;
-        }
-        utils.deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
-        utils.deepSetValue(request, 'user.ext.consent', firstBidRequest.gdprConsent.consentString);
-      }
-
-      // US Privacy (CCPA) support
-      if (firstBidRequest.uspConsent) {
-        utils.deepSetValue(request, 'regs.ext.us_privacy', firstBidRequest.uspConsent);
-      }
-    }
-
-    if (getConfig('coppa') === true) {
-      utils.deepSetValue(request, 'regs.coppa', 1);
-    }
-
-    const commonFpd = getConfig('fpd') || {};
-    if (commonFpd.context) {
-      utils.deepSetValue(request, 'site.ext.data', commonFpd.context);
-    }
-    if (commonFpd.user) {
-      utils.deepSetValue(request, 'user.ext.data', commonFpd.user);
-    }
-    addBidderFirstPartyDataToRequest(request);
-
-    return request;
-  },
-
-  interpretResponse(response, bidderRequests) {
-    const bids = [];
-
-    if (response.seatbid) {
-      // a seatbid object contains a `bid` array and a `seat` string
-      response.seatbid.forEach(seatbid => {
-        (seatbid.bid || []).forEach(bid => {
-          let bidRequest;
-          let key = `${bid.impid}${seatbid.seat}`;
-          if (bidIdMap[key]) {
-            bidRequest = utils.getBidRequest(
-              bidIdMap[key],
-              bidderRequests
-            );
-          }
-
-          const cpm = bid.price;
-          const status = cpm !== 0 ? STATUS.GOOD : STATUS.NO_BID;
-          let bidObject = createBid(status, bidRequest || {
-            bidder: seatbid.seat,
-            src: TYPE
-          });
-
-          bidObject.cpm = cpm;
-
-          let serverResponseTimeMs = utils.deepAccess(response, ['ext', 'responsetimemillis', seatbid.seat].join('.'));
-          if (bidRequest && serverResponseTimeMs) {
-            bidRequest.serverResponseTimeMs = serverResponseTimeMs;
-          }
-
-          // Look for seatbid[].bid[].ext.prebid.bidid and place it in the bidResponse object for use in analytics adapters as 'pbsBidId'
-          const bidId = utils.deepAccess(bid, 'ext.prebid.bidid');
-          if (utils.isStr(bidId)) {
-            bidObject.pbsBidId = bidId;
-          }
-
-          // store wurl by auctionId and adId so it can be accessed from the BID_WON event handler
-          if (utils.isStr(utils.deepAccess(bid, 'ext.prebid.events.win'))) {
-            addWurl(bidRequest.auctionId, bidObject.adId, utils.deepAccess(bid, 'ext.prebid.events.win'));
-          }
-
-          let extPrebidTargeting = utils.deepAccess(bid, 'ext.prebid.targeting');
-
-          // If ext.prebid.targeting exists, add it as a property value named 'adserverTargeting'
-          // The removal of hb_winurl and hb_bidid targeting values is temporary
-          // once we get through the transition, this block will be removed.
-          if (utils.isPlainObject(extPrebidTargeting)) {
-            // If wurl exists, remove hb_winurl and hb_bidid targeting attributes
-            if (utils.isStr(utils.deepAccess(bid, 'ext.prebid.events.win'))) {
-              extPrebidTargeting = utils.getDefinedParams(extPrebidTargeting, Object.keys(extPrebidTargeting)
-                .filter(i => (i.indexOf('hb_winurl') === -1 && i.indexOf('hb_bidid') === -1)));
-            }
-            bidObject.adserverTargeting = extPrebidTargeting;
-          }
-
-          bidObject.seatBidId = bid.id;
-
-          if (utils.deepAccess(bid, 'ext.prebid.type') === VIDEO) {
-            bidObject.mediaType = VIDEO;
-            let sizes = bidRequest.sizes && bidRequest.sizes[0];
-            bidObject.playerHeight = sizes[0];
-            bidObject.playerWidth = sizes[1];
-
-            // try to get cache values from 'response.ext.prebid.cache.js'
-            // else try 'bid.ext.prebid.targeting' as fallback
-            if (bid.ext.prebid.cache && typeof bid.ext.prebid.cache.vastXml === 'object' && bid.ext.prebid.cache.vastXml.cacheId && bid.ext.prebid.cache.vastXml.url) {
-              bidObject.videoCacheKey = bid.ext.prebid.cache.vastXml.cacheId;
-              bidObject.vastUrl = bid.ext.prebid.cache.vastXml.url;
-            } else if (extPrebidTargeting && extPrebidTargeting.hb_uuid && extPrebidTargeting.hb_cache_host && extPrebidTargeting.hb_cache_path) {
-              bidObject.videoCacheKey = extPrebidTargeting.hb_uuid;
-              // build url using key and cache host
-              bidObject.vastUrl = `https://${extPrebidTargeting.hb_cache_host}${extPrebidTargeting.hb_cache_path}?uuid=${extPrebidTargeting.hb_uuid}`;
-            }
-
-            if (bid.adm) { bidObject.vastXml = bid.adm; }
-            if (!bidObject.vastUrl && bid.nurl) { bidObject.vastUrl = bid.nurl; }
-          } else if (utils.deepAccess(bid, 'ext.prebid.type') === NATIVE) {
-            bidObject.mediaType = NATIVE;
-            let adm;
-            if (typeof bid.adm === 'string') {
-              adm = bidObject.adm = JSON.parse(bid.adm);
-            } else {
-              adm = bidObject.adm = bid.adm;
-            }
-
-            let trackers = {
-              [nativeEventTrackerMethodMap.img]: adm.imptrackers || [],
-              [nativeEventTrackerMethodMap.js]: adm.jstracker ? [adm.jstracker] : []
-            };
-            if (adm.eventtrackers) {
-              adm.eventtrackers.forEach(tracker => {
-                switch (tracker.method) {
-                  case nativeEventTrackerMethodMap.img:
-                    trackers[nativeEventTrackerMethodMap.img].push(tracker.url);
-                    break;
-                  case nativeEventTrackerMethodMap.js:
-                    trackers[nativeEventTrackerMethodMap.js].push(tracker.url);
-                    break;
-                }
-              });
-            }
-
-            if (utils.isPlainObject(adm) && Array.isArray(adm.assets)) {
-              let origAssets = nativeAssetCache[bidRequest.adUnitCode];
-              bidObject.native = utils.cleanObj(adm.assets.reduce((native, asset) => {
-                let origAsset = origAssets[asset.id];
-                if (utils.isPlainObject(asset.img)) {
-                  native[origAsset.img.type ? nativeImgIdMap[origAsset.img.type] : 'image'] = utils.pick(
-                    asset.img,
-                    ['url', 'w as width', 'h as height']
-                  );
-                } else if (utils.isPlainObject(asset.title)) {
-                  native['title'] = asset.title.text
-                } else if (utils.isPlainObject(asset.data)) {
-                  nativeDataNames.forEach(dataType => {
-                    if (nativeDataIdMap[dataType] === origAsset.data.type) {
-                      native[dataType] = asset.data.value;
-                    }
-                  });
-                }
-                return native;
-              }, utils.cleanObj({
-                clickUrl: adm.link,
-                clickTrackers: utils.deepAccess(adm, 'link.clicktrackers'),
-                impressionTrackers: trackers[nativeEventTrackerMethodMap.img],
-                javascriptTrackers: trackers[nativeEventTrackerMethodMap.js]
-              })));
-            } else {
-              utils.logError('prebid server native response contained no assets');
-            }
-          } else { // banner
-            if (bid.adm && bid.nurl) {
-              bidObject.ad = bid.adm;
-              bidObject.ad += utils.createTrackPixelHtml(decodeURIComponent(bid.nurl));
-            } else if (bid.adm) {
-              bidObject.ad = bid.adm;
-            } else if (bid.nurl) {
-              bidObject.adUrl = bid.nurl;
-            }
-          }
-
-          bidObject.width = bid.w;
-          bidObject.height = bid.h;
-          if (bid.dealid) { bidObject.dealId = bid.dealid; }
-          bidObject.requestId = bidRequest.bidId || bidRequest.bid_Id;
-          bidObject.creative_id = bid.crid;
-          bidObject.creativeId = bid.crid;
-          if (bid.burl) { bidObject.burl = bid.burl; }
-          bidObject.currency = (response.cur) ? response.cur : DEFAULT_S2S_CURRENCY;
-
-          // TODO: Remove when prebid-server returns ttl and netRevenue
-          const configTtl = _s2sConfig.defaultTtl || DEFAULT_S2S_TTL;
-          bidObject.ttl = (bid.ttl) ? bid.ttl : configTtl;
-          bidObject.netRevenue = (bid.netRevenue) ? bid.netRevenue : DEFAULT_S2S_NETREVENUE;
-
-          bids.push({ adUnit: bid.impid, bid: bidObject });
-        });
-      });
-    }
-
-    return bids;
-  }
-};
-
 /**
  * BID_WON event to request the wurl
  * @param {Bid} bid the winning bid object
  */
 function bidWonHandler(bid) {
   const wurl = getWurl(bid.auctionId, bid.adId);
-  if (utils.isStr(wurl)) {
-    utils.logMessage(`Invoking image pixel for wurl on BID_WIN: "${wurl}"`);
-    utils.triggerPixel(wurl);
+  if (isStr(wurl)) {
+    logMessage(`Invoking image pixel for wurl on BID_WIN: "${wurl}"`);
+    triggerPixel(wurl);
 
     // remove from wurl cache, since the wurl url was called
     removeWurl(bid.auctionId, bid.adId);
   }
 }
 
+function getMatchingConsentUrl(urlProp, gdprConsent) {
+  return hasPurpose1Consent(gdprConsent) ? urlProp.p1Consent : urlProp.noP1Consent;
+}
+
+function getConsentData(bidRequests) {
+  let gdprConsent, uspConsent, gppConsent;
+  if (Array.isArray(bidRequests) && bidRequests.length > 0) {
+    gdprConsent = bidRequests[0].gdprConsent;
+    uspConsent = bidRequests[0].uspConsent;
+    gppConsent = bidRequests[0].gppConsent;
+  }
+  return { gdprConsent, uspConsent, gppConsent };
+}
+
 /**
  * Bidder adapter for Prebid Server
  */
@@ -869,83 +438,55 @@ export function PrebidServer() {
 
   /* Prebid executes this function when the page asks to send out bid requests */
   baseAdapter.callBids = function(s2sBidRequest, bidRequests, addBidResponse, done, ajax) {
-    const adUnits = utils.deepClone(s2sBidRequest.ad_units);
+    const adapterMetrics = s2sBidRequest.metrics = useMetrics(deepAccess(bidRequests, '0.metrics'))
+      .newMetrics()
+      .renameWith((n) => [`adapter.s2s.${n}`, `adapters.s2s.${s2sBidRequest.s2sConfig.defaultVendor}.${n}`])
+    done = adapterMetrics.startTiming('total').stopBefore(done);
+    bidRequests.forEach(req => useMetrics(req.metrics).join(adapterMetrics, {continuePropagation: false}));
 
-    // at this point ad units should have a size array either directly or mapped so filter for that
-    const validAdUnits = adUnits.filter(unit =>
-      unit.mediaTypes && (unit.mediaTypes.native || (unit.mediaTypes.banner && unit.mediaTypes.banner.sizes) || (unit.mediaTypes.video && unit.mediaTypes.video.playerSize))
-    );
-
-    // in case config.bidders contains invalid bidders, we only process those we sent requests for
-    const requestedBidders = validAdUnits
-      .map(adUnit => adUnit.bids.map(bid => bid.bidder).filter(utils.uniques))
-      .reduce(utils.flatten)
-      .filter(utils.uniques);
-
-    if (_s2sConfig && _s2sConfig.syncEndpoint) {
-      let gdprConsent, uspConsent;
-      if (Array.isArray(bidRequests) && bidRequests.length > 0) {
-        gdprConsent = bidRequests[0].gdprConsent;
-        uspConsent = bidRequests[0].uspConsent;
-      }
+    let { gdprConsent, uspConsent, gppConsent } = getConsentData(bidRequests);
 
-      let syncBidders = _s2sConfig.bidders
-        .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
-        .filter((bidder, index, array) => (array.indexOf(bidder) === index));
+    if (Array.isArray(_s2sConfigs)) {
+      if (s2sBidRequest.s2sConfig && s2sBidRequest.s2sConfig.syncEndpoint && getMatchingConsentUrl(s2sBidRequest.s2sConfig.syncEndpoint, gdprConsent)) {
+        let syncBidders = s2sBidRequest.s2sConfig.bidders
+          .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
+          .filter((bidder, index, array) => (array.indexOf(bidder) === index));
 
-      queueSync(syncBidders, gdprConsent, uspConsent);
-    }
+        queueSync(syncBidders, gdprConsent, uspConsent, gppConsent, s2sBidRequest.s2sConfig);
+      }
 
-    const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits);
-    const requestJson = request && JSON.stringify(request);
-    if (request && requestJson) {
-      ajax(
-        _s2sConfig.endpoint,
-        {
-          success: response => handleResponse(response, requestedBidders, bidRequests, addBidResponse, done),
-          error: done
+      processPBSRequest(s2sBidRequest, bidRequests, ajax, {
+        onResponse: function (isValid, requestedBidders) {
+          if (isValid) {
+            bidRequests.forEach(bidderRequest => events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest));
+          }
+          done();
+          doClientSideSyncs(requestedBidders, gdprConsent, uspConsent, gppConsent);
         },
-        requestJson,
-        { contentType: 'text/plain', withCredentials: true }
-      );
-    }
-  };
-
-  /* Notify Prebid of bid responses so bids can get in the auction */
-  function handleResponse(response, requestedBidders, bidderRequests, addBidResponse, done) {
-    let result;
-    let bids = [];
-
-    try {
-      result = JSON.parse(response);
-
-      bids = OPEN_RTB_PROTOCOL.interpretResponse(
-        result,
-        bidderRequests,
-        requestedBidders
-      );
-
-      bids.forEach(({adUnit, bid}) => {
-        if (isValid(adUnit, bid, bidderRequests)) {
-          addBidResponse(adUnit, bid);
+        onError: done,
+        onBid: function ({adUnit, bid}) {
+          const metrics = bid.metrics = s2sBidRequest.metrics.fork().renameWith();
+          metrics.checkpoint('addBidResponse');
+          if ((bid.requestId == null || bid.requestBidder == null) && !s2sBidRequest.s2sConfig.allowUnknownBidderCodes) {
+            logWarn(`PBS adapter received bid from unknown bidder (${bid.bidder}), but 's2sConfig.allowUnknownBidderCodes' is not set. Ignoring bid.`);
+            addBidResponse.reject(adUnit, bid, CONSTANTS.REJECTION_REASON.BIDDER_DISALLOWED);
+          } else {
+            if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnit, bid))) {
+              addBidResponse(adUnit, bid);
+              if (bid.pbsWurl) {
+                addWurl(bid.auctionId, bid.adId, bid.pbsWurl);
+              }
+            } else {
+              addBidResponse.reject(adUnit, bid, CONSTANTS.REJECTION_REASON.INVALID);
+            }
+          }
         }
-      });
-
-      bidderRequests.forEach(bidderRequest => events.emit(EVENTS.BIDDER_DONE, bidderRequest));
-    } catch (error) {
-      utils.logError(error);
-    }
-
-    if (!result || (result.status && includes(result.status, 'Error'))) {
-      utils.logError('error parsing response: ', result.status);
+      })
     }
-
-    done();
-    doClientSideSyncs(requestedBidders);
-  }
+  };
 
   // Listen for bid won to call wurl
-  events.on(EVENTS.BID_WON, bidWonHandler);
+  events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler);
 
   return Object.assign(this, {
     callBids: baseAdapter.callBids,
@@ -954,4 +495,73 @@ export function PrebidServer() {
   });
 }
 
+/**
+ * Build and send the appropriate HTTP request over the network, then interpret the response.
+ * @param s2sBidRequest
+ * @param bidRequests
+ * @param ajax
+ * @param onResponse {function(boolean, Array[String])} invoked on a successful HTTP response - with a flag indicating whether it was successful,
+ * and a list of the unique bidder codes that were sent in the request
+ * @param onError {function(String, {})} invoked on HTTP failure - with status message and XHR error
+ * @param onBid {function({})} invoked once for each bid in the response - with the bid as returned by interpretResponse
+ */
+export const processPBSRequest = hook('sync', function (s2sBidRequest, bidRequests, ajax, {onResponse, onError, onBid}) {
+  let { gdprConsent } = getConsentData(bidRequests);
+  const adUnits = deepClone(s2sBidRequest.ad_units);
+
+  // in case config.bidders contains invalid bidders, we only process those we sent requests for
+  const requestedBidders = adUnits
+    .map(adUnit => adUnit.bids.map(bid => bid.bidder).filter(uniques))
+    .reduce(flatten, [])
+    .filter(uniques);
+
+  const request = s2sBidRequest.metrics.measureTime('buildRequests', () => buildPBSRequest(s2sBidRequest, bidRequests, adUnits, requestedBidders, eidPermissions));
+  const requestJson = request && JSON.stringify(request);
+  logInfo('BidRequest: ' + requestJson);
+  const endpointUrl = getMatchingConsentUrl(s2sBidRequest.s2sConfig.endpoint, gdprConsent);
+  if (request && requestJson && endpointUrl) {
+    const networkDone = s2sBidRequest.metrics.startTiming('net');
+    ajax(
+      endpointUrl,
+      {
+        success: function (response) {
+          networkDone();
+          let result;
+          try {
+            result = JSON.parse(response);
+            const bids = s2sBidRequest.metrics.measureTime('interpretResponse', () => interpretPBSResponse(result, request).bids);
+            bids.forEach(onBid);
+          } catch (error) {
+            logError(error);
+          }
+          if (!result || (result.status && includes(result.status, 'Error'))) {
+            logError('error parsing response: ', result ? result.status : 'not valid JSON');
+            onResponse(false, requestedBidders);
+          } else {
+            onResponse(true, requestedBidders);
+          }
+        },
+        error: function () {
+          networkDone();
+          onError.apply(this, arguments);
+        }
+      },
+      requestJson,
+      {contentType: 'text/plain', withCredentials: true}
+    );
+  } else {
+    logError('PBS request not made.  Check endpoints.');
+  }
+}, 'processPBSRequest');
+
+/**
+ * Global setter that sets eids permissions for bidders
+ * This setter is to be used by userId module when included
+ * @param {array} newEidPermissions
+ */
+function setEidPermissions(newEidPermissions) {
+  eidPermissions = newEidPermissions;
+}
+getPrebidInternal().setEidPermissions = setEidPermissions;
+
 adapterManager.registerBidAdapter(new PrebidServer(), 'prebidServer');
diff --git a/modules/prebidServerBidAdapter/ortbConverter.js b/modules/prebidServerBidAdapter/ortbConverter.js
new file mode 100644
index 00000000000..83335f81bc2
--- /dev/null
+++ b/modules/prebidServerBidAdapter/ortbConverter.js
@@ -0,0 +1,275 @@
+import {ortbConverter} from '../../libraries/ortbConverter/converter.js';
+import {
+  deepAccess,
+  deepSetValue,
+  getBidRequest,
+  getDefinedParams,
+  isArray,
+  logError,
+  logWarn,
+  mergeDeep,
+  timestamp
+} from '../../src/utils.js';
+import {config} from '../../src/config.js';
+import CONSTANTS from '../../src/constants.json';
+import {createBid} from '../../src/bidfactory.js';
+import {pbsExtensions} from '../../libraries/pbsExtensions/pbsExtensions.js';
+import {setImpBidParams} from '../../libraries/pbsExtensions/processors/params.js';
+import {SUPPORTED_MEDIA_TYPES} from '../../libraries/pbsExtensions/processors/mediaType.js';
+import {IMP, REQUEST, RESPONSE} from '../../src/pbjsORTB.js';
+import {beConvertCurrency} from '../../src/utils/currency.js';
+
+const DEFAULT_S2S_TTL = 60;
+const DEFAULT_S2S_CURRENCY = 'USD';
+const DEFAULT_S2S_NETREVENUE = true;
+const BIDDER_SPECIFIC_REQUEST_PROPS = new Set(['bidderCode', 'bidderRequestId', 'uniquePbsTid', 'bids', 'timeout']);
+
+const PBS_CONVERTER = ortbConverter({
+  processors: pbsExtensions,
+  context: {
+    netRevenue: DEFAULT_S2S_NETREVENUE,
+  },
+  imp(buildImp, proxyBidRequest, context) {
+    Object.assign(context, proxyBidRequest.pbsData);
+    const imp = buildImp(proxyBidRequest, context);
+    if (Object.values(SUPPORTED_MEDIA_TYPES).some(mtype => imp[mtype])) {
+      imp.secure = context.s2sBidRequest.s2sConfig.secure;
+      return imp;
+    }
+  },
+  request(buildRequest, imps, proxyBidderRequest, context) {
+    if (!imps.length) {
+      logError('Request to Prebid Server rejected due to invalid media type(s) in adUnit.');
+    } else {
+      let {s2sBidRequest, requestedBidders, eidPermissions} = context;
+      const request = buildRequest(imps, proxyBidderRequest, context);
+
+      request.tmax = s2sBidRequest.s2sConfig.timeout;
+      deepSetValue(request, 'source.tid', proxyBidderRequest.auctionId);
+
+      [request.app, request.site].forEach(section => {
+        if (section && !section.publisher?.id) {
+          deepSetValue(section, 'publisher.id', s2sBidRequest.s2sConfig.accountId);
+        }
+      })
+
+      if (isArray(eidPermissions) && eidPermissions.length > 0) {
+        if (requestedBidders && isArray(requestedBidders)) {
+          eidPermissions = eidPermissions.map(p => ({
+            ...p,
+            bidders: p.bidders.filter(bidder => requestedBidders.includes(bidder))
+          }))
+        }
+        deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
+      }
+
+      return request;
+    }
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    // before sending the response throgh "stock" ortb conversion, here we need to:
+    // - filter out ones that come from an "unknown" bidder (if allowUnknownBidderCode is not set)
+    // - overwrite context.bidRequest with the actual bid request for this seat / imp combination
+
+    let bidRequest = context.actualBidRequests.get(context.seatbid.seat);
+    if (bidRequest == null) {
+      // for stored impressions, a request was made with bidder code `null`. Pick it up here so that NO_BID, BID_WON, etc events
+      // can work as expected (otherwise, the original request will always result in NO_BID).
+      bidRequest = context.actualBidRequests.get(null);
+    }
+
+    if (bidRequest) {
+      Object.assign(context, {
+        bidRequest,
+        bidderRequest: context.actualBidderRequests.find(req => req.bidderCode === bidRequest.bidder)
+      })
+    }
+
+    const bidResponse = buildBidResponse(bid, context);
+    bidResponse.requestBidder = bidRequest?.bidder;
+
+    if (bidResponse.native?.ortb) {
+      // TODO: do we need to set bidResponse.adm here?
+      // Any consumers can now get the same object from bidResponse.native.ortb;
+      // I could not find any, which raises the question - who is looking for this?
+      bidResponse.adm = bidResponse.native.ortb;
+    }
+
+    // because core has special treatment for PBS adapter responses, we need some additional processing
+    bidResponse.requestTimestamp = context.requestTimestamp;
+    const status = bid.price !== 0 ? CONSTANTS.STATUS.GOOD : CONSTANTS.STATUS.NO_BID;
+    return {
+      bid: Object.assign(createBid(status, {
+        src: CONSTANTS.S2S.SRC,
+        bidId: bidRequest ? (bidRequest.bidId || bidRequest.bid_Id) : null,
+        transactionId: context.adUnit.transactionId,
+        auctionId: context.bidderRequest.auctionId,
+      }), bidResponse),
+      adUnit: context.adUnit.code
+    };
+  },
+  overrides: {
+    [IMP]: {
+      id(orig, imp, proxyBidRequest, context) {
+        imp.id = context.impId;
+      },
+      params(orig, imp, proxyBidRequest, context) {
+        // override params processing to do it for each bidRequest in this imp;
+        // also, take overrides from s2sConfig.adapterOptions
+        const adapterOptions = context.s2sBidRequest.s2sConfig.adapterOptions;
+        for (const req of context.actualBidRequests.values()) {
+          setImpBidParams(imp, req, context, context);
+          if (adapterOptions && adapterOptions[req.bidder]) {
+            Object.assign(imp.ext.prebid.bidder[req.bidder], adapterOptions[req.bidder]);
+          }
+        }
+      },
+      bidfloor(orig, imp, proxyBidRequest, context) {
+        // for bid floors, we pass each bidRequest associated with this imp through normal bidfloor processing,
+        // and aggregate all of them into a single, minimum floor to put in the request
+        let min;
+        for (const req of context.actualBidRequests.values()) {
+          const floor = {};
+          orig(floor, req, context);
+          // if any bid does not have a valid floor, do not attempt to send any to PBS
+          if (floor.bidfloorcur == null || floor.bidfloor == null) {
+            min = null;
+            break;
+          } else if (min == null) {
+            min = floor;
+          } else {
+            const value = beConvertCurrency(floor.bidfloor, floor.bidfloorcur, min.bidfloorcur);
+            if (value != null && value < min.bidfloor) {
+              min = floor;
+            }
+          }
+        }
+        if (min != null) {
+          Object.assign(imp, min);
+        }
+      }
+    },
+    [REQUEST]: {
+      fpd(orig, ortbRequest, proxyBidderRequest, context) {
+        // FPD is handled different for PBS - the base request will only contain global FPD;
+        // bidder-specific values are set in ext.prebid.bidderconfig
+
+        mergeDeep(ortbRequest, context.s2sBidRequest.ortb2Fragments?.global);
+
+        // also merge in s2sConfig.extPrebid
+        if (context.s2sBidRequest.s2sConfig.extPrebid && typeof context.s2sBidRequest.s2sConfig.extPrebid === 'object') {
+          deepSetValue(ortbRequest, 'ext.prebid', mergeDeep(ortbRequest.ext?.prebid || {}, context.s2sBidRequest.s2sConfig.extPrebid));
+        }
+
+        const fpdConfigs = Object.entries(context.s2sBidRequest.ortb2Fragments?.bidder || {}).map(([bidder, ortb2]) => ({
+          bidders: [bidder],
+          config: {ortb2}
+        }));
+        if (fpdConfigs.length) {
+          deepSetValue(ortbRequest, 'ext.prebid.bidderconfig', fpdConfigs);
+        }
+      },
+      extPrebidAliases(orig, ortbRequest, proxyBidderRequest, context) {
+        // override alias processing to do it for each bidder in the request
+        context.actualBidderRequests.forEach(req => orig(ortbRequest, req, context));
+      },
+      sourceExtSchain(orig, ortbRequest, proxyBidderRequest, context) {
+        // pass schains in ext.prebid.schains, with the most commonly used one in source.ext.schain
+        let mainChain;
+
+        let chains = (deepAccess(ortbRequest, 'ext.prebid.schains') || []);
+        const chainBidders = new Set(chains.flatMap((item) => item.bidders));
+
+        chains = Object.values(
+          chains
+            .concat(context.actualBidderRequests
+              .filter((req) => !chainBidders.has(req.bidderCode)) // schain defined in s2sConfig.extPrebid takes precedence
+              .map((req) => ({
+                bidders: [req.bidderCode],
+                schain: deepAccess(req, 'bids.0.schain')
+              })))
+            .filter(({bidders, schain}) => bidders?.length > 0 && schain)
+            .reduce((chains, {bidders, schain}) => {
+              const key = JSON.stringify(schain);
+              if (!chains.hasOwnProperty(key)) {
+                chains[key] = {bidders: new Set(), schain};
+              }
+              bidders.forEach((bidder) => chains[key].bidders.add(bidder));
+              if (mainChain == null || chains[key].bidders.size > mainChain.bidders.size) {
+                mainChain = chains[key]
+              }
+              return chains;
+            }, {})
+        ).map(({bidders, schain}) => ({bidders: Array.from(bidders), schain}));
+
+        if (mainChain != null) {
+          deepSetValue(ortbRequest, 'source.ext.schain', mainChain.schain);
+        }
+
+        if (chains.length) {
+          deepSetValue(ortbRequest, 'ext.prebid.schains', chains);
+        }
+      }
+    },
+    [RESPONSE]: {
+      serverSideStats(orig, response, ortbResponse, context) {
+        // override to process each request
+        context.actualBidderRequests.forEach(req => orig(response, ortbResponse, {...context, bidderRequest: req, bidRequests: req.bids}));
+      }
+    }
+  },
+});
+
+export function buildPBSRequest(s2sBidRequest, bidderRequests, adUnits, requestedBidders, eidPermissions) {
+  const requestTimestamp = timestamp();
+  const impIds = new Set();
+  const proxyBidRequests = [];
+
+  adUnits.forEach(adUnit => {
+    const actualBidRequests = new Map();
+
+    adUnit.bids.forEach((bid) => {
+      if (bid.mediaTypes != null) {
+        // TODO: support labels / conditional bids
+        // for now, just warn about them
+        logWarn(`Prebid Server adapter does not (yet) support bidder-specific mediaTypes for the same adUnit. Size mapping configuration will be ignored for adUnit: ${adUnit.code}, bidder: ${bid.bidder}`);
+      }
+      actualBidRequests.set(bid.bidder, getBidRequest(bid.bid_id, bidderRequests));
+    });
+
+    let impId = adUnit.code;
+    let i = 1;
+    while (impIds.has(impId)) {
+      i++;
+      impId = `${adUnit.code}-${i}`;
+    }
+    impIds.add(impId)
+    proxyBidRequests.push({
+      ...adUnit,
+      adUnitCode: adUnit.code,
+      ...getDefinedParams(actualBidRequests.values().next().value || {}, ['userId', 'userIdAsEids', 'schain']),
+      pbsData: {impId, actualBidRequests, adUnit}
+    });
+  });
+
+  const proxyBidderRequest = Object.fromEntries(Object.entries(bidderRequests[0]).filter(([k]) => !BIDDER_SPECIFIC_REQUEST_PROPS.has(k)))
+
+  return PBS_CONVERTER.toORTB({
+    bidderRequest: proxyBidderRequest,
+    bidRequests: proxyBidRequests,
+    context: {
+      currency: config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY,
+      ttl: s2sBidRequest.s2sConfig.defaultTtl || DEFAULT_S2S_TTL,
+      requestTimestamp,
+      s2sBidRequest,
+      requestedBidders,
+      actualBidderRequests: bidderRequests,
+      eidPermissions,
+      nativeRequest: s2sBidRequest.s2sConfig.ortbNative,
+    }
+  });
+}
+
+export function interpretPBSResponse(response, request) {
+  return PBS_CONVERTER.fromORTB({response, request});
+}
diff --git a/modules/prebidmanagerAnalyticsAdapter.js b/modules/prebidmanagerAnalyticsAdapter.js
index b98ca864cd5..1180a74db30 100644
--- a/modules/prebidmanagerAnalyticsAdapter.js
+++ b/modules/prebidmanagerAnalyticsAdapter.js
@@ -1,21 +1,23 @@
+import { generateUUID, getParameterByName, logError, parseUrl, logInfo } from '../src/utils.js';
 import {ajaxBuilder} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
+import { getStorageManager } from '../src/storageManager.js';
+import CONSTANTS from '../src/constants.json';
 
 /**
  * prebidmanagerAnalyticsAdapter.js - analytics adapter for prebidmanager
  */
-const DEFAULT_EVENT_URL = 'https://endpoint.prebidmanager.com/endpoint'
+export const storage = getStorageManager({gvlid: undefined, moduleName: 'prebidmanager'});
+const DEFAULT_EVENT_URL = 'https://endpoint.prebidmanager.com/endpoint';
 const analyticsType = 'endpoint';
 const analyticsName = 'Prebid Manager Analytics: ';
 
-var utils = require('../src/utils.js');
-var CONSTANTS = require('../src/constants.json');
 let ajax = ajaxBuilder(0);
 
 var _VERSION = 1;
 var initOptions = null;
-var _pageViewId = utils.generateUUID();
+var _pageViewId = generateUUID();
 var _startAuction = 0;
 var _bidRequestTimeout = 0;
 let flushInterval;
@@ -74,7 +76,7 @@ function collectUtmTagData() {
   let pmUtmTags = {};
   try {
     utmTags.forEach(function (utmKey) {
-      let utmValue = utils.getParameterByName(utmKey);
+      let utmValue = getParameterByName(utmKey);
       if (utmValue !== '') {
         newUtm = true;
       }
@@ -82,23 +84,33 @@ function collectUtmTagData() {
     });
     if (newUtm === false) {
       utmTags.forEach(function (utmKey) {
-        let itemValue = localStorage.getItem(`pm_${utmKey}`);
-        if (itemValue.length !== 0) {
+        let itemValue = storage.getDataFromLocalStorage(`pm_${utmKey}`);
+        if (itemValue && itemValue.length !== 0) {
           pmUtmTags[utmKey] = itemValue;
         }
       });
     } else {
       utmTags.forEach(function (utmKey) {
-        localStorage.setItem(`pm_${utmKey}`, pmUtmTags[utmKey]);
+        storage.setDataInLocalStorage(`pm_${utmKey}`, pmUtmTags[utmKey]);
       });
     }
   } catch (e) {
-    utils.logError(`${analyticsName}Error`, e);
+    logError(`${analyticsName}Error`, e);
     pmUtmTags['error_utm'] = 1;
   }
   return pmUtmTags;
 }
 
+function collectPageInfo() {
+  const pageInfo = {
+    domain: window.location.hostname,
+  }
+  if (document.referrer) {
+    pageInfo.referrerDomain = parseUrl(document.referrer).hostname;
+  }
+  return pageInfo;
+}
+
 function flush() {
   if (!pmAnalyticsEnabled) {
     return;
@@ -111,11 +123,12 @@ function flush() {
       bundleId: initOptions.bundleId,
       events: _eventQueue,
       utmTags: collectUtmTagData(),
+      pageInfo: collectPageInfo(),
     };
 
     ajax(
       initOptions.url,
-      () => utils.logInfo(`${analyticsName} sent events batch`),
+      () => logInfo(`${analyticsName} sent events batch`),
       _VERSION + ':' + JSON.stringify(data),
       {
         contentType: 'text/plain',
@@ -202,7 +215,7 @@ function handleEvent(eventType, eventArgs) {
 
 function sendEvent(event) {
   _eventQueue.push(event);
-  utils.logInfo(`${analyticsName}Event ${event.eventType}:`, event);
+  logInfo(`${analyticsName}Event ${event.eventType}:`, event);
 
   if (event.eventType === CONSTANTS.EVENTS.AUCTION_END) {
     flush();
diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index 6d35a0a74cc..8b5976149d0 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -1,13 +1,33 @@
-import { getGlobal } from '../src/prebidGlobal.js';
-import { config } from '../src/config.js';
-import * as utils from '../src/utils.js';
-import { ajaxBuilder } from '../src/ajax.js';
-import events from '../src/events.js';
+import {
+  debugTurnedOn,
+  deepAccess,
+  deepClone,
+  deepSetValue,
+  generateUUID,
+  getGptSlotInfoForAdUnitCode,
+  getParameterByName,
+  isNumber,
+  logError,
+  logInfo,
+  logWarn,
+  mergeDeep,
+  parseGPTSingleSizeArray,
+  parseUrl,
+  pick
+} from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+import {config} from '../src/config.js';
+import {ajaxBuilder} from '../src/ajax.js';
+import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
-import { getHook } from '../src/hook.js';
-import { createBid } from '../src/bidfactory.js';
-import find from 'core-js-pure/features/array/find.js';
-import { getRefererInfo } from '../src/refererDetection.js';
+import {getHook} from '../src/hook.js';
+import {find} from '../src/polyfill.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {bidderSettings} from '../src/bidderSettings.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {IMP, PBS, registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
+import {timedAuctionHook, timedBidResponseHook} from '../src/utils/perfMetrics.js';
+import {beConvertCurrency} from '../src/utils/currency.js';
 
 /**
  * @summary This Module is intended to provide users with the ability to dynamically set and enforce price floors on a per auction basis.
@@ -55,24 +75,39 @@ export let _floorDataForAuction = {};
  * @summary Simple function to round up to a certain decimal degree
  */
 function roundUp(number, precision) {
-  return Math.ceil(parseFloat(number) * Math.pow(10, precision)) / Math.pow(10, precision);
+  return Math.ceil((parseFloat(number) * Math.pow(10, precision)).toFixed(1)) / Math.pow(10, precision);
 }
 
-let referrerHostname;
-function getHostNameFromReferer(referer) {
-  referrerHostname = utils.parseUrl(referer, {noDecodeWholeURL: true}).hostname;
-  return referrerHostname;
+const getHostname = (() => {
+  let domain;
+  return function() {
+    if (domain == null) {
+      domain = parseUrl(getRefererInfo().topmostLocation, {noDecodeWholeURL: true}).hostname;
+    }
+    return domain;
+  }
+})();
+
+// First look into bidRequest!
+function getGptSlotFromAdUnit(transactionId, {index = auctionManager.index} = {}) {
+  const adUnit = index.getAdUnit({transactionId});
+  const isGam = deepAccess(adUnit, 'ortb2Imp.ext.data.adserver.name') === 'gam';
+  return isGam && adUnit.ortb2Imp.ext.data.adserver.adslot;
+}
+
+function getAdUnitCode(request, response, {index = auctionManager.index} = {}) {
+  return request?.adUnitCode || index.getAdUnit(response).code;
 }
 
 /**
  * @summary floor field types with their matching functions to resolve the actual matched value
  */
 export let fieldMatchingFunctions = {
-  'size': (bidRequest, bidResponse) => utils.parseGPTSingleSizeArray(bidResponse.size) || '*',
+  'size': (bidRequest, bidResponse) => parseGPTSingleSizeArray(bidResponse.size) || '*',
   'mediaType': (bidRequest, bidResponse) => bidResponse.mediaType || 'banner',
-  'gptSlot': (bidRequest, bidResponse) => utils.getGptSlotInfoForAdUnitCode(bidRequest.adUnitCode).gptSlot,
-  'domain': (bidRequest, bidResponse) => referrerHostname || getHostNameFromReferer(getRefererInfo().referer),
-  'adUnitCode': (bidRequest, bidResponse) => bidRequest.adUnitCode
+  'gptSlot': (bidRequest, bidResponse) => getGptSlotFromAdUnit((bidRequest || bidResponse).transactionId) || getGptSlotInfoForAdUnitCode(getAdUnitCode(bidRequest, bidResponse)).gptSlot,
+  'domain': getHostname,
+  'adUnitCode': (bidRequest, bidResponse) => getAdUnitCode(bidRequest, bidResponse)
 }
 
 /**
@@ -95,26 +130,32 @@ function enumeratePossibleFieldValues(floorFields, bidObject, responseObject) {
  * Generates all possible rule matches and picks the first matching one.
  */
 export function getFirstMatchingFloor(floorData, bidObject, responseObject = {}) {
-  let fieldValues = enumeratePossibleFieldValues(utils.deepAccess(floorData, 'schema.fields') || [], bidObject, responseObject);
+  let fieldValues = enumeratePossibleFieldValues(deepAccess(floorData, 'schema.fields') || [], bidObject, responseObject);
   if (!fieldValues.length) return { matchingFloor: floorData.default };
 
-  // look to see iof a request for this context was made already
+  // look to see if a request for this context was made already
   let matchingInput = fieldValues.map(field => field[0]).join('-');
   // if we already have gotten the matching rule from this matching input then use it! No need to look again
-  let previousMatch = utils.deepAccess(floorData, `matchingInputs.${matchingInput}`);
+  let previousMatch = deepAccess(floorData, `matchingInputs.${matchingInput}`);
   if (previousMatch) {
-    return previousMatch;
+    return {...previousMatch};
   }
-  let allPossibleMatches = generatePossibleEnumerations(fieldValues, utils.deepAccess(floorData, 'schema.delimiter') || '|');
+  let allPossibleMatches = generatePossibleEnumerations(fieldValues, deepAccess(floorData, 'schema.delimiter') || '|');
   let matchingRule = find(allPossibleMatches, hashValue => floorData.values.hasOwnProperty(hashValue));
 
   let matchingData = {
-    matchingFloor: floorData.values[matchingRule] || floorData.default,
+    floorMin: floorData.floorMin || 0,
+    floorRuleValue: isNaN(floorData.values[matchingRule]) ? floorData.default : floorData.values[matchingRule],
     matchingData: allPossibleMatches[0], // the first possible match is an "exact" so contains all data relevant for anlaytics adapters
     matchingRule
   };
+  // use adUnit floorMin as priority!
+  if (typeof deepAccess(bidObject, 'ortb2Imp.ext.prebid.floorMin') === 'number') {
+    matchingData.floorMin = bidObject.ortb2Imp.ext.prebid.floorMin;
+  }
+  matchingData.matchingFloor = Math.max(matchingData.floorMin, matchingData.floorRuleValue);
   // save for later lookup if needed
-  utils.deepSetValue(floorData, `matchingInputs.${matchingInput}`, {...matchingData});
+  deepSetValue(floorData, `matchingInputs.${matchingInput}`, {...matchingData});
   return matchingData;
 }
 
@@ -138,10 +179,10 @@ function generatePossibleEnumerations(arrayOfFields, delimiter) {
 /**
  * @summary If a the input bidder has a registered cpmadjustment it returns the input CPM after being adjusted
  */
-export function getBiddersCpmAdjustment(bidderName, inputCpm) {
-  const adjustmentFunction = utils.deepAccess(getGlobal(), `bidderSettings.${bidderName}.bidCpmAdjustment`);
+export function getBiddersCpmAdjustment(bidderName, inputCpm, bid = {}) {
+  const adjustmentFunction = bidderSettings.get(bidderName, 'bidCpmAdjustment');
   if (adjustmentFunction) {
-    return parseFloat(adjustmentFunction(inputCpm));
+    return parseFloat(adjustmentFunction(inputCpm, {...bid, cpm: inputCpm}));
   }
   return parseFloat(inputCpm);
 }
@@ -159,9 +200,9 @@ export function calculateAdjustedFloor(oldFloor, newFloor) {
  * @summary gets the prebid set sizes depending on the input mediaType
  */
 const getMediaTypesSizes = {
-  banner: (bid) => utils.deepAccess(bid, 'mediaTypes.banner.sizes') || [],
-  video: (bid) => utils.deepAccess(bid, 'mediaTypes.video.playerSize') || [],
-  native: (bid) => utils.deepAccess(bid, 'mediaTypes.native.image.sizes') ? [utils.deepAccess(bid, 'mediaTypes.native.image.sizes')] : []
+  banner: (bid) => deepAccess(bid, 'mediaTypes.banner.sizes') || [],
+  video: (bid) => deepAccess(bid, 'mediaTypes.video.playerSize') || [],
+  native: (bid) => deepAccess(bid, 'mediaTypes.native.image.sizes') ? [deepAccess(bid, 'mediaTypes.native.image.sizes')] : []
 }
 
 /**
@@ -200,7 +241,7 @@ export function getFloor(requestParams = {currency: 'USD', mediaType: '*', size:
     try {
       floorInfo.matchingFloor = getGlobal().convertCurrency(floorInfo.matchingFloor, floorData.data.currency, currency);
     } catch (err) {
-      utils.logWarn(`${MODULE_NAME}: Unable to get currency conversion for getFloor for bidder ${bidRequest.bidder}. You must have currency module enabled with defaultRates in your currency config`);
+      logWarn(`${MODULE_NAME}: Unable to get currency conversion for getFloor for bidder ${bidRequest.bidder}. You must have currency module enabled with defaultRates in your currency config`);
       // since we were unable to convert to the bidders requested currency, we send back just the actual floors currency to them
       currency = floorData.data.currency;
     }
@@ -225,7 +266,7 @@ export function getFloor(requestParams = {currency: 'USD', mediaType: '*', size:
  * @summary Takes a floorsData object and converts it into a hash map with appropriate keys
  */
 export function getFloorsDataForAuction(floorData, adUnitCode) {
-  let auctionFloorData = utils.deepClone(floorData);
+  let auctionFloorData = deepClone(floorData);
   auctionFloorData.schema.delimiter = floorData.schema.delimiter || '|';
   auctionFloorData.values = normalizeRulesForAuction(auctionFloorData, adUnitCode);
   // default the currency to USD if not passed in
@@ -286,11 +327,15 @@ export function updateAdUnitsForAuction(adUnits, floorData, auctionId) {
       bid.auctionId = auctionId;
       bid.floorData = {
         skipped: floorData.skipped,
-        modelVersion: utils.deepAccess(floorData, 'data.modelVersion'),
-        location: utils.deepAccess(floorData, 'data.location'),
         skipRate: floorData.skipRate,
+        floorMin: floorData.floorMin,
+        modelVersion: deepAccess(floorData, 'data.modelVersion'),
+        modelWeight: deepAccess(floorData, 'data.modelWeight'),
+        modelTimestamp: deepAccess(floorData, 'data.modelTimestamp'),
+        location: deepAccess(floorData, 'data.location', 'noData'),
+        floorProvider: floorData.floorProvider,
         fetchStatus: _floorsConfig.fetchStatus
-      }
+      };
     });
   });
 }
@@ -311,30 +356,32 @@ export function pickRandomModel(modelGroups, weightSum) {
  * @summary Updates the adUnits accordingly and returns the necessary floorsData for the current auction
  */
 export function createFloorsDataForAuction(adUnits, auctionId) {
-  let resolvedFloorsData = utils.deepClone(_floorsConfig);
+  let resolvedFloorsData = deepClone(_floorsConfig);
   // if using schema 2 pick a model here:
-  if (utils.deepAccess(resolvedFloorsData, 'data.floorsSchemaVersion') === 2) {
+  if (deepAccess(resolvedFloorsData, 'data.floorsSchemaVersion') === 2) {
     // merge the models specific stuff into the top level data settings (now it looks like floorsSchemaVersion 1!)
     let { modelGroups, ...rest } = resolvedFloorsData.data;
     resolvedFloorsData.data = Object.assign(rest, pickRandomModel(modelGroups, rest.modelWeightSum));
   }
 
   // if we do not have a floors data set, we will try to use data set on adUnits
-  let useAdUnitData = Object.keys(utils.deepAccess(resolvedFloorsData, 'data.values') || {}).length === 0;
+  let useAdUnitData = Object.keys(deepAccess(resolvedFloorsData, 'data.values') || {}).length === 0;
   if (useAdUnitData) {
     resolvedFloorsData.data = getFloorDataFromAdUnits(adUnits);
   } else {
     resolvedFloorsData.data = getFloorsDataForAuction(resolvedFloorsData.data);
   }
   // if we still do not have a valid floor data then floors is not on for this auction, so skip
-  if (Object.keys(utils.deepAccess(resolvedFloorsData, 'data.values') || {}).length === 0) {
+  if (Object.keys(deepAccess(resolvedFloorsData, 'data.values') || {}).length === 0) {
     resolvedFloorsData.skipped = true;
   } else {
     // determine the skip rate now
-    const auctionSkipRate = utils.getParameterByName('pbjs_skipRate') || resolvedFloorsData.skipRate;
+    const auctionSkipRate = getParameterByName('pbjs_skipRate') || resolvedFloorsData.skipRate;
     const isSkipped = Math.random() * 100 < parseFloat(auctionSkipRate);
     resolvedFloorsData.skipped = isSkipped;
   }
+  // copy FloorMin to floorData.data
+  if (resolvedFloorsData.hasOwnProperty('floorMin')) resolvedFloorsData.data.floorMin = resolvedFloorsData.floorMin;
   // add floorData to bids
   updateAdUnitsForAuction(adUnits, resolvedFloorsData, auctionId);
   return resolvedFloorsData;
@@ -350,7 +397,7 @@ export function continueAuction(hookConfig) {
     _delayedAuctions = _delayedAuctions.filter(auctionConfig => auctionConfig.timer !== hookConfig.timer);
 
     // We need to know the auctionId at this time. So we will use the passed in one or generate and set it ourselves
-    hookConfig.reqBidsConfigObj.auctionId = hookConfig.reqBidsConfigObj.auctionId || utils.generateUUID();
+    hookConfig.reqBidsConfigObj.auctionId = hookConfig.reqBidsConfigObj.auctionId || generateUUID();
 
     // now we do what we need to with adUnits and save the data object to be used for getFloor and enforcement calls
     _floorDataForAuction[hookConfig.reqBidsConfigObj.auctionId] = createFloorsDataForAuction(hookConfig.reqBidsConfigObj.adUnits || getGlobal().adUnits, hookConfig.reqBidsConfigObj.auctionId);
@@ -364,7 +411,7 @@ function validateSchemaFields(fields) {
   if (Array.isArray(fields) && fields.length > 0 && fields.every(field => allowedFields.indexOf(field) !== -1)) {
     return true;
   }
-  utils.logError(`${MODULE_NAME}: Fields recieved do not match allowed fields`);
+  logError(`${MODULE_NAME}: Fields recieved do not match allowed fields`);
   return false;
 }
 
@@ -392,7 +439,7 @@ function validateRules(floorsData, numFields, delimiter) {
 
 function modelIsValid(model) {
   // schema.fields has only allowed attributes
-  if (!validateSchemaFields(utils.deepAccess(model, 'schema.fields'))) {
+  if (!validateSchemaFields(deepAccess(model, 'schema.fields'))) {
     return false;
   }
   return validateRules(model, model.schema.fields.length, model.schema.delimiter || '|')
@@ -432,7 +479,7 @@ export function isFloorsDataValid(floorsData) {
   }
   floorsData.floorsSchemaVersion = floorsData.floorsSchemaVersion || 1;
   if (typeof floorsSchemaValidation[floorsData.floorsSchemaVersion] !== 'function') {
-    utils.logError(`${MODULE_NAME}: Unknown floorsSchemaVersion: `, floorsData.floorsSchemaVersion);
+    logError(`${MODULE_NAME}: Unknown floorsSchemaVersion: `, floorsData.floorsSchemaVersion);
     return false;
   }
   return floorsSchemaValidation[floorsData.floorsSchemaVersion](floorsData);
@@ -443,13 +490,13 @@ export function isFloorsDataValid(floorsData) {
  */
 export function parseFloorData(floorsData, location) {
   if (floorsData && typeof floorsData === 'object' && isFloorsDataValid(floorsData)) {
-    utils.logInfo(`${MODULE_NAME}: A ${location} set the auction floor data set to `, floorsData);
+    logInfo(`${MODULE_NAME}: A ${location} set the auction floor data set to `, floorsData);
     return {
       ...floorsData,
       location
     };
   }
-  utils.logError(`${MODULE_NAME}: The floors data did not contain correct values`, floorsData);
+  logError(`${MODULE_NAME}: The floors data did not contain correct values`, floorsData);
 }
 
 /**
@@ -457,7 +504,7 @@ export function parseFloorData(floorsData, location) {
  * @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) {
+export const requestBidsHook = timedAuctionHook('priceFloors', function requestBidsHook(fn, reqBidsConfigObj) {
   // preserves all module related variables for the current auction instance (used primiarily for concurrent auctions)
   const hookConfig = {
     reqBidsConfigObj,
@@ -470,7 +517,7 @@ export function requestBidsHook(fn, reqBidsConfigObj) {
   // If auction delay > 0 AND we are fetching -> Then wait until it finishes
   if (_floorsConfig.auctionDelay > 0 && fetching) {
     hookConfig.timer = setTimeout(() => {
-      utils.logWarn(`${MODULE_NAME}: Fetch attempt did not return in time for auction`);
+      logWarn(`${MODULE_NAME}: Fetch attempt did not return in time for auction`);
       _floorsConfig.fetchStatus = 'timeout';
       continueAuction(hookConfig);
     }, _floorsConfig.auctionDelay);
@@ -478,7 +525,7 @@ export function requestBidsHook(fn, reqBidsConfigObj) {
   } else {
     continueAuction(hookConfig);
   }
-}
+});
 
 /**
  * @summary If an auction was queued to be delayed (waiting for a fetch) then this function will resume
@@ -512,7 +559,8 @@ export function handleFetchResponse(fetchResponse) {
     // set .data to it
     _floorsConfig.data = fetchData;
     // set skipRate override if necessary
-    _floorsConfig.skipRate = utils.isNumber(fetchData.skipRate) ? fetchData.skipRate : _floorsConfig.skipRate;
+    _floorsConfig.skipRate = isNumber(fetchData.skipRate) ? fetchData.skipRate : _floorsConfig.skipRate;
+    _floorsConfig.floorProvider = fetchData.floorProvider || _floorsConfig.floorProvider;
   }
 
   // if any auctions are waiting for fetch to finish, we need to continue them!
@@ -522,7 +570,7 @@ export function handleFetchResponse(fetchResponse) {
 function handleFetchError(status) {
   fetching = false;
   _floorsConfig.fetchStatus = 'error';
-  utils.logError(`${MODULE_NAME}: Fetch errored with: `, status);
+  logError(`${MODULE_NAME}: Fetch errored with: `, status);
 
   // if any auctions are waiting for fetch to finish, we need to continue them!
   resumeDelayedAuctions();
@@ -538,13 +586,13 @@ export function generateAndHandleFetch(floorEndpoint) {
     // default to GET and we only support GET for now
     let requestMethod = floorEndpoint.method || 'GET';
     if (requestMethod !== 'GET') {
-      utils.logError(`${MODULE_NAME}: 'GET' is the only request method supported at this time!`);
+      logError(`${MODULE_NAME}: 'GET' is the only request method supported at this time!`);
     } else {
       ajax(floorEndpoint.url, { success: handleFetchResponse, error: handleFetchError }, null, { method: 'GET' });
       fetching = true;
     }
   } else if (fetching) {
-    utils.logWarn(`${MODULE_NAME}: A fetch is already occuring. Skipping.`);
+    logWarn(`${MODULE_NAME}: A fetch is already occuring. Skipping.`);
   }
 }
 
@@ -565,12 +613,14 @@ function addFieldOverrides(overrides) {
  * @summary This is the function which controls what happens during a pbjs.setConfig({...floors: {}}) is called
  */
 export function handleSetFloorsConfig(config) {
-  _floorsConfig = utils.pick(config, [
+  _floorsConfig = pick(config, [
+    'floorMin',
     'enabled', enabled => enabled !== false, // defaults to true
     'auctionDelay', auctionDelay => auctionDelay || 0,
+    'floorProvider', floorProvider => deepAccess(config, 'data.floorProvider', floorProvider),
     'endpoint', endpoint => endpoint || {},
-    'skipRate', () => !isNaN(utils.deepAccess(config, 'data.skipRate')) ? config.data.skipRate : config.skipRate || 0,
-    'enforcement', enforcement => utils.pick(enforcement || {}, [
+    'skipRate', () => !isNaN(deepAccess(config, 'data.skipRate')) ? config.data.skipRate : config.skipRate || 0,
+    'enforcement', enforcement => pick(enforcement || {}, [
       'enforceJS', enforceJS => enforceJS !== false, // defaults to true
       'enforcePBS', enforcePBS => enforcePBS === true, // defaults to false
       'floorDeals', floorDeals => floorDeals === true, // defaults to false
@@ -596,11 +646,11 @@ export function handleSetFloorsConfig(config) {
       getGlobal().requestBids.before(requestBidsHook, 50);
       // if user has debug on then we want to allow the debugging module to run before this, assuming they are testing priceFloors
       // debugging is currently set at 5 priority
-      getHook('addBidResponse').before(addBidResponseHook, utils.debugTurnedOn() ? 4 : 50);
+      getHook('addBidResponse').before(addBidResponseHook, debugTurnedOn() ? 4 : 50);
       addedFloorsHook = true;
     }
   } else {
-    utils.logInfo(`${MODULE_NAME}: Turning off module`);
+    logInfo(`${MODULE_NAME}: Turning off module`);
 
     _floorsConfig = {};
     _floorDataForAuction = {};
@@ -620,6 +670,7 @@ function addFloorDataToBid(floorData, floorInfo, bid, adjustedCpm) {
   bid.floorData = {
     floorValue: floorInfo.matchingFloor,
     floorRule: floorInfo.matchingRule,
+    floorRuleValue: floorInfo.floorRuleValue,
     floorCurrency: floorData.data.currency,
     cpmAfterAdjustments: adjustedCpm,
     enforcements: {...floorData.enforcement},
@@ -635,8 +686,8 @@ function addFloorDataToBid(floorData, floorInfo, bid, adjustedCpm) {
  * @summary takes the enforcement flags and the bid itself and determines if it should be floored
  */
 function shouldFloorBid(floorData, floorInfo, bid) {
-  let enforceJS = utils.deepAccess(floorData, 'enforcement.enforceJS') !== false;
-  let shouldFloorDeal = utils.deepAccess(floorData, 'enforcement.floorDeals') === true || !bid.dealId;
+  let enforceJS = deepAccess(floorData, 'enforcement.enforceJS') !== false;
+  let shouldFloorDeal = deepAccess(floorData, 'enforcement.floorDeals') === true || !bid.dealId;
   let bidBelowFloor = bid.floorData.cpmAfterAdjustments < floorInfo.matchingFloor;
   return enforceJS && (bidBelowFloor && shouldFloorDeal);
 }
@@ -645,20 +696,21 @@ function shouldFloorBid(floorData, floorInfo, bid) {
  * @summary The main driving force of floors. On bidResponse we hook in and intercept bidResponses.
  * And if the rule we find determines a bid should be floored we will do so.
  */
-export function addBidResponseHook(fn, adUnitCode, bid) {
-  let floorData = _floorDataForAuction[this.bidderRequest.auctionId];
-  // if no floor data or associated bidRequest then bail
-  const matchingBidRequest = find(this.bidderRequest.bids, bidRequest => bidRequest.bidId && bidRequest.bidId === bid.requestId);
-  if (!floorData || !bid || floorData.skipped || !matchingBidRequest) {
-    return fn.call(this, adUnitCode, bid);
+export const addBidResponseHook = timedBidResponseHook('priceFloors', function addBidResponseHook(fn, adUnitCode, bid, reject) {
+  let floorData = _floorDataForAuction[bid.auctionId];
+  // if no floor data then bail
+  if (!floorData || !bid || floorData.skipped) {
+    return fn.call(this, adUnitCode, bid, reject);
   }
 
+  const matchingBidRequest = auctionManager.index.getBidRequest(bid);
+
   // get the matching rule
-  let floorInfo = getFirstMatchingFloor(floorData.data, {...matchingBidRequest}, {...bid, size: [bid.width, bid.height]});
+  let floorInfo = getFirstMatchingFloor(floorData.data, matchingBidRequest, {...bid, size: [bid.width, bid.height]});
 
   if (!floorInfo.matchingFloor) {
-    utils.logWarn(`${MODULE_NAME}: unable to determine a matching price floor for bidResponse`, bid);
-    return fn.call(this, adUnitCode, bid);
+    logWarn(`${MODULE_NAME}: unable to determine a matching price floor for bidResponse`, bid);
+    return fn.call(this, adUnitCode, bid, reject);
   }
 
   // determine the base cpm to use based on if the currency matches the floor currency
@@ -673,13 +725,13 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
     try {
       adjustedCpm = getGlobal().convertCurrency(bid.cpm, bidResponseCurrency.toUpperCase(), floorCurrency);
     } catch (err) {
-      utils.logError(`${MODULE_NAME}: Unable do get currency conversion for bidResponse to Floor Currency. Do you have Currency module enabled? ${bid}`);
-      return fn.call(this, adUnitCode, bid);
+      logError(`${MODULE_NAME}: Unable do get currency conversion for bidResponse to Floor Currency. Do you have Currency module enabled? ${bid}`);
+      return fn.call(this, adUnitCode, bid, reject);
     }
   }
 
   // ok we got the bid response cpm in our desired currency. Now we need to run the bidders CPMAdjustment function if it exists
-  adjustedCpm = getBiddersCpmAdjustment(bid.bidderCode, adjustedCpm);
+  adjustedCpm = getBiddersCpmAdjustment(bid.bidderCode, adjustedCpm, bid);
 
   // add necessary data information for analytics adapters / floor providers would possibly need
   addFloorDataToBid(floorData, floorInfo, bid, adjustedCpm);
@@ -687,25 +739,81 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
   // now do the compare!
   if (shouldFloorBid(floorData, floorInfo, bid)) {
     // bid fails floor -> throw it out
-    // create basic bid no-bid with necessary data fro analytics adapters
-    let flooredBid = createBid(CONSTANTS.STATUS.NO_BID, matchingBidRequest);
-    Object.assign(flooredBid, utils.pick(bid, [
-      'floorData',
-      'width',
-      'height',
-      'mediaType',
-      'currency',
-      'originalCpm',
-      'originalCurrency',
-      'getCpmInNewCurrency',
-    ]));
-    flooredBid.status = CONSTANTS.BID_STATUS.BID_REJECTED;
-    // if floor not met update bid with 0 cpm so it is not included downstream and marked as no-bid
-    flooredBid.cpm = 0;
-    utils.logWarn(`${MODULE_NAME}: ${flooredBid.bidderCode}'s Bid Response for ${adUnitCode} was rejected due to floor not met`, bid);
-    return fn.call(this, adUnitCode, flooredBid);
-  }
-  return fn.call(this, adUnitCode, bid);
-}
+    // continue with a "NO_BID" bid, TODO: remove this in v8
+    const flooredBid = reject(CONSTANTS.REJECTION_REASON.FLOOR_NOT_MET);
+    logWarn(`${MODULE_NAME}: ${flooredBid.bidderCode}'s Bid Response for ${adUnitCode} was rejected due to floor not met (adjusted cpm: ${bid?.floorData?.cpmAfterAdjustments}, floor: ${floorInfo?.matchingFloor})`, bid);
+    return fn.call(this, adUnitCode, flooredBid, reject);
+  }
+  return fn.call(this, adUnitCode, bid, reject);
+});
 
 config.getConfig('floors', config => handleSetFloorsConfig(config.floors));
+
+/**
+ * Sets bidfloor and bidfloorcur for ORTB imp objects
+ */
+export function setOrtbImpBidFloor(imp, bidRequest, context) {
+  if (typeof bidRequest.getFloor === 'function') {
+    let currency, floor;
+    try {
+      ({currency, floor} = bidRequest.getFloor({
+        currency: context.currency || config.getConfig('currency.adServerCurrency') || 'USD',
+        mediaType: context.mediaType || '*',
+        size: '*'
+      }));
+    } catch (e) {
+      logWarn('Cannot compute floor for bid', bidRequest);
+      return;
+    }
+    floor = parseFloat(floor);
+    if (currency != null && floor != null && !isNaN(floor)) {
+      Object.assign(imp, {
+        bidfloor: floor,
+        bidfloorcur: currency
+      });
+    }
+  }
+}
+
+export function setImpExtPrebidFloors(imp, bidRequest, context) {
+  // logic below relates to https://github.com/prebid/Prebid.js/issues/8749 and does the following:
+  // 1. check client-side floors (ref bidfloor/bidfloorcur & ortb2Imp floorMin/floorMinCur (if present))
+  // 2. set pbs req wide floorMinCur to the first floor currency found when iterating over imp's
+  //    (if currency conversion logic present, convert all imp floor values to this currency)
+  // 3. compare/store ref to lowest floorMin value as each imp is iterated over
+  // 4. set req wide floorMin and floorMinCur values for pbs after iterations are done
+
+  if (imp.bidfloor != null) {
+    let {floorMinCur, floorMin} = context.reqContext.floorMin || {};
+
+    if (floorMinCur == null) { floorMinCur = imp.bidfloorcur }
+    const ortb2ImpFloorCur = imp.ext?.prebid?.floors?.floorMinCur || imp.ext?.prebid?.floorMinCur || floorMinCur;
+    const ortb2ImpFloorMin = imp.ext?.prebid?.floors?.floorMin || imp.ext?.prebid?.floorMin;
+    const convertedFloorMinValue = beConvertCurrency(imp.bidfloor, imp.bidfloorcur, floorMinCur);
+    const convertedOrtb2ImpFloorMinValue = ortb2ImpFloorMin && ortb2ImpFloorCur ? beConvertCurrency(ortb2ImpFloorMin, ortb2ImpFloorCur, floorMinCur) : false;
+
+    const lowestImpFloorMin = convertedOrtb2ImpFloorMinValue && convertedOrtb2ImpFloorMinValue < convertedFloorMinValue
+      ? convertedOrtb2ImpFloorMinValue
+      : convertedFloorMinValue;
+
+    deepSetValue(imp, 'ext.prebid.floors.floorMin', lowestImpFloorMin);
+    if (floorMin == null || floorMin > lowestImpFloorMin) { floorMin = lowestImpFloorMin }
+    context.reqContext.floorMin = {floorMin, floorMinCur};
+  }
+}
+
+/**
+ * PBS specific extension: set ext.prebid.floors.enabled = false if floors are processed client-side
+ */
+export function setOrtbExtPrebidFloors(ortbRequest, bidderRequest, context) {
+  if (addedFloorsHook) {
+    deepSetValue(ortbRequest, 'ext.prebid.floors.enabled', ortbRequest.ext?.prebid?.floors?.enabled || false);
+  }
+  if (context?.floorMin) {
+    mergeDeep(ortbRequest, {ext: {prebid: {floors: context.floorMin}}})
+  }
+}
+
+registerOrtbProcessor({type: IMP, name: 'bidfloor', fn: setOrtbImpBidFloor});
+registerOrtbProcessor({type: IMP, name: 'extPrebidFloors', fn: setImpExtPrebidFloors, dialects: [PBS], priority: -1});
+registerOrtbProcessor({type: REQUEST, name: 'extPrebidFloors', fn: setOrtbExtPrebidFloors, dialects: [PBS]});
diff --git a/modules/priceFloors.md b/modules/priceFloors.md
index d09be78c620..36ac07ee972 100644
--- a/modules/priceFloors.md
+++ b/modules/priceFloors.md
@@ -11,6 +11,7 @@ pbjs.setConfig({
       enforceJS: true //defaults to true
     },
     auctionDelay: 150, // in milliseconds defaults to 0
+    floorProvider: 'awesomeFloorProviderName', // name of the floor provider (optional)
     endpoint: {
       url: 'http://localhost:1500/floor-domains',
       method: 'GET' // Only get supported for now
@@ -40,6 +41,7 @@ pbjs.setConfig({
 | enabled                | Wether to turn off or on the floors module                                                                          |
 | enforcement            | object of booleans which control certain features of the module                                                     |
 | auctionDelay           | The time to suspend and auction while waiting for a real time price floors fetch to come back                       |
+| floorProvider          | A string identifying the floor provider.|
 | endpoint               | An object describing the endpoint to retrieve floor data from. GET only                                             |
 | data                   | The data to be used to select appropriate floors. See schema for more detail                                        |
 | additionalSchemaFields | An object of additional fields to be used in a floor data object. The schema is KEY: function to retrieve the match |
@@ -59,4 +61,4 @@ This function can takes in an object with the following optional parameters:
 
 If a bid adapter passes in `*` as an attribute, then the `priceFloors` module will attempt to select the best rule based on context.
 
-For example, if an adapter passes in a `*`, but the bidRequest only has a single size and a single mediaType, then the `getFloor` function will attempt to get a rule for that size before matching with the `*` catch-all. Similarily, if mediaType can be inferred on the bidRequest, it will use it.
\ No newline at end of file
+For example, if an adapter passes in a `*`, but the bidRequest only has a single size and a single mediaType, then the `getFloor` function will attempt to get a rule for that size before matching with the `*` catch-all. Similarily, if mediaType can be inferred on the bidRequest, it will use it.
diff --git a/modules/prismaBidAdapter.js b/modules/prismaBidAdapter.js
new file mode 100644
index 00000000000..52a8c18a6fd
--- /dev/null
+++ b/modules/prismaBidAdapter.js
@@ -0,0 +1,199 @@
+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';
+
+const BIDDER_CODE = 'prisma';
+const BIDDER_URL = 'https://prisma.nexx360.io/prebid';
+const CACHE_URL = 'https://prisma.nexx360.io/cache';
+const METRICS_TRACKER_URL = 'https://prisma.nexx360.io/track-imp';
+
+const GVLID = 965;
+
+function getConnectionType() {
+  const connection = navigator.connection || navigator.webkitConnection;
+  if (!connection) {
+    return 0;
+  }
+  switch (connection.type) {
+    case 'ethernet':
+      return 1;
+    case 'wifi':
+      return 2;
+    case 'cellular':
+      switch (connection.effectiveType) {
+        case 'slow-2g':
+        case '2g':
+          return 4;
+        case '3g':
+          return 5;
+        case '4g':
+          return 6;
+        default:
+          return 3;
+      }
+    default:
+      return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: ['prismadirect'], // short code
+  supportedMediaTypes: [BANNER, VIDEO],
+  /**
+         * Determines whether or not the given bid request is valid.
+         *
+         * @param {BidRequest} bid The bid params to validate.
+         * @return boolean True if this is a valid bid, and false otherwise.
+         */
+  isBidRequestValid: function(bid) {
+    return !!(bid.params.account && bid.params.tagId);
+  },
+  /**
+         * Make a server request from the list of BidRequests.
+         *
+         * @param {validBidRequests[]} - an array of bids
+         * @return ServerRequest Info describing the request to the server.
+         */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const adUnits = [];
+    const test = config.getConfig('debug') ? 1 : 0;
+    let adunitValue = null;
+    let userEids = null;
+    Object.keys(validBidRequests).forEach(key => {
+      adunitValue = validBidRequests[key];
+      const foo = {
+        account: adunitValue.params.account,
+        tagId: adunitValue.params.tagId,
+        label: adunitValue.adUnitCode,
+        bidId: adunitValue.bidId,
+        auctionId: adunitValue.auctionId,
+        transactionId: adunitValue.transactionId,
+        mediatypes: adunitValue.mediaTypes,
+        bidfloor: 0,
+        bidfloorCurrency: 'USD',
+        keywords: adunitValue.params.keywords ? transformBidderParamKeywords(adunitValue.params.keywords) : [],
+      }
+      adUnits.push(foo);
+      if (adunitValue.userIdAsEids) userEids = adunitValue.userIdAsEids;
+    });
+    const payload = {
+      adUnits,
+      // TODO: does the fallback make sense here?
+      href: encodeURIComponent(bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation)
+    };
+    if (bidderRequest) { // modules informations (gdpr, ccpa, schain, userId)
+      if (bidderRequest.gdprConsent) {
+        payload.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+        payload.gdprConsent = bidderRequest.gdprConsent.consentString;
+      } else {
+        payload.gdpr = 0;
+        payload.gdprConsent = '';
+      }
+      if (bidderRequest.uspConsent) { payload.uspConsent = bidderRequest.uspConsent; }
+      if (bidderRequest.schain) { payload.schain = bidderRequest.schain; }
+      if (userEids !== null) payload.userEids = userEids;
+    };
+    payload.connectionType = getConnectionType();
+
+    if (test) payload.test = 1;
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: BIDDER_URL,
+      data: payloadString,
+    };
+  },
+  /**
+         * Unpack the response from the server into a list of bids.
+         *
+         * @param {ServerResponse} serverResponse A successful response from the server.
+         * @return {Bid[]} An array of bids which were nested inside the server.
+         */
+  interpretResponse: function(serverResponse, bidRequest) {
+    const serverBody = serverResponse.body;
+    const bidResponses = [];
+    let bidResponse = null;
+    let value = null;
+    if (serverBody.hasOwnProperty('responses')) {
+      Object.keys(serverBody['responses']).forEach(key => {
+        value = serverBody['responses'][key];
+        const url = `${CACHE_URL}?uuid=${value['uuid']}`;
+        bidResponse = {
+          requestId: value['bidId'],
+          cpm: value['cpm'],
+          currency: value['currency'],
+          width: value['width'],
+          height: value['height'],
+          ttl: value['ttl'],
+          creativeId: value['creativeId'],
+          netRevenue: true,
+          prisma: {
+            'ssp': value['bidder'],
+            'consent': value['consent'],
+            'tagId': value['tagId']
+          },
+          meta: {
+            'advertiserDomains': value['adomain'] || []
+          }
+        };
+        if (value.type === 'banner') bidResponse.adUrl = url;
+        if (value.type === 'video') {
+          const params = {
+            type: 'prebid',
+            mediatype: 'video',
+            ssp: value.bidder,
+            tag_id: value.tagId,
+            consent: value.consent,
+            price: value.cpm,
+          };
+          bidResponse.cpm = value.cpm;
+          bidResponse.mediaType = 'video';
+          bidResponse.vastUrl = url;
+          bidResponse.vastImpUrl = `${METRICS_TRACKER_URL}?${new URLSearchParams(params).toString()}`;
+        }
+        bidResponses.push(bidResponse);
+      });
+    }
+    return bidResponses;
+  },
+
+  /**
+     * Register the user sync pixels which should be dropped after the auction.
+     *
+     * @param {SyncOptions} syncOptions Which user syncs are allowed?
+     * @param {ServerResponse[]} serverResponses List of server's responses.
+     * @return {UserSync[]} The user syncs which should be dropped.
+     */
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
+        serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
+      return serverResponses[0].body.cookies.slice(0, 5);
+    } else {
+      return [];
+    }
+  },
+
+  /**
+     * Register bidder specific code, which will execute if a bid from this bidder won the auction
+     * @param {Bid} The bid that won the auction
+     */
+  onBidWon: function(bid) {
+    // fires a pixel to confirm a winning bid
+    const params = { type: 'prebid', mediatype: 'banner' };
+    if (bid.hasOwnProperty('prisma')) {
+      if (bid.prisma.hasOwnProperty('ssp')) params.ssp = bid.prisma.ssp;
+      if (bid.prisma.hasOwnProperty('tagId')) params.tag_id = bid.prisma.tagId;
+      if (bid.prisma.hasOwnProperty('consent')) params.consent = bid.prisma.consent;
+    };
+    params.price = bid.cpm;
+    const url = `${METRICS_TRACKER_URL}?${new URLSearchParams(params).toString()}`;
+    ajax(url, null, undefined, {method: 'GET', withCredentials: true});
+    return true;
+  }
+
+}
+registerBidder(spec);
diff --git a/modules/prismaBidAdapter.md b/modules/prismaBidAdapter.md
new file mode 100644
index 00000000000..a400183cec6
--- /dev/null
+++ b/modules/prismaBidAdapter.md
@@ -0,0 +1,59 @@
+# Overview
+
+```
+Module Name:  Prisma Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: gabriel@nexx360.io
+```
+
+# Description
+
+Connects to Prisma network for bids.
+
+To use us as a bidder you must have an account and an active "tagId" on our platform.
+
+# Test Parameters
+
+## Web
+
+### Display
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'prisma',
+         params: {
+            account: '1067',
+            tagId: 'luvxjvgn'
+         }
+       }]
+   },
+];
+```
+
+### Video Instream
+```
+    var videoAdUnit = {
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'prisma',
+            params: {
+               account: '1067',
+               tagId: 'luvxjvgn'
+            }
+        }]
+    };
+```
diff --git a/modules/projectLimeLightBidAdapter.js b/modules/projectLimeLightBidAdapter.js
deleted file mode 100644
index f2ff77f6229..00000000000
--- a/modules/projectLimeLightBidAdapter.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import {ajax} from '../src/ajax.js';
-import * as utils from '../src/utils.js';
-
-const BIDDER_CODE = 'project-limelight';
-const URL = 'https://ads.project-limelight.com/hb';
-
-/**
- * Determines whether or not the given bid response is valid.
- *
- * @param {object} bid The bid to validate.
- * @return boolean True if this is a valid bid, and false otherwise.
- */
-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.vastXml || bid.vastUrl);
-  }
-  return false;
-}
-
-function extractBidSizes(bid) {
-  const bidSizes = [];
-
-  bid.sizes.forEach(size => {
-    bidSizes.push({
-      width: size[0],
-      height: size[1]
-    });
-  });
-
-  return bidSizes;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: (validBidRequests, bidderRequest) => {
-    let winTop;
-    try {
-      winTop = window.top;
-      winTop.location.toString();
-    } catch (e) {
-      utils.logMessage(e);
-      winTop = window;
-    };
-    const placements = [];
-    const request = {
-      'secure': (location.protocol === 'https:'),
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'adUnits': placements
-    };
-    for (let i = 0; i < validBidRequests.length; i++) {
-      const bid = validBidRequests[i];
-      const params = bid.params;
-      placements.push({
-        id: params.adUnitId,
-        bidId: bid.bidId,
-        transactionId: bid.transactionId,
-        sizes: extractBidSizes(bid),
-        type: params.adUnitType.toUpperCase()
-      });
-    }
-    return {
-      method: 'POST',
-      url: URL,
-      data: request
-    };
-  },
-
-  onBidWon: (bid) => {
-    const cpm = bid.pbMg;
-    if (bid.nurl !== '') {
-      bid.nurl = bid.nurl.replace(
-        /\$\{AUCTION_PRICE\}/,
-        cpm
-      );
-      ajax(bid.nurl, null);
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: (bidResponses) => {
-    const res = [];
-    const bidResponsesBody = bidResponses.body;
-    const len = bidResponsesBody.length;
-    for (let i = 0; i < len; i++) {
-      const bid = bidResponsesBody[i];
-      if (isBidResponseValid(bid)) {
-        res.push(bid);
-      }
-    }
-    return res;
-  },
-};
-
-registerBidder(spec);
diff --git a/modules/projectLimeLightBidAdapter.md b/modules/projectLimeLightBidAdapter.md
deleted file mode 100644
index 71621983b89..00000000000
--- a/modules/projectLimeLightBidAdapter.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Overview
-
-```
-Module Name: Project LimeLight SSP Adapter
-Module Type: Bidder Adapter
-Maintainer: engineering@project-limelight.com
-```
-
-# Description
-
-Module that connects to Project Limelight SSP demand sources
-
-# Test Parameters for banner
-```
-    var adUnits = [{
-                code: 'placementCode',
-                sizes: [[300, 250]],
-                bids: [{
-                        bidder: 'project-limelight',
-                        params: {
-                            adUnitId: 0,
-                            adUnitType: 'banner'
-                        }
-                    }]
-                }
-            ];
-```
-
-# Test Parameters for video
-```
-var videoAdUnit = [{
-                code: 'video1',
-                sizes: [[300, 250]],
-                bids: [{
-                        bidder: 'project-limelight',
-                        params: {
-                            adUnitId: 0,
-                            adUnitType: 'video'
-                        }
-                }]
-            }];
-```
-
-# Configuration
-
-The Project Limelight Bid Adapter expects Prebid Cache(for video) to be enabled so that we can store and retrieve a single vastXml.
-
-```
-pbjs.setConfig({
-    usePrebidCache: true,
-    cache: {
-        url: 'https://prebid.adnxs.com/pbc/v1/cache'
-    }
-});
-```
diff --git a/modules/proxistoreBidAdapter.js b/modules/proxistoreBidAdapter.js
index c546337c47f..04d363be7fb 100644
--- a/modules/proxistoreBidAdapter.js
+++ b/modules/proxistoreBidAdapter.js
@@ -1,59 +1,110 @@
-
+import { isFn, isPlainObject } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
+
 const BIDDER_CODE = 'proxistore';
-const storage = getStorageManager();
 const PROXISTORE_VENDOR_ID = 418;
+const COOKIE_BASE_URL = 'https://abs.proxistore.com/v3/rtb/prebid/multi';
+const COOKIE_LESS_URL =
+  'https://abs.cookieless-proxistore.com/v3/rtb/prebid/multi';
 
 function _createServerRequest(bidRequests, bidderRequest) {
-  const sizeIds = [];
-
+  var sizeIds = [];
   bidRequests.forEach(function (bid) {
-    const sizeId = {
+    var sizeId = {
       id: bid.bidId,
       sizes: bid.sizes.map(function (size) {
         return {
           width: size[0],
-          height: size[1]
+          height: size[1],
         };
-      })
+      }),
+      floor: _assignFloor(bid),
+      segments: _assignSegments(bid),
     };
     sizeIds.push(sizeId);
   });
-  const payload = {
+  var payload = {
     auctionId: bidRequests[0].auctionId,
     transactionId: bidRequests[0].auctionId,
     bids: sizeIds,
     website: bidRequests[0].params.website,
     language: bidRequests[0].params.language,
     gdpr: {
-      applies: false
-    }
-  };
-  const options = {
-    contentType: 'application/json',
-    withCredentials: true
+      applies: false,
+      consentGiven: false,
+    },
   };
 
   if (bidderRequest && bidderRequest.gdprConsent) {
-    if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean' && bidderRequest.gdprConsent.gdprApplies) {
+    var gdprConsent = bidderRequest.gdprConsent;
+
+    if (
+      typeof gdprConsent.gdprApplies === 'boolean' &&
+      gdprConsent.gdprApplies
+    ) {
       payload.gdpr.applies = true;
     }
 
-    if (typeof bidderRequest.gdprConsent.consentString === 'string' && bidderRequest.gdprConsent.consentString) {
+    if (
+      typeof gdprConsent.consentString === 'string' &&
+      gdprConsent.consentString
+    ) {
       payload.gdpr.consentString = bidderRequest.gdprConsent.consentString;
     }
 
-    if (bidderRequest.gdprConsent.vendorData && bidderRequest.gdprConsent.vendorData.vendorConsents && typeof bidderRequest.gdprConsent.vendorData.vendorConsents[PROXISTORE_VENDOR_ID.toString(10)] !== 'undefined') {
-      payload.gdpr.consentGiven = !!bidderRequest.gdprConsent.vendorData.vendorConsents[PROXISTORE_VENDOR_ID.toString(10)];
+    if (gdprConsent.vendorData) {
+      var vendorData = gdprConsent.vendorData;
+
+      if (
+        vendorData.vendor &&
+        vendorData.vendor.consents &&
+        typeof vendorData.vendor.consents[PROXISTORE_VENDOR_ID.toString(10)] !==
+          'undefined'
+      ) {
+        payload.gdpr.consentGiven =
+          !!vendorData.vendor.consents[PROXISTORE_VENDOR_ID.toString(10)];
+      }
     }
   }
 
+  var options = {
+    contentType: 'application/json',
+    withCredentials: payload.gdpr.consentGiven,
+    customHeaders: {
+      version: '1.0.4',
+    },
+  };
+  var endPointUri =
+    payload.gdpr.consentGiven || !payload.gdpr.applies
+      ? COOKIE_BASE_URL
+      : COOKIE_LESS_URL;
+
   return {
     method: 'POST',
-    url: bidRequests[0].params.url || 'https://abs.proxistore.com/' + payload.language + '/v3/rtb/prebid/multi',
+    url: endPointUri,
     data: JSON.stringify(payload),
-    options: options
+    options: options,
+  };
+}
+
+function _assignSegments(bid) {
+  if (
+    bid.ortb2 &&
+    bid.ortb2.user &&
+    bid.ortb2.user.ext &&
+    bid.ortb2.user.ext.data
+  ) {
+    return (
+      bid.ortb2.user.ext.data || {
+        segments: [],
+        contextual_categories: {},
+      }
+    );
+  }
+
+  return {
+    segments: [],
+    contextual_categories: {},
   };
 }
 
@@ -70,7 +121,8 @@ function _createBidResponse(response) {
     netRevenue: response.netRevenue,
     vastUrl: response.vastUrl,
     vastXml: response.vastXml,
-    dealId: response.dealId
+    dealId: response.dealId,
+    meta: response.meta,
   };
 }
 /**
@@ -81,23 +133,8 @@ function _createBidResponse(response) {
  */
 
 function isBidRequestValid(bid) {
-  const hasNoAd = function() {
-    if (!storage.hasLocalStorage()) {
-      return false;
-    }
-    const pxNoAds = storage.getDataFromLocalStorage(`PX_NoAds_${bid.params.website}`);
-    if (!pxNoAds) {
-      return false;
-    } else {
-      const storedDate = new Date(pxNoAds);
-      const now = new Date();
-      const diff = Math.abs(storedDate.getTime() - now.getTime()) / 60000;
-      return diff <= 5;
-    }
-  }
-  return !!(bid.params.website && bid.params.language) && !hasNoAd();
+  return !!(bid.params.website && bid.params.language);
 }
-
 /**
  * Make a server request from the list of BidRequests.
  *
@@ -107,7 +144,8 @@ function isBidRequestValid(bid) {
  */
 
 function buildRequests(bidRequests, bidderRequest) {
-  const request = _createServerRequest(bidRequests, bidderRequest);
+  var request = _createServerRequest(bidRequests, bidderRequest);
+
   return request;
 }
 /**
@@ -119,34 +157,23 @@ function buildRequests(bidRequests, bidderRequest) {
  */
 
 function interpretResponse(serverResponse, bidRequest) {
-  const itemName = `PX_NoAds_${websiteFromBidRequest(bidRequest)}`;
-  if (serverResponse.body.length > 0) {
-    storage.removeDataFromLocalStorage(itemName, true);
-    return serverResponse.body.map(_createBidResponse);
-  } else {
-    storage.setDataInLocalStorage(itemName, new Date());
-    return [];
-  }
+  return serverResponse.body.map(_createBidResponse);
 }
 
-const websiteFromBidRequest = function(bidR) {
-  if (bidR.data) {
-    return JSON.parse(bidR.data).website
-  } else if (bidR.params.website) {
-    return bidR.params.website;
+function _assignFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidFloor ? bid.params.bidFloor : null;
   }
-}
-
-/**
- * Register the user sync pixels which should be dropped after the auction.
- *
- * @param syncOptions Which user syncs are allowed?
- * @param serverResponses List of server's responses.
- * @return The user syncs which should be dropped.
- */
+  const floor = bid.getFloor({
+    currency: 'EUR',
+    mediaType: 'banner',
+    size: '*',
+  });
 
-function getUserSyncs(syncOptions, serverResponses) {
-  return [];
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'EUR') {
+    return floor.floor;
+  }
+  return null;
 }
 
 export const spec = {
@@ -154,7 +181,7 @@ export const spec = {
   isBidRequestValid: isBidRequestValid,
   buildRequests: buildRequests,
   interpretResponse: interpretResponse,
-  getUserSyncs: getUserSyncs
+  gvlid: PROXISTORE_VENDOR_ID,
 };
 
 registerBidder(spec);
diff --git a/modules/pubCommonId.js b/modules/pubCommonId.js
index 174fa6ffe6e..1fde8f8db5b 100644
--- a/modules/pubCommonId.js
+++ b/modules/pubCommonId.js
@@ -3,13 +3,15 @@
  * stored in the page's domain.  When the module is included, an id is generated if needed,
  * persisted as a cookie, and automatically appended to all the bidRequest as bid.crumbs.pubcid.
  */
-import * as utils from '../src/utils.js';
+import { logMessage, parseUrl, buildUrl, triggerPixel, generateUUID, isArray } from '../src/utils.js';
 import { config } from '../src/config.js';
-import events from '../src/events.js';
+import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
+import {timedAuctionHook} from '../src/utils/perfMetrics.js';
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
-const storage = getStorageManager();
+const storage = getStorageManager({moduleName: 'pubCommonId', gvlid: VENDORLESS_GVLID});
 
 const ID_NAME = '_pubcid';
 const OPTOUT_NAME = '_pubcid_optout';
@@ -44,7 +46,7 @@ export function setStorageItem(key, val, expires) {
 
     storage.setDataInLocalStorage(key, val);
   } catch (e) {
-    utils.logMessage(e);
+    logMessage(e);
   }
 }
 
@@ -74,7 +76,7 @@ export function getStorageItem(key) {
       }
     }
   } catch (e) {
-    utils.logMessage(e);
+    logMessage(e);
   }
 
   return val;
@@ -89,7 +91,7 @@ export function removeStorageItem(key) {
     storage.removeDataFromLocalStorage(key + EXP_SUFFIX);
     storage.removeDataFromLocalStorage(key);
   } catch (e) {
-    utils.logMessage(e);
+    logMessage(e);
   }
 }
 
@@ -141,13 +143,13 @@ function queuePixelCallback(pixelUrl, id) {
   id = id || '';
 
   // Use pubcid as a cache buster
-  const urlInfo = utils.parseUrl(pixelUrl);
+  const urlInfo = parseUrl(pixelUrl);
   urlInfo.search.id = encodeURIComponent('pubcid:' + id);
-  const targetUrl = utils.buildUrl(urlInfo);
+  const targetUrl = buildUrl(urlInfo);
 
   events.on(CONSTANTS.EVENTS.AUCTION_END, function auctionEndHandler() {
     events.off(CONSTANTS.EVENTS.AUCTION_END, auctionEndHandler);
-    utils.triggerPixel(targetUrl);
+    triggerPixel(targetUrl);
   });
 
   return true;
@@ -165,7 +167,7 @@ export function getPubcidConfig() { return pubcidConfig; }
  * @param {function} next The next function in the chain
  */
 
-export function requestBidHook(next, config) {
+export const requestBidHook = timedAuctionHook('pubCommonId', function requestBidHook(next, config) {
   let adUnits = config.adUnits || $$PREBID_GLOBAL$$.adUnits;
   let pubcid = null;
 
@@ -177,7 +179,7 @@ export function requestBidHook(next, config) {
   if (typeof window[PUB_COMMON] === 'object') {
     // If the page includes its own pubcid object, then use that instead.
     pubcid = window[PUB_COMMON].getId();
-    utils.logMessage(PUB_COMMON + ': pubcid = ' + pubcid);
+    logMessage(PUB_COMMON + ': pubcid = ' + pubcid);
   } else {
     // Otherwise get the existing cookie
     pubcid = readValue(ID_NAME);
@@ -190,7 +192,7 @@ export function requestBidHook(next, config) {
         }
         // Generate a new id
         if (!pubcid) {
-          pubcid = utils.generateUUID();
+          pubcid = generateUUID();
         }
         // Update the cookie/storage with the latest expiration date
         writeValue(ID_NAME, pubcid, pubcidConfig.interval);
@@ -205,21 +207,23 @@ export function requestBidHook(next, config) {
       }
     }
 
-    utils.logMessage('pbjs: pubcid = ' + pubcid);
+    logMessage('pbjs: pubcid = ' + pubcid);
   }
 
   // Append pubcid to each bid object, which will be incorporated
   // into bid requests later.
   if (adUnits && pubcid) {
     adUnits.forEach((unit) => {
-      unit.bids.forEach((bid) => {
-        Object.assign(bid, {crumbs: {pubcid}});
-      });
+      if (unit.bids && isArray(unit.bids)) {
+        unit.bids.forEach((bid) => {
+          Object.assign(bid, {crumbs: {pubcid}});
+        });
+      }
     });
   }
 
   return next.call(this, config);
-}
+});
 
 // Helper to set a cookie
 export function setCookie(name, value, expires, sameSite) {
diff --git a/modules/pubCommonIdSystem.js b/modules/pubCommonIdSystem.js
deleted file mode 100644
index 8e2be1207f5..00000000000
--- a/modules/pubCommonIdSystem.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * This module adds PubCommonId to the User ID module
- * The {@link module:modules/userId} module is required
- * @module modules/pubCommonIdSystem
- * @requires module:modules/userId
- */
-
-import * as utils from '../src/utils.js';
-import {submodule} from '../src/hook.js';
-
-const PUB_COMMON_ID = 'PublisherCommonId';
-
-const MODULE_NAME = 'pubCommonId';
-
-/** @type {Submodule} */
-export const pubCommonIdSubmodule = {
-  /**
-   * used to link submodule with config
-   * @type {string}
-   */
-  name: MODULE_NAME,
-  /**
-   * Return a callback function that calls the pixelUrl with id as a query parameter
-   * @param pixelUrl
-   * @param id
-   * @returns {function}
-   */
-  makeCallback: function (pixelUrl, id = '') {
-    if (!pixelUrl) {
-      return;
-    }
-
-    // Use pubcid as a cache buster
-    const urlInfo = utils.parseUrl(pixelUrl);
-    urlInfo.search.id = encodeURIComponent('pubcid:' + id);
-    const targetUrl = utils.buildUrl(urlInfo);
-
-    return function () {
-      utils.triggerPixel(targetUrl);
-    };
-  },
-  /**
-   * decode the stored id value for passing to bid requests
-   * @function
-   * @param {string} value
-   * @returns {{pubcid:string}}
-   */
-  decode(value) {
-    return { 'pubcid': value }
-  },
-  /**
-   * performs action to obtain id
-   * @function
-   * @param {SubmoduleParams} [configParams]
-   * @returns {IdResponse}
-   */
-  getId: function ({create = true, pixelUrl} = {}) {
-    try {
-      if (typeof window[PUB_COMMON_ID] === 'object') {
-        // If the page includes its own pubcid module, then save a copy of id.
-        return {id: window[PUB_COMMON_ID].getId()};
-      }
-    } catch (e) {
-    }
-
-    const newId = (create && utils.hasDeviceAccess()) ? utils.generateUUID() : undefined;
-    return {
-      id: newId,
-      callback: this.makeCallback(pixelUrl, newId)
-    }
-  },
-  /**
-   * performs action to extend an id
-   * @function
-   * @param {SubmoduleParams} [configParams]
-   * @param {Object} storedId existing id
-   * @returns {IdResponse|undefined}
-   */
-  extendId: function({extend = false, pixelUrl} = {}, storedId) {
-    try {
-      if (typeof window[PUB_COMMON_ID] === 'object') {
-        // If the page includes its onw pubcid module, then there is nothing to do.
-        return;
-      }
-    } catch (e) {
-    }
-
-    if (extend) {
-      // When extending, only one of response fields is needed
-      const callback = this.makeCallback(pixelUrl, storedId);
-      return callback ? {callback: callback} : {id: storedId};
-    }
-  }
-};
-
-submodule('userId', pubCommonIdSubmodule);
diff --git a/modules/pubProvidedIdSystem.js b/modules/pubProvidedIdSystem.js
new file mode 100644
index 00000000000..baffd997443
--- /dev/null
+++ b/modules/pubProvidedIdSystem.js
@@ -0,0 +1,56 @@
+/**
+ * This module adds Publisher Provided ids support to the User ID module
+ * The {@link module:modules/userId} module is required.
+ * @module modules/pubProvidedSystem
+ * @requires module:modules/userId
+ */
+
+import {submodule} from '../src/hook.js';
+import { logInfo, isArray } from '../src/utils.js';
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
+
+const MODULE_NAME = 'pubProvidedId';
+
+/** @type {Submodule} */
+export const pubProvidedIdSubmodule = {
+
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  gvlid: VENDORLESS_GVLID,
+
+  /**
+   * decode the stored id value for passing to bid request
+   * @function
+   * @param {string} value
+   * @returns {{pubProvidedId: array}} or undefined if value doesn't exists
+   */
+  decode(value) {
+    const res = value ? {pubProvidedId: value} : undefined;
+    logInfo('PubProvidedId: Decoded value ' + JSON.stringify(res));
+    return res;
+  },
+
+  /**
+   * performs action to obtain id and return a value.
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {{id: array}}
+   */
+  getId(config) {
+    const configParams = (config && config.params) || {};
+    let res = [];
+    if (isArray(configParams.eids)) {
+      res = res.concat(configParams.eids);
+    }
+    if (typeof configParams.eidsFunction === 'function') {
+      res = res.concat(configParams.eidsFunction());
+    }
+    return {id: res};
+  }
+};
+
+// Register submodule for userId
+submodule('userId', pubProvidedIdSubmodule);
diff --git a/modules/pubgeniusBidAdapter.js b/modules/pubgeniusBidAdapter.js
index d42073b3da5..5e7ce6fc9fb 100644
--- a/modules/pubgeniusBidAdapter.js
+++ b/modules/pubgeniusBidAdapter.js
@@ -1,27 +1,27 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import {
   deepAccess,
   deepSetValue,
   inIframe,
   isArrayOfNums,
+  isFn,
   isInteger,
-  isNumber,
   isStr,
   logError,
   parseQueryStringParameters,
+  pick,
 } from '../src/utils.js';
 
-const BIDDER_VERSION = '1.0.0';
-const BASE_URL = 'https://ortb.adpearl.io';
-const AUCTION_URL = BASE_URL + '/prebid/auction';
+const BIDDER_VERSION = '1.1.0';
+const BASE_URL = 'https://auction.adpearl.io';
 
 export const spec = {
   code: 'pubgenius',
 
-  supportedMediaTypes: [ BANNER ],
+  supportedMediaTypes: [ BANNER, VIDEO ],
 
   isBidRequestValid(bid) {
     const adUnitId = bid.params.adUnitId;
@@ -30,15 +30,20 @@ export const spec = {
       return false;
     }
 
-    const sizes = deepAccess(bid, 'mediaTypes.banner.sizes');
-    return Boolean(sizes && sizes.length) && sizes.every(size => isArrayOfNums(size, 2));
+    const { mediaTypes } = bid;
+
+    if (mediaTypes.banner) {
+      return isValidBanner(mediaTypes.banner);
+    }
+
+    return isValidVideo(mediaTypes.video, bid.params.video);
   },
 
   buildRequests: function (bidRequests, bidderRequest) {
     const data = {
       id: bidderRequest.auctionId,
       imp: bidRequests.map(buildImp),
-      tmax: config.getConfig('bidderTimeout'),
+      tmax: bidderRequest.timeout,
       ext: {
         pbadapter: {
           version: BIDDER_VERSION,
@@ -66,7 +71,7 @@ export const spec = {
       deepSetValue(data, 'regs.ext.us_privacy', usp);
     }
 
-    const schain = bidderRequest.schain;
+    const schain = bidRequests[0].schain;
     if (schain) {
       deepSetValue(data, 'source.ext.schain', schain);
     }
@@ -85,7 +90,7 @@ export const spec = {
 
     return {
       method: 'POST',
-      url: AUCTION_URL,
+      url: `${getBaseUrl()}/prebid/auction`,
       data,
     };
   },
@@ -128,7 +133,7 @@ export const spec = {
       const qs = parseQueryStringParameters(params);
       syncs.push({
         type: 'iframe',
-        url: `${BASE_URL}/usersync/pixels.html?${qs}`,
+        url: `${getBaseUrl()}/usersync/pixels.html?${qs}`,
       });
     }
 
@@ -136,25 +141,75 @@ export const spec = {
   },
 
   onTimeout(data) {
-    ajax(`${BASE_URL}/prebid/events?type=timeout`, null, JSON.stringify(data), {
+    ajax(`${getBaseUrl()}/prebid/events?type=timeout`, null, JSON.stringify(data), {
       method: 'POST',
     });
   },
 };
 
+function buildVideoParams(videoMediaType, videoParams) {
+  videoMediaType = videoMediaType || {};
+  const params = pick(videoMediaType, [
+    'mimes',
+    'minduration',
+    'maxduration',
+    'protocols',
+    'startdelay',
+    'placement',
+    'skip',
+    'skipafter',
+    'minbitrate',
+    'maxbitrate',
+    'delivery',
+    'playbackmethod',
+    'api',
+    'linearity',
+  ]);
+
+  switch (videoMediaType.context) {
+    case 'instream':
+      params.placement = 1;
+      break;
+    case 'outstream':
+      params.placement = 2;
+      break;
+    default:
+      break;
+  }
+
+  if (videoMediaType.playerSize) {
+    params.w = videoMediaType.playerSize[0][0];
+    params.h = videoMediaType.playerSize[0][1];
+  }
+
+  return Object.assign(params, videoParams);
+}
+
 function buildImp(bid) {
   const imp = {
     id: bid.bidId,
-    banner: {
-      format: deepAccess(bid, 'mediaTypes.banner.sizes').map(size => ({ w: size[0], h: size[1] })),
-      topframe: numericBoolean(!inIframe()),
-    },
     tagid: String(bid.params.adUnitId),
   };
 
-  const bidFloor = bid.params.bidFloor;
-  if (isNumber(bidFloor)) {
-    imp.bidfloor = bidFloor;
+  if (bid.mediaTypes.banner) {
+    imp.banner = {
+      format: bid.mediaTypes.banner.sizes.map(size => ({ w: size[0], h: size[1] })),
+      topframe: numericBoolean(!inIframe()),
+    };
+  } else {
+    imp.video = buildVideoParams(bid.mediaTypes.video, bid.params.video);
+  }
+
+  if (isFn(bid.getFloor)) {
+    const { floor } = bid.getFloor({
+      mediaType: bid.mediaTypes.banner ? 'banner' : 'video',
+      size: '*',
+      currency: 'USD',
+    });
+
+    if (floor) {
+      imp.bidfloor = floor;
+    }
   }
 
   const pos = bid.params.position;
@@ -170,14 +225,21 @@ function buildImp(bid) {
 }
 
 function buildSite(bidderRequest) {
-  const pageUrl = config.getConfig('pageUrl') || bidderRequest.refererInfo.referer;
+  let site = null;
+  const { refererInfo } = bidderRequest;
+
+  const pageUrl = refererInfo.page;
   if (pageUrl) {
-    return {
-      page: pageUrl,
-    };
+    site = site || {};
+    site.page = pageUrl;
+  }
+
+  if (refererInfo.ref) {
+    site = site || {};
+    site.ref = refererInfo.ref;
   }
 
-  return null;
+  return site;
 }
 
 function interpretBid(bid) {
@@ -186,7 +248,6 @@ function interpretBid(bid) {
     cpm: bid.price,
     width: bid.w,
     height: bid.h,
-    ad: bid.adm,
     ttl: bid.exp,
     creativeId: bid.crid,
     netRevenue: true,
@@ -198,6 +259,24 @@ function interpretBid(bid) {
     };
   }
 
+  const pbadapter = deepAccess(bid, 'ext.pbadapter') || {};
+  switch (pbadapter.mediaType) {
+    case 'video':
+      if (bid.nurl) {
+        bidResponse.vastUrl = bid.nurl;
+      }
+
+      if (bid.adm) {
+        bidResponse.vastXml = bid.adm;
+      }
+
+      bidResponse.mediaType = VIDEO;
+      break;
+    default: // banner by default
+      bidResponse.ad = bid.adm;
+      break;
+  }
+
   return bidResponse;
 }
 
@@ -205,4 +284,27 @@ function numericBoolean(value) {
   return value ? 1 : 0;
 }
 
+function getBaseUrl() {
+  const pubg = config.getConfig('pubgenius');
+  return (pubg && pubg.endpoint) || BASE_URL;
+}
+
+function isValidSize(size) {
+  return isArrayOfNums(size, 2) && size[0] > 0 && size[1] > 0;
+}
+
+function isValidBanner(banner) {
+  const sizes = banner.sizes;
+  return !!(sizes && sizes.length) && sizes.every(isValidSize);
+}
+
+function isValidVideo(videoMediaType, videoParams) {
+  const params = buildVideoParams(videoMediaType, videoParams);
+
+  return !!(params.placement &&
+    isValidSize([params.w, params.h]) &&
+    params.mimes && params.mimes.length &&
+    isArrayOfNums(params.protocols) && params.protocols.length);
+}
+
 registerBidder(spec);
diff --git a/modules/pubgeniusBidAdapter.md b/modules/pubgeniusBidAdapter.md
index 66851af9c3f..2a10b421de2 100644
--- a/modules/pubgeniusBidAdapter.md
+++ b/modules/pubgeniusBidAdapter.md
@@ -12,8 +12,6 @@ Module that connects to pubGENIUS's demand sources
 
 # Test Parameters
 
-Test bids have $0.01 CPM by default. Use `bidFloor` in bidder params to control CPM for testing purposes.
-
 ```
 var adUnits = [
   {
@@ -45,12 +43,43 @@ var adUnits = [
         bidder: 'pubgenius',
         params: {
           adUnitId: '1000',
-          bidFloor: 0.5,
           test: true
         }
       }
     ]
-  }
+  },
+  {
+    code: 'test-video',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 360],
+        mimes: ['video/mp4'],
+        protocols: [3],
+      }
+    },
+    bids: [
+      {
+        bidder: 'pubgenius',
+        params: {
+          adUnitId: '1001',
+          test: true,
+
+          // Other video parameters can be put here as in OpenRTB v2.5 spec.
+          // This overrides the same parameters in mediaTypes.video.
+          video: {
+            placement: 1,
+
+            // w and h overrides mediaTypes.video.playerSize.
+            w: 640,
+            h: 360,
+
+            skip: 1
+          }
+        }
+      }
+    ]
+  },
 ];
 ```
 
diff --git a/modules/publinkIdSystem.js b/modules/publinkIdSystem.js
new file mode 100644
index 00000000000..9d5645a38cb
--- /dev/null
+++ b/modules/publinkIdSystem.js
@@ -0,0 +1,144 @@
+/**
+ * This module adds the PublinkId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/publinkIdSystem
+ * @requires module:modules/userId
+ */
+
+import {submodule} from '../src/hook.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {ajax} from '../src/ajax.js';
+import { parseUrl, buildUrl, logError } from '../src/utils.js';
+import {uspDataHandler} from '../src/adapterManager.js';
+
+const MODULE_NAME = 'publinkId';
+const GVLID = 24;
+const PUBLINK_COOKIE = '_publink';
+const PUBLINK_S2S_COOKIE = '_publink_srv';
+
+export const storage = getStorageManager({gvlid: GVLID});
+
+function isHex(s) {
+  return /^[A-F0-9]+$/i.test(s);
+}
+
+function publinkIdUrl(params, consentData) {
+  let url = parseUrl('https://proc.ad.cpe.dotomi.com/cvx/client/sync/publink');
+  url.search = {
+    deh: params.e,
+    mpn: 'Prebid.js',
+    mpv: '$prebid.version$',
+  };
+
+  if (consentData) {
+    url.search.gdpr = (consentData.gdprApplies) ? 1 : 0;
+    url.search.gdpr_consent = consentData.consentString;
+  }
+
+  if (params.site_id) { url.search.sid = params.site_id; }
+
+  if (params.api_key) { url.search.apikey = params.api_key; }
+
+  const usPrivacyString = uspDataHandler.getConsentData();
+  if (usPrivacyString && typeof usPrivacyString === 'string') {
+    url.search.us_privacy = usPrivacyString;
+  }
+
+  return buildUrl(url);
+}
+
+function makeCallback(config = {}, consentData) {
+  return function(prebidCallback) {
+    const options = {method: 'GET', withCredentials: true};
+    let handleResponse = function(responseText, xhr) {
+      if (xhr.status === 200) {
+        let response = JSON.parse(responseText);
+        if (response) {
+          prebidCallback(response.publink);
+        }
+      }
+    };
+
+    if (config.params && config.params.e) {
+      if (isHex(config.params.e)) {
+        ajax(publinkIdUrl(config.params, consentData), handleResponse, undefined, options);
+      } else {
+        logError('params.e must be a hex string');
+      }
+    }
+  };
+}
+
+function getlocalValue() {
+  let result;
+  function getData(key) {
+    let value;
+    if (storage.hasLocalStorage()) {
+      value = storage.getDataFromLocalStorage(key);
+    }
+    if (!value) {
+      value = storage.getCookie(key);
+    }
+
+    if (typeof value === 'string') {
+      // if it's a json object parse it and return the publink value, otherwise assume the value is the id
+      if (value.charAt(0) === '{') {
+        try {
+          const obj = JSON.parse(value);
+          if (obj) {
+            return obj.publink;
+          }
+        } catch (e) {
+          logError(e);
+        }
+      } else {
+        return value;
+      }
+    }
+  }
+  result = getData(PUBLINK_S2S_COOKIE);
+  if (!result) {
+    result = getData(PUBLINK_COOKIE);
+  }
+  return result;
+}
+
+/** @type {Submodule} */
+export const publinkIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  gvlid: GVLID,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} publinkId encrypted userid
+   * @returns {{publinkId: string} | undefined}
+   */
+  decode(publinkId) {
+    return {publinkId: publinkId};
+  },
+
+  /**
+   * performs action to obtain id
+   * Use a publink cookie first if it is present, otherwise use prebids copy, if neither are available callout to get a new id
+   * @function
+   * @param {SubmoduleConfig} [config] Config object with params and storage properties
+   * @param {ConsentData|undefined} consentData GDPR consent
+   * @param {(Object|undefined)} storedId Previously cached id
+   * @returns {IdResponse}
+   */
+  getId: function(config, consentData, storedId) {
+    const localValue = getlocalValue();
+    if (localValue) {
+      return {id: localValue};
+    }
+    if (!storedId) {
+      return {callback: makeCallback(config, consentData)};
+    }
+  }
+};
+submodule('userId', publinkIdSubmodule);
diff --git a/modules/publinkIdSystem.md b/modules/publinkIdSystem.md
new file mode 100644
index 00000000000..263ce490529
--- /dev/null
+++ b/modules/publinkIdSystem.md
@@ -0,0 +1,33 @@
+## Publink User ID Submodule
+
+Publink user id module
+
+## Configuration Descriptions for the `userId` Configuration Section
+
+| Param Name | Required | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Yes | String | module identifier | `"publinkId"` |
+| params.e | Yes | String | hashed email address | `"7D320454942620664D96EF78ED4E3A2A"` |
+| params.api_key | Yes | String | api key for access | `"7ab62359-bdc0-4095-b573-ef474fb55d24"` |
+| params.site_id | Yes | String | site identifier | `"123456"` |
+
+
+### Example configuration for Publink
+```
+pbjs.setConfig({
+       userSync: {
+           userIds: [{
+               name: "publinkId",
+               storage: {
+                   name: "pbjs_publink",
+                   type: "html5"
+               },
+               params: {
+                   e: "7D320454942620664D96EF78ED4E3A2A",           // example hashed email (md5)
+                   site_id: "123456",                               // provided by Epsilon
+                   api_key: "7ab62359-bdc0-4095-b573-ef474fb55d2"   // provided by Epsilon
+               }
+           }],
+       }
+   });
+```
diff --git a/modules/pubmaticAnalyticsAdapter.js b/modules/pubmaticAnalyticsAdapter.js
index a19c6f095ad..cae94f6fe7b 100755
--- a/modules/pubmaticAnalyticsAdapter.js
+++ b/modules/pubmaticAnalyticsAdapter.js
@@ -1,9 +1,9 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import { _each, pick, logWarn, isStr, isArray, logError } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
-import * as utils from '../src/utils.js';
 import { getGlobal } from '../src/prebidGlobal.js';
 
 /// /////////// CONSTANTS //////////////
@@ -30,6 +30,11 @@ const DEFAULT_PUBLISHER_ID = 0;
 const DEFAULT_PROFILE_ID = 0;
 const DEFAULT_PROFILE_VERSION_ID = 0;
 const enc = window.encodeURIComponent;
+const MEDIATYPE = {
+  BANNER: 0,
+  VIDEO: 1,
+  NATIVE: 2
+}
 
 /// /////////// VARIABLES //////////////
 let publisherId = DEFAULT_PUBLISHER_ID; // int: mandatory
@@ -69,7 +74,7 @@ function setMediaTypes(types, bid) {
   if (typeof types === 'object') {
     if (!bid.sizes) {
       bid.dimensions = [];
-      utils._each(types, (type) =>
+      _each(types, (type) =>
         bid.dimensions = bid.dimensions.concat(
           type.sizes.map(sizeToDimensions)
         )
@@ -81,16 +86,19 @@ function setMediaTypes(types, bid) {
 }
 
 function copyRequiredBidDetails(bid) {
-  return utils.pick(bid, [
-    'bidder', bidder => bidder.toLowerCase(),
+  return pick(bid, [
+    'bidder',
+    'bidderCode',
+    'adapterCode',
     'bidId',
     'status', () => NO_BID, // default a bid to NO_BID until response is recieved or bid is timed out
     'finalSource as source',
     'params',
-    'adUnit', () => utils.pick(bid, [
+    'floorData',
+    'adUnit', () => pick(bid, [
       'adUnitCode',
       'transactionId',
-      'sizes as dimensions', sizes => sizes.map(sizeToDimensions),
+      'sizes as dimensions', sizes => sizes && sizes.map(sizeToDimensions),
       'mediaTypes', (types) => setMediaTypes(types, bid)
     ])
   ]);
@@ -115,7 +123,7 @@ function setBidStatus(bid, args) {
 }
 
 function parseBidResponse(bid) {
-  return utils.pick(bid, [
+  return pick(bid, [
     'bidPriceUSD', () => {
       // todo: check whether currency cases are handled here
       if (typeof bid.currency === 'string' && bid.currency.toUpperCase() === CURRENCY_USD) {
@@ -125,7 +133,7 @@ function parseBidResponse(bid) {
       if (typeof bid.getCpmInNewCurrency === 'function') {
         return window.parseFloat(Number(bid.getCpmInNewCurrency(CURRENCY_USD)).toFixed(BID_PRECISION));
       }
-      utils.logWarn(LOG_PRE_FIX + 'Could not determine the Net cpm in USD for the bid thus using bid.cpm', bid);
+      logWarn(LOG_PRE_FIX + 'Could not determine the Net cpm in USD for the bid thus using bid.cpm', bid);
       return bid.cpm
     },
     'bidGrossCpmUSD', () => {
@@ -136,7 +144,7 @@ function parseBidResponse(bid) {
       if (typeof getGlobal().convertCurrency === 'function') {
         return window.parseFloat(Number(getGlobal().convertCurrency(bid.originalCpm, bid.originalCurrency, CURRENCY_USD)).toFixed(BID_PRECISION));
       }
-      utils.logWarn(LOG_PRE_FIX + 'Could not determine the Gross cpm in USD for the bid, thus using bid.originalCpm', bid);
+      logWarn(LOG_PRE_FIX + 'Could not determine the Gross cpm in USD for the bid, thus using bid.originalCpm', bid);
       return bid.originalCpm
     },
     'dealId',
@@ -151,8 +159,11 @@ function parseBidResponse(bid) {
     'bidId',
     'mediaType',
     'params',
+    'floorData',
     'mi',
-    'dimensions', () => utils.pick(bid, [
+    'regexPattern', () => bid.regexPattern || undefined,
+    'partnerImpId', // partner impression ID
+    'dimensions', () => pick(bid, [
       'width',
       'height'
     ])
@@ -165,39 +176,102 @@ function getDomainFromUrl(url) {
   return a.hostname;
 }
 
+function getDevicePlatform() {
+  var deviceType = 3;
+  try {
+    var ua = navigator.userAgent;
+    if (ua && isStr(ua) && ua.trim() != '') {
+      ua = ua.toLowerCase().trim();
+      var isMobileRegExp = new RegExp('(mobi|tablet|ios).*');
+      if (ua.match(isMobileRegExp)) {
+        deviceType = 2;
+      } else {
+        deviceType = 1;
+      }
+    }
+  } catch (ex) {}
+  return deviceType;
+}
+
+function getValueForKgpv(bid, adUnitId) {
+  if (bid.params && bid.params.regexPattern) {
+    return bid.params.regexPattern;
+  } else if (bid.bidResponse && bid.bidResponse.regexPattern) {
+    return bid.bidResponse.regexPattern;
+  } else if (bid.params && bid.params.kgpv) {
+    return bid.params.kgpv;
+  } else {
+    return adUnitId;
+  }
+}
+
+function getAdapterNameForAlias(aliasName) {
+  return adapterManager.aliasRegistry[aliasName] || aliasName;
+}
+
+function getAdDomain(bidResponse) {
+  if (bidResponse.meta && bidResponse.meta.advertiserDomains) {
+    let adomain = bidResponse.meta.advertiserDomains[0]
+    if (adomain) {
+      try {
+        let hostname = (new URL(adomain));
+        return hostname.hostname.replace('www.', '');
+      } catch (e) {
+        logWarn(LOG_PRE_FIX + 'Adomain URL (Not a proper URL):', adomain);
+        return adomain.replace('www.', '');
+      }
+    }
+  }
+}
+
 function gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestBid) {
   highestBid = (highestBid && highestBid.length > 0) ? highestBid[0] : null;
   return Object.keys(adUnit.bids).reduce(function(partnerBids, bidId) {
-    let bid = adUnit.bids[bidId];
-    partnerBids.push({
-      'pn': bid.bidder,
-      'bidid': bid.bidId,
-      'db': bid.bidResponse ? 0 : 1,
-      'kgpv': bid.params.kgpv ? bid.params.kgpv : adUnitId,
-      'kgpsv': bid.params.kgpv ? bid.params.kgpv : adUnitId,
-      'psz': bid.bidResponse ? (bid.bidResponse.dimensions.width + 'x' + bid.bidResponse.dimensions.height) : '0x0',
-      'eg': bid.bidResponse ? bid.bidResponse.bidGrossCpmUSD : 0,
-      'en': bid.bidResponse ? bid.bidResponse.bidPriceUSD : 0,
-      'di': bid.bidResponse ? (bid.bidResponse.dealId || EMPTY_STRING) : EMPTY_STRING,
-      'dc': bid.bidResponse ? (bid.bidResponse.dealChannel || EMPTY_STRING) : EMPTY_STRING,
-      'l1': bid.bidResponse ? bid.clientLatencyTimeMs : 0,
-      'l2': 0,
-      'ss': (s2sBidders.indexOf(bid.bidder) > -1) ? 1 : 0,
-      't': (bid.status == ERROR && bid.error.code == TIMEOUT_ERROR) ? 1 : 0,
-      'wb': (highestBid && highestBid.requestId === bid.bidId ? 1 : 0),
-      'mi': bid.bidResponse ? (bid.bidResponse.mi || undefined) : undefined,
-      'af': bid.bidResponse ? (bid.bidResponse.mediaType || undefined) : undefined,
-      'ocpm': bid.bidResponse ? (bid.bidResponse.originalCpm || 0) : 0,
-      'ocry': bid.bidResponse ? (bid.bidResponse.originalCurrency || CURRENCY_USD) : CURRENCY_USD
+    adUnit.bids[bidId].forEach(function(bid) {
+      partnerBids.push({
+        'pn': getAdapterNameForAlias(bid.adapterCode || bid.bidder),
+        'bc': bid.bidderCode || bid.bidder,
+        'bidid': bid.bidId || bidId,
+        'db': bid.bidResponse ? 0 : 1,
+        'kgpv': getValueForKgpv(bid, adUnitId),
+        'kgpsv': bid.params && bid.params.kgpv ? bid.params.kgpv : adUnitId,
+        'psz': bid.bidResponse ? (bid.bidResponse.dimensions.width + 'x' + bid.bidResponse.dimensions.height) : '0x0',
+        'eg': bid.bidResponse ? bid.bidResponse.bidGrossCpmUSD : 0,
+        'en': bid.bidResponse ? bid.bidResponse.bidPriceUSD : 0,
+        'di': bid.bidResponse ? (bid.bidResponse.dealId || EMPTY_STRING) : EMPTY_STRING,
+        'dc': bid.bidResponse ? (bid.bidResponse.dealChannel || EMPTY_STRING) : EMPTY_STRING,
+        'l1': bid.bidResponse ? bid.clientLatencyTimeMs : 0,
+        'l2': 0,
+        'adv': bid.bidResponse ? getAdDomain(bid.bidResponse) || undefined : undefined,
+        'ss': (s2sBidders.indexOf(bid.bidder) > -1) ? 1 : 0,
+        't': (bid.status == ERROR && bid.error.code == TIMEOUT_ERROR) ? 1 : 0,
+        'wb': (highestBid && highestBid.adId === bid.adId ? 1 : 0),
+        'mi': bid.bidResponse ? (bid.bidResponse.mi || undefined) : undefined,
+        'af': bid.bidResponse ? (bid.bidResponse.mediaType || undefined) : undefined,
+        'ocpm': bid.bidResponse ? (bid.bidResponse.originalCpm || 0) : 0,
+        'ocry': bid.bidResponse ? (bid.bidResponse.originalCurrency || CURRENCY_USD) : CURRENCY_USD,
+        'piid': bid.bidResponse ? (bid.bidResponse.partnerImpId || EMPTY_STRING) : EMPTY_STRING,
+        'frv': (s2sBidders.indexOf(bid.bidder) > -1) ? undefined : (bid.bidResponse ? (bid.bidResponse.floorData ? bid.bidResponse.floorData.floorRuleValue : undefined) : undefined)
+      });
     });
     return partnerBids;
   }, [])
 }
 
+function getAdUnitAdFormats(adUnit) {
+  var af = adUnit ? Object.keys(adUnit.mediaTypes || {}).map(format => MEDIATYPE[format.toUpperCase()]) : [];
+  return af;
+}
+
+function getAdUnit(adUnits, adUnitId) {
+  return adUnits.filter(adUnit => (adUnit.divID && adUnit.divID == adUnitId) || (adUnit.code == adUnitId))[0];
+}
+
 function executeBidsLoggerCall(e, highestCpmBids) {
   let auctionId = e.auctionId;
   let referrer = config.getConfig('pageUrl') || cache.auctions[auctionId].referer || '';
   let auctionCache = cache.auctions[auctionId];
+  let floorData = auctionCache.floorData;
   let outputObj = { s: [] };
   let pixelURL = END_POINT_BID_LOGGER;
 
@@ -218,20 +292,30 @@ function executeBidsLoggerCall(e, highestCpmBids) {
   outputObj['tst'] = Math.round((new window.Date()).getTime() / 1000);
   outputObj['pid'] = '' + profileId;
   outputObj['pdvid'] = '' + profileVersionId;
+  outputObj['dvc'] = {'plt': getDevicePlatform()};
+  outputObj['tgid'] = (function() {
+    var testGroupId = parseInt(config.getConfig('testGroupId') || 0);
+    if (testGroupId <= 15 && testGroupId >= 0) {
+      return testGroupId;
+    }
+    return 0;
+  })();
 
-  // GDPR support
-  if (auctionCache.gdprConsent) {
-    outputObj['cns'] = auctionCache.gdprConsent.consentString || '';
-    outputObj['gdpr'] = auctionCache.gdprConsent.gdprApplies === true ? 1 : 0;
-    pixelURL += '&gdEn=1';
+  if (floorData) {
+    outputObj['fmv'] = floorData.floorRequestData ? floorData.floorRequestData.modelVersion || undefined : undefined;
+    outputObj['ft'] = floorData.floorResponseData ? (floorData.floorResponseData.enforcements.enforceJS == false ? 0 : 1) : undefined;
   }
 
   outputObj.s = Object.keys(auctionCache.adUnitCodes).reduce(function(slotsArray, adUnitId) {
     let adUnit = auctionCache.adUnitCodes[adUnitId];
+    let origAdUnit = getAdUnit(auctionCache.origAdUnits, adUnitId) || {};
     let slotObject = {
       'sn': adUnitId,
+      'au': origAdUnit.adUnitId || adUnitId,
+      'mt': getAdUnitAdFormats(origAdUnit),
       'sz': adUnit.dimensions.map(e => e[0] + 'x' + e[1]),
-      'ps': gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestCpmBids.filter(bid => bid.adUnitCode === adUnitId))
+      'ps': gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestCpmBids.filter(bid => bid.adUnitCode === adUnitId)),
+      'fskp': floorData ? (floorData.floorRequestData ? (floorData.floorRequestData.skipped == false ? 0 : 1) : undefined) : undefined,
     };
     slotsArray.push(slotObject);
     return slotsArray;
@@ -253,7 +337,15 @@ function executeBidsLoggerCall(e, highestCpmBids) {
 
 function executeBidWonLoggerCall(auctionId, adUnitId) {
   const winningBidId = cache.auctions[auctionId].adUnitCodes[adUnitId].bidWon;
-  const winningBid = cache.auctions[auctionId].adUnitCodes[adUnitId].bids[winningBidId];
+  const winningBids = cache.auctions[auctionId].adUnitCodes[adUnitId].bids[winningBidId];
+  let winningBid = winningBids[0];
+
+  if (winningBids.length > 1) {
+    winningBid = winningBids.filter(bid => bid.adId === cache.auctions[auctionId].adUnitCodes[adUnitId].bidWonAdId)[0];
+  }
+
+  const adapterName = getAdapterNameForAlias(winningBid.adapterCode || winningBid.bidder);
+  let origAdUnit = getAdUnit(cache.auctions[auctionId].origAdUnits, adUnitId) || {};
   let pixelURL = END_POINT_WIN_BID_LOGGER;
   pixelURL += 'pubid=' + publisherId;
   pixelURL += '&purl=' + enc(config.getConfig('pageUrl') || cache.auctions[auctionId].referer || '');
@@ -263,10 +355,13 @@ function executeBidWonLoggerCall(auctionId, adUnitId) {
   pixelURL += '&pid=' + enc(profileId);
   pixelURL += '&pdvid=' + enc(profileVersionId);
   pixelURL += '&slot=' + enc(adUnitId);
-  pixelURL += '&pn=' + enc(winningBid.bidder);
+  pixelURL += '&au=' + enc(origAdUnit.adUnitId || adUnitId);
+  pixelURL += '&pn=' + enc(adapterName);
+  pixelURL += '&bc=' + enc(winningBid.bidderCode || winningBid.bidder);
   pixelURL += '&en=' + enc(winningBid.bidResponse.bidPriceUSD);
   pixelURL += '&eg=' + enc(winningBid.bidResponse.bidGrossCpmUSD);
-  pixelURL += '&kgpv=' + enc(winningBid.params.kgpv || adUnitId);
+  pixelURL += '&kgpv=' + enc(getValueForKgpv(winningBid, adUnitId));
+  pixelURL += '&piid=' + enc(winningBid.bidResponse.partnerImpId || EMPTY_STRING);
   ajax(
     pixelURL,
     null,
@@ -284,20 +379,21 @@ function executeBidWonLoggerCall(auctionId, adUnitId) {
 function auctionInitHandler(args) {
   s2sBidders = (function() {
     let s2sConf = config.getConfig('s2sConfig');
-    return (s2sConf && utils.isArray(s2sConf.bidders)) ? s2sConf.bidders : [];
+    return (s2sConf && isArray(s2sConf.bidders)) ? s2sConf.bidders : [];
   }());
-  let cacheEntry = utils.pick(args, [
+  let cacheEntry = pick(args, [
     'timestamp',
     'timeout',
     'bidderDonePendingCount', () => args.bidderRequests.length,
   ]);
   cacheEntry.adUnitCodes = {};
-  cacheEntry.referer = args.bidderRequests[0].refererInfo.referer;
+  cacheEntry.floorData = {};
+  cacheEntry.origAdUnits = args.adUnits;
+  cacheEntry.referer = args.bidderRequests[0].refererInfo.topmostLocation;
   cache.auctions[args.auctionId] = cacheEntry;
 }
 
 function bidRequestedHandler(args) {
-  cache.auctions[args.auctionId].gdprConsent = args.gdprConsent || undefined;
   args.bids.forEach(function(bid) {
     if (!cache.auctions[args.auctionId].adUnitCodes.hasOwnProperty(bid.adUnitCode)) {
       cache.auctions[args.auctionId].adUnitCodes[bid.adUnitCode] = {
@@ -306,16 +402,30 @@ function bidRequestedHandler(args) {
         dimensions: bid.sizes
       };
     }
-    cache.auctions[args.auctionId].adUnitCodes[bid.adUnitCode].bids[bid.bidId] = copyRequiredBidDetails(bid);
+    cache.auctions[args.auctionId].adUnitCodes[bid.adUnitCode].bids[bid.bidId] = [copyRequiredBidDetails(bid)];
+    if (bid.floorData) {
+      cache.auctions[args.auctionId].floorData['floorRequestData'] = bid.floorData;
+    }
   })
 }
 
 function bidResponseHandler(args) {
-  let bid = cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId];
+  let bid = cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId][0];
   if (!bid) {
-    utils.logError(LOG_PRE_FIX + 'Could not find associated bid request for bid response with requestId: ', args.requestId);
+    logError(LOG_PRE_FIX + 'Could not find associated bid request for bid response with requestId: ', args.requestId);
     return;
   }
+
+  if ((bid.bidder && args.bidderCode && bid.bidder !== args.bidderCode) || (bid.bidder === args.bidderCode && bid.status === SUCCESS)) {
+    bid = copyRequiredBidDetails(args);
+    cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId].push(bid);
+  }
+
+  if (args.floorData) {
+    cache.auctions[args.auctionId].floorData['floorResponseData'] = args.floorData;
+  }
+
+  bid.adId = args.adId;
   bid.source = formatSource(bid.source || args.source);
   setBidStatus(bid, args);
   bid.clientLatencyTimeMs = Date.now() - cache.auctions[args.auctionId].timestamp;
@@ -341,6 +451,7 @@ function bidderDoneHandler(args) {
 function bidWonHandler(args) {
   let auctionCache = cache.auctions[args.auctionId];
   auctionCache.adUnitCodes[args.adUnitCode].bidWon = args.requestId;
+  auctionCache.adUnitCodes[args.adUnitCode].bidWonAdId = args.adId;
   executeBidWonLoggerCall(args.auctionId, args.adUnitCode);
 }
 
@@ -357,14 +468,14 @@ function bidTimeoutHandler(args) {
   // db = 0 and t = 1 means bidder did  respond with a bid but post timeout
   args.forEach(badBid => {
     let auctionCache = cache.auctions[badBid.auctionId];
-    let bid = auctionCache.adUnitCodes[badBid.adUnitCode].bids[ badBid.bidId || badBid.requestId ];
+    let bid = auctionCache.adUnitCodes[badBid.adUnitCode].bids[ badBid.bidId || badBid.requestId ][0];
     if (bid) {
       bid.status = ERROR;
       bid.error = {
         code: TIMEOUT_ERROR
       };
     } else {
-      utils.logWarn(LOG_PRE_FIX + 'bid not found');
+      logWarn(LOG_PRE_FIX + 'bid not found');
     }
   });
 }
@@ -384,17 +495,17 @@ let pubmaticAdapter = Object.assign({}, baseAdapter, {
       profileId = Number(conf.options.profileId) || DEFAULT_PROFILE_ID;
       profileVersionId = Number(conf.options.profileVersionId) || DEFAULT_PROFILE_VERSION_ID;
     } else {
-      utils.logError(LOG_PRE_FIX + 'Config not found.');
+      logError(LOG_PRE_FIX + 'Config not found.');
       error = true;
     }
 
     if (!publisherId) {
-      utils.logError(LOG_PRE_FIX + 'Missing publisherId(Number).');
+      logError(LOG_PRE_FIX + 'Missing publisherId(Number).');
       error = true;
     }
 
     if (error) {
-      utils.logError(LOG_PRE_FIX + 'Not collecting data due to error(s).');
+      logError(LOG_PRE_FIX + 'Not collecting data due to error(s).');
     } else {
       baseAdapter.enableAnalytics.call(this, conf);
     }
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 7314d81aee6..296a4314ac8 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -1,12 +1,15 @@
-import * as utils from '../src/utils.js';
+import { getBidRequest, logWarn, _each, isBoolean, isStr, isArray, inIframe, mergeDeep, deepAccess, isNumber, deepSetValue, logInfo, logError, deepClone, convertTypes, uniques } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
+import { BANNER, VIDEO, NATIVE, ADPOD } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { Renderer } from '../src/Renderer.js';
+import { bidderSettings } from '../src/bidderSettings.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'pubmatic';
 const LOG_WARN_PREFIX = 'PubMatic: ';
 const ENDPOINT = 'https://hbopenbid.pubmatic.com/translator?source=prebid-client';
-const USER_SYNC_URL_IFRAME = 'https://ads.pubmatic.com/AdServer/js/showad.js#PIX&kdntuid=1&p=';
+const USER_SYNC_URL_IFRAME = 'https://ads.pubmatic.com/AdServer/js/user_sync.html?kdntuid=1&p=';
 const USER_SYNC_URL_IMAGE = 'https://image8.pubmatic.com/AdServer/ImgSync?p=';
 const DEFAULT_CURRENCY = 'USD';
 const AUCTION_TYPE = 1;
@@ -14,6 +17,9 @@ const UNDEFINED = undefined;
 const DEFAULT_WIDTH = 0;
 const DEFAULT_HEIGHT = 0;
 const PREBID_NATIVE_HELP_LINK = 'http://prebid.org/dev-docs/show-native-ads.html';
+const PUBLICATION = 'pubmatic'; // Your publication on Blue Billywig, potentially with environment (e.g. publication.bbvms.com or publication.test.bbvms.com)
+const RENDERER_URL = 'https://pubmatic.bbvms.com/r/'.concat('$RENDERER', '.js'); // URL of the renderer application
+const MSG_VIDEO_PLACEMENT_MISSING = 'Video.Placement param missing';
 const CUSTOM_PARAMS = {
   'kadpageurl': '', // Custom page url
   'gender': '', // User gender
@@ -45,7 +51,8 @@ const VIDEO_CUSTOM_PARAMS = {
   'linearity': DATA_TYPES.NUMBER,
   'placement': DATA_TYPES.NUMBER,
   'minbitrate': DATA_TYPES.NUMBER,
-  'maxbitrate': DATA_TYPES.NUMBER
+  'maxbitrate': DATA_TYPES.NUMBER,
+  'skip': DATA_TYPES.NUMBER
 }
 
 const NATIVE_ASSETS = {
@@ -98,32 +105,95 @@ const NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS = [
   }
 ]
 
-const NET_REVENUE = false;
+const NET_REVENUE = true;
 const dealChannelValues = {
   1: 'PMP',
   5: 'PREF',
   6: 'PMPG'
 };
 
+// BB stands for Blue BillyWig
+const BB_RENDERER = {
+  bootstrapPlayer: function(bid) {
+    const config = {
+      code: bid.adUnitCode,
+    };
+
+    if (bid.vastXml) config.vastXml = bid.vastXml;
+    else if (bid.vastUrl) config.vastUrl = bid.vastUrl;
+
+    if (!bid.vastXml && !bid.vastUrl) {
+      logWarn(`${LOG_WARN_PREFIX}: No vastXml or vastUrl on bid, bailing...`);
+      return;
+    }
+
+    const rendererId = BB_RENDERER.getRendererId(PUBLICATION, bid.rendererCode);
+
+    const ele = document.getElementById(bid.adUnitCode); // NB convention
+
+    let renderer;
+
+    for (let rendererIndex = 0; rendererIndex < window.bluebillywig.renderers.length; rendererIndex++) {
+      if (window.bluebillywig.renderers[rendererIndex]._id === rendererId) {
+        renderer = window.bluebillywig.renderers[rendererIndex];
+        break;
+      }
+    }
+
+    if (renderer) renderer.bootstrap(config, ele);
+    else logWarn(`${LOG_WARN_PREFIX}: Couldn't find a renderer with ${rendererId}`);
+  },
+  newRenderer: function(rendererCode, adUnitCode) {
+    var rendererUrl = RENDERER_URL.replace('$RENDERER', rendererCode);
+    const renderer = Renderer.install({
+      url: rendererUrl,
+      loaded: false,
+      adUnitCode
+    });
+
+    try {
+      renderer.setRender(BB_RENDERER.outstreamRender);
+    } catch (err) {
+      logWarn(`${LOG_WARN_PREFIX}: Error tying to setRender on renderer`, err);
+    }
+
+    return renderer;
+  },
+  outstreamRender: function(bid) {
+    bid.renderer.push(function() { BB_RENDERER.bootstrapPlayer(bid) });
+  },
+  getRendererId: function(pub, renderer) {
+    return `${pub}-${renderer}`; // NB convention!
+  }
+};
+
+const MEDIATYPE = [
+  BANNER,
+  VIDEO,
+  NATIVE
+]
+
 let publisherId = 0;
 let isInvalidNativeRequest = false;
 let NATIVE_ASSET_ID_TO_KEY_MAP = {};
 let NATIVE_ASSET_KEY_TO_ASSET_MAP = {};
+let biddersList = ['pubmatic'];
+const allBiddersList = ['all'];
 
 // loading NATIVE_ASSET_ID_TO_KEY_MAP
-utils._each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAsset.KEY });
+_each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAsset.KEY });
 // loading NATIVE_ASSET_KEY_TO_ASSET_MAP
-utils._each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
+_each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
 
-function _getDomainFromURL(url) {
+export function _getDomainFromURL(url) {
   let anchor = document.createElement('a');
   anchor.href = url;
   return anchor.hostname;
 }
 
 function _parseSlotParam(paramName, paramValue) {
-  if (!utils.isStr(paramValue)) {
-    paramValue && utils.logWarn(LOG_WARN_PREFIX + 'Ignoring param key: ' + paramName + ', expects string-value, found ' + typeof paramValue);
+  if (!isStr(paramValue)) {
+    paramValue && logWarn(LOG_WARN_PREFIX + 'Ignoring param key: ' + paramName + ', expects string-value, found ' + typeof paramValue);
     return UNDEFINED;
   }
 
@@ -144,9 +214,12 @@ function _parseSlotParam(paramName, paramValue) {
 }
 
 function _cleanSlot(slotName) {
-  if (utils.isStr(slotName)) {
+  if (isStr(slotName)) {
     return slotName.replace(/^\s+/g, '').replace(/\s+$/g, '');
   }
+  if (slotName) {
+    logWarn(BIDDER_CODE + ': adSlot must be a string. Ignoring adSlot');
+  }
   return '';
 }
 
@@ -171,7 +244,7 @@ function _parseAdSlot(bid) {
     // i.e size is specified in adslot, so consider that and ignore sizes array
     splits = splits[1].split('x');
     if (splits.length != 2) {
-      utils.logWarn(LOG_WARN_PREFIX + 'AdSlot Error: adSlot not in required format');
+      logWarn(LOG_WARN_PREFIX + 'AdSlot Error: adSlot not in required format');
       return;
     }
     bid.params.width = parseInt(splits[0], 10);
@@ -199,8 +272,9 @@ function _parseAdSlot(bid) {
 
 function _initConf(refererInfo) {
   return {
-    pageURL: (refererInfo && refererInfo.referer) ? refererInfo.referer : window.location.href,
-    refURL: window.document.referrer
+    // TODO: do the fallbacks make sense here?
+    pageURL: refererInfo?.page || window.location.href,
+    refURL: refererInfo?.ref || window.document.referrer
   };
 }
 
@@ -222,10 +296,10 @@ function _handleCustomParams(params, conf) {
           value = entry.f(value, conf);
         }
 
-        if (utils.isStr(value)) {
+        if (isStr(value)) {
           conf[key] = value;
         } else {
-          utils.logWarn(LOG_WARN_PREFIX + 'Ignoring param : ' + key + ' with value : ' + CUSTOM_PARAMS[key] + ', expects string-value, found ' + typeof value);
+          logWarn(LOG_WARN_PREFIX + 'Ignoring param : ' + key + ' with value : ' + CUSTOM_PARAMS[key] + ', expects string-value, found ' + typeof value);
         }
       }
     }
@@ -262,22 +336,22 @@ function _checkParamDataType(key, value, datatype) {
   var functionToExecute;
   switch (datatype) {
     case DATA_TYPES.BOOLEAN:
-      functionToExecute = utils.isBoolean;
+      functionToExecute = isBoolean;
       break;
     case DATA_TYPES.NUMBER:
-      functionToExecute = utils.isNumber;
+      functionToExecute = isNumber;
       break;
     case DATA_TYPES.STRING:
-      functionToExecute = utils.isStr;
+      functionToExecute = isStr;
       break;
     case DATA_TYPES.ARRAY:
-      functionToExecute = utils.isArray;
+      functionToExecute = isArray;
       break;
   }
   if (functionToExecute(value)) {
     return value;
   }
-  utils.logWarn(LOG_WARN_PREFIX + errMsg);
+  logWarn(LOG_WARN_PREFIX + errMsg);
   return UNDEFINED;
 }
 
@@ -314,41 +388,33 @@ function _createNativeRequest(params) {
                 }
               };
             } else {
-              utils.logWarn(LOG_WARN_PREFIX + 'Error: Title Length is required for native ad: ' + JSON.stringify(params));
+              logWarn(LOG_WARN_PREFIX + 'Error: Title Length is required for native ad: ' + JSON.stringify(params));
             }
             break;
           case NATIVE_ASSETS.IMAGE.KEY:
-            if (params[key].sizes && params[key].sizes.length > 0) {
-              assetObj = {
-                id: NATIVE_ASSETS.IMAGE.ID,
-                required: params[key].required ? 1 : 0,
-                img: {
-                  type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
-                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
-                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
-                  wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
-                  hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
-                  mimes: params[key].mimes,
-                  ext: params[key].ext,
-                }
-              };
-            } else {
-              utils.logWarn(LOG_WARN_PREFIX + 'Error: Image sizes is required for native ad: ' + JSON.stringify(params));
-            }
+            assetObj = {
+              id: NATIVE_ASSETS.IMAGE.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
+                hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
+                mimes: params[key].mimes,
+                ext: params[key].ext,
+              }
+            };
             break;
           case NATIVE_ASSETS.ICON.KEY:
-            if (params[key].sizes && params[key].sizes.length > 0) {
-              assetObj = {
-                id: NATIVE_ASSETS.ICON.ID,
-                required: params[key].required ? 1 : 0,
-                img: {
-                  type: NATIVE_ASSET_IMAGE_TYPE.ICON,
-                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
-                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
-                }
-              };
-            } else {
-              utils.logWarn(LOG_WARN_PREFIX + 'Error: Icon sizes is required for native ad: ' + JSON.stringify(params));
+            assetObj = {
+              id: NATIVE_ASSETS.ICON.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.ICON,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+              }
             };
             break;
           case NATIVE_ASSETS.VIDEO.KEY:
@@ -428,13 +494,13 @@ function _createBannerRequest(bid) {
   var sizes = bid.mediaTypes.banner.sizes;
   var format = [];
   var bannerObj;
-  if (sizes !== UNDEFINED && utils.isArray(sizes)) {
+  if (sizes !== UNDEFINED && isArray(sizes)) {
     bannerObj = {};
     if (!bid.params.width && !bid.params.height) {
       if (sizes.length === 0) {
         // i.e. since bid.params does not have width or height, and length of sizes is 0, need to ignore this banner imp
         bannerObj = UNDEFINED;
-        utils.logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+        logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
         return bannerObj;
       } else {
         bannerObj.w = parseInt(sizes[0][0], 10);
@@ -457,41 +523,44 @@ function _createBannerRequest(bid) {
       }
     }
     bannerObj.pos = 0;
-    bannerObj.topframe = utils.inIframe() ? 0 : 1;
+    bannerObj.topframe = inIframe() ? 0 : 1;
   } else {
-    utils.logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+    logWarn(LOG_WARN_PREFIX + 'Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
     bannerObj = UNDEFINED;
   }
   return bannerObj;
 }
 
+export function checkVideoPlacement(videoData, adUnitCode) {
+  // Check for video.placement property. If property is missing display log message.
+  if (!deepAccess(videoData, 'placement')) {
+    logWarn(MSG_VIDEO_PLACEMENT_MISSING + ' for ' + adUnitCode);
+  };
+}
+
 function _createVideoRequest(bid) {
-  var videoData = bid.params.video;
+  var videoData = mergeDeep(deepAccess(bid.mediaTypes, 'video'), bid.params.video);
   var videoObj;
 
   if (videoData !== UNDEFINED) {
     videoObj = {};
+    checkVideoPlacement(videoData, bid.adUnitCode);
     for (var key in VIDEO_CUSTOM_PARAMS) {
       if (videoData.hasOwnProperty(key)) {
         videoObj[key] = _checkParamDataType(key, videoData[key], VIDEO_CUSTOM_PARAMS[key]);
       }
     }
     // read playersize and assign to h and w.
-    if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
+    if (isArray(bid.mediaTypes.video.playerSize[0])) {
       videoObj.w = parseInt(bid.mediaTypes.video.playerSize[0][0], 10);
       videoObj.h = parseInt(bid.mediaTypes.video.playerSize[0][1], 10);
-    } else if (utils.isNumber(bid.mediaTypes.video.playerSize[0])) {
+    } else if (isNumber(bid.mediaTypes.video.playerSize[0])) {
       videoObj.w = parseInt(bid.mediaTypes.video.playerSize[0], 10);
       videoObj.h = parseInt(bid.mediaTypes.video.playerSize[1], 10);
     }
-    if (bid.params.video.hasOwnProperty('skippable')) {
-      videoObj.ext = {
-        'video_skippable': bid.params.video.skippable ? 1 : 0
-      };
-    }
   } else {
     videoObj = UNDEFINED;
-    utils.logWarn(LOG_WARN_PREFIX + 'Error: Video config params missing for adunit: ' + bid.params.adUnit + ' with mediaType set as video. Ignoring video impression in the adunit.');
+    logWarn(LOG_WARN_PREFIX + 'Error: Video config params missing for adunit: ' + bid.params.adUnit + ' with mediaType set as video. Ignoring video impression in the adunit.');
   }
   return videoObj;
 }
@@ -499,23 +568,70 @@ function _createVideoRequest(bid) {
 // support for PMP deals
 function _addPMPDealsInImpression(impObj, bid) {
   if (bid.params.deals) {
-    if (utils.isArray(bid.params.deals)) {
+    if (isArray(bid.params.deals)) {
       bid.params.deals.forEach(function(dealId) {
-        if (utils.isStr(dealId) && dealId.length > 3) {
+        if (isStr(dealId) && dealId.length > 3) {
           if (!impObj.pmp) {
             impObj.pmp = { private_auction: 0, deals: [] };
           }
           impObj.pmp.deals.push({ id: dealId });
         } else {
-          utils.logWarn(LOG_WARN_PREFIX + 'Error: deal-id present in array bid.params.deals should be a strings with more than 3 charaters length, deal-id ignored: ' + dealId);
+          logWarn(LOG_WARN_PREFIX + 'Error: deal-id present in array bid.params.deals should be a strings with more than 3 charaters length, deal-id ignored: ' + dealId);
         }
       });
     } else {
-      utils.logWarn(LOG_WARN_PREFIX + 'Error: bid.params.deals should be an array of strings.');
+      logWarn(LOG_WARN_PREFIX + 'Error: bid.params.deals should be an array of strings.');
     }
   }
 }
 
+function _addDealCustomTargetings(imp, bid) {
+  var dctr = '';
+  var dctrLen;
+  if (bid.params.dctr) {
+    dctr = bid.params.dctr;
+    if (isStr(dctr) && dctr.length > 0) {
+      var arr = dctr.split('|');
+      dctr = '';
+      arr.forEach(val => {
+        dctr += (val.length > 0) ? (val.trim() + '|') : '';
+      });
+      dctrLen = dctr.length;
+      if (dctr.substring(dctrLen, dctrLen - 1) === '|') {
+        dctr = dctr.substring(0, dctrLen - 1);
+      }
+      imp.ext['key_val'] = dctr.trim();
+    } else {
+      logWarn(LOG_WARN_PREFIX + 'Ignoring param : dctr with value : ' + dctr + ', expects string-value, found empty or non-string value');
+    }
+  }
+}
+
+function _addJWPlayerSegmentData(imp, bid, isS2S) {
+  var jwSegData = (bid.rtd && bid.rtd.jwplayer && bid.rtd.jwplayer.targeting) || undefined;
+  var jwPlayerData = '';
+  const jwMark = 'jw-';
+
+  if (jwSegData === undefined || jwSegData === '' || !jwSegData.hasOwnProperty('segments')) return;
+
+  var maxLength = jwSegData.segments.length;
+
+  jwPlayerData += jwMark + 'id=' + jwSegData.content.id; // add the content id first
+
+  for (var i = 0; i < maxLength; i++) {
+    jwPlayerData += '|' + jwMark + jwSegData.segments[i] + '=1';
+  }
+
+  var ext;
+
+  if (isS2S) {
+    (imp.dctr === undefined || imp.dctr.length == 0) ? imp.dctr = jwPlayerData : imp.dctr += '|' + jwPlayerData;
+  } else {
+    ext = imp.ext;
+    ext && ext.key_val === undefined ? ext.key_val = jwPlayerData : ext.key_val += '|' + jwPlayerData;
+  }
+}
+
 function _createImpressionObject(bid, conf) {
   var impObj = {};
   var bannerObj;
@@ -537,7 +653,8 @@ function _createImpressionObject(bid, conf) {
   };
 
   _addPMPDealsInImpression(impObj, bid);
-
+  _addDealCustomTargetings(impObj, bid);
+  _addJWPlayerSegmentData(impObj, bid);
   if (bid.hasOwnProperty('mediaTypes')) {
     for (mediaTypes in bid.mediaTypes) {
       switch (mediaTypes) {
@@ -552,7 +669,7 @@ function _createImpressionObject(bid, conf) {
           if (!isInvalidNativeRequest) {
             impObj.native = nativeObj;
           } else {
-            utils.logWarn(LOG_WARN_PREFIX + 'Error: Error in Native adunit ' + bid.params.adUnit + '. Ignoring the adunit. Refer to ' + PREBID_NATIVE_HELP_LINK + ' for more details.');
+            logWarn(LOG_WARN_PREFIX + 'Error: Error in Native adunit ' + bid.params.adUnit + '. Ignoring the adunit. Refer to ' + PREBID_NATIVE_HELP_LINK + ' for more details.');
           }
           break;
         case VIDEO:
@@ -570,9 +687,9 @@ function _createImpressionObject(bid, conf) {
       pos: 0,
       w: bid.params.width,
       h: bid.params.height,
-      topframe: utils.inIframe() ? 0 : 1
+      topframe: inIframe() ? 0 : 1
     };
-    if (utils.isArray(sizes) && sizes.length > 1) {
+    if (isArray(sizes) && sizes.length > 1) {
       sizes = sizes.splice(1, sizes.length - 1);
       sizes.forEach(size => {
         format.push({
@@ -585,6 +702,8 @@ function _createImpressionObject(bid, conf) {
     impObj.banner = bannerObj;
   }
 
+  _addImpressionFPD(impObj, bid);
+
   _addFloorFromFloorModule(impObj, bid);
 
   return impObj.hasOwnProperty(BANNER) ||
@@ -592,53 +711,115 @@ function _createImpressionObject(bid, conf) {
             impObj.hasOwnProperty(VIDEO) ? impObj : UNDEFINED;
 }
 
+function _addImpressionFPD(imp, bid) {
+  const ortb2 = {...deepAccess(bid, 'ortb2Imp.ext.data')};
+  Object.keys(ortb2).forEach(prop => {
+    /**
+      * Prebid AdSlot
+      * @type {(string|undefined)}
+    */
+    if (prop === 'pbadslot') {
+      if (typeof ortb2[prop] === 'string' && ortb2[prop]) deepSetValue(imp, 'ext.data.pbadslot', ortb2[prop]);
+    } else if (prop === 'adserver') {
+      /**
+       * Copy GAM AdUnit and Name to imp
+       */
+      ['name', 'adslot'].forEach(name => {
+        /** @type {(string|undefined)} */
+        const value = deepAccess(ortb2, `adserver.${name}`);
+        if (typeof value === 'string' && value) {
+          deepSetValue(imp, `ext.data.adserver.${name.toLowerCase()}`, value);
+          // copy GAM ad unit id as imp[].ext.dfp_ad_unit_code
+          if (name === 'adslot') {
+            deepSetValue(imp, `ext.dfp_ad_unit_code`, value);
+          }
+        }
+      });
+    } else {
+      deepSetValue(imp, `ext.data.${prop}`, ortb2[prop]);
+    }
+  });
+}
+
 function _addFloorFromFloorModule(impObj, bid) {
   let bidFloor = -1;
   // get lowest floor from floorModule
   if (typeof bid.getFloor === 'function' && !config.getConfig('pubmatic.disableFloors')) {
     [BANNER, VIDEO, NATIVE].forEach(mediaType => {
       if (impObj.hasOwnProperty(mediaType)) {
-        let floorInfo = bid.getFloor({ currency: impObj.bidfloorcur, mediaType: mediaType, size: '*' });
-        if (typeof floorInfo === 'object' && floorInfo.currency === impObj.bidfloorcur && !isNaN(parseInt(floorInfo.floor))) {
-          let mediaTypeFloor = parseFloat(floorInfo.floor);
-          bidFloor = (bidFloor == -1 ? mediaTypeFloor : Math.min(mediaTypeFloor, bidFloor))
+        let sizesArray = [];
+
+        if (mediaType === 'banner') {
+          if (impObj[mediaType].w && impObj[mediaType].h) {
+            sizesArray.push([impObj[mediaType].w, impObj[mediaType].h]);
+          }
+          if (isArray(impObj[mediaType].format)) {
+            impObj[mediaType].format.forEach(size => sizesArray.push([size.w, size.h]));
+          }
         }
+
+        if (sizesArray.length === 0) {
+          sizesArray.push('*')
+        }
+
+        sizesArray.forEach(size => {
+          let floorInfo = bid.getFloor({ currency: impObj.bidfloorcur, mediaType: mediaType, size: size });
+          logInfo(LOG_WARN_PREFIX, 'floor from floor module returned for mediatype:', mediaType, ' and size:', size, ' is: currency', floorInfo.currency, 'floor', floorInfo.floor);
+          if (typeof floorInfo === 'object' && floorInfo.currency === impObj.bidfloorcur && !isNaN(parseInt(floorInfo.floor))) {
+            let mediaTypeFloor = parseFloat(floorInfo.floor);
+            logInfo(LOG_WARN_PREFIX, 'floor from floor module:', mediaTypeFloor, 'previous floor value', bidFloor, 'Min:', Math.min(mediaTypeFloor, bidFloor));
+            if (bidFloor === -1) {
+              bidFloor = mediaTypeFloor;
+            } else {
+              bidFloor = Math.min(mediaTypeFloor, bidFloor)
+            }
+            logInfo(LOG_WARN_PREFIX, 'new floor value:', bidFloor);
+          }
+        });
       }
     });
   }
   // get highest from impObj.bidfllor and floor from floor module
   // as we are using Math.max, it is ok if we have not got any floor from floorModule, then value of bidFloor will be -1
   if (impObj.bidfloor) {
+    logInfo(LOG_WARN_PREFIX, 'floor from floor module:', bidFloor, 'impObj.bidfloor', impObj.bidfloor, 'Max:', Math.max(bidFloor, impObj.bidfloor));
     bidFloor = Math.max(bidFloor, impObj.bidfloor)
   }
 
   // assign value only if bidFloor is > 0
   impObj.bidfloor = ((!isNaN(bidFloor) && bidFloor > 0) ? bidFloor : UNDEFINED);
+  logInfo(LOG_WARN_PREFIX, 'new impObj.bidfloor value:', impObj.bidfloor);
 }
 
 function _handleEids(payload, validBidRequests) {
-  const bidUserIdAsEids = utils.deepAccess(validBidRequests, '0.userIdAsEids');
-  if (utils.isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
-    utils.deepSetValue(payload, 'user.eids', bidUserIdAsEids);
+  let bidUserIdAsEids = deepAccess(validBidRequests, '0.userIdAsEids');
+  if (isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
+    deepSetValue(payload, 'user.eids', bidUserIdAsEids);
   }
 }
 
-function _checkMediaType(adm, newBid) {
+function _checkMediaType(bid, newBid) {
   // Create a regex here to check the strings
-  var admStr = '';
-  var videoRegex = new RegExp(/VAST\s+version/);
-  if (adm.indexOf('span class="PubAPIAd"') >= 0) {
-    newBid.mediaType = BANNER;
-  } else if (videoRegex.test(adm)) {
-    newBid.mediaType = VIDEO;
+  if (bid.ext && bid.ext['bidtype'] != undefined) {
+    newBid.mediaType = MEDIATYPE[bid.ext.bidtype];
   } else {
-    try {
-      admStr = JSON.parse(adm.replace(/\\/g, ''));
-      if (admStr && admStr.native) {
-        newBid.mediaType = NATIVE;
+    logInfo(LOG_WARN_PREFIX + 'bid.ext.bidtype does not exist, checking alternatively for mediaType');
+    var adm = bid.adm;
+    var admStr = '';
+    var videoRegex = new RegExp(/VAST\s+version/);
+    if (adm.indexOf('span class="PubAPIAd"') >= 0) {
+      newBid.mediaType = BANNER;
+    } else if (videoRegex.test(adm)) {
+      newBid.mediaType = VIDEO;
+    } else {
+      try {
+        admStr = JSON.parse(adm.replace(/\\/g, ''));
+        if (admStr && admStr.native) {
+          newBid.mediaType = NATIVE;
+        }
+      } catch (e) {
+        logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + adm);
       }
-    } catch (e) {
-      utils.logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + adm);
     }
   }
 }
@@ -650,7 +831,7 @@ function _parseNativeResponse(bid, newBid) {
     try {
       adm = JSON.parse(bid.adm.replace(/\\/g, ''));
     } catch (ex) {
-      utils.logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + newBid.adm);
+      logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + newBid.adm);
       return;
     }
     if (adm && adm.native && adm.native.assets && adm.native.assets.length > 0) {
@@ -710,7 +891,7 @@ function _blockedIabCategoriesValidation(payload, blockedIabCategories) {
       if (typeof category === 'string') { // only strings
         return true;
       } else {
-        utils.logWarn(LOG_WARN_PREFIX + 'bcat: Each category should be a string, ignoring category: ' + category);
+        logWarn(LOG_WARN_PREFIX + 'bcat: Each category should be a string, ignoring category: ' + category);
         return false;
       }
     })
@@ -719,47 +900,83 @@ function _blockedIabCategoriesValidation(payload, blockedIabCategories) {
       if (category.length > 3) {
         return arr.indexOf(category) === index; // unique value only
       } else {
-        utils.logWarn(LOG_WARN_PREFIX + 'bcat: Each category should have a value of a length of more than 3 characters, ignoring category: ' + category)
+        logWarn(LOG_WARN_PREFIX + 'bcat: Each category should have a value of a length of more than 3 characters, ignoring category: ' + category)
       }
     });
   if (blockedIabCategories.length > 0) {
-    utils.logWarn(LOG_WARN_PREFIX + 'bcat: Selected: ', blockedIabCategories);
+    logWarn(LOG_WARN_PREFIX + 'bcat: Selected: ', blockedIabCategories);
     payload.bcat = blockedIabCategories;
   }
 }
 
-function _handleDealCustomTargetings(payload, dctrArr, validBidRequests) {
-  var dctr = '';
-  var dctrLen;
-  // set dctr value in site.ext, if present in validBidRequests[0], else ignore
-  if (dctrArr.length > 0) {
-    if (validBidRequests[0].params.hasOwnProperty('dctr')) {
-      dctr = validBidRequests[0].params.dctr;
-      if (utils.isStr(dctr) && dctr.length > 0) {
-        var arr = dctr.split('|');
-        dctr = '';
-        arr.forEach(val => {
-          dctr += (val.length > 0) ? (val.trim() + '|') : '';
-        });
-        dctrLen = dctr.length;
-        if (dctr.substring(dctrLen, dctrLen - 1) === '|') {
-          dctr = dctr.substring(0, dctrLen - 1);
-        }
-        payload.site.ext = {
-          key_val: dctr.trim()
-        }
+function _allowedIabCategoriesValidation(payload, allowedIabCategories) {
+  allowedIabCategories = allowedIabCategories
+    .filter(function(category) {
+      if (typeof category === 'string') { // returns only strings
+        return true;
       } else {
-        utils.logWarn(LOG_WARN_PREFIX + 'Ignoring param : dctr with value : ' + dctr + ', expects string-value, found empty or non-string value');
+        logWarn(LOG_WARN_PREFIX + 'acat: Each category should be a string, ignoring category: ' + category);
+        return false;
       }
-      if (dctrArr.length > 1) {
-        utils.logWarn(LOG_WARN_PREFIX + 'dctr value found in more than 1 adunits. Value from 1st adunit will be picked. Ignoring values from subsequent adunits');
+    })
+    .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) {
+    for (let bidderRequestBidsIndex = 0; bidderRequestBidsIndex < request.bidderRequest.bids.length; bidderRequestBidsIndex++) {
+      if (request.bidderRequest.bids[bidderRequestBidsIndex].bidId === newBid.requestId) {
+        bidParams = request.bidderRequest.bids[bidderRequestBidsIndex].params;
+        context = request.bidderRequest.bids[bidderRequestBidsIndex].mediaTypes[VIDEO].context;
+        adUnitCode = request.bidderRequest.bids[bidderRequestBidsIndex].adUnitCode;
       }
-    } else {
-      utils.logWarn(LOG_WARN_PREFIX + 'dctr value not found in 1st adunit, ignoring values from subsequent adunits');
+    }
+    if (context && context === 'outstream' && bidParams && bidParams.outstreamAU && adUnitCode) {
+      newBid.rendererCode = bidParams.outstreamAU;
+      newBid.renderer = BB_RENDERER.newRenderer(newBid.rendererCode, adUnitCode);
     }
   }
 }
 
+/**
+ * In case of adpod video context, assign prebiddealpriority to the dealtier property of adpod-video bid,
+ * so that adpod module can set the hb_pb_cat_dur targetting key.
+ * @param {*} newBid
+ * @param {*} bid
+ * @param {*} request
+ * @returns
+ */
+export function assignDealTier(newBid, bid, request) {
+  if (!bid?.ext?.prebiddealpriority) return;
+  const bidRequest = getBidRequest(newBid.requestId, [request.bidderRequest]);
+  const videoObj = deepAccess(bidRequest, 'mediaTypes.video');
+  if (videoObj?.context != ADPOD) return;
+
+  const duration = bid?.ext?.video?.duration || videoObj?.maxduration;
+  // if (!duration) return;
+  newBid.video = {
+    context: ADPOD,
+    durationSeconds: duration,
+    dealTier: bid.ext.prebiddealpriority
+  };
+}
+
+function isNonEmptyArray(test) {
+  if (isArray(test) === true) {
+    if (test.length > 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 76,
@@ -772,16 +989,43 @@ export const spec = {
   */
   isBidRequestValid: bid => {
     if (bid && bid.params) {
-      if (!utils.isStr(bid.params.publisherId)) {
-        utils.logWarn(LOG_WARN_PREFIX + 'Error: publisherId is mandatory and cannot be numeric. Call to OpenBid will not be sent for ad unit: ' + JSON.stringify(bid));
+      if (!isStr(bid.params.publisherId)) {
+        logWarn(LOG_WARN_PREFIX + 'Error: publisherId is mandatory and cannot be numeric (wrap it in quotes in your config). Call to OpenBid will not be sent for ad unit: ' + JSON.stringify(bid));
         return false;
       }
       // video ad validation
-      if (bid.params.hasOwnProperty('video')) {
-        if (!bid.params.video.hasOwnProperty('mimes') || !utils.isArray(bid.params.video.mimes) || bid.params.video.mimes.length === 0) {
-          utils.logWarn(LOG_WARN_PREFIX + 'Error: For video ads, mimes is mandatory and must specify atlease 1 mime value. Call to OpenBid will not be sent for ad unit:' + JSON.stringify(bid));
+      if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
+        // bid.mediaTypes.video.mimes OR bid.params.video.mimes should be present and must be a non-empty array
+        let mediaTypesVideoMimes = deepAccess(bid.mediaTypes, 'video.mimes');
+        let paramsVideoMimes = deepAccess(bid, 'params.video.mimes');
+        if (isNonEmptyArray(mediaTypesVideoMimes) === false && isNonEmptyArray(paramsVideoMimes) === false) {
+          logWarn(LOG_WARN_PREFIX + 'Error: For video ads, bid.mediaTypes.video.mimes OR bid.params.video.mimes should be present and must be a non-empty array. Call to OpenBid will not be sent for ad unit:' + JSON.stringify(bid));
+          return false;
+        }
+
+        if (!bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
+          logError(`${LOG_WARN_PREFIX}: no context specified in bid. Rejecting bid: `, bid);
           return false;
         }
+
+        if (bid.mediaTypes[VIDEO].context === 'outstream' &&
+          !isStr(bid.params.outstreamAU) &&
+          !bid.hasOwnProperty('renderer') &&
+          !bid.mediaTypes[VIDEO].hasOwnProperty('renderer')) {
+          // we are here since outstream ad-unit is provided without outstreamAU and renderer
+          // so it is not a valid video ad-unit
+          // but it may be valid banner or native ad-unit
+          // so if mediaType banner or Native is present then  we will remove media-type video and return true
+
+          if (bid.mediaTypes.hasOwnProperty(BANNER) || bid.mediaTypes.hasOwnProperty(NATIVE)) {
+            delete bid.mediaTypes[VIDEO];
+            logWarn(`${LOG_WARN_PREFIX}: for "outstream" bids either outstreamAU parameter must be provided or ad unit supplied renderer is required. Rejecting mediatype Video of bid: `, bid);
+            return true;
+          } else {
+            logError(`${LOG_WARN_PREFIX}: for "outstream" bids either outstreamAU parameter must be provided or ad unit supplied renderer is required. Rejecting bid: `, bid);
+            return false;
+          }
+        }
       }
       return true;
     }
@@ -795,6 +1039,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     var refererInfo;
     if (bidderRequest && bidderRequest.refererInfo) {
       refererInfo = bidderRequest.refererInfo;
@@ -805,18 +1051,19 @@ export const spec = {
     var dctrArr = [];
     var bid;
     var blockedIabCategories = [];
+    var allowedIabCategories = [];
 
     validBidRequests.forEach(originalBid => {
-      bid = utils.deepClone(originalBid);
+      bid = deepClone(originalBid);
       bid.params.adSlot = bid.params.adSlot || '';
       _parseAdSlot(bid);
-      if (bid.params.hasOwnProperty('video')) {
+      if ((bid.mediaTypes && bid.mediaTypes.hasOwnProperty('video')) || bid.params.hasOwnProperty('video')) {
         // Nothing to do
       } else {
         // If we have a native mediaType configured alongside banner, its ok if the banner size is not set in width and height
         // The corresponding banner imp object will not be generated, but we still want the native object to be sent, hence the following check
         if (!(bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(NATIVE)) && bid.params.width === 0 && bid.params.height === 0) {
-          utils.logWarn(LOG_WARN_PREFIX + 'Skipping the non-standard adslot: ', bid.params.adSlot, JSON.stringify(bid));
+          logWarn(LOG_WARN_PREFIX + 'Skipping the non-standard adslot: ', bid.params.adSlot, JSON.stringify(bid));
           return;
         }
       }
@@ -826,16 +1073,19 @@ export const spec = {
       if (bidCurrency === '') {
         bidCurrency = bid.params.currency || UNDEFINED;
       } else if (bid.params.hasOwnProperty('currency') && bidCurrency !== bid.params.currency) {
-        utils.logWarn(LOG_WARN_PREFIX + 'Currency specifier ignored. Only one currency permitted.');
+        logWarn(LOG_WARN_PREFIX + 'Currency specifier ignored. Only one currency permitted.');
       }
       bid.params.currency = bidCurrency;
       // check if dctr is added to more than 1 adunit
-      if (bid.params.hasOwnProperty('dctr') && utils.isStr(bid.params.dctr)) {
+      if (bid.params.hasOwnProperty('dctr') && isStr(bid.params.dctr)) {
         dctrArr.push(bid.params.dctr);
       }
-      if (bid.params.hasOwnProperty('bcat') && utils.isArray(bid.params.bcat)) {
+      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);
@@ -851,11 +1101,26 @@ export const spec = {
     payload.ext.wrapper = {};
     payload.ext.wrapper.profile = parseInt(conf.profId) || UNDEFINED;
     payload.ext.wrapper.version = parseInt(conf.verId) || UNDEFINED;
-    payload.ext.wrapper.wiid = conf.wiid || UNDEFINED;
+    payload.ext.wrapper.wiid = conf.wiid || bidderRequest.auctionId;
     // eslint-disable-next-line no-undef
     payload.ext.wrapper.wv = $$REPO_AND_VERSION$$;
     payload.ext.wrapper.transactionId = conf.transactionId;
     payload.ext.wrapper.wp = 'pbjs';
+    const allowAlternateBidder = bidderRequest ? bidderSettings.get(bidderRequest.bidderCode, 'allowAlternateBidderCodes') : undefined;
+    if (allowAlternateBidder !== undefined) {
+      payload.ext.marketplace = {};
+      if (bidderRequest && allowAlternateBidder == true) {
+        let allowedBiddersList = bidderSettings.get(bidderRequest.bidderCode, 'allowedAlternateBidderCodes');
+        if (isArray(allowedBiddersList)) {
+          allowedBiddersList = allowedBiddersList.map(val => val.trim().toLowerCase()).filter(val => !!val).filter(uniques);
+          biddersList = allowedBiddersList.includes('*') ? allBiddersList : [...biddersList, ...allowedBiddersList];
+        } else {
+          biddersList = allBiddersList;
+        }
+      }
+      payload.ext.marketplace.allowedbidders = biddersList.filter(uniques);
+    }
+
     payload.user.gender = (conf.gender ? conf.gender.trim() : UNDEFINED);
     payload.user.geo = {};
     payload.user.geo.lat = _parseSlotParam('lat', conf.lat);
@@ -865,13 +1130,21 @@ export const spec = {
     payload.site.page = conf.kadpageurl.trim() || payload.site.page.trim();
     payload.site.domain = _getDomainFromURL(payload.site.page);
 
+    // add the content object from config in request
+    if (typeof config.getConfig('content') === 'object') {
+      payload.site.content = config.getConfig('content');
+    }
+
     // merge the device from config.getConfig('device')
     if (typeof config.getConfig('device') === 'object') {
       payload.device = Object.assign(payload.device, config.getConfig('device'));
     }
 
+    // update device.language to ISO-639-1-alpha-2 (2 character language)
+    payload.device.language = payload.device.language && payload.device.language.split('-')[0];
+
     // passing transactionId in source.tid
-    utils.deepSetValue(payload, 'source.tid', conf.transactionId);
+    deepSetValue(payload, 'source.tid', conf.transactionId);
 
     // test bids
     if (window.location.href.indexOf('pubmaticTest=true') !== -1) {
@@ -880,29 +1153,63 @@ export const spec = {
 
     // adding schain object
     if (validBidRequests[0].schain) {
-      utils.deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
+      deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
     }
 
     // Attaching GDPR Consent Params
     if (bidderRequest && bidderRequest.gdprConsent) {
-      utils.deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-      utils.deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+      deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
     }
 
     // CCPA
     if (bidderRequest && bidderRequest.uspConsent) {
-      utils.deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+      deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     }
 
     // coppa compliance
     if (config.getConfig('coppa') === true) {
-      utils.deepSetValue(payload, 'regs.coppa', 1);
+      deepSetValue(payload, 'regs.coppa', 1);
     }
 
-    _handleDealCustomTargetings(payload, dctrArr, validBidRequests);
     _handleEids(payload, validBidRequests);
+
+    // First Party Data
+    const commonFpd = (bidderRequest && bidderRequest.ortb2) || {};
+    if (commonFpd.site) {
+      const { page, domain, ref } = payload.site;
+      mergeDeep(payload, {site: commonFpd.site});
+      payload.site.page = page;
+      payload.site.domain = domain;
+      payload.site.ref = ref;
+    }
+    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);
 
+    // Check if bidderRequest has timeout property if present send timeout as tmax value to translator request
+    // bidderRequest has timeout property if publisher sets during calling requestBids function from page
+    // if not bidderRequest contains global value set by Prebid
+    if (bidderRequest?.timeout) {
+      payload.tmax = bidderRequest.timeout || config.getConfig('bidderTimeout');
+    } else {
+      payload.tmax = window?.PWT?.versionDetails?.timeout;
+    }
+
+    // Sending epoch timestamp in request.ext object
+    payload.ext.epoch = new Date().getTime();
+
     // 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') {
@@ -910,13 +1217,19 @@ export const spec = {
       // not copying domain from site as it is a derived value from page
       payload.app.publisher = payload.site.publisher;
       payload.app.ext = payload.site.ext || UNDEFINED;
+      // We will also need to pass content object in app.content if app object is also set into the config;
+      // BUT do not use content object from config if content object is present in app as app.content
+      if (typeof payload.app.content !== 'object') {
+        payload.app.content = payload.site.content || UNDEFINED;
+      }
       delete payload.site;
     }
 
     return {
       method: 'POST',
       url: ENDPOINT,
-      data: JSON.stringify(payload)
+      data: JSON.stringify(payload),
+      bidderRequest: bidderRequest
     };
   },
 
@@ -932,16 +1245,16 @@ export const spec = {
     let parsedRequest = JSON.parse(request.data);
     let parsedReferrer = parsedRequest.site && parsedRequest.site.ref ? parsedRequest.site.ref : '';
     try {
-      if (response.body && response.body.seatbid && utils.isArray(response.body.seatbid)) {
+      if (response.body && response.body.seatbid && isArray(response.body.seatbid)) {
         // Supporting multiple bid responses for same adSize
         respCur = response.body.cur || respCur;
         response.body.seatbid.forEach(seatbidder => {
           seatbidder.bid &&
-            utils.isArray(seatbidder.bid) &&
+            isArray(seatbidder.bid) &&
             seatbidder.bid.forEach(bid => {
               let newBid = {
                 requestId: bid.impid,
-                cpm: (parseFloat(bid.price) || 0).toFixed(2),
+                cpm: parseFloat((bid.price || 0).toFixed(2)),
                 width: bid.w,
                 height: bid.h,
                 creativeId: bid.crid || bid.id,
@@ -952,12 +1265,13 @@ export const spec = {
                 referrer: parsedReferrer,
                 ad: bid.adm,
                 pm_seat: seatbidder.seat || null,
-                pm_dspid: bid.ext && bid.ext.dspid ? bid.ext.dspid : null
+                pm_dspid: bid.ext && bid.ext.dspid ? bid.ext.dspid : null,
+                partnerImpId: bid.id || '' // partner impression Id
               };
               if (parsedRequest.imp && parsedRequest.imp.length > 0) {
                 parsedRequest.imp.forEach(req => {
                   if (bid.impid === req.id) {
-                    _checkMediaType(bid.adm, newBid);
+                    _checkMediaType(bid, newBid);
                     switch (newBid.mediaType) {
                       case BANNER:
                         break;
@@ -965,6 +1279,8 @@ export const spec = {
                         newBid.width = bid.hasOwnProperty('w') ? bid.w : req.video.w;
                         newBid.height = bid.hasOwnProperty('h') ? bid.h : req.video.h;
                         newBid.vastXml = bid.adm;
+                        _assignRenderer(newBid, request);
+                        assignDealTier(newBid, bid, request);
                         break;
                       case NATIVE:
                         _parseNativeResponse(bid, newBid);
@@ -985,6 +1301,7 @@ export const spec = {
                 newBid.meta.buyerId = bid.ext.advid;
               }
               if (bid.adomain && bid.adomain.length > 0) {
+                newBid.meta.advertiserDomains = bid.adomain;
                 newBid.meta.clickUrl = bid.adomain[0];
               }
 
@@ -995,12 +1312,18 @@ export const spec = {
                 };
               }
 
+              // if from the server-response the bid.ext.marketplace is set then
+              //    submit the bid to Prebid as marketplace name
+              if (bid.ext && !!bid.ext.marketplace) {
+                newBid.bidderCode = bid.ext.marketplace;
+              }
+
               bidResponses.push(newBid);
             });
         });
       }
     } catch (error) {
-      utils.logError(error);
+      logError(error);
     }
     return bidResponses;
   },
@@ -1046,8 +1369,10 @@ export const spec = {
    * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
    * @return {Object} params bid params
    */
-  transformBidParams: function (params, isOpenRtb) {
-    return utils.convertTypes({
+
+  transformBidParams: function (params, isOpenRtb, adUnit, bidRequests) {
+    _addJWPlayerSegmentData(params, adUnit.bids[0], true);
+    return convertTypes({
       'publisherId': 'string',
       'adSlot': 'string'
     }, params);
diff --git a/modules/pubmaticBidAdapter.md b/modules/pubmaticBidAdapter.md
index a045bed3e2b..baf58177505 100644
--- a/modules/pubmaticBidAdapter.md
+++ b/modules/pubmaticBidAdapter.md
@@ -24,8 +24,9 @@ var adUnits = [
     bids: [{
       bidder: 'pubmatic',
       params: {
-        publisherId: '156209',               // required
-        adSlot: 'pubmatic_test2',            // optional
+        publisherId: '156209',               // required, must be a string, not an integer or other js type.
+        outstreamAU: 'renderer_test_pubmatic',   // required if mediaTypes-> video-> context is 'outstream' and optional if renderer is defined in adUnits or in mediaType video. This value can be get by BlueBillyWig Team.
+        adSlot: 'pubmatic_test2',            // optional, must be a string, not an integer or other js type.
         pmzoneid: 'zone1, zone11',           // optional
         lat: '40.712775',                    // optional
         lon: '-74.005973',                   // optional
diff --git a/modules/pubnxBidAdapter.md b/modules/pubnxBidAdapter.md
deleted file mode 100644
index 6c843322402..00000000000
--- a/modules/pubnxBidAdapter.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Overview
-
-```
-Module Name:  PubNX Bidder Adapter
-Module Type:  Bidder Adapter
-Maintainer: prebid-team@pubnx.com
-```
-
-# Description
-
-Connects to PubNX exchange for bids.
-PubNX Bidder adapter supports Banner ads.
-Use bidder code ```pubnx``` for all PubNX traffic.
-
-# Test Parameters
-```
-var adUnits = [
-   // Banner adUnit
-   {
-       code: 'banner-div',
-       sizes: [[300, 250], [300,600]],   // a display size(s)
-       bids: [{
-         bidder: 'pubnx',
-         params: {
-           placementId: 'PNX-HB-G396432V4809F3'
-         }
-       }]
-   },
-];
-```
-
diff --git a/modules/pubperfAnalyticsAdapter.js b/modules/pubperfAnalyticsAdapter.js
new file mode 100644
index 00000000000..9ef95adb77a
--- /dev/null
+++ b/modules/pubperfAnalyticsAdapter.js
@@ -0,0 +1,36 @@
+/**
+ * Analytics Adapter for Pubperf
+ */
+
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import { logError } from '../src/utils.js';
+
+var pubperfAdapter = adapter({
+  global: 'pubperf_pbjs',
+  analyticsType: 'bundle',
+  handler: 'on'
+});
+
+pubperfAdapter.originEnableAnalytics = pubperfAdapter.enableAnalytics;
+
+pubperfAdapter.enableAnalytics = config => {
+  if (!config || !config.provider || config.provider !== 'pubperf') {
+    logError('expected config.provider to equal pubperf');
+    return;
+  }
+  if (!window['pubperf_pbjs']) {
+    logError(
+      `Make sure that Pubperf tag from https://www.pubperf.com is included before the Prebid configuration.`
+    );
+    return;
+  }
+  pubperfAdapter.originEnableAnalytics(config);
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: pubperfAdapter,
+  code: 'pubperf'
+});
+
+export default pubperfAdapter;
diff --git a/modules/pubperfAnalyticsAdapter.md b/modules/pubperfAnalyticsAdapter.md
new file mode 100644
index 00000000000..50ac3691dda
--- /dev/null
+++ b/modules/pubperfAnalyticsAdapter.md
@@ -0,0 +1,27 @@
+# Overview
+
+```
+Module Name: Pubperf Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: support@transfon.com
+```
+
+# Description
+
+Transfon's pubperf analytics adaptor allows you to view detailed auction and prebid information in Meridian. Contact support@transfon.com for more information or to sign up for analytics.
+
+For more information, please visit https://www.pubperf.com.
+
+
+# Sample pubperf tag to be placed before prebid tag
+
+```
+(function(i, s, o, g, r, a, m, z) {i['pubperf_pbjs'] = r;i[r] = i[r] || function() {z = Array.prototype.slice.call(arguments);z.unshift(+new Date());(i[r].q = i[r].q || []).push(z)}, i[r].t = 1, i[r].l = 1 * new Date();a = s.createElement(o),m = s.getElementsByTagName(o)[0];a.async = 1;a.src = g;m.parentNode.insertBefore(a, m)})(window, document, 'script', 'https://t.pubperf.com/t/b5a635e307.js', 'pubperf_pbjs');
+```
+
+# Test Parameters
+```
+{
+  provider: 'pubperf'
+}
+```
diff --git a/modules/pubstackAnalyticsAdapter.js b/modules/pubstackAnalyticsAdapter.js
index b1da40c5b89..ef33b2d75ae 100644
--- a/modules/pubstackAnalyticsAdapter.js
+++ b/modules/pubstackAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 const pubstackAnalytics = adapter({
diff --git a/modules/pubwiseAnalyticsAdapter.js b/modules/pubwiseAnalyticsAdapter.js
index 915aeb58f99..19a74c7c245 100644
--- a/modules/pubwiseAnalyticsAdapter.js
+++ b/modules/pubwiseAnalyticsAdapter.js
@@ -1,10 +1,9 @@
+import { getParameterByName, logInfo, generateUUID, debugTurnedOn } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
-const utils = require('../src/utils.js');
-
 const storage = getStorageManager();
 
 /****
@@ -17,30 +16,54 @@ const storage = getStorageManager();
  pbjs.enableAnalytics({
   provider: 'pubwise',
   options: {
-    site: 'test-test-test-test',
-    endpoint: 'https://api.pubwise.io/api/v4/event/add/',
+    site: 'b1ccf317-a6fc-428d-ba69-0c9c208aa61c'
   }
  });
- */
+
+Changes in 4.0 Version
+4.0.1 - Initial Version for Prebid 4.x, adds activationId, adds additiona testing, removes prebid global in favor of a prebid.version const
+4.0.2 - Updates to include dedicated default site to keep everything from getting rate limited
+
+*/
 
 const analyticsType = 'endpoint';
-const analyticsName = 'PubWise Analytics: ';
-let defaultUrl = 'https://api.pubwise.io/api/v4/event/default/';
-let pubwiseVersion = '3.0';
-let pubwiseSchema = 'AVOCET';
-let configOptions = {site: '', endpoint: 'https://api.pubwise.io/api/v4/event/default/', debug: ''};
+const analyticsName = 'PubWise:';
+const prebidVersion = '$prebid.version$';
+let pubwiseVersion = '4.0.1';
+let configOptions = {site: '', endpoint: 'https://api.pubwise.io/api/v5/event/add/', debug: null};
 let pwAnalyticsEnabled = false;
 let utmKeys = {utm_source: '', utm_medium: '', utm_campaign: '', utm_term: '', utm_content: ''};
+let sessionData = {sessionId: '', activationId: ''};
+let pwNamespace = 'pubwise';
+let pwEvents = [];
+let metaData = {};
+let auctionEnded = false;
+let sessTimeout = 60 * 30 * 1000; // 30 minutes, G Analytics default session length
+let sessName = 'sess_id';
+let sessTimeoutName = 'sess_timeout';
 
-function markEnabled() {
-  utils.logInfo(`${analyticsName}Enabled`, configOptions);
-  pwAnalyticsEnabled = true;
+function enrichWithSessionInfo(dataBag) {
+  try {
+    // eslint-disable-next-line
+    // console.log(sessionData);
+    dataBag['session_id'] = sessionData.sessionId;
+    dataBag['activation_id'] = sessionData.activationId;
+  } catch (e) {
+    dataBag['error_sess'] = 1;
+  }
+
+  return dataBag;
 }
 
 function enrichWithMetrics(dataBag) {
   try {
+    if (window.PREBID_TIMEOUT) {
+      dataBag['target_timeout'] = window.PREBID_TIMEOUT;
+    } else {
+      dataBag['target_timeout'] = 'NA';
+    }
     dataBag['pw_version'] = pubwiseVersion;
-    dataBag['pbjs_version'] = $$PREBID_GLOBAL$$.version;
+    dataBag['pbjs_version'] = prebidVersion;
     dataBag['debug'] = configOptions.debug;
   } catch (e) {
     dataBag['error_metric'] = 1;
@@ -53,8 +76,8 @@ function enrichWithUTM(dataBag) {
   let newUtm = false;
   try {
     for (let prop in utmKeys) {
-      utmKeys[prop] = utils.getParameterByName(prop);
-      if (utmKeys[prop] != '') {
+      utmKeys[prop] = getParameterByName(prop);
+      if (utmKeys[prop]) {
         newUtm = true;
         dataBag[prop] = utmKeys[prop];
       }
@@ -62,70 +85,254 @@ function enrichWithUTM(dataBag) {
 
     if (newUtm === false) {
       for (let prop in utmKeys) {
-        let itemValue = storage.getDataFromLocalStorage(`pw-${prop}`);
-        if (itemValue.length !== 0) {
+        let itemValue = storage.getDataFromLocalStorage(setNamespace(prop));
+        if (itemValue !== null && typeof itemValue !== 'undefined' && itemValue.length !== 0) {
           dataBag[prop] = itemValue;
         }
       }
     } else {
       for (let prop in utmKeys) {
-        storage.setDataInLocalStorage(`pw-${prop}`, utmKeys[prop]);
+        storage.setDataInLocalStorage(setNamespace(prop), utmKeys[prop]);
       }
     }
   } catch (e) {
-    utils.logInfo(`${analyticsName}Error`, e);
+    pwInfo(`Error`, e);
     dataBag['error_utm'] = 1;
   }
   return dataBag;
 }
 
-function sendEvent(eventType, data) {
-  utils.logInfo(`${analyticsName}Event ${eventType} ${pwAnalyticsEnabled}`, data);
+function expireUtmData() {
+  pwInfo(`Session Expiring UTM Data`);
+  for (let prop in utmKeys) {
+    storage.removeDataFromLocalStorage(setNamespace(prop));
+  }
+}
+
+function enrichWithCustomSegments(dataBag) {
+  // c_script_type: '', c_slot1: '', c_slot2: '', c_slot3: '', c_slot4: ''
+  if (configOptions.custom) {
+    if (configOptions.custom.c_script_type) {
+      dataBag['c_script_type'] = configOptions.custom.c_script_type;
+    }
+
+    if (configOptions.custom.c_host) {
+      dataBag['c_host'] = configOptions.custom.c_host;
+    }
+
+    if (configOptions.custom.c_slot1) {
+      dataBag['c_slot1'] = configOptions.custom.c_slot1;
+    }
+
+    if (configOptions.custom.c_slot2) {
+      dataBag['c_slot2'] = configOptions.custom.c_slot2;
+    }
+
+    if (configOptions.custom.c_slot3) {
+      dataBag['c_slot3'] = configOptions.custom.c_slot3;
+    }
+
+    if (configOptions.custom.c_slot4) {
+      dataBag['c_slot4'] = configOptions.custom.c_slot4;
+    }
+  }
+
+  return dataBag;
+}
+
+function setNamespace(itemText) {
+  return pwNamespace.concat('_' + itemText);
+}
+
+function localStorageSessTimeoutName() {
+  return setNamespace(sessTimeoutName);
+}
+
+function localStorageSessName() {
+  return setNamespace(sessName);
+}
+
+function extendUserSessionTimeout() {
+  storage.setDataInLocalStorage(localStorageSessTimeoutName(), Date.now().toString());
+}
+
+function userSessionID() {
+  return storage.getDataFromLocalStorage(localStorageSessName()) || '';
+}
+
+function sessionExpired() {
+  let sessLastTime = storage.getDataFromLocalStorage(localStorageSessTimeoutName());
+  return (Date.now() - parseInt(sessLastTime)) > sessTimeout;
+}
+
+function flushEvents() {
+  if (pwEvents.length > 0) {
+    let dataBag = {metaData: metaData, eventList: pwEvents.splice(0)}; // put all the events together with the metadata and send
+    ajax(configOptions.endpoint, (result) => pwInfo(`Result`, result), JSON.stringify(dataBag));
+  }
+}
+
+function isIngestedEvent(eventType) {
+  const ingested = [
+    CONSTANTS.EVENTS.AUCTION_INIT,
+    CONSTANTS.EVENTS.BID_REQUESTED,
+    CONSTANTS.EVENTS.BID_RESPONSE,
+    CONSTANTS.EVENTS.BID_WON,
+    CONSTANTS.EVENTS.BID_TIMEOUT,
+    CONSTANTS.EVENTS.AD_RENDER_FAILED,
+    CONSTANTS.EVENTS.TCF2_ENFORCEMENT
+  ];
+  return ingested.indexOf(eventType) !== -1;
+}
 
-  // put the typical items in the data bag
-  let dataBag = {
-    eventType: eventType,
-    args: data,
-    target_site: configOptions.site,
-    pubwiseSchema: pubwiseSchema,
-    debug: configOptions.debug ? 1 : 0,
-  };
+function markEnabled() {
+  pwInfo(`Enabled`, configOptions);
+  pwAnalyticsEnabled = true;
+  setInterval(flushEvents, 100);
+}
+
+function pwInfo(info, context) {
+  logInfo(`${analyticsName} ` + info, context);
+}
 
-  dataBag = enrichWithMetrics(dataBag);
-  // for certain events, track additional info
-  if (eventType == CONSTANTS.EVENTS.AUCTION_INIT) {
-    dataBag = enrichWithUTM(dataBag);
+function filterBidResponse(data) {
+  let modified = Object.assign({}, data);
+  // clean up some properties we don't track in public version
+  if (typeof modified.ad !== 'undefined') {
+    modified.ad = '';
   }
+  if (typeof modified.adUrl !== 'undefined') {
+    modified.adUrl = '';
+  }
+  if (typeof modified.adserverTargeting !== 'undefined') {
+    modified.adserverTargeting = '';
+  }
+  if (typeof modified.ts !== 'undefined') {
+    modified.ts = '';
+  }
+  // clean up a property to make simpler
+  if (typeof modified.statusMessage !== 'undefined' && modified.statusMessage === 'Bid returned empty or error response') {
+    modified.statusMessage = 'eoe';
+  }
+  modified.auctionEnded = auctionEnded;
+  return modified;
+}
 
-  ajax(configOptions.endpoint, (result) => utils.logInfo(`${analyticsName}Result`, result), JSON.stringify(dataBag));
+function filterAuctionInit(data) {
+  let modified = Object.assign({}, data);
+
+  modified.refererInfo = {};
+  // handle clean referrer, we only need one
+  if (typeof modified.bidderRequests !== 'undefined' && typeof modified.bidderRequests[0] !== 'undefined' && typeof modified.bidderRequests[0].refererInfo !== 'undefined') {
+    // TODO: please do not send internal data structures over the network
+    modified.refererInfo = modified.bidderRequests[0].refererInfo.legacy;
+  }
+
+  if (typeof modified.adUnitCodes !== 'undefined') {
+    delete modified.adUnitCodes;
+  }
+  if (typeof modified.adUnits !== 'undefined') {
+    delete modified.adUnits;
+  }
+  if (typeof modified.bidderRequests !== 'undefined') {
+    delete modified.bidderRequests;
+  }
+  if (typeof modified.bidsReceived !== 'undefined') {
+    delete modified.bidsReceived;
+  }
+  if (typeof modified.config !== 'undefined') {
+    delete modified.config;
+  }
+  if (typeof modified.noBids !== 'undefined') {
+    delete modified.noBids;
+  }
+  if (typeof modified.winningBids !== 'undefined') {
+    delete modified.winningBids;
+  }
+
+  return modified;
 }
 
-let pubwiseAnalytics = Object.assign(adapter(
-  {
-    defaultUrl,
-    analyticsType
-  }),
-{
+let pubwiseAnalytics = Object.assign(adapter({analyticsType}), {
   // Override AnalyticsAdapter functions by supplying custom methods
   track({eventType, args}) {
-    sendEvent(eventType, args);
+    this.handleEvent(eventType, args);
   }
 });
 
+pubwiseAnalytics.handleEvent = function(eventType, data) {
+  // we log most events, but some are information
+  if (isIngestedEvent(eventType)) {
+    pwInfo(`Emitting Event ${eventType} ${pwAnalyticsEnabled}`, data);
+
+    // record metadata
+    metaData = {
+      target_site: configOptions.site,
+      debug: configOptions.debug ? 1 : 0,
+    };
+    metaData = enrichWithSessionInfo(metaData);
+    metaData = enrichWithMetrics(metaData);
+    metaData = enrichWithUTM(metaData);
+    metaData = enrichWithCustomSegments(metaData);
+
+    // add data on init to the metadata container
+    if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
+      data = filterAuctionInit(data);
+    } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
+      data = filterBidResponse(data);
+    }
+
+    // add all ingested events
+    pwEvents.push({
+      eventType: eventType,
+      args: data
+    });
+  } else {
+    pwInfo(`Skipping Event ${eventType} ${pwAnalyticsEnabled}`, data);
+  }
+
+  // once the auction ends, or the event is a bid won send events
+  if (eventType === CONSTANTS.EVENTS.AUCTION_END || eventType === CONSTANTS.EVENTS.BID_WON) {
+    flushEvents();
+  }
+};
+
+pubwiseAnalytics.storeSessionID = function (userSessID) {
+  storage.setDataInLocalStorage(localStorageSessName(), userSessID);
+  pwInfo(`New Session Generated`, userSessID);
+};
+
+// ensure a session exists, if not make one, always store it
+pubwiseAnalytics.ensureSession = function () {
+  if (sessionExpired() === true || userSessionID() === null || userSessionID() === '') {
+    let generatedId = generateUUID();
+    expireUtmData();
+    this.storeSessionID(generatedId);
+    sessionData.sessionId = generatedId;
+  }
+  // eslint-disable-next-line
+  // console.log('ensured session');
+  extendUserSessionTimeout();
+};
+
 pubwiseAnalytics.adapterEnableAnalytics = pubwiseAnalytics.enableAnalytics;
 
 pubwiseAnalytics.enableAnalytics = function (config) {
-  if (config.options.debug === undefined) {
-    config.options.debug = utils.debugTurnedOn();
+  configOptions = Object.assign(configOptions, config.options);
+  // take the PBJS debug for our debug setting if no PW debug is defined
+  if (configOptions.debug === null) {
+    configOptions.debug = debugTurnedOn();
   }
-  configOptions = config.options;
   markEnabled();
+  sessionData.activationId = generateUUID();
+  this.ensureSession();
   pubwiseAnalytics.adapterEnableAnalytics(config);
 };
 
 adapterManager.registerAnalyticsAdapter({
   adapter: pubwiseAnalytics,
-  code: 'pubwise'
+  code: 'pubwise',
+  gvlid: 842
 });
 
 export default pubwiseAnalytics;
diff --git a/modules/pubwiseBidAdapter.js b/modules/pubwiseBidAdapter.js
new file mode 100644
index 00000000000..5e381e74a18
--- /dev/null
+++ b/modules/pubwiseBidAdapter.js
@@ -0,0 +1,784 @@
+import { _each, isStr, deepClone, isArray, deepSetValue, inIframe, logMessage, logInfo, logWarn, logError } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+const VERSION = '0.2.0';
+const GVLID = 842;
+const NET_REVENUE = true;
+const UNDEFINED = undefined;
+const DEFAULT_CURRENCY = 'USD';
+const AUCTION_TYPE = 1;
+const BIDDER_CODE = 'pwbid';
+const ENDPOINT_URL = 'https://bid.pubwise.io/prebid';
+const DEFAULT_WIDTH = 0;
+const DEFAULT_HEIGHT = 0;
+const PREBID_NATIVE_HELP_LINK = 'https://prebid.org/dev-docs/show-native-ads.html';
+// const USERSYNC_URL = '//127.0.0.1:8080/usersync'
+
+const CUSTOM_PARAMS = {
+  'gender': '', // User gender
+  'yob': '', // User year of birth
+  'lat': '', // User location - Latitude
+  'lon': '', // User Location - Longitude
+};
+
+// rtb native types are meant to be dynamic and extendable
+// the extendable data asset types are nicely aligned
+// in practice we set an ID that is distinct for each real type of return
+const NATIVE_ASSETS = {
+  'TITLE': { ID: 1, KEY: 'title', TYPE: 0 },
+  'IMAGE': { ID: 2, KEY: 'image', TYPE: 0 },
+  'ICON': { ID: 3, KEY: 'icon', TYPE: 0 },
+  'SPONSOREDBY': { ID: 4, KEY: 'sponsoredBy', TYPE: 1 },
+  'BODY': { ID: 5, KEY: 'body', TYPE: 2 },
+  'CLICKURL': { ID: 6, KEY: 'clickUrl', TYPE: 0 },
+  'VIDEO': { ID: 7, KEY: 'video', TYPE: 0 },
+  'EXT': { ID: 8, KEY: 'ext', TYPE: 0 },
+  'DATA': { ID: 9, KEY: 'data', TYPE: 0 },
+  'LOGO': { ID: 10, KEY: 'logo', TYPE: 0 },
+  'SPONSORED': { ID: 11, KEY: 'sponsored', TYPE: 1 },
+  'DESC': { ID: 12, KEY: 'data', TYPE: 2 },
+  'RATING': { ID: 13, KEY: 'rating', TYPE: 3 },
+  'LIKES': { ID: 14, KEY: 'likes', TYPE: 4 },
+  'DOWNLOADS': { ID: 15, KEY: 'downloads', TYPE: 5 },
+  'PRICE': { ID: 16, KEY: 'price', TYPE: 6 },
+  'SALEPRICE': { ID: 17, KEY: 'saleprice', TYPE: 7 },
+  'PHONE': { ID: 18, KEY: 'phone', TYPE: 8 },
+  'ADDRESS': { ID: 19, KEY: 'address', TYPE: 9 },
+  'DESC2': { ID: 20, KEY: 'desc2', TYPE: 10 },
+  'DISPLAYURL': { ID: 21, KEY: 'displayurl', TYPE: 11 },
+  'CTA': { ID: 22, KEY: 'cta', TYPE: 12 }
+};
+
+const NATIVE_ASSET_IMAGE_TYPE = {
+  'ICON': 1,
+  'LOGO': 2,
+  'IMAGE': 3
+}
+
+// to render any native unit we have to have a few items
+const NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS = [
+  {
+    id: NATIVE_ASSETS.SPONSOREDBY.ID,
+    required: true,
+    data: {
+      type: 1
+    }
+  },
+  {
+    id: NATIVE_ASSETS.TITLE.ID,
+    required: true,
+  },
+  {
+    id: NATIVE_ASSETS.IMAGE.ID,
+    required: true,
+  }
+]
+
+let isInvalidNativeRequest = false
+let NATIVE_ASSET_ID_TO_KEY_MAP = {};
+let NATIVE_ASSET_KEY_TO_ASSET_MAP = {};
+
+// together allows traversal of NATIVE_ASSETS_LIST in any direction
+// id -> key
+_each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAsset.KEY });
+// key -> asset
+_each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, NATIVE],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    // siteId is required
+    if (bid.params && bid.params.siteId) {
+      // it must be a string
+      if (!isStr(bid.params.siteId)) {
+        _logWarn('siteId is required for bid', bid);
+        return false;
+      }
+    } else {
+      return false;
+    }
+
+    return true;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    var refererInfo;
+    if (bidderRequest && bidderRequest.refererInfo) {
+      refererInfo = bidderRequest.refererInfo;
+    }
+    var conf = _initConf(refererInfo);
+    var payload = _createOrtbTemplate(conf);
+    var bidCurrency = '';
+    var bid;
+    var blockedIabCategories = [];
+
+    validBidRequests.forEach(originalBid => {
+      bid = deepClone(originalBid);
+      bid.params.adSlot = bid.params.adSlot || '';
+      _parseAdSlot(bid);
+
+      conf = _handleCustomParams(bid.params, conf);
+      conf.transactionId = bid.transactionId;
+      bidCurrency = bid.params.currency || UNDEFINED;
+      bid.params.currency = bidCurrency;
+
+      if (bid.params.hasOwnProperty('bcat') && isArray(bid.params.bcat)) {
+        blockedIabCategories = blockedIabCategories.concat(bid.params.bcat);
+      }
+
+      var impObj = _createImpressionObject(bid, conf);
+      if (impObj) {
+        payload.imp.push(impObj);
+      }
+    });
+
+    // no payload imps, no rason to continue
+    if (payload.imp.length == 0) {
+      return;
+    }
+
+    // test bids can also be turned on here
+    if (window.location.href.indexOf('pubwiseTestBid=true') !== -1) {
+      payload.test = 1;
+    }
+
+    if (bid.params.isTest) {
+      payload.test = Number(bid.params.isTest); // should be 1 or 0
+    }
+    payload.site.publisher.id = bid.params.siteId.trim();
+    payload.user.gender = (conf.gender ? conf.gender.trim() : UNDEFINED);
+    payload.user.geo = {};
+    payload.user.geo.lat = _parseSlotParam('lat', conf.lat);
+    payload.user.geo.lon = _parseSlotParam('lon', conf.lon);
+    payload.user.yob = _parseSlotParam('yob', conf.yob);
+    payload.device.geo = payload.user.geo;
+    payload.site.page = payload.site?.page?.trim();
+    payload.site.domain = _getDomainFromURL(payload.site.page);
+
+    // add the content object from config in request
+    if (typeof config.getConfig('content') === 'object') {
+      payload.site.content = config.getConfig('content');
+    }
+
+    // merge the device from config.getConfig('device')
+    if (typeof config.getConfig('device') === 'object') {
+      payload.device = Object.assign(payload.device, config.getConfig('device'));
+    }
+
+    // passing transactionId in source.tid
+    deepSetValue(payload, 'source.tid', bidderRequest?.auctionId);
+
+    // schain
+    if (validBidRequests[0].schain) {
+      deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
+    }
+
+    // gdpr consent
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // ccpa on the root object
+    if (bidderRequest && bidderRequest.uspConsent) {
+      deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    // if coppa is in effect then note it
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(payload, 'regs.coppa', 1);
+    }
+
+    var options = {contentType: 'text/plain'};
+
+    _logInfo('buildRequests payload', payload);
+    _logInfo('buildRequests bidderRequest', bidderRequest);
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payload,
+      options: options,
+      bidderRequest: bidderRequest,
+    };
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (response, request) {
+    const bidResponses = [];
+    var respCur = DEFAULT_CURRENCY;
+    _logInfo('interpretResponse request', request);
+    let parsedRequest = request.data; // not currently stringified
+    // let parsedReferrer = parsedRequest.site && parsedRequest.site.ref ? parsedRequest.site.ref : '';
+
+    // try {
+    if (response.body && response.body.seatbid && isArray(response.body.seatbid)) {
+      // Supporting multiple bid responses for same adSize
+      respCur = response.body.cur || respCur;
+      response.body.seatbid.forEach(seatbidder => {
+        seatbidder.bid &&
+            isArray(seatbidder.bid) &&
+            seatbidder.bid.forEach(bid => {
+              let newBid = {
+                requestId: bid.impid,
+                cpm: (parseFloat(bid.price) || 0).toFixed(2),
+                width: bid.w,
+                height: bid.h,
+                creativeId: bid.crid || bid.id,
+                currency: respCur,
+                netRevenue: NET_REVENUE,
+                ttl: 300,
+                ad: bid.adm,
+                pw_seat: seatbidder.seat || null,
+                pw_dspid: bid.ext && bid.ext.dspid ? bid.ext.dspid : null,
+                partnerImpId: bid.id || '' // partner impression Id
+              };
+              if (parsedRequest.imp && parsedRequest.imp.length > 0) {
+                parsedRequest.imp.forEach(req => {
+                  if (bid.impid === req.id) {
+                    _checkMediaType(bid.adm, newBid);
+                    switch (newBid.mediaType) {
+                      case BANNER:
+                        break;
+                      case NATIVE:
+                        _parseNativeResponse(bid, newBid);
+                        break;
+                    }
+                  }
+                });
+              }
+
+              newBid.meta = {};
+              if (bid.ext && bid.ext.dspid) {
+                newBid.meta.networkId = bid.ext.dspid;
+              }
+              if (bid.ext && bid.ext.advid) {
+                newBid.meta.buyerId = bid.ext.advid;
+              }
+              if (bid.adomain && bid.adomain.length > 0) {
+                newBid.meta.advertiserDomains = bid.adomain;
+                newBid.meta.clickUrl = bid.adomain[0];
+              }
+
+              bidResponses.push(newBid);
+            });
+      });
+    }
+    // } catch (error) {
+    // _logError(error);
+    // }
+    return bidResponses;
+  }
+}
+
+function _checkMediaType(adm, newBid) {
+  // Create a regex here to check the strings
+  var admJSON = '';
+  if (adm.indexOf('"ver":') >= 0) {
+    try {
+      admJSON = JSON.parse(adm.replace(/\\/g, ''));
+      if (admJSON && admJSON.assets) {
+        newBid.mediaType = NATIVE;
+      }
+    } catch (e) {
+      _logWarn('Error: Cannot parse native reponse for ad response: ' + adm);
+    }
+  } else {
+    newBid.mediaType = BANNER;
+  }
+}
+
+function _parseNativeResponse(bid, newBid) {
+  newBid.native = {};
+  if (bid.hasOwnProperty('adm')) {
+    var adm = '';
+    try {
+      adm = JSON.parse(bid.adm.replace(/\\/g, ''));
+    } catch (ex) {
+      _logWarn('Error: Cannot parse native reponse for ad response: ' + newBid.adm);
+      return;
+    }
+    if (adm && adm.assets && adm.assets.length > 0) {
+      newBid.mediaType = NATIVE;
+      for (let i = 0, len = adm.assets.length; i < len; i++) {
+        switch (adm.assets[i].id) {
+          case NATIVE_ASSETS.TITLE.ID:
+            newBid.native.title = adm.assets[i].title && adm.assets[i].title.text;
+            break;
+          case NATIVE_ASSETS.IMAGE.ID:
+            newBid.native.image = {
+              url: adm.assets[i].img && adm.assets[i].img.url,
+              height: adm.assets[i].img && adm.assets[i].img.h,
+              width: adm.assets[i].img && adm.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.ICON.ID:
+            newBid.native.icon = {
+              url: adm.assets[i].img && adm.assets[i].img.url,
+              height: adm.assets[i].img && adm.assets[i].img.h,
+              width: adm.assets[i].img && adm.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.SPONSOREDBY.ID:
+          case NATIVE_ASSETS.BODY.ID:
+          case NATIVE_ASSETS.LIKES.ID:
+          case NATIVE_ASSETS.DOWNLOADS.ID:
+          case NATIVE_ASSETS.PRICE:
+          case NATIVE_ASSETS.SALEPRICE.ID:
+          case NATIVE_ASSETS.PHONE.ID:
+          case NATIVE_ASSETS.ADDRESS.ID:
+          case NATIVE_ASSETS.DESC2.ID:
+          case NATIVE_ASSETS.CTA.ID:
+          case NATIVE_ASSETS.RATING.ID:
+          case NATIVE_ASSETS.DISPLAYURL.ID:
+            newBid.native[NATIVE_ASSET_ID_TO_KEY_MAP[adm.assets[i].id]] = adm.assets[i].data && adm.assets[i].data.value;
+            break;
+        }
+      }
+      newBid.clickUrl = adm.link && adm.link.url;
+      newBid.clickTrackers = (adm.link && adm.link.clicktrackers) || [];
+      newBid.impressionTrackers = adm.imptrackers || [];
+      newBid.jstracker = adm.jstracker || [];
+      if (!newBid.width) {
+        newBid.width = DEFAULT_WIDTH;
+      }
+      if (!newBid.height) {
+        newBid.height = DEFAULT_HEIGHT;
+      }
+    }
+  }
+}
+
+function _getDomainFromURL(url) {
+  let anchor = document.createElement('a');
+  anchor.href = url;
+  return anchor.hostname;
+}
+
+function _handleCustomParams(params, conf) {
+  var key, value, entry;
+  for (key in CUSTOM_PARAMS) {
+    if (CUSTOM_PARAMS.hasOwnProperty(key)) {
+      value = params[key];
+      if (value) {
+        entry = CUSTOM_PARAMS[key];
+
+        if (typeof entry === 'object') {
+          // will be used in future when we want to
+          // process a custom param before using
+          // 'keyname': {f: function() {}}
+          value = entry.f(value, conf);
+        }
+
+        if (isStr(value)) {
+          conf[key] = value;
+        } else {
+          _logWarn('Ignoring param : ' + key + ' with value : ' + CUSTOM_PARAMS[key] + ', expects string-value, found ' + typeof value);
+        }
+      }
+    }
+  }
+  return conf;
+}
+
+function _createOrtbTemplate(conf) {
+  return {
+    id: '' + new Date().getTime(),
+    at: AUCTION_TYPE,
+    cur: [DEFAULT_CURRENCY],
+    imp: [],
+    site: {
+      page: conf.pageURL,
+      ref: conf.refURL,
+      publisher: {}
+    },
+    device: {
+      ua: navigator.userAgent,
+      js: 1,
+      dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+      h: screen.height,
+      w: screen.width,
+      language: navigator.language
+    },
+    user: {},
+    ext: {
+      version: VERSION
+    }
+  };
+}
+
+function _createImpressionObject(bid, conf) {
+  var impObj = {};
+  var bannerObj;
+  var nativeObj = {};
+  var mediaTypes = '';
+
+  impObj = {
+    id: bid.bidId,
+    tagid: bid.params.adUnit || undefined,
+    bidfloor: _parseSlotParam('bidFloor', bid.params.bidFloor), // capitalization dicated by 3.2.4 spec
+    secure: 1,
+    bidfloorcur: bid.params.currency ? _parseSlotParam('currency', bid.params.currency) : DEFAULT_CURRENCY, // capitalization dicated by 3.2.4 spec
+    ext: {
+      tid: (bid.transactionId ? bid.transactionId : '')
+    }
+  };
+
+  if (bid.hasOwnProperty('mediaTypes')) {
+    for (mediaTypes in bid.mediaTypes) {
+      switch (mediaTypes) {
+        case BANNER:
+          bannerObj = _createBannerRequest(bid);
+          if (bannerObj !== UNDEFINED) {
+            impObj.banner = bannerObj;
+          }
+          break;
+        case NATIVE:
+          nativeObj['request'] = JSON.stringify(_createNativeRequest(bid.nativeParams));
+          if (!isInvalidNativeRequest) {
+            impObj.native = nativeObj;
+          } else {
+            _logWarn('Error: Error in Native adunit ' + bid.params.adUnit + '. Ignoring the adunit. Refer to ' + PREBID_NATIVE_HELP_LINK + ' for more details.');
+          }
+          break;
+      }
+    }
+  } else {
+    _logWarn('MediaTypes are Required for all Adunit Configs', bid);
+  }
+
+  _addFloorFromFloorModule(impObj, bid);
+
+  return impObj.hasOwnProperty(BANNER) ||
+          impObj.hasOwnProperty(NATIVE) ? impObj : UNDEFINED;
+}
+
+function _parseSlotParam(paramName, paramValue) {
+  if (!isStr(paramValue)) {
+    paramValue && _logWarn('Ignoring param key: ' + paramName + ', expects string-value, found ' + typeof paramValue);
+    return UNDEFINED;
+  }
+
+  switch (paramName) {
+    case 'bidFloor':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'lat':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'lon':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'yob':
+      return parseInt(paramValue) || UNDEFINED;
+    default:
+      return paramValue;
+  }
+}
+
+function _parseAdSlot(bid) {
+  _logInfo('parseAdSlot bid', bid)
+  if (bid.adUnitCode) {
+    bid.params.adUnit = bid.adUnitCode;
+  } else {
+    bid.params.adUnit = '';
+  }
+  bid.params.width = 0;
+  bid.params.height = 0;
+  bid.params.adSlot = _cleanSlotName(bid.params.adSlot);
+
+  if (bid.hasOwnProperty('mediaTypes')) {
+    if (bid.mediaTypes.hasOwnProperty(BANNER) &&
+          bid.mediaTypes.banner.hasOwnProperty('sizes')) { // if its a banner, has mediaTypes and sizes
+      var i = 0;
+      var sizeArray = [];
+      for (;i < bid.mediaTypes.banner.sizes.length; i++) {
+        if (bid.mediaTypes.banner.sizes[i].length === 2) { // sizes[i].length will not be 2 in case where size is set as fluid, we want to skip that entry
+          sizeArray.push(bid.mediaTypes.banner.sizes[i]);
+        }
+      }
+      bid.mediaTypes.banner.sizes = sizeArray;
+      if (bid.mediaTypes.banner.sizes.length >= 1) {
+        // if there is more than one size then pop one onto the banner params width
+        // pop the first into the params, then remove it from mediaTypes
+        bid.params.width = bid.mediaTypes.banner.sizes[0][0];
+        bid.params.height = bid.mediaTypes.banner.sizes[0][1];
+        bid.mediaTypes.banner.sizes = bid.mediaTypes.banner.sizes.splice(1, bid.mediaTypes.banner.sizes.length - 1);
+      }
+    }
+  } else {
+    _logWarn('MediaTypes are Required for all Adunit Configs', bid)
+  }
+}
+
+function _cleanSlotName(slotName) {
+  if (isStr(slotName)) {
+    return slotName.replace(/^\s+/g, '').replace(/\s+$/g, '');
+  }
+  return '';
+}
+
+function _initConf(refererInfo) {
+  return {
+    pageURL: refererInfo?.page,
+    refURL: refererInfo?.ref
+  };
+}
+
+function _commonNativeRequestObject(nativeAsset, params) {
+  var key = nativeAsset.KEY;
+  return {
+    id: nativeAsset.ID,
+    required: params[key].required ? 1 : 0,
+    data: {
+      type: nativeAsset.TYPE,
+      len: params[key].len,
+      ext: params[key].ext
+    }
+  };
+}
+
+function _addFloorFromFloorModule(impObj, bid) {
+  let bidFloor = -1; // indicates no floor
+
+  // get lowest floor from floorModule
+  if (typeof bid.getFloor === 'function' && !config.getConfig('pubwise.disableFloors')) {
+    [BANNER, NATIVE].forEach(mediaType => {
+      if (impObj.hasOwnProperty(mediaType)) {
+        let floorInfo = bid.getFloor({ currency: impObj.bidFloorCur, mediaType: mediaType, size: '*' });
+        if (typeof floorInfo === 'object' && floorInfo.currency === impObj.bidFloorCur && !isNaN(parseInt(floorInfo.floor))) {
+          let mediaTypeFloor = parseFloat(floorInfo.floor);
+          bidFloor = (bidFloor == -1 ? mediaTypeFloor : Math.min(mediaTypeFloor, bidFloor))
+        }
+      }
+    });
+  }
+
+  // get highest, if none then take the default -1
+  if (impObj.bidfloor) {
+    bidFloor = Math.max(bidFloor, impObj.bidfloor)
+  }
+
+  // assign if it has a valid floor - > 0
+  impObj.bidfloor = ((!isNaN(bidFloor) && bidFloor > 0) ? bidFloor : UNDEFINED);
+}
+
+function _createNativeRequest(params) {
+  var nativeRequestObject = {
+    assets: []
+  };
+  for (var key in params) {
+    if (params.hasOwnProperty(key)) {
+      var assetObj = {};
+      if (!(nativeRequestObject.assets && nativeRequestObject.assets.length > 0 && nativeRequestObject.assets.hasOwnProperty(key))) {
+        switch (key) {
+          case NATIVE_ASSETS.TITLE.KEY:
+            if (params[key].len || params[key].length) {
+              assetObj = {
+                id: NATIVE_ASSETS.TITLE.ID,
+                required: params[key].required ? 1 : 0,
+                title: {
+                  len: params[key].len || params[key].length,
+                  ext: params[key].ext
+                }
+              };
+            } else {
+              _logWarn('Error: Title Length is required for native ad: ' + JSON.stringify(params));
+            }
+            break;
+          case NATIVE_ASSETS.IMAGE.KEY:
+            if (params[key].sizes && params[key].sizes.length > 0) {
+              assetObj = {
+                id: NATIVE_ASSETS.IMAGE.ID,
+                required: params[key].required ? 1 : 0,
+                img: {
+                  type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
+                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                  wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
+                  hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
+                  mimes: params[key].mimes,
+                  ext: params[key].ext,
+                }
+              };
+            } else {
+              _logWarn('Error: Image sizes is required for native ad: ' + JSON.stringify(params));
+            }
+            break;
+          case NATIVE_ASSETS.ICON.KEY:
+            if (params[key].sizes && params[key].sizes.length > 0) {
+              assetObj = {
+                id: NATIVE_ASSETS.ICON.ID,
+                required: params[key].required ? 1 : 0,
+                img: {
+                  type: NATIVE_ASSET_IMAGE_TYPE.ICON,
+                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                }
+              };
+            } else {
+              _logWarn('Error: Icon sizes is required for native ad: ' + JSON.stringify(params));
+            };
+            break;
+          case NATIVE_ASSETS.VIDEO.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.VIDEO.ID,
+              required: params[key].required ? 1 : 0,
+              video: {
+                minduration: params[key].minduration,
+                maxduration: params[key].maxduration,
+                protocols: params[key].protocols,
+                mimes: params[key].mimes,
+                ext: params[key].ext
+              }
+            };
+            break;
+          case NATIVE_ASSETS.EXT.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.EXT.ID,
+              required: params[key].required ? 1 : 0,
+            };
+            break;
+          case NATIVE_ASSETS.LOGO.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.LOGO.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.LOGO,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED)
+              }
+            };
+            break;
+          case NATIVE_ASSETS.SPONSOREDBY.KEY:
+          case NATIVE_ASSETS.BODY.KEY:
+          case NATIVE_ASSETS.RATING.KEY:
+          case NATIVE_ASSETS.LIKES.KEY:
+          case NATIVE_ASSETS.DOWNLOADS.KEY:
+          case NATIVE_ASSETS.PRICE.KEY:
+          case NATIVE_ASSETS.SALEPRICE.KEY:
+          case NATIVE_ASSETS.PHONE.KEY:
+          case NATIVE_ASSETS.ADDRESS.KEY:
+          case NATIVE_ASSETS.DESC2.KEY:
+          case NATIVE_ASSETS.DISPLAYURL.KEY:
+          case NATIVE_ASSETS.CTA.KEY:
+            assetObj = _commonNativeRequestObject(NATIVE_ASSET_KEY_TO_ASSET_MAP[key], params);
+            break;
+        }
+      }
+    }
+    if (assetObj && assetObj.id) {
+      nativeRequestObject.assets[nativeRequestObject.assets.length] = assetObj;
+    }
+  };
+
+  // for native image adtype prebid has to have few required assests i.e. title,sponsoredBy, image
+  // if any of these are missing from the request then request will not be sent
+  var requiredAssetCount = NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS.length;
+  var presentrequiredAssetCount = 0;
+  NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS.forEach(ele => {
+    var lengthOfExistingAssets = nativeRequestObject.assets.length;
+    for (var i = 0; i < lengthOfExistingAssets; i++) {
+      if (ele.id == nativeRequestObject.assets[i].id) {
+        presentrequiredAssetCount++;
+        break;
+      }
+    }
+  });
+  if (requiredAssetCount == presentrequiredAssetCount) {
+    isInvalidNativeRequest = false;
+  } else {
+    isInvalidNativeRequest = true;
+  }
+  return nativeRequestObject;
+}
+
+function _createBannerRequest(bid) {
+  var sizes = bid.mediaTypes.banner.sizes;
+  var format = [];
+  var bannerObj;
+  if (sizes !== UNDEFINED && isArray(sizes)) {
+    bannerObj = {};
+    if (!bid.params.width && !bid.params.height) {
+      if (sizes.length === 0) {
+        // i.e. since bid.params does not have width or height, and length of sizes is 0, need to ignore this banner imp
+        bannerObj = UNDEFINED;
+        _logWarn('Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+        return bannerObj;
+      } else {
+        bannerObj.w = parseInt(sizes[0][0], 10);
+        bannerObj.h = parseInt(sizes[0][1], 10);
+        sizes = sizes.splice(1, sizes.length - 1);
+      }
+    } else {
+      bannerObj.w = bid.params.width;
+      bannerObj.h = bid.params.height;
+    }
+    if (sizes.length > 0) {
+      format = [];
+      sizes.forEach(function (size) {
+        if (size.length > 1) {
+          format.push({ w: size[0], h: size[1] });
+        }
+      });
+      if (format.length > 0) {
+        bannerObj.format = format;
+      }
+    }
+    bannerObj.pos = 0;
+    bannerObj.topframe = inIframe() ? 0 : 1;
+  } else {
+    _logWarn('Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+    bannerObj = UNDEFINED;
+  }
+  return bannerObj;
+}
+
+// various error levels are not always used
+// eslint-disable-next-line no-unused-vars
+function _logMessage(textValue, objectValue) {
+  logMessage('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logInfo(textValue, objectValue) {
+  logInfo('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logWarn(textValue, objectValue) {
+  logWarn('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logError(textValue, objectValue) {
+  logError('PubWise: ' + textValue, objectValue);
+}
+
+// function _decorateLog() {
+//   arguments[0] = 'PubWise' + arguments[0];
+//   return arguments
+// }
+
+// these are exported only for testing so maintaining the JS convention of _ to indicate the intent
+export {
+  _checkMediaType,
+  _parseAdSlot
+}
+
+registerBidder(spec);
diff --git a/modules/pubwiseBidAdapter.md b/modules/pubwiseBidAdapter.md
new file mode 100644
index 00000000000..8cf38a63913
--- /dev/null
+++ b/modules/pubwiseBidAdapter.md
@@ -0,0 +1,78 @@
+# Overview
+
+```
+Module Name:  PubWise Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: info@pubwise.io
+```
+
+# Description
+
+Connects to PubWise exchange for bids.
+
+# Sample Banner Ad Unit: For Publishers
+
+With isTest parameter the system will respond in whatever dimensions provided.
+
+## Params
+
+
+
+## Banner
+```
+var adUnits = [
+    {
+        code: "div-gpt-ad-1460505748561-0",
+        mediaTypes: {
+        banner: {
+            sizes: [[300, 250]]
+        }
+        },
+        bids: [{
+            bidder: 'pubwise',
+            params: {
+                siteId: "xxxxxx",
+                isTest: true
+            }
+        }]
+    }
+]
+```
+## Native
+```
+var adUnits = [
+    {
+        code: 'div-gpt-ad-1460505748561-1',
+        sizes: [[1, 1]],
+        mediaTypes: {
+            native: {
+                title: {
+                    required: true,
+                    len: 80
+                },
+                body: {
+                    required: true
+                },
+                image: {
+                    required: true,
+                    sizes: [150, 50]
+                },
+                sponsoredBy: {
+                    required: true
+                },
+                icon: {
+                    required: false
+                }
+            }
+        },
+        bids: [{
+            bidder: 'pubwise',
+            params: {
+                siteId: "xxxxxx",
+                isTest: true,
+            },
+        }]
+    }
+]
+```
+
diff --git a/modules/pubxBidAdapter.js b/modules/pubxBidAdapter.js
new file mode 100644
index 00000000000..17c4ba3848e
--- /dev/null
+++ b/modules/pubxBidAdapter.js
@@ -0,0 +1,99 @@
+import { deepSetValue } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'pubx';
+const BID_ENDPOINT = 'https://api.primecaster.net/adlogue/api/slot/bid';
+const USER_SYNC_URL = 'https://api.primecaster.net/primecaster_dmppv.html'
+export const spec = {
+  code: BIDDER_CODE,
+  isBidRequestValid: function(bid) {
+    if (!(bid.params.sid)) {
+      return false;
+    } else { return true }
+  },
+  buildRequests: function(validBidRequests) {
+    return validBidRequests.map(bidRequest => {
+      const bidId = bidRequest.bidId;
+      const params = bidRequest.params;
+      const sid = params.sid;
+      const payload = {
+        sid: sid
+      };
+      return {
+        id: bidId,
+        method: 'GET',
+        url: BID_ENDPOINT,
+        data: payload,
+      }
+    });
+  },
+  interpretResponse: function(serverResponse, bidRequest) {
+    const body = serverResponse.body;
+    const bidResponses = [];
+    if (body.cid) {
+      const bidResponse = {
+        requestId: bidRequest.id,
+        cpm: body.cpm,
+        currency: body.currency,
+        width: body.width,
+        height: body.height,
+        creativeId: body.cid,
+        netRevenue: true,
+        ttl: body.TTL,
+        ad: body.adm
+      };
+      if (body.adomains) {
+        deepSetValue(bidResponse, 'meta.advertiserDomains', Array.isArray(body.adomains) ? body.adomains : [body.adomains]);
+      }
+      bidResponses.push(bidResponse);
+    } else {};
+    return bidResponses;
+  },
+  /**
+   * Determine which user syncs should occur
+   * @param {object} syncOptions
+   * @param {array} serverResponses
+   * @returns {array} User sync pixels
+   */
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const kwTag = document.getElementsByName('keywords');
+    let kwString = '';
+    let kwEnc = '';
+    let titleContent = !!document.title && document.title;
+    let titleEnc = '';
+    let descContent = !!document.getElementsByName('description') && !!document.getElementsByName('description')[0] && document.getElementsByName('description')[0].content;
+    let descEnc = '';
+    const pageUrl = location.href.replace(/\?.*$/, '');
+    const pageEnc = encodeURIComponent(pageUrl);
+    const refUrl = document.referrer.replace(/\?.*$/, '');
+    const refEnc = encodeURIComponent(refUrl);
+    if (kwTag.length) {
+      const kwContents = kwTag[0].content;
+      if (kwContents.length > 20) {
+        const kwArray = kwContents.substr(0, 20).split(',');
+        kwArray.pop();
+        kwString = kwArray.join();
+      } else {
+        kwString = kwContents;
+      }
+      kwEnc = encodeURIComponent(kwString);
+    } else { }
+    if (titleContent) {
+      if (titleContent.length > 30) {
+        titleContent = titleContent.substr(0, 30);
+      } else {};
+      titleEnc = encodeURIComponent(titleContent);
+    } else { };
+    if (descContent) {
+      if (descContent.length > 60) {
+        descContent = descContent.substr(0, 60);
+      } else {};
+      descEnc = encodeURIComponent(descContent);
+    } else { };
+    return (syncOptions.iframeEnabled) ? [{
+      type: 'iframe',
+      url: USER_SYNC_URL + '?pkw=' + kwEnc + '&pd=' + descEnc + '&pu=' + pageEnc + '&pref=' + refEnc + '&pt=' + titleEnc
+    }] : [];
+  }
+}
+registerBidder(spec);
diff --git a/modules/pubxBidAdapter.md b/modules/pubxBidAdapter.md
new file mode 100644
index 00000000000..da7d960c831
--- /dev/null
+++ b/modules/pubxBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+Module Name: pubx Bid Adapter
+
+Maintainer: x@pub-x.io
+
+# Description
+
+Module that connects to Pub-X's demand sources
+Supported MediaTypes: banner only
+
+# Test Parameters
+```javascript
+	var adUnits = [
+    {
+      code: 'test',
+      mediaTypes: {
+        banner: {
+          sizes: [300,250]
+        }
+      },
+      bids: [
+        {
+          bidder: 'pubx',
+          params: {
+            sid: 'eDMR' //ID should be provided by Pub-X
+          }
+        }
+      ]
+    }
+  ];
+```
\ No newline at end of file
diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
new file mode 100644
index 00000000000..f7e73dd5fdd
--- /dev/null
+++ b/modules/pubxaiAnalyticsAdapter.js
@@ -0,0 +1,206 @@
+import { deepAccess, getGptSlotInfoForAdUnitCode, parseSizesInput, getWindowLocation, buildUrl } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
+
+const emptyUrl = '';
+const analyticsType = 'endpoint';
+const pubxaiAnalyticsVersion = 'v1.1.0';
+const defaultHost = 'api.pbxai.com';
+const auctionPath = '/analytics/auction';
+const winningBidPath = '/analytics/bidwon';
+
+let initOptions;
+let auctionTimestamp;
+let auctionCache = [];
+let events = {
+  bids: [],
+  floorDetail: {},
+  pageDetail: {},
+  deviceDetail: {}
+};
+
+function getStorage() {
+  try {
+    return window.top['sessionStorage'];
+  } catch (e) {
+    return null;
+  }
+}
+
+var pubxaiAnalyticsAdapter = Object.assign(adapter(
+  {
+    emptyUrl,
+    analyticsType
+  }), {
+  track({ eventType, args }) {
+    if (typeof args !== 'undefined') {
+      if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT) {
+        args.forEach(item => { mapBidResponse(item, 'timeout'); });
+      } else if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
+        events.auctionInit = args;
+        events.floorDetail = {};
+        events.bids = [];
+        const floorData = deepAccess(args, 'bidderRequests.0.bids.0.floorData');
+        if (typeof floorData !== 'undefined') {
+          Object.assign(events.floorDetail, floorData);
+        }
+        auctionTimestamp = args.timestamp;
+      } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
+        mapBidResponse(args, 'response');
+      } else if (eventType === CONSTANTS.EVENTS.BID_WON) {
+        send({
+          winningBid: mapBidResponse(args, 'bidwon')
+        }, 'bidwon');
+      }
+    }
+    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
+      send(events, 'auctionEnd');
+    }
+  }
+});
+
+function mapBidResponse(bidResponse, status) {
+  if (typeof bidResponse !== 'undefined') {
+    let bid = {
+      adUnitCode: bidResponse.adUnitCode,
+      gptSlotCode: getGptSlotInfoForAdUnitCode(bidResponse.adUnitCode).gptSlot || null,
+      auctionId: bidResponse.auctionId,
+      bidderCode: bidResponse.bidder,
+      cpm: bidResponse.cpm,
+      creativeId: bidResponse.creativeId,
+      currency: bidResponse.currency,
+      floorData: bidResponse.floorData,
+      mediaType: bidResponse.mediaType,
+      netRevenue: bidResponse.netRevenue,
+      requestTimestamp: bidResponse.requestTimestamp,
+      responseTimestamp: bidResponse.responseTimestamp,
+      status: bidResponse.status,
+      statusMessage: bidResponse.statusMessage,
+      timeToRespond: bidResponse.timeToRespond,
+      transactionId: bidResponse.transactionId
+    };
+    if (status !== 'bidwon') {
+      Object.assign(bid, {
+        bidId: status === 'timeout' ? bidResponse.bidId : bidResponse.requestId,
+        renderStatus: status === 'timeout' ? 3 : 2,
+        sizes: parseSizesInput(bidResponse.size).toString(),
+      });
+      events.bids.push(bid);
+    } else {
+      Object.assign(bid, {
+        bidId: bidResponse.requestId,
+        floorProvider: events.floorDetail?.floorProvider || null,
+        floorFetchStatus: events.floorDetail?.fetchStatus || null,
+        floorLocation: events.floorDetail?.location || null,
+        floorModelVersion: events.floorDetail?.modelVersion || null,
+        floorSkipRate: events.floorDetail?.skipRate || 0,
+        isFloorSkipped: events.floorDetail?.skipped || false,
+        isWinningBid: true,
+        placementId: bidResponse.params ? deepAccess(bidResponse, 'params.0.placementId') : null,
+        renderedSize: bidResponse.size,
+        renderStatus: 4
+      });
+      return bid;
+    }
+  }
+}
+
+export function getDeviceType() {
+  if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(navigator.userAgent.toLowerCase()))) {
+    return 'tablet';
+  }
+  if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(navigator.userAgent.toLowerCase()))) {
+    return 'mobile';
+  }
+  return 'desktop';
+}
+
+export function getBrowser() {
+  if (/Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor)) return 'Chrome';
+  else if (navigator.userAgent.match('CriOS')) return 'Chrome';
+  else if (/Firefox/.test(navigator.userAgent)) return 'Firefox';
+  else if (/Edg/.test(navigator.userAgent)) return 'Microsoft Edge';
+  else if (/Safari/.test(navigator.userAgent) && /Apple Computer/.test(navigator.vendor)) return 'Safari';
+  else if (/Trident/.test(navigator.userAgent) || /MSIE/.test(navigator.userAgent)) return 'Internet Explorer';
+  else return 'Others';
+}
+
+export function getOS() {
+  if (navigator.userAgent.indexOf('Android') != -1) return 'Android';
+  if (navigator.userAgent.indexOf('like Mac') != -1) return 'iOS';
+  if (navigator.userAgent.indexOf('Win') != -1) return 'Windows';
+  if (navigator.userAgent.indexOf('Mac') != -1) return 'Macintosh';
+  if (navigator.userAgent.indexOf('Linux') != -1) return 'Linux';
+  if (navigator.appVersion.indexOf('X11') != -1) return 'Unix';
+  return 'Others';
+}
+
+// add sampling rate
+pubxaiAnalyticsAdapter.shouldFireEventRequest = function (samplingRate = 1) {
+  return (Math.floor((Math.random() * samplingRate + 1)) === parseInt(samplingRate));
+};
+
+function send(data, status) {
+  if (pubxaiAnalyticsAdapter.shouldFireEventRequest(initOptions.samplingRate)) {
+    let location = getWindowLocation();
+    const storage = getStorage();
+    data.initOptions = initOptions;
+    data.pageDetail = {};
+    Object.assign(data.pageDetail, {
+      host: location.host,
+      path: location.pathname,
+      search: location.search
+    });
+    if (typeof data !== 'undefined' && typeof data.auctionInit !== 'undefined') {
+      data.pageDetail.adUnitCount = data.auctionInit.adUnitCodes ? data.auctionInit.adUnitCodes.length : null;
+      data.initOptions.auctionId = data.auctionInit.auctionId;
+      delete data.auctionInit;
+
+      data.pmcDetail = {};
+      Object.assign(data.pmcDetail, {
+        bidDensity: storage ? storage.getItem('pbx:dpbid') : null,
+        maxBid: storage ? storage.getItem('pbx:mxbid') : null,
+        auctionId: storage ? storage.getItem('pbx:aucid') : null,
+      });
+    }
+    data.deviceDetail = {};
+    Object.assign(data.deviceDetail, {
+      platform: navigator.platform,
+      deviceType: getDeviceType(),
+      deviceOS: getOS(),
+      browser: getBrowser()
+    });
+
+    let pubxaiAnalyticsRequestUrl = buildUrl({
+      protocol: 'https',
+      hostname: (initOptions && initOptions.hostName) || defaultHost,
+      pathname: status == 'bidwon' ? winningBidPath : auctionPath,
+      search: {
+        auctionTimestamp: auctionTimestamp,
+        pubxaiAnalyticsVersion: pubxaiAnalyticsVersion,
+        prebidVersion: $$PREBID_GLOBAL$$.version
+      }
+    });
+    if (status == 'bidwon') {
+      ajax(pubxaiAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/json' });
+    } else if (status == 'auctionEnd' && auctionCache.indexOf(data.initOptions.auctionId) === -1) {
+      ajax(pubxaiAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/json' });
+      auctionCache.push(data.initOptions.auctionId);
+    }
+  }
+}
+
+pubxaiAnalyticsAdapter.originEnableAnalytics = pubxaiAnalyticsAdapter.enableAnalytics;
+pubxaiAnalyticsAdapter.enableAnalytics = function (config) {
+  initOptions = config.options;
+  pubxaiAnalyticsAdapter.originEnableAnalytics(config);
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: pubxaiAnalyticsAdapter,
+  code: 'pubxai'
+});
+
+export default pubxaiAnalyticsAdapter;
diff --git a/modules/pubxaiAnalyticsAdapter.md b/modules/pubxaiAnalyticsAdapter.md
new file mode 100644
index 00000000000..112329fc171
--- /dev/null
+++ b/modules/pubxaiAnalyticsAdapter.md
@@ -0,0 +1,27 @@
+# Overview
+Module Name: PubX.io Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: phaneendra@pubx.ai
+
+# Description
+
+Analytics adapter for prebid provided by Pubx.ai. Contact alex@pubx.ai for information.
+
+# Test Parameters
+
+```
+{
+  provider: 'pubxai',
+    options : {
+      pubxId: 'xxx',
+      hostName: 'example.com',
+      samplingRate: 1
+    }
+}
+```
+Property | Data Type | Is required? | Description |Example
+:-----:|:-----:|:-----:|:-----:|:-----:
+pubxId|string|Yes | A unique identifier provided by PubX.ai to indetify publishers.  |`"a9d48e2f-24ec-4ec1-b3e2-04e32c3aeb03"`
+hostName|string|No|hostName is provided by Pubx.ai. |`"https://example.com"`
+samplingRate |number |No|How often the sampling must be taken. |`2` -  (sample one in two cases) \  `3` - (sample one in three cases)
+ | | | |
\ No newline at end of file
diff --git a/modules/pulsepointAnalyticsAdapter.js b/modules/pulsepointAnalyticsAdapter.js
index 375a817f257..999ae3dd3de 100644
--- a/modules/pulsepointAnalyticsAdapter.js
+++ b/modules/pulsepointAnalyticsAdapter.js
@@ -2,7 +2,7 @@
  * pulsepoint.js - Analytics Adapter for PulsePoint
  */
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 var pulsepointAdapter = adapter({
diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index 7bfa8686728..25f82fb60d9 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -1,7 +1,8 @@
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 /* eslint dot-notation:0, quote-props:0 */
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
+import {convertTypes, deepAccess, isArray, isFn, logError} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {Renderer} from '../src/Renderer.js';
 
 const NATIVE_DEFAULTS = {
   TITLE_LEN: 100,
@@ -39,13 +40,16 @@ export const spec = {
   ),
 
   buildRequests: (bidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const request = {
       id: bidRequests[0].bidderRequestId,
       imp: bidRequests.map(slot => impression(slot)),
       site: site(bidRequests, bidderRequest),
       app: app(bidRequests),
       device: device(),
-      bcat: bidRequests[0].params.bcat,
+      bcat: deepAccess(bidderRequest.ortb2Imp, 'bcat') || bidRequests[0].params.bcat,
       badv: bidRequests[0].params.badv,
       user: user(bidRequests[0], bidderRequest),
       regs: regs(bidderRequest),
@@ -77,7 +81,7 @@ export const spec = {
     }
   },
   transformBidParams: function(params, isOpenRtb) {
-    return utils.convertTypes({
+    return convertTypes({
       'cf': 'string',
       'cp': 'number',
       'ct': 'number'
@@ -92,7 +96,7 @@ function bidResponseAvailable(request, response) {
   const idToImpMap = {};
   const idToBidMap = {};
   const idToSlotConfig = {};
-  const bidResponse = response.body
+  const bidResponse = response.body;
   // extract the request bids and the response bids, keyed by impr-id
   const ortbRequest = request.data;
   ortbRequest.imp.forEach(imp => {
@@ -119,24 +123,25 @@ function bidResponseAvailable(request, response) {
         adId: id,
         ttl: idToBidMap[id].exp || DEFAULT_BID_TTL,
         netRevenue: DEFAULT_NET_REVENUE,
-        currency: bidResponse.cur || DEFAULT_CURRENCY
+        currency: bidResponse.cur || DEFAULT_CURRENCY,
+        meta: { advertiserDomains: idToBidMap[id].adomain || [] }
       };
-      if (idToImpMap[id]['native']) {
-        bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
-        bid.mediaType = 'native';
-      } else if (idToImpMap[id].video) {
+      if (idToImpMap[id].video) {
         // for outstream, a renderer is specified
-        if (idToSlotConfig[id] && utils.deepAccess(idToSlotConfig[id], 'mediaTypes.video.context') === 'outstream') {
-          bid.renderer = outstreamRenderer(utils.deepAccess(idToSlotConfig[id], 'renderer.options'), utils.deepAccess(idToBidMap[id], 'ext.outstream'));
+        if (idToSlotConfig[id] && deepAccess(idToSlotConfig[id], 'mediaTypes.video.context') === 'outstream') {
+          bid.renderer = outstreamRenderer(deepAccess(idToSlotConfig[id], 'renderer.options'), deepAccess(idToBidMap[id], 'ext.outstream'));
         }
         bid.vastXml = idToBidMap[id].adm;
         bid.mediaType = 'video';
         bid.width = idToBidMap[id].w;
         bid.height = idToBidMap[id].h;
-      } else {
+      } else if (idToImpMap[id].banner) {
         bid.ad = idToBidMap[id].adm;
         bid.width = idToBidMap[id].w || idToImpMap[id].banner.w;
         bid.height = idToBidMap[id].h || idToImpMap[id].banner.h;
+      } else if (idToImpMap[id]['native']) {
+        bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
+        bid.mediaType = 'native';
       }
       bids.push(bid);
     }
@@ -148,14 +153,16 @@ function bidResponseAvailable(request, response) {
  * Produces an OpenRTBImpression from a slot config.
  */
 function impression(slot) {
+  var firstPartyData = slot.ortb2Imp?.ext || {};
+  var ext = Object.assign({}, firstPartyData, slotUnknownParams(slot));
   return {
     id: slot.bidId,
     banner: banner(slot),
     'native': nativeImpression(slot),
     tagid: slot.params.ct.toString(),
     video: video(slot),
-    bidfloor: slot.params.bidfloor,
-    ext: ext(slot),
+    bidfloor: bidFloor(slot),
+    ext: Object.keys(ext).length > 0 ? ext : null,
   };
 }
 
@@ -165,21 +172,21 @@ function impression(slot) {
 function banner(slot) {
   const sizes = parseSizes(slot);
   const size = adSize(slot, sizes);
-  return (slot.nativeParams || slot.params.video) ? null : {
+  return (slot.mediaTypes && slot.mediaTypes.banner) ? {
     w: size[0],
     h: size[1],
     battr: slot.params.battr,
     format: sizes
-  };
+  } : null;
 }
 
 /**
  * Produce openrtb format objects based on the sizes configured for the slot.
  */
 function parseSizes(slot) {
-  const sizes = utils.deepAccess(slot, 'mediaTypes.banner.sizes');
-  if (sizes && utils.isArray(sizes)) {
-    return sizes.filter(sz => utils.isArray(sz) && sz.length === 2).map(sz => ({
+  const sizes = deepAccess(slot, 'mediaTypes.banner.sizes');
+  if (sizes && isArray(sizes)) {
+    return sizes.filter(sz => isArray(sz) && sz.length === 2).map(sz => ({
       w: sz[0],
       h: sz[1]
     }));
@@ -192,7 +199,11 @@ function parseSizes(slot) {
  */
 function video(slot) {
   if (slot.params.video) {
-    return Object.assign({}, slot.params.video, {battr: slot.params.battr});
+    return Object.assign({},
+      slot.params.video, // previously supported as bidder param
+      slot.mediaTypes && slot.mediaTypes.video ? slot.mediaTypes.video : {}, // params on mediaTypes.video
+      {battr: slot.params.battr}
+    );
   }
   return null;
 }
@@ -200,7 +211,7 @@ function video(slot) {
 /**
  * Unknown params are captured and sent on ext
  */
-function ext(slot) {
+function slotUnknownParams(slot) {
   const ext = {};
   const knownParamsMap = {};
   KNOWN_PARAMS.forEach(value => knownParamsMap[value] = 1);
@@ -321,13 +332,16 @@ function site(bidRequests, bidderRequest) {
   const pubId = bidRequests && bidRequests.length > 0 ? bidRequests[0].params.cp : '0';
   const appParams = bidRequests[0].params.app;
   if (!appParams) {
-    return {
+    // use the first party data if available, and override only publisher/ref/page properties
+    var firstPartyData = bidderRequest?.ortb2?.site || {};
+    return Object.assign({}, firstPartyData, {
       publisher: {
         id: pubId.toString(),
       },
-      ref: referrer(),
-      page: bidderRequest && bidderRequest.refererInfo ? bidderRequest.refererInfo.referer : '',
-    }
+      // TODO: does the fallback make sense here?
+      ref: bidderRequest?.refererInfo?.ref || window.document.referrer,
+      page: bidderRequest?.refererInfo?.page || ''
+    });
   }
   return null;
 }
@@ -351,17 +365,6 @@ function app(bidderRequest) {
   return null;
 }
 
-/**
- * Attempts to capture the referrer url.
- */
-function referrer() {
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return document.referrer;
-  }
-}
-
 /**
  * Produces an OpenRTB Device object.
  */
@@ -382,7 +385,7 @@ function parse(rawResponse) {
       return JSON.parse(rawResponse);
     }
   } catch (ex) {
-    utils.logError('pulsepointLite.safeParse', 'ERROR', ex);
+    logError('pulsepointLite.safeParse', 'ERROR', ex);
   }
   return null;
 }
@@ -407,60 +410,20 @@ function adSize(slot, sizes) {
  * an openrtb User object.
  */
 function user(bidRequest, bidderRequest) {
-  var ext = {};
+  var user = bidderRequest?.ortb2?.user || { ext: {} };
+  var ext = user.ext;
   if (bidderRequest) {
     if (bidderRequest.gdprConsent) {
       ext.consent = bidderRequest.gdprConsent.consentString;
     }
   }
   if (bidRequest) {
-    if (bidRequest.userId) {
-      ext.eids = [];
-      addExternalUserId(ext.eids, bidRequest.userId.pubcid, 'pubcommon');
-      addExternalUserId(ext.eids, bidRequest.userId.britepoolid, 'britepool.com');
-      addExternalUserId(ext.eids, bidRequest.userId.criteoId, 'criteo');
-      addExternalUserId(ext.eids, bidRequest.userId.idl_env, 'identityLink');
-      addExternalUserId(ext.eids, bidRequest.userId.id5id, 'id5-sync.com');
-      addExternalUserId(ext.eids, bidRequest.userId.parrableid, 'parrable.com');
-      // liveintent
-      if (bidRequest.userId.lipb && bidRequest.userId.lipb.lipbid) {
-        addExternalUserId(ext.eids, bidRequest.userId.lipb.lipbid, 'liveintent.com');
-      }
-      // TTD
-      addExternalUserId(ext.eids, bidRequest.userId.tdid, 'adserver.org', {
-        rtiPartner: 'TDID'
-      });
-      // digitrust
-      const digitrustResponse = bidRequest.userId.digitrustid;
-      if (digitrustResponse && digitrustResponse.data) {
-        var digitrust = {};
-        if (digitrustResponse.data.id) {
-          digitrust.id = digitrustResponse.data.id;
-        }
-        if (digitrustResponse.data.keyv) {
-          digitrust.keyv = digitrustResponse.data.keyv;
-        }
-        ext.digitrust = digitrust;
-      }
-    }
-  }
-  return { ext };
-}
-
-/**
- * Produces external userid object in ortb 3.0 model.
- */
-function addExternalUserId(eids, id, source, uidExt) {
-  if (id) {
-    var uid = { id };
-    if (uidExt) {
-      uid.ext = uidExt;
+    let eids = bidRequest.userIdAsEids;
+    if (eids) {
+      ext.eids = eids;
     }
-    eids.push({
-      source,
-      uids: [ uid ]
-    });
   }
+  return user;
 }
 
 /**
@@ -519,4 +482,19 @@ function nativeResponse(imp, bid) {
   return null;
 }
 
+function bidFloor(slot) {
+  let floor = slot.params.bidfloor;
+  if (isFn(slot.getFloor)) {
+    const floorData = slot.getFloor({
+      mediaType: slot.mediaTypes.banner ? 'banner' : slot.mediaTypes.video ? 'video' : 'Native',
+      size: '*',
+      currency: DEFAULT_CURRENCY,
+    });
+    if (floorData && floorData.floor) {
+      floor = floorData.floor;
+    }
+  }
+  return floor;
+}
+
 registerBidder(spec);
diff --git a/modules/pulsepointBidAdapter.md b/modules/pulsepointBidAdapter.md
index 36d4ef6cce5..7f4b7e6b611 100644
--- a/modules/pulsepointBidAdapter.md
+++ b/modules/pulsepointBidAdapter.md
@@ -45,23 +45,21 @@ Please use ```pulsepoint``` as the bidder code.
       mediaTypes: {
         video: {
             playerSize: [640, 480],
-            context: 'outstream'
+            context: 'outstream',
+            h: 300,
+            w: 400,
+            minduration: 1,
+            maxduration: 210,
+            linearity: 1,
+            mimes: ["video/mp4", "video/ogg", "video/webm"],
+            pos: 3
         }
       },
       bids: [{
           bidder: 'pulsepoint',
           params: { 
               cp: 512379,
-              ct: 505642,
-              video: {
-                  h: 300,
-                  w: 400,
-                  minduration: 1,
-                  maxduration: 210,
-                  linearity: 1,
-                  mimes: ["video/mp4", "video/ogg", "video/webm"],
-                  pos: 3
-              }
+              ct: 505642
           }
       }],
       renderer: {
@@ -74,7 +72,12 @@ Please use ```pulsepoint``` as the bidder code.
         mediaTypes: {
             video: {
                 playerSize: [640, 480],
-                context: 'instream'
+                context: 'instream',
+                h: 300,
+                w: 400,
+                minduration: 1,
+                maxduration: 210,
+                protocols: [2,3,5]
             }
         },
         bids: [{
@@ -82,14 +85,6 @@ Please use ```pulsepoint``` as the bidder code.
             params: {
                 cp: 512379,
                 ct: 694973, 
-                video: {
-                    battr: [1,3],
-                    h: 300,
-                    w: 400,
-                    minduration: 1,
-                    maxduration: 210,
-                    protocols: [2,3,5]
-                }
             }
         }]
     }];
diff --git a/modules/pxyzBidAdapter.js b/modules/pxyzBidAdapter.js
index bd2189ccc39..b40e0c79d6b 100644
--- a/modules/pxyzBidAdapter.js
+++ b/modules/pxyzBidAdapter.js
@@ -1,6 +1,6 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
+import { logInfo, logError, isArray } from '../src/utils.js';
 
 const BIDDER_CODE = 'pxyz';
 const URL = 'https://ads.playground.xyz/host-config/prebid?v=2';
@@ -32,7 +32,7 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
-    const referer = bidderRequest.refererInfo.referer;
+    const referer = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
     const parts = referer.split('/');
 
     let protocol, hostname;
@@ -61,15 +61,15 @@ export const spec = {
     if (bidderRequest && bidderRequest.gdprConsent) {
       const gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
       const consentString = bidderRequest.gdprConsent.consentString;
-      utils.logInfo(`PXYZ: GDPR applies ${gdpr}`);
-      utils.logInfo(`PXYZ: GDPR consent string ${consentString}`);
+      logInfo(`PXYZ: GDPR applies ${gdpr}`);
+      logInfo(`PXYZ: GDPR consent string ${consentString}`);
       payload.Regs.ext.gdpr = gdpr;
       payload.User = { ext: { consent: consentString } };
     }
 
     // CCPA
     if (bidderRequest && bidderRequest.uspConsent) {
-      utils.logInfo(`PXYZ: USP Consent ${bidderRequest.uspConsent}`);
+      logInfo(`PXYZ: USP Consent ${bidderRequest.uspConsent}`);
       payload.Regs.ext['us_privacy'] = bidderRequest.uspConsent;
     }
 
@@ -95,14 +95,14 @@ export const spec = {
       let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
       if (serverResponse && serverResponse.error) {
         errorMessage += `: ${serverResponse.error}`;
-        utils.logError(errorMessage);
+        logError(errorMessage);
       }
       return bids;
     }
 
-    if (!utils.isArray(serverResponse.seatbid)) {
+    if (!isArray(serverResponse.seatbid)) {
       let errorMessage = `in response for ${bidderRequest.bidderCode} adapter `;
-      utils.logError(errorMessage += 'Malformed seatbid response');
+      logError(errorMessage += 'Malformed seatbid response');
       return bids;
     }
 
@@ -133,6 +133,7 @@ export const spec = {
 }
 
 function newBid(bid, currency) {
+  const { adomain } = bid;
   return {
     requestId: bid.impid,
     mediaType: BANNER,
@@ -144,6 +145,9 @@ function newBid(bid, currency) {
     ttl: 300,
     netRevenue: true,
     currency: currency,
+    meta: {
+      ...(adomain && adomain.length > 0 ? { advertiserDomains: adomain } : {})
+    }
   };
 }
 
diff --git a/modules/quantcastBidAdapter.js b/modules/quantcastBidAdapter.js
index 91022d70df9..19a559edfda 100644
--- a/modules/quantcastBidAdapter.js
+++ b/modules/quantcastBidAdapter.js
@@ -1,8 +1,10 @@
-import * as utils from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
-import { config } from '../src/config.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import find from 'core-js-pure/features/array/find.js';
+import {deepAccess, isArray, isEmpty, logError, logInfo} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {find} from '../src/polyfill.js';
+import {parseDomain} from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'quantcast';
 const DEFAULT_BID_FLOOR = 0.0000000001;
@@ -18,35 +20,38 @@ export const QUANTCAST_TEST_PUBLISHER = 'test-publisher';
 export const QUANTCAST_TTL = 4;
 export const QUANTCAST_PROTOCOL = 'https';
 export const QUANTCAST_PORT = '8443';
+export const QUANTCAST_FPA = '__qca';
+
+export const storage = getStorageManager({gvlid: QUANTCAST_VENDOR_ID, bidderCode: BIDDER_CODE});
 
 function makeVideoImp(bid) {
-  const video = {};
-  if (bid.params.video) {
-    video['mimes'] = bid.params.video.mimes;
-    video['minduration'] = bid.params.video.minduration;
-    video['maxduration'] = bid.params.video.maxduration;
-    video['protocols'] = bid.params.video.protocols;
-    video['startdelay'] = bid.params.video.startdelay;
-    video['linearity'] = bid.params.video.linearity;
-    video['battr'] = bid.params.video.battr;
-    video['maxbitrate'] = bid.params.video.maxbitrate;
-    video['playbackmethod'] = bid.params.video.playbackmethod;
-    video['delivery'] = bid.params.video.delivery;
-    video['placement'] = bid.params.video.placement;
-    video['api'] = bid.params.video.api;
-  }
-  if (bid.mediaTypes.video.mimes) {
-    video['mimes'] = bid.mediaTypes.video.mimes;
+  const videoInMediaType = deepAccess(bid, 'mediaTypes.video') || {};
+  const videoInParams = deepAccess(bid, 'params.video') || {};
+  const video = Object.assign({}, videoInParams, videoInMediaType);
+
+  if (video.playerSize) {
+    video.w = video.playerSize[0];
+    video.h = video.playerSize[1];
   }
-  if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
-    video['w'] = bid.mediaTypes.video.playerSize[0][0];
-    video['h'] = bid.mediaTypes.video.playerSize[0][1];
-  } else {
-    video['w'] = bid.mediaTypes.video.playerSize[0];
-    video['h'] = bid.mediaTypes.video.playerSize[1];
+  const videoCopy = {
+    mimes: video.mimes,
+    minduration: video.minduration,
+    maxduration: video.maxduration,
+    protocols: video.protocols,
+    startdelay: video.startdelay,
+    linearity: video.linearity,
+    battr: video.battr,
+    maxbitrate: video.maxbitrate,
+    playbackmethod: video.playbackmethod,
+    delivery: video.delivery,
+    placement: video.placement,
+    api: video.api,
+    w: video.w,
+    h: video.h
   }
+
   return {
-    video: video,
+    video: videoCopy,
     placementCode: bid.placementCode,
     bidFloor: bid.params.bidFloor || DEFAULT_BID_FLOOR
   };
@@ -70,26 +75,7 @@ function makeBannerImp(bid) {
   };
 }
 
-function getDomain(url) {
-  if (!url) {
-    return url;
-  }
-  return url.replace('http://', '').replace('https://', '').replace('www.', '').split(/[/?#]/)[0];
-}
-
-function checkTCFv1(vendorData) {
-  let vendorConsent = vendorData.vendorConsents && vendorData.vendorConsents[QUANTCAST_VENDOR_ID];
-  let purposeConsent = vendorData.purposeConsents && vendorData.purposeConsents[PURPOSE_DATA_COLLECT];
-
-  return !!(vendorConsent && purposeConsent);
-}
-
-function checkTCFv2(tcData) {
-  if (tcData.purposeOneTreatment && tcData.publisherCC === 'DE') {
-    // special purpose 1 treatment for Germany
-    return true;
-  }
-
+function checkTCF(tcData) {
   let restrictions = tcData.publisher ? tcData.publisher.restrictions : {};
   let qcRestriction = restrictions && restrictions[PURPOSE_DATA_COLLECT]
     ? restrictions[PURPOSE_DATA_COLLECT][QUANTCAST_VENDOR_ID]
@@ -106,15 +92,21 @@ function checkTCFv2(tcData) {
   return !!(vendorConsent && purposeConsent);
 }
 
+function getQuantcastFPA() {
+  let fpa = storage.getCookie(QUANTCAST_FPA)
+  return fpa || ''
+}
+
+let hasUserSynced = false;
+
 /**
  * The documentation for Prebid.js Adapter 1.0 can be found at link below,
  * http://prebid.org/dev-docs/bidder-adapter-1.html
  */
 export const spec = {
   code: BIDDER_CODE,
-  GVLID: 11,
+  GVLID: QUANTCAST_VENDOR_ID,
   supportedMediaTypes: ['banner', 'video'],
-  hasUserSynced: false,
 
   /**
    * Verify the `AdUnits.bids` response with `true` for valid request and `false`
@@ -137,22 +129,18 @@ export const spec = {
    */
   buildRequests(bidRequests, bidderRequest) {
     const bids = bidRequests || [];
-    const gdprConsent = utils.deepAccess(bidderRequest, 'gdprConsent') || {};
-    const uspConsent = utils.deepAccess(bidderRequest, 'uspConsent');
-    const referrer = utils.deepAccess(bidderRequest, 'refererInfo.referer');
-    const page = utils.deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || config.getConfig('pageUrl') || utils.deepAccess(window, 'location.href');
-    const domain = getDomain(page);
+    const gdprConsent = deepAccess(bidderRequest, 'gdprConsent') || {};
+    const uspConsent = deepAccess(bidderRequest, 'uspConsent');
+    const referrer = deepAccess(bidderRequest, 'refererInfo.ref');
+    const page = deepAccess(bidderRequest, 'refererInfo.page') || deepAccess(window, 'location.href');
+    const domain = parseDomain(page, {noLeadingWww: true});
 
     // Check for GDPR consent for purpose 1, and drop request if consent has not been given
     // Remaining consent checks are performed server-side.
     if (gdprConsent.gdprApplies) {
       if (gdprConsent.vendorData) {
-        if (gdprConsent.apiVersion === 1 && !checkTCFv1(gdprConsent.vendorData)) {
-          utils.logInfo(`${BIDDER_CODE}: No purpose 1 consent for TCF v1`);
-          return;
-        }
-        if (gdprConsent.apiVersion === 2 && !checkTCFv2(gdprConsent.vendorData)) {
-          utils.logInfo(`${BIDDER_CODE}: No purpose 1 consent for TCF v2`);
+        if (!checkTCF(gdprConsent.vendorData)) {
+          logInfo(`${BIDDER_CODE}: No purpose 1 consent for TCF v2`);
           return;
         }
       }
@@ -169,7 +157,7 @@ export const spec = {
           imp = makeBannerImp(bid);
         } else {
           // Unsupported mediaType
-          utils.logInfo(`${BIDDER_CODE}: No supported mediaTypes found in ${JSON.stringify(bid.mediaTypes)}`);
+          logInfo(`${BIDDER_CODE}: No supported mediaTypes found in ${JSON.stringify(bid.mediaTypes)}`);
           return;
         }
       } else {
@@ -193,7 +181,8 @@ export const spec = {
         uspSignal: uspConsent ? 1 : 0,
         uspConsent,
         coppa: config.getConfig('coppa') === true ? 1 : 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: getQuantcastFPA()
       };
 
       const data = JSON.stringify(requestData);
@@ -225,24 +214,24 @@ export const spec = {
    */
   interpretResponse(serverResponse) {
     if (serverResponse === undefined) {
-      utils.logError('Server Response is undefined');
+      logError('Server Response is undefined');
       return [];
     }
 
     const response = serverResponse['body'];
 
     if (response === undefined || !response.hasOwnProperty('bids')) {
-      utils.logError('Sub-optimal JSON received from Quantcast server');
+      logError('Sub-optimal JSON received from Quantcast server');
       return [];
     }
 
-    if (utils.isEmpty(response.bids)) {
+    if (isEmpty(response.bids)) {
       // Shortcut response handling if no bids are present
       return [];
     }
 
     const bidResponsesList = response.bids.map(bid => {
-      const { ad, cpm, width, height, creativeId, currency, videoUrl, dealId } = bid;
+      const { ad, cpm, width, height, creativeId, currency, videoUrl, dealId, meta } = bid;
 
       const result = {
         requestId: response.requestId,
@@ -265,6 +254,11 @@ export const spec = {
         result['dealId'] = dealId;
       }
 
+      if (meta !== undefined && meta.advertiserDomains && isArray(meta.advertiserDomains)) {
+        result.meta = {};
+        result.meta.advertiserDomains = meta.advertiserDomains;
+      }
+
       return result;
     });
 
@@ -276,24 +270,24 @@ export const spec = {
   },
   getUserSyncs(syncOptions, serverResponses) {
     const syncs = []
-    if (!this.hasUserSynced && syncOptions.pixelEnabled) {
+    if (!hasUserSynced && syncOptions.pixelEnabled) {
       const responseWithUrl = find(serverResponses, serverResponse =>
-        utils.deepAccess(serverResponse.body, 'userSync.url')
+        deepAccess(serverResponse.body, 'userSync.url')
       );
 
       if (responseWithUrl) {
-        const url = utils.deepAccess(responseWithUrl.body, 'userSync.url')
+        const url = deepAccess(responseWithUrl.body, 'userSync.url')
         syncs.push({
           type: 'image',
           url: url
         });
       }
-      this.hasUserSynced = true;
+      hasUserSynced = true;
     }
     return syncs;
   },
   resetUserSync() {
-    this.hasUserSynced = false;
+    hasUserSynced = false;
   }
 };
 
diff --git a/modules/quantcastIdSystem.js b/modules/quantcastIdSystem.js
new file mode 100644
index 00000000000..97cd01f98da
--- /dev/null
+++ b/modules/quantcastIdSystem.js
@@ -0,0 +1,218 @@
+/**
+ * This module adds QuantcastID to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/quantcastIdSystem
+ * @requires module:modules/userId
+ */
+
+import {submodule} from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js';
+import { triggerPixel, logInfo } from '../src/utils.js';
+import { uspDataHandler, coppaDataHandler, gdprDataHandler } from '../src/adapterManager.js';
+
+const QUANTCAST_FPA = '__qca';
+const DEFAULT_COOKIE_EXP_DAYS = 392; // (13 months - 2 days)
+const DAY_MS = 86400000;
+const PREBID_PCODE = 'p-KceJUEvXN48CE';
+const QSERVE_URL = 'https://pixel.quantserve.com/pixel';
+const QUANTCAST_VENDOR_ID = '11';
+const PURPOSE_DATA_COLLECT = '1';
+const PURPOSE_PRODUCT_IMPROVEMENT = '10';
+const QC_TCF_REQUIRED_PURPOSES = [PURPOSE_DATA_COLLECT, PURPOSE_PRODUCT_IMPROVEMENT];
+const QC_TCF_CONSENT_FIRST_PURPOSES = [PURPOSE_DATA_COLLECT];
+const QC_TCF_CONSENT_ONLY_PUPROSES = [PURPOSE_DATA_COLLECT];
+const GDPR_PRIVACY_STRING = gdprDataHandler.getConsentData();
+const US_PRIVACY_STRING = uspDataHandler.getConsentData();
+
+export const storage = getStorageManager();
+
+export function firePixel(clientId, cookieExpDays = DEFAULT_COOKIE_EXP_DAYS) {
+  // check for presence of Quantcast Measure tag _qevent obj and publisher provided clientID
+  if (!window._qevents && clientId && clientId != '') {
+    var fpa = storage.getCookie(QUANTCAST_FPA);
+    var fpan = '0';
+    var domain = quantcastIdSubmodule.findRootDomain();
+    var now = new Date();
+    var usPrivacyParamString = '';
+    var firstPartyParamStrings;
+    var gdprParamStrings;
+
+    if (!fpa) {
+      var et = now.getTime();
+      var expires = new Date(et + (cookieExpDays * DAY_MS)).toGMTString();
+      var rand = Math.round(Math.random() * 2147483647);
+      fpa = `B0-${rand}-${et}`;
+      fpan = '1';
+      storage.setCookie(QUANTCAST_FPA, fpa, expires, '/', domain, null);
+    }
+
+    firstPartyParamStrings = `&fpan=${fpan}&fpa=${fpa}`;
+    gdprParamStrings = '&gdpr=0';
+    if (GDPR_PRIVACY_STRING && typeof GDPR_PRIVACY_STRING.gdprApplies === 'boolean' && GDPR_PRIVACY_STRING.gdprApplies) {
+      gdprParamStrings = `gdpr=1&gdpr_consent=${GDPR_PRIVACY_STRING.consentString}`;
+    }
+    if (US_PRIVACY_STRING && typeof US_PRIVACY_STRING === 'string') {
+      usPrivacyParamString = `&us_privacy=${US_PRIVACY_STRING}`;
+    }
+
+    let url = QSERVE_URL +
+    '?d=' + domain +
+    '&client_id=' + clientId +
+    '&a=' + PREBID_PCODE +
+    usPrivacyParamString +
+    gdprParamStrings +
+    firstPartyParamStrings;
+
+    triggerPixel(url);
+  }
+};
+
+export function hasGDPRConsent(gdprConsent) {
+  // Check for GDPR consent for purpose 1 and 10, and drop request if consent has not been given
+  // Remaining consent checks are performed server-side.
+  if (gdprConsent && typeof gdprConsent.gdprApplies === 'boolean' && gdprConsent.gdprApplies) {
+    if (!gdprConsent.vendorData) {
+      return false;
+    }
+    return checkTCFv2(gdprConsent.vendorData);
+  }
+  return true;
+}
+
+export function checkTCFv2(vendorData, requiredPurposes = QC_TCF_REQUIRED_PURPOSES) {
+  var gdprApplies = vendorData.gdprApplies;
+  var purposes = vendorData.purpose;
+  var vendors = vendorData.vendor;
+  var qcConsent = vendors && vendors.consents && vendors.consents[QUANTCAST_VENDOR_ID];
+  var qcInterest = vendors && vendors.legitimateInterests && vendors.legitimateInterests[QUANTCAST_VENDOR_ID];
+  var restrictions = vendorData.publisher ? vendorData.publisher.restrictions : {};
+
+  if (!gdprApplies) {
+    return true;
+  }
+
+  return requiredPurposes.map(function(purpose) {
+    var purposeConsent = purposes.consents ? purposes.consents[purpose] : false;
+    var purposeInterest = purposes.legitimateInterests ? purposes.legitimateInterests[purpose] : false;
+
+    var qcRestriction = restrictions && restrictions[purpose]
+      ? restrictions[purpose][QUANTCAST_VENDOR_ID]
+      : null;
+
+    if (qcRestriction === 0) {
+      return false;
+    }
+
+    // Seek consent or legitimate interest based on our default legal
+    // basis for the purpose, falling back to the other if possible.
+    if (
+      // we have positive vendor consent
+      qcConsent &&
+      // there is positive purpose consent
+      purposeConsent &&
+      // publisher does not require legitimate interest
+      qcRestriction !== 2 &&
+      // purpose is a consent-first purpose or publisher has explicitly restricted to consent
+      (QC_TCF_CONSENT_FIRST_PURPOSES.indexOf(purpose) != -1 || qcRestriction === 1)
+    ) {
+      return true;
+    } else if (
+      // publisher does not require consent
+      qcRestriction !== 1 &&
+      // we have legitimate interest for vendor
+      qcInterest &&
+      // there is legitimate interest for purpose
+      purposeInterest &&
+      // purpose's legal basis does not require consent
+      QC_TCF_CONSENT_ONLY_PUPROSES.indexOf(purpose) == -1 &&
+      // purpose is a legitimate-interest-first purpose or publisher has explicitly restricted to legitimate interest
+      (QC_TCF_CONSENT_FIRST_PURPOSES.indexOf(purpose) == -1 || qcRestriction === 2)
+    ) {
+      return true;
+    }
+
+    return false;
+  }).reduce(function(a, b) {
+    return a && b;
+  }, true);
+}
+
+/**
+ * tests if us_privacy consent string is present, us_privacy applies, and notice_given / do-not-sell is set to yes
+ * @returns {boolean}
+ */
+export function hasCCPAConsent(usPrivacyConsent) {
+  if (
+    usPrivacyConsent &&
+    typeof usPrivacyConsent === 'string' &&
+    usPrivacyConsent.length == 4 &&
+    usPrivacyConsent.charAt(1) == 'Y' &&
+    usPrivacyConsent.charAt(2) == 'Y'
+  ) {
+    return false
+  }
+  return true;
+}
+
+/** @type {Submodule} */
+export const quantcastIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'quantcastId',
+
+  /**
+   * Vendor id of Quantcast
+   * @type {Number}
+   */
+  gvlid: QUANTCAST_VENDOR_ID,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{quantcastId: string} | undefined}
+   */
+  decode(value) {
+    return value;
+  },
+
+  /**
+   * read Quantcast first party cookie and pass it along in quantcastId
+   * @function
+   * @returns {{id: {quantcastId: string} | undefined}}}
+   */
+  getId(config) {
+    // Consent signals are currently checked on the server side.
+    let fpa = storage.getCookie(QUANTCAST_FPA);
+
+    const coppa = coppaDataHandler.getCoppa();
+
+    if (coppa || !hasCCPAConsent(US_PRIVACY_STRING) || !hasGDPRConsent(GDPR_PRIVACY_STRING)) {
+      var expired = new Date(0).toUTCString();
+      var domain = quantcastIdSubmodule.findRootDomain();
+      logInfo('QuantcastId: Necessary consent not present for Id, exiting QuantcastId');
+      storage.setCookie(QUANTCAST_FPA, '', expired, '/', domain, null);
+      return undefined;
+    }
+
+    const configParams = (config && config.params) || {};
+    const storageParams = (config && config.storage) || {};
+
+    var clientId = configParams.clientId || '';
+    var cookieExpDays = storageParams.expires || DEFAULT_COOKIE_EXP_DAYS;
+
+    // Callbacks on Event Listeners won't trigger if the event is already complete so this check is required
+    if (document.readyState === 'complete') {
+      firePixel(clientId, cookieExpDays);
+    } else {
+      window.addEventListener('load', function () {
+        firePixel(clientId, cookieExpDays);
+      });
+    }
+
+    return { id: fpa ? { quantcastId: fpa } : undefined };
+  }
+};
+
+submodule('userId', quantcastIdSubmodule);
diff --git a/modules/quantcastIdSystem.md b/modules/quantcastIdSystem.md
new file mode 100644
index 00000000000..cf76099e4a5
--- /dev/null
+++ b/modules/quantcastIdSystem.md
@@ -0,0 +1,46 @@
+#### Overview
+
+```
+Module Name: Quantcast Id System
+Module Type: Id System
+Maintainer: asig@quantcast.com
+```
+
+#### Description
+
+ The Prebid Quantcast ID module stores a Quantcast ID in a first party cookie. The ID is then made available in the bid request. The ID from the cookie added in the bidstream allows Quantcast to more accurately bid on publisher inventories without third party cookies, which can result in better monetization across publisher sites from Quantcast. And, it’s free to use! For easier integration, you can work with one of our SSP partners, like PubMatic, who can facilitate the legal process as well as the software integration for you.
+
+ Add it to your Prebid.js package with:
+
+ `gulp build --modules=userId,quantcastIdSystem`
+
+ Quantcast’s privacy policies for the services rendered can be found at
+  		https://www.quantcast.com/privacy/
+
+ Publishers deploying the module are responsible for ensuring legally required notices and choices for users. 
+
+ The Quantcast ID module will only perform any action and return an ID in situations where:
+ 1. the publisher has not set a ‘coppa'  flag on the prebid configuration on their site (see [pbjs.setConfig.coppa](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-coppa)) 
+ 2. there is not a IAB us-privacy string indicating the digital property has provided user notice and the user has made a choice to opt out of sale
+ 3. if GDPR applies, an IAB TCF v2 string exists indicating that Quantcast does not have consent for purpose 1 (cookies, device identifiers, or other information can be stored or accessed on your device for the purposes presented to you), or an established legal basis (by default legitimate interest) for purpose 10 (your data can be used to improve existing systems and software, and to develop new products).
+
+ #### Quantcast ID Configuration
+
+ | Param under userSync.userIds[] | Scope | Type | Description | Example |
+ | --- | --- | --- | --- | --- |
+ | name | Required | String | `"quantcastId"` | `"quantcastId"` |
+ | params | Optional | Object | Details for Quantcast initialization. | |
+ | params.ClientID | Optional | String | Optional parameter for Quantcast prebid managed service partners. The parameter is not required for websites with Quantcast Measure tag. Reach out to Quantcast for ClientID if you are not an existing Quantcast prebid managed service partner: quantcast-idsupport@quantcast.com.  | |
+
+
+ #### Quantcast ID Example
+
+```js
+ pbjs.setConfig({
+     userSync: {
+         userIds: [{
+             name: "quantcastId"
+         }]
+     }
+ });
+```
diff --git a/modules/quantumBidAdapter.js b/modules/quantumBidAdapter.js
deleted file mode 100644
index f5da6e022f1..00000000000
--- a/modules/quantumBidAdapter.js
+++ /dev/null
@@ -1,320 +0,0 @@
-import * as utils from '../src/utils.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'quantum';
-const ENDPOINT_URL = 'https://s.sspqns.com/hb';
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['quantx', 'qtx'], // short code
-  supportedMediaTypes: [BANNER, NATIVE],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-
-  isBidRequestValid: function (bid) {
-    return !!(bid.params && bid.params.placementId);
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function (bidRequests, bidderRequest) {
-    return bidRequests.map(bid => {
-      const qtxRequest = {};
-      let bidId = '';
-
-      const params = bid.params;
-      let placementId = params.placementId;
-
-      let devEnpoint = false;
-      if (params.useDev && params.useDev === '1') {
-        devEnpoint = 'https://sdev.sspqns.com/hb';
-      }
-      let renderMode = 'native';
-      for (let i = 0; i < bid.sizes.length; i++) {
-        if (bid.sizes[i][0] > 1 && bid.sizes[i][1] > 1) {
-          renderMode = 'banner';
-          break;
-        }
-      }
-
-      let mediaType = (bid.mediaType === 'native' || utils.deepAccess(bid, 'mediaTypes.native')) ? 'native' : 'banner';
-
-      if (mediaType === 'native') {
-        renderMode = 'native';
-      }
-
-      if (!bidId) {
-        bidId = bid.bidId;
-      }
-      qtxRequest.auid = placementId;
-
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        qtxRequest.quantx_user_consent_string = bidderRequest.gdprConsent.consentString;
-        qtxRequest.quantx_gdpr = bidderRequest.gdprConsent.gdprApplies === true ? 1 : 0;
-      };
-
-      const url = devEnpoint || ENDPOINT_URL;
-
-      return {
-        method: 'GET',
-        bidId: bidId,
-        sizes: bid.sizes,
-        mediaType: mediaType,
-        renderMode: renderMode,
-        url: url,
-        'data': qtxRequest,
-        bidderRequest
-      };
-    });
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {ServerResponse} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function (serverResponse, bidRequest) {
-    const serverBody = serverResponse.body;
-    const bidResponses = [];
-    let responseCPM;
-    let bid = {};
-    let id = bidRequest.bidId;
-
-    if (serverBody.price && serverBody.price !== 0) {
-      responseCPM = parseFloat(serverBody.price);
-
-      bid.creativeId = serverBody.creative_id || '0';
-      bid.cpm = responseCPM;
-      bid.requestId = bidRequest.bidId;
-      bid.width = 1;
-      bid.height = 1;
-      bid.ttl = 200;
-      bid.netRevenue = true;
-      bid.currency = 'USD';
-
-      if (serverBody.native) {
-        bid.native = serverBody.native;
-      }
-      if (serverBody.cobj) {
-        bid.cobj = serverBody.cobj;
-      }
-      if (!utils.isEmpty(bidRequest.sizes)) {
-        bid.width = bidRequest.sizes[0][0];
-        bid.height = bidRequest.sizes[0][1];
-      }
-
-      bid.nurl = serverBody.nurl;
-      bid.sync = serverBody.sync;
-      if (bidRequest.renderMode && bidRequest.renderMode === 'banner') {
-        bid.mediaType = 'banner';
-        if (serverBody.native) {
-          const adAssetsUrl = 'https://cdn.elasticad.net/native/serve/js/quantx/quantumAd/';
-          let assets = serverBody.native.assets;
-          let link = serverBody.native.link;
-
-          let trackers = [];
-          if (serverBody.native.imptrackers) {
-            trackers = serverBody.native.imptrackers;
-          }
-
-          let jstracker = '';
-          if (serverBody.native.jstracker) {
-            jstracker = encodeURIComponent(serverBody.native.jstracker);
-          }
-
-          if (serverBody.nurl) {
-            trackers.push(serverBody.nurl);
-          }
-
-          let ad = {};
-          ad['trackers'] = trackers;
-          ad['jstrackers'] = jstracker;
-          ad['eventtrackers'] = serverBody.native.eventtrackers || [];
-
-          for (let i = 0; i < assets.length; i++) {
-            let asset = assets[i];
-            switch (asset['id']) {
-              case 1:
-                ad['title'] = asset['title']['text'];
-                break;
-              case 2:
-                ad['sponsor_logo'] = asset['img']['url'];
-                break;
-              case 3:
-                ad['content'] = asset['data']['value'];
-                break;
-              case 4:
-                ad['main_image'] = asset['img']['url'];
-                break;
-              case 6:
-                ad['teaser_type'] = 'vast';
-                ad['video_url'] = asset['video']['vasttag'];
-                break;
-              case 10:
-                ad['sponsor_name'] = asset['data']['value'];
-                break;
-              case 2001:
-                ad['expanded_content_type'] = 'embed';
-                ad['expanded_summary'] = asset['data']['value'];
-                break;
-              case 2002:
-                ad['expanded_content_type'] = 'vast';
-                ad['expanded_summary'] = asset['data']['value'];
-                break;
-              case 2003:
-                ad['sponsor_url'] = asset['data']['value'];
-                break;
-              case 2004: // prism
-                ad['content_type'] = 'prism';
-                break;
-              case 2005: // internal_landing_page
-                ad['content_type'] = 'internal_landing_page';
-                ad['internal_content_link'] = asset['data']['value'];
-                break;
-              case 2006: // teaser as vast
-                ad['teaser_type'] = 'vast';
-                ad['video_url'] = asset['data']['value'];
-                break;
-              case 2007:
-                ad['autoexpand_content_type'] = asset['data']['value'];
-                break;
-              case 2022: // content page
-                ad['content_type'] = 'full_text';
-                ad['full_text'] = asset['data']['value'];
-                break;
-            }
-          }
-
-          ad['action_url'] = link.url;
-
-          if (!ad['sponsor_url']) {
-            ad['sponsor_url'] = ad['action_url'];
-          }
-
-          ad['clicktrackers'] = [];
-          if (link.clicktrackers) {
-            ad['clicktrackers'] = link.clicktrackers;
-          }
-
-          ad['main_image'] = 'https://resize-ssp.adux.com/scalecrop-290x130/' + window.btoa(ad['main_image']) + '/external';
-
-          bid.ad = '<div id="ead_' + id + '\">' +
-            '<div class="ad_container ead_' + id + '" style="clear: both; display:inline-block;width:100%">' +
-            '  <div class="image_content">' +
-            '    <a href="' + ad['action_url'] + '" class="ea_expand" target="_blank"><img src="' + ad['main_image'] + '" class="ea_image ead_image">' +
-            '    </a>' +
-            '  </div>' +
-            '  <div class="ead_content"><a href="' + ad['action_url'] + '" class="ea_expand" style="text-decoration: none" target="_blank"><h2 style="margin:0px;">' + ad['title'] + '</h2></a>' +
-            '    <p class="ea_summary">' + ad['content'] + '&nbsp;</p></div>' +
-            '  <div style="text-align:right;" class="ea_hide_brand_logo ea_hide_brand_name">' +
-            '    <p style="margin:0;"><span class="ea_creative_var_label">Sponsored by</span>' +
-            '      <a href="' + ad['sponsor_url'] + '" class="ea_link" target="_blank" style="display:inline;" target="_blank"><img src="' + ad['sponsor_logo'] + '" class="ea_image" style="vertical-align:middle;"></a>' +
-            '    </p>' +
-            '  </div>' +
-            '</div>' +
-            '<script type="application/javascript">var eanAD = ' + JSON.stringify(ad) + ';</script>' +
-            '<script src="' + adAssetsUrl + 'qad.js" type="application/javascript"></script>' +
-            '<link rel="stylesheet" href="' + adAssetsUrl + 'qad.css">' +
-            '</div>';
-        }
-      } else {
-        // native
-        bid.mediaType = 'native';
-        if (bidRequest.mediaType === 'native') {
-          if (serverBody.native) {
-            let assets = serverBody.native.assets;
-            let link = serverBody.native.link;
-
-            let trackers = [];
-            if (serverBody.native.imptrackers) {
-              trackers = serverBody.native.imptrackers;
-            }
-
-            if (serverBody.nurl) {
-              trackers.push(serverBody.nurl);
-            }
-
-            let native = {};
-
-            for (let i = 0; i < assets.length; i++) {
-              let asset = assets[i];
-              switch (asset['id']) {
-                case 1:
-                  native.title = asset['title']['text'];
-                  break;
-                case 2:
-                  native.icon = {
-                    url: asset['img']['url'],
-                    width: asset['img']['w'],
-                    height: asset['img']['h']
-                  };
-                  break;
-                case 3:
-                  native.body = asset['data']['value'];
-                  break;
-                case 4:
-                  native.image = {
-                    url: asset['img']['url'],
-                    width: asset['img']['w'],
-                    height: asset['img']['h']
-                  };
-                  break;
-                case 10:
-                  native.sponsoredBy = asset['data']['value'];
-                  break;
-              }
-            }
-            native.cta = 'read more';
-            if (serverBody.language) {
-              native.cta = 'read more';
-            }
-
-            native.clickUrl = link.url;
-            native.impressionTrackers = trackers;
-            if (link.clicktrackers) {
-              native.clickTrackers = link.clicktrackers;
-            }
-            native.eventtrackers = native.eventtrackers || [];
-
-            bid.qtx_native = utils.deepClone(serverBody.native);
-            bid.native = native;
-          }
-        }
-      }
-      bidResponses.push(bid);
-    }
-
-    return bidResponses;
-  },
-
-  /**
-   * Register the user sync pixels which should be dropped after the auction.
-   *
-   * @param {SyncOptions} syncOptions Which user syncs are allowed?
-   * @param {ServerResponse} serverResponse A successful response from the server
-   * @return {UserSync[]} The user syncs which should be dropped.
-   */
-  getUserSyncs: function (syncOptions, serverResponse) {
-    const syncs = [];
-    utils._each(serverResponse, function(serverResponse) {
-      if (serverResponse.body && serverResponse.body.sync) {
-        utils._each(serverResponse.body.sync, function (pixel) {
-          syncs.push({
-            type: 'image',
-            url: pixel
-          });
-        });
-      }
-    });
-    return syncs;
-  }
-}
-registerBidder(spec);
diff --git a/modules/quantumBidAdapter.md b/modules/quantumBidAdapter.md
deleted file mode 100644
index 572ca9ecd37..00000000000
--- a/modules/quantumBidAdapter.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Overview
-
-```
-Module Name:  Quantum Advertising Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer: support.mediareporting@adux.com
-```
-
-# Description
-
-Connects to Quantum's ssp for bids.
-
-# Sample Ad Unit: For Publishers
-```
-var adUnits = [{
-          code: 'quantum-adUnit-id-1',
-          sizes: [[300, 250]],
-          bids: [{
-              bidder: 'quantum',
-              params: {
-                placementId: 21546 //quantum adUnit id
-              }      
-            }]
-        },{
-          code: 'quantum-native-adUnit-id-1',
-          sizes: [[0, 0]],
-          mediaTypes: 'native',
-          bids: [{
-              bidder: 'quantum',
-              params: {
-                placementId: 21546 //quantum adUnit id
-              }      
-            }]
-        }];
-```
-
-# Ad Unit and Setup: For Testing
-
-```
-<html>
-
-  <body style="margin:0;padding:0">
-
-    <script>
-      var pbjs = eanpbjs = pbjs || {};
-      pbjs.que = pbjs.que || [];
-      pbjs.logging = true;
-
-      (function() {
-        var pbjsEl = document.createElement("script");
-        pbjsEl.type = "text/javascript";
-        pbjsEl.async = true;
-        var isHttps = 'https:' === document.location.protocol;
-        pbjsEl.src = "//cdn.elasticad.net/native/serve/js/quantx/quantumPrebidAdapter/prebid.js";
-        var pbjsTargetEl = document.getElementsByTagName("head")[0];
-        pbjsTargetEl.insertBefore(pbjsEl, pbjsTargetEl.firstChild);
-      })();
-
-      var adUnitID = 'pl-100';
-
-      pbjs.que.push(function() {
-        var adUnits = [{
-          code: adUnitID,
-          sizes: [[300, 250]],
-          bids: [{
-              bidder: 'quantum',
-              params: {
-                placementId: 21546 //quantum adUnit id
-              }      
-            }]
-        }];
-
-        pbjs.addAdUnits(adUnits);
-
-        pbjs.requestBids({
-          timeout: 800,
-          bidsBackHandler: function() {    
-              var adUnitData = pbjs.getAdserverTargetingForAdUnitCode(adUnitID);
-              //console.log('adUnitData', adUnitData);
-              if(adUnitData['hb_adid']){
-                    var iframe = document.getElementById('placement');
-                    var iframeDoc = iframe.contentWindow.document;
-                    pbjs.renderAd(iframeDoc, adUnitData['hb_adid']);
-              }            
-          }
-        });
-      });
-
-    </script>
-    <iframe id='placement' FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" WIDTH="0" HEIGHT="0"></iframe>
-  </body>
-
-</html>
-  ```
diff --git a/modules/quantumdexBidAdapter.js b/modules/quantumdexBidAdapter.js
deleted file mode 100644
index 9b7a79755e3..00000000000
--- a/modules/quantumdexBidAdapter.js
+++ /dev/null
@@ -1,238 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-const BIDDER_CODE = 'quantumdex';
-const CONFIG = {
-  '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'
-  }
-};
-
-var bidderConfig = CONFIG['quantumdex'];
-var bySlotTargetKey = {};
-var bySlotSizesCount = {}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: ['banner', 'video'],
-  aliases: ['valueimpression'],
-  isBidRequestValid: function (bid) {
-    if (!bid.params) {
-      return false;
-    }
-    if (!bid.params.siteId) {
-      return false;
-    }
-    if (!utils.deepAccess(bid, 'mediaTypes.banner') && !utils.deepAccess(bid, 'mediaTypes.video')) {
-      return false;
-    }
-    if (utils.deepAccess(bid, 'mediaTypes.banner')) { // Quantumdex does not support multi type bids, favor banner over video
-      if (!utils.deepAccess(bid, 'mediaTypes.banner.sizes')) {
-        // sizes at the banner is required.
-        return false;
-      }
-    } else if (utils.deepAccess(bid, 'mediaTypes.video')) {
-      if (!utils.deepAccess(bid, 'mediaTypes.video.playerSize')) {
-        // playerSize is required for instream adUnits.
-        return false;
-      }
-    }
-    return true;
-  },
-
-  buildRequests: function (validBidRequests, bidderRequest) {
-    var bids = JSON.parse(JSON.stringify(validBidRequests))
-    bidderConfig = CONFIG[bids[0].bidder];
-    const payload = {};
-
-    bids.forEach(bidReq => {
-      var targetKey = 0;
-      if (bySlotTargetKey[bidReq.adUnitCode] != undefined) {
-        targetKey = bySlotTargetKey[bidReq.adUnitCode];
-      } else {
-        var biggestSize = _getBiggestSize(bidReq.sizes);
-        if (biggestSize) {
-          if (bySlotSizesCount[biggestSize] != undefined) {
-            bySlotSizesCount[biggestSize]++
-            targetKey = bySlotSizesCount[biggestSize];
-          } else {
-            bySlotSizesCount[biggestSize] = 0;
-            targetKey = 0
-          }
-        }
-      }
-      bySlotTargetKey[bidReq.adUnitCode] = targetKey;
-      bidReq.targetKey = targetKey;
-    });
-
-    payload.device = {};
-    payload.device.ua = navigator.userAgent;
-    payload.device.height = window.top.innerHeight;
-    payload.device.width = window.top.innerWidth;
-    payload.device.dnt = _getDoNotTrack();
-    payload.device.language = navigator.language;
-
-    payload.site = {};
-    payload.site.id = bids[0].params.siteId;
-    payload.site.page = _extractTopWindowUrlFromBidderRequest(bidderRequest);
-    payload.site.referrer = _extractTopWindowReferrerFromBidderRequest(bidderRequest);
-    payload.site.hostname = window.top.location.hostname;
-
-    // Apply GDPR parameters to request.
-    payload.gdpr = {};
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      payload.gdpr.gdprApplies = bidderRequest.gdprConsent.gdprApplies ? 'true' : 'false';
-      if (bidderRequest.gdprConsent.consentString) {
-        payload.gdpr.consentString = bidderRequest.gdprConsent.consentString;
-      }
-    }
-    // Apply schain.
-    if (bids[0].schain) {
-      payload.schain = JSON.stringify(bids[0].schain)
-    }
-    // Apply us_privacy.
-    if (bidderRequest && bidderRequest.uspConsent) {
-      payload.us_privacy = bidderRequest.uspConsent;
-    }
-
-    payload.bids = bids;
-
-    return {
-      method: 'POST',
-      url: bidderConfig.ENDPOINT,
-      data: payload,
-      withCredentials: true,
-      bidderRequests: bids
-    };
-  },
-  interpretResponse: function (serverResponse, bidRequest) {
-    const serverBody = serverResponse.body;
-    const serverBids = serverBody.bids;
-    // check overall response
-    if (!serverBody || typeof serverBody !== 'object') {
-      return [];
-    }
-    if (!serverBids || typeof serverBids !== 'object') {
-      return [];
-    }
-
-    const bidResponses = [];
-    serverBids.forEach(bid => {
-      const bidResponse = {
-        requestId: bid.requestId,
-        cpm: bid.cpm,
-        width: bid.width,
-        height: bid.height,
-        creativeId: bid.creativeId,
-        dealId: bid.dealId,
-        currency: bid.currency,
-        netRevenue: bid.netRevenue,
-        ttl: bid.ttl,
-        mediaType: bid.mediaType
-      };
-      if (bid.vastXml) {
-        bidResponse.vastXml = utils.replaceAuctionPrice(bid.vastXml, bid.cpm);
-      } else {
-        bidResponse.ad = utils.replaceAuctionPrice(bid.ad, bid.cpm);
-      }
-      bidResponses.push(bidResponse);
-    });
-    return bidResponses;
-  },
-  getUserSyncs: function (syncOptions, serverResponses) {
-    const syncs = [];
-    try {
-      if (syncOptions.iframeEnabled) {
-        syncs.push({
-          type: 'iframe',
-          url: bidderConfig.USERSYNC
-        });
-      }
-      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
-            });
-          }
-        });
-      }
-    } catch (e) { }
-    return syncs;
-  }
-};
-
-function _getBiggestSize(sizes) {
-  if (sizes.length <= 0) return false
-  var acreage = 0;
-  var index = 0;
-  for (var i = 0; i < sizes.length; i++) {
-    var currentAcreage = sizes[i][0] * sizes[i][1];
-    if (currentAcreage >= acreage) {
-      acreage = currentAcreage;
-      index = i;
-    }
-  }
-  return sizes[index][0] + 'x' + sizes[index][1];
-}
-
-function _getDoNotTrack() {
-  if (window.top.doNotTrack || navigator.doNotTrack || navigator.msDoNotTrack) {
-    if (window.top.doNotTrack == '1' || navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') {
-      return 1;
-    } else {
-      return 0;
-    }
-  } else {
-    return 0;
-  }
-}
-
-/**
- * Extracts the page url from given bid request or use the (top) window location as fallback
- *
- * @param {*} bidderRequest
- * @returns {string}
- */
-function _extractTopWindowUrlFromBidderRequest(bidderRequest) {
-  if (bidderRequest && utils.deepAccess(bidderRequest, 'refererInfo.canonicalUrl')) {
-    return bidderRequest.refererInfo.canonicalUrl;
-  }
-
-  try {
-    return window.top.location.href;
-  } catch (e) {
-    return window.location.href;
-  }
-}
-
-/**
- * Extracts the referrer from given bid request or use the (top) document referrer as fallback
- *
- * @param {*} bidderRequest
- * @returns {string}
- */
-function _extractTopWindowReferrerFromBidderRequest(bidderRequest) {
-  if (bidderRequest && utils.deepAccess(bidderRequest, 'refererInfo.referer')) {
-    return bidderRequest.refererInfo.referer;
-  }
-
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return window.document.referrer;
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/quantumdexBidAdapter.md b/modules/quantumdexBidAdapter.md
deleted file mode 100644
index 8c35ea8cb05..00000000000
--- a/modules/quantumdexBidAdapter.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Overview
-
-```
-Module Name: Quantum Digital Exchange Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: ken@quantumdex.io
-```
-
-# Description
-
-Connects to Quantum Digital Exchange for bids.
-Quantumdex bid adapter supports Banner and Video (Instream and Outstream) ads.
-
-# Test Parameters
-```
-var adUnits = [
-  {
-    code: 'test-div',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250], [300,600]]
-      }
-    },
-    bids: [
-      {
-          bidder: 'quantumdex',
-          params: {
-              siteId: 'quantumdex-site-id', // siteId provided by Quantumdex
-          }
-      }
-    ]
-  }
-];
-```
-
-# Video Test Parameters
-```
-var videoAdUnit = {
-  code: 'test-div',
-  sizes: [[640, 480]],
-  mediaTypes: {
-    video: {
-      playerSize: [[640, 480]],
-      context: 'instream'
-    },
-  },
-  bids: [
-    {
-      bidder: 'quantumdex',
-      params: {
-        siteId: 'quantumdex-site-id', // siteId provided by Quantumdex
-      }
-    }
-  ]
-};
-```
\ No newline at end of file
diff --git a/modules/qwarryBidAdapter.js b/modules/qwarryBidAdapter.js
new file mode 100644
index 00000000000..4b3e8fa8a19
--- /dev/null
+++ b/modules/qwarryBidAdapter.js
@@ -0,0 +1,102 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { deepClone } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'qwarry';
+export const ENDPOINT = 'https://bidder.qwarry.co/bid/adtag?prebid=true'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: ['banner', 'video'],
+
+  isBidRequestValid: function (bid) {
+    return !!(bid.params && bid.params.zoneToken);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let bids = [];
+    validBidRequests.forEach(bidRequest => {
+      bids.push({
+        bidId: bidRequest.bidId,
+        zoneToken: bidRequest.params.zoneToken,
+        pos: bidRequest.params.pos,
+        sizes: prepareSizes(bidRequest.sizes)
+      })
+    })
+
+    let payload = {
+      requestId: bidderRequest.bidderRequestId,
+      bids,
+      referer: bidderRequest.refererInfo.page,
+      schain: validBidRequests[0].schain
+    }
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdprConsent = {
+        consentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : false,
+        consentString: bidderRequest.gdprConsent.consentString
+      }
+    }
+
+    const options = {
+      contentType: 'application/json',
+      customHeaders: {
+        'Rtb-Direct': true
+      }
+    }
+
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: payload,
+      options
+    };
+  },
+
+  interpretResponse: function (serverResponse, request) {
+    const serverBody = serverResponse.body;
+    if (!serverBody || typeof serverBody !== 'object') {
+      return [];
+    }
+
+    const { prebidResponse } = serverBody;
+    if (!prebidResponse || typeof prebidResponse !== 'object') {
+      return [];
+    }
+
+    let bids = [];
+    prebidResponse.forEach(bidResponse => {
+      let bid = deepClone(bidResponse);
+      bid.cpm = parseFloat(bidResponse.cpm);
+
+      // banner or video
+      if (VIDEO === bid.format) {
+        bid.vastXml = bid.ad;
+      }
+
+      bid.meta = {};
+      bid.meta.advertiserDomains = bid.adomain || [];
+
+      bids.push(bid);
+    })
+
+    return bids;
+  },
+
+  onBidWon: function (bid) {
+    if (bid.winUrl) {
+      const cpm = bid.cpm;
+      const winUrl = bid.winUrl.replace(/\$\{AUCTION_PRICE\}/, cpm);
+      ajax(winUrl, null);
+      return true;
+    }
+    return false;
+  }
+}
+
+function prepareSizes(sizes) {
+  return sizes && sizes.map(size => ({ width: size[0], height: size[1] }));
+}
+
+registerBidder(spec);
diff --git a/modules/qwarryBidAdapter.md b/modules/qwarryBidAdapter.md
new file mode 100644
index 00000000000..056ccb51293
--- /dev/null
+++ b/modules/qwarryBidAdapter.md
@@ -0,0 +1,28 @@
+# Overview
+
+```
+Module Name: Qwarry Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: akascheev@asteriosoft.com
+```
+
+# Description
+
+Connects to Qwarry Bidder for bids.
+Qwarry bid adapter supports Banner and Video ads.
+
+# Test Parameters
+```
+const adUnits = [
+  {
+    bids: [
+      {
+          bidder: 'qwarry',
+          params: {
+              zoneToken: '?????????????????????', // zoneToken provided by Qwarry
+          }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/radsBidAdapter.js b/modules/radsBidAdapter.js
index 1f07cc07b91..fcb8c3a8c2a 100644
--- a/modules/radsBidAdapter.js
+++ b/modules/radsBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { deepAccess } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
@@ -7,10 +7,12 @@ const BIDDER_CODE = 'rads';
 const ENDPOINT_URL = 'https://rads.recognified.net/md.request.php';
 const ENDPOINT_URL_DEV = 'https://dcradn1.online-solution.biz/md.request.php';
 const DEFAULT_VAST_FORMAT = 'vast2';
+const GVLID = 602;
 
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['rads'],
+  gvlid: GVLID,
+  aliases: [],
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bid) {
     return !!(bid.params.placement);
@@ -18,52 +20,52 @@ export const spec = {
   buildRequests: function(validBidRequests, bidderRequest) {
     return validBidRequests.map(bidRequest => {
       const params = bidRequest.params;
-      const videoData = utils.deepAccess(bidRequest, 'mediaTypes.video') || {};
-      const sizes = utils.parseSizesInput(videoData.playerSize || bidRequest.sizes)[0];
-      const [width, height] = sizes.split('x');
       const placementId = params.placement;
 
       const rnd = Math.floor(Math.random() * 99999999999);
-      const referrer = encodeURIComponent(bidderRequest.refererInfo.referer);
+      const referrer = encodeURIComponent(bidderRequest.refererInfo.page);
       const bidId = bidRequest.bidId;
       const isDev = params.devMode || false;
 
       let endpoint = isDev ? ENDPOINT_URL_DEV : ENDPOINT_URL;
 
-      let payload = {};
-      if (isVideoRequest(bidRequest)) {
-        let vastFormat = params.vastFormat || DEFAULT_VAST_FORMAT;
-        payload = {
-          rt: vastFormat,
-          _f: 'prebid_js',
-          _ps: placementId,
-          srw: width,
-          srh: height,
-          idt: 100,
-          rnd: rnd,
-          p: referrer,
-          bid_id: bidId,
-        };
+      let payload = {
+        _f: 'prebid_js',
+        _ps: placementId,
+        idt: 100,
+        rnd: rnd,
+        p: referrer,
+        bid_id: bidId,
+      };
+
+      let sizes;
+      if (isBannerRequest(bidRequest)) {
+        sizes = getBannerSizes(bidRequest);
+        payload.rt = 'bid-response';
+        payload.srw = sizes[0].width;
+        payload.srh = sizes[0].height;
       } else {
-        payload = {
-          rt: 'bid-response',
-          _f: 'prebid_js',
-          _ps: placementId,
-          srw: width,
-          srh: height,
-          idt: 100,
-          rnd: rnd,
-          p: referrer,
-          bid_id: bidId,
-        };
+        let vastFormat = params.vastFormat || DEFAULT_VAST_FORMAT;
+        sizes = getVideoSizes(bidRequest);
+        payload.rt = vastFormat;
+        payload.srw = sizes[0].width;
+        payload.srh = sizes[0].height;
+      }
+
+      if (sizes.length > 1) {
+        payload.alt_ad_sizes = [];
+        for (let i = 1; i < sizes.length; i++) {
+          payload.alt_ad_sizes.push(sizes[i].width + 'x' + sizes[i].height);
+        }
       }
-      prepareExtraParams(params, payload);
+
+      prepareExtraParams(params, payload, bidderRequest, bidRequest);
 
       return {
         method: 'GET',
         url: endpoint,
         data: objectToQueryString(payload),
-      }
+      };
     });
   },
   interpretResponse: function(serverResponse, bidRequest) {
@@ -84,7 +86,10 @@ export const spec = {
         dealId: dealId,
         currency: currency,
         netRevenue: netRevenue,
-        ttl: config.getConfig('_bidderTimeout')
+        ttl: config.getConfig('_bidderTimeout'),
+        meta: {
+          advertiserDomains: response.adomain || []
+        }
       };
 
       if (response.vastXml) {
@@ -97,9 +102,48 @@ export const spec = {
       bidResponses.push(bidResponse);
     }
     return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    if (!serverResponses || serverResponses.length === 0) {
+      return [];
+    }
+
+    const syncs = []
+
+    let gdprParams = '';
+    if (gdprConsent) {
+      if ('gdprApplies' in gdprConsent && typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    if (serverResponses.length > 0 && serverResponses[0].body.userSync) {
+      if (syncOptions.iframeEnabled) {
+        serverResponses[0].body.userSync.iframeUrl.forEach((url) => syncs.push({
+          type: 'iframe',
+          url: appendToUrl(url, gdprParams)
+        }));
+      }
+      if (syncOptions.pixelEnabled) {
+        serverResponses[0].body.userSync.imageUrl.forEach((url) => syncs.push({
+          type: 'image',
+          url: appendToUrl(url, gdprParams)
+        }));
+      }
+    }
+    return syncs;
   }
 }
 
+function appendToUrl(url, what) {
+  if (!what) {
+    return url;
+  }
+  return url + (url.indexOf('?') !== -1 ? '&' : '?') + what;
+}
+
 function objectToQueryString(obj, prefix) {
   let str = [];
   let p;
@@ -114,23 +158,33 @@ function objectToQueryString(obj, prefix) {
   }
   return str.join('&');
 }
-
 /**
- * Check if it's a video bid request
+ * Add extra params to server request
  *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {boolean} True if it's a video bid
+ * @param params
+ * @param payload
+ * @param bidderRequest
+ * @param {BidRequest} bidRequest - Bid request generated from ad slots
  */
-function isVideoRequest(bid) {
-  return bid.mediaType === 'video' || !!utils.deepAccess(bid, 'mediaTypes.video');
-}
-
-function prepareExtraParams(params, payload) {
+function prepareExtraParams(params, payload, bidderRequest, bidRequest) {
   if (params.pfilter !== undefined) {
     payload.pfilter = params.pfilter;
   }
+
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    if (payload.pfilter !== undefined) {
+      payload.pfilter.gdpr_consent = bidderRequest.gdprConsent.consentString;
+      payload.pfilter.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    } else {
+      payload.pfilter = {
+        'gdpr_consent': bidderRequest.gdprConsent.consentString,
+        'gdpr': bidderRequest.gdprConsent.gdprApplies
+      };
+    }
+  }
+
   if (params.bcat !== undefined) {
-    payload.bcat = params.bcat;
+    payload.bcat = deepAccess(bidderRequest.ortb2Imp, 'bcat') || params.bcat;
   }
   if (params.dvt !== undefined) {
     payload.dvt = params.dvt;
@@ -146,6 +200,77 @@ function prepareExtraParams(params, payload) {
   if (params.ip !== undefined) {
     payload.i = params.ip;
   }
+
+  if (bidRequest.userId && bidRequest.userId.netId) {
+    payload.did_netid = bidRequest.userId.netId;
+  }
+  if (bidRequest.userId && bidRequest.userId.uid2) {
+    payload.did_uid2 = bidRequest.userId.uid2;
+  }
+}
+
+/**
+ * Check if it's a banner bid request
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {boolean} True if it's a banner bid
+ */
+function isBannerRequest(bid) {
+  return bid.mediaType === 'banner' || !!deepAccess(bid, 'mediaTypes.banner') || !isVideoRequest(bid);
+}
+
+/**
+ * Check if it's a video bid request
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {boolean} True if it's a video bid
+ */
+function isVideoRequest(bid) {
+  return bid.mediaType === 'video' || !!deepAccess(bid, 'mediaTypes.video');
+}
+
+/**
+ * Get video sizes
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {object} True if it's a video bid
+ */
+function getVideoSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
+}
+
+/**
+ * Get banner sizes
+ *
+ * @param {BidRequest} bid - Bid request generated from ad slots
+ * @returns {object} True if it's a video bid
+ */
+function getBannerSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
+}
+
+/**
+ * Parse size
+ * @param sizes
+ * @returns {width: number, h: height}
+ */
+function parseSize(size) {
+  let sizeObj = {}
+  sizeObj.width = parseInt(size[0], 10);
+  sizeObj.height = parseInt(size[1], 10);
+  return sizeObj;
+}
+
+/**
+ * Parse sizes
+ * @param sizes
+ * @returns {{width: number , height: number }[]}
+ */
+function parseSizes(sizes) {
+  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
+    return sizes.map(size => parseSize(size));
+  }
+  return [parseSize(sizes)]; // or a single one ? (ie. [728,90])
 }
 
 registerBidder(spec);
diff --git a/modules/radsBidAdapter.md b/modules/radsBidAdapter.md
index 6e970093154..a00b82e20cb 100644
--- a/modules/radsBidAdapter.md
+++ b/modules/radsBidAdapter.md
@@ -25,6 +25,7 @@ RADS Bidder Adapter for Prebid.js 1.x
                     bidder: "rads",
                     params: {
                         placement: 3,   // placement ID
+                        vastFormat: "vast2", // vast2(default) or vast4 
                         devMode: true   // if true: library uses dev server for tests
                     }
                 }
diff --git a/modules/rakutenBidAdapter/index.js b/modules/rakutenBidAdapter/index.js
index e567509b3c1..27c04029231 100644
--- a/modules/rakutenBidAdapter/index.js
+++ b/modules/rakutenBidAdapter/index.js
@@ -22,8 +22,9 @@ export const spec = {
           l: navigator.browserLanguage ||
                         navigator.language,
           d: document.domain,
+          // TODO: what are 'tp' and 'pp'?
           tp: bidderRequest.refererInfo.stack[0] || window.location.href,
-          pp: bidderRequest.refererInfo.referer,
+          pp: bidderRequest.refererInfo.topmostLocation,
           gdpr: ((_a = bidderRequest.gdprConsent) === null || _a === void 0 ? void 0 : _a.gdprApplies) ? 1 : 0,
           ...((_b = bidderRequest.gdprConsent) === null || _b === void 0 ? void 0 : _b.consentString) && {
             cd: bidderRequest.gdprConsent.consentString
diff --git a/modules/rasBidAdapter.js b/modules/rasBidAdapter.js
new file mode 100644
index 00000000000..f8ca260d490
--- /dev/null
+++ b/modules/rasBidAdapter.js
@@ -0,0 +1,164 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { isEmpty, getAdUnitSizes, parseSizesInput, deepAccess } from '../src/utils.js';
+
+const BIDDER_CODE = 'ras';
+const VERSION = '1.0';
+
+const getEndpoint = (network) => {
+  return `https://csr.onet.pl/${encodeURIComponent(network)}/csr-006/csr.json?nid=${encodeURIComponent(network)}&`;
+};
+
+function parseParams(params, bidderRequest) {
+  const newParams = {};
+  if (params.customParams && typeof params.customParams === 'object') {
+    for (const param in params.customParams) {
+      if (params.customParams.hasOwnProperty(param)) {
+        newParams[param] = params.customParams[param];
+      }
+    }
+  }
+  const du = deepAccess(bidderRequest, 'refererInfo.page');
+  const dr = deepAccess(bidderRequest, 'refererInfo.ref');
+  if (du) {
+    newParams.du = du;
+  }
+  if (dr) {
+    newParams.dr = dr;
+  }
+  const pageContext = params.pageContext;
+  if (!pageContext) {
+    return newParams;
+  }
+  if (pageContext.du) {
+    newParams.du = pageContext.du;
+  }
+  if (pageContext.dr) {
+    newParams.dr = pageContext.dr;
+  }
+  if (pageContext.dv) {
+    newParams.DV = pageContext.dv;
+  }
+  if (pageContext.keyWords && Array.isArray(pageContext.keyWords)) {
+    newParams.kwrd = pageContext.keyWords.join('+');
+  }
+  if (pageContext.capping) {
+    newParams.local_capping = pageContext.capping;
+  }
+  if (pageContext.keyValues && typeof pageContext.keyValues === 'object') {
+    for (const param in pageContext.keyValues) {
+      if (pageContext.keyValues.hasOwnProperty(param)) {
+        const kvName = 'kv' + param;
+        newParams[kvName] = pageContext.keyValues[param];
+      }
+    }
+  }
+  return newParams;
+}
+
+const buildBid = (ad) => {
+  if (ad.type === 'empty') {
+    return null;
+  }
+  return {
+    requestId: ad.id,
+    cpm: ad.bid_rate ? ad.bid_rate.toFixed(2) : 0,
+    width: ad.width || 0,
+    height: ad.height || 0,
+    ttl: 300,
+    creativeId: ad.adid ? parseInt(ad.adid.split(',')[2], 10) : 0,
+    netRevenue: true,
+    currency: ad.currency || 'USD',
+    dealId: null,
+    meta: {
+      mediaType: BANNER
+    },
+    ad: ad.html || null
+  };
+};
+
+const getContextParams = (bidRequests, bidderRequest) => {
+  const bid = bidRequests[0];
+  const { params } = bid;
+  const requestParams = {
+    site: params.site,
+    area: params.area,
+    cre_format: 'html',
+    systems: 'das',
+    kvprver: VERSION,
+    ems_url: 1,
+    bid_rate: 1,
+    ...parseParams(params, bidderRequest)
+  };
+  return Object.keys(requestParams).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(requestParams[key])).join('&');
+};
+
+const getSlots = (bidRequests) => {
+  let queryString = '';
+  const batchSize = bidRequests.length;
+  for (let i = 0; i < batchSize; i++) {
+    const adunit = bidRequests[i];
+    const slotSequence = deepAccess(adunit, 'params.slotSequence');
+
+    const sizes = parseSizesInput(getAdUnitSizes(adunit)).join(',');
+
+    queryString += `&slot${i}=${encodeURIComponent(adunit.params.slot)}&id${i}=${encodeURIComponent(adunit.bidId)}&composition${i}=CHILD`;
+
+    if (sizes.length) {
+      queryString += `&iusizes${i}=${encodeURIComponent(sizes)}`;
+    }
+    if (slotSequence !== undefined) {
+      queryString += `&pos${i}=${encodeURIComponent(slotSequence)}`;
+    }
+  }
+  return queryString;
+};
+
+const getGdprParams = (bidderRequest) => {
+  const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
+  let consentString = deepAccess(bidderRequest, 'gdprConsent.consentString');
+  let queryString = '';
+  if (gdprApplies !== undefined) {
+    queryString += `&gdpr_applies=${encodeURIComponent(gdprApplies)}`;
+  }
+  if (consentString !== undefined) {
+    queryString += `&euconsent=${encodeURIComponent(consentString)}`;
+  }
+  return queryString;
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest || !bidRequest.params || typeof bidRequest.params !== 'object') {
+      return;
+    }
+    const { params } = bidRequest;
+    return Boolean(params.network && params.site && params.area && params.slot);
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    const slotsQuery = getSlots(bidRequests);
+    const contextQuery = getContextParams(bidRequests, bidderRequest);
+    const gdprQuery = getGdprParams(bidderRequest);
+    const bidIds = bidRequests.map((bid) => ({ slot: bid.params.slot, bidId: bid.bidId }));
+    const network = bidRequests[0].params.network;
+    return [{
+      method: 'GET',
+      url: getEndpoint(network) + contextQuery + slotsQuery + gdprQuery,
+      bidIds: bidIds
+    }];
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const response = serverResponse.body;
+    if (!response || !response.ads || response.ads.length === 0) {
+      return [];
+    }
+    return response.ads.map(buildBid).filter((bid) => !isEmpty(bid));
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/rasBidAdapter.md b/modules/rasBidAdapter.md
new file mode 100644
index 00000000000..e8a61974130
--- /dev/null
+++ b/modules/rasBidAdapter.md
@@ -0,0 +1,52 @@
+# Overview
+
+```
+Module Name: Ringier Axel Springer Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@ringpublishing.com
+```
+
+# Description
+
+Module that connects to Ringer Axel Springer demand sources.
+Only banner format is supported.
+
+# Test Parameters
+```js
+var adUnits = [{
+  code: 'test-div-ad',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]]
+    }
+  },
+  bids: [{
+    bidder: 'ras',
+    params: {
+      network: '4178463',
+      site: 'test',
+      area: 'areatest',
+      slot: 'slot'
+    }
+  }]
+}];
+```
+
+# Parameters
+
+| Name                         | Scope    | Type     | Description                                                                                                                                                                                                                                                                | Example                                                                                     |
+|------------------------------|----------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
+| network                      | required | String   | Specific identifier provided by RAS                                                                                                                                                                                                                                        | `"4178463"`                                                                                 |
+| site                         | required | String   | Specific identifier name (case-insensitive) that is associated with this ad unit and provided by RAS                                                                                                                                                                       | `"example_com"`                                                                             |
+| area                         | required | String   | Ad unit category name; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                                         | `"sport"`                                                                                   |
+| slot                         | required | String   | Ad unit placement name (case-insensitive) provided by RAS                                                                                                                                                                                                                  | `"slot"`                                                                                    |
+| slotSequence                 | optional | Number   | Ad unit sequence position provided by RAS                                                                                                                                                                                                                                  | `1`                                                                                         |
+| pageContext                  | optional | Object   | Web page context data                                                                                                                                                                                                                                                      | `{}`                                                                                        |
+| pageContext.dr               | optional | String   | Document referrer URL address                                                                                                                                                                                                                                              | `"https://example.com/"`                                                                    |
+| pageContext.du               | optional | String   | Document URL address                                                                                                                                                                                                                                                       | `"https://example.com/sport/football/article.html?id=932016a5-02fc-4d5c-b643-fafc2f270f06"` |
+| pageContext.dv               | optional | String   | Document virtual address as slash-separated path that may consist of any number of parts (case-insensitive alphanumeric with underscores and hyphens); first part should be the same as `site` value and second as `area` value; next parts may reflect website navigation | `"example_com/sport/football"`                                                              |
+| pageContext.keyWords         | optional | String[] | List of keywords associated with this ad unit; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                 | `["euro", "lewandowski"]`                                                                   |
+| pageContext.keyValues        | optional | Object   | Key-values associated with this ad unit (case-insensitive); following characters are not allowed in the values: `" ' = ! + # * ~ ; ^ ( ) < > [ ] & @`                                                                                                                      | `{}`                                                                                        |
+| pageContext.keyValues.ci     | optional | String   | Content unique identifier                                                                                                                                                                                                                                                  | `"932016a5-02fc-4d5c-b643-fafc2f270f06"`                                                    |
+| pageContext.keyValues.adunit | optional | String   | Ad unit name                                                                                                                                                                                                                                                               | `"example_com/sport"`                                                                       |
+| customParams                 | optional | Object   | Custom request params                                                                                                                                                                                                                                                      | `{}`                                                                                        |
\ No newline at end of file
diff --git a/modules/rdnBidAdapter.md b/modules/rdnBidAdapter.md
deleted file mode 100644
index 9082c95c520..00000000000
--- a/modules/rdnBidAdapter.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Overview
-
-```
-Module Name: RDN Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: engineer@lob-inc.com
-```
-
-# Description
-
-Connect to RDN for bids.
-
-RDN bid adapter supports Banner currently.
-
-# Test Parameters
-
-```
-  var adUnits = [
-    {
-      code: 'test-ad-div',
-      sizes: [[300, 250]],
-      mediaTypes: {banner: {}},
-      bids: [
-        {
-          bidder: 'rdn',
-          params: {
-            adSpotId: '10000'
-          }
-        }
-      ]
-    }
-  ];
-```
diff --git a/modules/readpeakBidAdapter.js b/modules/readpeakBidAdapter.js
index c72bbdd658f..844e287c622 100644
--- a/modules/readpeakBidAdapter.js
+++ b/modules/readpeakBidAdapter.js
@@ -1,7 +1,8 @@
-import { logError, replaceAuctionPrice, parseUrl } from '../src/utils.js';
+import { logError, replaceAuctionPrice, triggerPixel, isStr } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
-import { NATIVE } from '../src/mediaTypes.js';
+import { NATIVE, BANNER } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 export const ENDPOINT = 'https://app.readpeak.com/header/prebid';
 
@@ -19,33 +20,47 @@ const BIDDER_CODE = 'readpeak';
 export const spec = {
   code: BIDDER_CODE,
 
-  supportedMediaTypes: [NATIVE],
+  supportedMediaTypes: [NATIVE, BANNER],
 
-  isBidRequestValid: bid =>
-    !!(bid && bid.params && bid.params.publisherId && bid.nativeParams),
+  isBidRequestValid: bid => !!(bid && bid.params && bid.params.publisherId),
 
   buildRequests: (bidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const currencyObj = config.getConfig('currency');
     const currency = (currencyObj && currencyObj.adServerCurrency) || 'USD';
 
     const request = {
       id: bidRequests[0].bidderRequestId,
       imp: bidRequests
-        .map(slot => impression(slot))
-        .filter(imp => imp.native != null),
+        .map(slot => impression(slot)),
       site: site(bidRequests, bidderRequest),
       app: app(bidRequests),
       device: device(),
       cur: [currency],
       source: {
         fd: 1,
-        tid: bidRequests[0].transactionId,
+        tid: bidderRequest.auctionId,
         ext: {
           prebid: '$prebid.version$'
         }
       }
     };
 
+    if (bidderRequest.gdprConsent) {
+      request.user = {
+        ext: {
+          consent: bidderRequest.gdprConsent.consentString || ''
+        },
+      };
+      request.regs = {
+        ext: {
+          gdpr: bidderRequest.gdprConsent.gdprApplies !== undefined ? bidderRequest.gdprConsent.gdprApplies : true
+        }
+      };
+    }
+
     return {
       method: 'POST',
       url: ENDPOINT,
@@ -53,8 +68,16 @@ export const spec = {
     };
   },
 
-  interpretResponse: (response, request) =>
-    bidResponseAvailable(request, response)
+  interpretResponse: (response, request) => {
+    return bidResponseAvailable(request, response)
+  },
+
+  onBidWon: (bid) => {
+    if (bid.burl && isStr(bid.burl)) {
+      bid.burl = replaceAuctionPrice(bid.burl, bid.cpm);
+      triggerPixel(bid.burl);
+    }
+  },
 };
 
 function bidResponseAvailable(bidRequest, bidResponse) {
@@ -83,10 +106,22 @@ function bidResponseAvailable(bidRequest, bidResponse) {
         creativeId: idToBidMap[id].crid,
         ttl: 300,
         netRevenue: true,
-        mediaType: NATIVE,
-        currency: bidResponse.cur,
-        native: nativeResponse(idToImpMap[id], idToBidMap[id])
+        mediaType: idToImpMap[id].native ? NATIVE : BANNER,
+        currency: bidResponse.cur
       };
+      if (idToImpMap[id].native) {
+        bid.native = nativeResponse(idToImpMap[id], idToBidMap[id]);
+      } else if (idToImpMap[id].banner) {
+        bid.ad = idToBidMap[id].adm
+        bid.width = idToBidMap[id].w
+        bid.height = idToBidMap[id].h
+        bid.burl = idToBidMap[id].burl
+      }
+      if (idToBidMap[id].adomain) {
+        bid.meta = {
+          advertiserDomains: idToBidMap[id].adomain
+        }
+      }
       bids.push(bid);
     }
   });
@@ -94,12 +129,28 @@ function bidResponseAvailable(bidRequest, bidResponse) {
 }
 
 function impression(slot) {
-  return {
+  let bidFloorFromModule
+  if (typeof slot.getFloor === 'function') {
+    const floorInfo = slot.getFloor({
+      currency: 'USD',
+      mediaType: 'native',
+      size: '\*'
+    });
+    bidFloorFromModule = floorInfo.currency === 'USD' ? floorInfo.floor : undefined;
+  }
+  const imp = {
     id: slot.bidId,
-    native: nativeImpression(slot),
-    bidfloor: slot.params.bidfloor || 0,
-    bidfloorcur: slot.params.bidfloorcur || 'USD'
+    bidfloor: bidFloorFromModule || slot.params.bidfloor || 0,
+    bidfloorcur: (bidFloorFromModule && 'USD') || slot.params.bidfloorcur || 'USD',
+    tagId: slot.params.tagId || '0'
   };
+
+  if (slot.mediaTypes.native) {
+    imp.native = nativeImpression(slot);
+  } else if (slot.mediaTypes.banner) {
+    imp.banner = bannerImpression(slot);
+  }
+  return imp
 }
 
 function nativeImpression(slot) {
@@ -190,13 +241,16 @@ function dataAsset(id, params, type, defaultLen) {
     : null;
 }
 
-function site(bidRequests, bidderRequest) {
-  const url =
-    config.getConfig('pageUrl') ||
-    (bidderRequest &&
-      bidderRequest.refererInfo &&
-      bidderRequest.refererInfo.referer);
+function bannerImpression(slot) {
+  var sizes = slot.mediaTypes.banner.sizes || slot.sizes;
+  return {
+    format: sizes.map((s) => ({ w: s[0], h: s[1] })),
+    w: sizes[0][0],
+    h: sizes[0][1],
+  }
+}
 
+function site(bidRequests, bidderRequest) {
   const pubId =
     bidRequests && bidRequests.length > 0
       ? bidRequests[0].params.publisherId
@@ -208,12 +262,11 @@ function site(bidRequests, bidderRequest) {
     return {
       publisher: {
         id: pubId.toString(),
-        domain: config.getConfig('publisherDomain')
+        domain: bidderRequest?.refererInfo?.domain,
       },
       id: siteId ? siteId.toString() : pubId.toString(),
-      page: url,
-      domain:
-        (url && parseUrl(url).hostname) || config.getConfig('publisherDomain')
+      page: bidderRequest?.refererInfo?.page,
+      domain: bidderRequest?.refererInfo?.domain
     };
   }
   return undefined;
diff --git a/modules/readpeakBidAdapter.md b/modules/readpeakBidAdapter.md
index a15767f29a7..8f8e7369ea5 100644
--- a/modules/readpeakBidAdapter.md
+++ b/modules/readpeakBidAdapter.md
@@ -4,7 +4,7 @@ Module Name: ReadPeak Bid Adapter
 
 Module Type: Bidder Adapter
 
-Maintainer: kurre.stahlberg@readpeak.com
+Maintainer: devteam@readpeak.com
 
 # Description
 
@@ -15,16 +15,48 @@ Please reach out to your account team or hello@readpeak.com for more information
 
 # Test Parameters
 ```javascript
-    var adUnits = [{
-        code: '/19968336/prebid_native_example_2',
-        mediaTypes: { native: { type: 'image' } },
-        bids: [{
-            bidder: 'readpeak',
-            params: {
-                bidfloor: 5.00,
-                publisherId: 'test',
-                siteId: 'test'
+    var adUnits = [
+        {
+            code: '/19968336/prebid_native_example_2',
+            mediaTypes: {
+                native: {
+                    title: {
+                        required: true
+                    },
+                    image: {
+                        required: true
+                    },
+                    body: {
+                        required: true
+                    },
+                }
             },
-        }]
-    }];
+            bids: [{
+                bidder: 'readpeak',
+                params: {
+                    bidfloor: 5.00,
+                    publisherId: 'test',
+                    siteId: 'test',
+                    tagId: 'test-tag-1'
+                },
+            }]
+        },
+        {
+            code: '/19968336/prebid_banner_example_2',
+            mediaTypes: {
+                banner: {
+                    sizes: [[640, 320], [300, 600]],
+                }
+            },
+            bids: [{
+                bidder: 'readpeak',
+                params: {
+                    bidfloor: 5.00,
+                    publisherId: 'test',
+                    siteId: 'test',
+                    tagId: 'test-tag-2'
+                },
+            }]
+        }
+    ];
 ```
diff --git a/modules/realvuAnalyticsAdapter.js b/modules/realvuAnalyticsAdapter.js
index 95e62397c2c..0811c70a2f7 100644
--- a/modules/realvuAnalyticsAdapter.js
+++ b/modules/realvuAnalyticsAdapter.js
@@ -1,13 +1,11 @@
 // RealVu Analytics Adapter
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
-
+import { logMessage, logError } from '../src/utils.js';
 const storage = getStorageManager();
 
-const utils = require('../src/utils.js');
-
 let realvuAnalyticsAdapter = adapter({
   global: 'realvuAnalytics',
   handler: 'on',
@@ -42,7 +40,7 @@ export let lib = {
   init: function () {
     let z = this;
     let u = navigator.userAgent;
-    z.device = u.match(/iPad|Tablet/gi) ? 'tablet' : u.match(/iPhone|iPod|Android|Opera Mini|IEMobile/gi) ? 'mobile' : 'desktop';
+    z.device = u.match(/iPhone|iPod|Android|Opera Mini|IEMobile/gi) ? 'mobile' : 'desktop';
     if (typeof (z.len) == 'undefined') z.len = 0;
     z.ie = navigator.appVersion.match(/MSIE/);
     z.saf = (u.match(/Safari/) && !u.match(/Chrome/));
@@ -306,28 +304,46 @@ export let lib = {
       if (!restored) {
         a.target = z.questA(a.div);
         let target = (a.target !== null) ? a.target : a.div;
-        a.box.w = Math.max(target.offsetWidth, a.w);
-        a.box.h = Math.max(target.offsetHeight, a.h);
-        let q = z.findPosG(target);
-        let pad = {};
-        pad.t = z.padd(target, 'Top');
-        pad.l = z.padd(target, 'Left');
-        pad.r = z.padd(target, 'Right');
-        pad.b = z.padd(target, 'Bottom');
-        let ax = q.x + pad.l;
-        let ay = q.y + pad.t;
-        a.box.x = ax;
-        a.box.y = ay;
-        if (a.box.w > a.w && a.box.w > 1) {
-          ax += (a.box.w - a.w - pad.l - pad.r) / 2;
-        }
-        if (a.box.h > a.h && a.box.h > 1) {
-          ay += (a.box.h - a.h - pad.t - pad.b) / 2;
-        }
-        if ((ax > 0 && ay > 0) && (a.x != ax || a.y != ay)) {
-          a.x = ax;
-          a.y = ay;
-          z.writePos(a);
+        if (window.getComputedStyle(target).display == 'none') {
+          let targSibl = target.previousElementSibling; // for 'none' containers on mobile define y as previous sibling y+h
+          if (targSibl) {
+            let q = z.findPosG(targSibl);
+            a.x = q.x;
+            a.y = q.y + targSibl.offsetHeight;
+          } else {
+            target = target.parentNode;
+            let q = z.findPosG(target);
+            a.x = q.x;
+            a.y = q.y;
+          }
+          a.box.x = a.x;
+          a.box.y = a.y;
+          a.box.w = a.w;
+          a.box.h = a.h;
+        } else {
+          a.box.w = Math.max(target.offsetWidth, a.w);
+          a.box.h = Math.max(target.offsetHeight, a.h);
+          let q = z.findPosG(target);
+          let pad = {};
+          pad.t = z.padd(target, 'Top');
+          pad.l = z.padd(target, 'Left');
+          pad.r = z.padd(target, 'Right');
+          pad.b = z.padd(target, 'Bottom');
+          let ax = q.x + pad.l;
+          let ay = q.y + pad.t;
+          a.box.x = ax;
+          a.box.y = ay;
+          if (a.box.w > a.w && a.box.w > 1) {
+            ax += (a.box.w - a.w - pad.l - pad.r) / 2;
+          }
+          if (a.box.h > a.h && a.box.h > 1) {
+            ay += (a.box.h - a.h - pad.t - pad.b) / 2;
+          }
+          if ((ax > 0 && ay > 0) && (a.x != ax || a.y != ay)) {
+            a.x = ax;
+            a.y = ay;
+            z.writePos(a);
+          }
         }
       }
       let vtr = ((a.box.w * a.box.h) < 242500) ? 49 : 29; // treashfold more then 49% and more then 29% for "oversized"
@@ -383,7 +399,7 @@ export let lib = {
             // @if NODE_ENV='debug'
             let now = new Date();
             let msg = (now.getTime() - time0) / 1000 + ' RENDERED ' + a.unit_id;
-            utils.logMessage(msg);
+            logMessage(msg);
             // @endif
             let rpt = z.bids_rpt(a, true);
             z.track(a, 'rend', rpt);
@@ -670,7 +686,7 @@ export let lib = {
       };
     }
     let a = window.top1.realvu_aa.check(p1);
-    return a.r;
+    return a.riff;
   },
 
   checkBidIn: function(partnerId, args, b) { // process a bid from hb
@@ -867,7 +883,7 @@ realvuAnalyticsAdapter.originEnableAnalytics = realvuAnalyticsAdapter.enableAnal
 realvuAnalyticsAdapter.enableAnalytics = function (config) {
   _options = config.options;
   if (typeof (_options.partnerId) == 'undefined' || _options.partnerId == '') {
-    utils.logError('Missed realvu.com partnerId parameter', 101, 'Missed partnerId parameter');
+    logError('Missed realvu.com partnerId parameter', 101, 'Missed partnerId parameter');
   }
   realvuAnalyticsAdapter.originEnableAnalytics(config);
   return _options.partnerId;
@@ -887,7 +903,7 @@ realvuAnalyticsAdapter.track = function ({eventType, args}) {
       ' creativei_id=' + args.creative_id;
   }
   // msg += '\nargs=' + JSON.stringify(args) + '<br>';
-  utils.logMessage(msg);
+  logMessage(msg);
   // @endif
 
   const boost = window.top1.realvu_aa;
@@ -917,7 +933,7 @@ realvuAnalyticsAdapter.track = function ({eventType, args}) {
 realvuAnalyticsAdapter.checkIn = function (bid, partnerId) {
   // find (or add if not registered yet) the unit in boost
   if (typeof (partnerId) == 'undefined' || partnerId == '') {
-    utils.logError('Missed realvu.com partnerId parameter', 102, 'Missed partnerId parameter');
+    logError('Missed realvu.com partnerId parameter', 102, 'Missed partnerId parameter');
   }
   let a = window.top1.realvu_aa.check({
     unit_id: bid.adUnitCode,
diff --git a/modules/reconciliationRtdProvider.js b/modules/reconciliationRtdProvider.js
new file mode 100644
index 00000000000..9b6a3d7aca3
--- /dev/null
+++ b/modules/reconciliationRtdProvider.js
@@ -0,0 +1,295 @@
+/**
+ * This module adds reconciliation provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will add custom targetings to ad units
+ * The module will listen to post messages from rendered creatives with Reconciliation Tag
+ * The module will call tracking pixels to log info needed for reconciliation matching
+ * @module modules/reconciliationRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+/**
+ * @typedef {Object} ModuleParams
+ * @property {string} publisherMemberId
+ * @property {?string} initUrl
+ * @property {?string} impressionUrl
+ * @property {?boolean} allowAccess
+ */
+
+import {submodule} from '../src/hook.js';
+import {ajaxBuilder} from '../src/ajax.js';
+import {generateUUID, isGptPubadsDefined, logError, timestamp} from '../src/utils.js';
+import {find} from '../src/polyfill.js';
+
+/** @type {Object} */
+const MessageType = {
+  IMPRESSION_REQUEST: 'rsdk:impression:req',
+  IMPRESSION_RESPONSE: 'rsdk:impression:res',
+};
+/** @type {ModuleParams} */
+const DEFAULT_PARAMS = {
+  initUrl: 'https://confirm.fiduciadlt.com/init',
+  impressionUrl: 'https://confirm.fiduciadlt.com/pimp',
+  allowAccess: false,
+};
+/** @type {ModuleParams} */
+let _moduleParams = {};
+
+/**
+ * Handle postMesssage from ad creative, track impression
+ * and send response to reconciliation ad tag
+ * @param {Event} e
+ */
+function handleAdMessage(e) {
+  let data = {};
+  let adUnitId = '';
+  let adDeliveryId = '';
+
+  try {
+    data = JSON.parse(e.data);
+  } catch (e) {
+    return;
+  }
+
+  if (data.type === MessageType.IMPRESSION_REQUEST) {
+    if (isGptPubadsDefined()) {
+      // 1. Find the last iframed window before window.top where the tracker was injected
+      // (the tracker could be injected in nested iframes)
+      const adWin = getTopIFrameWin(e.source);
+      if (adWin && adWin !== window.top) {
+        // 2. Find the GPT slot for the iframed window
+        const adSlot = getSlotByWin(adWin);
+        // 3. Get AdUnit IDs for the selected slot
+        if (adSlot) {
+          adUnitId = adSlot.getAdUnitPath();
+          adDeliveryId = adSlot.getTargeting('RSDK_ADID');
+          adDeliveryId = adDeliveryId.length
+            ? adDeliveryId[0]
+            : `${timestamp()}-${generateUUID()}`;
+        }
+      }
+    }
+
+    // Call local impression callback
+    const args = Object.assign({}, data.args, {
+      publisherDomain: window.location.hostname,
+      publisherMemberId: _moduleParams.publisherMemberId,
+      adUnitId,
+      adDeliveryId,
+    });
+
+    track.trackPost(_moduleParams.impressionUrl, args);
+
+    // Send response back to the Advertiser tag
+    let response = {
+      type: MessageType.IMPRESSION_RESPONSE,
+      id: data.id,
+      args: Object.assign(
+        {
+          publisherDomain: window.location.hostname,
+        },
+        data.args
+      ),
+    };
+
+    // If access is allowed - add ad unit id to response
+    if (_moduleParams.allowAccess) {
+      Object.assign(response.args, {
+        adUnitId,
+        adDeliveryId,
+      });
+    }
+
+    e.source.postMessage(JSON.stringify(response), '*');
+  }
+}
+
+/**
+ * Get top iframe window for nested Window object
+ * - top
+ * -- iframe.window  <-- top iframe window
+ * --- iframe.window
+ * ---- iframe.window <-- win
+ *
+ * @param {Window} win nested iframe window object
+ * @param {Window} topWin top window
+ */
+export function getTopIFrameWin(win, topWin) {
+  topWin = topWin || window;
+
+  if (!win) {
+    return null;
+  }
+
+  try {
+    while (win.parent !== topWin) {
+      win = win.parent;
+    }
+    return win;
+  } catch (e) {
+    return null;
+  }
+}
+
+/**
+ * get all slots on page
+ * @return {Object[]} slot GoogleTag slots
+ */
+function getAllSlots() {
+  return isGptPubadsDefined() && window.googletag.pubads().getSlots();
+}
+
+/**
+ * get GPT slot by placement id
+ * @param {string} code placement id
+ * @return {?Object}
+ */
+function getSlotByCode(code) {
+  const slots = getAllSlots();
+  if (!slots || !slots.length) {
+    return null;
+  }
+  return (
+    find(
+      slots,
+      (s) => s.getSlotElementId() === code || s.getAdUnitPath() === code
+    ) || null
+  );
+}
+
+/**
+ * get GPT slot by iframe window
+ * @param {Window} win
+ * @return {?Object}
+ */
+export function getSlotByWin(win) {
+  const slots = getAllSlots();
+
+  if (!slots || !slots.length) {
+    return null;
+  }
+
+  return (
+    find(slots, (s) => {
+      let slotElement = document.getElementById(s.getSlotElementId());
+
+      if (slotElement) {
+        let slotIframe = slotElement.querySelector('iframe');
+
+        if (slotIframe && slotIframe.contentWindow === win) {
+          return true;
+        }
+      }
+
+      return false;
+    }) || null
+  );
+}
+
+/**
+ * Init Reconciliation post messages listeners to handle
+ * impressions messages from ad creative
+ */
+function initListeners() {
+  window.addEventListener('message', handleAdMessage, false);
+}
+
+/**
+ * Send init event to log
+ * @param {Array} adUnits
+ */
+function trackInit(adUnits) {
+  track.trackPost(
+    _moduleParams.initUrl,
+    {
+      adUnits,
+      publisherDomain: window.location.hostname,
+      publisherMemberId: _moduleParams.publisherMemberId,
+    }
+  );
+}
+
+/**
+ * Track event via POST request
+ * wrap method to allow stubbing in tests
+ * @param {string} url
+ * @param {Object} data
+ */
+export const track = {
+  trackPost(url, data) {
+    const ajax = ajaxBuilder();
+
+    ajax(
+      url,
+      function() {},
+      JSON.stringify(data),
+      {
+        method: 'POST',
+      }
+    );
+  }
+}
+
+/**
+ * Set custom targetings for provided adUnits
+ * @param {string[]} adUnitsCodes
+ * @return {Object} key-value object with custom targetings
+ */
+function getReconciliationData(adUnitsCodes) {
+  const dataToReturn = {};
+  const adUnitsToTrack = [];
+
+  adUnitsCodes.forEach((adUnitCode) => {
+    if (!adUnitCode) {
+      return;
+    }
+
+    const adSlot = getSlotByCode(adUnitCode);
+    const adUnitId = adSlot ? adSlot.getAdUnitPath() : adUnitCode;
+    const adDeliveryId = `${timestamp()}-${generateUUID()}`;
+
+    dataToReturn[adUnitCode] = {
+      RSDK_AUID: adUnitId,
+      RSDK_ADID: adDeliveryId,
+    };
+
+    adUnitsToTrack.push({
+      adUnitId,
+      adDeliveryId
+    });
+  }, {});
+
+  // Track init event
+  trackInit(adUnitsToTrack);
+
+  return dataToReturn;
+}
+
+/** @type {RtdSubmodule} */
+export const reconciliationSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: 'reconciliation',
+  /**
+   * get data and send back to realTimeData module
+   * @function
+   * @param {string[]} adUnitsCodes
+   */
+  getTargetingData: getReconciliationData,
+  init: init,
+};
+
+function init(moduleConfig) {
+  const params = moduleConfig.params;
+  if (params && params.publisherMemberId) {
+    _moduleParams = Object.assign({}, DEFAULT_PARAMS, params);
+    initListeners();
+  } else {
+    logError('missing params for Reconciliation provider');
+  }
+  return true;
+}
+
+submodule('realTimeData', reconciliationSubmodule);
diff --git a/modules/reconciliationRtdProvider.md b/modules/reconciliationRtdProvider.md
new file mode 100644
index 00000000000..53883ad99eb
--- /dev/null
+++ b/modules/reconciliationRtdProvider.md
@@ -0,0 +1,49 @@
+The purpose of this Real Time Data Provider is to allow publishers to match impressions accross the supply chain.
+
+**Reconciliation SDK**
+The purpose of Reconciliation SDK module is to collect supply chain structure information and vendor-specific impression IDs from suppliers participating in ad creative delivery and report it to the Reconciliation Service, allowing publishers, advertisers and other supply chain participants to match and reconcile ad server, SSP, DSP and veritifation system log file records. Reconciliation SDK was created as part of TAG DLT initiative ( https://www.tagtoday.net/pressreleases/dlt_9_7_2020 ).
+
+**Usage for Publishers:**
+
+Compile the Reconciliation Provider into your Prebid build:
+
+`gulp build --modules=reconciliationRtdProvider`
+
+Add Reconciliation real time data provider configuration by setting up a Prebid Config:
+
+```javascript
+const reconciliationDataProvider = {
+    name: "reconciliation",
+    params: {
+        publisherMemberId: "test_prebid_publisher", // required
+        allowAccess: true, //optional
+    }
+};
+
+pbjs.setConfig({
+    ...,
+    realTimeData: {
+      dataProviders: [
+          reconciliationDataProvider
+      ]
+    }
+});
+```
+
+where:
+- `publisherMemberId` (required) - ID associated with the publisher
+- `access` (optional) true/false - Whether ad markup will recieve Ad Unit Id's via Reconciliation Tag
+  
+**Example:**
+
+To view an example:
+ 
+- in your cli run:
+
+`gulp serve --modules=reconciliationRtdProvider,appnexusBidAdapter`
+
+Your could also change 'appnexusBidAdapter' to another one.
+
+- in your browser, navigate to:
+
+`http://localhost:9999/integrationExamples/gpt/reconciliationRtdProvider_example.html`
diff --git a/modules/redtramBidAdapter.js b/modules/redtramBidAdapter.js
new file mode 100644
index 00000000000..e1dc0e2a148
--- /dev/null
+++ b/modules/redtramBidAdapter.js
@@ -0,0 +1,155 @@
+import {
+  isFn,
+  isStr,
+  deepAccess,
+  getWindowTop,
+  triggerPixel
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'redtram';
+const AD_URL = 'https://prebid.redtram.com/pbjs';
+const SYNC_URL = 'https://prebid.redtram.com/sync';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency || !bid.meta) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    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],
+
+  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] : '',
+      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)
+      };
+
+      if (typeof bid.userId !== 'undefined') {
+        placement.userId = bid.userId;
+      }
+
+      const mediaType = bid.mediaTypes;
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.sizes = mediaType[BANNER].sizes;
+        placement.adFormat = BANNER;
+      }
+
+      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)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  },
+
+  onBidWon: (bid) => {
+    const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
+    if (isStr(bid.nurl) && bid.nurl !== '') {
+      bid.nurl = bid.nurl.replace(/\${AUCTION_PRICE}/, cpm);
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/redtramBidAdapter.md b/modules/redtramBidAdapter.md
new file mode 100644
index 00000000000..39115502aa7
--- /dev/null
+++ b/modules/redtramBidAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+```
+Module Name: redtram Bidder Adapter
+Module Type: redtram Bidder Adapter
+Maintainer: support@redtram.com
+```
+
+# Description
+
+Module that connects to redtram demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'div-prebid',
+            mediaTypes:{
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids:[
+                {
+                    bidder: 'redtram',
+                    params: {
+                        placementId: '23611' //test, please replace after test 
+                    }
+                }
+            ]
+        },
+    ];
+```
\ No newline at end of file
diff --git a/modules/reklamstoreBidAdapter.js b/modules/reklamstoreBidAdapter.js
deleted file mode 100644
index 3d78cf95978..00000000000
--- a/modules/reklamstoreBidAdapter.js
+++ /dev/null
@@ -1,148 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'reklamstore';
-const ENDPOINT_URL = 'https://ads.rekmob.com/m/prebid';
-const CURRENCY = 'USD';
-const TIME_TO_LIVE = 360;
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-  /**
-  * Determines whether or not the given bid request is valid.
-  *
-  * @param {BidRequest} bid The bid params to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
-  isBidRequestValid: function (bid) {
-    return !!(bid.params.regionId);
-  },
-  /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param {validBidRequests[]} - an array of bids
-  * @return ServerRequest Info describing the request to the server.
-  */
-  buildRequests: function (validBidRequests, bidderRequest) {
-    const url = bidderRequest.refererInfo.referer;
-    let requests = [];
-    utils._each(validBidRequests, function(bid) {
-      requests.push({
-        method: 'GET',
-        url: ENDPOINT_URL,
-        data: {
-          regionId: bid.params.regionId,
-          dt: getDeviceType(),
-          os: getOS(),
-          ref: extractDomain(url),
-          _: (new Date().getTime()),
-          mobile_web: 1
-        },
-        bidId: bid.bidId
-      });
-    });
-    return requests;
-  },
-
-  /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {ServerResponse} serverResponse A successful response from the server.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  */
-  interpretResponse: function (serverResponse, bidRequest) {
-    try {
-      const bidResponse = serverResponse.body;
-      const bidResponses = [];
-      if (bidResponse) {
-        bidResponses.push({
-          requestId: bidRequest.bidId,
-          cpm: parseFloat(bidResponse.cpm),
-          width: bidResponse.w,
-          height: bidResponse.h,
-          creativeId: bidResponse.adId || 1,
-          currency: CURRENCY,
-          netRevenue: true,
-          ttl: TIME_TO_LIVE,
-          ad: bidResponse.ad
-        });
-      }
-      return bidResponses;
-    } catch (err) {
-      utils.logError(err);
-      return [];
-    }
-  },
-  /**
-  * Register the user sync pixels which should be dropped after the auction.
-  *
-  * @param {SyncOptions} syncOptions Which user syncs are allowed?
-  * @param {ServerResponse[]} serverResponses List of server's responses.
-  * @return {UserSync[]} The user syncs which should be dropped.
-  */
-  getUserSyncs: function(syncOptions, serverResponses) {
-    const syncs = [];
-    utils._each(serverResponses, function(bidResponse) {
-      utils._each(bidResponse.body.syncs, function(sync) {
-        if (syncOptions.pixelEnabled && sync.type == 'image') {
-          syncs.push({
-            type: sync.type,
-            url: sync.url
-          });
-        } else if (syncOptions.iframeEnabled && sync.type == 'iframe') {
-          syncs.push({
-            type: sync.type,
-            url: sync.url
-          });
-        }
-      });
-    });
-    return syncs;
-  }
-}
-registerBidder(spec);
-
-function getDeviceType() {
-  let PHONE = 0;
-  let TABLET = 2;
-  let DESKTOP = 3;
-  if (isPhone()) {
-    return PHONE;
-  } else if (isTablet()) {
-    return TABLET;
-  } else {
-    return DESKTOP;
-  }
-}
-function isPhone() {
-  var check = false;
-  (function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true })(navigator.userAgent || navigator.vendor || window.opera);
-  return check;
-}
-function isTablet() {
-  var check = false;
-  (function(a) { if (/ipad|android|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(a)) { check = true; } })(navigator.userAgent || navigator.vendor || window.opera);
-  return check;
-}
-function getOS() {
-  var ua = navigator.userAgent;
-  if (ua.match(/(iPhone|iPod|iPad)/)) {
-    return '1';
-  } else if (ua.match(/Android/)) {
-    return '0';
-  } else {
-    return '3';
-  }
-}
-function extractDomain(url) {
-  var domain;
-  if (url.indexOf('://') > -1) {
-    domain = url.split('/')[2];
-  } else {
-    domain = url.split('/')[0];
-  }
-  domain = domain.split(':')[0];
-  return domain;
-}
diff --git a/modules/reklamstoreBidAdapter.md b/modules/reklamstoreBidAdapter.md
deleted file mode 100644
index 8615341f5cc..00000000000
--- a/modules/reklamstoreBidAdapter.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Overview
-
-Module Name: ReklamStore Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: it@reklamstore.com
-
-# Description
-
-Module that connects to ReklamStore's demand sources.
-
-ReklamStore supports display. 
-
-
-# Test Parameters
-# display
-```
-
-    var adUnits = [
-        {
-            code: 'banner-ad-div',
-            sizes: [[300, 250]],
-            bids: [
-                {
-                    bidder: 'reklamstore',
-                    params: {
-                        regionId:532211
-                    }
-                }
-            ]
-        }
-    ];
-```
\ No newline at end of file
diff --git a/modules/relaidoBidAdapter.js b/modules/relaidoBidAdapter.js
index b3b8a647137..347cf66ee2b 100644
--- a/modules/relaidoBidAdapter.js
+++ b/modules/relaidoBidAdapter.js
@@ -1,97 +1,123 @@
-import * as utils from '../src/utils.js';
+import { deepAccess, logWarn, getBidIdParameter, parseQueryStringParameters, triggerPixel, generateUUID, isArray, isNumber, parseSizesInput } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { Renderer } from '../src/Renderer.js';
 import { getStorageManager } from '../src/storageManager.js';
+import sha1 from 'crypto-js/sha1';
 
 const BIDDER_CODE = 'relaido';
 const BIDDER_DOMAIN = 'api.relaido.jp';
-const ADAPTER_VERSION = '1.0.1';
+const ADAPTER_VERSION = '1.1.0';
 const DEFAULT_TTL = 300;
 const UUID_KEY = 'relaido_uuid';
 
-const storage = getStorageManager();
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 function isBidRequestValid(bid) {
-  if (!utils.isSafariBrowser() && !hasUuid()) {
-    utils.logWarn('uuid is not found.');
+  if (!deepAccess(bid, 'params.placementId')) {
+    logWarn('placementId param is reqeuired.');
     return false;
   }
-  if (!utils.deepAccess(bid, 'params.placementId')) {
-    utils.logWarn('placementId param is reqeuired.');
-    return false;
+  if (hasVideoMediaType(bid) && isVideoValid(bid)) {
+    return true;
+  } else {
+    logWarn('Invalid mediaType video.');
   }
-  if (hasVideoMediaType(bid)) {
-    if (!isVideoValid(bid)) {
-      utils.logWarn('Invalid mediaType video.');
-      return false;
-    }
-  } else if (hasBannerMediaType(bid)) {
-    if (!isBannerValid(bid)) {
-      utils.logWarn('Invalid mediaType banner.');
-      return false;
-    }
+  if (hasBannerMediaType(bid) && isBannerValid(bid)) {
+    return true;
   } else {
-    utils.logWarn('Invalid mediaTypes input banner or video.');
-    return false;
+    logWarn('Invalid mediaType banner.');
   }
-  return true;
+  return false;
 }
 
 function buildRequests(validBidRequests, bidderRequest) {
-  let bidRequests = [];
+  const bids = [];
+  let imuid = null;
+  let bidDomain = null;
+  let bidder = null;
+  let count = null;
 
   for (let i = 0; i < validBidRequests.length; i++) {
     const bidRequest = validBidRequests[i];
-    const placementId = utils.getBidIdParameter('placementId', bidRequest.params);
-    const bidDomain = bidRequest.params.domain || BIDDER_DOMAIN;
-    const bidUrl = `https://${bidDomain}/bid/v1/prebid/${placementId}`;
-    const uuid = getUuid();
-    const mediaType = getMediaType(bidRequest);
-
-    let payload = {
-      version: ADAPTER_VERSION,
-      timeout_ms: bidderRequest.timeout,
-      ad_unit_code: bidRequest.adUnitCode,
-      auction_id: bidRequest.auctionId,
-      bidder: bidRequest.bidder,
-      bidder_request_id: bidRequest.bidderRequestId,
-      bid_requests_count: bidRequest.bidRequestsCount,
-      bid_id: bidRequest.bidId,
-      transaction_id: bidRequest.transactionId,
-      media_type: mediaType,
-      uuid: uuid,
-    };
+    let mediaType = '';
+    let width = 0;
+    let height = 0;
+
+    if (hasVideoMediaType(bidRequest) && isVideoValid(bidRequest)) {
+      let playerSize = getValidSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'));
+      if (playerSize.length === 0) {
+        playerSize = getValidSizes(deepAccess(bidRequest, 'params.video.playerSize'));
+      }
+      width = playerSize[0][0];
+      height = playerSize[0][1];
+      mediaType = VIDEO;
+    } else if (hasBannerMediaType(bidRequest) && isBannerValid(bidRequest)) {
+      const sizes = getValidSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'));
+      width = sizes[0][0];
+      height = sizes[0][1];
+      mediaType = BANNER;
+    }
+
+    if (!imuid) {
+      const pickImuid = deepAccess(bidRequest, 'userId.imuid');
+      if (pickImuid) {
+        imuid = pickImuid;
+      }
+    }
 
-    if (hasVideoMediaType(bidRequest)) {
-      const playerSize = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize');
-      payload.width = playerSize[0][0];
-      payload.height = playerSize[0][1];
-    } else if (hasBannerMediaType(bidRequest)) {
-      const sizes = utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes');
-      payload.width = sizes[0][0];
-      payload.height = sizes[0][1];
+    if (!bidDomain) {
+      bidDomain = bidRequest.params.domain;
     }
 
-    // It may not be encoded, so add it at the end of the payload
-    payload.ref = bidderRequest.refererInfo.referer;
-
-    bidRequests.push({
-      method: 'GET',
-      url: bidUrl,
-      data: payload,
-      options: {
-        withCredentials: true
-      },
-      bidId: bidRequest.bidId,
+    if (!bidder) {
+      bidder = bidRequest.bidder;
+    }
+
+    if (!bidder) {
+      bidder = bidRequest.bidder;
+    }
+
+    if (!count) {
+      count = bidRequest.bidRequestsCount;
+    }
+
+    bids.push({
+      bid_id: bidRequest.bidId,
+      placement_id: getBidIdParameter('placementId', bidRequest.params),
+      transaction_id: bidRequest.transactionId,
+      bidder_request_id: bidRequest.bidderRequestId,
+      ad_unit_code: bidRequest.adUnitCode,
+      auction_id: bidRequest.auctionId,
       player: bidRequest.params.player,
-      width: payload.width,
-      height: payload.height,
-      mediaType: mediaType,
+      width: width,
+      height: height,
+      banner_sizes: getBannerSizes(bidRequest),
+      media_type: mediaType
     });
   }
 
-  return bidRequests;
+  const data = JSON.stringify({
+    version: ADAPTER_VERSION,
+    bids: bids,
+    timeout_ms: bidderRequest.timeout,
+    bidder: bidder,
+    bid_requests_count: count,
+    uuid: getUuid(),
+    pv: '$prebid.version$',
+    imuid: imuid,
+    canonical_url_hash: getCanonicalUrlHash(bidderRequest.refererInfo),
+    ref: bidderRequest.refererInfo.page
+  });
+
+  return {
+    method: 'POST',
+    url: `https://${bidDomain || BIDDER_DOMAIN}/bid/v1/sprebid`,
+    options: {
+      withCredentials: true
+    },
+    data: data
+  };
 }
 
 function interpretResponse(serverResponse, bidRequest) {
@@ -101,35 +127,40 @@ function interpretResponse(serverResponse, bidRequest) {
     return [];
   }
 
-  if (body.uuid) {
-    storage.setDataInLocalStorage(UUID_KEY, body.uuid);
-  }
+  for (const res of body.ads) {
+    const playerUrl = res.playerUrl || bidRequest.player || body.playerUrl;
+    let bidResponse = {
+      requestId: res.bidId,
+      width: res.width,
+      height: res.height,
+      cpm: res.price,
+      currency: res.currency,
+      creativeId: res.creativeId,
+      playerUrl: playerUrl,
+      dealId: body.dealId || '',
+      ttl: body.ttl || DEFAULT_TTL,
+      netRevenue: true,
+      meta: {
+        advertiserDomains: res.adomain || [],
+        mediaType: VIDEO
+      }
+    };
 
-  const playerUrl = bidRequest.player || body.playerUrl;
-  const mediaType = bidRequest.mediaType || VIDEO;
-
-  let bidResponse = {
-    requestId: bidRequest.bidId,
-    width: bidRequest.width,
-    height: bidRequest.height,
-    cpm: body.price,
-    currency: body.currency,
-    creativeId: body.creativeId,
-    dealId: body.dealId || '',
-    ttl: body.ttl || DEFAULT_TTL,
-    netRevenue: true,
-    mediaType: mediaType,
-  };
-  if (mediaType === VIDEO) {
-    bidResponse.vastXml = body.vast;
-    bidResponse.renderer = newRenderer(bidRequest.bidId, playerUrl);
-  } else {
-    const playerTag = createPlayerTag(playerUrl);
-    const renderTag = createRenderTag(bidRequest.width, bidRequest.height, body.vast);
-    bidResponse.ad = `<div id="rop-prebid">${playerTag}${renderTag}</div>`;
+    if (res.vast && res.mediaType === VIDEO) {
+      bidResponse.mediaType = VIDEO;
+      bidResponse.vastXml = res.vast;
+      bidResponse.renderer = newRenderer(res.bidId, playerUrl);
+    } else if (res.vast && res.mediaType === BANNER) {
+      bidResponse.mediaType = BANNER;
+      const playerTag = createPlayerTag(playerUrl);
+      const renderTag = createRenderTag(res.width, res.height, res.vast);
+      bidResponse.ad = `<div id="rop-prebid">${playerTag}${renderTag}</div>`;
+    } else if (res.adTag) {
+      bidResponse.mediaType = BANNER;
+      bidResponse.ad = decodeURIComponent(res.adTag);
+    }
+    bidResponses.push(bidResponse);
   }
-  bidResponses.push(bidResponse);
-
   return bidResponses;
 }
 
@@ -139,43 +170,43 @@ function getUserSyncs(syncOptions, serverResponses) {
   }
   let syncUrl = `https://${BIDDER_DOMAIN}/tr/v1/prebid/sync.html`;
   if (serverResponses.length > 0) {
-    syncUrl = utils.deepAccess(serverResponses, '0.body.syncUrl') || syncUrl;
+    syncUrl = deepAccess(serverResponses, '0.body.syncUrl') || syncUrl;
   }
-  receiveMessage();
   return [{
     type: 'iframe',
-    url: syncUrl
+    url: `${syncUrl}?uu=${getUuid()}`
   }];
 }
 
 function onBidWon(bid) {
-  let query = utils.parseQueryStringParameters({
-    placement_id: utils.deepAccess(bid, 'params.0.placementId'),
-    creative_id: utils.deepAccess(bid, 'creativeId'),
-    price: utils.deepAccess(bid, 'cpm'),
-    auction_id: utils.deepAccess(bid, 'auctionId'),
-    bid_id: utils.deepAccess(bid, 'requestId'),
-    ad_id: utils.deepAccess(bid, 'adId'),
-    ad_unit_code: utils.deepAccess(bid, 'adUnitCode'),
+  let query = parseQueryStringParameters({
+    placement_id: deepAccess(bid, 'params.0.placementId'),
+    creative_id: deepAccess(bid, 'creativeId'),
+    price: deepAccess(bid, 'cpm'),
+    auction_id: deepAccess(bid, 'auctionId'),
+    bid_id: deepAccess(bid, 'requestId'),
+    ad_id: deepAccess(bid, 'adId'),
+    ad_unit_code: deepAccess(bid, 'adUnitCode'),
     ref: window.location.href,
   }).replace(/\&$/, '');
-  const bidDomain = utils.deepAccess(bid, 'params.0.domain') || BIDDER_DOMAIN;
+  const bidDomain = deepAccess(bid, 'params.0.domain') || BIDDER_DOMAIN;
   const burl = `https://${bidDomain}/tr/v1/prebid/win.gif?${query}`;
-  utils.triggerPixel(burl);
+  triggerPixel(burl);
 }
 
 function onTimeout(data) {
-  let query = utils.parseQueryStringParameters({
-    placement_id: utils.deepAccess(data, '0.params.0.placementId'),
-    timeout: utils.deepAccess(data, '0.timeout'),
-    auction_id: utils.deepAccess(data, '0.auctionId'),
-    bid_id: utils.deepAccess(data, '0.bidId'),
-    ad_unit_code: utils.deepAccess(data, '0.adUnitCode'),
+  let query = parseQueryStringParameters({
+    placement_id: deepAccess(data, '0.params.0.placementId'),
+    timeout: deepAccess(data, '0.timeout'),
+    auction_id: deepAccess(data, '0.auctionId'),
+    bid_id: deepAccess(data, '0.bidId'),
+    ad_unit_code: deepAccess(data, '0.adUnitCode'),
+    version: ADAPTER_VERSION,
     ref: window.location.href,
   }).replace(/\&$/, '');
-  const bidDomain = utils.deepAccess(data, '0.params.0.domain') || BIDDER_DOMAIN;
+  const bidDomain = deepAccess(data, '0.params.0.domain') || BIDDER_DOMAIN;
   const timeoutUrl = `https://${bidDomain}/tr/v1/prebid/timeout.gif?${query}`;
-  utils.triggerPixel(timeoutUrl);
+  triggerPixel(timeoutUrl);
 }
 
 function createPlayerTag(playerUrl) {
@@ -202,7 +233,7 @@ function newRenderer(bidId, playerUrl) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('renderer.setRender Error', err);
+    logWarn('renderer.setRender Error', err);
   }
   return renderer;
 }
@@ -219,38 +250,21 @@ function outstreamRender(bid) {
   });
 }
 
-function receiveMessage() {
-  window.addEventListener('message', setUuid);
-}
-
-function setUuid(e) {
-  if (utils.isPlainObject(e.data) && e.data.relaido_uuid) {
-    storage.setDataInLocalStorage(UUID_KEY, e.data.relaido_uuid);
-    window.removeEventListener('message', setUuid);
-  }
-}
-
 function isBannerValid(bid) {
-  if (!isMobile()) {
-    return false;
-  }
-  const sizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes');
-  if (sizes && utils.isArray(sizes)) {
-    if (utils.isArray(sizes[0])) {
-      const width = sizes[0][0];
-      const height = sizes[0][1];
-      if (width >= 300 && height >= 250) {
-        return true;
-      }
-    }
+  const sizes = getValidSizes(deepAccess(bid, 'mediaTypes.banner.sizes'));
+  if (sizes.length > 0) {
+    return true;
   }
   return false;
 }
 
 function isVideoValid(bid) {
-  const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
-  if (playerSize && utils.isArray(playerSize) && playerSize.length > 0) {
-    const context = utils.deepAccess(bid, 'mediaTypes.video.context');
+  let playerSize = getValidSizes(deepAccess(bid, 'mediaTypes.video.playerSize'));
+  if (playerSize.length === 0) {
+    playerSize = getValidSizes(deepAccess(bid, 'params.video.playerSize'));
+  }
+  if (playerSize.length > 0) {
+    const context = deepAccess(bid, 'mediaTypes.video.context');
     if (context && context === 'outstream') {
       return true;
     }
@@ -258,37 +272,67 @@ function isVideoValid(bid) {
   return false;
 }
 
-function hasUuid() {
-  return !!storage.getDataFromLocalStorage(UUID_KEY);
-}
-
 function getUuid() {
-  return storage.getDataFromLocalStorage(UUID_KEY) || '';
-}
-
-export function isMobile() {
-  const ua = navigator.userAgent;
-  if (ua.indexOf('iPhone') > -1 || ua.indexOf('iPod') > -1 || (ua.indexOf('Android') > -1 && ua.indexOf('Tablet') == -1)) {
-    return true;
-  }
-  return false;
+  const id = storage.getCookie(UUID_KEY)
+  if (id) return id;
+  const newId = generateUUID();
+  storage.setCookie(UUID_KEY, newId);
+  return newId;
 }
 
-function getMediaType(bid) {
-  if (hasVideoMediaType(bid)) {
-    return VIDEO;
-  } else if (hasBannerMediaType(bid)) {
-    return BANNER;
+function getCanonicalUrlHash(refererInfo) {
+  const canonicalUrl = refererInfo.canonicalUrl || null;
+  if (!canonicalUrl) {
+    return null;
   }
-  return '';
+  return sha1(canonicalUrl).toString();
 }
 
 function hasBannerMediaType(bid) {
-  return !!utils.deepAccess(bid, 'mediaTypes.banner');
+  return !!deepAccess(bid, 'mediaTypes.banner');
 }
 
 function hasVideoMediaType(bid) {
-  return !!utils.deepAccess(bid, 'mediaTypes.video');
+  return !!deepAccess(bid, 'mediaTypes.video');
+}
+
+function getValidSizes(sizes) {
+  let result = [];
+  if (sizes && isArray(sizes) && sizes.length > 0) {
+    for (let i = 0; i < sizes.length; i++) {
+      if (isArray(sizes[i]) && sizes[i].length == 2) {
+        const width = sizes[i][0];
+        const height = sizes[i][1];
+        if (width == 1 && height == 1) {
+          return [[1, 1]];
+        }
+        if ((width >= 300 && height >= 250)) {
+          result.push([width, height]);
+        }
+      } else if (isNumber(sizes[i])) {
+        const width = sizes[0];
+        const height = sizes[1];
+        if (width == 1 && height == 1) {
+          return [[1, 1]];
+        }
+        if ((width >= 300 && height >= 250)) {
+          return [[width, height]];
+        }
+      }
+    }
+  }
+  return result;
+}
+
+function getBannerSizes(bidRequest) {
+  if (!hasBannerMediaType(bidRequest)) {
+    return null;
+  }
+  const sizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes');
+  if (!isArray(sizes)) {
+    return null;
+  }
+  return parseSizesInput(sizes).join(',');
 }
 
 export const spec = {
diff --git a/modules/relevantAnalyticsAdapter.js b/modules/relevantAnalyticsAdapter.js
new file mode 100644
index 00000000000..7774370f7ad
--- /dev/null
+++ b/modules/relevantAnalyticsAdapter.js
@@ -0,0 +1,33 @@
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+
+const relevantAnalytics = adapter({ analyticsType: 'bundle', handler: 'on' });
+
+const { enableAnalytics: orgEnableAnalytics } = relevantAnalytics;
+
+Object.assign(relevantAnalytics, {
+  /**
+   * Save event in the global array that will be consumed later by the Relevant Yield library
+   */
+  track: ({ eventType: ev, args }) => {
+    window.relevantDigital.pbEventLog.push({ ev, args, ts: new Date() });
+  },
+
+  /**
+   * Before forwarding the call to the original enableAnalytics function -
+   * create (if needed) the global array that is used to pass events to the Relevant Yield library
+   * by the 'track' function above.
+   */
+  enableAnalytics: function(...args) {
+    window.relevantDigital = window.relevantDigital || {};
+    window.relevantDigital.pbEventLog = window.relevantDigital.pbEventLog || [];
+    return orgEnableAnalytics.call(this, ...args);
+  },
+});
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: relevantAnalytics,
+  code: 'relevant',
+});
+
+export default relevantAnalytics;
diff --git a/modules/relevantAnalyticsAdapter.md b/modules/relevantAnalyticsAdapter.md
new file mode 100644
index 00000000000..e6383fa77e1
--- /dev/null
+++ b/modules/relevantAnalyticsAdapter.md
@@ -0,0 +1,13 @@
+# Overview
+
+Module Name: Relevant Yield Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: [support@relevant-digital.com](mailto:support@relevant-digital.com)
+
+# Description
+
+Analytics adapter to be used with [Relevant Yield](https://www.relevant-digital.com/relevantyield)
+
+Contact [sales@relevant-digital.com](mailto:sales@relevant-digital.com) for information.
diff --git a/modules/reloadBidAdapter.js b/modules/reloadBidAdapter.js
deleted file mode 100644
index 94ea4be281f..00000000000
--- a/modules/reloadBidAdapter.js
+++ /dev/null
@@ -1,419 +0,0 @@
-import {
-  registerBidder
-}
-  from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const storage = getStorageManager();
-
-const BIDDER_CODE = 'reload';
-const VERSION_ADAPTER = '1.10';
-export const spec = {
-  code: BIDDER_CODE,
-  png: {},
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bid) {
-    return !!(bid.params && bid.params.plcmID && bid.params.partID && 'opdomID' in bid.params &&
-      'bsrvID' in bid.params && bid.params.bsrvID >= 0 && bid.params.bsrvID <= 99);
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function (validBidRequests, bidderRequest) {
-    let vRequests = [];
-    let bidReq = {
-      id: Math.random().toString(10).substring(2),
-      imp: []
-    };
-    let vgdprConsent = null;
-    if (utils.deepAccess(bidderRequest, 'gdprConsent')) {
-      vgdprConsent = bidderRequest.gdprConsent;
-    }
-    let vPrxClientTool = null;
-    let vSrvUrl = null;
-    for (let vIdx = 0; vIdx < validBidRequests.length; vIdx++) {
-      let bidRequest = validBidRequests[vIdx];
-      vPrxClientTool = new ReloadClientTool({
-        prxVer: VERSION_ADAPTER,
-        prxType: 'bd',
-        plcmID: bidRequest.params.plcmID,
-        partID: bidRequest.params.partID,
-        opdomID: bidRequest.params.opdomID,
-        bsrvID: bidRequest.params.bsrvID,
-        gdprObj: vgdprConsent,
-        mediaObj: bidRequest.mediaTypes,
-        wnd: utils.getWindowTop(),
-        rtop: utils.deepAccess(bidderRequest, 'refererInfo.reachedTop') || false
-      });
-      if (vSrvUrl === null) vSrvUrl = vPrxClientTool.getSrvUrl();
-      let vImpression = {
-        id: bidRequest.bidId,
-        bidId: bidRequest.bidId,
-        adUnitCode: bidRequest.adUnitCode,
-        transactionId: bidRequest.transactionId,
-        bidderRequestId: bidRequest.bidderRequestId,
-        auctionId: bidRequest.auctionId,
-        banner: {
-          ext: {
-            type: bidRequest.params.type || 'pcm',
-            pcmdata: vPrxClientTool.getPCMObj()
-          }
-        }
-      };
-      bidReq.imp.push(vImpression);
-    }
-    if (bidReq.imp.length > 0) {
-      const payloadString = JSON.stringify(bidReq);
-      vRequests.push({
-        method: 'POST',
-        url: vSrvUrl,
-        data: payloadString
-      });
-    }
-    return vRequests;
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {ServerResponse} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function (serverResponse, bidRequest) {
-    const serverBody = serverResponse.body;
-    const bidResponses = [];
-    for (let vIdx = 0; vIdx < serverBody.seatbid.length; vIdx++) {
-      let vSeatBid = serverBody.seatbid[vIdx];
-      for (let vIdxBid = 0; vIdxBid < vSeatBid.bid.length; vIdxBid++) {
-        let vBid = vSeatBid.bid[vIdxBid];
-        let vPrxClientTool = new ReloadClientTool({
-          plcmID: vBid.ext.plcmID,
-          partID: vBid.ext.partID,
-          opdomID: vBid.ext.opdomID,
-          bsrvID: vBid.ext.bsrvID
-        });
-        vPrxClientTool.setPCMObj(vBid.ext.pcmdata);
-        if (vPrxClientTool.getBP() > 0) {
-          let bidResponse = {
-            requestId: vBid.impid,
-            ad: vPrxClientTool.getAM(),
-            cpm: vPrxClientTool.getBP() / 100,
-            width: vPrxClientTool.getW(),
-            height: vPrxClientTool.getH(),
-            creativeId: vBid.id,
-            currency: vPrxClientTool.getBC(),
-            ttl: 300,
-            netRevenue: true
-          };
-          bidResponses.push(bidResponse);
-          this.png[vBid.ext.adUnitCode] = vPrxClientTool.getPingUrl('bidwon');
-        }
-      }
-    }
-    return bidResponses;
-  },
-  /**
-     * Register bidder specific code, which will execute if a bid from this bidder won the auction
-     * @param {Bid} The bid that won the auction
-     */
-  onBidWon: function (bid) {
-    if (typeof this.png[bid.adUnitCode] !== 'string' || this.png[bid.adUnitCode] === '') return;
-    (new Image()).src = this.png[bid.adUnitCode];
-  }
-};
-
-function ReloadClientTool(args) {
-  var that = this;
-  var _pcmClientVersion = '120';
-  var _pcmFilePref = 'prx_root_';
-  var _resFilePref = 'prx_pnws_';
-  var _pcmInputObjVers = '120';
-  var _instObj = null;
-  var _status = 'NA';
-  var _message = '';
-  var _log = '';
-  var _memFile = _getMemFile();
-
-  if (_memFile.status !== 'ok') {
-    _log += 'WARNING: clnt-int mem file initialized\n';
-  }
-
-  that.getPCMObj = function () {
-    return {
-      thisVer: _pcmInputObjVers,
-      statStr: _memFile.statStr,
-      plcmData: _getPlcmData(),
-      clntData: _getClientData(args.wnd, args.rtop),
-      resultData: _getRD(),
-      gdprObj: _getGdpr(),
-      mediaObj: _getMediaObj(),
-      proxetString: null,
-      dboData: null,
-      plcmSett: null,
-    };
-  };
-
-  that.setPCMObj = function (obj) {
-    if (obj.thisVer !== '100') {
-      _status = 'error';
-      _message = 'incomp_output_obj_version';
-      _log += ' ERROR incomp_output_obj_version';
-      return;
-    }
-
-    _status = obj.status;
-    _message = obj.message;
-    _log += ' ' + obj.log;
-
-    if (obj.status !== 'ok') return;
-
-    _saveMemFile(obj.statStr, obj.srvUrl);
-    _instObj = obj.instr;
-  };
-
-  that.getSrvUrl = function () {
-    var effSrvUrl = getBidServerUrl(0);
-
-    if (isNaN(parseInt(args.bsrvID)) !== true) effSrvUrl = getBidServerUrl(parseInt(args.bsrvID));
-
-    if (typeof _memFile.srvUrl === 'string' && _memFile.srvUrl !== '') effSrvUrl = _memFile.srvUrl;
-
-    return 'https://' + effSrvUrl + '/bid';
-
-    function getBidServerUrl (idx) {
-      return 'bidsrv' + getTwoDigitString(idx) + '.reload.net';
-
-      function getTwoDigitString (idx) {
-        if (idx >= 10) return '' + idx;
-        else return '0' + idx;
-      }
-    }
-  };
-
-  that.getMT = function () {
-    return _checkInstProp('mtype', 'dsp');
-  };
-
-  that.getW = function () {
-    return _checkInstProp('width', 0);
-  };
-
-  that.getH = function () {
-    return _checkInstProp('height', 0);
-  };
-
-  that.getBP = function () {
-    return _checkInstProp('prc', 0);
-  };
-
-  that.getBC = function () {
-    return _checkInstProp('cur', 'USD');
-  };
-
-  that.getAM = function () {
-    return _checkInstProp('am', null);
-  };
-
-  that.getPingUrl = function (pingName) {
-    var pingData = _checkInstProp('pingdata', {});
-    if (pingData[pingName] !== 'undefined') return pingData[pingName];
-    return '';
-  };
-
-  that.setRD = function (data) {
-    return _setRD(data);
-  };
-
-  that.getStat = function () {
-    return _status;
-  };
-
-  that.getMsg = function () {
-    return _message;
-  };
-
-  that.getLog = function () {
-    return _log;
-  };
-
-  function _checkInstProp (key, def) {
-    if (_instObj === null) return def;
-    if (typeof _instObj === 'undefined') return def;
-    if (_instObj.go !== true) return def;
-    if (typeof _instObj[key] === 'undefined') return def;
-    return _instObj[key];
-  }
-
-  function _getPlcmData () {
-    return {
-      prxVer: args.prxVer,
-      prxType: args.prxType,
-      plcmID: args.plcmID,
-      partID: args.partID,
-      opdomID: args.opdomID,
-      bsrvID: args.bsrvID,
-      dmod: args.dmod,
-      lmod: args.lmod,
-      lplcmID: args.lplcmID,
-    };
-  }
-
-  function _getClientData (wnd, rtop) {
-    return {
-      version: 200,
-      locTime: Date.now(),
-      winInfo: _winInf(wnd),
-      envInfo: getEnvInfo(),
-      topw: rtop === true,
-      prot: wnd.document.location.protocol,
-      host: wnd.document.location.host,
-      title: wnd.document.title,
-    };
-
-    function _winInf (wnd) {
-      return {
-        phs: {
-          w: wnd.screen.width,
-          h: wnd.screen.height
-        },
-        avl: {
-          w: wnd.screen.availWidth,
-          h: wnd.screen.availHeight
-        },
-        inr: {
-          w: wnd.innerWidth,
-          h: wnd.innerHeight
-        },
-        bdy: {
-          w: wnd.document.body.clientWidth,
-          h: wnd.document.body.clientHeight
-        }
-      };
-    }
-
-    function getEnvInfo() {
-      return {
-        userAgent: navigator.userAgent,
-        appName: navigator.appName,
-        appVersion: navigator.appVersion
-      };
-    }
-  }
-
-  function _getMemFile () {
-    try {
-      var memFileObj = _getItem(_getMemFileName());
-
-      if (memFileObj === null) throw { s: 'init' };
-
-      if (typeof memFileObj.statStr !== 'string') throw { s: 'error' };
-      if (typeof memFileObj.srvUrl !== 'string') throw { s: 'error' };
-
-      memFileObj.status = 'ok';
-
-      return memFileObj;
-    } catch (err) {
-      var retObj = {
-        statStr: null,
-        srvUrl: null
-      };
-      retObj.status = err.s;
-
-      return retObj;
-    }
-  }
-
-  function _saveMemFile (statStr, srvUrl) {
-    try {
-      var fileData = {
-        statStr: statStr,
-        srvUrl: srvUrl,
-      };
-      _setItem(_getMemFileName(), fileData);
-      return true;
-    } catch (err) {
-      return false;
-    }
-  }
-
-  function _getMemFileName () {
-    return _pcmFilePref + args.plcmID + '_' + args.partID;
-  }
-
-  function _getRD () {
-    try {
-      return _getItem(_getResltStatusFileName());
-    } catch (err) {
-      return null;
-    }
-  }
-
-  function _setRD (fileData) {
-    try {
-      _setItem(_getResltStatusFileName(), fileData);
-      return true;
-    } catch (err) {
-      return false;
-    }
-  }
-
-  function _getGdpr() {
-    return args.gdprObj;
-  }
-
-  function _getMediaObj() {
-    return args.mediaObj;
-  }
-
-  function _getResltStatusFileName () {
-    if (args.lmod === true) return _resFilePref + args.lplcmID + '_' + args.partID;
-    else return _resFilePref + args.plcmID + '_' + args.partID;
-  }
-
-  function _setItem (name, data) {
-    var stgFileObj = {
-      ver: _pcmClientVersion,
-      ts: Date.now(),
-    };
-
-    if (typeof data === 'string') {
-      stgFileObj.objtype = false;
-      stgFileObj.memdata = data;
-    } else {
-      stgFileObj.objtype = true;
-      stgFileObj.memdata = JSON.stringify(data);
-    }
-
-    var stgFileStr = JSON.stringify(stgFileObj);
-
-    storage.setDataInLocalStorage(name, stgFileStr);
-
-    return true;
-  }
-
-  function _getItem (name) {
-    try {
-      var obStgFileStr = storage.getDataFromLocalStorage(name);
-      if (obStgFileStr === null) return null;
-
-      var stgFileObj = JSON.parse(obStgFileStr);
-
-      if (stgFileObj.ver !== _pcmClientVersion) throw { message: 'version_error' };
-
-      if (stgFileObj.objtype === true) return JSON.parse(stgFileObj.memdata);
-      else return '' + stgFileObj.memdata;
-    } catch (err) {
-      return null;
-    }
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/reloadBidAdapter.md b/modules/reloadBidAdapter.md
deleted file mode 100644
index 42fe11b40b3..00000000000
--- a/modules/reloadBidAdapter.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Overview
-
-Module Name: Reload Bid Adapter
-
-Module Type: Bidder Adapter
-
-Maintainer: prebid@reload.net
-
-# Description
-
-Prebid module for connecting to Reload
-
-# Parameters
-## Banner
-
-| Name          | Scope    | Description                                     | Example                            |
-| :------------ | :------- | :---------------------------------------------- | :--------------------------------- |
-| `plcmID`      | required | Placement ID (provided by Reload)               | "4234897234"                       |
-| `partID`      | required | Partition ID (provided by Reload)               | "part_01"                          |
-| `opdomID`     | required | Internal parameter (provided by Reload)         | 0                                  |
-| `bsrvID`      | required | Internal parameter (provided by Reload)         | 12                                 |
-| `type`        | optional | Internal parameter (provided by Reload)         | "pcm"                              |
-
-# Example ad units
-# Test Parameters
-```
-var adUnits = [
-  // Banner adUnit
-  {
-    code: 'banner-div',
-    mediaTypes: {
-      banner: {
-        sizes: [
-          [300, 250]
-        ],
-      }
-    },
-    bids: [{
-      bidder: 'reload',
-      params: {
-        plcmID: 'prebid_check',
-        partID: 'part_4',
-        opdomID: '0',
-        bsrvID: 0,
-        type: 'pcm'
-      }
-    }]
-  }];
\ No newline at end of file
diff --git a/modules/resetdigitalBidAdapter.js b/modules/resetdigitalBidAdapter.js
new file mode 100644
index 00000000000..a606f0c0b7d
--- /dev/null
+++ b/modules/resetdigitalBidAdapter.js
@@ -0,0 +1,140 @@
+
+import { timestamp, deepAccess } from '../src/utils.js';
+import { getOrigin } from '../libraries/getOrigin/index.js';
+import { config } from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+const BIDDER_CODE = 'resetdigital';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [ 'banner', 'video' ],
+  isBidRequestValid: function(bid) {
+    return (!!(bid.params.pubId || bid.params.zoneId));
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let stack = (bidderRequest.refererInfo &&
+      bidderRequest.refererInfo.stack ? bidderRequest.refererInfo.stack
+      : [])
+
+    let spb = (config.getConfig('userSync') && config.getConfig('userSync').syncsPerBidder)
+      ? config.getConfig('userSync').syncsPerBidder : 5
+
+    const payload = {
+      start_time: timestamp(),
+      language: window.navigator.userLanguage || window.navigator.language,
+      site: {
+        domain: getOrigin(),
+        iframe: !bidderRequest.refererInfo.reachedTop,
+        // TODO: the last element in refererInfo.stack is window.location.href, that's unlikely to have been the intent here
+        url: stack && stack.length > 0 ? [stack.length - 1] : null,
+        https: (window.location.protocol === 'https:'),
+        // TODO: is 'page' the right value here?
+        referrer: bidderRequest.refererInfo.page
+      },
+      imps: [],
+      user_ids: validBidRequests[0].userId,
+      sync_limit: spb
+    };
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdpr = {
+        applies: bidderRequest.gdprConsent.gdprApplies,
+        consent: bidderRequest.gdprConsent.consentString
+      };
+    }
+
+    for (let x = 0; x < validBidRequests.length; x++) {
+      let req = validBidRequests[x]
+
+      payload.imps.push({
+        pub_id: req.params.pubId,
+        zone_id: req.params.zoneId,
+        bid_id: req.bidId,
+        imp_id: req.transactionId,
+        sizes: req.sizes,
+        force_bid: req.params.forceBid,
+        media_types: deepAccess(req, 'mediaTypes')
+      });
+    }
+
+    let params = validBidRequests[0].params
+    let url = params.endpoint ? params.endpoint : '//ads.resetsrv.com'
+    return {
+      method: 'POST',
+      url: url,
+      data: JSON.stringify(payload)
+    };
+  },
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    if (!serverResponse || !serverResponse.body) {
+      return bidResponses
+    }
+
+    let res = serverResponse.body;
+    if (!res.bids || !res.bids.length) {
+      return []
+    }
+
+    for (let x = 0; x < serverResponse.body.bids.length; x++) {
+      let bid = serverResponse.body.bids[x]
+
+      bidResponses.push({
+        requestId: bid.bid_id,
+        cpm: bid.cpm,
+        width: bid.w,
+        height: bid.h,
+        ad: bid.html,
+        vastUrl: bid.vast_url,
+        vastXml: bid.vast_xml,
+        mediaType: bid.html ? 'banner' : 'video',
+        ttl: 120,
+        creativeId: bid.crid,
+        dealId: bid.deal_id,
+        netRevenue: true,
+        currency: 'USD',
+        meta: {
+          advertiserDomains: bid.adomain
+        }
+      })
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
+    const syncs = []
+
+    if (!serverResponses.length || !serverResponses[0].body) {
+      return syncs
+    }
+
+    let pixels = serverResponses[0].body.pixels
+    if (!pixels || !pixels.length) {
+      return syncs
+    }
+
+    let gdprParams = null
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`
+      } else {
+        gdprParams = `gdpr_consent=${gdprConsent.consentString}`
+      }
+    }
+
+    for (let x = 0; x < pixels.length; x++) {
+      let pixel = pixels[x]
+
+      if ((pixel.type === 'iframe' && syncOptions.iframeEnabled) ||
+        (pixel.type === 'image' && syncOptions.pixelEnabled)) {
+        if (gdprParams && gdprParams.length) {
+          pixel = (pixel.indexOf('?') === -1 ? '?' : '&') + gdprParams
+        }
+        syncs.push(pixel)
+      }
+    }
+    return syncs;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/resetdigitalBidAdapter.md b/modules/resetdigitalBidAdapter.md
new file mode 100644
index 00000000000..2f9f69b5e84
--- /dev/null
+++ b/modules/resetdigitalBidAdapter.md
@@ -0,0 +1,37 @@
+# Overview
+
+```
+Module Name: ResetDigital Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: bruce@resetdigital.co
+```
+
+# Description
+
+Prebid adapter for Reset Digital. Requires approval and account setup.
+Video is supported but requires a publisher supplied renderer at this time.
+
+# Test Parameters
+
+## Web
+```
+    var adUnits = [
+           {
+               code: 'your-div',
+               mediaTypes: {
+                   banner: {
+                       sizes: [[300,250]]
+                   }
+               },
+               bids: [
+                   {
+                       bidder: "resetdigital",
+                       params: {
+                           pubId: "your-pub-id",
+                           forceBid: true
+                       }
+                   }
+               ]
+           }
+       ];
+```
diff --git a/modules/resultsmediaBidAdapter.js b/modules/resultsmediaBidAdapter.js
deleted file mode 100644
index beb9991e1e2..00000000000
--- a/modules/resultsmediaBidAdapter.js
+++ /dev/null
@@ -1,269 +0,0 @@
-'use strict';
-
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-
-function ResultsmediaAdapter() {
-  this.code = 'resultsmedia';
-  this.aliases = ['resultsmedia'];
-  this.supportedMediaTypes = [VIDEO, BANNER];
-
-  let SUPPORTED_VIDEO_PROTOCOLS = [2, 3, 5, 6];
-  let SUPPORTED_VIDEO_MIMES = ['video/mp4'];
-  let SUPPORTED_VIDEO_PLAYBACK_METHODS = [1, 2, 3, 4];
-  let SUPPORTED_VIDEO_DELIVERY = [1];
-  let SUPPORTED_VIDEO_API = [1, 2, 5];
-  let slotsToBids = {};
-  let that = this;
-  let version = '2.1';
-
-  this.isBidRequestValid = function (bid) {
-    return !!(bid.params && bid.params.zoneId);
-  };
-
-  this.getUserSyncs = function (syncOptions, responses, gdprConsent) {
-    return [];
-  };
-
-  function frameImp(BRs, bidderRequest) {
-    var impList = [];
-    var isSecure = 0;
-    if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.stack.length) {
-      // clever trick to get the protocol
-      var el = document.createElement('a');
-      el.href = bidderRequest.refererInfo.stack[0];
-      isSecure = (el.protocol == 'https:') ? 1 : 0;
-    }
-    for (var i = 0; i < BRs.length; i++) {
-      slotsToBids[BRs[i].adUnitCode] = BRs[i];
-      var impObj = {};
-      impObj.id = BRs[i].adUnitCode;
-      impObj.secure = isSecure;
-
-      if (utils.deepAccess(BRs[i], 'mediaTypes.banner') || utils.deepAccess(BRs[i], 'mediaType') === 'banner') {
-        let banner = frameBanner(BRs[i]);
-        if (banner) {
-          impObj.banner = banner;
-        }
-      }
-      if (utils.deepAccess(BRs[i], 'mediaTypes.video') || utils.deepAccess(BRs[i], 'mediaType') === 'video') {
-        impObj.video = frameVideo(BRs[i]);
-      }
-      if (!(impObj.banner || impObj.video)) {
-        continue;
-      }
-      impObj.ext = frameExt(BRs[i]);
-      impList.push(impObj);
-    }
-    return impList;
-  }
-
-  function frameSite(bidderRequest) {
-    var site = {
-      domain: '',
-      page: '',
-      ref: ''
-    }
-    if (bidderRequest && bidderRequest.refererInfo) {
-      var ri = bidderRequest.refererInfo;
-      site.ref = ri.referer;
-
-      if (ri.stack.length) {
-        site.page = ri.stack[ri.stack.length - 1];
-
-        // clever trick to get the domain
-        var el = document.createElement('a');
-        el.href = ri.stack[0];
-        site.domain = el.hostname;
-      }
-    }
-    return site;
-  }
-
-  function frameDevice() {
-    return {
-      ua: navigator.userAgent,
-      ip: '', // Empty Ip string is required, server gets the ip from HTTP header
-      dnt: utils.getDNT() ? 1 : 0,
-    }
-  }
-
-  function getValidSizeSet(dimensionList) {
-    let w = parseInt(dimensionList[0]);
-    let h = parseInt(dimensionList[1]);
-    // clever check for NaN
-    if (! (w !== w || h !== h)) {  // eslint-disable-line
-      return [w, h];
-    }
-    return false;
-  }
-
-  function frameBanner(adUnit) {
-    // adUnit.sizes is scheduled to be deprecated, continue its support but prefer adUnit.mediaTypes.banner
-    var sizeList = adUnit.sizes;
-    if (adUnit.mediaTypes && adUnit.mediaTypes.banner) {
-      sizeList = adUnit.mediaTypes.banner.sizes;
-    }
-    var sizeStringList = utils.parseSizesInput(sizeList);
-    var format = [];
-    sizeStringList.forEach(function(size) {
-      if (size) {
-        var dimensionList = getValidSizeSet(size.split('x'));
-        if (dimensionList) {
-          format.push({
-            'w': dimensionList[0],
-            'h': dimensionList[1],
-          });
-        }
-      }
-    });
-    if (format.length) {
-      return {
-        'format': format
-      };
-    }
-
-    return false;
-  }
-
-  function frameVideo(bid) {
-    var size = [];
-    if (utils.deepAccess(bid, 'mediaTypes.video.playerSize')) {
-      var dimensionSet = bid.mediaTypes.video.playerSize;
-      if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
-        dimensionSet = bid.mediaTypes.video.playerSize[0];
-      }
-      var validSize = getValidSizeSet(dimensionSet)
-      if (validSize) {
-        size = validSize;
-      }
-    }
-    return {
-      mimes: utils.deepAccess(bid, 'mediaTypes.video.mimes') || SUPPORTED_VIDEO_MIMES,
-      protocols: utils.deepAccess(bid, 'mediaTypes.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS,
-      w: size[0],
-      h: size[1],
-      startdelay: utils.deepAccess(bid, 'mediaTypes.video.startdelay') || 0,
-      skip: utils.deepAccess(bid, 'mediaTypes.video.skip') || 0,
-      playbackmethod: utils.deepAccess(bid, 'mediaTypes.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS,
-      delivery: utils.deepAccess(bid, 'mediaTypes.video.delivery') || SUPPORTED_VIDEO_DELIVERY,
-      api: utils.deepAccess(bid, 'mediaTypes.video.api') || SUPPORTED_VIDEO_API,
-    }
-  }
-
-  function frameExt(bid) {
-    return {
-      bidder: {
-        zoneId: bid.params['zoneId']
-      }
-    }
-  }
-
-  function frameBid(BRs, bidderRequest) {
-    let bid = {
-      id: BRs[0].bidderRequestId,
-      imp: frameImp(BRs, bidderRequest),
-      site: frameSite(bidderRequest),
-      device: frameDevice(),
-      user: {
-        ext: {
-          consent: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? bidderRequest.gdprConsent.consentString : ''
-        }
-      },
-      at: 1,
-      tmax: 1000,
-      regs: {
-        ext: {
-          gdpr: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false
-        }
-      }
-    };
-    if (BRs[0].schain) {
-      bid.source = {
-        'ext': {
-          'schain': BRs[0].schain
-        }
-      }
-    }
-    return bid;
-  }
-
-  function getFirstParam(key, validBidRequests) {
-    for (let i = 0; i < validBidRequests.length; i++) {
-      if (validBidRequests[i].params && validBidRequests[i].params[key]) {
-        return validBidRequests[i].params[key];
-      }
-    }
-  }
-
-  this.buildRequests = function (BRs, bidderRequest) {
-    let fallbackZoneId = getFirstParam('zoneId', BRs);
-    if (fallbackZoneId === undefined || BRs.length < 1) {
-      return [];
-    }
-
-    var uri = 'https://bid306.rtbsrv.com/bidder/?bid=3mhdom&zoneId=' + fallbackZoneId;
-
-    var fat = /(^v|(\.0)+$)/gi;
-    var prebidVersion = '$prebid.version$';
-    uri += '&hbv=' + prebidVersion.replace(fat, '') + ',' + version.replace(fat, '');
-
-    var bidRequest = frameBid(BRs, bidderRequest);
-    if (!bidRequest.imp.length) {
-      return {};
-    }
-
-    return {
-      method: 'POST',
-      url: uri,
-      data: JSON.stringify(bidRequest)
-    };
-  };
-
-  this.interpretResponse = function (serverResponse) {
-    let responses = serverResponse.body || [];
-    let bids = [];
-    let i = 0;
-
-    if (responses.seatbid) {
-      let temp = [];
-      for (i = 0; i < responses.seatbid.length; i++) {
-        for (let j = 0; j < responses.seatbid[i].bid.length; j++) {
-          temp.push(responses.seatbid[i].bid[j]);
-        }
-      }
-      responses = temp;
-    }
-
-    for (i = 0; i < responses.length; i++) {
-      let bid = responses[i];
-      let bidRequest = slotsToBids[bid.impid];
-      let bidResponse = {
-        requestId: bidRequest.id,
-        bidderCode: that.code,
-        cpm: parseFloat(bid.price),
-        width: bid.w,
-        height: bid.h,
-        creativeId: bid.crid,
-        currency: 'USD',
-        netRevenue: true,
-        ttl: 350
-      };
-
-      if (bidRequest.mediaTypes && bidRequest.mediaTypes.video) {
-        bidResponse.vastUrl = bid.adm;
-        bidResponse.mediaType = 'video';
-        bidResponse.ttl = 600;
-      } else {
-        bidResponse.ad = bid.adm;
-      }
-      bids.push(bidResponse);
-    }
-
-    return bids;
-  };
-}
-
-export const spec = new ResultsmediaAdapter();
-registerBidder(spec);
diff --git a/modules/resultsmediaBidAdapter.md b/modules/resultsmediaBidAdapter.md
deleted file mode 100644
index 0b65264c8e4..00000000000
--- a/modules/resultsmediaBidAdapter.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Overview
-
-```
-Module Name: ResultsMedia (resultsmedia.com) Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: prebid@resultsmedia.COM
-```
-
-# Description
-
-Prebid adapter for ResultsMedia RTB. Requires approval and account setup.
-
-# Test Parameters
-
-## Web
-```
-    var adUnits = [{
-        code: 'banner-ad-div',
-        mediaTypes: {
-            banner: {
-                sizes: [
-                    [300, 200] // banner sizes
-                ],
-            }
-        },
-        bids: [{
-            bidder: 'resultsmedia',
-            params: {
-                zoneId: 9999
-            }
-        }]
-    }, {
-        code: 'video-ad-player',
-        mediaTypes: {
-            video: {
-                context: 'instream', // or 'outstream'
-                playerSize: [640, 480] // video player size        	
-            }
-        },
-        bids: [{
-            bidder: 'resultsmedia',
-            params: {
-                zoneId: 9999
-            }
-        }]
-    }];
-```
\ No newline at end of file
diff --git a/modules/revcontentBidAdapter.js b/modules/revcontentBidAdapter.js
index b429f94eae0..5e33a9a0fd7 100644
--- a/modules/revcontentBidAdapter.js
+++ b/modules/revcontentBidAdapter.js
@@ -2,7 +2,10 @@
 'use strict';
 
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { triggerPixel, isFn, deepAccess, getAdUnitSizes, parseGPTSingleSizeArrayToRtbSize, _map } from '../src/utils.js';
+import {parseDomain} from '../src/refererDetection.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'revcontent';
 const NATIVE_PARAMS = {
@@ -21,14 +24,18 @@ const NATIVE_PARAMS = {
     type: 1
   }
 };
+const STYLE_EXTRA = '<style type="text/css">.undefined-photo { background-size: cover !important;}</style>';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: ['native'],
+  supportedMediaTypes: [BANNER, NATIVE],
   isBidRequestValid: function (bid) {
-    return (typeof bid.params.apiKey !== 'undefined' && typeof bid.params.userId !== 'undefined' && bid.hasOwnProperty('nativeParams'));
+    return (typeof bid.params.apiKey !== 'undefined' && typeof bid.params.userId !== 'undefined');
   },
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const userId = validBidRequests[0].params.userId;
     const widgetId = validBidRequests[0].params.widgetId;
     const apiKey = validBidRequests[0].params.apiKey;
@@ -42,11 +49,11 @@ export const spec = {
     let serverRequests = [];
     var refererInfo;
     if (bidderRequest && bidderRequest.refererInfo) {
-      refererInfo = bidderRequest.refererInfo.referer;
+      refererInfo = bidderRequest.refererInfo.page;
     }
 
     if (typeof domain === 'undefined') {
-      domain = extractHostname(refererInfo);
+      domain = parseDomain(refererInfo, {noPort: true});
     }
 
     var endpoint = 'https://' + host + '/rtb?apiKey=' + apiKey + '&userId=' + userId;
@@ -55,66 +62,7 @@ export const spec = {
       endpoint = endpoint + '&widgetId=' + widgetId;
     }
 
-    let bidfloor = 0.1;
-    if (!isNaN(validBidRequests[0].params.bidfloor) && validBidRequests[0].params.bidfloor > 0) {
-      bidfloor = validBidRequests[0].params.bidfloor;
-    }
-
-    const imp = validBidRequests.map((bid, id) => {
-      if (bid.hasOwnProperty('nativeParams')) {
-        const assets = utils._map(bid.nativeParams, (bidParams, key) => {
-          const props = NATIVE_PARAMS[key];
-          const asset = {
-            required: bidParams.required & 1
-          };
-          if (props) {
-            asset.id = props.id;
-            let wmin, hmin, w, h;
-            let aRatios = bidParams.aspect_ratios;
-
-            if (aRatios && aRatios[0]) {
-              aRatios = aRatios[0];
-              wmin = aRatios.min_width || 0;
-              hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
-            }
-
-            asset[props.name] = {
-              len: bidParams.len,
-              type: props.type,
-              wmin,
-              hmin,
-              w,
-              h
-            };
-
-            return asset;
-          }
-        }).filter(Boolean);
-
-        return {
-          id: id + 1,
-          tagid: bid.params.mid,
-          bidderRequestId: bid.bidderRequestId,
-          auctionId: bid.auctionId,
-          transactionId: bid.transactionId,
-          native: {
-            request: {
-              ver: '1.1',
-              context: 2,
-              contextsubtype: 21,
-              plcmttype: 1,
-              plcmtcnt: 1,
-              assets: assets
-            },
-            ver: '1.1',
-            battr: [1, 3, 8, 11, 17]
-          },
-          instl: 0,
-          bidfloor: bidfloor,
-          secure: '1'
-        };
-      }
-    });
+    const imp = validBidRequests.map((bid, id) => buildImp(bid, id));
 
     let data = {
       id: bidderRequest.auctionId,
@@ -123,7 +71,6 @@ export const spec = {
         id: widgetId,
         domain: domain,
         page: refererInfo,
-        cat: ['IAB17'],
         publisher: {
           id: userId,
           domain: domain
@@ -136,23 +83,7 @@ export const spec = {
       user: {
         id: 1
       },
-      at: 2,
-      bcat: [
-        'IAB24',
-        'IAB25',
-        'IAB25-1',
-        'IAB25-2',
-        'IAB25-3',
-        'IAB25-4',
-        'IAB25-5',
-        'IAB25-6',
-        'IAB25-7',
-        'IAB26',
-        'IAB26-1',
-        'IAB26-2',
-        'IAB26-3',
-        'IAB26-4'
-      ]
+      at: 2
     };
     serverRequests.push({
       method: 'POST',
@@ -166,63 +97,76 @@ export const spec = {
 
     return serverRequests;
   },
-  interpretResponse: function (serverResponse, originalBidRequest) {
-    if (!serverResponse.body) {
-      return;
+  interpretResponse: function (serverResponse, serverRequest) {
+    let response = serverResponse.body;
+    if ((!response) || (!response.seatbid)) {
+      return [];
     }
-    const seatbid = serverResponse.body.seatbid[0];
-    const bidResponses = [];
-
-    for (var x in seatbid.bid) {
-      let adm = JSON.parse(seatbid.bid[x]['adm']);
-      let ad = {
-        clickUrl: adm.link.url
-      };
 
-      adm.assets.forEach(asset => {
-        switch (asset.id) {
-          case 3:
-            ad['image'] = {
-              url: asset.img.url,
-              height: 1,
-              width: 1
-            };
-            break;
-          case 0:
-            ad['title'] = asset.title.text;
-            break;
-          case 5:
-            ad['sponsoredBy'] = asset.data.value;
-            break;
-        }
-      });
-
-      var size = originalBidRequest.bid[0].params.size;
-
-      const bidResponse = {
-        bidder: BIDDER_CODE,
-        requestId: originalBidRequest.bid[0].bidId,
-        cpm: seatbid.bid[x]['price'],
-        creativeId: seatbid.bid[x]['adid'],
-        currency: 'USD',
-        netRevenue: true,
+    let rtbRequest = JSON.parse(serverRequest.data);
+    let rtbBids = response.seatbid
+      .map(seatbid => seatbid.bid)
+      .reduce((a, b) => a.concat(b), []);
+
+    return rtbBids.map(rtbBid => {
+      const bidIndex = +rtbBid.impid - 1;
+      let imp = rtbRequest.imp.filter(imp => imp.id.toString() === rtbBid.impid)[0];
+
+      let prBid = {
+        requestId: serverRequest.bid[bidIndex].bidId,
+        cpm: rtbBid.price,
+        creativeId: rtbBid.crid,
+        nurl: rtbBid.nurl,
+        currency: response.cur || 'USD',
         ttl: 360,
-        nurl: seatbid.bid[x]['nurl'],
-        bidderCode: 'revcontent',
-        mediaType: 'native',
-        native: ad,
-        width: size.width,
-        height: size.height,
-        ad: displayNative(ad, getTemplate(size, originalBidRequest.bid[0].params.template))
+        netRevenue: true,
+        bidder: 'revcontent',
+        bidderCode: 'revcontent'
       };
+      if ('banner' in imp) {
+        prBid.mediaType = BANNER;
+        prBid.width = rtbBid.w;
+        prBid.height = rtbBid.h;
+        prBid.ad = STYLE_EXTRA + rtbBid.adm;
+      } else if ('native' in imp) {
+        let adm = JSON.parse(rtbBid.adm);
+        let ad = {
+          clickUrl: adm.link.url
+        };
 
-      bidResponses.push(bidResponse);
-    }
+        adm.assets.forEach(asset => {
+          switch (asset.id) {
+            case 3:
+              ad['image'] = {
+                url: asset.img.url,
+                height: 1,
+                width: 1
+              };
+              break;
+            case 0:
+              ad['title'] = asset.title.text;
+              break;
+            case 5:
+              ad['sponsoredBy'] = asset.data.value || 'Revcontent';
+              break;
+          }
+        });
+        var size = serverRequest.bid[0].params.size;
+        prBid.width = size.width;
+        prBid.height = size.height;
+
+        prBid.mediaType = NATIVE;
+        prBid.native = ad;
+        prBid.ad = displayNative(ad, getTemplate(serverRequest.bid[0].params.size, serverRequest.bid[0].params.template));
+      }
 
-    return bidResponses;
+      return prBid;
+    });
   },
   onBidWon: function (bid) {
-    utils.triggerPixel(bid.nurl);
+    if (bid.nurl) {
+      triggerPixel(bid.nurl);
+    }
     return true;
   }
 };
@@ -257,19 +201,79 @@ function getTemplate(size, customTemplate) {
   return '';
 }
 
-function extractHostname(url) {
-  if (typeof url == 'undefined' || url == null) {
-    return '';
-  }
-  var hostname;
-  if (url.indexOf('//') > -1) {
-    hostname = url.split('/')[2];
+function buildImp(bid, id) {
+  let bidfloor;
+  if (isFn(bid.getFloor)) {
+    bidfloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*'
+    }).floor;
   } else {
-    hostname = url.split('/')[0];
+    bidfloor = deepAccess(bid, `params.bidfloor`) || 0.1;
   }
 
-  hostname = hostname.split(':')[0];
-  hostname = hostname.split('?')[0];
+  let imp = {
+    id: id + 1,
+    tagid: bid.adUnitCode,
+    bidderRequestId: bid.bidderRequestId,
+    auctionId: bid.auctionId,
+    transactionId: bid.transactionId,
+    instl: 0,
+    bidfloor: bidfloor,
+    secure: '1'
+  };
+
+  let bannerReq = deepAccess(bid, `mediaTypes.banner`);
+  let nativeReq = deepAccess(bid, `mediaTypes.native`);
+  if (bannerReq) {
+    let sizes = getAdUnitSizes(bid);
+    imp.banner = {
+      w: sizes[0][0],
+      h: sizes[0][1],
+      format: sizes.map(wh => parseGPTSingleSizeArrayToRtbSize(wh)),
+    };
+  } else if (nativeReq) {
+    const assets = _map(bid.nativeParams, (bidParams, key) => {
+      const props = NATIVE_PARAMS[key];
+      const asset = {
+        required: bidParams.required & 1
+      };
+      if (props) {
+        asset.id = props.id;
+        let wmin, hmin, w, h;
+        let aRatios = bidParams.aspect_ratios;
+
+        if (aRatios && aRatios[0]) {
+          aRatios = aRatios[0];
+          wmin = aRatios.min_width || 0;
+          hmin = aRatios.ratio_height * wmin / aRatios.ratio_width | 0;
+        }
+
+        asset[props.name] = {
+          len: bidParams.len,
+          type: props.type,
+          wmin,
+          hmin,
+          w,
+          h
+        };
 
-  return hostname;
+        return asset;
+      }
+    }).filter(Boolean);
+    imp.native = {
+      request: {
+        ver: '1.1',
+        context: 2,
+        contextsubtype: 21,
+        plcmttype: 1,
+        plcmtcnt: 1,
+        assets: assets
+      },
+      ver: '1.1',
+      battr: [1, 3, 8, 11, 17]
+    };
+  }
+  return imp;
 }
diff --git a/modules/rexrtbBidAdapter.md b/modules/rexrtbBidAdapter.md
deleted file mode 100644
index 1cb937b0a3d..00000000000
--- a/modules/rexrtbBidAdapter.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Overview
-
-Module Name: REXRTB Bidder Adapter
-
-Module Type: Bidder Adapter
-
-Maintainer: tech@rexrtb.com
-
-
-# Description
-
-Module that connects to REXRTB's demand source
-
-# Test Parameters
-```javascript
-    var adUnits = [
-        {
-            code: 'test-ad',
-            sizes: [[728, 98]],
-            bids: [
-                {
-                    bidder: 'rexrtb',
-                    params: {
-                        id: 89,
-                        token: '658f11a5efbbce2f9be3f1f146fcbc22',
-                        source: 'prebidtest'
-                    }
-                }
-            ]
-        },
-    ];
-```
\ No newline at end of file
diff --git a/modules/rhythmoneBidAdapter.js b/modules/rhythmoneBidAdapter.js
index 1acbcfd0463..94b3645f57b 100644
--- a/modules/rhythmoneBidAdapter.js
+++ b/modules/rhythmoneBidAdapter.js
@@ -1,12 +1,14 @@
+
 'use strict';
 
-import * as utils from '../src/utils.js';
+import { deepAccess, getDNT, parseSizesInput, isArray } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
 function RhythmOneBidAdapter() {
   this.code = 'rhythmone';
   this.supportedMediaTypes = [VIDEO, BANNER];
+  this.gvlid = 36;
 
   let SUPPORTED_VIDEO_PROTOCOLS = [2, 3, 5, 6];
   let SUPPORTED_VIDEO_MIMES = ['video/mp4'];
@@ -38,16 +40,16 @@ function RhythmOneBidAdapter() {
       slotsToBids[BRs[i].adUnitCode] = BRs[i];
       var impObj = {};
       impObj.id = BRs[i].adUnitCode;
-      impObj.bidfloor = parseFloat(utils.deepAccess(BRs[i], 'params.floor')) || 0;
+      impObj.bidfloor = 0;
       impObj.secure = isSecure;
 
-      if (utils.deepAccess(BRs[i], 'mediaTypes.banner') || utils.deepAccess(BRs[i], 'mediaType') === 'banner') {
+      if (deepAccess(BRs[i], 'mediaTypes.banner') || deepAccess(BRs[i], 'mediaType') === 'banner') {
         let banner = frameBanner(BRs[i]);
         if (banner) {
           impObj.banner = banner;
         }
       }
-      if (utils.deepAccess(BRs[i], 'mediaTypes.video') || utils.deepAccess(BRs[i], 'mediaType') === 'video') {
+      if (deepAccess(BRs[i], 'mediaTypes.video') || deepAccess(BRs[i], 'mediaType') === 'video') {
         impObj.video = frameVideo(BRs[i]);
       }
       if (!(impObj.banner || impObj.video)) {
@@ -60,32 +62,18 @@ function RhythmOneBidAdapter() {
   }
 
   function frameSite(bidderRequest) {
-    var site = {
-      domain: '',
-      page: '',
-      ref: ''
-    }
-    if (bidderRequest && bidderRequest.refererInfo) {
-      var ri = bidderRequest.refererInfo;
-      site.ref = ri.referer;
-
-      if (ri.stack.length) {
-        site.page = ri.stack[ri.stack.length - 1];
-
-        // clever trick to get the domain
-        var el = document.createElement('a');
-        el.href = ri.stack[0];
-        site.domain = el.hostname;
-      }
+    return {
+      domain: bidderRequest?.refererInfo?.domain || '',
+      page: bidderRequest?.refererInfo?.page || '',
+      ref: bidderRequest?.refererInfo?.ref || ''
     }
-    return site;
   }
 
   function frameDevice() {
     return {
       ua: navigator.userAgent,
       ip: '', // Empty Ip string is required, server gets the ip from HTTP header
-      dnt: utils.getDNT() ? 1 : 0,
+      dnt: getDNT() ? 1 : 0,
     }
   }
 
@@ -105,7 +93,7 @@ function RhythmOneBidAdapter() {
     if (adUnit.mediaTypes && adUnit.mediaTypes.banner) {
       sizeList = adUnit.mediaTypes.banner.sizes;
     }
-    var sizeStringList = utils.parseSizesInput(sizeList);
+    var sizeStringList = parseSizesInput(sizeList);
     var format = [];
     sizeStringList.forEach(function(size) {
       if (size) {
@@ -129,9 +117,9 @@ function RhythmOneBidAdapter() {
 
   function frameVideo(bid) {
     var size = [];
-    if (utils.deepAccess(bid, 'mediaTypes.video.playerSize')) {
+    if (deepAccess(bid, 'mediaTypes.video.playerSize')) {
       var dimensionSet = bid.mediaTypes.video.playerSize;
-      if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
+      if (isArray(bid.mediaTypes.video.playerSize[0])) {
         dimensionSet = bid.mediaTypes.video.playerSize[0];
       }
       var validSize = getValidSizeSet(dimensionSet)
@@ -140,15 +128,15 @@ function RhythmOneBidAdapter() {
       }
     }
     return {
-      mimes: utils.deepAccess(bid, 'mediaTypes.video.mimes') || SUPPORTED_VIDEO_MIMES,
-      protocols: utils.deepAccess(bid, 'mediaTypes.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS,
+      mimes: deepAccess(bid, 'mediaTypes.video.mimes') || SUPPORTED_VIDEO_MIMES,
+      protocols: deepAccess(bid, 'mediaTypes.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS,
       w: size[0],
       h: size[1],
-      startdelay: utils.deepAccess(bid, 'mediaTypes.video.startdelay') || 0,
-      skip: utils.deepAccess(bid, 'mediaTypes.video.skip') || 0,
-      playbackmethod: utils.deepAccess(bid, 'mediaTypes.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS,
-      delivery: utils.deepAccess(bid, 'mediaTypes.video.delivery') || SUPPORTED_VIDEO_DELIVERY,
-      api: utils.deepAccess(bid, 'mediaTypes.video.api') || SUPPORTED_VIDEO_API,
+      startdelay: deepAccess(bid, 'mediaTypes.video.startdelay') || 0,
+      skip: deepAccess(bid, 'mediaTypes.video.skip') || 0,
+      playbackmethod: deepAccess(bid, 'mediaTypes.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS,
+      delivery: deepAccess(bid, 'mediaTypes.video.delivery') || SUPPORTED_VIDEO_DELIVERY,
+      api: deepAccess(bid, 'mediaTypes.video.api') || SUPPORTED_VIDEO_API,
     }
   }
 
@@ -170,14 +158,14 @@ function RhythmOneBidAdapter() {
       device: frameDevice(),
       user: {
         ext: {
-          consent: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? bidderRequest.gdprConsent.consentString : ''
+          consent: deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? bidderRequest.gdprConsent.consentString : ''
         }
       },
       at: 1,
       tmax: 1000,
       regs: {
         ext: {
-          gdpr: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false
+          gdpr: deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false
         }
       }
     };
@@ -253,6 +241,9 @@ function RhythmOneBidAdapter() {
         cpm: parseFloat(bid.price),
         width: bid.w,
         height: bid.h,
+        meta: {
+          advertiserDomains: bid.adomain
+        },
         creativeId: bid.crid,
         currency: 'USD',
         netRevenue: true,
diff --git a/modules/richaudienceBidAdapter.js b/modules/richaudienceBidAdapter.js
index 43bef356a73..1faed74d84e 100755
--- a/modules/richaudienceBidAdapter.js
+++ b/modules/richaudienceBidAdapter.js
@@ -1,7 +1,7 @@
+import {isEmpty, deepAccess, isStr} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
 import { Renderer } from '../src/Renderer.js';
 
 const BIDDER_CODE = 'richaudience';
@@ -9,28 +9,29 @@ let REFERER = '';
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 108,
   aliases: ['ra'],
   supportedMediaTypes: [BANNER, VIDEO],
 
   /***
-     * Determines whether or not the given bid request is valid
-     *
-     * @param {bidRequest} bid The bid params to validate.
-     * @returns {boolean} True if this is a valid bid, and false otherwise
-     */
+   * Determines whether or not the given bid request is valid
+   *
+   * @param {bidRequest} bid The bid params to validate.
+   * @returns {boolean} True if this is a valid bid, and false otherwise
+   */
   isBidRequestValid: function (bid) {
     return !!(bid.params && bid.params.pid && bid.params.supplyType);
   },
   /***
-     * Build a server request from the list of valid BidRequests
-     * @param {validBidRequests} is an array of the valid bids
-     * @param {bidderRequest} bidder request object
-     * @returns {ServerRequest} Info describing the request to the server
-     */
+   * Build a server request from the list of valid BidRequests
+   * @param {validBidRequests} is an array of the valid bids
+   * @param {bidderRequest} bidder request object
+   * @returns {ServerRequest} Info describing the request to the server
+   */
   buildRequests: function (validBidRequests, bidderRequest) {
     return validBidRequests.map(bid => {
       var payload = {
-        bidfloor: bid.params.bidfloor,
+        bidfloor: raiGetFloor(bid, config),
         ifa: bid.params.ifa,
         pid: bid.params.pid,
         supplyType: bid.params.supplyType,
@@ -42,23 +43,33 @@ export const spec = {
         bidderRequestId: bid.bidderRequestId,
         tagId: bid.adUnitCode,
         sizes: raiGetSizes(bid),
-        referer: (typeof bidderRequest.refererInfo.referer != 'undefined' ? encodeURIComponent(bidderRequest.refererInfo.referer) : null),
+        // TODO: is 'page' the right value here?
+        referer: (typeof bidderRequest.refererInfo.page != 'undefined' ? encodeURIComponent(bidderRequest.refererInfo.page) : null),
         numIframes: (typeof bidderRequest.refererInfo.numIframes != 'undefined' ? bidderRequest.refererInfo.numIframes : null),
         transactionId: bid.transactionId,
         timeout: config.getConfig('bidderTimeout'),
         user: raiSetEids(bid),
         demand: raiGetDemandType(bid),
-        videoData: raiGetVideoInfo(bid)
+        videoData: raiGetVideoInfo(bid),
+        scr_rsl: raiGetResolution(),
+        cpuc: (typeof window.navigator != 'undefined' ? window.navigator.hardwareConcurrency : null),
+        kws: (!isEmpty(bid.params.keywords) ? bid.params.keywords : null),
+        schain: bid.schain
       };
 
-      REFERER = (typeof bidderRequest.refererInfo.referer != 'undefined' ? encodeURIComponent(bidderRequest.refererInfo.referer) : null)
+      // TODO: is 'page' the right value here?
+      REFERER = (typeof bidderRequest.refererInfo.page != 'undefined' ? encodeURIComponent(bidderRequest.refererInfo.page) : null)
 
       payload.gdpr_consent = '';
-      payload.gdpr = null;
+      payload.gdpr = false;
 
       if (bidderRequest && bidderRequest.gdprConsent) {
-        payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
-        payload.gdpr = bidderRequest.gdprConsent.gdprApplies;
+        if (typeof bidderRequest.gdprConsent.gdprApplies != 'undefined') {
+          payload.gdpr = bidderRequest.gdprConsent.gdprApplies;
+        }
+        if (typeof bidderRequest.gdprConsent.consentString != 'undefined') {
+          payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
+        }
       }
 
       var payloadString = JSON.stringify(payload);
@@ -73,11 +84,11 @@ export const spec = {
     });
   },
   /***
-     * Read the response from the server and build a list of bids
-     * @param {serverResponse} Response from the server.
-     * @param {bidRequest} Bid request object
-     * @returns {bidResponses} Array of bids which were nested inside the server
-     */
+   * Read the response from the server and build a list of bids
+   * @param {serverResponse} Response from the server.
+   * @param {bidRequest} Bid request object
+   * @returns {bidResponses} Array of bids which were nested inside the server
+   */
   interpretResponse: function (serverResponse, bidRequest) {
     const bidResponses = [];
     // try catch
@@ -93,16 +104,23 @@ export const spec = {
         netRevenue: response.netRevenue,
         currency: response.currency,
         ttl: response.ttl,
-        dealId: response.dealId,
+        meta: response.adomain,
+        dealId: response.dealId
       };
 
       if (response.media_type === 'video') {
         bidResponse.vastXml = response.vastXML;
         try {
-          if (JSON.parse(bidRequest.data).videoData.format == 'outstream') {
-            bidResponse.renderer = Renderer.install({
-              url: 'https://cdn3.richaudience.com/prebidVideo/player.js'
-            });
+          if (bidResponse.vastXml != null) {
+            if (JSON.parse(bidRequest.data).videoData.format == 'outstream' || JSON.parse(bidRequest.data).videoData.format == 'banner') {
+              bidResponse.renderer = Renderer.install({
+                id: bidRequest.bidId,
+                adunitcode: bidRequest.tagId,
+                loaded: false,
+                config: response.media_type,
+                url: 'https://cdn3.richaudience.com/prebidVideo/player.js'
+              });
+            }
             bidResponse.renderer.setRender(renderer);
           }
         } catch (e) {
@@ -114,16 +132,16 @@ export const spec = {
 
       bidResponses.push(bidResponse);
     }
-    return bidResponses
+    return bidResponses;
   },
   /***
-     * User Syncs
-     *
-     * @param {syncOptions} Publisher prebid configuration
-     * @param {serverResponses} Response from the server
-     * @param {gdprConsent} GPDR consent object
-     * @returns {Array}
-     */
+   * User Syncs
+   *
+   * @param {syncOptions} Publisher prebid configuration
+   * @param {serverResponses} Response from the server
+   * @param {gdprConsent} GPDR consent object
+   * @returns {Array}
+   */
   getUserSyncs: function (syncOptions, serverResponses, gdprConsent) {
     const syncs = [];
 
@@ -131,11 +149,15 @@ export const spec = {
     var syncUrl = '';
     var consent = '';
 
+    var raiSync = {};
+
+    raiSync = raiGetSyncInclude(config);
+
     if (gdprConsent && typeof gdprConsent.consentString === 'string' && typeof gdprConsent.consentString != 'undefined') {
-      consent = `consentString=’${gdprConsent.consentString}`
+      consent = `consentString=${gdprConsent.consentString}`
     }
 
-    if (syncOptions.iframeEnabled) {
+    if (syncOptions.iframeEnabled && raiSync.raiIframe != 'exclude') {
       syncUrl = 'https://sync.richaudience.com/dcf3528a0b8aa83634892d50e91c306e/?ord=' + rand
       if (consent != '') {
         syncUrl += `&${consent}`
@@ -146,7 +168,7 @@ export const spec = {
       });
     }
 
-    if (syncOptions.pixelEnabled && REFERER != null && syncs.length == 0) {
+    if (syncOptions.pixelEnabled && REFERER != null && syncs.length == 0 && raiSync.raiImage != 'exclude') {
       syncUrl = `https://sync.richaudience.com/bf7c142f4339da0278e83698a02b0854/?referrer=${REFERER}`;
       if (consent != '') {
         syncUrl += `&${consent}`
@@ -177,6 +199,13 @@ function raiGetSizes(bid) {
 
 function raiGetDemandType(bid) {
   let raiFormat = 'display';
+  if (typeof bid.sizes != 'undefined') {
+    bid.sizes.forEach(function (sz) {
+      if ((sz[0] == '1800' && sz[1] == '1000') || (sz[0] == '1' && sz[1] == '1')) {
+        raiFormat = 'skin'
+      }
+    })
+  }
   if (bid.mediaTypes != undefined) {
     if (bid.mediaTypes.video != undefined) {
       raiFormat = 'video';
@@ -193,6 +222,10 @@ function raiGetVideoInfo(bid) {
       playerSize: bid.mediaTypes.video.playerSize,
       mimes: bid.mediaTypes.video.mimes
     };
+  } else {
+    videoData = {
+      format: 'banner'
+    }
   }
   return videoData;
 }
@@ -201,19 +234,19 @@ function raiSetEids(bid) {
   let eids = [];
 
   if (bid && bid.userId) {
-    raiSetUserId(bid, eids, 'id5-sync.com', utils.deepAccess(bid, `userId.id5id`));
-    raiSetUserId(bid, eids, 'pubcommon', utils.deepAccess(bid, `userId.pubcid`));
-    raiSetUserId(bid, eids, 'criteo.com', utils.deepAccess(bid, `userId.criteoId`));
-    raiSetUserId(bid, eids, 'liveramp.com', utils.deepAccess(bid, `userId.idl_env`));
-    raiSetUserId(bid, eids, 'liveintent.com', utils.deepAccess(bid, `userId.lipb.lipbid`));
-    raiSetUserId(bid, eids, 'adserver.org', utils.deepAccess(bid, `userId.tdid`));
+    raiSetUserId(bid, eids, 'id5-sync.com', deepAccess(bid, `userId.id5id.uid`));
+    raiSetUserId(bid, eids, 'pubcommon', deepAccess(bid, `userId.pubcid`));
+    raiSetUserId(bid, eids, 'criteo.com', deepAccess(bid, `userId.criteoId`));
+    raiSetUserId(bid, eids, 'liveramp.com', deepAccess(bid, `userId.idl_env`));
+    raiSetUserId(bid, eids, 'liveintent.com', deepAccess(bid, `userId.lipb.lipbid`));
+    raiSetUserId(bid, eids, 'adserver.org', deepAccess(bid, `userId.tdid`));
   }
 
   return eids;
 }
 
 function raiSetUserId(bid, eids, source, value) {
-  if (utils.isStr(value)) {
+  if (isStr(value)) {
     eids.push({
       userId: value,
       source: source
@@ -241,3 +274,50 @@ function renderAd(bid) {
 
   window.raParams(raPlayerHB, raOutstreamHBPassback, true);
 }
+
+function raiGetResolution() {
+  let resolution = '';
+  if (typeof window.screen != 'undefined') {
+    resolution = window.screen.width + 'x' + window.screen.height;
+  }
+  return resolution;
+}
+
+function raiGetSyncInclude(config) {
+  try {
+    let raConfig = null;
+    let raiSync = {};
+    if (config.getConfig('userSync').filterSettings != null && typeof config.getConfig('userSync').filterSettings != 'undefined') {
+      raConfig = config.getConfig('userSync').filterSettings
+      if (raConfig.iframe != null && typeof raConfig.iframe != 'undefined') {
+        raiSync.raiIframe = raConfig.iframe.bidders == 'richaudience' || raConfig.iframe.bidders == '*' ? raConfig.iframe.filter : 'exclude';
+      }
+      if (raConfig.image != null && typeof raConfig.image != 'undefined') {
+        raiSync.raiImage = raConfig.image.bidders == 'richaudience' || raConfig.image.bidders == '*' ? raConfig.image.filter : 'exclude';
+      }
+    }
+    return raiSync;
+  } catch (e) {
+    return null;
+  }
+}
+
+function raiGetFloor(bid, config) {
+  try {
+    let raiFloor;
+    if (bid.params.bidfloor != null) {
+      raiFloor = bid.params.bidfloor;
+    } else if (typeof bid.getFloor == 'function') {
+      let floorSpec = bid.getFloor({
+        currency: config.getConfig('floors.data.currency') != null ? config.getConfig('floors.data.currency') : 'USD',
+        mediaType: typeof bid.mediaTypes['banner'] == 'object' ? 'banner' : 'video',
+        size: '*'
+      })
+
+      raiFloor = floorSpec.floor;
+    }
+    return raiFloor
+  } catch (e) {
+    return 0
+  }
+}
diff --git a/modules/richaudienceBidAdapter.md b/modules/richaudienceBidAdapter.md
index 932cdb8f8de..f888117b166 100644
--- a/modules/richaudienceBidAdapter.md
+++ b/modules/richaudienceBidAdapter.md
@@ -39,6 +39,7 @@ Please reach out to your account manager for more information.
                             "pid":"ADb1f40rmo",
                             "supplyType":"site",
                             "bidfloor":0.40,
+                            "keywords": "key1=value1;key2=value2;key3=value3;"
                         }
                     }]
                 }
diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
new file mode 100644
index 00000000000..0c4d6148f2b
--- /dev/null
+++ b/modules/riseBidAdapter.js
@@ -0,0 +1,453 @@
+import { logWarn, logInfo, isArray, isFn, deepAccess, isEmpty, contains, timestamp, getBidIdParameter, triggerPixel, isInteger } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const BIDDER_CODE = 'rise';
+const ADAPTER_VERSION = '6.0.0';
+const TTL = 360;
+const CURRENCY = 'USD';
+const DEFAULT_SELLER_ENDPOINT = 'https://hb.yellowblue.io/';
+const MODES = {
+  PRODUCTION: 'hb-multi',
+  TEST: 'hb-multi-test'
+}
+const SUPPORTED_SYNC_METHODS = {
+  IFRAME: 'iframe',
+  PIXEL: 'pixel'
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: 1043,
+  version: ADAPTER_VERSION,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params) {
+      logWarn('no params have been set to Rise adapter');
+      return false;
+    }
+
+    if (!bidRequest.params.org) {
+      logWarn('org is a mandatory param for Rise adapter');
+      return false;
+    }
+
+    return true;
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const combinedRequestsObject = {};
+
+    // use data from the first bid, to create the general params for all bids
+    const generalObject = validBidRequests[0];
+    const testMode = generalObject.params.testMode;
+    const rtbDomain = generalObject.params.rtbDomain;
+
+    combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest);
+    combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
+
+    return {
+      method: 'POST',
+      url: getEndpoint(testMode, rtbDomain),
+      data: combinedRequestsObject
+    }
+  },
+  interpretResponse: function ({body}) {
+    const bidResponses = [];
+
+    if (body.bids) {
+      body.bids.forEach(adUnit => {
+        const bidResponse = {
+          requestId: adUnit.requestId,
+          cpm: adUnit.cpm,
+          currency: adUnit.currency || CURRENCY,
+          width: adUnit.width,
+          height: adUnit.height,
+          ttl: adUnit.ttl || TTL,
+          creativeId: adUnit.requestId,
+          netRevenue: adUnit.netRevenue || true,
+          nurl: adUnit.nurl,
+          mediaType: adUnit.mediaType,
+          meta: {
+            mediaType: adUnit.mediaType
+          }
+        };
+
+        if (adUnit.mediaType === VIDEO) {
+          bidResponse.vastXml = adUnit.vastXml;
+        } else if (adUnit.mediaType === BANNER) {
+          bidResponse.ad = adUnit.ad;
+        }
+
+        if (adUnit.adomain && adUnit.adomain.length) {
+          bidResponse.meta.advertiserDomains = adUnit.adomain;
+        }
+
+        bidResponses.push(bidResponse);
+      });
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.iframeEnabled && response.body.params.userSyncURL) {
+        syncs.push({
+          type: 'iframe',
+          url: response.body.params.userSyncURL
+        });
+      }
+      if (syncOptions.pixelEnabled && isArray(response.body.params.userSyncPixels)) {
+        const pixels = response.body.params.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        })
+        syncs.push(...pixels)
+      }
+    }
+    return syncs;
+  },
+  onBidWon: function (bid) {
+    if (bid == null) {
+      return;
+    }
+
+    logInfo('onBidWon:', bid);
+    if (bid.hasOwnProperty('nurl') && bid.nurl.length > 0) {
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+registerBidder(spec);
+
+/**
+ * Get floor price
+ * @param bid {bid}
+ * @returns {Number}
+ */
+function getFloor(bid, mediaType) {
+  if (!isFn(bid.getFloor)) {
+    return 0;
+  }
+  let floorResult = bid.getFloor({
+    currency: CURRENCY,
+    mediaType: mediaType,
+    size: '*'
+  });
+  return floorResult.currency === CURRENCY && floorResult.floor ? floorResult.floor : 0;
+}
+
+/**
+ * Get the the ad sizes array from the bid
+ * @param bid {bid}
+ * @returns {Array}
+ */
+function getSizesArray(bid, mediaType) {
+  let sizesArray = []
+
+  if (deepAccess(bid, `mediaTypes.${mediaType}.sizes`)) {
+    sizesArray = bid.mediaTypes[mediaType].sizes;
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizesArray = bid.sizes;
+  }
+
+  return sizesArray;
+}
+
+/**
+ * Get schain string value
+ * @param schainObject {Object}
+ * @returns {string}
+ */
+function getSupplyChain(schainObject) {
+  if (isEmpty(schainObject)) {
+    return '';
+  }
+  let scStr = `${schainObject.ver},${schainObject.complete}`;
+  schainObject.nodes.forEach((node) => {
+    scStr += '!';
+    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
+    scStr += `${node.hp ? encodeURIComponent(node.hp) : ''},`;
+    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
+  });
+  return scStr;
+}
+
+/**
+ * Get encoded node value
+ * @param val {string}
+ * @returns {string}
+ */
+function getEncodedValIfNotEmpty(val) {
+  return !isEmpty(val) ? encodeURIComponent(val) : '';
+}
+
+/**
+ * Get preferred user-sync method based on publisher configuration
+ * @param bidderCode {string}
+ * @returns {string}
+ */
+function getAllowedSyncMethod(filterSettings, bidderCode) {
+  const iframeConfigsToCheck = ['all', 'iframe'];
+  const pixelConfigToCheck = 'image';
+  if (filterSettings && iframeConfigsToCheck.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
+    return SUPPORTED_SYNC_METHODS.IFRAME;
+  }
+  if (!filterSettings || !filterSettings[pixelConfigToCheck] || isSyncMethodAllowed(filterSettings[pixelConfigToCheck], bidderCode)) {
+    return SUPPORTED_SYNC_METHODS.PIXEL;
+  }
+}
+
+/**
+ * Check if sync rule is supported
+ * @param syncRule {Object}
+ * @param bidderCode {string}
+ * @returns {boolean}
+ */
+function isSyncMethodAllowed(syncRule, bidderCode) {
+  if (!syncRule) {
+    return false;
+  }
+  const isInclude = syncRule.filter === 'include';
+  const bidders = isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
+  return isInclude && contains(bidders, bidderCode);
+}
+
+/**
+ * Get the seller endpoint
+ * @param testMode {boolean}
+ * @param rtbDomain {string}
+ * @returns {string}
+ */
+function getEndpoint(testMode, rtbDomain) {
+  const SELLER_ENDPOINT = rtbDomain ? `https://${rtbDomain}/` : DEFAULT_SELLER_ENDPOINT;
+  return testMode
+    ? SELLER_ENDPOINT + MODES.TEST
+    : SELLER_ENDPOINT + MODES.PRODUCTION;
+}
+
+/**
+ * get device type
+ * @param uad {ua}
+ * @returns {string}
+ */
+function getDeviceType(ua) {
+  if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
+    .test(ua.toLowerCase())) {
+    return '5';
+  }
+  if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
+    .test(ua.toLowerCase())) {
+    return '4';
+  }
+  if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
+    .test(ua.toLowerCase())) {
+    return '3';
+  }
+  return '1';
+}
+
+function generateBidsParams(validBidRequests, bidderRequest) {
+  const bidsArray = [];
+
+  if (validBidRequests.length) {
+    validBidRequests.forEach(bid => {
+      bidsArray.push(generateBidParameters(bid, bidderRequest));
+    });
+  }
+
+  return bidsArray;
+}
+
+/**
+ * Generate bid specific parameters
+ * @param {bid} bid
+ * @param {bidderRequest} bidderRequest
+ * @returns {Object} bid specific params object
+ */
+function generateBidParameters(bid, bidderRequest) {
+  const {params} = bid;
+  const mediaType = isBanner(bid) ? BANNER : VIDEO;
+  const sizesArray = getSizesArray(bid, mediaType);
+
+  // fix floor price in case of NAN
+  if (isNaN(params.floorPrice)) {
+    params.floorPrice = 0;
+  }
+
+  const bidObject = {
+    mediaType,
+    adUnitCode: getBidIdParameter('adUnitCode', bid),
+    sizes: sizesArray,
+    floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
+    bidId: getBidIdParameter('bidId', bid),
+    bidderRequestId: getBidIdParameter('bidderRequestId', bid),
+    loop: getBidIdParameter('bidderRequestsCount', bid),
+    transactionId: getBidIdParameter('transactionId', bid),
+  };
+
+  const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
+  if (pos) {
+    bidObject.pos = pos;
+  }
+
+  const gpid = deepAccess(bid, `ortb2Imp.ext.gpid`);
+  if (gpid) {
+    bidObject.gpid = gpid;
+  }
+
+  const placementId = params.placementId || deepAccess(bid, `mediaTypes.${mediaType}.name`);
+  if (placementId) {
+    bidObject.placementId = placementId;
+  }
+
+  const mimes = deepAccess(bid, `mediaTypes.${mediaType}.mimes`);
+  if (mimes) {
+    bidObject.mimes = mimes;
+  }
+
+  const api = deepAccess(bid, `mediaTypes.${mediaType}.api`);
+  if (api) {
+    bidObject.api = api;
+  }
+
+  if (mediaType === VIDEO) {
+    const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
+    let playbackMethodValue;
+
+    // verify playbackMethod is of type integer array, or integer only.
+    if (Array.isArray(playbackMethod) && isInteger(playbackMethod[0])) {
+      // only the first playbackMethod in the array will be used, according to OpenRTB 2.5 recommendation
+      playbackMethodValue = playbackMethod[0];
+    } else if (isInteger(playbackMethod)) {
+      playbackMethodValue = playbackMethod;
+    }
+
+    if (playbackMethodValue) {
+      bidObject.playbackMethod = playbackMethodValue;
+    }
+
+    const placement = deepAccess(bid, `mediaTypes.video.placement`);
+    if (placement) {
+      bidObject.placement = placement;
+    }
+
+    const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
+    if (minDuration) {
+      bidObject.minDuration = minDuration;
+    }
+
+    const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
+    if (maxDuration) {
+      bidObject.maxDuration = maxDuration;
+    }
+
+    const skip = deepAccess(bid, `mediaTypes.video.skip`);
+    if (skip) {
+      bidObject.skip = skip;
+    }
+
+    const linearity = deepAccess(bid, `mediaTypes.video.linearity`);
+    if (linearity) {
+      bidObject.linearity = linearity;
+    }
+
+    const protocols = deepAccess(bid, `mediaTypes.video.protocols`);
+    if (protocols) {
+      bidObject.protocols = protocols;
+    }
+  }
+
+  return bidObject;
+}
+
+function isBanner(bid) {
+  return bid.mediaTypes && bid.mediaTypes.banner;
+}
+
+/**
+ * Generate params that are common between all bids
+ * @param {single bid object} generalObject
+ * @param {bidderRequest} bidderRequest
+ * @returns {object} the common params object
+ */
+function generateGeneralParams(generalObject, bidderRequest) {
+  const domain = window.location.hostname;
+  const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
+  const {bidderCode} = bidderRequest;
+  const generalBidParams = generalObject.params;
+  const timeout = config.getConfig('bidderTimeout');
+
+  // these params are snake_case instead of camelCase to allow backwards compatability on the server.
+  // in the future, these will be converted to camelCase to match our convention.
+  const generalParams = {
+    wrapper_type: 'prebidjs',
+    wrapper_vendor: '$$PREBID_GLOBAL$$',
+    wrapper_version: '$prebid.version$',
+    adapter_version: ADAPTER_VERSION,
+    auction_start: timestamp(),
+    publisher_id: generalBidParams.org,
+    publisher_name: domain,
+    site_domain: domain,
+    dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+    device_type: getDeviceType(navigator.userAgent),
+    ua: navigator.userAgent,
+    is_wrapper: !!generalBidParams.isWrapper,
+    session_id: generalBidParams.sessionId || getBidIdParameter('auctionId', generalObject),
+    tmax: timeout
+  };
+
+  const userIdsParam = getBidIdParameter('userId', generalObject);
+  if (userIdsParam) {
+    generalParams.userIds = JSON.stringify(userIdsParam);
+  }
+
+  const ortb2Metadata = bidderRequest.ortb2 || {};
+  if (ortb2Metadata.site) {
+    generalParams.site_metadata = JSON.stringify(ortb2Metadata.site);
+  }
+  if (ortb2Metadata.user) {
+    generalParams.user_metadata = JSON.stringify(ortb2Metadata.user);
+  }
+
+  if (syncEnabled) {
+    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
+    if (allowedSyncMethod) {
+      generalParams.cs_method = allowedSyncMethod;
+    }
+  }
+
+  if (bidderRequest.uspConsent) {
+    generalParams.us_privacy = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+    generalParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    generalParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
+  if (generalBidParams.ifa) {
+    generalParams.ifa = generalBidParams.ifa;
+  }
+
+  if (generalObject.schain) {
+    generalParams.schain = getSupplyChain(generalObject.schain);
+  }
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    // TODO: is 'ref' the right value here?
+    generalParams.referrer = deepAccess(bidderRequest, 'refererInfo.ref');
+    // TODO: does the fallback make sense here?
+    generalParams.page_url = deepAccess(bidderRequest, 'refererInfo.page') || deepAccess(window, 'location.href');
+  }
+
+  return generalParams;
+}
diff --git a/modules/riseBidAdapter.md b/modules/riseBidAdapter.md
new file mode 100644
index 00000000000..f0837cb5508
--- /dev/null
+++ b/modules/riseBidAdapter.md
@@ -0,0 +1,55 @@
+#Overview
+
+Module Name: Rise Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: prebid-rise-engage@risecodes.com
+
+
+# Description
+
+Module that connects to Rise's demand sources.
+
+The Rise adapter requires setup and approval from the Rise. Please reach out to prebid-rise-engage@risecodes.com to create an Rise account.
+
+The adapter supports Video(instream).
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `org` | required | String |  Rise publisher Id provided by your Rise representative  | "1234567890abcdef12345678"
+| `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
+| `placementId` | optional | String |  A unique placement identifier  | "12345678"
+| `testMode` | optional | Boolean |  This activates the test mode  | false
+| `rtbDomain` | optional | String |  Sets the seller end point  | "www.test.com"
+| `is_wrapper` | private | Boolean |  Please don't use unless your account manager asked you to  | false
+
+
+# Test Parameters
+```javascript
+var adUnits = [
+       {
+        code: 'dfp-video-div',
+        sizes: [[640, 480]],
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'instream'
+          }
+        },
+        bids: [{
+          bidder: 'rise',
+          params: {
+            org: '1234567890abcdef12345678', // Required
+            floorPrice: 2.00, // Optional
+            placementId: '12345678', // Optional
+            testMode: false, // Optional,
+            rtbDomain: "www.test.com" //Optional
+          }
+        }]
+      }
+   ];
+```
diff --git a/modules/rivrAnalyticsAdapter.js b/modules/rivrAnalyticsAdapter.js
index 279b1b13051..cf14ff44571 100644
--- a/modules/rivrAnalyticsAdapter.js
+++ b/modules/rivrAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import * as utils from '../src/utils.js';
 
diff --git a/modules/rockyouBidAdapter.md b/modules/rockyouBidAdapter.md
deleted file mode 100644
index 1c6d2708b99..00000000000
--- a/modules/rockyouBidAdapter.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Overview
-
-```
-Module Name: RockYou Bidder Adapter  
-Module Type: Bidder Adapter  
-Maintainer: prebid.adapter@rockyou.com  
-```
-
-# Description
-
-Connects to the RockYou exchange for bids.
-
-The RockYou bid adapter supports Banner and Video.
-
-For publishers who wish to be set up on the RockYou Ad Network, please contact
-publishers@rockyou.com.
-
-RockYou user syncing requires the `userSync.iframeEnabled` property be set to `true`.
-
-# Test PARAMETERS
-```
-var adUnits = [
-
-  // Banner adUnit
-  {
-    code: 'banner-div',
-    mediaTypes: {
-      banner: {
-        sizes: [[720, 480]]
-      }
-    },
-
-    bids: [{
-          bidder: 'rockyou',
-          params: {
-            placementId: '4954'
-          }
-        }]
-  },
-
-  // Video (outstream)
-  {
-    code: 'video-outstream',
-    mediaTypes: {
-      video: {
-        context: 'outstream',
-        playerSize: [720, 480]
-      }
-    },
-    bids: [{
-      bidder: 'rockyou',
-      params: {
-        placementId: '4957'
-      }
-    }]
-  }
-]
-```
diff --git a/modules/roxotAnalyticsAdapter.js b/modules/roxotAnalyticsAdapter.js
index b6857d69f45..1ded17f3a5b 100644
--- a/modules/roxotAnalyticsAdapter.js
+++ b/modules/roxotAnalyticsAdapter.js
@@ -1,13 +1,13 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import {deepClone, getParameterByName, logError, logInfo} from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {includes} from '../src/polyfill.js';
 import {ajaxBuilder} from '../src/ajax.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {getStorageManager} from '../src/storageManager.js';
 
 const storage = getStorageManager();
 
-const utils = require('../src/utils.js');
 let ajax = ajaxBuilder(0);
 
 const DEFAULT_EVENT_URL = 'pa.rxthdr.com/v3';
@@ -153,7 +153,7 @@ function buildBidderRequest(auction, bidRequest) {
 
 function buildBidAfterTimeout(adUnitAuction, args) {
   return {
-    'auction': utils.deepClone(adUnitAuction),
+    'auction': deepClone(adUnitAuction),
     'adUnit': extractAdUnitCode(args),
     'bidder': extractBidder(args),
     'cpm': args.cpm,
@@ -170,7 +170,7 @@ function buildBidAfterTimeout(adUnitAuction, args) {
 function buildImpression(adUnitAuction, args) {
   return {
     'isNew': checkIsNewFlag() ? 1 : 0,
-    'auction': utils.deepClone(adUnitAuction),
+    'auction': deepClone(adUnitAuction),
     'adUnit': extractAdUnitCode(args),
     'bidder': extractBidder(args),
     'cpm': args.cpm,
@@ -342,7 +342,7 @@ roxotAdapter.originEnableAnalytics = roxotAdapter.enableAnalytics;
 
 roxotAdapter.enableAnalytics = function (config) {
   if (this.initConfig(config)) {
-    logInfo('Analytics adapter enabled', initOptions);
+    _logInfo('Analytics adapter enabled', initOptions);
     roxotAdapter.originEnableAnalytics(config);
   }
 };
@@ -351,7 +351,7 @@ roxotAdapter.buildUtmTagData = function () {
   let utmTagData = {};
   let utmTagsDetected = false;
   utmTags.forEach(function (utmTagKey) {
-    let utmTagValue = utils.getParameterByName(utmTagKey);
+    let utmTagValue = getParameterByName(utmTagKey);
     if (utmTagValue !== '') {
       utmTagsDetected = true;
     }
@@ -374,11 +374,11 @@ roxotAdapter.buildUtmTagData = function () {
 roxotAdapter.initConfig = function (config) {
   let isCorrectConfig = true;
   initOptions = {};
-  initOptions.options = utils.deepClone(config.options);
+  initOptions.options = deepClone(config.options);
 
   initOptions.publisherId = initOptions.options.publisherId || (initOptions.options.publisherIds[0]) || null;
   if (!initOptions.publisherId) {
-    logError('"options.publisherId" is empty');
+    _logError('"options.publisherId" is empty');
     isCorrectConfig = false;
   }
 
@@ -407,7 +407,7 @@ function registerEvent(eventType, eventName, data) {
 
   sendEventCache.push(eventData);
 
-  logInfo('Register event', eventData);
+  _logInfo('Register event', eventData);
 
   (typeof initOptions.serverConfig === 'undefined') ? checkEventAfterTimeout() : checkSendEvent();
 }
@@ -427,7 +427,7 @@ function checkSendEvent() {
     let event = sendEventCache.shift();
     let isNeedSend = initOptions.serverConfig[event.eventType] || 0;
     if (Number(isNeedSend) === 0) {
-      logInfo('Skip event ' + event.eventName, event);
+      _logInfo('Skip event ' + event.eventName, event);
       continue;
     }
     sendEvent(event.eventType, event.eventName, event.data);
@@ -454,7 +454,7 @@ function sendEvent(eventType, eventName, data) {
   ajax(
     url,
     function () {
-      logInfo(eventName + ' sent', eventData);
+      _logInfo(eventName + ' sent', eventData);
     },
     JSON.stringify(eventData),
     {
@@ -490,12 +490,12 @@ function loadServerConfig() {
   );
 }
 
-function logInfo(message, meta) {
-  utils.logInfo(buildLogMessage(message), meta);
+function _logInfo(message, meta) {
+  logInfo(buildLogMessage(message), meta);
 }
 
-function logError(message) {
-  utils.logError(buildLogMessage(message));
+function _logError(message) {
+  logError(buildLogMessage(message));
 }
 
 function buildLogMessage(message) {
diff --git a/modules/rtbdemandBidAdapter.js b/modules/rtbdemandBidAdapter.js
deleted file mode 100644
index be5fb39f53a..00000000000
--- a/modules/rtbdemandBidAdapter.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'rtbdemand';
-const BIDDER_SERVER = 'bidding.rtbdemand.com';
-export const spec = {
-  code: BIDDER_CODE,
-  isBidRequestValid: function(bid) {
-    return !!(bid && bid.params && bid.params.zoneid);
-  },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    return validBidRequests.map(bidRequest => {
-      var server = bidRequest.params.server || BIDDER_SERVER;
-      var parse = getSize(bidderRequest.bids[0].sizes);
-      const payload = {
-        from: 'hb',
-        v: '1.0',
-        request_id: bidRequest.bidderRequestId,
-        imp_id: bidRequest.bidId,
-        aff: bidRequest.params.zoneid,
-        bid_floor: parseFloat(bidRequest.params.floor) > 0 ? bidRequest.params.floor : 0,
-        charset: document.charSet || document.characterSet,
-        site_domain: document.location.hostname,
-        site_page: window.location.href,
-        subid: 'hb',
-        flashver: getFlashVersion(),
-        tmax: bidderRequest.timeout,
-        hb: '1',
-        name: document.location.hostname,
-        width: parse.width,
-        height: parse.height,
-        device_width: screen.width,
-        device_height: screen.height,
-        dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
-        secure: isSecure(),
-        make: navigator.vendor ? navigator.vendor : '',
-      };
-      if (document.referrer) {
-        payload.referrer = document.referrer;
-      }
-
-      return {
-        method: 'GET',
-        url: 'https://' + server + '/hb',
-        data: payload
-      };
-    });
-  },
-  interpretResponse: function(serverResponse) {
-    serverResponse = serverResponse.body;
-    const bidResponses = [];
-    if (serverResponse && serverResponse.seatbid) {
-      serverResponse.seatbid.forEach(seatBid => seatBid.bid.forEach(bid => {
-        const bidResponse = {
-          requestId: bid.impid,
-          creativeId: bid.impid,
-          cpm: bid.price,
-          width: bid.w,
-          height: bid.h,
-          ad: bid.adm,
-          netRevenue: true,
-          currency: 'USD',
-          ttl: 360,
-        };
-
-        bidResponses.push(bidResponse);
-      }));
-    }
-    return bidResponses;
-  },
-  getUserSyncs: function getUserSyncs(syncOptions) {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: 'https://' + BIDDER_SERVER + '/delivery/matches.php?type=iframe',
-      }];
-    }
-  }
-}
-
-function getFlashVersion() {
-  var plugins, plugin, result;
-
-  if (navigator.plugins && navigator.plugins.length > 0) {
-    plugins = navigator.plugins;
-    for (var i = 0; i < plugins.length && !result; i++) {
-      plugin = plugins[i];
-      if (plugin.name.indexOf('Shockwave Flash') > -1) {
-        result = plugin.description.split('Shockwave Flash ')[1];
-      }
-    }
-  }
-  return result || '';
-}
-
-/* Get parsed size from request size */
-function getSize(requestSizes) {
-  const parsed = {};
-  const size = utils.parseSizesInput(requestSizes)[0];
-
-  if (typeof size !== 'string') {
-    return parsed;
-  }
-
-  const parsedSize = size.toUpperCase().split('X');
-  const width = parseInt(parsedSize[0], 10);
-  if (width) {
-    parsed.width = width;
-  }
-
-  const height = parseInt(parsedSize[1], 10);
-  if (height) {
-    parsed.height = height;
-  }
-
-  return parsed;
-}
-
-function isSecure() {
-  return document.location.protocol === 'https:';
-}
-
-registerBidder(spec);
diff --git a/modules/rtbdemandBidAdapter.md b/modules/rtbdemandBidAdapter.md
deleted file mode 100644
index 2727d85e084..00000000000
--- a/modules/rtbdemandBidAdapter.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Overview
-
-**Module Name**: Rtbdemand Media fmxSSP Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**:  rtb@rtbdemand.com
-
-# Description
-
-Connects to Rtbdemand Media fmxSSP demand source to fetch bids.  
-
-# Test Parameters
-```	
-    var adUnits = [{
-      code: 'banner-ad-div',
-      sizes: [[300, 250]],
-      bids: [{
-        bidder: 'rtbdemand',
-        params: {
-          zoneid: '9999',
-          floor: 0.005,
-          server: 'bidding.rtbdemand.com'
-        }
-      }]
-    }];
-	
-```
diff --git a/modules/rtbdemandadkBidAdapter.md b/modules/rtbdemandadkBidAdapter.md
deleted file mode 100644
index 96bd3f6c8d7..00000000000
--- a/modules/rtbdemandadkBidAdapter.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Overview
-
-```
-Module Name: Rtbdemandadk Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: shreyanschopra@rtbdemand.com
-```
-
-# Description
-
-Connects to Rtbdemandadk whitelabel platform.
-Banner and video formats are supported.
-
-
-# Test Parameters
-```
-    var adUnits = [
-      {
-        code: 'banner-ad-div',
-        sizes: [[300, 250]],  // banner size
-        bids: [
-          {
-            bidder: 'rtbdemandadk',
-            params: {
-              zoneId: '30164',  //required parameter
-              host: 'cpm.metaadserving.com' //required parameter
-            }
-          }
-        ]
-      }, {
-        code: 'video-ad-player',
-        sizes: [640, 480],   // video player size
-        bids: [
-          {
-            bidder: 'rtbdemandadk',
-            mediaType : 'video',
-            params: {
-              zoneId: '30164',  //required parameter
-              host: 'cpm.metaadserving.com' //required parameter
-            }
-          }
-        ]
-      }
-    ];
-```
diff --git a/modules/rtbhouseBidAdapter.js b/modules/rtbhouseBidAdapter.js
index 3337c3f1b59..9f498014a8e 100644
--- a/modules/rtbhouseBidAdapter.js
+++ b/modules/rtbhouseBidAdapter.js
@@ -1,13 +1,19 @@
-import * as utils from '../src/utils.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {deepAccess, mergeDeep, isArray, logError, logInfo} from '../src/utils.js';
+import { getOrigin } from '../libraries/getOrigin/index.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {includes} from '../src/polyfill.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'rtbhouse';
 const REGIONS = ['prebid-eu', 'prebid-us', 'prebid-asia'];
 const ENDPOINT_URL = 'creativecdn.com/bidder/prebid/bids';
+const FLEDGE_ENDPOINT_URL = 'creativecdn.com/bidder/prebidfledge/bids';
 const DEFAULT_CURRENCY_ARR = ['USD']; // NOTE - USD is the only supported currency right now; Hardcoded for bids
+const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE];
 const TTL = 55;
+const GVLID = 16;
 
 // Codes defined by OpenRTB Native Ads 1.1 specification
 export const OPENRTB = {
@@ -34,20 +40,25 @@ export const OPENRTB = {
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, NATIVE],
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+  gvlid: GVLID,
 
   isBidRequestValid: function (bid) {
     return !!(includes(REGIONS, bid.params.region) && bid.params.publisherId);
   },
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const request = {
       id: validBidRequests[0].auctionId,
-      imp: validBidRequests.map(slot => mapImpression(slot)),
+      imp: validBidRequests.map(slot => mapImpression(slot, bidderRequest)),
       site: mapSite(validBidRequests, bidderRequest),
       cur: DEFAULT_CURRENCY_ARR,
       test: validBidRequests[0].params.test || 0,
       source: mapSource(validBidRequests[0]),
     };
+
     if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
       const consentStr = (bidderRequest.gdprConsent.consentString)
         ? bidderRequest.gdprConsent.consentString.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '') : '';
@@ -55,41 +66,148 @@ export const spec = {
       request.regs = {ext: {gdpr: gdpr}};
       request.user = {ext: {consent: consentStr}};
     }
+    if (validBidRequests[0].schain) {
+      const schain = mapSchain(validBidRequests[0].schain);
+      if (schain) {
+        request.ext = {
+          schain: schain,
+        };
+      }
+    }
+
+    if (validBidRequests[0].userIdAsEids) {
+      const eids = { eids: validBidRequests[0].userIdAsEids };
+      if (request.user && request.user.ext) {
+        request.user.ext = { ...request.user.ext, ...eids };
+      } else {
+        request.user = {ext: eids};
+      }
+    }
+
+    const ortb2Params = bidderRequest?.ortb2 || {};
+    if (ortb2Params.site) {
+      mergeDeep(request, { site: ortb2Params.site });
+    }
+    if (ortb2Params.user) {
+      mergeDeep(request, { user: ortb2Params.user });
+    }
+    if (ortb2Params.device) {
+      mergeDeep(request, { device: ortb2Params.device });
+    }
+
+    let computedEndpointUrl = ENDPOINT_URL;
+
+    const fledgeConfig = config.getConfig('fledgeConfig');
+    if (bidderRequest.fledgeEnabled && fledgeConfig) {
+      mergeDeep(request, { ext: { fledge_config: fledgeConfig } });
+      computedEndpointUrl = FLEDGE_ENDPOINT_URL;
+    }
 
     return {
       method: 'POST',
-      url: 'https://' + validBidRequests[0].params.region + '.' + ENDPOINT_URL,
+      url: 'https://' + validBidRequests[0].params.region + '.' + computedEndpointUrl,
       data: JSON.stringify(request)
     };
   },
-  interpretResponse: function (serverResponse, originalRequest) {
+  interpretOrtbResponse: function (serverResponse, originalRequest) {
     const responseBody = serverResponse.body;
-    if (!utils.isArray(responseBody)) {
+    if (!isArray(responseBody)) {
       return [];
     }
 
     const bids = [];
     responseBody.forEach(serverBid => {
-      if (serverBid.price === 0) {
+      if (!serverBid.price) { // price may exist and is === 0 or there's no price prop at all (fledge req case)
         return;
       }
+
+      let interpretedBid;
+
       // try...catch would be risky cause JSON.parse throws SyntaxError
       if (serverBid.adm.indexOf('{') === 0) {
-        bids.push(interpretNativeBid(serverBid));
+        interpretedBid = interpretNativeBid(serverBid);
       } else {
-        bids.push(interpretBannerBid(serverBid));
+        interpretedBid = interpretBannerBid(serverBid);
       }
+      if (serverBid.ext) interpretedBid.ext = serverBid.ext;
+
+      bids.push(interpretedBid);
     });
     return bids;
+  },
+  interpretResponse: function (serverResponse, originalRequest) {
+    let bids;
+
+    const responseBody = serverResponse.body;
+    let fledgeAuctionConfigs = null;
+
+    if (responseBody.bidid && isArray(responseBody?.ext?.igbid)) {
+      // we have fledge response
+      // mimic the original response ([{},...])
+      bids = this.interpretOrtbResponse({ body: responseBody.seatbid[0]?.bid }, originalRequest);
+
+      const seller = responseBody.ext.seller;
+      const decisionLogicUrl = responseBody.ext.decisionLogicUrl;
+      const sellerTimeout = 'sellerTimeout' in responseBody.ext ? { sellerTimeout: responseBody.ext.sellerTimeout } : {};
+      responseBody.ext.igbid.forEach((igbid) => {
+        const perBuyerSignals = {};
+        igbid.igbuyer.forEach(buyerItem => {
+          perBuyerSignals[buyerItem.igdomain] = buyerItem.buyersignal
+        });
+        fledgeAuctionConfigs = fledgeAuctionConfigs || {};
+        fledgeAuctionConfigs[igbid.impid] = mergeDeep(
+          {
+            seller,
+            decisionLogicUrl,
+            interestGroupBuyers: Object.keys(perBuyerSignals),
+            perBuyerSignals,
+          },
+          sellerTimeout
+        );
+      });
+    } else {
+      bids = this.interpretOrtbResponse(serverResponse, originalRequest);
+    }
+
+    if (fledgeAuctionConfigs) {
+      fledgeAuctionConfigs = Object.entries(fledgeAuctionConfigs).map(([bidId, cfg]) => {
+        return Object.assign({
+          bidId,
+          auctionSignals: {}
+        }, cfg);
+      });
+      logInfo('Response with FLEDGE:', { bids, fledgeAuctionConfigs });
+      return {
+        bids,
+        fledgeAuctionConfigs,
+      }
+    }
+    return bids;
   }
 };
 registerBidder(spec);
 
+/**
+ * @param {object} slot Ad Unit Params by Prebid
+ * @returns {int} floor by imp type
+ */
+function applyFloor(slot) {
+  const floors = [];
+  if (typeof slot.getFloor === 'function') {
+    Object.keys(slot.mediaTypes).forEach(type => {
+      if (includes(SUPPORTED_MEDIA_TYPES, type)) {
+        floors.push(slot.getFloor({ currency: DEFAULT_CURRENCY_ARR[0], mediaType: type, size: slot.sizes || '*' }).floor);
+      }
+    });
+  }
+  return floors.length > 0 ? Math.max(...floors) : parseFloat(slot.params.bidfloor);
+}
+
 /**
  * @param {object} slot Ad Unit Params by Prebid
  * @returns {object} Imp by OpenRTB 2.5 §3.2.4
  */
-function mapImpression(slot) {
+function mapImpression(slot, bidderRequest) {
   const imp = {
     id: slot.bidId,
     banner: mapBanner(slot),
@@ -97,11 +215,19 @@ function mapImpression(slot) {
     tagid: slot.adUnitCode.toString()
   };
 
-  const bidfloor = parseFloat(slot.params.bidfloor);
+  const bidfloor = applyFloor(slot);
   if (bidfloor) {
-    imp.bidfloor = bidfloor
+    imp.bidfloor = bidfloor;
   }
 
+  if (bidderRequest.fledgeEnabled) {
+    imp.ext = imp.ext || {};
+    imp.ext.ae = slot?.ortb2Imp?.ext?.ae
+  } else {
+    if (imp.ext?.ae) {
+      delete imp.ext.ae;
+    }
+  }
   return imp;
 }
 
@@ -111,7 +237,7 @@ function mapImpression(slot) {
  */
 function mapBanner(slot) {
   if (slot.mediaType === 'banner' ||
-    utils.deepAccess(slot, 'mediaTypes.banner') ||
+    deepAccess(slot, 'mediaTypes.banner') ||
     (!slot.mediaType && !slot.mediaTypes)) {
     var sizes = slot.sizes || slot.mediaTypes.banner.sizes;
     return {
@@ -131,16 +257,26 @@ function mapBanner(slot) {
  * @returns {object} Site by OpenRTB 2.5 §3.2.13
  */
 function mapSite(slot, bidderRequest) {
-  const pubId = slot && slot.length > 0
-    ? slot[0].params.publisherId
-    : 'unknown';
-  return {
+  let pubId = 'unknown';
+  let channel = null;
+  if (slot && slot.length > 0) {
+    pubId = slot[0].params.publisherId;
+    channel = slot[0].params.channel &&
+    slot[0].params.channel
+      .toString()
+      .slice(0, 50);
+  }
+  let siteData = {
     publisher: {
       id: pubId.toString(),
     },
-    page: bidderRequest.refererInfo.referer,
-    name: utils.getOrigin()
+    page: bidderRequest.refererInfo.page,
+    name: getOrigin()
+  };
+  if (channel) {
+    siteData.channel = channel;
   }
+  return siteData;
 }
 
 /**
@@ -151,12 +287,7 @@ function mapSource(slot) {
   const source = {
     tid: slot.transactionId,
   };
-  const schain = mapSchain(slot.schain);
-  if (schain) {
-    source.ext = {
-      schain: schain
-    }
-  }
+
   return source;
 }
 
@@ -169,7 +300,7 @@ function mapSchain(schain) {
     return null;
   }
   if (!validateSchain(schain)) {
-    utils.logError('RTB House: required schain params missing');
+    logError('RTB House: required schain params missing');
     return null;
   }
   return schain;
@@ -194,7 +325,7 @@ function validateSchain(schain) {
  * @returns {object} Request by OpenRTB Native Ads 1.1 §4
  */
 function mapNative(slot) {
-  if (slot.mediaType === 'native' || utils.deepAccess(slot, 'mediaTypes.native')) {
+  if (slot.mediaType === 'native' || deepAccess(slot, 'mediaTypes.native')) {
     return {
       request: {
         assets: mapNativeAssets(slot)
@@ -209,7 +340,7 @@ function mapNative(slot) {
  * @returns {array} Request Assets by OpenRTB Native Ads 1.1 §4.2
  */
 function mapNativeAssets(slot) {
-  const params = slot.nativeParams || utils.deepAccess(slot, 'mediaTypes.native');
+  const params = slot.nativeParams || deepAccess(slot, 'mediaTypes.native');
   const assets = [];
   if (params.title) {
     assets.push({
@@ -302,6 +433,9 @@ function interpretBannerBid(serverBid) {
     width: serverBid.w,
     height: serverBid.h,
     ttl: TTL,
+    meta: {
+      advertiserDomains: serverBid.adomain
+    },
     netRevenue: true,
     currency: 'USD'
   }
@@ -320,6 +454,9 @@ function interpretNativeBid(serverBid) {
     width: 1,
     height: 1,
     ttl: TTL,
+    meta: {
+      advertiserDomains: serverBid.adomain
+    },
     netRevenue: true,
     currency: 'USD',
     native: interpretNativeAd(serverBid.adm),
diff --git a/modules/rtbsapeBidAdapter.js b/modules/rtbsapeBidAdapter.js
new file mode 100644
index 00000000000..cf3d79eb377
--- /dev/null
+++ b/modules/rtbsapeBidAdapter.js
@@ -0,0 +1,144 @@
+import { deepAccess, triggerPixel } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {OUTSTREAM} from '../src/video.js';
+import {Renderer} from '../src/Renderer.js';
+
+const BIDDER_CODE = 'rtbsape';
+const ENDPOINT = 'https://ssp-rtb.sape.ru/prebid';
+const RENDERER_SRC = 'https://cdn-rtb.sape.ru/js/player.js';
+const MATCH_SRC = 'https://www.acint.net/mc/?dp=141';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['sape'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True  if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return !!(bid && bid.mediaTypes && (bid.mediaTypes.banner || bid.mediaTypes.video) && bid.params && bid.params.placeId);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests an array of bids
+   * @param bidderRequest
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let tz = (new Date()).getTimezoneOffset()
+    let padInt = (v) => (v < 10 ? '0' + v : '' + v);
+
+    return {
+      url: ENDPOINT,
+      method: 'POST',
+      data: {
+        auctionId: bidderRequest.auctionId,
+        requestId: bidderRequest.bidderRequestId,
+        bids: validBidRequests,
+        timezone: (tz > 0 ? '-' : '+') + padInt(Math.floor(Math.abs(tz) / 60)) + ':' + padInt(Math.abs(tz) % 60),
+        // TODO: please do not send internal data structures over the network
+        refererInfo: bidderRequest.refererInfo.legacy
+      },
+    }
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {{data: {bids: [{mediaTypes: {banner: boolean}}]}}} bidRequest Info describing the request to the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (!(serverResponse.body && Array.isArray(serverResponse.body.bids))) {
+      return [];
+    }
+
+    let bids = {};
+    bidRequest.data.bids.forEach(bid => bids[bid.bidId] = bid);
+
+    return serverResponse.body.bids
+      .filter(bid => typeof (bid.meta || {}).advertiserDomains !== 'undefined')
+      .map(bid => {
+        let requestBid = bids[bid.requestId];
+        let context = deepAccess(requestBid, 'mediaTypes.video.context');
+
+        if (context === OUTSTREAM && (bid.vastUrl || bid.vastXml)) {
+          let renderer = Renderer.install({
+            id: bid.requestId,
+            url: RENDERER_SRC,
+            loaded: false
+          });
+
+          let muted = deepAccess(requestBid, 'params.video.playerMuted');
+          if (typeof muted === 'undefined') {
+            muted = true;
+          }
+
+          bid.playerMuted = muted;
+          bid.renderer = renderer
+
+          renderer.setRender(setOutstreamRenderer);
+        }
+
+        return bid;
+      });
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function (syncOptions) {
+    const sync = [];
+    if (syncOptions.iframeEnabled) {
+      sync.push({
+        type: 'iframe',
+        url: MATCH_SRC
+      });
+    }
+    return sync;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} bid The bid that won the auction
+   */
+  onBidWon: function(bid) {
+    if (bid.nurl) {
+      triggerPixel(bid.nurl);
+    }
+  }
+}
+
+/**
+ * Initialize RtbSape outstream player
+ *
+ * @param bid
+ */
+function setOutstreamRenderer(bid) {
+  let props = {};
+  if (bid.vastUrl) {
+    props.url = bid.vastUrl;
+  }
+  if (bid.vastXml) {
+    props.xml = bid.vastXml;
+  }
+  bid.renderer.push(() => {
+    let player = window.sapeRtbPlayerHandler(bid.adUnitCode, bid.width, bid.height, bid.playerMuted, {singleton: true});
+    props.onComplete = () => player.destroy();
+    props.onError = () => player.destroy();
+    player.addSlot(props);
+  });
+}
+
+registerBidder(spec);
diff --git a/modules/rtbsapeBidAdapter.md b/modules/rtbsapeBidAdapter.md
new file mode 100644
index 00000000000..6b1afe3867d
--- /dev/null
+++ b/modules/rtbsapeBidAdapter.md
@@ -0,0 +1,51 @@
+# Overview
+
+```
+Module Name:  RtbSape Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:  sergey@sape.ru
+```
+
+# Description
+Our module makes it easy to integrate RtbSape demand sources into your website.
+
+Supported Ad format:
+* Banner
+* Video (instream and outstream)
+
+# Test Parameters
+```
+var adUnits = [
+    // Banner adUnit
+    {
+        code: 'banner-div',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]],
+            }
+        },
+        bids: [{
+            bidder: 'rtbsape',
+            params: {
+                placeId: 553307
+            }
+        }]
+    },
+    // Video adUnit
+    {
+        code: 'video-div',
+        mediaTypes: {
+            video: {
+                context: 'outstream',
+                playerSize: [600, 340]
+            }
+        },
+        bids: [{
+            bidder: 'rtbsape',
+            params: {
+                placeId: 553309
+            }
+        }]
+    }
+];
+```
diff --git a/modules/rtbsolutionsBidAdapter.js b/modules/rtbsolutionsBidAdapter.js
deleted file mode 100644
index 244ab8a4eba..00000000000
--- a/modules/rtbsolutionsBidAdapter.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
-
-const BIDDER_CODE = 'rtbsolutions';
-const ENDPOINT_URL = 'https://dsp-eu-lb.rtbsolutions.pro/bid/hb';
-
-export const spec = {
-  version: '1.0',
-  code: BIDDER_CODE,
-  aliases: ['rtbss'], // short code
-  nurls: {},
-  isBidRequestValid: function(bid) {
-    return !!bid.params.blockId;
-  },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    let req = [];
-
-    bidderRequest.bids.forEach(item => {
-      const width = item.sizes[0][0];
-      const height = item.sizes[0][1];
-
-      let imp = {
-        referer: bidderRequest.refererInfo.referer,
-        ua: navigator.userAgent,
-        lang: this.getLanguage(),
-        domain: this.getDomain(),
-        width: width,
-        height: height,
-        type: 'banner',
-      };
-
-      if (item.params.s1 !== undefined) imp.s1 = item.params.s1;
-      if (item.params.s2 !== undefined) imp.s2 = item.params.s2;
-      if (item.params.s3 !== undefined) imp.s3 = item.params.s3;
-      if (item.params.s4 !== undefined) imp.s4 = item.params.s4;
-
-      req.push({
-        bid_id: item.bidId,
-        block_id: item.params.blockId,
-        ver: this.version,
-        imp
-      });
-    });
-
-    return {
-      method: 'POST',
-      url: ENDPOINT_URL,
-      data: req,
-      options: {
-        contentType: 'application/json'
-      }
-    }
-  },
-  interpretResponse: function(serverResponse, request) {
-    const bidResponses = [];
-
-    serverResponse.body.forEach(item => {
-      this.nurls[item.bid_id] = item.nurl;
-
-      const bidResponse = {
-        requestId: item.bid_id,
-        cpm: item.cpm,
-        width: item.width,
-        height: item.height,
-        creativeId: item.creative_id,
-        currency: item.currency,
-        netRevenue: true,
-        ttl: 360,
-        ad: item.ad,
-      };
-
-      bidResponses.push(bidResponse);
-    });
-
-    return bidResponses;
-  },
-  onBidWon: function(bid) {
-    ajax(this.nurls[bid.requestId], null);
-  },
-
-  getLanguage() {
-    const language = navigator.language ? 'language' : 'userLanguage';
-    const lang2 = navigator[language].split('-')[0];
-    if (lang2.length === 2 || lang2.length === 3) {
-      return lang2;
-    }
-    return '';
-  },
-  getDomain() {
-    if (!utils.inIframe()) {
-      return window.location.hostname
-    }
-    let origins = window.document.location.ancestorOrigins;
-    if (origins && origins.length > 0) {
-      return origins[origins.length - 1]
-    }
-  }
-};
-registerBidder(spec);
diff --git a/modules/rtbsolutionsBidAdapter.md b/modules/rtbsolutionsBidAdapter.md
deleted file mode 100644
index e671de306a0..00000000000
--- a/modules/rtbsolutionsBidAdapter.md
+++ /dev/null
@@ -1,128 +0,0 @@
-# Overview
-
-Module Name: Rtbsolutions Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: info@rtbsolutions.pro
-
-# Description
-
-You can use this adapter to get a bid from rtbsolutions.
-
-About us: http://rtbsolutions.pro
-
-
-# Test Parameters
-```javascript
-    var adUnits = [
-                {
-                    code: '/19968336/header-bid-tag-1',
-                    mediaTypes: {
-                        banner: {
-                            sizes: sizes
-                        }
-                    },
-                    bids: [{
-                        bidder: 'rtbsolutions',
-                        params: {
-                            blockId: 777,
-                            s1: 'sub_1',
-                            s2: 'sub_2',
-                            s3: 'sub_3',
-                            s4: 'sub_4'
-                        }
-                    }]
-                }];
-```
-
-Where:
-
-* blockId - Block ID from platform (required)
-* s1..s4 - Sub Id (optional)
-
-# Example page
-
-```html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Prebid</title>
-    <script async src="//www.googletagservices.com/tag/js/gpt.js"></script>
-    <script async src="prebid.js"></script>
-    <script>
-        var sizes = [
-            [640, 480]
-        ];
-        var PREBID_TIMEOUT = 1000;
-        var FAILSAFE_TIMEOUT = 3000;
-
-        var adUnits = [
-            {
-                code: '/19968336/header-bid-tag-1',
-                mediaTypes: {
-                    banner: {
-                        sizes: sizes
-                    }
-                },
-                bids: [{
-                    bidder: 'rtbsolutions',
-                    params: {
-                        blockId: 777
-                    }
-                }]
-            }];
-
-        // ======== DO NOT EDIT BELOW THIS LINE =========== //
-        var googletag = googletag || {};
-        googletag.cmd = googletag.cmd || [];
-        googletag.cmd.push(function() {
-            googletag.pubads().disableInitialLoad();
-        });
-
-        var pbjs = pbjs || {};
-        pbjs.que = pbjs.que || [];
-
-        pbjs.que.push(function() {
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: initAdserver,
-                timeout: PREBID_TIMEOUT
-            });
-        });
-
-        function initAdserver() {
-            if (pbjs.initAdserverSet) return;
-            pbjs.initAdserverSet = true;
-            googletag.cmd.push(function() {
-                pbjs.setTargetingForGPTAsync && pbjs.setTargetingForGPTAsync();
-                googletag.pubads().refresh();
-            });
-        }
-
-        // in case PBJS doesn't load
-        setTimeout(function() {
-            initAdserver();
-        }, FAILSAFE_TIMEOUT);
-
-        googletag.cmd.push(function() {
-            googletag.defineSlot('/19968336/header-bid-tag-1', sizes, 'div-1')
-                    .addService(googletag.pubads());
-            googletag.pubads().enableSingleRequest();
-            googletag.enableServices();
-        });
-
-    </script>
-</head>
-<body>
-    <h1>Prebid</h1>
-    <h5>Div-1</h5>
-    <div id='div-1'>
-        <script type='text/javascript'>
-            googletag.cmd.push(function() {
-                googletag.display('div-1');
-            });
-        </script>
-    </div>
-</body>
-</html>
-```
diff --git a/modules/rtdModule/index.js b/modules/rtdModule/index.js
index 3aa7753d204..05594c63132 100644
--- a/modules/rtdModule/index.js
+++ b/modules/rtdModule/index.js
@@ -3,16 +3,50 @@
  * @module modules/realTimeData
  */
 
+/**
+ * @interface UserConsentData
+ */
+/**
+ * @property
+ * @summary gdpr consent
+ * @name UserConsentData#gdpr
+ * @type {Object}
+ */
+/**
+ * @property
+ * @summary usp consent
+ * @name UserConsentData#usp
+ * @type {Object}
+ */
+/**
+ * @property
+ * @summary coppa
+ * @name UserConsentData#coppa
+ * @type {boolean}
+ */
+
 /**
  * @interface RtdSubmodule
  */
 
 /**
- * @function
+ * @function?
  * @summary return real time data
- * @name RtdSubmodule#getData
- * @param {AdUnit[]} adUnits
- * @param {function} onDone
+ * @name RtdSubmodule#getTargetingData
+ * @param {string[]} adUnitsCodes
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ * @param {auction} auction
+ */
+
+/**
+ * @function?
+ * @summary modify bid request data
+ * @name RtdSubmodule#getBidRequestData
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
  */
 
 /**
@@ -23,14 +57,66 @@
  */
 
 /**
- * @interface ModuleConfig
+ * @property
+ * @summary used to link submodule with config
+ * @name RtdSubmodule#config
+ * @type {Object}
  */
 
 /**
- * @property
- * @summary sub module name
- * @name ModuleConfig#name
- * @type {string}
+ * @function
+ * @summary init sub module
+ * @name RtdSubmodule#init
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} user consent
+ * @return {boolean} false to remove sub module
+ */
+
+/**
+ * @function?
+ * @summary on auction init event
+ * @name RtdSubmodule#onAuctionInitEvent
+ * @param {Object} data
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+
+/**
+ * @function?
+ * @summary on auction end event
+ * @name RtdSubmodule#onAuctionEndEvent
+ * @param {Object} data
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+
+/**
+ * @function?
+ * @summary on bid response event
+ * @name RtdSubmodule#onBidResponseEvent
+ * @param {Object} data
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+
+/**
+ * @function?
+ * @summary on bid requested event
+ * @name RtdSubmodule#onBidRequestEvent
+ * @param {Object} data
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+
+/**
+ * @function?
+ * @summary on data deletion request
+ * @name RtdSubmodule#onDataDeletionRequest
+ * @param {SubmoduleConfig} config
+ */
+
+/**
+ * @interface ModuleConfig
  */
 
 /**
@@ -40,136 +126,247 @@
  * @type {number}
  */
 
+/**
+ * @property
+ * @summary list of sub modules
+ * @name ModuleConfig#dataProviders
+ * @type {SubmoduleConfig[]}
+ */
+
+/**
+ * @interface SubModuleConfig
+ */
+
 /**
  * @property
  * @summary params for provide (sub module)
- * @name ModuleConfig#params
+ * @name SubModuleConfig#params
  * @type {Object}
  */
 
 /**
  * @property
- * @summary timeout (if no auction dealy)
- * @name ModuleConfig#timeout
- * @type {number}
+ * @summary name
+ * @name ModuleConfig#name
+ * @type {string}
+ */
+
+/**
+ * @property
+ * @summary delay auction for this sub module
+ * @name ModuleConfig#waitForIt
+ * @type {boolean}
  */
 
-import {getGlobal} from '../../src/prebidGlobal.js';
 import {config} from '../../src/config.js';
-import {targeting} from '../../src/targeting.js';
 import {getHook, module} from '../../src/hook.js';
-import * as utils from '../../src/utils.js';
+import {logError, logInfo, logWarn} from '../../src/utils.js';
+import * as events from '../../src/events.js';
+import CONSTANTS from '../../src/constants.json';
+import adapterManager, {gdprDataHandler, uspDataHandler, gppDataHandler} from '../../src/adapterManager.js';
+import {find} from '../../src/polyfill.js';
+import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
 
 /** @type {string} */
 const MODULE_NAME = 'realTimeData';
-/** @type {number} */
-const DEF_TIMEOUT = 1000;
 /** @type {RtdSubmodule[]} */
-let subModules = [];
+let registeredSubModules = [];
+/** @type {RtdSubmodule[]} */
+export let subModules = [];
 /** @type {ModuleConfig} */
 let _moduleConfig;
+/** @type {SubmoduleConfig[]} */
+let _dataProviders = [];
+/** @type {UserConsentData} */
+let _userConsent;
 
 /**
- * enable submodule in User ID
+ * Register a RTD submodule.
+ *
  * @param {RtdSubmodule} submodule
+ * @returns {function()} a de-registration function that will unregister the module when called.
  */
 export function attachRealTimeDataProvider(submodule) {
-  subModules.push(submodule);
+  registeredSubModules.push(submodule);
+  return function detach() {
+    const idx = registeredSubModules.indexOf(submodule)
+    if (idx >= 0) {
+      registeredSubModules.splice(idx, 1);
+      initSubModules();
+    }
+  }
 }
 
+/**
+ * call each sub module event function by config order
+ */
+const setEventsListeners = (function () {
+  let registered = false;
+  return function setEventsListeners() {
+    if (!registered) {
+      Object.entries({
+        [CONSTANTS.EVENTS.AUCTION_INIT]: ['onAuctionInitEvent'],
+        [CONSTANTS.EVENTS.AUCTION_END]: ['onAuctionEndEvent', getAdUnitTargeting],
+        [CONSTANTS.EVENTS.BID_RESPONSE]: ['onBidResponseEvent'],
+        [CONSTANTS.EVENTS.BID_REQUESTED]: ['onBidRequestEvent']
+      }).forEach(([ev, [handler, preprocess]]) => {
+        events.on(ev, (args) => {
+          preprocess && preprocess(args);
+          subModules.forEach(sm => {
+            try {
+              sm[handler] && sm[handler](args, sm.config, _userConsent)
+            } catch (e) {
+              logError(`RTD provider '${sm.name}': error in '${handler}':`, e);
+            }
+          });
+        })
+      });
+      registered = true;
+    }
+  }
+})();
+
 export function init(config) {
   const confListener = config.getConfig(MODULE_NAME, ({realTimeData}) => {
     if (!realTimeData.dataProviders) {
-      utils.logError('missing parameters for real time module');
+      logError('missing parameters for real time module');
       return;
     }
     confListener(); // unsubscribe config listener
     _moduleConfig = realTimeData;
-    if (typeof (_moduleConfig.auctionDelay) === 'undefined') {
-      _moduleConfig.auctionDelay = 0;
-    }
-    // delay bidding process only if auctionDelay > 0
-    if (!_moduleConfig.auctionDelay > 0) {
-      getHook('bidsBackCallback').before(setTargetsAfterRequestBids);
-    } else {
-      getGlobal().requestBids.before(requestBidsHook);
+    _dataProviders = realTimeData.dataProviders;
+    setEventsListeners();
+    getHook('startAuction').before(setBidRequestsData, 20); // RTD should run before FPD
+    adapterManager.callDataDeletionRequest.before(onDataDeletionRequest);
+    initSubModules();
+  });
+}
+
+function getConsentData() {
+  return {
+    gdpr: gdprDataHandler.getConsentData(),
+    usp: uspDataHandler.getConsentData(),
+    gpp: gppDataHandler.getConsentData(),
+    coppa: !!(config.getConfig('coppa'))
+  }
+}
+
+/**
+ * call each sub module init function by config order
+ * if no init function / init return failure / module not configured - remove it from submodules list
+ */
+function initSubModules() {
+  _userConsent = getConsentData();
+  let subModulesByOrder = [];
+  _dataProviders.forEach(provider => {
+    const sm = find(registeredSubModules, s => s.name === provider.name);
+    const initResponse = sm && sm.init && sm.init(provider, _userConsent);
+    if (initResponse) {
+      subModulesByOrder.push(Object.assign(sm, {config: provider}));
     }
   });
+  subModules = subModulesByOrder;
+  logInfo(`Real time data module enabled, using submodules: ${subModules.map((m) => m.name).join(', ')}`);
 }
 
 /**
- * get data from sub module
- * @param {AdUnit[]} adUnits received from auction
- * @param {function} callback callback function on data received
+ * loop through configured data providers If the data provider has registered getBidRequestData,
+ * call it, providing reqBidsConfigObj, consent data and module params
+ * this allows submodules to modify bidders
+ * @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
  */
-function getProviderData(adUnits, callback) {
-  const callbackExpected = subModules.length;
-  let dataReceived = [];
-  let processDone = false;
-  const dataWaitTimeout = setTimeout(() => {
-    processDone = true;
-    callback(dataReceived);
-  }, _moduleConfig.auctionDelay || _moduleConfig.timeout || DEF_TIMEOUT);
+export const setBidRequestsData = timedAuctionHook('rtd', function setBidRequestsData(fn, reqBidsConfigObj) {
+  _userConsent = getConsentData();
 
+  const relevantSubModules = [];
+  const prioritySubModules = [];
   subModules.forEach(sm => {
-    sm.getData(adUnits, onDataReceived);
+    if (typeof sm.getBidRequestData !== 'function') {
+      return;
+    }
+    relevantSubModules.push(sm);
+    const config = sm.config;
+    if (config && config.waitForIt) {
+      prioritySubModules.push(sm);
+    }
   });
 
-  function onDataReceived(data) {
-    if (processDone) {
-      return
+  const shouldDelayAuction = prioritySubModules.length && _moduleConfig.auctionDelay && _moduleConfig.auctionDelay > 0;
+  let callbacksExpected = prioritySubModules.length;
+  let isDone = false;
+  let waitTimeout;
+
+  if (!relevantSubModules.length) {
+    return exitHook();
+  }
+
+  waitTimeout = setTimeout(exitHook, shouldDelayAuction ? _moduleConfig.auctionDelay : 0);
+
+  relevantSubModules.forEach(sm => {
+    sm.getBidRequestData(reqBidsConfigObj, onGetBidRequestDataCallback.bind(sm), sm.config, _userConsent)
+  });
+
+  function onGetBidRequestDataCallback() {
+    if (isDone) {
+      return;
     }
-    dataReceived.push(data);
-    if (dataReceived.length === callbackExpected) {
-      processDone = true;
-      clearTimeout(dataWaitTimeout);
-      callback(dataReceived);
+    if (this.config && this.config.waitForIt) {
+      callbacksExpected--;
+    }
+    if (callbacksExpected === 0) {
+      setTimeout(exitHook, 0);
     }
   }
-}
 
-/**
- * delete invalid data received from provider
- * this is to ensure working flow for GPT
- * @param {Object} data received from provider
- * @return {Object} valid data for GPT targeting
- */
-export function validateProviderDataForGPT(data) {
-  // data must be an object, contains object with string as value
-  if (typeof data !== 'object') {
-    return {};
-  }
-  for (let key in data) {
-    if (data.hasOwnProperty(key)) {
-      for (let innerKey in data[key]) {
-        if (data[key].hasOwnProperty(innerKey)) {
-          if (typeof data[key][innerKey] !== 'string') {
-            utils.logWarn(`removing ${key}: {${innerKey}:${data[key][innerKey]} } from GPT targeting because of invalid type (must be string)`);
-            delete data[key][innerKey];
-          }
-        }
-      }
+  function exitHook() {
+    if (isDone) {
+      return;
     }
+    isDone = true;
+    clearTimeout(waitTimeout);
+    fn.call(this, reqBidsConfigObj);
   }
-  return data;
-}
+});
 
 /**
- * run hook after bids request and before callback
- * get data from provider and set key values to primary ad server
- * @param {function} next - next hook function
- * @param {AdUnit[]} adUnits received from auction
+ * loop through configured data providers If the data provider has registered getTargetingData,
+ * call it, providing ad unit codes, consent data and module params
+ * the sub mlodle will return data to set on the ad unit
+ * this function used to place key values on primary ad server per ad unit
+ * @param {Object} auction object received on auction end event
  */
-export function setTargetsAfterRequestBids(next, adUnits) {
-  getProviderData(adUnits, (data) => {
-    if (data && Object.keys(data).length) {
-      const _mergedData = deepMerge(data);
-      if (Object.keys(_mergedData).length) {
-        setDataForPrimaryAdServer(_mergedData);
-      }
+export function getAdUnitTargeting(auction) {
+  const relevantSubModules = subModules.filter(sm => typeof sm.getTargetingData === 'function');
+  if (!relevantSubModules.length) {
+    return;
+  }
+
+  // get data
+  const adUnitCodes = auction.adUnitCodes;
+  if (!adUnitCodes) {
+    return;
+  }
+  let targeting = [];
+  for (let i = relevantSubModules.length - 1; i >= 0; i--) {
+    const smTargeting = relevantSubModules[i].getTargetingData(adUnitCodes, relevantSubModules[i].config, _userConsent, auction);
+    if (smTargeting && typeof smTargeting === 'object') {
+      targeting.push(smTargeting);
+    } else {
+      logWarn('invalid getTargetingData response for sub module', relevantSubModules[i].name);
+    }
+  }
+  // place data on auction adUnits
+  const mergedTargeting = deepMerge(targeting);
+  auction.adUnits.forEach(adUnit => {
+    const kv = adUnit.code && mergedTargeting[adUnit.code];
+    if (!kv) {
+      return
     }
-    next(adUnits);
+    logInfo('RTD set ad unit targeting of', kv, 'for', adUnit);
+    adUnit[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = Object.assign(adUnit[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] || {}, kv);
   });
+  return auction.adUnits;
 }
 
 /**
@@ -198,54 +395,18 @@ export function deepMerge(arr) {
   }, {});
 }
 
-/**
- * run hook before bids request
- * get data from provider and set key values to primary ad server & bidders
- * @param {function} fn - hook function
- * @param {Object} reqBidsConfigObj - request bids object
- */
-export function requestBidsHook(fn, reqBidsConfigObj) {
-  getProviderData(reqBidsConfigObj.adUnits || getGlobal().adUnits, (data) => {
-    if (data && Object.keys(data).length) {
-      const _mergedData = deepMerge(data);
-      if (Object.keys(_mergedData).length) {
-        setDataForPrimaryAdServer(_mergedData);
-        addIdDataToAdUnitBids(reqBidsConfigObj.adUnits || getGlobal().adUnits, _mergedData);
+export function onDataDeletionRequest(next, ...args) {
+  subModules.forEach((sm) => {
+    if (typeof sm.onDataDeletionRequest === 'function') {
+      try {
+        sm.onDataDeletionRequest(sm.config);
+      } catch (e) {
+        logError(`Error executing ${sm.name}.onDataDeletionRequest`, e)
       }
     }
-    return fn.call(this, reqBidsConfigObj);
   });
+  next.apply(this, args);
 }
 
-/**
- * set data to primary ad server
- * @param {Object} data - key values to set
- */
-function setDataForPrimaryAdServer(data) {
-  data = validateProviderDataForGPT(data);
-  if (utils.isGptPubadsDefined()) {
-    targeting.setTargetingForGPT(data, null)
-  } else {
-    window.googletag = window.googletag || {};
-    window.googletag.cmd = window.googletag.cmd || [];
-    window.googletag.cmd.push(() => {
-      targeting.setTargetingForGPT(data, null);
-    });
-  }
-}
-
-/**
- * @param {AdUnit[]} adUnits
- *  @param {Object} data - key values to set
- */
-function addIdDataToAdUnitBids(adUnits, data) {
-  adUnits.forEach(adUnit => {
-    adUnit.bids = adUnit.bids.map(bid => {
-      const rd = data[adUnit.code] || {};
-      return Object.assign(bid, {realTimeData: rd});
-    })
-  });
-}
-
-init(config);
 module('realTimeData', attachRealTimeDataProvider);
+init(config);
diff --git a/modules/rtdModule/provider.md b/modules/rtdModule/provider.md
index fb42e7188d3..116db160238 100644
--- a/modules/rtdModule/provider.md
+++ b/modules/rtdModule/provider.md
@@ -1,27 +1,33 @@
 New provider must include the following:
 
-1. sub module object:
-```
-export const subModuleName = {
-  name: String,
-  getData: Function <Promise>
-};
-```
+1. sub module object with the following keys:
 
-2. Function that returns the real time data according to the following structure:
-```
+|  param name | type  | Scope | Description | Params |
+| :------------ | :------------ | :------ | :------ | :------ |
+| name  | string  | required | must match the name provided by the publisher in the on-page config | n/a |
+|  init | function | required | defines the function that does any auction-level initialization required | config, userConsent |
+|  getTargetingData  | function | optional | defines a function that provides ad server targeting data to RTD-core | adUnitArray, config, userConsent |
+|  getBidRequestData  | function | optional | defines a function that provides ad server targeting data to RTD-core | reqBidsConfigObj, callback, config, userConsent  |
+|  onAuctionInitEvent | function | optional | listens to the AUCTION_INIT event and calls a sub-module function that lets it inspect and/or update the auction | auctionDetails, config, userConsent |
+|  onAuctionEndEvent | function |optional | listens to the AUCTION_END event and calls a sub-module function that lets it know when auction is done | auctionDetails, config, userConsent |
+|  onBidResponseEvent | function |optional | listens to the BID_RESPONSE event and calls a sub-module function that lets it know when a bid response has been collected | bidResponse, config, userConsent |
+
+2. `getTargetingData` function (if defined) should return ad unit targeting data according to the following structure:
+```json
 {
   "adUnitCode":{
       "key":"value",
       "key2":"value"
   },
   "adUnitCode2":{
-      "dataKey":"dataValue",
+      "dataKey":"dataValue"
   }
 }
 ``` 
 
 3. Hook to Real Time Data module:
-```
+```javascript
 submodule('realTimeData', subModuleName);
 ```
+
+4. See detailed documentation [here](https://docs.prebid.org/dev-docs/add-rtd-submodule.html)
diff --git a/modules/rtdModule/realTimeData.md b/modules/rtdModule/realTimeData.md
deleted file mode 100644
index b2859098b1f..00000000000
--- a/modules/rtdModule/realTimeData.md
+++ /dev/null
@@ -1,32 +0,0 @@
-## Real Time Data Configuration Example 
-
-Example showing config using `browsi` sub module
-```
-    pbjs.setConfig({
-        "realTimeData": {
-            "auctionDelay": 1000,
-            dataProviders[{
-                "name": "browsi",
-                "params": {
-                    "url": "testUrl.com",
-                    "siteKey": "testKey",
-                    "pubKey": "testPub",
-                    "keyName":"bv"
-                }  
-            }]
-        }
-    });
-```    
-
-Example showing real time data object received form `browsi` real time data provider
-```
-{
-  "adUnitCode":{
-      "key":"value",
-      "key2":"value"
-  },
-  "adUnitCode2":{
-      "dataKey":"dataValue",
-  }
-}
-```   
diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 00ad14dd316..76043b71c64 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -1,11 +1,28 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import { generateUUID, mergeDeep, deepAccess, parseUrl, logError, pick, isEmpty, logWarn, debugTurnedOn, parseQS, getWindowLocation, isAdUnitCodeMatchingSlot, isNumber, isGptPubadsDefined, _each, deepSetValue, deepClone, logInfo } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
-import * as utils from '../src/utils.js';
 import { getGlobal } from '../src/prebidGlobal.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const RUBICON_GVL_ID = 52;
+export const storage = getStorageManager({gvlid: RUBICON_GVL_ID, moduleName: 'rubicon'});
+const COOKIE_NAME = 'rpaSession';
+const LAST_SEEN_EXPIRE_TIME = 1800000; // 30 mins
+const END_EXPIRE_TIME = 21600000; // 6 hours
+const MODULE_NAME = 'Rubicon Analytics';
+
+const pbsErrorMap = {
+  1: 'timeout-error',
+  2: 'input-error',
+  3: 'connect-error',
+  4: 'request-error',
+  999: 'generic-error'
+}
 
+let prebidGlobal = getGlobal();
 const {
   EVENTS: {
     AUCTION_INIT,
@@ -15,7 +32,8 @@ const {
     BIDDER_DONE,
     BID_TIMEOUT,
     BID_WON,
-    SET_TARGETING
+    SET_TARGETING,
+    BILLABLE_EVENT
   },
   STATUS: {
     GOOD,
@@ -27,7 +45,7 @@ const {
 } = CONSTANTS;
 
 let serverConfig;
-config.getConfig('s2sConfig', ({s2sConfig}) => {
+config.getConfig('s2sConfig', ({ s2sConfig }) => {
   serverConfig = s2sConfig;
 });
 
@@ -38,13 +56,40 @@ const cache = {
   auctions: {},
   targeting: {},
   timeouts: {},
+  gpt: {},
+  billing: {}
 };
 
+const BID_REJECTED_IPF = 'rejected-ipf';
+
+export let rubiConf;
+export const resetRubiConf = () => {
+  rubiConf = {
+    pvid: generateUUID().slice(0, 8),
+    analyticsEventDelay: 0,
+    dmBilling: {
+      enabled: false,
+      vendors: [],
+      waitForAuction: true
+    }
+  }
+}
+resetRubiConf();
+
+// we are saving these as global to this module so that if a pub accidentally overwrites the entire
+// rubicon object, then we do not lose other data
+config.getConfig('rubicon', config => {
+  mergeDeep(rubiConf, config.rubicon);
+  if (deepAccess(config, 'rubicon.updatePageView') === true) {
+    rubiConf.pvid = generateUUID().slice(0, 8)
+  }
+});
+
 export function getHostNameFromReferer(referer) {
   try {
-    rubiconAdapter.referrerHostname = utils.parseUrl(referer, {noDecodeWholeURL: true}).hostname;
+    rubiconAdapter.referrerHostname = parseUrl(referer, { noDecodeWholeURL: true }).hostname;
   } catch (e) {
-    utils.logError('Rubicon Analytics: Unable to parse hostname from supplied url: ', referer, e);
+    logError(`${MODULE_NAME}: Unable to parse hostname from supplied url: `, referer, e);
     rubiconAdapter.referrerHostname = '';
   }
   return rubiconAdapter.referrerHostname
@@ -58,7 +103,7 @@ function stringProperties(obj) {
     } else if (typeof value !== 'string') {
       value = String(value);
     }
-    newObj[prop] = value;
+    newObj[prop] = value || undefined;
     return newObj;
   }, {});
 }
@@ -83,41 +128,93 @@ function formatSource(src) {
   return src.toLowerCase();
 }
 
-function sendMessage(auctionId, bidWonId) {
+function getBillingPayload(event) {
+  let billingEvent = deepClone(event);
+  // Pass along type if is string and not empty else general
+  billingEvent.type = (typeof event.type === 'string' && event.type) || 'general';
+  billingEvent.accountId = accountId;
+  // mark as sent
+  deepSetValue(cache.billing, `${event.vendor}.${event.billingId}`, true);
+  return billingEvent;
+}
+
+function sendBillingEvent(event) {
+  let message = getBasicEventDetails(undefined, 'soloBilling');
+  message.billableEvents = [getBillingPayload(event)];
+  ajax(
+    rubiconAdapter.getUrl(),
+    null,
+    JSON.stringify(message),
+    {
+      contentType: 'application/json'
+    }
+  );
+}
+
+function getBasicEventDetails(auctionId, trigger) {
+  let auctionCache = cache.auctions[auctionId];
+  let referrer = pageReferer || (auctionCache && auctionCache.referrer);
+  let message = {
+    timestamps: {
+      prebidLoaded: rubiconAdapter.MODULE_INITIALIZED_TIME,
+      auctionEnded: auctionCache ? auctionCache.endTs : undefined,
+      eventTime: Date.now()
+    },
+    trigger,
+    integration: rubiConf.int_type || DEFAULT_INTEGRATION,
+    version: '$prebid.version$',
+    referrerUri: referrer,
+    referrerHostname: rubiconAdapter.referrerHostname || getHostNameFromReferer(referrer),
+    channel: 'web',
+  };
+  if (rubiConf.wrapperName) {
+    message.wrapper = {
+      name: rubiConf.wrapperName,
+      family: rubiConf.wrapperFamily,
+      rule: rubiConf.rule_name
+    }
+  }
+  return message;
+}
+
+function sendMessage(auctionId, bidWonId, trigger) {
   function formatBid(bid) {
-    return utils.pick(bid, [
+    return pick(bid, [
       'bidder',
-      'bidId', bidId => utils.deepAccess(bid, 'bidResponse.pbsBidId') || utils.deepAccess(bid, 'bidResponse.seatBidId') || bidId,
+      'bidderDetail',
+      'bidId', bidId => deepAccess(bid, 'bidResponse.pbsBidId') || deepAccess(bid, 'bidResponse.seatBidId') || bidId,
       'status',
       'error',
       'source', (source, bid) => {
         if (source) {
           return source;
         }
-        return serverConfig && Array.isArray(serverConfig.bidders) && serverConfig.bidders.indexOf(bid.bidder) !== -1
+        return serverConfig && Array.isArray(serverConfig.bidders) && serverConfig.bidders.some(s2sBidder => s2sBidder.toLowerCase() === bid.bidder) !== -1
           ? 'server' : 'client'
       },
       'clientLatencyMillis',
       'serverLatencyMillis',
       'params',
-      'bidResponse', bidResponse => bidResponse ? utils.pick(bidResponse, [
+      'bidResponse', bidResponse => bidResponse ? pick(bidResponse, [
         'bidPriceUSD',
         'dealId',
         'dimensions',
         'mediaType',
         'floorValue',
-        'floorRule'
+        'floorRuleValue',
+        'floorRule',
+        'adomains'
       ]) : undefined
     ]);
   }
   function formatBidWon(bid) {
-    return Object.assign(formatBid(bid), utils.pick(bid.adUnit, [
+    return Object.assign(formatBid(bid), pick(bid.adUnit, [
       'adUnitCode',
       'transactionId',
       'videoAdFormat', () => bid.videoAdFormat,
       'mediaTypes'
     ]), {
-      adserverTargeting: stringProperties(cache.targeting[bid.adUnit.adUnitCode] || {}),
+      adserverTargeting: !isEmpty(cache.targeting[bid.adUnit.adUnitCode]) ? stringProperties(cache.targeting[bid.adUnit.adUnitCode]) : undefined,
       bidwonStatus: 'success', // hard-coded for now
       accountId,
       siteId: bid.siteId,
@@ -125,31 +222,23 @@ function sendMessage(auctionId, bidWonId) {
       samplingFactor
     });
   }
+  let message = getBasicEventDetails(auctionId, trigger);
   let auctionCache = cache.auctions[auctionId];
-  let referrer = config.getConfig('pageUrl') || auctionCache.referrer;
-  let message = {
-    eventTimeMillis: Date.now(),
-    integration: config.getConfig('rubicon.int_type') || DEFAULT_INTEGRATION,
-    version: '$prebid.version$',
-    referrerUri: referrer,
-    referrerHostname: rubiconAdapter.referrerHostname || getHostNameFromReferer(referrer)
-  };
-  const wrapperName = config.getConfig('rubicon.wrapperName');
-  if (wrapperName) {
-    message.wrapperName = wrapperName;
-  }
   if (auctionCache && !auctionCache.sent) {
     let adUnitMap = Object.keys(auctionCache.bids).reduce((adUnits, bidId) => {
       let bid = auctionCache.bids[bidId];
       let adUnit = adUnits[bid.adUnit.adUnitCode];
       if (!adUnit) {
-        adUnit = adUnits[bid.adUnit.adUnitCode] = utils.pick(bid.adUnit, [
+        adUnit = adUnits[bid.adUnit.adUnitCode] = pick(bid.adUnit, [
           'adUnitCode',
           'transactionId',
           'mediaTypes',
           'dimensions',
-          'adserverTargeting', () => stringProperties(cache.targeting[bid.adUnit.adUnitCode] || {}),
-          'adSlot'
+          'adserverTargeting', () => !isEmpty(cache.targeting[bid.adUnit.adUnitCode]) ? stringProperties(cache.targeting[bid.adUnit.adUnitCode]) : undefined,
+          'gam', gam => !isEmpty(gam) ? gam : undefined,
+          'pbAdSlot',
+          'gpid',
+          'pattern'
         ]);
         adUnit.bids = [];
         adUnit.status = 'no-bid'; // default it to be no bid
@@ -157,10 +246,10 @@ function sendMessage(auctionId, bidWonId) {
 
       // Add site and zone id if not there and if we found a rubicon bidder
       if ((!adUnit.siteId || !adUnit.zoneId) && rubiconAliases.indexOf(bid.bidder) !== -1) {
-        if (utils.deepAccess(bid, 'params.accountId') == accountId) {
+        if (deepAccess(bid, 'params.accountId') == accountId) {
           adUnit.accountId = parseInt(accountId);
-          adUnit.siteId = parseInt(utils.deepAccess(bid, 'params.siteId'));
-          adUnit.zoneId = parseInt(utils.deepAccess(bid, 'params.zoneId'));
+          adUnit.siteId = parseInt(deepAccess(bid, 'params.siteId'));
+          adUnit.zoneId = parseInt(deepAccess(bid, 'params.zoneId'));
         }
       }
 
@@ -183,33 +272,77 @@ function sendMessage(auctionId, bidWonId) {
     // This allows the bidWon events to have these params even in the case of a delayed render
     Object.keys(auctionCache.bids).forEach(function (bidId) {
       let adCode = auctionCache.bids[bidId].adUnit.adUnitCode;
-      Object.assign(auctionCache.bids[bidId], utils.pick(adUnitMap[adCode], ['accountId', 'siteId', 'zoneId']));
+      Object.assign(auctionCache.bids[bidId], pick(adUnitMap[adCode], ['accountId', 'siteId', 'zoneId']));
     });
 
     let auction = {
       clientTimeoutMillis: auctionCache.timeout,
+      auctionStart: auctionCache.timestamp,
+      auctionEnd: auctionCache.endTs,
+      bidderOrder: auctionCache.bidderOrder,
       samplingFactor,
       accountId,
-      adUnits: Object.keys(adUnitMap).map(i => adUnitMap[i])
+      adUnits: Object.keys(adUnitMap).map(i => adUnitMap[i]),
+      requestId: auctionId
     };
 
     // pick our of top level floor data we want to send!
     if (auctionCache.floorData) {
-      auction.floors = utils.pick(auctionCache.floorData, [
-        'location',
-        'modelName', () => auctionCache.floorData.modelVersion,
-        'skipped',
-        'enforcement', () => utils.deepAccess(auctionCache.floorData, 'enforcements.enforceJS'),
-        'dealsEnforced', () => utils.deepAccess(auctionCache.floorData, 'enforcements.floorDeals'),
-        'skipRate', skipRate => !isNaN(skipRate) ? skipRate : 0,
-        'fetchStatus'
+      if (auctionCache.floorData.location === 'noData') {
+        auction.floors = pick(auctionCache.floorData, [
+          'location',
+          'fetchStatus',
+          'floorProvider as provider'
+        ]);
+      } else {
+        auction.floors = pick(auctionCache.floorData, [
+          'location',
+          'modelVersion as modelName',
+          'modelWeight',
+          'modelTimestamp',
+          'skipped',
+          'enforcement', () => deepAccess(auctionCache.floorData, 'enforcements.enforceJS'),
+          'dealsEnforced', () => deepAccess(auctionCache.floorData, 'enforcements.floorDeals'),
+          'skipRate',
+          'fetchStatus',
+          'floorMin',
+          'floorProvider as provider'
+        ]);
+      }
+    }
+
+    // gather gdpr info
+    if (auctionCache.gdprConsent) {
+      auction.gdpr = pick(auctionCache.gdprConsent, [
+        'gdprApplies as applies',
+        'consentString',
+        'apiVersion as version'
       ]);
     }
 
+    // gather session info
+    if (auctionCache.session) {
+      message.session = pick(auctionCache.session, [
+        'id',
+        'pvid',
+        'start',
+        'expires'
+      ]);
+      if (!isEmpty(auctionCache.session.fpkvs)) {
+        message.fpkvs = Object.keys(auctionCache.session.fpkvs).map(key => {
+          return { key, value: auctionCache.session.fpkvs[key] };
+        });
+      }
+    }
+
     if (serverConfig) {
       auction.serverTimeoutMillis = serverConfig.timeout;
     }
 
+    if (auctionCache.userIds.length) {
+      auction.user = { ids: auctionCache.userIds };
+    }
+
     message.auctions = [auction];
 
     let bidsWon = Object.keys(auctionCache.bidsWon).reduce((memo, adUnitCode) => {
@@ -231,6 +364,12 @@ function sendMessage(auctionId, bidWonId) {
     ];
   }
 
+  // if we have not sent any billingEvents send them
+  const pendingBillingEvents = getPendingBillingEvents(auctionCache);
+  if (pendingBillingEvents && pendingBillingEvents.length) {
+    message.billableEvents = pendingBillingEvents;
+  }
+
   ajax(
     this.getUrl(),
     null,
@@ -241,11 +380,26 @@ function sendMessage(auctionId, bidWonId) {
   );
 }
 
+function getPendingBillingEvents(auctionCache) {
+  if (auctionCache && auctionCache.billing && auctionCache.billing.length) {
+    return auctionCache.billing.reduce((accum, billingEvent) => {
+      if (deepAccess(cache.billing, `${billingEvent.vendor}.${billingEvent.billingId}`) === false) {
+        accum.push(getBillingPayload(billingEvent));
+      }
+      return accum;
+    }, []);
+  }
+}
+
+function adUnitIsOnlyInstream(adUnit) {
+  return adUnit.mediaTypes && Object.keys(adUnit.mediaTypes).length === 1 && deepAccess(adUnit, 'mediaTypes.video.context') === 'instream';
+}
+
 function getBidPrice(bid) {
   // get the cpm from bidResponse
   let cpm;
   let currency;
-  if (bid.status === BID_REJECTED && utils.deepAccess(bid, 'floorData.cpmAfterAdjustments')) {
+  if (bid.status === BID_REJECTED && deepAccess(bid, 'floorData.cpmAfterAdjustments')) {
     // if bid was rejected and bid.floorData.cpmAfterAdjustments use it
     cpm = bid.floorData.cpmAfterAdjustments;
     currency = bid.floorData.floorCurrency;
@@ -263,9 +417,9 @@ function getBidPrice(bid) {
   }
   // otherwise we convert and return
   try {
-    return Number(getGlobal().convertCurrency(cpm, currency, 'USD'));
+    return Number(prebidGlobal.convertCurrency(cpm, currency, 'USD'));
   } catch (err) {
-    utils.logWarn('Rubicon Analytics Adapter: Could not determine the bidPriceUSD of the bid ', bid);
+    logWarn(`${MODULE_NAME}: Could not determine the bidPriceUSD of the bid `, bid);
   }
 }
 
@@ -276,21 +430,61 @@ export function parseBidResponse(bid, previousBidResponse) {
   if (previousBidResponse && previousBidResponse.bidPriceUSD > responsePrice) {
     return previousBidResponse;
   }
-  return utils.pick(bid, [
+  return pick(bid, [
     'bidPriceUSD', () => responsePrice,
     'dealId',
     'status',
     'mediaType',
-    'dimensions', () => utils.pick(bid, [
-      'width',
-      'height'
-    ]),
-    'seatBidId',
-    'floorValue', () => utils.deepAccess(bid, 'floorData.floorValue'),
-    'floorRule', () => utils.debugTurnedOn() ? utils.deepAccess(bid, 'floorData.floorRule') : undefined
+    'dimensions', () => {
+      const width = bid.width || bid.playerWidth;
+      const height = bid.height || bid.playerHeight;
+      return (width && height) ? { width, height } : undefined;
+    },
+    // Handling use case where pbs sends back 0 or '0' bidIds
+    'pbsBidId', pbsBidId => pbsBidId == 0 ? generateUUID() : pbsBidId,
+    'seatBidId', seatBidId => seatBidId == 0 ? generateUUID() : seatBidId,
+    'floorValue', () => deepAccess(bid, 'floorData.floorValue'),
+    'floorRuleValue', () => deepAccess(bid, 'floorData.floorRuleValue'),
+    'floorRule', () => debugTurnedOn() ? deepAccess(bid, 'floorData.floorRule') : undefined,
+    'adomains', () => {
+      const adomains = deepAccess(bid, 'meta.advertiserDomains');
+      const validAdomains = Array.isArray(adomains) && adomains.filter(domain => typeof domain === 'string');
+      return validAdomains && validAdomains.length > 0 ? validAdomains.slice(0, 10) : undefined
+    }
   ]);
 }
 
+/*
+  Filters and converts URL Params into an object and returns only KVs that match the 'utm_KEY' format
+*/
+function getUtmParams() {
+  let search;
+
+  try {
+    search = parseQS(getWindowLocation().search);
+  } catch (e) {
+    search = {};
+  }
+
+  return Object.keys(search).reduce((accum, param) => {
+    if (param.match(/utm_/)) {
+      accum[param.replace(/utm_/, '')] = search[param];
+    }
+    return accum;
+  }, {});
+}
+
+function getFpkvs() {
+  rubiConf.fpkvs = Object.assign((rubiConf.fpkvs || {}), getUtmParams());
+
+  // convert all values to strings
+  Object.keys(rubiConf.fpkvs).forEach(key => {
+    rubiConf.fpkvs[key] = rubiConf.fpkvs[key] + '';
+  });
+
+  return rubiConf.fpkvs;
+}
+
 let samplingFactor = 1;
 let accountId;
 // List of known rubicon aliases
@@ -309,8 +503,124 @@ function setRubiconAliases(aliasRegistry) {
   });
 }
 
-let baseAdapter = adapter({analyticsType: 'endpoint'});
+function getRpaCookie() {
+  let encodedCookie = storage.getDataFromLocalStorage(COOKIE_NAME);
+  if (encodedCookie) {
+    try {
+      return JSON.parse(window.atob(encodedCookie));
+    } catch (e) {
+      logError(`${MODULE_NAME}: Unable to decode ${COOKIE_NAME} value: `, e);
+    }
+  }
+  return {};
+}
+
+function setRpaCookie(decodedCookie) {
+  try {
+    storage.setDataInLocalStorage(COOKIE_NAME, window.btoa(JSON.stringify(decodedCookie)));
+  } catch (e) {
+    logError(`${MODULE_NAME}: Unable to encode ${COOKIE_NAME} value: `, e);
+  }
+}
+
+function updateRpaCookie() {
+  const currentTime = Date.now();
+  let decodedRpaCookie = getRpaCookie();
+  if (
+    !Object.keys(decodedRpaCookie).length ||
+    (currentTime - decodedRpaCookie.lastSeen) > LAST_SEEN_EXPIRE_TIME ||
+    decodedRpaCookie.expires < currentTime
+  ) {
+    decodedRpaCookie = {
+      id: generateUUID(),
+      start: currentTime,
+      expires: currentTime + END_EXPIRE_TIME, // six hours later,
+    }
+  }
+  // possible that decodedRpaCookie is undefined, and if it is, we probably are blocked by storage or some other exception
+  if (Object.keys(decodedRpaCookie).length) {
+    decodedRpaCookie.lastSeen = currentTime;
+    decodedRpaCookie.fpkvs = { ...decodedRpaCookie.fpkvs, ...getFpkvs() };
+    decodedRpaCookie.pvid = rubiConf.pvid;
+    setRpaCookie(decodedRpaCookie)
+  }
+  return decodedRpaCookie;
+}
+
+function subscribeToGamSlots() {
+  window.googletag.pubads().addEventListener('slotRenderEnded', event => {
+    const isMatchingAdSlot = isAdUnitCodeMatchingSlot(event.slot);
+    // loop through auctions and adUnits and mark the info
+    // only mark first auction which finds a match
+    let hasMatch = false;
+    Object.keys(cache.auctions).find(auctionId => {
+      (Object.keys(cache.auctions[auctionId].bids) || []).forEach(bidId => {
+        let bid = cache.auctions[auctionId].bids[bidId];
+        // if this slot matches this bids adUnit, add the adUnit info
+        // only mark it if it already has not been marked
+        if (!bid.adUnit.gamRendered && isMatchingAdSlot(bid.adUnit.adUnitCode)) {
+          // mark this adUnit as having been rendered by gam
+          cache.auctions[auctionId].gamHasRendered[bid.adUnit.adUnitCode] = true;
+
+          // this current auction has an adunit that matched the slot, so mark it as matched so next auciton is skipped
+          hasMatch = true;
+
+          bid.adUnit.gam = pick(event, [
+            // these come in as `null` from Gpt, which when stringified does not get removed
+            // so set explicitly to undefined when not a number
+            'advertiserId', advertiserId => isNumber(advertiserId) ? advertiserId : undefined,
+            'creativeId', creativeId => isNumber(event.sourceAgnosticCreativeId) ? event.sourceAgnosticCreativeId : isNumber(creativeId) ? creativeId : undefined,
+            'lineItemId', lineItemId => isNumber(event.sourceAgnosticLineItemId) ? event.sourceAgnosticLineItemId : isNumber(lineItemId) ? lineItemId : undefined,
+            'adSlot', () => event.slot.getAdUnitPath(),
+            'isSlotEmpty', () => event.isEmpty || undefined
+          ]);
+
+          // this lets us know next iteration not to check this bids adunit
+          bid.adUnit.gamRendered = true;
+        }
+      });
+      // Now if all adUnits have gam rendered, send the payload
+      if (rubiConf.waitForGamSlots && !cache.auctions[auctionId].sent && Object.keys(cache.auctions[auctionId].gamHasRendered).every(adUnitCode => cache.auctions[auctionId].gamHasRendered[adUnitCode])) {
+        clearTimeout(cache.timeouts[auctionId]);
+        delete cache.timeouts[auctionId];
+        if (rubiConf.analyticsEventDelay > 0) {
+          setTimeout(() => sendMessage.call(rubiconAdapter, auctionId, undefined, 'delayedGam'), rubiConf.analyticsEventDelay)
+        } else {
+          sendMessage.call(rubiconAdapter, auctionId, undefined, 'gam')
+        }
+      }
+      return hasMatch;
+    });
+  });
+}
+
+let pageReferer;
+
+const isBillingEventValid = event => {
+  // vendor is whitelisted
+  const isWhitelistedVendor = rubiConf.dmBilling.vendors.includes(event.vendor);
+  // event is not duplicated
+  const isNotDuplicate = typeof deepAccess(cache.billing, `${event.vendor}.${event.billingId}`) !== 'boolean';
+  // billingId is defined and a string
+  return typeof event.billingId === 'string' && isWhitelistedVendor && isNotDuplicate;
+}
+
+const sendOrAddEventToQueue = event => {
+  // if any auction is not sent yet, then add it to the auction queue
+  const pendingAuction = Object.keys(cache.auctions).find(auctionId => !cache.auctions[auctionId].sent);
+
+  if (rubiConf.dmBilling.waitForAuction && pendingAuction) {
+    cache.auctions[pendingAuction].billing = cache.auctions[pendingAuction].billing || [];
+    cache.auctions[pendingAuction].billing.push(event);
+  } else {
+    // send it
+    sendBillingEvent(event);
+  }
+}
+
+let baseAdapter = adapter({ analyticsType: 'endpoint' });
 let rubiconAdapter = Object.assign({}, baseAdapter, {
+  MODULE_INITIALIZED_TIME: Date.now(),
   referrerHostname: '',
   enableAnalytics(config = {}) {
     let error = false;
@@ -323,7 +633,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
       if (config.options.endpoint) {
         this.getUrl = () => config.options.endpoint;
       } else {
-        utils.logError('required endpoint missing from rubicon analytics');
+        logError(`${MODULE_NAME}: required endpoint missing`);
         error = true;
       }
       if (typeof config.options.sampling !== 'undefined') {
@@ -331,7 +641,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
       }
       if (typeof config.options.samplingFactor !== 'undefined') {
         if (typeof config.options.sampling !== 'undefined') {
-          utils.logWarn('Both options.samplingFactor and options.sampling enabled in rubicon analytics, defaulting to samplingFactor');
+          logWarn(`${MODULE_NAME}: Both options.samplingFactor and options.sampling enabled defaulting to samplingFactor`);
         }
         samplingFactor = parseFloat(config.options.samplingFactor);
         config.options.sampling = 1 / samplingFactor;
@@ -341,10 +651,10 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
     let validSamplingFactors = [1, 10, 20, 40, 100];
     if (validSamplingFactors.indexOf(samplingFactor) === -1) {
       error = true;
-      utils.logError('invalid samplingFactor for rubicon analytics: ' + samplingFactor + ', must be one of ' + validSamplingFactors.join(', '));
+      logError(`${MODULE_NAME}: invalid samplingFactor ${samplingFactor} - must be one of ${validSamplingFactors.join(', ')}`);
     } else if (!accountId) {
       error = true;
-      utils.logError('required accountId missing for rubicon analytics');
+      logError(`${MODULE_NAME}: required accountId missing for rubicon analytics`);
     }
 
     if (!error) {
@@ -353,41 +663,70 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
   },
   disableAnalytics() {
     this.getUrl = baseAdapter.getUrl;
-    accountId = null;
+    accountId = undefined;
+    rubiConf = {};
+    cache.gpt.registered = false;
+    cache.billing = {};
     baseAdapter.disableAnalytics.apply(this, arguments);
   },
-  track({eventType, args}) {
+  track({ eventType, args }) {
     switch (eventType) {
       case AUCTION_INIT:
         // set the rubicon aliases
         setRubiconAliases(adapterManager.aliasRegistry);
-        let cacheEntry = utils.pick(args, [
+        let cacheEntry = pick(args, [
           'timestamp',
           'timeout'
         ]);
         cacheEntry.bids = {};
         cacheEntry.bidsWon = {};
-        cacheEntry.referrer = args.bidderRequests[0].refererInfo.referer;
-        if (utils.deepAccess(args, 'bidderRequests.0.bids.0.floorData')) {
-          cacheEntry.floorData = {...utils.deepAccess(args, 'bidderRequests.0.bids.0.floorData')};
+        cacheEntry.gamHasRendered = {};
+        // TODO: is 'page' the right value here?
+        cacheEntry.referrer = pageReferer = deepAccess(args, 'bidderRequests.0.refererInfo.page');
+        cacheEntry.bidderOrder = [];
+        const floorData = deepAccess(args, 'bidderRequests.0.bids.0.floorData');
+        if (floorData) {
+          cacheEntry.floorData = { ...floorData };
         }
+        cacheEntry.gdprConsent = deepAccess(args, 'bidderRequests.0.gdprConsent');
+        cacheEntry.session = storage.localStorageIsEnabled() && updateRpaCookie();
+        cacheEntry.userIds = Object.keys(deepAccess(args, 'bidderRequests.0.bids.0.userId', {})).map(id => {
+          return { provider: id, hasId: true }
+        });
         cache.auctions[args.auctionId] = cacheEntry;
+        // register to listen to gpt events if not done yet
+        if (!cache.gpt.registered && isGptPubadsDefined()) {
+          subscribeToGamSlots();
+          cache.gpt.registered = true;
+        } else if (!cache.gpt.registered) {
+          cache.gpt.registered = true;
+          window.googletag = window.googletag || {};
+          window.googletag.cmd = window.googletag.cmd || [];
+          window.googletag.cmd.push(function () {
+            subscribeToGamSlots();
+          });
+        }
         break;
       case BID_REQUESTED:
+        cache.auctions[args.auctionId].bidderOrder.push(args.bidderCode);
         Object.assign(cache.auctions[args.auctionId].bids, args.bids.reduce((memo, bid) => {
           // mark adUnits we expect bidWon events for
           cache.auctions[args.auctionId].bidsWon[bid.adUnitCode] = false;
 
-          memo[bid.bidId] = utils.pick(bid, [
+          if (rubiConf.waitForGamSlots && !adUnitIsOnlyInstream(bid)) {
+            cache.auctions[args.auctionId].gamHasRendered[bid.adUnitCode] = false;
+          }
+
+          memo[bid.bidId] = pick(bid, [
             'bidder', bidder => bidder.toLowerCase(),
             'bidId',
             'status', () => 'no-bid', // default a bid to no-bid until response is recieved or bid is timed out
-            'finalSource as source',
+            'source', () => formatSource(bid.src),
             'params', (params, bid) => {
               switch (bid.bidder) {
                 // specify bidder params we want here
                 case 'rubicon':
-                  return utils.pick(params, [
+                  return pick(params, [
                     'accountId',
                     'siteId',
                     'zoneId'
@@ -403,9 +742,9 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
                   204: 'mid-roll',
                   205: 'post-roll',
                   207: 'vertical'
-                })[utils.deepAccess(bid, 'params.video.size_id')];
+                })[deepAccess(bid, 'params.video.size_id')];
               } else {
-                let startdelay = parseInt(utils.deepAccess(bid, 'params.video.startdelay'), 10);
+                let startdelay = parseInt(deepAccess(bid, 'params.video.startdelay'), 10);
                 if (!isNaN(startdelay)) {
                   if (startdelay > 0) {
                     return 'mid-roll';
@@ -418,7 +757,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
                 }
               }
             },
-            'adUnit', () => utils.pick(bid, [
+            'adUnit', () => pick(bid, [
               'adUnitCode',
               'transactionId',
               'sizes as dimensions', sizes => sizes.map(sizeToDimensions),
@@ -432,7 +771,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
                 if (typeof types === 'object') {
                   if (!bid.sizes) {
                     bid.dimensions = [];
-                    utils._each(types, (type) =>
+                    _each(types, (type) =>
                       bid.dimensions = bid.dimensions.concat(
                         type.sizes.map(sizeToDimensions)
                       )
@@ -442,6 +781,14 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
                 }
                 return ['banner'];
               },
+              'gam', () => {
+                if (deepAccess(bid, 'ortb2Imp.ext.data.adserver.name') === 'gam') {
+                  return { adSlot: bid.ortb2Imp.ext.data.adserver.adslot }
+                }
+              },
+              'pbAdSlot', () => deepAccess(bid, 'ortb2Imp.ext.data.pbadslot'),
+              'pattern', () => deepAccess(bid, 'ortb2Imp.ext.data.aupname'),
+              'gpid', () => deepAccess(bid, 'ortb2Imp.ext.gpid')
             ])
           ]);
           return memo;
@@ -449,17 +796,24 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         break;
       case BID_RESPONSE:
         let auctionEntry = cache.auctions[args.auctionId];
+
+        if (!auctionEntry.bids[args.requestId] && args.originalRequestId) {
+          auctionEntry.bids[args.requestId] = { ...auctionEntry.bids[args.originalRequestId] };
+          auctionEntry.bids[args.requestId].bidId = args.requestId;
+          auctionEntry.bids[args.requestId].bidderDetail = args.targetingBidder;
+        }
+
         let bid = auctionEntry.bids[args.requestId];
         // If floor resolved gptSlot but we have not yet, then update the adUnit to have the adSlot name
-        if (!utils.deepAccess(bid, 'adUnit.adSlot') && utils.deepAccess(args, 'floorData.matchedFields.gptSlot')) {
-          bid.adUnit.adSlot = args.floorData.matchedFields.gptSlot;
+        if (!deepAccess(bid, 'adUnit.gam.adSlot') && deepAccess(args, 'floorData.matchedFields.gptSlot')) {
+          deepSetValue(bid, 'adUnit.gam.adSlot', args.floorData.matchedFields.gptSlot);
         }
         // if we have not set enforcements yet set it
-        if (!utils.deepAccess(auctionEntry, 'floorData.enforcements') && utils.deepAccess(args, 'floorData.enforcements')) {
-          auctionEntry.floorData.enforcements = {...args.floorData.enforcements};
+        if (!deepAccess(auctionEntry, 'floorData.enforcements') && deepAccess(args, 'floorData.enforcements')) {
+          auctionEntry.floorData.enforcements = { ...args.floorData.enforcements };
         }
         if (!bid) {
-          utils.logError('Rubicon Anlytics Adapter Error: Could not find associated bid request for bid response with requestId: ', args.requestId);
+          logError(`${MODULE_NAME}: Could not find associated bid request for bid response with requestId: `, args.requestId);
           break;
         }
         bid.source = formatSource(bid.source || args.source);
@@ -469,7 +823,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
             delete bid.error; // it's possible for this to be set by a previous timeout
             break;
           case NO_BID:
-            bid.status = args.status === BID_REJECTED ? 'rejected' : 'no-bid';
+            bid.status = args.status === BID_REJECTED ? BID_REJECTED_IPF : 'no-bid';
             delete bid.error;
             break;
           default:
@@ -478,14 +832,26 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
               code: 'request-error'
             };
         }
-        bid.clientLatencyMillis = Date.now() - cache.auctions[args.auctionId].timestamp;
+        bid.clientLatencyMillis = bid.timeToRespond || Date.now() - cache.auctions[args.auctionId].timestamp;
         bid.bidResponse = parseBidResponse(args, bid.bidResponse);
         break;
       case BIDDER_DONE:
+        const serverError = deepAccess(args, 'serverErrors.0');
+        const serverResponseTimeMs = args.serverResponseTimeMs;
         args.bids.forEach(bid => {
           let cachedBid = cache.auctions[bid.auctionId].bids[bid.bidId || bid.requestId];
           if (typeof bid.serverResponseTimeMs !== 'undefined') {
             cachedBid.serverLatencyMillis = bid.serverResponseTimeMs;
+          } else if (serverResponseTimeMs && bid.source === 's2s') {
+            cachedBid.serverLatencyMillis = serverResponseTimeMs;
+          }
+          // if PBS said we had an error, and this bid has not been processed by BID_RESPONSE YET
+          if (serverError && (!cachedBid.status || ['no-bid', 'error'].indexOf(cachedBid.status) !== -1)) {
+            cachedBid.status = 'error';
+            cachedBid.error = {
+              code: pbsErrorMap[serverError.code] || pbsErrorMap[999],
+              description: serverError.message
+            }
           }
           if (!cachedBid.status) {
             cachedBid.status = 'no-bid';
@@ -504,8 +870,8 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
 
         // check if this BID_WON missed the boat, if so send by itself
         if (auctionCache.sent === true) {
-          sendMessage.call(this, args.auctionId, args.requestId);
-        } else if (Object.keys(auctionCache.bidsWon).reduce((memo, adUnitCode) => {
+          sendMessage.call(this, args.auctionId, args.requestId, 'soloBidWon');
+        } else if (!rubiConf.waitForGamSlots && Object.keys(auctionCache.bidsWon).reduce((memo, adUnitCode) => {
           // only send if we've received bidWon events for all adUnits in auction
           memo = memo && auctionCache.bidsWon[adUnitCode];
           return memo;
@@ -513,32 +879,59 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
           clearTimeout(cache.timeouts[args.auctionId]);
           delete cache.timeouts[args.auctionId];
 
-          sendMessage.call(this, args.auctionId);
+          sendMessage.call(this, args.auctionId, undefined, 'allBidWons');
         }
         break;
       case AUCTION_END:
-        // start timer to send batched payload just in case we don't hear any BID_WON events
-        cache.timeouts[args.auctionId] = setTimeout(() => {
-          sendMessage.call(this, args.auctionId);
-        }, SEND_TIMEOUT);
+        // see how long it takes for the payload to come fire
+        let auctionData = cache.auctions[args.auctionId];
+        // if for some reason the auction did not do its normal thing, this could be undefied so bail
+        if (!auctionData) {
+          break;
+        }
+        auctionData.endTs = Date.now();
+
+        const isOnlyInstreamAuction = args.adUnits && args.adUnits.every(adUnit => adUnitIsOnlyInstream(adUnit));
+        // If only instream, do not wait around, just send payload
+        if (isOnlyInstreamAuction) {
+          sendMessage.call(this, args.auctionId, undefined, 'instreamAuction');
+        } else {
+          // start timer to send batched payload just in case we don't hear any BID_WON events
+          cache.timeouts[args.auctionId] = setTimeout(() => {
+            sendMessage.call(this, args.auctionId, undefined, 'auctionEnd');
+          }, rubiConf.analyticsBatchTimeout || SEND_TIMEOUT);
+        }
         break;
       case BID_TIMEOUT:
         args.forEach(badBid => {
           let auctionCache = cache.auctions[badBid.auctionId];
           let bid = auctionCache.bids[badBid.bidId || badBid.requestId];
-          bid.status = 'error';
-          bid.error = {
-            code: 'timeout-error'
-          };
+          // might be set already by bidder-done, so do not overwrite
+          if (bid.status !== 'error') {
+            bid.status = 'error';
+            bid.error = {
+              code: 'timeout-error',
+              description: 'prebid.js timeout' // will help us diff if timeout was set by PBS or PBJS
+            };
+          }
         });
         break;
+      case BILLABLE_EVENT:
+        if (rubiConf.dmBilling.enabled && isBillingEventValid(args)) {
+          // add to the map indicating it has not been sent yet
+          deepSetValue(cache.billing, `${args.vendor}.${args.billingId}`, false);
+          sendOrAddEventToQueue(args);
+        } else {
+          logInfo(`${MODULE_NAME}: Billing event ignored`, args);
+        }
     }
   }
 });
 
 adapterManager.registerAnalyticsAdapter({
   adapter: rubiconAdapter,
-  code: 'rubicon'
+  code: 'rubicon',
+  gvlid: RUBICON_GVL_ID
 });
 
 export default rubiconAdapter;
diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index f09bc51e2c5..bd53e9d5104 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -1,33 +1,44 @@
-import * as utils from '../src/utils.js';
+import {
+  _each,
+  convertTypes,
+  deepAccess,
+  deepSetValue,
+  formatQS,
+  isArray,
+  isNumber,
+  isStr,
+  logError,
+  logMessage,
+  logWarn,
+  mergeDeep,
+  parseSizesInput
+} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {find} from '../src/polyfill.js';
+import {Renderer} from '../src/Renderer.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 
 const DEFAULT_INTEGRATION = 'pbjs_lite';
 const DEFAULT_PBS_INTEGRATION = 'pbjs';
+const DEFAULT_RENDERER_URL = 'https://video-outstream.rubiconproject.com/apex-2.2.1.js';
+// renderer code at https://github.com/rubicon-project/apex2
 
-// always use https, regardless of whether or not current page is secure
-export const FASTLANE_ENDPOINT = 'https://fastlane.rubiconproject.com/a/api/fastlane.json';
-export const VIDEO_ENDPOINT = 'https://prebid-server.rubiconproject.com/openrtb2/auction';
-export const SYNC_ENDPOINT = 'https://eus.rubiconproject.com/usync.html';
+let rubiConf = {};
+// we are saving these as global to this module so that if a pub accidentally overwrites the entire
+// rubicon object, then we do not lose other data
+config.getConfig('rubicon', config => {
+  mergeDeep(rubiConf, config.rubicon);
+});
 
 const GVLID = 52;
-const DIGITRUST_PROP_NAMES = {
-  FASTLANE: {
-    id: 'dt.id',
-    keyv: 'dt.keyv',
-    pref: 'dt.pref'
-  },
-  PREBID_SERVER: {
-    id: 'id',
-    keyv: 'keyv'
-  }
-};
 
 var sizeMap = {
   1: '468x60',
   2: '728x90',
   5: '120x90',
+  7: '125x125',
   8: '120x600',
   9: '160x600',
   10: '300x600',
@@ -109,9 +120,24 @@ var sizeMap = {
   274: '1800x200',
   278: '320x500',
   282: '320x400',
-  288: '640x380'
+  288: '640x380',
+  548: '500x1000',
+  550: '980x480',
+  552: '300x200',
+  558: '640x640',
+  562: '300x431',
+  564: '320x431',
+  566: '320x300',
+  568: '300x150',
+  570: '300x125',
+  572: '250x350',
+  574: '620x891',
+  576: '610x877',
+  578: '980x552',
+  580: '505x656',
+  622: '192x160'
 };
-utils._each(sizeMap, (item, key) => sizeMap[item] = key);
+_each(sizeMap, (item, key) => sizeMap[item] = key);
 
 export const spec = {
   code: 'rubicon',
@@ -129,7 +155,7 @@ export const spec = {
     for (let i = 0, props = ['accountId', 'siteId', 'zoneId']; i < props.length; i++) {
       bid.params[props[i]] = parseInt(bid.params[props[i]])
       if (isNaN(bid.params[props[i]])) {
-        utils.logError('Rubicon: wrong format of accountId or siteId or zoneId.')
+        logError('Rubicon: wrong format of accountId or siteId or zoneId.')
         return false
       }
     }
@@ -161,21 +187,25 @@ export const spec = {
         source: {
           tid: bidRequest.transactionId
         },
-        tmax: config.getConfig('TTL') || 1000,
+        tmax: bidderRequest.timeout,
         imp: [{
-          exp: 300,
+          exp: config.getConfig('s2sConfig.defaultTtl'),
           id: bidRequest.adUnitCode,
           secure: 1,
           ext: {
             [bidRequest.bidder]: bidRequest.params
           },
-          video: utils.deepAccess(bidRequest, 'mediaTypes.video') || {}
+          video: deepAccess(bidRequest, 'mediaTypes.video') || {}
         }],
         ext: {
           prebid: {
+            channel: {
+              name: 'pbjs',
+              version: $$PREBID_GLOBAL$$.version
+            },
             cache: {
               vastxml: {
-                returnCreative: false // don't return the VAST
+                returnCreative: rubiConf.returnVast === true
               }
             },
             targeting: {
@@ -186,7 +216,7 @@ export const spec = {
             },
             bidders: {
               rubicon: {
-                integration: config.getConfig('rubicon.int_type') || DEFAULT_PBS_INTEGRATION
+                integration: rubiConf.int_type || DEFAULT_PBS_INTEGRATION
               }
             }
           }
@@ -200,20 +230,36 @@ export const spec = {
         }
       }
 
+      let modules = (getGlobal()).installedModules;
+      if (modules && (!modules.length || modules.indexOf('rubiconAnalyticsAdapter') !== -1)) {
+        deepSetValue(data, 'ext.prebid.analytics', {'rubicon': {'client-analytics': true}});
+      }
+
       let bidFloor;
-      if (typeof bidRequest.getFloor === 'function' && !config.getConfig('rubicon.disableFloors')) {
-        let floorInfo = bidRequest.getFloor({
-          currency: 'USD',
-          mediaType: 'video',
-          size: parseSizes(bidRequest, 'video')
-        });
+      if (typeof bidRequest.getFloor === 'function' && !rubiConf.disableFloors) {
+        let floorInfo;
+        try {
+          floorInfo = bidRequest.getFloor({
+            currency: 'USD',
+            mediaType: 'video',
+            size: parseSizes(bidRequest, 'video')
+          });
+        } catch (e) {
+          logError('Rubicon: getFloor threw an error: ', e);
+        }
         bidFloor = typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? parseFloat(floorInfo.floor) : undefined;
       } else {
-        bidFloor = parseFloat(utils.deepAccess(bidRequest, 'params.floor'));
+        bidFloor = parseFloat(deepAccess(bidRequest, 'params.floor'));
       }
       if (!isNaN(bidFloor)) {
         data.imp[0].bidfloor = bidFloor;
       }
+
+      // If the price floors module is active, then we need to signal to PBS! If floorData obj is present is best way to check
+      if (typeof bidRequest.floorData === 'object') {
+        data.ext.prebid.floors = { enabled: false };
+      }
+
       // if value is set, will overwrite with same value
       data.imp[0].ext[bidRequest.bidder].video.size_id = determineRubiconVideoSizeId(bidRequest)
 
@@ -221,11 +267,6 @@ export const spec = {
 
       addVideoParameters(data, bidRequest);
 
-      const digiTrust = _getDigiTrustQueryParams(bidRequest, 'PREBID_SERVER');
-      if (digiTrust) {
-        utils.deepSetValue(data, 'user.ext.digitrust', digiTrust);
-      }
-
       if (bidderRequest.gdprConsent) {
         // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
         let gdprApplies;
@@ -233,118 +274,61 @@ export const spec = {
           gdprApplies = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
         }
 
-        utils.deepSetValue(data, 'regs.ext.gdpr', gdprApplies);
-        utils.deepSetValue(data, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+        deepSetValue(data, 'regs.ext.gdpr', gdprApplies);
+        deepSetValue(data, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
       }
 
       if (bidderRequest.uspConsent) {
-        utils.deepSetValue(data, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+        deepSetValue(data, 'regs.ext.us_privacy', bidderRequest.uspConsent);
       }
 
-      if (bidRequest.userId && typeof bidRequest.userId === 'object' &&
-        (bidRequest.userId.tdid || bidRequest.userId.pubcid || bidRequest.userId.lipb || bidRequest.userId.idl_env)) {
-        utils.deepSetValue(data, 'user.ext.eids', []);
-
-        if (bidRequest.userId.tdid) {
-          data.user.ext.eids.push({
-            source: 'adserver.org',
-            uids: [{
-              id: bidRequest.userId.tdid,
-              ext: {
-                rtiPartner: 'TDID'
-              }
-            }]
-          });
-        }
-
-        if (bidRequest.userId.pubcid) {
-          data.user.ext.eids.push({
-            source: 'pubcommon',
-            uids: [{
-              id: bidRequest.userId.pubcid,
-            }]
-          });
-        }
-
-        // support liveintent ID
-        if (bidRequest.userId.lipb && bidRequest.userId.lipb.lipbid) {
-          data.user.ext.eids.push({
-            source: 'liveintent.com',
-            uids: [{
-              id: bidRequest.userId.lipb.lipbid
-            }]
-          });
-
-          data.user.ext.tpid = {
-            source: 'liveintent.com',
-            uid: bidRequest.userId.lipb.lipbid
-          };
-
-          if (Array.isArray(bidRequest.userId.lipb.segments) && bidRequest.userId.lipb.segments.length) {
-            utils.deepSetValue(data, 'rp.target.LIseg', bidRequest.userId.lipb.segments);
-          }
-        }
+      const eids = deepAccess(bidderRequest, 'bids.0.userIdAsEids');
+      if (eids && eids.length) {
+        deepSetValue(data, 'user.ext.eids', eids);
+      }
 
-        // support identityLink (aka LiveRamp)
-        if (bidRequest.userId.idl_env) {
-          data.user.ext.eids.push({
-            source: 'liveramp.com',
-            uids: [{
-              id: bidRequest.userId.idl_env
-            }]
-          });
-        }
+      // set user.id value from config value
+      const configUserId = config.getConfig('user.id');
+      if (configUserId) {
+        deepSetValue(data, 'user.id', configUserId);
       }
 
       if (config.getConfig('coppa') === true) {
-        utils.deepSetValue(data, 'regs.coppa', 1);
+        deepSetValue(data, 'regs.coppa', 1);
       }
 
       if (bidRequest.schain && hasValidSupplyChainParams(bidRequest.schain)) {
-        utils.deepSetValue(data, 'source.ext.schain', bidRequest.schain);
+        deepSetValue(data, 'source.ext.schain', bidRequest.schain);
       }
 
-      const siteData = Object.assign({}, bidRequest.params.inventory, config.getConfig('fpd.context'));
-      const userData = Object.assign({}, bidRequest.params.visitor, config.getConfig('fpd.user'));
-      if (!utils.isEmpty(siteData) || !utils.isEmpty(userData)) {
-        const bidderData = {
-          bidders: [ bidderRequest.bidderCode ],
-          config: {
-            fpd: {}
-          }
-        };
+      const multibid = config.getConfig('multibid');
+      if (multibid) {
+        deepSetValue(data, 'ext.prebid.multibid', multibid.reduce((result, i) => {
+          let obj = {};
 
-        if (!utils.isEmpty(siteData)) {
-          bidderData.config.fpd.site = siteData;
-        }
+          Object.keys(i).forEach(key => {
+            obj[key.toLowerCase()] = i[key];
+          });
 
-        if (!utils.isEmpty(userData)) {
-          bidderData.config.fpd.user = userData;
-        }
+          result.push(obj);
 
-        utils.deepSetValue(data, 'ext.prebid.bidderconfig.0', bidderData);
+          return result;
+        }, []));
       }
 
-      /**
-       * Prebid AdSlot
-       * @type {(string|undefined)}
-       */
-      const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
-      if (typeof pbAdSlot === 'string' && pbAdSlot) {
-        utils.deepSetValue(data.imp[0].ext, 'context.data.adslot', pbAdSlot);
-      }
-
-      // if storedAuctionResponse has been set, pass SRID
-      if (bidRequest.storedAuctionResponse) {
-        utils.deepSetValue(data.imp[0], 'ext.prebid.storedauctionresponse.id', bidRequest.storedAuctionResponse.toString());
-      }
+      applyFPD(bidRequest, VIDEO, data);
 
       // set ext.prebid.auctiontimestamp using auction time
-      utils.deepSetValue(data.imp[0], 'ext.prebid.auctiontimestamp', bidderRequest.auctionStart);
+      deepSetValue(data.imp[0], 'ext.prebid.auctiontimestamp', bidderRequest.auctionStart);
+
+      // set storedrequests to undefined so not sent to PBS
+      // top level and imp level both 'ext.prebid' objects are set above so no exception thrown here
+      data.ext.prebid.storedrequest = undefined;
+      data.imp[0].ext.prebid.storedrequest = undefined;
 
       return {
         method: 'POST',
-        url: VIDEO_ENDPOINT,
+        url: `https://${rubiConf.videoHost || 'prebid-server'}.rubiconproject.com/openrtb2/auction`,
         data,
         bidRequest
       }
@@ -356,17 +340,17 @@ export const spec = {
         const bidParams = spec.createSlotParams(bidRequest, bidderRequest);
         return {
           method: 'GET',
-          url: FASTLANE_ENDPOINT,
+          url: `https://${rubiConf.bannerHost || 'fastlane'}.rubiconproject.com/a/api/fastlane.json`,
           data: spec.getOrderedParams(bidParams).reduce((paramString, key) => {
             const propValue = bidParams[key];
-            return ((utils.isStr(propValue) && propValue !== '') || utils.isNumber(propValue)) ? `${paramString}${encodeParam(key, propValue)}&` : paramString;
+            return ((isStr(propValue) && propValue !== '') || isNumber(propValue)) ? `${paramString}${encodeParam(key, propValue)}&` : paramString;
           }, '') + `slots=1&rand=${Math.random()}`,
           bidRequest
         };
       }));
     } else {
       // single request requires bids to be grouped by site id into a single request
-      // note: utils.groupBy wasn't used because deep property access was needed
+      // note: groupBy wasn't used because deep property access was needed
       const nonVideoRequests = bidRequests.filter(bidRequest => bidType(bidRequest) === 'banner');
       const groupedBidRequests = nonVideoRequests.reduce((groupedBids, bid) => {
         (groupedBids[bid.params['siteId']] = groupedBids[bid.params['siteId']] || []).push(bid);
@@ -387,10 +371,10 @@ export const spec = {
           // SRA request returns grouped bidRequest arrays not a plain bidRequest
           aggregate.push({
             method: 'GET',
-            url: FASTLANE_ENDPOINT,
+            url: `https://${rubiConf.bannerHost || 'fastlane'}.rubiconproject.com/a/api/fastlane.json`,
             data: spec.getOrderedParams(combinedSlotParams).reduce((paramString, key) => {
               const propValue = combinedSlotParams[key];
-              return ((utils.isStr(propValue) && propValue !== '') || utils.isNumber(propValue)) ? `${paramString}${encodeParam(key, propValue)}&` : paramString;
+              return ((isStr(propValue) && propValue !== '') || isNumber(propValue)) ? `${paramString}${encodeParam(key, propValue)}&` : paramString;
             }, '') + `slots=${bidsInGroup.length}&rand=${Math.random()}`,
             bidRequest: bidsInGroup
           });
@@ -404,6 +388,7 @@ export const spec = {
   getOrderedParams: function(params) {
     const containsTgV = /^tg_v/
     const containsTgI = /^tg_i/
+    const containsUId = /^eid_|^tpid_/
 
     const orderedParams = [
       'account_id',
@@ -416,21 +401,20 @@ export const spec = {
       'gdpr_consent',
       'us_privacy',
       'rp_schain',
-      'tpid_tdid',
-      'tpid_liveintent.com',
-      'tg_v.LIseg',
-      'dt.id',
-      'dt.keyv',
-      'dt.pref',
-      'rf',
-      'p_geo.latitude',
-      'p_geo.longitude',
-      'kw'
-    ].concat(Object.keys(params).filter(item => containsTgV.test(item)))
+    ].concat(Object.keys(params).filter(item => containsUId.test(item)))
+      .concat([
+        'x_liverampidl',
+        'ppuid',
+        'rf',
+        'p_geo.latitude',
+        'p_geo.longitude',
+        'kw'
+      ]).concat(Object.keys(params).filter(item => containsTgV.test(item)))
       .concat(Object.keys(params).filter(item => containsTgI.test(item)))
       .concat([
         'tk_flint',
         'x_source.tid',
+        'l_pb_bid_id',
         'x_source.pchain',
         'p_screen_res',
         'rp_floor',
@@ -494,18 +478,17 @@ export const spec = {
 
     const [latitude, longitude] = params.latLong || [];
 
-    const configIntType = config.getConfig('rubicon.int_type');
-
     const data = {
       'account_id': params.accountId,
       'site_id': params.siteId,
       'zone_id': params.zoneId,
       'size_id': parsedSizes[0],
       'alt_size_ids': parsedSizes.slice(1).join(',') || undefined,
-      'rp_floor': (params.floor = parseFloat(params.floor)) > 0.01 ? params.floor : 0.01,
+      'rp_floor': (params.floor = parseFloat(params.floor)) >= 0.01 ? params.floor : undefined,
       'rp_secure': '1',
-      'tk_flint': `${configIntType || DEFAULT_INTEGRATION}_v$prebid.version$`,
+      'tk_flint': `${rubiConf.int_type || DEFAULT_INTEGRATION}_v$prebid.version$`,
       'x_source.tid': bidRequest.transactionId,
+      'l_pb_bid_id': bidRequest.bidId,
       'x_source.pchain': params.pchain,
       'p_screen_res': _getScreenResolution(),
       'tk_user_key': params.userId,
@@ -516,36 +499,65 @@ export const spec = {
     };
 
     // If floors module is enabled and we get USD floor back, send it in rp_hard_floor else undfined
-    if (typeof bidRequest.getFloor === 'function' && !config.getConfig('rubicon.disableFloors')) {
-      let floorInfo = bidRequest.getFloor({
-        currency: 'USD',
-        mediaType: 'banner',
-        size: '*'
-      });
+    if (typeof bidRequest.getFloor === 'function' && !rubiConf.disableFloors) {
+      let floorInfo;
+      try {
+        floorInfo = bidRequest.getFloor({
+          currency: 'USD',
+          mediaType: 'banner',
+          size: '*'
+        });
+      } catch (e) {
+        logError('Rubicon: getFloor threw an error: ', e);
+      }
       data['rp_hard_floor'] = typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? floorInfo.floor : undefined;
     }
 
     // add p_pos only if specified and valid
     // For SRA we need to explicitly put empty semi colons so AE treats it as empty, instead of copying the latter value
-    data['p_pos'] = (params.position === 'atf' || params.position === 'btf') ? params.position : '';
-
-    if (bidRequest.userId) {
-      if (bidRequest.userId.tdid) {
-        data['tpid_tdid'] = bidRequest.userId.tdid;
-      }
-
-      // support liveintent ID
-      if (bidRequest.userId.lipb && bidRequest.userId.lipb.lipbid) {
-        data['tpid_liveintent.com'] = bidRequest.userId.lipb.lipbid;
-        if (Array.isArray(bidRequest.userId.lipb.segments) && bidRequest.userId.lipb.segments.length) {
-          data['tg_v.LIseg'] = bidRequest.userId.lipb.segments.join(',');
+    let posMapping = {1: 'atf', 3: 'btf'};
+    let pos = posMapping[deepAccess(bidRequest, 'mediaTypes.banner.pos')] || '';
+    data['p_pos'] = (params.position === 'atf' || params.position === 'btf') ? params.position : pos;
+
+    // pass publisher provided userId if configured
+    const configUserId = config.getConfig('user.id');
+    if (configUserId) {
+      data['ppuid'] = configUserId;
+    }
+    // loop through userIds and add to request
+    if (bidRequest.userIdAsEids) {
+      bidRequest.userIdAsEids.forEach(eid => {
+        try {
+          // special cases
+          if (eid.source === 'adserver.org') {
+            data['tpid_tdid'] = eid.uids[0].id;
+            data['eid_adserver.org'] = eid.uids[0].id;
+          } else if (eid.source === 'liveintent.com') {
+            data['tpid_liveintent.com'] = eid.uids[0].id;
+            data['eid_liveintent.com'] = eid.uids[0].id;
+            if (eid.ext && Array.isArray(eid.ext.segments) && eid.ext.segments.length) {
+              data['tg_v.LIseg'] = eid.ext.segments.join(',');
+            }
+          } else if (eid.source === 'liveramp.com') {
+            data['x_liverampidl'] = eid.uids[0].id;
+          } else if (eid.source === 'id5-sync.com') {
+            data['eid_id5-sync.com'] = `${eid.uids[0].id}^${eid.uids[0].atype}^${(eid.uids[0].ext && eid.uids[0].ext.linkType) || ''}`;
+          } else {
+            // add anything else with this generic format
+            data[`eid_${eid.source}`] = `${eid.uids[0].id}^${eid.uids[0].atype || ''}`;
+          }
+          // send AE "ppuid" signal if exists, and hasn't already been sent
+          if (!data['ppuid']) {
+            // get the first eid.uids[*].ext.stype === 'ppuid', if one exists
+            const ppId = find(eid.uids, uid => uid.ext && uid.ext.stype === 'ppuid');
+            if (ppId && ppId.id) {
+              data['ppuid'] = ppId.id;
+            }
+          }
+        } catch (e) {
+          logWarn('Rubicon: error reading eid:', eid, e);
         }
-      }
-
-      // support identityLink (aka LiveRamp)
-      if (bidRequest.userId.idl_env) {
-        data['tpid_liveramp.com'] = bidRequest.userId.idl_env;
-      }
+      });
     }
 
     if (bidderRequest.gdprConsent) {
@@ -560,44 +572,9 @@ export const spec = {
       data['us_privacy'] = encodeURIComponent(bidderRequest.uspConsent);
     }
 
-    // visitor properties
-    const visitorData = Object.assign({}, params.visitor, config.getConfig('fpd.user'));
-    Object.keys(visitorData).forEach((key) => {
-      if (visitorData[key] != null && key !== 'keywords') {
-        data[`tg_v.${key}`] = typeof visitorData[key] === 'object' && !Array.isArray(visitorData[key])
-          ? JSON.stringify(visitorData[key])
-          : visitorData[key].toString(); // initialize array;
-      }
-    });
-
-    // inventory properties
-    const inventoryData = Object.assign({}, params.inventory, config.getConfig('fpd.context'));
-    Object.keys(inventoryData).forEach((key) => {
-      if (inventoryData[key] != null && key !== 'keywords') {
-        data[`tg_i.${key}`] = typeof inventoryData[key] === 'object' && !Array.isArray(inventoryData[key])
-          ? JSON.stringify(inventoryData[key])
-          : inventoryData[key].toString();
-      }
-    });
-
-    // keywords
-    const keywords = (params.keywords || []).concat(
-      utils.deepAccess(config.getConfig('fpd.user'), 'keywords') || [],
-      utils.deepAccess(config.getConfig('fpd.context'), 'keywords') || []);
-    data.kw = Array.isArray(keywords) && keywords.length ? keywords.join(',') : '';
-
-    /**
-     * Prebid AdSlot
-     * @type {(string|undefined)}
-     */
-    const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
-    if (typeof pbAdSlot === 'string' && pbAdSlot) {
-      data['tg_i.dfp_ad_unit_code'] = pbAdSlot.replace(/^\/+/, '');
-    }
+    data['rp_maxbids'] = bidderRequest.bidLimit || 1;
 
-    // digitrust properties
-    const digitrustParams = _getDigiTrustQueryParams(bidRequest, 'FASTLANE');
-    Object.assign(data, digitrustParams);
+    applyFPD(bidRequest, BANNER, data);
 
     if (config.getConfig('coppa') === true) {
       data['coppa'] = 1;
@@ -651,9 +628,9 @@ export const spec = {
 
     // video response from PBS Java openRTB
     if (responseObj.seatbid) {
-      const responseErrors = utils.deepAccess(responseObj, 'ext.errors.rubicon');
+      const responseErrors = deepAccess(responseObj, 'ext.errors.rubicon');
       if (Array.isArray(responseErrors) && responseErrors.length > 0) {
-        utils.logWarn('Rubicon: Error in video response');
+        logWarn('Rubicon: Error in video response');
       }
       const bids = [];
       responseObj.seatbid.forEach(seatbid => {
@@ -665,9 +642,9 @@ export const spec = {
             cpm: bid.price || 0,
             bidderCode: seatbid.seat,
             ttl: 300,
-            netRevenue: config.getConfig('rubicon.netRevenue') !== false, // If anything other than false, netRev is true
-            width: bid.w || utils.deepAccess(bidRequest, 'mediaTypes.video.w') || utils.deepAccess(bidRequest, 'params.video.playerWidth'),
-            height: bid.h || utils.deepAccess(bidRequest, 'mediaTypes.video.h') || utils.deepAccess(bidRequest, 'params.video.playerHeight'),
+            netRevenue: rubiConf.netRevenue !== false, // If anything other than false, netRev is true
+            width: bid.w || deepAccess(bidRequest, 'mediaTypes.video.w') || deepAccess(bidRequest, 'params.video.playerWidth'),
+            height: bid.h || deepAccess(bidRequest, 'mediaTypes.video.h') || deepAccess(bidRequest, 'params.video.playerHeight'),
           };
 
           if (bid.id) {
@@ -678,14 +655,23 @@ export const spec = {
             bidObject.dealId = bid.dealid;
           }
 
-          let serverResponseTimeMs = utils.deepAccess(responseObj, 'ext.responsetimemillis.rubicon');
+          if (bid.adomain) {
+            deepSetValue(bidObject, 'meta.advertiserDomains', Array.isArray(bid.adomain) ? bid.adomain : [bid.adomain]);
+          }
+
+          if (deepAccess(bid, 'ext.bidder.rp.advid')) {
+            deepSetValue(bidObject, 'meta.advertiserId', bid.ext.bidder.rp.advid);
+          }
+
+          let serverResponseTimeMs = deepAccess(responseObj, 'ext.responsetimemillis.rubicon');
           if (bidRequest && serverResponseTimeMs) {
             bidRequest.serverResponseTimeMs = serverResponseTimeMs;
           }
 
-          if (utils.deepAccess(bid, 'ext.prebid.type') === VIDEO) {
+          if (deepAccess(bid, 'ext.prebid.type') === VIDEO) {
             bidObject.mediaType = VIDEO;
-            const extPrebidTargeting = utils.deepAccess(bid, 'ext.prebid.targeting');
+            deepSetValue(bidObject, 'meta.mediaType', VIDEO);
+            const extPrebidTargeting = deepAccess(bid, 'ext.prebid.targeting');
 
             // If ext.prebid.targeting exists, add it as a property value named 'adserverTargeting'
             if (extPrebidTargeting && typeof extPrebidTargeting === 'object') {
@@ -706,8 +692,13 @@ export const spec = {
             if (bid.adm) { bidObject.vastXml = bid.adm; }
             if (bid.nurl) { bidObject.vastUrl = bid.nurl; }
             if (!bidObject.vastUrl && bid.nurl) { bidObject.vastUrl = bid.nurl; }
+
+            const videoContext = deepAccess(bidRequest, 'mediaTypes.video.context');
+            if (videoContext.toLowerCase() === 'outstream') {
+              bidObject.renderer = outstreamRenderer(bidObject);
+            }
           } else {
-            utils.logWarn('Rubicon: video response received non-video media type');
+            logWarn('Rubicon: video response received non-video media type');
           }
 
           bids.push(bidObject);
@@ -718,6 +709,8 @@ export const spec = {
     }
 
     let ads = responseObj.ads;
+    let lastImpId;
+    let multibid = 0;
 
     // video ads array is wrapped in an object
     if (typeof bidRequest === 'object' && !Array.isArray(bidRequest) && bidType(bidRequest) === 'video' && typeof ads === 'object') {
@@ -730,12 +723,14 @@ export const spec = {
     }
 
     return ads.reduce((bids, ad, i) => {
+      (ad.impression_id && lastImpId === ad.impression_id) ? multibid++ : lastImpId = ad.impression_id;
+
       if (ad.status !== 'ok') {
         return bids;
       }
 
       // associate bidRequests; assuming ads matches bidRequest
-      const associatedBidRequest = Array.isArray(bidRequest) ? bidRequest[i] : bidRequest;
+      const associatedBidRequest = Array.isArray(bidRequest) ? bidRequest[i - multibid] : bidRequest;
 
       if (associatedBidRequest && typeof associatedBidRequest === 'object') {
         let bid = {
@@ -745,12 +740,12 @@ export const spec = {
           cpm: ad.cpm || 0,
           dealId: ad.deal,
           ttl: 300, // 5 minutes
-          netRevenue: config.getConfig('rubicon.netRevenue') !== false, // If anything other than false, netRev is true
+          netRevenue: rubiConf.netRevenue !== false, // If anything other than false, netRev is true
           rubicon: {
             advertiserId: ad.advertiser, networkId: ad.network
           },
           meta: {
-            advertiserId: ad.advertiser, networkId: ad.network
+            advertiserId: ad.advertiser, networkId: ad.network, mediaType: BANNER
           }
         };
 
@@ -758,6 +753,10 @@ export const spec = {
           bid.mediaType = ad.creative_type;
         }
 
+        if (ad.adomain) {
+          bid.meta.advertiserDomains = Array.isArray(ad.adomain) ? ad.adomain : [ad.adomain];
+        }
+
         if (ad.creative_type === VIDEO) {
           bid.width = associatedBidRequest.params.video.playerWidth;
           bid.height = associatedBidRequest.params.video.playerHeight;
@@ -778,7 +777,7 @@ export const spec = {
 
         bids.push(bid);
       } else {
-        utils.logError(`Rubicon: bidRequest undefined at index position:${i}`, bidRequest, responseObj);
+        logError(`Rubicon: bidRequest undefined at index position:${i}`, bidRequest, responseObj);
       }
 
       return bids;
@@ -788,26 +787,28 @@ export const spec = {
   },
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
     if (!hasSynced && syncOptions.iframeEnabled) {
-      // data is only assigned if params are available to pass to SYNC_ENDPOINT
-      let params = '';
+      // data is only assigned if params are available to pass to syncEndpoint
+      let params = {};
 
-      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
-        // add 'gdpr' only if 'gdprApplies' is defined
+      if (gdprConsent) {
         if (typeof gdprConsent.gdprApplies === 'boolean') {
-          params += `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-        } else {
-          params += `?gdpr_consent=${gdprConsent.consentString}`;
+          params['gdpr'] = Number(gdprConsent.gdprApplies);
+        }
+        if (typeof gdprConsent.consentString === 'string') {
+          params['gdpr_consent'] = gdprConsent.consentString;
         }
       }
 
       if (uspConsent) {
-        params += `${params ? '&' : '?'}us_privacy=${encodeURIComponent(uspConsent)}`;
+        params['us_privacy'] = encodeURIComponent(uspConsent);
       }
 
+      params = Object.keys(params).length ? `?${formatQS(params)}` : '';
+
       hasSynced = true;
       return {
         type: 'iframe',
-        url: SYNC_ENDPOINT + params
+        url: `https://${rubiConf.syncHost || 'eus'}.rubiconproject.com/usync.html` + params
       };
     }
   },
@@ -818,7 +819,7 @@ export const spec = {
    * @return {Object} params bid params
    */
   transformBidParams: function(params, isOpenRtb) {
-    return utils.convertTypes({
+    return convertTypes({
       'accountId': 'number',
       'siteId': 'number',
       'zoneId': 'number'
@@ -830,49 +831,17 @@ function _getScreenResolution() {
   return [window.screen.width, window.screen.height].join('x');
 }
 
-function _getDigiTrustQueryParams(bidRequest = {}, endpointName) {
-  if (!endpointName || !DIGITRUST_PROP_NAMES[endpointName]) {
-    return null;
-  }
-  const propNames = DIGITRUST_PROP_NAMES[endpointName];
-
-  function getDigiTrustId() {
-    const bidRequestDigitrust = utils.deepAccess(bidRequest, 'userId.digitrustid.data');
-    if (bidRequestDigitrust) {
-      return bidRequestDigitrust;
-    }
-
-    let digiTrustUser = (window.DigiTrust && (config.getConfig('digiTrustId') || window.DigiTrust.getUser({member: 'T9QSFKPDN9'})));
-    return (digiTrustUser && digiTrustUser.success && digiTrustUser.identity) || null;
-  }
-
-  let digiTrustId = getDigiTrustId();
-  // Verify there is an ID and this user has not opted out
-  if (!digiTrustId || (digiTrustId.privacy && digiTrustId.privacy.optout)) {
-    return null;
-  }
-
-  const digiTrustQueryParams = {
-    [propNames.id]: digiTrustId.id,
-    [propNames.keyv]: digiTrustId.keyv
-  };
-  if (propNames.pref) {
-    digiTrustQueryParams[propNames.pref] = 0;
-  }
-  return digiTrustQueryParams;
-}
-
 /**
  * @param {BidRequest} bidRequest
  * @param bidderRequest
  * @returns {string}
  */
 function _getPageUrl(bidRequest, bidderRequest) {
-  let pageUrl = config.getConfig('pageUrl');
+  let pageUrl;
   if (bidRequest.params.referrer) {
     pageUrl = bidRequest.params.referrer;
-  } else if (!pageUrl) {
-    pageUrl = bidderRequest.refererInfo.referer;
+  } else {
+    pageUrl = bidderRequest.refererInfo.page;
   }
   return bidRequest.params.secure ? pageUrl.replace(/^http:/i, 'https:') : pageUrl;
 }
@@ -889,6 +858,64 @@ function _renderCreative(script, impId) {
 </html>`;
 }
 
+function hideGoogleAdsDiv(adUnit) {
+  const el = adUnit.querySelector("div[id^='google_ads']");
+  if (el) {
+    el.style.setProperty('display', 'none');
+  }
+}
+
+function hideSmartAdServerIframe(adUnit) {
+  const el = adUnit.querySelector("script[id^='sas_script']");
+  const nextSibling = el && el.nextSibling;
+  if (nextSibling && nextSibling.localName === 'iframe') {
+    nextSibling.style.setProperty('display', 'none');
+  }
+}
+
+function renderBid(bid) {
+  // hide existing ad units
+  const adUnitElement = document.getElementById(bid.adUnitCode);
+  hideGoogleAdsDiv(adUnitElement);
+  hideSmartAdServerIframe(adUnitElement);
+
+  // configure renderer
+  const config = bid.renderer.getConfig();
+  bid.renderer.push(() => {
+    window.MagniteApex.renderAd({
+      width: bid.width,
+      height: bid.height,
+      vastUrl: bid.vastUrl,
+      placement: {
+        attachTo: adUnitElement,
+        align: config.align || 'center',
+        position: config.position || 'append'
+      },
+      closeButton: config.closeButton || false,
+      label: config.label || undefined,
+      collapse: config.collapse || true
+    });
+  });
+}
+
+function outstreamRenderer(rtbBid) {
+  const renderer = Renderer.install({
+    id: rtbBid.adId,
+    url: rubiConf.rendererUrl || DEFAULT_RENDERER_URL,
+    config: rubiConf.rendererConfig || {},
+    loaded: false,
+    adUnitCode: rtbBid.adUnitCode
+  });
+
+  try {
+    renderer.setRender(renderBid);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
+}
+
 function parseSizes(bid, mediaType) {
   let params = bid.params;
   if (mediaType === 'video') {
@@ -898,7 +925,7 @@ function parseSizes(bid, mediaType) {
         params.video.playerWidth,
         params.video.playerHeight
       ];
-    } else if (Array.isArray(utils.deepAccess(bid, 'mediaTypes.video.playerSize')) && bid.mediaTypes.video.playerSize.length === 1) {
+    } else if (Array.isArray(deepAccess(bid, 'mediaTypes.video.playerSize')) && bid.mediaTypes.video.playerSize.length === 1) {
       size = bid.mediaTypes.video.playerSize[0];
     } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0 && Array.isArray(bid.sizes[0]) && bid.sizes[0].length > 1) {
       size = bid.sizes[0];
@@ -910,12 +937,12 @@ function parseSizes(bid, mediaType) {
   let sizes = [];
   if (Array.isArray(params.sizes)) {
     sizes = params.sizes;
-  } else if (typeof utils.deepAccess(bid, 'mediaTypes.banner.sizes') !== 'undefined') {
+  } else if (typeof deepAccess(bid, 'mediaTypes.banner.sizes') !== 'undefined') {
     sizes = mapSizes(bid.mediaTypes.banner.sizes);
   } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
-    sizes = mapSizes(bid.sizes)
+    sizes = mapSizes(bid.sizes);
   } else {
-    utils.logWarn('Rubicon: no sizes are setup or found');
+    logWarn('Rubicon: no sizes are setup or found');
   }
 
   return masSizeOrdering(sizes);
@@ -944,7 +971,11 @@ function appendSiteAppDevice(data, bidRequest, bidderRequest) {
   if (bidRequest.params.video.language) {
     ['site', 'device'].forEach(function(param) {
       if (data[param]) {
-        data[param].content = Object.assign({language: bidRequest.params.video.language}, data[param].content)
+        if (param === 'site') {
+          data[param].content = Object.assign({language: bidRequest.params.video.language}, data[param].content)
+        } else {
+          data[param] = Object.assign({language: bidRequest.params.video.language}, data[param])
+        }
       }
     });
   }
@@ -976,12 +1007,97 @@ function addVideoParameters(data, bidRequest) {
   data.imp[0].video.h = size[1]
 }
 
+function applyFPD(bidRequest, mediaType, data) {
+  const BID_FPD = {
+    user: {ext: {data: {...bidRequest.params.visitor}}},
+    site: {ext: {data: {...bidRequest.params.inventory}}}
+  };
+
+  if (bidRequest.params.keywords) BID_FPD.site.keywords = (isArray(bidRequest.params.keywords)) ? bidRequest.params.keywords.join(',') : bidRequest.params.keywords;
+
+  let fpd = mergeDeep({}, bidRequest.ortb2 || {}, BID_FPD);
+  let impExt = deepAccess(bidRequest.ortb2Imp, 'ext') || {};
+  let impExtData = deepAccess(bidRequest.ortb2Imp, 'ext.data') || {};
+
+  const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid');
+  const SEGTAX = {user: [4], site: [1, 2, 5, 6]};
+  const MAP = {user: 'tg_v.', site: 'tg_i.', adserver: 'tg_i.dfp_ad_unit_code', pbadslot: 'tg_i.pbadslot', keywords: 'kw'};
+  const validate = function(prop, key, parentName) {
+    if (key === 'data' && Array.isArray(prop)) {
+      return prop.filter(name => name.segment && deepAccess(name, 'ext.segtax') && SEGTAX[parentName] &&
+        SEGTAX[parentName].indexOf(deepAccess(name, 'ext.segtax')) !== -1).map(value => {
+        let segments = value.segment.filter(obj => obj.id).reduce((result, obj) => {
+          result.push(obj.id);
+          return result;
+        }, []);
+        if (segments.length > 0) return segments.toString();
+      }).toString();
+    } else if (typeof prop === 'object' && !Array.isArray(prop)) {
+      return undefined;
+    } else if (typeof prop !== 'undefined') {
+      return (Array.isArray(prop)) ? prop.filter(value => {
+        if (typeof value !== 'object' && typeof value !== 'undefined') return value.toString();
+
+        logWarn('Rubicon: Filtered value: ', value, 'for key', key, ': Expected value to be string, integer, or an array of strings/ints');
+      }).toString() : prop.toString();
+    }
+  };
+  const addBannerData = function(obj, name, key, isParent = true) {
+    let val = validate(obj, key, name);
+    let loc = (MAP[key] && isParent) ? `${MAP[key]}` : (key === 'data') ? `${MAP[name]}iab` : `${MAP[name]}${key}`;
+    data[loc] = (data[loc]) ? data[loc].concat(',', val) : val;
+  };
+
+  if (mediaType === BANNER) {
+    ['site', 'user'].forEach(name => {
+      Object.keys(fpd[name]).forEach((key) => {
+        if (name === 'site' && key === 'content' && fpd[name][key].data) {
+          addBannerData(fpd[name][key].data, name, 'data');
+        } else if (key !== 'ext') {
+          addBannerData(fpd[name][key], name, key);
+        } else if (fpd[name][key].data) {
+          Object.keys(fpd[name].ext.data).forEach((key) => {
+            addBannerData(fpd[name].ext.data[key], name, key, false);
+          });
+        }
+      });
+    });
+    Object.keys(impExtData).forEach((key) => {
+      if (key !== 'adserver') {
+        addBannerData(impExtData[key], 'site', key);
+      } else if (impExtData[key].name === 'gam') {
+        addBannerData(impExtData[key].adslot, name, key)
+      }
+    });
+
+    // add in gpid
+    if (gpid) {
+      data['p_gpid'] = gpid;
+    }
+
+    // only send one of pbadslot or dfp adunit code (prefer pbadslot)
+    if (data['tg_i.pbadslot']) {
+      delete data['tg_i.dfp_ad_unit_code'];
+    }
+  } else {
+    if (Object.keys(impExt).length) {
+      mergeDeep(data.imp[0].ext, impExt);
+    }
+    // add in gpid
+    if (gpid) {
+      data.imp[0].ext.gpid = gpid;
+    }
+
+    mergeDeep(data, fpd);
+  }
+}
+
 /**
  * @param sizes
  * @returns {*}
  */
 function mapSizes(sizes) {
-  return utils.parseSizesInput(sizes)
+  return parseSizesInput(sizes)
   // map sizes while excluding non-matches
     .reduce((result, size) => {
       let mappedSize = parseInt(sizeMap[size], 10);
@@ -994,15 +1110,25 @@ function mapSizes(sizes) {
 
 /**
  * Test if bid has mediaType or mediaTypes set for video.
- * Also makes sure the video object is present in the rubicon bidder params
+ * Also checks if the video object is present in the rubicon bidder params
  * @param {BidRequest} bidRequest
  * @returns {boolean}
  */
-export function hasVideoMediaType(bidRequest) {
-  if (typeof utils.deepAccess(bidRequest, 'params.video') !== 'object') {
-    return false;
+export function classifiedAsVideo(bidRequest) {
+  let isVideo = typeof deepAccess(bidRequest, `mediaTypes.${VIDEO}`) !== 'undefined';
+  let isBanner = typeof deepAccess(bidRequest, `mediaTypes.${BANNER}`) !== 'undefined';
+  let isMissingVideoParams = typeof deepAccess(bidRequest, 'params.video') !== 'object';
+  // If an ad has both video and banner types, a legacy implementation allows choosing video over banner
+  // based on whether or not there is a video object defined in the params
+  // Given this legacy implementation, other code depends on params.video being defined
+
+  if (isBanner && isMissingVideoParams) {
+    isVideo = false;
+  }
+  if (isVideo && isMissingVideoParams) {
+    deepSetValue(bidRequest, 'params.video', {});
   }
-  return (typeof utils.deepAccess(bidRequest, `mediaTypes.${VIDEO}`) !== 'undefined');
+  return isVideo;
 }
 
 /**
@@ -1013,12 +1139,12 @@ export function hasVideoMediaType(bidRequest) {
  */
 function bidType(bid, log = false) {
   // Is it considered video ad unit by rubicon
-  if (hasVideoMediaType(bid)) {
+  if (classifiedAsVideo(bid)) {
     // Removed legacy mediaType support. new way using mediaTypes.video object is now required
     // We require either context as instream or outstream
-    if (['outstream', 'instream'].indexOf(utils.deepAccess(bid, `mediaTypes.${VIDEO}.context`)) === -1) {
+    if (['outstream', 'instream'].indexOf(deepAccess(bid, `mediaTypes.${VIDEO}.context`)) === -1) {
       if (log) {
-        utils.logError('Rubicon: mediaTypes.video.context must be outstream or instream');
+        logError('Rubicon: mediaTypes.video.context must be outstream or instream');
       }
       return;
     }
@@ -1026,13 +1152,13 @@ function bidType(bid, log = false) {
     // we require playerWidth and playerHeight to come from one of params.playerWidth/playerHeight or mediaTypes.video.playerSize or adUnit.sizes
     if (parseSizes(bid, 'video').length < 2) {
       if (log) {
-        utils.logError('Rubicon: could not determine the playerSize of the video');
+        logError('Rubicon: could not determine the playerSize of the video');
       }
       return;
     }
 
     if (log) {
-      utils.logMessage('Rubicon: making video request for adUnit', bid.adUnitCode);
+      logMessage('Rubicon: making video request for adUnit', bid.adUnitCode);
     }
     return 'video';
   } else {
@@ -1040,19 +1166,20 @@ function bidType(bid, log = false) {
     // if we cannot determine them, we reject it!
     if (parseSizes(bid, 'banner').length === 0) {
       if (log) {
-        utils.logError('Rubicon: could not determine the sizes for banner request');
+        logError('Rubicon: could not determine the sizes for banner request');
       }
       return;
     }
 
     // everything looks good for banner so lets do it
     if (log) {
-      utils.logMessage('Rubicon: making banner request for adUnit', bid.adUnitCode);
+      logMessage('Rubicon: making banner request for adUnit', bid.adUnitCode);
     }
     return 'banner';
   }
 }
 
+export const resetRubiConf = () => rubiConf = {};
 export function masSizeOrdering(sizes) {
   const MAS_SIZE_PRIORITY = [15, 2, 9];
 
@@ -1078,13 +1205,13 @@ export function masSizeOrdering(sizes) {
 
 export function determineRubiconVideoSizeId(bid) {
   // If we have size_id in the bid then use it
-  let rubiconSizeId = parseInt(utils.deepAccess(bid, 'params.video.size_id'));
+  let rubiconSizeId = parseInt(deepAccess(bid, 'params.video.size_id'));
   if (!isNaN(rubiconSizeId)) {
     return rubiconSizeId;
   }
   // otherwise 203 for outstream and 201 for instream
   // When this function is used we know it has to be one of outstream or instream
-  return utils.deepAccess(bid, `mediaTypes.${VIDEO}.context`) === 'outstream' ? 203 : 201;
+  return deepAccess(bid, `mediaTypes.${VIDEO}.context`) === 'outstream' ? 203 : 201;
 }
 
 /**
@@ -1122,15 +1249,14 @@ export function hasValidVideoParams(bid) {
   var requiredParams = {
     mimes: arrayType,
     protocols: arrayType,
-    maxduration: numberType,
     linearity: numberType,
     api: arrayType
   }
   // loop through each param and verify it has the correct
   Object.keys(requiredParams).forEach(function(param) {
-    if (Object.prototype.toString.call(utils.deepAccess(bid, 'mediaTypes.video.' + param)) !== requiredParams[param]) {
+    if (Object.prototype.toString.call(deepAccess(bid, 'mediaTypes.video.' + param)) !== requiredParams[param]) {
       isValid = false;
-      utils.logError('Rubicon: mediaTypes.video.' + param + ' is required and must be of type: ' + requiredParams[param]);
+      logError('Rubicon: mediaTypes.video.' + param + ' is required and must be of type: ' + requiredParams[param]);
     }
   })
   return isValid;
@@ -1147,15 +1273,14 @@ export function hasValidSupplyChainParams(schain) {
   if (!schain.nodes) return isValid;
   isValid = schain.nodes.reduce((status, node) => {
     if (!status) return status;
-    return requiredFields.every(field => node[field]);
+    return requiredFields.every(field => node.hasOwnProperty(field));
   }, true);
-  if (!isValid) utils.logError('Rubicon: required schain params missing');
+  if (!isValid) logError('Rubicon: required schain params missing');
   return isValid;
 }
 
 /**
- * Creates a URL key value param, encoding the
- * param unless the key is schain
+ * Creates a URL key value param, encoding the param unless the key is schain
  * @param {String} key
  * @param {String} param
  * @returns {String}
diff --git a/modules/rubiconBidAdapter.md b/modules/rubiconBidAdapter.md
index beb29a6baf1..0ef22a81972 100644
--- a/modules/rubiconBidAdapter.md
+++ b/modules/rubiconBidAdapter.md
@@ -70,9 +70,9 @@ globalsupport@rubiconproject.com for more information.
        bids: [{
         bidder: 'rubicon',
         params: {
-            accountId: '7780',
-            siteId: '87184',
-            zoneId: '412394',
+            accountId: 7780,
+            siteId: 87184,
+            zoneId: 412394,
             video: {
                 language: 'en'
             }
diff --git a/modules/s2sTesting.js b/modules/s2sTesting.js
index 98b3b86671c..8e9628c8810 100644
--- a/modules/s2sTesting.js
+++ b/modules/s2sTesting.js
@@ -1,47 +1,38 @@
-import { config } from '../src/config.js';
-import { setS2STestingModule } from '../src/adapterManager.js';
+import {PARTITIONS, partitionBidders, filterBidsForAdUnit, getS2SBidderSet} from '../src/adapterManager.js';
+import {find} from '../src/polyfill.js';
+import {getBidderCodes, logWarn} from '../src/utils.js';
 
-let s2sTesting = {};
-
-const SERVER = 'server';
-const CLIENT = 'client';
-
-s2sTesting.SERVER = SERVER;
-s2sTesting.CLIENT = CLIENT;
+const {CLIENT, SERVER} = PARTITIONS;
+export const s2sTesting = {
+  ...PARTITIONS,
+  clientTestBidders: new Set()
+};
 
-var testing = false; // whether testing is turned on
-var bidSource = {}; // store bidder sources determined from s2sConfing bidderControl
+s2sTesting.bidSource = {}; // store bidder sources determined from s2sConfig bidderControl
 s2sTesting.globalRand = Math.random(); // if 10% of bidderA and 10% of bidderB should be server-side, make it the same 10%
 
-// load s2sConfig
-config.getConfig('s2sConfig', config => {
-  testing = config.s2sConfig && config.s2sConfig.testing;
-  s2sTesting.calculateBidSources(config.s2sConfig);
-});
-
-s2sTesting.getSourceBidderMap = function(adUnits = []) {
+s2sTesting.getSourceBidderMap = function(adUnits = [], allS2SBidders = []) {
   var sourceBidders = {[SERVER]: {}, [CLIENT]: {}};
 
-  // bail if testing is not turned on
-  if (!testing) {
-    return {[SERVER]: [], [CLIENT]: []};
-  }
-
   adUnits.forEach((adUnit) => {
     // if any adUnit bidders specify a bidSource, include them
     (adUnit.bids || []).forEach((bid) => {
+      // When a s2sConfig does not have testing=true and did not calc bid sources
+      if (allS2SBidders.indexOf(bid.bidder) > -1 && !s2sTesting.bidSource[bid.bidder]) {
+        s2sTesting.bidSource[bid.bidder] = SERVER;
+      }
       // calculate the source once and store on bid object
       bid.calcSource = bid.calcSource || s2sTesting.getSource(bid.bidSource);
       // if no bidSource at bid level, default to bidSource from bidder
-      bid.finalSource = bid.calcSource || bidSource[bid.bidder] || CLIENT; // default to client
+      bid.finalSource = bid.calcSource || s2sTesting.bidSource[bid.bidder] || CLIENT; // default to client
       // add bidder to sourceBidders data structure
       sourceBidders[bid.finalSource][bid.bidder] = true;
     });
   });
 
   // make sure all bidders in bidSource are in sourceBidders
-  Object.keys(bidSource).forEach((bidder) => {
-    sourceBidders[bidSource[bidder]][bidder] = true;
+  Object.keys(s2sTesting.bidSource).forEach((bidder) => {
+    sourceBidders[s2sTesting.bidSource[bidder]][bidder] = true;
   });
 
   // return map of source => array of bidders
@@ -49,24 +40,20 @@ s2sTesting.getSourceBidderMap = function(adUnits = []) {
     [SERVER]: Object.keys(sourceBidders[SERVER]),
     [CLIENT]: Object.keys(sourceBidders[CLIENT])
   };
-};
+}
 
 /**
  * @function calculateBidSources determines the source for each s2s bidder based on bidderControl weightings.  these can be overridden at the adUnit level
- * @param s2sConfig server-to-server configuration
+ * @param s2sConfigs server-to-server configuration
  */
 s2sTesting.calculateBidSources = function(s2sConfig = {}) {
-  // bail if testing is not turned on
-  if (!testing) {
-    return;
-  }
-  bidSource = {}; // reset bid sources
   // calculate bid source (server/client) for each s2s bidder
+
   var bidderControl = s2sConfig.bidderControl || {};
   (s2sConfig.bidders || []).forEach((bidder) => {
-    bidSource[bidder] = s2sTesting.getSource(bidderControl[bidder] && bidderControl[bidder].bidSource) || SERVER; // default to server
+    s2sTesting.bidSource[bidder] = s2sTesting.getSource(bidderControl[bidder] && bidderControl[bidder].bidSource) || SERVER; // default to server
   });
-};
+}
 
 /**
  * @function getSource() gets a random source based on the given sourceWeights (export just for testing)
@@ -89,10 +76,59 @@ s2sTesting.getSource = function(sourceWeights = {}, bidSources = [SERVER, CLIENT
     // choose the first source with an incremental weight > random weight
     if (rndWeight < srcIncWeight[source]) return source;
   }
-};
+}
+
+function doingS2STesting(s2sConfig) {
+  return s2sConfig && s2sConfig.enabled && s2sConfig.testing;
+}
+
+function isTestingServerOnly(s2sConfig) {
+  return Boolean(doingS2STesting(s2sConfig) && s2sConfig.testServerOnly);
+}
 
-// inject the s2sTesting module into the adapterManager rather than importing it
-// importing it causes the packager to include it even when it's not explicitly included in the build
-setS2STestingModule(s2sTesting);
+const adUnitsContainServerRequests = (adUnits, s2sConfig) => Boolean(
+  find(adUnits, adUnit => find(adUnit.bids, bid => (
+    bid.bidSource ||
+    (s2sConfig.bidderControl && s2sConfig.bidderControl[bid.bidder])
+  ) && bid.finalSource === SERVER))
+);
+
+partitionBidders.before(function (next, adUnits, s2sConfigs) {
+  const serverBidders = getS2SBidderSet(s2sConfigs);
+  let serverOnly = false;
+
+  s2sConfigs.forEach((s2sConfig) => {
+    if (doingS2STesting(s2sConfig)) {
+      s2sTesting.calculateBidSources(s2sConfig);
+      const bidderMap = s2sTesting.getSourceBidderMap(adUnits, [...serverBidders]);
+      // get all adapters doing client testing
+      bidderMap[CLIENT].forEach((bidder) => s2sTesting.clientTestBidders.add(bidder))
+    }
+    if (isTestingServerOnly(s2sConfig) && adUnitsContainServerRequests(adUnits, s2sConfig)) {
+      logWarn('testServerOnly: True.  All client requests will be suppressed.');
+      serverOnly = true;
+    }
+  });
+
+  next.bail(getBidderCodes(adUnits).reduce((memo, bidder) => {
+    if (serverBidders.has(bidder)) {
+      memo[SERVER].push(bidder);
+    }
+    if (!serverOnly && (!serverBidders.has(bidder) || s2sTesting.clientTestBidders.has(bidder))) {
+      memo[CLIENT].push(bidder);
+    }
+    return memo;
+  }, {[CLIENT]: [], [SERVER]: []}));
+});
+
+filterBidsForAdUnit.before(function(next, bids, s2sConfig) {
+  if (s2sConfig == null) {
+    next.bail(bids.filter((bid) => !s2sTesting.clientTestBidders.size || bid.finalSource !== SERVER));
+  } else {
+    const serverBidders = getS2SBidderSet(s2sConfig);
+    next.bail(bids.filter((bid) => serverBidders.has(bid.bidder) &&
+      (!doingS2STesting(s2sConfig) || bid.finalSource !== CLIENT)));
+  }
+});
 
 export default s2sTesting;
diff --git a/modules/saambaaBidAdapter.js b/modules/saambaaBidAdapter.js
new file mode 100644
index 00000000000..5300fe879b0
--- /dev/null
+++ b/modules/saambaaBidAdapter.js
@@ -0,0 +1,420 @@
+// TODO: this adapter appears to have no tests
+
+import {deepAccess, generateUUID, isEmpty, isFn, parseSizesInput, parseUrl} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {find, includes} from '../src/polyfill.js';
+
+const ADAPTER_VERSION = '1.0';
+const BIDDER_CODE = 'saambaa';
+
+export const VIDEO_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';
+export const BANNER_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';
+export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/loader/outstream.js';
+export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'skip', 'playerSize', 'context'];
+export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
+
+let pubid = '';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid(bidRequest) {
+    if (typeof bidRequest != 'undefined') {
+      if (bidRequest.bidder !== BIDDER_CODE && typeof bidRequest.params === 'undefined') { return false; }
+      if (bidRequest === '' || bidRequest.params.placement === '' || bidRequest.params.pubid === '') { return false; }
+      return true;
+    } else { return false; }
+  },
+
+  buildRequests(bids, bidderRequest) {
+    let requests = [];
+    let videoBids = bids.filter(bid => isVideoBidValid(bid));
+    let bannerBids = bids.filter(bid => isBannerBidValid(bid));
+    videoBids.forEach(bid => {
+      pubid = getVideoBidParam(bid, 'pubid');
+      requests.push({
+        method: 'POST',
+        url: VIDEO_ENDPOINT + pubid,
+        data: createVideoRequestData(bid, bidderRequest),
+        bidRequest: bid
+      });
+    });
+
+    bannerBids.forEach(bid => {
+      pubid = getBannerBidParam(bid, 'pubid');
+
+      requests.push({
+        method: 'POST',
+        url: BANNER_ENDPOINT + pubid,
+        data: createBannerRequestData(bid, bidderRequest),
+        bidRequest: bid
+      });
+    });
+    return requests;
+  },
+
+  interpretResponse(serverResponse, {bidRequest}) {
+    let response = serverResponse.body;
+    if (response !== null && isEmpty(response) == false) {
+      if (isVideoBid(bidRequest)) {
+        let bidResponse = {
+          requestId: response.id,
+          bidderCode: BIDDER_CODE,
+          cpm: response.seatbid[0].bid[0].price,
+          width: response.seatbid[0].bid[0].w,
+          height: response.seatbid[0].bid[0].h,
+          ttl: response.seatbid[0].bid[0].ttl || 60,
+          creativeId: response.seatbid[0].bid[0].crid,
+          currency: response.cur,
+          meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
+          mediaType: VIDEO,
+          netRevenue: true
+        }
+
+        if (response.seatbid[0].bid[0].adm) {
+          bidResponse.vastXml = response.seatbid[0].bid[0].adm;
+          bidResponse.adResponse = {
+            content: response.seatbid[0].bid[0].adm
+          };
+        } else {
+          bidResponse.vastUrl = response.seatbid[0].bid[0].nurl;
+        }
+
+        return bidResponse;
+      } else {
+        return {
+          requestId: response.id,
+          bidderCode: BIDDER_CODE,
+          cpm: response.seatbid[0].bid[0].price,
+          width: response.seatbid[0].bid[0].w,
+          height: response.seatbid[0].bid[0].h,
+          ad: response.seatbid[0].bid[0].adm,
+          ttl: response.seatbid[0].bid[0].ttl || 60,
+          creativeId: response.seatbid[0].bid[0].crid,
+          currency: response.cur,
+          meta: { 'advertiserDomains': response.seatbid[0].bid[0].adomain },
+          mediaType: BANNER,
+          netRevenue: true
+        }
+      }
+    }
+  }
+};
+
+function isBannerBid(bid) {
+  return deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
+}
+
+function isVideoBid(bid) {
+  return deepAccess(bid, 'mediaTypes.video');
+}
+
+function getBannerBidFloor(bid) {
+  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'banner', size: '*' }) : {};
+  return floorInfo.floor || getBannerBidParam(bid, 'bidfloor');
+}
+
+function getVideoBidFloor(bid) {
+  let floorInfo = isFn(bid.getFloor) ? bid.getFloor({ currency: 'USD', mediaType: 'video', size: '*' }) : {};
+  return floorInfo.floor || getVideoBidParam(bid, 'bidfloor');
+}
+
+function isVideoBidValid(bid) {
+  return isVideoBid(bid) && getVideoBidParam(bid, 'pubid') && getVideoBidParam(bid, 'placement');
+}
+
+function isBannerBidValid(bid) {
+  return isBannerBid(bid) && getBannerBidParam(bid, 'pubid') && getBannerBidParam(bid, 'placement');
+}
+
+function getVideoBidParam(bid, key) {
+  return deepAccess(bid, 'params.video.' + key) || deepAccess(bid, 'params.' + key);
+}
+
+function getBannerBidParam(bid, key) {
+  return deepAccess(bid, 'params.banner.' + key) || deepAccess(bid, 'params.' + key);
+}
+
+function isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
+}
+
+function isConnectedTV() {
+  return (/(smart[-]?tv|hbbtv|appletv|googletv|hdmi|netcast\.tv|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b)/i).test(navigator.userAgent);
+}
+
+function getDoNotTrack() {
+  return navigator.doNotTrack === '1' || window.doNotTrack === '1' || navigator.msDoNoTrack === '1' || navigator.doNotTrack === 'yes';
+}
+
+function findAndFillParam(o, key, value) {
+  try {
+    if (typeof value === 'function') {
+      o[key] = value();
+    } else {
+      o[key] = value;
+    }
+  } catch (ex) {}
+}
+
+function getOsVersion() {
+  let clientStrings = [
+    { s: 'Android', r: /Android/ },
+    { s: 'iOS', r: /(iPhone|iPad|iPod)/ },
+    { s: 'Mac OS X', r: /Mac OS X/ },
+    { s: 'Mac OS', r: /(MacPPC|MacIntel|Mac_PowerPC|Macintosh)/ },
+    { s: 'Linux', r: /(Linux|X11)/ },
+    { s: 'Windows 10', r: /(Windows 10.0|Windows NT 10.0)/ },
+    { s: 'Windows 8.1', r: /(Windows 8.1|Windows NT 6.3)/ },
+    { s: 'Windows 8', r: /(Windows 8|Windows NT 6.2)/ },
+    { s: 'Windows 7', r: /(Windows 7|Windows NT 6.1)/ },
+    { s: 'Windows Vista', r: /Windows NT 6.0/ },
+    { s: 'Windows Server 2003', r: /Windows NT 5.2/ },
+    { s: 'Windows XP', r: /(Windows NT 5.1|Windows XP)/ },
+    { s: 'UNIX', r: /UNIX/ },
+    { s: 'Search Bot', r: /(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves\/Teoma|ia_archiver)/ }
+  ];
+  let cs = find(clientStrings, cs => cs.r.test(navigator.userAgent));
+  return cs ? cs.s : 'unknown';
+}
+
+function getFirstSize(sizes) {
+  return (sizes && sizes.length) ? sizes[0] : { w: undefined, h: undefined };
+}
+
+function parseSizes(sizes) {
+  return parseSizesInput(sizes).map(size => {
+    let [ width, height ] = size.split('x');
+    return {
+      w: parseInt(width, 10) || undefined,
+      h: parseInt(height, 10) || undefined
+    };
+  });
+}
+
+function getVideoSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
+}
+
+function getBannerSizes(bid) {
+  return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
+}
+
+function getTopWindowReferrer() {
+  try {
+    return window.top.document.referrer;
+  } catch (e) {
+    return '';
+  }
+}
+
+function getVideoTargetingParams(bid) {
+  const result = {};
+  const excludeProps = ['playerSize', 'context', 'w', 'h'];
+  Object.keys(Object(bid.mediaTypes.video))
+    .filter(key => !includes(excludeProps, key))
+    .forEach(key => {
+      result[ key ] = bid.mediaTypes.video[ key ];
+    });
+  Object.keys(Object(bid.params.video))
+    .filter(key => includes(VIDEO_TARGETING, key))
+    .forEach(key => {
+      result[ key ] = bid.params.video[ key ];
+    });
+  return result;
+}
+
+function createVideoRequestData(bid, bidderRequest) {
+  let topLocation = getTopWindowLocation(bidderRequest);
+  let topReferrer = getTopWindowReferrer();
+
+  // if size is explicitly given via adapter params
+  let paramSize = getVideoBidParam(bid, 'size');
+  let sizes = [];
+  let coppa = config.getConfig('coppa');
+
+  if (typeof paramSize !== 'undefined' && paramSize != '') {
+    sizes = parseSizes(paramSize);
+  } else {
+    sizes = getVideoSizes(bid);
+  }
+  const firstSize = getFirstSize(sizes);
+  let floor = (getVideoBidFloor(bid) == null || typeof getVideoBidFloor(bid) == 'undefined') ? 0.5 : getVideoBidFloor(bid);
+  let video = getVideoTargetingParams(bid);
+  const o = {
+    'device': {
+      'langauge': (global.navigator.language).split('-')[0],
+      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
+      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
+      'js': 1,
+      'os': getOsVersion()
+    },
+    'at': 2,
+    'site': {},
+    'tmax': 3000,
+    'cur': ['USD'],
+    'id': bid.bidId,
+    'imp': [],
+    'regs': {
+      'ext': {
+      }
+    },
+    'user': {
+      'ext': {
+      }
+    }
+  };
+
+  o.site['page'] = topLocation.href;
+  o.site['domain'] = topLocation.hostname;
+  o.site['search'] = topLocation.search;
+  o.site['domain'] = topLocation.hostname;
+  o.site['ref'] = topReferrer;
+  o.site['mobile'] = isMobile() ? 1 : 0;
+  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
+
+  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
+
+  findAndFillParam(o.site, 'name', function() {
+    return global.top.document.title;
+  });
+
+  findAndFillParam(o.device, 'h', function() {
+    return global.screen.height;
+  });
+  findAndFillParam(o.device, 'w', function() {
+    return global.screen.width;
+  });
+
+  let placement = getVideoBidParam(bid, 'placement');
+
+  for (let j = 0; j < sizes.length; j++) {
+    o.imp.push({
+      'id': '' + j,
+      'displaymanager': '' + BIDDER_CODE,
+      'displaymanagerver': '' + ADAPTER_VERSION,
+      'tagId': placement,
+      'bidfloor': floor,
+      'bidfloorcur': 'USD',
+      'secure': secure,
+      'video': Object.assign({
+        'id': generateUUID(),
+        'pos': 0,
+        'w': firstSize.w,
+        'h': firstSize.h,
+        'mimes': DEFAULT_MIMES
+      }, video)
+
+    });
+  }
+  if (coppa) {
+    o.regs.ext = {'coppa': 1};
+  }
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
+    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
+    o.user.ext = {'consent': consentString};
+  }
+
+  return o;
+}
+
+function getTopWindowLocation(bidderRequest) {
+  return parseUrl(bidderRequest?.refererInfo?.page || '', { decodeSearchAsString: true });
+}
+
+function createBannerRequestData(bid, bidderRequest) {
+  let topLocation = getTopWindowLocation(bidderRequest);
+  let topReferrer = getTopWindowReferrer();
+
+  // if size is explicitly given via adapter params
+
+  let paramSize = getBannerBidParam(bid, 'size');
+  let sizes = [];
+  let coppa = config.getConfig('coppa');
+  if (typeof paramSize !== 'undefined' && paramSize != '') {
+    sizes = parseSizes(paramSize);
+  } else {
+    sizes = getBannerSizes(bid);
+  }
+
+  let floor = (getBannerBidFloor(bid) == null || typeof getBannerBidFloor(bid) == 'undefined') ? 0.1 : getBannerBidFloor(bid);
+  const o = {
+    'device': {
+      'langauge': (global.navigator.language).split('-')[0],
+      'dnt': (global.navigator.doNotTrack === 1 ? 1 : 0),
+      'devicetype': isMobile() ? 4 : isConnectedTV() ? 3 : 2,
+      'js': 1
+    },
+    'at': 2,
+    'site': {},
+    'tmax': 3000,
+    'cur': ['USD'],
+    'id': bid.bidId,
+    'imp': [],
+    'regs': {
+      'ext': {
+      }
+    },
+    'user': {
+      'ext': {
+      }
+    }
+  };
+
+  o.site['page'] = topLocation.href;
+  o.site['domain'] = topLocation.hostname;
+  o.site['search'] = topLocation.search;
+  o.site['domain'] = topLocation.hostname;
+  o.site['ref'] = topReferrer;
+  o.site['mobile'] = isMobile() ? 1 : 0;
+  const secure = topLocation.protocol.indexOf('https') === 0 ? 1 : 0;
+
+  o.device['dnt'] = getDoNotTrack() ? 1 : 0;
+
+  findAndFillParam(o.site, 'name', function() {
+    return global.top.document.title;
+  });
+
+  findAndFillParam(o.device, 'h', function() {
+    return global.screen.height;
+  });
+  findAndFillParam(o.device, 'w', function() {
+    return global.screen.width;
+  });
+
+  let placement = getBannerBidParam(bid, 'placement');
+  for (let j = 0; j < sizes.length; j++) {
+    let size = sizes[j];
+
+    o.imp.push({
+      'id': '' + j,
+      'displaymanager': '' + BIDDER_CODE,
+      'displaymanagerver': '' + ADAPTER_VERSION,
+      'tagId': placement,
+      'bidfloor': floor,
+      'bidfloorcur': 'USD',
+      'secure': secure,
+      'banner': {
+        'id': generateUUID(),
+        'pos': 0,
+        'w': size['w'],
+        'h': size['h']
+      }
+    });
+  }
+  if (coppa) {
+    o.regs.ext = {'coppa': 1};
+  }
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    let { gdprApplies, consentString } = bidderRequest.gdprConsent;
+    o.regs.ext = {'gdpr': gdprApplies ? 1 : 0};
+    o.user.ext = {'consent': consentString};
+  }
+
+  return o;
+}
+registerBidder(spec);
diff --git a/modules/saambaaBidAdapter.md b/modules/saambaaBidAdapter.md
new file mode 100755
index 00000000000..d58e3f0abfa
--- /dev/null
+++ b/modules/saambaaBidAdapter.md
@@ -0,0 +1,66 @@
+# Overview
+
+```
+Module Name: Saambaa Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: matt.voigt@saambaa.com
+```
+
+# Description
+
+Connects to Saambaa exchange for bids.
+
+Saambaa bid adapter supports Banner and Video ads currently.
+
+For more informatio
+
+# Sample Display Ad Unit: For Publishers
+```javascript
+
+var displayAdUnit = [
+{
+    code: 'display',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250],[320, 50]]
+        }
+    }
+    bids: [{
+        bidder: 'saambaa',
+        params: {
+            pubid: '121ab139faf7ac67428a23f1d0a9a71b',
+			placement: 1234,
+			size: '320x50'
+        }
+    }]
+}];
+```
+
+# Sample Video Ad Unit: For Publishers
+```javascript
+
+var videoAdUnit = {
+	code: 'video',
+	sizes: [320,480],
+	mediaTypes: {
+	  video: {
+	  	playerSize : [[320, 480]], 
+	  	context: 'instream',
+		  skip: 1,
+      mimes : ['video/mp4', 'application/javascript'],
+      playbackmethod : [2,6],
+      maxduration: 30
+	  }
+	},
+    bids: [
+      {
+      	bidder: 'saambaa',
+      	params: {
+        	pubid: '121ab139faf7ac67428a23f1d0a9a71b',
+			placement: 1234,
+			size: "320x480"
+      	}
+      }
+    ]
+  };
+```
\ No newline at end of file
diff --git a/modules/saraBidAdapter.md b/modules/saraBidAdapter.md
deleted file mode 100644
index 65572528181..00000000000
--- a/modules/saraBidAdapter.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Overview
-
-Module Name: Sara Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: github@sara.media
-
-# Description
-
-Module that connects to Sara demand source to fetch bids.
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "sara",
-                       params: {
-                           uid: '5',
-                           priceType: 'gross' // by default is 'net'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[728, 90]],
-               bids: [
-                   {
-                       bidder: "sara",
-                       params: {
-                           uid: 6,
-                           priceType: 'gross'
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/scaleableAnalyticsAdapter.js b/modules/scaleableAnalyticsAdapter.js
index 955a08c065a..46f9d45d84d 100644
--- a/modules/scaleableAnalyticsAdapter.js
+++ b/modules/scaleableAnalyticsAdapter.js
@@ -2,9 +2,9 @@
 
 import { ajax } from '../src/ajax.js';
 import CONSTANTS from '../src/constants.json';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-import * as utils from '../src/utils.js';
+import { logMessage } from '../src/utils.js';
 
 // Object.entries polyfill
 const entries = Object.entries || function(obj) {
@@ -62,7 +62,7 @@ scaleableAnalytics.enableAnalytics = config => {
   scaleableAnalytics.originEnableAnalytics(config);
 
   scaleableAnalytics.enableAnalytics = function _enable() {
-    return utils.logMessage(`Analytics adapter for "${global}" already enabled, unnecessary call to \`enableAnalytics\`.`);
+    return logMessage(`Analytics adapter for "${global}" already enabled, unnecessary call to \`enableAnalytics\`.`);
   };
 }
 
diff --git a/modules/schain.js b/modules/schain.js
index d409e74df48..eac2cb93b0a 100644
--- a/modules/schain.js
+++ b/modules/schain.js
@@ -1,6 +1,18 @@
 import { config } from '../src/config.js';
 import adapterManager from '../src/adapterManager.js';
-import { isNumber, isStr, isArray, isPlainObject, hasOwn, logError, isInteger, _each, logWarn } from '../src/utils.js';
+import {
+  isNumber,
+  isStr,
+  isArray,
+  isPlainObject,
+  hasOwn,
+  logError,
+  isInteger,
+  _each,
+  logWarn,
+  deepAccess, deepSetValue
+} from '../src/utils.js';
+import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 
 // https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/supplychainobject.md
 
@@ -19,7 +31,7 @@ _each(MODE, mode => MODES.push(mode));
 
 // validate the supply chain object
 export function isSchainObjectValid(schainObject, returnOnError) {
-  let failPrefix = 'Detected something wrong within an schain config:'
+  let failPrefix = 'Detected something wrong within an schain config:';
   let failMsg = '';
 
   function appendFailMsg(msg) {
@@ -181,3 +193,14 @@ export function init() {
 }
 
 init()
+
+export function setOrtbSourceExtSchain(ortbRequest, bidderRequest, context) {
+  if (!deepAccess(ortbRequest, 'source.ext.schain')) {
+    const schain = deepAccess(context, 'bidRequests.0.schain');
+    if (schain) {
+      deepSetValue(ortbRequest, 'source.ext.schain', schain);
+    }
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'sourceExtSchain', fn: setOrtbSourceExtSchain});
diff --git a/modules/seedingAllianceBidAdapter.js b/modules/seedingAllianceBidAdapter.js
index b6acd7214a2..64b9cd5d4aa 100755
--- a/modules/seedingAllianceBidAdapter.js
+++ b/modules/seedingAllianceBidAdapter.js
@@ -3,12 +3,14 @@
 
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { NATIVE } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
+import { _map, deepSetValue, isEmpty, deepAccess } from '../src/utils.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'seedingAlliance';
+const GVL_ID = 371;
 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'};
 
@@ -52,6 +54,8 @@ const NATIVE_PARAMS = {
 export const spec = {
   code: BIDDER_CODE,
 
+  gvlid: GVL_ID,
+
   supportedMediaTypes: [NATIVE],
 
   isBidRequestValid: function(bid) {
@@ -59,14 +63,16 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
-    const tid = validBidRequests[0].transactionId;
+    const tid = bidderRequest.auctionId;
     const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
-    let pubcid = null;
-    let url = bidderRequest.refererInfo.referer;
+    let url = bidderRequest.refererInfo.page;
 
     const imp = validBidRequests.map((bid, id) => {
-      const assets = utils._map(bid.nativeParams, (bidParams, key) => {
+      const assets = _map(bid.nativeParams, (bidParams, key) => {
         const props = NATIVE_PARAMS[key];
 
         const asset = {
@@ -112,10 +118,6 @@ export const spec = {
       };
     });
 
-    if (validBidRequests[0].crumbs && validBidRequests[0].crumbs.pubcid) {
-      pubcid = validBidRequests[0].crumbs.pubcid;
-    }
-
     const request = {
       id: bidderRequest.auctionId,
       site: {
@@ -126,30 +128,42 @@ export const spec = {
       },
       cur,
       imp,
-      user: {
-        buyeruid: pubcid
+      user: {},
+      regs: {
+        ext: {
+          gdpr: 0,
+          pb_ver: '$prebid.version$'
+        }
       }
     };
 
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(request, 'regs.ext.gdpr', (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean' && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0);
+    }
+
     return {
       method: 'POST',
       url: ENDPOINT_URL,
       data: JSON.stringify(request),
+      options: {
+        contentType: 'application/json'
+      },
       bids: validBidRequests
     };
   },
 
   interpretResponse: function(serverResponse, { bids }) {
-    if (utils.isEmpty(serverResponse.body)) {
+    if (isEmpty(serverResponse.body)) {
       return [];
     }
 
     const { seatbid, cur } = serverResponse.body;
 
-    const bidResponses = flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
+    const bidResponses = (typeof seatbid != 'undefined') ? flatten(seatbid.map(seat => seat.bid)).reduce((result, bid) => {
       result[bid.impid - 1] = bid;
       return result;
-    }, []);
+    }, []) : [];
 
     return bids
       .map((bid, id) => {
@@ -161,11 +175,14 @@ export const spec = {
             cpm: bidResponse.price,
             creativeId: bidResponse.crid,
             ttl: 1000,
-            netRevenue: bid.netRevenue === 'net',
+            netRevenue: (!bid.netRevenue || bid.netRevenue === 'net'),
             currency: cur,
             mediaType: NATIVE,
             bidderCode: BIDDER_CODE,
-            native: parseNative(bidResponse)
+            native: parseNative(bidResponse),
+            meta: {
+              advertiserDomains: bidResponse.adomain && bidResponse.adomain.length > 0 ? bidResponse.adomain : []
+            }
           };
         }
       })
@@ -178,17 +195,23 @@ registerBidder(spec);
 function parseNative(bid) {
   const {assets, link, imptrackers} = bid.adm.native;
 
-  link.clicktrackers.forEach(function (clicktracker, index) {
-    link.clicktrackers[index] = clicktracker.replace(/\$\{AUCTION_PRICE\}/, bid.price);
-  });
+  let clickUrl = link.url.replace(/\$\{AUCTION_PRICE\}/g, bid.price);
 
-  imptrackers.forEach(function (imptracker, index) {
-    imptrackers[index] = imptracker.replace(/\$\{AUCTION_PRICE\}/, 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);
+    });
+  }
 
   const result = {
-    url: link.url,
-    clickUrl: link.url,
+    url: clickUrl,
+    clickUrl: clickUrl,
     clickTrackers: link.clicktrackers || undefined,
     impressionTrackers: imptrackers || undefined
   };
@@ -207,7 +230,7 @@ function parseNative(bid) {
 
 function setOnAny(collection, key) {
   for (let i = 0, result; i < collection.length; i++) {
-    result = utils.deepAccess(collection[i], key);
+    result = deepAccess(collection[i], key);
     if (result) {
       return result;
     }
diff --git a/modules/seedtagBidAdapter.js b/modules/seedtagBidAdapter.js
index 018339fabe4..1a4f903789b 100644
--- a/modules/seedtagBidAdapter.js
+++ b/modules/seedtagBidAdapter.js
@@ -1,15 +1,53 @@
-import * as utils from '../src/utils.js'
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { VIDEO, BANNER } from '../src/mediaTypes.js'
+import { isArray, _map, triggerPixel } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { VIDEO, BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'seedtag';
 const SEEDTAG_ALIAS = 'st';
 const SEEDTAG_SSP_ENDPOINT = 'https://s.seedtag.com/c/hb/bid';
 const SEEDTAG_SSP_ONTIMEOUT_ENDPOINT = 'https://s.seedtag.com/se/hb/timeout';
+const ALLOWED_DISPLAY_PLACEMENTS = [
+  'inScreen',
+  'inImage',
+  'inArticle',
+  'inBanner',
+];
+
+// Global Vendor List Id
+// https://iabeurope.eu/vendor-list-tcf-v2-0/
+const GVLID = 157;
 
 const mediaTypesMap = {
   [BANNER]: 'display',
-  [VIDEO]: 'video'
+  [VIDEO]: 'video',
+};
+
+const deviceConnection = {
+  FIXED: 'fixed',
+  MOBILE: 'mobile',
+  UNKNOWN: 'unknown',
+};
+
+const getConnectionType = () => {
+  const connection =
+    navigator.connection ||
+    navigator.mozConnection ||
+    navigator.webkitConnection ||
+    {};
+  switch (connection.type || connection.effectiveType) {
+    case 'wifi':
+    case 'ethernet':
+      return deviceConnection.FIXED;
+    case 'cellular':
+    case 'wimax':
+      return deviceConnection.MOBILE;
+    default:
+      const isMobile =
+        /iPad|iPhone|iPod/.test(navigator.userAgent) ||
+        /android/i.test(navigator.userAgent);
+      return isMobile ? deviceConnection.UNKNOWN : deviceConnection.FIXED;
+  }
 };
 
 function mapMediaType(seedtagMediaType) {
@@ -18,66 +56,76 @@ function mapMediaType(seedtagMediaType) {
   else return seedtagMediaType;
 }
 
-function getMediaTypeFromBid(bid) {
-  return bid.mediaTypes && Object.keys(bid.mediaTypes)[0]
+function hasVideoMediaType(bid) {
+  return !!bid.mediaTypes && !!bid.mediaTypes.video;
 }
 
-function hasMandatoryParams(params) {
+function hasMandatoryDisplayParams(bid) {
+  const p = bid.params;
   return (
-    !!params.publisherId &&
-    !!params.adUnitId &&
-    !!params.placement &&
-    (params.placement === 'inImage' ||
-      params.placement === 'inScreen' ||
-      params.placement === 'banner' ||
-      params.placement === 'video')
+    !!p.publisherId &&
+    !!p.adUnitId &&
+    ALLOWED_DISPLAY_PLACEMENTS.indexOf(p.placement) > -1
   );
 }
 
-function hasVideoMandatoryParams(mediaTypes) {
-  const isVideoInStream =
-    !!mediaTypes.video && mediaTypes.video.context === 'instream';
-  const isPlayerSize =
-    !!utils.deepAccess(mediaTypes, 'video.playerSize') &&
-    utils.isArray(utils.deepAccess(mediaTypes, 'video.playerSize'));
-  return isVideoInStream && isPlayerSize;
-}
+function hasMandatoryVideoParams(bid) {
+  const videoParams = getVideoParams(bid);
 
-function buildBidRequests(validBidRequests) {
-  return utils._map(validBidRequests, function(validBidRequest) {
-    const params = validBidRequest.params;
-    const mediaTypes = utils._map(
-      Object.keys(validBidRequest.mediaTypes),
-      function(pbjsType) {
-        return mediaTypesMap[pbjsType];
-      }
-    );
-    const bidRequest = {
-      id: validBidRequest.bidId,
-      transactionId: validBidRequest.transactionId,
-      sizes: validBidRequest.sizes,
-      supplyTypes: mediaTypes,
-      adUnitId: params.adUnitId,
-      placement: params.placement
-    };
+  return (
+    !!bid.params.publisherId &&
+    !!bid.params.adUnitId &&
+    hasVideoMediaType(bid) &&
+    !!videoParams.playerSize &&
+    isArray(videoParams.playerSize) &&
+    videoParams.playerSize.length > 0 &&
+    // only instream is supported for video
+    videoParams.context === 'instream' &&
+    bid.params.placement === 'inStream'
+  );
+}
 
-    if (params.adPosition) {
-      bidRequest.adPosition = params.adPosition;
+function buildBidRequest(validBidRequest) {
+  const params = validBidRequest.params;
+  const mediaTypes = _map(
+    Object.keys(validBidRequest.mediaTypes),
+    function (pbjsType) {
+      return mediaTypesMap[pbjsType];
     }
+  );
 
-    if (params.video) {
-      bidRequest.videoParams = params.video || {};
-      bidRequest.videoParams.w =
-        validBidRequest.mediaTypes.video.playerSize[0][0];
-      bidRequest.videoParams.h =
-        validBidRequest.mediaTypes.video.playerSize[0][1];
-    }
+  const bidRequest = {
+    id: validBidRequest.bidId,
+    transactionId: validBidRequest.transactionId,
+    sizes: validBidRequest.sizes,
+    supplyTypes: mediaTypes,
+    adUnitId: params.adUnitId,
+    adUnitCode: validBidRequest.adUnitCode,
+    placement: params.placement,
+    requestCount: validBidRequest.bidderRequestsCount || 1, // FIXME : in unit test the parameter bidderRequestsCount is undefined
+  };
 
-    return bidRequest;
-  })
+  if (hasVideoMediaType(validBidRequest)) {
+    bidRequest.videoParams = getVideoParams(validBidRequest);
+  }
+
+  return bidRequest;
 }
 
-function buildBid(seedtagBid) {
+/**
+ * return video param (global or overrided per bidder)
+ */
+function getVideoParams(validBidRequest) {
+  const videoParams = validBidRequest.mediaTypes.video || {};
+  if (videoParams.playerSize) {
+    videoParams.w = videoParams.playerSize[0][0];
+    videoParams.h = videoParams.playerSize[0][1];
+  }
+
+  return videoParams;
+}
+
+function buildBidResponse(seedtagBid) {
   const mediaType = mapMediaType(seedtagBid.mediaType);
   const bid = {
     requestId: seedtagBid.bidId,
@@ -88,8 +136,16 @@ function buildBid(seedtagBid) {
     currency: seedtagBid.currency,
     netRevenue: true,
     mediaType: mediaType,
-    ttl: seedtagBid.ttl
+    ttl: seedtagBid.ttl,
+    nurl: seedtagBid.nurl,
+    meta: {
+      advertiserDomains:
+        seedtagBid && seedtagBid.adomain && seedtagBid.adomain.length > 0
+          ? seedtagBid.adomain
+          : [],
+    },
   };
+
   if (mediaType === VIDEO) {
     bid.vastXml = seedtagBid.content;
   } else {
@@ -98,25 +154,63 @@ function buildBid(seedtagBid) {
   return bid;
 }
 
-export function getTimeoutUrl (data) {
+/**
+ *
+ * @returns Measure time to first byte implementation
+ * @see https://web.dev/ttfb/
+ *      https://developer.mozilla.org/en-US/docs/Web/API/Navigation_timing_API
+ */
+function ttfb() {
+  const ttfb = (() => {
+    // Timing API V2
+    try {
+      const entry = performance.getEntriesByType('navigation')[0];
+      return Math.round(entry.responseStart - entry.startTime);
+    } catch (e) {
+      // Timing API V1
+      try {
+        const entry = performance.timing;
+        return Math.round(entry.responseStart - entry.fetchStart);
+      } catch (e) {
+        // Timing API not available
+        return 0;
+      }
+    }
+  })();
+
+  // prevent negative or excessive value
+  // @see https://github.com/googleChrome/web-vitals/issues/162
+  //      https://github.com/googleChrome/web-vitals/issues/137
+  return ttfb >= 0 && ttfb <= performance.now() ? ttfb : 0;
+}
+
+export function getTimeoutUrl(data) {
   let queryParams = '';
   if (
-    utils.isArray(data) && data[0] &&
-    utils.isArray(data[0].params) && data[0].params[0]
+    isArray(data) &&
+    data[0] &&
+    isArray(data[0].params) &&
+    data[0].params[0]
   ) {
     const params = data[0].params[0];
+    const timeout = data[0].timeout;
+
     queryParams =
-      '?publisherToken=' + params.publisherId +
-      '&adUnitId=' + params.adUnitId;
+      '?publisherToken=' +
+      params.publisherId +
+      '&adUnitId=' +
+      params.adUnitId +
+      '&timeout=' +
+      timeout;
   }
   return SEEDTAG_SSP_ONTIMEOUT_ENDPOINT + queryParams;
 }
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   aliases: [SEEDTAG_ALIAS],
   supportedMediaTypes: [BANNER, VIDEO],
-
   /**
    * Determines whether or not the given bid request is valid.
    *
@@ -124,9 +218,9 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid(bid) {
-    return getMediaTypeFromBid(bid) === VIDEO
-      ? hasMandatoryParams(bid.params) && hasVideoMandatoryParams(bid.mediaTypes)
-      : hasMandatoryParams(bid.params);
+    return hasVideoMediaType(bid)
+      ? hasMandatoryVideoParams(bid)
+      : hasMandatoryDisplayParams(bid);
   },
 
   /**
@@ -137,12 +231,15 @@ export const spec = {
    */
   buildRequests(validBidRequests, bidderRequest) {
     const payload = {
-      url: bidderRequest.refererInfo.referer,
+      url: bidderRequest.refererInfo.page,
       publisherToken: validBidRequests[0].params.publisherId,
       cmp: !!bidderRequest.gdprConsent,
       timeout: bidderRequest.timeout,
       version: '$prebid.version$',
-      bidRequests: buildBidRequests(validBidRequests)
+      connectionType: getConnectionType(),
+      auctionStart: bidderRequest.auctionStart || Date.now(),
+      ttfb: ttfb(),
+      bidRequests: _map(validBidRequests, buildBidRequest),
     };
 
     if (payload.cmp) {
@@ -150,13 +247,25 @@ export const spec = {
       if (gdprApplies !== undefined) payload['ga'] = gdprApplies;
       payload['cd'] = bidderRequest.gdprConsent.consentString;
     }
+    if (bidderRequest.uspConsent) {
+      payload['uspConsent'] = bidderRequest.uspConsent;
+    }
+
+    if (validBidRequests[0].schain) {
+      payload.schain = validBidRequests[0].schain;
+    }
+
+    let coppa = config.getConfig('coppa');
+    if (coppa) {
+      payload.coppa = coppa;
+    }
 
-    const payloadString = JSON.stringify(payload)
+    const payloadString = JSON.stringify(payload);
     return {
       method: 'POST',
       url: SEEDTAG_SSP_ENDPOINT,
-      data: payloadString
-    }
+      data: payloadString,
+    };
   },
 
   /**
@@ -165,11 +274,11 @@ export const spec = {
    * @param {ServerResponse} serverResponse A successful response from the server.
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
-  interpretResponse: function(serverResponse) {
+  interpretResponse: function (serverResponse) {
     const serverBody = serverResponse.body;
-    if (serverBody && serverBody.bids && utils.isArray(serverBody.bids)) {
-      return utils._map(serverBody.bids, function(bid) {
-        return buildBid(bid);
+    if (serverBody && serverBody.bids && isArray(serverBody.bids)) {
+      return _map(serverBody.bids, function (bid) {
+        return buildBidResponse(bid);
       });
     } else {
       return [];
@@ -198,8 +307,18 @@ export const spec = {
    * @param {data} Containing timeout specific data
    */
   onTimeout(data) {
-    getTimeoutUrl(data);
-    utils.triggerPixel(SEEDTAG_SSP_ONTIMEOUT_ENDPOINT);
-  }
-}
+    const url = getTimeoutUrl(data);
+    triggerPixel(url);
+  },
+
+  /**
+   * Function to call when the adapter wins the auction
+   * @param {bid} Bid information received from the server
+   */
+  onBidWon: function (bid) {
+    if (bid && bid.nurl) {
+      triggerPixel(bid.nurl);
+    }
+  },
+};
 registerBidder(spec);
diff --git a/modules/seedtagBidAdapter.md b/modules/seedtagBidAdapter.md
index 627ff8333ad..8ccfcfb701e 100644
--- a/modules/seedtagBidAdapter.md
+++ b/modules/seedtagBidAdapter.md
@@ -8,19 +8,42 @@ Maintainer: prebid@seedtag.com
 
 # Description
 
-Module that connects to Seedtag demand sources to fetch bids.
+Prebidjs seedtag bidder
 
-# Test Parameters
+# Sample integration
 
-## Sample Banner Ad Unit
+## InScreen
+```js
+const adUnits = [
+  {
+    code: '/21804003197/prebid_test_320x100',
+    mediaTypes: {
+      banner: {
+        sizes: [[320, 100]]
+      }
+    },
+    bids: [
+      {
+        bidder: 'seedtag',
+        params: {
+          publisherId: '0000-0000-01',      // required
+          adUnitId: '0000',                 // required
+          placement: 'inScreen',              // required
+        }
+      }
+    ]
+  }
+]
+```
 
+## InArticle
 ```js
 const adUnits = [
   {
     code: '/21804003197/prebid_test_300x250',
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [[300, 250], [1, 1]]
       }
     },
     bids: [
@@ -29,8 +52,7 @@ const adUnits = [
         params: {
           publisherId: '0000-0000-01',      // required
           adUnitId: '0000',                 // required
-          placement: 'banner',              // required
-          adPosition: 0                     // optional
+          placement: 'inArticle',              // required
         }
       }
     ]
@@ -38,15 +60,51 @@ const adUnits = [
 ]
 ```
 
-## Sample inStream Video Ad Unit
+## InBanner
+```js
+const adUnits = [
+  {
+    code: '/21804003197/prebid_test_300x250',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    bids: [
+      {
+        bidder: 'seedtag',
+        params: {
+          publisherId: '0000-0000-01',      // required
+          adUnitId: '0000',                 // required
+          placement: 'inBanner',              // required
+        }
+      }
+    ]
+  }
+]
+```
 
+## inStream Video
 ```js
 var adUnits = [{
   code: 'video',
   mediaTypes: {
     video: {
       context: 'instream',   // required
-      playerSize: [600, 300] // required
+      playerSize: [640, 360], // required
+      // Video object as specified in OpenRTB 2.5
+      mimes: ['video/mp4'], // recommended
+      minduration: 5,       // optional
+      maxduration: 60,      // optional
+      boxingallowed: 1,     // optional
+      skip: 1,              // optional
+      startdelay: 1,        // optional
+      linearity: 1,         // optional
+      battr: [1, 2],        // optional
+      maxbitrate: 10,       // optional
+      playbackmethod: [1],  // optional
+      delivery: [1],        // optional
+      placement: 1,         // optional
     }
   },
   bids: [
@@ -55,23 +113,7 @@ var adUnits = [{
       params: {
         publisherId: '0000-0000-01',    // required
         adUnitId: '0000',               // required
-        placement: 'video',             // required
-        adPosition: 0,                  // optional
-        // Video object as specified in OpenRTB 2.5
-        video: {
-          mimes: ['video/mp4'], // recommended
-          minduration: 5,       // optional
-          maxduration: 60,      // optional
-          boxingallowed: 1,     // optional
-          skip: 1,              // optional
-          startdelay: 1,        // optional
-          linearity: 1,         // optional
-          battr: [1, 2],        // optional
-          maxbitrate: 10,       // optional
-          playbackmethod: [1],  // optional
-          delivery: [1],        // optional
-          placement: 1,         // optional
-        }
+        placement: 'inStream',          // required
       }
     }
   ]
diff --git a/modules/segmentoBidAdapter.js b/modules/segmentoBidAdapter.js
deleted file mode 100644
index a042bdf4942..00000000000
--- a/modules/segmentoBidAdapter.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'segmento';
-const URL = 'https://prebid-bidder.rutarget.ru/bid';
-const SYNC_IFRAME_URL = 'https://tag.rutarget.ru/tag?event=otherPage&check=true&response=syncframe&synconly=true';
-const SYNC_IMAGE_URL = 'https://tag.rutarget.ru/tag?event=otherPage&check=true&synconly=true';
-const RUB = 'RUB';
-const TIME_TO_LIVE = 0;
-
-export const spec = {
-  code: BIDDER_CODE,
-  isBidRequestValid: (bid) => {
-    return Boolean(bid && bid.params && !isNaN(bid.params.placementId));
-  },
-  buildRequests: (validBidRequests, bidderRequest) => {
-    const payload = {
-      places: [],
-      settings: {
-        currency: RUB,
-        referrer: bidderRequest.refererInfo && bidderRequest.refererInfo.referer
-      }
-    };
-
-    for (let i = 0; i < validBidRequests.length; i++) {
-      const bid = validBidRequests[i];
-
-      payload.places.push({
-        id: bid.bidId,
-        placementId: bid.params.placementId,
-        sizes: bid.sizes
-      });
-    }
-
-    return {
-      method: 'POST',
-      url: URL,
-      data: payload
-    };
-  },
-  interpretResponse: (serverResponse) => {
-    const bids = serverResponse.body && serverResponse.body.bids;
-    if (!bids) {
-      return [];
-    }
-
-    const bidResponses = [];
-
-    for (let i = 0; i < bids.length; i++) {
-      const bid = bids[i];
-
-      bidResponses.push({
-        requestId: bid.id,
-        cpm: bid.cpm,
-        width: bid.size.width,
-        height: bid.size.height,
-        creativeId: bid.creativeId,
-        currency: RUB,
-        netRevenue: true,
-        ttl: TIME_TO_LIVE,
-        adUrl: bid.displayUrl
-      });
-    }
-
-    return bidResponses;
-  },
-  getUserSyncs: (syncOptions) => {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: SYNC_IFRAME_URL
-      }];
-    }
-
-    if (syncOptions.pixelEnabled) {
-      return [{
-        type: 'image',
-        url: SYNC_IMAGE_URL
-      }];
-    }
-
-    return [];
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/segmentoBidAdapter.md b/modules/segmentoBidAdapter.md
deleted file mode 100644
index e64153195c5..00000000000
--- a/modules/segmentoBidAdapter.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Overview
-
-```
-Module Name: Segmento Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: ssp@segmento.ru
-```
-
-# Description
-
-Module that connects to Segmento's demand sources
-
-# Test Parameters
-```
-var adUnits = [
-    {
-        code: 'test-div',
-        mediaTypes: {
-            banner: {
-                sizes: [[240,400],[160,600]],
-            }
-        },
-        bids: [
-            {
-                bidder: 'segmento',
-                params: {
-                    placementId: -1
-                }
-            }
-        ]
-    }
-];
-```
diff --git a/modules/sekindoUMBidAdapter.js b/modules/sekindoUMBidAdapter.js
deleted file mode 100644
index bea25173747..00000000000
--- a/modules/sekindoUMBidAdapter.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-export const spec = {
-  code: 'sekindoUM',
-  supportedMediaTypes: ['banner', 'video'],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    if (bid.mediaType == 'video' || (typeof bid.mediaTypes == 'object' && typeof bid.mediaTypes.video == 'object')) {
-      if (typeof bid.params.video != 'object' || typeof bid.params.video.playerWidth == 'undefined' || typeof bid.params.video.playerHeight == 'undefined') {
-        return false;
-      }
-    }
-    return !!(bid.params.spaceId);
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(validBidRequests, bidderRequest) {
-    var pubUrl = null;
-    try {
-      if (window.top == window) {
-        pubUrl = window.location.href;
-      } else {
-        try {
-          pubUrl = window.top.location.href;
-        } catch (e2) {
-          pubUrl = document.referrer;
-        }
-      }
-    } catch (e1) {}
-
-    return validBidRequests.map(bidRequest => {
-      var subId = utils.getBidIdParameter('subId', bidRequest.params);
-      var spaceId = utils.getBidIdParameter('spaceId', bidRequest.params);
-      var bidfloor = utils.getBidIdParameter('bidfloor', bidRequest.params);
-      var protocol = (document.location.protocol === 'https:' ? 's' : '');
-      var queryString = '';
-
-      queryString = utils.tryAppendQueryString(queryString, 's', spaceId);
-      queryString = utils.tryAppendQueryString(queryString, 'subId', subId);
-      queryString = utils.tryAppendQueryString(queryString, 'pubUrl', pubUrl);
-      queryString = utils.tryAppendQueryString(queryString, 'hbTId', bidRequest.transactionId);
-      queryString = utils.tryAppendQueryString(queryString, 'hbBidId', bidRequest.bidId);
-      queryString = utils.tryAppendQueryString(queryString, 'hbver', '4');
-      queryString = utils.tryAppendQueryString(queryString, 'hbcb', '1');/// legasy
-      queryString = utils.tryAppendQueryString(queryString, 'dcpmflr', bidfloor);
-      queryString = utils.tryAppendQueryString(queryString, 'protocol', protocol);
-      queryString = utils.tryAppendQueryString(queryString, 'x', bidRequest.params.width);
-      queryString = utils.tryAppendQueryString(queryString, 'y', bidRequest.params.height);
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        queryString = utils.tryAppendQueryString(queryString, 'gdprConsent', bidderRequest.gdprConsent.consentString);
-        queryString = utils.tryAppendQueryString(queryString, 'gdpr', (bidderRequest.gdprConsent.gdprApplies) ? '1' : '0');
-      }
-      if (bidRequest.mediaType === 'video' || (typeof bidRequest.mediaTypes == 'object' && typeof bidRequest.mediaTypes.video == 'object')) {
-        queryString = utils.tryAppendQueryString(queryString, 'x', bidRequest.params.playerWidth);
-        queryString = utils.tryAppendQueryString(queryString, 'y', bidRequest.params.playerHeight);
-        if (typeof vid_vastType != 'undefined') { // eslint-disable-line camelcase
-          queryString = utils.tryAppendQueryString(queryString, 'vid_vastType', bidRequest.params.vid_vastType);
-        }
-        if (typeof bidRequest.mediaTypes == 'object' && typeof bidRequest.mediaTypes.video == 'object' && typeof bidRequest.mediaTypes.video.context == 'string') {
-          queryString = utils.tryAppendQueryString(queryString, 'vid_context', bidRequest.mediaTypes.video.context);
-        }
-      }
-
-      var endpointUrl = 'https' + '://hb.sekindo.com/live/liveView.php';
-
-      return {
-        method: 'GET',
-        url: endpointUrl,
-        data: queryString,
-      };
-    });
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, bidRequest) {
-    if (typeof serverResponse !== 'object') {
-      return [];
-    }
-
-    let bidResponses = [];
-    var bidResponse = {
-      requestId: serverResponse.body.id,
-      bidderCode: spec.code,
-      cpm: serverResponse.body.cpm,
-      width: serverResponse.body.width,
-      height: serverResponse.body.height,
-      creativeId: serverResponse.body.creativeId,
-      currency: serverResponse.body.currency,
-      netRevenue: serverResponse.body.netRevenue,
-      ttl: serverResponse.body.ttl
-    };
-    if (bidRequest.mediaType == 'video') {
-      if (typeof serverResponse.body.vastUrl != 'undefined') {
-        bidResponse.vastUrl = serverResponse.body.vastUrl;
-      } else {
-        bidResponse.vastXml = serverResponse.body.vastXml;
-      }
-    } else {
-      bidResponse.ad = serverResponse.body.ad;
-    }
-
-    bidResponses.push(bidResponse);
-    return bidResponses;
-  }
-}
-registerBidder(spec);
diff --git a/modules/sekindoUMBidAdapter.md b/modules/sekindoUMBidAdapter.md
deleted file mode 100644
index eeffff928eb..00000000000
--- a/modules/sekindoUMBidAdapter.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Overview
-
-**Module Name**: sekindoUM Bidder Adapter  
-**Module Type**: Bidder Adapter  
-**Maintainer**: nissime@sekindo.com  
-
-# Description
-
-Connects to Sekindo (part of UM) demand source to fetch bids.  
-Banner, Outstream and Native formats are supported.  
-
-
-# Test Parameters
-```
-    var adUnits = [{
-      code: 'banner-ad-div',
-      sizes: [[300, 250]],
-      bids: [{
-          bidder: 'sekindoUM',
-          params: { 
-              spaceId: 14071
-			  width:300, ///optional
-			  height:250, //optional
-          }
-      }]
-    },
-	{
-      code: 'video-ad-div',
-      sizes: [[640, 480]],
-      bids: [{
-          bidder: 'sekindoUM',
-          params: { 
-              spaceId: 87812,
-			  video:{ 
-				playerWidth:640,
-				playerHeight:480,
-				vid_vastType: 5 //optional
-			  }
-          }
-      }]
-    }
-	];
-```
diff --git a/modules/serverbidBidAdapter.md b/modules/serverbidBidAdapter.md
deleted file mode 100644
index 87b51e665e2..00000000000
--- a/modules/serverbidBidAdapter.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Overview
-
-Module Name: Serverbid Bid Adapter
-
-Module Type: Bid Adapter
-
-Maintainer: jgrimes@serverbid.com, jswart@serverbid.com
-
-# Description
-
-Connects to Serverbid for receiving bids from configured demand sources.
-
-# Test Parameters
-```javascript
-    var adUnits = [
-        {
-            code: 'test-ad-1',
-            sizes: [[300, 250]],
-            bids: [
-                {
-                    bidder: 'serverbid',
-                    params: {
-                        networkId: '9969',
-                        siteId: '980639'
-                    }
-                }
-            ]
-        },
-        {
-            code: 'test-ad-2',
-            sizes: [[300, 250]],
-            bids: [
-                {
-                    bidder: 'serverbid',
-                    params: {
-                        networkId: '9969',
-                        siteId: '980639',
-                        zoneIds: [178503]
-                    }
-                }
-            ]
-        }
-    ];
-```
diff --git a/modules/sharedIdSystem.js b/modules/sharedIdSystem.js
index 5c2a3df0595..7562b472047 100644
--- a/modules/sharedIdSystem.js
+++ b/modules/sharedIdSystem.js
@@ -1,333 +1,199 @@
 /**
- * This module adds Shared ID support to the User ID module
- * The {@link module:modules/userId} module is required.
+ * This module adds SharedId to the User ID module
+ * The {@link module:modules/userId} module is required
  * @module modules/sharedIdSystem
  * @requires module:modules/userId
  */
 
-import * as utils from '../src/utils.js'
-import {ajax} from '../src/ajax.js';
+import { parseUrl, buildUrl, triggerPixel, logInfo, hasDeviceAccess, generateUUID } from '../src/utils.js';
 import {submodule} from '../src/hook.js';
+import { coppaDataHandler } from '../src/adapterManager.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
-const MODULE_NAME = 'sharedId';
-const ID_SVC = 'https://id.sharedid.org/id';
-const DEFAULT_24_HOURS = 86400;
-const OPT_OUT_VALUE = '00000000000000000000000000';
-// These values should NEVER change. If
-// they do, we're no longer making ulids!
-const ENCODING = '0123456789ABCDEFGHJKMNPQRSTVWXYZ'; // Crockford's Base32
-const ENCODING_LEN = ENCODING.length;
-const TIME_MAX = Math.pow(2, 48) - 1;
-const TIME_LEN = 10;
-const RANDOM_LEN = 16;
-const id = factory();
-/**
- * Constructs cookie value
- * @param value
- * @param needsSync
- * @returns {string}
- */
-function constructCookieValue(value, needsSync) {
-  const cookieValue = {};
-  cookieValue.id = value;
-  cookieValue.ts = utils.timestamp();
-  if (needsSync) {
-    cookieValue.ns = true;
-  }
-  utils.logInfo('SharedId: cookie Value: ' + JSON.stringify(cookieValue));
-  return cookieValue;
-}
-
-/**
- * Checks if id needs to be synced
- * @param configParams
- * @param storedId
- * @returns {boolean}
- */
-function isIdSynced(configParams, storedId) {
-  const needSync = storedId.ns;
-  if (needSync) {
-    return true;
-  }
-  if (!configParams || typeof configParams.syncTime !== 'number') {
-    utils.logInfo('SharedId: Sync time is not configured or is not a number');
-  }
-  let syncTime = (!configParams || typeof configParams.syncTime !== 'number') ? DEFAULT_24_HOURS : configParams.syncTime;
-  if (syncTime > DEFAULT_24_HOURS) {
-    syncTime = DEFAULT_24_HOURS;
-  }
-  const cookieTimestamp = storedId.ts;
-  if (cookieTimestamp) {
-    var secondBetweenTwoDate = timeDifferenceInSeconds(utils.timestamp(), cookieTimestamp);
-    return secondBetweenTwoDate >= syncTime;
-  }
-  return false;
-}
+export const storage = getStorageManager({moduleName: 'pubCommonId', gvlid: VENDORLESS_GVLID});
+const COOKIE = 'cookie';
+const LOCAL_STORAGE = 'html5';
+const OPTOUT_NAME = '_pubcid_optout';
+const PUB_COMMON_ID = 'PublisherCommonId';
 
 /**
- * Gets time difference in secounds
- * @param date1
- * @param date2
- * @returns {number}
+ * Read a value either from cookie or local storage
+ * @param {string} name Name of the item
+ * @param {string} type storage type override
+ * @returns {string|null} a string if item exists
  */
-function timeDifferenceInSeconds(date1, date2) {
-  const diff = (date1 - date2) / 1000;
-  return Math.abs(Math.round(diff));
-}
-
-/**
- * id generation call back
- * @param result
- * @param callback
- * @returns {{success: success, error: error}}
- */
-function idGenerationCallback(callback) {
-  return {
-    success: function (responseBody) {
-      let value = {};
-      if (responseBody) {
-        try {
-          let responseObj = JSON.parse(responseBody);
-          utils.logInfo('SharedId: Generated SharedId: ' + responseObj.sharedId);
-          value = constructCookieValue(responseObj.sharedId, false);
-        } catch (error) {
-          utils.logError(error);
-        }
+function readValue(name, type) {
+  if (type === COOKIE) {
+    return storage.getCookie(name);
+  } else if (type === LOCAL_STORAGE) {
+    if (storage.hasLocalStorage()) {
+      const expValue = storage.getDataFromLocalStorage(`${name}_exp`);
+      if (!expValue) {
+        return storage.getDataFromLocalStorage(name);
+      } else if ((new Date(expValue)).getTime() - Date.now() > 0) {
+        return storage.getDataFromLocalStorage(name)
       }
-      callback(value);
-    },
-    error: function (statusText, responseBody) {
-      const value = constructCookieValue(id(), true);
-      utils.logInfo('SharedId: Ulid Generated SharedId: ' + value.id);
-      callback(value);
     }
   }
 }
 
-/**
- * existing id generation call back
- * @param result
- * @param callback
- * @returns {{success: success, error: error}}
- */
-function existingIdCallback(storedId, callback) {
-  return {
-    success: function (responseBody) {
-      utils.logInfo('SharedId: id to be synced: ' + storedId.id);
-      if (responseBody) {
-        try {
-          let responseObj = JSON.parse(responseBody);
-          storedId = constructCookieValue(responseObj.sharedId, false);
-          utils.logInfo('SharedId: Older SharedId: ' + storedId.id);
-        } catch (error) {
-          utils.logError(error);
-        }
-      }
-      callback(storedId);
-    },
-    error: function () {
-      utils.logInfo('SharedId: Sync error for id : ' + storedId.id);
-      callback(storedId);
+function getIdCallback(pubcid, pixelCallback) {
+  return function (callback) {
+    if (typeof pixelCallback === 'function') {
+      pixelCallback();
     }
+    callback(pubcid);
   }
 }
 
-/**
- * Encode the id
- * @param value
- * @returns {string|*}
- */
-function encodeId(value) {
-  const result = {};
-  const sharedId = (value && typeof value['id'] === 'string') ? value['id'] : undefined;
-  if (sharedId == OPT_OUT_VALUE) {
-    return undefined;
+function queuePixelCallback(pixelUrl, id = '', callback) {
+  if (!pixelUrl) {
+    return;
   }
-  if (sharedId) {
-    const bidIds = {
-      id: sharedId,
-    }
-    const ns = (value && typeof value['ns'] === 'boolean') ? value['ns'] : undefined;
-    if (ns == undefined) {
-      bidIds.third = sharedId;
-    }
-    result.sharedid = bidIds;
-    utils.logInfo('SharedId: Decoded value ' + JSON.stringify(result));
-    return result;
-  }
-  return sharedId;
-}
-
-/**
- * the factory to generate unique identifier based on time and current pseudorandom number
- * @param {string} the current pseudorandom number generator
- * @returns {function(*=): *}
- */
-function factory(currPrng) {
-  if (!currPrng) {
-    currPrng = detectPrng();
-  }
-  return function ulid(seedTime) {
-    if (isNaN(seedTime)) {
-      seedTime = Date.now();
-    }
-    return encodeTime(seedTime, TIME_LEN) + encodeRandom(RANDOM_LEN, currPrng);
-  };
-}
 
-/**
- * creates and logs the error message
- * @function
- * @param {string} error message
- * @returns {Error}
- */
-function createError(message) {
-  utils.logError(message);
-  const err = new Error(message);
-  err.source = 'sharedId';
-  return err;
-}
+  // Use pubcid as a cache buster
+  const urlInfo = parseUrl(pixelUrl);
+  urlInfo.search.id = encodeURIComponent('pubcid:' + id);
+  const targetUrl = buildUrl(urlInfo);
 
-/**
- * gets a a random charcter from generated pseudorandom number
- * @param {string} the generated pseudorandom number
- * @returns {string}
- */
-function randomChar(prng) {
-  let rand = Math.floor(prng() * ENCODING_LEN);
-  if (rand === ENCODING_LEN) {
-    rand = ENCODING_LEN - 1;
-  }
-  return ENCODING.charAt(rand);
-}
-
-/**
- * encodes the time based on the length
- * @param now
- * @param len
- * @returns {string} encoded time.
- */
-function encodeTime (now, len) {
-  if (isNaN(now)) {
-    throw new Error(now + ' must be a number');
-  }
-
-  if (Number.isInteger(now) === false) {
-    throw createError('time must be an integer');
-  }
-
-  if (now > TIME_MAX) {
-    throw createError('cannot encode time greater than ' + TIME_MAX);
-  }
-  if (now < 0) {
-    throw createError('time must be positive');
-  }
-
-  if (Number.isInteger(len) === false) {
-    throw createError('length must be an integer');
-  }
-  if (len < 0) {
-    throw createError('length must be positive');
-  }
-
-  let mod;
-  let str = '';
-  for (; len > 0; len--) {
-    mod = now % ENCODING_LEN;
-    str = ENCODING.charAt(mod) + str;
-    now = (now - mod) / ENCODING_LEN;
-  }
-  return str;
-}
-
-/**
- * encodes random character
- * @param len
- * @param prng
- * @returns {string}
- */
-function encodeRandom (len, prng) {
-  let str = '';
-  for (; len > 0; len--) {
-    str = randomChar(prng) + str;
-  }
-  return str;
+  return function () {
+    triggerPixel(targetUrl);
+  };
 }
 
-/**
- * detects the pseudorandom number generator and generates the random number
- * @function
- * @param {string} error message
- * @returns {string} a random number
- */
-function detectPrng(root) {
-  if (!root) {
-    root = typeof window !== 'undefined' ? window : null;
-  }
-  const browserCrypto = root && (root.crypto || root.msCrypto);
-  if (browserCrypto) {
-    return () => {
-      const buffer = new Uint8Array(1);
-      browserCrypto.getRandomValues(buffer);
-      return buffer[0] / 0xff;
-    };
-  }
-  return () => Math.random();
+function hasOptedOut() {
+  return !!((storage.cookiesAreEnabled() && readValue(OPTOUT_NAME, COOKIE)) ||
+    (storage.hasLocalStorage() && readValue(OPTOUT_NAME, LOCAL_STORAGE)));
 }
 
-/** @type {Submodule} */
-export const sharedIdSubmodule = {
+export const sharedIdSystemSubmodule = {
   /**
    * used to link submodule with config
    * @type {string}
    */
-  name: MODULE_NAME,
+  name: 'sharedId',
+  aliasName: 'pubCommonId',
+  gvlid: VENDORLESS_GVLID,
 
   /**
    * decode the stored id value for passing to bid requests
    * @function
    * @param {string} value
-   * @returns {{sharedid:{ id: string, third:string}} or undefined if value doesn't exists
+   * @param {SubmoduleConfig} config
+   * @returns {{pubcid:string}}
    */
-  decode(value) {
-    return (value) ? encodeId(value) : undefined;
+  decode(value, config) {
+    if (hasOptedOut()) {
+      logInfo('PubCommonId decode: Has opted-out');
+      return undefined;
+    }
+    logInfo(' Decoded value PubCommonId ' + value);
+    const idObj = {'pubcid': value};
+    return idObj;
   },
-
   /**
-   * performs action to obtain id and return a value.
+   * performs action to obtain id
    * @function
-   * @param {SubmoduleParams} [configParams]
-   * @returns {sharedId}
+   * @param {SubmoduleConfig} [config] Config object with params and storage properties
+   * @param {Object} consentData
+   * @param {string} storedId Existing pubcommon id
+   * @returns {IdResponse}
    */
-  getId(configParams) {
-    const resp = function (callback) {
-      utils.logInfo('SharedId: Sharedid doesnt exists, new cookie creation');
-      ajax(ID_SVC, idGenerationCallback(callback), undefined, {method: 'GET', withCredentials: true});
-    };
-    return {callback: resp};
-  },
+  getId: function (config = {}, consentData, storedId) {
+    if (hasOptedOut()) {
+      logInfo('PubCommonId: Has opted-out');
+      return;
+    }
+    const coppa = coppaDataHandler.getCoppa();
+
+    if (coppa) {
+      logInfo('PubCommonId: IDs not provided for coppa requests, exiting PubCommonId');
+      return;
+    }
+    const {params: {create = true, pixelUrl} = {}} = config;
+    let newId = storedId;
+    if (!newId) {
+      try {
+        if (typeof window[PUB_COMMON_ID] === 'object') {
+          // If the page includes its own pubcid module, then save a copy of id.
+          newId = window[PUB_COMMON_ID].getId();
+        }
+      } catch (e) {
+      }
 
+      if (!newId) newId = (create && hasDeviceAccess()) ? generateUUID() : undefined;
+    }
+
+    const pixelCallback = queuePixelCallback(pixelUrl, newId);
+    return {id: newId, callback: getIdCallback(newId, pixelCallback)};
+  },
   /**
-   * performs actions even if the id exists and returns a value
-   * @param configParams
-   * @param storedId
-   * @returns {{callback: *}}
+   * performs action to extend an id.  There are generally two ways to extend the expiration time
+   * of stored id: using pixelUrl or return the id and let main user id module write it again with
+   * the new expiration time.
+   *
+   * PixelUrl, if defined, should point back to a first party domain endpoint.  On the server
+   * side, there is either a plugin, or customized logic to read and write back the pubcid cookie.
+   * The extendId function itself should return only the callback, and not the id itself to avoid
+   * having the script-side overwriting server-side.  This applies to both pubcid and sharedid.
+   *
+   * On the other hand, if there is no pixelUrl, then the extendId should return storedId so that
+   * its expiration time is updated.
+   *
+   * @function
+   * @param {SubmoduleParams} [config]
+   * @param {ConsentData|undefined} consentData
+   * @param {Object} storedId existing id
+   * @returns {IdResponse|undefined}
    */
-  extendId(configParams, storedId) {
-    utils.logInfo('SharedId: Existing shared id ' + storedId.id);
-    const resp = function (callback) {
-      const needSync = isIdSynced(configParams, storedId);
-      if (needSync) {
-        utils.logInfo('SharedId: Existing shared id ' + storedId + ' is not synced');
-        const sharedIdPayload = {};
-        sharedIdPayload.sharedId = storedId.id;
-        const payloadString = JSON.stringify(sharedIdPayload);
-        ajax(ID_SVC, existingIdCallback(storedId, callback), payloadString, {method: 'POST', withCredentials: true});
+  extendId: function(config = {}, consentData, storedId) {
+    if (hasOptedOut()) {
+      logInfo('PubCommonId: Has opted-out');
+      return {id: undefined};
+    }
+    const coppa = coppaDataHandler.getCoppa();
+    if (coppa) {
+      logInfo('PubCommonId: IDs not provided for coppa requests, exiting PubCommonId');
+      return;
+    }
+    const {params: {extend = false, pixelUrl} = {}} = config;
+
+    if (extend) {
+      if (pixelUrl) {
+        const callback = queuePixelCallback(pixelUrl, storedId);
+        return {callback: callback};
+      } else {
+        return {id: storedId};
       }
-    };
-    return {callback: resp};
+    }
+  },
+
+  domainOverride: function () {
+    const domainElements = document.domain.split('.');
+    const cookieName = `_gd${Date.now()}`;
+    for (let i = 0, topDomain, testCookie; i < domainElements.length; i++) {
+      const nextDomain = domainElements.slice(i).join('.');
+
+      // write test cookie
+      storage.setCookie(cookieName, '1', undefined, undefined, nextDomain);
+
+      // read test cookie to verify domain was valid
+      testCookie = storage.getCookie(cookieName);
+
+      // delete test cookie
+      storage.setCookie(cookieName, '', 'Thu, 01 Jan 1970 00:00:01 GMT', undefined, nextDomain);
+
+      if (testCookie === '1') {
+        // cookie was written successfully using test domain so the topDomain is updated
+        topDomain = nextDomain;
+      } else {
+        // cookie failed to write using test domain so exit by returning the topDomain
+        return topDomain;
+      }
+    }
   }
+
 };
 
-// Register submodule for userId
-submodule('userId', sharedIdSubmodule);
+submodule('userId', sharedIdSystemSubmodule);
diff --git a/modules/sharedIdSystem.md b/modules/sharedIdSystem.md
deleted file mode 100644
index acb076ed97f..00000000000
--- a/modules/sharedIdSystem.md
+++ /dev/null
@@ -1,43 +0,0 @@
-## Shared ID User ID Submodule
-
-Shared ID User ID Module generates a UUID that can be utilized to improve user matching.This module enables timely synchronization which handles sharedId.org optout. This module does not require any registration.  
-
-### Building Prebid with Shared Id Support
-Your Prebid build must include the modules for both **userId** and **sharedId** submodule. Follow the build instructions for Prebid as
-explained in the top level README.md file of the Prebid source tree.
-
-ex: $ gulp build --modules=userId,sharedIdSystem
-
-### Prebid Params
-
-Individual params may be set for the Shared ID User ID Submodule. 
-```
-pbjs.setConfig({
-    usersync: {
-        userIds: [{
-            name: 'sharedId',
-            params: {
-                      syncTime: 60 // in seconds, default is 24 hours
-             },
-            storage: {
-                name: 'sharedid',
-                type: 'cookie',
-                expires: 28
-            },
-        }]
-    }
-});
-```
-
-### Parameter Descriptions for the `usersync` Configuration Section
-The below parameters apply only to the Shared ID User ID Module integration.
-
-| Params under usersync.userIds[]| Scope | Type | Description | Example |
-| --- | --- | --- | --- | --- |
-| name | Required | String | ID value for the Shared ID module - `"sharedId"` | `"sharedId"` |
-| params | Optional | Object | Details for sharedId syncing. | |
-| params.syncTime | Optional | Object | Configuration to define the frequency(in seconds) of id synchronization. By default id is synchronized every 24 hours | 60 |
-| storage | Required | Object | The publisher must specify the local storage in which to store the results of the call to get the user ID. This can be either cookie or HTML5 storage. | |
-| storage.type | Required | String | This is where the results of the user ID will be stored. The recommended method is `localStorage` by specifying `html5`. | `"html5"` |
-| storage.name | Required | String | The name of the cookie or html5 local storage where the user ID will be stored. | `"sharedid"` |
-| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. | `28` |
diff --git a/modules/sharethroughAnalyticsAdapter.js b/modules/sharethroughAnalyticsAdapter.js
index 5147b2a4275..6502c7e3a53 100644
--- a/modules/sharethroughAnalyticsAdapter.js
+++ b/modules/sharethroughAnalyticsAdapter.js
@@ -1,6 +1,6 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import { tryAppendQueryString } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
-const utils = require('../src/utils.js');
 
 const emptyUrl = '';
 const analyticsType = 'endpoint';
@@ -42,18 +42,18 @@ var sharethroughAdapter = Object.assign(adapter(
 
   fireLoseBeacon(winningBidderCode, winningCPM, arid, type) {
     let loseBeaconUrl = this.STR_BEACON_HOST;
-    loseBeaconUrl = utils.tryAppendQueryString(loseBeaconUrl, 'winnerBidderCode', winningBidderCode);
-    loseBeaconUrl = utils.tryAppendQueryString(loseBeaconUrl, 'winnerCpm', winningCPM);
-    loseBeaconUrl = utils.tryAppendQueryString(loseBeaconUrl, 'arid', arid);
-    loseBeaconUrl = utils.tryAppendQueryString(loseBeaconUrl, 'type', type);
+    loseBeaconUrl = tryAppendQueryString(loseBeaconUrl, 'winnerBidderCode', winningBidderCode);
+    loseBeaconUrl = tryAppendQueryString(loseBeaconUrl, 'winnerCpm', winningCPM);
+    loseBeaconUrl = tryAppendQueryString(loseBeaconUrl, 'arid', arid);
+    loseBeaconUrl = tryAppendQueryString(loseBeaconUrl, 'type', type);
     loseBeaconUrl = this.appendEnvFields(loseBeaconUrl);
 
     this.fireBeacon(loseBeaconUrl);
   },
   appendEnvFields(url) {
-    url = utils.tryAppendQueryString(url, 'hbVersion', '$prebid.version$');
-    url = utils.tryAppendQueryString(url, 'strVersion', STR_VERSION);
-    url = utils.tryAppendQueryString(url, 'hbSource', 'prebid');
+    url = tryAppendQueryString(url, 'hbVersion', '$prebid.version$');
+    url = tryAppendQueryString(url, 'strVersion', STR_VERSION);
+    url = tryAppendQueryString(url, 'hbSource', 'prebid');
 
     return url;
   },
diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
index 0d183be05df..0c8b84fd0c5 100644
--- a/modules/sharethroughBidAdapter.js
+++ b/modules/sharethroughBidAdapter.js
@@ -1,253 +1,248 @@
+import { deepAccess, generateUUID, inIframe } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { createEidsArray } from './userId/eids.js';
 
-const VERSION = '3.2.1';
+const VERSION = '4.3.0';
 const BIDDER_CODE = 'sharethrough';
-const STR_ENDPOINT = 'https://btlr.sharethrough.com/WYu2BXv1/v1';
-const DEFAULT_SIZE = [1, 1];
+const SUPPLY_ID = 'WYu2BXv1';
+
+const STR_ENDPOINT = `https://btlr.sharethrough.com/universal/v1?supply_id=${SUPPLY_ID}`;
 
 // this allows stubbing of utility function that is used internally by the sharethrough adapter
 export const sharethroughInternal = {
-  b64EncodeUnicode,
-  handleIframe,
-  isLockedInFrame,
-  getProtocol
+  getProtocol,
 };
 
 export const sharethroughAdapterSpec = {
   code: BIDDER_CODE,
-
+  supportedMediaTypes: [VIDEO, BANNER],
+  gvlid: 80,
   isBidRequestValid: bid => !!bid.params.pkey && bid.bidder === BIDDER_CODE,
 
   buildRequests: (bidRequests, bidderRequest) => {
-    return bidRequests.map(bidRequest => {
-      let query = {
-        placement_key: bidRequest.params.pkey,
-        bidId: bidRequest.bidId,
-        consent_required: false,
-        instant_play_capable: canAutoPlayHTML5Video(),
-        hbSource: 'prebid',
-        hbVersion: '$prebid.version$',
-        strVersion: VERSION
-      };
-
-      const nonHttp = sharethroughInternal.getProtocol().indexOf('http') < 0;
-      query.secure = nonHttp || (sharethroughInternal.getProtocol().indexOf('https') > -1);
-
-      if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) {
-        query.consent_string = bidderRequest.gdprConsent.consentString;
-      }
-
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        query.consent_required = !!bidderRequest.gdprConsent.gdprApplies;
-      }
-
-      if (bidderRequest && bidderRequest.uspConsent) {
-        query.us_privacy = bidderRequest.uspConsent
-      }
-
-      if (bidRequest.userId && bidRequest.userId.tdid) {
-        query.ttduid = bidRequest.userId.tdid;
+    const timeout = config.getConfig('bidderTimeout');
+    const firstPartyData = bidderRequest.ortb2 || {};
+
+    const nonHttp = sharethroughInternal.getProtocol().indexOf('http') < 0;
+    const secure = nonHttp || (sharethroughInternal.getProtocol().indexOf('https') > -1);
+
+    const req = {
+      id: generateUUID(),
+      at: 1,
+      cur: ['USD'],
+      tmax: timeout,
+      site: {
+        domain: deepAccess(bidderRequest, 'refererInfo.domain', window.location.hostname),
+        page: deepAccess(bidderRequest, 'refererInfo.page', window.location.href),
+        ref: deepAccess(bidderRequest, 'refererInfo.ref'),
+        ...firstPartyData.site,
+      },
+      device: {
+        ua: navigator.userAgent,
+        language: navigator.language,
+        js: 1,
+        dnt: navigator.doNotTrack === '1' ? 1 : 0,
+        h: window.screen.height,
+        w: window.screen.width,
+      },
+      regs: {
+        coppa: config.getConfig('coppa') === true ? 1 : 0,
+        ext: {},
+      },
+      source: {
+        tid: bidderRequest.auctionId,
+        ext: {
+          version: '$prebid.version$',
+          str: VERSION,
+          schain: bidRequests[0].schain,
+        },
+      },
+      bcat: deepAccess(bidderRequest.ortb2, 'bcat') || bidRequests[0].params.bcat || [],
+      badv: deepAccess(bidderRequest.ortb2, 'badv') || bidRequests[0].params.badv || [],
+      test: 0,
+    };
+
+    req.user = nullish(firstPartyData.user, {});
+    if (!req.user.ext) req.user.ext = {};
+    req.user.ext.eids = createEidsArray(deepAccess(bidRequests[0], 'userId')) || [];
+
+    if (bidderRequest.gdprConsent) {
+      const gdprApplies = bidderRequest.gdprConsent.gdprApplies === true;
+      req.regs.ext.gdpr = gdprApplies ? 1 : 0;
+      if (gdprApplies) {
+        req.user.ext.consent = bidderRequest.gdprConsent.consentString;
       }
+    }
 
-      if (bidRequest.schain) {
-        query.schain = JSON.stringify(bidRequest.schain);
-      }
+    if (bidderRequest.uspConsent) {
+      req.regs.ext.us_privacy = bidderRequest.uspConsent;
+    }
 
-      if (bidRequest.bidfloor) {
-        query.bidfloor = parseFloat(bidRequest.bidfloor);
+    const imps = bidRequests.map(bidReq => {
+      const impression = { ext: {} };
+
+      // mergeDeep(impression, bidReq.ortb2Imp); // leaving this out for now as we may want to leave stuff out on purpose
+      const tid = deepAccess(bidReq, 'ortb2Imp.ext.tid');
+      if (tid) impression.ext.tid = tid;
+      const gpid = deepAccess(bidReq, 'ortb2Imp.ext.gpid', deepAccess(bidReq, 'ortb2Imp.ext.data.pbadslot'));
+      if (gpid) impression.ext.gpid = gpid;
+
+      const videoRequest = deepAccess(bidReq, 'mediaTypes.video');
+
+      if (videoRequest) {
+        // default playerSize, only change this if we know width and height are properly defined in the request
+        let [w, h] = [640, 360];
+        if (videoRequest.playerSize && videoRequest.playerSize[0] && videoRequest.playerSize[1]) {
+          [w, h] = videoRequest.playerSize;
+        }
+
+        impression.video = {
+          pos: nullish(videoRequest.pos, 0),
+          topframe: inIframe() ? 0 : 1,
+          skip: nullish(videoRequest.skip, 0),
+          linearity: nullish(videoRequest.linearity, 1),
+          minduration: nullish(videoRequest.minduration, 5),
+          maxduration: nullish(videoRequest.maxduration, 60),
+          playbackmethod: videoRequest.playbackmethod || [2],
+          api: getVideoApi(videoRequest),
+          mimes: videoRequest.mimes || ['video/mp4'],
+          protocols: getVideoProtocols(videoRequest),
+          w,
+          h,
+          startdelay: nullish(videoRequest.startdelay, 0),
+          skipmin: nullish(videoRequest.skipmin, 0),
+          skipafter: nullish(videoRequest.skipafter, 0),
+          placement: videoRequest.context === 'instream' ? 1 : +deepAccess(videoRequest, 'placement', 4),
+        };
+
+        if (videoRequest.delivery) impression.video.delivery = videoRequest.delivery;
+        if (videoRequest.companiontype) impression.video.companiontype = videoRequest.companiontype;
+        if (videoRequest.companionad) impression.video.companionad = videoRequest.companionad;
+      } else {
+        impression.banner = {
+          pos: deepAccess(bidReq, 'mediaTypes.banner.pos', 0),
+          topframe: inIframe() ? 0 : 1,
+          format: bidReq.sizes.map(size => ({ w: +size[0], h: +size[1] })),
+        };
       }
 
-      // Data that does not need to go to the server,
-      // but we need as part of interpretResponse()
-      const strData = {
-        skipIframeBusting: bidRequest.params.iframe,
-        iframeSize: bidRequest.params.iframeSize,
-        sizes: bidRequest.sizes
+      return {
+        id: bidReq.bidId,
+        tagid: String(bidReq.params.pkey),
+        secure: secure ? 1 : 0,
+        bidfloor: getBidRequestFloor(bidReq),
+        ...impression,
       };
+    }).filter(imp => !!imp);
 
+    return imps.map(impression => {
       return {
-        method: 'GET',
+        method: 'POST',
         url: STR_ENDPOINT,
-        data: query,
-        strData: strData
+        data: {
+          ...req,
+          imp: [impression],
+        },
       };
-    })
+    });
   },
 
   interpretResponse: ({ body }, req) => {
-    if (!body || !body.creatives || !body.creatives.length) {
+    if (!body || !body.seatbid || body.seatbid.length === 0 || !body.seatbid[0].bid || body.seatbid[0].bid.length === 0) {
       return [];
     }
 
-    const creative = body.creatives[0];
-    let size = DEFAULT_SIZE;
-    if (req.strData.iframeSize || req.strData.sizes.length) {
-      size = req.strData.iframeSize
-        ? req.strData.iframeSize
-        : getLargestSize(req.strData.sizes);
-    }
+    return body.seatbid[0].bid.map(bid => {
+      const response = {
+        requestId: bid.impid,
+        width: +bid.w,
+        height: +bid.h,
+        cpm: +bid.price,
+        creativeId: bid.crid,
+        dealId: bid.dealid || null,
+        mediaType: req.data.imp[0].video ? VIDEO : BANNER,
+        currency: body.cur || 'USD',
+        netRevenue: true,
+        ttl: 360,
+        ad: bid.adm,
+        nurl: bid.nurl,
+        meta: {
+          advertiserDomains: bid.adomain || [],
+        },
+      };
 
-    return [{
-      requestId: req.data.bidId,
-      width: size[0],
-      height: size[1],
-      cpm: creative.cpm,
-      creativeId: creative.creative.creative_key,
-      dealId: creative.creative.deal_id,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 360,
-      ad: generateAd(body, req)
-    }];
+      if (response.mediaType === VIDEO) {
+        response.ttl = 3600;
+        response.vastXml = bid.adm;
+      }
+
+      return response;
+    });
   },
 
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    const syncParams = uspConsent ? `&us_privacy=${uspConsent}` : '';
-    const syncs = [];
-    const shouldCookieSync = syncOptions.pixelEnabled &&
-      serverResponses.length > 0 &&
-      serverResponses[0].body &&
-      serverResponses[0].body.cookieSyncUrls;
-
-    if (shouldCookieSync) {
-      serverResponses[0].body.cookieSyncUrls.forEach(url => {
-        syncs.push({ type: 'image', url: url + syncParams });
-      });
-    }
+  getUserSyncs: (syncOptions, serverResponses) => {
+    const shouldCookieSync = syncOptions.pixelEnabled && deepAccess(serverResponses, '0.body.cookieSyncUrls') !== undefined;
 
-    return syncs;
+    return shouldCookieSync
+      ? serverResponses[0].body.cookieSyncUrls.map(url => ({ type: 'image', url: url }))
+      : [];
   },
 
   // Empty implementation for prebid core to be able to find it
-  onTimeout: (data) => {},
+  onTimeout: (data) => {
+  },
 
   // Empty implementation for prebid core to be able to find it
-  onBidWon: (bid) => {},
+  onBidWon: (bid) => {
+  },
 
   // Empty implementation for prebid core to be able to find it
-  onSetTargeting: (bid) => {}
+  onSetTargeting: (bid) => {
+  },
 };
 
-function getLargestSize(sizes) {
-  function area(size) {
-    return size[0] * size[1];
+function getVideoApi({ api }) {
+  let defaultValue = [2];
+  if (api && Array.isArray(api) && api.length > 0) {
+    return api;
+  } else {
+    return defaultValue;
   }
-
-  return sizes.reduce((prev, current) => {
-    if (area(current) > area(prev)) {
-      return current
-    } else {
-      return prev
-    }
-  });
 }
 
-function generateAd(body, req) {
-  const strRespId = `str_response_${req.data.bidId}`;
-
-  let adMarkup = `
-    <div data-str-native-key="${req.data.placement_key}" data-stx-response-name="${strRespId}">
-    </div>
-    <script>var ${strRespId} = "${b64EncodeUnicode(JSON.stringify(body))}"</script>
-  `;
-
-  if (req.strData.skipIframeBusting) {
-    // Don't break out of iframe
-    adMarkup = adMarkup + `<script src="https://native.sharethrough.com/assets/sfp.js"></script>`;
+function getVideoProtocols({ protocols }) {
+  let defaultValue = [2, 3, 5, 6, 7, 8];
+  if (protocols && Array.isArray(protocols) && protocols.length > 0) {
+    return protocols;
   } else {
-    // Add logic to the markup that detects whether or not in top level document is accessible
-    // this logic will deploy sfp.js and/or iframe buster script(s) as appropriate
-    adMarkup = adMarkup + `
-      <script>
-        (${sharethroughInternal.isLockedInFrame.toString()})()
-      </script>
-      <script>
-        (${sharethroughInternal.handleIframe.toString()})()
-      </script>`;
+    return defaultValue;
   }
-
-  return adMarkup;
 }
 
-function handleIframe () {
-  // only load iframe buster JS if we can access the top level document
-  // if we are 'locked in' to this frame then no point trying to bust out: we may as well render in the frame instead
-  var iframeBusterLoaded = false;
-  if (!window.lockedInFrame) {
-    var sfpIframeBusterJs = document.createElement('script');
-    sfpIframeBusterJs.src = 'https://native.sharethrough.com/assets/sfp-set-targeting.js';
-    sfpIframeBusterJs.type = 'text/javascript';
-    try {
-      window.document.getElementsByTagName('body')[0].appendChild(sfpIframeBusterJs);
-      iframeBusterLoaded = true;
-    } catch (e) {
-      utils.logError('Trouble writing frame buster script, error details:', e);
-    }
-  }
-
-  var clientJsLoaded = (!iframeBusterLoaded) ? !!(window.STR && window.STR.Tag) : !!(window.top.STR && window.top.STR.Tag);
-  if (!clientJsLoaded) {
-    var sfpJs = document.createElement('script');
-    sfpJs.src = 'https://native.sharethrough.com/assets/sfp.js';
-    sfpJs.type = 'text/javascript';
-
-    // only add sfp js to window.top if iframe busting successfully loaded; otherwise, add to iframe
-    try {
-      if (iframeBusterLoaded) {
-        window.top.document.getElementsByTagName('body')[0].appendChild(sfpJs);
-      } else {
-        window.document.getElementsByTagName('body')[0].appendChild(sfpJs);
-      }
-    } catch (e) {
-      utils.logError('Trouble writing sfp script, error details:', e);
+function getBidRequestFloor(bid) {
+  let floor = null;
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: bid.mediaTypes && bid.mediaTypes.video ? 'video' : 'banner',
+      size: bid.sizes.map(size => ({ w: size[0], h: size[1] })),
+    });
+    if (typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+      floor = parseFloat(floorInfo.floor);
     }
   }
+  return floor !== null ? floor : bid.params.floor;
 }
 
-// determines if we are capable of busting out of the iframe we are in
-// if we catch a DOMException when trying to access top-level document, it means we're stuck in the frame we're in
-function isLockedInFrame () {
-  window.lockedInFrame = false;
-  try {
-    window.lockedInFrame = !window.top.document;
-  } catch (e) {
-    window.lockedInFrame = (e instanceof DOMException);
-  }
-}
-
-// See https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding#The_Unicode_Problem
-function b64EncodeUnicode(str) {
-  return btoa(
-    encodeURIComponent(str).replace(/%([0-9A-F]{2})/g,
-      function toSolidBytes(match, p1) {
-        return String.fromCharCode('0x' + p1);
-      }));
-}
-
-function canAutoPlayHTML5Video() {
-  const userAgent = navigator.userAgent;
-  if (!userAgent) return false;
-
-  const isAndroid = /Android/i.test(userAgent);
-  const isiOS = /iPhone|iPad|iPod/i.test(userAgent);
-  const chromeVersion = parseInt((/Chrome\/([0-9]+)/.exec(userAgent) || [0, 0])[1]);
-  const chromeiOSVersion = parseInt((/CriOS\/([0-9]+)/.exec(userAgent) || [0, 0])[1]);
-  const safariVersion = parseInt((/Version\/([0-9]+)/.exec(userAgent) || [0, 0])[1]);
-
-  if (
-    (isAndroid && chromeVersion >= 53) ||
-    (isiOS && (safariVersion >= 10 || chromeiOSVersion >= 53)) ||
-    !(isAndroid || isiOS)
-  ) {
-    return true;
-  } else {
-    return false;
-  }
+function getProtocol() {
+  return window.location.protocol;
 }
 
-function getProtocol() {
-  return document.location.protocol;
+// stub for ?? operator
+function nullish(input, def) {
+  return input === null || input === undefined ? def : input;
 }
 
 registerBidder(sharethroughAdapterSpec);
diff --git a/modules/sharethroughBidAdapter.md b/modules/sharethroughBidAdapter.md
index 2290e370cae..218ef353d4e 100644
--- a/modules/sharethroughBidAdapter.md
+++ b/modules/sharethroughBidAdapter.md
@@ -23,16 +23,74 @@ Module that connects to Sharethrough's demand sources
             // REQUIRED - The placement key
             pkey: 'LuB3vxGGFrBZJa6tifXW4xgK',
 
-            // OPTIONAL - Render Sharethrough creative in an iframe, defaults to false
-            iframe: true,
+            // OPTIONAL - Blocked Advertiser Domains
+            badv: ['domain1.com', 'domain2.com'],
 
-            // OPTIONAL - If iframeSize is provided, we'll use this size for the iframe
-            // otherwise we'll grab the largest size from the sizes array
-            // This is ignored if iframe: false
-            iframeSize: [250, 250]
+            // OPTIONAL - Blocked Categories (IAB codes)
+            bcat: ['IAB1-1', 'IAB1-2'],
+
+            // OPTIONAL - default bid floor, if not specified in bid request (USD)
+            floor: 0.1,
           }
         }
       ]
     }
   ];
 ```
+
+# Sample Instream Video Ad Unit: For Publishers
+```
+var adVideoAdUnits = [
+{
+    code: 'test-div-video',
+    mediaTypes: {
+        video: {
+            // CANNOT be 'outstream'
+            context: 'instream', 
+            placement: 1,
+            delivery: 1,
+            companiontype: 'companion type',
+            companionad: 'companion ad',
+            // default values shown below this point
+            pos: 0,
+            skip: 0,
+            linearity: 1,
+            minduration: 5,
+            maxduration: 60,
+            playbackmethod: [2],
+            api: [2],
+            mimes: ['video/mp4'],
+            protocols: [2, 3, 5, 6, 7, 8],
+            playerSize: [640, 360],
+            startdelay: 0,
+            skipmin: 0,
+            skipafter: 0,
+        },
+    },
+    bids: [{
+        bidder: 'sharethrough',
+        params: {
+            pkey: 'pkey1'           
+        }
+    }]
+}]
+```
+
+# Sample Banner Ad Unit: For Publishers
+```
+var adUnits = [
+{
+    code: 'test-div-video',
+    mediaTypes: {
+        banner: {
+            pos: 0, // default
+        },
+    },
+    bids: [{
+      bidder: 'sharethrough',
+      params: {
+            pkey: 'pkey1'
+      }
+    }]
+}]
+```
diff --git a/modules/shinezBidAdapter.js b/modules/shinezBidAdapter.js
new file mode 100644
index 00000000000..0ce2eed6479
--- /dev/null
+++ b/modules/shinezBidAdapter.js
@@ -0,0 +1,435 @@
+import { logWarn, logInfo, isArray, isFn, deepAccess, isEmpty, contains, timestamp, getBidIdParameter, triggerPixel, isInteger } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const BIDDER_CODE = 'shinez';
+const ADAPTER_VERSION = '1.0.0';
+const TTL = 360;
+const CURRENCY = 'USD';
+const SELLER_ENDPOINT = 'https://hb.sweetgum.io/';
+const MODES = {
+  PRODUCTION: 'hb-sz-multi',
+  TEST: 'hb-multi-sz-test'
+}
+const SUPPORTED_SYNC_METHODS = {
+  IFRAME: 'iframe',
+  PIXEL: 'pixel'
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: ADAPTER_VERSION,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params) {
+      logWarn('no params have been set to Shinez adapter');
+      return false;
+    }
+
+    if (!bidRequest.params.org) {
+      logWarn('org is a mandatory param for Shinez adapter');
+      return false;
+    }
+
+    return true;
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const combinedRequestsObject = {};
+
+    // use data from the first bid, to create the general params for all bids
+    const generalObject = validBidRequests[0];
+    const testMode = generalObject.params.testMode;
+
+    combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest);
+    combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
+
+    return {
+      method: 'POST',
+      url: getEndpoint(testMode),
+      data: combinedRequestsObject
+    }
+  },
+  interpretResponse: function ({body}) {
+    const bidResponses = [];
+
+    if (body.bids) {
+      body.bids.forEach(adUnit => {
+        const bidResponse = {
+          requestId: adUnit.requestId,
+          cpm: adUnit.cpm,
+          currency: adUnit.currency || CURRENCY,
+          width: adUnit.width,
+          height: adUnit.height,
+          ttl: adUnit.ttl || TTL,
+          creativeId: adUnit.requestId,
+          netRevenue: adUnit.netRevenue || true,
+          nurl: adUnit.nurl,
+          mediaType: adUnit.mediaType,
+          meta: {
+            mediaType: adUnit.mediaType
+          }
+        };
+
+        if (adUnit.mediaType === VIDEO) {
+          bidResponse.vastXml = adUnit.vastXml;
+        } else if (adUnit.mediaType === BANNER) {
+          bidResponse.ad = adUnit.ad;
+        }
+
+        if (adUnit.adomain && adUnit.adomain.length) {
+          bidResponse.meta.advertiserDomains = adUnit.adomain;
+        }
+
+        bidResponses.push(bidResponse);
+      });
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.iframeEnabled && response.body.params.userSyncURL) {
+        syncs.push({
+          type: 'iframe',
+          url: response.body.params.userSyncURL
+        });
+      }
+      if (syncOptions.pixelEnabled && isArray(response.body.params.userSyncPixels)) {
+        const pixels = response.body.params.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        })
+        syncs.push(...pixels)
+      }
+    }
+    return syncs;
+  },
+  onBidWon: function (bid) {
+    if (bid == null) {
+      return;
+    }
+
+    logInfo('onBidWon:', bid);
+    if (bid.hasOwnProperty('nurl') && bid.nurl.length > 0) {
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+registerBidder(spec);
+
+/**
+ * Get floor price
+ * @param bid {bid}
+ * @returns {Number}
+ */
+function getFloor(bid, mediaType) {
+  if (!isFn(bid.getFloor)) {
+    return 0;
+  }
+  let floorResult = bid.getFloor({
+    currency: CURRENCY,
+    mediaType: mediaType,
+    size: '*'
+  });
+  return floorResult.currency === CURRENCY && floorResult.floor ? floorResult.floor : 0;
+}
+
+/**
+ * Get the the ad sizes array from the bid
+ * @param bid {bid}
+ * @returns {Array}
+ */
+function getSizesArray(bid, mediaType) {
+  let sizesArray = []
+
+  if (deepAccess(bid, `mediaTypes.${mediaType}.sizes`)) {
+    sizesArray = bid.mediaTypes[mediaType].sizes;
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    sizesArray = bid.sizes;
+  }
+
+  return sizesArray;
+}
+
+/**
+ * Get schain string value
+ * @param schainObject {Object}
+ * @returns {string}
+ */
+function getSupplyChain(schainObject) {
+  if (isEmpty(schainObject)) {
+    return '';
+  }
+  let scStr = `${schainObject.ver},${schainObject.complete}`;
+  schainObject.nodes.forEach((node) => {
+    scStr += '!';
+    scStr += `${getEncodedValIfNotEmpty(node.asi)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.sid)},`;
+    scStr += `${node.hp ? encodeURIComponent(node.hp) : ''},`;
+    scStr += `${getEncodedValIfNotEmpty(node.rid)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.name)},`;
+    scStr += `${getEncodedValIfNotEmpty(node.domain)}`;
+  });
+  return scStr;
+}
+
+/**
+ * Get encoded node value
+ * @param val {string}
+ * @returns {string}
+ */
+function getEncodedValIfNotEmpty(val) {
+  return !isEmpty(val) ? encodeURIComponent(val) : '';
+}
+
+/**
+ * Get preferred user-sync method based on publisher configuration
+ * @param bidderCode {string}
+ * @returns {string}
+ */
+function getAllowedSyncMethod(filterSettings, bidderCode) {
+  const iframeConfigsToCheck = ['all', 'iframe'];
+  const pixelConfigToCheck = 'image';
+  if (filterSettings && iframeConfigsToCheck.some(config => isSyncMethodAllowed(filterSettings[config], bidderCode))) {
+    return SUPPORTED_SYNC_METHODS.IFRAME;
+  }
+  if (!filterSettings || !filterSettings[pixelConfigToCheck] || isSyncMethodAllowed(filterSettings[pixelConfigToCheck], bidderCode)) {
+    return SUPPORTED_SYNC_METHODS.PIXEL;
+  }
+}
+
+/**
+ * Check if sync rule is supported
+ * @param syncRule {Object}
+ * @param bidderCode {string}
+ * @returns {boolean}
+ */
+function isSyncMethodAllowed(syncRule, bidderCode) {
+  if (!syncRule) {
+    return false;
+  }
+  const isInclude = syncRule.filter === 'include';
+  const bidders = isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
+  return isInclude && contains(bidders, bidderCode);
+}
+
+/**
+ * Get the seller endpoint
+ * @param testMode {boolean}
+ * @returns {string}
+ */
+function getEndpoint(testMode) {
+  return testMode
+    ? SELLER_ENDPOINT + MODES.TEST
+    : SELLER_ENDPOINT + MODES.PRODUCTION;
+}
+
+/**
+ * get device type
+ * @param uad {ua}
+ * @returns {string}
+ */
+function getDeviceType(ua) {
+  if (/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i
+    .test(ua.toLowerCase())) {
+    return '5';
+  }
+  if (/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i
+    .test(ua.toLowerCase())) {
+    return '4';
+  }
+  if (/smart[-_\s]?tv|hbbtv|appletv|googletv|hdmi|netcast|viera|nettv|roku|\bdtv\b|sonydtv|inettvbrowser|\btv\b/i
+    .test(ua.toLowerCase())) {
+    return '3';
+  }
+  return '1';
+}
+
+function generateBidsParams(validBidRequests, bidderRequest) {
+  const bidsArray = [];
+
+  if (validBidRequests.length) {
+    validBidRequests.forEach(bid => {
+      bidsArray.push(generateBidParameters(bid, bidderRequest));
+    });
+  }
+
+  return bidsArray;
+}
+
+/**
+ * Generate bid specific parameters
+ * @param {bid} bid
+ * @param {bidderRequest} bidderRequest
+ * @returns {Object} bid specific params object
+ */
+function generateBidParameters(bid, bidderRequest) {
+  const {params} = bid;
+  const mediaType = isBanner(bid) ? BANNER : VIDEO;
+  const sizesArray = getSizesArray(bid, mediaType);
+
+  // fix floor price in case of NAN
+  if (isNaN(params.floorPrice)) {
+    params.floorPrice = 0;
+  }
+
+  const bidObject = {
+    mediaType,
+    adUnitCode: getBidIdParameter('adUnitCode', bid),
+    sizes: sizesArray,
+    floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
+    bidId: getBidIdParameter('bidId', bid),
+    bidderRequestId: getBidIdParameter('bidderRequestId', bid),
+    transactionId: getBidIdParameter('transactionId', bid),
+  };
+
+  const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
+  if (pos) {
+    bidObject.pos = pos;
+  }
+
+  const gpid = deepAccess(bid, `ortb2Imp.ext.gpid`);
+  if (gpid) {
+    bidObject.gpid = gpid;
+  }
+
+  const placementId = params.placementId || deepAccess(bid, `mediaTypes.${mediaType}.name`);
+  if (placementId) {
+    bidObject.placementId = placementId;
+  }
+
+  if (mediaType === VIDEO) {
+    const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
+    let playbackMethodValue;
+
+    // verify playbackMethod is of type integer array, or integer only.
+    if (Array.isArray(playbackMethod) && isInteger(playbackMethod[0])) {
+      // only the first playbackMethod in the array will be used, according to OpenRTB 2.5 recommendation
+      playbackMethodValue = playbackMethod[0];
+    } else if (isInteger(playbackMethod)) {
+      playbackMethodValue = playbackMethod;
+    }
+
+    if (playbackMethodValue) {
+      bidObject.playbackMethod = playbackMethodValue;
+    }
+
+    const placement = deepAccess(bid, `mediaTypes.video.placement`);
+    if (placement) {
+      bidObject.placement = placement;
+    }
+
+    const minDuration = deepAccess(bid, `mediaTypes.video.minduration`);
+    if (minDuration) {
+      bidObject.minDuration = minDuration;
+    }
+
+    const maxDuration = deepAccess(bid, `mediaTypes.video.maxduration`);
+    if (maxDuration) {
+      bidObject.maxDuration = maxDuration;
+    }
+
+    const skip = deepAccess(bid, `mediaTypes.video.skip`);
+    if (skip) {
+      bidObject.skip = skip;
+    }
+
+    const linearity = deepAccess(bid, `mediaTypes.video.linearity`);
+    if (linearity) {
+      bidObject.linearity = linearity;
+    }
+  }
+
+  return bidObject;
+}
+
+function isBanner(bid) {
+  return bid.mediaTypes && bid.mediaTypes.banner;
+}
+
+/**
+ * Generate params that are common between all bids
+ * @param {single bid object} generalObject
+ * @param {bidderRequest} bidderRequest
+ * @returns {object} the common params object
+ */
+function generateGeneralParams(generalObject, bidderRequest) {
+  const domain = window.location.hostname;
+  const {syncEnabled, filterSettings} = config.getConfig('userSync') || {};
+  const {bidderCode} = bidderRequest;
+  const generalBidParams = generalObject.params;
+  const timeout = config.getConfig('bidderTimeout');
+
+  // these params are snake_case instead of camelCase to allow backwards compatability on the server.
+  // in the future, these will be converted to camelCase to match our convention.
+  const generalParams = {
+    wrapper_type: 'prebidjs',
+    wrapper_vendor: '$$PREBID_GLOBAL$$',
+    wrapper_version: '$prebid.version$',
+    adapter_version: ADAPTER_VERSION,
+    auction_start: timestamp(),
+    publisher_id: generalBidParams.org,
+    publisher_name: domain,
+    site_domain: domain,
+    dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+    device_type: getDeviceType(navigator.userAgent),
+    ua: navigator.userAgent,
+    session_id: getBidIdParameter('auctionId', generalObject),
+    tmax: timeout
+  };
+
+  const userIdsParam = getBidIdParameter('userId', generalObject);
+  if (userIdsParam) {
+    generalParams.userIds = JSON.stringify(userIdsParam);
+  }
+
+  const ortb2Metadata = bidderRequest.ortb2 || {};
+  if (ortb2Metadata.site) {
+    generalParams.site_metadata = JSON.stringify(ortb2Metadata.site);
+  }
+  if (ortb2Metadata.user) {
+    generalParams.user_metadata = JSON.stringify(ortb2Metadata.user);
+  }
+
+  if (syncEnabled) {
+    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
+    if (allowedSyncMethod) {
+      generalParams.cs_method = allowedSyncMethod;
+    }
+  }
+
+  if (bidderRequest.uspConsent) {
+    generalParams.us_privacy = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+    generalParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    generalParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
+  if (generalBidParams.ifa) {
+    generalParams.ifa = generalBidParams.ifa;
+  }
+
+  if (generalObject.schain) {
+    generalParams.schain = getSupplyChain(generalObject.schain);
+  }
+
+  if (bidderRequest.ortb2 && bidderRequest.ortb2.site) {
+    generalParams.referrer = bidderRequest.ortb2.site.ref;
+    generalParams.page_url = bidderRequest.ortb2.site.page;
+  }
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    generalParams.referrer = generalParams.referrer || deepAccess(bidderRequest, 'refererInfo.referer');
+    generalParams.page_url = generalParams.page_url || config.getConfig('pageUrl') || deepAccess(window, 'location.href');
+  }
+
+  return generalParams;
+}
diff --git a/modules/shinezBidAdapter.md b/modules/shinezBidAdapter.md
new file mode 100644
index 00000000000..f0ef7a6c218
--- /dev/null
+++ b/modules/shinezBidAdapter.md
@@ -0,0 +1,76 @@
+#Overview
+
+Module Name: Shinez Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: tech-team@shinez.io
+
+
+# Description
+
+Module that connects to Shinez's demand sources.
+
+The Shinez adapter requires setup and approval from the Shinez. Please reach out to tech-team@shinez.io to create an Shinez account.
+
+The adapter supports Video(instream) & Banner.
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `org` | required | String |  Shinez publisher Id provided by your Shinez representative  | "56f91cd4d3e3660002000033"
+| `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
+| `placementId` | optional | String |  A unique placement identifier  | "12345678"
+| `testMode` | optional | Boolean |  This activates the test mode  | false
+
+# Test Parameters
+```javascript
+var adUnits = [{
+        code: 'dfp-video-div',
+        sizes: [
+            [640, 480]
+        ],
+        mediaTypes: {
+            video: {
+                playerSize: [
+                    [640, 480]
+                ],
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'shinez',
+            params: {
+                org: '56f91cd4d3e3660002000033', // Required
+                floorPrice: 2.00, // Optional
+                placementId: 'shinez-video-test', // Optional
+                testMode: true // Optional
+            }
+        }]
+    },
+    {
+        code: 'dfp-banner-div',
+        sizes: [
+            [640, 480]
+        ],
+        mediaTypes: {
+            banner: {
+                sizes: [
+                    [640, 480]
+                ]
+            }
+        },
+        bids: [{
+            bidder: 'shinez',
+            params: {
+                org: '56f91cd4d3e3660002000033', // Required
+                floorPrice: 2.00, // Optional
+                placementId: 'shinez-banner-test', // Optional
+                testMode: true // Optional
+            }
+        }]
+    }
+];
+```
\ No newline at end of file
diff --git a/modules/showheroes-bsBidAdapter.js b/modules/showheroes-bsBidAdapter.js
index d0eb8c6a589..f9ce3a450cf 100644
--- a/modules/showheroes-bsBidAdapter.js
+++ b/modules/showheroes-bsBidAdapter.js
@@ -1,4 +1,11 @@
-import * as utils from '../src/utils.js';
+import {
+  deepAccess,
+  getBidIdParameter,
+  getWindowTop,
+  triggerPixel,
+  logInfo,
+  logError
+} from '../src/utils.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
@@ -7,6 +14,7 @@ import { loadExternalScript } from '../src/adloader.js';
 
 const PROD_ENDPOINT = 'https://bs.showheroes.com/api/v1/bid';
 const STAGE_ENDPOINT = 'https://bid-service.stage.showheroes.com/api/v1/bid';
+const VIRALIZE_ENDPOINT = 'https://ads.viralize.tv/prebid-sh/';
 const PROD_PUBLISHER_TAG = 'https://static.showheroes.com/publishertag.js';
 const STAGE_PUBLISHER_TAG = 'https://pubtag.stage.showheroes.com/publishertag.js';
 const PROD_VL = 'https://video-library.showheroes.com';
@@ -26,33 +34,41 @@ export const spec = {
   aliases: ['showheroesBs'],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function(bid) {
-    return !!bid.params.playerId;
+    return !!bid.params.playerId || !!bid.params.unitId;
   },
   buildRequests: function(validBidRequests, bidderRequest) {
     let adUnits = [];
     const pageURL = validBidRequests[0].params.contentPageUrl || bidderRequest.refererInfo.referer;
     const isStage = !!validBidRequests[0].params.stage;
-    const isOutstream = utils.deepAccess(validBidRequests[0], 'mediaTypes.video.context') === 'outstream';
-    const isCustomRender = utils.deepAccess(validBidRequests[0], 'params.outstreamOptions.customRender');
-    const isNodeRender = utils.deepAccess(validBidRequests[0], 'params.outstreamOptions.slot') || utils.deepAccess(validBidRequests[0], 'params.outstreamOptions.iframe');
-    const isNativeRender = utils.deepAccess(validBidRequests[0], 'renderer');
-    const outstreamOptions = utils.deepAccess(validBidRequests[0], 'params.outstreamOptions');
+    const isViralize = !!validBidRequests[0].params.unitId;
+    const isOutstream = deepAccess(validBidRequests[0], 'mediaTypes.video.context') === 'outstream';
+    const isCustomRender = deepAccess(validBidRequests[0], 'params.outstreamOptions.customRender');
+    const isNodeRender = deepAccess(validBidRequests[0], 'params.outstreamOptions.slot') || deepAccess(validBidRequests[0], 'params.outstreamOptions.iframe');
+    const isNativeRender = deepAccess(validBidRequests[0], 'renderer');
+    const outstreamOptions = deepAccess(validBidRequests[0], 'params.outstreamOptions');
     const isBanner = !!validBidRequests[0].mediaTypes.banner || (isOutstream && !(isCustomRender || isNativeRender || isNodeRender));
     const defaultSchain = validBidRequests[0].schain || {};
 
+    const consentData = bidderRequest.gdprConsent || {};
+    const gdprConsent = {
+      apiVersion: consentData.apiVersion || 2,
+      gdprApplies: consentData.gdprApplies || 0,
+      consentString: consentData.consentString || '',
+    }
+
     validBidRequests.forEach((bid) => {
       const videoSizes = getVideoSizes(bid);
       const bannerSizes = getBannerSizes(bid);
-      const vpaidMode = utils.getBidIdParameter('vpaidMode', bid.params);
+      const vpaidMode = getBidIdParameter('vpaidMode', bid.params);
 
-      const makeBids = (type, size) => {
+      const makeBids = (type, size, isViralize) => {
         let context = '';
         let streamType = 2;
 
         if (type === BANNER) {
           streamType = 5;
         } else {
-          context = utils.deepAccess(bid, 'mediaTypes.video.context');
+          context = deepAccess(bid, 'mediaTypes.video.context');
           if (vpaidMode && context === 'instream') {
             streamType = 1;
           }
@@ -61,52 +77,94 @@ export const spec = {
           }
         }
 
-        return {
+        let rBid = {
           type: streamType,
+          adUnitCode: bid.adUnitCode,
           bidId: bid.bidId,
-          mediaType: type,
           context: context,
-          playerId: utils.getBidIdParameter('playerId', bid.params),
           auctionId: bidderRequest.auctionId,
           bidderCode: BIDDER_CODE,
-          gdprConsent: bidderRequest.gdprConsent,
           start: +new Date(),
           timeout: 3000,
-          size: {
-            width: size[0],
-            height: size[1]
-          },
           params: bid.params,
-          schain: bid.schain || defaultSchain,
+          schain: bid.schain || defaultSchain
         };
+
+        if (isViralize) {
+          rBid.unitId = getBidIdParameter('unitId', bid.params);
+          rBid.sizes = size;
+          rBid.mediaTypes = {
+            [type]: {'context': context}
+          };
+        } else {
+          rBid.playerId = getBidIdParameter('playerId', bid.params);
+          rBid.mediaType = type;
+          rBid.size = {
+            width: size[0],
+            height: size[1]
+          };
+          rBid.gdprConsent = gdprConsent;
+        }
+
+        return rBid;
       };
 
-      videoSizes.forEach((size) => {
-        adUnits.push(makeBids(VIDEO, size));
-      });
+      if (isViralize) {
+        if (videoSizes && videoSizes[0]) {
+          adUnits.push(makeBids(VIDEO, videoSizes, isViralize));
+        }
+        if (bannerSizes && bannerSizes[0]) {
+          adUnits.push(makeBids(BANNER, bannerSizes, isViralize));
+        }
+      } else {
+        videoSizes.forEach((size) => {
+          adUnits.push(makeBids(VIDEO, size));
+        });
 
-      bannerSizes.forEach((size) => {
-        adUnits.push(makeBids(BANNER, size));
-      });
+        bannerSizes.forEach((size) => {
+          adUnits.push(makeBids(BANNER, size));
+        });
+      }
     });
 
-    return {
-      url: isStage ? STAGE_ENDPOINT : PROD_ENDPOINT,
-      method: 'POST',
-      options: {contentType: 'application/json', accept: 'application/json'},
-      data: {
+    let endpointUrl;
+    let data;
+
+    const QA = validBidRequests[0].params.qa || {};
+
+    if (isViralize) {
+      endpointUrl = VIRALIZE_ENDPOINT;
+      data = {
+        'bidRequests': adUnits,
+        'context': {
+          'gdprConsent': gdprConsent,
+          'schain': defaultSchain,
+          'pageURL': QA.pageURL || encodeURIComponent(pageURL)
+        }
+      }
+    } else {
+      endpointUrl = isStage ? STAGE_ENDPOINT : PROD_ENDPOINT;
+
+      data = {
         'user': [],
         'meta': {
           'adapterVersion': 2,
-          'pageURL': encodeURIComponent(pageURL),
+          'pageURL': QA.pageURL || encodeURIComponent(pageURL),
           'vastCacheEnabled': (!!config.getConfig('cache') && !isBanner && !outstreamOptions) || false,
-          'isDesktop': utils.getWindowTop().document.documentElement.clientWidth > 700,
+          'isDesktop': getWindowTop().document.documentElement.clientWidth > 700,
           'xmlAndTag': !!(isOutstream && isCustomRender) || false,
           'stage': isStage || undefined
         },
         'requests': adUnits,
         'debug': validBidRequests[0].params.debug || false,
       }
+    }
+
+    return {
+      url: QA.endpoint || endpointUrl,
+      method: 'POST',
+      options: {contentType: 'application/json', accept: 'application/json'},
+      data: data
     };
   },
   interpretResponse: function(response, request) {
@@ -140,58 +198,85 @@ export const spec = {
     }
     return syncs;
   },
+
+  onBidWon(bid) {
+    if (bid.callbacks) {
+      triggerPixel(bid.callbacks.won);
+    }
+    logInfo(
+      `Showheroes adapter won the auction. Bid id: ${bid.bidId || bid.requestId}`
+    );
+  },
 };
 
 function createBids(bidRes, reqData) {
-  if (bidRes && (!Array.isArray(bidRes.bids) || bidRes.bids.length < 1)) {
+  if (!bidRes) {
+    return [];
+  }
+  const responseBids = bidRes.bids || bidRes.bidResponses;
+  if (!Array.isArray(responseBids) || responseBids.length < 1) {
     return [];
   }
 
   const bids = [];
   const bidMap = {};
-  (reqData.requests || []).forEach((bid) => {
+  (reqData.requests || reqData.bidRequests || []).forEach((bid) => {
     bidMap[bid.bidId] = bid;
   });
 
-  bidRes.bids.forEach(function (bid) {
-    const reqBid = bidMap[bid.bidId];
+  responseBids.forEach(function (bid) {
+    const requestId = bid.bidId || bid.requestId;
+    const reqBid = bidMap[requestId];
     const currentBidParams = reqBid.params;
+    const isViralize = !!reqBid.params.unitId;
+    const size = {
+      width: bid.width || bid.size.width,
+      height: bid.height || bid.size.height
+    };
+
     let bidUnit = {};
     bidUnit.cpm = bid.cpm;
-    bidUnit.requestId = bid.bidId;
+    bidUnit.requestId = requestId;
+    bidUnit.adUnitCode = reqBid.adUnitCode;
     bidUnit.currency = bid.currency;
     bidUnit.mediaType = bid.mediaType || VIDEO;
     bidUnit.ttl = TTL;
-    bidUnit.creativeId = 'c_' + bid.bidId;
+    bidUnit.creativeId = 'c_' + requestId;
     bidUnit.netRevenue = true;
-    bidUnit.width = bid.size.width;
-    bidUnit.height = bid.size.height;
+    bidUnit.width = size.width;
+    bidUnit.height = size.height;
+    bidUnit.meta = {
+      advertiserDomains: bid.adomain || []
+    };
     if (bid.vastXml) {
       bidUnit.vastXml = bid.vastXml;
       bidUnit.adResponse = {
         content: bid.vastXml,
       };
     }
-    if (bid.vastTag) {
-      bidUnit.vastUrl = bid.vastTag;
+    if (bid.vastTag || bid.vastUrl) {
+      bidUnit.vastUrl = bid.vastTag || bid.vastUrl;
     }
     if (bid.mediaType === BANNER) {
       bidUnit.ad = getBannerHtml(bid, reqBid, reqData);
     } else if (bid.context === 'outstream') {
       const renderer = Renderer.install({
-        id: bid.bidId,
-        url: '//',
+        id: requestId,
+        url: 'https://static.showheroes.com/renderer.js',
+        adUnitCode: reqBid.adUnitCode,
         config: {
           playerId: reqBid.playerId,
-          width: bid.size.width,
-          height: bid.size.height,
+          width: size.width,
+          height: size.height,
           vastUrl: bid.vastTag,
           vastXml: bid.vastXml,
+          ad: bid.ad,
           debug: reqData.debug,
-          isStage: !!reqData.meta.stage,
-          customRender: utils.getBidIdParameter('customRender', currentBidParams.outstreamOptions),
-          slot: utils.getBidIdParameter('slot', currentBidParams.outstreamOptions),
-          iframe: utils.getBidIdParameter('iframe', currentBidParams.outstreamOptions),
+          isStage: reqData.meta && !!reqData.meta.stage,
+          isViralize: isViralize,
+          customRender: getBidIdParameter('customRender', currentBidParams.outstreamOptions),
+          slot: getBidIdParameter('slot', currentBidParams.outstreamOptions),
+          iframe: getBidIdParameter('iframe', currentBidParams.outstreamOptions),
         }
       });
       renderer.setRender(outstreamRender);
@@ -204,12 +289,17 @@ function createBids(bidRes, reqData) {
 }
 
 function outstreamRender(bid) {
-  const embedCode = createOutstreamEmbedCode(bid);
+  let embedCode;
+  if (bid.renderer.config.isViralize) {
+    embedCode = createOutstreamEmbedCodeV2(bid);
+  } else {
+    embedCode = createOutstreamEmbedCode(bid);
+  }
   if (typeof bid.renderer.config.customRender === 'function') {
     bid.renderer.config.customRender(bid, embedCode);
   } else {
     try {
-      const inIframe = utils.getBidIdParameter('iframe', bid.renderer.config);
+      const inIframe = getBidIdParameter('iframe', bid.renderer.config);
       if (inIframe && window.document.getElementById(inIframe).nodeName === 'IFRAME') {
         const iframe = window.document.getElementById(inIframe);
         let framedoc = iframe.contentDocument || (iframe.contentWindow && iframe.contentWindow.document);
@@ -217,20 +307,20 @@ function outstreamRender(bid) {
         return;
       }
 
-      const slot = utils.getBidIdParameter('slot', bid.renderer.config) || bid.adUnitCode;
+      const slot = getBidIdParameter('slot', bid.renderer.config) || bid.adUnitCode;
       if (slot && window.document.getElementById(slot)) {
         window.document.getElementById(slot).appendChild(embedCode);
       } else if (slot) {
-        utils.logError('[ShowHeroes][renderer] Error: spot not found');
+        logError('[ShowHeroes][renderer] Error: spot not found');
       }
     } catch (err) {
-      utils.logError('[ShowHeroes][renderer] Error:' + err.message)
+      logError('[ShowHeroes][renderer] Error:' + err.message);
     }
   }
 }
 
 function createOutstreamEmbedCode(bid) {
-  const isStage = utils.getBidIdParameter('isStage', bid.renderer.config);
+  const isStage = getBidIdParameter('isStage', bid.renderer.config);
   const urls = getEnvURLs(isStage);
 
   const fragment = window.document.createDocumentFragment();
@@ -242,9 +332,9 @@ function createOutstreamEmbedCode(bid) {
 
   const spot = window.document.createElement('div');
   spot.setAttribute('class', 'showheroes-spot');
-  spot.setAttribute('data-player', utils.getBidIdParameter('playerId', bid.renderer.config));
-  spot.setAttribute('data-debug', utils.getBidIdParameter('debug', bid.renderer.config));
-  spot.setAttribute('data-ad-vast-tag', utils.getBidIdParameter('vastUrl', bid.renderer.config));
+  spot.setAttribute('data-player', getBidIdParameter('playerId', bid.renderer.config));
+  spot.setAttribute('data-debug', getBidIdParameter('debug', bid.renderer.config));
+  spot.setAttribute('data-ad-vast-tag', getBidIdParameter('vastUrl', bid.renderer.config));
   spot.setAttribute('data-stream-type', 'outstream');
 
   fragment.appendChild(spot);
@@ -252,6 +342,12 @@ function createOutstreamEmbedCode(bid) {
   return fragment;
 }
 
+function createOutstreamEmbedCodeV2(bid) {
+  const range = document.createRange();
+  range.selectNode(document.getElementsByTagName('body')[0]);
+  return range.createContextualFragment(getBidIdParameter('ad', bid.renderer.config));
+}
+
 function getBannerHtml (bid, reqBid, reqData) {
   const isStage = !!reqData.meta.stage;
   const urls = getEnvURLs(isStage);
@@ -272,11 +368,11 @@ function getBannerHtml (bid, reqBid, reqData) {
 }
 
 function getVideoSizes(bidRequest) {
-  return formatSizes(utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize') || []);
+  return formatSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize') || []);
 }
 
 function getBannerSizes(bidRequest) {
-  return formatSizes(utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes') || []);
+  return formatSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes') || []);
 }
 
 function formatSizes(sizes) {
diff --git a/modules/showheroes-bsBidAdapter.md b/modules/showheroes-bsBidAdapter.md
index cde652e9d83..a32a77a2525 100644
--- a/modules/showheroes-bsBidAdapter.md
+++ b/modules/showheroes-bsBidAdapter.md
@@ -125,3 +125,52 @@ Module that connects to ShowHeroes demand source to fetch bids.
            }
        ];
 ```
+
+# Test Parameters (V2)
+```
+    var adUnits = [
+           {
+               code: 'video',
+               mediaTypes: {
+                   video: {
+                       playerSize: [640, 480],
+                       context: 'instream',
+                   }
+               },
+               bids: [
+                   {
+                       bidder: "showheroes-bs",
+                       params: {
+                           unitId: 'AACBWAcof-611K4U',
+                           vpaidMode: true // by default is 'false'
+                       }
+                   }
+               ]
+           },
+           {
+               code: 'video',
+               mediaTypes: {
+                   video: {
+                       playerSize: [640, 480],
+                       context: 'outstream',
+                   }
+               },
+               bids: [
+                   {
+                       bidder: "showheroes-bs",
+                       params: {
+                           unitId: 'AACBTwsZVANd9NlB',
+
+                           outstreamOptions: {
+                               // Required for the outstream renderer to exact node, one of
+                               iframe: 'iframe_id',
+                               // or
+                               slot: 'slot_id'
+                           }
+                       }
+                   }
+               ]
+           }
+       ];
+```
+
diff --git a/modules/sigmoidAnalyticsAdapter.js b/modules/sigmoidAnalyticsAdapter.js
index 303fbbc8995..dc386813978 100644
--- a/modules/sigmoidAnalyticsAdapter.js
+++ b/modules/sigmoidAnalyticsAdapter.js
@@ -1,15 +1,14 @@
 /* Sigmoid Analytics Adapter for prebid.js v1.1.0-pre
 Updated : 2018-03-28 */
-import includes from 'core-js-pure/features/array/includes.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import {includes} from '../src/polyfill.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {generateUUID, logError, logInfo} from '../src/utils.js';
 
 const storage = getStorageManager();
 
-const utils = require('../src/utils.js');
-
 const url = 'https://kinesis.us-east-1.amazonaws.com/';
 const analyticsType = 'endpoint';
 
@@ -56,7 +55,7 @@ function buildSessionIdTimeoutLocalStorageKey() {
 
 function updateSessionId() {
   if (isSessionIdTimeoutExpired()) {
-    let newSessionId = utils.generateUUID();
+    let newSessionId = generateUUID();
     storage.setDataInLocalStorage(buildSessionIdLocalStorageKey(), newSessionId);
   }
   initOptions.sessionId = getSessionId();
@@ -206,7 +205,7 @@ sigmoidAdapter.originEnableAnalytics = sigmoidAdapter.enableAnalytics;
 sigmoidAdapter.enableAnalytics = function (config) {
   initOptions = config.options;
   initOptions.utmTagData = this.buildUtmTagData();
-  utils.logInfo('Sigmoid Analytics enabled with config', initOptions);
+  logInfo('Sigmoid Analytics enabled with config', initOptions);
   sigmoidAdapter.originEnableAnalytics(config);
 };
 
@@ -246,7 +245,7 @@ function send(eventType, data, sendDataType) {
   AWS.config.credentials.get(function(err) {
     // attach event listener
     if (err) {
-      utils.logError(err);
+      logError(err);
       return;
     }
     // create kinesis service object
diff --git a/modules/sirdataRtdProvider.js b/modules/sirdataRtdProvider.js
new file mode 100644
index 00000000000..369276e7638
--- /dev/null
+++ b/modules/sirdataRtdProvider.js
@@ -0,0 +1,498 @@
+/**
+ * This module adds Sirdata provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch segments (user-centric) and categories (page-centric) from Sirdata server
+ * The module will automatically handle user's privacy and choice in California (IAB TL CCPA Framework) and in Europe (IAB EU TCF FOR GDPR)
+ * @module modules/sirdataRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {deepAccess, deepEqual, deepSetValue, isEmpty, logError, mergeDeep} from '../src/utils.js';
+import {submodule} from '../src/hook.js';
+import {ajax} from '../src/ajax.js';
+import {findIndex} from '../src/polyfill.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {config} from '../src/config.js';
+
+/** @type {string} */
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'SirdataRTDModule';
+
+export function getSegmentsAndCategories(reqBidsConfigObj, onDone, moduleConfig, userConsent) {
+  moduleConfig.params = moduleConfig.params || {};
+
+  var tcString = (userConsent && userConsent.gdpr && userConsent.gdpr.consentString ? userConsent.gdpr.consentString : '');
+  var gdprApplies = (userConsent && userConsent.gdpr && userConsent.gdpr.gdprApplies ? userConsent.gdpr.gdprApplies : '');
+
+  moduleConfig.params.partnerId = moduleConfig.params.partnerId ? moduleConfig.params.partnerId : 1;
+  moduleConfig.params.key = moduleConfig.params.key ? moduleConfig.params.key : 1;
+
+  var sirdataDomain;
+  var sendWithCredentials;
+
+  if (userConsent.coppa || (userConsent.usp && (userConsent.usp[0] == '1' && (userConsent.usp[1] == 'N' || userConsent.usp[2] == 'Y')))) {
+    // if children or "Do not Sell" management in California, no segments, page categories only whatever TCF signal
+    sirdataDomain = 'cookieless-data.com';
+    sendWithCredentials = false;
+    gdprApplies = null;
+    tcString = '';
+  } else if (config.getConfig('consentManagement.gdpr')) {
+    // Default endpoint is cookieless if gdpr management is set. Needed because the cookie-based endpoint will fail and return error if user is located in Europe and no consent has been given
+    sirdataDomain = 'cookieless-data.com';
+    sendWithCredentials = false;
+  }
+
+  // default global endpoint is cookie-based if no rules falls into cookieless or consent has been given or GDPR doesn't apply
+
+  if (!sirdataDomain || !gdprApplies || (deepAccess(userConsent, 'gdpr.vendorData.vendor.consents') && userConsent.gdpr.vendorData.vendor.consents[53] && userConsent.gdpr.vendorData.purpose.consents[1] && userConsent.gdpr.vendorData.purpose.consents[4])) {
+    sirdataDomain = 'sddan.com';
+    sendWithCredentials = true;
+  }
+  // TODO: is 'page' the right value here?
+  var actualUrl = moduleConfig.params.actualUrl || getRefererInfo().page;
+
+  const url = 'https://kvt.' + sirdataDomain + '/api/v1/public/p/' + moduleConfig.params.partnerId + '/d/' + moduleConfig.params.key + '/s?callback=&gdpr=' + gdprApplies + '&gdpr_consent=' + tcString + (actualUrl ? '&url=' + encodeURIComponent(actualUrl) : '');
+
+  ajax(url,
+    {
+      success: function (response, req) {
+        if (req.status === 200) {
+          try {
+            const data = JSON.parse(response);
+            if (data && data.segments) {
+              addSegmentData(reqBidsConfigObj, data, moduleConfig, onDone);
+            } else {
+              onDone();
+            }
+          } catch (e) {
+            onDone();
+            logError('unable to parse Sirdata data' + e);
+          }
+        } else if (req.status === 204) {
+          onDone();
+        }
+      },
+      error: function () {
+        onDone();
+        logError('unable to get Sirdata data');
+      }
+    },
+    null,
+    {
+      contentType: 'text/plain',
+      method: 'GET',
+      withCredentials: sendWithCredentials,
+      referrerPolicy: 'unsafe-url',
+      crossOrigin: true
+    });
+}
+
+export function setGlobalOrtb2(ortb2, segments, categories) {
+  try {
+    let addOrtb2 = {};
+    let testGlobal = ortb2 || {}
+    if (!deepAccess(testGlobal, 'user.ext.data.sd_rtd') || !deepEqual(testGlobal.user.ext.data.sd_rtd, segments)) {
+      deepSetValue(addOrtb2, 'user.ext.data.sd_rtd', segments || {});
+    }
+    if (!deepAccess(testGlobal, 'site.ext.data.sd_rtd') || !deepEqual(testGlobal.site.ext.data.sd_rtd, categories)) {
+      deepSetValue(addOrtb2, 'site.ext.data.sd_rtd', categories || {});
+    }
+    if (!isEmpty(addOrtb2)) {
+      mergeDeep(ortb2, addOrtb2);
+    }
+  } catch (e) {
+    logError(e)
+  }
+
+  return true;
+}
+
+export function setBidderOrtb2(bidderOrtb2, bidder, segments, categories) {
+  try {
+    let addOrtb2 = {};
+    let testBidder = bidderOrtb2[bidder];
+    if (!deepAccess(testBidder, 'user.ext.data.sd_rtd') || !deepEqual(testBidder.user.ext.data.sd_rtd, segments)) {
+      deepSetValue(addOrtb2, 'user.ext.data.sd_rtd', segments || {});
+    }
+    if (!deepAccess(testBidder, 'site.ext.data.sd_rtd') || !deepEqual(testBidder.site.ext.data.sd_rtd, categories)) {
+      deepSetValue(addOrtb2, 'site.ext.data.sd_rtd', categories || {});
+    }
+    if (!isEmpty(addOrtb2)) {
+      mergeDeep(bidderOrtb2[bidder], addOrtb2)
+    }
+  } catch (e) {
+    logError(e)
+  }
+
+  return true;
+}
+
+export function loadCustomFunction(todo, adUnit, list, data, bid) {
+  try {
+    if (typeof todo == 'function') {
+      todo(adUnit, list, data, bid);
+    }
+  } catch (e) {
+    logError(e);
+  }
+  return true;
+}
+
+export function getSegAndCatsArray(data, minScore) {
+  var sirdataData = {'segments': [], 'categories': []};
+  minScore = minScore && typeof minScore == 'number' ? minScore : 30;
+  try {
+    if (data && data.contextual_categories) {
+      for (let catId in data.contextual_categories) {
+        if (data.contextual_categories.hasOwnProperty(catId)) {
+          let value = data.contextual_categories[catId];
+          if (value >= minScore && sirdataData.categories.indexOf(catId) === -1) {
+            sirdataData.categories.push(catId.toString());
+          }
+        }
+      }
+    }
+  } catch (e) {
+    logError(e);
+  }
+  try {
+    if (data && data.segments) {
+      for (let segId in data.segments) {
+        if (data.segments.hasOwnProperty(segId)) {
+          sirdataData.segments.push(data.segments[segId].toString());
+        }
+      }
+    }
+  } catch (e) {
+    logError(e);
+  }
+  return sirdataData;
+}
+
+export function addSegmentData(reqBids, data, moduleConfig, onDone) {
+  const adUnits = reqBids.adUnits;
+  moduleConfig = moduleConfig || {};
+  moduleConfig.params = moduleConfig.params || {};
+  const globalMinScore = moduleConfig.params.hasOwnProperty('contextualMinRelevancyScore') ? moduleConfig.params.contextualMinRelevancyScore : 30;
+  var sirdataData = getSegAndCatsArray(data, globalMinScore);
+
+  const sirdataList = sirdataData.segments.concat(sirdataData.categories);
+  var sirdataMergedList = [];
+
+  var curationData = {'segments': [], 'categories': []};
+  var curationId = '1';
+  const biddersParamsExist = (!!(moduleConfig.params && moduleConfig.params.bidders));
+
+  // Global ortb2
+  if (!biddersParamsExist) {
+    setGlobalOrtb2(reqBids.ortb2Fragments?.global, sirdataData.segments, sirdataData.categories);
+  }
+
+  // Google targeting
+  if (typeof window.googletag !== 'undefined' && (moduleConfig.params.setGptKeyValues || !moduleConfig.params.hasOwnProperty('setGptKeyValues'))) {
+    try {
+      // For curation Google is pid 27449
+      curationId = (moduleConfig.params.gptCurationId ? moduleConfig.params.gptCurationId : '27449');
+      if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+        curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], globalMinScore);
+      }
+      sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+      window.googletag.pubads().getSlots().forEach(function (n) {
+        if (typeof n.setTargeting !== 'undefined' && sirdataMergedList && sirdataMergedList.length > 0) {
+          n.setTargeting('sd_rtd', sirdataMergedList);
+        }
+      });
+    } catch (e) {
+      logError(e);
+    }
+  }
+
+  // Bid targeting level for FPD non-generic biders
+  var bidderIndex = '';
+  var indexFound = false;
+
+  adUnits.forEach(adUnit => {
+    if (!biddersParamsExist && !deepAccess(adUnit, 'ortb2Imp.ext.data.sd_rtd')) {
+      deepSetValue(adUnit, 'ortb2Imp.ext.data.sd_rtd', sirdataList);
+    }
+
+    adUnit.hasOwnProperty('bids') && adUnit.bids.forEach(bid => {
+      bidderIndex = (moduleConfig.params.hasOwnProperty('bidders') ? findIndex(moduleConfig.params.bidders, function (i) {
+        return i.bidder === bid.bidder;
+      }) : false);
+      indexFound = (!!(typeof bidderIndex == 'number' && bidderIndex >= 0));
+      try {
+        curationData = {'segments': [], 'categories': []};
+        sirdataMergedList = [];
+
+        let minScore = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('contextualMinRelevancyScore') ? moduleConfig.params.bidders[bidderIndex].contextualMinRelevancyScore : globalMinScore);
+
+        if (!biddersParamsExist || (indexFound && (!moduleConfig.params.bidders[bidderIndex].hasOwnProperty('adUnitCodes') || moduleConfig.params.bidders[bidderIndex].adUnitCodes.indexOf(adUnit.code) !== -1))) {
+          switch (bid.bidder) {
+            case 'appnexus':
+            case 'appnexusAst':
+            case 'brealtime':
+            case 'emxdigital':
+            case 'pagescience':
+            case 'gourmetads':
+            case 'matomy':
+            case 'featureforward':
+            case 'oftmedia':
+            case 'districtm':
+            case 'adasta':
+            case 'beintoo':
+            case 'gravity':
+            case 'msq_classic':
+            case 'msq_max':
+            case '366_apx':
+              // For curation Xandr is pid 27446
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27446');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  deepSetValue(bid, 'params.keywords.sd_rtd', sirdataMergedList);
+                }
+              }
+              break;
+
+            case 'smartadserver':
+            case 'smart':
+              var target = [];
+              if (bid.hasOwnProperty('params') && bid.params.hasOwnProperty('target')) {
+                target.push(bid.params.target);
+              }
+              // For curation Smart is pid 27440
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27440');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  sirdataMergedList.forEach(function (entry) {
+                    if (target.indexOf('sd_rtd=' + entry) === -1) {
+                      target.push('sd_rtd=' + entry);
+                    }
+                  });
+                  deepSetValue(bid, 'params.target', target.join(';'));
+                }
+              }
+              break;
+
+            case 'rubicon':
+              // For curation Magnite is pid 27518
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27452');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  setBidderOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, data.segments.concat(curationData.segments), sirdataMergedList);
+                }
+              }
+              break;
+
+            case 'ix':
+              var ixConfig = config.getConfig('ix.firstPartyData.sd_rtd');
+              if (!ixConfig) {
+                // For curation index is pid 27248
+                curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27248');
+                if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                  curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+                }
+                sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+                if (sirdataMergedList && sirdataMergedList.length > 0) {
+                  if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                    loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                  } else {
+                    var cappIxCategories = [];
+                    var ixLength = 0;
+                    var ixLimit = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('sizeLimit') ? moduleConfig.params.bidders[bidderIndex].sizeLimit : 1000);
+                    // Push ids For publisher use and for curation if exists but limit size because the bidder uses GET parameters
+                    sirdataMergedList.forEach(function (entry) {
+                      if (ixLength < ixLimit) {
+                        cappIxCategories.push(entry);
+                        ixLength += entry.toString().length;
+                      }
+                    });
+                    config.setConfig({ix: {firstPartyData: {sd_rtd: cappIxCategories}}});
+                  }
+                }
+              }
+              break;
+
+            case 'proxistore':
+              // For curation Proxistore is pid 27484
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27484');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              } else {
+                data.shared_taxonomy[curationId] = {contextual_categories: {}};
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  deepSetValue(bid, 'ortb2.user.ext.data', {
+                    segments: sirdataData.segments.concat(curationData.segments),
+                    contextual_categories: {...data.contextual_categories, ...data.shared_taxonomy[curationId].contextual_categories}
+                  });
+                }
+              }
+              break;
+
+            case 'criteo':
+              // For curation Smart is pid 27443
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27443');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  setBidderOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, data.segments.concat(curationData.segments), sirdataMergedList);
+                }
+              }
+              break;
+
+            case 'triplelift':
+              // For curation Triplelift is pid 27518
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27518');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  setBidderOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, data.segments.concat(curationData.segments), sirdataMergedList);
+                }
+              }
+              break;
+
+            case 'avct':
+            case 'avocet':
+              // For curation Avocet is pid 27522
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27522');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  setBidderOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, data.segments.concat(curationData.segments), sirdataMergedList);
+                }
+              }
+              break;
+
+            case 'smaato':
+              // For curation Smaato is pid 27520
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27520');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  setBidderOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, data.segments.concat(curationData.segments), sirdataMergedList);
+                }
+              }
+              break;
+
+            case 'yahoossp':
+              // For curation Yahoo is pid 30339
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '30339');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  setBidderOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, data.segments.concat(curationData.segments), sirdataMergedList);
+                }
+              }
+              break;
+
+            case 'openx':
+              // For curation OpenX is pid 30342
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '30342');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  setBidderOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, data.segments.concat(curationData.segments), sirdataMergedList);
+                }
+              }
+              break;
+
+            case 'pubmatic':
+              // For curation Pubmatic is pid 30345
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '30345');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              sirdataMergedList = sirdataList.concat(curationData.segments).concat(curationData.categories);
+              if (sirdataMergedList && sirdataMergedList.length > 0) {
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataMergedList, data, bid);
+                } else {
+                  setBidderOrtb2(reqBids.ortb2Fragments?.bidder, bid.bidder, data.segments.concat(curationData.segments), sirdataMergedList);
+                }
+              }
+              break;
+
+            default:
+              if (!biddersParamsExist || indexFound) {
+                if (!deepAccess(bid, 'ortb2.site.ext.data.sd_rtd')) {
+                  deepSetValue(bid, 'ortb2.site.ext.data.sd_rtd', sirdataData.categories);
+                }
+                if (!deepAccess(bid, 'ortb2.user.ext.data.sd_rtd')) {
+                  deepSetValue(bid, 'ortb2.user.ext.data.sd_rtd', sirdataData.segments);
+                }
+              }
+          }
+        }
+      } catch (e) {
+        logError(e);
+      }
+    })
+  });
+
+  onDone();
+  return adUnits;
+}
+
+export function init(config) {
+  return true;
+}
+
+export const sirdataSubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  getBidRequestData: getSegmentsAndCategories
+};
+
+submodule(MODULE_NAME, sirdataSubmodule);
diff --git a/modules/sirdataRtdProvider.md b/modules/sirdataRtdProvider.md
new file mode 100644
index 00000000000..f67e34db43a
--- /dev/null
+++ b/modules/sirdataRtdProvider.md
@@ -0,0 +1,169 @@
+# Sirdata Real-Time Data Submodule
+
+Module Name: Sirdata Rtd Provider
+Module Type: Rtd Provider
+Maintainer: bob@sirdata.com
+
+# Description
+
+Sirdata provides a disruptive API that allows its partners to leverage its 
+cutting-edge contextualization technology and its audience segments based on 
+cookies and consent or without cookies nor consent! 
+
+User-based segments and page-level automatic contextual categories will be 
+attached to bid request objects sent to different SSPs in order to optimize
+targeting.
+
+Automatic integration with Google Ad Manager and major bidders like Xandr/Appnexus,
+Smartadserver, Index Exchange, Proxistore, Magnite/Rubicon or Triplelift !
+
+User's country and choice management are included in the module, so it's 100%
+compliant with local and regional laws like GDPR and CCPA/CPRA.
+
+ORTB2 compliant and FPD support for Prebid versions < 4.29
+
+Contact bob@sirdata.com for information.
+
+### Publisher Usage
+
+Compile the Sirdata RTD module into your Prebid build:
+
+`gulp build --modules=rtdModule,sirdataRtdProvider`
+
+Add the Sirdata RTD provider to your Prebid config.
+
+Segments ids (user-centric) and category ids (page-centric) will be provided
+salted and hashed : you can use them with a dedicated and private matching table.
+Should you want to allow a SSP or a partner to curate your media and operate
+cross-publishers campaigns with our data, please ask Sirdata (bob@sirdata.com) to
+open it for you account. 
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "SirdataRTDModule",
+                waitForIt: true,
+                params: {
+                	partnerId: 1,
+                    key: 1,
+                	setGptKeyValues: true,
+                	contextualMinRelevancyScore: 50, //Min score to filter contextual category globally (0-100 scale)
+                	actualUrl: actual_url, //top location url, for contextual categories
+                    bidders: [{
+                        bidder: 'appnexus',
+                        adUnitCodes: ['adUnit-1','adUnit-2'],
+                        customFunction: overrideAppnexus,
+                        curationId: '111',
+                    },{
+                        bidder: 'ix',
+                        sizeLimit: 1200 //specific to Index Exchange,
+                        contextualMinRelevancyScore: 50, //Min score to filter contextual category for curation in the bidder (0-100 scale)
+                    }]
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Parameter Descriptions for the Sirdata Configuration Section
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Real time data module name | Mandatory. Always 'SirdataRTDModule' |
+| waitForIt | Boolean | Mandatory. Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false but recommended to true |
+| params | Object | | Optional |
+| params.partnerId | Integer | Partner ID, required to get results and provided by Sirdata. Use 1 for tests and get one running at bob@sirdata.com | Mandatory. Defaults 1. |
+| params.key | Integer | Key linked to Partner ID, required to get results and provided by Sirdata. Use 1 for tests and get one running at bob@sirdata.com | Mandatory. Defaults 1. |
+| params.setGptKeyValues | Boolean | This parameter Sirdata to set Targeting for GPT/GAM | Optional. Defaults to true. |
+| params.contextualMinRelevancyScore | Integer | Min score to keep filter category in the bidders (0-100 scale). Optional. Defaults to 30. |
+| params.bidders | Object | Dictionary of bidders you would like to supply Sirdata data for. | Optional. In case no bidder is specified Sirdata will atend to ad data custom and ortb2 to all bidders, adUnits & Globalconfig |
+
+Bidders can receive common setting :
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| bidder | String | Bidder name | Mandatory if params.bidders are specified |
+| adUnitCodes | Array of String | Use if you want to limit data injection to specified adUnits for the bidder | Optional. Default is false and data shared with the bidder isn't filtered |
+| customFunction | Function | Use it to override the way data is shared with a bidder | Optional. Default is false |
+| curationId | String | Specify the curation ID of the bidder. Provided by Sirdata, request it at bob@sirdata.com | Optional. Default curation ids are specified for main bidders |
+| contextualMinRelevancyScore | Integer | Min score to filter contextual categories for curation in the bidder (0-100 scale). Optional. Defaults to 30 or global params.contextualMinRelevancyScore if exits. |
+| sizeLimit | Integer | used only for bidder 'ix' to limit the size of the get parameter in Index Exchange ad call | Optional. Default is 1000 |
+
+
+### Overriding data sharing function
+As indicated above, it is possible to provide your own bid augmentation
+functions. This is useful if you know a bid adapter's API supports segment
+fields which aren't specifically being added to request objects in the Prebid
+bid adapter.
+
+Please see the following example, which provides a function to modify bids for
+a bid adapter called ix and overrides the appnexus.
+
+data Object format for usage in this kind of function :
+{
+	"segments":[111111,222222],
+	"contextual_categories":{"333333":100},
+	"shared_taxonomy":{
+		"27446":{ //CurationId
+			"segments":[444444,555555],
+			"contextual_categories":{"666666":100}
+		}
+	}
+}
+
+```
+function overrideAppnexus (adUnit, segmentsArray, dataObject, bid) {
+	for (var i = 0; i < segmentsArray.length; i++) {
+        if (segmentsArray[i]) {
+            bid.params.user.segments.push(segmentsArray[i]);
+        }
+    }
+}
+
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "SirdataRTDModule",
+                waitForIt: true,
+                params: {
+                	partnerId: 1,
+                    key: 1,
+                	setGptKeyValues: true,
+                	contextualMinRelevancyScore: 50, //Min score to keep contextual category in the bidders (0-100 scale)
+                	actualUrl: actual_url, //top location url, for contextual categories
+                    bidders: [{
+                        bidder: 'appnexus',
+                        customFunction: overrideAppnexus,
+                        curationId: '111'
+                    },{
+                        bidder: 'ix',
+                        sizeLimit: 1200, //specific to Index Exchange
+                        customFunction: function(adUnit, segmentsArray, dataObject, bid) {
+                            bid.params.contextual.push(dataObject.contextual_categories);
+                        },
+                    }]
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Testing
+
+To view an example of available segments returned by Sirdata's backends:
+
+`gulp serve --modules=rtdModule,sirdataRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/sirdataRtdProvider_example.html`
\ No newline at end of file
diff --git a/modules/sizeMappingV2.js b/modules/sizeMappingV2.js
index 20ab640990b..05475b3e143 100644
--- a/modules/sizeMappingV2.js
+++ b/modules/sizeMappingV2.js
@@ -1,18 +1,24 @@
 /**
- * This modules adds support for the new Size Mapping spec described here. https://github.com/prebid/Prebid.js/issues/4129
- * This implementation replaces global sizeConfig with a adUnit/bidder level sizeConfig with support for labels.
+ * This module adds support for the new size mapping spec, Advanced Size Mapping. It's documented here. https://github.com/prebid/Prebid.js/issues/4129
+ * The implementation is an alternative to global sizeConfig. It introduces 'Ad Unit' & 'Bidder' level sizeConfigs and also supports 'labels' for conditional
+ * rendering. Read full API documentation on Prebid.org, http://prebid.org/dev-docs/modules/sizeMappingV2.html
  */
 
-import * as utils from '../src/utils.js';
-import { processNativeAdUnitParams } from '../src/native.js';
-import { adunitCounter } from '../src/adUnits.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import { getHook } from '../src/hook.js';
 import {
-  adUnitSetupChecks
-} from '../src/prebid.js';
-
-// allows for sinon.spy, sinon.stub, etc to unit test calls made to these functions internally
+  deepClone,
+  getWindowTop,
+  isArray,
+  isArrayOfNums,
+  isValidMediaTypes,
+  logError,
+  logInfo,
+  logWarn
+} from '../src/utils.js';
+import {includes} from '../src/polyfill.js';
+import {getHook} from '../src/hook.js';
+import {adUnitSetupChecks} from '../src/prebid.js';
+
+// Allows for stubbing of these functions while writing unit tests.
 export const internal = {
   checkBidderSizeConfigFormat,
   getActiveSizeBucket,
@@ -22,188 +28,201 @@ export const internal = {
   isLabelActivated
 };
 
-// 'sizeMappingInternalStore' contains information whether a particular auction is using size mapping V2 (the new size mapping spec),
-// and it also contains additional information on each adUnit, as such, mediaTypes, activeViewport, etc.
-// This information is required by the 'getBids' function.
-export const sizeMappingInternalStore = createSizeMappingInternalStore();
-
-function createSizeMappingInternalStore() {
-  const sizeMappingInternalStore = {};
+const V2_ADUNITS = new WeakMap();
 
-  return {
-    initializeStore: function (auctionId, isUsingSizeMappingBool) {
-      sizeMappingInternalStore[auctionId] = {
-        usingSizeMappingV2: isUsingSizeMappingBool,
-        adUnits: []
-      };
-    },
-    getAuctionDetail: function (auctionId) {
-      return sizeMappingInternalStore[auctionId];
-    },
-    setAuctionDetail: function (auctionId, adUnitDetail) {
-      sizeMappingInternalStore[auctionId].adUnits.push(adUnitDetail);
-    }
-  }
-}
-
-// returns "true" if atleast one of the adUnit in the adUnits array has declared a Ad Unit or(and) Bidder level sizeConfig
-// returns "false" otherwise
+/*
+  Returns "true" if at least one of the adUnits in the adUnits array is using an Ad Unit and/or Bidder level sizeConfig,
+  otherwise, returns "false."
+*/
 export function isUsingNewSizeMapping(adUnits) {
-  let isUsingSizeMappingBool = false;
-  adUnits.forEach(adUnit => {
+  return !!adUnits.find(adUnit => {
+    if (V2_ADUNITS.has(adUnit)) return V2_ADUNITS.get(adUnit);
     if (adUnit.mediaTypes) {
       // checks for the presence of sizeConfig property at the adUnit.mediaTypes object
-      Object.keys(adUnit.mediaTypes).forEach(mediaType => {
+      for (let mediaType of Object.keys(adUnit.mediaTypes)) {
         if (adUnit.mediaTypes[mediaType].sizeConfig) {
-          if (isUsingSizeMappingBool === false) {
-            isUsingSizeMappingBool = true;
-          }
+          V2_ADUNITS.set(adUnit, true);
+          return true;
         }
-      });
-
-      // checks for the presence of sizeConfig property at the adUnit.bids[].bidder object
-      adUnit.bids.forEach(bidder => {
-        if (bidder.sizeConfig) {
-          if (isUsingSizeMappingBool === false) {
-            isUsingSizeMappingBool = true;
-          }
+      }
+      for (let bid of adUnit.bids && isArray(adUnit.bids) ? adUnit.bids : []) {
+        if (bid.sizeConfig) {
+          V2_ADUNITS.set(adUnit, true);
+          return true;
         }
-      });
+      }
+      V2_ADUNITS.set(adUnit, false);
+      return false;
     }
   });
-  return isUsingSizeMappingBool;
 }
 
-// returns "adUnits" array which have passed sizeConfig validation checks in addition to mediaTypes checks
-// deletes properties from adUnit which fail validation.
+/**
+  This hooked function executes before the function 'checkAdUnitSetup', that is defined in /src/prebid.js. It's necessary to run this funtion before
+  because it applies a series of checks in order to determine the correctness of the 'sizeConfig' array, which, the original 'checkAdUnitSetup' function
+  does not recognize.
+  @params {Array<AdUnits>} adUnits
+  @returns {Array<AdUnits>} validateAdUnits - Unrecognized properties are deleted.
+*/
 export function checkAdUnitSetupHook(adUnits) {
-  return adUnits.filter(adUnit => {
-    const mediaTypes = adUnit.mediaTypes;
-    if (!mediaTypes || Object.keys(mediaTypes).length === 0) {
-      utils.logError(`Detected adUnit.code '${adUnit.code}' did not have a 'mediaTypes' object defined. This is a required field for the auction, so this adUnit has been removed.`);
-      return false;
+  const validateSizeConfig = function (mediaType, sizeConfig, adUnitCode) {
+    let isValid = true;
+    const associatedProperty = {
+      banner: 'sizes',
+      video: 'playerSize',
+      native: 'active'
     }
-
-    if (mediaTypes.banner) {
-      const banner = mediaTypes.banner;
-      if (banner.sizes) {
-        adUnitSetupChecks.validateBannerMediaType(adUnit);
-      } else if (banner.sizeConfig) {
-        if (Array.isArray(banner.sizeConfig)) {
-          let deleteBannerMediaType = false;
-          banner.sizeConfig.forEach((config, index) => {
-            // verify if all config objects include "minViewPort" and "sizes" property.
-            // if not, remove the mediaTypes.banner object
-            const keys = Object.keys(config);
-            if (!(includes(keys, 'minViewPort') && includes(keys, 'sizes'))) {
-              utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.banner.sizeConfig[${index}] is missing required property minViewPort or sizes or both.`);
-              deleteBannerMediaType = true;
-              return;
+    const propertyName = associatedProperty[mediaType];
+    const conditionalLogMessages = {
+      banner: 'Removing mediaTypes.banner from ad unit.',
+      video: 'Removing mediaTypes.video.sizeConfig from ad unit.',
+      native: 'Removing mediaTypes.native.sizeConfig from ad unit.'
+    }
+    if (Array.isArray(sizeConfig)) {
+      sizeConfig.forEach((config, index) => {
+        const keys = Object.keys(config);
+        /*
+          Check #1 (Applies to 'banner', 'video' and 'native' media types.)
+          Verify that all config objects include 'minViewPort' and 'sizes' property.
+          If they do not, return 'false'.
+        */
+        if (!(includes(keys, 'minViewPort') && includes(keys, propertyName))) {
+          logError(`Ad unit ${adUnitCode}: Missing required property 'minViewPort' or 'sizes' from 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
+          isValid = false;
+          return;
+        }
+        /*
+          Check #2 (Applies to 'banner', 'video' and 'native' media types.)
+          Verify that 'config.minViewPort' property is in [width, height] format.
+          If not, return false.
+        */
+        if (!isArrayOfNums(config.minViewPort, 2)) {
+          logError(`Ad unit ${adUnitCode}: Invalid declaration of 'minViewPort' in 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
+          isValid = false;
+          return;
+        }
+        /*
+          Check #3 (Applies only to 'banner' and 'video' media types.)
+          Verify that 'config.sizes' (in case of banner) or 'config.playerSize' (in case of video)
+          property is in [width, height] format. If not, return 'false'.
+        */
+        if (mediaType === 'banner' || mediaType === 'video') {
+          let showError = false;
+          if (Array.isArray(config[propertyName])) {
+            const validatedSizes = adUnitSetupChecks.validateSizes(config[propertyName]);
+            if (config[propertyName].length > 0 && validatedSizes.length === 0) {
+              isValid = false;
+              showError = true;
             }
+          } else {
+            // Either 'sizes' or 'playerSize' is not declared as an array, which makes it invalid by default.
+            isValid = false;
+            showError = true;
+          }
+          if (showError) {
+            logError(`Ad unit ${adUnitCode}: Invalid declaration of '${propertyName}' in 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
+            return;
+          }
+        }
+        /*
+          Check #4 (Applies only to 'native' media type)
+          Verify that 'config.active' is a 'boolean'.
+          If not, return 'false'.
+        */
+        if (FEATURES.NATIVE && mediaType === 'native') {
+          if (typeof config[propertyName] !== 'boolean') {
+            logError(`Ad unit ${adUnitCode}: Invalid declaration of 'active' in 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
+            isValid = false;
+          }
+        }
+      });
+    } else {
+      logError(`Ad unit ${adUnitCode}: Invalid declaration of 'sizeConfig' in 'mediaTypes.${mediaType}.sizeConfig'. ${conditionalLogMessages[mediaType]}`);
+      isValid = false;
+      return isValid;
+    }
 
-            // check if the config.sizes property is in [w, h] format, if yes, change it to [[w, h]] format.
-            const bannerSizes = adUnitSetupChecks.validateSizes(config.sizes);
-            if (utils.isArrayOfNums(config.minViewPort, 2)) {
-              if (config.sizes.length > 0 && bannerSizes.length > 0) {
-                config.sizes = bannerSizes;
-              } else if (config.sizes.length === 0) {
-                // If a size bucket doesn't have any sizes, sizes is an empty array, i.e. sizes: []. This check takes care of that.
-                config.sizes = [config.sizes];
-              } else {
-                utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.banner.sizeConfig[${index}] has propery sizes declared with invalid value. Please ensure the sizes are listed like: [[300, 250], ...] or like: [] if no sizes are present for that size bucket.`);
-                deleteBannerMediaType = true;
-              }
-            } else {
-              utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.banner.sizeConfig[${index}] has property minViewPort decalared with invalid value. Please ensure minViewPort is an Array and is listed like: [700, 0]. Declaring an empty array is not allowed, instead use: [0, 0].`);
-              deleteBannerMediaType = true;
+    // If all checks have passed, isValid should equal 'true'
+    return isValid;
+  }
+  const validatedAdUnits = [];
+  adUnits.forEach(adUnit => {
+    adUnit = adUnitSetupChecks.validateAdUnit(adUnit);
+    if (adUnit == null) return;
+
+    const mediaTypes = adUnit.mediaTypes;
+    let validatedBanner, validatedVideo, validatedNative;
+
+    if (mediaTypes.banner) {
+      if (mediaTypes.banner.sizes) {
+        // Ad unit is using 'mediaTypes.banner.sizes' instead of the new property 'sizeConfig'. Apply the old checks!
+        validatedBanner = adUnitSetupChecks.validateBannerMediaType(adUnit);
+      } else if (mediaTypes.banner.sizeConfig) {
+        // Ad unit is using the 'sizeConfig' property, 'mediaTypes.banner.sizeConfig'. Apply the new checks!
+        validatedBanner = deepClone(adUnit);
+        const isBannerValid = validateSizeConfig('banner', mediaTypes.banner.sizeConfig, adUnit.code);
+        if (!isBannerValid) {
+          delete validatedBanner.mediaTypes.banner;
+        } else {
+          /*
+            Make sure 'sizes' field is always an array of arrays. If not, make it so.
+            For example, [] becomes [[]], and [360, 400] becomes [[360, 400]]
+          */
+          validatedBanner.mediaTypes.banner.sizeConfig.forEach(config => {
+            if (!Array.isArray(config.sizes[0])) {
+              config.sizes = [config.sizes];
             }
           });
-          if (deleteBannerMediaType) {
-            utils.logInfo(`Ad Unit: ${adUnit.code}: mediaTypes.banner has been removed due to error in sizeConfig.`);
-            delete adUnit.mediaTypes.banner;
-          }
-        } else {
-          utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.banner.sizeConfig is NOT an Array. Removing the invalid object mediaTypes.banner from Ad Unit.`);
-          delete adUnit.mediaTypes.banner;
         }
       } else {
-        utils.logError('Detected a mediaTypes.banner object did not include required property sizes or sizeConfig. Removing invalid mediaTypes.banner object from Ad Unit.');
-        delete adUnit.mediaTypes.banner;
+        // Ad unit is invalid since it's mediaType property does not have either 'sizes' or 'sizeConfig' declared.
+        logError(`Ad unit ${adUnit.code}: 'mediaTypes.banner' does not contain either 'sizes' or 'sizeConfig' property. Removing 'mediaTypes.banner' from ad unit.`);
+        validatedBanner = deepClone(adUnit);
+        delete validatedBanner.mediaTypes.banner;
       }
     }
 
     if (mediaTypes.video) {
-      const video = mediaTypes.video;
-      if (video.playerSize) {
-        adUnitSetupChecks.validateVideoMediaType(adUnit);
-      } else if (video.sizeConfig) {
-        if (Array.isArray(video.sizeConfig)) {
-          let deleteVideoMediaType = false;
-          video.sizeConfig.forEach((config, index) => {
-            // verify if all config objects include "minViewPort" and "playerSize" property.
-            // if not, remove the mediaTypes.video object
-            const keys = Object.keys(config);
-            if (!(includes(keys, 'minViewPort') && includes(keys, 'playerSize'))) {
-              utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig[${index}] is missing required property minViewPort or playerSize or both. Removing the invalid property mediaTypes.video.sizeConfig from Ad Unit.`);
-              deleteVideoMediaType = true;
-              return;
-            }
-            // check if the config.playerSize property is in [w, h] format, if yes, change it to [[w, h]] format.
-            let tarPlayerSizeLen = (typeof config.playerSize[0] === 'number') ? 2 : 1;
-            const videoSizes = adUnitSetupChecks.validateSizes(config.playerSize, tarPlayerSizeLen);
-            if (utils.isArrayOfNums(config.minViewPort, 2)) {
-              if (tarPlayerSizeLen === 2) {
-                utils.logInfo('Transforming video.playerSize from [640,480] to [[640,480]] so it\'s in the proper format.');
-              }
-              if (config.playerSize.length > 0 && videoSizes.length > 0) {
-                config.playerSize = videoSizes;
-              } else if (config.playerSize.length === 0) {
-                // If a size bucket doesn't have any playerSize, playerSize is an empty array, i.e. playerSize: []. This check takes care of that.
-                config.playerSize = [config.playerSize];
-              } else {
-                utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig[${index}] has propery playerSize declared with invalid value. Please ensure the playerSize is listed like: [640, 480] or like: [] if no playerSize is present for that size bucket.`);
-                deleteVideoMediaType = true;
-              }
-            } else {
-              utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig[${index}] has property minViewPort decalared with invalid value. Please ensure minViewPort is an Array and is listed like: [700, 0]. Declaring an empty array is not allowed, instead use: [0, 0].`);
-              deleteVideoMediaType = true;
+      if (mediaTypes.video.playerSize) {
+        // Ad unit is using 'mediaTypes.video.playerSize' instead of the new property 'sizeConfig'. Apply the old checks!
+        validatedVideo = validatedBanner ? adUnitSetupChecks.validateVideoMediaType(validatedBanner) : adUnitSetupChecks.validateVideoMediaType(adUnit);
+      } else if (mediaTypes.video.sizeConfig) {
+        // Ad unit is using the 'sizeConfig' property, 'mediaTypes.video.sizeConfig'. Apply the new checks!
+        validatedVideo = validatedBanner || deepClone(adUnit);
+        const isVideoValid = validateSizeConfig('video', mediaTypes.video.sizeConfig, adUnit.code);
+        if (!isVideoValid) {
+          delete validatedVideo.mediaTypes.video.sizeConfig;
+        } else {
+          /*
+            Make sure 'playerSize' field is always an array of arrays. If not, make it so.
+            For example, [] becomes [[]], and [640, 400] becomes [[640, 400]]
+          */
+          validatedVideo.mediaTypes.video.sizeConfig.forEach(config => {
+            if (!Array.isArray(config.playerSize[0])) {
+              config.playerSize = [config.playerSize];
             }
           });
-          if (deleteVideoMediaType) {
-            utils.logInfo(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig has been removed due to error in sizeConfig.`);
-            delete adUnit.mediaTypes.video.sizeConfig;
-          }
-        } else {
-          utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig is NOT an Array. Removing the invalid property mediaTypes.video.sizeConfig from Ad Unit.`);
-          return delete adUnit.mediaTypes.video.sizeConfig;
         }
       }
     }
 
-    if (mediaTypes.native) {
-      const native = mediaTypes.native;
-      adUnitSetupChecks.validateNativeMediaType(adUnit);
+    if (FEATURES.NATIVE && mediaTypes.native) {
+      // Apply the old native checks
+      validatedNative = validatedVideo ? adUnitSetupChecks.validateNativeMediaType(validatedVideo) : validatedBanner ? adUnitSetupChecks.validateNativeMediaType(validatedBanner) : adUnitSetupChecks.validateNativeMediaType(adUnit);
 
+      // Apply the new checks if 'mediaTypes.native.sizeConfig' detected
       if (mediaTypes.native.sizeConfig) {
-        native.sizeConfig.forEach(config => {
-          // verify if all config objects include "minViewPort" and "active" property.
-          // if not, remove the mediaTypes.native object
-          const keys = Object.keys(config);
-          if (!(includes(keys, 'minViewPort') && includes(keys, 'active'))) {
-            utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.native.sizeConfig is missing required property minViewPort or active or both. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
-            return delete adUnit.mediaTypes.native.sizeConfig;
-          }
-
-          if (!(utils.isArrayOfNums(config.minViewPort, 2) && typeof config.active === 'boolean')) {
-            utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.native.sizeConfig has properties minViewPort or active decalared with invalid values. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
-            return delete adUnit.mediaTypes.native.sizeConfig;
-          }
-        });
+        const isNativeValid = validateSizeConfig('native', mediaTypes.native.sizeConfig, adUnit.code);
+        if (!isNativeValid) {
+          delete validatedNative.mediaTypes.native.sizeConfig;
+        }
       }
     }
 
-    return true;
+    const validatedAdUnit = Object.assign({}, validatedBanner, validatedVideo, validatedNative);
+    validatedAdUnits.push(validatedAdUnit);
   });
+  return validatedAdUnits;
 }
 
 getHook('checkAdUnitSetup').before(function (fn, adUnits) {
@@ -227,7 +246,7 @@ export function checkBidderSizeConfigFormat(sizeConfig) {
       const keys = Object.keys(config);
       if ((includes(keys, 'minViewPort') &&
         includes(keys, 'relevantMediaTypes')) &&
-        utils.isArrayOfNums(config.minViewPort, 2) &&
+        isArrayOfNums(config.minViewPort, 2) &&
         Array.isArray(config.relevantMediaTypes) &&
         config.relevantMediaTypes.length > 0 &&
         (config.relevantMediaTypes.length > 1 ? (config.relevantMediaTypes.every(mt => (includes(['banner', 'video', 'native'], mt))))
@@ -243,23 +262,11 @@ export function checkBidderSizeConfigFormat(sizeConfig) {
   return didCheckPass;
 }
 
-getHook('getBids').before(function (fn, bidderInfo) {
-  // check if the adUnit is using sizeMappingV2 specs and store the result in _sizeMappingUsageMap.
-  if (typeof sizeMappingInternalStore.getAuctionDetail(bidderInfo.auctionId) === 'undefined') {
-    const isUsingSizeMappingBool = isUsingNewSizeMapping(bidderInfo.adUnits);
-
-    // initialize sizeMappingInternalStore for the first time for a particular auction
-    sizeMappingInternalStore.initializeStore(bidderInfo.auctionId, isUsingSizeMappingBool);
-  }
-  if (sizeMappingInternalStore.getAuctionDetail(bidderInfo.auctionId).usingSizeMappingV2) {
-    // if adUnit is found using sizeMappingV2 specs, run the getBids function which processes the sizeConfig object
-    // and returns the bids array for a particular bidder.
-
-    const bids = getBids(bidderInfo);
-    return fn.bail(bids);
+getHook('setupAdUnitMediaTypes').before(function (fn, adUnits, labels) {
+  if (isUsingNewSizeMapping(adUnits)) {
+    return fn.bail(setupAdUnitMediaTypes(adUnits, labels));
   } else {
-    // if not using sizeMappingV2, default back to the getBids function defined in adapterManager.
-    return fn.call(this, bidderInfo);
+    return fn.call(this, adUnits, labels);
   }
 });
 
@@ -275,14 +282,14 @@ export function isLabelActivated(bidOrAdUnit, activeLabels, adUnitCode, adUnitIn
   let labelOperator;
   const labelsFound = Object.keys(bidOrAdUnit).filter(prop => prop === 'labelAny' || prop === 'labelAll');
   if (labelsFound && labelsFound.length > 1) {
-    utils.logWarn(`Size Mapping V2:: ${(bidOrAdUnit.code)
+    logWarn(`Size Mapping V2:: ${(bidOrAdUnit.code)
       ? (`Ad Unit: ${bidOrAdUnit.code}(${adUnitInstance}) => Ad unit has multiple label operators. Using the first declared operator: ${labelsFound[0]}`)
       : (`Ad Unit: ${adUnitCode}(${adUnitInstance}), Bidder: ${bidOrAdUnit.bidder} => Bidder has multiple label operators. Using the first declared operator: ${labelsFound[0]}`)}`);
   }
   labelOperator = labelsFound[0];
 
   if (labelOperator && !activeLabels) {
-    utils.logWarn(`Size Mapping V2:: ${(bidOrAdUnit.code)
+    logWarn(`Size Mapping V2:: ${(bidOrAdUnit.code)
       ? (`Ad Unit: ${bidOrAdUnit.code}(${adUnitInstance}) => Found '${labelOperator}' on ad unit, but 'labels' is not set. Did you pass 'labels' to pbjs.requestBids() ?`)
       : (`Ad Unit: ${adUnitCode}(${adUnitInstance}), Bidder: ${bidOrAdUnit.bidder} => Found '${labelOperator}' on bidder, but 'labels' is not set. Did you pass 'labels' to pbjs.requestBids() ?`)}`);
     return true;
@@ -290,13 +297,13 @@ export function isLabelActivated(bidOrAdUnit, activeLabels, adUnitCode, adUnitIn
 
   if (labelOperator === 'labelAll' && Array.isArray(bidOrAdUnit[labelOperator])) {
     if (bidOrAdUnit.labelAll.length === 0) {
-      utils.logWarn(`Size Mapping V2:: Ad Unit: ${bidOrAdUnit.code}(${adUnitInstance}) => Ad unit has declared property 'labelAll' with an empty array.`);
+      logWarn(`Size Mapping V2:: Ad Unit: ${bidOrAdUnit.code}(${adUnitInstance}) => Ad unit has declared property 'labelAll' with an empty array.`);
       return true;
     }
     return bidOrAdUnit.labelAll.every(label => includes(activeLabels, label));
   } else if (labelOperator === 'labelAny' && Array.isArray(bidOrAdUnit[labelOperator])) {
     if (bidOrAdUnit.labelAny.length === 0) {
-      utils.logWarn(`Size Mapping V2:: Ad Unit: ${bidOrAdUnit.code}(${adUnitInstance}) => Ad unit has declared property 'labelAny' with an empty array.`);
+      logWarn(`Size Mapping V2:: Ad Unit: ${bidOrAdUnit.code}(${adUnitInstance}) => Ad unit has declared property 'labelAny' with an empty array.`);
       return true;
     }
     return bidOrAdUnit.labelAny.some(label => includes(activeLabels, label));
@@ -316,7 +323,7 @@ export function getFilteredMediaTypes(mediaTypes) {
     activeViewportHeight,
     transformedMediaTypes;
 
-  transformedMediaTypes = utils.deepClone(mediaTypes);
+  transformedMediaTypes = deepClone(mediaTypes);
 
   let activeSizeBucket = {
     banner: undefined,
@@ -325,10 +332,10 @@ export function getFilteredMediaTypes(mediaTypes) {
   }
 
   try {
-    activeViewportWidth = utils.getWindowTop().innerWidth;
-    activeViewportHeight = utils.getWindowTop().innerHeight;
+    activeViewportWidth = getWindowTop().innerWidth;
+    activeViewportHeight = getWindowTop().innerHeight;
   } catch (e) {
-    utils.logWarn(`SizeMappingv2:: Unfriendly iframe blocks viewport size to be evaluated correctly`);
+    logWarn(`SizeMappingv2:: Unfriendly iframe blocks viewport size to be evaluated correctly`);
     activeViewportWidth = window.innerWidth;
     activeViewportHeight = window.innerHeight;
   }
@@ -377,8 +384,8 @@ export function getFilteredMediaTypes(mediaTypes) {
       return sizeBucketToSizeMap;
     }, {});
 
-  return { mediaTypes, sizeBucketToSizeMap, activeViewport, transformedMediaTypes };
-};
+  return { sizeBucketToSizeMap, activeViewport, transformedMediaTypes };
+}
 
 /**
  * Evaluates the given sizeConfig object and checks for various properties to determine if the sizeConfig is active or not. For example,
@@ -429,126 +436,87 @@ export function getActiveSizeBucket(sizeConfig, activeViewport) {
 }
 
 export function getRelevantMediaTypesForBidder(sizeConfig, activeViewport) {
+  const mediaTypes = new Set();
   if (internal.checkBidderSizeConfigFormat(sizeConfig)) {
     const activeSizeBucket = internal.getActiveSizeBucket(sizeConfig, activeViewport);
-    return sizeConfig.filter(config => config.minViewPort === activeSizeBucket)[0]['relevantMediaTypes'];
+    sizeConfig.filter(config => config.minViewPort === activeSizeBucket)[0]['relevantMediaTypes'].forEach((mt) => mediaTypes.add(mt));
   }
-  return [];
+  return mediaTypes;
 }
 
-// sets sizeMappingInternalStore for a given auctionId with relevant adUnit information returned from the call to 'getFilteredMediaTypes' function
-// returns adUnit details object.
-export function getAdUnitDetail(auctionId, adUnit, labels) {
-  // fetch all adUnits for an auction from the sizeMappingInternalStore
-  const adUnitsForAuction = sizeMappingInternalStore.getAuctionDetail(auctionId).adUnits;
-
-  // check if the adUnit exists already in the sizeMappingInterStore (check for equivalence of 'code' && 'mediaTypes' properties)
-  const adUnitDetail = adUnitsForAuction.filter(adUnitDetail => adUnitDetail.adUnitCode === adUnit.code && utils.deepEqual(adUnitDetail.mediaTypes, adUnit.mediaTypes));
-
-  if (adUnitDetail.length > 0) {
-    adUnitDetail[0].cacheHits++;
-    return adUnitDetail[0];
-  } else {
-    const identicalAdUnit = adUnitsForAuction.filter(adUnitDetail => adUnitDetail.adUnitCode === adUnit.code);
-    const adUnitInstance = identicalAdUnit.length > 0 && typeof identicalAdUnit[0].instance === 'number' ? identicalAdUnit[identicalAdUnit.length - 1].instance + 1 : 1;
-    const isLabelActivated = internal.isLabelActivated(adUnit, labels, adUnit.code, adUnitInstance);
-    const { mediaTypes = adUnit.mediaTypes, sizeBucketToSizeMap, activeViewport, transformedMediaTypes } = isLabelActivated && internal.getFilteredMediaTypes(adUnit.mediaTypes);
-
-    const adUnitDetail = {
-      adUnitCode: adUnit.code,
-      mediaTypes,
-      sizeBucketToSizeMap,
-      activeViewport,
-      transformedMediaTypes,
-      instance: adUnitInstance,
-      isLabelActivated,
-      cacheHits: 0
-    };
-
-    // set adUnitDetail in sizeMappingInternalStore against the correct 'auctionId'.
-    sizeMappingInternalStore.setAuctionDetail(auctionId, adUnitDetail);
-    isLabelActivated && utils.logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${adUnitInstance}) => Active size buckets after filtration: `, sizeBucketToSizeMap);
-
-    return adUnitDetail;
-  }
+export function getAdUnitDetail(adUnit, labels, adUnitInstance) {
+  const isLabelActivated = internal.isLabelActivated(adUnit, labels, adUnit.code, adUnitInstance);
+  const { sizeBucketToSizeMap, activeViewport, transformedMediaTypes } = isLabelActivated && internal.getFilteredMediaTypes(adUnit.mediaTypes);
+  isLabelActivated && logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${adUnitInstance}) => Active size buckets after filtration: `, sizeBucketToSizeMap);
+  return {
+    activeViewport,
+    transformedMediaTypes,
+    isLabelActivated,
+  };
 }
 
-export function getBids({ bidderCode, auctionId, bidderRequestId, adUnits, labels, src }) {
+export function setupAdUnitMediaTypes(adUnits, labels) {
+  const duplCounter = {};
   return adUnits.reduce((result, adUnit) => {
-    if (adUnit.mediaTypes && utils.isValidMediaTypes(adUnit.mediaTypes)) {
-      const { activeViewport, transformedMediaTypes, instance: adUnitInstance, isLabelActivated, cacheHits } = internal.getAdUnitDetail(auctionId, adUnit, labels);
+    const instance = (() => {
+      if (!duplCounter.hasOwnProperty(adUnit.code)) {
+        duplCounter[adUnit.code] = 1;
+      }
+      return duplCounter[adUnit.code]++;
+    })();
+    if (adUnit.mediaTypes && isValidMediaTypes(adUnit.mediaTypes)) {
+      const { activeViewport, transformedMediaTypes, isLabelActivated } = internal.getAdUnitDetail(adUnit, labels, instance);
       if (isLabelActivated) {
-        // check if adUnit has any active media types remaining, if not drop the adUnit from auction,
-        // else proceed to evaluate the bids object.
         if (Object.keys(transformedMediaTypes).length === 0) {
-          cacheHits === 0 && utils.logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${adUnitInstance}) => Ad unit disabled since there are no active media types after sizeConfig filtration.`);
-          return result;
-        }
-        result
-          .push(adUnit.bids.filter(bid => bid.bidder === bidderCode)
-            .reduce((bids, bid) => {
-              if (internal.isLabelActivated(bid, labels, adUnit.code, adUnitInstance)) {
-                // handle native params
-                const nativeParams = adUnit.nativeParams || utils.deepAccess(adUnit, 'mediaTypes.native');
-                if (nativeParams) {
-                  bid = Object.assign({}, bid, {
-                    nativeParams: processNativeAdUnitParams(nativeParams)
-                  });
-                }
-
-                bid = Object.assign({}, bid, utils.getDefinedParams(adUnit, ['mediaType', 'renderer']));
-
-                if (bid.sizeConfig) {
-                  const relevantMediaTypes = internal.getRelevantMediaTypesForBidder(bid.sizeConfig, activeViewport);
-                  if (relevantMediaTypes.length === 0) {
-                    utils.logError(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${adUnitInstance}), Bidder: ${bidderCode} => 'sizeConfig' is not configured properly. This bidder won't be eligible for sizeConfig checks and will remail active.`);
-                    bid = Object.assign({}, bid);
-                  } else if (relevantMediaTypes[0] !== 'none') {
-                    const bidderMediaTypes = Object
-                      .keys(transformedMediaTypes)
-                      .filter(mt => relevantMediaTypes.indexOf(mt) > -1)
-                      .reduce((mediaTypes, mediaType) => {
-                        mediaTypes[mediaType] = transformedMediaTypes[mediaType];
-                        return mediaTypes;
-                      }, {});
-
-                    if (Object.keys(bidderMediaTypes).length > 0) {
-                      bid = Object.assign({}, bid, { mediaTypes: bidderMediaTypes });
-                    } else {
-                      utils.logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${adUnitInstance}), Bidder: ${bid.bidder} => 'relevantMediaTypes' does not match with any of the active mediaTypes at the Ad Unit level. This bidder is disabled.`);
-                      return bids;
+          logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${instance}) => Ad unit disabled since there are no active media types after sizeConfig filtration.`);
+        } else {
+          adUnit.mediaTypes = transformedMediaTypes;
+          adUnit.bids = adUnit.bids.reduce((bids, bid) => {
+            if (internal.isLabelActivated(bid, labels, adUnit.code, instance)) {
+              if (bid.sizeConfig) {
+                const relevantMediaTypes = internal.getRelevantMediaTypesForBidder(bid.sizeConfig, activeViewport);
+                if (relevantMediaTypes.size === 0) {
+                  logError(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${instance}), Bidder: ${bid.bidder} => 'sizeConfig' is not configured properly. This bidder won't be eligible for sizeConfig checks and will remain active.`);
+                  bids.push(bid);
+                } else if (!relevantMediaTypes.has('none')) {
+                  let modified = false;
+                  const bidderMediaTypes = Object.fromEntries(
+                    Object.entries(transformedMediaTypes)
+                      .filter(([key, val]) => {
+                        if (!relevantMediaTypes.has(key)) {
+                          modified = true;
+                          return false;
+                        }
+                        return true;
+                      })
+                  );
+                  if (Object.keys(bidderMediaTypes).length > 0) {
+                    if (modified) {
+                      bid.mediaTypes = bidderMediaTypes;
                     }
+                    bids.push(bid);
                   } else {
-                    utils.logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${adUnitInstance}), Bidder: ${bid.bidder} => 'relevantMediaTypes' is set to 'none' in sizeConfig for current viewport size. This bidder is disabled.`);
-                    return bids;
+                    logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${instance}), Bidder: ${bid.bidder} => 'relevantMediaTypes' does not match with any of the active mediaTypes at the Ad Unit level. This bidder is disabled.`);
                   }
+                } else {
+                  logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${instance}), Bidder: ${bid.bidder} => 'relevantMediaTypes' is set to 'none' in sizeConfig for current viewport size. This bidder is disabled.`);
                 }
-                bids.push(Object.assign({}, bid, {
-                  adUnitCode: adUnit.code,
-                  transactionId: adUnit.transactionId,
-                  sizes: utils.deepAccess(transformedMediaTypes, 'banner.sizes') || utils.deepAccess(transformedMediaTypes, 'video.playerSize') || [],
-                  mediaTypes: bid.mediaTypes || transformedMediaTypes,
-                  bidId: bid.bid_id || utils.getUniqueIdentifierStr(),
-                  bidderRequestId,
-                  auctionId,
-                  src,
-                  bidRequestsCount: adunitCounter.getRequestsCounter(adUnit.code),
-                  bidderRequestsCount: adunitCounter.getBidderRequestsCounter(adUnit.code, bid.bidder),
-                  bidderWinsCount: adunitCounter.getBidderWinsCounter(adUnit.code, bid.bidder)
-                }));
-                return bids;
               } else {
-                utils.logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${adUnitInstance}), Bidder: ${bid.bidder} => Label check for this bidder has failed. This bidder is disabled.`);
-                return bids;
+                bids.push(bid);
               }
-            }, []));
+            } else {
+              logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${instance}), Bidder: ${bid.bidder} => Label check for this bidder has failed. This bidder is disabled.`);
+            }
+            return bids;
+          }, []);
+          result.push(adUnit);
+        }
       } else {
-        cacheHits === 0 && utils.logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${adUnitInstance}) => Ad unit is disabled due to failing label check.`);
+        logInfo(`Size Mapping V2:: Ad Unit: ${adUnit.code}(${instance}) => Ad unit is disabled due to failing label check.`);
       }
     } else {
-      utils.logWarn(`Size Mapping V2:: Ad Unit: ${adUnit.code} => Ad unit has declared invalid 'mediaTypes' or has not declared a 'mediaTypes' property`);
-      return result;
+      logWarn(`Size Mapping V2:: Ad Unit: ${adUnit.code} => Ad unit has declared invalid 'mediaTypes' or has not declared a 'mediaTypes' property`);
     }
     return result;
-  }, []).reduce(utils.flatten, []).filter(val => val !== '');
+  }, [])
 }
diff --git a/modules/slimcutBidAdapter.js b/modules/slimcutBidAdapter.js
index d717f3a88bd..a04a2fda89a 100644
--- a/modules/slimcutBidAdapter.js
+++ b/modules/slimcutBidAdapter.js
@@ -1,15 +1,17 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { ajax } from '../src/ajax.js';
-
+import { getValue, parseSizesInput, getBidIdParameter } from '../src/utils.js';
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import {
+  ajax
+} from '../src/ajax.js';
 const BIDDER_CODE = 'slimcut';
 const ENDPOINT_URL = 'https://sb.freeskreen.com/pbr';
-
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['scm'],
+  gvlid: 102,
+  aliases: [{ code: 'scm', gvlid: 102 }],
   supportedMediaTypes: ['video', 'banner'],
-
   /**
      * Determines whether or not the given bid request is valid.
      *
@@ -18,12 +20,11 @@ export const spec = {
      */
   isBidRequestValid: function(bid) {
     let isValid = false;
-    if (typeof bid.params !== 'undefined' && !isNaN(parseInt(utils.getValue(bid.params, 'placementId'))) && parseInt(utils.getValue(bid.params, 'placementId')) > 0) {
+    if (typeof bid.params !== 'undefined' && !isNaN(parseInt(getValue(bid.params, 'placementId'))) && parseInt(getValue(bid.params, 'placementId')) > 0) {
       isValid = true;
     }
     return isValid;
   },
-
   /**
      * Make a server request from the list of BidRequests.
      *
@@ -37,7 +38,6 @@ export const spec = {
       data: bids,
       deviceWidth: screen.width
     };
-
     let gdpr = bidderRequest.gdprConsent;
     if (bidderRequest && gdpr) {
       let isCmp = (typeof gdpr.gdprApplies === 'boolean')
@@ -47,7 +47,6 @@ export const spec = {
         status: isCmp ? gdpr.gdprApplies : -1
       };
     }
-
     const payloadString = JSON.stringify(payload);
     return {
       method: 'POST',
@@ -55,7 +54,6 @@ export const spec = {
       data: payloadString,
     };
   },
-
   /**
      * Unpack the response from the server into a list of bids.
      *
@@ -65,9 +63,8 @@ export const spec = {
   interpretResponse: function(serverResponse, request) {
     const bidResponses = [];
     serverResponse = serverResponse.body;
-
     if (serverResponse.responses) {
-      serverResponse.responses.forEach(function (bid) {
+      serverResponse.responses.forEach(function(bid) {
         const bidResponse = {
           cpm: bid.cpm,
           width: bid.width,
@@ -79,14 +76,16 @@ export const spec = {
           requestId: bid.requestId,
           creativeId: bid.creativeId,
           transactionId: bid.tranactionId,
-          winUrl: bid.winUrl
+          winUrl: bid.winUrl,
+          meta: {
+            advertiserDomains: bid.adomain || []
+          }
         };
         bidResponses.push(bidResponse);
       });
     }
     return bidResponses;
   },
-
   getUserSyncs: function(syncOptions, serverResponses) {
     if (syncOptions.iframeEnabled) {
       return [{
@@ -96,31 +95,26 @@ export const spec = {
     }
     return [];
   },
-
   onBidWon: function(bid) {
     ajax(bid.winUrl + bid.cpm, null);
   }
 }
-
 function buildRequestObject(bid) {
   const reqObj = {};
-  let placementId = utils.getValue(bid.params, 'placementId');
-
-  reqObj.sizes = utils.parseSizesInput(bid.sizes);
-  reqObj.bidId = utils.getBidIdParameter('bidId', bid);
-  reqObj.bidderRequestId = utils.getBidIdParameter('bidderRequestId', bid);
+  let placementId = getValue(bid.params, 'placementId');
+  reqObj.sizes = parseSizesInput(bid.sizes);
+  reqObj.bidId = getBidIdParameter('bidId', bid);
+  reqObj.bidderRequestId = getBidIdParameter('bidderRequestId', bid);
   reqObj.placementId = parseInt(placementId);
-  reqObj.adUnitCode = utils.getBidIdParameter('adUnitCode', bid);
-  reqObj.auctionId = utils.getBidIdParameter('auctionId', bid);
-  reqObj.transactionId = utils.getBidIdParameter('transactionId', bid);
-
+  reqObj.adUnitCode = getBidIdParameter('adUnitCode', bid);
+  reqObj.auctionId = getBidIdParameter('auctionId', bid);
+  reqObj.transactionId = getBidIdParameter('transactionId', bid);
   return reqObj;
 }
-
 function getReferrerInfo(bidderRequest) {
   let ref = window.location.href;
-  if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-    ref = bidderRequest.refererInfo.referer;
+  if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
+    ref = bidderRequest.refererInfo.page;
   }
   return ref;
 }
diff --git a/modules/smaatoBidAdapter.js b/modules/smaatoBidAdapter.js
new file mode 100644
index 00000000000..18ce56c7a80
--- /dev/null
+++ b/modules/smaatoBidAdapter.js
@@ -0,0 +1,497 @@
+import { deepAccess, isNumber, getDNT, deepSetValue, logInfo, logError, isEmpty, getAdUnitSizes, fill, chunk, getMaxValueFromArray, getMinValueFromArray } from '../src/utils.js';
+import {find} from '../src/polyfill.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {config} from '../src/config.js';
+import {ADPOD, BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
+import CONSTANTS from '../src/constants.json';
+
+const { NATIVE_IMAGE_TYPES } = CONSTANTS;
+const BIDDER_CODE = 'smaato';
+const SMAATO_ENDPOINT = 'https://prebid.ad.smaato.net/oapi/prebid';
+const SMAATO_CLIENT = 'prebid_js_$prebid.version$_1.7'
+const CURRENCY = 'USD';
+
+const buildOpenRtbBidRequest = (bidRequest, bidderRequest) => {
+  const requestTemplate = {
+    id: bidderRequest.auctionId,
+    at: 1,
+    cur: [CURRENCY],
+    tmax: bidderRequest.timeout,
+    site: {
+      id: window.location.hostname,
+      // TODO: do the fallbacks make sense here?
+      domain: bidderRequest.refererInfo.domain || window.location.hostname,
+      page: bidderRequest.refererInfo.page || window.location.href,
+      ref: bidderRequest.refererInfo.ref
+    },
+    device: {
+      language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+      ua: navigator.userAgent,
+      dnt: getDNT() ? 1 : 0,
+      h: screen.height,
+      w: screen.width
+    },
+    regs: {
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ext: {}
+    },
+    user: {
+      ext: {}
+    },
+    source: {
+      ext: {
+        schain: bidRequest.schain
+      }
+    },
+    ext: {
+      client: SMAATO_CLIENT
+    }
+  };
+
+  let ortb2 = bidderRequest.ortb2 || {};
+  Object.assign(requestTemplate.user, ortb2.user);
+  Object.assign(requestTemplate.site, ortb2.site);
+
+  deepSetValue(requestTemplate, 'site.publisher.id', deepAccess(bidRequest, 'params.publisherId'));
+
+  if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies === true) {
+    deepSetValue(requestTemplate, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
+    deepSetValue(requestTemplate, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+  }
+
+  if (bidderRequest.uspConsent !== undefined) {
+    deepSetValue(requestTemplate, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+
+  if (deepAccess(bidRequest, 'params.app')) {
+    const geo = deepAccess(bidRequest, 'params.app.geo');
+    deepSetValue(requestTemplate, 'device.geo', geo);
+    const ifa = deepAccess(bidRequest, 'params.app.ifa');
+    deepSetValue(requestTemplate, 'device.ifa', ifa);
+  }
+
+  const eids = deepAccess(bidRequest, 'userIdAsEids');
+  if (eids && eids.length) {
+    deepSetValue(requestTemplate, 'user.ext.eids', eids);
+  }
+
+  let requests = [];
+
+  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
+    const bannerRequest = Object.assign({}, requestTemplate, createBannerImp(bidRequest));
+    requests.push(bannerRequest);
+  }
+
+  const videoMediaType = deepAccess(bidRequest, 'mediaTypes.video');
+  if (videoMediaType) {
+    if (videoMediaType.context === ADPOD) {
+      const adPodRequest = Object.assign({}, requestTemplate, createAdPodImp(bidRequest, videoMediaType));
+      addOptionalAdpodParameters(adPodRequest, videoMediaType);
+      requests.push(adPodRequest);
+    } else {
+      const videoRequest = Object.assign({}, requestTemplate, createVideoImp(bidRequest, videoMediaType));
+      requests.push(videoRequest);
+    }
+  }
+
+  const nativeOrtbRequest = bidRequest.nativeOrtbRequest;
+  if (nativeOrtbRequest) {
+    const nativeRequest = Object.assign({}, requestTemplate, createNativeImp(bidRequest, nativeOrtbRequest));
+    requests.push(nativeRequest);
+  }
+
+  return requests;
+}
+
+const buildServerRequest = (validBidRequest, data) => {
+  logInfo('[SMAATO] OpenRTB Request:', data);
+  return {
+    method: 'POST',
+    url: validBidRequest.params.endpoint || SMAATO_ENDPOINT,
+    data: JSON.stringify(data),
+    options: {
+      withCredentials: true,
+      crossOrigin: true,
+    }
+  };
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+  gvlid: 82,
+
+  /**
+   * Determines whether the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: (bid) => {
+    if (typeof bid.params !== 'object') {
+      logError('[SMAATO] Missing params object');
+      return false;
+    }
+
+    if (typeof bid.params.publisherId !== 'string') {
+      logError('[SMAATO] Missing mandatory publisherId param');
+      return false;
+    }
+
+    if (deepAccess(bid, 'mediaTypes.video.context') === ADPOD) {
+      logInfo('[SMAATO] Verifying adpod bid request');
+
+      if (typeof bid.params.adbreakId !== 'string') {
+        logError('[SMAATO] Missing for adpod request mandatory adbreakId param');
+        return false;
+      }
+
+      if (bid.params.adspaceId) {
+        logError('[SMAATO] The adspaceId param is not allowed in an adpod bid request');
+        return false;
+      }
+    } else {
+      logInfo('[SMAATO] Verifying a non adpod bid request');
+
+      if (typeof bid.params.adspaceId !== 'string') {
+        logError('[SMAATO] Missing mandatory adspaceId param');
+        return false;
+      }
+
+      if (bid.params.adbreakId) {
+        logError('[SMAATO] The adbreakId param is only allowed in an adpod bid request');
+        return false;
+      }
+    }
+
+    logInfo('[SMAATO] Verification done, all good');
+    return true;
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    logInfo('[SMAATO] Client version:', SMAATO_CLIENT);
+
+    return validBidRequests.map((validBidRequest) => {
+      const openRtbBidRequests = buildOpenRtbBidRequest(validBidRequest, bidderRequest);
+      return openRtbBidRequests.map((openRtbBidRequest) => buildServerRequest(validBidRequest, openRtbBidRequest));
+    }).reduce((acc, item) => item != null && acc.concat(item), []);
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (serverResponse, bidRequest) => {
+    // response is empty (HTTP 204)
+    if (isEmpty(serverResponse.body)) {
+      logInfo('[SMAATO] Empty response body HTTP 204, no bids');
+      return []; // no bids
+    }
+
+    const serverResponseHeaders = serverResponse.headers;
+
+    const smtExpires = serverResponseHeaders.get('X-SMT-Expires');
+    logInfo('[SMAATO] Expires:', smtExpires);
+    const ttlInSec = smtExpires ? Math.floor((smtExpires - Date.now()) / 1000) : 300;
+
+    const response = serverResponse.body;
+    logInfo('[SMAATO] OpenRTB Response:', response);
+
+    const smtAdType = serverResponseHeaders.get('X-SMT-ADTYPE');
+    const bids = [];
+    response.seatbid.forEach(seatbid => {
+      seatbid.bid.forEach(bid => {
+        let resultingBid = {
+          requestId: bid.impid,
+          cpm: bid.price || 0,
+          width: bid.w,
+          height: bid.h,
+          ttl: ttlInSec,
+          creativeId: bid.crid,
+          dealId: bid.dealid || null,
+          netRevenue: deepAccess(bid, 'ext.net', true),
+          currency: response.cur,
+          meta: {
+            advertiserDomains: bid.adomain,
+            networkName: bid.bidderName,
+            agencyId: seatbid.seat
+          }
+        };
+
+        const videoContext = deepAccess(JSON.parse(bidRequest.data).imp[0], 'video.ext.context');
+        if (videoContext === ADPOD) {
+          resultingBid.vastXml = bid.adm;
+          resultingBid.mediaType = VIDEO;
+          if (config.getConfig('adpod.brandCategoryExclusion')) {
+            resultingBid.meta.primaryCatId = bid.cat[0];
+          }
+          resultingBid.video = {
+            context: ADPOD,
+            durationSeconds: bid.ext.duration
+          };
+          bids.push(resultingBid);
+        } else {
+          switch (smtAdType) {
+            case 'Img':
+              resultingBid.ad = createImgAd(bid.adm);
+              resultingBid.mediaType = BANNER;
+              bids.push(resultingBid);
+              break;
+            case 'Richmedia':
+              resultingBid.ad = createRichmediaAd(bid.adm);
+              resultingBid.mediaType = BANNER;
+              bids.push(resultingBid);
+              break;
+            case 'Video':
+              resultingBid.vastXml = bid.adm;
+              resultingBid.mediaType = VIDEO;
+              bids.push(resultingBid);
+              break;
+            case 'Native':
+              resultingBid.native = createNativeAd(bid.adm);
+              resultingBid.mediaType = NATIVE;
+              bids.push(resultingBid);
+              break;
+            default:
+              logInfo('[SMAATO] Invalid ad type:', smtAdType);
+          }
+        }
+        resultingBid.meta.mediaType = resultingBid.mediaType;
+      });
+    });
+
+    logInfo('[SMAATO] Prebid bids:', bids);
+    return bids;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    return [];
+  }
+}
+registerBidder(spec);
+
+const createImgAd = (adm) => {
+  const image = JSON.parse(adm).image;
+
+  let clickEvent = '';
+  image.clicktrackers.forEach(src => {
+    clickEvent += `fetch(decodeURIComponent('${encodeURIComponent(src)}'), {cache: 'no-cache'});`;
+  })
+
+  let markup = `<div style="cursor:pointer" onclick="${clickEvent};window.open(decodeURIComponent('${encodeURIComponent(image.img.ctaurl)}'));"><img src="${image.img.url}" width="${image.img.w}" height="${image.img.h}"/>`;
+
+  image.impressiontrackers.forEach(src => {
+    markup += `<img src="${src}" alt="" width="0" height="0"/>`;
+  });
+
+  return markup + '</div>';
+};
+
+const createRichmediaAd = (adm) => {
+  const rich = JSON.parse(adm).richmedia;
+  let clickEvent = '';
+  rich.clicktrackers.forEach(src => {
+    clickEvent += `fetch(decodeURIComponent('${encodeURIComponent(src)}'), {cache: 'no-cache'});`;
+  })
+
+  let markup = `<div onclick="${clickEvent}">${rich.mediadata.content}`;
+
+  rich.impressiontrackers.forEach(src => {
+    markup += `<img src="${src}" alt="" width="0" height="0"/>`;
+  });
+
+  return markup + '</div>';
+};
+
+const createNativeAd = (adm) => {
+  const nativeResponse = JSON.parse(adm).native;
+  return {
+    ortb: nativeResponse
+  }
+};
+
+function createBannerImp(bidRequest) {
+  const adUnitSizes = getAdUnitSizes(bidRequest);
+  const sizes = adUnitSizes.map((size) => ({w: size[0], h: size[1]}));
+  return {
+    imp: [{
+      id: bidRequest.bidId,
+      tagid: deepAccess(bidRequest, 'params.adspaceId'),
+      bidfloor: getBidFloor(bidRequest, BANNER, adUnitSizes),
+      instl: deepAccess(bidRequest.ortb2Imp, 'instl'),
+      banner: {
+        w: sizes[0].w,
+        h: sizes[0].h,
+        format: sizes
+      }
+    }]
+  };
+}
+
+function createVideoImp(bidRequest, videoMediaType) {
+  return {
+    imp: [{
+      id: bidRequest.bidId,
+      tagid: deepAccess(bidRequest, 'params.adspaceId'),
+      bidfloor: getBidFloor(bidRequest, VIDEO, videoMediaType.playerSize),
+      instl: deepAccess(bidRequest.ortb2Imp, 'instl'),
+      video: {
+        mimes: videoMediaType.mimes,
+        minduration: videoMediaType.minduration,
+        startdelay: videoMediaType.startdelay,
+        linearity: videoMediaType.linearity,
+        w: videoMediaType.playerSize[0][0],
+        h: videoMediaType.playerSize[0][1],
+        maxduration: videoMediaType.maxduration,
+        skip: videoMediaType.skip,
+        protocols: videoMediaType.protocols,
+        ext: {
+          rewarded: videoMediaType.ext && videoMediaType.ext.rewarded ? videoMediaType.ext.rewarded : 0
+        },
+        skipmin: videoMediaType.skipmin,
+        api: videoMediaType.api
+      }
+    }]
+  };
+}
+
+function createNativeImp(bidRequest, nativeRequest) {
+  return {
+    imp: [{
+      id: bidRequest.bidId,
+      tagid: deepAccess(bidRequest, 'params.adspaceId'),
+      bidfloor: getBidFloor(bidRequest, NATIVE, getNativeMainImageSize(nativeRequest)),
+      native: {
+        request: JSON.stringify(nativeRequest),
+        ver: '1.2'
+      }
+    }]
+  };
+}
+
+function getNativeMainImageSize(nativeRequest) {
+  const mainImage = find(nativeRequest.assets, asset => asset.hasOwnProperty('img') && asset.img.type === NATIVE_IMAGE_TYPES.MAIN)
+  if (mainImage) {
+    if (isNumber(mainImage.img.w) && isNumber(mainImage.img.h)) {
+      return [[mainImage.img.w, mainImage.img.h]]
+    }
+    if (isNumber(mainImage.img.wmin) && isNumber(mainImage.img.hmin)) {
+      return [[mainImage.img.wmin, mainImage.img.hmin]]
+    }
+  }
+  return []
+}
+
+function createAdPodImp(bidRequest, videoMediaType) {
+  const tagid = deepAccess(bidRequest, 'params.adbreakId')
+  const bce = config.getConfig('adpod.brandCategoryExclusion')
+  let imp = {
+    id: bidRequest.bidId,
+    tagid: tagid,
+    bidfloor: getBidFloor(bidRequest, VIDEO, videoMediaType.playerSize),
+    instl: deepAccess(bidRequest.ortb2Imp, 'instl'),
+    video: {
+      w: videoMediaType.playerSize[0][0],
+      h: videoMediaType.playerSize[0][1],
+      mimes: videoMediaType.mimes,
+      startdelay: videoMediaType.startdelay,
+      linearity: videoMediaType.linearity,
+      skip: videoMediaType.skip,
+      protocols: videoMediaType.protocols,
+      skipmin: videoMediaType.skipmin,
+      api: videoMediaType.api,
+      ext: {
+        context: ADPOD,
+        brandcategoryexclusion: bce !== undefined && bce
+      }
+    }
+  }
+
+  const numberOfPlacements = getAdPodNumberOfPlacements(videoMediaType)
+  let imps = fill(imp, numberOfPlacements)
+
+  const durationRangeSec = videoMediaType.durationRangeSec
+  if (videoMediaType.requireExactDuration) {
+    // equal distribution of numberOfPlacement over all available durations
+    const divider = Math.ceil(numberOfPlacements / durationRangeSec.length)
+    const chunked = chunk(imps, divider)
+
+    // each configured duration is set as min/maxduration for a subset of requests
+    durationRangeSec.forEach((duration, index) => {
+      chunked[index].map(imp => {
+        const sequence = index + 1;
+        imp.video.minduration = duration
+        imp.video.maxduration = duration
+        imp.video.sequence = sequence
+      });
+    });
+  } else {
+    // all maxdurations should be the same
+    const maxDuration = getMaxValueFromArray(durationRangeSec);
+    imps.map((imp, index) => {
+      const sequence = index + 1;
+      imp.video.maxduration = maxDuration
+      imp.video.sequence = sequence
+    });
+  }
+
+  return {
+    imp: imps
+  }
+}
+
+function getAdPodNumberOfPlacements(videoMediaType) {
+  const {adPodDurationSec, durationRangeSec, requireExactDuration} = videoMediaType
+  const minAllowedDuration = getMinValueFromArray(durationRangeSec)
+  const numberOfPlacements = Math.floor(adPodDurationSec / minAllowedDuration)
+
+  return requireExactDuration
+    ? Math.max(numberOfPlacements, durationRangeSec.length)
+    : numberOfPlacements
+}
+
+const addOptionalAdpodParameters = (request, videoMediaType) => {
+  const content = {}
+
+  if (videoMediaType.tvSeriesName) {
+    content.series = videoMediaType.tvSeriesName
+  }
+  if (videoMediaType.tvEpisodeName) {
+    content.title = videoMediaType.tvEpisodeName
+  }
+  if (typeof videoMediaType.tvSeasonNumber === 'number') {
+    content.season = videoMediaType.tvSeasonNumber.toString() // conversion to string as in OpenRTB season is a string
+  }
+  if (typeof videoMediaType.tvEpisodeNumber === 'number') {
+    content.episode = videoMediaType.tvEpisodeNumber
+  }
+  if (typeof videoMediaType.contentLengthSec === 'number') {
+    content.len = videoMediaType.contentLengthSec
+  }
+  if (videoMediaType.contentMode && ['live', 'on-demand'].indexOf(videoMediaType.contentMode) >= 0) {
+    content.livestream = videoMediaType.contentMode === 'live' ? 1 : 0
+  }
+
+  if (!isEmpty(content)) {
+    request.site.content = content
+  }
+}
+
+function getBidFloor(bidRequest, mediaType, sizes) {
+  if (typeof bidRequest.getFloor === 'function') {
+    const size = sizes.length === 1 ? sizes[0] : '*';
+    const floor = bidRequest.getFloor({currency: CURRENCY, mediaType: mediaType, size: size});
+    if (floor && !isNaN(floor.floor) && (floor.currency === CURRENCY)) {
+      return floor.floor;
+    }
+  }
+}
diff --git a/modules/smaatoBidAdapter.md b/modules/smaatoBidAdapter.md
new file mode 100644
index 00000000000..170880c3fc0
--- /dev/null
+++ b/modules/smaatoBidAdapter.md
@@ -0,0 +1,173 @@
+# Overview
+
+```
+Module Name: Smaato Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@smaato.com
+```
+
+# Description
+
+The Smaato adapter requires setup and approval from the Smaato team, even for existing Smaato publishers. Please reach out to your account team or prebid@smaato.com for more information.
+
+# Test Parameters
+
+For banner adunits:
+
+```
+var adUnits = [{
+    "code": "banner-unit",
+    "mediaTypes": {
+        "banner": {
+            "sizes": [320, 50]
+        }
+    },
+    "bids": [{
+        "bidder": "smaato",
+        "params": {
+            "publisherId": "1100042525",
+            "adspaceId": "130563103"
+        }
+    }]
+}];
+```
+
+For video adunits:
+
+```
+var adUnits = [{
+    "code": "video unit",
+    "mediaTypes": {
+        "video": {
+            "context": "instream",
+            "playerSize": [640, 480],
+            "mimes": ["video/mp4"],
+            "minduration": 5,
+            "maxduration": 30,
+            "startdelay": 0,
+            "linearity": 1,
+            "protocols": [7],
+            "skip": 1,
+            "skipmin": 5,
+            "api": [7],
+            "ext": {"rewarded": 0}
+        }
+    },
+    "bids": [{
+        "bidder": "smaato",
+        "params": {
+            "publisherId": "1100042525",
+            "adspaceId": "130563103"
+        }
+    }]
+}];
+```
+
+For native adunits:
+
+```
+var adUnits = [{
+    "code": "native unit",
+    "mediaTypes": {
+        native: {
+            ortb: {
+                ver: "1.2",
+                assets: [
+                    {
+                        id: 1,
+                        required: 1,
+                        img: {
+                            type: 3,
+                            w: 150,
+                            h: 50,
+                        }
+                    },
+                    {
+                        id: 2,
+                        required: 1,
+                        img: {
+                            type: 2,
+                            w: 50,
+                            h: 50
+                        }
+                    },
+                    {
+                        id: 3,
+                        required: 1,
+                        title: {
+                            len: 80
+                        }
+                    },
+                    {
+                        id: 4,
+                        required: 1,
+                        data: {
+                            type: 1
+                        }
+                    },
+                    {
+                        id: 5,
+                        required: 1,
+                        data: {
+                            type: 2
+                        }
+                    },
+                    {
+                        id: 6,
+                        required: 0,
+                        data: {
+                            type: 3
+                        }
+                    },
+                    {
+                        id: 7,
+                        required: 0,
+                        data: {
+                            type: 12
+                        }
+                    }
+                ]
+            },
+            sendTargetingKeys: false,
+        }
+    },
+    "bids": [{
+        "bidder": "smaato",
+        "params": {
+            "publisherId": "1100042525",
+            "adspaceId": "130563103"
+        }
+    }]
+}];
+```
+
+For adpod adunits:
+
+```
+var adUnits = [{
+    "code": "adpod unit",
+    "mediaTypes": {
+        "video": {
+            "context": "adpod",
+            "playerSize": [640, 480],
+            "adPodDurationSec": 300,
+            "durationRangeSec": [15, 30],
+            "requireExactDuration": false,
+            "mimes": ["video/mp4"],
+            "startdelay": 0,
+            "linearity": 1,
+            "protocols": [7],
+            "skip": 1,
+            "skipmin": 5,
+            "api": [7],
+        }
+    },
+    "bids": [{
+        "bidder": "smaato",
+        "params": {
+            "publisherId": "1100042525",
+            "adbreakId": "330563103"
+        }
+    }]
+}];
+```
diff --git a/modules/smartadserverBidAdapter.js b/modules/smartadserverBidAdapter.js
index 97dd43fc5ba..6ff0e592542 100644
--- a/modules/smartadserverBidAdapter.js
+++ b/modules/smartadserverBidAdapter.js
@@ -1,20 +1,16 @@
-import * as utils from '../src/utils.js';
-import {
-  BANNER,
-  VIDEO
-} from '../src/mediaTypes.js';
-import {
-  config
-} from '../src/config.js';
-import {
-  registerBidder
-} from '../src/adapters/bidderFactory.js';
-import {
-  createEidsArray
-} from './userId/eids.js';
+import { deepAccess, deepClone, logError, isFn, isPlainObject } from '../src/utils.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { createEidsArray } from './userId/eids.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
 const BIDDER_CODE = 'smartadserver';
+const GVL_ID = 45;
+const DEFAULT_FLOOR = 0.0;
+
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   aliases: ['smart'], // short code
   supportedMediaTypes: [BANNER, VIDEO],
   /**
@@ -43,7 +39,91 @@ export const spec = {
   },
 
   /**
-   * Make a server request from the list of BidRequests.
+   * Transforms the banner ad unit sizes into an object array.
+   *
+   * @param {*} bannerSizes Array of size array (ex. [[300, 250]]).
+   * @returns
+   */
+  adaptBannerSizes: function(bannerSizes) {
+    return bannerSizes.map(size => ({
+      w: size[0],
+      h: size[1]
+    }));
+  },
+
+  /**
+   * Fills the payload with specific video attributes.
+   *
+   * @param {*} payload Payload that will be sent in the ServerRequest
+   * @param {*} videoMediaType Video media type.
+   */
+  fillPayloadForVideoBidRequest: function(payload, videoMediaType, videoParams) {
+    const playerSize = videoMediaType.playerSize[0];
+    payload.isVideo = videoMediaType.context === 'instream';
+    payload.mediaType = VIDEO;
+    payload.videoData = {
+      videoProtocol: this.getProtocolForVideoBidRequest(videoMediaType, videoParams),
+      playerWidth: playerSize[0],
+      playerHeight: playerSize[1],
+      adBreak: this.getStartDelayForVideoBidRequest(videoMediaType, videoParams)
+    };
+  },
+
+  /**
+   * Gets the protocols from either videoParams or VideoMediaType
+   * @param {*} videoMediaType
+   * @param {*} videoParams
+   * @returns protocol from either videoMediaType or videoParams
+   */
+  getProtocolForVideoBidRequest: function(videoMediaType, videoParams) {
+    if (videoParams !== undefined && videoParams.protocol) {
+      return videoParams.protocol;
+    } else if (videoMediaType !== undefined) {
+      if (Array.isArray(videoMediaType.protocols)) {
+        return Math.max.apply(Math, videoMediaType.protocols);
+      }
+    }
+    return null;
+  },
+
+  /**
+   * Gets the startDelay from either videoParams or VideoMediaType
+   * @param {*} videoMediaType
+   * @param {*} videoParams
+   * @returns positive integer value of startdelay
+   */
+  getStartDelayForVideoBidRequest: function(videoMediaType, videoParams) {
+    if (videoParams !== undefined && videoParams.startDelay) {
+      return videoParams.startDelay;
+    } else if (videoMediaType !== undefined) {
+      if (videoMediaType.startdelay == 0) {
+        return 1;
+      } else if (videoMediaType.startdelay == -1) {
+        return 2;
+      } else if (videoMediaType.startdelay == -2) {
+        return 3;
+      }
+    }
+    return 2;// Default value for all exotic cases set to bid.params.video.startDelay midroll hence 2.
+  },
+
+  /**
+   * Creates the server request.
+   *
+   * @param {*} payload Body of the request.
+   * @param {string} domain Endpoint domain .
+   * @returns {ServerRequest} Info describing the request to the server.
+   */
+  createServerRequest: function(payload, domain) {
+    return {
+      method: 'POST',
+      url: (domain !== undefined ? domain : 'https://prg.smartadserver.com') + '/prebid/v1',
+      data: JSON.stringify(payload),
+    };
+  },
+
+  /**
+   * Makes server requests from the list of BidRequests.
    *
    * @param {BidRequest[]} validBidRequests an array of bids
    * @param {BidderRequest} bidderRequest bidder request object
@@ -51,53 +131,38 @@ export const spec = {
    */
   buildRequests: function (validBidRequests, bidderRequest) {
     // use bidderRequest.bids[] to get bidder-dependent request info
-    // if your bidder supports multiple currencies, use config.getConfig(currency)
-    // to find which one the ad server needs
+
+    const adServerCurrency = config.getConfig('currency.adServerCurrency');
+    const sellerDefinedAudience = deepAccess(bidderRequest, 'ortb2.user.data', config.getAnyConfig('ortb2.user.data'));
+    const sellerDefinedContext = deepAccess(bidderRequest, 'ortb2.site.content.data', config.getAnyConfig('ortb2.site.content.data'));
 
     // pull requested transaction ID from bidderRequest.bids[].transactionId
-    return validBidRequests.map(bid => {
+    return validBidRequests.reduce((bidRequests, bid) => {
       // Common bid request attributes for banner, outstream and instream.
       let payload = {
         siteid: bid.params.siteId,
         pageid: bid.params.pageId,
         formatid: bid.params.formatId,
-        currencyCode: config.getConfig('currency.adServerCurrency'),
-        bidfloor: bid.params.bidfloor || 0.0,
+        currencyCode: adServerCurrency,
+        bidfloor: bid.params.bidfloor || spec.getBidFloor(bid, adServerCurrency),
         targeting: bid.params.target && bid.params.target !== '' ? bid.params.target : undefined,
         buid: bid.params.buId && bid.params.buId !== '' ? bid.params.buId : undefined,
         appname: bid.params.appName && bid.params.appName !== '' ? bid.params.appName : undefined,
         ckid: bid.params.ckId || 0,
         tagId: bid.adUnitCode,
-        pageDomain: bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer ? bidderRequest.refererInfo.referer : undefined,
+        // TODO: is 'page' the right value here?
+        pageDomain: bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page ? bidderRequest.refererInfo.page : undefined,
         transactionId: bid.transactionId,
         timeout: config.getConfig('bidderTimeout'),
         bidId: bid.bidId,
         prebidVersion: '$prebid.version$',
-        schain: spec.serializeSupplyChain(bid.schain)
+        schain: spec.serializeSupplyChain(bid.schain),
+        sda: sellerDefinedAudience,
+        sdc: sellerDefinedContext
       };
 
-      const videoMediaType = utils.deepAccess(bid, 'mediaTypes.video');
-      if (!videoMediaType) {
-        const bannerMediaType = utils.deepAccess(bid, 'mediaTypes.banner');
-        payload.sizes = bannerMediaType.sizes.map(size => ({
-          w: size[0],
-          h: size[1]
-        }));
-      } else if (videoMediaType && videoMediaType.context === 'instream') {
-        // Specific attributes for instream.
-        let playerSize = videoMediaType.playerSize[0];
-        payload.isVideo = true;
-        payload.videoData = {
-          videoProtocol: bid.params.video.protocol,
-          playerWidth: playerSize[0],
-          playerHeight: playerSize[1],
-          adBreak: bid.params.video.startDelay || 1
-        };
-      } else {
-        return {};
-      }
-
       if (bidderRequest && bidderRequest.gdprConsent) {
+        payload.addtl_consent = bidderRequest.gdprConsent.addtlConsent;
         payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
         payload.gdpr = bidderRequest.gdprConsent.gdprApplies; // we're handling the undefined case server side
       }
@@ -110,14 +175,31 @@ export const spec = {
         payload.us_privacy = bidderRequest.uspConsent;
       }
 
-      var payloadString = JSON.stringify(payload);
+      const videoMediaType = deepAccess(bid, 'mediaTypes.video');
+      const bannerMediaType = deepAccess(bid, 'mediaTypes.banner');
+      const isAdUnitContainingVideo = videoMediaType && (videoMediaType.context === 'instream' || videoMediaType.context === 'outstream');
+      if (!isAdUnitContainingVideo && bannerMediaType) {
+        payload.sizes = spec.adaptBannerSizes(bannerMediaType.sizes);
+        bidRequests.push(spec.createServerRequest(payload, bid.params.domain));
+      } else if (isAdUnitContainingVideo && !bannerMediaType) {
+        spec.fillPayloadForVideoBidRequest(payload, videoMediaType, bid.params.video);
+        bidRequests.push(spec.createServerRequest(payload, bid.params.domain));
+      } else if (isAdUnitContainingVideo && bannerMediaType) {
+        // If there are video and banner media types in the ad unit, we clone the payload
+        // to create a specific one for video.
+        let videoPayload = deepClone(payload);
 
-      return {
-        method: 'POST',
-        url: (bid.params.domain !== undefined ? bid.params.domain : 'https://prg.smartadserver.com') + '/prebid/v1',
-        data: payloadString,
-      };
-    });
+        spec.fillPayloadForVideoBidRequest(videoPayload, videoMediaType, bid.params.video);
+        bidRequests.push(spec.createServerRequest(videoPayload, bid.params.domain));
+
+        payload.sizes = spec.adaptBannerSizes(bannerMediaType.sizes);
+        bidRequests.push(spec.createServerRequest(payload, bid.params.domain));
+      } else {
+        bidRequests.push({});
+      }
+
+      return bidRequests;
+    }, []);
   },
 
   /**
@@ -131,7 +213,7 @@ export const spec = {
     const bidResponses = [];
     let response = serverResponse.body;
     try {
-      if (response) {
+      if (response && !response.isNoAd && (response.ad || response.adUrl)) {
         const bidRequest = JSON.parse(bidRequestString.data);
 
         let bidResponse = {
@@ -143,13 +225,16 @@ export const spec = {
           dealId: response.dealId,
           currency: response.currency,
           netRevenue: response.isNetCpm,
-          ttl: response.ttl
+          ttl: response.ttl,
+          dspPixels: response.dspPixels,
+          meta: { advertiserDomains: response.adomain ? response.adomain : [] }
         };
 
-        if (bidRequest.isVideo) {
+        if (bidRequest.mediaType === VIDEO) {
           bidResponse.mediaType = VIDEO;
           bidResponse.vastUrl = response.adUrl;
           bidResponse.vastXml = response.ad;
+          bidResponse.content = response.ad;
         } else {
           bidResponse.adUrl = response.adUrl;
           bidResponse.ad = response.ad;
@@ -158,11 +243,36 @@ export const spec = {
         bidResponses.push(bidResponse);
       }
     } catch (error) {
-      utils.logError('Error while parsing smart server response', error);
+      logError('Error while parsing smart server response', error);
     }
     return bidResponses;
   },
 
+  /**
+   * Get floors from Prebid Price Floors module
+   *
+   * @param {object} bid Bid request object
+   * @param {string} currency Ad server currency
+   * @return {number} Floor price
+   */
+  getBidFloor: function (bid, currency) {
+    if (!isFn(bid.getFloor)) {
+      return DEFAULT_FLOOR;
+    }
+
+    const floor = bid.getFloor({
+      currency: currency || 'USD',
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (isPlainObject(floor) && !isNaN(floor.floor)) {
+      return floor.floor;
+    }
+
+    return DEFAULT_FLOOR;
+  },
+
   /**
    * User syncs.
    *
@@ -172,11 +282,18 @@ export const spec = {
    */
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
-    if (syncOptions.iframeEnabled && serverResponses.length > 0) {
+    if (syncOptions.iframeEnabled && serverResponses.length > 0 && serverResponses[0].body.cSyncUrl != null) {
       syncs.push({
         type: 'iframe',
         url: serverResponses[0].body.cSyncUrl
       });
+    } else if (syncOptions.pixelEnabled && serverResponses.length > 0 && serverResponses[0].body.dspPixels !== undefined) {
+      serverResponses[0].body.dspPixels.forEach(function(pixel) {
+        syncs.push({
+          type: 'image',
+          url: pixel
+        });
+      });
     }
     return syncs;
   }
diff --git a/modules/smartadserverBidAdapter.md b/modules/smartadserverBidAdapter.md
index c6f68363d7c..7a2381ac9f1 100644
--- a/modules/smartadserverBidAdapter.md
+++ b/modules/smartadserverBidAdapter.md
@@ -94,4 +94,73 @@ Please reach out to your Technical account manager for more information.
             }
         }]
     };
+```
+
+## Outstream Video
+
+```
+    var outstreamVideoAdUnit = {
+			code: 'test-div',
+			mediaTypes: {
+				video: {
+					context: 'outstream',
+					playerSize: [640, 480]
+				}
+			},
+			renderer: {
+				url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+				render: function (bid) {
+					bid.renderer.push(() => {
+						ANOutstreamVideo.renderAd({
+							targetId: bid.adUnitCode,
+							adResponse: bid
+						});
+					});
+				}
+			},
+			bids: [{
+				bidder: "smart",
+				params: {
+					domain: 'https://prg.smartadserver.com',
+					siteId: 207435,
+					pageId: 896536,
+					formatId: 85089,
+					bidfloor: 5,
+                    video: {
+                        protocol: 6,
+                        startDelay: 1
+                    }
+				}
+			}]
+		};
+```
+
+##  Double Mediatype Setup (Banner & Video)
+
+```
+    var adUnits = [{
+        code: 'prebid_tag_001',
+        mediaTypes: {
+            banner: {
+                sizes: [[300,250]]
+            },
+            video: {
+                context: 'outstream',
+                playerSize: [640, 480]
+            }
+        },
+        bids: [{
+            bidder: 'smartadserver',
+            params: {
+                domain: 'https://prg.smartadserver.com',
+                siteId: 411951,
+                pageId: 1383641,
+                formatId: 84313,
+                target: 'iid=8984466',
+                video: {
+                    protocol: 6, // Stands for "up to VAST 3". For "up to VAST 4" it is 8
+                }
+            }
+        }]
+    }];
 ```
\ No newline at end of file
diff --git a/modules/smarthubBidAdapter.js b/modules/smarthubBidAdapter.js
new file mode 100644
index 00000000000..6aab6a8b57e
--- /dev/null
+++ b/modules/smarthubBidAdapter.js
@@ -0,0 +1,190 @@
+import {deepAccess, isFn, logError, logMessage} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'smarthub';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency || !bid.hasOwnProperty('netRevenue')) {
+    return false;
+  }
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.width && bid.height && (bid.vastUrl || bid.vastXml));
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { partnerName, seat, token, iabCat, minBidfloor, pos } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    partnerName: partnerName.toLowerCase(),
+    seat,
+    token,
+    iabCat,
+    minBidfloor,
+    pos,
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+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 (e) {
+    logError(e);
+    return 0;
+  }
+}
+
+function buildRequestParams(bidderRequest = {}, placements = []) {
+  let deviceWidth = 0;
+  let deviceHeight = 0;
+
+  let winLocation;
+  try {
+    const winTop = window.top;
+    deviceWidth = winTop.screen.width;
+    deviceHeight = winTop.screen.height;
+    winLocation = winTop.location;
+  } catch (e) {
+    logMessage(e);
+    winLocation = window.location;
+  }
+
+  const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+  let refferLocation;
+  try {
+    refferLocation = refferUrl && new URL(refferUrl);
+  } catch (e) {
+    logMessage(e);
+  }
+
+  let location = refferLocation || winLocation;
+  const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+  const host = location.host;
+  const page = location.pathname;
+  const secure = location.protocol === 'https:' ? 1 : 0;
+  return {
+    deviceWidth,
+    deviceHeight,
+    language,
+    secure,
+    host,
+    page,
+    placements,
+    coppa: config.getConfig('coppa') === true ? 1 : 0,
+    ccpa: bidderRequest.uspConsent || undefined,
+    gdpr: bidderRequest.gdprConsent || undefined,
+    tmax: config.getConfig('bidderTimeout')
+  };
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && params.partnerName && params.seat && params.token);
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    } else {
+      valid = false;
+    }
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const tempObj = {};
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      const data = getPlacementReqData(bid);
+      tempObj[data.partnerName] = tempObj[data.partnerName] || [];
+      tempObj[data.partnerName].push(data);
+    }
+
+    return Object.keys(tempObj).map(key => {
+      const request = buildRequestParams(bidderRequest, tempObj[key]);
+      return {
+        method: 'POST',
+        url: `https://${key}-prebid.smart-hub.io/pbjs`,
+        data: request,
+      }
+    });
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/smarthubBidAdapter.md b/modules/smarthubBidAdapter.md
new file mode 100644
index 00000000000..c09855303e2
--- /dev/null
+++ b/modules/smarthubBidAdapter.md
@@ -0,0 +1,94 @@
+# Overview
+
+```
+Module Name: SmartHub Bidder Adapter
+Module Type: SmartHub Bidder Adapter
+Maintainer: support@smart-hub.io
+```
+
+# Description
+
+Connects to SmartHub exchange for bids.
+
+SmartHub bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'smarthub',
+                            params: {
+                                partnerName: 'pbjstest',
+                                seat: 'testSeat',
+                                token: 'testBanner',
+                                iabCat: ['IAB1-1', 'IAB3-1', 'IAB4-3'],
+                                minBidfloor: 10,
+                                pos: 1,
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'smarthub',
+                            params: {
+                                partnerName: 'pbjstest',
+                                seat: 'testSeat',
+                                token: 'testVideo',
+                                iabCat: ['IAB1-1', 'IAB3-1', 'IAB4-3'],
+                                minBidfloor: 10,
+                                pos: 1,
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'smarthub',
+                            params: {
+                                partnerName: 'pbjstest',
+                                seat: 'testSeat',
+                                token: 'testNative',
+                                iabCat: ['IAB1-1', 'IAB3-1', 'IAB4-3'],
+                                minBidfloor: 10,
+                                pos: 1,
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/smarticoBidAdapter.js b/modules/smarticoBidAdapter.js
new file mode 100644
index 00000000000..edb774f812f
--- /dev/null
+++ b/modules/smarticoBidAdapter.js
@@ -0,0 +1,121 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {find} from '../src/polyfill.js';
+
+const SMARTICO_CONFIG = {
+  bidRequestUrl: 'https://trmads.eu/preBidRequest',
+  widgetUrl: 'https://trmads.eu/get',
+  method: 'POST'
+}
+
+const BIDDER_CODE = 'smartico';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: function (bid) {
+    return !!(bid && bid.params && bid.params.token && bid.params.placementId);
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    var i
+    var j
+    var bid
+    var bidParam
+    var bidParams = []
+    var sizes
+    var frameWidth = Math.round(window.screen.width)
+    var frameHeight = Math.round(window.screen.height)
+    for (i = 0; i < validBidRequests.length; i++) {
+      bid = validBidRequests[i]
+      if (bid.sizes) {
+        sizes = bid.sizes
+      } else if (typeof (BANNER) != 'undefined' && bid.mediaTypes && bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
+        sizes = bid.mediaTypes[BANNER].sizes
+      } else if (frameWidth && frameHeight) {
+        sizes = [[frameWidth, frameHeight]]
+      } else {
+        sizes = []
+      }
+      for (j = 0; j < sizes.length; j++) {
+        bidParam = {
+          token: bid.params.token || '',
+          bidId: bid.bidId,
+          'banner-format-width': sizes[j][0],
+          'banner-format-height': sizes[j][1]
+        }
+        if (bid.params.bannerFormat) {
+          bidParam['banner-format'] = bid.params.bannerFormat
+        }
+        if (bid.params.language) {
+          bidParam.language = bid.params.language
+        }
+        if (bid.params.region) {
+          bidParam.region = bid.params.region
+        }
+        if (bid.params.regions && (bid.params.regions instanceof String || (bid.params.regions instanceof Array && bid.params.regions.length))) {
+          bidParam.regions = bid.params.regions
+          if (bidParam.regions instanceof Array) {
+            bidParam.regions = bidParam.regions.join(',')
+          }
+        }
+        bidParams.push(bidParam)
+      }
+    }
+
+    var ServerRequestObjects = {
+      method: SMARTICO_CONFIG.method,
+      url: SMARTICO_CONFIG.bidRequestUrl,
+      bids: validBidRequests,
+      data: {bidParams: bidParams, auctionId: bidderRequest.auctionId}
+    }
+    return ServerRequestObjects;
+  },
+  interpretResponse: function (serverResponse, bidRequest) {
+    var i
+    var bid
+    var bidObject
+    var url
+    var html
+    var ad
+    var ads
+    var token
+    var language
+    var scriptId
+    var bidResponses = []
+    ads = serverResponse.body
+    for (i = 0; i < ads.length; i++) {
+      ad = ads[i]
+      bid = find(bidRequest.bids, bid => bid.bidId === ad.bidId)
+      if (bid) {
+        token = bid.params.token || ''
+
+        language = bid.params.language || SMARTICO_CONFIG.language || ''
+
+        scriptId = encodeURIComponent('smartico-widget-' + bid.params.placementId + '-' + i)
+
+        url = SMARTICO_CONFIG.widgetUrl + '?token=' + encodeURIComponent(token) + '&auction-id=' + encodeURIComponent(bid.auctionId) + '&from-auction-buffer=1&own_session=1&ad=' + encodeURIComponent(ad.id) + '&scriptid=' + scriptId + (ad.bannerFormatAlias ? '&banner-format=' + encodeURIComponent(ad.bannerFormatAlias) : '') + (language ? '&language=' + encodeURIComponent(language) : '')
+
+        html = '<script id="' + scriptId + '" async defer type="text/javascript" src="' + url + '"><\/script>'
+
+        bidObject = {
+          requestId: bid.bidId,
+          cpm: ad.cpm,
+          width: parseInt(ad.bannerFormatWidth),
+          height: parseInt(ad.bannerFormatHeight),
+          creativeId: ad.id,
+          netRevenue: !!ad.netRevenue,
+          currency: ad.currency,
+          ttl: ad.ttl,
+          ad: html,
+          meta: {
+            advertiserDomains: ad.domains,
+            advertiserName: ad.title
+          }
+        }
+        bidResponses.push(bidObject);
+      }
+    }
+    return bidResponses;
+  }
+}
+registerBidder(spec)
diff --git a/modules/smarticoBidAdapter.md b/modules/smarticoBidAdapter.md
new file mode 100644
index 00000000000..1db9a6d59ce
--- /dev/null
+++ b/modules/smarticoBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+Module Name: Smartico Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: sk@smartico.eu
+
+# Description
+
+Module that connects to Smartico's demand sources.
+
+# Test Parameters
+
+    var adUnits = [
+        {
+            code: 'medium_rectangle',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: 'smartico',
+                    params: {
+                           placementId: 'testPlacementId', 
+                           token: "FNVzUGZn9ebpIOoheh3kEJ2GQ6H6IyMH39sHXaya"
+                    }
+                }
+            ]
+        }
+    ];
+
diff --git a/modules/smartrtbBidAdapter.js b/modules/smartrtbBidAdapter.js
deleted file mode 100644
index 12d5a0ae7da..00000000000
--- a/modules/smartrtbBidAdapter.js
+++ /dev/null
@@ -1,135 +0,0 @@
-
-import * as utils from '../src/utils.js';
-import { config } from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-const BIDDER_CODE = 'smartrtb';
-
-function getDomain () {
-  if (!utils.inIframe()) {
-    return window.location.hostname
-  }
-  let origins = window.document.location.ancestorOrigins
-  if (origins && origins.length > 0) {
-    return origins[origins.length - 1]
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [ 'banner', 'video' ],
-  aliases: ['smrtb'],
-  isBidRequestValid: function(bid) {
-    return (bid.params.pubId !== null &&
-      bid.params.medId !== null &&
-      bid.params.zoneId !== null);
-  },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    let stack = (bidderRequest.refererInfo &&
-      bidderRequest.refererInfo.stack ? bidderRequest.refererInfo
-      : [])
-
-    let spb = (config.getConfig('userSync') && config.getConfig('userSync').syncsPerBidder)
-      ? config.getConfig('userSync').syncsPerBidder : 5
-
-    const payload = {
-      start_time: utils.timestamp(),
-      language: window.navigator.userLanguage || window.navigator.language,
-      site: {
-        domain: getDomain(),
-        iframe: !bidderRequest.refererInfo.reachedTop,
-        url: stack && stack.length > 0 ? [stack.length - 1] : null,
-        https: (window.location.protocol === 'https:'),
-        referrer: bidderRequest.refererInfo.referer
-      },
-      imps: [],
-      user_ids: validBidRequests[0].userId,
-      sync_limit: spb
-    };
-
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      payload.gdpr = {
-        applies: bidderRequest.gdprConsent.gdprApplies,
-        consent: bidderRequest.gdprConsent.consentString
-      };
-    }
-
-    for (let x = 0; x < validBidRequests.length; x++) {
-      let req = validBidRequests[x]
-
-      payload.imps.push({
-        zone_id: req.params.zoneId,
-        bid_id: req.bidId,
-        imp_id: req.transactionId,
-        sizes: req.sizes,
-        force_bid: req.params.forceBid,
-        media_types: utils.deepAccess(req, 'mediaTypes'),
-        has_renderer: (req.renderer !== undefined)
-      });
-    }
-
-    let params = validBidRequests[0].params
-    let url = params.endpoint ? params.endpoint : 'https://market-global.smrtb.com/json/publisher/prebid'
-    return {
-      method: 'POST',
-      url: url,
-      data: JSON.stringify(payload)
-    };
-  },
-  interpretResponse: function(serverResponse, bidRequest) {
-    const bidResponses = [];
-    if (!serverResponse || !serverResponse.body) {
-      return bidResponses
-    }
-
-    let res = serverResponse.body;
-    if (!res.bids || !res.bids.length) {
-      return []
-    }
-
-    for (let x = 0; x < serverResponse.body.bids.length; x++) {
-      let bid = serverResponse.body.bids[x]
-
-      bidResponses.push({
-        requestId: bid.bid_id,
-        cpm: bid.cpm,
-        width: bid.w,
-        height: bid.h,
-        ad: bid.html,
-        vastUrl: bid.vast_url,
-        vastXml: bid.vast_xml,
-        mediaType: bid.html ? 'banner' : 'video',
-        ttl: 120,
-        creativeId: bid.crid,
-        dealId: bid.deal_id,
-        netRevenue: true,
-        currency: 'USD'
-      })
-    }
-
-    return bidResponses;
-  },
-  getUserSyncs: function(syncOptions, serverResponses) {
-    const syncs = []
-
-    if (!serverResponses.length || !serverResponses[0].body) {
-      return syncs
-    }
-
-    let pixels = serverResponses[0].body.pixels
-    if (!pixels || !pixels.length) {
-      return syncs
-    }
-
-    for (let x = 0; x < pixels.length; x++) {
-      let pixel = pixels[x]
-
-      if ((pixel.type === 'iframe' && syncOptions.iframeEnabled) ||
-        (pixel.type === 'image' && syncOptions.pixelEnabled)) {
-        syncs.push(pixel)
-      }
-    }
-    return syncs;
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/smartrtbBidAdapter.md b/modules/smartrtbBidAdapter.md
deleted file mode 100644
index c44903114cf..00000000000
--- a/modules/smartrtbBidAdapter.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Overview
-
-```
-Module Name: Smart RTB (smrtb.com) Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: evanm@smrtb.com
-```
-
-# Description
-
-Prebid adapter for Smart RTB. Requires approval and account setup.
-Video is supported but requires a publisher supplied adunit renderer at this time.
-
-# Test Parameters
-
-## Web
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               mediaTypes: {
-                   banner: {
-                       sizes: [[300,250]]
-                   },
-                   video: { /* requires publisher supplied renderer */
-                       context: 'outstream',
-                       playerDimension: [640, 480]
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "smartrtb",
-                       params: {
-                           zoneId: "N4zTDq3PPEHBIODv7cXK",
-                           forceBid: true
-                       }
-                   }
-               ]
-           }
-       ];
-```
diff --git a/modules/smartxBidAdapter.js b/modules/smartxBidAdapter.js
new file mode 100644
index 00000000000..452aaafb09b
--- /dev/null
+++ b/modules/smartxBidAdapter.js
@@ -0,0 +1,453 @@
+import { logError, deepAccess, isArray, getBidIdParameter, getDNT, generateUUID, isEmpty, _each, logMessage, logWarn, isFn, isPlainObject } from '../src/utils.js';
+import {
+  Renderer
+} from '../src/Renderer.js';
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import {
+  VIDEO
+} from '../src/mediaTypes.js';
+const BIDDER_CODE = 'smartx';
+const URL = 'https://bid.sxp.smartclip.net/bid/1000';
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [VIDEO],
+  /**
+   * Determines whether or not the given bid request is valid.
+   * From Prebid.js: isBidRequestValid - Verify the the AdUnits.bids, respond with true (valid) or false (invalid).
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    if (bid && typeof bid.params !== 'object') {
+      logError(BIDDER_CODE + ': params is not defined or is incorrect in the bidder settings.');
+      return false;
+    }
+    if (!deepAccess(bid, 'mediaTypes.video')) {
+      logError(BIDDER_CODE + ': mediaTypes.video is not present in the bidder settings.');
+      return false;
+    }
+    const playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
+    if (!playerSize || !isArray(playerSize)) {
+      logError(BIDDER_CODE + ': mediaTypes.video.playerSize is not defined in the bidder settings.');
+      return false;
+    }
+    if (!getBidIdParameter('tagId', bid.params)) {
+      logError(BIDDER_CODE + ': tagId is not present in bidder params');
+      return false;
+    }
+    if (!getBidIdParameter('publisherId', bid.params)) {
+      logError(BIDDER_CODE + ': publisherId is not present in bidder params');
+      return false;
+    }
+    if (!getBidIdParameter('siteId', bid.params)) {
+      logError(BIDDER_CODE + ': siteId is not present in bidder params');
+      return false;
+    }
+    if (deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
+      if (!getBidIdParameter('outstream_options', bid.params)) {
+        logError(BIDDER_CODE + ': outstream_options parameter is not defined');
+        return false;
+      }
+      if (!getBidIdParameter('slot', bid.params.outstream_options)) {
+        logError(BIDDER_CODE + ': slot parameter is not defined in outstream_options object in the configuration');
+        return false;
+      }
+    }
+
+    return true;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   * from Prebid.js: buildRequests - Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (bidRequests, bidderRequest) {
+    const page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+    const isPageSecure = !!page.match(/^https:/)
+
+    const smartxRequests = bidRequests.map(function (bid) {
+      const tagId = getBidIdParameter('tagId', bid.params);
+      const publisherId = getBidIdParameter('publisherId', bid.params);
+      const bidfloor = getBidFloor(bid) || 0;
+      const bidfloorcur = getBidIdParameter('bidfloorcur', bid.params) || 'EUR';
+      const siteId = getBidIdParameter('siteId', bid.params);
+      const domain = getBidIdParameter('domain', bid.params);
+      const cat = getBidIdParameter('cat', bid.params) || [''];
+      let pubcid = null;
+      const playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
+      const contentWidth = playerSize[0][0];
+      const contentHeight = playerSize[0][1];
+      const secure = +(isPageSecure || (getBidIdParameter('secure', bid.params) ? 1 : 0));
+      const ext = {
+        sdk_name: 'Prebid 1+'
+      };
+      const mimes = getBidIdParameter('mimes', bid.params) || ['application/javascript', 'video/mp4', 'video/webm'];
+      const linearity = getBidIdParameter('linearity', bid.params) || 1;
+      const minduration = getBidIdParameter('minduration', bid.params) || 0;
+      const maxduration = getBidIdParameter('maxduration', bid.params) || 500;
+      const startdelay = getBidIdParameter('startdelay', bid.params) || 0;
+      const minbitrate = getBidIdParameter('minbitrate', bid.params) || 0;
+      const maxbitrate = getBidIdParameter('maxbitrate', bid.params) || 3500;
+      const delivery = getBidIdParameter('delivery', bid.params) || [2];
+      const pos = getBidIdParameter('pos', bid.params) || 1;
+      const api = getBidIdParameter('api', bid.params) || [2];
+      const protocols = getBidIdParameter('protocols', bid.params) || [2, 3, 5, 6];
+      var contextcustom = deepAccess(bid, 'mediaTypes.video.context');
+      var placement = 1;
+
+      if (contextcustom === 'outstream') {
+        placement = 3;
+      }
+
+      let smartxReq = [{
+        id: bid.bidId,
+        secure: secure,
+        bidfloor: bidfloor,
+        bidfloorcur: bidfloorcur,
+        video: {
+          w: contentWidth,
+          h: contentHeight,
+          mimes: mimes,
+          linearity: linearity,
+          minduration: minduration,
+          maxduration: maxduration,
+          startdelay: startdelay,
+          protocols: protocols,
+          minbitrate: minbitrate,
+          maxbitrate: maxbitrate,
+          delivery: delivery,
+          pos: pos,
+          placement: placement,
+          api: api,
+          ext: ext
+        },
+        tagid: tagId,
+        ext: {
+          'smart.bidpricetype': 1
+        }
+      }];
+
+      if (bid.crumbs && bid.crumbs.pubcid) {
+        pubcid = bid.crumbs.pubcid;
+      }
+
+      const language = navigator.language ? 'language' : 'userLanguage';
+
+      const device = {
+        h: screen.height,
+        w: screen.width,
+        dnt: getDNT() ? 1 : 0,
+        language: navigator[language].split('-')[0],
+        make: navigator.vendor ? navigator.vendor : '',
+        ua: navigator.userAgent
+      };
+
+      const at = getBidIdParameter('at', bid.params) || 2;
+
+      const cur = getBidIdParameter('cur', bid.params) || ['EUR'];
+
+      const requestPayload = {
+        id: generateUUID(),
+        imp: smartxReq,
+        site: {
+          id: siteId,
+          page: page,
+          cat: cat,
+          domain: domain,
+          publisher: {
+            id: publisherId
+          },
+          content: {
+            ext: {
+              prebid: {
+                name: 'pbjs',
+                version: '$prebid.version$'
+              }
+            }
+          }
+        },
+        device: device,
+        at: at,
+        cur: cur,
+        ext: {}
+      };
+
+      const userExt = {};
+
+      // Add GDPR flag and consent string
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        userExt.consent = bidderRequest.gdprConsent.consentString;
+        if (typeof bidderRequest.gdprConsent.gdprApplies !== 'undefined') {
+          requestPayload.regs = {
+            ext: {
+              gdpr: (bidderRequest.gdprConsent.gdprApplies ? 1 : 0)
+            }
+          };
+        }
+      }
+
+      // Add common id if available
+      if (pubcid) {
+        userExt.fpc = pubcid;
+      }
+
+      // Add schain object if available
+      if (bid && bid.schain) {
+        requestPayload['source'] = {
+          ext: {
+            schain: bid.schain
+          }
+        };
+      }
+
+      // Only add the user object if it's not empty
+      if (!isEmpty(userExt)) {
+        requestPayload.user = {
+          ext: userExt
+        };
+      }
+
+      // Add targeting
+      if (getBidIdParameter('data', bid.params.user)) {
+        var targetingarr = [];
+        for (var i = 0; i < bid.params.user.data.length; i++) {
+          var isemq = (bid.params.user.data[i].name) || 'empty';
+          if (isemq !== 'empty') {
+            var provider = bid.params.user.data[i].name;
+            var targetingstring = (bid.params.user.data[i].segment[0].value) || 'empty';
+            targetingarr.push({
+              id: provider,
+              name: provider,
+              segment: {
+                name: provider,
+                value: targetingstring,
+              }
+            });
+          }
+        }
+
+        requestPayload.user = {
+          ext: userExt,
+          data: targetingarr
+        };
+      }
+
+      return {
+        method: 'POST',
+        url: URL,
+        data: requestPayload,
+        bidRequest: bidderRequest,
+        options: {
+          contentType: 'application/json',
+          customHeaders: {
+            'x-openrtb-version': '2.5'
+          }
+        }
+      };
+    });
+
+    return smartxRequests;
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidderRequest) {
+    const bidResponses = [];
+    const serverResponseBody = serverResponse.body;
+    if (serverResponseBody && isArray(serverResponseBody.seatbid)) {
+      _each(serverResponseBody.seatbid, function (bids) {
+        _each(bids.bid, function (smartxBid) {
+          let currentBidRequest = {};
+          for (let i in bidderRequest.bidRequest.bids) {
+            if (smartxBid.impid == bidderRequest.bidRequest.bids[i].bidId) {
+              currentBidRequest = bidderRequest.bidRequest.bids[i];
+            }
+          }
+          /**
+           * Make sure currency and price are the right ones
+           */
+          _each(currentBidRequest.params.pre_market_bids, function (pmb) {
+            if (pmb.deal_id == smartxBid.id) {
+              smartxBid.price = pmb.price;
+              serverResponseBody.cur = pmb.currency;
+            }
+          });
+
+          const bid = {
+            requestId: currentBidRequest.bidId,
+            currency: serverResponseBody.cur || 'USD',
+            cpm: smartxBid.price,
+            creativeId: smartxBid.crid || '',
+            ttl: 360,
+            netRevenue: true,
+            vastContent: smartxBid.adm,
+            vastXml: smartxBid.adm,
+            mediaType: VIDEO,
+            width: smartxBid.w,
+            height: smartxBid.h
+          };
+
+          bid.meta = bid.meta || {};
+          if (smartxBid && smartxBid.adomain && smartxBid.adomain.length > 0) {
+            bid.meta.advertiserDomains = smartxBid.adomain;
+          }
+
+          const context = deepAccess(currentBidRequest, 'mediaTypes.video.context');
+
+          if (context === 'outstream') {
+            const playersize = deepAccess(currentBidRequest, 'mediaTypes.video.playerSize');
+            const renderer = Renderer.install({
+              id: 0,
+              url: 'https://dco.smartclip.net/?plc=7777779',
+              config: {
+                adText: 'SmartX Outstream Video Ad via Prebid.js',
+                player_width: playersize[0][0],
+                player_height: playersize[0][1],
+                content_page_url: deepAccess(bidderRequest, 'data.site.page'),
+                ad_mute: +!!deepAccess(currentBidRequest, 'params.ad_mute'),
+                hide_skin: +!!deepAccess(currentBidRequest, 'params.hide_skin'),
+                outstream_options: deepAccess(currentBidRequest, 'params.outstream_options')
+              }
+            });
+            try {
+              renderer.setRender(createOutstreamConfig);
+              renderer.setEventHandlers({
+                impression: function impression() {
+                  return logMessage('SmartX outstream video impression event');
+                },
+                loaded: function loaded() {
+                  return logMessage('SmartX outstream video loaded event');
+                },
+                ended: function ended() {
+                  return logMessage('SmartX outstream renderer video event');
+                }
+              });
+            } catch (err) {
+              logWarn('Prebid Error calling setRender or setEventHandlers on renderer', err);
+            }
+            bid.renderer = renderer;
+          }
+          bidResponses.push(bid);
+        })
+      });
+    }
+    return bidResponses;
+  }
+}
+
+function createOutstreamConfig(bid) {
+  let confMinAdWidth = getBidIdParameter('minAdWidth', bid.renderer.config.outstream_options) || 290;
+  let confMaxAdWidth = getBidIdParameter('maxAdWidth', bid.renderer.config.outstream_options) || 900;
+  let confStartOpen = getBidIdParameter('startOpen', bid.renderer.config.outstream_options)
+  let confEndingScreen = getBidIdParameter('endingScreen', bid.renderer.config.outstream_options)
+  let confTitle = getBidIdParameter('title', bid.renderer.config.outstream_options);
+  let confSkipOffset = getBidIdParameter('skipOffset', bid.renderer.config.outstream_options);
+  let confDesiredBitrate = getBidIdParameter('desiredBitrate', bid.renderer.config.outstream_options);
+  let confVisibilityThreshold = getBidIdParameter('visibilityThreshold', bid.renderer.config.outstream_options);
+  let elementId = getBidIdParameter('slot', bid.renderer.config.outstream_options) || bid.adUnitCode;
+
+  logMessage('[SMARTX][renderer] Handle SmartX outstream renderer');
+
+  var playerConfig = {
+    minAdWidth: confMinAdWidth,
+    maxAdWidth: confMaxAdWidth,
+    coreSetup: {},
+    layoutSettings: {},
+    onCappedCallback: function() {
+      try {
+        window.sc_smartIntxtNoad();
+      } catch (f) {}
+    },
+  };
+
+  if (confStartOpen == 'true') {
+    playerConfig.startOpen = true;
+  } else if (confStartOpen == 'false') {
+    playerConfig.startOpen = false;
+  }
+
+  if (confEndingScreen == 'true') {
+    playerConfig.endingScreen = true;
+  } else if (confEndingScreen == 'false') {
+    playerConfig.endingScreen = false;
+  }
+
+  if (confTitle || (typeof bid.renderer.config.outstream_options.title == 'string' && bid.renderer.config.outstream_options.title == '')) {
+    playerConfig.layoutSettings.advertisingLabel = confTitle;
+  }
+
+  if (confSkipOffset) {
+    playerConfig.coreSetup.skipOffset = confSkipOffset;
+  }
+
+  if (confDesiredBitrate) {
+    playerConfig.coreSetup.desiredBitrate = confDesiredBitrate;
+  }
+
+  if (confVisibilityThreshold) {
+    playerConfig.visibilityThreshold = confVisibilityThreshold;
+  }
+
+  playerConfig.adResponse = bid.vastContent;
+
+  const divID = '[id="' + elementId + '"]';
+
+  var playerListener = function callback(event) {
+    switch (event) {
+      case 'AdSlotStarted':
+        try {
+          window.sc_smartIntxtStart();
+        } catch (f) {}
+        break;
+
+      case 'AdSlotComplete':
+        try {
+          window.sc_smartIntxtEnd();
+        } catch (f) {}
+        break;
+    }
+  };
+
+  try {
+    // eslint-disable-next-line
+    outstreamplayer.connect(divID).setup(playerConfig, playerListener)
+  } catch (e) {
+    logError('[SMARTX][renderer] Error caught: ' + e);
+  }
+  return playerConfig;
+}
+
+/**
+ * Get the floor price from bid.params for backward compatibility.
+ * If not found, then check floor module.
+ * @param bid A valid bid object
+ * @returns {*|number} floor price
+ */
+function getBidFloor(bid) {
+  let floor = getBidIdParameter('bidfloor', bid.params);
+  let floorcur = getBidIdParameter('bidfloorcur', bid.params) || 'EUR';
+
+  if (!floor && isFn(bid.getFloor)) {
+    const floorObj = bid.getFloor({
+      currency: floorcur,
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (isPlainObject(floorObj) && !isNaN(floorObj.floor) && floorObj.currency === floorcur) {
+      floor = floorObj.floor;
+    }
+  }
+
+  return floor;
+}
+
+registerBidder(spec);
diff --git a/modules/smartxBidAdapter.md b/modules/smartxBidAdapter.md
new file mode 100644
index 00000000000..853f06d6baf
--- /dev/null
+++ b/modules/smartxBidAdapter.md
@@ -0,0 +1,173 @@
+# Overview
+
+```
+Module Name: smartclip Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: adtech@smartclip.tv
+```
+
+# Description
+
+Connect to smartx for bids.
+
+This adapter requires setup and approval from the smartclip team.
+
+# Test Parameters - Use case #1 - Out-Stream example and default rendering options
+```
+    var adUnits = [{
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                context: 'outstream',
+                playerSize: [640, 360]
+            }
+        },
+        bids: [{
+            bidder: 'smartx',
+            params: {
+                tagId: 'Nu68JuOWAvrbzoyrOR9a7A',
+                publisherId: '11986',
+                siteId: '22860',
+                bidfloor: 0.3,
+                bidfloorcur: 'EUR',
+                at: 2,
+                cur: ['EUR'],
+                outstream_options: {
+                    slot: 'video1',
+                    minAdWidth: 290,
+                    maxAdWidth: 900,
+                    title: '',
+                    skipOffset: 0,
+                    startOpen: 'true',
+                    endingScreen: 'true',
+                    desiredBitrate: 800,
+                },
+            }
+        }],
+    }];
+```
+
+# Test Parameters - Use case #2 - Out-Stream with targeting example and default rendering options
+```
+    var adUnits = [{
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                context: 'outstream',
+                playerSize: [640, 360]
+            }
+        },
+        bids: [{
+            bidder: 'smartx',
+            params: {
+                tagId: 'Nu68JuOWAvrbzoyrOR9a7A',
+                publisherId: '11986',
+                siteId: '22860',
+                bidfloor: 0.3,
+                bidfloorcur: 'EUR',
+                at: 2,
+                cur: ['EUR'],
+                outstream_options: {
+                    slot: 'video1',
+                    minAdWidth: 290,
+                    maxAdWidth: 900,
+                    title: '',
+                    skipOffset: 0,
+                    startOpen: 'true',
+                    endingScreen: 'true',
+                    desiredBitrate: 800,
+                },
+                user: {
+                    data: [{
+                        id: 'emq',
+                        name: 'emq',
+                        segment: [{
+                            id: 'emq',
+                            name: 'emq',
+                            value: 'e0:k14:e24'
+                        }]
+                    }, {
+                        id: 'gs',
+                        name: 'gs',
+                        segment: [{
+                            id: 'gs',
+                            name: 'gs',
+                            value: 'tone_of_voice_dislike:tone_of_voice_negative:gs_health'
+                        }]
+                    }]
+                }
+            }
+        }]
+    }];
+```
+
+# Test Parameters - Use case #3 - In-Stream example and default rendering options
+```
+    var adUnits = [{
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                context: 'instream',
+                playerSize: [640, 360]
+            }
+        },
+        bids: [{
+            bidder: 'smartx',
+            params: {
+                tagId: 'Nu68JuOWAvrbzoyrOR9a7A',
+                publisherId: '11986',
+                siteId: '22860',
+                bidfloor: 0.3,
+                bidfloorcur: 'EUR',
+                at: 2,
+                cur: ['EUR']
+            }
+        }],
+    }];
+```
+
+# Test Parameters - Use case #4 - In-Stream with targeting example and default rendering options
+```
+    var adUnits = [{
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                context: 'instream',
+                playerSize: [640, 360]
+            }
+        },
+        bids: [{
+            bidder: 'smartx',
+            params: {
+                tagId: 'Nu68JuOWAvrbzoyrOR9a7A',
+                publisherId: '11986',
+                siteId: '22860',
+                bidfloor: 0.3,
+                bidfloorcur: 'EUR',
+                at: 2,
+                cur: ['EUR'],
+                user: {
+                    data: [{
+                            id: 'emq',
+                            name: 'emq',
+                            segment: [{
+                                id: 'emq',
+                                name: 'emq',
+                                value: 'e0:k14:e24'
+                            }]
+                        },
+                        {
+                            id: 'gs',
+                            name: 'gs',
+                            segment: [{
+                                id: 'gs',
+                                name: 'gs',
+                                value: 'tone_of_voice_dislike:tone_of_voice_negative:gs_health'
+                            }]
+                        }
+                    ]
+                }
+            }
+        }],
+    }];
+```
\ No newline at end of file
diff --git a/modules/smartyadsBidAdapter.js b/modules/smartyadsBidAdapter.js
index ff60d08e48b..e5800e7cad0 100644
--- a/modules/smartyadsBidAdapter.js
+++ b/modules/smartyadsBidAdapter.js
@@ -1,10 +1,12 @@
+import { logMessage } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'smartyads';
-const AD_URL = 'https://ssp-nj.webtradehub.com/?c=o&m=multi';
-const URL_SYNC = 'https://ssp-nj.webtradehub.com/?c=o&m=cookie';
+const AD_URL = 'https://n1.smartyads.com/?c=o&m=prebid&secret_key=prebid_js';
+const URL_SYNC = 'https://as.ck-ie.com/prebidjs?p=7c47322e527cf8bdeb7facc1bb03387a';
 
 function isBidResponseValid(bid) {
   if (!bid.requestId || !bid.cpm || !bid.creativeId ||
@@ -28,18 +30,22 @@ export const spec = {
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(bid.params.placementId));
+    return Boolean(bid.bidId && bid.params && !isNaN(bid.params.sourceid) && !isNaN(bid.params.accountid) && bid.params.host == 'prebid');
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
+    // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
     try {
-      location = new URL(bidderRequest.refererInfo.referer)
+      location = new URL(bidderRequest.refererInfo.page)
       winTop = window.top;
     } catch (e) {
       location = winTop.location;
-      utils.logMessage(e);
+      logMessage(e);
     };
     let placements = [];
     let request = {
@@ -49,6 +55,7 @@ export const spec = {
       'secure': 1,
       'host': location.host,
       'page': location.pathname,
+      'coppa': config.getConfig('coppa') === true ? 1 : 0,
       'placements': placements
     };
     request.language.indexOf('-') != -1 && (request.language = request.language.split('-')[0])
@@ -66,10 +73,11 @@ export const spec = {
       let bid = validBidRequests[i];
       let traff = bid.params.traffic || BANNER
       placements.push({
-        placementId: bid.params.placementId,
+        placementId: bid.params.sourceid,
         bidId: bid.bidId,
         sizes: bid.mediaTypes && bid.mediaTypes[traff] && bid.mediaTypes[traff].sizes ? bid.mediaTypes[traff].sizes : [],
-        traffic: traff
+        traffic: traff,
+        publisherId: bid.params.accountid
       });
       if (bid.schain) {
         placements.schain = bid.schain;
@@ -94,11 +102,23 @@ export const spec = {
     return response;
   },
 
-  getUserSyncs: (syncOptions, serverResponses) => {
-    return [{
-      type: 'image',
-      url: URL_SYNC
-    }];
+  getUserSyncs: (syncOptions, serverResponses = [], gdprConsent = {}, uspConsent = '') => {
+    let syncs = [];
+    let { gdprApplies, consentString = '' } = gdprConsent;
+
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: `${URL_SYNC}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&type=iframe&us_privacy=${uspConsent}`
+      });
+    } else {
+      syncs.push({
+        type: 'image',
+        url: `${URL_SYNC}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&type=image&us_privacy=${uspConsent}`
+      });
+    }
+
+    return syncs
   }
 
 };
diff --git a/modules/smartyadsBidAdapter.md b/modules/smartyadsBidAdapter.md
index 4fe4d51a2e6..f078d905e62 100644
--- a/modules/smartyadsBidAdapter.md
+++ b/modules/smartyadsBidAdapter.md
@@ -23,7 +23,9 @@ Module that connects to SmartyAds' demand sources
                         {
                             bidder: 'smartyads',
                             params: {
-                                placementId: 0,
+                                host: 'prebid',
+                                sourceid: '0',
+                                accountid: '0',
                                 traffic: 'native'
                             }
                         }
@@ -41,7 +43,9 @@ Module that connects to SmartyAds' demand sources
                         {
                             bidder: 'smartyads',
                             params: {
-                                placementId: 0,
+                              host: 'prebid',
+                                sourceid: '0',
+                                accountid: '0',
                                 traffic: 'banner'
                             }
                         }
@@ -60,7 +64,9 @@ Module that connects to SmartyAds' demand sources
                         {
                             bidder: 'smartyads',
                             params: {
-                                placementId: 0,
+                              host: 'prebid',
+                                sourceid: '0',
+                                accountid: '0',
                                 traffic: 'video'
                             }
                         }
diff --git a/modules/smartytechBidAdapter.js b/modules/smartytechBidAdapter.js
new file mode 100644
index 00000000000..231ca315de8
--- /dev/null
+++ b/modules/smartytechBidAdapter.js
@@ -0,0 +1,78 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {buildUrl} from '../src/utils.js'
+
+const BIDDER_CODE = 'smartytech';
+export const ENDPOINT_PROTOCOL = 'https';
+export const ENDPOINT_DOMAIN = 'server.smartytech.io';
+export const ENDPOINT_PATH = '/hb/bidder';
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  isBidRequestValid: function (bidRequest) {
+    return !!parseInt(bidRequest.params.endpointId);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const referer = bidderRequest?.refererInfo?.page || window.location.href;
+
+    const bidRequests = validBidRequests.map((validBidRequest) => {
+      return {
+        endpointId: validBidRequest.params.endpointId,
+        adUnitCode: validBidRequest.adUnitCode,
+        sizes: validBidRequest.sizes,
+        bidId: validBidRequest.bidId,
+        referer: referer
+      };
+    });
+
+    let adPartnerRequestUrl = buildUrl({
+      protocol: ENDPOINT_PROTOCOL,
+      hostname: ENDPOINT_DOMAIN,
+      pathname: ENDPOINT_PATH,
+    });
+
+    return {
+      method: 'POST',
+      url: adPartnerRequestUrl,
+      data: bidRequests
+    };
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (typeof serverResponse.body === 'undefined') {
+      return [];
+    }
+
+    const validBids = bidRequest.data;
+    const keys = Object.keys(serverResponse.body)
+    const responseBody = serverResponse.body;
+
+    return keys.filter(key => {
+      return responseBody[key].ad
+    }).map(key => {
+      return {
+        bid: validBids.find(b => b.adUnitCode === key),
+        response: responseBody[key]
+      }
+    }).map(item => spec.adResponse(item.bid.bidId, item.response));
+  },
+
+  adResponse: function (requestId, response) {
+    const bidObject = {
+      requestId,
+      ad: response.ad,
+      cpm: response.cpm,
+      width: response.width,
+      height: response.height,
+      ttl: 60,
+      creativeId: response.creativeId,
+      netRevenue: true,
+      currency: response.currency,
+    }
+    return bidObject;
+  },
+
+}
+
+registerBidder(spec);
diff --git a/modules/smartytechBidAdapter.md b/modules/smartytechBidAdapter.md
new file mode 100644
index 00000000000..dbfc2833c78
--- /dev/null
+++ b/modules/smartytechBidAdapter.md
@@ -0,0 +1,44 @@
+# Overview
+
+Module Name: SmartyTech Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: info@adpartner.pro
+
+# Description
+
+You can use this adapter to get a bid from smartytech.io.
+
+About us : https://smartytech.io
+
+# Test Parameters
+
+```javascript
+    var adUnits = [
+    {
+        code: 'div-smartytech-example',
+        sizes: [[300, 250]],
+        bids: [
+            {
+                bidder: "smartytech",
+                params: {
+                    endpointId: 14
+                }
+            }
+        ]
+    },
+    {
+        code: 'div-smartytech-example-2',
+        sizes: [[300, 250]],
+        bids: [
+            {
+                bidder: "smartytech",
+                params: {
+                    endpointId: 14
+                }
+            }
+        ]
+    }
+];
+```
diff --git a/modules/smilewantedBidAdapter.js b/modules/smilewantedBidAdapter.js
index f965310abdd..f82e7c9258f 100644
--- a/modules/smilewantedBidAdapter.js
+++ b/modules/smilewantedBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { isArray, logError, logWarn, isFn, isPlainObject } from '../src/utils.js';
 import { Renderer } from '../src/Renderer.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
@@ -29,7 +29,6 @@ export const spec = {
       var payload = {
         zoneId: bid.params.zoneId,
         currencyCode: config.getConfig('currency.adServerCurrency') || 'EUR',
-        bidfloor: bid.params.bidfloor || 0.0,
         tagId: bid.adUnitCode,
         sizes: bid.sizes.map(size => ({
           w: size[0],
@@ -38,11 +37,26 @@ export const spec = {
         transactionId: bid.transactionId,
         timeout: config.getConfig('bidderTimeout'),
         bidId: bid.bidId,
+        /** positionType is undocumented
+        It is unclear what this parameter means.
+        If it means the same as pos in openRTB,
+        It should read from openRTB object
+        or from mediaTypes.banner.pos */
+        positionType: bid.params.positionType || '',
         prebidVersion: '$prebid.version$'
       };
 
+      const floor = getBidFloor(bid);
+      if (floor) {
+        payload.bidfloor = floor;
+      }
+
+      if (bid.params.bidfloor) {
+        payload.bidfloor = bid.params.bidfloor;
+      }
+
       if (bidderRequest && bidderRequest.refererInfo) {
-        payload.pageDomain = bidderRequest.refererInfo.referer || '';
+        payload.pageDomain = bidderRequest.refererInfo.page || '';
       }
 
       if (bidderRequest && bidderRequest.gdprConsent) {
@@ -70,6 +84,7 @@ export const spec = {
 
     try {
       if (response) {
+        const dealId = response.dealId || '';
         const bidResponse = {
           requestId: JSON.parse(bidRequest.data).bidId,
           cpm: response.cpm,
@@ -93,10 +108,18 @@ export const spec = {
           bidResponse['renderer'] = newRenderer(JSON.parse(bidRequest.data), response);
         }
 
+        if (dealId.length > 0) {
+          bidResponse.dealId = dealId;
+        }
+
+        bidResponse.meta = {};
+        if (response.meta && response.meta.advertiserDomains && isArray(response.meta.advertiserDomains)) {
+          bidResponse.meta.advertiserDomains = response.meta.advertiserDomains;
+        }
         bidResponses.push(bidResponse);
       }
     } catch (error) {
-      utils.logError('Error while parsing smilewanted response', error);
+      logError('Error while parsing smilewanted response', error);
     }
     return bidResponses;
   },
@@ -108,16 +131,31 @@ export const spec = {
    * @param {*} serverResponses A successful response from the server.
    * @return {Syncs[]} An array of syncs that should be executed.
    */
-  getUserSyncs: function(syncOptions, serverResponses) {
-    const syncs = []
-    if (syncOptions.iframeEnabled && serverResponses.length > 0) {
-      if (serverResponses[0].body.cSyncUrl === 'https://csync.smilewanted.com') {
-        syncs.push({
-          type: 'iframe',
-          url: serverResponses[0].body.cSyncUrl
-        });
+  getUserSyncs: function(syncOptions, responses, gdprConsent, uspConsent) {
+    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 (uspConsent) {
+      params += `${params ? '&' : '?'}us_privacy=${encodeURIComponent(uspConsent)}`;
+    }
+
+    const syncs = []
+
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: 'https://csync.smilewanted.com' + params
+      });
+    }
+
     return syncs;
   }
 }
@@ -137,7 +175,7 @@ function newRenderer(bidRequest, bidResponse) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on newRenderer', err);
+    logWarn('Prebid Error calling setRender on newRenderer', err);
   }
   return renderer;
 }
@@ -157,4 +195,24 @@ function outstreamRender(bid) {
   });
 }
 
+/**
+ * Get the floor price from bid.params for backward compatibility.
+ * If not found, then check floor module.
+ * @param bid A valid bid object
+ * @returns {*|number} floor price
+ */
+function getBidFloor(bid) {
+  if (isFn(bid.getFloor)) {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: 'banner',
+      size: bid.sizes.map(size => ({ w: size[0], h: size[1] }))
+    });
+    if (isPlainObject(floorInfo) && !isNaN(floorInfo.floor) && floorInfo.currency === 'USD') {
+      return parseFloat(floorInfo.floor);
+    }
+  }
+  return null;
+}
+
 registerBidder(spec);
diff --git a/modules/smmsBidAdapter.js b/modules/smmsBidAdapter.js
deleted file mode 100644
index 670caebe61b..00000000000
--- a/modules/smmsBidAdapter.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'smms';
-const ENDPOINT_BANNER = 'https://bidder.mediams.mb.softbank.jp/api/v1/prebid/banner';
-const ENDPOINT_NATIVE = 'https://bidder.mediams.mb.softbank.jp/api/v1/prebid/native';
-const COOKIE_SYNC_URL = 'https://bidder.mediams.mb.softbank.jp/api/v1/cookie/gen';
-const SUPPORTED_MEDIA_TYPES = ['banner', 'native'];
-const SUPPORTED_CURRENCIES = ['USD', 'JPY'];
-const DEFAULT_CURRENCY = 'JPY';
-const NET_REVENUE = true;
-
-function _encodeURIComponent(a) {
-  let b = window.encodeURIComponent(a);
-  b = b.replace(/'/g, '%27');
-  return b;
-}
-
-export function _getUrlVars(url) {
-  let hash;
-  const myJson = {};
-  const hashes = url.slice(url.indexOf('?') + 1).split('&');
-  for (let i = 0; i < hashes.length; i++) {
-    hash = hashes[i].split('=');
-    myJson[hash[0]] = hash[1];
-  }
-  return myJson;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
-  isBidRequestValid: function(bid) {
-    let valid = !!(bid.params.placementId);
-    if (valid && bid.params.hasOwnProperty('currency')) {
-      if (SUPPORTED_CURRENCIES.indexOf(bid.params.currency) === -1) {
-        utils.logError('Invalid currency type, we support only JPY and USD!');
-        valid = false;
-      }
-    }
-
-    return valid;
-  },
-  /**
-    * Make a server request from the list of BidRequests.
-    *
-    * @param {validBidRequests[]} - an array of bids
-    * @return ServerRequest Info describing the request to the server.
-    */
-  buildRequests: function(validBidRequests, bidderRequest) {
-    const serverRequests = [];
-    let refererInfo;
-    if (bidderRequest && bidderRequest.refererInfo) {
-      refererInfo = bidderRequest.refererInfo;
-    }
-
-    // eslint-disable-next-line no-undef
-    const g = (typeof (geparams) !== 'undefined' && typeof (geparams) == 'object' && geparams) ? geparams : {};
-    validBidRequests.forEach((bid, i) => {
-      let endpoint = ENDPOINT_BANNER;
-      let data = {
-        'placementid': bid.params.placementId,
-        'cur': bid.params.hasOwnProperty('currency') ? bid.params.currency : DEFAULT_CURRENCY,
-        'ua': navigator.userAgent,
-        'adtk': _encodeURIComponent(g.lat ? '0' : '1'),
-        'loc': (refererInfo && refererInfo.referer) ? refererInfo.referer : '',
-        'topframe': (window.parent == window.self) ? 1 : 0,
-        'sw': screen && screen.width,
-        'sh': screen && screen.height,
-        'cb': Math.floor(Math.random() * 99999999999),
-        'tpaf': 1,
-        'cks': 1,
-        'requestid': bid.bidId,
-        'referer': (refererInfo && refererInfo.referer) ? refererInfo.referer : ''
-      };
-
-      if (bid.hasOwnProperty('nativeParams')) {
-        endpoint = ENDPOINT_NATIVE;
-        data.tkf = 1; // return url tracker
-        data.ad_track = '1';
-        data.apiv = '1.1.0';
-      }
-
-      serverRequests.push({
-        method: 'GET',
-        url: endpoint,
-        data: utils.parseQueryStringParameters(data)
-      });
-    });
-
-    return serverRequests;
-  },
-  interpretResponse: function(serverResponse, request) {
-    const data = _getUrlVars(request.data)
-    const successBid = serverResponse.body || {};
-    let bidResponses = [];
-    if (successBid.hasOwnProperty(data.placementid)) {
-      let bid = successBid[data.placementid]
-      let bidResponse = {
-        requestId: bid.requestid,
-        cpm: bid.price,
-        creativeId: bid.creativeId,
-        currency: bid.cur,
-        netRevenue: NET_REVENUE,
-        ttl: 700
-      };
-
-      if (bid.hasOwnProperty('title')) { // it is native ad response
-        bidResponse.mediaType = 'native'
-        bidResponse.native = {
-          title: bid.title,
-          body: bid.description,
-          cta: bid.cta,
-          sponsoredBy: bid.advertiser,
-          clickUrl: _encodeURIComponent(bid.landingURL),
-          impressionTrackers: bid.trackings,
-        }
-        if (bid.screenshots) {
-          bidResponse.native.image = {
-            url: bid.screenshots.url,
-            height: bid.screenshots.height,
-            width: bid.screenshots.width,
-          }
-        }
-        if (bid.icon) {
-          bidResponse.native.icon = {
-            url: bid.icon.url,
-            height: bid.icon.height,
-            width: bid.icon.width,
-          }
-        }
-      } else {
-        bidResponse.ad = bid.adm
-        bidResponse.width = bid.width
-        bidResponse.height = bid.height
-      }
-
-      bidResponses.push(bidResponse);
-    }
-
-    return bidResponses;
-  },
-  getUserSyncs: function(syncOptions, serverResponses) {
-    let syncs = []
-    syncs.push({
-      type: 'image',
-      url: COOKIE_SYNC_URL
-    })
-
-    return syncs;
-  },
-  onTimeout: function(timeoutData) {},
-  onBidWon: function(bid) {},
-  onSetTargeting: function(bid) {}
-}
-registerBidder(spec);
diff --git a/modules/smmsBidAdapter.md b/modules/smmsBidAdapter.md
deleted file mode 100644
index f1d6e233f96..00000000000
--- a/modules/smmsBidAdapter.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Overview
-
-Module Name: SMMS Bid Adapter
-
-Maintainer: SBBGRP-SSP-PMP@g.softbank.co.jp
-
-# Description
-
-Module that connects to softbank's demand sources
-
-# Test Parameters
-
-```javascript
-	var adUnits = [
-    {
-      code: 'test',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300,600]],
-        }
-      },
-      bids: [
-        {
-          bidder: 'smms',
-          params: {
-            placementId: 1440837,
-            currency: 'USD'
-          }
-        }
-      ]
-    },
-    {
-      code: 'test',
-      mediaTypes: {
-        native: {
-          title: {
-            required: true,
-            len: 80
-          },
-          image: {
-            required: true,
-            sizes: [150, 50]
-          },
-          sponsoredBy: {
-            required: true
-          }
-        }
-      },
-      bids: [
-        {
-          bidder: 'smms',
-          params: {
-            placementId: 1440838,
-            currency: 'USD'
-          }
-        },
-      ],
-    }
-  ];
-```
diff --git a/modules/smnBidAdapter.md b/modules/smnBidAdapter.md
new file mode 100644
index 00000000000..c9cb777e743
--- /dev/null
+++ b/modules/smnBidAdapter.md
@@ -0,0 +1,52 @@
+# Overview
+
+Module Name: SMN Bidder Adapter  
+Module Type: Bidder Adapter  
+Maintainer: smnoffice.belgrade@gmail.com
+
+# Description
+
+Connects to SMN demand source to fetch bids.  
+Banner and Video formats are supported.  
+Please use ```smn``` as the bidder code.  
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+               code: 'desktop-banner-ad-div',
+               sizes: [[300, 250]],  // a display size
+               bids: [
+                   {
+                       bidder: "smn",
+                       params: {
+                           zone: '2eb6bd58-865c-47ce-af7f-a918108c3fd2'
+                       }
+                   }
+               ]
+           },{
+               code: 'mobile-banner-ad-div',
+               sizes: [[300, 50]],   // a mobile size
+               bids: [
+                   {
+                       bidder: "smn",
+                       params: {
+                           zone: '62211486-c50b-4356-9f0f-411778d31fcc'
+                       }
+                   }
+               ]
+           },{
+               code: 'video-ad',
+               sizes: [[300, 50]],
+               mediaType: 'video',
+               bids: [
+                   {
+                       bidder: "smn",
+                       params: {
+                           zone: 'ebeb1e79-8cb4-4473-b2d0-2e24b7ff47fd'
+                       }
+                   }
+               ]
+           },
+       ];
+```
diff --git a/modules/snigelBidAdapter.js b/modules/snigelBidAdapter.js
new file mode 100644
index 00000000000..e0ec10c6ed6
--- /dev/null
+++ b/modules/snigelBidAdapter.js
@@ -0,0 +1,150 @@
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {deepAccess, isArray, isFn, isPlainObject} from '../src/utils.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+
+const BIDDER_CODE = 'snigel';
+const GVLID = 1076;
+const DEFAULT_URL = 'https://adserv.snigelweb.com/bp/v1/prebid';
+const DEFAULT_TTL = 60;
+const DEFAULT_CURRENCIES = ['USD'];
+const FLOOR_MATCH_ALL_SIZES = '*';
+
+const getConfig = config.getConfig;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bidRequest) {
+    return !!bidRequest.params.placement;
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
+    return {
+      method: 'POST',
+      url: getEndpoint(),
+      data: JSON.stringify({
+        id: bidderRequest.bidderRequestId,
+        cur: getCurrencies(),
+        test: getTestFlag(),
+        devw: window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth,
+        devh: window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight,
+        version: $$PREBID_GLOBAL$$.version,
+        gdprApplies: gdprApplies,
+        gdprConsentString: gdprApplies === true ? deepAccess(bidderRequest, 'gdprConsent.consentString') : undefined,
+        gdprConsentProv: gdprApplies === true ? deepAccess(bidderRequest, 'gdprConsent.addtlConsent') : undefined,
+        uspConsent: deepAccess(bidderRequest, 'uspConsent'),
+        coppa: getConfig('coppa'),
+        eids: deepAccess(bidRequests, '0.userIdAsEids'),
+        schain: deepAccess(bidRequests, '0.schain'),
+        page: getPage(bidderRequest),
+        placements: bidRequests.map((r) => {
+          return {
+            uuid: r.bidId,
+            name: r.params.placement,
+            sizes: r.sizes,
+            floor: getPriceFloor(r, BANNER, FLOOR_MATCH_ALL_SIZES),
+          };
+        }),
+      }),
+      bidderRequest,
+    };
+  },
+
+  interpretResponse: function (serverResponse) {
+    if (!serverResponse.body || !serverResponse.body.bids) {
+      return [];
+    }
+
+    return serverResponse.body.bids.map((bid) => {
+      return {
+        requestId: bid.uuid,
+        cpm: bid.price,
+        creativeId: bid.crid,
+        currency: serverResponse.body.cur,
+        width: bid.width,
+        height: bid.height,
+        ad: bid.ad,
+        netRevenue: true,
+        ttl: bid.ttl || DEFAULT_TTL,
+        meta: bid.meta,
+      };
+    });
+  },
+
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+    const syncUrl = getSyncUrl(responses || []);
+    if (syncUrl && syncOptions.iframeEnabled && hasSyncConsent(gdprConsent, uspConsent)) {
+      return [{type: 'iframe', url: getSyncEndpoint(syncUrl, gdprConsent)}];
+    }
+  },
+};
+
+registerBidder(spec);
+
+function getPage(bidderRequest) {
+  return (
+    getConfig(`${BIDDER_CODE}.page`) || deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || window.location.href
+  );
+}
+
+function getEndpoint() {
+  return getConfig(`${BIDDER_CODE}.url`) || DEFAULT_URL;
+}
+
+function getTestFlag() {
+  return getConfig(`${BIDDER_CODE}.test`) === true;
+}
+
+function getCurrencies() {
+  const currencyOverrides = getConfig(`${BIDDER_CODE}.cur`);
+  if (currencyOverrides !== undefined && (!isArray(currencyOverrides) || currencyOverrides.length === 0)) {
+    throw Error('Currency override must be an array with at least one currency');
+  }
+  return currencyOverrides || DEFAULT_CURRENCIES;
+}
+
+function getFloorCurrency() {
+  return getConfig(`${BIDDER_CODE}.floorCur`) || getCurrencies()[0];
+}
+
+function getPriceFloor(bidRequest, mediaType, size) {
+  if (isFn(bidRequest.getFloor)) {
+    const cur = getFloorCurrency();
+    const floorInfo = bidRequest.getFloor({
+      currency: cur,
+      mediaType: mediaType,
+      size: size,
+    });
+    if (isPlainObject(floorInfo) && !isNaN(floorInfo.floor)) {
+      return {
+        cur: floorInfo.currency || cur,
+        value: floorInfo.floor,
+      };
+    }
+  }
+}
+
+function hasSyncConsent(gdprConsent, uspConsent) {
+  if (gdprConsent?.gdprApplies && !hasPurpose1Consent(gdprConsent)) {
+    return false;
+  } else if (uspConsent && uspConsent[1] === 'Y' && uspConsent[2] === 'Y') {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+function getSyncUrl(responses) {
+  return getConfig(`${BIDDER_CODE}.syncUrl`) || deepAccess(responses[0], 'body.syncUrl');
+}
+
+function getSyncEndpoint(url, gdprConsent) {
+  return `${url}?gdpr=${gdprConsent?.gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(
+    gdprConsent?.consentString || ''
+  )}`;
+}
diff --git a/modules/snigelBidAdapter.md b/modules/snigelBidAdapter.md
new file mode 100644
index 00000000000..a83e133144f
--- /dev/null
+++ b/modules/snigelBidAdapter.md
@@ -0,0 +1,46 @@
+# Overview
+
+- Module name: Snigel Bid Adapter
+- Module type: Bidder Adapter
+- Maintainer: devops@snigel.com
+- Bidder code: snigel
+- Supported media types: Banner
+
+# Description
+
+Connects to Snigel demand sources for bids.
+
+**Note:** This bid adapter requires our ad operation experts to create an optimized setup for the desired placements on your property.
+Please reach out to us [through our contact form](https://snigel.com/get-in-touch). We will reply as soon as possible.
+
+# Parameters
+
+| Name | Required | Description | Example |
+| :--- | :-------- | :---------- | :------ |
+| placement | Yes | Placement identifier | top_leaderboard |
+
+# Test
+
+```js
+var adUnits = [
+  {
+    code: "example",
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [970, 90],
+          [728, 90],
+        ],
+      },
+    },
+    bids: [
+      {
+        bidder: "snigel",
+        params: {
+          placement: "prebid_test_placement",
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/modules/somoBidAdapter.js b/modules/somoBidAdapter.js
deleted file mode 100644
index c6e31790005..00000000000
--- a/modules/somoBidAdapter.js
+++ /dev/null
@@ -1,289 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-
-const VIDEO_TARGETING = ['mimes', 'minduration', 'maxduration', 'protocols',
-  'startdelay', 'linearity', 'skip', 'delivery',
-  'pos', 'api', 'ext', 'battr'];
-const BANNER_TARGETING = ['battr', 'btype', 'pos', 'mimes', 'ext'];
-
-const SITE_TARGETING = ['name', 'domain', 'cat', 'keywords', 'content']
-const APP_TARGETING = ['name', 'bundle', 'domain', 'storeUrl', 'cat', 'ver', 'keywords', 'content']
-
-export const spec = {
-
-  code: 'somo',
-
-  supportedMediaTypes: [BANNER, VIDEO],
-  aliases: ['somoaudience'],
-
-  isBidRequestValid: bid => (
-    !!(bid && bid.params && bid.params.placementId)
-  ),
-
-  buildRequests: function(bidRequests, bidderRequest) {
-    return bidRequests.map(bidRequest => {
-      let da = openRtbRequest(bidRequest, bidderRequest);
-
-      return {
-        method: 'POST',
-        url: 'https://publisher-east.mobileadtrading.com/rtb/bid?s=' + bidRequest.params.placementId.toString(),
-        data: da,
-        bidRequest: bidRequest
-      };
-    });
-  },
-
-  interpretResponse(response, request) {
-    return bidResponseAvailable(request, response);
-  },
-
-  getUserSyncs: (syncOptions, serverResponses, gdprConsent) => {
-    const syncs = [];
-    var url = 'https://publisher-east.mobileadtrading.com/usersync';
-
-    if (syncOptions.pixelEnabled) {
-      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
-        // add 'gdpr' only if 'gdprApplies' is defined
-        if (typeof gdprConsent.gdprApplies === 'boolean') {
-          url += `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-        }
-      }
-      syncs.push({
-        type: 'image',
-        url: url
-      });
-    }
-    return syncs;
-  }
-};
-
-function bidResponseAvailable(bidRequest, bidResponse) {
-  let bidResponses = [];
-
-  if (bidResponse.body) {
-    let bidData = bidResponse.body.seatbid[0].bid[0];
-    const bid = {
-      requestId: bidResponse.body.id,
-      cpm: bidData.price,
-      width: bidData.w,
-      height: bidData.h,
-      ad: bidData.adm,
-      ttl: 360,
-      creativeId: bidData.crid,
-      adId: bidData.impid,
-      netRevenue: false,
-      currency: 'USD',
-      adUnitCode: bidRequest.bidRequest.adUnitCode
-    };
-    if (isVideo(bidRequest.bidRequest)) {
-      bid.vastXml = bidData.adm;
-      bid.mediaType = 'video';
-    } else {
-      bid.ad = bidData.adm;
-      bid.mediaType = 'banner';
-    }
-    bidResponses.push(bid);
-  }
-  return bidResponses;
-}
-
-function openRtbRequest(bidRequest, bidderRequest) {
-  var openRtbRequest = {
-    id: bidRequest.bidId,
-    imp: [openRtbImpression(bidRequest)],
-    at: 1,
-    tmax: 400,
-    site: openRtbSite(bidRequest, bidderRequest),
-    app: openRtbApp(bidRequest),
-    device: openRtbDevice(),
-    bcat: openRtbBCat(bidRequest),
-    badv: openRtbBAdv(bidRequest),
-    ext: {
-      prebid: '$prebid.version$',
-    },
-  };
-  if (typeof bidderRequest !== 'undefined') {
-    openRtbRequest = populateOpenRtbGdpr(bidderRequest.gdprConsent, openRtbRequest);
-  }
-
-  return openRtbRequest;
-}
-
-function populateOpenRtbGdpr(gdpr, bidRequest) {
-  if (gdpr && bidRequest && 'gdprApplies' in gdpr) {
-    if (!('reqs' in bidRequest)) {
-      bidRequest.reqs = {};
-    }
-    if (!('ext' in bidRequest.reqs)) {
-      bidRequest.reqs.ext = {};
-    }
-    bidRequest.reqs.ext.gdpr = gdpr.gdprApplies;
-
-    if ('consentString' in gdpr) {
-      if (!('user' in bidRequest)) {
-        bidRequest.user = {};
-      }
-      if (!('ext' in bidRequest.user)) {
-        bidRequest.user.ext = {};
-      }
-      bidRequest.user.ext.consent = gdpr.consentString;
-    }
-  }
-
-  return bidRequest;
-}
-
-function openRtbImpression(bidRequest) {
-  const imp = {
-    'id': bidRequest.bidId,
-    bidfloor: bidRequest.params.bidfloor || 0,
-  };
-  if (isVideo(bidRequest)) {
-    imp.video = {};
-    if (bidRequest.mediaTypes &&
-            bidRequest.mediaTypes.video &&
-            bidRequest.mediaTypes.video.sizes) {
-      const sizes = getSizes(bidRequest.mediaTypes.video.sizes);
-      imp.video.w = sizes[0];
-      imp.video.h = sizes[1];
-    }
-    if (bidRequest.params.video) {
-      Object.keys(bidRequest.params.video)
-        .filter(param => includes(VIDEO_TARGETING, param))
-        .forEach(param => imp.video[param] = bidRequest.params.video[param]);
-    }
-  } else {
-    imp.banner = {
-      topframe: 0
-    };
-    if (bidRequest.mediaTypes &&
-            bidRequest.mediaTypes.banner &&
-            bidRequest.mediaTypes.banner.sizes) {
-      const sizes = getSizes(bidRequest.mediaTypes.banner.sizes);
-      imp.banner.w = sizes[0];
-      imp.banner.h = sizes[1];
-    }
-    if (bidRequest.params.banner) {
-      Object.keys(bidRequest.params.banner)
-        .filter(param => includes(BANNER_TARGETING, param))
-        .forEach(param => imp.banner[param] = bidRequest.params.banner[param]);
-    }
-  }
-  return imp;
-}
-
-function isApp(bidRequest) {
-  if (bidRequest.params.app) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function openRtbSite(bidRequest, bidderRequest) {
-  if (!isApp(bidRequest)) {
-    const site = {};
-
-    if (bidderRequest && bidderRequest.refererInfo) {
-      site.ref = bidderRequest.refererInfo.referer;
-      site.page = bidderRequest.refererInfo.canonicalUrl;
-    }
-
-    if (bidRequest.params.site) {
-      Object.keys(bidRequest.params.site)
-        .filter(param => includes(SITE_TARGETING, param))
-        .forEach(param => site[param] = bidRequest.params.site[param]);
-    }
-    if (typeof site.domain === 'undefined' &&
-            typeof site.page !== 'undefined') {
-      if (typeof window.URL === 'function') {
-        site.domain = (new window.URL(site.page)).hostname;
-      } else {
-        site.domain = getDomainFromUrl(site.page);
-      }
-    }
-
-    return site;
-  } else {
-    return null;
-  }
-}
-
-function getDomainFromUrl(url) {
-  var domain = url;
-
-  if (url.indexOf('//') > -1) {
-    domain = url.split('/')[2];
-  } else {
-    domain = url.split('/')[0];
-  }
-
-  domain = domain.split(':')[0];
-  domain = domain.split('?')[0];
-
-  return domain;
-}
-
-function openRtbApp(bidRequest) {
-  if (isApp(bidRequest)) {
-    const app = {
-
-    }
-    Object.keys(bidRequest.params.app)
-      .filter(param => includes(APP_TARGETING, param))
-      .forEach(param => app[param] = bidRequest.params.app[param]);
-
-    return app;
-  } else {
-    return null;
-  }
-}
-
-function openRtbDevice() {
-  return {
-    ip: 'check',
-    ua: navigator.userAgent,
-    language: (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage),
-  };
-}
-
-function openRtbBCat(bidRequest) {
-  if (utils.isArray(bidRequest.params.bcat)) {
-    return bidRequest.params.bcat;
-  }
-  return [];
-}
-
-function openRtbBAdv(bidRequest) {
-  if (utils.isArray(bidRequest.params.badv)) {
-    return bidRequest.params.badv;
-  }
-  return [];
-}
-
-function isVideo(format) {
-  return utils.deepAccess(format, 'mediaTypes.video') || format.mediaType == 'video';
-}
-
-/* Turn bid request sizes into compatible format */
-function getSizes(requestSizes) {
-  let width = 0;
-  let height = 0;
-  if (utils.isArray(requestSizes) && requestSizes.length === 2 &&
-    !utils.isArray(requestSizes[0])) {
-    width = parseInt(requestSizes[0], 10);
-    height = parseInt(requestSizes[1], 10);
-  } else if (typeof requestSizes === 'object') {
-    for (let i = 0; i < requestSizes.length; i++) {
-      let size = requestSizes[i];
-      width = parseInt(size[0], 10);
-      height = parseInt(size[1], 10);
-      break;
-    }
-  }
-  return [width, height];
-}
-
-registerBidder(spec);
diff --git a/modules/somoBidAdapter.md b/modules/somoBidAdapter.md
deleted file mode 100644
index e8457fc0ca2..00000000000
--- a/modules/somoBidAdapter.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Overview
-
-**Module Name**: Somo Audience Bidder Adapter  
-**Module Type**: Bidder Adapter  
-**Maintainer**: prebid@somoaudience.com
-# Description
-Connects to Somo Audience demand source.  
-Please use ```somo``` as the bidder code.  
-
-For video integration, Somo Audience returns content as vastXML and requires the publisher to define the cache url in config passed to Prebid for it to be valid in the auction
-# Test Site Parameters
-```
-    var adUnits = [{
-      code: 'banner-ad-div',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250]]
-        }
-      },
-      bids: [{
-          bidder: 'somo',
-          params: {
-              placementId: '22a58cfb0c9b656bff713d1236e930e8'
-          }
-      }]
-    }];
-```
-# Test App Parameters
-```
-var adUnits = [{
-  code: 'banner-ad-div',
-  mediaTypes: {
-    banner: {
-      sizes: [[300, 250]]
-    }
-  },
-  bids: [{
-      bidder: 'somo',
-      params: {
-          placementId: '22a58cfb0c9b656bff713d1236e930e8',
-          app: {
-            bundle: 'com.somoaudience.apps',
-            storeUrl: 'http://somoaudience.com/apps',
-            domain: 'somoaudience.com',
-          }
-      }
-  }]
-}];
-```
diff --git a/modules/sonobiAnalyticsAdapter.js b/modules/sonobiAnalyticsAdapter.js
index d69276e915c..0057944b201 100644
--- a/modules/sonobiAnalyticsAdapter.js
+++ b/modules/sonobiAnalyticsAdapter.js
@@ -1,9 +1,9 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import { deepClone, logInfo, logError } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {ajaxBuilder} from '../src/ajax.js';
 
-const utils = require('../src/utils.js');
 let ajax = ajaxBuilder(0);
 
 const DEFAULT_EVENT_URL = 'apex.go.sonobi.com/keymaker';
@@ -91,7 +91,7 @@ function addToAuctionQueue(auctionId, id) {
     if (item.bidid !== id) { return true; }
     return auction.stats[id].data.p !== item.p;
   });
-  auction.queue.push(utils.deepClone(auction.stats[id].data));
+  auction.queue.push(deepClone(auction.stats[id].data));
   if (!auction.qTimeout) {
     auction.qTimeout = setTimeout(() => {
       sendQueue(auctionId);
@@ -102,18 +102,18 @@ function updateBidStats(auctionId, id, data) {
   let auction = auctionCache[auctionId];
   auction.stats[id].data = {...auction.stats[id].data, ...data};
   addToAuctionQueue(auctionId, id);
-  logInfo('Updated Bid Stats: ', auction.stats[id]);
+  _logInfo('Updated Bid Stats: ', auction.stats[id]);
   return auction.stats[id];
 }
 
 function handleOtherEvents(eventType, args) {
-  logInfo('Other Event: ' + eventType, args);
+  _logInfo('Other Event: ' + eventType, args);
 }
 
 function handlerAuctionInit(args) {
   auctionCache[args.auctionId] = buildAuctionEntity(args);
   deleteOldAuctions();
-  logInfo('Auction Init', args);
+  _logInfo('Auction Init', args);
 }
 function handlerBidRequested(args) {
   let auction = auctionCache[args.auctionId];
@@ -127,14 +127,14 @@ function handlerBidRequested(args) {
     addToAuctionQueue(args.auctionId, built.bidid);
   })
 
-  logInfo('Bids Requested ', data);
+  _logInfo('Bids Requested ', data);
 }
 
 function handlerBidAdjustment(args) {
-  logInfo('Bid Adjustment', args);
+  _logInfo('Bid Adjustment', args);
 }
 function handlerBidderDone(args) {
-  logInfo('Bidder Done', args);
+  _logInfo('Bidder Done', args);
 }
 
 function handlerAuctionEnd(args) {
@@ -152,24 +152,24 @@ function handlerAuctionEnd(args) {
       updateBidStats(args.auctionId, bidId, {response: 4});
     }
   })
-  logInfo('Auction End', args);
-  logInfo('Auction Cache', auctionCache[args.auctionId].stats);
+  _logInfo('Auction End', args);
+  _logInfo('Auction Cache', auctionCache[args.auctionId].stats);
 }
 function handlerBidWon(args) {
   let {auctionId, requestId} = args;
   let res = updateBidStats(auctionId, requestId, {p: 3, response: 6});
-  logInfo('Bid Won ', args);
-  logInfo('Bid Update Result: ', res);
+  _logInfo('Bid Won ', args);
+  _logInfo('Bid Update Result: ', res);
 }
 function handlerBidResponse(args) {
   let {auctionId, requestId, cpm, size, timeToRespond} = args;
   updateBidStats(auctionId, requestId, {bid: cpm, s: size, jsLatency: timeToRespond, latency: timeToRespond, p: 2, response: 9});
 
-  logInfo('Bid Response ', args);
+  _logInfo('Bid Response ', args);
 }
 function handlerBidTimeout(args) {
   let {auctionId, bidId} = args;
-  logInfo('Bid Timeout ', args);
+  _logInfo('Bid Timeout ', args);
   updateBidStats(auctionId, bidId, {p: 2, response: 0, latency: args.timeout, jsLatency: args.timeout});
 }
 let sonobiAdapter = Object.assign(adapter({url: DEFAULT_EVENT_URL, analyticsType}), {
@@ -211,7 +211,7 @@ sonobiAdapter.originEnableAnalytics = sonobiAdapter.enableAnalytics;
 
 sonobiAdapter.enableAnalytics = function (config) {
   if (this.initConfig(config)) {
-    logInfo('Analytics adapter enabled', initOptions);
+    _logInfo('Analytics adapter enabled', initOptions);
     sonobiAdapter.originEnableAnalytics(config);
   }
 };
@@ -219,17 +219,17 @@ sonobiAdapter.enableAnalytics = function (config) {
 sonobiAdapter.initConfig = function (config) {
   let isCorrectConfig = true;
   initOptions = {};
-  initOptions.options = utils.deepClone(config.options);
+  initOptions.options = deepClone(config.options);
 
   initOptions.pubId = initOptions.options.pubId || null;
   initOptions.siteId = initOptions.options.siteId || null;
   initOptions.delay = initOptions.options.delay || QUEUE_TIMEOUT_DEFAULT;
   if (!initOptions.pubId) {
-    logError('"options.pubId" is empty');
+    _logError('"options.pubId" is empty');
     isCorrectConfig = false;
   }
   if (!initOptions.siteId) {
-    logError('"options.siteId" is empty');
+    _logError('"options.siteId" is empty');
     isCorrectConfig = false;
   }
 
@@ -247,7 +247,7 @@ sonobiAdapter.sendData = function (auction, data) {
   let url = 'https://' + initOptions.server + '?pageviewid=' + auction.id + '&corscred=1&pubId=' + initOptions.pubId + '&siteId=' + initOptions.siteId;
   ajax(
     url,
-    function () { logInfo('Auction [' + auction.id + '] sent ', data); },
+    function () { _logInfo('Auction [' + auction.id + '] sent ', data); },
     JSON.stringify(data),
     {
       method: 'POST',
@@ -255,14 +255,14 @@ sonobiAdapter.sendData = function (auction, data) {
       contentType: 'text/plain'
     }
   );
-}
+};
 
-function logInfo(message, meta) {
-  utils.logInfo(buildLogMessage(message), meta);
+function _logInfo(message, meta) {
+  logInfo(buildLogMessage(message), meta);
 }
 
-function logError(message) {
-  utils.logError(buildLogMessage(message));
+function _logError(message) {
+  logError(buildLogMessage(message));
 }
 
 function buildLogMessage(message) {
diff --git a/modules/sonobiBidAdapter.js b/modules/sonobiBidAdapter.js
index ee201a72bf2..294fb2e4fbc 100644
--- a/modules/sonobiBidAdapter.js
+++ b/modules/sonobiBidAdapter.js
@@ -1,18 +1,17 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { parseSizesInput, logError, generateUUID, isEmpty, deepAccess, logWarn, logMessage } from '../src/utils.js';
+import { parseSizesInput, logError, generateUUID, isEmpty, deepAccess, logWarn, logMessage, deepClone, getGptSlotInfoForAdUnitCode, isFn, isPlainObject } from '../src/utils.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { userSync } from '../src/userSync.js';
-
 const BIDDER_CODE = 'sonobi';
 const STR_ENDPOINT = 'https://apex.go.sonobi.com/trinity.json';
 const PAGEVIEW_ID = generateUUID();
-const SONOBI_DIGITRUST_KEY = 'fhnS5drwmH';
 const OUTSTREAM_REDNERER_URL = 'https://mtrx.go.sonobi.com/sbi_outstream_renderer.js';
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 104,
   supportedMediaTypes: [BANNER, VIDEO],
   /**
    * Determines whether or not the given bid request is valid.
@@ -58,15 +57,23 @@ export const spec = {
    */
   buildRequests: (validBidRequests, bidderRequest) => {
     const bids = validBidRequests.map(bid => {
+      let mediaType;
+
+      if (deepAccess(bid, 'mediaTypes.video')) {
+        mediaType = 'video';
+      } else if (deepAccess(bid, 'mediaTypes.banner')) {
+        mediaType = 'display';
+      }
+
       let slotIdentifier = _validateSlot(bid);
       if (/^[\/]?[\d]+[[\/].+[\/]?]?$/.test(slotIdentifier)) {
         slotIdentifier = slotIdentifier.charAt(0) === '/' ? slotIdentifier : '/' + slotIdentifier;
         return {
-          [`${slotIdentifier}|${bid.bidId}`]: `${_validateSize(bid)}${_validateFloor(bid)}`
+          [`${slotIdentifier}|${bid.bidId}`]: `${_validateSize(bid)}|${_validateFloor(bid)}${_validateGPID(bid)}${_validateMediaType(mediaType)}`
         }
       } else if (/^[0-9a-fA-F]{20}$/.test(slotIdentifier) && slotIdentifier.length === 20) {
         return {
-          [bid.bidId]: `${slotIdentifier}|${_validateSize(bid)}${_validateFloor(bid)}`
+          [bid.bidId]: `${slotIdentifier}|${_validateSize(bid)}|${_validateFloor(bid)}${_validateGPID(bid)}${_validateMediaType(mediaType)}`
         }
       } else {
         logError(`The ad unit code or Sonobi Placement id for slot ${bid.bidId} is invalid`);
@@ -78,7 +85,9 @@ export const spec = {
 
     const payload = {
       'key_maker': JSON.stringify(data),
-      'ref': bidderRequest.refererInfo.referer,
+      video_options: _getVideoOptions(validBidRequests),
+      // TODO: is 'page' the right value here?
+      'ref': bidderRequest.refererInfo.page,
       's': generateUUID(),
       'pv': PAGEVIEW_ID,
       'vp': _getPlatform(),
@@ -87,6 +96,12 @@ export const spec = {
       'us': 0,
     };
 
+    const fpd = bidderRequest.ortb2;
+
+    if (fpd) {
+      payload.fpd = JSON.stringify(fpd);
+    }
+
     if (config.getConfig('userSync') && config.getConfig('userSync').syncsPerBidder) {
       payload.us = config.getConfig('userSync').syncsPerBidder;
     }
@@ -114,18 +129,22 @@ export const spec = {
       }
     }
 
-    const digitrust = _getDigiTrustObject(SONOBI_DIGITRUST_KEY);
-
-    if (digitrust) {
-      payload.digid = digitrust.id;
-      payload.digkeyv = digitrust.keyv;
-    }
-
     if (validBidRequests[0].schain) {
-      payload.schain = JSON.stringify(validBidRequests[0].schain)
+      payload.schain = JSON.stringify(validBidRequests[0].schain);
     }
     if (deepAccess(validBidRequests[0], 'userId') && Object.keys(validBidRequests[0].userId).length > 0) {
-      payload.userid = JSON.stringify(validBidRequests[0].userId);
+      const userIds = deepClone(validBidRequests[0].userId);
+
+      if (userIds.id5id) {
+        userIds.id5id = deepAccess(userIds, 'id5id.uid');
+      }
+
+      payload.userid = JSON.stringify(userIds);
+    }
+
+    const eids = deepAccess(validBidRequests[0], 'userIdAsEids');
+    if (Array.isArray(eids) && eids.length > 0) {
+      payload.eids = JSON.stringify(eids);
     }
 
     let keywords = validBidRequests[0].params.keywords; // a CSV of keywords
@@ -138,6 +157,12 @@ export const spec = {
       payload.us_privacy = bidderRequest.uspConsent;
     }
 
+    if (config.getConfig('coppa') === true) {
+      payload.coppa = 1;
+    } else {
+      payload.coppa = 0;
+    }
+
     // If there is no key_maker data, then don't make the request.
     if (isEmpty(data)) {
       return null;
@@ -191,6 +216,10 @@ export const spec = {
           width = 1,
           height = 1
         ] = bid.sbi_size.split('x');
+        let aDomains = [];
+        if (bid.sbi_adomain) {
+          aDomains = [bid.sbi_adomain];
+        }
         const bids = {
           requestId: bidId,
           cpm: Number(bid.sbi_mouse),
@@ -201,7 +230,10 @@ export const spec = {
           creativeId: bid.sbi_crid || bid.sbi_aid,
           aid: bid.sbi_aid,
           netRevenue: true,
-          currency: 'USD'
+          currency: 'USD',
+          meta: {
+            advertiserDomains: aDomains
+          }
         };
 
         if (bid.sbi_dozer) {
@@ -215,6 +247,7 @@ export const spec = {
           delete bids.width;
           delete bids.height;
         } else if (mediaType === 'outstream' && bidRequest) {
+          delete bids.ad; // Some pubs expect bids.ad to be a vast xml structure, we have a vatUrl so lets delete this.
           bids.mediaType = 'video';
           bids.vastUrl = createCreative(bidResponse.sbi_dc, bid.sbi_aid);
           bids.renderer = newRenderer(bidRequest.adUnitCode, bids, deepAccess(
@@ -223,7 +256,7 @@ export const spec = {
           ));
           let videoSize = deepAccess(bidRequest, 'params.sizes');
           if (Array.isArray(videoSize) && Array.isArray(videoSize[0])) { // handle case of multiple sizes
-            videoSize = videoSize[0] // Only take the first size for outstream
+            videoSize = videoSize[0]; // Only take the first size for outstream
           }
           if (videoSize) {
             bids.width = videoSize[0];
@@ -249,7 +282,7 @@ export const spec = {
           });
         });
       }
-    } catch (e) {}
+    } catch (e) { }
     return syncs;
   }
 };
@@ -262,38 +295,67 @@ function _findBidderRequest(bidderRequests, bidId) {
   }
 }
 
-function _validateSize (bid) {
-  if (deepAccess(bid, 'mediaTypes.video')) {
-    return ''; // Video bids arent allowed to override sizes via the trinity request
+// This function takes all the possible sizes
+// returns string csv
+function _validateSize(bid) {
+  let size = [];
+  if (deepAccess(bid, 'mediaTypes.video.playerSize')) {
+    size.push(deepAccess(bid, 'mediaTypes.video.playerSize'))
   }
-
-  if (bid.params.sizes) {
-    return parseSizesInput(bid.params.sizes).join(',');
+  if (deepAccess(bid, 'mediaTypes.video.sizes')) {
+    size.push(deepAccess(bid, 'mediaTypes.video.sizes'))
+  }
+  if (deepAccess(bid, 'params.sizes')) {
+    size.push(deepAccess(bid, 'params.sizes'));
   }
   if (deepAccess(bid, 'mediaTypes.banner.sizes')) {
-    return parseSizesInput(deepAccess(bid, 'mediaTypes.banner.sizes')).join(',');
+    size.push(deepAccess(bid, 'mediaTypes.banner.sizes'))
   }
-
-  // Handle deprecated sizes definition
-  if (bid.sizes) {
-    return parseSizesInput(bid.sizes).join(',');
+  if (deepAccess(bid, 'sizes')) {
+    size.push(deepAccess(bid, 'sizes'))
   }
+  // Pass the 2d sizes array into parseSizeInput to flatten it into an array of x separated sizes.
+  // Then throw it into Set to uniquify it.
+  // Spread it to an array again. Then join it into a csv of sizes
+  return [...new Set(parseSizesInput(...size))].join(',');
 }
 
-function _validateSlot (bid) {
+function _validateSlot(bid) {
   if (bid.params.ad_unit) {
     return bid.params.ad_unit;
   }
   return bid.params.placement_id;
 }
 
-function _validateFloor (bid) {
-  if (bid.params.floor) {
-    return `|f=${bid.params.floor}`;
+function _validateFloor(bid) {
+  const floor = getBidFloor(bid);
+
+  if (floor) {
+    return `f=${floor},`;
   }
   return '';
 }
 
+function _validateGPID(bid) {
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot') || deepAccess(getGptSlotInfoForAdUnitCode(bid.adUnitCode), 'gptSlot') || bid.params.ad_unit;
+
+  if (gpid) {
+    return `gpid=${gpid},`
+  }
+  return ''
+}
+
+function _validateMediaType(mediaType) {
+  let mediaTypeValidation = '';
+  if (mediaType === 'video') {
+    mediaTypeValidation = 'c=v,';
+  } else if (mediaType === 'display') {
+    mediaTypeValidation = 'c=d,';
+  }
+
+  return mediaTypeValidation;
+}
+
 const _creative = (mediaType, referer) => (sbiDc, sbiAid) => {
   if (mediaType === 'video' || mediaType === 'outstream') {
     return _videoCreative(sbiDc, sbiAid, referer)
@@ -306,7 +368,7 @@ function _videoCreative(sbiDc, sbiAid, referer) {
   return `https://${sbiDc}apex.go.sonobi.com/vast.xml?vid=${sbiAid}&ref=${encodeURIComponent(referer)}`
 }
 
-function _getBidIdFromTrinityKey (key) {
+function _getBidIdFromTrinityKey(key) {
   return key.split('|').slice(-1)[0]
 }
 
@@ -336,18 +398,13 @@ export function _getPlatform(context = window) {
   return 'desktop';
 }
 
-// https://github.com/digi-trust/dt-cdn/wiki/Integration-Guide
-function _getDigiTrustObject(key) {
-  function getDigiTrustId() {
-    let digiTrustUser = window.DigiTrust && (config.getConfig('digiTrustId') || window.DigiTrust.getUser({member: key}));
-    return (digiTrustUser && digiTrustUser.success && digiTrustUser.identity) || null;
-  }
-  let digiTrustId = getDigiTrustId();
-  // Verify there is an ID and this user has not opted out
-  if (!digiTrustId || (digiTrustId.privacy && digiTrustId.privacy.optout)) {
-    return null;
-  }
-  return digiTrustId;
+function _getVideoOptions(bids) {
+  const videoOptions = bids.map(bid => {
+    if (deepAccess(bid, 'mediaTypes.video')) {
+      return deepAccess(bid, 'mediaTypes.video');
+    }
+  })
+  return JSON.stringify(videoOptions);
 }
 
 function newRenderer(adUnitCode, bid, rendererOptions = {}) {
@@ -397,4 +454,21 @@ function _iframeAllowed() {
   return userSync.canBidderRegisterSync('iframe', BIDDER_CODE);
 }
 
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.floor) ? bid.params.floor : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return '';
+}
+
 registerBidder(spec);
diff --git a/modules/sortableAnalyticsAdapter.js b/modules/sortableAnalyticsAdapter.js
deleted file mode 100644
index 73ce1393c23..00000000000
--- a/modules/sortableAnalyticsAdapter.js
+++ /dev/null
@@ -1,534 +0,0 @@
-import adapter from '../src/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
-import adapterManager from '../src/adapterManager.js';
-import * as utils from '../src/utils.js';
-import {ajax} from '../src/ajax.js';
-import {getGlobal} from '../src/prebidGlobal.js';
-import { config } from '../src/config.js';
-
-const DEFAULT_PROTOCOL = 'https';
-const DEFAULT_HOST = 'pa.deployads.com';
-const DEFAULT_URL = `${DEFAULT_PROTOCOL}://${DEFAULT_HOST}/pae`;
-const ANALYTICS_TYPE = 'endpoint';
-const UTM_STORE_KEY = 'sortable_utm';
-
-export const DEFAULT_PBID_TIMEOUT = 1000;
-export const TIMEOUT_FOR_REGISTRY = 250;
-
-const settings = {};
-const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    BID_REQUESTED,
-    BID_ADJUSTMENT,
-    BID_WON,
-    BID_TIMEOUT,
-  }
-} = CONSTANTS;
-
-const minsToMillis = mins => mins * 60 * 1000;
-const UTM_TTL = minsToMillis(30);
-
-const SORTABLE_EVENTS = {
-  BID_WON: 'pbrw',
-  BID_TIMEOUT: 'pbto',
-  ERROR: 'pber',
-  PB_BID: 'pbid'
-};
-
-const UTM_PARAMS = [
-  'utm_campaign',
-  'utm_source',
-  'utm_medium',
-  'utm_content',
-  'utm_term'
-];
-
-const EVENT_KEYS_SHORT_NAMES = {
-  'auctionId': 'ai',
-  'adUnitCode': 'ac',
-  'adId': 'adi',
-  'bidderAlias': 'bs',
-  'bidFactor': 'bif',
-  'bidId': 'bid',
-  'bidRequestCount': 'brc',
-  'bidderRequestId': 'brid',
-  'bidRequestedSizes': 'rs',
-  'bidTopCpm': 'btcp',
-  'bidTopCpmCurrency': 'btcc',
-  'bidTopIsNetRevenue': 'btin',
-  'bidTopFactor': 'btif',
-  'bidTopSrc': 'btsrc',
-  'cpm': 'c',
-  'currency': 'cc',
-  'dealId': 'did',
-  'isNetRevenue': 'inr',
-  'isTop': 'it',
-  'isWinner': 'iw',
-  'isTimeout': 'ito',
-  'mediaType': 'mt',
-  'reachedTop': 'rtp',
-  'numIframes': 'nif',
-  'size': 'siz',
-  'start': 'st',
-  'tagId': 'tgid',
-  'transactionId': 'trid',
-  'ttl': 'ttl',
-  'ttr': 'ttr',
-  'url': 'u',
-  'utm_campaign': 'uc',
-  'utm_source': 'us',
-  'utm_medium': 'um',
-  'utm_content': 'un',
-  'utm_term': 'ut'
-};
-
-const auctionCache = {};
-
-let bidderFactors = null;
-
-let timeoutId = null;
-let eventsToBeSent = [];
-
-function getStorage() {
-  try {
-    return window['sessionStorage'];
-  } catch (e) {
-    return null;
-  }
-}
-
-function putParams(k, v) {
-  try {
-    const storage = getStorage();
-    if (!storage) {
-      return false;
-    }
-    if (v === null) {
-      storage.removeItem(k);
-    } else {
-      storage.setItem(k, JSON.stringify(v));
-    }
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-function getParams(k) {
-  try {
-    let storage = getStorage();
-    if (!storage) {
-      return null;
-    }
-    let value = storage.getItem(k);
-    return value === null ? null : JSON.parse(value);
-  } catch (e) {
-    return null;
-  }
-}
-
-function storeParams(key, paramsToSave) {
-  if (!settings.disableSessionTracking) {
-    for (let property in paramsToSave) {
-      if (paramsToSave.hasOwnProperty(property)) {
-        putParams(key, paramsToSave);
-        break;
-      }
-    }
-  }
-}
-
-function getSiteKey(options) {
-  const sortableConfig = config.getConfig('sortable') || {};
-  const globalSiteId = sortableConfig.siteId;
-  return globalSiteId || options.siteId;
-}
-
-function generateRandomId() {
-  let s = (+new Date()).toString(36);
-  for (let i = 0; i < 6; ++i) { s += (Math.random() * 36 | 0).toString(36); }
-  return s;
-}
-
-function getSessionParams() {
-  const stillValid = paramsFromStorage => (paramsFromStorage.created) < (+new Date() + UTM_TTL);
-  let sessionParams = null;
-  if (!settings.disableSessionTracking) {
-    const paramsFromStorage = getParams(UTM_STORE_KEY);
-    sessionParams = paramsFromStorage && stillValid(paramsFromStorage) ? paramsFromStorage : null;
-  }
-  sessionParams = sessionParams || {'created': +new Date(), 'sessionId': generateRandomId()};
-  const urlParams = UTM_PARAMS.map(utils.getParameterByName);
-  if (UTM_PARAMS.every(key => !sessionParams[key])) {
-    UTM_PARAMS.forEach((v, i) => sessionParams[v] = urlParams[i] || sessionParams[v]);
-    sessionParams.created = +new Date();
-    storeParams(UTM_STORE_KEY, sessionParams);
-  }
-  return sessionParams;
-}
-
-function getPrebidVersion() {
-  return getGlobal().version;
-}
-
-function getFactor(bidder) {
-  if (bidder && bidder.bidCpmAdjustment) {
-    return bidder.bidCpmAdjustment(1.0);
-  } else {
-    return null;
-  }
-}
-
-function getBiddersFactors() {
-  const pb = getGlobal();
-  const result = {};
-  if (pb && pb.bidderSettings) {
-    Object.keys(pb.bidderSettings).forEach(bidderKey => {
-      const bidder = pb.bidderSettings[bidderKey];
-      const factor = getFactor(bidder);
-      if (factor !== null) {
-        result[bidderKey] = factor;
-      }
-    });
-  }
-  return result;
-}
-
-function getBaseEvent(auctionId, adUnitCode, bidderCode) {
-  const event = {};
-  event.s = settings.key;
-  event.ai = auctionId;
-  event.ac = adUnitCode;
-  event.bs = bidderCode;
-  return event;
-}
-
-function getBidBaseEvent(auctionId, adUnitCode, bidderCode) {
-  const sessionParams = getSessionParams();
-  const prebidVersion = getPrebidVersion();
-  const event = getBaseEvent(auctionId, adUnitCode, bidderCode);
-  event.sid = sessionParams.sessionId;
-  event.pv = settings.pageviewId;
-  event.to = auctionCache[auctionId].timeout;
-  event.pbv = prebidVersion;
-  UTM_PARAMS.filter(k => sessionParams[k]).forEach(k => event[EVENT_KEYS_SHORT_NAMES[k]] = sessionParams[k]);
-  return event;
-}
-
-function createPBBidEvent(bid) {
-  const event = getBidBaseEvent(bid.auctionId, bid.adUnitCode, bid.bidderAlias);
-  Object.keys(bid).forEach(k => {
-    const shortName = EVENT_KEYS_SHORT_NAMES[k];
-    if (shortName) {
-      event[shortName] = bid[k];
-    }
-  });
-  event._type = SORTABLE_EVENTS.PB_BID;
-  return event;
-}
-
-function getBidFactor(bidderAlias) {
-  if (!bidderFactors) {
-    bidderFactors = getBiddersFactors();
-  }
-  const factor = bidderFactors[bidderAlias];
-  return typeof factor !== 'undefined' ? factor : 1.0;
-}
-
-function createPrebidBidWonEvent({auctionId, adUnitCode, bidderAlias, cpm, currency, isNetRevenue}) {
-  const bidFactor = getBidFactor(bidderAlias);
-  const event = getBaseEvent(auctionId, adUnitCode, bidderAlias);
-  event.bif = bidFactor;
-  bidderFactors = null;
-  event.c = cpm;
-  event.cc = currency;
-  event.inr = isNetRevenue;
-  event._type = SORTABLE_EVENTS.BID_WON;
-  return event;
-}
-
-function createPrebidTimeoutEvent({auctionId, adUnitCode, bidderAlias}) {
-  const event = getBaseEvent(auctionId, adUnitCode, bidderAlias);
-  event._type = SORTABLE_EVENTS.BID_TIMEOUT;
-  return event;
-}
-
-function getDistinct(arr) {
-  return arr.filter((v, i, a) => a.indexOf(v) === i);
-}
-
-function groupBy(list, keyGetterFn) {
-  const map = {};
-  list.forEach(item => {
-    const key = keyGetterFn(item);
-    map[key] = map[key] ? map[key].concat(item) : [item];
-  });
-  return map;
-}
-
-function mergeAndCompressEventsByType(events, type) {
-  if (!events.length) {
-    return {};
-  }
-  const allKeys = getDistinct(events.map(ev => Object.keys(ev)).reduce((prev, curr) => prev.concat(curr), []));
-  const eventsAsMap = {};
-  allKeys.forEach(k => {
-    events.forEach(ev => eventsAsMap[k] = eventsAsMap[k] ? eventsAsMap[k].concat(ev[k]) : [ev[k]]);
-  });
-  const allSame = arr => arr.every(el => arr[0] === el);
-  Object.keys(eventsAsMap)
-    .forEach(k => eventsAsMap[k] = (eventsAsMap[k].length && allSame(eventsAsMap[k])) ? eventsAsMap[k][0] : eventsAsMap[k]);
-  eventsAsMap._count = events.length;
-  const result = {};
-  result[type] = eventsAsMap;
-  return result;
-}
-
-function mergeAndCompressEvents(events) {
-  const types = getDistinct(events.map(e => e._type));
-  const groupedEvents = groupBy(events, e => e._type);
-  const results = types.map(t => groupedEvents[t])
-    .map(events => mergeAndCompressEventsByType(events, events[0]._type));
-  return results.reduce((prev, eventMap) => {
-    const key = Object.keys(eventMap)[0];
-    prev[key] = eventMap[key];
-    return prev;
-  }, {});
-}
-
-function registerEvents(events) {
-  eventsToBeSent = eventsToBeSent.concat(events);
-  if (!timeoutId) {
-    timeoutId = setTimeout(() => {
-      const _eventsToBeSent = eventsToBeSent.slice();
-      eventsToBeSent = [];
-      sendEvents(_eventsToBeSent);
-      timeoutId = null;
-    }, TIMEOUT_FOR_REGISTRY);
-  }
-}
-
-function sendEvents(events) {
-  const url = settings.url;
-  const mergedEvents = mergeAndCompressEvents(events);
-  const options = {
-    'contentType': 'text/plain',
-    'method': 'POST',
-    'withCredentials': true
-  };
-  const onSend = () => utils.logInfo('Sortable Analytics data sent');
-  ajax(url, onSend, JSON.stringify(mergedEvents), options);
-}
-
-// converts [[300, 250], [728, 90]] to '300x250,728x90'
-function sizesToString(sizes) {
-  return sizes.map(s => s.join('x')).join(',');
-}
-
-function dimsToSizeString(width, height) {
-  return `${width}x${height}`;
-}
-
-function handleBidRequested(event) {
-  const refererInfo = event.refererInfo;
-  const url = refererInfo.referer;
-  const reachedTop = refererInfo.reachedTop;
-  const numIframes = refererInfo.numIframes;
-  event.bids.forEach(bid => {
-    const auctionId = bid.auctionId;
-    const adUnitCode = bid.adUnitCode;
-    const tagId = bid.bidder === 'sortable' ? bid.params.tagId : '';
-    if (!auctionCache[auctionId].adUnits[adUnitCode]) {
-      auctionCache[auctionId].adUnits[adUnitCode] = {bids: {}};
-    }
-    const adUnit = auctionCache[auctionId].adUnits[adUnitCode];
-    const bids = adUnit.bids;
-    const newBid = {
-      adUnitCode: bid.adUnitCode,
-      auctionId: event.auctionId,
-      bidderAlias: bid.bidder,
-      bidId: bid.bidId,
-      bidderRequestId: bid.bidderRequestId,
-      bidRequestCount: bid.bidRequestsCount,
-      bidRequestedSizes: sizesToString(bid.sizes),
-      currency: bid.currency,
-      cpm: 0.0,
-      isTimeout: false,
-      isTop: false,
-      isWinner: false,
-      numIframes: numIframes,
-      start: event.start,
-      tagId: tagId,
-      transactionId: bid.transactionId,
-      reachedTop: reachedTop,
-      url: encodeURI(url)
-    };
-    bids[newBid.bidderAlias] = newBid;
-  });
-}
-
-function handleBidAdjustment(event) {
-  const auctionId = event.auctionId;
-  const adUnitCode = event.adUnitCode;
-  const adUnit = auctionCache[auctionId].adUnits[adUnitCode];
-  const bid = adUnit.bids[event.bidderCode];
-  const bidFactor = getBidFactor(event.bidderCode);
-  bid.adId = event.adId;
-  bid.adUnitCode = event.adUnitCode;
-  bid.auctionId = event.auctionId;
-  bid.bidderAlias = event.bidderCode;
-  bid.bidFactor = bidFactor;
-  bid.cpm = event.cpm;
-  bid.currency = event.currency;
-  bid.dealId = event.dealId;
-  bid.isNetRevenue = event.netRevenue;
-  bid.mediaType = event.mediaType;
-  bid.responseTimestamp = event.responseTimestamp;
-  bid.size = dimsToSizeString(event.width, event.height);
-  bid.ttl = event.ttl;
-  bid.ttr = event.timeToRespond;
-}
-
-function handleBidWon(event) {
-  const auctionId = event.auctionId;
-  const auction = auctionCache[auctionId];
-  if (auction) {
-    const adUnitCode = event.adUnitCode;
-    const adUnit = auction.adUnits[adUnitCode];
-    Object.keys(adUnit.bids).forEach(bidderCode => {
-      const bidFromUnit = adUnit.bids[bidderCode];
-      bidFromUnit.isWinner = event.bidderCode === bidderCode;
-    });
-  } else {
-    const ev = createPrebidBidWonEvent({
-      adUnitCode: event.adUnitCode,
-      auctionId: event.auctionId,
-      bidderAlias: event.bidderCode,
-      currency: event.currency,
-      cpm: event.cpm,
-      isNetRevenue: event.netRevenue,
-    });
-    registerEvents([ev]);
-  }
-}
-
-function handleBidTimeout(event) {
-  event.forEach(timeout => {
-    const auctionId = timeout.auctionId;
-    const adUnitCode = timeout.adUnitCode;
-    const bidderAlias = timeout.bidder;
-    const auction = auctionCache[auctionId];
-    if (auction) {
-      const adUnit = auction.adUnits[adUnitCode];
-      const bid = adUnit.bids[bidderAlias];
-      bid.isTimeout = true;
-    } else {
-      const prebidTimeoutEvent = createPrebidTimeoutEvent({auctionId, adUnitCode, bidderAlias});
-      registerEvents([prebidTimeoutEvent]);
-    }
-  });
-}
-
-function handleAuctionInit(event) {
-  const auctionId = event.auctionId;
-  const timeout = event.timeout;
-  auctionCache[auctionId] = {timeout: timeout, auctionId: auctionId, adUnits: {}};
-}
-
-function handleAuctionEnd(event) {
-  const auction = auctionCache[event.auctionId];
-  const adUnits = auction.adUnits;
-  setTimeout(() => {
-    const events = Object.keys(adUnits).map(adUnitCode => {
-      const bidderKeys = Object.keys(auction.adUnits[adUnitCode].bids);
-      const bids = bidderKeys.map(bidderCode => auction.adUnits[adUnitCode].bids[bidderCode]);
-      const highestBid = bids.length ? bids.reduce(utils.getOldestHighestCpmBid) : null;
-      return bidderKeys.map(bidderCode => {
-        const bid = auction.adUnits[adUnitCode].bids[bidderCode];
-        if (highestBid && highestBid.cpm) {
-          bid.isTop = highestBid.bidderAlias === bid.bidderAlias;
-          bid.bidTopFactor = getBidFactor(highestBid.bidderAlias);
-          bid.bidTopCpm = highestBid.cpm;
-          bid.bidTopCpmCurrency = highestBid.currency;
-          bid.bidTopIsNetRevenue = highestBid.isNetRevenue;
-          bid.bidTopSrc = highestBid.bidderAlias;
-        }
-        return createPBBidEvent(bid);
-      });
-    }).reduce((prev, curr) => prev.concat(curr), []);
-    bidderFactors = null;
-    sendEvents(events);
-    delete auctionCache[event.auctionId];
-  }, settings.timeoutForPbid);
-}
-
-function handleError(eventType, event, e) {
-  const ev = {};
-  ev.s = settings.key;
-  ev.ti = eventType;
-  ev.args = JSON.stringify(event);
-  ev.msg = e.message;
-  ev._type = SORTABLE_EVENTS.ERROR;
-  registerEvents([ev]);
-}
-
-const sortableAnalyticsAdapter = Object.assign(adapter({url: DEFAULT_URL, ANALYTICS_TYPE}), {
-  track({eventType, args}) {
-    try {
-      switch (eventType) {
-        case AUCTION_INIT:
-          handleAuctionInit(args);
-          break;
-        case AUCTION_END:
-          handleAuctionEnd(args);
-          break;
-        case BID_REQUESTED:
-          handleBidRequested(args);
-          break;
-        case BID_ADJUSTMENT:
-          handleBidAdjustment(args);
-          break;
-        case BID_WON:
-          handleBidWon(args);
-          break;
-        case BID_TIMEOUT:
-          handleBidTimeout(args);
-          break;
-      }
-    } catch (e) {
-      handleError(eventType, args, e);
-    }
-  }
-});
-
-sortableAnalyticsAdapter.originEnableAnalytics = sortableAnalyticsAdapter.enableAnalytics;
-
-sortableAnalyticsAdapter.enableAnalytics = function (setupConfig) {
-  if (this.initConfig(setupConfig)) {
-    utils.logInfo('Sortable Analytics adapter enabled');
-    sortableAnalyticsAdapter.originEnableAnalytics(setupConfig);
-  }
-};
-
-sortableAnalyticsAdapter.initConfig = function (setupConfig) {
-  settings.disableSessionTracking = setupConfig.disableSessionTracking === undefined ? false : setupConfig.disableSessionTracking;
-  settings.key = getSiteKey(setupConfig.options);
-  settings.protocol = setupConfig.options.protocol || DEFAULT_PROTOCOL;
-  settings.url = `${settings.protocol}://${setupConfig.options.eventHost || DEFAULT_HOST}/pae/${settings.key}`;
-  settings.pageviewId = generateRandomId();
-  settings.timeoutForPbid = setupConfig.timeoutForPbid ? Math.max(setupConfig.timeoutForPbid, 0) : DEFAULT_PBID_TIMEOUT;
-  return !!settings.key;
-};
-
-sortableAnalyticsAdapter.getOptions = function () {
-  return settings;
-};
-
-adapterManager.registerAnalyticsAdapter({
-  adapter: sortableAnalyticsAdapter,
-  code: 'sortable'
-});
-
-export default sortableAnalyticsAdapter;
diff --git a/modules/sortableAnalyticsAdapter.md b/modules/sortableAnalyticsAdapter.md
deleted file mode 100644
index a4aa8019031..00000000000
--- a/modules/sortableAnalyticsAdapter.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Overview
-
-Module Name: Sortable Analytics Adapter
-Module Type: Analytics Adapter
-Maintainer: prebid@sortable.com
-
-# Description
-
-Analytics adapter for Sortable. Contact prebid@sortable.com for information.
diff --git a/modules/sortableBidAdapter.js b/modules/sortableBidAdapter.js
deleted file mode 100644
index f5d3a6b1bb5..00000000000
--- a/modules/sortableBidAdapter.js
+++ /dev/null
@@ -1,342 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { config } from '../src/config.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'sortable';
-const SERVER_URL = 'https://c.deployads.com';
-
-function setAssetRequired(native, asset) {
-  if (native.required) {
-    asset.required = 1;
-  }
-  return asset;
-}
-
-function buildNativeRequest(nativeMediaType) {
-  const assets = [];
-  const title = nativeMediaType.title;
-  if (title) {
-    assets.push(setAssetRequired(title, {
-      title: {len: title.len}
-    }));
-  }
-  const img = nativeMediaType.image;
-  if (img) {
-    assets.push(setAssetRequired(img, {
-      img: {
-        type: 3, // Main
-        wmin: 1,
-        hmin: 1
-      }
-    }));
-  }
-  const icon = nativeMediaType.icon;
-  if (icon) {
-    assets.push(setAssetRequired(icon, {
-      img: {
-        type: 1, // Icon
-        wmin: 1,
-        hmin: 1
-      }
-    }));
-  }
-  const body = nativeMediaType.body;
-  if (body) {
-    assets.push(setAssetRequired(body, {data: {type: 2}}));
-  }
-  const cta = nativeMediaType.cta;
-  if (cta) {
-    assets.push(setAssetRequired(cta, {data: {type: 12}}));
-  }
-  const sponsoredBy = nativeMediaType.sponsoredBy;
-  if (sponsoredBy) {
-    assets.push(setAssetRequired(sponsoredBy, {data: {type: 1}}));
-  }
-
-  utils._each(assets, (asset, id) => asset.id = id);
-  return {
-    ver: '1',
-    request: JSON.stringify({
-      ver: '1',
-      assets
-    })
-  };
-}
-
-function tryParseNativeResponse(adm) {
-  let native = null;
-  try {
-    native = JSON.parse(adm);
-  } catch (e) {
-    utils.logError('Sortable bid adapter unable to parse native bid response:\n\n' + e);
-  }
-  return native && native.native;
-}
-
-function createImgObject(img) {
-  if (img.w || img.h) {
-    return {
-      url: img.url,
-      width: img.w,
-      height: img.h
-    };
-  } else {
-    return img.url;
-  }
-}
-
-function interpretNativeResponse(response) {
-  const native = {};
-  if (response.link) {
-    native.clickUrl = response.link.url;
-  }
-  utils._each(response.assets, asset => {
-    switch (asset.id) {
-      case 1:
-        native.title = asset.title.text;
-        break;
-      case 2:
-        native.image = createImgObject(asset.img);
-        break;
-      case 3:
-        native.icon = createImgObject(asset.img);
-        break;
-      case 4:
-        native.body = asset.data.value;
-        break;
-      case 5:
-        native.cta = asset.data.value;
-        break;
-      case 6:
-        native.sponsoredBy = asset.data.value;
-        break;
-    }
-  });
-  return native;
-}
-
-function transformSyncs(responses, type, syncs) {
-  utils._each(responses, res => {
-    if (res.body && res.body.ext && res.body.ext.sync_dsps && res.body.ext.sync_dsps.length) {
-      utils._each(res.body.ext.sync_dsps, sync => {
-        if (sync[0] === type && sync[1]) {
-          syncs.push({type, url: sync[1]});
-        }
-      });
-    }
-  });
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
-
-  isBidRequestValid: function(bid) {
-    const sortableConfig = config.getConfig('sortable');
-    const haveSiteId = (sortableConfig && !!sortableConfig.siteId) || bid.params.siteId;
-    const validFloor = !bid.params.floor || utils.isNumber(bid.params.floor);
-    const validSize = /\d+x\d+/;
-    const validFloorSizeMap = !bid.params.floorSizeMap ||
-      (utils.isPlainObject(bid.params.floorSizeMap) &&
-        Object.keys(bid.params.floorSizeMap).every(size =>
-          size.match(validSize) && utils.isNumber(bid.params.floorSizeMap[size])
-        ))
-    const validKeywords = !bid.params.keywords ||
-      (utils.isPlainObject(bid.params.keywords) &&
-        Object.keys(bid.params.keywords).every(key =>
-          utils.isStr(key) && utils.isStr(bid.params.keywords[key])
-        ))
-    const isBanner = !bid.mediaTypes || bid.mediaTypes[BANNER] || !(bid.mediaTypes[NATIVE] || bid.mediaTypes[VIDEO]);
-    const bannerSizes = isBanner ? utils.deepAccess(bid, `mediaType.${BANNER}.sizes`) || bid.sizes : null;
-    return !!(bid.params.tagId && haveSiteId && validFloor && validFloorSizeMap && validKeywords && (!isBanner ||
-      (bannerSizes && bannerSizes.length > 0 && bannerSizes.every(sizeArr => sizeArr.length == 2 && sizeArr.every(num => utils.isNumber(num))))));
-  },
-
-  buildRequests: function(validBidReqs, bidderRequest) {
-    const sortableConfig = config.getConfig('sortable') || {};
-    const globalSiteId = sortableConfig.siteId;
-    let loc = utils.parseUrl(bidderRequest.refererInfo.referer);
-
-    const sortableImps = utils._map(validBidReqs, bid => {
-      const rv = {
-        id: bid.bidId,
-        tagid: bid.params.tagId,
-        ext: {}
-      };
-      const bannerMediaType = utils.deepAccess(bid, `mediaTypes.${BANNER}`);
-      const nativeMediaType = utils.deepAccess(bid, `mediaTypes.${NATIVE}`);
-      const videoMediaType = utils.deepAccess(bid, `mediaTypes.${VIDEO}`);
-      if (bannerMediaType || !(nativeMediaType || videoMediaType)) {
-        const bannerSizes = (bannerMediaType && bannerMediaType.sizes) || bid.sizes;
-        rv.banner = {
-          format: utils._map(bannerSizes, ([width, height]) => ({w: width, h: height}))
-        };
-      }
-      if (nativeMediaType) {
-        rv.native = buildNativeRequest(nativeMediaType);
-      }
-      if (videoMediaType && videoMediaType.context === 'instream') {
-        const video = {placement: 1};
-        video.mimes = videoMediaType.mimes || [];
-        video.minduration = utils.deepAccess(bid, 'params.video.minduration') || 10;
-        video.maxduration = utils.deepAccess(bid, 'params.video.maxduration') || 60;
-        const startDelay = utils.deepAccess(bid, 'params.video.startdelay');
-        if (startDelay != null) {
-          video.startdelay = startDelay;
-        }
-        if (videoMediaType.playerSize && videoMediaType.playerSize.length) {
-          const size = videoMediaType.playerSize[0];
-          video.w = size[0];
-          video.h = size[1];
-        }
-        if (videoMediaType.api) {
-          video.api = videoMediaType.api;
-        }
-        if (videoMediaType.protocols) {
-          video.protocols = videoMediaType.protocols;
-        }
-        if (videoMediaType.playbackmethod) {
-          video.playbackmethod = videoMediaType.playbackmethod;
-        }
-        rv.video = video;
-      }
-      if (bid.params.floor) {
-        rv.bidfloor = bid.params.floor;
-      }
-      if (bid.params.keywords) {
-        rv.ext.keywords = bid.params.keywords;
-      }
-      if (bid.params.bidderParams) {
-        utils._each(bid.params.bidderParams, (params, partner) => {
-          rv.ext[partner] = params;
-        });
-      }
-      if (bid.params.floorSizeMap) {
-        rv.ext.floorSizeMap = bid.params.floorSizeMap;
-      }
-      return rv;
-    });
-    const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
-    const sortableBidReq = {
-      id: utils.getUniqueIdentifierStr(),
-      imp: sortableImps,
-      source: {
-        ext: {
-          schain: validBidReqs[0].schain
-        }
-      },
-      regs: {
-        ext: {}
-      },
-      site: {
-        domain: loc.hostname,
-        page: loc.href,
-        ref: loc.href,
-        publisher: {
-          id: globalSiteId || validBidReqs[0].params.siteId,
-        },
-        device: {
-          w: screen.width,
-          h: screen.height
-        },
-      },
-    };
-    if (bidderRequest && bidderRequest.timeout > 0) {
-      sortableBidReq.tmax = bidderRequest.timeout;
-    }
-    if (gdprConsent) {
-      sortableBidReq.user = {
-        ext: {
-          consent: gdprConsent.consentString
-        }
-      };
-      if (typeof gdprConsent.gdprApplies == 'boolean') {
-        sortableBidReq.regs.ext.gdpr = gdprConsent.gdprApplies ? 1 : 0
-      }
-    }
-    if (bidderRequest.uspConsent) {
-      sortableBidReq.regs.ext.us_privacy = bidderRequest.uspConsent;
-    }
-    return {
-      method: 'POST',
-      url: `${SERVER_URL}/openrtb2/auction?src=$$REPO_AND_VERSION$$&host=${loc.hostname}`,
-      data: JSON.stringify(sortableBidReq),
-      options: {contentType: 'text/plain'}
-    };
-  },
-
-  interpretResponse: function(serverResponse) {
-    const { body: {id, seatbid} } = serverResponse;
-    const sortableBids = [];
-    if (id && seatbid) {
-      utils._each(seatbid, seatbid => {
-        utils._each(seatbid.bid, bid => {
-          const bidObj = {
-            requestId: bid.impid,
-            cpm: parseFloat(bid.price),
-            width: parseInt(bid.w),
-            height: parseInt(bid.h),
-            creativeId: bid.crid || bid.id,
-            dealId: bid.dealid || null,
-            currency: 'USD',
-            netRevenue: true,
-            mediaType: BANNER,
-            ttl: 60
-          };
-          if (bid.adm) {
-            const adFormat = utils.deepAccess(bid, 'ext.ad_format')
-            if (adFormat === 'native') {
-              let native = tryParseNativeResponse(bid.adm);
-              if (!native) {
-                return;
-              }
-              bidObj.mediaType = NATIVE;
-              bidObj.native = interpretNativeResponse(native);
-            } else if (adFormat === 'instream') {
-              bidObj.mediaType = VIDEO;
-              bidObj.vastXml = bid.adm;
-            } else {
-              bidObj.mediaType = BANNER;
-              bidObj.ad = bid.adm;
-              if (bid.nurl) {
-                bidObj.ad += utils.createTrackPixelHtml(decodeURIComponent(bid.nurl));
-              }
-            }
-          } else if (bid.nurl) {
-            bidObj.adUrl = bid.nurl;
-          }
-          if (bid.ext) {
-            bidObj[BIDDER_CODE] = bid.ext;
-          }
-          sortableBids.push(bidObj);
-        });
-      });
-    }
-    return sortableBids;
-  },
-
-  getUserSyncs: (syncOptions, responses) => {
-    const syncs = [];
-    if (syncOptions.iframeEnabled) {
-      transformSyncs(responses, 'iframe', syncs);
-    }
-    if (syncOptions.pixelEnabled) {
-      transformSyncs(responses, 'image', syncs);
-    }
-    return syncs;
-  },
-
-  onTimeout(details) {
-    fetch(`${SERVER_URL}/prebid/timeout`, {
-      method: 'POST',
-      body: JSON.stringify(details),
-      mode: 'no-cors',
-      headers: new Headers({
-        'Content-Type': 'text/plain'
-      })
-    });
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/sortableBidAdapter.md b/modules/sortableBidAdapter.md
deleted file mode 100644
index c24ad85b752..00000000000
--- a/modules/sortableBidAdapter.md
+++ /dev/null
@@ -1,109 +0,0 @@
-# Overview
-
-```
-Module Name: Sortable Bid Adapter
-Module Type: Bidder Adapter
-Maintainer: prebid@sortable.com
-```
-
-# Description
-
-Sortable's adapter integration to the Prebid library. Posts plain-text JSON to the /openrtb2/auction endpoint.
-
-# Test Parameters
-
-```
-var adUnits = [
-  {
-    code: 'test-pb-leaderboard',
-    mediaTypes: {
-        banner: {
-            sizes: [[728, 90]],
-        }
-    },
-    bids: [{
-      bidder: 'sortable',
-      params: {
-        tagId: 'test-pb-leaderboard',
-        siteId: 'prebid.example.com',
-        'keywords': {
-          'key1': 'val1',
-          'key2': 'val2'
-        }
-      }
-    }]
-  }, {
-    code: 'test-pb-banner',
-    mediaTypes: {
-        banner: {
-            sizes: [[300, 250]],
-        }
-    },
-    bids: [{
-      bidder: 'sortable',
-      params: {
-        tagId: 'test-pb-banner',
-        siteId: 'prebid.example.com'
-      }
-    }]
-  }, {
-    code: 'test-pb-sidebar',
-    mediaTypes: {
-        banner: {
-            sizes: [[160, 600]],
-        }
-    },
-    bids: [{
-      bidder: 'sortable',
-      params: {
-        tagId: 'test-pb-sidebar',
-        siteId: 'prebid.example.com',
-        'keywords': {
-          'keyA': 'valA'
-        }
-      }
-    }]
-  }, {
-    code: 'test-pb-native',
-    mediaTypes: {
-      native: {
-        title: {
-          required: true,
-          len: 800
-        },
-        image: {
-          required: true,
-          sizes: [790, 294],
-        },
-        sponsoredBy: {
-          required: true
-        }
-      }
-    },
-    bids: [{
-      bidder: 'sortable',
-      params: {
-        tagId: 'test-pb-native',
-        siteId: 'prebid.example.com'
-      }
-    }]
-  }, {
-    code: 'test-pb-video',
-    mediaTypes: {
-      video: {
-        playerSize: [640,480],
-        context: 'instream'
-      }
-    },
-    bids: [
-      {
-        bidder: 'sortable',
-        params: {
-          tagId: 'test-pb-video',
-          siteId: 'prebid.example.com'
-        }
-      }
-    ]
-  }
-]
-```
diff --git a/modules/sovrnAnalyticsAdapter.js b/modules/sovrnAnalyticsAdapter.js
index 0d2576edb05..a72c4b1a5a5 100644
--- a/modules/sovrnAnalyticsAdapter.js
+++ b/modules/sovrnAnalyticsAdapter.js
@@ -1,11 +1,11 @@
-import adapter from '../src/AnalyticsAdapter.js'
-import adaptermanager from '../src/adapterManager.js'
-import CONSTANTS from '../src/constants.json'
-import {ajaxBuilder} from '../src/ajax.js'
-import * as utils from '../src/utils.js'
-import {config} from '../src/config.js'
-import find from 'core-js-pure/features/array/find.js'
-import includes from 'core-js-pure/features/array/includes.js'
+import {logError, timestamp} from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adaptermanager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
+import {ajaxBuilder} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import {find, includes} from '../src/polyfill.js';
+import {getRefererInfo} from '../src/refererDetection.js';
 
 const ajax = ajaxBuilder(0)
 
@@ -23,49 +23,11 @@ let pbaUrl = 'https://pba.aws.lijit.com/analytics'
 let currentAuctions = {};
 const analyticsType = 'endpoint'
 
-const getClosestTop = () => {
-  let topFrame = window;
-  let err = false;
-  try {
-    while (topFrame.parent.document !== topFrame.document) {
-      if (topFrame.parent.document) {
-        topFrame = topFrame.parent;
-      } else {
-        throw new Error();
-      }
-    }
-  } catch (e) {
-    // bException = true;
-  }
-
-  return {
-    topFrame,
-    err
-  };
-};
-
-const getBestPageUrl = ({err: crossDomainError, topFrame}) => {
-  let sBestPageUrl = '';
-
-  if (!crossDomainError) {
-    // easy case- we can get top frame location
-    sBestPageUrl = topFrame.location.href;
-  } else {
-    try {
-      try {
-        sBestPageUrl = window.top.location.href;
-      } catch (e) {
-        let aOrigins = window.location.ancestorOrigins;
-        sBestPageUrl = aOrigins[aOrigins.length - 1];
-      }
-    } catch (e) {
-      sBestPageUrl = topFrame.document.referrer;
-    }
-  }
-
-  return sBestPageUrl;
-};
-const rootURL = getBestPageUrl(getClosestTop())
+const rootURL = (() => {
+  const ref = getRefererInfo();
+  // TODO: does the fallback make sense here?
+  return ref.page || ref.topmostLocation;
+})();
 
 let sovrnAnalyticsAdapter = Object.assign(adapter({url: pbaUrl, analyticsType}), {
   track({ eventType, args }) {
@@ -112,7 +74,7 @@ sovrnAnalyticsAdapter.enableAnalytics = function (config) {
   if (config && config.options && (config.options.sovrnId || config.options.affiliateId)) {
     sovrnId = config.options.sovrnId || config.options.affiliateId;
   } else {
-    utils.logError('Need Sovrn Id to log auction results. Please contact a Sovrn representative if you do not know your Sovrn Id.')
+    logError('Need Sovrn Id to log auction results. Please contact a Sovrn representative if you do not know your Sovrn Id.')
     return
   }
   sovrnAnalyticsAdapter.sovrnId = sovrnId;
@@ -149,7 +111,7 @@ class BidWinner {
    * Sends the auction to the the ingest server
    */
   send() {
-    this.body.ts = utils.timestamp()
+    this.body.ts = timestamp()
     ajax(
       pbaUrl,
       null,
@@ -269,7 +231,7 @@ class AuctionData {
     Object.keys(maxBids).forEach(unit => {
       maxBids[unit].isAuctionWinner = true
     })
-    this.auction.ts = utils.timestamp()
+    this.auction.ts = timestamp()
     ajax(
       pbaUrl,
       () => {
@@ -311,7 +273,7 @@ class LogError {
     if (ErrorEvent.data && this.error.data.ad) {
       delete this.error.data.ad
     }
-    this.error.ts = utils.timestamp()
+    this.error.ts = timestamp()
     ajax(
       pbaUrl,
       null,
diff --git a/modules/sovrnBidAdapter.js b/modules/sovrnBidAdapter.js
index f3260668b74..ab8abb7e2b4 100644
--- a/modules/sovrnBidAdapter.js
+++ b/modules/sovrnBidAdapter.js
@@ -1,72 +1,163 @@
-import * as utils from '../src/utils.js'
+import {
+  _each,
+  getBidIdParameter,
+  isArray,
+  getUniqueIdentifierStr,
+  deepSetValue,
+  logError,
+  deepAccess,
+  isInteger,
+  logWarn
+} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { BANNER } from '../src/mediaTypes.js'
+import {
+  ADPOD,
+  BANNER,
+  VIDEO
+} from '../src/mediaTypes.js'
+import {createEidsArray} from './userId/eids.js';
+
+const ORTB_VIDEO_PARAMS = {
+  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
+  'minduration': (value) => isInteger(value),
+  'maxduration': (value) => isInteger(value),
+  'protocols': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 10),
+  'w': (value) => isInteger(value),
+  'h': (value) => isInteger(value),
+  'startdelay': (value) => isInteger(value),
+  'placement': (value) => isInteger(value) && value >= 1 && value <= 5,
+  'linearity': (value) => [1, 2].indexOf(value) !== -1,
+  'skip': (value) => [0, 1].indexOf(value) !== -1,
+  'skipmin': (value) => isInteger(value),
+  'skipafter': (value) => isInteger(value),
+  'sequence': (value) => isInteger(value),
+  'battr': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 17),
+  'maxextended': (value) => isInteger(value),
+  'minbitrate': (value) => isInteger(value),
+  'maxbitrate': (value) => isInteger(value),
+  'boxingallowed': (value) => [0, 1].indexOf(value) !== -1,
+  'playbackmethod': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6),
+  'playbackend': (value) => [1, 2, 3].indexOf(value) !== -1,
+  'delivery': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 3),
+  'pos': (value) => isInteger(value) && value >= 1 && value <= 7,
+  'api': (value) => Array.isArray(value) && value.every(v => v >= 1 && v <= 6)
+}
+
+const REQUIRED_VIDEO_PARAMS = {
+  context: (value) => value !== ADPOD,
+  mimes: ORTB_VIDEO_PARAMS.mimes,
+  minduration: ORTB_VIDEO_PARAMS.minduration,
+  maxduration: ORTB_VIDEO_PARAMS.maxduration,
+  protocols: ORTB_VIDEO_PARAMS.protocols
+}
 
 export const spec = {
   code: 'sovrn',
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
+  gvlid: 13,
 
   /**
    * Check if the bid is a valid zone ID in either number or string form
    * @param {object} bid the Sovrn bid to validate
    * @return boolean for whether or not a bid is valid
    */
-  isBidRequestValid: function(bid) {
-    return !!(bid.params.tagid && !isNaN(parseFloat(bid.params.tagid)) && isFinite(bid.params.tagid));
+  isBidRequestValid: function (bid) {
+    const video = bid?.mediaTypes?.video
+    return !!(
+      bid.params.tagid &&
+      !isNaN(parseFloat(bid.params.tagid)) &&
+      isFinite(bid.params.tagid) && (
+        !video || (
+          Object.keys(REQUIRED_VIDEO_PARAMS)
+            .every(key => REQUIRED_VIDEO_PARAMS[key](video[key]))
+        )
+      )
+    )
   },
 
   /**
    * Format the bid request object for our endpoint
-   * @param {BidRequest[]} bidRequests Array of Sovrn bidders
    * @return object of parameters for Prebid AJAX request
+   * @param bidReqs
+   * @param bidderRequest
    */
   buildRequests: function(bidReqs, bidderRequest) {
     try {
       let sovrnImps = [];
       let iv;
       let schain;
-      let unifiedID;
+      let eids;
+      let criteoId;
 
-      utils._each(bidReqs, function (bid) {
-        if (!unifiedID) {
-          unifiedID = utils.deepAccess(bid, 'userId.tdid');
+      _each(bidReqs, function (bid) {
+        if (!eids && bid.userId) {
+          eids = createEidsArray(bid.userId)
+          eids.forEach(function (id) {
+            if (id.uids && id.uids[0]) {
+              if (id.source === 'criteo.com') {
+                criteoId = id.uids[0].id
+              }
+            }
+          })
         }
 
         if (bid.schain) {
-          schain = schain || bid.schain;
+          schain = schain || bid.schain
         }
-        iv = iv || utils.getBidIdParameter('iv', bid.params);
+        iv = iv || getBidIdParameter('iv', bid.params)
+
+        const floorInfo = (bid.getFloor && typeof bid.getFloor === 'function') ? bid.getFloor({
+          currency: 'USD',
+          mediaType: bid.mediaTypes && bid.mediaTypes.banner ? 'banner' : 'video',
+          size: '*'
+        }) : {}
+        floorInfo.floor = floorInfo.floor || getBidIdParameter('bidfloor', bid.params)
 
-        let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
-        bidSizes = ((utils.isArray(bidSizes) && utils.isArray(bidSizes[0])) ? bidSizes : [bidSizes])
-        bidSizes = bidSizes.filter(size => utils.isArray(size))
-        const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}))
-        sovrnImps.push({
+        const imp = {
           adunitcode: bid.adUnitCode,
           id: bid.bidId,
-          banner: {
+          tagid: String(getBidIdParameter('tagid', bid.params)),
+          bidfloor: floorInfo.floor
+        }
+
+        if (deepAccess(bid, 'mediaTypes.banner')) {
+          let bidSizes = deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes
+          bidSizes = (isArray(bidSizes) && isArray(bidSizes[0])) ? bidSizes : [bidSizes]
+          bidSizes = bidSizes.filter(size => isArray(size))
+          const processedSizes = bidSizes.map(size => ({w: parseInt(size[0], 10), h: parseInt(size[1], 10)}))
+
+          imp.banner = {
             format: processedSizes,
             w: 1,
             h: 1,
-          },
-          tagid: String(utils.getBidIdParameter('tagid', bid.params)),
-          bidfloor: utils.getBidIdParameter('bidfloor', bid.params)
-        });
-      });
+          };
+        }
+        if (deepAccess(bid, 'mediaTypes.video')) {
+          imp.video = _buildVideoRequestObj(bid);
+        }
+
+        imp.ext = getBidIdParameter('ext', bid.ortb2Imp) || undefined
 
-      const page = bidderRequest.refererInfo.referer
+        const segmentsString = getBidIdParameter('segments', bid.params)
+        if (segmentsString) {
+          imp.ext = imp.ext || {}
+          imp.ext.deals = segmentsString.split(',').map(deal => deal.trim())
+        }
+        sovrnImps.push(imp)
+      })
+
+      const fpd = bidderRequest.ortb2 || {};
 
-      // clever trick to get the domain
-      const domain = utils.parseUrl(page).hostname
+      const site = fpd.site || {}
+      site.page = bidderRequest.refererInfo.page
+      site.domain = bidderRequest.refererInfo.domain
 
       const sovrnBidReq = {
-        id: utils.getUniqueIdentifierStr(),
+        id: getUniqueIdentifierStr(),
         imp: sovrnImps,
-        site: {
-          page,
-          domain
-        }
-      };
+        site: site,
+        user: fpd.user || {}
+      }
 
       if (schain) {
         sovrnBidReq.source = {
@@ -77,26 +168,18 @@ export const spec = {
       }
 
       if (bidderRequest.gdprConsent) {
-        utils.deepSetValue(sovrnBidReq, 'regs.ext.gdpr', +bidderRequest.gdprConsent.gdprApplies);
-        utils.deepSetValue(sovrnBidReq, 'user.ext.consent', bidderRequest.gdprConsent.consentString)
+        deepSetValue(sovrnBidReq, 'regs.ext.gdpr', +bidderRequest.gdprConsent.gdprApplies);
+        deepSetValue(sovrnBidReq, 'user.ext.consent', bidderRequest.gdprConsent.consentString)
       }
       if (bidderRequest.uspConsent) {
-        utils.deepSetValue(sovrnBidReq, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+        deepSetValue(sovrnBidReq, 'regs.ext.us_privacy', bidderRequest.uspConsent);
       }
 
-      if (unifiedID) {
-        const idArray = [{
-          source: 'adserver.org',
-          uids: [
-            {
-              id: unifiedID,
-              ext: {
-                rtiPartner: 'TDID'
-              }
-            }
-          ]
-        }]
-        utils.deepSetValue(sovrnBidReq, 'user.ext.eids', idArray)
+      if (eids) {
+        deepSetValue(sovrnBidReq, 'user.ext.eids', eids)
+        if (criteoId) {
+          deepSetValue(sovrnBidReq, 'user.ext.prebid_criteoid', criteoId)
+        }
       }
 
       let url = `https://ap.lijit.com/rtb/bid?src=$$REPO_AND_VERSION$$`;
@@ -109,7 +192,7 @@ export const spec = {
         options: {contentType: 'text/plain'}
       }
     } catch (e) {
-      utils.logError('Could not build bidrequest, error deatils:', e);
+      logError('Could not build bidrequest, error deatils:', e);
     }
   },
 
@@ -119,15 +202,13 @@ export const spec = {
    * @return {Bid[]} An array of formatted bids.
   */
   interpretResponse: function({ body: {id, seatbid} }) {
+    if (!id || !seatbid || !Array.isArray(seatbid)) return []
+
     try {
-      let sovrnBidResponses = [];
-      if (id &&
-        seatbid &&
-        seatbid.length > 0 &&
-        seatbid[0].bid &&
-        seatbid[0].bid.length > 0) {
-        seatbid[0].bid.map(sovrnBid => {
-          sovrnBidResponses.push({
+      return seatbid
+        .filter(seat => seat)
+        .map(seat => seat.bid.map(sovrnBid => {
+          const bid = {
             requestId: sovrnBid.impid,
             cpm: parseFloat(sovrnBid.price),
             width: parseInt(sovrnBid.w),
@@ -136,15 +217,23 @@ export const spec = {
             dealId: sovrnBid.dealid || null,
             currency: 'USD',
             netRevenue: true,
-            mediaType: BANNER,
-            ad: decodeURIComponent(`${sovrnBid.adm}<img src="${sovrnBid.nurl}">`),
-            ttl: 60
-          });
-        });
-      }
-      return sovrnBidResponses
+            mediaType: sovrnBid.nurl ? BANNER : VIDEO,
+            ttl: sovrnBid.ext?.ttl || 90,
+            meta: { advertiserDomains: sovrnBid && sovrnBid.adomain ? sovrnBid.adomain : [] }
+          }
+
+          if (sovrnBid.nurl) {
+            bid.ad = decodeURIComponent(`${sovrnBid.adm}<img src="${sovrnBid.nurl}">`)
+          } else {
+            bid.vastXml = decodeURIComponent(sovrnBid.adm)
+          }
+
+          return bid
+        }))
+        .flat()
     } catch (e) {
-      utils.logError('Could not intrepret bidresponse, error deatils:', e);
+      logError('Could not interpret bidresponse, error details:', e)
+      return e
     }
   },
 
@@ -153,7 +242,7 @@ export const spec = {
       const tracks = []
       if (serverResponses && serverResponses.length !== 0) {
         if (syncOptions.iframeEnabled) {
-          const iidArr = serverResponses.filter(resp => utils.deepAccess(resp, 'body.ext.iid'))
+          const iidArr = serverResponses.filter(resp => deepAccess(resp, 'body.ext.iid'))
             .map(resp => resp.body.ext.iid);
           const params = [];
           if (gdprConsent && gdprConsent.gdprApplies && typeof gdprConsent.consentString === 'string') {
@@ -173,7 +262,7 @@ export const spec = {
         }
 
         if (syncOptions.pixelEnabled) {
-          serverResponses.filter(resp => utils.deepAccess(resp, 'body.ext.sync.pixels'))
+          serverResponses.filter(resp => deepAccess(resp, 'body.ext.sync.pixels'))
             .reduce((acc, resp) => acc.concat(resp.body.ext.sync.pixels), [])
             .map(pixel => pixel.url)
             .forEach(url => tracks.push({ type: 'image', url }))
@@ -186,4 +275,39 @@ export const spec = {
   },
 }
 
-registerBidder(spec);
+function _buildVideoRequestObj(bid) {
+  const videoObj = {}
+  const bidSizes = deepAccess(bid, 'sizes')
+  const videoAdUnitParams = deepAccess(bid, 'mediaTypes.video', {})
+  const videoBidderParams = deepAccess(bid, 'params.video', {})
+  const computedParams = {}
+
+  if (bidSizes) {
+    const sizes = (Array.isArray(bidSizes[0])) ? bidSizes[0] : bidSizes
+    computedParams.w = sizes[0]
+    computedParams.h = sizes[1]
+  } else if (Array.isArray(videoAdUnitParams.playerSize)) {
+    const sizes = (Array.isArray(videoAdUnitParams.playerSize[0])) ? videoAdUnitParams.playerSize[0] : videoAdUnitParams.playerSize
+    computedParams.w = sizes[0]
+    computedParams.h = sizes[1]
+  }
+
+  const videoParams = {
+    ...computedParams,
+    ...videoAdUnitParams,
+    ...videoBidderParams
+  };
+
+  Object.keys(ORTB_VIDEO_PARAMS).forEach(paramName => {
+    if (videoParams.hasOwnProperty(paramName)) {
+      if (ORTB_VIDEO_PARAMS[paramName](videoParams[paramName])) {
+        videoObj[paramName] = videoParams[paramName]
+      } else {
+        logWarn(`The OpenRTB video param ${paramName} has been skipped due to misformating. Please refer to OpenRTB 2.5 spec.`);
+      }
+    }
+  })
+  return videoObj
+}
+
+registerBidder(spec)
diff --git a/modules/sovrnBidAdapter.md b/modules/sovrnBidAdapter.md
index 2b5d21d5515..53e3158024d 100644
--- a/modules/sovrnBidAdapter.md
+++ b/modules/sovrnBidAdapter.md
@@ -10,9 +10,9 @@ Maintainer: jrosendahl@sovrn.com
 
 Sovrn's adapter integration to the Prebid library. Posts plain-text JSON to the /rtb/bid endpoint.
 
-# Test Parameters
+# Banner Test Parameters
 
-```
+```js
 var adUnits = [
   {
     code: 'test-leaderboard',
@@ -45,3 +45,81 @@ var adUnits = [
   }
 ]
 ```
+
+# Video Test Parameters
+### Instream
+```js
+var videoAdUnit = {
+  code: 'video1',
+  sizes: [640, 480],
+  mediaTypes: {
+    video: {
+      context: 'instream',
+      playerSize: [640, 480],
+      mimes: ['video/mp4'],
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+      playbackmethod: [2],
+      skip: 1,
+    },
+  },
+  bids: [
+    {
+      bidder: 'sovrn',
+      // Prebid Server Bidder Params https://docs.prebid.org/dev-docs/pbs-bidders.html#sovrn
+      params: {
+        tagid: '315045',
+        bidfloor: '0.04',
+      },
+    },
+  ],
+}
+```
+### Outstream
+```js
+var adUnits = [
+  {
+    code: videoId,
+    mediaTypes: {
+      video: {
+        context: 'outstream',
+        playerSize: [640, 360],
+        mimes: ['video/mp4'],
+        protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+        playbackmethod: [2],
+        skip: 1,
+      },
+    },
+    bids: [
+      {
+        bidder: 'sovrn',
+        // Prebid Server Bidder Params https://docs.prebid.org/dev-docs/pbs-bidders.html#sovrn
+        params: {
+          tagid: '315045',
+          bidfloor: '0.04',
+        },
+      },
+    ],
+    renderer: {
+      url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+      render: function (bid) {
+        adResponse = {
+          ad: {
+            video: {
+              content: bid.vastXml,
+              player_height: bid.height,
+              player_width: bid.width,
+            },
+          },
+        }
+        // push to render queue because ANOutstreamVideo may not be loaded yet.
+        bid.renderer.push(() => {
+          ANOutstreamVideo.renderAd({
+            targetId: bid.adUnitCode,
+            adResponse: adResponse,
+          })
+        })
+      },
+    },
+  },
+]
+```
diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index 1733a176eba..874207adcf8 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -1,7 +1,9 @@
-import * as utils from '../src/utils.js';
+import { logError, deepAccess, isArray, getBidIdParameter, getDNT, deepSetValue, isEmpty, _each, logMessage, logWarn, isBoolean, isNumber, isPlainObject, isFn, setScriptAttributes } from '../src/utils.js';
+import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO } from '../src/mediaTypes.js';
+import { loadExternalScript } from '../src/adloader.js';
 
 const BIDDER_CODE = 'spotx';
 const URL = 'https://search.spotxchange.com/openrtb/2.3/dados/';
@@ -11,7 +13,6 @@ export const GOOGLE_CONSENT = { consented_providers: ['3', '7', '11', '12', '15'
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 165,
-  aliases: ['spotx'],
   supportedMediaTypes: [VIDEO],
 
   /**
@@ -19,38 +20,38 @@ export const spec = {
    * From Prebid.js: isBidRequestValid - Verify the the AdUnits.bids, respond with true (valid) or false (invalid).
    *
    * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
+   * @return {boolean} True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function(bid) {
     if (bid && typeof bid.params !== 'object') {
-      utils.logError(BIDDER_CODE + ': params is not defined or is incorrect in the bidder settings.');
+      logError(BIDDER_CODE + ': params is not defined or is incorrect in the bidder settings.');
       return false;
     }
 
-    if (!utils.deepAccess(bid, 'mediaTypes.video')) {
-      utils.logError(BIDDER_CODE + ': mediaTypes.video is not present in the bidder settings.');
+    if (!deepAccess(bid, 'mediaTypes.video')) {
+      logError(BIDDER_CODE + ': mediaTypes.video is not present in the bidder settings.');
       return false;
     }
 
-    const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
-    if (!playerSize || !utils.isArray(playerSize)) {
-      utils.logError(BIDDER_CODE + ': mediaTypes.video.playerSize is not defined in the bidder settings.');
+    const playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
+    if (!playerSize || !isArray(playerSize)) {
+      logError(BIDDER_CODE + ': mediaTypes.video.playerSize is not defined in the bidder settings.');
       return false;
     }
 
-    if (!utils.getBidIdParameter('channel_id', bid.params)) {
-      utils.logError(BIDDER_CODE + ': channel_id is not present in bidder params');
+    if (!getBidIdParameter('channel_id', bid.params)) {
+      logError(BIDDER_CODE + ': channel_id is not present in bidder params');
       return false;
     }
 
-    if (utils.deepAccess(bid, 'mediaTypes.video.context') == 'outstream' || utils.deepAccess(bid, 'params.ad_unit') == 'outstream') {
-      if (!utils.getBidIdParameter('outstream_function', bid.params)) {
-        if (!utils.getBidIdParameter('outstream_options', bid.params)) {
-          utils.logError(BIDDER_CODE + ': please define outstream_options parameter or override the default SpotX outstream rendering by defining your own Outstream function using field outstream_function.');
+    if (deepAccess(bid, 'mediaTypes.video.context') == 'outstream' || deepAccess(bid, 'params.ad_unit') == 'outstream') {
+      if (!getBidIdParameter('outstream_function', bid.params)) {
+        if (!getBidIdParameter('outstream_options', bid.params)) {
+          logError(BIDDER_CODE + ': please define outstream_options parameter or override the default SpotX outstream rendering by defining your own Outstream function using field outstream_function.');
           return false;
         }
-        if (!utils.getBidIdParameter('slot', bid.params.outstream_options)) {
-          utils.logError(BIDDER_CODE + ': please define parameters slot outstream_options object in the configuration.');
+        if (!getBidIdParameter('slot', bid.params.outstream_options)) {
+          logError(BIDDER_CODE + ': please define parameter slot in outstream_options object in the configuration.');
           return false;
         }
       }
@@ -64,54 +65,63 @@ export const spec = {
    * from Prebid.js: buildRequests - Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
    *
    * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
+   * @param {object} bidderRequest - The master bidRequest object.
+   * @return {ServerRequest} Info describing the request to the server.
    */
   buildRequests: function(bidRequests, bidderRequest) {
-    const page = bidderRequest.refererInfo.referer;
-    const isPageSecure = !!page.match(/^https:/)
+    // TODO: does the fallback make sense here?
+    const referer = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+    const isPageSecure = !!referer.match(/^https:/);
 
     const siteId = '';
     const spotxRequests = bidRequests.map(function(bid) {
-      const channelId = utils.getBidIdParameter('channel_id', bid.params);
+      let page;
+      if (getBidIdParameter('page', bid.params)) {
+        page = getBidIdParameter('page', bid.params);
+      } else {
+        page = referer;
+      }
+
+      const channelId = getBidIdParameter('channel_id', bid.params);
       let pubcid = null;
 
-      const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+      const playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
       const contentWidth = playerSize[0][0];
       const contentHeight = playerSize[0][1];
 
-      const secure = isPageSecure || (utils.getBidIdParameter('secure', bid.params) ? 1 : 0);
+      const secure = isPageSecure || (getBidIdParameter('secure', bid.params) ? 1 : 0);
 
       const ext = {
         sdk_name: 'Prebid 1+',
         versionOrtb: ORTB_VERSION
       };
 
-      if (utils.getBidIdParameter('hide_skin', bid.params) != '') {
-        ext.hide_skin = +!!utils.getBidIdParameter('hide_skin', bid.params);
+      if (getBidIdParameter('hide_skin', bid.params) != '') {
+        ext.hide_skin = +!!getBidIdParameter('hide_skin', bid.params);
       }
 
-      if (utils.getBidIdParameter('ad_volume', bid.params) != '') {
-        ext.ad_volume = utils.getBidIdParameter('ad_volume', bid.params);
+      if (getBidIdParameter('ad_volume', bid.params) != '') {
+        ext.ad_volume = getBidIdParameter('ad_volume', bid.params);
       }
 
-      if (utils.getBidIdParameter('ad_unit', bid.params) != '') {
-        ext.ad_unit = utils.getBidIdParameter('ad_unit', bid.params);
+      if (getBidIdParameter('ad_unit', bid.params) != '') {
+        ext.ad_unit = getBidIdParameter('ad_unit', bid.params);
       }
 
-      if (utils.getBidIdParameter('outstream_options', bid.params) != '') {
-        ext.outstream_options = utils.getBidIdParameter('outstream_options', bid.params);
+      if (getBidIdParameter('outstream_options', bid.params) != '') {
+        ext.outstream_options = getBidIdParameter('outstream_options', bid.params);
       }
 
-      if (utils.getBidIdParameter('outstream_function', bid.params) != '') {
-        ext.outstream_function = utils.getBidIdParameter('outstream_function', bid.params);
+      if (getBidIdParameter('outstream_function', bid.params) != '') {
+        ext.outstream_function = getBidIdParameter('outstream_function', bid.params);
       }
 
-      if (utils.getBidIdParameter('custom', bid.params) != '') {
-        ext.custom = utils.getBidIdParameter('custom', bid.params);
+      if (getBidIdParameter('custom', bid.params) != '') {
+        ext.custom = getBidIdParameter('custom', bid.params);
       }
 
-      if (utils.getBidIdParameter('pre_market_bids', bid.params) != '' && utils.isArray(utils.getBidIdParameter('pre_market_bids', bid.params))) {
-        const preMarketBids = utils.getBidIdParameter('pre_market_bids', bid.params);
+      if (getBidIdParameter('pre_market_bids', bid.params) != '' && isArray(getBidIdParameter('pre_market_bids', bid.params))) {
+        const preMarketBids = getBidIdParameter('pre_market_bids', bid.params);
         ext.pre_market_bids = [];
         for (let i in preMarketBids) {
           const preMarketBid = preMarketBids[i];
@@ -139,7 +149,7 @@ export const spec = {
         }
       }
 
-      const mimes = utils.getBidIdParameter('mimes', bid.params) || ['application/javascript', 'video/mp4', 'video/webm'];
+      const mimes = getBidIdParameter('mimes', bid.params) || deepAccess(bid, 'mediaTypes.video.mimes') || ['application/javascript', 'video/mp4', 'video/webm'];
 
       const spotxReq = {
         id: bid.bidId,
@@ -152,28 +162,43 @@ export const spec = {
         }
       };
 
-      if (utils.getBidIdParameter('price_floor', bid.params) != '') {
-        spotxReq.bidfloor = utils.getBidIdParameter('price_floor', bid.params);
+      if (isFn(bid.getFloor)) {
+        let floorInfo = bid.getFloor({
+          currency: 'USD',
+          mediaType: 'video',
+          size: '*'
+        });
+
+        if (floorInfo.currency === 'USD') {
+          spotxReq.bidfloor = floorInfo.floor;
+        }
+      } else if (getBidIdParameter('price_floor', bid.params) != '') {
+        spotxReq.bidfloor = getBidIdParameter('price_floor', bid.params);
       }
 
-      if (utils.getBidIdParameter('start_delay', bid.params) != '') {
-        spotxReq.video.startdelay = 0 + Boolean(utils.getBidIdParameter('start_delay', bid.params));
+      const startdelay = getBidIdParameter('start_delay', bid.params) || deepAccess(bid, 'mediaTypes.video.startdelay');
+      if (startdelay) {
+        spotxReq.video.startdelay = 0 + Boolean(startdelay);
       }
 
-      if (utils.getBidIdParameter('min_duration', bid.params) != '') {
-        spotxReq.video.minduration = utils.getBidIdParameter('min_duration', bid.params);
+      const minduration = getBidIdParameter('min_duration', bid.params) || deepAccess(bid, 'mediaTypes.video.minduration');
+      if (minduration) {
+        spotxReq.video.minduration = minduration;
       }
 
-      if (utils.getBidIdParameter('max_duration', bid.params) != '') {
-        spotxReq.video.maxduration = utils.getBidIdParameter('max_duration', bid.params);
+      const maxduration = getBidIdParameter('max_duration', bid.params) || deepAccess(bid, 'mediaTypes.video.maxduration');
+      if (maxduration) {
+        spotxReq.video.maxduration = maxduration;
       }
 
-      if (utils.getBidIdParameter('placement_type', bid.params) != '') {
-        spotxReq.video.ext.placement = utils.getBidIdParameter('placement_type', bid.params);
+      const placement = getBidIdParameter('placement_type', bid.params) || deepAccess(bid, 'mediaTypes.video.placement');
+      if (placement) {
+        spotxReq.video.ext.placement = placement;
       }
 
-      if (utils.getBidIdParameter('position', bid.params) != '') {
-        spotxReq.video.ext.pos = utils.getBidIdParameter('position', bid.params);
+      const position = getBidIdParameter('position', bid.params) || deepAccess(bid, 'mediaTypes.video.pos');
+      if (position) {
+        spotxReq.video.ext.pos = position;
       }
 
       if (bid.crumbs && bid.crumbs.pubcid) {
@@ -184,7 +209,7 @@ export const spec = {
       const device = {
         h: screen.height,
         w: screen.width,
-        dnt: utils.getDNT() ? 1 : 0,
+        dnt: getDNT() ? 1 : 0,
         language: navigator[language].split('-')[0],
         make: navigator.vendor ? navigator.vendor : '',
         ua: navigator.userAgent
@@ -204,13 +229,19 @@ export const spec = {
         }
       };
 
-      if (utils.getBidIdParameter('number_of_ads', bid.params)) {
-        requestPayload['ext']['number_of_ads'] = utils.getBidIdParameter('number_of_ads', bid.params);
+      // If the publisher asks to ignore the bidder cache key we need to return the full vast xml
+      // so that it can be cached on the publishes specified server.
+      if (!!config.getConfig('cache') && !!config.getConfig('cache.url') && (config.getConfig('cache.ignoreBidderCacheKey') === true)) {
+        requestPayload['ext']['wrap_response'] = 0;
+      }
+
+      if (getBidIdParameter('number_of_ads', bid.params)) {
+        requestPayload['ext']['number_of_ads'] = getBidIdParameter('number_of_ads', bid.params);
       }
 
       const userExt = {};
 
-      if (utils.getBidIdParameter('spotx_all_google_consent', bid.params) == 1) {
+      if (getBidIdParameter('spotx_all_google_consent', bid.params) == 1) {
         userExt['consented_providers_settings'] = GOOGLE_CONSENT;
       }
 
@@ -219,25 +250,25 @@ export const spec = {
         userExt.consent = bidderRequest.gdprConsent.consentString;
 
         if (typeof bidderRequest.gdprConsent.gdprApplies !== 'undefined') {
-          utils.deepSetValue(requestPayload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+          deepSetValue(requestPayload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
         }
       }
 
       if (bidderRequest && bidderRequest.uspConsent) {
-        utils.deepSetValue(requestPayload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+        deepSetValue(requestPayload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
       }
 
-      // ID5 fied
-      if (bid && bid.userId && bid.userId.id5id) {
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push(
-          {
-            source: 'id5-sync.com',
-            uids: [{
-              id: bid.userId.id5id
-            }]
+      if (bid.userIdAsEids) {
+        userExt.eids = bid.userIdAsEids;
+
+        userExt.eids.forEach(eid => {
+          if (eid.source === 'uidapi.com') {
+            eid.uids.forEach(uid => {
+              uid.ext = uid.ext || {};
+              uid.ext.rtiPartner = 'UID2'
+            });
           }
-        )
+        });
       }
 
       // Add common id if available
@@ -254,28 +285,14 @@ export const spec = {
         };
       }
 
-      if (bid && bid.userId && bid.userId.tdid) {
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push(
-          {
-            source: 'adserver.org',
-            uids: [{
-              id: bid.userId.tdid,
-              ext: {
-                rtiPartner: 'TDID'
-              }
-            }]
-          }
-        )
-      }
-
       // Only add the user object if it's not empty
-      if (!utils.isEmpty(userExt)) {
+      if (!isEmpty(userExt)) {
         requestPayload.user = { ext: userExt };
       }
+      const urlQueryParams = 'src_sys=prebid';
       return {
         method: 'POST',
-        url: URL + channelId,
+        url: URL + channelId + '?' + urlQueryParams,
         data: requestPayload,
         bidRequest: bidderRequest
       };
@@ -294,9 +311,9 @@ export const spec = {
     const bidResponses = [];
     const serverResponseBody = serverResponse.body;
 
-    if (serverResponseBody && utils.isArray(serverResponseBody.seatbid)) {
-      utils._each(serverResponseBody.seatbid, function(bids) {
-        utils._each(bids.bid, function(spotxBid) {
+    if (serverResponseBody && isArray(serverResponseBody.seatbid)) {
+      _each(serverResponseBody.seatbid, function(bids) {
+        _each(bids.bid, function(spotxBid) {
           let currentBidRequest = {};
           for (let i in bidderRequest.bidRequest.bids) {
             if (spotxBid.impid == bidderRequest.bidRequest.bids[i].bidId) {
@@ -308,7 +325,7 @@ export const spec = {
            * Make sure currency and price are the right ones
            * TODO: what about the pre_market_bid partners sizes?
            */
-          utils._each(currentBidRequest.params.pre_market_bids, function(pmb) {
+          _each(currentBidRequest.params.pre_market_bids, function(pmb) {
             if (pmb.deal_id == spotxBid.id) {
               spotxBid.price = pmb.price;
               serverResponseBody.cur = pmb.currency;
@@ -320,33 +337,45 @@ export const spec = {
             currency: serverResponseBody.cur || 'USD',
             cpm: spotxBid.price,
             creativeId: spotxBid.crid || '',
+            dealId: spotxBid.dealid || '',
             ttl: 360,
             netRevenue: true,
             channel_id: serverResponseBody.id,
-            cache_key: spotxBid.ext.cache_key,
-            vastUrl: 'https://search.spotxchange.com/ad/vast.html?key=' + spotxBid.ext.cache_key,
-            videoCacheKey: spotxBid.ext.cache_key,
             mediaType: VIDEO,
             width: spotxBid.w,
             height: spotxBid.h
           };
 
-          const context1 = utils.deepAccess(currentBidRequest, 'mediaTypes.video.context');
-          const context2 = utils.deepAccess(currentBidRequest, 'params.ad_unit');
+          if (!!config.getConfig('cache') && !!config.getConfig('cache.url') && (config.getConfig('cache.ignoreBidderCacheKey') === true)) {
+            bid.vastXml = spotxBid.adm;
+          } else {
+            bid.cache_key = spotxBid.ext.cache_key;
+            bid.vastUrl = 'https://search.spotxchange.com/ad/vast.html?key=' + spotxBid.ext.cache_key;
+            bid.videoCacheKey = spotxBid.ext.cache_key;
+          }
+
+          bid.meta = bid.meta || {};
+          if (spotxBid && spotxBid.adomain && spotxBid.adomain.length > 0) {
+            bid.meta.advertiserDomains = spotxBid.adomain;
+          }
+
+          const context1 = deepAccess(currentBidRequest, 'mediaTypes.video.context');
+          const context2 = deepAccess(currentBidRequest, 'params.ad_unit');
           if (context1 == 'outstream' || context2 == 'outstream') {
-            const playersize = utils.deepAccess(currentBidRequest, 'mediaTypes.video.playerSize');
+            const playersize = deepAccess(currentBidRequest, 'mediaTypes.video.playerSize');
             const renderer = Renderer.install({
               id: 0,
-              url: '//',
+              renderNow: true,
+              url: '/',
               config: {
                 adText: 'SpotX Outstream Video Ad via Prebid.js',
                 player_width: playersize[0][0],
                 player_height: playersize[0][1],
-                content_page_url: utils.deepAccess(bidderRequest, 'data.site.page'),
-                ad_mute: +!!utils.deepAccess(currentBidRequest, 'params.ad_mute'),
-                hide_skin: +!!utils.deepAccess(currentBidRequest, 'params.hide_skin'),
-                outstream_options: utils.deepAccess(currentBidRequest, 'params.outstream_options'),
-                outstream_function: utils.deepAccess(currentBidRequest, 'params.outstream_function')
+                content_page_url: deepAccess(bidderRequest, 'data.site.page'),
+                ad_mute: +!!deepAccess(currentBidRequest, 'params.ad_mute'),
+                hide_skin: +!!deepAccess(currentBidRequest, 'params.hide_skin'),
+                outstream_options: deepAccess(currentBidRequest, 'params.outstream_options'),
+                outstream_function: deepAccess(currentBidRequest, 'params.outstream_function')
               }
             });
 
@@ -354,17 +383,17 @@ export const spec = {
               renderer.setRender(outstreamRender);
               renderer.setEventHandlers({
                 impression: function impression() {
-                  return utils.logMessage('SpotX outstream video impression event');
+                  return logMessage('SpotX outstream video impression event');
                 },
                 loaded: function loaded() {
-                  return utils.logMessage('SpotX outstream video loaded event');
+                  return logMessage('SpotX outstream video loaded event');
                 },
                 ended: function ended() {
-                  utils.logMessage('SpotX outstream renderer video event');
+                  logMessage('SpotX outstream renderer video event');
                 }
               });
             } catch (err) {
-              utils.logWarn('Prebid Error calling setRender or setEve,tHandlers on renderer', err);
+              logWarn('Prebid Error calling setRender or setEventHandlers on renderer', err);
             }
             bid.renderer = renderer;
           }
@@ -379,103 +408,99 @@ export const spec = {
 }
 
 function createOutstreamScript(bid) {
-  const slot = utils.getBidIdParameter('slot', bid.renderer.config.outstream_options);
-  utils.logMessage('[SPOTX][renderer] Handle SpotX outstream renderer');
   const script = window.document.createElement('script');
+  let dataSpotXParams = createScriptAttributeMap(bid);
+
   script.type = 'text/javascript';
   script.src = 'https://js.spotx.tv/easi/v1/' + bid.channel_id + '.js';
+
+  setScriptAttributes(script, dataSpotXParams);
+
+  return script;
+}
+
+function outstreamRender(bid) {
+  if (bid.renderer.config.outstream_function != null && typeof bid.renderer.config.outstream_function === 'function') {
+    const script = createOutstreamScript(bid);
+    bid.renderer.config.outstream_function(bid, script);
+  } else {
+    try {
+      const inIframe = getBidIdParameter('in_iframe', bid.renderer.config.outstream_options);
+      const easiUrl = 'https://js.spotx.tv/easi/v1/' + bid.channel_id + '.js';
+      let attributes = createScriptAttributeMap(bid);
+      if (inIframe && window.document.getElementById(inIframe).nodeName == 'IFRAME') {
+        const rawframe = window.document.getElementById(inIframe);
+        let framedoc = rawframe.contentDocument;
+        if (!framedoc && rawframe.contentWindow) {
+          framedoc = rawframe.contentWindow.document;
+        }
+        loadExternalScript(easiUrl, BIDDER_CODE, undefined, framedoc, attributes);
+      } else {
+        loadExternalScript(easiUrl, BIDDER_CODE, undefined, undefined, attributes);
+      }
+    } catch (err) {
+      logError('[SPOTX][renderer] Error:' + err.message);
+    }
+  }
+}
+
+function createScriptAttributeMap(bid) {
+  const slot = getBidIdParameter('slot', bid.renderer.config.outstream_options);
+  logMessage('[SPOTX][renderer] Handle SpotX outstream renderer');
   let dataSpotXParams = {};
   dataSpotXParams['data-spotx_channel_id'] = '' + bid.channel_id;
   dataSpotXParams['data-spotx_vast_url'] = '' + bid.vastUrl;
   dataSpotXParams['data-spotx_content_page_url'] = bid.renderer.config.content_page_url;
   dataSpotXParams['data-spotx_ad_unit'] = 'incontent';
 
-  utils.logMessage('[SPOTX][renderer] Default beahavior');
-  if (utils.getBidIdParameter('ad_mute', bid.renderer.config.outstream_options)) {
-    dataSpotXParams['data-spotx_ad_mute'] = '0';
+  logMessage('[SPOTX][renderer] Default behavior');
+  if (getBidIdParameter('ad_mute', bid.renderer.config.outstream_options)) {
+    dataSpotXParams['data-spotx_ad_mute'] = '1';
   }
   dataSpotXParams['data-spotx_collapse'] = '0';
   dataSpotXParams['data-spotx_autoplay'] = '1';
   dataSpotXParams['data-spotx_blocked_autoplay_override_mode'] = '1';
   dataSpotXParams['data-spotx_video_slot_can_autoplay'] = '1';
-
-  const playersizeAutoAdapt = utils.getBidIdParameter('playersize_auto_adapt', bid.renderer.config.outstream_options);
-  if (playersizeAutoAdapt && utils.isBoolean(playersizeAutoAdapt) && playersizeAutoAdapt === true) {
-    if (bid.width && utils.isNumber(bid.width) && bid.height && utils.isNumber(bid.height)) {
-      const ratio = bid.width / bid.height;
-      const slotClientWidth = window.document.getElementById(slot).clientWidth;
-      let playerWidth = bid.renderer.config.player_width;
-      let playerHeight = bid.renderer.config.player_height;
-      let contentWidth = 0;
-      let contentHeight = 0;
-      if (slotClientWidth < playerWidth) {
-        playerWidth = slotClientWidth;
-        playerHeight = playerWidth / ratio;
-      }
-      if (ratio <= 1) {
-        contentWidth = Math.round(playerHeight * ratio);
-        contentHeight = playerHeight;
-      } else {
-        contentWidth = playerWidth;
-        contentHeight = Math.round(playerWidth / ratio);
-      }
-
-      dataSpotXParams['data-spotx_content_width'] = '' + contentWidth;
-      dataSpotXParams['data-spotx_content_height'] = '' + contentHeight;
+  dataSpotXParams['data-spotx_content_container_id'] = slot;
+
+  const playersizeAutoAdapt = getBidIdParameter('playersize_auto_adapt', bid.renderer.config.outstream_options);
+  if (playersizeAutoAdapt && isBoolean(playersizeAutoAdapt) && playersizeAutoAdapt === true) {
+    const ratio = bid.width && isNumber(bid.width) && bid.height && isNumber(bid.height) ? bid.width / bid.height : 4 / 3;
+    const slotClientWidth = window.document.getElementById(slot).clientWidth;
+    let playerWidth = bid.renderer.config.player_width;
+    let playerHeight = bid.renderer.config.player_height;
+    let contentWidth = 0;
+    let contentHeight = 0;
+    if (slotClientWidth < playerWidth) {
+      playerWidth = slotClientWidth;
+      playerHeight = playerWidth / ratio;
+    }
+    if (ratio <= 1) {
+      contentWidth = Math.round(playerHeight * ratio);
+      contentHeight = playerHeight;
     } else {
-      utils.logWarn('[SPOTX][renderer] PlayerSize auto adapt: bid.width and bid.height are incorrect');
+      contentWidth = playerWidth;
+      contentHeight = Math.round(playerWidth / ratio);
     }
+
+    dataSpotXParams['data-spotx_content_width'] = '' + contentWidth;
+    dataSpotXParams['data-spotx_content_height'] = '' + contentHeight;
   }
 
-  const customOverride = utils.getBidIdParameter('custom_override', bid.renderer.config.outstream_options);
-  if (customOverride && utils.isPlainObject(customOverride)) {
-    utils.logMessage('[SPOTX][renderer] Custom beahavior.');
+  const customOverride = getBidIdParameter('custom_override', bid.renderer.config.outstream_options);
+  if (customOverride && isPlainObject(customOverride)) {
+    logMessage('[SPOTX][renderer] Custom behavior.');
     for (let name in customOverride) {
       if (customOverride.hasOwnProperty(name)) {
         if (name === 'channel_id' || name === 'vast_url' || name === 'content_page_url' || name === 'ad_unit') {
-          utils.logWarn('[SPOTX][renderer] Custom beahavior: following option cannot be overrided: ' + name);
+          logWarn('[SPOTX][renderer] Custom behavior: following option cannot be overridden: ' + name);
         } else {
           dataSpotXParams['data-spotx_' + name] = customOverride[name];
         }
       }
     }
   }
-
-  for (let key in dataSpotXParams) {
-    if (dataSpotXParams.hasOwnProperty(key)) {
-      script.setAttribute(key, dataSpotXParams[key]);
-    }
-  }
-
-  return script;
-}
-
-function outstreamRender(bid) {
-  const script = createOutstreamScript(bid);
-  if (bid.renderer.config.outstream_function != null && typeof bid.renderer.config.outstream_function === 'function') {
-    bid.renderer.config.outstream_function(bid, script);
-  } else {
-    try {
-      const inIframe = utils.getBidIdParameter('in_iframe', bid.renderer.config.outstream_options);
-      if (inIframe && window.document.getElementById(inIframe).nodeName == 'IFRAME') {
-        const rawframe = window.document.getElementById(inIframe);
-        let framedoc = rawframe.contentDocument;
-        if (!framedoc && rawframe.contentWindow) {
-          framedoc = rawframe.contentWindow.document;
-        }
-        framedoc.body.appendChild(script);
-      } else {
-        const slot = utils.getBidIdParameter('slot', bid.renderer.config.outstream_options);
-        if (slot && window.document.getElementById(slot)) {
-          window.document.getElementById(slot).appendChild(script);
-        } else {
-          window.document.getElementsByTagName('head')[0].appendChild(script);
-        }
-      }
-    } catch (err) {
-      utils.logError('[SPOTX][renderer] Error:' + err.message)
-    }
-  }
+  return dataSpotXParams;
 }
 
 registerBidder(spec);
diff --git a/modules/sspBCBidAdapter.js b/modules/sspBCBidAdapter.js
new file mode 100644
index 00000000000..ffe2bef054c
--- /dev/null
+++ b/modules/sspBCBidAdapter.js
@@ -0,0 +1,749 @@
+import { deepAccess, getWindowTop, isArray, logWarn } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { includes as strIncludes } from '../src/polyfill.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'sspBC';
+const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
+const SYNC_URL = 'https://ssp.wp.pl/bidder/usersync';
+const NOTIFY_URL = 'https://ssp.wp.pl/bidder/notify';
+const TRACKER_URL = 'https://bdr.wpcdn.pl/tag/jstracker.js';
+const GVLID = 676;
+const TMAX = 450;
+const BIDDER_VERSION = '5.7';
+const DEFAULT_CURRENCY = 'PLN';
+const W = window;
+const { navigator } = W;
+const oneCodeDetection = {};
+const adUnitsCalled = {};
+const adSizesCalled = {};
+const pageView = {};
+var consentApiVersion;
+
+/**
+ * Get preferred language of browser (i.e. user)
+ * @returns {string} languageCode - ISO language code
+ */
+const getBrowserLanguage = () => navigator.language || (navigator.languages && navigator.languages[0]);
+
+/**
+ * Get language of top level html object
+ * @returns {string} languageCode - ISO language code
+ */
+const getContentLanguage = () => {
+  try {
+    const topWindow = getWindowTop();
+    return topWindow.document.body.parentNode.lang;
+  } catch (err) {
+    logWarn('Could not read language form top-level html', err);
+  }
+};
+
+/**
+ * Get bid parameters for notification
+ * @param {*} bidData - bid (bidWon), or array of bids (timeout)
+ */
+const getNotificationPayload = bidData => {
+  if (bidData) {
+    const bids = isArray(bidData) ? bidData : [bidData];
+    if (bids.length > 0) {
+      let result = {
+        requestId: undefined,
+        siteId: [],
+        slotId: [],
+        tagid: [],
+      }
+      bids.forEach(bid => {
+        const { adUnitCode, auctionId, cpm, creativeId, meta, params: bidParams, requestId, timeout } = bid;
+        let params = isArray(bidParams) ? bidParams[0] : bidParams;
+        params = params || {};
+
+        // basic notification data
+        const bidBasicData = {
+          requestId: auctionId || result.requestId,
+          timeout: timeout || result.timeout,
+          pvid: pageView.id,
+        }
+        result = { ...result, ...bidBasicData }
+
+        result.tagid.push(adUnitCode);
+
+        // check for stored detection
+        if (oneCodeDetection[requestId]) {
+          params.siteId = oneCodeDetection[requestId][0];
+          params.id = oneCodeDetection[requestId][1];
+        }
+        if (params.siteId) {
+          result.siteId.push(params.siteId);
+        }
+        if (params.id) {
+          result.slotId.push(params.id);
+        }
+
+        if (cpm) {
+          // non-empty bid data
+          const bidNonEmptyData = {
+            cpm,
+            cpmpl: meta && meta.pricepl,
+            creativeId,
+            adomain: meta && meta.advertiserDomains && meta.advertiserDomains[0],
+            networkName: meta && meta.networkName,
+          }
+          result = { ...result, ...bidNonEmptyData }
+        }
+      })
+      return result;
+    }
+  }
+}
+
+const applyClientHints = ortbRequest => {
+  const { location } = document;
+  const { connection = {}, deviceMemory, userAgentData = {} } = navigator;
+  const viewport = W.visualViewport || false;
+  const segments = [];
+  const hints = {
+    'CH-Ect': connection.effectiveType,
+    'CH-Rtt': connection.rtt,
+    'CH-SaveData': connection.saveData,
+    'CH-Downlink': connection.downlink,
+    'CH-DeviceMemory': deviceMemory,
+    'CH-Dpr': W.devicePixelRatio,
+    'CH-ViewportWidth': viewport.width,
+    'CH-BrowserBrands': JSON.stringify(userAgentData.brands),
+    'CH-isMobile': userAgentData.mobile,
+  };
+
+  /**
+    Check / generate page view id
+    Should be generated dureing first call to applyClientHints(),
+    and re-generated if pathname has changed
+  */
+  if (!pageView.id || location.pathname !== pageView.path) {
+    pageView.path = location.pathname;
+    pageView.id = Math.floor(1E20 * Math.random()).toString();
+  }
+
+  Object.keys(hints).forEach(key => {
+    const hint = hints[key];
+
+    if (hint) {
+      segments.push({
+        name: key,
+        value: hint.toString(),
+      });
+    }
+  });
+  const data = [
+    {
+      id: '12',
+      name: 'NetInfo',
+      segment: segments,
+    }, {
+      id: '7',
+      name: 'pvid',
+      segment: [
+        {
+          value: pageView.id
+        }
+      ]
+    }];
+
+  const ch = { data };
+  ortbRequest.user = { ...ortbRequest.user, ...ch };
+};
+
+const applyUserIds = (validBidRequest, ortbRequest) => {
+  const eids = validBidRequest.userIdAsEids
+  if (eids && eids.length) {
+    const ids = { eids };
+    ortbRequest.user = { ...ortbRequest.user, ...ids };
+  }
+};
+
+/**
+ * Add GDPR data to oRTB request
+ * Store conset API version (will be required by user sync)
+ */
+const applyGdpr = (bidderRequest, ortbRequest) => {
+  const { gdprConsent } = bidderRequest;
+  if (gdprConsent) {
+    const { apiVersion, gdprApplies, consentString } = gdprConsent;
+    consentApiVersion = apiVersion;
+    ortbRequest.regs = Object.assign(ortbRequest.regs, { 'gdpr': gdprApplies ? 1 : 0 });
+    ortbRequest.user = Object.assign(ortbRequest.user, { 'consent': consentString });
+  }
+}
+
+/**
+ * Get currency (either default or adserver)
+ * @returns {string} currency name
+ */
+const getCurrency = () => config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY;
+
+/**
+ * Get value for first occurence of key within the collection
+ */
+const setOnAny = (collection, key) => collection.reduce((prev, next) => prev || deepAccess(next, key), false);
+
+/**
+ * Send payload to notification endpoint
+ */
+const sendNotification = payload => {
+  ajax(NOTIFY_URL, null, JSON.stringify(payload), {
+    contentType: 'application/json',
+    withCredentials: false,
+    method: 'POST',
+    crossOrigin: true
+  });
+}
+
+/**
+ * @param {object} slot Ad Unit Params by Prebid
+ * @returns {object} Banner by OpenRTB 2.5 §3.2.6
+ */
+const mapBanner = slot => {
+  if (slot.mediaType === 'banner' ||
+    deepAccess(slot, 'mediaTypes.banner') ||
+    (!slot.mediaType && !slot.mediaTypes)) {
+    const format = slot.sizes.map(size => ({
+      w: size[0],
+      h: size[1],
+    }));
+
+    return {
+      format,
+      id: slot.bidId,
+    };
+  }
+}
+
+/**
+ * @param {string} paramName Native parameter name
+ * @param {object} paramValue Native parameter value
+ * @returns {object} native asset object that conforms to ortb native ads spec
+ */
+const mapAsset = (paramName, paramValue) => {
+  let asset;
+  switch (paramName) {
+    case 'title':
+      asset = {
+        id: 0,
+        required: paramValue.required,
+        title: { len: paramValue.len }
+      }
+      break;
+    case 'cta':
+      asset = {
+        id: 1,
+        required: paramValue.required,
+        data: { type: 12 }
+      }
+      break;
+    case 'icon':
+      asset = {
+        id: 2,
+        required: paramValue.required,
+        img: { type: 1, w: paramValue.sizes[0], h: paramValue.sizes[1] }
+      }
+      break;
+    case 'image':
+      asset = {
+        id: 3,
+        required: paramValue.required,
+        img: { type: 3, w: paramValue.sizes[0], h: paramValue.sizes[1] }
+      }
+      break;
+    case 'body':
+      asset = {
+        id: 4,
+        required: paramValue.required,
+        data: { type: 2 }
+      }
+      break;
+    case 'sponsoredBy':
+      asset = {
+        id: 5,
+        required: paramValue.required,
+        data: { type: 1 }
+      }
+      break;
+  }
+  return asset;
+}
+
+/**
+ * @param {object} slot Ad Unit Params by Prebid
+ * @returns {object} native object that conforms to ortb native ads spec
+ */
+const mapNative = slot => {
+  const native = deepAccess(slot, 'mediaTypes.native');
+  let assets;
+  if (native) {
+    const nativeParams = Object.keys(native);
+    assets = [];
+    nativeParams.forEach(par => {
+      const newAsset = mapAsset(par, native[par]);
+      if (newAsset) { assets.push(newAsset) };
+    });
+  }
+  return assets ? { request: JSON.stringify({ native: { assets } }) } : undefined;
+}
+
+var mapVideo = (slot, videoFromBid) => {
+  var videoFromSlot = deepAccess(slot, 'mediaTypes.video');
+  var videoParamsUsed = ['api', 'context', 'linearity', 'maxduration', 'mimes', 'protocols', 'playbackmethod'];
+  var videoAssets;
+
+  if (videoFromSlot) {
+    const video = videoFromBid ? Object.assign(videoFromSlot, videoFromBid) : videoFromSlot;
+    var videoParams = Object.keys(video);
+    var playerSize = video.playerSize;
+    videoAssets = {}; // player width / height
+
+    if (playerSize) {
+      var maxSize = playerSize.reduce(function (prev, next) {
+        return next[0] >= prev[0] && next[1] >= prev[1] ? next : prev;
+      }, [1, 1]);
+      videoAssets.w = maxSize[0];
+      videoAssets.h = maxSize[1];
+    } // remaining supported params
+
+    videoParams.forEach(function (par) {
+      if (videoParamsUsed.indexOf(par) >= 0) {
+        videoAssets[par] = video[par];
+      }
+
+      ;
+    });
+  }
+
+  return videoAssets;
+};
+
+const mapImpression = slot => {
+  const { adUnitCode, bidId, params = {}, ortb2Imp = {} } = slot;
+  const { id, siteId, video } = params;
+  const { ext = {} } = ortb2Imp;
+
+  /*
+     check max size for this imp, and check/store number this size was called (for current view)
+     send this info as ext.pbsize
+  */
+  const slotSize = slot.sizes.length ? slot.sizes.reduce((prev, next) => prev[0] * prev[1] <= next[0] * next[1] ? next : prev).join('x') : '1x1';
+
+  if (!adUnitsCalled[adUnitCode]) {
+    // this is a new adunit - assign & save pbsize
+    adSizesCalled[slotSize] = adSizesCalled[slotSize] ? adSizesCalled[slotSize] += 1 : 1;
+    adUnitsCalled[adUnitCode] = `${slotSize}_${adSizesCalled[slotSize]}`;
+  }
+
+  ext.data = Object.assign({ pbsize: adUnitsCalled[adUnitCode] }, ext.data);
+
+  const imp = {
+    id: id && siteId ? id.padStart(3, '0') : 'bidid-' + bidId,
+    banner: mapBanner(slot),
+    native: mapNative(slot),
+    video: mapVideo(slot, video),
+    tagid: adUnitCode,
+    ext,
+  };
+
+  // Check floorprices for this imp
+  const currency = getCurrency();
+  if (typeof slot.getFloor === 'function') {
+    var bannerFloor = 0;
+    var nativeFloor = 0;
+    var videoFloor = 0; // sspBC adapter accepts only floor per imp - check for maximum value for requested ad types and sizes
+
+    if (slot.sizes.length) {
+      bannerFloor = slot.sizes.reduce(function (prev, next) {
+        var currentFloor = slot.getFloor({
+          mediaType: 'banner',
+          size: next,
+          currency
+        }).floor;
+        return prev > currentFloor ? prev : currentFloor;
+      }, 0);
+    }
+
+    nativeFloor = slot.getFloor({
+      mediaType: 'native', currency
+    });
+    videoFloor = slot.getFloor({
+      mediaType: 'video', currency
+    });
+    imp.bidfloor = Math.max(bannerFloor, nativeFloor, videoFloor);
+  } else {
+    imp.bidfloor = 0;
+  }
+  imp.bidfloorcur = currency;
+  return imp;
+}
+
+const isVideoAd = bid => {
+  const xmlTester = new RegExp(/^<\?xml/);
+  return bid.adm && bid.adm.match(xmlTester);
+}
+
+const isNativeAd = bid => {
+  const xmlTester = new RegExp(/^{['"]native['"]/);
+
+  return bid.admNative || (bid.adm && bid.adm.match(xmlTester));
+}
+
+const parseNative = nativeData => {
+  const result = {};
+  nativeData.assets.forEach(asset => {
+    const id = parseInt(asset.id);
+    switch (id) {
+      case 0:
+        result.title = asset.title.text;
+        break;
+      case 1:
+        result.cta = asset.data.value;
+        break;
+      case 2:
+        result.icon = {
+          url: asset.img.url,
+          width: asset.img.w,
+          height: asset.img.h,
+        };
+        break;
+      case 3:
+        result.image = {
+          url: asset.img.url,
+          width: asset.img.w,
+          height: asset.img.h,
+        };
+        break;
+      case 4:
+        result.body = asset.data.value;
+        break;
+      case 5:
+        result.sponsoredBy = asset.data.value;
+        break;
+
+      default:
+        logWarn('Unrecognized native asset', asset);
+    }
+  });
+  result.clickUrl = nativeData.link.url;
+  result.impressionTrackers = nativeData.imptrackers;
+
+  if (isArray(nativeData.jstracker)) {
+    result.javascriptTrackers = nativeData.jstracker;
+  } else if (nativeData.jstracker) {
+    result.javascriptTrackers = [nativeData.jstracker];
+  }
+  return result;
+}
+
+const renderCreative = (site, auctionId, bid, seat, request) => {
+  let gam;
+
+  const mcad = {
+    id: auctionId,
+    seat,
+    seatbid: [{
+      bid: [bid],
+    }],
+  };
+
+  const mcbase = btoa(encodeURI(JSON.stringify(mcad)));
+
+  if (bid.adm) {
+    // parse adm for gam config
+    try {
+      gam = JSON.parse(bid.adm).gam;
+
+      if (!gam || !Object.keys(gam).length) {
+        gam = undefined;
+      } else {
+        gam.namedSizes = ['fluid'];
+        gam.div = 'div-gpt-ad-x01';
+        gam.targeting = Object.assign(gam.targeting || {}, {
+          OAS_retarg: '0',
+          PREBID_ON: '1',
+          emptygaf: '0',
+        });
+      }
+
+      if (gam && !gam.targeting) {
+        gam.targeting = {};
+      }
+    } catch (err) {
+      logWarn('Could not parse adm data', bid.adm);
+    }
+  }
+
+  let adcode = `<head>
+  <title></title>
+  <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <style>
+    body {
+    background-color: transparent;
+    margin: 0;
+    padding: 0;
+  }
+</style>
+  <script>
+  window.rekid = ${site.id};
+  window.slot = ${parseInt(site.slot, 10)};
+  window.responseTimestamp = ${Date.now()};
+  window.wp_sn = "${site.sn}";
+  window.mcad = JSON.parse(decodeURI(atob("${mcbase}")));
+  window.gdpr = ${JSON.stringify(request.gdprConsent)};
+  window.page = "${site.page}";
+  window.ref = "${site.ref}";
+  window.adlabel = "${site.adLabel ? site.adLabel : ''}";
+  window.pubid = "${site.publisherId ? site.publisherId : ''}";
+  window.requestPVID = "${pageView.id}";
+  `;
+
+  if (gam) {
+    adcode += `window.gam = ${JSON.stringify(gam)};`;
+  }
+
+  adcode += `</script>
+    </head>
+    <body>
+    <div id="c"></div>
+    <script async crossorigin nomodule src="https://std.wpcdn.pl/wpjslib/wpjslib-inline.js" id="wpjslib"></script>
+    <script async crossorigin type="module" src="https://std.wpcdn.pl/wpjslib6/wpjslib-inline.js" id="wpjslib6"></script>
+  </body>
+  </html>`;
+
+  return adcode;
+}
+
+const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: [],
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  isBidRequestValid(bid) {
+    // as per OneCode integration, bids without params are valid
+    return true;
+  },
+  buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    if ((!validBidRequests) || (validBidRequests.length < 1)) {
+      return false;
+    }
+
+    const siteId = setOnAny(validBidRequests, 'params.siteId');
+    const publisherId = setOnAny(validBidRequests, 'params.publisherId');
+    const page = setOnAny(validBidRequests, 'params.page') || bidderRequest.refererInfo.page;
+    const domain = setOnAny(validBidRequests, 'params.domain') || bidderRequest.refererInfo.domain;
+    const tmax = setOnAny(validBidRequests, 'params.tmax') ? parseInt(setOnAny(validBidRequests, 'params.tmax'), 10) : TMAX;
+    const pbver = '$prebid.version$';
+    const testMode = setOnAny(validBidRequests, 'params.test') ? 1 : undefined;
+    const ref = bidderRequest.refererInfo.ref;
+
+    const payload = {
+      id: bidderRequest.auctionId,
+      site: {
+        id: siteId,
+        publisher: publisherId ? { id: publisherId } : undefined,
+        page,
+        domain,
+        ref,
+        content: { language: getContentLanguage() },
+      },
+      imp: validBidRequests.map(slot => mapImpression(slot)),
+      cur: [getCurrency()],
+      tmax,
+      user: {},
+      regs: {},
+      device: {
+        language: getBrowserLanguage(),
+        w: screen.width,
+        h: screen.height,
+      },
+      test: testMode,
+    };
+
+    applyGdpr(bidderRequest, payload);
+    applyClientHints(payload);
+    applyUserIds(validBidRequests[0], payload);
+
+    return {
+      method: 'POST',
+      url: `${BIDDER_URL}?bdver=${BIDDER_VERSION}&pbver=${pbver}&inver=0`,
+      data: JSON.stringify(payload),
+      bidderRequest,
+    };
+  },
+
+  interpretResponse(serverResponse, request) {
+    const { bidderRequest } = request;
+    const response = serverResponse.body;
+    const bids = [];
+    const site = JSON.parse(request.data).site; // get page and referer data from request
+    site.sn = response.sn || 'mc_adapter'; // WPM site name (wp_sn)
+    pageView.sn = site.sn; // store site_name (for syncing and notifications)
+    let seat;
+
+    if (response.seatbid !== undefined) {
+      /*
+        Match response to request, by comparing bid id's
+        'bidid-' prefix indicates oneCode (parameterless) request and response
+      */
+      response.seatbid.forEach(seatbid => {
+        let creativeCache;
+        seat = seatbid.seat;
+        seatbid.bid.forEach(serverBid => {
+          // get data from bid response
+          const { adomain, crid = `mcad_${bidderRequest.auctionId}_${site.slot}`, impid, exp = 300, ext, price, w, h } = serverBid;
+
+          const bidRequest = bidderRequest.bids.filter(b => {
+            const { bidId, params = {} } = b;
+            const { id, siteId } = params;
+            const currentBidId = id && siteId ? id : 'bidid-' + bidId;
+            return currentBidId === impid;
+          })[0];
+
+          // get data from linked bidRequest
+          const { bidId, params } = bidRequest || {};
+
+          // get slot id for current bid
+          site.slot = params && params.id;
+
+          if (ext) {
+            /*
+              bid response might include ext object containing siteId / slotId, as detected by OneCode
+              update site / slot data in this case
+
+              ext also might contain publisherId and custom ad label
+            */
+            const { siteid, slotid, pubid, adlabel, cache } = ext;
+            site.id = siteid || site.id;
+            site.slot = slotid || site.slot;
+            site.publisherId = pubid;
+            site.adLabel = adlabel;
+            creativeCache = cache;
+          }
+
+          if (bidRequest && site.id && !strIncludes(site.id, 'bidid')) {
+            // found a matching request; add this bid
+
+            // store site data for future notification
+            oneCodeDetection[bidId] = [site.id, site.slot];
+
+            const bid = {
+              requestId: bidId,
+              creativeId: crid,
+              cpm: price,
+              currency: response.cur,
+              ttl: exp,
+              width: w,
+              height: h,
+              bidderCode: BIDDER_CODE,
+              meta: {
+                advertiserDomains: adomain,
+                networkName: seat,
+                pricepl: ext && ext.pricepl,
+              },
+              netRevenue: true,
+            };
+
+            // mediaType and ad data for instream / native / banner
+            if (isVideoAd(serverBid)) {
+              // video
+              bid.adType = 'instream';
+              bid.mediaType = 'video';
+              bid.vastXml = serverBid.adm;
+              bid.vastContent = serverBid.adm;
+              bid.vastUrl = creativeCache;
+            } else if (isNativeAd(serverBid)) {
+              // native
+              bid.mediaType = 'native';
+              // check native object
+              try {
+                const nativeData = serverBid.admNative || JSON.parse(serverBid.adm).native;
+                bid.native = parseNative(nativeData);
+                bid.width = 1;
+                bid.height = 1;
+
+                // append viewability tracker
+                const jsData = {
+                  rid: bidRequest.auctionId,
+                  crid: bid.creativeId,
+                  adunit: bidRequest.adUnitCode,
+                  url: bid.native.clickUrl,
+                  vendor: seat,
+                  site: site.id,
+                  slot: site.slot,
+                  cpm: bid.cpm.toPrecision(4),
+                };
+                const jsTracker = '<script type="text/javascript" async="true" src="' + TRACKER_URL + '" ' + Object.keys(jsData).reduce((acc, current) => { return acc + ` data-wpar-${current}="${jsData[current]}"` }, '') + '><\/script>';
+                if (bid.native.javascriptTrackers) {
+                  bid.native.javascriptTrackers.push(jsTracker);
+                } else {
+                  bid.native.javascriptTrackers = [jsTracker];
+                }
+              } catch (err) {
+                logWarn('Could not parse native data', serverBid.adm);
+                bid.cpm = 0;
+              }
+            } else {
+              // banner ad (default)
+              bid.mediaType = 'banner';
+              bid.ad = renderCreative(site, response.id, serverBid, seat, bidderRequest);
+            }
+
+            if (bid.cpm > 0) {
+              bids.push(bid);
+            }
+          } else {
+            logWarn('Discarding response - no matching request / site id', serverBid.impid);
+          }
+        });
+      });
+    }
+
+    return bids;
+  },
+  getUserSyncs(syncOptions, serverResponses, gdprConsent) {
+    let mySyncs = [];
+    // TODO: the check on CMP api version does not seem to make sense here. It means "always run the usersync unless an old (v1) CMP was detected". No attention is paid to the consent choices.
+    if (syncOptions.iframeEnabled && consentApiVersion != 1) {
+      mySyncs.push({
+        type: 'iframe',
+        url: `${SYNC_URL}?tcf=${consentApiVersion}&pvid=${pageView.id}&sn=${pageView.sn}`,
+      });
+    };
+    return mySyncs;
+  },
+
+  onTimeout(timeoutData) {
+    const payload = getNotificationPayload(timeoutData);
+    if (payload) {
+      payload.event = 'timeout';
+      sendNotification(payload);
+      return payload;
+    }
+  },
+
+  onBidWon(bid) {
+    const payload = getNotificationPayload(bid);
+    if (payload) {
+      payload.event = 'bidWon';
+      sendNotification(payload);
+      return payload;
+    }
+  },
+};
+
+registerBidder(spec);
+
+export {
+  spec,
+};
diff --git a/modules/sspBCBidAdapter.md b/modules/sspBCBidAdapter.md
new file mode 100644
index 00000000000..4ae2e425865
--- /dev/null
+++ b/modules/sspBCBidAdapter.md
@@ -0,0 +1,47 @@
+# Overview
+
+Module Name: sspBC Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: wojciech.bialy@grupawp.pl
+
+# Description
+
+Module that connects to Wirtualna Polska Media header bidding endpoint to fetch bids.
+Supports Banner, Video (instream) and Native formats 
+Supported currencies: USD, EUR, PLN
+
+Required parameters:
+- none
+
+Optional parameters:
+- site id 
+- adslot id
+- publisher id
+- domain
+- page
+- tmax
+- test
+- video
+
+# Test Parameters
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bids: [{
+         bidder: 'sspBC',
+         params: {
+            id: "006",
+            siteId: "235911",
+            test: 1
+         }
+       }]
+   }
+];
+```
diff --git a/modules/staqAnalyticsAdapter.js b/modules/staqAnalyticsAdapter.js
index 4e3914bccdd..13996adfb7e 100644
--- a/modules/staqAnalyticsAdapter.js
+++ b/modules/staqAnalyticsAdapter.js
@@ -1,8 +1,8 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import { logInfo, logError, parseUrl, _each } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { getRefererInfo } from '../src/refererDetection.js';
-import * as utils from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { getStorageManager } from '../src/storageManager.js';
 
@@ -21,12 +21,13 @@ const STAQ_EVENTS = {
   BID_WON: 'bidWon',
   AUCTION_END: 'auctionEnd',
   TIMEOUT: 'adapterTimedOut'
-}
+};
 
 function buildRequestTemplate(connId) {
-  const url = staqAdapterRefWin.referer;
-  const ref = staqAdapterRefWin.referer;
-  const topLocation = staqAdapterRefWin.referer;
+  // TODO: what should these pick from refererInfo?
+  const url = staqAdapterRefWin.topmostLocation;
+  const ref = staqAdapterRefWin.topmostLocation;
+  const topLocation = staqAdapterRefWin.topmostLocation;
 
   return {
     ver: ANALYTICS_VERSION,
@@ -94,14 +95,14 @@ analyticsAdapter.context = {};
 analyticsAdapter.originEnableAnalytics = analyticsAdapter.enableAnalytics;
 
 analyticsAdapter.enableAnalytics = (config) => {
-  utils.logInfo('Enabling STAQ Adapter');
+  logInfo('Enabling STAQ Adapter');
   staqAdapterRefWin = getRefererInfo(window);
   if (!config.options.connId) {
-    utils.logError('ConnId is not defined. STAQ Analytics won\'t work');
+    logError('ConnId is not defined. STAQ Analytics won\'t work');
     return;
   }
   if (!config.options.url) {
-    utils.logError('URL is not defined. STAQ Analytics won\'t work');
+    logError('URL is not defined. STAQ Analytics won\'t work');
     return;
   }
   analyticsAdapter.context = {
@@ -133,7 +134,7 @@ function sendAll() {
 }
 
 analyticsAdapter.ajaxCall = function ajaxCall(data) {
-  utils.logInfo('SENDING DATA: ' + data);
+  logInfo('SENDING DATA: ' + data);
   ajax(`https://${analyticsAdapter.context.url}/prebid/${analyticsAdapter.context.connectionId}`, () => {}, data, { contentType: 'text/plain' });
 };
 
@@ -248,7 +249,7 @@ export function getUmtSource(pageUrl, referrer) {
       if (se) {
         return asUtm(se, ORGANIC, ORGANIC);
       }
-      let parsedUrl = utils.parseUrl(pageUrl);
+      let parsedUrl = parseUrl(pageUrl);
       let [refHost, refPath] = getReferrer(referrer);
       if (refHost && refHost !== parsedUrl.hostname) {
         return asUtm(refHost, REFERRAL, REFERRAL, '', refPath);
@@ -275,17 +276,17 @@ export function getUmtSource(pageUrl, referrer) {
   }
 
   function getReferrer(referrer) {
-    let ref = utils.parseUrl(referrer);
+    let ref = parseUrl(referrer);
     return [ref.hostname, ref.pathname];
   }
 
   function getUTM(pageUrl) {
-    let urlParameters = utils.parseUrl(pageUrl).search;
+    let urlParameters = parseUrl(pageUrl).search;
     if (!urlParameters['utm_campaign'] || !urlParameters['utm_source']) {
       return;
     }
     let utmArgs = [];
-    utils._each(UTM_TAGS, (utmTagName) => {
+    _each(UTM_TAGS, (utmTagName) => {
       let utmValue = urlParameters[utmTagName] || '';
       utmArgs.push(utmValue);
     });
diff --git a/modules/stroeerCoreBidAdapter.js b/modules/stroeerCoreBidAdapter.js
new file mode 100644
index 00000000000..722cffab16d
--- /dev/null
+++ b/modules/stroeerCoreBidAdapter.js
@@ -0,0 +1,232 @@
+import {buildUrl, deepAccess, getWindowSelf, getWindowTop, isEmpty, isStr, logWarn} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+
+const GVL_ID = 136;
+const BIDDER_CODE = 'stroeerCore';
+const DEFAULT_HOST = 'hb.adscale.de';
+const DEFAULT_PATH = '/dsh';
+const DEFAULT_PORT = '';
+const FIVE_MINUTES_IN_SECONDS = 300;
+const USER_SYNC_IFRAME_URL = 'https://js.adscale.de/pbsync.html';
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVL_ID,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: (function () {
+    const validators = [];
+
+    const createValidator = (checkFn, msg) => {
+      return (bidRequest) => {
+        if (checkFn(bidRequest)) {
+          return true;
+        } else {
+          logWarn(`${BIDDER_CODE}: Bid setup for ${bidRequest.adUnitCode} is invalid: ${msg}`);
+          return false;
+        }
+      }
+    };
+
+    const hasValidMediaType = bidReq => hasBanner(bidReq) || hasVideo(bidReq);
+
+    validators.push(createValidator((bidReq) => hasValidMediaType(bidReq),
+      'the media type is invalid'));
+    validators.push(createValidator((bidReq) => typeof bidReq.params === 'object',
+      'the custom params does not exist'));
+    validators.push(createValidator((bidReq) => isStr(bidReq.params.sid),
+      'the sid field must be a string'));
+
+    return function (bidRequest) {
+      return validators.every(f => f(bidRequest));
+    }
+  }()),
+
+  buildRequests: function (validBidRequests = [], bidderRequest) {
+    const anyBid = bidderRequest.bids[0];
+
+    const refererInfo = bidderRequest.refererInfo;
+
+    const basePayload = {
+      id: bidderRequest.auctionId,
+      ref: refererInfo.ref,
+      ssl: isSecureWindow(),
+      mpa: isMainPageAccessible(),
+      timeout: bidderRequest.timeout - (Date.now() - bidderRequest.auctionStart),
+      url: refererInfo.page,
+      schain: anyBid.schain
+    };
+
+    const userIds = anyBid.userId;
+
+    if (!isEmpty(userIds)) {
+      basePayload.user = {
+        euids: userIds
+      };
+    }
+
+    const gdprConsent = bidderRequest.gdprConsent;
+
+    if (gdprConsent && gdprConsent.consentString != null && gdprConsent.gdprApplies != null) {
+      basePayload.gdpr = {
+        consent: bidderRequest.gdprConsent.consentString, applies: bidderRequest.gdprConsent.gdprApplies
+      };
+    }
+
+    const bannerBids = validBidRequests
+      .filter(hasBanner)
+      .map(mapToPayloadBannerBid);
+
+    const videoBids = validBidRequests
+      .filter(hasVideo)
+      .map(mapToPayloadVideoBid);
+
+    return {
+      method: 'POST',
+      url: buildEndpointUrl(anyBid.params),
+      data: {...basePayload, bids: [...bannerBids, ...videoBids]}
+    };
+  },
+
+  interpretResponse: function (serverResponse) {
+    const bids = [];
+
+    if (serverResponse.body && typeof serverResponse.body === 'object') {
+      serverResponse.body.bids.forEach(bidResponse => {
+        const mediaType = bidResponse.vastXml != null ? VIDEO : BANNER;
+
+        const bid = {
+          requestId: bidResponse.bidId,
+          cpm: bidResponse.cpm || 0,
+          width: bidResponse.width || 0,
+          height: bidResponse.height || 0,
+          ttl: FIVE_MINUTES_IN_SECONDS,
+          currency: 'EUR',
+          netRevenue: true,
+          creativeId: '',
+          meta: {
+            advertiserDomains: bidResponse.adomain
+          },
+          mediaType,
+        };
+
+        if (mediaType === VIDEO) {
+          bid.vastXml = bidResponse.vastXml;
+        } else {
+          bid.ad = bidResponse.ad;
+        }
+
+        bids.push(bid);
+      });
+    }
+
+    return bids;
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent) {
+    if (serverResponses.length > 0 && syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: USER_SYNC_IFRAME_URL + getGdprParams(gdprConsent)
+      }];
+    }
+
+    return [];
+  }
+};
+
+const isSecureWindow = () => getWindowSelf().location.protocol === 'https:';
+
+const isMainPageAccessible = () => {
+  try {
+    return !!getWindowTop().location.href;
+  } catch (ignore) {
+    return false;
+  }
+}
+
+const elementInView = (elementId) => {
+  const resolveElement = (elId) => {
+    const win = getWindowSelf();
+
+    return win.document.getElementById(elId);
+  };
+
+  const visibleInWindow = (el, win) => {
+    const rect = el.getBoundingClientRect();
+    const inView = (rect.top + rect.height >= 0) && (rect.top <= win.innerHeight);
+
+    if (win !== win.parent) {
+      return inView && visibleInWindow(win.frameElement, win.parent);
+    }
+
+    return inView;
+  };
+
+  try {
+    return visibleInWindow(resolveElement(elementId), getWindowSelf());
+  } catch (e) {
+    // old browser, element not found, cross-origin etc.
+  }
+  return undefined;
+}
+
+const buildEndpointUrl = ({host: hostname = DEFAULT_HOST, port = DEFAULT_PORT, securePort, path: pathname = DEFAULT_PATH}) => {
+  if (securePort) {
+    port = securePort;
+  }
+
+  return buildUrl({protocol: 'https', hostname, port, pathname});
+}
+
+const getGdprParams = gdprConsent => {
+  if (gdprConsent) {
+    const consentString = encodeURIComponent(gdprConsent.consentString || '')
+    const isGdpr = gdprConsent.gdprApplies ? 1 : 0;
+
+    return `?gdpr=${isGdpr}&gdpr_consent=${consentString}`
+  } else {
+    return '';
+  }
+}
+
+const hasBanner = bidReq => {
+  return (!bidReq.mediaTypes && !bidReq.mediaType) ||
+    (bidReq.mediaTypes && bidReq.mediaTypes.banner) ||
+    bidReq.mediaType === BANNER;
+}
+
+const hasVideo = bidReq => {
+  const mediaTypes = bidReq.mediaTypes;
+  return mediaTypes &&
+    mediaTypes.video &&
+    ['instream', 'outstream'].indexOf(mediaTypes.video.context) > -1;
+};
+
+const mapToPayloadBaseBid = (bidRequest) => ({
+  bid: bidRequest.bidId,
+  sid: bidRequest.params.sid,
+  viz: elementInView(bidRequest.adUnitCode),
+});
+
+const mapToPayloadBannerBid = (bidRequest) => ({
+  ban: {
+    siz: deepAccess(bidRequest, 'mediaTypes.banner.sizes') || [],
+  },
+  ...mapToPayloadBaseBid(bidRequest)
+});
+
+const mapToPayloadVideoBid = (bidRequest) => {
+  const video = deepAccess(bidRequest, 'mediaTypes.video') || {};
+  return {
+    vid: {
+      ctx: video.context,
+      siz: video.playerSize,
+      mim: video.mimes,
+    },
+    ...mapToPayloadBaseBid(bidRequest)
+  };
+};
+
+registerBidder(spec);
diff --git a/modules/stroeerCoreBidAdapter.md b/modules/stroeerCoreBidAdapter.md
new file mode 100644
index 00000000000..f9e26e1ad3e
--- /dev/null
+++ b/modules/stroeerCoreBidAdapter.md
@@ -0,0 +1,69 @@
+## Overview
+
+```
+Module Name: Stroeer Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: help@cz.stroeer-labs.com
+```
+
+### Bid Params
+
+| Name          | Scope    | Description        | Example                                 | Type     |
+|---------------|----------|--------------------|-----------------------------------------|----------|
+| `sid`         | required | Slot ID            | `'06b782cc-091b-4f53-9cd2-0291679aa1ac'`| `string` |
+
+### Ad Unit Configuration
+
+#### Banner
+
+* The server will ignore sizes that are not supported by the slot or by the platform (such as 987x123).
+
+##### Example
+
+```javascript
+var adUnits = [
+  { 
+    code: 'your-banner-adunit-code',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    },
+    bids: [{
+      bidder: 'stroeerCore',
+      params: {
+        sid: '06b782cc-091b-4f53-9cd2-0291679aa1ac'
+      }    
+    }]
+  }
+];
+```
+
+#### Video
+
+* Both instream and outstream contexts are supported.
+* We do not provide an outstream renderer. You will need to set up your own. See [Show Outstream Video Ads](https://docs.prebid.org/dev-docs/show-outstream-video-ads.html) for more information.
+* On `mediaTypes.video`, the fields `context` and `mediaTypes` are required.
+
+##### Example
+
+```javascript
+var adUnits = [
+  {
+    code: 'your-video-adunit-code',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        mimes: ['video/mp4', 'video/quicktime', 'video/x-ms-wmv']
+      }
+    },
+    bids: [{
+      bidder: 'stroeerCore',
+      params: {
+        sid: '35d4225e-f8e3-4f45-b1ea-77913afd00d1'
+      }
+    }]
+  }
+];
+```
diff --git a/modules/stvBidAdapter.js b/modules/stvBidAdapter.js
deleted file mode 100644
index 2200e01b089..00000000000
--- a/modules/stvBidAdapter.js
+++ /dev/null
@@ -1,150 +0,0 @@
-
-import * as utils from '../src/utils.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'stv';
-const VADS_ENDPOINT_URL = 'https://ads.smartstream.tv/r/';
-const DEFAULT_VIDEO_SOURCE = 'vads';
-const DEFAULT_BANNER_FORMAT = 'vast2';
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['vads'],
-  supportedMediaTypes: [BANNER, VIDEO],
-  isBidRequestValid: function(bid) {
-    return !!(bid.params.placement);
-  },
-  buildRequests: function(validBidRequests, bidderRequest) {
-    return validBidRequests.map(bidRequest => {
-      const params = bidRequest.params;
-
-      const videoData = utils.deepAccess(bidRequest, 'mediaTypes.video') || {};
-      const sizes = utils.parseSizesInput(videoData.playerSize || bidRequest.sizes)[0];
-      const width = sizes.split('x')[0];
-      const height = sizes.split('x')[1];
-
-      const placementId = params.placement;
-
-      const rnd = Math.floor(Math.random() * 99999999999);
-      const referrer = bidderRequest.refererInfo.referer;
-      const bidId = bidRequest.bidId;
-      let endpoint = VADS_ENDPOINT_URL;
-
-      let payload = {};
-      if (isVideoRequest(bidRequest)) {
-        const source = params.source || DEFAULT_VIDEO_SOURCE;
-        if (source === 'vads') {
-          payload = {
-            _f: 'vast2',
-            alternative: 'prebid_js',
-            _ps: placementId,
-            srw: width,
-            srh: height,
-            idt: 100,
-            rnd: rnd,
-            ref: referrer,
-            bid_id: bidId,
-          };
-          endpoint = VADS_ENDPOINT_URL;
-        }
-      } else {
-        const outputFormat = params.format || DEFAULT_BANNER_FORMAT;
-        payload = {
-          _f: outputFormat,
-          alternative: 'prebid_js',
-          inventory_item_id: placementId,
-          srw: width,
-          srh: height,
-          idt: 100,
-          rnd: rnd,
-          ref: referrer,
-          bid_id: bidId,
-        };
-      }
-      prepareExtraParams(params, payload);
-
-      return {
-        method: 'GET',
-        url: endpoint,
-        data: objectToQueryString(payload),
-      }
-    });
-  },
-  interpretResponse: function(serverResponse, bidRequest) {
-    const bidResponses = [];
-    const response = serverResponse.body;
-    const crid = response.crid || 0;
-    const cpm = response.cpm / 1000000 || 0;
-    if (cpm !== 0 && crid !== 0) {
-      const dealId = response.dealid || '';
-      const currency = response.currency || 'EUR';
-      const netRevenue = (response.netRevenue === undefined) ? true : response.netRevenue;
-      const bidResponse = {
-        requestId: response.bid_id,
-        cpm: cpm,
-        width: response.width,
-        height: response.height,
-        creativeId: crid,
-        dealId: dealId,
-        currency: currency,
-        netRevenue: netRevenue,
-        ttl: config.getConfig('_bidderTimeout')
-      };
-
-      if (response.vastXml) {
-        bidResponse.vastXml = response.vastXml;
-        bidResponse.mediaType = 'video';
-      } else {
-        bidResponse.ad = response.adTag;
-      }
-
-      bidResponses.push(bidResponse);
-    }
-    return bidResponses;
-  }
-}
-
-function objectToQueryString(obj, prefix) {
-  let str = [];
-  let p;
-  for (p in obj) {
-    if (obj.hasOwnProperty(p)) {
-      let k = prefix ? prefix + '[' + p + ']' : p;
-      let v = obj[p];
-      str.push((v !== null && typeof v === 'object')
-        ? objectToQueryString(v, k)
-        : encodeURIComponent(k) + '=' + (k == '_ps' ? v : encodeURIComponent(v)));
-    }
-  }
-  return str.join('&');
-}
-
-/**
- * Check if it's a video bid request
- *
- * @param {BidRequest} bid - Bid request generated from ad slots
- * @returns {boolean} True if it's a video bid
- */
-function isVideoRequest(bid) {
-  return bid.mediaType === 'video' || !!utils.deepAccess(bid, 'mediaTypes.video');
-}
-
-function prepareExtraParams(params, payload) {
-  if (params.pfilter !== undefined) {
-    payload.pfilter = params.pfilter;
-  }
-  if (params.bcat !== undefined) {
-    payload.bcat = params.bcat;
-  }
-  if (params.noskip !== undefined) {
-    payload.noskip = params.noskip;
-  }
-
-  if (params.dvt !== undefined) {
-    payload.dvt = params.dvt;
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/stvBidAdapter.md b/modules/stvBidAdapter.md
deleted file mode 100644
index 79e958c3bba..00000000000
--- a/modules/stvBidAdapter.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Overview
-
-```
-Module Name: STV Video Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: prebid@dspx.tv
-```
-
-# Description
-
-STV video adapter for Prebid.js 1.x
-
-# Parameters
-```
-    var adUnits = [
-        {
-            // video settings
-            code: 'video-obj',
-            mediaTypes: {
-                video: {
-                    context: 'instream',
-                    playerSize: [640, 480]
-                }
-            },
-            bids: [
-                {
-                    bidder: "stv",
-                    params: {
-                        placement: "", // placement ID of inventory with STV
-                        noskip: 1, // 0 or 1 
-                        pfilter: {/*
-                            min_duration: 10, // min duration
-                            max_duration: 30, // max duration
-                            min_bitrate:  300, // min bitrate
-                            max_bitrate:  1600, // max bitrate
-                        */}
-                    }
-                 }
-            ]
-        }
-    ];
-```
-
diff --git a/modules/sublimeBidAdapter.js b/modules/sublimeBidAdapter.js
index 1f8cb59f442..2d177fbe6eb 100644
--- a/modules/sublimeBidAdapter.js
+++ b/modules/sublimeBidAdapter.js
@@ -1,6 +1,6 @@
+import { logInfo, generateUUID, formatQS, triggerPixel, deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
-import * as utils from '../src/utils.js';
 
 const BIDDER_CODE = 'sublime';
 const BIDDER_GVLID = 114;
@@ -9,7 +9,33 @@ const DEFAULT_CURRENCY = 'EUR';
 const DEFAULT_PROTOCOL = 'https';
 const DEFAULT_TTL = 600;
 const SUBLIME_ANTENNA = 'antenna.ayads.co';
-const SUBLIME_VERSION = '0.5.2';
+const SUBLIME_VERSION = '0.8.0';
+
+/**
+ * Identify the current device type
+ * @returns {string}
+ */
+function detectDevice() {
+  const isMobile = /(?:phone|windows\s+phone|ipod|blackberry|Galaxy Nexus|SM-G892A|(?:android|bbd+|meego|silk|googlebot) .+?mobile|palm|windows\s+ce|opera mini|avantgo|docomo)/i;
+
+  const isTablet = /(?:ipad|playbook|Tablet|(?:android|bb\d+|meego|silk)(?! .+? mobile))/i;
+
+  return (
+    (isMobile.test(navigator.userAgent) && 'm') || // mobile
+    (isTablet.test(navigator.userAgent) && 't') || // tablet
+    'd' // desktop
+  );
+}
+
+const UUID_V4_RE = /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
+/**
+ * Checks whether a notifyId is well-formed
+ * @param {*} value
+ * @returns {boolean}
+ */
+function isValidNotifyId(value) {
+  return UUID_V4_RE.test(value);
+}
 
 /**
  * Debug log message
@@ -17,13 +43,15 @@ const SUBLIME_VERSION = '0.5.2';
  * @param {Object=} obj
  */
 export function log(msg, obj) {
-  utils.logInfo('SublimeBidAdapter - ' + msg, obj);
+  logInfo('SublimeBidAdapter - ' + msg, obj);
 }
 
 // Default state
 export const state = {
   zoneId: '',
-  transactionId: ''
+  transactionId: '',
+  notifyId: '',
+  timeout: config.getConfig('bidderTimeout'),
 };
 
 /**
@@ -35,11 +63,32 @@ export function setState(value) {
   log('State has been updated :', state);
 }
 
+/**
+ * Get a notifyId from bid params or from sublime global
+ * @param {Object} params - The bid params
+ * @return {string}
+ */
+function getNotifyId(params) {
+  const sublime = window.sublime = window.sublime || {};
+
+  let notifyId = params.notifyId || sublime.notifyId;
+  if (!notifyId) {
+    notifyId = generateUUID();
+    log('generating a notifyId', notifyId);
+  }
+  if (!sublime.notifyId) {
+    sublime.notifyId = notifyId;
+  }
+
+  return notifyId;
+}
+
 /**
  * Send pixel to our debug endpoint
  * @param {string} eventName - Event name that will be send in the e= query string
+ * @param {string} [sspName] - The optionnal name of the AD provider
  */
-export function sendEvent(eventName) {
+export function sendEvent(eventName, sspName) {
   const ts = Date.now();
   const eventObject = {
     t: ts,
@@ -47,15 +96,22 @@ export function sendEvent(eventName) {
     z: state.zoneId,
     e: eventName,
     src: 'pa',
-    puid: state.transactionId,
-    trId: state.transactionId,
-    ver: SUBLIME_VERSION,
+    puid: state.transactionId || state.notifyId,
+    notid: state.notifyId || '',
+    pbav: SUBLIME_VERSION,
+    pubtimeout: state.timeout,
+    pubpbv: '$prebid.version$',
+    device: detectDevice(),
   };
 
+  if (eventName === 'bidwon') {
+    eventObject.sspname = sspName || '';
+  }
+
   log('Sending pixel for event: ' + eventName, eventObject);
 
-  const queryString = utils.formatQS(eventObject);
-  utils.triggerPixel('https://' + SUBLIME_ANTENNA + '/?' + queryString);
+  const queryString = formatQS(eventObject);
+  triggerPixel('https://' + SUBLIME_ANTENNA + '/?' + queryString);
 }
 
 /**
@@ -65,6 +121,16 @@ export function sendEvent(eventName) {
  * @return {Boolean} True if this is a valid bid, and false otherwise.
  */
 function isBidRequestValid(bid) {
+  const notifyId = getNotifyId(bid.params);
+  if (!isValidNotifyId(notifyId)) {
+    log(`invalid notifyId format, got "${notifyId}"`);
+    return false;
+  }
+  if (notifyId !== window.sublime.notifyId) {
+    log(`notifyId mismatch: params [${bid.params.notifyId}] / sublime [${window.sublime.notifyId}]`);
+    return false;
+  }
+
   return !!Number(bid.params.zoneId);
 }
 
@@ -84,9 +150,12 @@ function buildRequests(validBidRequests, bidderRequest) {
     timeout: (typeof bidderRequest === 'object' && !!bidderRequest) ? bidderRequest.timeout : config.getConfig('bidderTimeout'),
   };
 
+  setState({ timeout: commonPayload.timeout });
+
   // RefererInfo
   if (bidderRequest && bidderRequest.refererInfo) {
-    commonPayload.referer = bidderRequest.refererInfo.referer;
+    // TODO: is 'topmostLocation' the right value here?
+    commonPayload.referer = bidderRequest.refererInfo.topmostLocation;
     commonPayload.numIframes = bidderRequest.refererInfo.numIframes;
   }
   // GDPR handling
@@ -99,8 +168,11 @@ function buildRequests(validBidRequests, bidderRequest) {
     const bidHost = bid.params.bidHost || DEFAULT_BID_HOST;
     const protocol = bid.params.protocol || DEFAULT_PROTOCOL;
 
+    const notifyId = getNotifyId(bid.params);
+
     setState({
       transactionId: bid.transactionId,
+      notifyId,
       zoneId: bid.params.zoneId,
       debug: bid.params.debug || false,
     });
@@ -117,6 +189,7 @@ function buildRequests(validBidRequests, bidderRequest) {
         h: size[1],
       })),
       transactionId: bid.transactionId,
+      notifyId,
       zoneId: bid.params.zoneId,
     };
 
@@ -125,10 +198,10 @@ function buildRequests(validBidRequests, bidderRequest) {
     return {
       method: 'POST',
       url: protocol + '://' + bidHost + '/bid',
-      data: payload,
+      data: JSON.stringify(payload),
       options: {
-        contentType: 'application/json',
-        withCredentials: true
+        contentType: 'text/plain',
+        withCredentials: false
       },
     }
   });
@@ -176,9 +249,16 @@ function interpretResponse(serverResponse, bidRequest) {
       netRevenue: response.netRevenue || true,
       ttl: response.ttl || DEFAULT_TTL,
       ad: response.ad,
-      pbav: SUBLIME_VERSION
+      pbav: SUBLIME_VERSION,
+      sspname: response.sspname || null
     };
 
+    // We don't support advertiserDomains atm
+    if (response.advertiserDomains) {
+      // Creating a stub for Prebid.js 5.0 compliance
+      bidResponse.meta = Object.assign({}, bidResponse.meta, { advertiserDomains: [] });
+    }
+
     bidResponses.push(bidResponse);
   }
 
@@ -187,19 +267,25 @@ function interpretResponse(serverResponse, bidRequest) {
 
 /**
  * Send pixel when bidWon event is triggered
- * @param {Object} timeoutData
+ * @param {Object} bid
  */
 function onBidWon(bid) {
   log('Bid won', bid);
-  sendEvent('bidwon');
+  sendEvent('bidwon', bid.sspname);
 }
 
 /**
  * Send debug when we timeout
- * @param {Object} timeoutData
+ * @param {Array[{}]} timeoutData
  */
 function onTimeout(timeoutData) {
   log('Timeout from adapter', timeoutData);
+
+  const timeout = deepAccess(timeoutData, '0.timeout');
+  if (timeout) {
+    // Set timeout to the one we got from the bid
+    setState({ timeout });
+  }
   sendEvent('bidtimeout');
 }
 
@@ -207,11 +293,18 @@ export const spec = {
   code: BIDDER_CODE,
   gvlid: BIDDER_GVLID,
   aliases: [],
-  isBidRequestValid: isBidRequestValid,
-  buildRequests: buildRequests,
-  interpretResponse: interpretResponse,
-  onBidWon: onBidWon,
-  onTimeout: onTimeout,
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  onBidWon,
+  onTimeout,
+  // Exposed for test purpose
+  sendEvent,
+  setState,
+  state,
+  detectDevice,
+  getNotifyId,
+  isValidNotifyId,
 };
 
 registerBidder(spec);
diff --git a/modules/sublimeBidAdapter.md b/modules/sublimeBidAdapter.md
index e57f4a1fdb0..5cd1c95b682 100644
--- a/modules/sublimeBidAdapter.md
+++ b/modules/sublimeBidAdapter.md
@@ -9,7 +9,7 @@ Maintainer: pbjs@sublimeskinz.com
 # Description
 
 Connects to Sublime for bids.
-Sublime bid adapter supports Skinz and M-Skinz formats.
+Sublime bid adapter supports Skinz.
 
 # Nota Bene
 
@@ -53,10 +53,13 @@ var adUnits = [{
     bids: [{
         bidder: 'sublime',
         params: {
-            zoneId: <zoneId>
+            zoneId: <zoneId>,
+            notifyId: <notifyId>
         }
     }]
 }];
 ```
 
-Where you replace `<zoneId>` by your Sublime Zone id
+Where you replace:
+- `<zoneId>` by your Sublime Zone id;
+- `<notifyId>` by your Sublime Notify id
diff --git a/modules/supply2BidAdapter.md b/modules/supply2BidAdapter.md
deleted file mode 100644
index 3d86f065abf..00000000000
--- a/modules/supply2BidAdapter.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Overview
-
-Module Name: Supply2 Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: vishal@mediadonuts.com
-
-# Description
-
-Module that connects to Media Donuts demand source to fetch bids.
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "supply2",
-                       params: {
-                           uid: '23',
-                           priceType: 'gross' // by default is 'net'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[728, 90]],
-               bids: [
-                   {
-                       bidder: "supply2",
-                       params: {
-                           uid: 24,
-                           priceType: 'gross'
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/synacormediaBidAdapter.js b/modules/synacormediaBidAdapter.js
index 8f069f551ee..4ebed12cb05 100644
--- a/modules/synacormediaBidAdapter.js
+++ b/modules/synacormediaBidAdapter.js
@@ -1,18 +1,20 @@
 'use strict';
 
-import { getAdUnitSizes, logWarn } from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {deepAccess, deepSetValue, getAdUnitSizes, isFn, isPlainObject, logWarn} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {includes} from '../src/polyfill.js';
 import {config} from '../src/config.js';
 
-const BID_HOST = 'https://prebid.technoratimedia.com';
+const BID_SCHEME = 'https://';
+const BID_DOMAIN = 'technoratimedia.com';
 const USER_SYNC_HOST = 'https://ad-cdn.technoratimedia.com';
 const VIDEO_PARAMS = [ 'minduration', 'maxduration', 'startdelay', 'placement', 'linearity', 'mimes', 'protocols', 'api' ];
 const BLOCKED_AD_SIZES = [
   '1x1',
   '1x2'
 ];
+const DEFAULT_MAX_TTL = 420; // 7 minutes
 export const spec = {
   code: 'synacormedia',
   supportedMediaTypes: [ BANNER, VIDEO ],
@@ -23,7 +25,7 @@ export const spec = {
       bid.mediaTypes.hasOwnProperty('video');
   },
   isBidRequestValid: function(bid) {
-    const hasRequiredParams = bid && bid.params && bid.params.hasOwnProperty('placementId') && bid.params.hasOwnProperty('seatId');
+    const hasRequiredParams = bid && bid.params && (bid.params.hasOwnProperty('placementId') || bid.params.hasOwnProperty('tagId')) && bid.params.hasOwnProperty('seatId');
     const hasAdSizes = bid && getAdUnitSizes(bid).filter(size => BLOCKED_AD_SIZES.indexOf(size.join('x')) === -1).length > 0
     return !!(hasRequiredParams && hasAdSizes);
   },
@@ -36,9 +38,10 @@ export const spec = {
     const openRtbBidRequest = {
       id: bidderRequest.auctionId,
       site: {
-        domain: location.hostname,
-        page: refererInfo.referer,
-        ref: document.referrer
+        // TODO: does the fallback make sense here?
+        domain: refererInfo.domain || location.hostname,
+        page: refererInfo.page,
+        ref: refererInfo.ref
       },
       device: {
         ua: navigator.userAgent
@@ -46,6 +49,13 @@ export const spec = {
       imp: []
     };
 
+    const callbackTimeout = bidderRequest.timeout;
+    const globalTimeout = config.getConfig('bidderTimeout');
+    const tmax = globalTimeout ? Math.min(globalTimeout, callbackTimeout) : callbackTimeout;
+    if (tmax) {
+      openRtbBidRequest.tmax = tmax;
+    }
+
     const schain = validBidReqs[0].schain;
     if (schain) {
       openRtbBidRequest.source = { ext: { schain } };
@@ -60,12 +70,8 @@ export const spec = {
       } else {
         seatId = bid.params.seatId;
       }
-      const placementId = bid.params.placementId;
-      const bidFloor = bid.params.bidfloor ? parseFloat(bid.params.bidfloor) : null;
-      if (isNaN(bidFloor)) {
-        logWarn(`Synacormedia: there is an invalid bid floor: ${bid.params.bidfloor}`);
-      }
-      let pos = parseInt(bid.params.pos, 10);
+      const tagIdOrPlacementId = bid.params.tagId || bid.params.placementId;
+      let pos = parseInt(bid.params.pos || deepAccess(bid.mediaTypes, 'video.pos'), 10);
       if (isNaN(pos)) {
         logWarn(`Synacormedia: there is an invalid POS: ${bid.params.pos}`);
         pos = 0;
@@ -76,19 +82,41 @@ export const spec = {
 
       let imps = [];
       if (videoOrBannerKey === 'banner') {
-        imps = this.buildBannerImpressions(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey);
+        imps = this.buildBannerImpressions(adSizes, bid, tagIdOrPlacementId, pos, videoOrBannerKey);
       } else if (videoOrBannerKey === 'video') {
-        imps = this.buildVideoImpressions(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey);
+        imps = this.buildVideoImpressions(adSizes, bid, tagIdOrPlacementId, pos, videoOrBannerKey);
       }
       if (imps.length > 0) {
-        imps.forEach(i => openRtbBidRequest.imp.push(i));
+        imps.forEach(i => {
+          // Deeply add ext section to all imp[] for GPID, prebid slot id, and anything else down the line
+          const extSection = deepAccess(bid, 'ortb2Imp.ext');
+          if (extSection) {
+            deepSetValue(i, 'ext', extSection);
+          }
+
+          // Add imp[] to request object
+          openRtbBidRequest.imp.push(i);
+        });
       }
     });
 
+    // CCPA
+    if (bidderRequest.uspConsent) {
+      deepSetValue(openRtbBidRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    // User ID
+    if (validBidReqs[0] && validBidReqs[0].userIdAsEids && Array.isArray(validBidReqs[0].userIdAsEids)) {
+      const eids = validBidReqs[0].userIdAsEids;
+      if (eids.length) {
+        deepSetValue(openRtbBidRequest, 'user.ext.eids', eids);
+      }
+    }
+
     if (openRtbBidRequest.imp.length && seatId) {
       return {
         method: 'POST',
-        url: `${BID_HOST}/openrtb/bids/${seatId}?src=$$REPO_AND_VERSION$$`,
+        url: `${BID_SCHEME}${seatId}.${BID_DOMAIN}/openrtb/bids/${seatId}?src=$$REPO_AND_VERSION$$`,
         data: openRtbBidRequest,
         options: {
           contentType: 'application/json',
@@ -98,7 +126,7 @@ export const spec = {
     }
   },
 
-  buildBannerImpressions: function(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey) {
+  buildBannerImpressions: function (adSizes, bid, tagIdOrPlacementId, pos, videoOrBannerKey) {
     let format = [];
     let imps = [];
     adSizes.forEach((size, i) => {
@@ -119,8 +147,12 @@ export const spec = {
           format,
           pos
         },
-        tagid: placementId,
+        tagid: tagIdOrPlacementId,
       };
+      const bidFloor = getBidFloor(bid, 'banner', '*');
+      if (isNaN(bidFloor)) {
+        logWarn(`Synacormedia: there is an invalid bid floor: ${bid.params.bidfloor}`);
+      }
       if (bidFloor !== null && !isNaN(bidFloor)) {
         imp.bidfloor = bidFloor;
       }
@@ -129,7 +161,7 @@ export const spec = {
     return imps;
   },
 
-  buildVideoImpressions: function(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey) {
+  buildVideoImpressions: function(adSizes, bid, tagIdOrPlacementId, pos, videoOrBannerKey) {
     let imps = [];
     adSizes.forEach((size, i) => {
       if (!size || size.length != 2) {
@@ -139,8 +171,13 @@ export const spec = {
       const size1 = size[1];
       const imp = {
         id: `${videoOrBannerKey.substring(0, 1)}${bid.bidId}-${size0}x${size1}`,
-        tagid: placementId
+        tagid: tagIdOrPlacementId
       };
+      const bidFloor = getBidFloor(bid, 'video', size);
+      if (isNaN(bidFloor)) {
+        logWarn(`Synacormedia: there is an invalid bid floor: ${bid.params.bidfloor}`);
+      }
+
       if (bidFloor !== null && !isNaN(bidFloor)) {
         imp.bidfloor = bidFloor;
       }
@@ -151,6 +188,9 @@ export const spec = {
         pos
       };
       if (bid.mediaTypes.video) {
+        if (!bid.params.video) {
+          bid.params.video = {};
+        }
         this.setValidVideoParams(bid.mediaTypes.video, bid.params.video);
       }
       if (bid.params.video) {
@@ -167,7 +207,7 @@ export const spec = {
       .filter(param => includes(VIDEO_PARAMS, param) && sourceObj[param] !== null && (!isNaN(parseInt(sourceObj[param], 10)) || !(sourceObj[param].length < 1)))
       .forEach(param => destObj[param] = Array.isArray(sourceObj[param]) ? sourceObj[param] : parseInt(sourceObj[param], 10));
   },
-  interpretResponse: function(serverResponse) {
+  interpretResponse: function(serverResponse, bidRequest) {
     const updateMacros = (bid, r) => {
       return r ? r.replace(/\${AUCTION_PRICE}/g, bid.price) : r;
     };
@@ -176,7 +216,6 @@ export const spec = {
       logWarn('Synacormedia: server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
       return;
     }
-
     const {id, seatbid: seatbids} = serverResponse.body;
     let bids = [];
     if (id && seatbids) {
@@ -184,11 +223,48 @@ export const spec = {
         seatbid.bid.forEach(bid => {
           const creative = updateMacros(bid, bid.adm);
           const nurl = updateMacros(bid, bid.nurl);
-          const [, impType, impid, width, height] = bid.impid.match(/^([vb])(.*)-(.*)x(.*)$/);
-          const isVideo = impType == 'v';
+          const [, impType, impid] = bid.impid.match(/^([vb])([\w\d]+)/);
+          let height = bid.h;
+          let width = bid.w;
+          const isVideo = impType === 'v';
+          const isBanner = impType === 'b';
+          if ((!height || !width) && bidRequest.data && bidRequest.data.imp && bidRequest.data.imp.length > 0) {
+            bidRequest.data.imp.forEach(req => {
+              if (bid.impid === req.id) {
+                if (isVideo) {
+                  height = req.video.h;
+                  width = req.video.w;
+                } else if (isBanner) {
+                  let bannerHeight = 1;
+                  let bannerWidth = 1;
+                  if (req.banner.format && req.banner.format.length > 0) {
+                    bannerHeight = req.banner.format[0].h;
+                    bannerWidth = req.banner.format[0].w;
+                  }
+                  height = bannerHeight;
+                  width = bannerWidth;
+                } else {
+                  height = 1;
+                  width = 1;
+                }
+              }
+            });
+          }
+
+          let maxTtl = DEFAULT_MAX_TTL;
+          if (bid.ext && bid.ext['imds.tv'] && bid.ext['imds.tv'].ttl) {
+            const bidTtlMax = parseInt(bid.ext['imds.tv'].ttl, 10);
+            maxTtl = !isNaN(bidTtlMax) && bidTtlMax > 0 ? bidTtlMax : DEFAULT_MAX_TTL;
+          }
+
+          let ttl = maxTtl;
+          if (bid.exp) {
+            const bidTtl = parseInt(bid.exp, 10);
+            ttl = !isNaN(bidTtl) && bidTtl > 0 ? Math.min(bidTtl, maxTtl) : maxTtl;
+          }
+
           const bidObj = {
             requestId: impid,
-            adId: bid.id.replace(/~/g, '-'),
             cpm: parseFloat(bid.price),
             width: parseInt(width, 10),
             height: parseInt(height, 10),
@@ -197,8 +273,13 @@ export const spec = {
             netRevenue: true,
             mediaType: isVideo ? VIDEO : BANNER,
             ad: creative,
-            ttl: 60
+            ttl,
           };
+
+          if (bid.adomain != undefined || bid.adomain != null) {
+            bidObj.meta = { advertiserDomains: bid.adomain };
+          }
+
           if (isVideo) {
             const [, uuid] = nurl.match(/ID=([^&]*)&?/);
             if (!config.getConfig('cache.url')) {
@@ -226,4 +307,20 @@ export const spec = {
   }
 };
 
+function getBidFloor(bid, mediaType, size) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidfloor ? parseFloat(bid.params.bidfloor) : null;
+  }
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType,
+    size
+  });
+
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 registerBidder(spec);
diff --git a/modules/synacormediaBidAdapter.md b/modules/synacormediaBidAdapter.md
index fd71f07b3a3..523c66fd1d9 100644
--- a/modules/synacormediaBidAdapter.md
+++ b/modules/synacormediaBidAdapter.md
@@ -33,7 +33,7 @@ https://track.technoratimedia.com/openrtb/tags?ID=%%PATTERN:hb_cache_id_synacorm
           bidder: "synacormedia",
           params: {
               seatId: "prebid",
-              placementId: "demo1",
+              tagId: "demo1",
               bidfloor: 0.10,
               pos: 1
           }
@@ -52,7 +52,7 @@ https://track.technoratimedia.com/openrtb/tags?ID=%%PATTERN:hb_cache_id_synacorm
           bidder: "synacormedia",
           params: {
               seatId: "prebid",
-              placementId: "demo1",
+              tagId: "demo1",
               bidfloor: 0.20,
               pos: 1,
               video: {
diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
new file mode 100644
index 00000000000..2e10a8d8951
--- /dev/null
+++ b/modules/taboolaBidAdapter.js
@@ -0,0 +1,304 @@
+'use strict';
+
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {deepAccess, getWindowSelf, replaceAuctionPrice} from '../src/utils.js'
+import {getStorageManager} from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
+
+const BIDDER_CODE = 'taboola';
+const GVLID = 42;
+const CURRENCY = 'USD';
+export const END_POINT_URL = 'https://display.bidder.taboola.com/OpenRTB/TaboolaHB/auction';
+export const USER_SYNC_IMG_URL = 'https://trc.taboola.com/sg/prebidJS/1/cm';
+const USER_ID = 'user-id';
+const STORAGE_KEY = `taboola global:${USER_ID}`;
+const COOKIE_KEY = 'trc_cookie_storage';
+
+/**
+ *  extract User Id by that order:
+ * 1. local storage
+ * 2. first party cookie
+ * 3. rendered trc
+ * 4. new user set it to 0
+ */
+export const userData = {
+  storageManager: getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE}),
+  getUserId: () => {
+    const {getFromLocalStorage, getFromCookie, getFromTRC} = userData;
+
+    try {
+      return getFromLocalStorage() || getFromCookie() || getFromTRC();
+    } catch (ex) {
+      return 0;
+    }
+  },
+  getFromCookie() {
+    const {cookiesAreEnabled, getCookie} = userData.storageManager;
+    if (cookiesAreEnabled()) {
+      const cookieData = getCookie(COOKIE_KEY);
+      const userId = userData.getCookieDataByKey(cookieData, USER_ID);
+      if (userId) {
+        return userId;
+      }
+    }
+  },
+  getCookieDataByKey(cookieData, key) {
+    const [, value = ''] = cookieData.split(`${key}=`)
+    return value;
+  },
+  getFromLocalStorage() {
+    const {hasLocalStorage, localStorageIsEnabled, getDataFromLocalStorage} = userData.storageManager;
+
+    if (hasLocalStorage() && localStorageIsEnabled()) {
+      return getDataFromLocalStorage(STORAGE_KEY);
+    }
+  },
+  getFromTRC() {
+    return window.TRC ? window.TRC.user_id : 0;
+  }
+}
+
+export const internal = {
+  getPageUrl: (refererInfo = {}) => {
+    return refererInfo?.page || getWindowSelf().location.href;
+  },
+  getReferrer: (refererInfo = {}) => {
+    return refererInfo?.ref || getWindowSelf().document.referrer;
+  }
+}
+
+export const spec = {
+  supportedMediaTypes: [BANNER],
+  gvlid: GVLID,
+  code: BIDDER_CODE,
+  isBidRequestValid: (bidRequest) => {
+    return !!(bidRequest.sizes &&
+              bidRequest.params &&
+              bidRequest.params.publisherId &&
+              bidRequest.params.tagId);
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const [bidRequest] = validBidRequests;
+    const {refererInfo, gdprConsent = {}, uspConsent} = bidderRequest;
+    const {publisherId} = bidRequest.params;
+    const site = getSiteProperties(bidRequest.params, refererInfo, bidderRequest.ortb2);
+    const device = {ua: navigator.userAgent};
+    const imps = getImps(validBidRequests);
+    const user = {
+      buyeruid: userData.getUserId(gdprConsent, uspConsent),
+      ext: {}
+    };
+    const regs = {
+      coppa: 0,
+      ext: {}
+    };
+
+    if (gdprConsent.gdprApplies) {
+      user.ext.consent = bidderRequest.gdprConsent.consentString;
+      regs.ext.gdpr = 1;
+    }
+
+    if (uspConsent) {
+      regs.ext.us_privacy = uspConsent;
+    }
+
+    if (bidderRequest.ortb2?.regs?.gpp) {
+      regs.ext.gpp = bidderRequest.ortb2.regs.gpp;
+      regs.ext.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
+    }
+
+    if (config.getConfig('coppa')) {
+      regs.coppa = 1;
+    }
+
+    const ortb2 = bidderRequest.ortb2 || {
+      bcat: [],
+      badv: [],
+      wlang: []
+    };
+
+    const request = {
+      id: bidderRequest.auctionId,
+      imp: imps,
+      site,
+      device,
+      source: {fd: 1},
+      tmax: bidderRequest.timeout,
+      bcat: ortb2.bcat || bidRequest.params.bcat || [],
+      badv: ortb2.badv || bidRequest.params.badv || [],
+      wlang: ortb2.wlang || bidRequest.params.wlang || [],
+      user,
+      regs,
+      ext: {
+        pageType: ortb2?.ext?.data?.pageType || ortb2?.ext?.data?.section || bidRequest.params.pageType
+      }
+    };
+
+    const url = [END_POINT_URL, publisherId].join('/');
+
+    return {
+      url,
+      method: 'POST',
+      data: JSON.stringify(request),
+      bids: validBidRequests,
+      options: {
+        withCredentials: false
+      },
+    };
+  },
+  interpretResponse: (serverResponse, {bids}) => {
+    if (!bids) {
+      return [];
+    }
+
+    const {bidResponses, cur: currency} = getBidResponses(serverResponse);
+
+    if (!bidResponses) {
+      return [];
+    }
+
+    return bidResponses.map((bidResponse) => getBid(bids, currency, bidResponse)).filter(Boolean);
+  },
+  onBidWon: (bid) => {
+    if (bid.nurl) {
+      const resolvedNurl = replaceAuctionPrice(bid.nurl, bid.originalCpm);
+      ajax(resolvedNurl);
+    }
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) {
+    const syncs = []
+    const queryParams = [];
+    if (gdprConsent) {
+      queryParams.push(`gdpr=${Number(gdprConsent.gdprApplies && 1)}&gdpr_consent=${encodeURIComponent(gdprConsent.consentString || '')}`);
+    }
+
+    if (uspConsent) {
+      queryParams.push('us_privacy=' + encodeURIComponent(uspConsent));
+    }
+
+    if (gppConsent) {
+      queryParams.push('gpp=' + encodeURIComponent(gppConsent));
+    }
+
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: USER_SYNC_IMG_URL + (queryParams.length ? '?' + queryParams.join('&') : '')
+      });
+    }
+    return syncs;
+  },
+};
+
+function getSiteProperties({publisherId}, refererInfo, ortb2) {
+  const {getPageUrl, getReferrer} = internal;
+  return {
+    id: publisherId,
+    name: publisherId,
+    domain: ortb2?.site?.domain || refererInfo?.domain || window.location?.host,
+    page: ortb2?.site?.page || getPageUrl(refererInfo),
+    ref: ortb2?.site?.ref || getReferrer(refererInfo),
+    publisher: {
+      id: publisherId
+    },
+    content: {
+      language: navigator.language
+    }
+  }
+}
+
+function getImps(validBidRequests) {
+  return validBidRequests.map((bid, id) => {
+    const {tagId, position} = bid.params;
+    const imp = {
+      id: id + 1,
+      banner: getBanners(bid, position),
+      tagid: tagId
+    }
+    if (typeof bid.getFloor === 'function') {
+      const floorInfo = bid.getFloor({
+        currency: CURRENCY,
+        mediaType: BANNER,
+        size: '*'
+      });
+      if (typeof floorInfo === 'object' && floorInfo.currency === CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
+        imp.bidfloor = parseFloat(floorInfo.floor);
+        imp.bidfloorcur = CURRENCY;
+      }
+    } else {
+      const {bidfloor = null, bidfloorcur = CURRENCY} = bid.params;
+      imp.bidfloor = bidfloor;
+      imp.bidfloorcur = bidfloorcur;
+    }
+    imp['ext'] = {
+      gpid: deepAccess(bid, 'ortb2Imp.ext.gpid')
+    }
+    return imp;
+  });
+}
+
+function getBanners(bid, pos) {
+  return {
+    ...getSizes(bid.sizes),
+    pos: pos
+  }
+}
+
+function getSizes(sizes) {
+  return {
+    format: sizes.map(size => {
+      return {
+        w: size[0],
+        h: size[1]
+      }
+    })
+  }
+}
+
+function getBidResponses({body}) {
+  if (!body) {
+    return [];
+  }
+
+  const {seatbid, cur} = body;
+
+  if (!seatbid.length || !seatbid[0].bid || !seatbid[0].bid.length) {
+    return [];
+  }
+
+  return {
+    bidResponses: seatbid[0].bid,
+    cur
+  };
+}
+
+function getBid(bids, currency, bidResponse) {
+  if (!bidResponse) {
+    return;
+  }
+  const {
+    price: cpm, crid: creativeId, adm: ad, w: width, h: height, exp: ttl, adomain: advertiserDomains, meta = {}
+  } = bidResponse;
+  let requestId = bids[bidResponse.impid - 1].bidId;
+  if (advertiserDomains && advertiserDomains.length > 0) {
+    meta.advertiserDomains = advertiserDomains
+  }
+
+  return {
+    requestId,
+    ttl,
+    mediaType: BANNER,
+    cpm,
+    creativeId,
+    currency,
+    ad,
+    width,
+    height,
+    meta,
+    netRevenue: true
+  };
+}
+
+registerBidder(spec);
diff --git a/modules/taboolaBidAdapter.md b/modules/taboolaBidAdapter.md
new file mode 100644
index 00000000000..79538d0d48b
--- /dev/null
+++ b/modules/taboolaBidAdapter.md
@@ -0,0 +1,49 @@
+# Overview
+
+```
+Module Name: Taboola Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@taboola.com
+```
+
+# Description
+
+Module that connects to Taboola bidder to fetch bids.
+- Supports `display` format
+- Uses `OpenRTB` standard
+
+The Taboola Bidding adapter requires setup before beginning. Please contact us on prebid@taboola.com
+
+# Test Display Parameters
+``` javascript
+ var adUnits = [{
+  code: 'your-unit-container-id',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300,600]]
+    }
+  },
+  bids: [{
+    bidder: 'taboola',
+    params: {
+      tagId: 'tester-placement', // Placement Name
+      publisherId: 'tester-pub', // your-publisher-id
+      bidfloor: 0.25, // Optional - default is null
+      bcat: ['IAB1-1'], // Optional - default is []
+      badv: ['example.com'],  // Optional - default is []
+    }
+  }]
+}];
+```
+
+# Parameters
+
+| Name          | Scope    | Description                                             | Example                    | Type         |
+|---------------|----------|---------------------------------------------------------|----------------------------|--------------|
+| `tagId`       | required | Tag ID / Placement Name <br>                            | `'Below The Article'`      | `String`     |
+| `publisherId` | required | Numeric Publisher ID <br>(as provided by Taboola)       | `'1234567'`                | `String`     |
+| `bcat`        | optional | List of blocked advertiser categories (IAB)             | `['IAB1-1']`               | `Array`      |
+| `badv`        | optional | Blocked Advertiser Domains                              | `'example.com'`            | `String Url` |
+| `bidfloor`    | optional | CPM bid floor                                           | `0.25`                     | `Float`      |
+
+
diff --git a/modules/talkadsBidAdapter.js b/modules/talkadsBidAdapter.js
new file mode 100644
index 00000000000..9c3e13bae47
--- /dev/null
+++ b/modules/talkadsBidAdapter.js
@@ -0,0 +1,136 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { NATIVE, BANNER } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const CURRENCY = 'EUR';
+const BIDDER_CODE = 'talkads';
+const GVLID = 1074;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [ NATIVE, BANNER ],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param poBid  The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (poBid) {
+    utils.logInfo('isBidRequestValid : ', poBid);
+    if (poBid.params === undefined) {
+      utils.logError('VALIDATION FAILED : the parameters must be defined');
+      return false;
+    }
+    if (poBid.params.tag_id === undefined) {
+      utils.logError('VALIDATION FAILED : the parameter "tag_id" must be defined');
+      return false;
+    }
+    if (poBid.params.bidder_url === undefined) {
+      utils.logError('VALIDATION FAILED : the parameter "bidder_url" must be defined');
+      return false;
+    }
+
+    return !!(poBid.nativeParams || poBid.sizes);
+  }, // isBidRequestValid
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param paValidBidRequests  An array of bids
+   * @param poBidderRequest
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (paValidBidRequests, poBidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    paValidBidRequests = convertOrtbRequestToProprietaryNative(paValidBidRequests);
+    utils.logInfo('buildRequests : ', paValidBidRequests, poBidderRequest);
+    const laBids = paValidBidRequests.map((poBid, piId) => {
+      const loOne = { id: piId, ad_unit: poBid.adUnitCode, bid_id: poBid.bidId, type: '', size: [] };
+      if (poBid.nativeParams) {
+        loOne.type = 'native';
+      } else {
+        loOne.type = 'banner';
+        loOne.size = poBid.sizes;
+      }
+      return loOne;
+    });
+    let laParams = paValidBidRequests[0].params;
+    const loServerRequest = {
+      cur: CURRENCY,
+      timeout: poBidderRequest.timeout,
+      auction_id: paValidBidRequests[0].auctionId,
+      // TODO: should this use auctionId? see #8573
+      transaction_id: paValidBidRequests[0].transactionId,
+      bids: laBids,
+      gdpr: { applies: false, consent: false },
+    };
+    if (poBidderRequest && poBidderRequest.gdprConsent) {
+      const loGdprConsent = poBidderRequest.gdprConsent;
+      if ((typeof loGdprConsent.gdprApplies === 'boolean') && loGdprConsent.gdprApplies) {
+        loServerRequest.gdpr.applies = true;
+      }
+      if ((typeof loGdprConsent.consentString === 'string') && loGdprConsent.consentString) {
+        loServerRequest.gdpr.consent = poBidderRequest.gdprConsent.consentString;
+      }
+    }
+    const lsUrl = laParams.bidder_url + '/' + laParams.tag_id;
+    return {
+      method: 'POST',
+      url: lsUrl,
+      data: JSON.stringify(loServerRequest),
+    };
+  }, // buildRequests
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param poServerResponse A successful response from the server.
+   * @param poPidRequest Request original server request
+   * @return An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (poServerResponse, poPidRequest) {
+    utils.logInfo('interpretResponse : ', poServerResponse);
+    if (!poServerResponse.body) {
+      return [];
+    }
+    let laResponse = [];
+    if (poServerResponse.body.status !== 'ok') {
+      utils.logInfo('Error : ', poServerResponse.body.error);
+      return laResponse;
+    }
+    poServerResponse.body.bids.forEach((poResponse) => {
+      laResponse[laResponse.length] = {
+        requestId: poResponse.requestId,
+        cpm: poResponse.cpm,
+        currency: poResponse.currency,
+        width: poResponse.width,
+        height: poResponse.height,
+        ad: poResponse.ad,
+        ttl: poResponse.ttl,
+        creativeId: poResponse.creativeId,
+        netRevenue: poResponse.netRevenue,
+        pbid: poServerResponse.body.pbid,
+      };
+    });
+    return laResponse;
+  }, // interpretResponse
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction.
+   *
+   * @param poBid The bid that won the auction
+   */
+  onBidWon: function (poBid) {
+    utils.logInfo('onBidWon : ', poBid);
+    let laParams = poBid.params[0];
+    if (poBid.pbid) {
+      ajax(laParams.bidder_url + 'won/' + poBid.pbid);
+    }
+  }, // onBidWon
+};
+
+registerBidder(spec);
diff --git a/modules/talkadsBidAdapter.md b/modules/talkadsBidAdapter.md
new file mode 100644
index 00000000000..3ab8aaa8354
--- /dev/null
+++ b/modules/talkadsBidAdapter.md
@@ -0,0 +1,60 @@
+# Overview
+
+```
+Module Name: TalkAds Adapter
+Module Type: Bidder Adapter
+Maintainer: technical_team@natexo.com
+```
+
+# Description
+
+Module that connects to TalkAds bidder to fetch bids.
+Both native and banner formats are supported but not at the same time.
+The only currently supported currency is EUR.
+
+This adapter requires setup and approval from the Natexo programmatic team.
+
+# Configuration
+
+
+
+
+# Test parameters
+
+## Test banner Parameters
+
+```
+    var adUnits = [
+        code: 'prebid_banner_test',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250], [300, 600]],
+            }
+        },
+        bids: [{
+            bidder: 'talkads',
+            params: {
+                tag_id: 0,
+                bidder_url: 'https://d.natexo-programmatic.com/tad/tag/testbid',
+            },
+        }]
+    ];
+```
+
+## Test native parameters
+
+```
+    var adUnits = [
+        code: 'prebid_native_test',
+        mediaTypes: {
+            native: {}
+        },
+        bids: [{
+            bidder: 'talkads',
+            params: {
+                tag_id: 0,
+                bidder_url: 'https://d.natexo-programmatic.com/tad/tag/testbid',
+            },
+        }]
+    ];
+```
diff --git a/modules/tapadIdSystem.js b/modules/tapadIdSystem.js
new file mode 100644
index 00000000000..149ba22eb92
--- /dev/null
+++ b/modules/tapadIdSystem.js
@@ -0,0 +1,61 @@
+import { logMessage } from '../src/utils.js';
+import { uspDataHandler } from '../src/adapterManager.js';
+import { submodule } from '../src/hook.js';
+import * as ajax from '../src/ajax.js'
+
+export const graphUrl = 'https://rtga.tapad.com/v1/graph';
+
+export const tapadIdSubmodule = {
+  name: 'tapadId',
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{tapadId: string} | undefined}
+   */
+  decode(id) {
+    return { tapadId: id };
+  },
+  /*
+   * @function
+   * @summary initiate Real Time Graph
+   * @param {SubmoduleParams} [configParams]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse }}
+   */
+  getId(config) {
+    const uspData = uspDataHandler.getConsentData();
+    if (uspData && uspData !== '1---') {
+      return { id: undefined };
+    }
+    const configParams = config.params || {};
+
+    if (configParams.companyId == null || isNaN(Number(configParams.companyId))) {
+      logMessage('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+    }
+
+    return {
+      callback: (complete) => {
+        ajax.ajaxBuilder(10000)(
+          `${graphUrl}?company_id=${configParams.companyId}&tapad_id_type=TAPAD_ID`,
+          {
+            success: (response) => {
+              const responseJson = JSON.parse(response);
+              if (responseJson.hasOwnProperty('tapadId')) {
+                complete(responseJson.tapadId);
+              }
+            },
+            error: (_, e) => {
+              if (e.status === 404) {
+                complete(undefined);
+              }
+              if (e.status === 403) {
+                logMessage('Invalid Company Id. Contact prebid@tapad.com for assistance.');
+              }
+            }
+          }
+        );
+      }
+    }
+  }
+}
+submodule('userId', tapadIdSubmodule);
diff --git a/modules/tapadIdSystem.md b/modules/tapadIdSystem.md
new file mode 100644
index 00000000000..4bab1b4689d
--- /dev/null
+++ b/modules/tapadIdSystem.md
@@ -0,0 +1,43 @@
+### Tapad ID
+
+Tapad's ID module provides access to a universal identifier that publishers, ad tech platforms and advertisers can use for data collection and collation without reliance on third-party cookies.
+Tapad's ID module is free to use and promotes collaboration across the industry by facilitating interoperability between DSPs, SSPs and publishers.
+
+To register as an authorized user of the Tapad ID module, or for more information, documentation and access to Tapad’s Terms and Conditions please contact  [prebid@tapad.com](mailto:prebid@tapad.com).
+
+Tapad’s Privacy landing page containing links to region-specific Privacy Notices may be found here: [https://tapad.com/privacy.html](https://tapad.com/privacy.html).
+
+Add it to your Prebid.js package with:
+
+
+`gulp build --modules=userId,tapadIdSystem`
+
+#### Tapad ID Configuration
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | `"tapadId"` | `"tapadId"` |
+| params | Required | Object | Details for Tapad initialization. | |
+| params.company_id | Required | Number | Tapad Company Id provided by Tapad | 1234567890 |
+
+#### Tapad ID Example
+
+```js
+pbjs.setConfig({
+    userSync: {
+        userIds: [
+            {
+                name: "tapadId",
+                params: {
+                    companyId: 1234567890
+                },
+                storage: {
+                    type: "cookie",
+                    name: "tapad_id",
+                    expires: 1
+                }
+            }
+        ]
+    }
+});
+```
diff --git a/modules/taphypeBidAdapter.js b/modules/taphypeBidAdapter.js
deleted file mode 100644
index 65c5a728127..00000000000
--- a/modules/taphypeBidAdapter.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-export const spec = {
-  code: 'taphype',
-  isBidRequestValid: function (bid) {
-    return !!bid.params.placementId;
-  },
-  buildRequests: function (bidRequests) {
-    const requests = bidRequests.map(function (bid) {
-      const params = {
-        placementId: bid.params.placementId,
-        url: encodeURIComponent(window.location.href),
-        size: bid.sizes[0][0] + 'x' + bid.sizes[0][1],
-        rnd: Math.random(),
-        bidId: bid.bidId,
-      };
-
-      return {method: 'GET', url: 'https://us-central1-taphype-internal.cloudfunctions.net/th-prebid', data: params, options: {withCredentials: false}}
-    });
-
-    return requests;
-  },
-  interpretResponse: function (serverResponse, bidRequest) {
-    if (!serverResponse || !serverResponse.body || !serverResponse.body.ad) {
-      return [];
-    }
-
-    const bid = serverResponse.body;
-    const sizes = bid.size.split(',');
-
-    return [{
-      requestId: bidRequest.data.bidId,
-      cpm: bid.price,
-      width: sizes[0],
-      height: sizes[1],
-      creativeId: bidRequest.data.bidId,
-      currency: bid.currency || 'USD',
-      netRevenue: true,
-      ad: bid.ad,
-      ttl: 360
-    }];
-  },
-};
-
-registerBidder(spec);
diff --git a/modules/taphypeBidAdapter.md b/modules/taphypeBidAdapter.md
deleted file mode 100644
index c6ff40a42ba..00000000000
--- a/modules/taphypeBidAdapter.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Overview
-
-Module Name: TapHype Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: admin@taphype.com
-
-# Description
-
-You can use this adapter to get a bid from taphype.com.
-
-
-# Test Parameters
-```javascript
-    var adUnits = [
-        {
-            code: 'div-taphype-example',
-            sizes: [[300, 250]],
-            bids: [
-                {
-                    bidder: "taphype",
-                    params: {
-                        placementId: 12345
-                    }
-                }
-            ]
-        }
-    ];
-```
-
-Where:
-
-* placementId - TapHype Placement ID
diff --git a/modules/tappxBidAdapter.js b/modules/tappxBidAdapter.js
new file mode 100644
index 00000000000..c7a54431ee9
--- /dev/null
+++ b/modules/tappxBidAdapter.js
@@ -0,0 +1,588 @@
+'use strict';
+
+import { logWarn, deepAccess, isFn, isPlainObject, getDNT, isBoolean, isNumber, isStr, isArray } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { Renderer } from '../src/Renderer.js';
+import {parseDomain} from '../src/refererDetection.js';
+
+const BIDDER_CODE = 'tappx';
+const GVLID_CODE = 628;
+const TTL = 360;
+const CUR = 'USD';
+const TAPPX_BIDDER_VERSION = '0.1.2';
+const TYPE_CNN = 'prebidjs';
+const LOG_PREFIX = '[TAPPX]: ';
+const VIDEO_SUPPORT = ['instream', 'outstream'];
+
+const DATA_TYPES = {
+  'NUMBER': 'number',
+  'STRING': 'string',
+  'BOOLEAN': 'boolean',
+  'ARRAY': 'array',
+  'OBJECT': 'object'
+};
+const VIDEO_CUSTOM_PARAMS = {
+  'minduration': DATA_TYPES.NUMBER,
+  'maxduration': DATA_TYPES.NUMBER,
+  'startdelay': DATA_TYPES.NUMBER,
+  'playbackmethod': DATA_TYPES.ARRAY,
+  'api': DATA_TYPES.ARRAY,
+  'protocols': DATA_TYPES.ARRAY,
+  'w': DATA_TYPES.NUMBER,
+  'h': DATA_TYPES.NUMBER,
+  'battr': DATA_TYPES.ARRAY,
+  'linearity': DATA_TYPES.NUMBER,
+  'placement': DATA_TYPES.NUMBER,
+  'minbitrate': DATA_TYPES.NUMBER,
+  'maxbitrate': DATA_TYPES.NUMBER,
+  'skip': DATA_TYPES.NUMBER
+}
+
+var hostDomain;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+  */
+  isBidRequestValid: function(bid) {
+    // bid.params.host
+    if ((new RegExp(`^(vz.*|zz.*)\\.*$`, 'i')).test(bid.params.host)) { // New endpoint
+      if ((new RegExp(`^(zz.*)\\.*$`, 'i')).test(bid.params.host)) return validBasic(bid)
+      else return validBasic(bid) && validMediaType(bid)
+    } else { // This is backward compatible feature. It will be remove in the future
+      if ((new RegExp(`^(ZZ.*)\\.*$`, 'i')).test(bid.params.endpoint)) return validBasic(bid)
+      else return validBasic(bid) && validMediaType(bid)
+    }
+  },
+
+  /**
+   * Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {*} validBidRequests
+   * @param {*} bidderRequest
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let requests = [];
+    validBidRequests.forEach(oneValidRequest => {
+      requests.push(buildOneRequest(oneValidRequest, bidderRequest));
+    });
+    return requests;
+  },
+
+  /**
+   * Parse the response and generate one or more bid objects.
+   *
+   * @param {*} serverResponse
+   * @param {*} originalRequest
+   */
+  interpretResponse: function(serverResponse, originalRequest) {
+    const responseBody = serverResponse.body;
+    if (!serverResponse.body) {
+      logWarn(LOG_PREFIX, 'Empty response body HTTP 204, no bids');
+      return [];
+    }
+
+    const bids = [];
+    responseBody.seatbid.forEach(serverSeatBid => {
+      serverSeatBid.bid.forEach(serverBid => {
+        bids.push(interpretBid(serverBid, originalRequest));
+      });
+    });
+
+    return bids;
+  },
+
+  /**
+   * If the publisher allows user-sync activity, the platform will call this function and the adapter may register pixels and/or iframe user syncs.
+   *
+   * @param {*} syncOptions
+   * @param {*} serverResponses
+   * @param {*} gdprConsent
+   */
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let url = `https://${hostDomain}/cs/usersync.php?`;
+
+    // GDPR & CCPA
+    if (gdprConsent) {
+      url += '&gdpr_optin=' + (gdprConsent.gdprApplies ? 1 : 0);
+      url += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
+    }
+    if (uspConsent) {
+      url += '&us_privacy=' + encodeURIComponent(uspConsent);
+    }
+
+    // SyncOptions
+    if (syncOptions.iframeEnabled) {
+      url += '&type=iframe'
+      return [{
+        type: 'iframe',
+        url: url
+      }];
+    } else {
+      url += '&type=img'
+      return [{
+        type: 'image',
+        url: url
+      }];
+    }
+  }
+}
+
+function validBasic(bid) {
+  if (bid.params == null) {
+    logWarn(LOG_PREFIX, 'Please review the mandatory Tappx parameters.');
+    return false;
+  }
+
+  if (bid.params.tappxkey == null) {
+    logWarn(LOG_PREFIX, 'Please review the mandatory Tappxkey parameter.');
+    return false;
+  }
+
+  if (bid.params.host == null) {
+    logWarn(LOG_PREFIX, 'Please review the mandatory Host parameter.');
+    return false;
+  }
+
+  let classicEndpoint = true
+  if ((new RegExp(`^(vz.*|zz.*)\\.*$`, 'i')).test(bid.params.host)) {
+    classicEndpoint = false
+  }
+
+  if (classicEndpoint && bid.params.endpoint == null) {
+    logWarn(LOG_PREFIX, 'Please review the mandatory endpoint Tappx parameters.');
+    return false;
+  }
+
+  return true;
+}
+
+function validMediaType(bid) {
+  const video = deepAccess(bid, 'mediaTypes.video');
+
+  // Video validations
+  if (typeof video !== 'undefined') {
+    if (VIDEO_SUPPORT.indexOf(video.context) === -1) {
+      logWarn(LOG_PREFIX, 'Please review the mandatory Tappx parameters for Video. Video context not supported.');
+      return false;
+    }
+  }
+
+  return true;
+}
+
+/**
+ * Parse the response and generate one bid object.
+ *
+ * @param {object} serverBid Bid by OpenRTB 2.5
+ * @returns {object} Prebid banner bidObject
+ */
+function interpretBid(serverBid, request) {
+  let bidReturned = {
+    requestId: request.bids.bidId,
+    cpm: serverBid.price,
+    currency: serverBid.cur ? serverBid.cur : CUR,
+    width: serverBid.w,
+    height: serverBid.h,
+    ttl: TTL,
+    creativeId: serverBid.crid,
+    netRevenue: true,
+  }
+
+  if (typeof serverBid.dealId !== 'undefined') { bidReturned.dealId = serverBid.dealId }
+  if (typeof serverBid.lurl != 'undefined') { bidReturned.lurl = serverBid.lurl }
+  if (typeof serverBid.nurl != 'undefined') { bidReturned.nurl = serverBid.nurl }
+  if (typeof serverBid.burl != 'undefined') { bidReturned.burl = serverBid.burl }
+
+  if (typeof request.bids.mediaTypes !== 'undefined' && typeof request.bids.mediaTypes.video !== 'undefined') {
+    bidReturned.vastXml = serverBid.adm;
+    bidReturned.vastUrl = serverBid.lurl;
+    bidReturned.ad = serverBid.adm;
+    bidReturned.mediaType = VIDEO;
+    bidReturned.width = serverBid.w;
+    bidReturned.height = serverBid.h;
+
+    if (request.bids.mediaTypes.video.context === 'outstream') {
+      const url = (serverBid.ext.purl) ? serverBid.ext.purl : false;
+      if (typeof url === 'undefined') {
+        logWarn(LOG_PREFIX, 'Error getting player outstream from tappx');
+        return false;
+      }
+      bidReturned.renderer = createRenderer(bidReturned, request, url);
+    }
+  } else {
+    bidReturned.ad = serverBid.adm;
+    bidReturned.mediaType = BANNER;
+  }
+
+  if (typeof bidReturned.adomain !== 'undefined' || bidReturned.adomain !== null) {
+    bidReturned.meta = { advertiserDomains: request.bids.adomain };
+  }
+
+  return bidReturned;
+}
+
+/**
+* Build and makes the request
+*
+* @param {*} validBidRequests
+* @param {*} bidderRequest
+* @return response ad
+*/
+function buildOneRequest(validBidRequests, bidderRequest) {
+  let hostInfo = _getHostInfo(validBidRequests);
+  const ENDPOINT = hostInfo.endpoint;
+  hostDomain = hostInfo.domain;
+
+  const TAPPXKEY = deepAccess(validBidRequests, 'params.tappxkey');
+  const MKTAG = deepAccess(validBidRequests, 'params.mktag');
+  const BIDFLOOR = deepAccess(validBidRequests, 'params.bidfloor');
+  const BIDEXTRA = deepAccess(validBidRequests, 'params.ext');
+  const bannerMediaType = deepAccess(validBidRequests, 'mediaTypes.banner');
+  const videoMediaType = deepAccess(validBidRequests, 'mediaTypes.video');
+
+  // let requests = [];
+  let payload = {};
+  let publisher = {};
+  let tagid;
+  let api = {};
+
+  // > App/Site object
+  if (deepAccess(validBidRequests, 'params.app')) {
+    let app = {};
+    app.name = deepAccess(validBidRequests, 'params.app.name');
+    app.bundle = deepAccess(validBidRequests, 'params.app.bundle');
+    app.domain = deepAccess(validBidRequests, 'params.app.domain');
+    publisher.name = deepAccess(validBidRequests, 'params.app.publisher.name');
+    publisher.domain = deepAccess(validBidRequests, 'params.app.publisher.domain');
+    tagid = `${app.name}_typeAdBanVid_${getOs()}`;
+    payload.app = app;
+    api[0] = deepAccess(validBidRequests, 'params.api') ? deepAccess(validBidRequests, 'params.api') : [3, 5];
+  } else {
+    let bundle = _extractPageUrl(validBidRequests, bidderRequest);
+    let site = deepAccess(validBidRequests, 'params.site') || {};
+    site.name = bundle;
+    site.page = bidderRequest?.refererInfo?.page || deepAccess(validBidRequests, 'params.site.page') || bidderRequest?.refererInfo?.topmostLocation || window.location.href || bundle;
+    site.domain = bundle;
+    site.ref = bidderRequest?.refererInfo?.ref || window.top.document.referrer || '';
+    site.ext = {};
+    site.ext.is_amp = bidderRequest?.refererInfo?.isAmp || 0;
+    site.ext.page_da = deepAccess(validBidRequests, 'params.site.page') || '-';
+    site.ext.page_rip = bidderRequest?.refererInfo?.page || '-';
+    site.ext.page_rit = bidderRequest?.refererInfo?.topmostLocation || '-';
+    site.ext.page_wlh = window.location.href || '-';
+    publisher.name = bundle;
+    publisher.domain = bundle;
+    let sitename = document.getElementsByTagName('meta')['title'];
+    if (sitename && sitename.content) {
+      site.name = sitename.content;
+    }
+    tagid = `${site.name}_typeAdBanVid_${getOs()}`;
+    let keywords = document.getElementsByTagName('meta')['keywords'];
+    if (keywords && keywords.content) {
+      site.keywords = keywords.content;
+    }
+    payload.site = site;
+  }
+  // < App/Site object
+
+  // > Imp object
+  let imp = {};
+  let w;
+  let h;
+
+  if (bannerMediaType) {
+    let banner = {};
+    w = bannerMediaType.sizes[0][0];
+    h = bannerMediaType.sizes[0][1];
+    banner.w = w;
+    banner.h = h;
+    if (
+      ((bannerMediaType.sizes[0].indexOf(480) >= 0) && (bannerMediaType.sizes[0].indexOf(320) >= 0)) ||
+      ((bannerMediaType.sizes[0].indexOf(768) >= 0) && (bannerMediaType.sizes[0].indexOf(1024) >= 0))) {
+      banner.pos = 0;
+    } else {
+      banner.pos = 0;
+    }
+
+    banner.api = api;
+
+    let format = {};
+    format[0] = {};
+    format[0].w = w;
+    format[0].h = h;
+    banner.format = format;
+
+    imp.banner = banner;
+  }
+
+  if (typeof videoMediaType !== 'undefined') {
+    let video = {};
+
+    let videoParams = deepAccess(validBidRequests, 'params.video');
+    if (typeof videoParams !== 'undefined') {
+      for (var key in VIDEO_CUSTOM_PARAMS) {
+        if (videoParams.hasOwnProperty(key)) {
+          video[key] = _checkParamDataType(key, videoParams[key], VIDEO_CUSTOM_PARAMS[key]);
+        }
+      }
+    }
+
+    if ((video.w === undefined || video.w == null || video.w <= 0) ||
+        (video.h === undefined || video.h == null || video.h <= 0)) {
+      w = videoMediaType.playerSize[0][0];
+      h = videoMediaType.playerSize[0][1];
+      video.w = w;
+      video.h = h;
+    }
+
+    video.mimes = videoMediaType.mimes;
+
+    let videoExt = {};
+    if ((typeof videoMediaType.rewarded !== 'undefined') && videoMediaType.rewarded == 1) {
+      videoExt.rewarded = videoMediaType.rewarded;
+    }
+    video.ext = videoExt;
+
+    imp.video = video;
+  }
+
+  imp.id = validBidRequests.bidId;
+  imp.tagid = tagid;
+  imp.secure = 1;
+
+  imp.bidfloor = deepAccess(validBidRequests, 'params.bidfloor');
+  if (isFn(validBidRequests.getFloor)) {
+    try {
+      let floor = validBidRequests.getFloor({
+        currency: CUR,
+        mediaType: '*',
+        size: '*'
+      });
+      if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+        imp.bidfloor = floor.floor;
+      } else {
+        logWarn(LOG_PREFIX, 'Currency not valid. Use only USD with Tappx.');
+      }
+    } catch (e) {
+      logWarn(LOG_PREFIX, e);
+      imp.bidfloor = deepAccess(validBidRequests, 'params.bidfloor'); // Be sure that we have an imp.bidfloor
+    }
+  }
+
+  let bidder = {};
+  bidder.endpoint = ENDPOINT;
+  bidder.host = hostInfo.url;
+  bidder.bidfloor = BIDFLOOR;
+  bidder.ext = (typeof BIDEXTRA == 'object') ? BIDEXTRA : undefined;
+
+  imp.ext = {};
+  imp.ext.bidder = bidder;
+  // < Imp object
+
+  // > Device object
+  let device = {};
+  // Mandatory
+  device.os = getOs();
+  device.ip = 'peer';
+  device.ua = navigator.userAgent;
+  device.ifa = validBidRequests.ifa;
+
+  // Optional
+  device.h = screen.height;
+  device.w = screen.width;
+  device.dnt = getDNT() ? 1 : 0;
+  device.language = getLanguage();
+  device.make = navigator.vendor ? navigator.vendor : '';
+
+  let geo = {};
+  geo.country = deepAccess(validBidRequests, 'params.geo.country');
+  // < Device object
+
+  // > GDPR
+  let user = {};
+  user.ext = {};
+
+  // Universal ID
+  let eidsArr = deepAccess(validBidRequests, 'userIdAsEids');
+  if (typeof eidsArr !== 'undefined') {
+    eidsArr = eidsArr.filter(
+      uuid =>
+        (typeof uuid !== 'undefined' && uuid !== null) &&
+        (typeof uuid.source == 'string' && uuid.source !== null) &&
+        (typeof uuid.uids[0].id == 'string' && uuid.uids[0].id !== null)
+    );
+
+    user.ext.eids = eidsArr;
+  };
+
+  let regs = {};
+  regs.gdpr = 0;
+  if (!(bidderRequest.gdprConsent == null)) {
+    if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') { regs.gdpr = bidderRequest.gdprConsent.gdprApplies; }
+    if (regs.gdpr) { user.ext.consent = bidderRequest.gdprConsent.consentString; }
+  }
+
+  // CCPA
+  regs.ext = {};
+  if (!(bidderRequest.uspConsent == null)) {
+    regs.ext.us_privacy = bidderRequest.uspConsent;
+  }
+
+  // COPPA compliance
+  if (config.getConfig('coppa') === true) {
+    regs.coppa = config.getConfig('coppa') === true ? 1 : 0;
+  }
+  // < GDPR
+
+  // > Payload Ext
+  let payloadExt = {};
+  payloadExt.bidder = {};
+  payloadExt.bidder.tappxkey = TAPPXKEY;
+  payloadExt.bidder.mktag = MKTAG;
+  payloadExt.bidder.bcid = deepAccess(validBidRequests, 'params.bcid');
+  payloadExt.bidder.bcrid = deepAccess(validBidRequests, 'params.bcrid');
+  payloadExt.bidder.ext = (typeof BIDEXTRA == 'object') ? BIDEXTRA : {};
+  if (typeof videoMediaType !== 'undefined') {
+    payloadExt.bidder.ext.pbvidtype = videoMediaType.context;
+  }
+  // < Payload Ext
+
+  // > Payload
+  payload.id = validBidRequests.auctionId;
+  payload.test = deepAccess(validBidRequests, 'params.test') ? 1 : 0;
+  payload.at = 1;
+  payload.tmax = bidderRequest.timeout ? bidderRequest.timeout : 600;
+  payload.bidder = BIDDER_CODE;
+  payload.imp = [imp];
+  payload.user = user;
+  payload.ext = payloadExt;
+
+  payload.device = device;
+  payload.regs = regs;
+  // < Payload
+
+  let pbjsv = ($$PREBID_GLOBAL$$.version !== null) ? encodeURIComponent($$PREBID_GLOBAL$$.version) : -1;
+
+  return {
+    method: 'POST',
+    url: `${hostInfo.url}?type_cnn=${TYPE_CNN}&v=${TAPPX_BIDDER_VERSION}&pbjsv=${pbjsv}`,
+    data: JSON.stringify(payload),
+    bids: validBidRequests
+  };
+}
+
+function getLanguage() {
+  const language = navigator.language ? 'language' : 'userLanguage';
+  return navigator[language].split('-')[0];
+}
+
+function getOs() {
+  let ua = navigator.userAgent;
+  if (ua == null) { return 'unknown'; } else if (ua.match(/(iPhone|iPod|iPad)/)) { return 'ios'; } else if (ua.match(/Android/)) { return 'android'; } else if (ua.match(/Window/)) { return 'windows'; } else { return 'unknown'; }
+}
+
+export function _getHostInfo(validBidRequests) {
+  let domainInfo = {};
+  let endpoint = deepAccess(validBidRequests, 'params.endpoint');
+  let hostParam = deepAccess(validBidRequests, 'params.host');
+
+  domainInfo.domain = hostParam.split('/', 1)[0];
+
+  let regexHostParamHttps = new RegExp(`^https:\/\/`);
+  let regexHostParamHttp = new RegExp(`^http:\/\/`);
+
+  let regexNewEndpoints = new RegExp(`^(vz.*|zz.*)\\.[a-z]{3}\\.tappx\\.com$`, 'i');
+  let regexClassicEndpoints = new RegExp(`^([a-z]{3}|testing)\\.[a-z]{3}\\.tappx\\.com$`, 'i');
+
+  if (regexHostParamHttps.test(hostParam)) {
+    hostParam = hostParam.replace('https://', '');
+  } else if (regexHostParamHttp.test(hostParam)) {
+    hostParam = hostParam.replace('http://', '');
+  }
+
+  if (regexNewEndpoints.test(domainInfo.domain)) {
+    domainInfo.newEndpoint = true;
+    domainInfo.endpoint = domainInfo.domain.split('.', 1)[0]
+    domainInfo.url = `https://${hostParam}`
+  } else if (regexClassicEndpoints.test(domainInfo.domain)) {
+    domainInfo.newEndpoint = false;
+    domainInfo.endpoint = endpoint
+    domainInfo.url = `https://${hostParam}${endpoint}`
+  }
+
+  return domainInfo;
+}
+
+function outstreamRender(bid, request) {
+  let rendererOptions = {};
+  rendererOptions = (typeof bid.params[0].video != 'undefined') ? bid.params[0].video : {};
+  rendererOptions.content = bid.vastXml;
+
+  bid.renderer.push(() => {
+    window.tappxOutstream.renderAd({
+      sizes: [bid.width, bid.height],
+      targetId: bid.adUnitCode,
+      adResponse: bid.adResponse,
+      rendererOptions: rendererOptions
+    });
+  });
+}
+
+function createRenderer(bid, request, url) {
+  const rendererInst = Renderer.install({
+    id: request.id,
+    url: url,
+    loaded: false
+  });
+
+  try {
+    rendererInst.setRender(outstreamRender);
+  } catch (err) {
+    logWarn(LOG_PREFIX, 'Prebid Error calling setRender on renderer');
+  }
+
+  return rendererInst;
+}
+
+export function _checkParamDataType(key, value, datatype) {
+  var errMsg = 'Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value;
+  var functionToExecute;
+  switch (datatype) {
+    case DATA_TYPES.BOOLEAN:
+      functionToExecute = isBoolean;
+      break;
+    case DATA_TYPES.NUMBER:
+      functionToExecute = isNumber;
+      break;
+    case DATA_TYPES.STRING:
+      functionToExecute = isStr;
+      break;
+    case DATA_TYPES.ARRAY:
+      functionToExecute = isArray;
+      break;
+  }
+  if (functionToExecute(value)) {
+    return value;
+  }
+  logWarn(LOG_PREFIX, errMsg);
+  return undefined;
+}
+
+export function _extractPageUrl(validBidRequests, bidderRequest) {
+  let url = bidderRequest?.refererInfo?.page || bidderRequest?.refererInfo?.topmostLocation;
+  return parseDomain(url, {noLeadingWww: true});
+}
+
+registerBidder(spec);
diff --git a/modules/tappxBidAdapter.md b/modules/tappxBidAdapter.md
new file mode 100644
index 00000000000..677718c261c
--- /dev/null
+++ b/modules/tappxBidAdapter.md
@@ -0,0 +1,94 @@
+# Overview
+```
+Module Name: Tappx Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@tappx.com
+```
+
+# Description
+Module that connects to :tappx demand sources.
+Suppots Banner and Video (instream and outstream).
+Please use ```tappx``` as the bidder code.
+Ads sizes available: [300,250], [320,50], [320,480], [480,320], [728,90], [768,1024], [1024,768]
+
+# Banner Test Parameters
+```
+    var adUnits = [
+            {
+                code: 'banner-ad-div',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[320,50]]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: "tappx",
+                        params: {
+                            host: "testing.ssp.tappx.com/rtb/v2/",
+                            tappxkey: "pub-1234-android-1234",
+                            endpoint: "ZZ1234PBJS",
+                            bidfloor: 0.005,
+                            mktag: "123456",                // Optional: tappx mktag
+                            test: true,                     // Optional: for testing purposes
+                            domainUrl: "www.example.com",   // Optional: add domain site
+                            ext: {                          // Optional: extra params
+                                foo: "bar"
+                            }
+                        }
+                    }
+                ]
+            }
+    ];
+```
+
+
+# Video Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'video-ad-div',
+            renderer: {
+                options: {
+                    text: "Tappx instream Video"
+                    }
+            },
+            mediaTypes: {
+                video: {
+                    context: %CONTEXT%,             // Could be "instream" or "outstream"
+                    mimes : [ "video/mp4", "application/javascript" ],
+                    playerSize: [320, 250]
+                }
+            },
+            bids: [{
+                bidder: 'tappx',
+                params: {
+                    host: "testing.ssp.tappx.com/rtb/v2/",
+                    tappxkey: "pub-1234-desktop-1234",
+                    endpoint: "VZ12TESTCTV",
+                    bidfloor: 0.005,
+                    mktag: "123456",                // Optional: tappx mktag
+                    test: true,                     // Optional: for testing purposes
+                    domainUrl: "www.example.com",   // Optional: add domain site
+                    video: {                        // Optional
+                        skippable: true,            // Optional
+                        minduration: 5,             // Optional
+                        maxduration: 30,            // Optional
+                        startdelay: 5,              // Optional
+                        playbackmethod: [1,3],      // Optional
+                        api: [ 1, 2 ],              // Optional
+                        protocols: [ 2, 3 ],        // Optional
+                        battr: [ 13, 14 ],          // Optional
+                        linearity: 1,               // Optional
+                        placement: 2,               // Optional
+                        minbitrate: 10,             // Optional
+                        maxbitrate: 10              // Optional
+                    },
+                    ext: {                          // Optional: extra params
+                                foo: "bar"
+                            }
+                }
+            }]
+        }
+    ];
+```
diff --git a/modules/targetVideoBidAdapter.js b/modules/targetVideoBidAdapter.js
new file mode 100644
index 00000000000..bc775e78647
--- /dev/null
+++ b/modules/targetVideoBidAdapter.js
@@ -0,0 +1,207 @@
+import {find} from '../src/polyfill.js';
+import {getBidRequest} from '../src/utils.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+
+const SOURCE = 'pbjs';
+const BIDDER_CODE = 'targetVideo';
+const ENDPOINT_URL = 'https://ib.adnxs.com/ut/v3/prebid';
+const MARGIN = 1.35;
+const GVLID = 786;
+
+export const spec = {
+
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    return !!(bid && bid.params && bid.params.placementId);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(bidRequests, bidderRequest) {
+    const tags = bidRequests.map(createVideoTag);
+    const schain = bidRequests[0].schain;
+    const payload = {
+      tags: tags,
+      sdk: {
+        source: SOURCE,
+        version: '$prebid.version$'
+      },
+      schain: schain
+    };
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdpr_consent = {
+        consent_string: bidderRequest.gdprConsent.consentString,
+        consent_required: bidderRequest.gdprConsent.gdprApplies
+      };
+
+      if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+        let ac = bidderRequest.gdprConsent.addtlConsent;
+        let acStr = ac.substring(ac.indexOf('~') + 1);
+        payload.gdpr_consent.addtl_consent = acStr.split('.').map(id => parseInt(id, 10));
+      }
+    }
+
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent
+    }
+
+    return formatRequest(payload, bidderRequest);
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, { bidderRequest }) {
+    serverResponse = serverResponse.body;
+    const bids = [];
+
+    if (serverResponse.tags) {
+      serverResponse.tags.forEach(serverBid => {
+        const rtbBid = getRtbBid(serverBid);
+        if (rtbBid && rtbBid.cpm !== 0 && rtbBid.ad_type == VIDEO) {
+          bids.push(newBid(serverBid, rtbBid, bidderRequest));
+        }
+      });
+    }
+
+    return bids;
+  }
+
+}
+
+function getSizes(request) {
+  let sizes = request.sizes;
+  if (!sizes && request.mediaTypes && request.mediaTypes.banner && request.mediaTypes.banner.sizes) {
+    sizes = request.mediaTypes.banner.sizes;
+  }
+  if (Array.isArray(sizes) && !Array.isArray(sizes[0])) {
+    sizes = [sizes[0], sizes[1]];
+  }
+  if (!Array.isArray(sizes) || !Array.isArray(sizes[0])) {
+    sizes = [[0, 0]];
+  }
+
+  return sizes;
+}
+
+function formatRequest(payload, bidderRequest) {
+  const options = {
+    withCredentials: true
+  };
+  const request = {
+    method: 'POST',
+    url: ENDPOINT_URL,
+    data: JSON.stringify(payload),
+    bidderRequest,
+    options
+  };
+
+  return request;
+}
+
+/**
+ * Create video auction.
+ *
+ * @param {*} serverResponse A successful response from the server.
+ * @return {Bid[]} An array of bids which were nested inside the server.
+ */
+function createVideoTag(bid) {
+  const tag = {};
+  tag.id = parseInt(bid.params.placementId, 10);
+  tag.gpid = 'targetVideo';
+  tag.sizes = getSizes(bid);
+  tag.primary_size = tag.sizes[0];
+  tag.ad_types = [VIDEO];
+  tag.uuid = bid.bidId;
+  tag.allow_smaller_sizes = false;
+  tag.use_pmt_rule = false;
+  tag.prebid = true;
+  tag.disable_psa = true;
+  tag.hb_source = 1;
+  tag.require_asset_url = true;
+  tag.video = {
+    playback_method: 2,
+    skippable: true
+  };
+
+  return tag;
+}
+
+/**
+ * Unpack the Server's Bid into a Prebid-compatible one.
+ * @param serverBid
+ * @param rtbBid
+ * @param bidderRequest
+ * @return Bid
+ */
+function newBid(serverBid, rtbBid, bidderRequest) {
+  const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
+  const sizes = getSizes(bidRequest);
+  const bid = {
+    requestId: serverBid.uuid,
+    cpm: rtbBid.cpm * MARGIN,
+    creativeId: rtbBid.creative_id,
+    dealId: rtbBid.deal_id,
+    currency: 'USD',
+    netRevenue: true,
+    width: sizes[0][0],
+    height: sizes[0][1],
+    ttl: 300,
+    adUnitCode: bidRequest.adUnitCode,
+    appnexus: {
+      buyerMemberId: rtbBid.buyer_member_id,
+      dealPriority: rtbBid.deal_priority,
+      dealCode: rtbBid.deal_code
+    }
+  };
+
+  if (rtbBid.rtb.video) {
+    Object.assign(bid, {
+      vastImpUrl: rtbBid.notify_url,
+      ad: getBannerHtml(rtbBid.notify_url + '&redir=' + encodeURIComponent(rtbBid.rtb.video.asset_url)),
+      ttl: 3600
+    });
+  }
+
+  return bid;
+}
+
+function getRtbBid(tag) {
+  return tag && tag.ads && tag.ads.length && find(tag.ads, ad => ad.rtb);
+}
+
+function getBannerHtml(vastUrl) {
+  return `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <title></title>
+      <style>html, body {width: 100%; height: 100%; margin: 0;}</style>
+    </head>
+    <body>
+      <div id="targetVideoPlayer"></div>
+      <script src="https://player.target-video.com/custom/targetvideo-banner.js"></script>
+      <script>initPlayer("${vastUrl}");</script>
+    </body>
+  </html>`;
+}
+
+registerBidder(spec);
diff --git a/modules/targetVideoBidAdapter.md b/modules/targetVideoBidAdapter.md
new file mode 100644
index 00000000000..557c9f94410
--- /dev/null
+++ b/modules/targetVideoBidAdapter.md
@@ -0,0 +1,34 @@
+# Overview
+
+```
+Module Name:  Target Video Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:   grajzer@gmail.com
+```
+
+# Description
+
+Connects to Appnexus exchange for bids.
+
+TargetVideo bid adapter supports Banner.
+
+# Test Parameters
+```
+var adUnits = [
+  // Banner adUnit
+  {
+      code: 'banner-div',
+      mediaTypes: {
+          banner: {
+              sizes: [[640, 480], [300, 250]],
+          }
+      },
+      bids: [{
+          bidder: 'targetVideo',
+          params: {
+              placementId: 13232361
+          }
+      }]
+  }
+];
+```
diff --git a/modules/teadsBidAdapter.js b/modules/teadsBidAdapter.js
index dbeed4aceae..56b21d0d4cf 100644
--- a/modules/teadsBidAdapter.js
+++ b/modules/teadsBidAdapter.js
@@ -1,16 +1,22 @@
+import { getValue, logError, deepAccess, getBidIdParameter, parseSizesInput, isArray } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-const utils = require('../src/utils.js');
+import {getStorageManager} from '../src/storageManager.js';
+
 const BIDDER_CODE = 'teads';
+const GVL_ID = 132;
 const ENDPOINT_URL = 'https://a.teads.tv/hb/bid-request';
 const gdprStatus = {
   GDPR_APPLIES_PUBLISHER: 12,
   GDPR_APPLIES_GLOBAL: 11,
   GDPR_DOESNT_APPLY: 0,
   CMP_NOT_FOUND_OR_ERROR: 22
-}
+};
+const FP_TEADS_ID_COOKIE_NAME = '_tfpvi';
+export const storage = getStorageManager({gvlid: GVL_ID, bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   supportedMediaTypes: ['video', 'banner'],
   /**
    * Determines whether or not the given bid request is valid.
@@ -21,13 +27,13 @@ export const spec = {
   isBidRequestValid: function(bid) {
     let isValid = false;
     if (typeof bid.params !== 'undefined') {
-      let isValidPlacementId = _validateId(utils.getValue(bid.params, 'placementId'));
-      let isValidPageId = _validateId(utils.getValue(bid.params, 'pageId'));
+      let isValidPlacementId = _validateId(getValue(bid.params, 'placementId'));
+      let isValidPageId = _validateId(getValue(bid.params, 'pageId'));
       isValid = isValidPlacementId && isValidPageId;
     }
 
     if (!isValid) {
-      utils.logError('Teads placementId and pageId parameters are required. Bid aborted.');
+      logError('Teads placementId and pageId parameters are required. Bid aborted.');
     }
     return isValid;
   },
@@ -39,26 +45,32 @@ export const spec = {
    */
   buildRequests: function(validBidRequests, bidderRequest) {
     const bids = validBidRequests.map(buildRequestObject);
+
     const payload = {
       referrer: getReferrerInfo(bidderRequest),
       pageReferrer: document.referrer,
       networkBandwidth: getConnectionDownLink(window.navigator),
+      timeToFirstByte: getTimeToFirstByte(window),
       data: bids,
       deviceWidth: screen.width,
-      hb_version: '$prebid.version$'
+      hb_version: '$prebid.version$',
+      ...getSharedViewerIdParameters(validBidRequests),
+      ...getFirstPartyTeadsIdParameter(validBidRequests)
     };
 
-    if (validBidRequests[0].schain) {
-      payload.schain = validBidRequests[0].schain;
+    const firstBidRequest = validBidRequests[0];
+
+    if (firstBidRequest.schain) {
+      payload.schain = firstBidRequest.schain;
     }
 
     let gdpr = bidderRequest.gdprConsent;
     if (bidderRequest && gdpr) {
-      let isCmp = (typeof gdpr.gdprApplies === 'boolean')
-      let isConsentString = (typeof gdpr.consentString === 'string')
+      let isCmp = typeof gdpr.gdprApplies === 'boolean';
+      let isConsentString = typeof gdpr.consentString === 'string';
       let status = isCmp
-        ? findGdprStatus(gdpr.gdprApplies, gdpr.vendorData, gdpr.apiVersion)
-        : gdprStatus.CMP_NOT_FOUND_OR_ERROR
+        ? findGdprStatus(gdpr.gdprApplies, gdpr.vendorData)
+        : gdprStatus.CMP_NOT_FOUND_OR_ERROR;
       payload.gdpr_iab = {
         consent: isConsentString ? gdpr.consentString : '',
         status: status,
@@ -67,14 +79,19 @@ export const spec = {
     }
 
     if (bidderRequest && bidderRequest.uspConsent) {
-      payload.us_privacy = bidderRequest.uspConsent
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    const userAgentClientHints = deepAccess(firstBidRequest, 'ortb2.device.sua');
+    if (userAgentClientHints) {
+      payload.userAgentClientHints = userAgentClientHints;
     }
 
     const payloadString = JSON.stringify(payload);
     return {
       method: 'POST',
       url: ENDPOINT_URL,
-      data: payloadString,
+      data: payloadString
     };
   },
   /**
@@ -96,6 +113,9 @@ export const spec = {
           currency: bid.currency,
           netRevenue: true,
           ttl: bid.ttl,
+          meta: {
+            advertiserDomains: bid && bid.adomain ? bid.adomain : []
+          },
           ad: bid.ad,
           requestId: bid.bidId,
           creativeId: bid.creativeId,
@@ -108,13 +128,44 @@ export const spec = {
       });
     }
     return bidResponses;
-  },
+  }
 };
 
+/**
+ *
+ * @param validBidRequests an array of bids
+ * @returns {{sharedViewerIdKey : 'sharedViewerIdValue'}} object with all sharedviewerids
+ */
+function getSharedViewerIdParameters(validBidRequests) {
+  const sharedViewerIdMapping = {
+    unifiedId2: 'uid2.id', // uid2IdSystem
+    liveRampId: 'idl_env', // identityLinkIdSystem
+    lotamePanoramaId: 'lotamePanoramaId', // lotamePanoramaIdSystem
+    id5Id: 'id5id.uid', // id5IdSystem
+    criteoId: 'criteoId', // criteoIdSystem
+    yahooConnectId: 'connectId', // connectIdSystem
+    quantcastId: 'quantcastId', // quantcastIdSystem
+    epsilonPublisherLinkId: 'publinkId', // publinkIdSystem
+    publisherFirstPartyViewerId: 'pubcid', // sharedIdSystem
+    merkleId: 'merkleId.id', // merkleIdSystem
+    kinessoId: 'kpuid' // kinessoIdSystem
+  }
+
+  let sharedViewerIdObject = {};
+  for (const sharedViewerId in sharedViewerIdMapping) {
+    const key = sharedViewerIdMapping[sharedViewerId];
+    const value = deepAccess(validBidRequests, `0.userId.${key}`);
+    if (value) {
+      sharedViewerIdObject[sharedViewerId] = value;
+    }
+  }
+  return sharedViewerIdObject;
+}
+
 function getReferrerInfo(bidderRequest) {
   let ref = '';
-  if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-    ref = bidderRequest.refererInfo.referer;
+  if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
+    ref = bidderRequest.refererInfo.page;
   }
   return ref;
 }
@@ -123,60 +174,89 @@ function getConnectionDownLink(nav) {
   return nav && nav.connection && nav.connection.downlink >= 0 ? nav.connection.downlink.toString() : '';
 }
 
-function findGdprStatus(gdprApplies, gdprData, apiVersion) {
-  let status = gdprStatus.GDPR_APPLIES_PUBLISHER
-  if (gdprApplies) {
-    if (isGlobalConsent(gdprData, apiVersion)) status = gdprStatus.GDPR_APPLIES_GLOBAL
-  } else status = gdprStatus.GDPR_DOESNT_APPLY
-  return status;
+function getTimeToFirstByte(win) {
+  const performance = win.performance || win.webkitPerformance || win.msPerformance || win.mozPerformance;
+
+  const ttfbWithTimingV2 = performance &&
+    typeof performance.getEntriesByType === 'function' &&
+    Object.prototype.toString.call(performance.getEntriesByType) === '[object Function]' &&
+    performance.getEntriesByType('navigation')[0] &&
+    performance.getEntriesByType('navigation')[0].responseStart &&
+    performance.getEntriesByType('navigation')[0].requestStart &&
+    performance.getEntriesByType('navigation')[0].responseStart > 0 &&
+    performance.getEntriesByType('navigation')[0].requestStart > 0 &&
+    Math.round(
+      performance.getEntriesByType('navigation')[0].responseStart - performance.getEntriesByType('navigation')[0].requestStart
+    );
+
+  if (ttfbWithTimingV2) {
+    return ttfbWithTimingV2.toString();
+  }
+
+  const ttfbWithTimingV1 = performance &&
+    performance.timing.responseStart &&
+    performance.timing.requestStart &&
+    performance.timing.responseStart > 0 &&
+    performance.timing.requestStart > 0 &&
+    performance.timing.responseStart - performance.timing.requestStart;
+
+  return ttfbWithTimingV1 ? ttfbWithTimingV1.toString() : '';
 }
 
-function isGlobalConsent(gdprData, apiVersion) {
-  return gdprData && apiVersion === 1
-    ? (gdprData.hasGlobalScope || gdprData.hasGlobalConsent)
-    : gdprData && apiVersion === 2
-      ? !gdprData.isServiceSpecific
-      : false
+function findGdprStatus(gdprApplies, gdprData) {
+  let status = gdprStatus.GDPR_APPLIES_PUBLISHER;
+  if (gdprApplies) {
+    if (gdprData && !gdprData.isServiceSpecific) {
+      status = gdprStatus.GDPR_APPLIES_GLOBAL;
+    }
+  } else {
+    status = gdprStatus.GDPR_DOESNT_APPLY;
+  }
+  return status;
 }
 
 function buildRequestObject(bid) {
   const reqObj = {};
-  let placementId = utils.getValue(bid.params, 'placementId');
-  let pageId = utils.getValue(bid.params, 'pageId');
+  let placementId = getValue(bid.params, 'placementId');
+  let pageId = getValue(bid.params, 'pageId');
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid');
 
   reqObj.sizes = getSizes(bid);
-  reqObj.bidId = utils.getBidIdParameter('bidId', bid);
-  reqObj.bidderRequestId = utils.getBidIdParameter('bidderRequestId', bid);
+  reqObj.bidId = getBidIdParameter('bidId', bid);
+  reqObj.bidderRequestId = getBidIdParameter('bidderRequestId', bid);
   reqObj.placementId = parseInt(placementId, 10);
   reqObj.pageId = parseInt(pageId, 10);
-  reqObj.adUnitCode = utils.getBidIdParameter('adUnitCode', bid);
-  reqObj.auctionId = utils.getBidIdParameter('auctionId', bid);
-  reqObj.transactionId = utils.getBidIdParameter('transactionId', bid);
+  reqObj.adUnitCode = getBidIdParameter('adUnitCode', bid);
+  reqObj.auctionId = getBidIdParameter('auctionId', bid);
+  reqObj.transactionId = getBidIdParameter('transactionId', bid);
+  if (gpid) { reqObj.gpid = gpid; }
   return reqObj;
 }
 
 function getSizes(bid) {
-  return utils.parseSizesInput(concatSizes(bid));
+  return parseSizesInput(concatSizes(bid));
 }
 
 function concatSizes(bid) {
-  let playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
-  let videoSizes = utils.deepAccess(bid, 'mediaTypes.video.sizes');
-  let bannerSizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes');
+  let playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
+  let videoSizes = deepAccess(bid, 'mediaTypes.video.sizes');
+  let bannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
 
-  if (utils.isArray(bannerSizes) || utils.isArray(playerSize) || utils.isArray(videoSizes)) {
+  if (isArray(bannerSizes) || isArray(playerSize) || isArray(videoSizes)) {
     let mediaTypesSizes = [bannerSizes, videoSizes, playerSize];
     return mediaTypesSizes
       .reduce(function(acc, currSize) {
-        if (utils.isArray(currSize)) {
-          if (utils.isArray(currSize[0])) {
-            currSize.forEach(function (childSize) { acc.push(childSize) })
+        if (isArray(currSize)) {
+          if (isArray(currSize[0])) {
+            currSize.forEach(function (childSize) {
+              acc.push(childSize);
+            })
           } else {
             acc.push(currSize);
           }
         }
         return acc;
-      }, [])
+      }, []);
   } else {
     return bid.sizes;
   }
@@ -186,4 +266,27 @@ function _validateId(id) {
   return (parseInt(id) > 0);
 }
 
+/**
+ * Get the first-party cookie Teads ID parameter to be sent in bid request.
+ * @param validBidRequests an array of bids
+ * @returns `{} | {firstPartyCookieTeadsId: string}`
+ */
+function getFirstPartyTeadsIdParameter(validBidRequests) {
+  const firstPartyTeadsIdFromUserIdModule = deepAccess(validBidRequests, '0.userId.teadsId');
+
+  if (firstPartyTeadsIdFromUserIdModule) {
+    return {firstPartyCookieTeadsId: firstPartyTeadsIdFromUserIdModule};
+  }
+
+  if (storage.cookiesAreEnabled(null)) {
+    const firstPartyTeadsIdFromCookie = storage.getCookie(FP_TEADS_ID_COOKIE_NAME, null);
+
+    if (firstPartyTeadsIdFromCookie) {
+      return {firstPartyCookieTeadsId: firstPartyTeadsIdFromCookie};
+    }
+  }
+
+  return {};
+}
+
 registerBidder(spec);
diff --git a/modules/teadsIdSystem.js b/modules/teadsIdSystem.js
new file mode 100644
index 00000000000..c18f8fb76ac
--- /dev/null
+++ b/modules/teadsIdSystem.js
@@ -0,0 +1,239 @@
+/**
+ * This module adds TeadsId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/teadsIdSystem
+ * @requires module:modules/userId
+ */
+
+import {isStr, isNumber, logError, logInfo, isEmpty, timestamp} from '../src/utils.js'
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {uspDataHandler} from '../src/adapterManager.js';
+
+const MODULE_NAME = 'teadsId';
+const GVL_ID = 132;
+const FP_TEADS_ID_COOKIE_NAME = '_tfpvi';
+const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+
+export const gdprStatus = {
+  GDPR_DOESNT_APPLY: 0,
+  CMP_NOT_FOUND_OR_ERROR: 22,
+  GDPR_APPLIES_PUBLISHER: 12,
+};
+
+export const gdprReason = {
+  GDPR_DOESNT_APPLY: 0,
+  CMP_NOT_FOUND: 220,
+  GDPR_APPLIES_PUBLISHER_CLASSIC: 120,
+};
+
+export const storage = getStorageManager({gvlid: GVL_ID, moduleName: MODULE_NAME});
+
+/** @type {Submodule} */
+export const teadsIdSubmodule = {
+  /**
+     * used to link submodule with config
+     * @type {string}
+     */
+  name: MODULE_NAME,
+  /**
+   * Vendor id of Teads
+   * @type {number}
+   */
+  gvlid: GVL_ID,
+  /**
+     * decode the stored id value for passing to bid requests
+     * @function
+     * @param {string} value
+     * @returns {{teadsId:string}}
+     */
+  decode(value) {
+    return {teadsId: value}
+  },
+  /**
+     * performs action to obtain id and return a value in the callback's response argument
+     * @function
+     * @param {SubmoduleConfig} [submoduleConfig]
+     * @param {ConsentData} [consentData]
+     * @returns {IdResponse|undefined}
+     */
+  getId(submoduleConfig, consentData) {
+    const resp = function (callback) {
+      const url = buildAnalyticsTagUrl(submoduleConfig, consentData);
+
+      const callbacks = {
+        success: (bodyResponse, responseObj) => {
+          if (responseObj && responseObj.status === 200) {
+            if (isStr(bodyResponse) && !isEmpty(bodyResponse)) {
+              const cookiesMaxAge = getTimestampFromDays(365); // 1 year
+              const expirationCookieDate = getCookieExpirationDate(cookiesMaxAge);
+              storage.setCookie(FP_TEADS_ID_COOKIE_NAME, bodyResponse, expirationCookieDate);
+              callback(bodyResponse);
+            } else {
+              storage.setCookie(FP_TEADS_ID_COOKIE_NAME, '', EXPIRED_COOKIE_DATE);
+              callback();
+            }
+          } else {
+            logInfo(`${MODULE_NAME}: Server error while fetching ID`);
+            callback();
+          }
+        },
+        error: error => {
+          logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+          callback();
+        }
+      };
+
+      ajax(url, callbacks, undefined, {method: 'GET'});
+    };
+    return {callback: resp};
+  }
+};
+
+/**
+ * Build the full URL from the Submodule config & consentData
+ * @param submoduleConfig
+ * @param consentData
+ * @returns {string}
+ */
+export function buildAnalyticsTagUrl(submoduleConfig, consentData) {
+  const pubId = getPublisherId(submoduleConfig);
+  const teadsViewerId = getTeadsViewerId();
+  const status = getGdprStatus(consentData);
+  const gdprConsentString = getGdprConsentString(consentData);
+  const ccpaConsentString = getCcpaConsentString(uspDataHandler?.getConsentData());
+  const gdprReason = getGdprReasonFromStatus(status);
+  const params = {
+    analytics_tag_id: pubId,
+    tfpvi: teadsViewerId,
+    gdpr_consent: gdprConsentString,
+    gdpr_status: status,
+    gdpr_reason: gdprReason,
+    ccpa_consent: ccpaConsentString,
+    sv: 'prebid-v1',
+  };
+
+  const url = 'https://at.teads.tv/fpc';
+  const queryParams = new URLSearchParams();
+
+  for (const param in params) {
+    queryParams.append(param, params[param]);
+  }
+
+  return url + '?' + queryParams.toString();
+}
+
+/**
+ * Extract the Publisher ID from the Submodule config
+ * @returns {string}
+ * @param submoduleConfig
+ */
+export function getPublisherId(submoduleConfig) {
+  const pubId = submoduleConfig?.params?.pubId;
+  const prefix = 'PUB_';
+  if (isNumber(pubId)) {
+    return prefix + pubId.toString();
+  }
+  if (isStr(pubId) && parseInt(pubId)) {
+    return prefix + pubId;
+  }
+  return '';
+}
+
+/**
+ * Extract the GDPR status from the given consentData
+ * @param consentData
+ * @returns {number}
+ */
+export function getGdprStatus(consentData) {
+  const gdprApplies = consentData?.gdprApplies;
+  if (gdprApplies === true) {
+    return gdprStatus.GDPR_APPLIES_PUBLISHER;
+  } else if (gdprApplies === false) {
+    return gdprStatus.GDPR_DOESNT_APPLY;
+  } else {
+    return gdprStatus.CMP_NOT_FOUND_OR_ERROR;
+  }
+}
+
+/**
+ * Extract the GDPR consent string from the given consentData
+ * @param consentData
+ * @returns {string}
+ */
+export function getGdprConsentString(consentData) {
+  const consentString = consentData?.consentString;
+  if (isStr(consentString)) {
+    return consentString;
+  } else {
+    return '';
+  }
+}
+
+/**
+ * Map the GDPR reason from the given GDPR status
+ * @param status
+ * @returns {number}
+ */
+function getGdprReasonFromStatus(status) {
+  switch (status) {
+    case gdprStatus.GDPR_DOESNT_APPLY:
+      return gdprReason.GDPR_DOESNT_APPLY;
+    case gdprStatus.CMP_NOT_FOUND_OR_ERROR:
+      return gdprReason.CMP_NOT_FOUND;
+    case gdprStatus.GDPR_APPLIES_PUBLISHER:
+      return gdprReason.GDPR_APPLIES_PUBLISHER_CLASSIC;
+    default:
+      return -1;
+  }
+}
+
+/**
+ * Return the well formatted CCPA consent string
+ * @param ccpaConsentString
+ * @returns {string|*}
+ */
+export function getCcpaConsentString(ccpaConsentString) {
+  if (isStr(ccpaConsentString)) {
+    return ccpaConsentString;
+  } else {
+    return '';
+  }
+}
+
+/**
+ * Get the cookie expiration date string from a given Date and a max age
+ * @param {number} maxAge
+ * @returns {string}
+ */
+export function getCookieExpirationDate(maxAge) {
+  return new Date(timestamp() + maxAge).toUTCString()
+}
+
+/**
+ * Get cookie from Cookie or Local Storage
+ * @returns {string}
+ */
+function getTeadsViewerId() {
+  const teadsViewerId = readCookie()
+  if (isStr(teadsViewerId)) {
+    return teadsViewerId
+  } else {
+    return '';
+  }
+}
+
+function readCookie() {
+  return storage.cookiesAreEnabled(null) ? storage.getCookie(FP_TEADS_ID_COOKIE_NAME, null) : null;
+}
+
+/**
+ * Return a number of milliseconds from given days number
+ * @param days
+ * @returns {number}
+ */
+export function getTimestampFromDays(days) {
+  return days * 24 * 60 * 60 * 1000;
+}
+submodule('userId', teadsIdSubmodule);
diff --git a/modules/teadsIdSystem.md b/modules/teadsIdSystem.md
new file mode 100644
index 00000000000..b898ceaeacf
--- /dev/null
+++ b/modules/teadsIdSystem.md
@@ -0,0 +1,22 @@
+# Overview
+
+Module Name: Teads Id System
+Module Type: User Id System
+Maintainer: innov-ssp@teads.com
+
+# Description
+
+Teads user identification system. GDPR & CCPA compliant.
+
+## Example configuration for publishers:
+
+    pbjs.setConfig({
+        userSync: {
+            userIds: [{
+                name: 'teadsId',
+                params: {
+                    pubId: 1234
+                }
+            }]
+        }
+    });
diff --git a/modules/telariaBidAdapter.js b/modules/telariaBidAdapter.js
index 74c97f34b74..5fb71d1d627 100644
--- a/modules/telariaBidAdapter.js
+++ b/modules/telariaBidAdapter.js
@@ -1,8 +1,6 @@
-import * as utils from '../src/utils.js';
-import {createBid as createBidFactory} from '../src/bidfactory.js';
+import { logError, isEmpty, deepAccess, triggerPixel, logWarn, isArray } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {VIDEO} from '../src/mediaTypes.js';
-import {STATUS} from '../src/constants.json';
 
 const BIDDER_CODE = 'telaria';
 const DOMAIN = 'tremorhub.com';
@@ -11,7 +9,11 @@ const EVENTS_ENDPOINT = `events.${DOMAIN}/diag`;
 
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['tremor', 'tremorvideo'],
+  gvlid: 202,
+  aliases: [
+    { code: 'tremor', gvlid: 202 },
+    { code: 'tremorvideo', gvlid: 202 }
+  ],
   supportedMediaTypes: [VIDEO],
   /**
    * Determines if the request is valid
@@ -73,7 +75,7 @@ export const spec = {
         }
       });
     } catch (error) {
-      utils.logError(error);
+      logError(error);
       width = 0;
       height = 0;
     }
@@ -83,10 +85,12 @@ export const spec = {
       if (bidResult && bidResult.error) {
         errorMessage += `: ${bidResult.error}`;
       }
-      utils.logError(errorMessage);
-    } else if (!utils.isEmpty(bidResult.seatbid)) {
+      logError(errorMessage);
+    } else if (!isEmpty(bidResult.seatbid)) {
       bidResult.seatbid[0].bid.forEach(tag => {
-        bids.push(createBid(STATUS.GOOD, bidderRequest, tag, width, height, BIDDER_CODE));
+        if (tag) {
+          bids.push(createBid(bidderRequest, tag, width, height));
+        }
       });
     }
 
@@ -102,7 +106,7 @@ export const spec = {
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
     if (syncOptions.pixelEnabled && serverResponses.length) {
-      (utils.deepAccess(serverResponses, '0.body.ext.telaria.userSync') || []).forEach(url => syncs.push({type: 'image', url: url}));
+      (deepAccess(serverResponses, '0.body.ext.telaria.userSync') || []).forEach(url => syncs.push({type: 'image', url: url}));
     }
     return syncs;
   },
@@ -114,7 +118,7 @@ export const spec = {
   onTimeout: function (timeoutData) {
     let url = getTimeoutUrl(timeoutData);
     if (url) {
-      utils.triggerPixel(url);
+      triggerPixel(url);
     }
   }
 };
@@ -124,7 +128,7 @@ function getDefaultSrcPageUrl() {
 }
 
 function getEncodedValIfNotEmpty(val) {
-  return !utils.isEmpty(val) ? encodeURIComponent(val) : '';
+  return (val !== '' && val !== undefined) ? encodeURIComponent(val) : '';
 }
 
 /**
@@ -135,7 +139,7 @@ function getEncodedValIfNotEmpty(val) {
  * @returns {string}
  */
 function getSupplyChainAsUrlParam(schainObject) {
-  if (utils.isEmpty(schainObject)) {
+  if (isEmpty(schainObject)) {
     return '';
   }
 
@@ -157,22 +161,22 @@ function getSupplyChainAsUrlParam(schainObject) {
 function getUrlParams(params, schainFromBidRequest) {
   let urlSuffix = '';
 
-  if (!utils.isEmpty(params)) {
+  if (!isEmpty(params)) {
     for (let key in params) {
-      if (key !== 'schain' && params.hasOwnProperty(key) && !utils.isEmpty(params[key])) {
+      if (key !== 'schain' && params.hasOwnProperty(key) && !isEmpty(params[key])) {
         urlSuffix += `&${key}=${params[key]}`;
       }
     }
-    urlSuffix += getSupplyChainAsUrlParam(!utils.isEmpty(schainFromBidRequest) ? schainFromBidRequest : params['schain']);
+    urlSuffix += getSupplyChainAsUrlParam(!isEmpty(schainFromBidRequest) ? schainFromBidRequest : params['schain']);
   }
 
   return urlSuffix;
 }
 
 export const getTimeoutUrl = function(timeoutData) {
-  let params = utils.deepAccess(timeoutData, '0.params.0');
+  let params = deepAccess(timeoutData, '0.params.0');
 
-  if (!utils.isEmpty(params)) {
+  if (!isEmpty(params)) {
     let url = `https://${EVENTS_ENDPOINT}`;
 
     params = Object.assign({
@@ -195,14 +199,14 @@ export const getTimeoutUrl = function(timeoutData) {
  * @returns {string}
  */
 function generateUrl(bid, bidderRequest) {
-  let playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+  let playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
   if (!playerSize) {
-    utils.logWarn(`Although player size isn't required it is highly recommended`);
+    logWarn(`Although player size isn't required it is highly recommended`);
   }
 
   let width, height;
   if (playerSize) {
-    if (utils.isArray(playerSize) && (playerSize.length === 2) && (!isNaN(playerSize[0]) && !isNaN(playerSize[1]))) {
+    if (isArray(playerSize) && (playerSize.length === 2) && (!isNaN(playerSize[0]) && !isNaN(playerSize[1]))) {
       width = playerSize[0];
       height = playerSize[1];
     } else if (typeof playerSize === 'object') {
@@ -211,8 +215,8 @@ function generateUrl(bid, bidderRequest) {
     }
   }
 
-  let supplyCode = utils.deepAccess(bid, 'params.supplyCode');
-  let adCode = utils.deepAccess(bid, 'params.adCode');
+  let supplyCode = deepAccess(bid, 'params.supplyCode');
+  let adCode = deepAccess(bid, 'params.adCode');
 
   if (supplyCode && adCode) {
     let url = `https://${supplyCode}.${TAG_ENDPOINT}?adCode=${adCode}`;
@@ -243,8 +247,9 @@ function generateUrl(bid, bidderRequest) {
         }
       }
 
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        url += (`&referrer=${encodeURIComponent(bidderRequest.refererInfo.referer)}`);
+      if (bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
+        // TODO: is 'page' the right value here?
+        url += (`&referrer=${encodeURIComponent(bidderRequest.refererInfo.page)}`);
       }
     }
 
@@ -253,35 +258,32 @@ function generateUrl(bid, bidderRequest) {
 }
 
 /**
- * Create and return a bid object based on status and tag
- * @param status
+ * Create and return a bid response
  * @param reqBid
  * @param response
  * @param width
  * @param height
- * @param bidderCode
  */
-function createBid(status, reqBid, response, width, height, bidderCode) {
-  let bid = createBidFactory(status, reqBid);
-
+function createBid(reqBid, response, width, height) {
   // TTL 5 mins by default, future support for extended imp wait time
-  if (response) {
-    Object.assign(bid, {
-      requestId: reqBid.bidId,
-      cpm: response.price,
-      creativeId: response.crid || '-1',
-      vastXml: response.adm,
-      vastUrl: reqBid.vastUrl,
-      mediaType: 'video',
-      width: width,
-      height: height,
-      bidderCode: bidderCode,
-      adId: response.id,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 300,
-      ad: response.adm
-    });
+  const bid = {
+    requestId: reqBid.bidId,
+    cpm: response.price,
+    creativeId: response.crid || '-1',
+    vastXml: response.adm,
+    vastUrl: reqBid.vastUrl,
+    mediaType: 'video',
+    width: width,
+    height: height,
+    currency: 'USD',
+    netRevenue: true,
+    ttl: 300,
+    ad: response.adm,
+    meta: {}
+  };
+
+  if (response.adomain && response.adomain.length > 0) {
+    bid.meta.advertiserDomains = response.adomain;
   }
 
   return bid;
diff --git a/modules/temedyaBidAdapter.js b/modules/temedyaBidAdapter.js
new file mode 100644
index 00000000000..4eac0bc641f
--- /dev/null
+++ b/modules/temedyaBidAdapter.js
@@ -0,0 +1,148 @@
+import { parseSizesInput, parseQueryStringParameters, logError } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'temedya';
+const ENDPOINT_URL = 'https://adm.vidyome.com/';
+const ENDPOINT_METHOD = 'GET';
+const CURRENCY = 'TRY';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
+  /**
+  * Determines whether or not the given bid request is valid.
+  *
+  * @param {BidRequest} bid The bid params to validate.
+  * @return boolean True if this is a valid bid, and false otherwise.
+  */
+  isBidRequestValid: function (bid) {
+    return !!(bid.params.widgetId);
+  },
+  /**
+  * Make a server request from the list of BidRequests.
+  *
+  * @param {validBidRequests[]} - an array of bids
+  * @return ServerRequest Info describing the request to the server.
+  */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    return validBidRequests.map(req => {
+      const mediaType = this._isBannerRequest(req) ? 'display' : NATIVE;
+      const data = {
+        wid: req.params.widgetId,
+        type: mediaType,
+        count: (req.params.count > 6 ? 6 : req.params.count) || 1,
+        mediaType: mediaType,
+        requestid: req.bidId
+      };
+      if (mediaType === 'display') {
+        data.sizes = parseSizesInput(
+          req.mediaTypes && req.mediaTypes.banner && req.mediaTypes.banner.sizes
+        ).join('|')
+      }
+      /** @type {ServerRequest} */
+      return {
+        method: ENDPOINT_METHOD,
+        url: ENDPOINT_URL,
+        data: parseQueryStringParameters(data),
+        options: { withCredentials: false, requestId: req.bidId, mediaType: mediaType }
+      };
+    });
+  },
+  /**
+  * Unpack the response from the server into a list of bids.
+  *
+  * @param {ServerResponse} serverResponse A successful response from the server.
+  * @return {Bid[]} An array of bids which were nested inside the server.
+  */
+  interpretResponse: function (serverResponse, bidRequest) {
+    try {
+      const bidResponse = serverResponse.body;
+      const bidResponses = [];
+      if (bidResponse && bidRequest.options.mediaType == NATIVE) {
+        bidResponse.ads.forEach(function(ad) {
+          bidResponses.push({
+            requestId: bidRequest.options.requestId,
+            cpm: parseFloat(ad.assets.cpm) || 1,
+            width: 320,
+            height: 240,
+            creativeId: ad.assets.id,
+            currency: ad.currency || CURRENCY,
+            netRevenue: false,
+            mediaType: NATIVE,
+            ttl: 360,
+            native: {
+              title: ad.assets.title,
+              body: ad.assets.body || '',
+              icon: {
+                url: ad.assets.files[0],
+                width: 320,
+                height: 240
+              },
+              image: {
+                url: ad.assets.files[0],
+                width: 320,
+                height: 240
+              },
+              privacyLink: '',
+              clickUrl: ad.assets.click_url,
+              displayUrl: ad.assets.click_url,
+              cta: '',
+              sponsoredBy: ad.assets.sponsor || '',
+              impressionTrackers: [bidResponse.base.widget.impression + '&ids=' + ad.id + ':' + ad.assets.id],
+            },
+          });
+        });
+      } else if (bidResponse && bidRequest.options.mediaType == 'display') {
+        bidResponse.ads.forEach(function(ad) {
+          let w = ad.assets.width || 300;
+          let h = ad.assets.height || 250;
+          let htmlTag = '<!doctype html><html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" href="https://widget.cdn.vidyome.com/builds/neytivme.css"></head>';
+          htmlTag += '<body><div id="tem_banner" class="size' + w + '-' + h + '" style="width:' + w + 'px;height:' + h + 'px">';
+          htmlTag += '<i onclick="window.open(\'https://www.temedya.com\', \'_blank\')">TE Medya</i>';
+          htmlTag += '<a href="' + ad.assets.click_url + '" target="_blank">';
+          htmlTag += '<div class="image-with-text">';
+          htmlTag += '<div class="tem-img"><img src="' + ad.assets.files[0] + '" style="width:' + w + 'px;height:' + h + 'px;"/></div>';
+          if (ad.assets.title) {
+            htmlTag += '<div class="text-elements">';
+            htmlTag += '<h2>' + ad.assets.title + '</h2>';
+            htmlTag += '<p>' + (ad.assets.sponsor || '') + '</p>';
+            htmlTag += '<em><canvas height="100" width="100"></canvas></em>';
+            htmlTag += '</div>';
+          };
+          htmlTag += '</div></a><img style="display: none;" src="' + bidResponse.base.widget.impression + '&ids=' + ad.id + ':' + ad.assets.id + '">';
+          htmlTag += '</div></body></html>';
+          bidResponses.push({
+            requestId: bidRequest.options.requestId,
+            cpm: parseFloat(ad.assets.cpm) || 1,
+            width: w,
+            height: h,
+            creativeId: ad.assets.id,
+            currency: ad.currency || CURRENCY,
+            netRevenue: false,
+            ttl: 360,
+            mediaType: BANNER,
+            ad: htmlTag
+          });
+        });
+      }
+      return bidResponses;
+    } catch (err) {
+      logError(err);
+      return [];
+    }
+  },
+  /**
+   * @param {BidRequest} req
+   * @return {boolean}
+   * @private
+   */
+  _isBannerRequest(req) {
+    return !!(req.mediaTypes && req.mediaTypes.banner);
+  }
+}
+registerBidder(spec);
diff --git a/modules/temedyaBidAdapter.md b/modules/temedyaBidAdapter.md
new file mode 100644
index 00000000000..31ac4f3689b
--- /dev/null
+++ b/modules/temedyaBidAdapter.md
@@ -0,0 +1,64 @@
+# Overview
+
+Module Name: TE Medya Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@temedya.com
+
+# Description
+
+Module that connects to TE Medya's demand sources.
+
+TE Medya supports Native and Banner. 
+
+
+# Test Parameters
+# Native
+```
+
+    var adUnits = [
+        {
+            code:'tme_div_id',
+            mediaTypes:{
+                native: {
+                    title: {
+                        required: true
+                    }
+                }
+            },
+            bids:[
+                {
+                    bidder: 'temedya',
+                    params: {
+                        widgetId: 753497,
+                        count: 1
+                    }
+                }
+            ]
+        }
+    ];
+```
+# Test Parameters
+# Banner
+```
+
+    var adUnits = [
+        {
+            code:'tme_div_id',
+            mediaTypes:{
+                banner: {
+                    banner: {
+                        sizes:[300, 250]
+                    }
+                }
+            },
+            bids:[
+                {
+                    bidder: 'temedya',
+                    params: {
+                        widgetId: 753497
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/terceptAnalyticsAdapter.js b/modules/terceptAnalyticsAdapter.js
index 54da2bd06d2..9d215f0ceda 100644
--- a/modules/terceptAnalyticsAdapter.js
+++ b/modules/terceptAnalyticsAdapter.js
@@ -1,8 +1,8 @@
+import { parseSizesInput, getWindowLocation, buildUrl } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import * as utils from '../src/utils.js';
 
 const emptyUrl = '';
 const analyticsType = 'endpoint';
@@ -56,7 +56,7 @@ function mapBidRequests(params) {
         requestId: bid.bidderRequestId,
         auctionId: bid.auctionId,
         transactionId: bid.transactionId,
-        sizes: utils.parseSizesInput(bid.mediaTypes.banner.sizes).toString(),
+        sizes: parseSizesInput(bid.mediaTypes.banner.sizes).toString(),
         renderStatus: 1,
         requestTimestamp: params.auctionStart
       });
@@ -110,13 +110,13 @@ function mapBidResponse(bidResponse, status) {
 }
 
 function send(data, status) {
-  let location = utils.getWindowLocation();
+  let location = getWindowLocation();
   if (typeof data !== 'undefined' && typeof data.auctionInit !== 'undefined') {
     Object.assign(data.auctionInit, { host: location.host, path: location.pathname, search: location.search });
   }
   data.initOptions = initOptions;
 
-  let terceptAnalyticsRequestUrl = utils.buildUrl({
+  let terceptAnalyticsRequestUrl = buildUrl({
     protocol: 'https',
     hostname: (initOptions && initOptions.hostName) || defaultHostName,
     pathname: (initOptions && initOptions.pathName) || defaultPathName,
diff --git a/modules/theAdxBidAdapter.js b/modules/theAdxBidAdapter.js
index 91e36077e88..3f7823d2fd1 100644
--- a/modules/theAdxBidAdapter.js
+++ b/modules/theAdxBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { logInfo, isEmpty, deepAccess, parseUrl, getDNT, parseSizesInput, _map } from '../src/utils.js';
 import {
   BANNER,
   NATIVE,
@@ -7,6 +7,7 @@ import {
 import {
   registerBidder
 } from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'theadx';
 const ENDPOINT_URL = 'https://ssp.theadx.com/request';
@@ -125,7 +126,7 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    utils.logInfo('theadx.isBidRequestValid', bid);
+    logInfo('theadx.isBidRequestValid', bid);
     let res = false;
     if (bid && bid.params) {
       res = !!(bid.params.pid && bid.params.tagId);
@@ -141,10 +142,13 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    utils.logInfo('theadx.buildRequests', 'validBidRequests', validBidRequests, 'bidderRequest', bidderRequest);
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    logInfo('theadx.buildRequests', 'validBidRequests', validBidRequests, 'bidderRequest', bidderRequest);
     let results = [];
     const requestType = 'POST';
-    if (!utils.isEmpty(validBidRequests)) {
+    if (!isEmpty(validBidRequests)) {
       results = validBidRequests.map(
         bidRequest => {
           return {
@@ -155,7 +159,8 @@ export const spec = {
               withCredentials: true,
             },
             bidder: 'theadx',
-            referrer: encodeURIComponent(bidderRequest.refererInfo.referer),
+            // TODO: is 'page' the right value here?
+            referrer: encodeURIComponent(bidderRequest.refererInfo.page || ''),
             data: generatePayload(bidRequest, bidderRequest),
             mediaTypes: bidRequest['mediaTypes'],
             requestId: bidderRequest.bidderRequestId,
@@ -176,7 +181,7 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: (serverResponse, request) => {
-    utils.logInfo('theadx.interpretResponse', 'serverResponse', serverResponse, ' request', request);
+    logInfo('theadx.interpretResponse', 'serverResponse', serverResponse, ' request', request);
 
     let responses = [];
 
@@ -185,8 +190,8 @@ export const spec = {
 
       let seatBids = responseBody.seatbid;
 
-      if (!(utils.isEmpty(seatBids) ||
-          utils.isEmpty(seatBids[0].bid))) {
+      if (!(isEmpty(seatBids) ||
+          isEmpty(seatBids[0].bid))) {
         let seatBid = seatBids[0];
         let bid = seatBid.bid[0];
 
@@ -201,7 +206,7 @@ export const spec = {
         let bidWidth = nullify(bid.w);
         let bidHeight = nullify(bid.h);
 
-        let creative = null
+        let creative = null;
         let videoXml = null;
         let mediaType = null;
         let native = null;
@@ -280,7 +285,7 @@ export const spec = {
    * @return {UserSync[]} The user syncs which should be dropped.
    */
   getUserSyncs: function (syncOptions, serverResponses) {
-    utils.logInfo('theadx.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses)
+    logInfo('theadx.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses)
     const syncs = [];
 
     if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
@@ -288,8 +293,8 @@ export const spec = {
     }
 
     serverResponses.forEach(resp => {
-      const syncIframeUrls = utils.deepAccess(resp, 'body.ext.sync.iframe');
-      const syncImageUrls = utils.deepAccess(resp, 'body.ext.sync.image');
+      const syncIframeUrls = deepAccess(resp, 'body.ext.sync.iframe');
+      const syncImageUrls = deepAccess(resp, 'body.ext.sync.image');
       if (syncOptions.iframeEnabled && syncIframeUrls) {
         syncIframeUrls.forEach(syncIframeUrl => {
           syncs.push({
@@ -314,7 +319,7 @@ export const spec = {
 }
 
 let buildSiteComponent = (bidRequest, bidderRequest) => {
-  let loc = utils.parseUrl(bidderRequest.refererInfo.referer, {
+  let loc = parseUrl(bidderRequest.refererInfo.page || '', {
     decodeSearchAsString: true
   });
 
@@ -353,7 +358,7 @@ let buildDeviceComponent = (bidRequest, bidderRequest) => {
     language: ('language' in navigator) ? navigator.language : null,
     ua: ('userAgent' in navigator) ? navigator.userAgent : null,
     devicetype: isMobile() ? 1 : isConnectedTV() ? 3 : 2,
-    dnt: utils.getDNT() ? 1 : 0,
+    dnt: getDNT() ? 1 : 0,
   };
   // Include connection info if available
   const CONNECTION = navigator.connection || navigator.webkitConnection;
@@ -383,14 +388,14 @@ let extractValidSize = (bidRequest, bidderRequest) => {
     } else {
       requestedSizes = mediaTypes.video.sizes;
     }
-  } else if (!utils.isEmpty(bidRequest.sizes)) {
-    requestedSizes = bidRequest.sizes
+  } else if (!isEmpty(bidRequest.sizes)) {
+    requestedSizes = bidRequest.sizes;
   }
 
   // Ensure the size array is normalized
-  let conformingSize = utils.parseSizesInput(requestedSizes);
+  let conformingSize = parseSizesInput(requestedSizes);
 
-  if (!utils.isEmpty(conformingSize) && conformingSize[0] != null) {
+  if (!isEmpty(conformingSize) && conformingSize[0] != null) {
     // Currently only the first size is utilized
     let splitSizes = conformingSize[0].split('x');
 
@@ -423,7 +428,7 @@ let generateBannerComponent = (bidRequest, bidderRequest) => {
 }
 
 let generateNativeComponent = (bidRequest, bidderRequest) => {
-  const assets = utils._map(bidRequest.mediaTypes.native, (bidParams, key) => {
+  const assets = _map(bidRequest.mediaTypes.native, (bidParams, key) => {
     const props = NATIVEPROBS[key];
     const asset = {
       required: bidParams.required & 1,
diff --git a/modules/timBidAdapter.js b/modules/timBidAdapter.js
deleted file mode 100644
index 68c711f9935..00000000000
--- a/modules/timBidAdapter.js
+++ /dev/null
@@ -1,177 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as bidfactory from '../src/bidfactory.js';
-var CONSTANTS = require('../src/constants.json');
-const BIDDER_CODE = 'tim';
-
-function parseBidRequest(bidRequest) {
-  let params = bidRequest.url.split('?')[1];
-  var obj = {};
-  var pairs = params.split('&');
-  try {
-    for (var i in pairs) {
-      var split = pairs[i].split('=');
-      obj[decodeURIComponent(split[0])] = decodeURIComponent(split[1]);
-    }
-  } catch (e) {
-    utils.logError(e);
-  }
-
-  return JSON.parse(obj.br);
-}
-
-function formatAdMarkup(bid) {
-  var adm = bid.adm;
-  if ('nurl' in bid) {
-    adm += createTrackPixelHtml(bid.nurl);
-  }
-  return `<!DOCTYPE html><html><head><title></title><body style='margin:0px;padding:0px;'>${adm}</body></head>`;
-}
-
-function createTrackPixelHtml(url) {
-  if (!url) {
-    return '';
-  }
-  let img = '<div style="position:absolute;left:0px;top:0px;visibility:hidden;">';
-  img += '<img src="' + url + '"></div>';
-  return img;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['timmedia'],
-
-  isBidRequestValid: function(bid) {
-    if (bid.params && bid.params.publisherid && bid.params.placementCode) {
-      return true;
-    } if (!bid.params) {
-      utils.logError('bid not valid: params were not provided');
-    } else if (!bid.params.publisherid) {
-      utils.logError('bid not valid: publisherid was not provided');
-    } else if (!bid.params.placementCode) {
-      utils.logError('bid not valid: placementCode was not provided');
-    } return false;
-  },
-
-  buildRequests: function(validBidRequests, bidderRequest) {
-    var requests = [];
-    for (var i = 0; i < validBidRequests.length; i++) {
-      requests.push(this.createRTBRequestURL(validBidRequests[i]));
-    }
-    return requests;
-  },
-
-  createRTBRequestURL: function(bidReq) {
-    // build bid request object
-    var domain = window.location.host;
-    var page = window.location.href;
-    var publisherid = bidReq.params.publisherid;
-    var bidFloor = bidReq.params.bidfloor;
-    var placementCode = bidReq.params.placementCode;
-
-    var adW = bidReq.mediaTypes.banner.sizes[0][0];
-    var adH = bidReq.mediaTypes.banner.sizes[0][1];
-
-    // build bid request with impressions
-    var bidRequest = {
-      id: utils.getUniqueIdentifierStr(),
-      imp: [{
-        id: bidReq.bidId,
-        banner: {
-          w: adW,
-          h: adH
-        },
-        tagid: placementCode,
-        bidfloor: bidFloor
-      }],
-      site: {
-        domain: domain,
-        page: page,
-        publisher: {
-          id: publisherid
-        }
-      },
-      device: {
-        'language': this.getLanguage(),
-        'w': adW,
-        'h': adH,
-        'js': 1,
-        'ua': navigator.userAgent
-      }
-    };
-    if (!bidFloor) {
-      delete bidRequest.imp['bidfloor'];
-    }
-
-    bidRequest.bidId = bidReq.bidId;
-    var url = 'https://hb.timmedia-hb.com/api/v2/services/prebid/' + publisherid + '/' + placementCode + '?' + 'br=' + encodeURIComponent(JSON.stringify(bidRequest));
-    return {
-      method: 'GET',
-      url: url,
-      data: '',
-      options: {withCredentials: false}
-    };
-  },
-
-  interpretResponse: function(serverResponse, bidRequest) {
-    bidRequest = parseBidRequest(bidRequest);
-    var bidResp = serverResponse.body;
-    const bidResponses = [];
-    if ((!bidResp || !bidResp.id) ||
-      (!bidResp.seatbid || bidResp.seatbid.length === 0 || !bidResp.seatbid[0].bid || bidResp.seatbid[0].bid.length === 0)) {
-      return [];
-    }
-    bidResp.seatbid[0].bid.forEach(function (bidderBid) {
-      var responseCPM;
-      var placementCode = '';
-      if (bidRequest) {
-        var bidResponse = bidfactory.createBid(1);
-        placementCode = bidRequest.placementCode;
-        bidRequest.status = CONSTANTS.STATUS.GOOD;
-        responseCPM = parseFloat(bidderBid.price);
-        if (responseCPM === 0) {
-          var bid = bidfactory.createBid(2);
-          bid.bidderCode = BIDDER_CODE;
-          bidResponses.push(bid);
-          return bidResponses;
-        }
-        bidResponse.placementCode = placementCode;
-        bidResponse.size = bidRequest.sizes;
-        bidResponse.creativeId = bidderBid.id;
-        bidResponse.bidderCode = BIDDER_CODE;
-        bidResponse.cpm = responseCPM;
-        bidResponse.ad = formatAdMarkup(bidderBid);
-        bidResponse.width = parseInt(bidderBid.w);
-        bidResponse.height = parseInt(bidderBid.h);
-        bidResponse.currency = bidResp.cur;
-        bidResponse.netRevenue = true;
-        bidResponse.requestId = bidRequest.bidId;
-        bidResponse.ttl = 180;
-        bidResponses.push(bidResponse);
-      }
-    });
-    return bidResponses;
-  },
-  getLanguage: function() {
-    const language = navigator.language ? 'language' : 'userLanguage';
-    return navigator[language].split('-')[0];
-  },
-
-  getUserSyncs: function(syncOptions, serverResponses) {
-    const syncs = []
-    return syncs;
-  },
-
-  onTimeout: function(data) {
-    // Bidder specifc code
-  },
-
-  onBidWon: function(bid) {
-    // Bidder specific code
-  },
-
-  onSetTargeting: function(bid) {
-    // Bidder specific code
-  },
-}
-registerBidder(spec);
diff --git a/modules/timBidAdapter.md b/modules/timBidAdapter.md
deleted file mode 100644
index 684f2e5f7c4..00000000000
--- a/modules/timBidAdapter.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Overview
-
-```
-Module Name: tim Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: boris@thetimmedia.com
-```
-
-# Description
-
-Module that connects to tim's demand sources
-
-# Test Parameters
-```
-    var adUnits = [{
-        "code":"99",
-        "sizes":[[300,250]],
-        "bids":[{"bidder":"tim",
-                "params":{
-                "placementCode":"testPlacementCode",
-                "publisherid":"testpublisherid"
-                }
-        }]
-    }]
-```
-
diff --git a/modules/timeoutRtdProvider.js b/modules/timeoutRtdProvider.js
new file mode 100644
index 00000000000..323a5291e2d
--- /dev/null
+++ b/modules/timeoutRtdProvider.js
@@ -0,0 +1,181 @@
+
+import { submodule } from '../src/hook.js';
+import * as ajax from '../src/ajax.js';
+import { logInfo, deepAccess, logError } from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+
+const SUBMODULE_NAME = 'timeout';
+
+// this allows the stubbing of functions during testing
+export const timeoutRtdFunctions = {
+  getDeviceType,
+  getConnectionSpeed,
+  checkVideo,
+  calculateTimeoutModifier,
+  handleTimeoutIncrement
+};
+
+const entries = Object.entries || function(obj) {
+  const ownProps = Object.keys(obj);
+  let i = ownProps.length;
+  let resArray = new Array(i);
+  while (i--) { resArray[i] = [ownProps[i], obj[ownProps[i]]]; }
+  return resArray;
+};
+
+function getDeviceType() {
+  const userAgent = window.navigator.userAgent.toLowerCase();
+  if ((/ipad|android 3.0|xoom|sch-i800|playbook|tablet|kindle/i.test(userAgent))) {
+    return 5; // tablet
+  }
+  if ((/iphone|ipod|android|blackberry|opera|mini|windows\sce|palm|smartphone|iemobile/i.test(userAgent))) {
+    return 4; // mobile
+  }
+  return 2; // personal computer
+}
+
+function checkVideo(adUnits) {
+  return adUnits.some((adUnit) => {
+    return adUnit.mediaTypes && adUnit.mediaTypes.video;
+  });
+}
+
+function getConnectionSpeed() {
+  const connection = window.navigator.connection || window.navigator.mozConnection || window.navigator.webkitConnection || {}
+  const connectionType = connection.type || connection.effectiveType;
+
+  switch (connectionType) {
+    case 'slow-2g':
+    case '2g':
+      return 'slow';
+
+    case '3g':
+      return 'medium';
+
+    case 'bluetooth':
+    case 'cellular':
+    case 'ethernet':
+    case 'wifi':
+    case 'wimax':
+    case '4g':
+      return 'fast';
+  }
+
+  return 'unknown';
+}
+/**
+ * Calculate the time to be added to the timeout
+ * @param {Array} adUnits
+ * @param {Object} rules
+ * @return {int}
+ */
+function calculateTimeoutModifier(adUnits, rules) {
+  logInfo('Timeout rules', rules);
+  let timeoutModifier = 0;
+  let toAdd = 0;
+
+  if (rules.includesVideo) {
+    const hasVideo = timeoutRtdFunctions.checkVideo(adUnits);
+    toAdd = rules.includesVideo[hasVideo] || 0;
+    logInfo(`Adding ${toAdd} to timeout for includesVideo ${hasVideo}`)
+    timeoutModifier += toAdd;
+  }
+
+  if (rules.numAdUnits) {
+    const numAdUnits = adUnits.length;
+    if (rules.numAdUnits[numAdUnits]) {
+      timeoutModifier += rules.numAdUnits[numAdUnits];
+    } else {
+      for (const [rangeStr, timeoutVal] of entries(rules.numAdUnits)) {
+        const [lowerBound, upperBound] = rangeStr.split('-');
+        if (parseInt(lowerBound) <= numAdUnits && numAdUnits <= parseInt(upperBound)) {
+          logInfo(`Adding ${timeoutVal} to timeout for numAdUnits ${numAdUnits}`)
+          timeoutModifier += timeoutVal;
+          break;
+        }
+      }
+    }
+  }
+
+  if (rules.deviceType) {
+    const deviceType = timeoutRtdFunctions.getDeviceType();
+    toAdd = rules.deviceType[deviceType] || 0;
+    logInfo(`Adding ${toAdd} to timeout for deviceType ${deviceType}`)
+    timeoutModifier += toAdd;
+  }
+
+  if (rules.connectionSpeed) {
+    const connectionSpeed = timeoutRtdFunctions.getConnectionSpeed();
+    toAdd = rules.connectionSpeed[connectionSpeed] || 0;
+    logInfo(`Adding ${toAdd} to timeout for connectionSpeed ${connectionSpeed}`)
+    timeoutModifier += toAdd;
+  }
+
+  logInfo('timeout Modifier calculated', timeoutModifier);
+  return timeoutModifier;
+}
+
+/**
+ *
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {Object} config
+ * @param {Object} userConsent
+ */
+function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
+  logInfo('Timeout rtd config', config);
+  const timeoutUrl = deepAccess(config, 'params.endpoint.url');
+  if (timeoutUrl) {
+    logInfo('Timeout url', timeoutUrl);
+    ajax.ajaxBuilder()(timeoutUrl, {
+      success: function(response) {
+        try {
+          const rules = JSON.parse(response);
+          timeoutRtdFunctions.handleTimeoutIncrement(reqBidsConfigObj, rules);
+        } catch (e) {
+          logError('Error parsing json response from timeout provider.')
+        }
+        callback();
+      },
+      error: function(errorStatus) {
+        logError('Timeout request error!', errorStatus);
+        callback();
+      }
+    });
+  } else if (deepAccess(config, 'params.rules')) {
+    timeoutRtdFunctions.handleTimeoutIncrement(reqBidsConfigObj, deepAccess(config, 'params.rules'));
+    callback();
+  } else {
+    logInfo('No timeout endpoint or timeout rules found. Exiting timeout rtd module');
+    callback();
+  }
+}
+
+/**
+ * Gets the timeout modifier, adds it to the bidder timeout, and sets it to reqBidsConfigObj
+ * @param {Object} reqBidsConfigObj
+ * @param {Object} rules
+ */
+function handleTimeoutIncrement(reqBidsConfigObj, rules) {
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+  const timeoutModifier = timeoutRtdFunctions.calculateTimeoutModifier(adUnits, rules);
+  const bidderTimeout = getGlobal().getConfig('bidderTimeout');
+  reqBidsConfigObj.timeout = bidderTimeout + timeoutModifier;
+}
+
+/** @type {RtdSubmodule} */
+export const timeoutSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: SUBMODULE_NAME,
+  init: () => true,
+  getBidRequestData,
+};
+
+function registerSubModule() {
+  submodule('realTimeData', timeoutSubmodule);
+}
+
+registerSubModule();
diff --git a/modules/timeoutRtdProvider.md b/modules/timeoutRtdProvider.md
new file mode 100644
index 00000000000..49d1e1fc70a
--- /dev/null
+++ b/modules/timeoutRtdProvider.md
@@ -0,0 +1,151 @@
+ ---
+ layout: page_v2
+ title: Timeout Rtd Module
+ description: Module for managing timeouts in real time
+ page_type: module
+ module_type: rtd
+ module_code : example
+ enable_download : true
+ sidebarType : 1
+ ---
+
+## Overview
+The timeout RTD module enables publishers to set rules that determine the timeout based on 
+certain features. It supports rule sets dynamically retrieved from a timeout provider as well as rules 
+set directly via configuration.
+Build the timeout RTD module into the Prebid.js package with: 
+```
+gulp build --modules=timeoutRtdProvider,rtdModule...
+```
+
+## Configuration
+The module is configured in the realTimeData.dataProviders object. The module will override 
+`bidderTimeout` in the pbjs config. 
+
+### Timeout Data Provider interface
+The timeout RTD module provides an interface of dynamically fetching timeout rules from 
+a data provider just before the auction begins. The endpoint url is set in the config just as in 
+the example below, and the timeout data will be used when making bid requests.
+ 
+```
+pbjs.setConfig({
+    ...
+    "realTimeData": {
+        "dataProviders": [{
+            "name": 'timeout',
+            "params": {
+                "endpoint": {
+                    "url": "http://{cdn-link}.json"
+                }
+            }
+        }
+    ]},
+    
+    // This value below will be modified by the timeout RTD module if it successfully 
+    // fetches the timeout data.  
+    "bidderTimeout": 1500, 
+    ...
+});
+```
+
+Sample Endpoint Response: 
+```
+{
+    "rules": {
+        "includesVideo": {
+            "true": 200,
+            "false": 50
+          },
+        "numAdUnits" : {
+            "1-5": 100,
+            "6-10": 200,
+            "11-15": 300
+        },
+        "deviceType": {
+            "2": 50,
+            "4": 100,
+            "5": 200
+        },
+        "connectionSpeed": {
+            "slow": 200,
+            "medium": 100,
+            "fast": 50,
+            "unknown": 10
+        },
+}
+```
+
+### Rule Handling:
+The rules retrieved from the endpoint will be used to add time to the `bidderTimeout` based on certain features such as 
+the user's deviceType, connection speed, etc. These rules can also be configured statically on page via a `rules` object.
+Note that the timeout Module will ignore the static rules if an endpoint url is provided. The timeout rules follow the 
+format:
+```
+{
+  '<feature>': {
+    '<key>': <milliseconds to be added to timeout>
+  }
+}
+```
+See bottom of page for examples.
+
+Currently supported features:
+
+|Name |Description | Keys | Example
+| :------------ | :------------ | :------------ |:------------ |
+| includesVideo | Adds time to the timeout based on whether there is a video ad unit in the auction or not | 'true'/'false'| { "true": 200, "false": 50 } | 
+| numAdUnits | Adds time based on the number of ad units. Ranges in the format `'lowerbound-upperbound` are accepted. This range is inclusive | numbers or number ranges | {"1": 50, "2-5": 100, "6-10": 200} |  
+| deviceType | Adds time based on device type| 2, 4, or 5| {"2": 50, "4": 100} |
+| connectionSpeed | Adds time based on connection speed. `connectionSpeed` defaults to 'unknown' if connection speed cannot be determined | slow, medium, fast, or unknown | { "slow": 200} |
+
+If there are multiple rules set, all of them would be used and any that apply will be added to the base timeout. For example, if the rules object contains:
+```
+{
+  "includesVideo": {
+      "true": 200,
+      "false": 50
+    },
+  "numAdUnits" : {
+      "1-3": 100,
+      "4-5": 200
+  }
+}
+```
+and there are 3 ad units in the auction, all of which are banner, then the timeout to be added will be 150 milliseconds (50 for `includesVideo[false]` + 100 for `numAdUnits['1-3']`).
+
+Full example:  
+```
+pbjs.setConfig({
+    ...
+    "realTimeData": {
+        "dataProviders": [{
+            "name": 'timeout',
+            "params": {
+            "rules": {
+                "includesVideo": {
+                    "true": 200,
+                    "false": 50
+                  },
+                "numAdUnits" : {
+                    "1-5": 100,
+                    "6-10": 200,
+                    "11-15": 300
+                },
+                "deviceType": {
+                    "2": 50,
+                    "4": 100,
+                    "5": 200
+                },
+                "connectionSpeed": {
+                    "slow": 200,
+                    "medium": 100,
+                    "fast": 50,
+                    "unknown": 10
+                },
+            }
+        }
+    ]}
+    ...
+    // The timeout RTD module will add time to `bidderTimeout` based on the rules set above.  
+    "bidderTimeout": 1500, 
+```
diff --git a/modules/tncIdSystem.js b/modules/tncIdSystem.js
new file mode 100644
index 00000000000..24e3c79d4df
--- /dev/null
+++ b/modules/tncIdSystem.js
@@ -0,0 +1,63 @@
+import { submodule } from '../src/hook.js';
+import { logInfo } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+
+const MODULE_NAME = 'tncId';
+let url = null;
+
+const waitTNCScript = (tncNS) => {
+  return new Promise((resolve, reject) => {
+    var tnc = window[tncNS];
+    if (!tnc) reject(new Error('No TNC Object'));
+    if (tnc.tncid) resolve(tnc.tncid);
+    tnc.ready(() => {
+      tnc = window[tncNS];
+      if (tnc.tncid) resolve(tnc.tncid);
+      else tnc.on('data-sent', () => resolve(tnc.tncid));
+    });
+  });
+}
+
+const loadRemoteScript = () => {
+  return new Promise((resolve) => {
+    loadExternalScript(url, MODULE_NAME, resolve);
+  })
+}
+
+const tncCallback = function (cb) {
+  let tncNS = '__tnc';
+  let promiseArray = [];
+  if (!window[tncNS]) {
+    tncNS = '__tncPbjs';
+    promiseArray.push(loadRemoteScript());
+  }
+
+  return Promise.all(promiseArray).then(() => waitTNCScript(tncNS)).then(cb).catch(() => cb());
+}
+
+export const tncidSubModule = {
+  name: MODULE_NAME,
+  decode(id) {
+    return {
+      tncid: id
+    };
+  },
+  gvlid: 750,
+  getId(config, consentData) {
+    const gdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
+    const consentString = gdpr ? consentData.consentString : '';
+
+    if (gdpr && !consentString) {
+      logInfo('Consent string is required for TNCID module');
+      return;
+    }
+
+    if (config.params && config.params.url) { url = config.params.url; }
+
+    return {
+      callback: function (cb) { return tncCallback(cb); }
+    }
+  }
+}
+
+submodule('userId', tncidSubModule)
diff --git a/modules/tncIdSystem.md b/modules/tncIdSystem.md
new file mode 100644
index 00000000000..f0f98e9098f
--- /dev/null
+++ b/modules/tncIdSystem.md
@@ -0,0 +1,33 @@
+# TNCID UserID Module
+
+### Prebid Configuration
+
+First, make sure to add the TNCID submodule to your Prebid.js package with: 
+
+```
+gulp build --modules=tncIdSystem,userId
+```
+
+### TNCIDIdSystem module Configuration
+
+You can configure this submodule in your `userSync.userIds[]` configuration:
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'tncId',
+            params: {
+              url: 'https://js.tncid.app/remote.min.js' //Optional
+            }
+        }],
+        syncDelay: 5000
+    }
+});
+```
+#### Configuration Params
+
+| Param Name | Required | Type | Description |
+| --- | --- | --- | --- |
+| name | Required | String | ID value for the TNCID module: `"tncId"` |
+| params.url | Optional | String | Provide TNC fallback script URL, this script is loaded if there is no TNC script on page |
diff --git a/modules/topRTBBidAdapter.js b/modules/topRTBBidAdapter.js
deleted file mode 100644
index c93bd8ccaac..00000000000
--- a/modules/topRTBBidAdapter.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'topRTB';
-const ENDPOINT_URL = 'https://ssp.toprtb.com/ssp/rest/ReqAd?ref=www.google.com&hbid=0&adUnitId=';
-var adName = '';
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
-  isBidRequestValid: function (bid) {
-    if (utils.deepAccess(bid, 'mediaTypes.banner')) {
-      adName = 'banner';
-      return bid.params && !!bid.params.adUnitId;
-    }
-    if (utils.deepAccess(bid, 'mediaTypes.video')) {
-      adName = 'video';
-      return bid.params && !!bid.params.adUnitId;
-    }
-  },
-
-  buildRequests: function (validBidRequests, bidderRequest) {
-    let adunitid = [];
-    utils._each(validBidRequests, function (bid) {
-      adunitid.push(bid.params.adUnitId + '_' + bid.bidId);
-    });
-
-    return {
-      method: 'GET',
-      url: ENDPOINT_URL + adunitid.toString()
-    };
-  },
-
-  interpretResponse: function(serverResponses, request) {
-    const bidResponses = [];
-    utils._each(serverResponses.body, function(response) {
-      if (response.cpm > 0) {
-        const bidResponse = {
-          requestId: response.bidId,
-          cpm: response.cpm,
-          width: response.width,
-          height: response.height,
-          ad: response.mediadata,
-          ttl: response.ttl,
-          creativeId: response.id,
-          netRevenue: true,
-          currency: response.currency,
-          tracking: response.tracking,
-          impression: response.impression
-        };
-        if (adName == 'video') {
-          bidResponse.vastXml = response.mediadata;
-          bidResponse.mediaType = 'video';
-        } else {
-          bidResponse.ad = response.mediadata;
-          bidResponse.mediaType = 'banner';
-        }
-        bidResponses.push(bidResponse);
-      }
-    });
-    return bidResponses;
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/topRTBBidAdapter.md b/modules/topRTBBidAdapter.md
deleted file mode 100644
index d1930c928e4..00000000000
--- a/modules/topRTBBidAdapter.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Overview
-
-```
-Module Name: topRTB Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: karthikeyan.d@djaxtech.com
-```
-
-# Description
-
-topRTB Bidder Adapter for Prebid.js. 
-Only Banner & video format is supported.
-
-# Test Parameters
-```
-    var adUnits = [
-       {
-           code: 'test-div-0',
-           sizes: [[728, 90]],  // a display size
-           bids: [
-               {
-                    bidder: 'topRTB',
-                    params: {
-                        adUnitId: 'c5c06f77430c4c33814a0577cb4cc978'
-                    }
-               }
-           ]
-       }
-    ];
-```
diff --git a/modules/topicsFpdModule.js b/modules/topicsFpdModule.js
new file mode 100644
index 00000000000..f5a3c0a2c70
--- /dev/null
+++ b/modules/topicsFpdModule.js
@@ -0,0 +1,261 @@
+import {logError, logWarn, mergeDeep, isEmpty, safeJSONParse, logInfo, hasDeviceAccess} from '../src/utils.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {submodule} from '../src/hook.js';
+import {GreedyPromise} from '../src/utils/promise.js';
+import {config} from '../src/config.js';
+import {getCoreStorageManager} from '../src/storageManager.js';
+import {includes} from '../src/polyfill.js';
+import {gdprDataHandler} from '../src/adapterManager.js';
+
+const MODULE_NAME = 'topicsFpd';
+const DEFAULT_EXPIRATION_DAYS = 21;
+const TCF_REQUIRED_PURPOSES = ['1', '2', '3', '4'];
+let HAS_GDPR_CONSENT = true;
+let LOAD_TOPICS_INITIALISE = false;
+const HAS_DEVICE_ACCESS = hasDeviceAccess();
+
+const bidderIframeList = {
+  maxTopicCaller: 1,
+  bidders: [{
+    bidder: 'pubmatic',
+    iframeURL: 'https://ads.pubmatic.com/AdServer/js/topics/topics_frame.html'
+  }]
+}
+export const coreStorage = getCoreStorageManager(MODULE_NAME);
+export const topicStorageName = 'prebid:topics';
+export const lastUpdated = 'lastUpdated';
+
+const iframeLoadedURL = [];
+const TAXONOMIES = {
+  // map from topic taxonomyVersion to IAB segment taxonomy
+  '1': 600
+}
+
+function partitionBy(field, items) {
+  return items.reduce((partitions, item) => {
+    const key = item[field];
+    if (!partitions.hasOwnProperty(key)) partitions[key] = [];
+    partitions[key].push(item);
+    return partitions;
+  }, {});
+}
+
+/**
+ * function to get list of loaded Iframes calling Topics API
+ */
+function getLoadedIframeURL() {
+  return iframeLoadedURL;
+}
+
+/**
+ * function to set/push iframe in the list which is loaded to called topics API.
+ */
+function setLoadedIframeURL(url) {
+  return iframeLoadedURL.push(url);
+}
+
+export function getTopicsData(name, topics, taxonomies = TAXONOMIES) {
+  return Object.entries(partitionBy('taxonomyVersion', topics))
+    .filter(([taxonomyVersion]) => {
+      if (!taxonomies.hasOwnProperty(taxonomyVersion)) {
+        logWarn(`Unrecognized taxonomyVersion from Topics API: "${taxonomyVersion}"; topic will be ignored`);
+        return false;
+      }
+      return true;
+    }).flatMap(([taxonomyVersion, topics]) =>
+      Object.entries(partitionBy('modelVersion', topics))
+        .map(([modelVersion, topics]) => {
+          const datum = {
+            ext: {
+              segtax: taxonomies[taxonomyVersion],
+              segclass: modelVersion
+            },
+            segment: topics.map((topic) => ({id: topic.topic.toString()}))
+          };
+          if (name != null) {
+            datum.name = name;
+          }
+          return datum;
+        })
+    );
+}
+
+export function getTopics(doc = document) {
+  let topics = null;
+  try {
+    if ('browsingTopics' in doc && doc.featurePolicy.allowsFeature('browsing-topics')) {
+      topics = GreedyPromise.resolve(doc.browsingTopics());
+    }
+  } catch (e) {
+    logError('Could not call topics API', e);
+  }
+  if (topics == null) {
+    topics = GreedyPromise.resolve([]);
+  }
+  return topics;
+}
+
+const topicsData = getTopics().then((topics) => getTopicsData(getRefererInfo().domain, topics));
+
+export function processFpd(config, {global}, {data = topicsData} = {}) {
+  if (!LOAD_TOPICS_INITIALISE) {
+    loadTopicsForBidders();
+    LOAD_TOPICS_INITIALISE = true;
+  }
+  return data.then((data) => {
+    data = [].concat(data, getCachedTopics()); // Add cached data in FPD data.
+    if (data.length) {
+      mergeDeep(global, {
+        user: {
+          data
+        }
+      });
+    }
+    return {global};
+  });
+}
+
+/**
+ * function to fetch the cached topic data from storage for bidders and return it
+ */
+export function getCachedTopics() {
+  let cachedTopicData = [];
+  if (!HAS_GDPR_CONSENT || !HAS_DEVICE_ACCESS) {
+    return cachedTopicData;
+  }
+  const topics = config.getConfig('userSync.topics') || bidderIframeList;
+  const bidderList = topics.bidders || [];
+  let storedSegments = new Map(safeJSONParse(coreStorage.getDataFromLocalStorage(topicStorageName)));
+  storedSegments && storedSegments.forEach((value, cachedBidder) => {
+    // Check bidder exist in config for cached bidder data and then only retrieve the cached data
+    let bidderConfigObj = bidderList.find(({bidder}) => cachedBidder == bidder)
+    if (bidderConfigObj) {
+      if (!isCachedDataExpired(value[lastUpdated], bidderConfigObj?.expiry || DEFAULT_EXPIRATION_DAYS)) {
+        Object.keys(value).forEach((segData) => {
+          segData != lastUpdated && cachedTopicData.push(value[segData]);
+        })
+      } else {
+        // delete the specific bidder map from the store and store the updated maps
+        storedSegments.delete(cachedBidder);
+        coreStorage.setDataInLocalStorage(topicStorageName, JSON.stringify([...storedSegments]));
+      }
+    }
+  });
+  return cachedTopicData;
+}
+
+/**
+ * Recieve messages from iframe loaded for bidders to fetch topic
+ * @param {MessageEvent} evt
+ */
+export function receiveMessage(evt) {
+  if (evt && evt.data) {
+    try {
+      let data = safeJSONParse(evt.data);
+      if (includes(getLoadedIframeURL(), evt.origin) && data && data.segment && !isEmpty(data.segment.topics)) {
+        const {domain, topics, bidder} = data.segment;
+        const iframeTopicsData = getTopicsData(domain, topics)[0];
+        iframeTopicsData && storeInLocalStorage(bidder, iframeTopicsData);
+      }
+    } catch (err) { }
+  }
+}
+
+/**
+Function to store Topics data recieved from iframe in storage(name: "prebid:topics")
+* @param {Topics} topics
+*/
+export function storeInLocalStorage(bidder, topics) {
+  const storedSegments = new Map(safeJSONParse(coreStorage.getDataFromLocalStorage(topicStorageName)));
+  if (storedSegments.has(bidder)) {
+    storedSegments.get(bidder)[topics['ext']['segclass']] = topics;
+    storedSegments.get(bidder)[lastUpdated] = new Date().getTime();
+    storedSegments.set(bidder, storedSegments.get(bidder));
+  } else {
+    storedSegments.set(bidder, {[topics.ext.segclass]: topics, [lastUpdated]: new Date().getTime()})
+  }
+  coreStorage.setDataInLocalStorage(topicStorageName, JSON.stringify([...storedSegments]));
+}
+
+function isCachedDataExpired(storedTime, cacheTime) {
+  const _MS_PER_DAY = 1000 * 60 * 60 * 24;
+  const currentTime = new Date().getTime();
+  const daysDifference = Math.ceil((currentTime - storedTime) / _MS_PER_DAY);
+  return daysDifference > cacheTime;
+}
+
+/**
+* Function to get random bidders based on count passed with array of bidders
+**/
+function getRandomBidders(arr, count) {
+  return ([...arr].sort(() => 0.5 - Math.random())).slice(0, count)
+}
+
+/**
+ * function to add listener for message receiving from IFRAME
+ */
+function listenMessagesFromTopicIframe() {
+  window.addEventListener('message', receiveMessage, false);
+}
+
+function checkTCFv2(vendorData, requiredPurposes = TCF_REQUIRED_PURPOSES) {
+  const {gdprApplies, purpose} = vendorData;
+  if (!gdprApplies || !purpose) {
+    return true;
+  }
+  return requiredPurposes.map((purposeNo) => {
+    const purposeConsent = purpose.consents ? purpose.consents[purposeNo] : false;
+    if (purposeConsent) {
+      return true;
+    }
+    return false;
+  }).reduce((a, b) => a && b, true);
+}
+
+export function hasGDPRConsent() {
+  // Check for GDPR consent for purpose 1,2,3,4 and return false if consent has not been given
+  const gdprConsent = gdprDataHandler.getConsentData();
+  const hasGdpr = (gdprConsent && typeof gdprConsent.gdprApplies === 'boolean' && gdprConsent.gdprApplies) ? 1 : 0;
+  const gdprConsentString = hasGdpr ? gdprConsent.consentString : '';
+  if (hasGdpr) {
+    if ((!gdprConsentString || gdprConsentString === '') || !gdprConsent.vendorData) {
+      return false;
+    }
+    return checkTCFv2(gdprConsent.vendorData);
+  }
+  return true;
+}
+
+/**
+ * function to load the iframes of the bidder to load the topics data
+ */
+function loadTopicsForBidders() {
+  HAS_GDPR_CONSENT = hasGDPRConsent();
+  if (!HAS_GDPR_CONSENT || !HAS_DEVICE_ACCESS) {
+    logInfo('Topics Module : Consent string is required to fetch the topics from third party domains.');
+    return;
+  }
+  const topics = config.getConfig('userSync.topics') || bidderIframeList;
+  if (topics) {
+    listenMessagesFromTopicIframe();
+    const randomBidders = getRandomBidders(topics.bidders || [], topics.maxTopicCaller || 1)
+    randomBidders && randomBidders.forEach(({ bidder, iframeURL }) => {
+      if (bidder && iframeURL) {
+        let ifrm = document.createElement('iframe');
+        ifrm.name = 'ifrm_'.concat(bidder);
+        ifrm.src = ''.concat(iframeURL, '?bidder=').concat(bidder);
+        ifrm.style.display = 'none';
+        setLoadedIframeURL(new URL(iframeURL).origin);
+        iframeURL && window.document.documentElement.appendChild(ifrm);
+      }
+    })
+  } else {
+    logWarn(`Topics config not defined under userSync Object`);
+  }
+}
+
+submodule('firstPartyData', {
+  name: 'topics',
+  queue: 1,
+  processFpd
+});
diff --git a/modules/tpmnBidAdapter.js b/modules/tpmnBidAdapter.js
index ec9d30c0e29..4dcdf1ef529 100644
--- a/modules/tpmnBidAdapter.js
+++ b/modules/tpmnBidAdapter.js
@@ -1,13 +1,16 @@
 /* eslint-disable no-tabs */
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
+import { parseUrl, deepAccess } from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
 import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 
 export const ADAPTER_VERSION = '1';
 const SUPPORTED_AD_TYPES = [BANNER];
-
 const BIDDER_CODE = 'tpmn';
 const URL = 'https://ad.tpmn.co.kr/prebidhb.tpmn';
+const IFRAMESYNC = 'https://ad.tpmn.co.kr/sync.tpmn?type=iframe';
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
@@ -18,20 +21,20 @@ export const spec = {
    * @param {object} bid The bid to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
    */
-  isBidRequestValid: function(bid) {
+  isBidRequestValid: function (bid) {
     return 'params' in bid &&
-    'inventoryId' in bid.params &&
-    'publisherId' in bid.params &&
-    !isNaN(Number(bid.params.inventoryId)) &&
-    bid.params.inventoryId > 0 &&
-    (typeof bid.mediaTypes.banner.sizes != 'undefined'); // only accepting appropriate sizes
+      'inventoryId' in bid.params &&
+      'publisherId' in bid.params &&
+      !isNaN(Number(bid.params.inventoryId)) &&
+      bid.params.inventoryId > 0 &&
+      (typeof bid.mediaTypes.banner.sizes != 'undefined'); // only accepting appropriate sizes
   },
 
   /**
-	 * @param {BidRequest[]} bidRequests
-	 * @param {*} bidderRequest
-	 * @return {ServerRequest}
-	 */
+   * @param {BidRequest[]} bidRequests
+   * @param {*} bidderRequest
+   * @return {ServerRequest}
+   */
   buildRequests: (bidRequests, bidderRequest) => {
     if (bidRequests.length === 0) {
       return [];
@@ -49,11 +52,11 @@ export const spec = {
     }];
   },
   /**
-	 * Unpack the response from the server into a list of bids.
-	 *
-	 * @param {serverResponse} serverResponse A successful response from the server.
-	 * @return {Bid[]} An array of bids which were nested inside the server.
-	 */
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {serverResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
   interpretResponse: function (serverResponse, serverRequest) {
     if (!Array.isArray(serverResponse.body)) {
       return [];
@@ -63,7 +66,48 @@ export const spec = {
     // our server directly returns the format needed by prebid.js so no more
     // transformation is needed here.
     return bidResults;
-  }
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncArr = [];
+    if (syncOptions.iframeEnabled) {
+      let policyParam = '';
+      if (gdprConsent && gdprConsent.consentString) {
+        if (typeof gdprConsent.gdprApplies === 'boolean') {
+          policyParam += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+        } else {
+          policyParam += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+        }
+      }
+      if (uspConsent && uspConsent.consentString) {
+        policyParam += `&ccpa_consent=${uspConsent.consentString}`;
+      }
+      const coppa = config.getConfig('coppa') ? 1 : 0;
+      policyParam += `&coppa=${coppa}`;
+      syncArr.push({
+        type: 'iframe',
+        url: IFRAMESYNC + policyParam
+      });
+    } else {
+      syncArr.push({
+        type: 'image',
+        url: 'https://x.bidswitch.net/sync?ssp=tpmn'
+      });
+      syncArr.push({
+        type: 'image',
+        url: 'https://gocm.c.appier.net/tpmn'
+      });
+      syncArr.push({
+        type: 'image',
+        url: 'https://info.mmnneo.com/getGuidRedirect.info?url=https%3A%2F%2Fad.tpmn.co.kr%2Fcookiesync.tpmn%3Ftpmn_nid%3Dbf91e8b3b9d3f1af3fc1d657f090b4fb%26tpmn_buid%3D'
+      });
+      syncArr.push({
+        type: 'image',
+        url: 'https://sync.aralego.com/idSync?redirect=https%3A%2F%2Fad.tpmn.co.kr%2FpixelCt.tpmn%3Ftpmn_nid%3Dde91e8b3b9d3f1af3fc1d657f090b815%26tpmn_buid%3DSspCookieUserId'
+      });
+    }
+    return syncArr;
+  },
 };
 
 registerBidder(spec);
@@ -72,13 +116,13 @@ registerBidder(spec);
  * Creates site description object
  */
 function createSite(refInfo) {
-  let url = utils.parseUrl(refInfo.referer);
+  let url = parseUrl(refInfo.page || '');
   let site = {
     'domain': url.hostname,
     'page': url.protocol + '://' + url.hostname + url.pathname
   };
-  if (self === top && document.referrer) {
-    site.ref = document.referrer;
+  if (refInfo.ref) {
+    site.ref = refInfo.ref
   }
   let keywords = document.getElementsByTagName('meta')['keywords'];
   if (keywords && keywords.content) {
@@ -102,7 +146,7 @@ function parseSizes(sizes) {
 }
 
 function getBannerSizes(bidRequest) {
-  return parseSizes(utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes') || bidRequest.sizes);
+  return parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes') || bidRequest.sizes);
 }
 
 function bidToRequest(bid) {
diff --git a/modules/trafficgateBidAdapter.js b/modules/trafficgateBidAdapter.js
new file mode 100644
index 00000000000..6665c397fe9
--- /dev/null
+++ b/modules/trafficgateBidAdapter.js
@@ -0,0 +1,95 @@
+import { getWindowLocation, deepAccess } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'trafficgate';
+const URL = 'https://[HOST].bc-plugin.com/?c=o&m=multi'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: function (bid) {
+    return !!(bid.bidId && bid.params && parseInt(bid.params.placementId) && bid.params.host)
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    if (validBidRequests && validBidRequests.length === 0) return [];
+
+    const location = getWindowLocation()
+    const placements = []
+
+    validBidRequests.forEach((bidReq) => {
+      placements.push({
+        placementId: bidReq.params.placementId,
+        bidId: bidReq.bidId,
+        traffic: getMediatype(bidReq)
+      })
+    })
+
+    return {
+      method: 'POST',
+      url: URL.replace('[HOST]', validBidRequests[0].params.host),
+      data: {
+        language: (navigator && navigator.language) ? navigator.language : '',
+        secure: +(location.protocol === 'https:'),
+        host: location.hostname,
+        page: location.pathname,
+        placements: placements
+      }
+    }
+  },
+
+  interpretResponse: function (opts) {
+    const body = opts.body
+    const response = []
+
+    for (let i = 0; i < body.length; i++) {
+      const item = body[i]
+      if (isBidResponseValid(item)) {
+        response.push(item)
+      }
+    }
+
+    return response
+  }
+}
+
+registerBidder(spec)
+
+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.title && bid.image && bid.impressionTrackers)
+    default:
+      return false
+  }
+}
+
+function getMediatype(bidRequest) {
+  if (deepAccess(bidRequest, 'mediaTypes.banner')) {
+    return BANNER;
+  }
+  if (deepAccess(bidRequest, 'mediaTypes.video')) {
+    return VIDEO;
+  }
+  if (deepAccess(bidRequest, 'mediaTypes.native')) {
+    return NATIVE;
+  }
+}
diff --git a/modules/trafficgateBidAdapter.md b/modules/trafficgateBidAdapter.md
new file mode 100644
index 00000000000..de4449c341e
--- /dev/null
+++ b/modules/trafficgateBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name: TrafficGate Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: publishers@bidscube.com
+```
+
+# Description
+
+Module that connects to TrafficGate demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: 'placementId_0',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'trafficgate',
+            params: {
+                placementId: 0,
+                host: 'example'
+            }
+        }]
+    }];
+```
diff --git a/modules/trafficrootsBidAdapter.md b/modules/trafficrootsBidAdapter.md
deleted file mode 100644
index 2aceb0c866b..00000000000
--- a/modules/trafficrootsBidAdapter.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Overview
-
-Module Name: Trafficroots Bid Adapter
-
-Module Type: Bidder Adapter
-
-Maintainer: cary@trafficroots.com
-
-# Description
-
-Module that connects to Trafficroots demand sources
-
-# Test Parameters
-```javascript
-
-    var adUnits = [
-       {
-           code: 'test-div',
-           sizes: [[300, 250],[300,600]],  // a display size
-           bids: [
-               {
-                    bidder: 'trafficroots',
-                    params: {
-                        zoneId: 'aa0444af31',
-                        deliveryUrl: location.protocol + '//service.trafficroots.com/prebid'
-                    }
-               },{
-                    bidder: 'trafficroots',
-                    params: {
-                        zoneId: '8f527a4835',
-                        deliveryUrl: location.protocol + '//service.trafficroots.com/prebid'
-                    }
-               }
-           ]
-       }
-    ];
-```
diff --git a/modules/trendqubeBidAdapter.js b/modules/trendqubeBidAdapter.js
deleted file mode 100644
index d0364b4acec..00000000000
--- a/modules/trendqubeBidAdapter.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import * as utils from '../src/utils.js';
-
-const BIDDER_CODE = 'trendqube';
-const AD_URL = 'https://ads.trendqube.com/?c=o&m=multi';
-
-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.title && bid.native.image && bid.native.impressionTrackers);
-    default:
-      return false;
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-
-  isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && !isNaN(parseInt(bid.params.placementId)));
-  },
-
-  buildRequests: (validBidRequests = [], bidderRequest) => {
-    let winTop = window;
-    let location;
-    try {
-      location = new URL(bidderRequest.refererInfo.referer)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      utils.logMessage(e);
-    };
-    let placements = [];
-    let 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++) {
-      let bid = validBidRequests[i];
-      let sizes
-      if (bid.mediaTypes) {
-        if (bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
-          sizes = bid.mediaTypes[BANNER].sizes
-        } else if (bid.mediaTypes[VIDEO] && bid.mediaTypes[VIDEO].playerSize) {
-          sizes = bid.mediaTypes[VIDEO].playerSize
-        }
-      }
-      placements.push({
-        placementId: bid.params.placementId,
-        bidId: bid.bidId,
-        sizes: sizes || [],
-        wPlayer: sizes ? sizes[0] : 0,
-        hPlayer: sizes ? sizes[1] : 0,
-        traffic: bid.params.traffic || BANNER,
-        schain: bid.schain || {}
-      });
-    }
-    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)) {
-        response.push(resItem);
-      }
-    }
-    return response;
-  },
-};
-
-registerBidder(spec);
diff --git a/modules/trendqubeBidAdapter.md b/modules/trendqubeBidAdapter.md
deleted file mode 100644
index 8b72c225575..00000000000
--- a/modules/trendqubeBidAdapter.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Overview
-
-```
-Module Name: trendqube Bidder Adapter
-Module Type: trendqube Bidder Adapter
-```
-
-# Description
-
-Module that connects to trendqube demand sources
-
-# Test Parameters
-```
-    var adUnits = [
-                // Will return static test banner
-                {
-                    code: 'placementId_0',
-                    mediaTypes: {
-                        banner: {
-                            sizes: [[300, 250]],
-                        }
-                    },
-                    bids: [
-                        {
-                            bidder: 'trendqube',
-                            params: {
-                                placementId: 0,
-                                traffic: 'banner'
-                            }
-                        }
-                    ]
-                },
-                // Will return test vast xml. All video params are stored under placement in publishers UI
-                {
-                    code: 'placementId_0',
-                    mediaTypes: {
-                        video: {
-                            playerSize: [640, 480],
-                            context: 'instream'
-                        }
-                    },
-                    bids: [
-                        {
-                            bidder: 'trendqube',
-                            params: {
-                                placementId: 0,
-                                traffic: 'video'
-                            }
-                        }
-                    ]
-                }
-            ];
-```
diff --git a/modules/tribeosBidAdapter.js b/modules/tribeosBidAdapter.js
deleted file mode 100644
index 80361aa3fdb..00000000000
--- a/modules/tribeosBidAdapter.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as bidfactory from '../src/bidfactory.js';
-import {BANNER} from '../src/mediaTypes.js';
-var CONSTANTS = require('../src/constants.json');
-
-const BIDDER_CODE = 'tribeos';
-const ENDPOINT_URL = 'https://bidder.tribeos.tech/prebid/';
-const LOG_PREFIX = 'TRIBEOS: ';
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-
-  /**
-  * Determines whether or not the given bid request is valid.
-  *
-  * @param {BidRequest}
-  *            bid The bid params to validate.
-  * @return boolean True if this is a valid bid, and false otherwise.
-  */
-  isBidRequestValid: function(bid) {
-    if (utils.isEmpty(bid.params.placementId)) {
-      utils.logError(LOG_PREFIX, 'placementId is required, please contact tribeOS for placementId. Bid details: ', JSON.stringify(bid));
-      return false;
-    }
-    return true;
-  },
-  /**
-  * Make a server request from the list of BidRequests.
-  *
-  * @param {validBidRequests[]} -
-  *            an array of bids
-  * @return ServerRequest Info describing the request to the server.
-  */
-  buildRequests: function(validBidRequests) {
-    var requests = [];
-    for (var i = 0; i < validBidRequests.length; i++) {
-      requests.push(this.buidRTBRequest(validBidRequests[i]));
-    }
-    return requests;
-  },
-  buidRTBRequest: function(bidReq) {
-    // build bid request object
-
-    var placementId = bidReq.params.placementId;
-    var bidFloor = bidReq.params.bidfloor;
-    var placementCode = bidReq.params.placementCode;
-
-    var adWidth = bidReq.mediaTypes.banner.sizes[0][0];
-    var adHeight = bidReq.mediaTypes.banner.sizes[0][1];
-
-    // build bid request with impressions
-    var bidRequest = {
-      id: utils.getUniqueIdentifierStr(),
-      imp: [{
-        id: bidReq.bidId,
-        banner: {
-          w: adWidth,
-          h: adHeight
-        },
-        tagid: placementCode,
-        bidfloor: bidFloor
-      }],
-      site: {
-        domain: window.location.host,
-        page: window.location.href,
-        publisher: {
-          id: placementId
-        }
-      },
-      device: {
-        'language': (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage),
-        'w': adWidth,
-        'h': adHeight,
-        'js': 1,
-        'ua': navigator.userAgent
-      }
-    };
-
-    // apply gdpr
-    if (bidReq.gdprConsent) {
-      bidRequest.regs = {ext: {gdpr: bidReq.gdprConsent.gdprApplies ? 1 : 0}};
-      bidRequest.user = {ext: {consent: bidReq.gdprConsent.consentString}};
-    }
-
-    bidRequest.bidId = bidReq.bidId;
-    var url = ENDPOINT_URL + placementId + '/requests';
-    if (!utils.isEmpty(bidReq.params.endpointUrl)) {
-      url = bidReq.params.endpointUrl + placementId + '/requests';
-    }
-
-    return {
-      method: 'POST',
-      url: url,
-      data: JSON.stringify(bidRequest),
-      options: { withCredentials: true, contentType: 'application/json' },
-    };
-  },
-  /**
-  * Unpack the response from the server into a list of bids.
-  *
-  * @param {ServerResponse}
-  *            serverResponse A successful response from the server.
-  * @return {Bid[]} An array of bids which were nested inside the server.
-  */
-  interpretResponse: function(serverResponse, bidRequest) {
-    const responseBody = serverResponse.body;
-
-    utils.logInfo(LOG_PREFIX, 'response body: ', JSON.stringify(serverResponse));
-
-    if ((!responseBody || !responseBody.id)) {
-      return [];
-    }
-    const bidResponses = [];
-    responseBody.seatbid[0].bid.forEach(function(bidderBid) {
-      var responsePrice;
-      var placementCode = '';
-      if (bidRequest) {
-        var bidResponse = bidfactory.createBid(1);
-        placementCode = bidRequest.placementCode;
-        bidRequest.status = CONSTANTS.STATUS.GOOD;
-        responsePrice = parseFloat(bidderBid.price);
-        if (responsePrice === 0) {
-          var bid = bidfactory.createBid(2);
-          bid.bidderCode = BIDDER_CODE;
-          bidResponses.push(bid);
-
-          utils.logInfo(LOG_PREFIX, 'response price is zero. Response data: ', JSON.stringify(bidRequest));
-
-          return bidResponses;
-        }
-        bidResponse.placementCode = placementCode;
-        bidResponse.size = bidRequest.sizes;
-        bidResponse.creativeId = bidderBid.crid;
-        bidResponse.bidderCode = BIDDER_CODE;
-        bidResponse.cpm = responsePrice;
-        bidResponse.ad = bidderBid.adm;
-        bidResponse.width = parseInt(bidderBid.w);
-        bidResponse.height = parseInt(bidderBid.h);
-        bidResponse.currency = responseBody.cur;
-        bidResponse.netRevenue = true;
-        bidResponse.requestId = bidderBid.impid;
-        bidResponse.ttl = 180;
-
-        utils.logInfo(LOG_PREFIX, 'bid response data: ', JSON.stringify(bidResponse));
-        utils.logInfo(LOG_PREFIX, 'bid request data: ', JSON.stringify(bidRequest));
-
-        bidResponses.push(bidResponse);
-      }
-    });
-    return bidResponses;
-  },
-  /**
-  * Register bidder specific code, which will execute if a bid from this
-  * bidder won the auction
-  *
-  * @param {Bid}
-  *            The bid that won the auction
-  */
-//  onBidWon: function(bid) {
-//    ajax(this.nurls[bid.requestId], null);
-//  }
-
-}
-registerBidder(spec);
diff --git a/modules/tribeosBidAdapter.md b/modules/tribeosBidAdapter.md
deleted file mode 100644
index 670810abec9..00000000000
--- a/modules/tribeosBidAdapter.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Overview
-
-```
-Module Name: tribeOS Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: dev@tribeos.io
-```
-
-# Description
-
-tribeOS adapter
-
-# Test Parameters
-```
-	var adUnits = [{
-	    code: 'test-tribeos',
-	    mediaTypes: {
-	        banner: {
-	            sizes: [
-	                [300, 250]
-	            ],
-	        }
-	    },
-	    bids: [{
-	        bidder: "tribeos",
-	        params: {
-	            placementId: '12345' // REQUIRED
-	        }
-	    }]
-	}];
-```
diff --git a/modules/trionBidAdapter.js b/modules/trionBidAdapter.js
index 37d54e60cd2..b6375243a5a 100644
--- a/modules/trionBidAdapter.js
+++ b/modules/trionBidAdapter.js
@@ -1,13 +1,12 @@
-import * as utils from '../src/utils.js';
+import { getBidIdParameter, parseSizesInput, tryAppendQueryString } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 
-const storage = getStorageManager();
-
 const BID_REQUEST_BASE_URL = 'https://in-appadvertising.com/api/bidRequest';
 const USER_SYNC_URL = 'https://in-appadvertising.com/api/userSync.html';
 const BIDDER_CODE = 'trion';
 const BASE_KEY = '_trion_';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
@@ -53,6 +52,9 @@ export const spec = {
         bid.creativeId = result.creativeId;
         bid.currency = result.currency;
         bid.netRevenue = result.netRevenue;
+        if (result.adomain) {
+          bid.meta = {advertiserDomains: result.adomain};
+        }
         bidResponses.push(bid);
       }
     }
@@ -109,11 +111,11 @@ function getPublisherUrl() {
 }
 
 function buildTrionUrlParams(bid, bidderRequest) {
-  var pubId = utils.getBidIdParameter('pubId', bid.params);
-  var sectionId = utils.getBidIdParameter('sectionId', bid.params);
+  var pubId = getBidIdParameter('pubId', bid.params);
+  var sectionId = getBidIdParameter('sectionId', bid.params);
   var url = getPublisherUrl();
   var bidSizes = getBidSizesFromBidRequest(bid);
-  var sizes = utils.parseSizesInput(bidSizes).join(',');
+  var sizes = parseSizesInput(bidSizes).join(',');
   var isAutomated = (navigator && navigator.webdriver) ? '1' : '0';
   var isHidden = (document.hidden) ? '1' : '0';
   var visibilityState = encodeURIComponent(document.visibilityState);
@@ -123,15 +125,15 @@ function buildTrionUrlParams(bid, bidderRequest) {
     intT = getStorageData(BASE_KEY + 'int_t');
   }
   if (intT) {
-    setStorageData(BASE_KEY + 'int_t', intT)
+    setStorageData(BASE_KEY + 'int_t', intT);
   }
   setStorageData(BASE_KEY + 'lps', pubId + ':' + sectionId);
   var trionUrl = '';
 
-  trionUrl = utils.tryAppendQueryString(trionUrl, 'bidId', bid.bidId);
-  trionUrl = utils.tryAppendQueryString(trionUrl, 'pubId', pubId);
-  trionUrl = utils.tryAppendQueryString(trionUrl, 'sectionId', sectionId);
-  trionUrl = utils.tryAppendQueryString(trionUrl, 'vers', '$prebid.version$');
+  trionUrl = tryAppendQueryString(trionUrl, 'bidId', bid.bidId);
+  trionUrl = tryAppendQueryString(trionUrl, 'pubId', pubId);
+  trionUrl = tryAppendQueryString(trionUrl, 'sectionId', sectionId);
+  trionUrl = tryAppendQueryString(trionUrl, 'vers', '$prebid.version$');
   if (url) {
     trionUrl += 'url=' + url + '&';
   }
@@ -139,22 +141,22 @@ function buildTrionUrlParams(bid, bidderRequest) {
     trionUrl += 'sizes=' + sizes + '&';
   }
   if (intT) {
-    trionUrl = utils.tryAppendQueryString(trionUrl, 'int_t', encodeURIComponent(intT));
+    trionUrl = tryAppendQueryString(trionUrl, 'int_t', encodeURIComponent(intT));
   }
-  trionUrl = utils.tryAppendQueryString(trionUrl, 'tr_wd', isAutomated);
-  trionUrl = utils.tryAppendQueryString(trionUrl, 'tr_hd', isHidden);
-  trionUrl = utils.tryAppendQueryString(trionUrl, 'tr_vs', visibilityState);
+  trionUrl = tryAppendQueryString(trionUrl, 'tr_wd', isAutomated);
+  trionUrl = tryAppendQueryString(trionUrl, 'tr_hd', isHidden);
+  trionUrl = tryAppendQueryString(trionUrl, 'tr_vs', visibilityState);
   if (bidderRequest && bidderRequest.gdprConsent) {
     var gdpr = bidderRequest.gdprConsent;
     if (gdpr) {
       if (gdpr.consentString) {
-        trionUrl = utils.tryAppendQueryString(trionUrl, 'gdprc', encodeURIComponent(gdpr.consentString));
+        trionUrl = tryAppendQueryString(trionUrl, 'gdprc', encodeURIComponent(gdpr.consentString));
       }
-      trionUrl = utils.tryAppendQueryString(trionUrl, 'gdpr', (gdpr.gdprApplies ? 1 : 0));
+      trionUrl = tryAppendQueryString(trionUrl, 'gdpr', (gdpr.gdprApplies ? 1 : 0));
     }
   }
   if (bidderRequest && bidderRequest.uspConsent) {
-    trionUrl = utils.tryAppendQueryString(trionUrl, 'usp', encodeURIComponent(bidderRequest.uspConsent));
+    trionUrl = tryAppendQueryString(trionUrl, 'usp', encodeURIComponent(bidderRequest.uspConsent));
   }
   // remove the trailing "&"
   if (trionUrl.lastIndexOf('&') === trionUrl.length - 1) {
diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index af904aedc11..7f6ec90c7b9 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -1,60 +1,65 @@
-import { BANNER } from '../src/mediaTypes.js';
+import { tryAppendQueryString, logMessage, logError, isEmpty, isStr, isPlainObject, isArray, logWarn } from '../src/utils.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
 import { config } from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
 
+const GVLID = 28;
 const BIDDER_CODE = 'triplelift';
 const STR_ENDPOINT = 'https://tlx.3lift.com/header/auction?';
+const BANNER_TIME_TO_LIVE = 300;
+const VIDEO_TIME_TO_LIVE = 3600;
 let gdprApplies = true;
 let consentString = null;
+export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 
 export const tripleliftAdapterSpec = {
-
+  gvlid: GVLID,
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-  isBidRequestValid: function(bid) {
-    return (typeof bid.params.inventoryCode !== 'undefined');
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid: function (bid) {
+    return typeof bid.params.inventoryCode !== 'undefined';
   },
 
   buildRequests: function(bidRequests, bidderRequest) {
     let tlCall = STR_ENDPOINT;
-    let data = _buildPostBody(bidRequests);
+    let data = _buildPostBody(bidRequests, bidderRequest);
 
-    tlCall = utils.tryAppendQueryString(tlCall, 'lib', 'prebid');
-    tlCall = utils.tryAppendQueryString(tlCall, 'v', '$prebid.version$');
+    tlCall = tryAppendQueryString(tlCall, 'lib', 'prebid');
+    tlCall = tryAppendQueryString(tlCall, 'v', '$prebid.version$');
 
     if (bidderRequest && bidderRequest.refererInfo) {
-      let referrer = bidderRequest.refererInfo.referer;
-      tlCall = utils.tryAppendQueryString(tlCall, 'referrer', referrer);
+      let referrer = bidderRequest.refererInfo.page;
+      tlCall = tryAppendQueryString(tlCall, 'referrer', referrer);
     }
 
     if (bidderRequest && bidderRequest.timeout) {
-      tlCall = utils.tryAppendQueryString(tlCall, 'tmax', bidderRequest.timeout);
+      tlCall = tryAppendQueryString(tlCall, 'tmax', bidderRequest.timeout);
     }
 
     if (bidderRequest && bidderRequest.gdprConsent) {
       if (typeof bidderRequest.gdprConsent.gdprApplies !== 'undefined') {
         gdprApplies = bidderRequest.gdprConsent.gdprApplies;
-        tlCall = utils.tryAppendQueryString(tlCall, 'gdpr', gdprApplies.toString());
+        tlCall = tryAppendQueryString(tlCall, 'gdpr', gdprApplies.toString());
       }
       if (typeof bidderRequest.gdprConsent.consentString !== 'undefined') {
         consentString = bidderRequest.gdprConsent.consentString;
-        tlCall = utils.tryAppendQueryString(tlCall, 'cmp_cs', consentString);
+        tlCall = tryAppendQueryString(tlCall, 'cmp_cs', consentString);
       }
     }
 
     if (bidderRequest && bidderRequest.uspConsent) {
-      tlCall = utils.tryAppendQueryString(tlCall, 'us_privacy', bidderRequest.uspConsent);
+      tlCall = tryAppendQueryString(tlCall, 'us_privacy', bidderRequest.uspConsent);
     }
 
     if (config.getConfig('coppa') === true) {
-      tlCall = utils.tryAppendQueryString(tlCall, 'coppa', true);
+      tlCall = tryAppendQueryString(tlCall, 'coppa', true);
     }
 
     if (tlCall.lastIndexOf('&') === tlCall.length - 1) {
       tlCall = tlCall.substring(0, tlCall.length - 1);
     }
-    utils.logMessage('tlCall request built: ' + tlCall);
+    logMessage('tlCall request built: ' + tlCall);
 
     return {
       method: 'POST',
@@ -78,17 +83,17 @@ export const tripleliftAdapterSpec = {
     let syncEndpoint = 'https://eb2.3lift.com/sync?';
 
     if (syncType === 'image') {
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'px', 1);
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'src', 'prebid');
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'px', 1);
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'src', 'prebid');
     }
 
     if (consentString !== null) {
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'gdpr', gdprApplies);
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'cmp_cs', consentString);
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'gdpr', gdprApplies);
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'cmp_cs', consentString);
     }
 
     if (usPrivacy) {
-      syncEndpoint = utils.tryAppendQueryString(syncEndpoint, 'us_privacy', usPrivacy);
+      syncEndpoint = tryAppendQueryString(syncEndpoint, 'us_privacy', usPrivacy);
     }
 
     return [{
@@ -96,7 +101,7 @@ export const tripleliftAdapterSpec = {
       url: syncEndpoint
     }];
   }
-}
+};
 
 function _getSyncType(syncOptions) {
   if (!syncOptions) return;
@@ -104,24 +109,38 @@ function _getSyncType(syncOptions) {
   if (syncOptions.pixelEnabled) return 'image';
 }
 
-function _buildPostBody(bidRequests) {
+function _buildPostBody(bidRequests, bidderRequest) {
   let data = {};
   let { schain } = bidRequests[0];
-  data.imp = bidRequests.map(function(bid, index) {
-    return {
+  const globalFpd = _getGlobalFpd(bidderRequest);
+
+  data.imp = bidRequests.map(function(bidRequest, index) {
+    let imp = {
       id: index,
-      tagid: bid.params.inventoryCode,
-      floor: _getFloor(bid),
-      banner: {
-        format: _sizes(bid.sizes)
-      }
+      tagid: bidRequest.params.inventoryCode,
+      floor: _getFloor(bidRequest)
     };
+    // Check for video bidrequest
+    if (_isVideoBidRequest(bidRequest)) {
+      imp.video = _getORTBVideo(bidRequest);
+    }
+    // append banner if applicable and request is not for instream
+    if (bidRequest.mediaTypes.banner && !_isInstream(bidRequest)) {
+      imp.banner = { format: _sizes(bidRequest.sizes) };
+    }
+
+    if (!isEmpty(bidRequest.ortb2Imp)) {
+      imp.fpd = _getAdUnitFpd(bidRequest.ortb2Imp);
+    }
+    return imp;
   });
 
   let eids = [
-    ...getUnifiedIdEids(bidRequests),
-    ...getIdentityLinkEids(bidRequests),
-    ...getCriteoEids(bidRequests)
+    ...getUnifiedIdEids([bidRequests[0]]),
+    ...getIdentityLinkEids([bidRequests[0]]),
+    ...getCriteoEids([bidRequests[0]]),
+    ...getPubCommonEids([bidRequests[0]]),
+    ...getUniversalEids(bidRequests[0])
   ];
 
   if (eids.length > 0) {
@@ -130,58 +149,221 @@ function _buildPostBody(bidRequests) {
     };
   }
 
-  if (schain) {
-    data.ext = {
-      schain
-    }
+  let ext = _getExt(schain, globalFpd);
+
+  if (!isEmpty(ext)) {
+    data.ext = ext;
   }
   return data;
 }
 
+function _isVideoBidRequest(bidRequest) {
+  return _isValidVideoObject(bidRequest) && (_isInstream(bidRequest) || _isOutstream(bidRequest));
+}
+
+function _isOutstream(bidRequest) {
+  return _isValidVideoObject(bidRequest) && bidRequest.mediaTypes.video.context.toLowerCase() === 'outstream';
+}
+
+function _isInstream(bidRequest) {
+  return _isValidVideoObject(bidRequest) && bidRequest.mediaTypes.video.context.toLowerCase() === 'instream';
+}
+
+function _isValidVideoObject(bidRequest) {
+  return bidRequest.mediaTypes.video && bidRequest.mediaTypes.video.context;
+}
+
+function _getORTBVideo(bidRequest) {
+  // give precedent to mediaTypes.video
+  let video = { ...bidRequest.params.video, ...bidRequest.mediaTypes.video };
+  try {
+    if (!video.w) video.w = video.playerSize[0][0];
+    if (!video.h) video.h = video.playerSize[0][1];
+  } catch (err) {
+    logWarn('Video size not defined', err);
+  }
+  if (video.context === 'instream') video.placement = 1;
+  if (video.context === 'outstream') {
+    if (!video.placement) {
+      video.placement = 3
+    } else if ([3, 4, 5].indexOf(video.placement) === -1) {
+      logMessage(`video.placement value of ${video.placement} is invalid for outstream context. Setting placement to 3`)
+      video.placement = 3
+    }
+  }
+
+  // clean up oRTB object
+  delete video.playerSize;
+  return video;
+}
+
 function _getFloor (bid) {
   let floor = null;
   if (typeof bid.getFloor === 'function') {
-    const floorInfo = bid.getFloor({
-      currency: 'USD',
-      mediaType: 'banner',
-      size: _sizes(bid.sizes)
-    });
-    if (typeof floorInfo === 'object' &&
-    floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
-      floor = parseFloat(floorInfo.floor);
+    try {
+      const floorInfo = bid.getFloor({
+        currency: 'USD',
+        mediaType: _isVideoBidRequest(bid) ? 'video' : 'banner',
+        size: '*'
+      });
+      if (typeof floorInfo === 'object' &&
+      floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+        floor = parseFloat(floorInfo.floor);
+      }
+    } catch (err) {
+      logError('Triplelift: getFloor threw an error: ', err);
     }
   }
   return floor !== null ? floor : bid.params.floor;
 }
 
-function getUnifiedIdEids(bidRequests) {
-  return getEids(bidRequests, 'tdid', 'adserver.org', 'TDID');
+function _getGlobalFpd(bidderRequest) {
+  const fpd = {};
+  const context = {}
+  const user = {};
+  const ortbData = bidderRequest.ortb2 || {};
+  const opeCloudStorage = _fetchOpeCloud();
+
+  const fpdContext = Object.assign({}, ortbData.site);
+  const fpdUser = Object.assign({}, ortbData.user);
+
+  if (opeCloudStorage) {
+    fpdUser.data = fpdUser.data || []
+    try {
+      fpdUser.data.push({
+        name: 'www.1plusx.com',
+        ext: opeCloudStorage
+      })
+    } catch (err) {
+      logError('Triplelift: error adding 1plusX segments: ', err);
+    }
+  }
+
+  _addEntries(context, fpdContext);
+  _addEntries(user, fpdUser);
+
+  if (!isEmpty(context)) {
+    fpd.context = context;
+  }
+  if (!isEmpty(user)) {
+    fpd.user = user;
+  }
+  return fpd;
+}
+
+function _fetchOpeCloud() {
+  const opeCloud = storage.getDataFromLocalStorage('opecloud_ctx');
+  if (!opeCloud) return null;
+  try {
+    const parsedJson = JSON.parse(opeCloud);
+    return parsedJson
+  } catch (err) {
+    logError('Triplelift: error parsing JSON: ', err);
+    return null
+  }
+}
+
+function _getAdUnitFpd(adUnitFpd) {
+  const fpd = {};
+  const context = {};
+
+  _addEntries(context, adUnitFpd.ext);
+
+  if (!isEmpty(context)) {
+    fpd.context = context;
+  }
+
+  return fpd;
+}
+
+function _addEntries(target, source) {
+  if (!isEmpty(source)) {
+    Object.keys(source).forEach(key => {
+      if (source[key] != null) {
+        target[key] = source[key];
+      }
+    });
+  }
+}
+
+function _getExt(schain, fpd) {
+  let ext = {};
+  if (!isEmpty(schain)) {
+    ext.schain = { ...schain };
+  }
+  if (!isEmpty(fpd)) {
+    ext.fpd = { ...fpd };
+  }
+  return ext;
+}
+
+function getUnifiedIdEids(bidRequest) {
+  return getEids(bidRequest, 'tdid', 'adserver.org', 'TDID');
+}
+
+function getIdentityLinkEids(bidRequest) {
+  return getEids(bidRequest, 'idl_env', 'liveramp.com', 'idl');
 }
 
-function getIdentityLinkEids(bidRequests) {
-  return getEids(bidRequests, 'idl_env', 'liveramp.com', 'idl');
+function getCriteoEids(bidRequest) {
+  return getEids(bidRequest, 'criteoId', 'criteo.com', 'criteoId');
 }
 
-function getCriteoEids(bidRequests) {
-  return getEids(bidRequests, 'criteoId', 'criteo.com', 'criteoId');
+function getPubCommonEids(bidRequest) {
+  return getEids(bidRequest, 'pubcid', 'pubcid.org', 'pubcid');
 }
 
-function getEids(bidRequests, type, source, rtiPartner) {
-  return bidRequests
+function getUniversalEids(bidRequest) {
+  let common = ['adserver.org', 'liveramp.com', 'criteo.com', 'pubcid.org'];
+  let eids = [];
+  if (bidRequest.userIdAsEids) {
+    bidRequest.userIdAsEids.forEach(id => {
+      try {
+        if (common.indexOf(id.source) === -1) {
+          let uids = id.uids.map(uid => ({ id: uid.id, ext: { rtiPartner: id.source } }));
+          eids.push({ source: id.source, uids });
+        }
+      } catch (err) {
+        logWarn(`Triplelift: Error attempting to add ${id} to bid request`, err);
+      }
+    });
+  }
+  return eids;
+}
+
+function getEids(bidRequest, type, source, rtiPartner) {
+  return bidRequest
     .map(getUserId(type)) // bids -> userIds of a certain type
-    .filter((x) => !!x) // filter out null userIds
+    .filter(filterEids(type)) // filter out unqualified userIds
     .map(formatEid(source, rtiPartner)); // userIds -> eid objects
 }
 
+const filterEids = type => (userId, i, arr) => {
+  let isValidUserId =
+    !!userId && // is not null nor empty
+    (isStr(userId)
+      ? !!userId
+      : isPlainObject(userId) && // or, is object
+        !isArray(userId) && // not an array
+        !isEmpty(userId) && // is not empty
+        userId.id && // contains nested id field
+        isStr(userId.id) && // nested id field is a string
+        !!userId.id); // that is not empty
+  if (!isValidUserId && arr[0] !== undefined) {
+    logWarn(`Triplelift: invalid ${type} userId format`);
+  }
+  return isValidUserId;
+};
+
 function getUserId(type) {
-  return (bid) => (bid && bid.userId && bid.userId[type]);
+  return bid => bid && bid.userId && bid.userId[type];
 }
 
 function formatEid(source, rtiPartner) {
-  return (id) => ({
+  return (userId) => ({
     source,
     uids: [{
-      id,
+      id: userId.id ? userId.id : userId,
       ext: { rtiPartner }
     }]
   });
@@ -207,10 +389,11 @@ function _buildResponseObject(bidderRequest, bid) {
   let height = bid.height || 1;
   let dealId = bid.deal_id || '';
   let creativeId = bid.crid || '';
+  let breq = bidderRequest.bids[bid.imp_id];
 
   if (bid.cpm != 0 && bid.ad) {
     bidResponse = {
-      requestId: bidderRequest.bids[bid.imp_id].bidId,
+      requestId: breq.bidId,
       cpm: bid.cpm,
       width: width,
       height: height,
@@ -219,9 +402,36 @@ function _buildResponseObject(bidderRequest, bid) {
       creativeId: creativeId,
       dealId: dealId,
       currency: 'USD',
-      ttl: 300,
+      ttl: BANNER_TIME_TO_LIVE,
       tl_source: bid.tl_source,
+      meta: {}
+    };
+
+    if (_isVideoBidRequest(breq) && bid.media_type === 'video') {
+      bidResponse.vastXml = bid.ad;
+      bidResponse.mediaType = 'video';
+      bidResponse.ttl = VIDEO_TIME_TO_LIVE;
     };
+
+    if (bid.advertiser_name) {
+      bidResponse.meta.advertiserName = bid.advertiser_name;
+    }
+
+    if (bid.adomain && bid.adomain.length) {
+      bidResponse.meta.advertiserDomains = bid.adomain;
+    }
+
+    if (bid.tl_source && bid.tl_source == 'hdx') {
+      if (_isVideoBidRequest(breq) && bid.media_type === 'video') {
+        bidResponse.meta.mediaType = 'video'
+      } else {
+        bidResponse.meta.mediaType = 'banner'
+      }
+    }
+
+    if (bid.tl_source && bid.tl_source == 'tlx') {
+      bidResponse.meta.mediaType = 'native';
+    }
   };
   return bidResponse;
 }
diff --git a/modules/tripleliftBidAdapter.md b/modules/tripleliftBidAdapter.md
index d5f88a2bece..03dcee3b980 100644
--- a/modules/tripleliftBidAdapter.md
+++ b/modules/tripleliftBidAdapter.md
@@ -58,5 +58,25 @@ var adUnits = [{
            floor: 0
         }
     }]
+}, {
+    code: 'instream-div-1',
+    mediaTypes: {
+        video: {
+            playerSize: [640, 480],
+            context: 'instream',
+        }
+    },
+    bids: [
+    {
+        bidder: 'triplelift',
+        params: {
+            inventoryCode: 'instream_test',
+            video: {
+                mimes: ['video/mp4'],
+                w: 640,
+                h: 480,
+          },
+        }
+    }]
 }];
 ```
diff --git a/modules/truereachBidAdapter.js b/modules/truereachBidAdapter.js
new file mode 100755
index 00000000000..e343842543d
--- /dev/null
+++ b/modules/truereachBidAdapter.js
@@ -0,0 +1,149 @@
+import { deepAccess, getUniqueIdentifierStr } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const SUPPORTED_AD_TYPES = [BANNER];
+const BIDDER_CODE = 'truereach';
+const BIDDER_URL = 'https://ads-sg.momagic.com/exchange/openrtb25/';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+
+  isBidRequestValid: function (bidRequest) {
+    return (bidRequest.params.site_id && bidRequest.params.bidfloor &&
+    deepAccess(bidRequest, 'mediaTypes.banner') && (deepAccess(bidRequest, 'mediaTypes.banner.sizes.length') > 0));
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    if (validBidRequests.length === 0) {
+      return [];
+    }
+
+    let queryParams = buildCommonQueryParamsFromBids(validBidRequests, bidderRequest);
+
+    let siteId = deepAccess(validBidRequests[0], 'params.site_id');
+
+    // TODO: should this use auctionId? see #8573
+    let url = BIDDER_URL + siteId + '?hb=1&transactionId=' + validBidRequests[0].transactionId;
+
+    return {
+      method: 'POST',
+      url: url,
+      data: queryParams,
+      options: { withCredentials: true }
+    };
+  },
+
+  interpretResponse: function ({ body: serverResponse }, serverRequest) {
+    const bidResponses = [];
+
+    if ((!serverResponse || !serverResponse.id) ||
+      (!serverResponse.seatbid || serverResponse.seatbid.length === 0 || !serverResponse.seatbid[0].bid || serverResponse.seatbid[0].bid.length === 0)) {
+      return bidResponses;
+    }
+
+    let adUnits = serverResponse.seatbid[0].bid;
+    let bidderBid = adUnits[0];
+
+    let responseCPM = parseFloat(bidderBid.price);
+    if (responseCPM === 0) {
+      return bidResponses;
+    }
+
+    let responseAd = bidderBid.adm;
+
+    if (bidderBid.nurl) {
+      let responseNurl = '<img src="' + bidderBid.nurl + '" height="0px" width="0px">';
+      responseAd += responseNurl;
+    }
+
+    const bidResponse = {
+      requestId: bidderBid.impid,
+      cpm: responseCPM,
+      currency: serverResponse.cur || 'USD',
+      width: parseInt(bidderBid.w),
+      height: parseInt(bidderBid.h),
+      ad: decodeURIComponent(responseAd),
+      ttl: 180,
+      creativeId: bidderBid.crid,
+      netRevenue: false
+    };
+    if (bidderBid.adomain && bidderBid.adomain.length) {
+      bidResponse.meta = {
+        advertiserDomains: bidderBid.adomain,
+      };
+    }
+
+    bidResponses.push(bidResponse);
+
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = []
+
+    var gdprParams = '';
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `?gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: 'https://ads-sg.momagic.com/jsp/usersync.jsp' + gdprParams
+      });
+    }
+    return syncs;
+  }
+
+};
+
+function buildCommonQueryParamsFromBids(validBidRequests, bidderRequest) {
+  let adW = 0;
+  let adH = 0;
+  let adSizes = Array.isArray(validBidRequests[0].params.sizes) ? validBidRequests[0].params.sizes : validBidRequests[0].sizes;
+  let sizeArrayLength = adSizes.length;
+  if (sizeArrayLength === 2 && typeof adSizes[0] === 'number' && typeof adSizes[1] === 'number') {
+    adW = adSizes[0];
+    adH = adSizes[1];
+  } else {
+    adW = adSizes[0][0];
+    adH = adSizes[0][1];
+  }
+
+  let bidFloor = Number(0);
+
+  let domain = window.location.host;
+  let page = window.location.host + window.location.pathname + location.search + location.hash;
+
+  let defaultParams = {
+    id: getUniqueIdentifierStr(),
+    imp: [
+      {
+        id: validBidRequests[0].bidId,
+        banner: {
+          w: adW,
+          h: adH
+        },
+        bidfloor: bidFloor
+      }
+    ],
+    site: {
+      domain: domain,
+      page: page
+    },
+    device: {
+      ua: window.navigator.userAgent
+    },
+    tmax: config.getConfig('bidderTimeout')
+  };
+
+  return defaultParams;
+}
+
+registerBidder(spec);
diff --git a/modules/truereachBidAdapter.md b/modules/truereachBidAdapter.md
new file mode 100644
index 00000000000..8a926565092
--- /dev/null
+++ b/modules/truereachBidAdapter.md
@@ -0,0 +1,44 @@
+# Overview
+
+```
+Module Name: TrueReach Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: mm.github@momagic.com
+```
+
+# Description
+
+Module that connects to TrueReach's demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: 'test-banner',
+        mediaTypes: {
+             banner: {
+                sizes: [[300, 250]]
+             }
+        },
+        bids: [{
+            bidder: 'truereach',
+            params: {
+                site_id: '0142010a-8400-1b01-72cb-a553b9000009',
+                bidfloor: 0.1
+            }
+        }]
+    }];
+```
+
+# Bid Parameters
+
+`mediaTypes -> banner -> sizes` must be `defined`.
+
+Also, the following parameters are `required` to be set-
+
+| Name | Type | Description
+| ---- | ---- | -----------
+| `site_id` | String | TrueReach provided site ID 
+| `bidfloor` | Number | Minimum price (CPM) in USD. Must be greater than 0.
+
+# Additional Details
+[TrueReach Ads](http://doc.truereach.co.in/docs/prebid/js-bidder-adapter.html)
diff --git a/modules/trustpidSystem.js b/modules/trustpidSystem.js
new file mode 100644
index 00000000000..cb61ffcc8b5
--- /dev/null
+++ b/modules/trustpidSystem.js
@@ -0,0 +1,142 @@
+/**
+ * This module adds TrustPid provided by Vodafone Sales and Services Limited to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/trustpidSystem
+ * @requires module:modules/userId
+ */
+import { logInfo } from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'trustpid';
+const LOG_PREFIX = 'Trustpid module'
+let mnoDomain = '';
+
+export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME});
+
+/**
+ * Handle an event for an iframe.
+ * Takes the body.url parameter from event and returns the string domain.
+ * i.e.: "fc.vodafone.de"
+ * @param event
+ */
+function messageHandler(event) {
+  try {
+    if (event && event.data && typeof event.data === 'string') {
+      const msg = JSON.parse(event.data);
+      if (msg.msgType === 'MNOSELECTOR' && msg.body && msg.body.url) {
+        let URL = msg.body.url.split('//');
+        let domainURL = URL[1].split('/');
+        mnoDomain = domainURL[0];
+        logInfo(`${LOG_PREFIX}: Message handler set domain to ${mnoDomain}`);
+      }
+    }
+  } catch (e) {
+    logInfo(`${LOG_PREFIX}: Unsupported message caught. Origin: ${event.origin}, data: ${event.data}.`);
+  }
+}
+
+// Set a listener to handle the iframe response message.
+window.addEventListener('message', messageHandler, false);
+
+/**
+ * Get the "atid" from html5 local storage to make it available to the UserId module.
+ * @param config
+ * @returns {{trustpid: (*|string)}}
+ */
+function getTrustpidFromStorage() {
+  // Get the domain either from localStorage or global
+  let domain = JSON.parse(storage.getDataFromLocalStorage('fcIdConnectDomain')) || mnoDomain;
+  logInfo(`${LOG_PREFIX}: Local storage domain: ${domain}`);
+
+  if (!domain) {
+    logInfo(`${LOG_PREFIX}: Local storage domain not found, returning null`);
+    return {
+      trustpid: null,
+    };
+  }
+
+  let fcIdConnectObject;
+  let fcIdConnectData = JSON.parse(storage.getDataFromLocalStorage('fcIdConnectData'));
+  logInfo(`${LOG_PREFIX}: Local storage fcIdConnectData: ${JSON.stringify(fcIdConnectData)}`);
+
+  if (fcIdConnectData &&
+    fcIdConnectData.connectId &&
+    Array.isArray(fcIdConnectData.connectId.idGraph) &&
+    fcIdConnectData.connectId.idGraph.length > 0) {
+    fcIdConnectObject = fcIdConnectData.connectId.idGraph.find(item => {
+      return item.domain === domain;
+    });
+  }
+  logInfo(`${LOG_PREFIX}: Local storage fcIdConnectObject for domain: ${JSON.stringify(fcIdConnectObject)}`);
+
+  return {
+    trustpid: (fcIdConnectObject && fcIdConnectObject.atid)
+      ? fcIdConnectObject.atid
+      : null,
+  };
+}
+
+/** @type {Submodule} */
+export const trustpidSubmodule = {
+  /**
+   * Used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * Decodes the stored id value for passing to bid requests.
+   * @function
+   * @returns {{trustpid: string} | null}
+   */
+  decode(bidId) {
+    logInfo(`${LOG_PREFIX}: Decoded ID value ${JSON.stringify(bidId)}`);
+    return bidId.trustpid ? bidId : null;
+  },
+  /**
+   * Get the id from helper function and initiate a new user sync.
+   * @param config
+   * @returns {{callback: result}|{id: {trustpid: string}}}
+   */
+  getId: function(config) {
+    const data = getTrustpidFromStorage();
+    if (data.trustpid) {
+      logInfo(`${LOG_PREFIX}: Local storage ID value ${JSON.stringify(data)}`);
+      return {id: {trustpid: data.trustpid}};
+    } else {
+      if (!config) {
+        config = {};
+      }
+      if (!config.params) {
+        config.params = {};
+      }
+      if (typeof config.params.maxDelayTime === 'undefined' || config.params.maxDelayTime === null) {
+        config.params.maxDelayTime = 1000;
+      }
+      // Current delay and delay step in milliseconds
+      let currentDelay = 0;
+      const delayStep = 50;
+      const result = (callback) => {
+        const data = getTrustpidFromStorage();
+        if (!data.trustpid) {
+          if (currentDelay > config.params.maxDelayTime) {
+            logInfo(`${LOG_PREFIX}: No trustpid value set after ${config.params.maxDelayTime} max allowed delay time`);
+            callback(null);
+          } else {
+            currentDelay += delayStep;
+            setTimeout(() => {
+              result(callback);
+            }, delayStep);
+          }
+        } else {
+          const dataToReturn = { trustpid: data.trustpid };
+          logInfo(`${LOG_PREFIX}: Returning ID value data of ${JSON.stringify(dataToReturn)}`);
+          callback(dataToReturn);
+        }
+      };
+      return { callback: result };
+    }
+  },
+};
+
+submodule('userId', trustpidSubmodule);
diff --git a/modules/trustpidSystem.md b/modules/trustpidSystem.md
new file mode 100644
index 00000000000..38daf9fa3ac
--- /dev/null
+++ b/modules/trustpidSystem.md
@@ -0,0 +1,22 @@
+## trustpid User Id Submodule
+
+trustpid User Id Module.
+
+First, make sure to add the trustpid submodule to your Prebid.js package with:
+
+```
+gulp build --modules=userId,adfBidAdapter,ixBidAdapter,prebidServerBidAdapter,trustpidSystem
+```
+
+## Parameter Descriptions
+
+| Params under userSync.userIds[] | Type             | Description                                                                                                  | Example                          |
+| ------------------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------ | -------------------------------- |
+| name                            | String           | The name of the module                                                                                       | `"trustpid"`                     |
+| params                          | Object           | Object with configuration parameters for trustpid User Id submodule                                          | -                                |
+| params.maxDelayTime             | Integer          | Max amount of time (in seconds) before looking into storage for data                                         | 2500                             |
+| bidders                         | Array of Strings | An array of bidder codes to which this user ID may be sent. Currently required and supporting AdformOpenRTB  | [`"adf"`, `"adformPBS"`, `"ix"`] |
+| storage                         | Object           | Local storage configuration object                                                                           | -                                |
+| storage.type                    | String           | Type of the storage that would be used to store user ID. Must be `"html5"` to utilise HTML5 local storage.   | `"html5"`                        |
+| storage.name                    | String           | The name of the key in local storage where the user ID will be stored.                                       | `"trustpid"`                     |
+| storage.expires                 | Integer          | How long (in days) the user ID information will be stored. For safety reasons, this information is required. | `1`                              |
diff --git a/modules/trustxBidAdapter.js b/modules/trustxBidAdapter.js
deleted file mode 100644
index f412fa21a05..00000000000
--- a/modules/trustxBidAdapter.js
+++ /dev/null
@@ -1,288 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'trustx';
-const ENDPOINT_URL = 'https://sofia.trustx.org/hb';
-const TIME_TO_LIVE = 360;
-const ADAPTER_SYNC_URL = 'https://sofia.trustx.org/push_sync';
-const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
-
-const LOG_ERROR_MESS = {
-  noAuid: 'Bid from response has no auid parameter - ',
-  noAdm: 'Bid from response has no adm parameter - ',
-  noBid: 'Array of bid objects is empty',
-  noPlacementCode: 'Can\'t find in requested bids the bid with auid - ',
-  emptyUids: 'Uids should be not empty',
-  emptySeatbid: 'Seatbid array from response has empty item',
-  emptyResponse: 'Response is empty',
-  hasEmptySeatbidArray: 'Response has empty seatbid array',
-  hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - '
-};
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [ BANNER, VIDEO ],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    return !!bid.params.uid;
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests - an array of bids
-   * @param {bidderRequest} - bidder request object
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(validBidRequests, bidderRequest) {
-    const auids = [];
-    const bidsMap = {};
-    const slotsMapByUid = {};
-    const sizeMap = {};
-    const bids = validBidRequests || [];
-    let priceType = 'net';
-    let pageKeywords;
-    let reqId;
-
-    bids.forEach(bid => {
-      if (bid.params.priceType === 'gross') {
-        priceType = 'gross';
-      }
-      reqId = bid.bidderRequestId;
-      const {params: {uid}, adUnitCode} = bid;
-      auids.push(uid);
-      const sizesId = utils.parseSizesInput(bid.sizes);
-
-      if (!pageKeywords && !utils.isEmpty(bid.params.keywords)) {
-        const keywords = utils.transformBidderParamKeywords(bid.params.keywords);
-
-        if (keywords.length > 0) {
-          keywords.forEach(deleteValues);
-        }
-        pageKeywords = keywords;
-      }
-
-      if (!slotsMapByUid[uid]) {
-        slotsMapByUid[uid] = {};
-      }
-      const slotsMap = slotsMapByUid[uid];
-      if (!slotsMap[adUnitCode]) {
-        slotsMap[adUnitCode] = {adUnitCode, bids: [bid], parents: []};
-      } else {
-        slotsMap[adUnitCode].bids.push(bid);
-      }
-      const slot = slotsMap[adUnitCode];
-
-      sizesId.forEach((sizeId) => {
-        sizeMap[sizeId] = true;
-        if (!bidsMap[uid]) {
-          bidsMap[uid] = {};
-        }
-
-        if (!bidsMap[uid][sizeId]) {
-          bidsMap[uid][sizeId] = [slot];
-        } else {
-          bidsMap[uid][sizeId].push(slot);
-        }
-        slot.parents.push({parent: bidsMap[uid], key: sizeId, uid});
-      });
-    });
-
-    const payload = {
-      pt: priceType,
-      auids: auids.join(','),
-      sizes: utils.getKeys(sizeMap).join(','),
-      r: reqId,
-      wrapperType: 'Prebid_js',
-      wrapperVersion: '$prebid.version$'
-    };
-
-    if (pageKeywords) {
-      payload.keywords = JSON.stringify(pageKeywords);
-    }
-
-    if (bidderRequest) {
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        payload.u = bidderRequest.refererInfo.referer;
-      }
-      if (bidderRequest.timeout) {
-        payload.wtimeout = bidderRequest.timeout;
-      }
-      if (bidderRequest.gdprConsent) {
-        if (bidderRequest.gdprConsent.consentString) {
-          payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
-        }
-        payload.gdpr_applies =
-          (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
-            ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
-      }
-      if (bidderRequest.uspConsent) {
-        payload.us_privacy = bidderRequest.uspConsent;
-      }
-    }
-
-    return {
-      method: 'GET',
-      url: ENDPOINT_URL,
-      data: utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
-      bidsMap: bidsMap,
-    };
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @param {*} bidRequest
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, bidRequest, RendererConst = Renderer) {
-    serverResponse = serverResponse && serverResponse.body;
-    const bidResponses = [];
-    const bidsMap = bidRequest.bidsMap;
-    const priceType = bidRequest.data.pt;
-
-    let errorMessage;
-
-    if (!serverResponse) errorMessage = LOG_ERROR_MESS.emptyResponse;
-    else if (serverResponse.seatbid && !serverResponse.seatbid.length) {
-      errorMessage = LOG_ERROR_MESS.hasEmptySeatbidArray;
-    }
-
-    if (!errorMessage && serverResponse.seatbid) {
-      serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidsMap, priceType, bidResponses, RendererConst);
-      });
-    }
-    if (errorMessage) utils.logError(errorMessage);
-    return bidResponses;
-  },
-  getUserSyncs: function(syncOptions) {
-    if (syncOptions.pixelEnabled) {
-      return [{
-        type: 'image',
-        url: ADAPTER_SYNC_URL
-      }];
-    }
-  }
-}
-
-function isPopulatedArray(arr) {
-  return !!(utils.isArray(arr) && arr.length > 0);
-}
-
-function deleteValues(keyPairObj) {
-  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
-    delete keyPairObj.value;
-  }
-}
-
-function _getBidFromResponse(respItem) {
-  if (!respItem) {
-    utils.logError(LOG_ERROR_MESS.emptySeatbid);
-  } else if (!respItem.bid) {
-    utils.logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
-  } else if (!respItem.bid[0]) {
-    utils.logError(LOG_ERROR_MESS.noBid);
-  }
-  return respItem && respItem.bid && respItem.bid[0];
-}
-
-function _addBidResponse(serverBid, bidsMap, priceType, bidResponses, RendererConst) {
-  if (!serverBid) return;
-  let errorMessage;
-  if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
-  if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
-  else {
-    const awaitingBids = bidsMap[serverBid.auid];
-    if (awaitingBids) {
-      const sizeId = `${serverBid.w}x${serverBid.h}`;
-      if (awaitingBids[sizeId]) {
-        const slot = awaitingBids[sizeId][0];
-
-        const bid = slot.bids.shift();
-        const bidResponse = {
-          requestId: bid.bidId, // bid.bidderRequestId,
-          bidderCode: spec.code,
-          cpm: serverBid.price,
-          width: serverBid.w,
-          height: serverBid.h,
-          creativeId: serverBid.auid, // bid.bidId,
-          currency: 'USD',
-          netRevenue: priceType !== 'gross',
-          ttl: TIME_TO_LIVE,
-          dealId: serverBid.dealid
-        };
-        if (serverBid.content_type === 'video') {
-          bidResponse.vastXml = serverBid.adm;
-          bidResponse.mediaType = VIDEO;
-          bidResponse.adResponse = {
-            content: bidResponse.vastXml
-          };
-          if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
-            bidResponse.renderer = createRenderer(bidResponse, {
-              id: bid.bidId,
-              url: RENDERER_URL
-            }, RendererConst);
-          }
-        } else {
-          bidResponse.ad = serverBid.adm;
-          bidResponse.mediaType = BANNER;
-        }
-
-        bidResponses.push(bidResponse);
-
-        if (!slot.bids.length) {
-          slot.parents.forEach(({parent, key, uid}) => {
-            const index = parent[key].indexOf(slot);
-            if (index > -1) {
-              parent[key].splice(index, 1);
-            }
-            if (!parent[key].length) {
-              delete parent[key];
-              if (!utils.getKeys(parent).length) {
-                delete bidsMap[uid];
-              }
-            }
-          });
-        }
-      }
-    } else {
-      errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
-    }
-  }
-  if (errorMessage) {
-    utils.logError(errorMessage);
-  }
-}
-
-function outstreamRender (bid) {
-  bid.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      targetId: bid.adUnitCode,
-      adResponse: bid.adResponse
-    });
-  });
-}
-
-function createRenderer (bid, rendererParams, RendererConst) {
-  const rendererInst = RendererConst.install({
-    id: rendererParams.id,
-    url: rendererParams.url,
-    loaded: false
-  });
-
-  try {
-    rendererInst.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-
-  return rendererInst;
-}
-
-registerBidder(spec);
diff --git a/modules/trustxBidAdapter.md b/modules/trustxBidAdapter.md
deleted file mode 100644
index a72f1ba85aa..00000000000
--- a/modules/trustxBidAdapter.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Overview
-
-Module Name: TrustX Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: paul@trustx.org
-
-# Description
-
-Module that connects to TrustX demand source to fetch bids.
-TrustX Bid Adapter supports Banner and Video (instream and outstream).
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "trustx",
-                       params: {
-                           uid: '44',
-                           priceType: 'gross' // by default is 'net'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[728, 90]],
-               bids: [
-                   {
-                       bidder: "trustx",
-                       params: {
-                           uid: 45,
-                           priceType: 'gross',
-                           keywords: {
-                               brandsafety: ['disaster'],
-                               topic: ['stress', 'fear']
-                           }
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[640, 360]],
-               mediaTypes: { video: {} },
-               bids: [
-                   {
-                       bidder: "trustx",
-                       params: {
-                           uid: 7697
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/ttdBidAdapter.js b/modules/ttdBidAdapter.js
new file mode 100644
index 00000000000..884c43c438a
--- /dev/null
+++ b/modules/ttdBidAdapter.js
@@ -0,0 +1,547 @@
+import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import { createEidsArray } from './userId/eids.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDADAPTERVERSION = 'TTD-PREBID-2022.06.28';
+const BIDDER_CODE = 'ttd';
+const BIDDER_CODE_LONG = 'thetradedesk';
+const BIDDER_ENDPOINT = 'https://direct.adsrvr.org/bid/bidder/';
+const USER_SYNC_ENDPOINT = 'https://match.adsrvr.org';
+
+const MEDIA_TYPE = {
+  BANNER: 1,
+  VIDEO: 2
+};
+
+function getExt(firstPartyData) {
+  const ext = {
+    ver: BIDADAPTERVERSION,
+    pbjs: '$prebid.version$',
+    keywords: firstPartyData.site?.keywords ? firstPartyData.site.keywords.split(',').map(k => k.trim()) : []
+  }
+  return {
+    ttdprebid: ext
+  };
+}
+
+function getRegs(bidderRequest) {
+  let regs = {};
+
+  if (bidderRequest.gdprConsent && typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') {
+    utils.deepSetValue(regs, 'ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
+  }
+  if (bidderRequest.uspConsent) {
+    utils.deepSetValue(regs, 'ext.us_privacy', bidderRequest.uspConsent);
+  }
+  if (config.getConfig('coppa') === true) {
+    regs.coppa = 1;
+  }
+  if (bidderRequest.ortb2?.regs) {
+    utils.mergeDeep(regs, bidderRequest.ortb2.regs);
+  }
+
+  return regs;
+}
+
+function getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (utils.isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
+function getSource(validBidRequests) {
+  let source = {
+    tid: validBidRequests[0].auctionId
+  };
+  if (validBidRequests[0].schain) {
+    utils.deepSetValue(source, 'ext.schain', validBidRequests[0].schain);
+  }
+  return source;
+}
+
+function getDevice() {
+  const language = navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage;
+  let device = {
+    ua: navigator.userAgent,
+    dnt: utils.getDNT() ? 1 : 0,
+    language: language,
+    connectiontype: getConnectionType()
+  };
+
+  return device;
+};
+
+function getConnectionType() {
+  const connection = navigator.connection || navigator.webkitConnection;
+  if (!connection) {
+    return 0;
+  }
+  switch (connection.type) {
+    case 'ethernet':
+      return 1;
+    case 'wifi':
+      return 2;
+    case 'cellular':
+      switch (connection.effectiveType) {
+        case 'slow-2g':
+        case '2g':
+          return 4;
+        case '3g':
+          return 5;
+        case '4g':
+          return 6;
+        default:
+          return 3;
+      }
+    default:
+      return 0;
+  }
+}
+
+function getUser(bidderRequest) {
+  let user = {};
+  if (bidderRequest.gdprConsent) {
+    utils.deepSetValue(user, 'ext.consent', bidderRequest.gdprConsent.consentString);
+  }
+
+  if (utils.isStr(utils.deepAccess(bidderRequest, 'bids.0.userId.tdid'))) {
+    user.buyeruid = bidderRequest.bids[0].userId.tdid;
+  }
+
+  var eids = createEidsArray(utils.deepAccess(bidderRequest, 'bids.0.userId'))
+  if (eids.length) {
+    utils.deepSetValue(user, 'ext.eids', eids);
+  }
+
+  // gather user.data
+  const ortb2UserData = utils.deepAccess(bidderRequest, 'ortb2.user.data');
+  if (ortb2UserData && ortb2UserData.length) {
+    user = utils.mergeDeep(user, {
+      data: [...ortb2UserData]
+    });
+  };
+  return user;
+}
+
+function getSite(bidderRequest, firstPartyData) {
+  var site = utils.mergeDeep({
+    page: utils.deepAccess(bidderRequest, 'refererInfo.page'),
+    ref: utils.deepAccess(bidderRequest, 'refererInfo.ref'),
+    publisher: {
+      id: utils.deepAccess(bidderRequest, 'bids.0.params.publisherId'),
+    },
+  },
+  firstPartyData.site
+  );
+
+  var publisherDomain = bidderRequest.refererInfo.domain;
+  if (publisherDomain) {
+    utils.deepSetValue(site, 'publisher.domain', publisherDomain);
+  }
+  return site;
+}
+
+function getImpression(bidRequest) {
+  let impression = {
+    id: bidRequest.bidId
+  };
+
+  const gpid = utils.deepAccess(bidRequest, 'ortb2Imp.ext.gpid');
+  const tid = utils.deepAccess(bidRequest, 'ortb2Imp.ext.tid');
+  if (gpid || tid) {
+    impression.ext = {}
+    if (gpid) { impression.ext.gpid = gpid }
+    if (tid) { impression.ext.tid = tid }
+  }
+
+  const tagid = gpid || bidRequest.params.placementId;
+  if (tagid) {
+    impression.tagid = tagid
+  }
+
+  const mediaTypesVideo = utils.deepAccess(bidRequest, 'mediaTypes.video');
+  const mediaTypesBanner = utils.deepAccess(bidRequest, 'mediaTypes.banner');
+
+  let mediaTypes = {};
+  if (mediaTypesBanner) {
+    mediaTypes[BANNER] = banner(bidRequest);
+  }
+  if (mediaTypesVideo) {
+    mediaTypes[VIDEO] = video(bidRequest);
+  }
+
+  Object.assign(impression, mediaTypes);
+
+  let bidfloor = getBidFloor(bidRequest);
+  if (bidfloor) {
+    impression.bidfloor = parseFloat(bidfloor);
+    impression.bidfloorcur = 'USD';
+  }
+
+  return impression;
+}
+
+function getSizes(sizes) {
+  const sizeStructs = utils.parseSizesInput(sizes)
+    .filter(x => x) // sizes that don't conform are returned as null, which we want to ignore
+    .map(x => x.split('x'))
+    .map(size => {
+      return {
+        width: parseInt(size[0]),
+        height: parseInt(size[1]),
+      }
+    });
+
+  return sizeStructs;
+}
+
+function banner(bid) {
+  const sizes = getSizes(bid.mediaTypes.banner.sizes).map(x => {
+    return {
+      w: x.width,
+      h: x.height,
+    }
+  });
+  const pos = parseInt(utils.deepAccess(bid, 'mediaTypes.banner.pos'));
+  const expdir = utils.deepAccess(bid, 'params.banner.expdir');
+  let optionalParams = {};
+  if (pos) {
+    optionalParams.pos = pos;
+  }
+  if (expdir && Array.isArray(expdir)) {
+    optionalParams.expdir = expdir;
+  }
+
+  const banner = Object.assign(
+    {
+      w: sizes[0].w,
+      h: sizes[0].h,
+      format: sizes,
+    },
+    optionalParams);
+
+  const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
+  if (battr) {
+    banner.battr = battr;
+  }
+
+  return banner;
+}
+
+function video(bid) {
+  let minduration = utils.deepAccess(bid, 'mediaTypes.video.minduration');
+  const maxduration = utils.deepAccess(bid, 'mediaTypes.video.maxduration');
+  const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+  const api = utils.deepAccess(bid, 'mediaTypes.video.api');
+  const mimes = utils.deepAccess(bid, 'mediaTypes.video.mimes');
+  const placement = utils.deepAccess(bid, 'mediaTypes.video.placement');
+  const protocols = utils.deepAccess(bid, 'mediaTypes.video.protocols');
+  const playbackmethod = utils.deepAccess(bid, 'mediaTypes.video.playbackmethod');
+  const pos = utils.deepAccess(bid, 'mediaTypes.video.pos');
+  const startdelay = utils.deepAccess(bid, 'mediaTypes.video.startdelay');
+  const skip = utils.deepAccess(bid, 'mediaTypes.video.skip');
+  const skipmin = utils.deepAccess(bid, 'mediaTypes.video.skipmin');
+  const skipafter = utils.deepAccess(bid, 'mediaTypes.video.skipafter');
+  const minbitrate = utils.deepAccess(bid, 'mediaTypes.video.minbitrate');
+  const maxbitrate = utils.deepAccess(bid, 'mediaTypes.video.maxbitrate');
+
+  if (!minduration || !utils.isInteger(minduration)) {
+    minduration = 0;
+  }
+  let video = {
+    minduration: minduration,
+    maxduration: maxduration,
+    api: api,
+    mimes: mimes,
+    placement: placement,
+    protocols: protocols
+  };
+
+  if (typeof playerSize !== 'undefined') {
+    if (utils.isArray(playerSize[0])) {
+      video.w = parseInt(playerSize[0][0]);
+      video.h = parseInt(playerSize[0][1]);
+    } else if (utils.isNumber(playerSize[0])) {
+      video.w = parseInt(playerSize[0]);
+      video.h = parseInt(playerSize[1]);
+    }
+  }
+
+  if (playbackmethod) {
+    video.playbackmethod = playbackmethod;
+  }
+  if (pos) {
+    video.pos = pos;
+  }
+  if (startdelay && utils.isInteger(startdelay)) {
+    video.startdelay = startdelay;
+  }
+  if (skip && (skip === 0 || skip === 1)) {
+    video.skip = skip;
+  }
+  if (skipmin && utils.isInteger(skipmin)) {
+    video.skipmin = skipmin;
+  }
+  if (skipafter && utils.isInteger(skipafter)) {
+    video.skipafter = skipafter;
+  }
+  if (minbitrate && utils.isInteger(minbitrate)) {
+    video.minbitrate = minbitrate;
+  }
+  if (maxbitrate && utils.isInteger(maxbitrate)) {
+    video.maxbitrate = maxbitrate;
+  }
+
+  const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
+  if (battr) {
+    video.battr = battr;
+  }
+
+  return video;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: 21,
+  aliases: [BIDDER_CODE_LONG],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    const alphaRegex = /^[\w+]+$/;
+
+    // required parameters
+    if (!bid || !bid.params) {
+      utils.logWarn(BIDDER_CODE + ': Missing bid parameters');
+      return false;
+    }
+    if (!bid.params.supplySourceId) {
+      utils.logWarn(BIDDER_CODE + ': Missing required parameter params.supplySourceId');
+      return false;
+    }
+    if (!alphaRegex.test(bid.params.supplySourceId)) {
+      utils.logWarn(BIDDER_CODE + ': supplySourceId must only contain alphabetic characters');
+      return false;
+    }
+    if (!bid.params.publisherId) {
+      utils.logWarn(BIDDER_CODE + ': Missing required parameter params.publisherId');
+      return false;
+    }
+    if (bid.params.publisherId.length > 32) {
+      utils.logWarn(BIDDER_CODE + ': params.publisherId must be 32 characters or less');
+      return false;
+    }
+
+    const gpid = utils.deepAccess(bid, 'ortb2Imp.ext.gpid');
+    if (!bid.params.placementId && !gpid) {
+      utils.logWarn(BIDDER_CODE + ': one of params.placementId or gpid (via the GPT module https://docs.prebid.org/dev-docs/modules/gpt-pre-auction.html) must be passed');
+      return false;
+    }
+
+    const mediaTypesBanner = utils.deepAccess(bid, 'mediaTypes.banner');
+    const mediaTypesVideo = utils.deepAccess(bid, 'mediaTypes.video');
+
+    if (!mediaTypesBanner && !mediaTypesVideo) {
+      utils.logWarn(BIDDER_CODE + ': one of mediaTypes.banner or mediaTypes.video must be passed');
+      return false;
+    }
+
+    if (mediaTypesVideo) {
+      if (!mediaTypesVideo.maxduration || !utils.isInteger(mediaTypesVideo.maxduration)) {
+        utils.logWarn(BIDDER_CODE + ': mediaTypes.video.maxduration must be set to the maximum video ad duration in seconds');
+        return false;
+      }
+      if (!mediaTypesVideo.api || mediaTypesVideo.api.length === 0) {
+        utils.logWarn(BIDDER_CODE + ': mediaTypes.video.api should be an array of supported api frameworks. See the Open RTB v2.5 spec for valid values');
+        return false;
+      }
+      if (!mediaTypesVideo.mimes || mediaTypesVideo.mimes.length === 0) {
+        utils.logWarn(BIDDER_CODE + ': mediaTypes.video.mimes should be an array of supported mime types');
+        return false;
+      }
+      if (!mediaTypesVideo.protocols) {
+        utils.logWarn(BIDDER_CODE + ': mediaTypes.video.protocols should be an array of supported protocols. See the Open RTB v2.5 spec for valid values');
+        return false;
+      }
+    }
+
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} an array of validBidRequests
+   * @param {*} bidderRequest
+   * @return {ServerRequest} Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const firstPartyData = bidderRequest.ortb2 || {};
+    let topLevel = {
+      id: bidderRequest.auctionId,
+      imp: validBidRequests.map(bidRequest => getImpression(bidRequest)),
+      site: getSite(bidderRequest, firstPartyData),
+      device: getDevice(),
+      user: getUser(bidderRequest),
+      at: 1,
+      cur: ['USD'],
+      regs: getRegs(bidderRequest),
+      source: getSource(validBidRequests),
+      ext: getExt(firstPartyData)
+    }
+
+    if (firstPartyData && firstPartyData.bcat) {
+      topLevel.bcat = firstPartyData.bcat;
+    }
+
+    if (firstPartyData && firstPartyData.badv) {
+      topLevel.badv = firstPartyData.badv;
+    }
+
+    let url = BIDDER_ENDPOINT + bidderRequest.bids[0].params.supplySourceId;
+
+    let serverRequest = {
+      method: 'POST',
+      url: url,
+      data: topLevel,
+      options: {
+        withCredentials: true
+      }
+    };
+
+    return serverRequest;
+  },
+
+  /**
+   * Format responses as Prebid bid responses
+   *
+   * Each bid can have the following elements:
+   * - requestId (required)
+   * - cpm (required)
+   * - width (required)
+   * - height (required)
+   * - ad (required)
+   * - ttl (required)
+   * - creativeId (required)
+   * - netRevenue (required)
+   * - currency (required)
+   * - vastUrl
+   * - vastImpUrl
+   * - vastXml
+   * - dealId
+   *
+   * @param {ttdResponseObj} bidResponse A successful response from ttd.
+   * @param {ServerRequest} serverRequest The result of buildRequests() that lead to this response.
+   * @return {Bid[]} An array of formatted bids.
+  */
+  interpretResponse: function (response, serverRequest) {
+    let seatBidsInResponse = utils.deepAccess(response, 'body.seatbid');
+    const currency = utils.deepAccess(response, 'body.cur');
+    if (!seatBidsInResponse || seatBidsInResponse.length === 0) {
+      return [];
+    }
+    let bidResponses = [];
+    let requestedImpressions = utils.deepAccess(serverRequest, 'data.imp');
+
+    seatBidsInResponse.forEach(seatBid => {
+      seatBid.bid.forEach(bid => {
+        let matchingRequestedImpression = requestedImpressions.find(imp => imp.id === bid.impid);
+
+        const cpm = bid.price || 0;
+        let bidResponse = {
+          requestId: bid.impid,
+          cpm: cpm,
+          creativeId: bid.crid,
+          dealId: bid.dealid || null,
+          currency: currency || 'USD',
+          netRevenue: true,
+          ttl: bid.ttl || 360,
+          meta: {},
+        };
+
+        if (bid.adomain && bid.adomain.length > 0) {
+          bidResponse.meta.advertiserDomains = bid.adomain;
+        }
+
+        if (bid.ext.mediatype === MEDIA_TYPE.BANNER) {
+          Object.assign(
+            bidResponse,
+            {
+              width: bid.w,
+              height: bid.h,
+              ad: utils.replaceAuctionPrice(bid.adm, cpm),
+              mediaType: BANNER
+            }
+          );
+        } else if (bid.ext.mediatype === MEDIA_TYPE.VIDEO) {
+          Object.assign(
+            bidResponse,
+            {
+              width: matchingRequestedImpression.video.w,
+              height: matchingRequestedImpression.video.h,
+              mediaType: VIDEO
+            }
+          );
+          if (bid.nurl) {
+            bidResponse.vastUrl = utils.replaceAuctionPrice(bid.nurl, cpm);
+          } else {
+            bidResponse.vastXml = utils.replaceAuctionPrice(bid.adm, cpm);
+          }
+        }
+
+        bidResponses.push(bidResponse);
+      });
+    });
+
+    return bidResponses;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @param {gdprConsent} gdprConsent GDPR consent object
+   * @param {uspConsent} uspConsent USP consent object
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '') {
+    const syncs = [];
+
+    let gdprParams = `&gdpr=${gdprConsent.gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(gdprConsent.consentString)}`;
+
+    let url = `${USER_SYNC_ENDPOINT}/track/usersync?us_privacy=${encodeURIComponent(uspConsent)}${gdprParams}`;
+
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: url + '&ust=image'
+      });
+    } else if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: url + '&ust=iframe'
+      });
+    }
+    return syncs;
+  },
+};
+
+registerBidder(spec)
diff --git a/modules/ttdBidAdapter.md b/modules/ttdBidAdapter.md
new file mode 100644
index 00000000000..efdef751149
--- /dev/null
+++ b/modules/ttdBidAdapter.md
@@ -0,0 +1,116 @@
+# Overview
+
+```
+Module Name: The Trade Desk Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid-maintainers@thetradedesk.com
+```
+
+# Description
+
+Module that connects to The Trade Desk's demand sources to fetch bids.
+
+The Trade Desk bid adapter supports Banner and Video.
+
+# Test Parameters
+
+```js
+    var adUnits = [
+            // Banner adUnit with only required parameters
+            {
+                code: 'test-div-minimal',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300, 250]]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'ttd',
+                        params: {
+                            supplySourceId: 'supplier',
+                            publisherId: '1427ab10f2e448057ed3b422'
+                        }
+                    }
+                ]
+            },
+            // Banner adUnit with all optional parameters provided
+            {
+                code: 'test-div-banner-optional-params',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[728, 90]],
+                        pos: 1
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'ttd',
+                        params: {
+                            supplySourceId: 'supplier',
+                            publisherId: '1427ab10f2e448057ed3b422',
+                            placementId: '/1111/home#header',
+                            banner: {
+                                expdir: [1, 3]
+                            },
+                        }
+                    }
+                ]
+            },
+            // Video adUnit with only required parameters
+            {
+                code: 'test-div-video-minimal',
+                mediaTypes: {
+                    video: {
+                        maxduration: 30,
+                        api: [1, 3],
+                        mimes: ['video/mp4'],
+                        placement: 3,
+                        protocols: [2,3,5,6]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'ttd',
+                        params: {
+                            supplySourceId: 'supplier',
+                            publisherId: '1427ab10f2e448057ed3b422'
+                        }
+                    }
+                ]
+            },
+            // Video adUnit with all optional parameters provided
+            {
+                code: 'test-div-video-full',
+                mediaTypes: {
+                    video: {
+                        minduration: 1,
+                        maxduration: 10,
+                        playerSize: [640, 480],
+                        api: [1, 3],
+                        mimes: ['video/mp4'],
+                        placement: 3,
+                        protocols: [2, 3, 5, 6],
+                        startdelay: 1,
+                        playbackmethod: [1],
+                        pos: 1,
+                        minbitrate: 100,
+                        maxbitrate: 500,
+                        skip: 1,
+                        skipmin: 5,
+                        skipafter: 10
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'ttd',
+                        params: {
+                            supplySourceId: 'supplier',
+                            publisherId: '1427ab10f2e448057ed3b422',
+                            placementId: '/1111/home#header'
+                        }
+                    }
+                ]
+            }
+        ];
+```
diff --git a/modules/turktelekomBidAdapter.js b/modules/turktelekomBidAdapter.js
deleted file mode 100644
index 852e557290c..00000000000
--- a/modules/turktelekomBidAdapter.js
+++ /dev/null
@@ -1,261 +0,0 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
-import { VIDEO, BANNER } from '../src/mediaTypes.js';
-
-const BIDDER_CODE = 'turktelekom';
-const ENDPOINT_URL = 'https://ssp.programattik.com/hb';
-const TIME_TO_LIVE = 360;
-const ADAPTER_SYNC_URL = 'https://ssp.programattik.com/sync';
-const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
-
-const LOG_ERROR_MESS = {
-  noAuid: 'Bid from response has no auid parameter - ',
-  noAdm: 'Bid from response has no adm parameter - ',
-  noBid: 'Array of bid objects is empty',
-  noPlacementCode: 'Can\'t find in requested bids the bid with auid - ',
-  emptyUids: 'Uids should be not empty',
-  emptySeatbid: 'Seatbid array from response has empty item',
-  emptyResponse: 'Response is empty',
-  hasEmptySeatbidArray: 'Response has empty seatbid array',
-  hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - '
-};
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [ BANNER, VIDEO ],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    return !!bid.params.uid;
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} validBidRequests - an array of bids
-   * @param {bidderRequest} - bidder request object
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(validBidRequests, bidderRequest) {
-    const auids = [];
-    const bidsMap = {};
-    const slotsMapByUid = {};
-    const sizeMap = {};
-    const bids = validBidRequests || [];
-    let priceType = 'net';
-    let reqId;
-
-    bids.forEach(bid => {
-      if (bid.params.priceType === 'gross') {
-        priceType = 'gross';
-      }
-      reqId = bid.bidderRequestId;
-      const {params: {uid}, adUnitCode} = bid;
-      auids.push(uid);
-      const sizesId = utils.parseSizesInput(bid.sizes);
-
-      if (!slotsMapByUid[uid]) {
-        slotsMapByUid[uid] = {};
-      }
-      const slotsMap = slotsMapByUid[uid];
-      if (!slotsMap[adUnitCode]) {
-        slotsMap[adUnitCode] = {adUnitCode, bids: [bid], parents: []};
-      } else {
-        slotsMap[adUnitCode].bids.push(bid);
-      }
-      const slot = slotsMap[adUnitCode];
-
-      sizesId.forEach((sizeId) => {
-        sizeMap[sizeId] = true;
-        if (!bidsMap[uid]) {
-          bidsMap[uid] = {};
-        }
-
-        if (!bidsMap[uid][sizeId]) {
-          bidsMap[uid][sizeId] = [slot];
-        } else {
-          bidsMap[uid][sizeId].push(slot);
-        }
-        slot.parents.push({parent: bidsMap[uid], key: sizeId, uid});
-      });
-    });
-
-    const payload = {
-      pt: priceType,
-      auids: auids.join(','),
-      sizes: utils.getKeys(sizeMap).join(','),
-      r: reqId,
-      wrapperType: 'Prebid_js',
-      wrapperVersion: '$prebid.version$'
-    };
-
-    if (bidderRequest) {
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        payload.u = bidderRequest.refererInfo.referer;
-      }
-      if (bidderRequest.timeout) {
-        payload.wtimeout = bidderRequest.timeout;
-      }
-      if (bidderRequest.gdprConsent) {
-        if (bidderRequest.gdprConsent.consentString) {
-          payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
-        }
-        payload.gdpr_applies =
-            (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
-              ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
-      }
-    }
-
-    return {
-      method: 'GET',
-      url: ENDPOINT_URL,
-      data: utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
-      bidsMap: bidsMap,
-    };
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @param {*} bidRequest
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, bidRequest, RendererConst = Renderer) {
-    serverResponse = serverResponse && serverResponse.body;
-    const bidResponses = [];
-    const bidsMap = bidRequest.bidsMap;
-    const priceType = bidRequest.data.pt;
-
-    let errorMessage;
-
-    if (!serverResponse) errorMessage = LOG_ERROR_MESS.emptyResponse;
-    else if (serverResponse.seatbid && !serverResponse.seatbid.length) {
-      errorMessage = LOG_ERROR_MESS.hasEmptySeatbidArray;
-    }
-
-    if (!errorMessage && serverResponse.seatbid) {
-      serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidsMap, priceType, bidResponses, RendererConst);
-      });
-    }
-    if (errorMessage) utils.logError(errorMessage);
-    return bidResponses;
-  },
-  getUserSyncs: function(syncOptions) {
-    if (syncOptions.pixelEnabled) {
-      return [{
-        type: 'image',
-        url: ADAPTER_SYNC_URL
-      }];
-    }
-  }
-}
-
-function _getBidFromResponse(respItem) {
-  if (!respItem) {
-    utils.logError(LOG_ERROR_MESS.emptySeatbid);
-  } else if (!respItem.bid) {
-    utils.logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
-  } else if (!respItem.bid[0]) {
-    utils.logError(LOG_ERROR_MESS.noBid);
-  }
-  return respItem && respItem.bid && respItem.bid[0];
-}
-
-function _addBidResponse(serverBid, bidsMap, priceType, bidResponses, RendererConst) {
-  if (!serverBid) return;
-  let errorMessage;
-  if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
-  if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
-  else {
-    const awaitingBids = bidsMap[serverBid.auid];
-    if (awaitingBids) {
-      const sizeId = `${serverBid.w}x${serverBid.h}`;
-      if (awaitingBids[sizeId]) {
-        const slot = awaitingBids[sizeId][0];
-
-        const bid = slot.bids.shift();
-        const bidResponse = {
-          requestId: bid.bidId, // bid.bidderRequestId,
-          bidderCode: spec.code,
-          cpm: serverBid.price,
-          width: serverBid.w,
-          height: serverBid.h,
-          creativeId: serverBid.auid, // bid.bidId,
-          currency: 'TRY',
-          netRevenue: priceType !== 'gross',
-          ttl: TIME_TO_LIVE,
-          dealId: serverBid.dealid
-        };
-        if (serverBid.content_type === 'video') {
-          bidResponse.vastXml = serverBid.adm;
-          bidResponse.mediaType = VIDEO;
-          bidResponse.adResponse = {
-            content: bidResponse.vastXml
-          };
-          if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
-            bidResponse.renderer = createRenderer(bidResponse, {
-              id: bid.bidId,
-              url: RENDERER_URL
-            }, RendererConst);
-          }
-        } else {
-          bidResponse.ad = serverBid.adm;
-          bidResponse.mediaType = BANNER;
-        }
-
-        bidResponses.push(bidResponse);
-
-        if (!slot.bids.length) {
-          slot.parents.forEach(({parent, key, uid}) => {
-            const index = parent[key].indexOf(slot);
-            if (index > -1) {
-              parent[key].splice(index, 1);
-            }
-            if (!parent[key].length) {
-              delete parent[key];
-              if (!utils.getKeys(parent).length) {
-                delete bidsMap[uid];
-              }
-            }
-          });
-        }
-      }
-    } else {
-      errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
-    }
-  }
-  if (errorMessage) {
-    utils.logError(errorMessage);
-  }
-}
-
-function outstreamRender (bid) {
-  bid.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      targetId: bid.adUnitCode,
-      adResponse: bid.adResponse
-    });
-  });
-}
-
-function createRenderer (bid, rendererParams, RendererConst) {
-  const rendererInst = RendererConst.install({
-    id: rendererParams.id,
-    url: rendererParams.url,
-    loaded: false
-  });
-
-  try {
-    rendererInst.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-
-  return rendererInst;
-}
-
-registerBidder(spec);
diff --git a/modules/turktelekomBidAdapter.md b/modules/turktelekomBidAdapter.md
deleted file mode 100644
index 360e7f95230..00000000000
--- a/modules/turktelekomBidAdapter.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Overview
-
-Module Name: Türk Telekom Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: turktelssp@gmail.com
-
-# Description
-
-Module that connects to Türk Telekom demand source to fetch bids.
-Türk Telekom Bid Adapter supports Banner and Video (instream and outstream).
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               mediaTypes: {
-                   banner: {
-                       sizes: [[300, 250], [300,600]]
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "turktelekom",
-                       params: {
-                           uid: 17,
-                           priceType: 'gross' // by default is 'net'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               mediaTypes: {
-                   video: {
-                       playerSize: [[640, 360]],
-                       context: 'instream'
-                   }
-               },
-               bids: [
-                   {
-                       bidder: "turktelekom",
-                       params: {
-                           uid: 19
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/ucfunnelAnalyticsAdapter.js b/modules/ucfunnelAnalyticsAdapter.js
index 7a471a1d3b4..77fffddbaae 100644
--- a/modules/ucfunnelAnalyticsAdapter.js
+++ b/modules/ucfunnelAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {getGlobal} from '../src/prebidGlobal.js';
diff --git a/modules/ucfunnelBidAdapter.js b/modules/ucfunnelBidAdapter.js
index f9982edef36..2225deaa900 100644
--- a/modules/ucfunnelBidAdapter.js
+++ b/modules/ucfunnelBidAdapter.js
@@ -1,19 +1,24 @@
+import { generateUUID, _each, deepAccess } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
-import * as utils from '../src/utils.js';
-const storage = getStorageManager();
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
 const COOKIE_NAME = 'ucf_uid';
 const VER = 'ADGENT_PREBID-2018011501';
 const BIDDER_CODE = 'ucfunnel';
-
+const GVLID = 607;
+const CURRENCY = 'USD';
 const VIDEO_CONTEXT = {
   INSTREAM: 0,
   OUSTREAM: 2
 }
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   ENDPOINT: 'https://hb.aralego.com/header',
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   /**
@@ -42,6 +47,9 @@ export const spec = {
    * @return {ServerRequest}
    */
   buildRequests: function(bids, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bids = convertOrtbRequestToProprietaryNative(bids);
+
     return bids.map(bid => {
       return {
         method: 'GET',
@@ -65,11 +73,12 @@ export const spec = {
     let bid = {
       requestId: bidRequest.bidId,
       cpm: ad.cpm || 0,
-      creativeId: ad.ad_id || bidRequest.params.adid,
+      creativeId: ad.crid || ad.ad_id || bidRequest.params.adid,
       dealId: ad.deal || null,
-      currency: 'USD',
+      currency: ad.currency || 'USD',
       netRevenue: true,
-      ttl: 1800
+      ttl: 1800,
+      meta: {}
     };
 
     if (bidRequest.params && bidRequest.params.bidfloor && ad.cpm && ad.cpm < bidRequest.params.bidfloor) {
@@ -77,6 +86,10 @@ export const spec = {
     }
     if (ad.creative_type) {
       bid.mediaType = ad.creative_type;
+      bid.meta.mediaType = ad.creative_type;
+    }
+    if (ad.adomain) {
+      bid.meta.advertiserDomains = ad.adomain;
     }
 
     switch (ad.creative_type) {
@@ -124,16 +137,19 @@ export const spec = {
     return [bid];
   },
 
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent = {}, uspConsent) {
+    let gdprApplies = (gdprConsent && gdprConsent.gdprApplies) ? '1' : '';
+    let apiVersion = (gdprConsent) ? gdprConsent.apiVersion : '';
+    let consentString = (gdprConsent) ? gdprConsent.consentString : '';
     if (syncOptions.iframeEnabled) {
       return [{
         type: 'iframe',
-        url: 'https://cdn.aralego.net/ucfad/cookie/sync.html'
+        url: 'https://cdn.aralego.net/ucfad/cookie/sync.html' + getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent)
       }];
     } else if (syncOptions.pixelEnabled) {
       return [{
         type: 'image',
-        url: 'https://sync.aralego.com/idSync'
+        url: 'https://sync.aralego.com/idSync' + getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent)
       }];
     }
   }
@@ -146,6 +162,22 @@ function transformSizes(requestSizes) {
   }
 }
 
+function getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent) {
+  let param = '?';
+  if (gdprApplies == '1') {
+    param = param + 'gdpr=1&';
+  }
+  if (apiVersion == 1) {
+    param = param + 'euconsent=' + consentString + '&';
+  } else if (apiVersion == 2) {
+    param = param + 'euconsent-v2=' + consentString + '&';
+  }
+  if (uspConsent) {
+    param = param + 'usprivacy=' + uspConsent;
+  }
+  return (param == '?') ? '' : param;
+}
+
 function parseSizes(bid) {
   let params = bid.params;
   if (bid.mediaType === VIDEO) {
@@ -184,12 +216,42 @@ function getSupplyChain(schain) {
   return supplyChain;
 }
 
+function getMediaType(mediaTypes) {
+  if (mediaTypes != null && mediaTypes.banner) {
+    return 'banner';
+  } else if (mediaTypes != null && mediaTypes.video) {
+    return 'video';
+  } else if (mediaTypes != null && mediaTypes.native) {
+    return 'native'
+  }
+  return 'banner';
+}
+
+function getFloor(bid, size, mediaTypes) {
+  if (bid.params.bidfloor) {
+    return bid.params.bidfloor;
+  }
+  if (typeof bid.getFloor === 'function') {
+    var bidFloor = bid.getFloor({
+      currency: CURRENCY,
+      mediaType: getMediaType(mediaTypes),
+      size: (size) ? [ size[0], size[1] ] : '*',
+    });
+    if (bidFloor.currency === CURRENCY) {
+      return bidFloor.floor;
+    }
+  }
+  return undefined;
+}
+
 function getRequestData(bid, bidderRequest) {
   const size = parseSizes(bid);
   const language = navigator.language;
   const dnt = (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0;
   const userIdTdid = (bid.userId && bid.userId.tdid) ? bid.userId.tdid : '';
   const supplyChain = getSupplyChain(bid.schain);
+  const bidFloor = getFloor(bid, size, bid.mediaTypes);
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid');
   // general bid data
   let bidData = {
     ver: VER,
@@ -199,20 +261,22 @@ function getRequestData(bid, bidderRequest) {
     dnt: dnt,
     adid: bid.params.adid,
     tdid: userIdTdid,
-    schain: supplyChain,
-    fp: bid.params.bidfloor
+    schain: supplyChain
   };
 
-  try {
-    bidData.host = window.top.location.hostname;
-    bidData.u = window.top.location.href;
-    bidData.xr = 0;
-  } catch (e) {
-    bidData.host = window.location.hostname;
-    bidData.u = document.referrer || window.location.href;
-    bidData.xr = 1;
+  if (bidFloor) {
+    bidData.fp = bidFloor;
+  }
+
+  if (gpid) {
+    bidData.gpid = gpid;
   }
 
+  addUserId(bidData, bid.userId);
+
+  bidData.u = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+  bidData.host = bidderRequest.refererInfo.domain;
+
   if (window.location.ancestorOrigins && window.location.ancestorOrigins.length > 0) {
     bidData.ao = window.location.ancestorOrigins[window.location.ancestorOrigins.length - 1];
   }
@@ -223,7 +287,7 @@ function getRequestData(bid, bidderRequest) {
       ucfUid = storage.getCookie(COOKIE_NAME);
       bidData.ucfUid = ucfUid;
     } else {
-      ucfUid = utils.generateUUID();
+      ucfUid = generateUUID();
       bidData.ucfUid = ucfUid;
       storage.setCookie(COOKIE_NAME, ucfUid);
     }
@@ -255,9 +319,61 @@ function getRequestData(bid, bidderRequest) {
   if (bidderRequest && bidderRequest.gdprConsent) {
     Object.assign(bidData, {
       gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
-      euconsent: bidderRequest.gdprConsent.consentString
+      'euconsent-v2': bidderRequest.gdprConsent.consentString
     });
   }
 
+  if (config.getConfig('coppa')) {
+    bidData.coppa = true;
+  }
+
+  return bidData;
+}
+
+function addUserId(bidData, userId) {
+  bidData['eids'] = '';
+  _each(userId, (userIdObjectOrValue, userIdProviderKey) => {
+    switch (userIdProviderKey) {
+      case 'hadronId':
+        if (userIdObjectOrValue.hadronId) {
+          bidData[userIdProviderKey + 'hadronId'] = userIdObjectOrValue.hadronId;
+        }
+        if (userIdObjectOrValue.auSeg) {
+          bidData[userIdProviderKey + '_auSeg'] = userIdObjectOrValue.auSeg;
+        }
+        break;
+      case 'parrableId':
+        if (userIdObjectOrValue.eid) {
+          bidData[userIdProviderKey + '_eid'] = userIdObjectOrValue.eid;
+        }
+        break;
+      case 'id5id':
+        if (userIdObjectOrValue.uid) {
+          bidData[userIdProviderKey + '_uid'] = userIdObjectOrValue.uid;
+        }
+        if (userIdObjectOrValue.ext && userIdObjectOrValue.ext.linkType) {
+          bidData[userIdProviderKey + '_linkType'] = userIdObjectOrValue.ext.linkType;
+        }
+        break;
+      case 'uid2':
+        if (userIdObjectOrValue.id) {
+          bidData['eids'] = (bidData['eids'].length > 0)
+            ? (bidData['eids'] + '!' + userIdProviderKey + ',' + userIdObjectOrValue.id)
+            : (userIdProviderKey + ',' + userIdObjectOrValue.id);
+        }
+        break;
+      case 'connectid':
+        if (userIdObjectOrValue) {
+          bidData['eids'] = (bidData['eids'].length > 0)
+            ? (bidData['eids'] + '!verizonMediaId,' + userIdObjectOrValue)
+            : ('verizonMediaId,' + userIdObjectOrValue);
+        }
+        break;
+      default:
+        bidData[userIdProviderKey] = userIdObjectOrValue;
+        break;
+    }
+  });
+
   return bidData;
 }
diff --git a/modules/uid2IdSystem.js b/modules/uid2IdSystem.js
new file mode 100644
index 00000000000..9fd75f12591
--- /dev/null
+++ b/modules/uid2IdSystem.js
@@ -0,0 +1,283 @@
+/* eslint-disable no-console */
+/**
+ * This module adds uid2 ID support to the User ID module
+ * The {@link module:modules/userId} module is required.
+ * @module modules/uid2IdSystem
+ * @requires module:modules/userId
+ */
+
+import { logInfo } from '../src/utils.js';
+import {submodule} from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'uid2';
+const MODULE_REVISION = `1.0`;
+const PREBID_VERSION = '$prebid.version$';
+const UID2_CLIENT_ID = `PrebidJS-${PREBID_VERSION}-UID2Module-${MODULE_REVISION}`;
+const GVLID = 887;
+const LOG_PRE_FIX = 'UID2: ';
+const ADVERTISING_COOKIE = '__uid2_advertising_token';
+
+// eslint-disable-next-line no-unused-vars
+const UID2_TEST_URL = 'https://operator-integ.uidapi.com';
+const UID2_PROD_URL = 'https://prod.uidapi.com';
+const UID2_BASE_URL = UID2_PROD_URL;
+
+function getStorage() {
+  return getStorageManager({gvlid: GVLID, moduleName: MODULE_NAME});
+}
+
+function createLogInfo(prefix) {
+  return function (...strings) {
+    logInfo(prefix + ' ', ...strings);
+  }
+}
+export const storage = getStorage();
+const _logInfo = createLogInfo(LOG_PRE_FIX);
+
+function readFromLocalStorage() {
+  return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(ADVERTISING_COOKIE) : null;
+}
+
+function readModuleCookie() {
+  const cookie = readCookie(ADVERTISING_COOKIE);
+  if (cookie && cookie.includes('{')) {
+    return JSON.parse(cookie);
+  }
+  return cookie;
+}
+
+function readJsonCookie(cookieName) {
+  return JSON.parse(readCookie(cookieName));
+}
+
+function readCookie(cookieName) {
+  const cookie = storage.cookiesAreEnabled() ? storage.getCookie(cookieName) : null;
+  if (!cookie) {
+    _logInfo(`Attempted to read UID2 from cookie '${cookieName}' but it was empty`);
+    return null;
+  };
+  _logInfo(`Read UID2 from cookie '${cookieName}'`);
+  return cookie;
+}
+
+function storeValue(value) {
+  if (storage.cookiesAreEnabled()) {
+    storage.setCookie(ADVERTISING_COOKIE, JSON.stringify(value), Date.now() + 60 * 60 * 24 * 1000);
+  } else if (storage.localStorageIsEnabled()) {
+    storage.setLocalStorage(ADVERTISING_COOKIE, value);
+  }
+}
+
+function isValidIdentity(identity) {
+  return !!(typeof identity === 'object' && identity !== null && identity.advertising_token && identity.identity_expires && identity.refresh_from && identity.refresh_token && identity.refresh_expires);
+}
+
+// This is extracted from an in-progress API client. Once it's available via NPM, this class should be replaced with the NPM package.
+class Uid2ApiClient {
+  constructor(opts) {
+    this._baseUrl = opts.baseUrl ? opts.baseUrl : UID2_BASE_URL;
+    this._clientVersion = UID2_CLIENT_ID;
+  }
+  createArrayBuffer(text) {
+    const arrayBuffer = new Uint8Array(text.length);
+    for (let i = 0; i < text.length; i++) {
+      arrayBuffer[i] = text.charCodeAt(i);
+    }
+    return arrayBuffer;
+  }
+  hasStatusResponse(response) {
+    return typeof (response) === 'object' && response && response.status;
+  }
+  isValidRefreshResponse(response) {
+    return this.hasStatusResponse(response) && (
+      response.status === 'optout' || response.status === 'expired_token' || (response.status === 'success' && response.body && isValidIdentity(response.body))
+    );
+  }
+  ResponseToRefreshResult(response) {
+    if (this.isValidRefreshResponse(response)) {
+      if (response.status === 'success') { return { status: response.status, identity: response.body }; }
+      return response;
+    } else { return "Response didn't contain a valid status"; }
+  }
+  callRefreshApi(refreshDetails) {
+    const url = this._baseUrl + '/v2/token/refresh';
+    const req = new XMLHttpRequest();
+    req.overrideMimeType('text/plain');
+    req.open('POST', url, true);
+    req.setRequestHeader('X-UID2-Client-Version', this._clientVersion);
+    let resolvePromise;
+    let rejectPromise;
+    const promise = new Promise((resolve, reject) => {
+      resolvePromise = resolve;
+      rejectPromise = reject;
+    });
+    req.onreadystatechange = () => {
+      if (req.readyState !== req.DONE) { return; }
+      try {
+        if (!refreshDetails.refresh_response_key || req.status !== 200) {
+          _logInfo('Error status OR no response decryption key available, assuming unencrypted JSON');
+          const response = JSON.parse(req.responseText);
+          const result = this.ResponseToRefreshResult(response);
+          if (typeof result === 'string') { rejectPromise(result); } else { resolvePromise(result); }
+        } else {
+          _logInfo('Decrypting refresh API response');
+          const encodeResp = this.createArrayBuffer(atob(req.responseText));
+          window.crypto.subtle.importKey('raw', this.createArrayBuffer(atob(refreshDetails.refresh_response_key)), { name: 'AES-GCM' }, false, ['decrypt']).then((key) => {
+            _logInfo('Imported decryption key')
+            // returns the symmetric key
+            window.crypto.subtle.decrypt({
+              name: 'AES-GCM',
+              iv: encodeResp.slice(0, 12),
+              tagLength: 128, // The tagLength you used to encrypt (if any)
+            }, key, encodeResp.slice(12)).then((decrypted) => {
+              const decryptedResponse = String.fromCharCode(...new Uint8Array(decrypted));
+              _logInfo('Decrypted to:', decryptedResponse);
+              const response = JSON.parse(decryptedResponse);
+              const result = this.ResponseToRefreshResult(response);
+              if (typeof result === 'string') { rejectPromise(result); } else { resolvePromise(result); }
+            }, (reason) => console.warn(`Call to UID2 API failed`, reason));
+          }, (reason) => console.warn(`Call to UID2 API failed`, reason));
+        }
+      } catch (err) {
+        rejectPromise(err);
+      }
+    };
+    _logInfo('Sending refresh request', req);
+    req.send(refreshDetails.refresh_token);
+    return promise;
+  }
+}
+
+/** @type {Submodule} */
+export const uid2IdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * Vendor id of Prebid
+   * @type {Number}
+   */
+  gvlid: GVLID,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {{uid2:{ id: string } }} or undefined if value doesn't exists
+   */
+  decode(value) {
+    const result = decodeImpl(value);
+    _logInfo('UID2 decode returned', result);
+    return result;
+  },
+
+  /**
+   * performs action to obtain id and return a value.
+   * @function
+   * @param {SubmoduleConfig} [configparams]
+   * @param {ConsentData|undefined} consentData
+   * @returns {uid2Id}
+   */
+  getId(config, consentData) {
+    const result = getIdImpl(config, consentData);
+    _logInfo(`UID2 getId returned`, result);
+    return result;
+  },
+};
+
+function refreshTokenAndStore(baseUrl, token) {
+  _logInfo('UID2 base url provided: ', baseUrl);
+  const client = new Uid2ApiClient({baseUrl});
+  return client.callRefreshApi(token).then((response) => {
+    _logInfo('Refresh endpoint responded with:', response);
+    const tokens = {
+      originalToken: token,
+      latestToken: response.identity,
+    };
+    storeValue(tokens);
+    return tokens;
+  });
+}
+
+function decodeImpl(value) {
+  if (typeof value === 'string') {
+    _logInfo('Found an old-style ID from an earlier version of the module. Refresh is unavailable for this token.');
+    const result = { uid2: { id: value } };
+    return result;
+  }
+  if (Date.now() < value.latestToken.identity_expires) {
+    return { uid2: { id: value.latestToken.advertising_token } };
+  }
+  return null;
+}
+
+function getIdImpl(config, consentData) {
+  let suppliedToken = null;
+  const uid2BaseUrl = config?.params?.uid2ApiBase ?? UID2_BASE_URL;
+  if (config && config.params) {
+    if (config.params.uid2Token) {
+      suppliedToken = config.params.uid2Token;
+      _logInfo('Read token from params', suppliedToken);
+    } else if (config.params.uid2ServerCookie) {
+      suppliedToken = readJsonCookie(config.params.uid2ServerCookie);
+      _logInfo('Read token from server-supplied cookie', suppliedToken);
+    }
+  }
+  let storedTokens = readModuleCookie() || readFromLocalStorage();
+  _logInfo('Loaded module-stored tokens:', storedTokens);
+
+  if (storedTokens && typeof storedTokens === 'string') {
+    // Legacy value stored, this must be from an old integration. If no token supplied, just use the legacy value.
+
+    if (!suppliedToken) {
+      _logInfo('Returning legacy cookie value.');
+      return { id: storedTokens };
+    }
+    // Otherwise, ignore the legacy value - it should get over-written later anyway.
+    _logInfo('Discarding superseded legacy cookie.');
+    storedTokens = null;
+  }
+
+  if (suppliedToken && storedTokens) {
+    if (storedTokens.originalToken?.advertising_token !== suppliedToken.advertising_token) {
+      _logInfo('Server supplied new token - ignoring stored value.', storedTokens.originalToken?.advertising_token, suppliedToken.advertising_token);
+      // Stored token wasn't originally sourced from the provided token - ignore the stored value. A new user has logged in?
+      storedTokens = null;
+    }
+  }
+  // At this point, any legacy values or superseded stored tokens have been nulled out.
+  const useSuppliedToken = !(storedTokens?.latestToken) || (suppliedToken && suppliedToken.identity_expires > storedTokens.latestToken.identity_expires);
+  const newestAvailableToken = useSuppliedToken ? suppliedToken : storedTokens.latestToken;
+  _logInfo('UID2 module selected latest token', useSuppliedToken, newestAvailableToken);
+  if (!newestAvailableToken || Date.now() > newestAvailableToken.refresh_expires) {
+    _logInfo('Newest available token is expired and not refreshable.');
+    return { id: null };
+  }
+  if (Date.now() > newestAvailableToken.identity_expires) {
+    const promise = refreshTokenAndStore(uid2BaseUrl, newestAvailableToken);
+    _logInfo('Token is expired but can be refreshed, attempting refresh.');
+    return { callback: (cb) => {
+      promise.then((result) => {
+        _logInfo('Refresh reponded, passing the updated token on.', result);
+        cb(result);
+      });
+    } };
+  }
+  // If should refresh (but don't need to), refresh in the background.
+  if (Date.now() > newestAvailableToken.refresh_from) {
+    _logInfo(`Refreshing token in background with low priority.`);
+    refreshTokenAndStore(uid2BaseUrl, newestAvailableToken);
+  }
+  const tokens = {
+    originalToken: suppliedToken ?? storedTokens?.originalToken,
+    latestToken: newestAvailableToken,
+  };
+  storeValue(tokens);
+  return { id: tokens };
+}
+
+// Register submodule for userId
+submodule('userId', uid2IdSubmodule);
diff --git a/modules/uid2IdSystem.md b/modules/uid2IdSystem.md
new file mode 100644
index 00000000000..82ff1b3cb68
--- /dev/null
+++ b/modules/uid2IdSystem.md
@@ -0,0 +1,54 @@
+## UID 2.0 User ID Submodule
+
+UID 2.0 ID Module.
+
+### Prebid Params
+
+Individual params may be set for the UID 2.0 Submodule. At least one identifier must be set in the params.
+
+The module will handle refreshing the token periodically and storing the updated token using the Prebid.js storage manager. If you provide an expired identity and the module has a valid identity which was refreshed from the identity you provide, it will use the refreshed identity. The module stores the original token used for refreshing the token, and it will use the refreshed tokens as long as the original token matches the one supplied.
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'uid2',
+            params: {
+                // Either:
+                uid2ServerCookie: 'your_UID2_server_set_cookie_name'
+                // Or:
+                uid2Token: {
+                    'advertising_token': '...',
+                    'refresh_token': '...',
+                    // etc. - see the Sample Token below for contents of this object
+                }
+            }
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the UID 2.0 User ID Module integration.
+
+You should supply either `uid2Token` or `uid2ServerCookie`.
+
+If you provide `uid2Token`, the value should be a JavaScript/JSON object with the decrypted `body` payload response from a call to either `/token/generate` or `/token/refresh`.
+
+If you provide `uid2ServerCookie`, the module will expect that same JSON object to be stored in the cookie - i.e. it will pass the cookie value to `JSON.parse` and expect to receive an object containing similar to what you see in the `Sample token` section below.
+
+The module will make calls to the `/token/refresh` endpoint to update the token it stores internally, so bids may contain an updated token.
+
+If neither of `uid2Token` or `uid2ServerCookie` are supplied, and the module has stored a token using the Prebid.js storage system (typically in a cookie named `__uid2_advertising_token`), it will use that token. This cookie is internal to the module and should not be set directly.
+
+If a new token is supplied which does not match the original token used to generate any refreshed tokens, all stored tokens will be discarded and the new token used instead (refreshed if necessary).
+
+### Sample token
+
+`{`<br />&nbsp;&nbsp;`"advertising_token": "...",`<br />&nbsp;&nbsp;`"refresh_token": "...",`<br />&nbsp;&nbsp;`"identity_expires": 1633643601000,`<br />&nbsp;&nbsp;`"refresh_from": 1633643001000,`<br />&nbsp;&nbsp;`"refresh_expires": 1636322000000,`<br />&nbsp;&nbsp;`"refresh_response_key": "wR5t6HKMfJ2r4J7fEGX9Gw=="`<br />`}`
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the UID20 module - `"uid2"` | `"uid2"` |
+| params.uid2Token | Optional | Object | The initial UID2 token. This should be `body` element of the decrypted response from a call to the `/token/generate` or `/token/refresh` endpoint. | See the sample token above. |
+| params.uid2ServerCookie | Optional | String | The name of a cookie which holds the initial UID2 token, set by the server. The cookie should contain JSON in the same format as the alternative uid2Token param. **If uid2Token is supplied, this param is ignored.** | See the sample token above. |
+| params.uid2ApiBase | Optional | String | Overrides the default UID2 API endpoint. | `https://prod.uidapi.com` _(default)_ |
diff --git a/modules/underdogmediaBidAdapter.js b/modules/underdogmediaBidAdapter.js
index 8368077a627..53fe83b1dd0 100644
--- a/modules/underdogmediaBidAdapter.js
+++ b/modules/underdogmediaBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { logMessage, flatten, parseSizesInput } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 const BIDDER_CODE = 'underdogmedia';
@@ -7,7 +7,7 @@ const UDM_VENDOR_ID = '159';
 const prebidVersion = '$prebid.version$';
 let USER_SYNCED = false;
 
-utils.logMessage(`Initializing UDM Adapter. PBJS Version: ${prebidVersion} with adapter version: ${UDM_ADAPTER_VERSION}  Updated 20191028`);
+logMessage(`Initializing UDM Adapter. PBJS Version: ${prebidVersion} with adapter version: ${UDM_ADAPTER_VERSION}  Updated 20191028`);
 
 // helper function for testing user syncs
 export function resetUserSync() {
@@ -29,7 +29,7 @@ export const spec = {
 
     validBidRequests.forEach(bidParam => {
       let bidParamSizes = bidParam.mediaTypes && bidParam.mediaTypes.banner && bidParam.mediaTypes.banner.sizes ? bidParam.mediaTypes.banner.sizes : bidParam.sizes;
-      sizes = utils.flatten(sizes, utils.parseSizesInput(bidParamSizes));
+      sizes = flatten(sizes, parseSizesInput(bidParamSizes));
       siteId = bidParam.params.siteId;
     });
 
@@ -98,8 +98,8 @@ export const spec = {
         }
 
         var sizeNotFound = true;
-        const bidParamSizes = bidParam.mediaTypes && bidParam.mediaTypes.banner && bidParam.mediaTypes.banner.sizes ? bidParam.mediaTypes.banner.sizes : bidParam.sizes
-        utils.parseSizesInput(bidParamSizes).forEach(size => {
+        const bidParamSizes = bidParam.mediaTypes && bidParam.mediaTypes.banner && bidParam.mediaTypes.banner.sizes ? bidParam.mediaTypes.banner.sizes : bidParam.sizes;
+        parseSizesInput(bidParamSizes).forEach(size => {
           if (size === mid.width + 'x' + mid.height) {
             sizeNotFound = false;
           }
@@ -120,6 +120,9 @@ export const spec = {
           currency: 'USD',
           netRevenue: false,
           ttl: mid.ttl || 60,
+          meta: {
+            advertiserDomains: mid.advertiser_domains || []
+          }
         };
 
         if (bidResponse.cpm <= 0) {
diff --git a/modules/undertoneBidAdapter.js b/modules/undertoneBidAdapter.js
index 6ead453b622..eda4b6f579c 100644
--- a/modules/undertoneBidAdapter.js
+++ b/modules/undertoneBidAdapter.js
@@ -2,8 +2,9 @@
  * Adapter to send bids to Undertone
  */
 
-import { parseUrl } from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
+import {deepAccess, parseUrl} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'undertone';
 const URL = 'https://hb.undertone.com/hb';
@@ -11,16 +12,18 @@ const FRAME_USER_SYNC = 'https://cdn.undertone.com/js/usersync.html';
 const PIXEL_USER_SYNC_1 = 'https://usr.undertone.com/userPixel/syncOne?id=1&of=2';
 const PIXEL_USER_SYNC_2 = 'https://usr.undertone.com/userPixel/syncOne?id=2&of=2';
 
-function getCanonicalUrl() {
-  try {
-    let doc = window.top.document;
-    let element = doc.querySelector("link[rel='canonical']");
-    if (element !== null) {
-      return element.href;
-    }
-  } catch (e) {
+function getBidFloor(bidRequest, mediaType) {
+  if (typeof bidRequest.getFloor !== 'function') {
+    return 0;
   }
-  return null;
+
+  const floor = bidRequest.getFloor({
+    currency: 'USD',
+    mediaType: mediaType,
+    size: '*'
+  });
+
+  return (floor && floor.currency === 'USD' && floor.floor) || 0;
 }
 
 function extractDomainFromHost(pageHost) {
@@ -73,6 +76,7 @@ function getBannerCoords(id) {
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bid) {
     if (bid && bid.params && bid.params.publisherId) {
       bid.params.publisherId = parseInt(bid.params.publisherId);
@@ -83,18 +87,29 @@ export const spec = {
     const vw = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
     const vh = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
     const pageSizeArray = vw == 0 || vh == 0 ? null : [vw, vh];
+    const commons = {
+      'adapterVersion': '$prebid.version$',
+      'uids': validBidRequests[0].userId,
+      'pageSize': pageSizeArray
+    };
+    if (validBidRequests[0].schain) {
+      commons.schain = validBidRequests[0].schain;
+    }
     const payload = {
       'x-ut-hb-params': [],
-      'commons': {
-        'adapterVersion': '$prebid.version$',
-        'uids': validBidRequests[0].userId,
-        'pageSize': pageSizeArray
-      }
+      'commons': commons
     };
-    const referer = bidderRequest.refererInfo.referer;
+    const referer = bidderRequest.refererInfo.topmostLocation;
+    const canonicalUrl = bidderRequest.refererInfo.canonicalUrl;
+    if (referer) {
+      commons.referrer = referer;
+    }
+    if (canonicalUrl) {
+      commons.canonicalUrl = canonicalUrl;
+    }
     const hostname = parseUrl(referer).hostname;
     let domain = extractDomainFromHost(hostname);
-    const pageUrl = getCanonicalUrl() || referer;
+    const pageUrl = canonicalUrl || referer;
 
     const pubid = validBidRequests[0].params.publisherId;
     let reqUrl = `${URL}?pid=${pubid}&domain=${domain}`;
@@ -120,8 +135,22 @@ export const spec = {
         sizes: bidReq.sizes,
         params: bidReq.params
       };
+      const videoMediaType = deepAccess(bidReq, 'mediaTypes.video');
+      const mediaType = videoMediaType ? VIDEO : BANNER;
+      bid.mediaType = mediaType;
+      bid.bidfloor = getBidFloor(bidReq, mediaType);
+      if (videoMediaType) {
+        bid.video = {
+          playerSize: deepAccess(bidReq, 'mediaTypes.video.playerSize') || null,
+          streamType: deepAccess(bidReq, 'mediaTypes.video.context') || null,
+          playbackMethod: deepAccess(bidReq, 'params.video.playbackMethod') || null,
+          maxDuration: deepAccess(bidReq, 'params.video.maxDuration') || null,
+          skippable: deepAccess(bidReq, 'params.video.skippable') || null
+        };
+      }
       payload['x-ut-hb-params'].push(bid);
     });
+
     return {
       method: 'POST',
       url: reqUrl,
@@ -145,8 +174,14 @@ export const spec = {
             currency: bidRes.currency,
             netRevenue: bidRes.netRevenue,
             ttl: bidRes.ttl || 360,
-            ad: bidRes.ad
+            meta: { advertiserDomains: bidRes.adomain ? bidRes.adomain : [] }
           };
+          if (bidRes.mediaType && bidRes.mediaType === 'video') {
+            bid.vastXml = bidRes.ad;
+            bid.mediaType = bidRes.mediaType;
+          } else {
+            bid.ad = bidRes.ad
+          }
           bids.push(bid);
         }
       });
diff --git a/modules/undertoneBidAdapter.md b/modules/undertoneBidAdapter.md
index 8ac84b77bd8..8e0b234fd7a 100644
--- a/modules/undertoneBidAdapter.md
+++ b/modules/undertoneBidAdapter.md
@@ -1,9 +1,13 @@
 # Overview
 
 ```
-Module Name: Example Bidder Adapter
+Module Name: Undertone Bidder Adapter
 Module Type: Bidder Adapter
 Maintainer: RampProgrammatic@perion.com
+gdpr_supported: true
+usp_supported: true
+schain_supported: true
+media_types: video, native
 ```
 # Description
 
diff --git a/modules/unicornBidAdapter.js b/modules/unicornBidAdapter.js
index 33e60ad2789..9cbc79f3e61 100644
--- a/modules/unicornBidAdapter.js
+++ b/modules/unicornBidAdapter.js
@@ -1,13 +1,14 @@
-import * as utils from '../src/utils.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
+import { logInfo, deepAccess, generateUUID } from '../src/utils.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getStorageManager} from '../src/storageManager.js';
 
-const storage = getStorageManager();
 const BIDDER_CODE = 'unicorn';
 const UNICORN_ENDPOINT = 'https://ds.uncn.jp/pb/0/bid.json';
 const UNICORN_DEFAULT_CURRENCY = 'JPY';
 const UNICORN_PB_COOKIE_KEY = '__pb_unicorn_aud';
+const UNICORN_PB_VERSION = '1.1';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 /**
  * Placement ID and Account ID are required.
@@ -38,40 +39,34 @@ export const buildRequests = (validBidRequests, bidderRequest) => {
  * @returns {string}
  */
 function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
-  utils.logInfo(
-    '[UNICORN] buildOpenRtbBidRequestPayload.validBidRequests:',
-    validBidRequests
-  );
-  utils.logInfo(
-    '[UNICORN] buildOpenRtbBidRequestPayload.bidderRequest:',
-    bidderRequest
-  );
+  logInfo('[UNICORN] buildOpenRtbBidRequestPayload.validBidRequests:', validBidRequests);
+  logInfo('[UNICORN] buildOpenRtbBidRequestPayload.bidderRequest:', bidderRequest);
   const imp = validBidRequests.map(br => {
-    const sizes = utils.parseSizesInput(br.sizes)[0];
     return {
       id: br.bidId,
       banner: {
-        w: sizes.split('x')[0],
-        h: sizes.split('x')[1]
+        format: makeFormat(br.sizes),
+        w: br.sizes[0][0],
+        h: br.sizes[0][1]
       },
-      tagid: utils.deepAccess(br, 'params.placementId') || br.adUnitCode,
+      tagid: deepAccess(br, 'params.placementId') || br.adUnitCode,
       secure: 1,
-      bidfloor: parseFloat(utils.deepAccess(br, 'params.bidfloorCpm') || 0)
+      bidfloor: parseFloat(0)
     };
   });
   const request = {
     id: bidderRequest.auctionId,
     at: 1,
     imp,
-    cur: UNICORN_DEFAULT_CURRENCY,
+    cur: [UNICORN_DEFAULT_CURRENCY],
     site: {
-      id: utils.deepAccess(validBidRequests[0], 'params.mediaId') || '',
+      id: deepAccess(validBidRequests[0], 'params.mediaId') || '',
       publisher: {
-        id: utils.deepAccess(validBidRequests[0], 'params.publisherId') || 0
+        id: String(deepAccess(validBidRequests[0], 'params.publisherId') || 0)
       },
-      domain: window.location.hostname,
-      page: window.location.href,
-      ref: bidderRequest.refererInfo.referer
+      domain: bidderRequest.refererInfo.domain,
+      page: bidderRequest.refererInfo.page,
+      ref: bidderRequest.refererInfo.ref
     },
     device: {
       language: navigator.language,
@@ -80,30 +75,31 @@ function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
     user: {
       id: getUid()
     },
-    bcat: utils.deepAccess(validBidRequests[0], 'params.bcat') || [],
+    bcat: deepAccess(validBidRequests[0], 'params.bcat') || [],
     source: {
       ext: {
         stype: 'prebid_uncn',
-        bidder: BIDDER_CODE
+        bidder: BIDDER_CODE,
+        prebid_version: UNICORN_PB_VERSION
       }
     },
     ext: {
-      accountId: utils.deepAccess(validBidRequests[0], 'params.accountId')
+      accountId: deepAccess(validBidRequests[0], 'params.accountId')
     }
   };
-  utils.logInfo('[UNICORN] OpenRTB Formatted Request:', request);
+  logInfo('[UNICORN] OpenRTB Formatted Request:', request);
   return JSON.stringify(request);
 }
 
 const interpretResponse = (serverResponse, request) => {
-  utils.logInfo('[UNICORN] interpretResponse.serverResponse:', serverResponse);
-  utils.logInfo('[UNICORN] interpretResponse.request:', request);
+  logInfo('[UNICORN] interpretResponse.serverResponse:', serverResponse);
+  logInfo('[UNICORN] interpretResponse.request:', request);
   const res = serverResponse.body;
   var bids = []
   if (res) {
     res.seatbid.forEach(sb => {
       sb.bid.forEach(b => {
-        bids.push({
+        var bid = {
           requestId: b.impid,
           cpm: b.price || 0,
           width: b.w,
@@ -113,11 +109,17 @@ const interpretResponse = (serverResponse, request) => {
           creativeId: b.crid,
           netRevenue: false,
           currency: res.cur
-        })
+        }
+
+        if (b.adomain != undefined || b.adomain != null) {
+          bid.meta = { advertiserDomains: b.adomain };
+        }
+
+        bids.push(bid)
       })
     });
   }
-  utils.logInfo('[UNICORN] interpretResponse bids:', bids);
+  logInfo('[UNICORN] interpretResponse bids:', bids);
   return bids;
 };
 
@@ -130,7 +132,7 @@ const getUid = () => {
     return JSON.parse(ck)['uid'];
   } else {
     const newCk = {
-      uid: utils.generateUUID()
+      uid: generateUUID()
     };
     const expireIn = new Date(Date.now() + 24 * 60 * 60 * 10000).toUTCString();
     storage.setCookie(UNICORN_PB_COOKIE_KEY, JSON.stringify(newCk), expireIn);
@@ -138,13 +140,21 @@ const getUid = () => {
   }
 };
 
+/**
+ * Make imp.banner.format
+ * @param {Array<Number>} arr
+ */
+const makeFormat = arr => arr.map((s) => {
+  return {w: s[0], h: s[1]};
+});
+
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['uncn'],
   supportedMediaTypes: [BANNER],
   isBidRequestValid,
   buildRequests,
-  interpretResponse,
+  interpretResponse
 };
 
 registerBidder(spec);
diff --git a/modules/unicornBidAdapter.md b/modules/unicornBidAdapter.md
index 5b8c8268bcf..52c11aae3ee 100644
--- a/modules/unicornBidAdapter.md
+++ b/modules/unicornBidAdapter.md
@@ -22,7 +22,6 @@ Module that connects to UNICORN.
             bidder: 'unicorn',
             params: {
                 placementId: 'rectangle-ad-1', // OPTIONAL: If placementId is empty, adunit code will be used as placementId. 
-                bidfloorCpm: 0.2, // OPTIONAL: Floor CPM (JPY) defaults to 0
                 publisherId: 99999 // OPTIONAL: Account specific publisher id
                 mediaId: "uc" // OPTIONAL: Publisher specific media id
                 accountId: 12345, // REQUIRED: Account ID for charge request
diff --git a/modules/unifiedIdSystem.js b/modules/unifiedIdSystem.js
index f916030d643..8ec5fcd3f90 100644
--- a/modules/unifiedIdSystem.js
+++ b/modules/unifiedIdSystem.js
@@ -5,7 +5,7 @@
  * @requires module:modules/userId
  */
 
-import * as utils from '../src/utils.js'
+import { logError } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import {submodule} from '../src/hook.js'
 
@@ -18,6 +18,10 @@ export const unifiedIdSubmodule = {
    * @type {string}
    */
   name: MODULE_NAME,
+  /**
+   * required for the gdpr enforcement module
+   */
+  gvlid: 21,
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -30,12 +34,13 @@ export const unifiedIdSubmodule = {
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @returns {IdResponse|undefined}
    */
-  getId(configParams) {
+  getId(config) {
+    const configParams = (config && config.params) || {};
     if (!configParams || (typeof configParams.partner !== 'string' && typeof configParams.url !== 'string')) {
-      utils.logError('User ID - unifiedId submodule requires either partner or url to be defined');
+      logError('User ID - unifiedId submodule requires either partner or url to be defined');
       return;
     }
     // use protocol relative urls for http or https
@@ -49,13 +54,13 @@ export const unifiedIdSubmodule = {
             try {
               responseObj = JSON.parse(response);
             } catch (error) {
-              utils.logError(error);
+              logError(error);
             }
           }
           callback(responseObj);
         },
         error: error => {
-          utils.logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+          logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
           callback();
         }
       };
diff --git a/modules/unrulyBidAdapter.js b/modules/unrulyBidAdapter.js
index 15fe0fefe8b..77160bb01e6 100644
--- a/modules/unrulyBidAdapter.js
+++ b/modules/unrulyBidAdapter.js
@@ -1,136 +1,226 @@
-import * as utils from '../src/utils.js'
-import { Renderer } from '../src/Renderer.js'
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { VIDEO } from '../src/mediaTypes.js'
+import { deepAccess, logError } from '../src/utils.js';
+import {Renderer} from '../src/Renderer.js'
+import {registerBidder} from '../src/adapters/bidderFactory.js'
+import {VIDEO, BANNER} from '../src/mediaTypes.js'
 
-function configureUniversalTag (exchangeRenderer) {
-  if (!exchangeRenderer.config) throw new Error('UnrulyBidAdapter: Missing renderer config.')
-  if (!exchangeRenderer.config.siteId) throw new Error('UnrulyBidAdapter: Missing renderer siteId.')
+function configureUniversalTag(exchangeRenderer, requestId) {
+  if (!exchangeRenderer.config) throw new Error('UnrulyBidAdapter: Missing renderer config.');
+  if (!exchangeRenderer.config.siteId) throw new Error('UnrulyBidAdapter: Missing renderer siteId.');
 
   parent.window.unruly = parent.window.unruly || {};
   parent.window.unruly['native'] = parent.window.unruly['native'] || {};
   parent.window.unruly['native'].siteId = parent.window.unruly['native'].siteId || exchangeRenderer.config.siteId;
+  parent.window.unruly['native'].adSlotId = requestId;
   parent.window.unruly['native'].supplyMode = 'prebid';
 }
 
-function configureRendererQueue () {
+function configureRendererQueue() {
   parent.window.unruly['native'].prebid = parent.window.unruly['native'].prebid || {};
   parent.window.unruly['native'].prebid.uq = parent.window.unruly['native'].prebid.uq || [];
 }
 
-function notifyRenderer (bidResponseBid) {
+function notifyRenderer(bidResponseBid) {
   parent.window.unruly['native'].prebid.uq.push(['render', bidResponseBid]);
 }
 
-const serverResponseToBid = (bid, rendererInstance) => ({
-  requestId: bid.bidId,
-  cpm: bid.cpm,
-  width: bid.width,
-  height: bid.height,
-  vastUrl: bid.vastUrl,
-  netRevenue: true,
-  creativeId: bid.bidId,
-  ttl: 360,
-  currency: 'USD',
-  renderer: rendererInstance,
-  mediaType: VIDEO
-});
-
-const buildPrebidResponseAndInstallRenderer = bids =>
-  bids
-    .filter(serverBid => {
-      const hasConfig = !!utils.deepAccess(serverBid, 'ext.renderer.config');
-      const hasSiteId = !!utils.deepAccess(serverBid, 'ext.renderer.config.siteId');
-
-      if (!hasConfig) utils.logError(new Error('UnrulyBidAdapter: Missing renderer config.'));
-      if (!hasSiteId) utils.logError(new Error('UnrulyBidAdapter: Missing renderer siteId.'));
-
-      return hasSiteId
-    })
-    .map(serverBid => {
-      const exchangeRenderer = utils.deepAccess(serverBid, 'ext.renderer');
-
-      configureUniversalTag(exchangeRenderer);
-      configureRendererQueue();
-
-      const rendererInstance = Renderer.install(Object.assign({}, exchangeRenderer, { callback: () => {} }));
-      return { rendererInstance, serverBid };
-    })
-    .map(
-      ({rendererInstance, serverBid}) => {
-        const prebidBid = serverResponseToBid(serverBid, rendererInstance);
-
-        const rendererConfig = Object.assign(
-          {},
-          prebidBid,
-          {
-            renderer: rendererInstance,
-            adUnitCode: serverBid.ext.adUnitCode
-          }
-        );
-
-        rendererInstance.setRender(() => { notifyRenderer(rendererConfig) });
-
-        return prebidBid;
+const addBidFloorInfo = (validBid) => {
+  Object.keys(validBid.mediaTypes).forEach((key) => {
+    let floor;
+    if (typeof validBid.getFloor === 'function') {
+      floor = validBid.getFloor({
+        currency: 'USD',
+        mediaType: key,
+        size: '*'
+      }).floor || 0;
+    } else {
+      floor = validBid.params.floor || 0;
+    }
+
+    validBid.mediaTypes[key].floor = floor;
+  });
+};
+
+const RemoveDuplicateSizes = (validBid) => {
+  let bannerMediaType = deepAccess(validBid, 'mediaTypes.banner');
+  if (bannerMediaType) {
+    let seenSizes = {};
+    let newSizesArray = [];
+    bannerMediaType.sizes.forEach((size) => {
+      if (!seenSizes[size.toString()]) {
+        seenSizes[size.toString()] = true;
+        newSizesArray.push(size);
       }
-    );
+    });
 
-export const adapter = {
-  code: 'unruly',
-  supportedMediaTypes: [ VIDEO ],
-  isBidRequestValid: function(bid) {
-    if (!bid) return false;
+    bannerMediaType.sizes = newSizesArray;
+  }
+};
 
-    const context = utils.deepAccess(bid, 'mediaTypes.video.context');
+const getRequests = (conf, validBidRequests, bidderRequest) => {
+  const {bids, bidderRequestId, auctionId, bidderCode, ...bidderRequestData} = bidderRequest;
+  const invalidBidsCount = bidderRequest.bids.length - validBidRequests.length;
+  let requestBySiteId = {};
 
-    return bid.mediaType === 'video' || context === 'outstream';
-  },
+  validBidRequests.forEach((validBid) => {
+    const currSiteId = validBid.params.siteId;
+    addBidFloorInfo(validBid);
+    RemoveDuplicateSizes(validBid);
+    requestBySiteId[currSiteId] = requestBySiteId[currSiteId] || [];
+    requestBySiteId[currSiteId].push(validBid);
+  });
 
-  buildRequests: function(validBidRequests, bidderRequest) {
-    const url = 'https://targeting.unrulymedia.com/prebid';
-    const method = 'POST';
-    const data = {
-      bidRequests: validBidRequests,
-      bidderRequest
-    };
-    const options = { contentType: 'text/plain' };
+  let request = [];
 
-    return {
-      url,
-      method,
-      data,
-      options
+  Object.keys(requestBySiteId).forEach((key) => {
+    let data = {
+      bidderRequest: Object.assign({}, {bids: requestBySiteId[key], invalidBidsCount, ...bidderRequestData})
     };
+
+    request.push(Object.assign({}, {data, ...conf}));
+  });
+
+  return request;
+};
+
+const handleBidResponseByMediaType = (bids) => {
+  let bidResponses = [];
+
+  bids.forEach((bid) => {
+    let parsedBidResponse;
+    let bidMediaType = deepAccess(bid, 'meta.mediaType');
+    if (bidMediaType && bidMediaType.toLowerCase() === 'banner') {
+      bid.mediaType = BANNER;
+      parsedBidResponse = handleBannerBid(bid);
+    } else if (bidMediaType && bidMediaType.toLowerCase() === 'video') {
+      let context = deepAccess(bid, 'meta.videoContext');
+      bid.mediaType = VIDEO;
+      if (context === 'instream') {
+        parsedBidResponse = handleInStreamBid(bid);
+      } else if (context === 'outstream') {
+        parsedBidResponse = handleOutStreamBid(bid);
+      }
+    }
+
+    if (parsedBidResponse) {
+      bidResponses.push(parsedBidResponse);
+    }
+  });
+
+  return bidResponses;
+};
+
+const handleBannerBid = (bid) => {
+  if (!bid.ad) {
+    logError(new Error('UnrulyBidAdapter: Missing ad config.'));
+    return;
+  }
+
+  return bid;
+};
+
+const handleInStreamBid = (bid) => {
+  if (!(bid.vastUrl || bid.vastXml)) {
+    logError(new Error('UnrulyBidAdapter: Missing vastUrl or vastXml config.'));
+    return;
+  }
+
+  return bid;
+};
+
+const handleOutStreamBid = (bid) => {
+  const hasConfig = !!deepAccess(bid, 'ext.renderer.config');
+  const hasSiteId = !!deepAccess(bid, 'ext.renderer.config.siteId');
+
+  if (!hasConfig) {
+    logError(new Error('UnrulyBidAdapter: Missing renderer config.'));
+    return;
+  }
+  if (!hasSiteId) {
+    logError(new Error('UnrulyBidAdapter: Missing renderer siteId.'));
+    return;
+  }
+
+  const exchangeRenderer = deepAccess(bid, 'ext.renderer');
+
+  configureUniversalTag(exchangeRenderer, bid.requestId);
+  configureRendererQueue();
+
+  const rendererInstance = Renderer.install(Object.assign({}, exchangeRenderer));
+
+  const rendererConfig = Object.assign(
+    {},
+    bid,
+    {
+      renderer: rendererInstance,
+      adUnitCode: deepAccess(bid, 'ext.adUnitCode')
+    }
+  );
+
+  rendererInstance.setRender(() => {
+    notifyRenderer(rendererConfig)
+  });
+
+  bid.renderer = bid.renderer || rendererInstance;
+  return bid;
+};
+
+const isMediaTypesValid = (bid) => {
+  const mediaTypeVideoData = deepAccess(bid, 'mediaTypes.video');
+  const mediaTypeBannerData = deepAccess(bid, 'mediaTypes.banner');
+  let isValid = !!(mediaTypeVideoData || mediaTypeBannerData);
+  if (isValid && mediaTypeVideoData) {
+    isValid = isVideoMediaTypeValid(mediaTypeVideoData);
+  }
+  if (isValid && mediaTypeBannerData) {
+    isValid = isBannerMediaTypeValid(mediaTypeBannerData);
+  }
+  return isValid;
+};
+
+const isVideoMediaTypeValid = (mediaTypeVideoData) => {
+  if (!mediaTypeVideoData.context) {
+    return false;
+  }
+
+  const supportedContexts = ['outstream', 'instream'];
+  return supportedContexts.indexOf(mediaTypeVideoData.context) !== -1;
+};
+
+const isBannerMediaTypeValid = (mediaTypeBannerData) => {
+  return mediaTypeBannerData.sizes;
+};
+
+export const adapter = {
+  code: 'unruly',
+  supportedMediaTypes: [VIDEO, BANNER],
+  gvlid: 36,
+  isBidRequestValid: function (bid) {
+    let siteId = deepAccess(bid, 'params.siteId');
+    let isBidValid = siteId && isMediaTypesValid(bid);
+    return !!isBidValid;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let endPoint = 'https://targeting.unrulymedia.com/unruly_prebid';
+    if (validBidRequests[0]) {
+      endPoint = deepAccess(validBidRequests[0], 'params.endpoint') || endPoint;
+    }
+
+    const url = endPoint;
+    const method = 'POST';
+    const options = {contentType: 'application/json'};
+    return getRequests({url, method, options}, validBidRequests, bidderRequest);
   },
 
-  interpretResponse: function(serverResponse = {}) {
+  interpretResponse: function (serverResponse = {}) {
     const serverResponseBody = serverResponse.body;
+
     const noBidsResponse = [];
     const isInvalidResponse = !serverResponseBody || !serverResponseBody.bids;
 
     return isInvalidResponse
       ? noBidsResponse
-      : buildPrebidResponseAndInstallRenderer(serverResponseBody.bids);
-  },
-
-  getUserSyncs: function(syncOptions, response, gdprConsent) {
-    let params = '';
-    if (gdprConsent && 'gdprApplies' in gdprConsent) {
-      if (gdprConsent.gdprApplies && typeof gdprConsent.consentString === 'string') {
-        params += `?gdpr=1&gdpr_consent=${gdprConsent.consentString}`;
-      } else {
-        params += `?gdpr=0`;
-      }
-    }
-
-    const syncs = []
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: 'https://video.unrulymedia.com/iframes/third-party-iframes.html' + params
-      });
-    }
-    return syncs;
+      : handleBidResponseByMediaType(serverResponseBody.bids);
   }
 };
 
diff --git a/modules/unrulyBidAdapter.md b/modules/unrulyBidAdapter.md
index fc3c6c264be..5bfa09bb646 100644
--- a/modules/unrulyBidAdapter.md
+++ b/modules/unrulyBidAdapter.md
@@ -2,7 +2,7 @@
 
 **Module Name**: Unruly Bid Adapter
 **Module Type**: Bidder Adapter
-**Maintainer**: prodev@unrulymedia.com
+**Maintainer**: prebidsupport@unrulygroup.com
 
 # Description
 
@@ -11,21 +11,78 @@ Module that connects to UnrulyX for bids.
 # Test Parameters
 
 ```js
-   const adUnits = [{
-       code: 'ad-slot',
-       sizes: [[728, 90], [300, 250]],
-       mediaTypes: {
-           video: {
-               context: 'outstream'
-           }
-       },
-       bids: [{
-           bidder: 'unruly',
-           params: {
-               targetingUUID: '6f15e139-5f18-49a1-b52f-87e5e69ee65e',
-               siteId: 1081534
-           }
-       }
-       ]
-   }];
+const adUnits =
+    [
+      {
+        "code": "outstream-ad",
+        "mediaTypes": {
+          "video": {
+            "context": "outstream",
+            "playerSize": [[640, 480]]
+          }
+        },
+        "bids": [
+          {
+            "bidder": "unruly",
+            "params": {
+              "siteId": 1081534
+            }
+          }
+        ]
+      },
+      {
+        "code": "unmissable-ad",
+        "mediaTypes": {
+          "video": {
+            "context": "outstream",
+            "playerSize": [[640, 480]]
+          }
+        },
+        "bids": [
+          {
+            "bidder": "unruly",
+            "params": {
+              "siteId": 1081534,
+              "featureOverrides": {
+                "canRunUnmissable": true
+              }
+            }
+          }
+        ]
+      },
+      {
+        "code": "banner-ad",
+        "mediaTypes": {
+          "banner": {
+            "sizes": [[300, 250]]
+          }
+        },
+        "bids": [
+          {
+            "bidder": "unruly",
+            "params": {
+              "siteId": 1081534
+            }
+          }
+        ]
+      },
+      {
+        "code": "instream-ad",
+        "mediaTypes": {
+          "video": {
+            "context": "instream",
+            "mimes": ["video/mp4"],
+            "playerSize": [[640, 480]]
+          }
+        },
+        "bids": [
+          {
+            "bidder": "unruly",
+            "params": {
+              "siteId": 1081534
+            }
+          }
+        ]
+      }
+    ];
 ```
diff --git a/modules/uolBidAdapter.md b/modules/uolBidAdapter.md
deleted file mode 100644
index 1d465c9a9c5..00000000000
--- a/modules/uolBidAdapter.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Overview
-
-```
-Module Name:  UOL Project Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer:   l-prebid@uolinc.com
-```
-
-# Description
-
-Connect to UOL Project's exchange for bids.
-
-For proper setup, please contact UOL Project's team at l-prebid@uolinc.com
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: '/19968336/header-bid-tag-0',
-            mediaTypes: {
-                banner: {
-                    sizes: [[300, 250],[300, 600]]
-                }
-            },
-            bids: [{
-                bidder: 'uol',
-                params: {
-                    placementId: 1231244,
-                    test: true,
-                    cpmFactor: 2
-                }
-            }
-            ]
-        },
-        {
-            code: '/19968336/header-bid-tag-1',
-            mediaTypes: {
-                banner: {
-                    sizes: [[970, 250],[728, 90]]
-                }
-            },
-            bids: [{
-                bidder: 'uol',
-                params: {
-                    placementId: 1231242,
-                    test: false
-                }
-            }]
-        }
-    ];
-```
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 1261e2ea7d9..bae5071e4b2 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -1,10 +1,56 @@
-import * as utils from '../../src/utils.js';
+import { pick, isFn, isStr, isPlainObject, deepAccess } from '../../src/utils.js';
 
 // Each user-id sub-module is expected to mention respective config here
-const USER_IDS_CONFIG = {
+export const USER_IDS_CONFIG = {
 
   // key-name : {config}
 
+  // GrowthCode
+  'growthCodeId': {
+    getValue: function(data) {
+      return data.gc_id
+    },
+    source: 'growthcode.io',
+    atype: 1,
+    getUidExt: function(data) {
+      const extendedData = pick(data, [
+        'h1',
+        'h2',
+        'h3',
+      ]);
+      if (Object.keys(extendedData).length) {
+        return extendedData;
+      }
+    }
+  },
+
+  // trustpid
+  'trustpid': {
+    source: 'trustpid.com',
+    atype: 1,
+    getValue: function (data) {
+      return data;
+    },
+  },
+
+  // intentIqId
+  'intentIqId': {
+    source: 'intentiq.com',
+    atype: 1
+  },
+
+  // naveggId
+  'naveggId': {
+    source: 'navegg.com',
+    atype: 1
+  },
+
+  // justId
+  'justId': {
+    source: 'justtag.com',
+    atype: 1
+  },
+
   // pubCommonId
   'pubcid': {
     source: 'pubcid.org',
@@ -24,20 +70,64 @@ const USER_IDS_CONFIG = {
 
   // id5Id
   'id5id': {
+    getValue: function(data) {
+      return data.uid
+    },
     source: 'id5-sync.com',
-    atype: 1
+    atype: 1,
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+
+  // ftrack
+  'ftrackId': {
+    source: 'flashtalking.com',
+    atype: 1,
+    getValue: function(data) {
+      let value = '';
+      if (data && data.ext && data.ext.DeviceID) {
+        value = data.ext.DeviceID;
+      }
+      return value;
+    },
+    getUidExt: function(data) {
+      return data && data.ext;
+    }
   },
 
   // parrableId
-  'parrableid': {
+  'parrableId': {
     source: 'parrable.com',
-    atype: 1
+    atype: 1,
+    getValue: function(parrableId) {
+      if (parrableId.eid) {
+        return parrableId.eid;
+      }
+      if (parrableId.ccpaOptout) {
+        // If the EID was suppressed due to a non consenting ccpa optout then
+        // we still wish to provide this as a reason to the adapters
+        return '';
+      }
+      return null;
+    },
+    getUidExt: function(parrableId) {
+      const extendedData = pick(parrableId, [
+        'ibaOptout',
+        'ccpaOptout'
+      ]);
+      if (Object.keys(extendedData).length) {
+        return extendedData;
+      }
+    }
   },
 
   // identityLink
   'idl_env': {
     source: 'liveramp.com',
-    atype: 1
+    atype: 3
   },
 
   // liveIntentId
@@ -46,7 +136,7 @@ const USER_IDS_CONFIG = {
       return data.lipbid;
     },
     source: 'liveintent.com',
-    atype: 1,
+    atype: 3,
     getEidExt: function(data) {
       if (Array.isArray(data.segments) && data.segments.length) {
         return {
@@ -59,7 +149,13 @@ const USER_IDS_CONFIG = {
   // britepoolId
   'britepoolid': {
     source: 'britepool.com',
-    atype: 1
+    atype: 3
+  },
+
+  // dmdId
+  'dmdId': {
+    source: 'hcn.health',
+    atype: 3
   },
 
   // lotamePanoramaId
@@ -68,41 +164,216 @@ const USER_IDS_CONFIG = {
     atype: 1,
   },
 
-  // DigiTrust
-  'digitrustid': {
-    getValue: function (data) {
-      var id = null;
-      if (data && data.data && data.data.id != null) {
-        id = data.data.id;
-      }
-      return id;
-    },
-    source: 'digitru.st',
-    atype: 1
-  },
-
   // criteo
   'criteoId': {
     source: 'criteo.com',
     atype: 1
   },
 
+  // merkleId
+  'merkleId': {
+    atype: 3,
+    getSource: function(data) {
+      if (data?.ext?.ssp) {
+        return `${data.ext.ssp}.merkleinc.com`
+      }
+      return 'merkleinc.com'
+    },
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      if (data.keyID) {
+        return {
+          keyID: data.keyID
+        }
+      }
+      if (data.ext) {
+        return data.ext;
+      }
+    }
+  },
+
   // NetId
   'netId': {
     source: 'netid.de',
     atype: 1
   },
-  // sharedid
-  'sharedid': {
-    source: 'sharedid.org',
-    atype: 1,
+
+  // zeotapIdPlus
+  'IDP': {
+    source: 'zeotap.com',
+    atype: 1
+  },
+
+  // hadronId
+  'hadronId': {
+    source: 'audigent.com',
+    atype: 1
+  },
+
+  // quantcastId
+  'quantcastId': {
+    source: 'quantcast.com',
+    atype: 1
+  },
+
+  // IDx
+  'idx': {
+    source: 'idx.lat',
+    atype: 1
+  },
+
+  // Verizon Media ConnectID
+  'connectid': {
+    source: 'verizonmedia.com',
+    atype: 3
+  },
+
+  // Neustar Fabrick
+  'fabrickId': {
+    source: 'neustar.biz',
+    atype: 1
+  },
+
+  // MediaWallah OpenLink
+  'mwOpenLinkId': {
+    source: 'mediawallahscript.com',
+    atype: 1
+  },
+
+  'tapadId': {
+    source: 'tapad.com',
+    atype: 1
+  },
+
+  // Novatiq Snowflake
+  'novatiq': {
+    getValue: function(data) {
+      return data.snowflake
+    },
+    source: 'novatiq.com',
+    atype: 1
+  },
+
+  'uid2': {
+    source: 'uidapi.com',
+    atype: 3,
     getValue: function(data) {
       return data.id;
+    }
+  },
+
+  'deepintentId': {
+    source: 'deepintent.com',
+    atype: 3
+  },
+
+  // Admixer Id
+  'admixerId': {
+    source: 'admixer.net',
+    atype: 3
+  },
+
+  // Adtelligent Id
+  'adtelligentId': {
+    source: 'adtelligent.com',
+    atype: 3
+  },
+
+  amxId: {
+    source: 'amxrtb.com',
+    atype: 1,
+  },
+
+  'publinkId': {
+    source: 'epsilon.com',
+    atype: 3
+  },
+
+  'kpuid': {
+    source: 'kpuid.com',
+    atype: 3
+  },
+
+  'imppid': {
+    source: 'ppid.intimatemerger.com',
+    atype: 1
+  },
+
+  'imuid': {
+    source: 'intimatemerger.com',
+    atype: 1
+  },
+
+  // Yahoo ConnectID
+  'connectId': {
+    source: 'yahoo.com',
+    atype: 3
+  },
+
+  // Adquery ID
+  'qid': {
+    source: 'adquery.io',
+    atype: 1
+  },
+
+  // DAC ID
+  'dacId': {
+    source: 'impact-ad.jp',
+    atype: 1
+  },
+
+  // 33across ID
+  '33acrossId': {
+    source: '33across.com',
+    atype: 1,
+    getValue: function(data) {
+      return data.envelope;
+    }
+  },
+
+  // tncId
+  'tncid': {
+    source: 'thenewco.it',
+    atype: 3
+  },
+
+  // Gravito MP ID
+  'gravitompId': {
+    source: 'gravito.net',
+    atype: 1
+  },
+
+  // cpexId
+  'cpexId': {
+    source: 'czechadid.cz',
+    atype: 1
+  },
+
+  // OneKey Data
+  'oneKeyData': {
+    getValue: function(data) {
+      if (data && Array.isArray(data.identifiers) && data.identifiers[0]) {
+        return data.identifiers[0].value;
+      }
+    },
+    source: 'paf',
+    atype: 1,
+    getEidExt: function(data) {
+      if (data && data.preferences) {
+        return {preferences: data.preferences};
+      }
     },
     getUidExt: function(data) {
-      return (data && data.third) ? {
-        third: data.third
-      } : undefined;
+      if (data && Array.isArray(data.identifiers) && data.identifiers[0]) {
+        const id = data.identifiers[0];
+        return {
+          version: id.version,
+          type: id.type,
+          source: id.source
+        };
+      }
     }
   }
 };
@@ -112,12 +383,12 @@ function createEidObject(userIdData, subModuleKey) {
   const conf = USER_IDS_CONFIG[subModuleKey];
   if (conf && userIdData) {
     let eid = {};
-    eid.source = conf['source'];
-    const value = utils.isFn(conf['getValue']) ? conf['getValue'](userIdData) : userIdData;
-    if (utils.isStr(value)) {
+    eid.source = isFn(conf['getSource']) ? conf['getSource'](userIdData) : conf['source'];
+    const value = isFn(conf['getValue']) ? conf['getValue'](userIdData) : userIdData;
+    if (isStr(value)) {
       const uid = { id: value, atype: conf['atype'] };
       // getUidExt
-      if (utils.isFn(conf['getUidExt'])) {
+      if (isFn(conf['getUidExt'])) {
         const uidExt = conf['getUidExt'](userIdData);
         if (uidExt) {
           uid.ext = uidExt;
@@ -125,7 +396,7 @@ function createEidObject(userIdData, subModuleKey) {
       }
       eid.uids = [uid];
       // getEidExt
-      if (utils.isFn(conf['getEidExt'])) {
+      if (isFn(conf['getEidExt'])) {
         const eidExt = conf['getEidExt'](userIdData);
         if (eidExt) {
           eid.ext = eidExt;
@@ -142,13 +413,49 @@ function createEidObject(userIdData, subModuleKey) {
 // if any adapter does not want any particular userId to be passed then adapter can use Array.filter(e => e.source != 'tdid')
 export function createEidsArray(bidRequestUserId) {
   let eids = [];
+
   for (const subModuleKey in bidRequestUserId) {
     if (bidRequestUserId.hasOwnProperty(subModuleKey)) {
-      const eid = createEidObject(bidRequestUserId[subModuleKey], subModuleKey);
-      if (eid) {
-        eids.push(eid);
+      if (subModuleKey === 'pubProvidedId') {
+        eids = eids.concat(bidRequestUserId['pubProvidedId']);
+      } else if (Array.isArray(bidRequestUserId[subModuleKey])) {
+        bidRequestUserId[subModuleKey].forEach((config, index, arr) => {
+          const eid = createEidObject(config, subModuleKey);
+
+          if (eid) {
+            eids.push(eid);
+          }
+        })
+      } else {
+        const eid = createEidObject(bidRequestUserId[subModuleKey], subModuleKey);
+        if (eid) {
+          eids.push(eid);
+        }
       }
     }
   }
+
   return eids;
 }
+
+/**
+ * @param {SubmoduleContainer[]} submodules
+ */
+export function buildEidPermissions(submodules) {
+  let eidPermissions = [];
+  submodules.filter(i => isPlainObject(i.idObj) && Object.keys(i.idObj).length)
+    .forEach(i => {
+      Object.keys(i.idObj).forEach(key => {
+        if (deepAccess(i, 'config.bidders') && Array.isArray(i.config.bidders) &&
+          deepAccess(USER_IDS_CONFIG, key + '.source')) {
+          eidPermissions.push(
+            {
+              source: USER_IDS_CONFIG[key].source,
+              bidders: i.config.bidders
+            }
+          );
+        }
+      });
+    });
+  return eidPermissions;
+}
diff --git a/modules/userId/eids.md b/modules/userId/eids.md
index 60f450e9328..83414cbe295 100644
--- a/modules/userId/eids.md
+++ b/modules/userId/eids.md
@@ -1,7 +1,23 @@
 ## Example of eids array generated by UserId Module.
+
 ```
 userIdAsEids = [
-	{
+    {
+        source: '33across.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'trustpid.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+
+    {
         source: 'pubcid.org',
         uids: [{
             id: 'some-random-id-value',
@@ -21,13 +37,48 @@ userIdAsEids = [
     },
 
     {
-        source: 'id5-sync.com',
+        source: 'navegg.com',
+        uids: [{
+            id: 'naveggId',
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'justtag.com',
+        uids: [{
+            id: 'justId',
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'neustar.biz',
         uids: [{
             id: 'some-random-id-value',
             atype: 1
         }]
     },
 
+    {
+        source: 'id5-sync.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1,
+            ext: {
+                linkType: 2,
+                abTestingControlGroup: false
+            }
+        }]
+    },
+
+    {
+        source: 'flashtalking.com',
+        uids: [{
+            id: 'the-ids-object-stringified',
+            atype: 1
+    },
+
     {
         source: 'parrable.com',
         uids: [{
@@ -56,7 +107,7 @@ userIdAsEids = [
     },
 
     {
-        source: 'britepool.com',
+        source: 'merkleinc.com',
         uids: [{
             id: 'some-random-id-value',
             atype: 1
@@ -64,13 +115,21 @@ userIdAsEids = [
     },
 
     {
-        source: 'digitru.st',
+        source: 'britepool.com',
         uids: [{
             id: 'some-random-id-value',
             atype: 1
         }]
     },
 
+    {
+        source: 'hcn.health',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3
+        }]
+    },
+
     {
         source: 'criteo.com',
         uids: [{
@@ -86,15 +145,100 @@ userIdAsEids = [
             atype: 1
         }]
     },
+
     {
-        source: 'sharedid.org',
+        source: 'zeotap.com',
         uids: [{
             id: 'some-random-id-value',
-            atype: 1,
-            ext: { 
-                third: 'some-random-id-value'
-             }
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'audigent.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'quantcast.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'verizonmedia.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'mediawallahscript.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'tapad.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'novatiq.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'uidapi.com',
+        uids: [{
+            id: 'some-random-id-value',
+             atype: 3
+        }]
+    },
+    {
+        source: 'admixer.net',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3
+        }]
+    },
+    {
+        source: 'deepintent.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3
+        }]
+    },
+    {
+         source: 'kpuid.com',
+         uids: [{
+              id: 'some-random-id-value',
+              atype: 3
+         }]
+    },
+    {
+         source: 'yahoo.com',
+         uids: [{
+              id: 'some-random-id-value',
+              atype: 3
          }]
+    },
+    {
+        source: 'thenewco.it',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3
+        }]
     }
 ]
 ```
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 1c5768edae1..82ebaf2b14e 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -14,7 +14,7 @@
  *  If IdResponse#callback is defined, then it'll called at the end of auction.
  *  It's permissible to return neither, one, or both fields.
  * @name Submodule#getId
- * @param {SubmoduleParams} configParams
+ * @param {SubmoduleConfig} config
  * @param {ConsentData|undefined} consentData
  * @param {(Object|undefined)} cacheIdObj
  * @return {(IdResponse|undefined)} A response object that contains id and/or callback.
@@ -27,7 +27,8 @@
  *  If IdResponse#callback is defined, then it'll called at the end of auction.
  *  It's permissible to return neither, one, or both fields.
  * @name Submodule#extendId
- * @param {SubmoduleParams} configParams
+ * @param {SubmoduleConfig} config
+ * @param {ConsentData|undefined} consentData
  * @param {Object} storedId - existing id, if any
  * @return {(IdResponse|function(callback:function))} A response object that contains id and/or callback.
  */
@@ -37,7 +38,7 @@
  * @summary decode a stored value for passing to bid requests
  * @name Submodule#decode
  * @param {Object|string} value
- * @param {SubmoduleParams|undefined} configParams
+ * @param {SubmoduleConfig|undefined} config
  * @return {(Object|undefined)}
  */
 
@@ -48,6 +49,20 @@
  * @type {string}
  */
 
+/**
+ * @property
+ * @summary use a predefined domain override for cookies or provide your own
+ * @name Submodule#domainOverride
+ * @type {(undefined|function)}
+ */
+
+/**
+ * @function
+ * @summary Returns the root domain
+ * @name Submodule#findRootDomain
+ * @returns {string}
+ */
+
 /**
  * @typedef {Object} SubmoduleConfig
  * @property {string} name - the User ID submodule name (used to link submodule with config)
@@ -83,8 +98,10 @@
  * @property {(string|undefined)} publisherId - the unique identifier of the publisher in question
  * @property {(string|undefined)} ajaxTimeout - the number of milliseconds a resolution request can take before automatically being terminated
  * @property {(array|undefined)} identifiersToResolve - the identifiers from either ls|cookie to be attached to the getId query
- * @property {(string|undefined)} providedIdentifierName - defines the name of an identifier that can be found in local storage or in the cookie jar that can be sent along with the getId request. This parameter should be used whenever a customer is able to provide the most stable identifier possible
  * @property {(LiveIntentCollectConfig|undefined)} liCollectConfig - the config for LiveIntent's collect requests
+ * @property {(string|undefined)} pd - publisher provided data for reconciling ID5 IDs
+ * @property {(string|undefined)} emailHash - if provided, the hashed email address of a user
+ * @property {(string|undefined)} notUse3P - use to retrieve envelope from 3p endpoint
  */
 
 /**
@@ -108,27 +125,50 @@
  * @property {(function|undefined)} callback - function that will return an id
  */
 
-import find from 'core-js-pure/features/array/find.js';
+import {find, includes} from '../../src/polyfill.js';
 import {config} from '../../src/config.js';
-import events from '../../src/events.js';
-import * as utils from '../../src/utils.js';
+import * as events from '../../src/events.js';
 import {getGlobal} from '../../src/prebidGlobal.js';
-import {gdprDataHandler} from '../../src/adapterManager.js';
+import adapterManager, {gdprDataHandler} from '../../src/adapterManager.js';
 import CONSTANTS from '../../src/constants.json';
-import {module, hook} from '../../src/hook.js';
-import {createEidsArray} from './eids.js';
-import { getCoreStorageManager } from '../../src/storageManager.js';
+import {hook, module, ready as hooksReady} from '../../src/hook.js';
+import {buildEidPermissions, createEidsArray, USER_IDS_CONFIG} from './eids.js';
+import {getCoreStorageManager} from '../../src/storageManager.js';
+import {
+  cyrb53Hash,
+  deepAccess,
+  delayExecution,
+  getPrebidInternal,
+  isArray,
+  isEmptyStr,
+  isFn,
+  isGptPubadsDefined,
+  isNumber,
+  isPlainObject,
+  logError,
+  logInfo,
+  logWarn,
+  isEmpty, deepSetValue
+} from '../../src/utils.js';
+import {getPPID as coreGetPPID} from '../../src/adserver.js';
+import {defer, GreedyPromise} from '../../src/utils/promise.js';
+import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {registerOrtbProcessor, REQUEST} from '../../src/pbjsORTB.js';
+import {newMetrics, timedAuctionHook, useMetrics} from '../../src/utils/perfMetrics.js';
+import {findRootDomain} from '../../src/fpd/rootDomain.js';
 
 const MODULE_NAME = 'User ID';
 const COOKIE = 'cookie';
 const LOCAL_STORAGE = 'html5';
 const DEFAULT_SYNC_DELAY = 500;
 const NO_AUCTION_DELAY = 0;
+const CONSENT_DATA_COOKIE_STORAGE_CONFIG = {
+  name: '_pbjs_userid_consent_data',
+  expires: 30 // 30 days expiration, which should match how often consent is refreshed by CMPs
+};
+export const PBJS_USER_ID_OPTOUT_NAME = '_pbjs_id_optout';
 export const coreStorage = getCoreStorageManager('userid');
 
-/** @type {string[]} */
-let validStorageTypes = [];
-
 /** @type {boolean} */
 let addedUserIdHook = false;
 
@@ -153,23 +193,56 @@ export let syncDelay;
 /** @type {(number|undefined)} */
 export let auctionDelay;
 
+/** @type {(string|undefined)} */
+let ppidSource;
+
+let configListener;
+
+const uidMetrics = (() => {
+  let metrics;
+  return () => {
+    if (metrics == null) {
+      metrics = newMetrics();
+    }
+    return metrics;
+  }
+})();
+
+function submoduleMetrics(moduleName) {
+  return uidMetrics().fork().renameWith(n => [`userId.mod.${n}`, `userId.mods.${moduleName}.${n}`])
+}
+
 /** @param {Submodule[]} submodules */
 export function setSubmoduleRegistry(submodules) {
   submoduleRegistry = submodules;
 }
 
+function cookieSetter(submodule) {
+  const domainOverride = (typeof submodule.submodule.domainOverride === 'function') ? submodule.submodule.domainOverride() : null;
+  const name = submodule.config.storage.name;
+  return function setCookie(suffix, value, expiration) {
+    coreStorage.setCookie(name + (suffix || ''), value, expiration, 'Lax', domainOverride);
+  }
+}
+
 /**
- * @param {SubmoduleStorage} storage
+ * @param {SubmoduleContainer} submodule
  * @param {(Object|string)} value
  */
-function setStoredValue(storage, value) {
+export function setStoredValue(submodule, value) {
+  /**
+   * @type {SubmoduleStorage}
+   */
+  const storage = submodule.config.storage;
+
   try {
-    const valueStr = utils.isPlainObject(value) ? JSON.stringify(value) : value;
     const expiresStr = (new Date(Date.now() + (storage.expires * (60 * 60 * 24 * 1000)))).toUTCString();
+    const valueStr = isPlainObject(value) ? JSON.stringify(value) : value;
     if (storage.type === COOKIE) {
-      coreStorage.setCookie(storage.name, valueStr, expiresStr, 'Lax');
+      const setCookie = cookieSetter(submodule);
+      setCookie(null, valueStr, expiresStr);
       if (typeof storage.refreshInSeconds === 'number') {
-        coreStorage.setCookie(`${storage.name}_last`, new Date().toUTCString(), expiresStr);
+        setCookie('_last', new Date().toUTCString(), expiresStr);
       }
     } else if (storage.type === LOCAL_STORAGE) {
       coreStorage.setDataInLocalStorage(`${storage.name}_exp`, expiresStr);
@@ -179,10 +252,43 @@ function setStoredValue(storage, value) {
       }
     }
   } catch (error) {
-    utils.logError(error);
+    logError(error);
+  }
+}
+
+export function deleteStoredValue(submodule) {
+  let deleter, suffixes;
+  switch (submodule.config?.storage?.type) {
+    case COOKIE:
+      const setCookie = cookieSetter(submodule);
+      const expiry = (new Date(Date.now() - 1000 * 60 * 60 * 24)).toUTCString();
+      deleter = (suffix) => setCookie(suffix, '', expiry)
+      suffixes = ['', '_last'];
+      break;
+    case LOCAL_STORAGE:
+      deleter = (suffix) => coreStorage.removeDataFromLocalStorage(submodule.config.storage.name + suffix)
+      suffixes = ['', '_last', '_exp'];
+      break;
+  }
+  if (deleter) {
+    suffixes.forEach(suffix => {
+      try {
+        deleter(suffix)
+      } catch (e) {
+        logError(e);
+      }
+    });
   }
 }
 
+function setPrebidServerEidPermissions(initializedSubmodules) {
+  let setEidPermissions = getPrebidInternal().setEidPermissions;
+  if (typeof setEidPermissions === 'function' && isArray(initializedSubmodules)) {
+    setEidPermissions(buildEidPermissions(initializedSubmodules));
+  }
+}
+
+/**
 /**
  * @param {SubmoduleStorage} storage
  * @param {String|undefined} key optional key of the value
@@ -206,33 +312,77 @@ function getStoredValue(storage, key = undefined) {
       }
     }
     // support storing a string or a stringified object
-    if (typeof storedValue === 'string' && storedValue.charAt(0) === '{') {
+    if (typeof storedValue === 'string' && storedValue.trim().charAt(0) === '{') {
       storedValue = JSON.parse(storedValue);
     }
   } catch (e) {
-    utils.logError(e);
+    logError(e);
   }
   return storedValue;
 }
 
 /**
- * test if consent module is present, applies, and is valid for local storage or cookies (purpose 1)
- * @param {ConsentData} consentData
- * @returns {boolean}
+ * makes an object that can be stored with only the keys we need to check.
+ * excluding the vendorConsents object since the consentString is enough to know
+ * if consent has changed without needing to have all the details in an object
+ * @param consentData
+ * @returns {{apiVersion: number, gdprApplies: boolean, consentString: string}}
  */
-function hasGDPRConsent(consentData) {
-  if (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) {
-    if (!consentData.consentString) {
-      return false;
-    }
-    if (consentData.apiVersion === 1 && utils.deepAccess(consentData, 'vendorData.purposeConsents.1') === false) {
-      return false;
-    }
-    if (consentData.apiVersion === 2 && utils.deepAccess(consentData, 'vendorData.purpose.consents.1') === false) {
-      return false;
-    }
+function makeStoredConsentDataHash(consentData) {
+  const storedConsentData = {
+    consentString: '',
+    gdprApplies: false,
+    apiVersion: 0
+  };
+
+  if (consentData) {
+    storedConsentData.consentString = consentData.consentString;
+    storedConsentData.gdprApplies = consentData.gdprApplies;
+    storedConsentData.apiVersion = consentData.apiVersion;
+  }
+
+  return cyrb53Hash(JSON.stringify(storedConsentData));
+}
+
+/**
+ * puts the current consent data into cookie storage
+ * @param consentData
+ */
+export function setStoredConsentData(consentData) {
+  try {
+    const expiresStr = (new Date(Date.now() + (CONSENT_DATA_COOKIE_STORAGE_CONFIG.expires * (60 * 60 * 24 * 1000)))).toUTCString();
+    coreStorage.setCookie(CONSENT_DATA_COOKIE_STORAGE_CONFIG.name, makeStoredConsentDataHash(consentData), expiresStr, 'Lax');
+  } catch (error) {
+    logError(error);
+  }
+}
+
+/**
+ * get the stored consent data from local storage, if any
+ * @returns {string}
+ */
+function getStoredConsentData() {
+  try {
+    return coreStorage.getCookie(CONSENT_DATA_COOKIE_STORAGE_CONFIG.name);
+  } catch (e) {
+    logError(e);
   }
-  return true;
+}
+
+/**
+ * test if the consent object stored locally matches the current consent data. if they
+ * don't match or there is nothing stored locally, it means a refresh of the user id
+ * submodule is needed
+ * @param storedConsentData
+ * @param consentData
+ * @returns {boolean}
+ */
+function storedConsentDataMatchesConsentData(storedConsentData, consentData) {
+  return (
+    typeof storedConsentData !== 'undefined' &&
+    storedConsentData !== null &&
+    storedConsentData === makeStoredConsentDataHash(consentData)
+  );
 }
 
 /**
@@ -240,26 +390,36 @@ function hasGDPRConsent(consentData) {
  * @param {function} cb - callback for after processing is done.
  */
 function processSubmoduleCallbacks(submodules, cb) {
-  const done = cb ? utils.delayExecution(cb, submodules.length) : function() { };
-  submodules.forEach(function(submodule) {
-    submodule.callback(function callbackCompleted(idObj) {
+  cb = uidMetrics().fork().startTiming('userId.callbacks.total').stopBefore(cb);
+  const done = delayExecution(() => {
+    clearTimeout(timeoutID);
+    cb();
+  }, submodules.length);
+  submodules.forEach(function (submodule) {
+    const moduleDone = submoduleMetrics(submodule.submodule.name).startTiming('callback').stopBefore(done);
+    function callbackCompleted(idObj) {
       // if valid, id data should be saved to cookie/html storage
       if (idObj) {
         if (submodule.config.storage) {
-          setStoredValue(submodule.config.storage, idObj);
+          setStoredValue(submodule, idObj);
         }
         // cache decoded value (this is copied to every adUnit bid)
-        submodule.idObj = submodule.submodule.decode(idObj);
+        submodule.idObj = submodule.submodule.decode(idObj, submodule.config);
+        updatePPID(submodule.idObj);
       } else {
-        utils.logInfo(`${MODULE_NAME}: ${submodule.submodule.name} - request id responded with an empty value`);
+        logInfo(`${MODULE_NAME}: ${submodule.submodule.name} - request id responded with an empty value`);
       }
-      done();
-    });
-
+      moduleDone();
+    }
+    try {
+      submodule.callback(callbackCompleted);
+    } catch (e) {
+      logError(`Error in userID module '${submodule.submodule.name}':`, e);
+      moduleDone();
+    }
     // clear callback, this prop is used to test if all submodule callbacks are complete below
     submodule.callback = undefined;
   });
-  clearTimeout(timeoutID);
 }
 
 /**
@@ -270,7 +430,7 @@ function getCombinedSubmoduleIds(submodules) {
   if (!Array.isArray(submodules) || !submodules.length) {
     return {};
   }
-  const combinedSubmoduleIds = submodules.filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length).reduce((carry, i) => {
+  const combinedSubmoduleIds = submodules.filter(i => isPlainObject(i.idObj) && Object.keys(i.idObj).length).reduce((carry, i) => {
     Object.keys(i.idObj).forEach(key => {
       carry[key] = i.idObj[key];
     });
@@ -280,6 +440,40 @@ function getCombinedSubmoduleIds(submodules) {
   return combinedSubmoduleIds;
 }
 
+/**
+ * This function will return a submodule ID object for particular source name
+ * @param {SubmoduleContainer[]} submodules
+ * @param {string} sourceName
+ */
+function getSubmoduleId(submodules, sourceName) {
+  if (!Array.isArray(submodules) || !submodules.length) {
+    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 : [];
+}
+
+/**
+ * This function will create a combined object for bidder with allowed subModule Ids
+ * @param {SubmoduleContainer[]} submodules
+ * @param {string} bidder
+ */
+function getCombinedSubmoduleIdsForBidder(submodules, bidder) {
+  if (!Array.isArray(submodules) || !submodules.length || !bidder) {
+    return {};
+  }
+  return submodules
+    .filter(i => !i.config.bidders || !isArray(i.config.bidders) || includes(i.config.bidders, bidder))
+    .filter(i => isPlainObject(i.idObj) && Object.keys(i.idObj).length)
+    .reduce((carry, i) => {
+      Object.keys(i.idObj).forEach(key => {
+        carry[key] = i.idObj[key];
+      });
+      return carry;
+    }, {});
+}
+
 /**
  * @param {AdUnit[]} adUnits
  * @param {SubmoduleContainer[]} submodules
@@ -288,68 +482,128 @@ function addIdDataToAdUnitBids(adUnits, submodules) {
   if ([adUnits].some(i => !Array.isArray(i) || !i.length)) {
     return;
   }
-  const combinedSubmoduleIds = getCombinedSubmoduleIds(submodules);
-  const combinedSubmoduleIdsAsEids = createEidsArray(combinedSubmoduleIds);
-  if (Object.keys(combinedSubmoduleIds).length) {
-    adUnits.forEach(adUnit => {
+  adUnits.forEach(adUnit => {
+    if (adUnit.bids && isArray(adUnit.bids)) {
       adUnit.bids.forEach(bid => {
-        // create a User ID object on the bid,
-        bid.userId = combinedSubmoduleIds;
-        bid.userIdAsEids = combinedSubmoduleIdsAsEids;
+        const combinedSubmoduleIds = getCombinedSubmoduleIdsForBidder(submodules, bid.bidder);
+        if (Object.keys(combinedSubmoduleIds).length) {
+          // create a User ID object on the bid,
+          bid.userId = combinedSubmoduleIds;
+          bid.userIdAsEids = createEidsArray(combinedSubmoduleIds);
+        }
       });
-    });
-  }
+    }
+  });
 }
 
-/**
- * This is a common function that will initalize subModules if not already done and it will also execute subModule callbacks
- */
-function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
-  let delayed = false;
+const INIT_CANCELED = {};
 
-  // initialize submodules only when undefined
-  if (typeof initializedSubmodules === 'undefined') {
-    initializedSubmodules = initSubmodules(submodules, gdprDataHandler.getConsentData());
-    if (initializedSubmodules.length) {
-      // list of submodules that have callbacks that need to be executed
-      const submodulesWithCallbacks = initializedSubmodules.filter(item => utils.isFn(item.callback));
+function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
+  const startInit = defer();
+  const startCallbacks = defer();
+  let cancel;
+  let initialized = false;
+  let initMetrics;
 
-      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();
-            }
-          }
-          utils.logInfo(`${MODULE_NAME} - auction delayed by ${auctionDelay} at most to fetch ids`);
-
-          timeoutID = setTimeout(continueCallback, auctionDelay);
-          processSubmoduleCallbacks(submodulesWithCallbacks, continueCallback);
-        } 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);
-            }
-          });
-        }
+  function cancelAndTry(promise) {
+    initMetrics = uidMetrics().fork();
+    if (cancel != null) {
+      cancel.reject(INIT_CANCELED);
+    }
+    cancel = defer();
+    return GreedyPromise.race([promise, cancel.promise])
+      .finally(initMetrics.startTiming('userId.total'))
+  }
+
+  // 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);
       }
     }
   }
 
-  if (continueAuction && !delayed) {
-    continueAuction();
+  function timeGdpr() {
+    return gdprDataHandler.promise.finally(initMetrics.startTiming('userId.init.gdpr'));
+  }
+
+  let done = cancelAndTry(
+    GreedyPromise.all([hooksReady, startInit.promise])
+      .then(timeGdpr)
+      .then(checkRefs((consentData) => {
+        initSubmodules(initModules, allModules, consentData);
+      }))
+      .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
+      .then(checkRefs(() => {
+        const modWithCb = initModules.filter(item => isFn(item.callback));
+        if (modWithCb.length) {
+          return new GreedyPromise((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 && initialized) {
+      done = cancelAndTry(
+        done
+          .catch(() => null)
+          .then(timeGdpr) // 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 GreedyPromise((resolve) => processSubmoduleCallbacks(cbModules, resolve));
+            }
+          }))
+      );
+    }
+    return done;
+  };
+}
+
+let initIdSystem;
+
+function getPPID(eids = getUserIdsAsEids() || []) {
+  // userSync.ppid should be one of the 'source' values in getUserIdsAsEids() eg pubcid.org or id5-sync.com
+  const matchingUserId = ppidSource && eids.find(userID => userID.source === ppidSource);
+  if (matchingUserId && typeof deepAccess(matchingUserId, 'uids.0.id') === 'string') {
+    const ppidValue = matchingUserId.uids[0].id.replace(/[\W_]/g, '');
+    if (ppidValue.length >= 32 && ppidValue.length <= 150) {
+      return ppidValue;
+    } else {
+      logWarn(`User ID - Googletag Publisher Provided ID for ${ppidSource} is not between 32 and 150 characters - ${ppidValue}`);
+    }
   }
 }
 
@@ -362,24 +616,25 @@ 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 const requestBidsHook = timedAuctionHook('userId', function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout, getIds = getUserIdsAsync} = {}) {
+  GreedyPromise.race([
+    getIds().catch(() => null),
+    delay(auctionDelay)
+  ]).then(() => {
     // pass available user id data to bid adapters
     addIdDataToAdUnitBids(reqBidsConfigObj.adUnits || getGlobal().adUnits, initializedSubmodules);
+    uidMetrics().join(useMetrics(reqBidsConfigObj.metrics), {propagate: false, includeGroups: true});
     // calling fn allows prebid to continue processing
     fn.call(this, reqBidsConfigObj);
   });
-}
+});
 
 /**
  * This function will be exposed in global-name-space so that userIds stored by Prebid UserId module can be used by external codes as well.
  * 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)
 }
 
 /**
@@ -387,83 +642,263 @@ 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())
 }
 
 /**
- * This hook returns updated list of submodules which are allowed to do get user id based on TCF 2 enforcement rules configured
+ * This function will be exposed in global-name-space so that userIds stored by Prebid UserId module can be used by external codes as well.
+ * Simple use case will be passing these UserIds to A9 wrapper solution
  */
-export const validateGdprEnforcement = hook('sync', function (submodules, consentData) {
-  return {userIdModules: submodules, hasValidated: consentData && consentData.hasValidated};
-}, 'validateGdprEnforcement');
+
+function getUserIdsAsEidBySource(sourceName) {
+  return createEidsArray(getSubmoduleId(initializedSubmodules, sourceName))[0];
+}
 
 /**
- * @param {SubmoduleContainer[]} submodules
- * @param {ConsentData} consentData
- * @returns {SubmoduleContainer[]} initialized submodules
- */
-function initSubmodules(submodules, consentData) {
-  // gdpr consent with purpose one is required, otherwise exit immediately
-  let {userIdModules, hasValidated} = validateGdprEnforcement(submodules, consentData);
-  if (!hasValidated && !hasGDPRConsent(consentData)) {
-    utils.logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
-    return [];
+ * 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) {
+  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
+      }
+    }
+    logInfo(`${MODULE_NAME} - Fetching encrypted eids: ${eidsSignals[source]}`);
+    return eidsSignals[source];
+  })
+}
+
+function encryptSignals(signals, version = 1) {
+  let encryptedSig = '';
+  switch (version) {
+    case 1: // Base64 Encryption
+      encryptedSig = typeof signals === 'object' ? window.btoa(JSON.stringify(signals)) : window.btoa(signals); // Test encryption. To be replaced with better algo
+      break;
+    default:
+      break;
   }
+  return `${version}||${encryptedSig}`;
+}
 
-  return userIdModules.reduce((carry, submodule) => {
-    // There are two submodule configuration types to handle: storage or value
-    // 1. storage: retrieve user id data from cookie/html storage or with the submodule's getId method
-    // 2. value: pass directly to bids
-    if (submodule.config.storage) {
-      let storedId = getStoredValue(submodule.config.storage);
-      let response;
+/**
+* This function will be exposed in the global-name-space so that publisher can register the signals-ESP.
+*/
+function registerSignalSources() {
+  if (!isGptPubadsDefined()) {
+    return;
+  }
+  window.googletag.encryptedSignalProviders = window.googletag.encryptedSignalProviders || [];
+  const encryptedSignalSources = config.getConfig('userSync.encryptedSignalSources');
+  if (encryptedSignalSources) {
+    const registerDelay = encryptedSignalSources.registerDelay || 0;
+    setTimeout(() => {
+      encryptedSignalSources['sources'] && encryptedSignalSources['sources'].forEach(({ source, encrypt, customFunc }) => {
+        source.forEach((src) => {
+          window.googletag.encryptedSignalProviders.push({
+            id: src,
+            collectorFunction: () => getEncryptedEidsForSource(src, encrypt, customFunc)
+          });
+        });
+      })
+    }, registerDelay)
+  } else {
+    logWarn(`${MODULE_NAME} - ESP : encryptedSignalSources config not defined under userSync Object`);
+  }
+}
 
-      let refreshNeeded = false;
-      if (typeof submodule.config.storage.refreshInSeconds === 'number') {
-        const storedDate = new Date(getStoredValue(submodule.config.storage, 'last'));
-        refreshNeeded = storedDate && (Date.now() - storedDate.getTime() > submodule.config.storage.refreshInSeconds * 1000);
+/**
+ * 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();
       }
+      return getUserIds();
+    });
+}
 
-      if (!storedId || refreshNeeded) {
-        // No previously saved id.  Request one from submodule.
-        response = submodule.submodule.getId(submodule.config.params, consentData, storedId);
-      } else if (typeof submodule.submodule.extendId === 'function') {
-        // If the id exists already, give submodule a chance to decide additional actions that need to be taken
-        response = submodule.submodule.extendId(submodule.config.params, storedId);
+/**
+ * @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(),
+    (e) => {
+      if (e === INIT_CANCELED) {
+        // there's a pending refresh - because GreedyPromise runs this synchronously, we are now in the middle
+        // of canceling the previous init, before the refresh logic has had a chance to run.
+        // Use a "normal" Promise to clear the stack and let it complete (or this will just recurse infinitely)
+        return Promise.resolve().then(getUserIdsAsync)
+      } else {
+        logError('Error initializing userId', e)
+        return GreedyPromise.reject(e)
       }
+    }
+  );
+}
 
-      if (utils.isPlainObject(response)) {
-        if (response.id) {
-          // A getId/extendId result assumed to be valid user id data, which should be saved to users local storage or cookies
-          setStoredValue(submodule.config.storage, response.id);
-          storedId = response.id;
-        }
+/**
+ * This hook returns updated list of submodules which are allowed to do get user id based on TCF 2 enforcement rules configured
+ */
+export const validateGdprEnforcement = hook('sync', function (submodules, consentData) {
+  return { userIdModules: submodules, hasValidated: consentData && consentData.hasValidated };
+}, 'validateGdprEnforcement');
 
-        if (typeof response.callback === 'function') {
-          // Save async callback to be invoked after auction
-          submodule.callback = response.callback;
-        }
+function populateSubmoduleId(submodule, consentData, storedConsentData, forceRefresh) {
+  // There are two submodule configuration types to handle: storage or value
+  // 1. storage: retrieve user id data from cookie/html storage or with the submodule's getId method
+  // 2. value: pass directly to bids
+  if (submodule.config.storage) {
+    let storedId = getStoredValue(submodule.config.storage);
+    let response;
+
+    let refreshNeeded = false;
+    if (typeof submodule.config.storage.refreshInSeconds === 'number') {
+      const storedDate = new Date(getStoredValue(submodule.config.storage, 'last'));
+      refreshNeeded = storedDate && (Date.now() - storedDate.getTime() > submodule.config.storage.refreshInSeconds * 1000);
+    }
+
+    if (!storedId || refreshNeeded || forceRefresh || !storedConsentDataMatchesConsentData(storedConsentData, consentData)) {
+      // No id previously saved, or a refresh is needed, or consent has changed. Request a new id from the submodule.
+      response = submodule.submodule.getId(submodule.config, consentData, storedId);
+    } else if (typeof submodule.submodule.extendId === 'function') {
+      // If the id exists already, give submodule a chance to decide additional actions that need to be taken
+      response = submodule.submodule.extendId(submodule.config, consentData, storedId);
+    }
+
+    if (isPlainObject(response)) {
+      if (response.id) {
+        // A getId/extendId result assumed to be valid user id data, which should be saved to users local storage or cookies
+        setStoredValue(submodule, response.id);
+        storedId = response.id;
       }
 
-      if (storedId) {
-        // cache decoded value (this is copied to every adUnit bid)
-        submodule.idObj = submodule.submodule.decode(storedId, submodule.config.params);
+      if (typeof response.callback === 'function') {
+        // Save async callback to be invoked after auction
+        submodule.callback = response.callback;
       }
-    } else if (submodule.config.value) {
+    }
+
+    if (storedId) {
       // cache decoded value (this is copied to every adUnit bid)
-      submodule.idObj = submodule.config.value;
-    } else {
-      const response = submodule.submodule.getId(submodule.config.params, consentData, undefined);
-      if (utils.isPlainObject(response)) {
-        if (typeof response.callback === 'function') { submodule.callback = response.callback; }
-        if (response.id) { submodule.idObj = submodule.submodule.decode(response.id, submodule.config.params); }
+      submodule.idObj = submodule.submodule.decode(storedId, submodule.config);
+    }
+  } else if (submodule.config.value) {
+    // cache decoded value (this is copied to every adUnit bid)
+    submodule.idObj = submodule.config.value;
+  } else {
+    const response = submodule.submodule.getId(submodule.config, consentData, undefined);
+    if (isPlainObject(response)) {
+      if (typeof response.callback === 'function') { submodule.callback = response.callback; }
+      if (response.id) { submodule.idObj = submodule.submodule.decode(response.id, submodule.config); }
+    }
+  }
+  updatePPID(submodule.idObj);
+}
+
+function updatePPID(userIds = getUserIds()) {
+  if (userIds && ppidSource) {
+    const ppid = getPPID(createEidsArray(userIds));
+    if (ppid) {
+      if (isGptPubadsDefined()) {
+        window.googletag.pubads().setPublisherProvidedId(ppid);
+      } else {
+        window.googletag = window.googletag || {};
+        window.googletag.cmd = window.googletag.cmd || [];
+        window.googletag.cmd.push(function() {
+          window.googletag.pubads().setPublisherProvidedId(ppid);
+        });
       }
     }
-    carry.push(submodule);
-    return carry;
-  }, []);
+  }
+}
+
+function initSubmodules(dest, submodules, consentData, forceRefresh = false) {
+  return uidMetrics().fork().measureTime('userId.init.modules', function () {
+    if (!submodules.length) return []; // to simplify log messages from here on
+
+    // filter out submodules whose storage type is not enabled
+    // this needs to be done here (after consent data has loaded) so that enforcement may disable storage globally
+    const storageTypes = getActiveStorageTypes();
+    submodules = submodules.filter((submod) => !submod.config.storage || storageTypes.has(submod.config.storage.type));
+
+    if (!submodules.length) {
+      logWarn(`${MODULE_NAME} - no ID module is configured for one of the available storage types:`, Array.from(storageTypes));
+      return [];
+    }
+
+    // another consent check, this time each module is checked for consent with its own gvlid
+    let { userIdModules, hasValidated } = validateGdprEnforcement(submodules, consentData);
+    if (!hasValidated && !hasPurpose1Consent(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);
+
+    const initialized = userIdModules.reduce((carry, submodule) => {
+      return submoduleMetrics(submodule.submodule.name).measureTime('init', () => {
+        try {
+          populateSubmoduleId(submodule, consentData, storedConsentData, forceRefresh);
+          carry.push(submodule);
+        } catch (e) {
+          logError(`Error in userID module '${submodule.submodule.name}':`, e);
+        }
+        return carry;
+      })
+    }, []);
+    if (initialized.length) {
+      setPrebidServerEidPermissions(initialized);
+    }
+    initialized.forEach(updateInitializedSubmodules.bind(null, dest));
+    return initialized;
+  })
+}
+
+function updateInitializedSubmodules(dest, submodule) {
+  let updated = false;
+  for (let i = 0; i < dest.length; i++) {
+    if (submodule.config.name.toLowerCase() === dest[i].config.name.toLowerCase()) {
+      updated = true;
+      dest[i] = submodule;
+      break;
+    }
+  }
+
+  if (!updated) {
+    dest.push(submodule);
+  }
 }
 
 /**
@@ -475,23 +910,23 @@ function initSubmodules(submodules, consentData) {
  * @param {string[]} activeStorageTypes
  * @returns {SubmoduleConfig[]}
  */
-function getValidSubmoduleConfigs(configRegistry, submoduleRegistry, activeStorageTypes) {
+function getValidSubmoduleConfigs(configRegistry, submoduleRegistry) {
   if (!Array.isArray(configRegistry)) {
     return [];
   }
   return configRegistry.reduce((carry, config) => {
     // every submodule config obj must contain a valid 'name'
-    if (!config || utils.isEmptyStr(config.name)) {
+    if (!config || isEmptyStr(config.name)) {
       return carry;
     }
     // Validate storage config contains 'type' and 'name' properties with non-empty string values
-    // 'type' must be a value currently enabled in the browser
+    // 'type' must be one of html5, cookies
     if (config.storage &&
-      !utils.isEmptyStr(config.storage.type) &&
-      !utils.isEmptyStr(config.storage.name) &&
-      activeStorageTypes.indexOf(config.storage.type) !== -1) {
+      !isEmptyStr(config.storage.type) &&
+      !isEmptyStr(config.storage.name) &&
+      ALL_STORAGE_TYPES.has(config.storage.type)) {
       carry.push(config);
-    } else if (utils.isPlainObject(config.value)) {
+    } else if (isPlainObject(config.value)) {
       carry.push(config);
     } else if (!config.storage && !config.value) {
       carry.push(config);
@@ -500,36 +935,82 @@ function getValidSubmoduleConfigs(configRegistry, submoduleRegistry, activeStora
   }, []);
 }
 
+const ALL_STORAGE_TYPES = new Set([LOCAL_STORAGE, COOKIE]);
+
+function getActiveStorageTypes() {
+  const storageTypes = [];
+  let disabled = false;
+  if (coreStorage.localStorageIsEnabled()) {
+    storageTypes.push(LOCAL_STORAGE);
+    if (coreStorage.getDataFromLocalStorage(PBJS_USER_ID_OPTOUT_NAME)) {
+      logInfo(`${MODULE_NAME} - opt-out localStorage found, storage disabled`);
+      disabled = true;
+    }
+  }
+  if (coreStorage.cookiesAreEnabled()) {
+    storageTypes.push(COOKIE);
+    if (coreStorage.getCookie(PBJS_USER_ID_OPTOUT_NAME)) {
+      logInfo(`${MODULE_NAME} - opt-out cookie found, storage disabled`);
+      disabled = true;
+    }
+  }
+  return new Set(disabled ? [] : storageTypes)
+}
+
 /**
  * update submodules by validating against existing configs and storage types
  */
 function updateSubmodules() {
-  const configs = getValidSubmoduleConfigs(configRegistry, submoduleRegistry, validStorageTypes);
+  const configs = getValidSubmoduleConfigs(configRegistry, submoduleRegistry);
   if (!configs.length) {
     return;
   }
   // do this to avoid reprocessing submodules
+  // TODO: the logic does not match the comment - addedSubmodules is always a copy of submoduleRegistry
+  // (if it did it would not be correct - it's not enough to find new modules, as others may have been removed or changed)
   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 => {
-    const submoduleConfig = find(configs, j => j.name === i.name);
+  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;
+    i.findRootDomain = findRootDomain;
     return submoduleConfig ? {
       submodule: i,
       config: submoduleConfig,
       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
     getGlobal().requestBids.before(requestBidsHook, 40);
-    utils.logInfo(`${MODULE_NAME} - usersync config updated for ${submodules.length} submodules`);
+    adapterManager.callDataDeletionRequest.before(requestDataDeletion);
+    coreGetPPID.after((next) => next(getPPID()));
+    logInfo(`${MODULE_NAME} - usersync config updated for ${submodules.length} submodules: `, submodules.map(a => a.submodule.name));
     addedUserIdHook = true;
   }
 }
 
+export function requestDataDeletion(next, ...args) {
+  logInfo('UserID: received data deletion request; deleting all stored IDs...')
+  submodules.forEach(submodule => {
+    if (typeof submodule.submodule.onDataDeletionRequest === 'function') {
+      try {
+        submodule.submodule.onDataDeletionRequest(submodule.config, submodule.idObj, ...args);
+      } catch (e) {
+        logError(`Error calling onDataDeletionRequest for ID submodule ${submodule.submodule.name}`, e);
+      }
+    }
+    deleteStoredValue(submodule);
+  })
+  next.apply(this, args);
+}
+
 /**
  * enable submodule in User ID
  * @param {Submodule} submodule
@@ -538,6 +1019,17 @@ export function attachIdSystem(submodule) {
   if (!find(submoduleRegistry, i => i.name === submodule.name)) {
     submoduleRegistry.push(submodule);
     updateSubmodules();
+    // TODO: a test case wants this to work even if called after init (the setConfig({userId}))
+    // so we trigger a refresh. But is that even possible outside of tests?
+    initIdSystem({refresh: true, submoduleNames: [submodule.name]});
+  }
+}
+
+function normalizePromise(fn) {
+  // for public methods that return promises, make sure we return a "normal" one - to avoid
+  // exposing confusing stack traces
+  return function() {
+    return Promise.resolve(fn.apply(this, arguments));
   }
 }
 
@@ -546,46 +1038,51 @@ 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 = GreedyPromise.timeout} = {}) {
+  ppidSource = undefined;
   submodules = [];
   configRegistry = [];
   addedUserIdHook = false;
-  initializedSubmodules = undefined;
-
-  // list of browser enabled storage types
-  validStorageTypes = [
-    coreStorage.localStorageIsEnabled() ? LOCAL_STORAGE : null,
-    coreStorage.cookiesAreEnabled() ? COOKIE : null
-  ].filter(i => i !== null);
-
-  // exit immediately if opt out cookie or local storage keys exists.
-  if (validStorageTypes.indexOf(COOKIE) !== -1 && (coreStorage.getCookie('_pbjs_id_optout') || coreStorage.getCookie('_pubcid_optout'))) {
-    utils.logInfo(`${MODULE_NAME} - opt-out cookie found, exit module`);
-    return;
-  }
-  // _pubcid_optout is checked for compatiblility with pubCommonId
-  if (validStorageTypes.indexOf(LOCAL_STORAGE) !== -1 && (coreStorage.getDataFromLocalStorage('_pbjs_id_optout') || coreStorage.getDataFromLocalStorage('_pubcid_optout'))) {
-    utils.logInfo(`${MODULE_NAME} - opt-out localStorage found, exit module`);
-    return;
+  initializedSubmodules = [];
+  initIdSystem = idSystemInitializer({delay});
+  if (configListener != null) {
+    configListener();
   }
+  submoduleRegistry = [];
+
   // listen for config userSyncs to be set
-  config.getConfig(conf => {
-    // Note: support for both 'userSync' and 'usersync' will be deprecated with Prebid.js 3.0
-    const userSync = conf.userSync || conf.usersync;
+  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;
     if (userSync && userSync.userIds) {
       configRegistry = userSync.userIds;
-      syncDelay = utils.isNumber(userSync.syncDelay) ? userSync.syncDelay : DEFAULT_SYNC_DELAY;
-      auctionDelay = utils.isNumber(userSync.auctionDelay) ? userSync.auctionDelay : NO_AUCTION_DELAY;
+      syncDelay = isNumber(userSync.syncDelay) ? userSync.syncDelay : DEFAULT_SYNC_DELAY;
+      auctionDelay = isNumber(userSync.auctionDelay) ? userSync.auctionDelay : NO_AUCTION_DELAY;
       updateSubmodules();
+      initIdSystem({ready: true});
     }
   });
 
   // exposing getUserIds function in global-name-space so that userIds stored in Prebid can be used by external codes.
   (getGlobal()).getUserIds = getUserIds;
   (getGlobal()).getUserIdsAsEids = getUserIdsAsEids;
+  (getGlobal()).getEncryptedEidsForSource = normalizePromise(getEncryptedEidsForSource);
+  (getGlobal()).registerSignalSources = registerSignalSources;
+  (getGlobal()).refreshUserIds = normalizePromise(refreshUserIds);
+  (getGlobal()).getUserIdsAsync = normalizePromise(getUserIdsAsync);
+  (getGlobal()).getUserIdsAsEidBySource = getUserIdsAsEidBySource;
 }
 
 // init config update listener to start the application
 init(config);
 
 module('userId', attachIdSystem);
+
+export function setOrtbUserExtEids(ortbRequest, bidderRequest, context) {
+  const eids = deepAccess(context, 'bidRequests.0.userIdAsEids');
+  if (eids) {
+    deepSetValue(ortbRequest, 'user.ext.eids', eids);
+  }
+}
+registerOrtbProcessor({type: REQUEST, name: 'userExtEids', fn: setOrtbUserExtEids});
diff --git a/modules/userId/userId.md b/modules/userId/userId.md
index 20b140c3900..f25383af975 100644
--- a/modules/userId/userId.md
+++ b/modules/userId/userId.md
@@ -1,16 +1,38 @@
 ## User ID Example Configuration
 
 Example showing `cookie` storage for user id data for each of the submodules
+
 ```
 pbjs.setConfig({
     userSync: {
         userIds: [{
+            name: "33acrossId",
+            storage: {
+                type: "cookie",
+                name: "33acrossId",
+                expires: 90,
+                refreshInSeconds: 8*3600
+            },
+            params: {
+                pid: "0010b00002GYU4eBAH" // Example ID
+            }
+        }, {
             name: "pubCommonId",
             storage: {
                 type: "cookie",
                 name: "_pubcid",
                 expires: 60
             }
+        }, {
+            name: 'dmdId',
+            storage: {
+                name: 'dmd-dgid',
+                type: 'cookie',
+                expires: 30
+            },
+            params: {
+                api_key: '3fdbe297-3690-4f5c-9e11-ee9186a6d77c', // provided by DMD
+            }
         }, {
             name: "unifiedId",
             params: {
@@ -25,25 +47,37 @@ pbjs.setConfig({
         }, {
             name: "id5Id",
             params: {
-                partner: 173, //Set your real ID5 partner ID here for production, please ask for one at https://id5.io/universal-id
-                pd: "some-pd-string" // See https://console.id5.io/docs/public/prebid for details
+                partner: 173,         // Set your real ID5 partner ID here for production, please ask for one at https://id5.io/universal-id
+                pd: "some-pd-string"  // See https://support.id5.io/portal/en/kb/articles/passing-partner-data-to-id5 for details
             },
             storage: {
-                type: "cookie",
+                type: "html5",        // ID5 requires html5
                 name: "id5id",
-                expires: 90, // Expiration of cookies in days
+                expires: 90,          // Expiration in days
                 refreshInSeconds: 8*3600 // User Id cache lifetime in seconds, defaulting to 'expires'
             },
+        }, {
+            name: "ftrackId",
+            storage: {
+                type: "html5",
+                name: "ftrackId",
+                expires: 90,
+                refreshInSeconds: 8*3600
+            },
+            params: {
+                url: 'https://d9.flashtalking.com/d9core', // required, if not populated ftrack will not run
+            }
         }, {
             name: 'parrableId',
             params: {
                 // Replace partner with comma-separated (if more than one) Parrable Partner Client ID(s) for Parrable-aware bid adapters in use
                 partner: "30182847-e426-4ff9-b2b5-9ca1324ea09b"
             }
-        }, {
+        },{
             name: 'identityLink',
             params: {
-                pid: '999' // Set your real identityLink placement ID here 
+                pid: '999', // Set your real identityLink placement ID here
+                // notUse3P: true // true/false - If you do not want to use 3P endpoint to retrieve envelope. If you do not set this property to true, 3p endpoint will be fired. By default this property is undefined and 3p request will be fired.
             },
             storage: {
                 type: 'cookie',
@@ -53,7 +87,7 @@ pbjs.setConfig({
         }, {
             name: 'liveIntentId',
             params: {
-                publisherId: '7798696' // Set an identifier of a publisher know to your systems 
+                publisherId: '7798696' // Set an identifier of a publisher know to your systems
             },
             storage: {
                 type: 'cookie',
@@ -61,16 +95,67 @@ pbjs.setConfig({
                 expires: 60
             }
         }, {
-             name: 'sharedId',
-              params: {
-                    syncTime: 60 // in seconds, default is 24 hours
-               },
-             storage: {
+             name: 'criteo',
+             storage: {             // It is best not to specify this parameter since the module needs to be called as many times as possible
                  type: 'cookie',
-                 name: 'sharedid',
-                 expires: 28
+                 name: '_criteoId',
+                 expires: 1
               }
-        }],
+        }, {
+            name: "cpexId"
+        }, {
+            name: 'mwOpenLinkId',
+            params: {
+                accountId: 0000,
+                partnerId: 0000,
+                uid: '12345xyz'
+            }
+        },{
+            name: "merkleId",
+            params: {
+                vendor:'sdfg',
+                sv_cid:'dfg',
+                sv_pubid:'xcv',
+                sv_domain:'zxv',
+                refreshInSeconds: 10 // Refreshes the id based on this configuration, else by default every 7 days
+            },
+            storage: {
+                type: "cookie",
+                name: "merkleId",
+                expires: 30
+            }
+        },{
+            name: 'uid2'
+        }
+        }, {
+              name: 'admixerId',
+              params: {
+                  pid: "4D393FAC-B6BB-4E19-8396-0A4813607316", // example id
+                  e: "3d400b57e069c993babea0bd9efa79e5dc698e16c042686569faae20391fd7ea", // example hashed email (sha256)
+                  p: "05de6c07eb3ea4bce45adca4e0182e771d80fbb99e12401416ca84ddf94c3eb9" //example hashed phone (sha256)
+              },
+              storage: {
+                  type: 'cookie',
+                  name: '__adm__admixer',
+                  expires: 30
+              }
+        },{
+             name: "kpuid",
+             params:{
+                    accountid: 124 // example of account id
+                   },
+             storage: {
+                 type: "cookie",
+                 name: "knssoId",
+                 expires: 30
+                  },
+        {
+             name: "dacId"
+        },
+        {
+            name: "gravitompId"
+        }
+        ],
         syncDelay: 5000,
         auctionDelay: 1000
     }
@@ -78,10 +163,22 @@ pbjs.setConfig({
 ```
 
 Example showing `localStorage` for user id data for some submodules
+
 ```
 pbjs.setConfig({
-    usersync: {
+    userSync: {
         userIds: [{
+            name: "33acrossId",
+            storage: {
+                type: "html5",
+                name: "33acrossId",
+                expires: 90,
+                refreshInSeconds: 8*3600
+            },
+            params: {
+                pid: "0010b00002GYU4eBAH" // Example ID
+            }
+        }, {
             name: "unifiedId",
             params: {
                 partner: "prebid",
@@ -102,7 +199,8 @@ pbjs.setConfig({
         }, {
             name: 'identityLink',
             params: {
-                pid: '999' // Set your real identityLink placement ID here 
+                pid: '999', // Set your real identityLink placement ID here
+                // notUse3P: true // true/false - If you do not want to use 3P endpoint to retrieve envelope. If you do not set this property to true, 3p endpoint will be fired. By default this property is undefined and 3p request will be fired.
             },
             storage: {
                 type: 'html5',
@@ -110,25 +208,114 @@ pbjs.setConfig({
                 expires: 30
             }
         }, {
-             name: 'liveIntentId',
-             params: {
-                 publisherId: '7798696' // Set an identifier of a publisher know to your systems 
-             },
-             storage: {
-                 type: 'html5',
-                 name: '_li_pbid',
-                 expires: 60
-             }
+            name: 'liveIntentId',
+            params: {
+                publisherId: '7798696' // Set an identifier of a publisher know to your systems
+            },
+            storage: {
+                type: 'html5',
+                name: '_li_pbid',
+                expires: 60
+            }
         }, {
-             name: 'sharedId',
+            name: 'sharedId',
             params: {
                   syncTime: 60 // in seconds, default is 24 hours
                },
              storage: {
-                type: 'cookie',
+                type: 'html5',
                 name: 'sharedid',
                 expires: 28
              }
+        }, {
+            name: 'id5Id',
+            params: {
+                partner: 173,         // Set your real ID5 partner ID here for production, please ask for one at https://id5.io/universal-id
+                pd: 'some-pd-string'  // See https://support.id5.io/portal/en/kb/articles/passing-partner-data-to-id5 for details
+            },
+            storage: {
+                type: 'html5',
+                name: 'id5id',
+                expires: 90,          // Expiration in days
+                refreshInSeconds: 8*3600 // User Id cache lifetime in seconds, defaulting to 'expires'
+            },
+        }, {
+             name: 'criteo',
+             storage: {              // It is best not to specify this parameter since the module needs to be called as many times as possible
+                 type: 'html5',
+                 name: '_criteoId',
+                 expires: 1
+             }
+        },{
+            name: "merkleId",
+            params: {
+                vendor:'sdfg',
+                sv_cid:'dfg',
+                sv_pubid:'xcv',
+                sv_domain:'zxv',
+                refreshInSeconds: 10 // Refreshes the id based on this configuration, else by default every 7 days
+            },
+            storage: {
+                type: "html5",
+                name: "merkleId",
+                expires: 30
+            }
+        }, {
+              name: 'admixerId',
+              params: {
+                  pid: "4D393FAC-B6BB-4E19-8396-0A4813607316", // example id
+                  e: "3d400b57e069c993babea0bd9efa79e5dc698e16c042686569faae20391fd7ea", // example hashed email (sha256)
+                  p: "05de6c07eb3ea4bce45adca4e0182e771d80fbb99e12401416ca84ddf94c3eb9" //example hashed phone (sha256)
+              },
+              storage: {
+                  type: 'html5',
+                  name: 'admixerId',
+                  expires: 30
+              }
+       },{
+            name: "deepintentId",
+            storage: {
+                type: "html5",
+                name: "_dpes_id",
+                expires: 90
+            }
+        },{
+             name: "kpuid",
+                   params:{
+                     accountid: 124 // example of account id
+                   },
+             storage: {
+                 type: "html5",
+                 name: "knssoId",
+                 expires: 30
+                  },
+        }
+        },
+        {
+            name: 'imuid',
+            params: {
+                cid: 5126 // Set your Intimate Merger Customer ID here for production
+            }
+        },
+        {
+            name: 'connectId',
+            params: {
+              pixelId: 58776,
+              he: '0bef996248d63cea1529cb86de31e9547a712d9f380146e98bbd39beec70355a'
+            },
+            storage: {
+              name: 'connectId',
+              type: 'html5',
+              expires: 15
+            }
+        }
+        {
+            name: "qid",
+            storage: {
+                type: "html5",
+                name: "qid",
+                expires: 365
+            }
         }],
         syncDelay: 5000
     }
@@ -136,9 +323,10 @@ pbjs.setConfig({
 ```
 
 Example showing how to configure a `value` object to pass directly to bid adapters
+
 ```
 pbjs.setConfig({
-    usersync: {
+    userSync: {
         userIds: [{
             name: "pubCommonId",
             value: {
@@ -152,8 +340,36 @@ pbjs.setConfig({
         {
             name: "netId",
             value: { "netId": "fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg" }
+        },
+        {
+            name: "criteo",
+            value: { "criteoId": "wK-fkF8zaEIlMkZMbHl3eFo4NEtoNmZaeXJtYkFjZlVuWjBhcjJMaTRYd3pZNSUyQnlKRHNGRXlpdzdjd3pjVzhjcSUyQmY4eTFzN3VSZjV1ZyUyRlA0U2ZiR0UwN2I4bDZRJTNEJTNE" }
+        },
+        {
+            name: "novatiq",
+            value: { "snowflake": "81b001ec-8914-488c-a96e-8c220d4ee08895ef" }
+        },
+        {
+            name: 'naveggId',
         }],
         syncDelay: 5000
     }
 });
 ```
+```
+
+Example showing how to configure a `params` object to pass directly to bid adapters
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'tncId',
+            params: {
+              providerId: "c8549079-f149-4529-a34b-3fa91ef257d1"
+            }
+        }],
+        syncDelay: 5000
+    }
+});
+```
\ No newline at end of file
diff --git a/modules/userIdTargeting.js b/modules/userIdTargeting.js
deleted file mode 100644
index 3ed8b2a14b5..00000000000
--- a/modules/userIdTargeting.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import {config} from '../src/config.js';
-import {getGlobal} from '../src/prebidGlobal.js';
-import CONSTANTS from '../src/constants.json';
-import events from '../src/events.js';
-import { isStr, isPlainObject, isBoolean, isFn, hasOwn, logInfo } from '../src/utils.js';
-
-const MODULE_NAME = 'userIdTargeting';
-const GAM = 'GAM';
-const GAM_KEYS_CONFIG = 'GAM_KEYS';
-
-export function userIdTargeting(userIds, config) {
-  if (!isPlainObject(config)) {
-    logInfo(MODULE_NAME + ': Invalid config found, not sharing userIds externally.');
-    return;
-  }
-
-  const PUB_GAM_KEYS = isPlainObject(config[GAM_KEYS_CONFIG]) ? config[GAM_KEYS_CONFIG] : {};
-  let SHARE_WITH_GAM = isBoolean(config[GAM]) ? config[GAM] : false;
-  let GAM_API;
-
-  if (!SHARE_WITH_GAM) {
-    logInfo(MODULE_NAME + ': Not enabled for ' + GAM);
-  }
-
-  if (window.googletag && isFn(window.googletag.pubads) && hasOwn(window.googletag.pubads(), 'setTargeting') && isFn(window.googletag.pubads().setTargeting)) {
-    GAM_API = window.googletag.pubads().setTargeting;
-  } else {
-    SHARE_WITH_GAM = false;
-    logInfo(MODULE_NAME + ': Could not find googletag.pubads().setTargeting API. Not adding User Ids in targeting.')
-    return;
-  }
-
-  Object.keys(userIds).forEach(function(key) {
-    if (userIds[key]) {
-      // PUB_GAM_KEYS: { "tdid": '' } means the publisher does not want to send the tdid to GAM
-      if (SHARE_WITH_GAM && PUB_GAM_KEYS[key] !== '') {
-        let uidStr;
-        if (isStr(userIds[key])) {
-          uidStr = userIds[key];
-        } else if (isPlainObject(userIds[key])) {
-          uidStr = JSON.stringify(userIds[key])
-        } else {
-          logInfo(MODULE_NAME + ': ' + key + ' User ID is not an object or a string.');
-          return;
-        }
-        GAM_API(
-          (hasOwn(PUB_GAM_KEYS, key) ? PUB_GAM_KEYS[key] : key),
-          [ uidStr ]
-        );
-      }
-    }
-  });
-}
-
-export function init(config) {
-  events.on(CONSTANTS.EVENTS.AUCTION_END, function() {
-    userIdTargeting((getGlobal()).getUserIds(), config.getConfig(MODULE_NAME));
-  })
-}
-
-init(config)
diff --git a/modules/userIdTargeting.md b/modules/userIdTargeting.md
deleted file mode 100644
index f99fd5308b3..00000000000
--- a/modules/userIdTargeting.md
+++ /dev/null
@@ -1,37 +0,0 @@
-## userIdTargeting Module
-- This module works with userId module.
-- This module is used to pass userIds to GAM in targeting so that user ids can be used to pass in Google Exchange Bidding or can be used for targeting in GAM.
-
-## Sample config
-```
-pbjs.setConfig({
-
-	// your existing userIds config
-
-	usersync: {
-		userIds: [{...}, ...]
-	},
-
-	// new userIdTargeting config
-
-	userIdTargeting: {
-		"GAM": true,
-		"GAM_KEYS": {
-			"tdid": "TTD_ID" // send tdid as TTD_ID
-		}
-	}
-});
-```
-
-## Config options
-- GAM: is required to be set to true if a publisher wants to send UserIds as targeting in GAM call. This module uses ``` googletag.pubads().setTargeting('key-name', ['value']) ``` API to set GAM targeting.
-- GAM_KEYS: is an optional config object to be used with ``` "GAM": true ```. If not passed then all UserIds are passed with respective key-name used in UserIds object.
-If a publisher wants to pass ```UserId.tdid``` as TTD_ID in targeting then set  ``` GAM_KEYS: { "tdid": "TTD_ID" }```
-If a publisher does not wants to pass ```UserId.tdid``` but wants to pass other Ids in UserId tthen set ``` GAM_KEYS: { "tdid": "" }```
-
-## Including this module in Prebid
-``` $ gulp build --modules=userId,userIdTargeting,pubmaticBidAdapter ```
-
-## Notes
-- We can add support for other external systems like GAM in future
-- We have not added support for A9/APSTag as it is called in parallel with Prebid. This module executes when ```pbjs.requestBids``` is called, in practice, call to A9 is expected to execute in paralle to Prebid thus we have not covered A9 here. For sending Uids in A9, one will need to set those Ids in params key in the object passed to ```apstag.init```, ```pbjs.getUserIds``` can be used for the same.
diff --git a/modules/validationFpdModule/config.js b/modules/validationFpdModule/config.js
new file mode 100644
index 00000000000..c87265fa1df
--- /dev/null
+++ b/modules/validationFpdModule/config.js
@@ -0,0 +1,149 @@
+/**
+ * Data type map
+ */
+const TYPES = {
+  string: 'string',
+  object: 'object',
+  number: 'number',
+};
+
+/**
+ * Template to define what ortb2 attributes should be validated
+ * Accepted fields:
+ * -- invalid - {Boolean} if true, field is not valid
+ * -- type - {String} valid data type of field
+ * -- isArray - {Boolean} if true, field must be an array
+ * -- childType - {String} used in conjuction with isArray: true, defines valid type of array indices
+ * -- children - {Object} defines child properties needed to be validated (used only if type: object)
+ * -- required - {Array} array of strings defining any required properties for object (used only if type: object)
+ * -- optoutApplies - {Boolean} if true, optout logic will filter if applicable (currently only applies to user object)
+ */
+export const ORTB_MAP = {
+  imp: {
+    invalid: true
+  },
+  cur: {
+    type: TYPES.object,
+    isArray: true,
+    childType: TYPES.string
+  },
+  device: {
+    type: TYPES.object,
+    children: {
+      w: { type: TYPES.number },
+      h: { type: TYPES.number }
+    }
+  },
+  site: {
+    type: TYPES.object,
+    children: {
+      name: { type: TYPES.string },
+      domain: { type: TYPES.string },
+      page: { type: TYPES.string },
+      ref: { type: TYPES.string },
+      keywords: { type: TYPES.string },
+      search: { type: TYPES.string },
+      cat: {
+        type: TYPES.object,
+        isArray: true,
+        childType: TYPES.string
+      },
+      sectioncat: {
+        type: TYPES.object,
+        isArray: true,
+        childType: TYPES.string
+      },
+      pagecat: {
+        type: TYPES.object,
+        isArray: true,
+        childType: TYPES.string
+      },
+      content: {
+        type: TYPES.object,
+        isArray: false,
+        children: {
+          data: {
+            type: TYPES.object,
+            isArray: true,
+            childType: TYPES.object,
+            required: ['name', 'segment'],
+            children: {
+              segment: {
+                type: TYPES.object,
+                isArray: true,
+                childType: TYPES.object,
+                required: ['id'],
+                children: {
+                  id: { type: TYPES.string }
+                }
+              },
+              name: { type: TYPES.string },
+              ext: { type: TYPES.object },
+            }
+          }
+        }
+      },
+      publisher: {
+        type: TYPES.object,
+        isArray: false,
+        children: {
+          id: { type: TYPES.string },
+          name: { type: TYPES.string },
+          cat: {
+            type: TYPES.object,
+            isArray: true,
+            childType: TYPES.string
+          },
+          domain: { type: TYPES.string },
+          ext: {
+            type: TYPES.object,
+            isArray: false
+          }
+        }
+      },
+    }
+  },
+  user: {
+    type: TYPES.object,
+    children: {
+      yob: {
+        type: TYPES.number,
+        optoutApplies: true
+      },
+      gender: {
+        type: TYPES.string,
+        optoutApplies: true
+      },
+      keywords: { type: TYPES.string },
+      data: {
+        type: TYPES.object,
+        isArray: true,
+        childType: TYPES.object,
+        required: ['name', 'segment'],
+        children: {
+          segment: {
+            type: TYPES.object,
+            isArray: true,
+            childType: TYPES.object,
+            required: ['id'],
+            children: {
+              id: { type: TYPES.string }
+            }
+          },
+          name: { type: TYPES.string },
+          ext: { type: TYPES.object },
+        }
+      }
+    }
+  },
+  bcat: {
+    type: TYPES.object,
+    isArray: true,
+    childType: TYPES.string
+  },
+  badv: {
+    type: TYPES.object,
+    isArray: true,
+    childType: TYPES.string
+  }
+}
diff --git a/modules/validationFpdModule/index.js b/modules/validationFpdModule/index.js
new file mode 100644
index 00000000000..8771e50b156
--- /dev/null
+++ b/modules/validationFpdModule/index.js
@@ -0,0 +1,219 @@
+/**
+ * This module sets default values and validates ortb2 first part data
+ * @module modules/firstPartyData
+ */
+import {deepAccess, isEmpty, isNumber, logWarn} from '../../src/utils.js';
+import {ORTB_MAP} from './config.js';
+import {submodule} from '../../src/hook.js';
+import {getStorageManager} from '../../src/storageManager.js';
+
+const STORAGE = getStorageManager();
+let optout;
+
+/**
+ * Check if data passed is empty
+ * @param {*} value to test against
+ * @returns {Boolean} is value empty
+ */
+function isEmptyData(data) {
+  let check = true;
+
+  if (typeof data === 'object' && !isEmpty(data)) {
+    check = false;
+  } else if (typeof data !== 'object' && (isNumber(data) || data)) {
+    check = false;
+  }
+
+  return check;
+}
+
+/**
+ * Check if required keys exist in data object
+ * @param {Object} data object
+ * @param {Array} array of required keys
+ * @param {String} object path (for printing warning)
+ * @param {Number} index of object value in the data array (for printing warning)
+ * @returns {Boolean} is requirements fulfilled
+ */
+function getRequiredData(obj, required, parent, i) {
+  let check = true;
+
+  required.forEach(key => {
+    if (!obj[key] || isEmptyData(obj[key])) {
+      check = false;
+      logWarn(`Filtered ${parent}[] value at index ${i} in ortb2 data: missing required property ${key}`);
+    }
+  });
+
+  return check;
+}
+
+/**
+ * Check if data type is valid
+ * @param {*} value to test against
+ * @param {Object} object containing type definition and if should be array bool
+ * @returns {Boolean} is type fulfilled
+ */
+function typeValidation(data, mapping) {
+  let check = false;
+
+  switch (mapping.type) {
+    case 'string':
+      if (typeof data === 'string') check = true;
+      break;
+    case 'number':
+      if (typeof data === 'number' && isFinite(data)) check = true;
+      break;
+    case 'object':
+      if (typeof data === 'object') {
+        if ((Array.isArray(data) && mapping.isArray) || (!Array.isArray(data) && !mapping.isArray)) check = true;
+      }
+      break;
+  }
+
+  return check;
+}
+
+/**
+ * Validates ortb2 data arrays and filters out invalid data
+ * @param {Array} ortb2 data array
+ * @param {Object} object defining child type and if array
+ * @param {String} config path of data array
+ * @param {String} parent path for logging warnings
+ * @returns {Array} validated/filtered data
+ */
+export function filterArrayData(arr, child, path, parent) {
+  arr = arr.filter((index, i) => {
+    let check = typeValidation(index, {type: child.type, isArray: child.isArray});
+
+    if (check && Array.isArray(index) === Boolean(child.isArray)) {
+      return true;
+    }
+
+    logWarn(`Filtered ${parent}[] value at index ${i} in ortb2 data: expected type ${child.type}`);
+  }).filter((index, i) => {
+    let requiredCheck = true;
+    let mapping = deepAccess(ORTB_MAP, path);
+
+    if (mapping && mapping.required) requiredCheck = getRequiredData(index, mapping.required, parent, i);
+
+    if (requiredCheck) return true;
+  }).reduce((result, value, i) => {
+    let typeBool = false;
+    let mapping = deepAccess(ORTB_MAP, path);
+
+    switch (child.type) {
+      case 'string':
+        result.push(value);
+        typeBool = true;
+        break;
+      case 'object':
+        if (mapping && mapping.children) {
+          let validObject = validateFpd(value, path + '.children.', parent + '.');
+          if (Object.keys(validObject).length) {
+            let requiredCheck = getRequiredData(validObject, mapping.required, parent, i);
+
+            if (requiredCheck) {
+              result.push(validObject);
+              typeBool = true;
+            }
+          }
+        } else {
+          result.push(value);
+          typeBool = true;
+        }
+        break;
+    }
+
+    if (!typeBool) logWarn(`Filtered ${parent}[] value at index ${i}  in ortb2 data: expected type ${child.type}`);
+
+    return result;
+  }, []);
+
+  return arr;
+}
+
+/**
+ * Validates ortb2 object and filters out invalid data
+ * @param {Object} ortb2 object
+ * @param {String} config path of data array
+ * @param {String} parent path for logging warnings
+ * @returns {Object} validated/filtered data
+ */
+export function validateFpd(fpd, path = '', parent = '') {
+  if (!fpd) return {};
+
+  // Filter out imp property if exists
+  let validObject = Object.assign({}, Object.keys(fpd).filter(key => {
+    let mapping = deepAccess(ORTB_MAP, path + key);
+
+    if (!mapping || !mapping.invalid) return key;
+
+    logWarn(`Filtered ${parent}${key} property in ortb2 data: invalid property`);
+  }).filter(key => {
+    let mapping = deepAccess(ORTB_MAP, path + key);
+    // let typeBool = false;
+    let typeBool = (mapping) ? typeValidation(fpd[key], {type: mapping.type, isArray: mapping.isArray}) : true;
+
+    if (typeBool || !mapping) return key;
+
+    logWarn(`Filtered ${parent}${key} property in ortb2 data: expected type ${(mapping.isArray) ? 'array' : mapping.type}`);
+  }).reduce((result, key) => {
+    let mapping = deepAccess(ORTB_MAP, path + key);
+    let modified = {};
+
+    if (mapping) {
+      if (mapping.optoutApplies && optout) {
+        logWarn(`Filtered ${parent}${key} data: pubcid optout found`);
+        return result;
+      }
+
+      modified = (mapping.type === 'object' && !mapping.isArray)
+        ? validateFpd(fpd[key], path + key + '.children.', parent + key + '.')
+        : (mapping.isArray && mapping.childType)
+          ? filterArrayData(fpd[key], { type: mapping.childType, isArray: mapping.childisArray }, path + key, parent + key) : fpd[key];
+
+      // Check if modified data has data and return
+      (!isEmptyData(modified)) ? result[key] = modified
+        : logWarn(`Filtered ${parent}${key} property in ortb2 data: empty data found`);
+    } else {
+      result[key] = fpd[key];
+    }
+
+    return result;
+  }, {}));
+
+  // Return validated data
+  return validObject;
+}
+
+/**
+ * Run validation on global and bidder config data for ortb2
+ */
+function runValidations(data) {
+  return {
+    global: validateFpd(data.global),
+    bidder: Object.fromEntries(Object.entries(data.bidder).map(([bidder, conf]) => [bidder, validateFpd(conf)]))
+  }
+}
+
+/**
+ * Sets default values to ortb2 if exists and adds currency and ortb2 setConfig callbacks on init
+ */
+export function processFpd(fpdConf, data) {
+  // Checks for existsnece of pubcid optout cookie/storage
+  // if exists, filters user data out
+  optout = (STORAGE.cookiesAreEnabled() && STORAGE.getCookie('_pubcid_optout')) ||
+    (STORAGE.hasLocalStorage() && STORAGE.getDataFromLocalStorage('_pubcid_optout'));
+
+  return (!fpdConf.skipValidations) ? runValidations(data) : data;
+}
+
+/** @type {firstPartyDataSubmodule} */
+export const validationSubmodule = {
+  name: 'validation',
+  queue: 1,
+  processFpd
+}
+
+submodule('firstPartyData', validationSubmodule)
diff --git a/modules/vdoaiBidAdapter.js b/modules/vdoaiBidAdapter.js
index 395953fb737..a57eae5f328 100644
--- a/modules/vdoaiBidAdapter.js
+++ b/modules/vdoaiBidAdapter.js
@@ -1,14 +1,14 @@
-import * as utils from '../src/utils.js';
+import { getAdUnitSizes } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
-const BIDDER_CODE = 'vdo.ai';
+const BIDDER_CODE = 'vdoai';
 const ENDPOINT_URL = 'https://prebid.vdo.ai/auction';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
   /**
    * Determines whether or not the given bid request is valid.
    *
@@ -30,17 +30,17 @@ export const spec = {
     if (validBidRequests.length === 0) {
       return [];
     }
+
     return validBidRequests.map(bidRequest => {
-      const sizes = utils.parseSizesInput(bidRequest.params.size || bidRequest.sizes)[0];
-      const width = sizes.split('x')[0];
-      const height = sizes.split('x')[1];
+      const sizes = getAdUnitSizes(bidRequest);
       const payload = {
         placementId: bidRequest.params.placementId,
-        width: width,
-        height: height,
+        sizes: sizes,
         bidId: bidRequest.bidId,
-        referer: bidderRequest.refererInfo.referer,
-        id: bidRequest.auctionId
+        // TODO: is 'page' the right value here?
+        referer: bidderRequest.refererInfo.page,
+        id: bidRequest.auctionId,
+        mediaType: bidRequest.mediaTypes.video ? 'video' : 'banner'
       };
       bidRequest.params.bidFloor && (payload['bidFloor'] = bidRequest.params.bidFloor);
       return {
@@ -63,9 +63,9 @@ export const spec = {
     const response = serverResponse.body;
     const creativeId = response.adid || 0;
     // const width = response.w || 0;
-    const width = bidRequest.data.width;
+    const width = response.width;
     // const height = response.h || 0;
-    const height = bidRequest.data.height;
+    const height = response.height;
     const cpm = response.price || 0;
 
     response.rWidth = width;
@@ -90,10 +90,23 @@ export const spec = {
         ttl: config.getConfig('_bidderTimeout'),
         // referrer: referrer,
         // ad: response.adm
-        ad: adCreative
+        // ad: adCreative,
+        mediaType: response.mediaType
       };
+
+      if (response.mediaType == 'video') {
+        bidResponse.vastXml = adCreative;
+      } else {
+        bidResponse.ad = adCreative;
+      }
+      if (response.adDomain) {
+        bidResponse.meta = {
+          advertiserDomains: response.adDomain
+        };
+      }
       bidResponses.push(bidResponse);
     }
+
     return bidResponses;
   },
 
diff --git a/modules/vdoaiBidAdapter.md b/modules/vdoaiBidAdapter.md
index 81bd8e69c1d..04200cc9be0 100644
--- a/modules/vdoaiBidAdapter.md
+++ b/modules/vdoaiBidAdapter.md
@@ -22,13 +22,36 @@ Module that connects to VDO.AI's demand sources
             },
             bids: [
                 {
-                    bidder: "vdo.ai",
+                    bidder: "vdoai",
                     params: {
-                        placement: 'newsdv77',
+                        placementId: 'newsdv77',
                         bidFloor: 0.01  // Optional
                     }
                 }
             ]
         }
     ];
+```
+
+
+# Video Test Parameters
+```
+var videoAdUnit = {
+  code: 'test-div',
+  sizes: [[640, 480]],
+  mediaTypes: {
+    video: {
+      playerSize: [[640, 480]],
+      context: 'instream'
+    },
+  },
+  bids: [
+    {
+        bidder: "vdoai",
+        params: {
+            placementId: 'newsdv77'
+        }
+    }
+  ]
+};
 ```
\ No newline at end of file
diff --git a/modules/ventesBidAdapter.js b/modules/ventesBidAdapter.js
new file mode 100644
index 00000000000..73ae0a7e5f1
--- /dev/null
+++ b/modules/ventesBidAdapter.js
@@ -0,0 +1,389 @@
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import {convertCamelToUnderscore, isArray, isNumber, isPlainObject, isStr, replaceAuctionPrice} from '../src/utils.js';
+import {find} from '../src/polyfill.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BID_METHOD = 'POST';
+const BIDDER_URL = 'https://ad.ventesavenues.in/va/ad';
+
+function groupBy(values, key) {
+  const groups = values.reduce((acc, value) => {
+    const groupId = value[key];
+
+    if (!acc[groupId]) acc[groupId] = [];
+    acc[groupId].push(value);
+
+    return acc;
+  }, {});
+
+  return Object
+    .keys(groups)
+    .map(id => ({
+      id,
+      key,
+      values: groups[id]
+    }));
+}
+
+function validateMediaTypes(mediaTypes, allowedMediaTypes) {
+  if (!isPlainObject(mediaTypes)) return false;
+  if (!allowedMediaTypes.some(mediaType => mediaType in mediaTypes)) return false;
+
+  if (isBanner(mediaTypes)) {
+    if (!validateBanner(mediaTypes.banner)) return false;
+  }
+  return true;
+}
+
+function isBanner(mediaTypes) {
+  return isPlainObject(mediaTypes) && isPlainObject(mediaTypes.banner);
+}
+
+function validateBanner(banner) {
+  return isPlainObject(banner) &&
+      isArray(banner.sizes) &&
+      (banner.sizes.length > 0) &&
+      banner.sizes.every(validateMediaSizes);
+}
+
+function validateMediaSizes(mediaSize) {
+  return isArray(mediaSize) &&
+      (mediaSize.length === 2) &&
+      mediaSize.every(size => (isNumber(size) && size >= 0));
+}
+
+function hasUserInfo(bid) {
+  return !!bid.params.user;
+}
+
+function validateParameters(parameters) {
+  if (!(parameters.placementId)) {
+    return false;
+  }
+  if (!(parameters.publisherId)) {
+    return false;
+  }
+
+  return true;
+}
+
+function generateSiteFromAdUnitContext(bidRequests, adUnitContext) {
+  if (!adUnitContext || !adUnitContext.refererInfo) return null;
+
+  const domain = adUnitContext.refererInfo.domain;
+  const publisherId = bidRequests[0].params.publisherId;
+
+  if (!domain) return null;
+
+  return {
+    page: adUnitContext.refererInfo.page,
+    domain: domain,
+    name: domain,
+    publisher: {
+      id: publisherId
+    }
+  };
+}
+
+function validateServerRequest(serverRequest) {
+  return isPlainObject(serverRequest) &&
+      isPlainObject(serverRequest.data) &&
+      isArray(serverRequest.data.imp)
+}
+
+function createServerRequestFromAdUnits(adUnits, bidRequestId, adUnitContext) {
+  return {
+    method: BID_METHOD,
+    url: BIDDER_URL,
+    data: generateBidRequestsFromAdUnits(adUnits, bidRequestId, adUnitContext),
+    options: {
+      contentType: 'application/json',
+      withCredentials: false,
+    }
+  }
+}
+
+function generateBidRequestsFromAdUnits(bidRequests, bidRequestId, adUnitContext) {
+  const userObjBid = find(bidRequests, hasUserInfo);
+  let userObj = {};
+  if (userObjBid) {
+    Object.keys(userObjBid.params.user)
+      .forEach((param) => {
+        let uparam = convertCamelToUnderscore(param);
+        if (param === 'segments' && isArray(userObjBid.params.user[param])) {
+          let segs = [];
+          userObjBid.params.user[param].forEach(val => {
+            if (isNumber(val)) {
+              segs.push({
+                'id': val
+              });
+            } else if (isPlainObject(val)) {
+              segs.push(val);
+            }
+          });
+          userObj[uparam] = segs;
+        } else if (param !== 'segments') {
+          userObj[uparam] = userObjBid.params.user[param];
+        }
+      });
+  }
+
+  const deviceObjBid = find(bidRequests, hasDeviceInfo);
+  let deviceObj;
+  if (deviceObjBid && deviceObjBid.params && deviceObjBid.params.device) {
+    deviceObj = {};
+    Object.keys(deviceObjBid.params.device)
+      .forEach(param => deviceObj[param] = deviceObjBid.params.device[param]);
+    if (!deviceObjBid.hasOwnProperty('ua')) {
+      deviceObj.ua = navigator.userAgent;
+    }
+    if (!deviceObjBid.hasOwnProperty('language')) {
+      deviceObj.language = navigator.language;
+    }
+  } else {
+    deviceObj = {};
+    deviceObj.ua = navigator.userAgent;
+    deviceObj.language = navigator.language;
+  }
+
+  const payload = {}
+  payload.id = bidRequestId
+  payload.at = 1
+  payload.cur = ['USD']
+  payload.imp = bidRequests.reduce(generateImpressionsFromAdUnit, [])
+  const appDeviceObjBid = find(bidRequests, hasAppInfo);
+  if (!appDeviceObjBid) {
+    payload.site = generateSiteFromAdUnitContext(bidRequests, adUnitContext)
+  } else {
+    let appIdObj;
+    if (appDeviceObjBid && appDeviceObjBid.params && appDeviceObjBid.params.app && appDeviceObjBid.params.app.id) {
+      appIdObj = {};
+      Object.keys(appDeviceObjBid.params.app)
+        .forEach(param => appIdObj[param] = appDeviceObjBid.params.app[param]);
+    }
+    payload.app = appIdObj;
+  }
+  payload.device = deviceObj;
+  payload.user = userObj
+  return payload
+}
+
+function generateImpressionsFromAdUnit(acc, adUnit) {
+  const {
+    bidId,
+    mediaTypes,
+    params
+  } = adUnit;
+  const {
+    placementId
+  } = params;
+  const pmp = {};
+
+  if (placementId) pmp.deals = [{ id: placementId }]
+
+  const imps = Object
+    .keys(mediaTypes)
+    .reduce((acc, mediaType) => {
+      const data = mediaTypes[mediaType];
+      const impId = `${bidId}`;
+
+      if (mediaType === 'banner') return acc.concat(generateBannerFromAdUnit(impId, data, params));
+    }, []);
+
+  return acc.concat(imps);
+}
+
+function generateBannerFromAdUnit(impId, data, params) {
+  const {
+    position,
+    placementId
+  } = params;
+  const pos = position || 0;
+  const pmp = {};
+  const ext = {
+    placementId
+  };
+
+  if (placementId) pmp.deals = [{ id: placementId }]
+
+  return data.sizes.map(([w, h]) => ({
+    id: `${impId}`,
+    banner: {
+      format: [{
+        w,
+        h
+      }],
+      w,
+      h,
+      pos
+    },
+    pmp,
+    ext,
+    tagid: placementId
+  }));
+}
+
+function validateServerResponse(serverResponse) {
+  return isPlainObject(serverResponse) &&
+      isPlainObject(serverResponse.body) &&
+      isStr(serverResponse.body.cur) &&
+      isArray(serverResponse.body.seatbid);
+}
+
+function seatBidsToAds(seatBid, bidResponse, serverRequest) {
+  return seatBid.bid
+    .filter(bid => validateBids(bid))
+    .map(bid => generateAdFromBid(bid, bidResponse));
+}
+
+function validateBids(bid) {
+  if (!isPlainObject(bid)) return false;
+  if (!isStr(bid.impid)) return false;
+  if (!isStr(bid.crid)) return false;
+  if (!isNumber(bid.price)) return false;
+  if (!isNumber(bid.w)) return false;
+  if (!isNumber(bid.h)) return false;
+  if (!bid.adm) return false;
+  if (bid.adm) {
+    if (!isStr(bid.adm)) return false;
+  }
+  return true;
+}
+
+function getMediaType(adm) {
+  const videoRegex = new RegExp(/VAST\s+version/);
+
+  if (videoRegex.test(adm)) {
+    return VIDEO;
+  }
+
+  const markup = safeJSONparse(adm.replace(/\\/g, ''));
+
+  if (markup && isPlainObject(markup.native)) {
+    return NATIVE;
+  }
+
+  return BANNER;
+}
+
+function safeJSONparse(...args) {
+  try {
+    return JSON.parse(...args);
+  } catch (_) {
+    return undefined;
+  }
+}
+
+function generateAdFromBid(bid, bidResponse) {
+  const mediaType = getMediaType(bid.adm);
+  const base = {
+    requestId: bid.impid,
+    cpm: bid.price,
+    currency: bidResponse.cur,
+    ttl: 10,
+    creativeId: bid.crid,
+    mediaType: mediaType,
+    netRevenue: true
+  };
+
+  if (bid.adomain) {
+    base.meta = {
+      advertiserDomains: bid.adomain
+    };
+  }
+
+  const size = getSizeFromBid(bid);
+  const creative = getCreativeFromBid(bid);
+
+  return {
+    ...base,
+    height: size.height,
+    width: size.width,
+    ad: creative.markup,
+    adUrl: creative.markupUrl,
+    renderer: creative.renderer
+  };
+}
+
+function getSizeFromBid(bid) {
+  if (isNumber(bid.w) && isNumber(bid.h)) {
+    return {
+      width: bid.w,
+      height: bid.h
+    };
+  }
+  return {
+    width: null,
+    height: null
+  };
+}
+
+function getCreativeFromBid(bid) {
+  const shouldUseAdMarkup = !!bid.adm;
+  const price = bid.price;
+  return {
+    markup: shouldUseAdMarkup ? replaceAuctionPrice(bid.adm, price) : null,
+    markupUrl: !shouldUseAdMarkup ? replaceAuctionPrice(bid.nurl, price) : null
+  };
+}
+
+function hasDeviceInfo(bid) {
+  if (bid.params) {
+    return !!bid.params.device
+  }
+}
+
+function hasAppInfo(bid) {
+  if (bid.params) {
+    return !!bid.params.app
+  }
+}
+
+const venavenBidderSpec = {
+  code: 'ventes',
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid(adUnit) {
+    const allowedBidderCodes = [this.code];
+
+    return isPlainObject(adUnit) &&
+          allowedBidderCodes.indexOf(adUnit.bidder) !== -1 &&
+          isStr(adUnit.adUnitCode) &&
+          isStr(adUnit.bidderRequestId) &&
+          isStr(adUnit.bidId) &&
+          validateMediaTypes(adUnit.mediaTypes, this.supportedMediaTypes) &&
+          validateParameters(adUnit.params);
+  },
+  buildRequests(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
+    if (!bidRequests) return null;
+
+    return groupBy(bidRequests, 'bidderRequestId').map(group => {
+      const bidRequestId = group.id;
+      const adUnits = groupBy(group.values, 'bidId').map((group) => {
+        const length = group.values.length;
+        return length > 0 && group.values[length - 1]
+      });
+
+      return createServerRequestFromAdUnits(adUnits, bidRequestId, bidderRequest)
+    });
+  },
+  interpretResponse(serverResponse, serverRequest) {
+    if (!validateServerRequest(serverRequest)) return [];
+    if (!validateServerResponse(serverResponse)) return [];
+
+    const bidResponse = serverResponse.body;
+
+    return bidResponse.seatbid
+      .filter(seatBid => isPlainObject(seatBid) && isArray(seatBid.bid))
+      .reduce((acc, seatBid) => acc.concat(seatBidsToAds(seatBid, bidResponse, serverRequest)), []);
+  }
+};
+
+registerBidder(venavenBidderSpec);
+
+export {
+  venavenBidderSpec as spec
+};
diff --git a/modules/ventesBidAdapter.md b/modules/ventesBidAdapter.md
new file mode 100644
index 00000000000..5b75d48b90e
--- /dev/null
+++ b/modules/ventesBidAdapter.md
@@ -0,0 +1,93 @@
+---
+layout: bidder
+title: ventes
+description: Prebid ventes Bidder Adapter
+pbjs: true
+biddercode: ventes
+gdpr_supported: false
+usp_supported: false
+media_types: banner
+coppa_supported: false
+schain_supported: false
+dchain_supported: false
+prebid_member: false
+---
+
+### BidParams
+{: .table .table-bordered .table-striped }
+| Name            | Scope    | Description                                		 | Example                      		| Type          |
+|-----------------|----------|-----------------------------------------------------------|----------------------------------------------|---------------|
+| `placementId`   | required | Placement ID from Ventes Avenues 			 | `'VA-062-0013-0183'` 			| `string`	|
+| `publisherId`   | required | Publisher ID from Ventes Avenues 			 | `'VA-062'` 					| `string`	|
+| `user`          | optional | Object that specifies information about an external user. | `user: { age: 25, gender: 0, dnt: true}` 	| `object`	|
+| `app`           | required | Object containing mobile app parameters.  		 | `app : { id: 'app-id'}`			| `object`	|
+| `device`        | required | Object containing device info mandatory for mobile devices| `device : { ifa: 'device-id'}`	        | `object`	|
+
+#### User Object
+
+{: .table .table-bordered .table-striped }
+| Name              | Description 										| Example		| Type             	|
+|-------------------|-------------------------------------------------------------------------------------------|-----------------------|-----------------------|
+| `age`             | The age of the user.									| `35`			| `integer`		|
+| `externalUid`     | Specifies a string that corresponds to an external user ID for this user. 		| `'1234567890abcdefg'`	| `string` 		|
+| `segments`        | Specifies the segments to which the user belongs.						| `[1, 2]` 		| `Array<integer>`	|
+| `gender`          | Specifies the gender of the user.  Allowed values: Unknown: `0`; Male: `1`; Female: `2`	| `1` 			| `integer`		|
+| `dnt`             | Do not track flag.  Indicates if tracking cookies should be disabled for this auction	| `true`  	 	| `boolean`		|
+| `language`        | Two-letter ANSI code for this user's language.						| `EN`			| `string`		|
+
+
+### Ad Unit Setup for Banner through mobile devices
+```javascript
+var adUnits = [
+{
+  code: 'test-hb-ad-11111-1',
+  mediaTypes: {
+    banner: {  
+      sizes: [
+          [300, 250]
+      ]
+    }   
+  }, 
+  bids: [{
+    bidder: 'ventes',
+    params: {
+        placementId: 'VA-062-0013-0183',
+        publisherId: '5cebea3c9eea646c7b623d5e',
+        IABCategories: "['IAB1', 'IAB5']",
+        device:{
+          ifa:"AEBE52E7-03EE-455A-B3C4-E57283966239",
+        },
+        app: {
+          id: "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA",
+          name: "Yahoo Weather",
+          bundle: 'com.kiloo.subwaysurf',
+          storeurl: 'https://play.google.com/store/apps/details?id=com.kiloo.subwaysurf&hl=en',
+          domain: 'somoaudience.com',
+        } 
+    }
+  }]
+ }
+]
+```
+
+### Ad Unit Setup for Banner through Websites
+```javascript
+var adUnits = [
+{
+  code: 'test-hb-ad-11111-1',
+  mediaTypes: {
+    banner: {  
+      sizes: [
+          [300, 250]
+      ]
+    }   
+  }, 
+  bids: [{
+    bidder: 'ventes',
+    params: {
+        placementId: 'VA-002-0007-0799',
+        publisherId: '5cebea3c9eea646c7b623d5e',
+    }
+  }]
+ }
+]
diff --git a/modules/verizonMediaIdSystem.js b/modules/verizonMediaIdSystem.js
new file mode 100644
index 00000000000..27577ad0de4
--- /dev/null
+++ b/modules/verizonMediaIdSystem.js
@@ -0,0 +1,105 @@
+/**
+ * This module adds verizonMediaId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/verizonMediaIdSystem
+ * @requires module:modules/userId
+ */
+
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {formatQS, logError} from '../src/utils.js';
+import {includes} from '../src/polyfill.js';
+
+const MODULE_NAME = 'verizonMediaId';
+const VENDOR_ID = 25;
+const PLACEHOLDER = '__PIXEL_ID__';
+const VMCID_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PLACEHOLDER}/fed`;
+
+function isEUConsentRequired(consentData) {
+  return !!(consentData && consentData.gdpr && consentData.gdpr.gdprApplies);
+}
+
+/** @type {Submodule} */
+export const verizonMediaIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * Vendor id of Verizon Media EMEA Limited
+   * @type {Number}
+   */
+  gvlid: VENDOR_ID,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{connectid: string} | undefined}
+   */
+  decode(value) {
+    return (typeof value === 'object' && (value.connectid || value.vmuid))
+      ? {connectid: value.connectid || value.vmuid} : undefined;
+  },
+  /**
+   * Gets the Verizon Media Connect ID
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData) {
+    const params = config.params || {};
+    if (!params || typeof params.he !== 'string' ||
+        (typeof params.pixelId === 'undefined' && typeof params.endpoint === 'undefined')) {
+      logError('The verizonMediaId submodule requires the \'he\' and \'pixelId\' parameters to be defined.');
+      return;
+    }
+
+    const data = {
+      '1p': includes([1, '1', true], params['1p']) ? '1' : '0',
+      he: params.he,
+      gdpr: isEUConsentRequired(consentData) ? '1' : '0',
+      gdpr_consent: isEUConsentRequired(consentData) ? consentData.gdpr.consentString : '',
+      us_privacy: consentData && consentData.uspConsent ? consentData.uspConsent : ''
+    };
+
+    if (params.pixelId) {
+      data.pixelId = params.pixelId
+    }
+
+    const resp = function (callback) {
+      const callbacks = {
+        success: response => {
+          let responseObj;
+          if (response) {
+            try {
+              responseObj = JSON.parse(response);
+            } catch (error) {
+              logError(error);
+            }
+          }
+          callback(responseObj);
+        },
+        error: error => {
+          logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+          callback();
+        }
+      };
+      const endpoint = VMCID_ENDPOINT.replace(PLACEHOLDER, params.pixelId);
+      let url = `${params.endpoint || endpoint}?${formatQS(data)}`;
+      verizonMediaIdSubmodule.getAjaxFn()(url, callbacks, null, {method: 'GET', withCredentials: true});
+    };
+    return {callback: resp};
+  },
+
+  /**
+   * Return the function used to perform XHR calls.
+   * Utilised for each of testing.
+   * @returns {Function}
+   */
+  getAjaxFn() {
+    return ajax;
+  }
+};
+
+submodule('userId', verizonMediaIdSubmodule);
diff --git a/modules/verizonMediaSystemId.md b/modules/verizonMediaSystemId.md
new file mode 100644
index 00000000000..c0d315dc754
--- /dev/null
+++ b/modules/verizonMediaSystemId.md
@@ -0,0 +1,33 @@
+## Verizon Media User ID Submodule
+
+Verizon Media User ID Module.
+
+### Prebid Params
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'verizonMediaId',
+            storage: {
+                name: 'vmcid',
+                type: 'html5',
+                expires: 15
+            },
+            params: {
+                pixelId: 58776,
+                he: '0bef996248d63cea1529cb86de31e9547a712d9f380146e98bbd39beec70355a'
+            }
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the Verizon Media User ID Module integration.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the Verizon Media module - `"verizonMediaId"` | `"verizonMediaId"` |
+| params | Required | Object | Data for Verizon Media ID initialization. | |
+| params.pixelId | Required | Number | The Verizon Media supplied publisher specific pixel Id  | `8976` |
+| params.he | Required | String | The SHA-256 hashed user email address | `"529cb86de31e9547a712d9f380146e98bbd39beec"` |
diff --git a/modules/vertamediaBidAdapter.md b/modules/vertamediaBidAdapter.md
deleted file mode 100644
index 6b1265fa792..00000000000
--- a/modules/vertamediaBidAdapter.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Overview
-
-**Module Name**: VertaMedia Bidder Adapter
-**Module Type**: Bidder Adapter
-**Maintainer**: support@verta.media
-
-# Description
-
-Get access to multiple demand partners across VertaMedia AdExchange and maximize your yield with VertaMedia header bidding adapter.
-
-VertaMedia header bidding adapter connects with VertaMedia demand sources in order to fetch bids.
-This adapter provides a solution for accessing Video demand and display demand
-
-
-# Test Parameters
-```
-    var adUnits = [
-
-      // Video instream adUnit
-      {
-        code: 'div-test-div',
-        sizes: [[640, 480]],
-        mediaTypes: {
-          video: {
-            context: 'instream'
-          }
-        },
-        bids: [{
-          bidder: 'vertamedia',
-          params: {
-            aid: 331133
-          }
-        }]
-      },
-
-      // Video outstream adUnit
-      {
-        code: 'outstream-test-div',
-        sizes: [[640, 480]],
-        mediaTypes: {
-          video: {
-            context: 'outstream'
-          }
-        },
-        bids: [{
-          bidder: 'vertamedia',
-          params: {
-            aid: 331133
-          }
-        }]
-      },
-
-      // Banner adUnit
-      {
-        code: 'div-test-div',
-        sizes: [[300, 250]],
-        bids: [{
-          bidder: 'vertamedia',
-          params: {
-            aid: 350975
-          }
-        }]
-      }
-    ];
-```
diff --git a/modules/vertozBidAdapter.md b/modules/vertozBidAdapter.md
deleted file mode 100644
index 100492da58b..00000000000
--- a/modules/vertozBidAdapter.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Overview
-
-```
-Module Name:  Vertoz Bidder Adapter
-Module Type:  Bidder Adapter
-Maintainer: prebid-team@vertoz.com
-```
-
-# Description
-
-Connects to Vertoz exchange for bids.
-Vertoz Bidder adapter supports Banner ads.
-Use bidder code ```vertoz``` for all Vertoz traffic.
-
-# Test Parameters
-```
-var adUnits = [
-   // Banner adUnit
-   {
-       code: 'banner-div',
-       sizes: [[300, 250], [300,600]],   // a display size(s)
-       bids: [{
-         bidder: 'vertoz',
-         params: {
-           placementId: 'VZ-HB-B784382V6C6G3C'
-         }
-       }]
-   },
-];
-```
-
diff --git a/modules/viBidAdapter.js b/modules/viBidAdapter.js
deleted file mode 100644
index 4a09a2d2fc1..00000000000
--- a/modules/viBidAdapter.js
+++ /dev/null
@@ -1,393 +0,0 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import * as mediaTypes from '../src/mediaTypes.js';
-
-export function get(path, obj, notFound) {
-  path = typeof path === 'string' ? path.split('.') : path;
-
-  while (path.length) {
-    const [key] = path;
-    if (!(obj instanceof Object) || !(key in obj)) return notFound;
-    obj = obj[key];
-    path = path.slice(1);
-  }
-
-  return obj;
-}
-
-export function merge(a, b, fn = a => a) {
-  const res = {};
-
-  for (const key in a) {
-    if (key in b) {
-      res[key] = fn(a[key], b[key]);
-    } else {
-      res[key] = a[key];
-    }
-  }
-
-  for (const key in b) {
-    if (!(key in a)) res[key] = b[key];
-  }
-
-  return res;
-}
-
-export function ratioToPercentageCeil(x) {
-  return Math.ceil(x * 100);
-}
-
-export function getDocumentHeight(curDocument = document) {
-  return Math.max(
-    get('body.clientHeight', curDocument, 0),
-    get('body.scrollHeight', curDocument, 0),
-    get('body.offsetHeight', curDocument, 0),
-    get('documentElement.clientHeight', curDocument, 0),
-    get('documentElement.scrollHeight', curDocument, 0),
-    get('documentElement.offsetHeight', curDocument, 0)
-  );
-}
-
-export function getOffset(element) {
-  const rect = element.getBoundingClientRect();
-  const elementWindow = getElementWindow(element);
-  if (!elementWindow) throw new Error('cannot get element window');
-  const scrollLeft =
-    elementWindow.pageXOffset || get('documentElement.scrollLeft', document, 0);
-  const scrollTop =
-    elementWindow.pageYOffset || get('documentElement.scrollTop', document, 0);
-  return {
-    top: rect.top + scrollTop,
-    right: rect.right + scrollLeft,
-    bottom: rect.bottom + scrollTop,
-    left: rect.left + scrollLeft
-  };
-}
-
-var IframeType;
-
-(function(IframeType) {
-  IframeType['safeframe'] = 'safeframe';
-  IframeType['friendly'] = 'friendly';
-  IframeType['nonfriendly'] = 'nonfriendly';
-})(IframeType || (IframeType = {}));
-
-export function getWindowParents(curWindow = window) {
-  const parents = [];
-
-  while (curWindow && curWindow.parent && curWindow !== curWindow.parent) {
-    parents.push(curWindow.parent);
-    curWindow = curWindow.parent;
-  }
-
-  return parents;
-}
-
-export function getTopmostReachableWindow(curWindow = window) {
-  const parents = getWindowParents(curWindow);
-  return parents.length ? parents[parents.length - 1] : curWindow;
-}
-
-export function topDocumentIsReachable(curWindow = window) {
-  if (!isInsideIframe(curWindow)) return true;
-  const windowParents = getWindowParents(curWindow);
-
-  try {
-    const topWindow = windowParents[windowParents.length - 1];
-
-    return topWindow === curWindow.top && !!curWindow.top.document;
-  } catch (e) {
-    return false;
-  }
-}
-
-export function isInsideIframe(curWindow = window) {
-  return curWindow !== curWindow.top;
-}
-
-export function isInsideSafeframe(curWindow = window) {
-  return !topDocumentIsReachable(curWindow) && !!curWindow.$sf;
-}
-
-export function isInsideFriendlyIframe(curWindow = window) {
-  return isInsideIframe(curWindow) && topDocumentIsReachable(curWindow);
-}
-
-export function getIframeType(curWindow = window) {
-  if (!isInsideIframe(curWindow)) return;
-  if (isInsideSafeframe(curWindow)) return IframeType.safeframe;
-  if (isInsideFriendlyIframe(curWindow)) return IframeType.friendly;
-  return IframeType.nonfriendly;
-}
-
-function getElementWindow(element) {
-  return element.ownerDocument
-    ? element.ownerDocument.defaultView
-    : element.defaultView;
-}
-
-const NO_CUTS = {
-  top: 0,
-  right: 0,
-  bottom: 0,
-  left: 0
-};
-
-export function getRectCuts(rect, vh, vw, vCuts = NO_CUTS) {
-  let { top, left } = rect;
-  const { bottom, right } = rect;
-  top = top + vCuts.top;
-  left = left + vCuts.left;
-  vh = vh + vCuts.bottom;
-  vw = vw + vCuts.right;
-  return {
-    bottom: Math.min(0, vh - bottom),
-    left: Math.min(0, left),
-    right: Math.min(0, vw - right),
-    top: Math.min(0, top)
-  };
-}
-
-export function getFrameElements(curWindow = window) {
-  const frameElements = [];
-
-  while (curWindow && curWindow.frameElement) {
-    frameElements.unshift(curWindow.frameElement);
-    curWindow =
-      curWindow.frameElement.ownerDocument &&
-      curWindow.frameElement.ownerDocument.defaultView;
-  }
-
-  return frameElements;
-}
-
-export function getElementCuts(element, vCuts) {
-  const window = getElementWindow(element);
-  return getRectCuts(
-    element.getBoundingClientRect(),
-    window ? window.innerHeight : 0,
-    window ? window.innerWidth : 0,
-    vCuts
-  );
-}
-
-export function area(width, height, areaCuts = NO_CUTS) {
-  const { top, right, bottom, left } = areaCuts;
-  return Math.max(0, (width + left + right) * (height + top + bottom));
-}
-
-export function getInViewRatio(element) {
-  const elements = [...getFrameElements(getElementWindow(element)), element];
-  const vCuts = elements.reduce(
-    (vCuts, element) => getElementCuts(element, vCuts),
-    NO_CUTS
-  );
-  return (
-    area(element.offsetWidth || 1, element.offsetHeight || 1, vCuts) /
-    area(element.offsetWidth || 1, element.offsetHeight || 1)
-  );
-}
-
-export function getInViewRatioInsideTopFrame(element) {
-  const elements = [...getFrameElements().slice(1), element];
-  const vCuts = elements.reduce(
-    (vCuts, element) => getElementCuts(element, vCuts),
-    NO_CUTS
-  );
-  return (
-    area(element.offsetWidth, element.offsetHeight, vCuts) /
-    area(element.offsetWidth, element.offsetHeight)
-  );
-}
-
-export function getMayBecomeVisible(element) {
-  return !isInsideIframe() || !!getInViewRatioInsideTopFrame(element);
-}
-
-export function getInViewPercentage(element) {
-  return ratioToPercentageCeil(getInViewRatio(element));
-}
-
-export function getOffsetTopDocument(element) {
-  return [...getFrameElements(getElementWindow(element)), element].reduce(
-    (acc, elem) => merge(acc, getOffset(elem), (a, b) => a + b),
-    {
-      top: 0,
-      right: 0,
-      bottom: 0,
-      left: 0
-    }
-  );
-}
-
-export function getOffsetTopDocumentPercentage(element) {
-  const elementWindow = getElementWindow(element);
-  if (!elementWindow) throw new Error('cannot get element window');
-  if (!topDocumentIsReachable(elementWindow)) {
-    throw new Error("top window isn't reachable");
-  }
-  const topWindow = getTopmostReachableWindow(elementWindow);
-  const documentHeight = getDocumentHeight(topWindow.document);
-  return ratioToPercentageCeil(
-    getOffsetTopDocument(element).top / documentHeight
-  );
-}
-
-export function getOffsetToView(element) {
-  const elemWindow = getElementWindow(element);
-  if (!elemWindow) throw new Error('cannot get element window');
-  const topWindow = getTopmostReachableWindow(elemWindow);
-  const { top, bottom } = getOffsetTopDocument(element);
-  const topWindowHeight = topWindow.innerHeight;
-
-  if (bottom < topWindow.scrollY) return bottom - topWindow.scrollY;
-
-  if (top > topWindow.scrollY + topWindowHeight) {
-    return top - topWindow.scrollY - topWindowHeight;
-  }
-
-  return 0;
-}
-
-export function getOffsetToViewPercentage(element) {
-  return ratioToPercentageCeil(
-    getOffsetToView(element) /
-      getDocumentHeight(
-        getTopmostReachableWindow(getElementWindow(element)).document
-      )
-  );
-}
-
-export function getViewabilityDescription(element) {
-  let iframeType;
-  try {
-    if (!element) {
-      return {
-        error: 'no element'
-      };
-    }
-    iframeType = getIframeType(getElementWindow(element));
-    if (!iframeType || iframeType === IframeType.friendly) {
-      const inViewPercentage = getInViewPercentage(element);
-      return {
-        inView: inViewPercentage,
-        hidden: !inViewPercentage && !getMayBecomeVisible(element),
-        offsetTop: getOffsetTopDocumentPercentage(element),
-        offsetView: getOffsetToViewPercentage(element),
-        iframeType
-      };
-    }
-    return {
-      iframeType
-    };
-  } catch (error) {
-    return {
-      iframeType,
-      error: error.message
-    };
-  }
-}
-
-export function mergeArrays(hashFn, ...args) {
-  const seen = {};
-  const merged = [];
-  args.forEach(sizes => {
-    sizes.forEach(size => {
-      const key = hashFn(size);
-      if (!(key in seen)) {
-        seen[key] = true;
-        merged.push(size);
-      }
-    });
-  });
-  return merged;
-}
-
-export function documentFocus(doc) {
-  return typeof doc.hasFocus === 'function' ? +doc.hasFocus() : undefined;
-}
-
-const spec = {
-  code: 'vi',
-  supportedMediaTypes: [mediaTypes.VIDEO, mediaTypes.BANNER],
-
-  isBidRequestValid({ adUnitCode, params: { pubId, lang, cat } = {} }) {
-    return [pubId, lang, cat].every(x => typeof x === 'string');
-  },
-
-  /**
-   *
-   * @param bidRequests
-   * @param bidderRequest
-   * @return {
-   * {method: string,
-   * data: {
-      imps: {
-        bidId: string,
-        adUnitCode: string,
-        sizes: [[number, number]],
-        pubId: string,
-        lang: string,
-        cat: string,
-        iframeType: string | undefined,
-        error: string | null,
-        inView: number,
-        offsetTop: number,
-        offsetView: number,
-        hidden: boolean,
-        bidFloor: number
-      }[],
-      refererInfo: {
-      referer: string
-      reachedTop: boolean,
-      numIframes: number,
-      stack: string[]
-      canonicalUrl: string
-      }
-    },
-   * options: {withCredentials: boolean, contentType: string}, url: string}}
-   */
-  buildRequests(bidRequests, bidderRequest) {
-    return {
-      method: 'POST',
-      url: 'https://pb.vi-serve.com/prebid/bid',
-      data: {
-        refererInfo: bidderRequest.refererInfo,
-        imps: bidRequests.map(
-          ({ bidId, adUnitCode, sizes, params, mediaTypes }) => {
-            const slot = document.getElementById(adUnitCode);
-            const bannerSizes = get('banner.sizes', mediaTypes);
-            const playerSize = get('video.playerSize', mediaTypes);
-
-            const sizesToMerge = [];
-            if (!params.useSizes) {
-              if (sizes) sizesToMerge.push(sizes);
-              if (bannerSizes) sizesToMerge.push(bannerSizes);
-              if (playerSize) sizesToMerge.push(playerSize);
-            } else if (params.useSizes === 'banner' && bannerSizes) {
-              sizesToMerge.push(bannerSizes);
-            } else if (params.useSizes === 'video' && playerSize) {
-              sizesToMerge.push(playerSize);
-            }
-            return {
-              bidId,
-              adUnitCode,
-              sizes: mergeArrays(x => x.join(','), ...sizesToMerge),
-              ...getViewabilityDescription(slot),
-              ...params
-            };
-          }
-        ),
-        focus: documentFocus(document)
-      },
-      options: {
-        contentType: 'application/json',
-        withCredentials: true
-      }
-    };
-  },
-
-  interpretResponse({ body }) {
-    return body;
-  }
-};
-registerBidder(spec);
diff --git a/modules/viBidAdapter.md b/modules/viBidAdapter.md
deleted file mode 100644
index 2608ccc4adb..00000000000
--- a/modules/viBidAdapter.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Overview
-
-```
-Module Name: vi bid adapter
-Module Type: Bidder adapter
-Maintainer: support@vi.ai
-```
-
-# Description
-
-The video intelligence (vi) adapter integration to the Prebid library.
-Connects to vi’s demand sources.
-There should be only one ad unit with vi bid adapter on each single page.
-
-# Test Parameters
-
-```
-var adUnits = [{
-    code: 'div-0',
-    sizes: [[320, 480]],
-    bids: [{
-        bidder: 'vi',
-        params: {
-            pubId: 'sb_test',
-            lang: 'en-US',
-            cat: 'IAB1',
-	        bidFloor: 0.05 //optional
-        }
-    }]
-}];
-```
-
-# Parameters
-
-| Name          | Scope    | Description                                     | Example                           |
-| :------------ | :------- | :---------------------------------------------- | :--------------------------------- |
-| `pubId` | required | Publisher ID, provided by vi           | 'sb_test' |
-| `lang`      | required | Ad language, in ISO 639-1 language code format  | 'en-US', 'es-ES', 'de'              |
-| `cat`      | required | Ad IAB category (top-level or subcategory), single one supported  | 'IAB1', 'IAB9-1'        |
-| `bidFloor`      | optional | Lowest value of expected bid price  | 0.001        |
-| `useSizes`      | optional | Specifies from which section of the config sizes are taken, possible values are 'banner', 'video'. If omitted, sizes from both sections are merged.  | 'banner'  |
-
diff --git a/modules/vibrantmediaBidAdapter.js b/modules/vibrantmediaBidAdapter.js
new file mode 100644
index 00000000000..371b70448e5
--- /dev/null
+++ b/modules/vibrantmediaBidAdapter.js
@@ -0,0 +1,231 @@
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+/*
+ * Vibrant Media Ltd.
+ *
+ * Prebid Adapter for sending bid requests to the prebid server and bid responses back to the client
+ *
+ * Note: Only BANNER and VIDEO are currently supported by the prebid server.
+ */
+
+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];
+
+/**
+ * Returns whether the given bid request contains at least one supported media request, which has valid data. (We can
+ * ignore invalid/unsupported ones, as they will be filtered out by the prebid server.)
+ *
+ * @param {*} bidRequest the bid requests sent by the Prebid API.
+ *
+ * @return {boolean} true if the given bid request contains at least one supported media request with valid details,
+ *                   otherwise false.
+ */
+const areValidSupportedMediaTypesPresent = function(bidRequest) {
+  const mediaTypes = Object.keys(bidRequest.mediaTypes);
+
+  return mediaTypes.some(function(mediaType) {
+    if (mediaType === BANNER) {
+      return true;
+    } else if (mediaType === VIDEO) {
+      return (bidRequest.mediaTypes[VIDEO].context === OUTSTREAM);
+    } else if (mediaType === NATIVE) {
+      return !!bidRequest.mediaTypes[NATIVE].image;
+    }
+
+    return false;
+  });
+};
+
+/**
+ * Returns whether the given URL contains just a domain, and not (for example) a subdirectory or query parameters.
+ * @param {string} url the URL to check.
+ * @returns {boolean} whether the URL contains just a domain.
+ */
+const isBaseUrl = function(url) {
+  const urlMinusScheme = url.substring(url.indexOf('://') + 3);
+  const endOfDomain = urlMinusScheme.indexOf('/');
+  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.
+ *
+ * @param {*[]} bidRequests the bid requests sent by the Prebid API.
+ *
+ * @returns {*[]} the transformed bid requests.
+ */
+const transformBidRequests = function(bidRequests) {
+  const transformedBidRequests = [];
+
+  bidRequests.forEach(function(bidRequest) {
+    const params = bidRequest.params || {};
+    const transformedBidRequest = {
+      code: bidRequest.adUnitCode || bidRequest.code,
+      id: bidRequest.placementId || params.placementId || params.invCode,
+      requestId: bidRequest.bidId || bidRequest.transactionId,
+      bidder: bidRequest.bidder,
+      mediaTypes: bidRequest.mediaTypes,
+      bids: bidRequest.bids,
+      sizes: bidRequest.sizes
+    };
+
+    transformedBidRequests.push(transformedBidRequest);
+  });
+
+  return transformedBidRequests;
+};
+
+/** @type {BidderSpec} */
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+
+  /**
+   * Transforms the 'raw' bid params into ones that this adapter can use, prior to creating the bid request.
+   *
+   * @param {object} bidParams the params to transform.
+   *
+   * @returns {object} the bid params.
+   */
+  transformBidParams: function(bidParams) {
+    return bidParams;
+  },
+
+  /**
+   * Determines whether or not the given bid request is valid. For all bid requests passed to the buildRequests
+   * function, each will have been passed to this function and this function will have returned true.
+   *
+   * @param {object} bid the bid params to validate.
+   *
+   * @return {boolean} true if this is a valid bid, otherwise false.
+   * @see SUPPORTED_MEDIA_TYPES
+   */
+  isBidRequestValid: function(bid) {
+    const areBidRequestParamsValid = !!(bid.params.placementId || (bid.params.member && bid.params.invCode));
+    return areBidRequestParamsValid && areValidSupportedMediaTypesPresent(bid);
+  },
+
+  /**
+   * Return a prebid server request from the list of bid requests.
+   *
+   * @param {BidRequest[]}  validBidRequests an array of bids validated via the isBidRequestValid function.
+   * @param {BidderRequest} bidderRequest    an object with data common to all bid requests.
+   *
+   * @return ServerRequest Info describing the request to the prebid server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    const transformedBidRequests = transformBidRequests(validBidRequests);
+
+    var url = window.parent.location.href;
+
+    if ((window.self === window.top) && (!url || (url.substr(0, 4) !== 'http') || isBaseUrl(url))) {
+      url = document.URL;
+    }
+
+    url = encodeURIComponent(url);
+
+    const prebidData = {
+      url,
+      gdpr: bidderRequest.gdprConsent,
+      usp: bidderRequest.uspConsent,
+      window: {
+        width: window.innerWidth,
+        height: window.innerHeight,
+      },
+      biddata: transformedBidRequests,
+    };
+
+    return {
+      method: 'POST',
+      url: VIBRANT_MEDIA_PREBID_URL,
+      data: JSON.stringify(prebidData)
+    };
+  },
+
+  /**
+   * Translate the Kormorant prebid server response into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse a successful response from the prebid server.
+   * @param {BidRequest}     bidRequest     the original bid request associated with this response.
+   *
+   * @return {Bid[]} an array of bids returned by the prebid server, translated into the expected Prebid.js format.
+   */
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bids = serverResponse.body;
+
+    bids.forEach(function(bid) {
+      bid.adResponse = serverResponse;
+    });
+
+    return bids;
+  },
+
+  /**
+   * Called if the Prebid API gives up waiting for a prebid server response.
+   *
+   * Example timeout data:
+   *
+   * [{
+   *   "bidder": "example",
+   *   "bidId": "51ef8751f9aead",
+   *   "params": {
+   *     ...
+   *   },
+   *   "adUnitCode": "div-gpt-ad-1460505748561-0",
+   *   "timeout": 3000,
+   *   "auctionId": "18fd8b8b0bd757"
+   * }]
+   *
+   * @param {{}} timeoutData data relating to the timeout.
+   */
+  onTimeout: function(timeoutData) {
+    logError('Timed out waiting for bids: ' + JSON.stringify(timeoutData));
+  },
+
+  /**
+   * Called when a bid returned by the prebid server is successful.
+   *
+   * Example bid won data:
+   *
+   * {
+   *   "bidder": "example",
+   *   "width": 300,
+   *   "height": 250,
+   *   "adId": "330a22bdea4cac",
+   *   "mediaType": "banner",
+   *   "cpm": 0.28
+   *   "ad": "...",
+   *   "requestId": "418b37f85e772c",
+   *   "adUnitCode": "div-gpt-ad-1460505748561-0",
+   *   "size": "350x250",
+   *   "adserverTargeting": {
+   *     "hb_bidder": "example",
+   *     "hb_adid": "330a22bdea4cac",
+   *     "hb_pb": "0.20",
+   *     "hb_size": "350x250"
+   *   }
+   * }
+   *
+   * @param {*} bidData the data associated with the won bid. See example above for data format.
+   */
+  onBidWon: function(bidData) {
+    if (bidData && bidData.meta && isValidPixelUrl(bidData.meta.wp)) {
+      triggerPixel(`${bidData.meta.wp}${bidData.status}`);
+    }
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/vibrantmediaBidAdapter.md b/modules/vibrantmediaBidAdapter.md
new file mode 100644
index 00000000000..ce5db42fdb5
--- /dev/null
+++ b/modules/vibrantmediaBidAdapter.md
@@ -0,0 +1,92 @@
+## Overview
+
+**Module Name:** Vibrant Media Bidder Adapter
+
+**Module Type:** Bidder Adapter
+
+**Maintainer:** kormorant@vibrantmedia.com
+
+## Description
+
+Module that allows Vibrant Media to provide ad bids for banner, native and video (outstream only).
+
+## Test Parameters
+
+```javascript
+var adUnits = [
+  // Banner ad unit
+  {
+    code: 'test-banner',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    bids: [{
+      bidder: 'vibrantmedia',
+      params: {
+        placementId: 12345
+      }
+    }]
+  },
+
+  // Video (outstream) ad unit
+  {
+    code: 'test-video-outstream',
+    sizes: [[300, 250]],
+    mediaTypes: {
+      video: {
+        playerSize: [[300, 250]],
+        context: 'outstream',
+        minduration: 1,      // Minimum ad duration, in seconds
+        maxduration: 60,     // Maximum ad duration, in seconds
+        skip: 0,             // 1 - true, 0 - false
+        skipafter: 5,        // Number of seconds before the video can be skipped
+        playbackmethod: [2], // Auto-play without sound
+        protocols: [1, 2, 3] // VAST 1.0, 2.0 and 3.0
+      }
+    },
+    bids: [
+      {
+        bidder: 'vibrantmedia',
+        params: {
+          placementId: 67890,
+          video: {
+            skippable: true,
+            playback_method: 'auto_play_sound_off'
+          }
+        }
+      }
+    ]
+  },
+
+  // Native ad unit
+  {
+    code: 'test-native',
+    mediaTypes: {
+      native: {
+        image: {
+          required: true,
+          sizes: [300, 250]
+        },
+        title: {
+          required: true
+        },
+        sponsoredBy: {
+          required: true
+        },
+        clickUrl: {
+          required: true
+        },
+      }
+    },
+    bids: [{
+      bidder: 'vibrantmedia',
+      params: {
+        placementId: 13579,
+        allowSmallerSizes: true
+      }
+    }]
+  }
+];
+```
diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 3eea270dc8d..bb3e4abd838 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -1,60 +1,116 @@
-import * as utils from '../src/utils.js';
+import { _each, deepAccess, parseSizesInput, parseUrl, uniques, isFn } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { bidderSettings } from '../src/bidderSettings.js';
 
+const GVLID = 744;
 const DEFAULT_SUB_DOMAIN = 'prebid';
 const BIDDER_CODE = 'vidazoo';
 const BIDDER_VERSION = '1.0.0';
 const CURRENCY = 'USD';
 const TTL_SECONDS = 60 * 5;
-const INTERNAL_SYNC_TYPE = {
-  IFRAME: 'iframe',
-  IMAGE: 'img'
-};
-const EXTERNAL_SYNC_TYPE = {
-  IFRAME: 'iframe',
-  IMAGE: 'image'
-};
+const DEAL_ID_EXPIRY = 1000 * 60 * 15;
+const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 60;
+const SESSION_ID_KEY = 'vidSid';
+const OPT_CACHE_KEY = 'vdzwopt';
 export const SUPPORTED_ID_SYSTEMS = {
   'britepoolid': 1,
   'criteoId': 1,
-  'digitrustid': 1,
   'id5id': 1,
   'idl_env': 1,
   'lipb': 1,
   'netId': 1,
-  'parrableid': 1,
+  'parrableId': 1,
   'pubcid': 1,
   'tdid': 1,
+  'pubProvidedId': 1
 };
+const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE });
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = parseUrl(window.top.document.URL, { decodeSearchAsString: true });
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
 
 export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
   return `https://${subDomain}.cootlogix.com`;
 }
 
+export function extractCID(params) {
+  return params.cId || params.CID || params.cID || params.CId || params.cid || params.ciD || params.Cid || params.CiD;
+}
+
+export function extractPID(params) {
+  return params.pId || params.PID || params.pID || params.PId || params.pid || params.piD || params.Pid || params.PiD;
+}
+
+export function extractSubDomain(params) {
+  return params.subDomain || params.SubDomain || params.Subdomain || params.subdomain || params.SUBDOMAIN || params.subDOMAIN;
+}
+
 function isBidRequestValid(bid) {
   const params = bid.params || {};
-  return !!(params.cId && params.pId);
+  return !!(extractCID(params) && extractPID(params));
 }
 
 function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
-  const { params, bidId, userId, adUnitCode } = bid;
-  const { bidFloor, cId, pId, ext, subDomain } = params;
+  const { params, bidId, userId, adUnitCode, schain, mediaTypes } = bid;
+  const { ext } = params;
+  let { bidFloor } = params;
   const hashUrl = hashCode(topWindowUrl);
   const dealId = getNextDealId(hashUrl);
+  const uniqueDealId = getUniqueDealId(hashUrl);
+  const sId = getVidazooSessionId();
+  const cId = extractCID(params);
+  const pId = extractPID(params);
+  const subDomain = extractSubDomain(params);
+  const ptrace = getCacheOpt();
+  const isStorageAllowed = bidderSettings.get(BIDDER_CODE, 'storageAllowed');
+
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid', deepAccess(bid, 'ortb2Imp.ext.data.pbadslot', ''));
+  const cat = deepAccess(bidderRequest, 'ortb2.site.cat', []);
+  const pagecat = deepAccess(bidderRequest, 'ortb2.site.pagecat', []);
+
+  if (isFn(bid.getFloor)) {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (floorInfo.currency === 'USD') {
+      bidFloor = floorInfo.floor;
+    }
+  }
 
   let data = {
     url: encodeURIComponent(topWindowUrl),
+    uqs: getTopWindowQueryParams(),
     cb: Date.now(),
     bidFloor: bidFloor,
     bidId: bidId,
+    referrer: bidderRequest.refererInfo.ref,
     adUnitCode: adUnitCode,
     publisherId: pId,
+    sessionId: sId,
     sizes: sizes,
     dealId: dealId,
+    uniqueDealId: uniqueDealId,
     bidderVersion: BIDDER_VERSION,
     prebidVersion: '$prebid.version$',
-    res: `${screen.width}x${screen.height}`
+    res: `${screen.width}x${screen.height}`,
+    schain: schain,
+    mediaTypes: mediaTypes,
+    ptrace: ptrace,
+    isStorageAllowed: isStorageAllowed,
+    gpid: gpid,
+    cat: cat,
+    pagecat: pagecat
   };
 
   appendUserIdsToRequestPayload(data, userId);
@@ -68,15 +124,16 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     }
   }
   if (bidderRequest.uspConsent) {
-    data.usPrivacy = bidderRequest.uspConsent
+    data.usPrivacy = bidderRequest.uspConsent;
   }
+
   const dto = {
     method: 'POST',
     url: `${createDomain(subDomain)}/prebid/multi/${cId}`,
     data: data
   };
 
-  utils._each(ext, (value, key) => {
+  _each(ext, (value, key) => {
     dto.data['ext.' + key] = value;
   });
 
@@ -85,17 +142,23 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
 
 function appendUserIdsToRequestPayload(payloadRef, userIds) {
   let key;
-  utils._each(userIds, (userId, idSystemProviderName) => {
+  _each(userIds, (userId, idSystemProviderName) => {
     if (SUPPORTED_ID_SYSTEMS[idSystemProviderName]) {
       key = `uid.${idSystemProviderName}`;
 
       switch (idSystemProviderName) {
         case 'digitrustid':
-          payloadRef[key] = utils.deepAccess(userId, 'data.id');
+          payloadRef[key] = deepAccess(userId, 'data.id');
           break;
         case 'lipb':
           payloadRef[key] = userId.lipbid;
           break;
+        case 'parrableId':
+          payloadRef[key] = userId.eid;
+          break;
+        case 'id5id':
+          payloadRef[key] = userId.uid;
+          break;
         default:
           payloadRef[key] = userId;
       }
@@ -104,10 +167,11 @@ function appendUserIdsToRequestPayload(payloadRef, userIds) {
 }
 
 function buildRequests(validBidRequests, bidderRequest) {
-  const topWindowUrl = bidderRequest.refererInfo.referer;
+  // TODO: does the fallback make sense here?
+  const topWindowUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
   const requests = [];
   validBidRequests.forEach(validBidRequest => {
-    const sizes = utils.parseSizesInput(validBidRequest.sizes);
+    const sizes = parseSizesInput(validBidRequest.sizes);
     const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest);
     requests.push(request);
   });
@@ -125,11 +189,12 @@ function interpretResponse(serverResponse, request) {
 
   try {
     results.forEach(result => {
-      const { creativeId, ad, price, exp, width, height, currency } = result;
+      const { creativeId, ad, price, exp, width, height, currency, advertiserDomains, mediaType = BANNER } = result;
       if (!ad || !price) {
         return;
       }
-      output.push({
+
+      const response = {
         requestId: bidId,
         cpm: price,
         width: width,
@@ -138,8 +203,22 @@ function interpretResponse(serverResponse, request) {
         currency: currency || CURRENCY,
         netRevenue: true,
         ttl: exp || TTL_SECONDS,
-        ad: ad
-      })
+        meta: {
+          advertiserDomains: advertiserDomains || []
+        }
+      };
+
+      if (mediaType === BANNER) {
+        Object.assign(response, {
+          ad: ad,
+        });
+      } else {
+        Object.assign(response, {
+          vastXml: ad,
+          mediaType: VIDEO
+        });
+      }
+      output.push(response);
     });
     return output;
   } catch (e) {
@@ -147,42 +226,29 @@ function interpretResponse(serverResponse, request) {
   }
 }
 
-function getUserSyncs(syncOptions, responses) {
+function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '') {
+  let syncs = [];
   const { iframeEnabled, pixelEnabled } = syncOptions;
+  const { gdprApplies, consentString = '' } = gdprConsent;
 
+  const cidArr = responses.filter(resp => deepAccess(resp, 'body.cid')).map(resp => resp.body.cid).filter(uniques);
+  const params = `?cid=${encodeURIComponent(cidArr.join(','))}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`
   if (iframeEnabled) {
-    return [{
+    syncs.push({
       type: 'iframe',
-      url: 'https://static.cootlogix.com/basev/sync/user_sync.html'
-    }];
+      url: `https://sync.cootlogix.com/api/sync/iframe/${params}`
+    });
   }
-
   if (pixelEnabled) {
-    const lookup = {};
-    const syncs = [];
-    responses.forEach(response => {
-      const { body } = response;
-      const results = body ? body.results || [] : [];
-      results.forEach(result => {
-        (result.cookies || []).forEach(cookie => {
-          if (cookie.type === INTERNAL_SYNC_TYPE.IMAGE) {
-            if (pixelEnabled && !lookup[cookie.src]) {
-              syncs.push({
-                type: EXTERNAL_SYNC_TYPE.IMAGE,
-                url: cookie.src
-              });
-            }
-          }
-        });
-      });
+    syncs.push({
+      type: 'image',
+      url: `https://sync.cootlogix.com/api/sync/image/${params}`
     });
-    return syncs;
   }
-
-  return [];
+  return syncs;
 }
 
-function hashCode(s, prefix = '_') {
+export function hashCode(s, prefix = '_') {
   const l = s.length;
   let h = 0
   let i = 0;
@@ -192,39 +258,84 @@ function hashCode(s, prefix = '_') {
   return prefix + h;
 }
 
-function getNextDealId(key) {
+export function getNextDealId(key, expiry = DEAL_ID_EXPIRY) {
   try {
-    const currentValue = Number(getStorageItem(key) || 0);
+    const data = getStorageItem(key);
+    let currentValue = 0;
+    let timestamp;
+
+    if (data && data.value && Date.now() - data.created < expiry) {
+      currentValue = data.value;
+      timestamp = data.created;
+    }
+
     const nextValue = currentValue + 1;
-    setStorageItem(key, nextValue);
+    setStorageItem(key, nextValue, timestamp);
     return nextValue;
   } catch (e) {
     return 0;
   }
 }
 
-function getStorage() {
-  return window['sessionStorage'];
+export function getUniqueDealId(key, expiry = UNIQUE_DEAL_ID_EXPIRY) {
+  const storageKey = `u_${key}`;
+  const now = Date.now();
+  const data = getStorageItem(storageKey);
+  let uniqueId;
+
+  if (!data || !data.value || now - data.created > expiry) {
+    uniqueId = `${key}_${now.toString()}`;
+    setStorageItem(storageKey, uniqueId);
+  } else {
+    uniqueId = data.value;
+  }
+
+  return uniqueId;
 }
 
-function getStorageItem(key) {
-  try {
-    return getStorage().getItem(key);
-  } catch (e) {
-    return null;
+export function getVidazooSessionId() {
+  return getStorageItem(SESSION_ID_KEY) || '';
+}
+
+export function getCacheOpt() {
+  let data = storage.getDataFromLocalStorage(OPT_CACHE_KEY);
+  if (!data) {
+    data = String(Date.now());
+    storage.setDataInLocalStorage(OPT_CACHE_KEY, data);
   }
+
+  return data;
 }
 
-function setStorageItem(key, value) {
+export function getStorageItem(key) {
   try {
-    getStorage().setItem(key, String(value));
+    return tryParseJSON(storage.getDataFromLocalStorage(key));
   } catch (e) { }
+
+  return null;
+}
+
+export function setStorageItem(key, value, timestamp) {
+  try {
+    const created = timestamp || Date.now();
+    const data = JSON.stringify({ value, created });
+    storage.setDataInLocalStorage(key, data);
+  } catch (e) { }
+}
+
+export function tryParseJSON(value) {
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return value;
+  }
 }
 
 export const spec = {
   code: BIDDER_CODE,
   version: BIDDER_VERSION,
-  supportedMediaTypes: [BANNER],
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid,
   buildRequests,
   interpretResponse,
diff --git a/modules/vidazooBidAdapter.md b/modules/vidazooBidAdapter.md
index df7700cb05a..c8fd5956d2a 100644
--- a/modules/vidazooBidAdapter.md
+++ b/modules/vidazooBidAdapter.md
@@ -20,7 +20,7 @@ var adUnits = [
       {
         bidder: 'vidazoo',
         params: {
-          cId: '5a1c419d95fce900044c334e',
+          cId: '562524b21b1c1f08117fc7f9',
           pId: '59ac17c192832d0011283fe3',
           bidFloor: 0.0001,
           ext: {
diff --git a/modules/videoModule/adQueue.js b/modules/videoModule/adQueue.js
new file mode 100644
index 00000000000..a6da3752f6e
--- /dev/null
+++ b/modules/videoModule/adQueue.js
@@ -0,0 +1,63 @@
+import { AD_BREAK_END, AUCTION_AD_LOAD_ATTEMPT, AUCTION_AD_LOAD_QUEUED, SETUP_COMPLETE } from '../../libraries/video/constants/events.js'
+import { getExternalVideoEventName } from '../../libraries/video/shared/helpers.js'
+
+export function AdQueueCoordinator(videoCore, pbEvents) {
+  const storage = {};
+
+  function registerProvider(divId) {
+    storage[divId] = [];
+    videoCore.onEvents([SETUP_COMPLETE], onSetupComplete, divId);
+  }
+
+  function queueAd(adTagUrl, divId, options) {
+    const queue = storage[divId];
+    if (queue) {
+      queue.push({adTagUrl, options});
+      triggerEvent(AUCTION_AD_LOAD_QUEUED, adTagUrl, options);
+    } else {
+      loadAd(divId, adTagUrl, options);
+    }
+  }
+
+  return {
+    registerProvider,
+    queueAd
+  };
+
+  function onSetupComplete(eventName, eventPayload) {
+    const divId = eventPayload.divId;
+    videoCore.offEvents([SETUP_COMPLETE], onSetupComplete, divId);
+    loadQueuedAd(divId);
+  }
+
+  function onAdBreakEnd(eventName, eventPayload) {
+    loadQueuedAd(eventPayload.divId);
+  }
+
+  function loadQueuedAd(divId) {
+    videoCore.offEvents([AD_BREAK_END], onAdBreakEnd, divId);
+    const adQueue = storage[divId];
+    if (!adQueue) {
+      return;
+    }
+
+    if (!adQueue.length) {
+      delete storage[divId];
+      return;
+    }
+
+    const queuedAd = adQueue.shift();
+    videoCore.onEvents([AD_BREAK_END], onAdBreakEnd, divId);
+    loadAd(divId, queuedAd.adTagUrl, queuedAd.options);
+  }
+
+  function loadAd(divId, adTagUrl, options) {
+    triggerEvent(AUCTION_AD_LOAD_ATTEMPT, adTagUrl, options);
+    videoCore.setAdTagUrl(adTagUrl, divId, options);
+  }
+
+  function triggerEvent(eventName, adTagUrl, options) {
+    const payload = Object.assign({ adTagUrl }, options);
+    pbEvents.emit(getExternalVideoEventName(eventName), payload);
+  }
+}
diff --git a/modules/videoModule/addingSubmodule.md b/modules/videoModule/addingSubmodule.md
new file mode 100644
index 00000000000..2f880fdef3a
--- /dev/null
+++ b/modules/videoModule/addingSubmodule.md
@@ -0,0 +1,528 @@
+# How to Add a Video Submodule
+
+Video submodules interact with the Video Module to integrate Prebid with Video Players, allowing Prebid to automatically:
+- render bids in the desired video player
+- mark used bids as won
+- trigger player and media events
+- populate the oRTB Video Impression and Content params in the bid request
+
+## Overview
+
+The Prebid Video Module simplifies the way Prebid integrates with video players by acting as a single point of contact for everything video.
+In order for the Video Module to connect to a video player, a submodule must be implemented. The submodule acts as a bridge between the Video Module and the video player.
+The Video Module will route commands and tasks to the appropriate submodule instance.
+A submodule is expected to work for a specific video player. i.e. the JW Player submodule is used to integrate Prebid with JW Player. The video.js submdule connects to video.js.
+Publishers who use players from different vendors on the same page can use multiple video submodules.
+
+## Requirements
+
+The Video Module only supports integration with Video Players that meet the following requirements:
+- Must support parsing and reproduction of VAST ads
+    - Input can be an ad tag URL or the actual Vast XML.
+- Must expose an API that allows the procurement of [Open RTB params](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf) for Video (section 3.2.7) and Content (section 3.2.16).
+- Must emit javascript events for Ads and Media
+    - see [Event Registration](#event-registration)
+
+## Creating a Submodule
+
+### Step 1: Add a markdown file describing the submodule
+
+Create a markdown file under `modules` with the name of the module suffixed with 'VideoProvider', i.e. `exampleVideoProvider.md`.
+
+Example markdown file:
+```markdown
+# Overview
+
+Module Name: Example Video Provider
+Module Type: Video Submodule
+Video Player: Example player
+Player website: example-player.com
+Maintainer: someone@example.com
+
+# Description
+
+Video provider for Example Player. Contact someone@example.com for information.
+
+# Requirements
+
+Your page must link the Example Player build from our CDN. Alternatively yu can use npm to load the build.
+```
+
+### Step 2: Add a Vendor Code
+
+Vendor codes are required to indicate which submodule type to instantiate. Add your vendor code constant to an export const in `vendorCodes.js` in Prebid.js under `libraries/video/constants/vendorCodes.js`.
+i.e. in `vendorCodes.js`:
+
+```javascript
+export const EXAMPLE_PLAYER_VENDOR = 3;
+```
+
+### Step 2: Build the Module
+
+Now create a javascript file under `modules` with the name of the module suffixed with 'VideoProvider', e.g., `exampleVideoProvider.js`.
+
+#### The Submodule factory
+
+The Video Module will need a submodule instance for every player instance registered with Prebid. You will therefore need to implement a submodule factory which is called with a `videoProviderConfig` argument and returns a Video Provider instance.
+Your submodule should import your vendor code constant and set it to a `vendorCode` property on your submodule factory.
+Your submodule should also import the `submodule` function from `src/hook.js` and should use it to register as a submodule of `'video'`.
+
+**Code Example**
+
+```javascript
+import { submodule } from '../src/hook.js';
+
+function exampleSubmoduleFactory(videoProviderConfig) {
+    const videoProvider = {
+      // implementation
+    };
+
+  return videoProvider;
+}
+
+exampleSubmoduleFactory.vendorCode = EXAMPLE_VENDOR;
+submodule('video', exampleSubmoduleFactory);
+```
+
+#### The Submodule object
+
+The submodule object must adhere to the `VideoProvider` interface defined in the `coreVideo.js` inline documentation.
+
+#### Event registration
+
+Submodules must support attaching and detaching event listeners on the video player. The list of events are defined in the Events file in the Video Library: `libraries/video/constants/events.js`.
+All events and their params must be supported.
+
+##### Event params
+
+All Video Module events include a `divId` and `type` param in the payload by default.
+The `divId` is the div id string of the player emitting the event; it can be used as an identifier. The `type` is the string name of the event.
+The remaining Payload params are listed in the following:
+
+###### SETUP_COMPLETE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playerVersion | string | The version of the player on the page |
+| viewable | boolean | Is the player currently viewable? |
+| viewabilityPercentage | number | The percentage of the video that is currently viewable on the user's screen. |
+| mute | boolean | Whether or not the player is currently muted. |
+| volumePercentage | number | The volume of the player, as a percentage |
+
+###### SETUP_FAILED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playerVersion | string | The version of the player on the page |
+| errorCode | number | The identifier of the error preventing the media from rendering |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+
+###### DESTROYED
+No additional params.
+
+###### AD_REQUEST
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+
+###### AD_BREAK_START
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+
+###### AD_LOADED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+
+###### AD_STARTED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+
+<a name="ad-impression-params" />
+
+###### AD_IMPRESSION
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+| time | number | The playback time in the ad when the event occurs, in seconds. |
+| duration | number | Total duration of an ad in seconds |
+
+###### AD_PLAY
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+
+###### AD_TIME
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| time | number | The current poisition in the ad timeline |
+| duration | number | Total duration of an ad in seconds |
+
+###### AD_PAUSE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+
+###### AD_CLICK
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+| time | number | The playback time in the ad when the event occurs, in seconds. |
+| duration | number | Total duration of an ad in seconds |
+
+###### AD_SKIPPED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| time | number | The playback time in the ad when the event occurs, in seconds. |
+| duration | number | Total duration of an ad in seconds |
+
+<a name="ad-error-params" />
+
+###### AD_ERROR
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playerErrorCode | number | The ad error code from the Player’s internal spec. |
+| vastErrorCode | number | The error code for the VAST response that is returned from the request, as defined in the VAST spec. |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+| time | number | The playback time in the ad when the event occurs, in seconds. |
+| duration | number | Total duration of an ad in seconds |
+
+###### AD_COMPLETE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+
+###### AD_BREAK_END
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+
+###### PLAYLIST
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playlistItemCount | number | The number of items in the current playlist |
+| autostart | boolean | Whether or not the player is set to begin playing automatically. |
+
+###### PLAYBACK_REQUEST
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playReason | string | wWy the play attempt originated. Options: ‘Unknown’ (Unknown reason:we cannot tell), ‘Interaction’ (A viewer interacts with the UI), ‘Auto’ (Autoplay based on the configuration of the player - autoStart), ‘autoOnViewable’ (autoStart when viewable), ‘autoRepeat’ (media automatically restarted after completion, without any user interaction), ‘Api’ (caused by a call on the player’s API), ‘Internal’ (started because of an internal mechanism i.e. playlist progressed to a recommended item) |
+
+###### AUTOSTART_BLOCKED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| errorCode | number | The identifier of error preventing the media from rendering |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+
+###### PLAY_ATTEMPT_FAILED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playReason | string | Why the play attempt originated. Options: ‘Unknown’ (Unknown reason:we cannot tell), ‘Interaction’ (A viewer interacts with the UI), ‘Auto’ (Autoplay based on the configuration of the player - autoStart), ‘autoOnViewable’ (autoStart when viewable), ‘autoRepeat’ (media automatically restarted after completion, without any user interaction), ‘Api’ (caused by a call on the player’s API), ‘Internal’ (started because of an internal mechanism i.e. playlist progressed to a recommended item) |
+| errorCode | number | The identifier of error preventing the media from rendering |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+
+###### CONTENT_LOADED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| contentId | string | The unique identifier of the media item being rendered by the video player. Nullable when not provided by Publisher, or unknown. |
+| contentUrl | string | The URL of the media source of the playlist item |
+| title | string | The title of the content; not meant to be used as a unique identifier. Nullable when not provided by Publisher, or unknown. |
+| description | string | The description of the content. Nullable when not provided by Publisher, or unknown. |
+| playlistIndex | number | The currently playing media item's index in the playlist. |
+| contentTags | array[string] | Customer media level tags describing the content. Nullable when not provided by Publisher, or unknown. |
+
+###### PLAY
+
+No additional params.
+
+###### PAUSE
+
+No additional params.
+
+###### BUFFER
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| time | number | Playback position of the media in seconds |
+| duration | number | Current media’s length in seconds |
+| playbackMode | number | The current playback mode used by a given player. Enum list: vod: 0, live: 1, dvr: 2 |
+
+###### TIME
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| position | number | Playback position of the media in seconds |
+| duration | number | Current media’s length in seconds |
+
+###### SEEK_START
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| position | number | Playback position of the media in seconds, when the seek begins |
+| destination | number | Desired playback position of a seek action, in seconds |
+| duration | number | Current media’s length in seconds |
+
+###### SEEK_END
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| position | number | Playback position of the media in seconds, when the seek has ended |
+| duration | number | Current media’s length in seconds |
+
+###### MUTE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| mute | boolean | Whether or not the player is currently muted. |
+
+###### VOLUME
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| volumePercentage | number | The volume of the player, as a percentage |
+
+###### RENDITION_UPDATE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| videoReportedBitrate | number | The bitrate of the currently playing video in kbps as reported by the Adaptive Manifest. |
+| audioReportedBitrate | number | The bitrate of the currently playing audio in kbps as reported by the Adaptive Manifest. |
+| encodedVideoWidth | number | The encoded width in pixels of the currently playing video rendition. |
+| encodedVideoHeight | number | The encoded height in pixels of the currently playing video rendition. |
+| videoFramerate | number | The current rate of playback. For a video that is playing twice as fast as the default playback, the playbackRate value should be 2.00 |
+
+###### ERROR
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| errorCode | number | The identifier of the error preventing the media from rendering |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+
+###### COMPLETE
+
+No additional params.
+
+###### PLAYLIST_COMPLETE
+
+No additional params.
+
+###### FULLSCREEN
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| fullscreen | boolean | Whether or not the player is currently in fullscreen |
+
+###### PLAYER_RESIZE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| height | number | The height of the player in pixels |
+| width | number | The width of the player in pixels |
+
+###### VIEWABLE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| viewable | boolean | Is the player currently viewable? |
+| viewabilityPercentage | number | The percentage of the video that is currently viewable on the user's screen. |
+
+###### CAST
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| casting | boolean | Whether or not the current user is casting to a device |
+
+###### AUCTION_AD_LOAD_ATTEMPT
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| adUnitCode | string | Unique identifier that was used when creating the ad unit. |
+
+###### AUCTION_AD_LOAD_QUEUED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| adUnitCode | string | Unique identifier that was used when creating the ad unit. |
+
+###### AUCTION_AD_LOAD_ABORT
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adUnitCode | string | Unique identifier that was used when creating the ad unit. |
+
+###### BID_IMPRESSION
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| bid | object |  Information about the Bid which resulted in the Ad Impression |
+| adEvent | object | Event payload from the [Ad Impression](#ad-impression-params) |
+
+###### BID_ERROR
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| bid | object | Information about the Bid which resulted in the Ad Error |
+| adEvent | object | Event payload from the [Ad Error](#ad-error-params) |
+
+#### Update .submodules.json
+
+In prebid.js, add your new submodule to `.submodules.json` under the `videoModule` as such:
+{% highlight text %}
+```
+{
+  "parentModules": {
+    "videoModule": [
+      "exampleVideoProvider"
+    ]
+  }
+}
+```
+
+### Shared resources for developers
+
+A video library containing reusable code and constants has been added to Prebid.js for your convenience. We encourage you to import from this library.
+Constants such as event names can be found in the `libraries/video/constants/` folder.
diff --git a/modules/videoModule/coreVideo.js b/modules/videoModule/coreVideo.js
new file mode 100644
index 00000000000..ce66acc2b02
--- /dev/null
+++ b/modules/videoModule/coreVideo.js
@@ -0,0 +1,240 @@
+import { module } from '../../src/hook.js';
+import { ParentModule, SubmoduleBuilder } from '../../libraries/video/shared/parentModule.js';
+
+// define, ortb object,  events
+
+/**
+ * Video Provider Submodule interface. All submodules of the Core Video module must adhere to this.
+ * @description attached to a video player instance.
+ * @typedef {Object} VideoProvider
+ * @function init - Instantiates the Video Provider and the video player, if not already instantiated.
+ * @function getId - retrieves the div id (unique identifier) of the attached player instance.
+ * @function getOrtbVideo - retrieves the oRTB Video params for a player's current video session.
+ * @function getOrtbContent - retrieves the oRTB Content params for a player's current video session.
+ * @function setAdTagUrl - Requests that a player render the ad in the provided ad tag url.
+ * @function onEvent - attaches an event listener to the player instance.
+ * @function offEvent - removes event listener to the player instance.
+ * @function destroy - deallocates the player instance
+ */
+
+/**
+ * @function VideoProvider#init
+ */
+
+/**
+ * @function VideoProvider#getId
+ * @returns {string}
+ */
+
+/**
+ * @function VideoProvider#getOrtbVideo
+ * @returns {Object}
+ */
+
+/**
+ * @function VideoProvider#getOrtbContent
+ * @returns {Object}
+ */
+
+/**
+ * @function VideoProvider#setAdTagUrl
+ * @param {string} adTagUrl - URL to a VAST ad tag
+ * @param {Object} options - Optional params
+ */
+
+/**
+ * @function VideoProvider#onEvent
+ * @param {string} event - name of event for which the listener should be added
+ * @param {function} callback - function that will get called when the event is triggered
+ * @param {Object} basePayload - Base payload for every event; includes common parameters such as divId and type. Event payload should be built on top of this.
+ */
+
+/**
+ * @function VideoProvider#offEvent
+ * @param {string} event - name of event for which the attached listener should be removed
+ * @param {function} callback - function that was assigned as a callback when the listener was added
+ */
+
+/**
+ * @function VideoProvider#destroy
+ */
+
+/**
+ * @typedef {Object} videoProviderConfig
+ * @name videoProviderConfig
+ * @summary contains data indicating which submodule to create and which player instance to attach it to
+ * @property {string} divId - unique identifier of the player instance
+ * @property {number} vendorCode - numeric identifier of the Video Provider type i.e. video.js or jwplayer
+ * @property {playerConfig} playerConfig
+ */
+
+/**
+ * @typedef {Object} playerConfig
+ * @name playerConfig
+ * @summary contains data indicating the behavior the player instance should have
+ * @property {boolean} autoStart - determines if the player should start automatically when instantiated
+ * @property {boolean} mute - determines if the player should be muted when instantiated
+ * @property {string} licenseKey - authentication key required for commercial players. Optional for free players.
+ * @property {playerVendorParams} params
+ */
+
+/**
+ * @typedef playerVendorParams
+ * @name playerVendorParams
+ * @summary configuration options specific to a Video Vendor's Provider
+ * @property {Object} vendorConfig - the settings object which can be used as an argument when instantiating a player. Specific to the video player's API.
+ */
+
+/**
+ * @typedef videoEvent
+ *
+ */
+
+/**
+ * Routes commands to the appropriate video submodule.
+ * @typedef {Object} VideoCore
+ * @class
+ * @function registerProvider
+ * @function getOrtbVideo
+ * @function getOrtbContent
+ * @function setAdTagUrl
+ * @function onEvents
+ * @function offEvents
+ */
+
+/**
+ * @summary Maps a Video Provider factory to the video player's vendor code.
+ * @type {vendorSubmoduleDirectory}
+ */
+const videoVendorDirectory = {};
+
+/**
+ * @constructor
+ * @param {ParentModule} parentModule_
+ * @returns {VideoCore}
+ */
+export function VideoCore(parentModule_) {
+  const parentModule = parentModule_;
+
+  /**
+   * requests that a submodule be instantiated for the specific player instance described by the @providerConfig
+   * @name VideoCore#registerProvider
+   * @param {videoProviderConfig} providerConfig
+   */
+  function registerProvider(providerConfig) {
+    try {
+      parentModule.registerSubmodule(providerConfig.divId, providerConfig.vendorCode, providerConfig);
+    } catch (e) {}
+  }
+
+  function initProvider(divId) {
+    const submodule = parentModule.getSubmodule(divId);
+    submodule && submodule.init && submodule.init();
+  }
+
+  /**
+   * @name VideoCore#getOrtbVideo
+   * @summary Obtains the oRTB Video params for a player's current video session.
+   * @param {string} divId - unique identifier of the player instance
+   * @returns {Object} oRTB Video params
+   */
+  function getOrtbVideo(divId) {
+    const submodule = parentModule.getSubmodule(divId);
+    return submodule && submodule.getOrtbVideo();
+  }
+
+  /**
+   * @name VideoCore#getOrtbContent
+   * @summary Obtains the oRTB Content params for a player's current video session.
+   * @param {string} divId - unique identifier of the player instance
+   * @returns {Object} oRTB Content params
+   */
+  function getOrtbContent(divId) {
+    const submodule = parentModule.getSubmodule(divId);
+    return submodule && submodule.getOrtbContent();
+  }
+
+  /**
+   * @name VideoCore#setAdTagUrl
+   * @summary Requests that a player render the ad in the provided ad tag
+   * @param {string} adTagUrl - URL to a VAST ad tag
+   * @param {string} divId - unique identifier of the player instance
+   * @param {Object} options - additional params
+   */
+  function setAdTagUrl(adTagUrl, divId, options) {
+    const submodule = parentModule.getSubmodule(divId);
+    submodule && submodule.setAdTagUrl(adTagUrl, options);
+  }
+
+  /**
+   * @name VideoCore#onEvents
+   * @summary attaches event listeners
+   * @param {[string]} events - List of event names for which the listener should be added
+   * @param {function} callback - function that will get called when one of the events is triggered
+   * @param {string} divId - unique identifier of the player instance
+   */
+  function onEvents(events, callback, divId) {
+    if (!callback) {
+      return;
+    }
+
+    const submodule = parentModule.getSubmodule(divId);
+    if (!submodule) {
+      return;
+    }
+
+    for (let i = 0; i < events.length; i++) {
+      const type = events[i];
+      const basePayload = {
+        divId,
+        type
+      };
+      submodule.onEvent(type, callback, basePayload);
+    }
+  }
+
+  /**
+   * @name VideoCore#offEvents
+   * @summary removes event listeners
+   * @param {[string]} events - List of event names for which the listener should be removed
+   * @param {function} callback - function that was assigned as a callback when the listener was added
+   * @param {string} divId - unique identifier of the player instance
+   */
+  function offEvents(events, callback, divId) {
+    const submodule = parentModule.getSubmodule(divId);
+    if (!submodule) {
+      return;
+    }
+
+    events.forEach(event => {
+      submodule.offEvent(event, callback);
+    });
+  }
+
+  return {
+    registerProvider,
+    initProvider,
+    getOrtbVideo,
+    getOrtbContent,
+    setAdTagUrl,
+    onEvents,
+    offEvents
+  };
+}
+
+/**
+ * @function videoCoreFactory
+ * @summary Factory to create a Video Core instance
+ * @returns {VideoCore}
+ */
+export function videoCoreFactory() {
+  const videoSubmoduleBuilder = SubmoduleBuilder(videoVendorDirectory);
+  const parentModule = ParentModule(videoSubmoduleBuilder);
+  return VideoCore(parentModule);
+}
+
+function attachVideoProvider(submoduleFactory) {
+  videoVendorDirectory[submoduleFactory.vendorCode] = submoduleFactory;
+}
+
+module('video', attachVideoProvider);
diff --git a/modules/videoModule/gamAdServerSubmodule.js b/modules/videoModule/gamAdServerSubmodule.js
new file mode 100644
index 00000000000..87db71ae38b
--- /dev/null
+++ b/modules/videoModule/gamAdServerSubmodule.js
@@ -0,0 +1,27 @@
+import { GAM_VENDOR } from '../../libraries/video/constants/vendorCodes.js';
+import { getGlobal } from '../../src/prebidGlobal.js';
+
+/**
+ * @constructor
+ * @param {Object} dfpModule_ - the DFP ad server module
+ * @returns {AdServerProvider}
+ */
+function GamAdServerProvider(dfpModule_) {
+  const dfp = dfpModule_;
+
+  function getAdTagUrl(adUnit, baseAdTag, params) {
+    return dfp.buildVideoUrl({ adUnit: adUnit, url: baseAdTag, params });
+  }
+
+  return {
+    getAdTagUrl
+  }
+}
+
+export function gamSubmoduleFactory() {
+  const dfp = getGlobal().adServers.dfp;
+  const gamProvider = GamAdServerProvider(dfp);
+  return gamProvider;
+}
+
+gamSubmoduleFactory.vendorCode = GAM_VENDOR;
diff --git a/modules/videoModule/index.js b/modules/videoModule/index.js
new file mode 100644
index 00000000000..fb3c621918d
--- /dev/null
+++ b/modules/videoModule/index.js
@@ -0,0 +1,251 @@
+import { config } from '../../src/config.js';
+import { find } from '../../src/polyfill.js';
+import * as events from '../../src/events.js';
+import { mergeDeep } from '../../src/utils.js';
+import { getGlobal } from '../../src/prebidGlobal.js';
+import CONSTANTS from '../../src/constants.json';
+import {
+  videoEvents,
+  AUCTION_AD_LOAD_ATTEMPT,
+  AD_IMPRESSION,
+  AD_ERROR,
+  BID_IMPRESSION,
+  BID_ERROR,
+  AUCTION_AD_LOAD_ABORT,
+  AUCTION_AD_LOAD_QUEUED
+} from '../../libraries/video/constants/events.js'
+import { PLACEMENT } from '../../libraries/video/constants/ortb.js';
+import { videoKey } from '../../libraries/video/constants/constants.js'
+import { videoCoreFactory } from './coreVideo.js';
+import { gamSubmoduleFactory } from './gamAdServerSubmodule.js';
+import { videoImpressionVerifierFactory } from './videoImpressionVerifier.js';
+import { AdQueueCoordinator } from './adQueue.js';
+import { getExternalVideoEventName } from '../../libraries/video/shared/helpers.js'
+
+const allVideoEvents = Object.keys(videoEvents).map(eventKey => videoEvents[eventKey]);
+events.addEvents(allVideoEvents.concat([AUCTION_AD_LOAD_ATTEMPT, AUCTION_AD_LOAD_QUEUED, AUCTION_AD_LOAD_ABORT, BID_IMPRESSION, BID_ERROR]).map(getExternalVideoEventName));
+
+/**
+ * This module adds User Video support to prebid.js
+ * @module modules/videoModule
+ */
+export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvents_, gamAdServerFactory_, videoImpressionVerifierFactory_, adQueueCoordinator_) {
+  const videoCore = videoCore_;
+  const getConfig = getConfig_;
+  const pbGlobal = pbGlobal_;
+  const requestBids = pbGlobal.requestBids;
+  const pbEvents = pbEvents_;
+  const videoEvents = videoEvents_;
+  const gamAdServerFactory = gamAdServerFactory_;
+  const adQueueCoordinator = adQueueCoordinator_;
+  let gamSubmodule;
+  let mainContentDivId;
+  let contentEnrichmentEnabled = true;
+  const videoImpressionVerifierFactory = videoImpressionVerifierFactory_;
+  let videoImpressionVerifier;
+
+  function init() {
+    const cache = getConfig('cache');
+    videoImpressionVerifier = videoImpressionVerifierFactory(!!cache);
+    getConfig(videoKey, ({ video }) => {
+      video.providers.forEach(provider => {
+        const divId = provider.divId;
+        videoCore.registerProvider(provider);
+        adQueueCoordinator.registerProvider(divId);
+        videoCore.initProvider(divId);
+        videoCore.onEvents(videoEvents, (type, payload) => {
+          pbEvents.emit(getExternalVideoEventName(type), payload);
+        }, divId);
+
+        const adServerConfig = provider.adServer;
+        if (!gamSubmodule && adServerConfig) {
+          gamSubmodule = gamAdServerFactory();
+        }
+      });
+      contentEnrichmentEnabled = video.contentEnrichmentEnabled !== false;
+      mainContentDivId = contentEnrichmentEnabled ? video.mainContentDivId : null;
+    });
+
+    requestBids.before(beforeBidsRequested, 40);
+
+    pbEvents.on(CONSTANTS.EVENTS.BID_ADJUSTMENT, function (bid) {
+      videoImpressionVerifier.trackBid(bid);
+    });
+
+    pbEvents.on(getExternalVideoEventName(AD_IMPRESSION), function (payload) {
+      triggerVideoBidEvent(BID_IMPRESSION, payload);
+    });
+
+    pbEvents.on(getExternalVideoEventName(AD_ERROR), function (payload) {
+      triggerVideoBidEvent(BID_ERROR, payload);
+    });
+  }
+
+  function renderBid(divId, bid, options = {}) {
+    const adUrl = bid.vastUrl;
+    options.adXml = bid.vastXml;
+    options.winner = bid.bidder;
+    loadAdTag(adUrl, divId, options);
+  }
+
+  function getOrtbVideo(divId) {
+    return videoCore.getOrtbVideo(divId);
+  }
+
+  function getOrtbContent(divId) {
+    return videoCore.getOrtbContent(divId);
+  }
+
+  return { init, renderBid, getOrtbVideo, getOrtbContent };
+
+  function beforeBidsRequested(nextFn, bidderRequest) {
+    enrichAuction(bidderRequest);
+
+    const bidsBackHandler = bidderRequest.bidsBackHandler;
+    if (!bidsBackHandler || typeof bidsBackHandler !== 'function') {
+      pbEvents.on(CONSTANTS.EVENTS.AUCTION_END, auctionEnd);
+    }
+
+    return nextFn.call(this, bidderRequest);
+  }
+
+  function enrichAuction(bidderRequest) {
+    if (mainContentDivId) {
+      enrichOrtb2(mainContentDivId, bidderRequest);
+    }
+
+    const adUnits = bidderRequest.adUnits || pbGlobal.adUnits || [];
+    adUnits.forEach(adUnit => {
+      const divId = getDivId(adUnit);
+      enrichAdUnit(adUnit, divId);
+      if (contentEnrichmentEnabled && !mainContentDivId) {
+        enrichOrtb2(divId, bidderRequest);
+      }
+    });
+  }
+
+  function getDivId(adUnit) {
+    const videoConfig = adUnit.video;
+    if (!adUnit.mediaTypes.video || !videoConfig) {
+      return;
+    }
+
+    return videoConfig.divId;
+  }
+
+  function enrichAdUnit(adUnit, videoDivId) {
+    const ortbVideo = getOrtbVideo(videoDivId);
+    if (!ortbVideo) {
+      return;
+    }
+
+    const video = Object.assign({}, adUnit.mediaTypes.video, ortbVideo);
+
+    video.context = ortbVideo.placement === PLACEMENT.INSTREAM ? 'instream' : 'outstream';
+
+    const width = ortbVideo.w;
+    const height = ortbVideo.h;
+    if (width && height) {
+      video.playerSize = [width, height];
+    }
+
+    adUnit.mediaTypes.video = video;
+  }
+
+  function enrichOrtb2(divId, bidderRequest) {
+    const ortbContent = getOrtbContent(divId);
+    if (!ortbContent) {
+      return;
+    }
+    bidderRequest.ortb2 = mergeDeep({}, bidderRequest.ortb2, { site: { content: ortbContent } });
+  }
+
+  function auctionEnd(auctionResult) {
+    auctionResult.adUnits.forEach(adUnit => {
+      if (adUnit.video) {
+        renderWinningBid(adUnit);
+      }
+    });
+    pbEvents.off(CONSTANTS.EVENTS.AUCTION_END, auctionEnd);
+  }
+
+  function getAdServerConfig(adUnitVideoConfig) {
+    const globalVideoConfig = getConfig(videoKey);
+    const globalProviderConfig = globalVideoConfig.providers.find(provider => provider.divId === adUnitVideoConfig.divId) || {};
+    if (!globalVideoConfig.adServer && !globalProviderConfig.adServer && !adUnitVideoConfig.adServer) {
+      return;
+    }
+    return mergeDeep({}, globalVideoConfig.adServer, globalProviderConfig.adServer, adUnitVideoConfig.adServer);
+  }
+
+  function renderWinningBid(adUnit) {
+    const adUnitCode = adUnit.code;
+    const options = { adUnitCode };
+
+    const videoConfig = adUnit.video;
+    const divId = videoConfig.divId;
+    const adServerConfig = getAdServerConfig(videoConfig);
+    let adUrl;
+    if (adServerConfig) {
+      adUrl = gamSubmodule.getAdTagUrl(adUnit, adServerConfig.baseAdTagUrl, adServerConfig.params);
+    }
+
+    if (adUrl) {
+      loadAdTag(adUrl, divId, options);
+      return;
+    }
+
+    const highestCpmBids = pbGlobal.getHighestCpmBids(adUnitCode);
+    if (!highestCpmBids.length) {
+      pbEvents.emit(getExternalVideoEventName(AUCTION_AD_LOAD_ABORT), options);
+      return;
+    }
+
+    const highestBid = highestCpmBids.shift();
+    if (!highestBid) {
+      return;
+    }
+
+    renderBid(divId, highestBid, options);
+  }
+
+  // options: adXml, winner, adUnitCode,
+  function loadAdTag(adTagUrl, divId, options) {
+    adQueueCoordinator.queueAd(adTagUrl, divId, options);
+  }
+
+  function triggerVideoBidEvent(eventName, adEventPayload) {
+    const bid = getBid(adEventPayload);
+    if (!bid) {
+      return;
+    }
+
+    pbGlobal.markWinningBidAsUsed(bid);
+    pbEvents.emit(getExternalVideoEventName(eventName), { bid, adEvent: adEventPayload });
+  }
+
+  function getBid(adPayload) {
+    const { adId, adTagUrl, wrapperAdIds } = adPayload;
+    const bidIdentifiers = videoImpressionVerifier.getBidIdentifiers(adId, adTagUrl, wrapperAdIds);
+    if (!bidIdentifiers) {
+      return;
+    }
+
+    const { adUnitCode, requestId, auctionId } = bidIdentifiers;
+    const bidAdId = bidIdentifiers.adId;
+    const { bids } = pbGlobal.getBidResponsesForAdUnitCode(adUnitCode);
+    return find(bids, bid => bid.adId === bidAdId && bid.requestId === requestId && bid.auctionId === auctionId);
+  }
+}
+
+export function pbVideoFactory() {
+  const videoCore = videoCoreFactory();
+  const adQueueCoordinator = AdQueueCoordinator(videoCore, events);
+  const pbGlobal = getGlobal();
+  const pbVideo = PbVideo(videoCore, config.getConfig, pbGlobal, events, allVideoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory, adQueueCoordinator);
+  pbVideo.init();
+  pbGlobal.videoModule = pbVideo;
+  return pbVideo;
+}
+
+pbVideoFactory();
diff --git a/modules/videoModule/videoImpressionVerifier.js b/modules/videoModule/videoImpressionVerifier.js
new file mode 100644
index 00000000000..60717c0f855
--- /dev/null
+++ b/modules/videoModule/videoImpressionVerifier.js
@@ -0,0 +1,206 @@
+import { find } from '../../src/polyfill.js';
+import { vastXmlEditorFactory } from '../../libraries/video/shared/vastXmlEditor.js';
+import { generateUUID } from '../../src/utils.js';
+
+export const PB_PREFIX = 'pb_';
+export const UUID_MARKER = PB_PREFIX + 'uuid';
+
+/**
+ * Video Impression Verifier interface. All implementations of a Video Impression Verifier must comply with this interface.
+ * @description adds tracking markers to an ad and extracts the bid identifiers from ad event information.
+ * @typedef {Object} VideoImpressionVerifier
+ * @function trackBid - requests that a bid's ad be tracked for impression verification.
+ * @function getBidIdentifiers - requests information from the ad event data that can be used to match the ad to a tracked bid.
+ */
+
+/**
+ * @function VideoImpressionVerifier#trackBid
+ * @param {Object} bid - Bid that should be tracked.
+ * @return {String} - Identifier for the bid being tracked.
+ */
+
+/**
+ * @function VideoImpressionVerifier#getBidIdentifiers
+ * @param {String} adId - In the VAST tag, this value is present in the Ad element's id property.
+ * @param {String} adTagUrl - The ad tag url that was loaded into the player.
+ * @param {[String]} adWrapperIds - List of ad id's that were obtained from the different wrappers. Each redirect points to an ad wrapper.
+ * @return {bidIdentifier} - Object allowing the bid matching the ad event to be identified.
+ */
+
+/**
+ * @typedef {Object} bidIdentifier
+ * @property {String} adId - Bid identifier.
+ * @property {String} adUnitCode - Identifier for the Ad Unit for which the bid was made.
+ * @property {String} auctionId - Id of the auction in which the bid was made.
+ * @property {String} requestId - Id of the bid request which resulted in the bid.
+ */
+
+/**
+ * Factory function for obtaining a Video Impression Verifier.
+ * @param {Boolean} isCacheUsed - wether Prebid is configured to use a cache.
+ * @return {VideoImpressionVerifier}
+ */
+export function videoImpressionVerifierFactory(isCacheUsed) {
+  const vastXmlEditor = vastXmlEditorFactory();
+  const bidTracker = tracker();
+  if (isCacheUsed) {
+    return cachedVideoImpressionVerifier(vastXmlEditor, bidTracker);
+  }
+
+  return videoImpressionVerifier(vastXmlEditor, bidTracker);
+}
+
+export function videoImpressionVerifier(vastXmlEditor_, bidTracker_) {
+  const verifier = baseImpressionVerifier(bidTracker_);
+  const superTrackBid = verifier.trackBid;
+  const vastXmlEditor = vastXmlEditor_;
+
+  verifier.trackBid = function(bid) {
+    let { vastXml, vastUrl } = bid;
+    if (!vastXml && !vastUrl) {
+      return;
+    }
+
+    const uuid = superTrackBid(bid);
+
+    if (vastUrl) {
+      const url = new URL(vastUrl);
+      url.searchParams.append(UUID_MARKER, uuid);
+      bid.vastUrl = url.toString();
+    } else if (vastXml) {
+      bid.vastXml = vastXmlEditor.getVastXmlWithTracking(vastXml, uuid);
+    }
+
+    return uuid;
+  }
+
+  return verifier;
+}
+
+export function cachedVideoImpressionVerifier(vastXmlEditor_, bidTracker_) {
+  const verifier = baseImpressionVerifier(bidTracker_);
+  const superTrackBid = verifier.trackBid;
+  const superGetBidIdentifiers = verifier.getBidIdentifiers;
+  const vastXmlEditor = vastXmlEditor_;
+
+  verifier.trackBid = function (bid, globalAdUnits) {
+    const adIdOverride = superTrackBid(bid);
+    let { vastXml, vastUrl, adId, adUnitCode } = bid;
+    const adUnit = find(globalAdUnits, adUnit => adUnitCode === adUnit.code);
+    const videoConfig = adUnit && adUnit.video;
+    const adServerConfig = videoConfig && videoConfig.adServer;
+    const trackingConfig = adServerConfig && adServerConfig.tracking;
+    let impressionUrl;
+    let impressionId;
+    let errorUrl;
+    const impressionTracking = trackingConfig.impression;
+    const errorTracking = trackingConfig.error;
+
+    if (impressionTracking) {
+      impressionUrl = getTrackingUrl(impressionTracking.getUrl, bid);
+      impressionId = impressionTracking.id || adId + '-impression';
+    }
+
+    if (errorTracking) {
+      errorUrl = getTrackingUrl(errorTracking.getUrl, bid);
+    }
+
+    if (vastXml) {
+      vastXml = vastXmlEditor.getVastXmlWithTracking(vastXml, adIdOverride, impressionUrl, impressionId, errorUrl);
+    } else if (vastUrl) {
+      vastXml = vastXmlEditor.buildVastWrapper(adIdOverride, vastUrl, impressionUrl, impressionId, errorUrl);
+    }
+
+    bid.vastXml = vastXml;
+    return adIdOverride;
+  }
+
+  verifier.getBidIdentifiers = function (adId, adTagUrl, adWrapperIds) {
+    // When the video is cached, the ad tag loaded into the player is a parent wrapper of the cache url.
+    // As a result, the ad tag Url cannot include identifiers.
+    return superGetBidIdentifiers(adId, null, adWrapperIds);
+  }
+
+  return verifier;
+
+  function getTrackingUrl(getUrl, bid) {
+    if (!getUrl || typeof getUrl !== 'function') {
+      return;
+    }
+
+    return getUrl(bid);
+  }
+}
+
+export function baseImpressionVerifier(bidTracker_) {
+  const bidTracker = bidTracker_;
+
+  function trackBid(bid) {
+    let { adId, adUnitCode, requestId, auctionId } = bid;
+    const trackingId = PB_PREFIX + generateUUID(10 ** 13);
+    bidTracker.store(trackingId, { adId, adUnitCode, requestId, auctionId });
+    return trackingId;
+  }
+
+  function getBidIdentifiers(adId, adTagUrl, adWrapperIds) {
+    return bidTracker.remove(adId) || getBidForAdTagUrl(adTagUrl) || getBidForAdWrappers(adWrapperIds);
+  }
+
+  return {
+    trackBid,
+    getBidIdentifiers
+  };
+
+  function getBidForAdTagUrl(adTagUrl) {
+    if (!adTagUrl) {
+      return;
+    }
+
+    let url;
+    try {
+      url = new URL(adTagUrl);
+    } catch (e) {
+      return;
+    }
+
+    const queryParams = url.searchParams;
+    let uuid = queryParams.get(UUID_MARKER);
+    return uuid && bidTracker.remove(uuid);
+  }
+
+  function getBidForAdWrappers(adWrapperIds) {
+    if (!adWrapperIds || !adWrapperIds.length) {
+      return;
+    }
+
+    for (const wrapperId in adWrapperIds) {
+      const bidInfo = bidTracker.remove(wrapperId);
+      if (bidInfo) {
+        return bidInfo;
+      }
+    }
+  }
+}
+
+export function tracker() {
+  const model = {};
+
+  function store(key, value) {
+    model[key] = value;
+  }
+
+  function remove(key) {
+    const value = model[key];
+    if (!value) {
+      return;
+    }
+
+    delete model[key];
+    return value;
+  }
+
+  return {
+    store,
+    remove
+  }
+}
diff --git a/modules/videoNowBidAdapter.js b/modules/videoNowBidAdapter.js
deleted file mode 100644
index b391af08d49..00000000000
--- a/modules/videoNowBidAdapter.js
+++ /dev/null
@@ -1,187 +0,0 @@
-import * as utils from '../src/utils.js'
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { BANNER } from '../src/mediaTypes.js'
-import { loadExternalScript } from '../src/adloader.js'
-
-const RTB_URL = 'https://bidder.videonow.ru/prebid'
-
-const BIDDER_CODE = 'videonow'
-const TTL_SECONDS = 60 * 5
-
-function isBidRequestValid(bid) {
-  return !!(bid && bid.params && bid.params.pId)
-}
-
-function buildRequest(bid, bidderRequest) {
-  const { refererInfo } = bidderRequest
-  const { ext, bidId, params, code, sizes } = bid
-  const { pId, bidFloor, cur, placementId, url: rtbUrl } = params || {}
-
-  let url = rtbUrl || RTB_URL
-  url = `${url}${~url.indexOf('?') ? '&' : '?'}profile_id=${pId}`
-
-  const dto = {
-    method: 'POST',
-    url,
-    data: {
-      id: bidId,
-      cpm: bidFloor,
-      code,
-      sizes,
-      cur: cur || 'RUB',
-      placementId,
-      ref: refererInfo && refererInfo.referer,
-    },
-  }
-
-  ext && Object.keys(ext).forEach(key => {
-    dto.data[`ext_${key}`] = ext[key]
-  })
-
-  return dto
-}
-
-function buildRequests(validBidRequests, bidderRequest) {
-  utils.logInfo(`${BIDDER_CODE}. buildRequests`)
-  const requests = []
-  validBidRequests.forEach(validBidRequest => {
-    const request = buildRequest(validBidRequest, bidderRequest)
-    request && requests.push(request)
-  })
-  return requests
-}
-
-function interpretResponse(serverResponse, bidRequest) {
-  if (!serverResponse || !serverResponse.body) {
-    return []
-  }
-  const { id: bidId } = (bidRequest && bidRequest.data) || {}
-  if (!bidId) return []
-
-  const { seatbid, cur, ext } = serverResponse.body
-  if (!seatbid || !seatbid.length) return []
-
-  const { placementId } = ext || {}
-  if (!placementId) return []
-
-  const bids = []
-  seatbid.forEach(sb => {
-    const { bid } = sb
-    bid && bid.length && bid.forEach(b => {
-      const res = createResponseBid(b, bidId, cur, placementId)
-      res && bids.push(res)
-    })
-  })
-
-  return bids
-}
-
-function createResponseBid(bidInfo, bidId, cur, placementId) {
-  const { id, nurl, code, price, crid, ext, ttl, netRevenue, w, h, adm } = bidInfo
-
-  if (!id || !price || !adm) {
-    return null
-  }
-
-  const { init: initPath, module, format } = ext || {}
-  if (!initPath) {
-    utils.logError(`vnInitModulePath is not defined`)
-    return null
-  }
-
-  const { log, min } = module || {}
-
-  if (!min && !log) {
-    utils.logError('module\'s paths are not defined')
-    return null
-  }
-
-  return {
-    requestId: bidId,
-    cpm: price,
-    width: w,
-    height: h,
-    creativeId: crid,
-    currency: cur || 'RUB',
-    netRevenue: netRevenue !== undefined ? netRevenue : true,
-    ttl: ttl || TTL_SECONDS,
-    ad: code,
-    nurl,
-    renderer: {
-      url: min || log,
-      render: function() {
-        const d = window.document
-        const el = placementId && d.getElementById(placementId)
-        if (el) {
-          const pId = 1
-          // prepare data for vn_init script
-          const profileData = {
-            module,
-            dataXml: adm,
-          }
-
-          format && (profileData.format = format)
-
-          // add init data for vn_init on the page
-          const videonow = window.videonow = window.videonow || {}
-          const init = videonow.init = window.videonow.init || {}
-          init[pId] = profileData
-
-          // add vn_init js on the page
-          loadExternalScript(`${initPath}${~initPath.indexOf('?') ? '&' : '?'}profileId=${pId}`, 'outstream')
-        } else {
-          utils.logError(`bidAdapter ${BIDDER_CODE}: ${placementId} not found`)
-        }
-      }
-    }
-  }
-}
-
-function getUserSyncs(syncOptions, serverResponses) {
-  const syncs = []
-
-  if (!serverResponses || !serverResponses.length) return syncs
-
-  serverResponses.forEach(response => {
-    const { ext } = (response && response.body) || {}
-    const { pixels, iframes } = ext || {}
-
-    if (syncOptions.iframeEnabled && iframes && iframes.length) {
-      iframes.forEach(i => syncs.push({
-        type: 'iframe',
-        url: i,
-      }),
-      )
-    }
-
-    if (syncOptions.pixelEnabled && pixels && pixels.length) {
-      pixels.forEach(p => syncs.push({
-        type: 'image',
-        url: p,
-      }),
-      )
-    }
-  })
-
-  utils.logInfo(`${BIDDER_CODE} getUserSyncs() syncs=${syncs.length}`)
-  return syncs
-}
-
-function onBidWon(bid) {
-  const { nurl } = bid || {}
-  if (nurl) {
-    utils.triggerPixel(utils.replaceAuctionPrice(nurl, bid.cpm));
-  }
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs,
-  onBidWon
-}
-
-registerBidder(spec)
diff --git a/modules/videoNowBidAdapter.md b/modules/videoNowBidAdapter.md
deleted file mode 100644
index 2ac2a431378..00000000000
--- a/modules/videoNowBidAdapter.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Overview
-
-```
-Module Name: Videonow Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: info@videonow.ru
-```
-
-# Description
-
-Connect to Videonow for bids.
-
-The Videonow bidder adapter requires setup and approval from the videoNow team.
-Please reach out to your account team or info@videonow.ru for more information.
-
-# Test Parameters
-```javascript
-var adUnits = [
-   // Banner adUnit
-   {
-      code: 'banner-div',
-      mediaTypes: {
-        banner: {
-          sizes: [[640, 480], [300, 250], [336, 280]]
-        }
-      },
-      bids: [{
-         bidder: 'videonow',
-         params: {
-           pId: 1,
-           placementId: '36891'
-         }
-       }]
-   }]
-```
diff --git a/modules/videobyteBidAdapter.js b/modules/videobyteBidAdapter.js
new file mode 100644
index 00000000000..2ecc3d481aa
--- /dev/null
+++ b/modules/videobyteBidAdapter.js
@@ -0,0 +1,318 @@
+import { logMessage, logError, deepAccess, isFn, isPlainObject, isStr, isNumber, isArray, deepSetValue } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {VIDEO} from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'videobyte';
+const DEFAULT_BID_TTL = 300;
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_NET_REVENUE = true;
+const VIDEO_ORTB_PARAMS = [
+  'mimes',
+  'minduration',
+  'maxduration',
+  'placement',
+  'protocols',
+  'startdelay',
+  'skip',
+  'skipafter',
+  'minbitrate',
+  'maxbitrate',
+  'delivery',
+  'playbackmethod',
+  'api',
+  'linearity'
+];
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [VIDEO],
+  VERSION: '1.0.0',
+  ENDPOINT: 'https://x.videobyte.com/ortbhb',
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bidRequest The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bidRequest) {
+    return validateVideo(bidRequest);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param bidRequests - an array of bid requests
+   * @param bidderRequest
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (bidRequests, bidderRequest) {
+    if (!bidRequests) {
+      return;
+    }
+    return bidRequests.map(bidRequest => {
+      const {params} = bidRequest;
+      let pubId = params.pubId;
+      const placementId = params.placementId;
+      const nId = params.nid;
+      if (bidRequest.params.video && bidRequest.params.video.e2etest) {
+        logMessage('E2E test mode enabled');
+        pubId = 'e2etest'
+      }
+      let baseEndpoint = spec.ENDPOINT + '?pid=' + pubId;
+      if (placementId) {
+        baseEndpoint += '&placementId=' + placementId
+      }
+      if (nId) {
+        baseEndpoint += '&nid=' + nId
+      }
+      return {
+        method: 'POST',
+        url: baseEndpoint,
+        data: JSON.stringify(buildRequestData(bidRequest, bidderRequest)),
+      }
+    });
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param bidRequest
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse) {
+    const bidResponses = [];
+    const response = (serverResponse || {}).body;
+    // one seat  with (optional) bids for each impression
+    if (response && response.seatbid && response.seatbid.length === 1 && response.seatbid[0].bid && response.seatbid[0].bid.length === 1) {
+      const bid = response.seatbid[0].bid[0]
+      if (bid.adm && bid.price) {
+        let bidResponse = {
+          requestId: response.id,
+          bidderCode: spec.code,
+          cpm: bid.price,
+          width: bid.w,
+          height: bid.h,
+          ttl: DEFAULT_BID_TTL,
+          creativeId: bid.crid,
+          netRevenue: DEFAULT_NET_REVENUE,
+          currency: DEFAULT_CURRENCY,
+          mediaType: 'video',
+          vastXml: bid.adm,
+          meta: {
+            advertiserDomains: bid.adomain
+          }
+        };
+        bidResponses.push(bidResponse)
+      }
+    }
+    return bidResponses;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function(syncOptions, serverResponses) {
+    let syncs = [];
+
+    if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
+      return syncs;
+    }
+
+    serverResponses.forEach(resp => {
+      const userSync = deepAccess(resp, 'body.ext.usersync');
+      if (userSync) {
+        let syncDetails = [];
+        Object.keys(userSync).forEach(key => {
+          const value = userSync[key];
+          if (value.syncs && value.syncs.length) {
+            syncDetails = syncDetails.concat(value.syncs);
+          }
+        });
+        syncDetails.forEach(syncDetails => {
+          syncs.push({
+            type: syncDetails.type === 'iframe' ? 'iframe' : 'image',
+            url: syncDetails.url
+          });
+        });
+
+        // if iframe is enabled return only iframe (videobyte)
+        // if iframe is disabled, we can proceed to pixels if any
+        if (syncOptions.iframeEnabled) {
+          syncs = syncs.filter(s => s.type === 'iframe')
+        } else if (syncOptions.pixelEnabled) {
+          syncs = syncs.filter(s => s.type === 'image')
+        }
+      }
+    });
+    return syncs;
+  }
+
+}
+
+// BUILD REQUESTS: VIDEO
+function buildRequestData(bidRequest, bidderRequest) {
+  const {params} = bidRequest;
+
+  const videoAdUnit = deepAccess(bidRequest, 'mediaTypes.video', {});
+  const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
+
+  const videoParams = {
+    ...videoAdUnit,
+    ...videoBidderParams // Bidder Specific overrides
+  };
+
+  if (bidRequest.params.video && bidRequest.params.video.e2etest) {
+    videoParams.playerSize = [[640, 480]]
+    videoParams.conext = 'instream'
+  }
+
+  const video = {
+    w: parseInt(videoParams.playerSize[0][0], 10),
+    h: parseInt(videoParams.playerSize[0][1], 10),
+  }
+
+  // Obtain all ORTB params related video from Ad Unit
+  VIDEO_ORTB_PARAMS.forEach((param) => {
+    if (videoParams.hasOwnProperty(param)) {
+      video[param] = videoParams[param];
+    }
+  });
+
+  // Placement Inference Rules:
+  // - If no placement is defined then default to 1 (In Stream)
+  video.placement = video.placement || 2;
+
+  // - If product is instream (for instream context) then override placement to 1
+  if (params.context === 'instream') {
+    video.startdelay = video.startdelay || 0;
+    video.placement = 1;
+  }
+
+  // bid floor
+  const bidFloorRequest = {
+    currency: bidRequest.params.cur || 'USD',
+    mediaType: 'video',
+    size: '*'
+  };
+  let floorData = bidRequest.params
+  if (isFn(bidRequest.getFloor)) {
+    floorData = bidRequest.getFloor(bidFloorRequest);
+  } else {
+    if (params.bidfloor) {
+      floorData = {floor: params.bidfloor, currency: params.currency || 'USD'};
+    }
+  }
+
+  const openrtbRequest = {
+    id: bidRequest.bidId,
+    imp: [
+      {
+        id: '1',
+        video: video,
+        secure: isSecure() ? 1 : 0,
+        bidfloor: floorData.floor,
+        bidfloorcur: floorData.currency
+      }
+    ],
+    site: {
+      domain: bidderRequest.refererInfo.domain,
+      page: bidderRequest.refererInfo.page,
+      ref: bidderRequest.refererInfo.ref,
+    },
+    ext: {
+      hb: 1,
+      prebidver: '$prebid.version$',
+      adapterver: spec.VERSION,
+    },
+  };
+
+  // content
+  if (videoParams.content && isPlainObject(videoParams.content)) {
+    openrtbRequest.site.content = {};
+    const contentStringKeys = ['id', 'title', 'series', 'season', 'genre', 'contentrating', 'language', 'url'];
+    const contentNumberkeys = ['episode', 'prodq', 'context', 'livestream', 'len'];
+    const contentArrayKeys = ['cat'];
+    const contentObjectKeys = ['ext'];
+    for (const contentKey in videoBidderParams.content) {
+      if (
+        (contentStringKeys.indexOf(contentKey) > -1 && isStr(videoParams.content[contentKey])) ||
+        (contentNumberkeys.indexOf(contentKey) > -1 && isNumber(videoParams.content[contentKey])) ||
+        (contentObjectKeys.indexOf(contentKey) > -1 && isPlainObject(videoParams.content[contentKey])) ||
+        (contentArrayKeys.indexOf(contentKey) > -1 && isArray(videoParams.content[contentKey]) &&
+          videoParams.content[contentKey].every(catStr => isStr(catStr)))) {
+        openrtbRequest.site.content[contentKey] = videoParams.content[contentKey];
+      } else {
+        logMessage('videobyte bid adapter validation error: ', contentKey, ' is either not supported is OpenRTB V2.5 or value is undefined');
+      }
+    }
+  }
+
+  // adding schain object
+  if (bidRequest.schain) {
+    deepSetValue(openrtbRequest, 'source.ext.schain', bidRequest.schain);
+    openrtbRequest.source.ext.schain.nodes[0].rid = openrtbRequest.id;
+  }
+
+  // Attaching GDPR Consent Params
+  if (bidderRequest.gdprConsent) {
+    deepSetValue(openrtbRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+    deepSetValue(openrtbRequest, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+  }
+
+  // CCPA
+  if (bidderRequest.uspConsent) {
+    deepSetValue(openrtbRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+  return openrtbRequest;
+}
+
+function validateVideo(bidRequest) {
+  if (!bidRequest.params) {
+    return false;
+  }
+
+  if (!bidRequest.params.pubId) {
+    logError('failed validation: pubId not declared');
+    return false;
+  }
+
+  const videoAdUnit = deepAccess(bidRequest, 'mediaTypes.video', {});
+  const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
+
+  if (videoBidderParams && videoBidderParams.e2etest) {
+    return true;
+  }
+
+  const videoParams = {
+    ...videoAdUnit,
+    ...videoBidderParams // Bidder Specific overrides
+  };
+
+  if (!videoParams.context) {
+    logError('failed validation: context id not declared');
+    return false;
+  }
+  if (videoParams.context !== 'instream') {
+    logError('failed validation: only context instream is supported ');
+    return false;
+  }
+
+  if (typeof videoParams.playerSize === 'undefined' || !Array.isArray(videoParams.playerSize) || !Array.isArray(videoParams.playerSize[0])) {
+    logError('failed validation: player size not declared or is not in format [[w,h]]');
+    return false;
+  }
+
+  return true;
+}
+
+function isSecure() {
+  return document.location.protocol === 'https:';
+}
+
+registerBidder(spec);
diff --git a/modules/videobyteBidAdapter.md b/modules/videobyteBidAdapter.md
new file mode 100644
index 00000000000..d0037b0972a
--- /dev/null
+++ b/modules/videobyteBidAdapter.md
@@ -0,0 +1,127 @@
+# Overview
+
+```
+Module Name: VideoByte Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@videobyte.com
+```
+
+# Description
+
+Module that connects to VideoByte's demand sources
+
+*Note:* The Video SSP ad server will respond with an VAST XML to load into your defined player.
+
+## Instream Video adUnit using mediaTypes.video
+*Note:* By default, the adapter will read the mandatory parameters from mediaTypes.video.
+*Note:* The Video SSP ad server will respond with an VAST XML to load into your defined player.
+```
+  var adUnits = [
+    {
+        code: 'video1',
+          mediaTypes: {
+            video: {
+                  context: 'instream',
+                  playerSize: [640, 480],
+                  mimes: ['video/mp4', 'application/javascript'],
+                  protocols: [2,5],
+                  api: [2],
+                  position: 1,
+                  delivery: [2],
+                  minduration: 10,
+                  maxduration: 30,
+                  placement: 1,
+                  playbackmethod: [1,5],
+                  protocols: [2,5],
+                  api: [2],
+            }
+          },
+          bids: [
+            {
+              bidder: 'videobyte',
+              params: {
+                bidfloor: 0.5,
+                pubId: 'e2etest'
+              }
+            }
+          ]
+      }
+  ]
+```
+
+## Instream Video adUnit with placement, nid and content params
+```
+  var adUnits = [
+    {
+        code: 'video1',
+          mediaTypes: {
+            video: {
+                  context: 'instream',
+                  playerSize: [640, 480],
+                  mimes: ['video/mp4', 'application/javascript'],
+                  protocols: [2,5],
+                  api: [2],
+                  position: 1,
+                  delivery: [2],
+                  minduration: 10,
+                  maxduration: 30,
+                  placement: 1,
+                  playbackmethod: [1,5],
+                  protocols: [2,5],
+                  api: [2],
+            }
+          },
+          bids: [
+            {
+                  bidder: 'videobyte',
+                  params: {
+                    bidfloor: 0.5,
+                    pubId: 'e2etest',
+                    placementId: '1234567',
+                    nid: '1234',
+                    video: {
+                      content:{
+                        id: "uuid",
+                        url: "https://videobyte.com/awesome-video.mp4",
+                        title: "Awesome video",
+                        genre: "Comedy",
+                        language: "en",
+                        season: "1",
+                        series: "1",
+        
+                      }
+                    }
+                  }
+                }
+          ]
+      }
+  ]
+```
+
+# End To End testing mode
+By passing bid.params.video.e2etest = true you will be able to receive a test creative
+
+```
+var adUnits = [
+    {
+      code: 'video-1',
+      mediaTypes: {
+        video: {
+          context: "instream",
+          playerSize: [[640, 480]],
+          mimes: ['video/mp4'],
+        }
+      },
+      bids: [
+        {
+          bidder: 'videobyte',
+          params: {
+            video: {
+              e2etest: true
+            }
+          }
+        }
+      ]
+    }
+]
+```
diff --git a/modules/videofyBidAdapter.js b/modules/videofyBidAdapter.js
deleted file mode 100644
index 11bc21303fd..00000000000
--- a/modules/videofyBidAdapter.js
+++ /dev/null
@@ -1,300 +0,0 @@
-import { VIDEO } from '../src/mediaTypes.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
-import * as utils from '../src/utils.js';
-
-const BIDDER_CODE = 'videofy';
-const TTL = 600;
-
-function avRenderer(bid) {
-  bid.renderer.push(function() {
-    let eventCallback = bid && bid.renderer && bid.renderer.handleVideoEvent ? bid.renderer.handleVideoEvent : null;
-    window.aniviewRenderer.renderAd({
-      id: bid.adUnitCode + '_' + bid.adId,
-      debug: window.location.href.indexOf('pbjsDebug') >= 0,
-      placement: bid.adUnitCode,
-      width: bid.width,
-      height: bid.height,
-      vastUrl: bid.vastUrl,
-      vastXml: bid.vastXml,
-      config: bid.params[0].rendererConfig,
-      eventsCallback: eventCallback,
-      bid: bid
-    });
-  });
-}
-
-function newRenderer(bidRequest) {
-  const renderer = Renderer.install({
-    url: 'https://player.srv-mars.com/script/6.1/prebidRenderer.js',
-    config: {},
-    loaded: false,
-  });
-
-  try {
-    renderer.setRender(avRenderer);
-  } catch (err) {
-  }
-
-  return renderer;
-}
-
-function isBidRequestValid(bid) {
-  if (!bid.params || !bid.params.AV_PUBLISHERID || !bid.params.AV_CHANNELID) { return false; }
-
-  return true;
-}
-let irc = 0;
-function buildRequests(validBidRequests, bidderRequest) {
-  let bidRequests = [];
-
-  for (let i = 0; i < validBidRequests.length; i++) {
-    let bidRequest = validBidRequests[i];
-    var sizes = [[640, 480]];
-
-    if (bidRequest.mediaTypes && bidRequest.mediaTypes.video && bidRequest.mediaTypes.video.playerSize) {
-      sizes = bidRequest.mediaTypes.video.playerSize;
-    } else {
-      if (bidRequest.sizes) {
-        sizes = bidRequest.sizes;
-      }
-    }
-    if (sizes.length === 2 && typeof sizes[0] === 'number') {
-      sizes = [[sizes[0], sizes[1]]];
-    }
-
-    for (let j = 0; j < sizes.length; j++) {
-      let size = sizes[j];
-      let playerWidth;
-      let playerHeight;
-
-      if (size && size.length == 2) {
-        playerWidth = size[0];
-        playerHeight = size[1];
-      } else {
-        playerWidth = 640;
-        playerHeight = 480;
-      }
-
-      let s2sParams = {};
-
-      for (var attrname in bidRequest.params) {
-        if (bidRequest.params.hasOwnProperty(attrname) && attrname.indexOf('AV_') == 0) {
-          s2sParams[attrname] = bidRequest.params[attrname];
-        }
-      };
-
-      if (s2sParams.AV_APPPKGNAME && !s2sParams.AV_URL) { s2sParams.AV_URL = s2sParams.AV_APPPKGNAME; }
-      if (!s2sParams.AV_IDFA && !s2sParams.AV_URL) {
-        if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-          s2sParams.AV_URL = bidderRequest.refererInfo.referer;
-        } else {
-          s2sParams.AV_URL = window.location.href;
-        }
-      }
-      if (s2sParams.AV_IDFA && !s2sParams.AV_AID) { s2sParams.AV_AID = s2sParams.AV_IDFA; }
-      if (s2sParams.AV_AID && !s2sParams.AV_IDFA) { s2sParams.AV_IDFA = s2sParams.AV_AID; }
-
-      s2sParams.cb = Math.floor(Math.random() * 999999999);
-      s2sParams.AV_WIDTH = playerWidth;
-      s2sParams.AV_HEIGHT = playerHeight;
-      s2sParams.bidWidth = playerWidth;
-      s2sParams.bidHeight = playerHeight;
-      s2sParams.bidId = bidRequest.bidId;
-      s2sParams.pbjs = 1;
-      s2sParams.tgt = 10;
-      s2sParams.s2s = '1';
-      s2sParams.irc = irc;
-      irc++;
-      s2sParams.wpm = 1;
-
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        if (bidderRequest.gdprConsent.gdprApplies) {
-          s2sParams.AV_GDPR = 1;
-          s2sParams.AV_CONSENT = bidderRequest.gdprConsent.consentString;
-        }
-      }
-      if (bidderRequest && bidderRequest.uspConsent) {
-        s2sParams.AV_CCPA = bidderRequest.uspConsent;
-      }
-
-      let serverDomain = (bidRequest.params && bidRequest.params.serverDomain) ? bidRequest.params.serverDomain : 'servx.srv-mars.com';
-      let servingUrl = 'https://' + serverDomain + '/api/adserver/vast3/';
-
-      bidRequests.push({
-        method: 'GET',
-        url: servingUrl,
-        data: s2sParams,
-        bidRequest
-      });
-    }
-  }
-
-  return bidRequests;
-}
-function getCpmData(xml) {
-  let ret = {cpm: 0, currency: 'USD'};
-  if (xml) {
-    let ext = xml.getElementsByTagName('Extensions');
-    if (ext && ext.length > 0) {
-      ext = ext[0].getElementsByTagName('Extension');
-      if (ext && ext.length > 0) {
-        for (var i = 0; i < ext.length; i++) {
-          if (ext[i].getAttribute('type') == 'ANIVIEW') {
-            let price = ext[i].getElementsByTagName('Cpm');
-            if (price && price.length == 1) {
-              ret.cpm = price[0].textContent;
-            }
-            break;
-          }
-        }
-      }
-    }
-  }
-  return ret;
-}
-function interpretResponse(serverResponse, bidRequest) {
-  let bidResponses = [];
-  if (serverResponse && serverResponse.body) {
-    if (serverResponse.error) {
-      return bidResponses;
-    } else {
-      try {
-        let bidResponse = {};
-        if (bidRequest && bidRequest.data && bidRequest.data.bidId && bidRequest.data.bidId !== '') {
-          let xmlStr = serverResponse.body;
-          let xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
-          if (xml && xml.getElementsByTagName('parsererror').length == 0) {
-            let cpmData = getCpmData(xml);
-            if (cpmData && cpmData.cpm > 0) {
-              bidResponse.requestId = bidRequest.data.bidId;
-              bidResponse.bidderCode = BIDDER_CODE;
-              bidResponse.ad = '';
-              bidResponse.cpm = cpmData.cpm;
-              bidResponse.width = bidRequest.data.AV_WIDTH;
-              bidResponse.height = bidRequest.data.AV_HEIGHT;
-              bidResponse.ttl = TTL;
-              bidResponse.creativeId = xml.getElementsByTagName('Ad') && xml.getElementsByTagName('Ad')[0] && xml.getElementsByTagName('Ad')[0].getAttribute('id') ? xml.getElementsByTagName('Ad')[0].getAttribute('id') : 'creativeId';
-              bidResponse.currency = cpmData.currency;
-              bidResponse.netRevenue = true;
-              var blob = new Blob([xmlStr], {
-                type: 'application/xml'
-              });
-              bidResponse.vastUrl = window.URL.createObjectURL(blob);
-              bidResponse.vastXml = xmlStr;
-              bidResponse.mediaType = VIDEO;
-              if (bidRequest.bidRequest && bidRequest.bidRequest.mediaTypes && bidRequest.bidRequest.mediaTypes.video && bidRequest.bidRequest.mediaTypes.video.context === 'outstream') { bidResponse.renderer = newRenderer(bidRequest); }
-
-              bidResponses.push(bidResponse);
-            }
-          } else {}
-        } else {}
-      } catch (e) {}
-    }
-  } else {}
-
-  return bidResponses;
-}
-
-function getSyncData(xml, options) {
-  let ret = [];
-  if (xml) {
-    let ext = xml.getElementsByTagName('Extensions');
-    if (ext && ext.length > 0) {
-      ext = ext[0].getElementsByTagName('Extension');
-      if (ext && ext.length > 0) {
-        for (var i = 0; i < ext.length; i++) {
-          if (ext[i].getAttribute('type') == 'ANIVIEW') {
-            let syncs = ext[i].getElementsByTagName('AdServingSync');
-            if (syncs && syncs.length == 1) {
-              try {
-                let data = JSON.parse(syncs[0].textContent);
-                if (data && data.trackers && data.trackers.length) {
-                  data = data.trackers;
-                  for (var j = 0; j < data.length; j++) {
-                    if (typeof data[j] === 'object' && typeof data[j].url === 'string' && data[j].e === 'inventory') {
-                      if (data[j].t == 1 && options.pixelEnabled) {
-                        ret.push({url: data[j].url, type: 'image'});
-                      } else {
-                        if (data[j].t == 3 && options.iframeEnabled) {
-                          ret.push({url: data[j].url, type: 'iframe'});
-                        }
-                      }
-                    }
-                  }
-                }
-              } catch (e) {}
-            }
-            break;
-          }
-        }
-      }
-    }
-  }
-  return ret;
-}
-
-function getUserSyncs(syncOptions, serverResponses) {
-  if (serverResponses && serverResponses[0] && serverResponses[0].body) {
-    if (serverResponses.error) {
-      return [];
-    } else {
-      try {
-        let xmlStr = serverResponses[0].body;
-        let xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
-        if (xml && xml.getElementsByTagName('parsererror').length == 0) {
-          let syncData = getSyncData(xml, syncOptions);
-          return syncData;
-        }
-      } catch (e) {}
-    }
-  }
-}
-
-function onBidWon(bid) {
-  sendbeacon(bid, 17);
-}
-
-function onTimeout(bid) {
-  sendbeacon(bid, 19);
-}
-
-function onSetTargeting(bid) {
-  sendbeacon(bid, 20);
-}
-
-function sendbeacon(bid, type) {
-  const bidCopy = {
-    bidder: bid.bidder,
-    cpm: bid.cpm,
-    originalCpm: bid.originalCpm,
-    currency: bid.currency,
-    originalCurrency: bid.originalCurrency,
-    timeToRespond: bid.timeToRespond,
-    statusMessage: bid.statusMessage,
-    width: bid.width,
-    height: bid.height,
-    size: bid.size,
-    params: bid.params,
-    status: bid.status,
-    adserverTargeting: bid.adserverTargeting,
-    ttl: bid.ttl
-  };
-  const bidString = JSON.stringify(bidCopy);
-  const encodedBuf = window.btoa(bidString);
-  utils.triggerPixel('https://beacon.videofy.io/notification/rtb/beacon/?bt=' + type + '&bid=hcwqso&hb_j=' + encodedBuf, null);
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [VIDEO],
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  getUserSyncs,
-  onBidWon,
-  onTimeout,
-  onSetTargeting
-};
-
-registerBidder(spec);
diff --git a/modules/videofyBidAdapter.md b/modules/videofyBidAdapter.md
deleted file mode 100644
index b50eaf5672e..00000000000
--- a/modules/videofyBidAdapter.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Overview
-
-```
-Module Name: Videofy Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: support1@videofy.ai
-```
-
-# Description
-
-Connects to Videofy for bids.
-
-Videofy bid adapter supports Video ads currently.
-
-# Sample Ad Unit: For Publishers
-```javascript
-var videoAdUnit = [
-{
-  code: 'video1',
-  mediaTypes: {
-    video: {
-      playerSize: [[640, 480]],
-      context: 'outstream'
-    },
-  },
-  bids: [{
-    bidder: 'videofy',
-    params: {
-      AV_PUBLISHERID: '55b78633181f4603178b4568',
-      AV_CHANNELID: '5d19dfca4b6236688c0a2fc4'
-    }
-  }]
-}];
-```
-
-```
diff --git a/modules/videoheroesBidAdapter.js b/modules/videoheroesBidAdapter.js
new file mode 100644
index 00000000000..4818d9e1c58
--- /dev/null
+++ b/modules/videoheroesBidAdapter.js
@@ -0,0 +1,254 @@
+import { isEmpty, parseUrl, isStr, triggerPixel } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const BIDDER_CODE = 'videoheroes';
+const DEFAULT_CUR = 'USD';
+const ENDPOINT_URL = `https://point.contextualadv.com/?t=2&partner=hash`;
+
+const NATIVE_ASSETS_IDS = { 1: 'title', 2: 'icon', 3: 'image', 4: 'body', 5: 'sponsoredBy', 6: 'cta' };
+const NATIVE_ASSETS = {
+  title: { id: 1, name: 'title' },
+  icon: { id: 2, type: 1, name: 'img' },
+  image: { id: 3, type: 3, name: 'img' },
+  body: { id: 4, type: 2, name: 'data' },
+  sponsoredBy: { id: 5, type: 1, name: 'data' },
+  cta: { id: 6, type: 12, name: 'data' }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: (bid) => {
+    return !!(bid.params.placementId && bid.params.placementId.toString().length === 32);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    if (validBidRequests.length === 0 || !bidderRequest) return [];
+
+    const endpointURL = ENDPOINT_URL.replace('hash', validBidRequests[0].params.placementId);
+
+    let imp = validBidRequests.map(br => {
+      let impObject = {
+        id: br.bidId,
+        secure: 1
+      };
+
+      if (br.mediaTypes.banner) {
+        impObject.banner = createBannerRequest(br);
+      } else if (br.mediaTypes.video) {
+        impObject.video = createVideoRequest(br);
+      } else if (br.mediaTypes.native) {
+        impObject.native = {
+          id: br.transactionId,
+          ver: '1.2',
+          request: createNativeRequest(br)
+        };
+      }
+      return impObject;
+    });
+
+    let page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+
+    let data = {
+      id: bidderRequest.bidderRequestId,
+      cur: [ DEFAULT_CUR ],
+      device: {
+        w: screen.width,
+        h: screen.height,
+        language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
+        ua: navigator.userAgent,
+      },
+      site: {
+        domain: parseUrl(page).hostname,
+        page: page,
+      },
+      tmax: bidderRequest.timeout || config.getConfig('bidderTimeout') || 500,
+      imp
+    };
+
+    if (bidderRequest.refererInfo.ref) {
+      data.site.ref = bidderRequest.refererInfo.ref;
+    }
+
+    if (bidderRequest.gdprConsent) {
+      data['regs'] = {'ext': {'gdpr': bidderRequest.gdprConsent.gdprApplies ? 1 : 0}};
+      data['user'] = {'ext': {'consent': bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : ''}};
+    }
+
+    if (bidderRequest.uspConsent !== undefined) {
+      if (!data['regs'])data['regs'] = {'ext': {}};
+      data['regs']['ext']['us_privacy'] = bidderRequest.uspConsent;
+    }
+
+    if (config.getConfig('coppa') === true) {
+      if (!data['regs'])data['regs'] = {'coppa': 1};
+      else data['regs']['coppa'] = 1;
+    }
+
+    if (validBidRequests[0].schain) {
+      data['source'] = {'ext': {'schain': validBidRequests[0].schain}};
+    }
+
+    return {
+      method: 'POST',
+      url: endpointURL,
+      data: data
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (serverResponse) => {
+    if (!serverResponse || isEmpty(serverResponse.body)) return [];
+
+    let bids = [];
+    serverResponse.body.seatbid.forEach(response => {
+      response.bid.forEach(bid => {
+        let mediaType = bid.ext && bid.ext.mediaType ? bid.ext.mediaType : 'banner';
+
+        let bidObj = {
+          requestId: bid.impid,
+          cpm: bid.price,
+          width: bid.w,
+          height: bid.h,
+          ttl: 1200,
+          currency: DEFAULT_CUR,
+          netRevenue: true,
+          creativeId: bid.crid,
+          dealId: bid.dealid || null,
+          mediaType: mediaType
+        };
+
+        switch (mediaType) {
+          case 'video':
+            bidObj.vastUrl = bid.adm;
+            break;
+          case 'native':
+            bidObj.native = parseNative(bid.adm);
+            break;
+          default:
+            bidObj.ad = bid.adm;
+        }
+
+        bids.push(bidObj);
+      });
+    });
+
+    return bids;
+  },
+
+  onBidWon: (bid) => {
+    if (isStr(bid.nurl) && bid.nurl !== '') {
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+const parseNative = adm => {
+  let bid = {
+    clickUrl: adm.native.link && adm.native.link.url,
+    impressionTrackers: adm.native.imptrackers || [],
+    clickTrackers: (adm.native.link && adm.native.link.clicktrackers) || [],
+    jstracker: adm.native.jstracker || []
+  };
+  adm.native.assets.forEach(asset => {
+    let kind = NATIVE_ASSETS_IDS[asset.id];
+    let content = kind && asset[NATIVE_ASSETS[kind].name];
+    if (content) {
+      bid[kind] = content.text || content.value || { url: content.url, width: content.w, height: content.h };
+    }
+  });
+
+  return bid;
+}
+
+const createNativeRequest = br => {
+  let impObject = {
+    ver: '1.2',
+    assets: []
+  };
+
+  let keys = Object.keys(br.mediaTypes.native);
+
+  for (let key of keys) {
+    const props = NATIVE_ASSETS[key];
+    if (props) {
+      const asset = {
+        required: br.mediaTypes.native[key].required ? 1 : 0,
+        id: props.id,
+        [props.name]: {}
+      };
+
+      if (props.type) asset[props.name]['type'] = props.type;
+      if (br.mediaTypes.native[key].len) asset[props.name]['len'] = br.mediaTypes.native[key].len;
+      if (br.mediaTypes.native[key].sizes && br.mediaTypes.native[key].sizes[0]) {
+        asset[props.name]['w'] = br.mediaTypes.native[key].sizes[0];
+        asset[props.name]['h'] = br.mediaTypes.native[key].sizes[1];
+      }
+
+      impObject.assets.push(asset);
+    }
+  }
+
+  return impObject;
+}
+
+const createBannerRequest = br => {
+  let size = [];
+
+  if (br.mediaTypes.banner.sizes && Array.isArray(br.mediaTypes.banner.sizes)) {
+    if (Array.isArray(br.mediaTypes.banner.sizes[0])) { size = br.mediaTypes.banner.sizes[0]; } else { size = br.mediaTypes.banner.sizes; }
+  } else size = [300, 250];
+
+  return { id: br.transactionId, w: size[0], h: size[1] };
+};
+
+const createVideoRequest = br => {
+  let videoObj = {id: br.transactionId};
+  let supportParamsList = ['mimes', 'minduration', 'maxduration', 'protocols', 'startdelay', 'skip', 'minbitrate', 'maxbitrate', 'api', 'linearity'];
+
+  for (let param of supportParamsList) {
+    if (br.mediaTypes.video[param] !== undefined) {
+      videoObj[param] = br.mediaTypes.video[param];
+    }
+  }
+
+  if (br.mediaTypes.video.playerSize && Array.isArray(br.mediaTypes.video.playerSize)) {
+    if (Array.isArray(br.mediaTypes.video.playerSize[0])) {
+      videoObj.w = br.mediaTypes.video.playerSize[0][0];
+      videoObj.h = br.mediaTypes.video.playerSize[0][1];
+    } else {
+      videoObj.w = br.mediaTypes.video.playerSize[0];
+      videoObj.h = br.mediaTypes.video.playerSize[1];
+    }
+  } else {
+    videoObj.w = 640;
+    videoObj.h = 480;
+  }
+
+  return videoObj;
+}
+
+registerBidder(spec);
diff --git a/modules/videoheroesBidAdapter.md b/modules/videoheroesBidAdapter.md
new file mode 100644
index 00000000000..f2a2ca9f7ba
--- /dev/null
+++ b/modules/videoheroesBidAdapter.md
@@ -0,0 +1,134 @@
+# Overview
+
+```
+Module Name: Video Heroes Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@videoheroes.tv
+```
+
+# Description
+
+Module which connects to VideoHeroes SSP demand sources
+
+# Test Parameters
+
+250x300 banner test
+```
+var adUnits = [{
+  code: 'videoheroes-prebid',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]]
+    }
+  },
+  bids: [{
+    bidder: 'videoheroes',
+    params : {
+      placementId : "1a8d9c22db19906cb8a5fd4518d05f62" // test placementId, please replace after test
+    }
+  }]
+}];
+```
+
+native test
+```
+var adUnits = [{
+  code: 'videoheroes-native-prebid',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+          required: true
+      },
+      clickUrl: {
+          required: true
+      },
+      privacyLink: {
+          required: false
+      },
+      body: {
+          required: true
+      },
+      icon: {
+          required: true,
+          sizes: [50, 50]
+      }
+    }
+  },
+  bids: [{
+      bidder: 'videoheroes',
+      params: {
+        placementId : "1a8d9c22db19906cb8a5fd4518d05f62" // test placementId, please replace after test
+      }
+  }]
+}];
+```
+
+video test
+```
+var adUnits = [{
+  code: 'videoheroes-video-prebid',
+  mediaTypes: {
+    video: {
+      minduration:1,
+      maxduration:999,
+      boxingallowed:1,
+      skip:0,
+      mimes:[
+          'application/javascript',
+          'video/mp4'
+      ],
+      playerSize: [[768, 1024]],
+      protocols:[
+          2,3
+      ],
+      linearity:1,
+      api:[
+          1,
+          2
+      ]
+    }
+  },
+  bids: [{
+      bidder: 'videoheroes',
+      params: {
+        placementId : "1a8d9c22db19906cb8a5fd4518d05f62" // test placementId, please replace after test
+      }
+  }]
+}];
+```
+
+# Bid Parameters
+## Banner
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `placementId` | required | String | The placement ID from Video Heroes  | "1a8d9c22db19906cb8a5fd4518d05f62"
+
+
+# Ad Unit and page Setup:
+
+```html
+ <!-- Prebid Config section -->
+ <script>
+     var PREBID_TIMEOUT = 700;
+     var adUnits = [{
+         code: 'videoheroes-prebid',
+         sizes: [[300, 250]],
+         bids: [{
+            bidder: 'videoheroes'
+            placementId : "PUT_YOUR_videoheroes_placementId",
+         }]
+     }];
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+</script>
+<!-- End Prebid Config section -->
+```
diff --git a/modules/videojsVideoProvider.js b/modules/videojsVideoProvider.js
new file mode 100644
index 00000000000..cc17758bd72
--- /dev/null
+++ b/modules/videojsVideoProvider.js
@@ -0,0 +1,854 @@
+import {
+  SETUP_COMPLETE, SETUP_FAILED, DESTROYED,
+  PLAYLIST, PLAYBACK_REQUEST, CONTENT_LOADED, PLAY, PAUSE, TIME, SEEK_START, SEEK_END, MUTE, VOLUME, ERROR, COMPLETE,
+  FULLSCREEN, PLAYER_RESIZE,
+  AD_REQUEST, AD_IMPRESSION, AD_TIME, AD_COMPLETE, AD_SKIPPED, AD_CLICK, AD_STARTED, AD_ERROR, AD_LOADED, AD_PLAY, AD_PAUSE
+} from '../libraries/video/constants/events.js';
+// missing events: , AD_BREAK_START, , AD_BREAK_END, VIEWABLE, BUFFER, CAST, PLAYLIST_COMPLETE, RENDITION_UPDATE, PLAY_ATTEMPT_FAILED, AUTOSTART_BLOCKED
+import {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE, AD_POSITION, PLAYBACK_END
+} from '../libraries/video/constants/ortb.js';
+import { VIDEO_JS_VENDOR } from '../libraries/video/constants/vendorCodes.js';
+import { submodule } from '../src/hook.js';
+import stateFactory from '../libraries/video/shared/state.js';
+import { PLAYBACK_MODE } from '../libraries/video/constants/constants.js';
+import { getEventHandler } from '../libraries/video/shared/eventHandler.js';
+
+/*
+Plugins of interest:
+https://www.npmjs.com/package/videojs-chromecast
+https://www.npmjs.com/package/@silvermine/videojs-airplay
+https://www.npmjs.com/package/videojs-airplay
+https://www.npmjs.com/package/@silvermine/videojs-chromecast
+https://www.npmjs.com/package/videojs-ima
+https://github.com/googleads/videojs-ima
+https://github.com/videojs/videojs-playlist
+https://github.com/videojs/videojs-contrib-ads
+https://github.com/videojs/videojs-errors
+https://github.com/videojs/videojs-overlay
+https://github.com/videojs/videojs-playlist-ui
+
+inspiration:
+https://github.com/Conviva/conviva-js-videojs/blob/master/conviva-videojs-module.js
+ */
+
+const setupFailMessage = 'Failed to instantiate the player';
+const AD_MANAGER_EVENTS = [AD_LOADED, AD_STARTED, AD_IMPRESSION, AD_PLAY, AD_PAUSE, AD_TIME, AD_COMPLETE, AD_SKIPPED];
+
+export function VideojsProvider(config, vjs_, adState_, timeState_, callbackStorage_, utils) {
+  let vjs = vjs_;
+  // Supplied callbacks are typically wrapped by handlers
+  // we use this dict to keep track of these pairings
+  const callbackToHandler = {};
+
+  const adState = adState_;
+  const timeState = timeState_;
+  let player = null;
+  let playerVersion = null;
+  let playerIsSetup = false;
+  const {playerConfig, divId} = config;
+  let isMuted;
+  let previousLastTimePosition = 0;
+  let lastTimePosition = 0;
+
+  let setupCompleteCallbacks = [];
+  let setupFailedCallbacks = [];
+  let setupFailedEventHandlers = [];
+
+  // TODO: test with older videojs versions
+  let minimumSupportedPlayerVersion = '7.17.0';
+
+  function init() {
+    if (!vjs) {
+      triggerSetupFailure(-1, setupFailMessage + ': Videojs not present')
+      return;
+    }
+
+    playerVersion = vjs.VERSION;
+    if (playerVersion < minimumSupportedPlayerVersion) {
+      triggerSetupFailure(-2, setupFailMessage + ': Videojs version not supported');
+      return;
+    }
+
+    if (!document.getElementById(divId)) {
+      triggerSetupFailure(-3, setupFailMessage + ': No div found with id ' + divId);
+      return;
+    }
+
+    const instantiatedPlayers = vjs.players;
+    if (instantiatedPlayers && instantiatedPlayers[divId]) {
+      // already instantiated
+      player = instantiatedPlayers[divId];
+      onReady();
+      return;
+    }
+
+    setupPlayer(playerConfig);
+
+    if (!player) {
+      triggerSetupFailure(-4, setupFailMessage);
+    }
+  }
+
+  function getId() {
+    return divId;
+  }
+
+  function getOrtbVideo() {
+    if (!player) {
+      return;
+    }
+
+    let playBackMethod = PLAYBACK_METHODS.CLICK_TO_PLAY;
+    // returns a boolean or a string with the autoplay strategy
+    const autoplay = player.autoplay();
+    const muted = player.muted() || autoplay === 'muted';
+    // check if autoplay is truthy since it may be a bool or string
+    if (autoplay) {
+      playBackMethod = muted ? PLAYBACK_METHODS.AUTOPLAY_MUTED : PLAYBACK_METHODS.AUTOPLAY;
+    }
+    const supportedMediaTypes = Object.values(VIDEO_MIME_TYPE).filter(
+      // Follows w3 spec https://www.w3.org/TR/2011/WD-html5-20110113/video.html#dom-navigator-canplaytype
+      type => player.canPlayType(type) !== ''
+    )
+
+    // IMA supports vpaid unless its expliclty turned off
+    // TODO: needs a reference to the imaOptions used at setup to determine if vpaid can be used
+    // if (imaOptions && imaOptions.vpaidMode !== 0) {
+    supportedMediaTypes.push(VPAID_MIME_TYPE);
+    // }
+
+    const video = {
+      mimes: supportedMediaTypes,
+      // Based on the protocol support provided by the videojs-ima plugin
+      // https://developers.google.com/interactive-media-ads/docs/sdks/html5/client-side/compatibility
+      // Need to check for the plugins
+      protocols: [
+        PROTOCOLS.VAST_2_0,
+      ],
+      api: [
+        API_FRAMEWORKS.VPAID_2_0 // TODO: needs a reference to the imaOptions used at setup to determine if vpaid can be used
+      ],
+      // TODO: Make sure this returns dimensions in DIPS
+      h: player.currentHeight(),
+      w: player.currentWidth(),
+      // TODO: implement startdelay since its reccomend param
+      // both linearity forms are supported so the param is excluded
+      // sequence - TODO not yet supported
+      maxextended: -1,
+      boxingallowed: 1,
+      playbackmethod: [ playBackMethod ],
+      playbackend: PLAYBACK_END.VIDEO_COMPLETION,
+      // Per ortb 7.4 skip is omitted since neither the player nor ima plugin imposes a skip button, or a skipmin/max
+    };
+
+    // TODO: Determine placement may not be in stream if videojs is only used to serve ad content
+    // ~ Sort of resolved check if the player has a source to tell if the placement is instream
+    // Still cannot reliably check what type of placement the player is if its outstream
+    // i.e. we can't tell if its interstitial, in article, etc.
+    if (player.src()) {
+      video.placement = PLACEMENT.INSTREAM;
+    }
+
+    // Placement according to IQG Guidelines 4.2.8
+    // https://cdn2.hubspot.net/hubfs/2848641/TrustworthyAccountabilityGroup_May2017/Docs/TAG-Inventory-Quality-Guidelines-v2_2-10-18-2016.pdf?t=1509469105938
+    const findPosition = vjs.dom.findPosition;
+    if (player.isFullscreen()) {
+      video.pos = AD_POSITION.FULL_SCREEN;
+    } else if (findPosition) {
+      video.pos = utils.getPositionCode(findPosition(player.el()));
+    }
+
+    return video;
+  }
+
+  function getOrtbContent() {
+    if (!player) {
+      return;
+    }
+
+    const content = {
+      // id:, TODO: find a suitable id for videojs sources
+      url: player.currentSrc()
+    };
+    // Only include length if player is ready
+    // player.readyState() returns a level of readiness from 0 to 4
+    // https://docs.videojs.com/player#readyState
+    if (player.readyState()) {
+      content.len = Math.round(player.duration());
+    }
+
+    const mediaItem = utils.getMedia(player);
+    if (mediaItem) {
+      for (let param of ['id', 'title', 'description', 'album', 'artist']) {
+        if (mediaItem[param]) {
+          content[param] = mediaItem[param];
+        }
+      }
+    }
+
+    const contentUrl = utils.getValidMediaUrl(mediaItem && mediaItem.src, player.src)
+    if (contentUrl) {
+      content.url = contentUrl;
+    }
+
+    return content;
+  }
+
+  // Plugins to integrate: https://github.com/googleads/videojs-ima
+  function setAdTagUrl(adTagUrl, options) {
+    if (!player.ima || !adTagUrl) {
+      return;
+    }
+
+    player.ima.changeAdTag(adTagUrl);
+    player.ima.requestAds();
+  }
+
+  function onEvent(type, callback, payload) {
+    registerSetupListeners(type, callback, payload);
+
+    if (!player) {
+      return;
+    }
+
+    player.ready(() => {
+      registerListeners(type, callback, payload);
+    });
+  }
+
+  function registerSetupListeners(externalEventName, callback, basePayload) {
+    // no point in registering for setup failures if already setup.
+    if (playerIsSetup) {
+      return;
+    }
+
+    if (externalEventName === SETUP_COMPLETE) {
+      setupCompleteCallbacks.push(callback);
+    } else if (externalEventName === SETUP_FAILED) {
+      setupFailedCallbacks.push(callback);
+      registerSetupErrorListener()
+    }
+  }
+
+  function registerSetupErrorListener() {
+    if (!player) {
+      return
+    }
+
+    const eventHandler = () => {
+      /*
+      Videojs has no specific setup error handler
+      so we imitate it by hooking to the general error
+      handler and checking to see if the player has been setup
+       */
+      if (playerIsSetup) {
+        return;
+      }
+
+      const error = player.error();
+      triggerSetupFailure(error.code, error.message, error);
+    };
+
+    player.on(ERROR, eventHandler);
+    setupFailedEventHandlers.push(eventHandler)
+  }
+
+  function registerListeners(externalEventName, callback, basePayload) {
+    if (externalEventName === MUTE) {
+      const eventHandler = () => {
+        if (isMuted !== player.muted()) {
+          basePayload.mute = isMuted = !isMuted;
+          callback(externalEventName, basePayload);
+        }
+      };
+      player.on(utils.getVideojsEventName(VOLUME), eventHandler);
+      return;
+    }
+
+    let getEventPayload;
+
+    switch (externalEventName) {
+      case PLAY:
+      case PAUSE:
+      case DESTROYED:
+        break;
+
+      case PLAYBACK_REQUEST:
+        getEventPayload = e => ({ playReason: 'unknown' });
+        break;
+
+      case AD_REQUEST:
+        getEventPayload = e => {
+          const adTagUrl = e.AdsRequest.adTagUrl;
+          adState.updateState({ adTagUrl });
+          return { adTagUrl };
+        };
+        break
+
+      case AD_LOADED:
+        getEventPayload = (e) => {
+          const imaAd = e.getAdData && e.getAdData();
+          adState.updateForEvent(imaAd);
+          timeState.clearState();
+          return adState.getState();
+        };
+        break
+
+      case AD_STARTED:
+      case AD_PLAY:
+      case AD_PAUSE:
+        getEventPayload = () => adState.getState();
+        break
+
+      case AD_IMPRESSION:
+      case AD_CLICK:
+        getEventPayload = () => Object.assign({}, adState.getState(), timeState.getState());
+        break
+
+      case AD_TIME:
+        getEventPayload = (e) => {
+          const adTimeEvent = e && e.getAdData && e.getAdData();
+          timeState.updateForTimeEvent(adTimeEvent);
+          return Object.assign({}, adState.getState(), timeState.getState());
+        };
+        break
+
+      case AD_COMPLETE:
+        getEventPayload = () => {
+          const currentState = adState.getState();
+          adState.clearState();
+          return currentState;
+        };
+        break
+
+      case AD_SKIPPED:
+        getEventPayload = () => {
+          const currentState = Object.assign({}, adState.getState(), timeState.getState());
+          adState.clearState();
+          return currentState;
+        };
+        break
+
+      case AD_ERROR:
+        getEventPayload = e => {
+          const imaAdError = e.data && e.data.AdError;
+          const extraPayload = Object.assign({
+            playerErrorCode: imaAdError.getErrorCode(),
+            vastErrorCode: imaAdError.getVastErrorCode(),
+            errorMessage: imaAdError.getMessage(),
+            sourceError: imaAdError.getInnerError()
+            // timeout
+          }, adState.getState(), timeState.getState());
+          adState.clearState();
+          return extraPayload;
+        };
+        break
+
+      case PLAYLIST:
+        getEventPayload = e => ({
+          playlistItemCount: utils.getPlaylistCount(player),
+          autostart: player.autoplay()
+        });
+        break
+
+      case CONTENT_LOADED:
+        getEventPayload = e => {
+          const media = utils.getMedia(player);
+          const contentUrl = utils.getValidMediaUrl(media && media.src, player.src, e && e.target && e.target.currentSrc)
+          return {
+            contentId: media && media.id,
+            contentUrl,
+            title: media && media.title,
+            description: media && media.description,
+            playlistIndex: utils.getCurrentPlaylistIndex(player),
+            contentTags: media && media.contentTags
+          };
+        };
+        break;
+
+      case TIME:
+        // TODO: might want to check seeking() and/or scrubbing()
+        getEventPayload = e => {
+          previousLastTimePosition = lastTimePosition;
+          const currentTime = player.currentTime();
+          const duration = player.duration();
+          timeState.updateForTimeEvent({ currentTime, duration });
+          lastTimePosition = currentTime;
+          return {
+            position: lastTimePosition,
+            duration
+          };
+        };
+        break;
+
+      case SEEK_START:
+        getEventPayload = e => {
+          return {
+            position: previousLastTimePosition,
+            destination: player.currentTime(),
+            duration: player.duration()
+          };
+        }
+        break;
+
+      case SEEK_END:
+        getEventPayload = () => ({
+          position: player.currentTime(),
+          duration: player.duration()
+        });
+        break;
+
+      case VOLUME:
+        getEventPayload = e => ({ volumePercentage: player.volume() * 100 });
+        break;
+
+      case ERROR:
+        getEventPayload = e => {
+          const error = player.error();
+          return {
+            sourceError: error,
+            errorCode: error.code,
+            errorMessage: error.message,
+          };
+        };
+        break;
+
+      case COMPLETE:
+        getEventPayload = e => {
+          previousLastTimePosition = lastTimePosition = 0;
+          timeState.clearState();
+        };
+        break;
+
+      case FULLSCREEN:
+        getEventPayload = e => ({ fullscreen: player.isFullscreen() });
+        break;
+
+      case PLAYER_RESIZE:
+        getEventPayload = e => ({
+          height: player.currentHeight(),
+          width: player.currentWidth(),
+        });
+        break;
+
+      default:
+        return;
+    }
+
+    const eventHandler = getEventHandler(externalEventName, callback, basePayload, getEventPayload);
+
+    if (externalEventName === PLAYLIST) {
+      registerPlaylistEventListener(eventHandler);
+      return;
+    }
+
+    const videojsEventName = utils.getVideojsEventName(externalEventName);
+
+    if (AD_MANAGER_EVENTS.includes(externalEventName)) {
+      player.on('ads-manager', () => player.ima.addEventListener(videojsEventName, eventHandler));
+    } else {
+      player.on(videojsEventName, eventHandler);
+    }
+  }
+
+  function registerPlaylistEventListener(eventHandler) {
+    if (player.playlist) {
+      // force a playlist event on first item load
+      player.one('loadstart', eventHandler);
+      player.on('playlistchange', eventHandler);
+    } else {
+      // When playlist plugin is not used, treat each media item as a single item playlist
+      player.on('loadstart', eventHandler);
+    }
+  }
+
+  function offEvent(event, callback) {
+    const videojsEvent = utils.getVideojsEventName(event)
+    if (!callback) {
+      player.off(videojsEvent);
+      return;
+    }
+
+    const eventHandler = callbackToHandler[event];// callbackStorage.getCallback(event, callback);
+    if (eventHandler) {
+      player.off(videojsEvent, eventHandler);
+    }
+  }
+
+  function destroy() {
+    if (!player) {
+      return;
+    }
+    player.remove();
+    player = null;
+  }
+
+  return {
+    init,
+    getId,
+    getOrtbVideo,
+    getOrtbContent,
+    setAdTagUrl,
+    onEvent,
+    offEvent,
+    destroy
+  };
+
+  function setupPlayer(config) {
+    const setupConfig = utils.getSetupConfig(config);
+    player = vjs(divId, setupConfig, onReady);
+  }
+
+  function onReady() {
+    try {
+      setupAds();
+    } catch (e) {
+      triggerSetupFailure(-5, e.message);
+      return;
+    }
+    triggerSetupComplete();
+  }
+
+  // TODO: consider supporting https://www.npmjs.com/package/videojs-vast-vpaid as well
+  function setupAds() {
+    if (!player.ima) {
+      throw new Error(setupFailMessage + ': ima plugin is missing');
+    }
+
+    if (typeof player.ima !== 'function') {
+      // when player.ima is already instantiated, it is an object. Early abort if already instantiated.
+      return;
+    }
+
+    const adConfig = utils.getAdConfig(config);
+    player.ima(adConfig);
+  }
+
+  function triggerSetupFailure(errorCode, msg, sourceError) {
+    const payload = {
+      divId,
+      playerVersion,
+      type: SETUP_FAILED,
+      errorCode,
+      errorMessage: msg,
+      sourceError: sourceError
+    };
+    setupFailedCallbacks.forEach(setupFailedCallback => setupFailedCallback(SETUP_FAILED, payload));
+    setupFailedCallbacks = [];
+  }
+
+  function triggerSetupComplete() {
+    playerIsSetup = true;
+    const payload = {
+      divId,
+      playerVersion,
+      type: SETUP_COMPLETE,
+    };
+
+    setupCompleteCallbacks.forEach(callback => callback(SETUP_COMPLETE, payload));
+    setupCompleteCallbacks = [];
+
+    isMuted = player.muted();
+
+    setupFailedEventHandlers.forEach(eventHandler => player.off('error', eventHandler));
+    setupFailedEventHandlers = [];
+  }
+}
+
+export const utils = {
+  getSetupConfig: function (config) {
+    if (!config) {
+      return;
+    }
+
+    const params = config.params || {};
+    const videojsConfig = params.vendorConfig || {};
+
+    if (videojsConfig.autostart === undefined && config.autostart !== undefined) {
+      videojsConfig.autostart = config.autostart
+    }
+
+    if (videojsConfig.muted === undefined && config.mute !== undefined) {
+      videojsConfig.muted = config.mute;
+    }
+
+    return videojsConfig;
+  },
+
+  getAdConfig: function (config) {
+    const params = config && config.params;
+    if (!params) {
+      return {};
+    }
+
+    return params.adPluginConfig || {}; // TODO: add adPluginConfig to spec
+  },
+
+  getPositionCode: function({left, top, width, height}) {
+    const bottom = window.innerHeight - top - height;
+    const right = window.innerWidth - left - width;
+
+    if (left < 0 || right < 0 || top < 0) {
+      return AD_POSITION.UNKNOWN;
+    }
+
+    return bottom >= 0 ? AD_POSITION.ABOVE_THE_FOLD : AD_POSITION.BELOW_THE_FOLD;
+  },
+
+  getVideojsEventName: function(eventName) {
+    switch (eventName) {
+      case SETUP_COMPLETE:
+        return 'ready';
+      case SETUP_FAILED:
+        return 'error';
+      case DESTROYED:
+        return 'dispose';
+      case AD_REQUEST:
+        return 'ads-request';
+      case AD_LOADED:
+        return 'loaded'
+      case AD_STARTED:
+        return 'start';
+      case AD_IMPRESSION:
+        return 'impression';
+      case AD_PLAY:
+        return 'resume'
+      case AD_PAUSE:
+        return PAUSE;
+      case AD_TIME:
+        return 'adProgress';
+      case AD_CLICK:
+        return 'click';
+      case AD_COMPLETE:
+        return COMPLETE;
+      case AD_SKIPPED:
+        return 'skip';
+      case AD_ERROR:
+        return 'adserror';
+      case CONTENT_LOADED:
+        return 'loadstart';
+      case PLAY:
+        return PLAY + 'ing';
+      case PLAYBACK_REQUEST:
+        return PLAY;
+      case SEEK_START:
+        return 'seeking';
+      case SEEK_END:
+        return 'seeked';
+      case TIME:
+        return TIME + 'update';
+      case VOLUME:
+        return VOLUME + 'change';
+      case MUTE:
+        return MUTE + 'change';
+      case PLAYER_RESIZE:
+        return 'playerresize';
+      case FULLSCREEN:
+        return FULLSCREEN + 'change';
+      case COMPLETE:
+        return 'ended';
+      default:
+        return eventName;
+    }
+    /*
+    The following video.js events might map to an event in our spec
+    'loadstart',
+      'progress', buffer load ?
+      'suspend',
+      'abort',
+      'error',
+      'emptied',
+      'stalled',
+      'loadedmetadata', meta
+      'loadeddata', meta
+      'canplay',
+      'canplaythrough',
+      'waiting', buffer?
+      'durationchange', meta-duration
+      'ratechange',
+     */
+  },
+
+  getMedia: function(player) {
+    const playlistItem = this.getCurrentPlaylistItem(player);
+    if (playlistItem) {
+      return playlistItem.sources[0];
+    }
+
+    return player.getMedia();
+  },
+
+  getValidMediaUrl: function(mediaSrc, playerSrc, eventTargetSrc) {
+    return this.getMediaUrl(mediaSrc) || this.getMediaUrl(playerSrc) || this.getMediaUrl(eventTargetSrc);
+  },
+
+  getMediaUrl: function(source) {
+    if (!source) {
+      return;
+    }
+
+    if (Array.isArray(source) && source.length) {
+      return this.parseSource(source[0]);
+    }
+
+    return this.parseSource(source)
+  },
+
+  parseSource: function (source) {
+    const type = typeof source;
+    if (type === 'string') {
+      return source;
+    } else if (type === 'object') {
+      return source.src;
+    }
+  },
+
+  getPlaylistCount: function (player) {
+    const playlist = player.playlist; // has playlist plugin
+    if (!playlist) {
+      return 1;
+    }
+    return playlist.lastIndex && playlist.lastIndex() + 1;
+  },
+
+  getCurrentPlaylistIndex: function (player) {
+    const playlist = player.playlist; // has playlist plugin
+    if (!playlist) {
+      return 0;
+    }
+    return playlist.currentIndex && playlist.currentIndex();
+  },
+
+  getCurrentPlaylistItem: function(player) {
+    const playlist = player.playlist; // has playlist plugin
+    if (!playlist) {
+      return;
+    }
+
+    const currentIndex = this.getCurrentPlaylistIndex(player);
+    if (!currentIndex) {
+      return
+    }
+
+    const item = playlist()[currentIndex];
+    return item;
+  }
+};
+
+const videojsSubmoduleFactory = function (config) {
+  const adState = adStateFactory();
+  const timeState = timeStateFactory();
+  const callbackStorage = null;
+  // videojs factory is stored to window by default
+  const vjs = window.videojs;
+  return VideojsProvider(config, vjs, adState, timeState, callbackStorage, utils);
+}
+
+videojsSubmoduleFactory.vendorCode = VIDEO_JS_VENDOR;
+submodule('video', videojsSubmoduleFactory);
+export default videojsSubmoduleFactory;
+
+// STATE
+
+/**
+ * @returns {State}
+ */
+export function adStateFactory() {
+  const adState = Object.assign({}, stateFactory());
+
+  function updateForEvent(event) {
+    if (!event) {
+      return;
+    }
+
+    const skippable = event.skippable;
+    // TODO: possibly can check traffickingParameters to determine if winning bid is passed
+    const updates = {
+      adId: event.adId,
+      adServer: event.adSystem,
+      advertiserName: event.advertiserName,
+      redirectUrl: event.clickThroughUrl,
+      creativeId: event.creativeId || event.creativeAdId,
+      dealId: event.dealId,
+      adDescription: event.description,
+      linear: event.linear,
+      creativeUrl: event.mediaUrl,
+      adTitle: event.title,
+      universalAdId: event.universalAdIdValue,
+      creativeType: event.contentType,
+      wrapperAdIds: event.adWrapperIds,
+      skip: skippable ? 1 : 0,
+      // missing fields:
+      // loadTime
+      // advertiserId - TODO: does this even exist ? If not, remove from spec
+      // vastVersion
+      // adCategories
+      // campaignId
+      // waterfallIndex
+      // waterfallCount
+      // skipmin
+      // adTagUrl - for now, only has request ad tag
+      // adPlacementType
+    };
+
+    const adPodInfo = event.adPodInfo;
+    if (adPodInfo && adPodInfo.podIndex > -1) {
+      updates.adPodCount = adPodInfo.totalAds;
+      updates.adPodIndex = adPodInfo.adPosition - 1; // Per IMA docs, adPosition is 1 based.
+    }
+
+    if (adPodInfo && adPodInfo.timeOffset) {
+      switch (adPodInfo.timeOffset) {
+        case -1:
+          updates.offset = 'post';
+          break
+
+        case 0:
+          // TODO: Defaults to 0 if this ad is not part of a pod, or the pod is not part of an ad playlist. - need to check if loaded dynamically and pass last content time update
+          updates.offset = 'pre';
+          break
+
+        default:
+          updates.offset = '' + adPodInfo.timeOffset;
+      }
+    }
+
+    if (skippable) {
+      updates.skipafter = event.skipTimeOffset;
+    }
+
+    this.updateState(updates);
+  }
+
+  adState.updateForEvent = updateForEvent;
+
+  return adState;
+}
+
+export function timeStateFactory() {
+  const timeState = Object.assign({}, stateFactory());
+
+  function updateForTimeEvent(event) {
+    const { currentTime, duration } = event;
+    this.updateState({
+      time: currentTime,
+      duration,
+      playbackMode: getPlaybackMode(duration)
+    });
+  }
+
+  timeState.updateForTimeEvent = updateForTimeEvent;
+
+  function getPlaybackMode(duration) {
+    if (duration > 0) {
+      return PLAYBACK_MODE.VOD;
+    } else if (duration < 0) {
+      return PLAYBACK_MODE.DVR;
+    }
+
+    return PLAYBACK_MODE.LIVE;
+  }
+
+  return timeState;
+}
diff --git a/modules/videojsVideoProvider.md b/modules/videojsVideoProvider.md
new file mode 100644
index 00000000000..70f4daa64e1
--- /dev/null
+++ b/modules/videojsVideoProvider.md
@@ -0,0 +1,17 @@
+# Overview
+
+Module Name: Video.js Video Provider
+Module Type: Video Submodule
+Video Player: video.js
+Player website: https://videojs.com/
+Maintainer: Prebid Video Task Force
+
+# Description
+
+Video provider to connect the Prebid Video Module to video.js.
+
+# Requirements
+
+- Your page must include a build of video.js. For instructions see https://videojs.com/getting-started .
+- Your video.js instance must include the Google IMA plugin. 
+  - The Google IMA plugin must be accessible publicly in order for the Video.js Video Provider to reference it.
diff --git a/modules/videonowBidAdapter.js b/modules/videonowBidAdapter.js
new file mode 100644
index 00000000000..bfbc07fdff1
--- /dev/null
+++ b/modules/videonowBidAdapter.js
@@ -0,0 +1,122 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {_each, getBidIdParameter, getValue, logError, logInfo} from '../src/utils.js';
+
+const BIDDER_CODE = 'videonow';
+const RTB_URL = 'https://adx.videonow.ru/yhb'
+const DEFAULT_CURRENCY = 'RUB'
+const DEFAULT_CODE_TYPE = 'combo'
+const TTL_SECONDS = 60 * 5
+
+export const spec = {
+
+  code: BIDDER_CODE,
+  url: RTB_URL,
+  supportedMediaTypes: [ BANNER ],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bidRequest The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params) {
+      return false;
+    }
+
+    if (!bidRequest.params.pId) {
+      logError('failed validation: pId not declared');
+      return false
+    }
+
+    return true
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} validBidRequests - an array of bids
+   * @param bidderRequest
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    logInfo('validBidRequests', validBidRequests);
+
+    const bidRequests = [];
+
+    _each(validBidRequests, (bid) => {
+      const bidId = getBidIdParameter('bidId', bid)
+      const placementId = getValue(bid.params, 'pId')
+      const currency = getValue(bid.params, 'currency') || DEFAULT_CURRENCY
+      const url = getValue(bid.params, 'url') || RTB_URL
+      const codeType = getValue(bid.params, 'codeType') || DEFAULT_CODE_TYPE
+      const sizes = getValue(bid, 'sizes')
+
+      bidRequests.push({
+        method: 'POST',
+        url,
+        data: {
+          places: [
+            {
+              id: bidId,
+              placementId,
+              codeType,
+              sizes
+            }
+          ],
+          settings: {
+            currency,
+          }
+        },
+      })
+    })
+
+    return bidRequests;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest The bid params
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    logInfo('serverResponse', serverResponse.body);
+
+    const responsesBody = serverResponse ? serverResponse.body : {};
+    const bidResponses = [];
+    try {
+      if (!responsesBody?.bids?.length) {
+        return [];
+      }
+
+      _each(responsesBody.bids, (bid) => {
+        if (bid?.displayCode) {
+          const bidResponse = {
+            requestId: bid.id,
+            cpm: bid.cpm,
+            currency: bid.currency,
+            width: bid.size.width,
+            height: bid.size.height,
+            ad: bid.displayCode,
+            ttl: TTL_SECONDS,
+            creativeId: bid.id,
+            netRevenue: true,
+            meta: {
+              advertiserDomains: bid.adDomain ? [bid.adDomain] : []
+            }
+          };
+          bidResponses.push(bidResponse)
+        }
+      })
+    } catch (error) {
+      logError(error);
+    }
+
+    return bidResponses
+  },
+}
+
+registerBidder(spec);
diff --git a/modules/videonowBidAdapter.md b/modules/videonowBidAdapter.md
new file mode 100644
index 00000000000..0762880f666
--- /dev/null
+++ b/modules/videonowBidAdapter.md
@@ -0,0 +1,37 @@
+# Overview
+
+**Module Name**: Videonow Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: nregularniy@videonow.ru
+
+# Description
+
+Videonow Bidder Adapter for Prebid.js. About: https://videonow.ru/
+
+
+Use `videonow` as bidder:
+
+# Params
+- `pId` required, profile ID
+- `currency` optional, currency, default is 'RUB'
+- `url` optional, for debug, bidder url
+- `codeType` optional, for debug, yhb codeType
+
+## AdUnits configuration example
+```
+    var adUnits = [{
+      code: 'your-slot', //use exactly the same code as your slot div id.
+      mediaTypes: {
+          banner: {
+              sizes: [[640, 480]]
+          }
+      },
+      bids: [{
+        bidder: 'videonow',
+        params: { 
+            pId: '1234',
+            currency: 'RUB',
+        }
+      }]
+    }];
+```
diff --git a/modules/videoreachBidAdapter.js b/modules/videoreachBidAdapter.js
index 710920c54fc..1fc38066407 100644
--- a/modules/videoreachBidAdapter.js
+++ b/modules/videoreachBidAdapter.js
@@ -1,10 +1,12 @@
+import { getValue, getBidIdParameter } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-const utils = require('../src/utils.js');
 const BIDDER_CODE = 'videoreach';
 const ENDPOINT_URL = 'https://a.videoreach.com/hb/';
+const GVLID = 547;
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: ['banner'],
 
   isBidRequestValid: function(bid) {
@@ -15,18 +17,19 @@ export const spec = {
     let data = {
       data: validBidRequests.map(function(bid) {
         return {
-          TagId: utils.getValue(bid.params, 'TagId'),
-          adUnitCode: utils.getBidIdParameter('adUnitCode', bid),
-          bidId: utils.getBidIdParameter('bidId', bid),
-          bidderRequestId: utils.getBidIdParameter('bidderRequestId', bid),
-          auctionId: utils.getBidIdParameter('auctionId', bid),
-          transactionId: utils.getBidIdParameter('transactionId', bid)
+          TagId: getValue(bid.params, 'TagId'),
+          adUnitCode: getBidIdParameter('adUnitCode', bid),
+          bidId: getBidIdParameter('bidId', bid),
+          bidderRequestId: getBidIdParameter('bidderRequestId', bid),
+          auctionId: getBidIdParameter('auctionId', bid),
+          transactionId: getBidIdParameter('transactionId', bid)
         }
       })
     };
 
     if (bidderRequest && bidderRequest.refererInfo) {
-      data.referrer = bidderRequest.refererInfo.referer;
+      // TODO: is 'page' the right value here?
+      data.referrer = bidderRequest.refererInfo.page;
     }
 
     if (bidderRequest && bidderRequest.gdprConsent) {
@@ -58,7 +61,10 @@ export const spec = {
           ttl: bid.ttl,
           ad: bid.ad,
           requestId: bid.bidId,
-          creativeId: bid.creativeId
+          creativeId: bid.creativeId,
+          meta: {
+            advertiserDomains: bid && bid.adomain ? bid.adomain : []
+          }
         };
         bidResponses.push(bidResponse);
       });
diff --git a/modules/vidoomyBidAdapter.js b/modules/vidoomyBidAdapter.js
new file mode 100644
index 00000000000..146ea6dd4bd
--- /dev/null
+++ b/modules/vidoomyBidAdapter.js
@@ -0,0 +1,244 @@
+import { logError, deepAccess, parseSizesInput } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import { Renderer } from '../src/Renderer.js';
+import { INSTREAM, OUTSTREAM } from '../src/video.js';
+
+const ENDPOINT = `https://d.vidoomy.com/api/rtbserver/prebid/`;
+const BIDDER_CODE = 'vidoomy';
+const GVLID = 380;
+
+const COOKIE_SYNC_FALLBACK_URLS = [
+  'https://x.bidswitch.net/sync?ssp=vidoomy',
+  'https://ib.adnxs.com/getuid?https%3A%2F%2Fa-prebid.vidoomy.com%2Fsetuid%3Fbidder%3Dadnxs%26gdpr%3D{{GDPR}}%26gdpr_consent%3D{{GDPR_CONSENT}}%26uid%3D%24UID',
+  'https://pixel-sync.sitescout.com/dmp/pixelSync?nid=120&gdpr={{GDPR}}&gdpr_consent={{GDPR_CONSENT}}&redir=https%3A%2F%2Fa.vidoomy.com%2Fapi%2Frtbserver%2Fcookie%3Fi%3DCEN%26uid%3D%7BuserId%7D',
+  'https://cm.adform.net/cookie?redirect_url=https%3A%2F%2Fa-prebid.vidoomy.com%2Fsetuid%3Fbidder%3Dadf%26gdpr%3D{{GDPR}}%26gdpr_consent%3D{{GDPR_CONSENT}}%26uid%3D%24UID',
+  'https://ups.analytics.yahoo.com/ups/58531/occ?gdpr={{GDPR}}&gdpr_consent={{GDPR_CONSENT}}'
+];
+
+const isBidRequestValid = bid => {
+  if (!bid.params) {
+    logError(BIDDER_CODE + ': bid.params should be non-empty');
+    return false;
+  }
+
+  if (!+bid.params.pid) {
+    logError(BIDDER_CODE + ': bid.params.pid should be non-empty Number');
+    return false;
+  }
+
+  if (!+bid.params.id) {
+    logError(BIDDER_CODE + ': bid.params.id should be non-empty Number');
+    return false;
+  }
+
+  if (bid.params && bid.params.mediaTypes && bid.params.mediaTypes.video && bid.params.mediaTypes.video.context === INSTREAM && !bid.params.mediaTypes.video.playerSize) {
+    logError(BIDDER_CODE + ': bid.params.mediaType.video should have a playerSize property to tell player size when is INSTREAM');
+    return false;
+  }
+
+  if (bid.params.bidfloor && (isNaN(bid.params.bidfloor) || bid.params.bidfloor < 0)) {
+    logError(BIDDER_CODE + ': bid.params.bidfloor should be a number equal or greater than zero');
+    return false;
+  }
+
+  return true;
+};
+
+const isBidResponseValid = bid => {
+  if (!bid || !bid.requestId || !bid.cpm || !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 || bid.vastXml);
+    default:
+      return false;
+  }
+}
+
+const buildRequests = (validBidRequests, bidderRequest) => {
+  const serverRequests = validBidRequests.map(bid => {
+    let adType = BANNER;
+    let sizes;
+    if (bid.mediaTypes && bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
+      sizes = bid.mediaTypes[BANNER].sizes;
+      adType = BANNER;
+    } else if (bid.mediaTypes && bid.mediaTypes[VIDEO] && bid.mediaTypes[VIDEO].playerSize) {
+      sizes = bid.mediaTypes[VIDEO].playerSize;
+      adType = VIDEO;
+    }
+    const [w, h] = (parseSizesInput(sizes)[0] || '0x0').split('x');
+
+    // TODO: is 'domain' the right value here?
+    const hostname = bidderRequest.refererInfo.domain || window.location.hostname;
+
+    const videoContext = deepAccess(bid, 'mediaTypes.video.context');
+    const bidfloor = deepAccess(bid, `params.bidfloor`, 0);
+
+    const queryParams = {
+      id: bid.params.id,
+      adtype: adType,
+      auc: bid.adUnitCode,
+      w,
+      h,
+      pos: parseInt(bid.params.position) || 1,
+      ua: navigator.userAgent,
+      l: navigator.language && navigator.language.indexOf('-') !== -1 ? navigator.language.split('-')[0] : '',
+      dt: /Mobi/.test(navigator.userAgent) ? 2 : 1,
+      pid: bid.params.pid,
+      requestId: bid.bidId,
+      schain: bid.schain || '',
+      bidfloor,
+      d: getDomainWithoutSubdomain(hostname), // 'vidoomy.com',
+      // TODO: does the fallback make sense here?
+      sp: encodeURIComponent(bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation),
+      usp: bidderRequest.uspConsent || '',
+      coppa: !!config.getConfig('coppa'),
+      videoContext: videoContext || ''
+    };
+
+    if (bidderRequest.gdprConsent) {
+      queryParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+      queryParams.gdprcs = bidderRequest.gdprConsent.consentString;
+    }
+
+    return {
+      method: 'GET',
+      url: ENDPOINT,
+      data: queryParams
+    };
+  });
+  return serverRequests;
+};
+
+const render = (bid) => {
+  bid.ad = bid.vastUrl;
+  var obj = {
+    vastTimeout: 5000,
+    maxAllowedVastTagRedirects: 3,
+    allowVpaid: true,
+    autoPlay: true,
+    preload: true,
+    mute: true,
+  }
+  window.outstreamPlayer(bid, bid.adUnitCode, obj);
+}
+
+const interpretResponse = (serverResponse, bidRequest) => {
+  try {
+    let responseBody = serverResponse.body;
+    if (!responseBody) return;
+    if (responseBody.mediaType === 'video') {
+      responseBody.ad = responseBody.vastUrl || responseBody.vastXml;
+      const videoContext = bidRequest.data.videoContext;
+
+      if (videoContext === OUTSTREAM) {
+        try {
+          const renderer = Renderer.install({
+            id: bidRequest.bidId,
+            adunitcode: bidRequest.tagId,
+            loaded: false,
+            config: responseBody.mediaType,
+            url: responseBody.meta.rendererUrl
+          });
+          renderer.setRender(render);
+
+          responseBody.renderer = renderer;
+        } catch (e) {
+          responseBody.ad = responseBody.vastUrl || responseBody.vastXml;
+          logError(BIDDER_CODE + ': error while installing renderer to show outstream ad');
+        }
+      }
+    }
+    const bid = {
+      ad: responseBody.ad,
+      renderer: responseBody.renderer,
+      mediaType: responseBody.mediaType,
+      requestId: responseBody.requestId,
+      cpm: responseBody.cpm,
+      currency: responseBody.currency,
+      width: responseBody.width,
+      height: responseBody.height,
+      creativeId: responseBody.creativeId,
+      netRevenue: responseBody.netRevenue,
+      ttl: responseBody.ttl,
+      meta: {
+        mediaType: responseBody.meta.mediaType,
+        rendererUrl: responseBody.meta.rendererUrl,
+        advertiserDomains: responseBody.meta.advertiserDomains,
+        advertiserId: responseBody.meta.advertiserId,
+        advertiserName: responseBody.meta.advertiserName,
+        agencyId: responseBody.meta.agencyId,
+        agencyName: responseBody.meta.agencyName,
+        brandId: responseBody.meta.brandId,
+        brandName: responseBody.meta.brandName,
+        dchain: responseBody.meta.dchain,
+        networkId: responseBody.meta.networkId,
+        networkName: responseBody.meta.networkName,
+        primaryCatId: responseBody.meta.primaryCatId,
+        secondaryCatIds: responseBody.meta.secondaryCatIds
+      }
+    };
+    if (responseBody.vastUrl) {
+      bid.vastUrl = responseBody.vastUrl;
+    } else if (responseBody.vastXml) {
+      bid.vastXml = responseBody.vastXml;
+    }
+
+    const bids = [];
+
+    if (isBidResponseValid(bid)) {
+      bids.push(bid);
+    } else {
+      logError(BIDDER_CODE + ': server returns invalid response');
+    }
+
+    return bids;
+  } catch (e) {
+    logError(BIDDER_CODE + ': error parsing server response to Prebid format');
+    return [];
+  }
+};
+
+function getUserSyncs (syncOptions, responses, gdprConsent, uspConsent) {
+  if (syncOptions.iframeEnabled || syncOptions.pixelEnabled) {
+    const pixelType = syncOptions.pixelEnabled ? 'image' : 'iframe';
+    const urls = deepAccess(responses, '0.body.pixels') || COOKIE_SYNC_FALLBACK_URLS;
+
+    return [].concat(urls).map(url => ({
+      type: pixelType,
+      url: url
+        .replace('{{GDPR}}', gdprConsent ? (gdprConsent.gdprApplies ? '1' : '0') : '0')
+        .replace('{{GDPR_CONSENT}}', gdprConsent ? encodeURIComponent(gdprConsent.consentString) : '')
+        .replace('{{USP_CONSENT}}', uspConsent ? encodeURIComponent(uspConsent) : '')
+    }));
+  }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  gvlid: GVLID,
+  getUserSyncs,
+};
+
+registerBidder(spec);
+
+function getDomainWithoutSubdomain (hostname) {
+  const parts = hostname.split('.');
+  const newParts = [];
+  for (let i = parts.length - 1; i >= 0; i--) {
+    newParts.push(parts[i]);
+    if (newParts.length !== 1 && parts[i].length > 3) {
+      break;
+    }
+  }
+  return newParts.reverse().join('.');
+}
diff --git a/modules/vidoomyBidAdapter.md b/modules/vidoomyBidAdapter.md
new file mode 100644
index 00000000000..d91ace5a7b9
--- /dev/null
+++ b/modules/vidoomyBidAdapter.md
@@ -0,0 +1,61 @@
+# Overview
+
+**Module Name:** Vidoomy Bid Adapter
+
+**Module Type:** Bidder Adapter
+
+**Maintainer:** support@vidoomy.com
+
+# Description
+
+Module to connect with Vidoomy, supporting banner and video
+ 
+# Test Parameters
+For banner
+```js
+var adUnits = [
+  {
+    code: 'test-ad',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250]] // only first size will be accepted
+        }
+    },
+    bids: [
+      {
+        bidder: 'vidoomy',
+        params: {
+          id: '123123',
+          pid: '123123',
+          bidfloor: 0.5 // This is optional
+        }
+      }
+    ]
+  }
+];
+```
+
+For video
+```js
+var adUnits = [
+  {
+    code: 'test-ad',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [300, 250]
+        }
+    },
+    bids: [
+      {
+        bidder: 'vidoomy',
+        params: {
+          id: '123123',
+          pid: '123123',
+          bidfloor: 0.5 // This is optional
+        }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/viewability.js b/modules/viewability.js
new file mode 100644
index 00000000000..8da2d00f9ef
--- /dev/null
+++ b/modules/viewability.js
@@ -0,0 +1,9 @@
+import {logWarn} from '../src/utils.js';
+
+export const MODULE_NAME = 'viewability';
+
+export function init() {
+  logWarn('Viewability module should not be used. See https://github.com/prebid/Prebid.js/issues/8928');
+}
+
+init();
diff --git a/modules/viewdeosDXBidAdapter.js b/modules/viewdeosDXBidAdapter.js
index 52894ef2dd9..7afd23cbde7 100644
--- a/modules/viewdeosDXBidAdapter.js
+++ b/modules/viewdeosDXBidAdapter.js
@@ -1,8 +1,8 @@
-import * as utils from '../src/utils.js';
+import {deepAccess, flatten, isArray, logError, parseSizesInput} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {VIDEO, BANNER} from '../src/mediaTypes.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
-import findIndex from 'core-js-pure/features/array/find-index.js';
+import {findIndex} from '../src/polyfill.js';
 
 const URL = 'https://ghb.sync.viewdeos.com/auction/';
 const OUTSTREAM_SRC = 'https://player.sync.viewdeos.com/outstream-unit/2.01/outstream.min.js';
@@ -13,9 +13,10 @@ const DISPLAY = 'display';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['viewdeos'],
+  gvlid: 924,
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
-    return !!utils.deepAccess(bid, 'params.aid');
+    return !!deepAccess(bid, 'params.aid');
   },
   getUserSyncs: function (syncOptions, serverResponses) {
     const syncs = [];
@@ -42,9 +43,9 @@ export const spec = {
     }
 
     if (syncOptions.pixelEnabled || syncOptions.iframeEnabled) {
-      utils.isArray(serverResponses) && serverResponses.forEach((response) => {
+      isArray(serverResponses) && serverResponses.forEach((response) => {
         if (response.body) {
-          if (utils.isArray(response.body)) {
+          if (isArray(response.body)) {
             response.body.forEach(b => {
               addSyncs(b);
             })
@@ -80,12 +81,12 @@ export const spec = {
     serverResponse = serverResponse.body;
     let bids = [];
 
-    if (!utils.isArray(serverResponse)) {
+    if (!isArray(serverResponse)) {
       return parseRTBResponse(serverResponse, bidderRequest);
     }
 
     serverResponse.forEach(serverBidResponse => {
-      bids = utils.flatten(bids, parseRTBResponse(serverBidResponse, bidderRequest));
+      bids = flatten(bids, parseRTBResponse(serverBidResponse, bidderRequest));
     });
 
     return bids;
@@ -93,7 +94,7 @@ export const spec = {
 };
 
 function parseRTBResponse(serverResponse, bidderRequest) {
-  const isInvalidValidResp = !serverResponse || !utils.isArray(serverResponse.bids);
+  const isInvalidValidResp = !serverResponse || !isArray(serverResponse.bids);
 
   const bids = [];
 
@@ -101,7 +102,7 @@ function parseRTBResponse(serverResponse, bidderRequest) {
     const extMessage = serverResponse && serverResponse.ext && serverResponse.ext.message ? `: ${serverResponse.ext.message}` : '';
     const errorMessage = `in response for ${bidderRequest.bidderCode} adapter ${extMessage}`;
 
-    utils.logError(errorMessage);
+    logError(errorMessage);
 
     return bids;
   }
@@ -124,15 +125,16 @@ function parseRTBResponse(serverResponse, bidderRequest) {
 
 function bidToTag(bidRequests, bidderRequest) {
   const tag = {
-    domain: utils.deepAccess(bidderRequest, 'refererInfo.referer')
+    // TODO: is 'page' the right value here?
+    domain: deepAccess(bidderRequest, 'refererInfo.page')
   };
 
-  if (utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
+  if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
     tag.gdpr = 1;
-    tag.gdpr_consent = utils.deepAccess(bidderRequest, 'gdprConsent.consentString');
+    tag.gdpr_consent = deepAccess(bidderRequest, 'gdprConsent.consentString');
   }
 
-  if (utils.deepAccess(bidderRequest, 'bidderRequest.uspConsent')) {
+  if (deepAccess(bidderRequest, 'bidderRequest.uspConsent')) {
     tag.us_privacy = bidderRequest.uspConsent;
   }
 
@@ -150,14 +152,14 @@ function bidToTag(bidRequests, bidderRequest) {
  * @returns {object}
  */
 function prepareRTBRequestParams(_index, bid) {
-  const mediaType = utils.deepAccess(bid, 'mediaTypes.video') ? VIDEO : DISPLAY;
+  const mediaType = deepAccess(bid, 'mediaTypes.video') ? VIDEO : DISPLAY;
   const index = !_index ? '' : `${_index + 1}`;
-  const sizes = bid.sizes ? bid.sizes : (mediaType === VIDEO ? utils.deepAccess(bid, 'mediaTypes.video.playerSize') : utils.deepAccess(bid, 'mediaTypes.banner.sizes'));
+  const sizes = bid.sizes ? bid.sizes : (mediaType === VIDEO ? deepAccess(bid, 'mediaTypes.video.playerSize') : deepAccess(bid, 'mediaTypes.banner.sizes'));
   return {
     ['callbackId' + index]: bid.bidId,
     ['aid' + index]: bid.params.aid,
     ['ad_type' + index]: mediaType,
-    ['sizes' + index]: utils.parseSizesInput(sizes).join()
+    ['sizes' + index]: parseSizesInput(sizes).join()
   };
 }
 
@@ -167,8 +169,8 @@ function prepareRTBRequestParams(_index, bid) {
  * @returns {object}
  */
 function getMediaType(bidderRequest) {
-  const videoMediaType = utils.deepAccess(bidderRequest, 'mediaTypes.video');
-  const context = utils.deepAccess(bidderRequest, 'mediaTypes.video.context');
+  const videoMediaType = deepAccess(bidderRequest, 'mediaTypes.video');
+  const context = deepAccess(bidderRequest, 'mediaTypes.video.context');
 
   return !videoMediaType ? DISPLAY : context === OUTSTREAM ? OUTSTREAM : VIDEO;
 }
@@ -189,7 +191,10 @@ function createBid(bidResponse, mediaType, bidderParams) {
     cpm: bidResponse.cpm,
     netRevenue: true,
     mediaType,
-    ttl: 3600
+    ttl: 3600,
+    meta: {
+      advertiserDomains: bidResponse.adomain || []
+    }
   };
 
   if (mediaType === DISPLAY) {
diff --git a/modules/viouslyBidAdapter.js b/modules/viouslyBidAdapter.js
new file mode 100644
index 00000000000..f18c9c7b3db
--- /dev/null
+++ b/modules/viouslyBidAdapter.js
@@ -0,0 +1,209 @@
+import { deepAccess, logError, parseUrl, parseSizesInput, triggerPixel } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { VIDEO } from '../src/mediaTypes.js';
+import find from 'core-js-pure/features/array/find.js'; // eslint-disable-line prebid/validate-imports
+
+const BIDDER_CODE = 'viously';
+// const GVLID = 1028;
+const CURRENCY = 'EUR';
+const TTL = 60;
+const HTTP_METHOD = 'POST';
+const REQUEST_URL = 'https://bidder.viously.com/bid';
+const REQUIRED_VIDEO_PARAMS = ['context', 'playbackmethod', 'playerSize'];
+const REQUIRED_VIOUSLY_PARAMS = ['pid'];
+
+export const spec = {
+  code: BIDDER_CODE,
+  // gvlid: GVLID,
+  supportedMediaTypes: [VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    let videoParams = deepAccess(bid, 'mediaTypes.video');
+
+    if (!bid.params) {
+      logError('The bid params are missing');
+      return false;
+    }
+
+    if (!videoParams) {
+      logError('The placement must be of video type');
+      return false;
+    }
+
+    /**
+     * VIDEO checks
+     */
+
+    let areParamsValid = true;
+
+    REQUIRED_VIDEO_PARAMS.forEach(function(videoParam) {
+      if (typeof videoParams[videoParam] === 'undefined') {
+        logError('mediaTypes.video.' + videoParam + ' must be set for video placement.');
+        areParamsValid = false;
+      }
+    });
+
+    if (parseSizesInput(videoParams.playerSize).length === 0) {
+      logError('mediaTypes.video.playerSize must be set for video placement at the right format.');
+      return false;
+    }
+
+    /**
+     * Viously checks
+     */
+
+    REQUIRED_VIOUSLY_PARAMS.forEach(function(viouslyParam) {
+      if (typeof bid.params[viouslyParam] === 'undefined') {
+        logError('The ' + viouslyParam + ' is missing.');
+        areParamsValid = false;
+      }
+    });
+
+    if (!areParamsValid) {
+      return false;
+    }
+
+    return true;
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let payload = {};
+
+    /** Viously Publisher ID */
+    if (validBidRequests[0].params.pid) {
+      payload.pid = validBidRequests[0].params.pid;
+    }
+
+    // Referer Info
+    if (config.getConfig('pageUrl')) {
+      let parsedUrl = parseUrl(config.getConfig('pageUrl'));
+
+      payload.domain = parsedUrl.hostname;
+      payload.page_domain = config.getConfig('pageUrl');
+    } else if (bidderRequest && bidderRequest.refererInfo) {
+      let parsedUrl = parseUrl(bidderRequest.refererInfo.page);
+
+      payload.domain = parsedUrl.hostname;
+      payload.page_domain = bidderRequest.refererInfo.page;
+    }
+    if (payload.domain) {
+      /** Make sur that the scheme is not part of the domain */
+      payload.domain = payload.domain.replace(/(^\w+:|^)\/\//, '');
+      payload.domain = payload.domain.replace(/\/$/, '');
+    }
+
+    // Handle GDPR
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdpr = bidderRequest.gdprConsent.gdprApplies;
+      payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
+      if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+        payload.addtl_consent = bidderRequest.gdprConsent.addtlConsent;
+      }
+    }
+
+    // US Privacy
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    // Schain
+    if (validBidRequests[0].schain) {
+      payload.schain = validBidRequests[0].schain;
+    }
+    // Currency
+    payload.currency_code = CURRENCY;
+
+    // User IDs
+    if (validBidRequests[0].userIdAsEids) {
+      payload.users_uid = validBidRequests[0].userIdAsEids;
+    }
+
+    // Placements
+    payload.placements = validBidRequests.map(bidRequest => {
+      let request = {
+        id: bidRequest.adUnitCode,
+        bid_id: bidRequest.bidId
+      };
+
+      request.video_params = {
+        context: deepAccess(bidRequest, 'mediaTypes.video.context'),
+        playbackmethod: deepAccess(bidRequest, 'mediaTypes.video.playbackmethod'),
+        size: parseSizesInput(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
+      };
+
+      return request;
+    });
+
+    return {
+      method: HTTP_METHOD,
+      url: validBidRequests[0].params.endpoint ? validBidRequests[0].params.endpoint : REQUEST_URL,
+      data: payload
+    };
+  },
+
+  interpretResponse: function(serverResponse, requests) {
+    const bidResponses = [];
+    const responseBody = serverResponse.body;
+
+    if (responseBody.ads && responseBody.ads.length > 0) {
+      responseBody.ads.forEach(function(bidResponse) {
+        if (bidResponse.bid) {
+          let bidRequest = find(requests.data.placements, bid => bid.bid_id === bidResponse.bid_id);
+
+          if (bidRequest) {
+            let sizes = bidResponse.size.split('x');
+
+            const bid = {
+              requestId: bidRequest.bid_id,
+              id: bidResponse.id,
+              cpm: bidResponse.cpm,
+              width: sizes[0],
+              height: sizes[1],
+              creativeId: bidResponse.creative_id || '',
+              currency: CURRENCY,
+              netRevenue: true,
+              ttl: TTL,
+              mediaType: 'video',
+              meta: {},
+              // Tracking data
+              nurl: bidResponse.nurl ? bidResponse.nurl : []
+            };
+
+            if (bidResponse.ad_url) {
+              bid.vastUrl = bidResponse.ad_url;
+            } else {
+              bid.vastXml = bidResponse.ad;
+            }
+
+            bidResponses.push(bid);
+          }
+        }
+      });
+    }
+
+    return bidResponses;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {},
+
+  onTimeout: function(timeoutData) {},
+
+  onBidWon: function(bid) {
+    if (bid && bid.nurl && bid.nurl.length > 0) {
+      bid.nurl.forEach(function(winUrl) {
+        triggerPixel(winUrl, null);
+      });
+    }
+  },
+
+  onSetTargeting: function(bid) {}
+};
+
+registerBidder(spec);
diff --git a/modules/viouslyBidAdapter.md b/modules/viouslyBidAdapter.md
new file mode 100644
index 00000000000..0d15525cc72
--- /dev/null
+++ b/modules/viouslyBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Viously Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@viously.com
+```
+
+# Description
+
+Module that connects to Viously's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                video: {
+                    playerSize: [640, 360],
+                    context: 'instream',
+                    playbackmethod: [1, 2, 3, 4, 5, 6]
+                }
+            },
+            bids: [
+                {
+                    bidder: 'viously',
+                    params: {
+                        pid: '20d30b78-43ec-11ed-b878-0242ac120002'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/viqeoBidAdapter.js b/modules/viqeoBidAdapter.js
new file mode 100644
index 00000000000..5762a794c8e
--- /dev/null
+++ b/modules/viqeoBidAdapter.js
@@ -0,0 +1,180 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {logError, logInfo, _each, mergeDeep, isFn, isNumber, isPlainObject} from '../src/utils.js'
+import {VIDEO} from '../src/mediaTypes.js';
+import {Renderer} from '../src/Renderer.js';
+
+const BIDDER_CODE = 'viqeo';
+const DEFAULT_MIMES = ['application/javascript'];
+const VIQEO_ENDPOINT = 'https://ads.betweendigital.com/openrtb_bid';
+const RENDERER_URL = 'https://cdn.viqeo.tv/js/vq_starter.js';
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_SSPID = 44697;
+
+function getBidFloor(bid) {
+  const {floor, currency} = bid.params;
+  const curr = currency || DEFAULT_CURRENCY;
+  if (!isFn(bid.getFloor)) {
+    return {floor: isNumber(floor) ? floor : 0, currency: curr};
+  }
+  const floorInfo = bid.getFloor({currency: curr, mediaType: VIDEO, size: '*'});
+  if (isPlainObject(floorInfo) && isNumber(floorInfo.floor) && floorInfo.currency === curr) {
+    return floorInfo;
+  }
+  return {floor: floor || 0, currency: currency || DEFAULT_CURRENCY};
+}
+
+function getVideoTargetingParams({mediaTypes: {video}}) {
+  const result = {};
+  Object.keys(Object(video))
+    .forEach(key => {
+      if (key === 'playerSize') {
+        result.w = video.playerSize[0][0];
+        result.h = video.playerSize[0][1];
+      } else if (key !== 'context') {
+        result[key] = video[key];
+      }
+    })
+  return result;
+}
+
+/**
+ * @type {BidderSpec}
+ */
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [VIDEO],
+  /**
+   * @param {BidRequest} bidRequest The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: ({params}) => {
+    if (!params) {
+      logError('failed validation: params not declared');
+      return false;
+    }
+    if (!params.user && !params.user?.buyeruid) {
+      logError('failed validation: user.buyeruid not declared');
+      return false;
+    }
+    if (!params.playerOptions) {
+      logError('failed validation: playerOptions not declared');
+      return false;
+    }
+    const {profileId, videoId, playerId} = params.playerOptions;
+    if (!profileId) {
+      logError('failed validation: profileId not declared');
+      return false;
+    }
+    if (!videoId && !playerId) {
+      logError('failed validation: videoId or playerId not declared');
+      return false;
+    }
+    return true;
+  },
+  /**
+   * @param validBidRequests {BidRequest[]}
+   * @returns {ServerRequest[]}
+   */
+  buildRequests: (validBidRequests) => {
+    logInfo('validBidRequests', validBidRequests);
+    const bidRequests = [];
+    _each(validBidRequests, (bid, i) => {
+      const {
+        params: {test, sspId, endpointUrl},
+        mediaTypes: {video},
+      } = bid;
+      const ortb2 = bid.ortb2 || {};
+      const user = bid.params.user || {};
+      const device = bid.params.device || {};
+      const site = bid.params.site || {};
+      const w = window;
+      const floorInfo = getBidFloor(bid);
+      const data = {
+        id: bid.bidId,
+        test,
+        imp: [{
+          id: `${i}`,
+          tagid: bid.adUnitCode,
+          video: {
+            ...getVideoTargetingParams(bid),
+            mimes: video.mimes || DEFAULT_MIMES,
+          },
+          bidfloor: floorInfo.floor,
+          bidfloorcur: floorInfo.currency,
+          secure: 1
+        }],
+        site: test === 1 ? {
+          page: 'https://viqeo.tv',
+          domain: 'viqeo.tv'
+        } : mergeDeep({
+          domain: w.location.hostname,
+          page: w.location.href
+        }, ortb2.site, site),
+        device: mergeDeep({
+          w: w.screen.width,
+          h: w.screen.height,
+          ua: w.navigator.userAgent,
+        }, ortb2.device, device),
+        user: mergeDeep({...user}, ortb2.user),
+        app: bid.params.app,
+      };
+      bidRequests.push({
+        url: endpointUrl || `${VIQEO_ENDPOINT}/?sspId=${sspId || DEFAULT_SSPID}`,
+        method: 'POST',
+        data,
+        bids: validBidRequests,
+      });
+    });
+    return bidRequests;
+  },
+  /**
+   * @param {ServerResponse} serverResponse
+   * @param {BidRequest} bidRequests
+   * @return {Bid[]}
+   */
+  interpretResponse: (serverResponse, bidRequests) => {
+    logInfo('serverResponse', serverResponse);
+    const bidResponses = [];
+    if (!serverResponse || !serverResponse.body) {
+      logError('empty response');
+      return [];
+    }
+    try {
+      const {id, seatbid, cur} = serverResponse.body;
+      _each(seatbid, (sb) => {
+        const {bid} = sb;
+        _each(bid, (b) => {
+          const bidRequest = bidRequests.bids.find(({bidId}) => bidId === id);
+          const renderer = Renderer.install({
+            url: bidRequest?.params?.renderUrl || RENDERER_URL,
+          });
+          renderer.setRender((bid) => {
+            if (window.VIQEO) {
+              window.VIQEO.renderPrebid(bid);
+            } else {
+              logError('failed get window.VIQEO');
+            }
+          });
+          bidResponses.push({
+            requestId: id,
+            currency: cur,
+            cpm: b.price,
+            ttl: b.exp,
+            netRevenue: true,
+            creativeId: b.cid,
+            width: b.w || bidRequest?.mediaTypes[VIDEO].playerSize[0][0],
+            height: b.h || bidRequest?.mediaTypes[VIDEO].playerSize[0][1],
+            vastXml: b.adm,
+            vastUrl: b.nurl,
+            mediaType: VIDEO,
+            renderer,
+          })
+        })
+      });
+    } catch (error) {
+      logError(error);
+    }
+    return bidResponses;
+  },
+}
+registerBidder(spec);
diff --git a/modules/viqeoBidAdapter.md b/modules/viqeoBidAdapter.md
new file mode 100644
index 00000000000..b4a020bf057
--- /dev/null
+++ b/modules/viqeoBidAdapter.md
@@ -0,0 +1,56 @@
+# Overview
+
+**Module Name**: Viqeo Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: muravjovv1@gmail.com
+
+# Description
+
+Viqeo Bidder Adapter for Prebid.js. About: https://viqeo.tv/
+
+### Bid params
+
+{: .table .table-bordered .table-striped }
+| Name                        | Scope    | Description                                                                                                                | Example                  | Type      |
+|-----------------------------|----------|----------------------------------------------------------------------------------------------------------------------------|--------------------------|-----------|
+| `user`                      | required | The object containing user data (See OpenRTB spec)                                                                         | `user: {}`               | `object`  |
+| `user.buyeruid`             | required | User id                                                                                                                    | `"12345"`                | `string`  |
+| `playerOptions`             | required | The object containing Viqeo player options                                                                                 | `playerOptions: {}`      | `object`  |
+| `playerOptions.profileId`   | required | Viqeo profile id                                                                                                           | `1382`                   | `number`  |
+| `playerOptions.videId`      | optional | Viqeo video id                                                                                                             | `"ed584da454c7205ca7e4"` | `string`  |
+| `playerOptions.playerId`    | optional | Viqeo player id                                                                                                            | `1`                      | `number`  |
+| `device`                    | optional | The object containing device data (See OpenRTB spec)                                                                       | `device: {}`             | `object`  |
+| `site`                      | optional | The object containing site data (See OpenRTB spec)                                                                         | `site: {}`               | `object`  |
+| `app`                       | optional | The object containing app data (See OpenRTB spec)                                                                          | `app: {}`                | `object`  |
+| `floor`                     | optional | Bid floor price                                                                                                            | `0.5`                    | `number`  |
+| `currency`                  | optional | 3-letter ISO 4217 code defining the currency of the bid.                                                                   | `EUR`                    | `string`  |
+| `test`                      | optional | Flag which will induce a sample bid response when true; only set to true for testing purposes (1 = true, 0 = false)        | `1`                      | `integer` |
+| `sspId`                     | optional | For debug, request id                                                                                                      | `1`                      | `number`  |
+| `renderUrl`                 | optional | For debug, script player url                                                                                               | `"https://viqeo.tv"`     | `string`  |
+| `endpointUrl`               | optional | For debug, api endpoint                                                                                                    | `"https://viqeo.tv"`     | `string`  |
+
+# Test Parameters
+```
+    var adUnits = [{
+      code: 'your-slot', // use exactly the same code as your slot div id.
+      mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [640, 480]  
+          }
+      },
+      bids: [{
+        bidder: 'viqeo',
+        params: { 
+            user: {
+                buyeruid: '1',
+            },
+            playerOptions: {
+                videoId: 'ed584da454c7205ca7e4',
+                profileId: 1382,
+            },
+            test: 1,
+        }
+      }]
+    }];
+```
diff --git a/modules/visxBidAdapter.js b/modules/visxBidAdapter.js
index 511e658c947..ee4d9708f15 100644
--- a/modules/visxBidAdapter.js
+++ b/modules/visxBidAdapter.js
@@ -1,15 +1,22 @@
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { triggerPixel, parseSizesInput, deepAccess, logError, getGptSlotInfoForAdUnitCode } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { INSTREAM as VIDEO_INSTREAM } from '../src/video.js';
 const BIDDER_CODE = 'visx';
-const ENDPOINT_URL = 'https://t.visx.net/hb';
+const GVLID = 154;
+const BASE_URL = 'https://t.visx.net';
+const DEBUG_URL = 'https://t-stage.visx.net';
+const ENDPOINT_PATH = '/hb_post';
 const TIME_TO_LIVE = 360;
 const DEFAULT_CUR = 'EUR';
-const ADAPTER_SYNC_URL = 'https://t.visx.net/push_sync';
+const ADAPTER_SYNC_PATH = '/push_sync';
+const TRACK_TIMEOUT_PATH = '/track/bid_timeout';
 const LOG_ERROR_MESS = {
   noAuid: 'Bid from response has no auid parameter - ',
   noAdm: 'Bid from response has no adm parameter - ',
   noBid: 'Array of bid objects is empty',
+  noImpId: 'Bid from response has no impid parameter - ',
   noPlacementCode: 'Can\'t find in requested bids the bid with auid - ',
   emptyUids: 'Uids should not be empty',
   emptySeatbid: 'Seatbid array from response has an empty item',
@@ -17,100 +24,79 @@ const LOG_ERROR_MESS = {
   hasEmptySeatbidArray: 'Response has empty seatbid array',
   hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - ',
   notAllowedCurrency: 'Currency is not supported - ',
-  currencyMismatch: 'Currency from the request is not match currency from the response - '
+  currencyMismatch: 'Currency from the request is not match currency from the response - ',
+  onlyVideoInstream: `Only video ${VIDEO_INSTREAM} supported`,
+  videoMissing: 'Bid request videoType property is missing - '
 };
 const currencyWhiteList = ['EUR', 'USD', 'GBP', 'PLN'];
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bid) {
-    return !!bid.params.uid;
+    if (_isVideoBid(bid)) {
+      if (!_isValidVideoBid(bid, true)) {
+        // in case if video bid configuration invalid will try to send bid request for banner
+        if (!_isBannerBid(bid)) {
+          return false;
+        }
+      }
+    }
+    return !!bid.params.uid && !isNaN(parseInt(bid.params.uid));
   },
   buildRequests: function(validBidRequests, bidderRequest) {
     const auids = [];
     const bidsMap = {};
-    const slotsMapByUid = {};
-    const sizeMap = {};
     const bids = validBidRequests || [];
     const currency =
       config.getConfig(`currency.bidderCurrencyDefault.${BIDDER_CODE}`) ||
       config.getConfig('currency.adServerCurrency') ||
       DEFAULT_CUR;
+
     let reqId;
     let payloadSchain;
     let payloadUserId;
+    let payloadUserEids;
+    let timeout;
 
     if (currencyWhiteList.indexOf(currency) === -1) {
-      utils.logError(LOG_ERROR_MESS.notAllowedCurrency + currency);
+      logError(LOG_ERROR_MESS.notAllowedCurrency + currency);
       return;
     }
 
+    const imp = [];
+
     bids.forEach(bid => {
       reqId = bid.bidderRequestId;
-      const {params: {uid}, adUnitCode, schain, userId} = bid;
-      auids.push(uid);
+
+      const impObj = buildImpObject(bid);
+      if (impObj) {
+        imp.push(impObj);
+        bidsMap[bid.bidId] = bid;
+      }
+
+      const { params: { uid }, schain, userId, userIdAsEids } = bid;
+
       if (!payloadSchain && schain) {
         payloadSchain = schain;
       }
-      if (!payloadUserId && userId) {
-        payloadUserId = userId;
+      if (!payloadUserEids && userIdAsEids) {
+        payloadUserEids = userIdAsEids;
       }
-      const sizesId = utils.parseSizesInput(bid.sizes);
 
-      if (!slotsMapByUid[uid]) {
-        slotsMapByUid[uid] = {};
-      }
-      const slotsMap = slotsMapByUid[uid];
-      if (!slotsMap[adUnitCode]) {
-        slotsMap[adUnitCode] = {adUnitCode, bids: [bid], parents: []};
-      } else {
-        slotsMap[adUnitCode].bids.push(bid);
+      if (!payloadUserId && userId) {
+        payloadUserId = userId;
       }
-      const slot = slotsMap[adUnitCode];
-
-      sizesId.forEach((sizeId) => {
-        sizeMap[sizeId] = true;
-        if (!bidsMap[uid]) {
-          bidsMap[uid] = {};
-        }
-
-        if (!bidsMap[uid][sizeId]) {
-          bidsMap[uid][sizeId] = [slot];
-        } else {
-          bidsMap[uid][sizeId].push(slot);
-        }
-        slot.parents.push({parent: bidsMap[uid], key: sizeId, uid});
-      });
+      auids.push(uid);
     });
 
-    const payload = {
-      pt: 'net',
-      auids: auids.join(','),
-      sizes: utils.getKeys(sizeMap).join(','),
-      r: reqId,
-      cur: currency,
-      wrapperType: 'Prebid_js',
-      wrapperVersion: '$prebid.version$'
-    };
-
-    if (payloadSchain) {
-      payload.schain = JSON.stringify(payloadSchain);
-    }
-
-    if (payloadUserId) {
-      if (payloadUserId.tdid) {
-        payload.tdid = payloadUserId.tdid;
-      }
-      if (payloadUserId.id5id) {
-        payload.id5 = payloadUserId.id5id;
-      }
-      if (payloadUserId.digitrustid && payloadUserId.digitrustid.data && payloadUserId.digitrustid.data.id) {
-        payload.dtid = payloadUserId.digitrustid.data.id;
-      }
-    }
+    const payload = {};
 
     if (bidderRequest) {
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        payload.u = bidderRequest.refererInfo.referer;
+      timeout = bidderRequest.timeout;
+      if (bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
+        // TODO: is 'page' the right value here?
+        payload.u = bidderRequest.refererInfo.page;
       }
       if (bidderRequest.gdprConsent) {
         if (bidderRequest.gdprConsent.consentString) {
@@ -122,19 +108,50 @@ export const spec = {
       }
     }
 
+    const bidderTimeout = Number(config.getConfig('bidderTimeout')) || timeout;
+    const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
+    const source = {
+      ext: {
+        wrapperType: 'Prebid_js',
+        wrapperVersion: '$prebid.version$',
+        ...(payloadSchain && { schain: payloadSchain })
+      }
+    };
+    const user = {
+      ext: {
+        ...(payloadUserEids && { eids: payloadUserEids }),
+        ...(payload.gdpr_consent && { consent: payload.gdpr_consent })
+      }
+    };
+    const regs = ('gdpr_applies' in payload) && {
+      ext: {
+        gdpr: payload.gdpr_applies
+      }
+    };
+
+    const request = {
+      id: reqId,
+      imp,
+      tmax,
+      cur: [currency],
+      source,
+      site: { page: payload.u },
+      ...(Object.keys(user.ext).length && { user }),
+      ...(regs && { regs })
+    };
+
     return {
-      method: 'GET',
-      url: ENDPOINT_URL,
-      data: payload,
-      bidsMap: bidsMap,
+      method: 'POST',
+      url: buildUrl(ENDPOINT_PATH) + '?auids=' + encodeURIComponent(auids.join(',')),
+      data: request,
+      bidsMap
     };
   },
   interpretResponse: function(serverResponse, bidRequest) {
     serverResponse = serverResponse && serverResponse.body;
     const bidResponses = [];
-    const bidsWithoutSizeMatching = [];
     const bidsMap = bidRequest.bidsMap;
-    const currency = bidRequest.data.cur;
+    const currency = bidRequest.data.cur[0];
 
     let errorMessage;
 
@@ -145,100 +162,224 @@ export const spec = {
 
     if (!errorMessage && serverResponse.seatbid) {
       serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidsMap, currency, bidResponses, bidsWithoutSizeMatching);
-      });
-      bidsWithoutSizeMatching.forEach(serverBid => {
-        _addBidResponse(serverBid, bidsMap, currency, bidResponses);
+        _addBidResponse(_getBidFromResponse(respItem), bidsMap, currency, bidResponses);
       });
     }
-    if (errorMessage) utils.logError(errorMessage);
+    if (errorMessage) logError(errorMessage);
     return bidResponses;
   },
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
-    if (syncOptions.pixelEnabled) {
-      var query = [];
-      if (gdprConsent) {
-        if (gdprConsent.consentString) {
-          query.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString));
-        }
-        query.push('gdpr_applies=' + encodeURIComponent(
-          (typeof gdprConsent.gdprApplies === 'boolean')
-            ? Number(gdprConsent.gdprApplies) : 1));
+    var query = [];
+    if (gdprConsent) {
+      if (gdprConsent.consentString) {
+        query.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString));
       }
+      query.push('gdpr_applies=' + encodeURIComponent(
+        (typeof gdprConsent.gdprApplies === 'boolean')
+          ? Number(gdprConsent.gdprApplies) : 1));
+    }
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: buildUrl(ADAPTER_SYNC_PATH) + '?iframe=1' + (query.length ? '&' + query.join('&') : '')
+      }];
+    } else if (syncOptions.pixelEnabled) {
       return [{
         type: 'image',
-        url: ADAPTER_SYNC_URL + (query.length ? '?' + query.join('&') : '')
+        url: buildUrl(ADAPTER_SYNC_PATH) + (query.length ? '?' + query.join('&') : '')
       }];
     }
+  },
+  onSetTargeting: function(bid) {
+    // Call '/track/pending' with the corresponding bid.requestId
+    if (bid.ext && bid.ext.events && bid.ext.events.pending) {
+      triggerPixel(bid.ext.events.pending);
+    }
+  },
+  onBidWon: function(bid) {
+    // Call '/track/win' with the corresponding bid.requestId
+    if (bid.ext && bid.ext.events && bid.ext.events.win) {
+      triggerPixel(bid.ext.events.win);
+    }
+  },
+  onTimeout: function(timeoutData) {
+    // Call '/track/bid_timeout' with timeout data
+    timeoutData.forEach(({ params }) => {
+      if (params) {
+        params.forEach((item) => {
+          if (item && item.uid) {
+            item.uid = parseInt(item.uid);
+          }
+        });
+      }
+    });
+    triggerPixel(buildUrl(TRACK_TIMEOUT_PATH) + '//' + JSON.stringify(timeoutData));
   }
 };
 
+function buildUrl(path) {
+  return (config.getConfig('devMode') ? DEBUG_URL : BASE_URL) + path;
+}
+
+function makeBanner(bannerParams) {
+  const bannerSizes = bannerParams && bannerParams.sizes;
+  if (bannerSizes) {
+    const sizes = parseSizesInput(bannerSizes);
+    if (sizes.length) {
+      const format = sizes.map(size => {
+        const [ width, height ] = size.split('x');
+        const w = parseInt(width, 10);
+        const h = parseInt(height, 10);
+        return { w, h };
+      });
+
+      return { format };
+    }
+  }
+}
+
+function makeVideo(videoParams = {}) {
+  const video = Object.keys(videoParams).filter((param) => param !== 'context' && param !== 'playerSize')
+    .reduce((result, param) => {
+      result[param] = videoParams[param];
+      return result;
+    }, { w: deepAccess(videoParams, 'playerSize.0.0'), h: deepAccess(videoParams, 'playerSize.0.1') });
+
+  if (video.w && video.h) {
+    return video;
+  }
+}
+
+function buildImpObject(bid) {
+  const { params: { uid }, bidId, mediaTypes, sizes, adUnitCode } = bid;
+  const video = mediaTypes && _isVideoBid(bid) && _isValidVideoBid(bid) && makeVideo(mediaTypes.video);
+  const banner = makeBanner((mediaTypes && mediaTypes.banner) || (!video && { sizes }));
+  const impObject = {
+    id: bidId,
+    ...(banner && { banner }),
+    ...(video && { video }),
+    ext: {
+      bidder: { uid: parseInt(uid) },
+    }
+  };
+
+  if (impObject.banner) {
+    impObject.ext.bidder.adslotExists = _isAdSlotExists(adUnitCode);
+  }
+
+  if (impObject.ext.bidder.uid && (impObject.banner || impObject.video)) {
+    return impObject;
+  }
+}
+
 function _getBidFromResponse(respItem) {
   if (!respItem) {
-    utils.logError(LOG_ERROR_MESS.emptySeatbid);
+    logError(LOG_ERROR_MESS.emptySeatbid);
   } else if (!respItem.bid) {
-    utils.logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
+    logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
   } else if (!respItem.bid[0]) {
-    utils.logError(LOG_ERROR_MESS.noBid);
+    logError(LOG_ERROR_MESS.noBid);
   }
   return respItem && respItem.bid && respItem.bid[0];
 }
 
-function _addBidResponse(serverBid, bidsMap, currency, bidResponses, bidsWithoutSizeMatching) {
+function _addBidResponse(serverBid, bidsMap, currency, bidResponses) {
   if (!serverBid) return;
   let errorMessage;
   if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
+  if (!serverBid.impid) errorMessage = LOG_ERROR_MESS.noImpId + JSON.stringify(serverBid);
   if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
   else {
     const reqCurrency = currency || DEFAULT_CUR;
-    const awaitingBids = bidsMap[serverBid.auid];
-    if (awaitingBids) {
+    const bid = bidsMap[serverBid.impid];
+    if (bid) {
       if (serverBid.cur && serverBid.cur !== reqCurrency) {
         errorMessage = LOG_ERROR_MESS.currencyMismatch + reqCurrency + ' - ' + serverBid.cur;
       } else {
-        const sizeId = bidsWithoutSizeMatching ? `${serverBid.w}x${serverBid.h}` : Object.keys(awaitingBids)[0];
-        if (awaitingBids[sizeId]) {
-          const slot = awaitingBids[sizeId][0];
-
-          const bid = slot.bids.shift();
-          bidResponses.push({
-            requestId: bid.bidId,
-            cpm: serverBid.price,
-            width: serverBid.w,
-            height: serverBid.h,
-            creativeId: serverBid.auid,
-            currency: reqCurrency,
-            netRevenue: true,
-            ttl: TIME_TO_LIVE,
-            ad: serverBid.adm,
-            dealId: serverBid.dealid
-          });
-
-          if (!slot.bids.length) {
-            slot.parents.forEach(({parent, key, uid}) => {
-              const index = parent[key].indexOf(slot);
-              if (index > -1) {
-                parent[key].splice(index, 1);
-              }
-              if (!parent[key].length) {
-                delete parent[key];
-                if (!utils.getKeys(parent).length) {
-                  delete bidsMap[uid];
-                }
-              }
-            });
-          }
+        const bidResponse = {
+          requestId: bid.bidId,
+          cpm: serverBid.price,
+          width: serverBid.w,
+          height: serverBid.h,
+          creativeId: serverBid.auid,
+          currency: reqCurrency,
+          netRevenue: true,
+          ttl: TIME_TO_LIVE,
+          dealId: serverBid.dealid,
+          meta: {
+            advertiserDomains: serverBid.advertiserDomains ? serverBid.advertiserDomains : [],
+            mediaType: serverBid.mediaType
+          },
+        };
+
+        if (serverBid.ext && serverBid.ext.prebid) {
+          bidResponse.ext = serverBid.ext.prebid;
+        }
+
+        const visxTargeting = deepAccess(serverBid, 'ext.prebid.targeting');
+        if (visxTargeting) {
+          bidResponse.adserverTargeting = visxTargeting;
+        }
+
+        if (!_isVideoInstreamBid(bid)) {
+          bidResponse.ad = serverBid.adm;
         } else {
-          bidsWithoutSizeMatching && bidsWithoutSizeMatching.push(serverBid);
+          bidResponse.vastXml = serverBid.adm;
+          bidResponse.mediaType = 'video';
         }
+
+        bidResponses.push(bidResponse);
       }
     } else {
       errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
     }
   }
   if (errorMessage) {
-    utils.logError(errorMessage);
+    logError(errorMessage);
+  }
+}
+
+function _isVideoBid(bid) {
+  return bid.mediaType === VIDEO || deepAccess(bid, 'mediaTypes.video');
+}
+
+function _isVideoInstreamBid(bid) {
+  return _isVideoBid(bid) && deepAccess(bid, 'mediaTypes.video', {}).context === VIDEO_INSTREAM;
+}
+
+function _isBannerBid(bid) {
+  return bid.mediaType === BANNER || deepAccess(bid, 'mediaTypes.banner');
+}
+
+function _isValidVideoBid(bid, logErrors = false) {
+  let result = true;
+  const videoMediaType = deepAccess(bid, 'mediaTypes.video');
+  if (!_isVideoInstreamBid(bid)) {
+    if (logErrors) {
+      logError(LOG_ERROR_MESS.onlyVideoInstream);
+    }
+    result = false;
+  }
+  if (!(videoMediaType.playerSize && parseSizesInput(deepAccess(videoMediaType, 'playerSize', [])))) {
+    if (logErrors) {
+      logError(LOG_ERROR_MESS.videoMissing + 'playerSize');
+    }
+    result = false;
   }
+  return result;
+}
+
+function _isAdSlotExists(adUnitCode) {
+  if (document.getElementById(adUnitCode)) {
+    return true;
+  }
+
+  const gptAdSlot = getGptSlotInfoForAdUnitCode(adUnitCode);
+  if (gptAdSlot.divId && document.getElementById(gptAdSlot.divId)) {
+    return true;
+  }
+
+  return false;
 }
 
 registerBidder(spec);
diff --git a/modules/visxBidAdapter.md b/modules/visxBidAdapter.md
index 41e45622481..34ebe9bb937 100644
--- a/modules/visxBidAdapter.md
+++ b/modules/visxBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name:    YOC VIS.X Bidder Adapter
 Module Type:    Bidder Adapter
-Maintainer:     service@yoc.com
+Maintainer:     supply.partners@yoc.com
 ```
 
 # Description
@@ -11,33 +11,59 @@ Maintainer:     service@yoc.com
 Module that connects to YOC VIS.X® demand source to fetch bids.
 
 # Test Parameters
+```javascript
+var adUnits = [
+    // YOC Mystery Ad adUnit
+    {
+        code: 'yma-test-div',
+        mediaTypes: {
+            banner: {
+                sizes: [[1, 1]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'visx',
+                params: {
+                    uid: '903535'
+                }
+            }
+        ]
+    },
+    // YOC Understitial Ad adUnit
+    {
+        code: 'yua-test-div',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'visx',
+                params: {
+                    uid: '903536'
+                }
+            }
+        ]
+    },
+    // In-stream video adUnit
+    {
+        code: 'instream-test-div',
+        mediaTypes: {
+            video: {
+                context: 'instream',
+                playerSize: [400, 300]
+            }
+        },
+        bids: [
+            {
+                bidder: 'visx',
+                params: {
+                    uid: '921068'
+                }
+            }
+        ]
+    }
+];
 ```
-    var adUnits = [
-           // YOC Mystery Ad adUnit
-           {
-               code: 'yma-test-div',
-               sizes: [[1, 1]],
-               bids: [
-                   {
-                       bidder: 'visx',
-                       params: {
-                           uid: '903535'
-                       }
-                   }
-               ]
-           },
-           // YOC Understitial Ad adUnit
-           {
-               code: 'yua-test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: 'visx',
-                       params: {
-                           uid: '903536'
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/vlybyBidAdapter.js b/modules/vlybyBidAdapter.js
new file mode 100644
index 00000000000..10352179044
--- /dev/null
+++ b/modules/vlybyBidAdapter.js
@@ -0,0 +1,71 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+
+import { BANNER, VIDEO } from '../src/mediaTypes.js'
+
+const ENDPOINT = '//prebid.vlyby.com/';
+const BIDDER_CODE = 'vlyby';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [VIDEO, BANNER],
+
+  isBidRequestValid: function (bid) {
+    if (bid && bid.params && bid.params.publisherId) {
+      return true
+    }
+    return false
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest = {}) {
+    const gdprConsent = bidderRequest.gdprConsent || {};
+    return {
+      method: 'POST',
+      url: `${ENDPOINT}`,
+      data: {
+        request: {
+          auctionId: bidderRequest.auctionId
+        },
+        gdprConsent: {
+          consentString: gdprConsent.consentString,
+          gdprApplies: gdprConsent.gdprApplies
+        },
+        bidRequests: validBidRequests.map(({ params, sizes, bidId, adUnitCode }) => ({
+          bidId,
+          adUnitCode,
+          params,
+          sizes
+        }))
+      },
+      options: {
+        withCredentials: false,
+        contentType: 'application/json'
+      },
+      validBidRequests: validBidRequests,
+    }
+  },
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    if (serverResponse.body) {
+      const vHB = serverResponse.body.bids;
+      try {
+        let bidResponse = {
+          requestId: vHB.bid,
+          cpm: vHB.cpm,
+          width: vHB.size.width,
+          height: vHB.size.height,
+          creativeId: vHB.creative.id,
+          currency: 'EUR',
+          netRevenue: true,
+          ttl: 360,
+          ad: vHB.creative.ad,
+          meta: {
+            adomain: vHB.adomain && Array.isArray(vHB.adomain) ? vHB.adomain : []
+          }
+        };
+        bidResponses.push(bidResponse);
+      } catch (e) { }
+    }
+    return bidResponses;
+  }
+};
+registerBidder(spec);
diff --git a/modules/vlybyBidAdapter.md b/modules/vlybyBidAdapter.md
new file mode 100755
index 00000000000..41d9bbf8709
--- /dev/null
+++ b/modules/vlybyBidAdapter.md
@@ -0,0 +1,36 @@
+# Overview
+
+```
+Module Name:    VLYBY Prebid Outstream
+Module Type:    Bidder Adapter
+Tech-Support:   prebid@vlyby.com
+Client-Support: support@vlyby.com
+```
+
+# Description
+
+VLYBY Digital GmbH provides with this VLYBY Prebid Adapter a Mediation for the Outstream Product. Please contact support@vlyby.com for additional information and access to VLYBY User Interface and Prebid IDs.
+
+# Demo Implementation
+
+In most of the cases a Publisher will use his own AdServer for delivering Creatives to a Publisher-Website. This GPT implementation is only a skeleton. You need an additional Line-Item in your AdServer, Prebid Creative, access to VLYBY UI. 
+
+### GPT Implementation
+```javascript
+    var adUnits = [{
+        code: '/your-network-id/adunit',
+        mediaTypes: {
+            banner: {
+                sizes: div_1_sizes
+            }
+        },
+        bids: [{
+            bidder: 'vlyby',
+                params: { 
+                    publisherId: 'f363eb2b75459b34592cc4',     // needed - only demo
+                    siteId: 'techpreview.vlyby_prebidadapter', // needed - only demo
+                    placement:'default'                        // optional - provided by VLYBY UI
+                }
+        }]
+    }]
+```
\ No newline at end of file
diff --git a/modules/vmgBidAdapter.js b/modules/vmgBidAdapter.js
deleted file mode 100644
index 57a812ec466..00000000000
--- a/modules/vmgBidAdapter.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-const BIDDER_CODE = 'vmg';
-const ENDPOINT = 'https://predict.vmg.nyc';
-
-export const spec = {
-  code: BIDDER_CODE,
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bidRequest) {
-    if (typeof bidRequest !== 'undefined') {
-      return true;
-    } else {
-      return false;
-    }
-  },
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function (validBidRequests, bidderRequest) {
-    let bidRequests = [];
-    let referer = window.location.href;
-    try {
-      referer = typeof bidderRequest.refererInfo === 'undefined'
-        ? window.top.location.href
-        : bidderRequest.refererInfo.referer;
-    } catch (e) {}
-
-    validBidRequests.forEach(function(validBidRequest) {
-      bidRequests.push({
-        adUnitCode: validBidRequest.adUnitCode,
-        referer: referer,
-        bidId: validBidRequest.bidId
-      });
-    });
-
-    return {
-      method: 'POST',
-      url: ENDPOINT,
-      data: JSON.stringify(bidRequests)
-    };
-  },
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * Some required bid params are not needed for this so default
-   * values are used.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function (serverResponse, bidRequest) {
-    const validBids = JSON.parse(bidRequest.data);
-    let bidResponses = [];
-    if (typeof serverResponse.body !== 'undefined') {
-      const deals = serverResponse.body;
-      validBids.forEach(function(validBid) {
-        if (typeof deals[validBid.adUnitCode] !== 'undefined') {
-          const bidResponse = {
-            requestId: validBid.bidId,
-            ad: '<div></div>',
-            cpm: 0.01,
-            width: 0,
-            height: 0,
-            dealId: deals[validBid.adUnitCode],
-            ttl: 300,
-            creativeId: '1',
-            netRevenue: '0',
-            currency: 'USD'
-          };
-
-          bidResponses.push(bidResponse);
-        }
-      });
-    }
-
-    return bidResponses;
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/vmgBidAdapter.md b/modules/vmgBidAdapter.md
deleted file mode 100644
index 3ebfce91dee..00000000000
--- a/modules/vmgBidAdapter.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Overview
-
-```
-Module Name: VMG Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: paul@vmgood.com
-```
-
-# Description
-
-Connects DFP to the VMG Predict engine.
-
-# Test Parameters
-```
-  var adUnits = [{
-    code: 'div-0',
-    mediaTypes: {
-      banner: {
-          sizes: sizes
-      }
-    },
-    bids: [
-      {
-        bidder: 'vmg'
-      }
-    ]
-  }];
-```
diff --git a/modules/voxBidAdapter.js b/modules/voxBidAdapter.js
new file mode 100644
index 00000000000..7b8cb42bb0a
--- /dev/null
+++ b/modules/voxBidAdapter.js
@@ -0,0 +1,251 @@
+import {_map, deepAccess, isArray, logWarn} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {find} from '../src/polyfill.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {Renderer} from '../src/Renderer.js';
+
+const BIDDER_CODE = 'vox';
+const SSP_ENDPOINT = 'https://ssp.hybrid.ai/auction/prebid';
+const VIDEO_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+const TTL = 60;
+
+function buildBidRequests(validBidRequests) {
+  return _map(validBidRequests, function(validBidRequest) {
+    const params = validBidRequest.params;
+    const bidRequest = {
+      bidId: validBidRequest.bidId,
+      transactionId: validBidRequest.transactionId,
+      sizes: validBidRequest.sizes,
+      placement: params.placement,
+      placeId: params.placementId,
+      imageUrl: params.imageUrl
+    };
+
+    return bidRequest;
+  })
+}
+
+const outstreamRender = bid => {
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      sizes: [bid.width, bid.height],
+      targetId: bid.adUnitCode,
+      rendererOptions: {
+        showBigPlayButton: false,
+        showProgressBar: 'bar',
+        showVolume: false,
+        allowFullscreen: true,
+        skippable: false,
+        content: bid.vastXml
+      }
+    });
+  });
+}
+
+const createRenderer = (bid) => {
+  const renderer = Renderer.install({
+    targetId: bid.adUnitCode,
+    url: VIDEO_RENDERER_URL,
+    loaded: false
+  });
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
+}
+
+function buildBid(bidData) {
+  const bid = {
+    requestId: bidData.bidId,
+    cpm: bidData.price,
+    width: bidData.content.width,
+    height: bidData.content.height,
+    creativeId: bidData.content.seanceId || bidData.bidId,
+    currency: bidData.currency,
+    netRevenue: true,
+    mediaType: BANNER,
+    ttl: TTL,
+    content: bidData.content,
+    meta: {
+      advertiserDomains: bidData.advertiserDomains || [],
+    }
+  };
+
+  if (bidData.placement === 'video') {
+    bid.vastXml = bidData.content;
+    bid.mediaType = VIDEO;
+
+    let adUnit = find(auctionManager.getAdUnits(), function (unit) {
+      return unit.transactionId === bidData.transactionId;
+    });
+
+    if (adUnit) {
+      bid.width = adUnit.mediaTypes.video.playerSize[0][0];
+      bid.height = adUnit.mediaTypes.video.playerSize[0][1];
+
+      if (adUnit.mediaTypes.video.context === 'outstream') {
+        bid.renderer = createRenderer(bid);
+      }
+    }
+  } else if (bidData.placement === 'inImage') {
+    bid.mediaType = BANNER;
+    bid.ad = wrapInImageBanner(bid, bidData);
+  } else {
+    bid.mediaType = BANNER;
+    bid.ad = wrapBanner(bid, bidData);
+  }
+
+  return bid;
+}
+
+function getMediaTypeFromBid(bid) {
+  return bid.mediaTypes && Object.keys(bid.mediaTypes)[0];
+}
+
+function hasVideoMandatoryParams(mediaTypes) {
+  const isHasVideoContext = !!mediaTypes.video && (mediaTypes.video.context === 'instream' || mediaTypes.video.context === 'outstream');
+
+  const isPlayerSize =
+    !!deepAccess(mediaTypes, 'video.playerSize') &&
+    isArray(deepAccess(mediaTypes, 'video.playerSize'));
+
+  return isHasVideoContext && isPlayerSize;
+}
+
+function wrapInImageBanner(bid, bidData) {
+  return `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title></title>
+        <script id="prebidrenderer"></script>
+        <style>html, body {width: 100%; height: 100%; margin: 0;}</style>
+    </head>
+    <body>
+      <div data-hyb-ssp-in-image-overlay="${bidData.content.placeId}" style="width: 100%; height: 100%;"></div>
+      <script>
+        var s = document.getElementById("prebidrenderer");
+        s.onload = function () {
+          var _html = "${encodeURIComponent(JSON.stringify(bid))}";
+          window._hyb_prebid_ssp.registerInImage(JSON.parse(decodeURIComponent(_html)));
+        }
+        s.src = "https://st.hybrid.ai/prebidrenderer.js?t=" + Date.now();
+        if (parent.window.frames[window.name]) {
+            var parentDocument = window.parent.document.getElementById(parent.window.frames[window.name].name);
+            parentDocument.style.height = "100%";
+            parentDocument.style.width = "100%";
+        }
+      </script>
+    </body>
+  </html>`;
+}
+
+function wrapBanner(bid, bidData) {
+  return `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <title></title>
+      <script id="prebidrenderer"></script>
+      <style>html, body {width: 100%; height: 100%; margin: 0;}</style>
+    </head>
+    <body>
+      <div data-hyb-ssp-ad-place="${bidData.content.placeId}"></div>
+      <script>
+        var s = document.getElementById("prebidrenderer");
+        s.onload = function () {
+            var _html = "${encodeURIComponent(JSON.stringify(bid))}";
+            window._hyb_prebid_ssp.registerAds(JSON.parse(decodeURIComponent(_html)));
+        }
+        s.src = "https://st.hybrid.ai/prebidrenderer.js?t=" + Date.now();
+      </script>
+    </body>
+  </html>`;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid(bid) {
+    return (
+      !!bid.params.placementId &&
+      !!bid.params.placement &&
+      (
+        (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'banner') ||
+        (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'inImage' && !!bid.params.imageUrl) ||
+        (getMediaTypeFromBid(bid) === VIDEO && bid.params.placement === 'video' && hasVideoMandatoryParams(bid.mediaTypes))
+      )
+    );
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests(validBidRequests, bidderRequest) {
+    const payload = {
+      // TODO: is 'page' the right value here?
+      url: bidderRequest.refererInfo.page,
+      cmp: !!bidderRequest.gdprConsent,
+      bidRequests: buildBidRequests(validBidRequests)
+    };
+
+    if (payload.cmp) {
+      const gdprApplies = bidderRequest.gdprConsent.gdprApplies;
+      if (gdprApplies !== undefined) payload['ga'] = gdprApplies;
+      payload['cs'] = bidderRequest.gdprConsent.consentString;
+    }
+
+    const payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: SSP_ENDPOINT,
+      data: payloadString,
+      options: {
+        contentType: 'application/json'
+      }
+    }
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, bidRequest) {
+    let bidRequests = JSON.parse(bidRequest.data).bidRequests;
+    const serverBody = serverResponse.body;
+
+    if (serverBody && serverBody.bids && isArray(serverBody.bids)) {
+      return _map(serverBody.bids, function(bid) {
+        let rawBid = find(bidRequests, function (item) {
+          return item.bidId === bid.bidId;
+        });
+        bid.placement = rawBid.placement;
+        bid.transactionId = rawBid.transactionId;
+        bid.placeId = rawBid.placeId;
+        return buildBid(bid);
+      });
+    } else {
+      return [];
+    }
+  }
+
+}
+registerBidder(spec);
diff --git a/modules/voxBidAdapter.md b/modules/voxBidAdapter.md
new file mode 100644
index 00000000000..3fc0383e6f8
--- /dev/null
+++ b/modules/voxBidAdapter.md
@@ -0,0 +1,237 @@
+# Overview
+
+
+**Module Name**: VOX Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: prebid@hybrid.ai
+
+# Description
+
+You can use this adapter to get a bid from partners.hybrid.ai
+
+
+## Sample Banner Ad Unit
+
+```js
+var adUnits = [{
+    code: 'banner_ad_unit',
+    mediaTypes: {
+        banner: {
+            sizes: [[160, 600]]
+        }
+    },
+    bids: [{
+        bidder: "vox",
+        params: {
+            placement: "banner",                      // required
+            placementId: "5fc77bc5a757531e24c89a4c"   // required
+        }
+    }]
+}];
+```
+
+## Sample Video Ad Unit
+
+```js
+var adUnits = [{
+    code: 'video_ad_unit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',      // required
+            playerSize: [[640, 480]]   // required
+        }
+    },
+    bids: [{
+        bidder: 'vox',
+        params: {
+            placement: "video",                       // required
+            placementId: "5fc77a94a757531e24c89a3d"   // required
+        }
+    }]
+}];
+```
+
+# Sample In-Image Ad Unit
+
+```js
+var adUnits = [{
+    code: 'test-div',
+    mediaTypes: {
+        banner: {
+            sizes: [0, 0]
+        }
+    },
+    bids: [{
+        bidder: "vox",
+        params: {
+            placement: "inImage",
+            placementId: "5fc77b40a757531e24c89a42",
+            imageUrl: "https://gallery.voxexchange.io/vox-main.png"
+        }
+    }]
+}];
+```
+
+# Example page with In-Image
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js Banner Example</title>
+	<script async src="prebid.js"></script>
+	<style>
+        .banner-block {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            z-index: 1;
+            border: none;
+            overflow: hidden;
+        }
+    </style>
+    <script>
+        var adUnits = [{
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [0, 0]
+                }
+            },
+            bids: [{
+                bidder: "vox",
+                params: {
+                    placement: "inImage",
+                    placementId: "5fc77b40a757531e24c89a42",
+                    imageUrl: "https://gallery.voxexchange.io/vox-main.png"
+                }
+            }]
+        }];
+
+        var pbjs = pbjs || {};
+        pbjs.que = pbjs.que || [];
+
+        pbjs.que.push(function() {
+            pbjs.addAdUnits(adUnits);
+            pbjs.requestBids({
+                bidsBackHandler: function (e) {
+                    if (pbjs.adserverRequestSent) return;
+                    pbjs.adserverRequestSent = true;
+
+                    var params = pbjs.getAdserverTargetingForAdUnitCode("test-div");
+                    var iframe = document.getElementById('test-div');
+
+                    if (params && params['hb_adid']) {
+                        iframe.parentElement.style.position = "relative";
+                        iframe.style.display = "block";
+                        pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+                    }
+                }
+            });
+        });
+    </script>
+</head>
+<body>
+	<h2>Prebid.js InImage Banner Test</h2>
+	<div style="width: 600px;">
+        <img src="https://gallery.voxexchange.io/vox-main.png" />
+        <iframe id='test-div' class="banner-block" style="display: none;"></iframe>
+    </div>
+</body>
+</html>
+```
+
+# Example page with In-Image and GPT
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Prebid.js Banner Example</title>
+	<script async src="prebid.js"></script>
+	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+	<style>
+		.banner-block {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			left: 0;
+			z-index: 1;
+			border: none;
+			overflow: hidden;
+		}
+		.banner-block div {
+			width: 100%;
+			height: 100%;
+		}
+	</style>
+	<script>
+		var pbjs = pbjs || {};
+		pbjs.que = pbjs.que || [];
+
+		var adUnits = [{
+			code: 'div-gpt-ad-1574864639578-0',
+			mediaTypes: {
+				banner: {
+					sizes: [1, 1]
+				}
+			},
+			bids: [{
+				bidder: "vox",
+				params: {
+					placement: "inImage",
+					placementId: "5fc77b40a757531e24c89a42",
+					imageUrl: "https://gallery.voxexchange.io/vox-main.png"
+				}
+			}]
+		}];
+
+		var googletag = googletag || {};
+		googletag.cmd = googletag.cmd || [];
+
+		googletag.cmd.push(() => {
+			googletag.pubads().disableInitialLoad();
+		});
+
+		pbjs.que.push(() => {
+			pbjs.addAdUnits(adUnits);
+			pbjs.requestBids({ bidsBackHandler: sendAdServerRequest });
+		});
+
+		function sendAdServerRequest() {
+			googletag.cmd.push(() => {
+				pbjs.que.push(() => {
+					pbjs.setTargetingForGPTAsync('div-gpt-ad-1574864639578-0');
+					googletag.pubads().refresh();
+				});
+			});
+		}
+
+		googletag.cmd.push(() => {
+			googletag
+				.defineSlot('/21877108735/rtb-pbjs', [1, 1], 'div-gpt-ad-1574864639578-0')
+				.addService(googletag.pubads());
+
+			googletag.pubads().enableSingleRequest();
+			googletag.enableServices();
+		});
+	</script>
+</head>
+<body>
+	<h2>Prebid.js Banner Ad Unit Test</h2>
+	<div style="width: 600px; position: relative">
+		<img src="https://gallery.voxexchange.io/vox-main.png" />
+		<div id='div-gpt-ad-1574864639578-0' class="banner-block">
+			<script>
+				googletag.cmd.push(() => { googletag.display('div-gpt-ad-1574864639578-0'); });
+			</script>
+		</div>
+	</div>
+</body>
+</html>
+```
diff --git a/modules/vrtcalBidAdapter.js b/modules/vrtcalBidAdapter.js
index ff24803f688..301d278493b 100644
--- a/modules/vrtcalBidAdapter.js
+++ b/modules/vrtcalBidAdapter.js
@@ -1,6 +1,8 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import {ajax} from '../src/ajax.js';
+import {isFn, isPlainObject} from '../src/utils.js';
+import { config } from '../src/config.js';
 
 export const spec = {
   code: 'vrtcal',
@@ -10,16 +12,52 @@ export const spec = {
   },
   buildRequests: function (bidRequests) {
     const requests = bidRequests.map(function (bid) {
-      const params = {
+      let floor = 0;
+
+      if (isFn(bid.getFloor)) {
+        const floorInfo = bid.getFloor({ currency: 'USD', mediaType: 'banner', size: bid.sizes.map(([w, h]) => ({w, h})) });
+
+        if (isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+          floor = Math.max(floor, parseFloat(floorInfo.floor));
+        }
+      }
+
+      let gdprApplies = 0;
+      let gdprConsent = '';
+      let ccpa = '';
+      let coppa = 0;
+      let tmax = 0;
+      let eids = [];
+
+      if (bidRequests[0].userIdAsEids && bidRequests[0].userIdAsEids.length > 0) {
+        eids = bidRequests[0].userIdAsEids;
+      }
+
+      if (bid && bid.gdprConsent) {
+        gdprApplies = bid.gdprConsent.gdprApplies ? 1 : 0;
+        gdprConsent = bid.gdprConsent.consentString;
+      }
 
+      if (bid && bid.uspConsent) {
+        ccpa = bid.uspConsent;
+      }
+
+      if (config.getConfig('coppa') === true) {
+        coppa = 1;
+      }
+
+      tmax = config.getConfig('bidderTimeout');
+
+      const params = {
         prebidJS: 1,
         prebidAdUnitCode: bid.adUnitCode,
         id: bid.bidId,
+        tmax: tmax,
         imp: [{
           id: '1',
           banner: {
           },
-          bidfloor: 0.75
+          bidfloor: floor
         }],
         site: {
           id: 'VRTCAL_FILLED',
@@ -31,6 +69,19 @@ export const spec = {
         device: {
           ua: 'VRTCAL_FILLED',
           ip: 'VRTCAL_FILLED'
+        },
+        regs: {
+          coppa: coppa,
+          ext: {
+            gdpr: gdprApplies,
+            us_privacy: ccpa
+          }
+        },
+        user: {
+          ext: {
+            consent: gdprConsent,
+            eids: eids
+          }
         }
       };
 
@@ -42,7 +93,7 @@ export const spec = {
         params.imp[0].banner.h = bid.sizes[0][1];
       }
 
-      return {method: 'POST', url: 'https://rtb.vrtcal.com/bidder_prebid.vap?ssp=1804', data: JSON.stringify(params), options: {withCredentials: false, crossOrigin: true}}
+      return {method: 'POST', url: 'https://rtb.vrtcal.com/bidder_prebid.vap?ssp=1804', data: JSON.stringify(params), options: {withCredentials: false, crossOrigin: true}};
     });
 
     return requests;
@@ -70,6 +121,12 @@ export const spec = {
         nurl: response.seatbid[0].bid[0].nurl
       };
 
+      if (response.seatbid[0].bid[0].adomain && response.seatbid[0].bid[0].adomain.length) {
+        bidResponse.meta = {
+          advertiserDomains: response.seatbid[0].bid[0].adomain
+        };
+      }
+
       bidResponses.push(bidResponse);
     }
     return bidResponses;
diff --git a/modules/vubleAnalyticsAdapter.md b/modules/vubleAnalyticsAdapter.md
deleted file mode 100644
index dfe0a8d8eb0..00000000000
--- a/modules/vubleAnalyticsAdapter.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Overview
-
-Module Name: Vuble Analytics Adapter
-
-Module Type: Vuble Analytics Adapter
-
-Maintainer: abruyere@mediabong.com
-
-# Description
-
-Analytics adapter for vuble.tv Contact contact@mediabong.com for information.
-
-# Test Parameters
-
-```
-{
-  provider: 'vuble',
-  options: {
-    pubId: 18,  // require
-    env: 'net', // require
-  }
-}
-```
diff --git a/modules/vubleBidAdapter.js b/modules/vubleBidAdapter.js
deleted file mode 100644
index d14f24e9993..00000000000
--- a/modules/vubleBidAdapter.js
+++ /dev/null
@@ -1,198 +0,0 @@
-// Vuble Adapter
-
-import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { Renderer } from '../src/Renderer.js';
-
-const BIDDER_CODE = 'vuble';
-
-const ENVS = ['com', 'net'];
-const CURRENCIES = {
-  com: 'EUR',
-  net: 'USD'
-};
-const TTL = 60;
-
-const outstreamRender = bid => {
-  bid.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      sizes: [bid.width, bid.height],
-      targetId: bid.adUnitCode,
-      adResponse: bid.adResponse,
-      rendererOptions: {
-        showBigPlayButton: false,
-        showProgressBar: 'bar',
-        showVolume: false,
-        allowFullscreen: true,
-        skippable: false,
-      }
-    });
-  });
-}
-
-const createRenderer = (bid, serverResponse) => {
-  const renderer = Renderer.install({
-    id: serverResponse.renderer_id,
-    url: serverResponse.renderer_url,
-    loaded: false,
-  });
-
-  try {
-    renderer.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-
-  return renderer;
-}
-
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: ['video'],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bid) {
-    let rawSizes = utils.deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes;
-    if (utils.isEmpty(rawSizes) || utils.parseSizesInput(rawSizes).length == 0) {
-      return false;
-    }
-
-    if (!utils.deepAccess(bid, 'mediaTypes.video.context')) {
-      return false;
-    }
-
-    if (!utils.contains(ENVS, bid.params.env)) {
-      return false;
-    }
-
-    return !!(bid.params.env && bid.params.pubId && bid.params.zoneId);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} - an array of bids
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function (validBidRequests, bidderRequest) {
-    return validBidRequests.map(bidRequest => {
-      // We take the first size
-      let rawSize = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize') || bidRequest.sizes;
-      let size = utils.parseSizesInput(rawSize)[0].split('x');
-
-      // Get the page's url
-      let referer = (bidderRequest && bidderRequest.refererInfo) ? bidderRequest.refererInfo.referer : '';
-      if (bidRequest.params.referrer) {
-        referer = bidRequest.params.referrer;
-      }
-
-      // Get Video Context
-      let context = utils.deepAccess(bidRequest, 'mediaTypes.video.context');
-
-      let url = 'https://player.mediabong.' + bidRequest.params.env + '/prebid/request';
-      let data = {
-        width: size[0],
-        height: size[1],
-        pub_id: bidRequest.params.pubId,
-        zone_id: bidRequest.params.zoneId,
-        context: context,
-        floor_price: bidRequest.params.floorPrice ? bidRequest.params.floorPrice : 0,
-        url: referer,
-        env: bidRequest.params.env,
-        bid_id: bidRequest.bidId,
-        adUnitCode: bidRequest.adUnitCode
-      };
-
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        data.gdpr_consent = {
-          consent_string: bidderRequest.gdprConsent.consentString,
-          gdpr_applies: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
-        }
-      }
-
-      return {
-        method: 'POST',
-        url: url,
-        data: data
-      };
-    });
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {ServerResponse} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function (serverResponse, bidRequest) {
-    const responseBody = serverResponse.body;
-
-    if (typeof responseBody !== 'object' || responseBody.status !== 'ok') {
-      return [];
-    }
-
-    let bids = [];
-    let bid = {
-      requestId: bidRequest.data.bid_id,
-      cpm: responseBody.cpm,
-      width: bidRequest.data.width,
-      height: bidRequest.data.height,
-      ttl: TTL,
-      creativeId: responseBody.creativeId,
-      dealId: responseBody.dealId,
-      netRevenue: true,
-      currency: CURRENCIES[bidRequest.data.env],
-      vastUrl: responseBody.url,
-      mediaType: 'video'
-    };
-
-    if (responseBody.renderer_url) {
-      let adResponse = {
-        ad: {
-          video: {
-            content: responseBody.content
-          }
-        }
-      };
-
-      Object.assign(bid, {
-        adResponse: adResponse,
-        adUnitCode: bidRequest.data.adUnitCode,
-        renderer: createRenderer(bid, responseBody)
-      });
-    }
-
-    bids.push(bid);
-
-    return bids;
-  },
-
-  /**
-   * Register the user sync pixels which should be dropped after the auction.
-   *
-   * @param {SyncOptions} syncOptions Which user syncs are allowed?
-   * @param {ServerResponse[]} serverResponses List of server's responses.
-   * @return {UserSync[]} The user syncs which should be dropped.
-   */
-  getUserSyncs: function (syncOptions, serverResponses) {
-    if (syncOptions.iframeEnabled) {
-      if (serverResponses.length > 0) {
-        let responseBody = serverResponses[0].body;
-        if (typeof responseBody !== 'object' || responseBody.iframeSync) {
-          return [{
-            type: 'iframe',
-            url: responseBody.iframeSync
-          }];
-        }
-      }
-    }
-    return [];
-  }
-};
-
-registerBidder(spec);
diff --git a/modules/vubleBidAdapter.md b/modules/vubleBidAdapter.md
deleted file mode 100644
index 6bd8d3f779a..00000000000
--- a/modules/vubleBidAdapter.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Overview
-
-```
-Module Name: Vuble Bidder Adapter
-Module Type: Vuble Adapter
-Maintainer: gv@mediabong.com
-```
-
-# Description
-
-Module that connects to Vuble's demand sources
-
-# Test Parameters
-```
-    var adUnits = [
-        {
-            code: 'test-video-instream',
-            sizes: [[640, 360]],
-            mediaTypes: {
-                video: {
-                    context: 'instream'
-                }
-            },
-            bids: [
-                {
-                    bidder: "vuble",
-                    params: {
-                        env: 'net',
-                        pubId: '18',
-                        zoneId: '12345',
-                        referrer: "http://www.vuble.tv/", // optional
-                        floorPrice: 5.00 // optional
-                    }
-                }
-            ]
-        },
-        {
-            code: 'test-video-outstream',
-            sizes: [[640, 360]],
-            mediaTypes: {
-                video: {
-                    context: 'outstream'
-                }
-            },
-            bids: [
-                {
-                    bidder: "vuble",
-                    params: {
-                        env: 'net',
-                        pubId: '18',
-                        zoneId: '12345',
-                        referrer: "http://www.vuble.tv/", // optional
-                        floorPrice: 5.00 // optional
-                    }
-                }
-            ]
-        }
-    ];
\ No newline at end of file
diff --git a/modules/vuukleBidAdapter.js b/modules/vuukleBidAdapter.js
new file mode 100644
index 00000000000..f3ab2562ef4
--- /dev/null
+++ b/modules/vuukleBidAdapter.js
@@ -0,0 +1,98 @@
+import { parseSizesInput, deepAccess } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'vuukle';
+const URL = 'https://pb.vuukle.com/adapter';
+const TIME_TO_LIVE = 360;
+const VENDOR_ID = 1004;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: VENDOR_ID,
+  supportedMediaTypes: [ BANNER ],
+
+  isBidRequestValid: function(bid) {
+    return true
+  },
+
+  buildRequests: function(bidRequests, bidderRequest) {
+    bidderRequest = bidderRequest || {};
+    const requests = bidRequests.map(function (bid) {
+      const parseSized = parseSizesInput(bid.sizes);
+      const arrSize = parseSized[0].split('x');
+      const params = {
+        url: encodeURIComponent(window.location.href),
+        sizes: JSON.stringify(parseSized),
+        width: arrSize[0],
+        height: arrSize[1],
+        params: JSON.stringify(bid.params),
+        rnd: Math.random(),
+        bidId: bid.bidId,
+        source: 'pbjs',
+        schain: JSON.stringify(bid.schain),
+        requestId: bid.bidderRequestId,
+        tmax: bidderRequest.timeout,
+        gdpr: (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0,
+        consentGiven: vuukleGetConsentGiven(bidderRequest.gdprConsent),
+        version: '$prebid.version$',
+        v: 2,
+      };
+
+      if (bidderRequest.uspConsent) {
+        params.uspConsent = bidderRequest.uspConsent;
+      }
+
+      if (config.getConfig('coppa') === true) {
+        params.coppa = 1;
+      }
+
+      if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) {
+        params.consent = bidderRequest.gdprConsent.consentString;
+      }
+
+      return {
+        method: 'GET',
+        url: URL,
+        data: params,
+        options: {withCredentials: false}
+      }
+    });
+
+    return requests;
+  },
+
+  interpretResponse: function(serverResponse, bidRequest) {
+    if (!serverResponse || !serverResponse.body || !serverResponse.body.ad) {
+      return [];
+    }
+
+    const res = serverResponse.body;
+    const bidResponse = {
+      requestId: bidRequest.data.bidId,
+      cpm: res.cpm,
+      width: res.width,
+      height: res.height,
+      creativeId: res.creative_id,
+      currency: res.currency || 'USD',
+      netRevenue: true,
+      ttl: TIME_TO_LIVE,
+      ad: res.ad,
+      meta: {
+        advertiserDomains: Array.isArray(res.adomain) ? res.adomain : []
+      }
+    };
+
+    return [bidResponse];
+  },
+}
+registerBidder(spec);
+
+function vuukleGetConsentGiven(gdprConsent) {
+  let consentGiven = 0;
+  if (typeof gdprConsent !== 'undefined') {
+    consentGiven = deepAccess(gdprConsent, `vendorData.vendor.consents.${VENDOR_ID}`) ? 1 : 0;
+  }
+  return consentGiven;
+}
diff --git a/modules/vuukleBidAdapter.md b/modules/vuukleBidAdapter.md
new file mode 100644
index 00000000000..ee7b54c6262
--- /dev/null
+++ b/modules/vuukleBidAdapter.md
@@ -0,0 +1,26 @@
+# Overview
+```
+Module Name: Vuukle Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: support@vuukle.com
+```
+
+# Description
+Module that connects to Vuukle's server for bids.
+Currently module supports only banner mediaType.
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: '/test/div',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'vuukle',
+            params: {}
+        }]
+    }];
+```
diff --git a/modules/waardexBidAdapter.js b/modules/waardexBidAdapter.js
index 255bf24098b..92b7fc26e4c 100644
--- a/modules/waardexBidAdapter.js
+++ b/modules/waardexBidAdapter.js
@@ -1,218 +1,296 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { config } from '../src/config.js';
+import {deepAccess, getBidIdParameter, isArray, logError} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {find} from '../src/polyfill.js';
 
-const domain = 'hb.justbidit.xyz';
-const httpsPort = 8843;
-const path = '/prebid';
+const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid`;
+const BIDDER_CODE = 'waardex';
 
-const ENDPOINT = `https://${domain}:${httpsPort}${path}`;
+const isBidRequestValid = bid => {
+  if (!bid.bidId) {
+    logError(BIDDER_CODE + ': bid.bidId should be non-empty');
+    return false;
+  }
 
-const BIDDER_CODE = 'waardex';
+  if (!bid.params) {
+    logError(BIDDER_CODE + ': bid.params should be non-empty');
+    return false;
+  }
 
-/**
- * @param {Array} requestSizes
- *
- * @returns {Array}
- * */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  if (
-    Array.isArray(requestSizes) &&
-    !Array.isArray(requestSizes[0])
-  ) {
-    sizes[0] = {
-      width: parseInt(requestSizes[0], 10) || 0,
-      height: parseInt(requestSizes[1], 10) || 0,
-    };
-  } else if (
-    Array.isArray(requestSizes) &&
-    Array.isArray(requestSizes[0])
-  ) {
-    sizes = requestSizes.map(item => {
-      return {
-        width: parseInt(item[0], 10) || 0,
-        height: parseInt(item[1], 10) || 0,
-      }
-    });
+  if (!+bid.params.zoneId) {
+    logError(BIDDER_CODE + ': bid.params.zoneId should be non-empty Number');
+    return false;
   }
-  return sizes;
-}
 
-/**
- * @param {Object} banner
- * @param {Array<Array[Number]>} banner.sizes
- *
- * @returns {Object}
- * */
-function createBannerObject(banner) {
-  return {
-    sizes: transformSizes(banner.sizes),
-  };
-}
-
-/**
- * @param {Array} validBidRequests
- *
- * @returns {Object}
- * */
-function buildBidRequests(validBidRequests) {
-  return validBidRequests.map((validBidRequest) => {
-    const params = validBidRequest.params;
-
-    const item = {
-      bidId: validBidRequest.bidId,
-      placementId: params.placementId,
-      bidfloor: parseFloat(params.bidfloor) || 0,
-      position: parseInt(params.position) || 1,
-      instl: parseInt(params.instl) || 0,
-    };
-    if (validBidRequest.mediaTypes[BANNER]) {
-      item[BANNER] = createBannerObject(validBidRequest.mediaTypes[BANNER]);
+  if (bid.mediaTypes && bid.mediaTypes.video) {
+    if (!bid.mediaTypes.video.playerSize) {
+      logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty');
+      return false;
+    }
+
+    if (!isArray(bid.mediaTypes.video.playerSize)) {
+      logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be an Array');
+      return false;
     }
-    return item;
-  });
-}
-
-/**
- * @param {Object} bidderRequest
- * @param {String} bidderRequest.userAgent
- * @param {String} bidderRequest.refererInfo
- * @param {String} bidderRequest.uspConsent
- * @param {Object} bidderRequest.gdprConsent
- * @param {String} bidderRequest.gdprConsent.consentString
- * @param {String} bidderRequest.gdprConsent.gdprApplies
- *
- * @returns {Object} - {
- *   ua: string,
- *   language: string,
- *   [referer]: string,
- *   [us_privacy]: string,
- *   [consent_string]: string,
- *   [consent_required]: string,
- *   [coppa]: boolean,
- * }
- * */
-function getCommonBidsData(bidderRequest) {
+
+    if (!bid.mediaTypes.video.playerSize[0]) {
+      logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty');
+      return false;
+    }
+
+    if (!isArray(bid.mediaTypes.video.playerSize[0])) {
+      logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty Array');
+      return false;
+    }
+  }
+
+  return true;
+};
+
+const buildRequests = (validBidRequests, bidderRequest) => {
+  const dataToSend = {
+    ...getCommonBidsData(bidderRequest),
+    bidRequests: getBidRequestsToSend(validBidRequests)
+  };
+
+  let zoneId = '';
+  if (validBidRequests[0] && validBidRequests[0].params && +validBidRequests[0].params.zoneId) {
+    zoneId = +validBidRequests[0].params.zoneId;
+  }
+
+  return {method: 'POST', url: `${ENDPOINT}?pubId=${zoneId}`, data: dataToSend};
+};
+
+const getCommonBidsData = bidderRequest => {
   const payload = {
     ua: navigator.userAgent || '',
     language: navigator.language && navigator.language.indexOf('-') !== -1 ? navigator.language.split('-')[0] : '',
-
   };
+
   if (bidderRequest && bidderRequest.refererInfo) {
-    payload.referer = encodeURIComponent(bidderRequest.refererInfo.referer);
+    // TODO: is 'page' the right value here?
+    payload.referer = encodeURIComponent(bidderRequest.refererInfo.page || '');
   }
+
   if (bidderRequest && bidderRequest.uspConsent) {
     payload.us_privacy = bidderRequest.uspConsent;
   }
+
   if (bidderRequest && bidderRequest.gdprConsent) {
     payload.gdpr_consent = {
       consent_string: bidderRequest.gdprConsent.consentString,
       consent_required: bidderRequest.gdprConsent.gdprApplies,
     }
   }
+
   payload.coppa = !!config.getConfig('coppa');
 
   return payload;
-}
-
-/**
- * this function checks either bid response is valid or noе
- *
- * @param {Object} bid
- * @param {string} bid.requestId
- * @param {number} bid.cpm
- * @param {string} bid.creativeId
- * @param {number} bid.ttl
- * @param {string} bid.currency
- * @param {number} bid.width
- * @param {number} bid.height
- * @param {string} bid.ad
- *
- * @returns {boolean}
- * */
-function isBidValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
+};
+
+const getBidRequestsToSend = validBidRequests => {
+  return validBidRequests.map(getBidRequestToSend);
+};
+
+const getBidRequestToSend = validBidRequest => {
+  const result = {
+    bidId: validBidRequest.bidId,
+    bidfloor: 0,
+    position: parseInt(validBidRequest.params.position) || 1,
+    instl: deepAccess(validBidRequest.ortb2Imp, 'instl') === 1 || parseInt(validBidRequest.params.instl) === 1 ? 1 : 0,
+  };
+
+  if (validBidRequest.mediaTypes[BANNER]) {
+    result[BANNER] = createBannerObject(validBidRequest.mediaTypes[BANNER]);
   }
 
-  return Boolean(bid.width && bid.height && bid.ad);
-}
-
-/**
- * @param {Object} serverBid
- *
- * @returns {Object|null}
- * */
-function createBid(serverBid) {
-  const bid = {
-    requestId: serverBid.id,
-    cpm: serverBid.price,
+  if (validBidRequest.mediaTypes[VIDEO]) {
+    result[VIDEO] = createVideoObject(validBidRequest.mediaTypes[VIDEO], validBidRequest.params);
+  }
+
+  return result;
+};
+
+const createBannerObject = banner => {
+  return {
+    sizes: transformSizes(banner.sizes),
+  };
+};
+
+const transformSizes = requestSizes => {
+  let result = [];
+
+  if (Array.isArray(requestSizes) && !Array.isArray(requestSizes[0])) {
+    result[0] = {
+      width: parseInt(requestSizes[0], 10) || 0,
+      height: parseInt(requestSizes[1], 10) || 0,
+    };
+  } else if (Array.isArray(requestSizes) && Array.isArray(requestSizes[0])) {
+    result = requestSizes.map(item => {
+      return {
+        width: parseInt(item[0], 10) || 0,
+        height: parseInt(item[1], 10) || 0,
+      }
+    });
+  }
+
+  return result;
+};
+
+const createVideoObject = (videoMediaTypes, videoParams) => {
+  return {
+    w: deepAccess(videoMediaTypes, 'playerSize')[0][0],
+    h: deepAccess(videoMediaTypes, 'playerSize')[0][1],
+    mimes: getBidIdParameter('mimes', videoParams) || ['application/javascript', 'video/mp4', 'video/webm'],
+    minduration: getBidIdParameter('minduration', videoParams) || 0,
+    maxduration: getBidIdParameter('maxduration', videoParams) || 500,
+    protocols: getBidIdParameter('protocols', videoParams) || [2, 3, 5, 6],
+    startdelay: getBidIdParameter('startdelay', videoParams) || 0,
+    placement: getBidIdParameter('placement', videoParams) || videoMediaTypes.context === 'outstream' ? 3 : 1,
+    skip: getBidIdParameter('skip', videoParams) || 1,
+    skipafter: getBidIdParameter('skipafter', videoParams) || 0,
+    minbitrate: getBidIdParameter('minbitrate', videoParams) || 0,
+    maxbitrate: getBidIdParameter('maxbitrate', videoParams) || 3500,
+    delivery: getBidIdParameter('delivery', videoParams) || [2],
+    playbackmethod: getBidIdParameter('playbackmethod', videoParams) || [1, 2, 3, 4],
+    api: getBidIdParameter('api', videoParams) || [2],
+    linearity: getBidIdParameter('linearity', videoParams) || 1
+  };
+};
+
+const interpretResponse = (serverResponse, bidRequest) => {
+  try {
+    const responseBody = serverResponse.body;
+
+    if (!responseBody.seatbid || !responseBody.seatbid[0]) {
+      return [];
+    }
+
+    return responseBody.seatbid[0].bid
+      .map(openRtbBid => {
+        const hbRequestBid = getHbRequestBid(openRtbBid, bidRequest.data);
+        if (!hbRequestBid) return;
+
+        const hbRequestMediaType = getHbRequestMediaType(hbRequestBid);
+        if (!hbRequestMediaType) return;
+
+        return mapOpenRtbToHbBid(openRtbBid, hbRequestMediaType, hbRequestBid);
+      })
+      .filter(x => x);
+  } catch (e) {
+    return [];
+  }
+};
+
+const getHbRequestBid = (openRtbBid, bidRequest) => {
+  return find(bidRequest.bidRequests, x => x.bidId === openRtbBid.impid);
+};
+
+const getHbRequestMediaType = hbRequestBid => {
+  if (hbRequestBid.banner) return BANNER;
+  if (hbRequestBid.video) return VIDEO;
+  return null;
+};
+
+const mapOpenRtbToHbBid = (openRtbBid, mediaType, hbRequestBid) => {
+  let bid = null;
+
+  if (mediaType === BANNER) {
+    bid = mapOpenRtbBannerToHbBid(openRtbBid, hbRequestBid);
+  }
+
+  if (mediaType === VIDEO) {
+    bid = mapOpenRtbVideoToHbBid(openRtbBid, hbRequestBid);
+  }
+
+  return isBidValid(bid) ? bid : null;
+};
+
+const mapOpenRtbBannerToHbBid = (openRtbBid, hbRequestBid) => {
+  return {
+    mediaType: BANNER,
+    requestId: hbRequestBid.bidId,
+    cpm: openRtbBid.price,
     currency: 'USD',
-    width: serverBid.w,
-    height: serverBid.h,
-    creativeId: serverBid.crid,
+    width: openRtbBid.w,
+    height: openRtbBid.h,
+    creativeId: openRtbBid.crid,
     netRevenue: true,
     ttl: 3000,
-    ad: serverBid.adm,
-    dealId: serverBid.dealid,
+    ad: openRtbBid.adm,
+    dealId: openRtbBid.dealid,
     meta: {
-      cid: serverBid.cid,
-      adomain: serverBid.adomain,
-      mediaType: serverBid.ext.mediaType
+      cid: openRtbBid.cid,
+      adomain: openRtbBid.adomain,
+      mediaType: openRtbBid.ext && openRtbBid.ext.mediaType
     },
   };
+};
 
-  return isBidValid(bid) ? bid : null;
-}
+const mapOpenRtbVideoToHbBid = (openRtbBid, hbRequestBid) => {
+  return {
+    mediaType: VIDEO,
+    requestId: hbRequestBid.bidId,
+    cpm: openRtbBid.price,
+    currency: 'USD',
+    width: hbRequestBid.video.w,
+    height: hbRequestBid.video.h,
+    ad: openRtbBid.adm,
+    ttl: 3000,
+    creativeId: openRtbBid.crid,
+    netRevenue: true,
+    vastUrl: getVastUrl(openRtbBid),
+    // An impression tracking URL to serve with video Ad
+    // Optional; only usable with vastUrl and requires prebid cache to be enabled
+    // Example: "https://vid.exmpale.com/imp/134"
+    // For now we don't need this field
+    // vastImpUrl: null,
+    vastXml: openRtbBid.adm,
+    dealId: openRtbBid.dealid,
+    meta: {
+      cid: openRtbBid.cid,
+      adomain: openRtbBid.adomain,
+      networkId: null,
+      networkName: null,
+      agencyId: null,
+      agencyName: null,
+      advertiserId: null,
+      advertiserName: null,
+      advertiserDomains: null,
+      brandId: null,
+      brandName: null,
+      primaryCatId: null,
+      secondaryCatIds: null,
+      mediaType: 'video',
+    },
+  }
+};
 
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-
-  isBidRequestValid: (bid) => Boolean(bid.bidId && bid.params && +bid.params.placementId && +bid.params.pubId),
-
-  /**
-   * @param {Object[]} validBidRequests -  array of valid bid requests
-   * @param {Object} bidderRequest - an array of valid bid requests
-   *
-   * */
-  buildRequests(validBidRequests, bidderRequest) {
-    const payload = getCommonBidsData(bidderRequest);
-    payload.bidRequests = buildBidRequests(validBidRequests);
-
-    let pubId = '';
-    if (validBidRequests[0] && validBidRequests[0].params && +validBidRequests[0].params.pubId) {
-      pubId = +validBidRequests[0].params.pubId;
-    }
+const getVastUrl = openRtbBid => {
+  const adm = (openRtbBid.adm || '').trim();
 
-    const url = `${ENDPOINT}?pubId=${pubId}`;
+  if (adm.startsWith('http')) {
+    return adm;
+  } else {
+    return null
+  }
+};
 
-    return {
-      method: 'POST',
-      url,
-      data: payload
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   */
-  interpretResponse(serverResponse, bidRequest) {
-    const bids = [];
-    serverResponse = serverResponse.body;
-
-    if (serverResponse.seatbid && serverResponse.seatbid[0]) {
-      const oneSeatBid = serverResponse.seatbid[0];
-      oneSeatBid.bid.forEach(serverBid => {
-        const bid = createBid(serverBid);
-        if (bid) {
-          bids.push(bid);
-        }
-      });
-    }
-    return bids;
-  },
-}
+const isBidValid = bid => {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
+    return false;
+  }
+
+  return Boolean(bid.width && bid.height && bid.ad);
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+};
 
 registerBidder(spec);
diff --git a/modules/waardexBidAdapter.md b/modules/waardexBidAdapter.md
index 44ee720d31a..6978281d40e 100644
--- a/modules/waardexBidAdapter.md
+++ b/modules/waardexBidAdapter.md
@@ -10,51 +10,82 @@ Maintainer: info@prebid.org
 
 Connects to Waardex exchange for bids.
 
-Waardex bid adapter supports Banner.
+Waardex bid adapter supports Banner and Video.
 
 # Test Parameters
-
-```
-
+## Banner
+```javascript
 var sizes = [
     [300, 250]
 ];
 var PREBID_TIMEOUT = 5000;
 var FAILSAFE_TIMEOUT = 5000;
 
-var adUnits = [{
-  code: '/19968336/header-bid-tag-0',
-  mediaTypes: {
-    banner: {
-        sizes: sizes,
-    },
-  },
-  bids: [{
-    bidder: 'waardex',
-    params: {
-        placementId: 13144370,
-        position: 1,  // add position openrtb
-        bidfloor: 0.5,
-        instl: 0,     // 1 - full screen
-        pubId: 1,
+var adUnits = [
+    {
+        code: '/19968336/header-bid-tag-0',
+        mediaTypes: {
+            banner: {
+                sizes: sizes
+            }
+        },
+        bids: [
+            {
+                bidder: 'waardex',
+                params: {
+                    position: 1,
+                    instl: 1,
+                    zoneId: 1
+                }
+            }
+        ]
     }
-  }]
-},{
-    code: '/19968336/header-bid-tag-1',
-    mediaTypes: {
-        banner: {
-            sizes: sizes,
+];
+```
+
+## Video
+
+```javascript
+const PREBID_TIMEOUT = 1000;
+const FAILSAFE_TIMEOUT = 3000;
+
+const sizes = [
+    [640, 480]
+];
+
+const adUnits = [
+    {
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                context: 'instream',
+                playerSize: sizes[0],
+                mimes: ['video/x-ms-wmv', 'video/mp4'],
+                minduration: 2,
+                maxduration: 10,
+                protocols: ['VAST 1.0', 'VAST 2.0'],
+                startdelay: -1,
+                placement: 1,
+                skip: 1,
+                skipafter: 2,
+                minbitrate: 0,
+                maxbitrate: 0,
+                delivery: [1, 2, 3],
+                playbackmethod: [1, 2],
+                api: [1, 2, 3, 4, 5, 6],
+                linearity: 1,
+                position: 1
+            }
         },
-    },
-    bids: [{
-        bidder: 'waardex',
-        params: {
-            placementId: 333333333333,
-            position: 1,  // add position openrtb
-            bidfloor: 0.5,
-            instl: 0,     // 1 - full screen
-            pubId: 1,
-        }
-    }]
-}];
+        bids: [
+            {
+                bidder: 'waardex',
+                params: {
+                    instl: 1,
+                    zoneId: 1
+                }
+            }
+        ]
+    }
+]
 ```
diff --git a/modules/weboramaBidAdapter.md b/modules/weboramaBidAdapter.md
deleted file mode 100644
index 5bdca0bfcd1..00000000000
--- a/modules/weboramaBidAdapter.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Overview
-
-```
-Module Name: Weborama SSP Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: devweborama@gmail.com
-```
-
-# Description
-
-Module that connects to Weborama SSP demand sources
-
-# Test Parameters
-```
-    var adUnits = [{
-                code: 'placementCode',
-                sizes: [[300, 250]],
-                bids: [{
-                        bidder: 'weborama',
-                        params: {
-                            placementId: 0,
-                            traffic: 'banner'
-                        }
-                    }]
-                }
-            ];
-```
diff --git a/modules/weboramaRtdProvider.js b/modules/weboramaRtdProvider.js
new file mode 100644
index 00000000000..12e8d4b23c8
--- /dev/null
+++ b/modules/weboramaRtdProvider.js
@@ -0,0 +1,1050 @@
+/**
+ * This module adds Weborama provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch contextual data (page-centric) from Weborama server
+ * and may access user-centric data from local storage
+ * @module modules/weboramaRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+/** profile metadata
+ * @typedef dataCallbackMetadata
+ * @property {boolean} user if true it is user-centric data
+ * @property {string} source describe the source of data, if 'contextual' or 'wam'
+ * @property {boolean} isDefault if true it the default profile defined in the configuration
+ */
+
+/** profile from contextual, wam or sfbx
+ * @typedef {Object.<string,string[]>} Profile
+ */
+
+/** onData callback type
+ * @callback dataCallback
+ * @param {Profile} data profile data
+ * @param {dataCallbackMetadata} meta metadata
+ * @returns {void}
+ */
+
+/** setPrebidTargeting callback type
+ * @callback setPrebidTargetingCallback
+ * @param {string} adUnitCode
+ * @param {Profile} data
+ * @param {dataCallbackMetadata} metadata
+ * @returns {boolean}
+ */
+
+/** sendToBidders callback type
+ * @callback sendToBiddersCallback
+ * @param {Object} bid
+ * @param {string} adUnitCode
+ * @param {Profile} data
+ * @param {dataCallbackMetadata} metadata
+ * @returns {boolean}
+ */
+
+/**
+ * @typedef {Object} ModuleParams
+ * @property {?setPrebidTargetingCallback|?boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
+ * @property {?sendToBiddersCallback|?boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
+ * @property {?dataCallback} onData callback
+ * @property {?WeboCtxConf} weboCtxConf site-centric contextual configuration
+ * @property {?WeboUserDataConf} weboUserDataConf user-centric wam configuration
+ * @property {?SfbxLiteDataConf} sfbxLiteDataConf site-centric lite configuration
+ */
+
+/**
+ * @callback assetIDcallback
+ * @returns {string} should return asset identifier using the form datasource:docId
+ */
+/**
+ * @typedef {Object} WeboCtxConf
+ * @property {string} token required token to be used on bigsea contextual API requests
+ * @property {?string} targetURL specify the target url instead use the referer
+ * @property {?assetIDcallback|?string} assetID specifies the assert identifier using the form datasource:docId or via callback
+ * @property {?setPrebidTargetingCallback|?boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
+ * @property {?sendToBiddersCallback|?boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
+ * @property {?dataCallback} onData callback
+ * @property {?Profile} defaultProfile to be used if the profile is not found
+ * @property {?boolean} enabled if false, will ignore this configuration
+ * @property {?string} baseURLProfileAPI to be used to point to a different domain than ctx.weborama.com
+ */
+
+/**
+ * @typedef {Object} WeboUserDataConf
+ * @property {?number} accountId wam account id
+ * @property {?setPrebidTargetingCallback|?boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
+ * @property {?sendToBiddersCallback|?boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
+ * @property {?Profile} defaultProfile to be used if the profile is not found
+ * @property {?dataCallback} onData callback
+ * @property {?string} localStorageProfileKey can be used to customize the local storage key (default is 'webo_wam2gam_entry')
+ * @property {?boolean} enabled if false, will ignore this configuration
+ */
+
+/**
+ * @typedef {Object} SfbxLiteDataConf
+ * @property {?setPrebidTargetingCallback|?boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
+ * @property {?sendToBiddersCallback|?boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
+ * @property {?Profile} defaultProfile to be used if the profile is not found
+ * @property {?dataCallback} onData callback
+ * @property {?string} localStorageProfileKey can be used to customize the local storage key (default is '_lite')
+ * @property {?boolean} enabled if false, will ignore this configuration
+ */
+
+/** common configuration between contextual, wam and sfbx
+ * @typedef {WeboCtxConf|WeboUserDataConf|SfbxLiteDataConf} CommonConf
+ */
+
+import {
+  getGlobal
+} from '../src/prebidGlobal.js';
+import {
+  deepClone,
+  deepSetValue,
+  isEmpty,
+  isFn,
+  logError,
+  logMessage,
+  isArray,
+  isStr,
+  isBoolean,
+  isPlainObject,
+  logWarn,
+  mergeDeep,
+  tryAppendQueryString
+} from '../src/utils.js';
+import {
+  submodule
+} from '../src/hook.js';
+import {
+  ajax
+} from '../src/ajax.js';
+import {
+  getStorageManager
+} from '../src/storageManager.js';
+import adapterManager from '../src/adapterManager.js';
+
+/** @type {string} */
+const MODULE_NAME = 'realTimeData';
+/** @type {string} */
+const SUBMODULE_NAME = 'weborama';
+/** @type {string} */
+const BASE_URL_CONTEXTUAL_PROFILE_API = 'ctx.weborama.com';
+/** @type {string} */
+export const DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY = 'webo_wam2gam_entry';
+/** @type {string} */
+const LOCAL_STORAGE_USER_TARGETING_SECTION = 'targeting';
+/** @type {string} */
+export const DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY = '_lite';
+/** @type {string} */
+const LOCAL_STORAGE_LITE_TARGETING_SECTION = 'webo';
+/** @type {string} */
+const WEBO_CTX_CONF_SECTION = 'weboCtxConf';
+/** @type {string} */
+const WEBO_USER_DATA_CONF_SECTION = 'weboUserDataConf';
+/** @type {string} */
+const SFBX_LITE_DATA_CONF_SECTION = 'sfbxLiteDataConf';
+/** @type {string} */
+const WEBO_CTX_SOURCE_LABEL = 'contextual';
+/** @type {string} */
+const WEBO_USER_DATA_SOURCE_LABEL = 'wam';
+/** @type {string} */
+const SFBX_LITE_DATA_SOURCE_LABEL = 'lite';
+/** @type {number} */
+const GVLID = 284;
+
+export const storage = getStorageManager({
+  gvlid: GVLID,
+  moduleName: SUBMODULE_NAME
+});
+
+/**
+ * @typedef {Object} Component
+ * @property {boolean} initialized
+ * @property {?Profile} data
+ * @property {boolean} user if true it is user-centric data
+ * @property {string} source describe the source of data, if 'contextual' or 'wam'
+ * @property {buildProfileHandlerCallbackBuilder} callbackBuilder
+ */
+
+/**
+ * @typedef {Object} Components
+ * @property {Component} WeboCtx
+ * @property {Component} WeboUserData
+ * @property {Component} SfbxLiteData
+ */
+
+/**
+ * @classdesc Weborama Real Time Data Provider
+ * @class
+ */
+class WeboramaRtdProvider {
+  #components;
+  name = SUBMODULE_NAME;
+  /**
+   * @param  {Components} components
+   */
+  constructor(components) {
+    this.#components = components;
+  }
+  /** Initialize module
+   * @method
+   * @param {Object} moduleConfig
+   * @param {?ModuleParams} moduleConfig.params
+   * @return {boolean} true if module was initialized with success
+   */
+  init(moduleConfig) {
+    /** @type {Object} */
+    const globalDefaults = {
+      setPrebidTargeting: true,
+      sendToBidders: true,
+      onData: () => {
+        /* do nothing */
+      }
+    };
+    /** @type {ModuleParams} */
+    const moduleParams = Object.assign({}, globalDefaults, moduleConfig?.params || {});
+
+    // reset profiles
+
+    this.#components.WeboCtx.data = null;
+    this.#components.WeboUserData.data = null;
+    this.#components.SfbxLiteData.data = null;
+
+    this.#components.WeboCtx.initialized = this.#initSubSection(moduleParams, WEBO_CTX_CONF_SECTION, 'token');
+    this.#components.WeboUserData.initialized = this.#initSubSection(moduleParams, WEBO_USER_DATA_CONF_SECTION);
+    this.#components.SfbxLiteData.initialized = this.#initSubSection(moduleParams, SFBX_LITE_DATA_CONF_SECTION);
+
+    return Object.values(this.#components).some((c) => c.initialized);
+  }
+
+  /** function that will allow RTD sub-modules to modify the AdUnit object for each auction
+   * @method
+   * @param {Object} reqBidsConfigObj
+   * @param {doneCallback} onDone
+   * @param {Object} moduleConfig
+   * @param {?ModuleParams} moduleConfig.params
+   * @returns {void}
+   */
+  getBidRequestData(reqBidsConfigObj, onDone, moduleConfig) {
+    /** @type {ModuleParams} */
+    const moduleParams = moduleConfig?.params || {};
+
+    if (!this.#components.WeboCtx.initialized) {
+      this.#handleBidRequestData(reqBidsConfigObj, moduleParams);
+
+      onDone();
+
+      return;
+    }
+
+    /** @type {WeboCtxConf} */
+    const weboCtxConf = moduleParams.weboCtxConf || {};
+
+    this.#fetchContextualProfile(weboCtxConf, (data) => {
+      logMessage('fetchContextualProfile on getBidRequestData is done');
+
+      this.#setWeboContextualProfile(data);
+    }, () => {
+      this.#handleBidRequestData(reqBidsConfigObj, moduleParams);
+
+      onDone();
+    });
+  }
+
+  /** function that provides ad server targeting data to RTD-core
+   * @method
+   * @param {string[]} adUnitsCodes
+   * @param {Object} moduleConfig
+   * @param {?ModuleParams} moduleConfig.params
+   * @returns {Object} target data
+   */
+  getTargetingData(adUnitsCodes, moduleConfig) {
+    /** @type {ModuleParams} */
+    const moduleParams = moduleConfig?.params || {};
+
+    const profileHandlers = this.#buildProfileHandlers(moduleParams);
+
+    if (isEmpty(profileHandlers)) {
+      logMessage('no data to set targeting');
+      return {};
+    }
+
+    try {
+      return adUnitsCodes.reduce((data, adUnitCode) => {
+        data[adUnitCode] = profileHandlers.reduce((targeting, ph) => {
+          // logMessage(`check if should set targeting for adunit '${adUnitCode}'`);
+          const [data, metadata] = this.#copyDataAndMetadata(ph);
+          if (ph.setTargeting(adUnitCode, data, metadata)) {
+            // logMessage(`set targeting for adunit '${adUnitCode}', source '${metadata.source}'`);
+
+            mergeDeep(targeting, data);
+          }
+
+          return targeting;
+        }, {});
+
+        return data;
+      }, {});
+    } catch (e) {
+      logError(`unable to format weborama rtd targeting data:`, e);
+
+      return {};
+    }
+  }
+
+  /** Initialize subsection module
+   * @method
+   * @private
+   * @param {ModuleParams} moduleParams
+   * @param {string} subSection subsection name to initialize
+   * @param {string[]} requiredFields
+   * @return {boolean} true if module subsection was initialized with success
+   */
+  #initSubSection(moduleParams, subSection, ...requiredFields) {
+    /** @type {CommonConf} */
+    const weboSectionConf = moduleParams[subSection] || { enabled: false };
+
+    if (weboSectionConf.enabled === false) {
+      delete moduleParams[subSection];
+
+      return false;
+    }
+
+    try {
+      this.#normalizeConf(moduleParams, weboSectionConf);
+
+      requiredFields.forEach(field => {
+        if (!(field in weboSectionConf)) {
+          throw `missing required field '${field}''`;
+        }
+      });
+    } catch (e) {
+      logError(`unable to initialize: error on ${subSection} configuration:`, e);
+      return false;
+    }
+
+    logMessage(`weborama ${subSection} initialized with success`);
+
+    return true;
+  }
+
+  /** normalize submodule configuration
+   * @method
+   * @private
+   * @param {ModuleParams} moduleParams
+   * @param {CommonConf} submoduleParams
+   * @return {void}
+   * @throws will throw an error in case of invalid configuration
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #normalizeConf(moduleParams, submoduleParams) {
+    submoduleParams.defaultProfile = submoduleParams.defaultProfile || {};
+
+    const { setPrebidTargeting, sendToBidders, onData } = moduleParams;
+
+    submoduleParams.setPrebidTargeting ??= setPrebidTargeting;
+    submoduleParams.sendToBidders ??= sendToBidders;
+    submoduleParams.onData ??= onData;
+
+    // handle setPrebidTargeting
+    this.#coerceSetPrebidTargeting(submoduleParams);
+
+    // handle sendToBidders
+    this.#coerceSendToBidders(submoduleParams);
+
+    if (!isFn(submoduleParams.onData)) {
+      throw 'onData parameter should be a callback';
+    }
+
+    if (!isValidProfile(submoduleParams.defaultProfile)) {
+      throw 'defaultProfile is not valid';
+    }
+  }
+
+  /** coerce setPrebidTargeting to a callback
+   * @method
+   * @private
+   * @param {CommonConf} submoduleParams
+   * @return {void}
+   * @throws will throw an error in case of invalid configuration
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #coerceSetPrebidTargeting(submoduleParams) {
+    try {
+      submoduleParams.setPrebidTargeting = this.#wrapValidatorCallback(submoduleParams.setPrebidTargeting);
+    } catch (e) {
+      throw `invalid setPrebidTargeting: ${e}`;
+    }
+  }
+
+  /** coerce sendToBidders to a callback
+   * @method
+   * @private
+   * @param {CommonConf} submoduleParams
+   * @return {void}
+   * @throws will throw an error in case of invalid configuration
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #coerceSendToBidders(submoduleParams) {
+    let sendToBidders = submoduleParams.sendToBidders;
+
+    if (isPlainObject(sendToBidders)) {
+      const sendToBiddersMap = Object.entries(sendToBidders).reduce((map, [key, value]) => {
+        map[key] = this.#wrapValidatorCallback(value);
+        return map;
+      }, {});
+
+      submoduleParams.sendToBidders = (bid, adUnitCode) => {
+        const bidder = bid.bidder;
+        if (!(bidder in sendToBiddersMap)) {
+          return false;
+        }
+
+        const validatorCallback = sendToBiddersMap[bidder];
+
+        try {
+          return validatorCallback(adUnitCode);
+        } catch (e) {
+          throw `invalid sendToBidders[${bidder}]: ${e}`;
+        }
+      };
+
+      return;
+    }
+
+    try {
+      submoduleParams.sendToBidders = this.#wrapValidatorCallback(submoduleParams.sendToBidders,
+        (bid) => bid.bidder);
+    } catch (e) {
+      throw `invalid sendToBidders: ${e}`;
+    }
+  }
+
+  /**
+   * @typedef {Object} AdUnit
+   * @property {Object[]} bids
+   */
+  /** function that handles bid request data
+   * @method
+   * @private
+   * @param {Object} reqBidsConfigObj
+   * @param {AdUnit[]} reqBidsConfigObj.adUnits
+   * @param {Object} reqBidsConfigObj.ortb2Fragments
+   * @param {Object} reqBidsConfigObj.ortb2Fragments.bidder
+   * @param {ModuleParams} moduleParams
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleBidRequestData(reqBidsConfigObj, moduleParams) {
+    const profileHandlers = this.#buildProfileHandlers(moduleParams);
+
+    if (isEmpty(profileHandlers)) {
+      logMessage('no data to send to bidders');
+      return;
+    }
+
+    const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+
+    try {
+      adUnits.forEach(
+        adUnit => adUnit.bids?.forEach(
+          bid => profileHandlers.forEach(ph => {
+            // logMessage(`check if bidder '${bid.bidder}' and adunit '${adUnit.code} are share ${ph.metadata.source} data`);
+
+            const [data, metadata] = this.#copyDataAndMetadata(ph);
+            if (ph.sendToBidders(bid, adUnit.code, data, metadata)) {
+              // logMessage(`handling bidder '${bid.bidder}' with ${ph.metadata.source} data`);
+
+              this.#handleBid(reqBidsConfigObj, bid, data, ph.metadata);
+            }
+          })
+        )
+      );
+    } catch (e) {
+      logError('unable to send data to bidders:', e);
+    }
+
+    profileHandlers.forEach(ph => {
+      try {
+        const [data, metadata] = this.#copyDataAndMetadata(ph);
+        ph.onData(data, metadata);
+      } catch (e) {
+        logError(`error while execute onData callback with ${ph.metadata.source}-based data:`, e);
+      }
+    });
+  }
+
+  /** onSuccess callback type
+   * @callback successCallback
+   * @param {?Object} data
+   * @returns {void}
+   */
+
+  /** onDone callback type
+   * @callback doneCallback
+   * @returns {void}
+   */
+
+  /** Fetch Bigsea Contextual Profile
+   * @method
+   * @private
+   * @param {WeboCtxConf} weboCtxConf
+   * @param {successCallback} onSuccess callback
+   * @param {doneCallback} onDone callback
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #fetchContextualProfile(weboCtxConf, onSuccess, onDone) {
+    const token = weboCtxConf.token;
+    const baseURLProfileAPI = weboCtxConf.baseURLProfileAPI || BASE_URL_CONTEXTUAL_PROFILE_API;
+
+    let path = '/profile';
+    let queryString = '';
+    queryString = tryAppendQueryString(queryString, 'token', token);
+
+    if (weboCtxConf.assetID) {
+      path = '/document-profile';
+
+      let assetID = weboCtxConf.assetID;
+      if (isFn(assetID)) {
+        try {
+          assetID = weboCtxConf.assetID();
+        } catch (e) {
+          logError('unexpected error while fetching asset id from callback', e);
+
+          onDone();
+
+          return;
+        }
+      }
+
+      if (!assetID) {
+        logError('missing asset id');
+
+        onDone();
+
+        return;
+      }
+
+      queryString = tryAppendQueryString(queryString, 'assetId', assetID);
+    }
+
+    const targetURL = weboCtxConf.targetURL || document.URL;
+    queryString = tryAppendQueryString(queryString, 'url', targetURL);
+
+    const urlProfileAPI = `https://${baseURLProfileAPI}/api${path}?${queryString}`;
+
+    const success = (response, req) => {
+      if (req.status === 200) {
+        const data = JSON.parse(response);
+        onSuccess(data);
+      } else {
+        throw `unexpected http status response ${req.status} with response ${response}`;
+      }
+
+      onDone();
+    };
+
+    const error = (e, req) => {
+      logError(`unable to get weborama data`, e, req);
+
+      onDone();
+    };
+
+    const callback = {
+      success,
+      error,
+    };
+
+    const options = {
+      method: 'GET',
+      withCredentials: false,
+    };
+
+    ajax(urlProfileAPI, callback, null, options);
+  }
+
+  /** set bigsea contextual profile on module state
+   * @method
+   * @private
+   * @param {?Object} data
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #setWeboContextualProfile(data) {
+    if (data && isPlainObject(data) && isValidProfile(data) && !isEmpty(data)) {
+      this.#components.WeboCtx.data = data;
+    }
+  }
+
+  /** function that provides data handlers based on the configuration
+   * @method
+   * @private
+   * @param {ModuleParams} moduleParams
+   * @returns {ProfileHandler[]}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #buildProfileHandlers(moduleParams) {
+    const steps = [{
+      component: this.#components.WeboCtx,
+      conf: moduleParams?.weboCtxConf,
+    }, {
+      component: this.#components.WeboUserData,
+      conf: moduleParams?.weboUserDataConf,
+    }, {
+      component: this.#components.SfbxLiteData,
+      conf: moduleParams?.sfbxLiteDataConf,
+    }];
+
+    return steps.filter(step => step.component.initialized).reduce((ph, { component, conf }) => {
+      const user = component.user;
+      const source = component.source;
+      const callback = component.callbackBuilder(component /* equivalent to this */);
+      const profileHandler = this.#buildProfileHandler(conf, callback, user, source);
+      if (profileHandler) {
+        ph.push(profileHandler);
+      } else {
+        logMessage(`skip ${source} profile: no data`);
+      }
+
+      return ph;
+    }, []);
+  }
+
+  /**
+   * @typedef {Object} ProfileHandler
+   * @property {Profile} data
+   * @property {dataCallbackMetadata} metadata
+   * @property {setPrebidTargetingCallback} setTargeting
+   * @property {sendToBiddersCallback} sendToBidders
+   * @property {dataCallback} onData
+   */
+
+  /**
+   * @callback buildProfileHandlerCallbackBuilder
+   * @param {Component} component
+   * @returns {buildProfileHandlerCallback}
+   */
+
+  /**
+   * @callback buildProfileHandlerCallback
+   * @param {CommonConf} dataConf
+   * @returns {[Profile,boolean]} profile + is default flag
+   */
+
+  /**
+   * return specific profile handler
+   * @method
+   * @private
+   * @param {CommonConf} dataConf
+   * @param {buildProfileHandlerCallback} callback
+   * @param {boolean} user
+   * @param {string} source
+   * @returns {ProfileHandler}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #buildProfileHandler(dataConf, callback, user, source) {
+    if (!dataConf) {
+      return;
+    }
+
+    const [data, isDefault] = callback(dataConf);
+    if (isEmpty(data)) {
+      return;
+    }
+
+    return {
+      data: data,
+      metadata: {
+        user: user,
+        source: source,
+        isDefault: !!isDefault,
+      },
+      setTargeting: dataConf.setPrebidTargeting,
+      sendToBidders: dataConf.sendToBidders,
+      onData: dataConf.onData,
+    };
+  }
+  /** handle individual bid
+   * @method
+   * @private
+   * @param {Object} reqBidsConfigObj
+   * @param {Object} reqBidsConfigObj.ortb2Fragments
+   * @param {Object} reqBidsConfigObj.ortb2Fragments.bidder
+   * @param {Object} bid
+   * @param {string} bid.bidder
+   * @param {Profile} profile
+   * @param {dataCallbackMetadata} metadata
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleBid(reqBidsConfigObj, bid, profile, metadata) {
+    this.#handleBidViaORTB2(reqBidsConfigObj, bid.bidder, profile, metadata);
+
+    /** @type {Object.<string,string>} */
+    const bidderAliasRegistry = adapterManager.aliasRegistry || {};
+
+    /** @type {string} */
+    const bidder = bidderAliasRegistry[bid.bidder] || bid.bidder;
+
+    switch (bidder) {
+      case 'appnexus':
+        this.#handleAppnexusBid(bid, profile);
+        break;
+      case 'pubmatic':
+        this.#handlePubmaticBid(bid, profile);
+        break;
+      case 'smartadserver':
+        this.#handleSmartadserverBid(bid, profile);
+        break;
+      case 'rubicon':
+        this.#handleRubiconBid(bid, profile, metadata);
+        break;
+    }
+  }
+
+  /** function that handles bid request data
+   * @method
+   * @private
+   * @param {ProfileHandler} ph profile handler
+   * @returns {[Profile,dataCallbackMetadata]} deeply copy data + metadata
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #copyDataAndMetadata(ph) {
+    return [deepClone(ph.data), deepClone(ph.metadata)];
+  }
+
+  /** handle appnexus/xandr bid
+   * @method
+   * @private
+   * @param {Object} bid
+   * @param {Object} bid.params
+   * @param {Object} bid.params.keyword
+   * @param {Profile} profile
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleAppnexusBid(bid, profile) {
+    const base = 'params.keywords';
+    this.#assignProfileToObject(bid, base, profile);
+  }
+
+  /** handle pubmatic bid
+   * @method
+   * @private
+   * @param {Object} bid
+   * @param {Object} bid.params
+   * @param {string} bid.params.dctr
+   * @param {Profile} profile
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handlePubmaticBid(bid, profile) {
+    const sep = '|';
+    const subsep = ',';
+
+    bid.params ||= {};
+
+    const data = bid.params.dctr || '';
+    const target = new Set(data.split(sep).filter((x) => x.length > 0));
+
+    Object.entries(profile).forEach(([key, values]) => {
+      const value = values.join(subsep);
+      const keyword = `${key}=${value}`;
+      target.add(keyword);
+    });
+
+    bid.params.dctr = Array.from(target).join(sep);
+  }
+
+  /** handle smartadserver bid
+   * @method
+   * @private
+   * @param {Object} bid
+   * @param {Object} bid.params
+   * @param {string} bid.params.target
+   * @param {Profile} profile
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleSmartadserverBid(bid, profile) {
+    const sep = ';';
+
+    bid.params ||= {};
+
+    const data = bid.params.target || '';
+    const target = new Set(data.split(sep).filter((x) => x.length > 0));
+
+    Object.entries(profile).forEach(([key, values]) => {
+      values.forEach(value => {
+        const keyword = `${key}=${value}`;
+        target.add(keyword);
+      })
+    });
+
+    bid.params.target = Array.from(target).join(sep);
+  }
+
+  /** handle rubicon bid
+   * @method
+   * @private
+   * @param {Object} bid
+   * @param {string} bid.bidder
+   * @param {Profile} profile
+   * @param {dataCallbackMetadata} metadata
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleRubiconBid(bid, profile, metadata) {
+    if (isBoolean(metadata.user)) {
+      const section = metadata.user ? 'visitor' : 'inventory';
+      const base = `params.${section}`;
+      this.#assignProfileToObject(bid, base, profile);
+    } else {
+      logMessage(`SKIP bidder '${bid.bidder}', data from '${metadata.source}' is not defined as user or site-centric`);
+    }
+  }
+
+  /** handle generic bid via ortb2 arbitrary data
+   * @method
+   * @private
+   * @param {Object} reqBidsConfigObj
+   * @param {Object} reqBidsConfigObj.ortb2Fragments
+   * @param {Object} reqBidsConfigObj.ortb2Fragments.bidder
+   * @param {string} bidder
+   * @param {Profile} profile
+   * @param {dataCallbackMetadata} metadata
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleBidViaORTB2(reqBidsConfigObj, bidder, profile, metadata) {
+    if (isBoolean(metadata.user)) {
+      logMessage(`bidder '${bidder}' is not directly supported, trying set data via bidder ortb2 fpd`);
+      const section = metadata.user ? 'user' : 'site';
+      const base = `${bidder}.${section}.ext.data`;
+
+      this.#assignProfileToObject(reqBidsConfigObj.ortb2Fragments?.bidder, base, profile);
+    } else {
+      logMessage(`SKIP unsupported bidder '${bidder}', data from '${metadata.source}' is not defined as user or site-centric`);
+    }
+  }
+
+  /**
+   * assign profile to object
+   * @method
+   * @private
+   * @param {Object} destination
+   * @param {string} base
+   * @param {Profile} profile
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #assignProfileToObject(destination, base, profile) {
+    Object.entries(profile).forEach(([key, values]) => {
+      const path = `${base}.${key}`;
+      deepSetValue(destination, path, values);
+    })
+  }
+
+  /**
+   * @callback validatorCallback
+   * @param {string} target
+   * @returns {boolean}
+   */
+
+  /**
+   * @callback coerceCallback
+   * @param {*} input
+   * @returns {*}
+   */
+
+  /**
+   * wrap value into validator
+   * @method
+   * @private
+   * @param {*} value
+   * @param {coerceCallback} coerce
+   * @returns {validatorCallback}
+   * @throws will throw an error in case of unsupported type
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #wrapValidatorCallback(value, coerce = (x) => x) {
+    if (isFn(value)) {
+      return value;
+    }
+
+    if (isBoolean(value)) {
+      return (_) => value;
+    }
+
+    if (isStr(value)) {
+      return (target) => {
+        return value == coerce(target);
+      };
+    }
+
+    if (isArray(value)) {
+      return (target) => {
+        return value.includes(coerce(target));
+      };
+    }
+
+    throw `unexpected format: ${typeof value} (expects function, boolean, string or array)`;
+  }
+}
+
+/**
+ * check if profile is valid
+ * @param {*} profile
+ * @returns {boolean}
+ */
+export function isValidProfile(profile) {
+  if (!isPlainObject(profile)) {
+    return false;
+  }
+
+  return Object.values(profile).every((field) => isArray(field) && field.every(isStr));
+}
+
+/**
+ * bind callback with component
+ * @param {Component} component
+ * @returns {buildProfileHandlerCallback}
+ */
+function getContextualProfile(component /* equivalent to this */) {
+  /** return contextual profile
+   * @param {WeboCtxConf} weboCtxConf
+   * @returns {[Profile,boolean]} contextual profile + isDefault boolean flag
+   */
+  return function (weboCtxConf) {
+    if (component.data) {
+      return [component.data, false];
+    }
+
+    const defaultContextualProfile = weboCtxConf.defaultProfile || {};
+
+    return [defaultContextualProfile, true];
+  }
+}
+
+/**
+ * bind callback with component
+ * @param {Component} component
+ * @returns {buildProfileHandlerCallback}
+ */
+function getWeboUserDataProfile(component /* equivalent to this */) {
+  /** return weboUserData profile
+   * @param {WeboUserDataConf} weboUserDataConf
+   * @returns {[Profile,boolean]} weboUserData profile  + isDefault boolean flag
+   */
+  return function (weboUserDataConf) {
+    return getDataFromLocalStorage(weboUserDataConf,
+      () => component.data,
+      (data) => component.data = data,
+      DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY,
+      LOCAL_STORAGE_USER_TARGETING_SECTION,
+      WEBO_USER_DATA_SOURCE_LABEL);
+  }
+}
+
+/**
+ * bind callback with component
+ * @param {Component} component
+ * @returns {buildProfileHandlerCallback}
+ */
+function getSfbxLiteDataProfile(component /* equivalent to this */) {
+  /** return weboUserData profile
+   * @param {SfbxLiteDataConf} sfbxLiteDataConf
+   * @returns {[Profile,boolean]} sfbxLiteData profile + isDefault boolean flag
+   */
+  return function getSfbxLiteDataProfile(sfbxLiteDataConf) {
+    return getDataFromLocalStorage(sfbxLiteDataConf,
+      () => component.data,
+      (data) => component.data = data,
+      DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY,
+      LOCAL_STORAGE_LITE_TARGETING_SECTION,
+      SFBX_LITE_DATA_SOURCE_LABEL);
+  }
+}
+
+/**
+ * @callback cacheGetCallback
+ * @returns {Profile}
+ */
+/**
+ * @callback cacheSetCallback
+ * @param {Profile} profile
+ * @returns {void}
+ */
+
+/** return generic webo data profile
+ * @param {WeboUserDataConf|SfbxLiteDataConf} weboDataConf
+ * @param {cacheGetCallback} cacheGet
+ * @param {cacheSetCallback} cacheSet
+ * @param {string} defaultLocalStorageProfileKey
+ * @param {string} targetingSection
+ * @param {string} source
+ * @returns {[Profile,boolean]} webo (user|lite) data profile + isDefault boolean flag
+ */
+function getDataFromLocalStorage(weboDataConf, cacheGet, cacheSet, defaultLocalStorageProfileKey, targetingSection, source) {
+  const defaultProfile = weboDataConf.defaultProfile || {};
+
+  if (storage.hasLocalStorage() && storage.localStorageIsEnabled() && !cacheGet()) {
+    const localStorageProfileKey = weboDataConf.localStorageProfileKey || defaultLocalStorageProfileKey;
+
+    const entry = storage.getDataFromLocalStorage(localStorageProfileKey);
+    if (entry) {
+      const data = JSON.parse(entry);
+      if (data && isPlainObject(data) && targetingSection in data) {
+        /** @type {profile} */
+        const profile = data[targetingSection];
+        const valid = isValidProfile(profile);
+        if (!valid) {
+          logWarn(`found invalid ${source} profile on local storage key ${localStorageProfileKey}, section ${targetingSection}`);
+
+          return;
+        }
+
+        if (!isEmpty(data)) {
+          cacheSet(profile);
+        }
+      }
+    }
+  }
+
+  const profile = cacheGet();
+
+  if (profile) {
+    return [profile, false];
+  }
+
+  return [defaultProfile, true];
+}
+/** @type {Components} */
+const components = {
+  WeboCtx: {
+    initialized: false,
+    data: null,
+    user: false,
+    source: WEBO_CTX_SOURCE_LABEL,
+    callbackBuilder: getContextualProfile,
+  },
+  WeboUserData: {
+    initialized: false,
+    data: null,
+    user: true,
+    source: WEBO_USER_DATA_SOURCE_LABEL,
+    callbackBuilder: getWeboUserDataProfile,
+  },
+  SfbxLiteData: {
+    initialized: false,
+    data: null,
+    user: false,
+    source: SFBX_LITE_DATA_SOURCE_LABEL,
+    callbackBuilder: getSfbxLiteDataProfile,
+  },
+};
+
+export const weboramaSubmodule = new WeboramaRtdProvider(components);
+
+submodule(MODULE_NAME, weboramaSubmodule);
diff --git a/modules/weboramaRtdProvider.md b/modules/weboramaRtdProvider.md
new file mode 100644
index 00000000000..f86351fe214
--- /dev/null
+++ b/modules/weboramaRtdProvider.md
@@ -0,0 +1,626 @@
+# Weborama Real-Time Data Submodule
+
+```
+Module Name: Weborama Rtd Provider
+Module Type: Rtd Provider
+Maintainer: prebid-support@weborama.com
+```
+
+## Description
+
+Weborama provides a Real-Time Data Submodule for `Prebid.js`, allowing to easy integrate different products such as:
+
+* Semantic AI Contextual API that classifies in Real-time a web page seen by a web user within generic and custom topics. It enables publishers to better monetize their inventory and unlock it to programmatic.
+
+* Weborama Audience Manager (WAM) is a DMP (Data Management Platform) used by over 60 companies in the world. This platform distinguishes itself particularly by a high level interconnexion with the adtech & martech ecosystem and a transparent access to the database intelligence.
+
+* LiTE by SFBX® (Local inApp Trust Engine) provides “Zero Party Data” given by users, stored and calculated only on the user’s device. Through a unique cohorting system, it enables better monetization in a consent/consentless and identity-less mode.
+
+Contact prebid-support@weborama.com for more information.
+
+### Publisher Usage
+
+Compile the Weborama RTD module into your Prebid build:
+
+`gulp build --modules=rtdModule,weboramaRtdProvider`
+
+Add the Weborama RTD provider to your Prebid config, use the configuration template below:
+
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function () {
+    pbjs.setConfig({
+        debug: true, // Output debug messages to the web console, *should* be disabled in production
+        realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+                name: "weborama",
+                waitForIt: true,
+                params: {
+                    /* add weborama rtd submodule configuration here */
+                },
+            },
+            // other modules...
+            ]
+        }
+    });
+});
+```
+
+The module configuration has 3 independent sections (`weboCtxConf`, `weboUserDataConf` and `sfbxLiteDataConf`), each one mapped to a single product (`contextual`, `wam` and `lite`). No section is enabled by default, we must be explicit like in the minimal example below:
+
+```javascript
+pbjs.setConfig({
+    debug: true,
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [{
+            name: "weborama",
+            waitForIt: true,
+            params: {
+                weboCtxConf: {     // contextual site-centric configuration, *omit if not needed*
+                    token: "<<to-be-defined>>", // mandatory
+                },
+                weboUserDataConf: { // wam user-centric configuration, *omit if not needed*
+                    enabled: true,
+                },
+                sfbxLiteDataConf: { // sfbx-lite site-centric configuration, *omit if not needed*
+                    enabled: true, 
+                },
+            }
+        },
+        // other modules...
+        ]
+    }
+});
+```
+
+Each module can perform two actions:
+
+* set targeting on [GPT](https://docs.prebid.org/dev-docs/publisher-api-reference/setTargetingForGPTAsync.html) / [AST](https://docs.prebid.org/dev-docs/publisher-api-reference/setTargetingForAst.html]) via `prebid.js`
+
+* send data to other `prebid.js` bidder modules (check the complete list at the end of this page)
+
+### Parameter Descriptions for the Weborama Configuration Section
+
+This is the main configuration section
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Real time data module name | Mandatory. Always 'Weborama' |
+| waitForIt | Boolean | Mandatory. Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false but recommended to true |
+| params | Object | | Optional |
+| params.setPrebidTargeting | Boolean | If true, may use the profile to set the prebid (GPT/GAM or AST) targeting of all adunits managed by prebid.js | Optional. Affects the `weboCtxConf`, `weboUserDataConf` and `sfbxLiteDataConf` sections |
+| params.sendToBidders | Boolean or Array | If true, may send the profile to all bidders. If an array, will specify the bidders to send data | Optional. Affects the `weboCtxConf`, `weboUserDataConf` and `sfbxLiteDataConf` sections |
+| params.weboCtxConf | Object | Weborama Contextual Site-Centric Configuration | Optional |
+| params.weboUserDataConf | Object | Weborama WAM User-Centric Configuration | Optional |
+| params.sfbxLiteDataConf | Object | Sfbx LiTE Site-Centric Configuration | Optional |
+| params.onData | Callback | If set, will receive the profile and metadata | Optional. Affects the `weboCtxConf`, `weboUserDataConf` and `sfbxLiteDataConf` sections |
+
+#### Contextual Site-Centric Configuration
+
+To be possible use the integration with Weborama Contextual Service you must be a client with a valid API token. Please contact weborama if you don't have it.
+
+On this section we will explain the `params.weboCtxConf` subconfiguration:
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| token | String | Security Token provided by Weborama, unique per client | Mandatory |
+| targetURL | String | Url to be profiled in the contextual api | Optional. Defaults to `document.URL` |
+| assetID | Function or String | if provided, we will call the document-profile api using this asset id. |Optional|
+| setPrebidTargeting|Various|If true, will use the contextual profile to set the prebid (GPT/GAM or AST) targeting of all adunits managed by prebid.js| Optional. Default is `params.setPrebidTargeting` (if any) or `true`.|
+| sendToBidders|Various|If true, will send the contextual profile to all bidders. If an array, will specify the bidders to send data| Optional. Default is `params.sendToBidders` (if any) or `true`.|
+| defaultProfile | Object | default value of the profile to be used when there are no response from contextual api (such as timeout)| Optional. Default is `{}` |
+| onData | Callback | If set, will receive the profile and metadata | Optional. Default is `params.onData` (if any) or log via prebid debug |
+| enabled | Boolean| if false, will ignore this configuration| Default is `true` if this section is present|
+| baseURLProfileAPI | String| if present, update the domain of the contextual api| Optional. Default is `ctx.weborama.com` |
+
+#### WAM User-Centric Configuration
+
+To be possible use the integration with Weborama Audience Manager (WAM) you must be a client with an account id and you lust include the `wamfactory` script in your pages with `wam2gam` feature activated.
+Please contact weborama if you don't have it.
+
+On this section we will explain the `params.weboUserDataConf` subconfiguration:
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| accountId|Number|WAM account id. If you don't have it, please contact weborama. | Recommended.|
+| setPrebidTargeting|Various|If true, will use the user profile to set the prebid (GPT/GAM or AST) targeting of all adunits managed by prebid.js| Optional. Default is `params.setPrebidTargeting` (if any) or `true`.|
+| sendToBidders|Various|If true, will send the user profile to all bidders| Optional. Default is `params.sendToBidders` (if any) or `true`.|
+| onData | Callback | If set, will receive the profile and site flag | Optional. Default is `params.onData` (if any) or log via prebid debug |
+| defaultProfile | Object | default value of the profile to be used when there are no response from contextual api (such as timeout)| Optional. Default is `{}` |
+| localStorageProfileKey| String | can be used to customize the local storage key | Optional |
+| enabled | Boolean| if false, will ignore this configuration| Default is `true` if this section is present|
+
+#### Sfbx LiTE Site-Centric Configuration
+
+To be possible use the integration between Weborama and Sfbx LiTE you should also contact SFBX® to setup this product.
+
+On this section we will explain the `params.sfbxLiteDataConf` subconfiguration:
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| setPrebidTargeting|Various|If true, will use the user profile to set the prebid (GPT/GAM or AST) targeting of all adunits managed by prebid.js| Optional. Default is `params.setPrebidTargeting` (if any) or `true`.|
+| sendToBidders|Varios|If true, will send the user profile to all bidders| Optional. Default is `params.sendToBidders` (if any) or `true`.|
+| onData | Callback | If set, will receive the profile and site flag | Optional. Default is `params.onData` (if any) or log via prebid debug |
+| defaultProfile | Object | default value of the profile to be used when there are no response from contextual api (such as timeout)| Optional. Default is `{}` |
+| localStorageProfileKey| String | can be used to customize the local storage key | Optional |
+| enabled | Boolean| if false, will ignore this configuration| Default is `true` if this section is present|
+
+##### Property setPrebidTargeting supported types
+
+This property support the following types
+
+| Type  | Description | Example   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| Boolean|If true, set prebid targeting for all adunits, or not in case of false| `true` | default value |
+| String|Will set prebid targeting only for one adunit | `'adUnitCode1'` |  |
+| Array of Strings|Will set prebid targeting only for some adunits| `['adUnitCode1','adUnitCode2']` |  |
+| Callback |Will be executed for each adunit, expects return a true value to set prebid targeting or not| `function(adUnitCode){return adUnitCode == 'adUnitCode';}` |  |
+
+The complete callback function signature is:
+
+```javascript
+setPrebidTargeting: function(adUnitCode, data, metadata){
+    return true; // or false, depending on the logic
+}
+```
+
+This callback will be executed with the adUnitCode, profile and a metadata with the following fields
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| user | Boolean | If true, it contains user-centric data |  |
+| source | String | Represent the source of data | can be `contextual`, `wam` or `lite`  |
+| isDefault | Boolean | If true, it contains the default profile defined in the configuration |  |
+
+It is possible customize the targeting based on the parameters:
+
+```javascript
+setPrebidTargeting: function(adUnitCode, data, metadata){
+    // check metadata.source can be omitted if defined in params.weboUserDataConf
+    if (adUnitCode == 'adUnitCode1' && metadata.source == 'wam'){
+        data['foo']=['bar'];  // add this section only for adUnitCode1
+        delete data['other']; // remove this section
+    }
+    return true;
+}
+```
+
+##### Property sendToBidders supported types
+
+This property support the following types
+
+| Type  | Description | Example   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| Boolean|If true, send data to all bidders, or not in case of false| `true` | default value |
+| String|Will send data to only one bidder | `'appnexus'` |  |
+| Array of Strings|Will send data to only some bidders | `['appnexus','pubmatic']` |  |
+| Object |Will send data to only some bidders and some ad units | `{appnexus: true, pubmatic:['adUnitCode1']}` |  |
+| Callback |Will be executed for each adunit, expects return a true value to set prebid targeting or not| `function(bid, adUnitCode){return bid.bidder == 'appnexus' && adUnitCode == 'adUnitCode';}` |  |
+
+A better look on the `Object` type
+
+```javascript
+sendToBidders: {
+    appnexus: true,           // send profile to appnexus on all ad units
+    pubmatic: ['adUnitCode1'],// send profile to pubmatic on this ad units 
+}
+```
+
+The complete callback function signature is:
+
+```javascript
+sendToBidders: function(bid, adUnitCode, data, metadata){
+    return true; // or false, depending on the logic
+}
+```
+
+This callback will be executed with the bid object (contains a field `bidder` with name), adUnitCode, profile and a metadata with the following fields
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| user | Boolean | If true, it contains user-centric data |  |
+| source | String | Represent the source of data | can be `contextual`, `wam` or `lite`  |
+| isDefault | Boolean | If true, it contains the default profile defined in the configuration |  |
+
+It is possible customize the targeting based on the parameters:
+
+```javascript
+sendToBidders: function(bid, adUnitCode, data, metadata){
+    if (bid.bidder == 'appnexus' && adUnitCode == 'adUnitCode1'){
+        data['foo']=['bar']; // add this section only for appnexus + adUnitCode1
+        delete data['other']; // remove this section
+    }
+    return true;
+}
+```
+
+To be possible customize the way we send data to bidders via this callback:
+
+```javascript
+sendToBidders: function(bid, adUnitCode, data, metadata){
+    if (bid.bidder == 'other'){
+        /* use bid object to store data based on this specific logic, like in the example below */
+       
+        bid.params = bid.params || {};
+        bid.params['some_specific_key'] = data;
+
+        return false; // will prevent the module to follow the pre-defined logic per bidder
+    }
+    // others
+    return true;
+}
+```
+
+In case of using bid _aliases_, we should match the same string used in the adUnit configuration.
+
+```javascript
+pbjs.aliasBidder('appnexus', 'foo');
+pbjs.aliasBidder('criteo', 'bar');
+pbjs.aliasBidder('pubmatic', 'baz');
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: "weborama",
+            waitForIt: true,
+            params: {
+                weboCtxConf: {
+                    token: "to-be-defined", // mandatory
+                    sendToBidders: ['foo','bar'], // will share site-centric data with bidders foo and bar
+                },
+                weboUserDataConf: {
+                    accountId: 12345,       // recommended,
+                    sendToBidders: ['baz'], // will share user-centric data with only bidder baz
+                }
+            }
+        }]
+    }
+});
+```
+
+##### Using onData callback
+
+We can specify a callback to handle the profile data from site-centric or user-centric data.
+
+This callback will be executed with the profile and a metadata with the following fields
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| user | Boolean | If true, it contains user-centric data |  |
+| source | String | Represent the source of data | can be `contextual`, `wam` or `lite`  |
+| isDefault | Boolean | If true, it contains the default profile defined in the configuration |  |
+
+The metadata maybe not useful if we define the callback on site-centric of user-centric configuration, but if defined in the global level:
+
+```javascript
+params: {
+    onData: function(data, metadata){
+        var hasUserCentricData = metadata.user;
+        var dataSource = metadata.source;
+        console.log('onData', data, hasUserCentricData, dataSource);
+    }
+}
+```
+
+an interesting example is to set GAM targeting in global level instead in slot level only for contextual data:
+
+```javascript
+params: {
+    weboCtxConf: {
+        token: 'to-be-defined',
+        setPrebidTargeting: false,
+        onData: function(data, metadata){
+            var googletag = googletag || {};
+            googletag.cmd = googletag.cmd || [];
+            googletag.cmd.push(function () {
+                for(var key in data){
+                    googletag.pubads().setTargeting(key, data[key]);
+                }
+            });
+        },
+    }
+}
+```
+
+### More configuration examples
+
+A more complete example can be found below. We can define default profiles, for each section, to be used in case of no data are found.
+
+We can control if we will set prebid targeting or send data to bidders in a global level or on each section (`contextual`, `wam` or `lite`).
+
+By default we try to send the data to all destinations, always. To restrict we can have two choices:
+
+* Set `setPrebidTargeting` or `sendToBidders` explicity to `true` or `false` on each section;
+* Set `setPrebidTargeting` or `sendToBidders` globally to `false` and only enable on the right sections;
+
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function () {
+    pbjs.setConfig({
+        debug: true,
+        realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+                name: "weborama",
+                waitForIt: true,
+                params: {
+                    weboCtxConf: {
+                        token: "<<to-be-defined>>", // mandatory
+                        targetURL: "https://example.org", // default is document.URL
+                        setPrebidTargeting: true, // override param.setPrebidTargeting. default is true
+                        sendToBidders: true,      // override param.sendToBidders. default is true
+                        defaultProfile: {         // optional, used if nothing is found
+                            webo_ctx: [ ... ],    // contextual segments
+                            webo_ds: [ ...],      // data science segments
+                        },
+                        enabled: true,
+                    },
+                    weboUserDataConf: {
+                        setPrebidTargeting: true, // override param.setPrebidTargeting. default is true
+                        sendToBidders: true,      // override param.sendToBidders. default is true
+                        defaultProfile: {            // optional, used if nothing is found
+                            webo_cs: [...],        // wam custom segments
+                            webo_audiences: [...], // wam audiences 
+                        },
+                        enabled: true,
+                    },
+                    sfbxLiteDataConf: {
+                        setPrebidTargeting: true, // override param.setPrebidTargeting. default is true
+                        sendToBidders: true,      // override param.sendToBidders. default is true
+                        defaultProfile: {           // optional, used if nothing is found
+                            /* add specific lite segments here */
+                        },
+                        enabled: true,
+                    },
+                }
+            }]
+        }
+    });
+});
+```
+
+An alternative version, using asset id instead of target url on contextual, can be found here:
+
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function () {
+    pbjs.setConfig({
+        debug: true,
+        realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+                name: "weborama",
+                waitForIt: true,
+                params: {
+                    weboCtxConf: {
+                        token: "<<to-be-defined>>", // mandatory
+                        assetID: "datasource:docId", // can be a callback to be executed in runtime and returns the identifier
+                        setPrebidTargeting: true, // override param.setPrebidTargeting. default is true
+                        sendToBidders: true,      // override param.sendToBidders. default is true
+                        defaultProfile: {         // optional, used if nothing is found
+                            webo_ctx: [ ... ],    // contextual segments
+                            webo_ds: [ ...],      // data science segments
+                        },
+                        enabled: true,
+                    },
+                    ...
+    });
+});
+```
+
+Imagine we need to configure the following options using the previous example, we can write the configuration like the one below.
+
+||contextual|wam|lite|
+| :------------ | :------------ | :------------ |:------------ |
+|setPrebidTargeting|true|false|true|
+|sendToBidders|false|true|true|
+
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function () {
+    pbjs.setConfig({
+        debug: true,
+        realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+                name: "weborama",
+                waitForIt: true,
+                params: {
+                    setPrebidTargeting: false, // optional. set the default value of each section.
+                    sendToBidders: false,      // optional. set the default value of each section.
+                    weboCtxConf: {
+                        token: "<<to-be-defined>>", // mandatory
+                        targetURL: "https://example.org", // default is document.URL
+                        setPrebidTargeting: true, // override param.setPrebidTargeting. default is true
+                        enabled: true,
+                    },
+                    weboUserDataConf: {
+                        sendToBidders: true,      // override param.sendToBidders. default is true
+                        enabled: true,
+                    },
+                    sfbxLiteDataConf: {
+                        setPrebidTargeting: true, // override param.setPrebidTargeting. default is true
+                        sendToBidders: true,      // override param.sendToBidders. default is true
+                        enabled: true,
+                    },
+                }
+            }]
+        }
+    });
+});
+```
+
+We can also define a list of adunits / bidders that will receive data instead of using boolean values.
+
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function () {
+    pbjs.setConfig({
+        debug: true,
+        realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+                name: "weborama",
+                waitForIt: true,
+                params: {
+                    weboCtxConf: {
+                        token: "to-be-defined", // mandatory
+                        setPrebidTargeting: ['adUnitCode1',...], // set target only on certain adunits 
+                        sendToBidders: ['appnexus',...], // overide, send to only some bidders
+                        enabled: true,
+                    },
+                    weboUserDataConf: {
+                        accountId: 12345,           // recommended
+                        setPrebidTargeting: ['adUnitCode2',...], // set target only on certain adunits 
+                        sendToBidders: ['rubicon',...], // overide, send to only some bidders
+                        enabled: true,
+                    },
+                    sfbxLiteDataConf: {
+                        setPrebidTargeting: ['adUnitCode3',...], // set target only on certain adunits 
+                        sendToBidders: ['smartadserver',...], // overide, send to only some bidders
+                        enabled: true,
+                    }
+                }
+            }]
+        }
+    });
+});
+```
+
+Finally, we can combine several styles in the same configuration if needed. Including the callback style.
+
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function () {
+    pbjs.setConfig({
+        debug: true,
+        realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+                name: "weborama",
+                waitForIt: true,
+                params: {
+                    setPrebidTargeting: true, // optional
+                    sendToBidders: true,      // optional
+                    onData: function(data, meta){ // optional
+                        var userCentricData = meta.user;   // maybe undefined
+                        var sourceOfData    = meta.source; // contextual, wam or lite
+
+                        var isDefault       = meta.isDefault; // true if uses default profile
+
+                        console.log('onData', data, meta);
+                    },
+                    weboCtxConf: {
+                        token: "to-be-defined", // mandatory
+                        targetURL: "https://prebid.org", // default is document.URL
+                        setPrebidTargeting: true, // override param.setPrebidTargeting or default true
+                        sendToBidders: ['appnexus',...], // overide, send to only some bidders
+                        defaultProfile: {         // optional
+                            webo_ctx: ['moon'],
+                            webo_ds: ['bar']
+                        },
+                        enabled: true,
+                        //, onData: function (data, ...) { ...}
+                    },
+                    weboUserDataConf: {
+                        accountId: 12345,           // recommended
+                        setPrebidTargeting: ['adUnitCode1',...], // set target only on certain adunits 
+                        sendToBidders: { // send to only some bidders and adunits
+                            'appnexus': true,               // all adunits for appnexus 
+                            'pubmatic': ['adUnitCode1',...] // some adunits for pubmatic
+                            // other bidders will be ignored
+                        },
+                        defaultProfile: {           // optional
+                            webo_cs: ['Red'],
+                            webo_audiences: ['bam']
+                        },
+                        localStorageProfileKey: 'webo_wam2gam_entry', // default
+                        enabled: true,
+                        //, onData: function (data, ...) { ...}
+                    },
+                    sfbxLiteDataConf: {
+                        setPrebidTargeting: function(adUnitCode){ // specify set target via callback
+                            return adUnitCode == 'adUnitCode1';
+                        },
+                        sendToBidders: function(bid, adUnitCode){ // specify sendToBidders via callback
+                            return bid.bidder == 'appnexus' && adUnitCode == 'adUnitCode1';
+                        }
+                        defaultProfile: {           // optional
+                            lite_occupation: ['gérant', 'bénévole'],
+                            lite_hobbies: ['sport', 'cinéma'],
+                        },
+                        localStorageProfileKey: '_lite', // default
+                        enabled: true,
+                        //, onData: function (data, ...) { ...}
+                    }
+                }
+            }]
+        }
+    });
+});
+```
+
+### Supported Bidders
+
+We currently support the following bidder adapters:
+
+* SmartADServer SSP
+* PubMatic SSP
+* AppNexus SSP
+* Rubicon SSP
+
+We also set the bidder (and global, if no specific bidders are set on `sendToBidders`) ortb2 `site.ext.data` and `user.ext.data` sections (as arbitrary data). The following bidders may support it, to be sure, check the `First Party Data Support` on the feature list for the particular bidder from [here](https://docs.prebid.org/dev-docs/bidders).
+
+* Adagio
+* AdformOpenRTB
+* AdKernel
+* AdMixer
+* Adnuntius
+* Adrelevantis
+* adxcg
+* AMX RTB
+* Avocet
+* BeOp
+* Criteo
+* Etarget
+* Inmar
+* Index Exchange
+* Livewrapped
+* Mediakeys
+* NoBid
+* OpenX
+* Opt Out Advertising
+* Ozone Project
+* Proxistore
+* Rise
+* Smaato
+* Sonobi
+* TheMediaGrid
+* TripleLift
+* TrustX
+* Yahoo SSP
+* Yieldlab
+* Zeta Global Ssp
+
+### Testing
+
+To view an example of available segments returned by Weborama's backends:
+
+`gulp serve --notest --nolint --modules=rtdModule,weboramaRtdProvider,smartadserverBidAdapter,pubmaticBidAdapter,appnexusBidAdapter,rubiconBidAdapter,criteoBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/weboramaRtdProvider_example.html`
diff --git a/modules/welectBidAdapter.js b/modules/welectBidAdapter.js
new file mode 100644
index 00000000000..d88a3f4c3e2
--- /dev/null
+++ b/modules/welectBidAdapter.js
@@ -0,0 +1,106 @@
+import { deepAccess } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'welect';
+const DEFAULT_DOMAIN = 'www.welect.de';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['wlt'],
+  gvlid: 282,
+  supportedMediaTypes: ['video'],
+
+  // short code
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    return (
+      deepAccess(bid, 'mediaTypes.video.context') === 'instream' &&
+      !!bid.params.placementId
+    );
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests) {
+    return validBidRequests.map((bidRequest) => {
+      let rawSizes =
+        deepAccess(bidRequest, 'mediaTypes.video.playerSize') ||
+        bidRequest.sizes;
+      let size = rawSizes[0];
+
+      let domain = bidRequest.params.domain || DEFAULT_DOMAIN;
+
+      let url = `https://${domain}/api/v2/preflight/${bidRequest.params.placementId}`;
+
+      let gdprConsent = null;
+
+      if (bidRequest && bidRequest.gdprConsent) {
+        gdprConsent = {
+          gdpr_consent: {
+            gdprApplies: bidRequest.gdprConsent.gdprApplies,
+            tcString: bidRequest.gdprConsent.gdprConsent,
+          },
+        };
+      }
+
+      const data = {
+        width: size[0],
+        height: size[1],
+        bid_id: bidRequest.bidId,
+        ...gdprConsent,
+      };
+
+      return {
+        method: 'POST',
+        url: url,
+        data: data,
+        options: {
+          contentType: 'application/json',
+          withCredentials: false,
+          crossOrigin: true,
+        },
+      };
+    });
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const responseBody = serverResponse.body;
+
+    if (typeof responseBody !== 'object' || responseBody.available !== true) {
+      return [];
+    }
+
+    const bidResponses = [];
+    const bidResponse = {
+      requestId: responseBody.bidResponse.requestId,
+      cpm: responseBody.bidResponse.cpm,
+      width: responseBody.bidResponse.width,
+      height: responseBody.bidResponse.height,
+      creativeId: responseBody.bidResponse.creativeId,
+      currency: responseBody.bidResponse.currency,
+      netRevenue: responseBody.bidResponse.netRevenue,
+      ttl: responseBody.bidResponse.ttl,
+      ad: responseBody.bidResponse.ad,
+      vastUrl: responseBody.bidResponse.vastUrl,
+      meta: {
+        advertiserDomains: responseBody.bidResponse.meta.advertiserDomains
+      }
+    };
+    bidResponses.push(bidResponse);
+    return bidResponses;
+  },
+};
+registerBidder(spec);
diff --git a/modules/welectBidAdapter.md b/modules/welectBidAdapter.md
new file mode 100644
index 00000000000..7f72a0bd949
--- /dev/null
+++ b/modules/welectBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name: Welect Bidder Adapter
+Module Type: Welect Adapter
+Maintainer: nick.duitz@9elements.com
+```
+
+# Description
+
+Module that connects to Welect's demand sources
+
+# Test Parameters
+```
+var adUnits = [
+  {
+    bidder: 'welect',
+    params: {
+      placementId: 'exampleId',
+      domain: 'www.welect.de'
+    },
+    sizes: [[640, 360]],
+    mediaTypes: {
+      video: {
+        context: 'instream'
+      }
+    },
+  };
+];
+```
\ No newline at end of file
diff --git a/modules/widespaceBidAdapter.js b/modules/widespaceBidAdapter.js
index 3cea5ca57a1..ea6f1bce793 100644
--- a/modules/widespaceBidAdapter.js
+++ b/modules/widespaceBidAdapter.js
@@ -1,14 +1,8 @@
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {
-  parseQueryStringParameters,
-  parseSizesInput
-} from '../src/utils.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import find from 'core-js-pure/features/array/find.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-export const storage = getStorageManager();
+import {parseQueryStringParameters, parseSizesInput} from '../src/utils.js';
+import {find, includes} from '../src/polyfill.js';
+import {getStorageManager} from '../src/storageManager.js';
 
 const BIDDER_CODE = 'widespace';
 const WS_ADAPTER_VERSION = '2.0.1';
@@ -17,6 +11,7 @@ const LS_KEYS = {
   LC_UID: 'wsLcuid',
   CUST_DATA: 'wsCustomData'
 };
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 let preReqTime = 0;
 
@@ -61,7 +56,7 @@ export const spec = {
         'gdprCmp': bidderRequest && bidderRequest.gdprConsent ? 1 : 0,
         'hb': '1',
         'hb.cd': CUST_DATA ? encodedParamValue(CUST_DATA) : '',
-        'hb.floor': bid.bidfloor || '',
+        'hb.floor': '',
         'hb.spb': i === 0 ? pixelSyncPossibility() : -1,
         'hb.ver': WS_ADAPTER_VERSION,
         'hb.name': 'prebidjs-$prebid.version$',
@@ -95,10 +90,9 @@ export const spec = {
 
       // Include debug data when available
       if (!isInHostileIframe) {
-        const DEBUG_AD = (find(window.top.location.hash.split('&'),
+        data.forceAdId = (find(window.top.location.hash.split('&'),
           val => includes(val, 'WS_DEBUG_FORCEADID')
         ) || '').split('=')[1];
-        data.forceAdId = DEBUG_AD;
       }
 
       // GDPR Consent info
@@ -151,7 +145,10 @@ export const spec = {
           netRevenue: Boolean(bid.netRev),
           ttl: bid.ttl,
           referrer: getTopWindowReferrer(),
-          ad: bid.code
+          ad: bid.code,
+          meta: {
+            advertiserDomains: bid.adomain || []
+          }
         });
       }
     });
@@ -188,28 +185,6 @@ function storeData(data, name, stringify = true) {
 
 function getData(name, remove = true) {
   let data = [];
-  if (storage.hasLocalStorage()) {
-    Object.keys(localStorage).filter((key) => {
-      if (key.indexOf(name) > -1) {
-        data.push(storage.getDataFromLocalStorage(key));
-        if (remove) {
-          storage.removeDataFromLocalStorage(key);
-        }
-      }
-    });
-  }
-
-  if (storage.cookiesAreEnabled()) {
-    document.cookie.split(';').forEach((item) => {
-      let value = item.split('=');
-      if (value[0].indexOf(name) > -1) {
-        data.push(value[1]);
-        if (remove) {
-          storage.setCookie(value[0], '', 'Thu, 01 Jan 1970 00:00:01 GMT');
-        }
-      }
-    });
-  }
   return data;
 }
 
@@ -223,7 +198,6 @@ function visibleOnLoad(element) {
     const topPos = element.getBoundingClientRect().top;
     return topPos < screen.height && topPos >= window.top.pageYOffset ? 1 : 0;
   }
-  ;
   return '';
 }
 
diff --git a/modules/widespaceBidAdapter.md b/modules/widespaceBidAdapter.md
index 1ca2b61d406..fe87a620a86 100644
--- a/modules/widespaceBidAdapter.md
+++ b/modules/widespaceBidAdapter.md
@@ -1,8 +1,8 @@
 # Overview
 
 
-**Module Name:** Widespace Bidder Adapter.
-**Module Type:** Bidder Adapter.
+**Module Name:** Widespace Bidder Adapter.\
+**Module Type:** Bidder Adapter.\
 **Maintainer:** support@widespace.com
 
 
@@ -38,3 +38,4 @@ Banner and video formats are supported.
    }
   ];
 ```
+
diff --git a/modules/windtalkerBidAdapter.js b/modules/windtalkerBidAdapter.js
deleted file mode 100644
index 512cc7f839b..00000000000
--- a/modules/windtalkerBidAdapter.js
+++ /dev/null
@@ -1,307 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const NATIVE_DEFAULTS = {
-  TITLE_LEN: 100,
-  DESCR_LEN: 200,
-  SPONSORED_BY_LEN: 50,
-  IMG_MIN: 150,
-  ICON_MIN: 50,
-};
-const DEFAULT_MIMES = ['video/mp4', 'video/webm', 'application/x-shockwave-flash', 'application/javascript'];
-const VIDEO_TARGETING = ['mimes', 'skippable', 'playback_method', 'protocols', 'api'];
-const DEFAULT_PROTOCOLS = [2, 3, 5, 6];
-const DEFAULT_APIS = [1, 2];
-
-export const spec = {
-
-  code: 'windtalker',
-  supportedMediaTypes: ['banner', 'native', 'video'],
-
-  isBidRequestValid: bid => (
-    !!(bid && bid.params && bid.params.pubId && bid.params.placementId)
-  ),
-  buildRequests: (bidRequests, bidderRequest) => {
-    const request = {
-      id: bidRequests[0].bidderRequestId,
-      at: 2,
-      imp: bidRequests.map(slot => impression(slot)),
-      site: site(bidRequests),
-      app: app(bidRequests),
-      device: device(bidRequests),
-    };
-    applyGdpr(bidderRequest, request);
-    return {
-      method: 'POST',
-      url: 'https://windtalkerdisplay.hb.adp3.net/',
-      data: JSON.stringify(request),
-    };
-  },
-  interpretResponse: (response, request) => (
-    bidResponseAvailable(request, response.body)
-  ),
-};
-
-function bidResponseAvailable(bidRequest, bidResponse) {
-  const idToImpMap = {};
-  const idToBidMap = {};
-  const ortbRequest = parse(bidRequest.data);
-  ortbRequest.imp.forEach(imp => {
-    idToImpMap[imp.id] = imp;
-  });
-  if (bidResponse) {
-    bidResponse.seatbid.forEach(seatBid => seatBid.bid.forEach(bid => {
-      idToBidMap[bid.impid] = bid;
-    }));
-  }
-  const bids = [];
-  Object.keys(idToImpMap).forEach(id => {
-    if (idToBidMap[id]) {
-      const bid = {};
-      bid.requestId = id;
-      bid.adId = id;
-      bid.creativeId = id;
-      bid.cpm = idToBidMap[id].price;
-      bid.currency = bidResponse.cur;
-      bid.ttl = 360;
-      bid.netRevenue = true;
-      if (idToImpMap[id]['native']) {
-        bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
-        let nurl = idToBidMap[id].nurl;
-        nurl = nurl.replace(/\$(%7B|\{)AUCTION_IMP_ID(%7D|\})/gi, idToBidMap[id].impid);
-        nurl = nurl.replace(/\$(%7B|\{)AUCTION_PRICE(%7D|\})/gi, idToBidMap[id].price);
-        nurl = nurl.replace(/\$(%7B|\{)AUCTION_CURRENCY(%7D|\})/gi, bidResponse.cur);
-        nurl = nurl.replace(/\$(%7B|\{)AUCTION_BID_ID(%7D|\})/gi, bidResponse.bidid);
-        bid['native']['impressionTrackers'] = [nurl];
-        bid.mediaType = 'native';
-      } else if (idToImpMap[id]['video']) {
-        bid.vastUrl = idToBidMap[id].adm;
-        bid.vastUrl = bid.vastUrl.replace(/\$(%7B|\{)AUCTION_PRICE(%7D|\})/gi, idToBidMap[id].price);
-        bid.crid = idToBidMap[id].crid;
-        bid.width = idToImpMap[id].video.w;
-        bid.height = idToImpMap[id].video.h;
-        bid.mediaType = 'video';
-      } else if (idToImpMap[id]['banner']) {
-        bid.ad = idToBidMap[id].adm;
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_IMP_ID(%7D|\})/gi, idToBidMap[id].impid);
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_AD_ID(%7D|\})/gi, idToBidMap[id].adid);
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_PRICE(%7D|\})/gi, idToBidMap[id].price);
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_CURRENCY(%7D|\})/gi, bidResponse.cur);
-        bid.ad = bid.ad.replace(/\$(%7B|\{)AUCTION_BID_ID(%7D|\})/gi, bidResponse.bidid);
-        bid.width = idToBidMap[id].w;
-        bid.height = idToBidMap[id].h;
-        bid.mediaType = 'banner';
-      }
-      bids.push(bid);
-    }
-  });
-  return bids;
-}
-function impression(slot) {
-  return {
-    id: slot.bidId,
-    secure: window.location.protocol === 'https:' ? 1 : 0,
-    'banner': banner(slot),
-    'native': nativeImpression(slot),
-    'video': videoImpression(slot),
-    bidfloor: slot.params.bidFloor || '0.000001',
-    tagid: slot.params.placementId.toString(),
-  };
-}
-
-function banner(slot) {
-  if (slot.mediaType === 'banner' || utils.deepAccess(slot, 'mediaTypes.banner')) {
-    const sizes = utils.deepAccess(slot, 'mediaTypes.banner.sizes');
-    if (sizes.length > 1) {
-      let format = [];
-      for (let f = 0; f < sizes.length; f++) {
-        format.push({'w': sizes[f][0], 'h': sizes[f][1]});
-      }
-      return {'format': format};
-    } else {
-      return {
-        w: sizes[0][0],
-        h: sizes[0][1]
-      }
-    }
-  }
-  return null;
-}
-
-function videoImpression(slot) {
-  if (slot.mediaType === 'video' || utils.deepAccess(slot, 'mediaTypes.video')) {
-    const sizes = utils.deepAccess(slot, 'mediaTypes.video.playerSize');
-    const video = {
-      w: sizes[0][0],
-      h: sizes[0][1],
-      mimes: DEFAULT_MIMES,
-      protocols: DEFAULT_PROTOCOLS,
-      api: DEFAULT_APIS,
-    };
-    if (slot.params.video) {
-      Object.keys(slot.params.video).filter(param => includes(VIDEO_TARGETING, param)).forEach(param => video[param] = slot.params.video[param]);
-    }
-    return video;
-  }
-  return null;
-}
-
-function nativeImpression(slot) {
-  if (slot.mediaType === 'native' || utils.deepAccess(slot, 'mediaTypes.native')) {
-    const assets = [];
-    addAsset(assets, titleAsset(1, slot.nativeParams.title, NATIVE_DEFAULTS.TITLE_LEN));
-    addAsset(assets, dataAsset(2, slot.nativeParams.body, 2, NATIVE_DEFAULTS.DESCR_LEN));
-    addAsset(assets, dataAsset(3, slot.nativeParams.sponsoredBy, 1, NATIVE_DEFAULTS.SPONSORED_BY_LEN));
-    addAsset(assets, imageAsset(4, slot.nativeParams.icon, 1, NATIVE_DEFAULTS.ICON_MIN, NATIVE_DEFAULTS.ICON_MIN));
-    addAsset(assets, imageAsset(5, slot.nativeParams.image, 3, NATIVE_DEFAULTS.IMG_MIN, NATIVE_DEFAULTS.IMG_MIN));
-    return {
-      request: JSON.stringify({ assets }),
-      ver: '1.1',
-    };
-  }
-  return null;
-}
-
-function addAsset(assets, asset) {
-  if (asset) {
-    assets.push(asset);
-  }
-}
-
-function titleAsset(id, params, defaultLen) {
-  if (params) {
-    return {
-      id,
-      required: params.required ? 1 : 0,
-      title: {
-        len: params.len || defaultLen,
-      },
-    };
-  }
-  return null;
-}
-
-function imageAsset(id, params, type, defaultMinWidth, defaultMinHeight) {
-  return params ? {
-    id,
-    required: params.required ? 1 : 0,
-    img: {
-      type,
-      wmin: params.wmin || defaultMinWidth,
-      hmin: params.hmin || defaultMinHeight,
-    }
-  } : null;
-}
-
-function dataAsset(id, params, type, defaultLen) {
-  return params ? {
-    id,
-    required: params.required ? 1 : 0,
-    data: {
-      type,
-      len: params.len || defaultLen,
-    }
-  } : null;
-}
-
-function site(bidderRequest) {
-  const pubId = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.pubId : '0';
-  const siteId = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.siteId : '0';
-  const appParams = bidderRequest[0].params.app;
-  if (!appParams) {
-    return {
-      publisher: {
-        id: pubId.toString(),
-        domain: window.location.hostname,
-      },
-      id: siteId.toString(),
-      ref: window.top.document.referrer,
-      page: window.location.href,
-    }
-  }
-  return null;
-}
-
-function app(bidderRequest) {
-  const pubId = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.pubId : '0';
-  const appParams = bidderRequest[0].params.app;
-  if (appParams) {
-    return {
-      publisher: {
-        id: pubId.toString(),
-      },
-      id: appParams.id,
-      name: appParams.name,
-      bundle: appParams.bundle,
-      storeurl: appParams.storeUrl,
-      domain: appParams.domain,
-    }
-  }
-  return null;
-}
-
-function device(bidderRequest) {
-  const lat = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.latitude : '';
-  const lon = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.longitude : '';
-  const ifa = bidderRequest && bidderRequest.length > 0 ? bidderRequest[0].params.ifa : '';
-  return {
-    dnt: utils.getDNT() ? 1 : 0,
-    ua: navigator.userAgent,
-    language: (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage),
-    w: (window.screen.width || window.innerWidth),
-    h: (window.screen.height || window.innerHeigh),
-    geo: {
-      lat: lat,
-      lon: lon,
-    },
-    ifa: ifa,
-  };
-}
-
-function parse(rawResponse) {
-  try {
-    if (rawResponse) {
-      return JSON.parse(rawResponse);
-    }
-  } catch (ex) {
-    utils.logError('windtalker.parse', 'ERROR', ex);
-  }
-  return null;
-}
-
-function applyGdpr(bidderRequest, ortbRequest) {
-  if (bidderRequest && bidderRequest.gdprConsent) {
-    ortbRequest.regs = { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0 } };
-    ortbRequest.user = { ext: { consent: bidderRequest.gdprConsent.consentString } };
-  }
-}
-
-function nativeResponse(imp, bid) {
-  if (imp['native']) {
-    const nativeAd = parse(bid.adm);
-    const keys = {};
-    keys.image = {};
-    keys.icon = {};
-    if (nativeAd && nativeAd['native'] && nativeAd['native'].assets) {
-      nativeAd['native'].assets.forEach(asset => {
-        keys.title = asset.title ? asset.title.text : keys.title;
-        keys.body = asset.data && asset.id === 2 ? asset.data.value : keys.body;
-        keys.sponsoredBy = asset.data && asset.id === 3 ? asset.data.value : keys.sponsoredBy;
-        keys.icon.url = asset.img && asset.id === 4 ? asset.img.url : keys.icon.url;
-        keys.icon.width = asset.img && asset.id === 4 ? asset.img.w : keys.icon.width;
-        keys.icon.height = asset.img && asset.id === 4 ? asset.img.h : keys.icon.height;
-        keys.image.url = asset.img && asset.id === 5 ? asset.img.url : keys.image.url;
-        keys.image.width = asset.img && asset.id === 5 ? asset.img.w : keys.image.width;
-        keys.image.height = asset.img && asset.id === 5 ? asset.img.h : keys.image.height;
-      });
-      if (nativeAd['native'].link) {
-        keys.clickUrl = encodeURIComponent(nativeAd['native'].link.url);
-      }
-      return keys;
-    }
-  }
-  return null;
-}
-
-registerBidder(spec);
diff --git a/modules/windtalkerBidAdapter.md b/modules/windtalkerBidAdapter.md
deleted file mode 100644
index f7441effc47..00000000000
--- a/modules/windtalkerBidAdapter.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Overview
-
-**Module Name**: Windtalker Bidder Adapter  
-**Module Type**: Bidder Adapter  
-**Maintainer**: corbin@windtalker.io
-
-# Description
-
-Connects to Windtalker demand source to fetch bids.  
-Banner, Native, Video formats are supported.  
-Please use ```windtalker``` as the bidder code.
-
-# Test Parameters
-```
-  var adUnits = [{
-          code: 'dfp-native-div',
-          mediaTypes: {
-              native: {
-                  title: {
-                      required: true,
-                      len: 75
-                  },
-                  image: {
-                      required: true
-                  },
-                  body: {
-                      len: 200
-                  },
-                  icon: {
-                      required: false
-                  }
-              }
-          },
-          bids: [{
-              bidder: 'windtalker',
-              params: {
-                  pubId: '584971',
-                  siteId: '584971',
-                  placementId: '123',
-                  bidFloor: '0.001', // optional
-                  ifa: 'XXX-XXX', // optional
-                  latitude: '40.712775', // optional
-                  longitude: '-74.005973', // optional
-              }
-          }]
-      },
-      {
-          code: 'dfp-banner-div',
-          mediaTypes: {
-              banner: {
-                  sizes: [
-                      [300, 250],[300,600]
-                  ],
-              }
-          },
-          bids: [{
-              bidder: 'windtalker',
-              params: {
-                  pubId: '584971',
-                  siteId: '584971',
-                  placementId: '123',
-              }
-          }]
-      },
-      {
-          code: 'dfp-video-div',
-          mediaTypes: {
-              video: {
-                  playerSize: [[640, 480]],
-                  context: "instream"
-              }
-          },
-          bids: [{
-              bidder: 'windtalker',
-              params: {
-                  pubId: '584971',
-                  siteId: '584971',
-                  placementId: '123',
-                  video: {
-                      skipppable: true,
-                  }
-              }
-          }]
-      }
-  ];
-```
diff --git a/modules/winrBidAdapter.js b/modules/winrBidAdapter.js
new file mode 100644
index 00000000000..cd807917944
--- /dev/null
+++ b/modules/winrBidAdapter.js
@@ -0,0 +1,609 @@
+import {
+  convertCamelToUnderscore,
+  convertTypes,
+  deepAccess,
+  getBidRequest,
+  getParameterByName,
+  isArray,
+  isEmpty,
+  isFn,
+  isNumber,
+  isPlainObject,
+  logError,
+  transformBidderParamKeywords
+} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {find, includes} from '../src/polyfill.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+
+const BIDDER_CODE = 'winr';
+const URL = 'https://ib.adnxs.com/ut/v3/prebid';
+const URL_SIMPLE = 'https://ib.adnxs-simple.com/ut/v3/prebid';
+const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
+const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
+const SOURCE = 'pbjs';
+const DEFAULT_CURRENCY = 'USD';
+const GATE_COOKIE_NAME = 'wnr_gate';
+
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+function buildBid(bidData) {
+  const bid = bidData;
+  const position = {
+    domParent: bid.meta.domParent ? `'${bid.meta.domParent}'` : null,
+    child: bid.meta.child ? bid.meta.child : 4
+  }
+  bid.ad = wrapAd(bid, position);
+  return bid;
+}
+
+function getMediaTypeFromBid(bid) {
+  return bid.mediaTypes && Object.keys(bid.mediaTypes)[0];
+}
+
+function wrapAd(bid, position) {
+  return `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title></title>
+        <style>html, body {width: 100%; height: 100%; margin: 0;}</style>
+    </head>
+    <body>
+      <script>
+        function winrPbRendererLoad(cb) {
+          var w = parent.document.createElement("script");
+          w.innerHTML = \`
+            var WINR = {
+              pubDocRef: parent.document,
+              pubWinRef: window.parent
+            };
+            var winrLib = null;
+            var winrParams = {
+              rtb: {
+                _eng: 'xan',
+                _plmnt: ${bid.meta.placementId}
+              },
+              inR: {
+                tg: ${position.domParent},
+                rf: ${position.child}
+              },
+            };
+          \`;
+          var s = parent.document.head.getElementsByTagName("script")[0];
+          s.parentNode.insertBefore(w, s);
+          var n = parent.document.createElement("script");
+          n.src = 'https://helpers.winr.com.au/dist/prebidRenderer.js';
+          n.onload = function () {
+            var WinrLib = window.parent.WinrPbRenderer.default;
+            window.parent.winrLib = new WinrLib();
+            if (!window.parent.winrLib) {
+              console.log("Wnr: Renderer not found");
+              return false;
+            } else {
+              cb();
+            }
+          };
+          var t = parent.document.head.getElementsByTagName("script")[0];
+          t.parentNode.insertBefore(n, t.nexSibling);
+        }
+        winrPbRendererLoad(function() {
+          var tag = "${encodeURIComponent(JSON.stringify(bid))}";
+          window.parent.winrLib.render(tag);
+        });
+      </script>
+    </body>
+  </html>`;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['wnr'],
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    // Return false for each bid request if the media type is not 'banner'
+    if (getMediaTypeFromBid(bid) !== BANNER) {
+      return false;
+    }
+
+    // Return false for each bid request if the cookies disabled
+    if (!storage.cookiesAreEnabled()) {
+      return false;
+    }
+
+    // Return false for each bid request if the gate cookie is set
+    if (storage.getCookie(GATE_COOKIE_NAME) !== null) {
+      return false;
+    }
+
+    // Return false for each bid request if no placementId exists
+    if (!bid.params.placementId) {
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (bidRequests, bidderRequest) {
+    const tags = bidRequests.map(bidToTag);
+    const userObjBid = find(bidRequests, hasUserInfo);
+    let userObj = {};
+    if (config.getConfig('coppa') === true) {
+      userObj = { 'coppa': true };
+    }
+
+    if (userObjBid) {
+      Object.keys(userObjBid.params.user)
+        .filter((param) => includes(USER_PARAMS, param))
+        .forEach((param) => {
+          let uparam = convertCamelToUnderscore(param);
+          if (
+            param === 'segments' &&
+            isArray(userObjBid.params.user[param])
+          ) {
+            let segs = [];
+            userObjBid.params.user[param].forEach((val) => {
+              if (isNumber(val)) {
+                segs.push({ id: val });
+              } else if (isPlainObject(val)) {
+                segs.push(val);
+              }
+            });
+            userObj[uparam] = segs;
+          } else if (param !== 'segments') {
+            userObj[uparam] = userObjBid.params.user[param];
+          }
+        });
+    }
+
+    const appDeviceObjBid = find(bidRequests, hasAppDeviceInfo);
+    let appDeviceObj;
+    if (appDeviceObjBid && appDeviceObjBid.params && appDeviceObjBid.params.app) {
+      appDeviceObj = {};
+      Object.keys(appDeviceObjBid.params.app)
+        .filter(param => includes(APP_DEVICE_PARAMS, param))
+        .forEach(param => appDeviceObj[param] = appDeviceObjBid.params.app[param]);
+    }
+
+    const appIdObjBid = find(bidRequests, hasAppId);
+    let appIdObj;
+    if (appIdObjBid && appIdObjBid.params && appDeviceObjBid.params.app && appDeviceObjBid.params.app.id) {
+      appIdObj = {
+        appid: appIdObjBid.params.app.id
+      };
+    }
+
+    const memberIdBid = find(bidRequests, hasMemberId);
+    const member = memberIdBid ? parseInt(memberIdBid.params.member, 10) : 0;
+    const schain = bidRequests[0].schain;
+
+    const payload = {
+      tags: [...tags],
+      user: userObj,
+      sdk: {
+        source: SOURCE,
+        version: '$prebid.version$',
+      },
+      schain: schain
+    };
+
+    if (member > 0) {
+      payload.member_id = member;
+    }
+
+    if (appDeviceObjBid) {
+      payload.device = appDeviceObj;
+    }
+    if (appIdObjBid) {
+      payload.app = appIdObj;
+    }
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      // note - objects for impbus use underscore instead of camelCase
+      payload.gdpr_consent = {
+        consent_string: bidderRequest.gdprConsent.consentString,
+        consent_required: bidderRequest.gdprConsent.gdprApplies,
+      };
+    }
+
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    if (bidderRequest && bidderRequest.refererInfo) {
+      let refererinfo = {
+        // TODO: this collects everything it finds, except for canonicalUrl
+        rd_ref: encodeURIComponent(bidderRequest.refererInfo.topmostLocation),
+        rd_top: bidderRequest.refererInfo.reachedTop,
+        rd_ifs: bidderRequest.refererInfo.numIframes,
+        rd_stk: bidderRequest.refererInfo.stack
+          .map((url) => encodeURIComponent(url))
+          .join(','),
+      };
+      payload.referrer_detection = refererinfo;
+    }
+
+    if (bidRequests[0].userId) {
+      let eids = [];
+
+      addUserId(eids, deepAccess(bidRequests[0], `userId.criteoId`), 'criteo.com', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.netId`), 'netid.de', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.idl_env`), 'liveramp.com', null);
+      addUserId(eids, deepAccess(bidRequests[0], `userId.tdid`), 'adserver.org', 'TDID');
+      addUserId(eids, deepAccess(bidRequests[0], `userId.uid2.id`), 'uidapi.com', 'UID2');
+
+      if (eids.length) {
+        payload.eids = eids;
+      }
+    }
+
+    if (tags[0].publisher_id) {
+      payload.publisher_id = tags[0].publisher_id;
+    }
+
+    const request = formatRequest(payload, bidderRequest);
+    return request;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, { bidderRequest }) {
+    serverResponse = serverResponse.body;
+    const bids = [];
+    if (!serverResponse || serverResponse.error) {
+      let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
+      if (serverResponse && serverResponse.error) {
+        errorMessage += `: ${serverResponse.error}`;
+      }
+      logError(errorMessage);
+      return bids;
+    }
+
+    if (serverResponse.tags) {
+      serverResponse.tags.forEach((serverBid) => {
+        const rtbBid = getRtbBid(serverBid);
+        if (rtbBid) {
+          if (
+            rtbBid.cpm !== 0 &&
+            includes(this.supportedMediaTypes, rtbBid.ad_type)
+          ) {
+            const bid = newBid(serverBid, rtbBid, bidderRequest);
+            bid.mediaType = parseMediaType(rtbBid);
+            bids.push(bid);
+          }
+        }
+      });
+    }
+
+    return bids.map(bid => buildBid(bid));
+  },
+
+  getUserSyncs: function (syncOptions) {
+    if (syncOptions.iframeEnabled) {
+      return [
+        {
+          type: 'iframe',
+          url: 'https://acdn.adnxs.com/dmp/async_usersync.html',
+        },
+      ];
+    }
+  },
+
+  transformBidParams: function (params, isOpenRtb) {
+    params = convertTypes(
+      {
+        member: 'string',
+        invCode: 'string',
+        placementId: 'number',
+        keywords: transformBidderParamKeywords,
+        publisherId: 'number',
+      },
+      params
+    );
+
+    if (isOpenRtb) {
+      params.use_pmt_rule =
+        typeof params.usePaymentRule === 'boolean'
+          ? params.usePaymentRule
+          : false;
+      if (params.usePaymentRule) {
+        delete params.usePaymentRule;
+      }
+
+      if (isPopulatedArray(params.keywords)) {
+        params.keywords.forEach(deleteValues);
+      }
+
+      Object.keys(params).forEach((paramKey) => {
+        let convertedKey = convertCamelToUnderscore(paramKey);
+        if (convertedKey !== paramKey) {
+          params[convertedKey] = params[paramKey];
+          delete params[paramKey];
+        }
+      });
+    }
+
+    return params;
+  },
+};
+
+function isPopulatedArray(arr) {
+  return !!(isArray(arr) && arr.length > 0);
+}
+
+function deleteValues(keyPairObj) {
+  if (isPopulatedArray(keyPairObj.value) && keyPairObj.value[0] === '') {
+    delete keyPairObj.value;
+  }
+}
+
+function formatRequest(payload, bidderRequest) {
+  let request = [];
+  let options = {
+    withCredentials: true
+  };
+
+  let endpointUrl = URL;
+
+  if (!hasPurpose1Consent(bidderRequest?.gdprConsent)) {
+    endpointUrl = URL_SIMPLE;
+  }
+
+  if (
+    getParameterByName('apn_test').toUpperCase() === 'TRUE' ||
+    config.getConfig('apn_test') === true
+  ) {
+    options.customHeaders = {
+      'X-Is-Test': 1,
+    };
+  }
+
+  const payloadString = JSON.stringify(payload);
+  request = {
+    method: 'POST',
+    url: endpointUrl,
+    data: payloadString,
+    bidderRequest,
+    options,
+  };
+
+  return request;
+}
+
+/**
+ * Unpack the Server's Bid into a Prebid-compatible one.
+ * @param serverBid
+ * @param rtbBid
+ * @param bidderRequest
+ * @return Bid
+ */
+function newBid(serverBid, rtbBid, bidderRequest) {
+  const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
+  const bid = {
+    adType: rtbBid.ad_type,
+    requestId: serverBid.uuid,
+    auctionId: bidRequest.auctionId,
+    cpm: rtbBid.cpm,
+    creativeId: rtbBid.creative_id,
+    brandCategoryId: rtbBid.brandCategoryId,
+    dealId: rtbBid.deal_id,
+    currency: DEFAULT_CURRENCY,
+    netRevenue: true,
+    ttl: 300,
+    source: rtbBid.content_source,
+    mediaSubtypeId: rtbBid.media_subtype_id,
+    mediaTypeId: rtbBid.media_type_id,
+    adUnitCode: bidRequest.adUnitCode,
+    buyerMemberId: rtbBid.buyer_member_id,
+    appnexus: {
+      buyerMemberId: rtbBid.buyer_member_id,
+      dealPriority: rtbBid.deal_priority,
+      dealCode: rtbBid.deal_code,
+    }
+  };
+
+  // WE DON'T FULLY SUPPORT THIS ATM - future spot for adomain code; creating a stub for 5.0 compliance
+  if (rtbBid.adomain) {
+    bid.meta = Object.assign({}, bid.meta, { advertiserDomains: [] });
+  }
+
+  if (rtbBid.advertiser_id) {
+    bid.meta = Object.assign({}, bid.meta, {
+      advertiserId: rtbBid.advertiser_id,
+    });
+  }
+
+  if (bidRequest.params) {
+    const { placementId, siteId, domParent, child } = bidRequest.params;
+    bid.meta = Object.assign({}, bid.meta, {
+      placementId: placementId,
+      siteId: siteId,
+      domParent: domParent,
+      child: child
+    });
+  }
+
+  Object.assign(bid, {
+    width: rtbBid.rtb.banner.width,
+    height: rtbBid.rtb.banner.height,
+  });
+
+  try {
+    if (rtbBid.rtb.banner && rtbBid.rtb.trackers) {
+      bid.banner = Object.assign({}, bid.banner, {
+        content: rtbBid.rtb.banner.content,
+        width: rtbBid.rtb.banner.width,
+        height: rtbBid.rtb.banner.height,
+        trackers: rtbBid.rtb.trackers,
+      });
+    }
+  } catch (error) {
+    logError('Error assigning ad', error);
+  }
+  return bid;
+}
+
+function bidToTag(bid) {
+  const tag = {};
+  tag.sizes = transformSizes(bid.sizes);
+  tag.primary_size = tag.sizes[0];
+  tag.ad_types = [];
+  tag.uuid = bid.bidId;
+  if (bid.params.placementId) {
+    tag.id = parseInt(bid.params.placementId, 10);
+  } else {
+    tag.code = bid.params.invCode;
+  }
+  tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
+  tag.prebid = true;
+  tag.disable_psa = true;
+  let bidFloor = getBidFloor(bid);
+  if (bidFloor) {
+    tag.reserve = bidFloor;
+  }
+  if (bid.params.trafficSourceCode) {
+    tag.traffic_source_code = bid.params.trafficSourceCode;
+  }
+  if (bid.params.privateSizes) {
+    tag.private_sizes = transformSizes(bid.params.privateSizes);
+  }
+  if (bid.params.pubClick) {
+    tag.pubclick = bid.params.pubClick;
+  }
+  if (bid.params.publisherId) {
+    tag.publisher_id = parseInt(bid.params.publisherId, 10);
+  }
+  if (bid.params.externalImpId) {
+    tag.external_imp_id = bid.params.externalImpId;
+  }
+  if (!isEmpty(bid.params.keywords)) {
+    let keywords = transformBidderParamKeywords(bid.params.keywords);
+
+    if (keywords.length > 0) {
+      keywords.forEach(deleteValues);
+    }
+    tag.keywords = keywords;
+  }
+
+  let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  if (gpid) {
+    tag.gpid = gpid;
+  }
+
+  tag.hb_source = 1;
+
+  if (tag.ad_types.length === 0) {
+    delete tag.ad_types;
+  }
+
+  return tag;
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (
+    isArray(requestSizes) &&
+    requestSizes.length === 2 &&
+    !isArray(requestSizes[0])
+  ) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+function hasUserInfo(bid) {
+  return !!bid.params.user;
+}
+
+function hasMemberId(bid) {
+  return !!parseInt(bid.params.member, 10);
+}
+
+function hasAppDeviceInfo(bid) {
+  if (bid.params) {
+    return !!bid.params.app
+  }
+}
+
+function hasAppId(bid) {
+  if (bid.params && bid.params.app) {
+    return !!bid.params.app.id
+  }
+  return !!bid.params.app
+}
+
+function getRtbBid(tag) {
+  return tag && tag.ads && tag.ads.length && find(tag.ads, (ad) => ad.rtb);
+}
+
+function parseMediaType(rtbBid) {
+  const adType = rtbBid.ad_type;
+  if (adType !== BANNER) {
+    return false;
+  }
+  return BANNER;
+}
+
+function addUserId(eids, id, source, rti) {
+  if (id) {
+    if (rti) {
+      eids.push({ source, id, rti_partner: rti });
+    } else {
+      eids.push({ source, id });
+    }
+  }
+  return eids;
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.reserve) ? bid.params.reserve : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
+registerBidder(spec);
diff --git a/modules/winrBidAdapter.md b/modules/winrBidAdapter.md
new file mode 100644
index 00000000000..f9a73a6c0fa
--- /dev/null
+++ b/modules/winrBidAdapter.md
@@ -0,0 +1,546 @@
+# Overview
+
+```
+Module Name:  WINR Corporation Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: tech@winr.com.au
+```
+
+# Description
+
+WINR AdGate Bid Adaptor for Prebid.js.
+
+Connects to AppNexus exchange for bids.
+
+This bid adapter supports the Banner media type only.
+
+Please reach out to the WINR team before using this plugin to get `placementId`.
+
+`domParent` and `child` position settings are usually determined and remotely controlled for each publisher site by the WINR team. If you would prefer to have control over these settings, please get in touch.
+
+The code below returns a demo ad.
+
+# Test Parameters
+
+```js
+var adUnits = [
+  // Banner adUnit
+  {
+    code: "ad-unit",
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]],
+      },
+    },
+    bids: [
+      {
+        bidder: "winr",
+        params: {
+          placementId: 21764100,
+          domParent: ".blog-post", // optional
+          child: 4, // optional
+        },
+      },
+    ],
+  },
+];
+```
+
+# Example page
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Prebid.js Banner Example</title>
+    <script async src="prebid.js"></script>
+    <script>
+      var adUnits = [
+        {
+          code: "winr-demo",
+          mediaTypes: {
+            banner: {
+              sizes: [[1, 1]],
+            },
+          },
+          bids: [
+            {
+              bidder: "winr",
+              params: {
+                placementId: 21764100,
+                domParent: ".blog-post",
+                child: 4,
+              },
+            },
+          ],
+        },
+      ];
+
+      var PREBID_TIMEOUT = 2000;
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({
+          bidsBackHandler: function (bidResponses) {
+            initAdserver();
+          },
+          timeout: PREBID_TIMEOUT,
+        });
+      });
+    </script>
+
+    <script type="text/javascript">
+      // start loading tags
+      function initAdserver() {
+        if (pbjs.adserverRequestSent) return;
+        pbjs.adserverRequestSent = true;
+
+        var params = pbjs.getAdserverTargetingForAdUnitCode("winr-demo");
+        var iframe = document.getElementById("winr-demo");
+        if (params && params["hb_adid"]) {
+          pbjs.renderAd(iframe.contentDocument, params["hb_adid"]);
+        }
+      }
+    </script>
+
+    <!-- Bootstrap core CSS -->
+    <link
+      href="https://getbootstrap.com/docs/5.0/dist/css/bootstrap.min.css"
+      rel="stylesheet"
+      crossorigin="anonymous"
+    />
+
+    <style>
+      .bd-placeholder-img {
+        font-size: 1.125rem;
+        text-anchor: middle;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        user-select: none;
+      }
+
+      @media (min-width: 768px) {
+        .bd-placeholder-img-lg {
+          font-size: 3.5rem;
+        }
+      }
+    </style>
+
+    <!-- Custom styles for this template -->
+    <link
+      href="https://fonts.googleapis.com/css?family=Playfair+Display:700,900&amp;display=swap"
+      rel="stylesheet"
+    />
+    <link
+      href="https://getbootstrap.com/docs/5.0/examples/blog/blog.css"
+      rel="stylesheet"
+    />
+  </head>
+
+  <body class="single-post">
+    <div class="container">
+      <header class="blog-header py-3">
+        <div class="row flex-nowrap justify-content-between align-items-center">
+          <div class="col-12 text-center">
+            <a class="blog-header-logo text-dark" href="#">WINR</a>
+          </div>
+        </div>
+      </header>
+    </div>
+
+    <main class="container">
+      <div class="p-4 p-md-5 mb-4 text-white rounded bg-dark">
+        <div class="col-md-6 px-0">
+          <h1 class="display-4 fst-italic">Title of a featured blog post</h1>
+          <p class="lead my-3">
+            Multiple lines of text that form the lede, informing new readers
+            quickly and efficiently about what’s most interesting in this post’s
+            contents.
+          </p>
+          <p class="lead mb-0">
+            <a href="#" class="text-white fw-bold">Continue reading...</a>
+          </p>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-8">
+          <h3 class="pb-4 mb-4 fst-italic border-bottom">From the Firehose</h3>
+
+          <!-- domParent -->
+          <article class="blog-post">
+            <h2 class="blog-post-title">Sample blog post</h2>
+            <p class="blog-post-meta">
+              January 1, 2021 by <a href="#">Mark</a>
+            </p>
+
+            <p>
+              This blog post shows a few different types of content that’s
+              supported and styled with Bootstrap. Basic typography, images, and
+              code are all supported.
+            </p>
+            <hr />
+            <p>
+              Yeah, she dances to her own beat. Oh, no. You could've been the
+              greatest. 'Cause, baby, <a href="#">you're a firework</a>. Maybe a
+              reason why all the doors are closed. Open up your heart and just
+              let it begin. So très chic, yeah, she's a classic.
+            </p>
+            <blockquote>
+              <p>
+                Bikinis, zucchinis, Martinis, no weenies. I know there will be
+                sacrifice but that's the price.
+                <strong>This is how we do it</strong>. I'm not sticking around
+                to watch you go down. You think you're so rock and roll, but
+                you're really just a joke. I know one spark will shock the
+                world, yeah yeah. Can't replace you with a million rings.
+              </p>
+            </blockquote>
+            <p>
+              Trying to connect the dots, don't know what to tell my boss.
+              Before you met me I was alright but things were kinda heavy. You
+              just gotta ignite the light and let it shine. Glitter all over the
+              room <em>pink flamingos</em> in the pool.
+            </p>
+            <h3>Sub-heading</h3>
+            <p>
+              You got the finest architecture. Passport stamps, she's
+              cosmopolitan. Fine, fresh, fierce, we got it on lock. Never
+              planned that one day I'd be losing you. She eats your heart out.
+            </p>
+            <ul>
+              <li>Got a motel and built a fort out of sheets.</li>
+              <li>Your kiss is cosmic, every move is magic.</li>
+              <li>Suiting up for my crowning battle.</li>
+            </ul>
+            <p>
+              Takes you miles high, so high, 'cause she’s got that one
+              international smile.
+            </p>
+            <ol>
+              <li>Scared to rock the boat and make a mess.</li>
+              <li>I could have rewrite your addiction.</li>
+              <li>I know you get me so I let my walls come down.</li>
+            </ol>
+            <p>After a hurricane comes a rainbow.</p>
+
+            <!-- Ad unit -->
+            <div style="width: 1px; height: 1px;">
+              <iframe id="winr-demo" style="display: none;"></iframe>
+            </div>
+          </article>
+          <!-- /.blog-post -->
+        </div>
+
+        <div class="col-md-4">
+          <div class="p-4 mb-3 bg-light rounded">
+            <h4 class="fst-italic">About</h4>
+            <p class="mb-0">
+              Saw you downtown singing the Blues. Watch you circle the drain.
+              Why don't you let me stop by? Heavy is the head that
+              <em>wears the crown</em>. Yes, we make angels cry, raining down on
+              earth from up above.
+            </p>
+          </div>
+
+          <div class="p-4">
+            <h4 class="fst-italic">Archives</h4>
+            <ol class="list-unstyled mb-0">
+              <li><a href="#">March 2021</a></li>
+              <li><a href="#">February 2021</a></li>
+              <li><a href="#">January 2021</a></li>
+              <li><a href="#">December 2020</a></li>
+            </ol>
+          </div>
+        </div>
+      </div>
+      <!-- /.row -->
+    </main>
+    <!-- /.container -->
+
+    <footer class="blog-footer">
+      <p>
+        Blog template built for
+        <a href="https://getbootstrap.com/">Bootstrap</a> by
+        <a href="https://twitter.com/mdo">@mdo</a>.
+      </p>
+      <p>
+        <a href="#">Back to top</a>
+      </p>
+    </footer>
+  </body>
+</html>
+```
+
+# Example page with GPT
+
+```html
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Prebid.js Banner Example</title>
+    <script async src="prebid.js"></script>
+    <script
+      async
+      src="https://www.googletagservices.com/tag/js/gpt.js"
+    ></script>
+
+    <script>
+      var adUnits = [
+        {
+          code: "div-gpt-ad-1460505748561-0",
+          mediaTypes: {
+            banner: {
+              sizes: [[1, 1]],
+            },
+          },
+          bids: [
+            {
+              bidder: "winr",
+              params: {
+                placementId: 21764100,
+                domParent: ".blog-post",
+                child: 4,
+              },
+            },
+          ],
+        },
+      ];
+
+      var FAILSAFE_TIMEOUT = 3300;
+      var PREBID_TIMEOUT = 1000;
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+    </script>
+    <!-- Prebid Config Section END -->
+
+    <script>
+      var googletag = googletag || {};
+      googletag.cmd = googletag.cmd || [];
+      googletag.cmd.push(function () {
+        googletag.pubads().disableInitialLoad();
+      });
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          debug: true,
+        });
+        pbjs.addAdUnits(adUnits);
+        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();
+          });
+        });
+      }
+
+      setTimeout(function () {
+        sendAdserverRequest();
+      }, FAILSAFE_TIMEOUT);
+    </script>
+
+    <script>
+      googletag.cmd.push(function () {
+        googletag
+          .defineSlot(
+            "/19968336/header-bid-tag-0",
+            [
+              [1, 1],
+              [300, 250],
+            ],
+            "div-gpt-ad-1460505748561-0"
+          )
+          .addService(googletag.pubads());
+
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+      });
+    </script>
+
+    <!-- Bootstrap core CSS -->
+    <link
+      href="https://getbootstrap.com/docs/5.0/dist/css/bootstrap.min.css"
+      rel="stylesheet"
+      crossorigin="anonymous"
+    />
+
+    <style>
+      .bd-placeholder-img {
+        font-size: 1.125rem;
+        text-anchor: middle;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        user-select: none;
+      }
+
+      @media (min-width: 768px) {
+        .bd-placeholder-img-lg {
+          font-size: 3.5rem;
+        }
+      }
+    </style>
+
+    <!-- Custom styles for this template -->
+    <link
+      href="https://fonts.googleapis.com/css?family=Playfair+Display:700,900&amp;display=swap"
+      rel="stylesheet"
+    />
+    <link
+      href="https://getbootstrap.com/docs/5.0/examples/blog/blog.css"
+      rel="stylesheet"
+    />
+  </head>
+
+  <body class="single-post">
+    <div class="container">
+      <header class="blog-header py-3">
+        <div class="row flex-nowrap justify-content-between align-items-center">
+          <div class="col-12 text-center">
+            <a class="blog-header-logo text-dark" href="#">WINR</a>
+          </div>
+        </div>
+      </header>
+    </div>
+
+    <main class="container">
+      <div class="p-4 p-md-5 mb-4 text-white rounded bg-dark">
+        <div class="col-md-6 px-0">
+          <h1 class="display-4 fst-italic">Title of a featured blog post</h1>
+          <p class="lead my-3">
+            Multiple lines of text that form the lede, informing new readers
+            quickly and efficiently about what’s most interesting in this post’s
+            contents.
+          </p>
+          <p class="lead mb-0">
+            <a href="#" class="text-white fw-bold">Continue reading...</a>
+          </p>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-8">
+          <h3 class="pb-4 mb-4 fst-italic border-bottom">From the Firehose</h3>
+
+          <!-- domParent -->
+          <article class="blog-post">
+            <h2 class="blog-post-title">Sample blog post</h2>
+            <p class="blog-post-meta">
+              January 1, 2021 by <a href="#">Mark</a>
+            </p>
+
+            <p>
+              This blog post shows a few different types of content that’s
+              supported and styled with Bootstrap. Basic typography, images, and
+              code are all supported.
+            </p>
+            <hr />
+            <p>
+              Yeah, she dances to her own beat. Oh, no. You could've been the
+              greatest. 'Cause, baby, <a href="#">you're a firework</a>. Maybe a
+              reason why all the doors are closed. Open up your heart and just
+              let it begin. So très chic, yeah, she's a classic.
+            </p>
+            <blockquote>
+              <p>
+                Bikinis, zucchinis, Martinis, no weenies. I know there will be
+                sacrifice but that's the price.
+                <strong>This is how we do it</strong>. I'm not sticking around
+                to watch you go down. You think you're so rock and roll, but
+                you're really just a joke. I know one spark will shock the
+                world, yeah yeah. Can't replace you with a million rings.
+              </p>
+            </blockquote>
+            <p>
+              Trying to connect the dots, don't know what to tell my boss.
+              Before you met me I was alright but things were kinda heavy. You
+              just gotta ignite the light and let it shine. Glitter all over the
+              room <em>pink flamingos</em> in the pool.
+            </p>
+            <h3>Sub-heading</h3>
+            <p>
+              You got the finest architecture. Passport stamps, she's
+              cosmopolitan. Fine, fresh, fierce, we got it on lock. Never
+              planned that one day I'd be losing you. She eats your heart out.
+            </p>
+            <ul>
+              <li>Got a motel and built a fort out of sheets.</li>
+              <li>Your kiss is cosmic, every move is magic.</li>
+              <li>Suiting up for my crowning battle.</li>
+            </ul>
+            <p>
+              Takes you miles high, so high, 'cause she’s got that one
+              international smile.
+            </p>
+            <ol>
+              <li>Scared to rock the boat and make a mess.</li>
+              <li>I could have rewrite your addiction.</li>
+              <li>I know you get me so I let my walls come down.</li>
+            </ol>
+            <p>After a hurricane comes a rainbow.</p>
+
+            <!-- Ad unit -->
+            <div id="div-gpt-ad-1460505748561-0">
+              <script type="text/javascript">
+                googletag.cmd.push(function () {
+                  googletag.display("div-gpt-ad-1460505748561-0");
+                });
+              </script>
+            </div>
+          </article>
+          <!-- /.blog-post -->
+        </div>
+
+        <div class="col-md-4">
+          <div class="p-4 mb-3 bg-light rounded">
+            <h4 class="fst-italic">About</h4>
+            <p class="mb-0">
+              Saw you downtown singing the Blues. Watch you circle the drain.
+              Why don't you let me stop by? Heavy is the head that
+              <em>wears the crown</em>. Yes, we make angels cry, raining down on
+              earth from up above.
+            </p>
+          </div>
+
+          <div class="p-4">
+            <h4 class="fst-italic">Archives</h4>
+            <ol class="list-unstyled mb-0">
+              <li><a href="#">March 2021</a></li>
+              <li><a href="#">February 2021</a></li>
+              <li><a href="#">January 2021</a></li>
+              <li><a href="#">December 2020</a></li>
+            </ol>
+          </div>
+        </div>
+      </div>
+      <!-- /.row -->
+    </main>
+    <!-- /.container -->
+
+    <footer class="blog-footer">
+      <p>
+        Blog template built for
+        <a href="https://getbootstrap.com/">Bootstrap</a> by
+        <a href="https://twitter.com/mdo">@mdo</a>.
+      </p>
+      <p>
+        <a href="#">Back to top</a>
+      </p>
+    </footer>
+  </body>
+</html>
+```
diff --git a/modules/wipesBidAdapter.js b/modules/wipesBidAdapter.js
index f381bcb68a0..3d040fee8d3 100644
--- a/modules/wipesBidAdapter.js
+++ b/modules/wipesBidAdapter.js
@@ -1,4 +1,4 @@
-import * as utils from '../src/utils.js';
+import { logWarn } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
@@ -13,7 +13,7 @@ function isBidRequestValid(bid) {
     case !!(bid.params.asid):
       break;
     default:
-      utils.logWarn(`isBidRequestValid Error. ${bid.params}, please check your implementation.`);
+      logWarn(`isBidRequestValid Error. ${bid.params}, please check your implementation.`);
       return false;
   }
   return true;
@@ -54,6 +54,9 @@ function interpretResponse(serverResponse, bidRequest) {
       referrer: bidRequest.data.r || '',
       mediaType: BANNER,
       ad: response.ad_tag,
+      meta: {
+        advertiserDomains: response.advertiser_domain ? [response.advertiser_domain] : []
+      }
     };
     bidResponses.push(bidResponse);
   }
diff --git a/modules/xeBidAdapter.js b/modules/xeBidAdapter.js
new file mode 100644
index 00000000000..e7a251008bf
--- /dev/null
+++ b/modules/xeBidAdapter.js
@@ -0,0 +1,206 @@
+import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getAdUnitSizes, parseSizesInput, isFn, deepAccess, getBidIdParameter, logError, isArray } from '../src/utils.js';
+
+const CUR = 'USD';
+const BIDDER_CODE = 'xe';
+const ENDPOINT = 'https://pbjs.xe.works/bid';
+
+/**
+ * Determines whether or not the given bid request is valid.
+ *
+ * @param {BidRequest} bid The bid params to validate.
+ * @return boolean True  if this is a valid bid, and false otherwise.
+ */
+function isBidRequestValid(req) {
+  if (req && typeof req.params !== 'object') {
+    logError('Params is not defined or is incorrect in the bidder settings');
+    return false;
+  }
+
+  if (!getBidIdParameter('env', req.params) || !getBidIdParameter('placement', req.params)) {
+    logError('Env or placement is not present in bidder params');
+    return false;
+  }
+
+  if (deepAccess(req, 'mediaTypes.video') && !isArray(deepAccess(req, 'mediaTypes.video.playerSize'))) {
+    logError('mediaTypes.video.playerSize is required for video');
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Make a server request from the list of BidRequests.
+ *
+ * @param {validBidRequest?pbjs_debug=trues[]} - an array of bids
+ * @return ServerRequest Info describing the request to the server.
+ */
+function buildRequests(validBidRequests, bidderRequest) {
+  const { refererInfo = {}, gdprConsent = {}, uspConsent } = bidderRequest;
+  const requests = validBidRequests.map(req => {
+    const request = {};
+    request.bidId = req.bidId;
+    request.banner = deepAccess(req, 'mediaTypes.banner');
+    request.auctionId = req.auctionId;
+    request.transactionId = req.transactionId;
+    request.sizes = parseSizesInput(getAdUnitSizes(req));
+    request.schain = req.schain;
+    request.location = {
+      page: refererInfo.page,
+      location: refererInfo.location,
+      domain: refererInfo.domain,
+      whost: window.location.host,
+      ref: refererInfo.ref,
+      isAmp: refererInfo.isAmp
+    };
+    request.device = {
+      ua: navigator.userAgent,
+      lang: navigator.language
+    };
+    request.env = {
+      env: req.params.env,
+      placement: req.params.placement
+    };
+    request.ortb2 = req.ortb2;
+    request.ortb2Imp = req.ortb2Imp;
+    request.tz = new Date().getTimezoneOffset();
+    request.ext = req.params.ext;
+    request.bc = req.bidRequestsCount;
+    request.floor = getBidFloor(req);
+
+    if (req.userIdAsEids && req.userIdAsEids.length !== 0) {
+      request.userEids = req.userIdAsEids;
+    } else {
+      request.userEids = [];
+    }
+    if (gdprConsent.gdprApplies) {
+      request.gdprApplies = Number(gdprConsent.gdprApplies);
+      request.consentString = gdprConsent.consentString;
+    } else {
+      request.gdprApplies = 0;
+      request.consentString = '';
+    }
+    if (uspConsent) {
+      request.usPrivacy = uspConsent;
+    } else {
+      request.usPrivacy = '';
+    }
+    if (config.getConfig('coppa')) {
+      request.coppa = 1;
+    } else {
+      request.coppa = 0;
+    }
+
+    const video = deepAccess(req, 'mediaTypes.video');
+    if (video) {
+      request.sizes = parseSizesInput(deepAccess(req, 'mediaTypes.video.playerSize'));
+      request.video = video;
+    }
+
+    return request;
+  });
+
+  return {
+    method: 'POST',
+    url: ENDPOINT,
+    data: JSON.stringify(requests),
+    withCredentials: true,
+    bidderRequest,
+    options: {
+      contentType: 'application/json'
+    }
+  };
+}
+
+/**
+ * Unpack the response from the server into a list of bids.
+ *
+ * @param {ServerResponse} serverResponse A successful response from the server.
+ * @return {Bid[]} An array of bids which were nested inside the server.
+ */
+function interpretResponse(serverResponse, { bidderRequest }) {
+  const response = [];
+  if (!isArray(deepAccess(serverResponse, 'body.data'))) {
+    return response;
+  }
+
+  serverResponse.body.data.forEach(serverBid => {
+    const bid = {
+      requestId: bidderRequest.bidId,
+      dealId: bidderRequest.dealId || null,
+      ...serverBid
+    };
+    response.push(bid);
+  });
+
+  return response;
+}
+
+/**
+* Register the user sync pixels which should be dropped after the auction.
+*
+* @param {SyncOptions} syncOptions Which user syncs are allowed?
+* @param {ServerResponse[]} serverResponses List of server's responses.
+* @return {UserSync[]} The user syncs which should be dropped.
+*/
+function getUserSyncs(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '') {
+  const syncs = [];
+  const pixels = deepAccess(serverResponses, '0.body.data.0.ext.pixels');
+
+  if ((syncOptions.iframeEnabled || syncOptions.pixelEnabled) && isArray(pixels) && pixels.length !== 0) {
+    const gdprFlag = `&gdpr=${gdprConsent.gdprApplies ? 1 : 0}`;
+    const gdprString = `&gdpr_consent=${encodeURIComponent((gdprConsent.consentString || ''))}`;
+    const usPrivacy = `us_privacy=${encodeURIComponent(uspConsent)}`;
+
+    pixels.forEach(pixel => {
+      const [ type, url ] = pixel;
+      const sync = { type, url: `${url}&${usPrivacy}${gdprFlag}${gdprString}` };
+      if (type === 'iframe' && syncOptions.iframeEnabled) {
+        syncs.push(sync)
+      } else if (type === 'image' && syncOptions.pixelEnabled) {
+        syncs.push(sync)
+      }
+    });
+  }
+
+  return syncs;
+}
+
+/**
+* Get valid floor value from getFloor fuction.
+*
+* @param {Object} bid Current bid request.
+* @return {null|Number} Returns floor value when bid.getFloor is function and returns valid floor object with USD currency, otherwise returns null.
+*/
+export function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return null;
+  }
+
+  let floor = bid.getFloor({
+    currency: CUR,
+    mediaType: '*',
+    size: '*'
+  });
+
+  if (typeof floor === 'object' && !isNaN(floor.floor) && floor.currency === CUR) {
+    return floor.floor;
+  }
+
+  return null;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: [ 'xeworks', 'lunamediax' ],
+  supportedMediaTypes: [ BANNER, VIDEO ],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs
+}
+
+registerBidder(spec);
diff --git a/modules/xeBidAdapter.md b/modules/xeBidAdapter.md
new file mode 100644
index 00000000000..aad00cb45e8
--- /dev/null
+++ b/modules/xeBidAdapter.md
@@ -0,0 +1,54 @@
+# Overview
+
+```
+Module Name: xe Bidder Adapter
+Module Type: xe Bidder Adapter
+Maintainer: dima@xe.works
+```
+
+# Description
+
+Module that connects to xe.works demand sources
+
+# Test Parameters
+```
+var adUnits = [
+    {
+        code: 'test-banner',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]],
+            }
+        },
+        bids: [
+            {
+                bidder: 'xe',
+                params: {
+                    env: 'xe',
+                    placement: 'test-banner',
+                    ext: {}
+                }
+            }
+        ]
+    },
+    {
+        code: 'test-video',
+        sizes: [ [ 640, 480 ] ],
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'instream',
+                skipppable: true
+            }
+        },
+        bids: [{
+            bidder: 'xe',
+            params: {
+                env: 'xe',
+                placement: 'test-video',
+                ext: {}
+            }
+        }]
+    }
+];
+```
\ No newline at end of file
diff --git a/modules/xendizBidAdapter.md b/modules/xendizBidAdapter.md
deleted file mode 100644
index 4ecabe7070f..00000000000
--- a/modules/xendizBidAdapter.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Overview
-
-Module Name: Xendiz Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: hello@xendiz.com
-
-# Description
-
-Module that connects to Xendiz demand sources
-
-# Test Parameters
-```
-    var adUnits = [
-           {
-               code: 'test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: "xendiz",
-                       params: {
-                           pid: '00000000-0000-0000-0000-000000000000'
-                       }
-                   }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[300, 50]],
-               bids: [
-                   {
-                       bidder: "xendiz",
-                       params: {
-                           pid: '00000000-0000-0000-0000-000000000000',
-                           ext: {
-                              uid: '550e8400-e29b-41d4-a716-446655440000'
-                           }
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/xhbBidAdapter.js b/modules/xhbBidAdapter.js
deleted file mode 100644
index 9363eb97ddc..00000000000
--- a/modules/xhbBidAdapter.js
+++ /dev/null
@@ -1,457 +0,0 @@
-import { Renderer } from '../src/Renderer.js';
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const BIDDER_CODE = 'xhb';
-const URL = 'https://ib.adnxs.com/ut/v3/prebid';
-const VIDEO_TARGETING = ['id', 'mimes', 'minduration', 'maxduration',
-  'startdelay', 'skippable', 'playback_method', 'frameworks'];
-const USER_PARAMS = ['age', 'external_uid', 'segments', 'gender', 'dnt', 'language'];
-const NATIVE_MAPPING = {
-  body: 'description',
-  cta: 'ctatext',
-  image: {
-    serverName: 'main_image',
-    requiredParams: { required: true },
-    minimumParams: { sizes: [{}] },
-  },
-  icon: {
-    serverName: 'icon',
-    requiredParams: { required: true },
-    minimumParams: { sizes: [{}] },
-  },
-  sponsoredBy: 'sponsored_by',
-};
-const SOURCE = 'pbjs';
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: [],
-  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function(bid) {
-    return !!(bid.params.placementId || (bid.params.member && bid.params.invCode));
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function(bidRequests, bidderRequest) {
-    const tags = bidRequests.map(bidToTag);
-    const userObjBid = find(bidRequests, hasUserInfo);
-    let userObj;
-    if (userObjBid) {
-      userObj = {};
-      Object.keys(userObjBid.params.user)
-        .filter(param => includes(USER_PARAMS, param))
-        .forEach(param => userObj[param] = userObjBid.params.user[param]);
-    }
-
-    const memberIdBid = find(bidRequests, hasMemberId);
-    const member = memberIdBid ? parseInt(memberIdBid.params.member, 10) : 0;
-
-    const payload = {
-      tags: [...tags],
-      user: userObj,
-      sdk: {
-        source: SOURCE,
-        version: '$prebid.version$'
-      }
-    };
-    if (member > 0) {
-      payload.member_id = member;
-    }
-
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      // note - objects for impbus use underscore instead of camelCase
-      payload.gdpr_consent = {
-        consent_string: bidderRequest.gdprConsent.consentString,
-        consent_required: bidderRequest.gdprConsent.gdprApplies
-      };
-    }
-
-    const payloadString = JSON.stringify(payload);
-    return {
-      method: 'POST',
-      url: URL,
-      data: payloadString,
-      bidderRequest
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function(serverResponse, {bidderRequest}) {
-    serverResponse = serverResponse.body;
-    const bids = [];
-    if (!serverResponse || serverResponse.error) {
-      let errorMessage = `in response for ${bidderRequest.bidderCode} adapter`;
-      if (serverResponse && serverResponse.error) { errorMessage += `: ${serverResponse.error}`; }
-      utils.logError(errorMessage);
-      return bids;
-    }
-
-    if (serverResponse.tags) {
-      serverResponse.tags.forEach(serverBid => {
-        const rtbBid = getRtbBid(serverBid);
-        if (rtbBid) {
-          if (rtbBid.cpm !== 0 && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
-            const bid = newBid(serverBid, rtbBid, bidderRequest);
-            bid.mediaType = parseMediaType(rtbBid);
-            bids.push(bid);
-          }
-        }
-      });
-    }
-    return bids;
-  },
-
-  getUserSyncs: function(syncOptions) {
-    if (syncOptions.iframeEnabled) {
-      return [{
-        type: 'iframe',
-        url: 'https://acdn.adnxs.com/dmp/async_usersync.html'
-      }];
-    }
-  }
-};
-
-function newRenderer(adUnitCode, rtbBid, rendererOptions = {}) {
-  const renderer = Renderer.install({
-    id: rtbBid.renderer_id,
-    url: rtbBid.renderer_url,
-    config: rendererOptions,
-    loaded: false,
-  });
-
-  try {
-    renderer.setRender(outstreamRender);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-
-  renderer.setEventHandlers({
-    impression: () => utils.logMessage('xhb outstream video impression event'),
-    loaded: () => utils.logMessage('xhb outstream video loaded event'),
-    ended: () => {
-      utils.logMessage('xhb outstream renderer video event');
-      document.querySelector(`#${adUnitCode}`).style.display = 'none';
-    }
-  });
-  return renderer;
-}
-
-/* Turn keywords parameter into ut-compatible format */
-function getKeywords(keywords) {
-  let arrs = [];
-
-  utils._each(keywords, (v, k) => {
-    if (utils.isArray(v)) {
-      let values = [];
-      utils._each(v, (val) => {
-        val = utils.getValueString('keywords.' + k, val);
-        if (val) { values.push(val); }
-      });
-      v = values;
-    } else {
-      v = utils.getValueString('keywords.' + k, v);
-      if (utils.isStr(v)) {
-        v = [v];
-      } else {
-        return;
-      } // unsuported types - don't send a key
-    }
-    arrs.push({key: k, value: v});
-  });
-
-  return arrs;
-}
-
-/**
- * Unpack the Server's Bid into a Prebid-compatible one.
- * @param serverBid
- * @param rtbBid
- * @param bidderRequest
- * @return Bid
- */
-function newBid(serverBid, rtbBid, bidderRequest) {
-  const bid = {
-    requestId: serverBid.uuid,
-    cpm: 0.00,
-    creativeId: rtbBid.creative_id,
-    dealId: 99999999,
-    currency: 'USD',
-    netRevenue: true,
-    ttl: 300,
-    appnexus: {
-      buyerMemberId: rtbBid.buyer_member_id
-    }
-  };
-
-  if (rtbBid.rtb.video) {
-    Object.assign(bid, {
-      width: rtbBid.rtb.video.player_width,
-      height: rtbBid.rtb.video.player_height,
-      vastUrl: rtbBid.rtb.video.asset_url,
-      vastImpUrl: rtbBid.notify_url,
-      ttl: 3600
-    });
-    // This supports Outstream Video
-    if (rtbBid.renderer_url) {
-      const rendererOptions = utils.deepAccess(
-        bidderRequest.bids[0],
-        'renderer.options'
-      );
-
-      Object.assign(bid, {
-        adResponse: serverBid,
-        renderer: newRenderer(bid.adUnitCode, rtbBid, rendererOptions)
-      });
-      bid.adResponse.ad = bid.adResponse.ads[0];
-      bid.adResponse.ad.video = bid.adResponse.ad.rtb.video;
-    }
-  } else if (rtbBid.rtb[NATIVE]) {
-    const nativeAd = rtbBid.rtb[NATIVE];
-    bid[NATIVE] = {
-      title: nativeAd.title,
-      body: nativeAd.desc,
-      cta: nativeAd.ctatext,
-      sponsoredBy: nativeAd.sponsored,
-      clickUrl: nativeAd.link.url,
-      clickTrackers: nativeAd.link.click_trackers,
-      impressionTrackers: nativeAd.impression_trackers,
-      javascriptTrackers: nativeAd.javascript_trackers,
-    };
-    if (nativeAd.main_img) {
-      bid['native'].image = {
-        url: nativeAd.main_img.url,
-        height: nativeAd.main_img.height,
-        width: nativeAd.main_img.width,
-      };
-    }
-    if (nativeAd.icon) {
-      bid['native'].icon = {
-        url: nativeAd.icon.url,
-        height: nativeAd.icon.height,
-        width: nativeAd.icon.width,
-      };
-    }
-  } else {
-    Object.assign(bid, {
-      width: rtbBid.rtb.banner.width,
-      height: rtbBid.rtb.banner.height,
-      ad: rtbBid.rtb.banner.content
-    });
-    try {
-      const url = rtbBid.rtb.trackers[0].impression_urls[0];
-      const tracker = utils.createTrackPixelHtml(url);
-      bid.ad += tracker;
-    } catch (error) {
-      utils.logError('Error appending tracking pixel', error);
-    }
-  }
-
-  return bid;
-}
-
-function bidToTag(bid) {
-  const tag = {};
-  tag.sizes = transformSizes(bid.sizes);
-  tag.primary_size = tag.sizes[0];
-  tag.ad_types = [];
-  tag.uuid = bid.bidId;
-  if (bid.params.placementId) {
-    tag.id = parseInt(bid.params.placementId, 10);
-  } else {
-    tag.code = bid.params.invCode;
-  }
-  tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
-  tag.use_pmt_rule = bid.params.usePaymentRule || false;
-  tag.prebid = true;
-  tag.disable_psa = true;
-  if (bid.params.reserve) {
-    tag.reserve = bid.params.reserve;
-  }
-  if (bid.params.position) {
-    tag.position = {'above': 1, 'below': 2}[bid.params.position] || 0;
-  }
-  if (bid.params.trafficSourceCode) {
-    tag.traffic_source_code = bid.params.trafficSourceCode;
-  }
-  if (bid.params.privateSizes) {
-    tag.private_sizes = transformSizes(bid.params.privateSizes);
-  }
-  if (bid.params.supplyType) {
-    tag.supply_type = bid.params.supplyType;
-  }
-  if (bid.params.pubClick) {
-    tag.pubclick = bid.params.pubClick;
-  }
-  if (bid.params.extInvCode) {
-    tag.ext_inv_code = bid.params.extInvCode;
-  }
-  if (bid.params.externalImpId) {
-    tag.external_imp_id = bid.params.externalImpId;
-  }
-  if (!utils.isEmpty(bid.params.keywords)) {
-    tag.keywords = getKeywords(bid.params.keywords);
-  }
-
-  if (bid.mediaType === NATIVE || utils.deepAccess(bid, `mediaTypes.${NATIVE}`)) {
-    tag.ad_types.push(NATIVE);
-
-    if (bid.nativeParams) {
-      const nativeRequest = buildNativeRequest(bid.nativeParams);
-      tag[NATIVE] = {layouts: [nativeRequest]};
-    }
-  }
-
-  const videoMediaType = utils.deepAccess(bid, `mediaTypes.${VIDEO}`);
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
-
-  if (bid.mediaType === VIDEO || videoMediaType) {
-    tag.ad_types.push(VIDEO);
-  }
-
-  // instream gets vastUrl, outstream gets vastXml
-  if (bid.mediaType === VIDEO || (videoMediaType && context !== 'outstream')) {
-    tag.require_asset_url = true;
-  }
-
-  if (bid.params.video) {
-    tag.video = {};
-    // place any valid video params on the tag
-    Object.keys(bid.params.video)
-      .filter(param => includes(VIDEO_TARGETING, param))
-      .forEach(param => tag.video[param] = bid.params.video[param]);
-  }
-
-  if (
-    (utils.isEmpty(bid.mediaType) && utils.isEmpty(bid.mediaTypes)) ||
-    (bid.mediaType === BANNER || (bid.mediaTypes && bid.mediaTypes[BANNER]))
-  ) {
-    tag.ad_types.push(BANNER);
-  }
-
-  return tag;
-}
-
-/* Turn bid request sizes into ut-compatible format */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  let sizeObj = {};
-
-  if (utils.isArray(requestSizes) && requestSizes.length === 2 &&
-    !utils.isArray(requestSizes[0])) {
-    sizeObj.width = parseInt(requestSizes[0], 10);
-    sizeObj.height = parseInt(requestSizes[1], 10);
-    sizes.push(sizeObj);
-  } else if (typeof requestSizes === 'object') {
-    for (let i = 0; i < requestSizes.length; i++) {
-      let size = requestSizes[i];
-      sizeObj = {};
-      sizeObj.width = parseInt(size[0], 10);
-      sizeObj.height = parseInt(size[1], 10);
-      sizes.push(sizeObj);
-    }
-  }
-
-  return sizes;
-}
-
-function hasUserInfo(bid) {
-  return !!bid.params.user;
-}
-
-function hasMemberId(bid) {
-  return !!parseInt(bid.params.member, 10);
-}
-
-function getRtbBid(tag) {
-  return tag && tag.ads && tag.ads.length && find(tag.ads, ad => ad.rtb);
-}
-
-function buildNativeRequest(params) {
-  const request = {};
-
-  // map standard prebid native asset identifier to /ut parameters
-  // e.g., tag specifies `body` but /ut only knows `description`.
-  // mapping may be in form {tag: '<server name>'} or
-  // {tag: {serverName: '<server name>', requiredParams: {...}}}
-  Object.keys(params).forEach(key => {
-    // check if one of the <server name> forms is used, otherwise
-    // a mapping wasn't specified so pass the key straight through
-    const requestKey =
-      (NATIVE_MAPPING[key] && NATIVE_MAPPING[key].serverName) ||
-      NATIVE_MAPPING[key] ||
-      key;
-
-    // required params are always passed on request
-    const requiredParams = NATIVE_MAPPING[key] && NATIVE_MAPPING[key].requiredParams;
-    request[requestKey] = Object.assign({}, requiredParams, params[key]);
-
-    // minimum params are passed if no non-required params given on adunit
-    const minimumParams = NATIVE_MAPPING[key] && NATIVE_MAPPING[key].minimumParams;
-
-    if (requiredParams && minimumParams) {
-      // subtract required keys from adunit keys
-      const adunitKeys = Object.keys(params[key]);
-      const requiredKeys = Object.keys(requiredParams);
-      const remaining = adunitKeys.filter(key => !includes(requiredKeys, key));
-
-      // if none are left over, the minimum params needs to be sent
-      if (remaining.length === 0) {
-        request[requestKey] = Object.assign({}, request[requestKey], minimumParams);
-      }
-    }
-  });
-
-  return request;
-}
-
-function outstreamRender(bid) {
-  // push to render queue because ANOutstreamVideo may not be loaded yet
-  bid.renderer.push(() => {
-    window.ANOutstreamVideo.renderAd({
-      tagId: bid.adResponse.tag_id,
-      sizes: [bid.getSize().split('x')],
-      targetId: bid.adUnitCode, // target div id to render video
-      uuid: bid.adResponse.uuid,
-      adResponse: bid.adResponse,
-      rendererOptions: bid.renderer.getConfig()
-    }, handleOutstreamRendererEvents.bind(null, bid));
-  });
-}
-
-function handleOutstreamRendererEvents(bid, id, eventName) {
-  bid.renderer.handleVideoEvent({ id, eventName });
-}
-
-function parseMediaType(rtbBid) {
-  const adType = rtbBid.ad_type;
-  if (adType === VIDEO) {
-    return VIDEO;
-  } else if (adType === NATIVE) {
-    return NATIVE;
-  } else {
-    return BANNER;
-  }
-}
-
-registerBidder(spec);
diff --git a/modules/xhbBidAdapter.md b/modules/xhbBidAdapter.md
deleted file mode 100644
index bb95f4f499c..00000000000
--- a/modules/xhbBidAdapter.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Overview
-
-```
-Module Name:  XHB Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer:   daniel.hoffmann@xaxis.com 
-```
-
-# Description
-
-Connects to Appnexus exchange for bids.
-
-XHB bid adapter supports Banner, Video (instream and outstream) and Native.
-
-# Test Parameters
-```
-var adUnits = [
-   // Banner adUnit
-   {
-       code: 'banner-div',
-       sizes: [[300, 250], [300,600]],
-       bids: [{
-         bidder: 'xhb',
-         params: {
-           placementId: '10433394'
-         }
-       }]
-   },
-   // Native adUnit
-   {
-      code: 'native-div',
-      sizes: [[300, 250], [300,600]],
-      mediaTypes: {
-        native: {
-          title: {
-            required: true,
-            len: 80
-          },
-          body: {
-            required: true
-          },
-          image: {
-            required: true
-          },
-          clickUrl: {
-            required: true
-          },
-        }
-      },
-      bids: [{
-        bidder: 'xhb',
-        params: {
-          placementId: '9880618'
-        }
-      }]
-   },
-   // Video instream adUnit
-   {
-      code: 'video-instream',
-      sizes: [640, 480],
-      mediaTypes: {
-        video: {
-          context: 'instream'
-        },
-      },
-      bids: [{
-        bidder: 'xhb',
-        params: {
-          placementId: '9333431',
-          video: {
-            skippable: true,
-            playback_methods: ['auto_play_sound_off']
-          }
-        }
-      }]
-   },
-   // Video outstream adUnit
-   {
-     code: 'video-outstream',
-     sizes: [[640, 480]],
-     mediaTypes: {
-       video: {
-         context: 'outstream'
-       }
-     },
-     bids: [
-       {
-         bidder: 'xhb',
-         params: {
-           placementId: '5768085',
-           video: {
-             skippable: true,
-             playback_method: ['auto_play_sound_off']
-           }
-         }
-       }
-     ]
-   }
-];
-```
diff --git a/modules/yahoosspBidAdapter.js b/modules/yahoosspBidAdapter.js
new file mode 100644
index 00000000000..9dd635a990f
--- /dev/null
+++ b/modules/yahoosspBidAdapter.js
@@ -0,0 +1,642 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { deepAccess, isFn, isStr, isNumber, isArray, isEmpty, isPlainObject, generateUUID, logInfo, logWarn } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { Renderer } from '../src/Renderer.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+
+const INTEGRATION_METHOD = 'prebid.js';
+const BIDDER_CODE = 'yahoossp';
+const GVLID = 25;
+const ADAPTER_VERSION = '1.0.2';
+const PREBID_VERSION = '$prebid.version$';
+const DEFAULT_BID_TTL = 300;
+const TEST_MODE_DCN = '8a969516017a7a396ec539d97f540011';
+const TEST_MODE_PUBID_DCN = '1234567';
+const TEST_MODE_BANNER_POS = '8a969978017a7aaabab4ab0bc01a0009';
+const TEST_MODE_VIDEO_POS = '8a96958a017a7a57ac375d50c0c700cc';
+const DEFAULT_RENDERER_TIMEOUT = 700;
+const DEFAULT_CURRENCY = 'USD';
+const SSP_ENDPOINT_DCN_POS = 'https://c2shb.pubgw.yahoo.com/bidRequest';
+const SSP_ENDPOINT_PUBID = 'https://c2shb.pubgw.yahoo.com/admax/bid/partners/PBJS';
+const SUPPORTED_USER_ID_SOURCES = [
+  'admixer.net',
+  'adserver.org',
+  'adtelligent.com',
+  'akamai.com',
+  'amxrtb.com',
+  'audigent.com',
+  'britepool.com',
+  'criteo.com',
+  'crwdcntrl.net',
+  'deepintent.com',
+  'epsilon.com',
+  'hcn.health',
+  'id5-sync.com',
+  'idx.lat',
+  'intentiq.com',
+  'intimatemerger.com',
+  'liveintent.com',
+  'liveramp.com',
+  'mediawallahscript.com',
+  'merkleinc.com',
+  'netid.de',
+  'neustar.biz',
+  'nextroll.com',
+  'novatiq.com',
+  'parrable.com',
+  'pubcid.org',
+  'quantcast.com',
+  'tapad.com',
+  'uidapi.com',
+  'verizonmedia.com',
+  'yahoo.com',
+  'zeotap.com'
+];
+
+/* Utility functions */
+
+function getSize(size) {
+  return {
+    w: parseInt(size[0]),
+    h: parseInt(size[1])
+  }
+}
+
+function transformSizes(sizes) {
+  if (isArray(sizes) && sizes.length === 2 && !isArray(sizes[0])) {
+    return [ getSize(sizes) ];
+  }
+  return sizes.map(getSize);
+}
+
+function extractUserSyncUrls(syncOptions, pixels) {
+  let itemsRegExp = /(img|iframe)[\s\S]*?src\s*=\s*("|')(.*?)\2/gi;
+  let tagNameRegExp = /\w*(?=\s)/;
+  let srcRegExp = /src=("|')(.*?)\1/;
+  let userSyncObjects = [];
+
+  if (pixels) {
+    let matchedItems = pixels.match(itemsRegExp);
+    if (matchedItems) {
+      matchedItems.forEach(item => {
+        let tagName = item.match(tagNameRegExp)[0];
+        let url = item.match(srcRegExp)[2];
+
+        if (tagName && url) {
+          let tagType = tagName.toLowerCase() === 'img' ? 'image' : 'iframe';
+          if ((!syncOptions.iframeEnabled && tagType === 'iframe') ||
+                (!syncOptions.pixelEnabled && tagType === 'image')) {
+            return;
+          }
+          userSyncObjects.push({
+            type: tagType,
+            url: url
+          });
+        }
+      });
+    }
+  }
+
+  return userSyncObjects;
+}
+
+function getSupportedEids(bid) {
+  if (isArray(deepAccess(bid, 'userIdAsEids'))) {
+    return bid.userIdAsEids.filter(eid => {
+      return SUPPORTED_USER_ID_SOURCES.indexOf(eid.source) !== -1;
+    });
+  }
+  return [];
+}
+
+function isSecure(bid) {
+  return deepAccess(bid, 'params.bidOverride.imp.secure') || (document.location.protocol === 'https:') ? 1 : 0;
+};
+
+function getPubIdMode(bid) {
+  let pubIdMode;
+  if (deepAccess(bid, 'params.pubId')) {
+    pubIdMode = true;
+  } else if (deepAccess(bid, 'params.dcn') && deepAccess(bid, 'params.pos')) {
+    pubIdMode = false;
+  };
+  return pubIdMode;
+};
+
+function getAdapterMode() {
+  let adapterMode = config.getConfig('yahoossp.mode');
+  adapterMode = adapterMode ? adapterMode.toLowerCase() : undefined;
+  if (typeof adapterMode === 'undefined' || adapterMode === BANNER) {
+    return BANNER;
+  } else if (adapterMode === VIDEO) {
+    return VIDEO;
+  } else if (adapterMode === 'all') {
+    return '*';
+  }
+};
+
+function getResponseFormat(bid) {
+  const adm = bid.adm;
+  if (adm.indexOf('o2playerSettings') !== -1 || adm.indexOf('YAHOO.VideoPlatform.VideoPlayer') !== -1 || adm.indexOf('AdPlacement') !== -1) {
+    return BANNER;
+  } else if (adm.indexOf('VAST') !== -1) {
+    return VIDEO;
+  }
+};
+
+function getFloorModuleData(bid) {
+  const adapterMode = getAdapterMode();
+  const getFloorRequestObject = {
+    currency: deepAccess(bid, 'params.bidOverride.cur') || DEFAULT_CURRENCY,
+    mediaType: adapterMode,
+    size: '*'
+  };
+  return (isFn(bid.getFloor)) ? bid.getFloor(getFloorRequestObject) : false;
+};
+
+function filterBidRequestByMode(validBidRequests) {
+  const mediaTypesMode = getAdapterMode();
+  let result = [];
+  if (mediaTypesMode === BANNER) {
+    result = validBidRequests.filter(bid => {
+      return Object.keys(bid.mediaTypes).some(item => item === BANNER);
+    });
+  } else if (mediaTypesMode === VIDEO) {
+    result = validBidRequests.filter(bid => {
+      return Object.keys(bid.mediaTypes).some(item => item === VIDEO);
+    });
+  } else if (mediaTypesMode === '*') {
+    result = validBidRequests.filter(bid => {
+      return Object.keys(bid.mediaTypes).some(item => item === BANNER || item === VIDEO);
+    });
+  };
+  return result;
+};
+
+function validateAppendObject(validationType, allowedKeys, inputObject, appendToObject) {
+  const outputObject = {
+    ...appendToObject
+  };
+
+  for (const objectKey in inputObject) {
+    switch (validationType) {
+      case 'string':
+        if (allowedKeys.indexOf(objectKey) !== -1 && isStr(inputObject[objectKey])) {
+          outputObject[objectKey] = inputObject[objectKey];
+        };
+        break;
+      case 'number':
+        if (allowedKeys.indexOf(objectKey) !== -1 && isNumber(inputObject[objectKey])) {
+          outputObject[objectKey] = inputObject[objectKey];
+        };
+        break;
+
+      case 'array':
+        if (allowedKeys.indexOf(objectKey) !== -1 && isArray(inputObject[objectKey])) {
+          outputObject[objectKey] = inputObject[objectKey];
+        };
+        break;
+      case 'object':
+        if (allowedKeys.indexOf(objectKey) !== -1 && isPlainObject(inputObject[objectKey])) {
+          outputObject[objectKey] = inputObject[objectKey];
+        };
+        break;
+      case 'objectAllKeys':
+        if (isPlainObject(inputObject)) {
+          outputObject[objectKey] = inputObject[objectKey];
+        };
+        break;
+    };
+  };
+  return outputObject;
+};
+
+function getTtl(bidderRequest) {
+  const globalTTL = config.getConfig('yahoossp.ttl');
+  return globalTTL ? validateTTL(globalTTL) : validateTTL(deepAccess(bidderRequest, 'params.ttl'));
+};
+
+function validateTTL(ttl) {
+  return (isNumber(ttl) && ttl > 0 && ttl < 3600) ? ttl : DEFAULT_BID_TTL
+};
+
+function isNotEmptyStr(value) {
+  return (isStr(value) && value.length > 0);
+};
+
+function generateOpenRtbObject(bidderRequest, bid) {
+  if (bidderRequest) {
+    let outBoundBidRequest = {
+      id: generateUUID(),
+      cur: [getFloorModuleData(bidderRequest).currency || deepAccess(bid, 'params.bidOverride.cur') || DEFAULT_CURRENCY],
+      imp: [],
+      site: {
+        page: deepAccess(bidderRequest, 'refererInfo.page'),
+      },
+      device: {
+        dnt: 0,
+        ua: navigator.userAgent,
+        ip: deepAccess(bid, 'params.bidOverride.device.ip') || deepAccess(bid, 'params.ext.ip') || undefined,
+        w: window.screen.width,
+        h: window.screen.height
+      },
+      regs: {
+        ext: {
+          'us_privacy': bidderRequest.uspConsent ? bidderRequest.uspConsent : '',
+          gdpr: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+        }
+      },
+      source: {
+        ext: {
+          hb: 1,
+          adapterver: ADAPTER_VERSION,
+          prebidver: PREBID_VERSION,
+          integration: {
+            name: INTEGRATION_METHOD,
+            ver: PREBID_VERSION
+          }
+        },
+        fd: 1
+      },
+      user: {
+        ext: {
+          consent: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies
+            ? bidderRequest.gdprConsent.consentString : '',
+          eids: getSupportedEids(bid)
+        }
+      }
+    };
+
+    if (getPubIdMode(bid) === true) {
+      outBoundBidRequest.site.publisher = {
+        id: bid.params.pubId
+      }
+      if (deepAccess(bid, 'params.bidOverride.site.id') || deepAccess(bid, 'params.siteId')) {
+        outBoundBidRequest.site.id = deepAccess(bid, 'params.bidOverride.site.id') || bid.params.siteId;
+      }
+    } else {
+      outBoundBidRequest.site.id = bid.params.dcn;
+    };
+
+    if (bidderRequest.ortb2?.regs?.gpp) {
+      outBoundBidRequest.regs.ext.gpp = bidderRequest.ortb2.regs.gpp;
+      outBoundBidRequest.regs.ext.gpp_sid = bidderRequest.ortb2.regs.gpp_sid
+    };
+
+    if (bidderRequest.ortb2) {
+      outBoundBidRequest = appendFirstPartyData(outBoundBidRequest, bid);
+    };
+
+    const schainData = deepAccess(bid, 'schain.nodes');
+    if (isArray(schainData) && schainData.length > 0) {
+      outBoundBidRequest.source.ext.schain = bid.schain;
+      outBoundBidRequest.source.ext.schain.nodes[0].rid = outBoundBidRequest.id;
+    };
+
+    return outBoundBidRequest;
+  };
+};
+
+function appendImpObject(bid, openRtbObject) {
+  const mediaTypeMode = getAdapterMode();
+
+  if (openRtbObject && bid) {
+    const impObject = {
+      id: bid.bidId,
+      secure: isSecure(bid),
+      bidfloor: getFloorModuleData(bid).floor || deepAccess(bid, 'params.bidOverride.imp.bidfloor')
+    };
+
+    if (bid.mediaTypes.banner && (typeof mediaTypeMode === 'undefined' || mediaTypeMode === BANNER || mediaTypeMode === '*')) {
+      impObject.banner = {
+        mimes: bid.mediaTypes.banner.mimes || ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: transformSizes(bid.sizes)
+      };
+      if (bid.mediaTypes.banner.pos) {
+        impObject.banner.pos = bid.mediaTypes.banner.pos;
+      };
+    };
+
+    if (bid.mediaTypes.video && (mediaTypeMode === VIDEO || mediaTypeMode === '*')) {
+      const playerSize = transformSizes(bid.mediaTypes.video.playerSize);
+      impObject.video = {
+        mimes: deepAccess(bid, 'params.bidOverride.imp.video.mimes') || bid.mediaTypes.video.mimes || ['video/mp4', 'application/javascript'],
+        w: deepAccess(bid, 'params.bidOverride.imp.video.w') || playerSize[0].w,
+        h: deepAccess(bid, 'params.bidOverride.imp.video.h') || playerSize[0].h,
+        maxbitrate: deepAccess(bid, 'params.bidOverride.imp.video.maxbitrate') || bid.mediaTypes.video.maxbitrate || undefined,
+        maxduration: deepAccess(bid, 'params.bidOverride.imp.video.maxduration') || bid.mediaTypes.video.maxduration || undefined,
+        minduration: deepAccess(bid, 'params.bidOverride.imp.video.minduration') || bid.mediaTypes.video.minduration || undefined,
+        api: deepAccess(bid, 'params.bidOverride.imp.video.api') || bid.mediaTypes.video.api || [2],
+        delivery: deepAccess(bid, 'params.bidOverride.imp.video.delivery') || bid.mediaTypes.video.delivery || undefined,
+        pos: deepAccess(bid, 'params.bidOverride.imp.video.pos') || bid.mediaTypes.video.pos || undefined,
+        playbackmethod: deepAccess(bid, 'params.bidOverride.imp.video.playbackmethod') || bid.mediaTypes.video.playbackmethod || undefined,
+        placement: deepAccess(bid, 'params.bidOverride.imp.video.placement') || bid.mediaTypes.video.placement || undefined,
+        linearity: deepAccess(bid, 'params.bidOverride.imp.video.linearity') || bid.mediaTypes.video.linearity || 1,
+        protocols: deepAccess(bid, 'params.bidOverride.imp.video.protocols') || bid.mediaTypes.video.protocols || [2, 5],
+        startdelay: deepAccess(bid, 'params.bidOverride.imp.video.startdelay') || bid.mediaTypes.video.startdelay || 0,
+        rewarded: deepAccess(bid, 'params.bidOverride.imp.video.rewarded') || undefined,
+      }
+    }
+
+    impObject.ext = {
+      dfp_ad_unit_code: bid.adUnitCode
+    };
+
+    if (deepAccess(bid, 'params.kvp') && isPlainObject(bid.params.kvp)) {
+      impObject.ext.kvs = {};
+      for (const key in bid.params.kvp) {
+        if (isStr(bid.params.kvp[key]) || isNumber(bid.params.kvp[key])) {
+          impObject.ext.kvs[key] = bid.params.kvp[key];
+        } else if (isArray(bid.params.kvp[key])) {
+          const array = bid.params.kvp[key];
+          if (array.every(value => isStr(value)) || array.every(value => isNumber(value))) {
+            impObject.ext.kvs[key] = bid.params.kvp[key];
+          }
+        }
+      }
+    };
+
+    if (deepAccess(bid, 'ortb2Imp.ext.data') && isPlainObject(bid.ortb2Imp.ext.data)) {
+      impObject.ext.data = bid.ortb2Imp.ext.data;
+    };
+
+    if (deepAccess(bid, 'ortb2Imp.instl') && isNumber(bid.ortb2Imp.instl) && (bid.ortb2Imp.instl === 1)) {
+      impObject.instl = bid.ortb2Imp.instl;
+    };
+
+    if (getPubIdMode(bid) === false) {
+      impObject.tagid = bid.params.pos;
+      impObject.ext.pos = bid.params.pos;
+    } else if (deepAccess(bid, 'params.placementId')) {
+      impObject.tagid = bid.params.placementId
+    };
+
+    openRtbObject.imp.push(impObject);
+  };
+};
+
+function appendFirstPartyData(outBoundBidRequest, bid) {
+  const ortb2Object = bid.ortb2;
+  const siteObject = deepAccess(ortb2Object, 'site') || undefined;
+  const siteContentObject = deepAccess(siteObject, 'content') || undefined;
+  const siteContentDataArray = deepAccess(siteObject, 'content.data') || undefined;
+  const appContentObject = deepAccess(ortb2Object, 'app.content') || undefined;
+  const appContentDataArray = deepAccess(ortb2Object, 'app.content.data') || undefined;
+  const userObject = deepAccess(ortb2Object, 'user') || undefined;
+
+  if (siteObject && isPlainObject(siteObject)) {
+    const allowedSiteStringKeys = ['name', 'domain', 'page', 'ref', 'keywords', 'search'];
+    const allowedSiteArrayKeys = ['cat', 'sectioncat', 'pagecat'];
+    const allowedSiteObjectKeys = ['ext'];
+    outBoundBidRequest.site = validateAppendObject('string', allowedSiteStringKeys, siteObject, outBoundBidRequest.site);
+    outBoundBidRequest.site = validateAppendObject('array', allowedSiteArrayKeys, siteObject, outBoundBidRequest.site);
+    outBoundBidRequest.site = validateAppendObject('object', allowedSiteObjectKeys, siteObject, outBoundBidRequest.site);
+  };
+
+  if (siteContentObject && isPlainObject(siteContentObject)) {
+    const allowedContentStringKeys = ['id', 'title', 'series', 'season', 'genre', 'contentrating', 'language'];
+    const allowedContentNumberkeys = ['episode', 'prodq', 'context', 'livestream', 'len'];
+    const allowedContentArrayKeys = ['cat'];
+    const allowedContentObjectKeys = ['ext'];
+    outBoundBidRequest.site.content = validateAppendObject('string', allowedContentStringKeys, siteContentObject, outBoundBidRequest.site.content);
+    outBoundBidRequest.site.content = validateAppendObject('number', allowedContentNumberkeys, siteContentObject, outBoundBidRequest.site.content);
+    outBoundBidRequest.site.content = validateAppendObject('array', allowedContentArrayKeys, siteContentObject, outBoundBidRequest.site.content);
+    outBoundBidRequest.site.content = validateAppendObject('object', allowedContentObjectKeys, siteContentObject, outBoundBidRequest.site.content);
+
+    if (siteContentDataArray && isArray(siteContentDataArray)) {
+      siteContentDataArray.every(dataObject => {
+        let newDataObject = {};
+        const allowedContentDataStringKeys = ['id', 'name'];
+        const allowedContentDataArrayKeys = ['segment'];
+        const allowedContentDataObjectKeys = ['ext'];
+        newDataObject = validateAppendObject('string', allowedContentDataStringKeys, dataObject, newDataObject);
+        newDataObject = validateAppendObject('array', allowedContentDataArrayKeys, dataObject, newDataObject);
+        newDataObject = validateAppendObject('object', allowedContentDataObjectKeys, dataObject, newDataObject);
+        outBoundBidRequest.site.content.data = [];
+        outBoundBidRequest.site.content.data.push(newDataObject);
+      });
+    };
+  };
+
+  if (appContentObject && isPlainObject(appContentObject)) {
+    if (appContentDataArray && isArray(appContentDataArray)) {
+      appContentDataArray.every(dataObject => {
+        let newDataObject = {};
+        const allowedContentDataStringKeys = ['id', 'name'];
+        const allowedContentDataArrayKeys = ['segment'];
+        const allowedContentDataObjectKeys = ['ext'];
+        newDataObject = validateAppendObject('string', allowedContentDataStringKeys, dataObject, newDataObject);
+        newDataObject = validateAppendObject('array', allowedContentDataArrayKeys, dataObject, newDataObject);
+        newDataObject = validateAppendObject('object', allowedContentDataObjectKeys, dataObject, newDataObject);
+        outBoundBidRequest.app = {
+          content: {
+            data: []
+          }
+        };
+        outBoundBidRequest.app.content.data.push(newDataObject);
+      });
+    };
+  };
+
+  if (userObject && isPlainObject(userObject)) {
+    const allowedUserStrings = ['id', 'buyeruid', 'gender', 'keywords', 'customdata'];
+    const allowedUserNumbers = ['yob'];
+    const allowedUserArrays = ['data'];
+    const allowedUserObjects = ['ext'];
+    outBoundBidRequest.user = validateAppendObject('string', allowedUserStrings, userObject, outBoundBidRequest.user);
+    outBoundBidRequest.user = validateAppendObject('number', allowedUserNumbers, userObject, outBoundBidRequest.user);
+    outBoundBidRequest.user = validateAppendObject('array', allowedUserArrays, userObject, outBoundBidRequest.user);
+    outBoundBidRequest.user.ext = validateAppendObject('object', allowedUserObjects, userObject, outBoundBidRequest.user.ext);
+  };
+
+  return outBoundBidRequest;
+};
+
+function generateServerRequest({payload, requestOptions, bidderRequest}) {
+  const pubIdMode = getPubIdMode(bidderRequest);
+  let sspEndpoint = config.getConfig('yahoossp.endpoint') || SSP_ENDPOINT_DCN_POS;
+
+  if (pubIdMode === true) {
+    sspEndpoint = config.getConfig('yahoossp.endpoint') || SSP_ENDPOINT_PUBID;
+  };
+
+  if (deepAccess(bidderRequest, 'params.testing.e2etest') === true) {
+    logInfo('yahoossp adapter e2etest mode is active');
+    requestOptions.withCredentials = false;
+
+    if (pubIdMode === true) {
+      payload.site.id = TEST_MODE_PUBID_DCN;
+    } else {
+      const mediaTypeMode = getAdapterMode();
+      payload.site.id = TEST_MODE_DCN;
+      payload.imp.forEach(impObject => {
+        impObject.ext.e2eTestMode = true;
+        if (mediaTypeMode === BANNER) {
+          impObject.tagid = TEST_MODE_BANNER_POS; // banner passback
+        } else if (mediaTypeMode === VIDEO) {
+          impObject.tagid = TEST_MODE_VIDEO_POS; // video passback
+        } else {
+          logWarn('yahoossp adapter e2etest mode does not support yahoossp.mode="all". \n Please specify either "banner" or "video"');
+          logWarn('yahoossp adapter e2etest mode: Please make sure your adUnit matches the yahoossp.mode video or banner');
+        }
+      });
+    }
+  };
+
+  return {
+    url: sspEndpoint,
+    method: 'POST',
+    data: payload,
+    options: requestOptions,
+    bidderRequest: bidderRequest
+  };
+};
+
+function createRenderer(bidderRequest, bidResponse) {
+  const renderer = Renderer.install({
+    url: 'https://s.yimg.com/kp/prebid-outstream-renderer/renderer.js',
+    loaded: false,
+    adUnitCode: bidderRequest.adUnitCode
+  })
+
+  try {
+    renderer.setRender(function(bidResponse) {
+      setTimeout(function() {
+        // eslint-disable-next-line no-undef
+        o2PlayerRender(bidResponse);
+      }, deepAccess(bidderRequest, 'params.testing.renderer.setTimeout') || DEFAULT_RENDERER_TIMEOUT);
+    });
+  } catch (error) {
+    logWarn('yahoossp renderer error: setRender() failed', error);
+  }
+  return renderer;
+}
+/* Utility functions */
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: [],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: function(bid) {
+    const params = bid.params;
+    if (deepAccess(params, 'testing.e2etest') === true) {
+      return true;
+    } else if (
+      isPlainObject(params) &&
+      (isNotEmptyStr(params.pubId) || (isNotEmptyStr(params.dcn) && isNotEmptyStr(params.pos)))
+    ) {
+      return true;
+    } else {
+      logWarn('yahoossp bidder params missing or incorrect, please pass object with either: dcn & pos OR pubId');
+      return false;
+    }
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    if (isEmpty(validBidRequests) || isEmpty(bidderRequest)) {
+      logWarn('yahoossp Adapter: buildRequests called with either empty "validBidRequests" or "bidderRequest"');
+      return undefined;
+    };
+
+    const requestOptions = {
+      contentType: 'application/json',
+      customHeaders: {
+        'x-openrtb-version': '2.5'
+      }
+    };
+
+    requestOptions.withCredentials = hasPurpose1Consent(bidderRequest.gdprConsent);
+
+    const filteredBidRequests = filterBidRequestByMode(validBidRequests);
+
+    if (config.getConfig('yahoossp.singleRequestMode') === true) {
+      const payload = generateOpenRtbObject(bidderRequest, filteredBidRequests[0]);
+      filteredBidRequests.forEach(bid => {
+        appendImpObject(bid, payload);
+      });
+
+      return generateServerRequest({payload, requestOptions, bidderRequest});
+    }
+
+    return filteredBidRequests.map(bid => {
+      const payloadClone = generateOpenRtbObject(bidderRequest, bid);
+      appendImpObject(bid, payloadClone);
+      return generateServerRequest({payload: payloadClone, requestOptions, bidderRequest: bid});
+    });
+  },
+
+  interpretResponse: function(serverResponse, { data, bidderRequest }) {
+    const response = [];
+    if (!serverResponse.body || !Array.isArray(serverResponse.body.seatbid)) {
+      return response;
+    }
+
+    let seatbids = serverResponse.body.seatbid;
+    seatbids.forEach(seatbid => {
+      let bid;
+
+      try {
+        bid = seatbid.bid[0];
+      } catch (e) {
+        return response;
+      }
+
+      let cpm = (bid.ext && bid.ext.encp) ? bid.ext.encp : bid.price;
+
+      let bidResponse = {
+        adId: deepAccess(bid, 'adId') ? bid.adId : bid.impid || bid.crid,
+        adUnitCode: bidderRequest.adUnitCode,
+        requestId: bid.impid,
+        cpm: cpm,
+        width: bid.w,
+        height: bid.h,
+        creativeId: bid.crid || 0,
+        currency: bid.cur || DEFAULT_CURRENCY,
+        dealId: bid.dealid ? bid.dealid : null,
+        netRevenue: true,
+        ttl: getTtl(bidderRequest),
+        meta: {
+          advertiserDomains: bid.adomain,
+        }
+      };
+
+      const responseAdmFormat = getResponseFormat(bid);
+      if (responseAdmFormat === BANNER) {
+        bidResponse.mediaType = BANNER;
+        bidResponse.ad = bid.adm;
+        bidResponse.meta.mediaType = BANNER;
+      } else if (responseAdmFormat === VIDEO) {
+        bidResponse.mediaType = VIDEO;
+        bidResponse.meta.mediaType = VIDEO;
+        bidResponse.vastXml = bid.adm;
+
+        if (bid.nurl) {
+          bidResponse.vastUrl = bid.nurl;
+        };
+      }
+
+      if (deepAccess(bidderRequest, 'mediaTypes.video.context') === 'outstream' && !bidderRequest.renderer) {
+        bidResponse.renderer = createRenderer(bidderRequest, bidResponse) || undefined;
+      }
+
+      response.push(bidResponse);
+    });
+
+    return response;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const bidResponse = !isEmpty(serverResponses) && serverResponses[0].body;
+
+    if (bidResponse && bidResponse.ext && bidResponse.ext.pixels) {
+      return extractUserSyncUrls(syncOptions, bidResponse.ext.pixels);
+    }
+
+    return [];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/yahoosspBidAdapter.md b/modules/yahoosspBidAdapter.md
new file mode 100644
index 00000000000..7fb7a307192
--- /dev/null
+++ b/modules/yahoosspBidAdapter.md
@@ -0,0 +1,795 @@
+# Overview
+**Module Name:** yahoossp Bid Adapter
+**Module Type:** Bidder Adapter
+**Maintainer:** hb-fe-tech@yahooinc.com
+
+# Description
+The Yahoo SSP Bid Adapter is an OpenRTB interface that consolidates all previous "Oath.inc" adapters such as: "aol", "oneMobile", "oneDisplay" & "oneVideo" supply-side platforms.
+
+# Supported Features:
+* Media Types: Banner & Video
+* Outstream renderer
+* Multi-format adUnits
+* Schain module
+* Price floors module
+* Advertiser domains
+* End-2-End self-served testing mode
+* Outstream renderer/Player
+* User ID Modules - ConnectId and others
+* First Party Data (ortb2 & ortb2Imp)
+* Custom TTL (time to live)
+
+
+# Adapter Request mode
+Since the yahoossp adapter now supports both Banner and Video adUnits a controller was needed to allow you to define when the adapter should generate a bid-requests to our Yahoo SSP.
+
+**Important!** By default the adapter mode is set to "banner" only.
+This means that you do not need to explicitly declare the yahoossp.mode in the Global config to initiate banner adUnit requests.
+
+## Request modes:
+* **undefined** - (Default) Will generate bid-requests for "Banner" formats only.
+* **banner** - Will generate bid-requests for "Banner" formats only (Explicit declaration).
+* **video** - Will generate bid-requests for "Video" formats only (Explicit declaration).
+* **all** - Will generate bid-requests for both "Banner" & "Video" formats
+
+**Important!** When setting yahoossp.mode = 'all' Make sure your Yahoo SSP Placement (pos id) supports both Banner & Video placements.
+If it does not, the Yahoo SSP will respond only in the format it is set too.
+
+```javascript
+pbjs.setConfig({
+    yahoossp: {
+        mode: 'banner' // 'all', 'video', 'banner' (default)
+    }
+});
+```
+# Integration Options
+The `yahoossp` bid adapter supports 2 types of integration:
+1. **dcn & pos** DEFAULT (Site/App & Position targeting) - For Display partners/publishers.
+2. **pubId** (Publisher ID) - For legacy "oneVideo" AND New partners/publishers.
+**Important:** pubId integration (option 2) is only possible when your Seller account is setup for "Inventory Mapping".
+
+**Please Note:** Most examples in this file are using dcn & pos.
+
+## Who is currently eligible for "pubId" integration
+At this time, only the following partners/publishers are eligble for pubId integration:
+1. New partners/publishers that do not have any existing accounts on Yahoo SSP (aka: aol, oneMobile, oneDisplay).
+2. Video SSP (oneVideo) partners/publishers that
+   A. Do not have any display/banner inventory.
+   B. Do not have any existing accounts on Yahoo SSP (aka: aol, oneMobile, oneDisplay).
+
+# Mandatory Bidder Parameters
+## dcn & pos (DEFAULT)
+The minimal requirements for the 'yahoossp' bid adapter to generate an outbound bid-request to our Yahoo SSP are:
+1. At least 1 adUnit including mediaTypes: banner or video
+2. **bidder.params** object must include:
+    A. **dcn:** Yahoo SSP Site/App inventory parameter.
+    B. **pos:** Yahoo SSP position inventory parameter.
+
+### Example: dcn & pos Mandatory Parameters (Single banner adUnit)
+```javascript
+const adUnits = [{
+    code: 'your-placement',
+    mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+    bids: [
+        {
+            bidder: 'yahoossp',
+            params: {
+                dcn: '8a969516017a7a396ec539d97f540011', // Site/App ID provided from SSP
+                pos: '8a969978017a7aaabab4ab0bc01a0009' // Placement ID provided from SSP
+            }
+        }
+    ]
+}];
+```
+
+## pubId
+The minimal requirements for the 'yahoossp' bid adapter to generate an outbound bid-request to our Yahoo SSP are:
+1. At least 1 adUnit including mediaTypes: banner or video
+2. **bidder.params** object must include:
+    A. **pubId:** Yahoo SSP Publisher ID (AKA oneVideo pubId/Exchange name)
+
+### Example: pubId Mandatory Parameters (Single banner adUnit)
+```javascript
+const adUnits = [{
+    code: 'your-placement',
+    mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+    bids: [
+        {
+            bidder: 'yahoossp',
+            params: {
+                pubId: 'DemoPublisher', // Publisher External ID provided from Yahoo SSP.
+            }
+        }
+    ]
+}];
+```
+# Advanced adUnit Examples:
+## Banner
+```javascript
+const adUnits = [{
+    code: 'banner-adUnit',
+    mediaTypes: {
+        banner: {
+            sizes: [
+                [300, 250]
+            ]
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011', // Site/App ID provided from Yahoo SSP
+            pos: '8a969978017a7aaabab4ab0bc01a0009', // Placement ID provided from Yahoo SSP
+            }
+        }
+    }]
+}];
+```
+## Video Instream
+**Important!** Make sure that the Yahoo SSP Placement type (in-stream) matches the adUnit video inventory type.
+**Note:** Make sure to set the adapter mode to allow video requests by setting it to mode: 'video' OR mode: 'all'.
+```javascript
+pbjs.setConfig({
+    yahoossp: {
+        mode: 'video'
+    }
+});
+
+const adUnits = [{
+    code: 'video-adUnit',
+    mediaTypes: {
+        video: {
+            context: 'instream',
+            playerSize: [
+                [300, 250]
+            ],
+            mimes: ['video/mp4','application/javascript'],
+            api: [2]
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011', // Site/App ID provided from Yahoo SSP
+            pos: '8a96958a017a7a57ac375d50c0c700cc', // Placement ID provided from Yahoo SSP
+        }
+    }]
+}];
+```
+## Video Outstream
+**Important!** Make sure that the Yahoo SSP Placement type (in-feed/ in-article) matches the adUnit video inventory type.
+**Note:** Make sure to set the adapter mode to allow video requests by setting it to mode: 'video' OR mode: 'all'
+```javascript
+pbjs.setConfig({
+    yahoossp: {
+        mode: 'video'
+    }
+});
+
+const adUnits = [{
+    code: 'video-adUnit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+            mimes: ['video/mp4','application/javascript'],
+            api: [2]
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011', // Site/App ID provided from Yahoo SSP
+            pos: '8a96958a017a7a57ac375d50c0c700cc', // Placement ID provided from Yahoo SSP
+        }
+    }]
+}];
+```
+## Multi-Format
+**Important!** If you intend to use the yahoossp bidder for both Banner and Video formats please make sure:
+1. Set the adapter as mode: 'all' - to call the Yahoo SSP for both banner & video formats.
+2. Make sure the Yahoo SSP placement (pos id) supports both banner & video format requests.
+
+```javascript
+pbjs.setConfig({
+    yahoossp: {
+        mode: 'all'
+    }
+});
+
+const adUnits = [{
+    code: 'video-adUnit',
+    mediaTypes: {
+        banner: {
+                sizes: [[300, 250]]
+            },
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+            mimes: ['video/mp4','application/javascript'],
+            api: [2]
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011', // Site/App ID provided from Yahoo SSP
+            pos: '8a96958a017a7a57ac375d50c0c700cc', // Placement ID provided from Yahoo SSP
+        }
+    }]
+}];
+```
+
+# Optional: Schain module support
+The yahoossp adapter supports the Prebid.org Schain module and will pass it through to our Yahoo SSP
+For further details please see, https://docs.prebid.org/dev-docs/modules/schain.html
+
+## Global Schain Example:
+```javascript
+        pbjs.setConfig({
+            "schain": {
+                "validation": "off",
+                "config": {
+                    "ver": "1.0",
+                    "complete": 1,
+                    "nodes": [{
+                            "asi": "some-platform.com",
+                            "sid": "111111",
+                            "hp": 1
+                    }]
+                }
+            }
+        });
+```
+## Bidder Specific Schain Example:
+```javascript
+        pbjs.setBidderConfig({
+            "bidders": ['yahoossp'], // can list more bidders here if they share the same config
+            "config": {
+            "schain": {
+                "validation": "strict",
+                "config": {
+                    "ver": "1.0",
+                    "complete": 1,
+                    "nodes": [{
+                            "asi": "other-platform.com",
+                            "sid": "222222",
+                            "hp": 0
+                    }]
+                }
+            }
+        }
+        });
+```
+
+# Optional: Price floors module & bidfloor
+The yahoossp adapter supports the Prebid.org Price Floors module and will use it to define the outbound bidfloor and currency.
+By default the adapter will always check the existance of Module price floor.
+If a module price floor does not exist you can set a custom bid floor for your impression using "params.bidOverride.imp.bidfloor".
+
+**Note:** All override params apply to all requests generated using this configuration regardless of format type.
+
+```javascript
+const adUnits = [{
+    code: 'override-pricefloor',
+    mediaTypes: {
+        banner: {
+            sizes: [
+                [300, 250]
+            ]
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011', // Site/App ID provided from Yahoo SSP
+            pos: '8a969978017a7aaabab4ab0bc01a0009', // Placement ID provided from Yahoo SSP
+            bidOverride :{
+                imp: {
+                    bidfloor: 5.00 // bidOverride priceFloor
+                }
+            }
+            }
+        }
+    }]
+}];
+```
+
+For further details please see, https://docs.prebid.org/dev-docs/modules/floors.html
+
+# Optional: Self-served E2E testing mode
+If you want to see how the yahoossp adapter works and loads you are invited to try it out using our testing mode.
+This is useful for integration testing and response parsing when checking banner vs video capabilities.
+
+## How to use E2E test mode:
+1. Set the yahoossp global config mode to either 'banner' or 'video' - depending on the adUnit you want to test.
+2. Add params.testing.e2etest: true to your adUnit bidder config - See examples below.
+
+**Note:** When using E2E Test Mode you do not need to pass mandatory bidder params dcn or pos.
+
+**Important!** E2E Testing Mode only works when the Bidder Request Mode is set explicitly to either 'banner' or 'video'.
+
+## Activating E2E Test for "Banner"
+ ```javascript
+pbjs.setConfig({
+    yahoossp: {
+        mode: 'banner' // select 'banner' or 'video' to define what response to load
+    }
+});
+
+const adUnits = [{
+    code: 'your-placement',
+    mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+    bids: [
+        {
+            bidder: 'yahoossp',
+            params: {
+                testing: {
+                    e2etest: true // Activate E2E Test mode
+                }
+            }
+        }
+    ]
+}];
+
+```
+## Activating E2E Test for "Video"
+**Note:** We recommend using Video Outstream as it would load the video response using our Outstream Renderer feature
+ ```javascript
+pbjs.setConfig({
+    yahoossp: {
+        mode: 'video'
+    }
+});
+
+const adUnits = [{
+    code: 'video-adUnit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+            mimes: ['video/mp4','application/javascript'],
+            api: [2]
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            testing: {
+                e2etest: true // Activate E2E Test mode
+            }
+        }
+    }]
+}];
+```
+
+# Optional: First Party Data
+The yahoossp adapter now supports first party data passed via:
+1. Global ortb2 object using pbjs.setConfig()
+2. adUnit ortb2Imp object declared within an adUnit.
+For further details please see, https://docs.prebid.org/features/firstPartyData.html
+## Global First Party Data "ortb2"
+### Passing First Party "site" data:
+```javascript
+pbjs.setConfig({
+            ortb2: {
+                site: {
+                    name: 'yahooAdTech',
+                    domain: 'yahooadtech.com',
+                    cat: ['IAB2'],
+                    sectioncat: ['IAB2-2'],
+                    pagecat: ['IAB2-2'],
+                    page: 'https://page.yahooadtech.com/here.html',
+                    ref: 'https://ref.yahooadtech.com/there.html',
+                    keywords:'yahoo, ad, tech',
+                    search: 'SSP',
+                    content: {
+                        id: '1234',
+                        title: 'Title',
+                        series: 'Series',
+                        season: 'Season',
+                        episode: 1,
+                        cat: ['IAB1', 'IAB1-1', 'IAB1-2', 'IAB2', 'IAB2-1'],
+                        genre: 'Fantase',
+                        contentrating: 'C-Rating',
+                        language: 'EN',
+                        prodq: 1,
+                        context: 1,
+                        len: 200,
+                        data: [{
+                            name: "www.dataprovider1.com",
+                            ext: { segtax: 4 },
+                            segment: [
+                                { id: "687" },
+                                { id: "123" }
+                            ]
+                        }],
+                        ext: {
+                            network: 'ext-network',
+                            channel: 'ext-channel',
+                            data: {
+                                pageType: "article",
+                                category: "repair"
+                            }
+                        }
+                    }
+                }
+            }
+        });
+```
+### Passing First Party "user" data:
+```javascript
+pbjs.setConfig({
+            ortb2: {
+                user: {
+                    yob: 1985,
+                    gender: 'm',
+                    keywords: 'a,b',
+                    data: [{
+                            name: "www.dataprovider1.com",
+                            ext: { segtax: 4 },
+                            segment: [
+                                { id: "687" },
+                                { id: "123" }
+                            ]
+                    }],
+                    ext: {
+                        data: {
+                            registered: true,
+                            interests: ['cars']
+                        }
+                    }
+                }
+            }
+        });
+```
+### Passing First Party "app.content.data" data:
+```javascript
+pbjs.setConfig({
+            ortb2: {
+                app: {
+                    content: {
+                        data: [{
+                            name: "www.dataprovider1.com",
+                            ext: { segtax: 4 },
+                            segment: [
+                                { id: "687" },
+                                { id: "123" }
+                            ]
+                        }],
+                    }
+                }
+            }
+        });
+```
+
+
+## AdUnit First Party Data "ortb2Imp"
+Most DSPs are adopting the Global Placement ID (GPID).
+Please pass your placement specific GPID value to Yahoo SSP using `adUnit.ortb2Imp.ext.data.pbadslot`.
+```javascript
+const adUnits = [{
+                code: 'placement',
+                mediaTypes: {
+                    banner: {
+                        sizes: [
+                            [300, 250]
+                        ]
+                    },
+                },
+                ortb2Imp: {
+                    ext: {
+                        data: {
+                            pbadslot: "homepage-top-rect",
+                            adUnitSpecificAttribute: "123"
+                        }
+                    }
+                },
+                bids: [{
+                    bidder: 'yahoossp',
+                    params: {
+                        pubdId: 'DemoPublisher'
+                    }
+                }]
+            }
+        ]
+```
+
+# Optional: Bidder bidOverride Parameters
+The yahoossp adapter allows passing override data to the outbound bid-request in that overrides First Party Data.
+**Important!** We highly recommend using prebid modules to pass data instead of bidder speicifc overrides.
+The use of these parameters are a last resort to force a specific feature or use case in your implementation.
+
+Currently the bidOverride object only accepts the following:
+* imp
+  * video
+    * mimes
+    * w
+    * h
+    * maxbitrate
+    * maxduration
+    * minduration
+    * api
+    * delivery
+    * pos
+    * playbackmethod
+    * placement
+    * linearity
+    * protocols
+    * rewarded
+* site
+  * page
+* device
+  * ip
+
+
+```javascript
+const adUnits = [{
+    code: 'bidOverride-adUnit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011',
+            pos: '8a96958a017a7a57ac375d50c0c700cc',
+            bidOverride: {
+                imp: {
+                    video: {
+                        mimes: ['video/mp4', 'javascript/application'],
+                        w: 300,
+                        h: 200,
+                        maxbitrate: 4000,
+                        maxduration: 30,
+                        minduration: 10,
+                        api: [1,2],
+                        delivery: 1,
+                        pos: 1,
+                        playbackmethod: 0,
+                        placement: 1,
+                        linearity: 1,
+                        protocols: [2,5],
+                        startdelay: 0,
+                        rewarded: 0
+                    }
+                },
+                site: {
+                    page: 'https://yahoossp-bid-adapter.com',
+                },
+                device: {
+                    ip: "1.2.3.4"
+                }
+            }
+        }
+    }]
+}]
+```
+
+# Optional: Custom Key-Value Pairs
+Custom key-value paris can be used for both inventory targeting and reporting.
+You must set up key-value pairs in the Yahoo SSP before sending them via the adapter otherwise the Ad Server will not be listening and picking them up.
+
+Important! Key-value pairs can only contain values of types: String, Number, Array of strings OR Array of numbers
+
+```javascript
+const adUnits = [{
+    code: 'key-value-pairs',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011',
+            pos: '8a96958a017a7a57ac375d50c0c700cc',
+            kvp: {
+                key1: 'value', // String
+                key2: 123456,   // Number
+                key3: ['string1','string2', 'string3'], // Array of strings
+                key4: [1, 23, 456, 7890] // Array of Numbers
+            }
+        }
+    }]
+}]
+```
+
+# Optional: Custom Cache Time To Live (ttl):
+The yahoossp adapter supports passing of "Time To Live" (ttl) that indicates to prebid chache for how long to keep the chaced winning bid alive. Value is Number in seconds and you can enter any number between 1 - 3600 (seconds).
+The setting can be defined globally using setConfig or within the adUnit.params.
+Global level setConfig overrides adUnit.params.
+If no value is being passed default is 300 seconds.
+## Global TTL
+```javascript
+pbjs.setConfig({
+    yahoossp: {
+        ttl: 300
+    }
+});
+
+const adUnits = [{
+    code: 'global-ttl',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011',
+            pos: '8a96958a017a7a57ac375d50c0c700cc',
+        }
+    }]
+}]
+```
+
+## Ad Unit Params TTL
+```javascript
+const adUnits = [{
+    code: 'adUnit-ttl',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250]],
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011',
+            pos: '8a96958a017a7a57ac375d50c0c700cc',
+            ttl: 300,
+        }
+    }]
+}]
+```
+# Optional: Video Features
+## Rewarded video flag
+To indicate to Yahoo SSP that this adUnit is a rewarded video you can pass the following in the params.bidOverride.imp.video.rewarded: 1
+
+```javascript
+const adUnits = [{
+    code: 'rewarded-video-adUnit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            dcn: '8a969516017a7a396ec539d97f540011',
+            pos: '8a96958a017a7a57ac375d50c0c700cc',
+            bidOverride: {
+                imp: {
+                    video: {
+                        rewarded: 1
+                    }
+                }
+            }
+        }
+    }]
+}]
+```
+
+## Site/App Targeting for "pubId" Inventory Mapping
+To target your adUnit explicitly to a specific Site/App Object in Yahoo SSP, you can pass one of the following:
+1. params.siteId = External Site ID || Video SSP RTBIS Id (in String format).
+2. params.bidOverride.site.id = External Site ID || Video SSP RTBIS Id (in String format).
+**Important:** Site override is a only supported when using "pubId" mode.
+**Important:** If you are switching from the oneVideo adapter, please make sure to pass inventoryid as a String instead of Integer.
+
+```javascript
+const adUnits = [{
+    code: 'pubId-site-targeting-adUnit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            pubId: 'DemoPublisher',
+            siteId: '1234567';
+        }
+    }]
+}]
+```
+
+## Placement Targeting for "pubId" Inventory Mapping
+To target your adUnit explicitly to a specific Placement within a Site/App Object in Yahoo SSP, you can pass the following params.placementId = External Placement ID || Placement Alias
+
+**Important!** Placement override is a only supported when using "pubId" mode.
+**Important!** It is highly recommended that you pass both `siteId` AND `placementId` together to avoid inventory miss matching.
+
+### Site & Placement override
+**Important!** If the placement ID does not reside under the defined Site/App object, the request will not resolve and no response will be sent back from the ad-server.
+```javascript
+const adUnits = [{
+    code: 'pubId-site-targeting-adUnit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            pubId: 'DemoPublisher',
+            siteId: '1234567',
+            placementId: 'header-250x300'
+        }
+    }]
+}]
+```
+### Placement only override
+**Important!** Using this method is not advised if you have multiple Site/Apps that are broken out of a Run Of Network (RON) Site/App. If the placement ID does not reside under a matching Site/App object, the request will not resolve and no response will be sent back from the ad-server.
+```javascript
+const adUnits = [{
+    code: 'pubId-site-targeting-adUnit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',
+            playerSize: [
+                [300, 250]
+            ],
+        }
+    },
+    bids: [{
+        bidder: 'yahoossp',
+        params: {
+            pubId: 'DemoPublisher',
+            placementId: 'header-250x300'
+        }
+    }]
+}]
+```
+
+# Optional: Legacy override Parameters
+This adapter does not support passing legacy overrides via 'bidder.params.ext' since most of the data should be passed using prebid modules (First Party Data, Schain, Price Floors etc.).
+If you do not know how to pass a custom parameter that you previously used, please contact us using the information provided above.
+
+Thanks you,
+Yahoo SSP
+
diff --git a/modules/yandexBidAdapter.js b/modules/yandexBidAdapter.js
new file mode 100644
index 00000000000..f73b4369869
--- /dev/null
+++ b/modules/yandexBidAdapter.js
@@ -0,0 +1,196 @@
+import { formatQS, deepAccess, triggerPixel, isArray, isNumber } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js'
+
+const BIDDER_CODE = 'yandex';
+const BIDDER_URL = 'https://bs.yandex.ru/metadsp';
+const DEFAULT_TTL = 180;
+const DEFAULT_CURRENCY = 'EUR';
+const SSP_ID = 10500;
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['ya'], // short code
+  supportedMediaTypes: [ BANNER ],
+
+  isBidRequestValid: function(bid) {
+    const { params } = bid;
+    if (!params) {
+      return false;
+    }
+    const { pageId, impId } = extractPlacementIds(params);
+    if (!(pageId && impId)) {
+      return false;
+    }
+    const sizes = bid.mediaTypes?.banner?.sizes;
+    return isArray(sizes) && isArray(sizes[0]) && isNumber(sizes[0][0]) && isNumber(sizes[0][1]);
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
+    const consentString = deepAccess(bidderRequest, 'gdprConsent.consentString');
+
+    let referrer = '';
+    let domain = '';
+    let page = '';
+
+    if (bidderRequest && bidderRequest.refererInfo) {
+      referrer = bidderRequest.refererInfo.ref;
+      domain = bidderRequest.refererInfo.domain;
+      page = bidderRequest.refererInfo.page;
+    }
+
+    let timeout = null;
+    if (bidderRequest) {
+      timeout = bidderRequest.timeout;
+    }
+
+    return validBidRequests.map((bidRequest) => {
+      const { params } = bidRequest;
+      const { targetRef, withCredentials = true } = params;
+      const sizes = bidRequest.mediaTypes.banner.sizes;
+      const size = sizes[0];
+      const [ w, h ] = size;
+
+      const { pageId, impId } = extractPlacementIds(params);
+
+      const queryParams = {
+        'imp-id': impId,
+        'target-ref': targetRef || domain,
+        'ssp-id': SSP_ID,
+      };
+      if (gdprApplies !== undefined) {
+        queryParams['gdpr'] = 1;
+        queryParams['tcf-consent'] = consentString;
+      }
+
+      const imp = {
+        id: impId,
+        banner: {
+          format: sizes,
+          w,
+          h,
+        }
+      };
+
+      if (bidRequest.getFloor) {
+        const floorInfo = bidRequest.getFloor({
+          currency: DEFAULT_CURRENCY,
+          size
+        });
+
+        imp.bidfloor = floorInfo.floor;
+        imp.bidfloorcur = floorInfo.currency;
+      }
+
+      const queryParamsString = formatQS(queryParams);
+      return {
+        method: 'POST',
+        url: BIDDER_URL + `/${pageId}?${queryParamsString}`,
+        data: {
+          id: bidRequest.bidId,
+          imp: [imp],
+          site: {
+            ref_url: referrer,
+            page_url: page,
+          },
+          tmax: timeout,
+        },
+        options: {
+          withCredentials,
+        },
+        bidRequest,
+      };
+    });
+  },
+
+  interpretResponse: function(serverResponse, {bidRequest}) {
+    let response = serverResponse.body;
+    if (!response.seatbid) {
+      return [];
+    }
+
+    const { cur, seatbid } = serverResponse.body;
+    const rtbBids = seatbid
+      .map(seatbid => seatbid.bid)
+      .reduce((a, b) => a.concat(b), []);
+
+    return rtbBids.map(rtbBid => {
+      let prBid = {
+        requestId: bidRequest.bidId,
+        cpm: rtbBid.price,
+        currency: cur || DEFAULT_CURRENCY,
+        width: rtbBid.w,
+        height: rtbBid.h,
+        creativeId: rtbBid.adid,
+        nurl: rtbBid.nurl,
+
+        netRevenue: true,
+        ttl: DEFAULT_TTL,
+
+        meta: {
+          advertiserDomains: rtbBid.adomain && rtbBid.adomain.length > 0 ? rtbBid.adomain : [],
+        }
+      };
+
+      prBid.ad = rtbBid.adm;
+
+      return prBid;
+    });
+  },
+
+  onBidWon: function (bid) {
+    let nurl = bid['nurl'];
+    if (!nurl) {
+      return;
+    }
+
+    const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
+    const curr = (bid.hasOwnProperty('originalCurrency') && bid.hasOwnProperty('originalCpm'))
+      ? bid.originalCurrency
+      : bid.currency;
+
+    nurl = nurl
+      .replace(/\${AUCTION_PRICE}/, cpm)
+      .replace(/\${AUCTION_CURRENCY}/, curr)
+    ;
+
+    triggerPixel(nurl);
+  }
+}
+
+function extractPlacementIds(bidRequestParams) {
+  const { placementId } = bidRequestParams;
+  const result = { pageId: null, impId: null };
+
+  let pageId, impId;
+  if (placementId) {
+    /*
+     * Possible formats
+     * R-I-123456-2
+     * R-123456-1
+     * 123456-789
+     */
+    const num = placementId.lastIndexOf('-');
+    if (num === -1) {
+      return result;
+    }
+    const num2 = placementId.lastIndexOf('-', num - 1);
+    pageId = placementId.slice(num2 + 1, num);
+    impId = placementId.slice(num + 1);
+  } else {
+    pageId = bidRequestParams.pageId;
+    impId = bidRequestParams.impId;
+  }
+
+  if (!parseInt(pageId, 10) || !parseInt(impId, 10)) {
+    return result;
+  }
+
+  result.pageId = pageId;
+  result.impId = impId;
+
+  return result;
+}
+
+registerBidder(spec);
diff --git a/modules/yandexBidAdapter.md b/modules/yandexBidAdapter.md
new file mode 100644
index 00000000000..aee51bca249
--- /dev/null
+++ b/modules/yandexBidAdapter.md
@@ -0,0 +1,40 @@
+# Overview
+
+```
+Module Name: Yandex Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@yandex-team.com
+```
+
+# Description
+
+Yandex Bidder Adapter for Prebid.js.
+
+# Parameters
+
+| Name          | Required?                                  | Description | Example | Type      |
+|---------------|--------------------------------------------|-------------|---------|-----------|
+| `placementId` | Yes                                        | Block ID    | `123-1` | `String`  |
+| `pageId`      | No<br>Deprecated. Please use `placementId` | Page ID     | `123`   | `Integer` |
+| `impId`       | No<br>Deprecated. Please use `placementId` | Imp ID      | `1`     | `Integer` |
+
+# Test Parameters
+
+```
+var adUnits = [{
+  code: 'banner-1',
+  mediaTypes: {
+    banner: {
+      sizes: [[240, 400], [300, 600]],
+    }
+  },
+  bids: [{
+    {
+      bidder: 'yandex',
+      params: {
+        placementId: '346580-1'
+      },
+    }
+  }]
+}];
+```
diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index 9c2b6abf475..cadeb9c1300 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -1,134 +1,245 @@
-import * as utils from '../src/utils.js'
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import find from 'core-js-pure/features/array/find.js'
-import { VIDEO, BANNER } from '../src/mediaTypes.js'
-import { Renderer } from '../src/Renderer.js'
-
-const ENDPOINT = 'https://ad.yieldlab.net'
-const BIDDER_CODE = 'yieldlab'
-const BID_RESPONSE_TTL_SEC = 300
-const CURRENCY_CODE = 'EUR'
-const OUTSTREAMPLAYER_URL = 'https://ad2.movad.net/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event'
+import { _each, deepAccess, isArray, isFn, isPlainObject, timestamp } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { find } from '../src/polyfill.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+const ENDPOINT = 'https://ad.yieldlab.net';
+const BIDDER_CODE = 'yieldlab';
+const BID_RESPONSE_TTL_SEC = 300;
+const CURRENCY_CODE = 'EUR';
+const OUTSTREAMPLAYER_URL = 'https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event';
+const GVLID = 70;
+const DIMENSION_SIGN = 'x';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [VIDEO, BANNER],
+  gvlid: GVLID,
+  supportedMediaTypes: [VIDEO, BANNER, NATIVE],
 
-  isBidRequestValid: function (bid) {
+  /**
+   * @param {object} bid
+   * @returns {boolean}
+   */
+  isBidRequestValid(bid) {
     if (bid && bid.params && bid.params.adslotId && bid.params.supplyId) {
-      return true
+      return true;
     }
-    return false
+    return false;
   },
 
   /**
    * This method should build correct URL
-   * @param validBidRequests
-   * @returns {{method: string, url: string}}
+   * @param {BidRequest[]} validBidRequests
+   * @param [bidderRequest]
+   * @returns {ServerRequest|ServerRequest[]}
    */
-  buildRequests: function (validBidRequests, bidderRequest) {
-    const adslotIds = []
-    const timestamp = Date.now()
+  buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    const adslotIds = [];
+    const adslotSizes = [];
+    const adslotFloors = [];
+    const timestamp = Date.now();
     const query = {
       ts: timestamp,
-      json: true
-    }
+      json: true,
+    };
 
-    utils._each(validBidRequests, function (bid) {
-      adslotIds.push(bid.params.adslotId)
+    _each(validBidRequests, function (bid) {
+      adslotIds.push(bid.params.adslotId);
+      const sizes = extractSizes(bid);
+      if (sizes.length > 0) {
+        adslotSizes.push(bid.params.adslotId + ':' + sizes.join('|'));
+      }
+      if (bid.params.extId) {
+        query.id = bid.params.extId;
+      }
       if (bid.params.targeting) {
-        query.t = createQueryString(bid.params.targeting)
+        query.t = createTargetingString(bid.params.targeting);
       }
       if (bid.userIdAsEids && Array.isArray(bid.userIdAsEids)) {
-        query.ids = createUserIdString(bid.userIdAsEids)
+        query.ids = createUserIdString(bid.userIdAsEids);
+        query.atypes = createUserIdAtypesString(bid.userIdAsEids);
       }
-      if (bid.params.customParams && utils.isPlainObject(bid.params.customParams)) {
-        for (let prop in bid.params.customParams) {
-          query[prop] = bid.params.customParams[prop]
+      if (bid.params.customParams && isPlainObject(bid.params.customParams)) {
+        for (const prop in bid.params.customParams) {
+          query[prop] = bid.params.customParams[prop];
         }
       }
-    })
+      if (bid.schain && isPlainObject(bid.schain) && Array.isArray(bid.schain.nodes)) {
+        query.schain = createSchainString(bid.schain);
+      }
+
+      const iabContent = getContentObject(bid);
+      if (iabContent) {
+        query.iab_content = createIabContentString(iabContent);
+      }
+      const floor = getBidFloor(bid, sizes);
+      if (floor) {
+        adslotFloors.push(bid.params.adslotId + ':' + floor);
+      }
+    });
+
+    if (bidderRequest) {
+      if (bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
+        // TODO: is 'page' the right value here?
+        query.pubref = bidderRequest.refererInfo.page;
+      }
 
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      query.gdpr = (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
-      if (query.gdpr) {
-        query.consent = bidderRequest.gdprConsent.consentString
+      if (bidderRequest.gdprConsent) {
+        query.gdpr = (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true;
+        if (query.gdpr) {
+          query.consent = bidderRequest.gdprConsent.consentString;
+        }
       }
     }
 
-    const adslots = adslotIds.join(',')
-    const queryString = createQueryString(query)
+    const adslots = adslotIds.join(',');
+    if (adslotSizes.length > 0) {
+      query.sizes = adslotSizes.join(',');
+    }
+
+    if (adslotFloors.length > 0) {
+      query.floor = adslotFloors.join(',');
+    }
+
+    const queryString = createQueryString(query);
 
     return {
       method: 'GET',
       url: `${ENDPOINT}/yp/${adslots}?${queryString}`,
-      validBidRequests: validBidRequests
-    }
+      validBidRequests: validBidRequests,
+      queryParams: query,
+    };
   },
 
   /**
    * Map ad values and pricing and stuff
-   * @param serverResponse
-   * @param originalBidRequest
+   * @param {ServerResponse} serverResponse
+   * @param {BidRequest} originalBidRequest
+   * @returns {Bid[]}
    */
-  interpretResponse: function (serverResponse, originalBidRequest) {
-    const bidResponses = []
-    const timestamp = Date.now()
+  interpretResponse(serverResponse, originalBidRequest) {
+    const bidResponses = [];
+    const timestamp = Date.now();
+    const reqParams = originalBidRequest.queryParams;
 
     originalBidRequest.validBidRequests.forEach(function (bidRequest) {
       if (!serverResponse.body) {
-        return
+        return;
       }
 
-      let matchedBid = find(serverResponse.body, function (bidResponse) {
-        return bidRequest.params.adslotId == bidResponse.id
-      })
+      const matchedBid = find(serverResponse.body, function (bidResponse) {
+        return bidRequest.params.adslotId == bidResponse.id;
+      });
 
       if (matchedBid) {
-        const primarysize = bidRequest.sizes.length === 2 && !utils.isArray(bidRequest.sizes[0]) ? bidRequest.sizes : bidRequest.sizes[0]
-        const customsize = bidRequest.params.adSize !== undefined ? parseSize(bidRequest.params.adSize) : primarysize
-        const extId = bidRequest.params.extId !== undefined ? '&id=' + bidRequest.params.extId : ''
-        const adType = matchedBid.adtype !== undefined ? matchedBid.adtype : ''
+        const adUnitSize = bidRequest.sizes.length === 2 && !isArray(bidRequest.sizes[0]) ? bidRequest.sizes : bidRequest.sizes[0];
+        const adSize = bidRequest.params.adSize !== undefined ? parseSize(bidRequest.params.adSize) : (matchedBid.adsize !== undefined) ? parseSize(matchedBid.adsize) : adUnitSize;
+        const extId = bidRequest.params.extId !== undefined ? '&id=' + bidRequest.params.extId : '';
+        const adType = matchedBid.adtype !== undefined ? matchedBid.adtype : '';
+        const gdprApplies = reqParams.gdpr ? '&gdpr=' + reqParams.gdpr : '';
+        const gdprConsent = reqParams.consent ? '&consent=' + reqParams.consent : '';
+        const pvId = matchedBid.pvid !== undefined ? '&pvid=' + matchedBid.pvid : '';
+        const iabContent = reqParams.iab_content ? '&iab_content=' + reqParams.iab_content : '';
 
         const bidResponse = {
           requestId: bidRequest.bidId,
           cpm: matchedBid.price / 100,
-          width: customsize[0],
-          height: customsize[1],
+          width: adSize[0],
+          height: adSize[1],
           creativeId: '' + matchedBid.id,
           dealId: (matchedBid['c.dealid']) ? matchedBid['c.dealid'] : matchedBid.pid,
           currency: CURRENCY_CODE,
           netRevenue: false,
           ttl: BID_RESPONSE_TTL_SEC,
           referrer: '',
-          ad: `<script src="${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/${customsize[0]}x${customsize[1]}?ts=${timestamp}${extId}"></script>`
-        }
+          ad: `<script src="${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}${iabContent}"></script>`,
+          meta: {
+            advertiserDomains: (matchedBid.advertiser) ? matchedBid.advertiser : 'n/a',
+          },
+        };
 
         if (isVideo(bidRequest, adType)) {
-          const playersize = getPlayerSize(bidRequest)
+          const playersize = getPlayerSize(bidRequest);
           if (playersize) {
-            bidResponse.width = playersize[0]
-            bidResponse.height = playersize[1]
+            bidResponse.width = playersize[0];
+            bidResponse.height = playersize[1];
           }
-          bidResponse.mediaType = VIDEO
-          bidResponse.vastUrl = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/${customsize[0]}x${customsize[1]}?ts=${timestamp}${extId}`
-
+          bidResponse.mediaType = VIDEO;
+          bidResponse.vastUrl = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}${iabContent}`;
           if (isOutstream(bidRequest)) {
             const renderer = Renderer.install({
               id: bidRequest.bidId,
               url: OUTSTREAMPLAYER_URL,
-              loaded: false
-            })
-            renderer.setRender(outstreamRender)
-            bidResponse.renderer = renderer
+              loaded: false,
+            });
+            renderer.setRender(outstreamRender);
+            bidResponse.renderer = renderer;
           }
         }
 
-        bidResponses.push(bidResponse)
+        if (isNative(bidRequest, adType)) {
+          // there may be publishers still rely on it
+          const url = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}`;
+          bidResponse.adUrl = url;
+          bidResponse.mediaType = NATIVE;
+          const nativeImageAssetObj = find(matchedBid.native.assets, e => e.id === 2);
+          const nativeImageAsset = nativeImageAssetObj ? nativeImageAssetObj.img : { url: '', w: 0, h: 0 };
+          const nativeTitleAsset = find(matchedBid.native.assets, e => e.id === 1);
+          const nativeBodyAsset = find(matchedBid.native.assets, e => e.id === 3);
+          bidResponse.native = {
+            title: nativeTitleAsset ? nativeTitleAsset.title.text : '',
+            body: nativeBodyAsset ? nativeBodyAsset.data.value : '',
+            image: {
+              url: nativeImageAsset.url,
+              width: nativeImageAsset.w,
+              height: nativeImageAsset.h,
+            },
+            clickUrl: matchedBid.native.link.url,
+            impressionTrackers: matchedBid.native.imptrackers,
+          };
+        }
+
+        bidResponses.push(bidResponse);
       }
-    })
-    return bidResponses
-  }
+    });
+    return bidResponses;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @param {Object} gdprConsent Is the GDPR Consent object wrapping gdprApplies {boolean} and consentString {string} attributes.
+   * @param {string} uspConsent Is the US Privacy Consent string.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+
+    if (syncOptions.iframeEnabled) {
+      const params = [];
+      params.push(`ts=${timestamp()}`);
+      params.push(`type=h`);
+      if (gdprConsent && (typeof gdprConsent.gdprApplies === 'boolean')) {
+        params.push(`gdpr=${Number(gdprConsent.gdprApplies)}`);
+      }
+      if (gdprConsent && (typeof gdprConsent.consentString === 'string')) {
+        params.push(`gdpr_consent=${gdprConsent.consentString}`);
+      }
+      syncs.push({
+        type: 'iframe',
+        url: `${ENDPOINT}/d/6846326/766/2x2?${params.join('&')}`,
+      });
+    }
+
+    return syncs;
+  },
 };
 
 /**
@@ -137,8 +248,18 @@ export const spec = {
  * @param {String} adtype
  * @returns {Boolean}
  */
-function isVideo (format, adtype) {
-  return utils.deepAccess(format, 'mediaTypes.video') && adtype.toLowerCase() === 'video'
+function isVideo(format, adtype) {
+  return deepAccess(format, 'mediaTypes.video') && adtype.toLowerCase() === 'video';
+}
+
+/**
+ * Is this a native format?
+ * @param {Object} format
+ * @param {String} adtype
+ * @returns {Boolean}
+ */
+function isNative(format, adtype) {
+  return deepAccess(format, 'mediaTypes.native') && adtype.toLowerCase() === 'native';
 }
 
 /**
@@ -146,9 +267,9 @@ function isVideo (format, adtype) {
  * @param {Object} format
  * @returns {Boolean}
  */
-function isOutstream (format) {
-  let context = utils.deepAccess(format, 'mediaTypes.video.context')
-  return (context === 'outstream')
+function isOutstream(format) {
+  const context = deepAccess(format, 'mediaTypes.video.context');
+  return (context === 'outstream');
 }
 
 /**
@@ -156,31 +277,46 @@ function isOutstream (format) {
  * @param {Object} format
  * @returns {Array}
  */
-function getPlayerSize (format) {
-  let playerSize = utils.deepAccess(format, 'mediaTypes.video.playerSize')
-  return (playerSize && utils.isArray(playerSize[0])) ? playerSize[0] : playerSize
+function getPlayerSize(format) {
+  const playerSize = deepAccess(format, 'mediaTypes.video.playerSize');
+  return (playerSize && isArray(playerSize[0])) ? playerSize[0] : playerSize;
 }
 
 /**
- * Expands a 'WxH' string as a 2-element [W, H] array
+ * Expands a 'WxH' string to a 2-element [W, H] array
  * @param {String} size
  * @returns {Array}
  */
-function parseSize (size) {
-  return size.split('x').map(Number)
+function parseSize(size) {
+  return size.split(DIMENSION_SIGN).map(Number);
 }
 
 /**
  * Creates a string out of an array of eids with source and uid
- * @param {Array} eids
+ * @param {Array.<{source: String, uids: Array.<{id: String, atype: Number, ext: Object}>}>} eids
  * @returns {String}
  */
-function createUserIdString (eids) {
-  let str = []
+function createUserIdString(eids) {
+  const str = [];
   for (let i = 0; i < eids.length; i++) {
-    str.push(eids[i].source + ':' + eids[i].uids[0].id)
+    str.push(eids[i].source + ':' + eids[i].uids[0].id);
   }
-  return str.join(',')
+  return str.join(',');
+}
+
+/**
+ * Creates a string from an array of eids with ID provider and atype if atype exists
+ * @param {Array.<{source: String, uids: Array.<{id: String, atype: Number, ext: Object}>}>} eids
+ * @returns {String} idprovider:atype,idprovider2:atype2,...
+ */
+function createUserIdAtypesString(eids) {
+  const str = [];
+  for (let i = 0; i < eids.length; i++) {
+    if (eids[i].uids[0].atype) {
+      str.push(eids[i].source + ':' + eids[i].uids[0].atype);
+    }
+  }
+  return str.join(',');
 }
 
 /**
@@ -188,14 +324,109 @@ function createUserIdString (eids) {
  * @param {Object} obj
  * @returns {String}
  */
-function createQueryString (obj) {
-  let str = []
-  for (var p in obj) {
+function createQueryString(obj) {
+  const str = [];
+  for (const p in obj) {
+    if (obj.hasOwnProperty(p)) {
+      const val = obj[p];
+      if (p !== 'schain' && p !== 'iab_content') {
+        str.push(encodeURIComponent(p) + '=' + encodeURIComponent(val));
+      } else {
+        str.push(p + '=' + val);
+      }
+    }
+  }
+  return str.join('&');
+}
+
+/**
+ * Creates an unencoded targeting string out of an object with key-values
+ * @param {Object} obj
+ * @returns {String}
+ */
+function createTargetingString(obj) {
+  const str = [];
+  for (const p in obj) {
     if (obj.hasOwnProperty(p)) {
-      str.push(encodeURIComponent(p) + '=' + encodeURIComponent(obj[p]))
+      const key = p;
+      const val = obj[p];
+      str.push(key + '=' + val);
     }
   }
-  return str.join('&')
+  return str.join('&');
+}
+
+/**
+ * Creates a string out of a schain object
+ * @param {Object} schain
+ * @returns {String}
+ */
+function createSchainString(schain) {
+  const ver = schain.ver || '';
+  const complete = (schain.complete === 1 || schain.complete === 0) ? schain.complete : '';
+  const keys = ['asi', 'sid', 'hp', 'rid', 'name', 'domain', 'ext'];
+  const nodesString = schain.nodes.reduce((acc, node) => {
+    return acc += `!${keys.map(key => node[key] ? encodeURIComponentWithBangIncluded(node[key]) : '').join(',')}`;
+  }, '');
+  return `${ver},${complete}${nodesString}`;
+}
+
+/**
+ * Get content object from bid request
+ * First get content from bidder params;
+ * If not provided in bidder params, get from first party data under 'ortb2.site.content' or 'ortb2.app.content'
+ * @param {Object} bid
+ * @returns {Object}
+ */
+function getContentObject(bid) {
+  if (bid.params.iabContent && isPlainObject(bid.params.iabContent)) {
+    return bid.params.iabContent;
+  }
+
+  const globalContent = deepAccess(bid, 'ortb2.site') ? deepAccess(bid, 'ortb2.site.content')
+    : deepAccess(bid, 'ortb2.app.content');
+  if (globalContent && isPlainObject(globalContent)) {
+    return globalContent;
+  }
+  return undefined;
+}
+
+/**
+ * Creates a string for iab_content object by
+ * 1. flatten the iab content object
+ * 2. encoding the values
+ * 3. joining array of defined keys ('keyword', 'cat') into one value seperated with '|'
+ * 4. encoding the whole string
+ * @param {Object} iabContent
+ * @returns {String}
+ */
+function createIabContentString(iabContent) {
+  const arrKeys = ['keywords', 'cat'];
+  const str = [];
+  const transformObjToParam = (obj = {}, extraKey = '') => {
+    for (const key in obj) {
+      if ((arrKeys.indexOf(key) !== -1 && Array.isArray(obj[key]))) {
+        // Array of defined keyword which have to be joined into one value from "key: [value1, value2, value3]" to "key:value1|value2|value3"
+        str.push(''.concat(key, ':', obj[key].map(node => encodeURIComponent(node)).join('|')));
+      } else if (typeof obj[key] !== 'object') {
+        str.push(''.concat(extraKey + key, ':', encodeURIComponent(obj[key])));
+      } else {
+        // Object has to be further flattened
+        transformObjToParam(obj[key], ''.concat(extraKey, key, '.'));
+      }
+    }
+    return str.join(',');
+  };
+  return encodeURIComponent(transformObjToParam(iabContent));
+}
+
+/**
+ * Encodes URI Component with exlamation mark included. Needed for schain object.
+ * @param {String} str
+ * @returns {String}
+ */
+function encodeURIComponentWithBangIncluded(str) {
+  return encodeURIComponent(str).replace(/!/g, '%21');
 }
 
 /**
@@ -204,12 +435,74 @@ function createQueryString (obj) {
  */
 function outstreamRender(bid) {
   bid.renderer.push(() => {
-    window.ma_width = bid.width
-    window.ma_height = bid.height
-    window.ma_vastUrl = bid.vastUrl
-    window.ma_container = bid.adUnitCode
-    window.document.dispatchEvent(new Event('ma-start-event'))
+    window.ma_width = bid.width;
+    window.ma_height = bid.height;
+    window.ma_vastUrl = bid.vastUrl;
+    window.ma_container = bid.adUnitCode;
+    window.document.dispatchEvent(new Event('ma-start-event'));
+  });
+}
+
+/**
+ * Extract sizes for a given bid from either `mediaTypes` or `sizes` directly.
+ *
+ * @param {Object} bid
+ * @returns {string[]}
+ */
+function extractSizes(bid) {
+  const { mediaTypes } = bid; // see https://docs.prebid.org/dev-docs/adunit-reference.html#examples
+  const sizes = [];
+
+  if (isPlainObject(mediaTypes)) {
+    const { [BANNER]: bannerType } = mediaTypes;
+
+    // only applies for multi size Adslots -> BANNER
+    if (bannerType && isArray(bannerType.sizes)) {
+      if (isArray(bannerType.sizes[0])) { // multiple sizes given
+        sizes.push(bannerType.sizes);
+      } else { // just one size provided as array -> wrap to uniformly flatten later
+        sizes.push([bannerType.sizes]);
+      }
+    }
+    // The bid top level field `sizes` is deprecated and should not be used anymore. Keeping it for compatibility.
+  } else if (isArray(bid.sizes)) {
+    if (isArray(bid.sizes[0])) {
+      sizes.push(bid.sizes);
+    } else {
+      sizes.push([bid.sizes]);
+    }
+  }
+
+  /** @type {Set<string>} */
+  const deduplicatedSizeStrings = new Set(sizes.flat().map(([width, height]) => width + DIMENSION_SIGN + height));
+
+  return Array.from(deduplicatedSizeStrings);
+}
+
+/**
+ * Gets the floor price if the Price Floors Module is enabled for a given auction,
+ * which will add the getFloor() function to the bidRequest object.
+ *
+ * @param {Object} bid
+ * @param {string[]} sizes
+ * @returns The floor CPM in cents of a matched rule based on the rule selection process (mediaType, size and currency),
+ *          using the getFloor() inputs. Multi sizes and unsupported media types will default to '*'
+ */
+function getBidFloor(bid, sizes) {
+  if (!isFn(bid.getFloor)) {
+    return undefined;
+  }
+  const mediaTypes = deepAccess(bid, 'mediaTypes');
+  const mediaType = mediaTypes !== undefined ? Object.keys(mediaTypes)[0].toLowerCase() : undefined;
+  const floor = bid.getFloor({
+    currency: CURRENCY_CODE,
+    mediaType: mediaType !== undefined && spec.supportedMediaTypes.includes(mediaType) ? mediaType : '*',
+    size: sizes.length !== 1 ? '*' : sizes[0].split(DIMENSION_SIGN),
   });
+  if (floor.currency === CURRENCY_CODE) {
+    return (floor.floor * 100).toFixed(0);
+  }
+  return undefined;
 }
 
-registerBidder(spec)
+registerBidder(spec);
diff --git a/modules/yieldlabBidAdapter.md b/modules/yieldlabBidAdapter.md
index 37897b83f12..1f52e26f5c7 100644
--- a/modules/yieldlabBidAdapter.md
+++ b/modules/yieldlabBidAdapter.md
@@ -11,40 +11,96 @@ Maintainer: solutions@yieldlab.de
 Module that connects to Yieldlab's demand sources
 
 # Test Parameters
+
+```javascript
+const adUnits = [
+    {
+        code: 'banner',
+        sizes: [ [ 728, 90 ] ],
+        bids: [{
+            bidder: 'yieldlab',
+            params: {
+                adslotId: '5220336',
+                supplyId: '1381604',
+                targeting: {
+                    key1: 'value1',
+                    key2: 'value2'
+                },
+                extId: 'abc',
+                iabContent: {
+                    id: 'some_id',
+                    episode: '1',
+                    title: 'some title',
+                    series: 'some series',
+                    season: 's1',
+                    artist: 'John Doe',
+                    genre: 'some genre',
+                    isrc: 'CC-XXX-YY-NNNNN',
+                    url: 'http://foo_url.de',
+                    cat: [ 'IAB1-1', 'IAB1-2', 'IAB2-10' ],
+                    context: '7',
+                    keywords: ['k1', 'k2'],
+                    live: '0'
+                }
+            }
+        }]
+    },
+    {
+        code: 'video',
+        sizes: [ [ 640, 480 ] ],
+        mediaTypes: {
+            video: {
+                context: 'instream' // or 'outstream'
+            }
+        },
+        bids: [{
+            bidder: 'yieldlab',
+            params: {
+                adslotId: '5220339',
+                supplyId: '1381604'
+            }
+        }]
+    },
+    {
+        code: 'native',
+        mediaTypes: {
+            native: {
+                // native config
+            }
+        },
+        bids: [{
+            bidder: 'yieldlab',
+            params: {
+                adslotId: '5220339',
+                supplyId: '1381604'
+            }
+        }]
+    }
+];
 ```
-    var adUnits = [
-           {
-               code: "banner",
-               sizes: [[728, 90]],
-               bids: [{
-                   bidder: "yieldlab",
-                   params: {
-                       adslotId: "5220336",
-                       supplyId: "1381604",
-                       adSize: "728x90",
-                       targeting: {
-                           key1: "value1",
-                           key2: "value2"
-                       },
-                       extId: "abc"
-                   }
-               }]
-           }, {
-               code: "video",
-               sizes: [[640, 480]],
-               mediaTypes: {
-                   video: {
-                       context: "instream" // or "outstream"
-                   }
-               },
-               bids: [{
-                   bidder: "yieldlab",
-                   params: {
-                       adslotId: "5220339",
-                       supplyId: "1381604",
-                       adSize: "640x480"
-                   }
-               }]
-           }
-       ];
+
+# Multi-Format Setup
+
+A general overview of how to set up multi-format ads can be found in the offical Prebid.js docs. See: [show multi-format ads](https://docs.prebid.org/dev-docs/show-multi-format-ads.html)
+
+When setting up multi-format ads with Yieldlab make sure to always add at least one eligible Adslot per given media type in the ad unit configuration.
+
+```javascript
+const adUnit = {
+    code: 'multi-format-adslot',
+    mediaTypes: {
+        banner: {
+            sizes: [ [ 728, 90 ] ]
+        },
+        native: {
+            // native config
+        }
+    },
+    bids: [
+        // banner Adslot
+        { bidder: 'yieldlab', params: { adslotId: '1234', supplyId: '42' } },
+        // native Adslot
+        { bidder: 'yieldlab', params: { adslotId: '2345', supplyId: '42' } }
+    ]
+};
 ```
diff --git a/modules/yieldliftBidAdapter.js b/modules/yieldliftBidAdapter.js
index 87a598bd335..6e4bce15187 100644
--- a/modules/yieldliftBidAdapter.js
+++ b/modules/yieldliftBidAdapter.js
@@ -1,10 +1,10 @@
+import {deepSetValue, logInfo, deepAccess} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import * as utils from '../src/utils.js';
 import {BANNER} from '../src/mediaTypes.js';
 
-const ENDPOINT_URL = 'https://x.yieldlift.com/auction';
+const ENDPOINT_URL = 'https://x.yieldlift.com/pbjs';
 
-const DEFAULT_BID_TTL = 30;
+const DEFAULT_BID_TTL = 300;
 const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_NET_REVENUE = true;
 
@@ -44,9 +44,9 @@ export const spec = {
       id: bidderRequest.auctionId,
       imp: impressions,
       site: {
-        domain: window.location.hostname,
-        page: window.location.href,
-        ref: bidderRequest.refererInfo ? bidderRequest.refererInfo.referer || null : null
+        domain: bidderRequest.refererInfo?.domain,
+        page: bidderRequest.refererInfo?.page,
+        ref: bidderRequest.refererInfo?.ref,
       },
       ext: {
         exchange: {
@@ -58,18 +58,24 @@ export const spec = {
 
     // adding schain object
     if (validBidRequests[0].schain) {
-      utils.deepSetValue(openrtbRequest, 'source.ext.schain', validBidRequests[0].schain);
+      deepSetValue(openrtbRequest, 'source.ext.schain', validBidRequests[0].schain);
     }
 
     // Attaching GDPR Consent Params
     if (bidderRequest.gdprConsent) {
-      utils.deepSetValue(openrtbRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-      utils.deepSetValue(openrtbRequest, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+      deepSetValue(openrtbRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(openrtbRequest, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
     }
 
     // CCPA
     if (bidderRequest.uspConsent) {
-      utils.deepSetValue(openrtbRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+      deepSetValue(openrtbRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    // EIDS
+    const eids = deepAccess(validBidRequests[0], 'userIdAsEids');
+    if (Array.isArray(eids) && eids.length > 0) {
+      deepSetValue(openrtbRequest, 'user.ext.eids', eids);
     }
 
     const payloadString = JSON.stringify(openrtbRequest);
@@ -92,19 +98,20 @@ export const spec = {
           width: bid.w,
           height: bid.h,
           ad: bid.adm,
-          ttl: DEFAULT_BID_TTL,
+          ttl: typeof bid.exp === 'number' ? bid.exp : DEFAULT_BID_TTL,
           creativeId: bid.crid,
           netRevenue: DEFAULT_NET_REVENUE,
           currency: DEFAULT_CURRENCY,
+          meta: { advertiserDomains: bid && bid.advertiserDomains ? bid.advertiserDomains : [] }
         })
       })
     } else {
-      utils.logInfo('yieldlift.interpretResponse :: no valid responses to interpret');
+      logInfo('yieldlift.interpretResponse :: no valid responses to interpret');
     }
     return bidResponses;
   },
   getUserSyncs: function (syncOptions, serverResponses) {
-    utils.logInfo('yieldlift.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses);
+    logInfo('yieldlift.getUserSyncs', 'syncOptions', syncOptions, 'serverResponses', serverResponses);
     let syncs = [];
 
     if (!syncOptions.iframeEnabled && !syncOptions.pixelEnabled) {
@@ -112,7 +119,7 @@ export const spec = {
     }
 
     serverResponses.forEach(resp => {
-      const userSync = utils.deepAccess(resp, 'body.ext.usersync');
+      const userSync = deepAccess(resp, 'body.ext.usersync');
       if (userSync) {
         let syncDetails = [];
         Object.keys(userSync).forEach(key => {
@@ -136,7 +143,7 @@ export const spec = {
         }
       }
     });
-    utils.logInfo('yieldlift.getUserSyncs result=%o', syncs);
+    logInfo('yieldlift.getUserSyncs result=%o', syncs);
     return syncs;
   },
 
diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index 55495979ea4..5a0f302ab34 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -1,110 +1,208 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
+import {
+  deepAccess,
+  deepSetValue,
+  getWindowTop,
+  isArray,
+  isArrayOfNums,
+  isBoolean,
+  isEmpty,
+  isInteger,
+  isNumber,
+  isStr,
+  logError,
+  parseQueryStringParameters,
+  parseUrl
+} from '../src/utils.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {Renderer} from '../src/Renderer.js';
+import {find, includes} from '../src/polyfill.js';
+import {createEidsArray} from './userId/eids.js';
 
 const BIDDER_CODE = 'yieldmo';
+const GVLID = 173;
 const CURRENCY = 'USD';
 const TIME_TO_LIVE = 300;
 const NET_REVENUE = true;
-const SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
-const localWindow = utils.getWindowTop();
+const PB_COOKIE_ASSIST_SYNC_ENDPOINT = `https://ads.yieldmo.com/pbcas`;
+const BANNER_PATH = '/exchange/prebid';
+const VIDEO_PATH = '/exchange/prebidvideo';
+const STAGE_DOMAIN = 'https://ads-stg.yieldmo.com';
+const PROD_DOMAIN = 'https://ads.yieldmo.com';
+const OUTSTREAM_VIDEO_PLAYER_URL = 'https://prebid-outstream.yieldmo.com/bundle.js';
+const OPENRTB_VIDEO_BIDPARAMS = ['mimes', 'startdelay', 'placement', 'startdelay', 'skipafter', 'protocols', 'api',
+  'playbackmethod', 'maxduration', 'minduration', 'pos', 'skip', 'skippable'];
+const OPENRTB_VIDEO_SITEPARAMS = ['name', 'domain', 'cat', 'keywords'];
+const LOCAL_WINDOW = getWindowTop();
+const DEFAULT_PLAYBACK_METHOD = 2;
+const DEFAULT_START_DELAY = 0;
+const VAST_TIMEOUT = 15000;
+const MAX_BANNER_REQUEST_URL_LENGTH = 8000;
+const BANNER_REQUEST_PROPERTIES_TO_REDUCE = ['description', 'title', 'pr', 'page_url'];
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: ['banner'],
+  supportedMediaTypes: [BANNER, VIDEO],
+  gvlid: GVLID,
   /**
    * Determines whether or not the given bid request is valid.
    * @param {object} bid, bid to validate
    * @return boolean, true if valid, otherwise false
    */
-  isBidRequestValid: function(bid) {
-    return !!(bid && bid.adUnitCode && bid.bidId);
+  isBidRequestValid: function (bid) {
+    return !!(bid && bid.adUnitCode && bid.bidId && (hasBannerMediaType(bid) || hasVideoMediaType(bid)) &&
+      validateVideoParams(bid));
   },
+
   /**
    * Make a server request from the list of BidRequests.
    *
    * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @param {BidderRequest} bidderRequest bidder request object.
    * @return ServerRequest Info describing the request to the server.
    */
-  buildRequests: function(bidRequests, bidderRequest) {
-    let serverRequest = {
-      p: [],
-      page_url: bidderRequest.refererInfo.referer,
-      bust: new Date().getTime().toString(),
-      pr: bidderRequest.refererInfo.referer,
-      scrd: localWindow.devicePixelRatio || 0,
-      dnt: getDNT(),
-      e: getEnvironment(),
-      description: getPageDescription(),
-      title: localWindow.document.title || '',
-      w: localWindow.innerWidth,
-      h: localWindow.innerHeight,
-      userConsent:
-        JSON.stringify({
+  buildRequests: function (bidRequests, bidderRequest) {
+    const stage = isStage(bidderRequest);
+    const bannerUrl = getAdserverUrl(BANNER_PATH, stage);
+    const videoUrl = getAdserverUrl(VIDEO_PATH, stage);
+    const bannerBidRequests = bidRequests.filter(request => hasBannerMediaType(request));
+    const videoBidRequests = bidRequests.filter(request => hasVideoMediaType(request));
+    let serverRequests = [];
+    const eids = getEids(bidRequests[0]) || [];
+    if (bannerBidRequests.length > 0) {
+      let serverRequest = {
+        pbav: '$prebid.version$',
+        p: [],
+        // TODO: is 'page' the right value here?
+        page_url: bidderRequest.refererInfo.page,
+        bust: new Date().getTime().toString(),
+        dnt: getDNT(),
+        description: getPageDescription(),
+        userConsent: JSON.stringify({
           // case of undefined, stringify will remove param
-          gdprApplies:
-            bidderRequest && bidderRequest.gdprConsent
-              ? bidderRequest.gdprConsent.gdprApplies
-              : '',
-          cmp:
-            bidderRequest && bidderRequest.gdprConsent
-              ? bidderRequest.gdprConsent.consentString
-              : '',
+          gdprApplies: deepAccess(bidderRequest, 'gdprConsent.gdprApplies') || '',
+          cmp: deepAccess(bidderRequest, 'gdprConsent.consentString') || ''
         }),
-      us_privacy:
-        bidderRequest && bidderRequest.uspConsent
-          ? bidderRequest.uspConsent
-          : '',
-    };
-
-    bidRequests.forEach(request => {
-      serverRequest.p.push(addPlacement(request));
-      const pubcid = getId(request, 'pubcid');
-      if (pubcid) {
-        serverRequest.pubcid = pubcid;
-      } else if (request.crumbs) {
-        if (request.crumbs.pubcid) {
-          serverRequest.pubcid = request.crumbs.pubcid;
-        }
-      }
-      const tdid = getId(request, 'tdid');
-      if (tdid) {
-        serverRequest.tdid = tdid;
+        us_privacy: deepAccess(bidderRequest, 'uspConsent') || ''
+      };
+
+      if (canAccessTopWindow()) {
+        serverRequest.pr = (LOCAL_WINDOW.document && LOCAL_WINDOW.document.referrer) || '';
+        serverRequest.scrd = LOCAL_WINDOW.devicePixelRatio || 0;
+        serverRequest.title = LOCAL_WINDOW.document.title || '';
+        serverRequest.w = LOCAL_WINDOW.innerWidth;
+        serverRequest.h = LOCAL_WINDOW.innerHeight;
       }
-      const criteoId = getId(request, 'criteoId');
-      if (criteoId) {
-        serverRequest.cri_prebid = criteoId;
+
+      const mtp = window.navigator.maxTouchPoints;
+      if (mtp) {
+        serverRequest.mtp = mtp;
       }
-      if (request.schain) {
-        serverRequest.schain =
-          JSON.stringify(request.schain);
+
+      bannerBidRequests.forEach(request => {
+        serverRequest.p.push(addPlacement(request));
+        const pubcid = getId(request, 'pubcid');
+        if (pubcid) {
+          serverRequest.pubcid = pubcid;
+        } else if (request.crumbs && request.crumbs.pubcid) {
+          serverRequest.pubcid = request.crumbs.pubcid;
+        }
+        const tdid = getId(request, 'tdid');
+        if (tdid) {
+          serverRequest.tdid = tdid;
+        }
+        const criteoId = getId(request, 'criteoId');
+        if (criteoId) {
+          serverRequest.cri_prebid = criteoId;
+        }
+        if (request.schain) {
+          serverRequest.schain = JSON.stringify(request.schain);
+        }
+        if (deepAccess(request, 'params.lr_env')) {
+          serverRequest.ats_envelope = request.params.lr_env;
+        }
+      });
+      serverRequest.p = '[' + serverRequest.p.toString() + ']';
+
+      if (eids.length) {
+        serverRequest.eids = JSON.stringify(eids);
+      };
+      // check if url exceeded max length
+      const fullUrl = `${bannerUrl}?${parseQueryStringParameters(serverRequest)}`;
+      let extraCharacters = fullUrl.length - MAX_BANNER_REQUEST_URL_LENGTH;
+      if (extraCharacters > 0) {
+        for (let i = 0; i < BANNER_REQUEST_PROPERTIES_TO_REDUCE.length; i++) {
+          extraCharacters = shortcutProperty(extraCharacters, serverRequest, BANNER_REQUEST_PROPERTIES_TO_REDUCE[i]);
+
+          if (extraCharacters <= 0) {
+            break;
+          }
+        }
       }
-    });
-    serverRequest.p = '[' + serverRequest.p.toString() + ']';
-    return {
-      method: 'GET',
-      url: SERVER_ENDPOINT,
-      data: serverRequest
-    };
+
+      serverRequests.push({
+        method: 'GET',
+        url: bannerUrl,
+        data: serverRequest
+      });
+    }
+
+    if (videoBidRequests.length > 0) {
+      const serverRequest = openRtbRequest(videoBidRequests, bidderRequest);
+      if (eids.length) {
+        serverRequest.user = { eids };
+      };
+      serverRequests.push({
+        method: 'POST',
+        url: videoUrl,
+        data: serverRequest
+      });
+    }
+    return serverRequests;
   },
+
   /**
    * Makes Yieldmo Ad Server response compatible to Prebid specs
-   * @param serverResponse successful response from Ad Server
+   * @param {ServerResponse} serverResponse successful response from Ad Server
+   * @param {ServerRequest} bidRequest
    * @return {Bid[]} an array of bids
    */
-  interpretResponse: function(serverResponse) {
+  interpretResponse: function (serverResponse, bidRequest) {
     let bids = [];
-    let data = serverResponse.body;
+    const data = serverResponse.body;
     if (data.length > 0) {
       data.forEach(response => {
-        if (response.cpm && response.cpm > 0) {
-          bids.push(createNewBid(response));
+        if (response.cpm > 0) {
+          bids.push(createNewBannerBid(response));
         }
       });
     }
+    if (data.seatbid) {
+      const seatbids = data.seatbid.reduce((acc, seatBid) => acc.concat(seatBid.bid), []);
+      seatbids.forEach(bid => bids.push(createNewVideoBid(bid, bidRequest)));
+    }
     return bids;
   },
-  getUserSyncs: function() {
-    return [];
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '') {
+    const syncs = [];
+    const gdprFlag = `&gdpr=${gdprConsent.gdprApplies ? 1 : 0}`;
+    const gdprString = `&gdpr_consent=${encodeURIComponent((gdprConsent.consentString || ''))}`;
+    const usPrivacy = `us_privacy=${encodeURIComponent(uspConsent)}`;
+    const pbCookieAssistSyncUrl = `${PB_COOKIE_ASSIST_SYNC_ENDPOINT}?${usPrivacy}${gdprFlag}${gdprString}`;
+
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: pbCookieAssistSyncUrl + '&type=iframe'
+      });
+    } else if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: pbCookieAssistSyncUrl + '&type=image'
+      });
+    }
+    return syncs;
   }
 };
 registerBidder(spec);
@@ -113,11 +211,26 @@ registerBidder(spec);
  * Helper Functions
  ***************************************/
 
+/**
+ * @param {BidRequest} bidRequest bid request
+ */
+function hasBannerMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.banner');
+}
+
+/**
+ * @param {BidRequest} bidRequest bid request
+ */
+function hasVideoMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.video');
+}
+
 /**
  * Adds placement information to array
  * @param request bid request
  */
 function addPlacement(request) {
+  const gpid = deepAccess(request, 'ortb2Imp.ext.data.pbadslot');
   const placementInfo = {
     placement_id: request.adUnitCode,
     callback_id: request.bidId,
@@ -127,19 +240,34 @@ function addPlacement(request) {
     if (request.params.placementId) {
       placementInfo.ym_placement_id = request.params.placementId;
     }
-    if (request.params.bidFloor) {
-      placementInfo.bidFloor = request.params.bidFloor;
+    const bidfloor = getBidFloor(request, BANNER);
+    if (bidfloor) {
+      placementInfo.bidFloor = bidfloor;
     }
   }
+  if (gpid) {
+    placementInfo.gpid = gpid;
+  }
+
+  // get the transaction id for the banner bid.
+  const transactionId = deepAccess(request, 'ortb2Imp.ext.tid');
+
+  if (transactionId) {
+    placementInfo.tid = transactionId;
+  }
+  if (request.auctionId) {
+    placementInfo.auctionId = request.auctionId;
+  }
   return JSON.stringify(placementInfo);
 }
 
 /**
- * creates a new bid with response information
+ * creates a new banner bid with response information
  * @param response server response
  */
-function createNewBid(response) {
+function createNewBannerBid(response) {
   return {
+    dealId: response.publisherDealId,
     requestId: response['callback_id'],
     cpm: response.cpm,
     width: response.width,
@@ -149,9 +277,69 @@ function createNewBid(response) {
     netRevenue: NET_REVENUE,
     ttl: TIME_TO_LIVE,
     ad: response.ad,
+    meta: {
+      advertiserDomains: response.adomain || [],
+      mediaType: BANNER,
+    },
   };
 }
 
+/**
+ * creates a new video bid with response information
+ * @param response openRTB server response
+ * @param bidRequest server request
+ */
+function createNewVideoBid(response, bidRequest) {
+  const imp = find((deepAccess(bidRequest, 'data.imp') || []), imp => imp.id === response.impid);
+
+  let result = {
+    dealId: response.dealid,
+    requestId: imp.id,
+    cpm: response.price,
+    width: imp.video.w,
+    height: imp.video.h,
+    creativeId: response.crid || response.adid,
+    currency: CURRENCY,
+    netRevenue: NET_REVENUE,
+    mediaType: VIDEO,
+    ttl: TIME_TO_LIVE,
+    vastXml: response.adm,
+    meta: {
+      advertiserDomains: response.adomain || [],
+      mediaType: VIDEO,
+    },
+  };
+
+  if (imp.video.placement && imp.video.placement !== 1) {
+    const renderer = Renderer.install({
+      url: OUTSTREAM_VIDEO_PLAYER_URL,
+      config: {
+        width: result.width,
+        height: result.height,
+        vastTimeout: VAST_TIMEOUT,
+        maxAllowedVastTagRedirects: 5,
+        allowVpaid: true,
+        autoPlay: true,
+        preload: true,
+        mute: true
+      },
+      id: imp.tagid,
+      loaded: false,
+    });
+
+    renderer.setRender(function (bid) {
+      bid.renderer.push(() => {
+        const { id, config } = bid.renderer;
+        window.YMoutstreamPlayer(bid, id, config);
+      });
+    });
+
+    result.renderer = renderer;
+  }
+
+  return result;
+}
+
 /**
  * Detects whether dnt is true
  * @returns true if user enabled dnt
@@ -169,175 +357,325 @@ function getPageDescription() {
   if (document.querySelector('meta[name="description"]')) {
     return document
       .querySelector('meta[name="description"]')
-      .getAttribute('content'); // Value of the description metadata from the publisher's page.
+      .getAttribute('content') || ''; // Value of the description metadata from the publisher's page.
   } else {
     return '';
   }
 }
 
-/***************************************
- * Detect Environment Helper Functions
- ***************************************/
+/**
+ * Gets an id from the userId object if it exists
+ * @param {*} request
+ * @param {*} idType
+ * @returns an id if there is one, or undefined
+ */
+function getId(request, idType) {
+  return (typeof deepAccess(request, 'userId') === 'object') ? request.userId[idType] : undefined;
+}
 
 /**
- * Represents a method for loading Yieldmo ads.  Environments affect
- * which formats can be loaded into the page
- * Environments:
- *    CodeOnPage: 0, // div directly on publisher's page
- *    Amp: 1, // google Accelerate Mobile Pages ampproject.org
- *    Mraid = 2, // native loaded through the MRAID spec, without Yieldmo's SDK https://www.iab.net/media/file/IAB_MRAID_v2_FINAL.pdf
- *    Dfp: 4, // google doubleclick for publishers https://www.doubleclickbygoogle.com/
- *    DfpInAmp: 5, // AMP page containing a DFP iframe
- *    SafeFrame: 10,
- *    DfpSafeFrame: 11,Sandboxed: 16, // An iframe that can't get to the top window.
- *    SuperSandboxed: 89, // An iframe without allow-same-origin
- *    Unknown: 90, // A default sandboxed implementation delivered by EnvironmentDispatch when all positive environment checks fail
+ * @param {BidRequest[]} bidRequests bid request object
+ * @param {BidderRequest} bidderRequest bidder request object
+ * @return Object OpenRTB request object
  */
+function openRtbRequest(bidRequests, bidderRequest) {
+  const schain = bidRequests[0].schain;
+  let openRtbRequest = {
+    id: bidRequests[0].bidderRequestId,
+    at: 1,
+    imp: bidRequests.map(bidRequest => openRtbImpression(bidRequest)),
+    site: openRtbSite(bidRequests[0], bidderRequest),
+    device: deepAccess(bidderRequest, 'ortb2.device'),
+    badv: bidRequests[0].params.badv || [],
+    bcat: deepAccess(bidderRequest, 'bcat') || bidRequests[0].params.bcat || [],
+    ext: {
+      prebid: '$prebid.version$',
+    },
+    ats_envelope: bidRequests[0].params.lr_env,
+  };
+
+  if (schain) {
+    openRtbRequest.schain = schain;
+  }
+
+  if (bidRequests[0].auctionId) {
+    openRtbRequest.auctionId = bidRequests[0].auctionId;
+  }
+  populateOpenRtbGdpr(openRtbRequest, bidderRequest);
+
+  return openRtbRequest;
+}
 
 /**
- * Detects what environment we're in
- * @returns Environment kind
+ * @param {BidRequest} bidRequest bidder request object.
+ * @return Object OpenRTB's 'imp' (impression) object
  */
-function getEnvironment() {
-  if (isSuperSandboxedIframe()) {
-    return 89;
-  } else if (isDfpInAmp()) {
-    return 5;
-  } else if (isDfp()) {
-    return 4;
-  } else if (isAmp()) {
-    return 1;
-  } else if (isDFPSafeFrame()) {
-    return 11;
-  } else if (isSafeFrame()) {
-    return 10;
-  } else if (isMraid()) {
-    return 2;
-  } else if (isCodeOnPage()) {
-    return 0;
-  } else if (isSandboxedIframe()) {
-    return 16;
-  } else {
-    return 90;
+function openRtbImpression(bidRequest) {
+  const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
+  const size = extractPlayerSize(bidRequest);
+  const imp = {
+    id: bidRequest.bidId,
+    tagid: bidRequest.adUnitCode,
+    bidfloor: getBidFloor(bidRequest, VIDEO),
+    ext: {
+      placement_id: bidRequest.params.placementId,
+      tid: deepAccess(bidRequest, 'ortb2Imp.ext.tid')
+    },
+    video: {
+      w: size[0],
+      h: size[1],
+      linearity: 1
+    }
+  };
+
+  const mediaTypesParams = deepAccess(bidRequest, 'mediaTypes.video');
+  Object.keys(mediaTypesParams)
+    .filter(param => includes(OPENRTB_VIDEO_BIDPARAMS, param))
+    .forEach(param => imp.video[param] = mediaTypesParams[param]);
+
+  const videoParams = deepAccess(bidRequest, 'params.video');
+  Object.keys(videoParams)
+    .filter(param => includes(OPENRTB_VIDEO_BIDPARAMS, param))
+    .forEach(param => imp.video[param] = videoParams[param]);
+
+  if (imp.video.skippable) {
+    imp.video.skip = 1;
+    delete imp.video.skippable;
+  }
+  if (imp.video.placement !== 1) {
+    imp.video.startdelay = DEFAULT_START_DELAY;
+    imp.video.playbackmethod = [ DEFAULT_PLAYBACK_METHOD ];
+  }
+  if (gpid) {
+    imp.ext.gpid = gpid;
   }
+  return imp;
+}
+
+function getBidFloor(bidRequest, mediaType) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({ currency: CURRENCY, mediaType, size: '*' });
+  }
+
+  return floorInfo.floor || bidRequest.params.bidfloor || bidRequest.params.bidFloor || 0;
 }
 
 /**
- * @returns true if we are running on the top window at dispatch time
+ * @param {BidRequest} bidRequest bidder request object.
+ * @return [number, number] || null Player's width and height, or undefined otherwise.
  */
-function isCodeOnPage() {
-  return window === window.parent;
+function extractPlayerSize(bidRequest) {
+  const sizeArr = deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+  if (isArrayOfNums(sizeArr, 2)) {
+    return sizeArr;
+  } else if (isArray(sizeArr) && isArrayOfNums(sizeArr[0], 2)) {
+    return sizeArr[0];
+  }
+  return null;
 }
 
 /**
- * @returns true if the environment is both DFP and AMP
+ * @param {BidRequest} bidRequest bid request object
+ * @param {BidderRequest} bidderRequest bidder request object
+ * @return Object OpenRTB's 'site' object
  */
-function isDfpInAmp() {
-  return isDfp() && isAmp();
+function openRtbSite(bidRequest, bidderRequest) {
+  let result = {};
+
+  const loc = parseUrl(deepAccess(bidderRequest, 'refererInfo.page'));
+  if (!isEmpty(loc)) {
+    result.page = `${loc.protocol}://${loc.hostname}${loc.pathname}`;
+  }
+
+  if (bidderRequest.refererInfo?.ref) {
+    result.ref = bidderRequest.refererInfo.ref;
+  }
+
+  const keywords = document.getElementsByTagName('meta')['keywords'];
+  if (keywords && keywords.content) {
+    result.keywords = keywords.content;
+  }
+
+  const siteParams = deepAccess(bidRequest, 'params.site');
+  if (siteParams) {
+    Object.keys(siteParams)
+      .filter(param => includes(OPENRTB_VIDEO_SITEPARAMS, param))
+      .forEach(param => result[param] = siteParams[param]);
+  }
+  return result;
 }
 
 /**
- * @returns true if the window is in an iframe whose id and parent element id match DFP
+ * Updates openRtbRequest with GDPR info from bidderRequest, if present.
+ * @param {Object} openRtbRequest OpenRTB's request to update.
+ * @param {BidderRequest} bidderRequest bidder request object.
  */
-function isDfp() {
-  try {
-    const frameElement = window.frameElement;
-    const parentElement = window.frameElement.parentNode;
-    if (frameElement && parentElement) {
-      return (
-        frameElement.id.indexOf('google_ads_iframe') > -1 &&
-        parentElement.id.indexOf('google_ads_iframe') > -1
-      );
-    }
-    return false;
-  } catch (e) {
-    return false;
+function populateOpenRtbGdpr(openRtbRequest, bidderRequest) {
+  const gdpr = bidderRequest.gdprConsent;
+  if (gdpr && 'gdprApplies' in gdpr) {
+    deepSetValue(openRtbRequest, 'regs.ext.gdpr', gdpr.gdprApplies ? 1 : 0);
+    deepSetValue(openRtbRequest, 'user.ext.consent', gdpr.consentString);
+  }
+  const uspConsent = deepAccess(bidderRequest, 'uspConsent');
+  if (uspConsent) {
+    deepSetValue(openRtbRequest, 'regs.ext.us_privacy', uspConsent);
   }
 }
 
 /**
- * @returns true if there is an AMP context object
+ * Determines whether or not the given video bid request is valid. If it's not a video bid, returns true.
+ * @param {object} bid, bid to validate
+ * @return boolean, true if valid, otherwise false
  */
-function isAmp() {
+function validateVideoParams(bid) {
+  if (!hasVideoMediaType(bid)) {
+    return true;
+  }
+
+  const paramRequired = (paramStr, value, conditionStr) => {
+    let error = `"${paramStr}" is required`;
+    if (conditionStr) {
+      error += ' when ' + conditionStr;
+    }
+    throw new Error(error);
+  };
+
+  const paramInvalid = (paramStr, value, expectedStr) => {
+    expectedStr = expectedStr ? ', expected: ' + expectedStr : '';
+    value = JSON.stringify(value);
+    throw new Error(`"${paramStr}"=${value} is invalid${expectedStr}`);
+  };
+
+  const isDefined = val => typeof val !== 'undefined';
+  const validate = (fieldPath, validateCb, errorCb, errorCbParam) => {
+    if (fieldPath.indexOf('video') === 0) {
+      const valueFieldPath = 'params.' + fieldPath;
+      const mediaFieldPath = 'mediaTypes.' + fieldPath;
+      const valueParams = deepAccess(bid, valueFieldPath);
+      const mediaTypesParams = deepAccess(bid, mediaFieldPath);
+      const hasValidValueParams = validateCb(valueParams);
+      const hasValidMediaTypesParams = validateCb(mediaTypesParams);
+
+      if (hasValidValueParams) return valueParams;
+      else if (hasValidMediaTypesParams) return hasValidMediaTypesParams;
+      else {
+        if (!hasValidValueParams) errorCb(valueFieldPath, valueParams, errorCbParam);
+        else if (!hasValidMediaTypesParams) errorCb(mediaFieldPath, mediaTypesParams, errorCbParam);
+      }
+      return valueParams || mediaTypesParams;
+    } else {
+      const value = deepAccess(bid, fieldPath);
+      if (!validateCb(value)) {
+        errorCb(fieldPath, value, errorCbParam);
+      }
+      return value;
+    }
+  };
+
   try {
-    const ampContext = window.context || window.parent.context;
-    if (ampContext && ampContext.pageViewId) {
-      return ampContext;
+    validate('video.context', val => !isEmpty(val), paramRequired);
+
+    validate('params.placementId', val => !isEmpty(val), paramRequired);
+
+    validate('video.playerSize', val => isArrayOfNums(val, 2) ||
+      (isArray(val) && val.every(v => isArrayOfNums(v, 2))),
+    paramInvalid, 'array of 2 integers, ex: [640,480] or [[640,480]]');
+
+    validate('video.mimes', val => isDefined(val), paramRequired);
+    validate('video.mimes', val => isArray(val) && val.every(v => isStr(v)), paramInvalid,
+      'array of strings, ex: ["video/mp4"]');
+
+    const placement = validate('video.placement', val => isDefined(val), paramRequired);
+    validate('video.placement', val => val >= 1 && val <= 5, paramInvalid);
+    if (placement === 1) {
+      validate('video.startdelay', val => isDefined(val),
+        (field, v) => paramRequired(field, v, 'placement == 1'));
+      validate('video.startdelay', val => isNumber(val), paramInvalid, 'number, ex: 5');
     }
-    return false;
+
+    validate('video.protocols', val => isDefined(val), paramRequired);
+    validate('video.protocols', val => isArrayOfNums(val) && val.every(v => (v >= 1 && v <= 6)),
+      paramInvalid, 'array of numbers, ex: [2,3]');
+
+    validate('video.api', val => isDefined(val), paramRequired);
+    validate('video.api', val => isArrayOfNums(val) && val.every(v => (v >= 1 && v <= 6)),
+      paramInvalid, 'array of numbers, ex: [2,3]');
+
+    validate('video.playbackmethod', val => !isDefined(val) || isArrayOfNums(val), paramInvalid,
+      'array of integers, ex: [2,6]');
+
+    validate('video.maxduration', val => isDefined(val), paramRequired);
+    validate('video.maxduration', val => isInteger(val), paramInvalid);
+    validate('video.minduration', val => !isDefined(val) || isNumber(val), paramInvalid);
+    validate('video.skippable', val => !isDefined(val) || isBoolean(val), paramInvalid);
+    validate('video.skipafter', val => !isDefined(val) || isNumber(val), paramInvalid);
+    validate('video.pos', val => !isDefined(val) || isNumber(val), paramInvalid);
+    validate('params.badv', val => !isDefined(val) || isArray(val), paramInvalid,
+      'array of strings, ex: ["ford.com","pepsi.com"]');
+    validate('params.bcat', val => !isDefined(val) || isArray(val), paramInvalid,
+      'array of strings, ex: ["IAB1-5","IAB1-6"]');
+    return true;
   } catch (e) {
+    logError(e.message);
     return false;
   }
 }
 
 /**
- * @returns true if the environment is a SafeFrame.
+ * Shortcut object property and check if required characters count was deleted
+ *
+ * @param {number} extraCharacters, count of characters to remove
+ * @param {object} target, object on which string property length should be reduced
+ * @param {string} propertyName, name of property to reduce
+ * @return {number} 0 if required characters count was removed otherwise count of how many left
  */
-function isSafeFrame() {
-  return window.$sf && window.$sf.ext;
-}
+function shortcutProperty(extraCharacters, target, propertyName) {
+  if (target[propertyName].length > extraCharacters) {
+    target[propertyName] = target[propertyName].substring(0, target[propertyName].length - extraCharacters);
 
-/**
- * @returns true if the environment is a dfp safe frame.
- */
-function isDFPSafeFrame() {
-  if (window.location && window.location.href) {
-    const href = window.location.href;
-    return (
-      isSafeFrame() &&
-      href.indexOf('google') !== -1 &&
-      href.indexOf('safeframe') !== -1
-    );
+    return 0
   }
-  return false;
+
+  const charactersLeft = extraCharacters - target[propertyName].length;
+
+  target[propertyName] = '';
+
+  return charactersLeft;
 }
 
 /**
- * Return true if we are in an iframe and can't access the top window.
+ * Creates and returnes eids arr using createEidsArray from './userId/eids.js' module;
+ * @param {Object} openRtbRequest OpenRTB's request as a cource of userId.
+ * @return array of eids objects
  */
-function isSandboxedIframe() {
-  return window.top !== window && !window.frameElement;
-}
+function getEids(bidRequest) {
+  if (deepAccess(bidRequest, 'userId')) {
+    return createEidsArray(bidRequest.userId) || [];
+  }
+};
 
 /**
- * Return true if we cannot document.write to a child iframe (this implies no allow-same-origin)
+ * Check if top window can be accessed
+ *
+ * @return {boolean} true if can access top window otherwise false
  */
-function isSuperSandboxedIframe() {
-  const sacrificialIframe = window.document.createElement('iframe');
+function canAccessTopWindow() {
   try {
-    sacrificialIframe.setAttribute('style', 'display:none');
-    window.document.body.appendChild(sacrificialIframe);
-    sacrificialIframe.contentWindow._testVar = true;
-    window.document.body.removeChild(sacrificialIframe);
+    if (getWindowTop().location.href) {
+      return true;
+    }
+  } catch (error) {
     return false;
-  } catch (e) {
-    window.document.body.removeChild(sacrificialIframe);
-    return true;
   }
 }
 
-/**
- * @returns true if the window has the attribute identifying MRAID
- */
-function isMraid() {
-  return !!window.mraid;
+function isStage(bidderRequest) {
+  return !!bidderRequest.refererInfo?.referer?.includes('pb_force_a');
 }
 
-/**
- * Gets an id from the userId object if it exists
- * @param {*} request
- * @param {*} idType
- * @returns an id if there is one, or undefined
- */
-function getId(request, idType) {
-  let id;
-  if (
-    request &&
-    request.userId &&
-    request.userId[idType] &&
-    typeof request.userId === 'object'
-  ) {
-    id = request.userId[idType];
-  }
-  return id;
+function getAdserverUrl(path, stage) {
+  const domain = stage ? STAGE_DOMAIN : PROD_DOMAIN;
+  return `${domain}${path}`;
 }
diff --git a/modules/yieldmoBidAdapter.md b/modules/yieldmoBidAdapter.md
index 0f86d2507d1..c98e2ab5c74 100644
--- a/modules/yieldmoBidAdapter.md
+++ b/modules/yieldmoBidAdapter.md
@@ -11,26 +11,96 @@ Note: Our ads will only render in mobile
 
 Connects to Yieldmo Ad Server for bids.
 
-Yieldmo bid adapter supports Banner.
+Yieldmo bid adapter supports Banner and Video.
 
 # Test Parameters
+
+## Banner
+
+Sample banner ad unit config:
+```javascript
+var adUnits = [{ // Banner adUnit
+  code: 'div-gpt-ad-1460505748561-0',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]],
+    }
+  },
+  bids: [{
+    bidder: 'yieldmo',
+    params: {
+      placementId: '1779781193098233305', // string with at most 19 characters (may include numbers only)
+      bidFloor: .28, // optional param
+      lr_env: '***' // Optional. Live Ramp ATS envelope
+    }
+  }]
+}];
+```
+
+## Video
+
+Sample instream video ad unit config:
+```javascript
+var adUnits = [{ // Video adUnit
+  code: 'div-video-ad-1234567890',
+  mediaTypes: {
+    video: {
+      playerSize: [640, 480], // required
+      context: 'instream',
+      mimes: ['video/mp4']    // required, array of strings
+    }
+  },
+  bids: [{
+    bidder: 'yieldmo',
+    params: {
+      placementId: '1524592390382976659', // required
+      video: {
+        placement: 1,       // required, integer
+        maxduration: 30,    // required, integer
+        minduration: 15,    // optional, integer
+        pos: 1,             // optional, integer
+        startdelay: 10,     // required if placement == 1
+        protocols: [2, 3],  // required, array of integers
+        api: [2, 3],        // required, array of integers
+        playbackmethod: [2,6], // required, array of integers
+        skippable: true,    // optional, boolean
+        skipafter: 10       // optional, integer
+      },
+      lr_env: '***' // Optional. Live Ramp ATS envelope
+    }
+  }]
+}];
+```
+
+Sample out-stream video ad unit config:
+```javascript
+var videoAdUnit = [{
+  code: 'div-video-ad-1234567890',
+  mediaTypes: {
+      video: {
+          playerSize: [640, 480],   // required
+          context: 'outstream',
+          mimes: ['video/mp4']      // required, array of strings
+      }
+  },
+  bids: [{
+    bidder: 'yieldmo',
+    params: {
+      placementId: '1524592390382976659',  // required
+      video: {
+        placement: 3,                      // required, integer ( 3,4,5 )
+        maxduration: 30,                   // required, integer
+        protocols: [2, 3],                 // required, array of integers
+        api: [2, 3],                       // required, array of integers
+        playbackmethod: [1,2]              // required, array of integers
+      },
+      lr_env: '***' // Optional. Live Ramp ATS envelope
+    }
+  }]
+}];
 ```
-var adUnits = [
-   // Banner adUnit
-   {
-       code: 'div-gpt-ad-1460505748561-0', 
-       mediaTypes: {
-         banner: {
-            sizes: [[300, 250], [300,600]],
-         }
-       }
-       bids: [{
-         bidder: 'yieldmo',
-         params: {
-           placementId: '1779781193098233305', // string with at most 19 characters (may include numbers only) 
-           bidFloor: .28 // optional param
-         }
-       }]
-   }
-];
-```
\ No newline at end of file
+
+Please also note, that we support the following OpenRTB params:
+'mimes', 'startdelay', 'placement', 'startdelay', 'skipafter', 'protocols', 'api',
+'playbackmethod', 'maxduration', 'minduration', 'pos', 'skip', 'skippable'.
+They can be specified in `mediaTypes.video` or in `bids[].params.video`.
diff --git a/modules/yieldmoSyntheticInventoryModule.js b/modules/yieldmoSyntheticInventoryModule.js
new file mode 100644
index 00000000000..bca778a7b43
--- /dev/null
+++ b/modules/yieldmoSyntheticInventoryModule.js
@@ -0,0 +1,46 @@
+import { config } from '../src/config.js';
+import { isGptPubadsDefined } from '../src/utils.js';
+
+export const MODULE_NAME = 'Yieldmo Synthetic Inventory Module';
+
+export function init(config) {
+  validateConfig(config);
+
+  if (!isGptPubadsDefined()) {
+    window.googletag = window.googletag || {};
+    window.googletag.cmd = window.googletag.cmd || [];
+  }
+
+  const googletag = window.googletag;
+  const containerName = 'ym_sim_container_' + config.placementId;
+
+  googletag.cmd.push(() => {
+    if (window.document.body) {
+      googletagCmd(config, containerName, googletag);
+    } else {
+      window.document.addEventListener('DOMContentLoaded', () => googletagCmd(config, containerName, googletag));
+    }
+  });
+}
+
+export function validateConfig(config) {
+  if (!('placementId' in config)) {
+    throw new Error(`${MODULE_NAME}: placementId required`);
+  }
+  if (!('adUnitPath' in config)) {
+    throw new Error(`${MODULE_NAME}: adUnitPath required`);
+  }
+}
+
+function googletagCmd(config, containerName, googletag) {
+  const gamContainer = window.document.createElement('div');
+  gamContainer.id = containerName;
+  window.document.body.appendChild(gamContainer);
+  googletag.defineSlot(config.adUnitPath, [1, 1], containerName)
+    .addService(googletag.pubads())
+    .setTargeting('ym_sim_p_id', config.placementId);
+  googletag.enableServices();
+  googletag.display(containerName);
+}
+
+config.getConfig('yieldmo_synthetic_inventory', config => init(config.yieldmo_synthetic_inventory));
diff --git a/modules/yieldmoSyntheticInventoryModule.md b/modules/yieldmoSyntheticInventoryModule.md
new file mode 100644
index 00000000000..dd6f0acf884
--- /dev/null
+++ b/modules/yieldmoSyntheticInventoryModule.md
@@ -0,0 +1,68 @@
+# Yieldmo Synthetic Inventory Module
+
+## Overview
+
+This module enables publishers to set up Yieldmo Synthetic Outstream ads on their pages.
+
+If publishers will enable this module and provide placementId and Google Ad Manager ad unit path, this module will create a placement on the page and inject Yieldmo SDK into this placement. Publisher will then need to get a placement id from their Yieldmo account manager (accounts email) and setup corresponding ad units on the GAM ad server.
+
+## Integration
+
+Build the Yieldmo Synthetic Inventory Module into the Prebid.js package with:
+
+```
+gulp build --modules=yieldmoSyntheticInventoryModule,...
+```
+
+## Module Configuration
+
+```js
+pbjs.que.push(function() {
+    pbjs.setConfig({
+        yieldmo_synthetic_inventory: {
+            placementId: '1234567890',
+            adUnitPath: '/1234567/ad_unit_name_used_in_gam'
+        }
+    });
+});
+```
+
+### Configuration Parameters
+
+|Name |Scope |Description | Example| Type
+| :------------ | :------------ | :------------ | :------------ | :------------ |
+|placementId | required | Yieldmo placement ID | '1234567890' | string
+|adUnitPath | required | Google Ad Manager ad unit path | '/6355419/ad_unit_name_used_in_gam' | string
+
+### How to get ad unit path
+
+Ad unit path follows the format /network-code/[parent-ad-unit-code/.../]ad-unit-code, where:
+
+- network-code is a unique identifier for the Ad Manager network the ad unit belongs to
+- parent-ad-unit-code are the codes of all parent ad units (only applies to non-top level ad units)
+- ad-unit-code is the code for the ad unit to be displayed
+
+Note that all ad unit codes included in the ad unit path must adhere to the [formatting rules](https://support.google.com/admanager/answer/1628457#ad-unit-codes) specified by Ad Manager.
+
+Another and probably the easiest way to get an ad unit path is to get it from the google ad manager ad unit document header generated tag:
+
+```js
+googletag.defineSlot('/1234567/ad_unit_name_used_in_gam', [1, 1], 'ad-container-id').addService(googletag.pubads());
+```
+
+### How to get Yieldmo placement id
+
+Please reach out to your Yieldmo account's person or email to support@yieldmo.com
+
+### Google Ad Manager setup
+
+Yieldmo Synthetic Inventory Module is designed to be used along with Google Ad Manager. GAM should be set as usual, but there are a few requirements:
+
+- Ad unit size should be 1x1
+- Creative should NOT be served into a SafeFrame and also should have 1x1 size
+- Synthetic Inventory Universal Tag should be used as 3rd party creative code
+### Synthetic Inventory Universal Tag
+
+```js
+<div id="ym_%%PATTERN:ym_sim_p_id%%" class="ym"></div><script type="text/javascript">(function(e,t){if(t._ym===void 0){t._ym="";var m=e.createElement("script");m.type="text/javascript",m.async=!0,m.src="//static.yieldmo.com/ym."+Math.round(5*Math.random()/3)+".js",(e.getElementsByTagName("head")[0]||e.getElementsByTagName("body")[0]).appendChild(m)}else t._ym instanceof String||void 0===t._ym.chkPls||t._ym.chkPls()})(document,window);</script>
+```
\ No newline at end of file
diff --git a/modules/yieldnexusBidAdapter.md b/modules/yieldnexusBidAdapter.md
deleted file mode 100644
index 675e8948a3e..00000000000
--- a/modules/yieldnexusBidAdapter.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Overview
-
-```
-Module Name:  YieldNexus Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer:   rtbops@yieldnexus.com
-```
-
-# Description
-
-Adds support to query the YieldNexus platform for bids. The YieldNexus platform supports banners & video.
-
-Only one parameter is required: `spid`, which provides your YieldNexus account number.
-
-# Test Parameters
-```
-var adUnits = [
-   // Banner:
-   {
-     code: 'banner-ad-unit',
-     sizes: [[300, 250]],
-     bids: [{
-       bidder: 'yieldnexus',
-       params: {
-         spid: '1253',      // your supply ID in your YieldNexus dashboard
-         bidfloor: 0.03,    // an optional custom bid floor
-         adpos: 1,          // ad position on the page (optional)
-         instl: 0           // interstitial placement? (0 or 1, optional)
-       }
-     }]
-   },
-   // Outstream video:
-   {
-     code: 'video-ad-unit',
-     sizes: [[640, 480]],
-     mediaTypes: {
-       video: {
-         context: 'outstream',
-         playerSize: [640, 480]
-       }
-     },
-     bids: [ {
-       bidder: 'yieldnexus',
-       params: {
-         spid: '1254',      // your supply ID in your YieldNexus dashboard
-         bidfloor: 0.03,    // an optional custom bid floor
-         adpos: 1,          // ad position on the page (optional)
-         instl: 0           // interstitial placement? (0 or 1, optional)
-       }
-     }]
-   }
-];
-```
diff --git a/modules/yieldoneAnalyticsAdapter.js b/modules/yieldoneAnalyticsAdapter.js
index dd40e205b07..0663ecb3f76 100644
--- a/modules/yieldoneAnalyticsAdapter.js
+++ b/modules/yieldoneAnalyticsAdapter.js
@@ -1,10 +1,10 @@
+import { isArray, deepClone } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { targeting } from '../src/targeting.js';
 import { auctionManager } from '../src/auctionManager.js';
-import * as utils from '../src/utils.js';
 
 const ANALYTICS_CODE = 'yieldone';
 const analyticsType = 'endpoint';
@@ -42,7 +42,7 @@ function makeAdUnitNameMap() {
 }
 
 function addAdUnitNameForArray(ar, map) {
-  if (utils.isArray(ar)) {
+  if (isArray(ar)) {
     ar.forEach((it) => { addAdUnitName(it, map) });
   }
 }
@@ -51,14 +51,14 @@ function addAdUnitName(params, map) {
   if (params.adUnitCode && map[params.adUnitCode]) {
     params.adUnitName = map[params.adUnitCode];
   }
-  if (utils.isArray(params.adUnits)) {
+  if (isArray(params.adUnits)) {
     params.adUnits.forEach((adUnit) => {
       if (adUnit.code && map[adUnit.code]) {
         adUnit.name = map[adUnit.code];
       }
     });
   }
-  if (utils.isArray(params.adUnitCodes)) {
+  if (isArray(params.adUnitCodes)) {
     params.adUnitNames = params.adUnitCodes.map((code) => map[code]);
   }
   ['bids', 'bidderRequests', 'bidsReceived', 'noBids'].forEach((it) => {
@@ -71,13 +71,13 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
   track({eventType, args = {}}) {
     if (eventType === CONSTANTS.EVENTS.BID_REQUESTED) {
       const reqBidderId = `${args.bidderCode}_${args.auctionId}`;
-      requestedBidders[reqBidderId] = utils.deepClone(args);
+      requestedBidders[reqBidderId] = deepClone(args);
       requestedBidders[reqBidderId].bids = [];
       args.bids.forEach((bid) => {
         requestedBids[`${bid.bidId}_${bid.auctionId}`] = bid;
       });
     }
-    if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT && utils.isArray(args)) {
+    if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT && isArray(args)) {
       const eventsStorage = yieldoneAnalytics.eventsStorage;
       const reqBidders = {};
       args.forEach((bid) => {
@@ -99,7 +99,8 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
       if (currentAuctionId) {
         const eventsStorage = yieldoneAnalytics.eventsStorage;
         if (!eventsStorage[currentAuctionId]) eventsStorage[currentAuctionId] = {events: []};
-        const referrer = args.refererInfo && args.refererInfo.referer;
+        // TODO: is 'page' the right value here?
+        const referrer = args.refererInfo && args.refererInfo.page;
         if (referrer && referrers[currentAuctionId] !== referrer) {
           referrers[currentAuctionId] = referrer;
         }
@@ -123,7 +124,7 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
             auctionManager.getAdUnitCodes(),
             auctionManager.getBidsReceived()
           );
-          if (yieldoneAnalytics.eventsStorage[currentAuctionId]) {
+          if (yieldoneAnalytics.eventsStorage[currentAuctionId] && yieldoneAnalytics.eventsStorage[currentAuctionId].events.length) {
             yieldoneAnalytics.eventsStorage[currentAuctionId].page = {url: referrers[currentAuctionId]};
             yieldoneAnalytics.eventsStorage[currentAuctionId].pubId = pubId;
             yieldoneAnalytics.eventsStorage[currentAuctionId].wrapper_version = '$prebid.version$';
@@ -139,8 +140,8 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
       }
     }
   },
-  sendStat(events, auctionId) {
-    if (!events) return;
+  sendStat(data, auctionId) {
+    if (!data || !data.events || !data.events.length) return;
     delete yieldoneAnalytics.eventsStorage[auctionId];
     ajax(
       url,
@@ -148,7 +149,7 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
         success: function() {},
         error: function() {}
       },
-      JSON.stringify(events),
+      JSON.stringify(data),
       {
         method: 'POST'
       }
diff --git a/modules/yieldoneBidAdapter.js b/modules/yieldoneBidAdapter.js
index 59240878426..d408a0595f9 100644
--- a/modules/yieldoneBidAdapter.js
+++ b/modules/yieldoneBidAdapter.js
@@ -1,32 +1,61 @@
-import * as utils from '../src/utils.js';
+import {deepAccess, isEmpty, isStr, logWarn, parseSizesInput} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory').BidderSpec} BidderSpec
+ * @typedef {import('../src/adapters/bidderFactory').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory').UserSync} UserSync
+ * @typedef {import('../src/auction').BidderRequest} BidderRequest
+ */
+
 const BIDDER_CODE = 'yieldone';
 const ENDPOINT_URL = 'https://y.one.impact-ad.jp/h_bid';
 const USER_SYNC_URL = 'https://y.one.impact-ad.jp/push_sync';
 const VIDEO_PLAYER_URL = 'https://img.ak.impact-ad.jp/ic/pone/ivt/firstview/js/dac-video-prebid.min.js';
+const CMER_PLAYER_URL = 'https://an.cmertv.com/hb/renderer/cmertv-video-yone-prebid.min.js';
 const VIEWABLE_PERCENTAGE_URL = 'https://img.ak.impact-ad.jp/ic/pone/ivt/firstview/js/prebid-adformat-config.js';
 
+const DEFAULT_VIDEO_SIZE = {w: 640, h: 360};
+
+/** @type BidderSpec */
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['y1'],
   supportedMediaTypes: [BANNER, VIDEO],
+  /**
+   * Determines whether or not the given bid request is valid.
+   * @param {BidRequest} bid The bid params to validate.
+   * @returns {boolean} True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     return !!(bid.params.placementId);
   },
+  /**
+   * Make a server request from the list of BidRequests.
+   * @param {Bid[]} validBidRequests - An array of bids.
+   * @param {BidderRequest} bidderRequest - bidder request object.
+   * @returns {ServerRequest|ServerRequest[]} ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     return validBidRequests.map(bidRequest => {
       const params = bidRequest.params;
       const placementId = params.placementId;
       const cb = Math.floor(Math.random() * 99999999999);
-      const referrer = bidderRequest.refererInfo.referer;
+      // TODO: is 'page' the right value here?
+      const referrer = bidderRequest.refererInfo.page;
       const bidId = bidRequest.bidId;
       const transactionId = bidRequest.transactionId;
       const unitCode = bidRequest.adUnitCode;
       const timeout = config.getConfig('bidderTimeout');
+      const language = window.navigator.language;
+      const screenSize = window.screen.width + 'x' + window.screen.height;
       const payload = {
         v: 'hb1',
         p: placementId,
@@ -36,28 +65,66 @@ export const spec = {
         tid: transactionId,
         uc: unitCode,
         tmax: timeout,
-        t: 'i'
+        t: 'i',
+        language: language,
+        screen_size: screenSize
       };
 
-      const videoMediaType = utils.deepAccess(bidRequest, 'mediaTypes.video');
-      if ((utils.isEmpty(bidRequest.mediaType) && utils.isEmpty(bidRequest.mediaTypes)) ||
-      (bidRequest.mediaType === BANNER || (bidRequest.mediaTypes && bidRequest.mediaTypes[BANNER]))) {
-        const sizes = utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes') || bidRequest.sizes;
-        payload.sz = utils.parseSizesInput(sizes).join(',');
-      } else if (bidRequest.mediaType === VIDEO || videoMediaType) {
-        const sizes = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize') || bidRequest.sizes;
-        const size = utils.parseSizesInput(sizes)[0];
-        payload.w = size.split('x')[0];
-        payload.h = size.split('x')[1];
+      const mediaType = getMediaType(bidRequest);
+      switch (mediaType) {
+        case BANNER:
+          payload.sz = getBannerSizes(bidRequest);
+          break;
+        case VIDEO:
+          const videoSize = getVideoSize(bidRequest);
+          payload.w = videoSize.w;
+          payload.h = videoSize.h;
+          break;
+        default:
+          break;
+      }
+
+      // LiveRampID
+      const idlEnv = deepAccess(bidRequest, 'userId.idl_env');
+      if (isStr(idlEnv) && !isEmpty(idlEnv)) {
+        payload.lr_env = idlEnv;
+      }
+
+      // IMID
+      const imuid = deepAccess(bidRequest, 'userId.imuid');
+      if (isStr(imuid) && !isEmpty(imuid)) {
+        payload.imuid = imuid;
+      }
+
+      // DACID
+      const fuuid = deepAccess(bidRequest, 'userId.dacId.fuuid');
+      const dacid = deepAccess(bidRequest, 'userId.dacId.id');
+      if (isStr(fuuid) && !isEmpty(fuuid)) {
+        payload.fuuid = fuuid;
+      }
+      if (isStr(dacid) && !isEmpty(dacid)) {
+        payload.dac_id = dacid;
+      }
+
+      // ID5
+      const id5id = deepAccess(bidRequest, 'userId.id5id.uid');
+      if (isStr(id5id) && !isEmpty(id5id)) {
+        payload.id5Id = id5id;
       }
 
       return {
         method: 'GET',
         url: ENDPOINT_URL,
         data: payload,
-      }
+      };
     });
   },
+  /**
+   * Unpack the response from the server into a list of bids.
+   * @param {ServerResponse} serverResponse - A successful response from the server.
+   * @param {BidRequest} bidRequests
+   * @returns {Bid[]} - An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, bidRequest) {
     const bidResponses = [];
     const response = serverResponse.body;
@@ -81,7 +148,10 @@ export const spec = {
         currency: currency,
         netRevenue: netRevenue,
         ttl: config.getConfig('_bidderTimeout'),
-        referrer: referrer
+        referrer: referrer,
+        meta: {
+          advertiserDomains: response.adomain ? response.adomain : []
+        },
       };
 
       if (response.adTag && renderId === 'ViewableRendering') {
@@ -136,13 +206,22 @@ export const spec = {
       } else if (response.adm) {
         bidResponse.mediaType = VIDEO;
         bidResponse.vastXml = response.adm;
-        bidResponse.renderer = newRenderer(response);
+        if (renderId === 'cmer') {
+          bidResponse.renderer = newCmerRenderer(response);
+        } else {
+          bidResponse.renderer = newRenderer(response);
+        }
       }
 
       bidResponses.push(bidResponse);
     }
     return bidResponses;
   },
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @returns {UserSync[]} The user syncs which should be dropped.
+   */
   getUserSyncs: function(syncOptions) {
     if (syncOptions.iframeEnabled) {
       return [{
@@ -153,6 +232,111 @@ export const spec = {
   },
 }
 
+/**
+ * NOTE: server side does not yet support multiple formats.
+ * @param  {Object} bidRequest -
+ * @param  {boolean} [enabledOldFormat = true] - default: `true`.
+ * @returns {string|null} - `"banner"` or `"video"` or `null`.
+ */
+function getMediaType(bidRequest, enabledOldFormat = true) {
+  let hasBannerType = Boolean(deepAccess(bidRequest, 'mediaTypes.banner'));
+  let hasVideoType = Boolean(deepAccess(bidRequest, 'mediaTypes.video'));
+
+  if (enabledOldFormat) {
+    hasBannerType = hasBannerType || bidRequest.mediaType === BANNER ||
+      (isEmpty(bidRequest.mediaTypes) && isEmpty(bidRequest.mediaType));
+    hasVideoType = hasVideoType || bidRequest.mediaType === VIDEO;
+  }
+
+  if (hasBannerType && hasVideoType) {
+    const playerParams = deepAccess(bidRequest, 'params.playerParams');
+    if (playerParams) {
+      return VIDEO;
+    } else {
+      return BANNER;
+    }
+  } else if (hasBannerType) {
+    return BANNER;
+  } else if (hasVideoType) {
+    return VIDEO;
+  }
+
+  return null;
+}
+
+/**
+ * NOTE:
+ *   If `mediaTypes.banner` exists, then `mediaTypes.banner.sizes` must also exist.
+ *   The reason for this is that Prebid.js will perform the verification and
+ *   if `mediaTypes.banner.sizes` is inappropriate, it will delete the entire `mediaTypes.banner`.
+ * @param  {Object} bidRequest -
+ * @param  {Object} bidRequest.banner -
+ * @param  {Array<string>} bidRequest.banner.sizes -
+ * @param  {boolean} [enabledOldFormat = true] - default: `true`.
+ * @returns {string} - strings like `"300x250"` or `"300x250,728x90"`.
+ */
+function getBannerSizes(bidRequest, enabledOldFormat = true) {
+  let sizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes');
+
+  if (enabledOldFormat) {
+    sizes = sizes || bidRequest.sizes;
+  }
+
+  return parseSizesInput(sizes).join(',');
+}
+
+/**
+ * @param  {Object} bidRequest -
+ * @param  {boolean} [enabledOldFormat = true] - default: `true`.
+ * @param  {boolean} [enabled1x1 = true] - default: `true`.
+ * @returns {{w: number, h: number}} -
+ */
+function getVideoSize(bidRequest, enabledOldFormat = true, enabled1x1 = true) {
+  /**
+   * @param  {Array<number, number> | Array<Array<number, number>>} sizes -
+   * @return {{w: number, h: number} | null} -
+   */
+  const _getPlayerSize = (sizes) => {
+    let result = null;
+
+    const size = parseSizesInput(sizes)[0];
+    if (isEmpty(size)) {
+      return result;
+    }
+
+    const splited = size.split('x');
+    const sizeObj = {w: parseInt(splited[0], 10), h: parseInt(splited[1], 10)};
+    const _isValidPlayerSize = !(isEmpty(sizeObj)) && (isFinite(sizeObj.w) && isFinite(sizeObj.h));
+    if (!_isValidPlayerSize) {
+      return result;
+    }
+
+    result = sizeObj;
+    return result;
+  }
+
+  let playerSize = _getPlayerSize(deepAccess(bidRequest, 'mediaTypes.video.playerSize'));
+
+  if (enabledOldFormat) {
+    playerSize = playerSize || _getPlayerSize(bidRequest.sizes);
+  }
+
+  if (enabled1x1) {
+    // NOTE: `video.playerSize` in 1x1 is always [1,1].
+    if (playerSize && (playerSize.w === 1 && playerSize.h === 1)) {
+      // NOTE: `params.playerSize` is a specific object to support `1x1`.
+      playerSize = _getPlayerSize(deepAccess(bidRequest, 'params.playerSize'));
+    }
+  }
+
+  return playerSize || DEFAULT_VIDEO_SIZE;
+}
+
+/**
+ * Create render for outstream video.
+ * @param {Object} serverResponse.body -
+ * @returns {Renderer} - Prebid Renderer object
+ */
 function newRenderer(response) {
   const renderer = Renderer.install({
     id: response.uid,
@@ -163,16 +347,51 @@ function newRenderer(response) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on newRenderer', err);
+    logWarn('Prebid Error calling setRender on newRenderer', err);
   }
 
   return renderer;
 }
 
+/**
+ * Handles an outstream response after the library is loaded
+ * @param {Object} bid
+ */
 function outstreamRender(bid) {
   bid.renderer.push(() => {
     window.DACIVTPREBID.renderPrebid(bid);
   });
 }
 
+/**
+ * Create render for cmer outstream video.
+ * @param {Object} serverResponse.body -
+ * @returns {Renderer} - Prebid Renderer object
+ */
+function newCmerRenderer(response) {
+  const renderer = Renderer.install({
+    id: response.uid,
+    url: CMER_PLAYER_URL,
+    loaded: false,
+  });
+
+  try {
+    renderer.setRender(cmerRender);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on newRenderer', err);
+  }
+
+  return renderer;
+}
+
+/**
+ * Handles an outstream response after the library is loaded
+ * @param {Object} bid
+ */
+function cmerRender(bid) {
+  bid.renderer.push(() => {
+    window.CMERYONEPREBID.renderPrebid(bid);
+  });
+}
+
 registerBidder(spec);
diff --git a/modules/yieldoneBidAdapter.md b/modules/yieldoneBidAdapter.md
index 1414d4e464f..d1306a08202 100644
--- a/modules/yieldoneBidAdapter.md
+++ b/modules/yieldoneBidAdapter.md
@@ -13,8 +13,7 @@ Connect to YIELDONE for bids.
 THE YIELDONE adapter requires setup and approval from the YIELDONE team.
 Please reach out to your account team or y1s@platform-one.co.jp for more information.
 
-Note: THE YIELDONE adapter do not support "multi-format" scenario... if both
-banner and video are specified as mediatypes, YIELDONE will treat it as a video unit.
+YIELDONE adapter supports Banner, Video and Multi-Format(video, banner) currently.
 
 # Test Parameters
 ```javascript
@@ -24,13 +23,16 @@ var adUnits = [
       code: 'banner-div',
       mediaTypes: {
         banner: {
-          sizes: [[300, 250], [336, 280]]
+          sizes: [
+            [300, 250],
+            [336, 280]
+          ]
         }
       },
       bids: [{
          bidder: 'yieldone',
          params: {
-           placementId: '36891'
+           placementId: '36891'  // required
          }
        }]
    },
@@ -44,11 +46,109 @@ var adUnits = [
         },
       },
       bids: [{
-         bidder: 'yieldone',
-         params: {
-           placementId: '41993'
-         }
-       }]
+        bidder: "yieldone",
+        params: {
+          placementId: "36892",     // required
+          playerParams: {           // optional
+            wrapperWidth: "320px",  // optional
+            wrapperHeight: "180px"  // optional
+          },
+        }
+      }]
+   },
+   // Video adUnit(mediaTypes.video.playerSize: [1,1])
+   {
+      code: 'video-1x1-div',
+      mediaTypes: {
+        video: {
+          playerSize: [[1, 1]],
+          context: 'outstream'
+        },
+      },
+      bids: [{
+        bidder: 'yieldone',
+        params: {
+          placementId: "36892",     // required
+          playerSize: [640, 360],   // required
+          playerParams: {           // optional
+            wrapperWidth: "320px",  // optional
+            wrapperHeight: "180px"  // optional
+          },
+        }
+      }]
+   },
+   // Multi-Format adUnit
+   {
+      code: "multi-format-div",
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [1, 1]
+          ]
+        },
+        video: {
+          playerSize: [640, 360],
+          context: "outstream"
+        }
+      },
+      bids: [{
+        // * "video" bid object should be placed before "banner" bid object.
+        // This bid will request a "video" media type ad.
+        bidder: "yieldone",
+        params: {
+          placementId: "36892",     // required
+          playerParams: {           // required
+            wrapperWidth: "320px",  // optional
+            wrapperHeight: "180px"  // optional
+          },
+        }
+      },
+      {
+        // This bid will request a "banner" media type ad.
+        bidder: "yieldone",
+        params: {
+          placementId: "36891"  // required
+        }
+      }
+    ]
+   },
+   // Multi-Format adUnit(mediaTypes.video.playerSize: [1,1])
+   {
+      code: "multi-format-1x1-div",
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [1, 1]
+          ]
+        },
+        video: {
+          playerSize: [1, 1],
+          context: "outstream"
+        }
+      },
+      bids: [{
+        // * "video" bid object should be placed before "banner" bid object.
+        // This bid will request a "video" media type ad.
+        bidder: "yieldone",
+        params: {
+          placementId: "36892",     // required
+          playerSize: [640, 360],   // required
+          playerParams: {           // required
+            wrapperWidth: "320px",  // optional
+            wrapperHeight: "180px"  // optional
+          },
+        }
+      },
+      {
+        // This bid will request a "banner" media type ad.
+        bidder: "yieldone",
+        params: {
+          placementId: "36891"  // required
+        }
+      }
+    ]
    }
 ```
 
diff --git a/modules/yuktamediaAnalyticsAdapter.js b/modules/yuktamediaAnalyticsAdapter.js
index b346a26c843..31c6daae7f6 100644
--- a/modules/yuktamediaAnalyticsAdapter.js
+++ b/modules/yuktamediaAnalyticsAdapter.js
@@ -1,136 +1,260 @@
-import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import {buildUrl, generateUUID, getWindowLocation, logError, logInfo, parseSizesInput, parseUrl} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import * as utils from '../src/utils.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {includes as strIncludes} from '../src/polyfill.js';
 
-const emptyUrl = '';
-const analyticsType = 'endpoint';
-const yuktamediaAnalyticsVersion = 'v2.0.0';
+const storage = getStorageManager();
+const yuktamediaAnalyticsVersion = 'v3.1.0';
 
 let initOptions;
-let auctionTimestamp;
-let events = {
-  bids: []
+
+const events = {
+  auctions: {}
+};
+const localStoragePrefix = 'yuktamediaAnalytics_';
+const utmTags = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'];
+const location = getWindowLocation();
+// TODO: is 'page' the right value here?
+const referer = getRefererInfo().page;
+const _pageInfo = {
+  userAgent: window.navigator.userAgent,
+  timezoneOffset: new Date().getTimezoneOffset(),
+  language: window.navigator.language,
+  screenWidth: window.screen.width,
+  screenHeight: window.screen.height,
+  pageViewId: generateUUID(),
+  host: location.host,
+  path: location.pathname,
+  search: location.search,
+  hash: location.hash,
+  referer: referer,
+  refererDomain: parseUrl(referer).host,
+  yuktamediaAnalyticsVersion: yuktamediaAnalyticsVersion,
+  prebidVersion: $$PREBID_GLOBAL$$.version
 };
 
-var yuktamediaAnalyticsAdapter = Object.assign(adapter(
-  {
-    emptyUrl,
-    analyticsType
-  }), {
-  track({ eventType, args }) {
-    if (typeof args !== 'undefined') {
-      if (eventType === CONSTANTS.EVENTS.BID_TIMEOUT) {
-        args.forEach(item => { mapBidResponse(item, 'timeout'); });
-      } else if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
-        events.auctionInit = args;
-        auctionTimestamp = args.timestamp;
-      } else if (eventType === CONSTANTS.EVENTS.BID_REQUESTED) {
-        mapBidRequests(args).forEach(item => { events.bids.push(item) });
-      } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
-        mapBidResponse(args, 'response');
-      } else if (eventType === CONSTANTS.EVENTS.BID_WON) {
-        send({
-          bidWon: mapBidResponse(args, 'win')
-        }, 'won');
-      }
+function getParameterByName(param) {
+  let vars = {};
+  window.location.href.replace(location.hash, '').replace(
+    /[?&]+([^=&]+)=?([^&]*)?/gi,
+    function (m, key, value) {
+      vars[key] = value !== undefined ? value : '';
     }
+  );
+  return vars[param] ? vars[param] : '';
+}
 
-    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
-      send(events, 'auctionEnd');
-    }
-  }
-});
+function isNavigatorSendBeaconSupported() {
+  return ('navigator' in window) && ('sendBeacon' in window.navigator);
+}
 
-function mapBidRequests(params) {
-  let arr = [];
-  if (typeof params.bids !== 'undefined' && params.bids.length) {
-    params.bids.forEach(function (bid) {
-      arr.push({
-        bidderCode: bid.bidder,
-        bidId: bid.bidId,
-        adUnitCode: bid.adUnitCode,
-        requestId: bid.bidderRequestId,
-        auctionId: bid.auctionId,
-        transactionId: bid.transactionId,
-        sizes: utils.parseSizesInput(bid.mediaTypes.banner.sizes).toString(),
-        renderStatus: 1,
-        requestTimestamp: params.auctionStart
-      });
-    });
+function updateSessionId() {
+  if (isSessionIdTimeoutExpired()) {
+    let newSessionId = generateUUID();
+    storage.setDataInLocalStorage(localStoragePrefix.concat('session_id'), newSessionId);
   }
-  return arr;
+  initOptions.sessionId = getSessionId();
+  updateSessionIdTimeout();
 }
 
-function mapBidResponse(bidResponse, status) {
-  if (status !== 'win') {
-    let bid = events.bids.filter(o => o.bidId == bidResponse.bidId || o.bidId == bidResponse.requestId)[0];
-    Object.assign(bid, {
-      bidderCode: bidResponse.bidder,
-      bidId: status == 'timeout' ? bidResponse.bidId : bidResponse.requestId,
-      adUnitCode: bidResponse.adUnitCode,
-      auctionId: bidResponse.auctionId,
-      creativeId: bidResponse.creativeId,
-      transactionId: bidResponse.transactionId,
-      currency: bidResponse.currency,
-      cpm: bidResponse.cpm,
-      netRevenue: bidResponse.netRevenue,
-      mediaType: bidResponse.mediaType,
-      statusMessage: bidResponse.statusMessage,
-      status: bidResponse.status,
-      renderStatus: status == 'timeout' ? 3 : 2,
-      timeToRespond: bidResponse.timeToRespond,
-      requestTimestamp: bidResponse.requestTimestamp,
-      responseTimestamp: bidResponse.responseTimestamp
-    });
-  } else if (status == 'win') {
-    return {
-      bidderCode: bidResponse.bidder,
-      bidId: bidResponse.requestId,
-      adUnitCode: bidResponse.adUnitCode,
-      auctionId: bidResponse.auctionId,
-      creativeId: bidResponse.creativeId,
-      transactionId: bidResponse.transactionId,
-      currency: bidResponse.currency,
-      cpm: bidResponse.cpm,
-      netRevenue: bidResponse.netRevenue,
-      renderedSize: bidResponse.size,
-      mediaType: bidResponse.mediaType,
-      statusMessage: bidResponse.statusMessage,
-      status: bidResponse.status,
-      renderStatus: 4,
-      timeToRespond: bidResponse.timeToRespond,
-      requestTimestamp: bidResponse.requestTimestamp,
-      responseTimestamp: bidResponse.responseTimestamp
-    }
-  }
+function updateSessionIdTimeout() {
+  storage.setDataInLocalStorage(localStoragePrefix.concat('session_timeout'), Date.now());
 }
 
-function send(data, status) {
-  let location = utils.getWindowLocation();
-  if (typeof data !== 'undefined' && typeof data.auctionInit !== 'undefined') {
-    data.auctionInit = Object.assign({ host: location.host, path: location.pathname, search: location.search }, data.auctionInit);
-  }
-  data.initOptions = initOptions;
+function isSessionIdTimeoutExpired() {
+  let cpmSessionTimestamp = storage.getDataFromLocalStorage(localStoragePrefix.concat('session_timeout'));
+  return Date.now() - cpmSessionTimestamp > 3600000;
+}
+
+function getSessionId() {
+  return storage.getDataFromLocalStorage(localStoragePrefix.concat('session_id')) ? storage.getDataFromLocalStorage(localStoragePrefix.concat('session_id')) : '';
+}
+
+function isUtmTimeoutExpired() {
+  let utmTimestamp = storage.getDataFromLocalStorage(localStoragePrefix.concat('utm_timeout'));
+  return (Date.now() - utmTimestamp) > 3600000;
+}
 
-  let yuktamediaAnalyticsRequestUrl = utils.buildUrl({
+function send(data, status) {
+  data.initOptions = Object.assign(_pageInfo, initOptions);
+  const yuktamediaAnalyticsRequestUrl = buildUrl({
     protocol: 'https',
     hostname: 'analytics-prebid.yuktamedia.com',
-    pathname: status == 'auctionEnd' ? '/api/bids' : '/api/bid/won',
-    search: {
-      auctionTimestamp: auctionTimestamp,
-      yuktamediaAnalyticsVersion: yuktamediaAnalyticsVersion,
-      prebidVersion: $$PREBID_GLOBAL$$.version
-    }
+    pathname: '/api/bids'
   });
-
-  ajax(yuktamediaAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/plain' });
+  if (isNavigatorSendBeaconSupported()) {
+    window.navigator.sendBeacon(yuktamediaAnalyticsRequestUrl, JSON.stringify(data));
+  } else {
+    ajax(yuktamediaAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/plain' });
+  }
 }
 
+var yuktamediaAnalyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoint' }), {
+  track({ eventType, args }) {
+    if (typeof args !== 'undefined') {
+      switch (eventType) {
+        case CONSTANTS.EVENTS.AUCTION_INIT:
+          logInfo(localStoragePrefix + 'AUCTION_INIT:', JSON.stringify(args));
+          if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
+            events.auctions[args.auctionId] = { bids: {} };
+          }
+          break;
+        case CONSTANTS.EVENTS.BID_REQUESTED:
+          logInfo(localStoragePrefix + 'BID_REQUESTED:', JSON.stringify(args));
+          if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
+            if (typeof events.auctions[args.auctionId] === 'undefined') {
+              events.auctions[args.auctionId] = { bids: {} };
+            }
+            events.auctions[args.auctionId]['timeStamp'] = args.start;
+            args.bids.forEach(function (bidRequest) {
+              events.auctions[args.auctionId]['bids'][bidRequest.bidId] = {
+                bidder: bidRequest.bidder,
+                adUnit: bidRequest.adUnitCode,
+                sizes: parseSizesInput(bidRequest.sizes).toString(),
+                isBid: false,
+                won: false,
+                timeout: false,
+                renderStatus: 'bid-requested',
+                bidId: bidRequest.bidId,
+                auctionId: args.auctionId
+              }
+              if (typeof initOptions.enableUserIdCollection !== 'undefined' && initOptions.enableUserIdCollection && typeof bidRequest['userId'] !== 'undefined') {
+                for (let [userIdProvider, userId] in Object.entries(bidRequest['userId'])) {
+                  userIdProvider = typeof userIdProvider !== 'string' ? JSON.stringify(userIdProvider) : userIdProvider;
+                  userId = typeof userId !== 'string' ? JSON.stringify(userId) : userId;
+                  events.auctions[args.auctionId]['bids'][bidRequest.bidId]['userID-'.concat(userIdProvider)] = userId;
+                }
+              }
+            });
+          }
+          break;
+        case CONSTANTS.EVENTS.BID_RESPONSE:
+          logInfo(localStoragePrefix + 'BID_RESPONSE:', JSON.stringify(args));
+          if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
+            if (typeof events.auctions[args.auctionId] === 'undefined') {
+              events.auctions[args.auctionId] = { bids: {} };
+            } else if (Object.keys(events.auctions[args.auctionId]['bids']).length) {
+              let bidResponse = events.auctions[args.auctionId]['bids'][args.requestId];
+              bidResponse.isBid = args.getStatusCode() === CONSTANTS.STATUS.GOOD;
+              bidResponse.cpm = args.cpm;
+              bidResponse.currency = args.currency;
+              bidResponse.netRevenue = args.netRevenue;
+              bidResponse.dealId = typeof args.dealId !== 'undefined' ? args.dealId : '';
+              bidResponse.mediaType = args.mediaType;
+              if (bidResponse.mediaType === 'native') {
+                bidResponse.nativeTitle = typeof args['native']['title'] !== 'undefined' ? args['native']['title'] : '';
+                bidResponse.nativeSponsoredBy = typeof args['native']['sponsoredBy'] !== 'undefined' ? args['native']['sponsoredBy'] : '';
+              }
+              bidResponse.timeToRespond = args.timeToRespond;
+              bidResponse.requestTimestamp = args.requestTimestamp;
+              bidResponse.responseTimestamp = args.responseTimestamp;
+              bidResponse.bidForSize = args.size;
+              for (const [adserverTargetingKey, adserverTargetingValue] of Object.entries(args.adserverTargeting)) {
+                if (['body', 'icon', 'image', 'linkurl', 'host', 'path'].every((ele) => !strIncludes(adserverTargetingKey, ele))) {
+                  bidResponse['adserverTargeting-' + adserverTargetingKey] = adserverTargetingValue;
+                }
+              }
+              bidResponse.renderStatus = 'bid-response-received';
+            }
+          }
+          break;
+        case CONSTANTS.EVENTS.NO_BID:
+          logInfo(localStoragePrefix + 'NO_BID:', JSON.stringify(args));
+          if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
+            if (typeof events.auctions[args.auctionId] === 'undefined') {
+              events.auctions[args.auctionId] = { bids: {} };
+            } else if (Object.keys(events.auctions[args.auctionId]['bids']).length) {
+              const noBid = events.auctions[args.auctionId]['bids'][args.bidId];
+              noBid.renderStatus = 'no-bid';
+            }
+          }
+          break;
+        case CONSTANTS.EVENTS.BID_WON:
+          logInfo(localStoragePrefix + 'BID_WON:', JSON.stringify(args));
+          if (typeof initOptions.enableSession !== 'undefined' && initOptions.enableSession) {
+            updateSessionId();
+          }
+          if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
+            if (typeof events.auctions[args.auctionId] === 'undefined') {
+              events.auctions[args.auctionId] = { bids: {} };
+            } else if (Object.keys(events.auctions[args.auctionId]['bids']).length) {
+              const wonBid = events.auctions[args.auctionId]['bids'][args.requestId];
+              wonBid.won = true;
+              wonBid.renderStatus = 'bid-won';
+              send({ 'bids': [wonBid] }, 'won');
+            }
+          }
+          break;
+        case CONSTANTS.EVENTS.BID_TIMEOUT:
+          logInfo(localStoragePrefix + 'BID_TIMEOUT:', JSON.stringify(args));
+          if (args.length) {
+            args.forEach(timeout => {
+              if (typeof timeout !== 'undefined' && typeof timeout.auctionId !== 'undefined' && timeout.auctionId.length) {
+                if (typeof events.auctions[args.auctionId] === 'undefined') {
+                  events.auctions[args.auctionId] = { bids: {} };
+                } else if (Object.keys(events.auctions[args.auctionId]['bids']).length) {
+                  const timeoutBid = events.auctions[timeout.auctionId].bids[timeout.bidId];
+                  timeoutBid.timeout = true;
+                  timeoutBid.renderStatus = 'bid-timedout';
+                }
+              }
+            });
+          }
+          break;
+        case CONSTANTS.EVENTS.AUCTION_END:
+          logInfo(localStoragePrefix + 'AUCTION_END:', JSON.stringify(args));
+          if (typeof initOptions.enableSession !== 'undefined' && initOptions.enableSession) {
+            updateSessionId();
+          }
+          if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
+            const bids = Object.values(events.auctions[args.auctionId]['bids']);
+            send({ 'bids': bids }, 'auctionEnd');
+          }
+          break;
+      }
+    }
+  }
+});
+
+yuktamediaAnalyticsAdapter.buildUtmTagData = function (options) {
+  let utmTagData = {};
+  let utmTagsDetected = false;
+  if (typeof options.enableUTMCollection !== 'undefined' && options.enableUTMCollection) {
+    utmTags.forEach(function (utmTagKey) {
+      let utmTagValue = getParameterByName(utmTagKey);
+      if (utmTagValue !== '') {
+        utmTagsDetected = true;
+      }
+      utmTagData[utmTagKey] = utmTagValue;
+    });
+    utmTags.forEach(function (utmTagKey) {
+      if (utmTagsDetected) {
+        storage.setDataInLocalStorage(localStoragePrefix.concat(utmTagKey), utmTagData[utmTagKey]);
+        storage.setDataInLocalStorage(localStoragePrefix.concat('utm_timeout'), Date.now());
+      } else {
+        if (!isUtmTimeoutExpired()) {
+          utmTagData[utmTagKey] = storage.getDataFromLocalStorage(localStoragePrefix.concat(utmTagKey)) ? storage.getDataFromLocalStorage(localStoragePrefix.concat(utmTagKey)) : '';
+          storage.setDataInLocalStorage(localStoragePrefix.concat('utm_timeout'), Date.now());
+        }
+      }
+    });
+  }
+  return utmTagData;
+};
+
 yuktamediaAnalyticsAdapter.originEnableAnalytics = yuktamediaAnalyticsAdapter.enableAnalytics;
 yuktamediaAnalyticsAdapter.enableAnalytics = function (config) {
-  initOptions = config.options;
+  if (config && config.options) {
+    if (typeof config.options.pubId === 'undefined' || typeof config.options.pubKey === 'undefined') {
+      logError('Need pubId and pubKey to log auction results. Please contact a YuktaMedia representative if you do not know your pubId and pubKey.');
+      return;
+    }
+  }
+  initOptions = Object.assign({}, config.options, this.buildUtmTagData(config.options));
   yuktamediaAnalyticsAdapter.originEnableAnalytics(config);
 };
 
diff --git a/modules/yuktamediaAnalyticsAdapter.md b/modules/yuktamediaAnalyticsAdapter.md
index a21675b6b1d..af47985c834 100644
--- a/modules/yuktamediaAnalyticsAdapter.md
+++ b/modules/yuktamediaAnalyticsAdapter.md
@@ -1,5 +1,5 @@
 # Overview
-Module Name: YuktaMedia Analytics Adapter
+Module Name: YuktaOne Analytics by YuktaMedia
 
 Module Type: Analytics Adapter
 
@@ -15,8 +15,11 @@ Analytics adapter for prebid provided by YuktaMedia. Contact info@yuktamedia.com
 {
   provider: 'yuktamedia',
     options : {
-      pubId : 50357   //id provided by YuktaMedia LLP
-      pubKey: 'xxx'   //key provided by YuktaMedia LLP
+      pubId : 50357,               // id provided by YuktaMedia LLP
+      pubKey: 'xxx',               // key provided by YuktaMedia LLP
+      enableUTMCollection: true,   // set true if want to collect utm info
+      enableSession: true,         // set true if want to collect information by sessions
+      enableUserIdCollection: true // set true if want to collect user ID module info
     }
 }
 ```
diff --git a/modules/zedoBidAdapter.js b/modules/zedoBidAdapter.js
deleted file mode 100644
index e75b9c82065..00000000000
--- a/modules/zedoBidAdapter.js
+++ /dev/null
@@ -1,342 +0,0 @@
-import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import find from 'core-js-pure/features/array/find';
-import { Renderer } from '../src/Renderer.js';
-import { getRefererInfo } from '../src/refererDetection.js';
-
-const BIDDER_CODE = 'zedo';
-const SECURE_URL = 'https://saxp.zedo.com/asw/fmh.json';
-const DIM_TYPE = {
-  '7': 'display',
-  '9': 'display',
-  '14': 'display',
-  '70': 'SBR',
-  '83': 'CurtainRaiser',
-  '85': 'Inarticle',
-  '86': 'pswipeup',
-  '88': 'Inview',
-  '100': 'display',
-  '101': 'display',
-  '102': 'display',
-  '103': 'display'
-  // '85': 'pre-mid-post-roll',
-};
-const SECURE_EVENT_PIXEL_URL = 'tt1.zedo.com/log/p.gif';
-
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: [],
-  supportedMediaTypes: [BANNER, VIDEO],
-
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {object} bid The bid to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
-   */
-  isBidRequestValid: function (bid) {
-    return !!(bid.params && bid.params.channelCode && bid.params.dimId);
-  },
-
-  /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
-   * @return ServerRequest Info describing the request to the server.
-   */
-  buildRequests: function (bidRequests, bidderRequest) {
-    let data = {
-      placements: []
-    };
-    bidRequests.map(bidRequest => {
-      let channelCode = parseInt(bidRequest.params.channelCode);
-      let network = parseInt(channelCode / 1000000);
-      let channel = channelCode % 1000000;
-      let dim = getSizes(bidRequest.sizes);
-      let placement = {
-        id: bidRequest.bidId,
-        network: network,
-        channel: channel,
-        publisher: bidRequest.params.pubId ? bidRequest.params.pubId : 0,
-        width: dim[0],
-        height: dim[1],
-        dimension: bidRequest.params.dimId,
-        version: '$prebid.version$',
-        keyword: '',
-        transactionId: bidRequest.transactionId
-      }
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') {
-          data.gdpr = Number(bidderRequest.gdprConsent.gdprApplies);
-        }
-        data.gdpr_consent = bidderRequest.gdprConsent.consentString;
-      }
-      // Add CCPA consent string
-      if (bidderRequest && bidderRequest.uspConsent) {
-        data.usp = bidderRequest.uspConsent;
-      }
-
-      let dimType = DIM_TYPE[String(bidRequest.params.dimId)]
-      if (dimType) {
-        placement['renderers'] = [{
-          'name': dimType
-        }]
-      } else { // default to display
-        placement['renderers'] = [{
-          'name': 'display'
-        }]
-      }
-      data['placements'].push(placement);
-    });
-    // adding schain object
-    if (bidRequests[0].schain) {
-      data['supplyChain'] = getSupplyChain(bidRequests[0].schain);
-    }
-    return {
-      method: 'GET',
-      url: SECURE_URL,
-      data: 'g=' + JSON.stringify(data)
-    }
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
-   */
-  interpretResponse: function (serverResponse, request) {
-    serverResponse = serverResponse.body;
-    const bids = [];
-    if (!serverResponse || serverResponse.error) {
-      let errorMessage = `in response for ${request.bidderCode} adapter`;
-      if (serverResponse && serverResponse.error) { errorMessage += `: ${serverResponse.error}`; }
-      utils.logError(errorMessage);
-      return bids;
-    }
-
-    if (serverResponse.ad) {
-      serverResponse.ad.forEach(ad => {
-        const creativeBid = getCreative(ad);
-        if (creativeBid) {
-          if (parseInt(creativeBid.cpm) !== 0) {
-            const bid = newBid(ad, creativeBid, request);
-            bid.mediaType = parseMediaType(creativeBid);
-            bids.push(bid);
-          }
-        }
-      });
-    }
-    return bids;
-  },
-
-  getUserSyncs: function (syncOptions, responses, gdprConsent) {
-    if (syncOptions.iframeEnabled) {
-      let url = 'https://tt3.zedo.com/rs/us/fcs.html';
-      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
-        // add 'gdpr' only if 'gdprApplies' is defined
-        if (typeof gdprConsent.gdprApplies === 'boolean') {
-          url += `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
-        } else {
-          url += `?gdpr_consent=${gdprConsent.consentString}`;
-        }
-      }
-      return [{
-        type: 'iframe',
-        url: url
-      }];
-    }
-  },
-
-  onTimeout: function (timeoutData) {
-    try {
-      logEvent('117', timeoutData);
-    } catch (e) {
-      utils.logError(e);
-    }
-  },
-
-  onBidWon: function (bid) {
-    try {
-      logEvent('116', [bid]);
-    } catch (e) {
-      utils.logError(e);
-    }
-  }
-
-};
-
-function getSupplyChain (supplyChain) {
-  return {
-    complete: supplyChain.complete,
-    nodes: supplyChain.nodes
-  }
-};
-
-function getCreative(ad) {
-  return ad && ad.creatives && ad.creatives.length && find(ad.creatives, creative => creative.adId);
-};
-/**
- * Unpack the Server's Bid into a Prebid-compatible one.
- * @param serverBid
- * @param rtbBid
- * @param bidderRequest
- * @return Bid
- */
-function newBid(serverBid, creativeBid, bidderRequest) {
-  const bid = {
-    requestId: serverBid.slotId,
-    creativeId: creativeBid.adId,
-    network: serverBid.network,
-    adType: creativeBid.creativeDetails.type,
-    dealId: 99999999,
-    currency: 'USD',
-    netRevenue: true,
-    ttl: 300
-  };
-
-  if (creativeBid.creativeDetails.type === 'VAST') {
-    Object.assign(bid, {
-      width: creativeBid.width,
-      height: creativeBid.height,
-      vastXml: creativeBid.creativeDetails.adContent,
-      cpm: parseInt(creativeBid.bidCpm) / 1000000,
-      ttl: 3600
-    });
-    const rendererOptions = utils.deepAccess(
-      bidderRequest,
-      'renderer.options'
-    );
-    let rendererUrl = 'https://ss3.zedo.com/gecko/beta/fmpbgt.min.js';
-    Object.assign(bid, {
-      adResponse: serverBid,
-      renderer: getRenderer(bid.adUnitCode, serverBid.slotId, rendererUrl, rendererOptions)
-    });
-  } else {
-    Object.assign(bid, {
-      width: creativeBid.width,
-      height: creativeBid.height,
-      cpm: parseInt(creativeBid.bidCpm) / 1000000,
-      ad: creativeBid.creativeDetails.adContent,
-    });
-  }
-
-  return bid;
-}
-/* Turn bid request sizes into compatible format */
-function getSizes(requestSizes) {
-  let width = 0;
-  let height = 0;
-  if (utils.isArray(requestSizes) && requestSizes.length === 2 &&
-    !utils.isArray(requestSizes[0])) {
-    width = parseInt(requestSizes[0], 10);
-    height = parseInt(requestSizes[1], 10);
-  } else if (typeof requestSizes === 'object') {
-    for (let i = 0; i < requestSizes.length; i++) {
-      let size = requestSizes[i];
-      width = parseInt(size[0], 10);
-      height = parseInt(size[1], 10);
-      break;
-    }
-  }
-  return [width, height];
-}
-
-function getRenderer(adUnitCode, rendererId, rendererUrl, rendererOptions = {}) {
-  const renderer = Renderer.install({
-    id: rendererId,
-    url: rendererUrl,
-    config: rendererOptions,
-    loaded: false,
-  });
-
-  try {
-    renderer.setRender(videoRenderer);
-  } catch (err) {
-    utils.logWarn('Prebid Error calling setRender on renderer', err);
-  }
-
-  renderer.setEventHandlers({
-    impression: () => utils.logMessage('ZEDO video impression'),
-    loaded: () => utils.logMessage('ZEDO video loaded'),
-    ended: () => {
-      utils.logMessage('ZEDO renderer video ended');
-      document.querySelector(`#${adUnitCode}`).style.display = 'none';
-    }
-  });
-  return renderer;
-}
-
-function videoRenderer(bid) {
-  // push to render queue
-  const refererInfo = getRefererInfo();
-  let referrer = '';
-  if (refererInfo) {
-    referrer = refererInfo.referer;
-  }
-  bid.renderer.push(() => {
-    let channelCode = utils.deepAccess(bid, 'params.0.channelCode') || 0;
-    let dimId = utils.deepAccess(bid, 'params.0.dimId') || 0;
-    let publisher = utils.deepAccess(bid, 'params.0.pubId') || 0;
-    let options = utils.deepAccess(bid, 'params.0.options') || {};
-    let channel = (channelCode > 0) ? (channelCode - (bid.network * 1000000)) : 0;
-
-    var rndr = new window.ZdPBTag(bid.adUnitCode, bid.network, bid.width, bid.height, bid.adType, bid.vastXml, channel, dimId,
-      (encodeURI(referrer) || ''), options);
-    rndr.renderAd(publisher);
-  });
-}
-
-function parseMediaType(creativeBid) {
-  const adType = creativeBid.creativeDetails.type;
-  if (adType === 'VAST') {
-    return VIDEO;
-  } else {
-    return BANNER;
-  }
-}
-
-function logEvent(eid, data) {
-  let getParams = {
-    protocol: 'https',
-    hostname: SECURE_EVENT_PIXEL_URL,
-    search: getLoggingData(eid, data)
-  };
-  let eventUrl = utils.buildUrl(getParams).replace(/&/g, ';');
-  utils.triggerPixel(eventUrl);
-}
-
-function getLoggingData(eid, data) {
-  data = (utils.isArray(data) && data) || [];
-
-  let params = {};
-  let channel, network, dim, publisher, adunitCode, timeToRespond, cpm;
-  data.map((adunit) => {
-    adunitCode = adunit.adUnitCode;
-    channel = utils.deepAccess(adunit, 'params.0.channelCode') || 0;
-    network = channel > 0 ? parseInt(channel / 1000000) : 0;
-    dim = utils.deepAccess(adunit, 'params.0.dimId') * 256 || 0;
-    publisher = utils.deepAccess(adunit, 'params.0.pubId') || 0;
-    timeToRespond = adunit.timeout ? adunit.timeout : adunit.timeToRespond;
-    cpm = adunit.cpm;
-  });
-  let referrer = '';
-  const refererInfo = getRefererInfo();
-  if (refererInfo) {
-    referrer = refererInfo.referer;
-  }
-  params.n = network;
-  params.c = channel;
-  params.s = publisher;
-  params.x = dim;
-  params.ai = encodeURI('Prebid^zedo^' + adunitCode + '^' + cpm + '^' + timeToRespond);
-  params.pu = encodeURI(referrer) || '';
-  params.eid = eid;
-  params.e = 'e';
-  params.z = Math.random();
-
-  return params;
-}
-
-registerBidder(spec);
diff --git a/modules/zedoBidAdapter.md b/modules/zedoBidAdapter.md
deleted file mode 100644
index 2f31e8aed9b..00000000000
--- a/modules/zedoBidAdapter.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Overview
-
-Module Name: ZEDO Bidder Adapter
-Module Type: Bidder Adapter
-Maintainer: prebidsupport@zedo.com
-
-# Description
-
-Module that connects to ZEDO's demand sources.
-
-ZEDO supports both display and video. 
-For video integration, ZEDO returns content as vastXML and requires the publisher to define the cache url in config passed to Prebid for it to be valid in the auction
-
-ZEDO has its own renderer and will render the video unit if not defined in the config. 
-
-
-# Test Parameters
-# display
-```
-
-    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: 'zedo',
-                params: {
-                    channelCode: 2264004735, //REQUIRED 
-                    dimId:9 //REQUIRED
-                }
-            }]
-
-        }];
-```
-# video
-```
-
-    var adUnit1 = [
-    {   
-        code: 'videoAdUnit', 
-        mediaTypes: 
-        { 
-            video: 
-            { 
-                context: 'outstream', 
-                playerSize: [640, 480]
-            }
-        },
-        bids: [
-            { 
-                bidder: 'zedo', 
-                params: 
-                { 
-                    channelCode: 2264004735, // required
-                    dimId: 85, // required
-                    pubId: 1 // optional
-                } 
-            }
-        ]
-    }];
-```
\ No newline at end of file
diff --git a/modules/zeotapIdPlusIdSystem.js b/modules/zeotapIdPlusIdSystem.js
new file mode 100644
index 00000000000..3437928df4b
--- /dev/null
+++ b/modules/zeotapIdPlusIdSystem.js
@@ -0,0 +1,64 @@
+/**
+ * This module adds Zeotap to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/zeotapIdPlusIdSystem
+ * @requires module:modules/userId
+ */
+import { isStr, isPlainObject } from '../src/utils.js';
+import {submodule} from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const ZEOTAP_COOKIE_NAME = 'IDP';
+const ZEOTAP_VENDOR_ID = 301;
+const ZEOTAP_MODULE_NAME = 'zeotapIdPlus';
+
+function readCookie() {
+  return storage.cookiesAreEnabled() ? storage.getCookie(ZEOTAP_COOKIE_NAME) : null;
+}
+
+function readFromLocalStorage() {
+  return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(ZEOTAP_COOKIE_NAME) : null;
+}
+
+export function getStorage() {
+  return getStorageManager({gvlid: ZEOTAP_VENDOR_ID, moduleName: ZEOTAP_MODULE_NAME});
+}
+
+export const storage = getStorage();
+
+/** @type {Submodule} */
+export const zeotapIdPlusSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: ZEOTAP_MODULE_NAME,
+  /**
+   * Vendor ID of Zeotap
+   * @type {Number}
+   */
+  gvlid: ZEOTAP_VENDOR_ID,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param { Object | string | undefined } value
+   * @return { Object | string | undefined }
+   */
+  decode(value) {
+    const id = value ? isStr(value) ? value : isPlainObject(value) ? value.id : undefined : undefined;
+    return id ? {
+      'IDP': JSON.parse(atob(id))
+    } : undefined;
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} config
+   * @return {{id: string | undefined} | undefined}
+   */
+  getId() {
+    const id = readCookie() || readFromLocalStorage();
+    return id ? { id } : undefined;
+  }
+};
+submodule('userId', zeotapIdPlusSubmodule);
diff --git a/modules/zetaBidAdapter.js b/modules/zetaBidAdapter.js
new file mode 100644
index 00000000000..159ea42cead
--- /dev/null
+++ b/modules/zetaBidAdapter.js
@@ -0,0 +1,190 @@
+import { logWarn, deepAccess } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+const BIDDER_CODE = 'zeta_global';
+const PREBID_DEFINER_ID = '44253'
+const ENDPOINT_URL = 'https://prebid.rfihub.com/prebid';
+const USER_SYNC_URL = 'https://p.rfihub.com/cm?in=1&pub=';
+const DEFAULT_CUR = 'USD';
+const TTL = 200;
+const NET_REV = true;
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  /**
+     * Determines whether or not the given bid request is valid.
+     *
+     * @param {BidRequest} bid The bid params to validate.
+     * @return boolean True if this is a valid bid, and false otherwise.
+     */
+  isBidRequestValid: function(bid) {
+    // check for all required bid fields
+    if (!(bid &&
+          bid.bidId &&
+          bid.params)) {
+      logWarn('Invalid bid request - missing required bid data');
+      return false;
+    }
+
+    if (!(bid.params.user &&
+          bid.params.user.buyeruid)) {
+      logWarn('Invalid bid request - missing required user data');
+      return false;
+    }
+
+    if (!(bid.params.device &&
+          bid.params.device.ip)) {
+      logWarn('Invalid bid request - missing required device data');
+      return false;
+    }
+
+    if (!(bid.params.device.geo &&
+          bid.params.device.geo.country)) {
+      logWarn('Invalid bid request - missing required geo data');
+      return false;
+    }
+
+    if (!bid.params.definerId) {
+      logWarn('Invalid bid request - missing required definer data');
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+     * Make a server request from the list of BidRequests.
+     *
+     * @param {Bids[]} validBidRequests - an array of bidRequest objects
+     * @param {BidderRequest} bidderRequest - master bidRequest object
+     * @return ServerRequest Info describing the request to the server.
+     */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const secure = 1; // treat all requests as secure
+    const request = validBidRequests[0];
+    const params = request.params;
+    let impData = {
+      id: request.bidId,
+      secure: secure,
+      banner: buildBanner(request)
+    };
+    let payload = {
+      id: bidderRequest.auctionId,
+      imp: [impData],
+      site: params.site ? params.site : {},
+      app: params.app ? params.app : {},
+      device: params.device ? params.device : {},
+      user: params.user ? params.user : {},
+      at: params.at,
+      tmax: params.tmax,
+      wseat: params.wseat,
+      bseat: params.bseat,
+      allimps: params.allimps,
+      cur: [DEFAULT_CUR],
+      wlang: params.wlang,
+      bcat: deepAccess(bidderRequest.ortb2Imp, 'bcat') || params.bcat,
+      badv: params.badv,
+      bapp: params.bapp,
+      source: params.source ? params.source : {},
+      regs: params.regs ? params.regs : {},
+      ext: params.ext ? params.ext : {}
+    };
+
+    payload.device.ua = navigator.userAgent;
+    payload.device.ip = navigator.ip;
+    payload.site.page = bidderRequest.refererInfo.page;
+    payload.site.mobile = /(ios|ipod|ipad|iphone|android)/i.test(navigator.userAgent) ? 1 : 0;
+    payload.ext.definerId = params.definerId;
+
+    if (params.test) {
+      payload.test = params.test;
+    }
+    if (request.gdprConsent) {
+      payload.regs.ext = Object.assign(
+        payload.regs.ext,
+        {gdpr: request.gdprConsent.gdprApplies === true ? 1 : 0}
+      );
+    }
+    if (request.gdprConsent && request.gdprConsent.gdprApplies) {
+      payload.user.ext = Object.assign(
+        payload.user.ext,
+        {consent: request.gdprConsent.consentString}
+      );
+    }
+    const postUrl = params.definerId !== PREBID_DEFINER_ID ? ENDPOINT_URL.concat('/', params.definerId) : ENDPOINT_URL;
+    return {
+      method: 'POST',
+      url: postUrl,
+      data: JSON.stringify(payload),
+    };
+  },
+
+  /**
+     * Unpack the response from the server into a list of bids.
+     *
+     * @param {ServerResponse} serverResponse A successful response from the server.
+     * @param bidRequest The payload from the server's response.
+     * @return {Bid[]} An array of bids which were nested inside the server.
+     */
+  interpretResponse: function(serverResponse, bidRequest) {
+    let bidResponse = [];
+    if (Object.keys(serverResponse.body).length !== 0) {
+      let zetaResponse = serverResponse.body;
+      let zetaBid = zetaResponse.seatbid[0].bid[0];
+      let bid = {
+        requestId: zetaBid.impid,
+        cpm: zetaBid.price,
+        currency: zetaResponse.cur,
+        width: zetaBid.w,
+        height: zetaBid.h,
+        ad: zetaBid.adm,
+        ttl: TTL,
+        creativeId: zetaBid.crid,
+        netRevenue: NET_REV
+      };
+      bidResponse.push(bid);
+    }
+    return bidResponse;
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @param {ServerResponse[]} serverResponses List of server's responses.
+   * @param definerId The calling entity's definer id
+   * @param gdprConsent The GDPR consent parameters
+   * @param uspConsent The USP consent parameters
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function(syncOptions, serverResponses, definerId, gdprConsent, uspConsent) {
+    const syncs = [];
+    if (definerId === '' || definerId === null) {
+      definerId = PREBID_DEFINER_ID;
+    }
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: USER_SYNC_URL.concat(definerId)
+      });
+    }
+    return syncs;
+  }
+}
+
+function buildBanner(request) {
+  let sizes = request.sizes;
+  if (request.mediaTypes &&
+    request.mediaTypes.banner &&
+    request.mediaTypes.banner.sizes) {
+    sizes = request.mediaTypes.banner.sizes;
+  }
+  return {
+    w: sizes[0][0],
+    h: sizes[0][1]
+  };
+}
+
+registerBidder(spec);
diff --git a/modules/zetaBidAdapter.md b/modules/zetaBidAdapter.md
new file mode 100644
index 00000000000..e0f7271a4f1
--- /dev/null
+++ b/modules/zetaBidAdapter.md
@@ -0,0 +1,45 @@
+# Overview
+
+```
+Module Name: Zeta Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: DL-ZetaDSP-Supply-Engineering@zetaglobal.com
+```
+
+# Description
+
+Module that connects to Zeta's demand sources
+
+# Test Parameters
+```
+        var adUnits = [
+            {
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300, 250]],  // a display size
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'zeta_global',
+                        bidId: 12345,
+                        params: {
+                            placement: 12345,
+                            user: {
+                                uid: 12345,
+                                buyeruid: 12345
+                            },
+                            device: {
+                                ip: '111.222.33.44',
+                                geo: {
+                                    country: 'USA'
+                                }
+                            },
+                            definerId: '44253',
+                            test: 1
+                        }
+                    }
+                ]
+            }
+        ];
+```
diff --git a/modules/zeta_global_sspAnalyticsAdapter.js b/modules/zeta_global_sspAnalyticsAdapter.js
new file mode 100644
index 00000000000..ee3bb9cd5d6
--- /dev/null
+++ b/modules/zeta_global_sspAnalyticsAdapter.js
@@ -0,0 +1,97 @@
+import { logInfo, logError } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import adapterManager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
+
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+
+const ZETA_GVL_ID = 833;
+const ADAPTER_CODE = 'zeta_global_ssp';
+const BASE_URL = 'https://ssp.disqus.com/prebid/event';
+const LOG_PREFIX = 'ZetaGlobalSsp-Analytics: ';
+
+/// /////////// VARIABLES ////////////////////////////////////
+
+let publisherId; // int
+
+/// /////////// HELPER FUNCTIONS /////////////////////////////
+
+function sendEvent(eventType, event) {
+  ajax(
+    BASE_URL + '/' + eventType,
+    null,
+    JSON.stringify(event)
+  );
+}
+
+/// /////////// ADAPTER EVENT HANDLER FUNCTIONS //////////////
+
+function adRenderSucceededHandler(args) {
+  let eventType = CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED
+  logInfo(LOG_PREFIX + 'handle ' + eventType + ' event');
+
+  sendEvent(eventType, args);
+}
+
+function auctionEndHandler(args) {
+  let eventType = CONSTANTS.EVENTS.AUCTION_END;
+  logInfo(LOG_PREFIX + 'handle ' + eventType + ' event');
+
+  sendEvent(eventType, args);
+}
+
+/// /////////// ADAPTER DEFINITION ///////////////////////////
+
+let baseAdapter = adapter({ analyticsType: 'endpoint' });
+let zetaAdapter = Object.assign({}, baseAdapter, {
+
+  enableAnalytics(config = {}) {
+    let error = false;
+
+    if (typeof config.options === 'object') {
+      if (config.options.sid) {
+        publisherId = Number(config.options.sid);
+      }
+    } else {
+      logError(LOG_PREFIX + 'Config not found');
+      error = true;
+    }
+
+    if (!publisherId) {
+      logError(LOG_PREFIX + 'Missing sid (publisher id)');
+      error = true;
+    }
+
+    if (error) {
+      logError(LOG_PREFIX + 'Analytics is disabled due to error(s)');
+    } else {
+      baseAdapter.enableAnalytics.call(this, config);
+    }
+  },
+
+  disableAnalytics() {
+    publisherId = undefined;
+    baseAdapter.disableAnalytics.apply(this, arguments);
+  },
+
+  track({ eventType, args }) {
+    switch (eventType) {
+      case CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED:
+        adRenderSucceededHandler(args);
+        break;
+      case CONSTANTS.EVENTS.AUCTION_END:
+        auctionEndHandler(args);
+        break;
+    }
+  }
+});
+
+/// /////////// ADAPTER REGISTRATION /////////////////////////
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: zetaAdapter,
+  code: ADAPTER_CODE,
+  gvlid: ZETA_GVL_ID
+});
+
+export default zetaAdapter;
diff --git a/modules/zeta_global_sspAnalyticsAdapter.md b/modules/zeta_global_sspAnalyticsAdapter.md
new file mode 100644
index 00000000000..d586d0069b1
--- /dev/null
+++ b/modules/zeta_global_sspAnalyticsAdapter.md
@@ -0,0 +1,24 @@
+# Zeta Global SSP Analytics Adapter
+
+## Overview
+
+Module Name: Zeta Global SSP Analytics Adapter\
+Module Type: Analytics Adapter\
+Maintainer: abermanov@zetaglobal.com
+
+## Description
+
+Analytics Adapter which sends auctionEnd and adRenderSucceeded events to Zeta Global SSP analytics endpoints
+
+## How to configure
+```
+pbjs.enableAnalytics({
+    provider: 'zeta_global_ssp',
+    options: {
+        sid: 111,
+        tags: {
+            ...
+        }
+    }
+});
+```
diff --git a/modules/zeta_global_sspBidAdapter.js b/modules/zeta_global_sspBidAdapter.js
new file mode 100644
index 00000000000..6c5b9783782
--- /dev/null
+++ b/modules/zeta_global_sspBidAdapter.js
@@ -0,0 +1,298 @@
+import {deepAccess, deepSetValue, isArray, isBoolean, isNumber, isStr, logWarn} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {parseDomain} from '../src/refererDetection.js';
+
+const BIDDER_CODE = 'zeta_global_ssp';
+const ENDPOINT_URL = 'https://ssp.disqus.com/bid/prebid';
+const USER_SYNC_URL_IFRAME = 'https://ssp.disqus.com/sync?type=iframe';
+const USER_SYNC_URL_IMAGE = 'https://ssp.disqus.com/sync?type=image';
+const DEFAULT_CUR = 'USD';
+const TTL = 200;
+const NET_REV = true;
+
+const VIDEO_REGEX = new RegExp(/VAST\s+version/);
+
+const DATA_TYPES = {
+  'NUMBER': 'number',
+  'STRING': 'string',
+  'BOOLEAN': 'boolean',
+  'ARRAY': 'array',
+  'OBJECT': 'object'
+};
+const VIDEO_CUSTOM_PARAMS = {
+  'mimes': DATA_TYPES.ARRAY,
+  'minduration': DATA_TYPES.NUMBER,
+  'maxduration': DATA_TYPES.NUMBER,
+  'startdelay': DATA_TYPES.NUMBER,
+  'playbackmethod': DATA_TYPES.ARRAY,
+  'api': DATA_TYPES.ARRAY,
+  'protocols': DATA_TYPES.ARRAY,
+  'w': DATA_TYPES.NUMBER,
+  'h': DATA_TYPES.NUMBER,
+  'battr': DATA_TYPES.ARRAY,
+  'linearity': DATA_TYPES.NUMBER,
+  'placement': DATA_TYPES.NUMBER,
+  'minbitrate': DATA_TYPES.NUMBER,
+  'maxbitrate': DATA_TYPES.NUMBER,
+  'skip': DATA_TYPES.NUMBER
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    // check for all required bid fields
+    if (!(bid &&
+      bid.bidId &&
+      bid.params)) {
+      logWarn('Invalid bid request - missing required bid data');
+      return false;
+    }
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Bids[]} validBidRequests - an array of bidRequest objects
+   * @param {BidderRequest} bidderRequest - master bidRequest object
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const secure = 1; // treat all requests as secure
+    const params = validBidRequests[0].params;
+    const imps = validBidRequests.map(request => {
+      const impData = {
+        id: request.bidId,
+        secure: secure
+      };
+      if (request.mediaTypes) {
+        for (const mediaType in request.mediaTypes) {
+          switch (mediaType) {
+            case BANNER:
+              impData.banner = buildBanner(request);
+              break;
+            case VIDEO:
+              impData.video = buildVideo(request);
+              break;
+          }
+        }
+      }
+      if (!impData.banner && !impData.video) {
+        impData.banner = buildBanner(request);
+      }
+      return impData;
+    });
+
+    let payload = {
+      id: bidderRequest.auctionId,
+      cur: [DEFAULT_CUR],
+      imp: imps,
+      site: params.site ? params.site : {},
+      device: {...(bidderRequest.ortb2?.device || {}), ...params.device},
+      user: params.user ? params.user : {},
+      app: params.app ? params.app : {},
+      ext: {
+        tags: params.tags ? params.tags : {},
+        sid: params.sid ? params.sid : undefined
+      }
+    };
+    const rInfo = bidderRequest.refererInfo;
+    // TODO: do the fallbacks make sense here?
+    payload.site.page = rInfo.page || rInfo.topmostLocation;
+    payload.site.domain = parseDomain(payload.site.page, {noLeadingWww: true});
+
+    payload.device.ua = navigator.userAgent;
+    payload.device.language = navigator.language;
+
+    if (params.test) {
+      payload.test = params.test;
+    }
+
+    // Attaching GDPR Consent Params
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // CCPA
+    if (bidderRequest && bidderRequest.uspConsent) {
+      deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    if (bidderRequest?.timeout) {
+      payload.tmax = bidderRequest.timeout;
+    }
+
+    provideEids(validBidRequests[0], payload);
+    const url = params.shortname ? ENDPOINT_URL.concat('?shortname=', params.shortname) : ENDPOINT_URL;
+    return {
+      method: 'POST',
+      url: url,
+      data: JSON.stringify(payload),
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param bidRequest The payload from the server's response.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    let bidResponses = [];
+    const response = (serverResponse || {}).body;
+    if (response && response.seatbid && response.seatbid[0].bid && response.seatbid[0].bid.length) {
+      response.seatbid.forEach(zetaSeatbid => {
+        zetaSeatbid.bid.forEach(zetaBid => {
+          let bid = {
+            requestId: zetaBid.impid,
+            cpm: zetaBid.price,
+            currency: response.cur,
+            width: zetaBid.w,
+            height: zetaBid.h,
+            ad: zetaBid.adm,
+            ttl: TTL,
+            creativeId: zetaBid.crid,
+            netRevenue: NET_REV,
+          };
+          if (zetaBid.adomain && zetaBid.adomain.length) {
+            bid.meta = {
+              advertiserDomains: zetaBid.adomain
+            };
+          }
+          provideMediaType(zetaBid, bid);
+          bidResponses.push(bid);
+        })
+      })
+    }
+    return bidResponses;
+  },
+
+  /**
+   * Register User Sync.
+   */
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+    let syncurl = '';
+
+    // Attaching GDPR Consent Params in UserSync url
+    if (gdprConsent) {
+      syncurl += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
+      syncurl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
+    }
+
+    // CCPA
+    if (uspConsent) {
+      syncurl += '&us_privacy=' + encodeURIComponent(uspConsent);
+    }
+
+    // coppa compliance
+    if (config.getConfig('coppa') === true) {
+      syncurl += '&coppa=1';
+    }
+
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: USER_SYNC_URL_IFRAME + syncurl
+      }];
+    } else {
+      return [{
+        type: 'image',
+        url: USER_SYNC_URL_IMAGE + syncurl
+      }];
+    }
+  }
+}
+
+function buildBanner(request) {
+  let sizes = request.sizes;
+  if (request.mediaTypes &&
+    request.mediaTypes.banner &&
+    request.mediaTypes.banner.sizes) {
+    sizes = request.mediaTypes.banner.sizes;
+  }
+  return {
+    w: sizes[0][0],
+    h: sizes[0][1]
+  };
+}
+
+function buildVideo(request) {
+  let video = {};
+  const videoParams = deepAccess(request, 'mediaTypes.video', {});
+  for (const key in VIDEO_CUSTOM_PARAMS) {
+    if (videoParams.hasOwnProperty(key)) {
+      video[key] = checkParamDataType(key, videoParams[key], VIDEO_CUSTOM_PARAMS[key]);
+    }
+  }
+  if (videoParams.playerSize) {
+    if (isArray(videoParams.playerSize[0])) {
+      video.w = parseInt(videoParams.playerSize[0][0], 10);
+      video.h = parseInt(videoParams.playerSize[0][1], 10);
+    } else if (isNumber(videoParams.playerSize[0])) {
+      video.w = parseInt(videoParams.playerSize[0], 10);
+      video.h = parseInt(videoParams.playerSize[1], 10);
+    }
+  }
+  return video;
+}
+
+function checkParamDataType(key, value, datatype) {
+  let functionToExecute;
+  switch (datatype) {
+    case DATA_TYPES.BOOLEAN:
+      functionToExecute = isBoolean;
+      break;
+    case DATA_TYPES.NUMBER:
+      functionToExecute = isNumber;
+      break;
+    case DATA_TYPES.STRING:
+      functionToExecute = isStr;
+      break;
+    case DATA_TYPES.ARRAY:
+      functionToExecute = isArray;
+      break;
+  }
+  if (functionToExecute(value)) {
+    return value;
+  }
+  logWarn('Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value);
+  return undefined;
+}
+
+function provideEids(request, payload) {
+  if (Array.isArray(request.userIdAsEids) && request.userIdAsEids.length > 0) {
+    deepSetValue(payload, 'user.ext.eids', request.userIdAsEids);
+  }
+}
+
+function provideMediaType(zetaBid, bid) {
+  if (zetaBid.ext && zetaBid.ext.bidtype) {
+    if (zetaBid.ext.bidtype === VIDEO) {
+      bid.mediaType = VIDEO;
+      bid.vastXml = bid.ad;
+    } else {
+      bid.mediaType = BANNER;
+    }
+  } else {
+    if (VIDEO_REGEX.test(bid.ad)) {
+      bid.mediaType = VIDEO;
+      bid.vastXml = bid.ad;
+    } else {
+      bid.mediaType = BANNER;
+    }
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/zeusPrimeRtdProvider.js b/modules/zeusPrimeRtdProvider.js
new file mode 100644
index 00000000000..28c46957c50
--- /dev/null
+++ b/modules/zeusPrimeRtdProvider.js
@@ -0,0 +1,357 @@
+/**
+ * This module adds Zeus Insights For Publishers (ZIP) provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ *
+ * This module will request the article topics for the current page and add them as page keyvalues
+ * for the ad requests.
+ *
+ * @module modules/zeusInsightsForPublishersRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { logInfo, logError, logWarn, logMessage } from '../src/utils.js'
+import { submodule } from '../src/hook.js'
+import { ajaxBuilder } from '../src/ajax.js'
+
+class Logger {
+  get showDebug() {
+    if (this._showDebug === true || this._showDebug === false) {
+      return this._showDebug
+    }
+
+    return window.zeusPrime?.debug || false
+  }
+  set showDebug(shouldShow) {
+    this._showDebug = shouldShow
+  }
+
+  get error() {
+    return logError.bind(this, 'zeusPrimeRtdProvider: ')
+  }
+  get warn() {
+    return logWarn.bind(this, 'zeusPrimeRtdProvider: ')
+  }
+  get info() {
+    return logInfo.bind(this, 'zeusPrimeRtdProvider: ')
+  }
+  get debug() {
+    if (this.showDebug) {
+      return logMessage.bind(this, 'zeusPrimeRtdProvider: ')
+    }
+
+    return () => {}
+  }
+}
+
+var logger = new Logger()
+
+function loadCommandQueue() {
+  window.zeusPrime = window.zeusPrime || { cmd: [] }
+  const queue = [...window.zeusPrime.cmd]
+
+  window.zeusPrime.cmd = []
+  window.zeusPrime.cmd.push = (callback) => {
+    callback(window.zeusPrime)
+  }
+
+  queue.forEach((callback) => callback(window.zeusPrime))
+}
+
+function markStatusComplete(key) {
+  const status = window?.zeusPrime?.status
+  if (status) {
+    status[key] = true
+  }
+}
+
+function createStatus() {
+  if (window.zeusPrime && !window.zeusPrime.status) {
+    Object.defineProperty(window.zeusPrime, 'status', {
+      enumerable: false,
+      value: {
+        initComplete: false,
+        primeKeyValueSet: false,
+        insightsReqSent: false,
+        insightsReqReceived: false,
+        insightsKeyValueSet: false,
+        scriptComplete: false,
+      },
+    })
+  }
+}
+
+function loadPrimeQueryParams() {
+  try {
+    const params = new URLSearchParams(window.location.search)
+    params.forEach((paramValue, paramKey) => {
+      if (!paramKey.startsWith('zeus_prime_')) {
+        return
+      }
+
+      let key = paramKey.replace('zeus_prime_', '')
+      let value = paramValue.toLowerCase()
+
+      if (value === 'true' || value === '1') {
+        value = true
+      } else if (value === 'false' || value === '0') {
+        value = false
+      }
+
+      window.zeusPrime[key] = value
+    })
+  } catch (_) {}
+}
+
+const DEFAULT_API = 'https://insights.zeustechnology.com'
+
+function init(gamId = null, options = {}) {
+  window.zeusPrime = window.zeusPrime || { cmd: [] }
+
+  window.zeusPrime.gamId = gamId || options.gamId || window.zeusPrime.gamId || undefined
+  window.zeusPrime.api = DEFAULT_API
+  window.zeusPrime.hostname = options.hostname || window.location?.hostname || ''
+  window.zeusPrime.pathname = options.pathname || window.location?.pathname || ''
+  window.zeusPrime.pageUrl = `${window.zeusPrime.hostname}${window.zeusPrime.pathname}`
+  window.zeusPrime.pageHash = options.pageHash || null
+  window.zeusPrime.debug = window.zeusPrime.debug || options.debug === true || false
+  window.zeusPrime.disabled = window.zeusPrime.disabled || options.disabled === true || false
+
+  loadPrimeQueryParams()
+
+  logger.showDebug = window.zeusPrime.debug
+
+  createStatus()
+  markStatusComplete('initComplete')
+}
+
+function setTargeting() {
+  const { gamId, hostname } = window.zeusPrime
+
+  if (typeof gamId !== 'string') {
+    throw new Error(`window.zeusPrime.gamId must be a string. Received: ${String(gamId)}`)
+  }
+
+  addKeyValueToGoogletag(`zeus_${gamId}`, hostname)
+  logger.debug(`Setting zeus_${gamId}=${hostname}`)
+  markStatusComplete('primeKeyValueSet')
+}
+
+function setPrimeAsDisabled() {
+  addKeyValueToGoogletag('zeus_prime', 'false')
+  logger.debug('Disabling prime; Setting key-value zeus_prime to false')
+}
+
+function addKeyValueToGoogletag(key, value) {
+  window.googletag = window.googletag || { cmd: [] }
+  window.googletag.cmd.push(function () {
+    window.googletag.pubads().setTargeting(key, value)
+  })
+}
+
+function isInsightsPage(pathname = '') {
+  const NOT_SECTIONS = [
+    {
+      test: /\/search/,
+      type: 'search',
+    },
+    {
+      test: /\/author/,
+      type: 'author',
+    },
+    {
+      test: /\/event/,
+      type: 'event',
+    },
+    {
+      test: /\/homepage/,
+      type: 'front',
+    },
+    {
+      test: /^\/?$/,
+      type: 'front',
+    },
+  ]
+
+  const typeObj = NOT_SECTIONS.find((pg) => pathname.match(pg.test))
+  return typeObj === undefined
+}
+
+async function getUrlHash(canonical) {
+  try {
+    const buf = await window.crypto.subtle.digest(
+      'SHA-1',
+      new TextEncoder('utf-8').encode(canonical)
+    )
+    const hashed = Array.prototype.map
+      .call(new Uint8Array(buf), (x) => `00${x.toString(16)}`.slice(-2))
+      .join('')
+
+    return hashed
+  } catch (e) {
+    logger.error('Failed to load hash', e.message)
+    logger.debug('Exception', e)
+    return ''
+  }
+}
+
+async function sendPrebidRequest(url) {
+  return new Promise((resolve, reject) => {
+    const ajax = ajaxBuilder()
+    ajax(url, {
+      success: (responseText, response) => {
+        resolve({
+          ...response,
+          status: response.status,
+          json: () => JSON.parse(responseText),
+        })
+      },
+
+      error: (responseText, response) => {
+        if (!response.status) {
+          reject(response)
+        }
+
+        let json = responseText
+        if (responseText) {
+          try {
+            json = JSON.parse(responseText)
+          } catch (_) {
+            json = null
+          }
+        }
+
+        resolve({
+          status: response.status,
+          json: () => json || null,
+          responseValue: json,
+        })
+      },
+    })
+  })
+}
+
+async function requestTopics() {
+  const { api, hostname, pageUrl } = window.zeusPrime
+
+  if (!window.zeusPrime.pageHash) {
+    window.zeusPrime.pageHash = await getUrlHash(pageUrl)
+  }
+
+  const pageHash = window.zeusPrime.pageHash
+  const zeusInsightsUrl = `${api}/${hostname}/${pageHash}?article_location=${pageUrl}`
+
+  logger.debug('Requesting topics', zeusInsightsUrl)
+  try {
+    markStatusComplete('insightsReqSent')
+    const response = await sendPrebidRequest(zeusInsightsUrl)
+    if (response.status === 200) {
+      logger.debug('topics found')
+      markStatusComplete('insightsReqReceived')
+      return await response.json()
+    } else if (
+      response.status === 204 ||
+      response.status < 200 ||
+      (response.status >= 300 && response.status <= 399)
+    ) {
+      logger.debug('no topics found')
+      markStatusComplete('insightsReqReceived')
+      return null
+    } else {
+      logger.error(`Topics request returned error: ${response.status}`)
+      markStatusComplete('insightsReqReceived')
+      return null
+    }
+  } catch (e) {
+    logger.error('failed to request topics', e)
+    return null
+  }
+}
+
+function setTopicsTargeting(topics = []) {
+  if (topics.length === 0) {
+    return
+  }
+
+  window.googletag = window.googletag || { cmd: [] }
+  window.googletag.cmd.push(function () {
+    window.googletag.pubads().setTargeting('zeus_insights', topics)
+  })
+
+  markStatusComplete('insightsKeyValueSet')
+}
+
+async function startTopicsRequest() {
+  if (isInsightsPage(window.zeusPrime.pathname)) {
+    const response = await requestTopics()
+    if (response) {
+      setTopicsTargeting(response?.topics)
+    }
+  } else {
+    logger.debug('This page is not eligible for topics, request will be skipped')
+  }
+}
+
+async function run(gamId, options = {}) {
+  logger.showDebug = options.debug || false
+
+  try {
+    init(gamId, options)
+    loadCommandQueue()
+
+    if (window.zeusPrime.disabled) {
+      setPrimeAsDisabled()
+    } else {
+      setTargeting()
+      await startTopicsRequest()
+    }
+  } catch (e) {
+    logger.error('Failed to run.', e.message || e)
+  } finally {
+    markStatusComplete('scriptComplete')
+  }
+}
+
+/**
+ * @preserve
+ * Initializes the ZeusPrime RTD Submodule. The config provides the GamID for this
+ * site that is used to configure Prime.
+ * @param {object} config The Prebid configuration for this module.
+ * @param {object} config.params The parameters for this module.
+ * @param {string} config.params.gamId The Gam ID (or Network Code) in GAM for this site.
+ */
+function initModule(config) {
+  const { params } = config || {}
+  const { gamId, ...rest } = params || {}
+  run(gamId, rest)
+}
+
+/**
+ * @preserve
+ * @type {RtdSubmodule}
+ */
+const zeusPrimeSubmodule = {
+  /**
+   * @preserve
+   * The name of the plugin.
+   * @type {string}
+   */
+  name: 'zeusPrime',
+
+  /**
+   * @preserve
+   * ZeusPrime use
+   */
+  init: initModule,
+}
+
+/**
+ * @preserve
+ * Register the Sub Module.
+ */
+function registerSubModule() {
+  submodule('realTimeData', zeusPrimeSubmodule)
+}
+
+registerSubModule()
+
+export { zeusPrimeSubmodule }
diff --git a/modules/zeusPrimeRtdProvider.md b/modules/zeusPrimeRtdProvider.md
new file mode 100644
index 00000000000..f3a6c5018d5
--- /dev/null
+++ b/modules/zeusPrimeRtdProvider.md
@@ -0,0 +1,60 @@
+# Overview
+
+Module Name: Zeus Prime RTD Provider
+Module Type: Rtd Provider
+Maintainer: support@zeustechnology.com
+
+## Description
+
+The Zeus Prime RTD Provider provides integration of Zeus Prime onto sites with Prebid. This module will request information from Zeus Prime servers to add the page level targeting required for Prime into the customer's ad setup.
+
+Zeus Prime runs as soon as the code is initialized, so it can retrieve the information required from the Zeus Prime server to create the targeting key-values. Zeus Prime will provide two page level key-values: `zeus_<yourGamId>` and `zeus_insights`. Zeus Prime provides contextual information about a pages content, and does not provide user information that could present privacy implications.
+
+For more information and help with setting up Zeus Prime, see the [onboarding documentation site](https://onboarding.zeustechnology.com).
+
+## Usage
+
+To use Zeus Prime, add `zeusPrimeRtdProvider` into your Prebid build: 
+
+```
+gulp build --modules=rtdModule,zeusPrimeRtdProvider
+```
+
+> Note that the global RTD module, `rtdModule`, is required for the Zeus Prime RTD module.
+
+Once the code is included, configure Zeus Prime in your Prebid configuration: 
+
+```javascript
+pbjs.setConfig({
+  ...,
+  realTimeData: {
+    dataProviders: [{
+      name: 'zeusPrime',
+      waitForIt: false,
+      params: {
+        gamId: '<yourGamId>'
+      }
+    }]
+  },
+  ...
+})
+```
+
+## Parameters
+
+The parameters below describe the configuration object used to configure Zeus Prime. 
+
+| Name                   | Type     | Description                                                                                   | Default |
+|------------------------|----------|-----------------------------------------------------------------------------------------------|---------|
+| name                   | String   | This will always be `zeusPrime`                                                               | -       |
+| waitForIt              | Boolean  | Should be false since Zeus Prime runs on initial load and not during the bidding cycle.       | `false` |
+| params                 | Object   |                                                                                               | -       |
+| params.gamId           | String   | The gamId or Google Ad Manager Network Code to access your Google Ad Manager instance.        | -       |
+
+### `gamId` Parameter
+
+Zeus Prime requires the gamId parameter, or the Google Ad Manager Network Code, to reference your account. See the [Google documentation](https://support.google.com/admanager/answer/7674889?hl=en) to find out where you can retrieve the Network Code.
+
+## Troubleshooting 
+
+For troubleshooting steps and guides to assist with verifying your Zeus Prime installation, see our [installation documentation](https://onboarding.zeustechnology.com/docs/installation).
\ No newline at end of file
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index 072114953fe..0f34e6d0989 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -1,37 +1,36 @@
 module.exports = (function(settings) {
-	var browsers = require('./browsers.json');
-	delete browsers['bs_ie_9_windows_7'];
-	
-	for(var browser in browsers) {
-		if(browsers[browser].browser === 'iphone') continue;
+  var browsers = require('./browsers.json');
+  delete browsers['bs_ie_9_windows_7'];
 
-		var desiredCapabilities = {
-			"browserName": browsers[browser].browser,
-			"version": browsers[browser].browser_version,
-			"platform": browsers[browser].os,
-			"os": browsers[browser].os,
-			"os_version": browsers[browser].os_version,
-			"browser": browsers[browser].browser,
-			"browser_version": browsers[browser].browser_version,
-		};
+  for (var browser in browsers) {
+    if (browsers[browser].browser === 'iphone') continue;
 
-		settings.test_settings[browser] = {
-			"silent": true,
-      "exclude":["custom-assertions","custom-commands","common","custom-reporter"],
-      "screenshots" : {
-        "enabled" : false,
-        "path" : ""
-      },
-			"javascriptEnabled": true,
-			"acceptSslCerts": true,
-			"browserstack.local": true,
-			"browserstack.debug": true,
-			"browserstack.selenium_version" : "2.53.0",
-			"browserstack.user": "${BROWSERSTACK_USERNAME}",
-			"browserstack.key": "${BROWSERSTACK_KEY}"
-		};
-		settings.test_settings[browser]['desiredCapabilities'] = desiredCapabilities;
-	}
-	return settings;
+    var desiredCapabilities = {
+      'browserName': browsers[browser].browser,
+      'version': browsers[browser].browser_version,
+      'platform': browsers[browser].os,
+      'os': browsers[browser].os,
+      'os_version': browsers[browser].os_version,
+      'browser': browsers[browser].browser,
+      'browser_version': browsers[browser].browser_version,
+    };
 
+    settings.test_settings[browser] = {
+      'silent': true,
+      'exclude': ['custom-assertions', 'custom-commands', 'common', 'custom-reporter'],
+      'screenshots': {
+        'enabled': false,
+        'path': ''
+      },
+      'javascriptEnabled': true,
+      'acceptSslCerts': true,
+      'browserstack.local': true,
+      'browserstack.debug': true,
+      'browserstack.selenium_version': '2.53.0',
+      'browserstack.user': `${BROWSERSTACK_USERNAME}`,
+      'browserstack.key': `${BROWSERSTACK_KEY}`
+    };
+    settings.test_settings[browser]['desiredCapabilities'] = desiredCapabilities;
+  }
+  return settings;
 })(require('./nightwatch.browserstack.json'));
diff --git a/package-lock.json b/package-lock.json
index 2fc53a75352..4bfd2cea1f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8497 +1,28934 @@
 {
   "name": "prebid.js",
-  "version": "3.24.0-pre",
-  "lockfileVersion": 1,
+  "version": "7.32.0-pre",
+  "lockfileVersion": 2,
   "requires": true,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-      "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.10.1"
+  "packages": {
+    "": {
+      "name": "prebid.js",
+      "version": "7.31.0-pre",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/core": "^7.16.7",
+        "@babel/plugin-transform-runtime": "^7.18.9",
+        "@babel/preset-env": "^7.16.8",
+        "@babel/runtime": "^7.18.9",
+        "core-js": "^3.13.0",
+        "core-js-pure": "^3.13.0",
+        "criteo-direct-rsa-validate": "^1.1.0",
+        "crypto-js": "^3.3.0",
+        "dlv": "1.1.3",
+        "dset": "3.1.2",
+        "express": "^4.15.4",
+        "fun-hooks": "^0.9.9",
+        "just-clone": "^1.0.2",
+        "live-connect-js": "3.0.1"
+      },
+      "devDependencies": {
+        "@babel/eslint-parser": "^7.16.5",
+        "@wdio/browserstack-service": "~7.16.0",
+        "@wdio/cli": "~7.5.2",
+        "@wdio/concise-reporter": "~7.5.2",
+        "@wdio/local-runner": "~7.5.2",
+        "@wdio/mocha-framework": "~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-plugin-istanbul": "^6.1.1",
+        "babel-register": "^6.26.0",
+        "body-parser": "^1.19.0",
+        "chai": "^4.2.0",
+        "coveralls": "^3.1.0",
+        "deep-equal": "^2.0.3",
+        "documentation": "^14.0.0",
+        "es5-shim": "^4.5.14",
+        "eslint": "^7.27.0",
+        "eslint-config-standard": "^10.2.1",
+        "eslint-plugin-import": "^2.20.2",
+        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-prebid": "file:./plugins/eslint",
+        "eslint-plugin-promise": "^5.1.0",
+        "eslint-plugin-standard": "^3.0.1",
+        "execa": "^1.0.0",
+        "faker": "^5.5.3",
+        "fs.extra": "^1.3.2",
+        "gulp": "^4.0.0",
+        "gulp-clean": "^0.4.0",
+        "gulp-concat": "^2.6.0",
+        "gulp-connect": "^5.7.0",
+        "gulp-eslint": "^6.0.0",
+        "gulp-if": "^3.0.0",
+        "gulp-js-escape": "^1.0.1",
+        "gulp-replace": "^1.0.0",
+        "gulp-shell": "^0.8.0",
+        "gulp-sourcemaps": "^3.0.0",
+        "gulp-terser": "^2.0.1",
+        "gulp-util": "^3.0.0",
+        "is-docker": "^2.2.1",
+        "istanbul": "^0.4.5",
+        "karma": "^6.3.2",
+        "karma-babel-preprocessor": "^8.0.1",
+        "karma-browserstack-launcher": "1.4.0",
+        "karma-chai": "^0.1.0",
+        "karma-chrome-launcher": "^3.1.0",
+        "karma-coverage": "^2.0.1",
+        "karma-coverage-istanbul-reporter": "^3.0.3",
+        "karma-es5-shim": "^0.0.4",
+        "karma-firefox-launcher": "^2.1.0",
+        "karma-ie-launcher": "^1.0.0",
+        "karma-mocha": "^2.0.1",
+        "karma-mocha-reporter": "^2.2.5",
+        "karma-opera-launcher": "^1.0.0",
+        "karma-safari-launcher": "^1.0.0",
+        "karma-script-launcher": "^1.0.0",
+        "karma-sinon": "^1.0.5",
+        "karma-sourcemap-loader": "^0.3.7",
+        "karma-spec-reporter": "^0.0.32",
+        "karma-webpack": "^5.0.0",
+        "lodash": "^4.17.21",
+        "mocha": "^10.0.0",
+        "morgan": "^1.10.0",
+        "opn": "^5.4.0",
+        "resolve-from": "^5.0.0",
+        "sinon": "^4.1.3",
+        "through2": "^4.0.2",
+        "url": "^0.11.0",
+        "url-parse": "^1.0.5",
+        "video.js": "^7.17.0",
+        "videojs-contrib-ads": "^6.9.0",
+        "videojs-ima": "^1.11.0",
+        "videojs-playlist": "^5.0.0",
+        "webdriverio": "^7.6.1",
+        "webpack": "^5.70.0",
+        "webpack-bundle-analyzer": "^4.5.0",
+        "webpack-manifest-plugin": "^5.0.0",
+        "webpack-stream": "^7.0.0",
+        "yargs": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "@babel/compat-data": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz",
-      "integrity": "sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "@babel/core": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz",
-      "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.1",
-        "@babel/generator": "^7.10.2",
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helpers": "^7.10.1",
-        "@babel/parser": "^7.10.2",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.2",
+    "node_modules/@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz",
+      "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
+      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.6",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helpers": "^7.19.4",
+        "@babel/parser": "^7.19.6",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
       },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
       }
     },
-    "@babel/generator": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-      "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
+    "node_modules/@babel/eslint-parser": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
       "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.2",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
+      "dependencies": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0"
       }
     },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz",
-      "integrity": "sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/generator": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.1.tgz",
+      "integrity": "sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==",
+      "dependencies": {
+        "@babel/types": "^7.20.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz",
-      "integrity": "sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.10.1",
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "@babel/helper-compilation-targets": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz",
-      "integrity": "sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.10.1",
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz",
-      "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-member-expression-to-functions": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1"
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
+      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "dependencies": {
+        "@babel/helper-explode-assignable-expression": "^7.18.6",
+        "@babel/types": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz",
-      "integrity": "sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-regex": "^7.10.1",
-        "regexpu-core": "^4.7.0"
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
+      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
+      "dependencies": {
+        "@babel/compat-data": "^7.20.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "@babel/helper-define-map": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz",
-      "integrity": "sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13"
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz",
-      "integrity": "sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "regexpu-core": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "@babel/helper-function-name": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-      "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
       }
     },
-    "@babel/helper-get-function-arity": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-      "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-hoist-variables": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
-      "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
-      "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "dependencies": {
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-module-imports": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz",
-      "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-module-transforms": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
-      "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-simple-access": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13"
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
+      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+      "dependencies": {
+        "@babel/types": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
-      "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-plugin-utils": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-      "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-      "dev": true
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
+      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.19.4",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "@babel/helper-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
-      "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.13"
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
-      "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-wrap-function": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-replace-supers": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
-      "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
+      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-wrap-function": "^7.18.9",
+        "@babel/types": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "@babel/helper-simple-access": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
-      "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.10.1",
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/traverse": "^7.19.1",
+        "@babel/types": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-      "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
+      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+      "dependencies": {
+        "@babel/types": "^7.19.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helper-validator-identifier": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-      "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-      "dev": true
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
+      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+      "dependencies": {
+        "@babel/types": "^7.20.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "@babel/helper-wrap-function": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
-      "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/helpers": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
-      "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/highlight": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-      "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.10.1",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/parser": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-      "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-      "dev": true
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
-      "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-remap-async-to-generator": "^7.10.1",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+      "dependencies": {
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz",
-      "integrity": "sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/helpers": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz",
+      "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==",
+      "dependencies": {
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.20.1",
+        "@babel/types": "^7.20.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
-      "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
-      "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
+    "node_modules/@babel/parser": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.1.tgz",
+      "integrity": "sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw==",
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
-      "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz",
-      "integrity": "sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.1"
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
       }
     },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
-      "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.1"
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz",
+      "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
-      "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
-      "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+    "node_modules/@babel/plugin-proposal-class-static-block": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
       }
     },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz",
-      "integrity": "sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
-      "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
+      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "node_modules/@babel/plugin-proposal-json-strings": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz",
-      "integrity": "sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
+      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-json-strings": {
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
+      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
+      "dependencies": {
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.18.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-methods": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
+      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "requires": {
+      "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "requires": {
+      "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz",
-      "integrity": "sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-object-rest-spread": {
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "requires": {
+      "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-optional-catch-binding": {
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "requires": {
+      "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-optional-chaining": {
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "requires": {
+      "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
-      "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
-      "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
-      "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-remap-async-to-generator": "^7.10.1"
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
-      "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-remap-async-to-generator": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz",
-      "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "lodash": "^4.17.13"
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-classes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz",
-      "integrity": "sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-define-map": "^7.10.1",
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "globals": "^11.1.0"
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz",
+      "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
-      "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-compilation-targets": "^7.19.0",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
-      "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
+      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
-      "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz",
+      "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
-      "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
-      "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
+      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
-      "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
-      "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.18.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
-      "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
+      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.18.9",
+        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
-      "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
+      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
-      "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
-      "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-simple-access": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
+      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
-      "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.10.1",
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
+      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-simple-access": "^7.19.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
-      "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
+      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-identifier": "^7.19.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
-      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
-      "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
-      "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1"
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-      "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
-      "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz",
+      "integrity": "sha512-nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
-      "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
-      "dev": true,
-      "requires": {
-        "regenerator-transform": "^0.14.2"
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
-      "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "regenerator-transform": "^0.15.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
-      "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
-      "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
+      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
-      "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-regex": "^7.10.1"
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
-      "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
-      "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz",
-      "integrity": "sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
+      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
-      "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
+      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/preset-env": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.2.tgz",
-      "integrity": "sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.10.1",
-        "@babel/helper-compilation-targets": "^7.10.2",
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-proposal-async-generator-functions": "^7.10.1",
-        "@babel/plugin-proposal-class-properties": "^7.10.1",
-        "@babel/plugin-proposal-dynamic-import": "^7.10.1",
-        "@babel/plugin-proposal-json-strings": "^7.10.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
-        "@babel/plugin-proposal-numeric-separator": "^7.10.1",
-        "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.10.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.10.1",
-        "@babel/plugin-proposal-private-methods": "^7.10.1",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.10.1",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-class-properties": "^7.10.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.1",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.10.1",
-        "@babel/plugin-transform-arrow-functions": "^7.10.1",
-        "@babel/plugin-transform-async-to-generator": "^7.10.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.10.1",
-        "@babel/plugin-transform-block-scoping": "^7.10.1",
-        "@babel/plugin-transform-classes": "^7.10.1",
-        "@babel/plugin-transform-computed-properties": "^7.10.1",
-        "@babel/plugin-transform-destructuring": "^7.10.1",
-        "@babel/plugin-transform-dotall-regex": "^7.10.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.10.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.10.1",
-        "@babel/plugin-transform-for-of": "^7.10.1",
-        "@babel/plugin-transform-function-name": "^7.10.1",
-        "@babel/plugin-transform-literals": "^7.10.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.10.1",
-        "@babel/plugin-transform-modules-amd": "^7.10.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.10.1",
-        "@babel/plugin-transform-modules-umd": "^7.10.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.10.1",
-        "@babel/plugin-transform-object-super": "^7.10.1",
-        "@babel/plugin-transform-parameters": "^7.10.1",
-        "@babel/plugin-transform-property-literals": "^7.10.1",
-        "@babel/plugin-transform-regenerator": "^7.10.1",
-        "@babel/plugin-transform-reserved-words": "^7.10.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.10.1",
-        "@babel/plugin-transform-spread": "^7.10.1",
-        "@babel/plugin-transform-sticky-regex": "^7.10.1",
-        "@babel/plugin-transform-template-literals": "^7.10.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.10.1",
-        "@babel/plugin-transform-unicode-escapes": "^7.10.1",
-        "@babel/plugin-transform-unicode-regex": "^7.10.1",
-        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.10.2",
-        "browserslist": "^4.12.0",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
+      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/preset-modules": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
-      "dev": true,
-      "requires": {
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
+      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
+      "dependencies": {
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
+        "@babel/plugin-proposal-class-properties": "^7.18.6",
+        "@babel/plugin-proposal-class-static-block": "^7.18.6",
+        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+        "@babel/plugin-proposal-json-strings": "^7.18.6",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.18.6",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.18.6",
+        "@babel/plugin-transform-async-to-generator": "^7.18.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+        "@babel/plugin-transform-block-scoping": "^7.19.4",
+        "@babel/plugin-transform-classes": "^7.19.0",
+        "@babel/plugin-transform-computed-properties": "^7.18.9",
+        "@babel/plugin-transform-destructuring": "^7.19.4",
+        "@babel/plugin-transform-dotall-regex": "^7.18.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+        "@babel/plugin-transform-for-of": "^7.18.8",
+        "@babel/plugin-transform-function-name": "^7.18.9",
+        "@babel/plugin-transform-literals": "^7.18.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+        "@babel/plugin-transform-modules-amd": "^7.18.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
+        "@babel/plugin-transform-modules-umd": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
+        "@babel/plugin-transform-new-target": "^7.18.6",
+        "@babel/plugin-transform-object-super": "^7.18.6",
+        "@babel/plugin-transform-parameters": "^7.18.8",
+        "@babel/plugin-transform-property-literals": "^7.18.6",
+        "@babel/plugin-transform-regenerator": "^7.18.6",
+        "@babel/plugin-transform-reserved-words": "^7.18.6",
+        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+        "@babel/plugin-transform-spread": "^7.19.0",
+        "@babel/plugin-transform-sticky-regex": "^7.18.6",
+        "@babel/plugin-transform-template-literals": "^7.18.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+        "@babel/plugin-transform-unicode-regex": "^7.18.6",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.19.4",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "core-js-compat": "^3.25.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
         "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@babel/types": "^7.4.4",
         "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "@babel/runtime": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz",
-      "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==",
+    "node_modules/@babel/runtime": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
+      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz",
+      "integrity": "sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==",
       "dev": true,
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
+      "dependencies": {
+        "core-js-pure": "^3.25.1",
+        "regenerator-runtime": "^0.13.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.18.10",
+        "@babel/types": "^7.18.10"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz",
+      "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==",
       "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-          "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
-          "dev": true
-        }
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.20.1",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.20.1",
+        "@babel/types": "^7.20.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "@babel/template": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-      "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
+    "node_modules/@babel/types": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz",
+      "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
       "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.1",
-        "@babel/parser": "^7.10.1",
-        "@babel/types": "^7.10.1"
+      "engines": {
+        "node": ">=0.1.90"
       }
     },
-    "@babel/traverse": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-      "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
       "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.1",
-        "@babel/generator": "^7.10.1",
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "@babel/parser": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
       },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "@babel/types": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-      "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
       "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.10.1",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@cnakazawa/watch": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
-      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
-      "requires": {
-        "exec-sh": "^0.3.2",
-        "minimist": "^1.2.0"
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@gulp-sourcemaps/identity-map": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
-      "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
-      "requires": {
-        "acorn": "^5.0.3",
-        "css": "^2.2.1",
-        "normalize-path": "^2.1.1",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/identity-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
+      "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^6.4.1",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.16",
         "source-map": "^0.6.0",
-        "through2": "^2.0.3"
+        "through2": "^3.0.1"
       },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true
+    },
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/postcss": {
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
       "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       }
     },
-    "@gulp-sourcemaps/map-sources": {
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/map-sources": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+      "integrity": "sha512-o/EatdaGt8+x2qpb0vFLC/2Gug/xYPRXb6a+ET1wGYKozKN3krDWC/zZFZAtrzxJHuDL12mwdfEFKcKMNvc55A==",
       "dev": true,
-      "requires": {
+      "dependencies": {
         "normalize-path": "^2.0.1",
         "through2": "^2.0.3"
       },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/@gulp-sourcemaps/map-sources/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
       "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@istanbuljs/schema": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+    "node_modules/@gulp-sourcemaps/map-sources/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/@hapi/boom": {
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.1.4.tgz",
+      "integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==",
+      "dev": true,
+      "dependencies": {
+        "@hapi/hoek": "9.x.x"
+      }
+    },
+    "node_modules/@hapi/cryptiles": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/cryptiles/-/cryptiles-5.1.0.tgz",
+      "integrity": "sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA==",
+      "dev": true,
+      "dependencies": {
+        "@hapi/boom": "9.x.x"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@hapi/hoek": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
       "dev": true
     },
-    "@jest/console": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
-      "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
       "dev": true,
-      "requires": {
-        "@jest/source-map": "^24.9.0",
-        "chalk": "^2.0.1",
-        "slash": "^2.0.0"
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
       },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
       "dependencies": {
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
-        }
-      }
-    },
-    "@jest/core": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz",
-      "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/reporters": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.1.15",
-        "jest-changed-files": "^24.9.0",
-        "jest-config": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-resolve-dependencies": "^24.9.0",
-        "jest-runner": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "jest-watcher": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "p-each-series": "^1.0.0",
-        "realpath-native": "^1.1.0",
-        "rimraf": "^2.5.4",
-        "slash": "^2.0.0",
-        "strip-ansi": "^5.0.0"
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
       },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dev": true,
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-          "dev": true
-        },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/types/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@jest/types/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@jest/types/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@jest/types/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@jest/types/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/types/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.21",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
+      "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
+      "dev": true
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/formatio": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
+      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
+      "dev": true,
+      "dependencies": {
+        "samsam": "1.3.0"
+      }
+    },
+    "node_modules/@sinonjs/samsam": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz",
+      "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.3.0",
+        "array-from": "^2.1.1",
+        "lodash": "^4.17.15"
+      }
+    },
+    "node_modules/@sinonjs/text-encoding": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
+      "dev": true
+    },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "dev": true
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "dev": true,
+      "dependencies": {
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@types/aria-query": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
+      "dev": true
+    },
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
+      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "*",
+        "@types/node": "*",
+        "@types/responselike": "*"
+      }
+    },
+    "node_modules/@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+      "dev": true
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
+      "dev": true
+    },
+    "node_modules/@types/debug": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
+      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/diff": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.2.tgz",
+      "integrity": "sha512-uw8eYMIReOwstQ0QKF0sICefSy8cNO/v7gOTiIy9SbwuHyEecJUm7qlgueOO5S1udZ5I/irVydHVwMchgzbKTg==",
+      "dev": true
+    },
+    "node_modules/@types/easy-table": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.33.tgz",
+      "integrity": "sha512-/vvqcJPmZUfQwCgemL0/34G7bIQnCuvgls379ygRlcC1FqNqk3n+VZ15dAO51yl6JNDoWd8vsk+kT8zfZ1VZSw==",
+      "dev": true
+    },
+    "node_modules/@types/ejs": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.1.tgz",
+      "integrity": "sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==",
+      "dev": true
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.4.9",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz",
+      "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.51",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "dev": true
+    },
+    "node_modules/@types/expect": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
+      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
+      "dev": true
+    },
+    "node_modules/@types/extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha512-R1g/VyKFFI2HLC1QGAeTtCBWCo6n75l41OnsVYNbmKG+kempOESaodf6BeJyUM3Q0rKa/NQcTHbB2+66lNnxLw==",
+      "dev": true
+    },
+    "node_modules/@types/fibers": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/fibers/-/fibers-3.1.1.tgz",
+      "integrity": "sha512-yHoUi46uika0snoTpNcVqUSvgbRndaIps4TUCotrXjtc0DHDoPQckmyXEZ2bX3e4mpJmyEW3hRhCwQa/ISCPaA==",
+      "dev": true
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "9.0.13",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+      "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/github-slugger": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@types/github-slugger/-/github-slugger-1.3.0.tgz",
+      "integrity": "sha512-J/rMZa7RqiH/rT29TEVZO4nBoDP9XJOjnbbIofg7GQKs4JIduEO3WLpte+6WeUz/TcrXKlY+bM7FYrp8yFB+3g==",
+      "dev": true
+    },
+    "node_modules/@types/hast": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
+      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "dev": true
+    },
+    "node_modules/@types/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/through": "*",
+        "rxjs": "^6.4.0"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+      "dev": true
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/keyv": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-4.2.0.tgz",
+      "integrity": "sha512-xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw==",
+      "deprecated": "This is a stub types definition. keyv provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "dependencies": {
+        "keyv": "*"
+      }
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.14.187",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.187.tgz",
+      "integrity": "sha512-MrO/xLXCaUgZy3y96C/iOsaIqZSeupyTImKClHunL5GrmaiII2VwvWmLBu2hwa0Kp0sV19CsyjtrTc/Fx8rg/A==",
+      "dev": true
+    },
+    "node_modules/@types/lodash.flattendeep": {
+      "version": "4.4.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.7.tgz",
+      "integrity": "sha512-1h6GW/AeZw/Wej6uxrqgmdTDZX1yFS39lRsXYkg+3kWvOWWrlGCI6H7lXxlUHOzxDT4QeYGmgPpQ3BX9XevzOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/lodash.pickby": {
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.7.tgz",
+      "integrity": "sha512-4ebXRusuLflfscbD0PUX4eVknDHD9Yf+uMtBIvA/hrnTqeAzbuHuDjvnYriLjUrI9YrhCPVKUf4wkRSXJQ6gig==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/lodash.union": {
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.7.tgz",
+      "integrity": "sha512-6HXM6tsnHJzKgJE0gA/LhTGf/7AbjUk759WZ1MziVm+OBNAATHhdgj+a3KVE8g76GCLAnN4ZEQQG1EGgtBIABA==",
+      "dev": true,
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
+    "node_modules/@types/mdast": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
+      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/@types/mocha": {
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz",
+      "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==",
+      "dev": true
+    },
+    "node_modules/@types/ms": {
+      "version": "0.7.31",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
+      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "17.0.45",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+      "dev": true
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "node_modules/@types/object-inspect": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.8.1.tgz",
+      "integrity": "sha512-0JTdf3CGV0oWzE6Wa40Ayv2e2GhpP3pEJMcrlM74vBSJPuuNkVwfDnl0SZxyFCXETcB4oKA/MpTVfuYSMOelBg==",
+      "dev": true
+    },
+    "node_modules/@types/puppeteer": {
+      "version": "5.4.7",
+      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.7.tgz",
+      "integrity": "sha512-JdGWZZYL0vKapXF4oQTC5hLVNfOgdPrqeZ1BiQnGk5cB7HeE91EWUiTdVSdQPobRN8rIcdffjiOgCYJ/S8QrnQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/recursive-readdir": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.1.tgz",
+      "integrity": "sha512-Xd+Ptc4/F2ueInqy5yK2FI5FxtwwbX2+VZpcg+9oYsFJVen8qQKGapCr+Bi5wQtHU1cTXT8s+07lo/nKPgu8Gg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/responselike": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
+      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+      "dev": true
+    },
+    "node_modules/@types/stream-buffers": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.4.tgz",
+      "integrity": "sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
+      "dev": true
+    },
+    "node_modules/@types/through": {
+      "version": "0.0.30",
+      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
+      "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/tmp": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==",
+      "dev": true
+    },
+    "node_modules/@types/ua-parser-js": {
+      "version": "0.7.36",
+      "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz",
+      "integrity": "sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==",
+      "dev": true
+    },
+    "node_modules/@types/unist": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
+      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
+      "dev": true
+    },
+    "node_modules/@types/vinyl": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz",
+      "integrity": "sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==",
+      "dev": true,
+      "dependencies": {
+        "@types/expect": "^1.20.4",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/which": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz",
+      "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==",
+      "dev": true
+    },
+    "node_modules/@types/yargs": {
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+      "dev": true
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@ungap/promise-all-settled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+      "dev": true
+    },
+    "node_modules/@videojs/http-streaming": {
+      "version": "2.14.3",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.3.tgz",
+      "integrity": "sha512-2tFwxCaNbcEZzQugWf8EERwNMyNtspfHnvxRGRABQs09W/5SqmkWFuGWfUAm4wQKlXGfdPyAJ1338ASl459xAA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "3.0.5",
+        "aes-decrypter": "3.1.3",
+        "global": "^4.4.0",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
+        "video.js": "^6 || ^7"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      },
+      "peerDependencies": {
+        "video.js": "^6 || ^7"
+      }
+    },
+    "node_modules/@videojs/vhs-utils": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz",
+      "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "global": "^4.4.0",
+        "url-toolkit": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      }
+    },
+    "node_modules/@videojs/xhr": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.6.0.tgz",
+      "integrity": "sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "global": "~4.4.0",
+        "is-function": "^1.0.1"
+      }
+    },
+    "node_modules/@vue/compiler-core": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz",
+      "integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/shared": "3.2.41",
+        "estree-walker": "^2.0.2",
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/@vue/compiler-core/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz",
+      "integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@vue/compiler-core": "3.2.41",
+        "@vue/shared": "3.2.41"
+      }
+    },
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz",
+      "integrity": "sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.41",
+        "@vue/compiler-dom": "3.2.41",
+        "@vue/compiler-ssr": "3.2.41",
+        "@vue/reactivity-transform": "3.2.41",
+        "@vue/shared": "3.2.41",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7",
+        "postcss": "^8.1.10",
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/@vue/compiler-sfc/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz",
+      "integrity": "sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@vue/compiler-dom": "3.2.41",
+        "@vue/shared": "3.2.41"
+      }
+    },
+    "node_modules/@vue/reactivity-transform": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz",
+      "integrity": "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.41",
+        "@vue/shared": "3.2.41",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7"
+      }
+    },
+    "node_modules/@vue/shared": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz",
+      "integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@wdio/browserstack-service": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.16.16.tgz",
+      "integrity": "sha512-q4wUh/j0MR2SwhTkmIFif2DaXgH5yzdgOer6G/fac2n81zLCSpQHWO5aQ9T0An9CAd4L2A+t3dmChpBJPkHWSw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.4",
+        "@wdio/logger": "7.16.0",
+        "@wdio/types": "7.16.14",
+        "browserstack-local": "^1.4.5",
+        "got": "^11.0.2",
+        "webdriverio": "7.16.16"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@wdio/cli": "^7.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/config": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz",
+      "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.16.0",
+        "@wdio/types": "7.16.14",
+        "deepmerge": "^4.0.0",
+        "glob": "^7.1.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/protocols": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz",
+      "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/repl": {
+      "version": "7.16.14",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz",
+      "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/utils": "7.16.14"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/utils": {
+      "version": "7.16.14",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz",
+      "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.16.0",
+        "@wdio/types": "7.16.14",
+        "p-iteration": "^1.1.8"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/devtools": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
+      "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.4",
+        "@types/ua-parser-js": "^0.7.33",
+        "@wdio/config": "7.16.16",
+        "@wdio/logger": "7.16.0",
+        "@wdio/protocols": "7.16.7",
+        "@wdio/types": "7.16.14",
+        "@wdio/utils": "7.16.14",
+        "chrome-launcher": "^0.15.0",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^13.1.3",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^1.0.1",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/devtools-protocol": {
+      "version": "0.0.973690",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz",
+      "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
+      "dev": true
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/ua-parser-js": {
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz",
+      "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        }
+      ],
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/webdriver": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz",
+      "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.4",
+        "@wdio/config": "7.16.16",
+        "@wdio/logger": "7.16.0",
+        "@wdio/protocols": "7.16.7",
+        "@wdio/types": "7.16.14",
+        "@wdio/utils": "7.16.14",
+        "got": "^11.0.2",
+        "ky": "^0.29.0",
+        "lodash.merge": "^4.6.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/webdriverio": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz",
+      "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==",
+      "dev": true,
+      "dependencies": {
+        "@types/aria-query": "^5.0.0",
+        "@types/node": "^17.0.4",
+        "@wdio/config": "7.16.16",
+        "@wdio/logger": "7.16.0",
+        "@wdio/protocols": "7.16.7",
+        "@wdio/repl": "7.16.14",
+        "@wdio/types": "7.16.14",
+        "@wdio/utils": "7.16.14",
+        "archiver": "^5.0.0",
+        "aria-query": "^5.0.0",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.16.16",
+        "devtools-protocol": "^0.0.973690",
+        "fs-extra": "^10.0.0",
+        "get-port": "^5.1.1",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^5.0.0",
+        "puppeteer-core": "^13.1.3",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.16.16"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.5.7.tgz",
+      "integrity": "sha512-nOQJLskrY+UECDd3NxE7oBzb6cDA7e7x02YWQugOlOgnZ4a+PJmkFoSsO8C2uNCpdFngy5rJKGUo5vbtAHEF9Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/ejs": "^3.0.5",
+        "@types/fs-extra": "^9.0.4",
+        "@types/inquirer": "^7.3.1",
+        "@types/lodash.flattendeep": "^4.4.6",
+        "@types/lodash.pickby": "^4.6.6",
+        "@types/lodash.union": "^4.6.6",
+        "@types/recursive-readdir": "^2.2.0",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "async-exit-hook": "^2.0.1",
+        "chalk": "^4.0.0",
+        "chokidar": "^3.0.0",
+        "cli-spinners": "^2.1.0",
+        "ejs": "^3.0.1",
+        "fs-extra": "^10.0.0",
+        "inquirer": "^8.0.0",
+        "lodash.flattendeep": "^4.4.0",
+        "lodash.pickby": "^4.6.0",
+        "lodash.union": "^4.6.0",
+        "mkdirp": "^1.0.4",
+        "recursive-readdir": "^2.2.2",
+        "webdriverio": "7.5.7",
+        "yargs": "^17.0.0",
+        "yarn-install": "^1.0.0"
+      },
+      "bin": {
+        "wdio": "bin/wdio.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/chrome-launcher": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^1.0.5",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^0.5.3",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/chrome-launcher/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/@wdio/cli/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/devtools": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "chrome-launcher": "^0.13.1",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^0.7.21",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/devtools-protocol": {
+      "version": "0.0.878340",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/puppeteer-core": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/webdriverio": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+      "dev": true,
+      "dependencies": {
+        "@types/aria-query": "^4.2.1",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "archiver": "^5.0.0",
+        "aria-query": "^4.2.2",
+        "atob": "^2.1.2",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.5.7",
+        "devtools-protocol": "^0.0.878340",
+        "fs-extra": "^10.0.0",
+        "get-port": "^5.1.1",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^3.0.4",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.5.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/yargs": {
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@wdio/concise-reporter": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.5.7.tgz",
+      "integrity": "sha512-964i7eQ4sboSla2bdR8714Er82QBgS6u39GmDFX8Izy9Ge38xaE75HuF5S7mnOWGzSojCWgqtwy5k7Rfg6GE3g==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/reporter": "7.5.7",
+        "@wdio/types": "7.5.3",
+        "chalk": "^4.0.0",
+        "pretty-ms": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@wdio/cli": "^7.0.0"
+      }
+    },
+    "node_modules/@wdio/concise-reporter/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/concise-reporter/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/concise-reporter/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/concise-reporter/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/concise-reporter/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/concise-reporter/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/concise-reporter/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/config": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.5.3.tgz",
+      "integrity": "sha512-udvVizYoilOxuWj/BmoN6y7ZCd4wPdYNlSfWznrbCezAdaLZ4/pNDOO0WRWx2C4+q1wdkXZV/VuQPUGfL0lEHQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "deepmerge": "^4.0.0",
+        "glob": "^7.1.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/config/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/local-runner": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.5.7.tgz",
+      "integrity": "sha512-aYc0XUV+/e3cg8Fp+CWlC4FbwSSG3mKAv1iuy/+Hwzg2kJE+aa+Rf2p2BQYc7HPRtKNW0bM8o+aCImZLAiPM+A==",
+      "dev": true,
+      "dependencies": {
+        "@types/stream-buffers": "^3.0.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/runner": "7.5.7",
+        "@wdio/types": "7.5.3",
+        "async-exit-hook": "^2.0.1",
+        "split2": "^3.2.2",
+        "stream-buffers": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@wdio/cli": "^7.0.0"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/local-runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/logger": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.16.0.tgz",
+      "integrity": "sha512-/6lOGb2Iow5eSsy7RJOl1kCwsP4eMlG+/QKro5zUJsuyNJSQXf2ejhpkzyKWLgQbHu83WX6cM1014AZuLkzoQg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/logger/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/logger/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/logger/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/logger/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/logger/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/logger/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/mocha-framework": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.5.3.tgz",
+      "integrity": "sha512-96QCVWsiyZxEgOZP3oTq2B2T7zne5dCdehLa2n4q/BLjk96Rj0jifidJZfd/1+vdNPKX0gWWAzpy98Znn8MVMw==",
+      "dev": true,
+      "dependencies": {
+        "@types/mocha": "^8.0.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "expect-webdriverio": "^2.0.0",
+        "mocha": "^8.0.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/chokidar": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.5.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.1"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/js-yaml": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/log-symbols": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/mocha": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
+      "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
+      "dev": true,
+      "dependencies": {
+        "@ungap/promise-all-settled": "1.1.2",
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.1",
+        "debug": "4.3.1",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.1.6",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "4.0.0",
+        "log-symbols": "4.0.0",
+        "minimatch": "3.0.4",
+        "ms": "2.1.3",
+        "nanoid": "3.1.20",
+        "serialize-javascript": "5.0.1",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "which": "2.0.2",
+        "wide-align": "1.1.3",
+        "workerpool": "6.1.0",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 10.12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/mocha/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/mocha/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/mocha-framework/node_modules/nanoid": {
+      "version": "3.1.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/readdirp": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/workerpool": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
+      "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
+      "dev": true
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wdio/protocols": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.5.3.tgz",
+      "integrity": "sha512-lpNaKwxYhDSL6neDtQQYXvzMAw+u4PXx65ryeMEX82mkARgzSZps5Kyrg9ub7X4T17K1NPfnY6UhZEWg6cKJCg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/repl": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.5.3.tgz",
+      "integrity": "sha512-jfNJwNoc2nWdnLsFoGHmOJR9zaWfDTBMWM3W1eR5kXIjevD6gAfWsB5ZoA4IdybujCXxdnhlsm4o2jIzp/6f7A==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/utils": "7.5.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/reporter": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.5.7.tgz",
+      "integrity": "sha512-9PXqZtCXDtU6UYLNDPu9MZQ8BiABGnRlJTrlbYB3gBfZDibMkJMvwXzPderipBv2+ifDZXmGe3Njf1ao2TkbFA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/types": "7.5.3",
+        "fs-extra": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/reporter/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.5.7.tgz",
+      "integrity": "sha512-RzVXd+xnwK/thkx1/xo9K5iscQ0Ofobgsx5dNVtwLDVMn9V7jCW/WX4dSCPAPaVSqnUCmkcQp3P5AoSBPpCZnQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "deepmerge": "^4.0.0",
+        "gaze": "^1.1.2",
+        "webdriver": "7.5.3",
+        "webdriverio": "7.5.7"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/chrome-launcher": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^1.0.5",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^0.5.3",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/devtools": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "chrome-launcher": "^0.13.1",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^0.7.21",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/devtools-protocol": {
+      "version": "0.0.878340",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/runner/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/@wdio/runner/node_modules/puppeteer-core": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/webdriverio": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+      "dev": true,
+      "dependencies": {
+        "@types/aria-query": "^4.2.1",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "archiver": "^5.0.0",
+        "aria-query": "^4.2.2",
+        "atob": "^2.1.2",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.5.7",
+        "devtools-protocol": "^0.0.878340",
+        "fs-extra": "^10.0.0",
+        "get-port": "^5.1.1",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^3.0.4",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.5.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/spec-reporter": {
+      "version": "7.19.7",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.7.tgz",
+      "integrity": "sha512-BDBZU2EK/GuC9VxtfqPtoW43FmvKxYDsvcDVDi3F7o+9fkcuGSJiWbw1AX251ZzzVQ7YP9ImTitSpdpUKXkilQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/easy-table": "^0.0.33",
+        "@wdio/reporter": "7.19.7",
+        "@wdio/types": "7.19.5",
+        "chalk": "^4.0.0",
+        "easy-table": "^1.1.1",
+        "pretty-ms": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@wdio/cli": "^7.0.0"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/@wdio/reporter": {
+      "version": "7.19.7",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.7.tgz",
+      "integrity": "sha512-Dum19gpfru66FnIq78/4HTuW87B7ceLDp6PJXwQM5kXyN7Gb7zhMgp6FZTM0FCYLyi6U/zXZSvpNUYl77caS6g==",
+      "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.5",
+        "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/types": {
+      "version": "7.19.5",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.5.tgz",
+      "integrity": "sha512-S1lC0pmtEO7NVH/2nM1c7NHbkgxLZH3VVG/z6ym3Bbxdtcqi2LMsEvvawMAU/fmhyiIkMsGZCO8vxG9cRw4z4A==",
+      "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",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/spec-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/sync": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.5.7.tgz",
+      "integrity": "sha512-Zu/AYLjwqbFSbaOU1US7ownv3ov8JrtoGHq51JfJ4masefJDXNkHix2cZ0qEgl3IvkkWQ0ewL0G8GTXb3KOemA==",
+      "dev": true,
+      "dependencies": {
+        "@types/fibers": "^3.1.0",
+        "@types/puppeteer": "^5.4.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "fibers": "^5.0.0",
+        "webdriverio": "7.5.7"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "dev": true
+    },
+    "node_modules/@wdio/sync/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/chrome-launcher": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^1.0.5",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^0.5.3",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/sync/node_modules/devtools": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "chrome-launcher": "^0.13.1",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^0.7.21",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/devtools-protocol": {
+      "version": "0.0.878340",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+      "dev": true
+    },
+    "node_modules/@wdio/sync/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/sync/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/@wdio/sync/node_modules/puppeteer-core": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "dev": true
+    },
+    "node_modules/@wdio/sync/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/webdriverio": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+      "dev": true,
+      "dependencies": {
+        "@types/aria-query": "^4.2.1",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "archiver": "^5.0.0",
+        "aria-query": "^4.2.2",
+        "atob": "^2.1.2",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.5.7",
+        "devtools-protocol": "^0.0.878340",
+        "fs-extra": "^10.0.0",
+        "get-port": "^5.1.1",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^3.0.4",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.5.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/types": {
+      "version": "7.16.14",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.16.14.tgz",
+      "integrity": "sha512-AyNI9iBSos9xWBmiFAF3sBs6AJXO/55VppU/eeF4HRdbZMtMarnvMuahM+jlUrA3vJSmDW+ufelG0MT//6vrnw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.4",
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/utils": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.5.3.tgz",
+      "integrity": "sha512-nlLDKr8v8abLOHCKroBwQkGPdCIxjID2MllgWX23xqkYZylM9RdwPBdL8osQt9m3rq2TxiPAT4OlbzNt2WtN6Q==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/utils/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.8.tgz",
+      "integrity": "sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/abbrev": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+      "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
+      "dev": true
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/aes-decrypter": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
+      "integrity": "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "global": "^4.4.0",
+        "pkcs7": "^1.0.4"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.2"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-equal": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/archiver": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
+      "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
+      "dev": true,
+      "dependencies": {
+        "archiver-utils": "^2.1.0",
+        "async": "^3.2.3",
+        "buffer-crc32": "^0.2.1",
+        "readable-stream": "^3.6.0",
+        "readdir-glob": "^1.0.0",
+        "tar-stream": "^2.2.0",
+        "zip-stream": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/archiver-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
+      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.0",
+        "lazystream": "^1.0.0",
+        "lodash.defaults": "^4.2.0",
+        "lodash.difference": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.union": "^4.6.0",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/archiver/node_modules/async": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "dev": true
+    },
+    "node_modules/archiver/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/aria-query": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "dev": true,
+      "dependencies": {
+        "deep-equal": "^2.0.5"
+      }
+    },
+    "node_modules/arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-diff/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==",
+      "dev": true,
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==",
+      "dev": true,
+      "dependencies": {
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "node_modules/array-from": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
+      "integrity": "sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg==",
+      "dev": true
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==",
+      "dev": true,
+      "dependencies": {
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-initial/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-last/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "dev": true,
+      "dependencies": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/assert": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
+      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+      "dev": true,
+      "dependencies": {
+        "es6-object-assign": "^1.1.0",
+        "is-nan": "^1.2.1",
+        "object-is": "^1.0.1",
+        "util": "^0.12.0"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
+      "dev": true
+    },
+    "node_modules/async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
+    },
+    "node_modules/async-exit-hook": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
+      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
+      "dev": true,
+      "dependencies": {
+        "async-done": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
+    },
+    "node_modules/babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      }
+    },
+    "node_modules/babel-code-frame/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-code-frame/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-code-frame/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-code-frame/node_modules/js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
+      "dev": true
+    },
+    "node_modules/babel-code-frame/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-code-frame/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "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": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
+      "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": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "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/jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
+      "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": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
+      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+      "dev": true,
+      "dependencies": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^2.0.0",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 8.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "dependencies": {
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "semver": "^6.1.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "core-js-compat": "^3.25.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
+      "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.23.3 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. Some versions have web compatibility issues. 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-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "node_modules/babel-runtime/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.23.3 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. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "node_modules/babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
+      "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": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
+      "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": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
+      "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": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.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",
+      "integrity": "sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==",
+      "dev": true,
+      "dependencies": {
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/bail": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "dev": true,
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/basic-auth/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "dev": true,
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/beeper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
+      "integrity": "sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
+      "dev": true,
+      "dependencies": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/binaryextensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz",
+      "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
+      "dev": true
+    },
+    "node_modules/body": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+      "integrity": "sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==",
+      "dev": true,
+      "dependencies": {
+        "continuable-cache": "^0.3.1",
+        "error": "^7.0.0",
+        "raw-body": "~1.1.0",
+        "safe-json-parse": "~1.0.1"
+      }
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/body/node_modules/bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+      "integrity": "sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==",
+      "dev": true
+    },
+    "node_modules/body/node_modules/raw-body": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+      "integrity": "sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "1",
+        "string_decoder": "0.10"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/body/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "node_modules/browserslist": {
+      "version": "4.21.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001400",
+        "electron-to-chromium": "^1.4.251",
+        "node-releases": "^2.0.6",
+        "update-browserslist-db": "^1.0.9"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/browserstack": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz",
+      "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
+      "dev": true,
+      "dependencies": {
+        "https-proxy-agent": "^2.2.1"
+      }
+    },
+    "node_modules/browserstack-local": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.5.1.tgz",
+      "integrity": "sha512-T/wxyWDzvBHbDvl7fZKpFU7mYze6nrUkBhNy+d+8bXBqgQX10HTYvajIGO0wb49oGSLCPM0CMZTV/s7e6LF0sA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "https-proxy-agent": "^5.0.1",
+        "is-running": "^2.1.0",
+        "ps-tree": "=1.2.0",
+        "temp-fs": "^0.9.9"
+      }
+    },
+    "node_modules/browserstack/node_modules/agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
+      "dependencies": {
+        "es6-promisify": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/browserstack/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/browserstack/node_modules/https-proxy-agent": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/browserstacktunnel-wrapper": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.5.tgz",
+      "integrity": "sha512-oociT3nl+FhQnyJbAb1RM4oQ5pN7aKeXEURkTkiEVm/Rji2r0agl3Wbw5V23VFn9lCU5/fGyDejRZPtGYsEcFw==",
+      "dev": true,
+      "dependencies": {
+        "https-proxy-agent": "^2.2.1",
+        "unzipper": "^0.9.3"
+      },
+      "engines": {
+        "node": ">= 0.10.20"
+      }
+    },
+    "node_modules/browserstacktunnel-wrapper/node_modules/agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
+      "dependencies": {
+        "es6-promisify": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/browserstacktunnel-wrapper/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/browserstacktunnel-wrapper/node_modules/https-proxy-agent": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
+      "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.2.0"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cac": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
+      "integrity": "sha512-hq4rxE3NT5PlaEiVV39Z45d6MoFcQZG5dsgJqtAUeOz3408LEQAElToDkf9i5IYSCOmK0If/81dLg7nKxqPR0w==",
+      "dev": true,
+      "dependencies": {
+        "camelcase-keys": "^3.0.0",
+        "chalk": "^1.1.3",
+        "indent-string": "^3.0.0",
+        "minimist": "^1.2.0",
+        "read-pkg-up": "^1.0.1",
+        "suffix": "^0.1.0",
+        "text-table": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cac/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cac/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cac/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cac/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cac/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/cac/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/cac/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cac/node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cac/node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cac/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/cac/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cac/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.6.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
+      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "dev": true,
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
+      "integrity": "sha512-U4E6A6aFyYnNW+tDt5/yIUKQURKXe3WMFPfX4FxrQFcwZ/R08AUk1xWcUtlr7oq6CV07Ji+aa69V2g7BSpblnQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/camelcase-keys/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/can-autoplay": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
+      "integrity": "sha512-Ih6wc7yJB4TylS/mLyAW0Dj5Nh3Gftq/g966TcxgvpNCOzlbqTs85srAq7mwIspo4w8gnLCVVGroyCHfh6l9aA==",
+      "dev": true
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001429",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz",
+      "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==",
+      "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",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "dev": true
+    },
+    "node_modules/ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/chai": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
+      "dev": true,
+      "dependencies": {
+        "traverse": ">=0.3.0 <0.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/character-entities": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+      "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "node_modules/check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/chrome-launcher": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.1.tgz",
+      "integrity": "sha512-UugC8u59/w2AyX5sHLZUHoxBAiSiunUhZa3zZwMH6zPVis0C3dDKiRWyUGIo14tTbZHGVviWxv3PQWZ7taZ4fg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0"
+      },
+      "bin": {
+        "print-chrome-path": "bin/print-chrome-path.js"
+      },
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
+    "node_modules/chrome-launcher/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
+      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
+      "dev": true
+    },
+    "node_modules/cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==",
+      "dev": true,
+      "dependencies": {
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "dev": true,
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/comma-separated-tokens": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "node_modules/compress-commons": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",
+      "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "^0.2.13",
+        "crc32-stream": "^4.0.2",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/compress-commons/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/concat-with-sourcemaps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/connect-livereload": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz",
+      "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/connect/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/connect/node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/connect/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/connect/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/connect/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/continuable-cache": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+      "integrity": "sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
+    "node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/copy-props": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
+      "dev": true,
+      "dependencies": {
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
+      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
+      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
+      "dependencies": {
+        "browserslist": "^4.21.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.0.tgz",
+      "integrity": "sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/coveralls": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.1.tgz",
+      "integrity": "sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==",
+      "dev": true,
+      "dependencies": {
+        "js-yaml": "^3.13.1",
+        "lcov-parse": "^1.0.0",
+        "log-driver": "^1.2.7",
+        "minimist": "^1.2.5",
+        "request": "^2.88.2"
+      },
+      "bin": {
+        "coveralls": "bin/coveralls.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "dev": true,
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/crc32-stream": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz",
+      "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",
+      "dev": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "readable-stream": "^3.4.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/crc32-stream/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/criteo-direct-rsa-validate": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
+      "integrity": "sha512-7gQ3zX+d+hS/vOxzLrZ4aRAceB7qNJ0VzaGNpcWjDCmtOpASB50USJDupTik/H2nHgiSAA3VNZ3SFuONs8LR9Q=="
+    },
+    "node_modules/cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dev": true,
+      "dependencies": {
+        "node-fetch": "2.6.7"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-js": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
+      "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+    },
+    "node_modules/css": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.6.0"
+      }
+    },
+    "node_modules/css-shorthand-properties": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz",
+      "integrity": "sha512-Md+Juc7M3uOdbAFwOYlTrccIZ7oCFuzrhKYQjdeUEW/sE1hv17Jp/Bws+ReOPpGVBTYCBoYo+G17V5Qo8QQ75A==",
+      "dev": true
+    },
+    "node_modules/css-value": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
+      "integrity": "sha512-FUV3xaJ63buRLgHrLQVlVgQnQdR4yqdLGaDu7g8CQcWjInDfM9plBTPI9FRfpahju1UBSaMckeb2/46ApS/V1Q==",
+      "dev": true
+    },
+    "node_modules/css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
+      "dev": true
+    },
+    "node_modules/d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/date-format": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/dateformat": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/de-indent": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/debug-fabulous": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "3.X",
+        "memoizee": "0.4.X",
+        "object-assign": "4.X"
+      }
+    },
+    "node_modules/debug-fabulous/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decode-named-character-reference": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz",
+      "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==",
+      "dev": true,
+      "dependencies": {
+        "character-entities": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/deep-equal": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
+      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "es-get-iterator": "^1.1.1",
+        "get-intrinsic": "^1.0.1",
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.2",
+        "is-regex": "^1.1.1",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.4",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.3.0",
+        "side-channel": "^1.0.3",
+        "which-boxed-primitive": "^1.0.1",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^5.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/defaults/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
+      "dev": true,
+      "dependencies": {
+        "repeating": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+      "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/devtools": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.25.4.tgz",
+      "integrity": "sha512-R6/S/dCqxoX4Y6PxIGM9JFAuSRZzUeV5r+CoE/frhmno6mTe7dEEgwkJlfit3LkKRoul8n4DsL2A3QtWOvq5IA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^18.0.0",
+        "@types/ua-parser-js": "^0.7.33",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "chrome-launcher": "^0.15.0",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^13.1.3",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^1.0.1",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools-protocol": {
+      "version": "0.0.1061995",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1061995.tgz",
+      "integrity": "sha512-pKZZWTjWa/IF4ENCg6GN8bu/AxSZgdhjSa26uc23wz38Blt2Tnm9icOPcSG3Cht55rMq35in1w3rWVPcZ60ArA==",
+      "dev": true
+    },
+    "node_modules/devtools/node_modules/@types/node": {
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+      "dev": true
+    },
+    "node_modules/devtools/node_modules/@wdio/config": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
+      "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.19.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "deepmerge": "^4.0.0",
+        "glob": "^8.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/@wdio/logger": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
+      "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/@wdio/protocols": {
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
+      "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/@wdio/types": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+      "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^18.0.0",
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^4.6.2"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/devtools/node_modules/@wdio/utils": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
+      "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.19.0",
+        "@wdio/types": "7.25.4",
+        "p-iteration": "^1.1.8"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/devtools/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/devtools/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/devtools/node_modules/glob": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/devtools/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/devtools/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/devtools/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/devtools/node_modules/ua-parser-js": {
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz",
+      "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        }
+      ],
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/devtools/node_modules/uuid": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
+      "dev": true
+    },
+    "node_modules/diff": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/doctrine-temporary-fork": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz",
+      "integrity": "sha512-nliqOv5NkE4zMON4UA6AMJE6As35afs8aYXATpU4pTUdIKiARZwrJVEP1boA3Rx1ZXHVkwxkhcq4VkqvsuRLsA==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/documentation": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.1.tgz",
+      "integrity": "sha512-Y/brACCE3sNnDJPFiWlhXrqGY+NelLYVZShLGse5bT1KdohP4JkPf5T2KNq1YWhIEbDYl/1tebRLC0WYbPQxVw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.18.10",
+        "@babel/generator": "^7.18.10",
+        "@babel/parser": "^7.18.11",
+        "@babel/traverse": "^7.18.11",
+        "@babel/types": "^7.18.10",
+        "chalk": "^5.0.1",
+        "chokidar": "^3.5.3",
+        "diff": "^5.1.0",
+        "doctrine-temporary-fork": "2.1.0",
+        "git-url-parse": "^13.1.0",
+        "github-slugger": "1.4.0",
+        "glob": "^8.0.3",
+        "globals-docs": "^2.4.1",
+        "highlight.js": "^11.6.0",
+        "ini": "^3.0.0",
+        "js-yaml": "^4.1.0",
+        "konan": "^2.1.1",
+        "lodash": "^4.17.21",
+        "mdast-util-find-and-replace": "^2.2.1",
+        "mdast-util-inject": "^1.1.0",
+        "micromark-util-character": "^1.1.0",
+        "parse-filepath": "^1.0.2",
+        "pify": "^6.0.0",
+        "read-pkg-up": "^9.1.0",
+        "remark": "^14.0.2",
+        "remark-gfm": "^3.0.1",
+        "remark-html": "^15.0.1",
+        "remark-reference-links": "^6.0.1",
+        "remark-toc": "^8.0.1",
+        "resolve": "^1.22.1",
+        "strip-json-comments": "^5.0.0",
+        "unist-builder": "^3.0.0",
+        "unist-util-visit": "^4.1.0",
+        "vfile": "^5.3.4",
+        "vfile-reporter": "^7.0.4",
+        "vfile-sort": "^3.0.0",
+        "yargs": "^17.5.1"
+      },
+      "bin": {
+        "documentation": "bin/documentation.js"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "optionalDependencies": {
+        "@vue/compiler-sfc": "^3.2.37",
+        "vue-template-compiler": "^2.7.8"
+      }
+    },
+    "node_modules/documentation/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/documentation/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/documentation/node_modules/chalk": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
+      "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/documentation/node_modules/glob": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/documentation/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/documentation/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/documentation/node_modules/yargs": {
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
+      "dev": true,
+      "dependencies": {
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
+      }
+    },
+    "node_modules/dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
+      "dev": true
+    },
+    "node_modules/dset": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
+      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true
+    },
+    "node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/duplexer2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/duplexify": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
+      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.4.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/duplexify/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
+      }
+    },
+    "node_modules/each-props/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
+    "node_modules/easy-table": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz",
+      "integrity": "sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "optionalDependencies": {
+        "wcwidth": "^1.0.1"
+      }
+    },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/edge-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-2.2.1.tgz",
+      "integrity": "sha512-AI5fC7dfDmCdKo3m5y7PkYE8m6bMqR6pvVpgtrZkkhcJXFLelUgkjrhk3kXXx8Kbw2cRaTT4LkOR7hqf39KJdw==",
+      "dev": true,
+      "dependencies": {
+        "@types/which": "^1.3.2",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "node_modules/ejs": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
+      "dev": true,
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/engine.io": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
+      "dev": true,
+      "dependencies": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.3",
+        "ws": "~8.2.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
+      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
+      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
+      "dev": true
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
+    "node_modules/error": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
+      "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
+      "dev": true,
+      "dependencies": {
+        "string-template": "~0.2.1"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-get-iterator": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
+      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.0",
+        "has-symbols": "^1.0.1",
+        "is-arguments": "^1.1.0",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.5",
+        "isarray": "^2.0.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "dev": true
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es5-ext": {
+      "version": "0.10.62",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "next-tick": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/es5-shim": {
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.7.tgz",
+      "integrity": "sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/es6-object-assign": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
+      "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
+      "dev": true
+    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
+    "node_modules/es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==",
+      "dev": true,
+      "dependencies": {
+        "es6-promise": "^4.0.3"
+      }
+    },
+    "node_modules/es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "node_modules/es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^2.7.1",
+        "estraverse": "^1.9.1",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.2.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+      "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+      "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-standard": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
+      "integrity": "sha512-UkFojTV1o0GOe1edOEiuI5ccYLJSuNngtqSeClNzhsmG8KPJ+7mRxgtp2oYhqZAK/brlXMoCd+VgXViE0AfyKw==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=3.19.0",
+        "eslint-plugin-import": ">=2.2.0",
+        "eslint-plugin-node": ">=4.2.2",
+        "eslint-plugin-promise": ">=3.5.0",
+        "eslint-plugin-standard": ">=3.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-es": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
+      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/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/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-node": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
+      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+      "dev": true,
+      "dependencies": {
+        "eslint-plugin-es": "^3.0.0",
+        "eslint-utils": "^2.0.0",
+        "ignore": "^5.1.1",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.16.0"
+      }
+    },
+    "node_modules/eslint-plugin-node/node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/eslint-plugin-prebid": {
+      "resolved": "plugins/eslint",
+      "link": true
+    },
+    "node_modules/eslint-plugin-promise": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
+      "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==",
+      "dev": true,
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-standard": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
+      "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==",
+      "dev": true,
+      "peerDependencies": {
+        "eslint": ">=3.19.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "node_modules/event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "~0.1.1",
+        "from": "~0",
+        "map-stream": "~0.1.0",
+        "pause-stream": "0.0.11",
+        "split": "0.3",
+        "stream-combiner": "~0.0.4",
+        "through": "~2.3.1"
+      }
+    },
+    "node_modules/event-stream/node_modules/map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
+      "dev": true
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/execa/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/execa/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/execa/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/execa/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/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/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/expect-webdriverio": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-2.0.2.tgz",
+      "integrity": "sha512-dst0tqP1aZ2p7TPmbatqoIQ+7hRTw+IeKNi830XxKhu2DNNe5vQ85i9ttf9rpXgbnUf91HxKcocn4G7A5bQxDA==",
+      "dev": true,
+      "dependencies": {
+        "expect": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2"
+      }
+    },
+    "node_modules/expect/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/expect/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/ext": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+      "dev": true,
+      "dependencies": {
+        "type": "^2.7.2"
+      }
+    },
+    "node_modules/ext/node_modules/type": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
+      "dev": true
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extend-shallow/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/extract-zip/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/faker": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
+      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
+      "dev": true
+    },
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/fibers": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.3.tgz",
+      "integrity": "sha512-/qYTSoZydQkM21qZpGLDLuCq8c+B8KhuCQ1kLPvnRNhxhVbvrpmH9l2+Lblf5neDuEsY4bfT7LeO553TXQDvJw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/findup-sync/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/findup-sync/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fined/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/foreachasync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
+      "integrity": "sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==",
+      "dev": true
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/fork-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
+      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
+      "dev": true
+    },
+    "node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
+      "dev": true
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/fs-mkdirp-stream/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/fs.extra": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz",
+      "integrity": "sha512-Ig401VXtyrWrz23k9KxAx9OrnL8AHSLNhQ8YJH2wSYuH0ZUfxwBeY6zXkd/oOyVRFTlpEu/0n5gHeuZt7aqbkw==",
+      "dev": true,
+      "dependencies": {
+        "fs-extra": "~0.6.1",
+        "mkdirp": "~0.3.5",
+        "walk": "^2.3.9"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/fs.extra/node_modules/fs-extra": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
+      "integrity": "sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonfile": "~1.0.1",
+        "mkdirp": "0.3.x",
+        "ncp": "~0.4.2",
+        "rimraf": "~2.2.0"
+      }
+    },
+    "node_modules/fs.extra/node_modules/jsonfile": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
+      "integrity": "sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==",
+      "dev": true
+    },
+    "node_modules/fs.extra/node_modules/mkdirp": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true
+    },
+    "node_modules/fs.extra/node_modules/rimraf": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+      "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
+      "dev": true,
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/fstream/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/fstream/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/fun-hooks": {
+      "version": "0.9.10",
+      "resolved": "https://registry.npmjs.org/fun-hooks/-/fun-hooks-0.9.10.tgz",
+      "integrity": "sha512-7xBjdT+oMYOPWgwFxNiNzF4ubeUvim4zs1DnQqSSGyxu8UD7AW/6Z0iFsVRwuVSIZKUks2en2VHHotmNfj3ipw==",
+      "dependencies": {
+        "typescript-tuple": "^2.2.1"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "dependencies": {
+        "globule": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-port": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
+      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/git-up": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
+      "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==",
+      "dev": true,
+      "dependencies": {
+        "is-ssh": "^1.4.0",
+        "parse-url": "^8.1.0"
+      }
+    },
+    "node_modules/git-url-parse": {
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz",
+      "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
+      "dev": true,
+      "dependencies": {
+        "git-up": "^7.0.0"
+      }
+    },
+    "node_modules/github-slugger": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
+      "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
+      "dev": true
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "node_modules/glob-watcher": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
+      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "normalize-path": "^3.0.0",
+        "object.defaults": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
+      "dev": true,
+      "dependencies": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "optionalDependencies": {
+        "fsevents": "^1.2.7"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/glob-watcher/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "dev": true,
+      "dependencies": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
+    "node_modules/global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globals-docs": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/globals-docs/-/globals-docs-2.4.1.tgz",
+      "integrity": "sha512-qpPnUKkWnz8NESjrCvnlGklsgiQzlq+rcCxoG5uNQ+dNA7cFMCmn231slLAwS2N/PlkzZ3COL8CcS10jXmLHqg==",
+      "dev": true
+    },
+    "node_modules/globule": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
+      "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
+      "dev": true,
+      "dependencies": {
+        "glob": "~7.1.1",
+        "lodash": "^4.17.21",
+        "minimatch": "~3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/globule/node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/globule/node_modules/minimatch": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+      "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/got": {
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "node_modules/growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.x"
+      }
+    },
+    "node_modules/gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "dependencies": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-clean": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.4.0.tgz",
+      "integrity": "sha512-DARK8rNMo4lHOFLGTiHEJdf19GuoBDHqGUaypz+fOhrvOs3iFO7ntdYtdpNxv+AzSJBx/JfypF0yEj9ks1IStQ==",
+      "dev": true,
+      "dependencies": {
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^0.1.2",
+        "rimraf": "^2.6.2",
+        "through2": "^2.0.3",
+        "vinyl": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.9"
+      }
+    },
+    "node_modules/gulp-clean/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/gulp-clean/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
+      },
+      "bin": {
+        "gulp": "bin/gulp.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+      "dev": true,
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+      "dev": true,
+      "dependencies": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
+      "dev": true
+    },
+    "node_modules/gulp-cli/node_modules/yargs": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
+      "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.1"
+      }
+    },
+    "node_modules/gulp-cli/node_modules/yargs-parser": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
+      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==",
+      "dev": true,
+      "dependencies": {
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-concat/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-connect": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.7.0.tgz",
+      "integrity": "sha512-8tRcC6wgXMLakpPw9M7GRJIhxkYdgZsXwn7n56BA2bQYGLR9NOPhMzx7js+qYDy6vhNkbApGKURjAw1FjY4pNA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^2.0.5",
+        "connect": "^3.6.6",
+        "connect-livereload": "^0.6.0",
+        "fancy-log": "^1.3.2",
+        "map-stream": "^0.0.7",
+        "send": "^0.16.2",
+        "serve-index": "^1.9.1",
+        "serve-static": "^1.13.2",
+        "tiny-lr": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-connect/node_modules/ansi-colors": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
+      "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-connect/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/gulp-connect/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/gulp-connect/node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
+      "dev": true
+    },
+    "node_modules/gulp-connect/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/gulp-connect/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/gulp-connect/node_modules/mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      }
+    },
+    "node_modules/gulp-connect/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/gulp-connect/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/gulp-connect/node_modules/send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/gulp-connect/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/gulp-connect/node_modules/statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/gulp-eslint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz",
+      "integrity": "sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==",
+      "dev": true,
+      "dependencies": {
+        "eslint": "^6.0.0",
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^1.0.1"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/gulp-eslint/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/gulp-eslint/node_modules/eslint": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.3",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^7.0.0",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.14",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.3",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/eslint/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/espree": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "dev": true
+    },
+    "node_modules/gulp-eslint/node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/gulp-eslint/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/gulp-eslint/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.5.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/table/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/table/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/gulp-if": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-3.0.0.tgz",
+      "integrity": "sha512-fCUEngzNiEZEK2YuPm+sdMpO6ukb8+/qzbGfJBXyNOXz85bCG7yBI+pPSl+N90d7gnLvMsarthsAImx0qy7BAw==",
+      "dev": true,
+      "dependencies": {
+        "gulp-match": "^1.1.0",
+        "ternary-stream": "^3.0.0",
+        "through2": "^3.0.1"
+      }
+    },
+    "node_modules/gulp-if/node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
+    "node_modules/gulp-js-escape": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-js-escape/-/gulp-js-escape-1.0.1.tgz",
+      "integrity": "sha512-F+53crhLb78CTlG7ZZJFWzP0+/4q0vt2/pULXFkTMs6AGBo0Eh5cx+eWsqqHv8hrNIUsuTab3Se8rOOzP/6+EQ==",
+      "dev": true,
+      "dependencies": {
+        "through2": "^0.6.3"
+      }
+    },
+    "node_modules/gulp-js-escape/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/gulp-js-escape/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/gulp-js-escape/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/gulp-js-escape/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/gulp-match": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
+      "integrity": "sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^3.0.3"
+      }
+    },
+    "node_modules/gulp-replace": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz",
+      "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^14.14.41",
+        "@types/vinyl": "^2.0.4",
+        "istextorbinary": "^3.0.0",
+        "replacestream": "^4.0.3",
+        "yargs-parser": ">=5.0.0-security.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/gulp-replace/node_modules/@types/node": {
+      "version": "14.18.33",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz",
+      "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==",
+      "dev": true
+    },
+    "node_modules/gulp-shell": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.8.0.tgz",
+      "integrity": "sha512-wHNCgmqbWkk1c6Gc2dOL5SprcoeujQdeepICwfQRo91DIylTE7a794VEE+leq3cE2YDoiS5ulvRfKVIEMazcTQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^3.0.0",
+        "fancy-log": "^1.3.3",
+        "lodash.template": "^4.5.0",
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1",
+        "tslib": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/gulp-shell/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
+    "node_modules/gulp-sourcemaps": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
+      "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
+      "dev": true,
+      "dependencies": {
+        "@gulp-sourcemaps/identity-map": "^2.0.1",
+        "@gulp-sourcemaps/map-sources": "^1.0.0",
+        "acorn": "^6.4.1",
+        "convert-source-map": "^1.0.0",
+        "css": "^3.0.0",
+        "debug-fabulous": "^1.0.0",
+        "detect-newline": "^2.0.0",
+        "graceful-fs": "^4.0.0",
+        "source-map": "^0.6.0",
+        "strip-bom-string": "^1.0.0",
+        "through2": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/gulp-sourcemaps/node_modules/acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/gulp-sourcemaps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-sourcemaps/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-terser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz",
+      "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==",
+      "dev": true,
+      "dependencies": {
+        "plugin-error": "^1.0.1",
+        "terser": "^5.9.0",
+        "through2": "^4.0.2",
+        "vinyl-sourcemaps-apply": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gulp-util": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
+      "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
+      "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
+      "dev": true,
+      "dependencies": {
+        "array-differ": "^1.0.0",
+        "array-uniq": "^1.0.2",
+        "beeper": "^1.0.0",
+        "chalk": "^1.0.0",
+        "dateformat": "^2.0.0",
+        "fancy-log": "^1.1.0",
+        "gulplog": "^1.0.0",
+        "has-gulplog": "^0.1.0",
+        "lodash._reescape": "^3.0.0",
+        "lodash._reevaluate": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.template": "^3.0.0",
+        "minimist": "^1.1.0",
+        "multipipe": "^0.1.2",
+        "object-assign": "^3.0.0",
+        "replace-ext": "0.0.1",
+        "through2": "^2.0.0",
+        "vinyl": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/gulp-util/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/gulp-util/node_modules/clone-stats": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+      "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
+      "dev": true
+    },
+    "node_modules/gulp-util/node_modules/lodash.template": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+      "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash._basetostring": "^3.0.0",
+        "lodash._basevalues": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0",
+        "lodash.keys": "^3.0.0",
+        "lodash.restparam": "^3.0.0",
+        "lodash.templatesettings": "^3.0.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/lodash.templatesettings": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+      "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/object-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+      "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-util/node_modules/vinyl": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+      "integrity": "sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
+      "dev": true,
+      "dependencies": {
+        "glogg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/handlebars": {
+      "version": "4.7.7",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.0",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
+      }
+    },
+    "node_modules/handlebars/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==",
+      "dev": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hast-util-is-element": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
+      "integrity": "sha512-thjnlGAnwP8ef/GSO1Q8BfVk2gundnc2peGQqEg2kUt/IqesiGg/5mSwN2fE7nLzy61pg88NG6xV+UrGOrx9EA==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "@types/unist": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-sanitize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-4.0.0.tgz",
+      "integrity": "sha512-pw56+69jq+QSr/coADNvWTmBPDy+XsmwaF5KnUys4/wM1jt/fZdl7GPxhXXXYdXnz3Gj3qMkbUCH2uKjvX0MgQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-to-html": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-8.0.3.tgz",
+      "integrity": "sha512-/D/E5ymdPYhHpPkuTHOUkSatxr4w1ZKrZsG0Zv/3C2SRVT0JFJG53VS45AMrBtYk0wp5A7ksEhiC8QaOZM95+A==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-is-element": "^2.0.0",
+        "hast-util-whitespace": "^2.0.0",
+        "html-void-elements": "^2.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.2",
+        "unist-util-is": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-whitespace": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz",
+      "integrity": "sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/highlight.js": {
+      "version": "11.6.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz",
+      "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "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": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
+      "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",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/html-void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
+      "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "dev": true
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "dev": true,
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+      "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/individual": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
+      "integrity": "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
+      "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/inquirer": {
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz",
+      "integrity": "sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.1",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.21",
+        "mute-stream": "0.0.8",
+        "ora": "^5.4.1",
+        "run-async": "^2.4.0",
+        "rxjs": "^7.5.5",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/inquirer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inquirer/node_modules/rxjs": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
+      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/inquirer/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inquirer/node_modules/tslib": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "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",
+      "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extendable/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-finite": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+      "dev": true
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-nan": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
+      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-running": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
+      "integrity": "sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w==",
+      "dev": true
+    },
+    "node_modules/is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-ssh": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
+      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
+      "dev": true,
+      "dependencies": {
+        "protocols": "^2.0.1"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
+      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.20.0",
+        "for-each": "^0.3.3",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
+    },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "dev": true
+    },
+    "node_modules/is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/isbinaryfile": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/gjtorikian/"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "dev": true
+    },
+    "node_modules/istanbul": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+      "integrity": "sha512-nMtdn4hvK0HjUlzr1DrKSUY8ychprt8dzHOgY2KXsIhHu5PuQQEOTM27gV9Xblyon7aUH/TSFIjRHEODF/FRPg==",
+      "deprecated": "This module is no longer maintained, try this instead:\n  npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1.0.x",
+        "async": "1.x",
+        "escodegen": "1.8.x",
+        "esprima": "2.7.x",
+        "glob": "^5.0.15",
+        "handlebars": "^4.0.1",
+        "js-yaml": "3.x",
+        "mkdirp": "0.5.x",
+        "nopt": "3.x",
+        "once": "1.x",
+        "resolve": "1.1.x",
+        "supports-color": "^3.1.0",
+        "which": "^1.1.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "istanbul": "lib/cli.js"
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul/node_modules/glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+      "dev": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/istanbul/node_modules/has-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul/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/istanbul/node_modules/resolve": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
+      "dev": true
+    },
+    "node_modules/istanbul/node_modules/supports-color": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+      "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/istanbul/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/istextorbinary": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz",
+      "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==",
+      "dev": true,
+      "dependencies": {
+        "binaryextensions": "^2.2.0",
+        "textextensions": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
+    "node_modules/jake": {
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+      "dev": true,
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.1",
+        "minimatch": "^3.0.4"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jake/node_modules/async": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "dev": true
+    },
+    "node_modules/jake/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jake/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jake/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jake/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jake/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-diff/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-diff/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-diff/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-diff/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-matcher-utils/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/jest-message-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/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/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/js-yaml/node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsprim": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/just-clone": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
+      "integrity": "sha512-p93GINPwrve0w3HUzpXmpTl7MyzzWz1B5ag44KEtq/hP1mtK8lA2b9Q0VQaPlnY87352osJcE6uBmN0e8kuFMw=="
+    },
+    "node_modules/just-debounce": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
+      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
+      "dev": true
+    },
+    "node_modules/just-extend": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
+      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
+      "dev": true
+    },
+    "node_modules/karma": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz",
+      "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==",
+      "dev": true,
+      "dependencies": {
+        "@colors/colors": "1.5.0",
+        "body-parser": "^1.19.0",
+        "braces": "^3.0.2",
+        "chokidar": "^3.5.1",
+        "connect": "^3.7.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.1",
+        "glob": "^7.1.7",
+        "graceful-fs": "^4.2.6",
+        "http-proxy": "^1.18.1",
+        "isbinaryfile": "^4.0.8",
+        "lodash": "^4.17.21",
+        "log4js": "^6.4.1",
+        "mime": "^2.5.2",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.5",
+        "qjobs": "^1.2.0",
+        "range-parser": "^1.2.1",
+        "rimraf": "^3.0.2",
+        "socket.io": "^4.4.1",
+        "source-map": "^0.6.1",
+        "tmp": "^0.2.1",
+        "ua-parser-js": "^0.7.30",
+        "yargs": "^16.1.1"
+      },
+      "bin": {
+        "karma": "bin/karma"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/karma-babel-preprocessor": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.2.tgz",
+      "integrity": "sha512-6ZUnHwaK2EyhgxbgeSJW6n6WZUYSEdekHIV/qDUnPgMkVzQBHEvd07d2mTL5AQjV8uTUgH6XslhaPrp+fHWH2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "@babel/core": "7"
+      }
+    },
+    "node_modules/karma-browserstack-launcher": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-browserstack-launcher/-/karma-browserstack-launcher-1.4.0.tgz",
+      "integrity": "sha512-bUQK84U+euDfOUfEjcF4IareySMOBNRLrrl9q6cttIe8f011Ir6olLITTYMOJDcGY58wiFIdhPHSPd9Pi6+NfQ==",
+      "dev": true,
+      "dependencies": {
+        "browserstack": "~1.5.1",
+        "browserstacktunnel-wrapper": "~2.0.2",
+        "q": "~1.5.0"
+      },
+      "peerDependencies": {
+        "karma": ">=0.9"
+      }
+    },
+    "node_modules/karma-chai": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz",
+      "integrity": "sha512-mqKCkHwzPMhgTYca10S90aCEX9+HjVjjrBFAsw36Zj7BlQNbokXXCAe6Ji04VUMsxcY5RLP7YphpfO06XOubdg==",
+      "dev": true,
+      "peerDependencies": {
+        "chai": "*",
+        "karma": ">=0.10.9"
+      }
+    },
+    "node_modules/karma-chrome-launcher": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
+      "integrity": "sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==",
+      "dev": true,
+      "dependencies": {
+        "which": "^1.2.1"
+      }
+    },
+    "node_modules/karma-chrome-launcher/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/karma-coverage": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.0.tgz",
+      "integrity": "sha512-gPVdoZBNDZ08UCzdMHHhEImKrw1+PAOQOIiffv1YsvxFhBjqvo/SVXNk4tqn1SYqX0BJZT6S/59zgxiBe+9OuA==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.2.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.1",
+        "istanbul-reports": "^3.0.5",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz",
+      "integrity": "sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^3.0.6",
+        "istanbul-reports": "^3.0.2",
+        "minimatch": "^3.0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mattlewis92"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/istanbul-lib-source-maps": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
+      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^2.0.5",
+        "make-dir": "^2.1.0",
+        "rimraf": "^2.6.3",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/istanbul-lib-source-maps/node_modules/istanbul-lib-coverage": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/karma-coverage-istanbul-reporter/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/karma-es5-shim": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/karma-es5-shim/-/karma-es5-shim-0.0.4.tgz",
+      "integrity": "sha512-8xU6F2/R6u6HAZ/nlyhhx3WEhj4C6hJorG7FR2REX81pgj2LSo9ADJXxCGIeXg6Qr2BGpxp4hcZcEOYGAwiumg==",
+      "dev": true,
+      "dependencies": {
+        "es5-shim": "^4.0.5"
+      }
+    },
+    "node_modules/karma-firefox-launcher": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.2.tgz",
+      "integrity": "sha512-VV9xDQU1QIboTrjtGVD4NCfzIH7n01ZXqy/qpBhnOeGVOkG5JYPEm8kuSd7psHE6WouZaQ9Ool92g8LFweSNMA==",
+      "dev": true,
+      "dependencies": {
+        "is-wsl": "^2.2.0",
+        "which": "^2.0.1"
+      }
+    },
+    "node_modules/karma-ie-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz",
+      "integrity": "sha512-ts71ke8pHvw6qdRtq0+7VY3ANLoZuUNNkA8abRaWV13QRPNm7TtSOqyszjHUtuwOWKcsSz4tbUtrNICrQC+SXQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.6.1"
+      },
+      "peerDependencies": {
+        "karma": ">=0.9"
+      }
+    },
+    "node_modules/karma-mocha": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-2.0.1.tgz",
+      "integrity": "sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.3"
+      }
+    },
+    "node_modules/karma-mocha-reporter": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
+      "integrity": "sha512-Hr6nhkIp0GIJJrvzY8JFeHpQZNseuIakGac4bpw8K1+5F0tLb6l7uvXRa8mt2Z+NVwYgCct4QAfp2R2QP6o00w==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "peerDependencies": {
+        "karma": ">=0.13"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-opera-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz",
+      "integrity": "sha512-rdty4FlVIowmUhPuG08TeXKHvaRxeDSzPxGIkWguCF3A32kE0uvXZ6dXW08PuaNjai8Ip3f5Pn9Pm2HlChaxCw==",
+      "dev": true,
+      "peerDependencies": {
+        "karma": ">=0.9"
+      }
+    },
+    "node_modules/karma-safari-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
+      "integrity": "sha512-qmypLWd6F2qrDJfAETvXDfxHvKDk+nyIjpH9xIeI3/hENr0U3nuqkxaftq73PfXZ4aOuOChA6SnLW4m4AxfRjQ==",
+      "dev": true,
+      "peerDependencies": {
+        "karma": ">=0.9"
+      }
+    },
+    "node_modules/karma-script-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-1.0.0.tgz",
+      "integrity": "sha512-5NRc8KmTBjNPE3dNfpJP90BArnBohYV4//MsLFfUA1e6N+G1/A5WuWctaFBtMQ6MWRybs/oguSej0JwDr8gInA==",
+      "dev": true,
+      "peerDependencies": {
+        "karma": ">=0.9"
+      }
+    },
+    "node_modules/karma-sinon": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz",
+      "integrity": "sha512-wrkyAxJmJbn75Dqy17L/8aILJWFm7znd1CE8gkyxTBFnjMSOe2XTJ3P30T8SkxWZHmoHX0SCaUJTDBEoXs25Og==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      },
+      "peerDependencies": {
+        "karma": ">=0.10",
+        "sinon": "*"
+      }
+    },
+    "node_modules/karma-sourcemap-loader": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz",
+      "integrity": "sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2"
+      }
+    },
+    "node_modules/karma-spec-reporter": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
+      "integrity": "sha512-ZXsYERZJMTNRR2F3QN11OWF5kgnT/K2dzhM+oY3CDyMrDI3TjIWqYGG7c15rR9wjmy9lvdC+CCshqn3YZqnNrA==",
+      "dev": true,
+      "dependencies": {
+        "colors": "^1.1.2"
+      },
+      "peerDependencies": {
+        "karma": ">=0.9"
+      }
+    },
+    "node_modules/karma-webpack": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz",
+      "integrity": "sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "webpack-merge": "^4.1.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/karma/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/karma/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/karma/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/karma/node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dev": true,
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/karma/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/karma/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/keycode": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
+      "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==",
+      "dev": true
+    },
+    "node_modules/keyv": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.0.tgz",
+      "integrity": "sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/konan": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/konan/-/konan-2.1.1.tgz",
+      "integrity": "sha512-7ZhYV84UzJ0PR/RJnnsMZcAbn+kLasJhVNWsu8ZyVEJYRpGA5XESQ9d/7zOa08U0Ou4cmB++hMNY/3OSV9KIbg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.10.5",
+        "@babel/traverse": "^7.10.5"
+      }
+    },
+    "node_modules/ky": {
+      "version": "0.29.0",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-0.29.0.tgz",
+      "integrity": "sha512-01TBSOqlHmLfcQhHseugGHLxPtU03OyZWaLDWt5MfzCkijG6xWFvAQPhKVn0cR2MMjYvBP9keQ8A3+rQEhLO5g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/ky?sponsor=1"
+      }
+    },
+    "node_modules/last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==",
+      "dev": true,
+      "dependencies": {
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/lazystream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+      "dev": true,
+      "dependencies": {
+        "invert-kv": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lcov-parse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz",
+      "integrity": "sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==",
+      "dev": true,
+      "bin": {
+        "lcov-parse": "bin/cli.js"
+      }
+    },
+    "node_modules/lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==",
+      "dev": true,
+      "dependencies": {
+        "flush-write-stream": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/liftoff": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "findup-sync": "^3.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/liftoff/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lighthouse-logger": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz",
+      "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
+      }
+    },
+    "node_modules/lighthouse-logger/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/lighthouse-logger/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==",
+      "dev": true
+    },
+    "node_modules/live-connect-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.1.tgz",
+      "integrity": "sha512-rwB0IQfuKPJM+I96nLyq8Utr3LkQ7Z/iuq/xKlWDckQRJLYyWkk7F7yaavf/VsjazzLK2dpJeXGijoDkK4Vz8g==",
+      "dependencies": {
+        "tiny-hashes": "1.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/livereload-js": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
+      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
+      "dev": true
+    },
+    "node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
+      "dev": true
+    },
+    "node_modules/lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
+      "dev": true
+    },
+    "node_modules/lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
+      "dev": true
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
+      "dev": true
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
+      "dev": true
+    },
+    "node_modules/lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==",
+      "dev": true
+    },
+    "node_modules/lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==",
+      "dev": true
+    },
+    "node_modules/lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
+      "dev": true
+    },
+    "node_modules/lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
+      "dev": true
+    },
+    "node_modules/lodash.clone": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
+      "integrity": "sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==",
+      "dev": true
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
+      "dev": true
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+    },
+    "node_modules/lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "dev": true
+    },
+    "node_modules/lodash.difference": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
+      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
+      "dev": true
+    },
+    "node_modules/lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._root": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
+      "dev": true
+    },
+    "node_modules/lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
+      "dev": true
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "dev": true
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "dev": true
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
+      "dev": true
+    },
+    "node_modules/lodash.isobject": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==",
+      "dev": true
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "dev": true
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.pickby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
+      "integrity": "sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==",
+      "dev": true
+    },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
+      "dev": true
+    },
+    "node_modules/lodash.some": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
+      "dev": true
+    },
+    "node_modules/lodash.template": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+      "dev": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
+      }
+    },
+    "node_modules/lodash.templatesettings": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
+    },
+    "node_modules/lodash.union": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
+      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
+      "dev": true
+    },
+    "node_modules/lodash.zip": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
+      "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==",
+      "dev": true
+    },
+    "node_modules/log-driver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
+      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.6"
+      }
+    },
+    "node_modules/log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log4js": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
+      "integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
+      "dev": true,
+      "dependencies": {
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.1.3"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/loglevel": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz",
+      "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/loglevel"
+      }
+    },
+    "node_modules/loglevel-plugin-prefix": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz",
+      "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==",
+      "dev": true
+    },
+    "node_modules/lolex": {
+      "version": "2.7.5",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz",
+      "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==",
+      "dev": true
+    },
+    "node_modules/longest-streak": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.0.1.tgz",
+      "integrity": "sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "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/loupe": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
+      "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.0"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
+      "dev": true,
+      "dependencies": {
+        "es5-ext": "~0.10.2"
+      }
+    },
+    "node_modules/m3u8-parser": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
+      "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "global": "^4.4.0"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/make-iterator/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
+      "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==",
+      "dev": true
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "dev": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/markdown-table": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
+      "integrity": "sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/marky": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
+      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
+      "dev": true
+    },
+    "node_modules/matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
+      "dev": true,
+      "dependencies": {
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
+      "dev": true,
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/matchdep/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mdast-util-definitions": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
+      "integrity": "sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.0",
+        "unist-util-visit": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-find-and-replace": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz",
+      "integrity": "sha512-SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^5.0.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mdast-util-from-markdown": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz",
+      "integrity": "sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "mdast-util-to-string": "^3.1.0",
+        "micromark": "^3.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-decode-string": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "uvu": "^0.5.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-from-markdown/node_modules/mdast-util-to-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz",
+      "integrity": "sha512-42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ==",
+      "dev": true,
+      "dependencies": {
+        "mdast-util-from-markdown": "^1.0.0",
+        "mdast-util-gfm-autolink-literal": "^1.0.0",
+        "mdast-util-gfm-footnote": "^1.0.0",
+        "mdast-util-gfm-strikethrough": "^1.0.0",
+        "mdast-util-gfm-table": "^1.0.0",
+        "mdast-util-gfm-task-list-item": "^1.0.0",
+        "mdast-util-to-markdown": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-autolink-literal": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz",
+      "integrity": "sha512-FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "ccount": "^2.0.0",
+        "mdast-util-find-and-replace": "^2.0.0",
+        "micromark-util-character": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-footnote": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz",
+      "integrity": "sha512-p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0",
+        "micromark-util-normalize-identifier": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-strikethrough": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz",
+      "integrity": "sha512-zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-table": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz",
+      "integrity": "sha512-uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "markdown-table": "^3.0.0",
+        "mdast-util-from-markdown": "^1.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-task-list-item": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz",
+      "integrity": "sha512-KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-inject": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz",
+      "integrity": "sha512-CcJ0mHa36QYumDKiZ2OIR+ClhfOM7zIzN+Wfy8tRZ1hpH9DKLCS+Mh4DyK5bCxzE9uxMWcbIpeNFWsg1zrj/2g==",
+      "dev": true,
+      "dependencies": {
+        "mdast-util-to-string": "^1.0.0"
+      }
+    },
+    "node_modules/mdast-util-to-hast": {
+      "version": "12.2.4",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz",
+      "integrity": "sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "@types/mdast": "^3.0.0",
+        "mdast-util-definitions": "^5.0.0",
+        "micromark-util-sanitize-uri": "^1.1.0",
+        "trim-lines": "^3.0.0",
+        "unist-builder": "^3.0.0",
+        "unist-util-generated": "^2.0.0",
+        "unist-util-position": "^4.0.0",
+        "unist-util-visit": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-markdown": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz",
+      "integrity": "sha512-6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.0",
+        "longest-streak": "^3.0.0",
+        "mdast-util-to-string": "^3.0.0",
+        "micromark-util-decode-string": "^1.0.0",
+        "unist-util-visit": "^4.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-markdown/node_modules/mdast-util-to-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-string": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz",
+      "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-toc": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-6.1.0.tgz",
+      "integrity": "sha512-0PuqZELXZl4ms1sF7Lqigrqik4Ll3UhbI+jdTrfw7pZ9QPawgl7LD4GQ8MkU7bT/EwiVqChNTbifa2jLLKo76A==",
+      "dev": true,
+      "dependencies": {
+        "@types/extend": "^3.0.0",
+        "@types/github-slugger": "^1.0.0",
+        "@types/mdast": "^3.0.0",
+        "extend": "^3.0.0",
+        "github-slugger": "^1.0.0",
+        "mdast-util-to-string": "^3.1.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-toc/node_modules/mdast-util-to-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-toc/node_modules/unist-util-visit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-3.1.0.tgz",
+      "integrity": "sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-toc/node_modules/unist-util-visit-parents": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz",
+      "integrity": "sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memoizee": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
+      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.53",
+        "es6-weak-map": "^2.0.3",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.2.2",
+        "lru-queue": "^0.1.0",
+        "next-tick": "^1.1.0",
+        "timers-ext": "^0.1.7"
+      }
+    },
+    "node_modules/memory-fs": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+      "dev": true,
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromark": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.1.0.tgz",
+      "integrity": "sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "@types/debug": "^4.0.0",
+        "debug": "^4.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-core-commonmark": "^1.0.1",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-combine-extensions": "^1.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-encode": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-subtokenize": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.1",
+        "uvu": "^0.5.0"
+      }
+    },
+    "node_modules/micromark-core-commonmark": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz",
+      "integrity": "sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-factory-destination": "^1.0.0",
+        "micromark-factory-label": "^1.0.0",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-factory-title": "^1.0.0",
+        "micromark-factory-whitespace": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-classify-character": "^1.0.0",
+        "micromark-util-html-tag-name": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-subtokenize": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.1",
+        "uvu": "^0.5.0"
+      }
+    },
+    "node_modules/micromark-extension-gfm": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-2.0.1.tgz",
+      "integrity": "sha512-p2sGjajLa0iYiGQdT0oelahRYtMWvLjy8J9LOCxzIQsllMCGLbsLW+Nc+N4vi02jcRJvedVJ68cjelKIO6bpDA==",
+      "dev": true,
+      "dependencies": {
+        "micromark-extension-gfm-autolink-literal": "^1.0.0",
+        "micromark-extension-gfm-footnote": "^1.0.0",
+        "micromark-extension-gfm-strikethrough": "^1.0.0",
+        "micromark-extension-gfm-table": "^1.0.0",
+        "micromark-extension-gfm-tagfilter": "^1.0.0",
+        "micromark-extension-gfm-task-list-item": "^1.0.0",
+        "micromark-util-combine-extensions": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-autolink-literal": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.3.tgz",
+      "integrity": "sha512-i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg==",
+      "dev": true,
+      "dependencies": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-footnote": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.4.tgz",
+      "integrity": "sha512-E/fmPmDqLiMUP8mLJ8NbJWJ4bTw6tS+FEQS8CcuDtZpILuOb2kjLqPEeAePF1djXROHXChM/wPJw0iS4kHCcIg==",
+      "dev": true,
+      "dependencies": {
+        "micromark-core-commonmark": "^1.0.0",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-strikethrough": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.4.tgz",
+      "integrity": "sha512-/vjHU/lalmjZCT5xt7CcHVJGq8sYRm80z24qAKXzaHzem/xsDYb2yLL+NNVbYvmpLx3O7SYPuGL5pzusL9CLIQ==",
+      "dev": true,
+      "dependencies": {
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-classify-character": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-table": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.5.tgz",
+      "integrity": "sha512-xAZ8J1X9W9K3JTJTUL7G6wSKhp2ZYHrFk5qJgY/4B33scJzE2kpfRL6oiw/veJTbt7jiM/1rngLlOKPWr1G+vg==",
+      "dev": true,
+      "dependencies": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-tagfilter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.1.tgz",
+      "integrity": "sha512-Ty6psLAcAjboRa/UKUbbUcwjVAv5plxmpUTy2XC/3nJFL37eHej8jrHrRzkqcpipJliuBH30DTs7+3wqNcQUVA==",
+      "dev": true,
+      "dependencies": {
+        "micromark-util-types": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-task-list-item": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.3.tgz",
+      "integrity": "sha512-PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q==",
+      "dev": true,
+      "dependencies": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-factory-destination": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz",
+      "integrity": "sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-factory-label": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz",
+      "integrity": "sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
+    },
+    "node_modules/micromark-factory-space": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz",
+      "integrity": "sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
         },
-        "jest-message-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-          "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "@types/stack-utils": "^1.0.1",
-            "chalk": "^2.0.1",
-            "micromatch": "^3.1.10",
-            "slash": "^2.0.0",
-            "stack-utils": "^1.0.1"
-          }
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-factory-title": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz",
+      "integrity": "sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
         },
-        "jest-regex-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-          "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
-          "dev": true
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
+    },
+    "node_modules/micromark-factory-whitespace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz",
+      "integrity": "sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-character": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz",
+      "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
         },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-chunked": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz",
+      "integrity": "sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-classify-character": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz",
+      "integrity": "sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-combine-extensions": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz",
+      "integrity": "sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-numeric-character-reference": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz",
+      "integrity": "sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-string": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz",
+      "integrity": "sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-encode": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz",
+      "integrity": "sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-html-tag-name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz",
+      "integrity": "sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-normalize-identifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz",
+      "integrity": "sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-resolve-all": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz",
+      "integrity": "sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-sanitize-uri": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz",
+      "integrity": "sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-encode": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "node_modules/micromark-util-subtokenize": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz",
+      "integrity": "sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
+    },
+    "node_modules/micromark-util-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz",
+      "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-types": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz",
+      "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
+      "dev": true,
+      "dependencies": {
+        "dom-walk": "^0.1.0"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
+    "node_modules/mocha": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
+      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/mocha/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/mocha/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/mocha/node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/mocha/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/mocha/node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/mocha/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/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/mocha/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/morgan": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+      "dev": true,
+      "dependencies": {
+        "basic-auth": "~2.0.1",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-finished": "~2.3.0",
+        "on-headers": "~1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/morgan/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/morgan/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/morgan/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/mpd-parser": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
+      "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "@xmldom/xmldom": "^0.7.2",
+        "global": "^4.4.0"
+      },
+      "bin": {
+        "mpd-to-m3u8-json": "bin/parse.js"
+      }
+    },
+    "node_modules/mri": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
+      "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mrmime": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==",
+      "dev": true,
+      "dependencies": {
+        "duplexer2": "0.0.2"
+      }
+    },
+    "node_modules/mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
+    "node_modules/mux.js": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.0.1.tgz",
+      "integrity": "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "global": "^4.4.0"
+      },
+      "bin": {
+        "muxjs-transmux": "bin/transmux.js"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/ncp": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "integrity": "sha512-PfGU8jYWdRl4FqJfCy0IzbkGyFHntfWygZg46nFk/dJD/XRrk2cj0SsKSX9n5u5gE0E0YfEpKWrEkfjnlZSTXA==",
+      "dev": true,
+      "bin": {
+        "ncp": "bin/ncp"
+      }
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/next-tick": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "dev": true
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/nise": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz",
+      "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/formatio": "^3.2.1",
+        "@sinonjs/text-encoding": "^0.7.1",
+        "just-extend": "^4.0.2",
+        "lolex": "^5.0.1",
+        "path-to-regexp": "^1.7.0"
+      }
+    },
+    "node_modules/nise/node_modules/@sinonjs/formatio": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz",
+      "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1",
+        "@sinonjs/samsam": "^3.1.0"
+      }
+    },
+    "node_modules/nise/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/nise/node_modules/lolex": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
+      "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/nise/node_modules/path-to-regexp": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+      "dev": true,
+      "dependencies": {
+        "isarray": "0.0.1"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
+      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
+    },
+    "node_modules/nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/now-and-later": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/npm-run-path/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "dev": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+      "dev": true,
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "dev": true,
+      "bin": {
+        "opener": "bin/opener-bin.js"
+      }
+    },
+    "node_modules/opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "dev": true,
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/opn/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ora/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/ora/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ordered-read-streams": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
+      "dev": true,
+      "dependencies": {
+        "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": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+      "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",
+      "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
+      "dev": true,
+      "dependencies": {
+        "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-iteration": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/p-iteration/-/p-iteration-1.1.8.tgz",
+      "integrity": "sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
+      "dev": true,
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
+      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-path": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
+      "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
+      "dev": true,
+      "dependencies": {
+        "protocols": "^2.0.0"
+      }
+    },
+    "node_modules/parse-url": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
+      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
+      "dev": true,
+      "dependencies": {
+        "parse-path": "^7.0.0"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "dev": true,
+      "dependencies": {
+        "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-type/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
+      "dev": true,
+      "dependencies": {
+        "through": "~2.3"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "dev": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-6.1.0.tgz",
+      "integrity": "sha512-KocF8ve28eFjjuBKKGvzOBGzG8ew2OqOOSxTTZhirkzH7h3BI1vyzqlR0qbfcDBve1Yzo3FVlWUAtCRrbVN8Fw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pkcs7": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
+      "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.5.5"
+      },
+      "bin": {
+        "pkcs7": "bin/cli.js"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
+      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
         },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss/node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pretty-ms": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
+      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
+      "dev": true,
+      "dependencies": {
+        "parse-ms": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/property-information": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.1.1.tgz",
+      "integrity": "sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/protocols": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
+      "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==",
+      "dev": true
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+      "dev": true
+    },
+    "node_modules/ps-tree": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
+      "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
+      "dev": true,
+      "dependencies": {
+        "event-stream": "=3.3.4"
+      },
+      "bin": {
+        "ps-tree": "bin/ps-tree.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "dependencies": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "node_modules/pumpify/node_modules/duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/pumpify/node_modules/pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/puppeteer-core": {
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
+      "integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
+      "dev": true,
+      "dependencies": {
+        "cross-fetch": "3.1.5",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.981744",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "pkg-dir": "4.2.0",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "rimraf": "3.0.2",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "ws": "8.5.0"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.981744",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
+      "integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
+      "dev": true
+    },
+    "node_modules/puppeteer-core/node_modules/ws": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
         },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.0",
+        "teleport": ">=0.2.0"
+      }
+    },
+    "node_modules/qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.9"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/query-selector-shadow-dom": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.0.tgz",
+      "integrity": "sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==",
+      "dev": true
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true
+    },
+    "node_modules/read-pkg": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
+      "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.1",
+        "normalize-package-data": "^3.0.2",
+        "parse-json": "^5.2.0",
+        "type-fest": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
+      "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^6.3.0",
+        "read-pkg": "^7.1.0",
+        "type-fest": "^2.5.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/find-up": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/locate-path": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz",
+      "integrity": "sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/yocto-queue": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/readdir-glob": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz",
+      "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^5.1.0"
+      }
+    },
+    "node_modules/readdir-glob/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/readdir-glob/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/recursive-readdir": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
+      "dev": true,
+      "dependencies": {
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.10",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
+      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-not/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+      "dependencies": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsgen": "^0.7.1",
+        "regjsparser": "^0.9.1",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
+    },
+    "node_modules/regjsparser": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/remark": {
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-14.0.2.tgz",
+      "integrity": "sha512-A3ARm2V4BgiRXaUo5K0dRvJ1lbogrbXnhkJRmD0yw092/Yl0kOCZt1k9ZeElEwkZsWGsMumz6qL5MfNJH9nOBA==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "remark-parse": "^10.0.0",
+        "remark-stringify": "^10.0.0",
+        "unified": "^10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-gfm": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz",
+      "integrity": "sha512-lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-gfm": "^2.0.0",
+        "micromark-extension-gfm": "^2.0.0",
+        "unified": "^10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-html": {
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-15.0.1.tgz",
+      "integrity": "sha512-7ta5UPRqj8nP0GhGMYUAghZ/DRno7dgq7alcW90A7+9pgJsXzGJlFgwF8HOP1b1tMgT3WwbeANN+CaTimMfyNQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "hast-util-sanitize": "^4.0.0",
+        "hast-util-to-html": "^8.0.0",
+        "mdast-util-to-hast": "^12.0.0",
+        "unified": "^10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-parse": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.1.tgz",
+      "integrity": "sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-from-markdown": "^1.0.0",
+        "unified": "^10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-reference-links": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/remark-reference-links/-/remark-reference-links-6.0.1.tgz",
+      "integrity": "sha512-34wY2C6HXSuKVTRtyJJwefkUD8zBOZOSHFZ4aSTnU2F656gr9WeuQ2dL6IJDK3NPd2F6xKF2t4XXcQY9MygAXg==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "unified": "^10.0.0",
+        "unist-util-visit": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-stringify": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-10.0.2.tgz",
+      "integrity": "sha512-6wV3pvbPvHkbNnWB0wdDvVFHOe1hBRAx1Q/5g/EpH4RppAII6J8Gnwe7VbHuXaoKIF6LAg6ExTel/+kNqSQ7lw==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.0.0",
+        "unified": "^10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-toc": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/remark-toc/-/remark-toc-8.0.1.tgz",
+      "integrity": "sha512-7he2VOm/cy13zilnOTZcyAoyoolV26ULlon6XyCFU+vG54Z/LWJnwphj/xKIDLOt66QmJUgTyUvLVHi2aAElyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-toc": "^6.0.0",
+        "unified": "^10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-bom-buffer/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==",
+      "dev": true,
+      "dependencies": {
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/remove-bom-stream/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "dev": true
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
+      "dev": true,
+      "dependencies": {
+        "is-finite": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/replacestream": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
+      "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.3",
+        "object-assign": "^4.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/request/node_modules/qs": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+      "dev": true
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+      "dev": true
+    },
+    "node_modules/resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==",
+      "dev": true,
+      "dependencies": {
+        "value-or-function": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true
+    },
+    "node_modules/responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/resq": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.2.tgz",
+      "integrity": "sha512-HmgVS3j+FLrEDBTDYysPdPVF9/hioDMJ/otOiQDKqk77YfZeeLOj0qi34yObumcud1gBpk+wpBTEg4kMicD++A==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^2.0.1"
+      }
+    },
+    "node_modules/resq/node_modules/fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==",
+      "dev": true
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
+    },
+    "node_modules/rgb2hex": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz",
+      "integrity": "sha512-22MOP1Rh7sAo1BZpDG6R5RFYzR2lYEgwq7HEmyW2qcsOqR2lQKmn+O//xV3YG/0rrhMC6KVX2hU+ZXuaw9a5bw==",
+      "dev": true
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/rust-result": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
+      "integrity": "sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==",
+      "dev": true,
+      "dependencies": {
+        "individual": "^2.0.0"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/sade": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
+      "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==",
+      "dev": true,
+      "dependencies": {
+        "mri": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
         }
+      ]
+    },
+    "node_modules/safe-json-parse": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
+      "integrity": "sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==",
+      "dev": true
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "dev": true,
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/samsam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
+      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
+      "deprecated": "This package has been deprecated in favour of @sinonjs/samsam",
+      "dev": true
+    },
+    "node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==",
+      "dev": true,
+      "dependencies": {
+        "sver-compat": "^1.5.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/serialize-error": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz",
+      "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/serialize-error/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/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/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "dev": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/sinon": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
+      "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@sinonjs/formatio": "^2.0.0",
+        "diff": "^3.1.0",
+        "lodash.get": "^4.4.2",
+        "lolex": "^2.2.0",
+        "nise": "^1.2.0",
+        "supports-color": "^5.1.0",
+        "type-detect": "^4.0.5"
+      }
+    },
+    "node_modules/sinon/node_modules/diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/sirv": {
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
+      "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
+      "dev": true,
+      "dependencies": {
+        "@polka/url": "^1.0.0-next.20",
+        "mrmime": "^1.0.0",
+        "totalist": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/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/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/snapdragon/node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/socket.io": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
+      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "debug": "~4.3.2",
+        "engine.io": "~6.2.0",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
+      "dev": true
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
+      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
+      "dev": true,
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0"
+      }
+    },
+    "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/source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/space-separated-tokens": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz",
+      "integrity": "sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "dev": true
+    },
+    "node_modules/split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+      "dev": true,
+      "dependencies": {
+        "through": "2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split-string/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^3.0.0"
+      }
+    },
+    "node_modules/split2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/sshpk": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
+      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "dev": true,
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stream-buffers": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
+      "integrity": "sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "~0.1.1"
+      }
+    },
+    "node_modules/stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "node_modules/streamroller": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
+      "integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
+      "dev": true,
+      "dependencies": {
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "fs-extra": "^8.1.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/streamroller/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/streamroller/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/streamroller/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==",
+      "dev": true
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/stringify-entities": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz",
+      "integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==",
+      "dev": true,
+      "dependencies": {
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-bom-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
+      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/suffix": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
+      "integrity": "sha512-j5uf6MJtMCfC4vBe5LFktSe4bGyNTBk7I2Kdri0jeLrcv5B9pWfxVa5JQpoxgtR8vaVB7bVxsWgnfQbX5wkhAA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==",
+      "dev": true,
+      "dependencies": {
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "node_modules/table": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
-    "@jest/environment": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
-      "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
       "dev": true,
-      "requires": {
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0"
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
       }
     },
-    "@jest/fake-timers": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
-      "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
       "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-mock": "^24.9.0"
-      },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "jest-message-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-          "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "@types/stack-utils": "^1.0.1",
-            "chalk": "^2.0.1",
-            "micromatch": "^3.1.10",
-            "slash": "^2.0.0",
-            "stack-utils": "^1.0.1"
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "@jest/reporters": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz",
-      "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "istanbul-lib-coverage": "^2.0.2",
-        "istanbul-lib-instrument": "^3.0.1",
-        "istanbul-lib-report": "^2.0.4",
-        "istanbul-lib-source-maps": "^3.0.1",
-        "istanbul-reports": "^2.2.6",
-        "jest-haste-map": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.6.0",
-        "node-notifier": "^5.4.2",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^2.0.0"
+    "node_modules/tar-stream/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/temp-fs": {
+      "version": "0.9.9",
+      "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
+      "integrity": "sha512-WfecDCR1xC9b0nsrzSaxPf3ZuWeWLUWblW4vlDQAa1biQaKHiImHnJfeQocQe/hXKMcolRzgkcVX/7kK4zoWbw==",
+      "dev": true,
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "istanbul-lib-coverage": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
-          "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
-          "dev": true
-        },
-        "istanbul-lib-instrument": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
-          "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
-          "dev": true,
-          "requires": {
-            "@babel/generator": "^7.4.0",
-            "@babel/parser": "^7.4.3",
-            "@babel/template": "^7.4.0",
-            "@babel/traverse": "^7.4.3",
-            "@babel/types": "^7.4.0",
-            "istanbul-lib-coverage": "^2.0.5",
-            "semver": "^6.0.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "rimraf": "~2.5.2"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "@jest/source-map": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
-      "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
+    "node_modules/temp-fs/node_modules/rimraf": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+      "integrity": "sha512-Lw7SHMjssciQb/rRz7JyPIy9+bbUshEucPoLRvWqy09vC5zQixl8Uet+Zl+SROBB/JMWHJRdCk1qdxNWHNMvlQ==",
       "dev": true,
-      "requires": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.1.15",
-        "source-map": "^0.6.0"
+      "dependencies": {
+        "glob": "^7.0.5"
       },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/ternary-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
+      "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==",
+      "dev": true,
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "duplexify": "^4.1.1",
+        "fork-stream": "^0.0.4",
+        "merge-stream": "^2.0.0",
+        "through2": "^3.0.1"
       }
     },
-    "@jest/test-result": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
-      "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
+    "node_modules/ternary-stream/node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
       "dev": true,
-      "requires": {
-        "@jest/console": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/istanbul-lib-coverage": "^2.0.0"
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.15.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
+      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
       },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+      "dev": true,
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
+        "@jridgewell/trace-mapping": "^0.3.14",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.0",
+        "terser": "^5.14.1"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
         }
       }
     },
-    "@jest/test-sequencer": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
-      "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
+    "node_modules/terser-webpack-plugin/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser/node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
       "dev": true,
-      "requires": {
-        "@jest/test-result": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-runner": "^24.9.0",
-        "jest-runtime": "^24.9.0"
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "@jest/transform": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
-      "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^24.9.0",
-        "babel-plugin-istanbul": "^5.1.0",
-        "chalk": "^2.0.1",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.1.15",
-        "jest-haste-map": "^24.9.0",
-        "jest-regex-util": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "pirates": "^4.0.1",
-        "realpath-native": "^1.1.0",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "2.4.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "jest-regex-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-          "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@jest/types": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
-      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
-      "requires": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^1.1.1",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.0"
-      },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
       }
     },
-    "@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
-      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
-      "requires": {
-        "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.1",
-        "loader-utils": "^1.4.0",
-        "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.6.4"
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "@kiosked/ulid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@kiosked/ulid/-/ulid-3.0.0.tgz",
-      "integrity": "sha512-ZKt2KIgGHDaGfKt6FjYvCpDvBXZRRoE8b+wDOlAV76aXKpq6ITiSUnPYevR4y55NKDnwCvwOrjWe+aVOCAK8kQ=="
-    },
-    "@sindresorhus/is": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz",
-      "integrity": "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==",
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "@sinonjs/commons": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz",
-      "integrity": "sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==",
+    "node_modules/textextensions": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz",
+      "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==",
       "dev": true,
-      "requires": {
-        "type-detect": "4.0.8"
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
       }
     },
-    "@sinonjs/formatio": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
-      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
       "dev": true,
-      "requires": {
-        "samsam": "1.3.0"
+      "dependencies": {
+        "readable-stream": "3"
       }
     },
-    "@sinonjs/samsam": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz",
-      "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==",
+    "node_modules/through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
       "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1.3.0",
-        "array-from": "^2.1.1",
-        "lodash": "^4.17.15"
+      "dependencies": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
       }
     },
-    "@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
-      "dev": true
+    "node_modules/through2-filter/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
     },
-    "@szmarczak/http-timer": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
-      "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==",
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
       "dev": true,
-      "requires": {
-        "defer-to-connect": "^2.0.0"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@types/babel__core": {
-      "version": "7.1.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.8.tgz",
-      "integrity": "sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==",
+    "node_modules/timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
       "dev": true,
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
+      "dependencies": {
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
       }
     },
-    "@types/babel__generator": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
+    "node_modules/tiny-hashes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tiny-hashes/-/tiny-hashes-1.0.1.tgz",
+      "integrity": "sha512-knIN5zj4fl7kW4EBU5sLP20DWUvi/rVouvJezV0UAym2DkQaqm365Nyc8F3QEiOvunNDMxR8UhcXd1d5g+Wg1g=="
+    },
+    "node_modules/tiny-lr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
       "dev": true,
-      "requires": {
-        "@babel/types": "^7.0.0"
+      "dependencies": {
+        "body": "^5.1.0",
+        "debug": "^3.1.0",
+        "faye-websocket": "~0.10.0",
+        "livereload-js": "^2.3.0",
+        "object-assign": "^4.1.0",
+        "qs": "^6.4.0"
       }
     },
-    "@types/babel__template": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
+    "node_modules/tiny-lr/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
+      "dependencies": {
+        "ms": "^2.1.1"
       }
     },
-    "@types/babel__traverse": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.12.tgz",
-      "integrity": "sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==",
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
-      "requires": {
-        "@babel/types": "^7.3.0"
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
       }
     },
-    "@types/cacheable-request": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
-      "integrity": "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==",
+    "node_modules/to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
       "dev": true,
-      "requires": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "*",
-        "@types/node": "*",
-        "@types/responselike": "*"
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "@types/http-cache-semantics": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
-      "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
-      "dev": true
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "@types/istanbul-lib-coverage": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz",
-      "integrity": "sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==",
+    "node_modules/to-object-path/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
-      "requires": {
-        "@types/istanbul-lib-coverage": "*"
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@types/istanbul-reports": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
-      "requires": {
-        "@types/istanbul-lib-coverage": "*",
-        "@types/istanbul-lib-report": "*"
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@types/json-schema": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
-      "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==",
-      "dev": true
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
     },
-    "@types/keyv": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
-      "integrity": "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==",
+    "node_modules/to-regex/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
-      "requires": {
-        "@types/node": "*"
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@types/node": {
-      "version": "14.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.9.tgz",
-      "integrity": "sha512-0sCTiXKXELOBxvZLN4krQ0FPOAA7ij+6WwvD0k/PHd9/KAkr4dXel5J9fh6F4x1FwAQILqAWkmpeuS6mjf1iKA==",
-      "dev": true
+    "node_modules/to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==",
+      "dev": true,
+      "dependencies": {
+        "through2": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
     },
-    "@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+    "node_modules/to-through/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
-      "requires": {
-        "@types/node": "*"
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
-    "@types/stack-utils": {
+    "node_modules/toidentifier": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "engines": {
+        "node": ">=0.6"
+      }
     },
-    "@types/yargs": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-      "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
+    "node_modules/totalist": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
       "dev": true,
-      "requires": {
-        "@types/yargs-parser": "*"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
-      "dev": true
-    },
-    "@types/yauzl": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+    "node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/node": "*"
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
       }
     },
-    "@wdio/browserstack-service": {
-      "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-6.1.15.tgz",
-      "integrity": "sha512-q8qLa44wGSB3tIuZ0yquvAZqr2W7vEwupWiOd1ct0CSYgd4yX/nLd8oypqJCc8jU1ZwNAhu+V3/6hszvwx+HbA==",
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
+    },
+    "node_modules/traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
       "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "browserstack-local": "^1.4.5",
-        "got": "^11.0.2"
+      "engines": {
+        "node": "*"
       }
     },
-    "@wdio/cli": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.1.16.tgz",
-      "integrity": "sha512-q7JaEiLU2mdOibeKAQFqdWTS2evdkwgWSft1rmWDN7idiV39uncTTUcwlXBKE2a9yDk/8qn6EEXdBLthOCfyOA==",
-      "dev": true,
-      "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.1.8",
-        "async-exit-hook": "^2.0.1",
-        "chalk": "^4.0.0",
-        "chokidar": "^3.0.0",
-        "cli-spinners": "^2.1.0",
-        "ejs": "^3.0.1",
-        "fs-extra": "^9.0.0",
-        "inquirer": "^7.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "lodash.pickby": "^4.6.0",
-        "lodash.union": "^4.6.0",
-        "log-update": "^4.0.0",
-        "webdriverio": "6.1.16",
-        "yargs": "^15.0.1",
-        "yarn-install": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "yargs": {
-          "version": "15.3.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
-          "dev": true,
-          "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.1"
-          }
-        }
+    "node_modules/trim-lines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "@wdio/concise-reporter": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-6.1.14.tgz",
-      "integrity": "sha512-QKGiIPE2sYJpQcQ5zogUogu+Yldkx/FUM4LC01lc3v0Nww7n0p0fJA3U4cKFAqyW0gXCwW7m6/9c5fDgaSv8+g==",
+    "node_modules/trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
       "dev": true,
-      "requires": {
-        "@wdio/reporter": "6.1.14",
-        "chalk": "^4.0.0",
-        "pretty-ms": "^7.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@wdio/config": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-6.1.14.tgz",
-      "integrity": "sha512-MXHMHwtkAblfnIxONs9aW//T9Fq5XIw3oH+tztcBRvNTTAIXmwHd+4sOjAwjpCdBSGs0C4kM/aTpGfwDZVURvQ==",
+    "node_modules/trough": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
+      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
       "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "deepmerge": "^4.0.0",
-        "glob": "^7.1.2"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "@wdio/local-runner": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.1.16.tgz",
-      "integrity": "sha512-3+pT2fcMXFAnELA6jYjVm6Nt8Il7tGL66A90UbRiT0sL2faTcD3uGAPbmzxMclsmWLh7C04ucCnFwQoTMW1emg==",
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
       "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/repl": "6.1.8",
-        "@wdio/runner": "6.1.16",
-        "async-exit-hook": "^2.0.1",
-        "stream-buffers": "^3.0.2"
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
       }
     },
-    "@wdio/logger": {
-      "version": "6.0.16",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-6.0.16.tgz",
-      "integrity": "sha512-VbH5UnQIG/3sSMV+Y38+rOdwyK9mVA9vuL7iOngoTafHwUjL1MObfN/Cex84L4mGxIgfxCu6GV48iUmSuQ7sqA==",
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "loglevel": "^1.6.0",
-        "loglevel-plugin-prefix": "^0.8.4",
-        "strip-ansi": "^6.0.0"
-      },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "@wdio/mocha-framework": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.1.14.tgz",
-      "integrity": "sha512-2AmUH/v3kZoIDAMdW73AhI4tDJU3ie/2dO/DtpXJ3XFnuJ1CtklZGyCTtYHGMZ8DBj18/8Lrs/O0CjS5bAu2tw==",
+    "node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.1.8",
-        "expect-webdriverio": "^1.1.5",
-        "mocha": "^7.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "chokidar": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
-          "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
-          "dev": true,
-          "requires": {
-            "anymatch": "~3.1.1",
-            "braces": "~3.0.2",
-            "fsevents": "~2.1.1",
-            "glob-parent": "~5.1.0",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.2.0"
-          }
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "mocha": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
-          "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "3.2.3",
-            "browser-stdout": "1.3.1",
-            "chokidar": "3.3.0",
-            "debug": "3.2.6",
-            "diff": "3.5.0",
-            "escape-string-regexp": "1.0.5",
-            "find-up": "3.0.0",
-            "glob": "7.1.3",
-            "growl": "1.10.5",
-            "he": "1.2.0",
-            "js-yaml": "3.13.1",
-            "log-symbols": "3.0.0",
-            "minimatch": "3.0.4",
-            "mkdirp": "0.5.5",
-            "ms": "2.1.1",
-            "node-environment-flags": "1.0.6",
-            "object.assign": "4.1.0",
-            "strip-json-comments": "2.0.1",
-            "supports-color": "6.0.0",
-            "which": "1.3.1",
-            "wide-align": "1.1.3",
-            "yargs": "13.3.2",
-            "yargs-parser": "13.1.2",
-            "yargs-unparser": "1.6.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "readdirp": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
-          "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
-          "dev": true,
-          "requires": {
-            "picomatch": "^2.0.4"
-          }
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-          "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
-        },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "@wdio/protocols": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.1.14.tgz",
-      "integrity": "sha512-UtRLQ55i23cLQRGtFiEJty1F6AbAfiSpfIxDAiXKHbw6Rp1StwxlqHFrhNe5F48Zu4hnie46t9N/tr/cZOe0kA==",
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true
     },
-    "@wdio/repl": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.1.8.tgz",
-      "integrity": "sha512-C647KvDIcOHYN24eFbiM2xE+etPEACvRYkEp7BPLyopEABDr0I3Qdb5MLhopC5eMAVHp70/WT27H1CE2v9iILQ==",
+    "node_modules/type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
-      "requires": {
-        "@wdio/utils": "6.1.8"
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "@wdio/reporter": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-6.1.14.tgz",
-      "integrity": "sha512-Pt6P0JU0COHTpggsOoJKUJyAyQsi7xlHebBNU/DWdHHpmzYd4e9vDutjyTqXu/1zn+t+Zq+uL1IC0E4Xjv6f7w==",
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
-      "requires": {
-        "fs-extra": "^9.0.0"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "@wdio/runner": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.1.16.tgz",
-      "integrity": "sha512-pGRT51BGnxp4zFD1pSp6qZD/4dnbSnDyV4g/MbbFiA4PFKF41mFhaxRwIGMHcp4EYlv9gaT31UA52JaFIYyuNA==",
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
-      "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.1.8",
-        "deepmerge": "^4.0.0",
-        "gaze": "^1.1.2",
-        "webdriver": "6.1.14",
-        "webdriverio": "6.1.16"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "@wdio/spec-reporter": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.1.14.tgz",
-      "integrity": "sha512-QaSBgnzllzLp9LR7/5DTkmrI8BqcznUma8ZxwUNmhvskv/oKzrmNyeCsGoiExFmCk81A9FgZiZPXey7CuaTkdw==",
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "dev": true
+    },
+    "node_modules/typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true,
-      "requires": {
-        "@wdio/reporter": "6.1.14",
-        "chalk": "^4.0.0",
-        "easy-table": "^1.1.1",
-        "pretty-ms": "^7.0.0"
+      "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",
+      "integrity": "sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==",
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
+        "typescript-logic": "^0.0.0"
+      }
+    },
+    "node_modules/typescript-logic": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/typescript-logic/-/typescript-logic-0.0.0.tgz",
+      "integrity": "sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q=="
+    },
+    "node_modules/typescript-tuple": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/typescript-tuple/-/typescript-tuple-2.2.1.tgz",
+      "integrity": "sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==",
+      "dependencies": {
+        "typescript-compare": "^0.0.2"
+      }
+    },
+    "node_modules/ua-parser-js": {
+      "version": "0.7.32",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz",
+      "integrity": "sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
         },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
         }
+      ],
+      "engines": {
+        "node": "*"
       }
     },
-    "@wdio/sync": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-6.1.14.tgz",
-      "integrity": "sha512-94K0kQdrOU0aMlJ2Xsd4tWr4tPpmCFp612Ml5+ecQh4C4XD07ocfsvGs+mwI7cfF1sO6g/Hoc+XTY2D+/8En3w==",
+    "node_modules/uglify-js": {
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
       "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "fibers": "^4.0.1"
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "@wdio/utils": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.1.8.tgz",
-      "integrity": "sha512-qzvD8qCPpIpDrZ0HNOx1hTlfKY26p8WByUXgr52ll6DXxtAYXZLIJ8GAYFJUi87NVfwtv6+O7owQGSM/jtr8AQ==",
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16"
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+    "node_modules/unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
       "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
+      "dependencies": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
       }
     },
-    "abab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "abbrev": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-      "dev": true
+    "node_modules/undertaker": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
+      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "fast-levenshtein": "^1.0.0",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
     },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+    "node_modules/undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "acorn": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+    "node_modules/undertaker/node_modules/fast-levenshtein": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
+      "integrity": "sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
       "dev": true
     },
-    "acorn-dynamic-import": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unified": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
+      "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
       "dev": true,
-      "requires": {
-        "acorn": "^4.0.3"
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "bail": "^2.0.0",
+        "extend": "^3.0.0",
+        "is-buffer": "^2.0.0",
+        "is-plain-obj": "^4.0.0",
+        "trough": "^2.0.0",
+        "vfile": "^5.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
       "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "acorn-globals": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
-      "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+    "node_modules/union-value/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "dependencies": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "node_modules/unist-builder": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.0.tgz",
+      "integrity": "sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-generated": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.0.tgz",
+      "integrity": "sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-is": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz",
+      "integrity": "sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-position": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz",
+      "integrity": "sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-stringify-position": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz",
+      "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz",
+      "integrity": "sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^5.1.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit-parents": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz",
+      "integrity": "sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
       "dev": true,
-      "requires": {
-        "acorn": "^6.0.1",
-        "acorn-walk": "^6.0.1"
-      },
       "dependencies": {
-        "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-          "dev": true
-        }
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "acorn-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
-      "requires": {
-        "acorn": "^3.0.4"
-      },
       "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
-      "dev": true
-    },
-    "after": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-      "dev": true
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "agent-base": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
-      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+    "node_modules/unset-value/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+    "node_modules/unzipper": {
+      "version": "0.9.15",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.9.15.tgz",
+      "integrity": "sha512-2aaUvO4RAeHDvOCuEtth7jrHFaCKTSXPqUkXwADaLBzGbgZGzUDccoEdJ5lW+3RmfpOZYNx0Rw6F6PUzM6caIA==",
       "dev": true,
-      "requires": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
-      },
       "dependencies": {
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-          "dev": true
-        }
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
       }
     },
-    "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
-      "dev": true
-    },
-    "align-text": {
+    "node_modules/unzipper/node_modules/duplexer2": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
       "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
+        "readable-stream": "^2.0.2"
       }
     },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+    "node_modules/upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true,
-      "requires": {
-        "type-fest": "^0.11.0"
+      "engines": {
+        "node": ">=4",
+        "yarn": "*"
       }
     },
-    "ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist-lint": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
       }
     },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
+      "dependencies": {
+        "punycode": "^2.1.0"
       }
     },
-    "ansi-wrap": {
+    "node_modules/urix": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
-    "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
       "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
       }
     },
-    "append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
-      "requires": {
-        "buffer-equal": "^1.0.0"
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
       }
     },
-    "append-transform": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
-      "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
-      "dev": true,
-      "requires": {
-        "default-require-extensions": "^1.0.0"
-      }
+    "node_modules/url-toolkit": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz",
+      "integrity": "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==",
+      "dev": true
     },
-    "archiver": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-4.0.1.tgz",
-      "integrity": "sha512-/YV1pU4Nhpf/rJArM23W6GTUjT0l++VbjykrCRua1TSXrn+yM8Qs7XvtwSiRse0iCe49EPNf7ktXnPsWuSb91Q==",
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+      "dev": true
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true,
-      "requires": {
-        "archiver-utils": "^2.1.0",
-        "async": "^2.6.3",
-        "buffer-crc32": "^0.2.1",
-        "glob": "^7.1.6",
-        "readable-stream": "^3.6.0",
-        "tar-stream": "^2.1.2",
-        "zip-stream": "^3.0.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.14"
-          }
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "archiver-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
-      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
+    "node_modules/util": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
       "dev": true,
-      "requires": {
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.0",
-        "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^2.0.0"
-      },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "engines": {
+        "node": ">= 0.4.0"
       }
     },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+    "node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
       "dev": true,
-      "requires": {
-        "make-iterator": "^1.0.0"
+      "bin": {
+        "uuid": "bin/uuid"
       }
     },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+    "node_modules/uvu": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz",
+      "integrity": "sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==",
       "dev": true,
-      "requires": {
-        "make-iterator": "^1.0.0"
+      "dependencies": {
+        "dequal": "^2.0.0",
+        "diff": "^5.0.0",
+        "kleur": "^4.0.3",
+        "sade": "^1.7.3"
+      },
+      "bin": {
+        "uvu": "bin.js"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
       "dev": true
     },
-    "array-differ": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-      "dev": true
+    "node_modules/v8flags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
     },
-    "array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
     },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
+    "node_modules/value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
     },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
     },
-    "array-from": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
-      "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
+    "node_modules/verror/node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
-    "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+    "node_modules/vfile": {
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.5.tgz",
+      "integrity": "sha512-U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ==",
       "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "is-string": "^1.0.5"
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "is-buffer": "^2.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "vfile-message": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+    "node_modules/vfile-message": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz",
+      "integrity": "sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==",
       "dev": true,
-      "requires": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "unist-util-stringify-position": "^3.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-reporter": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz",
+      "integrity": "sha512-4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A==",
+      "dev": true,
       "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
+        "@types/supports-color": "^8.0.0",
+        "string-width": "^5.0.0",
+        "supports-color": "^9.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "vfile-sort": "^3.0.0",
+        "vfile-statistics": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+    "node_modules/vfile-reporter/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "dev": true,
-      "requires": {
-        "is-number": "^4.0.0"
+      "engines": {
+        "node": ">=12"
       },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+    "node_modules/vfile-reporter/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
-    "array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+    "node_modules/vfile-reporter/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
-      "requires": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/vfile-reporter/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+      "dev": true,
       "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
+    "node_modules/vfile-reporter/node_modules/supports-color": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.3.tgz",
+      "integrity": "sha512-aszYUX/DVK/ed5rFLb/dDinVJrQjG/vmU433wtqVSD800rYsJNWxh2R3USV90aLSU+UsyQkbNeffVLzc6B6foA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
     },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
+    "node_modules/vfile-sort": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.0.tgz",
+      "integrity": "sha512-fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg==",
+      "dev": true,
+      "dependencies": {
+        "vfile-message": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
     },
-    "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+    "node_modules/vfile-statistics": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.0.tgz",
+      "integrity": "sha512-foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA==",
       "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+      "dependencies": {
+        "vfile-message": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "arraybuffer.slice": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+    "node_modules/video.js": {
+      "version": "7.20.3",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.3.tgz",
+      "integrity": "sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/http-streaming": "2.14.3",
+        "@videojs/vhs-utils": "^3.0.4",
+        "@videojs/xhr": "2.6.0",
+        "aes-decrypter": "3.1.3",
+        "global": "^4.4.0",
+        "keycode": "^2.2.0",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
+        "safe-json-parse": "4.0.0",
+        "videojs-font": "3.2.0",
+        "videojs-vtt.js": "^0.15.4"
+      }
+    },
+    "node_modules/video.js/node_modules/safe-json-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
+      "integrity": "sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==",
+      "dev": true,
+      "dependencies": {
+        "rust-result": "^1.0.0"
+      }
+    },
+    "node_modules/videojs-contrib-ads": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/videojs-contrib-ads/-/videojs-contrib-ads-6.9.0.tgz",
+      "integrity": "sha512-nzKz+jhCGMTYffSNVYrmp9p70s05v6jUMOY3Z7DpVk3iFrWK4Zi/BIkokDWrMoHpKjdmCdKzfJVBT+CrUj6Spw==",
+      "dev": true,
+      "dependencies": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      }
+    },
+    "node_modules/videojs-font": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
+      "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==",
       "dev": true
     },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+    "node_modules/videojs-ima": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/videojs-ima/-/videojs-ima-1.11.0.tgz",
+      "integrity": "sha512-ZRoWuGyJ75zamwZgpr0i/gZ6q7Evda/Q6R46gpW88WN7u0ORU7apw/lM1MSG4c3YDXW8LDENgzMAvMZUdifWhg==",
       "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
+      "dependencies": {
+        "@hapi/cryptiles": "^5.1.0",
+        "can-autoplay": "^3.0.0",
+        "extend": ">=3.0.2",
+        "lodash": ">=4.17.19",
+        "lodash.template": ">=4.5.0",
+        "videojs-contrib-ads": "^6.6.5"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      },
+      "peerDependencies": {
+        "video.js": "^5.19.2 || ^6 || ^7"
       }
     },
-    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+    "node_modules/videojs-playlist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/videojs-playlist/-/videojs-playlist-5.0.0.tgz",
+      "integrity": "sha512-TM9bytwKqkE05wdWPEKDpkwMGhS/VgMCIsEuNxmX1J1JO9zaTIl4Wm3egf5j1dhIw19oWrqGUV/nK0YNIelCpA==",
       "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+      "dependencies": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
       },
+      "engines": {
+        "node": ">=4.4.0"
+      }
+    },
+    "node_modules/videojs-vtt.js": {
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
+      "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==",
+      "dev": true,
       "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
+        "global": "^4.3.1"
       }
     },
-    "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+    "node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
       "dev": true,
-      "requires": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vinyl-fs": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+      "dev": true,
       "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+    "node_modules/vinyl-fs/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
     },
-    "assertion-error": {
+    "node_modules/vinyl-sourcemap": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
-    },
-    "async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==",
+      "dev": true,
+      "dependencies": {
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
     },
-    "async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
+    "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
+    "node_modules/vinyl-sourcemaps-apply": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
+      "integrity": "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.5.1"
+      }
     },
-    "async-exit-hook": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
-      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
-      "dev": true
+    "node_modules/vinyl/node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
     },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
+    "node_modules/void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+    "node_modules/vue-template-compiler": {
+      "version": "2.7.13",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz",
+      "integrity": "sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==",
       "dev": true,
-      "requires": {
-        "async-done": "^1.2.2"
+      "optional": true,
+      "dependencies": {
+        "de-indent": "^1.0.2",
+        "he": "^1.2.0"
       }
     },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+    "node_modules/walk": {
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.15.tgz",
+      "integrity": "sha512-4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg==",
+      "dev": true,
+      "dependencies": {
+        "foreachasync": "^3.0.0"
+      }
     },
-    "at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
     },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "dev": true,
+      "dependencies": {
+        "defaults": "^1.0.3"
+      }
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+    "node_modules/webdriver": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.5.3.tgz",
+      "integrity": "sha512-cDTn/hYj5x8BYwXxVb/WUwqGxrhCMP2rC8ttIWCfzmiVtmOnJGulC7CyxU3+p9Q5R/gIKTzdJOss16dhb+5CoA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "got": "^11.0.2",
+        "lodash.merge": "^4.6.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
     },
-    "aws4": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
-      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
-      "dev": true
+    "node_modules/webdriver/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
     },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+    "node_modules/webdriver/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
       "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+      "dependencies": {
+        "got": "^11.8.1"
       },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/webdriver/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "babel-core": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
-      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+    "node_modules/webdriver/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "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": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/webdriver/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-          "dev": true
-        },
-        "slash": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-          "dev": true
-        }
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+    "node_modules/webdriver/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/webdriver/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "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"
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webdriver/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
       },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webdriverio": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.25.4.tgz",
+      "integrity": "sha512-agkgwn2SIk5cAJ03uue1GnGZcUZUDN3W4fUMY9/VfO8bVJrPEgWg31bPguEWPu+YhEB/aBJD8ECxJ3OEKdy4qQ==",
+      "dev": true,
       "dependencies": {
-        "jsesc": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-          "dev": true
-        }
+        "@types/aria-query": "^5.0.0",
+        "@types/node": "^18.0.0",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/repl": "7.25.4",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "archiver": "^5.0.0",
+        "aria-query": "^5.0.0",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.25.4",
+        "devtools-protocol": "^0.0.1061995",
+        "fs-extra": "^10.0.0",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^5.0.0",
+        "puppeteer-core": "^13.1.3",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.25.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "babel-helper-bindify-decorators": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
-      "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+    "node_modules/webdriverio/node_modules/@types/node": {
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+      "dev": true
+    },
+    "node_modules/webdriverio/node_modules/@wdio/config": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
+      "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "@wdio/logger": "7.19.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "deepmerge": "^4.0.0",
+        "glob": "^8.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "babel-helper-builder-binary-assignment-operator-visitor": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+    "node_modules/webdriverio/node_modules/@wdio/logger": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
+      "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
       "dev": true,
-      "requires": {
-        "babel-helper-explode-assignable-expression": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "babel-helper-builder-react-jsx": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
-      "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+    "node_modules/webdriverio/node_modules/@wdio/protocols": {
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
+      "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "esutils": "^2.0.2"
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "babel-helper-call-delegate": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+    "node_modules/webdriverio/node_modules/@wdio/repl": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.25.4.tgz",
+      "integrity": "sha512-kYhj9gLsUk4HmlXLqkVre+gwbfvw9CcnrHjqIjrmMS4mR9D8zvBb5CItb3ZExfPf9jpFzIFREbCAYoE9x/kMwg==",
       "dev": true,
-      "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "@wdio/utils": "7.25.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "babel-helper-define-map": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+    "node_modules/webdriverio/node_modules/@wdio/types": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+      "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
       "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+      "dependencies": {
+        "@types/node": "^18.0.0",
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^4.6.2"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "babel-helper-explode-assignable-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+    "node_modules/webdriverio/node_modules/@wdio/utils": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
+      "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "@wdio/logger": "7.19.0",
+        "@wdio/types": "7.25.4",
+        "p-iteration": "^1.1.8"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "babel-helper-explode-class": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
-      "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+    "node_modules/webdriverio/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "requires": {
-        "babel-helper-bindify-decorators": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+    "node_modules/webdriverio/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "requires": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+    "node_modules/webdriverio/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "babel-helper-hoist-variables": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+    "node_modules/webdriverio/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "babel-helper-optimise-call-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+    "node_modules/webdriverio/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/webdriverio/node_modules/glob": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "babel-helper-regex": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+    "node_modules/webdriverio/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "babel-helper-remap-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+    "node_modules/webdriverio/node_modules/ky": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-0.30.0.tgz",
+      "integrity": "sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==",
       "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/ky?sponsor=1"
       }
     },
-    "babel-helper-replace-supers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+    "node_modules/webdriverio/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
       "dev": true,
-      "requires": {
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+    "node_modules/webdriverio/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "babel-jest": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
-      "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
+    "node_modules/webdriverio/node_modules/webdriver": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.25.4.tgz",
+      "integrity": "sha512-6nVDwenh0bxbtUkHASz9B8T9mB531Fn1PcQjUGj2t5dolLPn6zuK1D7XYVX40hpn6r3SlYzcZnEBs4X0az5Txg==",
       "dev": true,
-      "requires": {
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/babel__core": "^7.1.0",
-        "babel-plugin-istanbul": "^5.1.0",
-        "babel-preset-jest": "^24.9.0",
-        "chalk": "^2.4.2",
-        "slash": "^2.0.0"
-      },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
-        }
+        "@types/node": "^18.0.0",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "got": "^11.0.2",
+        "ky": "0.30.0",
+        "lodash.merge": "^4.6.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "babel-loader": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
+    },
+    "node_modules/webpack": {
+      "version": "5.74.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
+      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
       "dev": true,
-      "requires": {
-        "find-cache-dir": "^2.1.0",
-        "loader-utils": "^1.4.0",
-        "mkdirp": "^0.5.3",
-        "pify": "^4.0.1",
-        "schema-utils": "^2.6.5"
-      },
       "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.10.0",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
         }
       }
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+    "node_modules/webpack-bundle-analyzer": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
+      "integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "chalk": "^4.1.0",
+        "commander": "^7.2.0",
+        "gzip-size": "^6.0.0",
+        "lodash": "^4.17.20",
+        "opener": "^1.5.2",
+        "sirv": "^1.0.7",
+        "ws": "^7.3.1"
+      },
+      "bin": {
+        "webpack-bundle-analyzer": "lib/bin/analyzer.js"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
       }
     },
-    "babel-plugin-check-es2015-constants": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+    "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.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",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+    "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "requires": {
-        "object.assign": "^4.1.0"
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "babel-plugin-istanbul": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
-      "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
+    "node_modules/webpack-bundle-analyzer/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "find-up": "^3.0.0",
-        "istanbul-lib-instrument": "^3.3.0",
-        "test-exclude": "^5.2.3"
-      },
       "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "istanbul-lib-coverage": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
-          "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
-          "dev": true
-        },
-        "istanbul-lib-instrument": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
-          "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
-          "dev": true,
-          "requires": {
-            "@babel/generator": "^7.4.0",
-            "@babel/parser": "^7.4.3",
-            "@babel/template": "^7.4.0",
-            "@babel/traverse": "^7.4.3",
-            "@babel/types": "^7.4.0",
-            "istanbul-lib-coverage": "^2.0.5",
-            "semver": "^6.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "babel-plugin-jest-hoist": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
-      "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
+    "node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "requires": {
-        "@types/babel__traverse": "^7.0.6"
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "babel-plugin-syntax-async-functions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
-    },
-    "babel-plugin-syntax-async-generators": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
-      "dev": true
-    },
-    "babel-plugin-syntax-class-constructor-call": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
-      "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
-      "dev": true
-    },
-    "babel-plugin-syntax-class-properties": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
-      "dev": true
-    },
-    "babel-plugin-syntax-decorators": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
-      "dev": true
-    },
-    "babel-plugin-syntax-do-expressions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
-      "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
-      "dev": true
-    },
-    "babel-plugin-syntax-dynamic-import": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
-      "dev": true
-    },
-    "babel-plugin-syntax-exponentiation-operator": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-      "dev": true
-    },
-    "babel-plugin-syntax-export-extensions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
-      "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
-      "dev": true
-    },
-    "babel-plugin-syntax-flow": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
-      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
-      "dev": true
-    },
-    "babel-plugin-syntax-function-bind": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
-      "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
-      "dev": true
-    },
-    "babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
-      "dev": true
-    },
-    "babel-plugin-syntax-object-rest-spread": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
-      "dev": true
-    },
-    "babel-plugin-syntax-trailing-function-commas": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+    "node_modules/webpack-bundle-analyzer/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "babel-plugin-system-import-transformer": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-system-import-transformer/-/babel-plugin-system-import-transformer-3.1.0.tgz",
-      "integrity": "sha1-038Mro5h7zkGAggzHZMbXmMNfF8=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-syntax-dynamic-import": "^6.18.0"
-      }
-    },
-    "babel-plugin-transform-async-generator-functions": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
-      "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+    "node_modules/webpack-bundle-analyzer/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true,
-      "requires": {
-        "babel-helper-remap-async-to-generator": "^6.24.1",
-        "babel-plugin-syntax-async-generators": "^6.5.0",
-        "babel-runtime": "^6.22.0"
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "babel-plugin-transform-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+    "node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "requires": {
-        "babel-helper-remap-async-to-generator": "^6.24.1",
-        "babel-plugin-syntax-async-functions": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "babel-plugin-transform-class-constructor-call": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
-      "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+    "node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-class-constructor-call": "^6.18.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "babel-plugin-transform-class-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
-      "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
       "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-plugin-syntax-class-properties": "^6.8.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "babel-plugin-transform-decorators": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
-      "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+    "node_modules/webpack-manifest-plugin": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-5.0.0.tgz",
+      "integrity": "sha512-8RQfMAdc5Uw3QbCQ/CBV/AXqOR8mt03B6GJmRbhWopE8GzRfEpn+k0ZuWywxW+5QZsffhmFDY1J6ohqJo+eMuw==",
       "dev": true,
-      "requires": {
-        "babel-helper-explode-class": "^6.24.1",
-        "babel-plugin-syntax-decorators": "^6.13.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "tapable": "^2.0.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.47.0"
       }
     },
-    "babel-plugin-transform-decorators-legacy": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz",
-      "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==",
+    "node_modules/webpack-manifest-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-decorators": "^6.1.18",
-        "babel-runtime": "^6.2.0",
-        "babel-template": "^6.3.0"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-plugin-transform-do-expressions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
-      "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
+    "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-do-expressions": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "babel-plugin-transform-es2015-arrow-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+    "node_modules/webpack-merge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "lodash": "^4.17.15"
       }
     },
-    "babel-plugin-transform-es2015-block-scoped-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+    "node_modules/webpack-stream": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-stream/-/webpack-stream-7.0.0.tgz",
+      "integrity": "sha512-XoAQTHyCaYMo6TS7Atv1HYhtmBgKiVLONJbzLBl2V3eibXQ2IT/MCRM841RW/r3vToKD5ivrTJFWgd/ghoxoRg==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "lodash": "^4.17.4"
+      "dependencies": {
+        "fancy-log": "^1.3.3",
+        "lodash.clone": "^4.3.2",
+        "lodash.some": "^4.2.2",
+        "memory-fs": "^0.5.0",
+        "plugin-error": "^1.0.1",
+        "supports-color": "^8.1.1",
+        "through": "^2.3.8",
+        "vinyl": "^2.2.1"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.21.2"
       }
     },
-    "babel-plugin-transform-es2015-classes": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+    "node_modules/webpack-stream/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "dev": true,
-      "requires": {
-        "babel-helper-define-map": "^6.24.1",
-        "babel-helper-function-name": "^6.24.1",
-        "babel-helper-optimise-call-expression": "^6.24.1",
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-plugin-transform-es2015-computed-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+    "node_modules/webpack-stream/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+    "node_modules/webpack-stream/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-plugin-transform-es2015-duplicate-keys": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+    "node_modules/webpack-stream/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-plugin-transform-es2015-for-of": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+    "node_modules/webpack-stream/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "babel-plugin-transform-es2015-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+    "node_modules/webpack-stream/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
       "dev": true,
-      "requires": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
       }
     },
-    "babel-plugin-transform-es2015-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+    "node_modules/webpack-stream/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,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "babel-plugin-transform-es2015-modules-amd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
       "dev": true,
-      "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.26.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
-      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
+    "node_modules/webpack/node_modules/acorn-import-assertions": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
       "dev": true,
-      "requires": {
-        "babel-plugin-transform-strict-mode": "^6.24.1",
-        "babel-runtime": "^6.26.0",
-        "babel-template": "^6.26.0",
-        "babel-types": "^6.26.0"
+      "peerDependencies": {
+        "acorn": "^8"
       }
     },
-    "babel-plugin-transform-es2015-modules-systemjs": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+    "node_modules/webpack/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "requires": {
-        "babel-helper-hoist-variables": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "babel-plugin-transform-es2015-modules-umd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
       "dev": true,
-      "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "babel-plugin-transform-es2015-object-super": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
-      "requires": {
-        "babel-helper-replace-supers": "^6.24.1",
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "babel-plugin-transform-es2015-parameters": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true,
-      "requires": {
-        "babel-helper-call-delegate": "^6.24.1",
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "babel-plugin-transform-es2015-shorthand-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
       }
     },
-    "babel-plugin-transform-es2015-spread": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "babel-plugin-transform-es2015-sticky-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
-      "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "babel-plugin-transform-es2015-template-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+    "node_modules/which-collection": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+    "node_modules/which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
+      "dev": true
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
+      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.20.0",
+        "for-each": "^0.3.3",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "babel-plugin-transform-es2015-unicode-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "dev": true,
-      "requires": {
-        "babel-helper-regex": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "regexpu-core": "^2.0.0"
-      },
       "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-          "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
-          }
-        },
-        "regjsgen": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
-        }
+        "string-width": "^1.0.2 || 2"
       }
     },
-    "babel-plugin-transform-exponentiation-operator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+    "node_modules/wide-align/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "dev": true,
-      "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "babel-plugin-transform-export-extensions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
-      "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-export-extensions": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "babel-plugin-transform-flow-strip-types": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
-      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+    "node_modules/wide-align/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-flow": "^6.18.0",
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "babel-plugin-transform-function-bind": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
-      "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
+    "node_modules/wide-align/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-function-bind": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "babel-plugin-transform-object-assign": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-assign/-/babel-plugin-transform-object-assign-6.22.0.tgz",
-      "integrity": "sha1-+Z0vZvGgsNSY40bFNZaEdAyqILo=",
-      "requires": {
-        "babel-runtime": "^6.22.0"
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-plugin-transform-object-rest-spread": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
-      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+    "node_modules/wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+      "dev": true
+    },
+    "node_modules/workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
-        "babel-runtime": "^6.26.0"
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "babel-plugin-transform-react-display-name": {
-      "version": "6.25.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
-      "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "babel-plugin-transform-react-jsx": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
-      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "requires": {
-        "babel-helper-builder-react-jsx": "^6.24.1",
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "babel-plugin-transform-react-jsx-self": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
-      "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "mkdirp": "^0.5.1"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "babel-plugin-transform-react-jsx-source": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
-      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+    "node_modules/write/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,
-      "requires": {
-        "babel-plugin-syntax-jsx": "^6.8.0",
-        "babel-runtime": "^6.22.0"
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "babel-plugin-transform-regenerator": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+    "node_modules/ws": {
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
       "dev": true,
-      "requires": {
-        "regenerator-transform": "^0.10.0"
+      "engines": {
+        "node": ">=10.0.0"
       },
-      "dependencies": {
-        "regenerator-transform": {
-          "version": "0.10.1",
-          "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-          "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-          "dev": true,
-          "requires": {
-            "babel-runtime": "^6.18.0",
-            "babel-types": "^6.19.0",
-            "private": "^0.1.6"
-          }
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
         }
       }
     },
-    "babel-plugin-transform-strict-mode": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
+      "engines": {
+        "node": ">=0.4"
       }
     },
-    "babel-preset-env": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
-      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
-      "dev": true,
-      "requires": {
-        "babel-plugin-check-es2015-constants": "^6.22.0",
-        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
-        "babel-plugin-transform-async-to-generator": "^6.22.0",
-        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
-        "babel-plugin-transform-es2015-classes": "^6.23.0",
-        "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
-        "babel-plugin-transform-es2015-destructuring": "^6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
-        "babel-plugin-transform-es2015-for-of": "^6.23.0",
-        "babel-plugin-transform-es2015-function-name": "^6.22.0",
-        "babel-plugin-transform-es2015-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
-        "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
-        "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
-        "babel-plugin-transform-es2015-object-super": "^6.22.0",
-        "babel-plugin-transform-es2015-parameters": "^6.23.0",
-        "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
-        "babel-plugin-transform-es2015-spread": "^6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
-        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
-        "babel-plugin-transform-exponentiation-operator": "^6.22.0",
-        "babel-plugin-transform-regenerator": "^6.22.0",
-        "browserslist": "^3.2.6",
-        "invariant": "^2.2.2",
-        "semver": "^5.3.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "3.2.8",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
-          "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30000844",
-            "electron-to-chromium": "^1.3.47"
-          }
-        }
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       }
     },
-    "babel-preset-flow": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
-      "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yargs": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
+      "integrity": "sha512-7OGt4xXoWJQh5ulgZ78rKaqY7dNWbjfK+UKxGcIlaM2j7C4fqGchyv8CPvEWdRPrHp6Ula/YU8yGRpYGOHrI+g==",
+      "dev": true
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
-      "requires": {
-        "babel-plugin-transform-flow-strip-types": "^6.22.0"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "babel-preset-jest": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
-      "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
       "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-        "babel-plugin-jest-hoist": "^24.9.0"
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "babel-preset-react": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
-      "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
+    "node_modules/yargs-unparser/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-jsx": "^6.3.13",
-        "babel-plugin-transform-react-display-name": "^6.23.0",
-        "babel-plugin-transform-react-jsx": "^6.24.1",
-        "babel-plugin-transform-react-jsx-self": "^6.22.0",
-        "babel-plugin-transform-react-jsx-source": "^6.22.0",
-        "babel-preset-flow": "^6.23.0"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "babel-preset-stage-0": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.24.1.tgz",
-      "integrity": "sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=",
+    "node_modules/yargs-unparser/node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
       "dev": true,
-      "requires": {
-        "babel-plugin-transform-do-expressions": "^6.22.0",
-        "babel-plugin-transform-function-bind": "^6.22.0",
-        "babel-preset-stage-1": "^6.24.1"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "babel-preset-stage-1": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
-      "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+    "node_modules/yarn-install": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
+      "integrity": "sha512-VO1u181msinhPcGvQTVMnHVOae8zjX/NSksR17e6eXHRveDvHCF5mGjh9hkN8mzyfnCqcBe42LdTs7bScuTaeg==",
       "dev": true,
-      "requires": {
-        "babel-plugin-transform-class-constructor-call": "^6.24.1",
-        "babel-plugin-transform-export-extensions": "^6.22.0",
-        "babel-preset-stage-2": "^6.24.1"
+      "dependencies": {
+        "cac": "^3.0.3",
+        "chalk": "^1.1.3",
+        "cross-spawn": "^4.0.2"
+      },
+      "bin": {
+        "yarn-install": "bin/yarn-install.js",
+        "yarn-remove": "bin/yarn-remove.js"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "babel-preset-stage-2": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
-      "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+    "node_modules/yarn-install/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-dynamic-import": "^6.18.0",
-        "babel-plugin-transform-class-properties": "^6.24.1",
-        "babel-plugin-transform-decorators": "^6.24.1",
-        "babel-preset-stage-3": "^6.24.1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-preset-stage-3": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
-      "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+    "node_modules/yarn-install/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
       "dev": true,
-      "requires": {
-        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
-        "babel-plugin-transform-async-generator-functions": "^6.24.1",
-        "babel-plugin-transform-async-to-generator": "^6.24.1",
-        "babel-plugin-transform-exponentiation-operator": "^6.24.1",
-        "babel-plugin-transform-object-rest-spread": "^6.22.0"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-register": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+    "node_modules/yarn-install/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "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.11",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
-          "dev": true
-        }
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
       },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.11",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-        }
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+    "node_modules/yarn-install/node_modules/cross-spawn": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+      "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
       "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"
+      "dependencies": {
+        "lru-cache": "^4.0.1",
+        "which": "^1.2.9"
       }
     },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+    "node_modules/yarn-install/node_modules/lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "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": {
-        "globals": {
-          "version": "9.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-          "dev": true
-        }
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+    "node_modules/yarn-install/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "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
-        }
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "babelify": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/babelify/-/babelify-8.0.0.tgz",
-      "integrity": "sha512-xVr63fKEvMWUrrIbqlHYsMcc5Zdw4FSVesAHgkgajyCE1W8gbm9rbMakqavhxKvikGYMhEcqxTwB/gQmQ6lBtw==",
-      "dev": true
-    },
-    "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",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+    "node_modules/yarn-install/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
       "dev": true,
-      "requires": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "backo2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "dev": true
-    },
-    "bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+    "node_modules/yarn-install/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
       "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "base64-arraybuffer": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-      "dev": true
-    },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
-    },
-    "base64id": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+    "node_modules/yarn-install/node_modules/yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
-    "basic-auth": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
-      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.2"
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
       }
     },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+    "node_modules/zip-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",
+      "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
       "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
+      "dependencies": {
+        "archiver-utils": "^2.1.0",
+        "compress-commons": "^4.1.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true
+    "node_modules/zip-stream/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
     },
-    "better-assert": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+    "node_modules/zwitch": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.2.tgz",
+      "integrity": "sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==",
       "dev": true,
-      "requires": {
-        "callsite": "1.0.0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "bfj": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
+    "plugins/eslint": {
+      "name": "eslint-plugin-prebid",
+      "version": "1.0.0",
       "dev": true,
+      "license": "Apache-2.0"
+    }
+  },
+  "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
       "requires": {
-        "bluebird": "^3.5.5",
-        "check-types": "^8.0.3",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "big-integer": {
-      "version": "1.6.48",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
-      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==",
-      "dev": true
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "binary": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-      "dev": true,
+    "@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
       "requires": {
-        "buffers": "~0.1.1",
-        "chainsaw": "~0.1.0"
+        "@babel/highlight": "^7.18.6"
       }
     },
-    "binary-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-      "dev": true
+    "@babel/compat-data": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz",
+      "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="
     },
-    "binaryextensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz",
-      "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==",
-      "dev": true
+    "@babel/core": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
+      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
+      "requires": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.6",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helpers": "^7.19.4",
+        "@babel/parser": "^7.19.6",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      }
     },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+    "@babel/eslint-parser": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "file-uri-to-path": "1.0.0"
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
       }
     },
-    "bl": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
-      "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
-      "dev": true,
+    "@babel/generator": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.1.tgz",
+      "integrity": "sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==",
       "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+        "@babel/types": "^7.20.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
         }
       }
     },
-    "blob": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
-      "dev": true
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
     },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
+      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.18.6",
+        "@babel/types": "^7.18.9"
+      }
     },
-    "bn.js": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
-      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
-      "dev": true
+    "@babel/helper-compilation-targets": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
+      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
+      "requires": {
+        "@babel/compat-data": "^7.20.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "semver": "^6.3.0"
+      }
     },
-    "body": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-      "dev": true,
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
       "requires": {
-        "continuable-cache": "^0.3.1",
-        "error": "^7.0.0",
-        "raw-body": "~1.1.0",
-        "safe-json-parse": "~1.0.1"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-          "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-          "dev": true
-        },
-        "raw-body": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-          "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-          "dev": true,
-          "requires": {
-            "bytes": "1",
-            "string_decoder": "0.10"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6"
       }
     },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
       "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "regexpu-core": "^5.1.0"
       }
     },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
       "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
       }
     },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
+    "@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
       "requires": {
-        "fill-range": "^7.0.1"
+        "@babel/types": "^7.18.6"
       }
     },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
+    "@babel/helper-function-name": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "requires": {
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
+      }
     },
-    "browser-cookies": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browser-cookies/-/browser-cookies-1.2.0.tgz",
-      "integrity": "sha1-/KP/ubamOq3E2MCZnGtX0Pp9KbU="
+    "@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
     },
-    "browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
+      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+      "requires": {
+        "@babel/types": "^7.18.9"
+      }
     },
-    "browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-      "dev": true,
+    "@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
       "requires": {
-        "resolve": "1.1.7"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        }
+        "@babel/types": "^7.18.6"
       }
     },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
+    "@babel/helper-module-transforms": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
+      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.19.4",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4"
+      }
     },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
       "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "@babel/types": "^7.18.6"
       }
     },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
+    "@babel/helper-plugin-utils": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
+      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
       "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-wrap-function": "^7.18.9",
+        "@babel/types": "^7.18.9"
       }
     },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
+    "@babel/helper-replace-supers": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
       "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/traverse": "^7.19.1",
+        "@babel/types": "^7.19.0"
       }
     },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
+    "@babel/helper-simple-access": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
+      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
       "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
+        "@babel/types": "^7.19.4"
       }
     },
-    "browserify-sign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
-      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
-      "dev": true,
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
+      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
       "requires": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.2",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
+        "@babel/types": "^7.20.0"
       }
     },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
+    "@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
       "requires": {
-        "pako": "~1.0.5"
+        "@babel/types": "^7.18.6"
       }
     },
-    "browserslist": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-      "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-      "dev": true,
+    "@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
       "requires": {
-        "caniuse-lite": "^1.0.30001043",
-        "electron-to-chromium": "^1.3.413",
-        "node-releases": "^1.1.53",
-        "pkg-up": "^2.0.0"
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       }
     },
-    "browserstack": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz",
-      "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
-      "dev": true,
+    "@babel/helpers": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz",
+      "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==",
       "requires": {
-        "https-proxy-agent": "^2.2.1"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-          "dev": true,
-          "requires": {
-            "es6-promisify": "^5.0.0"
-          }
-        },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-          "dev": true,
-          "requires": {
-            "agent-base": "^4.3.0",
-            "debug": "^3.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.20.1",
+        "@babel/types": "^7.20.0"
       }
     },
-    "browserstack-local": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.5.tgz",
-      "integrity": "sha512-0/VdSv2YVXmcnwBb64XThMvjM1HnZJnPdv7CUgQbC5y/N9Wsr0Fu+j1oknE9fC/VPx9CpoSC6CJ0kza42skMSA==",
-      "dev": true,
+    "@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
       "requires": {
-        "https-proxy-agent": "^4.0.0",
-        "is-running": "^2.1.0",
-        "ps-tree": "=1.2.0",
-        "temp-fs": "^0.9.9"
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
       }
     },
-    "browserstacktunnel-wrapper": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.4.tgz",
-      "integrity": "sha512-GCV599FUUxNOCFl3WgPnfc5dcqq9XTmMXoxWpqkvmk0R9TOIoqmjENNU6LY6DtgIL6WfBVbg/jmWtnM5K6UYSg==",
-      "dev": true,
+    "@babel/parser": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.1.tgz",
+      "integrity": "sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw=="
+    },
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
       "requires": {
-        "https-proxy-agent": "^2.2.1",
-        "unzipper": "^0.9.3"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-          "dev": true,
-          "requires": {
-            "es6-promisify": "^5.0.0"
-          }
-        },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-          "dev": true,
-          "requires": {
-            "agent-base": "^4.3.0",
-            "debug": "^3.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
+      }
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz",
+      "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
-    "bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "requires": {
-        "node-int64": "^0.4.0"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "buffer": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
-      "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
-      "dev": true,
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
-    "buffer-alloc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-      "dev": true,
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
       "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
-    "buffer-alloc-unsafe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-      "dev": true
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
+      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      }
     },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
     },
-    "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
+      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
     },
-    "buffer-fill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-      "dev": true
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
     },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
     },
-    "buffer-indexof-polyfill": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz",
-      "integrity": "sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8=",
-      "dev": true
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
+      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
+      "requires": {
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.18.8"
+      }
     },
-    "buffer-shims": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-      "dev": true
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
     },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
     },
-    "buffers": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
-      "dev": true
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      }
     },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "cac": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
-      "integrity": "sha1-bSTO7Dcu/lybeYgIvH9JtHJCpO8=",
-      "dev": true,
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "requires": {
-        "camelcase-keys": "^3.0.0",
-        "chalk": "^1.1.3",
-        "indent-string": "^3.0.0",
-        "minimist": "^1.2.0",
-        "read-pkg-up": "^1.0.1",
-        "suffix": "^0.1.0",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "cacheable-lookup": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz",
-      "integrity": "sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w==",
-      "dev": true
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
     },
-    "cacheable-request": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz",
-      "integrity": "sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==",
-      "dev": true,
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "requires": {
-        "callsites": "^0.2.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
-    "callsite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
-      "dev": true
+    "@babel/plugin-syntax-import-assertions": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
+      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      }
     },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
     },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
     },
-    "camelcase-keys": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
-      "integrity": "sha1-/AxsNgNj9zd+N5O5oWvM8QcMHKQ=",
-      "dev": true,
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "requires": {
-        "camelcase": "^3.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "caniuse-lite": {
-      "version": "1.0.30001077",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001077.tgz",
-      "integrity": "sha512-AEzsGvjBJL0lby/87W96PyEvwN0GsYvk5LHsglLg9tW37K4BqvAvoSCdWIE13OZQ8afupqZ73+oL/1LkedN8hA==",
-      "dev": true
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
     },
-    "capture-exit": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
-      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
-      "dev": true,
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "requires": {
-        "rsvp": "^4.8.4"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
     },
-    "ccount": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz",
-      "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==",
-      "dev": true
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
     },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "dev": true,
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "chai": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
-      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
-      "dev": true,
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.0",
-        "type-detect": "^4.0.5"
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-remap-async-to-generator": "^7.18.6"
       }
     },
-    "chainsaw": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-      "dev": true,
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
       "requires": {
-        "traverse": ">=0.3.0 <0.4"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz",
+      "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==",
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
-    "character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "dev": true
+    "@babel/plugin-transform-classes": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-compilation-targets": "^7.19.0",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "globals": "^11.1.0"
+      }
     },
-    "character-entities-html4": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-      "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
-      "dev": true
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
+      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
     },
-    "character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz",
+      "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      }
     },
-    "character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "dev": true
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
+      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
     },
-    "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "check-types": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
-      "dev": true
+    "@babel/plugin-transform-for-of": {
+      "version": "7.18.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "chokidar": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-      "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
-      "dev": true,
+    "@babel/plugin-transform-function-name": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
+      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
       "requires": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "fsevents": "~2.1.2",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
+        "@babel/helper-compilation-targets": "^7.18.9",
+        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
+    "@babel/plugin-transform-literals": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
+      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
     },
-    "chrome-launcher": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.2.tgz",
-      "integrity": "sha512-zWD9RVVKd8Nx2xKGY4G08lb3nCD+2hmICxovvRE9QjBKQzHFvCYqGlsw15b4zUxLKq3wXEwVbR/yLtMbfk7JbQ==",
-      "dev": true,
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
       "requires": {
-        "@types/node": "*",
-        "escape-string-regexp": "^1.0.5",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0",
-        "mkdirp": "^0.5.3",
-        "rimraf": "^3.0.2"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
+      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0"
+      }
     },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
+      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-simple-access": "^7.19.4"
       }
     },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
+      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-identifier": "^7.19.1"
+      }
     },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
       "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+        "@babel/helper-module-transforms": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
       "requires": {
-        "restore-cursor": "^3.1.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
-    "cli-spinners": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
-      "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
-      "dev": true
+    "@babel/plugin-transform-new-target": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-      "dev": true
+    "@babel/plugin-transform-object-super": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.6"
+      }
     },
-    "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
+    "@babel/plugin-transform-parameters": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz",
+      "integrity": "sha512-nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ==",
       "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "regenerator-transform": "^0.15.0"
+      }
     },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
       "requires": {
-        "mimic-response": "^1.0.0"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
+    "@babel/plugin-transform-runtime": {
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
+      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "semver": "^6.3.0"
+      }
     },
-    "cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
       "requires": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+    "@babel/plugin-transform-spread": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+      }
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.6"
+      }
     },
-    "collapse-white-space": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-      "integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
-      "dev": true
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
+      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.18.9"
+      }
     },
-    "collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
+      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
       "requires": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
+      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
       "requires": {
-        "color-name": "1.1.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+    "@babel/preset-env": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
+      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
+      "requires": {
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
+        "@babel/plugin-proposal-class-properties": "^7.18.6",
+        "@babel/plugin-proposal-class-static-block": "^7.18.6",
+        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+        "@babel/plugin-proposal-json-strings": "^7.18.6",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.18.6",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.18.6",
+        "@babel/plugin-transform-async-to-generator": "^7.18.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+        "@babel/plugin-transform-block-scoping": "^7.19.4",
+        "@babel/plugin-transform-classes": "^7.19.0",
+        "@babel/plugin-transform-computed-properties": "^7.18.9",
+        "@babel/plugin-transform-destructuring": "^7.19.4",
+        "@babel/plugin-transform-dotall-regex": "^7.18.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+        "@babel/plugin-transform-for-of": "^7.18.8",
+        "@babel/plugin-transform-function-name": "^7.18.9",
+        "@babel/plugin-transform-literals": "^7.18.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+        "@babel/plugin-transform-modules-amd": "^7.18.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
+        "@babel/plugin-transform-modules-umd": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
+        "@babel/plugin-transform-new-target": "^7.18.6",
+        "@babel/plugin-transform-object-super": "^7.18.6",
+        "@babel/plugin-transform-parameters": "^7.18.8",
+        "@babel/plugin-transform-property-literals": "^7.18.6",
+        "@babel/plugin-transform-regenerator": "^7.18.6",
+        "@babel/plugin-transform-reserved-words": "^7.18.6",
+        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+        "@babel/plugin-transform-spread": "^7.19.0",
+        "@babel/plugin-transform-sticky-regex": "^7.18.6",
+        "@babel/plugin-transform-template-literals": "^7.18.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+        "@babel/plugin-transform-unicode-regex": "^7.18.6",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.19.4",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "core-js-compat": "^3.25.1",
+        "semver": "^6.3.0"
+      }
     },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
+    "@babel/preset-modules": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
     },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true
+    "@babel/runtime": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
+      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
+      "requires": {
+        "regenerator-runtime": "^0.13.10"
+      }
     },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+    "@babel/runtime-corejs3": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz",
+      "integrity": "sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==",
       "dev": true,
       "requires": {
-        "delayed-stream": "~1.0.0"
+        "core-js-pure": "^3.25.1",
+        "regenerator-runtime": "^0.13.10"
       }
     },
-    "comma-separated-tokens": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
-      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==",
-      "dev": true
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
+    "@babel/template": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+      "requires": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.18.10",
+        "@babel/types": "^7.18.10"
+      }
     },
-    "component-bind": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
-      "dev": true
+    "@babel/traverse": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz",
+      "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==",
+      "requires": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.20.1",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.20.1",
+        "@babel/types": "^7.20.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      }
     },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
+    "@babel/types": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz",
+      "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==",
+      "requires": {
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      }
     },
-    "component-inherit": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+    "@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
       "dev": true
     },
-    "compress-commons": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-3.0.0.tgz",
-      "integrity": "sha512-FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg==",
+    "@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
       "dev": true,
       "requires": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^3.0.1",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^2.3.7"
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "globals": {
+          "version": "13.17.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
           }
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
         }
       }
     },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+    "@gulp-sourcemaps/identity-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
+      "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "acorn": "^6.4.1",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.16",
+        "source-map": "^0.6.0",
+        "through2": "^3.0.1"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "acorn": {
+          "version": "6.4.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+          "dev": true
+        },
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
           }
         }
       }
     },
-    "concat-with-sourcemaps": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
-      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+    "@gulp-sourcemaps/map-sources": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
+      "integrity": "sha512-o/EatdaGt8+x2qpb0vFLC/2Gug/xYPRXb6a+ET1wGYKozKN3krDWC/zZFZAtrzxJHuDL12mwdfEFKcKMNvc55A==",
       "dev": true,
       "requires": {
-        "source-map": "^0.6.1"
+        "normalize-path": "^2.0.1",
+        "through2": "^2.0.3"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
         }
       }
     },
-    "connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+    "@hapi/boom": {
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.1.4.tgz",
+      "integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
+        "@hapi/hoek": "9.x.x"
       }
     },
-    "connect-livereload": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz",
-      "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
-      "dev": true
-    },
-    "console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+    "@hapi/cryptiles": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/cryptiles/-/cryptiles-5.1.0.tgz",
+      "integrity": "sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA==",
+      "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "@hapi/boom": "9.x.x"
       }
     },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "continuable-cache": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+    "@hapi/hoek": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
       "dev": true
     },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+    "@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.1"
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
       }
     },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
-    "copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
       "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
       }
     },
-    "core-js": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
     },
-    "core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+    "@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.5",
-        "semver": "7.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
       },
       "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
-    "core-js-pure": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
-      "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="
+    "@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "requires": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
     },
-    "coveralls": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.0.tgz",
-      "integrity": "sha512-sHxOu2ELzW8/NC1UP5XVLbZDzO4S3VxfFye3XYCznopHy02YjNkHcj5bKaVw2O7hVaBdBjEdQGpie4II1mWhuQ==",
+    "@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
       "dev": true,
       "requires": {
-        "js-yaml": "^3.13.1",
-        "lcov-parse": "^1.0.0",
-        "log-driver": "^1.2.7",
-        "minimist": "^1.2.5",
-        "request": "^2.88.2"
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "dependencies": {
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        }
       }
     },
-    "crc": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
-      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
-      "dev": true,
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
       "requires": {
-        "buffer": "^5.1.0"
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
       }
     },
-    "crc32-stream": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz",
-      "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==",
+    "@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
       "dev": true,
       "requires": {
-        "crc": "^3.4.4",
-        "readable-stream": "^3.4.0"
+        "eslint-scope": "5.1.1"
       }
     },
-    "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+    "@polka/url": {
+      "version": "1.0.0-next.21",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
+      "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
+      "dev": true
+    },
+    "@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "dev": true
+    },
+    "@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
+        "type-detect": "4.0.8"
       }
     },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+    "@sinonjs/formatio": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
+      "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "samsam": "1.3.0"
       }
     },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+    "@sinonjs/samsam": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz",
+      "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==",
       "dev": true,
       "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "@sinonjs/commons": "^1.3.0",
+        "array-from": "^2.1.1",
+        "lodash": "^4.17.15"
       }
     },
-    "criteo-direct-rsa-validate": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
-      "integrity": "sha512-7gQ3zX+d+hS/vOxzLrZ4aRAceB7qNJ0VzaGNpcWjDCmtOpASB50USJDupTik/H2nHgiSAA3VNZ3SFuONs8LR9Q=="
+    "@sinonjs/text-encoding": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
+      "dev": true
     },
-    "cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+    "@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "dev": true
+    },
+    "@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
       "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
+        "defer-to-connect": "^2.0.0"
       }
     },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+    "@types/aria-query": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
+      "dev": true
+    },
+    "@types/cacheable-request": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
+      "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "*",
+        "@types/node": "*",
+        "@types/responselike": "*"
       }
     },
-    "crypto-js": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
-      "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+    "@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+      "dev": true
     },
-    "css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+    "@types/cors": {
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
+      "dev": true
+    },
+    "@types/debug": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
+      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "@types/ms": "*"
       }
     },
-    "css-value": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-      "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
+    "@types/diff": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.2.tgz",
+      "integrity": "sha512-uw8eYMIReOwstQ0QKF0sICefSy8cNO/v7gOTiIy9SbwuHyEecJUm7qlgueOO5S1udZ5I/irVydHVwMchgzbKTg==",
       "dev": true
     },
-    "cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+    "@types/easy-table": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.33.tgz",
+      "integrity": "sha512-/vvqcJPmZUfQwCgemL0/34G7bIQnCuvgls379ygRlcC1FqNqk3n+VZ15dAO51yl6JNDoWd8vsk+kT8zfZ1VZSw==",
       "dev": true
     },
-    "cssstyle": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+    "@types/ejs": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.1.tgz",
+      "integrity": "sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==",
+      "dev": true
+    },
+    "@types/eslint": {
+      "version": "8.4.9",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz",
+      "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==",
       "dev": true,
       "requires": {
-        "cssom": "0.3.x"
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+    "@types/eslint-scope": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
       "requires": {
-        "array-find-index": "^1.0.1"
+        "@types/eslint": "*",
+        "@types/estree": "*"
       }
     },
-    "custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+    "@types/estree": {
+      "version": "0.0.51",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
       "dev": true
     },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+    "@types/expect": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
+      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
+      "dev": true
+    },
+    "@types/extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha512-R1g/VyKFFI2HLC1QGAeTtCBWCo6n75l41OnsVYNbmKG+kempOESaodf6BeJyUM3Q0rKa/NQcTHbB2+66lNnxLw==",
+      "dev": true
+    },
+    "@types/fibers": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/fibers/-/fibers-3.1.1.tgz",
+      "integrity": "sha512-yHoUi46uika0snoTpNcVqUSvgbRndaIps4TUCotrXjtc0DHDoPQckmyXEZ2bX3e4mpJmyEW3hRhCwQa/ISCPaA==",
+      "dev": true
+    },
+    "@types/fs-extra": {
+      "version": "9.0.13",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
+      "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
       "dev": true,
       "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
+        "@types/node": "*"
       }
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+    "@types/github-slugger": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@types/github-slugger/-/github-slugger-1.3.0.tgz",
+      "integrity": "sha512-J/rMZa7RqiH/rT29TEVZO4nBoDP9XJOjnbbIofg7GQKs4JIduEO3WLpte+6WeUz/TcrXKlY+bM7FYrp8yFB+3g==",
+      "dev": true
+    },
+    "@types/hast": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
+      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "@types/unist": "*"
       }
     },
-    "data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+    "@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
+      "dev": true
+    },
+    "@types/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
-      },
-      "dependencies": {
-        "whatwg-url": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-          "dev": true,
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
+        "@types/through": "*",
+        "rxjs": "^6.4.0"
       }
     },
-    "date-format": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
-      "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
       "dev": true
     },
-    "dateformat": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-      "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
+    "@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.3.0"
+        "@types/istanbul-lib-coverage": "*"
       }
     },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "@types/istanbul-reports": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "dev": true,
       "requires": {
-        "ms": "2.0.0"
+        "@types/istanbul-lib-report": "*"
       }
     },
-    "debug-fabulous": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
-      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+    "@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "@types/keyv": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-4.2.0.tgz",
+      "integrity": "sha512-xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw==",
       "dev": true,
       "requires": {
-        "debug": "3.X",
-        "memoizee": "0.4.X",
-        "object-assign": "4.X"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "keyv": "*"
       }
     },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+    "@types/lodash": {
+      "version": "4.14.187",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.187.tgz",
+      "integrity": "sha512-MrO/xLXCaUgZy3y96C/iOsaIqZSeupyTImKClHunL5GrmaiII2VwvWmLBu2hwa0Kp0sV19CsyjtrTc/Fx8rg/A==",
       "dev": true
     },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
+    "@types/lodash.flattendeep": {
+      "version": "4.4.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.7.tgz",
+      "integrity": "sha512-1h6GW/AeZw/Wej6uxrqgmdTDZX1yFS39lRsXYkg+3kWvOWWrlGCI6H7lXxlUHOzxDT4QeYGmgPpQ3BX9XevzOg==",
+      "dev": true,
+      "requires": {
+        "@types/lodash": "*"
+      }
     },
-    "decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+    "@types/lodash.pickby": {
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.7.tgz",
+      "integrity": "sha512-4ebXRusuLflfscbD0PUX4eVknDHD9Yf+uMtBIvA/hrnTqeAzbuHuDjvnYriLjUrI9YrhCPVKUf4wkRSXJQ6gig==",
       "dev": true,
       "requires": {
-        "mimic-response": "^3.1.0"
-      },
-      "dependencies": {
-        "mimic-response": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-          "dev": true
-        }
+        "@types/lodash": "*"
       }
     },
-    "deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+    "@types/lodash.union": {
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.7.tgz",
+      "integrity": "sha512-6HXM6tsnHJzKgJE0gA/LhTGf/7AbjUk759WZ1MziVm+OBNAATHhdgj+a3KVE8g76GCLAnN4ZEQQG1EGgtBIABA==",
       "dev": true,
       "requires": {
-        "type-detect": "^4.0.0"
+        "@types/lodash": "*"
       }
     },
-    "deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+    "@types/mdast": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
+      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
+      "dev": true,
       "requires": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
+        "@types/unist": "*"
       }
     },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+    "@types/mocha": {
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz",
+      "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==",
       "dev": true
     },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+    "@types/ms": {
+      "version": "0.7.31",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
+      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
       "dev": true
     },
-    "default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+    "@types/node": {
+      "version": "17.0.45",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+      "dev": true
+    },
+    "@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "@types/object-inspect": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.8.1.tgz",
+      "integrity": "sha512-0JTdf3CGV0oWzE6Wa40Ayv2e2GhpP3pEJMcrlM74vBSJPuuNkVwfDnl0SZxyFCXETcB4oKA/MpTVfuYSMOelBg==",
+      "dev": true
+    },
+    "@types/puppeteer": {
+      "version": "5.4.7",
+      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.7.tgz",
+      "integrity": "sha512-JdGWZZYL0vKapXF4oQTC5hLVNfOgdPrqeZ1BiQnGk5cB7HeE91EWUiTdVSdQPobRN8rIcdffjiOgCYJ/S8QrnQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^5.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "@types/node": "*"
+      }
+    },
+    "@types/recursive-readdir": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.1.tgz",
+      "integrity": "sha512-Xd+Ptc4/F2ueInqy5yK2FI5FxtwwbX2+VZpcg+9oYsFJVen8qQKGapCr+Bi5wQtHU1cTXT8s+07lo/nKPgu8Gg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
       }
     },
-    "default-require-extensions": {
+    "@types/responselike": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
-      "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
+      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
       "dev": true,
       "requires": {
-        "strip-bom": "^2.0.0"
+        "@types/node": "*"
       }
     },
-    "default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+    "@types/stack-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+    "@types/stream-buffers": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.4.tgz",
+      "integrity": "sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "clone": "^1.0.2"
+        "@types/node": "*"
       }
     },
-    "defer-to-connect": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz",
-      "integrity": "sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==",
+    "@types/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
       "dev": true
     },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+    "@types/through": {
+      "version": "0.0.30",
+      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
+      "integrity": "sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==",
       "dev": true,
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
+        "@types/node": "*"
       }
     },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+    "@types/tmp": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-dDZH/tXzwjutnuk4UacGgFRwV+JSLaXL1ikvidfJprkb7L9Nx1njcRHHmi3Dsvt7pgqqTEeucQuOrWHPFgzVHA==",
       "dev": true
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+    "@types/ua-parser-js": {
+      "version": "0.7.36",
+      "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz",
+      "integrity": "sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==",
       "dev": true
     },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    "@types/unist": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
+      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
+      "dev": true
     },
-    "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+    "@types/vinyl": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz",
+      "integrity": "sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "@types/expect": "^1.20.4",
+        "@types/node": "*"
       }
     },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    "@types/which": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz",
+      "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==",
+      "dev": true
     },
-    "detab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detab/-/detab-2.0.3.tgz",
-      "integrity": "sha512-Up8P0clUVwq0FnFjDclzZsy9PadzRn5FFxrr47tQQvMHqyiFYVbpH8oXDzWtF0Q7pYy3l+RPmtBl+BsFF6wH0A==",
+    "@types/yargs": {
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "requires": {
-        "repeat-string": "^1.5.4"
+        "@types/yargs-parser": "*"
       }
     },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+    "@types/yargs-parser": {
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
       "dev": true
     },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+    "@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "@types/node": "*"
       }
     },
-    "detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+    "@ungap/promise-all-settled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
       "dev": true
     },
-    "detect-newline": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-      "dev": true
+    "@videojs/http-streaming": {
+      "version": "2.14.3",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.3.tgz",
+      "integrity": "sha512-2tFwxCaNbcEZzQugWf8EERwNMyNtspfHnvxRGRABQs09W/5SqmkWFuGWfUAm4wQKlXGfdPyAJ1338ASl459xAA==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "3.0.5",
+        "aes-decrypter": "3.1.3",
+        "global": "^4.4.0",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
+        "video.js": "^6 || ^7"
+      }
     },
-    "detective": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
+    "@videojs/vhs-utils": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz",
+      "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==",
       "dev": true,
       "requires": {
-        "acorn": "^5.2.1",
-        "defined": "^1.0.0"
+        "@babel/runtime": "^7.12.5",
+        "global": "^4.4.0",
+        "url-toolkit": "^2.2.1"
       }
     },
-    "devtools": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.1.16.tgz",
-      "integrity": "sha512-Px/K/xYY+fTW8D5yt7p6ZZJfkfHHulKVr2Y+BJSCQyKNSY/hiZFT6KAjoUFrAastLCqqs1gW2Dy/OGb0qWm+Hg==",
+    "@videojs/xhr": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.6.0.tgz",
+      "integrity": "sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==",
       "dev": true,
       "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/protocols": "6.1.14",
-        "@wdio/utils": "6.1.8",
-        "chrome-launcher": "^0.13.1",
-        "puppeteer-core": "^3.0.0",
-        "ua-parser-js": "^0.7.21",
-        "uuid": "^8.0.0"
+        "@babel/runtime": "^7.5.5",
+        "global": "~4.4.0",
+        "is-function": "^1.0.1"
       }
     },
-    "di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
+    "@vue/compiler-core": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz",
+      "integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@babel/parser": "^7.16.4",
+        "@vue/shared": "3.2.41",
+        "estree-walker": "^2.0.2",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        }
+      }
     },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
+    "@vue/compiler-dom": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz",
+      "integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@vue/compiler-core": "3.2.41",
+        "@vue/shared": "3.2.41"
+      }
     },
-    "diff-sequences": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
-      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
-      "dev": true
+    "@vue/compiler-sfc": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz",
+      "integrity": "sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.41",
+        "@vue/compiler-dom": "3.2.41",
+        "@vue/compiler-ssr": "3.2.41",
+        "@vue/reactivity-transform": "3.2.41",
+        "@vue/shared": "3.2.41",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7",
+        "postcss": "^8.1.10",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        }
+      }
     },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+    "@vue/compiler-ssr": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz",
+      "integrity": "sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@vue/compiler-dom": "3.2.41",
+        "@vue/shared": "3.2.41"
+      }
+    },
+    "@vue/reactivity-transform": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz",
+      "integrity": "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.41",
+        "@vue/shared": "3.2.41",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7"
+      }
+    },
+    "@vue/shared": {
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz",
+      "integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==",
+      "dev": true,
+      "optional": true
+    },
+    "@wdio/browserstack-service": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.16.16.tgz",
+      "integrity": "sha512-q4wUh/j0MR2SwhTkmIFif2DaXgH5yzdgOer6G/fac2n81zLCSpQHWO5aQ9T0An9CAd4L2A+t3dmChpBJPkHWSw==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "@types/node": "^17.0.4",
+        "@wdio/logger": "7.16.0",
+        "@wdio/types": "7.16.14",
+        "browserstack-local": "^1.4.5",
+        "got": "^11.0.2",
+        "webdriverio": "7.16.16"
+      },
+      "dependencies": {
+        "@wdio/config": {
+          "version": "7.16.16",
+          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz",
+          "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.16.0",
+            "@wdio/types": "7.16.14",
+            "deepmerge": "^4.0.0",
+            "glob": "^7.1.2"
+          }
+        },
+        "@wdio/protocols": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz",
+          "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==",
+          "dev": true
+        },
+        "@wdio/repl": {
+          "version": "7.16.14",
+          "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz",
+          "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==",
+          "dev": true,
+          "requires": {
+            "@wdio/utils": "7.16.14"
+          }
+        },
+        "@wdio/utils": {
+          "version": "7.16.14",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz",
+          "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.16.0",
+            "@wdio/types": "7.16.14",
+            "p-iteration": "^1.1.8"
+          }
+        },
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "devtools": {
+          "version": "7.16.16",
+          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
+          "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^17.0.4",
+            "@types/ua-parser-js": "^0.7.33",
+            "@wdio/config": "7.16.16",
+            "@wdio/logger": "7.16.0",
+            "@wdio/protocols": "7.16.7",
+            "@wdio/types": "7.16.14",
+            "@wdio/utils": "7.16.14",
+            "chrome-launcher": "^0.15.0",
+            "edge-paths": "^2.1.0",
+            "puppeteer-core": "^13.1.3",
+            "query-selector-shadow-dom": "^1.0.0",
+            "ua-parser-js": "^1.0.1",
+            "uuid": "^8.0.0"
+          }
+        },
+        "devtools-protocol": {
+          "version": "0.0.973690",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz",
+          "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "ua-parser-js": {
+          "version": "1.0.32",
+          "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz",
+          "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==",
+          "dev": true
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        },
+        "webdriver": {
+          "version": "7.16.16",
+          "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz",
+          "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^17.0.4",
+            "@wdio/config": "7.16.16",
+            "@wdio/logger": "7.16.0",
+            "@wdio/protocols": "7.16.7",
+            "@wdio/types": "7.16.14",
+            "@wdio/utils": "7.16.14",
+            "got": "^11.0.2",
+            "ky": "^0.29.0",
+            "lodash.merge": "^4.6.1"
+          }
+        },
+        "webdriverio": {
+          "version": "7.16.16",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz",
+          "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==",
+          "dev": true,
+          "requires": {
+            "@types/aria-query": "^5.0.0",
+            "@types/node": "^17.0.4",
+            "@wdio/config": "7.16.16",
+            "@wdio/logger": "7.16.0",
+            "@wdio/protocols": "7.16.7",
+            "@wdio/repl": "7.16.14",
+            "@wdio/types": "7.16.14",
+            "@wdio/utils": "7.16.14",
+            "archiver": "^5.0.0",
+            "aria-query": "^5.0.0",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "devtools": "7.16.16",
+            "devtools-protocol": "^0.0.973690",
+            "fs-extra": "^10.0.0",
+            "get-port": "^5.1.1",
+            "grapheme-splitter": "^1.0.2",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isobject": "^3.0.2",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^5.0.0",
+            "puppeteer-core": "^13.1.3",
+            "query-selector-shadow-dom": "^1.0.0",
+            "resq": "^1.9.1",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^8.0.0",
+            "webdriver": "7.16.16"
+          }
+        }
+      }
+    },
+    "@wdio/cli": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.5.7.tgz",
+      "integrity": "sha512-nOQJLskrY+UECDd3NxE7oBzb6cDA7e7x02YWQugOlOgnZ4a+PJmkFoSsO8C2uNCpdFngy5rJKGUo5vbtAHEF9Q==",
+      "dev": true,
+      "requires": {
+        "@types/ejs": "^3.0.5",
+        "@types/fs-extra": "^9.0.4",
+        "@types/inquirer": "^7.3.1",
+        "@types/lodash.flattendeep": "^4.4.6",
+        "@types/lodash.pickby": "^4.6.6",
+        "@types/lodash.union": "^4.6.6",
+        "@types/recursive-readdir": "^2.2.0",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "async-exit-hook": "^2.0.1",
+        "chalk": "^4.0.0",
+        "chokidar": "^3.0.0",
+        "cli-spinners": "^2.1.0",
+        "ejs": "^3.0.1",
+        "fs-extra": "^10.0.0",
+        "inquirer": "^8.0.0",
+        "lodash.flattendeep": "^4.4.0",
+        "lodash.pickby": "^4.6.0",
+        "lodash.union": "^4.6.0",
+        "mkdirp": "^1.0.4",
+        "recursive-readdir": "^2.2.2",
+        "webdriverio": "7.5.7",
+        "yargs": "^17.0.0",
+        "yarn-install": "^1.0.0"
       },
       "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+        "@types/aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+          "dev": true
+        },
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "@babel/runtime-corejs3": "^7.10.2"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "chrome-launcher": {
+          "version": "0.13.4",
+          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "escape-string-regexp": "^1.0.5",
+            "is-wsl": "^2.2.0",
+            "lighthouse-logger": "^1.0.0",
+            "mkdirp": "^0.5.3",
+            "rimraf": "^3.0.2"
+          },
+          "dependencies": {
+            "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"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "devtools": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+          "dev": true,
+          "requires": {
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "chrome-launcher": "^0.13.1",
+            "edge-paths": "^2.1.0",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "ua-parser-js": "^0.7.21",
+            "uuid": "^8.0.0"
+          }
+        },
+        "devtools-protocol": {
+          "version": "0.0.878340",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "puppeteer-core": {
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "devtools-protocol": "0.0.869402",
+            "extract-zip": "^2.0.0",
+            "https-proxy-agent": "^5.0.0",
+            "node-fetch": "^2.6.1",
+            "pkg-dir": "^4.2.0",
+            "progress": "^2.0.1",
+            "proxy-from-env": "^1.1.0",
+            "rimraf": "^3.0.2",
+            "tar-fs": "^2.0.0",
+            "unbzip2-stream": "^1.3.3",
+            "ws": "^7.2.3"
+          },
+          "dependencies": {
+            "devtools-protocol": {
+              "version": "0.0.869402",
+              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+              "dev": true
+            }
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        },
+        "webdriverio": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+          "dev": true,
+          "requires": {
+            "@types/aria-query": "^4.2.1",
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/repl": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "archiver": "^5.0.0",
+            "aria-query": "^4.2.2",
+            "atob": "^2.1.2",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "devtools": "7.5.7",
+            "devtools-protocol": "^0.0.878340",
+            "fs-extra": "^10.0.0",
+            "get-port": "^5.1.1",
+            "grapheme-splitter": "^1.0.2",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isobject": "^3.0.2",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^3.0.4",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "resq": "^1.9.1",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^8.0.0",
+            "webdriver": "7.5.3"
+          }
+        },
+        "ws": {
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "dev": true,
+          "requires": {}
+        },
+        "yargs": {
+          "version": "17.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+          "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+          "dev": true,
+          "requires": {
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.0.0"
+          }
         }
       }
     },
-    "disparity": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/disparity/-/disparity-2.0.0.tgz",
-      "integrity": "sha1-V92stHMkrl9Y0swNqIbbTOnutxg=",
+    "@wdio/concise-reporter": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.5.7.tgz",
+      "integrity": "sha512-964i7eQ4sboSla2bdR8714Er82QBgS6u39GmDFX8Izy9Ge38xaE75HuF5S7mnOWGzSojCWgqtwy5k7Rfg6GE3g==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^2.0.1",
-        "diff": "^1.3.2"
+        "@wdio/reporter": "7.5.7",
+        "@wdio/types": "7.5.3",
+        "chalk": "^4.0.0",
+        "pretty-ms": "^7.0.0"
       },
       "dependencies": {
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
         "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "diff": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-          "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
-    "dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
-    },
-    "doctrine": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
-      }
-    },
-    "doctrine-temporary-fork": {
-      "version": "2.0.0-alpha-allowarrayindex",
-      "resolved": "https://registry.npmjs.org/doctrine-temporary-fork/-/doctrine-temporary-fork-2.0.0-alpha-allowarrayindex.tgz",
-      "integrity": "sha1-QAFahn6yfnWybIKLcVJPE3+J+fA=",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
-      }
-    },
-    "documentation": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-5.5.0.tgz",
-      "integrity": "sha512-Aod3HOI+8zMhwWztDlECRsDfJ8SFu4oADvipOLq3gnWKy4Cpg2oF5AWT+U6PcX85KuguDI6c+q+2YwYEx99B/A==",
+    "@wdio/config": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.5.3.tgz",
+      "integrity": "sha512-udvVizYoilOxuWj/BmoN6y7ZCd4wPdYNlSfWznrbCezAdaLZ4/pNDOO0WRWx2C4+q1wdkXZV/VuQPUGfL0lEHQ==",
       "dev": true,
       "requires": {
-        "ansi-html": "^0.0.7",
-        "babel-core": "^6.26.0",
-        "babel-generator": "^6.26.0",
-        "babel-plugin-system-import-transformer": "3.1.0",
-        "babel-plugin-transform-decorators-legacy": "^1.3.4",
-        "babel-preset-env": "^1.6.1",
-        "babel-preset-react": "^6.24.1",
-        "babel-preset-stage-0": "^6.24.1",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babelify": "^8.0.0",
-        "babylon": "^6.18.0",
-        "chalk": "^2.3.0",
-        "chokidar": "^2.0.0",
-        "concat-stream": "^1.6.0",
-        "disparity": "^2.0.0",
-        "doctrine-temporary-fork": "2.0.0-alpha-allowarrayindex",
-        "get-port": "^3.2.0",
-        "git-url-parse": "^8.0.0",
-        "github-slugger": "1.2.0",
-        "glob": "^7.1.2",
-        "globals-docs": "^2.4.0",
-        "highlight.js": "^9.12.0",
-        "js-yaml": "^3.10.0",
-        "lodash": "^4.17.4",
-        "mdast-util-inject": "^1.1.0",
-        "micromatch": "^3.1.5",
-        "mime": "^1.4.1",
-        "module-deps-sortable": "4.0.6",
-        "parse-filepath": "^1.0.2",
-        "pify": "^3.0.0",
-        "read-pkg-up": "^3.0.0",
-        "remark": "^9.0.0",
-        "remark-html": "7.0.0",
-        "remark-reference-links": "^4.0.1",
-        "remark-toc": "^5.0.0",
-        "remote-origin-url": "0.4.0",
-        "shelljs": "^0.8.1",
-        "stream-array": "^1.1.2",
-        "strip-json-comments": "^2.0.1",
-        "tiny-lr": "^1.1.0",
-        "unist-builder": "^1.0.2",
-        "unist-util-visit": "^1.3.0",
-        "vfile": "^2.3.0",
-        "vfile-reporter": "^4.0.0",
-        "vfile-sort": "^2.1.0",
-        "vinyl": "^2.1.0",
-        "vinyl-fs": "^3.0.2",
-        "yargs": "^9.0.1"
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "deepmerge": "^4.0.0",
+        "glob": "^7.1.2"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
         },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
           "dev": true,
           "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-              "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
+            "got": "^11.8.1"
           }
         },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@wdio/local-runner": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.5.7.tgz",
+      "integrity": "sha512-aYc0XUV+/e3cg8Fp+CWlC4FbwSSG3mKAv1iuy/+Hwzg2kJE+aa+Rf2p2BQYc7HPRtKNW0bM8o+aCImZLAiPM+A==",
+      "dev": true,
+      "requires": {
+        "@types/stream-buffers": "^3.0.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/runner": "7.5.7",
+        "@wdio/types": "7.5.3",
+        "async-exit-hook": "^2.0.1",
+        "split2": "^3.2.2",
+        "stream-buffers": "^3.0.2"
+      },
+      "dependencies": {
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
+            "color-name": "~1.1.4"
           }
         },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
+            "has-flag": "^4.0.0"
           }
-        },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+        }
+      }
+    },
+    "@wdio/logger": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.16.0.tgz",
+      "integrity": "sha512-/6lOGb2Iow5eSsy7RJOl1kCwsP4eMlG+/QKro5zUJsuyNJSQXf2ejhpkzyKWLgQbHu83WX6cM1014AZuLkzoQg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "binary-extensions": "^1.0.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+            "color-name": "~1.1.4"
           }
         },
-        "load-json-file": {
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        }
+      }
+    },
+    "@wdio/mocha-framework": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.5.3.tgz",
+      "integrity": "sha512-96QCVWsiyZxEgOZP3oTq2B2T7zne5dCdehLa2n4q/BLjk96Rj0jifidJZfd/1+vdNPKX0gWWAzpy98Znn8MVMw==",
+      "dev": true,
+      "requires": {
+        "@types/mocha": "^8.0.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "expect-webdriverio": "^2.0.0",
+        "mocha": "^8.0.1"
+      },
+      "dependencies": {
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "got": "^11.8.1"
           }
         },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "pify": "^3.0.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
           "dev": true
         },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+        "chokidar": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.1",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.5.0"
           }
         },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
           }
         },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
+            "color-name": "~1.1.4"
           }
         },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
+            "ms": "2.1.2"
+          }
+        },
+        "diff": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+          "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "argparse": "^2.0.1"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "p-locate": "^5.0.0"
           }
         },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+        "log-symbols": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+          "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
+            "chalk": "^4.0.0"
           }
         },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
         },
-        "yargs": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-          "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+        "mocha": {
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
+          "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
+            "@ungap/promise-all-settled": "1.1.2",
+            "ansi-colors": "4.1.1",
+            "browser-stdout": "1.3.1",
+            "chokidar": "3.5.1",
+            "debug": "4.3.1",
+            "diff": "5.0.0",
+            "escape-string-regexp": "4.0.0",
+            "find-up": "5.0.0",
+            "glob": "7.1.6",
+            "growl": "1.10.5",
+            "he": "1.2.0",
+            "js-yaml": "4.0.0",
+            "log-symbols": "4.0.0",
+            "minimatch": "3.0.4",
+            "ms": "2.1.3",
+            "nanoid": "3.1.20",
+            "serialize-javascript": "5.0.1",
+            "strip-json-comments": "3.1.1",
+            "supports-color": "8.1.1",
+            "which": "2.0.2",
+            "wide-align": "1.1.3",
+            "workerpool": "6.1.0",
+            "yargs": "16.2.0",
+            "yargs-parser": "20.2.4",
+            "yargs-unparser": "2.0.0"
           },
           "dependencies": {
-            "load-json-file": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-              "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "parse-json": "^2.2.0",
-                "pify": "^2.0.0",
-                "strip-bom": "^3.0.0"
-              }
-            },
-            "parse-json": {
-              "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-              "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-              "dev": true,
-              "requires": {
-                "error-ex": "^1.2.0"
-              }
-            },
-            "path-type": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-              "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-              "dev": true,
-              "requires": {
-                "pify": "^2.0.0"
-              }
-            },
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+            "ms": {
+              "version": "2.1.3",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
               "dev": true
             },
-            "read-pkg": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-              "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-              "dev": true,
-              "requires": {
-                "load-json-file": "^2.0.0",
-                "normalize-package-data": "^2.3.2",
-                "path-type": "^2.0.0"
-              }
-            },
-            "read-pkg-up": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-              "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+            "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": {
-                "find-up": "^2.0.0",
-                "read-pkg": "^2.0.0"
+                "has-flag": "^4.0.0"
               }
             }
           }
         },
-        "yargs-parser": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0"
-          }
-        }
-      }
-    },
-    "dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-      "dev": true,
-      "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
-      }
-    },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true
-    },
-    "domexception": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
-      "dev": true,
-      "requires": {
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "dset": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-2.0.1.tgz",
-      "integrity": "sha512-nI29OZMRYq36hOcifB6HTjajNAAiBKSXsyWZrq+VniusseuP2OpNlTiYgsaNRSGvpyq5Wjbc2gQLyBdTyWqhnQ=="
-    },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-      "dev": true
-    },
-    "duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "nanoid": {
+          "version": "3.1.20",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+          "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "yocto-queue": "^0.1.0"
           }
-        }
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-      "dev": true
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "p-limit": "^3.0.2"
           }
-        }
-      }
-    },
-    "each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
-      }
-    },
-    "easy-table": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.1.tgz",
-      "integrity": "sha512-C9Lvm0WFcn2RgxbMnTbXZenMIWcBtkzMr+dWqq/JsVoGFSVUVlPqeOa5LP5kM0I3zoOazFpckOEb2/0LDFfToQ==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^3.0.0",
-        "wcwidth": ">=1.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        }
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "editions": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz",
-      "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==",
-      "dev": true
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "ejs": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz",
-      "integrity": "sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==",
-      "dev": true,
-      "requires": {
-        "jake": "^10.6.1"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.3.458",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.458.tgz",
-      "integrity": "sha512-OjRkb0igW0oKE2QbzS7vBYrm7xjW/KRTtIj0OGGx57jr/YhBiKb7oZvdbaojqjfCb/7LbnwsbMbdsYjthdJbAw==",
-      "dev": true
-    },
-    "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
-      }
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "engine.io": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
-      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "base64id": "1.0.0",
-        "cookie": "0.3.1",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.0",
-        "ws": "~3.3.1"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-          "dev": true
         },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "readdirp": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "picomatch": "^2.2.1"
           }
         },
-        "ws": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+        "serialize-javascript": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+          "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
           "dev": true,
           "requires": {
-            "async-limiter": "~1.0.0",
-            "safe-buffer": "~5.1.0",
-            "ultron": "~1.1.0"
+            "randombytes": "^2.1.0"
           }
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "component-inherit": "0.0.3",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.1",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "ws": "~3.3.1",
-        "xmlhttprequest-ssl": "~1.5.4",
-        "yeast": "0.1.2"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
           "dev": true
         },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "has-flag": "^4.0.0"
           }
         },
-        "ws": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+        "workerpool": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
+          "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
           "dev": true,
           "requires": {
-            "async-limiter": "~1.0.0",
-            "safe-buffer": "~5.1.0",
-            "ultron": "~1.1.0"
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
           }
+        },
+        "yargs-parser": {
+          "version": "20.2.4",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+          "dev": true
         }
       }
     },
-    "engine.io-parser": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
-      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
-      "dev": true,
-      "requires": {
-        "after": "0.8.2",
-        "arraybuffer.slice": "~0.0.7",
-        "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.5",
-        "has-binary2": "~1.0.2"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "object-assign": "^4.0.1",
-        "tapable": "^0.2.7"
-      }
-    },
-    "ent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
-    },
-    "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
-    "error": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
-      "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
-      "dev": true,
-      "requires": {
-        "string-template": "~0.2.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.17.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
-      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
-      "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "es5-shim": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.14.tgz",
-      "integrity": "sha512-7SwlpL+2JpymWTt8sNLuC2zdhhc+wrfe5cMPI2j0o6WsPdfAiPwmFy2f0AocPB4RQVBOZ9kNTgi5YF7TdhkvEg==",
-      "dev": true
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
-    "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+    "@wdio/protocols": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.5.3.tgz",
+      "integrity": "sha512-lpNaKwxYhDSL6neDtQQYXvzMAw+u4PXx65ryeMEX82mkARgzSZps5Kyrg9ub7X4T17K1NPfnY6UhZEWg6cKJCg==",
       "dev": true
     },
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+    "@wdio/repl": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.5.3.tgz",
+      "integrity": "sha512-jfNJwNoc2nWdnLsFoGHmOJR9zaWfDTBMWM3W1eR5kXIjevD6gAfWsB5ZoA4IdybujCXxdnhlsm4o2jIzp/6f7A==",
       "dev": true,
       "requires": {
-        "es6-promise": "^4.0.3"
+        "@wdio/utils": "7.5.3"
       }
     },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+    "@wdio/reporter": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.5.7.tgz",
+      "integrity": "sha512-9PXqZtCXDtU6UYLNDPu9MZQ8BiABGnRlJTrlbYB3gBfZDibMkJMvwXzPderipBv2+ifDZXmGe3Njf1ao2TkbFA==",
       "dev": true,
       "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "~0.3.5"
+        "@wdio/types": "7.5.3",
+        "fs-extra": "^10.0.0"
       },
       "dependencies": {
-        "es6-symbol": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-          "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
           "dev": true,
           "requires": {
-            "d": "1",
-            "es5-ext": "~0.10.14"
+            "got": "^11.8.1"
           }
         }
       }
     },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "escodegen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz",
-      "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==",
-      "dev": true,
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "dev": true,
-      "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+    "@wdio/runner": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.5.7.tgz",
+      "integrity": "sha512-RzVXd+xnwK/thkx1/xo9K5iscQ0Ofobgsx5dNVtwLDVMn9V7jCW/WX4dSCPAPaVSqnUCmkcQp3P5AoSBPpCZnQ==",
       "dev": true,
       "requires": {
-        "ajv": "^5.3.0",
-        "babel-code-frame": "^6.22.0",
-        "chalk": "^2.1.0",
-        "concat-stream": "^1.6.0",
-        "cross-spawn": "^5.1.0",
-        "debug": "^3.1.0",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^3.7.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^3.5.4",
-        "esquery": "^1.0.0",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
-        "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.0.1",
-        "ignore": "^3.3.3",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^3.0.6",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.9.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.2",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
-        "progress": "^2.0.0",
-        "regexpp": "^1.0.1",
-        "require-uncached": "^1.0.3",
-        "semver": "^5.3.0",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "~2.0.1",
-        "table": "4.0.2",
-        "text-table": "~0.2.0"
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "deepmerge": "^4.0.0",
+        "gaze": "^1.1.2",
+        "webdriver": "7.5.3",
+        "webdriverio": "7.5.7"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-          "dev": true
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "chardet": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-          "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+        "@types/aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
           "dev": true
         },
-        "cli-cursor": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
           "dev": true,
           "requires": {
-            "restore-cursor": "^2.0.0"
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
           "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "got": "^11.8.1"
           }
         },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "color-convert": "^2.0.1"
           }
         },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+        "aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
           "dev": true,
           "requires": {
-            "esutils": "^2.0.2"
+            "@babel/runtime": "^7.10.2",
+            "@babel/runtime-corejs3": "^7.10.2"
           }
         },
-        "external-editor": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-          "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "chardet": "^0.4.0",
-            "iconv-lite": "^0.4.17",
-            "tmp": "^0.0.33"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+        "chrome-launcher": {
+          "version": "0.13.4",
+          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "^1.0.5"
+            "@types/node": "*",
+            "escape-string-regexp": "^1.0.5",
+            "is-wsl": "^2.2.0",
+            "lighthouse-logger": "^1.0.0",
+            "mkdirp": "^0.5.3",
+            "rimraf": "^3.0.2"
           }
         },
-        "inquirer": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-          "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "^3.0.0",
-            "chalk": "^2.0.0",
-            "cli-cursor": "^2.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^2.0.4",
-            "figures": "^2.0.0",
-            "lodash": "^4.3.0",
-            "mute-stream": "0.0.7",
-            "run-async": "^2.2.0",
-            "rx-lite": "^4.0.8",
-            "rx-lite-aggregates": "^4.0.8",
-            "string-width": "^2.1.0",
-            "strip-ansi": "^4.0.0",
-            "through": "^2.3.6"
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-          "dev": true
+        "devtools": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+          "dev": true,
+          "requires": {
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "chrome-launcher": "^0.13.1",
+            "edge-paths": "^2.1.0",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "ua-parser-js": "^0.7.21",
+            "uuid": "^8.0.0"
+          }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "devtools-protocol": {
+          "version": "0.0.878340",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
           "dev": true
         },
-        "mute-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "^1.0.0"
-          }
-        },
-        "restore-cursor": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+        "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": {
-            "onetime": "^2.0.0",
-            "signal-exit": "^3.0.2"
+            "minimist": "^1.2.6"
           }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+        "puppeteer-core": {
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "debug": "^4.1.0",
+            "devtools-protocol": "0.0.869402",
+            "extract-zip": "^2.0.0",
+            "https-proxy-agent": "^5.0.0",
+            "node-fetch": "^2.6.1",
+            "pkg-dir": "^4.2.0",
+            "progress": "^2.0.1",
+            "proxy-from-env": "^1.1.0",
+            "rimraf": "^3.0.2",
+            "tar-fs": "^2.0.0",
+            "unbzip2-stream": "^1.3.3",
+            "ws": "^7.2.3"
+          },
+          "dependencies": {
+            "devtools-protocol": {
+              "version": "0.0.869402",
+              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+              "dev": true
+            }
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "has-flag": "^4.0.0"
+          }
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        },
+        "webdriverio": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+          "dev": true,
+          "requires": {
+            "@types/aria-query": "^4.2.1",
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/repl": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "archiver": "^5.0.0",
+            "aria-query": "^4.2.2",
+            "atob": "^2.1.2",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "devtools": "7.5.7",
+            "devtools-protocol": "^0.0.878340",
+            "fs-extra": "^10.0.0",
+            "get-port": "^5.1.1",
+            "grapheme-splitter": "^1.0.2",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isobject": "^3.0.2",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^3.0.4",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "resq": "^1.9.1",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^8.0.0",
+            "webdriver": "7.5.3"
           }
+        },
+        "ws": {
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "dev": true,
+          "requires": {}
         }
       }
     },
-    "eslint-config-standard": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-      "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
-      "dev": true
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+    "@wdio/spec-reporter": {
+      "version": "7.19.7",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.7.tgz",
+      "integrity": "sha512-BDBZU2EK/GuC9VxtfqPtoW43FmvKxYDsvcDVDi3F7o+9fkcuGSJiWbw1AX251ZzzVQ7YP9ImTitSpdpUKXkilQ==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
+        "@types/easy-table": "^0.0.33",
+        "@wdio/reporter": "7.19.7",
+        "@wdio/types": "7.19.5",
+        "chalk": "^4.0.0",
+        "easy-table": "^1.1.1",
+        "pretty-ms": "^7.0.0"
       },
       "dependencies": {
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+        "@wdio/reporter": {
+          "version": "7.19.7",
+          "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.7.tgz",
+          "integrity": "sha512-Dum19gpfru66FnIq78/4HTuW87B7ceLDp6PJXwQM5kXyN7Gb7zhMgp6FZTM0FCYLyi6U/zXZSvpNUYl77caS6g==",
           "dev": true,
           "requires": {
-            "find-up": "^2.1.0"
+            "@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.5",
+            "diff": "^5.0.0",
+            "fs-extra": "^10.0.0",
+            "object-inspect": "^1.10.3",
+            "supports-color": "8.1.1"
           }
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.20.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz",
-      "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.0.3",
-        "array.prototype.flat": "^1.2.1",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.4.1",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.0",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.12.0"
-      },
-      "dependencies": {
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+        },
+        "@wdio/types": {
+          "version": "7.19.5",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.5.tgz",
+          "integrity": "sha512-S1lC0pmtEO7NVH/2nM1c7NHbkgxLZH3VVG/z6ym3Bbxdtcqi2LMsEvvawMAU/fmhyiIkMsGZCO8vxG9cRw4z4A==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "@types/node": "^17.0.4",
+            "got": "^11.8.1"
           }
         },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "pify": "^2.0.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
           }
         },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
+            "color-name": "~1.1.4"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
-        }
-      }
-    },
-    "eslint-plugin-node": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-5.2.1.tgz",
-      "integrity": "sha512-xhPXrh0Vl/b7870uEbaumb2Q+LxaEcOQ3kS1jtIXanBAwpMre1l5q/l2l/hESYJGEFKuI78bp6Uw50hlpr7B+g==",
-      "dev": true,
-      "requires": {
-        "ignore": "^3.3.6",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.3.3",
-        "semver": "5.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "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"
+          }
         }
       }
     },
-    "eslint-plugin-prebid": {
-      "version": "file:plugins/eslint",
-      "dev": true
-    },
-    "eslint-plugin-promise": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz",
-      "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ==",
-      "dev": true
-    },
-    "eslint-plugin-standard": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
-      "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==",
-      "dev": true
-    },
-    "eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
-      "dev": true
-    },
-    "espree": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.5.0",
-        "acorn-jsx": "^3.0.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+    "@wdio/sync": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.5.7.tgz",
+      "integrity": "sha512-Zu/AYLjwqbFSbaOU1US7ownv3ov8JrtoGHq51JfJ4masefJDXNkHix2cZ0qEgl3IvkkWQ0ewL0G8GTXb3KOemA==",
       "dev": true,
       "requires": {
-        "estraverse": "^5.1.0"
+        "@types/fibers": "^3.1.0",
+        "@types/puppeteer": "^5.4.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "fibers": "^5.0.0",
+        "webdriverio": "7.5.7"
       },
       "dependencies": {
-        "estraverse": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
+        "@types/aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
           "dev": true
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-    },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "event-stream": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-      "dev": true,
-      "requires": {
-        "duplexer": "~0.1.1",
-        "from": "~0",
-        "map-stream": "~0.1.0",
-        "pause-stream": "0.0.11",
-        "split": "0.3",
-        "stream-combiner": "~0.0.4",
-        "through": "~2.3.1"
-      }
-    },
-    "eventemitter3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
-      "dev": true
-    },
-    "events": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
-      "dev": true
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
-      "dev": true
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
         },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
           "dev": true,
           "requires": {
-            "pump": "^3.0.0"
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
           }
-        }
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "got": "^11.8.1"
           }
         },
-        "extend-shallow": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "@babel/runtime-corejs3": "^7.10.2"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "chrome-launcher": {
+          "version": "0.13.4",
+          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "escape-string-regexp": "^1.0.5",
+            "is-wsl": "^2.2.0",
+            "lighthouse-logger": "^1.0.0",
+            "mkdirp": "^0.5.3",
+            "rimraf": "^3.0.2"
+          }
+        },
+        "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "color-name": "~1.1.4"
           }
-        }
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "dev": true,
-      "requires": {
-        "fill-range": "^2.1.0"
-      },
-      "dependencies": {
-        "fill-range": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "devtools": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
           "dev": true,
           "requires": {
-            "is-number": "^2.1.0",
-            "isobject": "^2.0.0",
-            "randomatic": "^3.0.0",
-            "repeat-element": "^1.1.2",
-            "repeat-string": "^1.5.2"
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "chrome-launcher": "^0.13.1",
+            "edge-paths": "^2.1.0",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "ua-parser-js": "^0.7.21",
+            "uuid": "^8.0.0"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "devtools-protocol": {
+          "version": "0.0.878340",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
           "dev": true
         },
-        "is-number": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "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": {
-            "kind-of": "^3.0.2"
+            "minimist": "^1.2.6"
           }
         },
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+        "puppeteer-core": {
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
           "dev": true,
           "requires": {
-            "isarray": "1.0.0"
+            "debug": "^4.1.0",
+            "devtools-protocol": "0.0.869402",
+            "extract-zip": "^2.0.0",
+            "https-proxy-agent": "^5.0.0",
+            "node-fetch": "^2.6.1",
+            "pkg-dir": "^4.2.0",
+            "progress": "^2.0.1",
+            "proxy-from-env": "^1.1.0",
+            "rimraf": "^3.0.2",
+            "tar-fs": "^2.0.0",
+            "unbzip2-stream": "^1.3.3",
+            "ws": "^7.2.3"
+          },
+          "dependencies": {
+            "devtools-protocol": {
+              "version": "0.0.869402",
+              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+              "dev": true
+            }
           }
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "has-flag": "^4.0.0"
+          }
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        },
+        "webdriverio": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+          "dev": true,
+          "requires": {
+            "@types/aria-query": "^4.2.1",
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/repl": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "archiver": "^5.0.0",
+            "aria-query": "^4.2.2",
+            "atob": "^2.1.2",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "devtools": "7.5.7",
+            "devtools-protocol": "^0.0.878340",
+            "fs-extra": "^10.0.0",
+            "get-port": "^5.1.1",
+            "grapheme-splitter": "^1.0.2",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isobject": "^3.0.2",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^3.0.4",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "resq": "^1.9.1",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^8.0.0",
+            "webdriver": "7.5.3"
           }
+        },
+        "ws": {
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "dev": true,
+          "requires": {}
         }
       }
     },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+    "@wdio/types": {
+      "version": "7.16.14",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.16.14.tgz",
+      "integrity": "sha512-AyNI9iBSos9xWBmiFAF3sBs6AJXO/55VppU/eeF4HRdbZMtMarnvMuahM+jlUrA3vJSmDW+ufelG0MT//6vrnw==",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1"
+        "@types/node": "^17.0.4",
+        "got": "^11.8.1"
       }
     },
-    "expect": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
-      "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
+    "@wdio/utils": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.5.3.tgz",
+      "integrity": "sha512-nlLDKr8v8abLOHCKroBwQkGPdCIxjID2MllgWX23xqkYZylM9RdwPBdL8osQt9m3rq2TxiPAT4OlbzNt2WtN6Q==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "ansi-styles": "^4.0.0",
-        "jest-get-type": "^25.2.6",
-        "jest-matcher-utils": "^25.5.0",
-        "jest-message-util": "^25.5.0",
-        "jest-regex-util": "^25.2.6"
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3"
       },
       "dependencies": {
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -8506,2305 +28943,2096 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
-    "expect-webdriverio": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-1.1.5.tgz",
-      "integrity": "sha512-+RL4Lkne+/z+o1G5Y0S5QuEXeICxt4jExhBSM2Jn/mrDwb+PZVKPM2Yd1OzLsKeCdQLtw4Oft6514Gp5GLgdZA==",
+    "@webassemblyjs/ast": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
       "dev": true,
       "requires": {
-        "expect": "^25.2.1",
-        "jest-matcher-utils": "^25.1.0"
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
       }
     },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "requires": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      }
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "dev": true
     },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
       "dev": true,
       "requires": {
-        "type": "^2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
-          "dev": true
-        }
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
       "dev": true
     },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
       "dev": true,
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
       }
     },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+    "@webassemblyjs/ieee754": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
       "dev": true,
       "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+    "@webassemblyjs/leb128": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
       "dev": true,
       "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
+        "@xtuc/long": "4.2.2"
       }
     },
-    "extract-zip": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.0.tgz",
-      "integrity": "sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg==",
+    "@webassemblyjs/utf8": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
       "dev": true,
       "requires": {
-        "@types/yauzl": "^2.9.1",
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
+      }
     },
-    "faker": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/faker/-/faker-3.1.0.tgz",
-      "integrity": "sha1-D5CPr05uwCUk5UpX5DLFwBPgjJ8=",
-      "dev": true
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
     },
-    "fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+    "@webassemblyjs/wast-printer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
       "dev": true,
       "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
+        "@webassemblyjs/ast": "1.11.1",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "fast-deep-equal": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+    "@xmldom/xmldom": {
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.8.tgz",
+      "integrity": "sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==",
       "dev": true
     },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
       "dev": true
     },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
-    "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-      "dev": true,
+    "abbrev": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+      "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "requires": {
-        "websocket-driver": ">=0.5.1"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
-    "fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+    "acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
-      "requires": {
-        "bser": "2.1.1"
-      }
+      "requires": {}
     },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+    "acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true
+    },
+    "aes-decrypter": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
+      "integrity": "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==",
       "dev": true,
       "requires": {
-        "pend": "~1.2.0"
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "global": "^4.4.0",
+        "pkcs7": "^1.0.4"
       }
     },
-    "fibers": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/fibers/-/fibers-4.0.3.tgz",
-      "integrity": "sha512-MW5VrDtTOLpKK7lzw4qD7Z9tXaAhdOmOED5RHzg3+HjUk+ibkjVW0Py2ERtdqgTXaerLkVkBy2AEmJiT6RMyzg==",
+    "agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
       "requires": {
-        "detect-libc": "^1.0.3"
+        "debug": "4"
       }
     },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+    "ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
-    "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+    "ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
-      }
+      "requires": {}
     },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
       "dev": true,
       "optional": true
     },
-    "filelist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz",
-      "integrity": "sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==",
+    "ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true
+    },
+    "ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
       "dev": true,
       "requires": {
-        "minimatch": "^3.0.4"
+        "ansi-wrap": "0.1.0"
       }
     },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-      "dev": true
-    },
-    "fileset": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
-      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+    "ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.3",
-        "minimatch": "^3.0.3"
+        "type-fest": "^0.21.3"
       }
     },
-    "filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
-      "dev": true
+    "ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
     },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
       "dev": true,
       "requires": {
-        "to-regex-range": "^5.0.1"
+        "ansi-wrap": "0.1.0"
       }
     },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
+        "color-convert": "^1.9.0"
       }
     },
-    "find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+    "ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dev": true,
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       }
     },
-    "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+    "append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==",
       "dev": true,
       "requires": {
-        "locate-path": "^2.0.0"
+        "buffer-equal": "^1.0.0"
       }
     },
-    "findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+    "archiver": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
+      "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
       "dev": true,
       "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
+        "archiver-utils": "^2.1.0",
+        "async": "^3.2.3",
+        "buffer-crc32": "^0.2.1",
+        "readable-stream": "^3.6.0",
+        "readdir-glob": "^1.0.0",
+        "tar-stream": "^2.2.0",
+        "zip-stream": "^4.1.0"
       },
       "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "async": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
           "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         }
       }
     },
-    "fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+    "archiver-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz",
+      "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.0",
+        "lazystream": "^1.0.0",
+        "lodash.defaults": "^4.2.0",
+        "lodash.difference": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.union": "^4.6.0",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^2.0.0"
       }
     },
-    "flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
-    "flat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
-      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
-        "is-buffer": "~2.0.3"
+        "sprintf-js": "~1.0.2"
       }
     },
-    "flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+    "aria-query": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
+        "deep-equal": "^2.0.5"
       }
     },
-    "flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-      "dev": true
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+    "arr-diff": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+          "dev": true
         }
       }
     },
-    "follow-redirects": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz",
-      "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==",
+    "arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==",
       "dev": true,
       "requires": {
-        "debug": "^3.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "make-iterator": "^1.0.0"
       }
     },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true
     },
-    "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+    "arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "make-iterator": "^1.0.0"
       }
     },
-    "foreachasync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
-      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=",
+    "arr-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
       "dev": true
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+    "array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
       "dev": true
     },
-    "fork-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
-      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=",
+    "array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
       "dev": true
     },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+    "array-from": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
+      "integrity": "sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg==",
+      "dev": true
     },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+    "array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
       "dev": true,
       "requires": {
-        "map-cache": "^0.2.2"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
       }
     },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
-    "from": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-      "dev": true
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+    "array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
+        "array-slice": "^1.0.0",
+        "is-number": "^4.0.0"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
         }
       }
     },
-    "fs-access": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+    "array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
       "dev": true,
       "requires": {
-        "null-check": "^1.0.0"
+        "is-number": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
       }
     },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+    "array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
       "dev": true
     },
-    "fs-extra": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
-      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
-      "dev": true,
-      "requires": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^1.0.0"
-      }
-    },
-    "fs-mkdirp-stream": {
+    "array-sort": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      }
-    },
-    "fs.extra": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz",
-      "integrity": "sha1-3QI/kwE77iRTHxszUUw3sg/ZM0k=",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
       "dev": true,
       "requires": {
-        "fs-extra": "~0.6.1",
-        "mkdirp": "~0.3.5",
-        "walk": "^2.3.9"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "0.6.4",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
-          "integrity": "sha1-9G8MdbeEH40gCzNIzU1pHVoJnRU=",
-          "dev": true,
-          "requires": {
-            "jsonfile": "~1.0.1",
-            "mkdirp": "0.3.x",
-            "ncp": "~0.4.2",
-            "rimraf": "~2.2.0"
-          }
-        },
-        "jsonfile": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
-          "integrity": "sha1-6l7+QLg2kLmGZ2FKc5L8YOhCwN0=",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
-          "dev": true
-        },
-        "rimraf": {
-          "version": "2.2.8",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
-          "dev": true
-        }
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
       }
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
       "dev": true
     },
-    "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-      "dev": true,
-      "optional": true
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true
     },
-    "fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+    "array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       }
     },
-    "fun-hooks": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/fun-hooks/-/fun-hooks-0.9.9.tgz",
-      "integrity": "sha512-821UhoYfO9Sg01wAl/QsDRB088BW0aeOqzC1PXLxSlB+kaUVbK+Vp6wMDHU5huZZopYxmMmv5jDkEYqDpK3hqg==",
+    "asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dev": true,
       "requires": {
-        "typescript-tuple": "^2.2.1"
+        "safer-buffer": "~2.1.0"
       }
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+    "assert": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
+      "integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
       "dev": true,
       "requires": {
-        "globule": "^1.0.0"
+        "es6-object-assign": "^1.1.0",
+        "is-nan": "^1.2.1",
+        "object-is": "^1.0.1",
+        "util": "^0.12.0"
       }
     },
-    "gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true
     },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
       "dev": true
     },
-    "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true
     },
-    "get-port": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
-      "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+    "async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
       "dev": true
     },
-    "get-stream": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-      "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+    "async-done": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
+      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
       "dev": true,
       "requires": {
-        "pump": "^3.0.0"
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
       }
     },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "git-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/git-up/-/git-up-2.1.0.tgz",
-      "integrity": "sha512-MJgwfcSd9qxgDyEYpRU/CDxNpUadrK80JHuEQDG4Urn0m7tpSOgCBrtiSIa9S9KH8Tbuo/TN8SSQmJBvsw1HkA==",
-      "dev": true,
-      "requires": {
-        "is-ssh": "^1.3.0",
-        "parse-url": "^3.0.2"
-      }
+    "async-exit-hook": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
+      "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
+      "dev": true
     },
-    "git-url-parse": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-8.3.1.tgz",
-      "integrity": "sha512-r/FxXIdfgdSO+V2zl4ZK1JGYkHT9nqVRSzom5WsYPLg3XzeBeKPl3R/6X9E9ZJRx/sE/dXwXtfl+Zp7YL8ktWQ==",
+    "async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
       "dev": true,
       "requires": {
-        "git-up": "^2.0.0",
-        "parse-domain": "^2.0.0"
+        "async-done": "^1.2.2"
       }
     },
-    "github-slugger": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz",
-      "integrity": "sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": ">=6.0.0 <=6.1.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz",
-          "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=",
-          "dev": true
-        }
-      }
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
     },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
     },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "dev": true,
-      "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^2.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        }
-      }
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true
     },
-    "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+      "dev": true
     },
-    "glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-      "dev": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          }
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
-      }
+    "aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
     },
-    "glob-watcher": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
       "requires": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "object.defaults": "^1.1.0"
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-              "dev": true
-            }
-          }
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "dev": true
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
           }
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
+          "dev": true
         },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
+            "ansi-regex": "^2.0.0"
           }
         },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+          "dev": true
+        }
+      }
+    },
+    "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": {
-            "binary-extensions": "^1.0.0"
+            "ms": "2.0.0"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
           "dev": true
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "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": {
+        "jsesc": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+          "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
+          "dev": true
+        }
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-loader": {
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
+      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^2.0.0",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      }
+    },
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "requires": {
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "semver": "^6.1.1"
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "core-js-compat": "^3.25.1"
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
+      "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
         },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+        "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": {
-            "remove-trailing-separator": "^1.0.1"
+            "minimist": "^1.2.6"
           }
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "dev": true,
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      },
+      "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
         },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+          "dev": true
+        }
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
+      "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": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
+      "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": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "ms": "2.0.0"
           }
         },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
+        "globals": {
+          "version": "9.18.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+          "dev": true
         },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
         }
       }
     },
-    "global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
       "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
+        "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": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
+          "dev": true
+        }
       }
     },
-    "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+    "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",
+      "integrity": "sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
+        "arr-filter": "^1.1.1",
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "array-each": "^1.0.0",
+        "array-initial": "^1.0.0",
+        "array-last": "^1.1.1",
+        "async-done": "^1.2.2",
+        "async-settle": "^1.0.0",
+        "now-and-later": "^2.0.0"
       }
     },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+    "bail": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
       "dev": true
     },
-    "globals-docs": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/globals-docs/-/globals-docs-2.4.1.tgz",
-      "integrity": "sha512-qpPnUKkWnz8NESjrCvnlGklsgiQzlq+rcCxoG5uNQ+dNA7cFMCmn231slLAwS2N/PlkzZ3COL8CcS10jXmLHqg==",
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "globule": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
-      "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.12",
-        "minimatch": "~3.0.2"
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        }
       }
     },
-    "glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "dev": true
+    },
+    "basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
-    "got": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.2.0.tgz",
-      "integrity": "sha512-68pBow9XXXSdVRV5wSx0kWMCZsag4xE3Ru0URVe0PWsSYmU4SJrUmEO6EVYFlFHc9rq/6Yqn6o1GxIb9torQxg==",
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "requires": {
-        "@sindresorhus/is": "^2.1.1",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.1",
-        "decompress-response": "^6.0.0",
-        "get-stream": "^5.1.0",
-        "http2-wrapper": "^1.0.0-beta.4.5",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
+        "tweetnacl": "^0.14.3"
       }
     },
-    "graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+    "beeper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
+      "integrity": "sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==",
+      "dev": true
+    },
+    "big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "dev": true
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true
     },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
+    "binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
+      "dev": true,
+      "requires": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      }
     },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+    "binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
-    "growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+    "binaryextensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz",
+      "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==",
       "dev": true
     },
-    "gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
       },
       "dependencies": {
-        "ansi-colors": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
-            "ansi-wrap": "^0.1.0"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+        }
+      }
+    },
+    "bluebird": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
+      "dev": true
+    },
+    "body": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+      "integrity": "sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==",
+      "dev": true,
+      "requires": {
+        "continuable-cache": "^0.3.1",
+        "error": "^7.0.0",
+        "raw-body": "~1.1.0",
+        "safe-json-parse": "~1.0.1"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+          "integrity": "sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==",
           "dev": true
         },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+        "raw-body": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+          "integrity": "sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "bytes": "1",
+            "string_decoder": "0.10"
           }
         },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
           "dev": true
-        },
-        "gulp-cli": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.1.tgz",
-          "integrity": "sha512-yEMxrXqY8mJFlaauFQxNrCpzWJThu0sH1sqlToaTOT063Hub9s/Nt2C+GSLe6feQ/IMWrHvGOOsyES7CQc9O+A==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "^1.0.1",
-            "archy": "^1.0.0",
-            "array-sort": "^1.0.0",
-            "color-support": "^1.1.3",
-            "concat-stream": "^1.6.0",
-            "copy-props": "^2.0.1",
-            "fancy-log": "^1.3.2",
-            "gulplog": "^1.0.0",
-            "interpret": "^1.1.0",
-            "isobject": "^3.0.1",
-            "liftoff": "^3.1.0",
-            "matchdep": "^2.0.0",
-            "mute-stdout": "^1.0.0",
-            "pretty-hrtime": "^1.0.0",
-            "replace-homedir": "^1.0.0",
-            "semver-greatest-satisfied-range": "^1.1.0",
-            "v8flags": "^3.0.1",
-            "yargs": "^7.1.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
+        }
+      }
+    },
+    "body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "requires": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "ms": "2.0.0"
           }
         },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "browserslist": {
+      "version": "4.21.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "requires": {
+        "caniuse-lite": "^1.0.30001400",
+        "electron-to-chromium": "^1.4.251",
+        "node-releases": "^2.0.6",
+        "update-browserslist-db": "^1.0.9"
+      }
+    },
+    "browserstack": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz",
+      "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "^2.2.1"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
           "dev": true,
           "requires": {
-            "lcid": "^1.0.0"
+            "es6-promisify": "^5.0.0"
           }
         },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "ms": "^2.1.1"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+        "https-proxy-agent": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "agent-base": "^4.3.0",
+            "debug": "^3.1.0"
           }
-        },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+        }
+      }
+    },
+    "browserstack-local": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.5.1.tgz",
+      "integrity": "sha512-T/wxyWDzvBHbDvl7fZKpFU7mYze6nrUkBhNy+d+8bXBqgQX10HTYvajIGO0wb49oGSLCPM0CMZTV/s7e6LF0sA==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^6.0.2",
+        "https-proxy-agent": "^5.0.1",
+        "is-running": "^2.1.0",
+        "ps-tree": "=1.2.0",
+        "temp-fs": "^0.9.9"
+      }
+    },
+    "browserstacktunnel-wrapper": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.5.tgz",
+      "integrity": "sha512-oociT3nl+FhQnyJbAb1RM4oQ5pN7aKeXEURkTkiEVm/Rji2r0agl3Wbw5V23VFn9lCU5/fGyDejRZPtGYsEcFw==",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "^2.2.1",
+        "unzipper": "^0.9.3"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
+            "es6-promisify": "^5.0.0"
           }
         },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
-          "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "5.0.0-security.0"
+            "ms": "^2.1.1"
           }
         },
-        "yargs-parser": {
-          "version": "5.0.0-security.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
-          "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
+        "https-proxy-agent": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0",
-            "object.assign": "^4.1.0"
+            "agent-base": "^4.3.0",
+            "debug": "^3.1.0"
           }
         }
       }
     },
-    "gulp-clean": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.3.2.tgz",
-      "integrity": "sha1-o0fUc6zqQBgvk1WHpFGUFnGSgQI=",
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true
+    },
+    "buffer-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
+      "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+      "dev": true
+    },
+    "buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+    },
+    "cac": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
+      "integrity": "sha512-hq4rxE3NT5PlaEiVV39Z45d6MoFcQZG5dsgJqtAUeOz3408LEQAElToDkf9i5IYSCOmK0If/81dLg7nKxqPR0w==",
       "dev": true,
       "requires": {
-        "gulp-util": "^2.2.14",
-        "rimraf": "^2.2.8",
-        "through2": "^0.4.2"
+        "camelcase-keys": "^3.0.0",
+        "chalk": "^1.1.3",
+        "indent-string": "^3.0.0",
+        "minimist": "^1.2.0",
+        "read-pkg-up": "^1.0.1",
+        "suffix": "^0.1.0",
+        "text-table": "^0.2.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
         "ansi-styles": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
           "dev": true
         },
         "chalk": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^1.1.0",
-            "escape-string-regexp": "^1.0.0",
-            "has-ansi": "^0.1.0",
-            "strip-ansi": "^0.3.0",
-            "supports-color": "^0.2.0"
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
           }
         },
-        "clone-stats": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "hosted-git-info": {
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
           "dev": true
         },
-        "gulp-util": {
-          "version": "2.2.20",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-          "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
           "dev": true,
           "requires": {
-            "chalk": "^0.5.0",
-            "dateformat": "^1.0.7-1.2.3",
-            "lodash._reinterpolate": "^2.4.1",
-            "lodash.template": "^2.4.1",
-            "minimist": "^0.2.0",
-            "multipipe": "^0.1.0",
-            "through2": "^0.5.0",
-            "vinyl": "^0.2.1"
-          },
-          "dependencies": {
-            "through2": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-              "dev": true,
-              "requires": {
-                "readable-stream": "~1.0.17",
-                "xtend": "~3.0.0"
-              }
-            }
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
           }
         },
-        "has-ansi": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^0.2.0"
+            "pinkie-promise": "^2.0.0"
           }
         },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "minimist": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz",
-          "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==",
-          "dev": true
-        },
-        "object-keys": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-          "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^0.2.1"
+            "find-up": "^1.0.0",
+            "read-pkg": "^1.0.0"
           }
         },
-        "supports-color": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
-        "through2": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~2.1.1"
-          },
-          "dependencies": {
-            "xtend": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-              "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-              "dev": true,
-              "requires": {
-                "object-keys": "~0.4.0"
-              }
-            }
+            "ansi-regex": "^2.0.0"
           }
         },
-        "vinyl": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-          "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+          "dev": true
+        }
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "dev": true
+    },
+    "cacheable-request": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
+      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "dev": true,
+      "requires": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
           "dev": true,
           "requires": {
-            "clone-stats": "~0.0.1"
+            "pump": "^3.0.0"
           }
-        },
-        "xtend": {
+        }
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
+      "integrity": "sha512-U4E6A6aFyYnNW+tDt5/yIUKQURKXe3WMFPfX4FxrQFcwZ/R08AUk1xWcUtlr7oq6CV07Ji+aa69V2g7BSpblnQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
           "dev": true
         }
       }
     },
-    "gulp-concat": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+    "can-autoplay": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
+      "integrity": "sha512-Ih6wc7yJB4TylS/mLyAW0Dj5Nh3Gftq/g966TcxgvpNCOzlbqTs85srAq7mwIspo4w8gnLCVVGroyCHfh6l9aA==",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001429",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz",
+      "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg=="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "dev": true
+    },
+    "ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "dev": true
+    },
+    "chai": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      }
+    },
+    "chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
+      "dev": true,
+      "requires": {
+        "traverse": ">=0.3.0 <0.4"
+      }
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "character-entities": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+      "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
+      "dev": true
+    },
+    "character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "dev": true
+    },
+    "character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
       "requires": {
-        "concat-with-sourcemaps": "^1.0.0",
-        "through2": "^2.0.0",
-        "vinyl": "^2.0.0"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
       }
     },
-    "gulp-connect": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.7.0.tgz",
-      "integrity": "sha512-8tRcC6wgXMLakpPw9M7GRJIhxkYdgZsXwn7n56BA2bQYGLR9NOPhMzx7js+qYDy6vhNkbApGKURjAw1FjY4pNA==",
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "chrome-launcher": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.1.tgz",
+      "integrity": "sha512-UugC8u59/w2AyX5sHLZUHoxBAiSiunUhZa3zZwMH6zPVis0C3dDKiRWyUGIo14tTbZHGVviWxv3PQWZ7taZ4fg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^2.0.5",
-        "connect": "^3.6.6",
-        "connect-livereload": "^0.6.0",
-        "fancy-log": "^1.3.2",
-        "map-stream": "^0.0.7",
-        "send": "^0.16.2",
-        "serve-index": "^1.9.1",
-        "serve-static": "^1.13.2",
-        "tiny-lr": "^1.1.1"
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0"
       },
       "dependencies": {
-        "ansi-colors": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
-          "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==",
-          "dev": true
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "map-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-          "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-          "dev": true
-        },
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-          "dev": true
-        },
-        "send": {
-          "version": "0.16.2",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-          "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-          "dev": true,
-          "requires": {
-            "debug": "2.6.9",
-            "depd": "~1.1.2",
-            "destroy": "~1.0.4",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "etag": "~1.8.1",
-            "fresh": "0.5.2",
-            "http-errors": "~1.6.2",
-            "mime": "1.4.1",
-            "ms": "2.0.0",
-            "on-finished": "~2.3.0",
-            "range-parser": "~1.2.0",
-            "statuses": "~1.4.0"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         }
       }
     },
-    "gulp-eslint": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-4.0.2.tgz",
-      "integrity": "sha512-fcFUQzFsN6dJ6KZlG+qPOEkqfcevRUXgztkYCvhNvJeSvOicC8ucutN4qR/ID8LmNZx9YPIkBzazTNnVvbh8wg==",
-      "dev": true,
-      "requires": {
-        "eslint": "^4.0.0",
-        "fancy-log": "^1.3.2",
-        "plugin-error": "^1.0.0"
-      }
+    "chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
     },
-    "gulp-footer": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-footer/-/gulp-footer-2.0.2.tgz",
-      "integrity": "sha512-HsG5VOgKHFRqZXnHGI6oGhPDg70p9pobM+dYOnjBZVLMQUHzLG6bfaPNRJ7XG707E+vWO3TfN0CND9UrYhk94g==",
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.6.2",
-        "map-stream": "0.0.7"
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
       },
       "dependencies": {
-        "lodash._reinterpolate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
           "dev": true
         },
-        "lodash.escape": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-          "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-          "dev": true,
-          "requires": {
-            "lodash._root": "^3.0.0"
-          }
-        },
-        "lodash.keys": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-          "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-          "dev": true,
-          "requires": {
-            "lodash._getnative": "^3.0.0",
-            "lodash.isarguments": "^3.0.0",
-            "lodash.isarray": "^3.0.0"
-          }
-        },
-        "lodash.template": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-          "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
-            "lodash._basecopy": "^3.0.0",
-            "lodash._basetostring": "^3.0.0",
-            "lodash._basevalues": "^3.0.0",
-            "lodash._isiterateecall": "^3.0.0",
-            "lodash._reinterpolate": "^3.0.0",
-            "lodash.escape": "^3.0.0",
-            "lodash.keys": "^3.0.0",
-            "lodash.restparam": "^3.0.0",
-            "lodash.templatesettings": "^3.0.0"
+            "is-descriptor": "^0.1.0"
           }
         },
-        "lodash.templatesettings": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
           "dev": true,
           "requires": {
-            "lodash._reinterpolate": "^3.0.0",
-            "lodash.escape": "^3.0.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "map-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-          "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-          "dev": true
-        }
-      }
-    },
-    "gulp-header": {
-      "version": "1.8.12",
-      "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-1.8.12.tgz",
-      "integrity": "sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==",
-      "dev": true,
-      "requires": {
-        "concat-with-sourcemaps": "*",
-        "lodash.template": "^4.4.0",
-        "through2": "^2.0.0"
-      },
-      "dependencies": {
-        "lodash._reinterpolate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
-        "lodash.template": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-          "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
           "dev": true,
           "requires": {
-            "lodash._reinterpolate": "^3.0.0",
-            "lodash.templatesettings": "^4.0.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "lodash.templatesettings": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-          "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
-            "lodash._reinterpolate": "^3.0.0"
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
           }
         }
       }
     },
-    "gulp-if": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz",
-      "integrity": "sha1-pJe351cwBQQcqivIt92jyARE1ik=",
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
       "requires": {
-        "gulp-match": "^1.0.3",
-        "ternary-stream": "^2.0.1",
-        "through2": "^2.0.1"
+        "restore-cursor": "^3.1.0"
       }
     },
-    "gulp-js-escape": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gulp-js-escape/-/gulp-js-escape-1.0.1.tgz",
-      "integrity": "sha1-HNRF+9AJ4Np2lZoDp/SbNWav+Gg=",
+    "cli-spinners": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
+      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
+      "dev": true
+    },
+    "cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true
+    },
+    "cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "requires": {
-        "through2": "^0.6.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       }
     },
-    "gulp-match": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
-      "integrity": "sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ==",
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "dev": true
+    },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
+      "dev": true
+    },
+    "clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
       "dev": true,
       "requires": {
-        "minimatch": "^3.0.3"
+        "mimic-response": "^1.0.0"
       }
     },
-    "gulp-replace": {
+    "clone-stats": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.0.0.tgz",
-      "integrity": "sha512-lgdmrFSI1SdhNMXZQbrC75MOl1UjYWlOWNbNRnz+F/KHmgxt3l6XstBoAYIdadwETFyG/6i+vWUSCawdC3pqOw==",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
+      "dev": true
+    },
+    "cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
       "dev": true,
       "requires": {
-        "istextorbinary": "2.2.1",
-        "readable-stream": "^2.0.1",
-        "replacestream": "^4.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
       }
     },
-    "gulp-shell": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.5.2.tgz",
-      "integrity": "sha1-pJWcoGUa0ce7/nCy0K27tOGuqY0=",
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+      "dev": true
+    },
+    "collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==",
       "dev": true,
       "requires": {
-        "async": "^1.5.0",
-        "gulp-util": "^3.0.7",
-        "lodash": "^4.0.0",
-        "through2": "^2.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        }
+        "arr-map": "^2.0.2",
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
       }
     },
-    "gulp-sourcemaps": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz",
-      "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==",
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
       "requires": {
-        "@gulp-sourcemaps/identity-map": "1.X",
-        "@gulp-sourcemaps/map-sources": "1.X",
-        "acorn": "5.X",
-        "convert-source-map": "1.X",
-        "css": "2.X",
-        "debug-fabulous": "1.X",
-        "detect-newline": "2.X",
-        "graceful-fs": "4.X",
-        "source-map": "~0.6.0",
-        "strip-bom-string": "1.X",
-        "through2": "2.X"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
       }
     },
-    "gulp-uglify": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz",
-      "integrity": "sha512-gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg==",
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
-        "array-each": "^1.0.1",
-        "extend-shallow": "^3.0.2",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "isobject": "^3.0.1",
-        "make-error-cause": "^1.1.1",
-        "safe-buffer": "^5.1.2",
-        "through2": "^2.0.0",
-        "uglify-js": "^3.0.5",
-        "vinyl-sourcemaps-apply": "^0.2.0"
+        "delayed-stream": "~1.0.0"
       }
     },
-    "gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+    "comma-separated-tokens": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "compress-commons": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",
+      "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
       "dev": true,
       "requires": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
+        "buffer-crc32": "^0.2.13",
+        "crc32-stream": "^4.0.2",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^3.6.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "clone-stats": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-          "dev": true
-        },
-        "dateformat": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-          "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-          "dev": true
-        },
-        "lodash._reinterpolate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-          "dev": true
-        },
-        "lodash.escape": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-          "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-          "dev": true,
-          "requires": {
-            "lodash._root": "^3.0.0"
-          }
-        },
-        "lodash.keys": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-          "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-          "dev": true,
-          "requires": {
-            "lodash._getnative": "^3.0.0",
-            "lodash.isarguments": "^3.0.0",
-            "lodash.isarray": "^3.0.0"
-          }
-        },
-        "lodash.template": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-          "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-          "dev": true,
-          "requires": {
-            "lodash._basecopy": "^3.0.0",
-            "lodash._basetostring": "^3.0.0",
-            "lodash._basevalues": "^3.0.0",
-            "lodash._isiterateecall": "^3.0.0",
-            "lodash._reinterpolate": "^3.0.0",
-            "lodash.escape": "^3.0.0",
-            "lodash.keys": "^3.0.0",
-            "lodash.restparam": "^3.0.0",
-            "lodash.templatesettings": "^3.0.0"
-          }
-        },
-        "lodash.templatesettings": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "^3.0.0",
-            "lodash.escape": "^3.0.0"
-          }
-        },
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-          "dev": true
-        },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        },
-        "vinyl": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
-            "clone": "^1.0.0",
-            "clone-stats": "^0.0.1",
-            "replace-ext": "0.0.1"
-          }
-        }
-      }
-    },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "requires": {
-        "glogg": "^1.0.0"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
-    "gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
-    "handlebars": {
-      "version": "4.7.6",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
-      "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
+    "concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4",
-        "wordwrap": "^1.0.0"
+        "source-map": "^0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -10815,528 +31043,622 @@
         }
       }
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+    "connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "ms": "2.0.0"
+          }
+        },
+        "finalhandler": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "statuses": "~1.5.0",
+            "unpipe": "~1.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
           }
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+          "dev": true
         }
       }
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
+    "connect-livereload": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.6.1.tgz",
+      "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
+      "dev": true
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
+    "content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
+        "safe-buffer": "5.2.1"
       }
     },
-    "has-binary2": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-      "dev": true,
-      "requires": {
-        "isarray": "2.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-          "dev": true
-        }
-      }
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
-    "has-cors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+    "continuable-cache": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+      "integrity": "sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==",
       "dev": true
     },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
+    "cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
       "dev": true
     },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+    "copy-props": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
       "dev": true,
       "requires": {
-        "sparkles": "^1.0.0"
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
       }
     },
-    "has-symbol-support-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
-      "dev": true
+    "core-js": {
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
+      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="
     },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+    "core-js-compat": {
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
+      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
+      "requires": {
+        "browserslist": "^4.21.4"
+      }
     },
-    "has-to-string-tag-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
-      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+    "core-js-pure": {
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.0.tgz",
+      "integrity": "sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA=="
+    },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
       "dev": true,
       "requires": {
-        "has-symbol-support-x": "^1.4.1"
+        "object-assign": "^4",
+        "vary": "^1"
       }
     },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+    "coveralls": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.1.tgz",
+      "integrity": "sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==",
       "dev": true,
       "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "js-yaml": "^3.13.1",
+        "lcov-parse": "^1.0.0",
+        "log-driver": "^1.2.7",
+        "minimist": "^1.2.5",
+        "request": "^2.88.2"
       }
     },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+    "crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "dev": true
+    },
+    "crc32-stream": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz",
+      "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "crc-32": "^1.2.0",
+        "readable-stream": "^3.4.0"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         }
       }
     },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "dev": true
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
+    "criteo-direct-rsa-validate": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
+      "integrity": "sha512-7gQ3zX+d+hS/vOxzLrZ4aRAceB7qNJ0VzaGNpcWjDCmtOpASB50USJDupTik/H2nHgiSAA3VNZ3SFuONs8LR9Q=="
     },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+    "cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
+        "node-fetch": "2.6.7"
       }
     },
-    "hast-util-is-element": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.4.tgz",
-      "integrity": "sha512-NFR6ljJRvDcyPP5SbV7MyPBgF47X3BsskLnmw1U34yL+X6YC0MoBx9EyMg8Jtx4FzGH95jw8+c1VPLHaRA0wDQ==",
-      "dev": true
-    },
-    "hast-util-sanitize": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz",
-      "integrity": "sha512-AIeKHuHx0Wk45nSkGVa2/ujQYTksnDl8gmmKo/mwQi7ag7IBZ8cM3nJ2G86SajbjGP/HRpud6kMkPtcM2i0Tlw==",
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "requires": {
-        "xtend": "^4.0.1"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
-    "hast-util-to-html": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-3.1.0.tgz",
-      "integrity": "sha1-iCyZhJ5AEw6ZHAQuRW1FPZXDbP8=",
+    "crypto-js": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
+      "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+    },
+    "css": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
       "dev": true,
       "requires": {
-        "ccount": "^1.0.0",
-        "comma-separated-tokens": "^1.0.1",
-        "hast-util-is-element": "^1.0.0",
-        "hast-util-whitespace": "^1.0.0",
-        "html-void-elements": "^1.0.0",
-        "kebab-case": "^1.0.0",
-        "property-information": "^3.1.0",
-        "space-separated-tokens": "^1.0.0",
-        "stringify-entities": "^1.0.1",
-        "unist-util-is": "^2.0.0",
-        "xtend": "^4.0.1"
+        "inherits": "^2.0.4",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.6.0"
       },
       "dependencies": {
-        "unist-util-is": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz",
-          "integrity": "sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
-    "hast-util-whitespace": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz",
-      "integrity": "sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==",
+    "css-shorthand-properties": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz",
+      "integrity": "sha512-Md+Juc7M3uOdbAFwOYlTrccIZ7oCFuzrhKYQjdeUEW/sE1hv17Jp/Bws+ReOPpGVBTYCBoYo+G17V5Qo8QQ75A==",
       "dev": true
     },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+    "css-value": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
+      "integrity": "sha512-FUV3xaJ63buRLgHrLQVlVgQnQdR4yqdLGaDu7g8CQcWjInDfM9plBTPI9FRfpahju1UBSaMckeb2/46ApS/V1Q==",
       "dev": true
     },
-    "highlight.js": {
-      "version": "9.18.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz",
-      "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==",
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
       "dev": true
     },
-    "hmac-drbg": {
+    "d": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "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=",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
       "dev": true,
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.1"
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
       }
     },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "requires": {
-        "parse-passwd": "^1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
-    "hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+    "date-format": {
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
       "dev": true
     },
-    "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+    "dateformat": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==",
       "dev": true
     },
-    "html-encoding-sniffer": {
+    "de-indent": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
       "dev": true,
+      "optional": true
+    },
+    "debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
-        "whatwg-encoding": "^1.0.1"
+        "ms": "2.1.2"
       }
     },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "html-void-elements": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
-      "integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==",
-      "dev": true
+    "debug-fabulous": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz",
+      "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==",
+      "dev": true,
+      "requires": {
+        "debug": "3.X",
+        "memoizee": "0.4.X",
+        "object-assign": "4.X"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
     },
-    "http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+    "decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
       "dev": true
     },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+    "decode-named-character-reference": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz",
+      "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==",
+      "dev": true,
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "character-entities": "^2.0.0"
       }
     },
-    "http-parser-js": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz",
-      "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==",
+    "decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true
     },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+    "decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
       "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
+        "mimic-response": "^3.1.0"
+      },
+      "dependencies": {
+        "mimic-response": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+          "dev": true
+        }
       }
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "type-detect": "^4.0.0"
       }
     },
-    "http2-wrapper": {
-      "version": "1.0.0-beta.4.6",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.4.6.tgz",
-      "integrity": "sha512-9oB4BiGDTI1FmIBlOF9OJ5hwJvcBEmPCqk/hy314Uhy2uq5TjekUZM8w8SPLLlUEM+mxNhXdPAXfrJN2Zbb/GQ==",
+    "deep-equal": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
+      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
       "dev": true,
       "requires": {
-        "quick-lru": "^5.0.0",
-        "resolve-alpn": "^1.0.0"
+        "call-bind": "^1.0.0",
+        "es-get-iterator": "^1.1.1",
+        "get-intrinsic": "^1.0.1",
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.2",
+        "is-regex": "^1.1.1",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.4",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.3.0",
+        "side-channel": "^1.0.3",
+        "which-boxed-primitive": "^1.0.1",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "https-browserify": {
+    "deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
+    },
+    "default-compare": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^5.0.2"
+      }
+    },
+    "default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==",
       "dev": true
     },
-    "https-proxy-agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
-      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+    "defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
       "requires": {
-        "agent-base": "5",
-        "debug": "4"
+        "clone": "^1.0.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "clone": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+          "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
           "dev": true
         }
       }
     },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+    "defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
       "dev": true
     },
-    "ignore": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-      "dev": true
+    "define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "requires": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      }
     },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
       }
     },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true
     },
-    "indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+    "depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+    },
+    "dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "dev": true
     },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+    "destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
       "dev": true
     },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
       "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "repeating": "^2.0.0"
       }
     },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true
     },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+    "detect-newline": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+      "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==",
       "dev": true
     },
-    "inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
+    "devtools": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.25.4.tgz",
+      "integrity": "sha512-R6/S/dCqxoX4Y6PxIGM9JFAuSRZzUeV5r+CoE/frhmno6mTe7dEEgwkJlfit3LkKRoul8n4DsL2A3QtWOvq5IA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^18.0.0",
+        "@types/ua-parser-js": "^0.7.33",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "chrome-launcher": "^0.15.0",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^13.1.3",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^1.0.1",
+        "uuid": "^9.0.0"
       },
       "dependencies": {
+        "@types/node": {
+          "version": "18.11.9",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+          "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+          "dev": true
+        },
+        "@wdio/config": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
+          "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.19.0",
+            "@wdio/types": "7.25.4",
+            "@wdio/utils": "7.25.4",
+            "deepmerge": "^4.0.0",
+            "glob": "^8.0.3"
+          }
+        },
+        "@wdio/logger": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
+          "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/protocols": {
+          "version": "7.22.0",
+          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
+          "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
+          "dev": true
+        },
+        "@wdio/types": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+          "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^18.0.0",
+            "got": "^11.8.1"
+          }
+        },
+        "@wdio/utils": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
+          "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.19.0",
+            "@wdio/types": "7.25.4",
+            "p-iteration": "^1.1.8"
+          }
+        },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -11358,1184 +31680,1297 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "glob": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "ua-parser-js": {
+          "version": "1.0.32",
+          "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz",
+          "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==",
+          "dev": true
+        },
+        "uuid": {
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+          "dev": true
         }
       }
     },
-    "interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+    "devtools-protocol": {
+      "version": "0.0.1061995",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1061995.tgz",
+      "integrity": "sha512-pKZZWTjWa/IF4ENCg6GN8bu/AxSZgdhjSa26uc23wz38Blt2Tnm9icOPcSG3Cht55rMq35in1w3rWVPcZ60ArA==",
       "dev": true
     },
-    "into-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
-      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
-      "dev": true,
-      "requires": {
-        "from2": "^2.1.1",
-        "p-is-promise": "^1.1.0"
-      }
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
+      "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"
-      }
+    "diff": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+      "dev": true
     },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+    "diff-sequences": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+    "dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
     },
-    "is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
+        "esutils": "^2.0.2"
       }
     },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+    "doctrine-temporary-fork": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz",
+      "integrity": "sha512-nliqOv5NkE4zMON4UA6AMJE6As35afs8aYXATpU4pTUdIKiARZwrJVEP1boA3Rx1ZXHVkwxkhcq4VkqvsuRLsA==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "esutils": "^2.0.2"
+      }
+    },
+    "documentation": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.1.tgz",
+      "integrity": "sha512-Y/brACCE3sNnDJPFiWlhXrqGY+NelLYVZShLGse5bT1KdohP4JkPf5T2KNq1YWhIEbDYl/1tebRLC0WYbPQxVw==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.18.10",
+        "@babel/generator": "^7.18.10",
+        "@babel/parser": "^7.18.11",
+        "@babel/traverse": "^7.18.11",
+        "@babel/types": "^7.18.10",
+        "@vue/compiler-sfc": "^3.2.37",
+        "chalk": "^5.0.1",
+        "chokidar": "^3.5.3",
+        "diff": "^5.1.0",
+        "doctrine-temporary-fork": "2.1.0",
+        "git-url-parse": "^13.1.0",
+        "github-slugger": "1.4.0",
+        "glob": "^8.0.3",
+        "globals-docs": "^2.4.1",
+        "highlight.js": "^11.6.0",
+        "ini": "^3.0.0",
+        "js-yaml": "^4.1.0",
+        "konan": "^2.1.1",
+        "lodash": "^4.17.21",
+        "mdast-util-find-and-replace": "^2.2.1",
+        "mdast-util-inject": "^1.1.0",
+        "micromark-util-character": "^1.1.0",
+        "parse-filepath": "^1.0.2",
+        "pify": "^6.0.0",
+        "read-pkg-up": "^9.1.0",
+        "remark": "^14.0.2",
+        "remark-gfm": "^3.0.1",
+        "remark-html": "^15.0.1",
+        "remark-reference-links": "^6.0.1",
+        "remark-toc": "^8.0.1",
+        "resolve": "^1.22.1",
+        "strip-json-comments": "^5.0.0",
+        "unist-builder": "^3.0.0",
+        "unist-util-visit": "^4.1.0",
+        "vfile": "^5.3.4",
+        "vfile-reporter": "^7.0.4",
+        "vfile-sort": "^3.0.0",
+        "vue-template-compiler": "^2.7.8",
+        "yargs": "^17.5.1"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
           "dev": true
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "chalk": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
+          "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
+          "dev": true
+        },
+        "glob": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "yargs": {
+          "version": "17.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+          "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+          "dev": true,
+          "requires": {
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.0.0"
           }
         }
       }
     },
-    "is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true
-    },
-    "is-alphanumeric": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-      "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=",
-      "dev": true
-    },
-    "is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
       "dev": true,
       "requires": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
       }
     },
-    "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+    "dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
       "dev": true
     },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
+    "dset": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
+      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q=="
     },
-    "is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
+    "duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
-    "is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
-    },
-    "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+    "duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
       "dev": true,
       "requires": {
-        "ci-info": "^2.0.0"
+        "readable-stream": "~1.1.9"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        }
       }
     },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+    "duplexify": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
+      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "end-of-stream": "^1.4.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1",
+        "stream-shift": "^1.0.0"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         }
       }
     },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
-    },
-    "is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+    "each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "is-plain-object": "^2.0.1",
+        "object.defaults": "^1.1.0"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
         }
       }
     },
-    "is-docker": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz",
-      "integrity": "sha1-8EN01O7lMQ6ajhE78UlUEeRhdqE=",
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true
     },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true
+    "easy-table": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz",
+      "integrity": "sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1",
+        "wcwidth": "^1.0.1"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
     },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+    "edge-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-2.2.1.tgz",
+      "integrity": "sha512-AI5fC7dfDmCdKo3m5y7PkYE8m6bMqR6pvVpgtrZkkhcJXFLelUgkjrhk3kXXx8Kbw2cRaTT4LkOR7hqf39KJdw==",
       "dev": true,
       "requires": {
-        "is-primitive": "^2.0.0"
+        "@types/which": "^1.3.2",
+        "which": "^2.0.2"
       }
     },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+    "ejs": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
       "dev": true,
       "requires": {
-        "is-extglob": "^2.1.1"
+        "jake": "^10.8.5"
       }
     },
-    "is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "dev": true
-    },
-    "is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "dev": true
+    "electron-to-chromium": {
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
     },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
-    "is-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+    "emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true
     },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.1"
+        "once": "^1.4.0"
       }
     },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
+    "engine.io": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
+      "dev": true,
+      "requires": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.3",
+        "ws": "~8.2.3"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+          "dev": true
+        }
+      }
     },
-    "is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+    "engine.io-parser": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
+      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
       "dev": true
     },
-    "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+    "enhanced-resolve": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
+      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+      "dev": true,
       "requires": {
-        "has": "^1.0.3"
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       }
     },
-    "is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "dev": true,
       "requires": {
-        "is-unc-path": "^1.0.0"
+        "ansi-colors": "^4.1.1"
       }
     },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
-    "is-retry-allowed": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
       "dev": true
     },
-    "is-running": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
-      "integrity": "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=",
-      "dev": true
+    "errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
     },
-    "is-ssh": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.1.tgz",
-      "integrity": "sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==",
+    "error": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
+      "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
       "dev": true,
       "requires": {
-        "protocols": "^1.1.0"
+        "string-template": "~0.2.1"
       }
     },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
     },
-    "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true
+    "es-abstract": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      }
     },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+    "es-get-iterator": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
+      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
+      "dev": true,
       "requires": {
-        "has-symbols": "^1.0.1"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.0",
+        "has-symbols": "^1.0.1",
+        "is-arguments": "^1.1.0",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.5",
+        "isarray": "^2.0.5"
       }
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+    "es-module-lexer": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
       "dev": true
     },
-    "is-unc-path": {
+    "es-shim-unscopables": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
       "dev": true,
       "requires": {
-        "unc-path-regex": "^0.1.2"
+        "has": "^1.0.3"
       }
     },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
     },
-    "is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-      "dev": true
+    "es5-ext": {
+      "version": "0.10.62",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "next-tick": "^1.1.0"
+      }
     },
-    "is-whitespace-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-      "integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
+    "es5-shim": {
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.7.tgz",
+      "integrity": "sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==",
       "dev": true
     },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-object-assign": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
+      "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
       "dev": true
     },
-    "is-word-character": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-      "integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
       "dev": true
     },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==",
       "dev": true,
       "requires": {
-        "is-docker": "^2.0.0"
-      },
-      "dependencies": {
-        "is-docker": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-          "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
-          "dev": true
-        }
+        "es6-promise": "^4.0.3"
       }
     },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+    "es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
+      "requires": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
     },
-    "isbinaryfile": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+    "es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
       "dev": true,
       "requires": {
-        "buffer-alloc": "^1.2.0"
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
       }
     },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
     },
-    "istanbul": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+    "escodegen": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==",
       "dev": true,
       "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
+        "esprima": "^2.7.1",
+        "estraverse": "^1.9.1",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.2.0"
       },
       "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "escodegen": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-          "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-          "dev": true,
-          "requires": {
-            "esprima": "^2.7.1",
-            "estraverse": "^1.9.1",
-            "esutils": "^2.0.2",
-            "optionator": "^0.8.1",
-            "source-map": "~0.2.0"
-          }
-        },
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
         "estraverse": {
           "version": "1.9.3",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+          "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
           "dev": true
         },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+        "levn": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
           "dev": true,
           "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2"
           }
         },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
+        "optionator": {
+          "version": "0.8.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+          "dev": true,
+          "requires": {
+            "deep-is": "~0.1.3",
+            "fast-levenshtein": "~2.0.6",
+            "levn": "~0.3.0",
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2",
+            "word-wrap": "~1.2.3"
+          }
         },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+        "prelude-ls": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
           "dev": true
         },
         "source-map": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+          "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
           "dev": true,
           "optional": true,
           "requires": {
             "amdefine": ">=0.0.4"
           }
         },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+        "type-check": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "prelude-ls": "~1.1.2"
           }
         }
       }
     },
-    "istanbul-api": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.7.tgz",
-      "integrity": "sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==",
+    "eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "dev": true,
       "requires": {
-        "async": "^2.1.4",
-        "fileset": "^2.0.2",
-        "istanbul-lib-coverage": "^1.2.1",
-        "istanbul-lib-hook": "^1.2.2",
-        "istanbul-lib-instrument": "^1.10.2",
-        "istanbul-lib-report": "^1.1.5",
-        "istanbul-lib-source-maps": "^1.2.6",
-        "istanbul-reports": "^1.5.1",
-        "js-yaml": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "once": "^1.4.0"
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+        "@babel/code-frame": {
+          "version": "7.12.11",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.14"
+            "@babel/highlight": "^7.10.4"
           }
         },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "color-convert": "^2.0.1"
           }
         },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "istanbul-lib-coverage": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-          "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
-          "dev": true
-        },
-        "istanbul-lib-instrument": {
-          "version": "1.10.2",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-          "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "babel-generator": "^6.18.0",
-            "babel-template": "^6.16.0",
-            "babel-traverse": "^6.18.0",
-            "babel-types": "^6.18.0",
-            "babylon": "^6.18.0",
-            "istanbul-lib-coverage": "^1.2.1",
-            "semver": "^5.3.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "istanbul-lib-report": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz",
-          "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "istanbul-lib-coverage": "^1.2.1",
-            "mkdirp": "^0.5.1",
-            "path-parse": "^1.0.5",
-            "supports-color": "^3.1.2"
+            "color-name": "~1.1.4"
           }
         },
-        "istanbul-lib-source-maps": {
-          "version": "1.2.6",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz",
-          "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
-          "dev": true,
-          "requires": {
-            "debug": "^3.1.0",
-            "istanbul-lib-coverage": "^1.2.1",
-            "mkdirp": "^0.5.1",
-            "rimraf": "^2.6.1",
-            "source-map": "^0.5.3"
-          }
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         },
-        "istanbul-reports": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.5.1.tgz",
-          "integrity": "sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==",
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "globals": {
+          "version": "13.17.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
           "dev": true,
           "requires": {
-            "handlebars": "^4.0.3"
+            "type-fest": "^0.20.2"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+        "semver": {
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
-            "glob": "^7.1.3"
+            "lru-cache": "^6.0.0"
           }
         },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
         "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "^4.0.0"
           }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
         }
       }
     },
-    "istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-      "dev": true
-    },
-    "istanbul-lib-hook": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz",
-      "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==",
+    "eslint-config-standard": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
+      "integrity": "sha512-UkFojTV1o0GOe1edOEiuI5ccYLJSuNngtqSeClNzhsmG8KPJ+7mRxgtp2oYhqZAK/brlXMoCd+VgXViE0AfyKw==",
       "dev": true,
-      "requires": {
-        "append-transform": "^0.4.0"
-      }
+      "requires": {}
     },
-    "istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+    "eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.5",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
-        "semver": "^6.3.0"
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
       },
       "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
         }
       }
     },
-    "istanbul-lib-report": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
-      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
+    "eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
       "dev": true,
       "requires": {
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "supports-color": "^6.1.0"
+        "debug": "^3.2.7"
       },
       "dependencies": {
-        "istanbul-lib-coverage": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
-          "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "ms": "^2.1.1"
           }
         }
       }
     },
-    "istanbul-lib-source-maps": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
-      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
+    "eslint-plugin-es": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
+      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "rimraf": "^2.6.3",
-        "source-map": "^0.6.1"
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "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.1.1"
+            "ms": "2.0.0"
           }
         },
-        "istanbul-lib-coverage": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
-          "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
           "requires": {
-            "glob": "^7.1.3"
+            "esutils": "^2.0.2"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-node": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
+      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+      "dev": true,
+      "requires": {
+        "eslint-plugin-es": "^3.0.0",
+        "eslint-utils": "^2.0.0",
+        "ignore": "^5.1.1",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-prebid": {
+      "version": "file:plugins/eslint"
+    },
+    "eslint-plugin-promise": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
+      "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-plugin-standard": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz",
+      "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "dev": true
         }
       }
     },
-    "istanbul-reports": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
-      "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
+    "eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true
+    },
+    "espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "dev": true,
       "requires": {
-        "html-escaper": "^2.0.0"
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
-    "istextorbinary": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.2.1.tgz",
-      "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==",
+    "esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
       "dev": true,
       "requires": {
-        "binaryextensions": "2",
-        "editions": "^1.3.3",
-        "textextensions": "2"
+        "estraverse": "^5.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        }
       }
     },
-    "isurl": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "requires": {
-        "has-to-string-tag-x": "^1.2.0",
-        "is-object": "^1.0.1"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        }
       }
     },
-    "jake": {
-      "version": "10.8.1",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.1.tgz",
-      "integrity": "sha512-eSp5h9S7UFzKdQERTyF+KuPLjDZa1Tbw8gCVUn98n4PbIkLEDGe4zl7vF4Qge9kQj06HcymnksPk8jznPZeKsA==",
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
+    },
+    "estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "optional": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
       "dev": true,
       "requires": {
-        "async": "0.9.x",
-        "chalk": "^2.4.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
+        "d": "1",
+        "es5-ext": "~0.10.14"
       }
     },
-    "jest": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz",
-      "integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==",
+    "event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
       "dev": true,
       "requires": {
-        "import-local": "^2.0.0",
-        "jest-cli": "^24.9.0"
+        "duplexer": "~0.1.1",
+        "from": "~0",
+        "map-stream": "~0.1.0",
+        "pause-stream": "0.0.11",
+        "split": "0.3",
+        "stream-combiner": "~0.0.4",
+        "through": "~2.3.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "map-stream": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+          "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
           "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+        }
+      }
+    },
+    "eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
+    },
+    "events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
           "dev": true
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
-        "jest-cli": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz",
-          "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==",
-          "dev": true,
-          "requires": {
-            "@jest/core": "^24.9.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "chalk": "^2.0.1",
-            "exit": "^0.1.2",
-            "import-local": "^2.0.0",
-            "is-ci": "^2.0.0",
-            "jest-config": "^24.9.0",
-            "jest-util": "^24.9.0",
-            "jest-validate": "^24.9.0",
-            "prompts": "^2.0.1",
-            "realpath-native": "^1.1.0",
-            "yargs": "^13.3.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "shebang-regex": "^1.0.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
           "dev": true
         },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
-        },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "jest-changed-files": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz",
-      "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "execa": "^1.0.0",
-        "throat": "^4.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "isexe": "^2.0.0"
           }
         }
       }
     },
-    "jest-config": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
-      "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "babel-jest": "^24.9.0",
-        "chalk": "^2.0.1",
-        "glob": "^7.1.1",
-        "jest-environment-jsdom": "^24.9.0",
-        "jest-environment-node": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "jest-jasmine2": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "pretty-format": "^24.9.0",
-        "realpath-native": "^1.1.0"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "ms": "2.0.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "is-descriptor": "^0.1.0"
           }
         },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "is-extendable": "^0.1.0"
           }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
+            "kind-of": "^3.0.2"
           },
           "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-buffer": "^1.1.5"
               }
             }
           }
@@ -12546,10 +32981,10 @@
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -12558,7 +32993,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -12566,95 +33001,63 @@
             }
           }
         },
-        "jest-get-type": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-          "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
-          "dev": true
-        },
-        "jest-regex-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-          "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
           }
         },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
-          }
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+          "dev": true
         },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
         }
       }
     },
-    "jest-diff": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
-      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
       "dev": true,
       "requires": {
-        "chalk": "^3.0.0",
-        "diff-sequences": "^25.2.6",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "expect": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -12669,398 +33072,386 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        }
+      }
+    },
+    "expect-webdriverio": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-2.0.2.tgz",
+      "integrity": "sha512-dst0tqP1aZ2p7TPmbatqoIQ+7hRTw+IeKNi830XxKhu2DNNe5vQ85i9ttf9rpXgbnUf91HxKcocn4G7A5bQxDA==",
+      "dev": true,
+      "requires": {
+        "expect": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2"
+      }
+    },
+    "express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "requires": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        }
+      }
+    },
+    "ext": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
+      "dev": true,
+      "requires": {
+        "type": "^2.7.2"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
+          "dev": true
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^1.1.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
           "dev": true
+        }
+      }
+    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
         },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+          "dev": true
+        }
+      }
+    },
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
           }
         }
       }
     },
-    "jest-docblock": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz",
-      "integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==",
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "dev": true
+    },
+    "faker": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz",
+      "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
+      "dev": true
+    },
+    "fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "requires": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
       "requires": {
-        "detect-newline": "^2.1.0"
+        "pend": "~1.2.0"
       }
     },
-    "jest-each": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
-      "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
+    "fibers": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.3.tgz",
+      "integrity": "sha512-/qYTSoZydQkM21qZpGLDLuCq8c+B8KhuCQ1kLPvnRNhxhVbvrpmH9l2+Lblf5neDuEsY4bfT7LeO553TXQDvJw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "jest-get-type": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "jest-get-type": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-          "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
-          }
-        }
+        "detect-libc": "^1.0.3"
+      }
+    },
+    "figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
       }
     },
-    "jest-environment-jsdom": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
-      "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jsdom": "^11.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
+        "flat-cache": "^3.0.4"
       }
     },
-    "jest-environment-node": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
-      "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-util": "^24.9.0"
+        "minimatch": "^5.0.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "balanced-match": "^1.0.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "brace-expansion": "^2.0.1"
           }
         }
       }
     },
-    "jest-get-type": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
-      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
-      "dev": true
-    },
-    "jest-haste-map": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
-      "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^24.9.0",
-        "anymatch": "^2.0.0",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^1.2.7",
-        "graceful-fs": "^4.1.15",
-        "invariant": "^2.2.4",
-        "jest-serializer": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7"
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
-            "@types/yargs-parser": "*"
+            "ms": "2.0.0"
           }
         },
-        "anymatch": {
+        "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
-    "jest-jasmine2": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
-      "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
+    "find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "co": "^4.6.0",
-        "expect": "^24.9.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "pretty-format": "^24.9.0",
-        "throat": "^4.0.0"
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
           "dev": true
         },
         "braces": {
@@ -13084,38 +33475,34 @@
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
               "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
             }
           }
         },
-        "diff-sequences": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
-          "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
-          "dev": true
-        },
-        "expect": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
-          "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-styles": "^3.2.0",
-            "jest-get-type": "^24.9.0",
-            "jest-matcher-utils": "^24.9.0",
-            "jest-message-util": "^24.9.0",
-            "jest-regex-util": "^24.9.0"
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
           }
         },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
           "dev": true,
           "requires": {
             "extend-shallow": "^2.0.1",
@@ -13127,11 +33514,17 @@
             "extend-shallow": {
               "version": "2.0.1",
               "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
               "dev": true,
               "requires": {
                 "is-extendable": "^0.1.0"
               }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
             }
           }
         },
@@ -13144,7 +33537,7 @@
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -13153,7 +33546,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -13161,56 +33554,10 @@
             }
           }
         },
-        "jest-diff": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
-          "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.0.1",
-            "diff-sequences": "^24.9.0",
-            "jest-get-type": "^24.9.0",
-            "pretty-format": "^24.9.0"
-          }
-        },
-        "jest-get-type": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-          "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
-          "dev": true
-        },
-        "jest-matcher-utils": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
-          "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.0.1",
-            "jest-diff": "^24.9.0",
-            "jest-get-type": "^24.9.0",
-            "pretty-format": "^24.9.0"
-          }
-        },
-        "jest-message-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-          "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "@types/stack-utils": "^1.0.1",
-            "chalk": "^2.0.1",
-            "micromatch": "^3.1.10",
-            "slash": "^2.0.0",
-            "stack-utils": "^1.0.1"
-          }
-        },
-        "jest-regex-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-          "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         },
         "micromatch": {
@@ -13234,28 +33581,10 @@
             "to-regex": "^3.0.2"
           }
         },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
-          }
-        },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
-        },
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
           "dev": true,
           "requires": {
             "is-number": "^3.0.0",
@@ -13264,357 +33593,537 @@
         }
       }
     },
-    "jest-leak-detector": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
-      "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
+    "fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
       "dev": true,
       "requires": {
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "jest-get-type": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-          "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
           "dev": true,
           "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
+            "isobject": "^3.0.1"
           }
         }
       }
     },
-    "jest-matcher-utils": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
-      "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
+    "flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true
+    },
+    "flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true
+    },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "dev": true,
       "requires": {
-        "chalk": "^3.0.0",
-        "jest-diff": "^25.5.0",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       }
     },
-    "jest-message-util": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
-      "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^25.5.0",
-        "@types/stack-utils": "^1.0.1",
-        "chalk": "^3.0.0",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.2",
-        "slash": "^3.0.0",
-        "stack-utils": "^1.0.1"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "dev": true
+    },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true
+    },
+    "for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "foreachasync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
+      "integrity": "sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "dev": true
+    },
+    "fork-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
+      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+    },
+    "from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
+      "dev": true
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      }
+    },
+    "fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "through2": "^2.0.3"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
     },
-    "jest-mock": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
-      "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
+    "fs.extra": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz",
+      "integrity": "sha512-Ig401VXtyrWrz23k9KxAx9OrnL8AHSLNhQ8YJH2wSYuH0ZUfxwBeY6zXkd/oOyVRFTlpEu/0n5gHeuZt7aqbkw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^24.9.0"
+        "fs-extra": "~0.6.1",
+        "mkdirp": "~0.3.5",
+        "walk": "^2.3.9"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+        "fs-extra": {
+          "version": "0.6.4",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
+          "integrity": "sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "jsonfile": "~1.0.1",
+            "mkdirp": "0.3.x",
+            "ncp": "~0.4.2",
+            "rimraf": "~2.2.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
+        "jsonfile": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
+          "integrity": "sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
+          "dev": true
         }
       }
     },
-    "jest-pnp-resolver": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
-      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
-    "jest-regex-util": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz",
-      "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==",
-      "dev": true
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "optional": true
     },
-    "jest-resolve": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-      "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^24.9.0",
-        "browser-resolve": "^1.11.3",
-        "chalk": "^2.0.1",
-        "jest-pnp-resolver": "^1.2.1",
-        "realpath-native": "^1.1.0"
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+        "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": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "minimist": "^1.2.6"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "glob": "^7.1.3"
           }
         }
       }
     },
-    "jest-resolve-dependencies": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
-      "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
+    "fun-hooks": {
+      "version": "0.9.10",
+      "resolved": "https://registry.npmjs.org/fun-hooks/-/fun-hooks-0.9.10.tgz",
+      "integrity": "sha512-7xBjdT+oMYOPWgwFxNiNzF4ubeUvim4zs1DnQqSSGyxu8UD7AW/6Z0iFsVRwuVSIZKUks2en2VHHotmNfj3ipw==",
+      "requires": {
+        "typescript-tuple": "^2.2.1"
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "requires": {
+        "globule": "^1.0.0"
+      }
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      }
+    },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
+    "get-port": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
+      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "git-up": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
+      "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==",
+      "dev": true,
+      "requires": {
+        "is-ssh": "^1.4.0",
+        "parse-url": "^8.1.0"
+      }
+    },
+    "git-url-parse": {
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz",
+      "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
+      "dev": true,
+      "requires": {
+        "git-up": "^7.0.0"
+      }
+    },
+    "github-slugger": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
+      "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-snapshot": "^24.9.0"
+        "extend": "^3.0.0",
+        "glob": "^7.1.1",
+        "glob-parent": "^3.1.0",
+        "is-negated-glob": "^1.0.0",
+        "ordered-read-streams": "^1.0.0",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.1.5",
+        "remove-trailing-separator": "^1.0.1",
+        "to-absolute-glob": "^2.0.0",
+        "unique-stream": "^2.0.2"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "is-extglob": "^2.1.0"
           }
-        },
-        "jest-regex-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-          "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
-          "dev": true
         }
       }
     },
-    "jest-runner": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
-      "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "glob-watcher": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
+      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
       "dev": true,
       "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.4.2",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.1.15",
-        "jest-config": "^24.9.0",
-        "jest-docblock": "^24.3.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-jasmine2": "^24.9.0",
-        "jest-leak-detector": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.6.0",
-        "source-map-support": "^0.5.6",
-        "throat": "^4.0.0"
+        "anymatch": "^2.0.0",
+        "async-done": "^1.2.0",
+        "chokidar": "^2.0.0",
+        "is-negated-glob": "^1.0.0",
+        "just-debounce": "^1.0.0",
+        "normalize-path": "^3.0.0",
+        "object.defaults": "^1.1.0"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true
         },
         "braces": {
           "version": "2.3.2",
@@ -13632,82 +34141,127 @@
             "snapdragon-node": "^2.0.1",
             "split-string": "^3.0.2",
             "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
           }
         },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
           "dev": true,
           "requires": {
             "extend-shallow": "^2.0.1",
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1",
             "to-regex-range": "^2.1.0"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
           },
           "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "is-extglob": "^2.1.0"
               }
             }
           }
         },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
+          "dev": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+          "dev": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
           }
         },
-        "jest-message-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-          "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "@types/stack-utils": "^1.0.1",
-            "chalk": "^2.0.1",
-            "micromatch": "^3.1.10",
-            "slash": "^2.0.0",
-            "stack-utils": "^1.0.1"
+            "isobject": "^3.0.1"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
           }
         },
         "micromatch": {
@@ -13729,1154 +34283,1280 @@
             "regex-not": "^1.0.0",
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+              "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+              "dev": true,
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            },
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            },
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true
+            }
           }
         },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.19",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-          "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
           "dev": true,
           "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
           }
         },
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
+      }
+    },
+    "global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "dev": true,
+      "requires": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+          "dev": true
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
+    "globals-docs": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/globals-docs/-/globals-docs-2.4.1.tgz",
+      "integrity": "sha512-qpPnUKkWnz8NESjrCvnlGklsgiQzlq+rcCxoG5uNQ+dNA7cFMCmn231slLAwS2N/PlkzZ3COL8CcS10jXmLHqg==",
+      "dev": true
+    },
+    "globule": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
+      "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
+      "dev": true,
+      "requires": {
+        "glob": "~7.1.1",
+        "lodash": "^4.17.21",
+        "minimatch": "~3.0.2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.7",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+          "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.8",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+          "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        }
+      }
+    },
+    "glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "requires": {
+        "sparkles": "^1.0.0"
+      }
+    },
+    "got": {
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+      "dev": true,
+      "requires": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
+    },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
+      "requires": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      }
+    },
+    "gulp-clean": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.4.0.tgz",
+      "integrity": "sha512-DARK8rNMo4lHOFLGTiHEJdf19GuoBDHqGUaypz+fOhrvOs3iFO7ntdYtdpNxv+AzSJBx/JfypF0yEj9ks1IStQ==",
+      "dev": true,
+      "requires": {
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^0.1.2",
+        "rimraf": "^2.6.2",
+        "through2": "^2.0.3",
+        "vinyl": "^2.1.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
     },
-    "jest-runtime": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
-      "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
+    "gulp-cli": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
       "dev": true,
       "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.9.0",
-        "@jest/source-map": "^24.3.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/yargs": "^13.0.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.1.15",
-        "jest-config": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "realpath-native": "^1.1.0",
-        "slash": "^2.0.0",
-        "strip-bom": "^3.0.0",
-        "yargs": "^13.3.0"
+        "ansi-colors": "^1.0.1",
+        "archy": "^1.0.0",
+        "array-sort": "^1.0.0",
+        "color-support": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "copy-props": "^2.0.1",
+        "fancy-log": "^1.3.2",
+        "gulplog": "^1.0.0",
+        "interpret": "^1.4.0",
+        "isobject": "^3.0.1",
+        "liftoff": "^3.1.0",
+        "matchdep": "^2.0.0",
+        "mute-stdout": "^1.0.0",
+        "pretty-hrtime": "^1.0.0",
+        "replace-homedir": "^1.0.0",
+        "semver-greatest-satisfied-range": "^1.1.0",
+        "v8flags": "^3.2.0",
+        "yargs": "^7.1.0"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "ansi-wrap": "^0.1.0"
           }
         },
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+          "dev": true
         },
         "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
           "dev": true,
           "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wrap-ansi": "^2.0.0"
           }
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+        "decamelize": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+          "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
           "dev": true
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
         "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        "hosted-git-info": {
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
           "dev": true
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+            "number-is-nan": "^1.0.0"
           }
         },
-        "jest-message-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-          "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "@types/stack-utils": "^1.0.1",
-            "chalk": "^2.0.1",
-            "micromatch": "^3.1.10",
-            "slash": "^2.0.0",
-            "stack-utils": "^1.0.1"
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
           }
         },
-        "jest-regex-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-          "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
-          "dev": true
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
         },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
           }
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "find-up": "^1.0.0",
+            "read-pkg": "^1.0.0"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "ansi-regex": "^2.0.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          }
         },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+        "y18n": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
           "dev": true
         },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+        "yargs": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
+          "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^5.0.1"
           }
         },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+        "yargs-parser": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
+          "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "camelcase": "^3.0.0",
+            "object.assign": "^4.1.0"
           }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+        }
+      }
+    },
+    "gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==",
+      "dev": true,
+      "requires": {
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
+      }
+    },
+    "gulp-connect": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.7.0.tgz",
+      "integrity": "sha512-8tRcC6wgXMLakpPw9M7GRJIhxkYdgZsXwn7n56BA2bQYGLR9NOPhMzx7js+qYDy6vhNkbApGKURjAw1FjY4pNA==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^2.0.5",
+        "connect": "^3.6.6",
+        "connect-livereload": "^0.6.0",
+        "fancy-log": "^1.3.2",
+        "map-stream": "^0.0.7",
+        "send": "^0.16.2",
+        "serve-index": "^1.9.1",
+        "serve-static": "^1.13.2",
+        "tiny-lr": "^1.1.1"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
+          "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==",
           "dev": true
         },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "ms": "2.0.0"
           }
         },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+          "dev": true
+        },
+        "destroy": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+          "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
           }
         },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+          "dev": true
+        },
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
           "dev": true,
           "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
+            "ee-first": "1.1.1"
           }
         },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+        "send": {
+          "version": "0.16.2",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+          "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
           "dev": true,
           "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "destroy": "~1.0.4",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "~1.6.2",
+            "mime": "1.4.1",
+            "ms": "2.0.0",
+            "on-finished": "~2.3.0",
+            "range-parser": "~1.2.0",
+            "statuses": "~1.4.0"
           }
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+          "dev": true
         }
       }
     },
-    "jest-serializer": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
-      "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
-      "dev": true
-    },
-    "jest-snapshot": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
-      "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
+    "gulp-eslint": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz",
+      "integrity": "sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "expect": "^24.9.0",
-        "jest-diff": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^24.9.0",
-        "semver": "^6.2.0"
+        "eslint": "^6.0.0",
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^1.0.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "ansi-wrap": "^0.1.0"
           }
         },
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
         },
-        "diff-sequences": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
-          "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
+        "astral-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+          "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
           "dev": true
         },
-        "expect": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
-          "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-styles": "^3.2.0",
-            "jest-get-type": "^24.9.0",
-            "jest-matcher-utils": "^24.9.0",
-            "jest-message-util": "^24.9.0",
-            "jest-regex-util": "^24.9.0"
+            "color-name": "~1.1.4"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           },
           "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
             }
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
           "dev": true
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "eslint": {
+          "version": "6.8.0",
+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+          "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "@babel/code-frame": "^7.0.0",
+            "ajv": "^6.10.0",
+            "chalk": "^2.1.0",
+            "cross-spawn": "^6.0.5",
+            "debug": "^4.0.1",
+            "doctrine": "^3.0.0",
+            "eslint-scope": "^5.0.0",
+            "eslint-utils": "^1.4.3",
+            "eslint-visitor-keys": "^1.1.0",
+            "espree": "^6.1.2",
+            "esquery": "^1.0.1",
+            "esutils": "^2.0.2",
+            "file-entry-cache": "^5.0.1",
+            "functional-red-black-tree": "^1.0.1",
+            "glob-parent": "^5.0.0",
+            "globals": "^12.1.0",
+            "ignore": "^4.0.6",
+            "import-fresh": "^3.0.0",
+            "imurmurhash": "^0.1.4",
+            "inquirer": "^7.0.0",
+            "is-glob": "^4.0.0",
+            "js-yaml": "^3.13.1",
+            "json-stable-stringify-without-jsonify": "^1.0.1",
+            "levn": "^0.3.0",
+            "lodash": "^4.17.14",
+            "minimatch": "^3.0.4",
+            "mkdirp": "^0.5.1",
+            "natural-compare": "^1.4.0",
+            "optionator": "^0.8.3",
+            "progress": "^2.0.0",
+            "regexpp": "^2.0.1",
+            "semver": "^6.1.2",
+            "strip-ansi": "^5.2.0",
+            "strip-json-comments": "^3.0.1",
+            "table": "^5.2.3",
+            "text-table": "^0.2.0",
+            "v8-compile-cache": "^2.0.3"
           },
           "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "ansi-regex": "^4.1.0"
               }
             }
           }
         },
-        "jest-diff": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
-          "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
+        "eslint-utils": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+          "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
           "dev": true,
           "requires": {
-            "chalk": "^2.0.1",
-            "diff-sequences": "^24.9.0",
-            "jest-get-type": "^24.9.0",
-            "pretty-format": "^24.9.0"
+            "eslint-visitor-keys": "^1.1.0"
           }
         },
-        "jest-get-type": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-          "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "dev": true
         },
-        "jest-matcher-utils": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
-          "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
+        "espree": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+          "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
           "dev": true,
           "requires": {
-            "chalk": "^2.0.1",
-            "jest-diff": "^24.9.0",
-            "jest-get-type": "^24.9.0",
-            "pretty-format": "^24.9.0"
+            "acorn": "^7.1.1",
+            "acorn-jsx": "^5.2.0",
+            "eslint-visitor-keys": "^1.1.0"
           }
         },
-        "jest-message-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-          "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "@types/stack-utils": "^1.0.1",
-            "chalk": "^2.0.1",
-            "micromatch": "^3.1.10",
-            "slash": "^2.0.0",
-            "stack-utils": "^1.0.1"
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
           }
         },
-        "jest-regex-util": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-          "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
-          "dev": true
+        "file-entry-cache": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+          "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+          "dev": true,
+          "requires": {
+            "flat-cache": "^2.0.1"
+          }
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        "flat-cache": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+          "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "flatted": "^2.0.0",
+            "rimraf": "2.6.3",
+            "write": "1.0.3"
           }
         },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+        "flatted": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+          "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+          "dev": true
+        },
+        "globals": {
+          "version": "12.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
+            "type-fest": "^0.8.1"
           }
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "slash": {
+        "inquirer": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+          "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-width": "^3.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^3.0.0",
+            "lodash": "^4.17.19",
+            "mute-stream": "0.0.8",
+            "run-async": "^2.4.0",
+            "rxjs": "^6.6.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "through": "^2.3.6"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "chalk": {
+              "version": "4.1.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            }
+          }
+        },
+        "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
           "dev": true
         },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+        "levn": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
           "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
-      }
-    },
-    "jest-util": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
-      "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/source-map": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "callsites": "^3.0.0",
-        "chalk": "^2.0.1",
-        "graceful-fs": "^4.1.15",
-        "is-ci": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+          "requires": {
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2"
+          }
+        },
+        "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": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "minimist": "^1.2.6"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "optionator": {
+          "version": "0.8.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "deep-is": "~0.1.3",
+            "fast-levenshtein": "~2.0.6",
+            "levn": "~0.3.0",
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2",
+            "word-wrap": "~1.2.3"
           }
         },
-        "slash": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-          "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
           "dev": true
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
           "dev": true
-        }
-      }
-    },
-    "jest-validate": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
-      "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^2.0.1",
-        "jest-get-type": "^24.9.0",
-        "leven": "^3.1.0",
-        "pretty-format": "^24.9.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+        },
+        "regexpp": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+          "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "glob": "^7.1.3"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "shebang-regex": "^1.0.0"
           }
         },
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
           "dev": true
         },
-        "jest-get-type": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-          "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
+        "slice-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+          "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "astral-regex": "^1.0.0",
+            "is-fullwidth-code-point": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
           "dev": true
         },
-        "pretty-format": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-          "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-regex": "^4.0.0",
-            "ansi-styles": "^3.2.0",
-            "react-is": "^16.8.4"
+            "has-flag": "^4.0.0"
           }
-        }
-      }
-    },
-    "jest-watcher": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz",
-      "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==",
-      "dev": true,
-      "requires": {
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/yargs": "^13.0.0",
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.1",
-        "jest-util": "^24.9.0",
-        "string-length": "^2.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-          "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
+        },
+        "table": {
+          "version": "5.4.6",
+          "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+          "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^1.1.1",
-            "@types/yargs": "^13.0.0"
+            "ajv": "^6.10.2",
+            "lodash": "^4.17.14",
+            "slice-ansi": "^2.1.0",
+            "string-width": "^3.0.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+              "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+              "dev": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "type-check": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "prelude-ls": "~1.1.2"
           }
         },
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
           "dev": true
-        }
-      }
-    },
-    "jest-worker": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
-      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
-      "dev": true,
-      "requires": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "isexe": "^2.0.0"
           }
         }
       }
     },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+    "gulp-if": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-3.0.0.tgz",
+      "integrity": "sha512-fCUEngzNiEZEK2YuPm+sdMpO6ukb8+/qzbGfJBXyNOXz85bCG7yBI+pPSl+N90d7gnLvMsarthsAImx0qy7BAw==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
-    "jsdom": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
-      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^5.5.3",
-        "acorn-globals": "^4.1.0",
-        "array-equal": "^1.0.0",
-        "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": "^1.0.0",
-        "data-urls": "^1.0.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.9.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "left-pad": "^1.3.0",
-        "nwsapi": "^2.0.7",
-        "parse5": "4.0.0",
-        "pn": "^1.1.0",
-        "request": "^2.87.0",
-        "request-promise-native": "^1.0.5",
-        "sax": "^1.2.4",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^2.3.4",
-        "w3c-hr-time": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.3",
-        "whatwg-mimetype": "^2.1.0",
-        "whatwg-url": "^6.4.1",
-        "ws": "^5.2.0",
-        "xml-name-validator": "^3.0.0"
+        "gulp-match": "^1.1.0",
+        "ternary-stream": "^3.0.0",
+        "through2": "^3.0.1"
       },
       "dependencies": {
-        "ws": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-          "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
           "dev": true,
           "requires": {
-            "async-limiter": "~1.0.0"
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
           }
         }
       }
     },
-    "jsencrypt": {
-      "version": "3.0.0-rc.1",
-      "resolved": "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.0.0-rc.1.tgz",
-      "integrity": "sha512-gcvGaqerlUJy1Kq6tNgPYteVEoWNemu+9hBe2CdsCIz4rVcwjoTQ72iD1W76/PRMlnkzG0yVh7nwOOMOOUfKmg=="
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "json-loader": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
+    "gulp-js-escape": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "jsonfile": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^1.0.0"
-      }
-    },
-    "jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-      "dev": true
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "just-clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
-      "integrity": "sha1-v7P672WqEqMWBYcSlFwyb9jwFDQ="
-    },
-    "just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
-      "dev": true
-    },
-    "just-extend": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz",
-      "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==",
-      "dev": true
-    },
-    "karma": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
-      "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
+      "resolved": "https://registry.npmjs.org/gulp-js-escape/-/gulp-js-escape-1.0.1.tgz",
+      "integrity": "sha512-F+53crhLb78CTlG7ZZJFWzP0+/4q0vt2/pULXFkTMs6AGBo0Eh5cx+eWsqqHv8hrNIUsuTab3Se8rOOzP/6+EQ==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "braces": "^3.0.2",
-        "chokidar": "^3.0.0",
-        "colors": "^1.1.0",
-        "connect": "^3.6.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "flatted": "^2.0.0",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.14",
-        "log4js": "^4.0.0",
-        "mime": "^2.3.1",
-        "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
-        "qjobs": "^1.1.4",
-        "range-parser": "^1.2.0",
-        "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
-        "socket.io": "2.1.1",
-        "source-map": "^0.6.1",
-        "tmp": "0.0.33",
-        "useragent": "2.3.0"
+        "through2": "^0.6.3"
       },
       "dependencies": {
-        "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
           "dev": true
         },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
           "dev": true,
           "requires": {
-            "glob": "^7.1.3"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
           "dev": true
+        },
+        "through2": {
+          "version": "0.6.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.0.33-1 <1.1.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
         }
       }
     },
-    "karma-babel-preprocessor": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/karma-babel-preprocessor/-/karma-babel-preprocessor-6.0.1.tgz",
-      "integrity": "sha1-euHT5klQ2+EfQht0BAqwj7WmbCE=",
-      "dev": true,
-      "requires": {
-        "babel-core": "^6.0.0"
-      }
-    },
-    "karma-browserstack-launcher": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/karma-browserstack-launcher/-/karma-browserstack-launcher-1.4.0.tgz",
-      "integrity": "sha512-bUQK84U+euDfOUfEjcF4IareySMOBNRLrrl9q6cttIe8f011Ir6olLITTYMOJDcGY58wiFIdhPHSPd9Pi6+NfQ==",
+    "gulp-match": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
+      "integrity": "sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ==",
       "dev": true,
       "requires": {
-        "browserstack": "~1.5.1",
-        "browserstacktunnel-wrapper": "~2.0.2",
-        "q": "~1.5.0"
+        "minimatch": "^3.0.3"
       }
     },
-    "karma-chai": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz",
-      "integrity": "sha1-vuWtQEAFF4Ea40u5RfdikJEIt5o=",
-      "dev": true
-    },
-    "karma-chrome-launcher": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
-      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
+    "gulp-replace": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz",
+      "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==",
       "dev": true,
       "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
+        "@types/node": "^14.14.41",
+        "@types/vinyl": "^2.0.4",
+        "istextorbinary": "^3.0.0",
+        "replacestream": "^4.0.3",
+        "yargs-parser": ">=5.0.0-security.0"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "14.18.33",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz",
+          "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==",
+          "dev": true
+        }
       }
     },
-    "karma-coverage": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.0.2.tgz",
-      "integrity": "sha512-zge5qiGEIKDdzWciQwP4p0LSac4k/L6VfrBsERMUn5mpDvxhv1sPVOrSlpzpi70T7NhuEy4bgnpAKIYuumIMCw==",
+    "gulp-shell": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.8.0.tgz",
+      "integrity": "sha512-wHNCgmqbWkk1c6Gc2dOL5SprcoeujQdeepICwfQRo91DIylTE7a794VEE+leq3cE2YDoiS5ulvRfKVIEMazcTQ==",
       "dev": true,
       "requires": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.1",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.0",
-        "minimatch": "^3.0.4"
+        "chalk": "^3.0.0",
+        "fancy-log": "^1.3.3",
+        "lodash.template": "^4.5.0",
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1",
+        "tslib": "^1.10.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ansi-wrap": "^0.1.0"
           }
         },
-        "has-flag": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "arr-diff": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
           "dev": true
         },
-        "istanbul-lib-report": {
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
+        },
+        "chalk": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-          "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
           "dev": true,
           "requires": {
-            "istanbul-lib-coverage": "^3.0.0",
-            "make-dir": "^3.0.0",
+            "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
         },
-        "istanbul-lib-source-maps": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-          "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "debug": "^4.1.1",
-            "istanbul-lib-coverage": "^3.0.0",
-            "source-map": "^0.6.1"
+            "color-name": "~1.1.4"
           }
         },
-        "istanbul-reports": {
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "extend-shallow": {
           "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-          "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
           "dev": true,
           "requires": {
-            "html-escaper": "^2.0.0",
-            "istanbul-lib-report": "^3.0.0"
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
           }
         },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
           "dev": true,
           "requires": {
-            "semver": "^6.0.0"
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
+    "gulp-sourcemaps": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
+      "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
+      "dev": true,
+      "requires": {
+        "@gulp-sourcemaps/identity-map": "^2.0.1",
+        "@gulp-sourcemaps/map-sources": "^1.0.0",
+        "acorn": "^6.4.1",
+        "convert-source-map": "^1.0.0",
+        "css": "^3.0.0",
+        "debug-fabulous": "^1.0.0",
+        "detect-newline": "^2.0.0",
+        "graceful-fs": "^4.0.0",
+        "source-map": "^0.6.0",
+        "strip-bom-string": "^1.0.0",
+        "through2": "^2.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.4.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
           "dev": true
         },
         "source-map": {
@@ -14885,8541 +35565,8844 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
     },
-    "karma-coverage-istanbul-reporter": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.3.tgz",
-      "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=",
-      "dev": true,
-      "requires": {
-        "istanbul-api": "^1.3.1",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "karma-es5-shim": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/karma-es5-shim/-/karma-es5-shim-0.0.4.tgz",
-      "integrity": "sha1-zdADM8znfC5M4D46yT8vjs0fuVI=",
-      "dev": true,
-      "requires": {
-        "es5-shim": "^4.0.5"
-      }
-    },
-    "karma-firefox-launcher": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.3.0.tgz",
-      "integrity": "sha512-Fi7xPhwrRgr+94BnHX0F5dCl1miIW4RHnzjIGxF8GaIEp7rNqX7LSi7ok63VXs3PS/5MQaQMhGxw+bvD+pibBQ==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^2.1.0"
-      }
-    },
-    "karma-ie-launcher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz",
-      "integrity": "sha1-SXmGhCxJAZA0bNifVJTKmDDG1Zw=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.6.1"
-      }
-    },
-    "karma-mocha": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-1.3.0.tgz",
-      "integrity": "sha1-7qrH/8DiAetjxGdEDStpx883eL8=",
+    "gulp-terser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz",
+      "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==",
       "dev": true,
       "requires": {
-        "minimist": "1.2.0"
+        "plugin-error": "^1.0.1",
+        "terser": "^5.9.0",
+        "through2": "^4.0.2",
+        "vinyl-sourcemaps-apply": "^0.2.1"
       },
       "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "dev": true,
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
           "dev": true
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
+          }
         }
       }
     },
-    "karma-mocha-reporter": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
-      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
+    "gulp-util": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
+      "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "strip-ansi": "^4.0.0"
+        "array-differ": "^1.0.0",
+        "array-uniq": "^1.0.2",
+        "beeper": "^1.0.0",
+        "chalk": "^1.0.0",
+        "dateformat": "^2.0.0",
+        "fancy-log": "^1.1.0",
+        "gulplog": "^1.0.0",
+        "has-gulplog": "^0.1.0",
+        "lodash._reescape": "^3.0.0",
+        "lodash._reevaluate": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.template": "^3.0.0",
+        "minimist": "^1.1.0",
+        "multipipe": "^0.1.2",
+        "object-assign": "^3.0.0",
+        "replace-ext": "0.0.1",
+        "through2": "^2.0.0",
+        "vinyl": "^0.5.0"
       },
       "dependencies": {
         "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "clone": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+          "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+          "dev": true
+        },
+        "clone-stats": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+          "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
+          "dev": true
+        },
+        "lodash.template": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+          "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
+          "dev": true,
+          "requires": {
+            "lodash._basecopy": "^3.0.0",
+            "lodash._basetostring": "^3.0.0",
+            "lodash._basevalues": "^3.0.0",
+            "lodash._isiterateecall": "^3.0.0",
+            "lodash._reinterpolate": "^3.0.0",
+            "lodash.escape": "^3.0.0",
+            "lodash.keys": "^3.0.0",
+            "lodash.restparam": "^3.0.0",
+            "lodash.templatesettings": "^3.0.0"
+          }
+        },
+        "lodash.templatesettings": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+          "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
+          "dev": true,
+          "requires": {
+            "lodash._reinterpolate": "^3.0.0",
+            "lodash.escape": "^3.0.0"
+          }
+        },
+        "object-assign": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
           "dev": true
         },
-        "log-symbols": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-          "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+          "dev": true
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "chalk": "^2.0.1"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "vinyl": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+          "integrity": "sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "clone": "^1.0.0",
+            "clone-stats": "^0.0.1",
+            "replace-ext": "0.0.1"
           }
         }
       }
     },
-    "karma-opera-launcher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz",
-      "integrity": "sha1-+lFihTGh0L6EstjcDX7iCfyP+Ro=",
-      "dev": true
-    },
-    "karma-safari-launcher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
-      "integrity": "sha1-lpgqLMR9BmquccVTursoMZEVos4=",
-      "dev": true
-    },
-    "karma-script-launcher": {
+    "gulplog": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-1.0.0.tgz",
-      "integrity": "sha1-zQF8TeXvCeWp2nkydhdhCN1LVC0=",
-      "dev": true
-    },
-    "karma-sinon": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz",
-      "integrity": "sha1-TjRD8oMP3s/2JNN0cWPxIX2qKpo=",
-      "dev": true
-    },
-    "karma-sourcemap-loader": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
-      "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2"
+        "glogg": "^1.0.0"
       }
     },
-    "karma-spec-reporter": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz",
-      "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
+    "gzip-size": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
       "dev": true,
       "requires": {
-        "colors": "^1.1.2"
+        "duplexer": "^0.1.2"
       }
     },
-    "karma-webpack": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-3.0.5.tgz",
-      "integrity": "sha512-nRudGJWstvVuA6Tbju9tyGUfXTtI1UXMXoRHVmM2/78D0q6s/Ye2IC157PKNDC15PWFGR0mVIRtWLAdcfsRJoA==",
+    "handlebars": {
+      "version": "4.7.7",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
       "dev": true,
       "requires": {
-        "async": "^2.0.0",
-        "babel-runtime": "^6.0.0",
-        "loader-utils": "^1.0.0",
-        "lodash": "^4.0.0",
-        "source-map": "^0.5.6",
-        "webpack-dev-middleware": "^2.0.6"
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.0",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4",
+        "wordwrap": "^1.0.0"
       },
       "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.14"
-          }
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "kebab-case": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.0.tgz",
-      "integrity": "sha1-P55JkK3K0MaGwOcB92RYaPdfkes=",
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
       "dev": true
     },
-    "keyv": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz",
-      "integrity": "sha512-xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw==",
+    "har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "dev": true,
       "requires": {
-        "json-buffer": "3.0.1"
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
       }
     },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true
-    },
-    "last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "requires": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
+        "function-bind": "^1.1.1"
       }
     },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true
-    },
-    "lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.5"
+        "ansi-regex": "^2.0.0"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+          "dev": true
         }
       }
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "lcov-parse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz",
-      "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=",
-      "dev": true
-    },
-    "lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
-      "requires": {
-        "flush-write-stream": "^1.0.2"
-      }
-    },
-    "left-pad": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
-      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true
     },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
     },
-    "levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+    "has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==",
       "dev": true,
       "requires": {
-        "leven": "^3.1.0"
+        "sparkles": "^1.0.0"
       }
     },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "get-intrinsic": "^1.1.1"
       }
     },
-    "liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      }
+    "has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
-    "lighthouse-logger": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz",
-      "integrity": "sha512-wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw==",
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.8",
-        "marky": "^1.2.0"
-      }
-    },
-    "listenercount": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
-      "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
-      "dev": true
-    },
-    "live-connect-js": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-1.1.10.tgz",
-      "integrity": "sha512-G/LJKN3b21DZILCQRyataC/znLvJRyogtu7mAkKlkhP9B9UJ8bcOL7ihW/clD2PsT4hVUkeabHhUGsPCmhsjFw==",
-      "requires": {
-        "@kiosked/ulid": "^3.0.0",
-        "abab": "^2.0.3",
-        "browser-cookies": "^1.2.0",
-        "tiny-hashes": "1.0.1"
+        "has-symbols": "^1.0.2"
       }
     },
-    "livereload-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
-      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
-      "dev": true
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
       "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
           }
         }
       }
     },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+    "hast-util-is-element": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
+      "integrity": "sha512-thjnlGAnwP8ef/GSO1Q8BfVk2gundnc2peGQqEg2kUt/IqesiGg/5mSwN2fE7nLzy61pg88NG6xV+UrGOrx9EA==",
+      "dev": true,
+      "requires": {
+        "@types/hast": "^2.0.0",
+        "@types/unist": "^2.0.0"
+      }
+    },
+    "hast-util-sanitize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-4.0.0.tgz",
+      "integrity": "sha512-pw56+69jq+QSr/coADNvWTmBPDy+XsmwaF5KnUys4/wM1jt/fZdl7GPxhXXXYdXnz3Gj3qMkbUCH2uKjvX0MgQ==",
+      "dev": true,
+      "requires": {
+        "@types/hast": "^2.0.0"
+      }
+    },
+    "hast-util-to-html": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-8.0.3.tgz",
+      "integrity": "sha512-/D/E5ymdPYhHpPkuTHOUkSatxr4w1ZKrZsG0Zv/3C2SRVT0JFJG53VS45AMrBtYk0wp5A7ksEhiC8QaOZM95+A==",
       "dev": true,
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "@types/hast": "^2.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-is-element": "^2.0.0",
+        "hast-util-whitespace": "^2.0.0",
+        "html-void-elements": "^2.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.2",
+        "unist-util-is": "^5.0.0"
       }
     },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+    "hast-util-whitespace": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz",
+      "integrity": "sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==",
       "dev": true
     },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true
     },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+    "highlight.js": {
+      "version": "11.6.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz",
+      "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
       "dev": true
     },
-    "lodash._escapehtmlchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-      "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
       "dev": true,
       "requires": {
-        "lodash._htmlescapes": "~2.4.1"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
       }
     },
-    "lodash._escapestringchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-      "dev": true
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._htmlescapes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-      "dev": true
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
     },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
+    "hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
     },
-    "lodash._isnative": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "lodash._objecttypes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
+    "html-void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
+      "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==",
       "dev": true
     },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
+    "http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
       "dev": true
     },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
+    "http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "requires": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      }
     },
-    "lodash._reinterpolate": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-      "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
+    "http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
       "dev": true
     },
-    "lodash._reunescapedhtml": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-      "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
+    "http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
       "requires": {
-        "lodash._htmlescapes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       }
     },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
     },
-    "lodash._shimkeys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
+    "http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
       "dev": true,
       "requires": {
-        "lodash._objecttypes": "~2.4.1"
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
       }
     },
-    "lodash.clone": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=",
-      "dev": true
+    "https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "requires": {
+        "agent-base": "6",
+        "debug": "4"
+      }
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
     },
-    "lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true
     },
-    "lodash.difference": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true
     },
-    "lodash.escape": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-      "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "requires": {
-        "lodash._escapehtmlchar": "~2.4.1",
-        "lodash._reunescapedhtml": "~2.4.1",
-        "lodash.keys": "~2.4.1"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        }
       }
     },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
-    },
-    "lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true
     },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+    "indent-string": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+      "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
       "dev": true
     },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+    "individual": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
+      "integrity": "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==",
       "dev": true
     },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
     },
-    "lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
-      "dev": true
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+    "ini": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
+      "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
       "dev": true
     },
-    "lodash.keys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-      "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
+    "inquirer": {
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz",
+      "integrity": "sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==",
       "dev": true,
       "requires": {
-        "lodash._isnative": "~2.4.1",
-        "lodash._shimkeys": "~2.4.1",
-        "lodash.isobject": "~2.4.1"
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.1",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.21",
+        "mute-stream": "0.0.8",
+        "ora": "^5.4.1",
+        "run-async": "^2.4.0",
+        "rxjs": "^7.5.5",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6",
+        "wrap-ansi": "^7.0.0"
       },
       "dependencies": {
-        "lodash.isobject": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-          "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
+          "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
           "dev": true,
           "requires": {
-            "lodash._objecttypes": "~2.4.1"
+            "tslib": "^2.1.0"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "tslib": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+          "dev": true
         }
       }
     },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
       "dev": true
     },
-    "lodash.pickby": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
-      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
-      "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"
+      }
     },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
       "dev": true
     },
-    "lodash.some": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
-      "dev": true
+    "ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
+    "is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "requires": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      }
     },
-    "lodash.template": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-      "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
+    "is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "requires": {
-        "lodash._escapestringchar": "~2.4.1",
-        "lodash._reinterpolate": "~2.4.1",
-        "lodash.defaults": "~2.4.1",
-        "lodash.escape": "~2.4.1",
-        "lodash.keys": "~2.4.1",
-        "lodash.templatesettings": "~2.4.1",
-        "lodash.values": "~2.4.1"
+        "kind-of": "^6.0.0"
       },
       "dependencies": {
-        "lodash.defaults": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-          "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-          "dev": true,
-          "requires": {
-            "lodash._objecttypes": "~2.4.1",
-            "lodash.keys": "~2.4.1"
-          }
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
         }
       }
     },
-    "lodash.templatesettings": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-      "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
+    "is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dev": true,
       "requires": {
-        "lodash._reinterpolate": "~2.4.1",
-        "lodash.escape": "~2.4.1"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "lodash.union": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
-    "lodash.values": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-      "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
       "requires": {
-        "lodash.keys": "~2.4.1"
+        "has-bigints": "^1.0.1"
       }
     },
-    "lodash.zip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
-      "integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=",
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
       "dev": true
     },
-    "log-driver": {
+    "is-callable": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
-      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true
     },
-    "log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+    "is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2"
+        "kind-of": "^6.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "log4js": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
-      "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==",
+    "is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "requires": {
-        "date-format": "^2.0.0",
-        "debug": "^4.1.1",
-        "flatted": "^2.0.0",
-        "rfdc": "^1.1.4",
-        "streamroller": "^1.0.6"
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
+      }
+    },
+    "is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true
+    },
+    "is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.4"
+      },
+      "dependencies": {
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "isobject": "^3.0.1"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
-    "loglevel": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
-      "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
-    "loglevel-plugin-prefix": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz",
-      "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==",
+    "is-finite": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
       "dev": true
     },
-    "loglevelnext": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz",
-      "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+      "dev": true
+    },
+    "is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
       "dev": true,
       "requires": {
-        "es6-symbol": "^3.1.1",
-        "object.assign": "^4.1.0"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "lolex": {
-      "version": "2.7.5",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz",
-      "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==",
-      "dev": true
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
     },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+    "is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
       "dev": true
     },
-    "longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
+    "is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
       "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==",
+    "is-nan": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
+      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
       "dev": true,
       "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       }
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+    "is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
+      "dev": true
+    },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+    "is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "dev": true
     },
-    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+    "is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+    "is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
-        "es5-ext": "~0.10.2"
+        "is-unc-path": "^1.0.0"
       }
     },
-    "make-dir": {
+    "is-running": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
+      "integrity": "sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w==",
+      "dev": true
+    },
+    "is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "dev": true
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
       "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-ssh": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
+      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
+      "dev": true,
+      "requires": {
+        "protocols": "^2.0.1"
       }
     },
-    "make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "dev": true
     },
-    "make-error-cause": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz",
-      "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "requires": {
-        "make-error": "^1.2.0"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.2"
+        "has-symbols": "^1.0.2"
       }
     },
-    "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+    "is-typed-array": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
+      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
       "dev": true,
       "requires": {
-        "tmpl": "1.0.x"
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.20.0",
+        "for-each": "^0.3.3",
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+    "is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "requires": {
+        "unc-path-regex": "^0.1.2"
+      }
     },
-    "map-stream": {
+    "is-unicode-supported": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true
     },
-    "map-visit": {
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "dev": true
+    },
+    "is-valid-glob": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
+      "dev": true
+    },
+    "is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "dev": true
+    },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
       "requires": {
-        "object-visit": "^1.0.0"
+        "call-bind": "^1.0.2"
       }
     },
-    "markdown-escapes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-      "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
+    "is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
-    "markdown-table": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz",
-      "integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==",
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
+    },
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
       "dev": true
     },
-    "marky": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.1.tgz",
-      "integrity": "sha512-md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ==",
+    "isbinaryfile": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
       "dev": true
     },
-    "matchdep": {
+    "isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "dev": true
+    },
+    "istanbul": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+      "integrity": "sha512-nMtdn4hvK0HjUlzr1DrKSUY8ychprt8dzHOgY2KXsIhHu5PuQQEOTM27gV9Xblyon7aUH/TSFIjRHEODF/FRPg==",
       "dev": true,
       "requires": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
+        "abbrev": "1.0.x",
+        "async": "1.x",
+        "escodegen": "1.8.x",
+        "esprima": "2.7.x",
+        "glob": "^5.0.15",
+        "handlebars": "^4.0.1",
+        "js-yaml": "3.x",
+        "mkdirp": "0.5.x",
+        "nopt": "3.x",
+        "once": "1.x",
+        "resolve": "1.1.x",
+        "supports-color": "^3.1.0",
+        "which": "^1.1.1",
+        "wordwrap": "^1.0.0"
       },
       "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "findup-sync": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-          "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
           "dev": true,
           "requires": {
-            "detect-file": "^1.0.0",
-            "is-glob": "^3.1.0",
-            "micromatch": "^3.0.4",
-            "resolve-dir": "^1.0.1"
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
           "dev": true
         },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+        "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": {
-            "is-extglob": "^2.1.0"
+            "minimist": "^1.2.6"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
+          "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "has-flag": "^1.0.0"
           }
         },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "isexe": "^2.0.0"
           }
         }
       }
     },
-    "math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+    "istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true
     },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+    "istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
       }
     },
-    "mdast-util-compact": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz",
-      "integrity": "sha512-3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg==",
+    "istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
       "dev": true,
       "requires": {
-        "unist-util-visit": "^1.1.0"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
-    "mdast-util-definitions": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-1.2.5.tgz",
-      "integrity": "sha512-CJXEdoLfiISCDc2JB6QLb79pYfI6+GcIH+W2ox9nMc7od0Pz+bovcHsiq29xAQY6ayqe/9CsK2VzkSJdg1pFYA==",
+    "istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
       "requires": {
-        "unist-util-visit": "^1.0.0"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
-    "mdast-util-inject": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz",
-      "integrity": "sha1-2wa4tYW+lZotzS+H9HK6m3VvNnU=",
+    "istanbul-reports": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
       "dev": true,
       "requires": {
-        "mdast-util-to-string": "^1.0.0"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       }
     },
-    "mdast-util-to-hast": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz",
-      "integrity": "sha512-/eIbly2YmyVgpJNo+bFLLMCI1XgolO/Ffowhf+pHDq3X4/V6FntC9sGQCDLM147eTS+uSXv5dRzJyFn+o0tazA==",
+    "istextorbinary": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz",
+      "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==",
       "dev": true,
       "requires": {
-        "collapse-white-space": "^1.0.0",
-        "detab": "^2.0.0",
-        "mdast-util-definitions": "^1.2.0",
-        "mdurl": "^1.0.1",
-        "trim": "0.0.1",
-        "trim-lines": "^1.0.0",
-        "unist-builder": "^1.0.1",
-        "unist-util-generated": "^1.1.0",
-        "unist-util-position": "^3.0.0",
-        "unist-util-visit": "^1.1.0",
-        "xtend": "^4.0.1"
+        "binaryextensions": "^2.2.0",
+        "textextensions": "^3.2.0"
       }
     },
-    "mdast-util-to-string": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz",
-      "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==",
-      "dev": true
-    },
-    "mdast-util-toc": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz",
-      "integrity": "sha512-Za0hqL1PqWrvxGtA/3NH9D5nhGAUS9grMM4obEAz5+zsk1RIw/vWUchkaoDLNdrwk05A0CSC5eEXng36/1qE5w==",
+    "jake": {
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
       "dev": true,
       "requires": {
-        "github-slugger": "^1.2.1",
-        "mdast-util-to-string": "^1.0.5",
-        "unist-util-is": "^2.1.2",
-        "unist-util-visit": "^1.1.0"
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.1",
+        "minimatch": "^3.0.4"
       },
       "dependencies": {
-        "emoji-regex": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz",
-          "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "async": {
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
           "dev": true
         },
-        "github-slugger": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz",
-          "integrity": "sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "emoji-regex": ">=6.0.0 <=6.1.1"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "unist-util-is": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.3.tgz",
-          "integrity": "sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
-        }
-      }
-    },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-      "dev": true
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
-    "memoizee": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.45",
-        "es6-weak-map": "^2.0.2",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.1",
-        "lru-queue": "0.1",
-        "next-tick": "1",
-        "timers-ext": "^0.1.5"
-      }
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+    "jest-diff": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "memorystream": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
-      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
+    "jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
       "dev": true
     },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+    "jest-matcher-utils": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "camelcase-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "camelcase": "^2.0.0",
-            "map-obj": "^1.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+    "jest-message-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "requires": {
-        "source-map": "^0.6.1"
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+    "jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
       "dev": true
     },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+    "jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "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"
+          }
+        }
       }
     },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       },
       "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
           "dev": true
         }
       }
     },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true
     },
-    "mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
-    "mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
-      "requires": {
-        "mime-db": "1.44.0"
-      }
+    "json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+    "json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "minimalistic-crypto-utils": {
+    "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true
     },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+    "json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+    },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
       }
     },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+    "jsprim": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.5"
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
       }
     },
-    "mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+    "just-clone": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
+      "integrity": "sha512-p93GINPwrve0w3HUzpXmpTl7MyzzWz1B5ag44KEtq/hP1mtK8lA2b9Q0VQaPlnY87352osJcE6uBmN0e8kuFMw=="
+    },
+    "just-debounce": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
+      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==",
       "dev": true
     },
-    "mocha": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+    "just-extend": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
+      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
+      "dev": true
+    },
+    "karma": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz",
+      "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==",
       "dev": true,
       "requires": {
-        "browser-stdout": "1.3.1",
-        "commander": "2.15.1",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.5",
-        "he": "1.1.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "supports-color": "5.4.0"
+        "@colors/colors": "1.5.0",
+        "body-parser": "^1.19.0",
+        "braces": "^3.0.2",
+        "chokidar": "^3.5.1",
+        "connect": "^3.7.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.1",
+        "glob": "^7.1.7",
+        "graceful-fs": "^4.2.6",
+        "http-proxy": "^1.18.1",
+        "isbinaryfile": "^4.0.8",
+        "lodash": "^4.17.21",
+        "log4js": "^6.4.1",
+        "mime": "^2.5.2",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.5",
+        "qjobs": "^1.2.0",
+        "range-parser": "^1.2.1",
+        "rimraf": "^3.0.2",
+        "socket.io": "^4.4.1",
+        "source-map": "^0.6.1",
+        "tmp": "^0.2.1",
+        "ua-parser-js": "^0.7.30",
+        "yargs": "^16.1.1"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.15.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-          "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
           }
         },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+        "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": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "minimist": "^1.2.6"
           }
         },
-        "he": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-          "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+        "tmp": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+          "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+          "dev": true,
+          "requires": {
+            "rimraf": "^3.0.0"
+          }
         },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+        "yargs": {
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
           "dev": true,
           "requires": {
-            "minimist": "0.0.8"
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
           }
         },
-        "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+        "yargs-parser": {
+          "version": "20.2.9",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+          "dev": true
+        }
+      }
+    },
+    "karma-babel-preprocessor": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.2.tgz",
+      "integrity": "sha512-6ZUnHwaK2EyhgxbgeSJW6n6WZUYSEdekHIV/qDUnPgMkVzQBHEvd07d2mTL5AQjV8uTUgH6XslhaPrp+fHWH2A==",
+      "dev": true,
+      "requires": {}
+    },
+    "karma-browserstack-launcher": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-browserstack-launcher/-/karma-browserstack-launcher-1.4.0.tgz",
+      "integrity": "sha512-bUQK84U+euDfOUfEjcF4IareySMOBNRLrrl9q6cttIe8f011Ir6olLITTYMOJDcGY58wiFIdhPHSPd9Pi6+NfQ==",
+      "dev": true,
+      "requires": {
+        "browserstack": "~1.5.1",
+        "browserstacktunnel-wrapper": "~2.0.2",
+        "q": "~1.5.0"
+      }
+    },
+    "karma-chai": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz",
+      "integrity": "sha512-mqKCkHwzPMhgTYca10S90aCEX9+HjVjjrBFAsw36Zj7BlQNbokXXCAe6Ji04VUMsxcY5RLP7YphpfO06XOubdg==",
+      "dev": true,
+      "requires": {}
+    },
+    "karma-chrome-launcher": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
+      "integrity": "sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==",
+      "dev": true,
+      "requires": {
+        "which": "^1.2.1"
+      },
+      "dependencies": {
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "isexe": "^2.0.0"
           }
         }
       }
     },
-    "module-deps-sortable": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/module-deps-sortable/-/module-deps-sortable-4.0.6.tgz",
-      "integrity": "sha1-ElGkuixEqS32mJvQKdoSGk8hCbA=",
+    "karma-coverage": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.0.tgz",
+      "integrity": "sha512-gPVdoZBNDZ08UCzdMHHhEImKrw1+PAOQOIiffv1YsvxFhBjqvo/SVXNk4tqn1SYqX0BJZT6S/59zgxiBe+9OuA==",
       "dev": true,
       "requires": {
-        "JSONStream": "^1.0.3",
-        "browser-resolve": "^1.7.0",
-        "concat-stream": "~1.5.0",
-        "defined": "^1.0.0",
-        "detective": "^4.0.0",
-        "duplexer2": "^0.1.2",
-        "inherits": "^2.0.1",
-        "parents": "^1.0.0",
-        "readable-stream": "^2.0.2",
-        "resolve": "^1.1.3",
-        "stream-combiner2": "^1.1.1",
-        "subarg": "^1.0.0",
-        "through2": "^2.0.0",
-        "xtend": "^4.0.0"
+        "istanbul-lib-coverage": "^3.2.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.1",
+        "istanbul-reports": "^3.0.5",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "karma-coverage-istanbul-reporter": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz",
+      "integrity": "sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^3.0.6",
+        "istanbul-reports": "^3.0.2",
+        "minimatch": "^3.0.4"
       },
       "dependencies": {
-        "concat-stream": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-          "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
+        "istanbul-lib-source-maps": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
+          "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
           "dev": true,
           "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "~2.0.0",
-            "typedarray": "~0.0.5"
+            "debug": "^4.1.1",
+            "istanbul-lib-coverage": "^2.0.5",
+            "make-dir": "^2.1.0",
+            "rimraf": "^2.6.3",
+            "source-map": "^0.6.1"
           },
           "dependencies": {
-            "readable-stream": {
-              "version": "2.0.6",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-              "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-              "dev": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~1.0.6",
-                "string_decoder": "~0.10.x",
-                "util-deprecate": "~1.0.1"
-              }
+            "istanbul-lib-coverage": {
+              "version": "2.0.5",
+              "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+              "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+              "dev": true
             }
           }
         },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          },
-          "dependencies": {
-            "process-nextick-args": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-              "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-              "dev": true
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-              "dev": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
-    "morgan": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
-      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+    "karma-es5-shim": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/karma-es5-shim/-/karma-es5-shim-0.0.4.tgz",
+      "integrity": "sha512-8xU6F2/R6u6HAZ/nlyhhx3WEhj4C6hJorG7FR2REX81pgj2LSo9ADJXxCGIeXg6Qr2BGpxp4hcZcEOYGAwiumg==",
       "dev": true,
       "requires": {
-        "basic-auth": "~2.0.1",
-        "debug": "2.6.9",
-        "depd": "~2.0.0",
-        "on-finished": "~2.3.0",
-        "on-headers": "~1.0.2"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-          "dev": true
-        }
+        "es5-shim": "^4.0.5"
       }
     },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    "karma-firefox-launcher": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-2.1.2.tgz",
+      "integrity": "sha512-VV9xDQU1QIboTrjtGVD4NCfzIH7n01ZXqy/qpBhnOeGVOkG5JYPEm8kuSd7psHE6WouZaQ9Ool92g8LFweSNMA==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "^2.2.0",
+        "which": "^2.0.1"
+      }
     },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+    "karma-ie-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz",
+      "integrity": "sha512-ts71ke8pHvw6qdRtq0+7VY3ANLoZuUNNkA8abRaWV13QRPNm7TtSOqyszjHUtuwOWKcsSz4tbUtrNICrQC+SXQ==",
       "dev": true,
       "requires": {
-        "duplexer2": "0.0.2"
+        "lodash": "^4.6.1"
+      }
+    },
+    "karma-mocha": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-2.0.1.tgz",
+      "integrity": "sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.3"
+      }
+    },
+    "karma-mocha-reporter": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
+      "integrity": "sha512-Hr6nhkIp0GIJJrvzY8JFeHpQZNseuIakGac4bpw8K1+5F0tLb6l7uvXRa8mt2Z+NVwYgCct4QAfp2R2QP6o00w==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.1.0",
+        "log-symbols": "^2.1.0",
+        "strip-ansi": "^4.0.0"
       },
       "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.1.9"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+        "ansi-regex": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
           "dev": true
         },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "ansi-regex": "^3.0.0"
           }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
         }
       }
     },
-    "mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "dev": true
+    "karma-opera-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz",
+      "integrity": "sha512-rdty4FlVIowmUhPuG08TeXKHvaRxeDSzPxGIkWguCF3A32kE0uvXZ6dXW08PuaNjai8Ip3f5Pn9Pm2HlChaxCw==",
+      "dev": true,
+      "requires": {}
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
+    "karma-safari-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
+      "integrity": "sha512-qmypLWd6F2qrDJfAETvXDfxHvKDk+nyIjpH9xIeI3/hENr0U3nuqkxaftq73PfXZ4aOuOChA6SnLW4m4AxfRjQ==",
+      "dev": true,
+      "requires": {}
     },
-    "nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+    "karma-script-launcher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-1.0.0.tgz",
+      "integrity": "sha512-5NRc8KmTBjNPE3dNfpJP90BArnBohYV4//MsLFfUA1e6N+G1/A5WuWctaFBtMQ6MWRybs/oguSej0JwDr8gInA==",
       "dev": true,
-      "optional": true
+      "requires": {}
     },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+    "karma-sinon": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz",
+      "integrity": "sha512-wrkyAxJmJbn75Dqy17L/8aILJWFm7znd1CE8gkyxTBFnjMSOe2XTJ3P30T8SkxWZHmoHX0SCaUJTDBEoXs25Og==",
+      "dev": true,
+      "requires": {}
+    },
+    "karma-sourcemap-loader": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz",
+      "integrity": "sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "graceful-fs": "^4.1.2"
       }
     },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
+    "karma-spec-reporter": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
+      "integrity": "sha512-ZXsYERZJMTNRR2F3QN11OWF5kgnT/K2dzhM+oY3CDyMrDI3TjIWqYGG7c15rR9wjmy9lvdC+CCshqn3YZqnNrA==",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2"
+      }
     },
-    "ncp": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
-      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
+    "karma-webpack": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz",
+      "integrity": "sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "webpack-merge": "^4.1.5"
+      }
+    },
+    "keycode": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
+      "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==",
       "dev": true
     },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+    "keyv": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.0.tgz",
+      "integrity": "sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.1"
+      }
     },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+    "kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true
     },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+    "kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
       "dev": true
     },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+    "konan": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/konan/-/konan-2.1.1.tgz",
+      "integrity": "sha512-7ZhYV84UzJ0PR/RJnnsMZcAbn+kLasJhVNWsu8ZyVEJYRpGA5XESQ9d/7zOa08U0Ou4cmB++hMNY/3OSV9KIbg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.10.5",
+        "@babel/traverse": "^7.10.5"
+      }
+    },
+    "ky": {
+      "version": "0.29.0",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-0.29.0.tgz",
+      "integrity": "sha512-01TBSOqlHmLfcQhHseugGHLxPtU03OyZWaLDWt5MfzCkijG6xWFvAQPhKVn0cR2MMjYvBP9keQ8A3+rQEhLO5g==",
       "dev": true
     },
-    "nise": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz",
-      "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==",
+    "last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==",
       "dev": true,
       "requires": {
-        "@sinonjs/formatio": "^3.2.1",
-        "@sinonjs/text-encoding": "^0.7.1",
-        "just-extend": "^4.0.2",
-        "lolex": "^5.0.1",
-        "path-to-regexp": "^1.7.0"
-      },
-      "dependencies": {
-        "@sinonjs/formatio": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz",
-          "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==",
-          "dev": true,
-          "requires": {
-            "@sinonjs/commons": "^1",
-            "@sinonjs/samsam": "^3.1.0"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "lolex": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
-          "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
-          "dev": true,
-          "requires": {
-            "@sinonjs/commons": "^1.7.0"
-          }
-        },
-        "path-to-regexp": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-          "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-          "dev": true,
-          "requires": {
-            "isarray": "0.0.1"
-          }
-        }
+        "default-resolution": "^2.0.0",
+        "es6-weak-map": "^2.0.1"
+      }
+    },
+    "lazystream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.0.5"
+      }
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "lcov-parse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz",
+      "integrity": "sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==",
+      "dev": true
+    },
+    "lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==",
+      "dev": true,
+      "requires": {
+        "flush-write-stream": "^1.0.2"
       }
     },
-    "node-environment-flags": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
-      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
       "requires": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       }
     },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
-    },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
+    "liftoff": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
+      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
+      "requires": {
+        "extend": "^3.0.0",
+        "findup-sync": "^3.0.0",
+        "fined": "^1.0.1",
+        "flagged-respawn": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.0",
+        "rechoir": "^0.6.2",
+        "resolve": "^1.1.7"
       },
       "dependencies": {
-        "buffer": {
-          "version": "4.9.2",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-          "dev": true,
-          "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4",
-            "isarray": "^1.0.0"
-          }
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "isobject": "^3.0.1"
           }
         }
       }
     },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true
-    },
-    "node-notifier": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
-      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
+    "lighthouse-logger": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz",
+      "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==",
       "dev": true,
       "requires": {
-        "growly": "^1.3.0",
-        "is-wsl": "^1.1.0",
-        "semver": "^5.5.0",
-        "shellwords": "^0.1.1",
-        "which": "^1.3.0"
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
       },
       "dependencies": {
-        "is-wsl": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+        "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"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
     },
-    "node-releases": {
-      "version": "1.1.58",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
-      "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1"
-      }
+    "listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==",
+      "dev": true
     },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
+    "live-connect-js": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.1.tgz",
+      "integrity": "sha512-rwB0IQfuKPJM+I96nLyq8Utr3LkQ7Z/iuq/xKlWDckQRJLYyWkk7F7yaavf/VsjazzLK2dpJeXGijoDkK4Vz8g==",
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "tiny-hashes": "1.0.1"
       }
     },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "normalize-url": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+    "livereload-js": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
+      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
       "dev": true
     },
-    "now-and-later": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.2"
-      }
-    },
-    "npm-run-all": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
-      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "pidtree": "^0.3.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
         "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
           "dev": true,
           "requires": {
-            "pify": "^3.0.0"
+            "error-ex": "^1.2.0"
           }
         },
         "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
           "dev": true
         },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "is-utf8": "^0.2.0"
           }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
         }
       }
     },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+    "loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
       }
     },
-    "null-check": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
-      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
       "dev": true
     },
-    "nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+    "lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
       "dev": true
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+    "lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
       "dev": true
     },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
       "dev": true
     },
-    "object-component": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
-      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
       "dev": true
     },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
+    "lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==",
+      "dev": true
+    },
+    "lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
+      "dev": true
+    },
+    "lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
+      "dev": true
+    },
+    "lodash.clone": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
+      "integrity": "sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==",
+      "dev": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
+      "dev": true
     },
-    "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "object-is": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
-      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "dev": true
     },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    "lodash.difference": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
+      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
+      "dev": true
     },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+    "lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
       "dev": true,
       "requires": {
-        "isobject": "^3.0.0"
+        "lodash._root": "^3.0.0"
       }
     },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
+    "lodash.flatten": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
+      "dev": true
     },
-    "object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "requires": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
+    "lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
+      "dev": true
     },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "dev": true
     },
-    "object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "dev": true
     },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "dev": true,
-      "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-own": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-          "dev": true,
-          "requires": {
-            "for-in": "^1.0.1"
-          }
-        }
-      }
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
+      "dev": true
     },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
+    "lodash.isobject": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==",
+      "dev": true
     },
-    "object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "dev": true
     },
-    "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
       }
     },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
+    "lodash.pickby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
+      "integrity": "sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==",
+      "dev": true
     },
-    "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
+    "lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
+      "dev": true
     },
-    "opener": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
-      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
+    "lodash.some": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
       "dev": true
     },
-    "opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+    "lodash.template": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
       "dev": true,
       "requires": {
-        "is-wsl": "^1.1.0"
-      },
-      "dependencies": {
-        "is-wsl": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-          "dev": true
-        }
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
       }
     },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+    "lodash.templatesettings": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
       "dev": true,
       "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-          "dev": true
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-          "dev": true
-        }
+        "lodash._reinterpolate": "^3.0.0"
       }
     },
-    "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
+    "lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
     },
-    "ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
-      }
+    "lodash.union": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
+      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
+      "dev": true
     },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+    "lodash.zip": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
+      "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==",
       "dev": true
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+    "log-driver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
+      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
       "dev": true
     },
-    "os-locale": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+    "log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        }
+        "chalk": "^2.0.1"
       }
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+    "log4js": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
+      "integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
+      "dev": true,
+      "requires": {
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.1.3"
+      }
+    },
+    "loglevel": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz",
+      "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
+      "dev": true
+    },
+    "loglevel-plugin-prefix": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz",
+      "integrity": "sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==",
       "dev": true
     },
-    "p-cancelable": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz",
-      "integrity": "sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==",
+    "lolex": {
+      "version": "2.7.5",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz",
+      "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==",
       "dev": true
     },
-    "p-each-series": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
-      "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
+    "longest-streak": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.0.1.tgz",
+      "integrity": "sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg==",
+      "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": {
-        "p-reduce": "^1.0.0"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+    "loupe": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
+      "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+      "dev": true,
+      "requires": {
+        "get-func-name": "^2.0.0"
+      }
     },
-    "p-is-promise": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+    "lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
       "dev": true
     },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
+        "yallist": "^4.0.0"
       }
     },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+    "lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
       "dev": true,
       "requires": {
-        "p-limit": "^1.1.0"
+        "es5-ext": "~0.10.2"
       }
     },
-    "p-reduce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
-      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
-      "dev": true
-    },
-    "p-timeout": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
-      "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+    "m3u8-parser": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
+      "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
       "dev": true,
       "requires": {
-        "p-finally": "^1.0.0"
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "global": "^4.4.0"
       }
     },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true
+    "magic-string": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "sourcemap-codec": "^1.4.8"
+      }
     },
-    "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      }
     },
-    "parents": {
+    "make-iterator": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-      "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
-        "path-platform": "~0.11.15"
+        "kind-of": "^6.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true
+    },
+    "map-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
+      "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
       "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
+        "object-visit": "^1.0.0"
       }
     },
-    "parse-domain": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/parse-domain/-/parse-domain-2.3.4.tgz",
-      "integrity": "sha512-LlFJJVTry4DD3Xa76CsVNP6MIu3JZ8GXd5HEEp38KSDGBCVsnccagAJ5YLy7uEEabvwtauQEQPcvXWgUGkJbMA==",
+    "markdown-table": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
+      "integrity": "sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==",
+      "dev": true
+    },
+    "marky": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
+      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
+      "dev": true
+    },
+    "matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
       "dev": true,
       "requires": {
-        "got": "^8.3.2",
-        "jest": "^24.9.0",
-        "mkdirp": "^0.5.1",
-        "npm-run-all": "^4.1.5"
+        "findup-sync": "^2.0.0",
+        "micromatch": "^3.0.4",
+        "resolve": "^1.4.0",
+        "stack-trace": "0.0.10"
       },
       "dependencies": {
-        "@sindresorhus/is": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-          "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
           "dev": true
         },
-        "cacheable-request": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
-          "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
-            "clone-response": "1.0.2",
-            "get-stream": "3.0.0",
-            "http-cache-semantics": "3.8.1",
-            "keyv": "3.0.0",
-            "lowercase-keys": "1.0.0",
-            "normalize-url": "2.0.1",
-            "responselike": "1.0.2"
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
           },
           "dependencies": {
-            "lowercase-keys": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-              "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
               "dev": true
             }
           }
         },
-        "decompress-response": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-          "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
           "dev": true,
           "requires": {
-            "mimic-response": "^1.0.0"
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
           }
         },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        },
-        "got": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
-          "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
-          "dev": true,
-          "requires": {
-            "@sindresorhus/is": "^0.7.0",
-            "cacheable-request": "^2.1.1",
-            "decompress-response": "^3.3.0",
-            "duplexer3": "^0.1.4",
-            "get-stream": "^3.0.0",
-            "into-stream": "^3.1.0",
-            "is-retry-allowed": "^1.1.0",
-            "isurl": "^1.0.0-alpha5",
-            "lowercase-keys": "^1.0.0",
-            "mimic-response": "^1.0.0",
-            "p-cancelable": "^0.4.0",
-            "p-timeout": "^2.0.1",
-            "pify": "^3.0.0",
-            "safe-buffer": "^5.1.1",
-            "timed-out": "^4.0.1",
-            "url-parse-lax": "^3.0.0",
-            "url-to-options": "^1.0.1"
-          }
-        },
-        "http-cache-semantics": {
-          "version": "3.8.1",
-          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-          "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-          "dev": true
-        },
-        "json-buffer": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-          "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-          "dev": true
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
+            }
+          }
         },
-        "keyv": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
-          "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+        "findup-sync": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+          "integrity": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
           "dev": true,
           "requires": {
-            "json-buffer": "3.0.0"
+            "detect-file": "^1.0.0",
+            "is-glob": "^3.1.0",
+            "micromatch": "^3.0.4",
+            "resolve-dir": "^1.0.1"
           }
         },
-        "lowercase-keys": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-          "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
-        "normalize-url": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-          "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
           "dev": true,
           "requires": {
-            "prepend-http": "^2.0.0",
-            "query-string": "^5.0.1",
-            "sort-keys": "^2.0.0"
+            "is-extglob": "^2.1.0"
           }
         },
-        "p-cancelable": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
-          "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
-          "dev": true
-        },
-        "pify": {
+        "is-number": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "prepend-http": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-          "dev": true
-        },
-        "query-string": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-          "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
           "dev": true,
           "requires": {
-            "decode-uri-component": "^0.2.0",
-            "object-assign": "^4.1.0",
-            "strict-uri-encode": "^1.0.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "responselike": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-          "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
           "dev": true,
           "requires": {
-            "lowercase-keys": "^1.0.0"
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
           }
         },
-        "sort-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-          "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
           "dev": true,
           "requires": {
-            "is-plain-obj": "^1.0.0"
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
           }
         }
       }
     },
-    "parse-entities": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz",
-      "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==",
+    "mdast-util-definitions": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
+      "integrity": "sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.0",
+        "unist-util-visit": "^4.0.0"
+      }
+    },
+    "mdast-util-find-and-replace": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz",
+      "integrity": "sha512-SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^5.0.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^5.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+          "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+          "dev": true
+        }
+      }
+    },
+    "mdast-util-from-markdown": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz",
+      "integrity": "sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "mdast-util-to-string": "^3.1.0",
+        "micromark": "^3.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-decode-string": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "uvu": "^0.5.0"
+      },
+      "dependencies": {
+        "mdast-util-to-string": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+          "dev": true
+        }
+      }
+    },
+    "mdast-util-gfm": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz",
+      "integrity": "sha512-42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ==",
       "dev": true,
       "requires": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
+        "mdast-util-from-markdown": "^1.0.0",
+        "mdast-util-gfm-autolink-literal": "^1.0.0",
+        "mdast-util-gfm-footnote": "^1.0.0",
+        "mdast-util-gfm-strikethrough": "^1.0.0",
+        "mdast-util-gfm-table": "^1.0.0",
+        "mdast-util-gfm-task-list-item": "^1.0.0",
+        "mdast-util-to-markdown": "^1.0.0"
       }
     },
-    "parse-filepath": {
+    "mdast-util-gfm-autolink-literal": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz",
+      "integrity": "sha512-FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg==",
       "dev": true,
       "requires": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
+        "@types/mdast": "^3.0.0",
+        "ccount": "^2.0.0",
+        "mdast-util-find-and-replace": "^2.0.0",
+        "micromark-util-character": "^1.0.0"
       }
     },
-    "parse-git-config": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/parse-git-config/-/parse-git-config-0.2.0.tgz",
-      "integrity": "sha1-Jygz/dFf6hRvt10zbSNrljtv9wY=",
+    "mdast-util-gfm-footnote": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz",
+      "integrity": "sha512-p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw==",
       "dev": true,
       "requires": {
-        "ini": "^1.3.3"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0",
+        "micromark-util-normalize-identifier": "^1.0.0"
       }
     },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+    "mdast-util-gfm-strikethrough": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz",
+      "integrity": "sha512-zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg==",
       "dev": true,
       "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        }
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
       }
     },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+    "mdast-util-gfm-table": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz",
+      "integrity": "sha512-uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag==",
       "dev": true,
       "requires": {
-        "error-ex": "^1.2.0"
+        "@types/mdast": "^3.0.0",
+        "markdown-table": "^3.0.0",
+        "mdast-util-from-markdown": "^1.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
       }
     },
-    "parse-ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
-      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
-      "dev": true
-    },
-    "parse-node-version": {
+    "mdast-util-gfm-task-list-item": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz",
+      "integrity": "sha512-KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
+      }
     },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
+    "mdast-util-inject": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz",
+      "integrity": "sha512-CcJ0mHa36QYumDKiZ2OIR+ClhfOM7zIzN+Wfy8tRZ1hpH9DKLCS+Mh4DyK5bCxzE9uxMWcbIpeNFWsg1zrj/2g==",
+      "dev": true,
+      "requires": {
+        "mdast-util-to-string": "^1.0.0"
+      }
     },
-    "parse-path": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-3.0.4.tgz",
-      "integrity": "sha512-wP70vtwv2DyrM2YoA7ZHVv4zIXa4P7dGgHlj+VwyXNDduLLVJ7NMY1zsFxjUUJ3DAwJLupGb1H5gMDDiNlJaxw==",
+    "mdast-util-to-hast": {
+      "version": "12.2.4",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz",
+      "integrity": "sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg==",
       "dev": true,
       "requires": {
-        "is-ssh": "^1.3.0",
-        "protocols": "^1.4.0"
+        "@types/hast": "^2.0.0",
+        "@types/mdast": "^3.0.0",
+        "mdast-util-definitions": "^5.0.0",
+        "micromark-util-sanitize-uri": "^1.1.0",
+        "trim-lines": "^3.0.0",
+        "unist-builder": "^3.0.0",
+        "unist-util-generated": "^2.0.0",
+        "unist-util-position": "^4.0.0",
+        "unist-util-visit": "^4.0.0"
       }
     },
-    "parse-url": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-3.0.2.tgz",
-      "integrity": "sha1-YCeHpwY6eV1yuGcxl1BecvYGEL4=",
+    "mdast-util-to-markdown": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz",
+      "integrity": "sha512-6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.0",
+        "longest-streak": "^3.0.0",
+        "mdast-util-to-string": "^3.0.0",
+        "micromark-util-decode-string": "^1.0.0",
+        "unist-util-visit": "^4.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "dependencies": {
+        "mdast-util-to-string": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+          "dev": true
+        }
+      }
+    },
+    "mdast-util-to-string": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz",
+      "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==",
+      "dev": true
+    },
+    "mdast-util-toc": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-6.1.0.tgz",
+      "integrity": "sha512-0PuqZELXZl4ms1sF7Lqigrqik4Ll3UhbI+jdTrfw7pZ9QPawgl7LD4GQ8MkU7bT/EwiVqChNTbifa2jLLKo76A==",
       "dev": true,
       "requires": {
-        "is-ssh": "^1.3.0",
-        "normalize-url": "^1.9.1",
-        "parse-path": "^3.0.1",
-        "protocols": "^1.4.0"
+        "@types/extend": "^3.0.0",
+        "@types/github-slugger": "^1.0.0",
+        "@types/mdast": "^3.0.0",
+        "extend": "^3.0.0",
+        "github-slugger": "^1.0.0",
+        "mdast-util-to-string": "^3.1.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit": "^3.0.0"
       },
       "dependencies": {
-        "normalize-url": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+        "mdast-util-to-string": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
+          "dev": true
+        },
+        "unist-util-visit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-3.1.0.tgz",
+          "integrity": "sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==",
+          "dev": true,
+          "requires": {
+            "@types/unist": "^2.0.0",
+            "unist-util-is": "^5.0.0",
+            "unist-util-visit-parents": "^4.0.0"
+          }
+        },
+        "unist-util-visit-parents": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz",
+          "integrity": "sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==",
           "dev": true,
           "requires": {
-            "object-assign": "^4.0.1",
-            "prepend-http": "^1.0.0",
-            "query-string": "^4.1.0",
-            "sort-keys": "^1.0.0"
+            "@types/unist": "^2.0.0",
+            "unist-util-is": "^5.0.0"
           }
         }
       }
     },
-    "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-      "dev": true
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
-    "parseqs": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+    "memoizee": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
+      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.53",
+        "es6-weak-map": "^2.0.3",
+        "event-emitter": "^0.3.5",
+        "is-promise": "^2.2.2",
+        "lru-queue": "^0.1.0",
+        "next-tick": "^1.1.0",
+        "timers-ext": "^0.1.7"
       }
     },
-    "parseuri": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+    "memory-fs": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
       "dev": true,
       "requires": {
-        "better-assert": "~1.0.0"
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
       }
     },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
-    "path-is-absolute": {
+    "merge-descriptors": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
-    "path-parse": {
+    "micromark": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.1.0.tgz",
+      "integrity": "sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==",
+      "dev": true,
+      "requires": {
+        "@types/debug": "^4.0.0",
+        "debug": "^4.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-core-commonmark": "^1.0.1",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-combine-extensions": "^1.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-encode": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-subtokenize": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.1",
+        "uvu": "^0.5.0"
+      }
+    },
+    "micromark-core-commonmark": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "path-platform": {
-      "version": "0.11.15",
-      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-      "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=",
-      "dev": true
-    },
-    "path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz",
+      "integrity": "sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==",
+      "dev": true,
+      "requires": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-factory-destination": "^1.0.0",
+        "micromark-factory-label": "^1.0.0",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-factory-title": "^1.0.0",
+        "micromark-factory-whitespace": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-classify-character": "^1.0.0",
+        "micromark-util-html-tag-name": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-subtokenize": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.1",
+        "uvu": "^0.5.0"
+      }
+    },
+    "micromark-extension-gfm": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-2.0.1.tgz",
+      "integrity": "sha512-p2sGjajLa0iYiGQdT0oelahRYtMWvLjy8J9LOCxzIQsllMCGLbsLW+Nc+N4vi02jcRJvedVJ68cjelKIO6bpDA==",
       "dev": true,
       "requires": {
-        "path-root-regex": "^0.1.0"
+        "micromark-extension-gfm-autolink-literal": "^1.0.0",
+        "micromark-extension-gfm-footnote": "^1.0.0",
+        "micromark-extension-gfm-strikethrough": "^1.0.0",
+        "micromark-extension-gfm-table": "^1.0.0",
+        "micromark-extension-gfm-tagfilter": "^1.0.0",
+        "micromark-extension-gfm-task-list-item": "^1.0.0",
+        "micromark-util-combine-extensions": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+    "micromark-extension-gfm-autolink-literal": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.3.tgz",
+      "integrity": "sha512-i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
-    "pathval": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
-      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
-      "dev": true
-    },
-    "pause-stream": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+    "micromark-extension-gfm-footnote": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.4.tgz",
+      "integrity": "sha512-E/fmPmDqLiMUP8mLJ8NbJWJ4bTw6tS+FEQS8CcuDtZpILuOb2kjLqPEeAePF1djXROHXChM/wPJw0iS4kHCcIg==",
       "dev": true,
       "requires": {
-        "through": "~2.3"
+        "micromark-core-commonmark": "^1.0.0",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
-    "pbkdf2": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.0.tgz",
-      "integrity": "sha512-wHMFZ6HTLGlB9f/WsQBs5OwMQJoLXYuJUzbA+j+hRBf7+Y8KcXpatzIviIcTy1OAyhWQp08nyiPO8Dnv0z4Sww==",
+    "micromark-extension-gfm-strikethrough": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.4.tgz",
+      "integrity": "sha512-/vjHU/lalmjZCT5xt7CcHVJGq8sYRm80z24qAKXzaHzem/xsDYb2yLL+NNVbYvmpLx3O7SYPuGL5pzusL9CLIQ==",
       "dev": true,
       "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-classify-character": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
-    "pbkdf2-compat": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz",
-      "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=",
-      "dev": true
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-      "dev": true
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true
-    },
-    "pidtree": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
-      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
-      "dev": true
+    "micromark-extension-gfm-table": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.5.tgz",
+      "integrity": "sha512-xAZ8J1X9W9K3JTJTUL7G6wSKhp2ZYHrFk5qJgY/4B33scJzE2kpfRL6oiw/veJTbt7jiM/1rngLlOKPWr1G+vg==",
+      "dev": true,
+      "requires": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
     },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
+    "micromark-extension-gfm-tagfilter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.1.tgz",
+      "integrity": "sha512-Ty6psLAcAjboRa/UKUbbUcwjVAv5plxmpUTy2XC/3nJFL37eHej8jrHrRzkqcpipJliuBH30DTs7+3wqNcQUVA==",
+      "dev": true,
+      "requires": {
+        "micromark-util-types": "^1.0.0"
+      }
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
+    "micromark-extension-gfm-task-list-item": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.3.tgz",
+      "integrity": "sha512-PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q==",
+      "dev": true,
+      "requires": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
     },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+    "micromark-factory-destination": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz",
+      "integrity": "sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==",
       "dev": true,
       "requires": {
-        "pinkie": "^2.0.0"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+    "micromark-factory-label": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz",
+      "integrity": "sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==",
       "dev": true,
       "requires": {
-        "node-modules-regexp": "^1.0.0"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
-    "pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+    "micromark-factory-space": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz",
+      "integrity": "sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==",
       "dev": true,
       "requires": {
-        "find-up": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        }
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "micromark-factory-title": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz",
+      "integrity": "sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==",
+      "dev": true,
+      "requires": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
-    "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+    "micromark-factory-whitespace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz",
+      "integrity": "sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+    "micromark-util-character": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz",
+      "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-          "dev": true,
-          "requires": {
-            "ansi-wrap": "^0.1.0"
-          }
-        }
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true
+    "micromark-util-chunked": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz",
+      "integrity": "sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==",
+      "dev": true,
+      "requires": {
+        "micromark-util-symbol": "^1.0.0"
+      }
     },
-    "pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-      "dev": true
+    "micromark-util-classify-character": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz",
+      "integrity": "sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==",
+      "dev": true,
+      "requires": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
     },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
+    "micromark-util-combine-extensions": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz",
+      "integrity": "sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==",
+      "dev": true,
+      "requires": {
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
     },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
+    "micromark-util-decode-numeric-character-reference": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz",
+      "integrity": "sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==",
+      "dev": true,
+      "requires": {
+        "micromark-util-symbol": "^1.0.0"
+      }
     },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+    "micromark-util-decode-string": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz",
+      "integrity": "sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==",
+      "dev": true,
+      "requires": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "micromark-util-encode": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz",
+      "integrity": "sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==",
       "dev": true
     },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+    "micromark-util-html-tag-name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz",
+      "integrity": "sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==",
       "dev": true
     },
-    "pretty-format": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
-      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+    "micromark-util-normalize-identifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz",
+      "integrity": "sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
+        "micromark-util-symbol": "^1.0.0"
       }
     },
-    "pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true
-    },
-    "pretty-ms": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.0.tgz",
-      "integrity": "sha512-J3aPWiC5e9ZeZFuSeBraGxSkGMOvulSWsxDByOcbD1Pr75YL3LSNIKIb52WXbCLE1sS5s4inBBbryjF4Y05Ceg==",
+    "micromark-util-resolve-all": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz",
+      "integrity": "sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==",
       "dev": true,
       "requires": {
-        "parse-ms": "^2.1.0"
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "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
+    "micromark-util-sanitize-uri": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz",
+      "integrity": "sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==",
+      "dev": true,
+      "requires": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-encode": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0"
+      }
     },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+    "micromark-util-subtokenize": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz",
+      "integrity": "sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==",
+      "dev": true,
+      "requires": {
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
     },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+    "micromark-util-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz",
+      "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==",
       "dev": true
     },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+    "micromark-util-types": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz",
+      "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==",
       "dev": true
     },
-    "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "requires": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       }
     },
-    "property-information": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-3.2.0.tgz",
-      "integrity": "sha1-/RSDyPusYYCPX+NZ52k6H0ilgzE=",
+    "mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "dev": true
     },
-    "protocols": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz",
-      "integrity": "sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==",
-      "dev": true
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
-    "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.1"
+        "mime-db": "1.52.0"
       }
     },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
-    "prr": {
+    "mimic-response": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
       "dev": true
     },
-    "ps-tree": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
-      "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
       "dev": true,
       "requires": {
-        "event-stream": "=3.3.4"
+        "dom-walk": "^0.1.0"
       }
     },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
       "dev": true
     },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      }
+    },
+    "mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "dev": true
     },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
+    "mocha": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
+      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
       },
       "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "diff": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          },
+          "dependencies": {
+            "minimatch": {
+              "version": "3.1.2",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+              "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+              "dev": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            }
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
-        }
-      }
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "argparse": "^2.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
+          }
+        },
+        "minimatch": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          },
+          "dependencies": {
+            "brace-expansion": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+              "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+              "dev": true,
+              "requires": {
+                "balanced-match": "^1.0.0"
+              }
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "yargs": {
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
           }
+        },
+        "yargs-parser": {
+          "version": "20.2.4",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+          "dev": true
         }
       }
     },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "puppeteer-core": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-3.3.0.tgz",
-      "integrity": "sha512-hynQ3r0J/lkGrKeBCqu160jrj0WhthYLIzDQPkBxLzxPokjw4elk1sn6mXAian/kfD2NRzpdh9FSykxZyL56uA==",
+    "morgan": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.0",
-        "extract-zip": "^2.0.0",
-        "https-proxy-agent": "^4.0.0",
-        "mime": "^2.0.3",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^3.0.2",
-        "tar-fs": "^2.0.0",
-        "unbzip2-stream": "^1.3.3",
-        "ws": "^7.2.3"
+        "basic-auth": "~2.0.1",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-finished": "~2.3.0",
+        "on-headers": "~1.0.2"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "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.1.1"
+            "ms": "2.0.0"
           }
         },
-        "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-          "dev": true
-        },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
           "dev": true,
           "requires": {
-            "glob": "^7.1.3"
+            "ee-first": "1.1.1"
           }
         }
       }
     },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
+    "mpd-parser": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
+      "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "@xmldom/xmldom": "^0.7.2",
+        "global": "^4.4.0"
+      }
     },
-    "qjobs": {
+    "mri": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
+      "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
       "dev": true
     },
-    "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+    "mrmime": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
+      "dev": true
     },
-    "query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==",
       "dev": true,
       "requires": {
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
+        "duplexer2": "0.0.2"
       }
     },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+    "mute-stdout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
       "dev": true
     },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
-    "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
-      "dev": true
+    "mux.js": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.0.1.tgz",
+      "integrity": "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "global": "^4.4.0"
+      }
     },
-    "quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+    "nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "dev": true,
+      "optional": true
+    },
+    "nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
       "dev": true
     },
-    "randomatic": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
-      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "requires": {
-        "is-number": "^4.0.0",
-        "kind-of": "^6.0.0",
-        "math-random": "^1.0.1"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
-        "is-number": {
+        "arr-diff": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
     },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
     },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    "ncp": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "integrity": "sha512-PfGU8jYWdRl4FqJfCy0IzbkGyFHntfWygZg46nFk/dJD/XRrk2cj0SsKSX9n5u5gE0E0YfEpKWrEkfjnlZSTXA==",
+      "dev": true
     },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
+    "negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
     },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+    "neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "read-pkg": {
+    "next-tick": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      }
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
+      "dev": true
     },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "nise": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz",
+      "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "@sinonjs/formatio": "^3.2.1",
+        "@sinonjs/text-encoding": "^0.7.1",
+        "just-extend": "^4.0.2",
+        "lolex": "^5.0.1",
+        "path-to-regexp": "^1.7.0"
       },
       "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+        "@sinonjs/formatio": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz",
+          "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==",
           "dev": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "@sinonjs/commons": "^1",
+            "@sinonjs/samsam": "^3.1.0"
           }
         },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "lolex": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
+          "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "path-to-regexp": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+          "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+          "dev": true,
+          "requires": {
+            "isarray": "0.0.1"
           }
         }
       }
     },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+    "node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dev": true,
       "requires": {
-        "picomatch": "^2.2.1"
+        "whatwg-url": "^5.0.0"
       }
     },
-    "realpath-native": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
-      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
-      "dev": true,
-      "requires": {
-        "util.promisify": "^1.0.0"
-      }
+    "node-releases": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
+      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
       "dev": true,
       "requires": {
-        "resolve": "^1.1.6"
+        "abbrev": "1"
       }
     },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+    "normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
       },
       "dependencies": {
-        "indent-string": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+        "semver": {
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
-            "repeating": "^2.0.0"
+            "lru-cache": "^6.0.0"
           }
         }
       }
     },
-    "regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
-    "regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.0"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-    },
-    "regenerator-transform": {
-      "version": "0.14.4",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
-      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.8.4",
-        "private": "^0.1.8"
-      }
+    "normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "dev": true
     },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+    "now-and-later": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "^0.1.3"
+        "once": "^1.3.2"
       }
     },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "path-key": "^2.0.0"
+      },
+      "dependencies": {
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+          "dev": true
+        }
       }
     },
-    "regexpp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
       "dev": true
     },
-    "regexpu-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.2.0",
-        "regjsgen": "^0.5.1",
-        "regjsparser": "^0.6.4",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.2.0"
-      }
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
     },
-    "regjsgen": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true
     },
-    "regjsparser": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
       "requires": {
-        "jsesc": "~0.5.0"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
         }
       }
     },
-    "remark": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-9.0.0.tgz",
-      "integrity": "sha512-amw8rGdD5lHbMEakiEsllmkdBP+/KpjW/PRK6NSGPZKCQowh0BT4IWXDAkRMyG3SB9dKPXWMviFjNusXzXNn3A==",
-      "dev": true,
-      "requires": {
-        "remark-parse": "^5.0.0",
-        "remark-stringify": "^5.0.0",
-        "unified": "^6.0.0"
-      }
-    },
-    "remark-html": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-7.0.0.tgz",
-      "integrity": "sha512-jqRzkZXCkM12gIY2ibMLTW41m7rfanliMTVQCFTezHJFsbH00YaTox/BX4gU+f/zCdzfhFJONtebFByvpMv37w==",
-      "dev": true,
-      "requires": {
-        "hast-util-sanitize": "^1.0.0",
-        "hast-util-to-html": "^3.0.0",
-        "mdast-util-to-hast": "^3.0.0",
-        "xtend": "^4.0.1"
-      }
-    },
-    "remark-parse": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz",
-      "integrity": "sha512-b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==",
-      "dev": true,
-      "requires": {
-        "collapse-white-space": "^1.0.2",
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "is-word-character": "^1.0.0",
-        "markdown-escapes": "^1.0.0",
-        "parse-entities": "^1.1.0",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "trim": "0.0.1",
-        "trim-trailing-lines": "^1.0.0",
-        "unherit": "^1.0.4",
-        "unist-util-remove-position": "^1.0.0",
-        "vfile-location": "^2.0.0",
-        "xtend": "^4.0.1"
-      }
-    },
-    "remark-reference-links": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/remark-reference-links/-/remark-reference-links-4.0.4.tgz",
-      "integrity": "sha512-+2X8hwSQqxG4tvjYZNrTcEC+bXp8shQvwRGG6J/rnFTvBoU4G0BBviZoqKGZizLh/DG+0gSYhiDDWCqyxXW1iQ==",
-      "dev": true,
-      "requires": {
-        "unist-util-visit": "^1.0.0"
-      }
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
     },
-    "remark-slug": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/remark-slug/-/remark-slug-5.1.2.tgz",
-      "integrity": "sha512-DWX+Kd9iKycqyD+/B+gEFO3jjnt7Yg1O05lygYSNTe5i5PIxxxPjp5qPBDxPIzp5wreF7+1ROCwRgjEcqmzr3A==",
+    "object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
       "requires": {
-        "github-slugger": "^1.0.0",
-        "mdast-util-to-string": "^1.0.0",
-        "unist-util-visit": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
-    "remark-stringify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-5.0.0.tgz",
-      "integrity": "sha512-Ws5MdA69ftqQ/yhRF9XhVV29mhxbfGhbz0Rx5bQH+oJcNhhSM6nCu1EpLod+DjrFGrU0BMPs+czVmJZU7xiS7w==",
-      "dev": true,
-      "requires": {
-        "ccount": "^1.0.0",
-        "is-alphanumeric": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-whitespace-character": "^1.0.0",
-        "longest-streak": "^2.0.1",
-        "markdown-escapes": "^1.0.0",
-        "markdown-table": "^1.1.0",
-        "mdast-util-compact": "^1.0.0",
-        "parse-entities": "^1.0.2",
-        "repeat-string": "^1.5.4",
-        "state-toggle": "^1.0.0",
-        "stringify-entities": "^1.0.1",
-        "unherit": "^1.0.4",
-        "xtend": "^4.0.1"
-      }
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
     },
-    "remark-toc": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/remark-toc/-/remark-toc-5.1.1.tgz",
-      "integrity": "sha512-vCPW4YOsm2CfyuScdktM9KDnJXVHJsd/ZeRtst+dnBU3B3KKvt8bc+bs5syJjyptAHfqo7H+5Uhz+2blWBfwow==",
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
       "requires": {
-        "mdast-util-toc": "^3.0.0",
-        "remark-slug": "^5.0.0"
+        "isobject": "^3.0.0"
       }
     },
-    "remote-origin-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/remote-origin-url/-/remote-origin-url-0.4.0.tgz",
-      "integrity": "sha1-TT4pAvNOLTfRwmPYdxC3frQIajA=",
+    "object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dev": true,
       "requires": {
-        "parse-git-config": "^0.2.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
       }
     },
-    "remove-bom-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+    "object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
       "dev": true,
       "requires": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        }
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
-    "remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+    "object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
       "dev": true,
       "requires": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
       }
     },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
       "requires": {
-        "is-finite": "^1.0.0"
+        "isobject": "^3.0.1"
       }
     },
-    "replace-ext": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-      "dev": true
-    },
-    "replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+    "object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
       }
     },
-    "replacestream": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
-      "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
+    "object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.3",
-        "object-assign": "^4.0.1",
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       }
     },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "dev": true,
+    "on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-          "dev": true
-        }
+        "ee-first": "1.1.1"
       }
     },
-    "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15"
+        "wrappy": "1"
       }
     },
-    "request-promise-native": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
       "requires": {
-        "request-promise-core": "1.1.3",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
+        "mimic-fn": "^2.1.0"
       }
     },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+    "opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true
     },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+    "opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
       "dev": true,
       "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
+        "is-wsl": "^1.1.0"
       },
       "dependencies": {
-        "resolve-from": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+        "is-wsl": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+          "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
           "dev": true
         }
       }
     },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
       "dev": true,
       "requires": {
-        "path-parse": "^1.0.6"
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
       }
     },
-    "resolve-alpn": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz",
-      "integrity": "sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==",
-      "dev": true
-    },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+    "ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
       "dev": true,
       "requires": {
-        "resolve-from": "^3.0.0"
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
       },
       "dependencies": {
-        "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
+        },
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
-    "resolve-dir": {
+    "ordered-read-streams": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
       "dev": true,
       "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
+        "readable-stream": "^2.0.1"
       }
     },
-    "resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
       "dev": true
     },
-    "resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
       "dev": true,
       "requires": {
-        "value-or-function": "^3.0.0"
+        "lcid": "^1.0.0"
       }
     },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "dev": true
+    },
+    "p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "dev": true
     },
-    "responselike": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "^2.0.0"
-      }
+    "p-iteration": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/p-iteration/-/p-iteration-1.1.8.tgz",
+      "integrity": "sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==",
+      "dev": true
     },
-    "resq": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/resq/-/resq-1.7.1.tgz",
-      "integrity": "sha512-09u9Q5SAuJfAW5UoVAmvRtLvCOMaKP+djiixTXsZvPaojGKhuvc0Nfvp84U1rIfopJWEOXi5ywpCFwCk7mj8Xw==",
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1"
-      },
-      "dependencies": {
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        }
+        "p-try": "^2.0.0"
       }
     },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
       "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
+        "p-limit": "^2.2.0"
       }
     },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "rfdc": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
-      "dev": true
-    },
-    "rgb2hex": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.0.tgz",
-      "integrity": "sha512-cHdNTwmTMPu/TpP1bJfdApd6MbD+Kzi4GNnM6h35mdFChhQPSi9cAI8J7DMn5kQDKX8NuBaQXAyo360Oa7tOEA==",
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "requires": {
-        "align-text": "^0.1.1"
+        "callsites": "^3.0.0"
       }
     },
-    "rimraf": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-      "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
+    "parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
       }
     },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       }
     },
-    "rsvp": {
-      "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+    "parse-ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
+      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
       "dev": true
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+    "parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
       "dev": true
     },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
       "dev": true
     },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+    "parse-path": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
+      "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
       "dev": true,
       "requires": {
-        "rx-lite": "*"
+        "protocols": "^2.0.0"
       }
     },
-    "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+    "parse-url": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
+      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
       "dev": true,
       "requires": {
-        "tslib": "^1.9.0"
+        "parse-path": "^7.0.0"
       }
     },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
     },
-    "safe-json-parse": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
       "dev": true
     },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+      "dev": true
     },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
     },
-    "samsam": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
-      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true
     },
-    "sane": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-      "dev": true,
-      "requires": {
-        "@cnakazawa/watch": "^1.0.3",
-        "anymatch": "^2.0.0",
-        "capture-exit": "^2.0.0",
-        "exec-sh": "^0.3.2",
-        "execa": "^1.0.0",
-        "fb-watchman": "^2.0.0",
-        "micromatch": "^3.1.4",
-        "minimist": "^1.1.1",
-        "walker": "~1.0.5"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "dev": true,
+      "requires": {
+        "path-root-regex": "^0.1.0"
       }
     },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+    "path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
       "dev": true
     },
-    "schema-utils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
       "dev": true,
       "requires": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+          "dev": true
         }
       }
     },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+    "pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
       "dev": true
     },
-    "semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
       "dev": true,
       "requires": {
-        "sver-compat": "^1.5.0"
+        "through": "~2.3"
       }
     },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "dev": true
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
+    "pify": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-6.1.0.tgz",
+      "integrity": "sha512-KocF8ve28eFjjuBKKGvzOBGzG8ew2OqOOSxTTZhirkzH7h3BI1vyzqlR0qbfcDBve1Yzo3FVlWUAtCRrbVN8Fw==",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
+        "pinkie": "^2.0.0"
       }
     },
-    "serialize-error": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+    "pkcs7": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
+      "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
+    "plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
+      "dev": true,
+      "requires": {
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true
+    },
+    "postcss": {
+      "version": "8.4.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
+      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "type-fest": "^0.13.1"
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       },
       "dependencies": {
-        "type-fest": {
-          "version": "0.13.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-          "dev": true
+        "nanoid": {
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+          "dev": true,
+          "optional": true
         }
       }
     },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
+    "pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
       },
       "dependencies": {
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
+            "color-convert": "^2.0.1"
           }
         },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
       }
     },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+    "pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
+      "dev": true
+    },
+    "pretty-ms": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
+      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
+      "dev": true,
       "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "parse-ms": "^2.1.0"
       }
     },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+    "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": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "property-information": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.1.1.tgz",
+      "integrity": "sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==",
+      "dev": true
+    },
+    "protocols": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
+      "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==",
+      "dev": true
+    },
+    "proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "requires": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      }
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+      "dev": true
+    },
+    "ps-tree": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
+      "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
+      "dev": true,
+      "requires": {
+        "event-stream": "=3.3.4"
+      }
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
       "dev": true
     },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
       },
       "dependencies": {
-        "extend-shallow": {
+        "duplexify": {
+          "version": "3.7.1",
+          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+          "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0",
+            "stream-shift": "^1.0.0"
+          }
+        },
+        "pump": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         }
       }
     },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+    "puppeteer-core": {
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
+      "integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
+      "dev": true,
+      "requires": {
+        "cross-fetch": "3.1.5",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.981744",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "pkg-dir": "4.2.0",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "rimraf": "3.0.2",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "ws": "8.5.0"
+      },
+      "dependencies": {
+        "devtools-protocol": {
+          "version": "0.0.981744",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
+          "integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
+          "dev": true
+        },
+        "ws": {
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+          "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+          "dev": true,
+          "requires": {}
+        }
       }
     },
-    "shebang-command": {
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+      "dev": true
+    },
+    "qjobs": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "side-channel": "^1.0.4"
       }
     },
-    "shebang-regex": {
+    "query-selector-shadow-dom": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.0.tgz",
+      "integrity": "sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==",
       "dev": true
     },
-    "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
       "dev": true
     },
-    "shelljs": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      }
-    },
-    "shellwords": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
-    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+    "quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true
     },
-    "sinon": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
-      "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==",
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
-        "@sinonjs/formatio": "^2.0.0",
-        "diff": "^3.1.0",
-        "lodash.get": "^4.4.2",
-        "lolex": "^2.2.0",
-        "nise": "^1.2.0",
-        "supports-color": "^5.1.0",
-        "type-detect": "^4.0.5"
+        "safe-buffer": "^5.1.0"
       }
     },
-    "sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "requires": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
-    "slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+    "read-pkg": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
+      "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "@types/normalize-package-data": "^2.4.1",
+        "normalize-package-data": "^3.0.2",
+        "parse-json": "^5.2.0",
+        "type-fest": "^2.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "type-fest": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
           "dev": true
         }
       }
     },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+    "read-pkg-up": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
+      "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
       "dev": true,
       "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
+        "find-up": "^6.3.0",
+        "read-pkg": "^7.1.0",
+        "type-fest": "^2.5.0"
       },
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+        "find-up": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+          "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "locate-path": "^7.1.0",
+            "path-exists": "^5.0.0"
           }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+        "locate-path": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz",
+          "integrity": "sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg==",
           "dev": true,
           "requires": {
-            "is-descriptor": "^1.0.0"
+            "p-locate": "^6.0.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+        "p-limit": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "yocto-queue": "^1.0.0"
           }
         },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+        "p-locate": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+          "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "p-limit": "^4.0.0"
           }
         },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "path-exists": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+          "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
           "dev": true
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
+        "type-fest": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+          "dev": true
+        },
+        "yocto-queue": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+          "dev": true
         }
       }
     },
-    "socket.io": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-      "dev": true,
-      "requires": {
-        "debug": "~3.1.0",
-        "engine.io": "~3.2.0",
-        "has-binary2": "~1.0.2",
-        "socket.io-adapter": "~1.1.0",
-        "socket.io-client": "2.1.1",
-        "socket.io-parser": "~3.2.0"
+    "readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+          "dev": true
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
         }
       }
     },
-    "socket.io-adapter": {
+    "readdir-glob": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz",
-      "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==",
-      "dev": true
-    },
-    "socket.io-client": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz",
+      "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==",
       "dev": true,
       "requires": {
-        "backo2": "1.0.2",
-        "base64-arraybuffer": "0.1.5",
-        "component-bind": "1.0.0",
-        "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "engine.io-client": "~3.2.0",
-        "has-binary2": "~1.0.2",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "object-component": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "socket.io-parser": "~3.2.0",
-        "to-array": "0.1.4"
+        "minimatch": "^5.1.0"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
         },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "brace-expansion": "^2.0.1"
           }
         }
       }
     },
-    "socket.io-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
-      "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "requires": {
-        "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "isarray": "2.0.1"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "isarray": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-          "dev": true
-        }
+        "picomatch": "^2.2.1"
       }
     },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
       "dev": true,
       "requires": {
-        "is-plain-obj": "^1.0.0"
+        "resolve": "^1.1.6"
       }
     },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
+    "recursive-readdir": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
+      "dev": true,
+      "requires": {
+        "minimatch": "^3.0.5"
+      }
     },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
+    "regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+    "regenerate-unicode-properties": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+      "requires": {
+        "regenerate": "^1.4.2"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.10",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
+      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
+    },
+    "regenerator-transform": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "requires": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        }
       }
     },
-    "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==",
+    "regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "requires": {
-        "source-map": "^0.5.6"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       }
     },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
-    "space-separated-tokens": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
-      "dev": true
+    "regexpu-core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+      "requires": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsgen": "^0.7.1",
+        "regjsparser": "^0.9.1",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
+      }
     },
-    "sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true
+    "regjsgen": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
     },
-    "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
+    "regjsparser": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
+        }
       }
     },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
+    "remark": {
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-14.0.2.tgz",
+      "integrity": "sha512-A3ARm2V4BgiRXaUo5K0dRvJ1lbogrbXnhkJRmD0yw092/Yl0kOCZt1k9ZeElEwkZsWGsMumz6qL5MfNJH9nOBA==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "remark-parse": "^10.0.0",
+        "remark-stringify": "^10.0.0",
+        "unified": "^10.0.0"
+      }
     },
-    "spdx-expression-parse": {
+    "remark-gfm": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz",
+      "integrity": "sha512-lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig==",
       "dev": true,
       "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-gfm": "^2.0.0",
+        "micromark-extension-gfm": "^2.0.0",
+        "unified": "^10.0.0"
       }
     },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "split": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+    "remark-html": {
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-15.0.1.tgz",
+      "integrity": "sha512-7ta5UPRqj8nP0GhGMYUAghZ/DRno7dgq7alcW90A7+9pgJsXzGJlFgwF8HOP1b1tMgT3WwbeANN+CaTimMfyNQ==",
       "dev": true,
       "requires": {
-        "through": "2"
+        "@types/mdast": "^3.0.0",
+        "hast-util-sanitize": "^4.0.0",
+        "hast-util-to-html": "^8.0.0",
+        "mdast-util-to-hast": "^12.0.0",
+        "unified": "^10.0.0"
       }
     },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+    "remark-parse": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.1.tgz",
+      "integrity": "sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-from-markdown": "^1.0.0",
+        "unified": "^10.0.0"
       }
     },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+    "remark-reference-links": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/remark-reference-links/-/remark-reference-links-6.0.1.tgz",
+      "integrity": "sha512-34wY2C6HXSuKVTRtyJJwefkUD8zBOZOSHFZ4aSTnU2F656gr9WeuQ2dL6IJDK3NPd2F6xKF2t4XXcQY9MygAXg==",
       "dev": true,
       "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
+        "@types/mdast": "^3.0.0",
+        "unified": "^10.0.0",
+        "unist-util-visit": "^4.0.0"
       }
     },
-    "stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true
-    },
-    "stack-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
-      "dev": true
+    "remark-stringify": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-10.0.2.tgz",
+      "integrity": "sha512-6wV3pvbPvHkbNnWB0wdDvVFHOe1hBRAx1Q/5g/EpH4RppAII6J8Gnwe7VbHuXaoKIF6LAg6ExTel/+kNqSQ7lw==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.0.0",
+        "unified": "^10.0.0"
+      }
     },
-    "state-toggle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-      "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
-      "dev": true
+    "remark-toc": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/remark-toc/-/remark-toc-8.0.1.tgz",
+      "integrity": "sha512-7he2VOm/cy13zilnOTZcyAoyoolV26ULlon6XyCFU+vG54Z/LWJnwphj/xKIDLOt66QmJUgTyUvLVHi2aAElyg==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "mdast-util-toc": "^6.0.0",
+        "unified": "^10.0.0"
+      }
     },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+    "remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
       "dev": true,
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "is-buffer": "^1.1.5",
+        "is-utf8": "^0.2.1"
       },
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
         }
       }
     },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-    },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true
-    },
-    "stream-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/stream-array/-/stream-array-1.1.2.tgz",
-      "integrity": "sha1-nl9zRfITfDDuO0mLkRToC1K7frU=",
+    "remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==",
       "dev": true,
       "requires": {
-        "readable-stream": "~2.1.0"
+        "remove-bom-buffer": "^3.0.0",
+        "safe-buffer": "^5.1.0",
+        "through2": "^2.0.3"
       },
       "dependencies": {
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-          "integrity": "sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=",
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "buffer-shims": "^1.0.0",
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "string_decoder": "~0.10.x",
-            "util-deprecate": "~1.0.1"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
         }
       }
     },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
       "dev": true,
       "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
+        "is-finite": "^1.0.0"
       }
     },
-    "stream-buffers": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
-      "integrity": "sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==",
+    "replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
       "dev": true
     },
-    "stream-combiner": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+    "replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==",
       "dev": true,
       "requires": {
-        "duplexer": "~0.1.1"
+        "homedir-polyfill": "^1.0.1",
+        "is-absolute": "^1.0.0",
+        "remove-trailing-separator": "^1.1.0"
       }
     },
-    "stream-combiner2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
-      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
+    "replacestream": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
+      "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
       "dev": true,
       "requires": {
-        "duplexer2": "~0.1.0",
+        "escape-string-regexp": "^1.0.3",
+        "object-assign": "^4.0.1",
         "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
       }
     },
-    "stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
+        "qs": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+          "dev": true
         }
       }
     },
-    "stream-shift": {
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "require-main-filename": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
       "dev": true
     },
-    "streamroller": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
-      "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
-      "dev": true,
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "requires": {
-        "async": "^2.6.2",
-        "date-format": "^2.0.0",
-        "debug": "^3.2.6",
-        "fs-extra": "^7.0.1",
-        "lodash": "^4.17.14"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.14"
-          }
-        },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "universalify": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-          "dev": true
-        }
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+    "resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
       "dev": true
     },
-    "string-length": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
-      "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
       "dev": true,
       "requires": {
-        "astral-regex": "^1.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "astral-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-          "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
       }
     },
-    "string-template": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
+    "resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true
     },
-    "string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+    "resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==",
       "dev": true,
       "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "value-or-function": "^3.0.0"
       }
     },
-    "string.prototype.padend": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz",
-      "integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==",
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "dev": true
+    },
+    "responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "lowercase-keys": "^2.0.0"
       }
     },
-    "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+    "resq": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.2.tgz",
+      "integrity": "sha512-HmgVS3j+FLrEDBTDYysPdPVF9/hioDMJ/otOiQDKqk77YfZeeLOj0qi34yObumcud1gBpk+wpBTEg4kMicD++A==",
+      "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "fast-deep-equal": "^2.0.1"
+      },
+      "dependencies": {
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==",
+          "dev": true
+        }
       }
     },
-    "string.prototype.trimleft": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
-      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimstart": "^1.0.0"
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
       }
     },
-    "string.prototype.trimright": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
-      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
+    },
+    "rgb2hex": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz",
+      "integrity": "sha512-22MOP1Rh7sAo1BZpDG6R5RFYzR2lYEgwq7HEmyW2qcsOqR2lQKmn+O//xV3YG/0rrhMC6KVX2hU+ZXuaw9a5bw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimend": "^1.0.0"
+        "glob": "^7.1.3"
       }
     },
-    "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+    "run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "dev": true
+    },
+    "rust-result": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
+      "integrity": "sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==",
+      "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "individual": "^2.0.0"
       }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+    },
+    "rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "tslib": "^1.9.0"
       }
     },
-    "stringify-entities": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
-      "integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
+    "sade": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
+      "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==",
       "dev": true,
       "requires": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
+        "mri": "^1.1.0"
       }
     },
-    "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safe-json-parse": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
+      "integrity": "sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ret": "~0.1.10"
       }
     },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
       "dev": true,
       "requires": {
-        "is-utf8": "^0.2.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
       }
     },
-    "strip-bom-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-      "dev": true
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+    "samsam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
+      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
       "dev": true
     },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+    "schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "dev": true,
       "requires": {
-        "get-stdin": "^4.0.1"
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        }
       }
     },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
+    "semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
-    "subarg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
+    "semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==",
       "dev": true,
       "requires": {
-        "minimist": "^1.1.0"
+        "sver-compat": "^1.5.0"
       }
     },
-    "suffix": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
-      "integrity": "sha1-zFgjFkag7xEC95R47zqSSP2chC8=",
-      "dev": true
+    "send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+            }
+          }
+        },
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        }
+      }
     },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "serialize-error": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz",
+      "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==",
       "dev": true,
       "requires": {
-        "has-flag": "^3.0.0"
+        "type-fest": "^0.20.2"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
       }
     },
-    "sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+    "serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
       "dev": true,
       "requires": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
+        "randombytes": "^2.1.0"
       }
     },
-    "symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "table": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
       "requires": {
-        "ajv": "^5.2.3",
-        "ajv-keywords": "^2.1.0",
-        "chalk": "^2.1.0",
-        "lodash": "^4.17.4",
-        "slice-ansi": "1.0.0",
-        "string-width": "^2.1.1"
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
       },
       "dependencies": {
-        "ajv-keywords": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+        "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"
+          }
+        },
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
           "dev": true
         },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
+        "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
-        "slice-ansi": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-          "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0"
-          }
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+          "dev": true
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-extendable": "^0.1.0"
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+          "dev": true
+        },
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "isobject": "^3.0.1"
           }
         }
       }
     },
-    "tapable": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
-      "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==",
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
       "dev": true
     },
-    "tar-fs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz",
-      "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==",
+    "setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "requires": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
+        "shebang-regex": "^3.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "sinon": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
+      "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/formatio": "^2.0.0",
+        "diff": "^3.1.0",
+        "lodash.get": "^4.4.2",
+        "lolex": "^2.2.0",
+        "nise": "^1.2.0",
+        "supports-color": "^5.1.0",
+        "type-detect": "^4.0.5"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+          "dev": true
+        }
       }
     },
-    "tar-stream": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz",
-      "integrity": "sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==",
+    "sirv": {
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
+      "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
       "dev": true,
       "requires": {
-        "bl": "^4.0.1",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
+        "@polka/url": "^1.0.0-next.20",
+        "mrmime": "^1.0.0",
+        "totalist": "^1.0.0"
       }
     },
-    "temp-fs": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
-      "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=",
-      "dev": true,
-      "requires": {
-        "rimraf": "~2.5.2"
-      }
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
+      "dev": true
     },
-    "ternary-stream": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.1.1.tgz",
-      "integrity": "sha512-j6ei9hxSoyGlqTmoMjOm+QNvUKDOIY6bNl4Uh1lhBvl6yjPW2iLqxDUYyfDPZknQ4KdRziFl+ec99iT4l7g0cw==",
+    "slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
       "requires": {
-        "duplexify": "^3.5.0",
-        "fork-stream": "^0.0.4",
-        "merge-stream": "^1.0.0",
-        "through2": "^2.0.1"
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
       },
       "dependencies": {
-        "merge-stream": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-          "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "readable-stream": "^2.0.1"
+            "color-convert": "^2.0.1"
           }
         },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "color-name": "~1.1.4"
           }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         }
       }
     },
-    "test-exclude": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
-      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
-        "read-pkg-up": "^4.0.0",
-        "require-main-filename": "^2.0.0"
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
       },
       "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "ms": "2.0.0"
           }
         },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "is-descriptor": "^0.1.0"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "is-extendable": "^0.1.0"
           }
         },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
           "dev": true,
           "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
           }
         },
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
           "dev": true,
           "requires": {
-            "pify": "^3.0.0"
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
           }
         },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
           "dev": true
         },
-        "read-pkg": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "source-map-resolve": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
           "dev": true,
           "requires": {
-            "load-json-file": "^4.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^3.0.0"
+            "atob": "^2.1.2",
+            "decode-uri-component": "^0.2.0",
+            "resolve-url": "^0.2.1",
+            "source-map-url": "^0.4.0",
+            "urix": "^0.1.0"
           }
-        },
-        "read-pkg-up": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
-          "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0",
-            "read-pkg": "^3.0.0"
+            "is-descriptor": "^1.0.0"
           }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
         }
       }
     },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+    "socket.io": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
+      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "debug": "~4.3.2",
+        "engine.io": "~6.2.0",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.0"
+      }
+    },
+    "socket.io-adapter": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
       "dev": true
     },
-    "textextensions": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz",
-      "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==",
+    "socket.io-parser": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
+      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
+      "dev": true,
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true
+    },
+    "source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true,
+      "optional": true
+    },
+    "source-map-resolve": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0"
+      }
+    },
+    "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"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "dev": true
+    },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true,
+      "optional": true
+    },
+    "space-separated-tokens": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz",
+      "integrity": "sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==",
+      "dev": true
+    },
+    "sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
       "dev": true
     },
-    "throat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
-      "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
-      "dev": true
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+    "spdx-license-ids": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
       "dev": true
     },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+    "split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
       "dev": true,
       "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "through": "2"
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
       },
       "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
           }
         }
       }
     },
-    "through2-filter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+    "split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
       "dev": true,
       "requires": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
+        "readable-stream": "^3.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
-    "time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true
-    },
-    "timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
-    "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+    "sshpk": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
+      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
       "dev": true,
       "requires": {
-        "setimmediate": "^1.0.4"
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
       }
     },
-    "timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+      "dev": true
+    },
+    "stack-utils": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
       "dev": true,
       "requires": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        }
       }
     },
-    "tiny-hashes": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tiny-hashes/-/tiny-hashes-1.0.1.tgz",
-      "integrity": "sha512-knIN5zj4fl7kW4EBU5sLP20DWUvi/rVouvJezV0UAym2DkQaqm365Nyc8F3QEiOvunNDMxR8UhcXd1d5g+Wg1g=="
-    },
-    "tiny-lr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
-      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
       "requires": {
-        "body": "^5.1.0",
-        "debug": "^3.1.0",
-        "faye-websocket": "~0.10.0",
-        "livereload-js": "^2.3.0",
-        "object-assign": "^4.1.0",
-        "qs": "^6.4.0"
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "is-descriptor": "^0.1.0"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^0.1.6",
+            "is-data-descriptor": "^0.1.4",
+            "kind-of": "^5.0.0"
+          }
         }
       }
     },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
+    "statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
-    "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+    "stream-buffers": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
+      "integrity": "sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==",
       "dev": true
     },
-    "to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+    "stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
       "dev": true,
       "requires": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
+        "duplexer": "~0.1.1"
       }
     },
-    "to-array": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+    "stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
       "dev": true
     },
-    "to-arraybuffer": {
+    "stream-shift": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+    "streamroller": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
+      "integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "fs-extra": "^8.1.0"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "graceful-fs": "^4.1.6"
           }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+          "dev": true
         }
       }
     },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
+        "safe-buffer": "~5.1.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+    "string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==",
+      "dev": true
+    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "requires": {
-        "is-number": "^7.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       }
     },
-    "to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+    "string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
       "requires": {
-        "through2": "^2.0.3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       }
     },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+    "string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       }
     },
-    "tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+    "stringify-entities": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz",
+      "integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==",
       "dev": true,
       "requires": {
-        "punycode": "^2.1.0"
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
       }
     },
-    "traverse": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-      "dev": true
-    },
-    "trim": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-      "dev": true
-    },
-    "trim-lines": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-1.1.3.tgz",
-      "integrity": "sha512-E0ZosSWYK2mkSu+KEtQ9/KqarVjA9HztOSX+9FDdNacRAq29RRV6ZQNgob3iuW8Htar9vAfEa6yyt5qBAHZDBA==",
-      "dev": true
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "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
-    },
-    "trim-trailing-lines": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz",
-      "integrity": "sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==",
-      "dev": true
-    },
-    "trough": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
-      "dev": true
-    },
-    "tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-      "dev": true
-    },
-    "tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "ansi-regex": "^5.0.1"
       }
     },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true
     },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+    "strip-bom-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
       "dev": true
     },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
       "dev": true
     },
-    "type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+    "strip-json-comments": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
+      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
       "dev": true
     },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+    "suffix": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
+      "integrity": "sha512-j5uf6MJtMCfC4vBe5LFktSe4bGyNTBk7I2Kdri0jeLrcv5B9pWfxVa5JQpoxgtR8vaVB7bVxsWgnfQbX5wkhAA==",
       "dev": true
     },
-    "typescript-compare": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
-      "integrity": "sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==",
-      "requires": {
-        "typescript-logic": "^0.0.0"
-      }
-    },
-    "typescript-logic": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/typescript-logic/-/typescript-logic-0.0.0.tgz",
-      "integrity": "sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q=="
-    },
-    "typescript-tuple": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/typescript-tuple/-/typescript-tuple-2.2.1.tgz",
-      "integrity": "sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==",
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "requires": {
-        "typescript-compare": "^0.0.2"
+        "has-flag": "^3.0.0"
       }
     },
-    "ua-parser-js": {
-      "version": "0.7.21",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
-      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==",
-      "dev": true
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
     },
-    "uglify-js": {
-      "version": "3.9.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz",
-      "integrity": "sha512-8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA==",
+    "sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==",
       "dev": true,
       "requires": {
-        "commander": "~2.20.3"
+        "es6-iterator": "^2.0.1",
+        "es6-symbol": "^3.1.1"
       }
     },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "dev": true
-    },
-    "uglifyjs-webpack-plugin": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+    "table": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "dev": true,
       "requires": {
-        "source-map": "^0.5.6",
-        "uglify-js": "^2.8.29",
-        "webpack-sources": "^1.0.1"
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-          "dev": true,
-          "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
-            "wordwrap": "0.0.2"
-          }
-        },
-        "uglify-js": {
-          "version": "2.8.29",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+        "ajv": {
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
           "dev": true,
           "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
           }
         },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0"
-          }
         }
       }
     },
-    "ultron": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-      "dev": true
-    },
-    "unbzip2-stream": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
-      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.2.1",
-        "through": "^2.3.8"
-      }
-    },
-    "unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+    "tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true
     },
-    "undertaker": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
+    "tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
       "dev": true,
       "requires": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
       }
     },
-    "undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "dev": true
-    },
-    "unherit": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-      "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.0",
-        "xtend": "^4.0.0"
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
-    "unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
-      "dev": true
-    },
-    "unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+    "temp-fs": {
+      "version": "0.9.9",
+      "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
+      "integrity": "sha512-WfecDCR1xC9b0nsrzSaxPf3ZuWeWLUWblW4vlDQAa1biQaKHiImHnJfeQocQe/hXKMcolRzgkcVX/7kK4zoWbw==",
       "dev": true,
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "rimraf": "~2.5.2"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.5.4",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+          "integrity": "sha512-Lw7SHMjssciQb/rRz7JyPIy9+bbUshEucPoLRvWqy09vC5zQixl8Uet+Zl+SROBB/JMWHJRdCk1qdxNWHNMvlQ==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.0.5"
+          }
+        }
       }
     },
-    "unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
-      "dev": true
-    },
-    "unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
-      "dev": true
-    },
-    "unified": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz",
-      "integrity": "sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==",
+    "ternary-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
+      "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==",
       "dev": true,
       "requires": {
-        "bail": "^1.0.0",
-        "extend": "^3.0.0",
-        "is-plain-obj": "^1.1.0",
-        "trough": "^1.0.0",
-        "vfile": "^2.0.0",
-        "x-is-string": "^0.1.0"
+        "duplexify": "^4.1.1",
+        "fork-stream": "^0.0.4",
+        "merge-stream": "^2.0.0",
+        "through2": "^3.0.1"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
+          }
+        }
       }
     },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+    "terser": {
+      "version": "5.15.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
+      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.8.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.21",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        }
       }
     },
-    "unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+    "terser-webpack-plugin": {
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
       "dev": true,
       "requires": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
+        "@jridgewell/trace-mapping": "^0.3.14",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.0",
+        "terser": "^5.14.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
       }
     },
-    "unist-builder": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-1.0.4.tgz",
-      "integrity": "sha512-v6xbUPP7ILrT15fHGrNyHc1Xda8H3xVhP7/HAIotHOhVPjH5dCXA097C3Rry1Q2O+HbOLCao4hfPB+EYEjHgVg==",
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
       "requires": {
-        "object-assign": "^4.1.0"
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
       }
     },
-    "unist-util-generated": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.5.tgz",
-      "integrity": "sha512-1TC+NxQa4N9pNdayCYA1EGUOCAO0Le3fVp7Jzns6lnua/mYgwHo0tz5WUAfrdpNch1RZLHc61VZ1SDgrtNXLSw==",
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
-    "unist-util-is": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
-      "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==",
+    "textextensions": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz",
+      "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==",
       "dev": true
     },
-    "unist-util-position": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
-      "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==",
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
-    "unist-util-remove-position": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz",
-      "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==",
+    "through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
       "dev": true,
       "requires": {
-        "unist-util-visit": "^1.1.0"
+        "readable-stream": "3"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
-    "unist-util-stringify-position": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
-      "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==",
-      "dev": true
-    },
-    "unist-util-visit": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
-      "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
+    "through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
       "dev": true,
       "requires": {
-        "unist-util-visit-parents": "^2.0.0"
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
       }
     },
-    "unist-util-visit-parents": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
-      "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
+    "time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+      "dev": true
+    },
+    "timers-ext": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
+      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
       "dev": true,
       "requires": {
-        "unist-util-is": "^3.0.0"
+        "es5-ext": "~0.10.46",
+        "next-tick": "1"
       }
     },
-    "universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    "tiny-hashes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tiny-hashes/-/tiny-hashes-1.0.1.tgz",
+      "integrity": "sha512-knIN5zj4fl7kW4EBU5sLP20DWUvi/rVouvJezV0UAym2DkQaqm365Nyc8F3QEiOvunNDMxR8UhcXd1d5g+Wg1g=="
     },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+    "tiny-lr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
       "dev": true,
       "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
+        "body": "^5.1.0",
+        "debug": "^3.1.0",
+        "faye-websocket": "~0.10.0",
+        "livereload-js": "^2.3.0",
+        "object-assign": "^4.1.0",
+        "qs": "^6.4.0"
       },
       "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
+            "ms": "^2.1.1"
           }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
         }
       }
     },
-    "unzipper": {
-      "version": "0.9.15",
-      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.9.15.tgz",
-      "integrity": "sha512-2aaUvO4RAeHDvOCuEtth7jrHFaCKTSXPqUkXwADaLBzGbgZGzUDccoEdJ5lW+3RmfpOZYNx0Rw6F6PUzM6caIA==",
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
-        "big-integer": "^1.6.17",
-        "binary": "~0.3.0",
-        "bluebird": "~3.4.1",
-        "buffer-indexof-polyfill": "~1.0.0",
-        "duplexer2": "~0.1.4",
-        "fstream": "^1.0.12",
-        "listenercount": "~1.0.1",
-        "readable-stream": "~2.3.6",
-        "setimmediate": "~1.0.4"
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
+      "dev": true,
+      "requires": {
+        "is-absolute": "^1.0.0",
+        "is-negated-glob": "^1.0.0"
+      }
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "bluebird": {
-          "version": "3.4.7",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-          "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "is-buffer": "^1.1.5"
           }
         }
       }
     },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
       },
       "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
         }
       }
     },
-    "url-join": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz",
-      "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=",
-      "dev": true
-    },
-    "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
+        "is-number": "^7.0.0"
       }
     },
-    "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+    "to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==",
       "dev": true,
       "requires": {
-        "prepend-http": "^2.0.0"
+        "through2": "^2.0.3"
       },
       "dependencies": {
-        "prepend-http": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-          "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-          "dev": true
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
         }
       }
     },
-    "url-to-options": {
+    "toidentifier": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
-      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+    "totalist": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
       "dev": true
     },
-    "useragent": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.x",
-        "tmp": "0.0.x"
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
-    "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      }
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
     },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+    "traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
       "dev": true
     },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      }
+    "trim-lines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+      "dev": true
     },
-    "utils-merge": {
+    "trim-right": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
-    "uuid": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
-      "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
       "dev": true
     },
-    "v8flags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+    "trough": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
+      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
       "dev": true
     },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vfile": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
-      "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
+    "tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
       "dev": true,
       "requires": {
-        "is-buffer": "^1.1.4",
-        "replace-ext": "1.0.0",
-        "unist-util-stringify-position": "^1.0.0",
-        "vfile-message": "^1.0.0"
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
         }
       }
     },
-    "vfile-location": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz",
-      "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==",
+    "tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
-    "vfile-message": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
-      "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "requires": {
-        "unist-util-stringify-position": "^1.1.1"
+        "safe-buffer": "^5.0.1"
       }
     },
-    "vfile-reporter": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-4.0.0.tgz",
-      "integrity": "sha1-6m8K4TQvSEFXOYXgX5QXNvJ96do=",
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "dev": true
+    },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "requires": {
-        "repeat-string": "^1.5.0",
-        "string-width": "^1.0.0",
-        "supports-color": "^4.1.0",
-        "unist-util-stringify-position": "^1.0.0",
-        "vfile-statistics": "^1.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        }
+        "prelude-ls": "^1.2.1"
       }
     },
-    "vfile-sort": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.2.tgz",
-      "integrity": "sha512-tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA==",
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true
     },
-    "vfile-statistics": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.4.tgz",
-      "integrity": "sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==",
+    "type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
-    "vinyl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
-      "dev": true,
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "requires": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-          "dev": true
-        }
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
       }
     },
-    "vinyl-fs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dev": true,
-      "requires": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
-      }
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "dev": true
     },
-    "vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+    "typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true,
+      "peer": true
+    },
+    "typescript-compare": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
+      "integrity": "sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==",
       "requires": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
+        "typescript-logic": "^0.0.0"
       }
     },
-    "vinyl-sourcemaps-apply": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-      "dev": true,
+    "typescript-logic": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/typescript-logic/-/typescript-logic-0.0.0.tgz",
+      "integrity": "sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q=="
+    },
+    "typescript-tuple": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/typescript-tuple/-/typescript-tuple-2.2.1.tgz",
+      "integrity": "sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==",
       "requires": {
-        "source-map": "^0.5.1"
+        "typescript-compare": "^0.0.2"
       }
     },
-    "vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+    "ua-parser-js": {
+      "version": "0.7.32",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz",
+      "integrity": "sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==",
       "dev": true
     },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true
+    "uglify-js": {
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "dev": true,
+      "optional": true
     },
-    "w3c-hr-time": {
+    "unbox-primitive": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
       "requires": {
-        "browser-process-hrtime": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
       }
     },
-    "walk": {
-      "version": "2.3.14",
-      "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz",
-      "integrity": "sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==",
+    "unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
       "dev": true,
       "requires": {
-        "foreachasync": "^3.0.0"
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
       }
     },
-    "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+    "unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "dev": true
+    },
+    "undertaker": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
+      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
       "dev": true,
       "requires": {
-        "makeerror": "1.0.x"
+        "arr-flatten": "^1.0.1",
+        "arr-map": "^2.0.0",
+        "bach": "^1.0.0",
+        "collection-map": "^1.0.0",
+        "es6-weak-map": "^2.0.1",
+        "fast-levenshtein": "^1.0.0",
+        "last-run": "^1.1.0",
+        "object.defaults": "^1.0.0",
+        "object.reduce": "^1.0.0",
+        "undertaker-registry": "^1.0.0"
+      },
+      "dependencies": {
+        "fast-levenshtein": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
+          "integrity": "sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
+          "dev": true
+        }
       }
     },
-    "watchpack": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
-      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
-      "dev": true,
+    "undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
+      "dev": true
+    },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "requires": {
-        "chokidar": "^3.4.0",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.0"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       }
     },
-    "watchpack-chokidar2": {
+    "unicode-match-property-value-ecmascript": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
+    },
+    "unified": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
+      "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "chokidar": "^2.1.8"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true,
-          "optional": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "binary-extensions": "^1.0.0"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true,
-          "optional": true
+        "@types/unist": "^2.0.0",
+        "bail": "^2.0.0",
+        "extend": "^3.0.0",
+        "is-buffer": "^2.0.0",
+        "is-plain-obj": "^4.0.0",
+        "trough": "^2.0.0",
+        "vfile": "^5.0.0"
+      }
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "dependencies": {
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "is-extendable": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+          "dev": true
+        }
+      }
+    },
+    "unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "requires": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "unist-builder": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.0.tgz",
+      "integrity": "sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0"
+      }
+    },
+    "unist-util-generated": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.0.tgz",
+      "integrity": "sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==",
+      "dev": true
+    },
+    "unist-util-is": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz",
+      "integrity": "sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==",
+      "dev": true
+    },
+    "unist-util-position": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz",
+      "integrity": "sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0"
+      }
+    },
+    "unist-util-stringify-position": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz",
+      "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0"
+      }
+    },
+    "unist-util-visit": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz",
+      "integrity": "sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^5.1.1"
+      }
+    },
+    "unist-util-visit-parents": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz",
+      "integrity": "sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^5.0.0"
+      }
+    },
+    "universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
           },
           "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
               "dev": true,
-              "optional": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "isarray": "1.0.0"
               }
             }
           }
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+          "dev": true
         },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+          "dev": true
+        }
+      }
+    },
+    "unzipper": {
+      "version": "0.9.15",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.9.15.tgz",
+      "integrity": "sha512-2aaUvO4RAeHDvOCuEtth7jrHFaCKTSXPqUkXwADaLBzGbgZGzUDccoEdJ5lW+3RmfpOZYNx0Rw6F6PUzM6caIA==",
+      "dev": true,
+      "requires": {
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
+      },
+      "dependencies": {
+        "duplexer2": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+          "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
             "readable-stream": "^2.0.2"
           }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
         }
       }
     },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true
+    },
+    "update-browserslist-db": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "requires": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+          "dev": true
+        }
+      }
+    },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "url-toolkit": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz",
+      "integrity": "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==",
+      "dev": true
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "dev": true
+    },
+    "uvu": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz",
+      "integrity": "sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==",
+      "dev": true,
+      "requires": {
+        "dequal": "^2.0.0",
+        "diff": "^5.0.0",
+        "kleur": "^4.0.3",
+        "sade": "^1.7.3"
+      }
+    },
+    "v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "v8flags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "defaults": "^1.0.3"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
-    "webdriver": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.1.14.tgz",
-      "integrity": "sha512-6fXoGDnxWfJn9zqfYbc6+VEV5N1obd3K7iuRmJ7w/hH9d9XDxcrcx147T5egiy1qziko61hqYE/x9VtSQbjPcA==",
+    "value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==",
+      "dev": true
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
       "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/protocols": "6.1.14",
-        "@wdio/utils": "6.1.8",
-        "got": "^11.0.2",
-        "lodash.merge": "^4.6.1"
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      },
+      "dependencies": {
+        "core-util-is": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+          "dev": true
+        }
       }
     },
-    "webdriverio": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.1.16.tgz",
-      "integrity": "sha512-vk6/XeErNnMooebCtxwIR//LqrastXO9gXL+eVUGNRAuG5omp8XCdT+MK2fmlw53xhcPULQ/y3h8ysYlPnPeyA==",
+    "vfile": {
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.5.tgz",
+      "integrity": "sha512-U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ==",
       "dev": true,
       "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/repl": "6.1.8",
-        "@wdio/utils": "6.1.8",
-        "archiver": "^4.0.1",
-        "css-value": "^0.0.1",
-        "devtools": "6.1.16",
-        "grapheme-splitter": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.zip": "^4.2.0",
-        "resq": "^1.6.0",
-        "rgb2hex": "^0.2.0",
-        "serialize-error": "^7.0.0",
-        "webdriver": "6.1.14"
+        "@types/unist": "^2.0.0",
+        "is-buffer": "^2.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "vfile-message": "^3.0.0"
       }
     },
-    "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true
+    "vfile-message": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz",
+      "integrity": "sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0",
+        "unist-util-stringify-position": "^3.0.0"
+      }
     },
-    "webpack": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
-      "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.0.0",
-        "acorn-dynamic-import": "^2.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "async": "^2.1.2",
-        "enhanced-resolve": "^3.4.0",
-        "escope": "^3.6.0",
-        "interpret": "^1.0.0",
-        "json-loader": "^0.5.4",
-        "json5": "^0.5.1",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "mkdirp": "~0.5.0",
-        "node-libs-browser": "^2.0.0",
-        "source-map": "^0.5.3",
-        "supports-color": "^4.2.1",
-        "tapable": "^0.2.7",
-        "uglifyjs-webpack-plugin": "^0.4.6",
-        "watchpack": "^1.4.0",
-        "webpack-sources": "^1.0.1",
-        "yargs": "^8.0.2"
+    "vfile-reporter": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz",
+      "integrity": "sha512-4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A==",
+      "dev": true,
+      "requires": {
+        "@types/supports-color": "^8.0.0",
+        "string-width": "^5.0.0",
+        "supports-color": "^9.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "vfile-sort": "^3.0.0",
+        "vfile-statistics": "^2.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.14"
-          }
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
           "dev": true
         },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "dev": true,
-          "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
           "dev": true
         },
         "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "^6.0.1"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "version": "9.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.3.tgz",
+          "integrity": "sha512-aszYUX/DVK/ed5rFLb/dDinVJrQjG/vmU433wtqVSD800rYsJNWxh2R3USV90aLSU+UsyQkbNeffVLzc6B6foA==",
           "dev": true
-        },
-        "yargs": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+        }
+      }
+    },
+    "vfile-sort": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.0.tgz",
+      "integrity": "sha512-fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg==",
+      "dev": true,
+      "requires": {
+        "vfile-message": "^3.0.0"
+      }
+    },
+    "vfile-statistics": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.0.tgz",
+      "integrity": "sha512-foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA==",
+      "dev": true,
+      "requires": {
+        "vfile-message": "^3.0.0"
+      }
+    },
+    "video.js": {
+      "version": "7.20.3",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.3.tgz",
+      "integrity": "sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/http-streaming": "2.14.3",
+        "@videojs/vhs-utils": "^3.0.4",
+        "@videojs/xhr": "2.6.0",
+        "aes-decrypter": "3.1.3",
+        "global": "^4.4.0",
+        "keycode": "^2.2.0",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
+        "safe-json-parse": "4.0.0",
+        "videojs-font": "3.2.0",
+        "videojs-vtt.js": "^0.15.4"
+      },
+      "dependencies": {
+        "safe-json-parse": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
+          "integrity": "sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "rust-result": "^1.0.0"
           }
         }
       }
     },
-    "webpack-bundle-analyzer": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
-      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
+    "videojs-contrib-ads": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/videojs-contrib-ads/-/videojs-contrib-ads-6.9.0.tgz",
+      "integrity": "sha512-nzKz+jhCGMTYffSNVYrmp9p70s05v6jUMOY3Z7DpVk3iFrWK4Zi/BIkokDWrMoHpKjdmCdKzfJVBT+CrUj6Spw==",
+      "dev": true,
+      "requires": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      }
+    },
+    "videojs-font": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
+      "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==",
+      "dev": true
+    },
+    "videojs-ima": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/videojs-ima/-/videojs-ima-1.11.0.tgz",
+      "integrity": "sha512-ZRoWuGyJ75zamwZgpr0i/gZ6q7Evda/Q6R46gpW88WN7u0ORU7apw/lM1MSG4c3YDXW8LDENgzMAvMZUdifWhg==",
+      "dev": true,
+      "requires": {
+        "@hapi/cryptiles": "^5.1.0",
+        "can-autoplay": "^3.0.0",
+        "extend": ">=3.0.2",
+        "lodash": ">=4.17.19",
+        "lodash.template": ">=4.5.0",
+        "videojs-contrib-ads": "^6.6.5"
+      }
+    },
+    "videojs-playlist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/videojs-playlist/-/videojs-playlist-5.0.0.tgz",
+      "integrity": "sha512-TM9bytwKqkE05wdWPEKDpkwMGhS/VgMCIsEuNxmX1J1JO9zaTIl4Wm3egf5j1dhIw19oWrqGUV/nK0YNIelCpA==",
+      "dev": true,
+      "requires": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      }
+    },
+    "videojs-vtt.js": {
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
+      "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==",
+      "dev": true,
+      "requires": {
+        "global": "^4.3.1"
+      }
+    },
+    "vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "dev": true,
+      "requires": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "dependencies": {
+        "replace-ext": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+          "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+          "dev": true
+        }
+      }
+    },
+    "vinyl-fs": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
       "dev": true,
       "requires": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.15",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
+        "fs-mkdirp-stream": "^1.0.0",
+        "glob-stream": "^6.1.0",
+        "graceful-fs": "^4.0.0",
+        "is-valid-glob": "^1.0.0",
+        "lazystream": "^1.0.0",
+        "lead": "^1.0.0",
+        "object.assign": "^4.0.4",
+        "pumpify": "^1.3.5",
+        "readable-stream": "^2.3.3",
+        "remove-bom-buffer": "^3.0.0",
+        "remove-bom-stream": "^1.2.0",
+        "resolve-options": "^1.1.0",
+        "through2": "^2.0.0",
+        "to-through": "^2.0.0",
+        "value-or-function": "^3.0.0",
+        "vinyl": "^2.0.0",
+        "vinyl-sourcemap": "^1.1.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-          "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
-          "dev": true
-        },
-        "acorn-walk": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
-          "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==",
-          "dev": true
-        },
-        "ejs": {
-          "version": "2.7.4",
-          "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-          "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-          "dev": true
-        },
-        "ws": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "async-limiter": "~1.0.0"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
     },
-    "webpack-core": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+    "vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==",
       "dev": true,
       "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
+        "append-buffer": "^1.0.2",
+        "convert-source-map": "^1.5.0",
+        "graceful-fs": "^4.1.6",
+        "normalize-path": "^2.1.1",
+        "now-and-later": "^2.0.0",
+        "remove-bom-buffer": "^3.0.0",
+        "vinyl": "^2.0.0"
       },
       "dependencies": {
-        "source-list-map": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "remove-trailing-separator": "^1.0.1"
           }
         }
       }
     },
-    "webpack-dev-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz",
-      "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==",
+    "vinyl-sourcemaps-apply": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
+      "integrity": "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==",
       "dev": true,
       "requires": {
-        "loud-rejection": "^1.6.0",
-        "memory-fs": "~0.4.1",
-        "mime": "^2.1.0",
-        "path-is-absolute": "^1.0.0",
-        "range-parser": "^1.0.3",
-        "url-join": "^2.0.2",
-        "webpack-log": "^1.0.1"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-          "dev": true
-        }
+        "source-map": "^0.5.1"
       }
     },
-    "webpack-log": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz",
-      "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
+      "dev": true
+    },
+    "vue-template-compiler": {
+      "version": "2.7.13",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz",
+      "integrity": "sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "chalk": "^2.1.0",
-        "log-symbols": "^2.1.0",
-        "loglevelnext": "^1.0.1",
-        "uuid": "^3.1.0"
-      },
-      "dependencies": {
-        "log-symbols": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-          "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.0.1"
-          }
-        },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-          "dev": true
-        }
+        "de-indent": "^1.0.2",
+        "he": "^1.2.0"
       }
     },
-    "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+    "walk": {
+      "version": "2.3.15",
+      "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.15.tgz",
+      "integrity": "sha512-4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg==",
       "dev": true,
       "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "foreachasync": "^3.0.0"
       }
     },
-    "webpack-stream": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-stream/-/webpack-stream-3.2.0.tgz",
-      "integrity": "sha1-Oh0WD7EdQXJ7fObzL3IkZPmLIYY=",
+    "watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
       "requires": {
-        "gulp-util": "^3.0.7",
-        "lodash.clone": "^4.3.2",
-        "lodash.some": "^4.2.2",
-        "memory-fs": "^0.3.0",
-        "through": "^2.3.8",
-        "vinyl": "^1.1.0",
-        "webpack": "^1.12.9"
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      }
+    },
+    "wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+      "dev": true,
+      "requires": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "webdriver": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.5.3.tgz",
+      "integrity": "sha512-cDTn/hYj5x8BYwXxVb/WUwqGxrhCMP2rC8ttIWCfzmiVtmOnJGulC7CyxU3+p9Q5R/gIKTzdJOss16dhb+5CoA==",
+      "dev": true,
+      "requires": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "got": "^11.0.2",
+        "lodash.merge": "^4.6.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        },
-        "anymatch": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^2.1.5",
-            "normalize-path": "^2.0.0"
-          }
-        },
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1"
-          }
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
-        },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "big.js": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-          "dev": true
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true
-        },
-        "braces": {
-          "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-          "dev": true,
-          "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
-          }
-        },
-        "browserify-aes": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz",
-          "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.1"
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "browserify-zlib": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-          "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-          "dev": true,
-          "requires": {
-            "pako": "~0.2.0"
-          }
-        },
-        "buffer": {
-          "version": "4.9.2",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
           "dev": true,
           "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4",
-            "isarray": "^1.0.0"
+            "got": "^11.8.1"
           }
         },
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-          "dev": true
-        },
-        "chokidar": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "anymatch": "^1.3.0",
-            "async-each": "^1.0.0",
-            "fsevents": "^1.0.0",
-            "glob-parent": "^2.0.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^2.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
-            "wordwrap": "0.0.2"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "clone-stats": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-          "dev": true
-        },
-        "crypto-browserify": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz",
-          "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "browserify-aes": "0.4.0",
-            "pbkdf2-compat": "2.0.1",
-            "ripemd160": "0.2.0",
-            "sha.js": "2.2.6"
+            "color-name": "~1.1.4"
           }
         },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "enhanced-resolve": {
-          "version": "0.9.1",
-          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-          "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "memory-fs": "^0.2.0",
-            "tapable": "^0.1.8"
-          },
-          "dependencies": {
-            "memory-fs": {
-              "version": "0.2.0",
-              "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-              "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
-              "dev": true
-            }
-          }
-        },
-        "events": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-          "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-          "dev": true,
-          "requires": {
-            "is-posix-bracket": "^0.1.0"
-          }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "has-flag": "^4.0.0"
           }
+        }
+      }
+    },
+    "webdriverio": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.25.4.tgz",
+      "integrity": "sha512-agkgwn2SIk5cAJ03uue1GnGZcUZUDN3W4fUMY9/VfO8bVJrPEgWg31bPguEWPu+YhEB/aBJD8ECxJ3OEKdy4qQ==",
+      "dev": true,
+      "requires": {
+        "@types/aria-query": "^5.0.0",
+        "@types/node": "^18.0.0",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/repl": "7.25.4",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "archiver": "^5.0.0",
+        "aria-query": "^5.0.0",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.25.4",
+        "devtools-protocol": "^0.0.1061995",
+        "fs-extra": "^10.0.0",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^5.0.0",
+        "puppeteer-core": "^13.1.3",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.25.4"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "18.11.9",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+          "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+          "dev": true
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+        "@wdio/config": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
+          "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
+            "@wdio/logger": "7.19.0",
+            "@wdio/types": "7.25.4",
+            "@wdio/utils": "7.25.4",
+            "deepmerge": "^4.0.0",
+            "glob": "^8.0.3"
           }
         },
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+        "@wdio/logger": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
+          "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
           "dev": true,
           "requires": {
-            "is-glob": "^2.0.0"
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "https-browserify": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-          "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
-          "dev": true
-        },
-        "interpret": {
-          "version": "0.6.6",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz",
-          "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=",
+        "@wdio/protocols": {
+          "version": "7.22.0",
+          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
+          "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
           "dev": true
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+        "@wdio/repl": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.25.4.tgz",
+          "integrity": "sha512-kYhj9gLsUk4HmlXLqkVre+gwbfvw9CcnrHjqIjrmMS4mR9D8zvBb5CItb3ZExfPf9jpFzIFREbCAYoE9x/kMwg==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
+            "@wdio/utils": "7.25.4"
           }
         },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+        "@wdio/types": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+          "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
           "dev": true,
           "requires": {
-            "binary-extensions": "^1.0.0"
+            "@types/node": "^18.0.0",
+            "got": "^11.8.1"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
+        "@wdio/utils": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
+          "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.19.0",
+            "@wdio/types": "7.25.4",
+            "p-iteration": "^1.1.8"
+          }
         },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
+            "color-convert": "^2.0.1"
           }
         },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
+            "balanced-match": "^1.0.0"
           }
         },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
         },
-        "is-glob": {
+        "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "is-extglob": "^1.0.0"
+            "color-name": "~1.1.4"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "glob": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
           }
         },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "ky": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/ky/-/ky-0.30.0.tgz",
+          "integrity": "sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
           "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "brace-expansion": "^2.0.1"
           }
         },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
+            "has-flag": "^4.0.0"
           }
         },
-        "memory-fs": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
-          "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
+        "webdriver": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.25.4.tgz",
+          "integrity": "sha512-6nVDwenh0bxbtUkHASz9B8T9mB531Fn1PcQjUGj2t5dolLPn6zuK1D7XYVX40hpn6r3SlYzcZnEBs4X0az5Txg==",
           "dev": true,
           "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
+            "@types/node": "^18.0.0",
+            "@wdio/config": "7.25.4",
+            "@wdio/logger": "7.19.0",
+            "@wdio/protocols": "7.22.0",
+            "@wdio/types": "7.25.4",
+            "@wdio/utils": "7.25.4",
+            "got": "^11.0.2",
+            "ky": "0.30.0",
+            "lodash.merge": "^4.6.1"
           }
+        }
+      }
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
+    },
+    "webpack": {
+      "version": "5.74.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
+      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+      "dev": true,
+      "requires": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.10.0",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.8.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+          "dev": true
         },
-        "micromatch": {
-          "version": "2.3.11",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
-          }
-        },
-        "node-libs-browser": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz",
-          "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
-          "dev": true,
-          "requires": {
-            "assert": "^1.1.1",
-            "browserify-zlib": "^0.1.4",
-            "buffer": "^4.9.0",
-            "console-browserify": "^1.1.0",
-            "constants-browserify": "^1.0.0",
-            "crypto-browserify": "3.3.0",
-            "domain-browser": "^1.1.1",
-            "events": "^1.0.0",
-            "https-browserify": "0.0.1",
-            "os-browserify": "^0.2.0",
-            "path-browserify": "0.0.0",
-            "process": "^0.11.0",
-            "punycode": "^1.2.4",
-            "querystring-es3": "^0.2.0",
-            "readable-stream": "^2.0.5",
-            "stream-browserify": "^2.0.1",
-            "stream-http": "^2.3.1",
-            "string_decoder": "^0.10.25",
-            "timers-browserify": "^2.0.2",
-            "tty-browserify": "0.0.0",
-            "url": "^0.11.0",
-            "util": "^0.10.3",
-            "vm-browserify": "0.0.4"
-          },
-          "dependencies": {
-            "string_decoder": {
-              "version": "0.10.31",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-              "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-              "dev": true
-            }
-          }
+        "acorn-import-assertions": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+          "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+          "dev": true,
+          "requires": {}
         },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "remove-trailing-separator": "^1.0.1"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "os-browserify": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-          "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
-          "dev": true
-        },
-        "pako": {
-          "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-          "dev": true
-        },
-        "path-browserify": {
-          "version": "0.0.0",
-          "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-          "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
+      }
+    },
+    "webpack-bundle-analyzer": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
+      "integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^8.0.4",
+        "acorn-walk": "^8.0.0",
+        "chalk": "^4.1.0",
+        "commander": "^7.2.0",
+        "gzip-size": "^6.0.0",
+        "lodash": "^4.17.20",
+        "opener": "^1.5.2",
+        "sirv": "^1.0.7",
+        "ws": "^7.3.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.8.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
           "dev": true
         },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
         },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          },
-          "dependencies": {
-            "arr-diff": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-              "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-              "dev": true
-            },
-            "array-unique": {
-              "version": "0.3.2",
-              "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-              "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-              "dev": true
-            },
-            "braces": {
-              "version": "2.3.2",
-              "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-              "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-              "dev": true,
-              "requires": {
-                "arr-flatten": "^1.1.0",
-                "array-unique": "^0.3.2",
-                "extend-shallow": "^2.0.1",
-                "fill-range": "^4.0.0",
-                "isobject": "^3.0.1",
-                "repeat-element": "^1.1.2",
-                "snapdragon": "^0.8.1",
-                "snapdragon-node": "^2.0.1",
-                "split-string": "^3.0.2",
-                "to-regex": "^3.0.1"
-              },
-              "dependencies": {
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "is-extendable": "^0.1.0"
-                  }
-                }
-              }
-            },
-            "expand-brackets": {
-              "version": "2.1.4",
-              "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-              "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-              "dev": true,
-              "requires": {
-                "debug": "^2.3.3",
-                "define-property": "^0.2.5",
-                "extend-shallow": "^2.0.1",
-                "posix-character-classes": "^0.1.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.1"
-              },
-              "dependencies": {
-                "define-property": {
-                  "version": "0.2.5",
-                  "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                  "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                  "dev": true,
-                  "requires": {
-                    "is-descriptor": "^0.1.0"
-                  }
-                },
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "is-extendable": "^0.1.0"
-                  }
-                },
-                "is-descriptor": {
-                  "version": "0.1.6",
-                  "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                  "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                  "dev": true,
-                  "requires": {
-                    "is-accessor-descriptor": "^0.1.6",
-                    "is-data-descriptor": "^0.1.4",
-                    "kind-of": "^5.0.0"
-                  }
-                },
-                "kind-of": {
-                  "version": "5.1.0",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                  "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                  "dev": true
-                }
-              }
-            },
-            "extglob": {
-              "version": "2.0.4",
-              "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-              "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-              "dev": true,
-              "requires": {
-                "array-unique": "^0.3.2",
-                "define-property": "^1.0.0",
-                "expand-brackets": "^2.1.4",
-                "extend-shallow": "^2.0.1",
-                "fragment-cache": "^0.2.1",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.1"
-              },
-              "dependencies": {
-                "define-property": {
-                  "version": "1.0.0",
-                  "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                  "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                  "dev": true,
-                  "requires": {
-                    "is-descriptor": "^1.0.0"
-                  }
-                },
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "is-extendable": "^0.1.0"
-                  }
-                }
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            },
-            "micromatch": {
-              "version": "3.1.10",
-              "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-              "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-              "dev": true,
-              "requires": {
-                "arr-diff": "^4.0.0",
-                "array-unique": "^0.3.2",
-                "braces": "^2.3.1",
-                "define-property": "^2.0.2",
-                "extend-shallow": "^3.0.2",
-                "extglob": "^2.0.4",
-                "fragment-cache": "^0.2.1",
-                "kind-of": "^6.0.2",
-                "nanomatch": "^1.2.9",
-                "object.pick": "^1.3.0",
-                "regex-not": "^1.0.0",
-                "snapdragon": "^0.8.1",
-                "to-regex": "^3.0.2"
-              }
-            }
+            "color-name": "~1.1.4"
           }
         },
-        "replace-ext": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "ripemd160": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
-          "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
+        "commander": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
           "dev": true
         },
-        "sha.js": {
-          "version": "2.2.6",
-          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz",
-          "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "has-flag": "^1.0.0"
+            "has-flag": "^4.0.0"
           }
         },
-        "tapable": {
-          "version": "0.1.10",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-          "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+        "ws": {
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
           "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+          "requires": {}
+        }
+      }
+    },
+    "webpack-manifest-plugin": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-5.0.0.tgz",
+      "integrity": "sha512-8RQfMAdc5Uw3QbCQ/CBV/AXqOR8mt03B6GJmRbhWopE8GzRfEpn+k0ZuWywxW+5QZsffhmFDY1J6ohqJo+eMuw==",
+      "dev": true,
+      "requires": {
+        "tapable": "^2.0.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         },
-        "uglify-js": {
-          "version": "2.7.5",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
-          "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
+        "webpack-sources": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+          "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
           "dev": true,
           "requires": {
-            "async": "~0.2.6",
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
-          },
-          "dependencies": {
-            "async": {
-              "version": "0.2.10",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-              "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-              "dev": true
-            }
+            "source-list-map": "^2.0.1",
+            "source-map": "^0.6.1"
           }
-        },
-        "util": {
-          "version": "0.10.4",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+        }
+      }
+    },
+    "webpack-merge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true
+    },
+    "webpack-stream": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-stream/-/webpack-stream-7.0.0.tgz",
+      "integrity": "sha512-XoAQTHyCaYMo6TS7Atv1HYhtmBgKiVLONJbzLBl2V3eibXQ2IT/MCRM841RW/r3vToKD5ivrTJFWgd/ghoxoRg==",
+      "dev": true,
+      "requires": {
+        "fancy-log": "^1.3.3",
+        "lodash.clone": "^4.3.2",
+        "lodash.some": "^4.2.2",
+        "memory-fs": "^0.5.0",
+        "plugin-error": "^1.0.1",
+        "supports-color": "^8.1.1",
+        "through": "^2.3.8",
+        "vinyl": "^2.2.1"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
           "dev": true,
           "requires": {
-            "inherits": "2.0.3"
+            "ansi-wrap": "^0.1.0"
           }
         },
-        "vinyl": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-          "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-          "dev": true,
-          "requires": {
-            "clone": "^1.0.0",
-            "clone-stats": "^0.0.1",
-            "replace-ext": "0.0.1"
-          }
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
         },
-        "vm-browserify": {
-          "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-          "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-          "dev": true,
-          "requires": {
-            "indexof": "0.0.1"
-          }
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
         },
-        "watchpack": {
-          "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
-          "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
           "dev": true,
           "requires": {
-            "async": "^0.9.0",
-            "chokidar": "^1.0.0",
-            "graceful-fs": "^4.1.2"
-          },
-          "dependencies": {
-            "async": {
-              "version": "0.9.2",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-              "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-              "dev": true
-            }
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
           }
         },
-        "webpack": {
-          "version": "1.15.0",
-          "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.15.0.tgz",
-          "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
           "dev": true,
           "requires": {
-            "acorn": "^3.0.0",
-            "async": "^1.3.0",
-            "clone": "^1.0.2",
-            "enhanced-resolve": "~0.9.0",
-            "interpret": "^0.6.4",
-            "loader-utils": "^0.2.11",
-            "memory-fs": "~0.3.0",
-            "mkdirp": "~0.5.0",
-            "node-libs-browser": "^0.7.0",
-            "optimist": "~0.6.0",
-            "supports-color": "^3.1.0",
-            "tapable": "~0.1.8",
-            "uglify-js": "~2.7.3",
-            "watchpack": "^0.2.1",
-            "webpack-core": "~0.6.9"
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
           }
         },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+        "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": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -23441,47 +44424,70 @@
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
-    "whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "dev": true,
       "requires": {
-        "iconv-lite": "0.4.24"
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
       }
     },
-    "whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
+    "which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
     },
-    "whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
       "requires": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
       }
     },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+    "which-collection": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
       }
     },
     "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
       "dev": true
     },
+    "which-typed-array": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
+      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.20.0",
+        "for-each": "^0.3.3",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.9"
+      }
+    },
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -23492,15 +44498,15 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
           "dev": true
         },
         "string-width": {
@@ -23516,7 +44522,7 @@
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
           "dev": true,
           "requires": {
             "ansi-regex": "^3.0.0"
@@ -23524,12 +44530,6 @@
         }
       }
     },
-    "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-      "dev": true
-    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -23539,13 +44539,19 @@
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+      "dev": true
+    },
+    "workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
       "dev": true
     },
     "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
@@ -23554,12 +44560,11 @@
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -23583,52 +44588,35 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
     "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
-      }
-    },
-    "write-file-atomic": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
-      "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
       }
     },
     "ws": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
-      "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==",
-      "dev": true
-    },
-    "x-is-string": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
-      "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=",
-      "dev": true
-    },
-    "xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-      "dev": true
-    },
-    "xmlhttprequest-ssl": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
-      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
-      "dev": true
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "dev": true,
+      "requires": {}
     },
     "xtend": {
       "version": "4.0.2",
@@ -23637,181 +44625,59 @@
       "dev": true
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true
     },
     "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
     "yargs": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
-      "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
+      "integrity": "sha512-7OGt4xXoWJQh5ulgZ78rKaqY7dNWbjfK+UKxGcIlaM2j7C4fqGchyv8CPvEWdRPrHp6Ula/YU8yGRpYGOHrI+g==",
       "dev": true
     },
     "yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true
     },
     "yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
       "dev": true,
       "requires": {
-        "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        "camelcase": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+          "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
           "dev": true
         },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+        "is-plain-obj": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
           "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
-        },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
         }
       }
     },
     "yarn-install": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
-      "integrity": "sha1-V/RQULgu/VcYKzlzxUqgXLXSUjA=",
+      "integrity": "sha512-VO1u181msinhPcGvQTVMnHVOae8zjX/NSksR17e6eXHRveDvHCF5mGjh9hkN8mzyfnCqcBe42LdTs7bScuTaeg==",
       "dev": true,
       "requires": {
         "cac": "^3.0.3",
@@ -23822,19 +44688,19 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -23844,10 +44710,30 @@
             "supports-color": "^2.0.0"
           }
         },
+        "cross-spawn": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+          "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
+          }
+        },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -23856,7 +44742,22 @@
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+          "dev": true
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
           "dev": true
         }
       }
@@ -23864,29 +44765,48 @@
     "yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
       }
     },
-    "yeast": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
-      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
     },
     "zip-stream": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-3.0.1.tgz",
-      "integrity": "sha512-r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",
+      "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
       "dev": true,
       "requires": {
         "archiver-utils": "^2.1.0",
-        "compress-commons": "^3.0.0",
+        "compress-commons": "^4.1.0",
         "readable-stream": "^3.6.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
+    },
+    "zwitch": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.2.tgz",
+      "integrity": "sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==",
+      "dev": true
     }
   }
 }
diff --git a/package.json b/package.json
index 4eb14fc5144..10da88d1c6f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "3.26.0-pre",
+  "version": "7.32.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {
@@ -11,6 +11,16 @@
     "type": "git",
     "url": "https://github.com/prebid/Prebid.js.git"
   },
+  "sideEffects": [
+    "src/prebid.js",
+    "modules/*.js",
+    "modules/*/index.js"
+  ],
+  "browserslist": [
+    "> 0.25%",
+    "not IE 11",
+    "not op_mini all"
+  ],
   "keywords": [
     "advertising",
     "auction",
@@ -24,94 +34,105 @@
     "node": ">=8.9.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.4",
-    "@babel/preset-env": "^7.8.4",
-    "@jsdevtools/coverage-istanbul-loader": "^3.0.3",
-    "@wdio/browserstack-service": "^6.1.4",
-    "@wdio/cli": "^6.1.5",
-    "@wdio/concise-reporter": "^6.1.5",
-    "@wdio/local-runner": "^6.1.7",
-    "@wdio/mocha-framework": "^6.1.6",
-    "@wdio/spec-reporter": "^6.1.5",
-    "@wdio/sync": "^6.1.5",
-    "ajv": "5.5.2",
+    "@babel/eslint-parser": "^7.16.5",
+    "@wdio/browserstack-service": "~7.16.0",
+    "@wdio/cli": "~7.5.2",
+    "@wdio/concise-reporter": "~7.5.2",
+    "@wdio/local-runner": "~7.5.2",
+    "@wdio/mocha-framework": "~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-plugin-istanbul": "^6.1.1",
+    "babel-register": "^6.26.0",
     "body-parser": "^1.19.0",
     "chai": "^4.2.0",
     "coveralls": "^3.1.0",
-    "documentation": "^5.2.2",
+    "deep-equal": "^2.0.3",
+    "documentation": "^14.0.0",
     "es5-shim": "^4.5.14",
+    "eslint": "^7.27.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-node": "^5.1.0",
+    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prebid": "file:./plugins/eslint",
-    "eslint-plugin-promise": "^3.5.0",
+    "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^3.0.1",
     "execa": "^1.0.0",
-    "faker": "^3.1.0",
+    "faker": "^5.5.3",
     "fs.extra": "^1.3.2",
     "gulp": "^4.0.0",
-    "gulp-clean": "^0.3.2",
+    "gulp-clean": "^0.4.0",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^5.7.0",
-    "gulp-eslint": "^4.0.0",
-    "gulp-footer": "^2.0.2",
-    "gulp-header": "^1.7.1",
-    "gulp-if": "^2.0.2",
+    "gulp-eslint": "^6.0.0",
+    "gulp-if": "^3.0.0",
     "gulp-js-escape": "^1.0.1",
     "gulp-replace": "^1.0.0",
-    "gulp-shell": "^0.5.2",
-    "gulp-sourcemaps": "^2.6.0",
-    "gulp-uglify": "^3.0.0",
+    "gulp-shell": "^0.8.0",
+    "gulp-sourcemaps": "^3.0.0",
+    "gulp-terser": "^2.0.1",
     "gulp-util": "^3.0.0",
-    "is-docker": "^1.1.0",
+    "is-docker": "^2.2.1",
     "istanbul": "^0.4.5",
-    "karma": "^4.0.0",
-    "karma-babel-preprocessor": "^6.0.1",
+    "karma": "^6.3.2",
+    "karma-babel-preprocessor": "^8.0.1",
     "karma-browserstack-launcher": "1.4.0",
     "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^2.2.0",
+    "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^2.0.1",
-    "karma-coverage-istanbul-reporter": "^1.3.0",
+    "karma-coverage-istanbul-reporter": "^3.0.3",
     "karma-es5-shim": "^0.0.4",
-    "karma-firefox-launcher": "^1.3.0",
+    "karma-firefox-launcher": "^2.1.0",
     "karma-ie-launcher": "^1.0.0",
-    "karma-mocha": "^1.3.0",
+    "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
     "karma-opera-launcher": "^1.0.0",
     "karma-safari-launcher": "^1.0.0",
     "karma-script-launcher": "^1.0.0",
     "karma-sinon": "^1.0.5",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "^0.0.31",
-    "karma-webpack": "^3.0.5",
-    "lodash": "^4.17.4",
-    "mocha": "^5.0.0",
+    "karma-spec-reporter": "^0.0.32",
+    "karma-webpack": "^5.0.0",
+    "lodash": "^4.17.21",
+    "mocha": "^10.0.0",
     "morgan": "^1.10.0",
     "opn": "^5.4.0",
     "resolve-from": "^5.0.0",
     "sinon": "^4.1.3",
-    "through2": "^2.0.3",
+    "through2": "^4.0.2",
+    "url": "^0.11.0",
     "url-parse": "^1.0.5",
-    "webdriverio": "^6.1.5",
-    "webpack": "^3.0.0",
-    "webpack-bundle-analyzer": "^3.8.0",
-    "webpack-stream": "^3.2.0",
+    "video.js": "^7.17.0",
+    "videojs-contrib-ads": "^6.9.0",
+    "videojs-ima": "^1.11.0",
+    "videojs-playlist": "^5.0.0",
+    "webdriverio": "^7.6.1",
+    "webpack": "^5.70.0",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-manifest-plugin": "^5.0.0",
+    "webpack-stream": "^7.0.0",
     "yargs": "^1.3.1"
   },
   "dependencies": {
-    "babel-plugin-transform-object-assign": "^6.22.0",
-    "core-js": "^3.0.0",
-    "core-js-pure": "^3.6.5",
+    "@babel/core": "^7.16.7",
+    "@babel/plugin-transform-runtime": "^7.18.9",
+    "@babel/preset-env": "^7.16.8",
+    "@babel/runtime": "^7.18.9",
+    "core-js": "^3.13.0",
+    "core-js-pure": "^3.13.0",
     "criteo-direct-rsa-validate": "^1.1.0",
     "crypto-js": "^3.3.0",
-    "deep-equal": "^1.0.1",
     "dlv": "1.1.3",
-    "dset": "2.0.1",
+    "dset": "3.1.2",
     "express": "^4.15.4",
     "fun-hooks": "^0.9.9",
-    "jsencrypt": "^3.0.0-rc.1",
     "just-clone": "^1.0.2",
-    "live-connect-js": "1.1.10"
+    "live-connect-js": "3.0.1"
+  },
+  "optionalDependencies": {
+    "fsevents": "^2.3.2"
   }
 }
diff --git a/plugins/RequireEnsureWithoutJsonp.js b/plugins/RequireEnsureWithoutJsonp.js
deleted file mode 100644
index c15af360e56..00000000000
--- a/plugins/RequireEnsureWithoutJsonp.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * RequireEnsureWithoutJsonp
- *
- * This plugin redefines the behavior of require.ensure that is used by webpack to load chunks. Usually require.ensure
- * includes code that allows the asynchronous loading of webpack chunks through jsonp requests AND includes a manifest
- * of all the build chunks so that they can be requested by name (e.g. require.ensure('./module.js'). Since that
- * functionality is not required and we plan on loading all of our chunks manually (either by concatenating all the
- * files together or including as individual scripts) we don't want the overhead of including that loading code or the
- * file manifest.  In this plugin, that code is replaced with an error message if a module is requested that hasn't been
- * loaded manually.
- *
- * @constructor
- */
-function RequireEnsureWithoutJsonp() {}
-RequireEnsureWithoutJsonp.prototype.apply = function(compiler) {
-  compiler.plugin('compilation', function(compilation) {
-    compilation.mainTemplate.plugin('require-ensure', function(_, chunk, hash) {
-      return '';
-    });
-  });
-};
-
-module.exports = RequireEnsureWithoutJsonp;
diff --git a/plugins/eslint/validateImports.js b/plugins/eslint/validateImports.js
index a39bf9b26d5..37a87fffb50 100644
--- a/plugins/eslint/validateImports.js
+++ b/plugins/eslint/validateImports.js
@@ -62,7 +62,7 @@ module.exports = {
             let importPath = node.source.value.trim();
             flagErrors(context, node, importPath);
           },
-          "ExportNamedDeclaration[source]"(node) {
+          'ExportNamedDeclaration[source]'(node) {
             let importPath = node.source.value.trim();
             flagErrors(context, node, importPath);
           }
diff --git a/plugins/pbjsGlobals.js b/plugins/pbjsGlobals.js
index bf3c9033ee6..c1a08133e8e 100644
--- a/plugins/pbjsGlobals.js
+++ b/plugins/pbjsGlobals.js
@@ -1,20 +1,72 @@
 
 let t = require('@babel/core').types;
 let prebid = require('../package.json');
+const path = require('path');
+const allFeatures = new Set(require('../features.json'));
+
+const FEATURES_GLOBAL = 'FEATURES';
+
+function featureMap(disable = []) {
+  disable = disable.map((s) => s.toUpperCase());
+  disable.forEach((f) => {
+    if (!allFeatures.has(f)) {
+      throw new Error(`Unrecognized feature: ${f}`)
+    }
+  });
+  disable = new Set(disable);
+  return Object.fromEntries([...allFeatures.keys()].map((f) => [f, !disable.has(f)]));
+}
+
+function getNpmVersion(version) {
+  try {
+    // only use "real" versions (that is, not the -pre ones, they won't be on jsDelivr)
+    return /^([\d.]+)$/.exec(version)[1];
+  } catch (e) {
+    return 'latest';
+  }
+}
 
 module.exports = function(api, options) {
+  const pbGlobal = options.globalVarName || prebid.globalVarName;
+  const features = featureMap(options.disableFeatures);
   let replace = {
     '$prebid.version$': prebid.version,
-    '$$PREBID_GLOBAL$$': options.globalVarName || prebid.globalVarName,
-    '$$REPO_AND_VERSION$$': `${prebid.repository.url.split('/')[3]}_prebid_${prebid.version}`
+    '$$PREBID_GLOBAL$$': pbGlobal,
+    '$$REPO_AND_VERSION$$': `${prebid.repository.url.split('/')[3]}_prebid_${prebid.version}`,
+    '$$PREBID_DIST_URL_BASE$$': options.prebidDistUrlBase || `https://cdn.jsdelivr.net/npm/prebid.js@${getNpmVersion(prebid.version)}/dist/`
   };
 
   let identifierToStringLiteral = [
     '$$REPO_AND_VERSION$$'
   ];
 
+  const PREBID_ROOT = path.resolve(__dirname, '..');
+
+  function getModuleName(filename) {
+    const modPath = path.parse(path.relative(PREBID_ROOT, filename));
+    if (modPath.ext.toLowerCase() !== '.js') {
+      return null;
+    }
+    if (modPath.dir === 'modules') {
+      // modules/moduleName.js -> moduleName
+      return modPath.name;
+    }
+    if (modPath.name.toLowerCase() === 'index' && path.dirname(modPath.dir) === 'modules') {
+      // modules/moduleName/index.js -> moduleName
+      return path.basename(modPath.dir);
+    }
+    return null;
+  }
+
   return {
     visitor: {
+      Program(path, state) {
+        const modName = getModuleName(state.filename);
+        if (modName != null) {
+          // append "registration" of module file to $$PREBID_GLOBAL$$.installedModules
+          path.node.body.push(...api.parse(`window.${pbGlobal}.installedModules.push('${modName}');`, {filename: state.filename}).program.body);
+        }
+      },
       StringLiteral(path) {
         Object.keys(replace).forEach(name => {
           if (path.node.value.includes(name)) {
@@ -55,6 +107,17 @@ module.exports = function(api, options) {
             }
           }
         });
+      },
+      MemberExpression(path) {
+        if (
+          t.isIdentifier(path.node.object) &&
+          path.node.object.name === FEATURES_GLOBAL &&
+          !path.scope.hasBinding(FEATURES_GLOBAL) &&
+          t.isIdentifier(path.node.property) &&
+          features.hasOwnProperty(path.node.property.name)
+        ) {
+          path.replaceWith(t.booleanLiteral(features[path.node.property.name]));
+        }
       }
     }
   };
diff --git a/src/AnalyticsAdapter.js b/src/AnalyticsAdapter.js
deleted file mode 100644
index f3297412a35..00000000000
--- a/src/AnalyticsAdapter.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import CONSTANTS from './constants.json';
-import { ajax } from './ajax.js';
-
-const events = require('./events.js');
-const utils = require('./utils.js');
-
-const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    REQUEST_BIDS,
-    BID_REQUESTED,
-    BID_TIMEOUT,
-    BID_RESPONSE,
-    NO_BID,
-    BID_WON,
-    BID_ADJUSTMENT,
-    BIDDER_DONE,
-    SET_TARGETING,
-    AD_RENDER_FAILED,
-    ADD_AD_UNITS
-  }
-} = CONSTANTS;
-
-const ENDPOINT = 'endpoint';
-const BUNDLE = 'bundle';
-
-var _sampled = true;
-
-export default function AnalyticsAdapter({ url, analyticsType, global, handler }) {
-  var _queue = [];
-  var _eventCount = 0;
-  var _enableCheck = true;
-  var _handlers;
-
-  if (analyticsType === ENDPOINT || BUNDLE) {
-    _emptyQueue();
-  }
-
-  return {
-    track: _track,
-    enqueue: _enqueue,
-    enableAnalytics: _enable,
-    disableAnalytics: _disable,
-    getAdapterType: () => analyticsType,
-    getGlobal: () => global,
-    getHandler: () => handler,
-    getUrl: () => url
-  };
-
-  function _track({ eventType, args }) {
-    if (this.getAdapterType() === BUNDLE) {
-      window[global](handler, eventType, args);
-    }
-
-    if (this.getAdapterType() === ENDPOINT) {
-      _callEndpoint(...arguments);
-    }
-  }
-
-  function _callEndpoint({ eventType, args, callback }) {
-    ajax(url, callback, JSON.stringify({ eventType, args }));
-  }
-
-  function _enqueue({ eventType, args }) {
-    const _this = this;
-
-    if (global && window[global] && eventType && args) {
-      this.track({ eventType, args });
-    } else {
-      _queue.push(function () {
-        _eventCount++;
-        _this.track({ eventType, args });
-      });
-    }
-  }
-
-  function _enable(config) {
-    var _this = this;
-
-    if (typeof config === 'object' && typeof config.options === 'object') {
-      _sampled = typeof config.options.sampling === 'undefined' || Math.random() < parseFloat(config.options.sampling);
-    } else {
-      _sampled = true;
-    }
-
-    if (_sampled) {
-      // first send all events fired before enableAnalytics called
-      events.getEvents().forEach(event => {
-        if (!event) {
-          return;
-        }
-
-        const { eventType, args } = event;
-
-        if (eventType !== BID_TIMEOUT) {
-          _enqueue.call(_this, { eventType, args });
-        }
-      });
-
-      // Next register event listeners to send data immediately
-
-      _handlers = {
-        [REQUEST_BIDS]: args => this.enqueue({ eventType: REQUEST_BIDS, args }),
-        [BID_REQUESTED]: args => this.enqueue({ eventType: BID_REQUESTED, args }),
-        [BID_RESPONSE]: args => this.enqueue({ eventType: BID_RESPONSE, args }),
-        [NO_BID]: args => this.enqueue({ eventType: NO_BID, args }),
-        [BID_TIMEOUT]: args => this.enqueue({ eventType: BID_TIMEOUT, args }),
-        [BID_WON]: args => this.enqueue({ eventType: BID_WON, args }),
-        [BID_ADJUSTMENT]: args => this.enqueue({ eventType: BID_ADJUSTMENT, args }),
-        [BIDDER_DONE]: args => this.enqueue({ eventType: BIDDER_DONE, args }),
-        [SET_TARGETING]: args => this.enqueue({ eventType: SET_TARGETING, args }),
-        [AUCTION_END]: args => this.enqueue({ eventType: AUCTION_END, args }),
-        [AD_RENDER_FAILED]: args => this.enqueue({ eventType: AD_RENDER_FAILED, args }),
-        [ADD_AD_UNITS]: args => this.enqueue({ eventType: ADD_AD_UNITS, args }),
-        [AUCTION_INIT]: args => {
-          args.config = typeof config === 'object' ? config.options || {} : {}; // enableAnaltyics configuration object
-          this.enqueue({ eventType: AUCTION_INIT, args });
-        }
-      };
-
-      utils._each(_handlers, (handler, event) => {
-        events.on(event, handler);
-      });
-    } else {
-      utils.logMessage(`Analytics adapter for "${global}" disabled by sampling`);
-    }
-
-    // finally set this function to return log message, prevents multiple adapter listeners
-    this._oldEnable = this.enableAnalytics;
-    this.enableAnalytics = function _enable() {
-      return utils.logMessage(`Analytics adapter for "${global}" already enabled, unnecessary call to \`enableAnalytics\`.`);
-    };
-  }
-
-  function _disable() {
-    utils._each(_handlers, (handler, event) => {
-      events.off(event, handler);
-    });
-    this.enableAnalytics = this._oldEnable ? this._oldEnable : _enable;
-  }
-
-  function _emptyQueue() {
-    if (_enableCheck) {
-      for (var i = 0; i < _queue.length; i++) {
-        _queue[i]();
-      }
-
-      // override push to execute the command immediately from now on
-      _queue.push = function (fn) {
-        fn();
-      };
-
-      _enableCheck = false;
-    }
-
-    utils.logMessage(`event count sent to ${global}: ${_eventCount}`);
-  }
-}
diff --git a/src/Renderer.js b/src/Renderer.js
index 85bcbb383e8..97e37084e89 100644
--- a/src/Renderer.js
+++ b/src/Renderer.js
@@ -1,6 +1,8 @@
 import { loadExternalScript } from './adloader.js';
-import * as utils from './utils.js';
-import find from 'core-js-pure/features/array/find.js';
+import {
+  logError, logWarn, logMessage, deepAccess
+} from './utils.js';
+import {find} from './polyfill.js';
 const moduleCode = 'outstream';
 
 /**
@@ -12,7 +14,7 @@ const moduleCode = 'outstream';
  */
 
 export function Renderer(options) {
-  const { url, config, id, callback, loaded, adUnitCode } = options;
+  const { url, config, id, callback, loaded, adUnitCode, renderNow } = options;
   this.url = url;
   this.config = config;
   this.handlers = {};
@@ -25,7 +27,7 @@ export function Renderer(options) {
   this.cmd = [];
   this.push = func => {
     if (typeof func !== 'function') {
-      utils.logError('Commands given to Renderer.push must be wrapped in a function');
+      logError('Commands given to Renderer.push must be wrapped in a function');
       return;
     }
     this.loaded ? func.call() : this.cmd.push(func);
@@ -39,23 +41,30 @@ export function Renderer(options) {
 
   // use a function, not an arrow, in order to be able to pass "arguments" through
   this.render = function () {
-    if (!isRendererDefinedOnAdUnit(adUnitCode)) {
-      // we expect to load a renderer url once only so cache the request to load script
-      loadExternalScript(url, moduleCode, this.callback);
-    } else {
-      utils.logWarn(`External Js not loaded by Renderer since renderer url and callback is already defined on adUnit ${adUnitCode}`);
+    const renderArgs = arguments
+    const runRender = () => {
+      if (this._render) {
+        this._render.apply(this, renderArgs)
+      } else {
+        logWarn(`No render function was provided, please use .setRender on the renderer`);
+      }
     }
 
-    if (this._render) {
-      this._render.apply(this, arguments) // _render is expected to use push as appropriate
+    if (isRendererPreferredFromAdUnit(adUnitCode)) {
+      logWarn(`External Js not loaded by Renderer since renderer url and callback is already defined on adUnit ${adUnitCode}`);
+      runRender();
+    } else if (renderNow) {
+      runRender();
     } else {
-      utils.logWarn(`No render function was provided, please use .setRender on the renderer`);
+      // we expect to load a renderer url once only so cache the request to load script
+      this.cmd.unshift(runRender) // should render run first ?
+      loadExternalScript(url, moduleCode, this.callback, this.documentContext);
     }
-  }.bind(this) // bind the function to this object to avoid 'this' errors
+  }.bind(this); // bind the function to this object to avoid 'this' errors
 }
 
-Renderer.install = function({ url, config, id, callback, loaded, adUnitCode }) {
-  return new Renderer({ url, config, id, callback, loaded, adUnitCode });
+Renderer.install = function({ url, config, id, callback, loaded, adUnitCode, renderNow }) {
+  return new Renderer({ url, config, id, callback, loaded, adUnitCode, renderNow });
 };
 
 Renderer.prototype.getConfig = function() {
@@ -75,7 +84,7 @@ Renderer.prototype.handleVideoEvent = function({ id, eventName }) {
     this.handlers[eventName]();
   }
 
-  utils.logMessage(`Prebid Renderer event for id ${id} type ${eventName}`);
+  logMessage(`Prebid Renderer event for id ${id} type ${eventName}`);
 };
 
 /*
@@ -87,7 +96,7 @@ Renderer.prototype.process = function() {
     try {
       this.cmd.shift().call();
     } catch (error) {
-      utils.logError('Error processing Renderer command: ', error);
+      logError('Error processing Renderer command: ', error);
     }
   }
 };
@@ -105,15 +114,40 @@ export function isRendererRequired(renderer) {
  * Render the bid returned by the adapter
  * @param {Object} renderer Renderer object installed by adapter
  * @param {Object} bid Bid response
+ * @param {Document} doc context document of bid
  */
-export function executeRenderer(renderer, bid) {
-  renderer.render(bid);
+export function executeRenderer(renderer, bid, doc) {
+  let docContext = null;
+  if (renderer.config && renderer.config.documentResolver) {
+    docContext = renderer.config.documentResolver(bid, document, doc);// a user provided callback, which should return a Document, and expect the parameters; bid, sourceDocument, renderDocument
+  }
+  if (!docContext) {
+    docContext = document;
+  }
+  renderer.documentContext = docContext;
+  renderer.render(bid, renderer.documentContext);
 }
 
-function isRendererDefinedOnAdUnit(adUnitCode) {
+function isRendererPreferredFromAdUnit(adUnitCode) {
   const adUnits = $$PREBID_GLOBAL$$.adUnits;
   const adUnit = find(adUnits, adUnit => {
     return adUnit.code === adUnitCode;
   });
-  return !!(adUnit && adUnit.renderer && adUnit.renderer.url && adUnit.renderer.render);
+
+  if (!adUnit) {
+    return false
+  }
+
+  // renderer defined at adUnit level
+  const adUnitRenderer = deepAccess(adUnit, 'renderer');
+  const hasValidAdUnitRenderer = !!(adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render);
+
+  // renderer defined at adUnit.mediaTypes level
+  const mediaTypeRenderer = deepAccess(adUnit, 'mediaTypes.video.renderer');
+  const hasValidMediaTypeRenderer = !!(mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render)
+
+  return !!(
+    (hasValidAdUnitRenderer && !(adUnitRenderer.backupOnly === true)) ||
+    (hasValidMediaTypeRenderer && !(mediaTypeRenderer.backupOnly === true))
+  );
 }
diff --git a/src/adRendering.js b/src/adRendering.js
new file mode 100644
index 00000000000..0a847d7cc25
--- /dev/null
+++ b/src/adRendering.js
@@ -0,0 +1,38 @@
+import {logError} from './utils.js';
+import * as events from './events.js';
+import CONSTANTS from './constants.json';
+
+const {AD_RENDER_FAILED, AD_RENDER_SUCCEEDED} = CONSTANTS.EVENTS;
+
+/**
+ * Emit the AD_RENDER_FAILED event.
+ *
+ * @param reason one of the values in CONSTANTS.AD_RENDER_FAILED_REASON
+ * @param message failure description
+ * @param bid? bid response object that failed to render
+ * @param id? adId that failed to render
+ */
+export function emitAdRenderFail({ reason, message, bid, id }) {
+  const data = { reason, message };
+  if (bid) data.bid = bid;
+  if (id) data.adId = id;
+
+  logError(message);
+  events.emit(AD_RENDER_FAILED, data);
+}
+
+/**
+ * Emit the AD_RENDER_SUCCEEDED event.
+ * (Note: Invocation of this function indicates that the render function did not generate an error, it does not guarantee that tracking for this event has occurred yet.)
+ * @param doc document object that was used to `.write` the ad. Should be `null` if unavailable (e.g. for documents in
+ * a cross-origin frame).
+ * @param bid bid response object for the ad that was rendered
+ * @param id adId that was rendered.
+ */
+export function emitAdRenderSucceeded({ doc, bid, id }) {
+  const data = { doc };
+  if (bid) data.bid = bid;
+  if (id) data.adId = id;
+
+  events.emit(AD_RENDER_SUCCEEDED, data);
+}
diff --git a/src/adapterManager.js b/src/adapterManager.js
index 2108bb7a4f6..f4f9e59fb84 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -1,30 +1,57 @@
 /** @module adaptermanger */
 
-import { flatten, getBidderCodes, getDefinedParams, shuffle, timestamp, getBidderRequest, bind } from './utils.js';
-import { getLabels, resolveStatus } from './sizeMapping.js';
-import { processNativeAdUnitParams, nativeAdapters } from './native.js';
-import { newBidder } from './adapters/bidderFactory.js';
-import { ajaxBuilder } from './ajax.js';
-import { config, RANDOM } from './config.js';
-import { hook } from './hook.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import find from 'core-js-pure/features/array/find.js';
-import { adunitCounter } from './adUnits.js';
-import { getRefererInfo } from './refererDetection.js';
-
-var utils = require('./utils.js');
-var CONSTANTS = require('./constants.json');
-var events = require('./events.js');
-let s2sTestingModule; // store s2sTesting module if it's loaded
+import {
+  _each,
+  bind,
+  deepAccess,
+  deepClone,
+  flatten,
+  generateUUID,
+  getBidderCodes,
+  getDefinedParams,
+  getUniqueIdentifierStr,
+  getUserConfiguredParams,
+  groupBy,
+  isArray,
+  isValidMediaTypes,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  mergeDeep,
+  shuffle,
+  timestamp,
+} from './utils.js';
+import {processAdUnitsForLabels} from './sizeMapping.js';
+import {decorateAdUnitsWithNativeParams, nativeAdapters} from './native.js';
+import {newBidder} from './adapters/bidderFactory.js';
+import {ajaxBuilder} from './ajax.js';
+import {config, RANDOM} from './config.js';
+import {hook} from './hook.js';
+import {find, includes} from './polyfill.js';
+import {adunitCounter} from './adUnits.js';
+import {getRefererInfo} from './refererDetection.js';
+import {GdprConsentHandler, UspConsentHandler, GppConsentHandler} from './consentHandler.js';
+import * as events from './events.js';
+import CONSTANTS from './constants.json';
+import {useMetrics} from './utils/perfMetrics.js';
+import {auctionManager} from './auctionManager.js';
+
+export const PARTITIONS = {
+  CLIENT: 'client',
+  SERVER: 'server'
+}
 
 let adapterManager = {};
 
 let _bidderRegistry = adapterManager.bidderRegistry = {};
 let _aliasRegistry = adapterManager.aliasRegistry = {};
 
-let _s2sConfig = {};
+let _s2sConfigs = [];
 config.getConfig('s2sConfig', config => {
-  _s2sConfig = config.s2sConfig;
+  if (config && config.s2sConfig) {
+    _s2sConfigs = isArray(config.s2sConfig) ? config.s2sConfig : [config.s2sConfig];
+  }
 });
 
 var _analyticsRegistry = {};
@@ -36,101 +63,79 @@ var _analyticsRegistry = {};
  * @property {Array<string>} activeLabels the labels specified as being active by requestBids
  */
 
-function getBids({bidderCode, auctionId, bidderRequestId, adUnits, labels, src}) {
+function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src, metrics}) {
   return adUnits.reduce((result, adUnit) => {
-    let {
-      active,
-      mediaTypes: filteredMediaTypes,
-      filterResults
-    } = resolveStatus(
-      getLabels(adUnit, labels),
-      adUnit.mediaTypes,
-      adUnit.sizes
-    );
-
-    if (!active) {
-      utils.logInfo(`Size mapping disabled adUnit "${adUnit.code}"`);
-    } else if (filterResults) {
-      utils.logInfo(`Size mapping filtered adUnit "${adUnit.code}" banner sizes from `, filterResults.before, 'to ', filterResults.after);
-    }
-
-    if (active) {
-      result.push(adUnit.bids.filter(bid => bid.bidder === bidderCode)
-        .reduce((bids, bid) => {
-          const nativeParams =
-            adUnit.nativeParams || utils.deepAccess(adUnit, 'mediaTypes.native');
-          if (nativeParams) {
-            bid = Object.assign({}, bid, {
-              nativeParams: processNativeAdUnitParams(nativeParams),
-            });
-          }
-
-          bid = Object.assign({}, bid, getDefinedParams(adUnit, [
-            'fpd',
-            'mediaType',
-            'renderer',
-            'storedAuctionResponse'
-          ]));
-
-          let {
-            active,
-            mediaTypes,
-            filterResults
-          } = resolveStatus(getLabels(bid, labels), filteredMediaTypes);
-
-          if (!active) {
-            utils.logInfo(`Size mapping deactivated adUnit "${adUnit.code}" bidder "${bid.bidder}"`);
-          } else if (filterResults) {
-            utils.logInfo(`Size mapping filtered adUnit "${adUnit.code}" bidder "${bid.bidder}" banner sizes from `, filterResults.before, 'to ', filterResults.after);
-          }
-
-          if (utils.isValidMediaTypes(mediaTypes)) {
-            bid = Object.assign({}, bid, {
-              mediaTypes
-            });
-          } else {
-            utils.logError(
-              `mediaTypes is not correctly configured for adunit ${adUnit.code}`
-            );
-          }
+    result.push(adUnit.bids.filter(bid => bid.bidder === bidderCode)
+      .reduce((bids, bid) => {
+        bid = Object.assign({}, bid, getDefinedParams(adUnit, [
+          'nativeParams',
+          'nativeOrtbRequest',
+          'ortb2Imp',
+          'mediaType',
+          'renderer'
+        ]));
+
+        const mediaTypes = bid.mediaTypes == null ? adUnit.mediaTypes : bid.mediaTypes
+
+        if (isValidMediaTypes(mediaTypes)) {
+          bid = Object.assign({}, bid, {
+            mediaTypes
+          });
+        } else {
+          logError(
+            `mediaTypes is not correctly configured for adunit ${adUnit.code}`
+          );
+        }
 
-          if (active) {
-            bids.push(Object.assign({}, bid, {
-              adUnitCode: adUnit.code,
-              transactionId: adUnit.transactionId,
-              sizes: utils.deepAccess(mediaTypes, 'banner.sizes') || utils.deepAccess(mediaTypes, 'video.playerSize') || [],
-              bidId: bid.bid_id || utils.getUniqueIdentifierStr(),
-              bidderRequestId,
-              auctionId,
-              src,
-              bidRequestsCount: adunitCounter.getRequestsCounter(adUnit.code),
-              bidderRequestsCount: adunitCounter.getBidderRequestsCounter(adUnit.code, bid.bidder),
-              bidderWinsCount: adunitCounter.getBidderWinsCounter(adUnit.code, bid.bidder),
-            }));
-          }
-          return bids;
-        }, [])
-      );
-    }
+        bids.push(Object.assign({}, bid, {
+          adUnitCode: adUnit.code,
+          transactionId: adUnit.transactionId,
+          sizes: deepAccess(mediaTypes, 'banner.sizes') || deepAccess(mediaTypes, 'video.playerSize') || [],
+          bidId: bid.bid_id || getUniqueIdentifierStr(),
+          bidderRequestId,
+          auctionId,
+          src,
+          metrics,
+          bidRequestsCount: adunitCounter.getRequestsCounter(adUnit.code),
+          bidderRequestsCount: adunitCounter.getBidderRequestsCounter(adUnit.code, bid.bidder),
+          bidderWinsCount: adunitCounter.getBidderWinsCounter(adUnit.code, bid.bidder),
+        }));
+        return bids;
+      }, [])
+    );
     return result;
   }, []).reduce(flatten, []).filter(val => val !== '');
 }
 
 const hookedGetBids = hook('sync', getBids, 'getBids');
 
-function getAdUnitCopyForPrebidServer(adUnits) {
-  let adaptersServerSide = _s2sConfig.bidders;
-  let adUnitsCopy = utils.deepClone(adUnits);
+/**
+ * Filter an adUnit's  bids for building client and/or server requests
+ *
+ * @param bids an array of bids as defined in an adUnit
+ * @param s2sConfig null if the adUnit is being routed to a client adapter; otherwise the s2s adapter's config
+ * @returns the subset of `bids` that are pertinent for the given `s2sConfig`
+ */
+export function _filterBidsForAdUnit(bids, s2sConfig, {getS2SBidders = getS2SBidderSet} = {}) {
+  if (s2sConfig == null) {
+    return bids;
+  } else {
+    const serverBidders = getS2SBidders(s2sConfig);
+    return bids.filter((bid) => serverBidders.has(bid.bidder))
+  }
+}
+export const filterBidsForAdUnit = hook('sync', _filterBidsForAdUnit, 'filterBidsForAdUnit');
+
+function getAdUnitCopyForPrebidServer(adUnits, s2sConfig) {
+  let adUnitsCopy = deepClone(adUnits);
 
   adUnitsCopy.forEach((adUnit) => {
     // filter out client side bids
-    adUnit.bids = adUnit.bids.filter((bid) => {
-      return includes(adaptersServerSide, bid.bidder) &&
-        (!doingS2STesting() || bid.finalSource !== s2sTestingModule.CLIENT);
-    }).map((bid) => {
-      bid.bid_id = utils.getUniqueIdentifierStr();
-      return bid;
-    });
+    adUnit.bids = filterBidsForAdUnit(adUnit.bids, s2sConfig)
+      .map((bid) => {
+        bid.bid_id = getUniqueIdentifierStr();
+        return bid;
+      });
   });
 
   // don't send empty requests
@@ -141,12 +146,9 @@ function getAdUnitCopyForPrebidServer(adUnits) {
 }
 
 function getAdUnitCopyForClientAdapters(adUnits) {
-  let adUnitsClientCopy = utils.deepClone(adUnits);
-  // filter out s2s bids
+  let adUnitsClientCopy = deepClone(adUnits);
   adUnitsClientCopy.forEach((adUnit) => {
-    adUnit.bids = adUnit.bids.filter((bid) => {
-      return !doingS2STesting() || bid.finalSource !== s2sTestingModule.SERVER;
-    })
+    adUnit.bids = filterBidsForAdUnit(adUnit.bids, null);
   });
 
   // don't send empty requests
@@ -157,123 +159,150 @@ function getAdUnitCopyForClientAdapters(adUnits) {
   return adUnitsClientCopy;
 }
 
-export let gdprDataHandler = {
-  consentData: null,
-  setConsentData: function(consentInfo) {
-    gdprDataHandler.consentData = consentInfo;
-  },
-  getConsentData: function() {
-    return gdprDataHandler.consentData;
-  }
-};
+export let gdprDataHandler = new GdprConsentHandler();
+export let uspDataHandler = new UspConsentHandler();
+export let gppDataHandler = new GppConsentHandler();
 
-export let uspDataHandler = {
-  consentData: null,
-  setConsentData: function(consentInfo) {
-    uspDataHandler.consentData = consentInfo;
-  },
-  getConsentData: function() {
-    return uspDataHandler.consentData;
+export let coppaDataHandler = {
+  getCoppa: function() {
+    return !!(config.getConfig('coppa'))
   }
 };
 
-adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, auctionId, cbTimeout, labels) {
+/**
+ * Filter and/or modify media types for ad units based on the given labels.
+ *
+ * This should return adUnits that are active for the given labels, modified to have their `mediaTypes`
+ * conform to size mapping configuration. If different bids for the same adUnit should use different `mediaTypes`,
+ * they should be exposed under `adUnit.bids[].mediaTypes`.
+ */
+export const setupAdUnitMediaTypes = hook('sync', (adUnits, labels) => {
+  return processAdUnitsForLabels(adUnits, labels);
+}, 'setupAdUnitMediaTypes')
+
+/**
+ * @param {{}|Array<{}>} s2sConfigs
+ * @returns {Set<String>} a set of all the bidder codes that should be routed through the S2S adapter(s)
+ *                        as defined in `s2sConfigs`
+ */
+export function getS2SBidderSet(s2sConfigs) {
+  if (!isArray(s2sConfigs)) s2sConfigs = [s2sConfigs];
+  // `null` represents the "no bid bidder" - when an ad unit is meant only for S2S adapters, like stored impressions
+  const serverBidders = new Set([null]);
+  s2sConfigs.filter((s2s) => s2s && s2s.enabled)
+    .flatMap((s2s) => s2s.bidders)
+    .forEach((bidder) => serverBidders.add(bidder));
+  return serverBidders;
+}
+
+/**
+ * @returns {{[PARTITIONS.CLIENT]: Array<String>, [PARTITIONS.SERVER]: Array<String>}}
+ *           All the bidder codes in the given `adUnits`, divided in two arrays -
+ *           those that should be routed to client, and server adapters (according to the configuration in `s2sConfigs`).
+ */
+export function _partitionBidders (adUnits, s2sConfigs, {getS2SBidders = getS2SBidderSet} = {}) {
+  const serverBidders = getS2SBidders(s2sConfigs);
+  return getBidderCodes(adUnits).reduce((memo, bidder) => {
+    const partition = serverBidders.has(bidder) ? PARTITIONS.SERVER : PARTITIONS.CLIENT;
+    memo[partition].push(bidder);
+    return memo;
+  }, {[PARTITIONS.CLIENT]: [], [PARTITIONS.SERVER]: []})
+}
+
+export const partitionBidders = hook('sync', _partitionBidders, 'partitionBidders');
+
+adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, auctionId, cbTimeout, labels, ortb2Fragments = {}, auctionMetrics) {
+  auctionMetrics = useMetrics(auctionMetrics);
   /**
    * emit and pass adunits for external modification
    * @see {@link https://github.com/prebid/Prebid.js/issues/4149|Issue}
    */
   events.emit(CONSTANTS.EVENTS.BEFORE_REQUEST_BIDS, adUnits);
+  if (FEATURES.NATIVE) {
+    decorateAdUnitsWithNativeParams(adUnits);
+  }
+  adUnits = setupAdUnitMediaTypes(adUnits, labels);
 
-  let bidRequests = [];
+  let {[PARTITIONS.CLIENT]: clientBidders, [PARTITIONS.SERVER]: serverBidders} = partitionBidders(adUnits, _s2sConfigs);
 
-  let bidderCodes = getBidderCodes(adUnits);
   if (config.getConfig('bidderSequence') === RANDOM) {
-    bidderCodes = shuffle(bidderCodes);
+    clientBidders = shuffle(clientBidders);
   }
   const refererInfo = getRefererInfo();
 
-  let clientBidderCodes = bidderCodes;
-  let clientTestAdapters = [];
-
-  if (_s2sConfig.enabled) {
-    // if s2sConfig.bidderControl testing is turned on
-    if (doingS2STesting()) {
-      // get all adapters doing client testing
-      const bidderMap = s2sTestingModule.getSourceBidderMap(adUnits);
-      clientTestAdapters = bidderMap[s2sTestingModule.CLIENT];
-    }
-
-    // these are called on the s2s adapter
-    let adaptersServerSide = _s2sConfig.bidders;
-
-    // don't call these client side (unless client request is needed for testing)
-    clientBidderCodes = bidderCodes.filter(elm =>
-      !includes(adaptersServerSide, elm) || includes(clientTestAdapters, elm)
-    );
-
-    const adUnitsContainServerRequests = adUnits => Boolean(
-      find(adUnits, adUnit => find(adUnit.bids, bid => (
-        bid.bidSource ||
-        (_s2sConfig.bidderControl && _s2sConfig.bidderControl[bid.bidder])
-      ) && bid.finalSource === s2sTestingModule.SERVER))
-    );
+  let bidRequests = [];
 
-    if (isTestingServerOnly() && adUnitsContainServerRequests(adUnits)) {
-      clientBidderCodes.length = 0;
-    }
+  const ortb2 = ortb2Fragments.global || {};
+  const bidderOrtb2 = ortb2Fragments.bidder || {};
 
-    let adUnitsS2SCopy = getAdUnitCopyForPrebidServer(adUnits);
-    let tid = utils.generateUUID();
-    adaptersServerSide.forEach(bidderCode => {
-      const bidderRequestId = utils.getUniqueIdentifierStr();
-      const bidderRequest = {
-        bidderCode,
-        auctionId,
-        bidderRequestId,
-        tid,
-        bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsS2SCopy), labels, src: CONSTANTS.S2S.SRC}),
-        auctionStart: auctionStart,
-        timeout: _s2sConfig.timeout,
-        src: CONSTANTS.S2S.SRC,
-        refererInfo
-      };
-      if (bidderRequest.bids.length !== 0) {
-        bidRequests.push(bidderRequest);
-      }
-    });
+  function addOrtb2(bidderRequest) {
+    const fpd = Object.freeze(mergeDeep({}, ortb2, bidderOrtb2[bidderRequest.bidderCode]));
+    bidderRequest.ortb2 = fpd;
+    bidderRequest.bids.forEach((bid) => bid.ortb2 = fpd);
+    return bidderRequest;
+  }
 
-    // update the s2sAdUnits object and remove all bids that didn't pass sizeConfig/label checks from getBids()
-    // this is to keep consistency and only allow bids/adunits that passed the checks to go to pbs
-    adUnitsS2SCopy.forEach((adUnitCopy) => {
-      let validBids = adUnitCopy.bids.filter((adUnitBid) => {
-        return find(bidRequests, request => {
-          return find(request.bids, (reqBid) => reqBid.bidId === adUnitBid.bid_id);
+  _s2sConfigs.forEach(s2sConfig => {
+    if (s2sConfig && s2sConfig.enabled) {
+      let adUnitsS2SCopy = getAdUnitCopyForPrebidServer(adUnits, s2sConfig);
+
+      // uniquePbsTid is so we know which server to send which bids to during the callBids function
+      let uniquePbsTid = generateUUID();
+      serverBidders.forEach(bidderCode => {
+        const bidderRequestId = getUniqueIdentifierStr();
+        const metrics = auctionMetrics.fork();
+        const bidderRequest = addOrtb2({
+          bidderCode,
+          auctionId,
+          bidderRequestId,
+          uniquePbsTid,
+          bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsS2SCopy), src: CONSTANTS.S2S.SRC, metrics}),
+          auctionStart: auctionStart,
+          timeout: s2sConfig.timeout,
+          src: CONSTANTS.S2S.SRC,
+          refererInfo,
+          metrics,
         });
+        if (bidderRequest.bids.length !== 0) {
+          bidRequests.push(bidderRequest);
+        }
       });
-      adUnitCopy.bids = validBids;
-    });
 
-    bidRequests.forEach(request => {
-      request.adUnitsS2SCopy = adUnitsS2SCopy.filter(adUnitCopy => adUnitCopy.bids.length > 0);
-    });
-  }
+      // update the s2sAdUnits object and remove all bids that didn't pass sizeConfig/label checks from getBids()
+      // this is to keep consistency and only allow bids/adunits that passed the checks to go to pbs
+      adUnitsS2SCopy.forEach((adUnitCopy) => {
+        let validBids = adUnitCopy.bids.filter((adUnitBid) =>
+          find(bidRequests, request =>
+            find(request.bids, (reqBid) => reqBid.bidId === adUnitBid.bid_id)));
+        adUnitCopy.bids = validBids;
+      });
+
+      bidRequests.forEach(request => {
+        if (request.adUnitsS2SCopy === undefined) {
+          request.adUnitsS2SCopy = adUnitsS2SCopy.filter(adUnitCopy => adUnitCopy.bids.length > 0);
+        }
+      });
+    }
+  });
 
   // client adapters
   let adUnitsClientCopy = getAdUnitCopyForClientAdapters(adUnits);
-  clientBidderCodes.forEach(bidderCode => {
-    const bidderRequestId = utils.getUniqueIdentifierStr();
-    const bidderRequest = {
+  clientBidders.forEach(bidderCode => {
+    const bidderRequestId = getUniqueIdentifierStr();
+    const metrics = auctionMetrics.fork();
+    const bidderRequest = addOrtb2({
       bidderCode,
       auctionId,
       bidderRequestId,
-      bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsClientCopy), labels, src: 'client'}),
+      bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsClientCopy), labels, src: 'client', metrics}),
       auctionStart: auctionStart,
       timeout: cbTimeout,
-      refererInfo
-    };
+      refererInfo,
+      metrics,
+    });
     const adapter = _bidderRegistry[bidderCode];
     if (!adapter) {
-      utils.logError(`Trying to make a request for bidder that does not exist: ${bidderCode}`);
+      logError(`Trying to make a request for bidder that does not exist: ${bidderCode}`);
     }
 
     if (adapter && bidderRequest.bids && bidderRequest.bids.length !== 0) {
@@ -281,23 +310,31 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
     }
   });
 
-  if (gdprDataHandler.getConsentData()) {
-    bidRequests.forEach(bidRequest => {
+  bidRequests.forEach(bidRequest => {
+    if (gdprDataHandler.getConsentData()) {
       bidRequest['gdprConsent'] = gdprDataHandler.getConsentData();
-    });
-  }
-
-  if (uspDataHandler.getConsentData()) {
-    bidRequests.forEach(bidRequest => {
+    }
+    if (uspDataHandler.getConsentData()) {
       bidRequest['uspConsent'] = uspDataHandler.getConsentData();
+    }
+    if (gppDataHandler.getConsentData()) {
+      bidRequest['gppConsent'] = gppDataHandler.getConsentData();
+    }
+  });
+
+  bidRequests.forEach(bidRequest => {
+    config.runWithBidder(bidRequest.bidderCode, () => {
+      const fledgeEnabledFromConfig = config.getConfig('fledgeEnabled');
+      bidRequest['fledgeEnabled'] = navigator.runAdAuction && fledgeEnabledFromConfig
     });
-  }
+  });
+
   return bidRequests;
 }, 'makeBidRequests');
 
-adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, requestCallbacks, requestBidsTimeout, onTimelyResponse) => {
+adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, requestCallbacks, requestBidsTimeout, onTimelyResponse, ortb2Fragments = {}) => {
   if (!bidRequests.length) {
-    utils.logWarn('callBids executed with no bidRequests.  Were they filtered by labels or sizing?');
+    logWarn('callBids executed with no bidRequests.  Were they filtered by labels or sizing?');
     return;
   }
 
@@ -306,64 +343,78 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
     return partitions;
   }, [[], []]);
 
-  if (serverBidRequests.length) {
-    // s2s should get the same client side timeout as other client side requests.
-    const s2sAjax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
-      request: requestCallbacks.request.bind(null, 's2s'),
-      done: requestCallbacks.done
-    } : undefined);
-    let adaptersServerSide = _s2sConfig.bidders;
-    const s2sAdapter = _bidderRegistry[_s2sConfig.adapter];
-    let tid = serverBidRequests[0].tid;
-    let adUnitsS2SCopy = serverBidRequests[0].adUnitsS2SCopy;
-
-    if (s2sAdapter) {
-      let s2sBidRequest = {tid, 'ad_units': adUnitsS2SCopy};
-      if (s2sBidRequest.ad_units.length) {
-        let doneCbs = serverBidRequests.map(bidRequest => {
-          bidRequest.start = timestamp();
-          return doneCb.bind(bidRequest);
-        });
-
-        // only log adapters that actually have adUnit bids
-        let allBidders = s2sBidRequest.ad_units.reduce((adapters, adUnit) => {
-          return adapters.concat((adUnit.bids || []).reduce((adapters, bid) => { return adapters.concat(bid.bidder) }, []));
-        }, []);
-        utils.logMessage(`CALLING S2S HEADER BIDDERS ==== ${adaptersServerSide.filter(adapter => {
-          return includes(allBidders, adapter);
-        }).join(',')}`);
-
-        // fire BID_REQUESTED event for each s2s bidRequest
-        serverBidRequests.forEach(bidRequest => {
-          events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
-        });
+  var uniqueServerBidRequests = [];
+  serverBidRequests.forEach(serverBidRequest => {
+    var index = -1;
+    for (var i = 0; i < uniqueServerBidRequests.length; ++i) {
+      if (serverBidRequest.uniquePbsTid === uniqueServerBidRequests[i].uniquePbsTid) {
+        index = i;
+        break;
+      }
+    }
+    if (index <= -1) {
+      uniqueServerBidRequests.push(serverBidRequest);
+    }
+  });
 
-        // make bid requests
-        s2sAdapter.callBids(
-          s2sBidRequest,
-          serverBidRequests,
-          function(adUnitCode, bid) {
-            let bidderRequest = getBidderRequest(serverBidRequests, bid.bidderCode, adUnitCode);
-            if (bidderRequest) {
-              addBidResponse.call(bidderRequest, adUnitCode, bid)
-            }
-          },
-          () => doneCbs.forEach(done => done()),
-          s2sAjax
-        );
+  let counter = 0;
+
+  _s2sConfigs.forEach((s2sConfig) => {
+    if (s2sConfig && uniqueServerBidRequests[counter] && getS2SBidderSet(s2sConfig).has(uniqueServerBidRequests[counter].bidderCode)) {
+      // s2s should get the same client side timeout as other client side requests.
+      const s2sAjax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
+        request: requestCallbacks.request.bind(null, 's2s'),
+        done: requestCallbacks.done
+      } : undefined);
+      let adaptersServerSide = s2sConfig.bidders;
+      const s2sAdapter = _bidderRegistry[s2sConfig.adapter];
+      let uniquePbsTid = uniqueServerBidRequests[counter].uniquePbsTid;
+      let adUnitsS2SCopy = uniqueServerBidRequests[counter].adUnitsS2SCopy;
+
+      let uniqueServerRequests = serverBidRequests.filter(serverBidRequest => serverBidRequest.uniquePbsTid === uniquePbsTid);
+
+      if (s2sAdapter) {
+        let s2sBidRequest = {'ad_units': adUnitsS2SCopy, s2sConfig, ortb2Fragments};
+        if (s2sBidRequest.ad_units.length) {
+          let doneCbs = uniqueServerRequests.map(bidRequest => {
+            bidRequest.start = timestamp();
+            return doneCb.bind(bidRequest);
+          });
+
+          const bidders = getBidderCodes(s2sBidRequest.ad_units).filter((bidder) => adaptersServerSide.includes(bidder));
+          logMessage(`CALLING S2S HEADER BIDDERS ==== ${bidders.length > 0 ? bidders.join(', ') : 'No bidder specified, using "ortb2Imp" definition(s) only'}`);
+
+          // fire BID_REQUESTED event for each s2s bidRequest
+          uniqueServerRequests.forEach(bidRequest => {
+            // add the new sourceTid
+            events.emit(CONSTANTS.EVENTS.BID_REQUESTED, {...bidRequest, tid: bidRequest.auctionId});
+          });
+
+          // make bid requests
+          s2sAdapter.callBids(
+            s2sBidRequest,
+            serverBidRequests,
+            addBidResponse,
+            () => doneCbs.forEach(done => done()),
+            s2sAjax
+          );
+        }
+      } else {
+        logError('missing ' + s2sConfig.adapter);
       }
-    } else {
-      utils.logError('missing ' + _s2sConfig.adapter);
+      counter++;
     }
-  }
+  });
 
   // handle client adapter requests
   clientBidRequests.forEach(bidRequest => {
     bidRequest.start = timestamp();
     // TODO : Do we check for bid in pool from here and skip calling adapter again ?
     const adapter = _bidderRegistry[bidRequest.bidderCode];
-    utils.logMessage(`CALLING BIDDER ======= ${bidRequest.bidderCode}`);
-    events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+    config.runWithBidder(bidRequest.bidderCode, () => {
+      logMessage(`CALLING BIDDER`);
+      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+    });
     let ajax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
       request: requestCallbacks.request.bind(null, bidRequest.bidderCode),
       done: requestCallbacks.done
@@ -376,7 +427,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
           adapter.callBids,
           adapter,
           bidRequest,
-          addBidResponse.bind(bidRequest),
+          addBidResponse,
           adapterDone,
           ajax,
           onTimelyResponse,
@@ -384,150 +435,158 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
         )
       );
     } catch (e) {
-      utils.logError(`${bidRequest.bidderCode} Bid Adapter emitted an uncaught error when parsing their bidRequest`, {e, bidRequest});
+      logError(`${bidRequest.bidderCode} Bid Adapter emitted an uncaught error when parsing their bidRequest`, {e, bidRequest});
       adapterDone();
     }
   });
 };
 
-function doingS2STesting() {
-  return _s2sConfig && _s2sConfig.enabled && _s2sConfig.testing && s2sTestingModule;
-}
-
-function isTestingServerOnly() {
-  return Boolean(doingS2STesting() && _s2sConfig.testServerOnly);
-};
-
 function getSupportedMediaTypes(bidderCode) {
-  let result = [];
-  if (includes(adapterManager.videoAdapters, bidderCode)) result.push('video');
-  if (includes(nativeAdapters, bidderCode)) result.push('native');
-  return result;
+  let supportedMediaTypes = [];
+  if (includes(adapterManager.videoAdapters, bidderCode)) supportedMediaTypes.push('video');
+  if (FEATURES.NATIVE && includes(nativeAdapters, bidderCode)) supportedMediaTypes.push('native');
+  return supportedMediaTypes;
 }
 
 adapterManager.videoAdapters = []; // added by adapterLoader for now
 
-adapterManager.registerBidAdapter = function (bidAdaptor, bidderCode, {supportedMediaTypes = []} = {}) {
-  if (bidAdaptor && bidderCode) {
-    if (typeof bidAdaptor.callBids === 'function') {
-      _bidderRegistry[bidderCode] = bidAdaptor;
+adapterManager.registerBidAdapter = function (bidAdapter, bidderCode, {supportedMediaTypes = []} = {}) {
+  if (bidAdapter && bidderCode) {
+    if (typeof bidAdapter.callBids === 'function') {
+      _bidderRegistry[bidderCode] = bidAdapter;
 
       if (includes(supportedMediaTypes, 'video')) {
         adapterManager.videoAdapters.push(bidderCode);
       }
-      if (includes(supportedMediaTypes, 'native')) {
+      if (FEATURES.NATIVE && includes(supportedMediaTypes, 'native')) {
         nativeAdapters.push(bidderCode);
       }
     } else {
-      utils.logError('Bidder adaptor error for bidder code: ' + bidderCode + 'bidder must implement a callBids() function');
+      logError('Bidder adaptor error for bidder code: ' + bidderCode + 'bidder must implement a callBids() function');
     }
   } else {
-    utils.logError('bidAdaptor or bidderCode not specified');
+    logError('bidAdapter or bidderCode not specified');
   }
 };
 
-adapterManager.aliasBidAdapter = function (bidderCode, alias) {
+adapterManager.aliasBidAdapter = function (bidderCode, alias, options) {
   let existingAlias = _bidderRegistry[alias];
 
   if (typeof existingAlias === 'undefined') {
-    let bidAdaptor = _bidderRegistry[bidderCode];
-    if (typeof bidAdaptor === 'undefined') {
+    let bidAdapter = _bidderRegistry[bidderCode];
+    if (typeof bidAdapter === 'undefined') {
       // check if alias is part of s2sConfig and allow them to register if so (as base bidder may be s2s-only)
-      const s2sConfig = config.getConfig('s2sConfig');
-      const s2sBidders = s2sConfig && s2sConfig.bidders;
-
-      if (!(s2sBidders && includes(s2sBidders, alias))) {
-        utils.logError('bidderCode "' + bidderCode + '" is not an existing bidder.', 'adapterManager.aliasBidAdapter');
-      } else {
-        _aliasRegistry[alias] = bidderCode;
-      }
+      const nonS2SAlias = [];
+      _s2sConfigs.forEach(s2sConfig => {
+        if (s2sConfig.bidders && s2sConfig.bidders.length) {
+          const s2sBidders = s2sConfig && s2sConfig.bidders;
+          if (!(s2sConfig && includes(s2sBidders, alias))) {
+            nonS2SAlias.push(bidderCode);
+          } else {
+            _aliasRegistry[alias] = bidderCode;
+          }
+        }
+      });
+      nonS2SAlias.forEach(bidderCode => {
+        logError('bidderCode "' + bidderCode + '" is not an existing bidder.', 'adapterManager.aliasBidAdapter');
+      });
     } else {
       try {
         let newAdapter;
         let supportedMediaTypes = getSupportedMediaTypes(bidderCode);
         // Have kept old code to support backward compatibilitiy.
         // Remove this if loop when all adapters are supporting bidderFactory. i.e When Prebid.js is 1.0
-        if (bidAdaptor.constructor.prototype != Object.prototype) {
-          newAdapter = new bidAdaptor.constructor();
+        if (bidAdapter.constructor.prototype != Object.prototype) {
+          newAdapter = new bidAdapter.constructor();
           newAdapter.setBidderCode(alias);
         } else {
-          let spec = bidAdaptor.getSpec();
-          newAdapter = newBidder(Object.assign({}, spec, { code: alias }));
+          let spec = bidAdapter.getSpec();
+          let gvlid = options && options.gvlid;
+          let skipPbsAliasing = options && options.skipPbsAliasing;
+          newAdapter = newBidder(Object.assign({}, spec, { code: alias, gvlid, skipPbsAliasing }));
           _aliasRegistry[alias] = bidderCode;
         }
         adapterManager.registerBidAdapter(newAdapter, alias, {
           supportedMediaTypes
         });
       } catch (e) {
-        utils.logError(bidderCode + ' bidder does not currently support aliasing.', 'adapterManager.aliasBidAdapter');
+        logError(bidderCode + ' bidder does not currently support aliasing.', 'adapterManager.aliasBidAdapter');
       }
     }
   } else {
-    utils.logMessage('alias name "' + alias + '" has been already specified.');
+    logMessage('alias name "' + alias + '" has been already specified.');
   }
 };
 
-adapterManager.registerAnalyticsAdapter = function ({adapter, code}) {
+adapterManager.registerAnalyticsAdapter = function ({adapter, code, gvlid}) {
   if (adapter && code) {
     if (typeof adapter.enableAnalytics === 'function') {
       adapter.code = code;
-      _analyticsRegistry[code] = adapter;
+      _analyticsRegistry[code] = { adapter, gvlid };
     } else {
-      utils.logError(`Prebid Error: Analytics adaptor error for analytics "${code}"
+      logError(`Prebid Error: Analytics adaptor error for analytics "${code}"
         analytics adapter must implement an enableAnalytics() function`);
     }
   } else {
-    utils.logError('Prebid Error: analyticsAdapter or analyticsCode not specified');
+    logError('Prebid Error: analyticsAdapter or analyticsCode not specified');
   }
 };
 
 adapterManager.enableAnalytics = function (config) {
-  if (!utils.isArray(config)) {
+  if (!isArray(config)) {
     config = [config];
   }
 
-  utils._each(config, adapterConfig => {
-    var adapter = _analyticsRegistry[adapterConfig.provider];
-    if (adapter) {
-      adapter.enableAnalytics(adapterConfig);
+  _each(config, adapterConfig => {
+    const entry = _analyticsRegistry[adapterConfig.provider];
+    if (entry && entry.adapter) {
+      entry.adapter.enableAnalytics(adapterConfig);
     } else {
-      utils.logError(`Prebid Error: no analytics adapter found in registry for
-        ${adapterConfig.provider}.`);
+      logError(`Prebid Error: no analytics adapter found in registry for '${adapterConfig.provider}'.`);
     }
   });
-};
+}
 
 adapterManager.getBidAdapter = function(bidder) {
   return _bidderRegistry[bidder];
 };
 
-// the s2sTesting module is injected when it's loaded rather than being imported
-// importing it causes the packager to include it even when it's not explicitly included in the build
-export function setS2STestingModule(module) {
-  s2sTestingModule = module;
+adapterManager.getAnalyticsAdapter = function(code) {
+  return _analyticsRegistry[code];
 }
 
-function tryCallBidderMethod(bidder, method, param) {
+function getBidderMethod(bidder, method) {
+  const adapter = _bidderRegistry[bidder];
+  const spec = adapter?.getSpec && adapter.getSpec();
+  if (spec && spec[method] && typeof spec[method] === 'function') {
+    return [spec, spec[method]]
+  }
+}
+
+function invokeBidderMethod(bidder, method, spec, fn, ...params) {
   try {
-    const adapter = _bidderRegistry[bidder];
-    const spec = adapter.getSpec();
-    if (spec && spec[method] && typeof spec[method] === 'function') {
-      utils.logInfo(`Invoking ${bidder}.${method}`);
-      config.runWithBidder(bidder, bind.call(spec[method], spec, param));
-    }
+    logInfo(`Invoking ${bidder}.${method}`);
+    config.runWithBidder(bidder, fn.bind(spec, ...params));
   } catch (e) {
-    utils.logWarn(`Error calling ${method} of ${bidder}`);
+    logWarn(`Error calling ${method} of ${bidder}`);
+  }
+}
+
+function tryCallBidderMethod(bidder, method, param) {
+  const target = getBidderMethod(bidder, method);
+  if (target != null) {
+    invokeBidderMethod(bidder, method, ...target, param);
   }
 }
 
 adapterManager.callTimedOutBidders = function(adUnits, timedOutBidders, cbTimeout) {
   timedOutBidders = timedOutBidders.map((timedOutBidder) => {
     // Adding user configured params & timeout to timeout event data
-    timedOutBidder.params = utils.getUserConfiguredParams(adUnits, timedOutBidder.adUnitCode, timedOutBidder.bidder);
+    timedOutBidder.params = getUserConfiguredParams(adUnits, timedOutBidder.adUnitCode, timedOutBidder.bidder);
     timedOutBidder.timeout = cbTimeout;
     return timedOutBidder;
   });
-  timedOutBidders = utils.groupBy(timedOutBidders, 'bidder');
+  timedOutBidders = groupBy(timedOutBidders, 'bidder');
 
   Object.keys(timedOutBidders).forEach((bidder) => {
     tryCallBidderMethod(bidder, 'onTimeout', timedOutBidders[bidder]);
@@ -536,7 +595,7 @@ adapterManager.callTimedOutBidders = function(adUnits, timedOutBidders, cbTimeou
 
 adapterManager.callBidWonBidder = function(bidder, bid, adUnits) {
   // Adding user configured params to bidWon event data
-  bid.params = utils.getUserConfiguredParams(adUnits, bid.adUnitCode, bid.bidder);
+  bid.params = getUserConfiguredParams(adUnits, bid.adUnitCode, bid.bidder);
   adunitCounter.incrementBidderWinsCounter(bid.adUnitCode, bid.bidder);
   tryCallBidderMethod(bidder, 'onBidWon', bid);
 };
@@ -545,4 +604,50 @@ adapterManager.callSetTargetingBidder = function(bidder, bid) {
   tryCallBidderMethod(bidder, 'onSetTargeting', bid);
 };
 
+adapterManager.callBidViewableBidder = function(bidder, bid) {
+  tryCallBidderMethod(bidder, 'onBidViewable', bid);
+};
+
+adapterManager.callBidderError = function(bidder, error, bidderRequest) {
+  const param = { error, bidderRequest };
+  tryCallBidderMethod(bidder, 'onBidderError', param);
+};
+
+function resolveAlias(alias) {
+  const seen = new Set();
+  while (_aliasRegistry.hasOwnProperty(alias) && !seen.has(alias)) {
+    seen.add(alias);
+    alias = _aliasRegistry[alias];
+  }
+  return alias;
+}
+/**
+ * Ask every adapter to delete PII.
+ * See https://github.com/prebid/Prebid.js/issues/9081
+ */
+adapterManager.callDataDeletionRequest = hook('sync', function (...args) {
+  const method = 'onDataDeletionRequest';
+  Object.keys(_bidderRegistry)
+    .filter((bidder) => !_aliasRegistry.hasOwnProperty(bidder))
+    .forEach(bidder => {
+      const target = getBidderMethod(bidder, method);
+      if (target != null) {
+        const bidderRequests = auctionManager.getBidsRequested().filter((br) =>
+          resolveAlias(br.bidderCode) === bidder
+        );
+        invokeBidderMethod(bidder, method, ...target, bidderRequests, ...args);
+      }
+    });
+  Object.entries(_analyticsRegistry).forEach(([name, entry]) => {
+    const fn = entry?.adapter?.[method];
+    if (typeof fn === 'function') {
+      try {
+        fn.apply(entry.adapter, args);
+      } catch (e) {
+        logError(`error calling ${method} of ${name}`, e);
+      }
+    }
+  });
+});
+
 export default adapterManager;
diff --git a/src/adapters/analytics/example.js b/src/adapters/analytics/example.js
deleted file mode 100644
index 1321612b688..00000000000
--- a/src/adapters/analytics/example.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * example.js - analytics adapter for Example Analytics Library example
- */
-
-import adapter from '../../AnalyticsAdapter.js';
-
-export default adapter(
-  {
-    url: 'http://localhost:9999/src/adapters/analytics/libraries/example.js',
-    global: 'ExampleAnalyticsGlobalObject',
-    handler: 'on',
-    analyticsType: 'library'
-  }
-);
diff --git a/src/adapters/analytics/example2.js b/src/adapters/analytics/example2.js
deleted file mode 100644
index eadf994ce36..00000000000
--- a/src/adapters/analytics/example2.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* eslint-disable no-console */
-import { ajax } from '../../../src/ajax.js';
-
-/**
- * example2.js - analytics adapter for Example2 Analytics Endpoint example
- */
-
-import adapter from '../../AnalyticsAdapter.js';
-
-const url = 'https://httpbin.org/post';
-const analyticsType = 'endpoint';
-
-export default Object.assign(adapter(
-  {
-    url,
-    analyticsType
-  }
-),
-{
-  // Override AnalyticsAdapter functions by supplying custom methods
-  track({ eventType, args }) {
-    console.log('track function override for Example2 Analytics');
-    ajax(url, (result) => console.log('Analytics Endpoint Example2: result = ' + result), JSON.stringify({ eventType, args }));
-  }
-});
diff --git a/src/adapters/analytics/libraries/example.js b/src/adapters/analytics/libraries/example.js
deleted file mode 100644
index 0d758fd5513..00000000000
--- a/src/adapters/analytics/libraries/example.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* eslint-disable no-console */
-/** @module example */
-
-window.ExampleAnalyticsGlobalObject = function(hander, type, data) {
-  console.log(`call to Example Analytics library: example('${hander}', '${type}', ${JSON.stringify(data)})`);
-};
-
-window[window.ExampleAnalyticsGlobalObject] = function() {};
-
-// var utils = require('utils');
-// var events = require('events');
-// var pbjsHandlers = require('prebid-event-handlers');
-var utils = { errorless: function(fn) { return fn; } };
-
-var events = { init: function() { return arguments; } };
-
-var pbjsHandlers = {
-  onBidAdjustment: args => console.log('pbjsHandlers onBidAdjustment args:', args),
-  onBidTimeout: args => console.log('pbjsHandlers bidTimeout args:', args),
-  onBidRequested: args => console.log('pbjsHandlers bidRequested args:', args),
-  onBidResponse: args => console.log('pbjsHandlers bidResponse args:', args),
-  onBidWon: args => console.log('pbjsHandlers bidWon args:', args)
-};
-
-// init
-var example = window[window.ExampleAnalyticsGlobalObject];
-var bufferedQueries = example.q || [];
-
-events.init();
-
-// overwrite example object and handle 'on' callbacks
-window[window.ExampleAnalyticsGlobalObject] = example = utils.errorless(function() {
-  if (arguments[0] && arguments[0] === 'on') {
-    var eventName = arguments[1] && arguments[1];
-    var args = arguments[2] && arguments[2];
-    if (eventName && args) {
-      if (eventName === 'bidAdjustment') {
-        pbjsHandlers.onBidAdjustment.apply(this, [args]);
-      }
-      if (eventName === 'bidTimeout') {
-        pbjsHandlers.onBidTimeout.apply(this, [args]);
-      }
-      if (eventName === 'bidRequested') {
-        pbjsHandlers.onBidRequested.apply(this, [args]);
-      }
-      if (eventName === 'bidResponse') {
-        pbjsHandlers.onBidResponse.apply(this, [args]);
-      }
-      if (eventName === 'bidWon') {
-        pbjsHandlers.onBidWon.apply(this, [args]);
-      }
-    }
-  }
-});
-
-// apply bufferedQueries
-bufferedQueries.forEach(function(args) {
-  example.apply(this, args);
-});
diff --git a/src/adapters/analytics/libraries/example2.js b/src/adapters/analytics/libraries/example2.js
deleted file mode 100644
index 68e814b1417..00000000000
--- a/src/adapters/analytics/libraries/example2.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* eslint-disable no-console */
-/** @module example */
-
-window.ExampleAnalyticsGlobalObject2 = function(hander, type, data) {
-  console.log(`call to Example2 Analytics library: example2('${hander}', '${type}', ${JSON.stringify(data)})`);
-};
-
-window[window.ExampleAnalyticsGlobalObject2] = function() {};
-
-// var utils = require('utils');
-// var events = require('events');
-// var pbjsHandlers = require('prebid-event-handlers');
-var utils = { errorless: function(fn) { return fn; } };
-
-var events = { init: function() { return arguments; } };
-
-var pbjsHandlers = {
-  onBidAdjustment: args => console.log('pbjsHandlers onBidAdjustment args:', args),
-  onBidTimeout: args => console.log('pbjsHandlers bidTimeout args:', args),
-  onBidRequested: args => console.log('pbjsHandlers bidRequested args:', args),
-  onBidResponse: args => console.log('pbjsHandlers bidResponse args:', args),
-  onBidWon: args => console.log('pbjsHandlers bidWon args:', args)
-};
-
-// init
-var example = window[window.ExampleAnalyticsGlobalObject2];
-var bufferedQueries = example.q || [];
-
-events.init();
-
-// overwrite example object and handle 'on' callbacks
-window[window.ExampleAnalyticsGlobalObject2] = example = utils.errorless(function() {
-  if (arguments[0] && arguments[0] === 'on') {
-    var eventName = arguments[1] && arguments[1];
-    var args = arguments[2] && arguments[2];
-    if (eventName && args) {
-      if (eventName === 'bidAdjustment') {
-        pbjsHandlers.onBidAdjustment.apply(this, [args]);
-      }
-      if (eventName === 'bidTimeout') {
-        pbjsHandlers.onBidTimeout.apply(this, [args]);
-      }
-      if (eventName === 'bidRequested') {
-        pbjsHandlers.onBidRequested.apply(this, [args]);
-      }
-      if (eventName === 'bidResponse') {
-        pbjsHandlers.onBidResponse.apply(this, [args]);
-      }
-      if (eventName === 'bidWon') {
-        pbjsHandlers.onBidWon.apply(this, [args]);
-      }
-    }
-  }
-});
-
-// apply bufferedQueries
-bufferedQueries.forEach(function(args) {
-  example.apply(this, args);
-});
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index 8dd351563be..55c84e57062 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -6,13 +6,16 @@ import { userSync } from '../userSync.js';
 import { nativeBidIsValid } from '../native.js';
 import { isValidVideoBid } from '../video.js';
 import CONSTANTS from '../constants.json';
-import events from '../events.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import * as events from '../events.js';
+import {includes} from '../polyfill.js';
 import { ajax } from '../ajax.js';
-import { logWarn, logError, parseQueryStringParameters, delayExecution, parseSizesInput, getBidderRequest, flatten, uniques, timestamp, deepAccess, isArray } from '../utils.js';
+import { logWarn, logInfo, logError, parseQueryStringParameters, delayExecution, parseSizesInput, flatten, uniques, timestamp, deepAccess, isArray, isPlainObject } from '../utils.js';
 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';
+import {useMetrics} from '../utils/perfMetrics.js';
 
 export const storage = getCoreStorageManager('bidderFactory');
 
@@ -36,6 +39,7 @@ export const storage = getCoreStorageManager('bidderFactory');
  * });
  *
  * @see BidderSpec for the full API and more thorough descriptions.
+ *
  */
 
 /**
@@ -69,6 +73,13 @@ export const storage = getCoreStorageManager('bidderFactory');
  * @property {object} params Any bidder-specific params which the publisher used in their bid request.
  */
 
+/**
+ * @typedef {object} BidderAuctionResponse An object encapsulating an adapter response for current Auction
+ *
+ * @property {Array<Bid>} bids Contextual bids returned by this adapter, if any
+ * @property {object|null} fledgeAuctionConfigs Optional FLEDGE response, as a map of impid -> auction_config
+ */
+
 /**
  * @typedef {object} ServerRequest
  *
@@ -130,7 +141,7 @@ export const storage = getCoreStorageManager('bidderFactory');
  */
 
 // common params for all mediaTypes
-const COMMON_BID_RESPONSE_KEYS = ['requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency'];
+const COMMON_BID_RESPONSE_KEYS = ['cpm', 'ttl', 'creativeId', 'netRevenue', 'currency'];
 
 const DEFAULT_REFRESHIN_DAYS = 1;
 
@@ -153,8 +164,16 @@ export function registerBidder(spec) {
   putBidder(spec);
   if (Array.isArray(spec.aliases)) {
     spec.aliases.forEach(alias => {
-      adapterManager.aliasRegistry[alias] = spec.code;
-      putBidder(Object.assign({}, spec, { code: alias }));
+      let aliasCode = alias;
+      let gvlid;
+      let skipPbsAliasing;
+      if (isPlainObject(alias)) {
+        aliasCode = alias.code;
+        gvlid = alias.gvlid;
+        skipPbsAliasing = alias.skipPbsAliasing
+      }
+      adapterManager.aliasRegistry[aliasCode] = spec.code;
+      putBidder(Object.assign({}, spec, { code: aliasCode, gvlid, skipPbsAliasing }));
     });
   }
 }
@@ -178,9 +197,13 @@ export function newBidder(spec) {
 
       const adUnitCodesHandled = {};
       function addBidWithCode(adUnitCode, bid) {
+        const metrics = useMetrics(bid.metrics);
+        metrics.checkpoint('addBidResponse');
         adUnitCodesHandled[adUnitCode] = true;
-        if (isValid(adUnitCode, bid, [bidderRequest])) {
+        if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnitCode, bid))) {
           addBidResponse(adUnitCode, bid);
+        } else {
+          addBidResponse.reject(adUnitCode, bid, CONSTANTS.REJECTION_REASON.INVALID)
         }
       }
 
@@ -189,11 +212,15 @@ export function newBidder(spec) {
       const responses = [];
       function afterAllResponses() {
         done();
-        events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest);
-        registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent);
+        config.runWithBidder(spec.code, () => {
+          events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest);
+          registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent, bidderRequest.gppConsent);
+        });
       }
 
-      const validBidRequests = bidderRequest.bids.filter(filterAndWarn);
+      const validBidRequests = adapterMetrics(bidderRequest)
+        .measureTime('validate', () => bidderRequest.bids.filter(filterAndWarn));
+
       if (validBidRequests.length === 0) {
         afterAllResponses();
         return;
@@ -207,134 +234,69 @@ export function newBidder(spec) {
         }
       });
 
-      let requests = spec.buildRequests(validBidRequests, bidderRequest);
-      if (!requests || requests.length === 0) {
-        afterAllResponses();
-        return;
-      }
-      if (!Array.isArray(requests)) {
-        requests = [requests];
-      }
-
-      // Callbacks don't compose as nicely as Promises. We should call done() once _all_ the
-      // Server requests have returned and been processed. Since `ajax` accepts a single callback,
-      // we need to rig up a function which only executes after all the requests have been responded.
-      const onResponse = delayExecution(configEnabledCallback(afterAllResponses), requests.length)
-      requests.forEach(processRequest);
-
-      function formatGetParameters(data) {
-        if (data) {
-          return `?${typeof data === 'object' ? parseQueryStringParameters(data) : data}`;
-        }
-
-        return '';
-      }
-
-      function processRequest(request) {
-        switch (request.method) {
-          case 'GET':
-            ajax(
-              `${request.url}${formatGetParameters(request.data)}`,
-              {
-                success: configEnabledCallback(onSuccess),
-                error: onFailure
-              },
-              undefined,
-              Object.assign({
-                method: 'GET',
-                withCredentials: true
-              }, request.options)
-            );
-            break;
-          case 'POST':
-            ajax(
-              request.url,
-              {
-                success: configEnabledCallback(onSuccess),
-                error: onFailure
-              },
-              typeof request.data === 'string' ? request.data : JSON.stringify(request.data),
-              Object.assign({
-                method: 'POST',
-                contentType: 'text/plain',
-                withCredentials: true
-              }, request.options)
-            );
-            break;
-          default:
-            logWarn(`Skipping invalid request from ${spec.code}. Request type ${request.type} must be GET or POST`);
-            onResponse();
-        }
-
-        // If the server responds successfully, use the adapter code to unpack the Bids from it.
-        // If the adapter code fails, no bids should be added. After all the bids have been added, make
-        // sure to call the `onResponse` function so that we're one step closer to calling done().
-        function onSuccess(response, responseObj) {
+      processBidderRequests(spec, validBidRequests, bidderRequest, ajax, configEnabledCallback, {
+        onRequest: requestObject => events.emit(CONSTANTS.EVENTS.BEFORE_BIDDER_HTTP, bidderRequest, requestObject),
+        onResponse: (resp) => {
           onTimelyResponse(spec.code);
-
-          try {
-            response = JSON.parse(response);
-          } catch (e) { /* response might not be JSON... that's ok. */ }
-
-          // Make response headers available for #1742. These are lazy-loaded because most adapters won't need them.
-          response = {
-            body: response,
-            headers: headerParser(responseObj)
-          };
-          responses.push(response);
-
-          let bids;
-          try {
-            bids = spec.interpretResponse(response, request);
-          } catch (err) {
-            logError(`Bidder ${spec.code} failed to interpret the server's response. Continuing without bids`, null, err);
-            onResponse();
-            return;
-          }
-
-          if (bids) {
-            if (isArray(bids)) {
-              bids.forEach(addBidUsingRequestMap);
-            } else {
-              addBidUsingRequestMap(bids);
-            }
-          }
-          onResponse(bids);
-
-          function addBidUsingRequestMap(bid) {
-            const bidRequest = bidRequestMap[bid.requestId];
+          responses.push(resp)
+        },
+        /** Process eventual BidderAuctionResponse.fledgeAuctionConfig field in response.
+         * @param {Array<FledgeAuctionConfig>} fledgeAuctionConfigs
+         */
+        onFledgeAuctionConfigs: (fledgeAuctionConfigs) => {
+          fledgeAuctionConfigs.forEach((fledgeAuctionConfig) => {
+            const bidRequest = bidRequestMap[fledgeAuctionConfig.bidId];
             if (bidRequest) {
-              // creating a copy of original values as cpm and currency are modified later
-              bid.originalCpm = bid.cpm;
-              bid.originalCurrency = bid.currency;
-              const prebidBid = Object.assign(createBid(CONSTANTS.STATUS.GOOD, bidRequest), bid);
-              addBidWithCode(bidRequest.adUnitCode, prebidBid);
-            } else {
-              logWarn(`Bidder ${spec.code} made bid for unknown request ID: ${bid.requestId}. Ignoring.`);
+              addComponentAuction(bidRequest, fledgeAuctionConfig);
             }
-          }
-
-          function headerParser(xmlHttpResponse) {
-            return {
-              get: responseObj.getResponseHeader.bind(responseObj)
-            };
-          }
-        }
-
-        // If the server responds with an error, there's not much we can do. Log it, and make sure to
-        // call onResponse() so that we're one step closer to calling done().
-        function onFailure(err) {
+          });
+        },
+        // If the server responds with an error, there's not much we can do beside logging.
+        onError: (errorMessage, error) => {
           onTimelyResponse(spec.code);
+          adapterManager.callBidderError(spec.code, error, bidderRequest)
+          events.emit(CONSTANTS.EVENTS.BIDDER_ERROR, { error, bidderRequest });
+          logError(`Server call for ${spec.code} failed: ${errorMessage} ${error.status}. Continuing without bids.`);
+        },
+        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.`);
+              addBidResponse.reject(bidRequest.adUnitCode, bid, CONSTANTS.REJECTION_REASON.BIDDER_DISALLOWED)
+              return;
+            }
+            // creating a copy of original values as cpm and currency are modified later
+            bid.originalCpm = bid.cpm;
+            bid.originalCurrency = bid.currency;
+            bid.meta = bid.meta || Object.assign({}, bid[bidRequest.bidder]);
+            const prebidBid = Object.assign(createBid(CONSTANTS.STATUS.GOOD, bidRequest), bid);
+            addBidWithCode(bidRequest.adUnitCode, prebidBid);
+          } else {
+            logWarn(`Bidder ${spec.code} made bid for unknown request ID: ${bid.requestId}. Ignoring.`);
+            addBidResponse.reject(null, bid, CONSTANTS.REJECTION_REASON.INVALID_REQUEST_ID);
+          }
+        },
+        onCompletion: afterAllResponses,
+      });
+    }
+  });
 
-          logError(`Server call for ${spec.code} failed: ${err}. Continuing without bids.`);
-          onResponse();
-        }
+  function isInvalidAlternateBidder(responseBidder, requestBidder) {
+    let allowAlternateBidderCodes = bidderSettings.get(requestBidder, 'allowAlternateBidderCodes') || false;
+    let alternateBiddersList = bidderSettings.get(requestBidder, 'allowedAlternateBidderCodes');
+    if (!!responseBidder && !!requestBidder && requestBidder !== responseBidder) {
+      alternateBiddersList = isArray(alternateBiddersList) ? alternateBiddersList.map(val => val.trim().toLowerCase()).filter(val => !!val).filter(uniques) : alternateBiddersList;
+      if (!allowAlternateBidderCodes || (isArray(alternateBiddersList) && (alternateBiddersList[0] !== '*' && !alternateBiddersList.includes(responseBidder)))) {
+        return true;
       }
     }
-  });
+    return false;
+  }
 
-  function registerSyncs(responses, gdprConsent, uspConsent) {
-    registerSyncInner(spec, responses, gdprConsent, uspConsent);
+  function registerSyncs(responses, gdprConsent, uspConsent, gppConsent) {
+    registerSyncInner(spec, responses, gdprConsent, uspConsent, gppConsent);
   }
 
   function filterAndWarn(bid) {
@@ -346,14 +308,154 @@ export function newBidder(spec) {
   }
 }
 
-export const registerSyncInner = hook('async', function(spec, responses, gdprConsent, uspConsent) {
+/**
+ * Run a set of bid requests - that entails converting them to HTTP requests, sending
+ * them over the network, and parsing the responses.
+ *
+ * @param spec bid adapter spec
+ * @param bids bid requests to run
+ * @param bidderRequest the bid request object that `bids` is connected to
+ * @param ajax ajax method to use
+ * @param wrapCallback {function(callback)} a function used to wrap every callback (for the purpose of `config.currentBidder`)
+ * @param onRequest {function({})} invoked once for each HTTP request built by the adapter - with the raw request
+ * @param onResponse {function({})} invoked once on each successful HTTP response - with the raw response
+ * @param onError {function(String, {})} invoked once for each HTTP error - with status code and response
+ * @param onBid {function({})} invoked once for each bid in the response - with the bid as returned by interpretResponse
+ * @param onCompletion {function()} invoked once when all bid requests have been processed
+ */
+export const processBidderRequests = hook('sync', function (spec, bids, bidderRequest, ajax, wrapCallback, {onRequest, onResponse, onFledgeAuctionConfigs, onError, onBid, onCompletion}) {
+  const metrics = adapterMetrics(bidderRequest);
+  onCompletion = metrics.startTiming('total').stopBefore(onCompletion);
+
+  let requests = metrics.measureTime('buildRequests', () => spec.buildRequests(bids, bidderRequest));
+
+  if (!requests || requests.length === 0) {
+    onCompletion();
+    return;
+  }
+  if (!Array.isArray(requests)) {
+    requests = [requests];
+  }
+
+  const requestDone = delayExecution(onCompletion, requests.length);
+
+  requests.forEach((request) => {
+    const requestMetrics = metrics.fork();
+    function addBid(bid) {
+      if (bid != null) bid.metrics = requestMetrics.fork().renameWith();
+      onBid(bid);
+    }
+    // If the server responds successfully, use the adapter code to unpack the Bids from it.
+    // If the adapter code fails, no bids should be added. After all the bids have been added,
+    // make sure to call the `requestDone` function so that we're one step closer to calling onCompletion().
+    const onSuccess = wrapCallback(function(response, responseObj) {
+      networkDone();
+      try {
+        response = JSON.parse(response);
+      } catch (e) { /* response might not be JSON... that's ok. */ }
+
+      // Make response headers available for #1742. These are lazy-loaded because most adapters won't need them.
+      response = {
+        body: response,
+        headers: headerParser(responseObj)
+      };
+      onResponse(response);
+
+      try {
+        response = requestMetrics.measureTime('interpretResponse', () => spec.interpretResponse(response, request));
+      } catch (err) {
+        logError(`Bidder ${spec.code} failed to interpret the server's response. Continuing without bids`, null, err);
+        requestDone();
+        return;
+      }
+
+      let bids;
+      // Extract additional data from a structured {BidderAuctionResponse} response
+      if (response && isArray(response.fledgeAuctionConfigs)) {
+        onFledgeAuctionConfigs(response.fledgeAuctionConfigs);
+        bids = response.bids;
+      } else {
+        bids = response;
+      }
+
+      if (bids) {
+        if (isArray(bids)) {
+          bids.forEach(addBid);
+        } else {
+          addBid(bids);
+        }
+      }
+      requestDone();
+
+      function headerParser(xmlHttpResponse) {
+        return {
+          get: responseObj.getResponseHeader.bind(responseObj)
+        };
+      }
+    });
+
+    const onFailure = wrapCallback(function (errorMessage, error) {
+      networkDone();
+      onError(errorMessage, error);
+      requestDone();
+    });
+
+    onRequest(request);
+
+    const networkDone = requestMetrics.startTiming('net');
+    switch (request.method) {
+      case 'GET':
+        ajax(
+          `${request.url}${formatGetParameters(request.data)}`,
+          {
+            success: onSuccess,
+            error: onFailure
+          },
+          undefined,
+          Object.assign({
+            method: 'GET',
+            withCredentials: true
+          }, request.options)
+        );
+        break;
+      case 'POST':
+        ajax(
+          request.url,
+          {
+            success: onSuccess,
+            error: onFailure
+          },
+          typeof request.data === 'string' ? request.data : JSON.stringify(request.data),
+          Object.assign({
+            method: 'POST',
+            contentType: 'text/plain',
+            withCredentials: true
+          }, request.options)
+        );
+        break;
+      default:
+        logWarn(`Skipping invalid request from ${spec.code}. Request type ${request.type} must be GET or POST`);
+        requestDone();
+    }
+
+    function formatGetParameters(data) {
+      if (data) {
+        return `?${typeof data === 'object' ? parseQueryStringParameters(data) : data}`;
+      }
+
+      return '';
+    }
+  })
+}, 'processBidderRequests')
+
+export const registerSyncInner = hook('async', function(spec, responses, gdprConsent, uspConsent, gppConsent) {
   const aliasSyncEnabled = config.getConfig('userSync.aliasSyncEnabled');
   if (spec.getUserSyncs && (aliasSyncEnabled || !adapterManager.aliasRegistry[spec.code])) {
     let filterConfig = config.getConfig('userSync.filterSettings');
     let syncs = spec.getUserSyncs({
       iframeEnabled: !!(filterConfig && (filterConfig.iframe || filterConfig.all)),
       pixelEnabled: !!(filterConfig && (filterConfig.image || filterConfig.all)),
-    }, responses, gdprConsent, uspConsent);
+    }, responses, gdprConsent, uspConsent, gppConsent);
     if (syncs) {
       if (!Array.isArray(syncs)) {
         syncs = [syncs];
@@ -365,6 +467,10 @@ export const registerSyncInner = hook('async', function(spec, responses, gdprCon
   }
 }, 'registerSyncs')
 
+export const addComponentAuction = hook('sync', (_bidRequest, fledgeAuctionConfig) => {
+  logInfo(`bidderFactory.addComponentAuction`, fledgeAuctionConfig);
+}, 'addComponentAuction')
+
 export function preloadBidderMappingFile(fn, adUnits) {
   if (!config.getConfig('adpod.brandCategoryExclusion')) {
     return fn.call(this, adUnits);
@@ -438,16 +544,17 @@ export function getIabSubCategory(bidderCode, category) {
 }
 
 // check that the bid has a width and height set
-function validBidSize(adUnitCode, bid, bidRequests) {
+function validBidSize(adUnitCode, bid, {index = auctionManager.index} = {}) {
   if ((bid.width || parseInt(bid.width, 10) === 0) && (bid.height || parseInt(bid.height, 10) === 0)) {
     bid.width = parseInt(bid.width, 10);
     bid.height = parseInt(bid.height, 10);
     return true;
   }
 
-  const adUnit = getBidderRequest(bidRequests, bid.bidderCode, adUnitCode);
+  const bidRequest = index.getBidRequest(bid);
+  const mediaTypes = index.getMediaTypes(bid);
 
-  const sizes = adUnit && adUnit.bids && adUnit.bids[0] && adUnit.bids[0].sizes;
+  const sizes = (bidRequest && bidRequest.sizes) || (mediaTypes && mediaTypes.banner && mediaTypes.banner.sizes);
   const parsedSizes = parseSizesInput(sizes);
 
   // if a banner impression has one valid size, we assign that size to any bid
@@ -463,7 +570,7 @@ function validBidSize(adUnitCode, bid, bidRequests) {
 }
 
 // Validate the arguments sent to us by the adapter. If this returns false, the bid should be totally ignored.
-export function isValid(adUnitCode, bid, bidRequests) {
+export function isValid(adUnitCode, bid, {index = auctionManager.index} = {}) {
   function hasValidKeys() {
     let bidKeys = Object.keys(bid);
     return COMMON_BID_RESPONSE_KEYS.every(key => includes(bidKeys, key) && !includes([undefined, null], bid[key]));
@@ -488,18 +595,22 @@ export function isValid(adUnitCode, bid, bidRequests) {
     return false;
   }
 
-  if (bid.mediaType === 'native' && !nativeBidIsValid(bid, bidRequests)) {
+  if (FEATURES.NATIVE && bid.mediaType === 'native' && !nativeBidIsValid(bid, {index})) {
     logError(errorMessage('Native bid missing some required properties.'));
     return false;
   }
-  if (bid.mediaType === 'video' && !isValidVideoBid(bid, bidRequests)) {
+  if (bid.mediaType === 'video' && !isValidVideoBid(bid, {index})) {
     logError(errorMessage(`Video bid does not have required vastUrl or renderer property`));
     return false;
   }
-  if (bid.mediaType === 'banner' && !validBidSize(adUnitCode, bid, bidRequests)) {
+  if (bid.mediaType === 'banner' && !validBidSize(adUnitCode, bid, {index})) {
     logError(errorMessage(`Banner bids require a width and height`));
     return false;
   }
 
   return true;
 }
+
+function adapterMetrics(bidderRequest) {
+  return useMetrics(bidderRequest.metrics).renameWith(n => [`adapter.client.${n}`, `adapters.client.${bidderRequest.bidderCode}.${n}`])
+}
diff --git a/src/adloader.js b/src/adloader.js
index 1c18ce82b16..01a77971b93 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -1,13 +1,27 @@
-import includes from 'core-js-pure/features/array/includes.js';
-import * as utils from './utils.js';
+import {includes} from './polyfill.js';
+import { logError, logWarn, insertElement, setScriptAttributes } from './utils.js';
 
-const _requestCache = {};
+const _requestCache = new WeakMap();
 // The below list contains modules or vendors whom Prebid allows to load external JS.
 const _approvedLoadExternalJSList = [
+  'debugging',
+  'adloox',
   'criteo',
   'outstream',
   'adagio',
-  'browsi'
+  'spotx',
+  'browsi',
+  'brandmetrics',
+  'justtag',
+  'tncId',
+  'akamaidap',
+  'ftrackId',
+  'inskin',
+  'hadron',
+  'medianet',
+  'improvedigital',
+  'aaxBlockmeter',
+  'confiant'
 ]
 
 /**
@@ -15,57 +29,73 @@ const _approvedLoadExternalJSList = [
  * Each unique URL will be loaded at most 1 time.
  * @param {string} url the url to load
  * @param {string} moduleCode bidderCode or module code of the module requesting this resource
- * @param {function} [callback] callback function to be called after the script is loaded.
+ * @param {function} [callback] callback function to be called after the script is loaded
+ * @param {Document} [doc] the context document, in which the script will be loaded, defaults to loaded document
+ * @param {object} an object of attributes to be added to the script with setAttribute by [key] and [value]; Only the attributes passed in the first request of a url will be added.
  */
-export function loadExternalScript(url, moduleCode, callback) {
+export function loadExternalScript(url, moduleCode, callback, doc, attributes) {
   if (!moduleCode || !url) {
-    utils.logError('cannot load external script without url and moduleCode');
+    logError('cannot load external script without url and moduleCode');
     return;
   }
   if (!includes(_approvedLoadExternalJSList, moduleCode)) {
-    utils.logError(`${moduleCode} not whitelisted for loading external JavaScript`);
+    logError(`${moduleCode} not whitelisted for loading external JavaScript`);
     return;
   }
+  if (!doc) {
+    doc = document; // provide a "valid" key for the WeakMap
+  }
   // only load each asset once
-  if (_requestCache[url]) {
+  const storedCachedObject = getCacheObject(doc, url);
+  if (storedCachedObject) {
     if (callback && typeof callback === 'function') {
-      if (_requestCache[url].loaded) {
+      if (storedCachedObject.loaded) {
         // invokeCallbacks immediately
         callback();
       } else {
         // queue the callback
-        _requestCache[url].callbacks.push(callback);
+        storedCachedObject.callbacks.push(callback);
       }
     }
-    return _requestCache[url].tag;
+    return storedCachedObject.tag;
   }
-  _requestCache[url] = {
+  const cachedDocObj = _requestCache.get(doc) || {};
+  const cacheObject = {
     loaded: false,
     tag: null,
     callbacks: []
   };
+  cachedDocObj[url] = cacheObject;
+  _requestCache.set(doc, cachedDocObj);
+
   if (callback && typeof callback === 'function') {
-    _requestCache[url].callbacks.push(callback);
+    cacheObject.callbacks.push(callback);
   }
 
-  utils.logWarn(`module ${moduleCode} is loading external JavaScript`);
+  logWarn(`module ${moduleCode} is loading external JavaScript`);
   return requestResource(url, function () {
-    _requestCache[url].loaded = true;
+    cacheObject.loaded = true;
     try {
-      for (let i = 0; i < _requestCache[url].callbacks.length; i++) {
-        _requestCache[url].callbacks[i]();
+      for (let i = 0; i < cacheObject.callbacks.length; i++) {
+        cacheObject.callbacks[i]();
       }
     } catch (e) {
-      utils.logError('Error executing callback', 'adloader.js:loadExternalScript', e);
+      logError('Error executing callback', 'adloader.js:loadExternalScript', e);
     }
-  });
+  }, doc, attributes);
 
-  function requestResource(tagSrc, callback) {
-    var jptScript = document.createElement('script');
+  function requestResource(tagSrc, callback, doc, attributes) {
+    if (!doc) {
+      doc = document;
+    }
+    var jptScript = doc.createElement('script');
     jptScript.type = 'text/javascript';
     jptScript.async = true;
 
-    _requestCache[url].tag = jptScript;
+    const cacheObject = getCacheObject(doc, url);
+    if (cacheObject) {
+      cacheObject.tag = jptScript;
+    }
 
     if (jptScript.readyState) {
       jptScript.onreadystatechange = function () {
@@ -82,9 +112,20 @@ export function loadExternalScript(url, moduleCode, callback) {
 
     jptScript.src = tagSrc;
 
+    if (attributes) {
+      setScriptAttributes(jptScript, attributes);
+    }
+
     // add the new script tag to the page
-    utils.insertElement(jptScript);
+    insertElement(jptScript, doc);
 
     return jptScript;
   }
+  function getCacheObject(doc, url) {
+    const cachedDocObj = _requestCache.get(doc);
+    if (cachedDocObj && cachedDocObj[url]) {
+      return cachedDocObj[url];
+    }
+    return null; // return new cache object?
+  }
 };
diff --git a/src/adserver.js b/src/adserver.js
index 61af8862972..db7aaaa1dc8 100644
--- a/src/adserver.js
+++ b/src/adserver.js
@@ -1,55 +1,6 @@
-import { formatQS } from './utils.js';
-import { targeting } from './targeting.js';
+import {hook} from './hook.js';
 
-// Adserver parent class
-const AdServer = function(attr) {
-  this.name = attr.adserver;
-  this.code = attr.code;
-  this.getWinningBidByCode = function() {
-    return targeting.getWinningBids(this.code)[0];
-  };
-};
-
-// DFP ad server
-export function dfpAdserver(options, urlComponents) {
-  var adserver = new AdServer(options);
-  adserver.urlComponents = urlComponents;
-
-  var dfpReqParams = {
-    'env': 'vp',
-    'gdfp_req': '1',
-    'impl': 's',
-    'unviewed_position_start': '1'
-  };
-
-  var dfpParamsWithVariableValue = ['output', 'iu', 'sz', 'url', 'correlator', 'description_url', 'hl'];
-
-  var getCustomParams = function(targeting) {
-    return encodeURIComponent(formatQS(targeting));
-  };
-
-  adserver.appendQueryParams = function() {
-    var bid = adserver.getWinningBidByCode();
-    if (bid) {
-      this.urlComponents.search.description_url = encodeURIComponent(bid.vastUrl);
-      this.urlComponents.search.cust_params = getCustomParams(bid.adserverTargeting);
-      this.urlComponents.search.correlator = Date.now();
-    }
-  };
-
-  adserver.verifyAdserverTag = function() {
-    for (var key in dfpReqParams) {
-      if (!this.urlComponents.search.hasOwnProperty(key) || this.urlComponents.search[key] !== dfpReqParams[key]) {
-        return false;
-      }
-    }
-    for (var i in dfpParamsWithVariableValue) {
-      if (!this.urlComponents.search.hasOwnProperty(dfpParamsWithVariableValue[i])) {
-        return false;
-      }
-    }
-    return true;
-  };
-
-  return adserver;
-};
+/**
+ * return the GAM PPID, if available (eid for the userID configured with `userSync.ppidSource`)
+ */
+export const getPPID = hook('sync', () => undefined);
diff --git a/src/ajax.js b/src/ajax.js
index b1e4cbdbdff..5e926f3210d 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,6 +1,5 @@
 import { config } from './config.js';
-
-var utils = require('./utils.js');
+import { logMessage, logError, parseUrl, buildUrl, _each } from './utils.js';
 
 const XHR_DONE = 4;
 
@@ -25,10 +24,10 @@ export function ajaxBuilder(timeout = 3000, {request, done} = {}) {
 
       let callbacks = typeof callback === 'object' && callback !== null ? callback : {
         success: function() {
-          utils.logMessage('xhr success');
+          logMessage('xhr success');
         },
         error: function(e) {
-          utils.logError('xhr error', null, e);
+          logError('xhr error', null, e);
         }
       };
 
@@ -55,18 +54,18 @@ export function ajaxBuilder(timeout = 3000, {request, done} = {}) {
       // Disabled timeout temporarily to avoid xhr failed requests. https://github.com/prebid/Prebid.js/issues/2648
       if (!config.getConfig('disableAjaxTimeout')) {
         x.ontimeout = function () {
-          utils.logError('  xhr timeout after ', x.timeout, 'ms');
+          logError('  xhr timeout after ', x.timeout, 'ms');
         };
       }
 
       if (method === 'GET' && data) {
-        let urlInfo = utils.parseUrl(url, options);
+        let urlInfo = parseUrl(url, options);
         Object.assign(urlInfo.search, data);
-        url = utils.buildUrl(urlInfo);
+        url = buildUrl(urlInfo);
       }
 
       x.open(method, url, true);
-      // IE needs timoeut to be set after open - see #1410
+      // IE needs timeout to be set after open - see #1410
       // Disabled timeout temporarily to avoid xhr failed requests. https://github.com/prebid/Prebid.js/issues/2648
       if (!config.getConfig('disableAjaxTimeout')) {
         x.timeout = timeout;
@@ -75,7 +74,7 @@ export function ajaxBuilder(timeout = 3000, {request, done} = {}) {
       if (options.withCredentials) {
         x.withCredentials = true;
       }
-      utils._each(options.customHeaders, (value, header) => {
+      _each(options.customHeaders, (value, header) => {
         x.setRequestHeader(header, value);
       });
       if (options.preflight) {
@@ -93,7 +92,8 @@ export function ajaxBuilder(timeout = 3000, {request, done} = {}) {
         x.send();
       }
     } catch (error) {
-      utils.logError('xhr construction', error);
+      logError('xhr construction', error);
+      typeof callback === 'object' && callback !== null && callback.error(error);
     }
   }
 }
diff --git a/src/auction.js b/src/auction.js
index b82b4752479..87397b0dc15 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -57,23 +57,44 @@
  * @property {function(): void} callBids - sends requests to all adapters for bids
  */
 
-import {flatten, timestamp, adUnitsFilter, deepAccess, getBidRequest, getValue, parseUrl} from './utils.js';
-import { getPriceBucketString } from './cpmBucketManager.js';
-import { getNativeTargeting } from './native.js';
-import { getCacheUrl, store } from './videoCache.js';
-import { Renderer } from './Renderer.js';
-import { config } from './config.js';
-import { userSync } from './userSync.js';
-import { hook } from './hook.js';
-import find from 'core-js-pure/features/array/find.js';
-import { OUTSTREAM } from './video.js';
-import { VIDEO } from './mediaTypes.js';
+import {
+  _each,
+  adUnitsFilter,
+  bind,
+  deepAccess,
+  flatten,
+  generateUUID,
+  getValue,
+  isEmpty,
+  isEmptyStr,
+  isFn,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  parseUrl,
+  timestamp
+} from './utils.js';
+import {getPriceBucketString} from './cpmBucketManager.js';
+import {getNativeTargeting, toLegacyResponse} from './native.js';
+import {getCacheUrl, store} from './videoCache.js';
+import {Renderer} from './Renderer.js';
+import {config} from './config.js';
+import {userSync} from './userSync.js';
+import {hook} from './hook.js';
+import {find, includes} from './polyfill.js';
+import {OUTSTREAM} from './video.js';
+import {VIDEO} from './mediaTypes.js';
+import {auctionManager} from './auctionManager.js';
+import {bidderSettings} from './bidderSettings.js';
+import * as events from './events.js';
+import adapterManager from './adapterManager.js';
+import CONSTANTS from './constants.json';
+import {GreedyPromise} from './utils/promise.js';
+import {useMetrics} from './utils/perfMetrics.js';
+import {createBid} from './bidfactory.js';
 
 const { syncUsers } = userSync;
-const utils = require('./utils.js');
-const adapterManager = require('./adapterManager.js').default;
-const events = require('./events.js');
-const CONSTANTS = require('./constants.json');
 
 export const AUCTION_STARTED = 'started';
 export const AUCTION_IN_PROGRESS = 'inProgress';
@@ -89,6 +110,14 @@ const outstandingRequests = {};
 const sourceInfo = {};
 const queuedCalls = [];
 
+/**
+ * Clear global state for tests
+ */
+export function resetAuctionState() {
+  queuedCalls.length = 0;
+  [outstandingRequests, sourceInfo].forEach((ob) => Object.keys(ob).forEach((k) => { delete ob[k] }));
+}
+
 /**
   * Creates new auction instance
   *
@@ -99,28 +128,32 @@ const queuedCalls = [];
   * @param {number} requestConfig.cbTimeout
   * @param {Array.<string>} requestConfig.labels
   * @param {string} requestConfig.auctionId
-  *
+  * @param {{global: {}, bidder: {}}} ortb2Fragments first party data, separated into global
+  *    (from getConfig('ortb2') + requestBids({ortb2})) and bidder (a map from bidderCode to ortb2)
   * @returns {Auction} auction instance
   */
-export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, auctionId}) {
-  let _adUnits = adUnits;
-  let _labels = labels;
-  let _adUnitCodes = adUnitCodes;
+export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, auctionId, ortb2Fragments, metrics}) {
+  metrics = useMetrics(metrics);
+  const _adUnits = adUnits;
+  const _labels = labels;
+  const _adUnitCodes = adUnitCodes;
+  const _auctionId = auctionId || generateUUID();
+  const _timeout = cbTimeout;
+  const _timelyBidders = new Set();
+  let _bidsRejected = [];
+  let _callback = callback;
   let _bidderRequests = [];
   let _bidsReceived = [];
   let _noBids = [];
+  let _winningBids = [];
   let _auctionStart;
   let _auctionEnd;
-  let _auctionId = auctionId || utils.generateUUID();
-  let _auctionStatus;
-  let _callback = callback;
   let _timer;
-  let _timeout = cbTimeout;
-  let _winningBids = [];
-  let _timelyBidders = new Set();
+  let _auctionStatus;
 
   function addBidRequests(bidderRequests) { _bidderRequests = _bidderRequests.concat(bidderRequests); }
   function addBidReceived(bidsReceived) { _bidsReceived = _bidsReceived.concat(bidsReceived); }
+  function addBidRejected(bidsRejected) { _bidsRejected = _bidsRejected.concat(bidsRejected); }
   function addNoBid(noBid) { _noBids = _noBids.concat(noBid); }
 
   function getProperties() {
@@ -135,8 +168,10 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
       bidderRequests: _bidderRequests,
       noBids: _noBids,
       bidsReceived: _bidsReceived,
+      bidsRejected: _bidsRejected,
       winningBids: _winningBids,
-      timeout: _timeout
+      timeout: _timeout,
+      metrics: metrics
     };
   }
 
@@ -156,7 +191,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
     if (_auctionEnd === undefined) {
       let timedOutBidders = [];
       if (timedOut) {
-        utils.logMessage(`Auction ${_auctionId} timedOut`);
+        logMessage(`Auction ${_auctionId} timedOut`);
         timedOutBidders = getTimedOutBids(_bidderRequests, _timelyBidders);
         if (timedOutBidders.length) {
           events.emit(CONSTANTS.EVENTS.BID_TIMEOUT, timedOutBidders);
@@ -165,6 +200,9 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
 
       _auctionStatus = AUCTION_COMPLETED;
       _auctionEnd = Date.now();
+      metrics.checkpoint('auctionEnd');
+      metrics.timeBetween('requestBids', 'auctionEnd', 'requestBids.total');
+      metrics.timeBetween('callBids', 'auctionEnd', 'requestBids.callBids');
 
       events.emit(CONSTANTS.EVENTS.AUCTION_END, getProperties());
       bidsBackCallback(_adUnits, function () {
@@ -172,13 +210,13 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
           if (_callback != null) {
             const adUnitCodes = _adUnitCodes;
             const bids = _bidsReceived
-              .filter(utils.bind.call(adUnitsFilter, this, adUnitCodes))
+              .filter(bind.call(adUnitsFilter, this, adUnitCodes))
               .reduce(groupByPlacement, {});
             _callback.apply($$PREBID_GLOBAL$$, [bids, timedOut, _auctionId]);
             _callback = null;
           }
         } catch (e) {
-          utils.logError('Error executing bidsBackHandler', null, e);
+          logError('Error executing bidsBackHandler', null, e);
         } finally {
           // Calling timed out bidders
           if (timedOutBidders.length) {
@@ -196,8 +234,9 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
   }
 
   function auctionDone() {
+    config.resetBidder();
     // when all bidders have called done callback atleast once it means auction is complete
-    utils.logInfo(`Bids Received for Auction with id: ${_auctionId}`, _bidsReceived);
+    logInfo(`Bids Received for Auction with id: ${_auctionId}`, _bidsReceived);
     _auctionStatus = AUCTION_COMPLETED;
     executeCallback(false, true);
   }
@@ -210,11 +249,14 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
     _auctionStatus = AUCTION_STARTED;
     _auctionStart = Date.now();
 
-    let bidRequests = adapterManager.makeBidRequests(_adUnits, _auctionStart, _auctionId, _timeout, _labels);
-    utils.logInfo(`Bids Requested for Auction with id: ${_auctionId}`, bidRequests);
+    let bidRequests = metrics.measureTime('requestBids.makeRequests',
+      () => adapterManager.makeBidRequests(_adUnits, _auctionStart, _auctionId, _timeout, _labels, ortb2Fragments, metrics));
+    logInfo(`Bids Requested for Auction with id: ${_auctionId}`, bidRequests);
+
+    metrics.checkpoint('callBids')
 
     if (bidRequests.length < 1) {
-      utils.logWarn('No valid bid requests returned for auction');
+      logWarn('No valid bid requests returned for auction');
       auctionDone();
     } else {
       addBidderRequests.call({
@@ -244,12 +286,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
         events.emit(CONSTANTS.EVENTS.AUCTION_INIT, getProperties());
 
         let callbacks = auctionCallbacks(auctionDone, this);
-        adapterManager.callBids(_adUnits, bidRequests, function(...args) {
-          addBidResponse.apply({
-            dispatch: callbacks.addBidResponse,
-            bidderRequest: this
-          }, args)
-        }, callbacks.adapterDone, {
+        adapterManager.callBids(_adUnits, bidRequests, callbacks.addBidResponse, callbacks.adapterDone, {
           request(source, origin) {
             increment(outstandingRequests, origin);
             increment(requests, source);
@@ -272,12 +309,12 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
               }
             }
           }
-        }, _timeout, onTimelyResponse);
+        }, _timeout, onTimelyResponse, ortb2Fragments);
       }
     };
 
     if (!runIfOriginHasCapacity(call)) {
-      utils.logWarn('queueing auction due to limited endpoint capacity');
+      logWarn('queueing auction due to limited endpoint capacity');
       queuedCalls.push(call);
     }
 
@@ -324,21 +361,23 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
 
   function addWinningBid(winningBid) {
     _winningBids = _winningBids.concat(winningBid);
-    adapterManager.callBidWonBidder(winningBid.bidder, winningBid, adUnits);
+    adapterManager.callBidWonBidder(winningBid.adapterCode || winningBid.bidder, winningBid, adUnits);
   }
 
   function setBidTargeting(bid) {
-    adapterManager.callSetTargetingBidder(bid.bidder, bid);
+    adapterManager.callSetTargetingBidder(bid.adapterCode || bid.bidder, bid);
   }
 
   return {
     addBidReceived,
+    addBidRejected,
     addNoBid,
     executeCallback,
     callBids,
     addWinningBid,
     setBidTargeting,
     getWinningBids: () => _winningBids,
+    getAuctionStart: () => _auctionStart,
     getTimeout: () => _timeout,
     getAuctionId: () => _auctionId,
     getAuctionStatus: () => _auctionStatus,
@@ -346,12 +385,21 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
     getAdUnitCodes: () => _adUnitCodes,
     getBidRequests: () => _bidderRequests,
     getBidsReceived: () => _bidsReceived,
-    getNoBids: () => _noBids
-  }
+    getNoBids: () => _noBids,
+    getFPD: () => ortb2Fragments,
+    getMetrics: () => metrics,
+  };
 }
 
-export const addBidResponse = hook('async', function(adUnitCode, bid) {
-  this.dispatch.call(this.bidderRequest, adUnitCode, bid);
+/**
+ * Hook into this to intercept bids before they are added to an auction.
+ *
+ * @param adUnitCode
+ * @param bid
+ * @param {function(String)} reject: a function that, when called, rejects `bid` with the given reason.
+ */
+export const addBidResponse = hook('sync', function(adUnitCode, bid, reject) {
+  this.dispatch.call(null, adUnitCode, bid);
 }, 'addBidResponse');
 
 export const addBidderRequests = hook('sync', function(bidderRequests) {
@@ -364,11 +412,37 @@ export const bidsBackCallback = hook('async', function (adUnits, callback) {
   }
 }, 'bidsBackCallback');
 
-export function auctionCallbacks(auctionDone, auctionInstance) {
+export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionManager.index} = {}) {
   let outstandingBidsAdded = 0;
   let allAdapterCalledDone = false;
   let bidderRequestsDone = new Set();
   let bidResponseMap = {};
+  const ready = {};
+
+  function waitFor(requestId, result) {
+    if (ready[requestId] == null) {
+      ready[requestId] = GreedyPromise.resolve();
+    }
+    ready[requestId] = ready[requestId].then(() => GreedyPromise.resolve(result).catch(() => {}))
+  }
+
+  function guard(bidderRequest, fn) {
+    let timeout = bidderRequest.timeout;
+    if (timeout == null || timeout > auctionInstance.getTimeout()) {
+      timeout = auctionInstance.getTimeout();
+    }
+    const timeRemaining = auctionInstance.getAuctionStart() + timeout - Date.now();
+    const wait = ready[bidderRequest.bidderRequestId];
+    const orphanWait = ready['']; // also wait for "orphan" responses that are not associated with any request
+    if ((wait != null || orphanWait != null) && timeRemaining > 0) {
+      GreedyPromise.race([
+        GreedyPromise.timeout(timeRemaining),
+        GreedyPromise.resolve(orphanWait).then(() => wait)
+      ]).then(fn);
+    } else {
+      fn();
+    }
+  }
 
   function afterBidAdded() {
     outstandingBidsAdded--;
@@ -377,30 +451,71 @@ export function auctionCallbacks(auctionDone, auctionInstance) {
     }
   }
 
-  function addBidResponse(adUnitCode, bid) {
-    let bidderRequest = this;
-
+  function handleBidResponse(adUnitCode, bid, handler) {
     bidResponseMap[bid.requestId] = true;
-
+    addCommonResponseProperties(bid, adUnitCode)
     outstandingBidsAdded++;
-    let auctionId = auctionInstance.getAuctionId();
+    return handler(afterBidAdded);
+  }
 
-    let bidResponse = getPreparedBidForAuction({adUnitCode, bid, bidderRequest, auctionId});
+  function acceptBidResponse(adUnitCode, bid) {
+    handleBidResponse(adUnitCode, bid, (done) => {
+      let bidResponse = getPreparedBidForAuction(bid);
 
-    if (bidResponse.mediaType === 'video') {
-      tryAddVideoBid(auctionInstance, bidResponse, bidderRequest, afterBidAdded);
-    } else {
-      addBidToAuction(auctionInstance, bidResponse);
-      afterBidAdded();
-    }
+      if (bidResponse.mediaType === VIDEO) {
+        tryAddVideoBid(auctionInstance, bidResponse, done);
+      } else {
+        if (FEATURES.NATIVE && bidResponse.native != null && typeof bidResponse.native === 'object') {
+          // NOTE: augment bidResponse.native even if bidResponse.mediaType !== NATIVE; it's possible
+          // to treat banner responses as native
+          addLegacyFieldsIfNeeded(bidResponse);
+        }
+        addBidToAuction(auctionInstance, bidResponse);
+        done();
+      }
+    });
+  }
+
+  function rejectBidResponse(adUnitCode, bid, reason) {
+    return handleBidResponse(adUnitCode, bid, (done) => {
+      // return a "NO_BID" replacement that the caller can decide to continue with
+      // TODO: remove this in v8; see https://github.com/prebid/Prebid.js/issues/8956
+      const noBid = createBid(CONSTANTS.STATUS.NO_BID, bid.getIdentifiers?.());
+      Object.assign(noBid, Object.fromEntries(Object.entries(bid).filter(([k]) => !noBid.hasOwnProperty(k) && ![
+        'ad',
+        'adUrl',
+        'vastXml',
+        'vastUrl',
+        'native',
+      ].includes(k))));
+      noBid.status = CONSTANTS.BID_STATUS.BID_REJECTED;
+      noBid.cpm = 0;
+
+      bid.rejectionReason = reason;
+      logWarn(`Bid from ${bid.bidder || 'unknown bidder'} was rejected: ${reason}`, bid)
+      events.emit(CONSTANTS.EVENTS.BID_REJECTED, bid);
+      auctionInstance.addBidRejected(bid);
+      done();
+
+      return noBid;
+    })
   }
 
   function adapterDone() {
     let bidderRequest = this;
+    let bidderRequests = auctionInstance.getBidRequests();
+    const auctionOptionsConfig = config.getConfig('auctionOptions');
 
     bidderRequestsDone.add(bidderRequest);
-    allAdapterCalledDone = auctionInstance.getBidRequests()
-      .every(bidderRequest => bidderRequestsDone.has(bidderRequest));
+
+    if (auctionOptionsConfig && !isEmpty(auctionOptionsConfig)) {
+      const secondaryBidders = auctionOptionsConfig.secondaryBidders;
+      if (secondaryBidders && !bidderRequests.every(bidder => includes(secondaryBidders, bidder.bidderCode))) {
+        bidderRequests = bidderRequests.filter(request => !includes(secondaryBidders, request.bidderCode));
+      }
+    }
+
+    allAdapterCalledDone = bidderRequests.every(bidderRequest => bidderRequestsDone.has(bidderRequest));
 
     bidderRequest.bids.forEach(bid => {
       if (!bidResponseMap[bid.bidId]) {
@@ -415,8 +530,27 @@ export function auctionCallbacks(auctionDone, auctionInstance) {
   }
 
   return {
-    addBidResponse,
-    adapterDone
+    addBidResponse: (function () {
+      function addBid(adUnitCode, bid) {
+        const bidderRequest = index.getBidderRequest(bid);
+        waitFor((bidderRequest && bidderRequest.bidderRequestId) || '', addBidResponse.call({
+          dispatch: acceptBidResponse,
+        }, adUnitCode, bid, (() => {
+          let rejection;
+          return (reason) => {
+            if (rejection == null) {
+              rejection = rejectBidResponse(adUnitCode, bid, reason);
+            }
+            return rejection;
+          }
+        })()));
+      }
+      addBid.reject = rejectBidResponse;
+      return addBid;
+    })(),
+    adapterDone: function () {
+      guard(this, adapterDone.bind(this))
+    }
   }
 }
 
@@ -428,10 +562,9 @@ export function doCallbacksIfTimedout(auctionInstance, bidResponse) {
 
 // Add a bid to the auction.
 export function addBidToAuction(auctionInstance, bidResponse) {
-  let bidderRequests = auctionInstance.getBidRequests();
-  let bidderRequest = find(bidderRequests, bidderRequest => bidderRequest.bidderCode === bidResponse.bidderCode);
-  setupBidTargeting(bidResponse, bidderRequest);
+  setupBidTargeting(bidResponse);
 
+  useMetrics(bidResponse.metrics).timeSince('addBidResponse', 'addBidResponse.total');
   events.emit(CONSTANTS.EVENTS.BID_RESPONSE, bidResponse);
   auctionInstance.addBidReceived(bidResponse);
 
@@ -439,20 +572,23 @@ export function addBidToAuction(auctionInstance, bidResponse) {
 }
 
 // Video bids may fail if the cache is down, or there's trouble on the network.
-function tryAddVideoBid(auctionInstance, bidResponse, bidRequests, afterBidAdded) {
+function tryAddVideoBid(auctionInstance, bidResponse, afterBidAdded, {index = auctionManager.index} = {}) {
   let addBid = true;
 
-  const bidderRequest = getBidRequest(bidResponse.requestId, [bidRequests]);
-  const videoMediaType =
-  bidderRequest && deepAccess(bidderRequest, 'mediaTypes.video');
+  const videoMediaType = deepAccess(
+    index.getMediaTypes({
+      requestId: bidResponse.originalRequestId || bidResponse.requestId,
+      transactionId: bidResponse.transactionId
+    }), 'video');
   const context = videoMediaType && deepAccess(videoMediaType, 'context');
+  const useCacheKey = videoMediaType && deepAccess(videoMediaType, 'useCacheKey');
 
-  if (config.getConfig('cache.url') && context !== OUTSTREAM) {
-    if (!bidResponse.videoCacheKey) {
+  if (config.getConfig('cache.url') && (useCacheKey || context !== OUTSTREAM)) {
+    if (!bidResponse.videoCacheKey || config.getConfig('cache.ignoreBidderCacheKey')) {
       addBid = false;
-      callPrebidCache(auctionInstance, bidResponse, afterBidAdded, bidderRequest);
+      callPrebidCache(auctionInstance, bidResponse, afterBidAdded, videoMediaType);
     } else if (!bidResponse.vastUrl) {
-      utils.logError('videoCacheKey specified but not required vastUrl for video bid');
+      logError('videoCacheKey specified but not required vastUrl for video bid');
       addBid = false;
     }
   }
@@ -462,83 +598,165 @@ function tryAddVideoBid(auctionInstance, bidResponse, bidRequests, afterBidAdded
   }
 }
 
-export const callPrebidCache = hook('async', function(auctionInstance, bidResponse, afterBidAdded, bidderRequest) {
-  store([bidResponse], function (error, cacheIds) {
-    if (error) {
-      utils.logWarn(`Failed to save to the video cache: ${error}. Video bid must be discarded.`);
+// Native bid response might be in ortb2 format - adds legacy field for backward compatibility
+const addLegacyFieldsIfNeeded = (bidResponse) => {
+  const nativeOrtbRequest = auctionManager.index.getAdUnit(bidResponse)?.nativeOrtbRequest;
+  const nativeOrtbResponse = bidResponse.native?.ortb
 
-      doCallbacksIfTimedout(auctionInstance, bidResponse);
-    } else {
-      if (cacheIds[0].uuid === '') {
-        utils.logWarn(`Supplied video cache key was already in use by Prebid Cache; caching attempt was rejected. Video bid must be discarded.`);
+  if (nativeOrtbRequest && nativeOrtbResponse) {
+    const legacyResponse = toLegacyResponse(nativeOrtbResponse, nativeOrtbRequest);
+    Object.assign(bidResponse.native, legacyResponse);
+  }
+}
+
+const storeInCache = (batch) => {
+  store(batch.map(entry => entry.bidResponse), function (error, cacheIds) {
+    cacheIds.forEach((cacheId, i) => {
+      const { auctionInstance, bidResponse, afterBidAdded } = batch[i];
+      if (error) {
+        logWarn(`Failed to save to the video cache: ${error}. Video bid must be discarded.`);
 
         doCallbacksIfTimedout(auctionInstance, bidResponse);
       } else {
-        bidResponse.videoCacheKey = cacheIds[0].uuid;
+        if (cacheId.uuid === '') {
+          logWarn(`Supplied video cache key was already in use by Prebid Cache; caching attempt was rejected. Video bid must be discarded.`);
+
+          doCallbacksIfTimedout(auctionInstance, bidResponse);
+        } else {
+          bidResponse.videoCacheKey = cacheId.uuid;
 
-        if (!bidResponse.vastUrl) {
-          bidResponse.vastUrl = getCacheUrl(bidResponse.videoCacheKey);
+          if (!bidResponse.vastUrl) {
+            bidResponse.vastUrl = getCacheUrl(bidResponse.videoCacheKey);
+          }
+          addBidToAuction(auctionInstance, bidResponse);
+          afterBidAdded();
         }
-        addBidToAuction(auctionInstance, bidResponse);
-        afterBidAdded();
       }
+    });
+  });
+};
+
+let batchSize, batchTimeout;
+config.getConfig('cache', (cacheConfig) => {
+  batchSize = typeof cacheConfig.cache.batchSize === 'number' && cacheConfig.cache.batchSize > 0
+    ? cacheConfig.cache.batchSize
+    : 1;
+  batchTimeout = typeof cacheConfig.cache.batchTimeout === 'number' && cacheConfig.cache.batchTimeout > 0
+    ? cacheConfig.cache.batchTimeout
+    : 0;
+});
+
+export const batchingCache = (timeout = setTimeout, cache = storeInCache) => {
+  let batches = [[]];
+  let debouncing = false;
+  const noTimeout = cb => cb();
+
+  return function(auctionInstance, bidResponse, afterBidAdded) {
+    const batchFunc = batchTimeout > 0 ? timeout : noTimeout;
+    if (batches[batches.length - 1].length >= batchSize) {
+      batches.push([]);
     }
-  }, bidderRequest);
+
+    batches[batches.length - 1].push({auctionInstance, bidResponse, afterBidAdded});
+
+    if (!debouncing) {
+      debouncing = true;
+      batchFunc(() => {
+        batches.forEach(cache);
+        batches = [[]];
+        debouncing = false;
+      }, batchTimeout);
+    }
+  }
+};
+
+const batchAndStore = batchingCache();
+
+export const callPrebidCache = hook('async', function(auctionInstance, bidResponse, afterBidAdded, videoMediaType) {
+  batchAndStore(auctionInstance, bidResponse, afterBidAdded);
 }, 'callPrebidCache');
 
-// Postprocess the bids so that all the universal properties exist, no matter which bidder they came from.
-// This should be called before addBidToAuction().
-function getPreparedBidForAuction({adUnitCode, bid, bidderRequest, auctionId}) {
-  const start = bidderRequest.start;
-
-  let bidObject = Object.assign({}, bid, {
-    auctionId,
-    responseTimestamp: timestamp(),
-    requestTimestamp: start,
-    cpm: parseFloat(bid.cpm) || 0,
-    bidder: bid.bidderCode,
+/**
+ * Augment `bidResponse` with properties that are common across all bids - including rejected bids.
+ *
+ */
+function addCommonResponseProperties(bidResponse, adUnitCode, {index = auctionManager.index} = {}) {
+  const bidderRequest = index.getBidderRequest(bidResponse);
+  const adUnit = index.getAdUnit(bidResponse);
+  const start = (bidderRequest && bidderRequest.start) || bidResponse.requestTimestamp;
+
+  Object.assign(bidResponse, {
+    responseTimestamp: bidResponse.responseTimestamp || timestamp(),
+    requestTimestamp: bidResponse.requestTimestamp || start,
+    cpm: parseFloat(bidResponse.cpm) || 0,
+    bidder: bidResponse.bidder || bidResponse.bidderCode,
     adUnitCode
   });
 
-  bidObject.timeToRespond = bidObject.responseTimestamp - bidObject.requestTimestamp;
+  if (adUnit?.ttlBuffer != null) {
+    bidResponse.ttlBuffer = adUnit.ttlBuffer;
+  }
+
+  bidResponse.timeToRespond = bidResponse.responseTimestamp - bidResponse.requestTimestamp;
+}
 
+/**
+ * Add additional bid response properties that are universal for all _accepted_ bids.
+ */
+function getPreparedBidForAuction(bid, {index = auctionManager.index} = {}) {
   // Let listeners know that now is the time to adjust the bid, if they want to.
   //
   // CAREFUL: Publishers rely on certain bid properties to be available (like cpm),
   // but others to not be set yet (like priceStrings). See #1372 and #1389.
-  events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, bidObject);
+  events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, bid);
 
   // a publisher-defined renderer can be used to render bids
-  const bidReq = bidderRequest.bids && find(bidderRequest.bids, bid => bid.adUnitCode == adUnitCode);
-  const adUnitRenderer = bidReq && bidReq.renderer;
+  const bidRenderer = index.getBidRequest(bid)?.renderer || index.getAdUnit(bid).renderer;
+
+  // a publisher can also define a renderer for a mediaType
+  const bidObjectMediaType = bid.mediaType;
+  const mediaTypes = index.getMediaTypes(bid);
+  const bidMediaType = mediaTypes && mediaTypes[bidObjectMediaType];
 
-  if (adUnitRenderer && adUnitRenderer.url) {
-    bidObject.renderer = Renderer.install({ url: adUnitRenderer.url });
-    bidObject.renderer.setRender(adUnitRenderer.render);
+  var mediaTypeRenderer = bidMediaType && bidMediaType.renderer;
+
+  var renderer = null;
+
+  // the renderer for the mediaType takes precendence
+  if (mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render && !(mediaTypeRenderer.backupOnly === true && bid.renderer)) {
+    renderer = mediaTypeRenderer;
+  } else if (bidRenderer && bidRenderer.url && bidRenderer.render && !(bidRenderer.backupOnly === true && bid.renderer)) {
+    renderer = bidRenderer;
+  }
+
+  if (renderer) {
+    // be aware, an adapter could already have installed the bidder, in which case this overwrite's the existing adapter
+    bid.renderer = Renderer.install({ url: renderer.url, config: renderer.options });// rename options to config, to make it consistent?
+    bid.renderer.setRender(renderer.render);
   }
 
   // Use the config value 'mediaTypeGranularity' if it has been defined for mediaType, else use 'customPriceBucket'
-  const mediaTypeGranularity = getMediaTypeGranularity(bid.mediaType, bidReq, config.getConfig('mediaTypePriceGranularity'));
+  const mediaTypeGranularity = getMediaTypeGranularity(bid.mediaType, mediaTypes, config.getConfig('mediaTypePriceGranularity'));
   const priceStringsObj = getPriceBucketString(
-    bidObject.cpm,
+    bid.cpm,
     (typeof mediaTypeGranularity === 'object') ? mediaTypeGranularity : config.getConfig('customPriceBucket'),
     config.getConfig('currency.granularityMultiplier')
   );
-  bidObject.pbLg = priceStringsObj.low;
-  bidObject.pbMg = priceStringsObj.med;
-  bidObject.pbHg = priceStringsObj.high;
-  bidObject.pbAg = priceStringsObj.auto;
-  bidObject.pbDg = priceStringsObj.dense;
-  bidObject.pbCg = priceStringsObj.custom;
-
-  return bidObject;
+  bid.pbLg = priceStringsObj.low;
+  bid.pbMg = priceStringsObj.med;
+  bid.pbHg = priceStringsObj.high;
+  bid.pbAg = priceStringsObj.auto;
+  bid.pbDg = priceStringsObj.dense;
+  bid.pbCg = priceStringsObj.custom;
+
+  return bid;
 }
 
-function setupBidTargeting(bidObject, bidderRequest) {
+function setupBidTargeting(bidObject) {
   let keyValues;
-  if (bidObject.bidderCode && (bidObject.cpm > 0 || bidObject.dealId)) {
-    let bidReq = find(bidderRequest.bids, bid => bid.adUnitCode === bidObject.adUnitCode);
-    keyValues = getKeyValueTargetingPairs(bidObject.bidderCode, bidObject, bidReq);
+  const cpmCheck = (bidderSettings.get(bidObject.bidderCode, 'allowZeroCpmBids') === true) ? bidObject.cpm >= 0 : bidObject.cpm > 0;
+  if (bidObject.bidderCode && (cpmCheck || bidObject.dealId)) {
+    keyValues = getKeyValueTargetingPairs(bidObject.bidderCode, bidObject);
   }
 
   // use any targeting provided as defaults, otherwise just set from getKeyValueTargetingPairs
@@ -547,14 +765,14 @@ function setupBidTargeting(bidObject, bidderRequest) {
 
 /**
  * @param {MediaType} mediaType
- * @param {Bid} [bidReq]
+ * @param mediaTypes media types map from adUnit
  * @param {MediaTypePriceGranularity} [mediaTypePriceGranularity]
  * @returns {(Object|string|undefined)}
  */
-export function getMediaTypeGranularity(mediaType, bidReq, mediaTypePriceGranularity) {
+export function getMediaTypeGranularity(mediaType, mediaTypes, mediaTypePriceGranularity) {
   if (mediaType && mediaTypePriceGranularity) {
     if (mediaType === VIDEO) {
-      const context = deepAccess(bidReq, `mediaTypes.${VIDEO}.context`, 'instream');
+      const context = deepAccess(mediaTypes, `${VIDEO}.context`, 'instream');
       if (mediaTypePriceGranularity[`${VIDEO}-${context}`]) {
         return mediaTypePriceGranularity[`${VIDEO}-${context}`];
       }
@@ -565,14 +783,14 @@ export function getMediaTypeGranularity(mediaType, bidReq, mediaTypePriceGranula
 
 /**
  * This function returns the price granularity defined. It can be either publisher defined or default value
- * @param {string} mediaType
- * @param {BidRequest} bidReq
+ * @param bid bid response object
+ * @param index
  * @returns {string} granularity
  */
-export const getPriceGranularity = (mediaType, bidReq) => {
+export const getPriceGranularity = (bid, {index = auctionManager.index} = {}) => {
   // Use the config value 'mediaTypeGranularity' if it has been set for mediaType, else use 'priceGranularity'
-  const mediaTypeGranularity = getMediaTypeGranularity(mediaType, bidReq, config.getConfig('mediaTypePriceGranularity'));
-  const granularity = (typeof mediaType === 'string' && mediaTypeGranularity) ? ((typeof mediaTypeGranularity === 'string') ? mediaTypeGranularity : 'custom') : config.getConfig('priceGranularity');
+  const mediaTypeGranularity = getMediaTypeGranularity(bid.mediaType, index.getMediaTypes(bid), config.getConfig('mediaTypePriceGranularity'));
+  const granularity = (typeof bid.mediaType === 'string' && mediaTypeGranularity) ? ((typeof mediaTypeGranularity === 'string') ? mediaTypeGranularity : 'custom') : config.getConfig('priceGranularity');
   return granularity;
 }
 
@@ -583,63 +801,88 @@ export const getPriceGranularity = (mediaType, bidReq) => {
  */
 export const getPriceByGranularity = (granularity) => {
   return (bid) => {
-    if (granularity === CONSTANTS.GRANULARITY_OPTIONS.AUTO) {
+    const bidGranularity = granularity || getPriceGranularity(bid);
+    if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.AUTO) {
       return bid.pbAg;
-    } else if (granularity === CONSTANTS.GRANULARITY_OPTIONS.DENSE) {
+    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.DENSE) {
       return bid.pbDg;
-    } else if (granularity === CONSTANTS.GRANULARITY_OPTIONS.LOW) {
+    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.LOW) {
       return bid.pbLg;
-    } else if (granularity === CONSTANTS.GRANULARITY_OPTIONS.MEDIUM) {
+    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.MEDIUM) {
       return bid.pbMg;
-    } else if (granularity === CONSTANTS.GRANULARITY_OPTIONS.HIGH) {
+    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.HIGH) {
       return bid.pbHg;
-    } else if (granularity === CONSTANTS.GRANULARITY_OPTIONS.CUSTOM) {
+    } else if (bidGranularity === CONSTANTS.GRANULARITY_OPTIONS.CUSTOM) {
       return bid.pbCg;
     }
   }
 }
 
+/**
+ * This function returns a function to get first advertiser domain from bid response meta
+ * @returns {function}
+ */
+export const getAdvertiserDomain = () => {
+  return (bid) => {
+    return (bid.meta && bid.meta.advertiserDomains && bid.meta.advertiserDomains.length > 0) ? bid.meta.advertiserDomains[0] : '';
+  }
+}
+
+/**
+ * This function returns a function to get the primary category id from bid response meta
+ * @returns {function}
+ */
+export const getPrimaryCatId = () => {
+  return (bid) => {
+    return (bid.meta && bid.meta.primaryCatId) ? bid.meta.primaryCatId : '';
+  }
+}
+
+// factory for key value objs
+function createKeyVal(key, value) {
+  return {
+    key,
+    val: (typeof value === 'function')
+      ? function (bidResponse, bidReq) {
+        return value(bidResponse, bidReq);
+      }
+      : function (bidResponse) {
+        return getValue(bidResponse, value);
+      }
+  };
+}
+
+function defaultAdserverTargeting() {
+  const TARGETING_KEYS = CONSTANTS.TARGETING_KEYS;
+  return [
+    createKeyVal(TARGETING_KEYS.BIDDER, 'bidderCode'),
+    createKeyVal(TARGETING_KEYS.AD_ID, 'adId'),
+    createKeyVal(TARGETING_KEYS.PRICE_BUCKET, getPriceByGranularity()),
+    createKeyVal(TARGETING_KEYS.SIZE, 'size'),
+    createKeyVal(TARGETING_KEYS.DEAL, 'dealId'),
+    createKeyVal(TARGETING_KEYS.SOURCE, 'source'),
+    createKeyVal(TARGETING_KEYS.FORMAT, 'mediaType'),
+    createKeyVal(TARGETING_KEYS.ADOMAIN, getAdvertiserDomain()),
+    createKeyVal(TARGETING_KEYS.ACAT, getPrimaryCatId()),
+  ]
+}
+
 /**
  * @param {string} mediaType
  * @param {string} bidderCode
  * @param {BidRequest} bidReq
  * @returns {*}
  */
-export function getStandardBidderSettings(mediaType, bidderCode, bidReq) {
-  // factory for key value objs
-  function createKeyVal(key, value) {
-    return {
-      key,
-      val: (typeof value === 'function')
-        ? function (bidResponse) {
-          return value(bidResponse);
-        }
-        : function (bidResponse) {
-          return getValue(bidResponse, value);
-        }
-    };
-  }
+export function getStandardBidderSettings(mediaType, bidderCode) {
   const TARGETING_KEYS = CONSTANTS.TARGETING_KEYS;
-  const granularity = getPriceGranularity(mediaType, bidReq);
-
-  let bidderSettings = $$PREBID_GLOBAL$$.bidderSettings;
-  if (!bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD]) {
-    bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD] = {};
-  }
-  if (!bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) {
-    bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = [
-      createKeyVal(TARGETING_KEYS.BIDDER, 'bidderCode'),
-      createKeyVal(TARGETING_KEYS.AD_ID, 'adId'),
-      createKeyVal(TARGETING_KEYS.PRICE_BUCKET, getPriceByGranularity(granularity)),
-      createKeyVal(TARGETING_KEYS.SIZE, 'size'),
-      createKeyVal(TARGETING_KEYS.DEAL, 'dealId'),
-      createKeyVal(TARGETING_KEYS.SOURCE, 'source'),
-      createKeyVal(TARGETING_KEYS.FORMAT, 'mediaType'),
-    ]
+  const standardSettings = Object.assign({}, bidderSettings.settingsFor(null));
+  if (!standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) {
+    standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = defaultAdserverTargeting();
   }
 
   if (mediaType === 'video') {
-    const adserverTargeting = bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING];
+    const adserverTargeting = standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING].slice();
+    standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = adserverTargeting;
 
     // Adding hb_uuid + hb_cache_id
     [TARGETING_KEYS.UUID, TARGETING_KEYS.CACHE_ID].forEach(targetingKeyVal => {
@@ -649,66 +892,63 @@ export function getStandardBidderSettings(mediaType, bidderCode, bidReq) {
     });
 
     // Adding hb_cache_host
-    if (config.getConfig('cache.url') && (!bidderCode || utils.deepAccess(bidderSettings, `${bidderCode}.sendStandardTargeting`) !== false)) {
+    if (config.getConfig('cache.url') && (!bidderCode || bidderSettings.get(bidderCode, 'sendStandardTargeting') !== false)) {
       const urlInfo = parseUrl(config.getConfig('cache.url'));
 
       if (typeof find(adserverTargeting, targetingKeyVal => targetingKeyVal.key === TARGETING_KEYS.CACHE_HOST) === 'undefined') {
         adserverTargeting.push(createKeyVal(TARGETING_KEYS.CACHE_HOST, function(bidResponse) {
-          return utils.deepAccess(bidResponse, `adserverTargeting.${TARGETING_KEYS.CACHE_HOST}`)
+          return deepAccess(bidResponse, `adserverTargeting.${TARGETING_KEYS.CACHE_HOST}`)
             ? bidResponse.adserverTargeting[TARGETING_KEYS.CACHE_HOST] : urlInfo.hostname;
         }));
       }
     }
   }
-  return bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD];
+  return standardSettings;
 }
 
-export function getKeyValueTargetingPairs(bidderCode, custBidObj, bidReq) {
+export function getKeyValueTargetingPairs(bidderCode, custBidObj, {index = auctionManager.index} = {}) {
   if (!custBidObj) {
     return {};
   }
-
+  const bidRequest = index.getBidRequest(custBidObj);
   var keyValues = {};
-  var bidderSettings = $$PREBID_GLOBAL$$.bidderSettings;
 
   // 1) set the keys from "standard" setting or from prebid defaults
-  if (bidderSettings) {
-    // initialize default if not set
-    const standardSettings = getStandardBidderSettings(custBidObj.mediaType, bidderCode, bidReq);
-    setKeys(keyValues, standardSettings, custBidObj);
-
-    // 2) set keys from specific bidder setting override if they exist
-    if (bidderCode && bidderSettings[bidderCode] && bidderSettings[bidderCode][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) {
-      setKeys(keyValues, bidderSettings[bidderCode], custBidObj);
-      custBidObj.sendStandardTargeting = bidderSettings[bidderCode].sendStandardTargeting;
-    }
+  // initialize default if not set
+  const standardSettings = getStandardBidderSettings(custBidObj.mediaType, bidderCode);
+  setKeys(keyValues, standardSettings, custBidObj, bidRequest);
+
+  // 2) set keys from specific bidder setting override if they exist
+  if (bidderCode && bidderSettings.getOwn(bidderCode, CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING)) {
+    setKeys(keyValues, bidderSettings.ownSettingsFor(bidderCode), custBidObj, bidRequest);
+    custBidObj.sendStandardTargeting = bidderSettings.get(bidderCode, 'sendStandardTargeting');
   }
 
   // set native key value targeting
-  if (custBidObj['native']) {
-    keyValues = Object.assign({}, keyValues, getNativeTargeting(custBidObj, bidReq));
+  if (FEATURES.NATIVE && custBidObj['native']) {
+    keyValues = Object.assign({}, keyValues, getNativeTargeting(custBidObj));
   }
 
   return keyValues;
 }
 
-function setKeys(keyValues, bidderSettings, custBidObj) {
+function setKeys(keyValues, bidderSettings, custBidObj, bidReq) {
   var targeting = bidderSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING];
   custBidObj.size = custBidObj.getSize();
 
-  utils._each(targeting, function (kvPair) {
+  _each(targeting, function (kvPair) {
     var key = kvPair.key;
     var value = kvPair.val;
 
     if (keyValues[key]) {
-      utils.logWarn('The key: ' + key + ' is getting ovewritten');
+      logWarn('The key: ' + key + ' is being overwritten');
     }
 
-    if (utils.isFn(value)) {
+    if (isFn(value)) {
       try {
-        value = value(custBidObj);
+        value = value(custBidObj, bidReq);
       } catch (e) {
-        utils.logError('bidmanager', 'ERROR', e);
+        logError('bidmanager', 'ERROR', e);
       }
     }
 
@@ -716,12 +956,12 @@ function setKeys(keyValues, bidderSettings, custBidObj) {
       ((typeof bidderSettings.suppressEmptyKeys !== 'undefined' && bidderSettings.suppressEmptyKeys === true) ||
       key === CONSTANTS.TARGETING_KEYS.DEAL) && // hb_deal is suppressed automatically if not set
       (
-        utils.isEmptyStr(value) ||
+        isEmptyStr(value) ||
         value === null ||
         value === undefined
       )
     ) {
-      utils.logInfo("suppressing empty key '" + key + "' from adserver targeting");
+      logInfo("suppressing empty key '" + key + "' from adserver targeting");
     } else {
       keyValues[key] = value;
     }
@@ -733,19 +973,13 @@ function setKeys(keyValues, bidderSettings, custBidObj) {
 export function adjustBids(bid) {
   let code = bid.bidderCode;
   let bidPriceAdjusted = bid.cpm;
-  let bidCpmAdjustment;
-  if ($$PREBID_GLOBAL$$.bidderSettings) {
-    if (code && $$PREBID_GLOBAL$$.bidderSettings[code] && typeof $$PREBID_GLOBAL$$.bidderSettings[code].bidCpmAdjustment === 'function') {
-      bidCpmAdjustment = $$PREBID_GLOBAL$$.bidderSettings[code].bidCpmAdjustment;
-    } else if ($$PREBID_GLOBAL$$.bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD] && typeof $$PREBID_GLOBAL$$.bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD].bidCpmAdjustment === 'function') {
-      bidCpmAdjustment = $$PREBID_GLOBAL$$.bidderSettings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD].bidCpmAdjustment;
-    }
-    if (bidCpmAdjustment) {
-      try {
-        bidPriceAdjusted = bidCpmAdjustment(bid.cpm, Object.assign({}, bid));
-      } catch (e) {
-        utils.logError('Error during bid adjustment', 'bidmanager.js', e);
-      }
+  const bidCpmAdjustment = bidderSettings.get(code || null, 'bidCpmAdjustment');
+
+  if (bidCpmAdjustment && typeof bidCpmAdjustment === 'function') {
+    try {
+      bidPriceAdjusted = bidCpmAdjustment(bid.cpm, Object.assign({}, bid));
+    } catch (e) {
+      logError('Error during bid adjustment', 'bidmanager.js', e);
     }
   }
 
@@ -782,13 +1016,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/src/auctionIndex.js b/src/auctionIndex.js
new file mode 100644
index 00000000000..bdd2b42f9c6
--- /dev/null
+++ b/src/auctionIndex.js
@@ -0,0 +1,85 @@
+/**
+ * Retrieves request-related bid data.
+ * All methods are designed to work with Bid (response) objects returned by bid adapters.
+ */
+export function AuctionIndex(getAuctions) {
+  Object.assign(this, {
+    /**
+     * @param auctionId
+     * @returns {*} Auction instance for `auctionId`
+     */
+    getAuction({auctionId}) {
+      if (auctionId != null) {
+        return getAuctions()
+          .find(auction => auction.getAuctionId() === auctionId);
+      }
+    },
+    /**
+     * NOTE: you should prefer {@link #getMediaTypes} for looking up bid media types.
+     * @param transactionId
+     * @returns adUnit object for `transactionId`
+     */
+    getAdUnit({transactionId}) {
+      if (transactionId != null) {
+        return getAuctions()
+          .flatMap(a => a.getAdUnits())
+          .find(au => au.transactionId === transactionId);
+      }
+    },
+    /**
+     * @param transactionId
+     * @param requestId?
+     * @returns {*} mediaTypes object from bidRequest (through requestId) falling back to the adUnit (through transactionId).
+     *
+     * The bidRequest is given precedence because its mediaTypes can differ from the adUnit's (if bidder-specific labels are in use).
+     * Bids that have no associated request do not have labels either, and use the adUnit's mediaTypes.
+     */
+    getMediaTypes({transactionId, requestId}) {
+      if (requestId != null) {
+        const req = this.getBidRequest({requestId});
+        if (req != null && (transactionId == null || req.transactionId === transactionId)) {
+          return req.mediaTypes;
+        }
+      } else if (transactionId != null) {
+        const au = this.getAdUnit({transactionId});
+        if (au != null) {
+          return au.mediaTypes;
+        }
+      }
+    },
+    /**
+     * @param requestId?
+     * @param bidderRequestId?
+     * @returns {*} bidderRequest that matches both requestId and bidderRequestId (if either or both are provided).
+     *
+     * NOTE: Bid responses are not guaranteed to have a corresponding request.
+     */
+    getBidderRequest({requestId, bidderRequestId}) {
+      if (requestId != null || bidderRequestId != null) {
+        let bers = getAuctions().flatMap(a => a.getBidRequests());
+        if (bidderRequestId != null) {
+          bers = bers.filter(ber => ber.bidderRequestId === bidderRequestId);
+        }
+        if (requestId == null) {
+          return bers[0];
+        } else {
+          return bers.find(ber => ber.bids && ber.bids.find(br => br.bidId === requestId) != null)
+        }
+      }
+    },
+    /**
+     * @param requestId
+     * @returns {*} bidRequest object for requestId
+     *
+     * NOTE: Bid responses are not guaranteed to have a corresponding request.
+     */
+    getBidRequest({requestId}) {
+      if (requestId != null) {
+        return getAuctions()
+          .flatMap(a => a.getBidRequests())
+          .flatMap(ber => ber.bids)
+          .find(br => br && br.bidId === requestId);
+      }
+    }
+  });
+}
diff --git a/src/auctionManager.js b/src/auctionManager.js
index 3d4bd0afe99..90d5fb543e2 100644
--- a/src/auctionManager.js
+++ b/src/auctionManager.js
@@ -9,18 +9,22 @@
  *
  * @property {function(): Array} getBidsRequested - returns consolidated bid requests
  * @property {function(): Array} getBidsReceived - returns consolidated bid received
+ * @property {function(): Array} getAllBidsForAdUnitCode - returns consolidated bid received for a given adUnit
  * @property {function(): Array} getAdUnits - returns consolidated adUnits
  * @property {function(): Array} getAdUnitCodes - returns consolidated adUnitCodes
  * @property {function(): Object} createAuction - creates auction instance and stores it for future reference
  * @property {function(): Object} findBidByAdId - find bid received by adId. This function will be called by $$PREBID_GLOBAL$$.renderAd
  * @property {function(): Object} getStandardBidderAdServerTargeting - returns standard bidder targeting for all the adapters. Refer http://prebid.org/dev-docs/publisher-api-reference.html#module_pbjs.bidderSettings for more details
+ * @property {function(Object): void} addWinningBid - add a winning bid to an auction based on auctionId
+ * @property {function(): void} clearAllAuctions - clear all auctions for testing
  */
 
 import { uniques, flatten, logWarn } from './utils.js';
 import { newAuction, getStandardBidderSettings, AUCTION_COMPLETED } from './auction.js';
-import find from 'core-js-pure/features/array/find.js';
-
-const CONSTANTS = require('./constants.json');
+import {find} from './polyfill.js';
+import {AuctionIndex} from './auctionIndex.js';
+import CONSTANTS from './constants.json';
+import {useMetrics} from './utils/perfMetrics.js';
 
 /**
  * Creates new instance of auctionManager. There will only be one instance of auctionManager but
@@ -33,6 +37,10 @@ export function newAuctionManager() {
   const auctionManager = {};
 
   auctionManager.addWinningBid = function(bid) {
+    const metrics = useMetrics(bid.metrics);
+    metrics.checkpoint('bidWon');
+    metrics.timeBetween('auctionEnd', 'bidWon', 'render.pending');
+    metrics.timeBetween('requestBids', 'bidWon', 'render.e2e');
     const auction = find(_auctions, auction => auction.getAuctionId() === bid.auctionId);
     if (auction) {
       bid.status = CONSTANTS.BID_STATUS.RENDERED;
@@ -66,6 +74,13 @@ export function newAuctionManager() {
       .filter(bid => bid);
   };
 
+  auctionManager.getAllBidsForAdUnitCode = function(adUnitCode) {
+    return _auctions.map((auction) => {
+      return auction.getBidsReceived();
+    }).reduce(flatten, [])
+      .filter(bid => bid && bid.adUnitCode === adUnitCode)
+  };
+
   auctionManager.getAdUnits = function() {
     return _auctions.map(auction => auction.getAdUnits())
       .reduce(flatten, []);
@@ -77,8 +92,8 @@ export function newAuctionManager() {
       .filter(uniques);
   };
 
-  auctionManager.createAuction = function({ adUnits, adUnitCodes, callback, cbTimeout, labels, auctionId }) {
-    const auction = newAuction({ adUnits, adUnitCodes, callback, cbTimeout, labels, auctionId });
+  auctionManager.createAuction = function(opts) {
+    const auction = newAuction(opts);
     _addAuction(auction);
     return auction;
   };
@@ -105,10 +120,16 @@ export function newAuctionManager() {
     return _auctions.length && _auctions[_auctions.length - 1].getAuctionId()
   };
 
+  auctionManager.clearAllAuctions = function() {
+    _auctions.length = 0;
+  }
+
   function _addAuction(auction) {
     _auctions.push(auction);
   }
 
+  auctionManager.index = new AuctionIndex(() => _auctions);
+
   return auctionManager;
 }
 
diff --git a/src/bidderSettings.js b/src/bidderSettings.js
new file mode 100644
index 00000000000..b39bf480511
--- /dev/null
+++ b/src/bidderSettings.js
@@ -0,0 +1,68 @@
+import {deepAccess, mergeDeep} from './utils.js';
+import {getGlobal} from './prebidGlobal.js';
+import CONSTANTS from './constants.json';
+
+export class ScopedSettings {
+  constructor(getSettings, defaultScope) {
+    this.getSettings = getSettings;
+    this.defaultScope = defaultScope;
+  }
+
+  /**
+   * Get setting value at `path` under the given scope, falling back to the default scope if needed.
+   * If `scope` is `null`, get the setting's default value.
+   * @param scope {String|null}
+   * @param path {String}
+   * @returns {*}
+   */
+  get(scope, path) {
+    let value = this.getOwn(scope, path);
+    if (typeof value === 'undefined') {
+      value = this.getOwn(null, path);
+    }
+    return value;
+  }
+
+  /**
+   * Get the setting value at `path` *without* falling back to the default value.
+   * @param scope {String}
+   * @param path {String}
+   * @returns {*}
+   */
+  getOwn(scope, path) {
+    scope = this.#resolveScope(scope);
+    return deepAccess(this.getSettings(), `${scope}.${path}`)
+  }
+
+  /**
+   * @returns {string[]} all existing scopes except the default one.
+   */
+  getScopes() {
+    return Object.keys(this.getSettings()).filter((scope) => scope !== this.defaultScope);
+  }
+
+  /**
+   * @returns all settings in the given scope, merged with the settings for the default scope.
+   */
+  settingsFor(scope) {
+    return mergeDeep({}, this.ownSettingsFor(null), this.ownSettingsFor(scope));
+  }
+
+  /**
+   * @returns all settings in the given scope, *without* any of the default settings.
+   */
+  ownSettingsFor(scope) {
+    scope = this.#resolveScope(scope);
+    return this.getSettings()[scope] || {};
+  }
+
+  #resolveScope(scope) {
+    if (scope == null) {
+      return this.defaultScope;
+    } else {
+      return scope;
+    }
+  }
+}
+
+export const bidderSettings = new ScopedSettings(() => getGlobal().bidderSettings || {}, CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD);
diff --git a/src/bidfactory.js b/src/bidfactory.js
index 8701184c799..4c2e4cf3ffb 100644
--- a/src/bidfactory.js
+++ b/src/bidfactory.js
@@ -1,4 +1,4 @@
-var utils = require('./utils.js');
+import { getUniqueIdentifierStr } from './utils.js';
 
 /**
  Required paramaters
@@ -14,16 +14,18 @@ var utils = require('./utils.js');
  dealId,
  priceKeyString;
  */
-function Bid(statusCode, bidRequest) {
-  var _bidSrc = (bidRequest && bidRequest.src) || 'client';
+function Bid(statusCode, {src = 'client', bidder = '', bidId, transactionId, auctionId} = {}) {
+  var _bidSrc = src;
   var _statusCode = statusCode || 0;
 
-  this.bidderCode = (bidRequest && bidRequest.bidder) || '';
+  this.bidderCode = bidder;
   this.width = 0;
   this.height = 0;
   this.statusMessage = _getStatus();
-  this.adId = utils.getUniqueIdentifierStr();
-  this.requestId = bidRequest && bidRequest.bidId;
+  this.adId = getUniqueIdentifierStr();
+  this.requestId = bidId;
+  this.transactionId = transactionId;
+  this.auctionId = auctionId;
   this.mediaType = 'banner';
   this.source = _bidSrc;
 
@@ -48,9 +50,19 @@ function Bid(statusCode, bidRequest) {
   this.getSize = function () {
     return this.width + 'x' + this.height;
   };
+
+  this.getIdentifiers = function () {
+    return {
+      src: this.source,
+      bidder: this.bidderCode,
+      bidId: this.requestId,
+      transactionId: this.transactionId,
+      auctionId: this.auctionId
+    }
+  };
 }
 
 // Bid factory function.
-export function createBid(statusCode, bidRequest) {
-  return new Bid(statusCode, bidRequest);
+export function createBid(statusCode, identifiers) {
+  return new Bid(statusCode, identifiers);
 }
diff --git a/src/config.js b/src/config.js
index 3284be52296..0922a2a2bea 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,6 +1,6 @@
 /*
  * Module for getting and setting Prebid configuration.
- */
+*/
 
 /**
  * @typedef {Object} MediaTypePriceGranularity
@@ -13,22 +13,20 @@
  */
 
 import { isValidPriceConfig } from './cpmBucketManager.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import Set from 'core-js-pure/features/set';
-import { mergeDeep } from './utils.js';
-
-const from = require('core-js-pure/features/array/from.js');
-const utils = require('./utils.js');
-const CONSTANTS = require('./constants.json');
-
-const DEFAULT_DEBUG = utils.getParameterByName(CONSTANTS.DEBUG_MODE).toUpperCase() === 'TRUE';
+import {find, includes, arrayFrom as from} from './polyfill.js';
+import {
+  mergeDeep, deepClone, getParameterByName, isPlainObject, logMessage, logWarn, logError,
+  isArray, isStr, isBoolean, deepAccess, bind
+} from './utils.js';
+import CONSTANTS from './constants.json';
+
+const DEFAULT_DEBUG = getParameterByName(CONSTANTS.DEBUG_MODE).toUpperCase() === 'TRUE';
 const DEFAULT_BIDDER_TIMEOUT = 3000;
-const DEFAULT_PUBLISHER_DOMAIN = window.location.origin;
 const DEFAULT_ENABLE_SEND_ALL_BIDS = true;
 const DEFAULT_DISABLE_AJAX_TIMEOUT = false;
 const DEFAULT_BID_CACHE = false;
 const DEFAULT_DEVICE_ACCESS = true;
+const DEFAULT_MAX_NESTED_IFRAMES = 10;
 
 const DEFAULT_TIMEOUTBUFFER = 400;
 
@@ -87,12 +85,12 @@ export function newConfig() {
         this._bidderTimeout = val;
       },
 
-      // domain where prebid is running for cross domain iframe communication
-      _publisherDomain: DEFAULT_PUBLISHER_DOMAIN,
+      _publisherDomain: null,
       get publisherDomain() {
         return this._publisherDomain;
       },
       set publisherDomain(val) {
+        logWarn('publisherDomain is deprecated and has no effect since v7 - use pageUrl instead')
         this._publisherDomain = val;
       },
 
@@ -102,10 +100,10 @@ export function newConfig() {
         if (validatePriceGranularity(val)) {
           if (typeof val === 'string') {
             this._priceGranularity = (hasGranularity(val)) ? val : GRANULARITY_OPTIONS.MEDIUM;
-          } else if (utils.isPlainObject(val)) {
+          } else if (isPlainObject(val)) {
             this._customPriceBucket = val;
             this._priceGranularity = GRANULARITY_OPTIONS.CUSTOM;
-            utils.logMessage('Using custom price granularity');
+            logMessage('Using custom price granularity');
           }
         }
       },
@@ -132,12 +130,12 @@ export function newConfig() {
           if (validatePriceGranularity(val[item])) {
             if (typeof val === 'string') {
               aggregate[item] = (hasGranularity(val[item])) ? val[item] : this._priceGranularity;
-            } else if (utils.isPlainObject(val)) {
+            } else if (isPlainObject(val)) {
               aggregate[item] = val[item];
-              utils.logMessage(`Using custom price granularity for ${item}`);
+              logMessage(`Using custom price granularity for ${item}`);
             }
           } else {
-            utils.logWarn(`Invalid price granularity for media type: ${item}`);
+            logWarn(`Invalid price granularity for media type: ${item}`);
           }
           return aggregate;
         }, {});
@@ -179,7 +177,7 @@ export function newConfig() {
         if (VALID_ORDERS[val]) {
           this._bidderSequence = val;
         } else {
-          utils.logWarn(`Invalid order: ${val}. Bidder Sequence was not set.`);
+          logWarn(`Invalid order: ${val}. Bidder Sequence was not set.`);
         }
       },
 
@@ -199,6 +197,25 @@ export function newConfig() {
       set disableAjaxTimeout(val) {
         this._disableAjaxTimeout = val;
       },
+
+      // default max nested iframes for referer detection
+      _maxNestedIframes: DEFAULT_MAX_NESTED_IFRAMES,
+      get maxNestedIframes() {
+        return this._maxNestedIframes;
+      },
+      set maxNestedIframes(val) {
+        this._maxNestedIframes = val;
+      },
+
+      _auctionOptions: {},
+      get auctionOptions() {
+        return this._auctionOptions;
+      },
+      set auctionOptions(val) {
+        if (validateauctionOptions(val)) {
+          this._auctionOptions = val;
+        }
+      },
     };
 
     if (config) {
@@ -222,21 +239,50 @@ export function newConfig() {
 
     function validatePriceGranularity(val) {
       if (!val) {
-        utils.logError('Prebid Error: no value passed to `setPriceGranularity()`');
+        logError('Prebid Error: no value passed to `setPriceGranularity()`');
         return false;
       }
       if (typeof val === 'string') {
         if (!hasGranularity(val)) {
-          utils.logWarn('Prebid Warning: setPriceGranularity was called with invalid setting, using `medium` as default.');
+          logWarn('Prebid Warning: setPriceGranularity was called with invalid setting, using `medium` as default.');
         }
-      } else if (utils.isPlainObject(val)) {
+      } else if (isPlainObject(val)) {
         if (!isValidPriceConfig(val)) {
-          utils.logError('Invalid custom price value passed to `setPriceGranularity()`');
+          logError('Invalid custom price value passed to `setPriceGranularity()`');
           return false;
         }
       }
       return true;
     }
+
+    function validateauctionOptions(val) {
+      if (!isPlainObject(val)) {
+        logWarn('Auction Options must be an object')
+        return false
+      }
+
+      for (let k of Object.keys(val)) {
+        if (k !== 'secondaryBidders' && k !== 'suppressStaleRender') {
+          logWarn(`Auction Options given an incorrect param: ${k}`)
+          return false
+        }
+        if (k === 'secondaryBidders') {
+          if (!isArray(val[k])) {
+            logWarn(`Auction Options ${k} must be of type Array`);
+            return false
+          } else if (!val[k].every(isStr)) {
+            logWarn(`Auction Options ${k} must be only string`);
+            return false
+          }
+        } else if (k === 'suppressStaleRender') {
+          if (!isBoolean(val[k])) {
+            logWarn(`Auction Options ${k} must be of type boolean`);
+            return false;
+          }
+        }
+      }
+      return true;
+    }
   }
 
   /**
@@ -244,7 +290,7 @@ export function newConfig() {
    * @private
    */
   function _getConfig() {
-    if (currBidder && bidderConfig && utils.isPlainObject(bidderConfig[currBidder])) {
+    if (currBidder && bidderConfig && isPlainObject(bidderConfig[currBidder])) {
       let currBidderConfig = bidderConfig[currBidder];
       const configTopicSet = new Set(Object.keys(config).concat(Object.keys(currBidderConfig)));
 
@@ -254,7 +300,7 @@ export function newConfig() {
         } else if (typeof config[topic] === 'undefined') {
           memo[topic] = currBidderConfig[topic];
         } else {
-          if (utils.isPlainObject(currBidderConfig[topic])) {
+          if (isPlainObject(currBidderConfig[topic])) {
             memo[topic] = mergeDeep({}, config[topic], currBidderConfig[topic]);
           } else {
             memo[topic] = currBidderConfig[topic];
@@ -266,23 +312,53 @@ export function newConfig() {
     return Object.assign({}, config);
   }
 
-  /*
-   * Returns configuration object if called without parameters,
-   * or single configuration property if given a string matching a configuration
-   * property name.  Allows deep access e.g. getConfig('currency.adServerCurrency')
-   *
-   * If called with callback parameter, or a string and a callback parameter,
-   * subscribes to configuration updates. See `subscribe` function for usage.
-   */
-  function getConfig(...args) {
-    if (args.length <= 1 && typeof args[0] !== 'function') {
-      const option = args[0];
-      return option ? utils.deepAccess(_getConfig(), option) : _getConfig();
-    }
-
-    return subscribe(...args);
+  function _getRestrictedConfig() {
+    // This causes reading 'ortb2' to throw an error; with prebid 7, that will almost
+    // always be the incorrect way to access FPD configuration (https://github.com/prebid/Prebid.js/issues/7651)
+    // code that needs the ortb2 config should explicitly use `getAnyConfig`
+    // TODO: this is meant as a temporary tripwire to catch inadvertent use of `getConfig('ortb')` as we transition.
+    // It should be removed once the risk of that happening is low enough.
+    const conf = _getConfig();
+    Object.defineProperty(conf, 'ortb2', {
+      get: function () {
+        throw new Error('invalid access to \'orbt2\' config - use request parameters instead');
+      }
+    });
+    return conf;
   }
 
+  const [getAnyConfig, getConfig] = [_getConfig, _getRestrictedConfig].map(accessor => {
+    /*
+     * Returns configuration object if called without parameters,
+     * or single configuration property if given a string matching a configuration
+     * property name.  Allows deep access e.g. getConfig('currency.adServerCurrency')
+     *
+     * If called with callback parameter, or a string and a callback parameter,
+     * subscribes to configuration updates. See `subscribe` function for usage.
+     */
+    return function getConfig(...args) {
+      if (args.length <= 1 && typeof args[0] !== 'function') {
+        const option = args[0];
+        return option ? deepAccess(accessor(), option) : _getConfig();
+      }
+
+      return subscribe(...args);
+    }
+  })
+
+  const [readConfig, readAnyConfig] = [getConfig, getAnyConfig].map(wrapee => {
+    /*
+     * Like getConfig, except that it returns a deepClone of the result.
+     */
+    return function readConfig(...args) {
+      let res = wrapee(...args);
+      if (res && typeof res === 'object') {
+        res = deepClone(res);
+      }
+      return res;
+    }
+  })
+
   /**
    * Internal API for modules (such as prebid-server) that might need access to all bidder config
    */
@@ -295,8 +371,8 @@ export function newConfig() {
    * listeners that were added by the `subscribe` function
    */
   function setConfig(options) {
-    if (!utils.isPlainObject(options)) {
-      utils.logError('setConfig options must be an object');
+    if (!isPlainObject(options)) {
+      logError('setConfig options must be an object');
       return;
     }
 
@@ -306,11 +382,15 @@ export function newConfig() {
     topics.forEach(topic => {
       let option = options[topic];
 
-      if (utils.isPlainObject(defaults[topic]) && utils.isPlainObject(option)) {
+      if (isPlainObject(defaults[topic]) && isPlainObject(option)) {
         option = Object.assign({}, defaults[topic], option);
       }
 
-      topicalConfig[topic] = config[topic] = option;
+      try {
+        topicalConfig[topic] = config[topic] = option;
+      } catch (e) {
+        logWarn(`Cannot set config for property ${topic} : `, e)
+      }
     });
 
     callSubscribers(topicalConfig);
@@ -321,8 +401,8 @@ export function newConfig() {
    * @param {object} options
    */
   function setDefaults(options) {
-    if (!utils.isPlainObject(defaults)) {
-      utils.logError('defaults must be an object');
+    if (!isPlainObject(defaults)) {
+      logError('defaults must be an object');
       return;
     }
 
@@ -338,6 +418,8 @@ export function newConfig() {
    * updates when specific properties are updated by passing a topic string as
    * the first parameter.
    *
+   * If `options.init` is true, the listener will be immediately called with the current options.
+   *
    * Returns an `unsubscribe` function for removing the subscriber from the
    * set of listeners
    *
@@ -351,8 +433,9 @@ export function newConfig() {
    * // unsubscribe
    * const unsubscribe = subscribe(...);
    * unsubscribe(); // no longer listening
+   *
    */
-  function subscribe(topic, listener) {
+  function subscribe(topic, listener, options = {}) {
     let callback = listener;
 
     if (typeof topic !== 'string') {
@@ -360,16 +443,26 @@ export function newConfig() {
       // meaning it gets called for any config change
       callback = topic;
       topic = ALL_TOPICS;
+      options = listener || {};
     }
 
     if (typeof callback !== 'function') {
-      utils.logError('listener must be a function');
+      logError('listener must be a function');
       return;
     }
 
     const nl = { topic, callback };
     listeners.push(nl);
 
+    if (options.init) {
+      if (topic === ALL_TOPICS) {
+        callback(getConfig());
+      } else {
+        // eslint-disable-next-line standard/no-callback-literal
+        callback({[topic]: getConfig(topic)});
+      }
+    }
+
     // save and call this function to remove the listener
     return function unsubscribe() {
       listeners.splice(listeners.indexOf(nl), 1);
@@ -395,7 +488,7 @@ export function newConfig() {
       .forEach(listener => listener.callback(options));
   }
 
-  function setBidderConfig(config) {
+  function setBidderConfig(config, mergeFlag = false) {
     try {
       check(config);
       config.bidders.forEach(bidder => {
@@ -404,29 +497,48 @@ export function newConfig() {
         }
         Object.keys(config.config).forEach(topic => {
           let option = config.config[topic];
-          if (utils.isPlainObject(option)) {
-            bidderConfig[bidder][topic] = Object.assign({}, bidderConfig[bidder][topic] || {}, option);
+
+          if (isPlainObject(option)) {
+            const func = mergeFlag ? mergeDeep : Object.assign;
+            bidderConfig[bidder][topic] = func({}, bidderConfig[bidder][topic] || {}, option);
           } else {
             bidderConfig[bidder][topic] = option;
           }
         });
       });
     } catch (e) {
-      utils.logError(e);
+      logError(e);
     }
+
     function check(obj) {
-      if (!utils.isPlainObject(obj)) {
+      if (!isPlainObject(obj)) {
         throw 'setBidderConfig bidder options must be an object';
       }
       if (!(Array.isArray(obj.bidders) && obj.bidders.length)) {
         throw 'setBidderConfig bidder options must contain a bidders list with at least 1 bidder';
       }
-      if (!utils.isPlainObject(obj.config)) {
+      if (!isPlainObject(obj.config)) {
         throw 'setBidderConfig bidder options must contain a config object';
       }
     }
   }
 
+  function mergeConfig(obj) {
+    if (!isPlainObject(obj)) {
+      logError('mergeConfig input must be an object');
+      return;
+    }
+
+    const mergedConfig = mergeDeep(_getConfig(), obj);
+
+    setConfig({ ...mergedConfig });
+    return mergedConfig;
+  }
+
+  function mergeBidderConfig(obj) {
+    return setBidderConfig(obj, true);
+  }
+
   /**
    * Internal functions for core to execute some synchronous code while having an active bidder set.
    */
@@ -435,16 +547,16 @@ export function newConfig() {
     try {
       return fn();
     } finally {
-      currBidder = null;
+      resetBidder();
     }
   }
   function callbackWithBidder(bidder) {
     return function(cb) {
       return function(...args) {
         if (typeof cb === 'function') {
-          return runWithBidder(bidder, utils.bind.call(cb, this, ...args))
+          return runWithBidder(bidder, bind.call(cb, this, ...args))
         } else {
-          utils.logWarn('config.callbackWithBidder callback is not a function');
+          logWarn('config.callbackWithBidder callback is not a function');
         }
       }
     }
@@ -454,18 +566,28 @@ export function newConfig() {
     return currBidder;
   }
 
+  function resetBidder() {
+    currBidder = null;
+  }
+
   resetConfig();
 
   return {
     getCurrentBidder,
+    resetBidder,
     getConfig,
+    getAnyConfig,
+    readConfig,
+    readAnyConfig,
     setConfig,
+    mergeConfig,
     setDefaults,
     resetConfig,
     runWithBidder,
     callbackWithBidder,
     setBidderConfig,
-    getBidderConfig
+    getBidderConfig,
+    mergeBidderConfig,
   };
 }
 
diff --git a/src/consentHandler.js b/src/consentHandler.js
new file mode 100644
index 00000000000..b1b2a04c043
--- /dev/null
+++ b/src/consentHandler.js
@@ -0,0 +1,120 @@
+import {isStr, timestamp} from './utils.js';
+import {defer, GreedyPromise} from './utils/promise.js';
+
+/**
+ * Placeholder gvlid for when vendor consent is not required. When this value is used as gvlid, the gdpr
+ * enforcement module will take it to mean "vendor consent was given".
+ *
+ * see https://github.com/prebid/Prebid.js/issues/8161
+ */
+export const VENDORLESS_GVLID = Object.freeze({});
+
+export class ConsentHandler {
+  #enabled;
+  #data;
+  #defer;
+  #ready;
+  generatedTime;
+
+  constructor() {
+    this.reset();
+  }
+
+  #resolve(data) {
+    this.#ready = true;
+    this.#data = data;
+    this.#defer.resolve(data);
+  }
+
+  /**
+   * reset this handler (mainly for tests)
+   */
+  reset() {
+    this.#defer = defer();
+    this.#enabled = false;
+    this.#data = null;
+    this.#ready = false;
+    this.generatedTime = null;
+  }
+
+  /**
+   * Enable this consent handler. This should be called by the relevant consent management module
+   * on initialization.
+   */
+  enable() {
+    this.#enabled = true;
+  }
+
+  /**
+   * @returns {boolean} true if the related consent management module is enabled.
+   */
+  get enabled() {
+    return this.#enabled;
+  }
+
+  /**
+   * @returns {boolean} true if consent data has been resolved (it may be `null` if the resolution failed).
+   */
+  get ready() {
+    return this.#ready;
+  }
+
+  /**
+   * @returns a promise than resolves to the consent data, or null if no consent data is available
+   */
+  get promise() {
+    if (this.#ready) {
+      return GreedyPromise.resolve(this.#data);
+    }
+    if (!this.#enabled) {
+      this.#resolve(null);
+    }
+    return this.#defer.promise;
+  }
+
+  setConsentData(data, time = timestamp()) {
+    this.generatedTime = time;
+    this.#resolve(data);
+  }
+
+  getConsentData() {
+    return this.#data;
+  }
+}
+
+export class UspConsentHandler extends ConsentHandler {
+  getConsentMeta() {
+    const consentData = this.getConsentData();
+    if (consentData && this.generatedTime) {
+      return {
+        usp: consentData,
+        generatedAt: this.generatedTime
+      };
+    }
+  }
+}
+
+export class GdprConsentHandler extends ConsentHandler {
+  getConsentMeta() {
+    const consentData = this.getConsentData();
+    if (consentData && consentData.vendorData && this.generatedTime) {
+      return {
+        gdprApplies: consentData.gdprApplies,
+        consentStringSize: (isStr(consentData.vendorData.tcString)) ? consentData.vendorData.tcString.length : 0,
+        generatedAt: this.generatedTime,
+        apiVersion: consentData.apiVersion
+      }
+    }
+  }
+}
+
+export class GppConsentHandler extends ConsentHandler {
+  getConsentMeta() {
+    const consentData = this.getConsentData();
+    if (consentData && this.generatedTime) {
+      return {
+        generatedAt: this.generatedTime,
+      }
+    }
+  }
+}
diff --git a/src/constants.json b/src/constants.json
index 5965d77a6c4..e33d65f3fb1 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -29,17 +29,26 @@
     "BID_TIMEOUT": "bidTimeout",
     "BID_REQUESTED": "bidRequested",
     "BID_RESPONSE": "bidResponse",
+    "BID_REJECTED": "bidRejected",
     "NO_BID": "noBid",
     "BID_WON": "bidWon",
     "BIDDER_DONE": "bidderDone",
+    "BIDDER_ERROR": "bidderError",
     "SET_TARGETING": "setTargeting",
     "BEFORE_REQUEST_BIDS": "beforeRequestBids",
+    "BEFORE_BIDDER_HTTP": "beforeBidderHttp",
     "REQUEST_BIDS": "requestBids",
     "ADD_AD_UNITS": "addAdUnits",
-    "AD_RENDER_FAILED" : "adRenderFailed"
+    "AD_RENDER_FAILED": "adRenderFailed",
+    "AD_RENDER_SUCCEEDED": "adRenderSucceeded",
+    "TCF2_ENFORCEMENT": "tcf2Enforcement",
+    "AUCTION_DEBUG": "auctionDebug",
+    "BID_VIEWABLE": "bidViewable",
+    "STALE_RENDER": "staleRender",
+    "BILLABLE_EVENT": "billableEvent"
   },
-  "AD_RENDER_FAILED_REASON" : {
-    "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocuemnt",
+  "AD_RENDER_FAILED_REASON": {
+    "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocument",
     "NO_AD": "noAd",
     "EXCEPTION": "exception",
     "CANNOT_FIND_AD": "cannotFindAd",
@@ -66,6 +75,18 @@
     "FORMAT": "hb_format",
     "UUID": "hb_uuid",
     "CACHE_ID": "hb_cache_id",
+    "CACHE_HOST": "hb_cache_host",
+    "ADOMAIN": "hb_adomain",
+    "ACAT": "hb_acat"
+  },
+  "DEFAULT_TARGETING_KEYS": {
+    "BIDDER": "hb_bidder",
+    "AD_ID": "hb_adid",
+    "PRICE_BUCKET": "hb_pb",
+    "SIZE": "hb_size",
+    "DEAL": "hb_deal",
+    "FORMAT": "hb_format",
+    "UUID": "hb_uuid",
     "CACHE_HOST": "hb_cache_host"
   },
   "NATIVE_KEYS": {
@@ -86,16 +107,65 @@
     "likes": "hb_native_likes",
     "phone": "hb_native_phone",
     "price": "hb_native_price",
-    "salePrice": "hb_native_saleprice"
+    "salePrice": "hb_native_saleprice",
+    "rendererUrl": "hb_renderer_url",
+    "adTemplate": "hb_adTemplate"
   },
-  "S2S" : {
-    "SRC" : "s2s",
-    "DEFAULT_ENDPOINT" : "https://prebid.adnxs.com/pbs/v1/openrtb2/auction",
+  "S2S": {
+    "SRC": "s2s",
+    "DEFAULT_ENDPOINT": "https://prebid.adnxs.com/pbs/v1/openrtb2/auction",
     "SYNCED_BIDDERS_KEY": "pbjsSyncs"
   },
-  "BID_STATUS" : {
+  "BID_STATUS": {
     "BID_TARGETING_SET": "targetingSet",
     "RENDERED": "rendered",
     "BID_REJECTED": "bidRejected"
-  }
+  },
+  "REJECTION_REASON": {
+    "INVALID": "Bid has missing or invalid properties",
+    "INVALID_REQUEST_ID": "Invalid request ID",
+    "BIDDER_DISALLOWED": "Bidder code is not allowed by allowedAlternateBidderCodes / allowUnknownBidderCodes",
+    "FLOOR_NOT_MET": "Bid does not meet price floor",
+    "CANNOT_CONVERT_CURRENCY": "Unable to convert currency"
+  },
+  "PREBID_NATIVE_DATA_KEYS_TO_ORTB": {
+    "body": "desc",
+    "body2": "desc2",
+    "sponsoredBy": "sponsored",
+    "cta": "ctatext",
+    "rating": "rating",
+    "address": "address",
+    "downloads": "downloads",
+    "likes": "likes",
+    "phone": "phone",
+    "price": "price",
+    "salePrice": "saleprice",
+    "displayUrl": "displayurl"
+  },
+  "NATIVE_ASSET_TYPES": {
+    "sponsored": 1,
+    "desc": 2,
+    "rating": 3,
+    "likes": 4,
+    "downloads": 5,
+    "price": 6,
+    "saleprice": 7,
+    "phone": 8,
+    "address": 9,
+    "desc2": 10,
+    "displayurl": 11,
+    "ctatext": 12
+  },
+  "NATIVE_IMAGE_TYPES": {
+    "ICON": 1,
+    "MAIN": 3
+  },
+  "NATIVE_KEYS_THAT_ARE_NOT_ASSETS": [
+    "privacyLink",
+    "clickUrl",
+    "sendTargetingKeys",
+    "adTemplate",
+    "rendererUrl",
+    "type"
+  ]
 }
diff --git a/src/cpmBucketManager.js b/src/cpmBucketManager.js
index a6b76cc38e2..5bb6675b8e1 100644
--- a/src/cpmBucketManager.js
+++ b/src/cpmBucketManager.js
@@ -1,5 +1,6 @@
-import find from 'core-js-pure/features/array/find.js';
-const utils = require('./utils.js');
+import {find} from './polyfill.js';
+import { isEmpty, logWarn } from './utils.js';
+import { config } from './config.js';
 
 const _defaultPrecision = 2;
 const _lgPriceConfig = {
@@ -102,7 +103,7 @@ function getCpmStringValue(cpm, config, granularityMultiplier) {
 }
 
 function isValidPriceConfig(config) {
-  if (utils.isEmpty(config) || !config.buckets || !Array.isArray(config.buckets)) {
+  if (isEmpty(config) || !config.buckets || !Array.isArray(config.buckets)) {
     return false;
   }
   let isValid = true;
@@ -118,6 +119,11 @@ function getCpmTarget(cpm, bucket, granularityMultiplier) {
   const precision = typeof bucket.precision !== 'undefined' ? bucket.precision : _defaultPrecision;
   const increment = bucket.increment * granularityMultiplier;
   const bucketMin = bucket.min * granularityMultiplier;
+  let roundingFunction = Math.floor;
+  let customRoundingFunction = config.getConfig('cpmRoundingFunction');
+  if (typeof customRoundingFunction === 'function') {
+    roundingFunction = customRoundingFunction;
+  }
 
   // start increments at the bucket min and then add bucket min back to arrive at the correct rounding
   // note - we're padding the values to avoid using decimals in the math prior to flooring
@@ -125,10 +131,23 @@ function getCpmTarget(cpm, bucket, granularityMultiplier) {
   //   (eg 4.01 / 0.01 = 400.99999999999994)
   // min precison should be 2 to move decimal place over.
   let pow = Math.pow(10, precision + 2);
-  let cpmToFloor = ((cpm * pow) - (bucketMin * pow)) / (increment * pow);
-  let cpmTarget = ((Math.floor(cpmToFloor)) * increment) + bucketMin;
+  let cpmToRound = ((cpm * pow) - (bucketMin * pow)) / (increment * pow);
+  let cpmTarget;
+  let invalidRounding;
+  // It is likely that we will be passed {cpmRoundingFunction: roundingFunction()}
+  // rather than the expected {cpmRoundingFunction: roundingFunction}. Default back to floor in that case
+  try {
+    cpmTarget = (roundingFunction(cpmToRound) * increment) + bucketMin;
+  } catch (err) {
+    invalidRounding = true;
+  }
+  if (invalidRounding || typeof cpmTarget !== 'number') {
+    logWarn('Invalid rounding function passed in config');
+    cpmTarget = (Math.floor(cpmToRound) * increment) + bucketMin;
+  }
   // force to 10 decimal places to deal with imprecise decimal/binary conversions
   //    (for example 0.1 * 3 = 0.30000000000000004)
+
   cpmTarget = Number(cpmTarget.toFixed(10));
   return cpmTarget.toFixed(precision);
 }
diff --git a/src/debugging.js b/src/debugging.js
index dc479f74674..f5d13d1a134 100644
--- a/src/debugging.js
+++ b/src/debugging.js
@@ -1,153 +1,94 @@
-
-import { config } from './config.js';
-import { logMessage as utilsLogMessage, logWarn as utilsLogWarn } from './utils.js';
-import { addBidderRequests, addBidResponse } from './auction.js';
-
-const OVERRIDE_KEY = '$$PREBID_GLOBAL$$:debugging';
-
-export let addBidResponseBound;
-export let addBidderRequestsBound;
-
-function logMessage(msg) {
-  utilsLogMessage('DEBUG: ' + msg);
-}
-
-function logWarn(msg) {
-  utilsLogWarn('DEBUG: ' + msg);
-}
-
-function addHooks(overrides) {
-  addBidResponseBound = addBidResponseHook.bind(overrides);
-  addBidResponse.before(addBidResponseBound, 5);
-
-  addBidderRequestsBound = addBidderRequestsHook.bind(overrides);
-  addBidderRequests.before(addBidderRequestsBound, 5);
-}
-
-function removeHooks() {
-  addBidResponse.getHooks({hook: addBidResponseBound}).remove();
-  addBidderRequests.getHooks({hook: addBidderRequestsBound}).remove();
+import {config} from './config.js';
+import {getHook, hook} from './hook.js';
+import {getGlobal} from './prebidGlobal.js';
+import {logMessage, prefixLog} from './utils.js';
+import {createBid} from './bidfactory.js';
+import {loadExternalScript} from './adloader.js';
+import {GreedyPromise} from './utils/promise.js';
+
+export const DEBUG_KEY = '__$$PREBID_GLOBAL$$_debugging__';
+
+function isDebuggingInstalled() {
+  return getGlobal().installedModules.includes('debugging');
 }
 
-export function enableOverrides(overrides, fromSession = false) {
-  config.setConfig({'debug': true});
-  removeHooks();
-  addHooks(overrides);
-  logMessage(`bidder overrides enabled${fromSession ? ' from session' : ''}`);
+function loadScript(url) {
+  return new GreedyPromise((resolve) => {
+    loadExternalScript(url, 'debugging', resolve);
+  });
 }
 
-export function disableOverrides() {
-  removeHooks();
-  logMessage('bidder overrides disabled');
+export function debuggingModuleLoader({alreadyInstalled = isDebuggingInstalled, script = loadScript} = {}) {
+  let loading = null;
+  return function () {
+    if (loading == null) {
+      loading = new GreedyPromise((resolve, reject) => {
+        // run this in a 0-delay timeout to give installedModules time to be populated
+        setTimeout(() => {
+          if (alreadyInstalled()) {
+            resolve();
+          } else {
+            const url = '$$PREBID_DIST_URL_BASE$$debugging-standalone.js';
+            logMessage(`Debugging module not installed, loading it from "${url}"...`);
+            getGlobal()._installDebugging = true;
+            script(url).then(() => {
+              getGlobal()._installDebugging({DEBUG_KEY, hook, config, createBid, logger: prefixLog('DEBUG:')});
+            }).then(resolve, reject);
+          }
+        });
+      })
+    }
+    return loading;
+  }
 }
 
-/**
- * @param {{bidder:string, adUnitCode:string}} overrideObj
- * @param {string} bidderCode
- * @param {string} adUnitCode
- * @returns {boolean}
- */
-export function bidExcluded(overrideObj, bidderCode, adUnitCode) {
-  if (overrideObj.bidder && overrideObj.bidder !== bidderCode) {
-    return true;
+export function debuggingControls({load = debuggingModuleLoader(), hook = getHook('requestBids')} = {}) {
+  let promise = null;
+  let enabled = false;
+  function waitForDebugging(next, ...args) {
+    return (promise || GreedyPromise.resolve()).then(() => next.apply(this, args))
   }
-  if (overrideObj.adUnitCode && overrideObj.adUnitCode !== adUnitCode) {
-    return true;
+  function enable() {
+    if (!enabled) {
+      promise = load();
+      // set debugging to high priority so that it has the opportunity to mess with most things
+      hook.before(waitForDebugging, 99);
+      enabled = true;
+    }
   }
-  return false;
-}
-
-/**
- * @param {string[]} bidders
- * @param {string} bidderCode
- * @returns {boolean}
- */
-export function bidderExcluded(bidders, bidderCode) {
-  return (Array.isArray(bidders) && bidders.indexOf(bidderCode) === -1);
-}
-
-/**
- * @param {Object} overrideObj
- * @param {Object} bidObj
- * @param {Object} bidType
- * @returns {Object} bidObj with overridden properties
- */
-export function applyBidOverrides(overrideObj, bidObj, bidType) {
-  return Object.keys(overrideObj).filter(key => (['adUnitCode', 'bidder'].indexOf(key) === -1)).reduce(function(result, key) {
-    logMessage(`bidder overrides changed '${result.adUnitCode}/${result.bidderCode}' ${bidType}.${key} from '${result[key]}.js' to '${overrideObj[key]}'`);
-    result[key] = overrideObj[key];
-    return result;
-  }, bidObj);
-}
-
-export function addBidResponseHook(next, adUnitCode, bid) {
-  const overrides = this;
-
-  if (bidderExcluded(overrides.bidders, bid.bidderCode)) {
-    logWarn(`bidder '${bid.bidderCode}' excluded from auction by bidder overrides`);
-    return;
+  function disable() {
+    hook.getHooks({hook: waitForDebugging}).remove();
+    enabled = false;
   }
-
-  if (Array.isArray(overrides.bids)) {
-    overrides.bids.forEach(function(overrideBid) {
-      if (!bidExcluded(overrideBid, bid.bidderCode, adUnitCode)) {
-        applyBidOverrides(overrideBid, bid, 'bidder');
-      }
-    });
+  function reset() {
+    promise = null;
+    disable();
   }
-
-  next(adUnitCode, bid);
+  return {enable, disable, reset};
 }
 
-export function addBidderRequestsHook(next, bidderRequests) {
-  const overrides = this;
+const ctl = debuggingControls();
+export const reset = ctl.reset;
 
-  const includedBidderRequests = bidderRequests.filter(function(bidderRequest) {
-    if (bidderExcluded(overrides.bidders, bidderRequest.bidderCode)) {
-      logWarn(`bidRequest '${bidderRequest.bidderCode}' excluded from auction by bidder overrides`);
-      return false;
-    }
-    return true;
-  });
-
-  if (Array.isArray(overrides.bidRequests)) {
-    includedBidderRequests.forEach(function(bidderRequest) {
-      overrides.bidRequests.forEach(function(overrideBid) {
-        bidderRequest.bids.forEach(function(bid) {
-          if (!bidExcluded(overrideBid, bidderRequest.bidderCode, bid.adUnitCode)) {
-            applyBidOverrides(overrideBid, bid, 'bidRequest');
-          }
-        });
-      });
-    });
-  }
-
-  next(includedBidderRequests);
-}
+export function loadSession() {
+  let storage = null;
+  try {
+    storage = window.sessionStorage;
+  } catch (e) {}
 
-export function getConfig(debugging) {
-  if (!debugging.enabled) {
-    disableOverrides();
-    try {
-      window.sessionStorage.removeItem(OVERRIDE_KEY);
-    } catch (e) {}
-  } else {
+  if (storage !== null) {
+    let debugging = ctl;
+    let config = null;
     try {
-      window.sessionStorage.setItem(OVERRIDE_KEY, JSON.stringify(debugging));
+      config = storage.getItem(DEBUG_KEY);
     } catch (e) {}
-    enableOverrides(debugging);
+    if (config !== null) {
+      // just make sure the module runs; it will take care of parsing the config (and disabling itself if necessary)
+      debugging.enable();
+    }
   }
 }
-config.getConfig('debugging', ({debugging}) => getConfig(debugging));
 
-export function sessionLoader(storage) {
-  let overrides;
-  try {
-    storage = storage || window.sessionStorage;
-    overrides = JSON.parse(storage.getItem(OVERRIDE_KEY));
-  } catch (e) {
-  }
-  if (overrides) {
-    enableOverrides(overrides, true);
-  }
-}
+config.getConfig('debugging', function ({debugging}) {
+  debugging?.enabled ? ctl.enable() : ctl.disable();
+});
diff --git a/src/events.js b/src/events.js
index e7a11635476..62f8c070deb 100644
--- a/src/events.js
+++ b/src/events.js
@@ -1,8 +1,9 @@
 /**
  * events.js
  */
-var utils = require('./utils.js');
-var CONSTANTS = require('./constants.json');
+import * as utils from './utils.js'
+import CONSTANTS from './constants.json';
+
 var slice = Array.prototype.slice;
 var push = Array.prototype.push;
 
@@ -16,8 +17,7 @@ var idPaths = CONSTANTS.EVENT_ID_PATHS;
 
 // keep a record of all events fired
 var eventsFired = [];
-
-module.exports = (function () {
+const _public = (function () {
   var _handlers = {};
   var _public = {};
 
@@ -44,7 +44,8 @@ module.exports = (function () {
     eventsFired.push({
       eventType: eventString,
       args: eventPayload,
-      id: key
+      id: key,
+      elapsedTime: utils.getPerformanceNow(),
     });
 
     /** Push each specific callback to the `callbacks` array.
@@ -132,6 +133,10 @@ module.exports = (function () {
     return _handlers;
   };
 
+  _public.addEvents = function (events) {
+    allEvents = allEvents.concat(events);
+  }
+
   /**
    * This method can return a copy of all the events fired
    * @return {Array} array of events fired
@@ -148,3 +153,11 @@ module.exports = (function () {
 
   return _public;
 }());
+
+utils._setEventEmitter(_public.emit.bind(_public));
+
+export const {on, off, get, getEvents, emit, addEvents} = _public;
+
+export function clearEvents() {
+  eventsFired.length = 0;
+}
diff --git a/src/fpd/enrichment.js b/src/fpd/enrichment.js
new file mode 100644
index 00000000000..fc50a057378
--- /dev/null
+++ b/src/fpd/enrichment.js
@@ -0,0 +1,94 @@
+import {hook} from '../hook.js';
+import {getRefererInfo, parseDomain} from '../refererDetection.js';
+import {findRootDomain} from './rootDomain.js';
+import {deepSetValue, getDefinedParams, getDNT, getWindowSelf, getWindowTop, mergeDeep} from '../utils.js';
+import {config} from '../config.js';
+import {getHighEntropySUA, getLowEntropySUA} from '../../libraries/fpd/sua.js';
+import {GreedyPromise} from '../utils/promise.js';
+
+export const dep = {
+  getRefererInfo,
+  findRootDomain,
+  getWindowTop,
+  getWindowSelf,
+  getHighEntropySUA,
+  getLowEntropySUA,
+};
+
+/**
+ * Enrich an ortb2 object with first party data.
+ * @param {Promise[{}]} fpd: a promise to an ortb2 object.
+ * @returns: {Promise[{}]}: a promise to an enriched ortb2 object.
+ */
+export const enrichFPD = hook('sync', (fpd) => {
+  return GreedyPromise.all([fpd, getSUA().catch(() => null)])
+    .then(([ortb2, sua]) => {
+      Object.entries(ENRICHMENTS).forEach(([section, getEnrichments]) => {
+        const data = getEnrichments();
+        if (data && Object.keys(data).length > 0) {
+          ortb2[section] = mergeDeep({}, data, ortb2[section]);
+        }
+      });
+      if (sua) {
+        deepSetValue(ortb2, 'device.sua', Object.assign({}, sua, ortb2.device.sua));
+      }
+      return ortb2;
+    });
+});
+
+function winFallback(fn) {
+  try {
+    return fn(dep.getWindowTop());
+  } catch (e) {
+    return fn(dep.getWindowSelf());
+  }
+}
+
+function getSUA() {
+  const hints = config.getConfig('firstPartyData.uaHints');
+  return Array.isArray(hints) && hints.length === 0
+    ? GreedyPromise.resolve(dep.getLowEntropySUA())
+    : dep.getHighEntropySUA(hints);
+}
+
+const ENRICHMENTS = {
+  site() {
+    const ri = dep.getRefererInfo();
+    const domain = parseDomain(ri.page, {noLeadingWww: true});
+    const keywords = winFallback((win) => win.document.querySelector('meta[name=\'keywords\']'))
+      ?.content?.replace?.(/\s/g, '');
+    return (site => getDefinedParams(site, Object.keys(site)))({
+      page: ri.page,
+      ref: ri.ref,
+      domain,
+      keywords,
+      publisher: {
+        domain: dep.findRootDomain(domain)
+      }
+    });
+  },
+  device() {
+    return winFallback((win) => {
+      const w = win.innerWidth || win.document.documentElement.clientWidth || win.document.body.clientWidth;
+      const h = win.innerHeight || win.document.documentElement.clientHeight || win.document.body.clientHeight;
+      return {
+        w,
+        h,
+        dnt: getDNT() ? 1 : 0,
+        ua: win.navigator.userAgent,
+        language: win.navigator.language.split('-').shift(),
+      };
+    })
+  },
+  regs() {
+    const regs = {};
+    if (winFallback((win) => win.navigator.globalPrivacyControl)) {
+      deepSetValue(regs, 'ext.gpc', 1);
+    }
+    const coppa = config.getConfig('coppa');
+    if (typeof coppa === 'boolean') {
+      regs.coppa = coppa ? 1 : 0;
+    }
+    return regs;
+  }
+};
diff --git a/src/fpd/rootDomain.js b/src/fpd/rootDomain.js
new file mode 100644
index 00000000000..4095613672f
--- /dev/null
+++ b/src/fpd/rootDomain.js
@@ -0,0 +1,57 @@
+import {memoize, timestamp} from '../utils.js';
+import {getCoreStorageManager} from '../storageManager.js';
+
+export const coreStorage = getCoreStorageManager();
+
+/**
+ * Find the root domain by testing for the topmost domain that will allow setting cookies.
+ */
+
+export const findRootDomain = memoize(function findRootDomain(fullDomain = window.location.host) {
+  if (!coreStorage.cookiesAreEnabled()) {
+    return fullDomain;
+  }
+
+  const domainParts = fullDomain.split('.');
+  if (domainParts.length === 2) {
+    return fullDomain;
+  }
+  let rootDomain;
+  let continueSearching;
+  let startIndex = -2;
+  const TEST_COOKIE_NAME = `_rdc${Date.now()}`;
+  const TEST_COOKIE_VALUE = 'writeable';
+  do {
+    rootDomain = domainParts.slice(startIndex).join('.');
+    let expirationDate = new Date(timestamp() + 10 * 1000).toUTCString();
+
+    // Write a test cookie
+    coreStorage.setCookie(
+      TEST_COOKIE_NAME,
+      TEST_COOKIE_VALUE,
+      expirationDate,
+      'Lax',
+      rootDomain,
+      undefined
+    );
+
+    // See if the write was successful
+    const value = coreStorage.getCookie(TEST_COOKIE_NAME, undefined);
+    if (value === TEST_COOKIE_VALUE) {
+      continueSearching = false;
+      // Delete our test cookie
+      coreStorage.setCookie(
+        TEST_COOKIE_NAME,
+        '',
+        'Thu, 01 Jan 1970 00:00:01 GMT',
+        undefined,
+        rootDomain,
+        undefined
+      );
+    } else {
+      startIndex += -1;
+      continueSearching = Math.abs(startIndex) <= domainParts.length;
+    }
+  } while (continueSearching);
+  return rootDomain;
+});
diff --git a/src/hook.js b/src/hook.js
index 9050bf2f7dc..3f01114935d 100644
--- a/src/hook.js
+++ b/src/hook.js
@@ -1,10 +1,28 @@
-
 import funHooks from 'fun-hooks/no-eval/index.js';
+import {defer} from './utils/promise.js';
 
 export let hook = funHooks({
   ready: funHooks.SYNC | funHooks.ASYNC | funHooks.QUEUE
 });
 
+const readyCtl = defer();
+hook.ready = (() => {
+  const ready = hook.ready;
+  return function () {
+    try {
+      return ready.apply(hook, arguments);
+    } finally {
+      readyCtl.resolve();
+    }
+  }
+})();
+
+/**
+ * A promise that resolves when hooks are ready.
+ * @type {Promise}
+ */
+export const ready = readyCtl.promise;
+
 export const getHook = hook.get;
 
 export function setupBeforeHookFnOnce(baseFn, hookFn, priority = 15) {
@@ -13,16 +31,31 @@ export function setupBeforeHookFnOnce(baseFn, hookFn, priority = 15) {
     baseFn.before(hookFn, priority);
   }
 }
+const submoduleInstallMap = {};
 
-export function module(name, install) {
+export function module(name, install, {postInstallAllowed = false} = {}) {
   hook('async', function (submodules) {
     submodules.forEach(args => install(...args));
+    if (postInstallAllowed) submoduleInstallMap[name] = install;
   }, name)([]); // will be queued until hook.ready() called in pbjs.processQueue();
 }
 
 export function submodule(name, ...args) {
+  const install = submoduleInstallMap[name];
+  if (install) return install(...args);
   getHook(name).before((next, modules) => {
     modules.push(args);
     next(modules);
   });
 }
+
+/**
+ * Copy hook methods (.before, .after, etc) from a given hook to a given wrapper object.
+ */
+export function wrapHook(hook, wrapper) {
+  Object.defineProperties(
+    wrapper,
+    Object.fromEntries(['before', 'after', 'getHooks', 'removeAll'].map((m) => [m, {get: () => hook[m]}]))
+  );
+  return wrapper;
+}
diff --git a/src/native.js b/src/native.js
index e41d7740ffa..25f8c38cb30 100644
--- a/src/native.js
+++ b/src/native.js
@@ -1,7 +1,21 @@
-import { deepAccess, getBidRequest, getKeyByValue, insertHtmlIntoIframe, logError, triggerPixel } from './utils.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const CONSTANTS = require('./constants.json');
+import {
+  deepAccess,
+  deepClone,
+  getKeyByValue,
+  insertHtmlIntoIframe,
+  isArray,
+  isBoolean,
+  isInteger,
+  isNumber,
+  isPlainObject,
+  logError,
+  triggerPixel,
+  pick
+} from './utils.js';
+import {includes} from './polyfill.js';
+import {auctionManager} from './auctionManager.js';
+import CONSTANTS from './constants.json';
+import {NATIVE} from './mediaTypes.js';
 
 export const nativeAdapters = [];
 
@@ -9,7 +23,51 @@ export const NATIVE_TARGETING_KEYS = Object.keys(CONSTANTS.NATIVE_KEYS).map(
   key => CONSTANTS.NATIVE_KEYS[key]
 );
 
-const IMAGE = {
+export const IMAGE = {
+  ortb: {
+    ver: '1.2',
+    assets: [
+      {
+        required: 1,
+        id: 1,
+        img: {
+          type: 3,
+          wmin: 100,
+          hmin: 100,
+        }
+      },
+      {
+        required: 1,
+        id: 2,
+        title: {
+          len: 140,
+        }
+      },
+      {
+        required: 1,
+        id: 3,
+        data: {
+          type: 1,
+        }
+      },
+      {
+        required: 0,
+        id: 4,
+        data: {
+          type: 2,
+        }
+      },
+      {
+        required: 0,
+        id: 5,
+        img: {
+          type: 1,
+          wmin: 20,
+          hmin: 20,
+        }
+      },
+    ],
+  },
   image: { required: true },
   title: { required: true },
   sponsoredBy: { required: true },
@@ -22,6 +80,26 @@ const SUPPORTED_TYPES = {
   image: IMAGE
 };
 
+const { NATIVE_ASSET_TYPES, NATIVE_IMAGE_TYPES, PREBID_NATIVE_DATA_KEYS_TO_ORTB, NATIVE_KEYS_THAT_ARE_NOT_ASSETS, NATIVE_KEYS } = CONSTANTS;
+
+// inverse native maps useful for converting to legacy
+const PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE = inverse(PREBID_NATIVE_DATA_KEYS_TO_ORTB);
+const NATIVE_ASSET_TYPES_INVERSE = inverse(NATIVE_ASSET_TYPES);
+
+const TRACKER_METHODS = {
+  img: 1,
+  js: 2,
+  1: 'img',
+  2: 'js'
+}
+
+const TRACKER_EVENTS = {
+  impression: 1,
+  'viewable-mrc50': 2,
+  'viewable-mrc100': 3,
+  'viewable-video50': 4,
+}
+
 /**
  * Recieves nativeParams from an adUnit. If the params were not of type 'type',
  * passes them on directly. If they were of type 'type', translate
@@ -29,12 +107,83 @@ const SUPPORTED_TYPES = {
  */
 export function processNativeAdUnitParams(params) {
   if (params && params.type && typeIsSupported(params.type)) {
-    return SUPPORTED_TYPES[params.type];
+    params = SUPPORTED_TYPES[params.type];
   }
 
+  if (params && params.ortb && !isOpenRTBBidRequestValid(params.ortb)) {
+    return;
+  }
   return params;
 }
 
+export function decorateAdUnitsWithNativeParams(adUnits) {
+  adUnits.forEach(adUnit => {
+    const nativeParams =
+      adUnit.nativeParams || deepAccess(adUnit, 'mediaTypes.native');
+    if (nativeParams) {
+      adUnit.nativeParams = processNativeAdUnitParams(nativeParams);
+    }
+    if (adUnit.nativeParams) {
+      adUnit.nativeOrtbRequest = adUnit.nativeParams.ortb || toOrtbNativeRequest(adUnit.nativeParams);
+    }
+  });
+}
+export function isOpenRTBBidRequestValid(ortb) {
+  const assets = ortb.assets;
+  if (!Array.isArray(assets) || assets.length === 0) {
+    logError(`assets in mediaTypes.native.ortb is not an array, or it's empty. Assets: `, assets);
+    return false;
+  }
+
+  // validate that ids exist, that they are unique and that they are numbers
+  const ids = assets.map(asset => asset.id);
+  if (assets.length !== new Set(ids).size || ids.some(id => id !== parseInt(id, 10))) {
+    logError(`each asset object must have 'id' property, it must be unique and it must be an integer`);
+    return false;
+  }
+
+  if (ortb.hasOwnProperty('eventtrackers') && !Array.isArray(ortb.eventtrackers)) {
+    logError('ortb.eventtrackers is not an array. Eventtrackers: ', ortb.eventtrackers);
+    return false;
+  }
+
+  return assets.every(asset => isOpenRTBAssetValid(asset))
+}
+
+function isOpenRTBAssetValid(asset) {
+  if (!isPlainObject(asset)) {
+    logError(`asset must be an object. Provided asset: `, asset);
+    return false;
+  }
+  if (asset.img) {
+    if (!isNumber(asset.img.w) && !isNumber(asset.img.wmin)) {
+      logError(`for img asset there must be 'w' or 'wmin' property`);
+      return false;
+    }
+    if (!isNumber(asset.img.h) && !isNumber(asset.img.hmin)) {
+      logError(`for img asset there must be 'h' or 'hmin' property`);
+      return false;
+    }
+  } else if (asset.title) {
+    if (!isNumber(asset.title.len)) {
+      logError(`for title asset there must be 'len' property defined`);
+      return false;
+    }
+  } else if (asset.data) {
+    if (!isNumber(asset.data.type)) {
+      logError(`for data asset 'type' property must be a number`);
+      return false;
+    }
+  } else if (asset.video) {
+    if (!Array.isArray(asset.video.mimes) || !Array.isArray(asset.video.protocols) ||
+      !isNumber(asset.video.minduration) || !isNumber(asset.video.maxduration)) {
+      logError('video asset is not properly configured');
+      return false;
+    }
+  }
+  return true;
+}
+
 /**
  * Check if the native type specified in the adUnit is supported by Prebid.
  */
@@ -68,40 +217,29 @@ export const hasNonNativeBidder = adUnit =>
  * @param {BidRequest[]} bidRequests All bid requests for an auction
  * @return {Boolean} If object is valid
  */
-export function nativeBidIsValid(bid, bidRequests) {
-  const bidRequest = getBidRequest(bid.requestId, bidRequests);
-  if (!bidRequest) { return false; }
+export function nativeBidIsValid(bid, {index = auctionManager.index} = {}) {
+  const adUnit = index.getAdUnit(bid);
+  if (!adUnit) { return false; }
+  let ortbRequest = adUnit.nativeOrtbRequest
+  let ortbResponse = bid.native?.ortb || toOrtbNativeResponse(bid.native, ortbRequest);
+  return isNativeOpenRTBBidValid(ortbResponse, ortbRequest);
+}
 
-  // all native bid responses must define a landing page url
-  if (!deepAccess(bid, 'native.clickUrl')) {
+export function isNativeOpenRTBBidValid(bidORTB, bidRequestORTB) {
+  if (!deepAccess(bidORTB, 'link.url')) {
+    logError(`native response doesn't have 'link' property. Ortb response: `, bidORTB);
     return false;
   }
 
-  if (deepAccess(bid, 'native.image')) {
-    if (!deepAccess(bid, 'native.image.height') || !deepAccess(bid, 'native.image.width')) {
-      return false;
-    }
-  }
-
-  if (deepAccess(bid, 'native.icon')) {
-    if (!deepAccess(bid, 'native.icon.height') || !deepAccess(bid, 'native.icon.width')) {
-      return false;
-    }
-  }
+  let requiredAssetIds = bidRequestORTB.assets.filter(asset => asset.required === 1).map(a => a.id);
+  let returnedAssetIds = bidORTB.assets.map(asset => asset.id);
 
-  const requestedAssets = bidRequest.nativeParams;
-  if (!requestedAssets) {
-    return true;
+  const match = requiredAssetIds.every(assetId => includes(returnedAssetIds, assetId));
+  if (!match) {
+    logError(`didn't receive a bid with all required assets. Required ids: ${requiredAssetIds}, but received ids in response: ${returnedAssetIds}`);
   }
 
-  const requiredAssets = Object.keys(requestedAssets).filter(
-    key => requestedAssets[key].required
-  );
-  const returnedAssets = Object.keys(bid['native']).filter(
-    key => bid['native'][key]
-  );
-
-  return requiredAssets.every(asset => includes(returnedAssets, asset));
+  return match;
 }
 
 /*
@@ -130,20 +268,64 @@ export function nativeBidIsValid(bid, bidRequests) {
  *   fireTrackers(); // fires impressions when creative is loaded
  * </script>
  */
-export function fireNativeTrackers(message, adObject) {
-  let trackers;
+export function fireNativeTrackers(message, bidResponse) {
+  const nativeResponse = bidResponse.native.ortb || legacyPropertiesToOrtbNative(bidResponse.native);
+
   if (message.action === 'click') {
-    trackers = adObject['native'] && adObject['native'].clickTrackers;
+    fireClickTrackers(nativeResponse, message?.assetId);
   } else {
-    trackers = adObject['native'] && adObject['native'].impressionTrackers;
+    fireImpressionTrackers(nativeResponse);
+  }
+  return message.action;
+}
 
-    if (adObject['native'] && adObject['native'].javascriptTrackers) {
-      insertHtmlIntoIframe(adObject['native'].javascriptTrackers);
+export function fireImpressionTrackers(nativeResponse, {runMarkup = (mkup) => insertHtmlIntoIframe(mkup), fetchURL = triggerPixel} = {}) {
+  const impTrackers = (nativeResponse.eventtrackers || [])
+    .filter(tracker => tracker.event === TRACKER_EVENTS.impression);
+
+  let {img, js} = impTrackers.reduce((tally, tracker) => {
+    if (TRACKER_METHODS.hasOwnProperty(tracker.method)) {
+      tally[TRACKER_METHODS[tracker.method]].push(tracker.url)
     }
+    return tally;
+  }, {img: [], js: []});
+
+  if (nativeResponse.imptrackers) {
+    img = img.concat(nativeResponse.imptrackers);
   }
+  img.forEach(url => fetchURL(url));
 
-  (trackers || []).forEach(triggerPixel);
-  return message.action;
+  js = js.map(url => `<script async src="${url}"></script>`);
+  if (nativeResponse.jstracker) {
+    // jstracker is already HTML markup
+    js = js.concat([nativeResponse.jstracker]);
+  }
+  if (js.length) {
+    runMarkup(js.join('\n'));
+  }
+}
+
+export function fireClickTrackers(nativeResponse, assetId = null, {fetchURL = triggerPixel} = {}) {
+  // legacy click tracker
+  if (!assetId) {
+    (nativeResponse.link?.clicktrackers || []).forEach(url => fetchURL(url));
+  } else {
+    // ortb click tracker. This will try to call the clicktracker associated with the asset;
+    // will fallback to the link if none is found.
+    const assetIdLinkMap = (nativeResponse.assets || [])
+      .filter(a => a.link)
+      .reduce((map, asset) => {
+        map[asset.id] = asset.link;
+        return map
+      }, {});
+    const masterClickTrackers = nativeResponse.link?.clicktrackers || [];
+    let assetLink = assetIdLinkMap[assetId];
+    let clickTrackers = masterClickTrackers;
+    if (assetLink) {
+      clickTrackers = assetLink.clicktrackers || [];
+    }
+    clickTrackers.forEach(url => fetchURL(url));
+  }
 }
 
 /**
@@ -151,24 +333,51 @@ export function fireNativeTrackers(message, adObject) {
  * @param {Object} bid
  * @return {Object} targeting
  */
-export function getNativeTargeting(bid, bidReq) {
+export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
   let keyValues = {};
+  const adUnit = index.getAdUnit(bid);
+  if (deepAccess(adUnit, 'nativeParams.rendererUrl')) {
+    bid['native']['rendererUrl'] = getAssetValue(adUnit.nativeParams['rendererUrl']);
+  } else if (deepAccess(adUnit, 'nativeParams.adTemplate')) {
+    bid['native']['adTemplate'] = getAssetValue(adUnit.nativeParams['adTemplate']);
+  }
+
+  const globalSendTargetingKeys = deepAccess(
+    adUnit,
+    `nativeParams.sendTargetingKeys`
+  ) !== false;
 
-  Object.keys(bid['native']).forEach(asset => {
-    const key = CONSTANTS.NATIVE_KEYS[asset];
-    let value = getAssetValue(bid['native'][asset]);
+  const nativeKeys = getNativeKeys(adUnit);
 
-    const sendPlaceholder = deepAccess(
-      bidReq,
-      `mediaTypes.native.${asset}.sendId`
-    );
+  const flatBidNativeKeys = { ...bid.native, ...bid.native.ext };
+  delete flatBidNativeKeys.ext;
+
+  Object.keys(flatBidNativeKeys).forEach(asset => {
+    const key = nativeKeys[asset];
+    let value = getAssetValue(bid.native[asset]) || getAssetValue(deepAccess(bid, `native.ext.${asset}`));
+
+    if (asset === 'adTemplate' || !key || !value) {
+      return;
+    }
+
+    let sendPlaceholder = deepAccess(adUnit, `nativeParams.${asset}.sendId`);
+    if (typeof sendPlaceholder !== 'boolean') {
+      sendPlaceholder = deepAccess(adUnit, `nativeParams.ext.${asset}.sendId`);
+    }
 
     if (sendPlaceholder) {
       const placeholder = `${key}:${bid.adId}`;
       value = placeholder;
     }
 
-    if (key && value) {
+    let assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.${asset}.sendTargetingKeys`);
+    if (typeof assetSendTargetingKeys !== 'boolean') {
+      assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.ext.${asset}.sendTargetingKeys`);
+    }
+
+    const sendTargeting = typeof assetSendTargetingKeys === 'boolean' ? assetSendTargetingKeys : globalSendTargetingKeys;
+
+    if (sendTargeting) {
       keyValues[key] = value;
     }
   });
@@ -176,35 +385,406 @@ export function getNativeTargeting(bid, bidReq) {
   return keyValues;
 }
 
-/**
- * Constructs a message object containing asset values for each of the
- * requested data keys.
- */
-export function getAssetMessage(data, adObject) {
+function assetsMessage(data, adObject, keys) {
   const message = {
     message: 'assetResponse',
     adId: data.adId,
-    assets: [],
   };
 
-  data.assets.forEach(asset => {
-    const key = getKeyByValue(CONSTANTS.NATIVE_KEYS, asset);
-    const value = getAssetValue(adObject.native[key]);
+  let nativeResp = adObject.native;
 
-    message.assets.push({ key, value });
+  if (adObject.native.ortb) {
+    message.ortb = adObject.native.ortb;
+  }
+  message.assets = [];
+
+  (keys == null ? Object.keys(nativeResp) : keys).forEach(function(key) {
+    if (key === 'adTemplate' && nativeResp[key]) {
+      message.adTemplate = getAssetValue(nativeResp[key]);
+    } else if (key === 'rendererUrl' && nativeResp[key]) {
+      message.rendererUrl = getAssetValue(nativeResp[key]);
+    } else if (key === 'ext') {
+      Object.keys(nativeResp[key]).forEach(extKey => {
+        if (nativeResp[key][extKey]) {
+          const value = getAssetValue(nativeResp[key][extKey]);
+          message.assets.push({ key: extKey, value });
+        }
+      })
+    } else if (nativeResp[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
+      const value = getAssetValue(nativeResp[key]);
+
+      message.assets.push({ key, value });
+    }
   });
-
   return message;
 }
 
+/**
+ * Constructs a message object containing asset values for each of the
+ * requested data keys.
+ */
+export function getAssetMessage(data, adObject) {
+  const keys = data.assets.map((k) => getKeyByValue(CONSTANTS.NATIVE_KEYS, k));
+  return assetsMessage(data, adObject, keys);
+}
+
+export function getAllAssetsMessage(data, adObject) {
+  return assetsMessage(data, adObject, null);
+}
+
 /**
  * Native assets can be a string or an object with a url prop. Returns the value
  * appropriate for sending in adserver targeting or placeholder replacement.
  */
 function getAssetValue(value) {
-  if (typeof value === 'object' && value.url) {
-    return value.url;
+  return value?.url || value;
+}
+
+function getNativeKeys(adUnit) {
+  const extraNativeKeys = {}
+
+  if (deepAccess(adUnit, 'nativeParams.ext')) {
+    Object.keys(adUnit.nativeParams.ext).forEach(extKey => {
+      extraNativeKeys[extKey] = `hb_native_${extKey}`;
+    })
+  }
+
+  return {
+    ...CONSTANTS.NATIVE_KEYS,
+    ...extraNativeKeys
+  }
+}
+
+/**
+ * converts Prebid legacy native assets request to OpenRTB format
+ * @param {object} legacyNativeAssets an object that describes a native bid request in Prebid proprietary format
+ * @returns an OpenRTB format of the same bid request
+ */
+export function toOrtbNativeRequest(legacyNativeAssets) {
+  if (!legacyNativeAssets && !isPlainObject(legacyNativeAssets)) {
+    logError('Native assets object is empty or not an object: ', legacyNativeAssets);
+    return;
+  }
+  const ortb = {
+    ver: '1.2',
+    assets: []
+  };
+  for (let key in legacyNativeAssets) {
+    // skip conversion for non-asset keys
+    if (NATIVE_KEYS_THAT_ARE_NOT_ASSETS.includes(key)) continue;
+    if (!NATIVE_KEYS.hasOwnProperty(key)) {
+      logError(`Unrecognized native asset code: ${key}. Asset will be ignored.`);
+      continue;
+    }
+
+    const asset = legacyNativeAssets[key];
+    let required = 0;
+    if (asset.required && isBoolean(asset.required)) {
+      required = Number(asset.required);
+    }
+    const ortbAsset = {
+      id: ortb.assets.length,
+      required
+    };
+    // data cases
+    if (key in PREBID_NATIVE_DATA_KEYS_TO_ORTB) {
+      ortbAsset.data = {
+        type: NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]]
+      }
+      if (asset.len) {
+        ortbAsset.data.len = asset.len;
+      }
+    // icon or image case
+    } else if (key === 'icon' || key === 'image') {
+      ortbAsset.img = {
+        type: key === 'icon' ? NATIVE_IMAGE_TYPES.ICON : NATIVE_IMAGE_TYPES.MAIN,
+      }
+      // if min_width and min_height are defined in aspect_ratio, they are preferred
+      if (asset.aspect_ratios) {
+        if (!isArray(asset.aspect_ratios)) {
+          logError("image.aspect_ratios was passed, but it's not a an array:", asset.aspect_ratios);
+        } else if (!asset.aspect_ratios.length) {
+          logError("image.aspect_ratios was passed, but it's empty:", asset.aspect_ratios);
+        } else {
+          const { min_width: minWidth, min_height: minHeight } = asset.aspect_ratios[0];
+          if (!isInteger(minWidth) || !isInteger(minHeight)) {
+            logError('image.aspect_ratios min_width or min_height are invalid: ', minWidth, minHeight);
+          } else {
+            ortbAsset.img.wmin = minWidth;
+            ortbAsset.img.hmin = minHeight;
+          }
+          const aspectRatios = asset.aspect_ratios
+            .filter((ar) => ar.ratio_width && ar.ratio_height)
+            .map(ratio => `${ratio.ratio_width}:${ratio.ratio_height}`);
+          if (aspectRatios.length > 0) {
+            ortbAsset.img.ext = {
+              aspectratios: aspectRatios
+            }
+          }
+        }
+      }
+
+      // if asset.sizes exist, by OpenRTB spec we should remove wmin and hmin
+      if (asset.sizes) {
+        if (asset.sizes.length !== 2 || !isInteger(asset.sizes[0]) || !isInteger(asset.sizes[1])) {
+          logError('image.sizes was passed, but its value is not an array of integers:', asset.sizes);
+        } else {
+          ortbAsset.img.w = asset.sizes[0];
+          ortbAsset.img.h = asset.sizes[1];
+          delete ortbAsset.img.hmin;
+          delete ortbAsset.img.wmin;
+        }
+      }
+    // title case
+    } else if (key === 'title') {
+      ortbAsset.title = {
+        // in openRTB, len is required for titles, while in legacy prebid was not.
+        // for this reason, if len is missing in legacy prebid, we're adding a default value of 140.
+        len: asset.len || 140
+      }
+    // all extensions to the native bid request are passed as is
+    } else if (key === 'ext') {
+      ortbAsset.ext = asset;
+      // in `ext` case, required field is not needed
+      delete ortbAsset.required;
+    }
+    ortb.assets.push(ortbAsset);
+  }
+  return ortb;
+}
+
+/**
+ * This function converts an OpenRTB native request object to Prebid proprietary
+ * format. The purpose of this function is to help adapters to handle the
+ * transition phase where publishers may be using OpenRTB objects but the
+ *  bidder does not yet support it.
+ * @param {object} openRTBRequest an OpenRTB v1.2 request object
+ * @returns a Prebid legacy native format request
+ */
+export function fromOrtbNativeRequest(openRTBRequest) {
+  if (!isOpenRTBBidRequestValid(openRTBRequest)) {
+    return;
+  }
+
+  const oldNativeObject = {};
+  for (const asset of openRTBRequest.assets) {
+    if (asset.title) {
+      const title = {
+        required: asset.required ? Boolean(asset.required) : false,
+        len: asset.title.len
+      }
+      oldNativeObject.title = title;
+    } else if (asset.img) {
+      const image = {
+        required: asset.required ? Boolean(asset.required) : false,
+      }
+      if (asset.img.w && asset.img.h) {
+        image.sizes = [asset.img.w, asset.img.h];
+      } else if (asset.img.wmin && asset.img.hmin) {
+        image.aspect_ratios = {
+          min_width: asset.img.wmin,
+          min_height: asset.img.hmin,
+          ratio_width: asset.img.wmin,
+          ratio_height: asset.img.hmin
+        }
+      }
+
+      if (asset.img.type === NATIVE_IMAGE_TYPES.MAIN) {
+        oldNativeObject.image = image;
+      } else {
+        oldNativeObject.icon = image;
+      }
+    } else if (asset.data) {
+      let assetType = Object.keys(NATIVE_ASSET_TYPES).find(k => NATIVE_ASSET_TYPES[k] === asset.data.type);
+      let prebidAssetName = Object.keys(PREBID_NATIVE_DATA_KEYS_TO_ORTB).find(k => PREBID_NATIVE_DATA_KEYS_TO_ORTB[k] === assetType);
+      oldNativeObject[prebidAssetName] = {
+        required: asset.required ? Boolean(asset.required) : false,
+      }
+      if (asset.data.len) {
+        oldNativeObject[prebidAssetName].len = asset.data.len;
+      }
+    }
+    // video was not supported by old prebid assets
+  }
+  return oldNativeObject;
+}
+
+/**
+ * Converts an OpenRTB request to a proprietary Prebid.js format.
+ * The proprietary Prebid format has many limitations and will be dropped in
+ * the future; adapters are encouraged to stop using it in favour of OpenRTB format.
+ * IMPLEMENTATION DETAILS: This function returns the same exact object if no
+ * conversion is needed. If a conversion is needed (meaning, at least one
+ * bidRequest contains a native.ortb definition), it will return a copy.
+ *
+ * @param {BidRequest[]} bidRequests an array of valid bid requests
+ * @returns an array of valid bid requests where the openRTB bids are converted to proprietary format.
+ */
+export function convertOrtbRequestToProprietaryNative(bidRequests) {
+  if (FEATURES.NATIVE) {
+    if (!bidRequests || !isArray(bidRequests)) return bidRequests;
+    // check if a conversion is needed
+    if (!bidRequests.some(bidRequest => (bidRequest?.mediaTypes || {})[NATIVE]?.ortb)) {
+      return bidRequests;
+    }
+    let bidRequestsCopy = deepClone(bidRequests);
+    // convert Native ORTB definition to old-style prebid native definition
+    for (const bidRequest of bidRequestsCopy) {
+      if (bidRequest.mediaTypes && bidRequest.mediaTypes[NATIVE] && bidRequest.mediaTypes[NATIVE].ortb) {
+        bidRequest.mediaTypes[NATIVE] = Object.assign(
+          pick(bidRequest.mediaTypes[NATIVE], NATIVE_KEYS_THAT_ARE_NOT_ASSETS),
+          fromOrtbNativeRequest(bidRequest.mediaTypes[NATIVE].ortb)
+        );
+        bidRequest.nativeParams = processNativeAdUnitParams(bidRequest.mediaTypes[NATIVE]);
+      }
+    }
+    return bidRequestsCopy;
+  }
+  return bidRequests;
+}
+
+/**
+ * convert PBJS proprietary native properties that are *not* assets to the ORTB native format.
+ *
+ * @param legacyNative `bidResponse.native` object as returned by adapters
+ */
+export function legacyPropertiesToOrtbNative(legacyNative) {
+  const response = {
+    link: {},
+    eventtrackers: []
+  }
+  Object.entries(legacyNative).forEach(([key, value]) => {
+    switch (key) {
+      case 'clickUrl':
+        response.link.url = value;
+        break;
+      case 'clickTrackers':
+        response.link.clicktrackers = Array.isArray(value) ? value : [value];
+        break;
+      case 'impressionTrackers':
+        (Array.isArray(value) ? value : [value]).forEach(url => {
+          response.eventtrackers.push({
+            event: TRACKER_EVENTS.impression,
+            method: TRACKER_METHODS.img,
+            url
+          });
+        });
+        break;
+      case 'javascriptTrackers':
+        // jstracker is deprecated, but we need to use it here since 'javascriptTrackers' is markup, not an url
+        // TODO: at the time of writing this, core expected javascriptTrackers to be a string (despite the name),
+        // but many adapters are passing an array. It's possible that some of them are, in fact, passing URLs and not markup
+        // in general, native trackers seem to be neglected and/or broken
+        response.jstracker = Array.isArray(value) ? value.join('') : value;
+        break;
+    }
+  })
+  return response;
+}
+
+export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
+  const ortbResponse = {
+    ...legacyPropertiesToOrtbNative(legacyResponse),
+    assets: []
+  };
+
+  function useRequestAsset(predicate, fn) {
+    let asset = ortbRequest.assets.find(predicate);
+    if (asset != null) {
+      asset = deepClone(asset);
+      fn(asset);
+      ortbResponse.assets.push(asset);
+    }
   }
 
-  return value;
+  Object.keys(legacyResponse).filter(key => !!legacyResponse[key]).forEach(key => {
+    const value = legacyResponse[key];
+    switch (key) {
+      // process titles
+      case 'title':
+        useRequestAsset(asset => asset.title != null, titleAsset => {
+          titleAsset.title = {
+            text: value
+          };
+        })
+        break;
+      case 'image':
+      case 'icon':
+        const imageType = key === 'image' ? NATIVE_IMAGE_TYPES.MAIN : NATIVE_IMAGE_TYPES.ICON;
+        useRequestAsset(asset => asset.img != null && asset.img.type === imageType, imageAsset => {
+          imageAsset.img = {
+            url: value
+          };
+        })
+        break;
+      default:
+        if (key in PREBID_NATIVE_DATA_KEYS_TO_ORTB) {
+          useRequestAsset(asset => asset.data != null && asset.data.type === NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]], dataAsset => {
+            dataAsset.data = {
+              value
+            };
+          })
+        }
+        break;
+    }
+  });
+  return ortbResponse;
+}
+
+/**
+ * Generates a legacy response from an ortb response. Useful during the transition period.
+ * @param {*} ortbResponse a standard ortb response object
+ * @param {*} ortbRequest the ortb request, useful to match ids.
+ * @returns an object containing the response in legacy native format: { title: "this is a title", image: ... }
+ */
+export function toLegacyResponse(ortbResponse, ortbRequest) {
+  const legacyResponse = {};
+  const requestAssets = ortbRequest?.assets || [];
+  legacyResponse.clickUrl = ortbResponse.link.url;
+  legacyResponse.privacyLink = ortbResponse.privacy;
+  for (const asset of ortbResponse?.assets || []) {
+    const requestAsset = requestAssets.find(reqAsset => asset.id === reqAsset.id);
+    if (asset.title) {
+      legacyResponse.title = asset.title.text;
+    } else if (asset.img) {
+      legacyResponse[requestAsset.img.type === NATIVE_IMAGE_TYPES.MAIN ? 'image' : 'icon'] = asset.img.url;
+    } else if (asset.data) {
+      legacyResponse[PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE[NATIVE_ASSET_TYPES_INVERSE[requestAsset.data.type]]] = asset.data.value;
+    }
+  }
+
+  // Handle trackers
+  legacyResponse.impressionTrackers = [];
+  let jsTrackers = [];
+
+  if (ortbRequest?.imptrackers) {
+    legacyResponse.impressionTrackers.push(...ortbRequest.imptrackers);
+  }
+  for (const eventTracker of ortbResponse?.eventtrackers || []) {
+    if (eventTracker.event === TRACKER_EVENTS.impression && eventTracker.method === TRACKER_METHODS.img) {
+      legacyResponse.impressionTrackers.push(eventTracker.url);
+    }
+    if (eventTracker.event === TRACKER_EVENTS.impression && eventTracker.method === TRACKER_METHODS.js) {
+      jsTrackers.push(eventTracker.url);
+    }
+  }
+
+  jsTrackers = jsTrackers.map(url => `<script async src="${url}"></script>`);
+  if (ortbResponse?.jstracker) { jsTrackers.push(ortbResponse.jstracker); }
+  if (jsTrackers.length) {
+    legacyResponse.javascriptTrackers = jsTrackers.join('\n');
+  }
+
+  return legacyResponse;
+}
+
+/**
+ * Inverts key-values of an object.
+ */
+function inverse(obj) {
+  var retobj = {};
+  for (var key in obj) {
+    retobj[obj[key]] = key;
+  }
+  return retobj;
 }
diff --git a/src/pbjsORTB.js b/src/pbjsORTB.js
new file mode 100644
index 00000000000..cc5c1c5bdd9
--- /dev/null
+++ b/src/pbjsORTB.js
@@ -0,0 +1,35 @@
+export const PROCESSOR_TYPES = ['request', 'imp', 'bidResponse', 'response'];
+export const PROCESSOR_DIALECTS = ['default', 'pbs'];
+export const [REQUEST, IMP, BID_RESPONSE, RESPONSE] = PROCESSOR_TYPES;
+export const [DEFAULT, PBS] = PROCESSOR_DIALECTS;
+
+const types = new Set(PROCESSOR_TYPES);
+
+export function processorRegistry() {
+  const processors = {};
+
+  return {
+    registerOrtbProcessor({type, name, fn, priority = 0, dialects = [DEFAULT]}) {
+      if (!types.has(type)) {
+        throw new Error(`ORTB processor type must be one of: ${PROCESSOR_TYPES.join(', ')}`)
+      }
+      dialects.forEach(dialect => {
+        if (!processors.hasOwnProperty(dialect)) {
+          processors[dialect] = {};
+        }
+        if (!processors[dialect].hasOwnProperty(type)) {
+          processors[dialect][type] = {};
+        }
+        processors[dialect][type][name] = {
+          priority,
+          fn
+        }
+      })
+    },
+    getProcessors(dialect) {
+      return processors[dialect] || {};
+    }
+  }
+}
+
+export const {registerOrtbProcessor, getProcessors} = processorRegistry();
diff --git a/src/polyfill.js b/src/polyfill.js
new file mode 100644
index 00000000000..183c2d46bf6
--- /dev/null
+++ b/src/polyfill.js
@@ -0,0 +1,18 @@
+// These stubs are here to help transition away from core-js polyfills for browsers we are no longer supporting.
+// You should not need these for new code; use stock JS instead!
+
+export function includes(target, elem, start) {
+  return (target && target.includes(elem, start)) || false;
+}
+
+export function arrayFrom() {
+  return Array.from.apply(Array, arguments);
+}
+
+export function find(arr, pred, thisArg) {
+  return arr && arr.find(pred, thisArg);
+}
+
+export function findIndex(arr, pred, thisArg) {
+  return arr && arr.findIndex(pred, thisArg);
+}
diff --git a/src/prebid.js b/src/prebid.js
index 1710849ba92..3fb131fb02c 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -1,29 +1,62 @@
 /** @module pbjs */
 
-import { getGlobal } from './prebidGlobal.js';
-import { flatten, uniques, isGptPubadsDefined, adUnitsFilter, isArrayOfNums } from './utils.js';
-import { listenMessagesFromCreative } from './secureCreatives.js';
-import { userSync } from './userSync.js';
-import { config } from './config.js';
-import { auctionManager } from './auctionManager.js';
-import { targeting } from './targeting.js';
-import { hook } from './hook.js';
-import { sessionLoader } from './debugging.js';
-import includes from 'core-js-pure/features/array/includes.js';
-import { adunitCounter } from './adUnits.js';
-import { isRendererRequired, executeRenderer } from './Renderer.js';
-import { createBid } from './bidfactory.js';
-import { storageCallbacks } from './storageManager.js';
+import {getGlobal} from './prebidGlobal.js';
+import {
+  adUnitsFilter,
+  bind,
+  callBurl,
+  contains,
+  createInvisibleIframe,
+  deepAccess,
+  deepClone,
+  deepSetValue,
+  flatten,
+  generateUUID,
+  getHighestCpm,
+  inIframe,
+  insertElement,
+  isArray,
+  isArrayOfNums,
+  isEmpty,
+  isFn,
+  isGptPubadsDefined,
+  isNumber,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  mergeDeep,
+  replaceAuctionPrice,
+  replaceClickThrough,
+  transformAdServerTargetingObj,
+  uniques,
+  unsupportedBidderMessage
+} from './utils.js';
+import {listenMessagesFromCreative} from './secureCreatives.js';
+import {userSync} from './userSync.js';
+import {config} from './config.js';
+import {auctionManager} from './auctionManager.js';
+import {isBidUsable, targeting} from './targeting.js';
+import {hook, wrapHook} from './hook.js';
+import {loadSession} from './debugging.js';
+import {includes} from './polyfill.js';
+import {adunitCounter} from './adUnits.js';
+import {executeRenderer, isRendererRequired} from './Renderer.js';
+import {createBid} from './bidfactory.js';
+import {storageCallbacks} from './storageManager.js';
+import {emitAdRenderFail, emitAdRenderSucceeded} from './adRendering.js';
+import {default as adapterManager, gdprDataHandler, getS2SBidderSet, gppDataHandler, uspDataHandler} from './adapterManager.js';
+import CONSTANTS from './constants.json';
+import * as events from './events.js';
+import {newMetrics, useMetrics} from './utils/perfMetrics.js';
+import {defer, GreedyPromise} from './utils/promise.js';
+import {enrichFPD} from './fpd/enrichment.js';
 
 const $$PREBID_GLOBAL$$ = getGlobal();
-const CONSTANTS = require('./constants.json');
-const utils = require('./utils.js');
-const adapterManager = require('./adapterManager.js').default;
-const events = require('./events.js');
 const { triggerUserSyncs } = userSync;
 
 /* private variables */
-const { ADD_AD_UNITS, BID_WON, REQUEST_BIDS, SET_TARGETING, AD_RENDER_FAILED } = CONSTANTS.EVENTS;
+const { ADD_AD_UNITS, BID_WON, REQUEST_BIDS, SET_TARGETING, STALE_RENDER } = CONSTANTS.EVENTS;
 const { PREVENT_WRITING_ON_MAIN_DOCUMENT, NO_AD, EXCEPTION, CANNOT_FIND_AD, MISSING_DOC_OR_ADID } = CONSTANTS.AD_RENDER_FAILED_REASON;
 
 const eventValidators = {
@@ -31,7 +64,7 @@ const eventValidators = {
 };
 
 // initialize existing debugging sessions if present
-sessionLoader();
+loadSession();
 
 /* Public vars */
 $$PREBID_GLOBAL$$.bidderSettings = $$PREBID_GLOBAL$$.bidderSettings || {};
@@ -41,7 +74,9 @@ $$PREBID_GLOBAL$$.libLoaded = true;
 
 // version auto generated from build
 $$PREBID_GLOBAL$$.version = 'v$prebid.version$';
-utils.logInfo('Prebid.js v$prebid.version$ loaded');
+logInfo('Prebid.js v$prebid.version$ loaded');
+
+$$PREBID_GLOBAL$$.installedModules = $$PREBID_GLOBAL$$.installedModules || [];
 
 // create adUnit array
 $$PREBID_GLOBAL$$.adUnits = $$PREBID_GLOBAL$$.adUnits || [];
@@ -54,8 +89,8 @@ function checkDefinedPlacement(id) {
     .reduce(flatten)
     .filter(uniques);
 
-  if (!utils.contains(adUnitCodes, id)) {
-    utils.logError('The "' + id + '" placement is not defined.');
+  if (!contains(adUnitCodes, id)) {
+    logError('The "' + id + '" placement is not defined.');
     return;
   }
 
@@ -71,7 +106,7 @@ function setRenderSize(doc, width, height) {
 
 function validateSizes(sizes, targLength) {
   let cleanSizes = [];
-  if (utils.isArray(sizes) && ((targLength) ? sizes.length === targLength : sizes.length > 0)) {
+  if (isArray(sizes) && ((targLength) ? sizes.length === targLength : sizes.length > 0)) {
     // check if an array of arrays or array of numbers
     if (sizes.every(sz => isArrayOfNums(sz, 2))) {
       cleanSizes = sizes;
@@ -83,83 +118,151 @@ function validateSizes(sizes, targLength) {
 }
 
 function validateBannerMediaType(adUnit) {
-  const banner = adUnit.mediaTypes.banner;
+  const validatedAdUnit = deepClone(adUnit);
+  const banner = validatedAdUnit.mediaTypes.banner;
   const bannerSizes = validateSizes(banner.sizes);
   if (bannerSizes.length > 0) {
     banner.sizes = bannerSizes;
     // Deprecation Warning: This property will be deprecated in next release in favor of adUnit.mediaTypes.banner.sizes
-    adUnit.sizes = bannerSizes;
+    validatedAdUnit.sizes = bannerSizes;
   } else {
-    utils.logError('Detected a mediaTypes.banner object without a proper sizes field.  Please ensure the sizes are listed like: [[300, 250], ...].  Removing invalid mediaTypes.banner object from request.');
-    delete adUnit.mediaTypes.banner
+    logError('Detected a mediaTypes.banner object without a proper sizes field.  Please ensure the sizes are listed like: [[300, 250], ...].  Removing invalid mediaTypes.banner object from request.');
+    delete validatedAdUnit.mediaTypes.banner
   }
+  return validatedAdUnit;
 }
 
 function validateVideoMediaType(adUnit) {
-  const video = adUnit.mediaTypes.video;
-  let tarPlayerSizeLen = (typeof video.playerSize[0] === 'number') ? 2 : 1;
-
-  const videoSizes = validateSizes(video.playerSize, tarPlayerSizeLen);
-  if (videoSizes.length > 0) {
-    if (tarPlayerSizeLen === 2) {
-      utils.logInfo('Transforming video.playerSize from [640,480] to [[640,480]] so it\'s in the proper format.');
+  const validatedAdUnit = deepClone(adUnit);
+  const video = validatedAdUnit.mediaTypes.video;
+  if (video.playerSize) {
+    let tarPlayerSizeLen = (typeof video.playerSize[0] === 'number') ? 2 : 1;
+
+    const videoSizes = validateSizes(video.playerSize, tarPlayerSizeLen);
+    if (videoSizes.length > 0) {
+      if (tarPlayerSizeLen === 2) {
+        logInfo('Transforming video.playerSize from [640,480] to [[640,480]] so it\'s in the proper format.');
+      }
+      video.playerSize = videoSizes;
+      // Deprecation Warning: This property will be deprecated in next release in favor of adUnit.mediaTypes.video.playerSize
+      validatedAdUnit.sizes = videoSizes;
+    } else {
+      logError('Detected incorrect configuration of mediaTypes.video.playerSize.  Please specify only one set of dimensions in a format like: [[640, 480]]. Removing invalid mediaTypes.video.playerSize property from request.');
+      delete validatedAdUnit.mediaTypes.video.playerSize;
     }
-    video.playerSize = videoSizes;
-    // Deprecation Warning: This property will be deprecated in next release in favor of adUnit.mediaTypes.video.playerSize
-    adUnit.sizes = videoSizes;
-  } else {
-    utils.logError('Detected incorrect configuration of mediaTypes.video.playerSize.  Please specify only one set of dimensions in a format like: [[640, 480]]. Removing invalid mediaTypes.video.playerSize property from request.');
-    delete adUnit.mediaTypes.video.playerSize;
   }
+  return validatedAdUnit;
 }
 
 function validateNativeMediaType(adUnit) {
-  const native = adUnit.mediaTypes.native;
+  const validatedAdUnit = deepClone(adUnit);
+  const native = validatedAdUnit.mediaTypes.native;
+  // if native assets are specified in OpenRTB format, remove legacy assets and print a warn.
+  if (native.ortb) {
+    const legacyNativeKeys = Object.keys(CONSTANTS.NATIVE_KEYS).filter(key => CONSTANTS.NATIVE_KEYS[key].includes('hb_native_'));
+    const nativeKeys = Object.keys(native);
+    const intersection = nativeKeys.filter(nativeKey => legacyNativeKeys.includes(nativeKey));
+    if (intersection.length > 0) {
+      logError(`when using native OpenRTB format, you cannot use legacy native properties. Deleting ${intersection} keys from request.`);
+      intersection.forEach(legacyKey => delete validatedAdUnit.mediaTypes.native[legacyKey]);
+    }
+  }
   if (native.image && native.image.sizes && !Array.isArray(native.image.sizes)) {
-    utils.logError('Please use an array of sizes for native.image.sizes field.  Removing invalid mediaTypes.native.image.sizes property from request.');
-    delete adUnit.mediaTypes.native.image.sizes;
+    logError('Please use an array of sizes for native.image.sizes field.  Removing invalid mediaTypes.native.image.sizes property from request.');
+    delete validatedAdUnit.mediaTypes.native.image.sizes;
   }
   if (native.image && native.image.aspect_ratios && !Array.isArray(native.image.aspect_ratios)) {
-    utils.logError('Please use an array of sizes for native.image.aspect_ratios field.  Removing invalid mediaTypes.native.image.aspect_ratios property from request.');
-    delete adUnit.mediaTypes.native.image.aspect_ratios;
+    logError('Please use an array of sizes for native.image.aspect_ratios field.  Removing invalid mediaTypes.native.image.aspect_ratios property from request.');
+    delete validatedAdUnit.mediaTypes.native.image.aspect_ratios;
   }
   if (native.icon && native.icon.sizes && !Array.isArray(native.icon.sizes)) {
-    utils.logError('Please use an array of sizes for native.icon.sizes field.  Removing invalid mediaTypes.native.icon.sizes property from request.');
-    delete adUnit.mediaTypes.native.icon.sizes;
+    logError('Please use an array of sizes for native.icon.sizes field.  Removing invalid mediaTypes.native.icon.sizes property from request.');
+    delete validatedAdUnit.mediaTypes.native.icon.sizes;
   }
+  return validatedAdUnit;
+}
+
+function validateAdUnitPos(adUnit, mediaType) {
+  let pos = deepAccess(adUnit, `mediaTypes.${mediaType}.pos`);
+
+  if (!isNumber(pos) || isNaN(pos) || !isFinite(pos)) {
+    let warning = `Value of property 'pos' on ad unit ${adUnit.code} should be of type: Number`;
+
+    logWarn(warning);
+    events.emit(CONSTANTS.EVENTS.AUCTION_DEBUG, {type: 'WARNING', arguments: warning});
+    delete adUnit.mediaTypes[mediaType].pos;
+  }
+
+  return adUnit
+}
+
+function validateAdUnit(adUnit) {
+  const msg = (msg) => `adUnit.code '${adUnit.code}' ${msg}`;
+
+  const mediaTypes = adUnit.mediaTypes;
+  const bids = adUnit.bids;
+
+  if (bids != null && !isArray(bids)) {
+    logError(msg(`defines 'adUnit.bids' that is not an array. Removing adUnit from auction`));
+    return null;
+  }
+  if (bids == null && adUnit.ortb2Imp == null) {
+    logError(msg(`has no 'adUnit.bids' and no 'adUnit.ortb2Imp'. Removing adUnit from auction`));
+    return null;
+  }
+  if (!mediaTypes || Object.keys(mediaTypes).length === 0) {
+    logError(msg(`does not define a 'mediaTypes' object.  This is a required field for the auction, so this adUnit has been removed.`));
+    return null;
+  }
+  if (adUnit.ortb2Imp != null && (bids == null || bids.length === 0)) {
+    adUnit.bids = [{bidder: null}]; // the 'null' bidder is treated as an s2s-only placeholder by adapterManager
+    logMessage(msg(`defines 'adUnit.ortb2Imp' with no 'adUnit.bids'; it will be seen only by S2S adapters`));
+  }
+
+  return adUnit;
 }
 
 export const adUnitSetupChecks = {
+  validateAdUnit,
   validateBannerMediaType,
   validateVideoMediaType,
-  validateNativeMediaType,
   validateSizes
 };
 
+if (FEATURES.NATIVE) {
+  Object.assign(adUnitSetupChecks, {validateNativeMediaType});
+}
+
 export const checkAdUnitSetup = hook('sync', function (adUnits) {
-  return adUnits.filter(adUnit => {
+  const validatedAdUnits = [];
+
+  adUnits.forEach(adUnit => {
+    adUnit = validateAdUnit(adUnit);
+    if (adUnit == null) return;
+
     const mediaTypes = adUnit.mediaTypes;
-    if (!mediaTypes || Object.keys(mediaTypes).length === 0) {
-      utils.logError(`Detected adUnit.code '${adUnit.code}' did not have a 'mediaTypes' object defined.  This is a required field for the auction, so this adUnit has been removed.`);
-      return false;
-    }
+    let validatedBanner, validatedVideo, validatedNative;
 
     if (mediaTypes.banner) {
-      validateBannerMediaType(adUnit);
+      validatedBanner = validateBannerMediaType(adUnit);
+      if (mediaTypes.banner.hasOwnProperty('pos')) validatedBanner = validateAdUnitPos(validatedBanner, 'banner');
     }
 
     if (mediaTypes.video) {
-      const video = mediaTypes.video;
-      if (video.playerSize) {
-        validateVideoMediaType(adUnit);
-      }
+      validatedVideo = validatedBanner ? validateVideoMediaType(validatedBanner) : validateVideoMediaType(adUnit);
+      if (mediaTypes.video.hasOwnProperty('pos')) validatedVideo = validateAdUnitPos(validatedVideo, 'video');
     }
 
-    if (mediaTypes.native) {
-      validateNativeMediaType(adUnit);
+    if (FEATURES.NATIVE && mediaTypes.native) {
+      validatedNative = validatedVideo ? validateNativeMediaType(validatedVideo) : validatedBanner ? validateNativeMediaType(validatedBanner) : validateNativeMediaType(adUnit);
     }
-    return true;
+
+    const validatedAdUnit = Object.assign({}, validatedBanner, validatedVideo, validatedNative);
+
+    validatedAdUnits.push(validatedAdUnit);
   });
+
+  return validatedAdUnits;
 }, 'checkAdUnitSetup');
 
 /// ///////////////////////////////
@@ -175,14 +278,31 @@ export const checkAdUnitSetup = hook('sync', function (adUnits) {
  * @return {Array}  returnObj return bids array
  */
 $$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCodeStr = function (adunitCode) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCodeStr', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCodeStr', arguments);
 
   // call to retrieve bids array
   if (adunitCode) {
     var res = $$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCode(adunitCode);
-    return utils.transformAdServerTargetingObj(res);
+    return transformAdServerTargetingObj(res);
+  } else {
+    logMessage('Need to call getAdserverTargetingForAdUnitCodeStr with adunitCode');
+  }
+};
+
+/**
+ * This function returns the query string targeting parameters available at this moment for a given ad unit. Note that some bidder's response may not have been received if you call this function too quickly after the requests are sent.
+ * @param adUnitCode {string} adUnitCode to get the bid responses for
+ * @alias module:pbjs.getHighestUnusedBidResponseForAdUnitCode
+ * @returns {Object}  returnObj return bid
+ */
+$$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode = function (adunitCode) {
+  if (adunitCode) {
+    const bid = auctionManager.getAllBidsForAdUnitCode(adunitCode)
+      .filter(isBidUsable)
+
+    return bid.length ? bid.reduce(getHighestCpm) : {}
   } else {
-    utils.logMessage('Need to call getAdserverTargetingForAdUnitCodeStr with adunitCode');
+    logMessage('Need to call getHighestUnusedBidResponseForAdUnitCode with adunitCode');
   }
 };
 
@@ -192,7 +312,7 @@ $$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCodeStr = function (adunitCode) {
  * @alias module:pbjs.getAdserverTargetingForAdUnitCode
  * @returns {Object}  returnObj return bids
  */
-$$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCode = function(adUnitCode) {
+$$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCode = function (adUnitCode) {
   return $$PREBID_GLOBAL$$.getAdserverTargeting(adUnitCode)[adUnitCode];
 };
 
@@ -203,13 +323,32 @@ $$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCode = function(adUnitCode) {
  */
 
 $$PREBID_GLOBAL$$.getAdserverTargeting = function (adUnitCode) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.getAdserverTargeting', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.getAdserverTargeting', arguments);
   return targeting.getAllTargeting(adUnitCode);
 };
 
+/**
+ * returns all consent data
+ * @return {Object} Map of consent types and data
+ * @alias module:pbjs.getConsentData
+ */
+function getConsentMetadata() {
+  return {
+    gdpr: gdprDataHandler.getConsentMeta(),
+    usp: uspDataHandler.getConsentMeta(),
+    gpp: gppDataHandler.getConsentMeta(),
+    coppa: !!(config.getConfig('coppa'))
+  }
+}
+
+$$PREBID_GLOBAL$$.getConsentMetadata = function () {
+  logInfo('Invoking $$PREBID_GLOBAL$$.getConsentMetadata');
+  return getConsentMetadata();
+};
+
 function getBids(type) {
   const responses = auctionManager[type]()
-    .filter(utils.bind.call(adUnitsFilter, this, auctionManager.getAdUnitCodes()));
+    .filter(bind.call(adUnitsFilter, this, auctionManager.getAdUnitCodes()));
 
   // find the last auction id to get responses for most recent auction only
   const currentAuctionId = auctionManager.getLastAuctionId();
@@ -234,10 +373,22 @@ function getBids(type) {
  */
 
 $$PREBID_GLOBAL$$.getNoBids = function () {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.getNoBids', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.getNoBids', arguments);
   return getBids('getNoBids');
 };
 
+/**
+ * This function returns the bids requests involved in an auction but not bid on or the specified adUnitCode
+ * @param  {string} adUnitCode adUnitCode
+ * @alias module:pbjs.getNoBidsForAdUnitCode
+ * @return {Object}           bidResponse object
+ */
+
+$$PREBID_GLOBAL$$.getNoBidsForAdUnitCode = function (adUnitCode) {
+  const bids = auctionManager.getNoBids().filter(bid => bid.adUnitCode === adUnitCode);
+  return { bids };
+};
+
 /**
  * This function returns the bid responses at the given moment.
  * @alias module:pbjs.getBidResponses
@@ -245,7 +396,7 @@ $$PREBID_GLOBAL$$.getNoBids = function () {
  */
 
 $$PREBID_GLOBAL$$.getBidResponses = function () {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.getBidResponses', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.getBidResponses', arguments);
   return getBids('getBidsReceived');
 };
 
@@ -268,9 +419,9 @@ $$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode = function (adUnitCode) {
  * @alias module:pbjs.setTargetingForGPTAsync
  */
 $$PREBID_GLOBAL$$.setTargetingForGPTAsync = function (adUnit, customSlotMatching) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.setTargetingForGPTAsync', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.setTargetingForGPTAsync', arguments);
   if (!isGptPubadsDefined()) {
-    utils.logError('window.googletag is not defined on the page');
+    logError('window.googletag is not defined on the page');
     return;
   }
 
@@ -300,10 +451,10 @@ $$PREBID_GLOBAL$$.setTargetingForGPTAsync = function (adUnit, customSlotMatching
  * @param  {(string|string[])} adUnitCode adUnitCode or array of adUnitCodes
  * @alias module:pbjs.setTargetingForAst
  */
-$$PREBID_GLOBAL$$.setTargetingForAst = function(adUnitCodes) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.setTargetingForAn', arguments);
+$$PREBID_GLOBAL$$.setTargetingForAst = function (adUnitCodes) {
+  logInfo('Invoking $$PREBID_GLOBAL$$.setTargetingForAn', arguments);
   if (!targeting.isApntagDefined()) {
-    utils.logError('window.apntag is not defined on the page');
+    logError('window.apntag is not defined on the page');
     return;
   }
 
@@ -313,93 +464,125 @@ $$PREBID_GLOBAL$$.setTargetingForAst = function(adUnitCodes) {
   events.emit(SET_TARGETING, targeting.getAllTargeting());
 };
 
-function emitAdRenderFail({ reason, message, bid, id }) {
-  const data = { reason, message };
-  if (bid) data.bid = bid;
-  if (id) data.adId = id;
-
-  utils.logError(message);
-  events.emit(AD_RENDER_FAILED, data);
+/**
+ * This function will check for presence of given node in given parent. If not present - will inject it.
+ * @param {Node} node node, whose existance is in question
+ * @param {Document} doc document element do look in
+ * @param {string} tagName tag name to look in
+ */
+function reinjectNodeIfRemoved(node, doc, tagName) {
+  const injectionNode = doc.querySelector(tagName);
+  if (!node.parentNode || node.parentNode !== injectionNode) {
+    insertElement(node, doc, tagName);
+  }
 }
 
 /**
  * This function will render the ad (based on params) in the given iframe document passed through.
  * Note that doc SHOULD NOT be the parent document page as we can't doc.write() asynchronously
- * @param  {HTMLDocument} doc document
+ * @param  {Document} doc document
  * @param  {string} id bid id to locate the ad
  * @alias module:pbjs.renderAd
  */
-$$PREBID_GLOBAL$$.renderAd = function (doc, id) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.renderAd', arguments);
-  utils.logMessage('Calling renderAd with adId :' + id);
+$$PREBID_GLOBAL$$.renderAd = hook('async', function (doc, id, options) {
+  logInfo('Invoking $$PREBID_GLOBAL$$.renderAd', arguments);
+  logMessage('Calling renderAd with adId :' + id);
 
-  if (doc && id) {
-    try {
-      // lookup ad by ad Id
-      const bid = auctionManager.findBidByAdId(id);
-      if (bid) {
-        // replace macros according to openRTB with price paid = bid.cpm
-        bid.ad = utils.replaceAuctionPrice(bid.ad, bid.cpm);
-        bid.adUrl = utils.replaceAuctionPrice(bid.adUrl, bid.cpm);
-        // save winning bids
-        auctionManager.addWinningBid(bid);
-
-        // emit 'bid won' event here
-        events.emit(BID_WON, bid);
-
-        const { height, width, ad, mediaType, adUrl, renderer } = bid;
-
-        const creativeComment = document.createComment(`Creative ${bid.creativeId} served by ${bid.bidder} Prebid.js Header Bidding`);
-        utils.insertElement(creativeComment, doc, 'body');
-
-        if (isRendererRequired(renderer)) {
-          executeRenderer(renderer, bid);
-        } else if ((doc === document && !utils.inIframe()) || mediaType === 'video') {
-          const message = `Error trying to write ad. Ad render call ad id ${id} was prevented from writing to the main document.`;
-          emitAdRenderFail({ reason: PREVENT_WRITING_ON_MAIN_DOCUMENT, message, bid, id });
-        } else if (ad) {
-          // will check if browser is firefox and below version 67, if so execute special doc.open()
-          // for details see: https://github.com/prebid/Prebid.js/pull/3524
-          // TODO remove this browser specific code at later date (when Firefox < 67 usage is mostly gone)
-          if (navigator.userAgent && navigator.userAgent.toLowerCase().indexOf('firefox/') > -1) {
-            const firefoxVerRegx = /firefox\/([\d\.]+)/;
-            let firefoxVer = navigator.userAgent.toLowerCase().match(firefoxVerRegx)[1]; // grabs the text in the 1st matching group
-            if (firefoxVer && parseInt(firefoxVer, 10) < 67) {
-              doc.open('text/html', 'replace');
-            }
-          }
-          doc.write(ad);
-          doc.close();
-          setRenderSize(doc, width, height);
-          utils.callBurl(bid);
-        } else if (adUrl) {
-          const iframe = utils.createInvisibleIframe();
-          iframe.height = height;
-          iframe.width = width;
-          iframe.style.display = 'inline';
-          iframe.style.overflow = 'hidden';
-          iframe.src = adUrl;
-
-          utils.insertElement(iframe, doc, 'body');
-          setRenderSize(doc, width, height);
-          utils.callBurl(bid);
-        } else {
-          const message = `Error trying to write ad. No ad for bid response id: ${id}`;
-          emitAdRenderFail({ reason: NO_AD, message, bid, id });
-        }
-      } else {
-        const message = `Error trying to write ad. Cannot find ad by given id : ${id}`;
-        emitAdRenderFail({ reason: CANNOT_FIND_AD, message, id });
+  if (!id) {
+    const message = `Error trying to write ad Id :${id} to the page. Missing adId`;
+    emitAdRenderFail({ reason: MISSING_DOC_OR_ADID, message, id });
+    return;
+  }
+
+  try {
+    // lookup ad by ad Id
+    const bid = auctionManager.findBidByAdId(id);
+    if (!bid) {
+      const message = `Error trying to write ad. Cannot find ad by given id : ${id}`;
+      emitAdRenderFail({ reason: CANNOT_FIND_AD, message, id });
+      return;
+    }
+
+    if (bid.status === CONSTANTS.BID_STATUS.RENDERED) {
+      logWarn(`Ad id ${bid.adId} has been rendered before`);
+      events.emit(STALE_RENDER, bid);
+      if (deepAccess(config.getConfig('auctionOptions'), 'suppressStaleRender')) {
+        return;
       }
-    } catch (e) {
-      const message = `Error trying to write ad Id :${id} to the page:${e.message}`;
-      emitAdRenderFail({ reason: EXCEPTION, message, id });
     }
-  } else {
-    const message = `Error trying to write ad Id :${id} to the page. Missing document or adId`;
-    emitAdRenderFail({ reason: MISSING_DOC_OR_ADID, message, id });
+
+    // replace macros according to openRTB with price paid = bid.cpm
+    bid.ad = replaceAuctionPrice(bid.ad, bid.originalCpm || bid.cpm);
+    bid.adUrl = replaceAuctionPrice(bid.adUrl, bid.originalCpm || bid.cpm);
+    // replacing clickthrough if submitted
+    if (options && options.clickThrough) {
+      const {clickThrough} = options;
+      bid.ad = replaceClickThrough(bid.ad, clickThrough);
+      bid.adUrl = replaceClickThrough(bid.adUrl, clickThrough);
+    }
+
+    // save winning bids
+    auctionManager.addWinningBid(bid);
+
+    // emit 'bid won' event here
+    events.emit(BID_WON, bid);
+
+    const {height, width, ad, mediaType, adUrl, renderer} = bid;
+
+    // video module
+    const adUnitCode = bid.adUnitCode;
+    const adUnit = $$PREBID_GLOBAL$$.adUnits.filter(adUnit => adUnit.code === adUnitCode);
+    const videoModule = $$PREBID_GLOBAL$$.videoModule;
+    if (adUnit.video && videoModule) {
+      videoModule.renderBid(adUnit.video.divId, bid);
+      return;
+    }
+
+    if (!doc) {
+      const message = `Error trying to write ad Id :${id} to the page. Missing document`;
+      emitAdRenderFail({ reason: MISSING_DOC_OR_ADID, message, id });
+      return;
+    }
+
+    const creativeComment = document.createComment(`Creative ${bid.creativeId} served by ${bid.bidder} Prebid.js Header Bidding`);
+    insertElement(creativeComment, doc, 'html');
+
+    if (isRendererRequired(renderer)) {
+      executeRenderer(renderer, bid, doc);
+      reinjectNodeIfRemoved(creativeComment, doc, 'html');
+      emitAdRenderSucceeded({ doc, bid, id });
+    } else if ((doc === document && !inIframe()) || mediaType === 'video') {
+      const message = `Error trying to write ad. Ad render call ad id ${id} was prevented from writing to the main document.`;
+      emitAdRenderFail({reason: PREVENT_WRITING_ON_MAIN_DOCUMENT, message, bid, id});
+    } else if (ad) {
+      doc.write(ad);
+      doc.close();
+      setRenderSize(doc, width, height);
+      reinjectNodeIfRemoved(creativeComment, doc, 'html');
+      callBurl(bid);
+      emitAdRenderSucceeded({ doc, bid, id });
+    } else if (adUrl) {
+      const iframe = createInvisibleIframe();
+      iframe.height = height;
+      iframe.width = width;
+      iframe.style.display = 'inline';
+      iframe.style.overflow = 'hidden';
+      iframe.src = adUrl;
+
+      insertElement(iframe, doc, 'body');
+      setRenderSize(doc, width, height);
+      reinjectNodeIfRemoved(creativeComment, doc, 'html');
+      callBurl(bid);
+      emitAdRenderSucceeded({ doc, bid, id });
+    } else {
+      const message = `Error trying to write ad. No ad for bid response id: ${id}`;
+      emitAdRenderFail({reason: NO_AD, message, bid, id});
+    }
+  } catch (e) {
+    const message = `Error trying to write ad Id :${id} to the page:${e.message}`;
+    emitAdRenderFail({ reason: EXCEPTION, message, id });
   }
-};
+});
 
 /**
  * Remove adUnit from the $$PREBID_GLOBAL$$ configuration, if there are no addUnitCode(s) it will remove all
@@ -407,7 +590,7 @@ $$PREBID_GLOBAL$$.renderAd = function (doc, id) {
  * @alias module:pbjs.removeAdUnit
  */
 $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.removeAdUnit', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.removeAdUnit', arguments);
 
   if (!adUnitCode) {
     $$PREBID_GLOBAL$$.adUnits = [];
@@ -416,7 +599,7 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
 
   let adUnitCodes;
 
-  if (utils.isArray(adUnitCode)) {
+  if (isArray(adUnitCode)) {
     adUnitCodes = adUnitCode;
   } else {
     adUnitCodes = [adUnitCode];
@@ -441,23 +624,61 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
  * @param {String} requestOptions.auctionId
  * @alias module:pbjs.requestBids
  */
-$$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId } = {}) {
-  events.emit(REQUEST_BIDS);
-  const cbTimeout = timeout || config.getConfig('bidderTimeout');
-  adUnits = adUnits || $$PREBID_GLOBAL$$.adUnits;
+$$PREBID_GLOBAL$$.requestBids = (function() {
+  const delegate = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2, metrics, defer } = {}) {
+    events.emit(REQUEST_BIDS);
+    const cbTimeout = timeout || config.getConfig('bidderTimeout');
+    logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
+    if (adUnitCodes && adUnitCodes.length) {
+      // if specific adUnitCodes supplied filter adUnits for those codes
+      adUnits = adUnits.filter(unit => includes(adUnitCodes, unit.code));
+    } else {
+      // otherwise derive adUnitCodes from adUnits
+      adUnitCodes = adUnits && adUnits.map(unit => unit.code);
+    }
+    const ortb2Fragments = {
+      global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
+      bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
+    }
+    return enrichFPD(GreedyPromise.resolve(ortb2Fragments.global)).then(global => {
+      ortb2Fragments.global = global;
+      return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2Fragments, metrics, defer});
+    })
+  }, 'requestBids');
+
+  return wrapHook(delegate, function requestBids(req = {}) {
+    // unlike the main body of `delegate`, this runs before any other hook has a chance to;
+    // it's also not restricted in its return value in the way `async` hooks are.
+
+    // if the request does not specify adUnits, clone the global adUnit array;
+    // otherwise, if the caller goes on to use addAdUnits/removeAdUnits, any asynchronous logic
+    // in any hook might see their effects.
+    let adUnits = req.adUnits || $$PREBID_GLOBAL$$.adUnits;
+    req.adUnits = (isArray(adUnits) ? adUnits.slice() : [adUnits]);
+
+    req.metrics = newMetrics();
+    req.metrics.checkpoint('requestBids');
+    req.defer = defer({promiseFactory: (r) => new Promise(r)})
+    delegate.call(this, req);
+    return req.defer.promise;
+  });
+})();
 
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
+export const startAuction = hook('async', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, ttlBuffer, adUnitCodes, labels, auctionId, ortb2Fragments, metrics, defer } = {}) {
+  const s2sBidders = getS2SBidderSet(config.getConfig('s2sConfig') || []);
+  adUnits = useMetrics(metrics).measureTime('requestBids.validate', () => checkAdUnitSetup(adUnits));
 
-  if (adUnitCodes && adUnitCodes.length) {
-    // if specific adUnitCodes supplied filter adUnits for those codes
-    adUnits = adUnits.filter(unit => includes(adUnitCodes, unit.code));
-  } else {
-    // otherwise derive adUnitCodes from adUnits
-    adUnitCodes = adUnits && adUnits.map(unit => unit.code);
+  function auctionDone(bids, timedOut, auctionId) {
+    if (typeof bidsBackHandler === 'function') {
+      try {
+        bidsBackHandler(bids, timedOut, auctionId);
+      } catch (e) {
+        logError('Error executing bidsBackHandler', null, e);
+      }
+    }
+    defer.resolve({bids, timedOut, auctionId})
   }
 
-  adUnits = checkAdUnitSetup(adUnits);
-
   /*
    * for a given adunit which supports a set of mediaTypes
    * and a given bidder which supports a set of mediaTypes
@@ -466,19 +687,21 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
    */
   adUnits.forEach(adUnit => {
     // get the adunit's mediaTypes, defaulting to banner if mediaTypes isn't present
-    const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || {'banner': 'banner'});
+    const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || { 'banner': 'banner' });
 
     // get the bidder's mediaTypes
     const allBidders = adUnit.bids.map(bid => bid.bidder);
     const bidderRegistry = adapterManager.bidderRegistry;
 
-    const s2sConfig = config.getConfig('s2sConfig');
-    const s2sBidders = s2sConfig && s2sConfig.bidders;
-    const bidders = (s2sBidders) ? allBidders.filter(bidder => {
-      return !includes(s2sBidders, bidder);
-    }) : allBidders;
+    const bidders = allBidders.filter(bidder => !s2sBidders.has(bidder));
 
-    adUnit.transactionId = utils.generateUUID();
+    const tid = adUnit.ortb2Imp?.ext?.tid || generateUUID();
+    adUnit.transactionId = tid;
+    if (ttlBuffer != null && !adUnit.hasOwnProperty('ttlBuffer')) {
+      adUnit.ttlBuffer = ttlBuffer;
+    }
+    // Populate ortb2Imp.ext.tid with transactionId. Specifying a transaction ID per item in the ortb impression array, lets multiple transaction IDs be transmitted in a single bid request.
+    deepSetValue(adUnit, 'ortb2Imp.ext.tid', tid);
 
     bidders.forEach(bidder => {
       const adapter = bidderRegistry[bidder];
@@ -490,7 +713,7 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
       const bidderEligible = adUnitMediaTypes.some(type => includes(bidderMediaTypes, type));
       if (!bidderEligible) {
         // drop the bidder from the ad unit if it's not compatible
-        utils.logWarn(utils.unsupportedBidderMessage(adUnit, bidder));
+        logWarn(unsupportedBidderMessage(adUnit, bidder));
         adUnit.bids = adUnit.bids.filter(bid => bid.bidder !== bidder);
       } else {
         adunitCounter.incrementBidderRequestsCounter(adUnit.code, bidder);
@@ -500,32 +723,35 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
   });
 
   if (!adUnits || adUnits.length === 0) {
-    utils.logMessage('No adUnits configured. No bids requested.');
-    if (typeof bidsBackHandler === 'function') {
-      // executeCallback, this will only be called in case of first request
-      try {
-        bidsBackHandler();
-      } catch (e) {
-        utils.logError('Error executing bidsBackHandler', null, e);
-      }
-    }
-    return;
-  }
+    logMessage('No adUnits configured. No bids requested.');
+    auctionDone();
+  } else {
+    const auction = auctionManager.createAuction({
+      adUnits,
+      adUnitCodes,
+      callback: auctionDone,
+      cbTimeout,
+      labels,
+      auctionId,
+      ortb2Fragments,
+      metrics,
+    });
 
-  const auction = auctionManager.createAuction({adUnits, adUnitCodes, callback: bidsBackHandler, cbTimeout, labels, auctionId});
+    let adUnitsLen = adUnits.length;
+    if (adUnitsLen > 15) {
+      logInfo(`Current auction ${auction.getAuctionId()} contains ${adUnitsLen} adUnits.`, adUnits);
+    }
 
-  let adUnitsLen = adUnits.length;
-  if (adUnitsLen > 15) {
-    utils.logInfo(`Current auction ${auction.getAuctionId()} contains ${adUnitsLen} adUnits.`, adUnits);
+    adUnitCodes.forEach(code => targeting.setLatestAuctionForAdUnit(code, auction.getAuctionId()));
+    auction.callBids();
   }
+}, 'startAuction');
 
-  adUnitCodes.forEach(code => targeting.setLatestAuctionForAdUnit(code, auction.getAuctionId()));
-  auction.callBids();
-});
-
-export function executeStorageCallbacks(fn, reqBidsConfigObj) {
+export function executeCallbacks(fn, reqBidsConfigObj) {
   runAll(storageCallbacks);
+  runAll(enableAnalyticsCallbacks);
   fn.call(this, reqBidsConfigObj);
+
   function runAll(queue) {
     var queued;
     while ((queued = queue.shift())) {
@@ -535,7 +761,7 @@ export function executeStorageCallbacks(fn, reqBidsConfigObj) {
 }
 
 // This hook will execute all storage callbacks which were registered before gdpr enforcement hook was added. Some bidders, user id modules use storage functions when module is parsed but gdpr enforcement hook is not added at that stage as setConfig callbacks are yet to be called. Hence for such calls we execute all the stored callbacks just before requestBids. At this hook point we will know for sure that gdprEnforcement module is added or not
-$$PREBID_GLOBAL$$.requestBids.before(executeStorageCallbacks, 49);
+$$PREBID_GLOBAL$$.requestBids.before(executeCallbacks, 49);
 
 /**
  *
@@ -544,12 +770,8 @@ $$PREBID_GLOBAL$$.requestBids.before(executeStorageCallbacks, 49);
  * @alias module:pbjs.addAdUnits
  */
 $$PREBID_GLOBAL$$.addAdUnits = function (adUnitArr) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.addAdUnits', arguments);
-  if (utils.isArray(adUnitArr)) {
-    $$PREBID_GLOBAL$$.adUnits.push.apply($$PREBID_GLOBAL$$.adUnits, adUnitArr);
-  } else if (typeof adUnitArr === 'object') {
-    $$PREBID_GLOBAL$$.adUnits.push(adUnitArr);
-  }
+  logInfo('Invoking $$PREBID_GLOBAL$$.addAdUnits', arguments);
+  $$PREBID_GLOBAL$$.adUnits.push.apply($$PREBID_GLOBAL$$.adUnits, isArray(adUnitArr) ? adUnitArr : [adUnitArr]);
   // emit event
   events.emit(ADD_AD_UNITS);
 };
@@ -571,14 +793,14 @@ $$PREBID_GLOBAL$$.addAdUnits = function (adUnitArr) {
  * Currently `bidWon` is the only event that accepts an `id` parameter.
  */
 $$PREBID_GLOBAL$$.onEvent = function (event, handler, id) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.onEvent', arguments);
-  if (!utils.isFn(handler)) {
-    utils.logError('The event handler provided is not a function and was not set on event "' + event + '".');
+  logInfo('Invoking $$PREBID_GLOBAL$$.onEvent', arguments);
+  if (!isFn(handler)) {
+    logError('The event handler provided is not a function and was not set on event "' + event + '".');
     return;
   }
 
   if (id && !eventValidators[event].call(null, id)) {
-    utils.logError('The id provided is not valid for event "' + event + '" and no handler was set.');
+    logError('The id provided is not valid for event "' + event + '" and no handler was set.');
     return;
   }
 
@@ -592,7 +814,7 @@ $$PREBID_GLOBAL$$.onEvent = function (event, handler, id) {
  * @alias module:pbjs.offEvent
  */
 $$PREBID_GLOBAL$$.offEvent = function (event, handler, id) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.offEvent', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.offEvent', arguments);
   if (id && !eventValidators[event].call(null, id)) {
     return;
   }
@@ -600,6 +822,16 @@ $$PREBID_GLOBAL$$.offEvent = function (event, handler, id) {
   events.off(event, handler, id);
 };
 
+/**
+ * Return a copy of all events emitted
+ *
+ * @alias module:pbjs.getEvents
+ */
+$$PREBID_GLOBAL$$.getEvents = function () {
+  logInfo('Invoking $$PREBID_GLOBAL$$.getEvents');
+  return events.getEvents();
+};
+
 /*
  * Wrapper to register bidderAdapter externally (adapterManager.registerBidAdapter())
  * @param  {Function} bidderAdaptor [description]
@@ -607,11 +839,11 @@ $$PREBID_GLOBAL$$.offEvent = function (event, handler, id) {
  * @alias module:pbjs.registerBidAdapter
  */
 $$PREBID_GLOBAL$$.registerBidAdapter = function (bidderAdaptor, bidderCode) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.registerBidAdapter', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.registerBidAdapter', arguments);
   try {
     adapterManager.registerBidAdapter(bidderAdaptor(), bidderCode);
   } catch (e) {
-    utils.logError('Error registering bidder adapter : ' + e.message);
+    logError('Error registering bidder adapter : ' + e.message);
   }
 };
 
@@ -621,11 +853,11 @@ $$PREBID_GLOBAL$$.registerBidAdapter = function (bidderAdaptor, bidderCode) {
  * @alias module:pbjs.registerAnalyticsAdapter
  */
 $$PREBID_GLOBAL$$.registerAnalyticsAdapter = function (options) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.registerAnalyticsAdapter', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.registerAnalyticsAdapter', arguments);
   try {
     adapterManager.registerAnalyticsAdapter(options);
   } catch (e) {
-    utils.logError('Error registering analytics adapter : ' + e.message);
+    logError('Error registering analytics adapter : ' + e.message);
   }
 };
 
@@ -636,7 +868,7 @@ $$PREBID_GLOBAL$$.registerAnalyticsAdapter = function (options) {
  * @return {Object} bidResponse [description]
  */
 $$PREBID_GLOBAL$$.createBid = function (statusCode) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.createBid', arguments);
+  logInfo('Invoking $$PREBID_GLOBAL$$.createBid', arguments);
   return createBid(statusCode);
 };
 
@@ -654,24 +886,32 @@ $$PREBID_GLOBAL$$.createBid = function (statusCode) {
  * @param {Object} config.options The options for this particular analytics adapter.  This will likely vary between adapters.
  * @alias module:pbjs.enableAnalytics
  */
-$$PREBID_GLOBAL$$.enableAnalytics = function (config) {
-  if (config && !utils.isEmpty(config)) {
-    utils.logInfo('Invoking $$PREBID_GLOBAL$$.enableAnalytics for: ', config);
+
+// Stores 'enableAnalytics' callbacks for later execution.
+const enableAnalyticsCallbacks = [];
+
+const enableAnalyticsCb = hook('async', function (config) {
+  if (config && !isEmpty(config)) {
+    logInfo('Invoking $$PREBID_GLOBAL$$.enableAnalytics for: ', config);
     adapterManager.enableAnalytics(config);
   } else {
-    utils.logError('$$PREBID_GLOBAL$$.enableAnalytics should be called with option {}');
+    logError('$$PREBID_GLOBAL$$.enableAnalytics should be called with option {}');
   }
+}, 'enableAnalyticsCb');
+
+$$PREBID_GLOBAL$$.enableAnalytics = function (config) {
+  enableAnalyticsCallbacks.push(enableAnalyticsCb.bind(this, config));
 };
 
 /**
  * @alias module:pbjs.aliasBidder
  */
-$$PREBID_GLOBAL$$.aliasBidder = function (bidderCode, alias) {
-  utils.logInfo('Invoking $$PREBID_GLOBAL$$.aliasBidder', arguments);
+$$PREBID_GLOBAL$$.aliasBidder = function (bidderCode, alias, options) {
+  logInfo('Invoking $$PREBID_GLOBAL$$.aliasBidder', arguments);
   if (bidderCode && alias) {
-    adapterManager.aliasBidAdapter(bidderCode, alias);
+    adapterManager.aliasBidAdapter(bidderCode, alias, options);
   } else {
-    utils.logError('bidderCode and alias must be passed as arguments', '$$PREBID_GLOBAL$$.aliasBidder');
+    logError('bidderCode and alias must be passed as arguments', '$$PREBID_GLOBAL$$.aliasBidder');
   }
 };
 
@@ -708,12 +948,12 @@ $$PREBID_GLOBAL$$.aliasBidder = function (bidderCode, alias) {
  * @property {string} adserverTargeting.hb_adid The ad ID of the creative, as understood by the ad server.
  * @property {string} adserverTargeting.hb_pb The price paid to show the creative, as logged in the ad server.
  * @property {string} adserverTargeting.hb_bidder The winning bidder whose ad creative will be served by the ad server.
-*/
+ */
 
 /**
  * Get all of the bids that have been rendered.  Useful for [troubleshooting your integration](http://prebid.org/dev-docs/prebid-troubleshooting-guide.html).
  * @return {Array<AdapterBidResponse>} A list of bids that have been rendered.
-*/
+ */
 $$PREBID_GLOBAL$$.getAllWinningBids = function () {
   return auctionManager.getAllWinningBids();
 };
@@ -745,7 +985,7 @@ $$PREBID_GLOBAL$$.getHighestCpmBids = function (adUnitCode) {
  * @property {string} adId The id representing the ad we want to mark
  *
  * @alias module:pbjs.markWinningBidAsUsed
-*/
+ */
 $$PREBID_GLOBAL$$.markWinningBidAsUsed = function (markBidRequest) {
   let bids = [];
 
@@ -757,7 +997,7 @@ $$PREBID_GLOBAL$$.markWinningBidAsUsed = function (markBidRequest) {
   } else if (markBidRequest.adId) {
     bids = auctionManager.getBidsReceived().filter(bid => bid.adId === markBidRequest.adId);
   } else {
-    utils.logWarn('Inproper usage of markWinningBidAsUsed. It\'ll need an adUnitCode and/or adId to function.');
+    logWarn('Improper use of markWinningBidAsUsed. It needs an adUnitCode or an adId to function.');
   }
 
   if (bids.length > 0) {
@@ -770,53 +1010,16 @@ $$PREBID_GLOBAL$$.markWinningBidAsUsed = function (markBidRequest) {
  * @param {Object} options
  * @alias module:pbjs.getConfig
  */
-$$PREBID_GLOBAL$$.getConfig = config.getConfig;
+$$PREBID_GLOBAL$$.getConfig = config.getAnyConfig;
+$$PREBID_GLOBAL$$.readConfig = config.readAnyConfig;
+$$PREBID_GLOBAL$$.mergeConfig = config.mergeConfig;
+$$PREBID_GLOBAL$$.mergeBidderConfig = config.mergeBidderConfig;
 
 /**
  * Set Prebid config options.
- * (Added in version 0.27.0).
- *
- * `setConfig` is designed to allow for advanced configuration while
- * reducing the surface area of the public API.  For more information
- * about the move to `setConfig` (and the resulting deprecations of
- * some other public methods), see [the Prebid 1.0 public API
- * proposal](https://gist.github.com/mkendall07/51ee5f6b9f2df01a89162cf6de7fe5b6).
- *
- * #### Troubleshooting your configuration
- *
- * If you call `pbjs.setConfig` without an object, e.g.,
- *
- * `pbjs.setConfig('debug', 'true'))`
- *
- * then Prebid.js will print an error to the console that says:
- *
- * ```
- * ERROR: setConfig options must be an object
- * ```
- *
- * If you don't see that message, you can assume the config object is valid.
+ * See https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html
  *
  * @param {Object} options Global Prebid configuration object. Must be JSON - no JavaScript functions are allowed.
- * @param {string} options.bidderSequence The order in which bidders are called.  Example: `pbjs.setConfig({ bidderSequence: "fixed" })`.  Allowed values: `"fixed"` (order defined in `adUnit.bids` array on page), `"random"`.
- * @param {boolean} options.debug Turn debug logging on/off. Example: `pbjs.setConfig({ debug: true })`.
- * @param {string} options.priceGranularity The bid price granularity to use.  Example: `pbjs.setConfig({ priceGranularity: "medium" })`. Allowed values: `"low"` ($0.50), `"medium"` ($0.10), `"high"` ($0.01), `"auto"` (sliding scale), `"dense"` (like `"auto"`, with smaller increments at lower CPMs), or a custom price bucket object, e.g., `{ "buckets" : [{"min" : 0,"max" : 20,"increment" : 0.1,"cap" : true}]}`.
- * @param {boolean} options.enableSendAllBids Turn "send all bids" mode on/off.  Example: `pbjs.setConfig({ enableSendAllBids: true })`.
- * @param {number} options.bidderTimeout Set a global bidder timeout, in milliseconds.  Example: `pbjs.setConfig({ bidderTimeout: 3000 })`.  Note that it's still possible for a bid to get into the auction that responds after this timeout. This is due to how [`setTimeout`](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout) works in JS: it queues the callback in the event loop in an approximate location that should execute after this time but it is not guaranteed.  For more information about the asynchronous event loop and `setTimeout`, see [How JavaScript Timers Work](https://johnresig.com/blog/how-javascript-timers-work/).
- * @param {string} options.publisherDomain The publisher's domain where Prebid is running, for cross-domain iFrame communication.  Example: `pbjs.setConfig({ publisherDomain: "https://www.theverge.com" })`.
- * @param {Object} options.s2sConfig The configuration object for [server-to-server header bidding](http://prebid.org/dev-docs/get-started-with-prebid-server.html).  Example:
- * @alias module:pbjs.setConfig
- * ```
- * pbjs.setConfig({
- *     s2sConfig: {
- *         accountId: '1',
- *         enabled: true,
- *         bidders: ['appnexus', 'pubmatic'],
- *         timeout: 1000,
- *         adapter: 'prebidServer',
- *         endpoint: 'https://prebid.adnxs.com/pbs/v1/auction'
- *     }
- * })
- * ```
  */
 $$PREBID_GLOBAL$$.setConfig = config.setConfig;
 $$PREBID_GLOBAL$$.setBidderConfig = config.setBidderConfig;
@@ -843,28 +1046,28 @@ $$PREBID_GLOBAL$$.que.push(() => listenMessagesFromCreative());
  *                            the Prebid script has been fully loaded.
  * @alias module:pbjs.cmd.push
  */
-$$PREBID_GLOBAL$$.cmd.push = function(command) {
+$$PREBID_GLOBAL$$.cmd.push = function (command) {
   if (typeof command === 'function') {
     try {
       command.call();
     } catch (e) {
-      utils.logError('Error processing command :', e.message, e.stack);
+      logError('Error processing command :', e.message, e.stack);
     }
   } else {
-    utils.logError('Commands written into $$PREBID_GLOBAL$$.cmd.push must be wrapped in a function');
+    logError('Commands written into $$PREBID_GLOBAL$$.cmd.push must be wrapped in a function');
   }
 };
 
 $$PREBID_GLOBAL$$.que.push = $$PREBID_GLOBAL$$.cmd.push;
 
 function processQueue(queue) {
-  queue.forEach(function(cmd) {
+  queue.forEach(function (cmd) {
     if (typeof cmd.called === 'undefined') {
       try {
         cmd.call();
         cmd.called = true;
       } catch (e) {
-        utils.logError('Error processing command :', 'prebid.js', e);
+        logError('Error processing command :', 'prebid.js', e);
       }
     }
   });
@@ -873,7 +1076,7 @@ function processQueue(queue) {
 /**
  * @alias module:pbjs.processQueue
  */
-$$PREBID_GLOBAL$$.processQueue = function() {
+$$PREBID_GLOBAL$$.processQueue = function () {
   hook.ready();
   processQueue($$PREBID_GLOBAL$$.que);
   processQueue($$PREBID_GLOBAL$$.cmd);
diff --git a/src/refererDetection.js b/src/refererDetection.js
index 60198678666..e0cb15522cc 100644
--- a/src/refererDetection.js
+++ b/src/refererDetection.js
@@ -3,201 +3,264 @@
  * The information that it tries to collect includes:
  * The detected top url in the nav bar,
  * Whether it was able to reach the top most window (if for example it was embedded in several iframes),
- * The number of iframes it was embedded in if applicable,
+ * The number of iframes it was embedded in if applicable (by default max ten iframes),
  * A list of the domains of each embedded window if applicable.
  * Canonical URL which refers to an HTML link element, with the attribute of rel="canonical", found in the <head> element of your webpage
  */
 
-import { logWarn } from './utils.js';
+import { config } from './config.js';
+import {logWarn} from './utils.js';
 
-export function detectReferer(win) {
-  /**
-   * Returns number of frames to reach top from current frame where prebid.js sits
-   * @returns {Array} levels
-   */
-  function getLevels() {
-    let levels = walkUpWindows();
-    let ancestors = getAncestorOrigins();
+/**
+ * Prepend a URL with the page's protocol (http/https), if necessary.
+ */
+export function ensureProtocol(url, win = window) {
+  if (!url) return url;
+  if (/\w+:\/\//.exec(url)) {
+    // url already has protocol
+    return url;
+  }
+  let windowProto = win.location.protocol;
+  try {
+    windowProto = win.top.location.protocol;
+  } catch (e) {}
+  if (/^\/\//.exec(url)) {
+    // url uses relative protocol ("//example.com")
+    return windowProto + url;
+  } else {
+    return `${windowProto}//${url}`;
+  }
+}
 
-    if (ancestors) {
-      for (let i = 0, l = ancestors.length; i < l; i++) {
-        levels[i].ancestor = ancestors[i];
-      }
-    }
-    return levels;
+/**
+ * Extract the domain portion from a URL.
+ * @param url
+ * @param noLeadingWww: if true, remove 'www.' appearing at the beginning of the domain.
+ * @param noPort: if true, do not include the ':[port]' portion
+ */
+export function parseDomain(url, {noLeadingWww = false, noPort = false} = {}) {
+  try {
+    url = new URL(ensureProtocol(url));
+  } catch (e) {
+    return;
+  }
+  url = noPort ? url.hostname : url.host;
+  if (noLeadingWww && url.startsWith('www.')) {
+    url = url.substring(4);
   }
+  return url;
+}
 
+/**
+ * @param {Window} win Window
+ * @returns {Function}
+ */
+export function detectReferer(win) {
   /**
    * This function would return a read-only array of hostnames for all the parent frames.
    * win.location.ancestorOrigins is only supported in webkit browsers. For non-webkit browsers it will return undefined.
+   *
+   * @param {Window} win Window object
    * @returns {(undefined|Array)} Ancestor origins or undefined
    */
-  function getAncestorOrigins() {
+  function getAncestorOrigins(win) {
     try {
       if (!win.location.ancestorOrigins) {
         return;
       }
+
       return win.location.ancestorOrigins;
     } catch (e) {
       // Ignore error
     }
   }
 
-  /**
-   * This function would try to get referer and urls for all parent frames in case of win.location.ancestorOrigins undefined.
-   * @param {Array} levels
-   * @returns {Object} urls for all parent frames and top most detected referer url
-   */
-  function getPubUrlStack(levels) {
-    let stack = [];
-    let defUrl = null;
-    let frameLocation = null;
-    let prevFrame = null;
-    let prevRef = null;
-    let ancestor = null;
-    let detectedRefererUrl = null;
-
-    let i;
-    for (i = levels.length - 1; i >= 0; i--) {
-      try {
-        frameLocation = levels[i].location;
-      } catch (e) {
-        // Ignore error
-      }
-
-      if (frameLocation) {
-        stack.push(frameLocation);
-        if (!detectedRefererUrl) {
-          detectedRefererUrl = frameLocation;
-        }
-      } else if (i !== 0) {
-        prevFrame = levels[i - 1];
-        try {
-          prevRef = prevFrame.referrer;
-          ancestor = prevFrame.ancestor;
-        } catch (e) {
-          // Ignore error
-        }
-
-        if (prevRef) {
-          stack.push(prevRef);
-          if (!detectedRefererUrl) {
-            detectedRefererUrl = prevRef;
-          }
-        } else if (ancestor) {
-          stack.push(ancestor);
-          if (!detectedRefererUrl) {
-            detectedRefererUrl = ancestor;
-          }
-        } else {
-          stack.push(defUrl);
-        }
-      } else {
-        stack.push(defUrl);
-      }
-    }
-    return {
-      stack,
-      detectedRefererUrl
-    };
-  }
-
   /**
    * This function returns canonical URL which refers to an HTML link element, with the attribute of rel="canonical", found in the <head> element of your webpage
+   *
    * @param {Object} doc document
+   * @returns {string|null}
    */
   function getCanonicalUrl(doc) {
     try {
-      let element = doc.querySelector("link[rel='canonical']");
+      const element = doc.querySelector("link[rel='canonical']");
+
       if (element !== null) {
         return element.href;
       }
     } catch (e) {
+      // Ignore error
     }
+
     return null;
   }
 
+  // TODO: the meaning of "reachedTop" seems to be intentionally ambiguous - best to leave them out of
+  // the typedef for now. (for example, unit tests enforce that "reachedTop" should be false in some situations where we
+  // happily provide a location for the top).
+
+  /**
+   * @typedef {Object} refererInfo
+   * @property {string|null} location the browser's location, or null if not available (due to cross-origin restrictions)
+   * @property {string|null} canonicalUrl the site's canonical URL as set by the publisher, through setConfig({pageUrl}) or <link rel="canonical" />
+   * @property {string|null} page the best candidate for the current page URL: `canonicalUrl`, falling back to `location`
+   * @property {string|null} domain the domain portion of `page`
+   * @property {string|null} ref the referrer (document.referrer) to the current page, or null if not available (due to cross-origin restrictions)
+   * @property {string} topmostLocation of the top-most frame for which we could guess the location. Outside of cross-origin scenarios, this is equivalent to `location`.
+   * @property {number} numIframes number of steps between window.self and window.top
+   * @property {Array[string|null]} stack our best guess at the location for each frame, in the direction top -> self.
+   */
+
   /**
-   * Walk up to the top of the window to detect origin, number of iframes, ancestor origins and canonical url
+   * Walk up the windows to get the origin stack and best available referrer, canonical URL, etc.
+   *
+   * @returns {refererInfo}
    */
-  function walkUpWindows() {
-    let acc = [];
+  function refererInfo() {
+    const stack = [];
+    const ancestors = getAncestorOrigins(win);
+    const maxNestedIframes = config.getConfig('maxNestedIframes');
+
     let currentWindow;
+    let bestLocation;
+    let bestCanonicalUrl;
+    let reachedTop = false;
+    let level = 0;
+    let valuesFromAmp = false;
+    let inAmpFrame = false;
+    let hasTopLocation = false;
+
     do {
+      const previousWindow = currentWindow;
+      const wasInAmpFrame = inAmpFrame;
+      let currentLocation;
+      let crossOrigin = false;
+      let foundLocation = null;
+
+      inAmpFrame = false;
+      currentWindow = currentWindow ? currentWindow.parent : win;
+
       try {
-        currentWindow = currentWindow ? currentWindow.parent : win;
-        try {
-          let isTop = (currentWindow == win.top);
-          let refData = {
-            referrer: currentWindow.document.referrer || null,
-            location: currentWindow.location.href || null,
-            isTop
+        currentLocation = currentWindow.location.href || null;
+      } catch (e) {
+        crossOrigin = true;
+      }
+
+      if (crossOrigin) {
+        if (wasInAmpFrame) {
+          const context = previousWindow.context;
+
+          try {
+            foundLocation = context.sourceUrl;
+            bestLocation = foundLocation;
+            hasTopLocation = true;
+
+            valuesFromAmp = true;
+
+            if (currentWindow === win.top) {
+              reachedTop = true;
+            }
+
+            if (context.canonicalUrl) {
+              bestCanonicalUrl = context.canonicalUrl;
+            }
+          } catch (e) { /* Do nothing */ }
+        } else {
+          logWarn('Trying to access cross domain iframe. Continuing without referrer and location');
+
+          try {
+            // the referrer to an iframe is the parent window
+            const referrer = previousWindow.document.referrer;
+
+            if (referrer) {
+              foundLocation = referrer;
+
+              if (currentWindow === win.top) {
+                reachedTop = true;
+              }
+            }
+          } catch (e) { /* Do nothing */ }
+
+          if (!foundLocation && ancestors && ancestors[level - 1]) {
+            foundLocation = ancestors[level - 1];
+            if (currentWindow === win.top) {
+              hasTopLocation = true;
+            }
           }
-          if (isTop) {
-            refData = Object.assign(refData, {
-              canonicalUrl: getCanonicalUrl(currentWindow.document)
-            })
+
+          if (foundLocation && !valuesFromAmp) {
+            bestLocation = foundLocation;
           }
-          acc.push(refData);
-        } catch (e) {
-          acc.push({
-            referrer: null,
-            location: null,
-            isTop: (currentWindow == win.top)
-          });
-          logWarn('Trying to access cross domain iframe. Continuing without referrer and location');
         }
-      } catch (e) {
-        acc.push({
-          referrer: null,
-          location: null,
-          isTop: false
-        });
-        return acc;
+      } else {
+        if (currentLocation) {
+          foundLocation = currentLocation;
+          bestLocation = foundLocation;
+          valuesFromAmp = false;
+
+          if (currentWindow === win.top) {
+            reachedTop = true;
+
+            const canonicalUrl = getCanonicalUrl(currentWindow.document);
+
+            if (canonicalUrl) {
+              bestCanonicalUrl = canonicalUrl;
+            }
+          }
+        }
+
+        if (currentWindow.context && currentWindow.context.sourceUrl) {
+          inAmpFrame = true;
+        }
       }
-    } while (currentWindow != win.top);
-    return acc;
-  }
 
-  /**
-   * Referer info
-   * @typedef {Object} refererInfo
-   * @property {string} referer detected top url
-   * @property {boolean} reachedTop whether prebid was able to walk upto top window or not
-   * @property {number} numIframes number of iframes
-   * @property {string} stack comma separated urls of all origins
-   * @property {string} canonicalUrl canonical URL refers to an HTML link element, with the attribute of rel="canonical", found in the <head> element of your webpage
-   */
+      stack.push(foundLocation);
+      level++;
+    } while (currentWindow !== win.top && level < maxNestedIframes);
 
-  /**
-   * Get referer info
-   * @returns {refererInfo}
-   */
-  function refererInfo() {
+    stack.reverse();
+
+    let ref;
     try {
-      let levels = getLevels();
-      let numIframes = levels.length - 1;
-      let reachedTop = (levels[numIframes].location !== null ||
-        (numIframes > 0 && levels[numIframes - 1].referrer !== null));
-      let stackInfo = getPubUrlStack(levels);
-      let canonicalUrl;
-      if (levels[levels.length - 1].canonicalUrl) {
-        canonicalUrl = levels[levels.length - 1].canonicalUrl;
-      }
+      ref = win.top.document.referrer;
+    } catch (e) {}
 
-      return {
-        referer: stackInfo.detectedRefererUrl,
+    const location = reachedTop || hasTopLocation ? bestLocation : null;
+    const canonicalUrl = config.getConfig('pageUrl') || bestCanonicalUrl || null;
+    let page = config.getConfig('pageUrl') || location || ensureProtocol(canonicalUrl, win);
+
+    if (location && location.indexOf('?') > -1 && page.indexOf('?') === -1) {
+      page = `${page}${location.substring(location.indexOf('?'))}`;
+    }
+
+    return {
+      reachedTop,
+      isAmp: valuesFromAmp,
+      numIframes: level - 1,
+      stack,
+      topmostLocation: bestLocation || null,
+      location,
+      canonicalUrl,
+      page,
+      domain: parseDomain(page) || null,
+      ref: ref || null,
+      // TODO: the "legacy" refererInfo object is provided here, for now, to accomodate
+      // adapters that decided to just send it verbatim to their backend.
+      legacy: {
         reachedTop,
-        numIframes,
-        stack: stackInfo.stack,
+        isAmp: valuesFromAmp,
+        numIframes: level - 1,
+        stack,
+        referer: bestLocation || null,
         canonicalUrl
-      };
-    } catch (e) {
-      // Ignore error
-    }
+      }
+    };
   }
 
   return refererInfo;
 }
 
+/**
+ * @type {function(): refererInfo}
+ */
 export const getRefererInfo = detectReferer(window);
diff --git a/src/secureCreatives.js b/src/secureCreatives.js
index 34de2be275c..82d331988fc 100644
--- a/src/secureCreatives.js
+++ b/src/secureCreatives.js
@@ -3,22 +3,54 @@
    access to a publisher page from creative payloads.
  */
 
-import events from './events.js';
-import { fireNativeTrackers, getAssetMessage } from './native.js';
-import { EVENTS } from './constants.json';
-import { logWarn, replaceAuctionPrice } from './utils.js';
-import { auctionManager } from './auctionManager.js';
-import find from 'core-js-pure/features/array/find.js';
-import { isRendererRequired, executeRenderer } from './Renderer.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import * as events from './events.js';
+import {fireNativeTrackers, getAllAssetsMessage, getAssetMessage} from './native.js';
+import constants from './constants.json';
+import {deepAccess, isApnGetTagDefined, isGptPubadsDefined, logError, logWarn, replaceAuctionPrice} from './utils.js';
+import {auctionManager} from './auctionManager.js';
+import {find, includes} from './polyfill.js';
+import {executeRenderer, isRendererRequired} from './Renderer.js';
+import {config} from './config.js';
+import {emitAdRenderFail, emitAdRenderSucceeded} from './adRendering.js';
+
+const BID_WON = constants.EVENTS.BID_WON;
+const STALE_RENDER = constants.EVENTS.STALE_RENDER;
+const WON_AD_IDS = new WeakSet();
+
+const HANDLER_MAP = {
+  'Prebid Request': handleRenderRequest,
+  'Prebid Event': handleEventRequest,
+}
 
-const BID_WON = EVENTS.BID_WON;
+if (FEATURES.NATIVE) {
+  Object.assign(HANDLER_MAP, {
+    'Prebid Native': handleNativeRequest,
+  })
+}
 
 export function listenMessagesFromCreative() {
   window.addEventListener('message', receiveMessage, false);
 }
 
-function receiveMessage(ev) {
+export function getReplier(ev) {
+  if (ev.origin == null && ev.ports.length === 0) {
+    return function () {
+      const msg = 'Cannot post message to a frame with null origin. Please update creatives to use MessageChannel, see https://github.com/prebid/Prebid.js/issues/7870'
+      logError(msg)
+      throw new Error(msg);
+    }
+  } else if (ev.ports.length > 0) {
+    return function (message) {
+      ev.ports[0].postMessage(JSON.stringify(message));
+    }
+  } else {
+    return function (message) {
+      ev.source.postMessage(JSON.stringify(message), ev.origin);
+    }
+  }
+}
+
+export function receiveMessage(ev) {
   var key = ev.message ? 'message' : 'data';
   var data = {};
   try {
@@ -27,56 +59,130 @@ function receiveMessage(ev) {
     return;
   }
 
-  if (data && data.adId) {
+  if (data && data.adId && data.message) {
     const adObject = find(auctionManager.getBidsReceived(), function (bid) {
       return bid.adId === data.adId;
     });
+    if (HANDLER_MAP.hasOwnProperty(data.message)) {
+      HANDLER_MAP[data.message](getReplier(ev), data, adObject);
+    }
+  }
+}
 
-    if (adObject && data.message === 'Prebid Request') {
-      _sendAdToCreative(adObject, ev);
+function handleRenderRequest(reply, data, adObject) {
+  if (adObject == null) {
+    emitAdRenderFail({
+      reason: constants.AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
+      message: `Cannot find ad '${data.adId}' for cross-origin render request`,
+      id: data.adId
+    });
+    return;
+  }
+  if (adObject.status === constants.BID_STATUS.RENDERED) {
+    logWarn(`Ad id ${adObject.adId} has been rendered before`);
+    events.emit(STALE_RENDER, adObject);
+    if (deepAccess(config.getConfig('auctionOptions'), 'suppressStaleRender')) {
+      return;
+    }
+  }
 
-      // save winning bids
-      auctionManager.addWinningBid(adObject);
+  try {
+    _sendAdToCreative(adObject, reply);
+  } catch (e) {
+    emitAdRenderFail({
+      reason: constants.AD_RENDER_FAILED_REASON.EXCEPTION,
+      message: e.message,
+      id: data.adId,
+      bid: adObject
+    });
+    return;
+  }
 
-      events.emit(BID_WON, adObject);
-    }
+  // save winning bids
+  auctionManager.addWinningBid(adObject);
 
-    // handle this script from native template in an ad server
-    // window.parent.postMessage(JSON.stringify({
-    //   message: 'Prebid Native',
-    //   adId: '%%PATTERN:hb_adid%%'
-    // }), '*');
-    if (adObject && data.message === 'Prebid Native') {
-      if (data.action === 'assetRequest') {
-        const message = getAssetMessage(data, adObject);
-        ev.source.postMessage(JSON.stringify(message), ev.origin);
-        return;
-      }
-
-      const trackerType = fireNativeTrackers(data, adObject);
-      if (trackerType === 'click') { return; }
-
-      auctionManager.addWinningBid(adObject);
-      events.emit(BID_WON, adObject);
-    }
+  events.emit(BID_WON, adObject);
+}
+
+function handleNativeRequest(reply, data, adObject) {
+  // handle this script from native template in an ad server
+  // window.parent.postMessage(JSON.stringify({
+  //   message: 'Prebid Native',
+  //   adId: '%%PATTERN:hb_adid%%'
+  // }), '*');
+  if (adObject == null) {
+    logError(`Cannot find ad '${data.adId}' for x-origin event request`);
+    return;
+  }
+
+  if (!WON_AD_IDS.has(adObject)) {
+    WON_AD_IDS.add(adObject);
+    auctionManager.addWinningBid(adObject);
+    events.emit(BID_WON, adObject);
+  }
+
+  switch (data.action) {
+    case 'assetRequest':
+      reply(getAssetMessage(data, adObject));
+      break;
+    case 'allAssetRequest':
+      reply(getAllAssetsMessage(data, adObject));
+      break;
+    case 'resizeNativeHeight':
+      adObject.height = data.height;
+      adObject.width = data.width;
+      resizeRemoteCreative(adObject);
+      break;
+    default:
+      fireNativeTrackers(data, adObject);
+  }
+}
+
+function handleEventRequest(reply, data, adObject) {
+  if (adObject == null) {
+    logError(`Cannot find ad '${data.adId}' for x-origin event request`);
+    return;
+  }
+  if (adObject.status !== constants.BID_STATUS.RENDERED) {
+    logWarn(`Received x-origin event request without corresponding render request for ad '${data.adId}'`);
+    return;
+  }
+  switch (data.event) {
+    case constants.EVENTS.AD_RENDER_FAILED:
+      emitAdRenderFail({
+        bid: adObject,
+        id: data.adId,
+        reason: data.info.reason,
+        message: data.info.message
+      });
+      break;
+    case constants.EVENTS.AD_RENDER_SUCCEEDED:
+      emitAdRenderSucceeded({
+        doc: null,
+        bid: adObject,
+        id: data.adId
+      });
+      break;
+    default:
+      logError(`Received x-origin event request for unsupported event: '${data.event}' (adId: '${data.adId}')`)
   }
 }
 
-export function _sendAdToCreative(adObject, ev) {
-  const { adId, ad, adUrl, width, height, renderer, cpm } = adObject;
+export function _sendAdToCreative(adObject, reply) {
+  const { adId, ad, adUrl, width, height, renderer, cpm, originalCpm } = adObject;
   // rendering for outstream safeframe
   if (isRendererRequired(renderer)) {
     executeRenderer(renderer, adObject);
   } else if (adId) {
     resizeRemoteCreative(adObject);
-    ev.source.postMessage(JSON.stringify({
+    reply({
       message: 'Prebid Response',
-      ad: replaceAuctionPrice(ad, cpm),
-      adUrl: replaceAuctionPrice(adUrl, cpm),
+      ad: replaceAuctionPrice(ad, originalCpm || cpm),
+      adUrl: replaceAuctionPrice(adUrl, originalCpm || cpm),
       adId,
       width,
       height
-    }), ev.origin);
+    });
   }
 }
 
@@ -87,7 +193,7 @@ function resizeRemoteCreative({ adId, adUnitCode, width, height }) {
     let element = getElementByAdUnit(elmType + ':not([style*="display: none"])');
     if (element) {
       let elementStyle = element.style;
-      elementStyle.width = width + 'px';
+      elementStyle.width = width ? width + 'px' : '100%';
       elementStyle.height = height + 'px';
     } else {
       logWarn(`Unable to locate matching page element for adUnitCode ${adUnitCode}.  Can't resize it to ad's dimensions.  Please review setup.`);
@@ -101,9 +207,9 @@ function resizeRemoteCreative({ adId, adUnitCode, width, height }) {
   }
 
   function getElementIdBasedOnAdServer(adId, adUnitCode) {
-    if (window.googletag) {
+    if (isGptPubadsDefined()) {
       return getDfpElementId(adId)
-    } else if (window.apntag) {
+    } else if (isApnGetTagDefined()) {
       return getAstElementId(adUnitCode)
     } else {
       return adUnitCode;
@@ -111,11 +217,12 @@ function resizeRemoteCreative({ adId, adUnitCode, width, height }) {
   }
 
   function getDfpElementId(adId) {
-    return find(window.googletag.pubads().getSlots(), slot => {
+    const slot = find(window.googletag.pubads().getSlots(), slot => {
       return find(slot.getTargetingKeys(), key => {
         return includes(slot.getTargeting(key), adId);
       });
-    }).getSlotElementId();
+    });
+    return slot ? slot.getSlotElementId() : null;
   }
 
   function getAstElementId(adUnitCode) {
diff --git a/src/sizeMapping.js b/src/sizeMapping.js
index 313da3f422a..00a24bbdb5d 100644
--- a/src/sizeMapping.js
+++ b/src/sizeMapping.js
@@ -1,6 +1,7 @@
 import { config } from './config.js';
-import {logWarn, isPlainObject, deepAccess, deepClone, getWindowTop} from './utils.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {logWarn, logInfo, isPlainObject, deepAccess, deepClone, getWindowTop} from './utils.js';
+import {includes} from './polyfill.js';
+import {BANNER} from './mediaTypes.js';
 
 let sizeConfig = [];
 
@@ -75,22 +76,19 @@ export function resolveStatus({labels = [], labelAll = false, activeLabels = []}
     } else {
       mediaTypes = {};
     }
-  } else {
-    mediaTypes = deepClone(mediaTypes);
   }
 
   let oldSizes = deepAccess(mediaTypes, 'banner.sizes');
   if (maps.shouldFilter && oldSizes) {
+    mediaTypes = deepClone(mediaTypes);
     mediaTypes.banner.sizes = oldSizes.filter(size => maps.sizesSupported[size]);
   }
 
-  let allMediaTypes = Object.keys(mediaTypes);
-
   let results = {
     active: (
-      allMediaTypes.every(type => type !== 'banner')
+      !mediaTypes.hasOwnProperty(BANNER)
     ) || (
-      allMediaTypes.some(type => type === 'banner') && deepAccess(mediaTypes, 'banner.sizes.length') > 0 && (
+      deepAccess(mediaTypes, 'banner.sizes.length') > 0 && (
         labels.length === 0 || (
           (!labelAll && (
             labels.some(label => maps.labels[label]) ||
@@ -111,7 +109,7 @@ export function resolveStatus({labels = [], labelAll = false, activeLabels = []}
     results.filterResults = {
       before: oldSizes,
       after: mediaTypes.banner.sizes
-    }
+    };
   }
 
   return results;
@@ -121,22 +119,17 @@ function evaluateSizeConfig(configs) {
   return configs.reduce((results, config) => {
     if (
       typeof config === 'object' &&
-      typeof config.mediaQuery === 'string'
+      typeof config.mediaQuery === 'string' &&
+      config.mediaQuery.length > 0
     ) {
       let ruleMatch = false;
 
-      // TODO: (Prebid - 4.0) Remove empty mediaQuery string check. Disallow empty mediaQuery in sizeConfig.
-      // Refer: https://github.com/prebid/Prebid.js/pull/4691, https://github.com/prebid/Prebid.js/issues/4810 for more details.
-      if (config.mediaQuery === '') {
-        ruleMatch = true;
-      } else {
-        try {
-          ruleMatch = getWindowTop().matchMedia(config.mediaQuery).matches;
-        } catch (e) {
-          logWarn('Unfriendly iFrame blocks sizeConfig from being correctly evaluated');
-
-          ruleMatch = matchMedia(config.mediaQuery).matches;
-        }
+      try {
+        ruleMatch = getWindowTop().matchMedia(config.mediaQuery).matches;
+      } catch (e) {
+        logWarn('Unfriendly iFrame blocks sizeConfig from being correctly evaluated');
+
+        ruleMatch = matchMedia(config.mediaQuery).matches;
       }
 
       if (ruleMatch) {
@@ -159,3 +152,48 @@ function evaluateSizeConfig(configs) {
     shouldFilter: false
   });
 }
+
+export function processAdUnitsForLabels(adUnits, activeLabels) {
+  return adUnits.reduce((adUnits, adUnit) => {
+    let {
+      active,
+      mediaTypes,
+      filterResults
+    } = resolveStatus(
+      getLabels(adUnit, activeLabels),
+      adUnit.mediaTypes,
+      adUnit.sizes
+    );
+
+    if (!active) {
+      logInfo(`Size mapping disabled adUnit "${adUnit.code}"`);
+    } else {
+      if (filterResults) {
+        logInfo(`Size mapping filtered adUnit "${adUnit.code}" banner sizes from `, filterResults.before, 'to ', filterResults.after);
+      }
+
+      adUnit.mediaTypes = mediaTypes;
+
+      adUnit.bids = adUnit.bids.reduce((bids, bid) => {
+        let {
+          active,
+          mediaTypes,
+          filterResults
+        } = resolveStatus(getLabels(bid, activeLabels), adUnit.mediaTypes);
+
+        if (!active) {
+          logInfo(`Size mapping deactivated adUnit "${adUnit.code}" bidder "${bid.bidder}"`);
+        } else {
+          if (filterResults) {
+            logInfo(`Size mapping filtered adUnit "${adUnit.code}" bidder "${bid.bidder}" banner sizes from `, filterResults.before, 'to ', filterResults.after);
+            bid.mediaTypes = mediaTypes;
+          }
+          bids.push(bid);
+        }
+        return bids;
+      }, []);
+      adUnits.push(adUnit);
+    }
+    return adUnits;
+  }, []);
+}
diff --git a/src/storageManager.js b/src/storageManager.js
index 0d88a8ccea1..eaf35603c60 100644
--- a/src/storageManager.js
+++ b/src/storageManager.js
@@ -1,6 +1,7 @@
-import { hook } from './hook.js';
-import * as utils from './utils.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {hook} from './hook.js';
+import {hasDeviceAccess, checkCookieSupport, logError, logInfo, isPlainObject} from './utils.js';
+import {bidderSettings as defaultBidderSettings} from './bidderSettings.js';
+import {VENDORLESS_GVLID} from './consentHandler.js';
 
 const moduleTypeWhiteList = ['core', 'prebid-module'];
 
@@ -10,7 +11,8 @@ export let storageCallbacks = [];
  * Storage options
  * @typedef {Object} storageOptions
  * @property {Number=} gvlid - Vendor id
- * @property {string} moduleName - Module name
+ * @property {string} moduleName? - Module name
+ * @property {string=} bidderCode? - Bidder code
  * @property {string=} moduleType - Module type, value can be anyone of core or prebid-module
  */
 
@@ -18,29 +20,41 @@ export let storageCallbacks = [];
  * Returns list of storage related functions with gvlid, module name and module type in its scope.
  * All three argument are optional here. Below shows the usage of of these
  * - GVL Id: Pass GVL id if you are a vendor
- * - Module name: All modules need to pass module name
+ * - Bidder code: All bid adapters need to pass bidderCode
+ * - Module name: All other modules need to pass module name
  * - Module type: Some modules may need these functions but are not vendor. e.g prebid core files in src and modules like currency.
  * @param {storageOptions} options
  */
-export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
+export function newStorageManager({gvlid, moduleName, bidderCode, moduleType} = {}, {bidderSettings = defaultBidderSettings} = {}) {
+  function isBidderAllowed() {
+    if (bidderCode == null) {
+      return true;
+    }
+    const storageAllowed = bidderSettings.get(bidderCode, 'storageAllowed');
+    return storageAllowed == null ? false : storageAllowed;
+  }
+
+  if (moduleTypeWhiteList.includes(moduleType)) {
+    gvlid = gvlid || VENDORLESS_GVLID;
+  }
+
   function isValid(cb) {
-    if (includes(moduleTypeWhiteList, moduleType)) {
-      let result = {
-        valid: true
-      }
+    if (!isBidderAllowed()) {
+      logInfo(`bidderSettings denied access to device storage for bidder '${bidderCode}'`);
+      const result = {valid: false};
       return cb(result);
     } else {
       let value;
       let hookDetails = {
         hasEnforcementHook: false
       }
-      validateStorageEnforcement(gvlid, moduleName, hookDetails, function(result) {
+      validateStorageEnforcement(gvlid, bidderCode || moduleName, hookDetails, function(result) {
         if (result && result.hasEnforcementHook) {
           value = cb(result);
         } else {
           let result = {
             hasEnforcementHook: false,
-            valid: utils.hasDeviceAccess()
+            valid: hasDeviceAccess()
           }
           value = cb(result);
         }
@@ -110,7 +124,12 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
         try {
           localStorage.setItem('prebid.cookieTest', '1');
           return localStorage.getItem('prebid.cookieTest') === '1';
-        } catch (error) {}
+        } catch (error) {
+        } finally {
+          try {
+            localStorage.removeItem('prebid.cookieTest');
+          } catch (error) {}
+        }
       }
       return false;
     }
@@ -130,11 +149,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
   const cookiesAreEnabled = function (done) {
     let cb = function (result) {
       if (result && result.valid) {
-        if (utils.checkCookieSupport()) {
-          return true;
-        }
-        window.document.cookie = 'prebid.cookieTest';
-        return window.document.cookie.indexOf('prebid.cookieTest') !== -1;
+        return checkCookieSupport();
       }
       return false;
     }
@@ -154,7 +169,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
    */
   const setDataInLocalStorage = function (key, value, done) {
     let cb = function (result) {
-      if (result && result.valid) {
+      if (result && result.valid && hasLocalStorage()) {
         window.localStorage.setItem(key, value);
       }
     }
@@ -174,7 +189,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
    */
   const getDataFromLocalStorage = function (key, done) {
     let cb = function (result) {
-      if (result && result.valid) {
+      if (result && result.valid && hasLocalStorage()) {
         return window.localStorage.getItem(key);
       }
       return null;
@@ -194,7 +209,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
    */
   const removeDataFromLocalStorage = function (key, done) {
     let cb = function (result) {
-      if (result && result.valid) {
+      if (result && result.valid && hasLocalStorage()) {
         window.localStorage.removeItem(key);
       }
     }
@@ -217,7 +232,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
         try {
           return !!window.localStorage;
         } catch (e) {
-          utils.logError('Local storage api disabled');
+          logError('Local storage api disabled');
         }
       }
       return false;
@@ -242,7 +257,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
     let cb = function (result) {
       if (result && result.valid) {
         const all = [];
-        if (utils.hasDeviceAccess()) {
+        if (hasDeviceAccess()) {
           const cookies = document.cookie.split(';');
           while (cookies.length) {
             const cookie = cookies.pop();
@@ -298,12 +313,17 @@ export function getCoreStorageManager(moduleName) {
 
 /**
  * Note: Core modules or Prebid modules like Currency, SizeMapping should use getCoreStorageManager
- * This function returns storage functions to access cookies and localstorage. Bidders and User id modules should import this and use it in their module if needed. GVL ID and Module name are optional param but gvl id is needed for when gdpr enforcement module is used.
- * @param {Number=} gvlid Vendor id
- * @param {string=} moduleName BidderCode or module name
+ * This function returns storage functions to access cookies and localstorage. Bidders and User id modules should import this and use it in their module if needed.
+ * Bid adapters should always provide `bidderCode`. GVL ID and Module name are optional param but gvl id is needed for when gdpr enforcement module is used.
+ * @param {Number=} gvlid? Vendor id - required for proper GDPR integration
+ * @param {string=} bidderCode? - required for bid adapters
+ * @param {string=} moduleName? module name
  */
-export function getStorageManager(gvlid, moduleName) {
-  return newStorageManager({gvlid: gvlid, moduleName: moduleName});
+export function getStorageManager({gvlid, moduleName, bidderCode} = {}) {
+  if (arguments.length > 1 || (arguments.length > 0 && !isPlainObject(arguments[0]))) {
+    throw new Error('Invalid invocation for getStorageManager')
+  }
+  return newStorageManager({gvlid, moduleName, bidderCode});
 }
 
 export function resetData() {
diff --git a/src/targeting.js b/src/targeting.js
index 45c098554a5..a75c9a2b52f 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -1,57 +1,97 @@
-import { uniques, isGptPubadsDefined, getHighestCpm, getOldestHighestCpmBid, groupBy, isAdUnitCodeMatchingSlot, timestamp, deepAccess, deepClone, logError, logWarn, logInfo } from './utils.js';
-import { config } from './config.js';
-import { NATIVE_TARGETING_KEYS } from './native.js';
-import { auctionManager } from './auctionManager.js';
-import { sizeSupported } from './sizeMapping.js';
-import { ADPOD } from './mediaTypes.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const utils = require('./utils.js');
-var CONSTANTS = require('./constants.json');
+import {
+  deepAccess,
+  deepClone,
+  getHighestCpm,
+  getOldestHighestCpmBid,
+  groupBy,
+  isAdUnitCodeMatchingSlot,
+  isArray,
+  isFn,
+  isGptPubadsDefined,
+  isStr,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  timestamp,
+  uniques,
+} from './utils.js';
+import {config} from './config.js';
+import {NATIVE_TARGETING_KEYS} from './native.js';
+import {auctionManager} from './auctionManager.js';
+import {ADPOD} from './mediaTypes.js';
+import {hook} from './hook.js';
+import {bidderSettings} from './bidderSettings.js';
+import {find, includes} from './polyfill.js';
+import CONSTANTS from './constants.json';
 
 var pbTargetingKeys = [];
 
 const MAX_DFP_KEYLENGTH = 20;
-const TTL_BUFFER = 1000;
+let DEFAULT_TTL_BUFFER = 1;
+
+config.getConfig('ttlBuffer', (cfg) => {
+  if (typeof cfg.ttlBuffer === 'number') {
+    DEFAULT_TTL_BUFFER = cfg.ttlBuffer;
+  } else {
+    logError('Invalid value for ttlBuffer', cfg.ttlBuffer);
+  }
+})
+
+const CFG_ALLOW_TARGETING_KEYS = `targetingControls.allowTargetingKeys`;
+const CFG_ADD_TARGETING_KEYS = `targetingControls.addTargetingKeys`;
+const TARGETING_KEY_CONFIGURATION_ERROR_MSG = `Only one of "${CFG_ALLOW_TARGETING_KEYS}" or "${CFG_ADD_TARGETING_KEYS}" can be set`;
 
 export const TARGETING_KEYS = Object.keys(CONSTANTS.TARGETING_KEYS).map(
   key => CONSTANTS.TARGETING_KEYS[key]
 );
 
 // return unexpired bids
-const isBidNotExpired = (bid) => (bid.responseTimestamp + bid.ttl * 1000 + TTL_BUFFER) > timestamp();
+const isBidNotExpired = (bid) => (bid.responseTimestamp + (bid.ttl - (bid.hasOwnProperty('ttlBuffer') ? bid.ttlBuffer : DEFAULT_TTL_BUFFER)) * 1000) > timestamp();
 
 // return bids whose status is not set. Winning bids can only have a status of `rendered`.
 const isUnusedBid = (bid) => bid && ((bid.status && !includes([CONSTANTS.BID_STATUS.RENDERED], bid.status)) || !bid.status);
 
 export let filters = {
+  isActualBid(bid) {
+    return bid.getStatusCode() === CONSTANTS.STATUS.GOOD
+  },
   isBidNotExpired,
   isUnusedBid
 };
 
+export function isBidUsable(bid) {
+  return !Object.values(filters).some((predicate) => !predicate(bid));
+}
+
 // If two bids are found for same adUnitCode, we will use the highest one to take part in auction
 // This can happen in case of concurrent auctions
 // If adUnitBidLimit is set above 0 return top N number of bids
-export function getHighestCpmBidsFromBidPool(bidsReceived, highestCpmCallback, adUnitBidLimit = 0) {
-  const bids = [];
-  const dealPrioritization = config.getConfig('sendBidsControl.dealPrioritization');
-  // bucket by adUnitcode
-  let buckets = groupBy(bidsReceived, 'adUnitCode');
-  // filter top bid for each bucket by bidder
-  Object.keys(buckets).forEach(bucketKey => {
-    let bucketBids = [];
-    let bidsByBidder = groupBy(buckets[bucketKey], 'bidderCode');
-    Object.keys(bidsByBidder).forEach(key => bucketBids.push(bidsByBidder[key].reduce(highestCpmCallback)));
-    // if adUnitBidLimit is set, pass top N number bids
-    if (adUnitBidLimit > 0) {
-      bucketBids = dealPrioritization ? bucketBids(sortByDealAndPriceBucketOrCpm(true)) : bucketBids.sort((a, b) => b.cpm - a.cpm);
-      bids.push(...bucketBids.slice(0, adUnitBidLimit));
-    } else {
-      bids.push(...bucketBids);
-    }
-  });
-  return bids;
-}
+export const getHighestCpmBidsFromBidPool = hook('sync', function(bidsReceived, highestCpmCallback, adUnitBidLimit = 0, hasModified = false) {
+  if (!hasModified) {
+    const bids = [];
+    const dealPrioritization = config.getConfig('sendBidsControl.dealPrioritization');
+    // bucket by adUnitcode
+    let buckets = groupBy(bidsReceived, 'adUnitCode');
+    // filter top bid for each bucket by bidder
+    Object.keys(buckets).forEach(bucketKey => {
+      let bucketBids = [];
+      let bidsByBidder = groupBy(buckets[bucketKey], 'bidderCode');
+      Object.keys(bidsByBidder).forEach(key => bucketBids.push(bidsByBidder[key].reduce(highestCpmCallback)));
+      // if adUnitBidLimit is set, pass top N number bids
+      if (adUnitBidLimit > 0) {
+        bucketBids = dealPrioritization ? bucketBids.sort(sortByDealAndPriceBucketOrCpm(true)) : bucketBids.sort((a, b) => b.cpm - a.cpm);
+        bids.push(...bucketBids.slice(0, adUnitBidLimit));
+      } else {
+        bids.push(...bucketBids);
+      }
+    });
+
+    return bids;
+  }
+
+  return bidsReceived;
+});
 
 /**
 * A descending sort function that will sort the list of objects based on the following two dimensions:
@@ -76,11 +116,11 @@ export function getHighestCpmBidsFromBidPool(bidsReceived, highestCpmCallback, a
 */
 export function sortByDealAndPriceBucketOrCpm(useCpm = false) {
   return function(a, b) {
-    if (a.adUnitTargeting.hb_deal !== undefined && b.adUnitTargeting.hb_deal === undefined) {
+    if (a.adserverTargeting.hb_deal !== undefined && b.adserverTargeting.hb_deal === undefined) {
       return -1;
     }
 
-    if ((a.adUnitTargeting.hb_deal === undefined && b.adUnitTargeting.hb_deal !== undefined)) {
+    if ((a.adserverTargeting.hb_deal === undefined && b.adserverTargeting.hb_deal !== undefined)) {
       return 1;
     }
 
@@ -89,7 +129,7 @@ export function sortByDealAndPriceBucketOrCpm(useCpm = false) {
       return b.cpm - a.cpm;
     }
 
-    return b.adUnitTargeting.hb_pb - a.adUnitTargeting.hb_pb;
+    return b.adserverTargeting.hb_pb - a.adserverTargeting.hb_pb;
   }
 }
 
@@ -114,17 +154,19 @@ export function newTargeting(auctionManager) {
     if (isGptPubadsDefined()) {
       const adUnitCodes = getAdUnitCodes(adUnitCode);
       const adUnits = auctionManager.getAdUnits().filter(adUnit => includes(adUnitCodes, adUnit.code));
+      let unsetKeys = pbTargetingKeys.reduce((reducer, key) => {
+        reducer[key] = null;
+        return reducer;
+      }, {});
       window.googletag.pubads().getSlots().forEach(slot => {
-        let customSlotMatchingFunc = utils.isFn(customSlotMatching) && customSlotMatching(slot);
-        pbTargetingKeys.forEach(function(key) {
-          // reset only registered adunits
-          adUnits.forEach(function(unit) {
-            if (unit.code === slot.getAdUnitPath() ||
-                unit.code === slot.getSlotElementId() ||
-                (utils.isFn(customSlotMatchingFunc) && customSlotMatchingFunc(unit.code))) {
-              slot.setTargeting(key, null);
-            }
-          });
+        let customSlotMatchingFunc = isFn(customSlotMatching) && customSlotMatching(slot);
+        // reset only registered adunits
+        adUnits.forEach(unit => {
+          if (unit.code === slot.getAdUnitPath() ||
+              unit.code === slot.getSlotElementId() ||
+              (isFn(customSlotMatchingFunc) && customSlotMatchingFunc(unit.code))) {
+            slot.updateTargetingFromMap(unsetKeys);
+          }
         });
       });
     }
@@ -153,7 +195,7 @@ export function newTargeting(auctionManager) {
    */
   function bidShouldBeAddedToTargeting(bid, adUnitCodes) {
     return bid.adserverTargeting && adUnitCodes &&
-      ((utils.isArray(adUnitCodes) && includes(adUnitCodes, bid.adUnitCode)) ||
+      ((isArray(adUnitCodes) && includes(adUnitCodes, bid.adUnitCode)) ||
       (typeof adUnitCodes === 'string' && bid.adUnitCode === adUnitCodes));
   };
 
@@ -162,7 +204,7 @@ export function newTargeting(auctionManager) {
    */
   function getDealBids(adUnitCodes, bidsReceived) {
     if (config.getConfig('targetingControls.alwaysIncludeDeals') === true) {
-      const standardKeys = TARGETING_KEYS.concat(NATIVE_TARGETING_KEYS);
+      const standardKeys = FEATURES.NATIVE ? TARGETING_KEYS.concat(NATIVE_TARGETING_KEYS) : TARGETING_KEYS.slice();
 
       // we only want the top bid from bidders who have multiple entries per ad unit code
       const bids = getHighestCpmBidsFromBidPool(bidsReceived, getHighestCpm);
@@ -181,6 +223,48 @@ export function newTargeting(auctionManager) {
     return [];
   };
 
+  /**
+   * Returns filtered ad server targeting for custom and allowed keys.
+   * @param {targetingArray} targeting
+   * @param {string[]} allowedKeys
+   * @return {targetingArray} filtered targeting
+   */
+  function getAllowedTargetingKeyValues(targeting, allowedKeys) {
+    const defaultKeyring = Object.assign({}, CONSTANTS.TARGETING_KEYS, CONSTANTS.NATIVE_KEYS);
+    const defaultKeys = Object.keys(defaultKeyring);
+    const keyDispositions = {};
+    logInfo(`allowTargetingKeys - allowed keys [ ${allowedKeys.map(k => defaultKeyring[k]).join(', ')} ]`);
+    targeting.map(adUnit => {
+      const adUnitCode = Object.keys(adUnit)[0];
+      const keyring = adUnit[adUnitCode];
+      const keys = keyring.filter(kvPair => {
+        const key = Object.keys(kvPair)[0];
+        // check if key is in default keys, if not, it's custom, we won't remove it.
+        const isCustom = defaultKeys.filter(defaultKey => key.indexOf(defaultKeyring[defaultKey]) === 0).length === 0;
+        // check if key explicitly allowed, if not, we'll remove it.
+        const found = isCustom || find(allowedKeys, allowedKey => {
+          const allowedKeyName = defaultKeyring[allowedKey];
+          // we're looking to see if the key exactly starts with one of our default keys.
+          // (which hopefully means it's not custom)
+          const found = key.indexOf(allowedKeyName) === 0;
+          return found;
+        });
+        keyDispositions[key] = !found;
+        return found;
+      });
+      adUnit[adUnitCode] = keys;
+    });
+    const removedKeys = Object.keys(keyDispositions).filter(d => keyDispositions[d]);
+    logInfo(`allowTargetingKeys - removed keys [ ${removedKeys.join(', ')} ]`);
+    // remove any empty targeting objects, as they're unnecessary.
+    const filteredTargeting = targeting.filter(adUnit => {
+      const adUnitCode = Object.keys(adUnit)[0];
+      const keyring = adUnit[adUnitCode];
+      return keyring.length > 0;
+    });
+    return filteredTargeting
+  }
+
   /**
    * Returns all ad server targeting for all ad units.
    * @param {string=} adUnitCode
@@ -193,7 +277,8 @@ export function newTargeting(auctionManager) {
     // `alwaysUseBid=true`. If sending all bids is enabled, add targeting for losing bids.
     var targeting = getWinningBidTargeting(adUnitCodes, bidsReceived)
       .concat(getCustomBidTargeting(adUnitCodes, bidsReceived))
-      .concat(config.getConfig('enableSendAllBids') ? getBidLandscapeTargeting(adUnitCodes, bidsReceived) : getDealBids(adUnitCodes, bidsReceived));
+      .concat(config.getConfig('enableSendAllBids') ? getBidLandscapeTargeting(adUnitCodes, bidsReceived) : getDealBids(adUnitCodes, bidsReceived))
+      .concat(getAdUnitTargeting(adUnitCodes));
 
     // store a reference of the targeting keys
     targeting.map(adUnitCode => {
@@ -206,6 +291,22 @@ export function newTargeting(auctionManager) {
       });
     });
 
+    const defaultKeys = Object.keys(Object.assign({}, CONSTANTS.DEFAULT_TARGETING_KEYS, CONSTANTS.NATIVE_KEYS));
+    let allowedKeys = config.getConfig(CFG_ALLOW_TARGETING_KEYS);
+    const addedKeys = config.getConfig(CFG_ADD_TARGETING_KEYS);
+
+    if (addedKeys != null && allowedKeys != null) {
+      throw new Error(TARGETING_KEY_CONFIGURATION_ERROR_MSG);
+    } else if (addedKeys != null) {
+      allowedKeys = defaultKeys.concat(addedKeys);
+    } else {
+      allowedKeys = allowedKeys || defaultKeys;
+    }
+
+    if (Array.isArray(allowedKeys) && allowedKeys.length > 0) {
+      targeting = getAllowedTargetingKeyValues(targeting, allowedKeys);
+    }
+
     targeting = flattenTargeting(targeting);
 
     const auctionKeysThreshold = config.getConfig('targetingControls.auctionKeyMaxChars');
@@ -224,6 +325,13 @@ export function newTargeting(auctionManager) {
     return targeting;
   };
 
+  // warn about conflicting configuration
+  config.getConfig('targetingControls', function (config) {
+    if (deepAccess(config, CFG_ALLOW_TARGETING_KEYS) != null && deepAccess(config, CFG_ADD_TARGETING_KEYS) != null) {
+      logError(TARGETING_KEY_CONFIGURATION_ERROR_MSG);
+    }
+  });
+
   // create an encoded string variant based on the keypairs of the provided object
   //  - note this will encode the characters between the keys (ie = and &)
   function convertKeysToQueryForm(keyMap) {
@@ -240,13 +348,13 @@ export function newTargeting(auctionManager) {
     let targetingMap = Object.keys(targetingCopy).map(adUnitCode => {
       return {
         adUnitCode,
-        adUnitTargeting: targetingCopy[adUnitCode]
+        adserverTargeting: targetingCopy[adUnitCode]
       };
     }).sort(sortByDealAndPriceBucketOrCpm());
 
     // iterate through the targeting based on above list and transform the keys into the query-equivalent and count characters
     return targetingMap.reduce(function (accMap, currMap, index, arr) {
-      let adUnitQueryString = convertKeysToQueryForm(currMap.adUnitTargeting);
+      let adUnitQueryString = convertKeysToQueryForm(currMap.adserverTargeting);
 
       // for the last adUnit - trim last encoded ampersand from the converted query string
       if ((index + 1) === arr.length) {
@@ -281,7 +389,7 @@ export function newTargeting(auctionManager) {
    *      "div-gpt-ad-1460505748561-0": [{"hb_bidder": ["appnexusAst"]}]
    *    },
    *    {
-   *      "div-gpt-ad-1460505748561-0": [{"hb_bidder_appnexusAs": ["appnexusAst"]}]
+   *      "div-gpt-ad-1460505748561-0": [{"hb_bidder_appnexusAs": ["appnexusAst", "other"]}]
    *    }
    * ]
    * ```
@@ -290,7 +398,7 @@ export function newTargeting(auctionManager) {
    * {
    *  "div-gpt-ad-1460505748561-0": {
    *    "hb_bidder": "appnexusAst",
-   *    "hb_bidder_appnexusAs": "appnexusAst"
+   *    "hb_bidder_appnexusAs": "appnexusAst,other"
    *  }
    * }
    * ```
@@ -304,7 +412,7 @@ export function newTargeting(auctionManager) {
         [Object.keys(targeting)[0]]: targeting[Object.keys(targeting)[0]]
           .map(target => {
             return {
-              [Object.keys(target)[0]]: target[Object.keys(target)[0]].join(', ')
+              [Object.keys(target)[0]]: target[Object.keys(target)[0]].join(',')
             };
           }).reduce((p, c) => Object.assign(c, p), {})
       };
@@ -323,18 +431,18 @@ export function newTargeting(auctionManager) {
   targeting.setTargetingForGPT = function(targetingConfig, customSlotMatching) {
     window.googletag.pubads().getSlots().forEach(slot => {
       Object.keys(targetingConfig).filter(customSlotMatching ? customSlotMatching(slot) : isAdUnitCodeMatchingSlot(slot))
-        .forEach(targetId =>
+        .forEach(targetId => {
           Object.keys(targetingConfig[targetId]).forEach(key => {
-            let valueArr = targetingConfig[targetId][key].split(',');
-            valueArr = (valueArr.length > 1) ? [valueArr] : valueArr;
-            valueArr.map((value) => {
-              utils.logMessage(`Attempting to set key value for slot: ${slot.getSlotElementId()} key: ${key} value: ${value}`);
-              return value;
-            }).forEach(value => {
-              slot.setTargeting(key, value);
-            });
-          })
-        )
+            let value = targetingConfig[targetId][key];
+            if (typeof value === 'string' && value.indexOf(',') !== -1) {
+              // due to the check the array will be formed only if string has ',' else plain string will be assigned as value
+              value = value.split(',');
+            }
+            targetingConfig[targetId][key] = value;
+          });
+          logMessage(`Attempting to set targeting-map for slot: ${slot.getSlotElementId()} with targeting-map:`, targetingConfig[targetId]);
+          slot.updateTargetingFromMap(targetingConfig[targetId])
+        })
     })
   };
 
@@ -346,7 +454,7 @@ export function newTargeting(auctionManager) {
   function getAdUnitCodes(adUnitCode) {
     if (typeof adUnitCode === 'string') {
       return [adUnitCode];
-    } else if (utils.isArray(adUnitCode)) {
+    } else if (isArray(adUnitCode)) {
       return adUnitCode;
     }
     return auctionManager.getAdUnitCodes() || [];
@@ -356,15 +464,20 @@ export function newTargeting(auctionManager) {
     let bidsReceived = auctionManager.getBidsReceived();
 
     if (!config.getConfig('useBidCache')) {
+      // don't use bid cache (i.e. filter out bids not in the latest auction)
       bidsReceived = bidsReceived.filter(bid => latestAuctionForAdUnit[bid.adUnitCode] === bid.auctionId)
+    } else {
+      // if custom bid cache filter function exists, run for each bid from
+      // previous auctions. If it returns true, include bid in bid pool
+      const filterFunction = config.getConfig('bidCacheFilterFunction');
+      if (typeof filterFunction === 'function') {
+        bidsReceived = bidsReceived.filter(bid => latestAuctionForAdUnit[bid.adUnitCode] === bid.auctionId || !!filterFunction(bid))
+      }
     }
 
     bidsReceived = bidsReceived
       .filter(bid => deepAccess(bid, 'video.context') !== ADPOD)
-      .filter(bid => bid.mediaType !== 'banner' || sizeSupported([bid.width, bid.height]))
-      .filter(filters.isUnusedBid)
-      .filter(filters.isBidNotExpired)
-    ;
+      .filter(isBidUsable);
 
     return getHighestCpmBidsFromBidPool(bidsReceived, getOldestHighestCpmBid);
   }
@@ -378,7 +491,7 @@ export function newTargeting(auctionManager) {
     const adUnitCodes = getAdUnitCodes(adUnitCode);
     return bidsReceived
       .filter(bid => includes(adUnitCodes, bid.adUnitCode))
-      .filter(bid => bid.cpm > 0)
+      .filter(bid => (bidderSettings.get(bid.bidderCode, 'allowZeroCpmBids') === true) ? bid.cpm >= 0 : bid.cpm > 0)
       .map(bid => bid.adUnitCode)
       .filter(uniques)
       .map(adUnitCode => bidsReceived
@@ -396,14 +509,14 @@ export function newTargeting(auctionManager) {
     try {
       targeting.resetPresetTargetingAST(adUnitCodes);
     } catch (e) {
-      utils.logError('unable to reset targeting for AST' + e)
+      logError('unable to reset targeting for AST' + e)
     }
 
     Object.keys(astTargeting).forEach(targetId =>
       Object.keys(astTargeting[targetId]).forEach(key => {
-        utils.logMessage(`Attempting to set targeting for targetId: ${targetId} key: ${key} value: ${astTargeting[targetId][key]}`);
+        logMessage(`Attempting to set targeting for targetId: ${targetId} key: ${key} value: ${astTargeting[targetId][key]}`);
         // setKeywords supports string and array as value
-        if (utils.isStr(astTargeting[targetId][key]) || utils.isArray(astTargeting[targetId][key])) {
+        if (isStr(astTargeting[targetId][key]) || isArray(astTargeting[targetId][key])) {
           let keywordsObj = {};
           let regex = /pt[0-9]/;
           if (key.search(regex) < 0) {
@@ -468,7 +581,7 @@ export function newTargeting(auctionManager) {
   function mergeAdServerTargeting(acc, bid, index, arr) {
     function concatTargetingValue(key) {
       return function(currentBidElement) {
-        if (!utils.isArray(currentBidElement.adserverTargeting[key])) {
+        if (!isArray(currentBidElement.adserverTargeting[key])) {
           currentBidElement.adserverTargeting[key] = [currentBidElement.adserverTargeting[key]];
         }
         currentBidElement.adserverTargeting[key] = currentBidElement.adserverTargeting[key].concat(bid.adserverTargeting[key]).filter(uniques);
@@ -495,7 +608,10 @@ export function newTargeting(auctionManager) {
   }
 
   function getCustomKeys() {
-    let standardKeys = getStandardKeys().concat(NATIVE_TARGETING_KEYS);
+    let standardKeys = getStandardKeys();
+    if (FEATURES.NATIVE) {
+      standardKeys = standardKeys.concat(NATIVE_TARGETING_KEYS);
+    }
     return function(key) {
       return standardKeys.indexOf(key) === -1;
     }
@@ -535,16 +651,22 @@ export function newTargeting(auctionManager) {
    * @return {targetingArray}   all non-winning bids targeting
    */
   function getBidLandscapeTargeting(adUnitCodes, bidsReceived) {
-    const standardKeys = TARGETING_KEYS.concat(NATIVE_TARGETING_KEYS);
+    const standardKeys = FEATURES.NATIVE ? TARGETING_KEYS.concat(NATIVE_TARGETING_KEYS) : TARGETING_KEYS.slice();
     const adUnitBidLimit = config.getConfig('sendBidsControl.bidLimit');
     const bids = getHighestCpmBidsFromBidPool(bidsReceived, getHighestCpm, adUnitBidLimit);
+    const allowSendAllBidsTargetingKeys = config.getConfig('targetingControls.allowSendAllBidsTargetingKeys');
+
+    const allowedSendAllBidTargeting = allowSendAllBidsTargetingKeys
+      ? allowSendAllBidsTargetingKeys.map((key) => CONSTANTS.TARGETING_KEYS[key])
+      : standardKeys;
 
     // populate targeting keys for the remaining bids
     return bids.map(bid => {
       if (bidShouldBeAddedToTargeting(bid, adUnitCodes)) {
         return {
           [bid.adUnitCode]: getTargetingMap(bid, standardKeys.filter(
-            key => typeof bid.adserverTargeting[key] !== 'undefined')
+            key => typeof bid.adserverTargeting[key] !== 'undefined' &&
+            allowedSendAllBidTargeting.indexOf(key) !== -1)
           )
         };
       }
@@ -559,8 +681,31 @@ export function newTargeting(auctionManager) {
     });
   }
 
+  function getAdUnitTargeting(adUnitCodes) {
+    function getTargetingObj(adUnit) {
+      return deepAccess(adUnit, CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING);
+    }
+
+    function getTargetingValues(adUnit) {
+      const aut = getTargetingObj(adUnit);
+
+      return Object.keys(aut)
+        .map(function(key) {
+          if (isStr(aut[key])) aut[key] = aut[key].split(',').map(s => s.trim());
+          if (!isArray(aut[key])) aut[key] = [ aut[key] ];
+          return { [key]: aut[key] };
+        });
+    }
+
+    return auctionManager.getAdUnits()
+      .filter(adUnit => includes(adUnitCodes, adUnit.code) && getTargetingObj(adUnit))
+      .map(adUnit => {
+        return {[adUnit.code]: getTargetingValues(adUnit)}
+      });
+  }
+
   targeting.isApntagDefined = function() {
-    if (window.apntag && utils.isFn(window.apntag.setKeywords)) {
+    if (window.apntag && isFn(window.apntag.setKeywords)) {
       return true;
     }
   };
diff --git a/src/userSync.js b/src/userSync.js
index fceeb1d722d..dec8f650930 100644
--- a/src/userSync.js
+++ b/src/userSync.js
@@ -1,6 +1,9 @@
-import * as utils from './utils.js';
+import {
+  deepClone, isPlainObject, logError, shuffle, logMessage, triggerPixel, insertUserSyncIframe, isArray,
+  logWarn, isStr, isSafariBrowser
+} from './utils.js';
 import { config } from './config.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {includes} from './polyfill.js';
 import { getCoreStorageManager } from './storageManager.js';
 
 export const USERSYNC_DEFAULT_CONFIG = {
@@ -18,7 +21,7 @@ export const USERSYNC_DEFAULT_CONFIG = {
 
 // Set userSync default values
 config.setDefaults({
-  'userSync': utils.deepClone(USERSYNC_DEFAULT_CONFIG)
+  'userSync': deepClone(USERSYNC_DEFAULT_CONFIG)
 });
 
 const storage = getCoreStorageManager('usersync');
@@ -54,7 +57,7 @@ export function newUserSync(userSyncDependencies) {
     // if userSync.filterSettings does not contain image/all configs, merge in default image config to ensure image pixels are fired
     if (conf.userSync) {
       let fs = conf.userSync.filterSettings;
-      if (utils.isPlainObject(fs)) {
+      if (isPlainObject(fs)) {
         if (!fs.image && !fs.all) {
           conf.userSync.filterSettings.image = {
             bidders: '*',
@@ -91,12 +94,12 @@ export function newUserSync(userSyncDependencies) {
     }
 
     try {
-      // Image pixels
-      fireImagePixels();
       // Iframe syncs
       loadIframes();
+      // Image pixels
+      fireImagePixels();
     } catch (e) {
-      return utils.logError('Error firing user syncs', e);
+      return logError('Error firing user syncs', e);
     }
     // Reset the user sync queue
     queue = getDefaultQueue();
@@ -106,7 +109,7 @@ export function newUserSync(userSyncDependencies) {
     // Randomize the order of the pixels before firing
     // This is to avoid giving any bidder who has registered multiple syncs
     // any preferential treatment and balancing them out
-    utils.shuffle(queue).forEach((sync) => {
+    shuffle(queue).forEach((sync) => {
       fn(sync);
       hasFiredBidder.add(sync[0]);
     });
@@ -123,9 +126,9 @@ export function newUserSync(userSyncDependencies) {
     }
     forEachFire(queue.image, (sync) => {
       let [bidderName, trackingPixelUrl] = sync;
-      utils.logMessage(`Invoking image pixel user sync for bidder: ${bidderName}`);
+      logMessage(`Invoking image pixel user sync for bidder: ${bidderName}`);
       // Create image object and add the src url
-      utils.triggerPixel(trackingPixelUrl);
+      triggerPixel(trackingPixelUrl);
     });
   }
 
@@ -138,11 +141,21 @@ export function newUserSync(userSyncDependencies) {
     if (!(permittedPixels.iframe)) {
       return;
     }
+
     forEachFire(queue.iframe, (sync) => {
       let [bidderName, iframeUrl] = sync;
-      utils.logMessage(`Invoking iframe user sync for bidder: ${bidderName}`);
+      logMessage(`Invoking iframe user sync for bidder: ${bidderName}`);
       // Insert iframe into DOM
-      utils.insertUserSyncIframe(iframeUrl);
+      insertUserSyncIframe(iframeUrl);
+      // for a bidder, if iframe sync is present then remove image pixel
+      removeImagePixelsForBidder(queue, bidderName);
+    });
+  }
+
+  function removeImagePixelsForBidder(queue, iframeSyncBidderName) {
+    queue.image = queue.image.filter(imageSync => {
+      let imageSyncBidderName = imageSync[0];
+      return imageSyncBidderName !== iframeSyncBidderName
     });
   }
 
@@ -177,21 +190,21 @@ export function newUserSync(userSyncDependencies) {
    */
   publicApi.registerSync = (type, bidder, url) => {
     if (hasFiredBidder.has(bidder)) {
-      return utils.logMessage(`already fired syncs for "${bidder}", ignoring registerSync call`);
+      return logMessage(`already fired syncs for "${bidder}", ignoring registerSync call`);
     }
-    if (!usConfig.syncEnabled || !utils.isArray(queue[type])) {
-      return utils.logWarn(`User sync type "${type}" not supported`);
+    if (!usConfig.syncEnabled || !isArray(queue[type])) {
+      return logWarn(`User sync type "${type}" not supported`);
     }
     if (!bidder) {
-      return utils.logWarn(`Bidder is required for registering sync`);
+      return logWarn(`Bidder is required for registering sync`);
     }
     if (usConfig.syncsPerBidder !== 0 && Number(numAdapterBids[bidder]) >= usConfig.syncsPerBidder) {
-      return utils.logWarn(`Number of user syncs exceeded for "${bidder}"`);
+      return logWarn(`Number of user syncs exceeded for "${bidder}"`);
     }
 
     const canBidderRegisterSync = publicApi.canBidderRegisterSync(type, bidder);
     if (!canBidderRegisterSync) {
-      return utils.logWarn(`Bidder "${bidder}" not permitted to register their "${type}" userSync pixels.`);
+      return logWarn(`Bidder "${bidder}" not permitted to register their "${type}" userSync pixels.`);
     }
 
     // the bidder's pixel has passed all checks and is allowed to register
@@ -225,7 +238,7 @@ export function newUserSync(userSyncDependencies) {
       }
       return checkForFiltering[filterType](biddersToFilter, bidder);
     }
-    return false;
+    return !permittedPixels[type];
   }
 
   /**
@@ -238,7 +251,7 @@ export function newUserSync(userSyncDependencies) {
    */
   function isFilterConfigValid(filterConfig, type) {
     if (filterConfig.all && filterConfig[type]) {
-      utils.logWarn(`Detected presence of the "filterSettings.all" and "filterSettings.${type}" in userSync config.  You cannot mix "all" with "iframe/image" configs; they are mutually exclusive.`);
+      logWarn(`Detected presence of the "filterSettings.all" and "filterSettings.${type}" in userSync config.  You cannot mix "all" with "iframe/image" configs; they are mutually exclusive.`);
       return false;
     }
 
@@ -255,12 +268,12 @@ export function newUserSync(userSyncDependencies) {
     let biddersField = activeConfig.bidders;
 
     if (filterField && filterField !== 'include' && filterField !== 'exclude') {
-      utils.logWarn(`UserSync "filterSettings.${activeConfigName}.filter" setting '${filterField}' is not a valid option; use either 'include' or 'exclude'.`);
+      logWarn(`UserSync "filterSettings.${activeConfigName}.filter" setting '${filterField}' is not a valid option; use either 'include' or 'exclude'.`);
       return false;
     }
 
-    if (biddersField !== '*' && !(Array.isArray(biddersField) && biddersField.length > 0 && biddersField.every(bidderInList => utils.isStr(bidderInList) && bidderInList !== '*'))) {
-      utils.logWarn(`Detected an invalid setup in userSync "filterSettings.${activeConfigName}.bidders"; use either '*' (to represent all bidders) or an array of bidders.`);
+    if (biddersField !== '*' && !(Array.isArray(biddersField) && biddersField.length > 0 && biddersField.every(bidderInList => isStr(bidderInList) && bidderInList !== '*'))) {
+      logWarn(`Detected an invalid setup in userSync "filterSettings.${activeConfigName}.bidders"; use either '*' (to represent all bidders) or an array of bidders.`);
       return false;
     }
 
@@ -298,16 +311,20 @@ export function newUserSync(userSyncDependencies) {
       }
     }
     return true;
-  }
+  };
   return publicApi;
 }
 
-const browserSupportsCookies = !utils.isSafariBrowser() && storage.cookiesAreEnabled();
-
-export const userSync = newUserSync({
+export const userSync = newUserSync(Object.defineProperties({
   config: config.getConfig('userSync'),
-  browserSupportsCookies: browserSupportsCookies
-});
+}, {
+  browserSupportsCookies: {
+    get: function() {
+      // call storage lazily to give time for consent data to be available
+      return !isSafariBrowser() && storage.cookiesAreEnabled();
+    }
+  }
+}));
 
 /**
  * @typedef {Object} UserSyncDependencies
diff --git a/src/utils.js b/src/utils.js
index 88328ff10aa..869e1007841 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,14 +1,10 @@
-/* eslint-disable no-console */
 import { config } from './config.js';
 import clone from 'just-clone';
-import deepequal from 'deep-equal';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const CONSTANTS = require('./constants.json');
-
+import {find, includes} from './polyfill.js';
+import CONSTANTS from './constants.json';
+import {GreedyPromise} from './utils/promise.js';
 export { default as deepAccess } from 'dlv/index.js';
-export { default as deepSetValue } from 'dset';
+export { dset as deepSetValue } from 'dset';
 
 var tArr = 'Array';
 var tStr = 'String';
@@ -23,6 +19,19 @@ let consoleInfoExists = Boolean(consoleExists && window.console.info);
 let consoleWarnExists = Boolean(consoleExists && window.console.warn);
 let consoleErrorExists = Boolean(consoleExists && window.console.error);
 
+let eventEmitter;
+
+export function _setEventEmitter(emitFn) {
+  // called from events.js - this hoop is to avoid circular imports
+  eventEmitter = emitFn;
+}
+
+function emitEvent(...args) {
+  if (eventEmitter != null) {
+    eventEmitter(...args);
+  }
+}
+
 // this allows stubbing of utility functions that are used internally by other utility functions
 export const internal = {
   checkCookieSupport,
@@ -43,6 +52,14 @@ export const internal = {
   deepEqual
 };
 
+let prebidInternal = {};
+/**
+ * Returns object that is used as internal prebid namespace
+ */
+export function getPrebidInternal() {
+  return prebidInternal;
+}
+
 var uniqueRef = {};
 export let bind = function(a, b) { return b; }.bind(null, 1, uniqueRef)() === uniqueRef
   ? Function.prototype.bind
@@ -242,34 +259,63 @@ export function getWindowLocation() {
  */
 export function logMessage() {
   if (debugTurnedOn() && consoleLogExists) {
+    // eslint-disable-next-line no-console
     console.log.apply(console, decorateLog(arguments, 'MESSAGE:'));
   }
 }
 
 export function logInfo() {
   if (debugTurnedOn() && consoleInfoExists) {
+    // eslint-disable-next-line no-console
     console.info.apply(console, decorateLog(arguments, 'INFO:'));
   }
 }
 
 export function logWarn() {
   if (debugTurnedOn() && consoleWarnExists) {
+    // eslint-disable-next-line no-console
     console.warn.apply(console, decorateLog(arguments, 'WARNING:'));
   }
+  emitEvent(CONSTANTS.EVENTS.AUCTION_DEBUG, {type: 'WARNING', arguments: arguments});
 }
 
 export function logError() {
   if (debugTurnedOn() && consoleErrorExists) {
+    // eslint-disable-next-line no-console
     console.error.apply(console, decorateLog(arguments, 'ERROR:'));
   }
+  emitEvent(CONSTANTS.EVENTS.AUCTION_DEBUG, {type: 'ERROR', arguments: arguments});
+}
+
+export function prefixLog(prefix) {
+  function decorate(fn) {
+    return function (...args) {
+      fn(prefix, ...args);
+    }
+  }
+  return {
+    logError: decorate(logError),
+    logWarn: decorate(logWarn),
+    logMessage: decorate(logMessage),
+    logInfo: decorate(logInfo),
+  }
 }
 
 function decorateLog(args, prefix) {
   args = [].slice.call(args);
+  let bidder = config.getCurrentBidder();
+
   prefix && args.unshift(prefix);
-  args.unshift('display: inline-block; color: #fff; background: #3b88c3; padding: 1px 4px; border-radius: 3px;');
-  args.unshift('%cPrebid');
+  if (bidder) {
+    args.unshift(label('#aaa'));
+  }
+  args.unshift(label('#3b88c3'));
+  args.unshift('%cPrebid' + (bidder ? `%c${bidder}` : ''));
   return args;
+
+  function label(color) {
+    return `display: inline-block; color: #fff; background: ${color}; padding: 1px 4px; border-radius: 3px;`
+  }
 }
 
 export function hasConsoleLogger() {
@@ -442,7 +488,7 @@ export function hasOwn(objectToCheck, propertyToCheckFor) {
 * @param {HTMLElement} [doc]
 * @param {HTMLElement} [target]
 * @param {Boolean} [asLastChildChild]
-* @return {HTMLElement}
+* @return {HTML Element}
 */
 export function insertElement(elm, doc, target, asLastChildChild) {
   doc = doc || document;
@@ -462,16 +508,43 @@ export function insertElement(elm, doc, target, asLastChildChild) {
   } catch (e) {}
 }
 
+/**
+ * Returns a promise that completes when the given element triggers a 'load' or 'error' DOM event, or when
+ * `timeout` milliseconds have elapsed.
+ *
+ * @param {HTMLElement} element
+ * @param {Number} [timeout]
+ * @returns {Promise}
+ */
+export function waitForElementToLoad(element, timeout) {
+  let timer = null;
+  return new GreedyPromise((resolve) => {
+    const onLoad = function() {
+      element.removeEventListener('load', onLoad);
+      element.removeEventListener('error', onLoad);
+      if (timer != null) {
+        window.clearTimeout(timer);
+      }
+      resolve();
+    };
+    element.addEventListener('load', onLoad);
+    element.addEventListener('error', onLoad);
+    if (timeout != null) {
+      timer = window.setTimeout(onLoad, timeout);
+    }
+  });
+}
+
 /**
  * Inserts an image pixel with the specified `url` for cookie sync
  * @param {string} url URL string of the image pixel to load
  * @param  {function} [done] an optional exit callback, used when this usersync pixel is added during an async process
+ * @param  {Number} [timeout] an optional timeout in milliseconds for the image to load before calling `done`
  */
-export function triggerPixel(url, done) {
+export function triggerPixel(url, done, timeout) {
   const img = new Image();
   if (done && internal.isFn(done)) {
-    img.addEventListener('load', done);
-    img.addEventListener('error', done);
+    waitForElementToLoad(img, timeout).then(done);
   }
   img.src = url;
 }
@@ -519,18 +592,18 @@ export function insertHtmlIntoIframe(htmlCode) {
  * @param  {string} url URL to be requested
  * @param  {string} encodeUri boolean if URL should be encoded before inserted. Defaults to true
  * @param  {function} [done] an optional exit callback, used when this usersync pixel is added during an async process
+ * @param  {Number} [timeout] an optional timeout in milliseconds for the iframe to load before calling `done`
  */
-export function insertUserSyncIframe(url, done) {
+export function insertUserSyncIframe(url, done, timeout) {
   let iframeHtml = internal.createTrackPixelIframeHtml(url, false, 'allow-scripts allow-same-origin');
   let div = document.createElement('div');
   div.innerHTML = iframeHtml;
   let iframe = div.firstChild;
   if (done && internal.isFn(done)) {
-    iframe.addEventListener('load', done);
-    iframe.addEventListener('error', done);
+    waitForElementToLoad(iframe, timeout).then(done);
   }
   internal.insertElement(iframe, document, 'html', true);
-};
+}
 
 /**
  * Creates a snippet of HTML that retrieves the specified `url`
@@ -637,7 +710,7 @@ export function getKeyByValue(obj, value) {
 export function getBidderCodes(adUnits = $$PREBID_GLOBAL$$.adUnits) {
   // this could memoize adUnits
   return adUnits.map(unit => unit.bids.map(bid => bid.bidder)
-    .reduce(flatten, [])).reduce(flatten).filter(uniques);
+    .reduce(flatten, [])).reduce(flatten, []).filter(uniques);
 }
 
 export function isGptPubadsDefined() {
@@ -646,6 +719,12 @@ export function isGptPubadsDefined() {
   }
 }
 
+export function isApnGetTagDefined() {
+  if (window.apntag && isFn(window.apntag.getTag)) {
+    return true;
+  }
+}
+
 // This function will get highest cpm value bid, in case of tie it will return the bid with lowest timeToRespond
 export const getHighestCpm = getHighestCpmCallback('timeToRespond', (previous, current) => previous > current);
 
@@ -717,10 +796,23 @@ export function replaceAuctionPrice(str, cpm) {
   return str.replace(/\$\{AUCTION_PRICE\}/g, cpm);
 }
 
+export function replaceClickThrough(str, clicktag) {
+  if (!str || !clicktag || typeof clicktag !== 'string') return;
+  return str.replace(/\${CLICKTHROUGH}/g, clicktag);
+}
+
 export function timestamp() {
   return new Date().getTime();
 }
 
+/**
+ * The returned value represents the time elapsed since the time origin. @see https://developer.mozilla.org/en-US/docs/Web/API/Performance/now
+ * @returns {number}
+ */
+export function getPerformanceNow() {
+  return (window.performance && window.performance.now && window.performance.now()) || 0;
+}
+
 /**
  * When the deviceAccess flag config option is false, no cookies should be read or set
  * @returns {boolean}
@@ -819,12 +911,6 @@ export function isValidMediaTypes(mediaTypes) {
   return true;
 }
 
-export function getBidderRequest(bidRequests, bidder, adUnitCode) {
-  return find(bidRequests, request => {
-    return request.bids
-      .filter(bid => bid.bidder === bidder && bid.adUnitCode === adUnitCode).length > 0;
-  }) || { start: null, auctionId: null };
-}
 /**
  * Returns user configured bidder params from adunit
  * @param {Object} adUnits
@@ -840,17 +926,6 @@ export function getUserConfiguredParams(adUnits, adUnitCode, bidder) {
     .filter((bidderData) => bidderData.bidder === bidder)
     .map((bidderData) => bidderData.params || {});
 }
-/**
- * Returns the origin
- */
-export function getOrigin() {
-  // IE10 does not have this property. https://gist.github.com/hbogs/7908703
-  if (!window.location.origin) {
-    return window.location.protocol + '//' + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
-  } else {
-    return window.location.origin;
-  }
-}
 
 /**
  * Returns Do Not Track state
@@ -880,14 +955,22 @@ export function isSlotMatchingAdUnitCode(adUnitCode) {
 }
 
 /**
- * @summary Uses the adUnit's code in order to find a matching gptSlot on the page
+ * @summary Uses the adUnit's code in order to find a matching gpt slot object on the page
  */
-export function getGptSlotInfoForAdUnitCode(adUnitCode) {
+export function getGptSlotForAdUnitCode(adUnitCode) {
   let matchingSlot;
   if (isGptPubadsDefined()) {
     // find the first matching gpt slot on the page
     matchingSlot = find(window.googletag.pubads().getSlots(), isSlotMatchingAdUnitCode(adUnitCode));
   }
+  return matchingSlot;
+};
+
+/**
+ * @summary Uses the adUnit's code in order to find a matching gptSlot on the page
+ */
+export function getGptSlotInfoForAdUnitCode(adUnitCode) {
+  const matchingSlot = getGptSlotForAdUnitCode(adUnitCode);
   if (matchingSlot) {
     return {
       gptSlot: matchingSlot.getAdUnitPath(),
@@ -1169,13 +1252,34 @@ export function buildUrl(obj) {
 }
 
 /**
- * This function compares two objects for checking their equivalence.
+ * This function deeply compares two objects checking for their equivalence.
  * @param {Object} obj1
  * @param {Object} obj2
+ * @param checkTypes {boolean} if set, two objects with identical properties but different constructors will *not*
+ * be considered equivalent.
  * @returns {boolean}
  */
-export function deepEqual(obj1, obj2) {
-  return deepequal(obj1, obj2);
+export function deepEqual(obj1, obj2, {checkTypes = false} = {}) {
+  if (obj1 === obj2) return true;
+  else if (
+    (typeof obj1 === 'object' && obj1 !== null) &&
+    (typeof obj2 === 'object' && obj2 !== null) &&
+    (!checkTypes || (obj1.constructor === obj2.constructor))
+  ) {
+    if (Object.keys(obj1).length !== Object.keys(obj2).length) return false;
+    for (let prop in obj1) {
+      if (obj2.hasOwnProperty(prop)) {
+        if (!deepEqual(obj1[prop], obj2[prop], {checkTypes})) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    return true;
+  } else {
+    return false;
+  }
 }
 
 export function mergeDeep(target, ...sources) {
@@ -1189,9 +1293,20 @@ export function mergeDeep(target, ...sources) {
         mergeDeep(target[key], source[key]);
       } else if (isArray(source[key])) {
         if (!target[key]) {
-          Object.assign(target, { [key]: source[key] });
+          Object.assign(target, { [key]: [...source[key]] });
         } else if (isArray(target[key])) {
-          target[key] = target[key].concat(source[key]);
+          source[key].forEach(obj => {
+            let addItFlag = 1;
+            for (let i = 0; i < target[key].length; i++) {
+              if (deepEqual(target[key][i], obj)) {
+                addItFlag = 0;
+                break;
+              }
+            }
+            if (addItFlag) {
+              target[key].push(obj);
+            }
+          });
         }
       } else {
         Object.assign(target, { [key]: source[key] });
@@ -1201,3 +1316,124 @@ export function mergeDeep(target, ...sources) {
 
   return mergeDeep(target, ...sources);
 }
+
+/**
+ * returns a hash of a string using a fast algorithm
+ * source: https://stackoverflow.com/a/52171480/845390
+ * @param str
+ * @param seed (optional)
+ * @returns {string}
+ */
+export function cyrb53Hash(str, seed = 0) {
+  // IE doesn't support imul
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/imul#Polyfill
+  let imul = function(opA, opB) {
+    if (isFn(Math.imul)) {
+      return Math.imul(opA, opB);
+    } else {
+      opB |= 0; // ensure that opB is an integer. opA will automatically be coerced.
+      // floating points give us 53 bits of precision to work with plus 1 sign bit
+      // automatically handled for our convienence:
+      // 1. 0x003fffff /*opA & 0x000fffff*/ * 0x7fffffff /*opB*/ = 0x1fffff7fc00001
+      //    0x1fffff7fc00001 < Number.MAX_SAFE_INTEGER /*0x1fffffffffffff*/
+      var result = (opA & 0x003fffff) * opB;
+      // 2. We can remove an integer coersion from the statement above because:
+      //    0x1fffff7fc00001 + 0xffc00000 = 0x1fffffff800001
+      //    0x1fffffff800001 < Number.MAX_SAFE_INTEGER /*0x1fffffffffffff*/
+      if (opA & 0xffc00000) result += (opA & 0xffc00000) * opB | 0;
+      return result | 0;
+    }
+  };
+
+  let h1 = 0xdeadbeef ^ seed;
+  let h2 = 0x41c6ce57 ^ seed;
+  for (let i = 0, ch; i < str.length; i++) {
+    ch = str.charCodeAt(i);
+    h1 = imul(h1 ^ ch, 2654435761);
+    h2 = imul(h2 ^ ch, 1597334677);
+  }
+  h1 = imul(h1 ^ (h1 >>> 16), 2246822507) ^ imul(h2 ^ (h2 >>> 13), 3266489909);
+  h2 = imul(h2 ^ (h2 >>> 16), 2246822507) ^ imul(h1 ^ (h1 >>> 13), 3266489909);
+  return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString();
+}
+
+/**
+ * returns a window object, which holds the provided document or null
+ * @param {Document} doc
+ * @returns {Window}
+ */
+export function getWindowFromDocument(doc) {
+  return (doc) ? doc.defaultView : null;
+}
+
+/**
+ * returns the result of `JSON.parse(data)`, or undefined if that throws an error.
+ * @param data
+ * @returns {any}
+ */
+export function safeJSONParse(data) {
+  try {
+    return JSON.parse(data);
+  } catch (e) {}
+}
+
+/**
+ * Returns a memoized version of `fn`.
+ *
+ * @param fn
+ * @param key cache key generator, invoked with the same arguments passed to `fn`.
+ *        By default, the first argument is used as key.
+ * @return {function(): any}
+ */
+export function memoize(fn, key = function (arg) { return arg; }) {
+  const cache = new Map();
+  const memoized = function () {
+    const cacheKey = key.apply(this, arguments);
+    if (!cache.has(cacheKey)) {
+      cache.set(cacheKey, fn.apply(this, arguments));
+    }
+    return cache.get(cacheKey);
+  }
+  memoized.clear = cache.clear.bind(cache);
+  return memoized;
+}
+
+/**
+ * Sets dataset attributes on a script
+ * @param {Script} script
+ * @param {object} attributes
+ */
+export function setScriptAttributes(script, attributes) {
+  for (let key in attributes) {
+    if (attributes.hasOwnProperty(key)) {
+      script.setAttribute(key, attributes[key]);
+    }
+  }
+}
+
+/**
+ * Encode a string for inclusion in HTML.
+ * See https://pragmaticwebsecurity.com/articles/spasecurity/json-stringify-xss.html and
+ * https://codeql.github.com/codeql-query-help/javascript/js-bad-code-sanitization/
+ * @return {string}
+ */
+export const escapeUnsafeChars = (() => {
+  const escapes = {
+    '<': '\\u003C',
+    '>': '\\u003E',
+    '/': '\\u002F',
+    '\\': '\\\\',
+    '\b': '\\b',
+    '\f': '\\f',
+    '\n': '\\n',
+    '\r': '\\r',
+    '\t': '\\t',
+    '\0': '\\0',
+    '\u2028': '\\u2028',
+    '\u2029': '\\u2029'
+  };
+
+  return function(str) {
+    return str.replace(/[<>\b\f\n\r\t\0\u2028\u2029\\]/g, x => escapes[x])
+  }
+})();
diff --git a/src/utils/currency.js b/src/utils/currency.js
new file mode 100644
index 00000000000..ab7e5faa1ea
--- /dev/null
+++ b/src/utils/currency.js
@@ -0,0 +1,16 @@
+import {getGlobal} from '../prebidGlobal.js';
+
+/**
+ * "best effort" wrapper around currency conversion; always returns an amount that may or may not be correct.
+ */
+export function beConvertCurrency(amount, from, to) {
+  if (from === to) return amount;
+  let result = amount;
+  if (typeof getGlobal().convertCurrency === 'function') {
+    try {
+      result = getGlobal().convertCurrency(amount, from, to);
+    } catch (e) {
+    }
+  }
+  return result;
+}
diff --git a/src/utils/gpdr.js b/src/utils/gpdr.js
new file mode 100644
index 00000000000..19c7126b7d7
--- /dev/null
+++ b/src/utils/gpdr.js
@@ -0,0 +1,14 @@
+import {deepAccess} from '../utils.js';
+
+/**
+ * Check if GDPR purpose 1 consent was given.
+ *
+ * @param gdprConsent GDPR consent data
+ * @returns {boolean} true if the gdprConsent is null-y; or GDPR does not apply; or if purpose 1 consent was given.
+ */
+export function hasPurpose1Consent(gdprConsent) {
+  if (gdprConsent?.gdprApplies) {
+    return deepAccess(gdprConsent, 'vendorData.purpose.consents.1') === true;
+  }
+  return true;
+}
diff --git a/src/utils/perfMetrics.js b/src/utils/perfMetrics.js
new file mode 100644
index 00000000000..b1fdb38effe
--- /dev/null
+++ b/src/utils/perfMetrics.js
@@ -0,0 +1,386 @@
+import {config} from '../config.js';
+export const CONFIG_TOGGLE = 'performanceMetrics';
+const getTime = window.performance && window.performance.now ? () => window.performance.now() : () => Date.now();
+const NODES = new WeakMap();
+
+export function metricsFactory({now = getTime, mkNode = makeNode, mkTimer = makeTimer, mkRenamer = (rename) => rename, nodes = NODES} = {}) {
+  return function newMetrics() {
+    function makeMetrics(self, rename = (n) => ({forEach(fn) { fn(n); }})) {
+      rename = mkRenamer(rename);
+
+      function accessor(slot) {
+        return function (name) {
+          return self.dfWalk({
+            visit(edge, node) {
+              const obj = node[slot];
+              if (obj.hasOwnProperty(name)) {
+                return obj[name];
+              }
+            }
+          });
+        };
+      }
+
+      const getTimestamp = accessor('timestamps');
+
+      /**
+       * Register a metric.
+       *
+       * @param name metric name
+       * @param value metric valiue
+       */
+      function setMetric(name, value) {
+        const names = rename(name);
+        self.dfWalk({
+          follow(inEdge, outEdge) {
+            return outEdge.propagate && (!inEdge || !inEdge.stopPropagation)
+          },
+          visit(edge, node) {
+            names.forEach(name => {
+              if (edge == null) {
+                node.metrics[name] = value;
+              } else {
+                if (!node.groups.hasOwnProperty(name)) {
+                  node.groups[name] = [];
+                }
+                node.groups[name].push(value);
+              }
+            })
+          }
+        });
+      }
+
+      /**
+       * Mark the current time as a checkpoint with the given name, to be referenced later
+       * by `timeSince` or `timeBetween`.
+       *
+       * @param name checkpoint name
+       */
+      function checkpoint(name) {
+        self.timestamps[name] = now();
+      }
+
+      /**
+       * Get the tame passed since `checkpoint`, and optionally save it as a metric.
+       *
+       * @param checkpoint checkpoint name
+       * @param metric? metric name
+       * @return {number} time between now and `checkpoint`
+       */
+      function timeSince(checkpoint, metric) {
+        const ts = getTimestamp(checkpoint);
+        const elapsed = ts != null ? now() - ts : null;
+        if (metric != null) {
+          setMetric(metric, elapsed);
+        }
+        return elapsed;
+      }
+
+      /**
+       * Get the time passed between `startCheckpoint` and `endCheckpoint`, optionally saving it as a metric.
+       *
+       * @param startCheckpoint begin checkpoint
+       * @param endCheckpoint end checkpoint
+       * @param metric? metric name
+       * @return {number} time passed between `startCheckpoint` and `endCheckpoint`
+       */
+      function timeBetween(startCheckpoint, endCheckpoint, metric) {
+        const start = getTimestamp(startCheckpoint);
+        const end = getTimestamp(endCheckpoint);
+        const elapsed = start != null && end != null ? end - start : null;
+        if (metric != null) {
+          setMetric(metric, elapsed);
+        }
+        return elapsed;
+      }
+
+      /**
+       * A function that, when called, stops a time measure and saves it as a metric.
+       *
+       * @typedef {function(): void} MetricsTimer
+       * @template {function} F
+       * @property {function(F): F} stopBefore returns a wrapper around the given function that begins by
+       *   stopping this time measure.
+       * @property {function(F): F} stopAfter returns a wrapper around the given function that ends by
+       *   stopping this time measure.
+       */
+
+      /**
+       * Start measuring a time metric with the given name.
+       *
+       * @param name metric name
+       * @return {MetricsTimer}
+       */
+      function startTiming(name) {
+        return mkTimer(now, (val) => setMetric(name, val))
+      }
+
+      /**
+       * Run fn and measure the time spent in it.
+       *
+       * @template T
+       * @param name the name to use for the measured time metric
+       * @param {function(): T} fn
+       * @return {T} the return value of `fn`
+       */
+      function measureTime(name, fn) {
+        return startTiming(name).stopAfter(fn)();
+      }
+
+      /**
+       * @typedef {function: T} HookFn
+       * @property {function(T): void} bail
+       *
+       * @template T
+       * @typedef {T: HookFn} TimedHookFn
+       * @property {function(): void} stopTiming
+       * @property {T} untimed
+       */
+
+      /**
+       * Convenience method for measuring time spent in a `.before` or `.after` hook.
+       *
+       * @template T
+       * @param name metric name
+       * @param {HookFn} next the hook's `next` (first) argument
+       * @param {function(TimedHookFn): T} fn a function that will be run immediately; it takes `next`,
+       *    where both `next` and `next.bail` automatically
+       *    call `stopTiming` before continuing with the original hook.
+       * @return {T} fn's return value
+       */
+      function measureHookTime(name, next, fn) {
+        const stopTiming = startTiming(name);
+        return fn((function (orig) {
+          const next = stopTiming.stopBefore(orig);
+          next.bail = orig.bail && stopTiming.stopBefore(orig.bail);
+          next.stopTiming = stopTiming;
+          next.untimed = orig;
+          return next;
+        })(next));
+      }
+
+      /**
+       * Get all registered metrics.
+       * @return {{}}
+       */
+      function getMetrics() {
+        let result = {}
+        self.dfWalk({
+          visit(edge, node) {
+            result = Object.assign({}, !edge || edge.includeGroups ? node.groups : null, node.metrics, result);
+          }
+        });
+        return result;
+      }
+
+      /**
+       * Create and return a new metrics object that starts as a view on all metrics registered here,
+       * and - by default - also propagates all new metrics here.
+       *
+       * Propagated metrics are grouped together, and intended for repeated operations. For example, with the following:
+       *
+       * ```
+       * const metrics = newMetrics();
+       * const requests = metrics.measureTime('buildRequests', buildRequests)
+       * requests.forEach((req) => {
+       *   const requestMetrics = metrics.fork();
+       *   requestMetrics.measureTime('processRequest', () => processRequest(req);
+       * })
+       * ```
+       *
+       * if `buildRequests` takes 10ms and returns 3 objects, which respectively take 100, 200, and 300ms in `processRequest`, then
+       * the final `metrics.getMetrics()` would be:
+       *
+       * ```
+       * {
+       *    buildRequests: 10,
+       *    processRequest: [100, 200, 300]
+       * }
+       * ```
+       *
+       * while the inner `requestMetrics.getMetrics()` would be:
+       *
+       * ```
+       * {
+       *   buildRequests: 10,
+       *   processRequest: 100 // or 200 for the 2nd loop, etc
+       * }
+       * ```
+       *
+       *
+       * @param propagate if false, the forked metrics will not be propagated here
+       * @param stopPropagation if true, propagation from the new metrics is stopped here - instead of
+       *   continuing up the chain (if for example these metrics were themselves created through `.fork()`)
+       * @param includeGroups if true, the forked metrics will also replicate metrics that were propagated
+       *   here from elsewhere. For example:
+       *   ```
+       *   const metrics = newMetrics();
+       *   const op1 = metrics.fork();
+       *   const withoutGroups = metrics.fork();
+       *   const withGroups = metrics.fork({includeGroups: true});
+       *   op1.setMetric('foo', 'bar');
+       *   withoutGroups.getMetrics() // {}
+       *   withGroups.getMetrics() // {foo: ['bar']}
+       *   ```
+       */
+      function fork({propagate = true, stopPropagation = false, includeGroups = false} = {}) {
+        return makeMetrics(mkNode([[self, {propagate, stopPropagation, includeGroups}]]), rename);
+      }
+
+      /**
+       * Join `otherMetrics` with these; all metrics from `otherMetrics` will (by default) be propagated here,
+       * and all metrics from here will be included in `otherMetrics`.
+       *
+       * `propagate`, `stopPropagation` and `includeGroups` have the same semantics as in `.fork()`.
+       */
+      function join(otherMetrics, {propagate = true, stopPropagation = false, includeGroups = false} = {}) {
+        const other = nodes.get(otherMetrics);
+        if (other != null) {
+          other.addParent(self, {propagate, stopPropagation, includeGroups});
+        }
+      }
+
+      /**
+       * return a version of these metrics where all new metrics are renamed according to `renameFn`.
+       *
+       * @param {function(String): Array[String]} renameFn
+       */
+      function renameWith(renameFn) {
+        return makeMetrics(self, renameFn);
+      }
+
+      /**
+       * Create a new metrics object that uses the same propagation and renaming rules as this one.
+       */
+      function newMetrics() {
+        return makeMetrics(self.newSibling(), rename);
+      }
+
+      const metrics = {
+        startTiming,
+        measureTime,
+        measureHookTime,
+        checkpoint,
+        timeSince,
+        timeBetween,
+        setMetric,
+        getMetrics,
+        fork,
+        join,
+        newMetrics,
+        renameWith,
+        toJSON() {
+          return getMetrics();
+        }
+      };
+      nodes.set(metrics, self);
+      return metrics;
+    }
+
+    return makeMetrics(mkNode([]));
+  }
+}
+
+function wrapFn(fn, before, after) {
+  return function () {
+    before && before();
+    try {
+      return fn.apply(this, arguments);
+    } finally {
+      after && after();
+    }
+  };
+}
+
+function makeTimer(now, cb) {
+  const start = now();
+  let done = false;
+  function stopTiming() {
+    if (!done) {
+      // eslint-disable-next-line standard/no-callback-literal
+      cb(now() - start);
+      done = true;
+    }
+  }
+  stopTiming.stopBefore = (fn) => wrapFn(fn, stopTiming);
+  stopTiming.stopAfter = (fn) => wrapFn(fn, null, stopTiming);
+  return stopTiming;
+}
+
+function makeNode(parents) {
+  return {
+    metrics: {},
+    timestamps: {},
+    groups: {},
+    addParent(node, edge) {
+      parents.push([node, edge]);
+    },
+    newSibling() {
+      return makeNode(parents.slice());
+    },
+    dfWalk({visit, follow = () => true, visited = new Set(), inEdge} = {}) {
+      let res;
+      if (!visited.has(this)) {
+        visited.add(this);
+        res = visit(inEdge, this);
+        if (res != null) return res;
+        for (const [parent, outEdge] of parents) {
+          if (follow(inEdge, outEdge)) {
+            res = parent.dfWalk({visit, follow, visited, inEdge: outEdge});
+            if (res != null) return res;
+          }
+        }
+      }
+    }
+  };
+}
+
+const nullMetrics = (() => {
+  const nop = function () {};
+  const empty = () => ({});
+  const none = {forEach: nop};
+  const nullTimer = () => null;
+  nullTimer.stopBefore = (fn) => fn;
+  nullTimer.stopAfter = (fn) => fn;
+  const nullNode = Object.defineProperties(
+    {dfWalk: nop, newSibling: () => nullNode, addParent: nop},
+    Object.fromEntries(['metrics', 'timestamps', 'groups'].map(prop => [prop, {get: empty}])));
+  return metricsFactory({
+    now: () => 0,
+    mkNode: () => nullNode,
+    mkRenamer: () => () => none,
+    mkTimer: () => nullTimer,
+    nodes: {get: nop, set: nop}
+  })();
+})();
+
+let enabled = true;
+config.getConfig(CONFIG_TOGGLE, (cfg) => { enabled = !!cfg[CONFIG_TOGGLE] });
+
+/**
+ * convenience fallback function for metrics that may be undefined, especially during tests.
+ */
+export function useMetrics(metrics) {
+  return (enabled && metrics) || nullMetrics;
+}
+
+export const newMetrics = (() => {
+  const makeMetrics = metricsFactory();
+  return function () {
+    return enabled ? makeMetrics() : nullMetrics;
+  }
+})();
+
+export function hookTimer(prefix, getMetrics) {
+  return function(name, hookFn) {
+    return function (next, ...args) {
+      const that = this;
+      return useMetrics(getMetrics.apply(that, args)).measureHookTime(prefix + name, next, function (next) {
+        return hookFn.call(that, next, ...args);
+      });
+    }
+  }
+}
+
+export const timedAuctionHook = hookTimer('requestBids.', (req) => req.metrics);
+export const timedBidResponseHook = hookTimer('addBidResponse.', (_, bid) => bid.metrics)
diff --git a/src/utils/promise.js b/src/utils/promise.js
new file mode 100644
index 00000000000..97c64a96f8b
--- /dev/null
+++ b/src/utils/promise.js
@@ -0,0 +1,113 @@
+import {getGlobal} from '../prebidGlobal.js';
+
+const SUCCESS = 0;
+const FAIL = 1;
+
+/**
+ * A version of Promise that runs callbacks synchronously when it can (i.e. after it's been fulfilled or rejected).
+ */
+export class GreedyPromise extends (getGlobal().Promise || Promise) {
+  #result;
+  #callbacks;
+  #parent = null;
+
+  /**
+   * Convenience wrapper for setTimeout; takes care of returning an already fulfilled GreedyPromise when the delay is zero.
+   *
+   * @param {Number} delayMs delay in milliseconds
+   * @returns {GreedyPromise} a promise that resolves (to undefined) in `delayMs` milliseconds
+   */
+  static timeout(delayMs = 0) {
+    return new GreedyPromise((resolve) => {
+      delayMs === 0 ? resolve() : setTimeout(resolve, delayMs);
+    });
+  }
+
+  constructor(resolver) {
+    const result = [];
+    const callbacks = [];
+    function handler(type, resolveFn) {
+      return function (value) {
+        if (!result.length) {
+          result.push(type, value);
+          while (callbacks.length) callbacks.shift()();
+          resolveFn(value);
+        }
+      }
+    }
+    super(
+      typeof resolver !== 'function'
+        ? resolver // let super throw an error
+        : (resolve, reject) => {
+          const rejectHandler = handler(FAIL, reject);
+          const resolveHandler = (() => {
+            const done = handler(SUCCESS, resolve);
+            return value =>
+              typeof value?.then === 'function' ? value.then(done, rejectHandler) : done(value);
+          })();
+          try {
+            resolver(resolveHandler, rejectHandler);
+          } catch (e) {
+            rejectHandler(e);
+          }
+        }
+    );
+    this.#result = result;
+    this.#callbacks = callbacks;
+  }
+  then(onSuccess, onError) {
+    if (typeof onError === 'function') {
+      // if an error handler is provided, attach a dummy error handler to super,
+      // and do the same for all promises without an error handler that precede this one in a chain.
+      // This is to avoid unhandled rejection events / warnings for errors that were, in fact, handled;
+      // since we are not using super's callback mechanisms we need to make it aware of this separately.
+      let node = this;
+      while (node) {
+        super.then.call(node, null, () => null);
+        const next = node.#parent;
+        node.#parent = null; // since we attached a handler already, we are no longer interested in what will happen later in the chain
+        node = next;
+      }
+    }
+    const result = this.#result;
+    const res = new GreedyPromise((resolve, reject) => {
+      const continuation = () => {
+        let value = result[1];
+        let [handler, resolveFn] = result[0] === SUCCESS ? [onSuccess, resolve] : [onError, reject];
+        if (typeof handler === 'function') {
+          try {
+            value = handler(value);
+          } catch (e) {
+            reject(e);
+            return;
+          }
+          resolveFn = resolve;
+        }
+        resolveFn(value);
+      }
+      result.length ? continuation() : this.#callbacks.push(continuation);
+    });
+    res.#parent = this;
+    return res;
+  }
+}
+
+/**
+ * @returns a {promise, resolve, reject} trio where `promise` is resolved by calling `resolve` or `reject`.
+ */
+export function defer({promiseFactory = (resolver) => new GreedyPromise(resolver)} = {}) {
+  function invoker(delegate) {
+    return (val) => delegate(val);
+  }
+
+  let resolveFn, rejectFn;
+
+  return {
+    promise: promiseFactory((resolve, reject) => {
+      resolveFn = resolve;
+      rejectFn = reject;
+    }),
+    resolve: invoker(resolveFn),
+    reject: invoker(rejectFn)
+  }
+}
diff --git a/src/video.js b/src/video.js
index befeb2ded39..7930e318874 100644
--- a/src/video.js
+++ b/src/video.js
@@ -1,8 +1,9 @@
 import adapterManager from './adapterManager.js';
-import { getBidRequest, deepAccess, logError } from './utils.js';
+import { deepAccess, logError } from './utils.js';
 import { config } from '../src/config.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {includes} from './polyfill.js';
 import { hook } from './hook.js';
+import {auctionManager} from './auctionManager.js';
 
 const VIDEO_MEDIA_TYPE = 'video';
 export const OUTSTREAM = 'outstream';
@@ -28,23 +29,22 @@ export const hasNonVideoBidder = adUnit =>
 /**
  * Validate that the assets required for video context are present on the bid
  * @param {VideoBid} bid Video bid to validate
- * @param {BidRequest[]} bidRequests All bid requests for an auction
+ * @param index
  * @return {Boolean} If object is valid
  */
-export function isValidVideoBid(bid, bidRequests) {
-  const bidRequest = getBidRequest(bid.requestId, bidRequests);
-
-  const videoMediaType =
-    bidRequest && deepAccess(bidRequest, 'mediaTypes.video');
+export function isValidVideoBid(bid, {index = auctionManager.index} = {}) {
+  const videoMediaType = deepAccess(index.getMediaTypes(bid), 'video');
   const context = videoMediaType && deepAccess(videoMediaType, 'context');
+  const useCacheKey = videoMediaType && deepAccess(videoMediaType, 'useCacheKey');
+  const adUnit = index.getAdUnit(bid);
 
   // if context not defined assume default 'instream' for video bids
   // instream bids require a vast url or vast xml content
-  return checkVideoBidSetup(bid, bidRequest, videoMediaType, context);
+  return checkVideoBidSetup(bid, adUnit, videoMediaType, context, useCacheKey);
 }
 
-export const checkVideoBidSetup = hook('sync', function(bid, bidRequest, videoMediaType, context) {
-  if (!bidRequest || (videoMediaType && context !== OUTSTREAM)) {
+export const checkVideoBidSetup = hook('sync', function(bid, adUnit, videoMediaType, context, useCacheKey) {
+  if (videoMediaType && (useCacheKey || context !== OUTSTREAM)) {
     // xml-only video bids require a prebid cache url
     if (!config.getConfig('cache.url') && bid.vastXml && !bid.vastUrl) {
       logError(`
@@ -58,8 +58,8 @@ export const checkVideoBidSetup = hook('sync', function(bid, bidRequest, videoMe
   }
 
   // outstream bids require a renderer on the bid or pub-defined on adunit
-  if (context === OUTSTREAM) {
-    return !!(bid.renderer || bidRequest.renderer);
+  if (context === OUTSTREAM && !useCacheKey) {
+    return !!(bid.renderer || (adUnit && adUnit.renderer) || videoMediaType.renderer);
   }
 
   return true;
diff --git a/src/videoCache.js b/src/videoCache.js
index 9f1fd7e4117..f69a20f0139 100644
--- a/src/videoCache.js
+++ b/src/videoCache.js
@@ -11,7 +11,13 @@
 
 import { ajax } from './ajax.js';
 import { config } from './config.js';
-import * as utils from './utils.js';
+import {auctionManager} from './auctionManager.js';
+
+/**
+ * Might be useful to be configurable in the future
+ * Depending on publisher needs
+ */
+const ttlBufferInSeconds = 15;
 
 /**
  * @typedef {object} CacheableUrlBid
@@ -58,23 +64,26 @@ function wrapURI(uri, impUrl) {
  * the bid can't be converted cleanly.
  *
  * @param {CacheableBid} bid
+ * @param index
  */
-function toStorageRequest(bid) {
+function toStorageRequest(bid, {index = auctionManager.index} = {}) {
   const vastValue = bid.vastXml ? bid.vastXml : wrapURI(bid.vastUrl, bid.vastImpUrl);
-
+  const auction = index.getAuction(bid);
+  const ttlWithBuffer = Number(bid.ttl) + ttlBufferInSeconds;
   let payload = {
     type: 'xml',
     value: vastValue,
-    ttlseconds: Number(bid.ttl)
+    ttlseconds: ttlWithBuffer
   };
 
   if (config.getConfig('cache.vasttrack')) {
     payload.bidder = bid.bidder;
     payload.bidid = bid.requestId;
-    // function has a thisArg set to bidderRequest for accessing the auctionStart
-    if (utils.isPlainObject(this) && this.hasOwnProperty('auctionStart')) {
-      payload.timestamp = this.auctionStart;
-    }
+    payload.aid = bid.auctionId;
+  }
+
+  if (auction != null) {
+    payload.timestamp = auction.getAuctionStart();
   }
 
   if (typeof bid.customCacheKey === 'string' && bid.customCacheKey !== '') {
@@ -131,12 +140,11 @@ function shimStorageCallback(done) {
  *
  * @param {CacheableBid[]} bids A list of bid objects which should be cached.
  * @param {videoCacheStoreCallback} [done] An optional callback which should be executed after
- * @param {BidderRequest} [bidderRequest]
  * the data has been stored in the cache.
  */
-export function store(bids, done, bidderRequest) {
+export function store(bids, done) {
   const requestData = {
-    puts: bids.map(toStorageRequest, bidderRequest)
+    puts: bids.map(toStorageRequest)
   };
 
   ajax(config.getConfig('cache.url'), shimStorageCallback(done), JSON.stringify(requestData), {
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
index 842bccd99b1..abb34438653 100644
--- a/test/.eslintrc.js
+++ b/test/.eslintrc.js
@@ -1,40 +1,42 @@
 module.exports = {
-  "env": {
-    "browser": true,
-    "mocha": true
+  env: {
+    browser: true,
+    mocha: true
   },
-  "extends": "standard",
-  "globals": {
-    "$$PREBID_GLOBAL$$": false
+  extends: 'standard',
+  globals: {
+    '$$PREBID_GLOBAL$$': false
   },
-  "parserOptions": {
-    "sourceType": "module"
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 2018
   },
-  "rules": {
-    "comma-dangle": "off",
-    "semi": "off",
-    "space-before-function-paren": "off",
+  rules: {
+    'comma-dangle': 'off',
+    semi: 'off',
+    'space-before-function-paren': 'off',
 
     // Exceptions below this line are temporary, so that eslint can be added into the CI process.
     // Violations of these styles should be fixed, and the exceptions removed over time.
     //
     // See Issue #1111.
-    "camelcase": "off",
-    "eqeqeq": "off",
-    "no-mixed-spaces-and-tabs": "off",
-    "no-tabs": "off",
-    "no-unused-expressions": "off",
-    "import/no-duplicates": "off",
-    "no-template-curly-in-string": "off",
-    "no-global-assign": "off",
-    "no-path-concat": "off",
-    "no-redeclare": "off",
-    "node/no-deprecated-api": "off",
-    "no-return-assign": "off",
-    "no-undef": "off",
-    "no-unused-vars": "off",
-    "no-use-before-define": "off",
-    "no-useless-escape": "off",
-    "one-var": "off"
+    camelcase: 'off',
+    eqeqeq: 'off',
+    'no-mixed-spaces-and-tabs': 'off',
+    'no-tabs': 'off',
+    'no-unused-expressions': 'off',
+    'import/no-duplicates': 'off',
+    'import/extensions': 'off',
+    'no-template-curly-in-string': 'off',
+    'no-global-assign': 'off',
+    'no-path-concat': 'off',
+    'no-redeclare': 'off',
+    'node/no-deprecated-api': 'off',
+    'no-return-assign': 'off',
+    'no-undef': 'off',
+    'no-unused-vars': 'off',
+    'no-use-before-define': 'off',
+    'no-useless-escape': 'off',
+    'one-var': 'off'
   }
 };
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/fixtures/fixtures.js b/test/fixtures/fixtures.js
index 2a0a7638fc4..b66d885c113 100644
--- a/test/fixtures/fixtures.js
+++ b/test/fixtures/fixtures.js
@@ -1,5 +1,6 @@
 // jscs:disable
 import CONSTANTS from 'src/constants.json';
+import {createBid} from '../../src/bidfactory.js';
 const utils = require('src/utils.js');
 
 function convertTargetingsFromOldToNew(targetings) {
@@ -676,7 +677,13 @@ export function getAdUnits() {
           'bidder': 'appnexus',
           'params': {
             'placementId': '543221',
-            'test': 'me'
+          }
+        },
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'publisherId': 1234567,
+            'adSlot': '1234567@728x90'
           }
         }
       ]
@@ -1225,7 +1232,7 @@ export function getCurrencyRates() {
   };
 }
 
-export function createBidReceived({bidder, cpm, auctionId, responseTimestamp, adUnitCode, adId, status, ttl, requestId}) {
+export function createBidReceived({bidder, cpm, auctionId, responseTimestamp, adUnitCode, adId, status, ttl, requestId, mediaType}) {
   let bid = {
     'bidderCode': bidder,
     'width': '300',
@@ -1253,6 +1260,7 @@ export function createBidReceived({bidder, cpm, auctionId, responseTimestamp, ad
       'hb_pb': cpm,
       'foobar': '300x250'
     }),
+    'mediaType': mediaType,
     'netRevenue': true,
     'currency': 'USD',
     'ttl': (!ttl) ? 300 : ttl
@@ -1261,7 +1269,7 @@ export function createBidReceived({bidder, cpm, auctionId, responseTimestamp, ad
   if (typeof status !== 'undefined') {
     bid.status = status;
   }
-  return bid;
+  return Object.assign(createBid(CONSTANTS.STATUS.GOOD), bid);
 }
 
 export function getServerTestingsAds() {
diff --git a/test/fixtures/video/adUnit.json b/test/fixtures/video/adUnit.json
index df55eb25d79..0773d7f3a62 100644
--- a/test/fixtures/video/adUnit.json
+++ b/test/fixtures/video/adUnit.json
@@ -1,7 +1,11 @@
 {
   "code": "video1",
-  "sizes": [640,480],
-  "mediaType": "video",
+  "mediaTypes": {
+    "video": {
+      "context": "instream",
+      "playerSize": [640, 480]
+    }
+  },
   "bids": [
     {
       "bidder": "appnexus",
diff --git a/test/helpers/analytics.js b/test/helpers/analytics.js
new file mode 100644
index 00000000000..b376118dc6f
--- /dev/null
+++ b/test/helpers/analytics.js
@@ -0,0 +1,34 @@
+import * as pbEvents from 'src/events.js';
+import constants from '../../src/constants.json';
+
+export function fireEvents(events = [
+  constants.EVENTS.AUCTION_INIT,
+  constants.EVENTS.AUCTION_END,
+  constants.EVENTS.BID_REQUESTED,
+  constants.EVENTS.BID_RESPONSE,
+  constants.EVENTS.BID_WON
+]) {
+  return events.map((ev, i) => {
+    ev = Array.isArray(ev) ? ev : [ev, {i: i}];
+    pbEvents.emit.apply(null, ev)
+    return ev;
+  });
+}
+
+export function expectEvents(events) {
+  events = fireEvents(events);
+  return {
+    to: {
+      beTrackedBy(trackFn) {
+        events.forEach(([eventType, args]) => {
+          sinon.assert.calledWithMatch(trackFn, sinon.match({eventType, args}));
+        });
+      },
+      beBundledTo(bundleFn) {
+        events.forEach(([eventType, args]) => {
+          sinon.assert.calledWithMatch(bundleFn, sinon.match.any, eventType, sinon.match(args))
+        });
+      },
+    },
+  };
+}
diff --git a/test/helpers/consentData.js b/test/helpers/consentData.js
new file mode 100644
index 00000000000..c708e397bd6
--- /dev/null
+++ b/test/helpers/consentData.js
@@ -0,0 +1,12 @@
+import {gdprDataHandler} from 'src/adapterManager.js';
+import {GreedyPromise} from '../../src/utils/promise.js';
+
+export function mockGdprConsent(sandbox, getConsentData = () => null) {
+  sandbox.stub(gdprDataHandler, 'enabled').get(() => true)
+  sandbox.stub(gdprDataHandler, 'promise').get(() => GreedyPromise.resolve(getConsentData()));
+  sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(getConsentData)
+}
+
+beforeEach(() => {
+  gdprDataHandler.reset();
+})
diff --git a/test/helpers/fpd.js b/test/helpers/fpd.js
new file mode 100644
index 00000000000..89755f26541
--- /dev/null
+++ b/test/helpers/fpd.js
@@ -0,0 +1,71 @@
+import {dep, enrichFPD} from 'src/fpd/enrichment.js';
+import {GreedyPromise} from '../../src/utils/promise.js';
+import {deepClone} from '../../src/utils.js';
+import {gdprDataHandler, uspDataHandler} from '../../src/adapterManager.js';
+
+export function mockFpdEnrichments(sandbox, overrides = {}) {
+  overrides = Object.assign({}, {
+    // override window getters, required for ChromeHeadless, apparently it sees window.self !== window
+    getWindowTop() {
+      return window
+    },
+    getWindowSelf() {
+      return window
+    },
+    getHighEntropySUA() {
+      return GreedyPromise.resolve()
+    }
+  }, overrides)
+  Object.entries(overrides)
+    .filter(([k]) => dep[k])
+    .forEach(([k, v]) => {
+      sandbox.stub(dep, k).callsFake(v);
+    });
+  Object.entries({
+    gdprConsent: gdprDataHandler,
+    uspConsent: uspDataHandler,
+  }).forEach(([ovKey, handler]) => {
+    const v = overrides[ovKey];
+    if (v) {
+      sandbox.stub(handler, 'getConsentData').callsFake(v);
+    }
+  })
+}
+
+export function addFPDEnrichments(ortb2 = {}, overrides) {
+  const sandbox = sinon.sandbox.create();
+  mockFpdEnrichments(sandbox, overrides)
+  return enrichFPD(GreedyPromise.resolve(deepClone(ortb2))).finally(() => sandbox.restore());
+}
+
+export const syncAddFPDEnrichments = synchronize(addFPDEnrichments);
+
+export function addFPDToBidderRequest(bidderRequest, overrides) {
+  overrides = Object.assign({}, {
+    getRefererInfo() {
+      return bidderRequest.refererInfo || {};
+    },
+    gdprConsent() {
+      return bidderRequest.gdprConsent;
+    },
+    uspConsent() {
+      return bidderRequest.uspConsent;
+    }
+  }, overrides);
+  return addFPDEnrichments(bidderRequest.ortb2 || {}, overrides).then(ortb2 => {
+    return {
+      ...bidderRequest,
+      ortb2
+    }
+  });
+}
+
+export const syncAddFPDToBidderRequest = synchronize(addFPDToBidderRequest);
+
+function synchronize(fn) {
+  return function () {
+    let result;
+    fn.apply(this, arguments).then(res => { result = res });
+    return result;
+  }
+}
diff --git a/test/helpers/hookSetup.js b/test/helpers/hookSetup.js
new file mode 100644
index 00000000000..2de35bb1dd4
--- /dev/null
+++ b/test/helpers/hookSetup.js
@@ -0,0 +1,5 @@
+import {hook} from '../../src/hook.js';
+
+before(() => {
+  hook.ready();
+});
diff --git a/test/helpers/indexStub.js b/test/helpers/indexStub.js
new file mode 100644
index 00000000000..2916b60ae32
--- /dev/null
+++ b/test/helpers/indexStub.js
@@ -0,0 +1,28 @@
+import {AuctionIndex} from '../../src/auctionIndex.js';
+
+export function stubAuctionIndex({bidRequests, bidderRequests, adUnits}) {
+  if (adUnits == null) {
+    adUnits = []
+  }
+  if (bidderRequests == null) {
+    bidderRequests = []
+  }
+  if (bidRequests != null) {
+    bidderRequests.push({
+      bidderRequestId: 'mock-bidder-request',
+      bids: bidRequests
+    });
+  }
+  const auction = {
+    getAuctionId() {
+      return 'mock-auction'
+    },
+    getBidRequests() {
+      return bidderRequests;
+    },
+    getAdUnits() {
+      return adUnits;
+    }
+  };
+  return new AuctionIndex(() => ([auction]));
+}
diff --git a/test/helpers/prebidGlobal.js b/test/helpers/prebidGlobal.js
index 597076ab0db..94776a5242b 100644
--- a/test/helpers/prebidGlobal.js
+++ b/test/helpers/prebidGlobal.js
@@ -1,3 +1,4 @@
 window.$$PREBID_GLOBAL$$ = (window.$$PREBID_GLOBAL$$ || {});
+window.$$PREBID_GLOBAL$$.installedModules = (window.$$PREBID_GLOBAL$$.installedModules || []);
 window.$$PREBID_GLOBAL$$.cmd = window.$$PREBID_GLOBAL$$.cmd || [];
 window.$$PREBID_GLOBAL$$.que = window.$$PREBID_GLOBAL$$.que || [];
diff --git a/test/helpers/refererDetectionHelper.js b/test/helpers/refererDetectionHelper.js
new file mode 100644
index 00000000000..bdbfb205cdb
--- /dev/null
+++ b/test/helpers/refererDetectionHelper.js
@@ -0,0 +1,88 @@
+/**
+ * Build a walkable linked list of window-like objects for testing.
+ *
+ * @param {Array} urls Array of URL strings starting from the top window.
+ * @param {string} [topReferrer]
+ * @param {string} [canonicalUrl]
+ * @param {boolean} [ancestorOrigins]
+ * @returns {Object}
+ */
+export function buildWindowTree(urls, topReferrer = null, canonicalUrl = null, ancestorOrigins = false) {
+  /**
+   * Find the origin from a given fully-qualified URL.
+   *
+   * @param {string} url The fully qualified URL
+   * @returns {string|null}
+   */
+  function getOrigin(url) {
+    const originRegex = new RegExp('^(https?://[^/]+/?)');
+
+    const result = originRegex.exec(url);
+
+    if (result && result[0]) {
+      return result[0];
+    }
+
+    return null;
+  }
+
+  const inaccessibles = [];
+
+  let previousWindow, topWindow;
+  const topOrigin = getOrigin(urls[0]);
+
+  const windowList = urls.map((url, index) => {
+    const thisOrigin = getOrigin(url),
+      sameOriginAsPrevious = index === 0 ? true : (getOrigin(urls[index - 1]) === thisOrigin),
+      sameOriginAsTop = thisOrigin === topOrigin;
+
+    const win = {
+      location: {
+        href: url,
+      },
+      document: {
+        referrer: index === 0 ? topReferrer : urls[index - 1]
+      }
+    };
+
+    if (topWindow == null) {
+      topWindow = win;
+      win.document.querySelector = function (selector) {
+        if (selector === 'link[rel=\'canonical\']') {
+          return {
+            href: canonicalUrl
+          };
+        }
+        return null;
+      };
+    }
+
+    if (sameOriginAsPrevious) {
+      win.parent = previousWindow;
+    } else {
+      win.parent = inaccessibles[inaccessibles.length - 1];
+    }
+    if (ancestorOrigins) {
+      win.location.ancestorOrigins = urls.slice(0, index).reverse().map(getOrigin);
+    }
+    win.top = sameOriginAsTop ? topWindow : inaccessibles[0];
+
+    const inWin = {parent: inaccessibles[inaccessibles.length - 1], top: inaccessibles[0]};
+    if (index === 0) {
+      inWin.top = inWin;
+    }
+    ['document', 'location'].forEach((prop) => {
+      Object.defineProperty(inWin, prop, {
+        get: function () {
+          throw new Error('cross-origin access');
+        }
+      });
+    });
+    inaccessibles.push(inWin);
+    previousWindow = win;
+
+    return win;
+  });
+
+  return windowList[windowList.length - 1];
+}
diff --git a/test/helpers/testing-utils.js b/test/helpers/testing-utils.js
index 76e2b652a79..1336a90ecbf 100644
--- a/test/helpers/testing-utils.js
+++ b/test/helpers/testing-utils.js
@@ -1,13 +1,52 @@
 /* eslint-disable no-console */
-module.exports = {
+const {expect} = require('chai');
+const DEFAULT_TIMEOUT = 2000;
+const utils = {
   host: (process.env.TEST_SERVER_HOST) ? process.env.TEST_SERVER_HOST : 'localhost',
   protocol: (process.env.TEST_SERVER_PROTOCOL) ? 'https' : 'http',
-  waitForElement: function(elementRef, time = 2000) {
+  testPageURL: function(name) {
+    return `${utils.protocol}://${utils.host}:9999/test/pages/${name}`
+  },
+  waitForElement: function(elementRef, time = DEFAULT_TIMEOUT) {
     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 = DEFAULT_TIMEOUT, 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 = DEFAULT_TIMEOUT, 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/mocks/adloaderStub.js b/test/mocks/adloaderStub.js
index b52ca5e9280..6e7f5756100 100644
--- a/test/mocks/adloaderStub.js
+++ b/test/mocks/adloaderStub.js
@@ -4,7 +4,7 @@ import * as adloader from 'src/adloader.js';
 // this export is for adloader's tests against actual implementation
 export let loadExternalScript = adloader.loadExternalScript;
 
-let stub = createStub();
+export let loadExternalScriptStub = createStub();
 
 function createStub() {
   return sinon.stub(adloader, 'loadExternalScript').callsFake((...args) => {
@@ -18,6 +18,6 @@ function createStub() {
 }
 
 beforeEach(function() {
-  stub.restore();
-  stub = createStub();
+  loadExternalScriptStub.restore();
+  loadExternalScriptStub = createStub();
 });
diff --git a/test/mocks/analyticsStub.js b/test/mocks/analyticsStub.js
new file mode 100644
index 00000000000..98e0f56688f
--- /dev/null
+++ b/test/mocks/analyticsStub.js
@@ -0,0 +1,15 @@
+import {_internal, setDebounceDelay} from '../../libraries/analyticsAdapter/AnalyticsAdapter.js';
+
+before(() => {
+  // stub out analytics networking to avoid random events polluting the global xhr mock
+  disableAjaxForAnalytics();
+  // make analytics event handling synchronous
+  setDebounceDelay(0);
+})
+
+export function disableAjaxForAnalytics() {
+  sinon.stub(_internal, 'ajax').callsFake(() => null);
+}
+export function enableAjaxForAnalytics() {
+  _internal.ajax.restore();
+}
diff --git a/test/mocks/fabrickId.json b/test/mocks/fabrickId.json
new file mode 100644
index 00000000000..a8723ec88ec
--- /dev/null
+++ b/test/mocks/fabrickId.json
@@ -0,0 +1,3 @@
+{
+  "fabrickId": 1980
+}
diff --git a/test/mocks/timers.js b/test/mocks/timers.js
new file mode 100644
index 00000000000..6efd798c881
--- /dev/null
+++ b/test/mocks/timers.js
@@ -0,0 +1,84 @@
+/*
+ * Provides wrappers for timers to allow easy cancelling and/or awaiting of outstanding timers.
+ * This helps avoid functionality leaking from one test to the next.
+ */
+
+let wrappersActive = false;
+
+export function configureTimerInterceptors(debugLog = function() {}, generateStackTraces = false) {
+  if (wrappersActive) throw new Error(`Timer wrappers are already in place.`);
+  wrappersActive = true;
+  let theseWrappersActive = true;
+
+  let originalSetTimeout = setTimeout, originalSetInterval = setInterval, originalClearTimeout = clearTimeout, originalClearInterval = clearInterval;
+
+  let timerId = -1;
+  let timers = [];
+
+  const waitOnTimersResolves = [];
+  function checkWaits() {
+    if (timers.length === 0) waitOnTimersResolves.forEach((r) => r());
+  }
+  const waitAllActiveTimers = () => timers.length === 0 ? Promise.resolve() : new Promise((resolve) => waitOnTimersResolves.push(resolve));
+  const clearAllActiveTimers = () => timers.forEach((timer) => timer.type === 'timeout' ? clearTimeout(timer.handle) : clearInterval(timer.handle));
+
+  const generateInterceptor = (type, originalFunctionWrapper) => (fn, delay, ...args) => {
+    timerId++;
+    debugLog(`Setting wrapped timeout ${timerId} for ${delay ?? 0}`);
+    const info = { timerId, type };
+    if (generateStackTraces) {
+      try {
+        throw new Error();
+      } catch (ex) {
+        info.stack = ex.stack;
+      }
+    }
+    info.handle = originalFunctionWrapper(info, fn, delay, ...args);
+    timers.push(info);
+    return info.handle;
+  };
+  const setTimeoutInterceptor = generateInterceptor('timeout', (info, fn, delay, ...args) => originalSetTimeout(() => {
+    try {
+      debugLog(`Running timeout ${info.timerId}`);
+      fn(...args);
+    } finally {
+      const infoIndex = timers.indexOf(info);
+      if (infoIndex > -1) timers.splice(infoIndex, 1);
+      checkWaits();
+    }
+  }, delay));
+
+  const setIntervalInterceptor = generateInterceptor('interval', (info, fn, interval, ...args) => originalSetInterval(() => {
+    debugLog(`Running interval ${info.timerId}`);
+    fn(...args);
+  }, interval));
+
+  const generateClearInterceptor = (type, originalClearFunction) => (handle) => {
+    originalClearFunction(handle);
+    const infoIndex = timers.findIndex((i) => i.handle === handle && i.type === type);
+    if (infoIndex > -1) timers.splice(infoIndex, 1);
+    checkWaits();
+  }
+  const clearTimeoutInterceptor = generateClearInterceptor('timeout', originalClearTimeout);
+  const clearIntervalInterceptor = generateClearInterceptor('interval', originalClearInterval);
+
+  setTimeout = setTimeoutInterceptor;
+  setInterval = setIntervalInterceptor;
+  clearTimeout = clearTimeoutInterceptor;
+  clearInterval = clearIntervalInterceptor;
+
+  return {
+    waitAllActiveTimers,
+    clearAllActiveTimers,
+    timers,
+    restore: () => {
+      if (theseWrappersActive) {
+        theseWrappersActive = false;
+        setTimeout = originalSetTimeout;
+        setInterval = originalSetInterval;
+        clearTimeout = originalClearTimeout;
+        clearInterval = originalClearInterval;
+      }
+    }
+  }
+}
diff --git a/test/mocks/xhr.js b/test/mocks/xhr.js
index 9fb8fe87fa0..424100f870c 100644
--- a/test/mocks/xhr.js
+++ b/test/mocks/xhr.js
@@ -1,3 +1,4 @@
+import {getUniqueIdentifierStr} from '../../src/utils.js';
 
 export let server = sinon.createFakeServer();
 export let xhr = global.XMLHttpRequest;
@@ -7,3 +8,24 @@ beforeEach(function() {
   server = sinon.createFakeServer();
   xhr = global.XMLHttpRequest;
 });
+
+const bid = getUniqueIdentifierStr().substring(4);
+let fid = 0;
+
+/* eslint-disable */
+afterEach(function () {
+  if (this?.currentTest?.state === 'failed') {
+    const prepend = (() => {
+      const preamble = `[Failure ${bid}-${fid++}]`;
+      return (s) => s.split('\n').map(s => `${preamble} ${s}`).join('\n');
+    })();
+
+
+    console.log(prepend(`XHR mock state after failure (for test '${this.currentTest.fullTitle()}'): ${server.requests.length} requests`))
+    server.requests.forEach((req, i) => {
+      console.log(prepend(`Request #${i}:`));
+      console.log(prepend(JSON.stringify(req, null, 2)));
+    })
+  }
+});
+/* eslint-enable */
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..3b5bfb3d102 100644
--- a/test/pages/instream.html
+++ b/test/pages/instream.html
@@ -8,15 +8,15 @@
     <title>Prebid.js video adUnit example</title>
 
     <!-- videojs -->
-    <link rel="stylesheet" href="http://vjs.zencdn.net/5.9.2/video-js.css">
-    <script type="text/javascript" src="http://vjs.zencdn.net/5.9.2/video.js"></script>
+    <link rel="stylesheet" href="https://vjs.zencdn.net/5.9.2/video-js.css">
+    <script type="text/javascript" src="https://vjs.zencdn.net/5.9.2/video.js"></script>
 
     <!-- videojs-vast-vpaid -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/videojs-vast-vpaid/2.0.2/videojs.vast.vpaid.min.css" rel="stylesheet">
     <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/AnalyticsAdapter_spec.js b/test/spec/AnalyticsAdapter_spec.js
index 4afa430f81e..62c00e04403 100644
--- a/test/spec/AnalyticsAdapter_spec.js
+++ b/test/spec/AnalyticsAdapter_spec.js
@@ -1,17 +1,19 @@
-import { expect } from 'chai';
-import events from 'src/events.js';
+import {expect} from 'chai';
+import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
-import { server } from 'test/mocks/xhr.js';
+import {server} from 'test/mocks/xhr.js';
+import {disableAjaxForAnalytics, enableAjaxForAnalytics} from '../mocks/analyticsStub.js';
+import {clearEvents} from 'src/events.js';
+import {
+  DEFAULT_EXCLUDE_EVENTS,
+  DEFAULT_INCLUDE_EVENTS,
+  setDebounceDelay
+} from '../../libraries/analyticsAdapter/AnalyticsAdapter.js';
 
-const REQUEST_BIDS = CONSTANTS.EVENTS.REQUEST_BIDS;
-const BID_REQUESTED = CONSTANTS.EVENTS.BID_REQUESTED;
-const BID_RESPONSE = CONSTANTS.EVENTS.BID_RESPONSE;
 const BID_WON = CONSTANTS.EVENTS.BID_WON;
-const BID_TIMEOUT = CONSTANTS.EVENTS.BID_TIMEOUT;
-const AD_RENDER_FAILED = CONSTANTS.EVENTS.AD_RENDER_FAILED;
-const ADD_AD_UNITS = CONSTANTS.EVENTS.ADD_AD_UNITS;
+const NO_BID = CONSTANTS.EVENTS.NO_BID;
 
-const AnalyticsAdapter = require('src/AnalyticsAdapter').default;
+const AnalyticsAdapter = require('libraries/analyticsAdapter/AnalyticsAdapter.js').default;
 const config = {
   url: 'https://localhost:9999/endpoint',
   analyticsType: 'endpoint'
@@ -23,35 +25,98 @@ FEATURE: Analytics Adapters API
     AND an  \`example\` instance of \`AnalyticsAdapter\`\n`, () => {
   let adapter;
 
+  before(enableAjaxForAnalytics);
+  after(disableAjaxForAnalytics);
+
   beforeEach(function () {
     adapter = new AnalyticsAdapter(config);
   });
 
   afterEach(function () {
     adapter.disableAnalytics();
+    clearEvents();
+  });
+
+  it('should track enable status in `enabled`', () => {
+    expect(adapter.enabled).to.equal(false);
+    adapter.enableAnalytics();
+    expect(adapter.enabled).to.equal(true);
+    adapter.disableAnalytics();
+    expect(adapter.enabled).to.equal(false);
   });
 
   it(`SHOULD call the endpoint WHEN an event occurs that is to be tracked`, function () {
-    const eventType = BID_REQUESTED;
-    const args = { some: 'data' };
+    const eventType = BID_WON;
+    const args = {some: 'data'};
 
-    adapter.track({ eventType, args });
+    adapter.track({eventType, args});
 
     let result = JSON.parse(server.requests[0].requestBody);
-    expect(result).to.deep.equal({args: {some: 'data'}, eventType: 'bidRequested'});
+    expect(result).to.deep.equal({args: {some: 'data'}, eventType});
   });
 
   it(`SHOULD queue the event first and then track it WHEN an event occurs before tracking library is available`, function () {
-    const eventType = BID_RESPONSE;
-    const args = { wat: 'wot' };
+    const eventType = BID_WON;
+    const args = {wat: 'wot'};
 
     events.emit(eventType, args);
     adapter.enableAnalytics();
 
-    let result = JSON.parse(server.requests[0].requestBody);
-    expect(result).to.deep.equal({args: {wat: 'wot'}, eventType: 'bidResponse'});
+    // As now AUCTION_DEBUG is triggered for WARNINGS too, the BID_RESPONSE goes last in the array
+    const index = server.requests.length - 1;
+    let result = JSON.parse(server.requests[index].requestBody);
+    expect(result).to.deep.equal({eventType, args: {wat: 'wot'}});
   });
 
+  describe('event filters', () => {
+    function fireEvents() {
+      events.emit(BID_WON, {});
+      events.emit(NO_BID, {});
+    }
+    function getEvents(ev) {
+      return server.requests
+        .map(r => JSON.parse(r.requestBody))
+        .filter(r => r.eventType === ev)
+    }
+
+    Object.entries({
+      'whitelist includeEvents': {
+        includeEvents: [BID_WON]
+      },
+      'blacklist excludeEvents': {
+        excludeEvents: [NO_BID]
+      },
+      'give precedence to exclude over include': {
+        includeEvents: [BID_WON, NO_BID],
+        excludeEvents: [NO_BID]
+      }
+    }).forEach(([t, config]) => {
+      it(`should ${t}`, () => {
+        fireEvents();
+        adapter.enableAnalytics(config);
+        expect(getEvents(BID_WON).length).to.eql(1);
+        expect(getEvents(NO_BID).length).to.eql(0);
+        fireEvents();
+        expect(getEvents(BID_WON).length).to.eql(2);
+        expect(getEvents(NO_BID).length).to.eql(0);
+      })
+    })
+  })
+
+  it('should prevent infinite loops when track triggers other events', () => {
+    let i = 0;
+    adapter.track = ((orig) => {
+      return function (event) {
+        i++;
+        orig.call(this, event);
+        events.emit(BID_WON, {})
+      }
+    })(adapter.track);
+    adapter.enableAnalytics(config);
+    events.emit(BID_WON, {});
+    expect(i >= 100).to.eql(false);
+  })
+
   describe(`WHEN an event occurs after enable analytics\n`, function () {
     beforeEach(function () {
       sinon.stub(events, 'getEvents').returns([]); // these tests shouldn't be affected by previous tests
@@ -61,86 +126,26 @@ FEATURE: Analytics Adapters API
       events.getEvents.restore();
     });
 
-    it('SHOULD call global when a bidWon event occurs', function () {
-      const eventType = BID_WON;
-      const args = { more: 'info' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {more: 'info'}, eventType: 'bidWon'});
-    });
-
-    it('SHOULD call global when a adRenderFailed event occurs', function () {
-      const eventType = AD_RENDER_FAILED;
-      const args = { call: 'adRenderFailed' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'adRenderFailed'}, eventType: 'adRenderFailed'});
-    });
-
-    it('SHOULD call global when an addAdUnits event occurs', function () {
-      const eventType = ADD_AD_UNITS;
-      const args = { call: 'addAdUnits' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
+    Object.values(DEFAULT_INCLUDE_EVENTS).forEach(eventType => {
+      it(`SHOULD call global when a ${eventType} event occurs`, () => {
+        const args = {more: 'info'};
 
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'addAdUnits'}, eventType: 'addAdUnits'});
-    });
-
-    it('SHOULD call global when a requestBids event occurs', function () {
-      const eventType = REQUEST_BIDS;
-      const args = { call: 'request' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'request'}, eventType: 'requestBids'});
-    });
-
-    it('SHOULD call global when a bidRequest event occurs', function () {
-      const eventType = BID_REQUESTED;
-      const args = { call: 'request' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'request'}, eventType: 'bidRequested'});
-    });
-
-    it('SHOULD call global when a bidResponse event occurs', function () {
-      const eventType = BID_RESPONSE;
-      const args = { call: 'response' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'response'}, eventType: 'bidResponse'});
-    });
-
-    it('SHOULD call global when a bidTimeout event occurs', function () {
-      const eventType = BID_TIMEOUT;
-      const args = { call: 'timeout' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
+        adapter.enableAnalytics();
+        events.emit(eventType, args);
 
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'timeout'}, eventType: 'bidTimeout'});
+        let result = JSON.parse(server.requests[server.requests.length - 1].requestBody);
+        sinon.assert.match(result, {
+          eventType,
+          args: {
+            more: 'info'
+          },
+        });
+      });
     });
 
     it('SHOULD NOT call global again when adapter.enableAnalytics is called with previous timeout', function () {
-      const eventType = BID_TIMEOUT;
-      const args = { call: 'timeout' };
+      const eventType = BID_WON;
+      const args = {call: 'timeout'};
 
       events.emit(eventType, args);
       adapter.enableAnalytics();
@@ -151,7 +156,7 @@ FEATURE: Analytics Adapters API
 
     describe(`AND sampling is enabled\n`, function () {
       const eventType = BID_WON;
-      const args = { more: 'info' };
+      const args = {more: 'info'};
 
       beforeEach(function () {
         sinon.stub(Math, 'random').returns(0.5);
@@ -187,3 +192,39 @@ FEATURE: Analytics Adapters API
     });
   });
 });
+
+describe('Analytics asynchronous event tracking', () => {
+  before(() => {
+    setDebounceDelay(100);
+  });
+  after(() => {
+    setDebounceDelay(0);
+  });
+
+  let adapter, clock;
+
+  beforeEach(() => {
+    clock = sinon.useFakeTimers();
+    adapter = new AnalyticsAdapter(config);
+    adapter.track = sinon.stub();
+    adapter.enableAnalytics({});
+  });
+
+  afterEach(() => {
+    clock.restore();
+  })
+
+  it('does not call track as long as events are coming', () => {
+    events.emit(BID_WON, {i: 0});
+    sinon.assert.notCalled(adapter.track);
+    clock.tick(10);
+    events.emit(BID_WON, {i: 1});
+    sinon.assert.notCalled(adapter.track);
+    clock.tick(10);
+    sinon.assert.notCalled(adapter.track);
+    clock.tick(100);
+    sinon.assert.calledTwice(adapter.track);
+    sinon.assert.calledWith(adapter.track.firstCall, {eventType: BID_WON, args: {i: 0}});
+    sinon.assert.calledWith(adapter.track.secondCall, {eventType: BID_WON, args: {i: 1}});
+  });
+})
diff --git a/test/spec/adUnits_spec.js b/test/spec/adUnits_spec.js
index 7dd48a13208..089aabf22a5 100644
--- a/test/spec/adUnits_spec.js
+++ b/test/spec/adUnits_spec.js
@@ -1,3 +1,5 @@
+import 'src/prebid.js';
+
 describe('Publisher API _ AdUnits', function () {
   var assert = require('chai').assert;
   var expect = require('chai').expect;
@@ -23,6 +25,16 @@ describe('Publisher API _ AdUnits', function () {
         }
       ]
     }, {
+      ortb2Imp: {
+        ext: {
+          data: {
+            pbadslot: 'adSlotTest',
+            inventory: [4],
+            keywords: 'foo,bar',
+            visitor: [1, 2, 3],
+          }
+        }
+      },
       code: '/1996833/slot-2',
       sizes: [[468, 60]],
       bids: [
@@ -85,6 +97,7 @@ describe('Publisher API _ AdUnits', function () {
     it('the second adUnits value should be same with the adUnits that is added by $$PREBID_GLOBAL$$.addAdUnits();', function () {
       assert.strictEqual(adUnit2.code, '/1996833/slot-2', 'adUnit2 code');
       assert.deepEqual(adUnit2.sizes, [[468, 60]], 'adUnit2 sizes');
+      assert.deepEqual(adUnit2['ortb2Imp'], {'ext': {'data': {'pbadslot': 'adSlotTest', 'inventory': [4], 'keywords': 'foo,bar', 'visitor': [1, 2, 3]}}}, 'adUnit2 ortb2Imp');
       assert.strictEqual(bids2[0].bidder, 'rubicon', 'adUnit2 bids1 bidder');
       assert.strictEqual(bids2[0].params.rp_account, '4934', 'adUnit2 bids1 params.rp_account');
       assert.strictEqual(bids2[0].params.rp_zonesize, '23948-15', 'adUnit2 bids1 params.rp_zonesize');
diff --git a/test/spec/adloader_spec.js b/test/spec/adloader_spec.js
index 0c46cd2f171..b775ec76e9b 100644
--- a/test/spec/adloader_spec.js
+++ b/test/spec/adloader_spec.js
@@ -38,5 +38,58 @@ describe('adLoader', function () {
       adLoader.loadExternalScript('someURL1', 'criteo', callback);
       expect(utilsinsertElementStub.called).to.be.true;
     });
+
+    it('requires a url to be included once per document', function () {
+      function getDocSpec() {
+        return {
+          createElement: function() {
+            return {
+
+            }
+          },
+          getElementsByTagName: function() {
+            return {
+              firstChild: {
+                insertBefore: function() {
+
+                }
+              }
+            }
+          }
+
+        }
+      }
+      const doc1 = getDocSpec();
+      const doc2 = getDocSpec();
+      adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc1);
+      adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc1);
+      adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc1);
+      adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc2);
+      adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc2);
+      expect(utilsinsertElementStub.callCount).to.equal(2);
+    });
+  });
+
+  it('attaches passed attributes to a script', function () {
+    const doc = {
+        createElement: function () {
+          return {
+            setAttribute: function (key, value) {
+              this[key] = value;
+            }
+          }
+        },
+        getElementsByTagName: function() {
+          return {
+            firstChild: {
+              insertBefore: function() {}
+            }
+          }
+        }
+      },
+      attrs = {'z': 'A', 'y': 2};
+    let script = adLoader.loadExternalScript('someUrl', 'criteo', undefined, doc, attrs);
+    expect(script.z).to.equal('A');
+    expect(script.y).to.equal(2);
   });
 });
diff --git a/test/spec/api_spec.js b/test/spec/api_spec.js
index 6f21eba7aaf..cb6c7aa87a3 100755
--- a/test/spec/api_spec.js
+++ b/test/spec/api_spec.js
@@ -43,10 +43,14 @@ describe('Publisher API', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getBidResponses);
     });
 
-    it('should have function $$PREBID_GLOBAL$$.getBidResponses', function () {
+    it('should have function $$PREBID_GLOBAL$$.getNoBids', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getNoBids);
     });
 
+    it('should have function $$PREBID_GLOBAL$$.getNoBidsForAdUnitCode', function () {
+      assert.isFunction($$PREBID_GLOBAL$$.getNoBidsForAdUnitCode);
+    });
+
     it('should have function $$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode);
     });
@@ -78,5 +82,9 @@ describe('Publisher API', function () {
     it('should have function $$PREBID_GLOBAL$$.getAllWinningBids', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getAllWinningBids);
     });
+
+    it('should have function $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode', function () {
+      assert.isFunction($$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode);
+    });
   });
 });
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 35a29727614..e1ecf801aa3 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -4,6 +4,8 @@ import {
   AUCTION_COMPLETED,
   adjustBids,
   getMediaTypeGranularity,
+  getPriceByGranularity,
+  addBidResponse
 } from 'src/auction.js';
 import CONSTANTS from 'src/constants.json';
 import * as auctionModule from 'src/auction.js';
@@ -12,8 +14,15 @@ import { createBid } from 'src/bidfactory.js';
 import { config } from 'src/config.js';
 import * as store from 'src/videoCache.js';
 import * as ajaxLib from 'src/ajax.js';
-import find from 'core-js-pure/features/array/find.js';
+import {find} from 'src/polyfill.js';
 import { server } from 'test/mocks/xhr.js';
+import {hook} from '../../src/hook.js';
+import {auctionManager} from '../../src/auctionManager.js';
+import 'modules/debugging/index.js' // some tests look for debugging side effects
+import {AuctionIndex} from '../../src/auctionIndex.js';
+import {expect} from 'chai';
+import {deepClone} from '../../src/utils.js';
+import { IMAGE as ortbNativeRequest } from 'src/native.js';
 
 var assert = require('assert');
 
@@ -45,11 +54,21 @@ function mockBid(opts) {
     'height': 250,
     'bidderCode': bidderCode || BIDDER_CODE,
     'requestId': utils.getUniqueIdentifierStr(),
+    'transactionId': (opts && opts.transactionId) || ADUNIT_CODE,
     'creativeId': 'id',
     'currency': 'USD',
     'netRevenue': true,
     'ttl': 360,
-    getSize: () => '300x250'
+    getSize: () => '300x250',
+    getIdentifiers() {
+      return {
+        src: this.source,
+        bidder: this.bidderCode,
+        bidId: this.requestId,
+        transactionId: this.transactionId,
+        auctionId: this.auctionId
+      }
+    }
   };
 }
 
@@ -75,7 +94,7 @@ function mockBidRequest(bid, opts) {
 
   return {
     'bidderCode': bidderCode || bid.bidderCode,
-    'auctionId': '20882439e3238c',
+    'auctionId': opts && opts.auctionId,
     'bidderRequestId': requestId,
     'bids': [
       {
@@ -84,10 +103,11 @@ function mockBidRequest(bid, opts) {
           'placementId': 'id'
         },
         'adUnitCode': adUnitCode || ADUNIT_CODE,
+        'transactionId': bid.transactionId,
         'sizes': [[300, 250], [300, 600]],
         'bidId': bid.requestId,
         'bidderRequestId': requestId,
-        'auctionId': '20882439e3238c',
+        'auctionId': opts && opts.auctionId,
         'mediaTypes': mediaType
       }
     ],
@@ -124,6 +144,28 @@ function mockAjaxBuilder() {
 }
 
 describe('auctionmanager.js', function () {
+  let indexAuctions, indexStub
+
+  before(() => {
+    // hooks are global and their side effects depend on what has been loaded
+    [
+      auctionModule.addBidResponse,
+      auctionModule.addBidderRequests,
+      auctionModule.bidsBackCallback
+    ].forEach((h) => h.getHooks().remove())
+    hook.ready();
+  });
+
+  beforeEach(() => {
+    indexAuctions = [];
+    indexStub = sinon.stub(auctionManager, 'index');
+    indexStub.get(() => new AuctionIndex(() => indexAuctions));
+  });
+
+  afterEach(() => {
+    indexStub.restore();
+  });
+
   describe('getKeyValueTargetingPairs', function () {
     const DEFAULT_BID = {
       cpm: 5.578,
@@ -143,6 +185,10 @@ describe('auctionmanager.js', function () {
       adId: '1adId',
       source: 'client',
       mediaType: 'banner',
+      meta: {
+        advertiserDomains: ['adomain'],
+        primaryCatId: 'IAB-test'
+      }
     };
 
     /* return the expected response for a given bid, filter by keys if given */
@@ -154,6 +200,8 @@ describe('auctionmanager.js', function () {
       expected[ CONSTANTS.TARGETING_KEYS.SIZE ] = bid.getSize();
       expected[ CONSTANTS.TARGETING_KEYS.SOURCE ] = bid.source;
       expected[ CONSTANTS.TARGETING_KEYS.FORMAT ] = bid.mediaType;
+      expected[ CONSTANTS.TARGETING_KEYS.ADOMAIN ] = bid.meta.advertiserDomains[0];
+      expected[ CONSTANTS.TARGETING_KEYS.ACAT ] = bid.meta.primaryCatId;
       if (bid.mediaType === 'video') {
         expected[ CONSTANTS.TARGETING_KEYS.UUID ] = bid.videoCacheKey;
         expected[ CONSTANTS.TARGETING_KEYS.CACHE_ID ] = bid.videoCacheKey;
@@ -239,6 +287,18 @@ describe('auctionmanager.js', function () {
                 return bidResponse.mediaType;
               }
             },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ADOMAIN,
+              val: function (bidResponse) {
+                return bidResponse.meta.advertiserDomains[0];
+              }
+            },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ACAT,
+              val: function (bidResponse) {
+                return bidResponse.meta.primaryCatId;
+              }
+            }
           ]
 
         }
@@ -309,6 +369,18 @@ describe('auctionmanager.js', function () {
               val: function (bidResponse) {
                 return bidResponse.videoCacheKey;
               }
+            },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ADOMAIN,
+              val: function (bidResponse) {
+                return bidResponse.meta.advertiserDomains[0];
+              }
+            },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ACAT,
+              val: function (bidResponse) {
+                return bidResponse.meta.primaryCatId;
+              }
             }
           ]
 
@@ -397,6 +469,24 @@ describe('auctionmanager.js', function () {
       assert.deepEqual(response, expected);
     });
 
+    it('Should set targeting as expecting when pbs is enabled', function () {
+      config.setConfig({
+        s2sConfig: {
+          accountId: '1',
+          enabled: true,
+          defaultVendor: 'appnexus',
+          bidders: ['appnexus'],
+          timeout: 1000,
+          adapter: 'prebidServer'
+        }
+      });
+
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      let expected = getDefaultExpected(bid);
+      let response = getKeyValueTargetingPairs(bid.bidderCode, bid);
+      assert.deepEqual(response, expected);
+    });
+
     it('Custom bidCpmAdjustment for one bidder and inherit standard but doesn\'t use standard bidCpmAdjustment', function () {
       $$PREBID_GLOBAL$$.bidderSettings =
       {
@@ -631,14 +721,55 @@ describe('auctionmanager.js', function () {
     });
   });
 
-  describe('addBidResponse', function () {
+  describe('createAuction', () => {
+    let adUnits, stubMakeBidRequests, stubCallAdapters
+
+    beforeEach(() => {
+      stubMakeBidRequests = sinon.stub(adapterManager, 'makeBidRequests').returns([{
+        bidderCode: BIDDER_CODE,
+        bids: [{
+          bidder: BIDDER_CODE
+        }]
+      }]);
+      stubCallAdapters = sinon.stub(adapterManager, 'callBids').callsFake((au, reqs, addBid, done) => {
+        reqs.forEach(r => done.apply(r));
+      });
+      adUnits = [{
+        code: ADUNIT_CODE,
+        transactionId: ADUNIT_CODE,
+        bids: [
+          {bidder: BIDDER_CODE},
+        ]
+      }];
+    });
+
+    afterEach(() => {
+      stubMakeBidRequests.restore();
+      stubCallAdapters.restore();
+    });
+
+    it('passes global and bidder ortb2 to the auction', () => {
+      const ortb2Fragments = {
+        global: {},
+        bidder: {}
+      }
+      const auction = auctionManager.createAuction({adUnits, ortb2Fragments});
+      auction.callBids();
+      const anyArgs = [...Array(7).keys()].map(() => sinon.match.any);
+      sinon.assert.calledWith(stubMakeBidRequests, ...anyArgs.slice(0, 5).concat([sinon.match.same(ortb2Fragments)]));
+      sinon.assert.calledWith(stubCallAdapters, ...anyArgs.slice(0, 7).concat([sinon.match.same(ortb2Fragments)]));
+    });
+  });
+
+  describe('addBidResponse #1', function () {
     let createAuctionStub;
     let adUnits;
     let adUnitCodes;
     let spec;
     let auction;
     let ajaxStub;
-    let bids = TEST_BIDS;
+    let bids;
+    let bidderRequests;
     let makeRequestsStub;
 
     before(function () {
@@ -650,19 +781,21 @@ describe('auctionmanager.js', function () {
     });
 
     describe('when auction timeout is 3000', function () {
-      before(function () {
-        ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockAjaxBuilder);
-        makeRequestsStub.returns(TEST_BID_REQS);
-      });
       beforeEach(function () {
+        ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockAjaxBuilder);
         adUnits = [{
           code: ADUNIT_CODE,
+          transactionId: ADUNIT_CODE,
           bids: [
             {bidder: BIDDER_CODE, params: {placementId: 'id'}},
           ]
         }];
         adUnitCodes = [ADUNIT_CODE];
         auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: 3000});
+        bids = TEST_BIDS.slice();
+        bidderRequests = bids.map(b => mockBidRequest(b, {auctionId: auction.getAuctionId()}));
+        makeRequestsStub.returns(bidderRequests);
+        indexAuctions = [auction];
         createAuctionStub = sinon.stub(auctionModule, 'newAuction');
         createAuctionStub.returns(auction);
 
@@ -671,11 +804,8 @@ describe('auctionmanager.js', function () {
       });
 
       afterEach(function () {
-        auctionModule.newAuction.restore();
-      });
-
-      after(function () {
         ajaxStub.restore();
+        auctionModule.newAuction.restore();
       });
 
       function checkPbDg(cpm, expected, msg) {
@@ -718,14 +848,40 @@ describe('auctionmanager.js', function () {
         assert.equal(registeredBid.adserverTargeting.extra, 'stuff');
       });
 
-      it('installs publisher-defined renderers on bids', function () {
+      describe('install publisher-defined renderers', () => {
+        Object.entries({
+          'on adUnit': () => adUnits[0],
+          'on bid': () => bidderRequests[0].bids[0],
+        }).forEach(([t, getObj]) => {
+          it(t, () => {
+            let renderer = {
+              url: 'renderer.js',
+              render: (bid) => bid
+            };
+
+            let bids1 = Object.assign({},
+              bids[0],
+              {
+                bidderCode: BIDDER_CODE,
+                mediaType: 'video-outstream',
+              }
+            );
+            Object.assign(getObj(), {renderer});
+            spec.interpretResponse.returns(bids1);
+            auction.callBids();
+            const addedBid = auction.getBidsReceived().pop();
+            assert.equal(addedBid.renderer.url, 'renderer.js');
+          })
+        })
+      })
+
+      it('installs publisher-defined backup renderers on bids', function () {
         let renderer = {
           url: 'renderer.js',
+          backupOnly: true,
           render: (bid) => bid
         };
-        let bidRequests = [Object.assign({}, TEST_BID_REQS[0])];
-        bidRequests[0].bids[0] = Object.assign({ renderer }, bidRequests[0].bids[0]);
-        makeRequestsStub.returns(bidRequests);
+        Object.assign(adUnits[0], {renderer});
 
         let bids1 = Object.assign({},
           bids[0],
@@ -740,22 +896,86 @@ describe('auctionmanager.js', function () {
         assert.equal(addedBid.renderer.url, 'renderer.js');
       });
 
+      it('installs publisher-defined renderers for a media type', function () {
+        const renderer = {
+          url: 'videoRenderer.js',
+          render: (bid) => bid
+        };
+        let myBid = mockBid();
+        let bidRequest = mockBidRequest(myBid);
+
+        bidRequest.bids[0] = {
+          ...bidRequest.bids[0],
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]]
+            },
+            video: {
+              context: 'outstream',
+              renderer
+            }
+          }
+        };
+        makeRequestsStub.returns([bidRequest]);
+
+        myBid.mediaType = 'video';
+        spec.interpretResponse.returns(myBid);
+        auction.callBids();
+
+        const addedBid = auction.getBidsReceived().pop();
+        assert.equal(addedBid.renderer.url, renderer.url);
+      });
+
+      it('installs bidder-defined renderer when onlyBackup is true in mediaTypes.video options ', function () {
+        const renderer = {
+          url: 'videoRenderer.js',
+          backupOnly: true,
+          render: (bid) => bid
+        };
+        let myBid = mockBid();
+        let bidRequest = mockBidRequest(myBid);
+
+        bidRequest.bids[0] = {
+          ...bidRequest.bids[0],
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              renderer
+            }
+          }
+        };
+        makeRequestsStub.returns([bidRequest]);
+
+        myBid.mediaType = 'video';
+        myBid.renderer = {
+          url: 'renderer.js',
+          render: sinon.spy()
+        };
+        spec.interpretResponse.returns(myBid);
+        auction.callBids();
+
+        const addedBid = auction.getBidsReceived().pop();
+        assert.strictEqual(addedBid.renderer.url, myBid.renderer.url);
+      });
+
       it('bid for a regular unit and a video unit', function() {
         let renderer = {
           url: 'renderer.js',
           render: (bid) => bid
         };
-
+        Object.assign(adUnits[0], {renderer});
         // make sure that if the renderer is only on the second ad unit, prebid
         // still correctly uses it
         let bid = mockBid();
-        let bidRequests = [mockBidRequest(bid)];
+        let bidRequests = [mockBidRequest(bid, {auctionId: auction.getAuctionId()})];
 
         bidRequests[0].bids[1] = Object.assign({
-          renderer,
           bidId: utils.getUniqueIdentifierStr()
         }, bidRequests[0].bids[0]);
-        bidRequests[0].bids[0].adUnitCode = ADUNIT_CODE1;
+        Object.assign(bidRequests[0].bids[0], {
+          adUnitCode: ADUNIT_CODE1,
+          transactionId: ADUNIT_CODE1,
+        });
 
         makeRequestsStub.returns(bidRequests);
 
@@ -768,21 +988,27 @@ describe('auctionmanager.js', function () {
         const addedBid = find(auction.getBidsReceived(), bid => bid.adUnitCode == ADUNIT_CODE);
         assert.equal(addedBid.renderer.url, 'renderer.js');
       });
+
+      it('sets bidResponse.ttlBuffer from adUnit.ttlBuffer', () => {
+        adUnits[0].ttlBuffer = 0;
+        auction.callBids();
+        expect(auction.getBidsReceived()[0].ttlBuffer).to.eql(0);
+      });
     });
 
     describe('when auction timeout is 20', function () {
       let eventsEmitSpy;
 
-      before(function () {
+      function setupBids(auctionId) {
         bids = [mockBid(), mockBid({ bidderCode: BIDDER_CODE1 })];
-        let bidRequests = bids.map(bid => mockBidRequest(bid));
-
+        let bidRequests = bids.map(bid => mockBidRequest(bid, {auctionId}));
         makeRequestsStub.returns(bidRequests);
-      });
+      }
 
       beforeEach(function () {
         adUnits = [{
           code: ADUNIT_CODE,
+          transactionId: ADUNIT_CODE,
           bids: [
             {bidder: BIDDER_CODE, params: {placementId: 'id'}},
           ]
@@ -809,6 +1035,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];
@@ -818,6 +1046,7 @@ describe('auctionmanager.js', function () {
           done();
         }
         auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: auctionCallback, cbTimeout: 20});
+        setupBids(auction.getAuctionId());
 
         auction.callBids();
         respondToRequest(0);
@@ -836,7 +1065,7 @@ describe('auctionmanager.js', function () {
           done();
         }
         auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: auctionCallback, cbTimeout: 20});
-
+        setupBids(auction.getAuctionId());
         auction.callBids();
         respondToRequest(0);
         respondToRequest(1);
@@ -858,14 +1087,14 @@ describe('auctionmanager.js', function () {
           done();
         }
         auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: auctionCallback, cbTimeout: 20});
-
+        setupBids(auction.getAuctionId());
         auction.callBids();
         respondToRequest(0);
       });
     });
   });
 
-  describe('addBidResponse', function () {
+  describe('addBidResponse #2', function () {
     let createAuctionStub;
     let adUnits;
     let adUnitCodes;
@@ -877,38 +1106,32 @@ describe('auctionmanager.js', function () {
     let bids = TEST_BIDS;
     let bids1 = [mockBid({ bidderCode: BIDDER_CODE1 })];
 
-    before(function () {
-      let bidRequests = [
-        mockBidRequest(bids[0]),
-        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 })
-      ];
-      let makeRequestsStub = sinon.stub(adapterManager, 'makeBidRequests');
-      makeRequestsStub.returns(bidRequests);
-
-      ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockAjaxBuilder);
-    });
-
-    after(function () {
-      ajaxStub.restore();
-      adapterManager.makeBidRequests.restore();
-    });
-
     beforeEach(function () {
       adUnits = [{
         code: ADUNIT_CODE,
+        transactionId: ADUNIT_CODE,
         bids: [
           {bidder: BIDDER_CODE, params: {placementId: 'id'}},
         ]
       }, {
         code: ADUNIT_CODE1,
+        transactionId: ADUNIT_CODE1,
         bids: [
           {bidder: BIDDER_CODE1, params: {placementId: 'id'}},
         ]
       }];
       adUnitCodes = adUnits.map(({ code }) => code);
       auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: 3000});
+      let bidRequests = [
+        mockBidRequest(bids[0], { auctionId: auction.getAuctionId() }),
+        mockBidRequest(bids1[0], { auctionId: auction.getAuctionId(), adUnitCode: ADUNIT_CODE1 })
+      ];
+      let makeRequestsStub = sinon.stub(adapterManager, 'makeBidRequests');
+      makeRequestsStub.returns(bidRequests);
+      ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockAjaxBuilder);
       createAuctionStub = sinon.stub(auctionModule, 'newAuction');
       createAuctionStub.returns(auction);
+      indexAuctions = [auction];
 
       spec = mockBidder(BIDDER_CODE, bids);
       spec1 = mockBidder(BIDDER_CODE1, bids1);
@@ -919,6 +1142,8 @@ describe('auctionmanager.js', function () {
 
     afterEach(function () {
       auctionModule.newAuction.restore();
+      ajaxStub.restore();
+      adapterManager.makeBidRequests.restore();
     });
 
     it('should not alter bid requestID', function () {
@@ -1008,14 +1233,6 @@ describe('auctionmanager.js', function () {
       logInfoStub = sinon.stub(utils, 'logInfo');
       logWarnStub = sinon.stub(utils, 'logWarn');
       logErrorStub = sinon.stub(utils, 'logError');
-      let bidRequests = [
-        mockBidRequest(bids[0]),
-        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 })
-      ];
-      let makeRequestsStub = sinon.stub(adapterManager, 'makeBidRequests');
-      makeRequestsStub.returns(bidRequests);
-
-      ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockAjaxBuilder);
     });
 
     after(function () {
@@ -1023,8 +1240,6 @@ describe('auctionmanager.js', function () {
       logInfoStub.restore();
       logWarnStub.restore();
       logErrorStub.restore();
-      ajaxStub.restore();
-      adapterManager.makeBidRequests.restore();
     });
 
     beforeEach(function () {
@@ -1033,19 +1248,20 @@ describe('auctionmanager.js', function () {
           enabled: true,
           bidRequests: [{
             bidderCode: BIDDER_CODE,
-            adUnitCode: ADUNIT_CODE,
-            storedAuctionResponse: '11111'
+            adUnitCode: ADUNIT_CODE
           }]
         }
       });
 
       adUnits = [{
         code: ADUNIT_CODE,
+        transactionId: ADUNIT_CODE,
         bids: [
           {bidder: BIDDER_CODE, params: {placementId: 'id'}},
         ]
       }, {
         code: ADUNIT_CODE1,
+        transactionId: ADUNIT_CODE1,
         bids: [
           {bidder: BIDDER_CODE1, params: {placementId: 'id'}},
         ]
@@ -1054,6 +1270,15 @@ describe('auctionmanager.js', function () {
       auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: 3000});
       createAuctionStub = sinon.stub(auctionModule, 'newAuction');
       createAuctionStub.returns(auction);
+      indexAuctions = [auction];
+      let bidRequests = [
+        mockBidRequest(bids[0], { auctionId: auction.getAuctionId() }),
+        mockBidRequest(bids1[0], { auctionId: auction.getAuctionId(), adUnitCode: ADUNIT_CODE1 })
+      ];
+      let makeRequestsStub = sinon.stub(adapterManager, 'makeBidRequests');
+      makeRequestsStub.returns(bidRequests);
+
+      ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockAjaxBuilder);
 
       spec = mockBidder(BIDDER_CODE, bids);
       spec1 = mockBidder(BIDDER_CODE1, bids1);
@@ -1068,6 +1293,8 @@ describe('auctionmanager.js', function () {
       logWarnStub.resetHistory();
       logErrorStub.resetHistory();
       auctionModule.newAuction.restore();
+      ajaxStub.restore();
+      adapterManager.makeBidRequests.restore();
       config.resetConfig();
     });
 
@@ -1079,19 +1306,90 @@ describe('auctionmanager.js', function () {
 
       const bid = find(auctionBidRequests[0].bids, bid => bid.adUnitCode === ADUNIT_CODE);
       assert.equal(typeof bid !== 'undefined', true);
-      assert.equal(bid.hasOwnProperty('storedAuctionResponse'), true);
-      assert.equal(bid.storedAuctionResponse, '11111');
     });
   });
 
+  if (FEATURES.NATIVE) {
+    describe('addBidResponse native', function () {
+      let makeRequestsStub;
+      let ajaxStub;
+      let spec;
+      let auction;
+
+      beforeEach(function () {
+        makeRequestsStub = sinon.stub(adapterManager, 'makeBidRequests');
+        ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockAjaxBuilder);
+
+        const adUnits = [{
+          code: ADUNIT_CODE,
+          transactionId: ADUNIT_CODE,
+          bids: [
+            {bidder: BIDDER_CODE, params: {placementId: 'id'}},
+          ],
+          nativeOrtbRequest: ortbNativeRequest.ortb,
+          mediaTypes: { native: { type: 'image' } }
+        }];
+        auction = auctionModule.newAuction({adUnits, adUnitCodes: [ADUNIT_CODE], callback: function() {}, cbTimeout: 3000});
+        indexAuctions = [auction];
+        const createAuctionStub = sinon.stub(auctionModule, 'newAuction');
+        createAuctionStub.returns(auction);
+
+        spec = mockBidder(BIDDER_CODE);
+        registerBidder(spec);
+      });
+
+      afterEach(function () {
+        ajaxStub.restore();
+        auctionModule.newAuction.restore();
+        adapterManager.makeBidRequests.restore();
+      });
+
+      it('should add legacy fields to native response', function () {
+        let nativeBid = mockBid();
+        nativeBid.mediaType = 'native';
+        nativeBid.native = {
+          ortb: {
+            ver: '1.2',
+            assets: [
+              { id: 2, title: { text: 'Sample title' } },
+              { id: 4, data: { value: 'Sample body' } },
+              { id: 3, data: { value: 'Sample sponsoredBy' } },
+              { id: 1, img: { url: 'https://www.example.com/image.png', w: 200, h: 200 } },
+              { id: 5, img: { url: 'https://www.example.com/icon.png', w: 32, h: 32 } }
+            ],
+            link: { url: 'http://www.click.com' },
+            eventtrackers: [
+              { event: 1, method: 1, url: 'http://www.imptracker.com' },
+              { event: 1, method: 2, url: 'http://www.jstracker.com/file.js' }
+            ]
+          }
+        }
+
+        let bidRequest = mockBidRequest(nativeBid, { mediaType: { native: ortbNativeRequest } });
+        makeRequestsStub.returns([bidRequest]);
+
+        spec.interpretResponse.returns(nativeBid);
+        auction.callBids();
+
+        const addedBid = auction.getBidsReceived().pop();
+        assert.equal(addedBid.native.body, 'Sample body')
+        assert.equal(addedBid.native.title, 'Sample title')
+        assert.equal(addedBid.native.sponsoredBy, 'Sample sponsoredBy')
+        assert.equal(addedBid.native.clickUrl, 'http://www.click.com')
+        assert.equal(addedBid.native.image, 'https://www.example.com/image.png')
+        assert.equal(addedBid.native.icon, 'https://www.example.com/icon.png')
+        assert.equal(addedBid.native.impressionTrackers[0], 'http://www.imptracker.com')
+        assert.equal(addedBid.native.javascriptTrackers, '<script async src="http://www.jstracker.com/file.js"></script>')
+      });
+    });
+  }
+
   describe('getMediaTypeGranularity', function () {
     it('video', function () {
-      let bidReq = {
-        'mediaTypes': { video: {id: '1'} }
-      };
+      let mediaTypes = { video: {id: '1'} };
 
       // mediaType is video and video.context is undefined
-      expect(getMediaTypeGranularity('video', bidReq, {
+      expect(getMediaTypeGranularity('video', mediaTypes, {
         banner: 'low',
         video: 'medium'
       })).to.equal('medium');
@@ -1107,10 +1405,8 @@ describe('auctionmanager.js', function () {
       })).to.equal('medium');
 
       // also when mediaTypes.video is undefined
-      bidReq = {
-        'mediaTypes': { banner: {} }
-      };
-      expect(getMediaTypeGranularity('video', bidReq, {
+      mediaTypes = { banner: {} };
+      expect(getMediaTypeGranularity('video', mediaTypes, {
         banner: 'low',
         video: 'medium'
       })).to.equal('medium');
@@ -1123,22 +1419,22 @@ describe('auctionmanager.js', function () {
     });
 
     it('video-outstream', function () {
-      let bidReq = { 'mediaTypes': { video: { context: 'outstream' } } };
+      let mediaTypes = { video: { context: 'outstream' } };
 
-      expect(getMediaTypeGranularity('video', bidReq, {
+      expect(getMediaTypeGranularity('video', mediaTypes, {
         'banner': 'low', 'video': 'medium', 'video-outstream': 'high'
       })).to.equal('high');
     });
 
     it('video-instream', function () {
-      let bidReq = { 'mediaTypes': { video: { context: 'instream' } } };
+      let mediaTypes = { video: { context: 'instream' } };
 
-      expect(getMediaTypeGranularity('video', bidReq, {
+      expect(getMediaTypeGranularity('video', mediaTypes, {
         banner: 'low', video: 'medium', 'video-instream': 'high'
       })).to.equal('high');
 
       // fall back to video if video-instream not found
-      expect(getMediaTypeGranularity('video', bidReq, {
+      expect(getMediaTypeGranularity('video', mediaTypes, {
         banner: 'low', video: 'medium'
       })).to.equal('medium');
 
@@ -1148,57 +1444,104 @@ describe('auctionmanager.js', function () {
     });
 
     it('native', function () {
-      expect(getMediaTypeGranularity('native', {mediaTypes: {native: {}}}, {
+      expect(getMediaTypeGranularity('native', {native: {}}, {
         banner: 'low', video: 'medium', native: 'high'
       })).to.equal('high');
     });
   });
 
+  function mockAuction(getBidRequests, start = 1) {
+    return {
+      getBidRequests: getBidRequests,
+      getAdUnits: () => getBidRequests().flatMap(br => br.bids).map(br => ({ code: br.adUnitCode, transactionId: br.transactionId, mediaTypes: br.mediaTypes })),
+      getAuctionId: () => '1',
+      addBidReceived: () => true,
+      addBidRejected: () => true,
+      getTimeout: () => 1000,
+      getAuctionStart: () => start,
+    }
+  }
+
+  describe('getPriceByGranularity', () => {
+    beforeEach(() => {
+      config.setConfig({
+        mediaTypePriceGranularity: {
+          video: 'medium',
+          banner: 'low'
+        }
+      });
+    })
+
+    afterEach(() => {
+      config.resetConfig();
+    })
+
+    it('evaluates undef granularity on each call', () => {
+      const gpbg = getPriceByGranularity();
+      expect(gpbg({
+        mediaType: 'video', pbMg: 'medium'
+      }, {
+        'mediaTypes': {video: {id: '1'}}
+      })).to.equal('medium');
+      expect(gpbg({
+        mediaType: 'banner',
+        pbLg: 'low'
+      }, {
+        'mediaTypes': {banner: {}}
+      })).to.equal('low');
+    });
+  })
+
   describe('auctionCallbacks', function() {
     let bids = TEST_BIDS;
     let bidRequests;
     let doneSpy;
-    let auction = {
-      getBidRequests: () => bidRequests,
-      getAuctionId: () => '1',
-      addBidReceived: () => true,
-      getTimeout: () => 1000
-    }
+    let auction;
 
     beforeEach(() => {
+      const start = Date.now();
+      auction = mockAuction(() => bidRequests, start);
+      indexAuctions = [auction];
       doneSpy = sinon.spy();
       config.setConfig({
         cache: {
           url: 'https://prebid.adnxs.com/pbc/v1/cache'
         }
-      })
+      });
     });
 
     afterEach(() => {
       doneSpy.resetHistory();
       config.resetConfig();
+      bidRequests = null;
     });
 
-    it('should call auction done after bid is added to auction for mediaType banner', function () {
-      let ADUNIT_CODE2 = 'adUnitCode2';
-      let BIDDER_CODE2 = 'sampleBidder2';
-
-      let bids1 = [mockBid({ bidderCode: BIDDER_CODE1 })];
-      let bids2 = [mockBid({ bidderCode: BIDDER_CODE2 })];
-      bidRequests = [
-        mockBidRequest(bids[0]),
-        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
-        mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE2 })
-      ];
-      let cbs = auctionCallbacks(doneSpy, auction);
-      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE, bids[0]);
-      cbs.adapterDone.call(bidRequests[0]);
-      cbs.addBidResponse.call(bidRequests[1], ADUNIT_CODE1, bids1[0]);
-      cbs.adapterDone.call(bidRequests[1]);
-      cbs.addBidResponse.call(bidRequests[2], ADUNIT_CODE2, bids2[0]);
-      cbs.adapterDone.call(bidRequests[2]);
-      assert.equal(doneSpy.callCount, 1);
-    });
+    Object.entries({
+      'added to': (cbs) => cbs.addBidResponse,
+      'rejected from': (cbs) => cbs.addBidResponse.reject,
+    }).forEach(([t, getMethod]) => {
+      it(`should call auction done after bid is ${t} auction for mediaType banner`, function () {
+        let ADUNIT_CODE2 = 'adUnitCode2';
+        let BIDDER_CODE2 = 'sampleBidder2';
+
+        let bids1 = [mockBid({ bidderCode: BIDDER_CODE1, transactionId: ADUNIT_CODE1 })];
+        let bids2 = [mockBid({ bidderCode: BIDDER_CODE2, transactionId: ADUNIT_CODE2 })];
+        bidRequests = [
+          mockBidRequest(bids[0]),
+          mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
+          mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE2 })
+        ];
+        let cbs = auctionCallbacks(doneSpy, auction);
+        const method = getMethod(cbs);
+        method(ADUNIT_CODE, bids[0]);
+        cbs.adapterDone.call(bidRequests[0]);
+        method(ADUNIT_CODE1, bids1[0]);
+        cbs.adapterDone.call(bidRequests[1]);
+        method(ADUNIT_CODE2, bids2[0]);
+        cbs.adapterDone.call(bidRequests[2]);
+        assert.equal(doneSpy.callCount, 1);
+      });
+    })
 
     it('should call auction done after prebid cache is complete for mediaType video', function() {
       bids[0].mediaType = 'video';
@@ -1227,6 +1570,322 @@ describe('auctionmanager.js', function () {
       const responseBody = `{"responses":[{"uuid":"${uuid}"}]}`;
       server.requests[0].respond(200, { 'Content-Type': 'application/json' }, responseBody);
       assert.equal(doneSpy.callCount, 1);
+    });
+
+    it('should convert cpm to number', () => {
+      auction.addBidReceived = sinon.spy();
+      const cbs = auctionCallbacks(doneSpy, auction);
+      const bid = {...bids[0], cpm: '1.23'}
+      bidRequests = [mockBidRequest(bid)];
+      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE, bid);
+      sinon.assert.calledWith(auction.addBidReceived, sinon.match({cpm: 1.23}));
+    })
+
+    describe('when addBidResponse hook returns promises', () => {
+      let resolvers, callbacks, bids;
+
+      function hook(next, ...args) {
+        next.bail(new Promise((resolve, reject) => {
+          resolvers.resolve.push(resolve);
+          resolvers.reject.push(reject);
+        }).finally(() => next(...args)));
+      }
+
+      function invokeCallbacks() {
+        bids.forEach((bid) => callbacks.addBidResponse(ADUNIT_CODE, bid));
+        bidRequests.forEach(bidRequest => callbacks.adapterDone.call(bidRequest));
+      }
+
+      function delay(ms = 0) {
+        return new Promise((resolve) => {
+          setTimeout(resolve, ms)
+        });
+      }
+
+      beforeEach(() => {
+        bids = [
+          mockBid({bidderCode: BIDDER_CODE1}),
+          mockBid({bidderCode: BIDDER_CODE})
+        ]
+        bidRequests = bids.map((b) => mockBidRequest(b));
+        resolvers = {resolve: [], reject: []};
+        addBidResponse.before(hook);
+        callbacks = auctionCallbacks(doneSpy, auction);
+        Object.assign(auction, {
+          addNoBid: sinon.spy()
+        });
+      });
+
+      afterEach(() => {
+        addBidResponse.getHooks({hook: hook}).remove();
+      });
+
+      it('should wait for bids without a request bids before calling auctionDone', () => {
+        callbacks.addBidResponse(ADUNIT_CODE, Object.assign(mockBid(), {requestId: null}));
+        invokeCallbacks();
+        resolvers.resolve.slice(1, 3).forEach((fn) => fn());
+        return delay().then(() => {
+          expect(doneSpy.called).to.be.false;
+          resolvers.resolve[0]();
+          return delay();
+        }).then(() => {
+          expect(doneSpy.called).to.be.true;
+        });
+      });
+
+      Object.entries({
+        'all succeed': ['resolve', 'resolve'],
+        'some fail': ['resolve', 'reject'],
+        'all fail': ['reject', 'reject']
+      }).forEach(([test, results]) => {
+        describe(`(and ${test})`, () => {
+          it('should wait for them to complete before calling auctionDone', () => {
+            invokeCallbacks();
+            return delay().then(() => {
+              expect(doneSpy.called).to.be.false;
+              expect(auction.addNoBid.called).to.be.false;
+              resolvers[results[0]][0]();
+              return delay();
+            }).then(() => {
+              expect(doneSpy.called).to.be.false;
+              expect(auction.addNoBid.called).to.be.false;
+              resolvers[results[1]][1]();
+              return delay();
+            }).then(() => {
+              expect(doneSpy.called).to.be.true;
+            });
+          });
+        });
+      });
+
+      Object.entries({
+        bidder: (timeout) => {
+          bidRequests.forEach((r) => r.timeout = timeout);
+          auction.getTimeout = () => timeout + 10000
+        },
+        auction: (timeout) => {
+          auction.getTimeout = () => timeout;
+          bidRequests.forEach((r) => r.timeout = timeout + 10000)
+        }
+      }).forEach(([test, setTimeout]) => {
+        it(`should respect ${test} timeout if they never complete`, () => {
+          const start = Date.now() - 2900;
+          auction.getAuctionStart = () => start;
+          setTimeout(3000);
+          invokeCallbacks();
+          return delay().then(() => {
+            expect(doneSpy.called).to.be.false;
+            return delay(100);
+          }).then(() => {
+            expect(doneSpy.called).to.be.true;
+          });
+        });
+
+        it(`should not wait if ${test} has already timed out`, () => {
+          const start = Date.now() - 2000;
+          auction.getAuctionStart = () => start;
+          setTimeout(1000);
+          invokeCallbacks();
+          return delay().then(() => {
+            expect(doneSpy.called).to.be.true;
+          });
+        });
+      })
+    });
+
+    describe('when bids are rejected', () => {
+      let cbs, bid, expectedRejection;
+      const onBidRejected = sinon.stub();
+      const REJECTION_REASON = 'Bid rejected';
+      const AU_CODE = 'au';
+
+      function rejectHook(fn, adUnitCode, bid, reject) {
+        reject(REJECTION_REASON);
+        reject(REJECTION_REASON); // second call should do nothing
+      }
+
+      before(() => {
+        addBidResponse.before(rejectHook, 999);
+        events.on(CONSTANTS.EVENTS.BID_REJECTED, onBidRejected);
+      });
+
+      after(() => {
+        addBidResponse.getHooks({hook: rejectHook}).remove();
+        events.off(CONSTANTS.EVENTS.BID_REJECTED, onBidRejected);
+      });
+
+      beforeEach(() => {
+        onBidRejected.reset();
+        bid = mockBid({bidderCode: BIDDER_CODE});
+        bidRequests = [
+          mockBidRequest(bid),
+        ];
+        cbs = auctionCallbacks(doneSpy, auction);
+        expectedRejection = sinon.match(Object.assign({}, bid, {
+          cpm: parseFloat(bid.cpm),
+          rejectionReason: REJECTION_REASON,
+          adUnitCode: AU_CODE
+        }));
+        auction.addBidRejected = sinon.stub();
+      });
+
+      Object.entries({
+        'with addBidResponse.reject': () => cbs.addBidResponse.reject(AU_CODE, deepClone(bid), REJECTION_REASON),
+        'from addBidResponse hooks': () => cbs.addBidResponse(AU_CODE, deepClone(bid))
+      }).forEach(([t, rejectBid]) => {
+        describe(t, () => {
+          it('should emit a BID_REJECTED event', () => {
+            rejectBid();
+            sinon.assert.calledWith(onBidRejected, expectedRejection);
+          });
+
+          it('should pass bid to auction.addBidRejected', () => {
+            rejectBid();
+            sinon.assert.calledWith(auction.addBidRejected, expectedRejection);
+          });
+        })
+      });
+
+      it('should return a NO_BID replacement', () => {
+        const noBid = cbs.addBidResponse.reject(AU_CODE, {...bid, statusMessage: 'Bid available', status: CONSTANTS.BID_STATUS.RENDERED}, 'Rejected');
+        sinon.assert.match(noBid, {
+          status: CONSTANTS.BID_STATUS.BID_REJECTED,
+          statusMessage: 'Bid returned empty or error response',
+          cpm: 0,
+          requestId: bid.requestId,
+          auctionId: bid.auctionId,
+          adUnitCode: AU_CODE,
+          rejectionReason: undefined,
+        });
+      });
+
+      it('should return NO_BID replacement when rejected bid is not a "proper" bid', () => {
+        const noBid = cbs.addBidResponse.reject(AU_CODE, {});
+        sinon.assert.match(noBid, {
+          status: CONSTANTS.BID_STATUS.BID_REJECTED,
+          statusMessage: 'Bid returned empty or error response',
+          cpm: 0,
+        });
+      })
+
+      it('addBidResponse hooks should not be able to reject the same bid twice', () => {
+        cbs.addBidResponse(AU_CODE, bid);
+        expect(auction.addBidRejected.calledOnce).to.be.true;
+      });
     })
   });
+
+  describe('auctionOptions', function() {
+    let bidRequests;
+    let doneSpy;
+    let clock;
+    let requiredBidder = BIDDER_CODE;
+    let requiredBidder1 = BIDDER_CODE1;
+    let secondaryBidder = 'doNotWaitForMe';
+    let auction;
+
+    beforeEach(() => {
+      clock = sinon.useFakeTimers();
+      doneSpy = sinon.spy();
+      config.setConfig({
+        'auctionOptions': {
+          secondaryBidders: [ secondaryBidder ]
+        }
+      });
+
+      const start = Date.now();
+      auction = mockAuction(() => bidRequests);
+      indexAuctions = [auction];
+    });
+
+    afterEach(() => {
+      doneSpy.resetHistory();
+      config.resetConfig();
+      clock.restore();
+    });
+
+    it('should not wait to call auction done for secondary bidders', function () {
+      let bids1 = [mockBid({ bidderCode: requiredBidder, transactionId: ADUNIT_CODE1 })];
+      let bids2 = [mockBid({ bidderCode: requiredBidder1, transactionId: ADUNIT_CODE1 })];
+      let bids3 = [mockBid({ bidderCode: secondaryBidder, transactionId: ADUNIT_CODE1 })];
+      bidRequests = [
+        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids3[0], { adUnitCode: ADUNIT_CODE1 }),
+      ];
+      let cbs = auctionCallbacks(doneSpy, auction);
+      // required bidder responds immeaditely to auction
+      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE1, bids1[0]);
+      cbs.adapterDone.call(bidRequests[0]);
+      assert.equal(doneSpy.callCount, 0);
+
+      // auction waits for second required bidder to respond
+      clock.tick(100);
+      cbs.addBidResponse.call(bidRequests[1], ADUNIT_CODE1, bids2[0]);
+      cbs.adapterDone.call(bidRequests[1]);
+
+      // auction done is reported and does not wait for secondaryBidder request
+      assert.equal(doneSpy.callCount, 1);
+
+      cbs.addBidResponse.call(bidRequests[2], ADUNIT_CODE1, bids3[0]);
+      cbs.adapterDone.call(bidRequests[2]);
+    });
+
+    it('should wait for all bidders if they are all secondary', function () {
+      config.setConfig({
+        'auctionOptions': {
+          secondaryBidders: [requiredBidder, requiredBidder1, secondaryBidder]
+        }
+      })
+      let bids1 = [mockBid({ bidderCode: requiredBidder })];
+      let bids2 = [mockBid({ bidderCode: requiredBidder1 })];
+      let bids3 = [mockBid({ bidderCode: secondaryBidder })];
+      bidRequests = [
+        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids3[0], { adUnitCode: ADUNIT_CODE1 }),
+      ];
+      let cbs = auctionCallbacks(doneSpy, auction);
+      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE1, bids1[0]);
+      cbs.adapterDone.call(bidRequests[0]);
+      clock.tick(100);
+      assert.equal(doneSpy.callCount, 0)
+
+      cbs.addBidResponse.call(bidRequests[1], ADUNIT_CODE1, bids2[0]);
+      cbs.adapterDone.call(bidRequests[1]);
+      clock.tick(100);
+      assert.equal(doneSpy.callCount, 0);
+
+      cbs.addBidResponse.call(bidRequests[2], ADUNIT_CODE1, bids3[0]);
+      cbs.adapterDone.call(bidRequests[2]);
+      assert.equal(doneSpy.callCount, 1);
+    });
+
+    it('should allow secondaryBidders to respond in auction before is is done', function () {
+      let bids1 = [mockBid({ bidderCode: requiredBidder })];
+      let bids2 = [mockBid({ bidderCode: requiredBidder1 })];
+      let bids3 = [mockBid({ bidderCode: secondaryBidder })];
+      bidRequests = [
+        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids3[0], { adUnitCode: ADUNIT_CODE1 }),
+      ];
+      let cbs = auctionCallbacks(doneSpy, auction);
+      // secondaryBidder is first to respond
+      cbs.addBidResponse.call(bidRequests[2], ADUNIT_CODE1, bids3[0]);
+      cbs.adapterDone.call(bidRequests[2]);
+      clock.tick(100);
+      assert.equal(doneSpy.callCount, 0);
+
+      cbs.addBidResponse.call(bidRequests[1], ADUNIT_CODE1, bids2[0]);
+      cbs.adapterDone.call(bidRequests[1]);
+      clock.tick(100);
+      assert.equal(doneSpy.callCount, 0);
+
+      // first required bidder takes longest to respond, auction isn't marked as done until this occurs
+      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE1, bids1[0]);
+      cbs.adapterDone.call(bidRequests[0]);
+      assert.equal(doneSpy.callCount, 1);
+    });
+  });
 });
diff --git a/test/spec/config_spec.js b/test/spec/config_spec.js
index be5b4bbb78b..d7f6b9de6c0 100644
--- a/test/spec/config_spec.js
+++ b/test/spec/config_spec.js
@@ -6,15 +6,27 @@ const utils = require('src/utils');
 
 let getConfig;
 let setConfig;
+let readConfig;
+let mergeConfig;
+let getBidderConfig;
+let setBidderConfig;
+let mergeBidderConfig;
 let setDefaults;
 
 describe('config API', function () {
   let logErrorSpy;
   let logWarnSpy;
+  let config;
+
   beforeEach(function () {
-    const config = newConfig();
-    getConfig = config.getConfig;
+    config = newConfig();
+    getConfig = config.getAnyConfig;
     setConfig = config.setConfig;
+    readConfig = config.readAnyConfig;
+    mergeConfig = config.mergeConfig;
+    getBidderConfig = config.getBidderConfig;
+    setBidderConfig = config.setBidderConfig;
+    mergeBidderConfig = config.mergeBidderConfig;
     setDefaults = config.setDefaults;
     logErrorSpy = sinon.spy(utils, 'logError');
     logWarnSpy = sinon.spy(utils, 'logWarn');
@@ -33,6 +45,81 @@ describe('config API', function () {
     expect(getConfig()).to.be.a('object');
   });
 
+  it('readConfig returns deepCopy of the internal config object', function () {
+    setConfig({ foo: {biz: 'bar'} });
+    const config1 = readConfig('foo');
+    config1.biz = 'buz';
+    const config2 = readConfig('foo');
+    expect(readConfig()).to.be.a('object');
+    expect(config1.biz).to.not.equal(config2.biz);
+  });
+
+  it('readConfig retrieves arbitrary configuration properties', function () {
+    setConfig({ baz: 'qux' });
+    expect(readConfig('baz')).to.equal('qux');
+  });
+
+  it('readConfig has subscribe functionality for adding listeners to config updates', function () {
+    const listener = sinon.spy();
+
+    readConfig(listener);
+
+    setConfig({ foo: 'bar' });
+
+    sinon.assert.calledOnce(listener);
+    sinon.assert.calledWith(listener, { foo: 'bar' });
+  });
+
+  it('readConfig subscribers can unsubscribe', function () {
+    const listener = sinon.spy();
+
+    const unsubscribe = getConfig(listener);
+
+    unsubscribe();
+
+    readConfig({ logging: true });
+
+    sinon.assert.notCalled(listener);
+  });
+
+  it('readConfig subscribers can subscribe to topics', function () {
+    const listener = sinon.spy();
+
+    readConfig('logging', listener);
+
+    setConfig({ logging: true, foo: 'bar' });
+
+    sinon.assert.calledOnce(listener);
+    sinon.assert.calledWithExactly(listener, { logging: true });
+  });
+
+  it('readConfig topic subscribers are only called when that topic is changed', function () {
+    const listener = sinon.spy();
+    const wildcard = sinon.spy();
+
+    readConfig('subject', listener);
+    readConfig(wildcard);
+
+    setConfig({ foo: 'bar' });
+
+    sinon.assert.notCalled(listener);
+    sinon.assert.calledOnce(wildcard);
+  });
+
+  it('getConfig subscribers are called immediately if passed {init: true}', () => {
+    const listener = sinon.spy();
+    setConfig({foo: 'bar'});
+    getConfig('foo', listener, {init: true});
+    sinon.assert.calledWith(listener, {foo: 'bar'});
+  });
+
+  it('getConfig subscribers with no topic are called immediately if passed {init: true}', () => {
+    const listener = sinon.spy();
+    setConfig({foo: 'bar'});
+    getConfig(listener, {init: true});
+    sinon.assert.calledWith(listener, sinon.match({foo: 'bar'}));
+  });
+
   it('sets and gets arbitrary configuration properties', function () {
     setConfig({ baz: 'qux' });
     expect(getConfig('baz')).to.equal('qux');
@@ -195,6 +282,12 @@ describe('config API', function () {
     expect(getConfig('deviceAccess')).to.be.equal(true);
   });
 
+  it('sets maxNestedIframes', function () {
+    expect(getConfig('maxNestedIframes')).to.be.equal(10);
+    setConfig({ maxNestedIframes: 2 });
+    expect(getConfig('maxNestedIframes')).to.be.equal(2);
+  });
+
   it('should log error for invalid priceGranularity', function () {
     setConfig({ priceGranularity: '' });
     const error = 'Prebid Error: no value passed to `setPriceGranularity()`';
@@ -211,4 +304,354 @@ describe('config API', function () {
     setConfig({ bidderSequence: 'random' });
     expect(logWarnSpy.called).to.equal(false);
   });
+
+  it('sets auctionOptions secondaryBidders', function () {
+    const auctionOptionsConfig = {
+      'secondaryBidders': ['rubicon', 'appnexus']
+    }
+    setConfig({ auctionOptions: auctionOptionsConfig });
+    expect(getConfig('auctionOptions')).to.eql(auctionOptionsConfig);
+  });
+
+  it('sets auctionOptions suppressStaleRender', function () {
+    const auctionOptionsConfig = {
+      'suppressStaleRender': true
+    }
+    setConfig({ auctionOptions: auctionOptionsConfig });
+    expect(getConfig('auctionOptions')).to.eql(auctionOptionsConfig);
+  });
+
+  it('should log warning for the wrong value passed to auctionOptions', function () {
+    setConfig({ auctionOptions: '' });
+    expect(logWarnSpy.calledOnce).to.equal(true);
+    const warning = 'Auction Options must be an object';
+    assert.ok(logWarnSpy.calledWith(warning), 'expected warning was logged');
+  });
+
+  it('should log warning for invalid auctionOptions bidder values', function () {
+    setConfig({ auctionOptions: {
+      'secondaryBidders': 'appnexus, rubicon',
+    }});
+    expect(logWarnSpy.calledOnce).to.equal(true);
+    const warning = 'Auction Options secondaryBidders must be of type Array';
+    assert.ok(logWarnSpy.calledWith(warning), 'expected warning was logged');
+  });
+
+  it('should log warning for invalid auctionOptions suppress stale render', function () {
+    setConfig({ auctionOptions: {
+      'suppressStaleRender': 'test',
+    }});
+    expect(logWarnSpy.calledOnce).to.equal(true);
+    const warning = 'Auction Options suppressStaleRender must be of type boolean';
+    assert.ok(logWarnSpy.calledWith(warning), 'expected warning was logged');
+  });
+
+  it('should log warning for invalid properties to auctionOptions', function () {
+    setConfig({ auctionOptions: {
+      'testing': true
+    }});
+    expect(logWarnSpy.calledOnce).to.equal(true);
+    const warning = 'Auction Options given an incorrect param: testing';
+    assert.ok(logWarnSpy.calledWith(warning), 'expected warning was logged');
+  });
+
+  it('should merge input with existing global config', function () {
+    const obj = {
+      ortb2: {
+        site: {
+          name: 'example',
+          domain: 'page.example.com',
+          cat: ['IAB2'],
+          sectioncat: ['IAB2-2'],
+          pagecat: ['IAB2-2']
+        }
+      }
+    };
+    setConfig({ ortb2: {
+      user: {
+        ext: {
+          data: {
+            registered: true,
+            interests: ['cars']
+          }
+        }
+      }
+    }
+    });
+    mergeConfig(obj);
+    const expected = {
+      site: {
+        name: 'example',
+        domain: 'page.example.com',
+        cat: ['IAB2'],
+        sectioncat: ['IAB2-2'],
+        pagecat: ['IAB2-2']
+      },
+      user: {
+        ext: {
+          data: {
+            registered: true,
+            interests: ['cars']
+          }
+        }
+      }
+    }
+    expect(getConfig('ortb2')).to.deep.equal(expected);
+  });
+
+  it('input should take precedence over existing config if keys are the same', function() {
+    const input = {
+      ortb2: {
+        user: {
+          ext: {
+            data: {
+              registered: true,
+              interests: ['cars']
+            }
+          }
+        }
+      }
+    }
+    setConfig({ ortb2: {
+      user: {
+        ext: {
+          data: {
+            registered: false
+          }
+        }
+      }
+    }});
+    mergeConfig(input);
+    const expected = {
+      user: {
+        ext: {
+          data: {
+            registered: true,
+            interests: ['cars']
+          }
+        }
+      }
+    }
+    expect(getConfig('ortb2')).to.deep.equal(expected);
+  });
+
+  it('should log error for a non-object value passed in', function () {
+    mergeConfig('invalid object');
+    expect(logErrorSpy.calledOnce).to.equal(true);
+    const error = 'mergeConfig input must be an object';
+    assert.ok(logErrorSpy.calledWith(error), 'expected error was logged');
+  });
+
+  it('should merge input with existing bidder config', function () {
+    const input = {
+      bidders: ['rubicon', 'appnexus'],
+      config: {
+        ortb2: {
+          site: {
+            name: 'example',
+            domain: 'page.example.com',
+            cat: ['IAB2'],
+            sectioncat: ['IAB2-2'],
+            pagecat: ['IAB2-2']
+          },
+          user: {
+            ext: {
+              ssp: 'magnite',
+              data: {
+                registered: false,
+                interests: ['sports']
+              }
+            }
+          }
+        }
+      }
+    };
+    setBidderConfig({
+      bidders: ['rubicon'],
+      config: {
+        ortb2: {
+          user: {
+            ext: {
+              data: {
+                registered: true,
+                interests: ['cars']
+              }
+            }
+          }
+        }
+      }
+    });
+    mergeBidderConfig(input);
+    const expected = {
+      rubicon: {
+        ortb2: {
+          site: {
+            name: 'example',
+            domain: 'page.example.com',
+            cat: ['IAB2'],
+            sectioncat: ['IAB2-2'],
+            pagecat: ['IAB2-2']
+          },
+          user: {
+            ext: {
+              ssp: 'magnite',
+              data: {
+                registered: false,
+                interests: ['cars', 'sports']
+              }
+            }
+          }
+        }
+      },
+      appnexus: {
+        ortb2: {
+          site: {
+            name: 'example',
+            domain: 'page.example.com',
+            cat: ['IAB2'],
+            sectioncat: ['IAB2-2'],
+            pagecat: ['IAB2-2']
+          },
+          user: {
+            ext: {
+              ssp: 'magnite',
+              data: {
+                registered: false,
+                interests: ['sports']
+              }
+            }
+          }
+        }
+      }
+    }
+    expect(getBidderConfig()).to.deep.equal(expected);
+  });
+
+  it('should log error for a non-object value passed in', function () {
+    mergeBidderConfig('invalid object');
+    expect(logErrorSpy.calledOnce).to.equal(true);
+    const error = 'setBidderConfig bidder options must be an object';
+    assert.ok(logErrorSpy.calledWith(error), 'expected error was logged');
+  });
+
+  it('should log error for empty bidders array', function () {
+    mergeBidderConfig({
+      bidders: [],
+      config: {
+        ortb2: {
+          site: {
+            name: 'example',
+            domain: 'page.example.com',
+            cat: ['IAB2'],
+            sectioncat: ['IAB2-2'],
+            pagecat: ['IAB2-2']
+          }
+        }
+      }
+    });
+    expect(logErrorSpy.calledOnce).to.equal(true);
+    const error = 'setBidderConfig bidder options must contain a bidders list with at least 1 bidder';
+    assert.ok(logErrorSpy.calledWith(error), 'expected error was logged');
+  });
+
+  it('should log error for nonexistent config object', function () {
+    mergeBidderConfig({
+      bidders: ['appnexus']
+    });
+    expect(logErrorSpy.calledOnce).to.equal(true);
+    const error = 'setBidderConfig bidder options must contain a config object';
+    assert.ok(logErrorSpy.calledWith(error), 'expected error was logged');
+  });
+
+  it('should merge without array duplication', function() {
+    const userObj1 = {
+      name: 'www.dataprovider1.com',
+      ext: { taxonomyname: 'iab_audience_taxonomy' },
+      segment: [{
+        id: '1776'
+      }]
+    };
+
+    const userObj2 = {
+      name: 'www.dataprovider2.com',
+      ext: { taxonomyname: 'iab_audience_taxonomy' },
+      segment: [{
+        id: '1914'
+      }]
+    };
+
+    const siteObj1 = {
+      name: 'www.dataprovider3.com',
+      ext: {
+        taxonomyname: 'iab_audience_taxonomy'
+      },
+      segment: [
+        {
+          id: '1812'
+        },
+        {
+          id: '1955'
+        }
+      ]
+    }
+
+    setConfig({
+      bidderTimeout: 2000,
+      ortb2: {
+        user: {
+          data: [userObj1, userObj2]
+        },
+        site: {
+          content: {
+            data: [siteObj1]
+          }
+        }
+      }
+    });
+
+    const rtd = {
+      bidderTimeout: 3000,
+      ortb2: {
+        user: {
+          data: [userObj1]
+        },
+        site: {
+          content: {
+            data: [siteObj1]
+          }
+        }
+      }
+    };
+    mergeConfig(rtd);
+
+    let ortb2Config = getConfig('ortb2');
+    let bidderTimeout = getConfig('bidderTimeout');
+
+    expect(ortb2Config.user.data).to.deep.include.members([userObj1, userObj2]);
+    expect(ortb2Config.site.content.data).to.deep.include.members([siteObj1]);
+    expect(ortb2Config.user.data).to.have.lengthOf(2);
+    expect(ortb2Config.site.content.data).to.have.lengthOf(1);
+    expect(bidderTimeout).to.equal(3000);
+  });
+
+  it('should not corrupt global configuration with bidder configuration', () => {
+    // https://github.com/prebid/Prebid.js/issues/7956
+    config.setConfig({
+      outer: {
+        inner: ['global']
+      }
+    });
+    config.setBidderConfig({
+      bidders: ['bidder'],
+      config: {
+        outer: {
+          inner: ['bidder']
+        }
+      }
+    });
+    config.runWithBidder('bidder', () => config.getConfig())
+    expect(config.getConfig('outer')).to.eql({
+      inner: ['global']
+    });
+  });
 });
diff --git a/test/spec/cpmBucketManager_spec.js b/test/spec/cpmBucketManager_spec.js
index 0b8635a4e3b..044c65ca504 100644
--- a/test/spec/cpmBucketManager_spec.js
+++ b/test/spec/cpmBucketManager_spec.js
@@ -1,195 +1,257 @@
 import { expect } from 'chai';
-import {getPriceBucketString, isValidPriceConfig} from 'src/cpmBucketManager.js';
+import { getPriceBucketString, isValidPriceConfig } from 'src/cpmBucketManager.js';
+import { config } from 'src/config.js';
+
 let cpmFixtures = require('test/fixtures/cpmInputsOutputs.json');
 
 describe('cpmBucketManager', function () {
-  it('getPriceBucketString function generates the correct price strings', function () {
-    let input = cpmFixtures.cpmInputs;
-    for (let i = 0; i < input.length; i++) {
-      let output = getPriceBucketString(input[i]);
-      let jsonOutput = JSON.stringify(output);
-      expect(jsonOutput).to.deep.equal(JSON.stringify(cpmFixtures.priceStringOutputs[i]));
-    }
-  });
-
-  it('gets the correct custom bucket strings', function () {
-    let cpm = 16.50908;
-    let customConfig = {
-      'buckets': [{
-        'precision': 4,
-        'max': 3,
-        'increment': 0.01,
-      },
-      {
-        'precision': 4,
-        'max': 18,
-        'increment': 0.05,
-        'cap': true
+  describe('getPriceBucketString', function () {
+    it('getPriceBucketString function generates the correct price strings', function () {
+      let input = cpmFixtures.cpmInputs;
+      for (let i = 0; i < input.length; i++) {
+        let output = getPriceBucketString(input[i]);
+        let jsonOutput = JSON.stringify(output);
+        expect(jsonOutput).to.deep.equal(JSON.stringify(cpmFixtures.priceStringOutputs[i]));
       }
-      ]
-    };
-    let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"16.5000"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
+    });
 
-  it('gets the correct custom bucket strings with irregular increment', function () {
-    let cpm = 14.50908;
-    let customConfig = {
-      'buckets': [{
-        'precision': 4,
-        'max': 4,
-        'increment': 0.01,
-      },
-      {
-        'precision': 4,
-        'max': 18,
-        'increment': 0.3,
-        'cap': true
-      }
-      ]
-    };
-    let expected = '{"low":"5.00","med":"14.50","high":"14.50","auto":"14.50","dense":"14.50","custom":"14.5000"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
-
-  it('gets the correct custom bucket strings in non-USD currency', function () {
-    let cpm = 16.50908 * 110.49;
-    let customConfig = {
-      'buckets': [{
-        'precision': 4,
-        'max': 3,
-        'increment': 0.01,
-      },
-      {
-        'precision': 4,
-        'max': 18,
-        'increment': 0.05,
-        'cap': true
-      }
-      ]
-    };
-    let expected = '{"low":"552.45","med":"1823.09","high":"1823.09","auto":"1823.09","dense":"1823.09","custom":"1823.0850"}';
-    let output = getPriceBucketString(cpm, customConfig, 110.49);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
-
-  it('gets the correct custom bucket strings with specific cpms that round oddly with certain increments', function () {
-    let customConfig = {
-      'buckets': [{
-        'precision': 4,
-        'max': 4,
-        'increment': 0.10,
-      }]
-    };
-    let cpm = 2.21;
-    let expected = '{"low":"2.00","med":"2.20","high":"2.21","auto":"2.20","dense":"2.21","custom":"2.2000"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    cpm = 3.15;
-    expected = '{"low":"3.00","med":"3.10","high":"3.15","auto":"3.15","dense":"3.15","custom":"3.1000"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    customConfig = {
-      'buckets': [{
-        'precision': 3,
-        'max': 6,
-        'increment': 0.08,
-      }]
-    };
-    cpm = 4.89;
-    expected = '{"low":"4.50","med":"4.80","high":"4.89","auto":"4.85","dense":"4.85","custom":"4.880"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    customConfig = {
-      'buckets': [{
-        'precision': 3,
-        'max': 6,
-        'increment': 0.05,
-      }]
-    };
-    cpm = 2.98;
-    expected = '{"low":"2.50","med":"2.90","high":"2.98","auto":"2.95","dense":"2.98","custom":"2.950"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    cpm = 2.99;
-    expected = '{"low":"2.50","med":"2.90","high":"2.99","auto":"2.95","dense":"2.99","custom":"2.950"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    customConfig = {
-      'buckets': [{
-        'precision': 2,
-        'max': 6,
-        'increment': 0.01,
-      }]
-    };
-    cpm = 4.01;
-    expected = '{"low":"4.00","med":"4.00","high":"4.01","auto":"4.00","dense":"4.00","custom":"4.01"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    cpm = 4.68;
-    expected = '{"low":"4.50","med":"4.60","high":"4.68","auto":"4.65","dense":"4.65","custom":"4.68"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    cpm = 4.69;
-    expected = '{"low":"4.50","med":"4.60","high":"4.69","auto":"4.65","dense":"4.65","custom":"4.69"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
-
-  it('gets custom bucket strings and it should honor 0', function () {
-    let cpm = 16.50908;
-    let customConfig = {
-      'buckets': [
+    it('gets the correct custom bucket strings', function () {
+      let cpm = 16.50908;
+      let customConfig = {
+        'buckets': [{
+          'precision': 4,
+          'max': 3,
+          'increment': 0.01,
+        },
         {
-          'precision': 0,
+          'precision': 4,
           'max': 18,
           'increment': 0.05,
-        }
-      ]
-    };
-    let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"17"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
+          'cap': true
+        }]
+      };
+      let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"16.5000"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
 
-  it('gets the custom bucket strings without passing precision and it should honor the default precision', function () {
-    let cpm = 16.50908;
-    let customConfig = {
-      'buckets': [
+    it('gets the correct custom bucket strings with irregular increment', function () {
+      let cpm = 14.50908;
+      let customConfig = {
+        'buckets': [{
+          'precision': 4,
+          'max': 4,
+          'increment': 0.01,
+        },
         {
+          'precision': 4,
+          'max': 18,
+          'increment': 0.3,
+          'cap': true
+        }]
+      };
+      let expected = '{"low":"5.00","med":"14.50","high":"14.50","auto":"14.50","dense":"14.50","custom":"14.5000"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('gets the correct custom bucket strings in non-USD currency', function () {
+      let cpm = 16.50908 * 110.49;
+      let customConfig = {
+        'buckets': [{
+          'precision': 4,
+          'max': 3,
+          'increment': 0.01,
+        },
+        {
+          'precision': 4,
           'max': 18,
           'increment': 0.05,
-        }
-      ]
-    };
-    let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"16.50"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
+          'cap': true
+        }]
+      };
+      let expected = '{"low":"552.45","med":"1823.09","high":"1823.09","auto":"1823.09","dense":"1823.09","custom":"1823.0850"}';
+      let output = getPriceBucketString(cpm, customConfig, 110.49);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('gets the correct custom bucket strings with specific cpms that round oddly with certain increments', function () {
+      let customConfig = {
+        'buckets': [{
+          'precision': 4,
+          'max': 4,
+          'increment': 0.10,
+        }]
+      };
+      let cpm = 2.21;
+      let expected = '{"low":"2.00","med":"2.20","high":"2.21","auto":"2.20","dense":"2.21","custom":"2.2000"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      cpm = 3.15;
+      expected = '{"low":"3.00","med":"3.10","high":"3.15","auto":"3.15","dense":"3.15","custom":"3.1000"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      customConfig = {
+        'buckets': [{
+          'precision': 3,
+          'max': 6,
+          'increment': 0.08,
+        }]
+      };
+      cpm = 4.89;
+      expected = '{"low":"4.50","med":"4.80","high":"4.89","auto":"4.85","dense":"4.85","custom":"4.880"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      customConfig = {
+        'buckets': [{
+          'precision': 3,
+          'max': 6,
+          'increment': 0.05,
+        }]
+      };
+      cpm = 2.98;
+      expected = '{"low":"2.50","med":"2.90","high":"2.98","auto":"2.95","dense":"2.98","custom":"2.950"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      cpm = 2.99;
+      expected = '{"low":"2.50","med":"2.90","high":"2.99","auto":"2.95","dense":"2.99","custom":"2.950"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      customConfig = {
+        'buckets': [{
+          'precision': 2,
+          'max': 6,
+          'increment': 0.01,
+        }]
+      };
+      cpm = 4.01;
+      expected = '{"low":"4.00","med":"4.00","high":"4.01","auto":"4.00","dense":"4.00","custom":"4.01"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      cpm = 4.68;
+      expected = '{"low":"4.50","med":"4.60","high":"4.68","auto":"4.65","dense":"4.65","custom":"4.68"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      cpm = 4.69;
+      expected = '{"low":"4.50","med":"4.60","high":"4.69","auto":"4.65","dense":"4.65","custom":"4.69"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('gets custom bucket strings and it should honor 0', function () {
+      let cpm = 16.50908;
+      let customConfig = {
+        'buckets': [
+          {
+            'precision': 0,
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"17"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('gets the custom bucket strings without passing precision and it should honor the default precision', function () {
+      let cpm = 16.50908;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"16.50"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('defaults to Math.floor if no rounding function is provided', function () {
+      let cpm = 6.516;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let expected = '{"low":"5.00","med":"6.50","high":"6.51","auto":"6.50","dense":"6.50","custom":"6.50"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('accepts custom rounding functions', function () {
+      let cpm = 6.516;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let getConfig = config.getConfig;
+      config.getConfig = () => Math.ceil;
+      let expected = '{"low":"5.00","med":"6.60","high":"6.52","auto":"6.60","dense":"6.55","custom":"6.55"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      config.getConfig = getConfig;
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('will default to Math.floor if passed an invalid rounding function', function () {
+      let cpm = 6.516;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let getConfig = config.getConfig;
+      config.getConfig = () => Math.ceil(5.3);
+      let expected = '{"low":"5.00","med":"6.50","high":"6.51","auto":"6.50","dense":"6.50","custom":"6.50"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      config.getConfig = getConfig;
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
   });
 
-  it('checks whether custom config is valid', function () {
-    let badConfig = {
-      'buckets': [{
-        'max': 3,
-        'increment': 0.01,
-      },
-      {
-        'max': 18,
-        // missing increment prop
-        'cap': true
-      }
-      ]
-    };
+  describe('isValidPriceConfig', function () {
+    it('checks whether custom config is valid', function () {
+      let badConfig = {
+        'buckets': [{
+          'max': 3,
+          'increment': 0.01,
+        },
+        {
+          'max': 18,
+          // missing increment prop
+          'cap': true
+        }]
+      };
+      expect(isValidPriceConfig(badConfig)).to.be.false;
 
-    expect(isValidPriceConfig(badConfig)).to.be.false;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      expect(isValidPriceConfig(customConfig)).to.be.true;
+    });
   });
 });
diff --git a/test/spec/debugging_spec.js b/test/spec/debugging_spec.js
index bf49a579cbd..8408ceec367 100644
--- a/test/spec/debugging_spec.js
+++ b/test/spec/debugging_spec.js
@@ -1,193 +1,93 @@
-
-import { expect } from 'chai';
-import { sessionLoader, addBidResponseHook, addBidderRequestsHook, getConfig, disableOverrides, addBidResponseBound, addBidderRequestsBound } from 'src/debugging.js';
-import { addBidResponse, addBidderRequests } from 'src/auction.js';
-import { config } from 'src/config.js';
-
-describe('bid overrides', function () {
-  let sandbox;
-
-  beforeEach(function () {
-    sandbox = sinon.sandbox.create();
+import {ready, loadSession, getConfig, reset, debuggingModuleLoader, debuggingControls} from '../../src/debugging.js';
+import {getGlobal} from '../../src/prebidGlobal.js';
+import {defer} from '../../src/utils/promise.js';
+import funHooks from 'fun-hooks/no-eval/index.js';
+
+describe('Debugging', () => {
+  beforeEach(() => {
+    reset();
   });
 
-  afterEach(function () {
-    window.sessionStorage.clear();
-    config.resetConfig();
-    sandbox.restore();
+  after(() => {
+    reset();
   });
 
-  describe('initialization', function () {
-    beforeEach(function () {
-      sandbox.stub(config, 'setConfig');
-    });
-
-    afterEach(function () {
-      disableOverrides();
-    });
-
-    it('should happen when enabled with setConfig', function () {
-      getConfig({
-        enabled: true
-      });
-
-      expect(addBidResponse.getHooks().some(hook => hook.hook === addBidResponseBound)).to.equal(true);
-      expect(addBidderRequests.getHooks().some(hook => hook.hook === addBidderRequestsBound)).to.equal(true);
-    });
-
-    it('should happen when configuration found in sessionStorage', function () {
-      sessionLoader({
-        getItem: () => ('{"enabled": true}')
+  describe('module loader', () => {
+    let script, scriptResult, alreadyInstalled, loader;
+    beforeEach(() => {
+      script = sinon.stub().callsFake(() => {
+        getGlobal()._installDebugging = sinon.stub();
+        return scriptResult;
       });
-      expect(addBidResponse.getHooks().some(hook => hook.hook === addBidResponseBound)).to.equal(true);
-      expect(addBidderRequests.getHooks().some(hook => hook.hook === addBidderRequestsBound)).to.equal(true);
-    });
-
-    it('should not throw if sessionStorage is inaccessible', function () {
-      expect(() => {
-        sessionLoader({
-          getItem() {
-            throw new Error('test');
-          }
-        });
-      }).not.to.throw();
+      alreadyInstalled = sinon.stub();
+      loader = debuggingModuleLoader({alreadyInstalled, script});
     });
-  });
 
-  describe('bidResponse hook', function () {
-    let mockBids;
-    let bids;
+    afterEach(() => {
+      delete getGlobal()._installDebugging;
+    })
 
-    beforeEach(function () {
-      let baseBid = {
-        'bidderCode': 'rubicon',
-        'width': 970,
-        'height': 250,
-        'statusMessage': 'Bid available',
-        'mediaType': 'banner',
-        'source': 'client',
-        'currency': 'USD',
-        'cpm': 0.5,
-        'ttl': 300,
-        'netRevenue': false,
-        'adUnitCode': '/19968336/header-bid-tag-0'
-      };
-      mockBids = [];
-      mockBids.push(baseBid);
-      mockBids.push(Object.assign({}, baseBid, {
-        bidderCode: 'appnexus'
-      }));
-
-      bids = [];
-    });
-
-    function run(overrides) {
-      mockBids.forEach(bid => {
-        let next = (adUnitCode, bid) => {
-          bids.push(bid);
-        };
-        addBidResponseHook.bind(overrides)(next, bid.adUnitCode, bid);
-      });
-    }
-
-    it('should allow us to exclude bidders', function () {
-      run({
-        enabled: true,
-        bidders: ['appnexus']
+    it('should not attempt to load if debugging module is already installed', () => {
+      alreadyInstalled.returns(true);
+      return loader().then(() => {
+        expect(script.called).to.be.false;
       });
-
-      expect(bids.length).to.equal(1);
-      expect(bids[0].bidderCode).to.equal('appnexus');
     });
 
-    it('should allow us to override all bids', function () {
-      run({
-        enabled: true,
-        bids: [{
-          cpm: 2
-        }]
+    it('should not attempt to load twice', () => {
+      alreadyInstalled.returns(false);
+      scriptResult = Promise.resolve();
+      return Promise.all([loader(), loader()]).then(() => {
+        expect(script.callCount).to.equal(1);
       });
-
-      expect(bids.length).to.equal(2);
-      expect(bids[0].cpm).to.equal(2);
-      expect(bids[1].cpm).to.equal(2);
     });
 
-    it('should allow us to override bids by bidder', function () {
-      run({
-        enabled: true,
-        bids: [{
-          bidder: 'rubicon',
-          cpm: 2
-        }]
+    it('should call _installDebugging after loading', () => {
+      alreadyInstalled.returns(false);
+      scriptResult = Promise.resolve();
+      return loader().then(() => {
+        expect(getGlobal()._installDebugging.called).to.be.true;
       });
-
-      expect(bids.length).to.equal(2);
-      expect(bids[0].cpm).to.equal(2);
-      expect(bids[1].cpm).to.equal(0.5);
     });
 
-    it('should allow us to override bids by adUnitCode', function () {
-      mockBids[1].adUnitCode = 'test';
-
-      run({
-        enabled: true,
-        bids: [{
-          adUnitCode: 'test',
-          cpm: 2
-        }]
+    it('should not call _installDebugging if load fails', () => {
+      const error = new Error();
+      alreadyInstalled.returns(false);
+      scriptResult = Promise.reject(error)
+      return loader().then(() => {
+        throw new Error('loader should not resolve');
+      }).catch((err) => {
+        expect(err).to.equal(error);
+        expect(getGlobal()._installDebugging.called).to.be.false;
       });
-
-      expect(bids.length).to.equal(2);
-      expect(bids[0].cpm).to.equal(0.5);
-      expect(bids[1].cpm).to.equal(2);
     });
   });
 
-  describe('bidRequests hook', function () {
-    let mockBidRequests;
-    let bidderRequests;
-
-    beforeEach(function () {
-      let baseBidderRequest = {
-        'bidderCode': 'rubicon',
-        'bids': [{
-          'width': 970,
-          'height': 250,
-          'statusMessage': 'Bid available',
-          'mediaType': 'banner',
-          'source': 'client',
-          'currency': 'USD',
-          'cpm': 0.5,
-          'ttl': 300,
-          'netRevenue': false,
-          'adUnitCode': '/19968336/header-bid-tag-0'
-        }]
-      };
-      mockBidRequests = [];
-      mockBidRequests.push(baseBidderRequest);
-      mockBidRequests.push(Object.assign({}, baseBidderRequest, {
-        bidderCode: 'appnexus'
-      }));
-
-      bidderRequests = [];
-    });
-
-    function run(overrides) {
-      let next = (b) => {
-        bidderRequests = b;
-      };
-      addBidderRequestsHook.bind(overrides)(next, mockBidRequests);
-    }
-
-    it('should allow us to exclude bidders', function () {
-      run({
-        enabled: true,
-        bidders: ['appnexus']
+  describe('debugging controls', () => {
+    let debugging, loader, hook, hookRan;
+
+    beforeEach(() => {
+      loader = defer();
+      hookRan = false;
+      hook = funHooks()('sync', () => { hookRan = true });
+      debugging = debuggingControls({load: sinon.stub().returns(loader.promise), hook});
+    })
+
+    it('should delay execution of hook until module is loaded', () => {
+      debugging.enable();
+      hook();
+      expect(hookRan).to.be.false;
+      loader.resolve();
+      return loader.promise.then(() => {
+        expect(hookRan).to.be.true;
       });
-
-      expect(bidderRequests.length).to.equal(1);
-      expect(bidderRequests[0].bidderCode).to.equal('appnexus');
     });
+
+    it('should restore hook behavior when disabled', () => {
+      debugging.enable();
+      debugging.disable();
+      hook();
+      expect(hookRan).to.be.true;
+    })
   });
 });
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/longform/basic_w_bidderSettings.spec.js b/test/spec/e2e/longform/basic_w_bidderSettings.spec.js
index d3443558316..e8bdbcf3b4f 100644
--- a/test/spec/e2e/longform/basic_w_bidderSettings.spec.js
+++ b/test/spec/e2e/longform/basic_w_bidderSettings.spec.js
@@ -1,4 +1,4 @@
-const includes = require('core-js-pure/features/array/includes.js');
+import {includes} from 'src/polyfill.js';
 const expect = require('chai').expect;
 const { host, protocol, waitForElement } = require('../../../helpers/testing-utils');
 
diff --git a/test/spec/e2e/longform/basic_w_custom_adserver_translation.spec.js b/test/spec/e2e/longform/basic_w_custom_adserver_translation.spec.js
index 9abe7295027..e4ea87bab1a 100644
--- a/test/spec/e2e/longform/basic_w_custom_adserver_translation.spec.js
+++ b/test/spec/e2e/longform/basic_w_custom_adserver_translation.spec.js
@@ -1,4 +1,4 @@
-const includes = require('core-js-pure/features/array/includes.js');
+import {includes} from 'src/polyfill.js';
 const expect = require('chai').expect;
 const { host, protocol, waitForElement } = require('../../../helpers/testing-utils');
 
diff --git a/test/spec/e2e/longform/basic_w_priceGran.spec.js b/test/spec/e2e/longform/basic_w_priceGran.spec.js
index 5658595eef7..b4a5272a69c 100644
--- a/test/spec/e2e/longform/basic_w_priceGran.spec.js
+++ b/test/spec/e2e/longform/basic_w_priceGran.spec.js
@@ -1,4 +1,4 @@
-const includes = require('core-js-pure/features/array/includes.js');
+import {includes} from 'src/polyfill.js';
 const expect = require('chai').expect;
 const { host, protocol, waitForElement } = require('../../../helpers/testing-utils');
 
diff --git a/test/spec/e2e/longform/basic_w_requireExactDuration.spec.js b/test/spec/e2e/longform/basic_w_requireExactDuration.spec.js
index 886daa3e320..6f9acf33061 100644
--- a/test/spec/e2e/longform/basic_w_requireExactDuration.spec.js
+++ b/test/spec/e2e/longform/basic_w_requireExactDuration.spec.js
@@ -1,4 +1,4 @@
-const includes = require('core-js-pure/features/array/includes.js');
+import {includes} from 'src/polyfill.js';
 const expect = require('chai').expect;
 const { host, protocol, waitForElement } = require('../../../helpers/testing-utils');
 
diff --git a/test/spec/e2e/longform/basic_wo_brandCategoryExclusion.spec.js b/test/spec/e2e/longform/basic_wo_brandCategoryExclusion.spec.js
index e19f90b8c39..1775bfafa77 100644
--- a/test/spec/e2e/longform/basic_wo_brandCategoryExclusion.spec.js
+++ b/test/spec/e2e/longform/basic_wo_brandCategoryExclusion.spec.js
@@ -1,4 +1,4 @@
-const includes = require('core-js-pure/features/array/includes.js');
+import {includes} from 'src/polyfill.js';
 const expect = require('chai').expect;
 const { host, protocol, waitForElement } = require('../../../helpers/testing-utils');
 
diff --git a/test/spec/e2e/longform/basic_wo_requireExactDuration.spec.js b/test/spec/e2e/longform/basic_wo_requireExactDuration.spec.js
index cb1bcda93ff..9e92c15e5f5 100644
--- a/test/spec/e2e/longform/basic_wo_requireExactDuration.spec.js
+++ b/test/spec/e2e/longform/basic_wo_requireExactDuration.spec.js
@@ -1,4 +1,4 @@
-const includes = require('core-js-pure/features/array/includes.js');
+import {includes} from 'src/polyfill.js';
 const expect = require('chai').expect;
 const { host, protocol, waitForElement } = require('../../../helpers/testing-utils');
 
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/fpd/enrichment_spec.js b/test/spec/fpd/enrichment_spec.js
new file mode 100644
index 00000000000..3363e1867d3
--- /dev/null
+++ b/test/spec/fpd/enrichment_spec.js
@@ -0,0 +1,213 @@
+import {dep, enrichFPD} from '../../../src/fpd/enrichment.js';
+import {hook} from '../../../src/hook.js';
+import {expect} from 'chai/index.mjs';
+import {config} from 'src/config.js';
+
+describe('FPD enrichment', () => {
+  let sandbox;
+  before(() => {
+    hook.ready();
+  });
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+  afterEach(() => {
+    sandbox.restore();
+    config.resetConfig();
+  });
+
+  function fpd(ortb2 = {}) {
+    return enrichFPD(Promise.resolve(ortb2));
+  }
+
+  function mockWindow() {
+    return {
+      innerHeight: 1,
+      innerWidth: 1,
+      navigator: {
+        language: ''
+      },
+      document: {
+        querySelector: sinon.stub()
+      }
+    };
+  }
+
+  function testWindows(getWindow, fn) {
+    Object.entries({
+      'top': ['getWindowTop', 'getWindowSelf'],
+      'self': ['getWindowSelf', 'getWindowTop']
+    }).forEach(([t, [winWorks, winThrows]]) => {
+      describe(`using window.${t}`, () => {
+        beforeEach(() => {
+          sandbox.stub(dep, winWorks).callsFake(getWindow);
+          sandbox.stub(dep, winThrows).throws(new Error());
+        });
+        fn();
+      });
+    });
+  }
+
+  describe('site', () => {
+    it('sets page, ref, domain, and publisher.domain', () => {
+      const refererInfo = {
+        page: 'www.example.com',
+        ref: 'referrer.com'
+      };
+      sandbox.stub(dep, 'getRefererInfo').callsFake(() => refererInfo);
+      sandbox.stub(dep, 'findRootDomain').callsFake((dom) => `publisher.${dom}`);
+      return fpd().then(ortb2 => {
+        sinon.assert.match(ortb2.site, {
+          page: 'www.example.com',
+          domain: 'example.com',
+          ref: 'referrer.com',
+          publisher: {
+            domain: 'publisher.example.com'
+          }
+        });
+      });
+    });
+
+    describe('keywords', () => {
+      let metaTag;
+      beforeEach(() => {
+        metaTag = document.createElement('meta');
+        metaTag.name = 'keywords';
+        metaTag.content = 'kw1, kw2';
+        document.head.appendChild(metaTag);
+      });
+      afterEach(() => {
+        document.head.removeChild(metaTag);
+      });
+
+      testWindows(() => window, () => {
+        it(`sets kewwords from meta tag`, () => {
+          return fpd().then(ortb2 => {
+            expect(ortb2.site.keywords).to.eql('kw1,kw2');
+          });
+        });
+      });
+    });
+
+    it('should not set keywords if meta tag is not present', () => {
+      return fpd().then(ortb2 => {
+        expect(ortb2.site.hasOwnProperty('keywords')).to.be.false;
+      });
+    });
+
+    it('respects pub-provided fpd', () => {
+      return fpd({
+        site: {
+          publisher: {
+            domain: 'pub.com'
+          }
+        }
+      }).then(ortb2 => {
+        expect(ortb2.site.publisher.domain).to.eql('pub.com');
+      });
+    });
+  });
+
+  describe('device', () => {
+    let win;
+    beforeEach(() => {
+      win = mockWindow();
+    });
+    testWindows(() => win, () => {
+      it('sets w/h', () => {
+        win.innerHeight = 123;
+        win.innerWidth = 321;
+        return fpd().then(ortb2 => {
+          sinon.assert.match(ortb2.device, {
+            w: 321,
+            h: 123,
+          });
+        });
+      });
+
+      it('sets ua', () => {
+        win.navigator.userAgent = 'mock-ua';
+        return fpd().then(ortb2 => {
+          expect(ortb2.device.ua).to.eql('mock-ua');
+        })
+      });
+
+      it('sets language', () => {
+        win.navigator.language = 'lang-ignored';
+        return fpd().then(ortb2 => {
+          expect(ortb2.device.language).to.eql('lang');
+        })
+      });
+    });
+  });
+
+  describe('regs', () => {
+    describe('gpc', () => {
+      let win;
+      beforeEach(() => {
+        win = mockWindow();
+      });
+      testWindows(() => win, () => {
+        it('is set if globalPrivacyControl is set', () => {
+          win.navigator.globalPrivacyControl = true;
+          return fpd().then(ortb2 => {
+            expect(ortb2.regs.ext.gpc).to.eql(1);
+          });
+        });
+
+        it('is not set otherwise', () => {
+          return fpd().then(ortb2 => {
+            expect(ortb2.regs?.ext?.gpc).to.not.exist;
+          })
+        })
+      });
+    })
+    describe('coppa', () => {
+      [[true, 1], [false, 0]].forEach(([cfgVal, regVal]) => {
+        it(`is set to ${regVal} if config = ${cfgVal}`, () => {
+          config.setConfig({coppa: cfgVal});
+          return fpd().then(ortb2 => {
+            expect(ortb2.regs.coppa).to.eql(regVal);
+          })
+        });
+      })
+
+      it('is not set if not configured', () => {
+        return fpd().then(ortb2 => {
+          expect(ortb2.regs?.coppa).to.not.exist;
+        })
+      })
+    });
+  });
+
+  describe('sua', () => {
+    it('does not set device.sua if resolved sua is null', () => {
+      sandbox.stub(dep, 'getHighEntropySUA').returns(Promise.resolve())
+      return fpd().then(ortb2 => {
+        expect(ortb2.device.sua).to.not.exist;
+      })
+    });
+    it('uses low entropy values if uaHints is []', () => {
+      sandbox.stub(dep, 'getLowEntropySUA').callsFake(() => ({mock: 'sua'}));
+      config.setConfig({
+        firstPartyData: {
+          uaHints: [],
+        }
+      })
+      return fpd().then(ortb2 => {
+        expect(ortb2.device.sua).to.eql({mock: 'sua'});
+      })
+    });
+    it('uses high entropy values otherwise', () => {
+      sandbox.stub(dep, 'getHighEntropySUA').callsFake((hints) => Promise.resolve({hints}));
+      config.setConfig({
+        firstPartyData: {
+          uaHints: ['h1', 'h2']
+        }
+      });
+      return fpd().then(ortb2 => {
+        expect(ortb2.device.sua).to.eql({hints: ['h1', 'h2']})
+      })
+    });
+  });
+});
diff --git a/test/spec/fpd/gdpr_spec.js b/test/spec/fpd/gdpr_spec.js
new file mode 100644
index 00000000000..8fc04815112
--- /dev/null
+++ b/test/spec/fpd/gdpr_spec.js
@@ -0,0 +1,47 @@
+import {gdprDataHandler} from '../../../src/adapterManager.js';
+import {enrichFPDHook} from '../../../modules/consentManagement.js';
+
+describe('GDPR FPD enrichment', () => {
+  let sandbox, consent;
+  beforeEach(() => {
+    consent = null;
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => consent);
+  });
+  afterEach(() => {
+    sandbox.restore();
+  })
+
+  function callHook() {
+    let result;
+    enrichFPDHook((res) => { result = res }, Promise.resolve({}));
+    return result;
+  }
+
+  it('sets gdpr properties from gdprDataHandler', () => {
+    consent = {gdprApplies: true, consentString: 'consent'};
+    return callHook().then(ortb2 => {
+      expect(ortb2.regs.ext.gdpr).to.eql(1);
+      expect(ortb2.user.ext.consent).to.eql('consent');
+    })
+  });
+
+  it('does not set it if missing', () => {
+    return callHook().then((ortb2) => {
+      expect(ortb2).to.eql({});
+    })
+  });
+
+  it('sets user.ext.consent, but not regs.ext.gdpr, if gpdrApplies is not a boolean', () => {
+    consent = {consentString: 'mock-consent'};
+    return callHook().then(ortb2 => {
+      expect(ortb2).to.eql({
+        user: {
+          ext: {
+            consent: 'mock-consent'
+          }
+        }
+      })
+    })
+  });
+});
diff --git a/test/spec/fpd/rootDomain_spec.js b/test/spec/fpd/rootDomain_spec.js
new file mode 100644
index 00000000000..008ef749edc
--- /dev/null
+++ b/test/spec/fpd/rootDomain_spec.js
@@ -0,0 +1,61 @@
+import {expect} from 'chai/index.js';
+import {findRootDomain, coreStorage} from 'src/fpd/rootDomain.js';
+
+describe('findRootDomain', function () {
+  let sandbox, cookies, rejectDomain;
+
+  beforeEach(function () {
+    findRootDomain.clear();
+    cookies = {};
+    rejectDomain = '';
+    sandbox = sinon.createSandbox();
+    sandbox.stub(coreStorage, 'cookiesAreEnabled').returns(true);
+    sandbox.stub(coreStorage, 'setCookie').callsFake((cookie, value, expiration, sameSite, domain) => {
+      if (rejectDomain !== domain) {
+        if (new Date(expiration) <= Date.now()) {
+          delete cookies[cookie];
+        } else {
+          cookies[cookie] = value;
+        }
+      }
+    })
+    sandbox.stub(coreStorage, 'getCookie').callsFake((cookie) => {
+      return cookies[cookie]
+    });
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
+
+  after(() => {
+    findRootDomain.clear();
+  })
+
+  it('should just find the root domain', function () {
+    rejectDomain = 'co.uk';
+    var domain = findRootDomain('sub.realdomain.co.uk');
+    expect(domain).to.be.eq('realdomain.co.uk');
+    expect(cookies).to.eql({});
+  });
+
+  it('should find the full domain when no subdomain is present', function () {
+    rejectDomain = 'co.uk';
+    var domain = findRootDomain('realdomain.co.uk');
+    expect(domain).to.be.eq('realdomain.co.uk');
+    expect(cookies).to.eql({});
+  });
+
+  it('should return domain as-is if cookies are disabled', () => {
+    coreStorage.cookiesAreEnabled.returns(false);
+    expect(findRootDomain('sub.example.com')).to.eql('sub.example.com');
+    sinon.assert.notCalled(coreStorage.setCookie);
+  });
+
+  it('should memoize default value', () => {
+    const domain = findRootDomain();
+    expect(domain.length > 0).to.be.true;
+    expect(findRootDomain()).to.eql(domain);
+    sinon.assert.calledOnce(coreStorage.getCookie);
+  });
+});
diff --git a/test/spec/fpd/sua_spec.js b/test/spec/fpd/sua_spec.js
new file mode 100644
index 00000000000..121922fa78d
--- /dev/null
+++ b/test/spec/fpd/sua_spec.js
@@ -0,0 +1,244 @@
+import {
+  highEntropySUAAccessor,
+  lowEntropySUAAccessor,
+  SUA_SOURCE_HIGH_ENTROPY,
+  SUA_SOURCE_LOW_ENTROPY,
+  SUA_SOURCE_UNKNOWN,
+  suaFromUAData,
+  uaDataToSUA
+} from '../../../libraries/fpd/sua.js';
+
+describe('uaDataToSUA', () => {
+  Object.entries({
+    'platform': 'platform',
+    'browsers': 'brands',
+    'mobile': 'mobile',
+    'architecture': 'architecture',
+    'model': 'model',
+    'bitness': 'bitness'
+  }).forEach(([suaKey, uaKey]) => {
+    it(`should not set ${suaKey} if ${uaKey} is missing from UAData`, () => {
+      const example = {
+        platform: 'Windows',
+        brands: [{brand: 'Mock', version: 'mk'}],
+        mobile: true,
+        model: 'mockModel',
+        bitness: '64',
+        architecture: 'arm'
+      }
+      delete example[uaKey];
+      const sua = uaDataToSUA(SUA_SOURCE_UNKNOWN, example);
+      expect(sua.hasOwnProperty(suaKey)).to.be.false;
+    })
+  });
+
+  it('should convert low-entropy userAgentData', () => {
+    const sua = uaDataToSUA(SUA_SOURCE_LOW_ENTROPY, {
+      'brands': [
+        {
+          'brand': '.Not/A)Brand',
+          'version': '99'
+        },
+        {
+          'brand': 'Google Chrome',
+          'version': '103'
+        },
+        {
+          'brand': 'Chromium',
+          'version': '103'
+        }
+      ],
+      'mobile': false,
+      'platform': 'Linux'
+    });
+
+    expect(sua).to.eql({
+      source: SUA_SOURCE_LOW_ENTROPY,
+      mobile: 0,
+      platform: {
+        brand: 'Linux',
+      },
+      browsers: [
+        {
+          brand: '.Not/A)Brand',
+          version: [
+            '99'
+          ]
+        },
+        {
+          brand: 'Google Chrome',
+          version: [
+            '103'
+          ]
+        },
+        {
+          brand: 'Chromium',
+          version: [
+            '103'
+          ]
+        }
+      ]
+    })
+  });
+
+  it('should convert high entropy properties', () => {
+    const uaData = {
+      architecture: 'x86',
+      bitness: '64',
+      fullVersionList: [
+        {
+          'brand': '.Not/A)Brand',
+          'version': '99.0.0.0'
+        },
+        {
+          'brand': 'Google Chrome',
+          'version': '103.0.5060.134'
+        },
+        {
+          'brand': 'Chromium',
+          'version': '103.0.5060.134'
+        }
+      ],
+      brands: [
+        {
+          'brand': '.Not/A)Brand',
+          'version': '99'
+        },
+        {
+          'brand': 'Google Chrome',
+          'version': '103'
+        },
+        {
+          'brand': 'Chromium',
+          'version': '103'
+        }
+      ],
+      model: 'mockModel',
+      platform: 'Linux',
+      platformVersion: '5.14.0'
+    }
+
+    expect(uaDataToSUA(SUA_SOURCE_HIGH_ENTROPY, uaData)).to.eql({
+      source: SUA_SOURCE_HIGH_ENTROPY,
+      architecture: 'x86',
+      bitness: '64',
+      model: 'mockModel',
+      platform: {
+        brand: 'Linux',
+        version: [
+          '5',
+          '14',
+          '0'
+        ]
+      },
+      browsers: [
+        {
+          brand: '.Not/A)Brand',
+          version: [
+            '99',
+            '0',
+            '0',
+            '0'
+          ]
+        },
+        {
+          brand: 'Google Chrome',
+          version: [
+            '103',
+            '0',
+            '5060',
+            '134'
+          ]
+        },
+        {
+          brand: 'Chromium',
+          version: [
+            '103',
+            '0',
+            '5060',
+            '134'
+          ]
+        }
+      ]
+    })
+  })
+});
+
+describe('lowEntropySUAAccessor', () => {
+  function getSUA(uaData) {
+    return lowEntropySUAAccessor(uaData)();
+  }
+
+  it('should not be modifiable', () => {
+    const sua = getSUA({});
+    expect(() => { sua.prop = 'value'; }).to.throw();
+  });
+
+  it('should return null if no uaData is available', () => {
+    expect(getSUA(null)).to.eql(null);
+  })
+
+  it('should return null if uaData is empty', () => {
+    expect(getSUA({})).to.eql(null);
+  })
+});
+
+describe('highEntropySUAAccessor', () => {
+  let userAgentData, uaResult, getSUA;
+  beforeEach(() => {
+    uaResult = {};
+    userAgentData = {
+      getHighEntropyValues: sinon.stub().callsFake(() => Promise.resolve(uaResult))
+    };
+    getSUA = highEntropySUAAccessor(userAgentData);
+  });
+
+  describe('should resolve to null if', () => {
+    it('uaData is not available', () => {
+      getSUA = highEntropySUAAccessor(null);
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      })
+    });
+    it('getHighEntropyValues is not avialable', () => {
+      delete userAgentData.getHighEntropyValues;
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      })
+    });
+    it('getHighEntropyValues throws', () => {
+      userAgentData.getHighEntropyValues.callsFake(() => { throw new Error() });
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      })
+    });
+    it('getHighEntropyValues rejects', () => {
+      userAgentData.getHighEntropyValues.callsFake(() => Promise.reject(new Error()));
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      })
+    });
+    it('getHighEntropyValues returns an empty object', () => {
+      userAgentData.getHighEntropyValues.callsFake(() => Promise.resolve({}));
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      });
+    })
+  });
+  it('should pass hints to userAgentData', () => {
+    getSUA(['h1', 'h2']);
+    sinon.assert.calledWith(userAgentData.getHighEntropyValues, ['h1', 'h2']);
+  });
+
+  it('should cache results for a set of hints', () => {
+    getSUA(['h1', 'h2']);
+    getSUA(['h2', 'h1']);
+    sinon.assert.calledOnce(userAgentData.getHighEntropyValues);
+  });
+
+  it('should return unmodifiable objects', () => {
+    return getSUA().then(result => {
+      expect(() => { result.prop = 'value'; }).to.throw();
+    })
+  })
+})
diff --git a/test/spec/fpd/usp_spec.js b/test/spec/fpd/usp_spec.js
new file mode 100644
index 00000000000..f616b086ffa
--- /dev/null
+++ b/test/spec/fpd/usp_spec.js
@@ -0,0 +1,36 @@
+import {enrichFPDHook} from '../../../modules/consentManagementUsp.js';
+import {uspDataHandler} from '../../../src/adapterManager.js';
+
+describe('FPD enrichment USP', () => {
+  let sandbox, consent;
+  beforeEach(() => {
+    consent = null;
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(uspDataHandler, 'getConsentData').callsFake(() => consent);
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  function callHook() {
+    let result;
+    enrichFPDHook((res) => {
+      result = res;
+    }, Promise.resolve({}));
+    return result;
+  }
+
+  it('sets regs.ext.us_privacy from uspDataHandler', () => {
+    consent = '1NN';
+    return callHook().then(ortb2 => {
+      expect(ortb2.regs.ext.us_privacy).to.eql('1NN');
+    })
+  });
+
+  it('does not set if missing', () => {
+    return callHook().then(ortb2 => {
+      expect(ortb2).to.eql({});
+    })
+  });
+});
diff --git a/test/spec/integration/faker/fixtures.js b/test/spec/integration/faker/fixtures.js
index a11bd126d61..6a65da37d37 100644
--- a/test/spec/integration/faker/fixtures.js
+++ b/test/spec/integration/faker/fixtures.js
@@ -23,7 +23,7 @@ export function makeBidder(overrides = {}) {
     bidder: `${faker.company.bsBuzz()}Media`,
     params: {
       abc: faker.random.alphaNumeric(10),
-      xyz: faker.random.number({ max: 10, precision: 2 })
+      xyz: faker.datatype.number({ max: 10, precision: 2 })
     },
     callBids: sinon.spy()
   }, overrides);
@@ -39,4 +39,4 @@ export function makeRequest(overrides = {}) {
   }, overrides);
 }
 
-export function randomFive() { return faker.random.number({ min: 10000, max: 99999 }); }
+export function randomFive() { return faker.datatype.number({ min: 10000, max: 99999 }); }
diff --git a/test/spec/integration/faker/googletag.js b/test/spec/integration/faker/googletag.js
index a0ce04402f7..a8676b500a5 100644
--- a/test/spec/integration/faker/googletag.js
+++ b/test/spec/integration/faker/googletag.js
@@ -43,18 +43,63 @@ export function makeSlot() {
   return slot;
 }
 
-window.googletag = {
-  _slots: [],
-  pubads: function () {
-    var self = this;
-    return {
-      getSlots: function () {
-        return self._slots;
-      },
-
-      setSlots: function (slots) {
-        self._slots = slots;
-      }
-    };
-  }
-};
+export function emitEvent(eventName, params) {
+  (window.googletag._callbackMap[eventName] || []).forEach(eventCb => eventCb({...params, eventName}));
+}
+
+export function enable() {
+  window.googletag = {
+    _slots: [],
+    _callbackMap: {},
+    _ppid: undefined,
+    cmd: [],
+    pubads: function () {
+      var self = this;
+      return {
+        setPublisherProvidedId: function (ppid) {
+          self._ppid = ppid;
+        },
+
+        getSlots: function () {
+          return self._slots;
+        },
+
+        setSlots: function (slots) {
+          self._slots = slots;
+        },
+
+        setTargeting: function(key, arrayOfValues) {
+          self._targeting[key] = Array.isArray(arrayOfValues) ? arrayOfValues : [arrayOfValues];
+        },
+
+        getTargeting: function(key) {
+          return self._targeting[key] || [];
+        },
+
+        getTargetingKeys: function() {
+          return Object.getOwnPropertyNames(self._targeting);
+        },
+
+        clearTargeting: function() {
+          self._targeting = {};
+        },
+
+        addEventListener: function (eventName, cb) {
+          self._callbackMap[eventName] = self._callbackMap[eventName] || [];
+          self._callbackMap[eventName].push(cb);
+        }
+      };
+    }
+  };
+}
+
+export function disable() {
+  window.googletag = undefined;
+}
+
+export function reset() {
+  disable();
+  enable();
+}
+
+enable();
diff --git a/test/spec/modules/1ad4goodBidAdapter_spec.js b/test/spec/modules/1ad4goodBidAdapter_spec.js
deleted file mode 100644
index b9cd86a4cf7..00000000000
--- a/test/spec/modules/1ad4goodBidAdapter_spec.js
+++ /dev/null
@@ -1,548 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/1ad4goodBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import * as bidderFactory from 'src/adapters/bidderFactory.js';
-import { deepClone } from 'src/utils.js';
-import { config } from 'src/config.js';
-
-const ENDPOINT = 'https://hb.1ad4good.org/prebid';
-
-describe('AdforgoodAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': '1ad4good',
-      'params': {
-        'placementId': '10433394'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'placementId': 0
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        'bidder': '1ad4good',
-        'params': {
-          'placementId': '10433394'
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      }
-    ];
-
-    it('should parse out private sizes', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            privateSizes: [300, 250]
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].private_sizes).to.exist;
-      expect(payload.tags[0].private_sizes).to.deep.equal([{width: 300, height: 250}]);
-    });
-
-    it('should add source and verison to the tag', function () {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.sdk).to.exist;
-      expect(payload.sdk).to.deep.equal({
-        source: 'pbjs',
-        version: '$prebid.version$'
-      });
-    });
-
-    it('should populate the ad_types array on all requests', function () {
-      ['banner', 'video'].forEach(type => {
-        const bidRequest = Object.assign({}, bidRequests[0]);
-        bidRequest.mediaTypes = {};
-        bidRequest.mediaTypes[type] = {};
-
-        const request = spec.buildRequests([bidRequest]);
-        const payload = JSON.parse(request.data);
-
-        expect(payload.tags[0].ad_types).to.deep.equal([type]);
-      });
-    });
-
-    it('should populate the ad_types array on outstream requests', function () {
-      const bidRequest = Object.assign({}, bidRequests[0]);
-      bidRequest.mediaTypes = {};
-      bidRequest.mediaTypes.video = {context: 'outstream'};
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].ad_types).to.deep.equal(['video']);
-    });
-
-    it('sends bid request to ENDPOINT via POST', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal(ENDPOINT);
-      expect(request.method).to.equal('POST');
-    });
-
-    it('should attach valid video params to the tag', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            video: {
-              id: 123,
-              minduration: 100,
-              foobar: 'invalid'
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-      expect(payload.tags[0].video).to.deep.equal({
-        id: 123,
-        minduration: 100
-      });
-    });
-
-    it('should add video property when adUnit includes a renderer', function () {
-      const videoData = {
-        mediaTypes: {
-          video: {
-            context: 'outstream',
-            mimes: ['video/mp4']
-          }
-        },
-        params: {
-          placementId: '10433394',
-          video: {
-            skippable: true,
-            playback_method: ['auto_play_sound_off']
-          }
-        }
-      };
-
-      let bidRequest1 = deepClone(bidRequests[0]);
-      bidRequest1 = Object.assign({}, bidRequest1, videoData, {
-        renderer: {
-          url: 'http://test.renderer.url',
-          render: function () {}
-        }
-      });
-
-      let bidRequest2 = deepClone(bidRequests[0]);
-      bidRequest2.adUnitCode = 'adUnit_code_2';
-      bidRequest2 = Object.assign({}, bidRequest2, videoData);
-
-      const request = spec.buildRequests([bidRequest1, bidRequest2]);
-      const payload = JSON.parse(request.data);
-      expect(payload.tags[0].video).to.deep.equal({
-        skippable: true,
-        playback_method: ['auto_play_sound_off'],
-        custom_renderer_present: true
-      });
-      expect(payload.tags[1].video).to.deep.equal({
-        skippable: true,
-        playback_method: ['auto_play_sound_off']
-      });
-    });
-
-    it('should attach valid user params to the tag', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            user: {
-              externalUid: '123',
-              foobar: 'invalid'
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.user).to.exist;
-      expect(payload.user).to.deep.equal({
-        externalUid: '123',
-      });
-    });
-
-    // it('should always populated tags[].sizes with 1,1 for native if otherwise not defined', function () {
-    //   let bidRequest = Object.assign({},
-    //     bidRequests[0],
-    //     {
-    //       mediaType: 'native',
-    //       nativeParams: {
-    //         image: { required: true }
-    //       }
-    //     }
-    //   );
-    //   bidRequest.sizes = [[150, 100], [300, 250]];
-
-    //   let request = spec.buildRequests([bidRequest]);
-    //   let payload = JSON.parse(request.data);
-    //   expect(payload.tags[0].sizes).to.deep.equal([{width: 150, height: 100}, {width: 300, height: 250}]);
-
-    //   delete bidRequest.sizes;
-
-    //   request = spec.buildRequests([bidRequest]);
-    //   payload = JSON.parse(request.data);
-
-    //   expect(payload.tags[0].sizes).to.deep.equal([{width: 1, height: 1}]);
-    // });
-
-    it('should convert keyword params to proper form and attaches to request', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            keywords: {
-              single: 'val',
-              singleArr: ['val'],
-              singleArrNum: [5],
-              multiValMixed: ['value1', 2, 'value3'],
-              singleValNum: 123,
-              emptyStr: '',
-              emptyArr: [''],
-              badValue: {'foo': 'bar'} // should be dropped
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].keywords).to.deep.equal([{
-        'key': 'single',
-        'value': ['val']
-      }, {
-        'key': 'singleArr',
-        'value': ['val']
-      }, {
-        'key': 'singleArrNum',
-        'value': ['5']
-      }, {
-        'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
-      }, {
-        'key': 'singleValNum',
-        'value': ['123']
-      }, {
-        'key': 'emptyStr'
-      }, {
-        'key': 'emptyArr'
-      }]);
-    });
-
-    it('should add payment rules to the request', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            usePaymentRule: true
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].use_pmt_rule).to.equal(true);
-    });
-
-    it('should add gdpr consent information to the request', function () {
-      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
-      let bidderRequest = {
-        'bidderCode': '1ad4good',
-        'auctionId': '1d1a030790a475',
-        'bidderRequestId': '22edbae2733bf6',
-        'timeout': 3000,
-        'gdprConsent': {
-          consentString: consentString,
-          gdprApplies: true
-        }
-      };
-      bidderRequest.bids = bidRequests;
-
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.gdpr_consent).to.exist;
-      expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
-      expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
-    });
-
-    it('supports sending hybrid mobile app parameters', function () {
-      let appRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            app: {
-              id: 'B1O2W3M4AN.com.prebid.webview',
-              geo: {
-                lat: 40.0964439,
-                lng: -75.3009142
-              },
-              device_id: {
-                idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE', // Apple advertising identifier
-                aaid: '38400000-8cf0-11bd-b23e-10b96e40000d', // Android advertising identifier
-                md5udid: '5756ae9022b2ea1e47d84fead75220c8', // MD5 hash of the ANDROID_ID
-                sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF', // SHA1 hash of the ANDROID_ID
-                windowsadid: '750c6be243f1c4b5c9912b95a5742fc5' // Windows advertising identifier
-              }
-            }
-          }
-        }
-      );
-      const request = spec.buildRequests([appRequest]);
-      const payload = JSON.parse(request.data);
-      expect(payload.app).to.exist;
-      expect(payload.app).to.deep.equal({
-        appid: 'B1O2W3M4AN.com.prebid.webview'
-      });
-      expect(payload.device.device_id).to.exist;
-      expect(payload.device.device_id).to.deep.equal({
-        aaid: '38400000-8cf0-11bd-b23e-10b96e40000d',
-        idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE',
-        md5udid: '5756ae9022b2ea1e47d84fead75220c8',
-        sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF',
-        windowsadid: '750c6be243f1c4b5c9912b95a5742fc5'
-      });
-      expect(payload.device.geo).to.exist;
-      expect(payload.device.geo).to.deep.equal({
-        lat: 40.0964439,
-        lng: -75.3009142
-      });
-    });
-
-    it('should add referer info to payload', function () {
-      const bidRequest = Object.assign({}, bidRequests[0])
-      const bidderRequest = {
-        refererInfo: {
-          referer: 'http://example.com/page.html',
-          reachedTop: true,
-          numIframes: 2,
-          stack: [
-            'http://example.com/page.html',
-            'http://example.com/iframe1.html',
-            'http://example.com/iframe2.html'
-          ]
-        }
-      }
-      const request = spec.buildRequests([bidRequest], bidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.referrer_detection).to.exist;
-      expect(payload.referrer_detection).to.deep.equal({
-        rd_ref: 'http%3A%2F%2Fexample.com%2Fpage.html',
-        rd_top: true,
-        rd_ifs: 2,
-        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
-      });
-    });
-  })
-
-  describe('interpretResponse', function () {
-    let bfStub;
-    before(function() {
-      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
-    });
-
-    after(function() {
-      bfStub.restore();
-    });
-
-    let response = {
-      'version': '3.0.0',
-      'tags': [
-        {
-          'uuid': '3db3773286ee59',
-          'tag_id': 10433394,
-          'auction_id': '4534722592064951574',
-          'nobid': false,
-          'no_ad_url': 'http://lax1-ib.adnxs.com/no-ad',
-          'timeout_ms': 10000,
-          'ad_profile_id': 27079,
-          'ads': [
-            {
-              'content_source': 'rtb',
-              'ad_type': 'banner',
-              'buyer_member_id': 958,
-              'creative_id': 29681110,
-              'media_type_id': 1,
-              'media_subtype_id': 1,
-              'cpm': 0.5,
-              'cpm_publisher_currency': 0.5,
-              'publisher_currency_code': '$',
-              'client_initiated_ad_counting': true,
-              'viewability': {
-                'config': '<script type=\'text/javascript\' async=\'true\' src=\'http://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=http%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttp%253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
-              },
-              'rtb': {
-                'banner': {
-                  'content': '<!-- Creative -->',
-                  'width': 300,
-                  'height': 250
-                },
-                'trackers': [
-                  {
-                    'impression_urls': [
-                      'http://lax1-ib.adnxs.com/impression'
-                    ],
-                    'video_events': {}
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ]
-    };
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {
-          'requestId': '3db3773286ee59',
-          'cpm': 0.5,
-          'creativeId': 29681110,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<!-- Creative -->',
-          'mediaType': 'banner',
-          'currency': 'USD',
-          'ttl': 300,
-          'netRevenue': true,
-          'adUnitCode': 'code',
-          'ads4good': {
-            'buyerMemberId': 958
-          }
-        }
-      ];
-      let bidderRequest = {
-        bids: [{
-          bidId: '3db3773286ee59',
-          adUnitCode: 'code'
-        }]
-      }
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
-    });
-
-    it('handles nobid responses', function () {
-      let response = {
-        'version': '0.0.1',
-        'tags': [{
-          'uuid': '84ab500420319d',
-          'tag_id': 5976557,
-          'auction_id': '297492697822162468',
-          'nobid': true
-        }]
-      };
-      let bidderRequest;
-
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
-      expect(result.length).to.equal(0);
-    });
-
-    it('handles non-banner media responses', function () {
-      let response = {
-        'tags': [{
-          'uuid': '84ab500420319d',
-          'ads': [{
-            'ad_type': 'video',
-            'cpm': 0.500000,
-            'notify_url': 'imptracker.com',
-            'rtb': {
-              'video': {
-                'content': '<!-- Creative -->'
-              }
-            },
-            'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'http://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=http%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttp%253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
-          }]
-        }]
-      };
-      let bidderRequest = {
-        bids: [{
-          bidId: '84ab500420319d',
-          adUnitCode: 'code'
-        }]
-      }
-
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
-      expect(result[0]).to.have.property('vastUrl');
-      expect(result[0]).to.have.property('vastImpUrl');
-      expect(result[0]).to.have.property('mediaType', 'video');
-    });
-
-    it('should add deal_priority and deal_code', function() {
-      let responseWithDeal = deepClone(response);
-      responseWithDeal.tags[0].ads[0].deal_priority = 'high';
-      responseWithDeal.tags[0].ads[0].deal_code = '123';
-
-      let bidderRequest = {
-        bids: [{
-          bidId: '3db3773286ee59',
-          adUnitCode: 'code'
-        }]
-      }
-      let result = spec.interpretResponse({ body: responseWithDeal }, {bidderRequest});
-      expect(Object.keys(result[0].ads4good)).to.include.members(['buyerMemberId', 'dealPriority', 'dealCode']);
-    });
-
-    it('should add advertiser id', function() {
-      let responseAdvertiserId = deepClone(response);
-      responseAdvertiserId.tags[0].ads[0].advertiser_id = '123';
-
-      let bidderRequest = {
-        bids: [{
-          bidId: '3db3773286ee59',
-          adUnitCode: 'code'
-        }]
-      }
-      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
-      expect(Object.keys(result[0].meta)).to.include.members(['advertiserId']);
-    })
-  });
-});
diff --git a/test/spec/modules/1plusXRtdProvider_spec.js b/test/spec/modules/1plusXRtdProvider_spec.js
new file mode 100644
index 00000000000..496c005f470
--- /dev/null
+++ b/test/spec/modules/1plusXRtdProvider_spec.js
@@ -0,0 +1,522 @@
+import { config } from 'src/config';
+import {
+  onePlusXSubmodule,
+  segtaxes,
+  extractConfig,
+  buildOrtb2Updates,
+  updateBidderConfig,
+  setTargetingDataToConfig,
+  extractConsent,
+  getPapiUrl
+} from 'modules/1plusXRtdProvider';
+import assert from 'assert';
+import { extractFpid } from '../../../modules/1plusXRtdProvider';
+
+describe('1plusXRtdProvider', () => {
+  // Fake server config
+  let fakeServer;
+  const fakeResponseHeaders = {
+    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*'
+  };
+  const fakeResponse = {
+    s: ['segment1', 'segment2', 'segment3'],
+    t: ['targeting1', 'targeting2', 'targeting3']
+  };
+
+  // Bid request config
+  const reqBidsConfigObj = {
+    adUnits: [{
+      bids: [
+        { bidder: 'appnexus' }
+      ]
+    }]
+  };
+
+  // Bidder configs
+  const bidderConfigInitial = {
+    ortb2: {
+      user: { keywords: '' },
+      site: { ext: {} }
+    }
+  }
+  const bidderConfigInitialWith1plusXUserData = {
+    ortb2: {
+      user: {
+        data: [{ name: '1plusX.com', segment: [{ id: 'initial' }] }]
+      },
+      site: { content: { data: [] } }
+    }
+  }
+  const bidderConfigInitialWithUserData = {
+    ortb2: {
+      user: {
+        data: [{ name: 'hello.world', segment: [{ id: 'initial' }] }]
+      },
+      site: { content: { data: [] } }
+    }
+  }
+  const bidderConfigInitialWith1plusXSiteContent = {
+    ortb2: {
+      user: { data: [] },
+      site: {
+        content: {
+          data: [{
+            name: '1plusX.com', segment: [{ id: 'initial' }], ext: { segtax: 525 }
+          }]
+        }
+      },
+    }
+  }
+  const bidderConfigInitialWithSiteContent = {
+    ortb2: {
+      user: { data: [] },
+      site: {
+        content: {
+          data: [{ name: 'hello.world', segment: [{ id: 'initial' }] }]
+        }
+      },
+    }
+  }
+  // Util functions
+  const randomBidder = (len = 5) => Math.random().toString(36).replace(/[^a-z]+/g, '').substring(0, len);
+
+  before(() => {
+    config.resetConfig();
+  })
+
+  after(() => { })
+
+  beforeEach(() => {
+    fakeServer = sinon.createFakeServer();
+    fakeServer.respondWith('GET', '*', [200, fakeResponseHeaders, JSON.stringify(fakeResponse)]);
+    fakeServer.respondImmediately = true;
+    fakeServer.autoRespond = true;
+  })
+
+  describe('onePlusXSubmodule', () => {
+    it('init is successfull', () => {
+      const initResult = onePlusXSubmodule.init();
+      expect(initResult).to.be.true;
+    })
+
+    it('callback is called after getBidRequestData', () => {
+      // Nice case; everything runs as expected
+      {
+        const callbackSpy = sinon.spy();
+        const config = { params: { customerId: 'test', bidders: ['appnexus'] } };
+        onePlusXSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, config);
+        setTimeout(() => {
+          expect(callbackSpy.calledOnce).to.be.true
+        }, 100)
+      }
+      // No customer id in config => error but still callback called
+      {
+        const callbackSpy = sinon.spy();
+        const config = {}
+        onePlusXSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, config);
+        setTimeout(() => {
+          expect(callbackSpy.calledOnce).to.be.true
+        }, 100);
+      }
+      // No bidders in config => error but still callback called
+      {
+        const callbackSpy = sinon.spy();
+        const config = { customerId: 'test' }
+        onePlusXSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, config);
+        setTimeout(() => {
+          expect(callbackSpy.calledOnce).to.be.true
+        }, 100);
+      }
+    })
+  })
+
+  describe('extractConfig', () => {
+    const customerId = 'test';
+    const timeout = 1000;
+    const bidders = ['appnexus'];
+
+    it('Throws an error if no customerId is specified', () => {
+      const moduleConfig = { params: { timeout, bidders } };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    })
+    it('Throws an error if no bidder is specified', () => {
+      const moduleConfig = { params: { customerId, timeout } };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    })
+    it("Throws an error if there's no bidder in reqBidsConfigObj", () => {
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      const reqBidsConfigEmpty = { adUnits: [{ bids: [] }] };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigEmpty)).to.throw();
+    })
+    it('Returns an object containing the parameters specified', () => {
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      const expectedKeys = ['customerId', 'timeout', 'bidders']
+      const extractedConfig = extractConfig(moduleConfig, reqBidsConfigObj);
+      expect(extractedConfig).to.be.an('object').and.to.have.all.keys(expectedKeys);
+      expect(extractedConfig.customerId).to.equal(customerId);
+      expect(extractedConfig.timeout).to.equal(timeout);
+      expect(extractedConfig.bidders).to.deep.equal(bidders);
+    })
+    /* 1plusX RTD module may only use bidders that are both specified in :
+        - the bid request configuration
+        - AND in the 1plusX RTD module configuration
+      Below 2 tests are enforcing those rules
+    */
+    it('Returns the intersection of bidders found in bid request config & module config', () => {
+      const bidders = ['appnexus', 'rubicon'];
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      const { bidders: extractedBidders } = extractConfig(moduleConfig, reqBidsConfigObj);
+      expect(extractedBidders).to.be.an('array').and.to.have.length(1); 7
+      expect(extractedBidders[0]).to.equal('appnexus');
+    })
+    it('Throws an error if no bidder can be used by the module', () => {
+      const bidders = ['rubicon'];
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    })
+  })
+
+  describe('buildOrtb2Updates', () => {
+    it('fills site.content.data & user.data in the ortb2 config', () => {
+      const rtdData = { segments: fakeResponse.s, topics: fakeResponse.t };
+      const ortb2Updates = buildOrtb2Updates(rtdData, randomBidder());
+
+      const expectedOutput = {
+        siteContentData: {
+          name: '1plusX.com',
+          segment: rtdData.topics.map((topicId) => ({ id: topicId })),
+          ext: { segtax: segtaxes.CONTENT }
+        },
+        userData: {
+          name: '1plusX.com',
+          segment: rtdData.segments.map((segmentId) => ({ id: segmentId }))
+        }
+      }
+      expect([ortb2Updates]).to.deep.include.members([expectedOutput]);
+    });
+    it('fills site.keywords in the ortb2 config (appnexus specific)', () => {
+      const rtdData = { segments: fakeResponse.s, topics: fakeResponse.t };
+      const ortb2Updates = buildOrtb2Updates(rtdData, 'appnexus');
+
+      const expectedOutput = {
+        site: {
+          keywords: rtdData.topics.join(','),
+        }
+      }
+      expect([ortb2Updates]).to.deep.include.members([expectedOutput]);
+    });
+
+    it('defaults to empty array if no segment is given', () => {
+      const rtdData = { topics: fakeResponse.t };
+      const ortb2Updates = buildOrtb2Updates(rtdData, randomBidder());
+
+      const expectedOutput = {
+        siteContentData: {
+          name: '1plusX.com',
+          segment: rtdData.topics.map((topicId) => ({ id: topicId })),
+          ext: { segtax: segtaxes.CONTENT }
+        },
+        userData: {
+          name: '1plusX.com',
+          segment: []
+        }
+      }
+      expect(ortb2Updates).to.deep.include(expectedOutput);
+    })
+
+    it('defaults to empty array if no topic is given', () => {
+      const rtdData = { segments: fakeResponse.s };
+      const ortb2Updates = buildOrtb2Updates(rtdData, randomBidder());
+
+      const expectedOutput = {
+        siteContentData: {
+          name: '1plusX.com',
+          segment: [],
+          ext: { segtax: segtaxes.CONTENT }
+        },
+        userData: {
+          name: '1plusX.com',
+          segment: rtdData.segments.map((segmentId) => ({ id: segmentId }))
+        }
+      }
+      expect(ortb2Updates).to.deep.include(expectedOutput);
+    })
+    it('defaults to empty string if no topic is given (appnexus specific)', () => {
+      const rtdData = { segments: fakeResponse.s };
+      const ortb2Updates = buildOrtb2Updates(rtdData, 'appnexus');
+
+      const expectedOutput = {
+        site: {
+          keywords: '',
+        }
+      }
+      expect(ortb2Updates).to.deep.include(expectedOutput);
+    })
+  })
+
+  describe('extractConsent', () => {
+    it('extracts consent strings correctly if given', () => {
+      const consent = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 'myConsent'
+        }
+      }
+      const output = extractConsent(consent)
+      const expectedOutput = {
+        gdpr_applies: 1,
+        consent_string: 'myConsent'
+      }
+      expect(expectedOutput).to.deep.include(output)
+      expect(output).to.deep.include(expectedOutput)
+    })
+    it('extracts null if consent object is empty', () => {
+      const consent1 = {}
+      expect(extractConsent(consent1)).to.equal(null)
+    })
+
+    it('throws an error if the consent is malformed', () => {
+      const consent1 = {
+        gdpr: {
+          consentString: 'myConsent'
+        }
+      }
+      const consent2 = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 3
+        }
+      }
+      const consent3 = {
+        gdpr: {
+          gdprApplies: 'yes',
+          consentString: 'myConsent'
+        }
+      }
+      const consent4 = {
+        gdpr: {}
+      }
+
+      for (const consent of [consent1, consent2, consent3, consent4]) {
+        var failed = false;
+        try {
+          extractConsent(consent)
+        } catch (e) {
+          failed = true;
+        } finally {
+          assert(failed, 'Should be throwing an exception')
+        }
+      }
+    })
+  })
+
+  describe('extractFpid', () => {
+    it('correctly extracts an ope fpid if present', () => {
+      window.localStorage.setItem('ope_fpid', 'oneplusx_test_key')
+      const id1 = extractFpid()
+      window.localStorage.removeItem('ope_fpid')
+      const id2 = extractFpid()
+      expect(id1).to.equal('oneplusx_test_key')
+      expect(id2).to.equal(null)
+    })
+  })
+
+  describe('getPapiUrl', () => {
+    const customer = 'acme'
+    const consent = {
+      gdpr: {
+        gdprApplies: 1,
+        consentString: 'myConsent'
+      }
+    }
+
+    it('correctly builds URLs if gdpr parameters are present', () => {
+      const url1 = getPapiUrl(customer)
+      const url2 = getPapiUrl(customer, extractConsent(consent))
+      expect(['&consent_string=myConsent&gdpr_applies=1', '&gdpr_applies=1&consent_string=myConsent']).to.contain(url2.replace(url1, ''))
+    })
+
+    it('correctly builds URLs if fpid parameters are present')
+    const url1 = getPapiUrl(customer)
+    const url2 = getPapiUrl(customer, {}, 'my_first_party_id')
+    expect(url2.replace(url1, '')).to.equal('&fpid=my_first_party_id')
+  })
+
+  describe('updateBidderConfig', () => {
+    const ortb2UpdatesAppNexus = {
+      site: {
+        keywords: fakeResponse.t.join(','),
+      },
+      userData: {
+        name: '1plusX.com',
+        segment: fakeResponse.s.map((segmentId) => ({ id: segmentId }))
+      }
+    }
+    const ortb2Updates = {
+      siteContentData: {
+        name: '1plusX.com',
+        segment: fakeResponse.t.map((topicId) => ({ id: topicId })),
+        ext: { segtax: segtaxes.CONTENT }
+      },
+      userData: {
+        name: '1plusX.com',
+        segment: fakeResponse.s.map((segmentId) => ({ id: segmentId }))
+      }
+    }
+
+    it('merges fetched data in bidderConfig for configured bidders', () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitial
+      });
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.site.content.data).to.deep.include(ortb2Updates.siteContentData);
+      expect(newBidderConfig.ortb2.user.data).to.deep.include(ortb2Updates.userData);
+      // Check that existing config didn't get erased
+      expect(newBidderConfig.ortb2.site).to.deep.include(bidderConfigInitial.ortb2.site);
+      expect(newBidderConfig.ortb2.user).to.deep.include(bidderConfigInitial.ortb2.user);
+    })
+
+    it('merges fetched data in bidderConfig for configured bidders (appnexus specific)', () => {
+      const bidder = 'appnexus';
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitial
+      });
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2UpdatesAppNexus, config.getBidderConfig());
+
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.site).to.deep.include(ortb2UpdatesAppNexus.site);
+      // Check that existing config didn't get erased
+      expect(newBidderConfig.ortb2.site).to.deep.include(bidderConfigInitial.ortb2.site);
+      expect(newBidderConfig.ortb2.user).to.deep.include(bidderConfigInitial.ortb2.user);
+    })
+
+    it('overwrites an existing 1plus.com entry in ortb2.user.data', () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitialWith1plusXUserData
+      });
+      // Save previous user.data entry
+      const previousUserData = bidderConfigInitialWith1plusXUserData.ortb2.user.data[0];
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.user.data).to.deep.include(ortb2Updates.userData);
+      expect(newBidderConfig.ortb2.user.data).not.to.include(previousUserData);
+    })
+    it("doesn't overwrite entries in ortb2.user.data that aren't 1plusx.com", () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitialWithUserData
+      });
+      // Save previous user.data entry
+      const previousUserData = bidderConfigInitialWithUserData.ortb2.user.data[0];
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.user.data).to.deep.include(ortb2Updates.userData);
+      expect(newBidderConfig.ortb2.user.data).to.deep.include(previousUserData);
+    })
+
+    it('overwrites an existing 1plus.com entry in ortb2.site.content.data', () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitialWith1plusXSiteContent
+      });
+      // Save previous user.data entry
+      const previousSiteContent = bidderConfigInitialWith1plusXSiteContent.ortb2.site.content.data[0];
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.site.content.data).to.deep.include(ortb2Updates.siteContentData);
+      expect(newBidderConfig.ortb2.site.content.data).not.to.include(previousSiteContent);
+    })
+    it("doesn't overwrite entries in ortb2.site.content.data that aren't 1plusx.com", () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitialWithSiteContent
+      });
+      // Save previous user.data entry
+      const previousSiteContent = bidderConfigInitialWithSiteContent.ortb2.site.content.data[0];
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.site.content.data).to.deep.include(ortb2Updates.siteContentData);
+      expect(newBidderConfig.ortb2.site.content.data).to.deep.include(previousSiteContent);
+    })
+  })
+
+  describe('setTargetingDataToConfig', () => {
+    const expectedKeywords = fakeResponse.t.join(',');
+    const expectedSiteContentObj = {
+      data: [{
+        name: '1plusX.com',
+        segment: fakeResponse.t.map((topicId) => ({ id: topicId })),
+        ext: { segtax: segtaxes.CONTENT }
+      }]
+    }
+    const expectedUserObj = {
+      data: [{
+        name: '1plusX.com',
+        segment: fakeResponse.s.map((segmentId) => ({ id: segmentId }))
+      }]
+    }
+    const expectedOrtb2 = {
+      appnexus: {
+        site: { keywords: expectedKeywords }
+      },
+      rubicon: {
+        site: { content: expectedSiteContentObj },
+        user: expectedUserObj
+      }
+    }
+
+    it('sets the config for the selected bidders', () => {
+      const bidders = ['appnexus', 'rubicon'];
+      // setting initial config for those bidders
+      config.setBidderConfig({
+        bidders,
+        config: bidderConfigInitial
+      })
+      // call setTargetingDataToConfig
+      setTargetingDataToConfig(fakeResponse, { bidders });
+
+      // Check that the targeting data has been set in both configs
+      for (const bidder of bidders) {
+        const newConfig = config.getBidderConfig()[bidder];
+        // Check that we got what we expect
+        const expectedConfErr = (prop) => `New config for ${bidder} doesn't comply with expected at ${prop}`;
+        expect(newConfig.ortb2.site, expectedConfErr('site')).to.deep.include(expectedOrtb2[bidder].site);
+        if (expectedOrtb2[bidder].user) {
+          expect(newConfig.ortb2.user, expectedConfErr('user')).to.deep.include(expectedOrtb2[bidder].user);
+        }
+        // Check that existing config didn't get erased
+        const existingConfErr = (prop) => `Existing config for ${bidder} got unlawfully overwritten at ${prop}`;
+        expect(newConfig.ortb2.site, existingConfErr('site')).to.deep.include(bidderConfigInitial.ortb2.site);
+        expect(newConfig.ortb2.user, existingConfErr('user')).to.deep.include(bidderConfigInitial.ortb2.user);
+      }
+    })
+  })
+})
diff --git a/test/spec/modules/33acrossBidAdapter_spec.js b/test/spec/modules/33acrossBidAdapter_spec.js
index 3721cef18d9..2680544d00b 100644
--- a/test/spec/modules/33acrossBidAdapter_spec.js
+++ b/test/spec/modules/33acrossBidAdapter_spec.js
@@ -5,57 +5,61 @@ import { config } from 'src/config.js';
 
 import { spec } from 'modules/33acrossBidAdapter.js';
 
+function validateBuiltServerRequest(builtReq, expectedReq) {
+  expect(builtReq.url).to.equal(expectedReq.url);
+  expect(builtReq.options).to.deep.equal(expectedReq.options);
+  expect(JSON.parse(builtReq.data)).to.deep.equal(
+    JSON.parse(expectedReq.data)
+  )
+}
+
 describe('33acrossBidAdapter:', function () {
   const BIDDER_CODE = '33across';
-  const SITE_ID = 'pub1234';
-  const PRODUCT_ID = 'product1';
+  const SITE_ID = 'sample33xGUID123456789';
   const END_POINT = 'https://ssc.33across.com/api/v1/hb';
 
   let element, win;
   let bidRequests;
   let sandbox;
 
-  function TtxRequestBuilder() {
+  function TtxRequestBuilder(siteId = SITE_ID) {
     const ttxRequest = {
       imp: [{
-        banner: {
-          format: [
-            {
-              w: 300,
-              h: 250
-            },
-            {
-              w: 728,
-              h: 90
-            }
-          ],
-          ext: {
-            ttx: {
-              viewability: {
-                amount: 100
-              }
-            }
-          }
-        },
-        ext: {
-          ttx: {
-            prod: PRODUCT_ID
-          }
-        }
+        id: 'b1'
       }],
       site: {
-        id: SITE_ID
+        id: siteId
       },
-      id: 'b1',
-      user: {
+      device: {
         ext: {
-          consent: undefined
+          ttx: {
+            w: 1024,
+            h: 728,
+            pxr: 2,
+            vp: {
+              w: 800,
+              h: 600
+            },
+            ah: 500,
+            mtp: 0
+          }
+        },
+        sua: {
+          browsers: [{
+            brand: 'Google Chrome',
+            version: ['104', '0', '5112', '79']
+          }],
+          platform: {
+            brand: 'macOS',
+            version: ['11', '6', '8']
+          },
+          model: ''
         }
       },
+      id: 'r1',
       regs: {
         ext: {
-          gdpr: 0,
-          us_privacy: null
+          gdpr: 0
         }
       },
       ext: {
@@ -69,17 +73,97 @@ describe('33acrossBidAdapter:', function () {
       }
     };
 
-    this.withSizes = sizes => {
-      Object.assign(ttxRequest.imp[0].banner, { format: sizes });
+    this.addImp = (id = 'b2') => {
+      ttxRequest.imp.push({ id });
+
+      return this;
+    }
+
+    this.withBanner = () => {
+      ttxRequest.imp.forEach((imp) => {
+        Object.assign(imp, {
+          banner: {
+            format: [
+              {
+                w: 300,
+                h: 250
+              },
+              {
+                w: 728,
+                h: 90
+              }
+            ],
+            ext: {
+              ttx: {
+                viewability: {
+                  amount: 100
+                }
+              }
+            }
+          }
+        });
+      });
+      return this;
+    };
+
+    this.withBannerSizes = this.withSizes = sizes => {
+      ttxRequest.imp.forEach((imp) => {
+        Object.assign(imp.banner, { format: sizes });
+      });
+
       return this;
     };
 
-    this.withViewability = viewability => {
-      Object.assign(ttxRequest.imp[0].banner, {
-        ext: {
-          ttx: { viewability }
-        }
+    this.withVideo = (params = {}) => {
+      ttxRequest.imp.forEach((imp) => {
+        Object.assign(imp, {
+          video: {
+            w: 300,
+            h: 250,
+            placement: 2,
+            ...params
+          }
+        });
+      });
+
+      return this;
+    };
+
+    this.withViewability = (viewability, format = 'banner') => {
+      ttxRequest.imp.forEach((imp) => {
+        Object.assign(imp[format], {
+          ext: {
+            ttx: { viewability }
+          }
+        });
+      });
+
+      return this;
+    };
+
+    this.withProduct = (prod = 'siab') => {
+      ttxRequest.imp.forEach((imp) => {
+        utils.mergeDeep(imp, {
+          ext: {
+            ttx: {
+              prod
+            }
+          }
+        });
+      });
+
+      return this;
+    };
+
+    this.withGpid = (gpid) => {
+      ttxRequest.imp.forEach((imp) => {
+        utils.mergeDeep(imp, {
+          ext: {
+            gpid
+          }
+        });
       });
+
       return this;
     };
 
@@ -120,6 +204,12 @@ describe('33acrossBidAdapter:', function () {
       return this;
     };
 
+    this.withDevice = (device) => {
+      utils.mergeDeep(ttxRequest, { device });
+
+      return this;
+    };
+
     this.withPageUrl = pageUrl => {
       Object.assign(ttxRequest.site, {
         page: pageUrl
@@ -140,21 +230,46 @@ describe('33acrossBidAdapter:', function () {
       return this;
     };
 
-    this.withFormatFloors = floors => {
-      const format = ttxRequest.imp[0].banner.format.map((fm, i) => {
-        return Object.assign(fm, {
-          ext: {
-            ttx: {
-              bidfloors: [ floors[i] ]
+    this.withFloors = this.withFormatFloors = (mediaType, floors) => {
+      switch (mediaType) {
+        case 'banner':
+          const format = ttxRequest.imp[0].banner.format.map((fm, i) => {
+            return Object.assign(fm, {
+              ext: {
+                ttx: {
+                  bidfloors: [ floors[i] ]
+                }
+              }
+            })
+          });
+
+          ttxRequest.imp[0].banner.format = format;
+          break;
+        case 'video':
+          Object.assign(ttxRequest.imp[0].video, {
+            ext: {
+              ttx: {
+                bidfloors: floors
+              }
             }
+          });
+          break;
+      }
+
+      return this;
+    };
+
+    this.withUserIds = (eids) => {
+      Object.assign(ttxRequest, {
+        user: {
+          ext: {
+            eids
           }
-        })
+        }
       });
 
-      ttxRequest.imp[0].banner.format = format;
-
       return this;
-    };
+    }
 
     this.build = () => ttxRequest;
   }
@@ -162,7 +277,7 @@ describe('33acrossBidAdapter:', function () {
   function ServerRequestBuilder() {
     const serverRequest = {
       'method': 'POST',
-      'url': END_POINT,
+      'url': `${END_POINT}?guid=${SITE_ID}`,
       'data': null,
       'options': {
         'contentType': 'text/plain',
@@ -188,6 +303,117 @@ describe('33acrossBidAdapter:', function () {
     this.build = () => serverRequest;
   }
 
+  function BidRequestsBuilder() {
+    const bidRequests = [
+      {
+        bidId: 'b1',
+        bidder: '33across',
+        bidderRequestId: 'b1a',
+        params: {
+          siteId: SITE_ID,
+          productId: 'siab'
+        },
+        adUnitCode: 'div-id',
+        auctionId: 'r1',
+        mediaTypes: {},
+        transactionId: 't1',
+        ortb2: {
+          device: {
+            sua: {
+              browsers: [{
+                brand: 'Google Chrome',
+                version: ['104', '0', '5112', '79']
+              }],
+              platform: {
+                brand: 'macOS',
+                version: ['11', '6', '8']
+              },
+              model: '',
+              mobile: false
+            }
+          }
+        }
+      }
+    ];
+
+    this.addBid = (bidParams = {}) => {
+      bidRequests.push({
+        bidId: 'b2',
+        bidder: '33across',
+        bidderRequestId: 'b1b',
+        params: {
+          siteId: SITE_ID,
+          productId: 'siab'
+        },
+        adUnitCode: 'div-id',
+        auctionId: 'r1',
+        mediaTypes: {},
+        transactionId: 't2',
+        ortb2: {
+          device: {
+            sua: {
+              browsers: [{
+                brand: 'Google Chrome',
+                version: ['104', '0', '5112', '79']
+              }],
+              platform: {
+                brand: 'macOS',
+                version: ['11', '6', '8']
+              },
+              model: '',
+              mobile: false
+            }
+          }
+        },
+        ...bidParams
+      });
+
+      return this;
+    };
+
+    this.withBanner = () => {
+      bidRequests.forEach((bid) => {
+        bid.mediaTypes.banner = {
+          sizes: [
+            [300, 250],
+            [728, 90]
+          ]
+        };
+      });
+
+      return this;
+    };
+
+    this.withProduct = (prod) => {
+      bidRequests.forEach((bid) => {
+        bid.params.productId = prod;
+      });
+      return this;
+    };
+
+    this.withVideo = (params) => {
+      bidRequests.forEach((bid) => {
+        bid.mediaTypes.video = {
+          playerSize: [[300, 250]],
+          context: 'outstream',
+          ...params
+        };
+      });
+
+      return this;
+    }
+
+    this.withUserIds = (eids) => {
+      bidRequests.forEach((bid) => {
+        bid.userIdAsEids = eids;
+      });
+
+      return this;
+    };
+
+    this.build = () => bidRequests;
+  }
+
   beforeEach(function() {
     element = {
       x: 0,
@@ -209,36 +435,36 @@ describe('33acrossBidAdapter:', function () {
       }
     };
     win = {
+      parent: null,
+      devicePixelRatio: 2,
+      screen: {
+        width: 1024,
+        height: 728,
+        availHeight: 500
+      },
+      navigator: {
+        maxTouchPoints: 0
+      },
       document: {
-        visibilityState: 'visible'
+        visibilityState: 'visible',
+        documentElement: {
+          clientWidth: 800,
+          clientHeight: 600
+        }
       },
 
       innerWidth: 800,
       innerHeight: 600
     };
 
-    bidRequests = [
-      {
-        bidId: 'b1',
-        bidder: '33across',
-        bidderRequestId: 'b1a',
-        params: {
-          siteId: SITE_ID,
-          productId: PRODUCT_ID
-        },
-        adUnitCode: 'div-id',
-        auctionId: 'r1',
-        sizes: [
-          [300, 250],
-          [728, 90]
-        ],
-        transactionId: 't1'
-      }
-    ];
-
+    bidRequests = (
+      new BidRequestsBuilder()
+        .withBanner()
+        .build()
+    );
     sandbox = sinon.sandbox.create();
     sandbox.stub(Date, 'now').returns(1);
-    sandbox.stub(document, 'getElementById').withArgs('div-id').returns(element);
+    sandbox.stub(document, 'getElementById').returns(element);
     sandbox.stub(utils, 'getWindowTop').returns(win);
     sandbox.stub(utils, 'getWindowSelf').returns(win);
   });
@@ -248,123 +474,339 @@ describe('33acrossBidAdapter:', function () {
   });
 
   describe('isBidRequestValid:', function() {
-    it('returns true when valid bid request is sent', function() {
-      const validBid = {
-        bidder: BIDDER_CODE,
-        params: {
-          siteId: SITE_ID,
-          productId: PRODUCT_ID
-        }
-      };
+    context('basic validation', function() {
+      it('returns true for valid bidder name values', function() {
+        const validBidderName = [
+          '33across',
+          '33across_mgni'
+        ];
 
-      expect(spec.isBidRequestValid(validBid)).to.be.true;
-    });
+        validBidderName.forEach((bidderName) => {
+          const bid = {
+            bidder: bidderName,
+            params: {
+              siteId: 'sample33xGUID123456789'
+            }
+          };
 
-    it('returns true when valid test bid request is sent', function() {
-      const validBid = {
-        bidder: BIDDER_CODE,
-        params: {
-          siteId: SITE_ID,
-          productId: PRODUCT_ID,
-          test: 1
-        }
-      };
+          expect(spec.isBidRequestValid(bid)).to.be.true;
+        });
+      });
 
-      expect(spec.isBidRequestValid(validBid)).to.be.true;
-    });
+      it('returns false for invalid bidder name values', function() {
+        const invalidBidderName = [
+          undefined,
+          '33',
+          '33x',
+          'thirtythree',
+          ''
+        ];
 
-    it('returns false when bidder not set to "33across"', function() {
-      const invalidBid = {
-        bidder: 'foo',
-        params: {
-          siteId: SITE_ID,
-          productId: PRODUCT_ID
-        }
-      };
+        invalidBidderName.forEach((bidderName) => {
+          const bid = {
+            bidder: bidderName,
+            params: {
+              siteId: 'sample33xGUID123456789'
+            }
+          };
 
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
-    });
+          expect(spec.isBidRequestValid(bid)).to.be.false;
+        });
+      });
 
-    it('returns false when params not set', function() {
-      const invalidBid = {
-        bidder: 'foo'
-      };
+      it('returns true for valid guid values', function() {
+        // NOTE: We ignore whitespace at the start and end since
+        // in our experience these are common typos
+        const validGUIDs = [
+          `${SITE_ID}`,
+          `${SITE_ID} `,
+          ` ${SITE_ID}`,
+          ` ${SITE_ID} `
+        ];
 
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
-    });
+        validGUIDs.forEach((siteId) => {
+          const bid = {
+            bidder: '33across',
+            params: {
+              siteId
+            }
+          };
 
-    it('returns false when site ID is not set in params', function() {
-      const invalidBid = {
-        bidder: 'foo',
-        params: {
-          productId: PRODUCT_ID
-        }
-      };
+          expect(spec.isBidRequestValid(bid)).to.be.true;
+        });
+      });
 
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
-    });
+      it('returns false for invalid guid values', function() {
+        const invalidGUIDs = [
+          undefined,
+          'siab'
+        ];
 
-    it('returns false when product ID not set in params', function() {
-      const invalidBid = {
-        bidder: 'foo',
-        params: {
-          siteId: SITE_ID
-        }
-      };
+        invalidGUIDs.forEach((siteId) => {
+          const bid = {
+            bidder: '33across',
+            params: {
+              siteId
+            }
+          };
 
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+          expect(spec.isBidRequestValid(bid)).to.be.false;
+        });
+      });
     });
-  });
 
-  describe('buildRequests:', function() {
-    context('when element is fully in view', function() {
-      it('returns 100', function() {
-        const ttxRequest = new TtxRequestBuilder()
-          .withViewability({amount: 100})
-          .build();
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
-          .build();
+    context('banner validation', function() {
+      it('returns true when banner mediaType does not exist', function() {
+        const bid = {
+          bidder: '33across',
+          params: {
+            siteId: 'cxBE0qjUir6iopaKkGJozW'
+          }
+        };
 
-        Object.assign(element, { width: 600, height: 400 });
+        expect(spec.isBidRequestValid(bid)).to.be.true;
+      });
+
+      it('returns true when banner sizes are defined', function() {
+        const bid = {
+          bidder: '33across',
+          mediaTypes: {
+            banner: {
+              sizes: [[250, 300]]
+            }
+          },
+          params: {
+            siteId: 'cxBE0qjUir6iopaKkGJozW'
+          }
+        };
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        expect(spec.isBidRequestValid(bid)).to.be.true;
       });
-    });
 
-    context('when element is out of view', function() {
-      it('returns 0', function() {
-        const ttxRequest = new TtxRequestBuilder()
-          .withViewability({amount: 0})
-          .build();
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
-          .build();
+      it('returns false when banner sizes are invalid', function() {
+        const invalidSizes = [
+          undefined,
+          '16:9',
+          300,
+          'foo'
+        ];
 
-        Object.assign(element, { x: -300, y: 0, width: 207, height: 320 });
+        invalidSizes.forEach((sizes) => {
+          const bid = {
+            bidder: '33across',
+            mediaTypes: {
+              banner: {
+                sizes
+              }
+            },
+            params: {
+              siteId: 'cxBE0qjUir6iopaKkGJozW'
+            }
+          };
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+          expect(spec.isBidRequestValid(bid)).to.be.false;
+        });
       });
     });
 
-    context('when element is partially in view', function() {
-      it('returns percentage', function() {
-        const ttxRequest = new TtxRequestBuilder()
-          .withViewability({amount: 75})
-          .build();
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
-          .build();
+    context('video validation', function() {
+      beforeEach(function() {
+        // Basic Valid BidRequest
+        this.bid = {
+          bidder: '33across',
+          mediaTypes: {
+            video: {
+              playerSize: [[300, 50]],
+              context: 'outstream',
+              mimes: ['foo', 'bar'],
+              protocols: [1, 2]
+            }
+          },
+          params: {
+            siteId: `${SITE_ID}`
+          }
+        };
+      });
 
-        Object.assign(element, { width: 800, height: 800 });
+      it('returns true when video mediaType does not exist', function() {
+        const bid = {
+          bidder: '33across',
+          params: {
+            siteId: `${SITE_ID}`
+          }
+        };
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        expect(spec.isBidRequestValid(bid)).to.be.true;
       });
-    });
 
-    context('when width or height of the element is zero', function() {
-      it('try to use alternative values', function() {
-        const ttxRequest = new TtxRequestBuilder()
+      it('returns true when valid video mediaType is defined', function() {
+        expect(spec.isBidRequestValid(this.bid)).to.be.true;
+      });
+
+      it('returns false when video context is not defined', function() {
+        delete this.bid.mediaTypes.video.context;
+
+        expect(spec.isBidRequestValid(this.bid)).to.be.false;
+      });
+
+      it('returns false when video playserSize is invalid', function() {
+        const invalidSizes = [
+          undefined,
+          '16:9',
+          300,
+          'foo'
+        ];
+
+        invalidSizes.forEach((playerSize) => {
+          this.bid.mediaTypes.video.playerSize = playerSize;
+          expect(spec.isBidRequestValid(this.bid)).to.be.false;
+        });
+      });
+
+      it('returns false when video mimes is invalid', function() {
+        const invalidMimes = [
+          undefined,
+          'foo',
+          1,
+          []
+        ]
+
+        invalidMimes.forEach((mimes) => {
+          this.bid.mediaTypes.video.mimes = mimes;
+          expect(spec.isBidRequestValid(this.bid)).to.be.false;
+        })
+      });
+
+      it('returns false when video protocols is invalid', function() {
+        const invalidMimes = [
+          undefined,
+          'foo',
+          1,
+          []
+        ]
+
+        invalidMimes.forEach((protocols) => {
+          this.bid.mediaTypes.video.protocols = protocols;
+          expect(spec.isBidRequestValid(this.bid)).to.be.false;
+        })
+      });
+
+      it('returns false when video placement is invalid', function() {
+        const invalidPlacement = [
+          [],
+          '1',
+          {},
+          'foo'
+        ];
+
+        invalidPlacement.forEach((placement) => {
+          this.bid.mediaTypes.video.placement = placement;
+          expect(spec.isBidRequestValid(this.bid)).to.be.false;
+        });
+      });
+
+      it('returns false when video startdelay is invalid for instream context', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'instream', protocols: [1, 2], mimes: ['foo', 'bar']})
+            .build()
+        );
+
+        const invalidStartdelay = [
+          [],
+          '1',
+          {},
+          'foo'
+        ];
+
+        invalidStartdelay.forEach((startdelay) => {
+          bidRequests[0].mediaTypes.video.startdelay = startdelay;
+          expect(spec.isBidRequestValid(bidRequests[0])).to.be.false;
+        });
+      });
+
+      it('returns true when video startdelay is invalid for outstream context', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream', protocols: [1, 2], mimes: ['foo', 'bar']})
+            .build()
+        );
+
+        const invalidStartdelay = [
+          [],
+          '1',
+          {},
+          'foo'
+        ];
+
+        invalidStartdelay.forEach((startdelay) => {
+          bidRequests[0].mediaTypes.video.startdelay = startdelay;
+          expect(spec.isBidRequestValid(bidRequests[0])).to.be.true;
+        });
+      });
+    })
+  });
+
+  describe('buildRequests:', function() {
+    context('when element is fully in view', function() {
+      it('returns 100', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withViewability({amount: 100})
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        Object.assign(element, { width: 600, height: 400 });
+
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
+      });
+    });
+
+    context('when element is out of view', function() {
+      it('returns 0', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withViewability({amount: 0})
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        Object.assign(element, { x: -300, y: 0, width: 207, height: 320 });
+
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
+      });
+    });
+
+    context('when element is partially in view', function() {
+      it('returns percentage', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withViewability({amount: 75})
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        Object.assign(element, { width: 800, height: 800 });
+
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
+      });
+    });
+
+    context('when width or height of the element is zero', function() {
+      it('try to use alternative values', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withSizes([{ w: 800, h: 2400 }])
           .withViewability({amount: 25})
           .build();
@@ -373,15 +815,18 @@ describe('33acrossBidAdapter:', function () {
           .build();
 
         Object.assign(element, { width: 0, height: 0 });
-        bidRequests[0].sizes = [[800, 2400]];
+        bidRequests[0].mediaTypes.banner.sizes = [[800, 2400]];
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
     context('when nested iframes', function() {
       it('returns \'nm\'', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withViewability({amount: spec.NON_MEASURABLE})
           .build();
         const serverRequest = new ServerRequestBuilder()
@@ -395,13 +840,161 @@ describe('33acrossBidAdapter:', function () {
         sandbox.stub(utils, 'getWindowTop').returns({});
         sandbox.stub(utils, 'getWindowSelf').returns(win);
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
+      });
+
+      context('when all the wrapping windows are accessible', function() {
+        it('returns the viewport dimensions of the top most accessible window', function() {
+          const ttxRequest = new TtxRequestBuilder()
+            .withBanner()
+            .withDevice({
+              ext: {
+                ttx: {
+                  vp: {
+                    w: 6789,
+                    h: 2345
+                  }
+                }
+              }
+            })
+            .withProduct()
+            .build();
+          const serverRequest = new ServerRequestBuilder()
+            .withData(ttxRequest)
+            .build();
+
+          sandbox.stub(win, 'parent').value({
+            document: {
+              documentElement: {
+                clientWidth: 1234,
+                clientHeight: 4567
+              }
+            },
+            parent: {
+              document: {
+                documentElement: {
+                  clientWidth: 6789,
+                  clientHeight: 2345
+                }
+              },
+            }
+          });
+
+          const [ buildRequest ] = spec.buildRequests(bidRequests);
+          validateBuiltServerRequest(buildRequest, serverRequest);
+        });
+      });
+
+      context('when one of the wrapping windows cannot be accessed', function() {
+        it('returns the viewport dimensions of the top most accessible window', function() {
+          const ttxRequest = new TtxRequestBuilder()
+            .withBanner()
+            .withDevice({
+              ext: {
+                ttx: {
+                  vp: {
+                    w: 9876,
+                    h: 5432
+                  }
+                }
+              }
+            })
+            .withProduct()
+            .build();
+          const serverRequest = new ServerRequestBuilder()
+            .withData(ttxRequest)
+            .build();
+          const notAccessibleParentWindow = {};
+
+          Object.defineProperty(notAccessibleParentWindow, 'document', {
+            get() { throw new Error('fakeError'); }
+          });
+
+          sandbox.stub(win, 'parent').value({
+            document: {
+              documentElement: {
+                clientWidth: 1234,
+                clientHeight: 4567
+              }
+            },
+            parent: {
+              parent: notAccessibleParentWindow,
+              document: {
+                documentElement: {
+                  clientWidth: 9876,
+                  clientHeight: 5432
+                }
+              },
+            }
+          });
+
+          const [ buildRequest ] = spec.buildRequests(bidRequests);
+          validateBuiltServerRequest(buildRequest, serverRequest);
+        });
+      });
+    });
+
+    it('returns the screen dimensions', function() {
+      const ttxRequest = new TtxRequestBuilder()
+        .withBanner()
+        .withDevice({
+          ext: {
+            ttx: {
+              w: 1024,
+              h: 728
+            }
+          }
+        })
+        .withProduct()
+        .build();
+      const serverRequest = new ServerRequestBuilder()
+        .withData(ttxRequest)
+        .build();
+
+      win.screen.width = 1024;
+      win.screen.height = 728;
+
+      const [ buildRequest ] = spec.buildRequests(bidRequests);
+
+      validateBuiltServerRequest(buildRequest, serverRequest);
+    });
+
+    context('when the window height is greater than the width', function() {
+      it('returns the smaller screen dimension as the width', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withDevice({
+            ext: {
+              ttx: {
+                w: 728,
+                h: 1024
+              }
+            }
+          })
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        win.screen.width = 1024;
+        win.screen.height = 728;
+
+        win.innerHeight = 728;
+        win.innerWidth = 727;
+
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
     context('when tab is inactive', function() {
       it('returns 0', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withViewability({amount: 0})
           .build();
         const serverRequest = new ServerRequestBuilder()
@@ -414,7 +1007,8 @@ describe('33acrossBidAdapter:', function () {
         win.document.visibilityState = 'hidden';
         sandbox.stub(utils, 'getWindowTop').returns(win);
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
@@ -432,14 +1026,16 @@ describe('33acrossBidAdapter:', function () {
 
       it('returns corresponding server requests with gdpr consent data', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withGdprConsent('foobarMyPreference', 1)
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
       it('returns corresponding test server requests with gdpr consent data', function() {
@@ -450,15 +1046,17 @@ describe('33acrossBidAdapter:', function () {
         });
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withGdprConsent('foobarMyPreference', 1)
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .withUrl('https://foo.com/hb/')
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
@@ -469,283 +1067,818 @@ describe('33acrossBidAdapter:', function () {
         bidderRequest = {};
       });
 
-      it('returns corresponding server requests with default gdpr consent data', function() {
+      it('returns corresponding server requests with default gdpr consent data', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      it('returns corresponding test server requests with default gdpr consent data', function() {
+        sandbox.stub(config, 'getConfig').callsFake(() => {
+          return {
+            'url': 'https://foo.com/hb/'
+          }
+        });
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .withUrl('https://foo.com/hb/')
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when us_privacy consent data exists', function() {
+      let bidderRequest;
+
+      beforeEach(function() {
+        bidderRequest = {
+          uspConsent: 'foo'
+        }
+      });
+
+      it('returns corresponding server requests with us_privacy consent data', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withUspConsent('foo')
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      it('returns corresponding test server requests with us_privacy consent data', function() {
+        sandbox.stub(config, 'getConfig').callsFake(() => {
+          return {
+            'url': 'https://foo.com/hb/'
+          }
+        });
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withUspConsent('foo')
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .withUrl('https://foo.com/hb/')
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when us_privacy consent data does not exist', function() {
+      let bidderRequest;
+
+      beforeEach(function() {
+        bidderRequest = {};
+      });
+
+      it('returns corresponding server requests with default us_privacy data', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      it('returns corresponding test server requests with default us_privacy consent data', function() {
+        sandbox.stub(config, 'getConfig').callsFake(() => {
+          return {
+            'url': 'https://foo.com/hb/'
+          }
+        });
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .withUrl('https://foo.com/hb/')
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when referer value is available', function() {
+      it('returns corresponding server requests with site.page set', function() {
+        const bidderRequest = {
+          refererInfo: {
+            page: 'http://foo.com/bar'
+          }
+        };
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withPageUrl('http://foo.com/bar')
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when Global Placement ID (gpid) is defined', function() {
+      let bidderRequest;
+
+      beforeEach(function() {
+        bidderRequest = {};
+      });
+
+      it('passes the Global Placement ID (gpid) in the request', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withGpid('fakeGPID0')
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        let copyBidRequest = utils.deepClone(bidRequests);
+        const bidRequestsWithGpid = copyBidRequest.map(function(bidRequest, index) {
+          return {
+            ...bidRequest,
+            ortb2Imp: {
+              ext: {
+                gpid: 'fakeGPID' + index
+              }
+            }
+          };
+        });
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequestsWithGpid, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when referer value is not available', function() {
+      it('returns corresponding server requests without site.page set', function() {
+        const bidderRequest = {
+          refererInfo: {}
+        };
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when there is schain object in the bidRequest', function() {
+      it('builds request with schain info in source', function() {
+        const schainValues = [
+          {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'bidderA.com',
+                'sid': '00001',
+                'hp': 1
+              }
+            ]
+          },
+          {
+            'ver': '1.0',
+            'complete': 1,
+          },
+          {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': []
+          },
+          {
+            'ver': '1.0',
+            'complete': '1',
+            'nodes': [
+              {
+                'asi': 'bidderA.com',
+                'sid': '00001',
+                'hp': 1
+              }
+            ]
+          }
+        ];
+
+        schainValues.forEach((schain) => {
+          bidRequests[0].schain = schain;
+
+          const ttxRequest = new TtxRequestBuilder()
+            .withBanner()
+            .withProduct()
+            .withSchain(schain)
+            .build();
+          const serverRequest = new ServerRequestBuilder()
+            .withData(ttxRequest)
+            .build();
+
+          const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+          validateBuiltServerRequest(builtServerRequest, serverRequest);
+        });
+      });
+    });
+
+    context('when there no schain object is passed', function() {
+      it('does not set source field', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .build();
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when price floor module is not enabled for banner in bidRequest', function() {
+      it('does not set any bidfloors in ttxRequest', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when price floor module is enabled for banner in bidRequest', function() {
+      it('does not set any bidfloors in ttxRequest if there is no floor', function() {
+        bidRequests[0].getFloor = () => ({});
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      it('sets bidfloors in ttxRequest if there is a floor', function() {
+        bidRequests[0].getFloor = ({size, currency, mediaType}) => {
+          const floor = (size[0] === 300 && size[1] === 250) ? 1.0 : 0.10
+          return (
+            {
+              floor,
+              currency: 'USD'
+            }
+          );
+        };
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withFormatFloors('banner', [ 1.0, 0.10 ])
+          .build();
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when mediaType has video only and context is instream', function() {
+      it('builds instream request with default params', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'instream'})
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withVideo()
+          .withProduct('instream')
+          .build();
+
+        ttxRequest.imp[0].video.placement = 1;
+        ttxRequest.imp[0].video.startdelay = 0;
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      it('builds instream request with params passed', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'instream', startdelay: -2})
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withVideo({startdelay: -2, placement: 1})
+          .withProduct('instream')
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+      });
+    });
+
+    context('when mediaType has video only and context is outstream', function() {
+      it('builds siab request with video only with default params', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream'})
+            .build()
+        );
+
         const ttxRequest = new TtxRequestBuilder()
+          .withVideo()
+          .withProduct('siab')
           .build();
+
+        ttxRequest.imp[0].video.placement = 2;
+
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
-      it('returns corresponding test server requests with default gdpr consent data', function() {
-        sandbox.stub(config, 'getConfig').callsFake(() => {
-          return {
-            'url': 'https://foo.com/hb/'
-          }
-        });
+      it('builds siab request with video params passed', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream', placement: 3, playbackmethod: [2]})
+            .build()
+        );
 
         const ttxRequest = new TtxRequestBuilder()
+          .withVideo({placement: 3, playbackmethod: [2]})
+          .withProduct('siab')
           .build();
+
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
-          .withUrl('https://foo.com/hb/')
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
-    context('when us_privacy consent data exists', function() {
-      let bidderRequest;
-
-      beforeEach(function() {
-        bidderRequest = {
-          uspConsent: 'foo'
-        }
-      });
+    context('when mediaType has banner only', function() {
+      it('builds default siab request', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withBanner()
+            .build()
+        );
 
-      it('returns corresponding server requests with us_privacy consent data', function() {
         const ttxRequest = new TtxRequestBuilder()
-          .withUspConsent('foo')
+          .withBanner()
+          .withProduct('siab')
           .build();
+
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
-      it('returns corresponding test server requests with us_privacy consent data', function() {
-        sandbox.stub(config, 'getConfig').callsFake(() => {
-          return {
-            'url': 'https://foo.com/hb/'
-          }
-        });
+      it('builds default inview request when product is set as such', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withBanner()
+            .withProduct('inview')
+            .build()
+        );
 
         const ttxRequest = new TtxRequestBuilder()
-          .withUspConsent('foo')
+          .withBanner()
+          .withProduct('inview')
           .build();
+
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
-          .withUrl('https://foo.com/hb/')
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
-    context('when us_privacy consent data does not exist', function() {
-      let bidderRequest;
-
-      beforeEach(function() {
-        bidderRequest = {};
-      });
+    context('when mediaType has banner and video', function() {
+      it('builds siab request with banner and outstream video', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withBanner()
+            .withVideo({context: 'outstream'})
+            .build()
+        );
 
-      it('returns corresponding server requests with default us_privacy data', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withVideo()
+          .withProduct('siab')
           .build();
+
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
-      it('returns corresponding test server requests with default us_privacy consent data', function() {
-        sandbox.stub(config, 'getConfig').callsFake(() => {
-          return {
-            'url': 'https://foo.com/hb/'
-          }
-        });
+      it('builds siab request with banner and outstream video even when context is instream', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withBanner()
+            .withVideo({context: 'instream'})
+            .build()
+        );
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withVideo()
+          .withProduct('siab')
           .build();
+
+        ttxRequest.imp[0].video.placement = 2;
+
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
-          .withUrl('https://foo.com/hb/')
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
-    context('when referer value is available', function() {
-      it('returns corresponding server requests with site.page set', function() {
-        const bidderRequest = {
-          refererInfo: {
-            referer: 'http://foo.com/bar'
-          }
-        };
+    context('when price floor module is enabled for video in bidRequest', function() {
+      it('does not set any bidfloors in video if there is no floor', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream'})
+            .build()
+        );
+
+        bidRequests[0].getFloor = () => ({});
 
         const ttxRequest = new TtxRequestBuilder()
-          .withPageUrl('http://foo.com/bar')
-          .build();
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
+          .withVideo()
+          .withProduct()
           .build();
 
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
       });
-    });
 
-    context('when referer value is not available', function() {
-      it('returns corresponding server requests without site.page set', function() {
-        const bidderRequest = {
-          refererInfo: {}
+      it('sets bidfloors in video if there is a floor', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream'})
+            .build()
+        );
+
+        bidRequests[0].getFloor = ({size, currency, mediaType}) => {
+          const floor = (mediaType === 'video') ? 1.0 : 0.10
+          return (
+            {
+              floor,
+              currency: 'USD'
+            }
+          );
         };
 
         const ttxRequest = new TtxRequestBuilder()
-          .build();
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
+          .withVideo()
+          .withProduct()
+          .withFloors('video', [ 1.0 ])
           .build();
 
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
       });
     });
 
-    context('when there is schain object in the bidRequest', function() {
-      it('builds request with schain info in source', function() {
-        const schainValues = [
+    context('when user ID data exists as userIdAsEids Array in bidRequest', function() {
+      it('passes userIds in eids field in ORTB request', function() {
+        const eids = [
           {
-            'ver': '1.0',
-            'complete': 1,
-            'nodes': [
+            'source': 'x-device-vendor-x.com',
+            'uids': [
               {
-                'asi': 'bidderA.com',
-                'sid': '00001',
-                'hp': 1
-              }
-            ]
-          },
-          {
-            'ver': '1.0',
-            'complete': 1,
-          },
-          {
-            'ver': '1.0',
-            'complete': 1,
-            'nodes': []
-          },
-          {
-            'ver': '1.0',
-            'complete': '1',
-            'nodes': [
+                'id': 'yyy',
+                'atype': 1
+              },
               {
-                'asi': 'bidderA.com',
-                'sid': '00001',
-                'hp': 1
+                'id': 'zzz',
+                'atype': 1
+              },
+              {
+                'id': 'DB700403-9A24-4A4B-A8D5-8A0B4BE777D2',
+                'atype': 2
               }
-            ]
+            ],
+            'ext': {
+              'foo': 'bar'
+            }
           }
         ];
 
-        schainValues.forEach((schain) => {
-          bidRequests[0].schain = schain;
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withUserIds(eids)
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withUserIds(eids)
+          .withProduct()
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+      });
+
+      it('does not validate eids ORTB', function() {
+        const eids = [1, 2, 3];
+
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withUserIds(eids)
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withUserIds(eids)
+          .withProduct()
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+      });
+    });
+
+    context('when user IDs do not exist under the userIdAsEids field in bidRequest as a non-empty Array', function() {
+      it('does not pass user IDs in the bidRequest ORTB', function() {
+        const eidsScenarios = [
+          'foo',
+          [],
+          {foo: 1}
+        ];
+
+        eidsScenarios.forEach((eids) => {
+          const bidRequests = (
+            new BidRequestsBuilder()
+              .withUserIds(eids)
+              .build()
+          );
+          bidRequests.userId = {
+            'vendorx': {
+              'source': 'x-device-vendor-x.com',
+              'uids': [
+                {
+                  'id': 'yyy',
+                  'atype': 1
+                },
+                {
+                  'id': 'zzz',
+                  'atype': 1
+                },
+                {
+                  'id': 'DB700403-9A24-4A4B-A8D5-8A0B4BE777D2',
+                  'atype': 2
+                }
+              ],
+              'ext': {
+                'foo': 'bar'
+              }
+            }
+          };
 
           const ttxRequest = new TtxRequestBuilder()
-            .withSchain(schain)
-            .build();
-          const serverRequest = new ServerRequestBuilder()
-            .withData(ttxRequest)
+            .withProduct()
             .build();
 
-          const builtServerRequests = spec.buildRequests(bidRequests, {});
+          const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-          expect(builtServerRequests).to.deep.equal([serverRequest]);
+          expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
         });
       });
     });
 
-    context('when there no schain object is passed', function() {
-      it('does not set source field', function() {
-        const ttxRequest = new TtxRequestBuilder()
+    context('when SRA mode is enabled', function() {
+      it('builds a single request with multiple imps corresponding to each group {siteId, productId}', function() {
+        sandbox.stub(config, 'getConfig').callsFake(() => {
+          return {
+            enableSRAMode: true
+          }
+        });
+
+        const bidRequests = new BidRequestsBuilder()
+          .addBid()
+          .addBid({
+            bidId: 'b3',
+            adUnitCode: 'div-id',
+            params: {
+              siteId: 'sample33xGUID123456780',
+              productId: 'siab'
+            }
+          })
+          .addBid({
+            bidId: 'b4',
+            adUnitCode: 'div-id',
+            params: {
+              siteId: 'sample33xGUID123456780',
+              productId: 'inview'
+            }
+          })
+          .withBanner()
+          .withVideo({context: 'outstream'})
           .build();
 
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
+        const req1 = new TtxRequestBuilder()
+          .addImp()
+          .withProduct('siab')
+          .withBanner()
+          .withVideo()
           .build();
 
-        const builtServerRequests = spec.buildRequests(bidRequests, {});
+        const req2 = new TtxRequestBuilder('sample33xGUID123456780')
+          .withProduct('siab')
+          .withBanner()
+          .withVideo()
+          .build();
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
-      });
-    });
+        req2.imp[0].id = 'b3';
 
-    context('when price floor module is not enabled in bidRequest', function() {
-      it('does not set any bidfloors in ttxRequest', function() {
-        const ttxRequest = new TtxRequestBuilder()
+        const req3 = new TtxRequestBuilder('sample33xGUID123456780')
+          .withProduct('inview')
+          .withBanner()
+          .withVideo()
           .build();
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
+
+        req3.imp[0].id = 'b4';
+
+        const serverReq1 = new ServerRequestBuilder()
+          .withData(req1)
+          .build();
+
+        const serverReq2 = new ServerRequestBuilder()
+          .withData(req2)
+          .withUrl('https://ssc.33across.com/api/v1/hb?guid=sample33xGUID123456780')
           .build();
+
+        const serverReq3 = new ServerRequestBuilder()
+          .withData(req3)
+          .withUrl('https://ssc.33across.com/api/v1/hb?guid=sample33xGUID123456780')
+          .build();
+
         const builtServerRequests = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        expect(builtServerRequests).to.deep.equal([serverReq1, serverReq2, serverReq3]);
       });
     });
 
-    context('when price floor module is enabled in bidRequest', function() {
-      it('does not set any bidfloors in ttxRequest if there is no floor', function() {
-        bidRequests[0].getFloor = () => ({});
+    context('when SRA mode is not enabled', function() {
+      it('builds multiple requests, one corresponding to each Ad Unit', function() {
+        const bidRequests = new BidRequestsBuilder()
+          .addBid()
+          .addBid({
+            bidId: 'b3',
+            adUnitCode: 'div-id',
+            params: {
+              siteId: 'sample33xGUID123456780',
+              productId: 'siab'
+            }
+          })
+          .withBanner()
+          .withVideo({context: 'outstream'})
+          .build();
 
-        const ttxRequest = new TtxRequestBuilder()
+        const req1 = new TtxRequestBuilder()
+          .withProduct('siab')
+          .withBanner()
+          .withVideo()
           .build();
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
+
+        const req2 = new TtxRequestBuilder()
+          .withProduct('siab')
+          .withBanner()
+          .withVideo()
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
-      });
+        req2.imp[0].id = 'b2';
 
-      it('sets bidfloors in ttxRequest if there is a floor', function() {
-        bidRequests[0].getFloor = ({size, currency, mediaType}) => {
-          const floor = (size[0] === 300 && size[1] === 250) ? 1.0 : 0.10
-          return (
-            {
-              floor,
-              currency: 'USD'
-            }
-          );
-        };
+        const req3 = new TtxRequestBuilder('sample33xGUID123456780')
+          .withProduct('siab')
+          .withBanner()
+          .withVideo()
+          .build();
 
-        const ttxRequest = new TtxRequestBuilder()
-          .withFormatFloors([ 1.0, 0.10 ])
+        req3.imp[0].id = 'b3';
+
+        const serverReq1 = new ServerRequestBuilder()
+          .withData(req1)
           .build();
 
-        const serverRequest = new ServerRequestBuilder()
-          .withData(ttxRequest)
+        const serverReq2 = new ServerRequestBuilder()
+          .withData(req2)
           .build();
+
+        const serverReq3 = new ServerRequestBuilder()
+          .withData(req3)
+          .withUrl('https://ssc.33across.com/api/v1/hb?guid=sample33xGUID123456780')
+          .build();
+
         const builtServerRequests = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        expect(builtServerRequests)
+          .to.deep.equal([
+            serverReq1,
+            serverReq2,
+            serverReq3
+          ]);
       });
     });
   });
 
   describe('interpretResponse', function() {
     let ttxRequest, serverRequest;
+    const videoBid = '<VAST version="3.0"><Ad></Ad></VAST>';
 
     beforeEach(function() {
       ttxRequest = new TtxRequestBuilder()
+        .withBanner()
+        .withProduct()
         .withSite({
           id: SITE_ID,
           page: 'https://test-url.com'
         })
         .build();
+
       serverRequest = new ServerRequestBuilder()
         .withUrl('https://staging-ssc.33across.com/api/v1/hb')
         .withData(ttxRequest)
@@ -757,20 +1890,22 @@ describe('33acrossBidAdapter:', function () {
     });
 
     context('when exactly one bid is returned', function() {
-      it('interprets and returns the single bid response', function() {
+      it('interprets and returns the single banner bid response', function() {
         const serverResponse = {
           cur: 'USD',
           ext: {},
-          id: 'b1',
+          id: 'r1',
           seatbid: [
             {
               bid: [{
                 id: '1',
+                impid: 'b1',
                 adm: '<html><h3>I am an ad</h3></html>',
                 crid: 1,
                 h: 250,
                 w: 300,
-                price: 0.0938
+                price: 0.0938,
+                adomain: ['advertiserdomain.com']
               }]
             }
           ]
@@ -784,12 +1919,104 @@ describe('33acrossBidAdapter:', function () {
           ad: '<html><h3>I am an ad</h3></html>',
           ttl: 60,
           creativeId: 1,
+          mediaType: 'banner',
+          currency: 'USD',
+          netRevenue: true,
+          meta: {
+            advertiserDomains: ['advertiserdomain.com']
+          }
+        };
+
+        expect(spec.interpretResponse({ body: serverResponse }, serverRequest)).to.deep.equal([bidResponse]);
+      });
+
+      it('interprets and returns the single video bid response', function() {
+        const serverResponse = {
+          cur: 'USD',
+          ext: {},
+          id: 'r1',
+          seatbid: [
+            {
+              bid: [{
+                id: '1',
+                impid: 'b1',
+                adm: videoBid,
+                ext: {
+                  ttx: {
+                    mediaType: 'video',
+                    vastType: 'xml'
+                  }
+                },
+                crid: 1,
+                h: 250,
+                w: 300,
+                price: 0.0938,
+                adomain: ['advertiserdomain.com']
+              }]
+            }
+          ]
+        };
+        const bidResponse = {
+          requestId: 'b1',
+          bidderCode: BIDDER_CODE,
+          cpm: 0.0938,
+          width: 300,
+          height: 250,
+          ad: videoBid,
+          ttl: 60,
+          creativeId: 1,
+          mediaType: 'video',
           currency: 'USD',
-          netRevenue: true
+          netRevenue: true,
+          vastXml: videoBid,
+          meta: {
+            advertiserDomains: ['advertiserdomain.com']
+          }
         };
 
         expect(spec.interpretResponse({ body: serverResponse }, serverRequest)).to.deep.equal([bidResponse]);
       });
+
+      context('when the list of advertiser domains for block list checking is empty', function() {
+        it('doesn\'t include the empty list in the interpreted response', function() {
+          const serverResponse = {
+            cur: 'USD',
+            ext: {},
+            id: 'b1',
+            seatbid: [
+              {
+                bid: [{
+                  id: '1',
+                  impid: 'b1',
+                  adm: '<html><h3>I am an ad</h3></html>',
+                  crid: 1,
+                  h: 250,
+                  w: 300,
+                  price: 0.0938,
+                  adomain: [] // Empty list
+                }]
+              }
+            ]
+          };
+
+          // Bid response below doesn't contain meta.advertiserDomains
+          const bidResponse = {
+            requestId: 'b1',
+            bidderCode: BIDDER_CODE,
+            cpm: 0.0938,
+            width: 300,
+            height: 250,
+            ad: '<html><h3>I am an ad</h3></html>',
+            ttl: 60,
+            creativeId: 1,
+            mediaType: 'banner',
+            currency: 'USD',
+            netRevenue: true
+          };
+
+          expect(spec.interpretResponse({ body: serverResponse }, serverRequest)).to.deep.equal([bidResponse]);
+        });
+      });
     });
 
     context('when no bids are returned', function() {
@@ -797,7 +2024,7 @@ describe('33acrossBidAdapter:', function () {
         const serverResponse = {
           cur: 'USD',
           ext: {},
-          id: 'b1',
+          id: 'r1',
           seatbid: []
         };
 
@@ -806,15 +2033,16 @@ describe('33acrossBidAdapter:', function () {
     });
 
     context('when more than one bids are returned', function() {
-      it('interprets and returns the the first bid of the first seatbid', function() {
+      it('interprets and returns all bids', function() {
         const serverResponse = {
           cur: 'USD',
           ext: {},
-          id: 'b1',
+          id: 'r1',
           seatbid: [
             {
               bid: [{
                 id: '1',
+                impid: 'b1',
                 adm: '<html><h3>I am an ad</h3></html>',
                 crid: 1,
                 h: 250,
@@ -823,6 +2051,7 @@ describe('33acrossBidAdapter:', function () {
               },
               {
                 id: '2',
+                impid: 'b2',
                 adm: '<html><h3>I am an ad</h3></html>',
                 crid: 2,
                 h: 250,
@@ -834,7 +2063,14 @@ describe('33acrossBidAdapter:', function () {
             {
               bid: [{
                 id: '3',
-                adm: '<html><h3>I am an ad</h3></html>',
+                impid: 'b3',
+                adm: videoBid,
+                ext: {
+                  ttx: {
+                    mediaType: 'video',
+                    vastType: 'xml'
+                  }
+                },
                 crid: 3,
                 h: 250,
                 w: 300,
@@ -843,20 +2079,50 @@ describe('33acrossBidAdapter:', function () {
             }
           ]
         };
-        const bidResponse = {
-          requestId: 'b1',
-          bidderCode: BIDDER_CODE,
-          cpm: 0.0940,
-          width: 300,
-          height: 250,
-          ad: '<html><h3>I am an ad</h3></html>',
-          ttl: 60,
-          creativeId: 1,
-          currency: 'USD',
-          netRevenue: true
-        };
+        const bidResponse = [
+          {
+            requestId: 'b1',
+            bidderCode: BIDDER_CODE,
+            cpm: 0.0940,
+            width: 300,
+            height: 250,
+            ad: '<html><h3>I am an ad</h3></html>',
+            ttl: 60,
+            creativeId: 1,
+            mediaType: 'banner',
+            currency: 'USD',
+            netRevenue: true
+          },
+          {
+            requestId: 'b2',
+            bidderCode: BIDDER_CODE,
+            cpm: 0.0938,
+            width: 300,
+            height: 250,
+            ad: '<html><h3>I am an ad</h3></html>',
+            ttl: 60,
+            creativeId: 2,
+            mediaType: 'banner',
+            currency: 'USD',
+            netRevenue: true
+          },
+          {
+            requestId: 'b3',
+            bidderCode: BIDDER_CODE,
+            cpm: 0.0938,
+            width: 300,
+            height: 250,
+            ad: videoBid,
+            vastXml: '<VAST version=\"3.0\"><Ad></Ad></VAST>',
+            ttl: 60,
+            creativeId: 3,
+            mediaType: 'video',
+            currency: 'USD',
+            netRevenue: true
+          }
+        ];
 
-        expect(spec.interpretResponse({ body: serverResponse }, serverRequest)).to.deep.equal([bidResponse]);
+        expect(spec.interpretResponse({ body: serverResponse }, serverRequest)).to.deep.equal(bidResponse);
       });
     });
   });
@@ -886,9 +2152,13 @@ describe('33acrossBidAdapter:', function () {
           },
           adUnitCode: 'div-id',
           auctionId: 'r1',
-          sizes: [
-            [300, 250]
-          ],
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250]
+              ]
+            }
+          },
           transactionId: 't1'
         },
         {
@@ -901,9 +2171,13 @@ describe('33acrossBidAdapter:', function () {
           },
           adUnitCode: 'div-id',
           auctionId: 'r1',
-          sizes: [
-            [300, 250]
-          ],
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250]
+              ]
+            }
+          },
           transactionId: 't2'
         }
       ];
diff --git a/test/spec/modules/33acrossIdSystem_spec.js b/test/spec/modules/33acrossIdSystem_spec.js
new file mode 100644
index 00000000000..765b320f925
--- /dev/null
+++ b/test/spec/modules/33acrossIdSystem_spec.js
@@ -0,0 +1,416 @@
+import { thirthyThreeAcrossIdSubmodule } from 'modules/33acrossIdSystem.js';
+import * as utils from 'src/utils.js';
+
+import { server } from 'test/mocks/xhr.js';
+import { uspDataHandler } from 'src/adapterManager.js';
+
+describe('33acrossIdSystem', () => {
+  describe('name', () => {
+    it('should expose the name of the submodule', () => {
+      expect(thirthyThreeAcrossIdSubmodule.name).to.equal('33acrossId');
+    });
+  });
+
+  describe('gvlid', () => {
+    it('should expose the vendor id', () => {
+      expect(thirthyThreeAcrossIdSubmodule.gvlid).to.equal(58);
+    });
+  });
+
+  describe('getId', () => {
+    it('should call endpoint and handle valid response', () => {
+      const completeCallback = sinon.spy();
+
+      const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+        params: {
+          pid: '12345'
+        }
+      });
+
+      callback(completeCallback);
+
+      const [request] = server.requests;
+
+      request.respond(200, {
+        'Content-Type': 'application/json'
+      }, JSON.stringify({
+        succeeded: true,
+        data: {
+          envelope: 'foo'
+        },
+        expires: 1645667805067
+      }));
+
+      expect(request.method).to.equal('GET');
+      expect(request.withCredentials).to.be.true;
+
+      const regExp = new RegExp('https://lexicon.33across.com/v1/envelope\\?pid=12345&gdpr=\\d&src=pbjs&ver=$prebid.version$');
+
+      expect(request.url).to.match(regExp);
+      expect(completeCallback.calledOnceWithExactly('foo')).to.be.true;
+    });
+
+    context('when GDPR applies', () => {
+      it('should call endpoint with \'gdpr=1\'', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        }, {
+          gdprApplies: true
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).to.contain('gdpr=1');
+      });
+
+      context('and the consent string is given', () => {
+        it('should call endpoint with the GDPR consent string', () => {
+          [
+            { consentString: '', expected: '' },
+            { consentString: undefined, expected: '' },
+            { consentString: 'foo', expected: 'foo' }
+          ].forEach(({ consentString, expected }, index) => {
+            const completeCallback = () => {};
+            const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+              params: {
+                pid: '12345'
+              }
+            }, {
+              gdprApplies: true,
+              consentString
+            });
+
+            callback(completeCallback);
+
+            expect(server.requests[index].url).to.contain(`gdpr_consent=${expected}`);
+          });
+        });
+      });
+    });
+
+    context('when GDPR doesn\'t apply', () => {
+      it('should call endpoint with \'gdpr=0\' and no GDPR consent string parameter', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        }, {
+          gdprApplies: false,
+          consentString: 'foo'
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).to.contain('gdpr=0');
+        expect(request.url).not.to.contain('gdpr_consent');
+      });
+    });
+
+    context('when a valid US Privacy string is given', () => {
+      it('should call endpoint with the US Privacy parameter', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        sinon.stub(uspDataHandler, 'getConsentData').returns('1YYY');
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).to.contain('us_privacy=1YYY');
+
+        uspDataHandler.getConsentData.restore();
+      });
+    });
+
+    context('when an invalid US Privacy is given', () => {
+      it('should call endpoint without the US Privacy parameter', () => {
+        const completeCallback = () => {};
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        // null or any other falsy value is considered invalid.
+        sinon.stub(uspDataHandler, 'getConsentData').returns(null);
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        expect(request.url).not.to.contain('us_privacy');
+
+        uspDataHandler.getConsentData.restore();
+      });
+    });
+
+    context('when the partner ID is not given', () => {
+      it('should log an error', () => {
+        const logErrorSpy = sinon.spy(utils, 'logError');
+
+        thirthyThreeAcrossIdSubmodule.getId({
+          params: { /* No 'pid' param */ }
+        });
+
+        expect(logErrorSpy.calledOnceWithExactly('33acrossId: Submodule requires a partner ID to be defined')).to.be.true;
+
+        logErrorSpy.restore();
+      });
+    });
+
+    context('when the partner ID has an incorrect format', () => {
+      it('should log an error', () => {
+        const logErrorSpy = sinon.spy(utils, 'logError');
+
+        thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: 123456 // PID must be a string
+          }
+        });
+
+        expect(logErrorSpy.calledOnceWithExactly('33acrossId: Submodule requires a partner ID to be defined')).to.be.true;
+
+        logErrorSpy.restore();
+      });
+    });
+
+    context('when the server JSON is invalid', () => {
+      it('should log an error', () => {
+        const logErrorSpy = sinon.spy(utils, 'logError');
+        const completeCallback = () => {};
+
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(200, {
+          'Content-Type': 'application/json'
+        }, 'invalid response');
+
+        expect(logErrorSpy.lastCall.args[0]).to.eq(`${thirthyThreeAcrossIdSubmodule.name}: ID reading error:`);
+
+        logErrorSpy.restore();
+      });
+
+      it('should execute complete callback with undefined value', () => {
+        const completeCallback = sinon.spy();
+
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(200, {
+          'Content-Type': 'application/json'
+        }, 'invalid response');
+
+        expect(completeCallback.calledOnceWithExactly(undefined)).to.be.true;
+      });
+    });
+
+    context('when an endpoint override is given', () => {
+      it('should call that endpoint', () => {
+        const completeCallback = sinon.spy();
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345',
+            apiUrl: 'https://staging-lexicon.33across.com/v1/envelope'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(200, {
+          'Content-Type': 'application/json'
+        }, JSON.stringify({
+          succeeded: true,
+          data: {
+            envelope: 'foo'
+          },
+          expires: 1645667805067
+        }));
+
+        expect(request.url).to.contain('https://staging-lexicon.33across.com/v1/envelope?pid=12345');
+      });
+    });
+
+    context('when the server returns an unsuccessful response', () => {
+      it('should log an error', () => {
+        const logErrorSpy = sinon.spy(utils, 'logError');
+        const completeCallback = () => {};
+
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(200, {
+          'Content-Type': 'application/json'
+        }, JSON.stringify({
+          succeeded: false,
+          error: 'foo'
+        }));
+
+        expect(logErrorSpy.calledOnceWithExactly(`${thirthyThreeAcrossIdSubmodule.name}: Unsuccessful response`)).to.be.true;
+
+        logErrorSpy.restore();
+      });
+
+      it('should execute complete callback with undefined value', () => {
+        const completeCallback = sinon.spy();
+
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(200, {
+          'Content-Type': 'application/json'
+        }, JSON.stringify({
+          succeeded: false,
+          error: 'foo'
+        }));
+
+        expect(completeCallback.calledOnceWithExactly(undefined)).to.be.true;
+      });
+    });
+
+    context('when the server returns a successful response but without ID', () => {
+      it('should log a message', () => {
+        const logMessageSpy = sinon.spy(utils, 'logMessage');
+        const completeCallback = () => {};
+
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(200, {
+          'Content-Type': 'application/json'
+        }, JSON.stringify({
+          succeeded: true,
+          data: {}
+        }));
+
+        expect(logMessageSpy.calledOnceWithExactly(`${thirthyThreeAcrossIdSubmodule.name}: No envelope was received`)).to.be.true;
+
+        logMessageSpy.restore();
+      });
+
+      it('should execute complete callback with undefined value', () => {
+        const completeCallback = sinon.spy();
+
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(200, {
+          'Content-Type': 'application/json'
+        }, JSON.stringify({
+          succeeded: true,
+          data: {}
+        }));
+
+        expect(completeCallback.calledOnceWithExactly(undefined)).to.be.true;
+      });
+    });
+
+    context('when the server returns an error status code', () => {
+      it('should log an error', () => {
+        const logErrorSpy = sinon.spy(utils, 'logError');
+        const completeCallback = () => {};
+
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(404);
+
+        expect(logErrorSpy.calledOnceWithExactly(`${thirthyThreeAcrossIdSubmodule.name}: ID error response`, 'Not Found')).to.be.true;
+
+        logErrorSpy.restore();
+      });
+
+      it('should execute complete callback without any value', () => {
+        const completeCallback = sinon.spy();
+
+        const { callback } = thirthyThreeAcrossIdSubmodule.getId({
+          params: {
+            pid: '12345'
+          }
+        });
+
+        callback(completeCallback);
+
+        const [request] = server.requests;
+
+        request.respond(404);
+
+        expect(completeCallback.calledOnceWithExactly()).to.be.true;
+      });
+    })
+  })
+
+  describe('decode', () => {
+    it('should wrap the given value inside an object literal', () => {
+      expect(thirthyThreeAcrossIdSubmodule.decode('foo')).to.deep.equal({
+        [thirthyThreeAcrossIdSubmodule.name]: {
+          envelope: 'foo'
+        }
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/7xbidBidAdapter_spec.js b/test/spec/modules/7xbidBidAdapter_spec.js
deleted file mode 100644
index bed2c604349..00000000000
--- a/test/spec/modules/7xbidBidAdapter_spec.js
+++ /dev/null
@@ -1,160 +0,0 @@
-import {expect} from 'chai';
-import {spec, _getUrlVars} from 'modules/7xbidBidAdapter.js';
-import * as utils from 'src/utils.js';
-
-const BASE_URI = '//bidder.7xbid.com/api/v1/prebid/banner'
-const NATIVE_BASE_URI = '//bidder.7xbid.com/api/v1/prebid/native'
-
-describe('7xbid adapter', function() {
-  let bidRequests;
-  let nativeBidRequests;
-
-  beforeEach(function() {
-    bidRequests = [
-      {
-        bidder: '7xbid',
-        params: {
-          placementId: 1425292,
-          currency: 'USD'
-        }
-      }
-    ]
-
-    nativeBidRequests = [
-      {
-        bidder: '7xbid',
-        params: {
-          placementId: 1429695,
-          currency: 'USD'
-        },
-        nativeParams: {
-          title: {
-            required: true,
-            len: 80
-          },
-          image: {
-            required: true,
-            sizes: [150, 50]
-          },
-          sponsoredBy: {
-            required: true
-          }
-        }
-      }
-    ]
-  })
-  describe('isBidRequestValid', function () {
-    it('valid bid case', function () {
-      let validBid = {
-        bidder: '7xbid',
-        params: {
-          placementId: 1425292,
-          currency: 'USD'
-        }
-      }
-      let isValid = spec.isBidRequestValid(validBid);
-      expect(isValid).to.equal(true);
-    });
-
-    it('invalid bid case: placementId is not passed', function() {
-      let validBid = {
-        bidder: '7xbid',
-        params: {
-        }
-      }
-      let isValid = spec.isBidRequestValid(validBid);
-      expect(isValid).to.equal(false);
-    })
-
-    it('invalid bid case: currency is not support', function() {
-      let validBid = {
-        bidder: '7xbid',
-        params: {
-          placementId: 1108295,
-          currency: 'AUD'
-        }
-      }
-      let isValid = spec.isBidRequestValid(validBid);
-      expect(isValid).to.equal(false);
-    })
-  })
-
-  describe('buildRequests', function () {
-    it('sends bid request to ENDPOINT via GET', function () {
-      const request = spec.buildRequests(bidRequests)[0];
-      expect(request.url).to.equal(BASE_URI);
-      expect(request.method).to.equal('GET');
-    });
-
-    it('sends native bid request to ENDPOINT via GET', function () {
-      const request = spec.buildRequests(nativeBidRequests)[0];
-      expect(request.url).to.equal(NATIVE_BASE_URI);
-      expect(request.method).to.equal('GET');
-    });
-
-    it('buildRequests function should not modify original bidRequests object', function () {
-      let originalBidRequests = utils.deepClone(bidRequests);
-      let request = spec.buildRequests(bidRequests);
-      expect(bidRequests).to.deep.equal(originalBidRequests);
-    });
-
-    it('buildRequests function should not modify original nativeBidRequests object', function () {
-      let originalBidRequests = utils.deepClone(nativeBidRequests);
-      let request = spec.buildRequests(nativeBidRequests);
-      expect(nativeBidRequests).to.deep.equal(originalBidRequests);
-    });
-
-    it('Request params check', function() {
-      let request = spec.buildRequests(bidRequests)[0];
-      const data = _getUrlVars(request.data)
-      expect(parseInt(data.placementid)).to.exist.and.to.equal(bidRequests[0].params.placementId);
-      expect(data.cur).to.exist.and.to.equal(bidRequests[0].params.currency);
-    })
-
-    it('Native request params check', function() {
-      let request = spec.buildRequests(nativeBidRequests)[0];
-      const data = _getUrlVars(request.data)
-      expect(parseInt(data.placementid)).to.exist.and.to.equal(nativeBidRequests[0].params.placementId);
-      expect(data.cur).to.exist.and.to.equal(nativeBidRequests[0].params.currency);
-    })
-  })
-
-  describe('interpretResponse', function () {
-    let response = {
-      1425292:
-      {
-        'creativeId': '<!-- CREATIVE ID -->',
-        'cur': 'USD',
-        'price': 0.0920,
-        'width': 300,
-        'height': 250,
-        'requestid': '2e42361a6172bf',
-        'adm': '<!-- ADS TAG -->'
-      }
-    }
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {
-          'requestId': '2e42361a6172bf',
-          'cpm': 0.0920,
-          'width': 300,
-          'height': 250,
-          'netRevenue': true,
-          'currency': 'USD',
-          'creativeId': '<!-- CREATIVE ID -->',
-          'ttl': 700,
-          'ad': '<!-- ADS TAG -->'
-        }
-      ];
-      let request = spec.buildRequests(bidRequests)[0];
-      let result = spec.interpretResponse({body: response}, request);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
-      expect(result[0].cpm).to.not.equal(null);
-      expect(result[0].creativeId).to.not.equal(null);
-      expect(result[0].ad).to.not.equal(null);
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].netRevenue).to.equal(true);
-    });
-  })
-})
diff --git a/test/spec/modules/ViouslyBidAdapter_spec.js b/test/spec/modules/ViouslyBidAdapter_spec.js
new file mode 100644
index 00000000000..612c5f87138
--- /dev/null
+++ b/test/spec/modules/ViouslyBidAdapter_spec.js
@@ -0,0 +1,378 @@
+import {expect} from 'chai';
+
+import { deepClone, mergeDeep } from 'src/utils';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+import {spec as adapter} from 'modules/viouslyBidAdapter';
+
+import sinon from 'sinon';
+import { config } from 'src/config.js';
+
+const CURRENCY = 'EUR';
+const TTL = 60;
+const HTTP_METHOD = 'POST';
+const REQUEST_URL = 'https://bidder.viously.com/bid';
+
+const VALID_BID_VIDEO = {
+  bidder: 'viously',
+  bidId: '5e6f7g8h',
+  adUnitCode: 'id-5678',
+  params: {
+    pid: '123e4567-e89b-12d3-a456-426614174001'
+  },
+  mediaTypes: {
+    video: {
+      playerSize: [640, 360],
+      context: 'instream',
+      playbackmethod: [1, 2, 3, 4]
+    }
+  }
+};
+
+const VALID_REQUEST_VIDEO = {
+  method: HTTP_METHOD,
+  url: REQUEST_URL,
+  data: {
+    pid: '123e4567-e89b-12d3-a456-426614174001',
+    currency_code: CURRENCY,
+    placements: [
+      {
+        id: 'id-5678',
+        bid_id: '5e6f7g8h',
+        video_params: {
+          context: 'instream',
+          playbackmethod: [1, 2, 3, 4],
+          size: ['640x360']
+        }
+      }
+    ]
+  }
+};
+
+const VALID_GDPR = {
+  gdprApplies: true,
+  apiVersion: 2,
+  consentString: 'abcdefgh',
+  addtlConsent: '1~12345678',
+  vendorData: {
+    purpose: {
+      consents: {
+        1: true
+      }
+    }
+  }
+};
+const US_PRIVACY = '1YNN';
+
+describe('ViouslyAdapter', function () {
+  describe('isBidRequestValid', function () {
+    describe('Check method return', function () {
+      it('should return true', function () {
+        expect(adapter.isBidRequestValid(VALID_BID_VIDEO)).to.equal(true);
+      });
+
+      it('should return false because the pid is missing', function () {
+        let wrongBid = deepClone(VALID_BID_VIDEO);
+        delete wrongBid.params.pid;
+
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+      });
+
+      it('should return false because the video context parameter is missing', function () {
+        let wrongBid = deepClone(VALID_BID_VIDEO);
+
+        delete wrongBid.mediaTypes.video.context;
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+      });
+    });
+  });
+
+  describe('buildRequests', function () {
+    describe('Check method return', function () {
+      it('should return the right formatted video requests', function() {
+        expect(adapter.buildRequests([VALID_BID_VIDEO])).to.deep.equal(VALID_REQUEST_VIDEO);
+      });
+
+      it('should return the right formatted request with the referer info', function() {
+        let bidderRequest = {
+          refererInfo: {
+            page: 'https://www.example.com/test'
+          }
+        };
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            domain: 'www.example.com',
+            page_domain: 'https://www.example.com/test'
+          }
+        });
+
+        expect(adapter.buildRequests([VALID_BID_VIDEO], bidderRequest)).to.deep.equal(requests);
+      });
+
+      it('should return the right formatted request with the referer info from config', function() {
+        /** Mock the config.getConfig method */
+        sinon.stub(config, 'getConfig')
+          .withArgs('pageUrl')
+          .returns('https://www.example.com/page');
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            domain: 'www.example.com',
+            page_domain: 'https://www.example.com/page'
+          }
+        });
+
+        expect(adapter.buildRequests([VALID_BID_VIDEO])).to.deep.equal(requests);
+
+        config.getConfig.restore();
+      });
+
+      it('should return the right formatted request with GDPR Consent info', function() {
+        let bidderRequest = {
+          gdprConsent: VALID_GDPR
+        };
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            gdpr: true,
+            gdpr_consent: 'abcdefgh',
+            addtl_consent: '1~12345678'
+          }
+        });
+
+        expect(adapter.buildRequests([VALID_BID_VIDEO], bidderRequest)).to.deep.equal(requests);
+      });
+
+      it('should return the right formatted request with US Privacy info', function() {
+        let bidderRequest = {
+          uspConsent: US_PRIVACY
+        };
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            us_privacy: US_PRIVACY
+          }
+        });
+
+        expect(adapter.buildRequests([VALID_BID_VIDEO], bidderRequest)).to.deep.equal(requests);
+      });
+
+      // TODO: Supply chain
+      it('should return the right formatted request with Supply Chain info', function() {
+        let schain = {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [
+            {
+              'asi': 'test1.com',
+              'sid': '00001',
+              'hp': 1
+            },
+            {
+              'asi': 'test2-2.com',
+              'sid': '00002',
+              'hp': 2
+            }
+          ]
+        };
+
+        let bid = mergeDeep(deepClone(VALID_BID_VIDEO), {
+          schain: schain
+        });
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            schain: schain
+          }
+        });
+
+        expect(adapter.buildRequests([bid])).to.deep.equal(requests);
+      });
+
+      it('should return the right formatted request with User Ids info', function() {
+        let userIds = {
+          idl_env: '1234-5678-9012-3456', // Liveramp
+          netId: 'testnetid123', // NetId
+          IDP: 'userIDP000', // IDP
+          fabrickId: 'fabrickId9000', // FabrickId
+          uid2: { id: 'testuid2' } // UID 2.0
+        };
+
+        let bid = mergeDeep(deepClone(VALID_BID_VIDEO), {
+          userIds: userIds
+        }, {
+          userIdAsEids: createEidsArray(userIds)
+        });
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            users_uid: createEidsArray(userIds)
+          }
+        });
+
+        expect(adapter.buildRequests([bid])).to.deep.equal(requests);
+      });
+
+      it('should return the right formatted request with endpint test', function() {
+        let endpoint = 'https://bid-test.viously.com/prebid';
+
+        let bid = mergeDeep(deepClone(VALID_BID_VIDEO), {
+          params: {
+            endpoint: endpoint
+          }
+        });
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO));
+
+        requests.url = endpoint;
+
+        expect(adapter.buildRequests([bid])).to.deep.equal(requests);
+      });
+
+      // TODO: Floor
+    });
+  });
+
+  describe('interpretResponse', function() {
+    describe('Check method return', function () {
+      it('should return the right formatted response', function() {
+        let response = {
+          body: {
+            ads: [
+              {
+                bid: false,
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-0',
+                bid_id: '1234'
+              },
+              {
+                bid: true,
+                creative_id: '2468',
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-1',
+                bid_id: '5678',
+                cpm: 8,
+                ad: 'vast xml',
+                ad_url: 'http://www.example.com/vast',
+                type: 'video',
+                size: '640x480',
+                nurl: [
+                  'win.domain.com'
+                ]
+              },
+              {
+                bid: true,
+                creative_id: '1469',
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-3',
+                bid_id: '2570',
+                cpm: 4,
+                ad: 'vast xml',
+                type: 'video',
+                size: '640x480',
+              }
+            ]
+          }
+        };
+        let requests = {
+          data: {
+            placements: [
+              {
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-0',
+                bid_id: '1234'
+              },
+              {
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-1',
+                bid_id: '5678'
+              },
+              {
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-3',
+                bid_id: '2570'
+              }
+            ]
+          }
+        };
+
+        let formattedReponse = [
+          {
+            requestId: '5678',
+            id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-1',
+            cpm: 8,
+            width: '640',
+            height: '480',
+            creativeId: '2468',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastUrl: 'http://www.example.com/vast',
+            nurl: [
+              'win.domain.com'
+            ]
+          },
+          {
+            requestId: '2570',
+            id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-3',
+            cpm: 4,
+            width: '640',
+            height: '480',
+            creativeId: '1469',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastXml: 'vast xml',
+            nurl: []
+          }
+        ];
+
+        expect(adapter.interpretResponse(response, requests)).to.deep.equal(formattedReponse);
+      });
+    });
+  });
+
+  describe('onBidWon', function() {
+    describe('Check methods succeed', function () {
+      it('should not throw error', function() {
+        let bids = [
+          {
+            requestId: '5678',
+            id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-1',
+            cpm: 8,
+            width: '640',
+            height: '480',
+            creativeId: '2468',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastUrl: 'http://www.example.com/vast',
+            nurl: [
+              'win.domain.com'
+            ]
+          },
+          {
+            requestId: '2570',
+            id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-3',
+            cpm: 4,
+            width: '640',
+            height: '480',
+            creativeId: '1469',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastXml: 'vast xml',
+            nurl: []
+          }
+        ];
+
+        bids.forEach(function(bid) {
+          expect(adapter.onBidWon.bind(adapter, bid)).to.not.throw();
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/a4gBidAdapter_spec.js b/test/spec/modules/a4gBidAdapter_spec.js
new file mode 100644
index 00000000000..a9ead9fd021
--- /dev/null
+++ b/test/spec/modules/a4gBidAdapter_spec.js
@@ -0,0 +1,235 @@
+import { expect } from 'chai';
+import { spec } from 'modules/a4gBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+describe('a4gAdapterTests', function () {
+  describe('bidRequestValidity', function () {
+    it('bidRequest with zoneId and deliveryUrl params', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'a4g',
+        params: {
+          zoneId: 59304,
+          deliveryUrl: 'http://dev01.ad4game.com/v1/bid'
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest with only zoneId', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'a4g',
+        params: {
+          zoneId: 59304
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest with only deliveryUrl', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'a4g',
+        params: {
+          deliveryUrl: 'http://dev01.ad4game.com/v1/bid'
+        }
+      })).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', function () {
+    const DEFAULT_OPTION = {
+      refererInfo: {
+        referer: 'https://www.prebid.org',
+        canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+      }
+    };
+
+    const bidRequests = [{
+      'bidder': 'a4g',
+      'bidId': '51ef8751f9aead',
+      'params': {
+        'zoneId': 59304,
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 50], [300, 250], [300, 600]]
+        }
+      },
+      'sizes': [[320, 50], [300, 250], [300, 600]],
+      'bidderRequestId': '418b37f85e772c',
+      'auctionId': '18fd8b8b0bd757'
+    }, {
+      'bidder': 'a4g',
+      'bidId': '51ef8751f9aead',
+      'params': {
+        'zoneId': 59354,
+        'deliveryUrl': '//dev01.ad4game.com/v1/bid'
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 50], [300, 250], [300, 600]]
+        }
+      },
+      'bidderRequestId': '418b37f85e772c',
+      'auctionId': '18fd8b8b0bd757'
+    }];
+
+    it('bidRequest method', function () {
+      const request = spec.buildRequests(bidRequests, DEFAULT_OPTION);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('bidRequest url', function () {
+      const request = spec.buildRequests(bidRequests, DEFAULT_OPTION);
+      expect(request.url).to.match(new RegExp(`${bidRequests[1].params.deliveryUrl}`));
+    });
+
+    it('bidRequest data', function () {
+      const request = spec.buildRequests(bidRequests, DEFAULT_OPTION);
+      expect(request.data).to.exist;
+    });
+
+    it('bidRequest zoneIds', function () {
+      const request = spec.buildRequests(bidRequests, DEFAULT_OPTION);
+      expect(request.data.zoneId).to.equal('59304;59354');
+    });
+
+    it('bidRequest gdpr consent', function () {
+      const consentString = 'consentString';
+      const bidderRequest = {
+        bidderCode: 'a4g',
+        auctionId: '18fd8b8b0bd757',
+        bidderRequestId: '418b37f85e772c',
+        timeout: 3000,
+        gdprConsent: {
+          consentString: consentString,
+          gdprApplies: true
+        },
+        refererInfo: {
+          referer: 'https://www.prebid.org',
+          canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+        }
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      expect(request.data.gdpr).to.exist;
+      expect(request.data.gdpr.applies).to.exist.and.to.be.true;
+      expect(request.data.gdpr.consent).to.exist.and.to.equal(consentString);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidRequest = [{
+      'bidder': 'a4g',
+      'bidId': '51ef8751f9aead',
+      'params': {
+        'zoneId': 59304,
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 50], [300, 250], [300, 600]]
+        }
+      },
+      'bidderRequestId': '418b37f85e772c',
+      'auctionId': '18fd8b8b0bd757'
+    }];
+
+    const bidResponse = {
+      body: [{
+        'id': '51ef8751f9aead',
+        'ad': 'test ad',
+        'width': 320,
+        'height': 250,
+        'cpm': 5.2,
+        'crid': '111'
+      }],
+      headers: {}
+    };
+
+    it('should get correct bid response for banner ad', function () {
+      const expectedParse = [
+        {
+          requestId: '51ef8751f9aead',
+          cpm: 5.2,
+          creativeId: '111',
+          width: 320,
+          height: 250,
+          ad: 'test ad',
+          currency: 'USD',
+          ttl: 120,
+          netRevenue: true,
+          meta: {
+            advertiserDomains: []
+          }
+
+        }
+      ];
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    });
+
+    it('should set creativeId to default value if not provided', function () {
+      const bidResponseWithoutCrid = utils.deepClone(bidResponse);
+      delete bidResponseWithoutCrid.body[0].crid;
+      const expectedParse = [
+        {
+          requestId: '51ef8751f9aead',
+          cpm: 5.2,
+          creativeId: '51ef8751f9aead',
+          width: 320,
+          height: 250,
+          ad: 'test ad',
+          currency: 'USD',
+          ttl: 120,
+          netRevenue: true,
+          meta: {
+            advertiserDomains: []
+          }
+        }
+      ];
+      const result = spec.interpretResponse(bidResponseWithoutCrid, bidRequest);
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    })
+
+    it('required keys', function () {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      let requiredKeys = [
+        'requestId',
+        'creativeId',
+        'adId',
+        'cpm',
+        'width',
+        'height',
+        'currency',
+        'netRevenue',
+        'ttl',
+        'ad',
+        'meta'
+      ];
+
+      let resultKeys = Object.keys(result[0]);
+      resultKeys.forEach(function(key) {
+        expect(requiredKeys.indexOf(key) !== -1).to.equal(true);
+      });
+    })
+
+    it('adId should not be equal to requestId', function () {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      expect(result[0].requestId).to.not.equal(result[0].adId);
+    })
+
+    it('advertiserDomains is included when sent by server', function () {
+      bidResponse.body[0].adomain = ['test_adomain'];
+      let response = spec.interpretResponse(bidResponse, bidRequest);
+      expect(Object.keys(response[0].meta)).to.include.members(['advertiserDomains']);
+      expect(response[0].meta.advertiserDomains).to.deep.equal(['test_adomain']);
+      delete bidResponse.body[0].adomain;
+    });
+  });
+});
diff --git a/test/spec/modules/aardvarkBidAdapter_spec.js b/test/spec/modules/aardvarkBidAdapter_spec.js
deleted file mode 100644
index 9671f961407..00000000000
--- a/test/spec/modules/aardvarkBidAdapter_spec.js
+++ /dev/null
@@ -1,569 +0,0 @@
-import { expect } from 'chai';
-import * as utils from 'src/utils.js';
-import { spec, resetUserSync } from 'modules/aardvarkBidAdapter.js';
-
-describe('aardvarkAdapterTest', function () {
-  describe('forming valid bidRequests', function () {
-    it('should accept valid bidRequests', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'aardvark',
-        params: {
-          ai: 'xiby',
-          sc: 'TdAx',
-        },
-        sizes: [[300, 250]]
-      })).to.equal(true);
-    });
-
-    it('should reject invalid bidRequests', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'aardvark',
-        params: {
-          ai: 'xiby',
-        },
-        sizes: [[300, 250]]
-      })).to.equal(false);
-    });
-  });
-
-  describe('executing network requests', function () {
-    const bidRequests = [{
-      bidder: 'aardvark',
-      params: {
-        ai: 'xiby',
-        sc: 'TdAx',
-      },
-      adUnitCode: 'aaa',
-      transactionId: '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
-      sizes: [300, 250],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337',
-      userId: { tdid: 'eff98622-b5fd-44fa-9a49-6e846922d532' }
-    },
-    {
-      bidder: 'aardvark',
-      params: {
-        ai: 'xiby',
-        sc: 'RAZd',
-        host: 'adzone.pub.com'
-      },
-      adUnitCode: 'bbb',
-      transactionId: '193995b4-7122-4739-959b-2463282a138b',
-      sizes: [[800, 600]],
-      bidId: '22aidtbx5eabd9',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: 'e97cafd0-ebfc-4f5c-b7c9-baa0fd335a4a'
-    }];
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-
-    it('should use HTTP GET method', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      requests.forEach(function (requestItem) {
-        expect(requestItem.method).to.equal('GET');
-      });
-    });
-
-    it('should call the correct bidRequest url', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].url).to.match(new RegExp('^https:\/\/adzone.pub.com/xiby/TdAx_RAZd/aardvark\?'));
-    });
-
-    it('should have correct data', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.version).to.equal(1);
-      expect(requests[0].data.jsonp).to.equal(false);
-      expect(requests[0].data.TdAx).to.equal('1abgs362e0x48a8');
-      expect(requests[0].data.rtkreferer).to.not.be.undefined;
-      expect(requests[0].data.RAZd).to.equal('22aidtbx5eabd9');
-    });
-
-    it('should have tdid, it is available in bidRequest', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      requests.forEach(function (requestItem) {
-        expect(requestItem.data.tdid).to.equal('eff98622-b5fd-44fa-9a49-6e846922d532');
-      });
-    });
-  });
-
-  describe('splitting multi-auction ad units into own requests', function () {
-    const bidRequests = [{
-      bidder: 'aardvark',
-      params: {
-        ai: 'Toby',
-        sc: 'TdAx',
-        categories: ['cat1', 'cat2']
-      },
-      adUnitCode: 'aaa',
-      transactionId: '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
-      sizes: [300, 250],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337'
-    },
-    {
-      bidder: 'aardvark',
-      params: {
-        ai: 'xiby',
-        sc: 'RAZd',
-        host: 'adzone.pub.com'
-      },
-      adUnitCode: 'bbb',
-      transactionId: '193995b4-7122-4739-959b-2463282a138b',
-      sizes: [[800, 600]],
-      bidId: '22aidtbx5eabd9',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: 'e97cafd0-ebfc-4f5c-b7c9-baa0fd335a4a'
-    }];
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-
-    it('should use HTTP GET method', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      requests.forEach(function (requestItem) {
-        expect(requestItem.method).to.equal('GET');
-      });
-    });
-
-    it('should call the correct bidRequest urls for each auction', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests[0].url).to.match(new RegExp('^https:\/\/bidder.rtk.io/Toby/TdAx/aardvark\?'));
-      expect(requests[0].data.categories.length).to.equal(2);
-      expect(requests[1].url).to.match(new RegExp('^https:\/\/adzone.pub.com/xiby/RAZd/aardvark\?'));
-    });
-
-    it('should have correct data', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(2);
-      expect(requests[0].data.version).to.equal(1);
-      expect(requests[0].data.jsonp).to.equal(false);
-      expect(requests[0].data.TdAx).to.equal('1abgs362e0x48a8');
-      expect(requests[0].data.rtkreferer).to.not.be.undefined;
-      expect(requests[0].data.RAZd).to.be.undefined;
-      expect(requests[1].data.version).to.equal(1);
-      expect(requests[1].data.jsonp).to.equal(false);
-      expect(requests[1].data.TdAx).to.be.undefined;
-      expect(requests[1].data.rtkreferer).to.not.be.undefined;
-      expect(requests[1].data.RAZd).to.equal('22aidtbx5eabd9');
-    });
-
-    it('should have no tdid, it is not available in bidRequest', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      requests.forEach(function (requestItem) {
-        expect(requestItem.data.tdid).to.be.undefined;
-      });
-    });
-  });
-
-  describe('GDPR conformity', function () {
-    const bidRequests = [{
-      bidder: 'aardvark',
-      params: {
-        ai: 'xiby',
-        sc: 'TdAx',
-      },
-      adUnitCode: 'aaa',
-      transactionId: '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
-      sizes: [300, 250],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337'
-    }];
-
-    const bidderRequest = {
-      gdprConsent: {
-        consentString: 'awefasdfwefasdfasd',
-        gdprApplies: true
-      },
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-
-    it('should transmit correct data', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.gdpr).to.equal(true);
-      expect(requests[0].data.consent).to.equal('awefasdfwefasdfasd');
-    });
-  });
-
-  describe('GDPR absence conformity', function () {
-    const bidRequests = [{
-      bidder: 'aardvark',
-      params: {
-        ai: 'xiby',
-        sc: 'TdAx',
-      },
-      adUnitCode: 'aaa',
-      transactionId: '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
-      sizes: [300, 250],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337'
-    }];
-
-    const bidderRequest = {
-      gdprConsent: undefined,
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-
-    it('should transmit correct data', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.gdpr).to.be.undefined;
-      expect(requests[0].data.consent).to.be.undefined;
-    });
-  });
-
-  describe('CCPA conformity', function () {
-    const bidRequests = [{
-      bidder: 'aardvark',
-      params: {
-        ai: 'xiby',
-        sc: 'TdAx',
-      },
-      adUnitCode: 'aaa',
-      transactionId: '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
-      sizes: [300, 250],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337'
-    }];
-
-    it('should transmit us_privacy data', function () {
-      const usp = '1NY-';
-      const bidderRequest = {
-        gdprConsent: {
-          consentString: 'awefasdfwefasdfasd',
-          gdprApplies: true
-        },
-        refererInfo: {
-          referer: 'http://example.com'
-        },
-        uspConsent: usp
-      };
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.gdpr).to.equal(true);
-      expect(requests[0].data.consent).to.equal('awefasdfwefasdfasd');
-      expect(requests[0].data.us_privacy).to.equal(usp);
-    });
-
-    it('should not send us_privacy', function () {
-      const bidderRequest = {
-        refererInfo: {
-          referer: 'http://example.com'
-        }
-      };
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.gdpr).to.be.undefined;
-      expect(requests[0].data.consent).to.be.undefined;
-      expect(requests[0].data.us_privacy).to.be.undefined;
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('should handle bid responses', function () {
-      const serverResponse = {
-        body: [
-          {
-            media: 'banner',
-            nurl: 'https://www.nurl.com/0',
-            cpm: 0.09,
-            width: 300,
-            height: 250,
-            cid: '22aidtbx5eabd9',
-            adm: '</tag1>',
-            dealId: 'dealing',
-            ttl: 200,
-          },
-          {
-            media: 'banner',
-            nurl: 'https://www.nurl.com/1',
-            cpm: 0.19,
-            width: 300,
-            height: 250,
-            cid: '1abgs362e0x48a8',
-            adm: '</tag2>',
-            ttl: 200,
-            ex: 'extraproperty'
-          }
-        ],
-        headers: {}
-      };
-
-      const result = spec.interpretResponse(serverResponse, {});
-      expect(result.length).to.equal(2);
-
-      expect(result[0].requestId).to.equal('22aidtbx5eabd9');
-      expect(result[0].cpm).to.equal(0.09);
-      expect(result[0].width).to.equal(300);
-      expect(result[0].height).to.equal(250);
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].ttl).to.equal(200);
-      expect(result[0].dealId).to.equal('dealing');
-      expect(result[0].ex).to.be.undefined;
-      expect(result[0].ad).to.not.be.undefined;
-
-      expect(result[1].requestId).to.equal('1abgs362e0x48a8');
-      expect(result[1].cpm).to.equal(0.19);
-      expect(result[1].width).to.equal(300);
-      expect(result[1].height).to.equal(250);
-      expect(result[1].currency).to.equal('USD');
-      expect(result[1].ttl).to.equal(200);
-      expect(result[1].ad).to.not.be.undefined;
-      expect(result[1].ex).to.equal('extraproperty');
-    });
-
-    it('should handle nobid responses', function () {
-      var emptyResponse = [{
-        nurl: '',
-        cid: '9e5a09319e18f1',
-        media: 'banner',
-        error: 'No bids received for 9DgF',
-        adm: '',
-        id: '9DgF',
-        cpm: 0.00
-      }];
-
-      var result = spec.interpretResponse({ body: emptyResponse }, {});
-      expect(result.length).to.equal(0);
-    });
-  });
-
-  describe('getUserSyncs', function () {
-    const syncOptions = {
-      iframeEnabled: true
-    };
-
-    it('should produce sync url', function () {
-      const syncs = spec.getUserSyncs(syncOptions);
-      expect(syncs.length).to.equal(1);
-      expect(syncs[0].type).to.equal('iframe');
-      expect(syncs[0].url).to.equal('https://sync.rtk.io/cs');
-    });
-
-    it('should return empty, as we sync only once', function () {
-      const syncs = spec.getUserSyncs(syncOptions);
-      expect(syncs.length).to.equal(0);
-    });
-
-    it('should reset hasSynced flag, allowing another sync', function () {
-      resetUserSync();
-
-      const syncs = spec.getUserSyncs(syncOptions);
-      expect(syncs.length).to.equal(1);
-    });
-
-    it('should return empty when iframe disallowed', function () {
-      resetUserSync();
-
-      const noIframeOptions = { iframeEnabled: false };
-      const syncs = spec.getUserSyncs(noIframeOptions);
-      expect(syncs.length).to.equal(0);
-    });
-
-    it('should produce sync url with gdpr params', function () {
-      const gdprConsent = {
-        gdprApplies: true,
-        consentString: 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA'
-      };
-
-      resetUserSync();
-
-      const syncs = spec.getUserSyncs(syncOptions, null, gdprConsent);
-      expect(syncs.length).to.equal(1);
-      expect(syncs[0].type).to.equal('iframe');
-      expect(syncs[0].url).to.equal('https://sync.rtk.io/cs?g=1&c=BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA');
-    });
-
-    it('should produce sync url with ccpa params', function () {
-      resetUserSync();
-
-      const syncs = spec.getUserSyncs(syncOptions, null, {}, '1YYN');
-      expect(syncs.length).to.equal(1);
-      expect(syncs[0].type).to.equal('iframe');
-      expect(syncs[0].url).to.equal('https://sync.rtk.io/cs?us_privacy=1YYN');
-    });
-  });
-
-  describe('reading window.top properties', function () {
-    const bidCategories = ['bcat1', 'bcat2', 'bcat3'];
-    const bidRequests = [{
-      bidder: 'aardvark',
-      params: {
-        ai: 'xiby',
-        sc: 'TdAx',
-        host: 'adzone.pub.com',
-        categories: bidCategories
-      },
-      adUnitCode: 'RTK_aaaa',
-      transactionId: '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
-      sizes: [300, 250],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337',
-      userId: { tdid: 'eff98622-b5fd-44fa-9a49-6e846922d532' }
-    }];
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-
-    const topWin = {
-      innerWidth: 1366,
-      innerHeight: 768,
-      rtkcategories: ['cat1', 'cat2', 'cat3']
-    };
-
-    let sandbox;
-    beforeEach(function () {
-      sandbox = sinon.createSandbox();
-    });
-
-    afterEach(function () {
-      sandbox.restore();
-    });
-
-    it('should have window.top dimensions', function () {
-      sandbox.stub(utils, 'getWindowTop').returns(topWin);
-
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      requests.forEach(function (requestItem) {
-        expect(requestItem.data.w).to.equal(topWin.innerWidth);
-        expect(requestItem.data.h).to.equal(topWin.innerHeight);
-      });
-    });
-
-    it('should have window dimensions, as backup', function () {
-      sandbox.stub(utils, 'getWindowTop').returns(undefined);
-
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      requests.forEach(function (requestItem) {
-        expect(requestItem.data.w).to.equal(window.innerWidth);
-        expect(requestItem.data.h).to.equal(window.innerHeight);
-      });
-    });
-
-    it('should have window.top & bid categories', function () {
-      sandbox.stub(utils, 'getWindowTop').returns(topWin);
-
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      requests.forEach(function (requestItem) {
-        utils._each(topWin.categories, function (cat) {
-          expect(requestItem.data.categories).to.contain(cat);
-        });
-        utils._each(bidCategories, function (cat) {
-          expect(requestItem.data.categories).to.contain(cat);
-        });
-      });
-    });
-  });
-
-  describe('schain support', function() {
-    const nodePropsOrder = ['asi', 'sid', 'hp', 'rid', 'name', 'domain'];
-    let schainConfig = {
-      ver: '1.0',
-      complete: 1,
-      nodes: [
-        {
-          asi: 'rtk.io',
-          sid: '1234',
-          hp: 1,
-          rid: 'bid-request-1',
-          name: 'first pub',
-          domain: 'first.com'
-        },
-        {
-          asi: 'rtk.io',
-          sid: '5678',
-          hp: 1,
-          rid: 'bid-request-2',
-          name: 'second pub',
-          domain: 'second.com'
-        }
-      ]
-    };
-
-    const bidRequests = [{
-      bidder: 'aardvark',
-      params: {
-        ai: 'xiby',
-        sc: 'TdAx',
-      },
-      adUnitCode: 'aaa',
-      transactionId: '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
-      sizes: [300, 250],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337',
-      schain: schainConfig,
-    }];
-
-    const bidderRequest = {
-      gdprConsent: undefined,
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-
-    it('should properly serialize schain object with correct delimiters', () => {
-      const results = spec.buildRequests(bidRequests, bidderRequest);
-      const numNodes = schainConfig.nodes.length;
-
-      const schain = results[0].data.schain;
-
-      // each node serialization should start with an !
-      expect(schain.match(/!/g).length).to.equal(numNodes);
-
-      // 5 commas per node plus 1 for version
-      expect(schain.match(/,/g).length).to.equal(numNodes * 5 + 1);
-    });
-
-    it('should send the proper version for the schain', () => {
-      const results = spec.buildRequests(bidRequests, bidderRequest);
-      const schain = decodeURIComponent(results[0].data.schain).split('!');
-      const version = schain.shift().split(',')[0];
-      expect(version).to.equal(bidRequests[0].schain.ver);
-    });
-
-    it('should send the correct value for complete in schain', () => {
-      const results = spec.buildRequests(bidRequests, bidderRequest);
-      const schain = decodeURIComponent(results[0].data.schain).split('!');
-      const complete = schain.shift().split(',')[1];
-      expect(complete).to.equal(String(bidRequests[0].schain.complete));
-    });
-
-    it('should send available params in the right order', () => {
-      const results = spec.buildRequests(bidRequests, bidderRequest);
-      const schain = decodeURIComponent(results[0].data.schain).split('!');
-      schain.shift();
-
-      schain.forEach((serializeNode, nodeIndex) => {
-        const nodeProps = serializeNode.split(',');
-        nodeProps.forEach((nodeProp, propIndex) => {
-          const node = schainConfig.nodes[nodeIndex];
-          const key = nodePropsOrder[propIndex];
-          expect(nodeProp).to.equal(node[key] ? String(node[key]) : '');
-        });
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/aaxBlockmeter_spec.js b/test/spec/modules/aaxBlockmeter_spec.js
new file mode 100644
index 00000000000..f9704361976
--- /dev/null
+++ b/test/spec/modules/aaxBlockmeter_spec.js
@@ -0,0 +1,58 @@
+import {aaxBlockmeterRtdModule} from '../../../modules/aaxBlockmeterRtdProvider.js';
+import * as sinon from 'sinon';
+import {assert} from 'chai';
+
+let sandbox;
+let getTargetingDataSpy;
+
+const config = {
+  dataProviders: [{
+    'name': 'aaxBlockmeter',
+    'params': {
+      'pub': 'publisher_id',
+    }
+  }]
+};
+
+describe('aaxBlockmeter realtime module', function () {
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    window.aax = window.aax || {};
+    window.aax.getTargetingData = getTargetingDataSpy = sandbox.spy();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    window.aax = {};
+  });
+
+  it('init should return false when config is empty', function () {
+    assert.equal(aaxBlockmeterRtdModule.init({}), false);
+  });
+
+  it('init should return false when config.params id is empty', function () {
+    assert.equal(aaxBlockmeterRtdModule.init({params: {}}), false);
+  });
+
+  it('init should return true when config.params.pub is not string', function () {
+    assert.equal(aaxBlockmeterRtdModule.init({params: {pub: 12345}}), false);
+  });
+
+  it('init should return true when config.params.pub id is passed and is string typed', function () {
+    assert.equal(aaxBlockmeterRtdModule.init(config.dataProviders[0]), true);
+  });
+
+  describe('getTargetingData should work correctly', function () {
+    it('should return ad unit codes when ad units are present', function () {
+      const codes = ['code1', 'code2'];
+      assert.deepEqual(aaxBlockmeterRtdModule.getTargetingData(codes), {
+        code1: {'atk': 'code1'},
+        code2: {'atk': 'code2'},
+      });
+    });
+
+    it('should call aax.getTargetingData if loaded', function () {
+      aaxBlockmeterRtdModule.getTargetingData([], config.dataProviders[0], null);
+    });
+  });
+});
diff --git a/test/spec/modules/ablidaBidAdapter_spec.js b/test/spec/modules/ablidaBidAdapter_spec.js
index 0238c14fe5c..73109d8cf16 100644
--- a/test/spec/modules/ablidaBidAdapter_spec.js
+++ b/test/spec/modules/ablidaBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {assert, expect} from 'chai';
 import {spec} from 'modules/ablidaBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import * as utils from 'src/utils.js';
 
 const ENDPOINT_URL = 'https://bidder.ablida.net/prebid';
 
@@ -8,17 +9,23 @@ describe('ablidaBidAdapter', function () {
   const adapter = newBidder(spec);
   describe('isBidRequestValid', function () {
     let bid = {
+      adUnitCode: 'adunit-code',
+      auctionId: '69e8fef8-5105-4a99-b011-d5669f3bc7f0',
+      bidRequestsCount: 1,
       bidder: 'ablida',
+      bidderRequestId: '14d2939272a26a',
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0,
+      bidId: '1234asdf1234',
+      mediaTypes: {banner: {sizes: [[300, 250]]}},
       params: {
         placementId: 123
       },
-      adUnitCode: 'adunit-code',
       sizes: [
         [300, 250]
       ],
-      bidId: '1234asdf1234',
-      bidderRequestId: '1234asdf1234asdf',
-      auctionId: '69e8fef8-5105-4a99-b011-d5669f3bc7f0'
+      src: 'client',
+      transactionId: '4781e6ac-93c4-42ba-86fe-ab5f278863cf'
     };
     it('should return true where required params found', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
@@ -27,22 +34,29 @@ describe('ablidaBidAdapter', function () {
   describe('buildRequests', function () {
     let bidRequests = [
       {
+        adUnitCode: 'adunit-code',
+        auctionId: '69e8fef8-5105-4a99-b011-d5669f3bc7f0',
+        bidId: '23beaa6af6cdde',
+        bidRequestsCount: 1,
         bidder: 'ablida',
+        bidderRequestId: '14d2939272a26a',
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+        mediaTypes: {banner: {sizes: [[300, 250]]}},
         params: {
           placementId: 123
         },
         sizes: [
           [300, 250]
         ],
-        adUnitCode: 'adunit-code',
-        bidId: '23beaa6af6cdde',
-        bidderRequestId: '14d2939272a26a',
-        auctionId: '69e8fef8-5105-4a99-b011-d5669f3bc7f0',
+        src: 'client',
+        transactionId: '4781e6ac-93c4-42ba-86fe-ab5f278863cf'
       }
     ];
 
     let bidderRequests = {
       refererInfo: {
+        canonicalUrl: '',
         numIframes: 0,
         reachedTop: true,
         referer: 'http://example.com',
@@ -61,42 +75,53 @@ describe('ablidaBidAdapter', function () {
       method: 'POST',
       url: ENDPOINT_URL,
       data: {
+        adapterVersion: 5,
+        bidId: '2b8c4de0116e54',
+        categories: undefined,
+        device: 'desktop',
+        gdprConsent: undefined,
+        jaySupported: true,
+        mediaTypes: {banner: {sizes: [[300, 250]]}},
         placementId: 'testPlacementId',
         width: 300,
         height: 200,
-        bidId: '2b8c4de0116e54',
-        jaySupported: true,
-        device: 'desktop',
-        referer: 'www.example.com',
-        adapterVersion: 2
+        referer: 'www.example.com'
       }
     };
     let serverResponse = {
       body: [{
-        requestId: '2b8c4de0116e54',
+        ad: '<script>console.log("ad");</script>',
         cpm: 1.00,
-        width: 300,
-        height: 250,
         creativeId: '2b8c4de0116e54',
         currency: 'EUR',
+        height: 250,
+        mediaType: 'banner',
+        meta: {},
         netRevenue: true,
+        nurl: 'https://example.com/some-tracker',
+        originalCpm: '0.10',
+        originalCurrency: 'EUR',
+        requestId: '2b8c4de0116e54',
         ttl: 3000,
-        ad: '<script>console.log("ad");</script>',
-        nurl: 'https://example.com/some-tracker'
+        width: 300
       }]
     };
     it('should get the correct bid response', function () {
       let expectedResponse = [{
-        requestId: '2b8c4de0116e54',
+        ad: '<script>console.log("ad");</script>',
         cpm: 1.00,
-        width: 300,
-        height: 250,
         creativeId: '2b8c4de0116e54',
         currency: 'EUR',
+        height: 250,
+        mediaType: 'banner',
+        meta: {},
         netRevenue: true,
+        nurl: 'https://example.com/some-tracker',
+        originalCpm: '0.10',
+        originalCurrency: 'EUR',
+        requestId: '2b8c4de0116e54',
         ttl: 3000,
-        ad: '<script>console.log("ad");</script>',
-        nurl: 'https://example.com/some-tracker'
+        width: 300
       }];
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
       expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
@@ -104,16 +129,23 @@ describe('ablidaBidAdapter', function () {
   });
 
   describe('onBidWon', function() {
-    it('Should not ajax call if bid does not contain nurl', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if bid does not contain nurl', function() {
       const result = spec.onBidWon({});
-      expect(result).to.equal(false)
+      expect(utils.triggerPixel.callCount).to.equal(0)
     })
 
-    it('Should ajax call if bid nurl', function() {
+    it('Should trigger pixel if bid nurl', function() {
       const result = spec.onBidWon({
         nurl: 'https://example.com/some-tracker'
       });
-      expect(result).to.equal(true)
+      expect(utils.triggerPixel.callCount).to.equal(1)
     })
   })
 });
diff --git a/test/spec/modules/acuityAdsBidAdapter_spec.js b/test/spec/modules/acuityAdsBidAdapter_spec.js
new file mode 100644
index 00000000000..18ea574c1ce
--- /dev/null
+++ b/test/spec/modules/acuityAdsBidAdapter_spec.js
@@ -0,0 +1,398 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/acuityAdsBidAdapter';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'acuityads'
+
+describe('AcuityAdsBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    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;
+      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://prebid.admanmedia.com/pbjs');
+    });
+
+    it('Returns general data 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',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      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.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, 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 = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, 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([], bidderRequest);
+      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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.admanmedia.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.admanmedia.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/adWMGAnalyticsAdapter_spec.js b/test/spec/modules/adWMGAnalyticsAdapter_spec.js
index ab8336c7126..1e0da1bb3c8 100644
--- a/test/spec/modules/adWMGAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adWMGAnalyticsAdapter_spec.js
@@ -1,6 +1,7 @@
 import adWMGAnalyticsAdapter from 'modules/adWMGAnalyticsAdapter.js';
 import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
+import {expectEvents} from '../../helpers/analytics.js';
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
 let constants = require('src/constants.json');
@@ -140,14 +141,15 @@ describe('adWMG Analytics', function () {
         }
       });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {timestamp, auctionId, timeout, adUnits});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
-      events.emit(constants.EVENTS.NO_BID, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgs);
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
-      sinon.assert.callCount(adWMGAnalyticsAdapter.track, 7);
+      expectEvents([
+        [constants.EVENTS.AUCTION_INIT, {timestamp, auctionId, timeout, adUnits}],
+        [constants.EVENTS.BID_REQUESTED, {}],
+        [constants.EVENTS.BID_RESPONSE, bidResponse],
+        [constants.EVENTS.NO_BID, {}],
+        [constants.EVENTS.BID_TIMEOUT, bidTimeoutArgs],
+        [constants.EVENTS.AUCTION_END, {}],
+        [constants.EVENTS.BID_WON, wonRequest],
+      ]).to.beTrackedBy(adWMGAnalyticsAdapter.track);
     });
 
     it('should be two xhr requests', function () {
diff --git a/test/spec/modules/adWMGBidAdapter_spec.js b/test/spec/modules/adWMGBidAdapter_spec.js
new file mode 100644
index 00000000000..db536ca14e2
--- /dev/null
+++ b/test/spec/modules/adWMGBidAdapter_spec.js
@@ -0,0 +1,335 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adWMGBidAdapter.js';
+import { config } from 'src/config.js';
+
+describe('adWMGBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let bid;
+    beforeEach(function() {
+      bid = {
+        bidder: 'adWMG',
+        params: {
+          publisherId: '5cebea3c9eea646c7b623d5e'
+        },
+        mediaTypes: {
+          banner: {
+            size: [[300, 250]]
+          }
+        }
+      };
+    });
+
+    it('should return true when valid bid request is set', function() {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when bidder is not set to "adWMG"', function() {
+      bid.bidder = 'bidder';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when \'publisherId\' param are not set', function() {
+      delete bid.params.publisherId;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('parseUserAgent', function() {
+    let ua_desktop, ua_mobile, ua_tv, ua_tablet;
+    beforeEach(function() {
+      ua_desktop = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36';
+      ua_tv = 'Mozilla/5.0 (Linux; NetCast; U) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/38.0.2125.122 Safari/537.31 SmartTV/7.0';
+      ua_mobile = 'Mozilla/5.0 (Linux; Android 7.0; SAMSUNG SM-G610M Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.2 Chrome/59.0.3071.125 Mobile Safari/537.36';
+      ua_tablet = 'Mozilla/5.0 (iPad; CPU OS 7_1_2 like Mac OS X) AppleWebKit/537.51.2 (KHTML, like Gecko) Version/7.0 Mobile/11D257 Safari/9537.53';
+    });
+
+    it('should return correct device type: desktop', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.devicetype).to.equal(2);
+    });
+
+    it('should return correct device type: TV', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_tv);
+      expect(userDeviceInfo.devicetype).to.equal(3);
+    });
+
+    it('should return correct device type: mobile', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_mobile);
+      expect(userDeviceInfo.devicetype).to.equal(4);
+    });
+
+    it('should return correct device type: tablet', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_tablet);
+      expect(userDeviceInfo.devicetype).to.equal(5);
+    });
+
+    it('should return correct OS name', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.os).to.equal('Windows');
+    });
+
+    it('should return correct OS version', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.osv).to.equal('10.0');
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests;
+    beforeEach(function() {
+      bidRequests = [
+        {
+          bidder: 'adWMG',
+          adUnitCode: 'adwmg-test-ad',
+          auctionId: 'test-auction-id',
+          bidId: 'test-bid-id',
+          bidRequestsCount: 1,
+          bidderRequestId: 'bidderrequestid123',
+          transactionId: 'transaction-id-123',
+          sizes: [[300, 250]],
+          requestId: 'requestid123',
+          params: {
+            floorPrice: 100,
+            currency: 'USD'
+          },
+          mediaTypes: {
+            banner: {
+              size: [[300, 250]]
+            }
+          },
+          userId: {
+            pubcid: 'pubc-id-123'
+          }
+        }, {
+          bidder: 'adWMG',
+          adUnitCode: 'adwmg-test-ad-2',
+          auctionId: 'test-auction-id-2',
+          bidId: 'test-bid-id-2',
+          bidRequestsCount: 1,
+          bidderRequestId: 'bidderrequestid456',
+          transactionId: 'transaction-id-456',
+          sizes: [[320, 50]],
+          requestId: 'requestid456',
+          params: {
+            floorPrice: 100,
+            currency: 'USD'
+          },
+          mediaTypes: {
+            banner: {
+              size: [[320, 50]]
+            }
+          },
+          userId: {
+            pubcid: 'pubc-id-456'
+          }
+        }
+      ];
+    });
+
+    let bidderRequest = {
+      refererInfo: {
+        referer: 'https://test.com'
+      },
+      gdprConsent: {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      }
+    };
+
+    it('should not contain a sizes when sizes is not set', function() {
+      delete bidRequests[0].sizes;
+      delete bidRequests[1].sizes;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).sizes).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).sizes).to.be.an('undefined');
+    });
+
+    it('should not contain a userId when userId is not set', function() {
+      delete bidRequests[0].userId;
+      delete bidRequests[1].userId;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).userId).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).userId).to.be.an('undefined');
+    });
+
+    it('should have a post method', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[1].method).to.equal('POST');
+    });
+
+    it('should contain a request id equals to the bid id', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).requestId).to.equal(bidRequests[0].bidId);
+      expect(JSON.parse(requests[1].data).requestId).to.equal(bidRequests[1].bidId);
+    });
+
+    it('should have an url that match the default endpoint', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].url).to.equal('https://hb.adwmg.com/hb');
+      expect(requests[1].url).to.equal('https://hb.adwmg.com/hb');
+    });
+
+    it('should contain GDPR consent data if GDPR set', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).gdpr.applies).to.be.true;
+      expect(JSON.parse(requests[0].data).gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(JSON.parse(requests[1].data).gdpr.applies).to.be.true;
+      expect(JSON.parse(requests[1].data).gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+    })
+
+    it('should not contain GDPR consent data if GDPR not set', function() {
+      delete bidderRequest.gdprConsent;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).gdpr).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).gdpr).to.be.an('undefined');
+    })
+
+    it('should set debug mode in requests if enabled', function() {
+      sinon.stub(config, 'getConfig').withArgs('debug').returns(true);
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).debug).to.be.true;
+      expect(JSON.parse(requests[1].data).debug).to.be.true;
+      config.getConfig.restore();
+    })
+  });
+
+  describe('interpretResponse', function () {
+    let serverResponse;
+    beforeEach(function() {
+      serverResponse = {
+        body: {
+          'requestId': 'request-id',
+          'cpm': 100,
+          'width': 300,
+          'height': 250,
+          'ad': '<div>ad</div>',
+          'ttl': 300,
+          'creativeId': 'creative-id',
+          'netRevenue': true,
+          'currency': 'USD',
+          'adomain': ['testdomain.com']
+        }
+      };
+    });
+
+    it('should return a valid response', () => {
+      var responses = spec.interpretResponse(serverResponse);
+      expect(responses).to.be.an('array').that.is.not.empty;
+
+      let response = responses[0];
+      expect(response).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'meta', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency');
+      expect(response.requestId).to.equal('request-id');
+      expect(response.cpm).to.equal(100);
+      expect(response.width).to.equal(300);
+      expect(response.height).to.equal(250);
+      expect(response.ad).to.equal('<div>ad</div>');
+      expect(response.ttl).to.equal(300);
+      expect(response.creativeId).to.equal('creative-id');
+      expect(response.netRevenue).to.be.true;
+      expect(response.currency).to.equal('USD');
+      expect(response.meta.advertiserDomains[0]).to.equal('testdomain.com');
+      expect(response.meta.mediaType).to.equal('banner');
+    });
+
+    it('should return an empty array when serverResponse is empty', () => {
+      serverResponse = {};
+      var responses = spec.interpretResponse(serverResponse);
+      expect(responses).to.deep.equal([]);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should return nothing when sync is disabled', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': false
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should register iframe sync when only iframe is enabled', function () {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': false
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).includes('https://hb.adwmg.com/cphb.html?');
+    });
+
+    it('should register iframe sync when iframe and image are enabled', function () {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).includes('https://hb.adwmg.com/cphb.html?');
+    });
+
+    it('should send GDPR consent if enabled', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      expect(syncs[0].url).includes('gdpr=1');
+      expect(syncs[0].url).includes(`gdpr_consent=${gdprConsent.consentString}`);
+    });
+
+    it('should not add GDPR consent params twice', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const gdprConsent2 = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_7_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent2);
+      expect(syncs[0].url.match(/gdpr/g).length).to.equal(2); // gdpr + gdpr_consent
+      expect(syncs[0].url.match(/gdpr_consent/g).length).to.equal(1);
+    });
+
+    it('should delete \'&\' symbol at the end of usersync URL', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      expect(syncs[0].url.slice(-1)).to.not.equal('&');
+    });
+  });
+});
diff --git a/test/spec/modules/adagioAnalyticsAdapter_spec.js b/test/spec/modules/adagioAnalyticsAdapter_spec.js
index aee85412104..581f3cb1b87 100644
--- a/test/spec/modules/adagioAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adagioAnalyticsAdapter_spec.js
@@ -83,34 +83,27 @@ describe('adagio analytics adapter', () => {
         timeToRespond: 132,
       };
 
-      // Step 1: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
+      const testEvents = {
+        [constants.EVENTS.BID_REQUESTED]: bidRequest,
+        [constants.EVENTS.BID_RESPONSE]: bidResponse,
+        [constants.EVENTS.AUCTION_END]: {}
+      };
 
-      // Step 2: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      // Step 1-3: Send events
+      Object.entries(testEvents).forEach(([ev, payload]) => events.emit(ev, payload));
 
-      // Step 3: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      function eventItem(eventName, args) {
+        return sinon.match({
+          action: 'pb-analytics-event',
+          ts: sinon.match((val) => val !== undefined),
+          data: {
+            eventName,
+            args
+          }
+        })
+      }
 
-      sandbox.assert.callCount(adagioQueuePushSpy, 3);
-
-      const call0 = adagioQueuePushSpy.getCall(0);
-      expect(call0.args[0].action).to.equal('pb-analytics-event');
-      expect(call0.args[0].ts).to.not.be.undefined;
-      expect(call0.args[0].data).to.not.be.undefined;
-      expect(call0.args[0].data).to.deep.equal({eventName: constants.EVENTS.BID_REQUESTED, args: bidRequest});
-
-      const call1 = adagioQueuePushSpy.getCall(1);
-      expect(call1.args[0].action).to.equal('pb-analytics-event');
-      expect(call1.args[0].ts).to.not.be.undefined;
-      expect(call1.args[0].data).to.not.be.undefined;
-      expect(call1.args[0].data).to.deep.equal({eventName: constants.EVENTS.BID_RESPONSE, args: bidResponse});
-
-      const call2 = adagioQueuePushSpy.getCall(2);
-      expect(call2.args[0].action).to.equal('pb-analytics-event');
-      expect(call2.args[0].ts).to.not.be.undefined;
-      expect(call2.args[0].data).to.not.be.undefined;
-      expect(call2.args[0].data).to.deep.equal({eventName: constants.EVENTS.AUCTION_END, args: {}});
+      Object.entries(testEvents).forEach(([ev, payload]) => sinon.assert.calledWith(adagioQueuePushSpy, eventItem(ev, payload)));
     });
   });
 
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 97265121ce0..8abdc621922 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -1,678 +1,814 @@
 import { expect } from 'chai';
-import { adagioScriptFromLocalStorageCb, _features, spec } from 'modules/adagioBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import * as utils from 'src/utils.js';
+import {
+  _features,
+  internal as adagio,
+  adagioScriptFromLocalStorageCb,
+  getAdagioScript,
+  storage,
+  setExtraParam,
+  spec,
+  ENDPOINT,
+  VERSION,
+  RENDERER_URL,
+  GlobalExchange
+} from '../../../modules/adagioBidAdapter.js';
+import { loadExternalScript } from '../../../src/adloader.js';
+import * as utils from '../../../src/utils.js';
+import { config } from '../../../src/config.js';
+import { NATIVE } from '../../../src/mediaTypes.js';
+import { executeRenderer } from '../../../src/Renderer.js';
+
+const BidRequestBuilder = function BidRequestBuilder(options) {
+  const defaults = {
+    request: {
+      auctionId: '4fd1ca2d-846c-4211-b9e5-321dfe1709c9',
+      adUnitCode: 'adunit-code',
+      bidder: 'adagio'
+    },
+    params: {
+      organizationId: '1000',
+      placement: 'PAVE_ATF',
+      site: 'SITE-NAME',
+      adUnitElementId: 'gpt-adunit-code'
+    },
+    sizes: [[300, 250], [300, 600]],
+  };
+
+  const request = {
+    ...defaults.request,
+    ...options
+  };
+
+  this.withParams = (options) => {
+    request.params = {
+      ...defaults.params,
+      ...options
+    };
+    return this;
+  };
+
+  this.build = () => request;
+};
+
+const BidderRequestBuilder = function BidderRequestBuilder(options) {
+  const defaults = {
+    bidderCode: 'adagio',
+    auctionId: '4fd1ca2d-846c-4211-b9e5-321dfe1709c9',
+    bidderRequestId: '7g36s867Tr4xF90X',
+    timeout: 3000,
+    refererInfo: {
+      numIframes: 0,
+      reachedTop: true,
+      referer: 'http://test.io/index.html?pbjs_debug=true'
+    }
+  };
+
+  const request = {
+    ...defaults,
+    ...options
+  };
+
+  this.build = () => request;
+};
 
-describe('adagioAdapter', () => {
+describe('Adagio bid adapter', () => {
+  let adagioMock;
   let utilsMock;
-  const adapter = newBidder(spec);
-  const ENDPOINT = 'https://mp.4dex.io/prebid';
-  const VERSION = '2.2.2';
+  let sandbox;
+
+  const fixtures = {
+    getElementById(width, height, x, y) {
+      const obj = {
+        x: x || 800,
+        y: y || 300,
+        width: width || 300,
+        height: height || 250,
+      };
+
+      return {
+        ...obj,
+        getBoundingClientRect: () => {
+          return {
+            width: obj.width,
+            height: obj.height,
+            left: obj.x,
+            top: obj.y,
+            right: obj.x + obj.width,
+            bottom: obj.y + obj.height
+          };
+        }
+      };
+    }
+  };
+
+  // safeFrame implementation
+  const $sf = {
+    ext: {
+      geom: function() {}
+    }
+  };
+
+  beforeEach(() => {
+    window.ADAGIO = {};
+    window.ADAGIO.adUnits = {};
+    window.ADAGIO.pbjsAdUnits = [];
+    window.ADAGIO.queue = [];
+    window.ADAGIO.versions = {};
+    window.ADAGIO.versions.adagioBidderAdapter = VERSION;
+    window.ADAGIO.pageviewId = 'dda61753-4059-4f75-b0bf-3f60bd2c4d9a';
 
-  beforeEach(function() {
-    localStorage.removeItem('adagioScript');
+    GlobalExchange.clearFeatures();
+    GlobalExchange.clearExchangeData();
+
+    adagioMock = sinon.mock(adagio);
     utilsMock = sinon.mock(utils);
+
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      adagio: {
+        storageAllowed: true
+      }
+    };
+
+    sandbox = sinon.createSandbox();
   });
 
-  afterEach(function() {
+  afterEach(() => {
+    window.ADAGIO = undefined;
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+
+    adagioMock.restore();
     utilsMock.restore();
-  });
 
-  describe('inherited functions', () => {
-    it('exists and is a function', () => {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
+    sandbox.restore();
   });
 
-  describe('isBidRequestValid', () => {
-    let sandbox;
-    beforeEach(function () {
-      sandbox = sinon.sandbox.create();
-      let element = {
-        x: 0,
-        y: 0,
-        width: 200,
-        height: 300,
-        getBoundingClientRect: () => {
-          return {
-            width: element.width,
-            height: element.height,
-            left: element.x,
-            top: element.y,
-            right: element.x + element.width,
-            bottom: element.y + element.height
-          };
+  describe('get and set params at adUnit level from global Prebid configuration', function() {
+    it('should set params get from bid.ortb2', function() {
+      const bid = new BidRequestBuilder().build();
+      bid.ortb2 = {
+        site: {
+          ext: {
+            data: {
+              pagetype: 'abc',
+              category: ['cat1', 'cat2', 'cat3']
+            }
+          }
         }
       };
-      sandbox.stub(document, 'getElementById').withArgs('banner-atf').returns(element);
+
+      sandbox.stub(config, 'getConfig').callsFake(key => {
+        const config = {
+          adagio: {
+            pagetype: 'article'
+          },
+        };
+        return utils.deepAccess(config, key);
+      });
+
+      setExtraParam(bid, 'pagetype')
+      expect(bid.params.pagetype).to.equal('article');
+
+      setExtraParam(bid, 'category');
+      expect(bid.params.category).to.equal('cat1'); // Only the first value is kept
     });
 
-    afterEach(function () {
-      sandbox.restore();
+    it('should use the adUnit param unit if defined', function() {
+      const bid = new BidRequestBuilder({ params: { pagetype: 'article' } }).build();
+      sandbox.stub(config, 'getConfig').withArgs('adagio').returns({
+        pagetype: 'ignore-me'
+      });
+      setExtraParam(bid, 'pagetype')
+      expect(bid.params.pagetype).to.equal('article');
     });
+  })
 
-    const bid = {
-      'bidder': 'adagio',
-      'params': {
-        organizationId: '0',
-        placement: 'PAVE_ATF',
-        site: 'SITE-NAME',
-        pagetype: 'ARTICLE',
-        adUnitElementId: 'banner-atf'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': 'c180kg4267tyqz',
-      'bidderRequestId': '8vfscuixrovn8i',
-      'auctionId': 'lel4fhp239i9km',
-    };
+  describe('isBidRequestValid()', function() {
+    it('should return true when required params have been found', function() {
+      const bid = new BidRequestBuilder().withParams().build();
 
-    const bidWithMediaTypes = {
-      'bidder': 'adagio',
-      'params': {
-        organizationId: '0',
-        placement: 'PAVE_ATF',
-        site: 'SITE-NAME',
-        pagetype: 'ARTICLE',
-        adUnitElementId: 'banner-atf'
-      },
-      'adUnitCode': 'adunit-code-2',
-      'mediaTypes': {
-        banner: {
-          sizes: [[300, 250]],
-        }
-      },
-      sizes: [[300, 600]],
-      'bidId': 'c180kg4267tyqz',
-      'bidderRequestId': '8vfscuixrovn8i',
-      'auctionId': 'lel4fhp239i9km',
-    }
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should compute organizationId and site params from global BidderSettings config', function() {
+      sandbox.stub(adagio, 'getRefererInfo').returns({ reachedTop: true });
+      sandbox.stub(config, 'getConfig').withArgs('adagio').returns({
+        siteId: '1000:SITE-NAME'
+      });
+
+      const bid = new BidRequestBuilder({
+        params: { placement: 'PAVE_ATF' }
+      }).build();
 
-    it('should return true when required params found', () => {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
-      expect(window.top.ADAGIO.adUnits['adunit-code'].printNumber).to.equal(1);
     })
 
-    it('should compute a printNumber for the new bid request on same adUnitCode and same pageviewId', () => {
-      spec.isBidRequestValid(bid);
-      expect(window.top.ADAGIO.adUnits).ok;
-      expect(window.top.ADAGIO.adUnits['adunit-code']).ok;
-      expect(window.top.ADAGIO.adUnits['adunit-code'].printNumber).to.equal(2);
+    it('should return false if bid.params is missing', function() {
+      sandbox.spy(utils, 'logWarn');
+      const bid01 = new BidRequestBuilder().build();
+
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+      sinon.assert.callCount(utils.logWarn, 1);
+    });
+
+    it('should use adUnit code for adUnitElementId and placement params', function() {
+      const bid01 = new BidRequestBuilder({ params: {
+        organizationId: '1000',
+        site: 'site-name',
+        useAdUnitCodeAsPlacement: true,
+        useAdUnitCodeAsAdUnitElementId: true
+      }}).build();
+
+      expect(spec.isBidRequestValid(bid01)).to.equal(true);
+      expect(bid01.params.adUnitElementId).to.equal('adunit-code');
+      expect(bid01.params.placement).to.equal('adunit-code');
+    });
+
+    it('should return false when a required param is missing', function() {
+      const bid01 = new BidRequestBuilder({ params: {
+        organizationId: '1000',
+        placement: 'PAVE_ATF'
+      }}).build();
+
+      const bid02 = new BidRequestBuilder({ params: {
+        organizationId: '1000',
+        site: 'SITE-NAME'
+      }}).build();
+
+      const bid03 = new BidRequestBuilder({ params: {
+        placement: 'PAVE_ATF',
+        site: 'SITE-NAME'
+      }}).build();
+
+      sandbox.stub(config, 'getConfig').withArgs('adagio').returns({
+        siteId: '1000'
+      });
+
+      const bid04 = new BidRequestBuilder({ params: { placement: 'PAVE_ATF' } }).build();
+
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+      expect(spec.isBidRequestValid(bid02)).to.equal(false);
+      expect(spec.isBidRequestValid(bid03)).to.equal(false);
+      expect(spec.isBidRequestValid(bid04)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests()', function() {
+    const expectedDataKeys = [
+      'id',
+      'organizationId',
+      'secure',
+      'device',
+      'site',
+      'pageviewId',
+      'adUnits',
+      'regs',
+      'user',
+      'schain',
+      'prebidVersion',
+      'featuresVersion',
+      'data'
+    ];
+
+    it('groups requests by organizationId', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      const bid02 = new BidRequestBuilder().withParams().build();
+      const bid03 = new BidRequestBuilder().withParams({
+        organizationId: '1002'
+      }).build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
 
-      spec.isBidRequestValid(bid);
-      expect(window.top.ADAGIO.adUnits['adunit-code'].printNumber).to.equal(3);
+      const requests = spec.buildRequests([bid01, bid02, bid03], bidderRequest);
 
-      window.top.ADAGIO.pageviewId = 123;
-      spec.isBidRequestValid(bid);
-      expect(window.top.ADAGIO.adUnits['adunit-code'].printNumber).to.equal(1);
+      expect(requests).to.have.lengthOf(2);
+
+      expect(requests[0].data.organizationId).to.equal('1000');
+      expect(requests[0].data.adUnits).to.have.lengthOf(2);
+
+      expect(requests[1].data.organizationId).to.equal('1002');
+      expect(requests[1].data.adUnits).to.have.lengthOf(1);
     });
 
-    it('should return false when organization params is not passed', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.organizationId;
-      expect(spec.isBidRequestValid(bidTest)).to.equal(false);
+    it('should send bid request to ENDPOINT_PB via POST', function() {
+      sandbox.stub(adagio, 'getDevice').returns({ a: 'a' });
+      sandbox.stub(adagio, 'getSite').returns({ domain: 'adagio.io', 'page': 'https://adagio.io/hb' });
+      sandbox.stub(adagio, 'getPageviewId').returns('1234-567');
+
+      const bid01 = new BidRequestBuilder().withParams().build();
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bid01], bidderRequest);
+
+      expect(requests).to.have.lengthOf(1);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(ENDPOINT);
+      expect(requests[0].options.contentType).to.eq('text/plain');
+      expect(requests[0].data).to.have.all.keys(expectedDataKeys);
     });
 
-    it('should return false when site params is not passed', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.site;
-      expect(spec.isBidRequestValid(bidTest)).to.equal(false);
+    it('should enqueue computed features for collect usage', function() {
+      sandbox.stub(Date, 'now').returns(12345);
+
+      const bid01 = new BidRequestBuilder().withParams().build();
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      adagioMock.expects('enqueue').withArgs(sinon.match({ action: 'features' })).atLeast(1);
+
+      const requests = spec.buildRequests([bid01], bidderRequest);
+
+      expect(requests[0].data).to.have.all.keys(expectedDataKeys);
+
+      adagioMock.verify();
     });
 
-    it('should return false when placement params is not passed', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.placement;
-      expect(spec.isBidRequestValid(bidTest)).to.equal(false);
+    it('should filter some props in case refererDetection.reachedTop is false', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      const bidderRequest = new BidderRequestBuilder({
+        refererInfo: {
+          numIframes: 2,
+          reachedTop: false,
+          referer: 'http://example.com/iframe1.html',
+          stack: [
+            null,
+            'http://example.com/iframe1.html',
+            'http://example.com/iframe2.html'
+          ],
+          canonicalUrl: ''
+        }
+      }).build();
+
+      const requests = spec.buildRequests([bid01], bidderRequest);
+
+      expect(requests).to.have.lengthOf(1);
+      expect(requests[0].data).to.have.all.keys(expectedDataKeys);
+      expect(requests[0].data.adUnits[0].features).to.exist;
+      expect(requests[0].data.adUnits[0].features.url).to.not.exist;
     });
 
-    it('should add autodetected adUnitElementId and environment params', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.adUnitElementId;
-      delete bidTest.params.environment;
-      sandbox.stub(utils, 'getGptSlotInfoForAdUnitCode').returns({divId: 'banner-atf'});
-      sandbox.stub(_features, 'getDevice').returns(4);
-      spec.isBidRequestValid(bidTest)
-      expect(bidTest.params.adUnitElementId).to.equal('banner-atf');
-      expect(bidTest.params.environment).to.equal('mobile');
-    })
+    describe('With video mediatype', function() {
+      context('Outstream video', function() {
+        it('should logWarn if user does not set renderer.backupOnly: true', function() {
+          sandbox.spy(utils, 'logWarn');
+          const bid01 = new BidRequestBuilder({
+            adUnitCode: 'adunit-code-01',
+            mediaTypes: {
+              banner: { sizes: [[300, 250]] },
+              video: {
+                context: 'outstream',
+                playerSize: [[300, 250]],
+                renderer: {
+                  url: 'https://url.tld',
+                  render: () => true
+                }
+              }
+            },
+          }).withParams().build();
+          const bidderRequest = new BidderRequestBuilder().build();
+          const request = spec.buildRequests([bid01], bidderRequest)[0];
 
-    it('should add autodetected tablet environment params', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.environment;
-      sandbox.stub(_features, 'getDevice').returns(5);
-      spec.isBidRequestValid(bidTest)
-      expect(bidTest.params.environment).to.equal('tablet');
-    })
+          expect(request.data.adUnits[0].mediaTypes.video.playerName).to.equal('other');
+          sinon.assert.calledWith(utils.logWarn, 'Adagio: renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.');
+        });
+      });
 
-    it('should return false if not in the window.top', () => {
-      sandbox.stub(utils, 'getWindowTop').throws();
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      it('Update mediaTypes.video with OpenRTB options. Validate and sanitize whitelisted OpenRTB', function() {
+        sandbox.spy(utils, 'logWarn');
+        const bid01 = new BidRequestBuilder({
+          adUnitCode: 'adunit-code-01',
+          mediaTypes: {
+            banner: { sizes: [[300, 250]] },
+            video: {
+              context: 'outstream',
+              playerSize: [[300, 250]],
+              mimes: ['video/mp4'],
+              api: 5, // will be removed because invalid
+              playbackmethod: [7], // will be removed because invalid
+            }
+          },
+        }).withParams({
+          // options in video, will overide
+          video: {
+            skip: 1,
+            skipafter: 4,
+            minduration: 10,
+            maxduration: 30,
+            placement: 3,
+            protocols: [8]
+          }
+        }).build();
+
+        const bidderRequest = new BidderRequestBuilder().build();
+        const expected = {
+          context: 'outstream',
+          playerSize: [[300, 250]],
+          playerName: 'adagio',
+          mimes: ['video/mp4'],
+          skip: 1,
+          skipafter: 4,
+          minduration: 10,
+          maxduration: 30,
+          placement: 3,
+          protocols: [8],
+          w: 300,
+          h: 250
+        };
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+        expect(requests).to.have.lengthOf(1);
+        expect(requests[0].data.adUnits[0].mediaTypes.video).to.deep.equal(expected);
+        sinon.assert.calledTwice(utils.logWarn.withArgs(sinon.match(new RegExp(/^Adagio: The OpenRTB/))));
+      });
     });
 
-    it('should expose ADAGIO.pbjsAdUnits in window', () => {
-      spec.isBidRequestValid(bidWithMediaTypes);
-      spec.isBidRequestValid(bid);
-      expect(window.top.ADAGIO.pbjsAdUnits).ok;
-      expect(window.top.ADAGIO.pbjsAdUnits).to.have.lengthOf(2);
-      const adUnitWithMediaTypeSizes = window.top.ADAGIO.pbjsAdUnits.filter((aU) => aU.code === 'adunit-code-2')[0];
-      const adUnitWithSizes = window.top.ADAGIO.pbjsAdUnits.filter((aU) => aU.code === 'adunit-code')[0];
-      expect(adUnitWithMediaTypeSizes.sizes).to.eql([[300, 250]]);
-      expect(adUnitWithSizes.sizes).to.eql([[300, 250], [300, 600]]);
+    describe('with sChain', function() {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'ssp.test',
+          sid: '00001',
+          hp: 1
+        }]
+      };
+
+      it('should add the schain if available at bidder level', function() {
+        const bid01 = new BidRequestBuilder({ schain }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data).to.have.all.keys(expectedDataKeys);
+        expect(requests[0].data.schain).to.deep.equal(schain);
+      });
+
+      it('Schain should not be added to the request', function() {
+        const bid01 = new BidRequestBuilder().withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.schain).to.not.exist;
+      });
     });
-  });
 
-  describe('buildRequests', () => {
-    const sandbox = sinon.createSandbox();
+    describe('with GDPR', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
 
-    const banner300x250 = {
-      x: 0,
-      y: 0,
-      width: 300,
-      height: 250,
-      getBoundingClientRect: () => {
+      const consentString = 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==';
+
+      const gdprConsentBuilderTCF1 = function gdprConsentBuilderTCF1(applies, allows) {
         return {
-          width: banner300x250.width,
-          height: banner300x250.height,
-          left: banner300x250.x,
-          top: banner300x250.y,
-          right: banner300x250.x + banner300x250.width,
-          bottom: banner300x250.y + banner300x250.height
+          consentString,
+          gdprApplies: applies,
+          allowAuctionWithoutConsent: allows,
+          apiVersion: 1
         };
-      },
-    };
+      };
 
-    const banner300x600 = {
-      x: 0,
-      y: 0,
-      width: 300,
-      height: 600,
-      getBoundingClientRect: () => {
+      const gdprConsentBuilderTCF2 = function gdprConsentBuilderTCF2(applies) {
         return {
-          width: banner300x600.width,
-          height: banner300x600.height,
-          left: banner300x600.x,
-          top: banner300x600.y,
-          right: banner300x600.x + banner300x600.width,
-          bottom: banner300x600.y + banner300x600.height
+          consentString,
+          gdprApplies: applies,
+          apiVersion: 2
         };
-      },
-    };
+      };
 
-    const computedStyleBlock = {
-      display: 'block'
-    };
+      context('When GDPR applies', function() {
+        it('send data.gdpr object to the server from TCF v.1.1 cmp', function() {
+          const bidderRequest = new BidderRequestBuilder({
+            gdprConsent: gdprConsentBuilderTCF1(true, true)
+          }).build();
+
+          const expected = {
+            consentString,
+            allowAuctionWithoutConsent: 1,
+            consentRequired: 1,
+            apiVersion: 1
+          };
 
-    const computedStyleNone = {
-      display: 'none'
-    };
+          const requests = spec.buildRequests([bid01], bidderRequest);
 
-    const stubs = {
-      topGetElementById: undefined,
-      topGetComputedStyle: undefined
-    }
+          expect(requests[0].data.regs.gdpr).to.deep.equal(expected);
+        });
 
-    top.ADAGIO = top.ADAGIO || {};
-    top.ADAGIO.adUnits = top.ADAGIO.adUnits || {};
-    top.ADAGIO.pbjsAdUnits = top.ADAGIO.pbjsAdUnits || [];
+        it('send data.gdpr object to the server from TCF v.2 cmp', function() {
+          const bidderRequest = new BidderRequestBuilder({
+            gdprConsent: gdprConsentBuilderTCF2(true)
+          }).build();
 
-    beforeEach(function () {
-      stubs.topGetElementById = sandbox.stub(top.document, 'getElementById');
-      stubs.topGetComputedStyle = sandbox.stub(top, 'getComputedStyle');
+          const expected = {
+            consentString,
+            allowAuctionWithoutConsent: 0,
+            consentRequired: 1,
+            apiVersion: 2
+          };
 
-      stubs.topGetElementById.withArgs('banner-atf-123').returns(banner300x250);
-      stubs.topGetElementById.withArgs('banner-atf-456').returns(banner300x600);
-      stubs.topGetElementById.withArgs('does-not-exist').returns(null);
-      stubs.topGetComputedStyle.returns(computedStyleBlock);
-    });
+          const requests = spec.buildRequests([bid01], bidderRequest);
 
-    afterEach(function () {
-      sandbox.restore();
-    });
+          expect(requests[0].data.regs.gdpr).to.deep.equal(expected);
+        });
+      });
 
-    after(function() {
-      sandbox.reset();
-    })
+      context('When GDPR does not applies', function() {
+        it('send data.gdpr object to the server from TCF v.1.1 cmp', function() {
+          const bidderRequest = new BidderRequestBuilder({
+            gdprConsent: gdprConsentBuilderTCF1(false, true)
+          }).build();
+
+          const expected = {
+            consentString,
+            allowAuctionWithoutConsent: 1,
+            consentRequired: 0,
+            apiVersion: 1
+          };
 
-    let bidRequests = [
-      {
-        'bidder': 'adagio',
-        'params': {
-          organizationId: '123',
-          site: 'ADAGIO-123',
-          placement: 'PAVE_ATF-123',
-          pagetype: 'ARTICLE',
-          adUnitElementId: 'banner-atf-123'
-        },
-        'adUnitCode': 'adunit-code1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c180kg4267tyqz',
-        'bidderRequestId': '8vfscuixrovn8i',
-        'auctionId': 'lel4fhp239i9km',
-      },
-      {
-        'bidder': 'adagio',
-        'params': {
-          organizationId: '123',
-          site: 'ADAGIO-123',
-          placement: 'PAVE_ATF-123',
-          pagetype: 'ARTICLE',
-          adUnitElementId: 'banner-atf-123'
-        },
-        'adUnitCode': 'adunit-code2',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c180kg4267tyqz',
-        'bidderRequestId': '8vfscuixrovn8i',
-        'auctionId': 'lel4fhp239i9km',
-      },
-      {
-        'bidder': 'adagio',
-        'params': {
-          organizationId: '456',
-          site: 'ADAGIO-456',
-          placement: 'PAVE_ATF-456',
-          pagetype: 'ARTICLE',
-          adUnitElementId: 'banner-atf-456'
-        },
-        'adUnitCode': 'adunit-code3',
-        'mediaTypes': {
-          banner: {
-            sizes: [[300, 250]]
-          }
-        },
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c180kg4267tyqz',
-        'bidderRequestId': '8vfscuixrovn8i',
-        'auctionId': 'lel4fhp239i9km',
-      }
-    ];
+          const requests = spec.buildRequests([bid01], bidderRequest);
 
-    const bidRequestsWithPostBid = [
-      {
-        'bidder': 'adagio',
-        'params': {
-          organizationId: '456',
-          site: 'ADAGIO-456',
-          placement: 'PAVE_ATF-456',
-          pagetype: 'ARTICLE',
-          adUnitElementId: 'banner-atf-456',
-          postBid: true
-        },
-        'adUnitCode': 'adunit-code3',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c180kg4267tyqz',
-        'bidderRequestId': '8vfscuixrovn8i',
-        'auctionId': 'lel4fhp239i9km',
-      }
-    ];
+          expect(requests[0].data.regs.gdpr).to.deep.equal(expected);
+        });
 
-    let consentString = 'theConsentString';
-    let bidderRequest = {
-      'bidderCode': 'adagio',
-      'auctionId': '12jejebn',
-      'bidderRequestId': 'hehehehbeheh',
-      'timeout': 3000,
-      'gdprConsent': {
-        consentString: consentString,
-        gdprApplies: true,
-        allowAuctionWithoutConsent: true,
-        apiVersion: 1,
-      },
-      'refererInfo': {
-        'numIframes': 0,
-        'reachedTop': true,
-        'referer': 'http://test.io/index.html?pbjs_debug=true'
-      }
-    };
+        it('send data.gdpr object to the server from TCF v.2 cmp', function() {
+          const bidderRequest = new BidderRequestBuilder({
+            gdprConsent: gdprConsentBuilderTCF2(false)
+          }).build();
 
-    let bidderRequestTCF2 = {
-      'bidderCode': 'adagio',
-      'auctionId': '12jejebn',
-      'bidderRequestId': 'hehehehbeheh',
-      'timeout': 3000,
-      'gdprConsent': {
-        consentString: consentString,
-        vendorData: {
-          tcString: consentString,
-          gdprApplies: true
-        },
-        gdprApplies: true,
-        apiVersion: 2
-      },
-      'refererInfo': {
-        'numIframes': 0,
-        'reachedTop': true,
-        'referer': 'http://test.io/index.html?pbjs_debug=true'
-      }
-    };
+          const expected = {
+            consentString,
+            consentRequired: 0,
+            allowAuctionWithoutConsent: 0,
+            apiVersion: 2
+          };
 
-    it('groups requests by siteId', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
+          const requests = spec.buildRequests([bid01], bidderRequest);
 
-      expect(requests[0].data.organizationId).to.equal('123');
-      expect(requests[0].data.adUnits).to.have.lengthOf(2);
+          expect(requests[0].data.regs.gdpr).to.deep.equal(expected);
+        });
+      });
 
-      expect(requests[1].data.organizationId).to.equal('456');
-      expect(requests[1].data.adUnits).to.have.lengthOf(1);
-    });
+      context('When GDPR is undefined in bidderRequest', function() {
+        it('send an empty data.gdpr to the server', function() {
+          const bidderRequest = new BidderRequestBuilder().build();
+          const requests = spec.buildRequests([bid01], bidderRequest);
 
-    it('sends bid request to ENDPOINT_PB via POST', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.method).to.equal('POST');
-      expect(request.url).to.equal(ENDPOINT);
-      expect(request.data.prebidVersion).to.equal('$prebid.version$');
+          expect(requests[0].data.regs.gdpr).to.be.empty;
+        });
+      });
     });
 
-    it('features params "adunit_position" must be empty if adUnitElement is not found in the DOM', () => {
-      const requests = spec.buildRequests([Object.assign({}, bidRequests[0], {params: {adUnitElementId: 'does-not-exist'}})], bidderRequest);
-      const request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
-      expect(request.data.adUnits[0].features.adunit_position).to.deep.equal('');
-    });
+    describe('with COPPA', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
 
-    it('features params "adunit_position" should be computed even if DOM element is display:none', () => {
-      stubs.topGetComputedStyle.returns(computedStyleNone);
-      const requests = spec.buildRequests([Object.assign({}, bidRequests[0])], bidderRequest);
-      let request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
-      expect(request.data.adUnits[0].features.adunit_position).to.equal('0x0');
-    });
+      it('should send the Coppa "required" flag set to "1" in the request', function () {
+        const bidderRequest = new BidderRequestBuilder().build();
 
-    it('features params "viewport" should be computed even if window.innerWidth is not supported', () => {
-      sandbox.stub(top, 'innerWidth').value(undefined);
-      const requests = spec.buildRequests([Object.assign({}, bidRequests[0])], bidderRequest);
-      let request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
-      expect(request.data.adUnits[0].features.viewport_dimensions).to.match(/^[\d]+x[\d]+$/);
-    });
+        sinon.stub(config, 'getConfig')
+          .withArgs('coppa')
+          .returns(true);
 
-    it('AdUnit requested should have the correct sizes array depending on the config', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests[1].data.adUnits[0]).to.have.property('mediaTypes');
-    });
+        const requests = spec.buildRequests([bid01], bidderRequest);
 
-    it('features params must be an object if featurejs is loaded', () => {
-      let requests = spec.buildRequests(bidRequests, bidderRequest);
-      let request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
+        expect(requests[0].data.regs.coppa.required).to.equal(1);
+
+        config.getConfig.restore();
+      });
     });
 
-    it('outerAdUnitElementId must be added when PostBid param has been set', () => {
-      top.ADAGIO = top.ADAGIO || {};
-      top.ADAGIO.pbjsAdUnits = [];
+    describe('without COPPA', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
 
-      top.ADAGIO.pbjsAdUnits.push({
-        code: bidRequestsWithPostBid[0].adUnitCode,
-        sizes: bidRequestsWithPostBid[0].sizes,
-        bids: [{
-          bidder: bidRequestsWithPostBid[0].bidder,
-          params: bidRequestsWithPostBid[0].params
-        }]
+      it('should send the Coppa "required" flag set to "0" in the request', function () {
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.regs.coppa.required).to.equal(0);
       });
-      let requests = spec.buildRequests(bidRequestsWithPostBid, bidderRequest);
-      let request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
-      expect(request.data.adUnits[0].params.outerAdUnitElementId).to.exist;
-      top.ADAGIO.pbjsAdUnits = undefined;
     });
 
-    it('generates a pageviewId if missing', () => {
-      window.top.ADAGIO = window.top.ADAGIO || {};
-      delete window.top.ADAGIO.pageviewId;
+    describe('with USPrivacy', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
 
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
+      const consent = 'Y11N';
+
+      it('should send the USPrivacy "ccpa.uspConsent" in the request', function () {
+        const bidderRequest = new BidderRequestBuilder({
+          uspConsent: consent
+        }).build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
 
-      expect(requests[0].data.pageviewId).to.exist.and.to.not.equal('_').and.to.not.equal('');
-      expect(requests[0].data.pageviewId).to.equal(requests[1].data.pageviewId);
+        expect(requests[0].data.regs.ccpa.uspConsent).to.equal(consent);
+      });
     });
 
-    it('uses an existing pageviewId if present', () => {
-      window.top.ADAGIO = window.top.ADAGIO || {};
-      window.top.ADAGIO.pageviewId = 'abc';
+    describe('without USPrivacy', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
 
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
+      it('should have an empty "ccpa" field in the request', function () {
+        const bidderRequest = new BidderRequestBuilder().build();
 
-      expect(requests[0].data.pageviewId).to.equal('abc');
-      expect(requests[1].data.pageviewId).to.equal('abc');
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.regs.ccpa).to.be.empty;
+      });
     });
 
-    it('should send the printNumber in features object', () => {
-      window.top.ADAGIO = window.top.ADAGIO || {};
-      window.top.ADAGIO.pageviewId = 'abc';
-      window.top.ADAGIO.adUnits['adunit-code1'] = {
-        pageviewId: 'abc',
-        printNumber: 2
+    describe('with userID modules', function() {
+      const userId = {
+        pubcid: '01EAJWWNEPN3CYMM5N8M5VXY22',
+        unsuported: '666'
       };
-      const requests = spec.buildRequests([bidRequests[0]], bidderRequest);
-      const request = requests[0];
-      expect(request.data.adUnits[0].features.print_number).to.equal('2');
-    });
 
-    it('organizationId param key must be a string', () => {
-      const requests = spec.buildRequests([Object.assign({}, bidRequests[0], {params: {organizationId: 1010}})], bidderRequest);
-      const request = requests[0];
-      expect(request.data.adUnits[0].params).to.exist;
-      expect(request.data.adUnits[0].params.organizationId).to.deep.equal('1010');
-      expect(request.data.organizationId).to.exist;
-      expect(request.data.organizationId).to.deep.equal('1010');
-    });
+      it('should send "user.eids" in the request for Prebid.js supported modules only', function() {
+        const bid01 = new BidRequestBuilder({
+          userId
+        }).withParams().build();
 
-    it('GDPR consent is applied', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr.consentString).to.exist.and.to.equal(consentString);
-      expect(request.data.gdpr.consentRequired).to.exist.and.to.equal(1);
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(1);
-    });
+        const bidderRequest = new BidderRequestBuilder().build();
 
-    it('GDPR consent is applied w/ TCF2', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequestTCF2);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr.consentString).to.exist.and.to.equal(consentString);
-      expect(request.data.gdpr.consentRequired).to.exist.and.to.equal(1);
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(2);
-    });
+        const requests = spec.buildRequests([bid01], bidderRequest);
 
-    it('GDPR consent is not applied', () => {
-      bidderRequest.gdprConsent.gdprApplies = false;
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr.consentString).to.exist.and.to.equal(consentString);
-      expect(request.data.gdpr.consentRequired).to.exist.and.to.equal(0);
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(1);
-    });
+        const expected = [{
+          source: 'pubcid.org',
+          uids: [
+            {
+              atype: 1,
+              id: '01EAJWWNEPN3CYMM5N8M5VXY22'
+            }
+          ]
+        }];
 
-    it('GDPR consent is not applied w/ TCF2', () => {
-      bidderRequestTCF2.gdprConsent.gdprApplies = false;
-      const requests = spec.buildRequests(bidRequests, bidderRequestTCF2);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr.consentString).to.exist.and.to.equal(consentString);
-      expect(request.data.gdpr.consentRequired).to.exist.and.to.equal(0);
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(2);
-    });
-
-    it('GDPR consent is undefined', () => {
-      delete bidderRequest.gdprConsent.consentString;
-      delete bidderRequest.gdprConsent.gdprApplies;
-      delete bidderRequest.gdprConsent.allowAuctionWithoutConsent;
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr).to.not.have.property('consentString');
-      expect(request.data.gdpr).to.not.have.property('gdprApplies');
-      expect(request.data.gdpr).to.not.have.property('allowAuctionWithoutConsent');
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(1);
-    });
-
-    it('GDPR consent is undefined w/ TCF2', () => {
-      delete bidderRequestTCF2.gdprConsent.consentString;
-      delete bidderRequestTCF2.gdprConsent.gdprApplies;
-      delete bidderRequestTCF2.gdprConsent.vendorData;
-      const requests = spec.buildRequests(bidRequests, bidderRequestTCF2);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr).to.not.have.property('consentString');
-      expect(request.data.gdpr).to.not.have.property('gdprApplies');
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(2);
-    });
+        expect(requests[0].data.user.eids).to.have.lengthOf(1);
+        expect(requests[0].data.user.eids).to.deep.equal(expected);
+      });
 
-    it('GDPR consent bidderRequest does not have gdprConsent', () => {
-      delete bidderRequest.gdprConsent;
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr).to.be.empty;
-    });
+      it('should send an empty "user.eids" array in the request if userId module is unsupported', function() {
+        const bid01 = new BidRequestBuilder({
+          userId: {
+            unsuported: '666'
+          }
+        }).withParams().build();
 
-    it('should expose version in window', () => {
-      expect(window.top.ADAGIO).ok;
-      expect(window.top.ADAGIO.versions).ok;
-      expect(window.top.ADAGIO.versions.adagioBidderAdapter).to.eq(VERSION);
-    });
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
 
-    it('should returns an empty array if the bidder cannot access to window top (based on refererInfo.reachedTop)', () => {
-      const requests = spec.buildRequests(bidRequests, {
-        ...bidderRequest,
-        refererInfo: { reachedTop: false }
+        expect(requests[0].data.user.eids).to.be.empty;
       });
-      expect(requests).to.be.empty;
     });
 
-    it('Should add the schain if available at bidder level', () => {
-      const bidRequest = Object.assign({}, bidRequests[0], {
-        schain: {
-          ver: '1.0',
-          complete: 1,
-          nodes: [{
-            asi: 'ssp.test',
-            sid: '00001',
-            hp: 1
-          }]
+    describe('with priceFloors module', function() {
+      it('should get and set floor by mediatype and sizes', function() {
+        const bid01 = new BidRequestBuilder({
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]]
+            },
+            video: {
+              playerSize: [600, 480]
+            }
+          }
+        }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        // delete the computed `sizes` prop as we are based on mediaTypes only.
+        delete bid01.sizes
+
+        bid01.getFloor = () => {
+          return { floor: 1, currency: 'USD' }
         }
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.adUnits[0].floors.length).to.equal(3);
+        expect(requests[0].data.adUnits[0].floors[0]).to.deep.equal({f: 1, mt: 'banner', s: '300x250'});
+        expect(requests[0].data.adUnits[0].floors[1]).to.deep.equal({f: 1, mt: 'banner', s: '300x600'});
+        expect(requests[0].data.adUnits[0].floors[2]).to.deep.equal({f: 1, mt: 'video', s: '600x480'});
+
+        expect(requests[0].data.adUnits[0].mediaTypes.banner.sizes.length).to.equal(2);
+        expect(requests[0].data.adUnits[0].mediaTypes.banner.bannerSizes[0]).to.deep.equal({size: [300, 250], floor: 1});
+        expect(requests[0].data.adUnits[0].mediaTypes.banner.bannerSizes[1]).to.deep.equal({size: [300, 600], floor: 1});
+        expect(requests[0].data.adUnits[0].mediaTypes.video.floor).to.equal(1);
       });
 
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const request = requests[0];
+      it('should get and set floor by mediatype if no size provided (ex native, video)', function() {
+        const bid01 = new BidRequestBuilder({
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              mimes: ['video/mp4']
+            },
+            native: {
+              body: { required: true }
+            }
+          }
+        }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+        bid01.getFloor = () => {
+          return { floor: 1, currency: 'USD' }
+        }
+        const requests = spec.buildRequests([bid01], bidderRequest);
 
-      expect(request.data.schain).to.exist;
-      expect(request.data.schain).to.deep.equal({
-        ver: '1.0',
-        complete: 1,
-        nodes: [{
-          asi: 'ssp.test',
-          sid: '00001',
-          hp: 1
-        }]
+        expect(requests[0].data.adUnits[0].floors.length).to.equal(2);
+        expect(requests[0].data.adUnits[0].floors[0]).to.deep.equal({f: 1, mt: 'video'});
+        expect(requests[0].data.adUnits[0].floors[1]).to.deep.equal({f: 1, mt: 'native'});
+
+        expect(requests[0].data.adUnits[0].mediaTypes.video.floor).to.equal(1);
+        expect(requests[0].data.adUnits[0].mediaTypes.native.floor).to.equal(1);
       });
-    });
 
-    it('Schain should not be added to the request', () => {
-      const requests = spec.buildRequests([bidRequests[0]], bidderRequest);
-      const request = requests[0];
-      expect(request.data.schain).to.not.exist;
+      it('should get and set floor with default value if no floors found', function() {
+        const bid01 = new BidRequestBuilder({
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              mimes: ['video/mp4']
+            }
+          }
+        }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+        bid01.getFloor = () => {
+          return { floor: NaN, currency: 'USD', mt: 'video' }
+        }
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.adUnits[0].floors.length).to.equal(1);
+        expect(requests[0].data.adUnits[0].floors[0]).to.deep.equal({mt: 'video'});
+        expect(requests[0].data.adUnits[0].mediaTypes.video.floor).to.be.undefined;
+      });
     });
   });
 
-  describe('interpretResponse', () => {
-    const sandbox = sinon.createSandbox();
-
+  describe('interpretResponse()', function() {
     let serverResponse = {
       body: {
         data: {
           pred: 1
         },
-        bids: [
-          {
-            ad: '<div style="background-color:red; height:250px; width:300px"></div>',
-            cpm: 1,
-            creativeId: 'creativeId',
-            currency: 'EUR',
-            height: 250,
-            netRevenue: true,
-            requestId: 'c180kg4267tyqz',
-            ttl: 360,
-            width: 300
+        bids: [{
+          ad: '<div style="background-color:red; height:250px; width:300px"></div>',
+          cpm: 1,
+          creativeId: 'creativeId',
+          currency: 'EUR',
+          height: 250,
+          netRevenue: true,
+          requestId: 'c180kg4267tyqz',
+          ttl: 360,
+          width: 300,
+          aDomain: ['advertiser.com'],
+          mediaType: 'banner',
+          meta: {
+            advertiserId: '80',
+            advertiserName: 'An Advertiser',
+            networkId: '110'
           }
-        ]
-      }
-    };
-
-    let emptyBodyServerResponse = {
-      body: null
-    };
-
-    let withoutBidsArrayServerResponse = {
-      body: {
-        bids: []
-      }
-    };
-
-    let serverResponseWhichThrowsException = {
-      body: {
-        data: {
-          pred: 1
-        },
-        bids: {
-          foo: 'bar'
-        }
+        }]
       }
     };
 
     let bidRequest = {
-      'data': {
-        'adUnits': [
-          {
-            'bidder': 'adagio',
-            'params': {
-              organizationId: '456',
-              site: 'ADAGIO-456',
-              placement: 'PAVE_ATF-456',
-              adUnitElementId: 'banner-atf-456',
-              pagetype: 'ARTICLE',
-              category: 'NEWS',
-              subcategory: 'SPORT',
-              environment: 'SITE-MOBILE'
-            },
-            'adUnitCode': 'adunit-code',
-            'sizes': [[300, 250], [300, 600]],
-            'bidId': 'c180kg4267tyqz',
-            'bidderRequestId': '8vfscuixrovn8i',
-            'auctionId': 'lel4fhp239i9km',
-            'pageviewId': 'd8c4fl2k39i0wn',
-          }
-        ]
+      data: {
+        adUnits: [{
+          bidder: 'adagio',
+          params: {
+            organizationId: '1000',
+            placement: 'PAVE_ATF',
+            site: 'SITE-NAME',
+            adUnitElementId: 'gpt-adunit-code',
+            pagetype: 'ARTICLE',
+            category: 'NEWS',
+            supportIObs: true
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: { sizes: [[300, 250], [300, 600]] }
+          },
+          bidId: 'c180kg4267tyqz',
+          bidderRequestId: '8vfscuixrovn8i',
+          auctionId: 'lel4fhp239i9km',
+          pageviewId: 'd8c4fl2k39i0wn',
+        }]
       }
     };
 
-    afterEach(function() {
-      sandbox.restore();
-    });
+    it('should return an empty response array if body is empty', function() {
+      expect(spec.interpretResponse({
+        body: null
+      }, bidRequest)).to.be.an('array').length(0);
 
-    it('Should returns empty response if body is empty', () => {
-      expect(spec.interpretResponse(emptyBodyServerResponse, bidRequest)).to.be.an('array').length(0);
-      expect(spec.interpretResponse({body: {}}, bidRequest)).to.be.an('array').length(0);
+      expect(spec.interpretResponse({
+        body: {}
+      }, bidRequest)).to.be.an('array').length(0);
     });
 
-    it('Should returns empty response if bids array is empty', () => {
-      expect(spec.interpretResponse({withoutBidsArrayServerResponse}, bidRequest)).to.be.an('array').length(0);
+    it('should return an empty response array if bids array is empty', function() {
+      expect(spec.interpretResponse({
+        body: {
+          bids: []
+        }
+      }, bidRequest)).to.be.an('array').length(0);
     });
 
-    it('should get correct bid response', () => {
+    it('should handle properly a correct bid response', function() {
       let expectedResponse = [{
         ad: '<div style="background-color:red; height:250px; width:300px"></div>',
         cpm: 1,
@@ -683,87 +819,729 @@ describe('adagioAdapter', () => {
         requestId: 'c180kg4267tyqz',
         ttl: 360,
         width: 300,
-        placement: 'PAVE_ATF-456',
-        site: 'ADAGIO-456',
+        placement: 'PAVE_ATF',
+        site: 'SITE-NAME',
         pagetype: 'ARTICLE',
         category: 'NEWS',
-        subcategory: 'SPORT',
-        environment: 'SITE-MOBILE'
+        aDomain: ['advertiser.com'],
+        mediaType: 'banner',
+        meta: {
+          advertiserId: '80',
+          advertiserName: 'An Advertiser',
+          advertiserDomains: ['advertiser.com'],
+          networkId: '110',
+          mediaType: 'banner'
+        }
       }];
+
       expect(spec.interpretResponse(serverResponse, bidRequest)).to.be.an('array');
       expect(spec.interpretResponse(serverResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
 
-    it('Should populate ADAGIO queue with ssp-data', () => {
-      spec.interpretResponse(serverResponse, bidRequest);
-      expect(window.top.ADAGIO).ok;
-      expect(window.top.ADAGIO.queue).to.be.an('array');
+    it('Meta props should be limited if no bid.meta is provided', function() {
+      const altServerResponse = utils.deepClone(serverResponse);
+      delete altServerResponse.body.bids[0].meta;
+
+      let expectedResponse = [{
+        ad: '<div style="background-color:red; height:250px; width:300px"></div>',
+        cpm: 1,
+        creativeId: 'creativeId',
+        currency: 'EUR',
+        height: 250,
+        netRevenue: true,
+        requestId: 'c180kg4267tyqz',
+        ttl: 360,
+        width: 300,
+        placement: 'PAVE_ATF',
+        site: 'SITE-NAME',
+        pagetype: 'ARTICLE',
+        category: 'NEWS',
+        aDomain: ['advertiser.com'],
+        mediaType: 'banner',
+        meta: {
+          advertiserDomains: ['advertiser.com'],
+          mediaType: 'banner'
+        }
+      }];
+
+      expect(spec.interpretResponse(altServerResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
 
-    it('Should not populate ADAGIO queue with ssp-data if not in top window', () => {
-      utils.getWindowTop().ADAGIO.queue = [];
-      sandbox.stub(utils, 'getWindowTop').throws();
+    it('should populate ADAGIO queue with ssp-data', function() {
+      sandbox.stub(Date, 'now').returns(12345);
+
+      adagioMock.expects('enqueue').withExactArgs({
+        action: 'ssp-data',
+        ts: 12345,
+        data: serverResponse.body.data
+      }).once();
+
       spec.interpretResponse(serverResponse, bidRequest);
-      expect(window.top.ADAGIO).ok;
-      expect(window.top.ADAGIO.queue).to.be.an('array');
-      expect(window.top.ADAGIO.queue).empty;
+
+      adagioMock.verify();
     });
 
-    it('should return an empty response even if an exception is ', () => {
-      expect(spec.interpretResponse(serverResponseWhichThrowsException, bidRequest)).to.be.an('array').length(0);
+    it('should properly try-catch an exception and return an empty array', function() {
+      sandbox.stub(adagio, 'enqueue').throws();
+      utilsMock.expects('logError').once();
+
+      expect(spec.interpretResponse(serverResponse, bidRequest)).to.be.an('array').length(0);
+
+      utilsMock.verify();
+    });
+
+    describe('Response with video outstream', () => {
+      const bidRequestWithOutstream = utils.deepClone(bidRequest);
+      bidRequestWithOutstream.data.adUnits[0].mediaTypes.video = {
+        context: 'outstream',
+        playerSize: [[300, 250]],
+        mimes: ['video/mp4'],
+        skip: true
+      };
+
+      const serverResponseWithOutstream = utils.deepClone(serverResponse);
+      serverResponseWithOutstream.body.bids[0].vastXml = '<VAST version="4.0"><Ad></Ad></VAST>';
+      serverResponseWithOutstream.body.bids[0].mediaType = 'video';
+      serverResponseWithOutstream.body.bids[0].outstream = {
+        bvwUrl: 'https://foo.baz',
+        impUrl: 'https://foo.bar'
+      };
+
+      it('should set a renderer in video outstream context', function() {
+        const bidResponse = spec.interpretResponse(serverResponseWithOutstream, bidRequestWithOutstream)[0];
+        expect(bidResponse).to.have.any.keys('outstream', 'renderer', 'mediaType');
+        expect(bidResponse.renderer).to.be.a('object');
+        expect(bidResponse.renderer.url).to.equal(RENDERER_URL);
+        expect(bidResponse.renderer.config.bvwUrl).to.be.ok;
+        expect(bidResponse.renderer.config.impUrl).to.be.ok;
+        expect(bidResponse.renderer.loaded).to.not.be.ok;
+        expect(bidResponse.width).to.equal(300);
+        expect(bidResponse.height).to.equal(250);
+        expect(bidResponse.vastUrl).to.match(/^data:text\/xml;/)
+      });
+
+      it('should execute Adagio outstreamPlayer if defined', function() {
+        window.ADAGIO.outstreamPlayer = sinon.stub();
+        const bidResponse = spec.interpretResponse(serverResponseWithOutstream, bidRequestWithOutstream)[0];
+        executeRenderer(bidResponse.renderer, bidResponse)
+        sinon.assert.calledOnce(window.ADAGIO.outstreamPlayer);
+        delete window.ADAGIO.outstreamPlayer;
+      });
+
+      it('should logError if Adagio outstreamPlayer is not defined', function() {
+        const bidResponse = spec.interpretResponse(serverResponseWithOutstream, bidRequestWithOutstream)[0];
+        executeRenderer(bidResponse.renderer, bidResponse)
+        utilsMock.expects('logError').withExactArgs('Adagio: Adagio outstream player is not defined').once();
+      });
+    });
+
+    describe('Response with native add', () => {
+      const serverResponseWithNative = utils.deepClone(serverResponse)
+      serverResponseWithNative.body.bids[0].mediaType = 'native';
+      serverResponseWithNative.body.bids[0].admNative = {
+        ver: '1.2',
+        link: {
+          url: 'https://i.am.a.click.url',
+          clicktrackers: [
+            'https://i.am.a.clicktracker.url'
+          ]
+        },
+        privacy: 'http://www.myprivacyurl.url',
+        ext: {
+          bvw: 'test'
+        },
+        eventtrackers: [
+          {
+            event: 1,
+            method: 1,
+            url: 'https://eventrack.local/impression'
+          },
+          {
+            event: 1,
+            method: 2,
+            url: 'https://eventrack.local/impression'
+          },
+          {
+            event: 2,
+            method: 1,
+            url: 'https://eventrack.local/viewable-mrc50'
+          }
+        ],
+        assets: [
+          {
+            title: {
+              text: 'My title'
+            }
+          },
+          {
+            img: {
+              url: 'https://images.local/image.jpg',
+              w: 100,
+              h: 250
+            }
+          },
+          {
+            img: {
+              type: 1,
+              url: 'https://images.local/icon.png',
+              w: 40,
+              h: 40
+            }
+          },
+          {
+            data: {
+              type: 1, // sponsored
+              value: 'Adagio'
+            }
+          },
+          {
+            data: {
+              type: 2, // desc / body
+              value: 'The super ad text'
+            }
+          },
+          {
+            data: {
+              type: 3, // rating
+              value: '10 from 10'
+            }
+          },
+          {
+            data: {
+              type: 11, // displayUrl
+              value: 'https://i.am.a.display.url'
+            }
+          }
+        ]
+      };
+
+      const bidRequestNative = utils.deepClone(bidRequest)
+      bidRequestNative.nativeParams = {
+        sendTargetingKeys: false,
+
+        clickUrl: {
+          required: true,
+        },
+        title: {
+          required: true,
+        },
+        body: {
+          required: true,
+        },
+        sponsoredBy: {
+          required: false
+        },
+        image: {
+          required: true
+        },
+        icon: {
+          required: true
+        },
+        privacyLink: {
+          required: false
+        },
+        ext: {
+          adagio_bvw: {}
+        }
+      };
+
+      it('Should ignore native parsing due to missing raw admNative property', () => {
+        const alternateServerResponse = utils.deepClone(serverResponseWithNative);
+        delete alternateServerResponse.body.bids[0].admNative
+        const r = spec.interpretResponse(alternateServerResponse, bidRequestNative);
+        expect(r[0].mediaType).to.equal(NATIVE);
+        expect(r[0].native).not.ok;
+        utilsMock.expects('logError').once();
+      });
+
+      it('Should ignore native parsing due to invalid raw admNative.assets property', () => {
+        const alternateServerResponse = utils.deepClone(serverResponseWithNative);
+        alternateServerResponse.body.bids[0].admNative.assets = { title: { text: 'test' } };
+        const r = spec.interpretResponse(alternateServerResponse, bidRequestNative);
+        expect(r[0].mediaType).to.equal(NATIVE);
+        expect(r[0].native).not.ok;
+        utilsMock.expects('logError').once();
+      });
+
+      it('Should handle and return a formated Native ad', () => {
+        const r = spec.interpretResponse(serverResponseWithNative, bidRequestNative);
+        const expected = {
+          displayUrl: 'https://i.am.a.display.url',
+          sponsoredBy: 'Adagio',
+          body: 'The super ad text',
+          rating: '10 from 10',
+          clickUrl: 'https://i.am.a.click.url',
+          title: 'My title',
+          impressionTrackers: [
+            'https://eventrack.local/impression'
+          ],
+          javascriptTrackers: '<script async src=\"https://eventrack.local/impression\"></script>',
+          clickTrackers: [
+            'https://i.am.a.clicktracker.url'
+          ],
+          image: {
+            url: 'https://images.local/image.jpg',
+            width: 100,
+            height: 250
+          },
+          icon: {
+            url: 'https://images.local/icon.png',
+            width: 40,
+            height: 40
+          },
+          ext: {
+            adagio_bvw: 'test'
+          },
+          privacyLink: 'http://www.myprivacyurl.url'
+        }
+        expect(r[0].mediaType).to.equal(NATIVE);
+        expect(r[0].native).ok;
+        expect(r[0].native).to.deep.equal(expected);
+      });
+
+      it('Should handle multiple javascriptTrackers in one single string', () => {
+        const serverResponseWithNativeCopy = utils.deepClone(serverResponseWithNative);
+        serverResponseWithNativeCopy.body.bids[0].admNative.eventtrackers.push(
+          {
+            event: 1,
+            method: 2,
+            url: 'https://eventrack.local/impression-2'
+          },)
+        const r = spec.interpretResponse(serverResponseWithNativeCopy, bidRequestNative);
+        const expected = '<script async src=\"https://eventrack.local/impression\"></script>\n<script async src=\"https://eventrack.local/impression-2\"></script>';
+        expect(r[0].native.javascriptTrackers).to.equal(expected);
+      });
     });
   });
 
-  describe('getUserSyncs', () => {
+  describe('getUserSyncs()', function() {
     const syncOptions = {
-      'iframeEnabled': 'true'
-    }
-    const serverResponses = [
-      {
+      syncEnabled: false
+    };
+
+    it('should handle user syncs if data is in the server response ', function() {
+      const serverResponses = [{
         body: {
           userSyncs: [
-            {
-              t: 'i',
-              u: 'https://test.url.com/setuid'
-            },
-            {
-              t: 'p',
-              u: 'https://test.url.com/setuid'
-            }
+            { t: 'i', u: 'https://test.url.com/setuid' },
+            { t: 'p', u: 'https://test.url.com/setuid' }
           ]
         }
-      }
-    ];
-
-    const emptyServerResponses = [
-      {
-        body: ''
-      }
-    ];
+      }];
 
-    it('should handle correctly user syncs', () => {
       let result = spec.getUserSyncs(syncOptions, serverResponses);
-      let emptyResult = spec.getUserSyncs(syncOptions, emptyServerResponses);
+
       expect(result[0].type).to.equal('iframe');
       expect(result[0].url).contain('setuid');
+
       expect(result[1].type).to.equal('image');
-      expect(emptyResult).to.equal(false);
+      expect(result[1].url).contain('setuid');
+    });
+
+    it('should return false if data is not in server response', function() {
+      const serverResponse = [{ body: '' }];
+      const result = spec.getUserSyncs(syncOptions, serverResponse);
+      expect(result).to.equal(false);
+    });
+  });
+
+  describe('transformBidParams', function() {
+    it('Compute additional params in s2s mode', function() {
+      GlobalExchange.prepareExchangeData('{}');
+
+      sandbox.stub(window.top.document, 'getElementById').returns(
+        fixtures.getElementById()
+      );
+      sandbox.stub(window.top, 'getComputedStyle').returns({ display: 'block' });
+      sandbox.stub(utils, 'inIframe').returns(false);
+
+      const adUnit = {
+        code: 'adunit-code',
+        params: {
+          organizationId: '1000'
+        }
+      };
+      const bid01 = new BidRequestBuilder({
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] },
+          video: {
+            context: 'outstream',
+            playerSize: [300, 250],
+            renderer: {
+              url: 'https://url.tld',
+              render: () => true
+            }
+          }
+        }
+      }).withParams().build();
+
+      const params = spec.transformBidParams({ organizationId: '1000' }, true, adUnit, [{ bidderCode: 'adagio', auctionId: bid01.auctionId, bids: [bid01] }]);
+
+      expect(params.organizationId).to.exist;
+      expect(params.auctionId).to.exist;
+      expect(params.playerName).to.exist;
+      expect(params.playerName).to.equal('other');
+      expect(params.features).to.exist;
+      expect(params.features.page_dimensions).to.exist;
+      expect(params.features.adunit_position).to.exist;
+      expect(params.features.dom_loading).to.exist;
+      expect(params.features.print_number).to.exist;
+      expect(params.features.user_timestamp).to.exist;
+      expect(params.placement).to.exist;
+      expect(params.adUnitElementId).to.exist;
+      expect(params.site).to.exist;
+      expect(params.data.session).to.exist;
     });
   });
 
-  describe('adagioScriptFromLocalStorageCb', () => {
+  describe('Adagio features when prebid in top.window', function() {
+    it('should return all expected features when all expected bidder params are available', function() {
+      sandbox.stub(window.top.document, 'getElementById').returns(
+        fixtures.getElementById()
+      );
+      sandbox.stub(window.top, 'getComputedStyle').returns({ display: 'block' });
+      sandbox.stub(utils, 'inIframe').returns(false);
+
+      const bidRequest = new BidRequestBuilder({
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] }
+        }
+      }).withParams().build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const result = requests[0].data.adUnits[0].features;
+
+      expect(result.adunit_position).to.match(/^[\d]+x[\d]+$/);
+      expect(result.page_dimensions).to.match(/^[\d]+x[\d]+$/);
+      expect(result.viewport_dimensions).to.match(/^[\d]+x[\d]+$/);
+      expect(result.print_number).to.be.a('String');
+      expect(result.dom_loading).to.be.a('String');
+      expect(result.user_timestamp).to.be.a('String');
+      expect(result.url).to.not.exist;
+      expect(result.device).to.not.exist;
+      expect(result.os).to.not.exist;
+      expect(result.browser).to.not.exist;
+    });
+
+    it('should return all expected features when `adUnitElementId` param is not available', function() {
+      sandbox.stub(utils, 'inIframe').returns(false);
+
+      const bidRequest = new BidRequestBuilder({
+        params: {
+          organizationId: '1000',
+          placement: 'PAVE_ATF',
+          site: 'SITE-NAME'
+        },
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] }
+        }
+      }).build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const result = requests[0].data.adUnits[0].features;
+
+      expect(result.adunit_position).to.not.exist;
+      expect(result.page_dimensions).to.be.a('String');
+      expect(result.viewport_dimensions).to.be.a('String');
+      expect(result.print_number).to.be.a('String');
+      expect(result.dom_loading).to.be.a('String');
+      expect(result.user_timestamp).to.be.a('String');
+    });
+
+    it('should return `adunit_position` feature when the slot is hidden', function () {
+      const elem = fixtures.getElementById();
+      sandbox.stub(window.top.document, 'getElementById').returns(elem);
+      sandbox.stub(window.top, 'getComputedStyle').returns({ display: 'none' });
+      sandbox.stub(utils, 'inIframe').returns(false);
+
+      const bidRequest = new BidRequestBuilder({
+        mediaTypes: {
+          banner: { sizes: [[300, 250]] },
+        },
+      })
+        .withParams()
+        .build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const result = requests[0].data.adUnits[0].features;
+
+      expect(result.adunit_position).to.match(/^[\d]+x[\d]+$/);
+      expect(elem.style.display).to.equal(null); // set null to reset style
+    });
+  });
+
+  describe('Adagio features when prebid in Safeframe', function() {
+    beforeEach(function () {
+      window.$sf = $sf;
+    });
+
+    afterEach(function () {
+      delete window.$sf;
+    });
+
+    it('should return all expected features when prebid is in safeframe iframe', function() {
+      sandbox.stub(window.$sf.ext, 'geom').returns({
+        win: {t: 23, r: 1920, b: 1200, l: 0, w: 1920, h: 1177},
+        self: {t: 210, r: 1159, b: 460, l: 859, w: 300, h: 250},
+      });
+
+      const bidRequest = new BidRequestBuilder({
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] }
+        }
+      }).withParams().build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const result = requests[0].data.adUnits[0].features;
+
+      expect(result.page_dimensions).to.not.exist;
+      expect(result.viewport_dimensions).to.be.a('String');
+      expect(result.print_number).to.be.a('String');
+      expect(result.dom_loading).to.be.a('String');
+      expect(result.user_timestamp).to.be.a('String');
+      expect(result.adunit_position).to.exist;
+    });
+
+    it('should return all expected features when prebid safeframe api not properly implemented', function() {
+      const bidRequest = new BidRequestBuilder({
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] }
+        }
+      }).withParams().build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const result = requests[0].data.adUnits[0].features;
+
+      expect(result.page_dimensions).to.not.exist;
+      expect(result.viewport_dimensions).to.not.exist;
+      expect(result.print_number).to.be.a('String');
+      expect(result.dom_loading).to.be.a('String');
+      expect(result.user_timestamp).to.be.a('String');
+      expect(result.adunit_position).to.not.exist;
+    });
+
+    it('should return all expected features when prebid safeframe api not properly implemented bis', function() {
+      window.$sf.ext.geom = undefined;
+
+      const bidRequest = new BidRequestBuilder({
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] }
+        }
+      }).withParams().build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const result = requests[0].data.adUnits[0].features;
+
+      expect(result.page_dimensions).to.not.exist;
+      expect(result.viewport_dimensions).to.not.exist;
+      expect(result.print_number).to.be.a('String');
+      expect(result.dom_loading).to.be.a('String');
+      expect(result.user_timestamp).to.be.a('String');
+      expect(result.adunit_position).to.not.exist;
+    });
+  });
+
+  describe('Adagio features when prebid in crossdomain iframe', function() {
+    it('should return all expected features', function() {
+      sandbox.stub(utils, 'getWindowTop').throws();
+
+      const bidRequest = new BidRequestBuilder({
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] }
+        }
+      }).withParams().build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const result = requests[0].data.adUnits[0].features;
+
+      expect(result.page_dimensions).to.not.exist;
+      expect(result.viewport_dimensions).to.not.exist;
+      expect(result.print_number).to.be.a('String');
+      expect(result.dom_loading).to.be.a('String');
+      expect(result.user_timestamp).to.be.a('String');
+      expect(result.adunit_position).to.not.exist;
+    });
+  });
+
+  describe.skip('optional params auto detection', function() {
+    it('should auto detect adUnitElementId when GPT is used', function() {
+      sandbox.stub(utils, 'getGptSlotInfoForAdUnitCode').withArgs('banner').returns({divId: 'gpt-banner'});
+      expect(adagio.autoDetectAdUnitElementId('banner')).to.eq('gpt-banner');
+    });
+  });
+
+  describe.skip('print number handling', function() {
+    it('should return 1 if no adunit-code found. This means it is the first auction', function() {
+      sandbox.stub(adagio, 'getPageviewId').returns('abc-def');
+      expect(adagio.computePrintNumber('adunit-code')).to.eql(1);
+    });
+
+    it('should increment the adunit print number when the adunit-code has already been used for an other auction', function() {
+      sandbox.stub(adagio, 'getPageviewId').returns('abc-def');
+
+      window.top.ADAGIO.adUnits['adunit-code'] = {
+        pageviewId: 'abc-def',
+        printNumber: 1,
+      };
+
+      expect(adagio.computePrintNumber('adunit-code')).to.eql(2);
+    });
+  });
+
+  describe('site information using refererDetection or window.top', function() {
+    it('should returns domain, page and window.referrer in a window.top context', function() {
+      const bidderRequest = new BidderRequestBuilder({
+        refererInfo: {
+          numIframes: 0,
+          reachedTop: true,
+          topmostLocation: 'https://test.io/article/a.html',
+          page: 'https://test.io/article/a.html',
+          domain: 'test.io',
+          ref: 'https://google.com'
+        }
+      }).build();
+
+      expect(adagio.getSite(bidderRequest)).to.deep.equal({
+        domain: 'test.io',
+        page: 'https://test.io/article/a.html',
+        referrer: 'https://google.com',
+        top: true
+      });
+    });
+
+    it('should returns domain and page in a cross-domain w/ top domain reached context', function() {
+      sandbox.stub(utils, 'getWindowTop').throws();
+      sandbox.stub(utils, 'getWindowSelf').returns({
+        document: {
+          referrer: 'https://google.com'
+        }
+      });
+
+      const info = {
+        numIframes: 0,
+        reachedTop: true,
+        page: 'http://level.io/',
+        topmostLocation: 'http://level.io/',
+        stack: [
+          'http://level.io/',
+          'http://example.com/iframe1.html',
+          'http://example.com/iframe2.html'
+        ],
+        canonicalUrl: '',
+        domain: 'level.io',
+        ref: null,
+      };
+
+      const bidderRequest = new BidderRequestBuilder({
+        refererInfo: info
+      }).build();
+
+      expect(adagio.getSite(bidderRequest)).to.deep.equal({
+        domain: 'level.io',
+        page: 'http://level.io/',
+        referrer: 'https://google.com',
+        top: true
+      });
+    });
+
+    it('should return info in a cross-domain w/o top domain reached and w/o ancestor context', function() {
+      sandbox.stub(utils, 'getWindowTop').throws();
+
+      const info = {
+        numIframes: 2,
+        reachedTop: false,
+        topmostLocation: 'http://example.com/iframe1.html',
+        stack: [
+          null,
+          'http://example.com/iframe1.html',
+          'http://example.com/iframe2.html'
+        ],
+        canonicalUrl: '',
+        page: null,
+        domain: null,
+        ref: null
+      };
+
+      const bidderRequest = new BidderRequestBuilder({
+        refererInfo: info
+      }).build();
+
+      const s = adagio.getSite(bidderRequest)
+      expect(s.domain).equal('example.com')
+      expect(s.page).equal('http://example.com/iframe1.html')
+      expect(s.referrer).match(/^https?:\/\/.+/);
+      expect(s.top).equal(false)
+    });
+  });
+
+  describe('adagioScriptFromLocalStorageCb()', function() {
     const VALID_HASH = 'Lddcw3AADdQDrPtbRJkKxvA+o1CtScGDIMNRpHB3NnlC/FYmy/9RKXelKrYj/sjuWusl5YcOpo+lbGSkk655i8EKuDiOvK6ae/imxSrmdziIp+S/TA6hTFJXcB8k1Q9OIp4CMCT52jjXgHwX6G0rp+uYoCR25B1jHaHnpH26A6I=';
     const INVALID_HASH = 'invalid';
     const VALID_SCRIPT_CONTENT = 'var _ADAGIO=function(){};(_ADAGIO)();\n';
     const INVALID_SCRIPT_CONTENT = 'var _ADAGIO=function(){//corrupted};(_ADAGIO)();\n';
     const ADAGIO_LOCALSTORAGE_KEY = 'adagioScript';
 
+    beforeEach(function() {
+      localStorage.removeItem(ADAGIO_LOCALSTORAGE_KEY);
+    });
+
+    describe('getAdagioScript', function() {
+      it('should run storage.getDataFromLocalStorage callback and call adagioScriptFromLocalStorageCb() ', function() {
+        sandbox.spy(adagio, 'adagioScriptFromLocalStorageCb');
+        const getDataFromLocalStorageStub = sandbox.stub(storage, 'getDataFromLocalStorage').callsArg(1);
+        localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, '// hash: ' + VALID_HASH + '\n' + VALID_SCRIPT_CONTENT);
+
+        getAdagioScript();
+
+        sinon.assert.callCount(getDataFromLocalStorageStub, 1);
+        sinon.assert.callCount(adagio.adagioScriptFromLocalStorageCb, 1);
+      });
+
+      it('should load external script if the user consent', function() {
+        sandbox.stub(storage, 'localStorageIsEnabled').callsArgWith(0, true);
+        getAdagioScript();
+
+        expect(loadExternalScript.called).to.be.true;
+      });
+
+      it('should not load external script if the user does not consent', function() {
+        sandbox.stub(storage, 'localStorageIsEnabled').callsArgWith(0, false);
+        getAdagioScript();
+
+        expect(loadExternalScript.called).to.be.false;
+      });
+
+      it('should remove the localStorage key if exists and the user does not consent', function() {
+        sandbox.stub(storage, 'localStorageIsEnabled').callsArgWith(0, false);
+        localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, 'the script');
+
+        getAdagioScript();
+
+        expect(loadExternalScript.called).to.be.false;
+        expect(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY)).to.be.null;
+      });
+    });
+
     it('should verify valid hash with valid script', function () {
       localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, '// hash: ' + VALID_HASH + '\n' + VALID_SCRIPT_CONTENT);
 
-      utilsMock.expects('logInfo').withExactArgs('Start Adagio script').once();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Adagio script found').never();
+      utilsMock.expects('logInfo').withExactArgs('Adagio: start script.').once();
+      utilsMock.expects('logWarn').withExactArgs('Adagio: no hash found.').never();
+      utilsMock.expects('logWarn').withExactArgs('Adagio: invalid script found.').never();
 
       adagioScriptFromLocalStorageCb(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY));
 
@@ -774,9 +1552,9 @@ describe('adagioAdapter', () => {
     it('should verify valid hash with invalid script', function () {
       localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, '// hash: ' + VALID_HASH + '\n' + INVALID_SCRIPT_CONTENT);
 
-      utilsMock.expects('logInfo').withExactArgs('Start Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Adagio script found').once();
+      utilsMock.expects('logInfo').withExactArgs('Adagio: start script').never();
+      utilsMock.expects('logWarn').withExactArgs('Adagio: no hash found.').never();
+      utilsMock.expects('logWarn').withExactArgs('Adagio: invalid script found.').once();
 
       adagioScriptFromLocalStorageCb(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY));
 
@@ -787,9 +1565,9 @@ describe('adagioAdapter', () => {
     it('should verify invalid hash with valid script', function () {
       localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, '// hash: ' + INVALID_HASH + '\n' + VALID_SCRIPT_CONTENT);
 
-      utilsMock.expects('logInfo').withExactArgs('Start Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Adagio script found').once();
+      utilsMock.expects('logInfo').withExactArgs('Adagio: start script').never();
+      utilsMock.expects('logWarn').withExactArgs('Adagio: no hash found.').never();
+      utilsMock.expects('logWarn').withExactArgs('Adagio: invalid script found.').once();
 
       adagioScriptFromLocalStorageCb(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY));
 
@@ -800,14 +1578,21 @@ describe('adagioAdapter', () => {
     it('should verify missing hash', function () {
       localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, VALID_SCRIPT_CONTENT);
 
-      utilsMock.expects('logInfo').withExactArgs('Start Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in Adagio script').once();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Adagio script found').never();
+      utilsMock.expects('logInfo').withExactArgs('Adagio: start script').never();
+      utilsMock.expects('logWarn').withExactArgs('Adagio: no hash found.').once();
+      utilsMock.expects('logWarn').withExactArgs('Adagio: invalid script found.').never();
 
       adagioScriptFromLocalStorageCb(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY));
 
       expect(localStorage.getItem(ADAGIO_LOCALSTORAGE_KEY)).to.be.null;
       utilsMock.verify();
     });
+
+    it('should return false if content script does not exist in localStorage', function() {
+      sandbox.spy(utils, 'logWarn');
+      expect(adagioScriptFromLocalStorageCb(null)).to.be.undefined;
+      sinon.assert.callCount(utils.logWarn, 1);
+      sinon.assert.calledWith(utils.logWarn, 'Adagio: script not found.');
+    });
   });
 });
diff --git a/test/spec/modules/adbookpspBidAdapter_spec.js b/test/spec/modules/adbookpspBidAdapter_spec.js
new file mode 100755
index 00000000000..f7e401fefbd
--- /dev/null
+++ b/test/spec/modules/adbookpspBidAdapter_spec.js
@@ -0,0 +1,1339 @@
+import { expect } from 'chai';
+import * as utils from '../../../src/utils.js';
+import {
+  spec,
+  storage,
+  DEFAULT_BIDDER_CONFIG,
+  VERSION,
+  common,
+} from '../../../modules/adbookpspBidAdapter.js';
+
+describe('adbookpsp bid adapter', () => {
+  let sandbox;
+
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+
+    sandbox
+      .stub(common, 'generateUUID')
+      .returns('54444444-5444-4444-9444-544444444444');
+    sandbox.stub(common, 'getWindowDimensions').returns({
+      innerWidth: 100,
+      innerHeight: 100,
+    });
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
+
+  describe('isBidRequestValid()', () => {
+    it('should return false when there is no banner in mediaTypes', () => {
+      const bid = utils.deepClone(bannerBid);
+      delete bid.mediaTypes.banner;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when orgId and placementId is not defined', () => {
+      const bid = utils.deepClone(bannerBid);
+      delete bid.params.placementId;
+      delete bid.params.orgId;
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('should return true when orgId is set in config', () => {
+      const bid = utils.deepClone(bannerBid);
+
+      delete bid.params.placementId;
+      delete bid.params.orgId;
+
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.orgId')
+        .returns('129576');
+
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should return true when required params found', () => {
+      expect(spec.isBidRequestValid(bannerBid)).to.equal(true);
+      expect(spec.isBidRequestValid(videoBid)).to.equal(true);
+      expect(spec.isBidRequestValid(mixedBid)).to.equal(true);
+    });
+
+    it('should return false when sizes for banner are not specified', () => {
+      const bid = utils.deepClone(bannerBid);
+      delete bid.mediaTypes.banner.sizes;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when sizes for banner are invalid', () => {
+      const bid = utils.deepClone(bannerBid);
+      delete bid.mediaTypes.banner.sizes;
+
+      bid.mediaTypes.banner.sizes = [['123', 'foo']];
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true if player size is set via playerSize', () => {
+      expect(spec.isBidRequestValid(videoBid)).to.equal(true);
+    });
+
+    it('should return true if player size is set via w and h', () => {
+      const bid = utils.deepClone(videoBid);
+      delete bid.mediaTypes.video.playerSize;
+
+      bid.mediaTypes.video.w = 400;
+      bid.mediaTypes.video.h = 300;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should reutrn false if player size is not set', () => {
+      const bid = utils.deepClone(videoBid);
+      delete bid.mediaTypes.video.playerSize;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests()', () => {
+    it('should build correct request for banner bid', () => {
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.orgId')
+        .returns(undefined)
+        .withArgs('adbookpsp.exchangeUrl')
+        .returns('https://ex.fattail.com/openrtb2');
+
+      const requests = spec.buildRequests([bannerBid], bidderRequest);
+
+      expect(requests).to.have.lengthOf(1);
+      expect(requests[0]).to.deep.include({
+        method: 'POST',
+        url: 'https://ex.fattail.com/openrtb2',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true,
+        },
+      });
+      expect(JSON.parse(requests[0].data)).to.deep.equal(bannerExchangeRequest);
+    });
+
+    it('should build correct request for video bid', () => {
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp')
+        .returns(DEFAULT_BIDDER_CONFIG)
+        .withArgs('adbookpsp.exchangeUrl')
+        .returns(DEFAULT_BIDDER_CONFIG.exchangeUrl)
+        .withArgs('adbookpsp.orgId')
+        .returns(undefined);
+
+      const requests = spec.buildRequests([videoBid], bidderRequest);
+
+      expect(requests).to.have.lengthOf(1);
+      expect(requests[0]).to.deep.include({
+        method: 'POST',
+        url: 'https://ex.fattail.com/openrtb2',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true,
+        },
+      });
+      expect(JSON.parse(requests[0].data)).to.deep.include({
+        ...videoExchangeRequest,
+        ext: {
+          adbook: {
+            config: DEFAULT_BIDDER_CONFIG,
+            version: {
+              adapter: VERSION,
+              prebid: '$prebid.version$',
+            },
+          },
+        },
+      });
+    });
+
+    it('should build correct request for video bid with w and h', () => {
+      const bid = utils.deepClone(videoBid);
+
+      delete bid.mediaTypes.video.playerSize;
+
+      bid.mediaTypes.video.w = 400;
+      bid.mediaTypes.video.h = 300;
+
+      const [request] = spec.buildRequests([bid], bidderRequest);
+      const requestData = JSON.parse(request.data);
+
+      expect(requestData.imp[0].video.w).to.equal(400);
+      expect(requestData.imp[0].video.h).to.equal(300);
+    });
+
+    it('should build correct request for video bid with both w, h and playerSize', () => {
+      const bid = utils.deepClone(videoBid);
+
+      bid.mediaTypes.video.w = 640;
+      bid.mediaTypes.video.h = 480;
+
+      const [request] = spec.buildRequests([bid], bidderRequest);
+      const requestData = JSON.parse(request.data);
+
+      expect(requestData.imp[0].video.w).to.equal(640);
+      expect(requestData.imp[0].video.h).to.equal(480);
+    });
+
+    it('should build correct request for mixed bid', () => {
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.orgId')
+        .returns(undefined)
+        .withArgs('adbookpsp.exchangeUrl')
+        .returns('https://ex.fattail.com/openrtb2');
+
+      const requests = spec.buildRequests([mixedBid], bidderRequest);
+
+      expect(requests).to.have.lengthOf(1);
+      expect(requests[0]).to.deep.include({
+        method: 'POST',
+        url: 'https://ex.fattail.com/openrtb2',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true,
+        },
+      });
+      expect(JSON.parse(requests[0].data)).to.deep.include(
+        mixedExchangeRequest
+      );
+    });
+
+    it('should use orgId from config', () => {
+      const bid = utils.deepClone(bannerBid);
+
+      delete bid.params;
+
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.orgId')
+        .returns('129576');
+
+      const requests = spec.buildRequests([bid], bidderRequest);
+      const request = JSON.parse(requests[0].data);
+
+      expect(request.imp[0].ext).to.deep.include({
+        adbook: {
+          orgId: '129576',
+        },
+      });
+    });
+
+    it('should use orgId from adUnit when orgId is also set in config', () => {
+      const bid = utils.deepClone(bannerBid);
+
+      delete bid.params.placementId;
+
+      bid.params.orgId = 'adUnitOrgId';
+
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.orgId')
+        .returns('configOrgId');
+
+      const requests = spec.buildRequests([bid], bidderRequest);
+      const request = JSON.parse(requests[0].data);
+
+      expect(request.imp[0].ext).to.deep.include({
+        adbook: {
+          orgId: 'adUnitOrgId',
+        },
+      });
+    });
+
+    it('should include in request GDPR options if available', () => {
+      const request = utils.deepClone(bidderRequest);
+
+      delete request.uspConsent;
+
+      const requests = spec.buildRequests([bannerBid, mixedBid], request);
+
+      expect(JSON.parse(requests[0].data)).to.deep.include({
+        regs: {
+          coppa: 0,
+          ext: {
+            gdpr: 1,
+            gdprConsentString: 'gdprConsentString',
+          },
+        },
+      });
+    });
+
+    it('should include in request USP (CPPA) options if available', () => {
+      const request = utils.deepClone(bidderRequest);
+
+      delete request.gdprConsent;
+
+      const requests = spec.buildRequests([bannerBid, mixedBid], request);
+
+      expect(JSON.parse(requests[0].data)).to.deep.include({
+        regs: {
+          coppa: 0,
+          ext: {
+            us_privacy: 'uspConsentString',
+          },
+        },
+      });
+    });
+
+    it('should pass valid coppa flag based on config', () => {
+      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
+
+      const request = utils.deepClone(bidderRequest);
+
+      delete request.gdprConsent;
+      delete request.uspConsent;
+
+      const requests = spec.buildRequests([bannerBid, mixedBid], request);
+
+      expect(JSON.parse(requests[0].data)).to.deep.include({
+        regs: {
+          coppa: 1,
+        },
+      });
+    });
+
+    it('should pass GDPR, USP (CCPA) and COPPA options', () => {
+      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
+
+      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
+
+      expect(JSON.parse(requests[0].data)).to.deep.include({
+        regs: {
+          coppa: 1,
+          ext: {
+            gdpr: 1,
+            gdprConsentString: 'gdprConsentString',
+            us_privacy: 'uspConsentString',
+          },
+        },
+      });
+    });
+
+    it('should generate and pass user id when is not present in cookie and local storage is not enabled', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(false);
+      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
+      const rtbRequest = JSON.parse(requests[0].data);
+
+      expect(rtbRequest.user.id).to.have.lengthOf(36);
+    });
+
+    it('should pass user id when is present in cookie', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(false);
+      sandbox
+        .stub(storage, 'getCookie')
+        .returns('e35da6bb-f2f8-443b-aeff-3375bef45c9d');
+      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
+      const rtbRequest = JSON.parse(requests[0].data);
+
+      expect(rtbRequest.user.id).to.equal(
+        'e35da6bb-f2f8-443b-aeff-3375bef45c9d'
+      );
+    });
+
+    it('should pass user id if is present in local storage', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      sandbox
+        .stub(storage, 'getDataFromLocalStorage')
+        .returns('e35da6bb-f2f8-443b-aeff-3375bef45c9d');
+
+      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
+      const rtbRequest = JSON.parse(requests[0].data);
+      expect(rtbRequest.user.id).to.equal(
+        'e35da6bb-f2f8-443b-aeff-3375bef45c9d'
+      );
+    });
+
+    it('should regenerate user id if it is invalid', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      sandbox.stub(storage, 'getDataFromLocalStorage').returns('foo');
+
+      const requests = spec.buildRequests([bannerBid, mixedBid], bidderRequest);
+      const rtbRequest = JSON.parse(requests[0].data);
+      expect(rtbRequest.user.id).to.have.lengthOf(36);
+    });
+
+    it('should pass schain if available', () => {
+      const bid = utils.deepClone(bannerBid);
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'exchange1.com',
+            sid: '1234',
+            hp: 1,
+            rid: 'bid-request-1',
+            name: 'publisher',
+            domain: 'publisher.com',
+          },
+        ],
+      };
+
+      bid.schain = schain;
+
+      const requests = spec.buildRequests([bid], bidderRequest);
+
+      expect(JSON.parse(requests[0].data).source).to.deep.include({
+        ext: {
+          schain,
+        },
+      });
+    });
+
+    it('return empty array if there are no valid bid requests', () => {
+      const requests = spec.buildRequests([], bidderRequest);
+
+      expect(requests).to.deep.equal([]);
+    });
+
+    it('should prioritize device information set in config', () => {
+      const ua =
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 13_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.1 Mobile/15E148 Safari/604.1';
+
+      sandbox.stub(common, 'getConfig').withArgs('device').returns({
+        ua,
+      });
+
+      const requests = spec.buildRequests([bannerBid], bidderRequest);
+
+      expect(JSON.parse(requests[0].data).device.ua).to.equal(ua);
+    });
+
+    it('should include bidder config', () => {
+      const bidderConfig = {
+        bidTTL: 500,
+        defaultCurrency: 'USD',
+        exchangeUrl: 'https://exsb.fattail.com/openrtb2',
+        winTrackingEnabled: true,
+        winTrackingUrl: 'https://evsb.fattail.com/wins',
+        orgId: '129576',
+      };
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp')
+        .returns(bidderConfig);
+
+      const requests = spec.buildRequests([bannerBid], bidderRequest);
+      const request = JSON.parse(requests[0].data);
+
+      expect(request.ext).to.deep.include({
+        adbook: {
+          config: bidderConfig,
+          version: {
+            adapter: VERSION,
+            prebid: '$prebid.version$',
+          },
+        },
+      });
+    });
+
+    it('should use bidder video params if they are set', () => {
+      const videoBidWithParams = utils.deepClone(videoBid);
+      const bidderVideoParams = {
+        api: [1, 2],
+        mimes: ['video/mp4', 'video/x-flv'],
+        playbackmethod: [3, 4],
+        protocols: [5, 6],
+        minduration: 10,
+        maxduration: 30,
+      };
+      videoBidWithParams.params.video = bidderVideoParams;
+
+      const requests = spec.buildRequests([videoBidWithParams], bidderRequest);
+      const request = JSON.parse(requests[0].data);
+
+      expect(request.imp[0]).to.deep.include({
+        video: {
+          ...bidderVideoParams,
+          w: videoBidWithParams.mediaTypes.video.playerSize[0][0],
+          h: videoBidWithParams.mediaTypes.video.playerSize[0][1],
+        },
+      });
+    });
+  });
+
+  describe('interpretResponse()', () => {
+    it('should correctly interpret valid response', () => {
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.defaultCurrency')
+        .returns(DEFAULT_BIDDER_CONFIG.defaultCurrency)
+        .withArgs('adbookpsp.bidTTL')
+        .returns(DEFAULT_BIDDER_CONFIG.bidTTL);
+
+      const response = utils.deepClone(exchangeResponse);
+      const bids = spec.interpretResponse(
+        { body: response },
+        { data: JSON.stringify(exchangeBidRequest) }
+      );
+
+      expect(bids).to.deep.equal([
+        {
+          bidderRequestId: '999ccceeee11',
+          requestId: '9873kfse',
+          bidId: 'bid123456',
+          width: 300,
+          height: 250,
+          ttl: 300,
+          cpm: 0.5,
+          currency: 'USD',
+          creativeId: '123456789',
+          mediaType: 'banner',
+          meta: {
+            advertiserDomains: ['advertiser.com'],
+            mediaType: 'banner',
+            primaryCatId: 'IAB2-1',
+            secondaryCatIds: ['IAB2-2', 'IAB2-3'],
+          },
+          netRevenue: true,
+          nurl: 'http://win.example.url',
+          adUnitCode: 'div-gpt-ad-837465923534-0',
+          ad: '<div>ad</div>',
+          adId: '5',
+          adserverTargeting: {
+            hb_ad_ord_adbookpsp: '0_0', // the value to the left of the underscore represents the index of the ad id and the number to the right represents the order index
+            hb_adid_c_adbookpsp: '5',
+            hb_deal_adbookpsp: 'werwetwerw',
+            hb_liid_adbookpsp: '2342345',
+            hb_ordid_adbookpsp: '567843',
+          },
+          referrer: 'http://prebid-test-page.io:8080/banner.html',
+          lineItemId: '2342345',
+        },
+        {
+          ad: '<VAST version="4.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST"></VAST>',
+          adId: '10',
+          adUnitCode: 'div-gpt-ad-837465923534-0',
+          adserverTargeting: {
+            hb_ad_ord_adbookpsp: '0_0',
+            hb_adid_c_adbookpsp: '10',
+            hb_deal_adbookpsp: 'dsfxcxcvxc',
+            hb_liid_adbookpsp: '2121221',
+            hb_ordid_adbookpsp: '5678234',
+          },
+          bidId: 'bid4321',
+          bidderRequestId: '999ccceeee11',
+          cpm: 0.45,
+          creativeId: '543123',
+          currency: 'USD',
+          height: 250,
+          lineItemId: '2121221',
+          mediaType: 'video',
+          meta: {
+            advertiserDomains: ['advertiser.com', 'campaign.advertiser.com'],
+            mediaType: 'video',
+            primaryCatId: 'IAB2-3',
+            secondaryCatIds: [],
+          },
+          netRevenue: true,
+          nurl: 'http://win.example.url',
+          referrer: 'http://prebid-test-page.io:8080/banner.html',
+          requestId: '120kfeske',
+          ttl: 300,
+          vastXml:
+            '<VAST version="4.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST"></VAST>',
+          width: 300,
+        },
+      ]);
+    });
+
+    it('should place valid GAM targeting for all bids when multiple bids are present for multiple impressions', () => {
+      const response = utils.deepClone(exchangeResponse);
+
+      const bids = spec.interpretResponse(
+        { body: response },
+        { data: JSON.stringify(exchangeBidRequest) }
+      );
+
+      expect(bids).to.have.length(2);
+      expect(bids[0].adserverTargeting).to.deep.equal({
+        hb_ad_ord_adbookpsp: '0_0',
+        hb_adid_c_adbookpsp: '5',
+        hb_deal_adbookpsp: 'werwetwerw',
+        hb_liid_adbookpsp: '2342345',
+        hb_ordid_adbookpsp: '567843',
+      });
+      expect(bids[1].adserverTargeting).to.deep.equal({
+        hb_ad_ord_adbookpsp: '0_0',
+        hb_adid_c_adbookpsp: '10',
+        hb_deal_adbookpsp: 'dsfxcxcvxc',
+        hb_liid_adbookpsp: '2121221',
+        hb_ordid_adbookpsp: '5678234',
+      });
+    });
+
+    it('should place valid GAM targeting for all bids when multiple bids are present for single impression', () => {
+      const response = utils.deepClone(exchangeResponse);
+
+      response.seatbid[1].bid[0].impid = '9873kfse';
+
+      const bids = spec.interpretResponse(
+        { body: response },
+        { data: JSON.stringify(exchangeBidRequest) }
+      );
+
+      expect(bids).to.have.length(2);
+      for (const bid of bids) {
+        expect(bid.adserverTargeting).to.deep.equal({
+          hb_ad_ord_adbookpsp: '0_0,1_0',
+          hb_adid_c_adbookpsp: '5,10',
+          hb_deal_adbookpsp: 'werwetwerw,dsfxcxcvxc',
+          hb_liid_adbookpsp: '2342345,2121221',
+          hb_ordid_adbookpsp: '567843,5678234',
+        });
+      }
+    });
+
+    it('should return no bids if response id does not match bidderRequestId', () => {
+      const body = utils.deepClone(exchangeResponse);
+      body.id = '999';
+
+      const bids = spec.interpretResponse(
+        { body },
+        { data: JSON.stringify(exchangeBidRequest) }
+      );
+
+      expect(bids).to.deep.equal([]);
+    });
+
+    it('should return no bids if response does not include seatbid', () => {
+      const body = utils.deepClone(exchangeResponse);
+      delete body.seatbid;
+
+      const bids = spec.interpretResponse(
+        { body },
+        { data: JSON.stringify(exchangeBidRequest) }
+      );
+
+      expect(bids).to.deep.equal([]);
+    });
+
+    it('should return no bids if response does not include any bids', () => {
+      const body = utils.deepClone(exchangeResponse);
+      body.seatbid = [];
+
+      const bids = spec.interpretResponse(
+        { body },
+        { data: JSON.stringify(exchangeBidRequest) }
+      );
+
+      expect(bids).to.deep.equal([]);
+    });
+
+    it('should exclude invalid video bids', () => {
+      const body = utils.deepClone(exchangeResponse);
+
+      body.seatbid.shift();
+      body.seatbid[0].bid[0].adid = 34;
+
+      const bids = spec.interpretResponse(
+        { body },
+        { data: JSON.stringify(exchangeBidRequest) }
+      );
+
+      expect(bids).to.deep.equal([]);
+    });
+
+    it('should exclude invalid banner bids', () => {
+      const body = utils.deepClone(exchangeResponse);
+      const request = utils.deepClone(exchangeBidRequest);
+
+      body.seatbid.pop();
+
+      delete body.seatbid[0].bid[0].w;
+      delete body.seatbid[0].bid[0].h;
+
+      request.imp[0].banner.format.push({ w: 300, h: 600 });
+
+      const bids = spec.interpretResponse(
+        { body },
+        { data: JSON.stringify(request) }
+      );
+
+      expect(bids).to.deep.equal([]);
+    });
+
+    it('should not include invalid banner bids in targeting map', () => {
+      const body = utils.deepClone(exchangeResponse);
+      const request = utils.deepClone(exchangeBidRequest);
+
+      body.seatbid[0].bid[0].h = '600';
+
+      request.imp[0].banner.format.push({ w: 300, h: 600 });
+
+      const bids = spec.interpretResponse(
+        { body },
+        { data: JSON.stringify(exchangeBidRequest) }
+      );
+
+      expect(bids[0].adserverTargeting).to.deep.equal({
+        hb_ad_ord_adbookpsp: '0_0',
+        hb_adid_c_adbookpsp: '10',
+        hb_deal_adbookpsp: 'dsfxcxcvxc',
+        hb_liid_adbookpsp: '2121221',
+        hb_ordid_adbookpsp: '5678234',
+      });
+    });
+
+    it('should not validate banner bid dimensions if bid request has single size', () => {
+      const body = utils.deepClone(exchangeResponse);
+      const request = utils.deepClone(exchangeBidRequest);
+
+      delete body.seatbid[1];
+      delete body.seatbid[0].bid[0].h;
+      delete body.seatbid[0].bid[0].w;
+
+      const bids = spec.interpretResponse(
+        { body },
+        { data: JSON.stringify(request) }
+      );
+
+      expect(bids.length).to.equal(1);
+    });
+  });
+
+  describe('getUserSyncs()', () => {
+    it('should return user syncs if there are included in the response and syncs are enabled', () => {
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: true,
+          iframeEnabled: true,
+        },
+        [{ body: exchangeResponse }]
+      );
+
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'http://sometest.com/sync/1234567',
+        },
+        {
+          type: 'iframe',
+          url: 'http://sometest.com/sync/1234567',
+        },
+      ]);
+    });
+
+    it('should not return user syncs if syncs are disabled', () => {
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: false,
+          iframeEnabled: false,
+        },
+        [{ body: exchangeResponse }]
+      );
+
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should return image syncs if they are enabled', () => {
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: true,
+          iframeEnabled: false,
+        },
+        [{ body: exchangeResponse }]
+      );
+
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'http://sometest.com/sync/1234567',
+        },
+      ]);
+    });
+
+    it('should return iframe syncs if they are enabled', () => {
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: false,
+          iframeEnabled: true,
+        },
+        [{ body: exchangeResponse }]
+      );
+
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'http://sometest.com/sync/1234567',
+        },
+      ]);
+    });
+
+    it('should append COPPA status to sync url', () => {
+      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: false,
+          iframeEnabled: true,
+        },
+        [{ body: utils.deepClone(exchangeResponse) }]
+      );
+
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'http://sometest.com/sync/1234567?coppa=1',
+        },
+      ]);
+    });
+
+    it('should append GDPR consent data to url', () => {
+      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(false);
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: false,
+          iframeEnabled: true,
+        },
+        [{ body: utils.deepClone(exchangeResponse) }],
+        { gdprApplies: true, consentString: 'gdprConsentString' }
+      );
+
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'http://sometest.com/sync/1234567?gdpr=1&consentString=gdprConsentString',
+        },
+      ]);
+    });
+
+    it('should append USP (CCPA) consent string to url', () => {
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: false,
+          iframeEnabled: true,
+        },
+        [{ body: utils.deepClone(exchangeResponse) }],
+        undefined,
+        'uspConsentString'
+      );
+
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'http://sometest.com/sync/1234567?us_privacy=uspConsentString',
+        },
+      ]);
+    });
+
+    it('should append COPPA, GDPR and USP (CCPA) url params', () => {
+      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: true,
+          iframeEnabled: true,
+        },
+        [{ body: utils.deepClone(exchangeResponse) }],
+        { gdprApplies: true, consentString: 'gdprConsentString' },
+        'uspConsentString'
+      );
+
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'http://sometest.com/sync/1234567?gdpr=1&consentString=gdprConsentString&us_privacy=uspConsentString&coppa=1',
+        },
+        {
+          type: 'iframe',
+          url: 'http://sometest.com/sync/1234567?gdpr=1&consentString=gdprConsentString&us_privacy=uspConsentString&coppa=1',
+        },
+      ]);
+    });
+
+    it('should respect url param syntax when appending params', () => {
+      sandbox.stub(common, 'getConfig').withArgs('coppa').returns(true);
+
+      const response = utils.deepClone(exchangeResponse);
+
+      response.ext.sync[0] = {
+        type: 'image',
+        url: 'http://sometest.com/sync/1234567?horseCount=4',
+      };
+
+      const syncs = spec.getUserSyncs(
+        {
+          pixelEnabled: true,
+          iframeEnabled: false,
+        },
+        [{ body: response }],
+        { gdprApplies: true, consentString: 'gdprConsentString' },
+        'uspConsentString'
+      );
+
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'http://sometest.com/sync/1234567?horseCount=4&gdpr=1&consentString=gdprConsentString&us_privacy=uspConsentString&coppa=1',
+        },
+      ]);
+    });
+  });
+
+  describe('onBidWon()', () => {
+    it('should track win if win tracking is enabled', () => {
+      const spy = sandbox.spy(utils, 'triggerPixel');
+
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.winTrackingEnabled')
+        .returns(true)
+        .withArgs('adbookpsp.winTrackingUrl')
+        .returns('https://ev.fattail.com/wins');
+
+      spec.onBidWon({
+        requestId: 'requestId',
+        bidderRequestId: 'bidderRequestId',
+        bidId: 'bidId',
+      });
+
+      expect(
+        spy.calledWith(
+          'https://ev.fattail.com/wins?impId=requestId&reqId=bidderRequestId&bidId=bidId'
+        )
+      ).to.equal(true);
+    });
+    it('should call bid.nurl if win tracking is enabled', () => {
+      const spy = sandbox.spy(utils, 'triggerPixel');
+
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.winTrackingEnabled')
+        .returns(true)
+        .withArgs('adbookpsp.winTrackingUrl')
+        .returns('https://ev.fattail.com/wins');
+
+      spec.onBidWon({
+        requestId: 'requestId',
+        bidderRequestId: 'bidderRequestId',
+        bidId: 'bidId',
+        nurl: 'http://win.example.url',
+      });
+
+      expect(spy.calledWith('http://win.example.url')).to.equal(true);
+    });
+    it('should not track win nor call bid.nurl if win tracking is disabled', () => {
+      const spy = sandbox.spy(utils, 'triggerPixel');
+
+      sandbox
+        .stub(common, 'getConfig')
+        .withArgs('adbookpsp.winTrackingEnabled')
+        .returns(false)
+        .withArgs('adbookpsp.winTrackingUrl')
+        .returns('https://ev.fattail.com/wins');
+
+      spec.onBidWon({
+        requestId: 'requestId',
+        bidderRequestId: 'bidderRequestId',
+        bidId: 'bidId',
+        nurl: 'http://win.example.url',
+      });
+
+      expect(spy.notCalled).to.equal(true);
+    });
+  });
+});
+
+const bidderRequest = {
+  auctionId: 'aaccee333311',
+  bidderRequestId: '999ccceeee11',
+  timeout: 200,
+  refererInfo: {
+    page: 'http://mock-page.com',
+    domain: 'mock-page.com',
+    ref: 'http://example-domain.com/foo',
+  },
+  gdprConsent: {
+    gdprApplies: 1,
+    consentString: 'gdprConsentString',
+  },
+  uspConsent: 'uspConsentString',
+};
+
+const bannerBid = {
+  bidder: 'adbookpsp',
+  params: {
+    placementId: '12390123',
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 600],
+      ],
+    },
+  },
+  adUnitCode: 'div-gpt-ad-837465923534-0',
+  transactionId: 'sfsf89e-mck3-asf3-fe45-feksjfi123mfs',
+  bidId: '9873kfse',
+  bidderRequestId: '999ccceeee11',
+  auctionId: 'aaccee333311',
+  lineItemId: 123123123,
+};
+
+const bannerExchangeRequest = {
+  id: '999ccceeee11',
+  device: {
+    h: 100,
+    w: 100,
+    js: true,
+    ua: navigator.userAgent,
+    dnt: 0,
+  },
+  regs: {
+    coppa: 0,
+    ext: {
+      gdpr: 1,
+      gdprConsentString: 'gdprConsentString',
+      us_privacy: 'uspConsentString',
+    },
+  },
+  site: {
+    domain: 'mock-page.com',
+    page: 'http://mock-page.com',
+    ref: 'http://example-domain.com/foo',
+  },
+  source: {
+    fd: 1,
+    tid: 'aaccee333311',
+  },
+  tmax: 200,
+  user: {
+    gdprConsentString: 'gdprConsentString',
+    id: '54444444-5444-4444-9444-544444444444',
+  },
+  imp: [
+    {
+      banner: {
+        format: [
+          {
+            w: 300,
+            h: 250,
+          },
+          {
+            w: 300,
+            h: 600,
+          },
+        ],
+        w: 300,
+        h: 250,
+        topframe: 0,
+        pos: 0,
+      },
+      ext: {
+        adbook: {
+          placementId: '12390123',
+        },
+      },
+      id: '9873kfse',
+      tagid: 'div-gpt-ad-837465923534-0',
+    },
+  ],
+  ext: {
+    adbook: {
+      version: {
+        adapter: VERSION,
+        prebid: '$prebid.version$',
+      },
+    },
+  },
+};
+
+const videoBid = {
+  bidder: 'adbookpsp',
+  params: {
+    placementId: '129576',
+  },
+  mediaTypes: {
+    video: {
+      api: [1, 2, 4, 6],
+      mimes: ['video/mp4'],
+      playbackmethod: [2, 4, 6],
+      playerSize: [[400, 300]],
+      protocols: [3, 4, 7, 8, 10],
+    },
+  },
+  adUnitCode: 'div-gpt-ad-9383743831-6',
+  transactionId: 'aacc3fasf-fere-1335-8m1s-785393mc3fj',
+  bidId: '120kfeske',
+  bidderRequestId: '999ccceeee11',
+  auctionId: 'aaccee333311',
+  lineItemId: 321321321,
+};
+
+const videoExchangeRequest = {
+  id: '999ccceeee11',
+  device: {
+    h: 100,
+    w: 100,
+    js: true,
+    ua: navigator.userAgent,
+    dnt: 0,
+  },
+  regs: {
+    coppa: 0,
+    ext: {
+      gdpr: 1,
+      gdprConsentString: 'gdprConsentString',
+      us_privacy: 'uspConsentString',
+    },
+  },
+  site: {
+    domain: 'mock-page.com',
+    page: 'http://mock-page.com',
+    ref: 'http://example-domain.com/foo',
+  },
+  source: {
+    fd: 1,
+    tid: 'aaccee333311',
+  },
+  tmax: 200,
+  user: {
+    gdprConsentString: 'gdprConsentString',
+    id: '54444444-5444-4444-9444-544444444444',
+  },
+  imp: [
+    {
+      video: {
+        api: [1, 2, 4, 6],
+        h: 300,
+        mimes: ['video/mp4'],
+        playbackmethod: [2, 4, 6],
+        protocols: [3, 4, 7, 8, 10],
+        w: 400,
+      },
+      ext: {
+        adbook: {
+          placementId: '129576',
+        },
+      },
+      id: '120kfeske',
+      tagid: 'div-gpt-ad-9383743831-6',
+    },
+  ],
+  ext: {
+    adbook: {
+      version: {
+        adapter: VERSION,
+        prebid: '$prebid.version$',
+      },
+    },
+  },
+};
+
+const mixedBid = {
+  bidder: 'adbookpsp',
+  params: {
+    orgId: '129576',
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 600]],
+    },
+    video: {
+      mimes: ['video/mp4'],
+      playerSize: [[300, 600]],
+    },
+  },
+  adUnitCode: 'div-gpt-ad-9383743831-5',
+  transactionId: 'aacc3fasf-fere-1335-8m1s-785393mc3fj',
+  bidId: '120kfeske',
+  bidderRequestId: '999ccceeee11',
+  auctionId: 'aaccee333311',
+  lineItemId: 12341234,
+};
+
+const mixedExchangeRequest = {
+  id: '999ccceeee11',
+  device: {
+    h: 100,
+    w: 100,
+    js: true,
+    ua: navigator.userAgent,
+    dnt: 0,
+  },
+  regs: {
+    coppa: 0,
+    ext: {
+      gdpr: 1,
+      gdprConsentString: 'gdprConsentString',
+      us_privacy: 'uspConsentString',
+    },
+  },
+  site: {
+    domain: 'mock-page.com',
+    page: 'http://mock-page.com',
+    ref: 'http://example-domain.com/foo',
+  },
+  source: {
+    fd: 1,
+    tid: 'aaccee333311',
+  },
+  tmax: 200,
+  user: {
+    gdprConsentString: 'gdprConsentString',
+    id: '54444444-5444-4444-9444-544444444444',
+  },
+  imp: [
+    {
+      banner: {
+        format: [
+          {
+            w: 300,
+            h: 600,
+          },
+        ],
+        w: 300,
+        h: 600,
+        topframe: 0,
+        pos: 0,
+      },
+      video: {
+        h: 600,
+        mimes: ['video/mp4'],
+        w: 300,
+      },
+      ext: {
+        adbook: {
+          orgId: '129576',
+        },
+      },
+      id: '120kfeske',
+      tagid: 'div-gpt-ad-9383743831-5',
+    },
+  ],
+  ext: {
+    adbook: {
+      version: {
+        adapter: VERSION,
+        prebid: '$prebid.version$',
+      },
+    },
+  },
+};
+
+const exchangeBidRequest = {
+  id: '999ccceeee11',
+  tmax: 200,
+  imp: [
+    {
+      id: '9873kfse',
+      banner: {
+        format: [
+          {
+            w: 300,
+            h: 250,
+          },
+        ],
+      },
+      video: {
+        w: 300,
+        h: 250,
+      },
+      tagid: 'div-gpt-ad-837465923534-0',
+    },
+    {
+      id: '120kfeske',
+      banner: {
+        format: [
+          {
+            w: 300,
+            h: 250,
+          },
+        ],
+      },
+      video: {
+        w: 300,
+        h: 250,
+      },
+      tagid: 'div-gpt-ad-837465923534-0',
+    },
+  ],
+  source: {
+    fd: 1,
+    tid: 'aaccee333311',
+  },
+  site: {
+    domain: location.hostname,
+    page: location.href,
+    ref: 'http://prebid-test-page.io:8080/banner.html',
+  },
+};
+
+const exchangeResponse = {
+  id: '999ccceeee11',
+  seatbid: [
+    {
+      seat: 'adbookpsp',
+      group: 0,
+      bid: [
+        {
+          id: 'bid123456',
+          w: 300,
+          h: 250,
+          impid: '9873kfse',
+          price: 0.5,
+          exp: 300,
+          crid: '123456789',
+          adm: '<div>ad</div>',
+          adid: '5',
+          dealid: 'werwetwerw',
+          nurl: 'http://win.example.url',
+          ext: {
+            liid: '2342345',
+            ordid: '567843',
+          },
+          cat: ['IAB2-1', 'IAB2-2', 'IAB2-3'],
+          adomain: ['advertiser.com'],
+        },
+      ],
+    },
+    {
+      seat: 'adbookpsp',
+      group: 0,
+      bid: [
+        {
+          id: 'bid4321',
+          impid: '120kfeske',
+          price: 0.45,
+          exp: 300,
+          crid: '543123',
+          adm: '<VAST version="4.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST"></VAST>',
+          adid: '10',
+          dealid: 'dsfxcxcvxc',
+          nurl: 'http://win.example.url',
+          ext: {
+            liid: '2121221',
+            ordid: '5678234',
+          },
+          cat: ['IAB2-3'],
+          adomain: ['advertiser.com', 'campaign.advertiser.com'],
+        },
+      ],
+    },
+  ],
+  ext: {
+    sync: [
+      {
+        type: 'image',
+        url: 'http://sometest.com/sync/1234567',
+      },
+      {
+        type: 'iframe',
+        url: 'http://sometest.com/sync/1234567',
+      },
+    ],
+  },
+};
diff --git a/test/spec/modules/adbutlerBidAdapter_spec.js b/test/spec/modules/adbutlerBidAdapter_spec.js
deleted file mode 100644
index a9b56ade79e..00000000000
--- a/test/spec/modules/adbutlerBidAdapter_spec.js
+++ /dev/null
@@ -1,221 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/adbutlerBidAdapter.js';
-
-describe('AdButler adapter', function () {
-  let bidRequests;
-
-  beforeEach(function () {
-    bidRequests = [
-      {
-        bidder: 'adbutler',
-        params: {
-          accountID: '167283',
-          zoneID: '210093',
-          keyword: 'red',
-          minCPM: '1.00',
-          maxCPM: '5.00'
-        },
-        placementCode: '/19968336/header-bid-tag-1',
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250], [300, 600]],
-          },
-        },
-        bidId: '23acc48ad47af5',
-        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-        bidderRequestId: '1c56ad30b9b8ca8',
-        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-      }
-    ];
-  });
-
-  describe('implementation', function () {
-    describe('for requests', function () {
-      it('should accept valid bid', function () {
-        let validBid = {
-            bidder: 'adbutler',
-            params: {
-              accountID: '167283',
-              zoneID: '210093'
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-
-        expect(isValid).to.equal(true);
-      });
-
-      it('should reject invalid bid', function () {
-        let invalidBid = {
-            bidder: 'adbutler',
-            params: {
-              accountID: '167283',
-            }
-          },
-          isValid = spec.isBidRequestValid(invalidBid);
-
-        expect(isValid).to.equal(false);
-      });
-
-      it('should use custom domain string', function () {
-        let bidRequests = [
-            {
-              bidId: '3c9408cdbf2f68',
-              sizes: [[300, 250]],
-              bidder: 'adbutler',
-              params: {
-                accountID: '107878',
-                zoneID: '86133',
-                domain: 'servedbyadbutler.com.dan.test'
-              },
-              auctionId: '10b327aa396609',
-              placementCode: '/123456/header-bid-tag-1'
-            }
-          ],
-          requests = spec.buildRequests(bidRequests),
-          requestURL = requests[0].url;
-
-        expect(requestURL).to.have.string('.dan.test');
-      });
-
-      it('should set default domain', function () {
-        let requests = spec.buildRequests(bidRequests),
-          request = requests[0];
-
-        let [domain] = request.url.split('/adserve/');
-
-        expect(domain).to.equal('https://servedbyadbutler.com');
-      });
-
-      it('should set the keyword parameter', function () {
-        let requests = spec.buildRequests(bidRequests),
-          requestURL = requests[0].url;
-
-        expect(requestURL).to.have.string(';kw=red;');
-      });
-
-      it('should increment the count for the same zone', function () {
-        let bidRequests = [
-            {
-              sizes: [[300, 250]],
-              bidder: 'adbutler',
-              params: {
-                accountID: '107878',
-                zoneID: '86133',
-              }
-            }, {
-              sizes: [[300, 250]],
-              bidder: 'adbutler',
-              params: {
-                accountID: '107878',
-                zoneID: '86133',
-              }
-            },
-          ],
-          requests = spec.buildRequests(bidRequests),
-          firstRequest = requests[0].url,
-          secondRequest = requests[1].url;
-
-        expect(firstRequest).to.have.string(';place=0;');
-        expect(secondRequest).to.have.string(';place=1;');
-      });
-    });
-
-    describe('bid responses', function () {
-      it('should return complete bid response', function () {
-        let serverResponse = {
-            body: {
-              status: 'SUCCESS',
-              account_id: 167283,
-              zone_id: 210093,
-              cpm: 1.5,
-              width: 300,
-              height: 250,
-              place: 0,
-              ad_code: '<img src="http://image.source.com/img" alt="" title="" border="0" width="300" height="250">',
-              tracking_pixels: [
-                'http://tracking.pixel.com/params=info'
-              ]
-            }
-          },
-          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
-
-        expect(bids).to.be.lengthOf(1);
-
-        expect(bids[0].bidderCode).to.equal('adbutler');
-        expect(bids[0].cpm).to.equal(1.5);
-        expect(bids[0].width).to.equal(300);
-        expect(bids[0].height).to.equal(250);
-        expect(bids[0].currency).to.equal('USD');
-        expect(bids[0].netRevenue).to.equal(true);
-        expect(bids[0].ad).to.have.length.above(1);
-        expect(bids[0].ad).to.have.string('http://tracking.pixel.com/params=info');
-      });
-
-      it('should return empty bid response', function () {
-        let serverResponse = {
-            body: {
-              status: 'NO_ELIGIBLE_ADS',
-              zone_id: 210083,
-              width: 300,
-              height: 250,
-              place: 0
-            }
-          },
-          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
-
-        expect(bids).to.be.lengthOf(0);
-      });
-
-      it('should return empty bid response on incorrect size', function () {
-        let serverResponse = {
-            body: {
-              status: 'SUCCESS',
-              account_id: 167283,
-              zone_id: 210083,
-              cpm: 1.5,
-              width: 728,
-              height: 90,
-              place: 0
-            }
-          },
-          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
-
-        expect(bids).to.be.lengthOf(0);
-      });
-
-      it('should return empty bid response with CPM too low', function () {
-        let serverResponse = {
-            body: {
-              status: 'SUCCESS',
-              account_id: 167283,
-              zone_id: 210093,
-              cpm: 0.75,
-              width: 300,
-              height: 250,
-              place: 0
-            }
-          },
-          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
-
-        expect(bids).to.be.lengthOf(0);
-      });
-
-      it('should return empty bid response with CPM too high', function () {
-        let serverResponse = {
-            body: {
-              status: 'SUCCESS',
-              account_id: 167283,
-              zone_id: 210093,
-              cpm: 7,
-              width: 300,
-              height: 250,
-              place: 0
-            }
-          },
-          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
-
-        expect(bids).to.be.lengthOf(0);
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/addefendBidAdapter_spec.js b/test/spec/modules/addefendBidAdapter_spec.js
new file mode 100644
index 00000000000..b3b6b2d417a
--- /dev/null
+++ b/test/spec/modules/addefendBidAdapter_spec.js
@@ -0,0 +1,184 @@
+import {expect} from 'chai';
+import {spec} from 'modules/addefendBidAdapter.js';
+
+describe('addefendBidAdapter', () => {
+  const defaultBidRequest = {
+    bidId: 'd66fa86787e0b0ca900a96eacfd5f0bb',
+    auctionId: 'ccc4c7cdfe11cfbd74065e6dd28413d8',
+    transactionId: 'd58851660c0c4461e4aa06344fc9c0c6',
+    sizes: [[300, 250], [300, 600]],
+    params: {
+      pageId: 'stringid1',
+      placementId: 'stringid2'
+    }
+  };
+
+  const deepClone = function (val) {
+    return JSON.parse(JSON.stringify(val));
+  };
+
+  const buildRequest = (buildRequest, bidderRequest) => {
+    if (!Array.isArray(buildRequest)) {
+      buildRequest = [buildRequest];
+    }
+
+    return spec.buildRequests(buildRequest, {
+      ...bidderRequest || {},
+      refererInfo: {
+        page: 'https://referer.example.com'
+      }
+    })[0];
+  };
+
+  describe('isBidRequestValid', () => {
+    it('should return true when required params found', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('pageId performs type checking', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      bidRequest.params.pageId = 1; // supposed to be a string
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('placementId performs type checking', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      bidRequest.params.placementId = 1; // supposed to be a string
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when required params are not passed', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      delete bidRequest.params;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', () => {
+    const bidRequest = deepClone(defaultBidRequest);
+    const request = buildRequest(bidRequest);
+
+    it('sends bid request to endpoint via https using post', () => {
+      expect(request.method).to.equal('POST');
+      expect(request.url.indexOf('https://')).to.equal(0);
+      expect(request.url).to.equal(`${spec.hostname}/bid`);
+    });
+
+    it('contains prebid version parameter', () => {
+      expect(request.data.v).to.equal($$PREBID_GLOBAL$$.version);
+    });
+
+    it('contains correct referer', () => {
+      expect(request.data.referer).to.equal('https://referer.example.com');
+    });
+
+    it('contains auctionId', () => {
+      expect(request.data.auctionId).to.equal('ccc4c7cdfe11cfbd74065e6dd28413d8');
+    });
+
+    it('contains pageId', () => {
+      expect(request.data.pageId).to.equal('stringid1');
+    });
+
+    it('sends correct bid parameters', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      expect(request.data.bids).to.deep.equal([ {
+        bidId: bidRequest.bidId,
+        placementId: bidRequest.params.placementId,
+        sizes: [ '300x250', '300x600' ],
+        transactionId: 'd58851660c0c4461e4aa06344fc9c0c6'
+      } ]);
+    });
+
+    it('handles empty gdpr object', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      const request = buildRequest(bidRequest, {
+        gdprConsent: {}
+      });
+      expect(request.data.gdpr_consent).to.be.equal('');
+    });
+
+    it('handles non-existent gdpr object', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      const request = buildRequest(bidRequest, {
+        gdprConsent: null
+      });
+      expect(request.data.gdpr_consent).to.be.equal('');
+    });
+
+    it('handles properly filled gdpr string', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      const consentString = 'GDPR_CONSENT_STRING';
+      const request = buildRequest(bidRequest, {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: consentString
+        }
+      });
+
+      expect(request.data.gdpr_consent).to.be.equal(consentString);
+    });
+  });
+
+  describe('interpretResponse', () => {
+    it('should get correct bid response', () => {
+      const serverResponse = [
+        {
+          'width': 300,
+          'height': 250,
+          'creativeId': '29681110',
+          'ad': '<!-- Creative -->',
+          'cpm': 0.5,
+          'requestId': 'ccc4c7cdfe11cfbd74065e6dd28413d8',
+          'ttl': 120,
+          'netRevenue': true,
+          'currency': 'EUR',
+          'advertiserDomains': ['advertiser.example.com']
+        }
+      ];
+
+      const expectedResponse = [
+        {
+          'requestId': 'ccc4c7cdfe11cfbd74065e6dd28413d8',
+          'cpm': 0.5,
+          'creativeId': '29681110',
+          'width': 300,
+          'height': 250,
+          'ttl': 120,
+          'currency': 'EUR',
+          'ad': '<!-- Creative -->',
+          'netRevenue': true,
+          'advertiserDomains': ['advertiser.example.com']
+        }
+      ];
+
+      const result = spec.interpretResponse({body: serverResponse});
+      expect(result.length).to.equal(expectedResponse.length);
+      Object.keys(expectedResponse[0]).forEach((key) => {
+        expect(result[0][key]).to.deep.equal(expectedResponse[0][key]);
+      });
+    });
+
+    it('handles incomplete server response', () => {
+      const serverResponse = [
+        {
+          'ad': '<!-- Creative -->',
+          'cpm': 0.5,
+          'requestId': 'ccc4c7cdfe11cfbd74065e6dd28413d8',
+          'ttl': 60
+        }
+      ];
+      const result = spec.interpretResponse({body: serverResponse});
+
+      expect(result.length).to.equal(0);
+    });
+
+    it('handles nobid responses', () => {
+      const serverResponse = [];
+      const result = spec.interpretResponse({body: serverResponse});
+
+      expect(result.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/adfBidAdapter_spec.js b/test/spec/modules/adfBidAdapter_spec.js
new file mode 100644
index 00000000000..eb560bb1bae
--- /dev/null
+++ b/test/spec/modules/adfBidAdapter_spec.js
@@ -0,0 +1,1070 @@
+// jshint esversion: 6, es3: false, node: true
+import { assert } from 'chai';
+import { spec } from 'modules/adfBidAdapter.js';
+import { config } from 'src/config.js';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+describe('Adf adapter', function () {
+  let bids = [];
+
+  describe('backwards-compatibility', function () {
+    it('should have adformOpenRTB alias defined', function () {
+      assert.equal(spec.aliases[0].code, 'adformOpenRTB');
+      assert.equal(spec.aliases[0].gvlid, 50);
+    });
+
+    it('should have adform alias defined', function () {
+      assert.equal(spec.aliases[1].code, 'adform');
+      assert.equal(spec.aliases[1].gvlid, 50);
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'adformOpenRTB',
+      'params': {
+        'mid': '19910113'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      assert(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        inv: 1234,
+        mname: 'some-placement'
+      };
+      assert(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        mid: 4332,
+        inv: 1234,
+        mname: 'some-placement'
+      };
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return false when required params are missing', function () {
+      bid.params = { adxDomain: 'adx.adform.net' };
+      assert.isFalse(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        mname: 'some-placement'
+      };
+      assert.isFalse(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        inv: 1234
+      };
+      assert.isFalse(spec.isBidRequestValid(bid));
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('should send request with correct structure', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {
+          adxDomain: '10.8.57.207'
+        }
+      }];
+      let request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } });
+
+      assert.equal(request.method, 'POST');
+      assert.equal(request.url, 'https://10.8.57.207/adx/openrtb');
+      assert.equal(request.options, undefined);
+      assert.ok(request.data);
+    });
+
+    describe('user privacy', function () {
+      it('should send GDPR Consent data to adform if gdprApplies', function () {
+        let validBidRequests = [{ bidId: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user.ext.consent, bidderRequest.gdprConsent.consentString);
+        assert.equal(request.regs.ext.gdpr, bidderRequest.gdprConsent.gdprApplies);
+        assert.equal(typeof request.regs.ext.gdpr, 'number');
+      });
+
+      it('should send gdpr as number', function () {
+        let validBidRequests = [{ bidId: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(typeof request.regs.ext.gdpr, 'number');
+        assert.equal(request.regs.ext.gdpr, 1);
+      });
+
+      it('should send CCPA Consent data to adform', function () {
+        let validBidRequests = [{ bidId: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { uspConsent: '1YA-', refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.regs.ext.us_privacy, '1YA-');
+
+        bidderRequest = { uspConsent: '1YA-', gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.regs.ext.us_privacy, '1YA-');
+        assert.equal(request.user.ext.consent, 'consentDataString');
+        assert.equal(request.regs.ext.gdpr, 1);
+      });
+
+      it('should not send GDPR Consent data to adform if gdprApplies is undefined', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: { siteId: 'siteId' }
+        }];
+        let bidderRequest = { gdprConsent: {gdprApplies: false, consentString: 'consentDataString'}, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user.ext.consent, 'consentDataString');
+        assert.equal(request.regs.ext.gdpr, 0);
+
+        bidderRequest = {gdprConsent: {consentString: 'consentDataString'}, refererInfo: { page: 'page' }};
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user, undefined);
+        assert.equal(request.regs, undefined);
+      });
+      it('should send default GDPR Consent data to adform', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: { siteId: 'siteId' }
+        }];
+        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+
+        assert.equal(request.user, undefined);
+        assert.equal(request.regs, undefined);
+      });
+    });
+
+    it('should add test and is_debug to request, if test is set in parameters', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: { test: 1 }
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+
+      assert.ok(request.is_debug);
+      assert.equal(request.test, 1);
+    });
+
+    it('should have default request structure', function () {
+      let keys = 'site,device,source,ext,imp'.split(',');
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: { siteId: 'siteId' }
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+      let data = Object.keys(request);
+
+      assert.deepEqual(keys, data);
+    });
+
+    it('should set request keys correct values', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: { siteId: 'siteId' },
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, auctionId: 'tid' }).data);
+
+      assert.equal(request.source.tid, 'tid');
+      assert.equal(request.source.fd, 1);
+    });
+
+    it('should not set coppa when coppa is not provided or is set to false', function () {
+      config.setConfig({
+      });
+      let validBidRequests = [{ bidId: 'bidId', params: { test: 1 } }];
+      let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+      assert.equal(request.regs.coppa, undefined);
+
+      config.setConfig({
+        coppa: false
+      });
+      request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+      assert.equal(request.regs.coppa, undefined);
+    });
+
+    it('should set coppa to 1 when coppa is provided with value true', function () {
+      config.setConfig({
+        coppa: true
+      });
+      let validBidRequests = [{ bidId: 'bidId', params: { test: 1 } }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+
+      assert.equal(request.regs.coppa, 1);
+    });
+
+    it('should send info about device', function () {
+      config.setConfig({
+        device: { w: 100, h: 100 }
+      });
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: { mid: '1000' }
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+
+      assert.equal(request.device.ua, navigator.userAgent);
+      assert.equal(request.device.w, 100);
+      assert.equal(request.device.h, 100);
+    });
+
+    it('should send app info', function () {
+      config.setConfig({
+        app: { id: 'appid' },
+      });
+      const ortb2 = { app: { name: 'appname' } };
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: { mid: '1000' },
+        ortb2
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, ortb2 }).data);
+
+      assert.equal(request.app.id, 'appid');
+      assert.equal(request.app.name, 'appname');
+      assert.equal(request.site, undefined);
+    });
+
+    it('should send info about the site', function () {
+      config.setConfig({
+        site: {
+          id: '123123',
+          publisher: {
+            domain: 'publisher.domain.com'
+          }
+        },
+      });
+      const ortb2 = {
+        site: {
+          publisher: {
+            name: 'publisher\'s name'
+          }
+        }
+      };
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: { mid: '1000' },
+        ortb2
+      }];
+      let refererInfo = { page: 'page' };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo, ortb2 }).data);
+
+      assert.deepEqual(request.site, {
+        page: refererInfo.page,
+        publisher: {
+          domain: 'publisher.domain.com',
+          name: 'publisher\'s name'
+        },
+        id: '123123'
+      });
+    });
+
+    it('should pass extended ids', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {},
+        userIdAsEids: createEidsArray({
+          tdid: 'TTD_ID_FROM_USER_ID_MODULE',
+          pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
+        })
+      }];
+
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+      assert.deepEqual(request.user.ext.eids, [
+        { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
+        { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
+      ]);
+    });
+
+    it('should send currency if defined', function () {
+      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
+      let validBidRequests = [{ params: {} }];
+      let refererInfo = { page: 'page' };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo }).data);
+
+      assert.deepEqual(request.cur, [ 'EUR' ]);
+    });
+
+    it('should pass supply chain object', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {},
+        schain: {
+          validation: 'strict',
+          config: {
+            ver: '1.0'
+          }
+        }
+      }];
+
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+      assert.deepEqual(request.source.ext.schain, {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      });
+    });
+
+    describe('priceType', function () {
+      it('should send default priceType', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: { siteId: 'siteId' }
+        }];
+        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+
+        assert.equal(request.ext.pt, 'net');
+      });
+      it('should send correct priceType value', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: { priceType: 'net' }
+        }];
+        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+
+        assert.equal(request.ext.pt, 'net');
+      });
+    });
+
+    describe('bids', function () {
+      it('should add more than one bid to the request', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: { siteId: 'siteId' }
+        }, {
+          bidId: 'bidId2',
+          params: { siteId: 'siteId' }
+        }];
+        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+
+        assert.equal(request.imp.length, 2);
+      });
+      it('should add incrementing values of id', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: { mid: '1000' },
+          mediaTypes: {video: {}}
+        }, {
+          bidId: 'bidId2',
+          params: { mid: '1000' },
+          mediaTypes: {video: {}}
+        }, {
+          bidId: 'bidId3',
+          params: { mid: '1000' },
+          mediaTypes: {video: {}}
+        }];
+        let imps = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp;
+
+        for (let i = 0; i < 3; i++) {
+          assert.equal(imps[i].id, i + 1);
+        }
+      });
+
+      it('should add mid', function () {
+        let validBidRequests = [{ bidId: 'bidId', params: {mid: 1000}, mediaTypes: {video: {}} },
+          { bidId: 'bidId2', params: {mid: 1001}, mediaTypes: {video: {}} },
+          { bidId: 'bidId3', params: {mid: 1002}, mediaTypes: {video: {}} }];
+        let imps = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp;
+        for (let i = 0; i < 3; i++) {
+          assert.equal(imps[i].tagid, validBidRequests[i].params.mid);
+        }
+      });
+
+      describe('dynamic placement tag', function () {
+        it('should add imp parameters correctly', function () {
+          const validBidRequests = [
+            { bidId: 'bidId', params: { inv: 1000, mname: 'placement' }, mediaTypes: {video: {}} },
+            { bidId: 'bidId', params: { mid: 1234, inv: 1002, mname: 'placement2' }, mediaTypes: {video: {}} },
+            { bidId: 'bidId', params: { mid: 1234 }, mediaTypes: {video: {}} }
+          ];
+          const [ imp1, imp2, imp3 ] = getRequestImps(validBidRequests);
+
+          assert.equal(imp1.ext.bidder.inv, 1000);
+          assert.equal(imp1.ext.bidder.mname, 'placement');
+          assert.equal('tagid' in imp1, false);
+
+          assert.equal(imp2.ext.bidder.inv, 1002);
+          assert.equal(imp2.ext.bidder.mname, 'placement2');
+          assert.equal(imp2.tagid, 1234);
+
+          assert.ok(imp3.ext.bidder);
+          assert.equal('inv' in imp3.ext.bidder, false);
+          assert.equal('mname' in imp3.ext.bidder, false);
+          assert.equal(imp3.tagid, 1234);
+        });
+      });
+
+      describe('price floors', function () {
+        it('should not add if floors module not configured', function () {
+          const validBidRequests = [{ bidId: 'bidId', params: {mid: 1000}, mediaTypes: {video: {}} }];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, undefined);
+        });
+
+        it('should not add if floor price not defined', function () {
+          const validBidRequests = [ getBidWithFloor() ];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'USD');
+        });
+
+        it('should request floor price in adserver currency', function () {
+          config.setConfig({ currency: { adServerCurrency: 'DKK' } });
+          const validBidRequests = [ getBidWithFloor() ];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'DKK');
+        });
+
+        it('should add correct floor values', function () {
+          const expectedFloors = [ 1, 1.3, 0.5 ];
+          const validBidRequests = expectedFloors.map(getBidWithFloor);
+          let imps = getRequestImps(validBidRequests);
+
+          expectedFloors.forEach((floor, index) => {
+            assert.equal(imps[index].bidfloor, floor);
+            assert.equal(imps[index].bidfloorcur, 'USD');
+          });
+        });
+
+        function getBidWithFloor(floor) {
+          return {
+            params: { mid: 1 },
+            mediaTypes: { video: {} },
+            getFloor: ({ currency }) => {
+              return {
+                currency: currency,
+                floor
+              };
+            }
+          };
+        }
+      });
+
+      describe('multiple media types', function () {
+        it('should use all configured media types for bidding', function () {
+          let validBidRequests = [{
+            bidId: 'bidId',
+            params: { mid: 1000 },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              },
+              video: {}
+            }
+          }, {
+            bidId: 'bidId1',
+            params: { mid: 1000 },
+            mediaTypes: {
+              video: {},
+              native: {}
+            }
+          }, {
+            bidId: 'bidId2',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 }
+            },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              },
+              native: {},
+              video: {}
+            }
+          }];
+          let [ first, second, third ] = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp;
+
+          assert.ok(first.banner);
+          assert.ok(first.video);
+          assert.equal(first.native, undefined);
+
+          assert.ok(second.video);
+          assert.equal(second.banner, undefined);
+          assert.equal(second.native, undefined);
+
+          assert.ok(third.native);
+          assert.ok(third.video);
+          assert.ok(third.banner);
+        });
+      });
+
+      describe('banner', function () {
+        it('should convert sizes to openrtb format', function () {
+          let validBidRequests = [{
+            bidId: 'bidId',
+            params: { mid: 1000 },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              }
+            }
+          }];
+          let { banner } = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp[0];
+          assert.deepEqual(banner, {
+            format: [ { w: 100, h: 100 }, { w: 200, h: 300 } ]
+          });
+        });
+      });
+
+      describe('video', function () {
+        it('should pass video mediatype config', function () {
+          let validBidRequests = [{
+            bidId: 'bidId',
+            params: { mid: 1000 },
+            mediaTypes: {
+              video: {
+                playerSize: [640, 480],
+                context: 'outstream',
+                mimes: ['video/mp4']
+              }
+            }
+          }];
+          let { video } = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp[0];
+          assert.deepEqual(video, {
+            playerSize: [640, 480],
+            context: 'outstream',
+            mimes: ['video/mp4']
+          });
+        });
+      });
+
+      describe('native', function () {
+        describe('assets', function () {
+          it('should set correct asset id', function () {
+            let validBidRequests = [{
+              bidId: 'bidId',
+              params: { mid: 1000 },
+              nativeParams: {
+                title: { required: true, len: 140 },
+                image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+                body: { len: 140 }
+              }
+            }];
+            let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp[0].native.request.assets;
+
+            assert.equal(assets[0].id, 0);
+            assert.equal(assets[1].id, 3);
+            assert.equal(assets[2].id, 4);
+          });
+          it('should add required key if it is necessary', function () {
+            let validBidRequests = [{
+              bidId: 'bidId',
+              params: { mid: 1000 },
+              nativeParams: {
+                title: { required: true, len: 140 },
+                image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+                body: { len: 140 },
+                sponsoredBy: { required: true, len: 140 }
+              }
+            }];
+
+            let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp[0].native.request.assets;
+
+            assert.equal(assets[0].required, 1);
+            assert.ok(!assets[1].required);
+            assert.ok(!assets[2].required);
+            assert.equal(assets[3].required, 1);
+          });
+
+          it('should map img and data assets', function () {
+            let validBidRequests = [{
+              bidId: 'bidId',
+              params: { mid: 1000 },
+              nativeParams: {
+                title: { required: true, len: 140 },
+                image: { required: true, sizes: [150, 50] },
+                icon: { required: false, sizes: [50, 50] },
+                body: { required: false, len: 140 },
+                sponsoredBy: { required: true },
+                cta: { required: false },
+                clickUrl: { required: false }
+              }
+            }];
+
+            let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp[0].native.request.assets;
+            assert.ok(assets[0].title);
+            assert.equal(assets[0].title.len, 140);
+            assert.deepEqual(assets[1].img, { type: 3, w: 150, h: 50 });
+            assert.deepEqual(assets[2].img, { type: 1, w: 50, h: 50 });
+            assert.deepEqual(assets[3].data, { type: 2, len: 140 });
+            assert.deepEqual(assets[4].data, { type: 1 });
+            assert.deepEqual(assets[5].data, { type: 12 });
+            assert.ok(!assets[6]);
+          });
+
+          describe('icon/image sizing', function () {
+            it('should flatten sizes and utilise first pair', function () {
+              const validBidRequests = [{
+                bidId: 'bidId',
+                params: { mid: 1000 },
+                nativeParams: {
+                  image: {
+                    sizes: [[200, 300], [100, 200]]
+                  },
+                }
+              }];
+
+              let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp[0].native.request.assets;
+              assert.ok(assets[0].img);
+              assert.equal(assets[0].img.w, 200);
+              assert.equal(assets[0].img.h, 300);
+            });
+          });
+
+          it('should utilise aspect_ratios', function () {
+            const validBidRequests = [{
+              bidId: 'bidId',
+              params: { mid: 1000 },
+              nativeParams: {
+                image: {
+                  aspect_ratios: [{
+                    min_width: 100,
+                    ratio_height: 3,
+                    ratio_width: 1
+                  }]
+                },
+                icon: {
+                  aspect_ratios: [{
+                    min_width: 10,
+                    ratio_height: 5,
+                    ratio_width: 2
+                  }]
+                }
+              }
+            }];
+
+            let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp[0].native.request.assets;
+            assert.ok(assets[0].img);
+            assert.equal(assets[0].img.wmin, 100);
+            assert.equal(assets[0].img.hmin, 300);
+
+            assert.ok(assets[1].img);
+            assert.equal(assets[1].img.wmin, 10);
+            assert.equal(assets[1].img.hmin, 25);
+          });
+
+          it('should not throw error if aspect_ratios config is not defined', function () {
+            const validBidRequests = [{
+              bidId: 'bidId',
+              params: { mid: 1000 },
+              nativeParams: {
+                image: {
+                  aspect_ratios: []
+                },
+                icon: {
+                  aspect_ratios: []
+                }
+              }
+            }];
+
+            assert.doesNotThrow(() => spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }));
+          });
+        });
+
+        it('should expect any dimensions if min_width not passed', function () {
+          const validBidRequests = [{
+            bidId: 'bidId',
+            params: { mid: 1000 },
+            nativeParams: {
+              image: {
+                aspect_ratios: [{
+                  ratio_height: 3,
+                  ratio_width: 1
+                }]
+              }
+            }
+          }];
+
+          let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp[0].native.request.assets;
+          assert.ok(assets[0].img);
+          assert.equal(assets[0].img.wmin, 0);
+          assert.equal(assets[0].img.hmin, 0);
+          assert.ok(!assets[1]);
+        });
+      });
+    });
+
+    function getRequestImps(validBidRequests) {
+      return JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data).imp;
+    }
+  });
+
+  describe('interpretResponse', function () {
+    it('should return if no body in response', function () {
+      let serverResponse = {};
+      let bidRequest = {};
+
+      assert.ok(!spec.interpretResponse(serverResponse, bidRequest));
+    });
+    it('should return more than one bids', function () {
+      let serverResponse = {
+        body: {
+          seatbid: [{
+            bid: [{impid: '1', native: {ver: '1.1', link: { url: 'link' }, assets: [{id: 1, title: {text: 'Asset title text'}}]}}]
+          }, {
+            bid: [{impid: '2', native: {ver: '1.1', link: { url: 'link' }, assets: [{id: 1, data: {value: 'Asset title text'}}]}}]
+          }]
+        }
+      };
+      let bidRequest = {
+        data: {},
+        bids: [
+          {
+            bidId: 'bidId1',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+              body: { len: 140 }
+            }
+          },
+          {
+            bidId: 'bidId2',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+              body: { len: 140 }
+            }
+          }
+        ]
+      };
+
+      bids = spec.interpretResponse(serverResponse, bidRequest);
+      assert.equal(spec.interpretResponse(serverResponse, bidRequest).length, 2);
+    });
+
+    it('should parse seatbids', function () {
+      let serverResponse = {
+        body: {
+          seatbid: [{
+            bid: [
+              {impid: '1', native: {ver: '1.1', link: { url: 'link1' }, assets: [{id: 1, title: {text: 'Asset title text'}}]}},
+              {impid: '4', native: {ver: '1.1', link: { url: 'link4' }, assets: [{id: 1, title: {text: 'Asset title text'}}]}}
+            ]
+          }, {
+            bid: [{impid: '2', native: {ver: '1.1', link: { url: 'link2' }, assets: [{id: 1, data: {value: 'Asset title text'}}]}}]
+          }]
+        }
+      };
+      let bidRequest = {
+        data: {},
+        bids: [
+          {
+            bidId: 'bidId1',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+              body: { len: 140 }
+            }
+          },
+          {
+            bidId: 'bidId2',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+              body: { len: 140 }
+            }
+          },
+          {
+            bidId: 'bidId3',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+              body: { len: 140 }
+            }
+          },
+          {
+            bidId: 'bidId4',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+              body: { len: 140 }
+            }
+          }
+        ]
+      };
+
+      bids = spec.interpretResponse(serverResponse, bidRequest).map(bid => {
+        const { requestId, native: { clickUrl } } = bid;
+        return [ requestId, clickUrl ];
+      });
+
+      assert.equal(bids.length, 3);
+      assert.deepEqual(bids, [[ 'bidId1', 'link1' ], [ 'bidId2', 'link2' ], [ 'bidId4', 'link4' ]]);
+    });
+
+    it('should set correct values to bid', function () {
+      let serverResponse = {
+        body: {
+          id: null,
+          bidid: null,
+          seatbid: [{
+            bid: [
+              {
+                impid: '1',
+                price: 93.1231,
+                crid: '12312312',
+                native: {
+                  assets: [],
+                  link: { url: 'link' },
+                  imptrackers: ['imptrackers url1', 'imptrackers url2']
+                },
+                dealid: 'deal-id',
+                adomain: [ 'demo.com' ],
+                ext: {
+                  prebid: {
+                    type: 'native'
+                  }
+                }
+              }
+            ]
+          }],
+          cur: 'NOK'
+        }
+      };
+      let bidRequest = {
+        data: {},
+        bids: [
+          {
+            bidId: 'bidId1',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
+              body: { len: 140 }
+            }
+          }
+        ]
+      };
+
+      const bids = spec.interpretResponse(serverResponse, bidRequest);
+      const bid = serverResponse.body.seatbid[0].bid[0];
+      assert.deepEqual(bids[0].requestId, bidRequest.bids[0].bidId);
+      assert.deepEqual(bids[0].cpm, bid.price);
+      assert.deepEqual(bids[0].creativeId, bid.crid);
+      assert.deepEqual(bids[0].ttl, 360);
+      assert.deepEqual(bids[0].netRevenue, false);
+      assert.deepEqual(bids[0].currency, serverResponse.body.cur);
+      assert.deepEqual(bids[0].mediaType, 'native');
+      assert.deepEqual(bids[0].meta.mediaType, 'native');
+      assert.deepEqual(bids[0].meta.advertiserDomains, [ 'demo.com' ]);
+      assert.deepEqual(bids[0].dealId, 'deal-id');
+    });
+    it('should set correct native params', function () {
+      const bid = [
+        {
+          impid: '1',
+          price: 93.1231,
+          crid: '12312312',
+          native: {
+            assets: [
+              {
+                data: null,
+                id: 0,
+                img: null,
+                required: 0,
+                title: {text: 'title', len: null},
+                video: null
+              }, {
+                data: null,
+                id: 2,
+                img: {type: null, url: 'test.url.com/Files/58345/308185.jpg?bv=1', w: 30, h: 10},
+                required: 0,
+                title: null,
+                video: null
+              }, {
+                data: null,
+                id: 3,
+                img: {type: null, url: 'test.url.com/Files/58345/308200.jpg?bv=1', w: 100, h: 100},
+                required: 0,
+                title: null,
+                video: null
+              }, {
+                data: {type: null, len: null, value: 'body'},
+                id: 4,
+                img: null,
+                required: 0,
+                title: null,
+                video: null
+              }, {
+                data: {type: null, len: null, value: 'cta'},
+                id: 1,
+                img: null,
+                required: 0,
+                title: null,
+                video: null
+              }, {
+                data: {type: null, len: null, value: 'sponsoredBy'},
+                id: 5,
+                img: null,
+                required: 0,
+                title: null,
+                video: null
+              }
+            ],
+            link: { url: 'clickUrl', clicktrackers: ['clickTracker1', 'clickTracker2'] },
+            imptrackers: ['imptrackers url1', 'imptrackers url2'],
+            jstracker: 'jstracker'
+          }
+        }
+      ];
+      const serverResponse = {
+        body: {
+          id: null,
+          bidid: null,
+          seatbid: [{ bid }],
+          cur: 'NOK'
+        }
+      };
+      let bidRequest = {
+        data: {},
+        bids: [{ bidId: 'bidId1' }]
+      };
+
+      const result = spec.interpretResponse(serverResponse, bidRequest)[0].native;
+      const native = bid[0].native;
+      const assets = native.assets;
+      assert.deepEqual({
+        clickUrl: native.link.url,
+        clickTrackers: native.link.clicktrackers,
+        impressionTrackers: native.imptrackers,
+        javascriptTrackers: [ native.jstracker ],
+        title: assets[0].title.text,
+        icon: {url: assets[1].img.url, width: assets[1].img.w, height: assets[1].img.h},
+        image: {url: assets[2].img.url, width: assets[2].img.w, height: assets[2].img.h},
+        body: assets[3].data.value,
+        cta: assets[4].data.value,
+        sponsoredBy: assets[5].data.value
+      }, result);
+    });
+    it('should return empty when there is no bids in response', function () {
+      const serverResponse = {
+        body: {
+          id: null,
+          bidid: null,
+          seatbid: [{ bid: [] }],
+          cur: 'NOK'
+        }
+      };
+      let bidRequest = {
+        data: {},
+        bids: [{ bidId: 'bidId1' }]
+      };
+      const result = spec.interpretResponse(serverResponse, bidRequest)[0];
+      assert.ok(!result);
+    });
+
+    describe('banner', function () {
+      it('should set ad content on response', function () {
+        let serverResponse = {
+          body: {
+            seatbid: [{
+              bid: [{ impid: '1', adm: '<banner>', ext: { prebid: { type: 'banner' } } }]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { mid: 1000 }
+            }
+          ]
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].ad, '<banner>');
+        assert.equal(bids[0].mediaType, 'banner');
+        assert.equal(bids[0].meta.mediaType, 'banner');
+      });
+    });
+
+    describe('video', function () {
+      it('should set vastXml on response', function () {
+        let serverResponse = {
+          body: {
+            seatbid: [{
+              bid: [{ impid: '1', adm: '<vast>', ext: { prebid: { type: 'video' } } }]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { mid: 1000 }
+            }
+          ]
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].vastXml, '<vast>');
+        assert.equal(bids[0].mediaType, 'video');
+        assert.equal(bids[0].meta.mediaType, 'video');
+      });
+
+      it('should add renderer for outstream bids', function () {
+        let serverResponse = {
+          body: {
+            seatbid: [{
+              bid: [{ impid: '1', adm: '<vast>', ext: { prebid: { type: 'video' } } }, { impid: '2', adm: '<vast>', ext: { prebid: { type: 'video' } } }]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { mid: 1000 },
+              mediaTypes: {
+                video: {
+                  context: 'outstream'
+                }
+              }
+            },
+            {
+              bidId: 'bidId2',
+              params: { mid: 1000 },
+              mediaTypes: {
+                video: {
+                  constext: 'instream'
+                }
+              }
+            }
+          ]
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.ok(bids[0].renderer);
+        assert.equal(bids[1].renderer, undefined);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/adfinityBidAdapter_spec.js b/test/spec/modules/adfinityBidAdapter_spec.js
deleted file mode 100644
index 479a2303dd5..00000000000
--- a/test/spec/modules/adfinityBidAdapter_spec.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/adfinityBidAdapter.js';
-
-describe('AdfinityAdapter', function () {
-  let bid = {
-    bidId: '2dd581a2b6281d',
-    bidder: 'adfinity',
-    bidderRequestId: '145e1d6a7837c9',
-    params: {
-      placement_id: 0
-    },
-    placementCode: 'placementid_0',
-    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]]
-      }
-    },
-    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
-    schain: {
-      ver: '1.0',
-      complete: 1,
-      nodes: [
-        {
-          asi: 'example.com',
-          sid: '0',
-          hp: 1,
-          rid: 'bidrequestid',
-          domain: 'example.com'
-        }
-      ]
-    }
-  };
-  let bidderRequest = {
-    bidderCode: 'adfinity',
-    auctionId: 'fffffff-ffff-ffff-ffff-ffffffffffff',
-    bidderRequestId: 'ffffffffffffff',
-    start: 1472239426002,
-    auctionStart: 1472239426000,
-    timeout: 5000,
-    uspConsent: '1YN-',
-    refererInfo: {
-      referer: 'http://www.example.com',
-      reachedTop: true,
-    },
-    bids: [bid]
-  }
-
-  describe('isBidRequestValid', function () {
-    it('Should return true when placement_id can be cast to a number', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
-    });
-    it('Should return false when placement_id is not a number', function () {
-      bid.params.placement_id = 'aaa';
-      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://stat.adfinity.pro/?c=o&m=multi');
-    });
-
-    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');
-      let placements = data['placements'];
-      for (let i = 0; i < placements.length; i++) {
-        let placement = placements[i];
-        expect(placement).to.have.all.keys('placementId', 'bidId', 'traffic', 'sizes', 'schain');
-        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.sizes).to.be.an('array');
-      }
-    });
-    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 () {
-    let resObject = {
-      body: [ {
-        requestId: '123',
-        mediaType: 'banner',
-        cpm: 0.3,
-        width: 320,
-        height: 50,
-        ad: '<h1>Hello ad</h1>',
-        ttl: 1000,
-        creativeId: '123asd',
-        netRevenue: true,
-        currency: 'USD'
-      } ]
-    };
-    let serverResponses = spec.interpretResponse(resObject);
-    it('Returns an array of valid server responses if response object is valid', function () {
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType');
-        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.ad).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');
-      }
-      it('Returns an empty array if invalid response is passed', function () {
-        serverResponses = spec.interpretResponse('invalid_response');
-        expect(serverResponses).to.be.an('array').that.is.empty;
-      });
-    });
-  });
-
-  describe('getUserSyncs', function () {
-    let userSync = spec.getUserSyncs();
-    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('image');
-      expect(userSync[0].url).to.be.equal('https://stat.adfinity.pro/?c=o&m=cookie');
-    });
-  });
-});
diff --git a/test/spec/modules/adformBidAdapter_spec.js b/test/spec/modules/adformBidAdapter_spec.js
deleted file mode 100644
index 360979659de..00000000000
--- a/test/spec/modules/adformBidAdapter_spec.js
+++ /dev/null
@@ -1,510 +0,0 @@
-import {assert, expect} from 'chai';
-import {spec} from 'modules/adformBidAdapter.js';
-import { BANNER, VIDEO } from 'src/mediaTypes.js';
-import { config } from 'src/config.js';
-import { createEidsArray } from 'modules/userId/eids.js';
-
-describe('Adform adapter', function () {
-  let serverResponse, bidRequest, bidResponses;
-  let bids = [];
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'adform',
-      'params': {
-        'mid': '19910113'
-      }
-    };
-
-    it('should return true when required params found', function () {
-      assert(spec.isBidRequestValid(bid));
-    });
-
-    it('should return false when required params are missing', function () {
-      bid.params = {
-        adxDomain: 'adx.adform.net'
-      };
-      assert.isFalse(spec.isBidRequestValid(bid));
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('should pass multiple bids via single request', function () {
-      let request = spec.buildRequests(bids);
-      let parsedUrl = parseUrl(request.url);
-      assert.lengthOf(parsedUrl.items, 7);
-    });
-
-    it('should handle global request parameters', function () {
-      let parsedUrl = parseUrl(spec.buildRequests([bids[0]]).url);
-      let query = parsedUrl.query;
-
-      assert.equal(parsedUrl.path, 'https://newDomain/adx');
-      assert.equal(query.tid, 45);
-      assert.equal(query.rp, 4);
-      assert.equal(query.fd, 1);
-      assert.equal(query.stid, '7aefb970-2045');
-      assert.equal(query.url, encodeURIComponent('some// there'));
-    });
-
-    it('should set correct request method', function () {
-      let request = spec.buildRequests([bids[0]]);
-      assert.equal(request.method, 'GET');
-    });
-
-    it('should pass request currency from config', function () {
-      config.setConfig({ currency: { adServerCurrency: 'PLN' } });
-      let request = parseUrl(spec.buildRequests(bids).url);
-
-      request.items.forEach(item => {
-        assert.equal(item.rcur, 'PLN');
-      });
-    });
-
-    it('should prefer bid currency over global config', function () {
-      config.setConfig({ currency: { adServerCurrency: 'PLN' } });
-      bids[0].params.rcur = 'USD';
-      let request = parseUrl(spec.buildRequests(bids).url);
-      const currencies = request.items.map(item => item.rcur);
-
-      assert.deepEqual(currencies, [ 'USD', 'PLN', 'PLN', 'PLN', 'PLN', 'PLN', 'PLN' ]);
-    });
-
-    it('should correctly form bid items', function () {
-      let bidList = bids;
-      let request = spec.buildRequests(bidList);
-      let parsedUrl = parseUrl(request.url);
-      assert.deepEqual(parsedUrl.items, [
-        {
-          mid: '1',
-          transactionId: '5f33781f-9552-4ca1'
-        },
-        {
-          mid: '2',
-          someVar: 'someValue',
-          pt: 'gross',
-          transactionId: '5f33781f-9552-4iuy'
-        },
-        {
-          mid: '3',
-          pdom: 'home',
-          transactionId: '5f33781f-9552-7ev3'
-        },
-        {
-          mid: '3',
-          pdom: 'home',
-          transactionId: '5f33781f-9552-7ev3'
-        },
-        {
-          mid: '3',
-          pdom: 'home',
-          transactionId: '5f33781f-9552-7ev3'
-        },
-        {
-          mid: '5',
-          pt: 'net',
-          transactionId: '5f33781f-9552-7ev3',
-        },
-        {
-          mid: '6',
-          pt: 'gross',
-          transactionId: '5f33781f-9552-7ev3'
-        }
-      ]);
-    });
-
-    it('should not change original validBidRequests object', function () {
-      var resultBids = JSON.parse(JSON.stringify(bids[0]));
-      let request = spec.buildRequests([bids[0]]);
-      assert.deepEqual(resultBids, bids[0]);
-    });
-
-    it('should set gross to the request, if there is any gross priceType', function () {
-      let request = spec.buildRequests([bids[5], bids[5]]);
-      let parsedUrl = parseUrl(request.url);
-
-      assert.equal(parsedUrl.query.pt, 'net');
-
-      request = spec.buildRequests([bids[4], bids[3]]);
-      parsedUrl = parseUrl(request.url);
-
-      assert.equal(parsedUrl.query.pt, 'gross');
-    });
-
-    it('should pass extended ids', function () {
-      bids[0].userIdAsEids = createEidsArray({
-        tdid: 'TTD_ID_FROM_USER_ID_MODULE',
-        pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
-      });
-      let request = spec.buildRequests(bids);
-      let eids = parseUrl(request.url).query.eids;
-
-      assert.equal(eids, 'eyJhZHNlcnZlci5vcmciOnsiVFREX0lEX0ZST01fVVNFUl9JRF9NT0RVTEUiOlsxXX0sInB1YmNpZC5vcmciOnsicHViQ29tbW9uSWRfRlJPTV9VU0VSX0lEX01PRFVMRSI6WzFdfX0%3D');
-      assert.deepEqual(JSON.parse(atob(decodeURIComponent(eids))), {
-        'adserver.org': {
-          'TTD_ID_FROM_USER_ID_MODULE': [1]
-        },
-        'pubcid.org': {
-          'pubCommonId_FROM_USER_ID_MODULE': [1]
-        }
-      });
-    });
-
-    describe('user privacy', function () {
-      it('should send GDPR Consent data to adform if gdprApplies', function () {
-        let request = spec.buildRequests([bids[0]], {gdprConsent: {gdprApplies: true, consentString: 'concentDataString'}});
-        let parsedUrl = parseUrl(request.url).query;
-
-        assert.equal(parsedUrl.gdpr, '1');
-        assert.equal(parsedUrl.gdpr_consent, 'concentDataString');
-      });
-
-      it('should not send GDPR Consent data to adform if gdprApplies is undefined', function () {
-        let request = spec.buildRequests([bids[0]], {gdprConsent: {gdprApplies: false, consentString: 'concentDataString'}});
-        let parsedUrl = parseUrl(request.url).query;
-
-        assert.equal(parsedUrl.gdpr, '0');
-        assert.equal(parsedUrl.gdpr_consent, 'concentDataString');
-
-        request = spec.buildRequests([bids[0]], {gdprConsent: {gdprApplies: undefined, consentString: 'concentDataString'}});
-        parsedUrl = parseUrl(request.url).query;
-        assert.ok(!parsedUrl.gdpr);
-        assert.ok(!parsedUrl.gdpr_consent);
-      });
-
-      it('should return GDPR Consent data with request data', function () {
-        let request = spec.buildRequests([bids[0]], {gdprConsent: {gdprApplies: true, consentString: 'concentDataString'}});
-
-        assert.deepEqual(request.gdpr, {
-          gdpr: true,
-          gdpr_consent: 'concentDataString'
-        });
-
-        request = spec.buildRequests([bids[0]]);
-        assert.ok(!request.gdpr);
-      });
-
-      it('should send CCPA Consent data to adform', function () {
-        const request = spec.buildRequests([bids[0]], {uspConsent: '1YA-'});
-        const parsedUrl = parseUrl(request.url).query;
-
-        assert.equal(parsedUrl.us_privacy, '1YA-');
-      });
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('should respond with empty response when there is empty serverResponse', function () {
-      let result = spec.interpretResponse({ body: {} }, {});
-      assert.deepEqual(result, []);
-    });
-    it('should respond with empty response when response from server is not banner', function () {
-      serverResponse.body[0].response = 'not banner';
-      serverResponse.body = [serverResponse.body[0]];
-      bidRequest.bids = [bidRequest.bids[0]];
-      let result = spec.interpretResponse(serverResponse, bidRequest);
-
-      assert.deepEqual(result, []);
-    });
-    it('should interpret server response correctly with one bid', function () {
-      serverResponse.body = [serverResponse.body[0]];
-      bidRequest.bids = [bidRequest.bids[0]];
-      let result = spec.interpretResponse(serverResponse, bidRequest)[0];
-
-      assert.equal(result.requestId, '2a0cf4e');
-      assert.equal(result.cpm, 13.9);
-      assert.equal(result.width, 300);
-      assert.equal(result.height, 250);
-      assert.equal(result.creativeId, '2a0cf4e');
-      assert.equal(result.dealId, '123abc');
-      assert.equal(result.currency, 'EUR');
-      assert.equal(result.netRevenue, true);
-      assert.equal(result.ttl, 360);
-      assert.equal(result.ad, '<tag1>');
-      assert.equal(result.bidderCode, 'adform');
-      assert.equal(result.transactionId, '5f33781f-9552-4ca1');
-    });
-
-    it('should set correct netRevenue', function () {
-      serverResponse.body = [serverResponse.body[0]];
-      bidRequest.bids = [bidRequest.bids[1]];
-      bidRequest.netRevenue = 'gross';
-      let result = spec.interpretResponse(serverResponse, bidRequest)[0];
-
-      assert.equal(result.netRevenue, false);
-    });
-
-    it('should create bid response item for every requested item', function () {
-      let result = spec.interpretResponse(serverResponse, bidRequest);
-      assert.lengthOf(result, 5);
-    });
-
-    it('should create bid response with vast xml', function () {
-      const result = spec.interpretResponse(serverResponse, bidRequest)[3];
-      assert.equal(result.vastXml, '<vast_xml>');
-    });
-
-    it('should create bid response with vast url', function () {
-      const result = spec.interpretResponse(serverResponse, bidRequest)[4];
-      assert.equal(result.vastUrl, 'vast://url');
-    });
-
-    it('should set mediaType on bid response', function () {
-      const expected = [ BANNER, BANNER, BANNER, VIDEO, VIDEO ];
-      const result = spec.interpretResponse(serverResponse, bidRequest);
-      for (let i = 0; i < result.length; i++) {
-        assert.equal(result[i].mediaType, expected[i]);
-      }
-    });
-
-    it('should set default netRevenue as gross', function () {
-      bidRequest.netRevenue = 'gross';
-      const result = spec.interpretResponse(serverResponse, bidRequest);
-      for (let i = 0; i < result.length; i++) {
-        assert.equal(result[i].netRevenue, false);
-      }
-    });
-
-    it('should set gdpr if it exist in bidRequest', function () {
-      bidRequest.gdpr = {
-        gdpr: true,
-        gdpr_consent: 'ERW342EIOWT34234KMGds'
-      };
-      let result = spec.interpretResponse(serverResponse, bidRequest);
-      for (let i = 0; i < result.length; i++) {
-        assert.equal(result[i].gdpr, true);
-        assert.equal(result[i].gdpr_consent, 'ERW342EIOWT34234KMGds');
-      }
-
-      bidRequest.gdpr = undefined;
-      result = spec.interpretResponse(serverResponse, bidRequest);
-      for (let i = 0; i < result.length; i++) {
-        assert.ok(!result[i].gdpr);
-        assert.ok(!result[i].gdpr_consent);
-      }
-    });
-
-    it('should set a renderer only for an outstream context', function () {
-      serverResponse.body = [serverResponse.body[3], serverResponse.body[2]];
-      bidRequest.bids = [bidRequest.bids[6], bidRequest.bids[6]];
-      let result = spec.interpretResponse(serverResponse, bidRequest);
-      assert.ok(result[0].renderer);
-      assert.equal(result[1].renderer, undefined);
-    });
-
-    describe('verifySizes', function () {
-      it('should respond with empty response when sizes doesn\'t match', function () {
-        serverResponse.body[0].response = 'banner';
-        serverResponse.body[0].width = 100;
-        serverResponse.body[0].height = 150;
-
-        serverResponse.body = [serverResponse.body[0]];
-        bidRequest.bids = [bidRequest.bids[0]];
-        let result = spec.interpretResponse(serverResponse, bidRequest);
-
-        assert.equal(serverResponse.body.length, 1);
-        assert.equal(serverResponse.body[0].response, 'banner');
-        assert.deepEqual(result, []);
-      });
-      it('should respond with empty response when sizes as a strings doesn\'t match', function () {
-        serverResponse.body[0].response = 'banner';
-        serverResponse.body[0].width = 100;
-        serverResponse.body[0].height = 150;
-
-        serverResponse.body = [serverResponse.body[0]];
-        bidRequest.bids = [bidRequest.bids[0]];
-
-        bidRequest.bids[0].sizes = [['101', '150']];
-        let result = spec.interpretResponse(serverResponse, bidRequest);
-
-        assert.equal(serverResponse.body.length, 1);
-        assert.equal(serverResponse.body[0].response, 'banner');
-        assert.deepEqual(result, []);
-      });
-      it('should support size dimensions as a strings', function () {
-        serverResponse.body[0].response = 'banner';
-        serverResponse.body[0].width = 300;
-        serverResponse.body[0].height = 600;
-
-        serverResponse.body = [serverResponse.body[0]];
-        bidRequest.bids = [bidRequest.bids[0]];
-
-        bidRequest.bids[0].sizes = [['300', '250'], ['250', '300'], ['300', '600'], ['600', '300']];
-        let result = spec.interpretResponse(serverResponse, bidRequest);
-
-        assert.equal(result[0].width, 300);
-        assert.equal(result[0].height, 600);
-      });
-    });
-  });
-
-  beforeEach(function () {
-    config.setConfig({ currency: {} });
-
-    let sizes = [[250, 300], [300, 250], [300, 600], [600, 300]];
-    let placementCode = ['div-01', 'div-02', 'div-03', 'div-04', 'div-05'];
-    let mediaTypes = [{video: {context: 'outstream'}, banner: {sizes: sizes[3]}}];
-    let params = [{ mid: 1, url: 'some// there' }, {adxDomain: null, mid: 2, someVar: 'someValue', pt: 'gross'}, { adxDomain: null, mid: 3, pdom: 'home' }, {mid: 5, pt: 'net'}, {mid: 6, pt: 'gross'}];
-    bids = [
-      {
-        adUnitCode: placementCode[0],
-        auctionId: '7aefb970-2045',
-        bidId: '2a0cf4e',
-        bidder: 'adform',
-        bidderRequestId: '1ab8d9',
-        params: params[0],
-        adxDomain: 'newDomain',
-        tid: 45,
-        placementCode: placementCode[0],
-        sizes: [[300, 250], [250, 300], [300, 600], [600, 300]],
-        transactionId: '5f33781f-9552-4ca1'
-      },
-      {
-        adUnitCode: placementCode[1],
-        auctionId: '7aefb970-2045',
-        bidId: '2a0cf5b',
-        bidder: 'adform',
-        bidderRequestId: '1ab8d9',
-        params: params[1],
-        placementCode: placementCode[1],
-        sizes: [[300, 250], [250, 300], [300, 600], [600, 300]],
-        transactionId: '5f33781f-9552-4iuy'
-      },
-      {
-        adUnitCode: placementCode[2],
-        auctionId: '7aefb970-2045',
-        bidId: '2a0cf6n',
-        bidder: 'adform',
-        bidderRequestId: '1ab8d9',
-        params: params[2],
-        placementCode: placementCode[2],
-        sizes: [[300, 250], [250, 300], [300, 600], [600, 300]],
-        transactionId: '5f33781f-9552-7ev3'
-      },
-      {
-        adUnitCode: placementCode[3],
-        auctionId: '7aefb970-2045',
-        bidId: '2a0cf6n',
-        bidder: 'adform',
-        bidderRequestId: '1ab8d9',
-        params: params[2],
-        placementCode: placementCode[2],
-        sizes: [],
-        transactionId: '5f33781f-9552-7ev3'
-      },
-      {
-        adUnitCode: placementCode[4],
-        auctionId: '7aefb970-2045',
-        bidId: '2a0cf6n',
-        bidder: 'adform',
-        bidderRequestId: '1ab8d9',
-        params: params[2],
-        placementCode: placementCode[2],
-        sizes: [],
-        transactionId: '5f33781f-9552-7ev3'
-      },
-      {
-        adUnitCode: placementCode[4],
-        auctionId: '7aefb970-2045',
-        bidId: '2a0cf6n',
-        bidder: 'adform',
-        bidderRequestId: '1ab8d9',
-        params: params[3],
-        placementCode: placementCode[2],
-        sizes: [],
-        transactionId: '5f33781f-9552-7ev3'
-      },
-      {
-        adUnitCode: placementCode[4],
-        auctionId: '7aefb970-2045',
-        bidId: '2a0cf6n',
-        bidder: 'adform',
-        bidderRequestId: '1ab8d9',
-        params: params[4],
-        placementCode: placementCode[2],
-        sizes: [],
-        mediaTypes: mediaTypes[0],
-        transactionId: '5f33781f-9552-7ev3'
-      }
-    ];
-    serverResponse = {
-      body: [
-        {
-          banner: '<tag1>',
-          deal_id: '123abc',
-          height: 250,
-          response: 'banner',
-          width: 300,
-          win_bid: 13.9,
-          win_cur: 'EUR'
-        },
-        {
-          banner: '<tag2>',
-          deal_id: '123abc',
-          height: 300,
-          response: 'banner',
-          width: 250,
-          win_bid: 13.9,
-          win_cur: 'EUR'
-        },
-        {
-          banner: '<tag3>',
-          deal_id: '123abc',
-          height: 300,
-          response: 'banner',
-          width: 600,
-          win_bid: 10,
-          win_cur: 'EUR'
-        },
-        {
-          deal_id: '123abc',
-          height: 300,
-          response: 'vast_content',
-          width: 600,
-          win_bid: 10,
-          win_cur: 'EUR',
-          vast_content: '<vast_xml>'
-        },
-        {
-          deal_id: '123abc',
-          height: 300,
-          response: 'vast_url',
-          width: 600,
-          win_bid: 10,
-          win_cur: 'EUR',
-          vast_url: 'vast://url'
-        }
-      ],
-      headers: {}
-    };
-    bidRequest = {
-      bidder: 'adform',
-      bids: bids,
-      method: 'GET',
-      url: 'url',
-      netRevenue: 'net'
-    };
-  });
-});
-
-function parseUrl(url) {
-  const parts = url.split('/');
-  const query = parts.pop().split('&');
-  return {
-    path: parts.join('/'),
-    items: query
-      .filter((i) => !~i.indexOf('='))
-      .map((i) => atob(decodeURIComponent(i))
-        .split('&')
-        .reduce(toObject, {})),
-    query: query
-      .filter((i) => ~i.indexOf('='))
-      .map((i) => i.replace('?', ''))
-      .reduce(toObject, {})
-  };
-}
-
-function toObject(cache, string) {
-  const keyValue = string.split('=');
-  cache[keyValue[0]] = keyValue[1];
-  return cache;
-}
diff --git a/test/spec/modules/adformOpenRTBBidAdapter_spec.js b/test/spec/modules/adformOpenRTBBidAdapter_spec.js
deleted file mode 100644
index 05788183e29..00000000000
--- a/test/spec/modules/adformOpenRTBBidAdapter_spec.js
+++ /dev/null
@@ -1,676 +0,0 @@
-// jshint esversion: 6, es3: false, node: true
-import {assert, expect} from 'chai';
-import {spec} from 'modules/adformOpenRTBBidAdapter.js';
-import { NATIVE } from 'src/mediaTypes.js';
-import { config } from 'src/config.js';
-import { createEidsArray } from 'modules/userId/eids.js';
-
-describe('AdformOpenRTB adapter', function () {
-  let serverResponse, bidRequest, bidResponses;
-  let bids = [];
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'adformOpenRTB',
-      'params': {
-        'mid': '19910113'
-      }
-    };
-
-    it('should return true when required params found', function () {
-      assert(spec.isBidRequestValid(bid));
-    });
-
-    it('should return false when required params are missing', function () {
-      bid.params = { adxDomain: 'adx.adform.net' };
-      assert.isFalse(spec.isBidRequestValid(bid));
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('should send request with correct structure', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {
-          siteId: 'siteId',
-          adxDomain: '10.8.57.207'
-        }
-      }];
-      let request = spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } });
-
-      assert.equal(request.method, 'POST');
-      assert.equal(request.url, 'https://10.8.57.207/adx/openrtb');
-      assert.deepEqual(request.options, {contentType: 'application/json'});
-      assert.ok(request.data);
-    });
-
-    describe('user privacy', function () {
-      it('should send GDPR Consent data to adform if gdprApplies', function () {
-        let validBidRequests = [{ bidId: 'bidId', params: { siteId: 'siteId', test: 1 } }];
-        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { referer: 'page' } };
-        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.user.ext.consent, bidderRequest.gdprConsent.consentString);
-        assert.equal(request.regs.ext.gdpr, bidderRequest.gdprConsent.gdprApplies);
-        assert.equal(typeof request.regs.ext.gdpr, 'number');
-      });
-
-      it('should send gdpr as number', function () {
-        let validBidRequests = [{ bidId: 'bidId', params: { siteId: 'siteId', test: 1 } }];
-        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { referer: 'page' } };
-        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(typeof request.regs.ext.gdpr, 'number');
-        assert.equal(request.regs.ext.gdpr, 1);
-      });
-
-      it('should send CCPA Consent data to adform', function () {
-        let validBidRequests = [{ bidId: 'bidId', params: { siteId: 'siteId', test: 1 } }];
-        let bidderRequest = { uspConsent: '1YA-', refererInfo: { referer: 'page' } };
-        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.regs.ext.us_privacy, '1YA-');
-
-        bidderRequest = { uspConsent: '1YA-', gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { referer: 'page' } };
-        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.regs.ext.us_privacy, '1YA-');
-        assert.equal(request.user.ext.consent, 'consentDataString');
-        assert.equal(request.regs.ext.gdpr, 1);
-      });
-
-      it('should not send GDPR Consent data to adform if gdprApplies is undefined', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: { siteId: 'siteId' }
-        }];
-        let bidderRequest = {gdprConsent: {gdprApplies: false, consentString: 'consentDataString'}, refererInfo: { referer: 'page' }};
-        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.user.ext.consent, 'consentDataString');
-        assert.equal(request.regs.ext.gdpr, 0);
-
-        bidderRequest = {gdprConsent: {consentString: 'consentDataString'}, refererInfo: { referer: 'page' }};
-        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
-
-        assert.equal(request.user, undefined);
-        assert.equal(request.regs, undefined);
-      });
-      it('should send default GDPR Consent data to adform', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: { siteId: 'siteId' }
-        }];
-        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-
-        assert.equal(request.user, undefined);
-        assert.equal(request.regs, undefined);
-      });
-    });
-
-    it('should add test and is_debug to request, if test is set in parameters', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: { siteId: 'siteId', test: 1 }
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-
-      assert.ok(request.is_debug);
-      assert.equal(request.test, 1);
-    });
-
-    it('should have default request structure', function () {
-      let keys = 'site,device,source,ext,imp'.split(',');
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: { siteId: 'siteId' }
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-      let data = Object.keys(request);
-
-      assert.deepEqual(keys, data);
-    });
-
-    it('should set request keys correct values', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: { siteId: 'siteId' },
-        transactionId: 'transactionId'
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-
-      assert.equal(request.source.tid, validBidRequests[0].transactionId);
-      assert.equal(request.source.fd, 1);
-    });
-
-    it('should send info about device', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: { siteId: 'siteId' }
-      }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-
-      assert.equal(request.device.ua, navigator.userAgent);
-    });
-    it('should send info about the site', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: { siteId: 'siteId', publisher: {id: '123123', domain: 'publisher.domain.com', name: 'publisher\'s name'} }
-      }];
-      let refererInfo = { referer: 'page' };
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo }).data);
-
-      assert.deepEqual(request.site, {
-        page: refererInfo.referer,
-        publisher: validBidRequests[0].params.publisher,
-        id: validBidRequests[0].params.siteId
-      });
-    });
-
-    it('should pass extended ids', function () {
-      let validBidRequests = [{
-        bidId: 'bidId',
-        params: {},
-        userIdAsEids: createEidsArray({
-          tdid: 'TTD_ID_FROM_USER_ID_MODULE',
-          pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
-        })
-      }];
-
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-      assert.deepEqual(request.user.ext.eids, [
-        { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
-        { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
-      ]);
-    });
-
-    it('should send currency if defined', function () {
-      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
-      let validBidRequests = [{ params: {} }];
-      let refererInfo = { referer: 'page' };
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo }).data);
-
-      assert.deepEqual(request.cur, [ 'EUR' ]);
-    });
-
-    describe('priceType', function () {
-      it('should send default priceType', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: { siteId: 'siteId' }
-        }];
-        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-
-        assert.equal(request.ext.pt, 'net');
-      });
-      it('should send correct priceType value', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: { siteId: 'siteId', priceType: 'net' }
-        }];
-        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-
-        assert.equal(request.ext.pt, 'net');
-      });
-    });
-
-    describe('bids', function () {
-      it('should add more than one bid to the request', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: { siteId: 'siteId' }
-        }, {
-          bidId: 'bidId2',
-          params: { siteId: 'siteId' }
-        }];
-        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
-
-        assert.equal(request.imp.length, 2);
-      });
-      it('should add incrementing values of id', function () {
-        let validBidRequests = [{
-          bidId: 'bidId',
-          params: { siteId: 'siteId' }
-        }, {
-          bidId: 'bidId2',
-          params: { siteId: 'siteId' }
-        }, {
-          bidId: 'bidId3',
-          params: { siteId: 'siteId' }
-        }];
-        let imps = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp;
-
-        for (let i = 0; i < 3; i++) {
-          assert.equal(imps[i].id, i + 1);
-        }
-      });
-
-      it('should add mid', function () {
-        let validBidRequests = [{ bidId: 'bidId', params: { siteId: 'siteId', mid: 1000 } },
-          { bidId: 'bidId2', params: { siteId: 'siteId', mid: 1001 } },
-          { bidId: 'bidId3', params: { siteId: 'siteId', mid: 1002 } }];
-        let imps = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp;
-        for (let i = 0; i < 3; i++) {
-          assert.equal(imps[i].tagid, validBidRequests[i].params.mid);
-        }
-      });
-
-      describe('native', function () {
-        describe('assets', function () {
-          it('should set correct asset id', function () {
-            let validBidRequests = [{
-              bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
-              nativeParams: {
-                title: { required: true, len: 140 },
-                image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-                body: { len: 140 }
-              }
-            }];
-            let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp[0].native.request.assets;
-
-            assert.equal(assets[0].id, 0);
-            assert.equal(assets[1].id, 3);
-            assert.equal(assets[2].id, 4);
-          });
-          it('should add required key if it is necessary', function () {
-            let validBidRequests = [{
-              bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
-              nativeParams: {
-                title: { required: true, len: 140 },
-                image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-                body: { len: 140 },
-                sponsoredBy: { required: true, len: 140 }
-              }
-            }];
-
-            let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp[0].native.request.assets;
-
-            assert.equal(assets[0].required, 1);
-            assert.ok(!assets[1].required);
-            assert.ok(!assets[2].required);
-            assert.equal(assets[3].required, 1);
-          });
-
-          it('should map img and data assets', function () {
-            let validBidRequests = [{
-              bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
-              nativeParams: {
-                title: { required: true, len: 140 },
-                image: { required: true, sizes: [150, 50] },
-                icon: { required: false, sizes: [50, 50] },
-                body: { required: false, len: 140 },
-                sponsoredBy: { required: true },
-                cta: { required: false },
-                clickUrl: { required: false }
-              }
-            }];
-
-            let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp[0].native.request.assets;
-            assert.ok(assets[0].title);
-            assert.equal(assets[0].title.len, 140);
-            assert.deepEqual(assets[1].img, { type: 3, w: 150, h: 50 });
-            assert.deepEqual(assets[2].img, { type: 1, w: 50, h: 50 });
-            assert.deepEqual(assets[3].data, { type: 2, len: 140 });
-            assert.deepEqual(assets[4].data, { type: 1 });
-            assert.deepEqual(assets[5].data, { type: 12 });
-            assert.ok(!assets[6]);
-          });
-
-          describe('icon/image sizing', function () {
-            it('should flatten sizes and utilise first pair', function () {
-              const validBidRequests = [{
-                bidId: 'bidId',
-                params: { siteId: 'siteId', mid: 1000 },
-                nativeParams: {
-                  image: {
-                    sizes: [[200, 300], [100, 200]]
-                  },
-                }
-              }];
-
-              let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp[0].native.request.assets;
-              assert.ok(assets[0].img);
-              assert.equal(assets[0].img.w, 200);
-              assert.equal(assets[0].img.h, 300);
-            });
-          });
-
-          it('should utilise aspect_ratios', function () {
-            const validBidRequests = [{
-              bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
-              nativeParams: {
-                image: {
-                  aspect_ratios: [{
-                    min_width: 100,
-                    ratio_height: 3,
-                    ratio_width: 1
-                  }]
-                },
-                icon: {
-                  aspect_ratios: [{
-                    min_width: 10,
-                    ratio_height: 5,
-                    ratio_width: 2
-                  }]
-                }
-              }
-            }];
-
-            let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp[0].native.request.assets;
-            assert.ok(assets[0].img);
-            assert.equal(assets[0].img.wmin, 100);
-            assert.equal(assets[0].img.hmin, 300);
-
-            assert.ok(assets[1].img);
-            assert.equal(assets[1].img.wmin, 10);
-            assert.equal(assets[1].img.hmin, 25);
-          });
-
-          it('should not throw error if aspect_ratios config is not defined', function () {
-            const validBidRequests = [{
-              bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
-              nativeParams: {
-                image: {
-                  aspect_ratios: []
-                },
-                icon: {
-                  aspect_ratios: []
-                }
-              }
-            }];
-
-            assert.doesNotThrow(() => spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }));
-          });
-        });
-
-        it('should expect any dimensions if min_width not passed', function () {
-          const validBidRequests = [{
-            bidId: 'bidId',
-            params: { siteId: 'siteId', mid: 1000 },
-            nativeParams: {
-              image: {
-                aspect_ratios: [{
-                  ratio_height: 3,
-                  ratio_width: 1
-                }]
-              }
-            }
-          }];
-
-          let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp[0].native.request.assets;
-          assert.ok(assets[0].img);
-          assert.equal(assets[0].img.wmin, 0);
-          assert.equal(assets[0].img.hmin, 0);
-          assert.ok(!assets[1]);
-        });
-      });
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('should return if no body in response', function () {
-      let serverResponse = {};
-      let bidRequest = {};
-
-      assert.ok(!spec.interpretResponse(serverResponse, bidRequest));
-    });
-    it('should return more than one bids', function () {
-      let serverResponse = {
-        body: {
-          seatbid: [{
-            bid: [{impid: '1', native: {ver: '1.1', link: { url: 'link' }, assets: [{id: 1, title: {text: 'Asset title text'}}]}}]
-          }, {
-            bid: [{impid: '2', native: {ver: '1.1', link: { url: 'link' }, assets: [{id: 1, data: {value: 'Asset title text'}}]}}]
-          }]
-        }
-      };
-      let bidRequest = {
-        data: {},
-        bids: [
-          {
-            bidId: 'bidId1',
-            params: { siteId: 'siteId', mid: 1000 },
-            nativeParams: {
-              title: { required: true, len: 140 },
-              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-              body: { len: 140 }
-            }
-          },
-          {
-            bidId: 'bidId2',
-            params: { siteId: 'siteId', mid: 1000 },
-            nativeParams: {
-              title: { required: true, len: 140 },
-              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-              body: { len: 140 }
-            }
-          }
-        ]
-      };
-
-      bids = spec.interpretResponse(serverResponse, bidRequest);
-      assert.equal(spec.interpretResponse(serverResponse, bidRequest).length, 2);
-    });
-
-    it('should parse seatbids', function () {
-      let serverResponse = {
-        body: {
-          seatbid: [{
-            bid: [
-              {impid: '1', native: {ver: '1.1', link: { url: 'link1' }, assets: [{id: 1, title: {text: 'Asset title text'}}]}},
-              {impid: '4', native: {ver: '1.1', link: { url: 'link4' }, assets: [{id: 1, title: {text: 'Asset title text'}}]}}
-            ]
-          }, {
-            bid: [{impid: '2', native: {ver: '1.1', link: { url: 'link2' }, assets: [{id: 1, data: {value: 'Asset title text'}}]}}]
-          }]
-        }
-      };
-      let bidRequest = {
-        data: {},
-        bids: [
-          {
-            bidId: 'bidId1',
-            params: { siteId: 'siteId', mid: 1000 },
-            nativeParams: {
-              title: { required: true, len: 140 },
-              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-              body: { len: 140 }
-            }
-          },
-          {
-            bidId: 'bidId2',
-            params: { siteId: 'siteId', mid: 1000 },
-            nativeParams: {
-              title: { required: true, len: 140 },
-              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-              body: { len: 140 }
-            }
-          },
-          {
-            bidId: 'bidId3',
-            params: { siteId: 'siteId', mid: 1000 },
-            nativeParams: {
-              title: { required: true, len: 140 },
-              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-              body: { len: 140 }
-            }
-          },
-          {
-            bidId: 'bidId4',
-            params: { siteId: 'siteId', mid: 1000 },
-            nativeParams: {
-              title: { required: true, len: 140 },
-              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-              body: { len: 140 }
-            }
-          }
-        ]
-      };
-
-      bids = spec.interpretResponse(serverResponse, bidRequest).map(bid => {
-        const { requestId, native: { clickUrl } } = bid;
-        return [ requestId, clickUrl ];
-      });
-
-      assert.equal(bids.length, 3);
-      assert.deepEqual(bids, [[ 'bidId1', 'link1' ], [ 'bidId2', 'link2' ], [ 'bidId4', 'link4' ]]);
-    });
-
-    it('should set correct values to bid', function () {
-      let serverResponse = {
-        body: {
-          id: null,
-          bidid: null,
-          seatbid: [{
-            bid: [
-              {
-                impid: '1',
-                price: 93.1231,
-                crid: '12312312',
-                native: {
-                  assets: [],
-                  link: { url: 'link' },
-                  imptrackers: ['imptrackers url1', 'imptrackers url2']
-                }
-              }
-            ]
-          }],
-          cur: 'NOK'
-        }
-      };
-      let bidRequest = {
-        data: {},
-        bids: [
-          {
-            bidId: 'bidId1',
-            params: { siteId: 'siteId', mid: 1000 },
-            nativeParams: {
-              title: { required: true, len: 140 },
-              image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
-              body: { len: 140 }
-            }
-          }
-        ]
-      };
-
-      const bids = spec.interpretResponse(serverResponse, bidRequest);
-      const bid = serverResponse.body.seatbid[0].bid[0];
-      assert.deepEqual(bids[0].requestId, bidRequest.bids[0].bidId);
-      assert.deepEqual(bids[0].cpm, bid.price);
-      assert.deepEqual(bids[0].creativeId, bid.crid);
-      assert.deepEqual(bids[0].ttl, 360);
-      assert.deepEqual(bids[0].netRevenue, false);
-      assert.deepEqual(bids[0].currency, serverResponse.body.cur);
-      assert.deepEqual(bids[0].mediaType, 'native');
-      assert.deepEqual(bids[0].bidderCode, 'adformOpenRTB');
-    });
-    it('should set correct native params', function () {
-      const bid = [
-        {
-          impid: '1',
-          price: 93.1231,
-          crid: '12312312',
-          native: {
-            assets: [
-              {
-                data: null,
-                id: 0,
-                img: null,
-                required: 0,
-                title: {text: 'title', len: null},
-                video: null
-              }, {
-                data: null,
-                id: 2,
-                img: {type: null, url: 'test.url.com/Files/58345/308185.jpg?bv=1', w: 30, h: 10},
-                required: 0,
-                title: null,
-                video: null
-              }, {
-                data: null,
-                id: 3,
-                img: {type: null, url: 'test.url.com/Files/58345/308200.jpg?bv=1', w: 100, h: 100},
-                required: 0,
-                title: null,
-                video: null
-              }, {
-                data: {type: null, len: null, value: 'body'},
-                id: 4,
-                img: null,
-                required: 0,
-                title: null,
-                video: null
-              }, {
-                data: {type: null, len: null, value: 'cta'},
-                id: 1,
-                img: null,
-                required: 0,
-                title: null,
-                video: null
-              }, {
-                data: {type: null, len: null, value: 'sponsoredBy'},
-                id: 5,
-                img: null,
-                required: 0,
-                title: null,
-                video: null
-              }
-            ],
-            link: { url: 'clickUrl', clicktrackers: ['clickTracker1', 'clickTracker2'] },
-            imptrackers: ['imptrackers url1', 'imptrackers url2'],
-            jstracker: 'jstracker'
-          }
-        }
-      ];
-      const serverResponse = {
-        body: {
-          id: null,
-          bidid: null,
-          seatbid: [{ bid }],
-          cur: 'NOK'
-        }
-      };
-      let bidRequest = {
-        data: {},
-        bids: [{ bidId: 'bidId1' }]
-      };
-
-      const result = spec.interpretResponse(serverResponse, bidRequest)[0].native;
-      const native = bid[0].native;
-      const assets = native.assets;
-      assert.deepEqual({
-        clickUrl: native.link.url,
-        clickTrackers: native.link.clicktrackers,
-        impressionTrackers: native.imptrackers,
-        javascriptTrackers: [ native.jstracker ],
-        title: assets[0].title.text,
-        icon: {url: assets[1].img.url, width: assets[1].img.w, height: assets[1].img.h},
-        image: {url: assets[2].img.url, width: assets[2].img.w, height: assets[2].img.h},
-        body: assets[3].data.value,
-        cta: assets[4].data.value,
-        sponsoredBy: assets[5].data.value
-      }, result);
-    });
-    it('should return empty when there is no bids in response', function () {
-      const serverResponse = {
-        body: {
-          id: null,
-          bidid: null,
-          seatbid: [{ bid: [] }],
-          cur: 'NOK'
-        }
-      };
-      let bidRequest = {
-        data: {},
-        bids: [{ bidId: 'bidId1' }]
-      };
-      const result = spec.interpretResponse(serverResponse, bidRequest)[0];
-      assert.ok(!result);
-    });
-  });
-});
diff --git a/test/spec/modules/adgenerationBidAdapter_spec.js b/test/spec/modules/adgenerationBidAdapter_spec.js
index 927e7910723..8583c226e50 100644
--- a/test/spec/modules/adgenerationBidAdapter_spec.js
+++ b/test/spec/modules/adgenerationBidAdapter_spec.js
@@ -84,17 +84,72 @@ describe('AdgenerationAdapter', function () {
         bidderRequestId: '14a9f773e30243',
         auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
         transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a'
+      },
+      { // bannerWithHyperId
+        bidder: 'adg',
+        params: {
+          id: '58278', // banner
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[320, 100]],
+        bidId: '2f6ac468a9c15e',
+        bidderRequestId: '14a9f773e30243',
+        auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
+        transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a',
+        userId: {
+          novatiq: {
+            snowflake: {'id': 'novatiqId', syncResponse: 1}
+          }
+        }
+      },
+      { // bannerWithAdgextCriteoId
+        bidder: 'adg',
+        params: {
+          id: '58278', // banner
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[320, 100]],
+        bidId: '2f6ac468a9c15e',
+        bidderRequestId: '14a9f773e30243',
+        auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
+        transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a',
+        userId: {
+          criteoId: 'criteo-id-test-1234567890'
+        }
+      },
+      { // bannerWithAdgextId5Id
+        bidder: 'adg',
+        params: {
+          id: '58278', // banner
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[320, 100]],
+        bidId: '2f6ac468a9c15e',
+        bidderRequestId: '14a9f773e30243',
+        auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
+        transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a',
+        userId: {
+          id5id: {
+            ext: {
+              linkType: 2
+            },
+            uid: 'id5-id-test-1234567890'
+          }
+        }
       }
     ];
     const bidderRequest = {
       refererInfo: {
-        referer: 'https://example.com'
+        page: 'https://example.com'
       }
     };
     const data = {
-      banner: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.0.1&imark=1&tp=https%3A%2F%2Fexample.com`,
-      bannerUSD: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100&currency=USD&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.0.1&imark=1&tp=https%3A%2F%2Fexample.com`,
-      native: 'posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=1x1&currency=JPY&pbver=' + prebid.version + '&sdkname=prebidjs&adapterver=1.0.1&tp=https%3A%2F%2Fexample.com'
+      banner: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&imark=1&tp=https%3A%2F%2Fexample.com`,
+      bannerUSD: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100&currency=USD&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&imark=1&tp=https%3A%2F%2Fexample.com`,
+      native: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=1x1&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&tp=https%3A%2F%2Fexample.com`,
+      bannerWithHyperId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&imark=1&tp=https%3A%2F%2Fexample.com&hyper_id=novatiqId`,
+      bannerWithAdgextCriteoId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&adgext_criteo_id=criteo-id-test-1234567890&imark=1&tp=https%3A%2F%2Fexample.com`,
+      bannerWithAdgextId5Id: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&adgext_id5_id=id5-id-test-1234567890&adgext_id5_id_link_type=2&imark=1&tp=https%3A%2F%2Fexample.com`,
     };
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest)[0];
@@ -118,6 +173,30 @@ describe('AdgenerationAdapter', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest)[1];
       expect(request.data).to.equal(data.native);
     });
+
+    it('should attache params to the bannerWithHyperId request', function () {
+      const defaultUA = window.navigator.userAgent;
+      window.navigator.__defineGetter__('userAgent', function() {
+        return 'Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Mobile/15E148 Safari/604.1';
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest)[2];
+
+      window.navigator.__defineGetter__('userAgent', function() {
+        return defaultUA;
+      });
+      expect(request.data).to.equal(data.bannerWithHyperId);
+    });
+
+    it('should attache params to the bannerWithAdgextCriteoId request', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[3];
+      expect(request.data).to.equal(data.bannerWithAdgextCriteoId);
+    });
+
+    it('should attache params to the bannerWithAdgextId5Id request', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[4];
+      expect(request.data).to.equal(data.bannerWithAdgextId5Id);
+    });
+
     it('allows setConfig to set bidder currency for JPY', function () {
       config.setConfig({
         currency: {
@@ -192,171 +271,603 @@ describe('AdgenerationAdapter', function () {
           transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a'
         },
       },
+      upperBillboard: {
+        bidRequest: {
+          bidder: 'adg',
+          params: {
+            id: '143038', // banner
+            marginTop: '50',
+          },
+          adUnitCode: 'adunit-code',
+          sizes: [[320, 180]],
+          bidId: '2f6ac468a9c15e',
+          bidderRequestId: '14a9f773e30243',
+          auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
+          transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a'
+        },
+      },
     };
 
     const serverResponse = {
       noAd: {
         results: [],
       },
-      banner: {
-        ad: '<div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>',
-        beacon: '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
-        cpm: 36.0008,
-        displaytype: '1',
-        ids: {},
-        w: 320,
-        h: 100,
-        location_params: null,
-        locationid: '58279',
-        rotation: '0',
-        scheduleid: '512603',
-        sdktype: '0',
-        creativeid: '1k2kv35vsa5r',
-        dealid: 'fd5sa5fa7f',
-        ttl: 1000,
-        results: [
-          {ad: '<!DOCTYPE html> <head> <meta charset="UTF-8"> <script src="https://bigman-test.scaleout.jp/sdk/js/adg-script-base.js" type="text/javascript"></script> <script type="text/javascript">adsettings = {locationid  : 10696,rotation    : 0,displaytype : 1,sdktype     : "0",scheduleid  : 12827}; </script> <style>body {margin:0;padding:0;} </style> </head> <body> <div id="medibasspContainer"> <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=_HWL-PTe&rd=https%3A%2F%2Fapi-test.scaleout.jp%2Frd%2Fv1%2Fz%2FhKFj2gDAY2hzbT0xNzUsYjkzMzU2N2QvMTA2OTYvU1NQTE9DLzEyODI3LzI3NTMuNzQ5NC4xMjgyNy84Mjg1LzExMjc1LzEwNjk2OlNTUExPQzoqL2N0PTE1MjIyMjY1OTU3ODI7c3I9aHR0cDtkc3BpZD0zMDE7cHI9eU1pV0FySmZ6TmJCU1ZDcm5FSkZBNGQ1O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTAwO2NyeTJkPTAuMDE7aWR4PTA7pXNlcWlk2gAkODZhN2EzNjYtNzI2Yi1mYjFkLTc0Y2QtZmQ3MTA5NzQ2NmVip3NlcXRpbWWtMTUyMjIyNjU5NTc4MqR4dWlkuFZuME5lcXdRQVMwQUFCbC1BTnNBQUFBQQ%2Fp%2Fseqid%3D86a7a366-726b-fb1d-74cd-fd71097466eb%3Bseqctx%3Dgat3by5hZy5mdHlwZaEx%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe> </div> </body> <iframe src="https://api-test.scaleout.jp/aux/sosync?ctsv=localhost&amp;seqid=86a7a366-726b-fb1d-74cd-fd71097466eb&amp;seqtime=1522226595782" width="1" height="1" style="position:absolute;border:none;padding:0;margin:0;"></iframe>'},
-        ]
-      },
-      native: {
-        ad: '<!DOCTYPE html>↵  <head>↵    <meta charset="UTF-8">↵    <script src="https://i.socdm.com/sdk/js/adg-script-base.js" type="text/javascript"></script>↵    <script type="text/javascript">↵      adsettings = {↵        locationid  : 58278,↵        rotation    : 0,↵        displaytype : 1,↵        sdktype     : "0",↵        scheduleid  : 512601↵      };↵    </script>↵    <style>↵      body {↵        margin:0;↵        padding:0;↵      }↵    </style>↵  </head>↵  <body>↵    <div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>↵  </body>',
-        beacon: '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
-        cpm: 36.0008,
-        displaytype: '1',
-        ids: {},
-        location_params: null,
-        locationid: '58279',
-        native_ad: {
-          assets: [
-            {
-              data: {
-                label: 'accompanying_text',
-                value: 'AD'
+      normal: {
+        banner: {
+          ad: '<div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>',
+          beacon: '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          cpm: 36.0008,
+          displaytype: '1',
+          ids: {},
+          w: 320,
+          h: 100,
+          location_params: null,
+          locationid: '58279',
+          rotation: '0',
+          scheduleid: '512603',
+          sdktype: '0',
+          creativeid: '1k2kv35vsa5r',
+          dealid: 'fd5sa5fa7f',
+          ttl: 1000,
+          results: [
+            {ad: '<\!DOCTYPE html> <head> <meta charset="UTF-8"> <script src="https://bigman-test.scaleout.jp/sdk/js/adg-script-base.js" type="text/javascript"></script> <script type="text/javascript">adsettings = {locationid  : 10696,rotation    : 0,displaytype : 1,sdktype     : "0",scheduleid  : 12827}; </script> <style>body {margin:0;padding:0;} </style> </head> <body> <div id="medibasspContainer"> <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=_HWL-PTe&rd=https%3A%2F%2Fapi-test.scaleout.jp%2Frd%2Fv1%2Fz%2FhKFj2gDAY2hzbT0xNzUsYjkzMzU2N2QvMTA2OTYvU1NQTE9DLzEyODI3LzI3NTMuNzQ5NC4xMjgyNy84Mjg1LzExMjc1LzEwNjk2OlNTUExPQzoqL2N0PTE1MjIyMjY1OTU3ODI7c3I9aHR0cDtkc3BpZD0zMDE7cHI9eU1pV0FySmZ6TmJCU1ZDcm5FSkZBNGQ1O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTAwO2NyeTJkPTAuMDE7aWR4PTA7pXNlcWlk2gAkODZhN2EzNjYtNzI2Yi1mYjFkLTc0Y2QtZmQ3MTA5NzQ2NmVip3NlcXRpbWWtMTUyMjIyNjU5NTc4MqR4dWlkuFZuME5lcXdRQVMwQUFCbC1BTnNBQUFBQQ%2Fp%2Fseqid%3D86a7a366-726b-fb1d-74cd-fd71097466eb%3Bseqctx%3Dgat3by5hZy5mdHlwZaEx%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe> </div> </body> <iframe src="https://api-test.scaleout.jp/aux/sosync?ctsv=localhost&amp;seqid=86a7a366-726b-fb1d-74cd-fd71097466eb&amp;seqtime=1522226595782" width="1" height="1" style="position:absolute;border:none;padding:0;margin:0;"></iframe>'},
+          ],
+          adomain: ['advertiserdomain.com']
+        },
+        native: {
+          ad: '<\!DOCTYPE html>↵  <head>↵    <meta charset="UTF-8">↵    <script src="https://i.socdm.com/sdk/js/adg-script-base.js" type="text/javascript"></script>↵    <script type="text/javascript">↵      adsettings = {↵        locationid  : 58278,↵        rotation    : 0,↵        displaytype : 1,↵        sdktype     : "0",↵        scheduleid  : 512601↵      };↵    </script>↵    <style>↵      body {↵        margin:0;↵        padding:0;↵      }↵    </style>↵  </head>↵  <body>↵    <div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>↵  </body>',
+          beacon: '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          cpm: 36.0008,
+          displaytype: '1',
+          ids: {},
+          location_params: null,
+          locationid: '58279',
+          adomain: ['advertiserdomain.com'],
+          native_ad: {
+            assets: [
+              {
+                data: {
+                  label: 'accompanying_text',
+                  value: 'AD'
+                },
+                id: 501
               },
-              id: 501
-            },
-            {
-              data: {
-                label: 'optout_url',
-                value: 'https://supership.jp/optout/#'
+              {
+                data: {
+                  label: 'optout_url',
+                  value: 'https://supership.jp/optout/#'
+                },
+                id: 502
               },
-              id: 502
-            },
-            {
-              data: {
-                ext: {
-                  black_back: 'https://i.socdm.com/sdk/img/icon_adg_optout_26x26_white.png',
+              {
+                data: {
+                  ext: {
+                    black_back: 'https://i.socdm.com/sdk/img/icon_adg_optout_26x26_white.png',
+                  },
+                  label: 'information_icon_url',
+                  value: 'https://i.socdm.com/sdk/img/icon_adg_optout_26x26_gray.png',
+                  id: 503
+                }
+              },
+              {
+                id: 1,
+                required: 1,
+                title: {text: 'Title'}
+              },
+              {
+                id: 2,
+                img: {
+                  h: 250,
+                  url: 'https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/img/300x250.png',
+                  w: 300
                 },
-                label: 'information_icon_url',
-                value: 'https://i.socdm.com/sdk/img/icon_adg_optout_26x26_gray.png',
-                id: 503
-              }
-            },
-            {
-              id: 1,
-              required: 1,
-              title: {text: 'Title'}
-            },
-            {
-              id: 2,
-              img: {
-                h: 250,
-                url: 'https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/img/300x250.png',
-                w: 300
+                required: 1
               },
-              required: 1
-            },
-            {
-              id: 3,
-              img: {
-                h: 300,
-                url: 'https://placehold.jp/300x300.png',
-                w: 300
+              {
+                id: 3,
+                img: {
+                  h: 300,
+                  url: 'https://placehold.jp/300x300.png',
+                  w: 300
+                },
+                required: 1
               },
-              required: 1
-            },
-            {
-              data: {value: 'Description'},
-              id: 5,
-              required: 0
-            },
-            {
-              data: {value: 'CTA'},
-              id: 6,
-              required: 0
+              {
+                data: {value: 'Description'},
+                id: 5,
+                required: 0
+              },
+              {
+                data: {value: 'CTA'},
+                id: 6,
+                required: 0
+              },
+              {
+                data: {value: 'Sponsored'},
+                id: 4,
+                required: 0
+              }
+            ],
+            imptrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1.gif'],
+            link: {
+              clicktrackers: [
+                'https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1_clicktracker_access.gif'
+              ],
+              url: 'https://supership.jp'
             },
+          },
+          results: [
+            {ad: '<body>Creative<\/body>'}
+          ],
+          rotation: '0',
+          scheduleid: '512603',
+          sdktype: '0',
+          creativeid: '1k2kv35vsa5r',
+          dealid: 'fd5sa5fa7f',
+          ttl: 1000
+        },
+        upperBillboard: {
+          'ad': '<\!DOCTYPE html>\n  <head>\n    <meta charset="UTF-8">\n    <script src="https://i.socdm.com/sdk/js/adg-script-base.js" type="text/javascript"></script>\n    <script type="text/javascript">\n      adsettings = {\n        locationid  : 143038,\n        rotation    : 0,\n        displaytype : 1,\n        sdktype     : "0",\n        scheduleid  : 1233323\n      };\n    </script>\n    <style>\n      body {\n        margin:0;\n        padding:0;\n      }\n    </style>\n  </head>\n  <body>\n    <div id="medibasspContainer">\n      \n    </div>\n  </body>\n<iframe src="https://tg.socdm.com/aux/sosync?ctsv=m-ad240&amp;seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&amp;seqtime=1633327583803" width="1" height="1" style="position:absolute;border:none;padding:0;margin:0;"></iframe>',
+          'beacon': '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0yOTQsNGZiM2NkNWVpZD0xNDMwMzgmcG9zPVNTUExPQyZhZD0xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovaWR4PTA7ZHNwaWQ9MTtkaTI9MjEzNC0xMzI4NjRfbmV3Zm9ybWF0X3Rlc3Q7ZnR5cGU9Mztwcj15TXB3O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTExLjkyO2NyeTJkPTAuMDA4OTM0OTUzNTM4MjQxNjAxMztwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzsmZXg9MTYzMzMyNzU4MyZjdD0xNjMzMzI3NTgzODAzJnNyPWh0dHA-&amp;xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&amp;ctsv=m-ad240&amp;seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&amp;seqtime=1633327583803&amp;seqctx=gat3by5hZy5mdHlwZaEz&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          'beaconurl': 'https://tg.socdm.com/bc/v3?b=Y2hzbT0yOTQsNGZiM2NkNWVpZD0xNDMwMzgmcG9zPVNTUExPQyZhZD0xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovaWR4PTA7ZHNwaWQ9MTtkaTI9MjEzNC0xMzI4NjRfbmV3Zm9ybWF0X3Rlc3Q7ZnR5cGU9Mztwcj15TXB3O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTExLjkyO2NyeTJkPTAuMDA4OTM0OTUzNTM4MjQxNjAxMztwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzsmZXg9MTYzMzMyNzU4MyZjdD0xNjMzMzI3NTgzODAzJnNyPWh0dHA-&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&ctsv=m-ad240&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&seqtime=1633327583803&seqctx=gat3by5hZy5mdHlwZaEz&t=.gif',
+          'cpm': 80,
+          'creative_params': {},
+          'creativeid': 'ScaleOut_2146187',
+          'dealid': '2134-132864_newformat_test',
+          'displaytype': '1',
+          'h': 180,
+          'ids': {
+            'anid': '',
+            'diid': '',
+            'idfa': '',
+            'soc': 'Xm8Q8cCo5r8AAHCCMg0AAAAA'
+          },
+          'location_params': {
+            'option': {
+              'ad_type': 'upper_billboard'
+            }
+          },
+          'locationid': '143038',
+          'results': [
             {
-              data: {value: 'Sponsored'},
-              id: 4,
-              required: 0
+              'ad': '<\!DOCTYPE html>\n  <head>\n    <meta charset="UTF-8">\n    <script src="https://i.socdm.com/sdk/js/adg-script-base.js" type="text/javascript"></script>\n    <script type="text/javascript">\n      adsettings = {\n        locationid  : 143038,\n        rotation    : 0,\n        displaytype : 1,\n        sdktype     : "0",\n        scheduleid  : 1233323\n      };\n    </script>\n    <style>\n      body {\n        margin:0;\n        padding:0;\n      }\n    </style>\n  </head>\n  <body>\n    <div id="medibasspContainer">\n      \n    </div>\n  </body>\n',
+              'beacon': '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0yOTQsNGZiM2NkNWVpZD0xNDMwMzgmcG9zPVNTUExPQyZhZD0xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovaWR4PTA7ZHNwaWQ9MTtkaTI9MjEzNC0xMzI4NjRfbmV3Zm9ybWF0X3Rlc3Q7ZnR5cGU9Mztwcj15TXB3O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTExLjkyO2NyeTJkPTAuMDA4OTM0OTUzNTM4MjQxNjAxMztwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzsmZXg9MTYzMzMyNzU4MyZjdD0xNjMzMzI3NTgzODAzJnNyPWh0dHA-&amp;xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&amp;ctsv=m-ad240&amp;seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&amp;seqtime=1633327583803&amp;seqctx=gat3by5hZy5mdHlwZaEz&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+              'beaconurl': 'https://tg.socdm.com/bc/v3?b=Y2hzbT0yOTQsNGZiM2NkNWVpZD0xNDMwMzgmcG9zPVNTUExPQyZhZD0xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovaWR4PTA7ZHNwaWQ9MTtkaTI9MjEzNC0xMzI4NjRfbmV3Zm9ybWF0X3Rlc3Q7ZnR5cGU9Mztwcj15TXB3O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTExLjkyO2NyeTJkPTAuMDA4OTM0OTUzNTM4MjQxNjAxMztwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzsmZXg9MTYzMzMyNzU4MyZjdD0xNjMzMzI3NTgzODAzJnNyPWh0dHA-&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&ctsv=m-ad240&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&seqtime=1633327583803&seqctx=gat3by5hZy5mdHlwZaEz&t=.gif',
+              'cpm': 80,
+              'creative_params': {},
+              'creativeid': 'ScaleOut_2146187',
+              'dealid': '2134-132864_newformat_test',
+              'h': 180,
+              'landing_url': 'https://supership.jp/',
+              'rparams': {},
+              'scheduleid': '1233323',
+              'trackers': {
+                'imp': [
+                  'https://tg.socdm.com/bc/v3?b=Y2hzbT0yOTQsNGZiM2NkNWVpZD0xNDMwMzgmcG9zPVNTUExPQyZhZD0xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovaWR4PTA7ZHNwaWQ9MTtkaTI9MjEzNC0xMzI4NjRfbmV3Zm9ybWF0X3Rlc3Q7ZnR5cGU9Mztwcj15TXB3O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTExLjkyO2NyeTJkPTAuMDA4OTM0OTUzNTM4MjQxNjAxMztwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzsmZXg9MTYzMzMyNzU4MyZjdD0xNjMzMzI3NTgzODAzJnNyPWh0dHA-&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&ctsv=m-ad240&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&seqtime=1633327583803&seqctx=gat3by5hZy5mdHlwZaEz&t=.gif'
+                ],
+                'viewable_imp': [
+                  'https://tg.socdm.com/aux/inview?creative_id=2166466&ctsv=m-ad240&extra_field=idx%3D0%3Bdspid%3D1%3Bdi2%3D2134-132864_newformat_test%3Bftype%3D3%3Bprb%3D0%3Bpro%3D0%3Bproc%3DJPY%3Bcrd2y%3D111.92%3Bcry2d%3D0.0089349535382416013%3Bsspm%3D0%3Bsom%3D0.2%3Borgm%3D0%3Btechm%3D0%3Bssp_margin%3D0%3Bso_margin%3D0.2%3Borg_margin%3D0%3Btech_margin%3D0%3Bbs%3Dclassic%3B&family_id=1233323&id=143038&loglocation_id=154410&lookupname=143038%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=261061.265799.1233323&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&seqtime=1633327583803&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA'
+                ],
+                'viewable_measured': [
+                  'https://tg.socdm.com/aux/measured?creative_id=2166466&ctsv=m-ad240&extra_field=idx%3D0%3Bdspid%3D1%3Bdi2%3D2134-132864_newformat_test%3Bftype%3D3%3Bprb%3D0%3Bpro%3D0%3Bproc%3DJPY%3Bcrd2y%3D111.92%3Bcry2d%3D0.0089349535382416013%3Bsspm%3D0%3Bsom%3D0.2%3Borgm%3D0%3Btechm%3D0%3Bssp_margin%3D0%3Bso_margin%3D0.2%3Borg_margin%3D0%3Btech_margin%3D0%3Bbs%3Dclassic%3B&family_id=1233323&id=143038&loglocation_id=154410&lookupname=143038%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=261061.265799.1233323&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&seqtime=1633327583803&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA'
+                ]
+              },
+              'ttl': 1000,
+              'vastxml': '<?xml version="1.0" encoding="UTF-8" standalone="no" ?><VAST version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vast.xsd">\n  <Ad id="SOADS_1219110">\n    <InLine>\n      <AdSystem>SOADS</AdSystem>\n      <AdTitle/>\n      <Description/>\n      <Impression><![CDATA[https://tg.socdm.com/adsv/v1?id=10392&posall=RTB&schedule_id=256840.261578.1219110&family_id=1219110&creative_id=2146187&loglocation_id=12869&proto=adgen&wpr=YmRlYmM4ZWI4YzVmNDU2Nw==&ssp_audit=abc&ssplocid=adgen%3A143038&wdl=30&nobc=1&prv2=ig9WkPpYLbCeleBCDAkD6vLXsKEH_gNH2aGvvA&t=pixel&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&ctsv=m-ad240&width=320&height=180&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e&seqtime=1633327583825&ssp_tag_id=143038&bidtime=1633327583&idx=0]]></Impression>\n      <Creatives>\n        <Creative AdID="2146187">\n          <CreativeExtensions>\n            <CreativeExtension on_playing="false" type="pmp">\n              <CtaButtonText>\n                <![CDATA[Supership株式会社]]>\n              </CtaButtonText>\n              <CtaButtonTextExtra>\n                <![CDATA[広告配信後に移動します]]>\n              </CtaButtonTextExtra>\n            </CreativeExtension>\n          </CreativeExtensions>\n\n          <Linear>\n          <Icons>\n            <Icon height="15" program="scaleout" width="18" xPosition="right" yPosition="top">\n              <StaticResource creativeType="image/png"><![CDATA[https://i.socdm.com/s/jiaa/rt_18x15.png]]></StaticResource>\n              <IconClicks>\n                <IconClickThrough><![CDATA[https://supership.jp/optout.html]]></IconClickThrough>\n              </IconClicks>\n            </Icon>\n          </Icons>\n            <Duration>00:00:15</Duration>\n            <TrackingEvents>\n              <Tracking event="start"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=start&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="firstQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=firstQuartile&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="midpoint"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=midpoint&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="thirdQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=thirdQuartile&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="complete"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=complete&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="fullscreen"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=fullscreen&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n            <Tracking event="start"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=start&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="skip"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=skip&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=firstQuartile&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="midpoint"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=midpoint&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=thirdQuartile&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="complete"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=complete&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="fullscreen"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=fullscreen&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking></TrackingEvents>\n            <VideoClicks>\n              <ClickThrough><![CDATA[https://tg.socdm.com/rd/v1/z/haFj2gDAY2hzbT0xNzUsNWE1Y2Y2YzMvMTAzOTIvUlRCLzEyMTkxMTAvMjU2ODQwLjI2MTU3OC4xMjE5MTEwLzIxNDYxODcvMTI4NjkvMTAzOTI6UlRCOiovY3Q9MTYzMzMyNzU4MzgyNTtzcj1odHRwcztwcj16RDRFO3ByYj16RDRFO3Bybz16RDRFO3Byb2M9SlBZO2NyZDJ5PTExMS45MjtjcnkyZD0wLjAwODkzNDk1MzUzODI0MTYwMTM7aWR4PTA7pXByb3RvpWFkZ2VupXNlcWlk2gAkNmNmNTFhZmItNmQyNi0xNDAyLWM5ZTctMGU4NDVlMzQxODNlp3NlcXRpbWWtMTYzMzMyNzU4MzgyNaR4dWlkuFhtOFE4Y0NvNXI4QUFIQ0NNZzBBQUFBQQ/p/ctsv=m-ad240;seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e;/g/B:aHR0cHM6Ly9zdXBlcnNoaXAuanAv]]></ClickThrough>\n            <ClickTracking><![CDATA[https://tg.socdm.com/rd/v1/z/hKFj2gD8Y2hzbT0yMzUsYzRjMmU2MjcvMTQzMDM4L1NTUExPQy8xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovY3Q9MTYzMzMyNzU4MzgwMztzcj1odHRwcztkc3BpZD0xO3ByPXlNcHc7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTEuOTI7Y3J5MmQ9MC4wMDg5MzQ5NTM1MzgyNDE2MDEzO2RpMj0yMTM0LTEzMjg2NF9uZXdmb3JtYXRfdGVzdDtkc3BpZD0xO2Z0eXBlPTM7aWR4PTA7pXNlcWlk2gAkYmUzOGJkYjQtNzRhNy0xNGE3LTM0MzktYjdmMWVhOGI0ZjMzp3NlcXRpbWWtMTYzMzMyNzU4MzgwM6R4dWlkuFhtOFE4Y0NvNXI4QUFIQ0NNZzBBQUFBQQ/p/ctsv=m-ad240;seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33;seqctx=gat3by5hZy5mdHlwZaEz;/g/U:?url=]]></ClickTracking></VideoClicks>\n            <MediaFiles>\n              <MediaFile bitrate="400" delivery="progressive" height="360" type="video/mp4" width="640">https://i.socdm.com/a/2/2095/2091787/20210810043037-de3e74aec30f36.mp4</MediaFile>\n              <MediaFile bitrate="1000" delivery="progressive" height="480" type="video/mp4" width="854">https://i.socdm.com/a/2/2095/2091788/20210810043037-6dd368dc91d507.mp4</MediaFile>\n              <MediaFile bitrate="400" delivery="progressive" height="360" type="video/webm" width="640">https://i.socdm.com/a/2/2095/2091789/20210810043037-c8eb814ddd85c4.webm</MediaFile>\n              <MediaFile bitrate="1000" delivery="progressive" height="480" type="video/webm" width="854">https://i.socdm.com/a/2/2095/2091790/20210810043037-0a7f74c40268ab.webm</MediaFile>\n            </MediaFiles>\n          </Linear>\n        </Creative>\n      </Creatives>\n    </InLine>\n  </Ad>\n</VAST>',
+              'vcpm': 0,
+              'w': 320,
+              'weight': 1
             }
           ],
-          imptrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1.gif'],
-          link: {
-            clicktrackers: [
-              'https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1_clicktracker_access.gif'
+          'rotation': '0',
+          'scheduleid': '1233323',
+          'sdktype': '0',
+          'trackers': {
+            'imp': [
+              'https://tg.socdm.com/bc/v3?b=Y2hzbT0yOTQsNGZiM2NkNWVpZD0xNDMwMzgmcG9zPVNTUExPQyZhZD0xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovaWR4PTA7ZHNwaWQ9MTtkaTI9MjEzNC0xMzI4NjRfbmV3Zm9ybWF0X3Rlc3Q7ZnR5cGU9Mztwcj15TXB3O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTExLjkyO2NyeTJkPTAuMDA4OTM0OTUzNTM4MjQxNjAxMztwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzsmZXg9MTYzMzMyNzU4MyZjdD0xNjMzMzI3NTgzODAzJnNyPWh0dHA-&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&ctsv=m-ad240&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&seqtime=1633327583803&seqctx=gat3by5hZy5mdHlwZaEz&t=.gif'
+            ],
+            'viewable_imp': [
+              'https://tg.socdm.com/aux/inview?creative_id=2166466&ctsv=m-ad240&extra_field=idx%3D0%3Bdspid%3D1%3Bdi2%3D2134-132864_newformat_test%3Bftype%3D3%3Bprb%3D0%3Bpro%3D0%3Bproc%3DJPY%3Bcrd2y%3D111.92%3Bcry2d%3D0.0089349535382416013%3Bsspm%3D0%3Bsom%3D0.2%3Borgm%3D0%3Btechm%3D0%3Bssp_margin%3D0%3Bso_margin%3D0.2%3Borg_margin%3D0%3Btech_margin%3D0%3Bbs%3Dclassic%3B&family_id=1233323&id=143038&loglocation_id=154410&lookupname=143038%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=261061.265799.1233323&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&seqtime=1633327583803&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA'
             ],
-            url: 'https://supership.jp'
+            'viewable_measured': [
+              'https://tg.socdm.com/aux/measured?creative_id=2166466&ctsv=m-ad240&extra_field=idx%3D0%3Bdspid%3D1%3Bdi2%3D2134-132864_newformat_test%3Bftype%3D3%3Bprb%3D0%3Bpro%3D0%3Bproc%3DJPY%3Bcrd2y%3D111.92%3Bcry2d%3D0.0089349535382416013%3Bsspm%3D0%3Bsom%3D0.2%3Borgm%3D0%3Btechm%3D0%3Bssp_margin%3D0%3Bso_margin%3D0.2%3Borg_margin%3D0%3Btech_margin%3D0%3Bbs%3Dclassic%3B&family_id=1233323&id=143038&loglocation_id=154410&lookupname=143038%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=261061.265799.1233323&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&seqtime=1633327583803&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA'
+            ]
           },
+          'ttl': 1000,
+          'vastxml': '<?xml version="1.0" encoding="UTF-8" standalone="no" ?><VAST version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vast.xsd">\n  <Ad id="SOADS_1219110">\n    <InLine>\n      <AdSystem>SOADS</AdSystem>\n      <AdTitle/>\n      <Description/>\n      <Impression><![CDATA[https://tg.socdm.com/adsv/v1?id=10392&posall=RTB&schedule_id=256840.261578.1219110&family_id=1219110&creative_id=2146187&loglocation_id=12869&proto=adgen&wpr=YmRlYmM4ZWI4YzVmNDU2Nw==&ssp_audit=abc&ssplocid=adgen%3A143038&wdl=30&nobc=1&prv2=ig9WkPpYLbCeleBCDAkD6vLXsKEH_gNH2aGvvA&t=pixel&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&ctsv=m-ad240&width=320&height=180&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e&seqtime=1633327583825&ssp_tag_id=143038&bidtime=1633327583&idx=0]]></Impression>\n      <Creatives>\n        <Creative AdID="2146187">\n          <CreativeExtensions>\n            <CreativeExtension on_playing="false" type="pmp">\n              <CtaButtonText>\n                <![CDATA[Supership株式会社]]>\n              </CtaButtonText>\n              <CtaButtonTextExtra>\n                <![CDATA[広告配信後に移動します]]>\n              </CtaButtonTextExtra>\n            </CreativeExtension>\n          </CreativeExtensions>\n\n          <Linear>\n          <Icons>\n            <Icon height="15" program="scaleout" width="18" xPosition="right" yPosition="top">\n              <StaticResource creativeType="image/png"><![CDATA[https://i.socdm.com/s/jiaa/rt_18x15.png]]></StaticResource>\n              <IconClicks>\n                <IconClickThrough><![CDATA[https://supership.jp/optout.html]]></IconClickThrough>\n              </IconClicks>\n            </Icon>\n          </Icons>\n            <Duration>00:00:15</Duration>\n            <TrackingEvents>\n              <Tracking event="start"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=start&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="firstQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=firstQuartile&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="midpoint"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=midpoint&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="thirdQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=thirdQuartile&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="complete"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=complete&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n              <Tracking event="fullscreen"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=fullscreen&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>\n            <Tracking event="start"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=start&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="skip"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=skip&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=firstQuartile&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="midpoint"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=midpoint&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=thirdQuartile&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="complete"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=complete&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="fullscreen"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=fullscreen&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking></TrackingEvents>\n            <VideoClicks>\n              <ClickThrough><![CDATA[https://tg.socdm.com/rd/v1/z/haFj2gDAY2hzbT0xNzUsNWE1Y2Y2YzMvMTAzOTIvUlRCLzEyMTkxMTAvMjU2ODQwLjI2MTU3OC4xMjE5MTEwLzIxNDYxODcvMTI4NjkvMTAzOTI6UlRCOiovY3Q9MTYzMzMyNzU4MzgyNTtzcj1odHRwcztwcj16RDRFO3ByYj16RDRFO3Bybz16RDRFO3Byb2M9SlBZO2NyZDJ5PTExMS45MjtjcnkyZD0wLjAwODkzNDk1MzUzODI0MTYwMTM7aWR4PTA7pXByb3RvpWFkZ2VupXNlcWlk2gAkNmNmNTFhZmItNmQyNi0xNDAyLWM5ZTctMGU4NDVlMzQxODNlp3NlcXRpbWWtMTYzMzMyNzU4MzgyNaR4dWlkuFhtOFE4Y0NvNXI4QUFIQ0NNZzBBQUFBQQ/p/ctsv=m-ad240;seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e;/g/B:aHR0cHM6Ly9zdXBlcnNoaXAuanAv]]></ClickThrough>\n            <ClickTracking><![CDATA[https://tg.socdm.com/rd/v1/z/hKFj2gD8Y2hzbT0yMzUsYzRjMmU2MjcvMTQzMDM4L1NTUExPQy8xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovY3Q9MTYzMzMyNzU4MzgwMztzcj1odHRwcztkc3BpZD0xO3ByPXlNcHc7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTEuOTI7Y3J5MmQ9MC4wMDg5MzQ5NTM1MzgyNDE2MDEzO2RpMj0yMTM0LTEzMjg2NF9uZXdmb3JtYXRfdGVzdDtkc3BpZD0xO2Z0eXBlPTM7aWR4PTA7pXNlcWlk2gAkYmUzOGJkYjQtNzRhNy0xNGE3LTM0MzktYjdmMWVhOGI0ZjMzp3NlcXRpbWWtMTYzMzMyNzU4MzgwM6R4dWlkuFhtOFE4Y0NvNXI4QUFIQ0NNZzBBQUFBQQ/p/ctsv=m-ad240;seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33;seqctx=gat3by5hZy5mdHlwZaEz;/g/U:?url=]]></ClickTracking></VideoClicks>\n            <MediaFiles>\n              <MediaFile bitrate="400" delivery="progressive" height="360" type="video/mp4" width="640">https://i.socdm.com/a/2/2095/2091787/20210810043037-de3e74aec30f36.mp4</MediaFile>\n              <MediaFile bitrate="1000" delivery="progressive" height="480" type="video/mp4" width="854">https://i.socdm.com/a/2/2095/2091788/20210810043037-6dd368dc91d507.mp4</MediaFile>\n              <MediaFile bitrate="400" delivery="progressive" height="360" type="video/webm" width="640">https://i.socdm.com/a/2/2095/2091789/20210810043037-c8eb814ddd85c4.webm</MediaFile>\n              <MediaFile bitrate="1000" delivery="progressive" height="480" type="video/webm" width="854">https://i.socdm.com/a/2/2095/2091790/20210810043037-0a7f74c40268ab.webm</MediaFile>\n            </MediaFiles>\n          </Linear>\n        </Creative>\n      </Creatives>\n    </InLine>\n  </Ad>\n</VAST>',
+          'vcpm': 0,
+          'w': 320,
+        }
+      },
+      emptyAdomain: {
+        banner: {
+          ad: '<div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>',
+          beacon: '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          cpm: 36.0008,
+          displaytype: '1',
+          ids: {},
+          w: 320,
+          h: 100,
+          location_params: null,
+          locationid: '58279',
+          rotation: '0',
+          scheduleid: '512603',
+          sdktype: '0',
+          creativeid: '1k2kv35vsa5r',
+          dealid: 'fd5sa5fa7f',
+          ttl: 1000,
+          results: [
+            {ad: '<\!DOCTYPE html> <head> <meta charset="UTF-8"> <script src="https://bigman-test.scaleout.jp/sdk/js/adg-script-base.js" type="text/javascript"></script> <script type="text/javascript">adsettings = {locationid  : 10696,rotation    : 0,displaytype : 1,sdktype     : "0",scheduleid  : 12827}; </script> <style>body {margin:0;padding:0;} </style> </head> <body> <div id="medibasspContainer"> <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=_HWL-PTe&rd=https%3A%2F%2Fapi-test.scaleout.jp%2Frd%2Fv1%2Fz%2FhKFj2gDAY2hzbT0xNzUsYjkzMzU2N2QvMTA2OTYvU1NQTE9DLzEyODI3LzI3NTMuNzQ5NC4xMjgyNy84Mjg1LzExMjc1LzEwNjk2OlNTUExPQzoqL2N0PTE1MjIyMjY1OTU3ODI7c3I9aHR0cDtkc3BpZD0zMDE7cHI9eU1pV0FySmZ6TmJCU1ZDcm5FSkZBNGQ1O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTAwO2NyeTJkPTAuMDE7aWR4PTA7pXNlcWlk2gAkODZhN2EzNjYtNzI2Yi1mYjFkLTc0Y2QtZmQ3MTA5NzQ2NmVip3NlcXRpbWWtMTUyMjIyNjU5NTc4MqR4dWlkuFZuME5lcXdRQVMwQUFCbC1BTnNBQUFBQQ%2Fp%2Fseqid%3D86a7a366-726b-fb1d-74cd-fd71097466eb%3Bseqctx%3Dgat3by5hZy5mdHlwZaEx%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe> </div> </body> <iframe src="https://api-test.scaleout.jp/aux/sosync?ctsv=localhost&amp;seqid=86a7a366-726b-fb1d-74cd-fd71097466eb&amp;seqtime=1522226595782" width="1" height="1" style="position:absolute;border:none;padding:0;margin:0;"></iframe>'},
+          ],
+          adomain: []
         },
-        results: [
-          {ad: '<body>Creative<\/body>'}
-        ],
-        rotation: '0',
-        scheduleid: '512603',
-        sdktype: '0',
-        creativeid: '1k2kv35vsa5r',
-        dealid: 'fd5sa5fa7f',
-        ttl: 1000
+        native: {
+          ad: '<\!DOCTYPE html>↵  <head>↵    <meta charset="UTF-8">↵    <script src="https://i.socdm.com/sdk/js/adg-script-base.js" type="text/javascript"></script>↵    <script type="text/javascript">↵      adsettings = {↵        locationid  : 58278,↵        rotation    : 0,↵        displaytype : 1,↵        sdktype     : "0",↵        scheduleid  : 512601↵      };↵    </script>↵    <style>↵      body {↵        margin:0;↵        padding:0;↵      }↵    </style>↵  </head>↵  <body>↵    <div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>↵  </body>',
+          beacon: '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          cpm: 36.0008,
+          displaytype: '1',
+          ids: {},
+          location_params: null,
+          locationid: '58279',
+          adomain: [],
+          native_ad: {
+            assets: [
+              {
+                data: {
+                  label: 'accompanying_text',
+                  value: 'AD'
+                },
+                id: 501
+              },
+              {
+                data: {
+                  label: 'optout_url',
+                  value: 'https://supership.jp/optout/#'
+                },
+                id: 502
+              },
+              {
+                data: {
+                  ext: {
+                    black_back: 'https://i.socdm.com/sdk/img/icon_adg_optout_26x26_white.png',
+                  },
+                  label: 'information_icon_url',
+                  value: 'https://i.socdm.com/sdk/img/icon_adg_optout_26x26_gray.png',
+                  id: 503
+                }
+              },
+              {
+                id: 1,
+                required: 1,
+                title: {text: 'Title'}
+              },
+              {
+                id: 2,
+                img: {
+                  h: 250,
+                  url: 'https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/img/300x250.png',
+                  w: 300
+                },
+                required: 1
+              },
+              {
+                id: 3,
+                img: {
+                  h: 300,
+                  url: 'https://placehold.jp/300x300.png',
+                  w: 300
+                },
+                required: 1
+              },
+              {
+                data: {value: 'Description'},
+                id: 5,
+                required: 0
+              },
+              {
+                data: {value: 'CTA'},
+                id: 6,
+                required: 0
+              },
+              {
+                data: {value: 'Sponsored'},
+                id: 4,
+                required: 0
+              }
+            ],
+            imptrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1.gif'],
+            link: {
+              clicktrackers: [
+                'https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1_clicktracker_access.gif'
+              ],
+              url: 'https://supership.jp'
+            },
+          },
+          results: [
+            {ad: '<body>Creative<\/body>'}
+          ],
+          rotation: '0',
+          scheduleid: '512603',
+          sdktype: '0',
+          creativeid: '1k2kv35vsa5r',
+          dealid: 'fd5sa5fa7f',
+          ttl: 1000
+        }
+      },
+      noAdomain: {
+        banner: {
+          ad: '<div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>',
+          beacon: '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          cpm: 36.0008,
+          displaytype: '1',
+          ids: {},
+          w: 320,
+          h: 100,
+          location_params: null,
+          locationid: '58279',
+          rotation: '0',
+          scheduleid: '512603',
+          sdktype: '0',
+          creativeid: '1k2kv35vsa5r',
+          dealid: 'fd5sa5fa7f',
+          ttl: 1000,
+          results: [
+            {ad: '<\!DOCTYPE html> <head> <meta charset="UTF-8"> <script src="https://bigman-test.scaleout.jp/sdk/js/adg-script-base.js" type="text/javascript"></script> <script type="text/javascript">adsettings = {locationid  : 10696,rotation    : 0,displaytype : 1,sdktype     : "0",scheduleid  : 12827}; </script> <style>body {margin:0;padding:0;} </style> </head> <body> <div id="medibasspContainer"> <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=_HWL-PTe&rd=https%3A%2F%2Fapi-test.scaleout.jp%2Frd%2Fv1%2Fz%2FhKFj2gDAY2hzbT0xNzUsYjkzMzU2N2QvMTA2OTYvU1NQTE9DLzEyODI3LzI3NTMuNzQ5NC4xMjgyNy84Mjg1LzExMjc1LzEwNjk2OlNTUExPQzoqL2N0PTE1MjIyMjY1OTU3ODI7c3I9aHR0cDtkc3BpZD0zMDE7cHI9eU1pV0FySmZ6TmJCU1ZDcm5FSkZBNGQ1O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTAwO2NyeTJkPTAuMDE7aWR4PTA7pXNlcWlk2gAkODZhN2EzNjYtNzI2Yi1mYjFkLTc0Y2QtZmQ3MTA5NzQ2NmVip3NlcXRpbWWtMTUyMjIyNjU5NTc4MqR4dWlkuFZuME5lcXdRQVMwQUFCbC1BTnNBQUFBQQ%2Fp%2Fseqid%3D86a7a366-726b-fb1d-74cd-fd71097466eb%3Bseqctx%3Dgat3by5hZy5mdHlwZaEx%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe> </div> </body> <iframe src="https://api-test.scaleout.jp/aux/sosync?ctsv=localhost&amp;seqid=86a7a366-726b-fb1d-74cd-fd71097466eb&amp;seqtime=1522226595782" width="1" height="1" style="position:absolute;border:none;padding:0;margin:0;"></iframe>'},
+          ],
+        },
+        native: {
+          ad: '<\!DOCTYPE html>↵  <head>↵    <meta charset="UTF-8">↵    <script src="https://i.socdm.com/sdk/js/adg-script-base.js" type="text/javascript"></script>↵    <script type="text/javascript">↵      adsettings = {↵        locationid  : 58278,↵        rotation    : 0,↵        displaytype : 1,↵        sdktype     : "0",↵        scheduleid  : 512601↵      };↵    </script>↵    <style>↵      body {↵        margin:0;↵        padding:0;↵      }↵    </style>↵  </head>↵  <body>↵    <div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>↵  </body>',
+          beacon: '<img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          cpm: 36.0008,
+          displaytype: '1',
+          ids: {},
+          location_params: null,
+          locationid: '58279',
+          native_ad: {
+            assets: [
+              {
+                data: {
+                  label: 'accompanying_text',
+                  value: 'AD'
+                },
+                id: 501
+              },
+              {
+                data: {
+                  label: 'optout_url',
+                  value: 'https://supership.jp/optout/#'
+                },
+                id: 502
+              },
+              {
+                data: {
+                  ext: {
+                    black_back: 'https://i.socdm.com/sdk/img/icon_adg_optout_26x26_white.png',
+                  },
+                  label: 'information_icon_url',
+                  value: 'https://i.socdm.com/sdk/img/icon_adg_optout_26x26_gray.png',
+                  id: 503
+                }
+              },
+              {
+                id: 1,
+                required: 1,
+                title: {text: 'Title'}
+              },
+              {
+                id: 2,
+                img: {
+                  h: 250,
+                  url: 'https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/img/300x250.png',
+                  w: 300
+                },
+                required: 1
+              },
+              {
+                id: 3,
+                img: {
+                  h: 300,
+                  url: 'https://placehold.jp/300x300.png',
+                  w: 300
+                },
+                required: 1
+              },
+              {
+                data: {value: 'Description'},
+                id: 5,
+                required: 0
+              },
+              {
+                data: {value: 'CTA'},
+                id: 6,
+                required: 0
+              },
+              {
+                data: {value: 'Sponsored'},
+                id: 4,
+                required: 0
+              }
+            ],
+            imptrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1.gif'],
+            link: {
+              clicktrackers: [
+                'https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1_clicktracker_access.gif'
+              ],
+              url: 'https://supership.jp'
+            },
+          },
+          results: [
+            {ad: '<body>Creative<\/body>'}
+          ],
+          rotation: '0',
+          scheduleid: '512603',
+          sdktype: '0',
+          creativeid: '1k2kv35vsa5r',
+          dealid: 'fd5sa5fa7f',
+          ttl: 1000
+        }
       }
     };
 
     const bidResponses = {
-      banner: {
-        requestId: '2f6ac468a9c15e',
-        cpm: 36.0008,
-        width: 320,
-        height: 100,
-        creativeId: '1k2kv35vsa5r',
-        dealId: 'fd5sa5fa7f',
-        currency: 'JPY',
-        netRevenue: true,
-        ttl: 1000,
-        ad: '<div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>',
-      },
-      native: {
-        requestId: '2f6ac468a9c15e',
-        cpm: 36.0008,
-        width: 1,
-        height: 1,
-        creativeId: '1k2kv35vsa5r',
-        dealId: 'fd5sa5fa7f',
-        currency: 'JPY',
-        netRevenue: true,
-        ttl: 1000,
-        ad: '↵    <div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>↵  <img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+      normal: {
+        banner: {
+          requestId: '2f6ac468a9c15e',
+          cpm: 36.0008,
+          width: 320,
+          height: 100,
+          creativeId: '1k2kv35vsa5r',
+          dealId: 'fd5sa5fa7f',
+          currency: 'JPY',
+          netRevenue: true,
+          ttl: 1000,
+          ad: '<div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>',
+          adomain: ['advertiserdomain.com']
+        },
         native: {
-          title: 'Title',
-          image: {
-            url: 'https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/img/300x250.png',
-            height: 250,
-            width: 300
+          requestId: '2f6ac468a9c15e',
+          cpm: 36.0008,
+          width: 1,
+          height: 1,
+          creativeId: '1k2kv35vsa5r',
+          dealId: 'fd5sa5fa7f',
+          currency: 'JPY',
+          netRevenue: true,
+          ttl: 1000,
+          adomain: ['advertiserdomain.com'],
+          ad: '↵    <div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>↵  <img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          native: {
+            title: 'Title',
+            image: {
+              url: 'https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/img/300x250.png',
+              height: 250,
+              width: 300
+            },
+            icon: {
+              url: 'https://placehold.jp/300x300.png',
+              height: 300,
+              width: 300
+            },
+            sponsoredBy: 'Sponsored',
+            body: 'Description',
+            cta: 'CTA',
+            privacyLink: 'https://supership.jp/optout/#',
+            clickUrl: 'https://supership.jp',
+            clickTrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1_clicktracker_access.gif'],
+            impressionTrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1.gif']
           },
-          icon: {
-            url: 'https://placehold.jp/300x300.png',
-            height: 300,
-            width: 300
+          mediaType: NATIVE
+        },
+        upperBillboard: {
+          requestId: '2f6ac468a9c15e',
+          cpm: 80,
+          width: 320,
+          height: 180,
+          creativeId: 'ScaleOut_2146187',
+          dealId: '2134-132864_newformat_test',
+          currency: 'JPY',
+          netRevenue: true,
+          ttl: 1000,
+          ad: `<script type="text/javascript" src="https://i.socdm.com/sdk/js/adg-browser-m.js"></script><script type="text/javascript">window.ADGBrowserM.init({vastXml: '<?xml version="1.0" encoding="UTF-8" standalone="no" ?><VAST version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vast.xsd">  <Ad id="SOADS_1219110">    <InLine>      <AdSystem>SOADS</AdSystem>      <AdTitle/>      <Description/>      <Impression><![CDATA[https://tg.socdm.com/adsv/v1?id=10392&posall=RTB&schedule_id=256840.261578.1219110&family_id=1219110&creative_id=2146187&loglocation_id=12869&proto=adgen&wpr=YmRlYmM4ZWI4YzVmNDU2Nw==&ssp_audit=abc&ssplocid=adgen%3A143038&wdl=30&nobc=1&prv2=ig9WkPpYLbCeleBCDAkD6vLXsKEH_gNH2aGvvA&t=pixel&xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&ctsv=m-ad240&width=320&height=180&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e&seqtime=1633327583825&ssp_tag_id=143038&bidtime=1633327583&idx=0]]></Impression>      <Creatives>        <Creative AdID="2146187">          <CreativeExtensions>            <CreativeExtension on_playing="false" type="pmp">              <CtaButtonText>                <![CDATA[Supership株式会社]]>              </CtaButtonText>              <CtaButtonTextExtra>                <![CDATA[広告配信後に移動します]]>              </CtaButtonTextExtra>            </CreativeExtension>          </CreativeExtensions>          <Linear>          <Icons>            <Icon height="15" program="scaleout" width="18" xPosition="right" yPosition="top">              <StaticResource creativeType="image/png"><![CDATA[https://i.socdm.com/s/jiaa/rt_18x15.png]]></StaticResource>              <IconClicks>                <IconClickThrough><![CDATA[https://supership.jp/optout.html]]></IconClickThrough>              </IconClicks>            </Icon>          </Icons>            <Duration>00:00:15</Duration>            <TrackingEvents>              <Tracking event="start"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=start&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>              <Tracking event="firstQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=firstQuartile&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>              <Tracking event="midpoint"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=midpoint&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>              <Tracking event="thirdQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=thirdQuartile&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>              <Tracking event="complete"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=complete&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>              <Tracking event="fullscreen"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=10392&schedule_id=256840.261578.1219110&wo_schedule_id=1219110&creative_id=2146187&event=fullscreen&loglocation_id=12869&order_id=256840&lookupname=10392:RTB:*&family_id=1219110&delivery_unit_id=261578&position=RTB&multiad_index=0&seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e]]></Tracking>            <Tracking event="start"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=start&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="skip"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=skip&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=firstQuartile&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="midpoint"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=midpoint&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=thirdQuartile&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="complete"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=complete&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking><Tracking event="fullscreen"><![CDATA[https://tg.socdm.com/aux/vast_event?page_id=143038&schedule_id=261061.265799.1233323&wo_schedule_id=1233323&creative_id=2166466&event=fullscreen&loglocation_id=154410&order_id=261061&lookupname=143038:SSPLOC:*&family_id=1233323&delivery_unit_id=265799&position=SSPLOC&multiad_index=0&seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&dspid=1&di2=2134-132864_newformat_test&ftype=3]]></Tracking></TrackingEvents>            <VideoClicks>              <ClickThrough><![CDATA[https://tg.socdm.com/rd/v1/z/haFj2gDAY2hzbT0xNzUsNWE1Y2Y2YzMvMTAzOTIvUlRCLzEyMTkxMTAvMjU2ODQwLjI2MTU3OC4xMjE5MTEwLzIxNDYxODcvMTI4NjkvMTAzOTI6UlRCOiovY3Q9MTYzMzMyNzU4MzgyNTtzcj1odHRwcztwcj16RDRFO3ByYj16RDRFO3Bybz16RDRFO3Byb2M9SlBZO2NyZDJ5PTExMS45MjtjcnkyZD0wLjAwODkzNDk1MzUzODI0MTYwMTM7aWR4PTA7pXByb3RvpWFkZ2VupXNlcWlk2gAkNmNmNTFhZmItNmQyNi0xNDAyLWM5ZTctMGU4NDVlMzQxODNlp3NlcXRpbWWtMTYzMzMyNzU4MzgyNaR4dWlkuFhtOFE4Y0NvNXI4QUFIQ0NNZzBBQUFBQQ/p/ctsv=m-ad240;seqid=6cf51afb-6d26-1402-c9e7-0e845e34183e;/g/B:aHR0cHM6Ly9zdXBlcnNoaXAuanAv]]></ClickThrough>            <ClickTracking><![CDATA[https://tg.socdm.com/rd/v1/z/hKFj2gD8Y2hzbT0yMzUsYzRjMmU2MjcvMTQzMDM4L1NTUExPQy8xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovY3Q9MTYzMzMyNzU4MzgwMztzcj1odHRwcztkc3BpZD0xO3ByPXlNcHc7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTEuOTI7Y3J5MmQ9MC4wMDg5MzQ5NTM1MzgyNDE2MDEzO2RpMj0yMTM0LTEzMjg2NF9uZXdmb3JtYXRfdGVzdDtkc3BpZD0xO2Z0eXBlPTM7aWR4PTA7pXNlcWlk2gAkYmUzOGJkYjQtNzRhNy0xNGE3LTM0MzktYjdmMWVhOGI0ZjMzp3NlcXRpbWWtMTYzMzMyNzU4MzgwM6R4dWlkuFhtOFE4Y0NvNXI4QUFIQ0NNZzBBQUFBQQ/p/ctsv=m-ad240;seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33;seqctx=gat3by5hZy5mdHlwZaEz;/g/U:?url=]]></ClickTracking></VideoClicks>            <MediaFiles>              <MediaFile bitrate="400" delivery="progressive" height="360" type="video/mp4" width="640">https://i.socdm.com/a/2/2095/2091787/20210810043037-de3e74aec30f36.mp4</MediaFile>              <MediaFile bitrate="1000" delivery="progressive" height="480" type="video/mp4" width="854">https://i.socdm.com/a/2/2095/2091788/20210810043037-6dd368dc91d507.mp4</MediaFile>              <MediaFile bitrate="400" delivery="progressive" height="360" type="video/webm" width="640">https://i.socdm.com/a/2/2095/2091789/20210810043037-c8eb814ddd85c4.webm</MediaFile>              <MediaFile bitrate="1000" delivery="progressive" height="480" type="video/webm" width="854">https://i.socdm.com/a/2/2095/2091790/20210810043037-0a7f74c40268ab.webm</MediaFile>            </MediaFiles>          </Linear>        </Creative>      </Creatives>    </InLine>  </Ad></VAST>', marginTop: '50'});</script><img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0yOTQsNGZiM2NkNWVpZD0xNDMwMzgmcG9zPVNTUExPQyZhZD0xMjMzMzIzLzI2MTA2MS4yNjU3OTkuMTIzMzMyMy8yMTY2NDY2LzE1NDQxMC8xNDMwMzg6U1NQTE9DOiovaWR4PTA7ZHNwaWQ9MTtkaTI9MjEzNC0xMzI4NjRfbmV3Zm9ybWF0X3Rlc3Q7ZnR5cGU9Mztwcj15TXB3O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTExLjkyO2NyeTJkPTAuMDA4OTM0OTUzNTM4MjQxNjAxMztwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzsmZXg9MTYzMzMyNzU4MyZjdD0xNjMzMzI3NTgzODAzJnNyPWh0dHA-&amp;xuid=Xm8Q8cCo5r8AAHCCMg0AAAAA&amp;ctsv=m-ad240&amp;seqid=be38bdb4-74a7-14a7-3439-b7f1ea8b4f33&amp;seqtime=1633327583803&amp;seqctx=gat3by5hZy5mdHlwZaEz&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>`,
+          adomain: ['advertiserdomain.com']
+        },
+      },
+      emptyAdomain: {
+        banner: {
+          requestId: '2f6ac468a9c15e',
+          cpm: 36.0008,
+          width: 320,
+          height: 100,
+          creativeId: '1k2kv35vsa5r',
+          dealId: 'fd5sa5fa7f',
+          currency: 'JPY',
+          netRevenue: true,
+          ttl: 1000,
+          ad: '<div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>',
+          adomain: []
+        },
+        native: {
+          requestId: '2f6ac468a9c15e',
+          cpm: 36.0008,
+          width: 1,
+          height: 1,
+          creativeId: '1k2kv35vsa5r',
+          dealId: 'fd5sa5fa7f',
+          currency: 'JPY',
+          netRevenue: true,
+          ttl: 1000,
+          adomain: [],
+          ad: '↵    <div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>↵  <img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          native: {
+            title: 'Title',
+            image: {
+              url: 'https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/img/300x250.png',
+              height: 250,
+              width: 300
+            },
+            icon: {
+              url: 'https://placehold.jp/300x300.png',
+              height: 300,
+              width: 300
+            },
+            sponsoredBy: 'Sponsored',
+            body: 'Description',
+            cta: 'CTA',
+            privacyLink: 'https://supership.jp/optout/#',
+            clickUrl: 'https://supership.jp',
+            clickTrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1_clicktracker_access.gif'],
+            impressionTrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1.gif']
           },
-          sponsoredBy: 'Sponsored',
-          body: 'Description',
-          cta: 'CTA',
-          privacyLink: 'https://supership.jp/optout/#',
-          clickUrl: 'https://supership.jp',
-          clickTrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1_clicktracker_access.gif'],
-          impressionTrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1.gif']
+          mediaType: NATIVE
         },
-        mediaType: NATIVE
-      }
+      },
+      noAdomain: {
+        banner: {
+          requestId: '2f6ac468a9c15e',
+          cpm: 36.0008,
+          width: 320,
+          height: 100,
+          creativeId: '1k2kv35vsa5r',
+          dealId: 'fd5sa5fa7f',
+          currency: 'JPY',
+          netRevenue: true,
+          ttl: 1000,
+          ad: '<div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>',
+        },
+        native: {
+          requestId: '2f6ac468a9c15e',
+          cpm: 36.0008,
+          width: 1,
+          height: 1,
+          creativeId: '1k2kv35vsa5r',
+          dealId: 'fd5sa5fa7f',
+          currency: 'JPY',
+          netRevenue: true,
+          ttl: 1000,
+          ad: '↵    <div id="medibasspContainer">↵      <iframe src="https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/300x250.html?prc=-WjRm3cb&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDZY2hzbT0yMDAsN2NhNTY1NjQvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTE1MDM4NTQ3NjQyO3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16ZmkzaWYxV3h5VDJrVk90OXpmMWIzMHE7cHJiPXlRO3Bybz15UTtwcm9jPUpQWTtjcmQyeT0xMTM7Y3J5MmQ9MC4wMDg4NDk1NTc1MjIxMjM4OTAyO2lkeD0wO6VzZXFpZNoAJDgyZDcxYzA3LTg5ZjItM2E1ZC1kYmVmLTFjNjhiMDZkOTBmZKdzZXF0aW1lrTE1MTUwMzg1NDc2NDKkeHVpZLhXamg1c2NDbzRWSUFBR1hRelRrQUFBQUE%2Fp%2Fseqid%3D82d71c07-89f2-3a5d-dbef-1c68b06d90fd%3B%2Fg%2FU%3A%3Furl%3D" style="border: 0px;" width="300" height="250" frameborder="0" scrolling="no"></iframe>↵    </div>↵  <img src="https://tg.socdm.com/bc/v3?b=Y2hzbT0zNTQsMjZhOGQ2NTRpZD01ODI3OSZwb3M9U1NQTE9DJmFkPTUxMjYwMy83MjExNi43Njg1Ni41MTI2MDMvMTA5MzkyNy82NDkyMC81ODI3OTpTU1BMT0M6Ki9pZHg9MDtkc3BpZD0zMDE7cHI9emZpM2lmMVd4eVQya1ZPdDl6ZjFiMzBxO3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTEyLjA1O2NyeTJkPTAuMDA4OTI0NTg3MjM3ODQwMjUwNDtwcnY9aWp6QVZtWW9wbmJUV1B0cWhtZEN1ZWRXNDd0MjU1MEtmYjFWYmI3SzthY2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNSU3RDthc2Q9JTdCJTIybWFyZ2luX2lkJTIyJTNBNTIlMkMlMjJtYXJnaW4lMjIlM0FmYWxzZSU3RDsmZXg9MTUxNDE4NzQ4NiZjdD0xNTE0MTg3NDg2Mzc4JnNyPWh0dHA-&amp;xuid=Wjh5scCo4VIAAGXQzTkAAAAA&amp;ctsv=a-ad84&amp;seqid=ca7d6a2d-7cf1-6c6a-f4bd-a19b168ba94b&amp;seqtime=1514187486378&amp;t=.gif" width="1" height="1" style="display:none;border:none;padding:0;margin:0;width:1px;height:1px"/>',
+          native: {
+            title: 'Title',
+            image: {
+              url: 'https://sdk-temp.s3-ap-northeast-1.amazonaws.com/adg-sample-ad/img/300x250.png',
+              height: 250,
+              width: 300
+            },
+            icon: {
+              url: 'https://placehold.jp/300x300.png',
+              height: 300,
+              width: 300
+            },
+            sponsoredBy: 'Sponsored',
+            body: 'Description',
+            cta: 'CTA',
+            privacyLink: 'https://supership.jp/optout/#',
+            clickUrl: 'https://supership.jp',
+            clickTrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1_clicktracker_access.gif'],
+            impressionTrackers: ['https://adg-dummy-dsp.s3-ap-northeast-1.amazonaws.com/1x1.gif']
+          },
+          mediaType: NATIVE
+        }
+      },
     };
 
     it('no bid responses', function () {
@@ -364,44 +875,110 @@ describe('AdgenerationAdapter', function () {
       expect(result.length).to.equal(0);
     });
 
-    it('handles banner responses', function () {
-      const result = spec.interpretResponse({body: serverResponse.banner}, bidRequests.banner)[0];
-      expect(result.requestId).to.equal(bidResponses.banner.requestId);
-      expect(result.width).to.equal(bidResponses.banner.width);
-      expect(result.height).to.equal(bidResponses.banner.height);
-      expect(result.creativeId).to.equal(bidResponses.banner.creativeId);
-      expect(result.dealId).to.equal(bidResponses.banner.dealId);
-      expect(result.currency).to.equal(bidResponses.banner.currency);
-      expect(result.netRevenue).to.equal(bidResponses.banner.netRevenue);
-      expect(result.ttl).to.equal(bidResponses.banner.ttl);
-      expect(result.ad).to.equal(bidResponses.banner.ad);
+    it('handles ADGBrowserM responses', function () {
+      config.setConfig({
+        currency: {
+          adServerCurrency: 'JPY'
+        }
+      });
+      const result = spec.interpretResponse({body: serverResponse.normal.upperBillboard}, bidRequests.upperBillboard)[0];
+      expect(result.requestId).to.equal(bidResponses.normal.upperBillboard.requestId);
+      expect(result.width).to.equal(bidResponses.normal.upperBillboard.width);
+      expect(result.height).to.equal(bidResponses.normal.upperBillboard.height);
+      expect(result.creativeId).to.equal(bidResponses.normal.upperBillboard.creativeId);
+      expect(result.dealId).to.equal(bidResponses.normal.upperBillboard.dealId);
+      expect(result.currency).to.equal(bidResponses.normal.upperBillboard.currency);
+      expect(result.netRevenue).to.equal(bidResponses.normal.upperBillboard.netRevenue);
+      expect(result.ttl).to.equal(bidResponses.normal.upperBillboard.ttl);
+      expect(result.ad).to.equal(bidResponses.normal.upperBillboard.ad);
+    });
+
+    it('handles banner responses for empty adomain', function () {
+      const result = spec.interpretResponse({body: serverResponse.emptyAdomain.banner}, bidRequests.banner)[0];
+      expect(result.requestId).to.equal(bidResponses.emptyAdomain.banner.requestId);
+      expect(result.width).to.equal(bidResponses.emptyAdomain.banner.width);
+      expect(result.height).to.equal(bidResponses.emptyAdomain.banner.height);
+      expect(result.creativeId).to.equal(bidResponses.emptyAdomain.banner.creativeId);
+      expect(result.dealId).to.equal(bidResponses.emptyAdomain.banner.dealId);
+      expect(result.currency).to.equal(bidResponses.emptyAdomain.banner.currency);
+      expect(result.netRevenue).to.equal(bidResponses.emptyAdomain.banner.netRevenue);
+      expect(result.ttl).to.equal(bidResponses.emptyAdomain.banner.ttl);
+      expect(result.ad).to.equal(bidResponses.emptyAdomain.banner.ad);
+      expect(result).to.not.have.any.keys('meta');
+      expect(result).to.not.have.any.keys('advertiserDomains');
+    });
+
+    it('handles native responses for empty adomain', function () {
+      const result = spec.interpretResponse({body: serverResponse.emptyAdomain.native}, bidRequests.native)[0];
+      expect(result.requestId).to.equal(bidResponses.emptyAdomain.native.requestId);
+      expect(result.width).to.equal(bidResponses.emptyAdomain.native.width);
+      expect(result.height).to.equal(bidResponses.emptyAdomain.native.height);
+      expect(result.creativeId).to.equal(bidResponses.emptyAdomain.native.creativeId);
+      expect(result.dealId).to.equal(bidResponses.emptyAdomain.native.dealId);
+      expect(result.currency).to.equal(bidResponses.emptyAdomain.native.currency);
+      expect(result.netRevenue).to.equal(bidResponses.emptyAdomain.native.netRevenue);
+      expect(result.ttl).to.equal(bidResponses.emptyAdomain.native.ttl);
+      expect(result.native.title).to.equal(bidResponses.emptyAdomain.native.native.title);
+      expect(result.native.image.url).to.equal(bidResponses.emptyAdomain.native.native.image.url);
+      expect(result.native.image.height).to.equal(bidResponses.emptyAdomain.native.native.image.height);
+      expect(result.native.image.width).to.equal(bidResponses.emptyAdomain.native.native.image.width);
+      expect(result.native.icon.url).to.equal(bidResponses.emptyAdomain.native.native.icon.url);
+      expect(result.native.icon.width).to.equal(bidResponses.emptyAdomain.native.native.icon.width);
+      expect(result.native.icon.height).to.equal(bidResponses.emptyAdomain.native.native.icon.height);
+      expect(result.native.sponsoredBy).to.equal(bidResponses.emptyAdomain.native.native.sponsoredBy);
+      expect(result.native.body).to.equal(bidResponses.emptyAdomain.native.native.body);
+      expect(result.native.cta).to.equal(bidResponses.emptyAdomain.native.native.cta);
+      expect(decodeURIComponent(result.native.privacyLink)).to.equal(bidResponses.emptyAdomain.native.native.privacyLink);
+      expect(result.native.clickUrl).to.equal(bidResponses.emptyAdomain.native.native.clickUrl);
+      expect(result.native.impressionTrackers[0]).to.equal(bidResponses.emptyAdomain.native.native.impressionTrackers[0]);
+      expect(result.native.clickTrackers[0]).to.equal(bidResponses.emptyAdomain.native.native.clickTrackers[0]);
+      expect(result.mediaType).to.equal(bidResponses.emptyAdomain.native.mediaType);
+      expect(result).to.not.have.any.keys('meta');
+      expect(result).to.not.have.any.keys('advertiserDomains');
+    });
+
+    it('handles banner responses for no adomain', function () {
+      const result = spec.interpretResponse({body: serverResponse.noAdomain.banner}, bidRequests.banner)[0];
+      expect(result.requestId).to.equal(bidResponses.noAdomain.banner.requestId);
+      expect(result.width).to.equal(bidResponses.noAdomain.banner.width);
+      expect(result.height).to.equal(bidResponses.noAdomain.banner.height);
+      expect(result.creativeId).to.equal(bidResponses.noAdomain.banner.creativeId);
+      expect(result.dealId).to.equal(bidResponses.noAdomain.banner.dealId);
+      expect(result.currency).to.equal(bidResponses.noAdomain.banner.currency);
+      expect(result.netRevenue).to.equal(bidResponses.noAdomain.banner.netRevenue);
+      expect(result.ttl).to.equal(bidResponses.noAdomain.banner.ttl);
+      expect(result.ad).to.equal(bidResponses.noAdomain.banner.ad);
+      expect(result).to.not.have.any.keys('meta');
+      expect(result).to.not.have.any.keys('advertiserDomains');
     });
 
-    it('handles native responses', function () {
-      const result = spec.interpretResponse({body: serverResponse.native}, bidRequests.native)[0];
-      expect(result.requestId).to.equal(bidResponses.native.requestId);
-      expect(result.width).to.equal(bidResponses.native.width);
-      expect(result.height).to.equal(bidResponses.native.height);
-      expect(result.creativeId).to.equal(bidResponses.native.creativeId);
-      expect(result.dealId).to.equal(bidResponses.native.dealId);
-      expect(result.currency).to.equal(bidResponses.native.currency);
-      expect(result.netRevenue).to.equal(bidResponses.native.netRevenue);
-      expect(result.ttl).to.equal(bidResponses.native.ttl);
-      expect(result.native.title).to.equal(bidResponses.native.native.title);
-      expect(result.native.image.url).to.equal(bidResponses.native.native.image.url);
-      expect(result.native.image.height).to.equal(bidResponses.native.native.image.height);
-      expect(result.native.image.width).to.equal(bidResponses.native.native.image.width);
-      expect(result.native.icon.url).to.equal(bidResponses.native.native.icon.url);
-      expect(result.native.icon.width).to.equal(bidResponses.native.native.icon.width);
-      expect(result.native.icon.height).to.equal(bidResponses.native.native.icon.height);
-      expect(result.native.sponsoredBy).to.equal(bidResponses.native.native.sponsoredBy);
-      expect(result.native.body).to.equal(bidResponses.native.native.body);
-      expect(result.native.cta).to.equal(bidResponses.native.native.cta);
-      expect(decodeURIComponent(result.native.privacyLink)).to.equal(bidResponses.native.native.privacyLink);
-      expect(result.native.clickUrl).to.equal(bidResponses.native.native.clickUrl);
-      expect(result.native.impressionTrackers[0]).to.equal(bidResponses.native.native.impressionTrackers[0]);
-      expect(result.native.clickTrackers[0]).to.equal(bidResponses.native.native.clickTrackers[0]);
-      expect(result.mediaType).to.equal(bidResponses.native.mediaType);
+    it('handles native responses for no adomain', function () {
+      const result = spec.interpretResponse({body: serverResponse.noAdomain.native}, bidRequests.native)[0];
+      expect(result.requestId).to.equal(bidResponses.noAdomain.native.requestId);
+      expect(result.width).to.equal(bidResponses.noAdomain.native.width);
+      expect(result.height).to.equal(bidResponses.noAdomain.native.height);
+      expect(result.creativeId).to.equal(bidResponses.noAdomain.native.creativeId);
+      expect(result.dealId).to.equal(bidResponses.noAdomain.native.dealId);
+      expect(result.currency).to.equal(bidResponses.noAdomain.native.currency);
+      expect(result.netRevenue).to.equal(bidResponses.noAdomain.native.netRevenue);
+      expect(result.ttl).to.equal(bidResponses.noAdomain.native.ttl);
+      expect(result.native.title).to.equal(bidResponses.noAdomain.native.native.title);
+      expect(result.native.image.url).to.equal(bidResponses.noAdomain.native.native.image.url);
+      expect(result.native.image.height).to.equal(bidResponses.noAdomain.native.native.image.height);
+      expect(result.native.image.width).to.equal(bidResponses.noAdomain.native.native.image.width);
+      expect(result.native.icon.url).to.equal(bidResponses.noAdomain.native.native.icon.url);
+      expect(result.native.icon.width).to.equal(bidResponses.noAdomain.native.native.icon.width);
+      expect(result.native.icon.height).to.equal(bidResponses.noAdomain.native.native.icon.height);
+      expect(result.native.sponsoredBy).to.equal(bidResponses.noAdomain.native.native.sponsoredBy);
+      expect(result.native.body).to.equal(bidResponses.noAdomain.native.native.body);
+      expect(result.native.cta).to.equal(bidResponses.noAdomain.native.native.cta);
+      expect(decodeURIComponent(result.native.privacyLink)).to.equal(bidResponses.noAdomain.native.native.privacyLink);
+      expect(result.native.clickUrl).to.equal(bidResponses.noAdomain.native.native.clickUrl);
+      expect(result.native.impressionTrackers[0]).to.equal(bidResponses.noAdomain.native.native.impressionTrackers[0]);
+      expect(result.native.clickTrackers[0]).to.equal(bidResponses.noAdomain.native.native.clickTrackers[0]);
+      expect(result.mediaType).to.equal(bidResponses.noAdomain.native.mediaType);
+      expect(result).to.not.have.any.keys('meta');
+      expect(result).to.not.have.any.keys('advertiserDomains');
     });
   });
 });
diff --git a/test/spec/modules/adglareBidAdapter_spec.js b/test/spec/modules/adglareBidAdapter_spec.js
deleted file mode 100644
index d0dbe891f9d..00000000000
--- a/test/spec/modules/adglareBidAdapter_spec.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/adglareBidAdapter.js';
-
-describe('AdGlare Adapter Tests', function () {
-  let bidRequests;
-
-  beforeEach(function () {
-    bidRequests = [
-      {
-        bidder: 'adglare',
-        params: {
-          domain: 'try.engine.adglare.net',
-          zID: '475579334',
-          type: 'banner'
-        },
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250], [300, 600]],
-          },
-        },
-        bidId: '23acc48ad47af5',
-        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-        bidderRequestId: '1c56ad30b9b8ca8',
-        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-      }
-    ];
-  });
-
-  describe('implementation', function () {
-    describe('for requests', function () {
-      it('should accept valid bid', function () {
-        let validBid = {
-            bidder: 'adglare',
-            params: {
-              domain: 'try.engine.adglare.net',
-              zID: '475579334',
-              type: 'banner'
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-
-        expect(isValid).to.equal(true);
-      });
-
-      it('should reject invalid bid', function () {
-        let invalidBid = {
-            bidder: 'adglare',
-            params: {
-              domain: 'somedomain.com',
-              zID: 'not an integer',
-              type: 'unsupported'
-            }
-          },
-          isValid = spec.isBidRequestValid(invalidBid);
-
-        expect(isValid).to.equal(false);
-      });
-
-      it('should build a valid endpoint URL', function () {
-        let bidRequests = [
-            {
-              bidder: 'adglare',
-              params: {
-                domain: 'try.engine.adglare.net',
-                zID: '475579334',
-                type: 'banner'
-              },
-              mediaTypes: {
-                banner: {
-                  sizes: [[300, 250], [300, 600]],
-                },
-              },
-              bidId: '23acc48ad47af5',
-              auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-              bidderRequestId: '1c56ad30b9b8ca8',
-              transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-            }
-          ],
-          bidderRequest = {
-            bidderCode: 'adglare',
-            auctionID: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-            bidderRequestId: '1c56ad30b9b8ca8',
-            auctionStart: 1581497568252,
-            timeout: 5000,
-            refererInfo: {
-              referer: 'https://www.somedomain.com',
-              reachedTop: true,
-              numFrames: 0
-            },
-            start: 1581497568254
-          },
-          requests = spec.buildRequests(bidRequests, bidderRequest),
-          requestURL = requests[0].url;
-
-        expect(requestURL).to.have.string('https://try.engine.adglare.net/?475579334');
-      });
-    });
-
-    describe('bid responses', function () {
-      it('should return complete bid response', function () {
-        let serverResponse = {
-            body: {
-              status: 'OK',
-              zID: 475579334,
-              cID: 501658124,
-              crID: 442123173,
-              cpm: 1.5,
-              ttl: 3600,
-              currency: 'USD',
-              width: 300,
-              height: 250,
-              adhtml: 'I am an ad.'
-            }
-          },
-          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
-
-        expect(bids).to.be.lengthOf(1);
-        expect(bids[0].bidderCode).to.equal('adglare');
-        expect(bids[0].cpm).to.equal(1.5);
-        expect(bids[0].width).to.equal(300);
-        expect(bids[0].height).to.equal(250);
-        expect(bids[0].currency).to.equal('USD');
-        expect(bids[0].netRevenue).to.equal(true);
-      });
-
-      it('should return empty bid response', function () {
-        let serverResponse = {
-            body: {
-              status: 'NOADS'
-            }
-          },
-          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
-
-        expect(bids).to.be.lengthOf(0);
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/adhashBidAdapter_spec.js b/test/spec/modules/adhashBidAdapter_spec.js
new file mode 100644
index 00000000000..4ea525c59d5
--- /dev/null
+++ b/test/spec/modules/adhashBidAdapter_spec.js
@@ -0,0 +1,271 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adhashBidAdapter.js';
+
+describe('adhashBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    const validBid = {
+      bidder: 'adhash',
+      params: {
+        publisherId: '0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb',
+        platformURL: 'https://adhash.com/p/struma/'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [[300, 250]],
+      bidId: '12345678901234',
+      bidderRequestId: '98765432109876',
+      auctionId: '01234567891234',
+    };
+
+    it('should return true when all mandatory parameters are there', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should return false when there are no params', function () {
+      const bid = { ...validBid };
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when unsupported media type is requested', function () {
+      const bid = { ...validBid };
+      bid.mediaTypes = { native: { sizes: [[300, 250]] } };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not a string', function () {
+      const bid = { ...validBid };
+      bid.params.publisherId = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not valid', function () {
+      const bid = { ...validBid };
+      bid.params.publisherId = 'short string';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not a string', function () {
+      const bid = { ...validBid };
+      bid.params.platformURL = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not valid', function () {
+      const bid = { ...validBid };
+      bid.params.platformURL = 'https://';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when bidderURL is present but not https://', function () {
+      const bid = { ...validBid };
+      bid.params.bidderURL = 'http://example.com/';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequest = {
+      params: {
+        publisherId: '0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb'
+      },
+      sizes: [[300, 250]],
+      adUnitCode: 'adUnitCode'
+    };
+    it('should build the request correctly', function () {
+      const result = spec.buildRequests(
+        [ bidRequest ],
+        { gdprConsent: { gdprApplies: true, consentString: 'example' }, refererInfo: { topmostLocation: 'https://example.com/path.html' } }
+      );
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://bidder.adhash.com/rtb?version=3.2&prebid=true&publisher=0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb');
+      expect(result[0].bidRequest).to.equal(bidRequest);
+      expect(result[0].data).to.have.property('timezone');
+      expect(result[0].data).to.have.property('location');
+      expect(result[0].data).to.have.property('publisherId');
+      expect(result[0].data).to.have.property('size');
+      expect(result[0].data).to.have.property('navigator');
+      expect(result[0].data).to.have.property('creatives');
+      expect(result[0].data).to.have.property('blockedCreatives');
+      expect(result[0].data).to.have.property('currentTimestamp');
+      expect(result[0].data).to.have.property('recentAds');
+    });
+    it('should build the request correctly without referer', function () {
+      const result = spec.buildRequests([ bidRequest ], { gdprConsent: { gdprApplies: true, consentString: 'example' } });
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://bidder.adhash.com/rtb?version=3.2&prebid=true&publisher=0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb');
+      expect(result[0].bidRequest).to.equal(bidRequest);
+      expect(result[0].data).to.have.property('timezone');
+      expect(result[0].data).to.have.property('location');
+      expect(result[0].data).to.have.property('publisherId');
+      expect(result[0].data).to.have.property('size');
+      expect(result[0].data).to.have.property('navigator');
+      expect(result[0].data).to.have.property('creatives');
+      expect(result[0].data).to.have.property('blockedCreatives');
+      expect(result[0].data).to.have.property('currentTimestamp');
+      expect(result[0].data).to.have.property('recentAds');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const request = {
+      data: { some: 'data' },
+      bidRequest: {
+        bidId: '12345678901234',
+        adUnitCode: 'adunit-code',
+        sizes: [[300, 250]],
+        params: {
+          platformURL: 'https://adhash.com/p/struma/'
+        }
+      }
+    };
+
+    let bodyStub;
+
+    const serverResponse = {
+      body: {
+        creatives: [{ costEUR: 1.234 }],
+        advertiserDomains: 'adhash.com',
+        badWords: [
+          ['onqjbeq', 'full', 1],
+          ['onqjbeqo', 'partial', 1],
+          ['tbbqjbeq', 'full', -1],
+          ['fgnegf', 'starts', 1],
+          ['raqf', 'ends', 1],
+          ['kkk[no]lll', 'regexp', 1],
+          ['дума', 'full', 1],
+          ['старт', 'starts', 1],
+          ['край', 'ends', 1],
+        ],
+        maxScore: 2
+      }
+    };
+
+    afterEach(function() {
+      bodyStub && bodyStub.restore();
+    });
+
+    it('should interpret the response correctly', function () {
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result.length).to.equal(1);
+      expect(result[0].requestId).to.equal('12345678901234');
+      expect(result[0].cpm).to.equal(1.234);
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].creativeId).to.equal('adunit-code');
+      expect(result[0].netRevenue).to.equal(true);
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].ttl).to.equal(60);
+      expect(result[0].meta.advertiserDomains).to.eql(['adhash.com']);
+    });
+
+    it('should return empty array when there are bad words (full)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text badword badword example badword text' + ' word'.repeat(993);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (full cyrillic)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text дума дума example дума text' + ' текст'.repeat(993);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (partial)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text partialbadwordb badwordb example badwordbtext' + ' word'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (starts)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text startsWith starts text startsAgain' + ' word'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (starts cyrillic)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text стартТекст старт text стартТекст' + ' дума'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (ends)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text wordEnds ends text anotherends' + ' word'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (ends cyrillic)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text ДругКрай край text ощеединкрай' + ' дума'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (regexp)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text xxxayyy zzxxxAyyyzz text xxxbyyy' + ' word'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return non-empty array when there are not enough bad words (full)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text badword badword example text' + ' word'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
+    });
+
+    it('should return non-empty array when there are not enough bad words (partial)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text partialbadwordb example' + ' word'.repeat(996);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
+    });
+
+    it('should return non-empty array when there are no-bad word matches', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text partialbadword example text' + ' word'.repeat(995);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
+    });
+
+    it('should return non-empty array when there are bad words and good words', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text badword badword example badword goodWord goodWord ' + ' word'.repeat(992);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
+    });
+
+    it('should return non-empty array when there is a problem with the brand-safety', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return null;
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
+    });
+
+    it('should return empty array when there are no creatives returned', function () {
+      expect(spec.interpretResponse({body: {creatives: []}}, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there is no creatives key in the response', function () {
+      expect(spec.interpretResponse({body: {}}, request).length).to.equal(0);
+    });
+
+    it('should return empty array when something is not right', function () {
+      expect(spec.interpretResponse(null, request).length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/adheseBidAdapter_spec.js b/test/spec/modules/adheseBidAdapter_spec.js
index def504b0424..a2e2691c8ba 100644
--- a/test/spec/modules/adheseBidAdapter_spec.js
+++ b/test/spec/modules/adheseBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import {expect} from 'chai';
 import {spec} from 'modules/adheseBidAdapter.js';
+import {config} from 'src/config.js';
 
 const BID_ID = 456;
 const TTL = 360;
@@ -17,10 +18,9 @@ let minimalBid = function() {
   }
 };
 
-let bidWithParams = function(data, userId) {
+let bidWithParams = function(data) {
   let bid = minimalBid();
   bid.params.data = data;
-  bid.userId = userId;
   return bid;
 };
 
@@ -67,44 +67,84 @@ describe('AdheseAdapter', function () {
         consentString: 'CONSENT_STRING'
       },
       refererInfo: {
-        referer: 'http://prebid.org/dev-docs/subjects?_d=1'
+        page: 'http://prebid.org/dev-docs/subjects?_d=1'
       }
     };
 
+    it('should include requested slots', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).slots[0].slotname).to.equal('_main_page_-leaderboard');
+    });
+
     it('should include all extra bid params', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ag': '25' }) ], bidderRequest);
 
-      expect(req.url).to.contain('/sl_main_page_-leaderboard/ag25');
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ag': [ '25' ] });
     });
 
-    it('should include duplicate bid params once', function () {
+    it('should assign bid params per slot', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ag': '25' }), bidWithParams({ 'ag': '25', 'ci': 'gent' }) ], bidderRequest);
 
-      expect(req.url).to.contain('/sl_main_page_-leaderboard/ag25/cigent');
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ag': [ '25' ] }).and.not.to.deep.include({ 'ci': [ 'gent' ] });
+      expect(JSON.parse(req.data).slots[1].parameters).to.deep.include({ 'ag': [ '25' ] }).and.to.deep.include({ 'ci': [ 'gent' ] });
     });
 
     it('should split multiple target values', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ci': 'london' }), bidWithParams({ 'ci': 'gent' }) ], bidderRequest);
 
-      expect(req.url).to.contain('/sl_main_page_-leaderboard/cilondon;gent');
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ci': [ 'london' ] });
+      expect(JSON.parse(req.data).slots[1].parameters).to.deep.include({ 'ci': [ 'gent' ] });
+    });
+
+    it('should filter out empty params', function () {
+      let req = spec.buildRequests([ bidWithParams({ 'aa': [], 'bb': null, 'cc': '', 'dd': [ '', '' ], 'ee': [ 0, 1, null ], 'ff': 0, 'gg': [ 'x', 'y', '' ] }) ], bidderRequest);
+
+      let params = JSON.parse(req.data).slots[0].parameters;
+      expect(params).to.not.have.any.keys('aa', 'bb', 'cc', 'dd');
+      expect(params).to.deep.include({ 'ee': [ 0, 1 ], 'ff': [ 0 ], 'gg': [ 'x', 'y' ] });
     });
 
     it('should include gdpr consent param', function () {
       let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
-      expect(req.url).to.contain('/xtCONSENT_STRING');
+      expect(JSON.parse(req.data).parameters).to.deep.include({ 'xt': [ 'CONSENT_STRING' ] });
     });
 
     it('should include referer param in base64url format', function () {
       let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
-      expect(req.url).to.contain('/xfaHR0cDovL3ByZWJpZC5vcmcvZGV2LWRvY3Mvc3ViamVjdHM_X2Q9MQ');
+      expect(JSON.parse(req.data).parameters).to.deep.include({ 'xf': [ 'aHR0cDovL3ByZWJpZC5vcmcvZGV2LWRvY3Mvc3ViamVjdHM_X2Q9MQ' ] });
+    });
+
+    it('should include eids', function () {
+      let bid = minimalBid();
+      bid.userIdAsEids = [{ source: 'id5-sync.com', uids: [{ id: 'ID5@59sigaS-...' }] }];
+
+      let req = spec.buildRequests([ bid ], bidderRequest);
+
+      expect(JSON.parse(req.data).user.ext.eids).to.deep.equal(bid.userIdAsEids);
+    });
+
+    it('should not include eids field when userid module disabled', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data)).to.not.have.key('eids');
+    });
+
+    it('should request vast content as url by default', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).vastContentAsUrl).to.equal(true);
     });
 
-    it('should include id5 id as /x5 param', function () {
-      let req = spec.buildRequests([ bidWithParams({}, {'id5id': 'ID5-1234567890'}) ], bidderRequest);
+    it('should request vast content as markup when configured', function () {
+      sinon.stub(config, 'getConfig').withArgs('adhese').returns({ vastContentAsUrl: false });
+
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
-      expect(req.url).to.contain('/x5ID5-1234567890');
+      expect(JSON.parse(req.data).vastContentAsUrl).to.equal(false);
+      config.getConfig.restore();
     });
 
     it('should include bids', function () {
@@ -113,6 +153,34 @@ describe('AdheseAdapter', function () {
 
       expect(req.bids).to.deep.equal([ bid ]);
     });
+
+    it('should make a POST request', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(req.method).to.equal('POST');
+    });
+
+    it('should request the json endpoint', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(req.url).to.equal('https://ads-demo.adhese.com/json');
+    });
+
+    it('should include params specified in the config', function () {
+      sinon.stub(config, 'getConfig').withArgs('adhese').returns({ globalTargets: { 'tl': [ 'all' ] } });
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).parameters).to.deep.include({ 'tl': [ 'all' ] });
+      config.getConfig.restore();
+    });
+
+    it('should give priority to bid params over config params', function () {
+      sinon.stub(config, 'getConfig').withArgs('adhese').returns({ globalTargets: { 'xt': ['CONFIG_CONSENT_STRING'] } });
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).parameters).to.deep.include({ 'xt': [ 'CONSENT_STRING' ] });
+      config.getConfig.restore();
+    });
   });
 
   describe('interpretResponse', () => {
@@ -144,7 +212,10 @@ describe('AdheseAdapter', function () {
             body: '<div style="background-color:red; height:250px; width:300px"></div>',
             tracker: 'https://hosts-demo.adhese.com/rtb_gateway/handlers/client/track/?id=a2f39296-6dd0-4b3c-be85-7baa22e7ff4a',
             impressionCounter: 'https://hosts-demo.adhese.com/rtb_gateway/handlers/client/track/?id=a2f39296-6dd0-4b3c-be85-7baa22e7ff4a',
-            extension: {'prebid': {'cpm': {'amount': '1.000000', 'currency': 'USD'}}}
+            extension: {'prebid': {'cpm': {'amount': '1.000000', 'currency': 'USD'}}, mediaType: 'banner'},
+            adomain: [
+              'www.example.com'
+            ]
           }
         ]
       };
@@ -175,7 +246,12 @@ describe('AdheseAdapter', function () {
             slotId: '10',
             slotName: '_main_page_-leaderboard'
           }
-        }
+        },
+        meta: {
+          advertiserDomains: [
+            'www.example.com'
+          ]
+        },
       }];
       expect(spec.interpretResponse(sspBannerResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
@@ -191,7 +267,7 @@ describe('AdheseAdapter', function () {
             width: '640',
             height: '350',
             body: '<?xml version="1.0" encoding="UTF-8"?><VAST xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:noNamespaceSchemaLocation="vast.xsd"></VAST>',
-            extension: {'prebid': {'cpm': {'amount': '2.1', 'currency': 'USD'}}}
+            extension: {'prebid': {'cpm': {'amount': '2.1', 'currency': 'USD'}}, mediaType: 'video'}
           }
         ]
       };
@@ -211,11 +287,55 @@ describe('AdheseAdapter', function () {
         adhese: {
           origin: 'RUBICON',
           originInstance: '',
-          originData: {} }
+          originData: {}
+        },
+        meta: {
+          advertiserDomains: []
+        },
       }];
       expect(spec.interpretResponse(sspVideoResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
 
+    it('should get correct ssp cache video response', () => {
+      let sspCachedVideoResponse = {
+        body: [
+          {
+            origin: 'RUBICON',
+            ext: 'js',
+            slotName: '_main_page_-leaderboard',
+            adType: 'leaderboard',
+            width: '640',
+            height: '350',
+            cachedBodyUrl: 'https://ads-demo.adhese.com/content/38983ccc-4083-4c24-932c-96f798d969b3',
+            extension: {'prebid': {'cpm': {'amount': '2.1', 'currency': 'USD'}}, mediaType: 'video'}
+          }
+        ]
+      };
+
+      let expectedResponse = [{
+        requestId: BID_ID,
+        vastUrl: 'https://ads-demo.adhese.com/content/38983ccc-4083-4c24-932c-96f798d969b3',
+        cpm: 2.1,
+        currency: 'USD',
+        creativeId: 'RUBICON',
+        dealId: '',
+        width: 640,
+        height: 350,
+        mediaType: 'video',
+        netRevenue: NET_REVENUE,
+        ttl: TTL,
+        adhese: {
+          origin: 'RUBICON',
+          originInstance: '',
+          originData: {}
+        },
+        meta: {
+          advertiserDomains: []
+        },
+      }];
+      expect(spec.interpretResponse(sspCachedVideoResponse, bidRequest)).to.deep.equal(expectedResponse);
+    });
+
     it('should get correct Adhese banner response', () => {
       const adheseBannerResponse = {
         body: [
@@ -253,7 +373,8 @@ describe('AdheseAdapter', function () {
                   amount: '5.96',
                   currency: 'USD'
                 }
-              }
+              },
+              mediaType: 'banner'
             }
           }
         ]
@@ -288,6 +409,9 @@ describe('AdheseAdapter', function () {
         mediaType: 'banner',
         netRevenue: NET_REVENUE,
         ttl: TTL,
+        meta: {
+          advertiserDomains: []
+        },
       }];
       expect(spec.interpretResponse(adheseBannerResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
@@ -315,7 +439,10 @@ describe('AdheseAdapter', function () {
             impressionCounter: 'https://hosts-demo.adhese.com/track/742898',
             origin: 'JERLICIA',
             originData: {},
-            auctionable: true
+            auctionable: true,
+            extension: {
+              mediaType: 'video'
+            }
           }
         ]
       };
@@ -349,6 +476,76 @@ describe('AdheseAdapter', function () {
         mediaType: 'video',
         netRevenue: NET_REVENUE,
         ttl: TTL,
+        meta: {
+          advertiserDomains: []
+        },
+      }];
+      expect(spec.interpretResponse(adheseVideoResponse, bidRequest)).to.deep.equal(expectedResponse);
+    });
+
+    it('should get correct Adhese cached video response', () => {
+      const adheseVideoResponse = {
+        body: [
+          {
+            adType: 'preroll',
+            adFormat: '',
+            orderId: '22248',
+            adspaceId: '164196',
+            body: '<ADHESE_BODY>',
+            height: '360',
+            width: '640',
+            extension: {
+              mediaType: 'video'
+            },
+            cachedBodyUrl: 'https://ads-demo.adhese.com/content/38983ccc-4083-4c24-932c-96f798d969b3',
+            libId: '89860',
+            id: '742470',
+            advertiserId: '2263',
+            ext: 'advar',
+            orderName: 'Smartphoto EOY-20181112',
+            creativeName: 'PREROLL',
+            slotName: '_main_page_-leaderboard',
+            slotID: '41711',
+            impressionCounter: 'https://hosts-demo.adhese.com/track/742898',
+            origin: 'JERLICIA',
+            originData: {},
+            auctionable: true
+          }
+        ]
+      };
+
+      let expectedResponse = [{
+        requestId: BID_ID,
+        vastUrl: 'https://ads-demo.adhese.com/content/38983ccc-4083-4c24-932c-96f798d969b3',
+        adhese: {
+          origin: '',
+          originInstance: '',
+          originData: {
+            adFormat: '',
+            adId: '742470',
+            adType: 'preroll',
+            adspaceId: '164196',
+            libId: '89860',
+            orderProperty: undefined,
+            priority: undefined,
+            viewableImpressionCounter: undefined,
+            slotId: '41711',
+            slotName: '_main_page_-leaderboard',
+            advertiserId: '2263',
+          }
+        },
+        cpm: 0,
+        currency: 'USD',
+        creativeId: '742470',
+        dealId: '22248',
+        width: 640,
+        height: 360,
+        mediaType: 'video',
+        netRevenue: NET_REVENUE,
+        ttl: TTL,
+        meta: {
+          advertiserDomains: []
+        },
       }];
       expect(spec.interpretResponse(adheseVideoResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
diff --git a/test/spec/modules/adkernelAdnAnalytics_spec.js b/test/spec/modules/adkernelAdnAnalytics_spec.js
index e7ef831080c..7af96c9321c 100644
--- a/test/spec/modules/adkernelAdnAnalytics_spec.js
+++ b/test/spec/modules/adkernelAdnAnalytics_spec.js
@@ -1,6 +1,6 @@
-import analyticsAdapter, {ExpiringQueue, getUmtSource, storage} from 'modules/adkernelAdnAnalyticsAdapter.js';
+import analyticsAdapter, {ExpiringQueue, getUmtSource, storage} from 'modules/adkernelAdnAnalyticsAdapter';
 import {expect} from 'chai';
-import adapterManager from 'src/adapterManager.js';
+import adapterManager from 'src/adapterManager';
 import CONSTANTS from 'src/constants.json';
 
 const events = require('../../../src/events');
@@ -158,11 +158,16 @@ describe('', function () {
       sizes: [[300, 250]],
       bidId: '208750227436c1',
       bidderRequestId: '1a6fc81528d0f6',
-      auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f'
+      auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f',
+      gdprConsent: {
+        consentString: 'CONSENT',
+        gdprApplies: true,
+        apiVersion: 2
+      },
+      uspConsent: '1---'
     }],
     auctionStart: 1509369418387,
-    timeout: 3000,
-    start: 1509369418389
+    timeout: 3000
   };
 
   const RESPONSE = {
@@ -202,6 +207,10 @@ describe('', function () {
       events.getEvents.restore();
     });
 
+    after(function() {
+      sandbox.restore();
+    });
+
     it('should be configurable', function () {
       adapterManager.registerAnalyticsAdapter({
         code: 'adkernelAdn',
@@ -221,7 +230,7 @@ describe('', function () {
     });
 
     it('should handle auction init event', function () {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {config: {}, timeout: 3000});
+      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {config: {}, bidderRequests: [REQUEST], timeout: 3000});
       const ev = analyticsAdapter.context.queue.peekAll();
       expect(ev).to.have.length(1);
       expect(ev[0]).to.be.eql({event: 'auctionInit'});
diff --git a/test/spec/modules/adkernelAdnBidAdapter_spec.js b/test/spec/modules/adkernelAdnBidAdapter_spec.js
index 3d3e64aeec9..67c168f5063 100644
--- a/test/spec/modules/adkernelAdnBidAdapter_spec.js
+++ b/test/spec/modules/adkernelAdnBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import {expect} from 'chai';
-import {spec} from 'modules/adkernelAdnBidAdapter.js';
+import {spec} from 'modules/adkernelAdnBidAdapter';
+import {config} from 'src/config';
 
 describe('AdkernelAdn adapter', function () {
   const bid1_pub1 = {
@@ -106,7 +107,12 @@ describe('AdkernelAdn adapter', function () {
         bid: 5.0,
         tag: '<!-- tag goes here -->',
         w: 300,
-        h: 250
+        h: 250,
+        advertiserId: 777,
+        advertiserName: 'advertiser',
+        agencyName: 'agency',
+        advertiserDomains: ['example.com'],
+        primaryCatId: 'IAB1-1',
       }, {
         id: 'ad-unit-2',
         impid: '31d798477126c4',
@@ -114,7 +120,12 @@ describe('AdkernelAdn adapter', function () {
         bid: 2.5,
         tag: '<!-- tag goes here -->',
         w: 300,
-        h: 250
+        h: 250,
+        advertiserId: 777,
+        advertiserName: 'advertiser',
+        agencyName: 'agency',
+        advertiserDomains: ['example.com'],
+        secondaryCatIds: ['IAB1-4', 'IAB8-16', 'IAB25-5']
       }, {
         id: 'video_wrapper',
         impid: '57d602ad1c9545',
@@ -133,7 +144,7 @@ describe('AdkernelAdn adapter', function () {
     auctionStart: 1545836987704,
     timeout: 3000,
     refererInfo: {
-      referer: 'https://example.com/index.html',
+      page: 'https://example.com/index.html',
       reachedTop: true,
       numIframes: 0,
       stack: ['https://example.com/index.html']
@@ -205,7 +216,6 @@ describe('AdkernelAdn adapter', function () {
     fullBidderRequest.bids = bidRequests;
     let pbRequests = spec.buildRequests(bidRequests, fullBidderRequest);
     let tagRequests = pbRequests.map(r => JSON.parse(r.data));
-
     return [pbRequests, tagRequests];
   }
 
@@ -263,6 +273,26 @@ describe('AdkernelAdn adapter', function () {
       expect(bidRequests[0].user).to.have.property('gdpr', 0);
       expect(bidRequests[0].user).to.not.have.property('consent');
     });
+
+    it('should\'t contain consent string if gdpr isn\'t applied', function () {
+      config.setConfig({coppa: true});
+      let [_, bidRequests] = buildRequest([bid1_pub1]);
+      config.resetConfig();
+      expect(bidRequests[0]).to.have.property('user');
+      expect(bidRequests[0].user).to.have.property('coppa', 1);
+    });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, bid1_pub1);
+      bid.getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 0.145
+        }
+      };
+      let [, tagRequests] = buildRequest([bid]);
+      expect(tagRequests[0].imp[0]).to.have.property('bidfloor', 0.145);
+    });
   });
 
   describe('video request building', () => {
@@ -355,6 +385,11 @@ describe('AdkernelAdn adapter', function () {
       expect(resp).to.have.property('mediaType', 'banner');
       expect(resp).to.have.property('ad');
       expect(resp.ad).to.have.string('<!-- tag goes here -->');
+      expect(resp.meta.advertiserId).to.be.eql(777);
+      expect(resp.meta.advertiserName).to.be.eql('advertiser');
+      expect(resp.meta.agencyName).to.be.eql('agency');
+      expect(resp.meta.advertiserDomains).to.be.eql(['example.com']);
+      expect(resp.meta.primaryCatId).to.be.eql('IAB1-1');
     });
 
     it('should return fully-initialized video bid-response', function () {
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 71637781f24..45498d2734a 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -1,8 +1,9 @@
 import {expect} from 'chai';
-import {spec} from 'modules/adkernelBidAdapter.js';
-import * as utils from 'src/utils.js';
+import {spec} from 'modules/adkernelBidAdapter';
+import * as utils from 'src/utils';
 import {NATIVE, BANNER, VIDEO} from 'src/mediaTypes';
-import {config} from 'src/config.js';
+import {config} from 'src/config';
+import {parseDomain} from '../../../src/refererDetection.js';
 
 describe('Adkernel adapter', function () {
   const bid1_zone1 = {
@@ -16,6 +17,9 @@ describe('Adkernel adapter', function () {
         banner: {
           sizes: [[300, 250], [300, 200]]
         }
+      },
+      ortb2Imp: {
+        battr: [6, 7, 9]
       }
     }, bid2_zone2 = {
       bidder: 'adkernel',
@@ -28,7 +32,15 @@ describe('Adkernel adapter', function () {
         banner: {
           sizes: [[728, 90]]
         }
-      }
+      },
+      userIdAsEids: [
+        {
+          source: 'crwdcntrl.net',
+          uids: [
+            {atype: 1, id: '97d09fbba28542b7acbb6317c9534945a702b74c5993c352f332cfe83f40cdd9'}
+          ]
+        }
+      ]
     }, bid3_host2 = {
       bidder: 'adkernel',
       params: {zoneId: 1, host: 'rtb-private.adkernel.com'},
@@ -86,12 +98,12 @@ describe('Adkernel adapter', function () {
       params: {
         zoneId: 1,
         host: 'rtb.adkernel.com',
-        video: {api: [1, 2]}
       },
       mediaTypes: {
         video: {
           context: 'instream',
-          playerSize: [[640, 480]]
+          playerSize: [[640, 480]],
+          api: [1, 2]
         }
       },
       adUnitCode: 'ad-unit-1'
@@ -171,10 +183,10 @@ describe('Adkernel adapter', function () {
           nurl: 'https://rtb.com/win?i=ZjKoPYSFI3Y_0',
           adm: '<!-- admarkup here -->',
           w: 300,
-          h: 250
+          h: 250,
+          dealid: 'deal'
         }]
       }],
-      cur: 'USD',
       ext: {
         adk_usersync: [{type: 1, url: 'https://adk.sync.com/sync'}]
       }
@@ -191,7 +203,6 @@ describe('Adkernel adapter', function () {
           cid: '16855'
         }]
       }],
-      cur: 'USD'
     }, usersyncOnlyResponse = {
       id: 'nobid1',
       ext: {
@@ -221,21 +232,38 @@ describe('Adkernel adapter', function () {
             }
           }),
           adomain: ['displayurl.com'],
+          cat: ['IAB1-4', 'IAB8-16', 'IAB25-5'],
           cid: '1',
-          crid: '4'
+          crid: '4',
+          ext: {
+            'advertiser_id': 777,
+            'advertiser_name': 'advertiser',
+            'agency_name': 'agency'
+          }
         }]
       }],
       bidid: 'pTuOlf5KHUo',
-      cur: 'USD'
+      cur: 'EUR'
     };
 
+  var sandbox;
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    config.resetConfig();
+  });
+
   function buildBidderRequest(url = 'https://example.com/index.html', params = {}) {
-    return Object.assign({}, params, {refererInfo: {referer: url, reachedTop: true}, timeout: 3000, bidderCode: 'adkernel'});
+    return Object.assign({}, params, {refererInfo: {page: url, domain: parseDomain(url), reachedTop: true}, timeout: 3000, bidderCode: 'adkernel'});
   }
   const DEFAULT_BIDDER_REQUEST = buildBidderRequest();
 
   function buildRequest(bidRequests, bidderRequest = DEFAULT_BIDDER_REQUEST, dnt = true) {
-    let dntmock = sinon.stub(utils, 'getDNT').callsFake(() => dnt);
+    let dntmock = sandbox.stub(utils, 'getDNT').callsFake(() => dnt);
+    bidderRequest.bids = bidRequests;
     let pbRequests = spec.buildRequests(bidRequests, bidderRequest);
     dntmock.restore();
     let rtbRequests = pbRequests.map(r => JSON.parse(r.data));
@@ -268,6 +296,7 @@ describe('Adkernel adapter', function () {
 
   describe('banner request building', function () {
     let bidRequest, bidRequests, _;
+
     before(function () {
       [_, bidRequests] = buildRequest([bid1_zone1]);
       bidRequest = bidRequests[0];
@@ -307,10 +336,16 @@ describe('Adkernel adapter', function () {
     it('should fill device with caller macro', function () {
       expect(bidRequest).to.have.property('device');
       expect(bidRequest.device).to.have.property('ip', 'caller');
+      expect(bidRequest.device).to.have.property('ipv6', 'caller');
       expect(bidRequest.device).to.have.property('ua', 'caller');
       expect(bidRequest.device).to.have.property('dnt', 1);
     });
 
+    it('should copy FPD to imp.banner', function() {
+      expect(bidRequest.imp[0].banner).to.have.property('battr');
+      expect(bidRequest.imp[0].banner.battr).to.be.eql([6, 7, 9]);
+    });
+
     it('shouldn\'t contain gdpr nor ccpa information for default request', function () {
       let [_, bidRequests] = buildRequest([bid1_zone1]);
       expect(bidRequests[0]).to.not.have.property('regs');
@@ -328,6 +363,14 @@ describe('Adkernel adapter', function () {
       expect(bidRequest.user.ext).to.be.eql({'consent': 'test-consent-string'});
     });
 
+    it('should contain coppa if configured', function () {
+      config.setConfig({coppa: true});
+      let [_, bidRequests] = buildRequest([bid1_zone1]);
+      let bidRequest = bidRequests[0];
+      expect(bidRequest).to.have.property('regs');
+      expect(bidRequest.regs).to.have.property('coppa', 1);
+    });
+
     it('should\'t contain consent string if gdpr isn\'t applied', function () {
       let [_, bidRequests] = buildRequest([bid1_zone1], buildBidderRequest('https://example.com/index.html', {gdprConsent: {gdprApplies: false}}));
       let bidRequest = bidRequests[0];
@@ -342,9 +385,32 @@ describe('Adkernel adapter', function () {
     });
 
     it('should forward default bidder timeout', function() {
-      let [_, bidRequests] = buildRequest([bid1_zone1], DEFAULT_BIDDER_REQUEST);
+      let [_, bidRequests] = buildRequest([bid1_zone1]);
       expect(bidRequests[0]).to.have.property('tmax', 3000);
     });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, bid1_zone1);
+      bid.getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 0.145
+        }
+      };
+      let [_, bidRequests] = buildRequest([bid]);
+      expect(bidRequests[0].imp[0]).to.have.property('bidfloor', 0.145);
+    });
+
+    it('should forward user ids if available', function() {
+      let bid = Object.assign({}, bid2_zone2);
+      let [_, bidRequests] = buildRequest([bid]);
+      expect(bidRequests[0]).to.have.property('user');
+      expect(bidRequests[0].user).to.have.property('ext');
+      expect(bidRequests[0].user.ext).to.have.property('eids');
+      expect(bidRequests[0].user.ext.eids).to.be.an('array').that.is.not.empty;
+      expect(bidRequests[0].user.ext.eids[0]).to.have.property('source');
+      expect(bidRequests[0].user.ext.eids[0]).to.have.property('uids');
+    });
   });
 
   describe('video request building', function () {
@@ -495,6 +561,7 @@ describe('Adkernel adapter', function () {
       expect(resp).to.have.property('ttl');
       expect(resp).to.have.property('mediaType', BANNER);
       expect(resp).to.have.property('ad');
+      expect(resp).to.have.property('dealId', 'deal');
       expect(resp.ad).to.have.string('<!-- admarkup here -->');
     });
 
@@ -540,8 +607,7 @@ describe('Adkernel adapter', function () {
 
   describe('adapter configuration', () => {
     it('should have aliases', () => {
-      expect(spec.aliases).to.have.lengthOf(6);
-      expect(spec.aliases).to.include.members(['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon']);
+      expect(spec.aliases).to.be.an('array').that.is.not.empty;
     });
   });
 
@@ -575,7 +641,13 @@ describe('Adkernel adapter', function () {
       let resp = spec.interpretResponse({body: nativeResponse}, pbRequests[0])[0];
       expect(resp).to.have.property('requestId', 'Bid_01');
       expect(resp).to.have.property('cpm', 2.25);
-      expect(resp).to.have.property('currency', 'USD');
+      expect(resp).to.have.property('currency', 'EUR');
+      expect(resp).to.have.property('meta');
+      expect(resp.meta.advertiserId).to.be.eql(777);
+      expect(resp.meta.advertiserName).to.be.eql('advertiser');
+      expect(resp.meta.agencyName).to.be.eql('agency');
+      expect(resp.meta.advertiserDomains).to.be.eql(['displayurl.com']);
+      expect(resp.meta.secondaryCatIds).to.be.eql(['IAB1-4', 'IAB8-16', 'IAB25-5']);
       expect(resp).to.have.property('mediaType', NATIVE);
       expect(resp).to.have.property('native');
       expect(resp.native).to.have.property('clickUrl', 'http://rtb.com/click?i=pTuOlf5KHUo_0');
diff --git a/test/spec/modules/adliveBidAdapter_spec.js b/test/spec/modules/adliveBidAdapter_spec.js
deleted file mode 100644
index ddf8f82f20f..00000000000
--- a/test/spec/modules/adliveBidAdapter_spec.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/adliveBidAdapter.js';
-
-describe('adliveBidAdapterTests', function() {
-  let bidRequestData = {
-    bids: [
-      {
-        bidId: 'transaction_1234',
-        bidder: 'adlive',
-        params: {
-          hashes: ['1e100887dd614b0909bf6c49ba7f69fdd1360437']
-        },
-        sizes: [[300, 250]]
-      }
-    ]
-  };
-  let request = [];
-
-  it('validate_pub_params', function() {
-    expect(
-      spec.isBidRequestValid({
-        bidder: 'adlive',
-        params: {
-          hashes: ['1e100887dd614b0909bf6c49ba7f69fdd1360437']
-        }
-      })
-    ).to.equal(true);
-  });
-
-  it('validate_generated_params', function() {
-    request = spec.buildRequests(bidRequestData.bids);
-    let req_data = JSON.parse(request[0].data);
-
-    expect(req_data.transaction_id).to.equal('transaction_1234');
-  });
-
-  it('validate_response_params', function() {
-    let serverResponse = {
-      body: [
-        {
-          hash: '1e100887dd614b0909bf6c49ba7f69fdd1360437',
-          content: 'Ad html',
-          price: 1.12,
-          size: [300, 250],
-          is_passback: 0
-        }
-      ]
-    };
-
-    let bids = spec.interpretResponse(serverResponse, bidRequestData.bids[0]);
-    expect(bids).to.have.lengthOf(1);
-
-    let bid = bids[0];
-
-    expect(bid.creativeId).to.equal('1e100887dd614b0909bf6c49ba7f69fdd1360437');
-    expect(bid.ad).to.equal('Ad html');
-    expect(bid.cpm).to.equal(1.12);
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.currency).to.equal('USD');
-  });
-
-  it('validate_response_params_with passback', function() {
-    let serverResponse = {
-      body: [
-        {
-          hash: '1e100887dd614b0909bf6c49ba7f69fdd1360437',
-          content: 'Ad html passback',
-          size: [300, 250],
-          is_passback: 1
-        }
-      ]
-    };
-    let bids = spec.interpretResponse(serverResponse, bidRequestData.bids[0]);
-
-    expect(bids).to.have.lengthOf(0);
-  });
-});
diff --git a/test/spec/modules/adlooxAdServerVideo_spec.js b/test/spec/modules/adlooxAdServerVideo_spec.js
new file mode 100644
index 00000000000..170982a51bd
--- /dev/null
+++ b/test/spec/modules/adlooxAdServerVideo_spec.js
@@ -0,0 +1,339 @@
+import adapterManager from 'src/adapterManager.js';
+import analyticsAdapter from 'modules/adlooxAnalyticsAdapter.js';
+import { ajax } from 'src/ajax.js';
+import { buildVideoUrl } from 'modules/adlooxAdServerVideo.js';
+import { expect } from 'chai';
+import * as events from 'src/events.js';
+import { targeting } from 'src/targeting.js';
+import * as utils from 'src/utils.js';
+
+const analyticsAdapterName = 'adloox';
+
+describe('Adloox Ad Server Video', function () {
+  let sandbox;
+
+  const adUnit = {
+    code: 'ad-slot-1',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [ 640, 480 ]
+      }
+    },
+    bids: [
+      {
+        bidder: 'dummy'
+      }
+    ]
+  };
+
+  const bid = {
+    bidder: adUnit.bids[0].bidder,
+    adUnitCode: adUnit.code,
+    mediaType: 'video'
+  };
+
+  const analyticsOptions = {
+    js: 'https://j.adlooxtracking.com/ads/js/tfav_adl_%%clientid%%.js',
+    client: 'adlooxtest',
+    clientid: 127,
+    platformid: 0,
+    tagid: 0
+  };
+
+  const urlVAST = 'https://j.adlooxtracking.com/ads/vast/tag.php';
+
+  const creativeUrl = 'http://example.invalid/c';
+  const vastHeaders = {
+    'content-type': 'application/xml;charset=utf-8'
+  };
+
+  const vastUrl = 'http://example.invalid/w';
+  const vastContent =
+`<?xml version="1.0" encoding="UTF-8" ?>
+<VAST version="3.0">
+  <Ad id="main" sequence="1">
+    <InLine>
+      <Creatives>
+        <Creative>
+          <Linear skipoffset="00:00:05">
+            <Duration>00:00:30</Duration>
+            <MediaFiles>
+              <MediaFile apiFramework="VPAID" type="application/javascript">http://example.invalid/v.js</MediaFile>
+            </MediaFiles>
+          </Linear>
+        </Creative>
+      </Creatives>
+    </InLine>
+  </Ad>
+  <Ad id="fallback">
+    <InLine>
+      <Creatives>
+        <Creative>
+          <Linear skipoffset="00:00:05">
+            <Duration>00:00:30</Duration>
+            <MediaFiles>
+              <MediaFile width="640" height="480" bitrate="1000" scalable="true" maintainAspectRatio="true" type="video/mp4" delivery="progressive">${creativeUrl}</MediaFile>
+            </MediaFiles>
+          </Linear>
+        </Creative>
+      </Creatives>
+    </InLine>
+  </Ad>
+</VAST>`
+
+  const wrapperUrl = 'http://example.invalid/w';
+  const wrapperContent =
+`<?xml version="1.0" encoding="UTF-8" ?>
+<VAST version="2.0">
+  <Ad id="Test">
+    <Wrapper>
+      <VASTAdTagURI><![CDATA[${vastUrl}]]></VASTAdTagURI>
+    </Wrapper>
+  </Ad>
+</VAST>`;
+
+  adapterManager.registerAnalyticsAdapter({
+    code: analyticsAdapterName,
+    adapter: analyticsAdapter
+  });
+
+  before(function () {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(events, 'getEvents').returns([]);
+
+    adapterManager.enableAnalytics({
+      provider: analyticsAdapterName,
+      options: analyticsOptions
+    });
+    expect(analyticsAdapter.context).is.not.null;
+  });
+
+  after(function () {
+    analyticsAdapter.disableAnalytics();
+    expect(analyticsAdapter.context).is.null;
+
+    sandbox.restore();
+    sandbox = undefined;
+  });
+
+  describe('buildVideoUrl', function () {
+    describe('invalid arguments', function () {
+      it('should require callback', function (done) {
+        const ret = buildVideoUrl();
+
+        expect(ret).is.false;
+
+        done();
+      });
+
+      it('should require options', function (done) {
+        const ret = buildVideoUrl(undefined, function () {});
+
+        expect(ret).is.false;
+
+        done();
+      });
+
+      it('should reject non-string options.url_vast', function (done) {
+        const ret = buildVideoUrl({ url_vast: null }, function () {});
+
+        expect(ret).is.false;
+
+        done();
+      });
+
+      it('should require options.adUnit or options.bid', function (done) {
+        let BID = utils.deepClone(bid);
+
+        let getWinningBidsStub = sinon.stub(targeting, 'getWinningBids')
+        getWinningBidsStub.withArgs(adUnit.code).returns([ BID ]);
+
+        const ret = buildVideoUrl({ url: vastUrl }, function () {});
+        expect(ret).is.false;
+
+        const retAdUnit = buildVideoUrl({ url: vastUrl, adUnit: utils.deepClone(adUnit) }, function () {})
+        expect(retAdUnit).is.true;
+
+        const retBid = buildVideoUrl({ url: vastUrl, bid: BID }, function () {});
+        expect(retBid).is.true;
+
+        getWinningBidsStub.restore();
+
+        done();
+      });
+
+      it('should reject non-string options.url', function (done) {
+        const ret = buildVideoUrl({ url: null, bid: utils.deepClone(bid) }, function () {});
+
+        expect(ret).is.false;
+
+        done();
+      });
+
+      it('should reject non-boolean options.wrap', function (done) {
+        const ret = buildVideoUrl({ wrap: null, url: vastUrl, bid: utils.deepClone(bid) }, function () {});
+
+        expect(ret).is.false;
+
+        done();
+      });
+
+      it('should reject non-boolean options.blob', function (done) {
+        const ret = buildVideoUrl({ blob: null, url: vastUrl, bid: utils.deepClone(bid) }, function () {});
+
+        expect(ret).is.false;
+
+        done();
+      });
+    });
+
+    describe('process VAST', function () {
+      let server = null;
+      let BID = null;
+      let getWinningBidsStub;
+      beforeEach(function () {
+        server = sinon.createFakeServer();
+        BID = utils.deepClone(bid);
+        getWinningBidsStub = sinon.stub(targeting, 'getWinningBids')
+        getWinningBidsStub.withArgs(adUnit.code).returns([ BID ]);
+      });
+      afterEach(function () {
+        getWinningBidsStub.restore();
+        getWinningBidsStub = undefined;
+        BID = null;
+        server.restore();
+        server = null;
+      });
+
+      it('should return URL unchanged for non-VAST', function (done) {
+        const ret = buildVideoUrl({ url: vastUrl, bid: BID }, function (url) {
+          expect(url).is.equal(vastUrl);
+
+          done();
+        });
+        expect(ret).is.true;
+
+        const request = server.requests[0];
+        expect(request.url).is.equal(vastUrl);
+        request.respond(200, { 'content-type': 'application/octet-stream' }, 'notvast');
+      });
+
+      it('should return URL unchanged for empty VAST', function (done) {
+        const ret = buildVideoUrl({ url: vastUrl, bid: BID }, function (url) {
+          expect(url).is.equal(vastUrl);
+
+          done();
+        });
+        expect(ret).is.true;
+
+        const request = server.requests[0];
+        expect(request.url).is.equal(vastUrl);
+        request.respond(200, vastHeaders, '<?xml version="1.0" encoding="UTF-8" ?>\n<VAST version="3.0"/>');
+      });
+
+      it('should fetch, retry on withoutCredentials, follow and return a wrapped blob that expires', function (done) {
+        BID.responseTimestamp = utils.timestamp();
+        BID.ttl = 30;
+
+        const clock = sandbox.useFakeTimers(BID.responseTimestamp);
+
+        const options = {
+          url_vast: urlVAST,
+          url: wrapperUrl,
+          bid: BID
+        };
+        const ret = buildVideoUrl(options, function (url) {
+          expect(url.substr(0, options.url_vast.length)).is.equal(options.url_vast);
+
+          const match = url.match(/[?&]vast=(blob%3A[^&]+)/);
+          expect(match).is.not.null;
+
+          const blob = decodeURIComponent(match[1]);
+
+          const xfr = sandbox.useFakeXMLHttpRequest();
+          xfr.useFilters = true;
+          xfr.addFilter(x => true);	// there is no network traffic for Blob URLs here
+
+          ajax(blob, {
+            success: (responseText, q) => {
+              expect(q.status).is.equal(200);
+              expect(q.getResponseHeader('content-type')).is.equal(vastHeaders['content-type']);
+
+              clock.runAll();
+
+              ajax(blob, {
+                success: (responseText, q) => {
+                  xfr.useFilters = false;		// .restore() does not really work
+                  if (q.status == 0) return done();
+                  done(new Error('Blob should have expired'));
+                },
+                error: (statusText, q) => {
+                  xfr.useFilters = false;
+                  done();
+                }
+              });
+            },
+            error: (statusText, q) => {
+              xfr.useFilters = false;
+              done(new Error(statusText));
+            }
+          });
+        });
+        expect(ret).is.true;
+
+        const wrapperRequestCORS = server.requests[0];
+        expect(wrapperRequestCORS.url).is.equal(wrapperUrl);
+        expect(wrapperRequestCORS.withCredentials).is.true;
+        wrapperRequestCORS.respond(0);
+
+        const wrapperRequest = server.requests[1];
+        expect(wrapperRequest.url).is.equal(wrapperUrl);
+        expect(wrapperRequest.withCredentials).is.false;
+        wrapperRequest.respond(200, vastHeaders, wrapperContent);
+
+        const vastRequest = server.requests[2];
+        expect(vastRequest.url).is.equal(vastUrl);
+        vastRequest.respond(200, vastHeaders, vastContent);
+      });
+
+      it('should fetch, follow and return a wrapped non-blob', function (done) {
+        const options = {
+          url_vast: urlVAST,
+          url: wrapperUrl,
+          bid: BID,
+          blob: false
+        };
+        const ret = buildVideoUrl(options, function (url) {
+          expect(url.substr(0, options.url_vast.length)).is.equal(options.url_vast);
+          expect(/[?&]vast=blob%3/.test(url)).is.false;
+
+          done();
+        });
+        expect(ret).is.true;
+
+        const wrapperRequest = server.requests[0];
+        expect(wrapperRequest.url).is.equal(wrapperUrl);
+        wrapperRequest.respond(200, vastHeaders, wrapperContent);
+
+        const vastRequest = server.requests[1];
+        expect(vastRequest.url).is.equal(vastUrl);
+        vastRequest.respond(200, vastHeaders, vastContent);
+      });
+
+      it('should not follow and return URL unchanged for non-wrap', function (done) {
+        const options = {
+          url: wrapperUrl,
+          bid: BID,
+          wrap: false
+        };
+        const ret = buildVideoUrl(options, function (url) {
+          expect(url).is.equal(options.url);
+
+          done();
+        });
+        expect(ret).is.true;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/adlooxAnalyticsAdapter_spec.js b/test/spec/modules/adlooxAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..8acd02c7f26
--- /dev/null
+++ b/test/spec/modules/adlooxAnalyticsAdapter_spec.js
@@ -0,0 +1,253 @@
+import adapterManager from 'src/adapterManager.js';
+import analyticsAdapter, { command as analyticsCommand, COMMAND } from 'modules/adlooxAnalyticsAdapter.js';
+import { AUCTION_COMPLETED } from 'src/auction.js';
+import { expect } from 'chai';
+import * as events from 'src/events.js';
+import CONSTANTS from 'src/constants.json';
+import * as utils from 'src/utils.js';
+import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
+
+const analyticsAdapterName = 'adloox';
+
+describe('Adloox Analytics Adapter', function () {
+  let sandbox;
+
+  const esplode = 'esplode';
+
+  const bid = {
+    bidder: 'dummy',
+    adUnitCode: 'ad-slot-1',
+    mediaType: 'display'
+  };
+
+  const auctionDetails = {
+    auctionStatus: AUCTION_COMPLETED,
+    bidsReceived: [
+      bid
+    ]
+  };
+
+  const analyticsOptions = {
+    js: 'https://j.adlooxtracking.com/ads/js/tfav_adl_%%clientid%%.js',
+    client: 'adlooxtest',
+    clientid: 127,
+    platformid: 0,
+    tagid: 0,
+    params: {
+      dummy1: '%%client%%',
+      dummy2: '%%pbadslot%%',
+      dummy3: function(bid) { throw new Error(esplode) }
+    }
+  };
+
+  adapterManager.registerAnalyticsAdapter({
+    code: analyticsAdapterName,
+    adapter: analyticsAdapter
+  });
+  describe('enableAnalytics', function () {
+    describe('invalid options', function () {
+      it('should require options', function (done) {
+        adapterManager.enableAnalytics({
+          provider: analyticsAdapterName
+        });
+        expect(analyticsAdapter.context).is.null;
+
+        done();
+      });
+
+      it('should reject non-string options.js', function (done) {
+        const analyticsOptionsLocal = utils.deepClone(analyticsOptions);
+        analyticsOptionsLocal.js = function () { };
+
+        adapterManager.enableAnalytics({
+          provider: analyticsAdapterName,
+          options: analyticsOptionsLocal
+        });
+        expect(analyticsAdapter.context).is.null;
+
+        done();
+      });
+
+      it('should reject non-function options.toselector', function (done) {
+        const analyticsOptionsLocal = utils.deepClone(analyticsOptions);
+        analyticsOptionsLocal.toselector = esplode;
+
+        adapterManager.enableAnalytics({
+          provider: analyticsAdapterName,
+          options: analyticsOptionsLocal
+        });
+        expect(analyticsAdapter.context).is.null;
+
+        done();
+      });
+
+      [ 'client', 'clientid', 'platformid', 'tagid' ].forEach(function (o) {
+        it('should require options.' + o, function (done) {
+          const analyticsOptionsLocal = utils.deepClone(analyticsOptions);
+          delete analyticsOptionsLocal[o];
+
+          adapterManager.enableAnalytics({
+            provider: analyticsAdapterName,
+            options: analyticsOptionsLocal
+          });
+          expect(analyticsAdapter.context).is.null;
+
+          done();
+        });
+      });
+
+      it('should reject non-object options.params', function (done) {
+        const analyticsOptionsLocal = utils.deepClone(analyticsOptions);
+        analyticsOptionsLocal.params = esplode;
+
+        adapterManager.enableAnalytics({
+          provider: analyticsAdapterName,
+          options: analyticsOptionsLocal
+        });
+        expect(analyticsAdapter.context).is.null;
+
+        done();
+      });
+    });
+  });
+
+  describe('process', function () {
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+
+      sandbox.stub(events, 'getEvents').returns([]);
+
+      adapterManager.enableAnalytics({
+        provider: analyticsAdapterName,
+        options: utils.deepClone(analyticsOptions)
+      });
+
+      expect(analyticsAdapter.context).is.not.null;
+    });
+
+    afterEach(function () {
+      analyticsAdapter.disableAnalytics();
+      expect(analyticsAdapter.context).is.null;
+
+      sandbox.restore();
+      sandbox = undefined;
+    });
+
+    describe('event', function () {
+      it('should preload the script on AUCTION_END only once', function (done) {
+        const insertElementStub = sandbox.stub(utils, 'insertElement');
+
+        const uri = utils.parseUrl(analyticsAdapter.url(analyticsOptions.js));
+        const isLinkPreloadAsScript = function(arg) {
+          const href_uri = utils.parseUrl(arg.href);	// IE11 requires normalisation (hostname always includes port)
+          return arg.tagName === 'LINK' && arg.getAttribute('rel') === 'preload' && arg.getAttribute('as') === 'script' && href_uri.href === uri.href;
+        };
+
+        events.emit(CONSTANTS.EVENTS.AUCTION_END, auctionDetails);
+        expect(insertElementStub.calledWith(sinon.match(isLinkPreloadAsScript))).to.true;
+
+        events.emit(CONSTANTS.EVENTS.AUCTION_END, auctionDetails);
+        expect(insertElementStub.callCount).to.equal(1);
+
+        done();
+      });
+
+      it('should inject verification JS on BID_WON', function (done) {
+        const url = analyticsAdapter.url(`${analyticsOptions.js}#`);
+
+        const parent = document.createElement('div');
+
+        const slot = document.createElement('div');
+        slot.id = bid.adUnitCode;
+        parent.appendChild(slot);
+
+        const dummy = document.createElement('div');
+        parent.appendChild(dummy);
+
+        const querySelectorStub = sandbox.stub(document, 'querySelector');
+        querySelectorStub.withArgs(`#${bid.adUnitCode}`).returns(slot);
+
+        events.emit(CONSTANTS.EVENTS.BID_WON, bid);
+
+        const [urlInserted, moduleCode] = loadExternalScriptStub.getCall(0).args;
+
+        expect(urlInserted.substr(0, url.length)).to.equal(url);
+        expect(moduleCode).to.equal(analyticsAdapterName);
+        expect(/[#&]creatype=2(&|$)/.test(urlInserted)).is.true; // prebid 'display' -> adloox '2'
+        expect(new RegExp('[#&]dummy3=' + encodeURIComponent('ERROR: ' + esplode) + '(&|$)').test(urlInserted)).is.true;
+
+        done();
+      });
+
+      it('should not inject verification JS on BID_WON when handled via Ad Server module', function (done) {
+        const bidIgnore = utils.deepClone(bid);
+        utils.deepSetValue(bidIgnore, 'ext.adloox.video.adserver', true);
+
+        const parent = document.createElement('div');
+
+        const slot = document.createElement('div');
+        slot.id = bidIgnore.adUnitCode;
+        parent.appendChild(slot);
+
+        const script = document.createElement('script');
+        const createElementStub = sandbox.stub(document, 'createElement');
+        createElementStub.withArgs('script').returns(script);
+
+        const querySelectorStub = sandbox.stub(document, 'querySelector');
+        querySelectorStub.withArgs(`#${bid.adUnitCode}`).returns(slot);
+
+        events.emit(CONSTANTS.EVENTS.BID_WON, bidIgnore);
+
+        expect(parent.querySelector('script')).is.null;
+
+        done();
+      });
+    });
+
+    describe('command', function () {
+      it('should return config', function (done) {
+        const expected = utils.deepClone(analyticsOptions);
+        delete expected.js;
+        delete expected.toselector;
+        delete expected.params;
+
+        analyticsCommand(COMMAND.CONFIG, null, function (response) {
+          expect(utils.deepEqual(response, expected)).is.true;
+
+          done();
+        });
+      });
+
+      it('should return expanded URL', function (done) {
+        const data = {
+          url: 'https://example.com?',
+          args: [
+            [ 'client', '%%client%%' ]
+          ],
+          bid: bid,
+          ids: true
+        };
+        const expected = `${data.url}${data.args[0][0]}=${analyticsOptions.client}`;
+
+        analyticsCommand(COMMAND.URL, data, function (response) {
+          expect(response.substr(0, expected.length)).is.equal(expected);
+
+          done();
+        });
+      });
+
+      it('should inject tracking event', function (done) {
+        const data = {
+          eventType: CONSTANTS.EVENTS.BID_WON,
+          args: bid
+        };
+
+        analyticsCommand(COMMAND.TRACK, data, function (response) {
+          expect(response).is.undefined;
+
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/adlooxRtdProvider_spec.js b/test/spec/modules/adlooxRtdProvider_spec.js
new file mode 100644
index 00000000000..236e053e58c
--- /dev/null
+++ b/test/spec/modules/adlooxRtdProvider_spec.js
@@ -0,0 +1,319 @@
+import adapterManager from 'src/adapterManager.js';
+import analyticsAdapter from 'modules/adlooxAnalyticsAdapter.js';
+import { config as _config } from 'src/config.js';
+import { expect } from 'chai';
+import * as events from 'src/events.js';
+import * as prebidGlobal from 'src/prebidGlobal.js';
+import { subModuleObj as rtdProvider } from 'modules/adlooxRtdProvider.js';
+import * as utils from 'src/utils.js';
+
+const analyticsAdapterName = 'adloox';
+
+describe('Adloox RTD Provider', function () {
+  let sandbox;
+
+  const adUnit = {
+    code: 'ad-slot-1',
+    ortb2Imp: {
+      ext: {
+        data: {
+          pbadslot: '/123456/home/ad-slot-1'
+        }
+      }
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [ [300, 250] ]
+      }
+    },
+    bids: [
+      {
+        bidder: 'dummy'
+      }
+    ]
+  };
+
+  const analyticsOptions = {
+    js: 'https://j.adlooxtracking.com/ads/js/tfav_adl_%%clientid%%.js',
+    client: 'adlooxtest',
+    clientid: 127,
+    platformid: 0,
+    tagid: 0
+  };
+
+  const config = {};
+
+  adapterManager.registerAnalyticsAdapter({
+    code: analyticsAdapterName,
+    adapter: analyticsAdapter
+  });
+
+  before(function () {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(events, 'getEvents').returns([]);
+  });
+
+  after(function () {
+    sandbox.restore();
+    sandbox = undefined;
+  });
+
+  describe('invalid config', function () {
+    it('should require config', function (done) {
+      const ret = rtdProvider.init();
+
+      expect(ret).is.false;
+
+      done();
+    });
+
+    it('should reject non-object config.params', function (done) {
+      const ret = rtdProvider.init({ params: null });
+
+      expect(ret).is.false;
+
+      done();
+    });
+
+    it('should reject non-string config.params.api_origin', function (done) {
+      const ret = rtdProvider.init({ params: { api_origin: null } });
+
+      expect(ret).is.false;
+
+      done();
+    });
+
+    it('should reject less than one config.params.imps', function (done) {
+      const ret = rtdProvider.init({ params: { imps: 0 } });
+
+      expect(ret).is.false;
+
+      done();
+    });
+
+    it('should reject negative config.params.freqcap_ip', function (done) {
+      const ret = rtdProvider.init({ params: { freqcap_ip: -1 } });
+
+      expect(ret).is.false;
+
+      done();
+    });
+
+    it('should reject negative integer config.params.freqcap_ipua', function (done) {
+      const ret = rtdProvider.init({ params: { freqcap_ipua: -1 } });
+
+      expect(ret).is.false;
+
+      done();
+    });
+
+    it('should reject non-array of integers with value greater than zero config.params.thresholds', function (done) {
+      const ret = rtdProvider.init({ params: { thresholds: [ 70, null ] } });
+
+      expect(ret).is.false;
+
+      done();
+    });
+
+    it('should reject non-boolean config.params.slotinpath', function (done) {
+      const ret = rtdProvider.init({ params: { slotinpath: null } });
+
+      expect(ret).is.false;
+
+      done();
+    });
+
+    it('should reject invalid config.params.params (legacy/deprecated)', function (done) {
+      const ret = rtdProvider.init({ params: { params: { clientid: 0, tagid: 0 } } });
+
+      expect(ret).is.false;
+
+      done();
+    });
+  });
+
+  describe('process segments', function () {
+    before(function () {
+      adapterManager.enableAnalytics({
+        provider: analyticsAdapterName,
+        options: analyticsOptions
+      });
+      expect(analyticsAdapter.context).is.not.null;
+    });
+
+    after(function () {
+      analyticsAdapter.disableAnalytics();
+      expect(analyticsAdapter.context).is.null;
+    });
+
+    let server = null;
+    let __config = null, CONFIG = null;
+    let getConfigStub, setConfigStub;
+    beforeEach(function () {
+      server = sinon.createFakeServer();
+      __config = {};
+      CONFIG = utils.deepClone(config);
+      getConfigStub = sinon.stub(_config, 'getConfig').callsFake(function (path) {
+        return utils.deepAccess(__config, path);
+      });
+      setConfigStub = sinon.stub(_config, 'setConfig').callsFake(function (obj) {
+        utils.mergeDeep(__config, obj);
+      });
+    });
+    afterEach(function () {
+      setConfigStub.restore();
+      getConfigStub.restore();
+      getConfigStub = setConfigStub = undefined;
+      CONFIG = null;
+      __config = null;
+      server.restore();
+      server = null;
+    });
+
+    it('should fetch segments', function (done) {
+      const req = {};
+      const adUnitWithSegments = utils.deepClone(adUnit);
+      const getGlobalStub = sinon.stub(prebidGlobal, 'getGlobal').returns({
+        adUnits: [ adUnitWithSegments ]
+      });
+
+      const ret = rtdProvider.init(CONFIG);
+      expect(ret).is.true;
+
+      const callback = function () {
+        const ortb2 = req.ortb2Fragments.global;
+        expect(ortb2.site.ext.data.adloox_rtd.ok).is.true;
+        expect(ortb2.site.ext.data.adloox_rtd.nope).is.undefined;
+        expect(ortb2.user.ext.data.adloox_rtd.unused).is.false;
+        expect(ortb2.user.ext.data.adloox_rtd.nope).is.undefined;
+        expect(adUnitWithSegments.ortb2Imp.ext.data.adloox_rtd.dis.length).is.equal(3);
+        expect(adUnitWithSegments.ortb2Imp.ext.data.adloox_rtd.nope).is.undefined;
+
+        getGlobalStub.restore();
+
+        done();
+      };
+      rtdProvider.getBidRequestData(req, callback, CONFIG, null);
+
+      const request = server.requests[0];
+      const response = { unused: false, _: [ { d: 77 } ] };
+      request.respond(200, { 'content-type': 'application/json' }, JSON.stringify(response));
+    });
+
+    it('should set ad server targeting', function (done) {
+      utils.deepSetValue(__config, 'ortb2.site.ext.data.adloox_rtd.ok', true);
+
+      const adUnitWithSegments = utils.deepClone(adUnit);
+      utils.deepSetValue(adUnitWithSegments, 'ortb2Imp.ext.data.adloox_rtd.dis', [ 50, 60 ]);
+      const getGlobalStub = sinon.stub(prebidGlobal, 'getGlobal').returns({
+        adUnits: [ adUnitWithSegments ]
+      });
+
+      const targetingData = rtdProvider.getTargetingData([ adUnitWithSegments.code ], CONFIG, null, {
+        getFPD: () => ({
+          global: __config.ortb2
+        })
+      });
+      expect(Object.keys(targetingData).length).is.equal(1);
+      expect(Object.keys(targetingData[adUnit.code]).length).is.equal(2);
+      expect(targetingData[adUnit.code].adl_ok).is.equal(1);
+      expect(targetingData[adUnit.code].adl_dis.length).is.equal(2);
+
+      getGlobalStub.restore();
+
+      done();
+    });
+  });
+
+  describe('measure atf', function () {
+    const adUnitCopy = utils.deepClone(adUnit);
+
+    const ratio = 0.38;
+    const [ [width, height] ] = utils.getAdUnitSizes(adUnitCopy);
+
+    before(function () {
+      adapterManager.enableAnalytics({
+        provider: analyticsAdapterName,
+        options: analyticsOptions
+      });
+      expect(analyticsAdapter.context).is.not.null;
+    });
+
+    after(function () {
+      analyticsAdapter.disableAnalytics();
+      expect(analyticsAdapter.context).is.null;
+    });
+
+    it(`should return ${ratio} for same-origin`, function (done) {
+      const el = document.createElement('div');
+      el.setAttribute('id', adUnitCopy.code);
+
+      const offset = height * ratio;
+      const elStub = sinon.stub(el, 'getBoundingClientRect').returns({
+        top: 0 - (height - offset),
+        bottom: height - offset,
+        left: 0,
+        right: width
+      });
+
+      const querySelectorStub = sinon.stub(document, 'querySelector');
+      querySelectorStub.withArgs(`#${adUnitCopy.code}`).returns(el);
+
+      rtdProvider.atf(adUnitCopy, function(x) {
+        expect(x).is.equal(ratio);
+
+        querySelectorStub.restore();
+        elStub.restore();
+
+        done();
+      });
+    });
+
+    ('IntersectionObserver' in window ? it : it.skip)(`should return ${ratio} for cross-origin`, function (done) {
+      const frameElementStub = sinon.stub(window, 'frameElement').value(null);
+
+      const el = document.createElement('div');
+      el.setAttribute('id', adUnitCopy.code);
+
+      const elStub = sinon.stub(el, 'getBoundingClientRect').returns({
+        top: 0,
+        bottom: height,
+        left: 0,
+        right: width
+      });
+
+      const querySelectorStub = sinon.stub(document, 'querySelector');
+      querySelectorStub.withArgs(`#${adUnitCopy.code}`).returns(el);
+
+      let intersectionObserverStubFn = null;
+      const intersectionObserverStub = sinon.stub(window, 'IntersectionObserver').callsFake((fn) => {
+        intersectionObserverStubFn = fn;
+        return {
+          observe: (element) => {
+            expect(element).is.equal(el);
+
+            intersectionObserverStubFn([{
+              target: element,
+              intersectionRect: { width, height },
+              intersectionRatio: ratio
+            }]);
+          },
+          unobserve: (element) => {
+            expect(element).is.equal(el);
+          }
+        }
+      });
+
+      rtdProvider.atf(adUnitCopy, function(x) {
+        expect(x).is.equal(ratio);
+
+        intersectionObserverStub.restore();
+        querySelectorStub.restore();
+        elStub.restore();
+        frameElementStub.restore();
+
+        done();
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/admanBidAdapter_spec.js b/test/spec/modules/admanBidAdapter_spec.js
index f3212dec2f5..feee8e39b45 100644
--- a/test/spec/modules/admanBidAdapter_spec.js
+++ b/test/spec/modules/admanBidAdapter_spec.js
@@ -1,28 +1,81 @@
 import {expect} from 'chai';
 import {spec} from '../../../modules/admanBidAdapter.js';
+import {deepClone} from '../../../src/utils'
 
-describe('AdmanMediaBidAdapter', function () {
-  let bid = {
-    bidId: '23fhj33i987f',
+describe('AdmanAdapter', function () {
+  let bidBanner = {
+    bidId: '2dd581a2b6281d',
     bidder: 'adman',
+    bidderRequestId: '145e1d6a7837c9',
     params: {
-      placementId: 0,
-      traffic: 'banner'
+      placementId: 0
+    },
+    placementCode: 'placementid_0',
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '0',
+          hp: 1,
+          rid: 'bidrequestid',
+          // name: 'alladsallthetime',
+          domain: 'example.com'
+        }
+      ]
     }
   };
 
+  let bidVideo = deepClone({
+    ...bidBanner,
+    params: {
+      placementId: 0,
+      traffic: 'video'
+    },
+    mediaTypes: {
+      video: {
+        playerSize: [300, 250]
+      }
+    }
+  });
+
+  let bidderRequest = {
+    bidderCode: 'adman',
+    auctionId: 'fffffff-ffff-ffff-ffff-ffffffffffff',
+    bidderRequestId: 'ffffffffffffff',
+    start: 1472239426002,
+    auctionStart: 1472239426000,
+    timeout: 5000,
+    uspConsent: '1YN-',
+    gdprConsent: 'gdprConsent',
+    refererInfo: {
+      referer: 'http://www.example.com',
+      reachedTop: true,
+    },
+    bids: [bidBanner, bidVideo]
+  }
+
   describe('isBidRequestValid', function () {
-    it('Should return true if there are bidId, params and placementId parameters present', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+    it('Should return true when placementId can be cast to a number', function () {
+      expect(spec.isBidRequestValid(bidBanner)).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;
+    it('Should return false when placementId is not a number', function () {
+      bidBanner.params.placementId = 'aaa';
+      expect(spec.isBidRequestValid(bidBanner)).to.be.false;
+      bidBanner.params.placementId = 0;
     });
   });
 
   describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid]);
+    let serverRequest = spec.buildRequests([bidBanner], bidderRequest);
     it('Creates a ServerRequest object with method, URL and data', function () {
       expect(serverRequest).to.exist;
       expect(serverRequest.method).to.exist;
@@ -35,197 +88,251 @@ describe('AdmanMediaBidAdapter', function () {
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://pub.admanmedia.com/?c=o&m=multi');
     });
-    it('Returns valid data if array of bids is valid', function () {
+    it('Should contain ccpa', function() {
+      expect(serverRequest.data.ccpa).to.be.an('string')
+    })
+
+    it('Returns valid BANNER data if array of bids is valid', function () {
+      serverRequest = spec.buildRequests([bidBanner], bidderRequest);
       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');
-      let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes');
-      expect(placement.placementId).to.equal(0);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal('banner');
+      let placements = data['placements'];
+      for (let i = 0; i < placements.length; i++) {
+        let placement = placements[i];
+        expect(placement).to.have.all.keys('placementId', 'eids', 'bidId', 'traffic', 'sizes', 'schain', 'bidFloor');
+        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.sizes).to.be.an('array');
+        expect(placement.bidFloor).to.be.an('number');
+      }
     });
+
+    it('Returns valid VIDEO data if array of bids is valid', function () {
+      serverRequest = spec.buildRequests([bidVideo], 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');
+      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', 'eids', 'bidId', 'traffic', 'sizes', 'schain', 'bidFloor',
+          '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.sizes).to.be.an('array');
+        expect(placement.bidFloor).to.be.an('number');
+      }
+    });
+
     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('buildRequests with user ids', function () {
+    bidBanner.userId = {}
+    bidBanner.userId.uid2 = { id: 'uid2id123' };
+    let serverRequest = spec.buildRequests([bidBanner], bidderRequest);
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      let placements = data['placements'];
+      expect(data).to.be.an('object');
+      for (let i = 0; i < placements.length; i++) {
+        let placement = placements[i];
+        expect(placement).to.have.property('eids')
+        expect(placement.eids).to.be.an('array')
+        expect(placement.eids.length).to.be.equal(1)
+        for (let index in placement.eids) {
+          let v = placement.eids[index];
+          expect(v).to.have.all.keys('source', 'uids')
+          expect(v.source).to.be.oneOf(['uidapi.com'])
+          expect(v.uids).to.be.an('array');
+          expect(v.uids.length).to.be.equal(1)
+          expect(v.uids[0]).to.have.property('id')
+        }
+      }
+    });
+  });
+
   describe('interpretResponse', function () {
-    it('Should interpret banner response', function () {
-      const banner = {
-        body: [{
+    it('(BANNER) Returns an array of valid server responses if response object is valid', function () {
+      const resBannerObject = {
+        body: [ {
+          requestId: '123',
           mediaType: 'banner',
-          width: 300,
-          height: 250,
-          cpm: 0.4,
-          ad: 'Test',
-          requestId: '23fhj33i987f',
-          ttl: 120,
-          creativeId: '2',
+          cpm: 0.3,
+          width: 320,
+          height: 50,
+          ad: '<h1>Hello ad</h1>',
+          ttl: 1000,
+          creativeId: '123asd',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
-        }]
+          adomain: ['example.com'],
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        } ]
       };
-      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');
-      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');
+
+      const serverResponses = spec.interpretResponse(resBannerObject);
+
+      expect(serverResponses).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < serverResponses.length; i++) {
+        let dataItem = serverResponses[i];
+        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+          'netRevenue', 'currency', 'mediaType', 'meta', 'adomain');
+        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.ad).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('Should interpret video response', function () {
-      const video = {
-        body: [{
-          vastUrl: 'test.com',
+
+    it('(VIDEO) Returns an array of valid server responses if response object is valid', function () {
+      const resVideoObject = {
+        body: [ {
+          requestId: '123',
           mediaType: 'video',
-          cpm: 0.5,
-          requestId: '23fhj33i987f',
-          ttl: 120,
-          creativeId: '2',
+          cpm: 0.3,
+          width: 320,
+          height: 50,
+          vastUrl: 'https://',
+          ttl: 1000,
+          creativeId: '123asd',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
-        }]
+          adomain: ['example.com'],
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        } ]
       };
-      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');
-      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');
+
+      const serverResponses = spec.interpretResponse(resVideoObject);
+
+      expect(serverResponses).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < serverResponses.length; i++) {
+        let dataItem = serverResponses[i];
+        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastUrl', 'ttl', 'creativeId',
+          'netRevenue', 'currency', 'mediaType', 'meta', 'adomain');
+        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('Should interpret native response', function () {
-      const native = {
-        body: [{
+
+    it('(NATIVE) Returns an array of valid server responses if response object is valid', function () {
+      const resNativeObject = {
+        body: [ {
+          requestId: '123',
           mediaType: 'native',
+          cpm: 0.3,
+          width: 320,
+          height: 50,
           native: {
-            clickUrl: 'test.com',
-            title: 'Test',
-            image: 'test.com',
-            impressionTrackers: ['test.com'],
+            title: 'title',
+            image: 'image',
+            impressionTrackers: [ 'https://' ]
           },
-          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');
-      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',
+          ttl: 1000,
+          creativeId: '123asd',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
-        }]
+          adomain: ['example.com'],
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        } ]
       };
 
-      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;
+      const serverResponses = spec.interpretResponse(resNativeObject);
+
+      expect(serverResponses).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < serverResponses.length; i++) {
+        let dataItem = serverResponses[i];
+        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
+          'netRevenue', 'currency', 'mediaType', 'meta', 'adomain');
+        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.native).to.be.an('object');
+        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('Should return an empty array if invalid response is passed', function () {
-      const invalid = {
-        body: [{
-          ttl: 120,
-          creativeId: '2',
-          netRevenue: true,
-          currency: 'USD',
-          dealId: '1'
-        }]
+
+    it('Invalid mediaType in response', function () {
+      const resBadObject = {
+        body: [ {
+          mediaType: 'other',
+          requestId: '123',
+          cpm: 0.3,
+          ttl: 1000,
+          creativeId: '123asd',
+          currency: 'USD'
+        } ]
       };
-      let serverResponses = spec.interpretResponse(invalid);
+
+      const serverResponses = spec.interpretResponse(resBadObject);
+
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+
   describe('getUserSyncs', function () {
-    let userSync = spec.getUserSyncs();
+    const gdprConsent = { consentString: 'consentString', gdprApplies: 1 };
+    const consentString = { consentString: 'consentString' }
+    let userSync = spec.getUserSyncs({}, {}, gdprConsent, consentString);
     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('image');
-      expect(userSync[0].url).to.be.equal('https://pub.admanmedia.com/?c=o&m=sync');
+      expect(userSync[0].url).to.be.equal('https://sync.admanmedia.com/image?pbjs=1&gdpr=0&gdpr_consent=consentString&ccpa_consent=consentString&coppa=0');
     });
   });
 });
diff --git a/test/spec/modules/admaruBidAdapter_spec.js b/test/spec/modules/admaruBidAdapter_spec.js
new file mode 100644
index 00000000000..a45ddae108f
--- /dev/null
+++ b/test/spec/modules/admaruBidAdapter_spec.js
@@ -0,0 +1,124 @@
+import { expect } from 'chai';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { spec } from '../../../modules/admaruBidAdapter.js';
+
+const ENDPOINT = 'https://p1.admaru.net/AdCall';
+
+describe('Admaru Adapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('should exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValidForBanner', () => {
+    let bid = {
+      'bidder': 'admaru',
+      'params': {
+    	  'pub_id': '1234',
+        'adspace_id': '1234'
+      },
+      'adUnitCode': 'adunit-code',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [300, 250]
+          ]
+        }
+      },
+      'sizes': [[300, 250]],
+      'bidId': '26e88c3c703e66',
+      'bidderRequestId': '1a8ff729f6c1a3',
+      'auctionId': 'cb65d954-ffe1-4f4a-8603-02b521c00333',
+    };
+
+    it('should return true when required params found', () => {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', () => {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        wrong: 'missing pub_id or adspace_id'
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequestsForBanner', () => {
+    let bidRequests = [
+      {
+        'bidder': 'admaru',
+        'params': {
+        	'pub_id': '1234',
+          'adspace_id': '1234'
+        },
+        'adUnitCode': 'adunit-code',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [300, 250]
+            ]
+          }
+        },
+        'sizes': [[300, 250]],
+        'bidId': '26e88c3c703e66',
+        'bidderRequestId': '1a8ff729f6c1a3',
+        'auctionId': 'cb65d954-ffe1-4f4a-8603-02b521c00333'
+      }
+    ];
+
+    it('should add parameters to the tag', () => {
+      const request = spec.buildRequests(bidRequests);
+      const payload = request[0].data;
+      expect(payload.pub_id).to.equal('1234');
+      expect(payload.adspace_id).to.equal('1234');
+      // expect(payload.refererInfo).to.equal('{"referer": "https://www.admaru.com/test/admaru_prebid/icv_reminder/test.html","reachedTop": true,"numIframes": 1,"stack": ["https://www.admaru.com/test/admaru_prebid/icv_reminder/test.html","https://www.admaru.com/test/admaru_prebid/icv_reminder/test.html"]}');
+      // expect(payload.os).to.equal('windows');
+      // expect(payload.platform).to.equal('pc_web');
+      expect(payload.bidderRequestId).to.equal('1a8ff729f6c1a3');
+      expect(payload.bidId).to.equal('26e88c3c703e66');
+    });
+
+    it('sends bid request to ENDPOINT via GET', () => {
+      const request = spec.buildRequests(bidRequests);
+      expect(request[0].url).to.contain(ENDPOINT);
+      expect(request[0].method).to.equal('GET');
+    });
+  });
+
+  describe('interpretResponseForBanner', () => {
+    let bidRequests = [
+      {
+        'bidder': 'admaru',
+        'params': {
+        	'pub_id': '1234',
+          'adspace_id': '1234'
+        },
+        'adUnitCode': 'adunit-code',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [300, 250]
+            ]
+          }
+        },
+        'sizes': [[300, 250]],
+        'bidId': '26e88c3c703e66',
+        'bidderRequestId': '1a8ff729f6c1a3',
+        'auctionId': 'cb65d954-ffe1-4f4a-8603-02b521c00333'
+      }
+    ];
+
+    it('handles nobid responses', () => {
+      var request = spec.buildRequests(bidRequests);
+      let response = '';
+
+      let result = spec.interpretResponse(response, request[0]);
+      expect(result.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/admaticBidAdapter_spec.js b/test/spec/modules/admaticBidAdapter_spec.js
new file mode 100644
index 00000000000..65a7b4111b7
--- /dev/null
+++ b/test/spec/modules/admaticBidAdapter_spec.js
@@ -0,0 +1,305 @@
+import {expect} from 'chai';
+import {spec, storage} from 'modules/admaticBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {getStorageManager} from 'src/storageManager';
+
+const ENDPOINT = 'https://layer.serve.admatic.com.tr/pb?bidder=admatic';
+
+describe('admaticBidAdapter', () => {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function() {
+    let bid = {
+      'bidder': 'admatic',
+      'params': {
+        'networkId': 10433394,
+        'host': 'layer.serve.admatic.com.tr'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+      'creativeId': 'er2ee'
+    };
+
+    it('should return true when required params found', function() {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function() {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+
+      bid.params = {
+        'networkId': 0,
+        'host': 'layer.serve.admatic.com.tr'
+      };
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('sends bid request to ENDPOINT via POST', function () {
+      let validRequest = [ {
+        'bidder': 'admatic',
+        'params': {
+          'networkId': 10433394,
+          'host': 'layer.serve.admatic.com.tr'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [728, 90]]
+          }
+        },
+        getFloor: inputParams => {
+          if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+            return {
+              currency: 'USD',
+              floor: 1.0
+            };
+          } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+            return {
+              currency: 'USD',
+              floor: 2.0
+            };
+          } else {
+            return {}
+          }
+        },
+        'user': {
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36'
+        },
+        'blacklist': [],
+        'site': {
+          'page': 'http://localhost:8888/admatic.html',
+          'ref': 'http://localhost:8888',
+          'publisher': {
+            'name': 'localhost',
+            'publisherId': 12321312
+          }
+        },
+        'imp': [
+          {
+            'size': [
+              {
+                'w': 300,
+                'h': 250
+              },
+              {
+                'w': 728,
+                'h': 90
+              }
+            ],
+            'id': '2205da7a81846b',
+            'floors': {
+              'banner': {
+                '300x250': { 'currency': 'USD', 'floor': 1 },
+                '728x90': { 'currency': 'USD', 'floor': 2 }
+              }
+            }
+          }
+        ],
+        'ext': {
+          'cur': 'USD',
+          'bidder': 'admatic'
+        }
+      } ];
+      let bidderRequest = {
+        'bidder': 'admatic',
+        'params': {
+          'networkId': 10433394,
+          'host': 'layer.serve.admatic.com.tr'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [728, 90]]
+          }
+        },
+        getFloor: inputParams => {
+          if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+            return {
+              currency: 'USD',
+              floor: 1.0
+            };
+          } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+            return {
+              currency: 'USD',
+              floor: 2.0
+            };
+          } else {
+            return {}
+          }
+        },
+        'user': {
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36'
+        },
+        'blacklist': [],
+        'site': {
+          'page': 'http://localhost:8888/admatic.html',
+          'ref': 'http://localhost:8888',
+          'publisher': {
+            'name': 'localhost',
+            'publisherId': 12321312
+          }
+        },
+        'imp': [
+          {
+            'size': [
+              {
+                'w': 300,
+                'h': 250
+              },
+              {
+                'w': 728,
+                'h': 90
+              }
+            ],
+            'id': '2205da7a81846b',
+            'floors': {
+              'banner': {
+                '300x250': { 'currency': 'USD', 'floor': 1 },
+                '728x90': { 'currency': 'USD', 'floor': 2 }
+              }
+            }
+          }
+        ],
+        'ext': {
+          'cur': 'USD',
+          'bidder': 'admatic'
+        }
+      };
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should properly build a banner request with floors', function () {
+      let bidRequests = [
+        {
+          'bidder': 'admatic',
+          'params': {
+            'networkId': 10433394,
+            'host': 'layer.serve.admatic.com.tr'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[300, 250], [728, 90]]
+            }
+          },
+          getFloor: inputParams => {
+            if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+              return {
+                currency: 'USD',
+                floor: 1.0
+              };
+            } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+              return {
+                currency: 'USD',
+                floor: 2.0
+              };
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      let bidderRequest = {
+        'bidder': 'admatic',
+        'params': {
+          'networkId': 10433394,
+          'host': 'layer.serve.admatic.com.tr'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [728, 90]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'creativeId': 'er2ee',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [728, 90]]
+          }
+        }
+      };
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      request.data.imp[0].floors = {
+        'banner': {
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
+        }
+      };
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should get correct bid responses', function() {
+      let bids = { body: {
+        data: [
+          {
+            'id': 1,
+            'creative_id': '374',
+            'width': 300,
+            'height': 250,
+            'price': 0.01,
+            'bidder': 'admatic',
+            'adomain': ['admatic.com.tr'],
+            'party_tag': '<div></div>'
+          }
+        ],
+        'queryId': 'cdnbh24rlv0hhkpfpln0',
+        'status': true
+      }};
+
+      let expectedResponse = [
+        {
+          requestId: 1,
+          cpm: 0.01,
+          width: 300,
+          height: 250,
+          currency: 'TRY',
+          netRevenue: true,
+          ad: '<div></div>',
+          creativeId: '374',
+          meta: {
+            advertiserDomains: ['admatic.com.tr']
+          },
+          ttl: 360,
+          bidder: 'admatic'
+        }
+      ];
+      const request = {
+        ext: {
+          'cur': 'TRY',
+          'type': 'admatic'
+        }
+      };
+      let result = spec.interpretResponse(bids, {data: request});
+      expect(result).to.eql(expectedResponse);
+    });
+
+    it('handles nobid responses', function () {
+      let request = {
+        ext: {
+          'cur': 'TRY',
+          'type': 'admatic'
+        }
+      };
+      let bids = { body: {
+        data: [],
+        'queryId': 'cdnbh24rlv0hhkpfpln0',
+        'status': true
+      }};
+
+      let result = spec.interpretResponse(bids, {data: request});
+      expect(result.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/admediaBidAdapter_spec.js b/test/spec/modules/admediaBidAdapter_spec.js
deleted file mode 100644
index 5dc7b9a02a8..00000000000
--- a/test/spec/modules/admediaBidAdapter_spec.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/admediaBidAdapter.js';
-
-describe('admediaAdapterTests', function () {
-  describe('bidRequestValidity', function () {
-    it('bidRequest with aid', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'admedia',
-        params: {
-          aid: 86858,
-        }
-      })).to.equal(true);
-    });
-
-    it('bidRequest without aid', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'a4g',
-        params: {
-          key: 86858
-        }
-      })).to.equal(false);
-    });
-  });
-
-  describe('bidRequest', function () {
-    const validBidRequests = [{
-      'adUnitCode': 'div-gpt-ad-1460505748561-0',
-      'auctionId': 'e3010a3c-5b95-4475-9ba2-1b004c737c30',
-      'bidId': '2758de47c84ab58',
-      'bidRequestsCount': 1,
-      'bidder': 'admedia',
-      'bidderRequestId': '1033407c6af0c7',
-      'params': {
-        'aid': 86858,
-      },
-      'sizes': [[300, 250], [300, 600]],
-      'transactionId': '5851b2cf-ee2d-4022-abd2-d581ef01604e'
-    }, {
-      'adUnitCode': 'div-gpt-ad-1460505748561-1',
-      'auctionId': 'e3010a3c-5b95-4475-9ba2-1b004c737c30',
-      'bidId': '3d2aaa400371fa',
-      'bidRequestsCount': 1,
-      'bidder': 'admedia',
-      'bidderRequestId': '1033407c6af0c7',
-      'params': {
-        'aid': 84977,
-      },
-      'sizes': [[728, 90]],
-      'transactionId': 'f8b5247e-7715-4e60-9d51-33153e78c190'
-    }];
-
-    const bidderRequest = {
-      'auctionId': 'e3010a3c-5b95-4475-9ba2-1b004c737c30',
-      'bidderCode': 'admedia',
-      'bidderRequestId': '1033407c6af0c7',
-      'refererInfo': {
-        'numIframes': 0,
-        'reachedTop': true,
-        'referer': 'https://test.com/index.html?pbjs_debug=true'
-      }
-
-    };
-
-    const request = spec.buildRequests(validBidRequests, bidderRequest);
-
-    it('bidRequest method', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('bidRequest url', function () {
-      expect(request.url).to.equal('https://prebid.admedia.com/bidder/');
-    });
-
-    it('bidRequest data', function () {
-      const data = JSON.parse(request.data);
-      expect(decodeURIComponent(data.referer)).to.be.eql(bidderRequest.refererInfo.referer);
-      expect(data.tags).to.be.an('array');
-      expect(data.tags[0].aid).to.be.eql(validBidRequests[0].params.aid);
-      expect(data.tags[0].id).to.be.eql(validBidRequests[0].bidId);
-      expect(data.tags[0].sizes).to.be.eql(validBidRequests[0].sizes);
-      expect(data.tags[1].aid).to.be.eql(validBidRequests[1].params.aid);
-      expect(data.tags[1].id).to.be.eql(validBidRequests[1].bidId);
-      expect(data.tags[1].sizes).to.be.eql(validBidRequests[1].sizes);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const serverResponse = {
-      body: {
-        tags: [
-          {
-            ad: '<img src="https://dummyimage.com/300x600/000150/fff.jpg&text=Admedia">',
-            cpm: 0.9,
-            height: 250,
-            id: '5582180864bc41',
-            width: 300,
-          },
-          {
-            error: 'Error message',
-            id: '6dc6ee4e157749'
-          },
-          {
-            ad: '',
-            cpm: 0,
-            height: 728,
-            id: '5762180864bc41',
-            width: 90,
-          }
-        ]
-      },
-      headers: {}
-    };
-
-    const bidRequest = {};
-
-    const result = spec.interpretResponse(serverResponse, bidRequest);
-
-    it('Should return an empty array if empty or no tags in response', function () {
-      expect(spec.interpretResponse({body: ''}, {}).length).to.equal(0);
-    });
-
-    it('Should have only one bid', function () {
-      expect(result.length).to.equal(1);
-    });
-
-    it('Should have required keys', function () {
-      expect(result[0].requestId).to.be.eql(serverResponse.body.tags[0].id);
-      expect(result[0].cpm).to.be.eql(serverResponse.body.tags[0].cpm);
-      expect(result[0].width).to.be.eql(serverResponse.body.tags[0].width);
-      expect(result[0].height).to.be.eql(serverResponse.body.tags[0].height);
-      expect(result[0].creativeId).to.be.eql(serverResponse.body.tags[0].id);
-      expect(result[0].dealId).to.be.eql(serverResponse.body.tags[0].id);
-      expect(result[0].netRevenue).to.be.eql(true);
-      expect(result[0].ttl).to.be.eql(120);
-      expect(result[0].ad).to.be.eql(serverResponse.body.tags[0].ad);
-    })
-  });
-});
diff --git a/test/spec/modules/admixerBidAdapter_spec.js b/test/spec/modules/admixerBidAdapter_spec.js
index 6d2e3059dc8..228b87ae4d5 100644
--- a/test/spec/modules/admixerBidAdapter_spec.js
+++ b/test/spec/modules/admixerBidAdapter_spec.js
@@ -1,9 +1,11 @@
 import {expect} from 'chai';
 import {spec} from 'modules/admixerBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import {config} from '../../../src/config.js';
 
 const BIDDER_CODE = 'admixer';
-const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.0.aspx';
+const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.2.aspx';
+const ENDPOINT_URL_CUSTOM = 'https://custom.admixer.net/prebid.aspx';
 const ZONE_ID = '2eb6bd58-865c-47ce-af7f-a918108c3fd2';
 
 describe('AdmixerAdapter', function () {
@@ -57,14 +59,15 @@ describe('AdmixerAdapter', function () {
       }
     ];
     let bidderRequest = {
+      bidderCode: BIDDER_CODE,
       refererInfo: {
-        referer: 'https://example.com'
+        page: 'https://example.com'
       }
     };
 
     it('should add referrer and imp to be equal bidRequest', function () {
       const request = spec.buildRequests(validRequest, bidderRequest);
-      const payload = JSON.parse(request.data.substr(5));
+      const payload = request.data;
       expect(payload.referrer).to.not.be.undefined;
       expect(payload.imps[0]).to.deep.equal(validRequest[0]);
     });
@@ -72,39 +75,54 @@ describe('AdmixerAdapter', function () {
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(validRequest, bidderRequest);
       expect(request.url).to.equal(ENDPOINT_URL);
-      expect(request.method).to.equal('GET');
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to CUSTOM_ENDPOINT via GET', function () {
+      config.setBidderConfig({
+        bidders: [BIDDER_CODE], // one or more bidders
+        config: {[BIDDER_CODE]: {endpoint_url: ENDPOINT_URL_CUSTOM}}
+      });
+      const request = config.runWithBidder(BIDDER_CODE, () => spec.buildRequests(validRequest, bidderRequest));
+      expect(request.url).to.equal(ENDPOINT_URL_CUSTOM);
+      expect(request.method).to.equal('POST');
     });
   });
 
   describe('interpretResponse', function () {
     let response = {
-      body: [{
-        'currency': 'USD',
-        'cpm': 6.210000,
-        'ad': '<div>ad</div>',
-        'width': 300,
-        'height': 600,
-        'creativeId': 'ccca3e5e-0c54-4761-9667-771322fbdffc',
-        'ttl': 360,
-        'netRevenue': false,
-        'bidId': '5e4e763b6bc60b'
-      }]
+      body: {
+        ads: [{
+          'currency': 'USD',
+          'cpm': 6.210000,
+          'ad': '<div>ad</div>',
+          'width': 300,
+          'height': 600,
+          'creativeId': 'ccca3e5e-0c54-4761-9667-771322fbdffc',
+          'ttl': 360,
+          'netRevenue': false,
+          'requestId': '5e4e763b6bc60b',
+          'dealId': 'asd123',
+          'meta': {'advertiserId': 123, 'networkId': 123, 'advertiserDomains': ['test.com']}
+        }]
+      }
     };
 
     it('should get correct bid response', function () {
-      const body = response.body;
+      const ads = response.body.ads;
       let expectedResponse = [
         {
-          'requestId': body[0].bidId,
-          'cpm': body[0].cpm,
-          'creativeId': body[0].creativeId,
-          'width': body[0].width,
-          'height': body[0].height,
-          'ad': body[0].ad,
-          'vastUrl': undefined,
-          'currency': body[0].currency,
-          'netRevenue': body[0].netRevenue,
-          'ttl': body[0].ttl,
+          'requestId': ads[0].requestId,
+          'cpm': ads[0].cpm,
+          'creativeId': ads[0].creativeId,
+          'width': ads[0].width,
+          'height': ads[0].height,
+          'ad': ads[0].ad,
+          'currency': ads[0].currency,
+          'netRevenue': ads[0].netRevenue,
+          'ttl': ads[0].ttl,
+          'dealId': ads[0].dealId,
+          'meta': {'advertiserId': 123, 'networkId': 123, 'advertiserDomains': ['test.com']}
         }
       ];
 
@@ -119,4 +137,34 @@ describe('AdmixerAdapter', function () {
       expect(result.length).to.equal(0);
     });
   });
+
+  describe('getUserSyncs', function () {
+    let imgUrl = 'https://example.com/img1';
+    let frmUrl = 'https://example.com/frm2';
+    let responses = [{
+      body: {
+        cm: {
+          pixels: [
+            imgUrl
+          ],
+          iframes: [
+            frmUrl
+          ],
+        }
+      }
+    }];
+
+    it('Returns valid values', function () {
+      let userSyncAll = spec.getUserSyncs({pixelEnabled: true, iframeEnabled: true}, responses);
+      let userSyncImg = spec.getUserSyncs({pixelEnabled: true, iframeEnabled: false}, responses);
+      let userSyncFrm = spec.getUserSyncs({pixelEnabled: false, iframeEnabled: true}, responses);
+      expect(userSyncAll).to.be.an('array').with.lengthOf(2);
+      expect(userSyncImg).to.be.an('array').with.lengthOf(1);
+      expect(userSyncImg[0].url).to.be.equal(imgUrl);
+      expect(userSyncImg[0].type).to.be.equal('image');
+      expect(userSyncFrm).to.be.an('array').with.lengthOf(1);
+      expect(userSyncFrm[0].url).to.be.equal(frmUrl);
+      expect(userSyncFrm[0].type).to.be.equal('iframe');
+    });
+  });
 });
diff --git a/test/spec/modules/admixerIdSystem_spec.js b/test/spec/modules/admixerIdSystem_spec.js
new file mode 100644
index 00000000000..18107b780db
--- /dev/null
+++ b/test/spec/modules/admixerIdSystem_spec.js
@@ -0,0 +1,81 @@
+import {admixerIdSubmodule} from 'modules/admixerIdSystem.js';
+import * as utils from 'src/utils.js';
+import {server} from 'test/mocks/xhr.js';
+import {getStorageManager} from '../../../src/storageManager.js';
+
+export const storage = getStorageManager();
+
+const pid = '4D393FAC-B6BB-4E19-8396-0A4813607316';
+const getIdParams = {params: {pid: pid}};
+describe('admixerId tests', function () {
+  let logErrorStub;
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+  });
+
+  it('should log an error if pid configParam was not passed when getId', function () {
+    admixerIdSubmodule.getId();
+    expect(logErrorStub.callCount).to.be.equal(1);
+
+    admixerIdSubmodule.getId({});
+    expect(logErrorStub.callCount).to.be.equal(2);
+
+    admixerIdSubmodule.getId({params: {}});
+    expect(logErrorStub.callCount).to.be.equal(3);
+
+    admixerIdSubmodule.getId({params: {pid: 123}});
+    expect(logErrorStub.callCount).to.be.equal(4);
+  });
+
+  it('should NOT call the admixer id endpoint if gdpr applies but consent string is missing', function () {
+    let submoduleCallback = admixerIdSubmodule.getId(getIdParams, { gdprApplies: true });
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should call the admixer id endpoint', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = admixerIdSubmodule.getId(getIdParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://inv-nets.admixer.net/cntcm.aspx?ssp=${pid}`);
+    request.respond(
+      200,
+      {},
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call callback with user id', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = admixerIdSubmodule.getId(getIdParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://inv-nets.admixer.net/cntcm.aspx?ssp=${pid}`);
+    request.respond(
+      200,
+      {},
+      JSON.stringify({setData: {visitorid: '571058d70bce453b80e6d98b4f8a81e3'}})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.eq('571058d70bce453b80e6d98b4f8a81e3');
+  });
+
+  it('should continue to callback if ajax response 204', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = admixerIdSubmodule.getId(getIdParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://inv-nets.admixer.net/cntcm.aspx?ssp=${pid}`);
+    request.respond(
+      204
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.undefined;
+  });
+});
diff --git a/test/spec/modules/adnowBidAdapter_spec.js b/test/spec/modules/adnowBidAdapter_spec.js
new file mode 100644
index 00000000000..a8013e3fa04
--- /dev/null
+++ b/test/spec/modules/adnowBidAdapter_spec.js
@@ -0,0 +1,163 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adnowBidAdapter.js';
+
+describe('adnowBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    it('Should return true', function() {
+      expect(spec.isBidRequestValid({
+        bidder: 'adnow',
+        params: {
+          codeId: 12345
+        }
+      })).to.equal(true);
+    });
+
+    it('Should return false when required params is not passed', function() {
+      expect(spec.isBidRequestValid({
+        bidder: 'adnow',
+        params: {}
+      })).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function() {
+    it('Common settings', function() {
+      const bidRequestData = [{
+        bidId: 'bid12345',
+        params: {
+          codeId: 12345
+        }
+      }];
+
+      const req = spec.buildRequests(bidRequestData);
+      const reqData = req[0].data;
+
+      expect(reqData)
+        .to.match(/Id=12345/)
+        .to.match(/mediaType=native/)
+        .to.match(/out=prebid/)
+        .to.match(/requestid=bid12345/)
+        .to.match(/d_user_agent=.+/);
+    });
+
+    it('Banner sizes', function () {
+      const bidRequestData = [{
+        bidId: 'bid12345',
+        params: {
+          codeId: 12345
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        }
+      }];
+
+      const req = spec.buildRequests(bidRequestData);
+      const reqData = req[0].data;
+
+      expect(reqData).to.match(/sizes=300x250/);
+    });
+
+    it('Native sizes', function () {
+      const bidRequestData = [{
+        bidId: 'bid12345',
+        params: {
+          codeId: 12345
+        },
+        mediaTypes: {
+          native: {
+            image: {
+              sizes: [100, 100]
+            }
+          }
+        }
+      }];
+
+      const req = spec.buildRequests(bidRequestData);
+      const reqData = req[0].data;
+
+      expect(reqData)
+        .to.match(/width=100/)
+        .to.match(/height=100/);
+    });
+  });
+
+  describe('interpretResponse', function() {
+    const request = {
+      bidRequest: {
+        bidId: 'bid12345'
+      }
+    };
+
+    it('Response with native bid', function() {
+      const response = {
+        currency: 'USD',
+        cpm: 0.5,
+        native: {
+          title: 'Title',
+          body: 'Body',
+          sponsoredBy: 'AdNow',
+          clickUrl: '//click.url',
+          image: {
+            url: '//img.url',
+            height: 200,
+            width: 200
+          }
+        },
+        meta: {
+          mediaType: 'native'
+        }
+      };
+
+      const bids = spec.interpretResponse({ body: response }, request);
+      expect(bids).to.be.an('array').that.is.not.empty;
+
+      const bid = bids[0];
+      expect(bid).to.have.keys('requestId', 'cpm', 'currency', 'native', 'creativeId', 'netRevenue', 'meta', 'ttl');
+
+      const nativePart = bid.native;
+
+      expect(nativePart.title).to.be.equal('Title');
+      expect(nativePart.body).to.be.equal('Body');
+      expect(nativePart.clickUrl).to.be.equal('//click.url');
+      expect(nativePart.image.url).to.be.equal('//img.url');
+      expect(nativePart.image.height).to.be.equal(200);
+      expect(nativePart.image.width).to.be.equal(200);
+    });
+
+    it('Response with banner bid', function() {
+      const response = {
+        currency: 'USD',
+        cpm: 0.5,
+        ad: '<div>Banner</div>',
+        meta: {
+          mediaType: 'banner'
+        }
+      };
+
+      const bids = spec.interpretResponse({ body: response }, request);
+      expect(bids).to.be.an('array').that.is.not.empty;
+
+      const bid = bids[0];
+      expect(bid).to.have.keys(
+        'requestId', 'cpm', 'currency', 'ad', 'creativeId', 'netRevenue', 'meta', 'ttl', 'width', 'height'
+      );
+
+      expect(bid.ad).to.be.equal('<div>Banner</div>');
+    });
+
+    it('Response with no bid should return an empty array', function() {
+      const noBidResponses = [
+        false,
+        {},
+        {body: false},
+        {body: {}}
+      ];
+
+      noBidResponses.forEach(response => {
+        return expect(spec.interpretResponse(response, request)).to.be.an('array').that.is.empty;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/adnuntiusBidAdapter_spec.js b/test/spec/modules/adnuntiusBidAdapter_spec.js
index 54ff038c083..ee585862800 100644
--- a/test/spec/modules/adnuntiusBidAdapter_spec.js
+++ b/test/spec/modules/adnuntiusBidAdapter_spec.js
@@ -2,27 +2,121 @@
 import { expect } from 'chai'; // may prefer 'assert' in place of 'expect'
 import { spec } from 'modules/adnuntiusBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import * as utils from 'src/utils.js';
+import { getStorageManager } from 'src/storageManager.js';
 
 describe('adnuntiusBidAdapter', function () {
-  const ENDPOINT_URL = 'https://delivery.adnuntius.com/i?tzo=-60&format=json';
+  const URL = 'https://ads.adnuntius.delivery/i?tzo=';
+  const GVLID = 855;
+  const usi = utils.generateUUID()
+  const meta = [{ key: 'usi', value: usi }]
+
+  before(() => {
+    const storage = getStorageManager({ gvlid: GVLID, moduleName: 'adnuntius' })
+    storage.setDataInLocalStorage('adn.metaData', JSON.stringify(meta))
+  });
+
+  beforeEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      adnuntius: {
+        storageAllowed: true
+      }
+    };
+  });
+
+  afterEach(function () {
+    config.resetConfig();
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+  });
+
+  const tzo = new Date().getTimezoneOffset();
+  const ENDPOINT_URL = `${URL}${tzo}&format=json&userId=${usi}`;
+  const ENDPOINT_URL_VIDEO = `${URL}${tzo}&format=json&userId=${usi}&tt=vast4`;
+  const ENDPOINT_URL_NOCOOKIE = `${URL}${tzo}&format=json&userId=${usi}&noCookies=true`;
+  const ENDPOINT_URL_SEGMENTS = `${URL}${tzo}&format=json&segments=segment1,segment2,segment3&userId=${usi}`;
+  const ENDPOINT_URL_CONSENT = `${URL}${tzo}&format=json&consentString=consentString&userId=${usi}`;
   const adapter = newBidder(spec);
-  const bidRequests = [
+
+  const bidderRequests = [
     {
+      bidId: '123',
       bidder: 'adnuntius',
       params: {
         auId: '8b6bc',
         network: 'adnuntius',
       },
-      bidId: '123'
+      mediaTypes: {
+        banner: {
+          sizes: [[640, 480], [600, 400]],
+        }
+      },
     }
-  ];
+  ]
+
+  const videoBidderRequest = [
+    {
+      bidId: '123',
+      bidder: 'adnuntius',
+      params: {
+        auId: '8b6bc',
+        network: 'adnuntius',
+      },
+      mediaTypes: {
+        video: {
+          playerSize: [640, 480],
+          context: 'instream'
+        }
+      },
+    }
+  ]
+
+  const nativeBidderRequest = [
+    {
+      bidId: '123',
+      bidder: 'adnuntius',
+      params: {
+        auId: '8b6bc',
+        network: 'adnuntius',
+      },
+      mediaTypes: {
+        native: {
+          title: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          body: {
+            required: true
+          }
+        }
+      },
+    }
+  ]
+
+  const singleBidRequest = {
+    bid: [
+      {
+        bidId: '123',
+      }
+    ]
+  }
+
+  const videoBidRequest = {
+    bid: videoBidderRequest
+  }
+
+  const nativeBidRequest = {
+    bid: nativeBidderRequest
+  }
 
   const serverResponse = {
     body: {
       'adUnits': [
         {
           'auId': '000000000008b6bc',
-          'targetId': '',
+          'targetId': '123',
           'html': '<h1>hi!</h1>',
           'matchedAdCount': 1,
           'responseId': 'adn-rsp-1460129238',
@@ -67,8 +161,155 @@ describe('adnuntiusBidAdapter', function () {
               'lineItemId': 'scyjdyv3mzgdsnpf',
               'layoutId': 'sw6gtws2rdj1kwby',
               'layoutName': 'Responsive image'
-            }
+            },
+
+          ]
+        },
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '456',
+          'matchedAdCount': 0,
+          'responseId': 'adn-rsp-1460129238',
+        }
+      ]
+    }
+  }
+  const serverVideoResponse = {
+    body: {
+      'adUnits': [
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '123',
+          'html': '<h1>hi!</h1>',
+          'matchedAdCount': 1,
+          'responseId': 'adn-rsp-1460129238',
+          'ads': [
+            {
+              'destinationUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fc%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN%3Fct%3D2501%26r%3Dhttp%253A%252F%252Fgoogle.com',
+              'assets': {
+                'image': {
+                  'cdnId': 'https://assets.adnuntius.com/oEmZa5uYjxENfA1R692FVn6qIveFpO8wUbpyF2xSOCc.jpg',
+                  'width': '980',
+                  'height': '120'
+                }
+              },
+              'clickUrl': 'https://delivery.adnuntius.com/c/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'urls': {
+                'destination': 'https://delivery.adnuntius.com/c/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN?ct=2501&r=http%3A%2F%2Fgoogle.com'
+              },
+              'urlsEsc': {
+                'destination': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fc%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN%3Fct%3D2501%26r%3Dhttp%253A%252F%252Fgoogle.com'
+              },
+              'destinationUrls': {
+                'destination': 'http://google.com'
+              },
+              'cpm': { 'amount': 5.0, 'currency': 'NOK' },
+              'bid': { 'amount': 0.005, 'currency': 'NOK' },
+              'cost': { 'amount': 0.005, 'currency': 'NOK' },
+              'impressionTrackingUrls': [],
+              'impressionTrackingUrlsEsc': [],
+              'adId': 'adn-id-1347343135',
+              'selectedColumn': '0',
+              'selectedColumnPosition': '0',
+              'renderedPixel': 'https://delivery.adnuntius.com/b/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN.html',
+              'renderedPixelEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fb%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN.html',
+              'visibleUrl': 'https://delivery.adnuntius.com/s?rt=52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'visibleUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fs%3Frt%3D52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'viewUrl': 'https://delivery.adnuntius.com/v?rt=52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'viewUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fv%3Frt%3D52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'rt': '52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'creativeWidth': '980',
+              'creativeHeight': '120',
+              'creativeId': 'wgkq587vgtpchsx1',
+              'lineItemId': 'scyjdyv3mzgdsnpf',
+              'layoutId': 'sw6gtws2rdj1kwby',
+              'layoutName': 'Responsive image'
+            },
+
+          ]
+        },
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '456',
+          'matchedAdCount': 0,
+          'responseId': 'adn-rsp-1460129238',
+        }
+      ]
+    }
+  }
+  const serverNativeResponse = {
+    body: {
+      'adUnits': [
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '123',
+          'html': '<h1>hi!</h1>',
+          'matchedAdCount': 1,
+          'responseId': 'adn-rsp-1460129238',
+          'ads': [
+            {
+              'destinationUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fc%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN%3Fct%3D2501%26r%3Dhttp%253A%252F%252Fgoogle.com',
+              'assets': {
+                'image': {
+                  'cdnId': 'https://assets.adnuntius.com/K9rfXC6wJvgVuy4Fbt5P8oEEGXme9ZaP8BNDzz3OMGQ.jpg',
+                  'width': '300',
+                  'height': '250'
+                }
+              },
+              'text': {
+                'body': {
+                  'content': 'Testing Native ad from Adnuntius',
+                  'length': '32',
+                  'minLength': '0',
+                  'maxLength': '100'
+                },
+                'title': {
+                  'content': 'Native Ad',
+                  'length': '9',
+                  'minLength': '5',
+                  'maxLength': '100'
+                }
+              },
+              'clickUrl': 'https://delivery.adnuntius.com/c/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'urls': {
+                'destination': 'https://delivery.adnuntius.com/c/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN?ct=2501&r=http%3A%2F%2Fgoogle.com'
+              },
+              'urlsEsc': {
+                'destination': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fc%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN%3Fct%3D2501%26r%3Dhttp%253A%252F%252Fgoogle.com'
+              },
+              'destinationUrls': {
+                'destination': 'http://google.com'
+              },
+              'cpm': { 'amount': 5.0, 'currency': 'NOK' },
+              'bid': { 'amount': 0.005, 'currency': 'NOK' },
+              'cost': { 'amount': 0.005, 'currency': 'NOK' },
+              'impressionTrackingUrls': [],
+              'impressionTrackingUrlsEsc': [],
+              'adId': 'adn-id-1347343135',
+              'selectedColumn': '0',
+              'selectedColumnPosition': '0',
+              'renderedPixel': 'https://delivery.adnuntius.com/b/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN.html',
+              'renderedPixelEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fb%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN.html',
+              'visibleUrl': 'https://delivery.adnuntius.com/s?rt=52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'visibleUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fs%3Frt%3D52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'viewUrl': 'https://delivery.adnuntius.com/v?rt=52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'viewUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fv%3Frt%3D52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'rt': '52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'creativeWidth': '980',
+              'creativeHeight': '120',
+              'creativeId': 'wgkq587vgtpchsx1',
+              'lineItemId': 'scyjdyv3mzgdsnpf',
+              'layoutId': 'sw6gtws2rdj1kwby',
+              'layoutName': 'Responsive image'
+            },
+
           ]
+        },
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '456',
+          'matchedAdCount': 0,
+          'responseId': 'adn-rsp-1460129238',
         }
       ]
     }
@@ -82,13 +323,13 @@ describe('adnuntiusBidAdapter', function () {
 
   describe('isBidRequestValid', function () {
     it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bidRequests[0])).to.equal(true);
+      expect(spec.isBidRequestValid(bidderRequests[0])).to.equal(true);
     });
   });
 
   describe('buildRequests', function () {
     it('Test requests', function () {
-      const request = spec.buildRequests(bidRequests);
+      const request = spec.buildRequests(bidderRequests, {});
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('bid');
       const bid = request[0].bid[0]
@@ -96,24 +337,215 @@ describe('adnuntiusBidAdapter', function () {
       expect(request[0]).to.have.property('url');
       expect(request[0].url).to.equal(ENDPOINT_URL);
       expect(request[0]).to.have.property('data');
-      expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\"}]}');
+      expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\",\"targetId\":\"123\",\"dimensions\":[[640,480],[600,400]]}],\"metaData\":{\"usi\":\"' + usi + '\"}}');
+    });
+
+    it('Test Video requests', function () {
+      const request = spec.buildRequests(videoBidderRequest, {});
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('bid');
+      const bid = request[0].bid[0]
+      expect(bid).to.have.property('bidId');
+      expect(request[0]).to.have.property('url');
+      expect(request[0].url).to.equal(ENDPOINT_URL_VIDEO);
+    });
+
+    it('should pass segments if available in config', function () {
+      const ortb2 = {
+        user: {
+          data: [{
+            name: 'adnuntius',
+            segment: [{ id: 'segment1' }, { id: 'segment2' }]
+          },
+          {
+            name: 'other',
+            segment: ['segment3']
+          }],
+        }
+      };
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
+    });
+
+    it('should skip segments in config if not either id or array of strings', function () {
+      const ortb2 = {
+        user: {
+          data: [{
+            name: 'adnuntius',
+            segment: [{ id: 'segment1' }, { id: 'segment2' }, { id: 'segment3' }]
+          },
+          {
+            name: 'other',
+            segment: [{
+              notright: 'segment4'
+            }]
+          }],
+        }
+      };
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
+    });
+  });
+
+  describe('user privacy', function () {
+    it('should send GDPR Consent data if gdprApplies', function () {
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: true, consentString: 'consentString' } });
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL_CONSENT);
+    });
+
+    it('should not send GDPR Consent data if gdprApplies equals undefined', function () {
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: undefined, consentString: 'consentString' } });
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+    });
+
+    it('should pass segments if available in config', function () {
+      const ortb2 = {
+        user: {
+          data: [{
+            name: 'adnuntius',
+            segment: [{ id: 'segment1' }, { id: 'segment2' }]
+          },
+          {
+            name: 'other',
+            segment: ['segment3']
+          }],
+        }
+      }
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
+    });
+
+    it('should skip segments in config if not either id or array of strings', function () {
+      const ortb2 = {
+        user: {
+          data: [{
+            name: 'adnuntius',
+            segment: [{ id: 'segment1' }, { id: 'segment2' }, { id: 'segment3' }]
+          },
+          {
+            name: 'other',
+            segment: [{
+              notright: 'segment4'
+            }]
+          }],
+        }
+      };
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
+    });
+
+    it('should user user ID if present in ortb2.user.id field', function () {
+      const ortb2 = {
+        user: {
+          id: usi
+        }
+      };
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+    });
+  });
+
+  describe('user privacy', function () {
+    it('should send GDPR Consent data if gdprApplies', function () {
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: true, consentString: 'consentString' } });
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL_CONSENT);
+    });
+
+    it('should not send GDPR Consent data if gdprApplies equals undefined', function () {
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: undefined, consentString: 'consentString' } });
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+    });
+  });
+
+  describe('use cookie', function () {
+    it('should send noCookie in url if set to false.', function () {
+      config.setBidderConfig({
+        bidders: ['adnuntius'],
+        config: {
+          useCookie: false
+        }
+      });
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, {}));
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('url')
+      expect(request[0].url).to.equal(ENDPOINT_URL_NOCOOKIE);
     });
   });
 
   describe('interpretResponse', function () {
     it('should return valid response when passed valid server response', function () {
-      const request = spec.buildRequests(bidRequests);
-      const interpretedResponse = spec.interpretResponse(serverResponse, request[0]);
+      const interpretedResponse = spec.interpretResponse(serverResponse, singleBidRequest);
       const ad = serverResponse.body.adUnits[0].ads[0]
       expect(interpretedResponse).to.have.lengthOf(1);
       expect(interpretedResponse[0].cpm).to.equal(ad.cpm.amount);
       expect(interpretedResponse[0].width).to.equal(Number(ad.creativeWidth));
       expect(interpretedResponse[0].height).to.equal(Number(ad.creativeHeight));
       expect(interpretedResponse[0].creativeId).to.equal(ad.creativeId);
-      expect(interpretedResponse[0].currency).to.equal(ad.cpm.currency);
+      expect(interpretedResponse[0].currency).to.equal(ad.bid.currency);
       expect(interpretedResponse[0].netRevenue).to.equal(false);
+      expect(interpretedResponse[0].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[0].meta.advertiserDomains).to.have.lengthOf(1);
+      expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal('google.com');
       expect(interpretedResponse[0].ad).to.equal(serverResponse.body.adUnits[0].html);
       expect(interpretedResponse[0].ttl).to.equal(360);
     });
   });
+  describe('interpretVideoResponse', function () {
+    it('should return valid response when passed valid server response', function () {
+      const interpretedResponse = spec.interpretResponse(serverVideoResponse, videoBidRequest);
+      const ad = serverVideoResponse.body.adUnits[0].ads[0]
+      expect(interpretedResponse).to.have.lengthOf(1);
+      expect(interpretedResponse[0].cpm).to.equal(ad.cpm.amount);
+      expect(interpretedResponse[0].width).to.equal(Number(ad.creativeWidth));
+      expect(interpretedResponse[0].height).to.equal(Number(ad.creativeHeight));
+      expect(interpretedResponse[0].creativeId).to.equal(ad.creativeId);
+      expect(interpretedResponse[0].currency).to.equal(ad.bid.currency);
+      expect(interpretedResponse[0].netRevenue).to.equal(false);
+      expect(interpretedResponse[0].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[0].meta.advertiserDomains).to.have.lengthOf(1);
+      expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal('google.com');
+      expect(interpretedResponse[0].vastXml).to.equal(serverVideoResponse.body.adUnits[0].vastXml);
+    });
+  });
+  describe('interpretNativeResponse', function () {
+    it('should return valid response when passed valid server response', function () {
+      const interpretedResponse = spec.interpretResponse(serverNativeResponse, nativeBidRequest);
+      const ad = serverNativeResponse.body.adUnits[0].ads[0]
+      expect(interpretedResponse).to.have.lengthOf(1);
+      expect(interpretedResponse[0].cpm).to.equal(ad.cpm.amount);
+      expect(interpretedResponse[0].width).to.equal(Number(ad.creativeWidth));
+      expect(interpretedResponse[0].height).to.equal(Number(ad.creativeHeight));
+      expect(interpretedResponse[0].creativeId).to.equal(ad.creativeId);
+      expect(interpretedResponse[0].currency).to.equal(ad.bid.currency);
+      expect(interpretedResponse[0].netRevenue).to.equal(false);
+      expect(interpretedResponse[0].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[0].meta.advertiserDomains).to.have.lengthOf(1);
+      expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal('google.com');
+      expect(interpretedResponse[0].native.body).to.equal(serverNativeResponse.body.adUnits[0].ads[0].text.body.content);
+    });
+  });
 });
diff --git a/test/spec/modules/adnuntiusRtdProvider_spec.js b/test/spec/modules/adnuntiusRtdProvider_spec.js
new file mode 100644
index 00000000000..c1fcfbf298f
--- /dev/null
+++ b/test/spec/modules/adnuntiusRtdProvider_spec.js
@@ -0,0 +1,145 @@
+import { adnuntiusSubmodule } from 'modules/adnuntiusRtdProvider.js';
+import { expect } from 'chai';
+import { server } from 'test/mocks/xhr.js';
+import { config as _config } from 'src/config.js';
+
+const responseHeader = { 'Content-Type': 'application/json' };
+
+describe('adnuntiusRtdProvider is a RTD provider that', function () {
+  describe('has a method `init` that', function () {
+    it('exists', function () {
+      expect(adnuntiusSubmodule.init).to.be.a('function');
+    });
+    it('returns false missing config params', function () {
+      const config = {
+        name: 'adnuntius',
+        waitForIt: true,
+      };
+      const value = adnuntiusSubmodule.init(config);
+      expect(value).to.equal(false);
+    });
+    it('returns false if missing providers param', function () {
+      const config = {
+        name: 'adnuntius',
+        waitForIt: true,
+        params: {}
+      };
+      const value = adnuntiusSubmodule.init(config);
+      expect(value).to.equal(false);
+    });
+    it('returns true if providers param included', function () {
+      const config = {
+        name: 'adnuntius',
+        waitForIt: true,
+        params: {
+          providers: []
+        }
+      };
+      const value = adnuntiusSubmodule.init(config);
+      expect(value).to.equal(true);
+    });
+  });
+
+  describe('has a method `getBidRequestData` that', function () {
+    it('exists', function () {
+      expect(adnuntiusSubmodule.getBidRequestData).to.be.a('function');
+    });
+    it('verify config params', function () {
+      expect(config.name).to.not.be.undefined;
+      expect(config.name).to.equal('adnuntius');
+      expect(config.params.providers).to.not.be.undefined;
+      expect(config.params).to.have.property('providers');
+      expect(config.params.providers[0]).to.have.property('siteId')
+      expect(config.params.providers[0]).to.have.property('userId')
+    });
+
+    it('send correct request', function () {
+      const callback = sinon.spy();
+      let request;
+      const adUnitsOriginal = adUnits;
+      adnuntiusSubmodule.getBidRequestData({ adUnits: adUnits }, callback, config);
+      request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(data));
+      expect(request.url).to.be.include(`&s=site123&browserId=mike`);
+      expect(adUnits).to.length(2);
+      expect(adUnits[0]).to.be.eq(adUnitsOriginal[0]);
+    });
+  });
+
+  describe('has a method `setGlobalConfig` that', function () {
+    it('exists', function () {
+      expect(adnuntiusSubmodule.setGlobalConfig).to.be.a('function');
+    });
+
+    it('sets global config', function () {
+      adnuntiusSubmodule.setGlobalConfig(config, concatSegments);
+      const globalConfig = _config.getBidderConfig()
+      expect(globalConfig).to.have.property('adnuntius')
+      expect(globalConfig.adnuntius).to.have.property('ortb2')
+      expect(globalConfig.adnuntius.ortb2).to.have.property('user')
+      expect(globalConfig.adnuntius.ortb2.user).to.have.property('data')
+      expect(globalConfig.adnuntius.ortb2.user.data).to.be.a('array')
+      expect(globalConfig.adnuntius.ortb2.user.data[0]).to.have.property('name')
+      expect(globalConfig.adnuntius.ortb2.user.data[0].name).to.equal('adnuntius')
+      expect(globalConfig.adnuntius.ortb2.user.data[0]).to.have.property('segment')
+      expect(globalConfig.adnuntius.ortb2.user.data[0].segment).to.be.a('array')
+      expect(globalConfig.adnuntius.ortb2.user.data[0].segment[0]).to.have.property('id')
+      expect(globalConfig.adnuntius.ortb2.user.data[0].segment[0].id).to.equal('segment2')
+    });
+  });
+});
+
+const config = {
+  name: 'adnuntius',
+  waitForIt: true,
+  params: {
+    bidders: ['adnuntius'],
+    providers: [{
+      siteId: 'site123',
+      userId: 'mike'
+    }]
+  }
+};
+
+const adUnits = [
+  {
+    code: 'one-div-id',
+    mediaTypes: {
+      banner: {
+        sizes: [970, 250]
+      }
+    },
+    bids: [
+      {
+        bidder: 'appnexus',
+        params: {
+          placementId: 12345370,
+        }
+      }]
+  },
+  {
+    code: 'two-div-id',
+    mediaTypes: {
+      banner: { sizes: [300, 250] }
+    },
+    bids: [
+      {
+        bidder: 'appnexus',
+        params: {
+          placementId: 12345370,
+        }
+      }]
+  }];
+
+const data = {
+  'expiryEpochMillis': 1640165064285,
+  'segments': [
+    'segment2',
+    'segment1'
+  ]
+};
+
+const concatSegments = [
+  { id: 'segment2' },
+  { id: 'segment1' },
+]
diff --git a/test/spec/modules/adoceanBidAdapter_spec.js b/test/spec/modules/adoceanBidAdapter_spec.js
index 2b4b7d711e1..080b5bd5d1d 100644
--- a/test/spec/modules/adoceanBidAdapter_spec.js
+++ b/test/spec/modules/adoceanBidAdapter_spec.js
@@ -83,6 +83,20 @@ describe('AdoceanAdapter', function () {
         'auctionId': '1d1a030790a475',
       }
     ];
+    const schainExample = {
+      'schain': {
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'directseller.com',
+            sid: '00001!,2',
+            rid: 'BidRequest1',
+            hp: 1
+          }
+        ]
+      }
+    };
 
     const bidderRequest = {
       gdprConsent: {
@@ -122,10 +136,12 @@ describe('AdoceanAdapter', function () {
       expect(request.url).to.include('gdpr_consent=' + bidderRequest.gdprConsent.consentString);
     });
 
-    it('should attach sizes information to url', function () {
+    it('should attach sizes and slaves information to url', function () {
       let requests = spec.buildRequests(bidRequests, bidderRequest);
       expect(requests[0].url).to.include('aosspsizes=myaozpniqismex~300x250_300x600');
+      expect(requests[0].url).to.include('slaves=zpniqismex');
       expect(requests[1].url).to.include('aosspsizes=myaozpniqismex~300x200_600x250');
+      expect(requests[1].url).to.include('slaves=zpniqismex');
 
       const differentSlavesBids = deepClone(bidRequests);
       differentSlavesBids[1].params.slaveId = 'adoceanmyaowafpdwlrks';
@@ -133,8 +149,19 @@ describe('AdoceanAdapter', function () {
       expect(requests.length).to.equal(1);
       expect(requests[0].url).to.include('aosspsizes=myaozpniqismex~300x250_300x600-myaowafpdwlrks~300x200_600x250');
       expect((requests[0].url.match(/aosspsizes=/g) || []).length).to.equal(1);
+      expect(requests[0].url).to.include('slaves=zpniqismex,wafpdwlrks');
     });
-  })
+
+    it('should attach schain parameter if available', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests.some(e => e.url.includes('schain='))).to.be.false;
+
+      const bidsWithSchain = deepClone(bidRequests).map(e => ({...e, ...schainExample}));
+      requests = spec.buildRequests(bidsWithSchain, bidderRequest);
+      expect(requests.every(e => e.url.includes('schain=1.0,1!directseller.com,00001%21%2C2,1,BidRequest1,,,0')),
+        `One of urls does not contain valid schain param: ${requests.map(e => e.url).join('\n')}`).to.be.true;
+    });
+  });
 
   describe('interpretResponse', function () {
     const response = {
@@ -150,7 +177,8 @@ describe('AdoceanAdapter', function () {
           'width': '300',
           'height': '250',
           'crid': '0af345b42983cc4bc0',
-          'ttl': '300'
+          'ttl': '300',
+          'adomain': ['adocean.pl']
         }
       ],
       'headers': {
@@ -186,7 +214,10 @@ describe('AdoceanAdapter', function () {
           'ad': '<!-- Creative -->',
           'creativeId': '0af345b42983cc4bc0',
           'ttl': 300,
-          'netRevenue': false
+          'netRevenue': false,
+          'meta': {
+            'advertiserDomains': ['adocean.pl']
+          }
         }
       ];
 
@@ -197,6 +228,8 @@ describe('AdoceanAdapter', function () {
       resultKeys.forEach(function(k) {
         if (k === 'ad') {
           expect(result[0][k]).to.match(/<!-- Creative -->$/);
+        } else if (k === 'meta') {
+          expect(result[0][k]).to.deep.equal(expectedResponse[0][k]);
         } else {
           expect(result[0][k]).to.equal(expectedResponse[0][k]);
         }
diff --git a/test/spec/modules/adomikAnalyticsAdapter_spec.js b/test/spec/modules/adomikAnalyticsAdapter_spec.js
index 1414b2402b9..d872d6f8e08 100644
--- a/test/spec/modules/adomikAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adomikAnalyticsAdapter_spec.js
@@ -1,5 +1,6 @@
 import adomikAnalytics from 'modules/adomikAnalyticsAdapter.js';
-import {expect} from 'chai';
+import { expect } from 'chai';
+
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
 let constants = require('src/constants.json');
@@ -8,41 +9,35 @@ describe('Adomik Prebid Analytic', function () {
   let sendEventStub;
   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',
+        url: 'testurl'
       };
 
       const bid = {
@@ -69,6 +64,7 @@ describe('Adomik Prebid Analytic', function () {
       expect(adomikAnalytics.currentContext).to.deep.equal({
         uid: '123456',
         url: 'testurl',
+        sampling: undefined,
         id: '',
         timeouted: false
       });
@@ -79,6 +75,7 @@ describe('Adomik Prebid Analytic', function () {
       expect(adomikAnalytics.currentContext).to.deep.equal({
         uid: '123456',
         url: 'testurl',
+        sampling: undefined,
         id: 'test-test-test',
         timeouted: false
       });
@@ -91,7 +88,7 @@ describe('Adomik Prebid Analytic', function () {
         type: 'request',
         event: {
           bidder: 'BIDDERTEST',
-          placementCode: 'placementtest',
+          placementCode: '0000',
         }
       });
 
@@ -139,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 594fc4ac7b7..34252e00f9e 100644
--- a/test/spec/modules/adotBidAdapter_spec.js
+++ b/test/spec/modules/adotBidAdapter_spec.js
@@ -1,3118 +1,336 @@
 import { expect } from 'chai';
-import { executeRenderer } from 'src/Renderer.js';
-import * as utils from 'src/utils.js';
 import { spec } from 'modules/adotBidAdapter.js';
 
 const BIDDER_URL = 'https://dsp.adotmob.com/headerbidding/bidrequest';
 
 describe('Adot Adapter', function () {
-  const examples = {
-    adUnit_banner: {
-      adUnitCode: 'ad_unit_banner',
-      bidder: 'adot',
-      bidderRequestId: 'bid_request_id',
-      bidId: 'bid_id',
-      params: {},
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250]]
-        }
-      }
-    },
-
-    adUnit_video_outstream: {
-      adUnitCode: 'ad_unit_video_outstream',
-      bidder: 'adot',
-      bidderRequestId: 'bid_request_id',
-      bidId: 'bid_id',
-      params: {
-        video: {
-          mimes: ['video/mp4'],
-          minDuration: 5,
-          maxDuration: 30,
-          protocols: [2, 3]
-        }
-      },
-      mediaTypes: {
-        video: {
-          context: 'outstream',
-          playerSize: [[300, 250]]
-        }
-      }
-    },
-
-    adUnit_video_instream: {
-      adUnitCode: 'ad_unit_video_instream',
-      bidder: 'adot',
-      bidderRequestId: 'bid_request_id',
-      bidId: 'bid_id',
-      params: {
-        video: {
-          instreamContext: 'pre-roll',
-          mimes: ['video/mp4'],
-          minDuration: 5,
-          maxDuration: 30,
-          protocols: [2, 3]
-        }
-      },
-      mediaTypes: {
-        video: {
-          context: 'instream',
-          playerSize: [[300, 250]]
-        }
-      }
-    },
-
-    adUnitContext: {
-      refererInfo: {
-        referer: 'https://we-are-adot.com/test',
-      },
-      gdprConsent: {
-        consentString: 'consent_string',
-        gdprApplies: true
-      }
-    },
-
-    adUnit_position: {
-      adUnitCode: 'ad_unit_position',
-      bidder: 'adot',
-      bidderRequestId: 'bid_request_id',
-      bidId: 'bid_id',
-      params: {
-        position: 1
-      },
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250]]
-        }
-      }
-    },
-
-    adUnit_native: {
-      adUnitCode: 'ad_unit_native',
-      bidder: 'adot',
-      bidderRequestId: 'bid_request_id',
-      bidId: 'bid_id',
-      params: {},
-      mediaTypes: {
-        native: {
-          title: {required: true, len: 140},
-          icon: {required: true, sizes: [50, 50]},
-          image: {required: false, sizes: [320, 200]},
-          sponsoredBy: {required: false},
-          body: {required: false},
-          cta: {required: true}
-        }
-      }
-    },
+  describe('isBidRequestValid', function () {
+    it('should return false if video and !isValidVideo', function () {
+      const bid = { mediaTypes: { video: {} } };
+      const isBidRequestValid = spec.isBidRequestValid(bid);
+      expect(isBidRequestValid).to.equal(false);
+    })
+
+    it('should return true if video and isValidVideo', function () {
+      const bid = { mediaTypes: { video: { 'mimes': 1, 'protocols': 1 } } };
+      const isBidRequestValid = spec.isBidRequestValid(bid);
+      expect(isBidRequestValid).to.equal(true);
+    })
+
+    it('should return true if !video', function () {
+      const bid = { mediaTypes: { banner: {} } };
+      const isBidRequestValid = spec.isBidRequestValid(bid);
+      expect(isBidRequestValid).to.equal(true);
+    })
+  });
 
-    serverRequest_banner: {
-      method: 'POST',
-      url: 'https://we-are-adot.com/bidrequest',
-      data: {
-        id: 'bid_request_id',
-        imp: [
-          {
-            id: 'imp_id_banner_0_0',
-            banner: {
-              format: [{
-                w: 300,
-                h: 200
-              }]
-            },
-            video: null
-          }
-        ],
+  describe('buildRequests', function () {
+    it('should build request (banner)', function () {
+      const bidderRequestId = 'bidderRequestId';
+      const validBidRequests = [{ bidderRequestId, mediaTypes: {} }, { bidderRequestId, bidId: 'bidId', mediaTypes: { banner: { sizes: [[300, 250]] } }, params: { placementId: 'placementId', adUnitCode: 200 } }];
+      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true }, userId: { pubProvidedId: 'userId' }, schain: { ver: '1.0' } };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const buildBidRequestResponse = {
+        id: bidderRequestId,
+        imp: [{
+          id: validBidRequests[1].bidId,
+          ext: {
+            placementId: validBidRequests[1].params.placementId,
+            adUnitCode: validBidRequests[1].adUnitCode,
+            container: undefined
+          },
+          banner: {
+            pos: bidderRequest.position,
+            format: [{ w: validBidRequests[1].mediaTypes.banner.sizes[0][0], h: validBidRequests[1].mediaTypes.banner.sizes[0][1] }]
+          },
+          bidfloorcur: 'USD',
+          bidfloor: 0
+        }],
         site: {
-          page: 'https://we-are-adot.com/test',
-          domain: 'we-are-adot.com',
-          name: 'we-are-adot.com'
-        },
-        device: {
-          ua: '',
-          language: 'en'
+          page: bidderRequest.refererInfo.page,
+          domain: 'localhost.com',
+          name: 'localhost.com',
+          publisher: {
+            // id: 'adot'
+            id: undefined
+          },
+          ext: { schain: { ver: '1.0' } }
         },
-        user: null,
-        regs: null,
-        at: 1,
+        device: { ua: navigator.userAgent, language: navigator.language },
+        user: { ext: { consent: bidderRequest.gdprConsent.consentString, pubProvidedId: 'userId' } },
+        regs: { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies } },
         ext: {
-          adot: {
-            'adapter_version': 'v1.0.0'
-          }
-        }
-      },
-      _adot_internal: {
-        impressions: [
-          {
-            impressionId: 'imp_id_banner_0_0',
-            adUnitCode: 'ad_unit_banner',
-            bidId: 'imp_id_banner'
-          }
-        ]
+          adot: { adapter_version: 'v2.0.0' },
+          should_use_gzip: true
+        },
+        at: 1
       }
-    },
 
-    serverRequest_banner_twoImps: {
-      method: 'POST',
-      url: 'https://we-are-adot.com/bidrequest',
-      data: {
-        id: 'bid_request_id',
-        imp: [
-          {
-            id: 'imp_id_banner_0_0',
-            banner: {
-              format: [{
-                w: 300,
-                h: 200
-              }]
-            },
-            video: null
+      expect(request).to.deep.equal([{
+        method: 'POST',
+        url: BIDDER_URL,
+        data: buildBidRequestResponse
+      }])
+    })
+
+    it('should build request (native)', function () {
+      const bidderRequestId = 'bidderRequestId';
+      const validBidRequests = [{ bidderRequestId, mediaTypes: {} }, { bidderRequestId, bidId: 'bidId', mediaTypes: { native: { title: { required: true, len: 50, sizes: [[300, 250]] }, wrong: {}, image: {} } }, params: { placementId: 'placementId', adUnitCode: 200 } }];
+      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true }, userId: { pubProvidedId: 'userId' }, schain: { ver: '1.0' } };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const buildBidRequestResponse = {
+        id: bidderRequestId,
+        imp: [{
+          id: validBidRequests[1].bidId,
+          ext: {
+            placementId: validBidRequests[1].params.placementId,
+            adUnitCode: validBidRequests[1].adUnitCode,
+            container: undefined
           },
-          {
-            id: 'imp_id_banner_2_0_0',
-            banner: {
-              format: [{
-                w: 300,
-                h: 200
-              }]
-            },
-            video: null
-          }
-        ],
-        site: {
-          page: 'https://we-are-adot.com/test',
-          domain: 'we-are-adot.com',
-          name: 'we-are-adot.com'
-        },
-        device: {
-          ua: '',
-          language: 'en'
-        },
-        user: null,
-        regs: null,
-        at: 1,
-        ext: {
-          adot: {
-            'adapter_version': 'v1.0.0'
-          }
-        }
-      },
-      _adot_internal: {
-        impressions: [
-          {
-            impressionId: 'imp_id_banner_0_0',
-            adUnitCode: 'ad_unit_banner',
-            bidId: 'imp_id_banner'
+          native: {
+            request: '{\"assets\":[{\"id\":1,\"required\":true,\"title\":{\"len\":50,\"wmin\":300,\"hmin\":250}},{\"id\":3,\"img\":{\"type\":3}}]}'
           },
-          {
-            impressionId: 'imp_id_banner_2_0_0',
-            adUnitCode: 'ad_unit_banner_2',
-            bidId: 'imp_id_banner_2'
-          }
-        ]
-      }
-    },
-
-    serverRequest_video_instream: {
-      method: 'POST',
-      url: 'https://we-are-adot.com/bidrequest',
-      data: {
-        id: 'bid_request_id',
-        imp: [
-          {
-            id: 'imp_id_video_instream_0',
-            banner: null,
-            video: {
-              mimes: ['video/mp4'],
-              w: 300,
-              h: 200,
-              startdelay: 0,
-              minduration: 5,
-              maxduration: 35,
-              protocols: [2, 3]
-            }
-          }
-        ],
+          bidfloorcur: 'USD',
+          bidfloor: 0
+        }],
         site: {
-          page: 'https://we-are-adot.com/test',
-          domain: 'we-are-adot.com',
-          name: 'we-are-adot.com'
-        },
-        device: {
-          ua: '',
-          language: 'en'
+          page: bidderRequest.refererInfo.page,
+          domain: 'localhost.com',
+          name: 'localhost.com',
+          publisher: {
+            // id: 'adot'
+            id: undefined
+          },
+          ext: { schain: { ver: '1.0' } }
         },
-        user: null,
-        regs: null,
-        at: 1,
+        device: { ua: navigator.userAgent, language: navigator.language },
+        user: { ext: { consent: bidderRequest.gdprConsent.consentString, pubProvidedId: 'userId' } },
+        regs: { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies } },
         ext: {
-          adot: {
-            'adapter_version': 'v1.0.0'
-          }
-        }
-      },
-      _adot_internal: {
-        impressions: [
-          {
-            impressionId: 'imp_id_video_instream_0',
-            adUnitCode: 'ad_unit_video_instream',
-            bidId: 'imp_id_video_instream'
-          }
-        ]
-      }
-    },
-
-    serverRequest_video_outstream: {
-      method: 'POST',
-      url: 'https://we-are-adot.com/bidrequest',
-      data: {
-        id: 'bid_request_id',
-        imp: [
-          {
-            id: 'imp_id_video_outstream_0',
-            banner: null,
-            video: {
-              mimes: ['video/mp4'],
-              w: 300,
-              h: 200,
-              startdelay: null,
-              minduration: 5,
-              maxduration: 35,
-              protocols: [2, 3]
-            }
-          }
-        ],
-        site: {
-          page: 'https://we-are-adot.com/test',
-          domain: 'we-are-adot.com',
-          name: 'we-are-adot.com'
-        },
-        device: {
-          ua: '',
-          language: 'en'
+          adot: { adapter_version: 'v2.0.0' },
+          should_use_gzip: true
         },
-        user: null,
-        regs: null,
-        at: 1,
-        ext: {
-          adot: {
-            'adapter_version': 'v1.0.0'
-          }
-        }
-      },
-      _adot_internal: {
-        impressions: [
-          {
-            impressionId: 'imp_id_video_outstream_0',
-            adUnitCode: 'ad_unit_video_outstream',
-            bidId: 'imp_id_video_outstream'
-          }
-        ]
+        at: 1
       }
-    },
 
-    serverRequest_video_instream_outstream: {
-      method: 'POST',
-      url: 'https://we-are-adot.com/bidrequest',
-      data: {
-        id: 'bid_request_id',
-        imp: [
-          {
-            id: 'imp_id_video_instream_0',
-            banner: null,
-            video: {
-              mimes: ['video/mp4'],
-              w: 300,
-              h: 200,
-              startdelay: 0,
-              minduration: 5,
-              maxduration: 35,
-              protocols: [2, 3]
-            }
+      expect(request).to.deep.equal([{
+        method: 'POST',
+        url: BIDDER_URL,
+        data: buildBidRequestResponse
+      }])
+    })
+
+    it('should build request (video)', function () {
+      const bidderRequestId = 'bidderRequestId';
+      const validBidRequests = [{ bidderRequestId, mediaTypes: {} }, { bidderRequestId, bidId: 'bidId', mediaTypes: { video: { playerSize: [[300, 250]], minduration: 1, maxduration: 2, api: 'api', linearity: 'linearity', mimes: [], placement: 'placement', playbackmethod: 'playbackmethod', protocols: 'protocol', startdelay: 'startdelay' } }, params: { placementId: 'placementId', adUnitCode: 200 } }];
+      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true }, userId: { pubProvidedId: 'userId' }, schain: { ver: '1.0' } };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const buildBidRequestResponse = {
+        id: bidderRequestId,
+        imp: [{
+          id: validBidRequests[1].bidId,
+          ext: {
+            placementId: validBidRequests[1].params.placementId,
+            adUnitCode: validBidRequests[1].adUnitCode,
+            container: undefined
           },
-          {
-            id: 'imp_id_video_outstream_0',
-            banner: null,
-            video: {
-              mimes: ['video/mp4'],
-              w: 300,
-              h: 200,
-              startdelay: null,
-              minduration: 5,
-              maxduration: 35,
-              protocols: [2, 3]
-            }
-          }
-        ],
-        site: {
-          page: 'https://we-are-adot.com/test',
-          domain: 'we-are-adot.com',
-          name: 'we-are-adot.com'
-        },
-        device: {
-          ua: '',
-          language: 'en'
-        },
-        user: null,
-        regs: null,
-        at: 1,
-        ext: {
-          adot: {
-            'adapter_version': 'v1.0.0'
-          }
-        }
-      },
-      _adot_internal: {
-        impressions: [
-          {
-            impressionId: 'imp_id_video_instream_0',
-            adUnitCode: 'ad_unit_video_instream',
-            bidId: 'imp_id_video_instream'
+          video: {
+            api: 'api',
+            h: 250,
+            linearity: 'linearity',
+            maxduration: 2,
+            mimes: [],
+            minduration: 1,
+            placement: 'placement',
+            playbackmethod: 'playbackmethod',
+            pos: 0,
+            protocols: 'protocol',
+            skip: 0,
+            startdelay: 'startdelay',
+            w: 300
           },
-          {
-            impressionId: 'imp_id_video_outstream_0',
-            adUnitCode: 'ad_unit_video_outstream',
-            bidId: 'imp_id_video_outstream'
-          }
-        ]
-      }
-    },
-
-    serverRequest_position: {
-      method: 'POST',
-      url: 'https://we-are-adot.com/bidrequest',
-      data: {
-        id: 'bid_request_id',
-        imp: [
-          {
-            id: 'imp_id_banner',
-            banner: {
-              format: [{
-                w: 300,
-                h: 200
-              }],
-              position: 1
-            },
-            video: null
-          }
-        ],
+          bidfloorcur: 'USD',
+          bidfloor: 0
+        }],
         site: {
-          page: 'https://we-are-adot.com/test',
-          domain: 'we-are-adot.com',
-          name: 'we-are-adot.com'
-        },
-        device: {
-          ua: '',
-          language: 'en'
+          page: bidderRequest.refererInfo.page,
+          domain: 'localhost.com',
+          name: 'localhost.com',
+          publisher: {
+            // id: 'adot'
+            id: undefined
+          },
+          ext: { schain: { ver: '1.0' } }
         },
-        user: null,
-        regs: null,
-        at: 1,
+        device: { ua: navigator.userAgent, language: navigator.language },
+        user: { ext: { consent: bidderRequest.gdprConsent.consentString, pubProvidedId: 'userId' } },
+        regs: { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies } },
         ext: {
-          adot: {
-            'adapter_version': 'v1.0.0'
-          }
-        }
-      },
-      _adot_internal: {
-        impressions: [
-          {
-            impressionId: 'imp_id_banner',
-            adUnitCode: 'ad_unit_position'
-          }
-        ]
-      }
-    },
-
-    serverRequest_native: {
-      method: 'POST',
-      url: 'https://we-are-adot.com/bidrequest',
-      data: {
-        id: 'bid_request_id',
-        imp: [
-          {
-            id: 'imp_id_native_0',
-            native: {
-              request: {
-                assets: [
-                  {
-                    id: 1,
-                    required: true,
-                    title: {
-                      len: 140
-                    }
-                  },
-                  {
-                    id: 2,
-                    required: true,
-                    img: {
-                      type: 1,
-                      wmin: 50,
-                      hmin: 50
-                    }
-                  },
-                  {
-                    id: 3,
-                    required: false,
-                    img: {
-                      type: 3,
-                      wmin: 320,
-                      hmin: 200
-                    }
-                  },
-                  {
-                    id: 4,
-                    required: false,
-                    data: {
-                      type: 1
-                    }
-                  },
-                  {
-                    id: 5,
-                    required: false,
-                    data: {
-                      type: 2
-                    }
-                  },
-                  {
-                    id: 6,
-                    required: true,
-                    data: {
-                      type: 12
-                    }
-                  }
-                ]
-              }
-            },
-            video: null,
-            banner: null
-          }
-        ],
-        site: {
-          page: 'https://we-are-adot.com/test',
-          domain: 'we-are-adot.com',
-          name: 'we-are-adot.com'
-        },
-        device: {
-          ua: '',
-          language: 'en'
+          adot: { adapter_version: 'v2.0.0' },
+          should_use_gzip: true
         },
-        user: null,
-        regs: null,
-        at: 1,
-        ext: {
-          adot: {
-            'adapter_version': 'v1.0.0'
-          }
-        }
-      },
-      _adot_internal: {
-        impressions: [
-          {
-            impressionId: 'imp_id_native_0',
-            adUnitCode: 'ad_unit_native',
-            bidId: 'imp_id_native'
-          }
-        ]
-      }
-    },
-
-    serverResponse_banner: {
-      body: {
-        cur: 'EUR',
-        seatbid: [
-          {
-            bid: [
-              {
-                impid: 'imp_id_banner_0_0',
-                crid: 'creative_id',
-                adm: 'creative_data_${AUCTION_PRICE}',
-                nurl: 'win_notice_url_${AUCTION_PRICE}',
-                price: 1.5,
-                h: 350,
-                w: 300,
-                ext: {
-                  adot: {
-                    media_type: 'banner'
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    },
-
-    serverResponse_banner_twoBids: {
-      body: {
-        cur: 'EUR',
-        seatbid: [
-          {
-            bid: [
-              {
-                impid: 'imp_id_banner_0_0',
-                crid: 'creative_id',
-                adm: 'creative_data_${AUCTION_PRICE}',
-                nurl: 'win_notice_url_${AUCTION_PRICE}',
-                price: 1.5,
-                h: 350,
-                w: 300,
-                ext: {
-                  adot: {
-                    media_type: 'banner'
-                  }
-                }
-              },
-              {
-                impid: 'imp_id_banner_2_0_0',
-                crid: 'creative_id_2',
-                adm: 'creative_data_2_${AUCTION_PRICE}',
-                nurl: 'win_notice_url_2_${AUCTION_PRICE}',
-                price: 2.5,
-                h: 400,
-                w: 350,
-                ext: {
-                  adot: {
-                    media_type: 'banner'
-                  }
-                }
-              }
-            ]
-          }
-        ]
+        at: 1
       }
-    },
 
-    serverResponse_video_instream: {
-      body: {
-        cur: 'EUR',
-        seatbid: [
-          {
-            bid: [
-              {
-                impid: 'imp_id_video_instream_0',
-                crid: 'creative_id',
-                adm: 'creative_data_${AUCTION_PRICE}',
-                nurl: 'win_notice_url_${AUCTION_PRICE}',
-                price: 1.5,
-                ext: {
-                  adot: {
-                    media_type: 'video'
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    },
+      expect(request).to.deep.equal([{
+        method: 'POST',
+        url: BIDDER_URL,
+        data: buildBidRequestResponse
+      }])
+    })
+  });
 
-    serverResponse_video_outstream: {
-      body: {
-        cur: 'EUR',
-        seatbid: [
-          {
-            bid: [
-              {
-                impid: 'imp_id_video_outstream_0',
-                crid: 'creative_id',
-                adm: 'creative_data_${AUCTION_PRICE}',
-                nurl: 'win_notice_url_${AUCTION_PRICE}',
-                price: 1.5,
-                ext: {
-                  adot: {
-                    media_type: 'video'
-                  }
-                }
-              }
-            ]
-          }
-        ]
+  describe('interpretResponse', function () {
+    it('should return [] if !isValidResponse', function () {
+      const serverResponse = 'response';
+      const request = 'request';
+      const interpretedResponse = spec.interpretResponse(serverResponse, request);
+      expect(interpretedResponse).to.deep.equal([]);
+    })
+
+    it('should return [] if !isValidRequest', function () {
+      const serverResponse = { body: { cur: 'EUR', seatbid: [] } };
+      const request = 'request';
+      const interpretedResponse = spec.interpretResponse(serverResponse, request);
+      expect(interpretedResponse).to.deep.equal([]);
+    })
+
+    it('should return bidResponse with random media type', function () {
+      const impId = 'impId';
+      const bid = { adm: 'adm', impid: impId, price: 2, crid: 'crid', dealid: 'dealid', adomain: 'adomain', ext: { adot: { media_type: 'media_type', size: { w: 300, h: 250 } } } }
+      const serverResponse = { body: { cur: 'EUR', seatbid: [{ bid: {} }, { bid: [bid] }] } };
+      const request = { data: { imp: [{ id: impId }] } };
+      const bidResponse = {
+        requestId: impId,
+        cpm: bid.price,
+        currency: serverResponse.body.cur,
+        ttl: 10,
+        creativeId: bid.crid,
+        netRevenue: true,
+        mediaType: bid.ext.adot.media_type,
+        dealId: bid.dealid,
+        meta: { advertiserDomains: bid.adomain },
+        width: bid.ext.adot.size.w,
+        height: bid.ext.adot.size.h,
+        ad: bid.adm,
+        adUrl: null,
+        vastXml: null,
+        vastUrl: null,
+        renderer: null
       }
-    },
 
-    serverResponse_video_instream_outstream: {
-      body: {
-        cur: 'EUR',
-        seatbid: [
-          {
-            bid: [
-              {
-                impid: 'imp_id_video_instream_0',
-                crid: 'creative_id',
-                adm: 'creative_data_${AUCTION_PRICE}',
-                nurl: 'win_notice_url_${AUCTION_PRICE}',
-                price: 1.5,
-                ext: {
-                  adot: {
-                    media_type: 'video'
-                  }
-                }
-              },
-              {
-                impid: 'imp_id_video_outstream_0',
-                crid: 'creative_id',
-                adm: 'creative_data_${AUCTION_PRICE}',
-                nurl: 'win_notice_url_${AUCTION_PRICE}',
-                price: 1.5,
-                ext: {
-                  adot: {
-                    media_type: 'video'
-                  }
-                }
-              }
-            ]
-          }
-        ]
+      const interpretedResponse = spec.interpretResponse(serverResponse, request);
+      expect(interpretedResponse).to.deep.equal([bidResponse]);
+    })
+
+    it('should return bidResponse with native', function () {
+      const impId = 'impId';
+      const bid = { adm: '{"native":{"assets":[{"id":1,"title":{"text":"title"}},{"id":3,"img":{"url":"url","w":300,"h":250}}],"link":{"url":"clickUrl","clicktrackers":"clicktrackers"},"imptrackers":["imptracker"],"jstracker":"jstracker"}}', impid: impId, price: 2, crid: 'crid', dealid: 'dealid', adomain: 'adomain', ext: { adot: { media_type: 'native', size: { width: 300, height: 250 } } } }
+      const serverResponse = { body: { cur: 'EUR', seatbid: [{ bid: {} }, { bid: [bid] }] } };
+      const request = { data: { imp: [{ id: impId }] } };
+      const bidResponse = {
+        requestId: impId,
+        cpm: bid.price,
+        currency: serverResponse.body.cur,
+        ttl: 10,
+        creativeId: bid.crid,
+        netRevenue: true,
+        mediaType: bid.ext.adot.media_type,
+        dealId: bid.dealid,
+        meta: { advertiserDomains: bid.adomain },
+        native: {
+          title: 'title',
+          image: { url: 'url', width: 300, height: 250 },
+          clickUrl: 'clickUrl',
+          clickTrackers: 'clicktrackers',
+          impressionTrackers: ['imptracker'],
+          javascriptTrackers: ['jstracker']
+        }
       }
-    },
 
-    serverResponse_native: {
-      body: {
-        cur: 'EUR',
-        seatbid: [
-          {
-            bid: [
-              {
-                impid: 'imp_id_native_0',
-                crid: 'creative_id',
-                adm: '{"native":{"assets":[{"id":1,"title":{"len":140,"text":"Hi everyone"}},{"id":2,"img":{"url":"https://adotmob.com","type":1,"w":50,"h":50}},{"id":3,"img":{"url":"https://adotmob.com","type":3,"w":320,"h":200}},{"id":4,"data":{"type":1,"value":"adotmob"}},{"id":5,"data":{"type":2,"value":"This is a test ad"}},{"id":6,"data":{"type":12,"value":"Click to buy"}}],"link":{"url":"https://adotmob.com?auction=${AUCTION_PRICE}"}}}',
-                nurl: 'win_notice_url_${AUCTION_PRICE}',
-                price: 1.5,
-                ext: {
-                  adot: {
-                    media_type: 'native'
-                  }
-                }
-              }
-            ]
-          }
-        ]
+      const interpretedResponse = spec.interpretResponse(serverResponse, request);
+      expect(interpretedResponse).to.deep.equal([bidResponse]);
+    })
+
+    it('should return bidResponse with video', function () {
+      const impId = 'impId';
+      const bid = { nurl: 'nurl', impid: impId, price: 2, crid: 'crid', dealid: 'dealid', adomain: 'adomain', ext: { adot: { media_type: 'video', size: { w: 300, h: 250 }, container: {}, adUnitCode: 20, video: { type: 'outstream' } } } }
+      const serverResponse = { body: { cur: 'EUR', seatbid: [{ bid: {} }, { bid: [bid] }] } };
+      const request = { data: { imp: [{ id: impId }] } };
+      const bidResponse = {
+        requestId: impId,
+        cpm: bid.price,
+        currency: serverResponse.body.cur,
+        ttl: 10,
+        creativeId: bid.crid,
+        netRevenue: true,
+        mediaType: bid.ext.adot.media_type,
+        dealId: bid.dealid,
+        meta: { advertiserDomains: bid.adomain },
+        w: bid.ext.adot.size.w,
+        h: bid.ext.adot.size.h,
+        ad: null,
+        adUrl: bid.nurl,
+        vastXml: null,
+        vastUrl: bid.nurl
       }
-    }
-  };
-
-  describe('isBidRequestValid', function () {
-    describe('General', function () {
-      it('should return false when not given an ad unit', function () {
-        const adUnit = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an invalid ad unit', function () {
-        const adUnit = 'bad_bid';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without bidder code', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.bidder = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a bad bidder code', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.bidder = 'unknownBidder';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without ad unit code', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.adUnitCode = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid ad unit code', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.adUnitCode = {};
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without bid request identifier', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.bidderRequestId = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid bid request identifier', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.bidderRequestId = {};
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without impression identifier', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.bidId = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid impression identifier', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.bidId = {};
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without media types', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with empty media types', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes = {};
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with invalid media types', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes = 'bad_media_types';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-    });
-
-    describe('Banner', function () {
-      it('should return true when given a valid ad unit', function () {
-        const adUnit = examples.adUnit_banner;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return true when given a valid ad unit without bidder parameters', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.params = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return false when given an ad unit without size', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid size', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = 'bad_banner_size';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an empty size', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = [];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid size value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = ['bad_banner_size_value'];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a size value with less than 2 dimensions', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = [[300]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a size value with more than 2 dimensions', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = [[300, 250, 30]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a negative width value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = [[-300, 250]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a negative height value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = [[300, -250]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid width value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = [[false, 250]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid height value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_banner);
-        adUnit.mediaTypes.banner.sizes = [[300, {}]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-    });
-
-    describe('Video', function () {
-      it('should return true when given a valid outstream ad unit', function () {
-        const adUnit = examples.adUnit_video_outstream;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return true when given a valid pre-roll instream ad unit', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_instream);
-        adUnit.params.video.instreamContext = 'pre-roll';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return true when given a valid mid-roll instream ad unit', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_instream);
-        adUnit.params.video.instreamContext = 'mid-roll';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return true when given a valid post-roll instream ad unit', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_instream);
-        adUnit.params.video.instreamContext = 'post-roll';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
 
-      it('should return true when given an ad unit without size', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return true when given an ad unit with an empty size', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = [];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return true when given an ad unit without minimum duration parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.minDuration = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return true when given an ad unit without maximum duration parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.maxDuration = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
-      });
-
-      it('should return false when given an ad unit without bidder parameters', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with invalid bidder parameters', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params = 'bad_bidder_parameters';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without video parameters', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with invalid video parameters', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video = 'bad_bidder_parameters';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without mime types parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.mimes = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid mime types parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.mimes = 'bad_mime_types';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an empty mime types parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.mimes = [];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid mime types parameter value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.mimes = [200];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid minimum duration parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.minDuration = 'bad_min_duration';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid maximum duration parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.maxDuration = 'bad_max_duration';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without protocols parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.protocols = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid protocols parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.protocols = 'bad_protocols';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an empty protocols parameter', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.protocols = [];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid protocols parameter value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.protocols = ['bad_protocols_value'];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an instream ad unit without instream context', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_instream);
-        adUnit.params.video.instreamContext = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an instream ad unit with an invalid instream context', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_instream);
-        adUnit.params.video.instreamContext = 'bad_instream_context';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit without context', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.context = undefined;
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid context', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.context = [];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an adpod ad unit', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.context = 'adpod';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an unknown context', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.context = 'invalid_context';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid size', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = 'bad_video_size';
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid size value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = ['bad_video_size_value'];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a size value with less than 2 dimensions', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = [[300]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a size value with more than 2 dimensions', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = [[300, 250, 30]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a negative width value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = [[-300, 250]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with a negative height value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = [[300, -250]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid width value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = [[false, 250]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-
-      it('should return false when given an ad unit with an invalid height value', function () {
-        const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.mediaTypes.video.playerSize = [[300, {}]];
-
-        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
-      });
-    });
+      const interpretedResponse = spec.interpretResponse(serverResponse, request);
+      expect(interpretedResponse).to.be.an('array').and.to.have.lengthOf(1)
+      expect(interpretedResponse[0].requestId).to.deep.equal(bidResponse.requestId);
+      expect(interpretedResponse[0].cpm).to.deep.equal(bidResponse.cpm);
+      expect(interpretedResponse[0].currency).to.deep.equal(bidResponse.currency);
+      expect(interpretedResponse[0].ttl).to.deep.equal(bidResponse.ttl);
+      expect(interpretedResponse[0].creativeId).to.deep.equal(bidResponse.creativeId);
+      expect(interpretedResponse[0].netRevenue).to.deep.equal(bidResponse.netRevenue);
+      expect(interpretedResponse[0].mediaType).to.deep.equal(bidResponse.mediaType);
+      expect(interpretedResponse[0].dealId).to.deep.equal(bidResponse.dealId);
+      expect(interpretedResponse[0].meta).to.deep.equal(bidResponse.meta);
+      expect(interpretedResponse[0].width).to.deep.equal(bidResponse.w);
+      expect(interpretedResponse[0].height).to.deep.equal(bidResponse.h);
+      expect(interpretedResponse[0].ad).to.deep.equal(bidResponse.ad);
+      expect(interpretedResponse[0].adUrl).to.deep.equal(bidResponse.adUrl);
+      expect(interpretedResponse[0].vastXml).to.deep.equal(bidResponse.vastXml);
+      expect(interpretedResponse[0].vastUrl).to.deep.equal(bidResponse.vastUrl);
+      expect(interpretedResponse[0].renderer).to.be.an('object');
+    })
   });
 
-  describe('buildRequests', function () {
-    describe('ServerRequest', function () {
-      it('should return a server request when given a valid ad unit and a valid ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.length(1);
-        expect(serverRequests[0].method).to.exist.and.to.be.a('string').and.to.equal('POST');
-        expect(serverRequests[0].url).to.exist.and.to.be.a('string').and.to.equal(BIDDER_URL);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal.impressions).to.exist.and.to.be.an('array').and.to.have.length(1);
-        expect(serverRequests[0]._adot_internal.impressions[0]).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal.impressions[0].impressionId).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0_0`);
-        expect(serverRequests[0]._adot_internal.impressions[0].adUnitCode).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].adUnitCode);
-      });
-
-      it('should return a server request containing a position when given a valid ad unit and a valid ad unit context and a position in the bidder params', function () {
-        const adUnits = [examples.adUnit_position];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.length(1);
-        expect(serverRequests[0].method).to.exist.and.to.be.a('string').and.to.equal('POST');
-        expect(serverRequests[0].url).to.exist.and.to.be.a('string').and.to.equal(BIDDER_URL);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal.impressions).to.exist.and.to.be.an('array').and.to.have.length(1);
-        expect(serverRequests[0]._adot_internal.impressions[0]).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal.impressions[0].impressionId).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0_0`);
-        expect(serverRequests[0]._adot_internal.impressions[0].adUnitCode).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].adUnitCode);
-        expect(serverRequests[0].data.imp[0].banner.pos).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.position);
-      });
-
-      it('should return a server request when given two valid ad units and a valid ad unit context', function () {
-        const adUnits_1 = utils.deepClone(examples.adUnit_banner);
-        adUnits_1.bidId = 'bid_id_1';
-        adUnits_1.adUnitCode = 'ad_unit_banner_1';
-
-        const adUnits_2 = utils.deepClone(examples.adUnit_banner);
-        adUnits_2.bidId = 'bid_id_2';
-        adUnits_2.adUnitCode = 'ad_unit_banner_2';
-
-        const adUnits = [adUnits_1, adUnits_2];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.length(1);
-        expect(serverRequests[0].method).to.exist.and.to.be.a('string').and.to.equal('POST');
-        expect(serverRequests[0].url).to.exist.and.to.be.a('string').and.to.equal(BIDDER_URL);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal.impressions).to.exist.and.to.be.an('array').and.to.have.length(2);
-        expect(serverRequests[0]._adot_internal.impressions[0]).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal.impressions[0].impressionId).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0_0`);
-        expect(serverRequests[0]._adot_internal.impressions[0].adUnitCode).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].adUnitCode);
-        expect(serverRequests[0]._adot_internal.impressions[1]).to.exist.and.to.be.an('object');
-        expect(serverRequests[0]._adot_internal.impressions[1].impressionId).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0_0`);
-        expect(serverRequests[0]._adot_internal.impressions[1].adUnitCode).to.exist.and.to.be.a('string').and.to.equal(adUnits[1].adUnitCode);
-      });
-
-      it('should return an empty server request list when given an empty ad unit list and a valid ad unit context', function () {
-        const adUnits = [];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should not return a server request when given no ad unit and a valid ad unit context', function () {
-        const serverRequests = spec.buildRequests(null, examples.adUnitContext);
-
-        expect(serverRequests).to.equal(null);
-      });
-
-      it('should not return a server request when given a valid ad unit and no ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const serverRequests = spec.buildRequests(adUnits, null);
-
-        expect(serverRequests).to.be.an('array').and.to.have.length(1);
-      });
-
-      it('should not return a server request when given a valid ad unit and an invalid ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const serverRequests = spec.buildRequests(adUnits, {});
-
-        expect(serverRequests).to.be.an('array').and.to.have.length(1);
-      });
-    });
-
-    describe('BidRequest', function () {
-      it('should return a valid server request when given a valid ad unit', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data.id).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.at).to.exist.and.to.be.a('number').and.to.equal(1);
-        expect(serverRequests[0].data.ext).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.ext.adot).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.ext.adot.adapter_version).to.exist.and.to.be.a('string').and.to.equal('v1.0.0');
-      });
-
-      it('should return one server request when given one valid ad unit', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data.id).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].bidderRequestId);
-      });
-
-      it('should return one server request when given two valid ad units with different impression identifiers', function () {
-        const adUnit_1 = utils.deepClone(examples.adUnit_banner);
-        adUnit_1.bidId = 'bid_id_1';
-
-        const adUnit_2 = utils.deepClone(examples.adUnit_banner);
-        adUnit_2.bidId = 'bid_id_2';
-
-        const adUnits = [adUnit_1, adUnit_2];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data.id).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.id).to.exist.and.to.be.a('string').and.to.equal(adUnits[1].bidderRequestId);
-      });
-
-      it('should return two server requests when given two valid ad units with different bid request identifiers', function () {
-        const adUnit_1 = utils.deepClone(examples.adUnit_banner);
-        adUnit_1.bidderRequestId = 'bidder_request_id_1';
-
-        const adUnit_2 = utils.deepClone(examples.adUnit_banner);
-        adUnit_2.bidderRequestId = 'bidder_request_id_2';
-
-        const adUnits = [adUnit_1, adUnit_2];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(2);
-        expect(serverRequests[0].data.id).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[1].data.id).to.exist.and.to.be.a('string').and.to.equal(adUnits[1].bidderRequestId);
-      });
-    });
-
-    describe('Impression', function () {
-      describe('Banner', function () {
-        it('should return a server request with one impression when given a valid ad unit', function () {
-          const adUnits = [examples.adUnit_banner];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0_0`);
-          expect(serverRequests[0].data.imp[0].banner).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[0][0]);
-          expect(serverRequests[0].data.imp[0].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[0][1]);
-          expect(serverRequests[0].data.imp[0].banner.format).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
-            w: adUnits[0].mediaTypes.banner.sizes[0][0],
-            h: adUnits[0].mediaTypes.banner.sizes[0][1]
-          });
-        });
-
-        it('should return a server request with two impressions containing one banner formats when given a valid ad unit with two banner sizes', function () {
-          const adUnit = utils.deepClone(examples.adUnit_banner);
-          adUnit.mediaTypes.banner.sizes = [
-            [300, 250],
-            [350, 300]
-          ];
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(2);
-
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0_0`);
-          expect(serverRequests[0].data.imp[0].banner).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[0][0]);
-          expect(serverRequests[0].data.imp[0].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[0][1]);
-          expect(serverRequests[0].data.imp[0].banner.format).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
-            w: adUnits[0].mediaTypes.banner.sizes[0][0],
-            h: adUnits[0].mediaTypes.banner.sizes[0][1]
-          });
-
-          expect(serverRequests[0].data.imp[1]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[1].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0_1`);
-          expect(serverRequests[0].data.imp[1].banner).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[1].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[1][0]);
-          expect(serverRequests[0].data.imp[1].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[1][1]);
-          expect(serverRequests[0].data.imp[1].banner.format).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[1].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
-            w: adUnits[0].mediaTypes.banner.sizes[1][0],
-            h: adUnits[0].mediaTypes.banner.sizes[1][1]
-          });
-        });
-
-        it('should return a server request with two impressions when given two valid ad units with different impression identifiers', function () {
-          const adUnit_1 = utils.deepClone(examples.adUnit_banner);
-          adUnit_1.bidId = 'bid_id_1';
-
-          const adUnit_2 = utils.deepClone(examples.adUnit_banner);
-          adUnit_2.bidId = 'bid_id_2';
-
-          const adUnits = [adUnit_1, adUnit_2];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(2);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0_0`);
-          expect(serverRequests[0].data.imp[0].banner).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[0][0]);
-          expect(serverRequests[0].data.imp[0].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[0][1]);
-          expect(serverRequests[0].data.imp[0].banner.format).to.exist.and.to.be.an('array');
-          expect(serverRequests[0].data.imp[0].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
-            w: adUnits[0].mediaTypes.banner.sizes[0][0],
-            h: adUnits[0].mediaTypes.banner.sizes[0][1]
-          });
-          expect(serverRequests[0].data.imp[1]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[1].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0_0`);
-          expect(serverRequests[0].data.imp[1].banner).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[1].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.banner.sizes[0][0]);
-          expect(serverRequests[0].data.imp[1].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.banner.sizes[0][1]);
-          expect(serverRequests[0].data.imp[1].banner.format).to.exist.and.to.be.an('array');
-          expect(serverRequests[0].data.imp[1].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
-            w: adUnits[1].mediaTypes.banner.sizes[0][0],
-            h: adUnits[1].mediaTypes.banner.sizes[0][1]
-          });
-        });
-
-        it('should return a server request with one overriden impression when given two valid ad units with identical identifiers', function () {
-          const adUnit_1 = utils.deepClone(examples.adUnit_banner);
-          adUnit_1.mediaTypes.banner.sizes = [[300, 250]];
-
-          const adUnit_2 = utils.deepClone(examples.adUnit_banner);
-          adUnit_2.mediaTypes.banner.sizes = [[350, 300]];
-
-          const adUnits = [adUnit_1, adUnit_2];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0_0`);
-          expect(serverRequests[0].data.imp[0].banner).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.banner.sizes[0][0]);
-          expect(serverRequests[0].data.imp[0].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.banner.sizes[0][1]);
-          expect(serverRequests[0].data.imp[0].banner.format).to.exist.and.to.be.an('array');
-          expect(serverRequests[0].data.imp[0].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
-            w: adUnits[1].mediaTypes.banner.sizes[0][0],
-            h: adUnits[1].mediaTypes.banner.sizes[0][1]
-          });
-        });
-
-        it('should return two server requests with one impression when given two valid ad units with different bid request identifiers', function () {
-          const adUnit_1 = utils.deepClone(examples.adUnit_banner);
-          adUnit_1.bidderRequestId = 'bidder_request_id_1';
-
-          const adUnit_2 = utils.deepClone(examples.adUnit_banner);
-          adUnit_2.bidderRequestId = 'bidder_request_id_2';
-
-          const adUnits = [adUnit_1, adUnit_2];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(2);
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0_0`);
-          expect(serverRequests[0].data.imp[0].banner).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.banner.sizes[0][0]);
-          expect(serverRequests[0].data.imp[0].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.banner.sizes[0][1]);
-          expect(serverRequests[0].data.imp[0].banner.format).to.exist.and.to.be.an('array');
-          expect(serverRequests[0].data.imp[0].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
-            w: adUnits[0].mediaTypes.banner.sizes[0][0],
-            h: adUnits[0].mediaTypes.banner.sizes[0][1]
-          });
-          expect(serverRequests[1].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[1].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[1].bidderRequestId);
-          expect(serverRequests[1].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[1].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[1].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0_0`);
-          expect(serverRequests[1].data.imp[0].banner).to.exist.and.to.be.an('object');
-          expect(serverRequests[1].data.imp[0].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.banner.sizes[0][0]);
-          expect(serverRequests[1].data.imp[0].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.banner.sizes[0][1]);
-          expect(serverRequests[1].data.imp[0].banner.format).to.exist.and.to.be.an('array');
-          expect(serverRequests[1].data.imp[0].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
-            w: adUnits[1].mediaTypes.banner.sizes[0][0],
-            h: adUnits[1].mediaTypes.banner.sizes[0][1]
-          });
-        });
-      });
-
-      describe('Video', function () {
-        it('should return a server request with one impression when given a valid outstream ad unit', function () {
-          const adUnit = examples.adUnit_video_outstream;
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with one impression when given a valid pre-roll instream ad unit', function () {
-          const adUnit = utils.deepClone(examples.adUnit_video_instream);
-          adUnit.params.video.instreamContext = 'pre-roll';
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.exist.and.to.be.a('number').and.to.equal(0);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with one impression when given a valid mid-roll instream ad unit', function () {
-          const adUnit = utils.deepClone(examples.adUnit_video_instream);
-          adUnit.params.video.instreamContext = 'mid-roll';
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.exist.and.to.be.a('number').and.to.equal(-1);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with one impression when given a valid post-roll instream ad unit', function () {
-          const adUnit = utils.deepClone(examples.adUnit_video_instream);
-          adUnit.params.video.instreamContext = 'post-roll';
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.exist.and.to.be.a('number').and.to.equal(-2);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with one impression when given a valid ad unit without player size', function () {
-          const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit.mediaTypes.video.playerSize = undefined;
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.h).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with one impression when given a valid ad unit with an empty player size', function () {
-          const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit.mediaTypes.video.playerSize = [];
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.h).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with one impression when given a valid ad unit with multiple player sizes', function () {
-          const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit.mediaTypes.video.playerSize = [[350, 300], [400, 350]];
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with one impression when given a valid ad unit without minimum duration', function () {
-          const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit.params.video.minDuration = undefined;
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with one impression when given a valid ad unit without maximum duration', function () {
-          const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit.params.video.maxDuration = undefined;
-
-          const adUnits = [adUnit];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-        });
-
-        it('should return a server request with two impressions when given two valid ad units with different impression identifiers', function () {
-          const adUnit_1 = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit_1.bidId = 'bid_id_1';
-
-          const adUnit_2 = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit_2.bidId = 'bid_id_2';
-
-          const adUnits = [adUnit_1, adUnit_2];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(2);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-          expect(serverRequests[0].data.imp[1]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[1].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0`);
-          expect(serverRequests[0].data.imp[1].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[1].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[1].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[1].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[1].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[1].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.minDuration);
-          expect(serverRequests[0].data.imp[1].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[1].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].params.video.protocols);
-        });
-
-        it('should return a server request with one overridden impression when given two valid ad units with identical identifiers', function () {
-          const adUnit_1 = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit_1.params.video.minDuration = 10;
-
-          const adUnit_2 = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit_2.params.video.minDuration = 15;
-
-          const adUnits = [adUnit_1, adUnit_2];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].params.video.protocols);
-        });
-
-        it('should return two server requests with one impression when given two valid ad units with different bid request identifiers', function () {
-          const adUnit_1 = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit_1.bidderRequestId = 'bidder_request_id_1';
-
-          const adUnit_2 = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit_2.bidderRequestId = 'bidder_request_id_2';
-
-          const adUnits = [adUnit_1, adUnit_2];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(2);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
-          expect(serverRequests[1].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[1].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[1].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[1].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0`);
-          expect(serverRequests[1].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[1].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
-          expect(serverRequests[1].data.imp[0].video.startdelay).to.equal(null);
-          expect(serverRequests[1].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][0]);
-          expect(serverRequests[1].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[1].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.minDuration);
-          expect(serverRequests[1].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.maxDuration);
-          expect(serverRequests[1].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].params.video.protocols);
-        });
-      });
-
-      describe('Native', function () {
-        it('should return a server request with one impression when given a valid ad unit', function () {
-          const adUnits = [examples.adUnit_native];
-
-          const serverRequests = spec.buildRequests(adUnits, examples.adUnit_native);
-
-          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-
-          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
-          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
-          expect(serverRequests[0].data.imp[0].native).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].native.request).to.exist.and.to.be.a('string').and.to.equal(JSON.stringify(examples.serverRequest_native.data.imp[0].native.request))
-        });
-      });
-    });
-
-    describe('Site', function () {
-      it('should return a server request with site information when given a valid ad unit and a valid ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = examples.adUnitContext;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.site).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.site.page).to.exist.and.to.be.an('string').and.to.equal(adUnitContext.refererInfo.referer);
-        expect(serverRequests[0].data.site.id).to.equal(undefined);
-        expect(serverRequests[0].data.site.domain).to.exist.and.to.be.an('string').and.to.equal('we-are-adot.com');
-        expect(serverRequests[0].data.site.name).to.exist.and.to.be.an('string').and.to.equal('we-are-adot.com');
-      });
-
-      it('should return a server request without site information when not given an ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = undefined;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.site).to.equal(null);
-      });
-
-      it('should return a server request without site information when given an ad unit context without referer information', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.refererInfo = undefined;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.site).to.equal(null);
-      });
-
-      it('should return a server request without site information when given an ad unit context with invalid referer information', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.refererInfo = 'bad_referer_information';
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.site).to.equal(null);
-      });
-
-      it('should return a server request without site information when given an ad unit context without referer', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.refererInfo.referer = undefined;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.site).to.equal(null);
-      });
-
-      it('should return a server request without site information when given an ad unit context with an invalid referer', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.refererInfo.referer = {};
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.site).to.equal(null);
-      });
-
-      it('should return a server request without site information when given an ad unit context with a misformatted referer', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.refererInfo.referer = 'we-are-adot';
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.site).to.equal(null);
-      });
-    });
-
-    describe('Device', function () {
-      it('should return a server request with device information when given a valid ad unit and a valid ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.device).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.device.ua).to.exist.and.to.be.a('string');
-        expect(serverRequests[0].data.device.language).to.exist.and.to.be.a('string');
-      });
-    });
-
-    describe('Regs', function () {
-      it('should return a server request with regulations information when given a valid ad unit and a valid ad unit context with GDPR applying', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = examples.adUnitContext;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.regs).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.regs.ext).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.regs.ext.gdpr).to.exist.and.to.be.a('boolean').and.to.equal(adUnitContext.gdprConsent.gdprApplies);
-      });
-
-      it('should return a server request with regulations information when given a valid ad unit and a valid ad unit context with GDPR not applying', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.gdprConsent.gdprApplies = false;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.regs).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.regs.ext).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.regs.ext.gdpr).to.exist.and.to.be.a('boolean').and.to.equal(adUnitContext.gdprConsent.gdprApplies);
-      });
-
-      it('should return a server request without regulations information when not given an ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = undefined;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.regs).to.equal(null);
-      });
-
-      it('should return a server request without regulations information when given an ad unit context without GDPR information', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.gdprConsent = undefined;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.regs).to.equal(null);
-      });
-
-      it('should return a server request without regulations information when given an ad unit context with invalid GDPR information', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.gdprConsent = 'bad_gdpr_consent';
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.regs).to.equal(null);
-      });
-
-      it('should return a server request without regulations information when given an ad unit context with invalid GDPR application information', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.gdprConsent.gdprApplies = 'bad_gdpr_applies';
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.regs).to.equal(null);
-      });
-    });
-
-    describe('User', function () {
-      it('should return a server request with user information when given a valid ad unit and a valid ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = examples.adUnitContext;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.user).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.user.ext).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.user.ext.consent).to.exist.and.to.be.a('string').and.to.equal(adUnitContext.gdprConsent.consentString);
-      });
-
-      it('should return a server request without user information when not given an ad unit context', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = undefined;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.user).to.equal(null);
-      });
-
-      it('should return a server request without user information when given an ad unit context without GDPR information', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.gdprConsent = undefined;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.user).to.equal(null);
-      });
-
-      it('should return a server request without user information when given an ad unit context with invalid GDPR information', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.gdprConsent = 'bad_gdpr_consent';
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.user).to.equal(null);
-      });
-
-      it('should return a server request without user information when given an ad unit context with an invalid consent string', function () {
-        const adUnits = [examples.adUnit_banner];
-
-        const adUnitContext = utils.deepClone(examples.adUnitContext);
-        adUnitContext.gdprConsent.consentString = true;
-
-        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
-
-        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
-        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
-        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
-        expect(serverRequests[0].data.user).to.equal(null);
-      });
-    });
-  });
-
-  describe('interpretResponse', function () {
-    describe('General', function () {
-      it('should return an ad when given a valid server response with one bid with USD currency', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.cur = 'USD';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(null);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
-        expect(ads[0].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return two ads when given a valid server response with two bids', function () {
-        const serverRequest = examples.serverRequest_banner_twoImps;
-
-        const serverResponse = examples.serverResponse_banner_twoBids;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(2);
-
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(null);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
-        expect(ads[0].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
-        expect(ads[0].renderer).to.equal(null);
-        expect(ads[1].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[1].bidId);
-        expect(ads[1].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[1].adm);
-        expect(ads[1].adUrl).to.equal(null);
-        expect(ads[1].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[1].crid);
-        expect(ads[1].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].price);
-        expect(ads[1].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[1].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[1].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[1].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].h);
-        expect(ads[1].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].w);
-        expect(ads[1].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
-        expect(ads[1].renderer).to.equal(null);
-      });
-
-      it('should return no ad when not given a server response', function () {
-        const ads = spec.interpretResponse(null);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when not given a server response body', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given an invalid server response body', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body = 'invalid_body';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response without seat bids', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with invalid seat bids', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid = 'invalid_seat_bids';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with an empty seat bids array', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid = [];
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with an invalid seat bid', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid = 'invalid_bids';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with an empty bids array', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid = [];
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with an invalid bid', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid = ['invalid_bid'];
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without currency', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.cur = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid currency', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.cur = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without impression identifier', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].impid = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid impression identifier', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].impid = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without creative identifier', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].crid = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid creative identifier', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].crid = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without ad markup and ad serving URL', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].adm = undefined;
-        serverResponse.body.seatbid[0].bid[0].nurl = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid ad markup', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].adm = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an ad markup without auction price macro', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].adm = 'creative_data';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid ad serving URL', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].nurl = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an ad serving URL without auction price macro', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].nurl = 'win_notice_url';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without bid price', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].price = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid bid price', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].price = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without extension', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].ext = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid extension', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].ext = 'bad_ext';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without adot extension', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].ext.adot = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid adot extension', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].ext.adot = 'bad_adot_ext';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without media type', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].ext.adot.media_type = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid media type', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].ext.adot.media_type = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an unknown media type', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].ext.adot.media_type = 'unknown_media_type';
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and no server request', function () {
-        const serverRequest = undefined;
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and an invalid server request', function () {
-        const serverRequest = 'bad_server_request';
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without bid request', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest.data = undefined;
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request with an invalid bid request', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest.data = 'bad_bid_request';
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without impression', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest.data.imp = undefined;
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request with an invalid impression field', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest.data.imp = 'invalid_impressions';
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without matching impression', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest.data.imp[0].id = 'unknown_imp_id';
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without internal data', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest._adot_internal = undefined;
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request with invalid internal data', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest._adot_internal = 'bad_internal_data';
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without internal impression data', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest._adot_internal.impressions = undefined;
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request with invalid internal impression data', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest._adot_internal.impressions = 'bad_internal_impression_data';
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without matching internal impression', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest._adot_internal.impressions[0].impressionId = 'unknown_imp_id';
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without internal impression ad unit code', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest._adot_internal.impressions[0].adUnitCode = undefined;
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request with an invalid internal impression ad unit code', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest._adot_internal.impressions[0].adUnitCode = {};
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-    });
-
-    describe('Banner', function () {
-      it('should return an ad when given a valid server response with one bid', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = examples.serverResponse_banner;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(null);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
-        expect(ads[0].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response with one bid without a win notice URL', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].nurl = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(null);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
-        expect(ads[0].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response with one bid using an ad serving URL', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].adm = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.equal(null);
-        expect(ads[0].adUrl).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].nurl);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
-        expect(ads[0].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return no ad when given a server response with a bid without height', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].h = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid height', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].h = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid without width', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].w = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid width', function () {
-        const serverRequest = examples.serverRequest_banner;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-        serverResponse.body.seatbid[0].bid[0].w = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without banner impression', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_banner);
-        serverRequest.data.imp[0].banner = undefined;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_banner);
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-    });
-
-    describe('Video', function () {
-      it('should return an ad when given a valid server response with one bid on an instream impression', function () {
-        const serverRequest = examples.serverRequest_video_instream;
-
-        const serverResponse = examples.serverResponse_video_instream;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverRequest.data.imp[0].video.h);
-        expect(ads[0].width).to.equal(serverRequest.data.imp[0].video.w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response with one bid on an outstream impression', function () {
-        const serverRequest = examples.serverRequest_video_outstream;
-
-        const serverResponse = examples.serverResponse_video_outstream;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverRequest.data.imp[0].video.h);
-        expect(ads[0].width).to.equal(serverRequest.data.imp[0].video.w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.be.an('object');
-      });
-
-      it('should return two ads when given a valid server response with two bids on both instream and outstream impressions', function () {
-        const serverRequest = examples.serverRequest_video_instream_outstream;
-
-        const serverResponse = examples.serverResponse_video_instream_outstream;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(2);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverRequest.data.imp[0].video.h);
-        expect(ads[0].width).to.equal(serverRequest.data.imp[0].video.w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-        expect(ads[1].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[1].bidId);
-        expect(ads[1].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[1].adm);
-        expect(ads[1].adUrl).to.equal(null);
-        expect(ads[1].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[1].vastUrl).to.equal(null);
-        expect(ads[1].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[1].crid);
-        expect(ads[1].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].price);
-        expect(ads[1].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[1].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[1].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverRequest.data.imp[1].video.h);
-        expect(ads[0].width).to.equal(serverRequest.data.imp[1].video.w);
-        expect(ads[1].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[1].renderer).to.be.an('object');
-      });
-
-      it('should return an ad when given a valid server response with one bid without a win notice URL', function () {
-        const serverRequest = examples.serverRequest_video_instream;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-        serverResponse.body.seatbid[0].bid[0].nurl = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverRequest.data.imp[0].video.h);
-        expect(ads[0].width).to.equal(serverRequest.data.imp[0].video.w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response with one bid using an ad serving URL', function () {
-        const serverRequest = examples.serverRequest_video_instream;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-        serverResponse.body.seatbid[0].bid[0].adm = undefined;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.equal(null);
-        expect(ads[0].adUrl).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].nurl);
-        expect(ads[0].vastXml).to.equal(null);
-        expect(ads[0].vastUrl).to.equal(serverResponse.body.seatbid[0].bid[0].nurl);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverRequest.data.imp[0].video.h);
-        expect(ads[0].width).to.equal(serverRequest.data.imp[0].video.w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response with a bid with a video height', function () {
-        const serverRequest = examples.serverRequest_video_instream;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-        serverResponse.body.seatbid[0].bid[0].h = 500;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverRequest.data.imp[0].video.h);
-        expect(ads[0].width).to.equal(serverRequest.data.imp[0].video.w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response with a bid with a video width', function () {
-        const serverRequest = examples.serverRequest_video_instream;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-        serverResponse.body.seatbid[0].bid[0].w = 500;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverRequest.data.imp[0].video.h);
-        expect(ads[0].width).to.equal(serverRequest.data.imp[0].video.w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response with a bid with a video width and height', function () {
-        const serverRequest = examples.serverRequest_video_instream;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-        serverResponse.body.seatbid[0].bid[0].w = 500;
-        serverResponse.body.seatbid[0].bid[0].h = 400;
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(serverResponse.body.seatbid[0].bid[0].h);
-        expect(ads[0].width).to.equal(serverResponse.body.seatbid[0].bid[0].w);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response and server request with a video impression without width', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_video_instream);
-        serverRequest.data.imp[0].video.w = null;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(null);
-        expect(ads[0].width).to.equal(null);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return an ad when given a valid server response and server request with a video impression without height', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_video_instream);
-        serverRequest.data.imp[0].video.h = null;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
-        expect(ads[0].vastUrl).to.equal(null);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].height).to.equal(null);
-        expect(ads[0].width).to.equal(null);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
-        expect(ads[0].renderer).to.equal(null);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid height', function () {
-        const serverRequest = examples.serverRequest_video_instream;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-        serverResponse.body.seatbid[0].bid[0].h = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a server response with a bid with an invalid width', function () {
-        const serverRequest = examples.serverRequest_video_instream;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-        serverResponse.body.seatbid[0].bid[0].w = {};
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      it('should return no ad when given a valid server response and a server request without video impression', function () {
-        const serverRequest = utils.deepClone(examples.serverRequest_video_instream);
-        serverRequest.data.imp[0].video = undefined;
-
-        const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
-
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(0);
-      });
-
-      describe('Outstream renderer', function () {
-        function spyAdRenderingQueue(ad) {
-          const spy = sinon.spy(ad.renderer, 'push');
-
-          this.sinonSpies.push(spy);
-        }
-
-        function executeAdRenderer(ad, onRendererExecution, done) {
-          executeRenderer(ad.renderer, ad);
-
-          setTimeout(() => {
-            try {
-              onRendererExecution();
-            } catch (err) {
-              done(err);
-            }
-
-            done()
-          }, 100);
-        }
-
-        before('Bind helper functions to the Mocha context', function () {
-          this.spyAdRenderingQueue = spyAdRenderingQueue.bind(this);
-
-          window.VASTPlayer = function VASTPlayer() {};
-          window.VASTPlayer.prototype.loadXml = function loadXml() {
-            return new Promise((resolve, reject) => resolve())
-          };
-          window.VASTPlayer.prototype.load = function load() {
-            return new Promise((resolve, reject) => resolve())
-          };
-          window.VASTPlayer.prototype.on = function on(event, callback) {};
-          window.VASTPlayer.prototype.startAd = function startAd() {};
-        });
-
-        beforeEach('Initialize the Sinon spies list', function () {
-          this.sinonSpies = [];
-        });
-
-        afterEach('Clear the registered Sinon spies', function () {
-          this.sinonSpies.forEach(spy => spy.restore());
-        });
-
-        after('clear data', () => {
-          window.VASTPlayer = null;
-        });
-
-        it('should return an ad with valid renderer', function () {
-          const serverRequest = examples.serverRequest_video_outstream;
-          const serverResponse = examples.serverResponse_video_outstream;
-
-          const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-          expect(ads).to.be.an('array').and.to.have.length(1);
-          expect(ads[0].renderer).to.be.an('object');
-        });
-
-        it('should append a command to the ad rendering queue when executing the renderer', function (done) {
-          const serverRequest = examples.serverRequest_video_outstream;
-          const serverResponse = examples.serverResponse_video_outstream;
-
-          const [ad] = spec.interpretResponse(serverResponse, serverRequest);
-
-          this.spyAdRenderingQueue(ad);
-
-          executeAdRenderer(ad, () => {
-            expect(ad.renderer.push.calledOnce).to.equal(true);
-            expect(ad.renderer.push.firstCall.args[0]).to.exist.and.to.be.a('function');
-          }, done);
-        });
-      });
-    });
-
-    describe('Native', function () {
-      it('should return an ad when given a valid server response with one bid', function () {
-        const serverRequest = examples.serverRequest_native;
-        const serverResponse = examples.serverResponse_native;
-        const native = JSON.parse(serverResponse.body.seatbid[0].bid[0].adm).native;
-        const {link, assets} = native;
-        const ads = spec.interpretResponse(serverResponse, serverRequest);
-
-        expect(ads).to.be.an('array').and.to.have.length(1);
-        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
-        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
-        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
-        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
-        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
-        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('native');
-        expect(ads[0].native).to.exist.and.to.be.an('object');
-        expect(Object.keys(ads[0].native)).to.have.length(10);
-        expect(ads[0].native.title).to.equal(assets[0].title.text);
-        expect(ads[0].native.icon.url).to.equal(assets[1].img.url);
-        expect(ads[0].native.icon.width).to.equal(assets[1].img.w);
-        expect(ads[0].native.icon.height).to.equal(assets[1].img.h);
-        expect(ads[0].native.image.url).to.equal(assets[2].img.url);
-        expect(ads[0].native.image.width).to.equal(assets[2].img.w);
-        expect(ads[0].native.image.height).to.equal(assets[2].img.h);
-        expect(ads[0].native.sponsoredBy).to.equal(assets[3].data.value);
-        expect(ads[0].native.body).to.equal(assets[4].data.value);
-        expect(ads[0].native.cta).to.equal(assets[5].data.value);
-        expect(ads[0].native.clickUrl).to.equal(link.url);
-      });
-    });
+  describe('getFloor', function () {
+    it('should return 0 if getFloor is not a function', function () {
+      const floor = spec.getFloor({ getFloor: 0 });
+      expect(floor).to.deep.equal(0);
+    })
+
+    it('should return floor result if currency are correct', function () {
+      const currency = 'EUR';
+      const floorResult = 2;
+      const fn = sinon.stub().callsFake(() => ({ currency, floor: floorResult }))
+      const adUnit = { getFloor: fn };
+      const size = {};
+      const mediaType = {};
+
+      const floor = spec.getFloor(adUnit, size, mediaType, currency);
+      expect(floor).to.deep.equal(floorResult);
+      expect(fn.calledOnce).to.equal(true);
+      expect(fn.calledWithExactly({ currency, mediaType, size })).to.equal(true);
+    })
+
+    it('should return floor result if currency are not correct', function () {
+      const currency = 'EUR';
+      const floorResult = 2;
+      const fn = sinon.stub().callsFake(() => ({ currency: 'wrong_currency', floor: floorResult }))
+      const adUnit = { getFloor: fn };
+      const size = {};
+      const mediaType = {};
+
+      const floor = spec.getFloor(adUnit, size, mediaType, currency);
+      expect(floor).to.deep.equal(0);
+      expect(fn.calledOnce).to.equal(true);
+      expect(fn.calledWithExactly({ currency, mediaType, size })).to.equal(true);
+    })
   });
 });
diff --git a/test/spec/modules/adpartnerBidAdapter_spec.js b/test/spec/modules/adpartnerBidAdapter_spec.js
index d30ef7ebf71..d9f9b0d0074 100644
--- a/test/spec/modules/adpartnerBidAdapter_spec.js
+++ b/test/spec/modules/adpartnerBidAdapter_spec.js
@@ -52,7 +52,7 @@ describe('AdpartnerAdapter', function () {
   });
 
   describe('buildRequests', function () {
-    let validEndpoint = ENDPOINT_PROTOCOL + '://' + ENDPOINT_DOMAIN + ENDPOINT_PATH + '?tag=123,456&sizes=300x250|300x600,728x90&referer=https%3A%2F%2Ftest.domain';
+    let validEndpoint = ENDPOINT_PROTOCOL + '://' + ENDPOINT_DOMAIN + ENDPOINT_PATH + '?tag=123,456&partner=777&sizes=300x250|300x600,728x90,300x250&referer=https%3A%2F%2Ftest.domain';
 
     let validRequest = [
       {
@@ -72,12 +72,21 @@ describe('AdpartnerAdapter', function () {
         'adUnitCode': 'adunit-code-2',
         'sizes': [[728, 90]],
         'bidId': '22aidtbx5eabd9'
+      },
+      {
+        'bidder': BIDDER_CODE,
+        'params': {
+          'partnerId': 777
+        },
+        'adUnitCode': 'partner-code-3',
+        'sizes': [[300, 250]],
+        'bidId': '5d4531d5a6c013'
       }
     ];
 
     let bidderRequest = {
       refererInfo: {
-        referer: 'https://test.domain'
+        page: 'https://test.domain'
       }
     };
 
@@ -100,6 +109,9 @@ describe('AdpartnerAdapter', function () {
       expect(payload[1].unitId).to.equal(456);
       expect(payload[1].sizes).to.deep.equal([[728, 90]]);
       expect(payload[1].bidId).to.equal('22aidtbx5eabd9');
+      expect(payload[2].partnerId).to.equal(777);
+      expect(payload[2].sizes).to.deep.equal([[300, 250]]);
+      expect(payload[2].bidId).to.equal('5d4531d5a6c013');
     });
   });
 
@@ -113,40 +125,45 @@ describe('AdpartnerAdapter', function () {
   describe('interpretResponse', function () {
     const bidRequest = {
       'method': 'POST',
-      'url': ENDPOINT_PROTOCOL + '://' + ENDPOINT_DOMAIN + ENDPOINT_PATH + '?tag=123,456&code=adunit-code-1,adunit-code-2&bid=30b31c1838de1e,22aidtbx5eabd9&sizes=300x250|300x600,728x90&referer=https%3A%2F%2Ftest.domain',
-      'data': '[{"unitId": 13144370,"adUnitCode": "div-gpt-ad-1460505748561-0","sizes": [[300, 250], [300, 600]],"bidId": "2bdcb0b203c17d","referer": "https://test.domain/index.html"},{"unitId": 13144370,"adUnitCode":"div-gpt-ad-1460505748561-1","sizes": [[768, 90]],"bidId": "3dc6b8084f91a8","referer": "https://test.domain/index.html"}]'
+      'url': ENDPOINT_PROTOCOL + '://' + ENDPOINT_DOMAIN + ENDPOINT_PATH + '?tag=123,456&partner=777code=adunit-code-1,adunit-code-2,partner-code-3&bid=30b31c1838de1e,22aidtbx5eabd9,5d4531d5a6c013&sizes=300x250|300x600,728x90,300x250&referer=https%3A%2F%2Ftest.domain',
+      'data': '[{"unitId": 13144370,"adUnitCode": "div-gpt-ad-1460505748561-0","sizes": [[300, 250], [300, 600]],"bidId": "2bdcb0b203c17d","referer": "https://test.domain/index.html"},' +
+        '{"unitId": 13144370,"adUnitCode":"div-gpt-ad-1460505748561-1","sizes": [[768, 90]],"bidId": "3dc6b8084f91a8","referer": "https://test.domain/index.html"},' +
+        '{"unitId": 0,"partnerId": 777,"adUnitCode":"div-gpt-ad-1460505748561-2","sizes": [[300, 250]],"bidId": "5d4531d5a6c013","referer": "https://test.domain/index.html"}]'
     };
 
     const bidResponse = {
       body: {
         'div-gpt-ad-1460505748561-0':
-        {
-          'ad': '<div>ad</div>',
-          'width': 300,
-          'height': 250,
-          'creativeId': '8:123456',
-          'syncs': [
-            {'type': 'image', 'url': 'https://test.domain/tracker_1.gif'},
-            {'type': 'image', 'url': 'https://test.domain/tracker_2.gif'},
-            {'type': 'image', 'url': 'https://test.domain/tracker_3.gif'}
-          ],
-          'winNotification': [
-            {
-              'method': 'POST',
-              'path': '/hb/bid_won?test=1',
-              'data': {
-                'ad': [
-                  {'dsp': 8, 'id': 800008, 'cost': 1.0e-5, 'nurl': 'https://test.domain/'}
-                ],
-                'unit_id': 1234,
-                'site_id': 123
+          {
+            'ad': '<div>ad</div>',
+            'width': 300,
+            'height': 250,
+            'creativeId': '8:123456',
+            'adomain': [
+              'test.domain'
+            ],
+            'syncs': [
+              {'type': 'image', 'url': 'https://test.domain/tracker_1.gif'},
+              {'type': 'image', 'url': 'https://test.domain/tracker_2.gif'},
+              {'type': 'image', 'url': 'https://test.domain/tracker_3.gif'}
+            ],
+            'winNotification': [
+              {
+                'method': 'POST',
+                'path': '/hb/bid_won?test=1',
+                'data': {
+                  'ad': [
+                    {'dsp': 8, 'id': 800008, 'cost': 1.0e-5, 'nurl': 'https://test.domain/'}
+                  ],
+                  'unit_id': 1234,
+                  'site_id': 123
+                }
               }
-            }
-          ],
-          'cpm': 0.01,
-          'currency': 'USD',
-          'netRevenue': true
-        }
+            ],
+            'cpm': 0.01,
+            'currency': 'USD',
+            'netRevenue': true
+          }
       },
       headers: {}
     };
@@ -160,6 +177,7 @@ describe('AdpartnerAdapter', function () {
       expect(result[0].creativeId).to.equal('8:123456');
       expect(result[0].currency).to.equal('USD');
       expect(result[0].ttl).to.equal(60);
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['test.domain']);
       expect(result[0].winNotification[0]).to.deep.equal({'method': 'POST', 'path': '/hb/bid_won?test=1', 'data': {'ad': [{'dsp': 8, 'id': 800008, 'cost': 1.0e-5, 'nurl': 'https://test.domain/'}], 'unit_id': 1234, 'site_id': 123}});
     });
   });
@@ -181,7 +199,10 @@ describe('AdpartnerAdapter', function () {
       'winNotification': [],
       'cpm': 0.01,
       'currency': 'USD',
-      'netRevenue': true
+      'netRevenue': true,
+      'adomain': [
+        'test.domain'
+      ],
     };
 
     it('fill ad for response', function () {
@@ -193,6 +214,7 @@ describe('AdpartnerAdapter', function () {
       expect(result.creativeId).to.equal('8:123456');
       expect(result.currency).to.equal('USD');
       expect(result.ttl).to.equal(60);
+      expect(result.meta.advertiserDomains).to.deep.equal(['test.domain']);
     });
   });
 
@@ -231,4 +253,84 @@ describe('AdpartnerAdapter', function () {
       expect(ajaxStub.firstCall.args[1]).to.deep.equal(JSON.stringify(bid.winNotification[0].data));
     });
   });
+
+  describe('getUserSyncs', function () {
+    const bidResponse = [{
+      body: {
+        'div-gpt-ad-1460505748561-0':
+          {
+            'ad': '<div>ad</div>',
+            'width': 300,
+            'height': 250,
+            'creativeId': '8:123456',
+            'adomain': [
+              'test.domain'
+            ],
+            'syncs': [
+              {'type': 'image', 'link': 'https://test.domain/tracker_1.gif'},
+              {'type': 'image', 'link': 'https://test.domain/tracker_2.gif'},
+              {'type': 'image', 'link': 'https://test.domain/tracker_3.gif'}
+            ],
+            'winNotification': [
+              {
+                'method': 'POST',
+                'path': '/hb/bid_won?test=1',
+                'data': {
+                  'ad': [
+                    {'dsp': 8, 'id': 800008, 'cost': 1.0e-5, 'nurl': 'https://test.domain/'}
+                  ],
+                  'unit_id': 1234,
+                  'site_id': 123
+                }
+              }
+            ],
+            'cpm': 0.01,
+            'currency': 'USD',
+            'netRevenue': true
+          }
+      },
+      headers: {}
+    }];
+
+    it('should return nothing when sync is disabled', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': false
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should register image sync when only image is enabled where gdprConsent is undefined', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': true
+      };
+
+      const gdprConsent = undefined;
+      let syncs = spec.getUserSyncs(syncOptions, bidResponse, gdprConsent);
+      expect(syncs.length).to.equal(3);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://test.domain/tracker_1.gif');
+    });
+
+    it('should register image sync when only image is enabled where gdprConsent is defined', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'someString',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions, bidResponse, gdprConsent);
+      expect(syncs.length).to.equal(3);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://test.domain/tracker_1.gif?gdpr=1&gdpr_consent=someString');
+    });
+  });
 });
diff --git a/test/spec/modules/adplusBidAdapter_spec.js b/test/spec/modules/adplusBidAdapter_spec.js
new file mode 100644
index 00000000000..840d86c80f1
--- /dev/null
+++ b/test/spec/modules/adplusBidAdapter_spec.js
@@ -0,0 +1,213 @@
+import {expect} from 'chai';
+import {spec, BIDDER_CODE, ADPLUS_ENDPOINT, } from 'modules/adplusBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+
+describe('AplusBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.be.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      let validRequest = {
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          inventoryId: '30',
+          adUnitId: '1',
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let validRequest = {
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          inventoryId: '30',
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(false);
+    });
+
+    it('should return false when required param types are wrong', function () {
+      let validRequest = {
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          inventoryId: 30,
+          adUnitId: '1',
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(false);
+    });
+
+    it('should return false when size is not exists', function () {
+      let validRequest = {
+        params: {
+          inventoryId: 30,
+          adUnitId: '1',
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(false);
+    });
+
+    it('should return false when size is wrong', function () {
+      let validRequest = {
+        mediaTypes: {
+          banner: {
+            sizes: [[300]]
+          }
+        },
+        params: {
+          inventoryId: 30,
+          adUnitId: '1',
+        }
+      };
+      expect(spec.isBidRequestValid(validRequest)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let validRequest = [
+      {
+        bidder: BIDDER_CODE,
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          inventoryId: '-1',
+          adUnitId: '-3',
+        },
+        bidId: '2bdcb0b203c17d'
+      },
+    ];
+
+    let bidderRequest = {
+      refererInfo: {
+        referer: 'https://test.domain'
+      }
+    };
+
+    it('bidRequest HTTP method', function () {
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      expect(request[0].method).to.equal('GET');
+    });
+
+    it('bidRequest url', function () {
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      expect(request[0].url).to.equal(ADPLUS_ENDPOINT);
+    });
+
+    it('tests bidRequest data is clean and has the right values', function () {
+      const request = spec.buildRequests(validRequest, bidderRequest);
+
+      expect(request[0].data.bidId).to.equal('2bdcb0b203c17d');
+      expect(request[0].data.inventoryId).to.equal('-1');
+      expect(request[0].data.adUnitId).to.equal('-3');
+      expect(request[0].data.adUnitWidth).to.equal(300);
+      expect(request[0].data.adUnitHeight).to.equal(250);
+      expect(request[0].data.sdkVersion).to.equal('1');
+      expect(typeof request[0].data.session).to.equal('string');
+      expect(request[0].data.session).length(36);
+      expect(request[0].data.interstitial).to.equal(0);
+      expect(request[0].data).to.not.have.deep.property('extraData');
+      expect(request[0].data).to.not.have.deep.property('yearOfBirth');
+      expect(request[0].data).to.not.have.deep.property('gender');
+      expect(request[0].data).to.not.have.deep.property('categories');
+      expect(request[0].data).to.not.have.deep.property('latitude');
+      expect(request[0].data).to.not.have.deep.property('longitude');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const requestData = {
+      language: window.navigator.language,
+      screenWidth: 1440,
+      screenHeight: 900,
+      sdkVersion: '1',
+      inventoryId: '-1',
+      adUnitId: '-3',
+      adUnitWidth: 300,
+      adUnitHeight: 250,
+      domain: 'tassandigi.com',
+      pageUrl: 'https%3A%2F%2Ftassandigi.com%2Fserafettin%2Fads.html',
+      interstitial: 0,
+      session: '1c02db03-5289-932a-93af-7b4022611fec',
+      token: '1c02db03-5289-937a-93df-7b4022611fec',
+      secure: 1,
+      bidId: '2bdcb0b203c17d',
+    };
+    const bidRequest = {
+      'method': 'GET',
+      'url': ADPLUS_ENDPOINT,
+      'data': requestData,
+    };
+
+    const bidResponse = {
+      body: [
+        {
+          'ad': '<div>ad</div>',
+          'advertiserDomains': [
+            'advertiser.com'
+          ],
+          'categoryIDs': [
+            'IAB-111'
+          ],
+          'cpm': 3.57,
+          'creativeID': '1',
+          'currency': 'TRY',
+          'dealID': '1',
+          'height': 300,
+          'mediaType': 'banner',
+          'netRevenue': true,
+          'requestID': '2bdcb0b203c17d',
+          'ttl': 300,
+          'width': 250
+        }
+      ],
+      headers: {}
+    };
+
+    const emptyBidResponse = {
+      body: null,
+    };
+
+    it('returns an empty array when the result body is not valid', function () {
+      const result = spec.interpretResponse(emptyBidResponse, bidRequest);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('result is correct', function () {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+      expect(result[0].requestId).to.equal('2bdcb0b203c17d');
+      expect(result[0].cpm).to.equal(3.57);
+      expect(result[0].width).to.equal(250);
+      expect(result[0].height).to.equal(300);
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].currency).to.equal('TRY');
+      expect(result[0].dealId).to.equal('1');
+      expect(result[0].mediaType).to.equal('banner');
+      expect(result[0].netRevenue).to.equal(true);
+      expect(result[0].ttl).to.equal(300);
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['advertiser.com']);
+      expect(result[0].meta.secondaryCatIds).to.deep.equal(['IAB-111']);
+    });
+  });
+});
diff --git a/test/spec/modules/adpod_spec.js b/test/spec/modules/adpod_spec.js
index 5e4bcce1fe6..a6164f919ef 100644
--- a/test/spec/modules/adpod_spec.js
+++ b/test/spec/modules/adpod_spec.js
@@ -73,16 +73,11 @@ describe('adpod.js', function () {
         mediaType: 'video'
       };
 
-      let bidderRequest = {
-        adUnitCode: 'adUnit_123',
-        mediaTypes: {
-          video: {
-            context: 'outstream'
-          }
-        }
-      }
+      let videoMT = {
+        context: 'outstream'
+      };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bid, function () {}, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bid, function () {}, videoMT);
       expect(callbackResult).to.equal(true);
     });
 
@@ -132,22 +127,16 @@ describe('adpod.js', function () {
         }
       };
 
-      let bidderRequest = {
-        adUnitCode: 'adpod_1',
-        auctionId: 'no_defer_123',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 300,
-            durationRangeSec: [15, 30, 45],
-            requireExactDuration: false
-          }
-        },
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 300,
+        durationRangeSec: [15, 30, 45],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, videoMT);
 
       // check if bid adsereverTargeting is setup
       expect(callbackResult).to.be.null;
@@ -214,22 +203,16 @@ describe('adpod.js', function () {
           durationBucket: 30
         }
       };
-      let bidderRequest = {
-        adUnitCode: 'adpod_1',
-        auctionId: 'full_abc123',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 120,
-            durationRangeSec: [15, 30],
-            requireExactDuration: false
-          }
-        }
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 120,
+        durationRangeSec: [15, 30],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, videoMT);
 
       expect(callbackResult).to.be.null;
       expect(afterBidAddedSpy.calledTwice).to.equal(true);
@@ -276,21 +259,15 @@ describe('adpod.js', function () {
           durationBucket: 30
         }
       };
-      let bidderRequest = {
-        adUnitCode: 'adpod_2',
-        auctionId: 'timer_abc234',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 120,
-            durationRangeSec: [15, 30],
-            requireExactDuration: true
-          }
-        }
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 120,
+        durationRangeSec: [15, 30],
+        requireExactDuration: true
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse, afterBidAddedSpy, videoMT);
       clock.tick(31);
 
       expect(callbackResult).to.be.null;
@@ -370,23 +347,17 @@ describe('adpod.js', function () {
         }
       };
 
-      let bidderRequest = {
-        adUnitCode: 'adpod_3',
-        auctionId: 'multi_call_abc345',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 45,
-            durationRangeSec: [15, 30],
-            requireExactDuration: false
-          }
-        }
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 45,
+        durationRangeSec: [15, 30],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, bidderRequest);
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse3, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, videoMT);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse3, afterBidAddedSpy, videoMT);
       clock.next();
 
       expect(callbackResult).to.be.null;
@@ -459,22 +430,16 @@ describe('adpod.js', function () {
         }
       };
 
-      let bidderRequest = {
-        adUnitCode: 'adpod_4',
-        auctionId: 'no_category_abc345',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 45,
-            durationRangeSec: [15, 30],
-            requireExactDuration: false
-          }
-        }
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 45,
+        durationRangeSec: [15, 30],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, videoMT);
 
       expect(callbackResult).to.be.null;
       expect(afterBidAddedSpy.calledTwice).to.equal(true);
@@ -519,21 +484,15 @@ describe('adpod.js', function () {
         }
       };
 
-      let bidderRequest = {
-        adUnitCode: 'adpod_5',
-        auctionId: 'missing_category_abc345',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 45,
-            durationRangeSec: [15, 30],
-            requireExactDuration: false
-          }
-        }
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 45,
+        durationRangeSec: [15, 30],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
 
       expect(callbackResult).to.be.null;
       expect(afterBidAddedSpy.calledOnce).to.equal(true);
@@ -596,22 +555,16 @@ describe('adpod.js', function () {
           durationBucket: 45
         }
       };
-      let bidderRequest = {
-        adUnitCode: 'adpod_4',
-        auctionId: 'duplicate_def123',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 120,
-            durationRangeSec: [15, 30, 45],
-            requireExactDuration: false
-          }
-        }
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 120,
+        durationRangeSec: [15, 30, 45],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, videoMT);
 
       expect(callbackResult).to.be.null;
       expect(afterBidAddedSpy.calledTwice).to.equal(true);
@@ -669,22 +622,16 @@ describe('adpod.js', function () {
           durationBucket: 30
         }
       };
-      let bidderRequest = {
-        adUnitCode: 'adpod_5',
-        auctionId: 'error_xyz123',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 120,
-            durationRangeSec: [15, 30, 45],
-            requireExactDuration: false
-          }
-        }
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 120,
+        durationRangeSec: [15, 30, 45],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, videoMT);
 
       expect(doCallbacksIfTimedoutStub.calledTwice).to.equal(true);
       expect(logWarnStub.calledOnce).to.equal(true);
@@ -742,21 +689,15 @@ describe('adpod.js', function () {
         }
       };
 
-      let bidderRequest = {
-        adUnitCode: 'adpod_5',
-        auctionId: 'test_category_abc345',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 45,
-            durationRangeSec: [15, 30],
-            requireExactDuration: false
-          }
-        }
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 45,
+        durationRangeSec: [15, 30],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
 
       expect(callbackResult).to.be.null;
       expect(afterBidAddedSpy.calledOnce).to.equal(true);
@@ -820,22 +761,16 @@ describe('adpod.js', function () {
         }
       };
 
-      let bidderRequest = {
-        adUnitCode: 'adpod_1',
-        auctionId: 'no_defer_123',
-        mediaTypes: {
-          video: {
-            context: ADPOD,
-            playerSize: [[300, 300]],
-            adPodDurationSec: 300,
-            durationRangeSec: [15, 30, 45],
-            requireExactDuration: false
-          }
-        },
+      let videoMT = {
+        context: ADPOD,
+        playerSize: [[300, 300]],
+        adPodDurationSec: 300,
+        durationRangeSec: [15, 30, 45],
+        requireExactDuration: false
       };
 
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, bidderRequest);
-      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, bidderRequest);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse1, afterBidAddedSpy, videoMT);
+      callPrebidCacheHook(callbackFn, auctionInstance, bidResponse2, afterBidAddedSpy, videoMT);
 
       expect(auctionBids[0].adserverTargeting.hb_pb_cat_dur).to.equal('tier7_test_15s');
       expect(auctionBids[1].adserverTargeting.hb_pb_cat_dur).to.equal('12.00_value_15s');
@@ -985,7 +920,7 @@ describe('adpod.js', function () {
       },
       vastXml: '<VAST>test XML here</VAST>'
     };
-    const bidderRequestNoExact = {
+    const adUnitNoExact = {
       mediaTypes: {
         video: {
           context: ADPOD,
@@ -996,7 +931,7 @@ describe('adpod.js', function () {
         }
       }
     };
-    const bidderRequestWithExact = {
+    const adUnitWithExact = {
       mediaTypes: {
         video: {
           context: ADPOD,
@@ -1051,7 +986,7 @@ describe('adpod.js', function () {
 
       let goodBid = utils.deepClone(adpodTestBid);
       goodBid.meta.primaryCatId = undefined;
-      checkVideoBidSetupHook(callbackFn, goodBid, bidderRequestNoExact, {}, ADPOD);
+      checkVideoBidSetupHook(callbackFn, goodBid, adUnitNoExact, adUnitNoExact.mediaTypes.video, ADPOD);
       expect(callbackResult).to.be.null;
       expect(bailResult).to.equal(true);
       expect(logErrorStub.called).to.equal(false);
@@ -1059,7 +994,7 @@ describe('adpod.js', function () {
 
     it('returns true when adpod bid is missing iab category while brandCategoryExclusion in config is false', function() {
       let goodBid = utils.deepClone(adpodTestBid);
-      checkVideoBidSetupHook(callbackFn, goodBid, bidderRequestNoExact, {}, ADPOD);
+      checkVideoBidSetupHook(callbackFn, goodBid, adUnitNoExact, adUnitNoExact.mediaTypes.video, ADPOD);
       expect(callbackResult).to.be.null;
       expect(bailResult).to.equal(true);
       expect(logErrorStub.called).to.equal(false);
@@ -1067,7 +1002,7 @@ describe('adpod.js', function () {
 
     it('returns false when a required property from an adpod bid is missing', function() {
       function testInvalidAdpodBid(badTestBid, shouldErrorBeLogged) {
-        checkVideoBidSetupHook(callbackFn, badTestBid, bidderRequestNoExact, {}, ADPOD);
+        checkVideoBidSetupHook(callbackFn, badTestBid, adUnitNoExact, adUnitNoExact.mediaTypes.video, ADPOD);
         expect(callbackResult).to.be.null;
         expect(bailResult).to.equal(false);
         expect(logErrorStub.called).to.equal(shouldErrorBeLogged);
@@ -1108,7 +1043,7 @@ describe('adpod.js', function () {
 
       it('when requireExactDuration is true', function() {
         let goodBid = utils.deepClone(basicBid);
-        checkVideoBidSetupHook(callbackFn, goodBid, bidderRequestWithExact, {}, ADPOD);
+        checkVideoBidSetupHook(callbackFn, goodBid, adUnitWithExact, adUnitWithExact.mediaTypes.video, ADPOD);
 
         expect(callbackResult).to.be.null;
         expect(goodBid.video.durationBucket).to.equal(30);
@@ -1117,7 +1052,7 @@ describe('adpod.js', function () {
 
         let badBid = utils.deepClone(basicBid);
         badBid.video.durationSeconds = 14;
-        checkVideoBidSetupHook(callbackFn, badBid, bidderRequestWithExact, {}, ADPOD);
+        checkVideoBidSetupHook(callbackFn, badBid, adUnitWithExact, adUnitWithExact.mediaTypes.video, ADPOD);
 
         expect(callbackResult).to.be.null;
         expect(badBid.video.durationBucket).to.be.undefined;
@@ -1127,7 +1062,7 @@ describe('adpod.js', function () {
 
       it('when requireExactDuration is false and bids are bucketed properly', function() {
         function testRoundingForGoodBId(bid, bucketValue) {
-          checkVideoBidSetupHook(callbackFn, bid, bidderRequestNoExact, {}, ADPOD);
+          checkVideoBidSetupHook(callbackFn, bid, adUnitNoExact, adUnitNoExact.mediaTypes.video, ADPOD);
           expect(callbackResult).to.be.null;
           expect(bid.video.durationBucket).to.equal(bucketValue);
           expect(bailResult).to.equal(true);
@@ -1157,7 +1092,7 @@ describe('adpod.js', function () {
 
       it('when requireExactDuration is false and bid duration exceeds listed buckets', function() {
         function testRoundingForBadBid(bid) {
-          checkVideoBidSetupHook(callbackFn, bid, bidderRequestNoExact, {}, ADPOD);
+          checkVideoBidSetupHook(callbackFn, bid, adUnitNoExact, adUnitNoExact.mediaTypes.video, ADPOD);
           expect(callbackResult).to.be.null;
           expect(bid.video.durationBucket).to.be.undefined;
           expect(bailResult).to.equal(false);
diff --git a/test/spec/modules/adponeBidAdapter_spec.js b/test/spec/modules/adponeBidAdapter_spec.js
index 737f1c284e1..92fd672df47 100644
--- a/test/spec/modules/adponeBidAdapter_spec.js
+++ b/test/spec/modules/adponeBidAdapter_spec.js
@@ -110,122 +110,109 @@ describe('adponeBidAdapter', function () {
       expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
-});
-
-describe('interpretResponse', function () {
-  let serverResponse;
-  let bidRequest = { data: {id: '1234'} };
-
-  beforeEach(function () {
-    serverResponse = {
-      body: {
-        id: '2579e20c0bb89',
-        seatbid: [
-          {
-            bid: [
-              {
-                id: '613673EF-A07C-4486-8EE9-3FC71A7DC73D',
-                impid: '2579e20c0bb89_0',
-                price: 1,
-                adm: '<html><a href="https://www.adpone.com" target="_blank"><img src ="https://placehold.it/300x250" /></a></html>',
-                adomain: [
-                  'www.addomain.com'
-                ],
-                iurl: 'https://localhost11',
-                crid: 'creative111',
-                h: 250,
-                w: 300,
-                ext: {
-                  dspid: 6
+  describe('interpretResponse', function () {
+    let serverResponse;
+    let bidRequest = { data: {id: '1234'} };
+
+    beforeEach(function () {
+      serverResponse = {
+        body: {
+          id: '2579e20c0bb89',
+          seatbid: [
+            {
+              bid: [
+                {
+                  id: '613673EF-A07C-4486-8EE9-3FC71A7DC73D',
+                  impid: '2579e20c0bb89_0',
+                  price: 1,
+                  adm: '<html><a href="https://www.adpone.com" target="_blank"><img src ="https://placehold.it/300x250" /></a></html>',
+                  meta: {
+                    adomain: [
+                      'adpone.com'
+                    ]
+                  },
+                  iurl: 'https://localhost11',
+                  crid: 'creative111',
+                  h: 250,
+                  w: 300,
+                  ext: {
+                    dspid: 6
+                  }
                 }
-              }
-            ],
-            seat: 'adpone'
-          }
-        ],
-        cur: 'USD'
-      },
-    };
-  });
-
-  it('validate_response_params', function() {
-    const newResponse = spec.interpretResponse(serverResponse, bidRequest);
-    expect(newResponse[0].id).to.be.equal('613673EF-A07C-4486-8EE9-3FC71A7DC73D');
-    expect(newResponse[0].requestId).to.be.equal('1234');
-    expect(newResponse[0].cpm).to.be.equal(1);
-    expect(newResponse[0].width).to.be.equal(300);
-    expect(newResponse[0].height).to.be.equal(250);
-    expect(newResponse[0].currency).to.be.equal('USD');
-    expect(newResponse[0].netRevenue).to.be.equal(true);
-    expect(newResponse[0].ttl).to.be.equal(300);
-    expect(newResponse[0].ad).to.be.equal('<html><a href="https://www.adpone.com" target="_blank"><img src ="https://placehold.it/300x250" /></a></html>');
-  });
+              ],
+              seat: 'adpone'
+            }
+          ],
+          cur: 'USD'
+        },
+      };
+    });
 
-  it('should correctly reorder the server response', function () {
-    const newResponse = spec.interpretResponse(serverResponse, bidRequest);
-    expect(newResponse.length).to.be.equal(1);
-    expect(newResponse[0]).to.deep.equal({
-      id: '613673EF-A07C-4486-8EE9-3FC71A7DC73D',
-      requestId: '1234',
-      cpm: 1,
-      width: 300,
-      height: 250,
-      creativeId: 'creative111',
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 300,
-      ad: '<html><a href="https://www.adpone.com" target="_blank"><img src ="https://placehold.it/300x250" /></a></html>'
+    it('validate_response_params', function() {
+      const newResponse = spec.interpretResponse(serverResponse, bidRequest);
+      expect(newResponse[0].id).to.be.equal('613673EF-A07C-4486-8EE9-3FC71A7DC73D');
+      expect(newResponse[0].requestId).to.be.equal('1234');
+      expect(newResponse[0].cpm).to.be.equal(1);
+      expect(newResponse[0].width).to.be.equal(300);
+      expect(newResponse[0].height).to.be.equal(250);
+      expect(newResponse[0].currency).to.be.equal('USD');
+      expect(newResponse[0].netRevenue).to.be.equal(true);
+      expect(newResponse[0].ttl).to.be.equal(300);
+      expect(newResponse[0].ad).to.be.equal('<html><a href="https://www.adpone.com" target="_blank"><img src ="https://placehold.it/300x250" /></a></html>');
     });
-  });
 
-  it('should not add responses if the cpm is 0 or null', function () {
-    serverResponse.body.seatbid[0].bid[0].price = 0;
-    let response = spec.interpretResponse(serverResponse, bidRequest);
-    expect(response).to.deep.equal([]);
+    it('should correctly reorder the server response', function () {
+      const newResponse = spec.interpretResponse(serverResponse, bidRequest);
+      expect(newResponse.length).to.be.equal(1);
+      expect(newResponse[0]).to.deep.equal({
+        id: '613673EF-A07C-4486-8EE9-3FC71A7DC73D',
+        meta: {
+          advertiserDomains: [
+            'adpone.com'
+          ]
+        },
+        requestId: '1234',
+        cpm: 1,
+        width: 300,
+        height: 250,
+        creativeId: 'creative111',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 300,
+        ad: '<html><a href="https://www.adpone.com" target="_blank"><img src ="https://placehold.it/300x250" /></a></html>'
+      });
+    });
 
-    serverResponse.body.seatbid[0].bid[0].price = null;
-    response = spec.interpretResponse(serverResponse, bidRequest);
-    expect(response).to.deep.equal([])
-  });
-  it('should add responses if the cpm is valid', function () {
-    serverResponse.body.seatbid[0].bid[0].price = 0.5;
-    let response = spec.interpretResponse(serverResponse, bidRequest);
-    expect(response).to.not.deep.equal([]);
-  });
-});
+    it('should not add responses if the cpm is 0 or null', function () {
+      serverResponse.body.seatbid[0].bid[0].price = 0;
+      let response = spec.interpretResponse(serverResponse, bidRequest);
+      expect(response).to.deep.equal([]);
 
-describe('getUserSyncs', function () {
-  it('Verifies that getUserSyncs is a function', function () {
-    expect((typeof (spec.getUserSyncs)).should.equals('function'));
-  });
-  it('Verifies getUserSyncs returns expected result', function () {
-    expect((typeof (spec.getUserSyncs)).should.equals('function'));
-    expect(spec.getUserSyncs({iframeEnabled: true})).to.deep.equal({
-      type: 'iframe',
-      url: 'https://eu-ads.adpone.com'
+      serverResponse.body.seatbid[0].bid[0].price = null;
+      response = spec.interpretResponse(serverResponse, bidRequest);
+      expect(response).to.deep.equal([])
+    });
+    it('should add responses if the cpm is valid', function () {
+      serverResponse.body.seatbid[0].bid[0].price = 0.5;
+      let response = spec.interpretResponse(serverResponse, bidRequest);
+      expect(response).to.not.deep.equal([]);
     });
   });
-  it('Verifies that iframeEnabled: false returns an empty array', function () {
-    expect(spec.getUserSyncs({iframeEnabled: false})).to.deep.equal(EMPTY_ARRAY);
-  });
-  it('Verifies that iframeEnabled: null returns an empty array', function () {
-    expect(spec.getUserSyncs(null)).to.deep.equal(EMPTY_ARRAY);
-  });
-});
 
-describe('test onBidWon function', function () {
-  beforeEach(function() {
-    sinon.stub(utils, 'triggerPixel');
-  });
-  afterEach(function() {
-    utils.triggerPixel.restore();
-  });
-  it('exists and is a function', () => {
-    expect(spec.onBidWon).to.exist.and.to.be.a('function');
-  });
-  it('should return nothing', function () {
-    var response = spec.onBidWon({});
-    expect(response).to.be.an('undefined')
-    expect(utils.triggerPixel.called).to.equal(true);
+  describe('test onBidWon function', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('exists and is a function', () => {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function');
+    });
+    it('should return nothing', function () {
+      var response = spec.onBidWon({});
+      expect(response).to.be.an('undefined')
+      expect(utils.triggerPixel.called).to.equal(true);
+    });
   });
 });
diff --git a/test/spec/modules/adprimeBidAdapter_spec.js b/test/spec/modules/adprimeBidAdapter_spec.js
index 3508a1175a6..5efed4ec5ab 100644
--- a/test/spec/modules/adprimeBidAdapter_spec.js
+++ b/test/spec/modules/adprimeBidAdapter_spec.js
@@ -6,9 +6,13 @@ describe('AdprimebBidAdapter', function () {
   const bid = {
     bidId: '23fhj33i987f',
     bidder: 'adprime',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    },
     params: {
-      placementId: 0,
-      traffic: BANNER
+      placementId: 'testBanner'
     }
   };
 
@@ -40,7 +44,7 @@ describe('AdprimebBidAdapter', function () {
       expect(serverRequest.method).to.equal('POST');
     });
     it('Returns valid URL', function () {
-      expect(serverRequest.url).to.equal('https://delta.adprime.com/?c=o&m=multi');
+      expect(serverRequest.url).to.equal('https://delta.adprime.com/pbjs');
     });
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
@@ -55,17 +59,16 @@ describe('AdprimebBidAdapter', function () {
       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', 'hPlayer', 'wPlayer', 'schain', 'keywords');
-      expect(placement.placementId).to.equal(0);
+      expect(placement).to.have.keys('placementId', 'bidId', 'identeties', 'adFormat', 'sizes', 'hPlayer', 'wPlayer', 'schain', 'keywords', 'audiences', 'bidFloor');
+      expect(placement.placementId).to.equal('testBanner');
       expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal(BANNER);
+      expect(placement.adFormat).to.equal(BANNER);
       expect(placement.schain).to.be.an('object');
     });
 
     it('Returns valid data for mediatype video', function () {
       const playerSize = [300, 300];
       bid.mediaTypes = {};
-      bid.params.traffic = VIDEO;
       bid.mediaTypes[VIDEO] = {
         playerSize
       };
@@ -74,7 +77,7 @@ describe('AdprimebBidAdapter', function () {
       expect(data).to.be.an('object');
       let placement = data['placements'][0];
       expect(placement).to.be.an('object');
-      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.adFormat).to.equal(VIDEO);
       expect(placement.wPlayer).to.equal(playerSize[0]);
       expect(placement.hPlayer).to.equal(playerSize[1]);
     });
@@ -106,6 +109,23 @@ describe('AdprimebBidAdapter', function () {
       expect(data.placements).to.be.an('array').that.is.empty;
     });
   });
+  describe('buildRequests with user ids', function () {
+    bid.userId = {}
+    bid.userId.idl_env = 'idl_env123';
+    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    it('Return bids with user identeties', function () {
+      let data = serverRequest.data;
+      let placements = data['placements'];
+      expect(data).to.be.an('object');
+      for (let i = 0; i < placements.length; i++) {
+        let placement = placements[i];
+        expect(placement).to.have.property('identeties')
+        expect(placement.identeties).to.be.an('object')
+        expect(placement.identeties).to.have.property('identityLink')
+        expect(placement.identeties.identityLink).to.be.equal('idl_env123')
+      }
+    });
+  });
   describe('interpretResponse', function () {
     it('Should interpret banner response', function () {
       const banner = {
@@ -120,14 +140,15 @@ describe('AdprimebBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {}
         }]
       };
       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');
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
       expect(dataItem.requestId).to.equal('23fhj33i987f');
       expect(dataItem.cpm).to.equal(0.4);
       expect(dataItem.width).to.equal(300);
@@ -137,6 +158,7 @@ describe('AdprimebBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret video response', function () {
       const video = {
@@ -149,7 +171,8 @@ describe('AdprimebBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {}
         }]
       };
       let videoResponses = spec.interpretResponse(video);
@@ -157,7 +180,7 @@ describe('AdprimebBidAdapter', function () {
 
       let dataItem = videoResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
-        'netRevenue', 'currency', 'dealId', 'mediaType');
+        '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');
@@ -165,6 +188,7 @@ describe('AdprimebBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should interpret native response', function () {
       const native = {
@@ -182,13 +206,14 @@ describe('AdprimebBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
+          meta: {}
         }]
       };
       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');
+      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);
@@ -201,6 +226,7 @@ describe('AdprimebBidAdapter', function () {
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
       expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
     });
     it('Should return an empty array if invalid banner response is passed', function () {
       const invBanner = {
@@ -267,4 +293,29 @@ describe('AdprimebBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.adprime.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync.adprime.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
 });
diff --git a/test/spec/modules/adqueryBidAdapter_spec.js b/test/spec/modules/adqueryBidAdapter_spec.js
new file mode 100644
index 00000000000..1c536620803
--- /dev/null
+++ b/test/spec/modules/adqueryBidAdapter_spec.js
@@ -0,0 +1,196 @@
+import { expect } from 'chai'
+import { spec } from 'modules/adqueryBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+import * as utils from '../../../src/utils';
+
+describe('adqueryBidAdapter', function () {
+  const adapter = newBidder(spec)
+  let bidRequest = {
+    bidder: 'adquery',
+    params: {
+      placementId: '6d93f2a0e5f0fe2cc3a6e9e3ade964b43b07f897',
+      type: 'banner300x250'
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    }
+  }
+
+  let expectedResponse = {
+    'body': {
+      'data':
+        {
+          'requestId': 1,
+          'emission_id': 1,
+          'eventTracker': 'https://example.com',
+          'externalEmissionCodes': 'https://example.com',
+          'impressionTracker': 'https://example.com',
+          'viewabilityTracker': 'https://example.com',
+          'clickTracker': 'https://example.com',
+          'link': 'https://example.com',
+          'logo': 'https://example.com',
+          'medias': [
+            {
+              'src': 'banner/2021-04-09/938',
+              'ext': 'zip',
+              'type': 3,
+            }
+          ],
+          'domain': 'https://example.com',
+          'urlAdq': 'https://example.com',
+          'creationId': 1,
+          'currency': 'PLN',
+          'adDomains': ['https://example.com'],
+          'tag': '<ad-adquery data-type="banner300x250"  data-placement="6d93f2a0e5f0fe2cc3a6e9e3ade964b43b07f897"> </ad-adquery>',
+          'adqLib': 'https://example.com/js/example.js',
+          'mediaType': {'width': 300, 'height': 250, 'name': 'banner', 'type': 'banner300x250'},
+          'cpm': 2.5,
+          'meta': {
+            'advertiserDomains': ['example.com'],
+            'mediaType': 'banner',
+          }
+        }
+    }
+  }
+  describe('codes', function () {
+    it('should return a bidder code of adquery', function () {
+      expect(spec.code).to.equal('adquery')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    let inValidBid = Object.assign({}, bidRequest)
+    delete inValidBid.params
+    it('should return true if all params present', function () {
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true)
+    })
+
+    it('should return false if any parameter missing', function () {
+      expect(spec.isBidRequestValid(inValidBid)).to.be.false
+    })
+
+    it('should return false when sizes for banner are not specified', () => {
+      const bid = utils.deepClone(bidRequest);
+      delete bid.mediaTypes.banner.sizes;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  })
+
+  describe('buildRequests', function () {
+    let req = spec.buildRequests([ bidRequest ], { refererInfo: { } })[0]
+    let rdata
+
+    it('should return request object', function () {
+      expect(req).to.not.be.null
+    })
+
+    it('should build request data', function () {
+      expect(req.data).to.not.be.null
+    })
+
+    it('should include one request', function () {
+      rdata = req.data;
+      expect(rdata.data).to.not.be.null
+    })
+
+    it('should include placementCode', function () {
+      expect(rdata.placementCode).not.be.null
+    })
+
+    it('should include qid', function () {
+      expect(rdata.qid).not.be.null
+    })
+
+    it('should include type', function () {
+      expect(rdata.type !== null).not.be.null
+    })
+
+    it('should include all publisher params', function () {
+      expect(rdata.type !== null && rdata.placementCode !== null).to.be.true
+    })
+
+    it('should include bidder', function () {
+      expect(rdata.bidder !== null).to.be.true
+    })
+
+    it('should include sizes', function () {
+      expect(rdata.sizes).not.be.null
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('should get the correct bid response', function () {
+      let result = spec.interpretResponse(expectedResponse)
+      expect(result).to.be.an('array')
+    })
+
+    it('validate response params', function() {
+      const newResponse = spec.interpretResponse(expectedResponse, bidRequest);
+      expect(newResponse[0].requestId).to.be.equal(1)
+    });
+    it('handles empty bid response', function () {
+      let response = {
+        body: {}
+      };
+      let result = spec.interpretResponse(response);
+      expect(result.length).to.equal(0);
+    })
+  })
+
+  describe('getUserSyncs', function () {
+    it('should return iframe sync', function () {
+      let sync = spec.getUserSyncs()
+      expect(sync.length).to.equal(1)
+      expect(sync[0].type === 'iframe')
+      expect(typeof sync[0].url === 'string')
+    })
+
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+    });
+  })
+
+  describe('test onBidWon function', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('exists and is a function', () => {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function');
+    });
+    it('should return nothing', function () {
+      var response = spec.onBidWon({});
+      expect(response).to.be.an('undefined')
+      expect(utils.triggerPixel.called).to.equal(true);
+    });
+  })
+
+  describe('onTimeout', function () {
+    const timeoutData = [{
+      timeout: null
+    }];
+
+    it('should exists and be a function', () => {
+      expect(spec.onTimeout).to.exist.and.to.be.a('function');
+    });
+    it('should include timeoutData', function () {
+      expect(spec.onTimeout(timeoutData)).to.be.undefined;
+    })
+  });
+
+  it(`onSetTargeting is present and type function`, function () {
+    expect(spec.onSetTargeting).to.exist.and.to.be.a('function')
+  });
+})
diff --git a/test/spec/modules/adqueryIdSystem_spec.js b/test/spec/modules/adqueryIdSystem_spec.js
new file mode 100644
index 00000000000..a6b4e9d1529
--- /dev/null
+++ b/test/spec/modules/adqueryIdSystem_spec.js
@@ -0,0 +1,72 @@
+import { adqueryIdSubmodule, storage } from 'modules/adqueryIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+
+const config = {
+  storage: {
+    type: 'html5',
+  },
+};
+
+describe('AdqueryIdSystem', function () {
+  describe('qid submodule', () => {
+    it('should expose a "name" property containing qid', () => {
+      expect(adqueryIdSubmodule.name).to.equal('qid');
+    });
+
+    it('should expose a "gvlid" property containing the GVL ID 902', () => {
+      expect(adqueryIdSubmodule.gvlid).to.equal(902);
+    });
+  });
+
+  describe('getId', function() {
+    let getDataFromLocalStorageStub;
+
+    beforeEach(function() {
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(function () {
+      getDataFromLocalStorageStub.restore();
+    });
+
+    it('gets a adqueryId', function() {
+      const config = {
+        params: {}
+      };
+      const callbackSpy = sinon.spy();
+      const callback = adqueryIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.eq(`https://bidder.adquery.io/prebid/qid`);
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ qid: 'qid' }));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({qid: 'qid'});
+    });
+
+    it('gets a cached adqueryId', function() {
+      const config = {
+        params: {}
+      };
+      getDataFromLocalStorageStub.withArgs('qid').returns('qid');
+
+      const callbackSpy = sinon.spy();
+      const callback = adqueryIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({qid: 'qid'});
+    });
+
+    it('allows configurable id url', function() {
+      const config = {
+        params: {
+          url: 'https://bidder.adquery.io'
+        }
+      };
+      const callbackSpy = sinon.spy();
+      const callback = adqueryIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.eq('https://bidder.adquery.io');
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ qid: 'testqid' }));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({qid: 'testqid'});
+    });
+  });
+});
diff --git a/test/spec/modules/adrelevantisBidAdapter_spec.js b/test/spec/modules/adrelevantisBidAdapter_spec.js
new file mode 100644
index 00000000000..2612800aa56
--- /dev/null
+++ b/test/spec/modules/adrelevantisBidAdapter_spec.js
@@ -0,0 +1,764 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adrelevantisBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { deepClone } from 'src/utils.js';
+import { config } from 'src/config.js';
+
+const ENDPOINT = 'https://ssp.adrelevantis.com/prebid';
+
+describe('AdrelevantisAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'adrelevantis',
+      'params': {
+        'placementId': '10433394'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'placementId': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        'bidder': 'adrelevantis',
+        'params': {
+          'placementId': '10433394'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      }
+    ];
+
+    it('should parse out private sizes', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            privateSizes: [300, 250]
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].private_sizes).to.exist;
+      expect(payload.tags[0].private_sizes).to.deep.equal([{width: 300, height: 250}]);
+    });
+
+    it('should add source and verison to the tag', function () {
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      expect(payload.sdk).to.exist;
+      expect(payload.sdk).to.deep.equal({
+        source: 'pbjs',
+        version: '$prebid.version$'
+      });
+    });
+
+    it('should populate the ad_types array on all requests', function () {
+      ['banner', 'video', 'native'].forEach(type => {
+        const bidRequest = Object.assign({}, bidRequests[0]);
+        bidRequest.mediaTypes = {};
+        bidRequest.mediaTypes[type] = {};
+
+        const request = spec.buildRequests([bidRequest], {});
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].ad_types).to.deep.equal([type]);
+      });
+    });
+
+    it('should populate the ad_types array on outstream requests', function () {
+      const bidRequest = Object.assign({}, bidRequests[0]);
+      bidRequest.mediaTypes = {};
+      bidRequest.mediaTypes.video = {context: 'outstream'};
+
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].ad_types).to.deep.equal(['video']);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, {});
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should attach valid video params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            video: {
+              id: 123,
+              minduration: 100,
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].video).to.deep.equal({
+        id: 123,
+        minduration: 100
+      });
+    });
+
+    it('should add video property when adUnit includes a renderer', function () {
+      const videoData = {
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            mimes: ['video/mp4']
+          }
+        },
+        params: {
+          placementId: '10433394',
+          video: {
+            skippable: true,
+            playback_method: ['auto_play_sound_off']
+          }
+        }
+      };
+
+      let bidRequest1 = deepClone(bidRequests[0]);
+      bidRequest1 = Object.assign({}, bidRequest1, videoData, {
+        renderer: {
+          url: 'http://test.renderer.url',
+          render: function () {}
+        }
+      });
+
+      let bidRequest2 = deepClone(bidRequests[0]);
+      bidRequest2.adUnitCode = 'adUnit_code_2';
+      bidRequest2 = Object.assign({}, bidRequest2, videoData);
+
+      const request = spec.buildRequests([bidRequest1, bidRequest2], {});
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].video).to.deep.equal({
+        skippable: true,
+        playback_method: ['auto_play_sound_off'],
+        custom_renderer_present: true
+      });
+      expect(payload.tags[1].video).to.deep.equal({
+        skippable: true,
+        playback_method: ['auto_play_sound_off']
+      });
+    });
+
+    it('should attach valid user params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            user: {
+              externalUid: '123',
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user).to.exist;
+      expect(payload.user).to.deep.equal({
+        externalUid: '123',
+      });
+    });
+
+    it('should contain hb_source value for other media', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'banner',
+          params: {
+            sizes: [[300, 250], [300, 600]],
+            placementId: 10433394
+          }
+        }
+      );
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('adds context data (category and keywords) to request when set', function() {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      const ortb2 = {
+        site: {
+          keywords: 'US Open',
+          ext: {
+            data: {category: 'sports/tennis'}
+          }
+        }
+      };
+
+      const request = spec.buildRequests([bidRequest], {ortb2});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.fpd.keywords).to.equal('US Open');
+      expect(payload.fpd.category).to.equal('sports/tennis');
+    });
+
+    it('should attach native params to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'native',
+          nativeParams: {
+            title: {required: true},
+            body: {required: true},
+            body2: {required: true},
+            image: {required: true, sizes: [100, 100]},
+            icon: {required: true},
+            cta: {required: false},
+            rating: {required: true},
+            sponsoredBy: {required: true},
+            privacyLink: {required: true},
+            displayUrl: {required: true},
+            address: {required: true},
+            downloads: {required: true},
+            likes: {required: true},
+            phone: {required: true},
+            price: {required: true},
+            salePrice: {required: true}
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].native.layouts[0]).to.deep.equal({
+        title: {required: true},
+        description: {required: true},
+        desc2: {required: true},
+        main_image: {required: true, sizes: [{ width: 100, height: 100 }]},
+        icon: {required: true},
+        ctatext: {required: false},
+        rating: {required: true},
+        sponsored_by: {required: true},
+        privacy_link: {required: true},
+        displayurl: {required: true},
+        address: {required: true},
+        downloads: {required: true},
+        likes: {required: true},
+        phone: {required: true},
+        price: {required: true},
+        saleprice: {required: true},
+        privacy_supported: true
+      });
+      expect(payload.tags[0].hb_source).to.equal(1);
+    });
+
+    it('should always populated tags[].sizes with 1,1 for native if otherwise not defined', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'native',
+          nativeParams: {
+            image: { required: true }
+          }
+        }
+      );
+      bidRequest.sizes = [[150, 100], [300, 250]];
+
+      let request = spec.buildRequests([bidRequest], {});
+      let payload = JSON.parse(request.data);
+      expect(payload.tags[0].sizes).to.deep.equal([{width: 150, height: 100}, {width: 300, height: 250}]);
+
+      delete bidRequest.sizes;
+
+      request = spec.buildRequests([bidRequest], {});
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].sizes).to.deep.equal([{width: 1, height: 1}]);
+    });
+
+    it('should convert keyword params to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            keywords: {
+              single: 'val',
+              singleArr: ['val'],
+              singleArrNum: [5],
+              multiValMixed: ['value1', 2, 'value3'],
+              singleValNum: 123,
+              emptyStr: '',
+              emptyArr: [''],
+              badValue: {'foo': 'bar'} // should be dropped
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'single',
+        'value': ['val']
+      }, {
+        'key': 'singleArr',
+        'value': ['val']
+      }, {
+        'key': 'singleArrNum',
+        'value': ['5']
+      }, {
+        'key': 'multiValMixed',
+        'value': ['value1', '2', 'value3']
+      }, {
+        'key': 'singleValNum',
+        'value': ['123']
+      }, {
+        'key': 'emptyStr'
+      }, {
+        'key': 'emptyArr'
+      }]);
+    });
+
+    it('should add payment rules to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            usePaymentRule: true
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].use_pmt_rule).to.equal(true);
+    });
+
+    it('should add gdpr consent information to the request', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'adrelevantis',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr_consent).to.exist;
+      expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
+      expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+    });
+
+    it('supports sending hybrid mobile app parameters', function () {
+      let appRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            app: {
+              id: 'B1O2W3M4AN.com.prebid.webview',
+              geo: {
+                lat: 40.0964439,
+                lng: -75.3009142
+              },
+              device_id: {
+                idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE', // Apple advertising identifier
+                aaid: '38400000-8cf0-11bd-b23e-10b96e40000d', // Android advertising identifier
+                md5udid: '5756ae9022b2ea1e47d84fead75220c8', // MD5 hash of the ANDROID_ID
+                sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF', // SHA1 hash of the ANDROID_ID
+                windowsadid: '750c6be243f1c4b5c9912b95a5742fc5' // Windows advertising identifier
+              }
+            }
+          }
+        }
+      );
+      const request = spec.buildRequests([appRequest], {});
+      const payload = JSON.parse(request.data);
+      expect(payload.app).to.exist;
+      expect(payload.app).to.deep.equal({
+        appid: 'B1O2W3M4AN.com.prebid.webview'
+      });
+      expect(payload.device.device_id).to.exist;
+      expect(payload.device.device_id).to.deep.equal({
+        aaid: '38400000-8cf0-11bd-b23e-10b96e40000d',
+        idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE',
+        md5udid: '5756ae9022b2ea1e47d84fead75220c8',
+        sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF',
+        windowsadid: '750c6be243f1c4b5c9912b95a5742fc5'
+      });
+      expect(payload.device.geo).to.exist;
+      expect(payload.device.geo).to.deep.equal({
+        lat: 40.0964439,
+        lng: -75.3009142
+      });
+    });
+
+    it('should add referer info to payload', function () {
+      const bidRequest = Object.assign({}, bidRequests[0])
+      const bidderRequest = {
+        refererInfo: {
+          topmostLocation: 'http://example.com/page.html',
+          reachedTop: true,
+          numIframes: 2,
+          stack: [
+            'http://example.com/page.html',
+            'http://example.com/iframe1.html',
+            'http://example.com/iframe2.html'
+          ]
+        }
+      }
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.referrer_detection).to.exist;
+      expect(payload.referrer_detection).to.deep.equal({
+        rd_ref: 'http%3A%2F%2Fexample.com%2Fpage.html',
+        rd_top: true,
+        rd_ifs: 2,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      });
+    });
+
+    it('should populate coppa if set in config', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest], {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user.coppa).to.equal(true);
+
+      config.getConfig.restore();
+    });
+  })
+
+  describe('interpretResponse', function () {
+    let bfStub;
+    before(function() {
+      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+    });
+
+    after(function() {
+      bfStub.restore();
+    });
+
+    let response = {
+      'version': '3.0.0',
+      'tags': [
+        {
+          'uuid': '3db3773286ee59',
+          'tag_id': 10433394,
+          'auction_id': '4534722592064951574',
+          'nobid': false,
+          'no_ad_url': 'http://lax1-ib.adnxs.com/no-ad',
+          'timeout_ms': 10000,
+          'ad_profile_id': 27079,
+          'ads': [
+            {
+              'content_source': 'rtb',
+              'ad_type': 'banner',
+              'buyer_member_id': 958,
+              'creative_id': 29681110,
+              'media_type_id': 1,
+              'media_subtype_id': 1,
+              'cpm': 0.5,
+              'cpm_publisher_currency': 0.5,
+              'publisher_currency_code': '$',
+              'client_initiated_ad_counting': true,
+              'viewability': {
+                'config': '<script type=\'text/javascript\' async=\'true\' src=\'http://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=http%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttp%253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+              },
+              'rtb': {
+                'banner': {
+                  'content': '<!-- Creative -->',
+                  'width': 300,
+                  'height': 250
+                },
+                'trackers': [
+                  {
+                    'impression_urls': [
+                      'http://lax1-ib.adnxs.com/impression'
+                    ],
+                    'video_events': {}
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'requestId': '3db3773286ee59',
+          'cpm': 0.5,
+          'creativeId': 29681110,
+          'dealId': undefined,
+          'width': 300,
+          'height': 250,
+          'ad': '<!-- Creative -->',
+          'mediaType': 'banner',
+          'currency': 'USD',
+          'ttl': 300,
+          'netRevenue': true,
+          'adUnitCode': 'code',
+          'adrelevantis': {
+            'buyerMemberId': 958
+          }
+        }
+      ];
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    it('handles nobid responses', function () {
+      let response = {
+        'version': '0.0.1',
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'tag_id': 5976557,
+          'auction_id': '297492697822162468',
+          'nobid': true
+        }]
+      };
+      let bidderRequest;
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result.length).to.equal(0);
+    });
+
+    it('handles outstream video responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'content': '<!-- Creative -->'
+              }
+            },
+            'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'http://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=http%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttp%253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+          }]
+        }]
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastXml');
+      expect(result[0]).to.have.property('vastImpUrl');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+
+    it('handles instream video responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'asset_url': 'https://sample.vastURL.com/here/vid'
+              }
+            },
+            'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+          }]
+        }]
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'instream'
+            }
+          }
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastUrl');
+      expect(result[0]).to.have.property('vastImpUrl');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+
+    it('handles native responses', function () {
+      let response1 = deepClone(response);
+      response1.tags[0].ads[0].ad_type = 'native';
+      response1.tags[0].ads[0].rtb.native = {
+        'title': 'Native Creative',
+        'desc': 'Cool description great stuff',
+        'desc2': 'Additional body text',
+        'ctatext': 'Do it',
+        'sponsored': 'AppNexus',
+        'icon': {
+          'width': 0,
+          'height': 0,
+          'url': 'https://cdn.adnxs.com/icon.png'
+        },
+        'main_img': {
+          'width': 2352,
+          'height': 1516,
+          'url': 'https://cdn.adnxs.com/img.png'
+        },
+        'link': {
+          'url': 'https://www.appnexus.com',
+          'fallback_url': '',
+          'click_trackers': ['https://nym1-ib.adnxs.com/click']
+        },
+        'impression_trackers': ['https://example.com'],
+        'rating': '5',
+        'displayurl': 'https://AppNexus.com/?url=display_url',
+        'likes': '38908320',
+        'downloads': '874983',
+        'price': '9.99',
+        'saleprice': 'FREE',
+        'phone': '1234567890',
+        'address': '28 W 23rd St, New York, NY 10010',
+        'privacy_link': 'https://appnexus.com/?url=privacy_url',
+        'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=;css_selector=.pb-click;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response1 }, {bidderRequest});
+      expect(result[0].native.title).to.equal('Native Creative');
+      expect(result[0].native.body).to.equal('Cool description great stuff');
+      expect(result[0].native.cta).to.equal('Do it');
+      expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
+    });
+
+    it('supports configuring outstream renderers', function () {
+      const outstreamResponse = deepClone(response);
+      outstreamResponse.tags[0].ads[0].rtb.video = {};
+      outstreamResponse.tags[0].ads[0].renderer_url = 'renderer.js';
+
+      const bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          renderer: {
+            options: {
+              adText: 'configured'
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      };
+
+      const result = spec.interpretResponse({ body: outstreamResponse }, {bidderRequest});
+      expect(result[0].renderer.config).to.deep.equal(
+        bidderRequest.bids[0].renderer.options
+      );
+    });
+
+    it('should add deal_priority and deal_code', function() {
+      let responseWithDeal = deepClone(response);
+      responseWithDeal.tags[0].ads[0].deal_priority = 'high';
+      responseWithDeal.tags[0].ads[0].deal_code = '123';
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseWithDeal }, {bidderRequest});
+      expect(Object.keys(result[0].adrelevantis)).to.include.members(['buyerMemberId', 'dealPriority', 'dealCode']);
+    });
+
+    it('should add advertiser id', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].advertiser_id = '123';
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserId']);
+    })
+  });
+});
diff --git a/test/spec/modules/adrinoBidAdapter_spec.js b/test/spec/modules/adrinoBidAdapter_spec.js
new file mode 100644
index 00000000000..78cea8da9ac
--- /dev/null
+++ b/test/spec/modules/adrinoBidAdapter_spec.js
@@ -0,0 +1,236 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adrinoBidAdapter.js';
+import {config} from '../../../src/config.js';
+import * as utils from '../../../src/utils';
+
+describe('adrinoBidAdapter', function () {
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  describe('isBidRequestValid', function () {
+    const validBid = {
+      bidder: 'adrino',
+      params: {
+        hash: 'abcdef123456'
+      },
+      mediaTypes: {
+        native: {
+          title: {
+            required: true
+          },
+          image: {
+            required: true,
+            sizes: [[300, 150], [300, 210]]
+          }
+        }
+      },
+      adUnitCode: 'adunit-code',
+      bidId: '12345678901234',
+      bidderRequestId: '98765432109876',
+      auctionId: '01234567891234',
+    };
+
+    it('should return true when all mandatory parameters are there', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should return false when there are no params', function () {
+      const bid = { ...validBid };
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when unsupported media type is requested', function () {
+      const bid = { ...validBid };
+      bid.mediaTypes = { banner: { sizes: [[300, 250]] } };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when hash is not a string', function () {
+      const bid = { ...validBid };
+      bid.params.hash = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequest = {
+      bidder: 'adrino',
+      params: {
+        hash: 'abcdef123456'
+      },
+      mediaTypes: {
+        native: {
+          title: {
+            required: true
+          },
+          image: {
+            required: true,
+            sizes: [[300, 150], [300, 210]]
+          }
+        }
+      },
+      userId: { criteoId: '2xqi3F94aHdwWnM3', pubcid: '3ec0b202-7697' },
+      adUnitCode: 'adunit-code',
+      bidId: '12345678901234',
+      bidderRequestId: '98765432109876',
+      auctionId: '01234567891234',
+    };
+
+    it('should build the request correctly with custom domain', function () {
+      config.setConfig({adrino: { host: 'https://stg-prebid-bidder.adrino.io' }});
+      const result = spec.buildRequests(
+        [ bidRequest ],
+        { refererInfo: { page: 'http://example.com/' } }
+      );
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://stg-prebid-bidder.adrino.io/bidder/bid/');
+      expect(result[0].data.bidId).to.equal('12345678901234');
+      expect(result[0].data.placementHash).to.equal('abcdef123456');
+      expect(result[0].data.referer).to.equal('http://example.com/');
+      expect(result[0].data.userAgent).to.equal(navigator.userAgent);
+      expect(result[0].data).to.have.property('nativeParams');
+      expect(result[0].data).not.to.have.property('gdprConsent');
+      expect(result[0].data).to.have.property('userId');
+      expect(result[0].data.userId.criteoId).to.equal('2xqi3F94aHdwWnM3');
+      expect(result[0].data.userId.pubcid).to.equal('3ec0b202-7697');
+    });
+
+    it('should build the request correctly with gdpr', function () {
+      const result = spec.buildRequests(
+        [ bidRequest ],
+        { gdprConsent: { gdprApplies: true, consentString: 'abc123' }, refererInfo: { page: 'http://example.com/' } }
+      );
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://prd-prebid-bidder.adrino.io/bidder/bid/');
+      expect(result[0].data.bidId).to.equal('12345678901234');
+      expect(result[0].data.placementHash).to.equal('abcdef123456');
+      expect(result[0].data.referer).to.equal('http://example.com/');
+      expect(result[0].data.userAgent).to.equal(navigator.userAgent);
+      expect(result[0].data).to.have.property('nativeParams');
+      expect(result[0].data).to.have.property('gdprConsent');
+      expect(result[0].data).to.have.property('userId');
+      expect(result[0].data.userId.criteoId).to.equal('2xqi3F94aHdwWnM3');
+      expect(result[0].data.userId.pubcid).to.equal('3ec0b202-7697');
+    });
+
+    it('should build the request correctly without gdpr', function () {
+      const result = spec.buildRequests(
+        [ bidRequest ],
+        { refererInfo: { page: 'http://example.com/' } }
+      );
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://prd-prebid-bidder.adrino.io/bidder/bid/');
+      expect(result[0].data.bidId).to.equal('12345678901234');
+      expect(result[0].data.placementHash).to.equal('abcdef123456');
+      expect(result[0].data.referer).to.equal('http://example.com/');
+      expect(result[0].data.userAgent).to.equal(navigator.userAgent);
+      expect(result[0].data).to.have.property('nativeParams');
+      expect(result[0].data).not.to.have.property('gdprConsent');
+      expect(result[0].data).to.have.property('userId');
+      expect(result[0].data.userId.criteoId).to.equal('2xqi3F94aHdwWnM3');
+      expect(result[0].data.userId.pubcid).to.equal('3ec0b202-7697');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should interpret the response correctly', function () {
+      const response = {
+        requestId: '31662c69728811',
+        mediaType: 'native',
+        cpm: 0.53,
+        currency: 'PLN',
+        creativeId: '859115',
+        netRevenue: true,
+        ttl: 600,
+        width: 1,
+        height: 1,
+        noAd: false,
+        testAd: false,
+        native: {
+          title: 'Ad Title',
+          body: 'Ad Body',
+          image: {
+            url: 'http://emisja.contentstream.pl/_/getImageII/?vid=17180728299&typ=cs_300_150&element=IMAGE&scale=1&prefix=adart&nc=1643878278955',
+            height: 150,
+            width: 300
+          },
+          clickUrl: 'http://emisja.contentstream.pl/_/ctr2/?u=https%3A%2F%2Fonline.efortuna.pl%2Fpage%3Fkey%3Dej0xMzUzMTM1NiZsPTE1Mjc1MzY1JnA9NTMyOTA%253D&e=znU3tABN8K4N391dmUxYfte5G9tBaDXELJVo1_-kvaTJH2XwWRw77fmfL2YjcEmrbqRQ3M0GcJ0vPWcLtZlsrf8dWrAEHNoZKAC6JMnZF_65IYhTPbQIJ-zn3ac9TU7gEZftFKksH1al7rMuieleVv9r6_DtrOk_oZcYAe4rMRQM-TiWvivJRPBchAAblE0cqyG7rCunJFpal43sxlYm4GvcBJaYHzErn5PXjEzNbd3xHjkdiap-xU9y6BbfkUZ1xIMS8QZLvwNrTXMFCSfSRN2tgVfEj7KyGdLCITHSaFtuIKT2iW2pxC7f2RtPHnzsEPXH0SgAfhA3OxZ5jkQjOZy0PsO7MiCv3sJai5ezUAOjFgayU91ZhI0Y9r2YpB1tTGIjnO23wot8PvRENlThHQ%3D%3D&ref=https%3A%2F%2Fbox.adrino.cloud%2Ftmielcarz%2Fadrino_prebid%2Ftest_page3.html%3Fpbjs_debug%3Dtrue',
+          privacyLink: 'https://adrino.pl/wp-content/uploads/2021/01/POLITYKA-PRYWATNOS%CC%81CI-Adrino-Mobile.pdf',
+          impressionTrackers: [
+            'https://prd-impression-tracker-producer.adrino.io/impression/eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJpbXByZXNzaW9uSWRcIjpcIjMxNjYyYzY5NzI4ODExXCIsXCJkYXRlXCI6WzIwMjIsMiwzXSxcInBsYWNlbWVudEhhc2hcIjpcIjk0NTVjMDQxYzlkMTI1ZmIwNDE4MWVhMGVlZTJmMmFlXCIsXCJjYW1wYWlnbklkXCI6MTc5MjUsXCJhZHZlcnRpc2VtZW50SWRcIjo5MjA3OSxcInZpc3VhbGlzYXRpb25JZFwiOjg1OTExNSxcImNwbVwiOjUzLjB9IiwiZXhwIjoxNjQzOTE2MjUxLCJpYXQiOjE2NDM5MTU2NTF9.0Y_HvInGl6Xo5xP6rDLC8lzQRGvy-wKe0blk1o8ebWyVRFiUY1JGLUeE0k3sCsPNxgdHAv-o6EcbogpUuqlMJA'
+          ]
+        }
+      };
+
+      const serverResponse = {
+        body: response
+      };
+
+      const result = spec.interpretResponse(serverResponse, {});
+      expect(result.length).to.equal(1);
+      expect(result[0]).to.equal(response);
+    });
+
+    it('should return empty array of responses', function () {
+      const response = {
+        requestId: '31662c69728811',
+        noAd: true,
+        testAd: false
+      };
+
+      const serverResponse = {
+        body: response
+      };
+
+      const result = spec.interpretResponse(serverResponse, {});
+      expect(result.length).to.equal(0);
+    });
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('should trigger pixel', function () {
+      const response = {
+        requestId: '31662c69728811',
+        mediaType: 'native',
+        cpm: 0.53,
+        currency: 'PLN',
+        creativeId: '859115',
+        netRevenue: true,
+        ttl: 600,
+        width: 1,
+        height: 1,
+        noAd: false,
+        testAd: false,
+        native: {
+          title: 'Ad Title',
+          body: 'Ad Body',
+          image: {
+            url: 'http://emisja.contentstream.pl/_/getImageII/?vid=17180728299&typ=cs_300_150&element=IMAGE&scale=1&prefix=adart&nc=1643878278955',
+            height: 150,
+            width: 300
+          },
+          clickUrl: 'http://emisja.contentstream.pl/_/ctr2/?u=https%3A%2F%2Fonline.efortuna.pl%2Fpage%3Fkey%3Dej0xMzUzMTM1NiZsPTE1Mjc1MzY1JnA9NTMyOTA%253D&e=znU3tABN8K4N391dmUxYfte5G9tBaDXELJVo1_-kvaTJH2XwWRw77fmfL2YjcEmrbqRQ3M0GcJ0vPWcLtZlsrf8dWrAEHNoZKAC6JMnZF_65IYhTPbQIJ-zn3ac9TU7gEZftFKksH1al7rMuieleVv9r6_DtrOk_oZcYAe4rMRQM-TiWvivJRPBchAAblE0cqyG7rCunJFpal43sxlYm4GvcBJaYHzErn5PXjEzNbd3xHjkdiap-xU9y6BbfkUZ1xIMS8QZLvwNrTXMFCSfSRN2tgVfEj7KyGdLCITHSaFtuIKT2iW2pxC7f2RtPHnzsEPXH0SgAfhA3OxZ5jkQjOZy0PsO7MiCv3sJai5ezUAOjFgayU91ZhI0Y9r2YpB1tTGIjnO23wot8PvRENlThHQ%3D%3D&ref=https%3A%2F%2Fbox.adrino.cloud%2Ftmielcarz%2Fadrino_prebid%2Ftest_page3.html%3Fpbjs_debug%3Dtrue',
+          privacyLink: 'https://adrino.pl/wp-content/uploads/2021/01/POLITYKA-PRYWATNOS%CC%81CI-Adrino-Mobile.pdf',
+          impressionTrackers: [
+            'https://prd-impression-tracker-producer.adrino.io/impression/eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJpbXByZXNzaW9uSWRcIjpcIjMxNjYyYzY5NzI4ODExXCIsXCJkYXRlXCI6WzIwMjIsMiwzXSxcInBsYWNlbWVudEhhc2hcIjpcIjk0NTVjMDQxYzlkMTI1ZmIwNDE4MWVhMGVlZTJmMmFlXCIsXCJjYW1wYWlnbklkXCI6MTc5MjUsXCJhZHZlcnRpc2VtZW50SWRcIjo5MjA3OSxcInZpc3VhbGlzYXRpb25JZFwiOjg1OTExNSxcImNwbVwiOjUzLjB9IiwiZXhwIjoxNjQzOTE2MjUxLCJpYXQiOjE2NDM5MTU2NTF9.0Y_HvInGl6Xo5xP6rDLC8lzQRGvy-wKe0blk1o8ebWyVRFiUY1JGLUeE0k3sCsPNxgdHAv-o6EcbogpUuqlMJA'
+          ]
+        }
+      };
+
+      spec.onBidWon(response);
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    });
+  });
+});
diff --git a/test/spec/modules/adriverBidAdapter_spec.js b/test/spec/modules/adriverBidAdapter_spec.js
new file mode 100644
index 00000000000..33084877c14
--- /dev/null
+++ b/test/spec/modules/adriverBidAdapter_spec.js
@@ -0,0 +1,614 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adriverBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { auctionManager } from 'src/auctionManager.js';
+
+const ENDPOINT = 'https://pb.adriver.ru/cgi-bin/bid.cgi';
+
+describe('adriverAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      bidder: 'adriver',
+      params: {
+        placementId: '55:test_placement',
+        siteid: 'testSiteID'
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [[300, 250], [300, 600], [300, 250]],
+      bidId: '30b31c1838de1e',
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '1d1a030790a475',
+      userIdAsEids: [
+        {
+          source: 'id5-sync.com',
+          uids: [
+            {
+              id: '',
+              atype: 1,
+              ext: {
+                linkType: 0,
+                abTestingControlGroup: true
+              }
+            }
+          ]
+        },
+        {
+          source: 'sharedid.org',
+          uids: [
+            {
+              id: '01F4W41TMN7NBXBA0PXJMPB7GF',
+              atype: 1,
+              ext: {
+                third: '01F4W41TMN7NBXBA0PXJMPB7GF'
+              }
+            }
+          ]
+        }
+      ]
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let getAdUnitsStub;
+    const floor = 3;
+
+    const bidRequests = [
+      {
+        bidder: 'adriver',
+        params: {
+          placementId: '55:test_placement',
+          siteid: 'testSiteID',
+          dealid: 'dealidTest'
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[300, 250], [300, 600], [300, 250]],
+        bidId: '30b31c1838de1e',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+        transactionId: '04f2659e-c005-4eb1-a57c-fa93145e3843',
+        userId: {
+          adrcid: 'testCookieValue',
+        },
+        userIdAsEids: [
+          {
+            source: 'id5-sync.com',
+            uids: [
+              {
+                id: '',
+                atype: 1,
+                ext: {
+                  linkType: 0,
+                  abTestingControlGroup: true
+                }
+              }
+            ]
+          },
+          {
+            source: 'sharedid.org',
+            uids: [
+              {
+                id: '01F4W41TMN7NBXBA0PXJMPB7GF',
+                atype: 1,
+                ext: {
+                  third: '01F4W41TMN7NBXBA0PXJMPB7GF'
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ];
+
+    const bidderRequest = {
+      'bidderCode': 'adriver',
+      'auctionId': '2cdbf766-c37e-464c-a924-d8cf2a2f7ed2',
+      'bidderRequestId': '10415226a1f2ac',
+      'bids': [
+        {
+          'bidder': 'adriver',
+          'params': {
+            'siteid': '216200',
+            'bidfloor': 1.33,
+            'placementId': 'test1'
+          },
+          'auctionId': '2cdbf766-c37e-464c-a924-d8cf2a2f7ed2',
+          'floorData': {
+            'skipped': false,
+            'skipRate': 5,
+            'modelVersion': 'BlackBerryZap',
+            'location': 'setConfig'
+          },
+          'userId': {
+            'id5id': {
+              'uid': 'ID5-ZHMO7vyrzH4ggO1TVF8lZ31h77BjNP6pLgMwIrhvtw!ID5*wP-eG3RLeJjkl1O5yeOMcf3Ksrsq1OeqM5nQZLgPvOMAACaMv9QnPWzdhdbFYu3r',
+              'ext': {
+                'linkType': 2,
+                'abTestingControlGroup': false
+              }
+            },
+            'sharedid': {
+              'id': '01F4W41TMN7NBXBA0PXJMPB7GF',
+              'third': '01F4W41TMN7NBXBA0PXJMPB7GF'
+            }
+          },
+          'userIdAsEids': [
+            {
+              'source': 'id5-sync.com',
+              'uids': [
+                {
+                  'id': 'ID5-ZHMO7vyrzH4ggO1TVF8lZ31h77BjNP6pLgMwIrhvtw!ID5*wP-eG3RLeJjkl1O5yeOMcf3Ksrsq1OeqM5nQZLgPvOMAACaMv9QnPWzdhdbFYu3r',
+                  'atype': 1,
+                  'ext': {
+                    'linkType': 2,
+                    'abTestingControlGroup': false
+                  }
+                }
+              ]
+            },
+            {
+              'source': 'sharedid.org',
+              'uids': [
+                {
+                  'id': '01F4W41TMN7NBXBA0PXJMPB7GF',
+                  'atype': 1,
+                  'ext': {
+                    'third': '01F4W41TMN7NBXBA0PXJMPB7GF'
+                  }
+                }
+              ]
+            }
+          ],
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ],
+                [
+                  600,
+                  500
+                ]
+              ]
+            }
+          },
+          'adUnitCode': 'div-gpt-ad-51545-0',
+          'transactionId': '01dfccdf-70d0-461f-b284-9132877ebe02',
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              600,
+              500
+            ]
+          ],
+          'bidId': '2794d8415635b3',
+          'bidderRequestId': '10415226a1f2ac',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0
+        }
+      ],
+      'auctionStart': 1622465003758,
+      'timeout': 1000,
+      'refererInfo': {
+        'referer': 'http://localhost:9999/integrationExamples/gpt/adUnitFloors.html',
+        'reachedTop': true,
+        'isAmp': false,
+        'numIframes': 0,
+        'stack': [
+          'http://localhost:9999/integrationExamples/gpt/adUnitFloors.html'
+        ],
+        'canonicalUrl': null
+      },
+      'start': 1622465003762
+    };
+
+    let floorTestData = {
+      'currency': 'USD',
+      'floor': floor
+    };
+
+    bidRequests[0].getFloor = _ => {
+      return floorTestData;
+    };
+
+    beforeEach(function() {
+      getAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits').callsFake(function() {
+        return [];
+      });
+    });
+
+    afterEach(function() {
+      getAdUnitsStub.restore();
+    });
+
+    it('should exist currency', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.cur).to.exist;
+    });
+
+    it('should exist timeout', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tmax).to.exist;
+      expect(payload.tmax).to.equal(1000);
+    });
+
+    it('should exist at', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.at).to.exist;
+      expect(payload.at).to.deep.equal(1);
+    });
+
+    it('should parse imp', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0]).to.exist;
+      expect(payload.imp[0].id).to.deep.equal('55:test_placement');
+
+      expect(payload.imp[0].ext).to.exist;
+      expect(payload.imp[0].ext.query).to.deep.equal('bn=15&custom=111=' + '30b31c1838de1e');
+
+      expect(payload.imp[0].banner).to.exist;
+      expect(payload.imp[0].banner.w).to.deep.equal(300);
+      expect(payload.imp[0].banner.h).to.deep.equal(250);
+    });
+
+    it('should parse pmp', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].pmp).to.exist;
+
+      expect(payload.imp[0].pmp.deals).to.exist;
+
+      expect(payload.imp[0].pmp.deals[0].bidfloor).to.exist;
+      expect(payload.imp[0].pmp.deals[0].bidfloor).to.deep.equal(3);
+
+      expect(payload.imp[0].pmp.deals[0].bidfloorcur).to.exist;
+      expect(payload.imp[0].pmp.deals[0].bidfloorcur).to.deep.equal('RUB');
+    });
+
+    const cookieValues = [
+      { adrcid: 'adrcidValue' },
+      { adrcid: undefined }
+    ]
+    cookieValues.forEach(cookieValue => describe('test cookie exist or not behavior', function () {
+      let expectedValues = [
+        'buyerid',
+        'ext'
+      ]
+
+      it('check adrcid if it exists', function () {
+        bidRequests[0].userId.adrcid = cookieValue.adrcid;
+        const payload = JSON.parse(spec.buildRequests(bidRequests).data);
+        if (cookieValue.adrcid) {
+          expect(Object.keys(payload.user)).to.have.members(expectedValues);
+        } else {
+          expect(payload.user.buyerid).to.equal(0);
+        }
+      });
+    }));
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bfStub;
+    before(function() {
+      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+    });
+
+    after(function() {
+      bfStub.restore();
+    });
+
+    let response = {
+      'id': '221594457-1615288400-1-46-',
+      'bidid': 'D8JW8XU8-L5m7qFMNQGs7i1gcuPvYMEDOKsktw6e9uLy5Eebo9HftVXb0VpKj4R2dXa93i6QmRhjextJVM4y1SqodMAh5vFOb_eVkHA',
+      'seatbid': [{
+        'bid': [{
+          'id': '1',
+          'impid': '/19968336/header-bid-tag-0',
+          'price': 4.29,
+          'h': 250,
+          'w': 300,
+          'adid': '7121351',
+          'adomain': ['http://ikea.com'],
+          'nurl': 'https://ad.adriver.ru/cgi-bin/erle.cgi?expid=D8JW8XU8-L5m7qFMNQGs7i1gcuPvYMEDOKsktw6e9uLy5Eebo9HftVXb0VpKj4R2dXa93i6QmRhjextJVM4y1SqodMAh5vFOb_eVkHA&bid=7121351&wprc=4.29&tuid=-1&custom=207=/19968336/header-bid-tag-0',
+          'cid': '717570',
+          'ext': '2c262a7058758d'
+        }]
+      }, {
+        'bid': [{
+          'id': '1',
+          'impid': '/19968336/header-bid-tag-0',
+          'price': 17.67,
+          'h': 600,
+          'w': 300,
+          'adid': '7121369',
+          'adomain': ['http://ikea.com'],
+          'nurl': 'https://ad.adriver.ru/cgi-bin/erle.cgi?expid=DdtToXX5cpTaMMxrJSEsOsUIXt3WmC3jOvuNI5DguDrY8edFG60Jg1M-iMkVNKQ4OiAdHSLPJLQQXMUXZfI9VbjMoGCb-zzOTPiMpshI&bid=7121369&wprc=17.67&tuid=-1&custom=207=/19968336/header-bid-tag-0',
+          'cid': '717570',
+          'ext': '2c262a7058758d'
+        }]
+      }],
+      'cur': 'RUB'
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          requestId: '2c262a7058758d',
+          cpm: 4.29,
+          width: 300,
+          height: 250,
+          creativeId: '/19968336/header-bid-tag-0',
+          currency: 'RUB',
+          netRevenue: true,
+          ttl: 3000,
+          meta: {
+            advertiserDomains: ['http://ikea.com']
+          },
+          ad: '<IFRAME SRC="https://ad.adriver.ru/cgi-bin/erle.cgi?expid=D8JW8XU8-L5m7qFMNQGs7i1gcuPvYMEDOKsktw6e9uLy5Eebo9HftVXb0VpKj4R2dXa93i6QmRhjextJVM4y1SqodMAh5vFOb_eVkHA&bid=7121351&wprc=4.29&tuid=-1&custom=207=/19968336/header-bid-tag-0" FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" STYLE ="WIDTH:300px; HEIGHT:250px"></IFRAME>'
+        }
+      ];
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      };
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    it('handles nobid responses', function () {
+      let response = {
+        'version': '0.0.1',
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'tag_id': 5976557,
+          'auction_id': '297492697822162468',
+          'nobid': true
+        }]
+      };
+      let bidderRequest;
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result.length).to.equal(0);
+    });
+  });
+
+  describe('function _getFloor', function () {
+    let bidRequests = [
+      {
+        bidder: 'adriver',
+        params: {
+          placementId: '55:test_placement',
+          siteid: 'testSiteID',
+          dealid: 'dealidTest',
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[300, 250], [300, 600], [300, 250]],
+        bidId: '30b31c1838de1e',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+        transactionId: '04f2659e-c005-4eb1-a57c-fa93145e3843',
+        userId: {
+          adrcid: 'testCookieValue',
+        },
+        userIdAsEids: [
+          {
+            source: 'id5-sync.com',
+            uids: [
+              {
+                id: '',
+                atype: 1,
+                ext: {
+                  linkType: 0,
+                  abTestingControlGroup: true
+                }
+              }
+            ]
+          },
+          {
+            source: 'sharedid.org',
+            uids: [
+              {
+                id: '01F4W41TMN7NBXBA0PXJMPB7GF',
+                atype: 1,
+                ext: {
+                  third: '01F4W41TMN7NBXBA0PXJMPB7GF'
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ];
+
+    const floorTestData = {
+      'currency': 'RUB',
+      'floor': 1.50
+    };
+
+    const bitRequestStandard = JSON.parse(JSON.stringify(bidRequests));
+
+    bitRequestStandard[0].getFloor = () => {
+      return floorTestData;
+    };
+
+    it('valid BidRequests', function () {
+      const request = spec.buildRequests(bitRequestStandard);
+      const payload = JSON.parse(request.data);
+
+      expect(typeof bitRequestStandard[0].getFloor).to.equal('function');
+      expect(payload.imp[0].bidfloor).to.equal(1.50);
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+    });
+
+    const bitRequestEmptyCurrency = JSON.parse(JSON.stringify(bidRequests));
+
+    const floorTestDataEmptyCurrency = {
+      'currency': 'RUB',
+      'floor': 1.50
+    };
+
+    bitRequestEmptyCurrency[0].getFloor = () => {
+      return floorTestDataEmptyCurrency;
+    };
+
+    it('empty currency', function () {
+      const request = spec.buildRequests(bitRequestEmptyCurrency);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].bidfloor).to.equal(1.50);
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+    });
+
+    const bitRequestFloorNull = JSON.parse(JSON.stringify(bidRequests));
+
+    const floorTestDataFloorNull = {
+      'currency': '',
+      'floor': null
+    };
+
+    bitRequestFloorNull[0].getFloor = () => {
+      return floorTestDataFloorNull;
+    };
+
+    it('empty floor', function () {
+      const request = spec.buildRequests(bitRequestFloorNull);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].bidfloor).to.equal(0);
+    });
+
+    const bitRequestGetFloorNotFunction = JSON.parse(JSON.stringify(bidRequests));
+
+    bitRequestGetFloorNotFunction[0].getFloor = 0;
+
+    it('bid.getFloor is not a function', function () {
+      const request = spec.buildRequests(bitRequestGetFloorNotFunction);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].bidfloor).to.equal(0);
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+    });
+
+    const bitRequestGetFloorBySized = JSON.parse(JSON.stringify(bidRequests));
+
+    bitRequestGetFloorBySized[0].getFloor = (requestParams = {currency: 'USD', mediaType: '*', size: '*'}) => {
+      if (requestParams.size.length === 2 && requestParams.size[0] === 300 && requestParams.size[1] === 250) {
+        return {
+          'currency': 'RUB',
+          'floor': 3.33
+        }
+      } else {
+        return {}
+      }
+    };
+
+    it('bid.getFloor get size', function () {
+      const request = spec.buildRequests(bitRequestGetFloorBySized);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].bidfloor).to.equal(3.33);
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+    });
+  });
+
+  describe('user ids', function () {
+    let bidRequests = [
+      {
+        bidder: 'adriver',
+        params: {
+          placementId: '55:test_placement',
+          siteid: 'testSiteID',
+          dealid: 'dealidTest',
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[300, 250], [300, 600], [300, 250]],
+        bidId: '30b31c1838de1e',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+        transactionId: '04f2659e-c005-4eb1-a57c-fa93145e3843',
+        userId: {
+          adrcid: 'testCookieValue',
+        },
+        userIdAsEids: [
+          {
+            source: 'id5-sync.com',
+            uids: [
+              {
+                id: '',
+                atype: 1,
+                ext: {
+                  linkType: 0,
+                  abTestingControlGroup: true
+                }
+              }
+            ]
+          },
+          {
+            source: 'sharedid.org',
+            uids: [
+              {
+                id: '01F4W41TMN7NBXBA0PXJMPB7GF',
+                atype: 1,
+                ext: {
+                  third: '01F4W41TMN7NBXBA0PXJMPB7GF'
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ];
+
+    it('user id id5-sync.com', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user.ext.eids[0].source).to.equal('id5-sync.com');
+      expect(payload.user.ext.eids[0].uids[0].id).to.equal('');
+    });
+
+    it('user id sharedid.org', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user.ext.eids[1].source).to.equal('sharedid.org');
+      expect(payload.user.ext.eids[1].uids[0].id).to.equal('01F4W41TMN7NBXBA0PXJMPB7GF');
+    });
+  });
+});
diff --git a/test/spec/modules/adriverIdSystem_spec.js b/test/spec/modules/adriverIdSystem_spec.js
new file mode 100644
index 00000000000..abc831b67f0
--- /dev/null
+++ b/test/spec/modules/adriverIdSystem_spec.js
@@ -0,0 +1,87 @@
+import { adriverIdSubmodule, storage } from 'modules/adriverIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+import * as utils from '../../../src/utils.js';
+
+describe('AdriverIdSystem', function () {
+  describe('getId', function() {
+    let setCookieStub, setLocalStorageStub, removeFromLocalStorageStub, logErrorStub;
+
+    beforeEach(function() {
+      setCookieStub = sinon.stub(storage, 'setCookie');
+      setLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
+      removeFromLocalStorageStub = sinon.stub(storage, 'removeDataFromLocalStorage');
+      logErrorStub = sinon.stub(utils, 'logError');
+    });
+
+    afterEach(function () {
+      setCookieStub.restore();
+      setLocalStorageStub.restore();
+      removeFromLocalStorageStub.restore();
+      logErrorStub.restore();
+    });
+
+    it('should log an error and continue to callback if request errors', function () {
+      const config = {
+        params: {}
+      };
+
+      const callbackSpy = sinon.spy();
+      const callback = adriverIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.include('https://ad.adriver.ru/cgi-bin/json.cgi');
+      request.respond(503, null, 'Unavailable');
+      expect(logErrorStub.calledOnce).to.be.true;
+    });
+
+    it('test call user sync url with the right params', function() {
+      const config = {
+        params: {}
+      };
+
+      const callbackSpy = sinon.spy();
+      const callback = adriverIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.include('https://ad.adriver.ru/cgi-bin/json.cgi');
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ adrcid: 'testAdriverId' }));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal('testAdriverId');
+    });
+
+    const responses = [
+      { adrcid: 'adrcidValue' },
+      { adrcid: undefined }
+    ]
+
+    responses.forEach(response => describe('test user sync response behavior', function () {
+      const config = {
+        params: {}
+      };
+      it('should save adrcid if it exists', function () {
+        const result = adriverIdSubmodule.getId(config);
+        result.callback((id) => {
+          expect(id).to.be.deep.equal(response.adrcid ? response.adrcid : undefined);
+        });
+
+        let request = server.requests[0];
+        request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ adrcid: response.adrcid }));
+
+        let expectedExpiration = new Date();
+        expectedExpiration.setTime(expectedExpiration.getTime() + 86400 * 1825 * 1000);
+        const minimalDate = new Date(0).toString();
+
+        function dateStringFor(date, maxDeltaMs = 2000) {
+          return sinon.match((val) => Math.abs(date.getTime() - new Date(val).getTime()) <= maxDeltaMs)
+        }
+
+        if (response.adrcid) {
+          expect(setCookieStub.calledWith('adrcid', response.adrcid, dateStringFor(expectedExpiration))).to.be.true;
+          expect(setLocalStorageStub.calledWith('adrcid', response.adrcid)).to.be.true;
+        } else {
+          expect(setCookieStub.calledWith('adrcid', '', minimalDate)).to.be.false;
+          expect(removeFromLocalStorageStub.calledWith('adrcid')).to.be.false;
+        }
+      });
+    }));
+  });
+});
diff --git a/test/spec/modules/adtargetBidAdapter_spec.js b/test/spec/modules/adtargetBidAdapter_spec.js
index 5a867e7dd52..d1221d24022 100644
--- a/test/spec/modules/adtargetBidAdapter_spec.js
+++ b/test/spec/modules/adtargetBidAdapter_spec.js
@@ -45,7 +45,8 @@ const SERVER_VIDEO_RESPONSE = {
     'height': 480,
     'cur': 'USD',
     'width': 640,
-    'cpm': 0.9
+    'cpm': 0.9,
+    'adomain': ['a.com']
   }]
 };
 const SERVER_DISPLAY_RESPONSE = {
@@ -107,7 +108,10 @@ const videoEqResponse = [{
   height: 480,
   width: 640,
   ttl: 300,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: ['a.com']
+  }
 }];
 
 const displayEqResponse = [{
@@ -120,7 +124,10 @@ const displayEqResponse = [{
   height: 250,
   width: 300,
   ttl: 300,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: []
+  }
 }];
 
 describe('adtargetBidAdapter', () => {
diff --git a/test/spec/modules/adtelligentBidAdapter_spec.js b/test/spec/modules/adtelligentBidAdapter_spec.js
index 9c694668703..d0ef69ccf08 100644
--- a/test/spec/modules/adtelligentBidAdapter_spec.js
+++ b/test/spec/modules/adtelligentBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { spec } from 'modules/adtelligentBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { config } from 'src/config.js';
+import { deepClone } from 'src/utils.js';
 
 const EXPECTED_ENDPOINTS = [
   'https://ghb.adtelligent.com/v2/auction/',
@@ -9,7 +10,20 @@ const EXPECTED_ENDPOINTS = [
   'https://ghb2.adtelligent.com/v2/auction/',
   'https://ghb.adtelligent.com/v2/auction/'
 ];
+const aliasEP = {
+  appaloosa: 'https://ghb.hb.appaloosa.media/v2/auction/',
+  appaloosa_publisherSuffix: 'https://ghb.hb.appaloosa.media/v2/auction/',
+  onefiftytwomedia: 'https://ghb.ads.152media.com/v2/auction/',
+  navelix: 'https://ghb.hb.navelix.com/v2/auction/',
+  bidsxchange: 'https://ghb.hbd.bidsxchange.com/v2/auction/',
+  streamkey: 'https://ghb.hb.streamkey.net/v2/auction/',
+  janet: 'https://ghb.bidder.jmgads.com/v2/auction/',
+  pgam: 'https://ghb.pgamssp.com/v2/auction/',
+  ocm: 'https://ghb.cenarius.orangeclickmedia.com/v2/auction/',
+  vidcrunchllc: 'https://ghb.platform.vidcrunch.com/v2/auction/',
+};
 
+const DEFAULT_ADATPER_REQ = { bidderCode: 'adtelligent' };
 const DISPLAY_REQUEST = {
   'bidder': 'adtelligent',
   'params': {
@@ -70,15 +84,16 @@ const SERVER_VIDEO_RESPONSE = {
     'height': 480,
     'cur': 'USD',
     'width': 640,
-    'cpm': 0.9
-  }
-  ]
+    'cpm': 0.9,
+    'adomain': ['a.com']
+  }]
 };
 const SERVER_OUSTREAM_VIDEO_RESPONSE = SERVER_VIDEO_RESPONSE;
 const SERVER_DISPLAY_RESPONSE = {
   'source': { 'aid': 12345, 'pubId': 54321 },
   'bids': [{
     'ad': '<!-- Creative -->',
+    'adUrl': 'adUrl',
     'requestId': '2e41f65424c87c',
     'creative_id': 342516,
     'cmpId': 342516,
@@ -152,7 +167,10 @@ const videoEqResponse = [{
   height: 480,
   width: 640,
   ttl: 300,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: ['a.com']
+  }
 }];
 
 const displayEqResponse = [{
@@ -162,10 +180,15 @@ const displayEqResponse = [{
   netRevenue: true,
   currency: 'USD',
   ad: '<!-- Creative -->',
+  adUrl: 'adUrl',
   height: 250,
   width: 300,
   ttl: 300,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: []
+  }
+
 }];
 
 describe('adtelligentBidAdapter', () => {
@@ -241,15 +264,24 @@ describe('adtelligentBidAdapter', () => {
     let videoBidRequests = [VIDEO_REQUEST];
     let displayBidRequests = [DISPLAY_REQUEST];
     let videoAndDisplayBidRequests = [DISPLAY_REQUEST, VIDEO_REQUEST];
-    const displayRequest = spec.buildRequests(displayBidRequests, {});
-    const videoRequest = spec.buildRequests(videoBidRequests, {});
-    const videoAndDisplayRequests = spec.buildRequests(videoAndDisplayBidRequests, {});
-    const rotatingRequest = spec.buildRequests(displayBidRequests, {});
+    const displayRequest = spec.buildRequests(displayBidRequests, DEFAULT_ADATPER_REQ);
+    const videoRequest = spec.buildRequests(videoBidRequests, DEFAULT_ADATPER_REQ);
+    const videoAndDisplayRequests = spec.buildRequests(videoAndDisplayBidRequests, DEFAULT_ADATPER_REQ);
+    const rotatingRequest = spec.buildRequests(displayBidRequests, DEFAULT_ADATPER_REQ);
     it('rotates endpoints', () => {
       const bidReqUrls = [displayRequest[0], videoRequest[0], videoAndDisplayRequests[0], rotatingRequest[0]].map(br => br.url);
       expect(bidReqUrls).to.deep.equal(EXPECTED_ENDPOINTS);
     })
 
+    it('makes correct host for aliases', () => {
+      for (const alias in aliasEP) {
+        const bidReq = deepClone(DISPLAY_REQUEST)
+        bidReq.bidder = alias;
+        const [bidderRequest] = spec.buildRequests([bidReq], { bidderCode: alias });
+        expect(bidderRequest.url).to.equal(aliasEP[alias]);
+      }
+    })
+
     it('building requests as arrays', () => {
       expect(videoRequest).to.be.a('array');
       expect(displayRequest).to.be.a('array');
@@ -264,7 +296,7 @@ describe('adtelligentBidAdapter', () => {
       expect(videoAndDisplayRequests.every(comparator)).to.be.true;
     });
     it('forms correct ADPOD request', () => {
-      const pbBidReqData = spec.buildRequests([ADPOD_REQUEST], {})[0].data;
+      const pbBidReqData = spec.buildRequests([ADPOD_REQUEST], DEFAULT_ADATPER_REQ)[0].data;
       const impRequest = pbBidReqData.BidRequests[0]
       expect(impRequest.AdType).to.be.equal('video');
       expect(impRequest.Adpod).to.be.a('object');
@@ -277,7 +309,8 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'video',
         Aid: 12345,
-        Sizes: '480x360,640x480'
+        Sizes: '480x360,640x480',
+        PlacementId: 'adunit-code'
       };
       expect(data.BidRequests[0]).to.deep.equal(eq);
     });
@@ -289,7 +322,8 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'display',
         Aid: 12345,
-        Sizes: '300x250'
+        Sizes: '300x250',
+        PlacementId: 'adunit-code'
       };
 
       expect(data.BidRequests[0]).to.deep.equal(eq);
@@ -301,12 +335,14 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'display',
         Aid: 12345,
-        Sizes: '300x250'
+        Sizes: '300x250',
+        PlacementId: 'adunit-code'
       }, {
         CallbackId: '84ab500420319d',
         AdType: 'video',
         Aid: 12345,
-        Sizes: '480x360,640x480'
+        Sizes: '480x360,640x480',
+        PlacementId: 'adunit-code'
       }]
 
       expect(bidRequests.BidRequests).to.deep.equal(expectedBidReqs);
diff --git a/test/spec/modules/adtelligentIdSystem_spec.js b/test/spec/modules/adtelligentIdSystem_spec.js
new file mode 100644
index 00000000000..f3c7262c67a
--- /dev/null
+++ b/test/spec/modules/adtelligentIdSystem_spec.js
@@ -0,0 +1,30 @@
+import { adtelligentIdModule } from 'modules/adtelligentIdSystem'
+import * as ajaxLib from 'src/ajax.js';
+
+const adtUserIdRemoteResponse = { u: 'test1' };
+const adtUserIdLocalResponse = 'test2';
+
+describe('AdtelligentId module', function () {
+  it('gets remote id', function () {
+    const ajaxBuilderStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(() => {
+      return (url, cbObj) => {
+        cbObj.success(JSON.stringify(adtUserIdRemoteResponse))
+      }
+    });
+    const moduleIdCallbackResponse = adtelligentIdModule.getId();
+    moduleIdCallbackResponse.callback((id) => {
+      expect(id).to.equal(adtUserIdRemoteResponse.u)
+    })
+    ajaxBuilderStub.restore();
+  })
+  it('gets id from page context', function () {
+    window.adtDmp = {
+      ready: true,
+      getUID() {
+        return adtUserIdLocalResponse;
+      }
+    }
+    const moduleIdResponse = adtelligentIdModule.getId();
+    assert.deepEqual(moduleIdResponse, { id: adtUserIdLocalResponse });
+  })
+})
diff --git a/test/spec/modules/adtrgtmeBidAdapter_spec.js b/test/spec/modules/adtrgtmeBidAdapter_spec.js
new file mode 100644
index 00000000000..fce270b4ea7
--- /dev/null
+++ b/test/spec/modules/adtrgtmeBidAdapter_spec.js
@@ -0,0 +1,802 @@
+import { expect } from 'chai';
+import { config } from 'src/config.js';
+import { BANNER } from 'src/mediaTypes.js';
+import { spec } from 'modules/adtrgtmeBidAdapter.js';
+
+const DEFAULT_SID = 1220291391;
+const DEFAULT_ZID = 1836455615;
+const DEFAULT_BID_ID = '84ab500420319d';
+
+const DEFAULT_AD_UNIT_CODE = '/1220291391/header-banner';
+const DEFAULT_AD_UNIT_TYPE = BANNER;
+const DEFAULT_PARAMS_BID_OVERRIDE = {};
+
+const ADAPTER_VERSION = '1.0.0';
+const PREBID_VERSION = '$prebid.version$';
+const INTEGRATION_METHOD = 'prebid.js';
+
+// Utility functions
+const generateBidRequest = ({bidId, adUnitCode, bidOverrideObject, zid, ortb2}) => {
+  const bidRequest = {
+    adUnitCode,
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    bidId,
+    bidderRequestsCount: 1,
+    bidder: 'adtrgtme',
+    bidderRequestId: '7101db09af0db2',
+    bidderWinsCount: 0,
+    mediaTypes: {},
+    params: {
+      bidOverride: bidOverrideObject
+    },
+    src: 'client',
+    transactionId: '5b17b67d-7704-4732-8cc9-5b1723e9bcf9',
+    ortb2
+  };
+
+  const bannerObj = {
+    sizes: [[300, 250]]
+  };
+
+  bidRequest.mediaTypes.banner = bannerObj;
+  bidRequest.sizes = [[300, 250]];
+
+  bidRequest.params.sid = DEFAULT_SID;
+  if (typeof zid == 'number') {
+    bidRequest.params.zid = zid;
+  }
+
+  return bidRequest;
+}
+
+let generateBidderRequest = (bidRequestArray, adUnitCode, ortb2 = {}) => {
+  const bidderRequest = {
+    adUnitCode: adUnitCode || 'default-adUnitCode',
+    auctionId: 'd4c83a3b-18e4-4208-b98b-63848449c7aa',
+    auctionStart: new Date().getTime(),
+    bidderCode: 'adtrgtme',
+    bidderRequestId: '112f1c7c5d399a',
+    bids: bidRequestArray,
+    refererInfo: {
+      page: 'https://publisher-test.com',
+      reachedTop: true,
+      isAmp: false,
+      numIframes: 0,
+      stack: ['https://publisher-test.com'],
+    },
+    gdprConsent: {
+      consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+      vendorData: {},
+      gdprApplies: true
+    },
+    start: new Date().getTime(),
+    timeout: 1000,
+    ortb2
+  };
+
+  return bidderRequest;
+};
+
+const generateBuildRequestMock = ({bidId, adUnitCode, adUnitType, zid, bidOverrideObject, pubIdMode, ortb2}) => {
+  const bidRequestConfig = {
+    bidId: bidId || DEFAULT_BID_ID,
+    adUnitCode: adUnitCode || DEFAULT_AD_UNIT_CODE,
+    adUnitType: adUnitType || DEFAULT_AD_UNIT_TYPE,
+    zid: zid || DEFAULT_ZID,
+    bidOverrideObject: bidOverrideObject || DEFAULT_PARAMS_BID_OVERRIDE,
+
+    pubIdMode: pubIdMode || false,
+    ortb2: ortb2 || {}
+  };
+  const bidRequest = generateBidRequest(bidRequestConfig);
+  const validBidRequests = [bidRequest];
+  const bidderRequest = generateBidderRequest(validBidRequests, adUnitCode, ortb2);
+
+  return { bidRequest, validBidRequests, bidderRequest }
+};
+
+const generateAdmPayload = (admPayloadType) => {
+  let ADM_PAYLOAD;
+  switch (admPayloadType) {
+    case 'banner':
+      ADM_PAYLOAD = '<script>logInfo(\'ad\'); AdPlacement </script>'; // banner
+      break;
+    default: '<script>logInfo(\'ad\'); AdPlacement </script>'; break;
+  };
+
+  return ADM_PAYLOAD;
+};
+
+const generateResponseMock = (admPayloadType) => {
+  const bidResponse = {
+    id: 'fc0c35df-21fb-4f93-9ebd-88759dbe31f9',
+    impid: '274395c06a24e5',
+    adm: generateAdmPayload(admPayloadType),
+    price: 1,
+    w: 300,
+    h: 250,
+    crid: 'ssp-placement-name',
+    adomain: ['advertiser-domain.com']
+  };
+
+  const serverResponse = {
+    body: {
+      id: 'fc0c35df-21fb-4f93-9ebd-88759dbe31f9',
+      seatbid: [{ bid: [ bidResponse ], seat: 13107 }]
+    }
+  };
+  const { validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: admPayloadType});
+  const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+
+  return {serverResponse, data, bidderRequest};
+}
+
+// Unit tests
+describe('adtrgtme Bid Adapter:', () => {
+  it('PLACEHOLDER TO PASS GULP', () => {
+    const obj = {};
+    expect(obj).to.be.an('object');
+  });
+
+  describe('Validate basic properties', () => {
+    it('should define the correct bidder code', () => {
+      expect(spec.code).to.equal('adtrgtme')
+    });
+  });
+
+  describe('getUserSyncs()', () => {
+    const IMAGE_PIXEL_URL = 'http://image-pixel.com/foo/bar?1234&baz=true';
+    const IFRAME_ONE_URL = 'http://image-iframe.com/foo/bar?1234&baz=true';
+    const IFRAME_TWO_URL = 'http://image-iframe-two.com/foo/bar?1234&baz=true';
+
+    let serverResponses = [];
+    beforeEach(() => {
+      serverResponses[0] = {
+        body: {
+          ext: {
+            pixels: `<script>document.write('<iframe src="${IFRAME_ONE_URL}"></iframe>` +
+                    `<img src="${IMAGE_PIXEL_URL}"></iframe>` +
+                    `<iframe src="${IFRAME_TWO_URL}"></iframe>');</script>`
+          }
+        }
+      }
+    });
+
+    after(() => {
+      serverResponses = undefined;
+    });
+
+    it('for only iframe enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: false
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(2);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'iframe', 'url': IFRAME_ONE_URL},
+          {type: 'iframe', 'url': IFRAME_TWO_URL}
+        ]
+      )
+    });
+
+    it('for only pixel enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: true
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(1);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'image', 'url': IMAGE_PIXEL_URL}
+        ]
+      )
+    });
+
+    it('for both pixel and iframe enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(3);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'iframe', 'url': IFRAME_ONE_URL},
+          {type: 'image', 'url': IMAGE_PIXEL_URL},
+          {type: 'iframe', 'url': IFRAME_TWO_URL}
+        ]
+      )
+    });
+  });
+
+  // Validate Bid Requests
+  describe('isBidRequestValid()', () => {
+    const INVALID_INPUT = [
+      {},
+      {params: {}},
+      {params: {sid: '1234', zid: '4321'}},
+      {params: {sid: '1220291391', zid: 4321}},
+      {params: {zid: ''}},
+      {params: {sid: '', zid: ''}},
+    ];
+
+    INVALID_INPUT.forEach(input => {
+      it(`should determine that the bid is INVALID for the input ${JSON.stringify(input)}`, () => {
+        expect(spec.isBidRequestValid(input)).to.be.false;
+      });
+    });
+
+    it('should determine that the bid is VALID if sid and zid are present on the params object', () => {
+      const validBid = {
+        params: {
+          sid: 1220291391,
+          zid: 1836455615
+        }
+      };
+      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    });
+  });
+
+  describe('Price Floor module support:', () => {
+    it('should get bidfloor from getFloor method', () => {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidRequest.params.bidOverride = {cur: 'EUR'};
+      bidRequest.getFloor = (floorObj) => {
+        return {
+          floor: bidRequest.floors.values[floorObj.mediaType + '|300x250'],
+          currency: floorObj.currency,
+          mediaType: floorObj.mediaType
+        }
+      };
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'banner|300x250': 5.55
+        }
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.cur).to.deep.equal(['EUR']);
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(5.55);
+    });
+  });
+
+  describe('Schain module support:', () => {
+    it('should send Global or Bidder specific schain', function () {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const globalSchain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'some-platform.com',
+          sid: '111111',
+          rid: bidRequest.bidId,
+          hp: 1
+        }]
+      };
+      bidRequest.schain = globalSchain;
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain.nodes.length).to.equal(1);
+      expect(schain).to.equal(globalSchain);
+    });
+  });
+
+  describe('First party data module - "Site" support (ortb2):', () => {
+    // Should not allow invalid "site" data types
+    const INVALID_ORTB2_TYPES = [ null, [], 123, 'unsupportedKeyName', true, false, undefined ];
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should not allow invalid site types to be added to bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = { site: param }
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.be.undefined;
+      });
+    });
+
+    // Should add valid "site" params
+    const VALID_SITE_STRINGS = ['name', 'domain', 'page', 'ref', 'keywords'];
+    const VALID_SITE_ARRAYS = ['cat', 'sectioncat', 'pagecat'];
+
+    VALID_SITE_STRINGS.forEach(param => {
+      it(`should allow supported site keys to be added bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            [param]: 'something'
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.exist;
+        expect(data.site[param]).to.be.a('string');
+        expect(data.site[param]).to.be.equal(ortb2.site[param]);
+      });
+    });
+
+    VALID_SITE_ARRAYS.forEach(param => {
+      it(`should determine that the ortb2.site Array key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            [param]: ['something']
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.exist;
+        expect(data.site[param]).to.be.a('array');
+        expect(data.site[param]).to.be.equal(ortb2.site[param]);
+      });
+    });
+
+    // Should not allow invalid "site.content" data types
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should determine that the ortb2.site.content key is invalid and should not be added to bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: param
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content).to.be.undefined;
+      });
+    });
+
+    // Should not allow invalid "site.content" keys
+    it(`should not allow invalid ortb2.site.content object keys to be added to bid-request: {custom object}`, () => {
+      const ortb2 = {
+        site: {
+          content: {
+            fake: 'news',
+            unreal: 'param',
+            counterfit: 'data'
+          }
+        }
+      };
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.site.content).to.be.a('object');
+    });
+
+    // Should append valid "site.content" keys
+    const VALID_CONTENT_STRINGS = ['id', 'title', 'language'];
+    VALID_CONTENT_STRINGS.forEach(param => {
+      it(`should determine that the ortb2.site String key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: {
+              [param]: 'something'
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content[param]).to.exist;
+        expect(data.site.content[param]).to.be.a('string');
+        expect(data.site.content[param]).to.be.equal(ortb2.site.content[param]);
+      });
+    });
+
+    const VALID_CONTENT_ARRAYS = ['cat'];
+    VALID_CONTENT_ARRAYS.forEach(param => {
+      it(`should determine that the ortb2.site Array key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: {
+              [param]: ['something', 'something-else']
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content[param]).to.be.a('array');
+        expect(data.site.content[param]).to.be.equal(ortb2.site.content[param]);
+      });
+    });
+  });
+
+  describe('First party data module - "User" support (ortb2):', () => {
+    // Global ortb2.user validations
+    // Should not allow invalid "user" data types
+    const INVALID_ORTB2_TYPES = [ null, [], 'unsupportedKeyName', true, false, undefined ];
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should not allow invalid site types to be added to bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = { user: param }
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.be.undefined;
+      });
+    });
+
+    // Should add valid "user" params
+    const VALID_USER_STRINGS = ['id', 'buyeruid', 'gender', 'keywords', 'customdata'];
+    VALID_USER_STRINGS.forEach(param => {
+      it(`should allow supported user string keys to be added bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            [param]: 'something'
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.exist;
+        expect(data.user[param]).to.be.a('string');
+        expect(data.user[param]).to.be.equal(ortb2.user[param]);
+      });
+    });
+
+    const VALID_USER_OBJECTS = ['ext'];
+    VALID_USER_OBJECTS.forEach(param => {
+      it(`should allow supported user extObject keys to be added to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            [param]: {a: '123', b: '456'}
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.exist;
+        expect(data.user[param]).to.be.a('object');
+        expect(data.user[param]).to.be.deep.include({[param]: {a: '123', b: '456'}});
+        config.setConfig({ortb2: {}});
+      });
+    });
+
+    // adUnit.ortb2Imp.ext.data
+    it(`should allow adUnit.ortb2Imp.ext.data object to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        ext: {
+          data: {
+            pbadslot: 'homepage-top-rect',
+            adUnitSpecificAttribute: '123'
+          }
+        }
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].ext.data).to.deep.equal(validBidRequests[0].ortb2Imp.ext.data);
+    });
+    // adUnit.ortb2Imp.instl
+    it(`should allow adUnit.ortb2Imp.instl numeric boolean "1" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: 1
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.deep.equal(validBidRequests[0].ortb2Imp.instl);
+    });
+
+    it(`should prevent adUnit.ortb2Imp.instl boolean "true" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: true
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.not.exist;
+    });
+
+    it(`should prevent adUnit.ortb2Imp.instl boolean "false" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: false
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.not.exist;
+    });
+  });
+
+  describe('GDPR & Consent:', () => {
+    it('should return request objects that do not send cookies if purpose 1 consent is not provided', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidderRequest.gdprConsent = {
+        consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+        apiVersion: 2,
+        vendorData: {
+          purpose: {
+            consents: {
+              '1': false
+            }
+          }
+        },
+        gdprApplies: true
+      };
+      const options = spec.buildRequests(validBidRequests, bidderRequest)[0].options;
+      expect(options.withCredentials).to.be.false;
+    });
+  });
+
+  describe('Endpoint & Impression Request Mode:', () => {
+    it('should route request to config override endpoint', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const sid = validBidRequests[0].params.sid;
+      const testOverrideEndpoint = 'http://new_bidder_host.com/ssp?s=';
+      config.setConfig({
+        adtrgtme: {
+          endpoint: testOverrideEndpoint
+        }
+      });
+      const response = spec.buildRequests(validBidRequests, bidderRequest)[0];
+      expect(response).to.deep.include(
+        {
+          method: 'POST',
+          url: testOverrideEndpoint + sid
+        });
+    });
+
+    it('should route request to endpoint + sid', () => {
+      config.setConfig({
+        adtrgtme: {}
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const sid = validBidRequests[0].params.sid;
+      const response = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(response[0]).to.deep.include({
+        method: 'POST',
+        url: 'https://z.cdn.adtarget.market/ssp?prebid&s=' + sid
+      });
+    });
+
+    it('should return a single request object for single request mode', () => {
+      let { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const BID_ID_2 = '84ab50xxxxx';
+      const BID_ZID_2 = 98876543210;
+      const AD_UNIT_CODE_2 = 'test-ad-unit-code-123';
+      const { bidRequest: bidRequest2 } = generateBuildRequestMock({bidId: BID_ID_2, zid: BID_ZID_2, adUnitCode: AD_UNIT_CODE_2});
+      validBidRequests = [bidRequest, bidRequest2];
+      bidderRequest.bids = validBidRequests;
+
+      config.setConfig({
+        adtrgtme: {
+          singleRequestMode: true
+        }
+      });
+
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+
+      expect(data.imp).to.be.an('array').with.lengthOf(2);
+
+      expect(data.imp[0]).to.deep.include({
+        id: DEFAULT_BID_ID,
+        ext: {
+          dfp_ad_unit_code: DEFAULT_AD_UNIT_CODE
+        }
+      });
+
+      expect(data.imp[1]).to.deep.include({
+        id: BID_ID_2,
+        tagid: BID_ZID_2,
+        ext: {
+          dfp_ad_unit_code: AD_UNIT_CODE_2
+        }
+      });
+    });
+  });
+
+  describe('Validate request filtering:', () => {
+    it('should not return request when no bids are present', function () {
+      let request = spec.buildRequests([]);
+      expect(request).to.be.undefined;
+    });
+
+    it('buildRequests(): should return an array with the correct amount of request objects', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const response = spec.buildRequests(validBidRequests, bidderRequest).bidderRequest;
+      expect(response.bids).to.be.an('array').to.have.lengthOf(1);
+    });
+  });
+
+  describe('Request Headers validation:', () => {
+    it('should return request objects with the relevant custom headers and content type declaration', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidderRequest.gdprConsent.gdprApplies = false;
+      const options = spec.buildRequests(validBidRequests, bidderRequest).options;
+      expect(options).to.deep.equal(
+        {
+          contentType: 'application/json',
+          customHeaders: {
+            'x-openrtb-version': '2.5'
+          },
+          withCredentials: true
+        });
+    });
+  });
+
+  describe('Request Payload oRTB bid validation:', () => {
+    it('should generate a valid openRTB bid-request object in the data field', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.site).to.deep.include({
+        id: bidderRequest.bids[0].params.sid,
+        page: bidderRequest.refererInfo.page
+      });
+
+      expect(data.device).to.deep.equal({
+        dnt: 0,
+        ua: navigator.userAgent,
+        ip: undefined
+      });
+
+      expect(data.regs).to.deep.equal({
+        ext: {
+          'us_privacy': '',
+          gdpr: 1
+        }
+      });
+
+      expect(data.source).to.deep.equal({
+        ext: {
+          hb: 1,
+          adapterver: ADAPTER_VERSION,
+          prebidver: PREBID_VERSION,
+          integration: {
+            name: INTEGRATION_METHOD,
+            ver: PREBID_VERSION
+          }
+        },
+        fd: 1
+      });
+
+      expect(data.cur).to.deep.equal(['USD']);
+    });
+
+    it('should generate a valid openRTB imp.ext object in the bid-request', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const bid = validBidRequests[0];
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.imp[0].ext).to.deep.equal({
+        dfp_ad_unit_code: DEFAULT_AD_UNIT_CODE
+      });
+    });
+
+    it('should use siteId value as site.id in the outbound bid-request when using "pubId" integration mode', () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({pubIdMode: true});
+      validBidRequests[0].params.sid = 9876543210;
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.site.id).to.equal(9876543210);
+    });
+
+    it('should use placementId value as imp.tagid in the outbound bid-request when using "zid"', () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({}),
+        TEST_ZID = 54321;
+      validBidRequests[0].params.zid = TEST_ZID;
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.imp[0].tagid).to.deep.equal(TEST_ZID);
+    });
+  });
+
+  describe('Request Payload oRTB bid.imp validation:', () => {
+    // Validate Banner imp imp when adtrgtme.mode=undefined
+    it('should generate a valid "Banner" imp object', () => {
+      config.setConfig({
+        adtrgtme: {}
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].banner).to.deep.equal({
+        mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: [{w: 300, h: 250}]
+      });
+    });
+
+    // Validate Banner imp
+    it('should generate a valid "Banner" imp object', () => {
+      config.setConfig({
+        adtrgtme: { mode: 'banner' }
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].banner).to.deep.equal({
+        mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: [{w: 300, h: 250}]
+      });
+    });
+  });
+
+  describe('interpretResponse()', () => {
+    describe('for mediaTypes: "banner"', () => {
+      it('should insert banner payload into response[0].ad', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ad).to.equal('<script>logInfo(\'ad\'); AdPlacement </script>');
+        expect(response[0].mediaType).to.equal('banner');
+      })
+    });
+
+    describe('Support Advertiser domains', () => {
+      it('should append bid-response adomain to meta.advertiserDomains', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].meta.advertiserDomains).to.be.a('array');
+        expect(response[0].meta.advertiserDomains[0]).to.equal('advertiser-domain.com');
+      })
+    });
+
+    describe('bid response Ad ID / Creative ID', () => {
+      it('should use adId if it exists in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const adId = 'bid-response-adId';
+        serverResponse.body.seatbid[0].bid[0].adId = adId;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(adId);
+      });
+
+      it('should use impid if adId does not exist in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const impid = '25b6c429c1f52f';
+        serverResponse.body.seatbid[0].bid[0].impid = impid;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(impid);
+      });
+
+      it('should use crid if adId & impid do not exist in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const crid = 'passback-12579';
+        serverResponse.body.seatbid[0].bid[0].impid = undefined;
+        serverResponse.body.seatbid[0].bid[0].crid = crid;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(crid);
+      });
+    });
+
+    describe('Time To Live (ttl)', () => {
+      const UNSUPPORTED_TTL_FORMATS = ['string', [1, 2, 3], true, false, null, undefined];
+      UNSUPPORTED_TTL_FORMATS.forEach(param => {
+        it('should not allow unsupported global adtrgtme.ttl formats and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          config.setConfig({
+            adtrgtme: { ttl: param }
+          });
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+
+        it('should not allow unsupported params.ttl formats and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          bidderRequest.bids[0].params.ttl = param;
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+      });
+
+      const UNSUPPORTED_TTL_VALUES = [-1, 3601];
+      UNSUPPORTED_TTL_VALUES.forEach(param => {
+        it('should not allow invalid global adtrgtme.ttl values 3600 < ttl < 0 and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          config.setConfig({
+            adtrgtme: { ttl: param }
+          });
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+
+        it('should not allow invalid params.ttl values 3600 < ttl < 0 and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          bidderRequest.bids[0].params.ttl = param;
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+      });
+
+      it('should give presedence to Gloabl ttl over params.ttl ', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        config.setConfig({
+          adtrgtme: { ttl: 500 }
+        });
+        bidderRequest.bids[0].params.ttl = 400;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ttl).to.equal(500);
+      });
+    });
+
+    describe('Aliasing support', () => {
+      it('should return undefined as the bidder code value', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].bidderCode).to.be.undefined;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/adtrueBidAdapter_spec.js b/test/spec/modules/adtrueBidAdapter_spec.js
new file mode 100644
index 00000000000..b499d077a3c
--- /dev/null
+++ b/test/spec/modules/adtrueBidAdapter_spec.js
@@ -0,0 +1,431 @@
+import {expect} from 'chai'
+import {spec} from 'modules/adtrueBidAdapter.js'
+import {newBidder} from 'src/adapters/bidderFactory.js'
+import * as utils from '../../../src/utils.js';
+import {config} from 'src/config.js';
+
+describe('AdTrueBidAdapter', function () {
+  const adapter = newBidder(spec)
+  let bidRequests;
+  let bidResponses;
+  let bidResponses2;
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'adtrue',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          publisherId: '1212',
+          zoneId: '21423',
+          reserve: 0
+        },
+        placementCode: 'adunit-code-1',
+        sizes: [[300, 250]],
+        bidId: '23acc48ad47af5',
+        requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+        schain: {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [
+            {
+              'asi': 'indirectseller.com',
+              'sid': '00001',
+              'hp': 1
+            },
+
+            {
+              'asi': 'indirectseller-2.com',
+              'sid': '00002',
+              'hp': 2
+            }
+          ]
+        }
+      }
+    ];
+    bidResponses = {
+      body: {
+        id: '1610681506302',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '1',
+                impid: '201fb513ca24e9',
+                price: 2.880000114440918,
+                burl: 'https://hb.adtrue.com/prebid/win-notify?impid=1610681506302&wp=${AUCTION_PRICE}',
+                adm: '<a href=\'https://adtrue.com?ref=pbjs\' target=\'_blank\'><img src=\'http://cdn.adtrue.com/img/prebid_sample_300x250.jpg?v=1.2\' style=\' width: 300px; \' /></a>',
+                adid: '1610681506302',
+                adomain: [
+                  'adtrue.com'
+                ],
+                cid: 'f6l0r6n',
+                crid: 'abc77au4',
+                attr: [],
+                w: 300,
+                h: 250
+              }
+            ],
+            seat: 'adtrue',
+            group: 0
+          }
+        ],
+        bidid: '1610681506302',
+        cur: 'USD',
+        ext: {
+          cookie_sync: [
+            {
+              type: 1,
+              url: 'https://hb.adtrue.com/prebid/usersync?bidder=adtrue'
+            }
+          ]
+        }
+      }
+    };
+    bidResponses2 = {
+      body: {
+        id: '1610681506302',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '1',
+                impid: '201fb513ca24e9',
+                price: 2.880000114440918,
+                burl: 'https://hb.adtrue.com/prebid/win-notify?impid=1610681506302&wp=${AUCTION_PRICE}',
+                adm: '<a href=\'https://adtrue.com?ref=pbjs\' target=\'_blank\'><img src=\'http://cdn.adtrue.com/img/prebid_sample_300x250.jpg?v=1.2\' style=\' width: 300px; \' /></a>',
+                adid: '1610681506302',
+                adomain: [
+                  'adtrue.com'
+                ],
+                cid: 'f6l0r6n',
+                crid: 'abc77au4',
+                attr: [],
+                w: 300,
+                h: 250
+              }
+            ],
+            seat: 'adtrue',
+            group: 0
+          }
+        ],
+        bidid: '1610681506302',
+        cur: 'USD',
+        ext: {
+          cookie_sync: [
+            {
+              type: 2,
+              url: 'https://hb.adtrue.com/prebid/usersync?bidder=adtrue&type=image'
+            },
+            {
+              type: 1,
+              url: 'https://hb.adtrue.com/prebid/usersync?bidder=appnexus'
+            }
+          ]
+        }
+      }
+    };
+  });
+
+  describe('.code', function () {
+    it('should return a bidder code of adtrue', function () {
+      expect(spec.code).to.equal('adtrue')
+    })
+  })
+
+  describe('inherited functions', function () {
+    it('should exist and be a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+  describe('implementation', function () {
+    describe('Bid validations', function () {
+      it('valid bid case', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              zoneId: '21423',
+              publisherId: '1212'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(true);
+      });
+      it('invalid bid case: publisherId not passed', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              zoneId: '21423'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(false);
+      });
+      it('valid bid case: zoneId is not passed', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              publisherId: '1212'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(false);
+      });
+      it('should return false if there are no params', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return false if there is no publisherId param', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            zoneId: '21423',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return false if there is no zoneId param', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            publisherId: '1212',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return true if the bid is valid', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            zoneId: '21423',
+            publisherId: '1212',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+    describe('Request formation', function () {
+      it('buildRequests function should not modify original bidRequests object', function () {
+        let originalBidRequests = utils.deepClone(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        expect(bidRequests).to.deep.equal(originalBidRequests);
+      });
+
+      it('Endpoint/method checking', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        expect(request.url).to.equal('https://hb.adtrue.com/prebid/auction');
+        expect(request.method).to.equal('POST');
+      });
+
+      it('test flag not sent when adtrueTest=true is absent in page url', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.test).to.equal(undefined);
+      });
+      it('Request params check', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.at).to.equal(1); // auction  type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
+        expect(data.imp[0].bidfloor).to.equal(bidRequests[0].params.reserve); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+      it('Request params check with GDPR Consent', function () {
+        let bidRequest = {
+          gdprConsent: {
+            consentString: 'kjfdniwjnifwenrif3',
+            gdprApplies: true
+          }
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.user.ext.consent).to.equal('kjfdniwjnifwenrif3');
+        expect(data.at).to.equal(1); // auction type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
+        expect(data.imp[0].bidfloor).to.equal(parseFloat(bidRequests[0].params.reserve)); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+      it('Request params check with USP/CCPA Consent', function () {
+        let bidRequest = {
+          uspConsent: '1NYN'
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.regs.ext.us_privacy).to.equal('1NYN');// USP/CCPAs
+        expect(data.at).to.equal(1); // auction type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
+        expect(data.imp[0].bidfloor).to.equal(parseFloat(bidRequests[0].params.reserve)); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+
+      it('should NOT include coppa flag in bid request if coppa config is not present', () => {
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        if (data.regs) {
+          // in case GDPR is set then data.regs will exist
+          expect(data.regs.coppa).to.equal(undefined);
+        } else {
+          expect(data.regs).to.equal(undefined);
+        }
+      });
+      it('should include coppa flag in bid request if coppa is set to true', () => {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            'coppa': true
+          };
+          return config[key];
+        });
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        expect(data.regs.coppa).to.equal(1);
+        sandbox.restore();
+      });
+      it('should NOT include coppa flag in bid request if coppa is set to false', () => {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            'coppa': false
+          };
+          return config[key];
+        });
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        if (data.regs) {
+          // in case GDPR is set then data.regs will exist
+          expect(data.regs.coppa).to.equal(undefined);
+        } else {
+          expect(data.regs).to.equal(undefined);
+        }
+        sandbox.restore();
+      });
+    });
+  });
+  describe('Response checking', function () {
+    it('should check for valid response values', function () {
+      let request = spec.buildRequests(bidRequests, {
+        auctionId: 'new-auction-id'
+      });
+      let data = JSON.parse(request.data);
+      let response = spec.interpretResponse(bidResponses, request);
+      expect(response).to.be.an('array').with.length.above(0);
+      expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
+      expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
+      expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
+      if (bidResponses.body.seatbid[0].bid[0].crid) {
+        expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
+      } else {
+        expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+      }
+      expect(response[0].currency).to.equal('USD');
+      expect(response[0].ttl).to.equal(300);
+      expect(response[0].meta.clickUrl).to.equal('adtrue.com');
+      expect(response[0].meta.advertiserDomains[0]).to.equal('adtrue.com');
+      expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+      expect(response[0].partnerImpId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+    });
+  });
+  describe('getUserSyncs', function () {
+    let sandbox;
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+    afterEach(function () {
+      sandbox.restore();
+    });
+    it('execute as per config', function () {
+      expect(spec.getUserSyncs({iframeEnabled: true}, [bidResponses], undefined, undefined)).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://hb.adtrue.com/prebid/usersync?bidder=adtrue&publisherId=1212&zoneId=21423&gdpr=0&gdpr_consent=&us_privacy=&coppa=0'
+      }]);
+    });
+    // Multiple user sync output
+    it('execute as per config', function () {
+      expect(spec.getUserSyncs({iframeEnabled: true}, [bidResponses2], undefined, undefined)).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://hb.adtrue.com/prebid/usersync?bidder=adtrue&type=image&publisherId=1212&zoneId=21423&gdpr=0&gdpr_consent=&us_privacy=&coppa=0'
+        },
+        {
+          type: 'iframe',
+          url: 'https://hb.adtrue.com/prebid/usersync?bidder=appnexus&publisherId=1212&zoneId=21423&gdpr=0&gdpr_consent=&us_privacy=&coppa=0'
+        }
+      ]);
+    });
+  });
+});
diff --git a/test/spec/modules/aduptechBidAdapter_spec.js b/test/spec/modules/aduptechBidAdapter_spec.js
index 1e39e0cfc8b..8dbdbbfeab5 100644
--- a/test/spec/modules/aduptechBidAdapter_spec.js
+++ b/test/spec/modules/aduptechBidAdapter_spec.js
@@ -1,180 +1,310 @@
 import { expect } from 'chai';
 import {
   BIDDER_CODE,
-  PUBLISHER_PLACEHOLDER,
-  ENDPOINT_URL,
   ENDPOINT_METHOD,
-  spec,
-  extractGdprFromBidderRequest,
-  extractParamsFromBidRequest,
-  extractSizesFromBidRequest,
-  extractTopWindowReferrerFromBidRequest,
-  extractTopWindowUrlFromBidRequest
+  internal,
+  spec
 } from '../../../modules/aduptechBidAdapter.js';
+import { config } from '../../../src/config.js';
+import * as utils from '../../../src/utils.js';
+import { BANNER, NATIVE } from '../../../src/mediaTypes.js'
 import { newBidder } from '../../../src/adapters/bidderFactory.js';
 
 describe('AduptechBidAdapter', () => {
-  describe('extractGdprFromBidderRequest', () => {
-    it('should handle empty bidder request', () => {
-      const bidderRequest = null;
-      expect(extractGdprFromBidderRequest(bidderRequest)).to.be.null;
-    });
+  describe('internal', () => {
+    describe('extractGdpr', () => {
+      it('should handle empty bidderRequest', () => {
+        expect(internal.extractGdpr(null)).to.be.null;
+        expect(internal.extractGdpr({})).to.be.null;
+      });
 
-    it('should handle missing gdprConsent in bidder request', () => {
-      const bidderRequest = {};
-      expect(extractGdprFromBidderRequest(bidderRequest)).to.be.null;
-    });
+      it('should extract bidderRequest.gdprConsent', () => {
+        const bidderRequest = {
+          gdprConsent: {
+            consentString: 'consentString',
+            gdprApplies: false
+          }
+        };
 
-    it('should handle gdprConsent in bidder request', () => {
-      const bidderRequest = {
-        gdprConsent: {
-          consentString: 'consentString',
-          gdprApplies: true
-        }
-      };
+        expect(internal.extractGdpr(bidderRequest)).to.deep.equal({
+          consentString: bidderRequest.gdprConsent.consentString,
+          consentRequired: bidderRequest.gdprConsent.gdprApplies
+        });
+      });
 
-      expect(extractGdprFromBidderRequest(bidderRequest)).to.deep.equal({
-        consentString: bidderRequest.gdprConsent.consentString,
-        consentRequired: true
+      it('should handle missing bidderRequest.gdprConsent.gdprApplies', () => {
+        const bidderRequest = {
+          gdprConsent: {
+            consentString: 'consentString'
+          }
+        };
+
+        expect(internal.extractGdpr(bidderRequest)).to.deep.equal({
+          consentString: bidderRequest.gdprConsent.consentString,
+          consentRequired: true
+        });
       });
-    });
-  });
 
-  describe('extractParamsFromBidRequest', () => {
-    it('should handle empty bid request', () => {
-      const bidRequest = null;
-      expect(extractParamsFromBidRequest(bidRequest)).to.be.null;
-    });
+      it('should handle invalid bidderRequest.gdprConsent.gdprApplies', () => {
+        const bidderRequest = {
+          gdprConsent: {
+            consentString: 'consentString',
+            gdprApplies: 'foobar'
+          }
+        };
 
-    it('should handle missing params in bid request', () => {
-      const bidRequest = {};
-      expect(extractParamsFromBidRequest(bidRequest)).to.be.null;
+        expect(internal.extractGdpr(bidderRequest)).to.deep.equal({
+          consentString: bidderRequest.gdprConsent.consentString,
+          consentRequired: true
+        });
+      });
     });
 
-    it('should handle params in bid request', () => {
-      const bidRequest = {
-        params: {
-          foo: '123',
-          bar: 456
-        }
-      };
-      expect(extractParamsFromBidRequest(bidRequest)).to.deep.equal(bidRequest.params);
-    });
-  });
+    describe('extractPageUrl', () => {
+      let origPageUrl;
 
-  describe('extractSizesFromBidRequest', () => {
-    it('should handle empty bid request', () => {
-      const bidRequest = null;
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal([]);
-    });
+      beforeEach(() => {
+        // remember original pageUrl in config
+        origPageUrl = config.getConfig('pageUrl');
 
-    it('should handle missing sizes in bid request', () => {
-      const bidRequest = {};
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal([]);
-    });
+        // unset pageUrl in config
+        config.setConfig({ pageUrl: null });
+      });
+
+      afterEach(() => {
+        // set original pageUrl to config
+        config.setConfig({ pageUrl: origPageUrl });
+      });
+
+      it('should handle empty or missing data', () => {
+        expect(internal.extractPageUrl(null)).to.equal(utils.getWindowSelf().location.href);
+        expect(internal.extractPageUrl({})).to.equal(utils.getWindowSelf().location.href);
+        expect(internal.extractPageUrl({ refererInfo: {} })).to.equal(utils.getWindowSelf().location.href);
+        expect(internal.extractPageUrl({ refererInfo: { canonicalUrl: null } })).to.equal(utils.getWindowSelf().location.href);
+        expect(internal.extractPageUrl({ refererInfo: { canonicalUrl: '' } })).to.equal(utils.getWindowSelf().location.href);
+      });
 
-    it('should handle sizes in bid request', () => {
-      const bidRequest = {
-        mediaTypes: {
-          banner: {
-            sizes: [[12, 34], [56, 78]]
+      it('should use bidderRequest.refererInfo.page', () => {
+        const bidderRequest = {
+          refererInfo: {
+            page: 'http://canonical.url'
           }
-        }
-      };
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal(bidRequest.mediaTypes.banner.sizes);
-    });
+        };
 
-    it('should handle sizes in bid request (backward compatibility)', () => {
-      const bidRequest = {
-        sizes: [[12, 34], [56, 78]]
-      };
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal(bidRequest.sizes);
+        expect(internal.extractPageUrl(bidderRequest)).to.equal(bidderRequest.refererInfo.page);
+      });
     });
 
-    it('should prefer sizes in mediaTypes.banner', () => {
-      const bidRequest = {
-        sizes: [[12, 34]],
-        mediaTypes: {
-          banner: {
-            sizes: [[56, 78]]
+    describe('extractReferrer', () => {
+      it('should handle empty or missing data', () => {
+        expect(internal.extractReferrer(null)).to.equal(utils.getWindowSelf().document.referrer);
+        expect(internal.extractReferrer({})).to.equal(utils.getWindowSelf().document.referrer);
+        expect(internal.extractReferrer({ refererInfo: {} })).to.equal(utils.getWindowSelf().document.referrer);
+        expect(internal.extractReferrer({ refererInfo: { referer: null } })).to.equal(utils.getWindowSelf().document.referrer);
+        expect(internal.extractReferrer({ refererInfo: { referer: '' } })).to.equal(utils.getWindowSelf().document.referrer);
+      });
+
+      it('hould use bidderRequest.refererInfo.ref', () => {
+        const bidderRequest = {
+          refererInfo: {
+            ref: 'foobar'
           }
-        }
-      };
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal(bidRequest.mediaTypes.banner.sizes);
-    });
-  });
+        };
 
-  describe('extractTopWindowReferrerFromBidRequest', () => {
-    it('should use fallback if bid request is empty', () => {
-      const bidRequest = null;
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(window.top.document.referrer);
+        expect(internal.extractReferrer(bidderRequest)).to.equal(bidderRequest.refererInfo.ref);
+      });
     });
 
-    it('should use fallback if refererInfo in bid request is missing', () => {
-      const bidRequest = {};
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(window.top.document.referrer);
+    describe('extractParams', () => {
+      it('should handle empty bidRequest', () => {
+        expect(internal.extractParams(null)).to.be.null;
+        expect(internal.extractParams({})).to.be.null;
+      });
+
+      it('should extract bidRequest.params', () => {
+        const bidRequest = {
+          params: {
+            foo: '123',
+            bar: 456
+          }
+        };
+        expect(internal.extractParams(bidRequest)).to.deep.equal(bidRequest.params);
+      });
     });
 
-    it('should use fallback if refererInfo.referer in bid request is missing', () => {
-      const bidRequest = {
-        refererInfo: {}
-      };
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(window.top.document.referrer);
+    describe('extractBannerConfig', () => {
+      it('should handle empty bidRequest', () => {
+        expect(internal.extractBannerConfig(null)).to.be.null;
+        expect(internal.extractBannerConfig({})).to.be.null;
+      });
+
+      it('should extract bidRequest.mediaTypes.banner', () => {
+        const bidRequest = {
+          mediaTypes: {
+            banner: {
+              sizes: [[12, 34], [56, 78]]
+            }
+          }
+        };
+        expect(internal.extractBannerConfig(bidRequest)).to.deep.equal(bidRequest.mediaTypes.banner);
+      });
+
+      it('should extract bidRequest.sizes (backward compatibility)', () => {
+        const bidRequest = {
+          sizes: [[12, 34], [56, 78]]
+        };
+
+        expect(internal.extractBannerConfig(bidRequest)).to.deep.equal({sizes: bidRequest.sizes});
+      });
     });
 
-    it('should use fallback if refererInfo.referer in bid request is empty', () => {
-      const bidRequest = {
-        refererInfo: {
-          referer: ''
-        }
-      };
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(window.top.document.referrer);
+    describe('extractNativeConfig', () => {
+      it('should handle empty bidRequest', () => {
+        expect(internal.extractNativeConfig(null)).to.be.null;
+        expect(internal.extractNativeConfig({})).to.be.null;
+      });
+
+      it('should extract bidRequest.mediaTypes.native', () => {
+        const bidRequest = {
+          mediaTypes: {
+            native: {
+              image: {
+                required: true
+              },
+              title: {
+                required: true
+              }
+            }
+          }
+        };
+
+        expect(internal.extractNativeConfig(bidRequest)).to.deep.equal(bidRequest.mediaTypes.native);
+      });
     });
 
-    it('should use refererInfo.referer from bid request ', () => {
-      const bidRequest = {
-        refererInfo: {
-          referer: 'foobar'
+    describe('getFloor', () => {
+      let bidRequest;
+
+      beforeEach(() => {
+        bidRequest = {
+          getFloor: sinon.stub()
+        };
+      });
+
+      it('should handle empty or invalid bidRequest', () => {
+        expect(internal.getFloor(null)).to.be.null;
+        expect(internal.getFloor({})).to.be.null;
+        expect(internal.getFloor({ getFloor: 'foo' })).to.be.null;
+      });
+
+      it('should detect floor via getFloor()', () => {
+        const result = {
+          floor: 1.11,
+          currency: 'USD'
+        };
+
+        const options = {
+          mediaType: BANNER,
+          size: '*'
         }
-      };
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(bidRequest.refererInfo.referer);
-    });
-  });
 
-  describe('extractTopWindowUrlFromBidRequest', () => {
-    it('should use fallback if bid request is empty', () => {
-      const bidRequest = null;
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(window.top.location.href);
-    });
+        bidRequest.getFloor.returns(result);
 
-    it('should use fallback if refererInfo in bid request is missing', () => {
-      const bidRequest = {};
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(window.top.location.href);
-    });
+        expect(internal.getFloor(bidRequest, options)).to.deep.equal(result);
+        expect(bidRequest.getFloor.calledOnceWith(options)).to.be.true;
+      });
 
-    it('should use fallback if refererInfo.canonicalUrl in bid request is missing', () => {
-      const bidRequest = {
-        refererInfo: {}
-      };
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(window.top.location.href);
+      it('should handle empty, invalid or faulty getFloor() results', () => {
+        bidRequest.getFloor
+          .onCall(0).returns({})
+          .onCall(1).returns({ floor: 'foo' })
+          .onCall(2).returns('bar')
+          .onCall(3).throws(new Error('baz'));
+
+        expect(internal.getFloor(bidRequest, {})).to.be.null;
+        expect(internal.getFloor(bidRequest, {})).to.be.null;
+        expect(internal.getFloor(bidRequest, {})).to.be.null;
+        expect(internal.getFloor(bidRequest, {})).to.be.null;
+
+        expect(bidRequest.getFloor.callCount).to.equal(4);
+      });
     });
 
-    it('should use fallback if refererInfo.canonicalUrl in bid request is empty', () => {
-      const bidRequest = {
-        refererInfo: {
-          canonicalUrl: ''
-        }
-      };
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(window.top.location.href);
+    describe('groupBidRequestsByPublisher', () => {
+      it('should handle empty bidRequests', () => {
+        expect(internal.groupBidRequestsByPublisher(null)).to.deep.equal({});
+        expect(internal.groupBidRequestsByPublisher([])).to.deep.equal({})
+      });
+
+      it('should group given bidRequests by params.publisher', () => {
+        const bidRequests = [
+          {
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100]]
+              }
+            },
+            params: {
+              publisher: 'publisher1',
+              placement: '1111'
+            }
+          },
+          {
+            mediaTypes: {
+              banner: {
+                sizes: [[200, 200]]
+              }
+            },
+            params: {
+              publisher: 'publisher2',
+              placement: '2222'
+            }
+          },
+          {
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 300]]
+              }
+            },
+            params: {
+              publisher: 'publisher3',
+              placement: '3333'
+            }
+          },
+          {
+            mediaTypes: {
+              banner: {
+                sizes: [[400, 400]]
+              }
+            },
+            params: {
+              publisher: 'publisher1',
+              placement: '4444'
+            }
+          }
+        ];
+
+        expect(internal.groupBidRequestsByPublisher(bidRequests)).to.deep.equal({
+          publisher1: [
+            bidRequests[0],
+            bidRequests[3]
+          ],
+          publisher2: [
+            bidRequests[1],
+          ],
+          publisher3: [
+            bidRequests[2],
+          ],
+        });
+      });
     });
 
-    it('should use refererInfo.canonicalUrl from bid request ', () => {
-      const bidRequest = {
-        refererInfo: {
-          canonicalUrl: 'foobar'
-        }
-      };
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(bidRequest.refererInfo.canonicalUrl);
+    describe('buildEndpointUrl', () => {
+      it('should build endpoint url based on given publisher code', () => {
+        expect(internal.buildEndpointUrl(1234)).to.be.equal('https://rtb.d.adup-tech.com/prebid/1234_bid');
+        expect(internal.buildEndpointUrl('foobar')).to.be.equal('https://rtb.d.adup-tech.com/prebid/foobar_bid');
+        expect(internal.buildEndpointUrl('foo bar')).to.be.equal('https://rtb.d.adup-tech.com/prebid/foo%20bar_bid');
+      });
     });
   });
 
@@ -185,42 +315,31 @@ describe('AduptechBidAdapter', () => {
       adapter = newBidder(spec);
     });
 
-    describe('inherited functions', () => {
-      it('exists and is a function', () => {
-        expect(adapter.callBids).to.exist.and.to.be.a('function');
+    describe('code', () => {
+      it('should be correct', () => {
+        expect(adapter.getSpec().code).to.equal(BIDDER_CODE);
       });
     });
 
-    describe('isBidRequestValid', () => {
-      it('should return true when necessary information is given', () => {
-        expect(spec.isBidRequestValid({
-          mediaTypes: {
-            banner: {
-              sizes: [[100, 200]]
-            }
-          },
-          params: {
-            publisher: 'test',
-            placement: '1234'
-          }
-        })).to.be.true;
+    describe('supportedMediaTypes', () => {
+      it('should be correct', () => {
+        expect(adapter.getSpec().supportedMediaTypes).to.deep.equal([BANNER, NATIVE]);
       });
+    });
 
-      it('should return true when necessary information is given (backward compatibility)', () => {
-        expect(spec.isBidRequestValid({
-          sizes: [[100, 200]],
-          params: {
-            publisher: 'test',
-            placement: '1234'
-          }
-        })).to.be.true;
+    describe('inherited functions', () => {
+      it('should exist and be a function', () => {
+        expect(adapter.callBids).to.exist.and.to.be.a('function');
       });
+    });
 
-      it('should return false on empty bid', () => {
+    describe('isBidRequestValid', () => {
+      it('should be false on empty bid', () => {
+        expect(spec.isBidRequestValid(null)).to.be.false;
         expect(spec.isBidRequestValid({})).to.be.false;
       });
 
-      it('should return false on missing sizes', () => {
+      it('should be false if mediaTypes.banner and mediaTypes.native is missing', () => {
         expect(spec.isBidRequestValid({
           params: {
             publisher: 'test',
@@ -229,63 +348,65 @@ describe('AduptechBidAdapter', () => {
         })).to.be.false;
       });
 
-      it('should return false on empty sizes', () => {
+      it('should be false if params missing', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
-              sizes: []
+              sizes: [[100, 200]]
             }
           },
-          params: {
-            publisher: 'test',
-            placement: '1234'
-          }
         })).to.be.false;
       });
 
-      it('should return false on empty sizes (backward compatibility)', () => {
+      it('should be false if params is invalid', () => {
         expect(spec.isBidRequestValid({
-          sizes: [],
-          params: {
-            publisher: 'test',
-            placement: '1234'
-          }
+          mediaTypes: {
+            banner: {
+              sizes: [[100, 200]]
+            }
+          },
+          params: 'bar'
         })).to.be.false;
       });
 
-      it('should return false on missing params', () => {
+      it('should be false if params is empty', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
               sizes: [[100, 200]]
             }
           },
+          params: {}
         })).to.be.false;
       });
 
-      it('should return false on invalid params', () => {
+      it('should be false if params.publisher is missing', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
               sizes: [[100, 200]]
             }
           },
-          params: 'bar'
+          params: {
+            placement: '1234'
+          }
         })).to.be.false;
       });
 
-      it('should return false on empty params', () => {
+      it('should be false if params.placement is missing', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
               sizes: [[100, 200]]
             }
           },
-          params: {}
+          params: {
+            publisher: 'test'
+          }
         })).to.be.false;
       });
 
-      it('should return false on missing publisher', () => {
+      it('should be true if mediaTypes.banner is given', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
@@ -293,34 +414,62 @@ describe('AduptechBidAdapter', () => {
             }
           },
           params: {
+            publisher: 'test',
             placement: '1234'
           }
-        })).to.be.false;
+        })).to.be.true;
       });
 
-      it('should return false on missing placement', () => {
+      it('should be true if mediaTypes.native is given', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
-            banner: {
-              sizes: [[100, 200]]
+            native: {
+              image: {
+                required: true
+              },
+              title: {
+                required: true
+              },
+              clickUrl: {
+                required: true
+              },
+              body: {
+                required: true
+              }
             }
           },
           params: {
-            publisher: 'test'
+            publisher: 'test',
+            placement: '1234'
           }
-        })).to.be.false;
+        })).to.be.true;
       });
     });
 
     describe('buildRequests', () => {
-      it('should send one bid request per ad unit to the endpoint via POST', () => {
-        const bidRequests = [
+      it('should handle empty validBidRequests', () => {
+        expect(spec.buildRequests(null)).to.deep.equal([]);
+        expect(spec.buildRequests([])).to.deep.equal([]);
+      });
+
+      it('should build one request per publisher', () => {
+        const bidderRequest = {
+          auctionId: 'auctionId123',
+          refererInfo: {
+            page: 'http://crazy.canonical.url',
+            ref: 'http://crazy.referer.url'
+          },
+          gdprConsent: {
+            consentString: 'consentString123',
+            gdprApplies: true
+          }
+        };
+
+        const validBidRequests = [
           {
-            bidder: BIDDER_CODE,
             bidId: 'bidId1',
             adUnitCode: 'adUnitCode1',
             transactionId: 'transactionId1',
-            auctionId: 'auctionId1',
             mediaTypes: {
               banner: {
                 sizes: [[100, 200], [300, 400]]
@@ -332,170 +481,285 @@ describe('AduptechBidAdapter', () => {
             }
           },
           {
-            bidder: BIDDER_CODE,
             bidId: 'bidId2',
             adUnitCode: 'adUnitCode2',
             transactionId: 'transactionId2',
-            auctionId: 'auctionId2',
             mediaTypes: {
               banner: {
-                sizes: [[500, 600]]
+                sizes: [[100, 200]]
               }
             },
             params: {
-              publisher: 'publisher2',
+              publisher: 'publisher1',
               placement: 'placement2'
             }
-          }
-        ];
-
-        const result = spec.buildRequests(bidRequests);
-        expect(result.length).to.equal(2);
-
-        expect(result[0].url).to.equal(ENDPOINT_URL.replace(PUBLISHER_PLACEHOLDER, bidRequests[0].params.publisher));
-        expect(result[0].method).to.equal(ENDPOINT_METHOD);
-        expect(result[0].data).to.deep.equal({
-          bidId: bidRequests[0].bidId,
-          auctionId: bidRequests[0].auctionId,
-          transactionId: bidRequests[0].transactionId,
-          adUnitCode: bidRequests[0].adUnitCode,
-          pageUrl: extractTopWindowUrlFromBidRequest(bidRequests[0]),
-          referrer: extractTopWindowReferrerFromBidRequest(bidRequests[0]),
-          sizes: extractSizesFromBidRequest(bidRequests[0]),
-          params: extractParamsFromBidRequest(bidRequests[0]),
-          gdpr: null
-        });
-
-        expect(result[1].url).to.equal(ENDPOINT_URL.replace(PUBLISHER_PLACEHOLDER, bidRequests[1].params.publisher));
-        expect(result[1].method).to.equal(ENDPOINT_METHOD);
-        expect(result[1].data).to.deep.equal({
-          bidId: bidRequests[1].bidId,
-          auctionId: bidRequests[1].auctionId,
-          transactionId: bidRequests[1].transactionId,
-          adUnitCode: bidRequests[1].adUnitCode,
-          pageUrl: extractTopWindowUrlFromBidRequest(bidRequests[1]),
-          referrer: extractTopWindowReferrerFromBidRequest(bidRequests[1]),
-          sizes: extractSizesFromBidRequest(bidRequests[1]),
-          params: extractParamsFromBidRequest(bidRequests[1]),
-          gdpr: null
-        });
-      });
-
-      it('should pass gdpr informations', () => {
-        const bidderRequest = {
-          gdprConsent: {
-            consentString: 'consentString',
-            gdprApplies: true
-          }
-        };
-
-        const bidRequests = [
+          },
           {
-            bidder: BIDDER_CODE,
             bidId: 'bidId3',
             adUnitCode: 'adUnitCode3',
             transactionId: 'transactionId3',
-            auctionId: 'auctionId3',
             mediaTypes: {
-              banner: {
-                sizes: [[100, 200], [300, 400]]
+              native: {
+                image: {
+                  required: true
+                },
+                title: {
+                  required: true
+                },
+                clickUrl: {
+                  required: true
+                },
+                body: {
+                  required: true
+                }
               }
             },
             params: {
-              publisher: 'publisher3',
+              publisher: 'publisher2',
               placement: 'placement3'
             }
           }
         ];
 
-        const result = spec.buildRequests(bidRequests, bidderRequest);
-        expect(result.length).to.equal(1);
-        expect(result[0].data.gdpr).to.deep.equal(extractGdprFromBidderRequest(bidderRequest));
-      });
-
-      it('should encode publisher param in endpoint url', () => {
-        const bidRequests = [
+        expect(spec.buildRequests(validBidRequests, bidderRequest)).to.deep.equal([
           {
-            bidder: BIDDER_CODE,
-            bidId: 'bidId1',
-            adUnitCode: 'adUnitCode1',
-            transactionId: 'transactionId1',
-            auctionId: 'auctionId1',
-            mediaTypes: {
-              banner: {
-                sizes: [[100, 200]]
-              }
-            },
-            params: {
-              publisher: 'crazy publisher key äÖÜ',
-              placement: 'placement1'
+            url: internal.buildEndpointUrl(validBidRequests[0].params.publisher),
+            method: ENDPOINT_METHOD,
+            data: {
+              auctionId: bidderRequest.auctionId,
+              pageUrl: bidderRequest.refererInfo.page,
+              referrer: bidderRequest.refererInfo.ref,
+              gdpr: {
+                consentString: bidderRequest.gdprConsent.consentString,
+                consentRequired: bidderRequest.gdprConsent.gdprApplies
+              },
+              imp: [
+                {
+                  bidId: validBidRequests[0].bidId,
+                  transactionId: validBidRequests[0].transactionId,
+                  adUnitCode: validBidRequests[0].adUnitCode,
+                  params: validBidRequests[0].params,
+                  banner: validBidRequests[0].mediaTypes.banner
+                },
+                {
+                  bidId: validBidRequests[1].bidId,
+                  transactionId: validBidRequests[1].transactionId,
+                  adUnitCode: validBidRequests[1].adUnitCode,
+                  params: validBidRequests[1].params,
+                  banner: validBidRequests[1].mediaTypes.banner
+                }
+              ]
             }
           },
-        ];
-
-        const result = spec.buildRequests(bidRequests);
-        expect(result[0].url).to.equal(ENDPOINT_URL.replace(PUBLISHER_PLACEHOLDER, encodeURIComponent(bidRequests[0].params.publisher)));
+          {
+            url: internal.buildEndpointUrl(validBidRequests[2].params.publisher),
+            method: ENDPOINT_METHOD,
+            data: {
+              auctionId: bidderRequest.auctionId,
+              pageUrl: bidderRequest.refererInfo.page,
+              referrer: bidderRequest.refererInfo.ref,
+              gdpr: {
+                consentString: bidderRequest.gdprConsent.consentString,
+                consentRequired: bidderRequest.gdprConsent.gdprApplies
+              },
+              imp: [
+                {
+                  bidId: validBidRequests[2].bidId,
+                  transactionId: validBidRequests[2].transactionId,
+                  adUnitCode: validBidRequests[2].adUnitCode,
+                  params: validBidRequests[2].params,
+                  native: validBidRequests[2].mediaTypes.native
+                }
+              ]
+            }
+          }
+        ]);
       });
 
-      it('should handle empty bidRequests', () => {
-        expect(spec.buildRequests([])).to.deep.equal([]);
-      });
-    });
+      it('should build a request with floorPrices', () => {
+        const bidderRequest = {
+          auctionId: 'auctionId123',
+          refererInfo: {
+            page: 'http://crazy.canonical.url',
+            ref: 'http://crazy.referer.url'
+          },
+          gdprConsent: {
+            consentString: 'consentString123',
+            gdprApplies: true
+          }
+        };
 
-    describe('interpretResponse', () => {
-      it('should correctly interpret the server response', () => {
-        const serverResponse = {
-          body: {
-            bid: {
-              bidId: 'bidId1',
-              price: 0.12,
-              net: true,
-              currency: 'EUR',
-              ttl: 123
+        const bidRequest = {
+          bidId: 'bidId1',
+          adUnitCode: 'adUnitCode1',
+          transactionId: 'transactionId1',
+          mediaTypes: {
+            banner: {
+              sizes: [[100, 200], [300, 400]]
             },
-            creative: {
-              id: 'creativeId1',
-              width: 100,
-              height: 200,
-              html: '<div>Hello World</div>'
+            native: {
+              image: {
+                required: true
+              },
             }
-          }
+          },
+          params: {
+            publisher: 'publisher1',
+            placement: 'placement1'
+          },
+          getFloor: sinon.stub()
+            .onCall(0).returns({ floor: 1.11, currency: 'USD' })
+            .onCall(1).returns({ floor: 2.22, currency: 'EUR' })
+            .onCall(2).returns({ floor: 3.33, currency: 'USD' })
+            .onCall(3).returns({ floor: 4.44, currency: 'GBP' })
+            .onCall(4).returns({ floor: 5.55, currency: 'EUR' })
         };
 
-        const result = spec.interpretResponse(serverResponse);
-        expect(result).to.deep.equal([
+        expect(spec.buildRequests([bidRequest], bidderRequest)).to.deep.equal([
           {
-            requestId: serverResponse.body.bid.bidId,
-            cpm: serverResponse.body.bid.price,
-            netRevenue: serverResponse.body.bid.net,
-            currency: serverResponse.body.bid.currency,
-            ttl: serverResponse.body.bid.ttl,
-            creativeId: serverResponse.body.creative.id,
-            width: serverResponse.body.creative.width,
-            height: serverResponse.body.creative.height,
-            ad: serverResponse.body.creative.html
+            url: internal.buildEndpointUrl(bidRequest.params.publisher),
+            method: ENDPOINT_METHOD,
+            data: {
+              auctionId: bidderRequest.auctionId,
+              pageUrl: bidderRequest.refererInfo.page,
+              referrer: bidderRequest.refererInfo.ref,
+              gdpr: {
+                consentString: bidderRequest.gdprConsent.consentString,
+                consentRequired: bidderRequest.gdprConsent.gdprApplies
+              },
+              imp: [
+                {
+                  bidId: bidRequest.bidId,
+                  transactionId: bidRequest.transactionId,
+                  adUnitCode: bidRequest.adUnitCode,
+                  params: bidRequest.params,
+                  banner: {
+                    sizes: [
+                      [100, 200, 1.11, 'USD'],
+                      [300, 400, 2.22, 'EUR'],
+                    ],
+                    floorPrice: 3.33,
+                    floorCurrency: 'USD'
+                  },
+                  native: {
+                    image: {
+                      required: true
+                    },
+                    floorPrice: 4.44,
+                    floorCurrency: 'GBP'
+                  },
+                  floorPrice: 5.55,
+                  floorCurrency: 'EUR'
+                }
+              ]
+            }
           }
         ]);
+
+        expect(bidRequest.getFloor.callCount).to.equal(5);
+        expect(bidRequest.getFloor.getCall(0).calledWith({ mediaType: BANNER, size: bidRequest.mediaTypes.banner.sizes[0] })).to.be.true;
+        expect(bidRequest.getFloor.getCall(1).calledWith({ mediaType: BANNER, size: bidRequest.mediaTypes.banner.sizes[1] })).to.be.true;
+        expect(bidRequest.getFloor.getCall(2).calledWith({ mediaType: BANNER, size: '*' })).to.be.true;
+        expect(bidRequest.getFloor.getCall(3).calledWith({ mediaType: NATIVE, size: '*' })).to.be.true;
+        expect(bidRequest.getFloor.getCall(4).calledWith({ mediaType: '*', size: '*' })).to.be.true;
       });
+    });
 
+    describe('interpretResponse', () => {
       it('should handle empty serverResponse', () => {
+        expect(spec.interpretResponse(null)).to.deep.equal([]);
         expect(spec.interpretResponse({})).to.deep.equal([]);
+        expect(spec.interpretResponse({ body: {} })).to.deep.equal([]);
+        expect(spec.interpretResponse({ body: { bids: [] } })).to.deep.equal([]);
       });
 
-      it('should handle missing bid', () => {
-        expect(spec.interpretResponse({
+      it('should correctly interpret the server response', () => {
+        const serverResponse = {
           body: {
-            creative: {}
+            bids: [
+              {
+                bid: {
+                  bidId: 'bidId1',
+                  price: 0.12,
+                  net: true,
+                  currency: 'EUR',
+                  ttl: 123
+                },
+                creative: {
+                  id: 'creativeId1',
+                  advertiserDomains: ['advertiser1.com', 'advertiser2.org'],
+                  width: 100,
+                  height: 200,
+                  html: '<div>Hello World</div>'
+                }
+              },
+              {
+                bid: {
+                  bidId: 'bidId2',
+                  price: 0.99,
+                  net: false,
+                  currency: 'USD',
+                  ttl: 465
+                },
+                creative: {
+                  id: 'creativeId2',
+                  advertiserDomains: ['advertiser3.com'],
+                  native: {
+                    title: 'Ad title',
+                    body: 'Ad description',
+                    displayUrl: 'Ad display url',
+                    clickUrl: 'http://click.url/ad.html',
+                    image: {
+                      url: 'https://image.url/ad.png',
+                      width: 123,
+                      height: 456
+                    },
+                    sponsoredBy: 'Ad sponsored by',
+                    impressionTrackers: [
+                      'https://impression.tracking.url/1',
+                      'https://impression.tracking.url/2',
+                    ],
+                    privacyLink: 'https://example.com/privacy',
+                    privacyIcon: 'https://example.com/icon.png'
+                  }
+                }
+              },
+              null, // should be skipped
+              {} // should be skipped
+            ]
           }
-        })).to.deep.equal([]);
-      });
+        };
 
-      it('should handle missing creative', () => {
-        expect(spec.interpretResponse({
-          body: {
-            bid: {}
+        expect(spec.interpretResponse(serverResponse)).to.deep.equal([
+          {
+            requestId: serverResponse.body.bids[0].bid.bidId,
+            cpm: serverResponse.body.bids[0].bid.price,
+            netRevenue: serverResponse.body.bids[0].bid.net,
+            currency: serverResponse.body.bids[0].bid.currency,
+            ttl: serverResponse.body.bids[0].bid.ttl,
+            creativeId: serverResponse.body.bids[0].creative.id,
+            meta: {
+              advertiserDomains: serverResponse.body.bids[0].creative.advertiserDomains
+            },
+            mediaType: BANNER,
+            width: serverResponse.body.bids[0].creative.width,
+            height: serverResponse.body.bids[0].creative.height,
+            ad: serverResponse.body.bids[0].creative.html
+          },
+          {
+            requestId: serverResponse.body.bids[1].bid.bidId,
+            cpm: serverResponse.body.bids[1].bid.price,
+            netRevenue: serverResponse.body.bids[1].bid.net,
+            currency: serverResponse.body.bids[1].bid.currency,
+            ttl: serverResponse.body.bids[1].bid.ttl,
+            creativeId: serverResponse.body.bids[1].creative.id,
+            meta: {
+              advertiserDomains: serverResponse.body.bids[1].creative.advertiserDomains
+            },
+            mediaType: NATIVE,
+            native: serverResponse.body.bids[1].creative.native
           }
-        })).to.deep.equal([]);
+        ]);
       });
     });
   });
diff --git a/test/spec/modules/advangelistsBidAdapter_spec.js b/test/spec/modules/advangelistsBidAdapter_spec.js
index 2b9615fb572..e1cd6977c5d 100755
--- a/test/spec/modules/advangelistsBidAdapter_spec.js
+++ b/test/spec/modules/advangelistsBidAdapter_spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
-import { spec } from 'modules/advangelistsBidAdapter.js';
-import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import { spec } from 'modules/advangelistsBidAdapter';
+import { BANNER, VIDEO } from 'src/mediaTypes';
 
 describe('advangelistsBidAdapter', function () {
   let bidRequests;
@@ -9,7 +9,7 @@ describe('advangelistsBidAdapter', function () {
   beforeEach(function () {
     bidRequests = [{'bidder': 'advangelists', 'params': {'pubid': '0cf8d6d643e13d86a5b6374148a4afac', 'placement': 1234}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': 'f72931e6-2b0e-4e37-a2bc-1ea912141f81', 'sizes': [[300, 250]], 'bidId': '2aa73f571eaf29', 'bidderRequestId': '1bac84515a7af3', 'auctionId': '5dbc60fa-1aa1-41ce-9092-e6bbd4d478f7', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
 
-    bidRequestsVid = [{'bidder': 'advangelists', 'params': {'pubid': '8537f00948fc37cc03c5f0f88e198a76', 'placement': 1234, 'video': {'id': 123, 'skip': 1, 'mimes': ['video/mp4', 'application/javascript'], 'playbackmethod': [2, 6], 'maxduration': 30}}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'video': {'playerSize': [[320, 480]], 'context': 'instream'}}, 'adUnitCode': 'video1', 'transactionId': '8b060952-93f7-4863-af44-bb8796b97c42', 'sizes': [], 'bidId': '25c6ab92aa0e81', 'bidderRequestId': '1d420b73a013fc', 'auctionId': '9a69741c-34fb-474c-83e1-cfa003aaee17', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
+    bidRequestsVid = [{'bidder': 'advangelists', 'params': {'pubid': '8537f00948fc37cc03c5f0f88e198a76', 'placement': 1234}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'video': {'playerSize': [[320, 480]], 'context': 'instream', 'skip': 1, 'mimes': ['video/mp4', 'application/javascript'], 'playbackmethod': [2, 6], 'maxduration': 30}}, 'adUnitCode': 'video1', 'transactionId': '8b060952-93f7-4863-af44-bb8796b97c42', 'sizes': [], 'bidId': '25c6ab92aa0e81', 'bidderRequestId': '1d420b73a013fc', 'auctionId': '9a69741c-34fb-474c-83e1-cfa003aaee17', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
   });
 
   describe('spec.isBidRequestValid', function () {
@@ -87,7 +87,7 @@ describe('advangelistsBidAdapter', function () {
       it('should return valid video bid responses', function () {
         let _mediaTypes = VIDEO;
         const advangelistsbidreqVid = {'bidRequest': {'mediaTypes': {'video': {'w': 320, 'h': 480}}}};
-        const serverResponseVid = {'cur': 'USD', 'id': '25c6ab92aa0e81', 'seatbid': [{'seat': '3', 'bid': [{'crid': '1855', 'h': 480, 'protocol': 2, 'nurl': 'http://nep.advangelists.com/xp/evt?pp=1MO1wiaMhhq7wLRzZZwwwPkJxxKpYEnM5k5MH4qSGm1HR8rp3Nl7vDocvzZzSAvE4pnREL9mQ1kf5PDjk6E8em6DOk7vVrYUH1TYQyqCucd58PFpJNN7h30RXKHHFg3XaLuQ3PKfMuI1qZATBJ6WHcu875y0hqRdiewn0J4JsCYF53M27uwmcV0HnQxARQZZ72mPqrW95U6wgkZljziwKrICM3aBV07TU6YK5R5AyzJRuD6mtrQ2xtHlQ3jXVYKE5bvWFiUQd90t0jOGhPtYBNoOfP7uQ4ZZj4pyucxbr96orHe9PSOn9UpCSWArdx7s8lOfDpwOvbMuyGxynbStDWm38sDgd4bMHnIt762m5VMDNJfiUyX0vWzp05OsufJDVEaWhAM62i40lQZo7mWP4ipoOWLkmlaAzFIMsTcNaHAHiKKqGEOZLkCEhFNM0SLcvgN2HFRULOOIZvusq7TydOKxuXgCS91dLUDxDDDFUK83BFKlMkTxnCzkLbIR1bd9GKcr1TRryOrulyvRWAKAIhEsUzsc5QWFUhmI2dZ1eqnBQJ0c89TaPcnoaP2WipF68UgyiOstf2CBy0M34858tC5PmuQwQYwXscg6zyqDwR0i9MzGH4FkTyU5yeOlPcsA0ht6UcoCdFpHpumDrLUwAaxwGk1Nj8S6YlYYT5wNuTifDGbg22QKXzZBkUARiyVvgPn9nRtXnrd7WmiMYq596rya9RQj7LC0auQW8bHVQLEe49shsZDnAwZTWr4QuYKqgRGZcXteG7RVJe0ryBZezOq11ha9C0Lv0siNVBahOXE35Wzoq4c4BDaGpqvhaKN7pjeWLGlQR04ufWekwxiMWAvjmfgAfexBJ7HfbYNZpq__', 'adid': '61_1855', 'adomain': ['chevrolet.com.ar'], 'price': 2, 'w': 320, 'iurl': 'https://daf37cpxaja7f.cloudfront.net/c61/creative_url_14922301369663_1.png', 'cat': ['IAB2'], 'id': '7f570b40-aca1-4806-8ea8-818ea679c82b_0', 'attr': [], 'impid': '0', 'cid': '61'}]}], 'bidid': '7f570b40-aca1-4806-8ea8-818ea679c82b'}
+        const serverResponseVid = {'cur': 'USD', 'id': '25c6ab92aa0e81', 'seatbid': [{'seat': '3', 'bid': [{'crid': '1855', 'h': 480, 'protocol': 2, 'nurl': 'http://nep.advangelists.com/xp/evt?pp=1MO1wiaMhhq7wLRzZZwwwPkJxxKpYEnM5k5MH4qSGm1HR8rp3Nl7vDocvzZzSAvE4pnREL9mQ1kf5PDjk6E8em6DOk7vVrYUH1TYQyqCucd58PFpJNN7h30RXKHHFg3XaLuQ3PKfMuI1qZATBJ6WHcu875y0hqRdiewn0J4JsCYF53M27uwmcV0HnQxARQZZ72mPqrW95U6wgkZljziwKrICM3aBV07TU6YK5R5AyzJRuD6mtrQ2xtHlQ3jXVYKE5bvWFiUQd90t0jOGhPtYBNoOfP7uQ4ZZj4pyucxbr96orHe9PSOn9UpCSWArdx7s8lOfDpwOvbMuyGxynbStDWm38sDgd4bMHnIt762m5VMDNJfiUyX0vWzp05OsufJDVEaWhAM62i40lQZo7mWP4ipoOWLkmlaAzFIMsTcNaHAHiKKqGEOZLkCEhFNM0SLcvgN2HFRULOOIZvusq7TydOKxuXgCS91dLUDxDDDFUK83BFKlMkTxnCzkLbIR1bd9GKcr1TRryOrulyvRWAKAIhEsUzsc5QWFUhmI2dZ1eqnBQJ0c89TaPcnoaP2WipF68UgyiOstf2CBy0M34858tC5PmuQwQYwXscg6zyqDwR0i9MzGH4FkTyU5yeOlPcsA0ht6UcoCdFpHpumDrLUwAaxwGk1Nj8S6YlYYT5wNuTifDGbg22QKXzZBkUARiyVvgPn9nRtXnrd7WmiMYq596rya9RQj7LC0auQW8bHVQLEe49shsZDnAwZTWr4QuYKqgRGZcXteG7RVJe0ryBZezOq11ha9C0Lv0siNVBahOXE35Wzoq4c4BDaGpqvhaKN7pjeWLGlQR04ufWekwxiMWAvjmfgAfexBJ7HfbYNZpq__', 'adid': '61_1855', 'adomain': ['chevrolet.com'], 'price': 2, 'w': 320, 'iurl': 'https://daf37cpxaja7f.cloudfront.net/c61/creative_url_14922301369663_1.png', 'cat': ['IAB2'], 'id': '7f570b40-aca1-4806-8ea8-818ea679c82b_0', 'attr': [], 'impid': '0', 'cid': '61'}]}], 'bidid': '7f570b40-aca1-4806-8ea8-818ea679c82b'};
         const bidResponseVid = spec.interpretResponse({ body: serverResponseVid }, advangelistsbidreqVid);
         delete bidResponseVid['vastUrl'];
         delete bidResponseVid['ad'];
@@ -99,6 +99,7 @@ describe('advangelistsBidAdapter', function () {
           width: serverResponseVid.seatbid[0].bid[0].w,
           height: serverResponseVid.seatbid[0].bid[0].h,
           mediaType: 'video',
+          meta: { 'advertiserDomains': serverResponseVid.seatbid[0].bid[0].adomain },
           currency: 'USD',
           netRevenue: true,
           ttl: 60
@@ -115,7 +116,7 @@ describe('advangelistsBidAdapter', function () {
 
           };
         });
-        const serverResponse = {'id': '2aa73f571eaf29', 'seatbid': [{'bid': [{'id': '2c5e8a1a84522d', 'impid': '2c5e8a1a84522d', 'price': 0.81, 'adid': 'abcde-12345', 'nurl': '', 'adm': '<div><img src=\'http://cdnin.bnmla.com/0b1c6e85e9376e3092df8c9fc8ab9095.gif\' width=350 height=250 /></div>', 'adomain': ['advertiserdomain.com'], 'iurl': '', 'cid': 'campaign1', 'crid': 'abcde-12345', 'w': 300, 'h': 250}], 'seat': '19513bcfca8006'}], 'bidid': '19513bcfca8006', 'cur': 'USD', 'w': 300, 'h': 250};
+        const serverResponse = {'id': '2aa73f571eaf29', 'seatbid': [{'bid': [{'id': '2c5e8a1a84522d', 'impid': '2c5e8a1a84522d', 'price': 0.81, 'adid': 'abcde-12345', 'nurl': '', 'adm': '<div><img src=\'http://cdnin.bnmla.com/0b1c6e85e9376e3092df8c9fc8ab9095.gif\' width=350 height=250 /></div>', 'iurl': '', 'cid': 'campaign1', 'crid': 'abcde-12345', 'adomain': ['chevrolet.com'], 'w': 300, 'h': 250}], 'seat': '19513bcfca8006'}], 'bidid': '19513bcfca8006', 'cur': 'USD', 'w': 300, 'h': 250};
 
         const bidResponse = spec.interpretResponse({ body: serverResponse }, advangelistsbidreq);
         expect(bidResponse).to.deep.equal({
@@ -127,6 +128,7 @@ describe('advangelistsBidAdapter', function () {
           width: serverResponse.seatbid[0].bid[0].w,
           height: serverResponse.seatbid[0].bid[0].h,
           mediaType: 'banner',
+          meta: { 'advertiserDomains': serverResponse.seatbid[0].bid[0].adomain },
           currency: 'USD',
           netRevenue: true,
           ttl: 60
diff --git a/test/spec/modules/advenueBidAdapter_spec.js b/test/spec/modules/advenueBidAdapter_spec.js
deleted file mode 100644
index 2d7739361b4..00000000000
--- a/test/spec/modules/advenueBidAdapter_spec.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/advenueBidAdapter.js';
-
-describe('AdvenueAdapter', function () {
-  let bid = {
-    bidId: '2dd581a2b6281d',
-    bidder: 'advenue',
-    bidderRequestId: '145e1d6a7837c9',
-    params: {
-      placementId: 123,
-      traffic: 'banner'
-    },
-    placementCode: 'placement_0',
-    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-    sizes: [[300, 250]],
-    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
-  };
-
-  describe('isBidRequestValid', function () {
-    it('Should return true when placementId can be cast to a number', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
-    });
-    it('Should return false when placementId is not a number', function () {
-      bid.params.placementId = 'aaa';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-    });
-  });
-
-  describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid]);
-    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://ssp.advenuemedia.co.uk/?c=o&m=multi');
-    });
-    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', 'secure', 'host', 'page', 'placements');
-      expect(data.deviceWidth).to.be.a('number');
-      expect(data.deviceHeight).to.be.a('number');
-      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', 'bidId', 'traffic', 'sizes');
-        expect(placement.placementId).to.be.a('number');
-        expect(placement.bidId).to.be.a('string');
-        expect(placement.traffic).to.be.a('string');
-        expect(placement.sizes).to.be.an('array');
-      }
-    });
-    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 () {
-    let resObject = {
-      body: [ {
-        requestId: '123',
-        mediaType: 'banner',
-        cpm: 0.3,
-        width: 320,
-        height: 50,
-        ad: '<h1>Hello ad</h1>',
-        ttl: 1000,
-        creativeId: '123asd',
-        netRevenue: true,
-        currency: 'USD'
-      } ]
-    };
-    let serverResponses = spec.interpretResponse(resObject);
-    it('Returns an array of valid server responses if response object is valid', function () {
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType');
-        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.ad).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');
-      }
-      it('Returns an empty array if invalid response is passed', function () {
-        serverResponses = spec.interpretResponse('invalid_response');
-        expect(serverResponses).to.be.an('array').that.is.empty;
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/advertlyBidAdapter_spec.js b/test/spec/modules/advertlyBidAdapter_spec.js
deleted file mode 100755
index 7825f11948a..00000000000
--- a/test/spec/modules/advertlyBidAdapter_spec.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/advertlyBidAdapter.js';
-
-const ENDPOINT = 'https://api.advertly.com/www/admin/plugins/Prebid/getAd.php';
-
-describe('The Advertly bidding adapter', function () {
-  describe('isBidRequestValid', function () {
-    it('should return false when given an invalid bid', function () {
-      const bid = {
-        bidder: 'advertly',
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(false);
-    });
-
-    it('should return true when given a publisherId in bid', function () {
-      const bid = {
-        bidder: 'advertly',
-        params: {
-          publisherId: 2
-        },
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bidRequests = [{
-      'bidder': 'advertly',
-      'params': {
-        'publisherId': 2
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250],
-        [300, 600]
-      ]
-    }];
-
-    const request = spec.buildRequests(bidRequests);
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('check endpoint url', function () {
-      expect(request.url).to.equal(ENDPOINT)
-    });
-
-    it('sets the proper banner object', function () {
-      expect(bidRequests[0].params.publisherId).to.equal(2);
-    })
-  });
-  const response = {
-    body: [
-      {
-        'requestId': '2ee937f15015c6',
-        'cpm': '0.2000',
-        'width': 300,
-        'height': 600,
-        'creativeId': '4',
-        'currency': 'USD',
-        'netRevenue': true,
-        'ad': 'ads.html',
-        'mediaType': 'banner'
-      },
-      {
-        'requestId': '3e1af92622bdc',
-        'cpm': '0.2000',
-        'creativeId': '4',
-        'context': 'outstream',
-        'currency': 'USD',
-        'netRevenue': true,
-        'vastUrl': 'tezt.xml',
-        'width': 640,
-        'height': 480,
-        'mediaType': 'video'
-      }]
-  };
-
-  const request = [
-    {
-      'bidder': 'advertly',
-      'params': {
-        'publisherId': 2
-      },
-      'mediaTypes': {
-        'banner': {
-          'sizes': [
-            [300, 600]
-          ]
-        }
-      },
-      'bidId': '2ee937f15015c6',
-      'src': 'client',
-    },
-    {
-      'bidder': 'advertly',
-      'params': {
-        'publisherId': 2
-      },
-      'mediaTypes': {
-        'video': {
-          'context': 'outstream',
-          'playerSize': [
-            [640, 480]
-          ]
-        }
-      },
-      'bidId': '3e1af92622bdc',
-      'src': 'client',
-    }
-  ];
-
-  describe('interpretResponse', function () {
-    it('return empty array when no ad found', function () {
-      const response = {};
-      const request = { bidRequests: [] };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('check response for banner and video', function () {
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(2);
-      expect(bids[0].requestId).to.equal('2ee937f15015c6');
-      expect(bids[0].cpm).to.equal('0.2000');
-      expect(bids[1].cpm).to.equal('0.2000');
-      expect(bids[0].width).to.equal(300);
-      expect(bids[0].height).to.equal(600);
-      expect(bids[1].vastUrl).to.not.equal('');
-      expect(bids[0].ad).to.not.equal('');
-      expect(bids[1].adResponse).to.not.equal('');
-      expect(bids[1].renderer).not.to.be.an('undefined');
-    });
-  });
-
-  describe('On winning bid', function () {
-    const bids = spec.interpretResponse(response, request);
-    spec.onBidWon(bids);
-  });
-
-  describe('On bid Time out', function () {
-    const bids = spec.interpretResponse(response, request);
-    spec.onTimeout(bids);
-  });
-
-  describe('user sync', function () {
-    it('to check the user sync iframe', function () {
-      let syncs = spec.getUserSyncs({
-        iframeEnabled: true
-      });
-      expect(syncs).to.not.be.an('undefined');
-      expect(syncs).to.have.lengthOf(1);
-      expect(syncs[0].type).to.equal('iframe');
-    });
-  });
-});
diff --git a/test/spec/modules/adxcgBidAdapter_spec.js b/test/spec/modules/adxcgBidAdapter_spec.js
index 306914960c3..e2d9e2a15e4 100644
--- a/test/spec/modules/adxcgBidAdapter_spec.js
+++ b/test/spec/modules/adxcgBidAdapter_spec.js
@@ -1,548 +1,904 @@
-import {expect} from 'chai';
+// jshint esversion: 6, es3: false, node: true
+import {assert} from 'chai';
 import {spec} from 'modules/adxcgBidAdapter.js';
-import {deepClone, parseUrl} from 'src/utils.js';
-
-describe('AdxcgAdapter', function () {
-  let bidBanner = {
-    bidder: 'adxcg',
-    params: {
-      adzoneid: '1'
-    },
-    adUnitCode: 'adunit-code',
-    mediaTypes: {
-      banner: {
-        sizes: [
-          [300, 250],
-          [640, 360],
-          [1, 1]
-        ]
-      }
-    },
-    bidId: '84ab500420319d',
-    bidderRequestId: '7101db09af0db2',
-    auctionId: '1d1a030790a475'
-  };
-
-  let bidVideo = {
-    bidder: 'adxcg',
-    params: {
-      adzoneid: '20',
-      video: {
-        api: [2],
-        protocols: [1, 2],
-        mimes: ['video/mp4'],
-        maxduration: 30
-      }
-    },
-    mediaTypes: {
-      video: {
-        context: 'instream',
-        playerSize: [[640, 480]]
-      }
-    },
-    adUnitCode: 'adunit-code',
-    bidId: '84ab500420319d',
-    bidderRequestId: '7101db09af0db2',
-    auctionId: '1d1a030790a475'
-  };
-
-  let bidNative = {
-    bidder: 'adxcg',
-    params: {
-      adzoneid: '2379'
-    },
-    mediaTypes: {
-      native: {
-        image: {
-          sendId: false,
-          required: true,
-          sizes: [80, 80]
-        },
-        title: {
-          required: true,
-          len: 75
-        },
-        body: {
-          required: true,
-          len: 200
-        },
-        sponsoredBy: {
-          required: false,
-          len: 20
-        }
-      }
-    },
-    adUnitCode: 'adunit-code',
-    bidId: '84ab500420319d',
-    bidderRequestId: '7101db09af0db2',
-    auctionId: '1d1a030790a475'
-  };
+import {config} from 'src/config.js';
+import {createEidsArray} from 'modules/userId/eids.js';
+const utils = require('src/utils');
 
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found bidNative', function () {
-      expect(spec.isBidRequestValid(bidNative)).to.equal(true);
-    });
+describe('Adxcg adapter', function () {
+  let bids = [];
 
-    it('should return true when required params  found bidVideo', function () {
-      expect(spec.isBidRequestValid(bidVideo)).to.equal(true);
-    });
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'adxcg',
+      'params': {
+        'adzoneid': '19910113'
+      }
+    };
 
-    it('should return true when required params found bidBanner', function () {
-      expect(spec.isBidRequestValid(bidBanner)).to.equal(true);
-    });
+    it('should return true when required params found', function () {
+      assert(spec.isBidRequestValid(bid));
 
-    it('should return true when required params not found', function () {
-      expect(spec.isBidRequestValid({})).to.be.false;
+      bid.params = {
+        adzoneid: 4332,
+      };
+      assert(spec.isBidRequestValid(bid));
     });
 
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bidBanner);
-      delete bid.params;
+    it('should return false when required params are missing', function () {
       bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
+      assert.isFalse(spec.isBidRequestValid(bid));
 
-    it('should return true when required video params not found', function () {
-      const simpleVideo = JSON.parse(JSON.stringify(bidVideo));
-      simpleVideo.params.adzoneid = 123;
-      expect(spec.isBidRequestValid(simpleVideo)).to.be.false;
-      simpleVideo.params.mimes = [1, 2, 3];
-      expect(spec.isBidRequestValid(simpleVideo)).to.be.false;
-      simpleVideo.params.mimes = 'bad type';
-      expect(spec.isBidRequestValid(simpleVideo)).to.be.false;
+      bid.params = {
+        mname: 'some-placement'
+      };
+      assert.isFalse(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        inv: 1234
+      };
+      assert.isFalse(spec.isBidRequestValid(bid));
     });
   });
 
-  describe('request function http', function () {
-    it('creates a valid adxcg request url bidBanner', function () {
-      let request = spec.buildRequests([bidBanner]);
-      expect(request).to.exist;
-      expect(request.method).to.equal('GET');
-      let parsedRequestUrl = parseUrl(request.url);
-      expect(parsedRequestUrl.hostname).to.equal('hbps.adxcg.net');
-      expect(parsedRequestUrl.pathname).to.equal('/get/adi');
-
-      let query = parsedRequestUrl.search;
-      expect(query.renderformat).to.equal('javascript');
-      expect(query.ver).to.equal('r20191128PB30');
-      expect(query.source).to.equal('pbjs10');
-      expect(query.pbjs).to.equal('$prebid.version$');
-      expect(query.adzoneid).to.equal('1');
-      expect(query.format).to.equal('300x250|640x360|1x1');
-      expect(query.jsonp).to.be.undefined;
-      expect(query.prebidBidIds).to.equal('84ab500420319d');
-      expect(query.bidfloors).to.equal('0');
-
-      expect(query).to.have.property('secure');
-      expect(query).to.have.property('uw');
-      expect(query).to.have.property('uh');
-      expect(query).to.have.property('dpr');
-      expect(query).to.have.property('bt');
-      expect(query).to.have.property('cookies');
-      expect(query).to.have.property('tz');
-      expect(query).to.have.property('dt');
-      expect(query).to.have.property('iob');
-      expect(query).to.have.property('rndid');
-      expect(query).to.have.property('ref');
-      expect(query).to.have.property('url');
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
     });
+    it('should send request with correct structure', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {
+          adzoneid: '19910113'
+        }
+      }];
+      let request = spec.buildRequests(validBidRequests, {refererInfo: {page: 'page', domain: 'localhost'}});
 
-    it('creates a valid adxcg request url bidVideo', function () {
-      let request = spec.buildRequests([bidVideo]);
-      expect(request).to.exist;
-      expect(request.method).to.equal('GET');
-      let parsedRequestUrl = parseUrl(request.url);
-      expect(parsedRequestUrl.hostname).to.equal('hbps.adxcg.net');
-      expect(parsedRequestUrl.pathname).to.equal('/get/adi');
-
-      let query = parsedRequestUrl.search;
-      // general part
-      expect(query.renderformat).to.equal('javascript');
-      expect(query.ver).to.equal('r20191128PB30');
-      expect(query.source).to.equal('pbjs10');
-      expect(query.pbjs).to.equal('$prebid.version$');
-      expect(query.adzoneid).to.equal('20');
-      expect(query.format).to.equal('640x480');
-      expect(query.jsonp).to.be.undefined;
-      expect(query.prebidBidIds).to.equal('84ab500420319d');
-      expect(query.bidfloors).to.equal('0');
-
-      expect(query).to.have.property('secure');
-      expect(query).to.have.property('uw');
-      expect(query).to.have.property('uh');
-      expect(query).to.have.property('dpr');
-      expect(query).to.have.property('bt');
-      expect(query).to.have.property('cookies');
-      expect(query).to.have.property('tz');
-      expect(query).to.have.property('dt');
-      expect(query).to.have.property('iob');
-      expect(query).to.have.property('rndid');
-      expect(query).to.have.property('ref');
-      expect(query).to.have.property('url');
-
-      // video specific part
-      expect(query['video.maxduration.0']).to.equal('30');
-      expect(query['video.mimes.0']).to.equal('video/mp4');
-      expect(query['video.context.0']).to.equal('instream');
+      assert.equal(request.method, 'POST');
+      assert.equal(request.url, 'https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1');
+      assert.deepEqual(request.options, {contentType: 'application/json'});
+      assert.ok(request.data);
     });
 
-    it('creates a valid adxcg request url bidNative', function () {
-      let request = spec.buildRequests([bidNative]);
-      expect(request).to.exist;
-      expect(request.method).to.equal('GET');
-      let parsedRequestUrl = parseUrl(request.url);
-      expect(parsedRequestUrl.hostname).to.equal('hbps.adxcg.net');
-      expect(parsedRequestUrl.pathname).to.equal('/get/adi');
-
-      let query = parsedRequestUrl.search;
-      expect(query.renderformat).to.equal('javascript');
-      expect(query.ver).to.equal('r20191128PB30');
-      expect(query.source).to.equal('pbjs10');
-      expect(query.pbjs).to.equal('$prebid.version$');
-      expect(query.adzoneid).to.equal('2379');
-      expect(query.format).to.equal('0x0');
-      expect(query.jsonp).to.be.undefined;
-      expect(query.prebidBidIds).to.equal('84ab500420319d');
-      expect(query.bidfloors).to.equal('0');
-
-      expect(query).to.have.property('secure');
-      expect(query).to.have.property('uw');
-      expect(query).to.have.property('uh');
-      expect(query).to.have.property('dpr');
-      expect(query).to.have.property('bt');
-      expect(query).to.have.property('cookies');
-      expect(query).to.have.property('tz');
-      expect(query).to.have.property('dt');
-      expect(query).to.have.property('iob');
-      expect(query).to.have.property('rndid');
-      expect(query).to.have.property('ref');
-      expect(query).to.have.property('url');
-    });
-  });
+    describe('user privacy', function () {
+      it('should send GDPR Consent data to exchange if gdprApplies', function () {
+        let validBidRequests = [{bidId: 'bidId', params: {test: 1}}];
+        let bidderRequest = {
+          gdprConsent: {gdprApplies: true, consentString: 'consentDataString'},
+          refererInfo: {referer: 'page'}
+        };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user.ext.consent, bidderRequest.gdprConsent.consentString);
+        assert.equal(request.regs.ext.gdpr, bidderRequest.gdprConsent.gdprApplies);
+        assert.equal(typeof request.regs.ext.gdpr, 'number');
+      });
 
-  describe('gdpr compliance', function () {
-    it('should send GDPR Consent data if gdprApplies', function () {
-      let request = spec.buildRequests([bidBanner], {
-        gdprConsent: {
-          gdprApplies: true,
-          consentString: 'consentDataString'
-        }
+      it('should send gdpr as number', function () {
+        let validBidRequests = [{bidId: 'bidId', params: {test: 1}}];
+        let bidderRequest = {
+          gdprConsent: {gdprApplies: true, consentString: 'consentDataString'},
+          refererInfo: {referer: 'page'}
+        };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(typeof request.regs.ext.gdpr, 'number');
+        assert.equal(request.regs.ext.gdpr, 1);
       });
-      let parsedRequestUrl = parseUrl(request.url);
-      let query = parsedRequestUrl.search;
 
-      expect(query.gdpr).to.equal('1');
-      expect(query.gdpr_consent).to.equal('consentDataString');
-    });
+      it('should send CCPA Consent data to exchange', function () {
+        let validBidRequests = [{bidId: 'bidId', params: {test: 1}}];
+        let bidderRequest = {uspConsent: '1YA-', refererInfo: {referer: 'page'}};
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
 
-    it('should not send GDPR Consent data if gdprApplies is false or undefined', function () {
-      let request = spec.buildRequests([bidBanner], {
-        gdprConsent: {
-          gdprApplies: false,
-          consentString: 'consentDataString'
-        }
+        assert.equal(request.regs.ext.us_privacy, '1YA-');
+
+        bidderRequest = {
+          uspConsent: '1YA-',
+          gdprConsent: {gdprApplies: true, consentString: 'consentDataString'},
+          refererInfo: {referer: 'page'}
+        };
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.regs.ext.us_privacy, '1YA-');
+        assert.equal(request.user.ext.consent, 'consentDataString');
+        assert.equal(request.regs.ext.gdpr, 1);
       });
-      let parsedRequestUrl = parseUrl(request.url);
-      let query = parsedRequestUrl.search;
 
-      expect(query.gdpr).to.be.undefined;
-      expect(query.gdpr_consent).to.be.undefined;
+      it('should not send GDPR Consent data to adxcg if gdprApplies is undefined', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: {siteId: 'siteId'}
+        }];
+        let bidderRequest = {
+          gdprConsent: {gdprApplies: false, consentString: 'consentDataString'},
+          refererInfo: {referer: 'page'}
+        };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user.ext.consent, 'consentDataString');
+        assert.equal(request.regs.ext.gdpr, 0);
+
+        bidderRequest = {gdprConsent: {consentString: 'consentDataString'}, refererInfo: {referer: 'page'}};
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user, undefined);
+        assert.equal(request.regs, undefined);
+      });
+      it('should send default GDPR Consent data to exchange', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: {siteId: 'siteId'}
+        }];
+        let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
+
+        assert.equal(request.user, undefined);
+        assert.equal(request.regs, undefined);
+      });
     });
-  });
 
-  describe('userid pubcid should be passed to querystring', function () {
-    let bidderRequests = {};
-    let bid = deepClone([bidBanner]);
-    bid[0].userId = {pubcid: 'pubcidabcd'};
+    it('should add test and is_debug to request, if test is set in parameters', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {test: 1}
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
 
-    it('should send pubcid if available', function () {
-      let request = spec.buildRequests(bid, bidderRequests);
-      let parsedRequestUrl = parseUrl(request.url);
-      let query = parsedRequestUrl.search;
-      expect(query.pubcid).to.equal('pubcidabcd');
+      assert.ok(request.is_debug);
+      assert.equal(request.test, 1);
     });
-  });
 
-  describe('userid tdid should be passed to querystring', function () {
-    let bid = deepClone([bidBanner]);
-    let bidderRequests = {};
+    it('should have default request structure', function () {
+      let keys = 'site,geo,device,source,ext,imp'.split(',');
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {siteId: 'siteId'}
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
+      let data = Object.keys(request);
+
+      assert.deepEqual(keys, data);
+    });
 
-    bid[0].userId = {tdid: 'tdidabcd'};
+    it('should set request keys correct values', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {siteId: 'siteId'},
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}, auctionId: 'tid'}).data);
 
-    it('should send pubcid if available', function () {
-      let request = spec.buildRequests(bid, bidderRequests);
-      let parsedRequestUrl = parseUrl(request.url);
-      let query = parsedRequestUrl.search;
-      expect(query.tdid).to.equal('tdidabcd');
+      assert.equal(request.source.tid, 'tid');
+      assert.equal(request.source.fd, 1);
     });
-  });
 
-  describe('userid id5id should be passed to querystring', function () {
-    let bid = deepClone([bidBanner]);
-    let bidderRequests = {};
+    it('should send info about device', function () {
+      config.setConfig({
+        device: {w: 100, h: 100}
+      });
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {adzoneid: '1000'}
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {page: 'page', domain: 'localhost'}}).data);
+
+      assert.equal(request.device.ua, navigator.userAgent);
+      assert.equal(request.device.w, 100);
+      assert.equal(request.device.h, 100);
+    });
 
-    bid[0].userId = {id5id: 'id5idsample'};
+    it('should send app info', function () {
+      config.setConfig({
+        app: {id: 'appid'},
+      });
+      const ortb2 = {app: {name: 'appname'}}
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {adzoneid: '1000'},
+        ortb2
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}, ortb2}).data);
+
+      assert.equal(request.app.id, 'appid');
+      assert.equal(request.app.name, 'appname');
+      assert.equal(request.site, undefined);
+    });
 
-    it('should send pubcid if available', function () {
-      let request = spec.buildRequests(bid, bidderRequests);
-      let parsedRequestUrl = parseUrl(request.url);
-      let query = parsedRequestUrl.search;
-      expect(query.id5id).to.equal('id5idsample');
+    it('should send info about the site', function () {
+      config.setConfig({
+        site: {
+          id: '123123',
+          publisher: {
+            domain: 'publisher.domain.com'
+          }
+        },
+      });
+      const ortb2 = {
+        site: {
+          publisher: {
+            id: 4441,
+            name: 'publisher\'s name'
+          }
+        }
+      };
+
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {adzoneid: '1000'},
+        ortb2
+      }];
+      let refererInfo = {page: 'page', domain: 'localhost'};
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo, ortb2}).data);
+
+      assert.deepEqual(request.site, {
+        domain: 'localhost',
+        id: '123123',
+        page: refererInfo.page,
+        publisher: {
+          domain: 'publisher.domain.com',
+          id: 4441,
+          name: 'publisher\'s name'
+        }
+      });
     });
-  });
 
-  describe('userid idl_env should be passed to querystring', function () {
-    let bid = deepClone([bidBanner]);
-    let bidderRequests = {};
+    it('should pass extended ids', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {},
+        userIdAsEids: createEidsArray({
+          tdid: 'TTD_ID_FROM_USER_ID_MODULE',
+          pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
+        })
+      }];
+
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
+      assert.deepEqual(request.user.ext.eids, [
+        {source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]},
+        {source: 'pubcid.org', uids: [{id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1}]}
+      ]);
+    });
 
-    bid[0].userId = {idl_env: 'idl_envsample'};
+    it('should send currency if defined', function () {
+      config.setConfig({currency: {adServerCurrency: 'EUR'}});
+      let validBidRequests = [{params: {}}];
+      let refererInfo = {referer: 'page'};
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo}).data);
 
-    it('should send pubcid if available', function () {
-      let request = spec.buildRequests(bid, bidderRequests);
-      let parsedRequestUrl = parseUrl(request.url);
-      let query = parsedRequestUrl.search;
-      expect(query.idl_env).to.equal('idl_envsample');
+      assert.deepEqual(request.cur, ['EUR']);
     });
-  });
 
-  describe('response handler', function () {
-    let BIDDER_REQUEST = {
-      bidder: 'adxcg',
-      params: {
-        adzoneid: '1'
-      },
-      adUnitCode: 'adunit-code',
-      mediaTypes: {
-        banner: {
-          sizes: [
-            [300, 250],
-            [640, 360],
-            [1, 1]
-          ]
+    it('should pass supply chain object', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {},
+        schain: {
+          validation: 'strict',
+          config: {
+            ver: '1.0'
+          }
         }
-      },
-      bidId: '84ab500420319d',
-      bidderRequestId: '7101db09af0db2',
-      auctionId: '1d1a030790a475'
-    };
+      }];
 
-    let BANNER_RESPONSE = {
-      body: [
-        {
-          bidId: '84ab500420319d',
-          bidderCode: 'adxcg',
-          width: 300,
-          height: 250,
-          creativeId: '42',
-          cpm: 0.45,
-          currency: 'USD',
-          netRevenue: true,
-          ad: '<!-- adContent -->'
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
+      assert.deepEqual(request.source.ext.schain, {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
         }
-      ],
-      header: {someheader: 'fakedata'}
-    };
+      });
+    });
 
-    let BANNER_RESPONSE_WITHDEALID = {
-      body: [
-        {
-          bidId: '84ab500420319d',
-          bidderCode: 'adxcg',
-          width: 300,
-          height: 250,
-          deal_id: '7722',
-          creativeId: '42',
-          cpm: 0.45,
-          currency: 'USD',
-          netRevenue: true,
-          ad: '<!-- adContent -->'
+    describe('bids', function () {
+      it('should add more than one bid to the request', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: {siteId: 'siteId'}
+        }, {
+          bidId: 'bidId2',
+          params: {siteId: 'siteId'}
+        }];
+        let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
+
+        assert.equal(request.imp.length, 2);
+      });
+      it('should add incrementing values of id', function () {
+        let validBidRequests = [{
+          bidId: 'bidId',
+          params: {adzoneid: '1000'},
+          mediaTypes: {video: {}}
+        }, {
+          bidId: 'bidId2',
+          params: {adzoneid: '1000'},
+          mediaTypes: {video: {}}
+        }, {
+          bidId: 'bidId3',
+          params: {adzoneid: '1000'},
+          mediaTypes: {video: {}}
+        }];
+        let imps = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp;
+
+        for (let i = 0; i < 3; i++) {
+          assert.equal(imps[i].id, i + 1);
         }
-      ],
-      header: {someheader: 'fakedata'}
-    };
+      });
 
-    let VIDEO_RESPONSE = {
-      body: [
-        {
-          bidId: '84ab500420319d',
-          bidderCode: 'adxcg',
-          width: 640,
-          height: 360,
-          creativeId: '42',
-          cpm: 0.45,
-          currency: 'USD',
-          netRevenue: true,
-          vastUrl: 'vastContentUrl'
+      it('should add adzoneid', function () {
+        let validBidRequests = [{bidId: 'bidId', params: {adzoneid: 1000}, mediaTypes: {video: {}}},
+          {bidId: 'bidId2', params: {adzoneid: 1001}, mediaTypes: {video: {}}},
+          {bidId: 'bidId3', params: {adzoneid: 1002}, mediaTypes: {video: {}}}];
+        let imps = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp;
+        for (let i = 0; i < 3; i++) {
+          assert.equal(imps[i].tagid, validBidRequests[i].params.adzoneid);
         }
-      ],
-      header: {someheader: 'fakedata'}
-    };
+      });
 
-    let NATIVE_RESPONSE = {
-      body: [
-        {
-          bidId: '84ab500420319d',
-          bidderCode: 'adxcg',
-          width: 0,
-          height: 0,
-          creativeId: '42',
-          cpm: 0.45,
-          currency: 'USD',
-          netRevenue: true,
-          nativeResponse: {
-            assets: [
-              {
-                id: 1,
-                required: 0,
-                title: {
-                  text: 'titleContent'
-                }
+      describe('price floors', function () {
+        it('should not add if floors module not configured', function () {
+          const validBidRequests = [{bidId: 'bidId', params: {adzoneid: 1000}, mediaTypes: {video: {}}}];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, undefined);
+        });
+
+        it('should not add if floor price not defined', function () {
+          const validBidRequests = [getBidWithFloor()];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'USD');
+        });
+
+        it('should request floor price in adserver currency', function () {
+          config.setConfig({currency: {adServerCurrency: 'DKK'}});
+          const validBidRequests = [getBidWithFloor()];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'DKK');
+        });
+
+        it('should add correct floor values', function () {
+          const expectedFloors = [1, 1.3, 0.5];
+          const validBidRequests = expectedFloors.map(getBidWithFloor);
+          let imps = getRequestImps(validBidRequests);
+
+          expectedFloors.forEach((floor, index) => {
+            assert.equal(imps[index].bidfloor, floor);
+            assert.equal(imps[index].bidfloorcur, 'USD');
+          });
+        });
+
+        function getBidWithFloor(floor) {
+          return {
+            params: {adzoneid: 1},
+            mediaTypes: {video: {}},
+            getFloor: ({currency}) => {
+              return {
+                currency: currency,
+                floor
+              };
+            }
+          };
+        }
+      });
+
+      describe('multiple media types', function () {
+        it('should use all configured media types for bidding', function () {
+          let validBidRequests = [{
+            bidId: 'bidId',
+            params: {adzoneid: 1000},
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
               },
-              {
-                id: 2,
-                required: 0,
-                img: {
-                  url: 'imageContent',
-                  w: 600,
-                  h: 600
-                }
+              video: {}
+            }
+          }, {
+            bidId: 'bidId1',
+            params: {adzoneid: 1000},
+            mediaTypes: {
+              video: {},
+              native: {}
+            }
+          }, {
+            bidId: 'bidId2',
+            params: {adzoneid: 1000},
+            nativeParams: {
+              title: {required: true, len: 140}
+            },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
               },
-              {
-                id: 3,
-                required: 0,
-                data: {
-                  label: 'DESC',
-                  value: 'descriptionContent'
+              native: {},
+              video: {}
+            }
+          }];
+          let [first, second, third] = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp;
+
+          assert.ok(first.banner);
+          assert.ok(first.video);
+          assert.equal(first.native, undefined);
+
+          assert.ok(second.video);
+          assert.equal(second.banner, undefined);
+          assert.equal(second.native, undefined);
+
+          assert.ok(third.native);
+          assert.ok(third.video);
+          assert.ok(third.banner);
+        });
+      });
+
+      describe('banner', function () {
+        it('should convert sizes to openrtb format', function () {
+          let validBidRequests = [{
+            bidId: 'bidId',
+            params: {adzoneid: 1000},
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              }
+            }
+          }];
+          let {banner} = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0];
+          assert.deepEqual(banner, {
+            format: [{w: 100, h: 100}, {w: 200, h: 300}]
+          });
+        });
+      });
+
+      describe('video', function () {
+        it('should pass video mediatype config', function () {
+          let validBidRequests = [{
+            bidId: 'bidId',
+            params: {adzoneid: 1000},
+            mediaTypes: {
+              video: {
+                playerSize: [640, 480],
+                context: 'outstream',
+                mimes: ['video/mp4']
+              }
+            }
+          }];
+          let {video} = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0];
+          assert.deepEqual(video, {
+            playerSize: [640, 480],
+            context: 'outstream',
+            mimes: ['video/mp4']
+          });
+        });
+      });
+
+      describe('native', function () {
+        describe('assets', function () {
+          it('should set correct asset id', function () {
+            let validBidRequests = [{
+              bidId: 'bidId',
+              params: {adzoneid: 1000},
+              nativeParams: {
+                title: {required: true, len: 140},
+                image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
+                body: {len: 140}
+              }
+            }];
+            let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
+            let assets = JSON.parse(nativeRequest).assets;
+
+            assert.equal(assets[0].id, 0);
+            assert.equal(assets[1].id, 3);
+            assert.equal(assets[2].id, 4);
+          });
+          it('should add required key if it is necessary', function () {
+            let validBidRequests = [{
+              bidId: 'bidId',
+              params: {adzoneid: 1000},
+              nativeParams: {
+                title: {required: true, len: 140},
+                image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
+                body: {len: 140},
+                sponsoredBy: {required: true, len: 140}
+              }
+            }];
+
+            let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
+            let assets = JSON.parse(nativeRequest).assets;
+
+            assert.equal(assets[0].required, 1);
+            assert.ok(!assets[1].required);
+            assert.ok(!assets[2].required);
+            assert.equal(assets[3].required, 1);
+          });
+
+          it('should map img and data assets', function () {
+            let validBidRequests = [{
+              bidId: 'bidId',
+              params: {adzoneid: 1000},
+              nativeParams: {
+                title: {required: true, len: 140},
+                image: {required: true, sizes: [150, 50]},
+                icon: {required: false, sizes: [50, 50]},
+                body: {required: false, len: 140},
+                sponsoredBy: {required: true},
+                cta: {required: false},
+                clickUrl: {required: false}
+              }
+            }];
+
+            let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
+            let assets = JSON.parse(nativeRequest).assets;
+            assert.ok(assets[0].title);
+            assert.equal(assets[0].title.len, 140);
+            assert.deepEqual(assets[1].img, {type: 3, w: 150, h: 50});
+            assert.deepEqual(assets[2].img, {type: 1, w: 50, h: 50});
+            assert.deepEqual(assets[3].data, {type: 2, len: 140});
+            assert.deepEqual(assets[4].data, {type: 1});
+            assert.deepEqual(assets[5].data, {type: 12});
+            assert.ok(!assets[6]);
+          });
+
+          describe('icon/image sizing', function () {
+            it('should flatten sizes and utilise first pair', function () {
+              const validBidRequests = [{
+                bidId: 'bidId',
+                params: {adzoneid: 1000},
+                nativeParams: {
+                  image: {
+                    sizes: [[200, 300], [100, 200]]
+                  },
                 }
-              },
-              {
-                id: 0,
-                required: 0,
-                data: {
-                  label: 'SPONSORED',
-                  value: 'sponsoredByContent'
+              }];
+
+              let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
+              let assets = JSON.parse(nativeRequest).assets;
+              assert.ok(assets[0].img);
+              assert.equal(assets[0].img.w, 200);
+              assert.equal(assets[0].img.h, 300);
+            });
+          });
+
+          it('should utilise aspect_ratios', function () {
+            const validBidRequests = [{
+              bidId: 'bidId',
+              params: {adzoneid: 1000},
+              nativeParams: {
+                image: {
+                  aspect_ratios: [{
+                    min_width: 100,
+                    ratio_height: 3,
+                    ratio_width: 1
+                  }]
+                },
+                icon: {
+                  aspect_ratios: [{
+                    min_width: 10,
+                    ratio_height: 5,
+                    ratio_width: 2
+                  }]
                 }
-              },
-              {
-                id: 5,
-                required: 0,
+              }
+            }];
+
+            let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
+            let assets = JSON.parse(nativeRequest).assets;
+            assert.ok(assets[0].img);
+            assert.equal(assets[0].img.wmin, 100);
+            assert.equal(assets[0].img.hmin, 300);
+
+            assert.ok(assets[1].img);
+            assert.equal(assets[1].img.wmin, 10);
+            assert.equal(assets[1].img.hmin, 25);
+          });
+
+          it('should not throw error if aspect_ratios config is not defined', function () {
+            const validBidRequests = [{
+              bidId: 'bidId',
+              params: {adzoneid: 1000},
+              nativeParams: {
+                image: {
+                  aspect_ratios: []
+                },
                 icon: {
-                  url: 'iconContent',
-                  w: 400,
-                  h: 400
+                  aspect_ratios: []
                 }
               }
-            ],
-            link: {
-              url: 'linkContent'
-            },
-            imptrackers: ['impressionTracker1', 'impressionTracker2']
-          }
-        }
-      ],
-      header: {someheader: 'fakedata'}
-    };
-
-    it('handles regular responses', function () {
-      let result = spec.interpretResponse(BANNER_RESPONSE, BIDDER_REQUEST);
-
-      expect(result).to.have.lengthOf(1);
-
-      expect(result[0]).to.exist;
-      expect(result[0].width).to.equal(300);
-      expect(result[0].height).to.equal(250);
-      expect(result[0].creativeId).to.equal(42);
-      expect(result[0].cpm).to.equal(0.45);
-      expect(result[0].ad).to.equal('<!-- adContent -->');
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].netRevenue).to.equal(true);
-      expect(result[0].ttl).to.equal(300);
-      expect(result[0].dealId).to.not.exist;
+            }];
+
+            assert.doesNotThrow(() => spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}));
+          });
+        });
+
+        it('should expect any dimensions if min_width not passed', function () {
+          const validBidRequests = [{
+            bidId: 'bidId',
+            params: {adzoneid: 1000},
+            nativeParams: {
+              image: {
+                aspect_ratios: [{
+                  ratio_height: 3,
+                  ratio_width: 1
+                }]
+              }
+            }
+          }];
+
+          let nativeRequest = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp[0].native.request;
+          let assets = JSON.parse(nativeRequest).assets;
+          assert.ok(assets[0].img);
+          assert.equal(assets[0].img.wmin, 0);
+          assert.equal(assets[0].img.hmin, 0);
+          assert.ok(!assets[1]);
+        });
+      });
     });
 
-    it('handles regular responses with dealid', function () {
-      let result = spec.interpretResponse(
-        BANNER_RESPONSE_WITHDEALID,
-        BIDDER_REQUEST
-      );
-
-      expect(result).to.have.lengthOf(1);
-
-      expect(result[0].width).to.equal(300);
-      expect(result[0].height).to.equal(250);
-      expect(result[0].creativeId).to.equal(42);
-      expect(result[0].cpm).to.equal(0.45);
-      expect(result[0].ad).to.equal('<!-- adContent -->');
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].netRevenue).to.equal(true);
-      expect(result[0].ttl).to.equal(300);
+    function getRequestImps(validBidRequests) {
+      return JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data).imp;
+    }
+  });
+
+  describe('interpretResponse', function () {
+    it('should return if no body in response', function () {
+      let serverResponse = {};
+      let bidRequest = {};
+
+      assert.ok(!spec.interpretResponse(serverResponse, bidRequest));
     });
+    it('should return more than one bids', function () {
+      let serverResponse = {
+        body: {
+          seatbid: [{
+            bid: [{
+              impid: '1',
+              native: {ver: '1.1', link: {url: 'link'}, assets: [{id: 1, title: {text: 'Asset title text'}}]}
+            }]
+          }, {
+            bid: [{
+              impid: '2',
+              native: {ver: '1.1', link: {url: 'link'}, assets: [{id: 1, data: {value: 'Asset title text'}}]}
+            }]
+          }]
+        }
+      };
+      let bidRequest = {
+        data: {},
+        bids: [
+          {
+            bidId: 'bidId1',
+            params: {adzoneid: 1000},
+            nativeParams: {
+              title: {required: true, len: 140},
+              image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
+              body: {len: 140}
+            }
+          },
+          {
+            bidId: 'bidId2',
+            params: {adzoneid: 1000},
+            nativeParams: {
+              title: {required: true, len: 140},
+              image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
+              body: {len: 140}
+            }
+          }
+        ]
+      };
 
-    it('handles video responses', function () {
-      let result = spec.interpretResponse(VIDEO_RESPONSE, BIDDER_REQUEST);
-      expect(result).to.have.lengthOf(1);
-
-      expect(result[0].width).to.equal(640);
-      expect(result[0].height).to.equal(360);
-      expect(result[0].mediaType).to.equal('video');
-      expect(result[0].creativeId).to.equal(42);
-      expect(result[0].cpm).to.equal(0.45);
-      expect(result[0].vastUrl).to.equal('vastContentUrl');
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].netRevenue).to.equal(true);
-      expect(result[0].ttl).to.equal(300);
+      bids = spec.interpretResponse(serverResponse, bidRequest);
+      assert.equal(spec.interpretResponse(serverResponse, bidRequest).length, 2);
     });
 
-    it('handles native responses', function () {
-      let result = spec.interpretResponse(NATIVE_RESPONSE, BIDDER_REQUEST);
-
-      expect(result[0].width).to.equal(0);
-      expect(result[0].height).to.equal(0);
-      expect(result[0].mediaType).to.equal('native');
-      expect(result[0].creativeId).to.equal(42);
-      expect(result[0].cpm).to.equal(0.45);
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].netRevenue).to.equal(true);
-      expect(result[0].ttl).to.equal(300);
-
-      expect(result[0].native.clickUrl).to.equal('linkContent');
-      expect(result[0].native.impressionTrackers).to.deep.equal([
-        'impressionTracker1',
-        'impressionTracker2'
-      ]);
-      expect(result[0].native.title).to.equal('titleContent');
+    it('should set correct values to bid', function () {
+      let nativeExample1 = {
+        assets: [],
+        link: {url: 'link'},
+        imptrackers: ['imptrackers url1', 'imptrackers url2']
+      }
 
-      expect(result[0].native.image.url).to.equal('imageContent');
-      expect(result[0].native.image.height).to.equal(600);
-      expect(result[0].native.image.width).to.equal(600);
+      let serverResponse = {
+        body: {
+          id: null,
+          bidid: null,
+          seatbid: [{
+            bid: [
+              {
+                impid: '1',
+                price: 93.1231,
+                crid: '12312312',
+                adm: JSON.stringify(nativeExample1),
+                dealid: 'deal-id',
+                adomain: ['demo.com'],
+                ext: {
+                  crType: 'native',
+                  advertiser_id: 'adv1',
+                  advertiser_name: 'advname',
+                  agency_name: 'agname',
+                  mediaType: 'native'
+                }
+              }
+            ]
+          }],
+          cur: 'EUR'
+        }
+      };
+      let bidRequest = {
+        data: {},
+        bids: [
+          {
+            bidId: 'bidId1',
+            params: {adzoneid: 1000},
+            nativeParams: {
+              title: {required: true, len: 140},
+              image: {required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif']},
+              body: {len: 140}
+            }
+          }
+        ]
+      };
+
+      const bids = spec.interpretResponse(serverResponse, bidRequest);
+      const bid = serverResponse.body.seatbid[0].bid[0];
+      assert.deepEqual(bids[0].requestId, bidRequest.bids[0].bidId);
+      assert.deepEqual(bids[0].cpm, bid.price);
+      assert.deepEqual(bids[0].creativeId, bid.crid);
+      assert.deepEqual(bids[0].ttl, 300);
+      assert.deepEqual(bids[0].netRevenue, false);
+      assert.deepEqual(bids[0].currency, serverResponse.body.cur);
+      assert.deepEqual(bids[0].mediaType, 'native');
+      assert.deepEqual(bids[0].meta.mediaType, 'native');
+      assert.deepEqual(bids[0].meta.advertiserDomains, ['demo.com']);
+
+      assert.deepEqual(bids[0].meta.advertiserName, 'advname');
+      assert.deepEqual(bids[0].meta.agencyName, 'agname');
+
+      assert.deepEqual(bids[0].dealId, 'deal-id');
+    });
+
+    it('should return empty when there is no bids in response', function () {
+      const serverResponse = {
+        body: {
+          id: null,
+          bidid: null,
+          seatbid: [{bid: []}],
+          cur: 'EUR'
+        }
+      };
+      let bidRequest = {
+        data: {},
+        bids: [{bidId: 'bidId1'}]
+      };
+      const result = spec.interpretResponse(serverResponse, bidRequest)[0];
+      assert.ok(!result);
+    });
 
-      expect(result[0].native.icon.url).to.equal('iconContent');
-      expect(result[0].native.icon.height).to.equal(400);
-      expect(result[0].native.icon.width).to.equal(400);
+    describe('banner', function () {
+      it('should set ad content on response', function () {
+        let serverResponse = {
+          body: {
+            seatbid: [{
+              bid: [{impid: '1', adm: '<banner>', ext: {crType: 'banner'}}]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: {adzoneid: 1000}
+            }
+          ]
+        };
 
-      expect(result[0].native.body).to.equal('descriptionContent');
-      expect(result[0].native.sponsoredBy).to.equal('sponsoredByContent');
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].ad, '<banner>');
+        assert.equal(bids[0].mediaType, 'banner');
+        assert.equal(bids[0].meta.mediaType, 'banner');
+      });
     });
 
-    it('handles nobid responses', function () {
-      let response = [];
-      let bidderRequest = BIDDER_REQUEST;
+    describe('video', function () {
+      it('should set vastXml on response', function () {
+        let serverResponse = {
+          body: {
+            seatbid: [{
+              bid: [{impid: '1', adm: '<vast>', ext: {crType: 'video'}}]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: {adzoneid: 1000}
+            }
+          ]
+        };
 
-      let result = spec.interpretResponse(response, bidderRequest);
-      expect(result.length).to.equal(0);
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].vastXml, '<vast>');
+        assert.equal(bids[0].mediaType, 'video');
+        assert.equal(bids[0].meta.mediaType, 'video');
+      });
     });
   });
 
   describe('getUserSyncs', function () {
-    let syncoptionsIframe = {
-      iframeEnabled: 'true'
-    };
+    const usersyncUrl = 'https://usersync-url.com';
+    beforeEach(() => {
+      config.setConfig(
+        {
+          adxcg: {
+            usersyncUrl: usersyncUrl,
+          }
+        }
+      )
+    })
+    after(() => {
+      config.resetConfig()
+    })
+
+    it('should return user sync if pixel enabled with adxcg config', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.deep.equal([{type: 'image', url: usersyncUrl}])
+    })
+
+    it('should not return user sync if pixel disabled', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: false})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+
+    it('should not return user sync if url is not set', function () {
+      config.resetConfig()
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+
+    it('should pass GDPR consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: false, consentString: 'foo'}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=0&gdpr_consent=foo`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: undefined}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=`
+      }]);
+    });
+
+    it('should pass US consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, '1NYN')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?us_privacy=1NYN`
+      }]);
+    });
 
-    it('should return iframe sync option', function () {
-      expect(spec.getUserSyncs(syncoptionsIframe)[0].type).to.equal('iframe');
-      expect(spec.getUserSyncs(syncoptionsIframe)[0].url).to.equal(
-        'https://cdn.adxcg.net/pb-sync.html'
-      );
+    it('should pass GDPR and US consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, '1NYN')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo&us_privacy=1NYN`
+      }]);
     });
   });
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should trigger pixel if bid nurl', function() {
+      const bid = {
+        nurl: 'http://example.com/win/${AUCTION_PRICE}',
+        cpm: 2.1,
+        originalCpm: 1.1,
+      }
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    })
+  })
 });
diff --git a/test/spec/modules/adxpremiumAnalyticsAdapter_spec.js b/test/spec/modules/adxpremiumAnalyticsAdapter_spec.js
index e4a8fa9dccd..fd698e9e1fd 100644
--- a/test/spec/modules/adxpremiumAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adxpremiumAnalyticsAdapter_spec.js
@@ -122,7 +122,7 @@ describe('AdxPremium analytics adapter', function () {
           'auctionStart': 1589707613899,
           'timeout': 2000,
           'refererInfo': {
-            'referer': 'https://test.com/article/176067',
+            'page': 'https://test.com/article/176067',
             'reachedTop': true,
             'numIframes': 0,
             'stack': [
@@ -222,7 +222,7 @@ describe('AdxPremium analytics adapter', function () {
       'auctionStart': 1589707613899,
       'timeout': 2000,
       'refererInfo': {
-        'referer': 'https://test.com/article/176067',
+        'page': 'https://test.com/article/176067',
         'reachedTop': true,
         'numIframes': 0,
         'stack': [
diff --git a/test/spec/modules/adyoulikeBidAdapter_spec.js b/test/spec/modules/adyoulikeBidAdapter_spec.js
index d2d4e10c17f..e6a153d501a 100644
--- a/test/spec/modules/adyoulikeBidAdapter_spec.js
+++ b/test/spec/modules/adyoulikeBidAdapter_spec.js
@@ -6,6 +6,8 @@ import { newBidder } from 'src/adapters/bidderFactory.js';
 describe('Adyoulike Adapter', function () {
   const canonicalUrl = 'https://canonical.url/?t=%26';
   const referrerUrl = 'http://referrer.url/?param=value';
+  const pageUrl = 'http://page.url/?param=value';
+  const domain = 'domain:123';
   const defaultDC = 'hb-api';
   const consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
   const bidderRequest = {
@@ -16,7 +18,8 @@ describe('Adyoulike Adapter', function () {
       consentString: consentString,
       gdprApplies: true
     },
-    refererInfo: {referer: referrerUrl}
+    refererInfo: {location: referrerUrl, canonicalUrl, domain, topmostLocation: 'fakePageURL'},
+    ortb2: {site: {page: pageUrl, ref: referrerUrl}}
   };
   const bidRequestWithEmptyPlacement = [
     {
@@ -58,12 +61,216 @@ describe('Adyoulike Adapter', function () {
       'mediaTypes':
         { 'banner':
           {'sizes': ['300x250']
+          },
+        'native':
+          { 'image': {
+            'required': true,
+          },
+          'title': {
+            'required': true,
+            'len': 80
+          },
+          'cta': {
+            'required': false
+          },
+          'sponsoredBy': {
+            'required': true
+          },
+          'clickUrl': {
+            'required': true
+          },
+          'privacyIcon': {
+            'required': false
+          },
+          'privacyLink': {
+            'required': false
+          },
+          'body': {
+            'required': true
+          },
+          'icon': {
+            'required': true,
+            'sizes': []
           }
+          },
         },
+      'schain': {
+        validation: 'strict',
+        config: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'indirectseller.com',
+              sid: '00001',
+              hp: 1
+            }
+          ]
+        }
+      },
+      'transactionId': 'bid_id_0_transaction_id'
+    }
+  ];
+
+  const bidRequestWithMultipleMediatype = [
+    {
+      'bidId': 'bid_id_0',
+      'bidder': 'adyoulike',
+      'placementCode': 'adunit/hb-0',
+      'params': {
+        'placement': 'placement_0'
+      },
+      'sizes': '300x250',
+      'mediaTypes': {
+        'banner': {
+          'sizes': ['640x480']
+        },
+        'video': {
+          'playerSize': [640, 480],
+          'context': 'outstream'
+        },
+        'native': {
+          'image': {
+            'required': true,
+          },
+          'title': {
+            'required': true,
+            'len': 80
+          },
+          'cta': {
+            'required': false
+          },
+        }
+      },
+      'transactionId': 'bid_id_0_transaction_id'
+    }
+  ];
+
+  const bidRequestWithVideo = [
+    {
+      'bidId': 'bid_id_0',
+      'bidder': 'adyoulike',
+      'placementCode': 'adunit/hb-0',
+      'params': {
+        'placement': 'placement_0'
+      },
+      'sizes': '300x250',
+      'mediaTypes':
+      {
+        'video': {
+          'context': 'instream',
+          'playerSize': [[ 640, 480 ]]
+        }
+      },
+      'transactionId': 'bid_id_0_transaction_id'
+    }
+  ];
+
+  const bidRequestWithNativeImageType = [
+    {
+      'bidId': 'bid_id_0',
+      'bidder': 'adyoulike',
+      'placementCode': 'adunit/hb-0',
+      'params': {
+        'placement': 'placement_0'
+      },
+      'sizes': '300x250',
+      'mediaTypes':
+      {
+        'native': {
+          'type': 'image',
+          'additional': {
+            'will': 'be',
+            'sent': ['300x250']
+          }
+        },
+      },
       'transactionId': 'bid_id_0_transaction_id'
     }
   ];
 
+  const sentBidNative = {
+    'bid_id_0': {
+      'PlacementID': 'e622af275681965d3095808561a1e510',
+      'TransactionID': 'e8355240-d976-4cd5-a493-640656fe08e8',
+      'AvailableSizes': '',
+      'Native': {
+        'image': {
+          'required': true,
+          'sizes': []
+        },
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'cta': {
+          'required': false
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'clickUrl': {
+          'required': true
+        },
+        'privacyIcon': {
+          'required': false
+        },
+        'privacyLink': {
+          'required': false
+        },
+        'body': {
+          'required': true
+        },
+        'icon': {
+          'required': true,
+          'sizes': []
+        }
+      }
+    }
+  };
+
+  const sentBidVideo = {
+    'bid_id_0': {
+      'PlacementID': 'e622af275681965d3095808561a1e510',
+      'TransactionID': 'e8355240-d976-4cd5-a493-640656fe08e8',
+      'AvailableSizes': '',
+      'Video': {
+        playerSize: [640, 480]
+      }
+    }
+  };
+
+  const sentNativeImageType = {
+    'additional': {
+      'sent': [
+        '300x250'
+      ],
+      'will': 'be'
+    },
+    'body': {
+      'required': false
+    },
+    'clickUrl': {
+      'required': true
+    },
+    'cta': {
+      'required': false
+    },
+    'icon': {
+      'required': false
+    },
+    'image': {
+      'required': true
+    },
+    'sponsoredBy': {
+      'required': true
+    },
+    'title': {
+      'required': true
+    },
+    'type': 'image'
+  };
+
   const bidRequestWithDCPlacement = [
     {
       'bidId': 'bid_id_0',
@@ -165,15 +372,133 @@ describe('Adyoulike Adapter', function () {
       'Placement': 'placement_0'
     }
   ];
+
+  const testMetaObject = {
+    'networkId': 123,
+    'advertiserId': '3',
+    'advertiserName': 'foobar',
+    'advertiserDomains': ['foobar.com'],
+    'brandId': '345',
+    'brandName': 'Foo',
+    'primaryCatId': '34',
+    'secondaryCatIds': ['IAB-222', 'IAB-333'],
+    'mediaType': 'banner'
+  };
+  const admSample = "\u003cscript id=\"ayl-prebid-a11a121205932e75e622af275681965d\"\u003e\n(function(){\n\twindow.isPrebid = true\n\tvar prebidResults = /*PREBID*/{\"OnEvents\": {\"CLICK\": [{\"Kind\": \"PIXEL_URL\",\"Url\": \"https://testPixelCLICK.com/fake\"}],\"IMPRESSION\": [{\"Kind\": \"PIXEL_URL\",\"Url\": \"https://testPixelIMP.com/fake\"}, {\"Kind\": \"JAVASCRIPT_URL\",\"Url\": \"https://testJsIMP.com/fake.js\"}]},\"Disabled\": false,\"Attempt\": \"a11a121205932e75e622af275681965d\",\"ApiPrefix\": \"https://fo-api.omnitagjs.com/fo-api\",\"TrackingPrefix\": \"https://tracking.omnitagjs.com/tracking\",\"DynamicPrefix\": \"https://tag-dyn.omnitagjs.com/fo-dyn\",\"StaticPrefix\": \"https://fo-static.omnitagjs.com/fo-static\",\"BlobPrefix\": \"https://fo-api.omnitagjs.com/fo-api/blobs\",\"SspPrefix\": \"https://fo-ssp.omnitagjs.com/fo-ssp\",\"VisitorPrefix\": \"https://visitor.omnitagjs.com/visitor\",\"Trusted\": true,\"Placement\": \"e622af275681965d3095808561a1e510\",\"PlacementAccess\": \"ALL\",\"Site\": \"6e2df7a92203c3c7a25561ed63f25a27\",\"Lang\": \"EN\",\"SiteLogo\": null,\"HasSponsorImage\": true,\"ResizeIframe\": true,\"IntegrationConfig\": {\"Kind\": \"WIDGET\",\"Widget\": {\"ExtraStyleSheet\": \"\",\"Placeholders\": {\"Body\": {\"Color\": {\"R\": 77,\"G\": 21,\"B\": 82,\"A\": 100},\"BackgroundColor\": {\"R\": 255,\"G\": 255,\"B\": 255,\"A\": 100},\"FontFamily\": \"Lato\",\"Width\": \"100%\",\"Align\": \"\",\"BoxShadow\": true},\"CallToAction\": {\"Color\": {\"R\": 26,\"G\": 157,\"B\": 212,\"A\": 100}},\"Description\": {\"Length\": 130},\"Image\": {\"Width\": 600,\"Height\": 600,\"Lowres\": false,\"Raw\": false},\"Size\": {\"Height\": \"250px\",\"Width\": \"300px\"},\"Title\": {\"Color\": {\"R\": 219,\"G\": 181,\"B\": 255,\"A\": 100}}},\"Selector\": {\"Kind\": \"CSS\",\"Css\": \"#ayl-prebid-a11a121205932e75e622af275681965d\"},\"Insertion\": \"AFTER\",\"ClickFormat\": true,\"Creative20\": true,\"WidgetKind\": \"CREATIVE_TEMPLATE_4\"}},\"Legal\": \"Sponsored\",\"ForcedCampaign\": \"f1c80d4bb5643c222ae8de75e9b2f991\",\"ForcedTrack\": \"\",\"ForcedCreative\": \"\",\"ForcedSource\": \"\",\"DisplayMode\": \"DEFAULT\",\"Campaign\": \"f1c80d4bb5643c222ae8de75e9b2f991\",\"CampaignAccess\": \"ALL\",\"CampaignKind\": \"AD_TRAFFIC\",\"DataSource\": \"LOCAL\",\"DataSourceUrl\": \"\",\"DataSourceOnEventsIsolated\": false,\"DataSourceWithoutCookie\": false,\"Content\": {\"Preview\": {\"Thumbnail\": {\"Image\": {\"Kind\": \"EXTERNAL\",\"Data\": {\"External\": {\"Url\": \"https://tag-dyn.omnitagjs.com/fo-dyn/native/preview/image?key=fd4362d35bb174d6f1c80d4bb5643c22\\u0026kind=INTERNAL\\u0026ztop=0.000000\\u0026zleft=0.000000\\u0026zwidth=0.333333\\u0026zheight=1.000000\\u0026width=[width]\\u0026height=[height]\"}},\"ZoneTop\": 0,\"ZoneLeft\": 0,\"ZoneWidth\": 1,\"ZoneHeight\": 1,\"Smart\": false,\"NoTransform\": false,\"Quality\": \"NORMAL\"}},\"Text\": {\"CALLTOACTION\": \"Click here to learn more\",\"DESCRIPTION\": \"Considérant l'extrémité conjoncturelle, il serait bon d'anticiper toutes les voies de bon sens.\",\"SPONSOR\": \"Tested by\",\"TITLE\": \"Adserver Traffic Redirect Internal\"},\"Sponsor\": {\"Name\": \"QA Team\",\"Logo\": {\"Resource\": {\"Kind\": \"EXTERNAL\",\"Data\": {\"External\": {\"Url\": \"https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.svg\"}},\"ZoneTop\": 0,\"ZoneLeft\": 0,\"ZoneWidth\": 1,\"ZoneHeight\": 1,\"Smart\": false,\"NoTransform\": false,\"Quality\": \"NORMAL\"}}},\"Credit\": {\"Logo\": {\"Resource\": {\"Kind\": \"EXTERNAL\",\"Data\": {\"External\": {\"Url\": \"https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.png\"}},\"ZoneTop\": 0,\"ZoneLeft\": 0,\"ZoneWidth\": 1,\"ZoneHeight\": 1,\"Smart\": false,\"NoTransform\": false,\"Quality\": \"NORMAL\"}},\"Url\": \"https://blobs.omnitagjs.com/adchoice/\"}},\"Landing\": {\"Url\": \"https://www.w3.org/People/mimasa/test/xhtml/entities/entities-11.xhtml#lat1\",\"LegacyTracking\": false},\"ViewButtons\": {\"Close\": {\"Skip\": 6000}},\"InternalContentFields\": {\"AnimatedImage\": false}},\"AdDomain\": \"adyoulike.com\",\"Opener\": \"REDIRECT\",\"PerformUITriggers\": [\"CLICK\"],\"RedirectionTarget\": \"TAB\"}/*PREBID*/;\n\tvar insertAds = function insertAds() {\insertAds();\n\t}\n})();\n\u003c/script\u003e";
   const responseWithSinglePlacement = [
     {
       'BidID': 'bid_id_0',
       'Placement': 'placement_0',
-      'Ad': 'placement_0',
+      'Ad': admSample,
       'Price': 0.5,
       'Height': 600,
+      'Meta': testMetaObject
     }
   ];
+
+  const responseWithSingleNative = [{
+    'BidID': 'bid_id_0',
+    'Placement': 'placement_0',
+    'Native': {
+      'body': 'Considérant l\'extrémité conjoncturelle, il serait bon d\'anticiper toutes les voies de bon sens.',
+      'cta': 'Click here to learn more',
+      'clickUrl': 'https://tracking.omnitagjs.com/tracking/ar?event_kind=CLICK&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991&url=https%3A%2F%2Fwww.w3.org%2FPeople%2Fmimasa%2Ftest%2Fxhtml%2Fentities%2Fentities-11.xhtml%23lat1',
+      'image': {
+        'height': 600,
+        'url': 'https://blobs.omnitagjs.com/blobs/f1/f1c80d4bb5643c22/fd4362d35bb174d6f1c80d4bb5643c22',
+        'width': 300
+      },
+      'icon': {
+        'height': 50,
+        'url': 'https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.svg',
+        'width': 50,
+      },
+      'privacyIcon': 'https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.png',
+      'privacyLink': 'https://blobs.omnitagjs.com/adchoice/',
+      'sponsoredBy': 'QA Team',
+      'title': 'Adserver Traffic Redirect Internal',
+      'impressionTrackers': [
+        'https://testPixelIMP.com/fake',
+        'https://tracking.omnitagjs.com/tracking/pixel?event_kind=IMPRESSION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991',
+        'https://tracking.omnitagjs.com/tracking/pixel?event_kind=INSERTION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991',
+      ],
+      'javascriptTrackers': [
+        'https://testJsIMP.com/fake.js'
+      ],
+      'clickTrackers': [
+        'https://testPixelCLICK.com/fake'
+      ]
+    },
+    'Price': 0.5,
+    'Height': 600,
+  }];
+
+  const nativeResult = [{
+    cpm: 0.5,
+    creativeId: undefined,
+    currency: 'USD',
+    netRevenue: true,
+    requestId: 'bid_id_0',
+    ttl: 3600,
+    mediaType: 'native',
+    native: {
+      body: 'Considérant l\'extrémité conjoncturelle, il serait bon d\'anticiper toutes les voies de bon sens.',
+      clickTrackers: [
+        'https://testPixelCLICK.com/fake'
+      ],
+      clickUrl: 'https://tracking.omnitagjs.com/tracking/ar?event_kind=CLICK&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991&url=https%3A%2F%2Fwww.w3.org%2FPeople%2Fmimasa%2Ftest%2Fxhtml%2Fentities%2Fentities-11.xhtml%23lat1',
+      cta: 'Click here to learn more',
+      image: {
+        height: 600,
+        url: 'https://blobs.omnitagjs.com/blobs/f1/f1c80d4bb5643c22/fd4362d35bb174d6f1c80d4bb5643c22',
+        width: 300,
+      },
+      icon: {
+        height: 50,
+        url: 'https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.svg',
+        width: 50,
+      },
+      impressionTrackers: [
+        'https://testPixelIMP.com/fake',
+        'https://tracking.omnitagjs.com/tracking/pixel?event_kind=IMPRESSION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991',
+        'https://tracking.omnitagjs.com/tracking/pixel?event_kind=INSERTION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991'
+      ],
+      javascriptTrackers: [
+        'https://testJsIMP.com/fake.js'
+      ],
+      privacyIcon: 'https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.png',
+      privacyLink: 'https://blobs.omnitagjs.com/adchoice/',
+      sponsoredBy: 'QA Team',
+      title: 'Adserver Traffic Redirect Internal',
+    },
+    meta: testMetaObject
+  }];
+
+  const responseWithSingleVideo = [{
+    'BidID': 'bid_id_0',
+    'Placement': 'placement_0',
+    'Vast': 'PFZBU1Q+RW1wdHkgc2FtcGxlPC92YXN0Pg==',
+    'Price': 0.5,
+    'Height': 300,
+    'Width': 530
+  }];
+
+  const videoResult = [{
+    cpm: 0.5,
+    creativeId: undefined,
+    currency: 'USD',
+    height: 300,
+    netRevenue: true,
+    requestId: 'bid_id_0',
+    ttl: 3600,
+    mediaType: 'video',
+    meta: {
+      advertiserDomains: []
+    },
+    vastXml: '<VAST>Empty sample</vast>',
+    width: 530
+  }];
+
   const responseWithMultiplePlacements = [
     {
       'BidID': 'bid_id_0',
@@ -214,15 +539,49 @@ describe('Adyoulike Adapter', function () {
       'transactionId': 'bid_id_1_transaction_id'
     };
 
+    let bidWSize = {
+      'bidId': 'bid_id_1',
+      'bidder': 'adyoulike',
+      'placementCode': 'adunit/hb-1',
+      'params': {
+        'placement': 'placement_1',
+        'size': [250, 300],
+      },
+      'transactionId': 'bid_id_1_transaction_id'
+    };
+
+    let nativeBid = {
+      'bidId': 'bid_id_1',
+      'bidder': 'adyoulike',
+      'placementCode': 'adunit/hb-1',
+      'params': {
+        'placement': 'placement_1'
+      },
+      mediaTypes: {
+        native: {
+
+        }
+      },
+      'transactionId': 'bid_id_1_transaction_id'
+    };
+
     it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when required params found with size in bid params', function () {
+      expect(!!spec.isBidRequestValid(bidWSize)).to.equal(true);
+    });
+
+    it('should return true when required params found for native ad', function () {
+      expect(!!spec.isBidRequestValid(nativeBid)).to.equal(true);
     });
 
     it('should return false when required params are not passed', function () {
       let bid = Object.assign({}, bid);
       delete bid.size;
 
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
     });
 
     it('should return false when required params are not passed', function () {
@@ -231,26 +590,35 @@ describe('Adyoulike Adapter', function () {
       bid.params = {
         'placement': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
     });
   });
 
   describe('buildRequests', function () {
-    let canonicalQuery;
+    it('Should expand short native image config type', function() {
+      const request = spec.buildRequests(bidRequestWithNativeImageType, bidderRequest);
+      const payload = JSON.parse(request.data);
 
-    beforeEach(function () {
-      let canonical = document.createElement('link');
-      canonical.rel = 'canonical';
-      canonical.href = canonicalUrl;
-      canonicalQuery = sinon.stub(window.top.document.head, 'querySelector');
-      canonicalQuery.withArgs('link[rel="canonical"][href]').returns(canonical);
+      expect(request.url).to.contain(getEndpoint());
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.contains('CanonicalUrl=' + encodeURIComponent(canonicalUrl));
+      expect(request.url).to.contains('RefererUrl=' + encodeURIComponent(referrerUrl));
+      expect(request.url).to.contains('PageUrl=' + encodeURIComponent(pageUrl));
+      expect(request.url).to.contains('PageReferrer=' + encodeURIComponent(referrerUrl));
+
+      expect(payload.Version).to.equal('1.0');
+      expect(payload.Bids['bid_id_0'].PlacementID).to.be.equal('placement_0');
+      expect(payload.PageRefreshed).to.equal(false);
+      expect(payload.Bids['bid_id_0'].TransactionID).to.be.equal('bid_id_0_transaction_id');
+      expect(payload.Bids['bid_id_0'].Native).deep.equal(sentNativeImageType);
     });
 
-    afterEach(function () {
-      canonicalQuery.restore();
+    it('Should target video enpoint for video mediatype', function() {
+      const request = spec.buildRequests(bidRequestWithVideo, bidderRequest);
+      expect(request.url).to.contain(getEndpoint());
     });
 
-    it('should add gdpr/usp consent information to the request', function () {
+    it('should add gdpr/usp consent information and SChain to the request', function () {
       let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
       let uspConsentData = '1YCC';
       let bidderRequest = {
@@ -273,6 +641,7 @@ describe('Adyoulike Adapter', function () {
       expect(payload.gdprConsent.consentString).to.exist.and.to.equal(consentString);
       expect(payload.gdprConsent.consentRequired).to.exist.and.to.be.true;
       expect(payload.uspConsent).to.exist.and.to.equal(uspConsentData);
+      expect(payload.Bids.bid_id_0.SChain).to.exist.and.to.deep.equal(bidRequestWithSinglePlacement[0].schain);
     });
 
     it('should not set a default value for gdpr consentRequired', function () {
@@ -298,6 +667,32 @@ describe('Adyoulike Adapter', function () {
       expect(payload.gdprConsent.consentRequired).to.be.null;
     });
 
+    it('should add userid eids information to the request', function () {
+      let bidderRequest = {
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'userId': {
+          pubcid: '01EAJWWNEPN3CYMM5N8M5VXY22',
+          unsuported: '666'
+        }
+      };
+
+      bidderRequest.bids = bidRequestWithSinglePlacement;
+
+      const request = spec.buildRequests(bidRequestWithSinglePlacement, bidderRequest);
+      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('sends bid request to endpoint with single placement', function () {
       const request = spec.buildRequests(bidRequestWithSinglePlacement, bidderRequest);
       const payload = JSON.parse(request.data);
@@ -306,16 +701,32 @@ describe('Adyoulike Adapter', function () {
       expect(request.method).to.equal('POST');
       expect(request.url).to.contains('CanonicalUrl=' + encodeURIComponent(canonicalUrl));
       expect(request.url).to.contains('RefererUrl=' + encodeURIComponent(referrerUrl));
+      expect(request.url).to.contains('PageUrl=' + encodeURIComponent(pageUrl));
+      expect(request.url).to.contains('PageReferrer=' + encodeURIComponent(referrerUrl));
 
       expect(payload.Version).to.equal('1.0');
       expect(payload.Bids['bid_id_0'].PlacementID).to.be.equal('placement_0');
       expect(payload.PageRefreshed).to.equal(false);
       expect(payload.Bids['bid_id_0'].TransactionID).to.be.equal('bid_id_0_transaction_id');
+      expect(payload.ortb2).to.deep.equal({site: {page: pageUrl, ref: referrerUrl}});
     });
 
     it('sends bid request to endpoint with single placement without canonical', function () {
-      canonicalQuery.restore();
-      const request = spec.buildRequests(bidRequestWithSinglePlacement, bidderRequest);
+      const request = spec.buildRequests(bidRequestWithSinglePlacement, {...bidderRequest, refererInfo: {...bidderRequest.refererInfo, canonicalUrl: null}});
+      const payload = JSON.parse(request.data);
+
+      expect(request.url).to.contain(getEndpoint());
+      expect(request.method).to.equal('POST');
+
+      expect(request.url).to.not.contains('CanonicalUrl=' + encodeURIComponent(canonicalUrl));
+      expect(payload.Version).to.equal('1.0');
+      expect(payload.Bids['bid_id_0'].PlacementID).to.be.equal('placement_0');
+      expect(payload.PageRefreshed).to.equal(false);
+      expect(payload.Bids['bid_id_0'].TransactionID).to.be.equal('bid_id_0_transaction_id');
+    });
+
+    it('sends bid request to endpoint with single placement multiple mediatype', function () {
+      const request = spec.buildRequests(bidRequestWithSinglePlacement, {...bidderRequest, refererInfo: {...bidderRequest.refererInfo, canonicalUrl: null}});
       const payload = JSON.parse(request.data);
 
       expect(request.url).to.contain(getEndpoint());
@@ -383,9 +794,10 @@ describe('Adyoulike Adapter', function () {
 
       expect(result.length).to.equal(1);
       expect(result[0].cpm).to.equal(0.5);
-      expect(result[0].ad).to.equal('placement_0');
+      expect(result[0].ad).to.equal(admSample);
       expect(result[0].width).to.equal(300);
       expect(result[0].height).to.equal(600);
+      expect(result[0].meta).to.deep.equal(testMetaObject);
     });
 
     it('receive reponse with multiple placement', function () {
@@ -404,5 +816,41 @@ describe('Adyoulike Adapter', function () {
       expect(result[1].width).to.equal(400);
       expect(result[1].height).to.equal(250);
     });
+
+    it('receive reponse with Native from ad markup', function () {
+      serverResponse.body = responseWithSinglePlacement;
+      let result = spec.interpretResponse(serverResponse, {data: '{"Bids":' + JSON.stringify(sentBidNative) + '}'});
+
+      expect(result.length).to.equal(1);
+
+      expect(result).to.deep.equal(nativeResult);
+    });
+
+    it('receive reponse with Native ad', function () {
+      serverResponse.body = responseWithSingleNative;
+      let result = spec.interpretResponse(serverResponse, {data: '{"Bids":' + JSON.stringify(sentBidNative) + '}'});
+
+      expect(result.length).to.equal(1);
+
+      const noMeta = [...nativeResult];
+      const metaBackup = noMeta[0].meta;
+
+      // this test should return default meta object
+      noMeta[0].meta = { advertiserDomains: [] };
+
+      expect(result).to.deep.equal(noMeta);
+    });
+
+    it('receive Vast reponse with Video ad', function () {
+      serverResponse.body = responseWithSingleVideo;
+      let result = spec.interpretResponse(serverResponse, {data: '{"Bids":' + JSON.stringify(sentBidVideo) + '}'});
+
+      expect(result.length).to.equal(1);
+      expect(result).to.deep.equal(videoResult);
+    });
+
+    it('should expose gvlid', function() {
+      expect(spec.gvlid).to.equal(259)
+    })
   });
 });
diff --git a/test/spec/modules/afpBidAdapter_spec.js b/test/spec/modules/afpBidAdapter_spec.js
new file mode 100644
index 00000000000..5b658a66351
--- /dev/null
+++ b/test/spec/modules/afpBidAdapter_spec.js
@@ -0,0 +1,306 @@
+import {includes} from 'src/polyfill.js'
+import cloneDeep from 'lodash/cloneDeep'
+import unset from 'lodash/unset'
+import { expect } from 'chai'
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js'
+import {
+  spec,
+  IN_IMAGE_BANNER_TYPE,
+  IN_IMAGE_MAX_BANNER_TYPE,
+  IN_CONTENT_BANNER_TYPE,
+  IN_CONTENT_VIDEO_TYPE,
+  OUT_CONTENT_VIDEO_TYPE,
+  IN_CONTENT_STORY_TYPE,
+  ACTION_SCROLLER_TYPE,
+  ACTION_SCROLLER_LIGHT_TYPE,
+  JUST_BANNER_TYPE,
+  BIDDER_CODE,
+  SSP_ENDPOINT,
+  REQUEST_METHOD,
+  TEST_PAGE_URL,
+  IS_DEV, mediaTypeByPlaceType
+} from 'modules/afpBidAdapter.js'
+
+const placeId = '613221112871613d1517d181'
+const bidId = '2a67c5577ff6a5'
+const transactionId = '7e8515a2-2ed9-4733-b976-6c2596a03287'
+const imageUrl = 'https://rtbinsight.ru/content/images/size/w1000/2021/05/ximage-30.png.pagespeed.ic.IfuX4zAEPP.png'
+const placeContainer = '#container'
+const imageWidth = 600
+const imageHeight = 400
+const pageUrl = IS_DEV ? TEST_PAGE_URL : 'referer'
+const sizes = [[imageWidth, imageHeight]]
+const bidderRequest = {
+  refererInfo: { referer: pageUrl },
+}
+const mediaTypeBanner = { [BANNER]: {sizes: [[imageWidth, imageHeight]]} }
+const mediaTypeVideo = { [VIDEO]: {playerSize: [[imageWidth, imageHeight]]} }
+const commonParams = {
+  placeId,
+  placeContainer,
+}
+const commonParamsForInImage = Object.assign({}, commonParams, {
+  imageUrl,
+  imageWidth,
+  imageHeight,
+})
+const configByPlaceType = {
+  get [IN_IMAGE_BANNER_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeBanner,
+      params: Object.assign({}, commonParamsForInImage, {
+        placeType: IN_IMAGE_BANNER_TYPE
+      }),
+    })
+  },
+  get [IN_IMAGE_MAX_BANNER_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeBanner,
+      params: Object.assign({}, commonParamsForInImage, {
+        placeType: IN_IMAGE_MAX_BANNER_TYPE
+      }),
+    })
+  },
+  get [IN_CONTENT_BANNER_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeBanner,
+      params: Object.assign({}, commonParams, {
+        placeType: IN_CONTENT_BANNER_TYPE
+      }),
+    })
+  },
+  get [IN_CONTENT_VIDEO_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeVideo,
+      params: Object.assign({}, commonParams, {
+        placeType: IN_CONTENT_VIDEO_TYPE
+      }),
+    })
+  },
+  get [OUT_CONTENT_VIDEO_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeVideo,
+      params: Object.assign({}, commonParams, {
+        placeType: OUT_CONTENT_VIDEO_TYPE
+      }),
+    })
+  },
+  get [IN_CONTENT_STORY_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeBanner,
+      params: Object.assign({}, commonParams, {
+        placeType: IN_CONTENT_STORY_TYPE
+      }),
+    })
+  },
+  get [ACTION_SCROLLER_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeBanner,
+      params: Object.assign({}, commonParams, {
+        placeType: ACTION_SCROLLER_TYPE
+      }),
+    })
+  },
+  get [ACTION_SCROLLER_LIGHT_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeBanner,
+      params: Object.assign({}, commonParams, {
+        placeType: ACTION_SCROLLER_LIGHT_TYPE
+      }),
+    })
+  },
+  get [JUST_BANNER_TYPE]() {
+    return cloneDeep({
+      mediaTypes: mediaTypeBanner,
+      params: Object.assign({}, commonParams, {
+        placeType: JUST_BANNER_TYPE
+      }),
+    })
+  },
+}
+const getTransformedConfig = ({mediaTypes, params}) => {
+  return {
+    params: params,
+    sizes,
+    bidId,
+    bidder: BIDDER_CODE,
+    mediaTypes: mediaTypes,
+    transactionId,
+  }
+}
+const validBidRequests = Object.keys(configByPlaceType).map(key => getTransformedConfig(configByPlaceType[key]))
+
+describe('AFP Adapter', function() {
+  describe('isBidRequestValid method', function() {
+    describe('returns true', function() {
+      describe('when config has all mandatory params', () => {
+        Object.keys(configByPlaceType).forEach(placeType => {
+          it(`and ${placeType} config has the correct value`, function() {
+            const isBidRequestValid = spec.isBidRequestValid(configByPlaceType[placeType])
+            expect(isBidRequestValid).to.equal(true)
+          })
+        })
+      })
+    })
+    describe('returns false', function() {
+      const checkMissingParams = (placesTypes, missingParams) =>
+        placesTypes.forEach(placeType =>
+          missingParams.forEach(missingParam => {
+            const config = configByPlaceType[placeType]
+            it(`${placeType} does not have the ${missingParam}.`, function() {
+              unset(config, missingParam)
+              const isBidRequestValid = spec.isBidRequestValid(config)
+              expect(isBidRequestValid).to.equal(false)
+            })
+          })
+        )
+
+      describe('when params are not correct', function() {
+        checkMissingParams(Object.keys(configByPlaceType), ['params.placeId', 'params.placeType'])
+        checkMissingParams([IN_IMAGE_BANNER_TYPE, IN_IMAGE_MAX_BANNER_TYPE],
+          ['params.imageUrl', 'params.imageWidth', 'params.imageHeight'])
+
+        it('does not have a the correct placeType.', function() {
+          const config = configByPlaceType[IN_IMAGE_BANNER_TYPE]
+          config.params.placeType = 'something'
+          const isBidRequestValid = spec.isBidRequestValid(config)
+          expect(isBidRequestValid).to.equal(false)
+        })
+      })
+      describe('when video mediaType object is not correct.', function() {
+        checkMissingParams([IN_CONTENT_VIDEO_TYPE, OUT_CONTENT_VIDEO_TYPE],
+          [`mediaTypes.${VIDEO}.playerSize`, `mediaTypes.${VIDEO}`])
+        checkMissingParams([
+          IN_IMAGE_BANNER_TYPE,
+          IN_IMAGE_MAX_BANNER_TYPE,
+          IN_CONTENT_BANNER_TYPE,
+          IN_CONTENT_STORY_TYPE,
+          ACTION_SCROLLER_TYPE,
+          ACTION_SCROLLER_LIGHT_TYPE,
+          JUST_BANNER_TYPE
+        ], [`mediaTypes.${BANNER}.sizes`, `mediaTypes.${BANNER}`])
+      })
+    })
+  })
+
+  describe('buildRequests method', function() {
+    const request = spec.buildRequests(validBidRequests, bidderRequest)
+
+    it('Url should be correct', function() {
+      expect(request.url).to.equal(SSP_ENDPOINT)
+    })
+
+    it('Method should be correct', function() {
+      expect(request.method).to.equal(REQUEST_METHOD)
+    })
+
+    describe('Common data request should be correct', function() {
+      it('pageUrl should be correct', function() {
+        expect(request.data.pageUrl).to.equal(pageUrl)
+      })
+      it('bidRequests should be array', function() {
+        expect(Array.isArray(request.data.bidRequests)).to.equal(true)
+      })
+
+      request.data.bidRequests.forEach((bid, index) => {
+        describe(`bid with ${validBidRequests[index].params.placeType} should be correct`, function() {
+          it('bidId should be correct', function() {
+            expect(bid.bidId).to.equal(bidId)
+          })
+          it('placeId should be correct', function() {
+            expect(bid.placeId).to.equal(placeId)
+          })
+          it('transactionId should be correct', function() {
+            expect(bid.transactionId).to.equal(transactionId)
+          })
+          it('sizes should be correct', function() {
+            expect(bid.sizes).to.equal(sizes)
+          })
+
+          if (includes([IN_IMAGE_BANNER_TYPE, IN_IMAGE_MAX_BANNER_TYPE], validBidRequests[index].params.placeType)) {
+            it('imageUrl should be correct', function() {
+              expect(bid.imageUrl).to.equal(imageUrl)
+            })
+            it('imageWidth should be correct', function() {
+              expect(bid.imageWidth).to.equal(Math.floor(imageWidth))
+            })
+            it('imageHeight should be correct', function() {
+              expect(bid.imageHeight).to.equal(Math.floor(imageHeight))
+            })
+          }
+        })
+      })
+    })
+  })
+
+  describe('interpretResponse method', function() {
+    it('should return a void array, when the server response are not correct.', function() {
+      const request = { data: JSON.stringify({}) }
+      const serverResponse = {
+        body: {}
+      }
+      const bids = spec.interpretResponse(serverResponse, request)
+      expect(Array.isArray(bids)).to.equal(true)
+      expect(bids.length).to.equal(0)
+    })
+    it('should return a void array, when the server response have not got bids.', function() {
+      const request = { data: JSON.stringify({}) }
+      const serverResponse = { body: { bids: [] } }
+      const bids = spec.interpretResponse(serverResponse, request)
+      expect(Array.isArray(bids)).to.equal(true)
+      expect(bids.length).to.equal(0)
+    })
+    describe('when the server response return a bids', function() {
+      Object.keys(configByPlaceType).forEach(placeType => {
+        it(`should return a bid with ${placeType} placeType`, function() {
+          const cpm = 10
+          const currency = 'RUB'
+          const creativeId = '123'
+          const netRevenue = true
+          const width = sizes[0][0]
+          const height = sizes[0][1]
+          const adSettings = {
+            content: 'html'
+          }
+          const placeSettings = {
+            placeType,
+          }
+          const request = spec.buildRequests([validBidRequests[0]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId,
+                  cpm,
+                  currency,
+                  creativeId,
+                  netRevenue,
+                  width,
+                  height,
+                  adSettings,
+                  placeSettings,
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal(bidId)
+          expect(bids[0].meta.mediaType).to.equal(mediaTypeByPlaceType[placeSettings.placeType])
+          expect(bids[0].cpm).to.equal(cpm)
+          expect(bids[0].width).to.equal(width)
+          expect(bids[0].height).to.equal(height)
+          expect(bids[0].currency).to.equal(currency)
+          expect(bids[0].netRevenue).to.equal(netRevenue)
+
+          if (mediaTypeByPlaceType[placeSettings.placeType] === BANNER) {
+            expect(typeof bids[0].ad).to.equal('string')
+          } else if (mediaTypeByPlaceType[placeSettings.placeType] === VIDEO) {
+            expect(typeof bids[0].vastXml).to.equal('string')
+            expect(typeof bids[0].renderer).to.equal('object')
+          }
+        })
+      })
+    })
+  })
+})
diff --git a/test/spec/modules/aidemBidAdapter_spec.js b/test/spec/modules/aidemBidAdapter_spec.js
new file mode 100644
index 00000000000..71edfcf82fb
--- /dev/null
+++ b/test/spec/modules/aidemBidAdapter_spec.js
@@ -0,0 +1,672 @@
+import {expect} from 'chai';
+import {setEndPoints, spec} from 'modules/aidemBidAdapter.js';
+import * as utils from '../../../src/utils';
+import {deepSetValue} from '../../../src/utils';
+import {server} from '../../mocks/xhr';
+import {config} from '../../../src/config';
+import {NATIVE} from '../../../src/mediaTypes.js';
+
+// Full banner + Full Video + Basic Banner + Basic Video
+const VALID_BIDS = [
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '301491',
+      publisherId: '3021491',
+      placementId: 13144370,
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]],
+      }
+    },
+  },
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '301491',
+      publisherId: '3021491',
+      placementId: 13144370,
+    },
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        minduration: 7,
+        maxduration: 30,
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [2]
+      }
+    },
+  },
+]
+
+const INVALID_BIDS = [
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '3014912'
+    }
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]],
+      }
+    },
+    params: {
+      siteId: '3014912',
+    }
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]],
+      }
+    },
+    params: {
+      publisherId: '3014912',
+    }
+  },
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '3014912',
+      member: '301e4912'
+    }
+  },
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '3014912',
+      invCode: '3014912'
+    }
+  },
+  {
+    bidder: 'aidem',
+    mediaType: NATIVE,
+    params: {
+      siteId: '3014912'
+    }
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      banner: {}
+    },
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      video: {
+        placement: 1,
+        minduration: 7,
+        maxduration: 30,
+        mimes: ['video/mp4'],
+        protocols: [2]
+      }
+    },
+    params: {
+      siteId: '301491',
+      placementId: 13144370,
+    },
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      video: {
+        minduration: 7,
+        maxduration: 30,
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [2]
+      }
+    },
+    params: {
+      siteId: '301491',
+      placementId: 13144370,
+    },
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      video: {
+        minduration: 7,
+        maxduration: 30,
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [2],
+        placement: 1
+      }
+    },
+    params: {
+      siteId: '301491',
+      placementId: 13144370,
+      video: {
+        size: [480, 40]
+      }
+    },
+  },
+]
+
+const DEFAULT_VALID_BANNER_REQUESTS = [
+  {
+    adUnitCode: 'test-div',
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    bidId: '22c4871113f461',
+    bidder: 'aidem',
+    bidderRequestId: '15246a574e859f',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [ 300, 250 ],
+          [ 300, 600 ]
+        ]
+      }
+    },
+    params: {
+      siteId: 1,
+      placementId: 13144370
+    },
+    src: 'client',
+    transactionId: '54a58774-7a41-494e-9aaf-fa7b79164f0c'
+  }
+];
+
+const DEFAULT_VALID_VIDEO_REQUESTS = [
+  {
+    adUnitCode: 'test-div',
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    bidId: '22c4871113f461',
+    bidder: 'aidem',
+    bidderRequestId: '15246a574e859f',
+    mediaTypes: {
+      video: {
+        minduration: 7,
+        maxduration: 30,
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [2]
+      }
+    },
+    params: {
+      siteId: 1,
+      placementId: 13144370
+    },
+    src: 'client',
+    transactionId: '54a58774-7a41-494e-9aaf-fa7b79164f0c'
+  }
+];
+
+const VALID_BIDDER_REQUEST = {
+  auctionId: '6e9b46c3-65a8-46ea-89f4-c5071110c85c',
+  bidderCode: 'aidem',
+  bidderRequestId: '170ea5d2b1d073',
+  refererInfo: {
+    page: 'test-page',
+    domain: 'test-domain',
+    ref: 'test-referer'
+  },
+}
+
+// Add mediatype
+const SERVER_RESPONSE_BANNER = {
+  body: {
+    id: 'efa1930a-bc3e-4fd0-8368-08bc40236b4f',
+    bid: [
+      // BANNER
+      {
+        'id': '2e614be960ee1d',
+        'impid': '2e614be960ee1d',
+        'price': 7.91,
+        'mediatype': 'banner',
+        'adid': '24277955',
+        'adm': 'creativity_banner',
+        'adomain': [
+          'aidem.com'
+        ],
+        'iurl': 'http://www.aidem.com',
+        'cat': [],
+        'cid': '4193561',
+        'crid': '24277955',
+        'w': 300,
+        'h': 250,
+        'ext': {
+          'dspid': 85,
+          'advbrandid': 1246,
+          'advbrand': 'AIDEM'
+        }
+      },
+    ],
+    cur: 'USD'
+  },
+}
+
+const SERVER_RESPONSE_VIDEO = {
+  body: {
+    id: 'efa1930a-bc3e-4fd0-8368-08bc40236b4f',
+    bid: [
+      // VIDEO
+      {
+        'id': '2876a29392a47c',
+        'impid': '2876a29392a47c',
+        'price': 7.93,
+        'mediatype': 'video',
+        'adid': '24277955',
+        'adm': 'https://hermes.aidemsrv.com/vast-tag/cl9mzhhd502uq09l720uegb02?auction_id={{AUCTION_ID}}&cachebuster={{CACHEBUSTER}}',
+        'adomain': [
+          'aidem.com'
+        ],
+        'iurl': 'http://www.aidem.com',
+        'cat': [],
+        'cid': '4193561',
+        'crid': '24277955',
+        'w': 640,
+        'h': 480,
+        'ext': {
+          'dspid': 85,
+          'advbrandid': 1246,
+          'advbrand': 'AIDEM'
+        }
+      }
+    ],
+    cur: 'USD'
+  },
+}
+
+const WIN_NOTICE = {
+  'adId': '3a20ee5dc78c1e',
+  'adUnitCode': 'div-gpt-ad-1460505748561-0',
+  'creativeId': '24277955',
+  'cpm': 1,
+  'netRevenue': false,
+  'adserverTargeting': {
+    'hb_bidder': 'aidem',
+    'hb_adid': '3a20ee5dc78c1e',
+    'hb_pb': '1.00',
+    'hb_size': '300x250',
+    'hb_source': 'client',
+    'hb_format': 'banner',
+    'hb_adomain': 'tenutabene.it'
+  },
+  'auctionId': '85864730-6cbc-4e56-bc3c-a4a6596dca5b',
+  'currency': [
+    'USD'
+  ],
+  'mediaType': 'banner',
+  'size': '300x250',
+  'width': 300,
+  'height': 250,
+  'status': 'rendered',
+  'transactionId': 'ce089116-4251-45c3-bdbb-3a03cb13816b',
+  'ttl': 300,
+  'requestTimestamp': 1666796241007,
+  'responseTimestamp': 1666796241021,
+  metrics: {
+    getMetrics() {
+      return {
+
+      }
+    }
+  }
+}
+
+const ERROR_NOTICE = {
+  'message': 'Prebid.js: Server call for aidem failed.',
+  'url': 'http%3A%2F%2Flocalhost%3A9999%2FintegrationExamples%2Fgpt%2Fhello_world.html%3Fpbjs_debug%3Dtrue',
+  'auctionId': 'b57faab7-23f7-4b63-90db-67b259d20db7',
+  'bidderRequestId': '1c53857d1ce616',
+  'timeout': 1000,
+  'bidderCode': 'aidem',
+  metrics: {
+    getMetrics() {
+      return {
+
+      }
+    }
+  }
+}
+
+describe('Aidem adapter', () => {
+  describe('isBidRequestValid', () => {
+    it('should return true for each valid bid requests', function () {
+      // spec.isBidRequestValid()
+      VALID_BIDS.forEach((value, index) => {
+        expect(spec.isBidRequestValid(value)).to.be.true
+      })
+    });
+
+    it('should return false for each invalid bid requests', function () {
+      // spec.isBidRequestValid()
+      INVALID_BIDS.forEach((value, index) => {
+        expect(spec.isBidRequestValid(value)).to.be.false
+      })
+    });
+
+    it('should return true if valid banner sizes are specified in params as single array', function () {
+      // spec.isBidRequestValid()
+      const validBannerRequest = utils.deepClone(VALID_BIDS[0])
+      deepSetValue(validBannerRequest.params, 'banner.size', [300, 250])
+      expect(spec.isBidRequestValid(validBannerRequest)).to.be.true
+    });
+
+    it('should return true if valid banner sizes are specified in params as array of array', function () {
+      // spec.isBidRequestValid()
+      const validBannerRequest = utils.deepClone(VALID_BIDS[0])
+      deepSetValue(validBannerRequest.params, 'banner.size', [[300, 600]])
+      expect(spec.isBidRequestValid(validBannerRequest)).to.be.true
+    });
+
+    it('should return true if valid video sizes are specified in params as single array', function () {
+      // spec.isBidRequestValid()
+      const validVideoRequest = utils.deepClone(VALID_BIDS[1])
+      deepSetValue(validVideoRequest.params, 'video.size', [640, 480])
+      expect(spec.isBidRequestValid(validVideoRequest)).to.be.true
+    });
+  });
+
+  describe('buildRequests', () => {
+    it('should match server requirements', () => {
+      const requests = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      expect(requests).to.be.an('object');
+      expect(requests.method).to.be.a('string')
+      expect(requests.data).to.be.a('string')
+      expect(requests.options).to.be.an('object').that.have.a.property('withCredentials')
+    });
+
+    it('should have a well formatted banner payload', () => {
+      const requests = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const payload = JSON.parse(requests.data)
+      expect(payload).to.be.a('object').that.has.all.keys(
+        'id', 'imp', 'device', 'cur', 'tz', 'regs', 'site', 'environment', 'at'
+      )
+      expect(payload.imp).to.be.a('array').that.has.lengthOf(DEFAULT_VALID_BANNER_REQUESTS.length)
+
+      expect(payload.imp[0]).to.be.a('object').that.has.all.keys(
+        'banner', 'id', 'mediatype', 'imp_ext', 'tid', 'tagid'
+      )
+      expect(payload.imp[0].banner).to.be.a('object').that.has.all.keys(
+        'format', 'topframe'
+      )
+    });
+
+    it('should have a well formatted video payload', () => {
+      const requests = spec.buildRequests(DEFAULT_VALID_VIDEO_REQUESTS, VALID_BIDDER_REQUEST);
+      const payload = JSON.parse(requests.data)
+      expect(payload).to.be.a('object').that.has.all.keys(
+        'id', 'imp', 'device', 'cur', 'tz', 'regs', 'site', 'environment', 'at'
+      )
+      expect(payload.imp).to.be.a('array').that.has.lengthOf(DEFAULT_VALID_VIDEO_REQUESTS.length)
+
+      expect(payload.imp[0]).to.be.a('object').that.has.all.keys(
+        'video', 'id', 'mediatype', 'imp_ext', 'tid', 'tagid'
+      )
+      expect(payload.imp[0].video).to.be.a('object').that.has.all.keys(
+        'format', 'mimes', 'minDuration', 'maxDuration', 'protocols'
+      )
+    });
+
+    it('should have a well formatted bid floor payload if configured', () => {
+      const validBannerRequests = utils.deepClone(DEFAULT_VALID_BANNER_REQUESTS)
+      validBannerRequests[0].params.floor = {
+        value: 1.98,
+        currency: 'USD'
+      }
+      const requests = spec.buildRequests(validBannerRequests, VALID_BIDDER_REQUEST);
+      const payload = JSON.parse(requests.data)
+      const { floor } = payload.imp[0]
+      expect(floor).to.be.a('object').that.has.all.keys(
+        'value', 'currency'
+      )
+    });
+
+    it('should hav wpar keys in environment object', function () {
+      const requests = spec.buildRequests(DEFAULT_VALID_VIDEO_REQUESTS, VALID_BIDDER_REQUEST);
+      const payload = JSON.parse(requests.data)
+      expect(payload).to.have.property('environment')
+      expect(payload.environment).to.be.a('object').that.have.property('wpar')
+      expect(payload.environment.wpar).to.be.a('object').that.has.keys('innerWidth', 'innerHeight')
+    });
+  })
+
+  describe('interpretResponse', () => {
+    it('should return a valid bid array with a banner bid', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_BANNER)
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(1)
+      interpreted.forEach(value => {
+        expect(value).to.be.a('object').that.has.all.keys(
+          'ad', 'cpm', 'creativeId', 'currency', 'height', 'mediaType', 'meta', 'netRevenue', 'requestId', 'ttl', 'width', 'dealId'
+        )
+      })
+    });
+
+    it('should return a valid bid array with a banner bid', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_VIDEO)
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(1)
+      interpreted.forEach(value => {
+        expect(value).to.be.a('object').that.has.all.keys(
+          'vastUrl', 'cpm', 'creativeId', 'currency', 'height', 'mediaType', 'meta', 'netRevenue', 'requestId', 'ttl', 'width', 'dealId'
+        )
+      })
+    });
+
+    it('should return a valid bid array with netRevenue', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_BANNER)
+      response.body.bid[0].isNet = true
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(1)
+      expect(interpreted[0].netRevenue).to.be.true
+    });
+
+    it('should return an empty bid array if one of seatbid entry is missing price property', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_BANNER)
+      delete response.body.bid[0].price
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(0)
+    });
+
+    it('should return an empty bid array if one of seatbid entry is missing adm property', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_BANNER)
+      delete response.body.bid[0].adm
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(0)
+    });
+  })
+
+  describe('onBidWon', () => {
+    it(`should exists and type function`, function () {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function')
+    });
+
+    it(`should send a valid bid won notice`, function () {
+      spec.onBidWon(WIN_NOTICE);
+      // server.respondWith('POST', WIN_EVENT_URL, [
+      //   400, {'Content-Type': 'application/json'}, )
+      // ]);
+      expect(server.requests.length).to.equal(1);
+    });
+  });
+
+  describe('onBidderError', () => {
+    it(`should exists and type function`, function () {
+      expect(spec.onBidderError).to.exist.and.to.be.a('function')
+    });
+
+    it(`should send a valid error notice`, function () {
+      spec.onBidderError({ bidderRequest: ERROR_NOTICE })
+      expect(server.requests.length).to.equal(1);
+      const body = JSON.parse(server.requests[0].requestBody)
+      expect(body).to.be.a('object').that.has.all.keys('message', 'auctionId', 'bidderRequestId', 'url', 'metrics')
+      // const { bids } = JSON.parse(server.requests[0].requestBody)
+      // expect(bids).to.be.a('array').that.has.lengthOf(1)
+      // _each(bids, (bid) => {
+      //   expect(bid).to.be.a('object').that.has.all.keys('adUnitCode', 'auctionId', 'bidId', 'bidderRequestId', 'transactionId', 'metrics')
+      // })
+    });
+  });
+
+  describe('setEndPoints', () => {
+    it(`should exists and type function`, function () {
+      expect(setEndPoints).to.exist.and.to.be.a('function')
+    });
+
+    it(`should not modify default endpoints`, function () {
+      const endpoints = setEndPoints()
+      const requestURL = new URL(endpoints.request)
+      const winNoticeURL = new URL(endpoints.notice.win)
+      const timeoutNoticeURL = new URL(endpoints.notice.timeout)
+      const errorNoticeURL = new URL(endpoints.notice.error)
+
+      expect(requestURL.host).to.equal('zero.aidemsrv.com')
+      expect(winNoticeURL.host).to.equal('zero.aidemsrv.com')
+      expect(timeoutNoticeURL.host).to.equal('zero.aidemsrv.com')
+      expect(errorNoticeURL.host).to.equal('zero.aidemsrv.com')
+
+      expect(decodeURIComponent(requestURL.pathname)).to.equal('/bid/request')
+      expect(decodeURIComponent(winNoticeURL.pathname)).to.equal('/notice/win')
+      expect(decodeURIComponent(timeoutNoticeURL.pathname)).to.equal('/notice/timeout')
+      expect(decodeURIComponent(errorNoticeURL.pathname)).to.equal('/notice/error')
+    });
+
+    it(`should not change request endpoint`, function () {
+      const endpoints = setEndPoints('default')
+      const requestURL = new URL(endpoints.request)
+      expect(decodeURIComponent(requestURL.pathname)).to.equal('/bid/request')
+    });
+
+    it(`should change to local env`, function () {
+      const endpoints = setEndPoints('local')
+      const requestURL = new URL(endpoints.request)
+      const winNoticeURL = new URL(endpoints.notice.win)
+      const timeoutNoticeURL = new URL(endpoints.notice.timeout)
+      const errorNoticeURL = new URL(endpoints.notice.error)
+
+      expect(requestURL.host).to.equal('127.0.0.1:8787')
+      expect(winNoticeURL.host).to.equal('127.0.0.1:8787')
+      expect(timeoutNoticeURL.host).to.equal('127.0.0.1:8787')
+      expect(errorNoticeURL.host).to.equal('127.0.0.1:8787')
+    });
+
+    it(`should add a path prefix`, function () {
+      const endpoints = setEndPoints('local', '/path')
+      const requestURL = new URL(endpoints.request)
+      const winNoticeURL = new URL(endpoints.notice.win)
+      const timeoutNoticeURL = new URL(endpoints.notice.timeout)
+      const errorNoticeURL = new URL(endpoints.notice.error)
+
+      expect(decodeURIComponent(requestURL.pathname)).to.equal('/path/bid/request')
+      expect(decodeURIComponent(winNoticeURL.pathname)).to.equal('/path/notice/win')
+      expect(decodeURIComponent(timeoutNoticeURL.pathname)).to.equal('/path/notice/timeout')
+      expect(decodeURIComponent(errorNoticeURL.pathname)).to.equal('/path/notice/error')
+    });
+
+    it(`should add a path prefix and change request endpoint`, function () {
+      const endpoints = setEndPoints('local', '/path')
+      const requestURL = new URL(endpoints.request)
+      const winNoticeURL = new URL(endpoints.notice.win)
+      const timeoutNoticeURL = new URL(endpoints.notice.timeout)
+      const errorNoticeURL = new URL(endpoints.notice.error)
+
+      expect(decodeURIComponent(requestURL.pathname)).to.equal('/path/bid/request')
+      expect(decodeURIComponent(winNoticeURL.pathname)).to.equal('/path/notice/win')
+      expect(decodeURIComponent(timeoutNoticeURL.pathname)).to.equal('/path/notice/timeout')
+      expect(decodeURIComponent(errorNoticeURL.pathname)).to.equal('/path/notice/error')
+    });
+  });
+
+  describe('config', () => {
+    beforeEach(() => {
+      config.setConfig({
+        aidem: {
+          env: 'main'
+        }
+      });
+    })
+
+    it(`should not override default endpoints`, function () {
+      config.setConfig({
+        aidem: {
+          env: 'unknown',
+          path: '/test'
+        }
+      });
+      const { url } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const requestURL = new URL(url)
+      expect(requestURL.host).to.equal('zero.aidemsrv.com')
+    });
+
+    it(`should set local endpoints`, function () {
+      config.setConfig({
+        aidem: {
+          env: 'local',
+          path: '/test'
+        }
+      });
+      const { url } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const requestURL = new URL(url)
+      expect(requestURL.host).to.equal('127.0.0.1:8787')
+    });
+
+    it(`should set coppa`, function () {
+      config.setConfig({
+        coppa: true
+      });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const request = JSON.parse(data)
+      expect(request.regs.coppa_applies).to.equal(true)
+    });
+
+    it(`should set gdpr to true`, function () {
+      config.setConfig({
+        consentManagement: {
+          gdpr: {
+            // any data here set gdpr to true
+          },
+        }
+      });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const request = JSON.parse(data)
+      expect(request.regs.gdpr_applies).to.equal(true)
+    });
+
+    it(`should set usp_consent string`, function () {
+      config.setConfig({
+        consentManagement: {
+          usp: {
+            cmpApi: 'static',
+            consentData: {
+              getUSPData: {
+                uspString: '1YYY'
+              }
+            }
+          }
+        }
+      });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const request = JSON.parse(data)
+      expect(request.regs.us_privacy).to.equal('1YYY')
+    });
+
+    it(`should not set usp_consent string`, function () {
+      config.setConfig({
+        consentManagement: {
+          usp: {
+            cmpApi: 'iab',
+            consentData: {
+              getUSPData: {
+                uspString: '1YYY'
+              }
+            }
+          }
+        }
+      });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const request = JSON.parse(data)
+      expect(request.regs.us_privacy).to.undefined
+    });
+  });
+});
diff --git a/test/spec/modules/airgridRtdProvider_spec.js b/test/spec/modules/airgridRtdProvider_spec.js
new file mode 100644
index 00000000000..5b1df6f9d4c
--- /dev/null
+++ b/test/spec/modules/airgridRtdProvider_spec.js
@@ -0,0 +1,135 @@
+import { config } from 'src/config.js';
+import { deepAccess } from 'src/utils.js';
+import { getAdUnits } from '../../fixtures/fixtures.js';
+import * as agRTD from 'modules/airgridRtdProvider.js';
+
+const MATCHED_AUDIENCES = ['travel', 'sport'];
+const RTD_CONFIG = {
+  auctionDelay: 250,
+  dataProviders: [
+    {
+      name: 'airgrid',
+      waitForIt: true,
+      params: {
+        apiKey: 'key123',
+        accountId: 'sdk',
+        publisherId: 'pub123',
+        bidders: ['pubmatic'],
+      },
+    },
+  ],
+};
+
+describe('airgrid RTD Submodule', function () {
+  let getDataFromLocalStorageStub;
+
+  beforeEach(function () {
+    config.resetConfig();
+    getDataFromLocalStorageStub = sinon.stub(
+      agRTD.storage,
+      'getDataFromLocalStorage'
+    );
+  });
+
+  afterEach(function () {
+    getDataFromLocalStorageStub.restore();
+  });
+
+  describe('Initialise module', function () {
+    it('should initalise and return true', function () {
+      expect(agRTD.airgridSubmodule.init(RTD_CONFIG.dataProviders[0])).to.equal(
+        true
+      );
+    });
+
+    it('should attach script to DOM with correct config', function () {
+      agRTD.attachScriptTagToDOM(RTD_CONFIG);
+      expect(window.edktInitializor.invoked).to.be.true;
+      expect(window.edktInitializor.apiKey).to.equal(
+        RTD_CONFIG.dataProviders[0].params.apiKey
+      );
+      expect(window.edktInitializor.accountId).to.equal(
+        RTD_CONFIG.dataProviders[0].params.accountId
+      );
+      expect(window.edktInitializor.publisherId).to.equal(
+        RTD_CONFIG.dataProviders[0].params.publisherId
+      );
+    });
+  });
+
+  describe('Get matched audiences', function () {
+    it('gets matched audiences from local storage', function () {
+      getDataFromLocalStorageStub
+        .withArgs(agRTD.AG_AUDIENCE_IDS_KEY)
+        .returns(JSON.stringify(MATCHED_AUDIENCES));
+
+      const audiences = agRTD.getMatchedAudiencesFromStorage();
+      expect(audiences).to.have.members(MATCHED_AUDIENCES);
+    });
+  });
+
+  describe('Add matched audiences', function () {
+    it('merges matched audiences on appnexus AdUnits', function () {
+      const adUnits = getAdUnits();
+      getDataFromLocalStorageStub
+        .withArgs(agRTD.AG_AUDIENCE_IDS_KEY)
+        .returns(JSON.stringify(MATCHED_AUDIENCES));
+      agRTD.passAudiencesToBidders({ adUnits }, () => {}, {}, {});
+
+      adUnits.forEach((adUnit) => {
+        adUnit.bids.forEach((bid) => {
+          const { bidder, params } = bid;
+          if (bidder === 'appnexus') {
+            expect(deepAccess(params, 'keywords.perid')).to.eql(
+              MATCHED_AUDIENCES
+            );
+          }
+        });
+      });
+    });
+
+    it('does not merge audiences on appnexus adunits, since none are matched', function () {
+      const adUnits = getAdUnits();
+      getDataFromLocalStorageStub
+        .withArgs(agRTD.AG_AUDIENCE_IDS_KEY)
+        .returns(undefined);
+      agRTD.passAudiencesToBidders({ adUnits }, () => {}, {}, {});
+
+      adUnits.forEach((adUnit) => {
+        adUnit.bids.forEach((bid) => {
+          const { bidder, params } = bid;
+          if (bidder === 'appnexus') {
+            expect(deepAccess(params, 'keywords.perid')).to.be.undefined;
+          }
+        });
+      });
+    });
+
+    it('sets bidder specific ORTB2 config', function () {
+      getDataFromLocalStorageStub
+        .withArgs(agRTD.AG_AUDIENCE_IDS_KEY)
+        .returns(JSON.stringify(MATCHED_AUDIENCES));
+      const audiences = agRTD.getMatchedAudiencesFromStorage();
+      const bidderOrtb2 = agRTD.getAudiencesAsBidderOrtb2(RTD_CONFIG.dataProviders[0], audiences);
+
+      const bidders = RTD_CONFIG.dataProviders[0].params.bidders;
+      Object.keys(bidderOrtb2).forEach((bidder) => {
+        if (bidders.indexOf(bidder) === -1) return;
+        expect(deepAccess(bidderOrtb2[bidder], 'ortb2.user.ext.data.airgrid')).to.eql(MATCHED_AUDIENCES);
+      });
+    });
+
+    it('sets audiences using appnexus auction level keywords', function () {
+      getDataFromLocalStorageStub
+        .withArgs(agRTD.AG_AUDIENCE_IDS_KEY)
+        .returns(JSON.stringify(MATCHED_AUDIENCES));
+      const audiences = agRTD.getMatchedAudiencesFromStorage();
+      agRTD.setAudiencesUsingAppNexusAuctionKeywords(audiences);
+
+      const bidderConfig = config.getConfig();
+      expect(deepAccess(bidderConfig, 'appnexusAuctionKeywords.perid')).to.eql(
+        MATCHED_AUDIENCES
+      );
+    });
+  });
+});
diff --git a/test/spec/modules/ajaBidAdapter_spec.js b/test/spec/modules/ajaBidAdapter_spec.js
index 80ecab764e8..a2095d52857 100644
--- a/test/spec/modules/ajaBidAdapter_spec.js
+++ b/test/spec/modules/ajaBidAdapter_spec.js
@@ -34,23 +34,23 @@ describe('AjaAdapter', function () {
   });
 
   describe('buildRequests', function () {
-    let bidRequests = [
+    const bidRequests = [
       {
-        'bidder': 'aja',
-        'params': {
-          'asi': '123456'
+        bidder: 'aja',
+        params: {
+          asi: '123456'
         },
-        'adUnitCode': 'adunit',
-        'sizes': [[300, 250]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        adUnitCode: 'adunit',
+        sizes: [[300, 250]],
+        bidId: '30b31c1838de1e',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
       }
     ];
 
-    let bidderRequest = {
+    const bidderRequest = {
       refererInfo: {
-        referer: 'https://hoge.com'
+        page: 'https://hoge.com'
       }
     };
 
@@ -62,6 +62,44 @@ describe('AjaAdapter', function () {
     });
   });
 
+  describe('buildRequests with UserModule', function () {
+    const bidRequests = [
+      {
+        bidder: 'aja',
+        params: {
+          asi: '123456'
+        },
+        adUnitCode: 'adunit',
+        sizes: [[300, 250]],
+        bidId: '30b31c1838de1e',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+        userIdAsEids: [
+          {
+            source: 'pubcid.org',
+            uids: [{
+              id: 'some-random-id-value',
+              atype: 1
+            }]
+          }
+        ]
+      }
+    ];
+
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://hoge.com'
+      }
+    };
+
+    it('sends bid request to ENDPOINT via GET', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].url).to.equal(ENDPOINT);
+      expect(requests[0].method).to.equal('GET');
+      expect(requests[0].data).to.equal('asi=123456&skt=5&prebid_id=30b31c1838de1e&prebid_ver=$prebid.version$&page_url=https%3A%2F%2Fhoge.com&eids=%7B%22eids%22%3A%5B%7B%22source%22%3A%22pubcid.org%22%2C%22uids%22%3A%5B%7B%22id%22%3A%22some-random-id-value%22%2C%22atype%22%3A1%7D%5D%7D%5D%7D&');
+    });
+  });
+
   describe('interpretResponse', function () {
     it('should get correct banner bid response', function () {
       let response = {
@@ -78,8 +116,11 @@ describe('AjaAdapter', function () {
             'tag': '<div></div>',
             'imps': [
               'https://as.amanad.adtdp.com/v1/imp'
+            ],
+            'adomain': [
+              'www.example.com'
             ]
-          }
+          },
         },
         'syncs': [
           'https://example.com'
@@ -98,7 +139,12 @@ describe('AjaAdapter', function () {
           'mediaType': 'banner',
           'currency': 'USD',
           'ttl': 300,
-          'netRevenue': true
+          'netRevenue': true,
+          'meta': {
+            'advertiserDomains': [
+              'www.example.com'
+            ]
+          }
         }
       ];
 
@@ -123,7 +169,10 @@ describe('AjaAdapter', function () {
             'purl': 'https://cdn/player',
             'progress': true,
             'loop': false,
-            'inread': false
+            'inread': false,
+            'adomain': [
+              'www.example.com'
+            ]
           }
         },
         'syncs': [
@@ -178,7 +227,10 @@ describe('AjaAdapter', function () {
                     'https://example.com/inview'
                   ],
                   'jstracker': '',
-                  'disable_trimming': false
+                  'disable_trimming': false,
+                  'adomain': [
+                    'www.example.com'
+                  ]
                 }
               ]
             }
@@ -218,7 +270,12 @@ describe('AjaAdapter', function () {
             'impressionTrackers': [
               'https://example.com/imp'
             ],
-            'privacyLink': 'https://aja-kk.co.jp/optout',
+            'privacyLink': 'https://aja-kk.co.jp/optout'
+          },
+          'meta': {
+            'advertiserDomains': [
+              'www.example.com'
+            ]
           }
         }
       ];
diff --git a/test/spec/modules/akamaiDapRtdProvider_spec.js b/test/spec/modules/akamaiDapRtdProvider_spec.js
new file mode 100644
index 00000000000..337fcf57a33
--- /dev/null
+++ b/test/spec/modules/akamaiDapRtdProvider_spec.js
@@ -0,0 +1,600 @@
+import {config} from 'src/config.js';
+import {
+  dapUtils,
+  generateRealTimeData,
+  akamaiDapRtdSubmodule,
+  storage, DAP_MAX_RETRY_TOKENIZE, DAP_SS_ID, DAP_TOKEN, DAP_MEMBERSHIP, DAP_ENCRYPTED_MEMBERSHIP
+} from 'modules/akamaiDapRtdProvider.js';
+import {server} from 'test/mocks/xhr.js';
+import {hook} from '../../../src/hook.js';
+const responseHeader = {'Content-Type': 'application/json'};
+
+describe('akamaiDapRtdProvider', function() {
+  const testReqBidsConfigObj = {
+    adUnits: [
+      {
+        bids: ['bid1', 'bid2']
+      }
+    ]
+  };
+
+  const onDone = function() { return true };
+
+  const sampleGdprConsentConfig = {
+    'gdpr': {
+      'consentString': null,
+      'vendorData': {},
+      'gdprApplies': true
+    }
+  };
+
+  const sampleUspConsentConfig = {
+    'usp': '1YYY'
+  };
+
+  const sampleIdentity = {
+    type: 'dap-signature:1.0.0'
+  };
+
+  const cmoduleConfig = {
+    'name': 'dap',
+    'waitForIt': true,
+    'params': {
+      'apiHostname': 'prebid.dap.akadns.net',
+      'apiVersion': 'x1',
+      'domain': 'prebid.org',
+      'identityType': 'dap-signature:1.0.0',
+      'segtax': 503
+    }
+  }
+
+  const emoduleConfig = {
+    'name': 'dap',
+    'waitForIt': true,
+    'params': {
+      'apiHostname': 'prebid.dap.akadns.net',
+      'apiVersion': 'x1',
+      'domain': 'prebid.org',
+      'identityType': 'dap-signature:1.0.0',
+      'segtax': 504
+    }
+  }
+
+  const sampleConfig = {
+    'api_hostname': 'prebid.dap.akadns.net',
+    'api_version': 'x1',
+    'domain': 'prebid.org',
+    'segtax': 503,
+    'identity': sampleIdentity
+  }
+
+  const esampleConfig = {
+    'api_hostname': 'prebid.dap.akadns.net',
+    'api_version': 'x1',
+    'domain': 'prebid.org',
+    'segtax': 504,
+    'identity': sampleIdentity
+  }
+  let cacheExpiry = Math.round(Date.now() / 1000.0) + 300; // in seconds
+  const sampleCachedToken = {'expires_at': cacheExpiry, 'token': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..6buzBd2BjtgoyaNbHN8YnQ.l38avCfm3sYNy798-ETYOugz0cOx1cCkjACkAhYszxzrZ0sUJ0AiF-NdDXVTiTyp2Ih3vCWKzS0rKJ8lbS1zhyEVWVu91QwtwseM2fBbwA5ggAgBEo5wV-IXqDLPxVnxsPF0D3hP6cNCiH9Q2c-vULfsLhMhG5zvvZDPBbn4hUY5fKB8LoCBTF9rbuuWGYK1nramnb4AlS5UK82wBsHQea1Ou_Kp5wWCMNZ6TZk5qKIuRBfPIAhQblWvHECaHXkg1wyoM9VASs_yNhne7RR-qkwzbFiPFiMJibNOt9hF3_vPDJO5-06ZBjRTP1BllYGWxI-uQX6InzN18Wtun2WHqg.63sH0SNlIRcsK57v0pMujfB_nhU8Y5CuQbsHqH5MGoM'};
+  const cachedEncryptedMembership = {'expires_at': cacheExpiry, 'encryptedSegments': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoic29tZXNlY3JldGludmF1bHQifQ..IvnIUQDqWBVYIS0gbcE9bw.Z4NZGvtogWaWlGH4e-GdYKe_PUc15M2x3Bj85rMWsN1A17mIxQIMOfg2hsQ2tgieLu5LggWPmsFu1Wbph6P0k3kOu1dVReoIhOHzxw50rP0DLHKaEZ5mLMJ7Lcosvwh4miIfFuCHlsX7J0sFgOTAp0zGo1S_UsHLtev1JflhjoSB0AoX95ALbAnyctirPuLJM8gZ1vXTiZ01jpvucGyR1lM4cWjPOeD8jPtgwaPGgSRZXE-3X2Cqy7z4Giam5Uqu74LPWTBuKtUQTGyAXA5QJoP7xwTbsU4O1f69lu3fWNqC92GijeTH1A4Zd_C-WXxWuQlDEURjlkWQoaqTHka2OqlnwukEQIf_v0r5KQQX64CTLhEUH91jeD0-E9ClcIP7pwOLxxqiKoaBmx8Mrnm_6Agj5DtTA1rusy3AL63sI_rsUxrmLrVt0Wft4aCfRkW8QpQxu8clFdOmce0NNCGeBCyCPVw9d9izrILlXJ6rItU2cpFrcbz8uw2otamF5eOFCOY3IzHedWVNNuKHFIUVC_xYSlsYvQ8f2QIP1eiMbmukcuPzmTzjw1h1_7IKaj-jJkXrnrY-TdDgX_4-_Z3rmbpXK2yTR7dBrsg-ubqFbgbKic1b4zlQEO_LbBlgPl3DYdWEuJ8CY2NUt1GfpATQGsufS2FTY1YGw_gkPe3q04l_cgLafDoxHvHh_t_0ZgPjciW82gThB_kN4RP7Mc3krVcXl_P6N1VbV07xyx0hCyVsrrxbLslI8q9wYDiLGci7mNmByM5j7SXV9jPwwPkHtn0HfMJlw2PFbIDPjgG3h7sOyLcBIJTTvuUIgpHPIkRWLIl_4FlIucXbJ7orW2nt5BWleBVHgumzGcnl9ZNcZb3W-dsdYPSOmuj0CY28MRTP2oJ1rzLInbDDpIRffJBtR7SS4nYyy7Vi09PtBigod5YNz1Q0WDSJxr8zeH_aKFaXInw7Bfo_U0IAcLiRgcT0ogsMLeQRjRFy27mr4XNJv3NtHhbdjDAwF2aClCktXyXbQaVdsPH2W71v6m2Q9rB5GQWOktw2s5f-4N1-_EBPGq6TgjF-aJZP22MJVwp1pimT50DfOzoeEqDwi862NNwNNoHmcObH0ZfwAXlhRxsgupNBe20-MNNABj2Phlfv4DUrtQbMdfCnNiypzNCmoTb7G7c_o5_JUwoV_GVkwUtvmi_IUm05P4GeMASSUw8zDKVRAj9h31C2cabM8RjMHGhkbCWpUP2pcz9zlJ7Y76Dh3RLnctfTw7DG9U4w4UlaxNZOgLUiSrGwfyapuSiuGUpuOJkBBLiHmEqAGI5C8oJpcVRccNlHxJAYowgXyFopD5Fr-FkXmv8KMkS0h5C9F6KihmDt5sqDD0qnjM0hHJgq01l7wjVnhEmPpyD-6auFQ-xDnbh1uBOJ_0gCVbRad--FSa5p-dXenggegRxOvZXJ0iAtM6Fal5Og-RCjexIHa9WhVbXhQBJpkSTWwAajZJ64eQ.yih49XB51wE-Xob7COT9OYqBrzBmIMVCQbLFx2UdzkI'};
+  const cachedMembership = {'expires_at': cacheExpiry, 'said': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..QwvU5h0NVJYaJbs5EqWCKA.XNaJHSlnsH8P-yBIr3gIEqavLONWDIFyj7QCHFwJVkwXH_EYkxrk0_26b0uMPzfJp5URnqxKZusMH9DzEJsmj8EMrKQv1y3IYYMsW5_0BdP5bcAWfG6fzOqtMOwLiYRkYiQOqn1ZVGzhovheHWEmNr2_oCY0LvAr3iN1eG_K-l-bBKvBWnwvuuGKquUfCqO8NMMq6wtkecEXM9blqFRZ7oNYmW2aIG7qcHUsrUW7HMr9Ev2Ik0sIeEUsOYrgf_X_VA64RgKSTRugS9FupMv1p54JkHokwduF9pOFmW8QLQi8itFogKGbbgvOTNnmahxQUX5FcrjjYLqHwKqC8htLdlHnO5LWU9l4A7vLXrRurvoSnh0cAJy0GsdoyEwTqR9bwVFHoPquxlJjQ4buEd7PIxpBj9Qg9oOPH3b2upbMTu5CQ9oj526eXPhP5G54nwGklm2AZ3Vggd7jCQJn45Jjiq0iIfsXAtpqS2BssCLBN8WhmUTnStK8m5sux6WUBdrpDESQjPj-EEHVS-DB5rA7icRUh6EzRxzen2rndvHvnwVhSG_l6cwPYuJ0HE0KBmYHOoqNpKwzoGiKFHrf4ReA06iWB3V2TEGJucGujhtQ9_18WwHCeJ1XtQiiO1eqa3tp5MwAbFXawVFl3FFOBgadrPyvGmkmUJ6FCLU2MSwHiYZmANMnJsokFX_6DwoAgO3U_QnvEHIVSvefc7ReeJ8fBDdmrH3LtuLrUpXsvLvEIMQdWQ_SXhjKIi7tOODR8CfrhUcdIjsp3PZs1DpuOcDB6YJKbGnKZTluLUJi3TyHgyi-DHXdTm-jSE5i_DYJGW-t2Gf23FoQhexv4q7gdrfsKfcRJNrZLp6Gd6jl4zHhUtY.nprKBsy9taQBk6dCPbA7BFF0CiGhQOEF_MazZ2bedqk', 'cohorts': ['9', '11', '13']};
+  const rtdUserObj = {
+    name: 'www.dataprovider3.com',
+    ext: {
+      taxonomyname: 'iab_audience_taxonomy'
+    },
+    segment: [
+      {
+        id: '1918'
+      },
+      {
+        id: '1939'
+      }
+    ]
+  };
+
+  const encRtdUserObj = {
+    name: 'www.dataprovider3.com',
+    ext: {
+      segtax: 504,
+      taxonomyname: 'iab_audience_taxonomy'
+    },
+    segment: []
+  };
+
+  const cachedRtd = {
+    rtd: {
+      ortb2: {
+        user: {
+          data: [rtdUserObj]
+        }
+      }
+    }
+  };
+
+  let membership = {
+    said: cachedMembership.said,
+    cohorts: cachedMembership.cohorts,
+    attributes: null
+  };
+  let encMembership = {
+    encryptedSegments: cachedEncryptedMembership.encryptedSegments
+  };
+  encRtdUserObj.segment.push({ id: encMembership.encryptedSegments });
+  const cachedEncRtd = {
+    rtd: {
+      ortb2: {
+        user: {
+          data: [encRtdUserObj]
+        }
+      }
+    }
+  };
+
+  before(() => {
+    hook.ready();
+  });
+
+  let ortb2, bidConfig;
+
+  beforeEach(function() {
+    bidConfig = {ortb2Fragments: {}};
+    ortb2 = bidConfig.ortb2Fragments.global = {};
+    config.resetConfig();
+    storage.removeDataFromLocalStorage(DAP_TOKEN);
+    storage.removeDataFromLocalStorage(DAP_MEMBERSHIP);
+    storage.removeDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP);
+    storage.removeDataFromLocalStorage(DAP_SS_ID);
+  });
+
+  afterEach(function () {
+  });
+
+  describe('akamaiDapRtdSubmodule', function() {
+    it('successfully instantiates', function () {
+      expect(akamaiDapRtdSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Get Real-Time Data', function() {
+    it('gets rtd from local storage cache', function() {
+      let dapGetMembershipFromLocalStorageStub = sinon.stub(dapUtils, 'dapGetMembershipFromLocalStorage').returns(membership)
+      let dapGetRtdObjStub = sinon.stub(dapUtils, 'dapGetRtdObj').returns(cachedRtd)
+      let dapGetEncryptedMembershipFromLocalStorageStub = sinon.stub(dapUtils, 'dapGetEncryptedMembershipFromLocalStorage').returns(encMembership)
+      let dapGetEncryptedRtdObjStub = sinon.stub(dapUtils, 'dapGetEncryptedRtdObj').returns(cachedEncRtd)
+      let callDapApisStub = sinon.stub(dapUtils, 'callDapAPIs')
+      try {
+        storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+        expect(ortb2).to.eql({});
+        generateRealTimeData(bidConfig, () => {}, emoduleConfig, {});
+
+        expect(ortb2.user.data).to.deep.include.members([encRtdUserObj]);
+        generateRealTimeData(bidConfig, () => {}, cmoduleConfig, {});
+        expect(ortb2.user.data).to.deep.include.members([rtdUserObj]);
+      } finally {
+        dapGetRtdObjStub.restore()
+        dapGetMembershipFromLocalStorageStub.restore()
+        dapGetEncryptedRtdObjStub.restore()
+        dapGetEncryptedMembershipFromLocalStorageStub.restore()
+        callDapApisStub.restore()
+      }
+    });
+  });
+
+  describe('calling DAP APIs', function() {
+    it('Calls callDapAPIs for unencrypted segments flow', function() {
+      storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+      let dapExtractExpiryFromTokenStub = sinon.stub(dapUtils, 'dapExtractExpiryFromToken').returns(cacheExpiry)
+      try {
+        expect(ortb2).to.eql({});
+        dapUtils.callDapAPIs(bidConfig, () => {}, cmoduleConfig, {});
+        let membership = {'cohorts': ['9', '11', '13'], 'said': 'sample-said'}
+        let membershipRequest = server.requests[0];
+        membershipRequest.respond(200, responseHeader, JSON.stringify(membership));
+        let tokenWithExpiry = 'Sample-token-with-exp'
+        let tokenizeRequest = server.requests[1];
+        responseHeader['Akamai-DAP-Token'] = tokenWithExpiry;
+        tokenizeRequest.respond(200, responseHeader, JSON.stringify(tokenWithExpiry));
+        let data = dapUtils.dapGetRtdObj(membership, cmoduleConfig.params.segtax);
+        expect(ortb2.user.data).to.deep.include.members(data.rtd.ortb2.user.data);
+      } finally {
+        dapExtractExpiryFromTokenStub.restore();
+      }
+    });
+
+    it('Calls callDapAPIs for encrypted segments flow', function() {
+      storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+      let dapExtractExpiryFromTokenStub = sinon.stub(dapUtils, 'dapExtractExpiryFromToken').returns(cacheExpiry)
+      try {
+        expect(ortb2).to.eql({});
+        dapUtils.callDapAPIs(bidConfig, () => {}, emoduleConfig, {});
+        let encMembership = 'Sample-enc-token';
+        let membershipRequest = server.requests[0];
+        responseHeader['Akamai-DAP-Token'] = encMembership;
+        membershipRequest.respond(200, responseHeader, JSON.stringify(encMembership));
+        let tokenWithExpiry = 'Sample-token-with-exp'
+        let tokenizeRequest = server.requests[1];
+        responseHeader['Akamai-DAP-Token'] = tokenWithExpiry;
+        tokenizeRequest.respond(200, responseHeader, JSON.stringify(tokenWithExpiry));
+        let data = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, emoduleConfig.params.segtax);
+        expect(ortb2.user.data).to.deep.include.members(data.rtd.ortb2.user.data);
+      } finally {
+        dapExtractExpiryFromTokenStub.restore();
+      }
+    });
+  });
+
+  describe('dapTokenize', function () {
+    it('dapTokenize error callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(sampleConfig));
+      let submoduleCallback = dapUtils.dapTokenize(configAsync, sampleIdentity, onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(400, responseHeader, JSON.stringify('error'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+
+    it('dapTokenize success callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(sampleConfig));
+      let submoduleCallback = dapUtils.dapTokenize(configAsync, sampleIdentity, onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify('success'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+  });
+
+  describe('dapTokenize and dapMembership incorrect params', function () {
+    it('Onerror and config are null', function () {
+      expect(dapUtils.dapTokenize(null, 'identity', onDone, null, null)).to.be.equal(undefined);
+      expect(dapUtils.dapMembership(null, 'identity', onDone, null, null)).to.be.equal(undefined);
+      expect(dapUtils.dapEncryptedMembership(null, 'identity', onDone, null, null)).to.be.equal(undefined);
+      const config = {
+        'api_hostname': 'prebid.dap.akadns.net',
+        'api_version': 1,
+        'domain': '',
+        'segtax': 503
+      };
+      const encConfig = {
+        'api_hostname': 'prebid.dap.akadns.net',
+        'api_version': 1,
+        'domain': '',
+        'segtax': 504
+      };
+      let identity = {
+        type: 'dap-signature:1.0.0'
+      };
+      expect(dapUtils.dapTokenize(config, identity, onDone, null, null)).to.be.equal(undefined);
+      expect(dapUtils.dapMembership(config, 'token', onDone, null, null)).to.be.equal(undefined);
+      expect(dapUtils.dapEncryptedMembership(encConfig, 'token', onDone, null, null)).to.be.equal(undefined);
+    });
+  });
+
+  describe('Getting dapTokenize, dapMembership and dapEncryptedMembership from localstorage', function () {
+    it('dapGetTokenFromLocalStorage success', function () {
+      storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+      expect(dapUtils.dapGetTokenFromLocalStorage(60)).to.be.equal(sampleCachedToken.token);
+    });
+
+    it('dapGetMembershipFromLocalStorage success', function () {
+      storage.setDataInLocalStorage(DAP_MEMBERSHIP, JSON.stringify(cachedMembership));
+      expect(JSON.stringify(dapUtils.dapGetMembershipFromLocalStorage())).to.be.equal(JSON.stringify(membership));
+    });
+
+    it('dapGetEncryptedMembershipFromLocalStorage success', function () {
+      storage.setDataInLocalStorage(DAP_ENCRYPTED_MEMBERSHIP, JSON.stringify(cachedEncryptedMembership));
+      expect(JSON.stringify(dapUtils.dapGetEncryptedMembershipFromLocalStorage())).to.be.equal(JSON.stringify(encMembership));
+    });
+  });
+
+  describe('dapMembership', function () {
+    it('dapMembership success callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(sampleConfig));
+      let submoduleCallback = dapUtils.dapMembership(configAsync, 'token', onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify('success'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+
+    it('dapMembership error callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(sampleConfig));
+      let submoduleCallback = dapUtils.dapMembership(configAsync, 'token', onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(400, responseHeader, JSON.stringify('error'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+  });
+
+  describe('dapEncMembership', function () {
+    it('dapEncMembership success callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(esampleConfig));
+      let submoduleCallback = dapUtils.dapEncryptedMembership(configAsync, 'token', onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify('success'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+
+    it('dapEncMembership error callback', function () {
+      let configAsync = JSON.parse(JSON.stringify(esampleConfig));
+      let submoduleCallback = dapUtils.dapEncryptedMembership(configAsync, 'token', onDone,
+        function(token, status, xhr, onDone) {
+        },
+        function(xhr, status, error, onDone) {
+        }
+      );
+      let request = server.requests[0];
+      request.respond(400, responseHeader, JSON.stringify('error'));
+      expect(submoduleCallback).to.equal(undefined);
+    });
+  });
+
+  describe('dapMembership', function () {
+    it('should invoke the getDapToken and getDapMembership', function () {
+      let membership = {
+        said: 'item.said1',
+        cohorts: 'item.cohorts',
+        attributes: null
+      };
+
+      let getDapMembershipStub = sinon.stub(dapUtils, 'dapGetMembershipFromLocalStorage').returns(membership);
+      let callDapApisStub = sinon.stub(dapUtils, 'callDapAPIs');
+      try {
+        generateRealTimeData(testReqBidsConfigObj, onDone, cmoduleConfig);
+        expect(getDapMembershipStub.calledOnce).to.be.equal(true);
+      } finally {
+        getDapMembershipStub.restore();
+        callDapApisStub.restore();
+      }
+    });
+  });
+
+  describe('dapEncMembership test', function () {
+    it('should invoke the getDapToken and getEncDapMembership', function () {
+      let encMembership = {
+        encryptedSegments: 'enc.seg',
+      };
+
+      let getDapEncMembershipStub = sinon.stub(dapUtils, 'dapGetEncryptedMembershipFromLocalStorage').returns(encMembership);
+      let callDapApisStub = sinon.stub(dapUtils, 'callDapAPIs');
+      try {
+        generateRealTimeData(testReqBidsConfigObj, onDone, emoduleConfig);
+        expect(getDapEncMembershipStub.calledOnce).to.be.equal(true);
+      } finally {
+        getDapEncMembershipStub.restore();
+        callDapApisStub.restore();
+      }
+    });
+  });
+
+  describe('dapGetRtdObj test', function () {
+    it('dapGetRtdObj', function () {
+      const config = {
+        apiHostname: 'prebid.dap.akadns.net',
+        apiVersion: 'x1',
+        domain: 'prebid.org',
+        segtax: 503
+      };
+      expect(dapUtils.dapRefreshMembership(ortb2, config, 'token', onDone)).to.equal(undefined)
+      const membership = {cohorts: ['1', '5', '7']}
+      expect(dapUtils.dapGetRtdObj(membership, config.segtax)).to.not.equal(undefined);
+    });
+  });
+
+  describe('checkAndAddRealtimeData test', function () {
+    it('add realtime data for segtax 503 and 504', function () {
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedEncRtd, 504);
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedEncRtd, 504);
+      expect(ortb2.user.data).to.deep.include.members([encRtdUserObj]);
+      dapUtils.checkAndAddRealtimeData(ortb2, cachedRtd, 503);
+      expect(ortb2.user.data).to.deep.include.members([rtdUserObj]);
+    });
+  });
+
+  describe('dapExtractExpiryFromToken test', function () {
+    it('test dapExtractExpiryFromToken function', function () {
+      let tokenWithoutExpiry = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..6buzBd2BjtgoyaNbHN8YnQ.l38avCfm3sYNy798-ETYOugz0cOx1cCkjACkAhYszxzrZ0sUJ0AiF-NdDXVTiTyp2Ih3vCWKzS0rKJ8lbS1zhyEVWVu91QwtwseM2fBbwA5ggAgBEo5wV-IXqDLPxVnxsPF0D3hP6cNCiH9Q2c-vULfsLhMhG5zvvZDPBbn4hUY5fKB8LoCBTF9rbuuWGYK1nramnb4AlS5UK82wBsHQea1Ou_Kp5wWCMNZ6TZk5qKIuRBfPIAhQblWvHECaHXkg1wyoM9VASs_yNhne7RR-qkwzbFiPFiMJibNOt9hF3_vPDJO5-06ZBjRTP1BllYGWxI-uQX6InzN18Wtun2WHqg.63sH0SNlIRcsK57v0pMujfB_nhU8Y5CuQbsHqH5MGoM'
+      expect(dapUtils.dapExtractExpiryFromToken(tokenWithoutExpiry)).to.equal(undefined);
+      let tokenWithExpiry = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIiwiZXhwIjoxNjQzODMwMzY5fQ..hTbcSQgmmO0HUJJrQ5fRHw.7zjrQXNNVkb-GD0ZhIVhEPcWbyaDBilHTWv-bp1lFZ9mdkSC0QbcAvUbYteiTD7ya23GUwcL2WOW8WgRSHaWHOJe0B5NDqfdUGTzElWfu7fFodRxRgGmwG8Rq5xxteFKLLGHLf1mFYRJKDtjtgajGNUKIDfn9AEt-c5Qz4KU8VolG_KzrLROx-f6Z7MnoPTcwRCj0WjXD6j2D6RAZ80-mKTNIsMIELdj6xiabHcjDJ1WzwtwCZSE2y2nMs451pSYp8W-bFPfZmDDwrkjN4s9ASLlIXcXgxK-H0GsiEbckQOZ49zsIKyFtasBvZW8339rrXi1js-aBh99M7aS5w9DmXPpUDmppSPpwkeTfKiqF0cQiAUq8tpeEQrGDJuw3Qt2.XI8h9Xw-VZj_NOmKtV19wLM63S4snos7rzkoHf9FXCw'
+      expect(dapUtils.dapExtractExpiryFromToken(tokenWithExpiry)).to.equal(1643830369);
+    });
+  });
+
+  describe('dapRefreshToken test', function () {
+    it('test dapRefreshToken success response', function () {
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, true, onDone)
+      let request = server.requests[0];
+      responseHeader['Akamai-DAP-Token'] = sampleCachedToken.token;
+      request.respond(200, responseHeader, JSON.stringify(sampleCachedToken.token));
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_TOKEN)).token).to.be.equal(sampleCachedToken.token);
+    });
+
+    it('test dapRefreshToken success response with deviceid 100', function () {
+      dapUtils.dapRefreshToken(ortb2, esampleConfig, true, onDone)
+      let request = server.requests[0];
+      responseHeader['Akamai-DAP-100'] = sampleCachedToken.token;
+      request.respond(200, responseHeader, '');
+      expect(storage.getDataFromLocalStorage('dap_deviceId100')).to.be.equal(sampleCachedToken.token);
+    });
+
+    it('test dapRefreshToken success response with exp claim', function () {
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, true, onDone)
+      let request = server.requests[0];
+      let tokenWithExpiry = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIiwiZXhwIjoxNjQzODMwMzY5fQ..hTbcSQgmmO0HUJJrQ5fRHw.7zjrQXNNVkb-GD0ZhIVhEPcWbyaDBilHTWv-bp1lFZ9mdkSC0QbcAvUbYteiTD7ya23GUwcL2WOW8WgRSHaWHOJe0B5NDqfdUGTzElWfu7fFodRxRgGmwG8Rq5xxteFKLLGHLf1mFYRJKDtjtgajGNUKIDfn9AEt-c5Qz4KU8VolG_KzrLROx-f6Z7MnoPTcwRCj0WjXD6j2D6RAZ80-mKTNIsMIELdj6xiabHcjDJ1WzwtwCZSE2y2nMs451pSYp8W-bFPfZmDDwrkjN4s9ASLlIXcXgxK-H0GsiEbckQOZ49zsIKyFtasBvZW8339rrXi1js-aBh99M7aS5w9DmXPpUDmppSPpwkeTfKiqF0cQiAUq8tpeEQrGDJuw3Qt2.XI8h9Xw-VZj_NOmKtV19wLM63S4snos7rzkoHf9FXCw'
+      responseHeader['Akamai-DAP-Token'] = tokenWithExpiry;
+      request.respond(200, responseHeader, JSON.stringify(tokenWithExpiry));
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_TOKEN)).expires_at).to.be.equal(1643830359);
+    });
+
+    it('test dapRefreshToken error response', function () {
+      storage.setDataInLocalStorage(DAP_TOKEN, JSON.stringify(sampleCachedToken));
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, false, onDone)
+      let request = server.requests[0];
+      request.respond(400, responseHeader, 'error');
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_TOKEN)).expires_at).to.be.equal(cacheExpiry);// Since the expiry is same, the token is not updated in the cache
+    });
+  });
+
+  describe('dapRefreshEncryptedMembership test', function () {
+    it('test dapRefreshEncryptedMembership success response', function () {
+      let expiry = Math.round(Date.now() / 1000.0) + 3600; // in seconds
+      let encMembership = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoic29tZXNlY3JldGludmF1bHQifQ..f8_At4OqeQXyQcSwThOJ_w.69ImVQ3bEZ6QP7ROCRpAJjNcKY49SEPYR6qTp_8l7L8kQdPbpi4wmuOzt78j7iBrX64k2wltzmQFjDmVKSxDhrEguxpgx6t-L1tT8ZA0UosMWpVsgmKEZxOn2e9ES3jw8RNCS4WSWocSPQX33xSb51evXjm9E1s0tGoLnwXl0GsUvzRsSU86wQG6RZnAQTi7s-r-M2TKibdDjUqgIt62vJ-aBZ7RWw91MINgOdmDNs1bFfbBX5Cy1kd4-kjvRDz_aJ6zHX4sK_7EmQhGEY3tW-A3_l2I88mw-RSJaPkb_IWg0QpVwXDaE2F2g8NpY1PzCRvG_NIE8r28eK5q44OMVitykHmKmBXGDj7z2JVgoXkfo5u0I-dypZARn4GP_7niK932avB-9JD7Mz3TrlU4GZ7IpYfJ91PMsRhrs5xNPQwLZbpuhF76A7Dp7iss71UjkGCiPTU6udfRb4foyf_7xEF66m1eQVcVaMdxEbMuu9GBfdr-d04TbtJhPfUV8JfxTenvRYoi13n0j5kH0M5OgaSQD9kQ3Mrd9u-Cms-BGtT0vf-N8AaFZY_wn0Y4rkpv5HEaH7z3iT4RCHINWrXb_D0WtjLTKQi2YmF8zMlzUOewNJGwZRwbRwxc7JoDIKEc5RZkJYevfJXOEEOPGXZ7AGZxOEsJawPqFqd_nOUosCZS4akHhcDPcVowoecVAV0hhhoS6JEY66PhPp1snbt6yqA-fQhch7z8Y-DZT3Scibvffww3Scg_KFANWp0KeEvHG0vyv9R2F4o66viSS8y21MDnM7Yjk8C-j7aNMldUQbjN_7Yq1nkfe0jiBX_hsINBRPgJHUY4zCaXuyXs-JZZfU92nwG0RT3A_3RP2rpY8-fXp9d3C2QJjEpnmHvTMsuAZCQSBe5DVrJwN_UKedxcJEoOt0wLz6MaCMyYZPd8tnQeqYK1cd3RgQDXtzKC0HDw1En489DqJXEst4eSSkaaW1lImLeaF8XCOaIqPqoyGk4_6KVLw5Q7OnpczuXqYKMd9UTMovGeuTuo1k0ddfEqTq9QwxkwZL51AiDRnwTCAeYBU1krV8FCJQx-mH_WPB5ftZj-o_3pbvANeRk27QBVmjcS-tgDllJkWBxX-4axRXzLw8pUUUZUT_NOL0OiqUCWVm0qMBEpgRQ57Se42-hkLMTzLhhGJOnVcaXU1j4ep-N7faNvbgREBjf_LgzvaWS90a2NJ9bB_J9FyXelhCN_AMLfdOS3fHkeWlZ0u0PMbn5DxXRMe0l9jB-2VJZhcPQRlWoYyoCO3l4F5ZmuQP5Xh9CU4tvSWih6jlwMDgdVWuTpdfPD5bx8ccog3JDq87enx-QtPzLU3gMgouNARJGgNwKS_GJSE1uPrt2oiqgZ3Z0u_I5MKvPdQPV3o-4rsaE730eB4OwAOF-mkGWpzy8Pbl-Qe5PR9mHBhuyJgZ-WDSCHl5yvet2kfO9mPXZlqBQ26fzTcUYH94MULAZn36og6w.3iKGv-Le-AvRmi26W1v6ibRLGbwKbCR92vs-a9t55hw';
+      dapUtils.dapRefreshEncryptedMembership(ortb2, esampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      responseHeader['Akamai-DAP-Token'] = encMembership;
+      request.respond(200, responseHeader, encMembership);
+      let rtdObj = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, 504)
+      expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP)).expires_at).to.equal(expiry);
+    });
+
+    it('test dapRefreshEncryptedMembership success response with exp claim', function () {
+      let encMembership = 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoic29tZXNlY3JldGludmF1bHQiLCJleHAiOjE2NDM4MzA2NDB9..inYoxwht_aqTIWqGhEm_Gw.wDcCUOCwtqgnNUouaD723gKfm7X7bgkHgtiX4mr07P3tWk25PUQunmwTLhWBB5CYzzGIfIvveG_u4glNRLi_eRSQV4ihKKk1AN-BSSJ3d0CLAdY9I1WG5vX1VmopXyKnV90bl9SLNqnhg4Vxe6YU4ogTYxsKHuIN1EeIH4hpl-HbCQWQ1DQt4mB-MQF8V9AWTfU0D7sFMSK8f9qj6NGmf1__oHdHUlws0t5V2UAn_dhJexsuREK_gh65pczCuly5eEcziZ82LeP-nOhKWSRHB_tS_mKXrRU6_At_EVDgtfA3PSBJ6eQylCii6bTL42vZzz4jZhJv_3eLfRdKqpVT5CWNBzcDoQ2VcQgKgIBtPJ45KFfAYTQ6kdl21QMSjqtu8GTsv1lEZtrqHY6zRiG8_Mu28-PmjEw4LDdZmBDOeroue_MJD6wuE_jlE7J2iVdo8CkVnoRgzFwNbKBo7CK4z0WahV9rhuOm0LKAN5H0jF_gj696U-3fVTDTIb8ndNKNI2_xAhvWs00BFGtUtWgr8QGDGRTDCNGsDgnb_Vva9xCqVOyAE9O3Fq1QYl-tMA-KkBt3zzvmFFpOxpOyH-lUubKLKlsrxKc3GSyVEQ9DDLhrXXJgR5H5BSE4tjlK7p3ODF5qz0FHtIj7oDcgLazFO7z2MuFy2LjJmd3hKl6ujcfYEDiQ4D3pMIo7oiU33aFBD1YpzI4-WzNfJlUt1FoK0-DAXpbbV95s8p08GOD4q81rPw5hRADKJEr0QzrbDwplTWCzT2fKXMg_dIIc5AGqGKnVRUS6UyF1DnHpudNIJWxyWZjWIEw_QNjU0cDFmyPSyKxNrnfq9w8WE2bfbS5KTicxei5QHnC-cnL7Nh7IXp7WOW6R1YHbNPT7Ad4OhnlV-jjrXwkSv4wMAbfwAWoSCchGh7uvENNAeJymuponlJbOgw_GcYM73hMs8Z8W9qxRfbyF4WX5fDKXg61mMlaieHkc0EnoC5q7uKyXuZUehHZ76JLDFmewslLkQq5SkVCttzJePBnY1ouPEHw5ZTzUnG5f01QQOVcjIN-AqXNDbG5IOwq0heyS6vVfq7lZKJdLDVQ21qRjazGPaqYwLzugkWkzCOzPTgyFdbXzgjfmJwylHSOM5Jpnul84GzxEQF-1mHP2A8wtIT-M7_iX24It2wwWvc8qLA6GEqruWCtNyoug8CXo44mKdSSCGeEZHtfMbzXdLIBHCy2jSHz5i8S7DU_R7rE_5Ssrb81CqIYbgsAQBHtOYoyvzduTOruWcci4De0QcULloqImIEHUuIe2lnYO889_LIx5p7nE3UlSvLBo0sPexavFUtHqI6jdG6ye9tdseUEoNBDXW0aWD4D-KXX1JLtAgToPVUtEaXCJI7QavwO9ZG6UZM6jbfuJ5co0fvUXp6qYrFxPQo2dYHkar0nT6s1Zg5l2g8yWlLUJrHdHAzAw_NScUp71OpM4TmNsLnYaPVPcOxMvtJXTanbNWr0VKc8gy9q3k_1XxAnQwiduNs7f5bA-6qCVpayHv5dE7mUhFEwyh1_w95jEaURsQF_hnnd2OqRkADfiok4ZiPU2b38kFW1LXjpI39XXES3JU0e08Rq2uuelyLbCLWuJWq_axuKSZbZvpYeqWtIAde8FjCiO7RPlEc0nyzWBst8RBxQ-Bekg9UXPhxBRcm0HwA.Q2cBSFOQAC-QKDwmjrQXnVQd3jNOppMl9oZfd2yuKeY';
+      dapUtils.dapRefreshEncryptedMembership(ortb2, esampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      responseHeader['Akamai-DAP-Token'] = encMembership;
+      request.respond(200, responseHeader, encMembership);
+      let rtdObj = dapUtils.dapGetEncryptedRtdObj({'encryptedSegments': encMembership}, 504)
+      expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_ENCRYPTED_MEMBERSHIP)).expires_at).to.equal(1643830630);
+    });
+
+    it('test dapRefreshEncryptedMembership error response', function () {
+      dapUtils.dapRefreshEncryptedMembership(ortb2, esampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      request.respond(400, responseHeader, 'error');
+      expect(ortb2).to.eql({});
+    });
+
+    it('test dapRefreshEncryptedMembership 403 error response', function () {
+      dapUtils.dapRefreshEncryptedMembership(ortb2, esampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      request.respond(403, responseHeader, 'error');
+      let requestTokenize = server.requests[1];
+      responseHeader['Akamai-DAP-Token'] = sampleCachedToken.token;
+      requestTokenize.respond(200, responseHeader, '');
+      let requestMembership = server.requests[2];
+      requestMembership.respond(403, responseHeader, 'error');
+      expect(server.requests.length).to.be.equal(DAP_MAX_RETRY_TOKENIZE + 2);
+    });
+  });
+
+  describe('dapRefreshMembership test', function () {
+    it('test dapRefreshMembership success response', function () {
+      let membership = {'cohorts': ['9', '11', '13'], 'said': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIn0..17wnrhz6FbWx0Cf6LXpm1A.m9PKVCradk3CZokNKzVHzE06TOqiXYeijgxTQUiQy5Syx-yicnO8DyYX6zQ6rgPcNgUNRt4R4XE5MXuK0laUVQJr9yc9g3vUfQfw69OMYGW_vRlLMPzoNOhF2c4gSyfkRrLr7C0qgALmZO1D11sPflaCTNmO7pmZtRaCOB5buHoWcQhp1bUSJ09DNDb31dX3llimPwjNGSrUhyq_EZl4HopnnjxbM4qVNMY2G_43C_idlVOvbFoTxcDRATd-6MplJoIOIHQLDZEetpIOVcbEYN9gQ_ndBISITwuu5YEgs5C_WPHA25nm6e4BT5R-tawSA8yPyQAupqE8gk4ZWq_2-T0cqyTstIHrMQnZ_vysYN7h6bkzE-KeZRk7GMtySN87_fiu904hLD9QentGegamX6UAbVqQh7Htj7SnMHXkEenjxXAM5mRqQvNCTlw8k-9-VPXs-vTcKLYP8VFf8gMOmuYykgWac1gX-svyAg-24mo8cUbqcsj9relx4Qj5HiXUVyDMBZxK-mHZi-Xz6uv9GlggcsjE13DSszar-j2OetigpdibnJIxRZ-4ew3-vlvZ0Dul3j0LjeWURVBWYWfMjuZ193G7lwR3ohh_NzlNfwOPBK_SYurdAnLh7jJgTW-lVLjH2Dipmi9JwX9s03IQq9opexAn7hlM9oBI6x5asByH8JF8WwZ5GhzDjpDwpSmHPQNGFRSyrx_Sh2CPWNK6C1NJmLkyqAtJ5iw0_al7vPDQyZrKXaLTjBCUnbpJhUZ8dUKtWLzGPjzFXp10muoDIutd1NfyKxk1aWGhx5aerYuLdywv6cT_M8RZTi8924NGj5VA30V5OvEwLLyX93eDhntXZSCbkPHpAfiRZNGXrPY.GhCbWGQz11mIRD4uPKmoAuFXDH7hGnils54zg7N7-TU'}
+      dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone);
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(membership));
+      let rtdObj = dapUtils.dapGetRtdObj(membership, 503);
+      expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
+    });
+
+    it('test dapRefreshMembership success response with exp claim', function () {
+      let membership = {'cohorts': ['9', '11', '13'], 'said': 'eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2Iiwia2lkIjoicGFzc3dvcmQxIiwiZXhwIjoxNjQ3OTcxNTU4fQ..ptdM5WO-62ypXlKxFXD4FQ.waEo9MHS2NYQCi-zh_p6HgT9BdqGyQbBq4GfGLfsay4nRBgICsTS-VkV6e7xx5U1T8BgpKkRJIZBwTOY5Pkxk9FpK5nnffDSEljRrp1LXLCkNP4qwrlqHInFbZsonNWW4_mW-7aUPlTwIsTbfjTuyHdXHeQa1ALrwFFFWE7QUmPNd2RsHjDwUsxlJPEb5TnHn5W0Mgo_PQZaxvhJInMbxPgtJLoqnJvOqCBEoQY7au7ALZL_nWK8XIwPMF19J7Z3cBg9vQInhr_E3rMdQcAFHEzYfgoNcIYCCR0t1UOqUE3HNtX-E64kZAYKWdlsBb9eW5Gj9hHYyPNL_4Hntjg5eLXGpsocMg0An-qQKGC6hkrxKzeM-GrjpvSaQLNs4iqDpHUtzA02LW_vkLkMNRUiyXVJ3FUZwfyq6uHSRKWZ6UFdAfL0rfJ8q8x8Ll-qJO2Jfyvidlsi9FIs7x1WJrvDCKepfAQM1UXRTonrQljFBAk83PcL2bmWuJDgJZ0lWS4VnZbIf6A7fDourmkDxdVRptvQq5nSjtzCA6whRw0-wGz8ehNJsaJw9H_nG9k4lRKs7A5Lqsyy7TVFrAPjnA_Q1a2H6xF2ULxrtIqoNqdX7k9RjowEZSQlZgZUOAmI4wzjckdcSyC_pUlYBMcBwmlld34mmOJe9EBHAxjdci7Q_9lvj1HTcwGDcQITXnkW9Ux5Jkt9Naw-IGGrnEIADaT2guUAto8W_Gb05TmwHSd6DCmh4zepQCbqeVe6AvPILtVkTgsTTo27Q-NvS7h-XtthJy8425j5kqwxxpZFJ0l0ytc6DUyNCLJXuxi0JFU6-LoSXcROEMVrHa_Achufr9vHIELwacSAIHuwseEvg_OOu1c1WYEwZH8ynBLSjqzy8AnDj24hYgA0YanPAvDqacrYrTUFqURbHmvcQqLBTcYa_gs7uDx4a1EjtP_NvHRlvCgGAaASrjGMhTX8oJxlTqahhQ.pXm-7KqnNK8sbyyczwkVYhcjgiwkpO8LjBBVw4lcyZE'};
+      dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone);
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(membership));
+      let rtdObj = dapUtils.dapGetRtdObj(membership, 503)
+      expect(ortb2.user.data).to.deep.include.members(rtdObj.rtd.ortb2.user.data);
+      expect(JSON.parse(storage.getDataFromLocalStorage(DAP_MEMBERSHIP)).expires_at).to.be.equal(1647971548);
+    });
+
+    it('test dapRefreshMembership 400 error response', function () {
+      dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      request.respond(400, responseHeader, 'error');
+      expect(ortb2).to.eql({});
+    });
+
+    it('test dapRefreshMembership 403 error response', function () {
+      dapUtils.dapRefreshMembership(ortb2, sampleConfig, sampleCachedToken.token, onDone)
+      let request = server.requests[0];
+      request.respond(403, responseHeader, 'error');
+      expect(server.requests.length).to.be.equal(DAP_MAX_RETRY_TOKENIZE);
+    });
+  });
+
+  describe('dapGetEncryptedMembershipFromLocalStorage test', function () {
+    it('test dapGetEncryptedMembershipFromLocalStorage function with valid cache', function () {
+      storage.setDataInLocalStorage(DAP_ENCRYPTED_MEMBERSHIP, JSON.stringify(cachedEncryptedMembership))
+      expect(JSON.stringify(dapUtils.dapGetEncryptedMembershipFromLocalStorage())).to.equal(JSON.stringify(encMembership));
+    });
+
+    it('test dapGetEncryptedMembershipFromLocalStorage function with invalid cache', function () {
+      let expiry = Math.round(Date.now() / 1000.0) - 100; // in seconds
+      let encMembership = {'expiry': expiry, 'encryptedSegments': cachedEncryptedMembership.encryptedSegments}
+      storage.setDataInLocalStorage(DAP_ENCRYPTED_MEMBERSHIP, JSON.stringify(encMembership))
+      expect(dapUtils.dapGetEncryptedMembershipFromLocalStorage()).to.equal(null);
+    });
+  });
+
+  describe('Akamai-DAP-SS-ID test', function () {
+    it('Akamai-DAP-SS-ID present in response header', function () {
+      let expiry = Math.round(Date.now() / 1000.0) + 300; // in seconds
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, false, onDone)
+      let request = server.requests[0];
+      let sampleSSID = 'Test_SSID_Spec';
+      responseHeader['Akamai-DAP-Token'] = sampleCachedToken.token;
+      responseHeader['Akamai-DAP-SS-ID'] = sampleSSID;
+      request.respond(200, responseHeader, '');
+      expect(storage.getDataFromLocalStorage(DAP_SS_ID)).to.be.equal(JSON.stringify(sampleSSID));
+    });
+
+    it('Test if Akamai-DAP-SS-ID is present in request header', function () {
+      let expiry = Math.round(Date.now() / 1000.0) + 100; // in seconds
+      storage.setDataInLocalStorage(DAP_SS_ID, JSON.stringify('Test_SSID_Spec'))
+      dapUtils.dapRefreshToken(ortb2, sampleConfig, false, onDone)
+      let request = server.requests[0];
+      let ssidHeader = request.requestHeaders['Akamai-DAP-SS-ID'];
+      responseHeader['Akamai-DAP-Token'] = sampleCachedToken.token;
+      request.respond(200, responseHeader, '');
+      expect(ssidHeader).to.be.equal('Test_SSID_Spec');
+    });
+  });
+
+  describe('Test gdpr and usp consent handling', function () {
+    it('Gdpr applies and gdpr consent string not present', function () {
+      expect(akamaiDapRtdSubmodule.init(null, sampleGdprConsentConfig)).to.equal(false);
+    });
+
+    it('Gdpr applies and gdpr consent string is present', function () {
+      sampleGdprConsentConfig.gdpr.consentString = 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==';
+      expect(akamaiDapRtdSubmodule.init(null, sampleGdprConsentConfig)).to.equal(true);
+    });
+
+    it('USP consent present and user have opted out', function () {
+      expect(akamaiDapRtdSubmodule.init(null, sampleUspConsentConfig)).to.equal(false);
+    });
+
+    it('USP consent present and user have not been provided with option to opt out', function () {
+      expect(akamaiDapRtdSubmodule.init(null, {'usp': '1NYY'})).to.equal(false);
+    });
+
+    it('USP consent present and user have not opted out', function () {
+      expect(akamaiDapRtdSubmodule.init(null, {'usp': '1YNY'})).to.equal(true);
+    });
+  });
+});
diff --git a/test/spec/modules/alkimiBidAdapter_spec.js b/test/spec/modules/alkimiBidAdapter_spec.js
new file mode 100644
index 00000000000..1ae9bb56df4
--- /dev/null
+++ b/test/spec/modules/alkimiBidAdapter_spec.js
@@ -0,0 +1,207 @@
+import { expect } from 'chai'
+import { ENDPOINT, spec } from 'modules/alkimiBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const REQUEST = {
+  'bidId': '456',
+  'bidder': 'alkimi',
+  'sizes': [[300, 250]],
+  'adUnitCode': 'bannerAdUnitCode',
+  'mediaTypes': {
+    'banner': {
+      'sizes': [[300, 250]]
+    }
+  },
+  'params': {
+    bidFloor: 0.1,
+    token: 'e64782a4-8e68-4c38-965b-80ccf115d46f',
+    pos: 7
+  },
+  'userIdAsEids': [{
+    'source': 'criteo.com',
+    'uids': [{
+      'id': 'test',
+      'atype': 1
+    }]
+  }, {
+    'source': 'pubcid.org',
+    'uids': [{
+      'id': 'test',
+      'atype': 1
+    }]
+  }],
+  'schain': {
+    ver: '1.0',
+    complete: 1,
+    nodes: [{
+      asi: 'alkimi-onboarding.com',
+      sid: '00001',
+      hp: 1
+    }]
+  }
+}
+
+const BIDDER_BANNER_RESPONSE = {
+  'prebidResponse': [{
+    'ad': '<div>test</div>',
+    'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46d',
+    'cpm': 900.5,
+    'currency': 'USD',
+    'width': 640,
+    'height': 480,
+    'ttl': 300,
+    'creativeId': 1,
+    'netRevenue': true,
+    'winUrl': 'http://test.com',
+    'mediaType': 'banner',
+    'adomain': ['test.com']
+  }]
+}
+
+const BIDDER_VIDEO_RESPONSE = {
+  'prebidResponse': [{
+    'ad': '<xml>vast</xml>',
+    'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46z',
+    'cpm': 800.4,
+    'currency': 'USD',
+    'width': 1024,
+    'height': 768,
+    'ttl': 200,
+    'creativeId': 2,
+    'netRevenue': true,
+    'winUrl': 'http://test.com',
+    'mediaType': 'video',
+    'adomain': ['test.com']
+  }]
+}
+
+const BIDDER_NO_BID_RESPONSE = ''
+
+describe('alkimiBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(REQUEST)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, REQUEST)
+      delete bid.params.token
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+
+      bid = Object.assign({}, REQUEST)
+      delete bid.params.bidFloor
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+
+      bid = Object.assign({}, REQUEST)
+      delete bid.params
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    let bidRequests = [REQUEST]
+    const bidderRequest = spec.buildRequests(bidRequests, {
+      auctionId: '123',
+      refererInfo: {
+        page: 'http://test.com/path.html'
+      },
+      gdprConsent: {
+        consentString: 'test-consent',
+        vendorData: {},
+        gdprApplies: true
+      },
+      uspConsent: 'uspConsent'
+    })
+
+    it('should return a properly formatted request with eids defined', function () {
+      expect(bidderRequest.data.eids).to.deep.equal(REQUEST.userIdAsEids)
+    })
+
+    it('should return a properly formatted request with gdpr defined', function () {
+      expect(bidderRequest.data.gdprConsent.consentRequired).to.equal(true)
+      expect(bidderRequest.data.gdprConsent.consentString).to.equal('test-consent')
+    })
+
+    it('should return a properly formatted request with uspConsent defined', function () {
+      expect(bidderRequest.data.uspConsent).to.equal('uspConsent')
+    })
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      expect(bidderRequest.method).to.equal('POST')
+      expect(bidderRequest.data.requestId).to.equal('123')
+      expect(bidderRequest.data.referer).to.equal('http://test.com/path.html')
+      expect(bidderRequest.data.schain).to.deep.contains({ver: '1.0', complete: 1, nodes: [{asi: 'alkimi-onboarding.com', sid: '00001', hp: 1}]})
+      expect(bidderRequest.data.signRequest.bids).to.deep.contains({ token: 'e64782a4-8e68-4c38-965b-80ccf115d46f', pos: 7, bidFloor: 0.1, width: 300, height: 250, impMediaType: 'Banner', adUnitCode: 'bannerAdUnitCode' })
+      expect(bidderRequest.data.signRequest.randomUUID).to.equal(undefined)
+      expect(bidderRequest.data.bidIds).to.deep.contains('456')
+      expect(bidderRequest.data.signature).to.equal(undefined)
+      expect(bidderRequest.options.customHeaders).to.deep.equal({ 'Rtb-Direct': true })
+      expect(bidderRequest.options.contentType).to.equal('application/json')
+      expect(bidderRequest.url).to.equal(ENDPOINT)
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('handles banner request : should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: BIDDER_BANNER_RESPONSE }, {})
+
+      expect(result[0]).to.have.property('ad').equal('<div>test</div>')
+      expect(result[0]).to.have.property('requestId').equal('e64782a4-8e68-4c38-965b-80ccf115d46d')
+      expect(result[0]).to.have.property('cpm').equal(900.5)
+      expect(result[0]).to.have.property('currency').equal('USD')
+      expect(result[0]).to.have.property('width').equal(640)
+      expect(result[0]).to.have.property('height').equal(480)
+      expect(result[0]).to.have.property('ttl').equal(300)
+      expect(result[0]).to.have.property('creativeId').equal(1)
+      expect(result[0]).to.have.property('netRevenue').equal(true)
+      expect(result[0]).to.have.property('winUrl').equal('http://test.com')
+      expect(result[0]).to.have.property('mediaType').equal('banner')
+      expect(result[0].meta).to.exist.property('advertiserDomains')
+      expect(result[0].meta).to.have.property('advertiserDomains').lengthOf(1)
+    })
+
+    it('handles video request : should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: BIDDER_VIDEO_RESPONSE }, {})
+
+      expect(result[0]).to.have.property('ad').equal('<xml>vast</xml>')
+      expect(result[0]).to.have.property('requestId').equal('e64782a4-8e68-4c38-965b-80ccf115d46z')
+      expect(result[0]).to.have.property('cpm').equal(800.4)
+      expect(result[0]).to.have.property('currency').equal('USD')
+      expect(result[0]).to.have.property('width').equal(1024)
+      expect(result[0]).to.have.property('height').equal(768)
+      expect(result[0]).to.have.property('ttl').equal(200)
+      expect(result[0]).to.have.property('creativeId').equal(2)
+      expect(result[0]).to.have.property('netRevenue').equal(true)
+      expect(result[0]).to.have.property('winUrl').equal('http://test.com')
+      expect(result[0]).to.have.property('mediaType').equal('video')
+      expect(result[0]).to.have.property('vastXml').equal('<xml>vast</xml>')
+      expect(result[0].meta).to.exist.property('advertiserDomains')
+      expect(result[0].meta).to.have.property('advertiserDomains').lengthOf(1)
+    })
+
+    it('handles no bid response : should get empty array', function () {
+      let result = spec.interpretResponse({ body: undefined }, {})
+      expect(result).to.deep.equal([])
+
+      result = spec.interpretResponse({ body: BIDDER_NO_BID_RESPONSE }, {})
+      expect(result).to.deep.equal([])
+    })
+  })
+
+  describe('onBidWon', function () {
+    it('handles banner win: should get true', function () {
+      const win = BIDDER_BANNER_RESPONSE.prebidResponse[0]
+      const bidWonResult = spec.onBidWon(win)
+
+      expect(bidWonResult).to.equal(true)
+    })
+  })
+})
diff --git a/test/spec/modules/amxBidAdapter_spec.js b/test/spec/modules/amxBidAdapter_spec.js
index 790f3bf2581..d71e9ab5cba 100644
--- a/test/spec/modules/amxBidAdapter_spec.js
+++ b/test/spec/modules/amxBidAdapter_spec.js
@@ -1,31 +1,52 @@
-import * as utils from 'src/utils.js';
 import { expect } from 'chai';
 import { spec } from 'modules/amxBidAdapter.js';
+import { createEidsArray } from 'modules/userId/eids.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import * as utils from 'src/utils.js';
 
 const sampleRequestId = '82c91e127a9b93e';
-const sampleDisplayAd = (additionalImpressions) => `<script src='https://assets.a-mo.net/tmode.v1.js'></script>${additionalImpressions}`;
+const sampleDisplayAd = `<script src='https://assets.a-mo.net/tmode.v1.js'></script>`;
 const sampleDisplayCRID = '78827819';
 // minimal example vast
-const sampleVideoAd = (addlImpression) => `
+const sampleVideoAd = (addlImpression) =>
+  `
 <?xml version="1.0" encoding="UTF-8" ?><VAST version="2.0"><Ad id="128a6.44d74.46b3"><InLine><Error><![CDATA[http://example.net/hbx/verr?e=]]></Error><Impression><![CDATA[http://example.net/hbx/vimp?lid=test&aid=testapp]]></Impression><Creatives><Creative sequence="1"><Linear><Duration>00:00:15</Duration><TrackingEvents><Tracking event="firstQuartile"><![CDATA[https://example.com?event=first_quartile]]></Tracking></TrackingEvents><VideoClicks><ClickThrough><![CDATA[http://example.com]]></ClickThrough></VideoClicks><MediaFiles><MediaFile delivery="progressive" width="16" height="9" type="video/mp4" bitrate="800"><![CDATA[https://example.com/media.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives>${addlImpression}</InLine></Ad></VAST>
-`.replace(/\n+/g, '')
+`.replace(/\n+/g, '');
 
-const embeddedTrackingPixel = `https://1x1.a-mo.net/hbx/g_impression?A=sample&B=20903`;
-const sampleNurl = 'https://example.exchange/nurl';
+const sampleFPD = {
+  site: {
+    keywords: 'sample keywords',
+    ext: {
+      data: {
+        pageType: 'article',
+      },
+    },
+  },
+  user: {
+    gender: 'O',
+    yob: 1982,
+  },
+};
 
 const sampleBidderRequest = {
   gdprConsent: {
     gdprApplies: true,
     consentString: utils.getUniqueIdentifierStr(),
-    vendorData: {}
+    vendorData: {},
   },
   auctionId: utils.getUniqueIdentifierStr(),
   uspConsent: '1YYY',
   refererInfo: {
-    referer: 'https://www.prebid.org',
-    canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
-  }
+    location: 'https://www.prebid.org',
+    site: 'prebid.org',
+    topmostLocation: 'https://www.prebid.org',
+    page: 'https://www.prebid.org/the/link/to/the/page',
+  },
+  ortb2: sampleFPD,
+};
+
+const sampleImpExt = {
+  testKey: 'testValue',
 };
 
 const sampleBidRequestBase = {
@@ -33,11 +54,29 @@ const sampleBidRequestBase = {
   params: {
     endpoint: 'https://httpbin.org/post',
   },
+  ortb2Imp: {
+    ext: sampleImpExt,
+  },
   sizes: [[320, 50]],
+  getFloor(params) {
+    if (
+      params.size == null ||
+      params.currency == null ||
+      params.mediaType == null
+    ) {
+      throw new Error(
+        `getFloor called with incomplete params: ${JSON.stringify(params)}`
+      );
+    }
+    return {
+      floor: 0.5,
+      currency: 'USD',
+    };
+  },
   mediaTypes: {
     [BANNER]: {
-      sizes: [[300, 250]]
-    }
+      sizes: [[300, 250]],
+    },
   },
   adUnitCode: 'div-gpt-ad-example',
   transactionId: utils.getUniqueIdentifierStr(),
@@ -45,90 +84,116 @@ const sampleBidRequestBase = {
   auctionId: utils.getUniqueIdentifierStr(),
 };
 
+const schainConfig = {
+  ver: '1.0',
+  nodes: [
+    {
+      asi: 'greatnetwork.exchange',
+      sid: '000001',
+      hp: 1,
+      rid: 'bid_request_1',
+      domain: 'publisher.com',
+    },
+  ],
+};
+
 const sampleBidRequestVideo = {
   ...sampleBidRequestBase,
   bidId: sampleRequestId + '_video',
   sizes: [[300, 150]],
+  schain: schainConfig,
   mediaTypes: {
     [VIDEO]: {
-      sizes: [[360, 250]]
-    }
-  }
+      sizes: [[360, 250]],
+      context: 'adpod',
+      adPodDurationSec: 90,
+      contentMode: 'live',
+    },
+  },
 };
 
 const sampleServerResponse = {
-  'p': {
-    'hreq': ['https://1x1.a-mo.net/hbx/g_sync?partner=test', 'https://1x1.a-mo.net/hbx/g_syncf?__st=iframe']
+  p: {
+    hreq: [
+      'https://1x1.a-mo.net/hbx/g_sync?partner=test',
+      'https://1x1.a-mo.net/hbx/g_syncf?__st=iframe',
+    ],
   },
-  'r': {
+  r: {
     [sampleRequestId]: [
       {
-        'b': [
+        b: [
           {
-            'adid': '78827819',
-            'adm': sampleDisplayAd(''),
-            'adomain': [
-              'example.com'
-            ],
-            'crid': sampleDisplayCRID,
-            'ext': {
-              'himp': [
-                embeddedTrackingPixel
-              ],
-            },
-            'nurl': sampleNurl,
-            'h': 600,
-            'id': '2014691335735134254',
-            'impid': '1',
-            'price': 0.25,
-            'w': 300
+            adid: '78827819',
+            adm: sampleDisplayAd,
+            adomain: ['example.com'],
+            crid: sampleDisplayCRID,
+            h: 600,
+            id: '2014691335735134254',
+            impid: '1',
+            exp: 90,
+            price: 0.25,
+            w: 300,
           },
           {
-            'adid': '222976952',
-            'adm': sampleVideoAd(''),
-            'adomain': [
-              'example.com'
-            ],
-            'crid': sampleDisplayCRID,
-            'ext': {
-              'himp': [
-                embeddedTrackingPixel
-              ],
-            },
-            'nurl': sampleNurl,
-            'h': 1,
-            'id': '7735706981389902829',
-            'impid': '1',
-            'price': 0.25,
-            'w': 1
+            adid: '222976952',
+            adm: sampleVideoAd(''),
+            adomain: ['example.com'],
+            crid: sampleDisplayCRID,
+            ext: {},
+            h: 1,
+            id: '7735706981389902829',
+            impid: '1',
+            exp: 90,
+            price: 0.25,
+            w: 1,
           },
         ],
-      }
-    ]
+      },
+    ],
   },
-}
+};
 
 describe('AmxBidAdapter', () => {
   describe('isBidRequestValid', () => {
     it('endpoint must be an optional string', () => {
-      expect(spec.isBidRequestValid({params: { endpoint: 1 }})).to.equal(false)
-      expect(spec.isBidRequestValid({params: { endpoint: 'test' }})).to.equal(true)
+      expect(spec.isBidRequestValid({ params: { endpoint: 1 } })).to.equal(
+        false
+      );
+      expect(spec.isBidRequestValid({ params: { endpoint: 'test' } })).to.equal(
+        true
+      );
     });
 
     it('tagId is an optional string', () => {
-      expect(spec.isBidRequestValid({params: { tagId: 1 }})).to.equal(false)
-      expect(spec.isBidRequestValid({params: { tagId: 'test' }})).to.equal(true)
+      expect(spec.isBidRequestValid({ params: { tagId: 1 } })).to.equal(false);
+      expect(spec.isBidRequestValid({ params: { tagId: 'test' } })).to.equal(
+        true
+      );
     });
 
-    it('testMode is an optional boolean', () => {
-      expect(spec.isBidRequestValid({params: { testMode: 1 }})).to.equal(false)
-      expect(spec.isBidRequestValid({params: { testMode: false }})).to.equal(true)
+    it('testMode is an optional truthy value', () => {
+      expect(spec.isBidRequestValid({ params: { testMode: 1 } })).to.equal(
+        true
+      );
+      expect(spec.isBidRequestValid({ params: { testMode: 'true' } })).to.equal(
+        true
+      );
+      // ignore invalid values (falsy)
+      expect(
+        spec.isBidRequestValid({
+          params: { testMode: 'non-truthy-invalid-value' },
+        })
+      ).to.equal(true);
+      expect(spec.isBidRequestValid({ params: { testMode: false } })).to.equal(
+        true
+      );
     });
 
     it('none of the params are required', () => {
-      expect(spec.isBidRequestValid({})).to.equal(true)
+      expect(spec.isBidRequestValid({})).to.equal(true);
     });
-  })
+  });
   describe('getUserSync', () => {
     it('will only sync from valid server responses', () => {
       const syncs = spec.getUserSyncs({ iframeEnabled: true });
@@ -136,82 +201,233 @@ describe('AmxBidAdapter', () => {
     });
 
     it('will return valid syncs from a server response', () => {
-      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [{body: sampleServerResponse}]);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [
+        { body: sampleServerResponse },
+      ]);
       expect(syncs.length).to.equal(2);
       expect(syncs[0].type).to.equal('image');
       expect(syncs[1].type).to.equal('iframe');
     });
 
     it('will filter out iframe syncs based on options', () => {
-      const syncs = spec.getUserSyncs({ iframeEnabled: false }, [{body: sampleServerResponse}, {body: sampleServerResponse}]);
+      const syncs = spec.getUserSyncs({ iframeEnabled: false }, [
+        { body: sampleServerResponse },
+        { body: sampleServerResponse },
+      ]);
       expect(syncs.length).to.equal(2);
-      expect(syncs).to.satisfy((allSyncs) => allSyncs.every((sync) => sync.type === 'image'))
+      expect(syncs).to.satisfy((allSyncs) =>
+        allSyncs.every((sync) => sync.type === 'image')
+      );
     });
   });
 
   describe('buildRequests', () => {
     it('will default to prebid.a-mo.net endpoint', () => {
       const { url } = spec.buildRequests([], sampleBidderRequest);
-      expect(url).to.equal('https://prebid.a-mo.net/a/c')
+      expect(url).to.equal('https://prebid.a-mo.net/a/c');
+    });
+
+    it('will read the prebid version & global', () => {
+      const {
+        data: { V: prebidVersion, vg: prebidGlobal },
+      } = spec.buildRequests(
+        [
+          {
+            ...sampleBidRequestBase,
+            params: {
+              testMode: true,
+            },
+          },
+        ],
+        sampleBidderRequest
+      );
+      expect(prebidVersion).to.equal('$prebid.version$');
+      expect(prebidGlobal).to.equal('$$PREBID_GLOBAL$$');
     });
 
     it('reads test mode from the first bid request', () => {
-      const { data } = spec.buildRequests([{
-        ...sampleBidRequestBase,
-        params: {
-          testMode: true
-        }
-      }], sampleBidderRequest);
+      const { data } = spec.buildRequests(
+        [
+          {
+            ...sampleBidRequestBase,
+            params: {
+              testMode: true,
+            },
+          },
+        ],
+        sampleBidderRequest
+      );
       expect(data.tm).to.equal(true);
     });
 
-    it('handles referer data and GDPR, USP Consent', () => {
-      const { data } = spec.buildRequests([sampleBidRequestBase], sampleBidderRequest);
+    it('if prebid is in an iframe, will use the frame url as domain, if the topmost is not avialable', () => {
+      const { data } = spec.buildRequests([sampleBidRequestBase], {
+        ...sampleBidderRequest,
+        refererInfo: {
+          location: null,
+          topmostLocation: null,
+          ref: 'http://search-traffic-source.com',
+        },
+      });
+      expect(data.do).to.equal('localhost');
+      expect(data.re).to.equal('http://search-traffic-source.com');
+    });
+
+    it('if prebid is in an iframe, will use the topmost url as domain', () => {
+      const { data } = spec.buildRequests([sampleBidRequestBase], {
+        ...sampleBidderRequest,
+        refererInfo: {
+          location: null,
+          topmostLocation: 'http://top-site.com',
+          ref: 'http://search-traffic-source.com',
+        },
+      });
+      expect(data.do).to.equal('top-site.com');
+      expect(data.re).to.equal('http://search-traffic-source.com');
+    });
+
+    it('handles referer data and GDPR, USP Consent, COPPA', () => {
+      const { data } = spec.buildRequests(
+        [sampleBidRequestBase],
+        sampleBidderRequest
+      );
       delete data.m; // don't deal with "m" in this test
-      expect(data.gs).to.equal(sampleBidderRequest.gdprConsent.gdprApplies)
-      expect(data.gc).to.equal(sampleBidderRequest.gdprConsent.consentString)
-      expect(data.usp).to.equal(sampleBidderRequest.uspConsent)
+      expect(data.gs).to.equal(sampleBidderRequest.gdprConsent.gdprApplies);
+      expect(data.gc).to.equal(sampleBidderRequest.gdprConsent.consentString);
+      expect(data.usp).to.equal(sampleBidderRequest.uspConsent);
+      expect(data.cpp).to.equal(0);
     });
 
-    it('can build a banner request', () => {
-      const { method, url, data } = spec.buildRequests([sampleBidRequestBase, {
+    it('will forward bid request count & wins count data', () => {
+      const bidderRequestsCount = Math.floor(Math.random() * 100);
+      const bidderWinsCount = Math.floor(Math.random() * 100);
+      const { data } = spec.buildRequests(
+        [
+          {
+            ...sampleBidRequestBase,
+            bidderRequestsCount,
+            bidderWinsCount,
+          },
+        ],
+        sampleBidderRequest
+      );
+
+      expect(data.brc).to.equal(bidderRequestsCount);
+      expect(data.bwc).to.equal(bidderWinsCount);
+      expect(data.trc).to.equal(0);
+    });
+    it('will forward first-party data', () => {
+      const { data } = spec.buildRequests(
+        [sampleBidRequestBase],
+        sampleBidderRequest
+      );
+      expect(data.fpd2).to.deep.equal(sampleFPD);
+    });
+
+    it('will collect & forward RTI user IDs', () => {
+      const randomRTI = `greatRTI${Math.floor(Math.random() * 100)}`;
+      const userId = {
+        britepoolid: 'sample-britepool',
+        criteoId: 'sample-criteo',
+        digitrustid: { data: { id: 'sample-digitrust' } },
+        id5id: { uid: 'sample-id5' },
+        idl_env: 'sample-liveramp',
+        lipb: { lipbid: 'sample-liveintent' },
+        netId: 'sample-netid',
+        parrableId: { eid: 'sample-parrable' },
+        pubcid: 'sample-pubcid',
+        [randomRTI]: 'sample-unknown',
+        tdid: 'sample-ttd',
+      };
+
+      const eids = createEidsArray(userId);
+      const bid = {
         ...sampleBidRequestBase,
-        bidId: sampleRequestId + '_2',
-        params: {
-          ...sampleBidRequestBase.params,
-          tagId: 'example'
-        }
-      }], sampleBidderRequest)
+        userIdAsEids: eids,
+      };
+
+      const { data } = spec.buildRequests([bid, bid], sampleBidderRequest);
+      expect(data.eids).to.deep.equal(eids);
+    });
+
+    it('can build a banner request', () => {
+      const { method, url, data } = spec.buildRequests(
+        [
+          sampleBidRequestBase,
+          {
+            ...sampleBidRequestBase,
+            bidId: sampleRequestId + '_2',
+            params: {
+              ...sampleBidRequestBase.params,
+              adUnitId: '',
+              tagId: 'example',
+            },
+          },
+        ],
+        sampleBidderRequest
+      );
 
-      expect(url).to.equal(sampleBidRequestBase.params.endpoint)
+      expect(url).to.equal(sampleBidRequestBase.params.endpoint);
       expect(method).to.equal('POST');
       expect(Object.keys(data.m).length).to.equal(2);
       expect(data.m[sampleRequestId]).to.deep.equal({
         av: true,
+        au: 'div-gpt-ad-example',
+        vd: {},
+        ms: [[[320, 50]], [[300, 250]], []],
         aw: 300,
+        sc: {},
         ah: 250,
         tf: 0,
-        vr: false
+        f: 0.5,
+        vr: false,
+        rtb: {
+          ext: sampleImpExt,
+        },
       });
       expect(data.m[sampleRequestId + '_2']).to.deep.equal({
         av: true,
         aw: 300,
+        au: 'div-gpt-ad-example',
+        sc: {},
+        ms: [[[320, 50]], [[300, 250]], []],
         i: 'example',
         ah: 250,
+        vd: {},
         tf: 0,
+        f: 0.5,
         vr: false,
+        rtb: {
+          ext: sampleImpExt,
+        },
       });
     });
 
     it('can build a video request', () => {
-      const { data } = spec.buildRequests([sampleBidRequestVideo], sampleBidderRequest);
+      const { data } = spec.buildRequests(
+        [{...sampleBidRequestVideo, params: { ...sampleBidRequestVideo.params, adUnitId: 'custom-auid' }}],
+        sampleBidderRequest
+      );
       expect(Object.keys(data.m).length).to.equal(1);
       expect(data.m[sampleRequestId + '_video']).to.deep.equal({
+        au: 'custom-auid',
+        ms: [[[300, 150]], [], [[360, 250]]],
         av: true,
         aw: 360,
         ah: 250,
+        sc: schainConfig,
+        vd: {
+          sizes: [[360, 250]],
+          context: 'adpod',
+          adPodDurationSec: 90,
+          contentMode: 'live',
+        },
         tf: 0,
-        vr: true
+        f: 0.5,
+        rtb: {
+          ext: sampleImpExt,
+        },
+        vr: true,
       });
     });
   });
@@ -235,18 +451,21 @@ describe('AmxBidAdapter', () => {
             aw: 300,
             ah: 250,
           },
-        }
-      }
+        },
+      },
     };
 
     it('will handle a nobid response', () => {
-      const parsed = spec.interpretResponse({ body: '' }, baseRequest)
-      expect(parsed).to.eql([])
+      const parsed = spec.interpretResponse({ body: '' }, baseRequest);
+      expect(parsed).to.eql([]);
     });
 
     it('can parse a display ad', () => {
-      const parsed = spec.interpretResponse({ body: sampleServerResponse }, baseRequest)
-      expect(parsed.length).to.equal(2)
+      const parsed = spec.interpretResponse(
+        { body: sampleServerResponse },
+        baseRequest
+      );
+      expect(parsed.length).to.equal(2);
 
       // we should have display, video, display
       expect(parsed[0]).to.deep.equal({
@@ -255,33 +474,28 @@ describe('AmxBidAdapter', () => {
           ...baseBidResponse.meta,
           mediaType: BANNER,
         },
+        mediaType: BANNER,
         width: 300,
         height: 600, // from the bid itself
-        ttl: 70,
-        ad: sampleDisplayAd(
-          `<img src="${embeddedTrackingPixel}" width="0" height="0"/>` +
-          `<img src="${sampleNurl}" width="0" height="0"/>`
-        ),
+        ttl: 90,
+        ad: sampleDisplayAd,
       });
     });
 
     it('can parse a video ad', () => {
-      const parsed = spec.interpretResponse({ body: sampleServerResponse }, baseRequest)
-      expect(parsed.length).to.equal(2)
-
-      // we should have display, video, display
-      const xml = parsed[1].vastXml
-      delete parsed[1].vastXml
-
-      expect(xml).to.have.string(`<Impression><![CDATA[${sampleNurl}]]></Impression>`)
-      expect(xml).to.have.string(`<Impression><![CDATA[${embeddedTrackingPixel}]]></Impression>`)
-
+      const parsed = spec.interpretResponse(
+        { body: sampleServerResponse },
+        baseRequest
+      );
+      expect(parsed.length).to.equal(2);
       expect(parsed[1]).to.deep.equal({
         ...baseBidResponse,
         meta: {
           ...baseBidResponse.meta,
           mediaType: VIDEO,
         },
+        mediaType: VIDEO,
+        vastXml: sampleVideoAd(''),
         width: 300,
         height: 250,
         ttl: 90,
@@ -296,9 +510,9 @@ describe('AmxBidAdapter', () => {
       _Image = window.Image;
       window.Image = class FakeImage {
         set src(value) {
-          firedPixels.push(value)
+          firedPixels.push(value);
         }
-      }
+      };
     });
 
     beforeEach(() => {
@@ -322,24 +536,26 @@ describe('AmxBidAdapter', () => {
         adserverTargeting: {
           hb_pb: '1.23',
           hb_adid: 'ad-id',
-          hb_bidder: 'example'
-        }
+          hb_bidder: 'example',
+        },
       });
-      expect(firedPixels.length).to.equal(1)
-      expect(firedPixels[0]).to.match(/\/hbx\/g_pbst/)
+      expect(firedPixels.length).to.equal(1);
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbst/);
       try {
         const parsed = new URL(firedPixels[0]);
         const nestedData = parsed.searchParams.get('c2');
-        expect(nestedData).to.equal(utils.formatQS({
-          hb_pb: '1.23',
-          hb_adid: 'ad-id',
-          hb_bidder: 'example'
-        }));
+        expect(nestedData).to.equal(
+          utils.formatQS({
+            hb_pb: '1.23',
+            hb_adid: 'ad-id',
+            hb_bidder: 'example',
+          })
+        );
       } catch (e) {
         // unsupported browser; try testing for string
         const pixel = firedPixels[0];
-        expect(pixel).to.have.string(encodeURIComponent('hb_pb=1.23'))
-        expect(pixel).to.have.string(encodeURIComponent('hb_adid=ad-id'))
+        expect(pixel).to.have.string(encodeURIComponent('hb_pb=1.23'));
+        expect(pixel).to.have.string(encodeURIComponent('hb_adid=ad-id'));
       }
     });
 
@@ -349,10 +565,10 @@ describe('AmxBidAdapter', () => {
         bidId: 'test-bid-id',
         adUnitCode: 'div-gpt-ad',
         timeout: 300,
-        auctionId: utils.getUniqueIdentifierStr()
+        auctionId: utils.getUniqueIdentifierStr(),
       });
-      expect(firedPixels.length).to.equal(1)
-      expect(firedPixels[0]).to.match(/\/hbx\/g_pbto/)
+      expect(firedPixels.length).to.equal(1);
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbto/);
     });
 
     it('will log an event for prebid win', () => {
@@ -365,19 +581,19 @@ describe('AmxBidAdapter', () => {
         cpm: 1.34,
         adUnitCode: 'div-gpt-ad',
         timeout: 300,
-        auctionId: utils.getUniqueIdentifierStr()
+        auctionId: utils.getUniqueIdentifierStr(),
       });
-      expect(firedPixels.length).to.equal(1)
-      expect(firedPixels[0]).to.match(/\/hbx\/g_pbwin/)
+      expect(firedPixels.length).to.equal(1);
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbwin/);
 
       const pixel = firedPixels[0];
       try {
         const url = new URL(pixel);
-        expect(url.searchParams.get('C')).to.equal('1')
-        expect(url.searchParams.get('np')).to.equal('1.34')
+        expect(url.searchParams.get('C')).to.equal('1');
+        expect(url.searchParams.get('np')).to.equal('1.34');
       } catch (e) {
-        expect(pixel).to.have.string('C=1')
-        expect(pixel).to.have.string('np=1.34')
+        expect(pixel).to.have.string('C=1');
+        expect(pixel).to.have.string('np=1.34');
       }
     });
   });
diff --git a/test/spec/modules/amxIdSystem_spec.js b/test/spec/modules/amxIdSystem_spec.js
new file mode 100644
index 00000000000..dea79e87baa
--- /dev/null
+++ b/test/spec/modules/amxIdSystem_spec.js
@@ -0,0 +1,202 @@
+import { amxIdSubmodule } from 'modules/amxIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+import * as utils from 'src/utils.js';
+
+const TEST_ID = '51b561e3-0d82-4aea-8487-093fffca4a3a';
+const ERROR_CODES = [404, 501, 500, 403];
+
+const config = {
+  params: {
+    tagId: Math.floor(Math.random() * 9e9).toString(36),
+  },
+  storage: {
+    type: 'html5',
+  },
+};
+
+describe('amxid submodule', () => {
+  it('should expose a "name" property containing amxId', () => {
+    expect(amxIdSubmodule.name).to.equal('amxId');
+  });
+
+  it('should expose a "gvlid" property containing the GVL ID 737', () => {
+    expect(amxIdSubmodule.gvlid).to.equal(737);
+  });
+});
+
+describe('decode', () => {
+  it('should respond with an object with "amxId" key containing the value', () => {
+    expect(amxIdSubmodule.decode(TEST_ID)).to.deep.equal({
+      amxId: TEST_ID
+    });
+  });
+
+  it('should respond with undefined if the value is not a string', () => {
+    [1, null, undefined, NaN, [], {}].forEach((value) => {
+      expect(amxIdSubmodule.decode(value)).to.equal(undefined);
+    });
+  });
+});
+
+describe('validateConfig', () => {
+  let logErrorSpy;
+
+  beforeEach(() => {
+    logErrorSpy = sinon.spy(utils, 'logError');
+  });
+  afterEach(() => {
+    logErrorSpy.restore();
+  });
+
+  it('should return undefined if config.storage is not present', () => {
+    expect(
+      amxIdSubmodule.getId(
+        {
+          ...config,
+          storage: null,
+        },
+        null,
+        null
+      )
+    ).to.equal(undefined);
+
+    expect(logErrorSpy.calledOnce).to.be.true;
+    expect(logErrorSpy.lastCall.lastArg).to.contain('storage is required');
+  });
+
+  it('should return undefined if config.storage.type !== "html5"', () => {
+    expect(
+      amxIdSubmodule.getId(
+        {
+          ...config,
+          storage: {
+            type: 'cookie',
+          },
+        },
+        null,
+        null
+      )
+    ).to.equal(undefined);
+
+    expect(logErrorSpy.calledOnce).to.be.true;
+    expect(logErrorSpy.lastCall.lastArg).to.contain('cookie');
+  });
+
+  it('should return undefined if expires > 30', () => {
+    const expires = Math.floor(Math.random() * 90) + 30.01;
+    expect(
+      amxIdSubmodule.getId(
+        {
+          ...config,
+          storage: {
+            type: 'html5',
+            expires,
+          },
+        },
+        null,
+        null
+      )
+    ).to.equal(undefined);
+
+    expect(logErrorSpy.calledOnce).to.be.true;
+    expect(logErrorSpy.lastCall.lastArg).to.contain(expires);
+  });
+});
+
+describe('getId', () => {
+  const spy = sinon.spy();
+
+  beforeEach(() => {
+    spy.resetHistory();
+  });
+
+  it('should call the sync endpoint and accept a valid response', () => {
+    const { callback } = amxIdSubmodule.getId(config, null, null);
+    callback(spy);
+
+    const [request] = server.requests;
+    expect(request.method).to.equal('GET');
+
+    request.respond(
+      200,
+      {},
+      JSON.stringify({
+        id: TEST_ID,
+        v: '1.0a',
+      })
+    );
+
+    expect(spy.calledOnce).to.be.true;
+    expect(spy.lastCall.lastArg).to.equal(TEST_ID);
+  });
+
+  it('should return undefined if the server has an error status code', () => {
+    const { callback } = amxIdSubmodule.getId(config, null, null);
+    callback(spy);
+
+    const [request] = server.requests;
+    const responseCode =
+      ERROR_CODES[Math.floor(Math.random() * ERROR_CODES.length)];
+    request.respond(responseCode, {}, '');
+
+    expect(spy.calledOnce).to.be.true;
+    expect(spy.lastCall.lastArg).to.equal(undefined);
+  });
+
+  it('should return undefined if the response has invalid keys', () => {
+    const { callback } = amxIdSubmodule.getId(config, null, null);
+    callback(spy);
+
+    const [request] = server.requests;
+    request.respond(
+      200,
+      {},
+      JSON.stringify({
+        test: TEST_ID,
+      })
+    );
+
+    expect(spy.calledOnce).to.be.true;
+    expect(spy.lastCall.lastArg).to.equal(undefined);
+  });
+
+  it('should returned undefined if the server JSON is invalid', () => {
+    const { callback } = amxIdSubmodule.getId(config, null, null);
+    callback(spy);
+
+    const [request] = server.requests;
+    request.respond(200, {}, '{,,}');
+
+    expect(spy.calledOnce).to.be.true;
+    expect(spy.lastCall.lastArg).to.equal(undefined);
+  });
+
+  it('should use the intermediate value for the sync server', () => {
+    const { callback } = amxIdSubmodule.getId(config, null, null);
+    callback(spy);
+
+    const [request] = server.requests;
+    const intermediateValue = 'https://example-publisher.com/api/sync';
+
+    request.respond(
+      200,
+      {},
+      JSON.stringify({
+        u: intermediateValue,
+      })
+    );
+
+    const [, secondRequest] = server.requests;
+    expect(secondRequest.url).to.be.equal(intermediateValue);
+    secondRequest.respond(
+      200,
+      {},
+      JSON.stringify({
+        id: TEST_ID,
+      })
+    );
+
+    expect(spy.calledOnce).to.be.true;
+    expect(spy.lastCall.lastArg).to.equal(TEST_ID);
+  });
+});
diff --git a/test/spec/modules/aniviewBidAdapter_spec.js b/test/spec/modules/aniviewBidAdapter_spec.js
index cca175c3388..a9498af046c 100644
--- a/test/spec/modules/aniviewBidAdapter_spec.js
+++ b/test/spec/modules/aniviewBidAdapter_spec.js
@@ -160,6 +160,7 @@ describe('ANIVIEW Bid Adapter Test', function () {
       expect(bidResponse.currency).to.equal('USD');
       expect(bidResponse.netRevenue).to.equal(true);
       expect(bidResponse.mediaType).to.equal('video');
+      expect(bidResponse.meta.advertiserDomains).to.be.an('array').that.is.empty;
     });
 
     it('safely handles XML parsing failure from invalid bid response', function () {
@@ -177,15 +178,69 @@ describe('ANIVIEW Bid Adapter Test', function () {
       let result = spec.interpretResponse(nobidResponse, bidRequest);
       expect(result.length).to.equal(0);
     });
+
+    it('should add renderer if outstream context', function () {
+      const bidRequest = spec.buildRequests([
+        {
+          bidId: '253dcb69fb2577',
+          params: {
+            playerDomain: 'example.com',
+            AV_PUBLISHERID: '55b78633181f4603178b4568',
+            AV_CHANNELID: '55b7904d181f46410f8b4568'
+          },
+          mediaTypes: {
+            video: {
+              playerSize: [[640, 480]],
+              context: 'outstream'
+            }
+          }
+        }
+      ])[0]
+      const bidResponse = spec.interpretResponse(serverResponse, bidRequest)[0]
+
+      expect(bidResponse.renderer.url).to.equal('https://example.com/script/6.1/prebidRenderer.js')
+      expect(bidResponse.renderer.config.AV_PUBLISHERID).to.equal('55b78633181f4603178b4568')
+      expect(bidResponse.renderer.config.AV_CHANNELID).to.equal('55b7904d181f46410f8b4568')
+      expect(bidResponse.renderer.loaded).to.equal(false)
+      expect(bidResponse.width).to.equal(640)
+      expect(bidResponse.height).to.equal(480)
+    });
+
+    it('Support banner format', function () {
+      const bidRequest = spec.buildRequests([
+        {
+          bidId: '253dcb69fb2577',
+          params: {
+            playerDomain: 'example.com',
+            AV_PUBLISHERID: '55b78633181f4603178b4568',
+            AV_CHANNELID: '55b7904d181f46410f8b4568'
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[640, 480]],
+            }
+          }
+        }
+      ])[0]
+      const bidResponse = spec.interpretResponse(serverResponse, bidRequest)[0]
+
+      expect(bidResponse.ad).to.have.string('https://example.com/script/6.1/prebidRenderer.js');
+      expect(bidResponse.width).to.equal(640)
+      expect(bidResponse.height).to.equal(480)
+    })
   });
 
   describe('getUserSyncs', function () {
-    it('Check get sync pixels from response', function () {
-      let pixelUrl = 'https://sync.pixel.url/sync';
+    let pixelUrl = 'https://sync.pixel.url/sync';
+    function createBidResponse (pixelEvent, pixelType) {
+      let pixelStr = '{"url":"' + pixelUrl + '", "e":"' + pixelEvent + '", "t":' + pixelType + '}';
+      return '<?xml version="1.0" encoding="UTF-8"?><VAST version="2.0"><Ad id="FORD"><InLine><AdSystem>FORD</AdSystem><AdTitle>FORD</AdTitle><Impression><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=impression]]></Impression><Creatives><Creative><Linear><Duration>00:00:15</Duration><TrackingEvents><Tracking event="start"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=start]]></Tracking><Tracking event="firstQuartile"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=firstQuartile]]></Tracking><Tracking event="midpoint"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=midpoint]]></Tracking><Tracking event="thirdQuartile"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=thirdQuartile]]></Tracking><Tracking event="complete"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=complete]]></Tracking><Tracking event="mute"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=mute]]></Tracking><Tracking event="unmute"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=unmute]]></Tracking><Tracking event="pause"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=pause]]></Tracking><Tracking event="resume"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=resume]]></Tracking><Tracking event="fullscreen"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=fullscreen]]></Tracking></TrackingEvents><VideoClicks><ClickTracking><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=click]]></ClickTracking><ClickThrough id="VideoHub"><![CDATA[http://www.ford.com/]]></ClickThrough></VideoClicks><MediaFiles><MediaFile height="360" width="480" bitrate="527" type="video/mp4" delivery="progressive"><![CDATA[https://play.aniview.com/clients/ford2.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives><Extensions><Extension type="ANIVIEW"><AdServingSync><![CDATA[{"trackers":[' + pixelStr + ']}]]></AdServingSync><AdServingData><Asid><![CDATA[55b78d94181f46290f8b456a]]></Asid><Nasid><![CDATA[55b78d94181f46290f8b456a]]></Nasid><Cpm><![CDATA[2]]></Cpm><PlayerSettings><![CDATA[{"vpp":1,"fp":0,"maxRPM":0,"vit":3,"nc":"1","mips":0,"mrqs":0,"vpm":0,"vi":0,"t": 1,"res": 5}]]></PlayerSettings></AdServingData></Extension></Extensions></InLine></Ad></VAST>';
+    }
+
+    it('Check get iframe sync pixels from response on inventory', function () {
       let pixelEvent = 'inventory';
       let pixelType = '3';
-      let pixelStr = '{"url":"' + pixelUrl + '", "e":"' + pixelEvent + '", "t":' + pixelType + '}';
-      let bidResponse = '<?xml version="1.0" encoding="UTF-8"?><VAST version="2.0"><Ad id="FORD"><InLine><AdSystem>FORD</AdSystem><AdTitle>FORD</AdTitle><Impression><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=impression]]></Impression><Creatives><Creative><Linear><Duration>00:00:15</Duration><TrackingEvents><Tracking event="start"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=start]]></Tracking><Tracking event="firstQuartile"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=firstQuartile]]></Tracking><Tracking event="midpoint"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=midpoint]]></Tracking><Tracking event="thirdQuartile"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=thirdQuartile]]></Tracking><Tracking event="complete"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=complete]]></Tracking><Tracking event="mute"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=mute]]></Tracking><Tracking event="unmute"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=unmute]]></Tracking><Tracking event="pause"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=pause]]></Tracking><Tracking event="resume"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=resume]]></Tracking><Tracking event="fullscreen"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=fullscreen]]></Tracking></TrackingEvents><VideoClicks><ClickTracking><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=click]]></ClickTracking><ClickThrough id="VideoHub"><![CDATA[http://www.ford.com/]]></ClickThrough></VideoClicks><MediaFiles><MediaFile height="360" width="480" bitrate="527" type="video/mp4" delivery="progressive"><![CDATA[https://play.aniview.com/clients/ford2.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives><Extensions><Extension type="ANIVIEW"><AdServingSync><![CDATA[{"trackers":[' + pixelStr + ']}]]></AdServingSync><AdServingData><Asid><![CDATA[55b78d94181f46290f8b456a]]></Asid><Nasid><![CDATA[55b78d94181f46290f8b456a]]></Nasid><Cpm><![CDATA[2]]></Cpm><PlayerSettings><![CDATA[{"vpp":1,"fp":0,"maxRPM":0,"vit":3,"nc":"1","mips":0,"mrqs":0,"vpm":0,"vi":0,"t": 1,"res": 5}]]></PlayerSettings></AdServingData></Extension></Extensions></InLine></Ad></VAST>';
+      let bidResponse = createBidResponse(pixelEvent, pixelType);
       let serverResponse = [
         {body: bidResponse}
       ];
@@ -195,5 +250,19 @@ describe('ANIVIEW Bid Adapter Test', function () {
       expect(pixel.url).to.equal(pixelUrl);
       expect(pixel.type).to.equal('iframe');
     });
+
+    it('Check get image sync pixels from response on sync', function () {
+      let pixelEvent = 'sync';
+      let pixelType = '1';
+      let bidResponse = createBidResponse(pixelEvent, pixelType);
+      let serverResponse = [
+        {body: bidResponse}
+      ];
+      let syncPixels = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
+      expect(syncPixels.length).to.equal(1);
+      let pixel = syncPixels[0];
+      expect(pixel.url).to.equal(pixelUrl);
+      expect(pixel.type).to.equal('image');
+    });
   });
 });
diff --git a/test/spec/modules/aolBidAdapter_spec.js b/test/spec/modules/aolBidAdapter_spec.js
index dd10a57bbfe..471c76f55cf 100644
--- a/test/spec/modules/aolBidAdapter_spec.js
+++ b/test/spec/modules/aolBidAdapter_spec.js
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as utils from 'src/utils.js';
 import {spec} from 'modules/aolBidAdapter.js';
-import {config} from 'src/config.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
 
 const DEFAULT_AD_CONTENT = '<script>logInfo(\'ad\');</script>';
 
@@ -80,6 +80,66 @@ describe('AolAdapter', function () {
   const NEXAGE_URL = 'https://c2shb.ssp.yahoo.com/bidRequest?';
   const ONE_DISPLAY_TTL = 60;
   const ONE_MOBILE_TTL = 3600;
+  const SUPPORTED_USER_ID_SOURCES = {
+    'admixer.net': '100',
+    'adserver.org': '200',
+    'adtelligent.com': '300',
+    'amxrtb.com': '500',
+    'audigent.com': '600',
+    'britepool.com': '700',
+    'criteo.com': '800',
+    'crwdcntrl.net': '900',
+    'deepintent.com': '1000',
+    'epsilon.com': '1100',
+    'hcn.health': '1200',
+    'id5-sync.com': '1300',
+    'idx.lat': '1400',
+    'intentiq.com': '1500',
+    'intimatemerger.com': '1600',
+    'liveintent.com': '1700',
+    'liveramp.com': '1800',
+    'mediawallahscript.com': '1900',
+    'netid.de': '2100',
+    'neustar.biz': '2200',
+    'pubcid.org': '2600',
+    'quantcast.com': '2700',
+    'tapad.com': '2800',
+    'zeotap.com': '3200'
+  };
+
+  const USER_ID_DATA = {
+    admixerId: SUPPORTED_USER_ID_SOURCES['admixer.net'],
+    adtelligentId: SUPPORTED_USER_ID_SOURCES['adtelligent.com'],
+    amxId: SUPPORTED_USER_ID_SOURCES['amxrtb.com'],
+    britepoolid: SUPPORTED_USER_ID_SOURCES['britepool.com'],
+    criteoId: SUPPORTED_USER_ID_SOURCES['criteo.com'],
+    connectid: SUPPORTED_USER_ID_SOURCES['verizonmedia.com'],
+    dmdId: SUPPORTED_USER_ID_SOURCES['hcn.health'],
+    hadronId: SUPPORTED_USER_ID_SOURCES['audigent.com'],
+    lotamePanoramaId: SUPPORTED_USER_ID_SOURCES['crwdcntrl.net'],
+    deepintentId: SUPPORTED_USER_ID_SOURCES['deepintent.com'],
+    fabrickId: SUPPORTED_USER_ID_SOURCES['neustar.biz'],
+    idl_env: SUPPORTED_USER_ID_SOURCES['liveramp.com'],
+    IDP: SUPPORTED_USER_ID_SOURCES['zeotap.com'],
+    lipb: {
+      lipbid: SUPPORTED_USER_ID_SOURCES['liveintent.com'],
+      segments: ['100', '200']
+    },
+    tdid: SUPPORTED_USER_ID_SOURCES['adserver.org'],
+    id5id: {
+      uid: SUPPORTED_USER_ID_SOURCES['id5-sync.com'],
+      ext: {foo: 'bar'}
+    },
+    idx: SUPPORTED_USER_ID_SOURCES['idx.lat'],
+    imuid: SUPPORTED_USER_ID_SOURCES['intimatemerger.com'],
+    intentIqId: SUPPORTED_USER_ID_SOURCES['intentiq.com'],
+    mwOpenLinkId: SUPPORTED_USER_ID_SOURCES['mediawallahscript.com'],
+    netId: SUPPORTED_USER_ID_SOURCES['netid.de'],
+    quantcastId: SUPPORTED_USER_ID_SOURCES['quantcast.com'],
+    publinkId: SUPPORTED_USER_ID_SOURCES['epsilon.com'],
+    pubcid: SUPPORTED_USER_ID_SOURCES['pubcid.org'],
+    tapadId: SUPPORTED_USER_ID_SOURCES['tapad.com']
+  };
 
   function createCustomBidRequest({bids, params} = {}) {
     var bidderRequest = getDefaultBidRequest();
@@ -133,6 +193,9 @@ describe('AolAdapter', function () {
         currency: 'USD',
         dealId: 'deal-id',
         netRevenue: true,
+        meta: {
+          advertiserDomains: []
+        },
         ttl: bidRequest.ttl
       });
     });
@@ -339,18 +402,6 @@ describe('AolAdapter', function () {
         expect(request.url).not.to.contain('bidfloor=');
       });
 
-      it('should return url with bidFloor option if it is present', function () {
-        let bidRequest = createCustomBidRequest({
-          params: {
-            placement: 1234567,
-            network: '9599.1',
-            bidFloor: 0.80
-          }
-        });
-        let [request] = spec.buildRequests(bidRequest.bids);
-        expect(request.url).to.contain('bidfloor=0.8');
-      });
-
       it('should return url with key values if keyValues param is present', function () {
         let bidRequest = createCustomBidRequest({
           params: {
@@ -437,6 +488,20 @@ describe('AolAdapter', function () {
         expect(request.url).to.contain(NEXAGE_URL + 'dcn=2c9d2b50015c5ce9db6aeeed8b9500d6&pos=header');
       });
 
+      it('should return One Mobile url with configured GPP data', function () {
+        let bidRequest = createCustomBidRequest({
+          params: getNexageGetBidParams()
+        });
+        bidRequest.ortb2 = {
+          regs: {
+            gpp: 'testgpp',
+            gpp_sid: [8]
+          }
+        }
+        let [request] = spec.buildRequests(bidRequest.bids, bidRequest);
+        expect(request.url).to.contain('gpp=testgpp&gpp_sid=8');
+      });
+
       it('should return One Mobile url with cmd=bid option', function () {
         let bidRequest = createCustomBidRequest({
           params: getNexageGetBidParams()
@@ -463,6 +528,18 @@ describe('AolAdapter', function () {
           '&param1=val1&param2=val2&param3=val3&param4=val4');
       });
 
+      Object.keys(SUPPORTED_USER_ID_SOURCES).forEach(source => {
+        it(`should set the user ID query param for ${source}`, function () {
+          let bidRequest = createCustomBidRequest({
+            params: getNexageGetBidParams()
+          });
+          bidRequest.bids[0].userId = {};
+          bidRequest.bids[0].userIdAsEids = createEidsArray(USER_ID_DATA);
+          let [request] = spec.buildRequests(bidRequest.bids);
+          expect(request.url).to.contain(`&eid${source}=${encodeURIComponent(SUPPORTED_USER_ID_SOURCES[source])}`);
+        });
+      });
+
       it('should return request object for One Mobile POST endpoint when POST configuration is present', function () {
         let bidConfig = getNexagePostBidParams();
         let bidRequest = createCustomBidRequest({
@@ -581,6 +658,22 @@ describe('AolAdapter', function () {
         }
       });
     });
+
+    it('returns the bid object with eid array populated with PB set eids', () => {
+      let userIdBid = Object.assign({
+        userId: {}
+      }, bid);
+      userIdBid.userIdAsEids = createEidsArray(USER_ID_DATA);
+      expect(spec.buildOpenRtbRequestData(userIdBid)).to.deep.equal({
+        id: 'bid-id',
+        imp: [],
+        user: {
+          ext: {
+            eids: userIdBid.userIdAsEids
+          }
+        }
+      });
+    });
   });
 
   describe('getUserSyncs()', function () {
@@ -715,6 +808,14 @@ describe('AolAdapter', function () {
         'euconsent=test-consent;gdpr=1;us_privacy=test-usp-consent;');
     });
 
+    it('should return formatted gpp privacy params when formatConsentData returns GPP data', function () {
+      formatConsentDataStub.returns({
+        gpp: 'gppstring',
+        gpp_sid: [6, 7]
+      });
+      expect(spec.formatMarketplaceDynamicParams()).to.be.equal('gpp=gppstring;gpp_sid=6%2C7;');
+    });
+
     it('should return formatted params when formatKeyValues returns data', function () {
       formatKeyValuesStub.returns({
         param1: 'val1',
@@ -723,13 +824,6 @@ describe('AolAdapter', function () {
       });
       expect(spec.formatMarketplaceDynamicParams()).to.be.equal('param1=val1;param2=val2;param3=val3;');
     });
-
-    it('should return formatted bid floor param when it is present', function () {
-      let params = {
-        bidFloor: 0.45
-      };
-      expect(spec.formatMarketplaceDynamicParams(params)).to.be.equal('bidfloor=0.45;');
-    });
   });
 
   describe('formatOneMobileDynamicParams()', function () {
diff --git a/test/spec/modules/apacdexBidAdapter_spec.js b/test/spec/modules/apacdexBidAdapter_spec.js
new file mode 100644
index 00000000000..773c9925d58
--- /dev/null
+++ b/test/spec/modules/apacdexBidAdapter_spec.js
@@ -0,0 +1,733 @@
+import { expect } from 'chai'
+import { spec, validateGeoObject, getDomain } from '../../../modules/apacdexBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+import { userSync } from '../../../src/userSync.js';
+import { config } from 'src/config.js';
+import { deepClone } from 'src/utils.js';
+
+describe('ApacdexBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  describe('.code', function () {
+    it('should return a bidder code of apacdex', function () {
+      expect(spec.code).to.equal('apacdex')
+    })
+  })
+
+  describe('inherited functions', function () {
+    it('should exist and be a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('.isBidRequestValid', function () {
+    it('should return false if there are no params', () => {
+      const bid = {
+        'bidder': 'apacdex',
+        'adUnitCode': 'adunit-code',
+        'mediaTypes': {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false if there is no siteId or placementId param', () => {
+      const bid = {
+        'bidder': 'apacdex',
+        'adUnitCode': 'adunit-code',
+        params: {
+          site_id: '1a2b3c4d5e6f1a2b3c4d',
+          placement_id: 'plcm12345678',
+        },
+        'mediaTypes': {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false if there is no mediaTypes', () => {
+      const bid = {
+        'bidder': 'apacdex',
+        'adUnitCode': 'adunit-code',
+        params: {
+          siteId: '1a2b3c4d5e6f1a2b3c4d'
+        },
+        'mediaTypes': {
+        },
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true if the bid is valid', () => {
+      const bid = {
+        'bidder': 'apacdex',
+        'adUnitCode': 'adunit-code',
+        params: {
+          siteId: '1a2b3c4d5e6f1a2b3c4d'
+        },
+        'mediaTypes': {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    describe('banner', () => {
+      it('should return false if there are no banner sizes', () => {
+        const bid = {
+          'bidder': 'apacdex',
+          'adUnitCode': 'adunit-code',
+          params: {
+            siteId: '1a2b3c4d5e6f1a2b3c4d'
+          },
+          'mediaTypes': {
+            banner: {
+
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return true if there is banner sizes', () => {
+        const bid = {
+          'bidder': 'apacdex',
+          'adUnitCode': 'adunit-code',
+          params: {
+            siteId: '1a2b3c4d5e6f1a2b3c4d'
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250], [300, 600]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+
+    describe('video', () => {
+      it('should return false if there is no playerSize defined in the video mediaType', () => {
+        const bid = {
+          'bidder': 'apacdex',
+          'adUnitCode': 'adunit-code',
+          params: {
+            siteId: '1a2b3c4d5e6f1a2b3c4d',
+            sizes: [[300, 250], [300, 600]]
+          },
+          'mediaTypes': {
+            video: {
+              context: 'instream'
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return true if there is playerSize defined on the video mediaType', () => {
+        const bid = {
+          'bidder': 'apacdex',
+          'adUnitCode': 'adunit-code',
+          params: {
+            siteId: '1a2b3c4d5e6f1a2b3c4d',
+          },
+          'mediaTypes': {
+            video: {
+              context: 'instream',
+              playerSize: [[640, 480]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+  });
+
+  describe('.buildRequests', function () {
+    beforeEach(function () {
+      sinon.stub(userSync, 'canBidderRegisterSync');
+    });
+    afterEach(function () {
+      userSync.canBidderRegisterSync.restore();
+    });
+    let bidRequest = [{
+      'schain': {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'indirectseller.com',
+            'sid': '00001',
+            'hp': 1
+          },
+          {
+            'asi': 'indirectseller-2.com',
+            'sid': '00002',
+            'hp': 0
+          },
+        ]
+      },
+      'bidder': 'apacdex',
+      'params': {
+        'siteId': '1a2b3c4d5e6f1a2b3c4d',
+        'geo': { 'lat': 123.13123456, 'lon': 54.23467311, 'accuracy': 60 }
+      },
+      'adUnitCode': 'adunit-code-1',
+      'sizes': [[300, 250], [300, 600]],
+      'targetKey': 0,
+      'bidId': '30b31c1838de1f',
+      'userIdAsEids': [{
+        'source': 'criteo.com',
+        'uids': [{
+          'id': 'p0cCLF9JazY1ZUFjazJRb3NKbEprVTcwZ0IwRUlGalBjOG9laUZNbFJ0ZGpOSnVFbE9VMjBNMzNBTzladGt4cUVGQzBybDY2Y1FqT1dkUkFsMmJIWDRHNjlvNXJjbiUyQlZDd1dOTmt6VlV2TDhRd0F0RTlBcmpyZU5WRHBPU25GQXpyMnlT',
+          'atype': 1
+        }]
+      }, {
+        'source': 'pubcid.org',
+        'uids': [{
+          'id': '2ae366c2-2576-45e5-bd21-72ed10598f17',
+          'atype': 1
+        }]
+      }],
+    },
+    {
+      'bidder': 'apacdex',
+      'params': {
+        'ad_unit': '/7780971/sparks_prebid_LB',
+        'sizes': [[300, 250], [300, 600]],
+        'referrer': 'overrides_top_window_location'
+      },
+      'adUnitCode': 'adunit-code-2',
+      'sizes': [[120, 600], [300, 600], [160, 600]],
+      'targetKey': 1,
+      'bidId': '30b31c1838de1e',
+    }];
+
+    let bidderRequests = {
+      'gdprConsent': {
+        'consentString': 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+        'vendorData': {},
+        'gdprApplies': true
+      },
+      'refererInfo': {
+        'numIframes': 0,
+        'reachedTop': true,
+        'referer': 'https://example.com',
+        'stack': ['https://example.com']
+      },
+      uspConsent: 'someCCPAString'
+    };
+
+    it('should return a properly formatted request', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      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/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==')
+    })
+
+    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/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==')
+    })
+    it('should return a properly formatted request with GDPR applies set to false with no consent_string param', function () {
+      let bidderRequests = {
+        'gdprConsent': {
+          'consentString': undefined,
+          'vendorData': {},
+          'gdprApplies': false
+        },
+        'refererInfo': {
+          'numIframes': 0,
+          'reachedTop': true,
+          'referer': 'https://example.com',
+          'stack': ['https://example.com']
+        }
+      };
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      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')
+    })
+    it('should return a properly formatted request with GDPR applies set to true with no consentString param', function () {
+      let bidderRequests = {
+        'gdprConsent': {
+          'consentString': undefined,
+          'vendorData': {},
+          'gdprApplies': true
+        },
+        'refererInfo': {
+          'numIframes': 0,
+          'reachedTop': true,
+          'referer': 'https://example.com',
+          'stack': ['https://example.com']
+        }
+      };
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      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')
+    })
+    it('should return a properly formatted request with schain defined', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.schain).to.deep.equal(bidRequest[0].schain)
+    });
+    it('should return a properly formatted request with eids defined', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.eids).to.deep.equal(bidRequest[0].userIdAsEids)
+    });
+    it('should return a properly formatted request with geo defined', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.geo).to.deep.equal(bidRequest[0].params.geo)
+    });
+    it('should return a properly formatted request with us_privacy included', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.us_privacy).to.equal('someCCPAString');
+    });
+    it('should attach bidFloor param when either bid param floorPrice or getFloor function exists', function () {
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      let singleBidRequest, request, payload = null;
+
+      // 1 -> floorPrice not defined, getFloor not defined > empty
+      singleBidRequest = deepClone(bidRequest[0]);
+      request = spec.buildRequests([singleBidRequest], bidderRequests);
+      payload = request.data;
+      expect(payload.bids[0].bidFloor).to.not.exist;
+
+      // 2 -> floorPrice is defined, getFloor not defined > floorPrice is used
+      singleBidRequest = deepClone(bidRequest[0]);
+      singleBidRequest.params = {
+        'siteId': '1890909',
+        'floorPrice': 0.5
+      };
+      request = spec.buildRequests([singleBidRequest], bidderRequests);
+      payload = request.data
+      expect(payload.bids[0].bidFloor).to.exist.and.to.equal(0.5);
+
+      // 3 -> floorPrice is defined, getFloor is defined > getFloor is used
+      singleBidRequest = deepClone(bidRequest[0]);
+      singleBidRequest.params = {
+        'siteId': '1890909',
+        'floorPrice': 0.5
+      };
+      singleBidRequest.getFloor = () => getFloorResponse;
+      request = spec.buildRequests([singleBidRequest], bidderRequests);
+      payload = request.data
+      expect(payload.bids[0].bidFloor).to.exist.and.to.equal(3);
+
+      // 4 -> floorPrice not defined, getFloor is defined > getFloor is used
+      singleBidRequest = deepClone(bidRequest[0]);
+      singleBidRequest.getFloor = () => getFloorResponse;
+      request = spec.buildRequests([singleBidRequest], bidderRequests);
+      payload = request.data
+      expect(payload.bids[0].bidFloor).to.exist.and.to.equal(3);
+    });
+    describe('debug test', function () {
+      beforeEach(function () {
+        config.setConfig({ debug: true });
+      });
+      afterEach(function () {
+        config.setConfig({ debug: false });
+      });
+      it('should return a properly formatted request with pbjs_debug is true', function () {
+        const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+        expect(bidRequests.data.test).to.equal(1);
+      });
+    });
+  });
+
+  describe('.interpretResponse', function () {
+    const bidRequests = {
+      'method': 'POST',
+      'url': 'https://useast.quantumdex.io/auction/pbjs',
+      'withCredentials': true,
+      'data': {
+        'device': {
+          'ua': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36',
+          'height': 937,
+          'width': 1920,
+          'dnt': 0,
+          'language': 'vi'
+        },
+        'site': {
+          'id': '343',
+          'page': 'https://www.example.com/page',
+          'referrer': '',
+          'hostname': 'www.example.com'
+        }
+      },
+      'bidderRequests': [
+        {
+          'bidder': 'apacdex',
+          'params': {
+            'siteId': '343'
+          },
+          'crumbs': {
+            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[160, 600], [120, 600]]
+            }
+          },
+          'adUnitCode': 'vi_3431035_1',
+          'transactionId': '994d8404-4a28-4c43-98d8-a38dbb061910',
+          'sizes': [[160, 600], [120, 600]],
+          'bidId': '3000aa31c41a29c21',
+          'bidderRequestId': '299926b3d3628cdd7',
+          'auctionId': '22445943-a0aa-4c63-a413-4deb64fcff1c',
+          'src': 'client',
+          'bidRequestsCount': 41,
+          'bidderRequestsCount': 41,
+          'bidderWinsCount': 0,
+          'schain': {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'freegames66.com',
+                'sid': '343',
+                'hp': 1
+              }
+            ]
+          }
+        },
+        {
+          'bidder': 'apacdex',
+          'params': {
+            'siteId': '343'
+          },
+          'crumbs': {
+            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[300, 250], [250, 250], [200, 200], [180, 150]]
+            }
+          },
+          'adUnitCode': 'vi_3431033_1',
+          'transactionId': '800fe87e-bfec-43a5-ace0-c4e2373ff4b5',
+          'sizes': [[300, 250], [250, 250], [200, 200], [180, 150]],
+          'bidId': '30024615be22ef66a',
+          'bidderRequestId': '299926b3d3628cdd7',
+          'auctionId': '22445943-a0aa-4c63-a413-4deb64fcff1c',
+          'src': 'client',
+          'bidRequestsCount': 41,
+          'bidderRequestsCount': 41,
+          'bidderWinsCount': 0,
+          'schain': {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'freegames66.com',
+                'sid': '343',
+                'hp': 1
+              }
+            ]
+          }
+        },
+        {
+          'bidder': 'apacdex',
+          'params': {
+            'siteId': '343'
+          },
+          'crumbs': {
+            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
+          },
+          'mediaTypes': {
+            'video': {
+              'playerSize': [[640, 480]],
+              'context': 'instream',
+              'mimes': [
+                'video/mp4',
+                'video/x-flv',
+                'video/x-ms-wmv',
+                'application/vnd.apple.mpegurl',
+                'application/x-mpegurl',
+                'video/3gpp',
+                'video/mpeg',
+                'video/ogg',
+                'video/quicktime',
+                'video/webm',
+                'video/x-m4v',
+                'video/ms-asf',
+                'video/x-msvideo'
+              ],
+              'protocols': [1, 2, 3, 4, 5, 6],
+              'playbackmethod': [6],
+              'maxduration': 120,
+              'linearity': 1,
+              'api': [2]
+            }
+          },
+          'adUnitCode': 'vi_3431909',
+          'transactionId': '33d83d87-43cc-499b-aabe-5c22eb6acfbb',
+          'sizes': [[640, 480]],
+          'bidId': '1854b40107d6745c',
+          'bidderRequestId': '1840763b6bda185d',
+          'auctionId': 'df495de0-5d42-471f-a501-73bcd7254b80',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0,
+          'schain': {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'freegames66.com',
+                'sid': '343',
+                'hp': 1
+              }
+            ]
+          }
+        }
+      ]
+    };
+
+    let serverResponse = {
+      'body': {
+        'bids': [
+          {
+            'requestId': '3000aa31c41a29c21',
+            'cpm': 1.07,
+            'width': 160,
+            'height': 600,
+            'ad': `<div>Apacdex AD</div>`,
+            'ttl': 500,
+            'creativeId': '1234abcd',
+            'netRevenue': true,
+            'currency': 'USD',
+            'dealId': 'apacdex',
+            'mediaType': 'banner',
+            'meta': {
+              'advertiserDomains': ['https://example.com']
+            }
+          },
+          {
+            'requestId': '30024615be22ef66a',
+            'cpm': 1,
+            'width': 300,
+            'height': 250,
+            'ad': `<div>Apacdex AD</div>`,
+            'ttl': 500,
+            'creativeId': '1234abcd',
+            'netRevenue': true,
+            'currency': 'USD',
+            'dealId': 'apacdex',
+            'mediaType': 'banner',
+            'meta': {
+              'advertiserDomains': ['https://example.com']
+            }
+          },
+          {
+            'requestId': '1854b40107d6745c',
+            'cpm': 1.25,
+            'width': 300,
+            'height': 250,
+            'vastXml': '<VAST><Ad id="20001"><InLine><AdSystem version="4.0">apacdex</AdSystem></InLine></Ad></VAST>',
+            'ttl': 500,
+            'creativeId': '30292e432662bd5f86d90774b944b038',
+            'netRevenue': true,
+            'currency': 'USD',
+            'dealId': 'apacdex',
+            'mediaType': 'video',
+            'meta': {
+              'advertiserDomains': ['https://example.com']
+            }
+          }
+        ],
+        'pixel': [{
+          'url': 'https://example.com/pixel.png',
+          'type': 'image'
+        }]
+      }
+    };
+
+    let prebidResponse = [
+      {
+        'requestId': '3000aa31c41a29c21',
+        'cpm': 1.07,
+        'width': 160,
+        'height': 600,
+        'ad': `<div>Apacdex AD</div>`,
+        'ttl': 500,
+        'creativeId': '1234abcd',
+        'netRevenue': true,
+        'currency': 'USD',
+        'dealId': 'apacdex',
+        'mediaType': 'banner'
+      },
+      {
+        'requestId': '30024615be22ef66a',
+        'cpm': 1,
+        'width': 300,
+        'height': 250,
+        'ad': `<div>Apacdex AD</div>`,
+        'ttl': 500,
+        'creativeId': '1234abcd',
+        'netRevenue': true,
+        'currency': 'USD',
+        'dealId': 'apacdex',
+        'mediaType': 'banner'
+      },
+      {
+        'requestId': '1854b40107d6745c',
+        'cpm': 1.25,
+        'width': 300,
+        'height': 250,
+        'vastXml': '<VAST><Ad id="20001"><InLine><AdSystem version="4.0">apacdex</AdSystem></InLine></Ad></VAST>',
+        'ttl': 500,
+        'creativeId': '30292e432662bd5f86d90774b944b038',
+        'netRevenue': true,
+        'currency': 'USD',
+        'dealId': 'apacdex',
+        'mediaType': 'video'
+      }
+    ];
+
+    it('should map bidResponse to prebidResponse', function () {
+      const response = spec.interpretResponse(serverResponse, bidRequests);
+      response.forEach((resp, i) => {
+        expect(resp.requestId).to.equal(prebidResponse[i].requestId);
+        expect(resp.cpm).to.equal(prebidResponse[i].cpm);
+        expect(resp.width).to.equal(prebidResponse[i].width);
+        expect(resp.height).to.equal(prebidResponse[i].height);
+        expect(resp.ttl).to.equal(prebidResponse[i].ttl);
+        expect(resp.creativeId).to.equal(prebidResponse[i].creativeId);
+        expect(resp.netRevenue).to.equal(prebidResponse[i].netRevenue);
+        expect(resp.currency).to.equal(prebidResponse[i].currency);
+        expect(resp.dealId).to.equal(prebidResponse[i].dealId);
+        if (resp.mediaType === 'video') {
+          expect(resp.vastXml.indexOf('apacdex')).to.be.greaterThan(0);
+        }
+        if (resp.mediaType === 'banner') {
+          expect(resp.ad.indexOf('Apacdex AD')).to.be.greaterThan(0);
+        }
+        expect(resp.meta.advertiserDomains).to.deep.equal(['https://example.com']);
+      });
+    });
+  });
+
+  describe('.getUserSyncs', function () {
+    let bidResponse = [{
+      'body': {
+        'pixel': [{
+          'url': 'https://pixel-test',
+          'type': 'image'
+        }]
+      }
+    }];
+
+    it('should return one sync pixel', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, bidResponse)).to.deep.equal([{
+        type: 'image',
+        url: 'https://pixel-test'
+      }]);
+    });
+    it('should return an empty array when sync is enabled but there are no bidResponses', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, [])).to.have.length(0);
+    });
+
+    it('should return an empty array when sync is enabled but no sync pixel returned', function () {
+      const pixel = Object.assign({}, bidResponse);
+      delete pixel[0].body.pixel;
+      expect(spec.getUserSyncs({ pixelEnabled: true }, bidResponse)).to.have.length(0);
+    });
+
+    it('should return an empty array', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: false }, bidResponse)).to.have.length(0);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, [])).to.have.length(0);
+    });
+  });
+
+  describe('validateGeoObject', function () {
+    it('should return true if the geo object is valid', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        lon: 23.6712341,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(true);
+    });
+
+    it('should return false if the geo object is not plain object', () => {
+      let geoObject = [{
+        lat: 123.5624234,
+        lon: 23.6712341,
+        accuracy: 20
+      }];
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing lat attribute', () => {
+      let geoObject = {
+        lon: 23.6712341,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing lon attribute', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing accuracy attribute', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        lon: 23.6712341
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+  });
+});
diff --git a/test/spec/modules/appierBidAdapter_spec.js b/test/spec/modules/appierBidAdapter_spec.js
index 5b6ccf14162..8b6ad5c2f6f 100644
--- a/test/spec/modules/appierBidAdapter_spec.js
+++ b/test/spec/modules/appierBidAdapter_spec.js
@@ -64,12 +64,16 @@ describe('AppierAdapter', function () {
         'auctionId': '1d1a030790a475',
       };
       const fakeBidRequests = [bid];
-      const fakeBidderRequest = {refererInfo: {
-        'referer': 'fakeReferer',
-        'reachedTop': true,
-        'numIframes': 1,
-        'stack': []
-      }};
+      const fakeBidderRequest = {
+        refererInfo: {
+          legacy: {
+            'referer': 'fakeReferer',
+            'reachedTop': true,
+            'numIframes': 1,
+            'stack': []
+          }
+        }
+      };
 
       const builtRequests = spec.buildRequests(fakeBidRequests, fakeBidderRequest);
       expect(builtRequests.length).to.equal(1);
@@ -77,7 +81,7 @@ describe('AppierAdapter', function () {
       expect(builtRequests[0].url).match(/v1\/prebid\/bid/);
       expect(builtRequests[0].data).deep.equal({
         'bids': fakeBidRequests,
-        'refererInfo': fakeBidderRequest.refererInfo,
+        'refererInfo': fakeBidderRequest.refererInfo.legacy,
         'version': ADAPTER_VERSION
       });
     });
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 7e985045c45..a5bd9a3592e 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -4,6 +4,7 @@ import { newBidder } from 'src/adapters/bidderFactory.js';
 import * as bidderFactory from 'src/adapters/bidderFactory.js';
 import { auctionManager } from 'src/auctionManager.js';
 import { deepClone } from 'src/utils.js';
+import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 
 const ENDPOINT = 'https://ib.adnxs.com/ut/v3/prebid';
@@ -72,13 +73,13 @@ describe('AppNexusAdapter', function () {
       }
     ];
 
-    beforeEach(function() {
-      getAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits').callsFake(function() {
+    beforeEach(function () {
+      getAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits').callsFake(function () {
         return [];
       });
     });
 
-    afterEach(function() {
+    afterEach(function () {
       getAdUnitsStub.restore();
     });
 
@@ -97,10 +98,59 @@ describe('AppNexusAdapter', function () {
       const payload = JSON.parse(request.data);
 
       expect(payload.tags[0].private_sizes).to.exist;
-      expect(payload.tags[0].private_sizes).to.deep.equal([{width: 300, height: 250}]);
+      expect(payload.tags[0].private_sizes).to.deep.equal([{ width: 300, height: 250 }]);
     });
 
-    it('should add publisher_id in request', function() {
+    it('should add position in request', function () {
+      // set from bid.params
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.params.position = 'above';
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].position).to.exist;
+      expect(payload.tags[0].position).to.deep.equal(1);
+
+      // set from mediaTypes.banner.pos = 1
+      bidRequest = deepClone(bidRequests[0]);
+      bidRequest.mediaTypes = {
+        banner: { pos: 1 }
+      };
+
+      const request2 = spec.buildRequests([bidRequest]);
+      const payload2 = JSON.parse(request2.data);
+
+      expect(payload2.tags[0].position).to.exist;
+      expect(payload2.tags[0].position).to.deep.equal(1);
+
+      // set from mediaTypes.video.pos = 3
+      bidRequest = deepClone(bidRequests[0]);
+      bidRequest.mediaTypes = {
+        video: { pos: 3 }
+      };
+
+      const request3 = spec.buildRequests([bidRequest]);
+      const payload3 = JSON.parse(request3.data);
+
+      expect(payload3.tags[0].position).to.exist;
+      expect(payload3.tags[0].position).to.deep.equal(2);
+
+      // bid.params trumps mediatypes
+      bidRequest = deepClone(bidRequests[0]);
+      bidRequest.params.position = 'above';
+      bidRequest.mediaTypes = {
+        banner: { pos: 3 }
+      };
+
+      const request4 = spec.buildRequests([bidRequest]);
+      const payload4 = JSON.parse(request4.data);
+
+      expect(payload4.tags[0].position).to.exist;
+      expect(payload4.tags[0].position).to.deep.equal(1);
+    });
+
+    it('should add publisher_id in request', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -116,7 +166,7 @@ describe('AppNexusAdapter', function () {
       expect(payload.tags[0].publisher_id).to.deep.equal(1231234);
       expect(payload.publisher_id).to.exist;
       expect(payload.publisher_id).to.deep.equal(1231234);
-    })
+    });
 
     it('should add source and verison to the tag', function () {
       const request = spec.buildRequests(bidRequests);
@@ -145,8 +195,13 @@ describe('AppNexusAdapter', function () {
         transactionId: '04f2659e-c005-4eb1-a57c-fa93145e3843'
       }];
 
-      ['banner', 'video', 'native'].forEach(type => {
-        getAdUnitsStub.callsFake(function(...args) {
+      let types = ['banner', 'video'];
+      if (FEATURES.NATIVE) {
+        types.push('native');
+      }
+
+      types.forEach(type => {
+        getAdUnitsStub.callsFake(function (...args) {
           return adUnits;
         });
 
@@ -165,7 +220,7 @@ describe('AppNexusAdapter', function () {
       });
     });
 
-    it('should not populate the ad_types array when adUnit.mediaTypes is undefined', function() {
+    it('should not populate the ad_types array when adUnit.mediaTypes is undefined', function () {
       const bidRequest = Object.assign({}, bidRequests[0]);
       const request = spec.buildRequests([bidRequest]);
       const payload = JSON.parse(request.data);
@@ -176,7 +231,7 @@ describe('AppNexusAdapter', function () {
     it('should populate the ad_types array on outstream requests', function () {
       const bidRequest = Object.assign({}, bidRequests[0]);
       bidRequest.mediaTypes = {};
-      bidRequest.mediaTypes.video = {context: 'outstream'};
+      bidRequest.mediaTypes.video = { context: 'outstream' };
 
       const request = spec.buildRequests([bidRequest]);
       const payload = JSON.parse(request.data);
@@ -215,6 +270,40 @@ describe('AppNexusAdapter', function () {
       expect(payload.tags[0].hb_source).to.deep.equal(1);
     });
 
+    it('should include ORTB video values when video params were not set', function () {
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.params = {
+        placementId: '1234235',
+        video: {
+          skippable: true,
+          playback_method: ['auto_play_sound_off', 'auto_play_sound_unknown'],
+          context: 'outstream'
+        }
+      };
+      bidRequest.mediaTypes = {
+        video: {
+          playerSize: [640, 480],
+          context: 'outstream',
+          mimes: ['video/mp4'],
+          skip: 0,
+          minduration: 5,
+          api: [1, 5, 6],
+          playbackmethod: [2, 4]
+        }
+      };
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].video).to.deep.equal({
+        minduration: 5,
+        playback_method: 2,
+        skippable: true,
+        context: 4
+      });
+      expect(payload.tags[0].video_frameworks).to.deep.equal([1, 4])
+    });
+
     it('should add video property when adUnit includes a renderer', function () {
       const videoData = {
         mediaTypes: {
@@ -236,7 +325,7 @@ describe('AppNexusAdapter', function () {
       bidRequest1 = Object.assign({}, bidRequest1, videoData, {
         renderer: {
           url: 'https://test.renderer.url',
-          render: function () {}
+          render: function () { }
         }
       });
 
@@ -265,6 +354,7 @@ describe('AppNexusAdapter', function () {
             placementId: '10433394',
             user: {
               externalUid: '123',
+              segments: [123, { id: 987, value: 876 }],
               foobar: 'invalid'
             }
           }
@@ -277,10 +367,64 @@ describe('AppNexusAdapter', function () {
       expect(payload.user).to.exist;
       expect(payload.user).to.deep.equal({
         external_uid: '123',
+        segments: [{ id: 123 }, { id: 987, value: 876 }]
       });
     });
 
-    it('should duplicate adpod placements into batches and set correct maxduration', function() {
+    it('should add debug params from query', function () {
+      let getParamStub = sinon.stub(utils, 'getParameterByName').callsFake(function(par) {
+        if (par === 'apn_debug_dongle') return 'abcdef';
+        if (par === 'apn_debug_member_id') return '1234';
+        if (par === 'apn_debug_timeout') return '1000';
+
+        return '';
+      });
+
+      let bidRequest = deepClone(bidRequests[0]);
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.debug).to.exist.and.to.deep.equal({
+        'dongle': 'abcdef',
+        'enabled': true,
+        'member_id': 1234,
+        'debug_timeout': 1000
+      });
+
+      getParamStub.restore();
+    });
+
+    it('should attach reserve param when either bid param or getFloor function exists', function () {
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      let request, payload = null;
+      let bidRequest = deepClone(bidRequests[0]);
+
+      // 1 -> reserve not defined, getFloor not defined > empty
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.not.exist;
+
+      // 2 -> reserve is defined, getFloor not defined > reserve is used
+      bidRequest.params = {
+        'placementId': '10433394',
+        'reserve': 0.5
+      };
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(0.5);
+
+      // 3 -> reserve is defined, getFloor is defined > getFloor is used
+      bidRequest.getFloor = () => getFloorResponse;
+
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(3);
+    });
+
+    it('should duplicate adpod placements into batches and set correct maxduration', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -313,7 +457,7 @@ describe('AppNexusAdapter', function () {
       expect(payload2.tags[0].video.maxduration).to.equal(30);
     });
 
-    it('should round down adpod placements when numbers are uneven', function() {
+    it('should round down adpod placements when numbers are uneven', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -336,7 +480,7 @@ describe('AppNexusAdapter', function () {
       expect(payload.tags.length).to.equal(2);
     });
 
-    it('should duplicate adpod placements when requireExactDuration is set', function() {
+    it('should duplicate adpod placements when requireExactDuration is set', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -378,7 +522,7 @@ describe('AppNexusAdapter', function () {
       expect(payload2tagsWith30.length).to.equal(5);
     });
 
-    it('should set durations for placements when requireExactDuration is set and numbers are uneven', function() {
+    it('should set durations for placements when requireExactDuration is set and numbers are uneven', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -409,7 +553,7 @@ describe('AppNexusAdapter', function () {
       expect(tagsWith60.length).to.equal(1);
     });
 
-    it('should break adpod request into batches', function() {
+    it('should break adpod request into batches', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -437,7 +581,7 @@ describe('AppNexusAdapter', function () {
       expect(payload3.tags.length).to.equal(15);
     });
 
-    it('should contain hb_source value for adpod', function() {
+    it('should contain hb_source value for adpod', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -459,7 +603,7 @@ describe('AppNexusAdapter', function () {
       expect(payload.tags[0].hb_source).to.deep.equal(7);
     });
 
-    it('should contain hb_source value for other media', function() {
+    it('should contain hb_source value for other media', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -475,7 +619,7 @@ describe('AppNexusAdapter', function () {
       expect(payload.tags[0].hb_source).to.deep.equal(1);
     });
 
-    it('adds brand_category_exclusion to request when set', function() {
+    it('adds brand_category_exclusion to request when set', function () {
       let bidRequest = Object.assign({}, bidRequests[0]);
       sinon
         .stub(config, 'getConfig')
@@ -490,28 +634,169 @@ describe('AppNexusAdapter', function () {
       config.getConfig.restore();
     });
 
-    it('should attach native params to the request', function () {
+    it('adds auction level keywords and ortb2 keywords to request when set', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon
+        .stub(config, 'getConfig')
+        .withArgs('appnexusAuctionKeywords')
+        .returns({
+          gender: 'm',
+          music: ['rock', 'pop'],
+          test: '',
+          tools: 'power'
+        });
+
+      const bidderRequest = {
+        ortb2: {
+          site: {
+            keywords: 'power tools, drills, tools=industrial',
+            content: {
+              keywords: 'video, source=streaming'
+            }
+          },
+          user: {
+            keywords: 'tools=home,renting'
+          },
+          app: {
+            keywords: 'app=iphone 11',
+            content: {
+              keywords: 'appcontent=home repair, dyi'
+            }
+          }
+        }
+      };
+
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.keywords).to.deep.equal([{
+        'key': 'gender',
+        'value': ['m']
+      }, {
+        'key': 'music',
+        'value': ['rock', 'pop']
+      }, {
+        'key': 'test'
+      }, {
+        'key': 'tools',
+        'value': ['power', 'industrial', 'home']
+      }, {
+        'key': 'power tools'
+      }, {
+        'key': 'drills'
+      }, {
+        'key': 'video'
+      }, {
+        'key': 'source',
+        'value': ['streaming']
+      }, {
+        'key': 'renting'
+      }, {
+        'key': 'app',
+        'value': ['iphone 11']
+      }, {
+        'key': 'appcontent',
+        'value': ['home repair']
+      }, {
+        'key': 'dyi'
+      }]);
+
+      config.getConfig.restore();
+    });
+
+    if (FEATURES.NATIVE) {
+      it('should attach native params to the request', function () {
+        let bidRequest = Object.assign({},
+          bidRequests[0],
+          {
+            mediaType: 'native',
+            nativeParams: {
+              title: { required: true },
+              body: { required: true },
+              body2: { required: true },
+              image: { required: true, sizes: [100, 100] },
+              icon: { required: true },
+              cta: { required: false },
+              rating: { required: true },
+              sponsoredBy: { required: true },
+              privacyLink: { required: true },
+              displayUrl: { required: true },
+              address: { required: true },
+              downloads: { required: true },
+              likes: { required: true },
+              phone: { required: true },
+              price: { required: true },
+              salePrice: { required: true }
+            }
+          }
+        );
+
+        const request = spec.buildRequests([bidRequest]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].native.layouts[0]).to.deep.equal({
+          title: { required: true },
+          description: { required: true },
+          desc2: { required: true },
+          main_image: { required: true, sizes: [{ width: 100, height: 100 }] },
+          icon: { required: true },
+          ctatext: { required: false },
+          rating: { required: true },
+          sponsored_by: { required: true },
+          privacy_link: { required: true },
+          displayurl: { required: true },
+          address: { required: true },
+          downloads: { required: true },
+          likes: { required: true },
+          phone: { required: true },
+          price: { required: true },
+          saleprice: { required: true },
+          privacy_supported: true
+        });
+        expect(payload.tags[0].hb_source).to.equal(1);
+      });
+
+      it('should always populated tags[].sizes with 1,1 for native if otherwise not defined', function () {
+        let bidRequest = Object.assign({},
+          bidRequests[0],
+          {
+            mediaType: 'native',
+            nativeParams: {
+              image: { required: true }
+            }
+          }
+        );
+        bidRequest.sizes = [[150, 100], [300, 250]];
+
+        let request = spec.buildRequests([bidRequest]);
+        let payload = JSON.parse(request.data);
+        expect(payload.tags[0].sizes).to.deep.equal([{ width: 150, height: 100 }, { width: 300, height: 250 }]);
+
+        delete bidRequest.sizes;
+
+        request = spec.buildRequests([bidRequest]);
+        payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].sizes).to.deep.equal([{ width: 1, height: 1 }]);
+      });
+    }
+
+    it('should convert keyword params (when there are no ortb keywords) to proper form and attaches to request', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
-          mediaType: 'native',
-          nativeParams: {
-            title: {required: true},
-            body: {required: true},
-            body2: {required: true},
-            image: {required: true, sizes: [100, 100]},
-            icon: {required: true},
-            cta: {required: false},
-            rating: {required: true},
-            sponsoredBy: {required: true},
-            privacyLink: {required: true},
-            displayUrl: {required: true},
-            address: {required: true},
-            downloads: {required: true},
-            likes: {required: true},
-            phone: {required: true},
-            price: {required: true},
-            salePrice: {required: true}
+          params: {
+            placementId: '10433394',
+            keywords: {
+              single: 'val',
+              singleArr: ['val'],
+              singleArrNum: [5],
+              multiValMixed: ['value1', 2, 'value3'],
+              singleValNum: 123,
+              emptyStr: '',
+              emptyArr: [''],
+              badValue: { 'foo': 'bar' } // should be dropped
+            }
           }
         }
       );
@@ -519,53 +804,60 @@ describe('AppNexusAdapter', function () {
       const request = spec.buildRequests([bidRequest]);
       const payload = JSON.parse(request.data);
 
-      expect(payload.tags[0].native.layouts[0]).to.deep.equal({
-        title: {required: true},
-        description: {required: true},
-        desc2: {required: true},
-        main_image: {required: true, sizes: [{ width: 100, height: 100 }]},
-        icon: {required: true},
-        ctatext: {required: false},
-        rating: {required: true},
-        sponsored_by: {required: true},
-        privacy_link: {required: true},
-        displayurl: {required: true},
-        address: {required: true},
-        downloads: {required: true},
-        likes: {required: true},
-        phone: {required: true},
-        price: {required: true},
-        saleprice: {required: true},
-        privacy_supported: true
-      });
-      expect(payload.tags[0].hb_source).to.equal(1);
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'single',
+        'value': ['val']
+      }, {
+        'key': 'singleArr',
+        'value': ['val']
+      }, {
+        'key': 'singleArrNum',
+        'value': ['5']
+      }, {
+        'key': 'multiValMixed',
+        'value': ['value1', '2', 'value3']
+      }, {
+        'key': 'singleValNum',
+        'value': ['123']
+      }, {
+        'key': 'emptyStr'
+      }, {
+        'key': 'emptyArr'
+      }]);
     });
 
-    it('should always populated tags[].sizes with 1,1 for native if otherwise not defined', function () {
+    it('should convert adUnit ortb2 keywords (when there are no bid param keywords) to proper form and attaches to request', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
-          mediaType: 'native',
-          nativeParams: {
-            image: { required: true }
+          ortb2Imp: {
+            ext: {
+              data: {
+                keywords: 'ortb2=yes,ortb2test, multiValMixed=4, singleValNum=456'
+              }
+            }
           }
         }
       );
-      bidRequest.sizes = [[150, 100], [300, 250]];
 
-      let request = spec.buildRequests([bidRequest]);
-      let payload = JSON.parse(request.data);
-      expect(payload.tags[0].sizes).to.deep.equal([{width: 150, height: 100}, {width: 300, height: 250}]);
-
-      delete bidRequest.sizes;
-
-      request = spec.buildRequests([bidRequest]);
-      payload = JSON.parse(request.data);
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
 
-      expect(payload.tags[0].sizes).to.deep.equal([{width: 1, height: 1}]);
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'ortb2',
+        'value': ['yes']
+      }, {
+        'key': 'ortb2test'
+      }, {
+        'key': 'multiValMixed',
+        'value': ['4']
+      }, {
+        'key': 'singleValNum',
+        'value': ['456']
+      }]);
     });
 
-    it('should convert keyword params to proper form and attaches to request', function () {
+    it('should convert keyword params and adUnit ortb2 keywords to proper form and attaches to request', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -579,7 +871,14 @@ describe('AppNexusAdapter', function () {
               singleValNum: 123,
               emptyStr: '',
               emptyArr: [''],
-              badValue: {'foo': 'bar'} // should be dropped
+              badValue: { 'foo': 'bar' } // should be dropped
+            }
+          },
+          ortb2Imp: {
+            ext: {
+              data: {
+                keywords: 'ortb2=yes,ortb2test, multiValMixed=4, singleValNum=456'
+              }
             }
           }
         }
@@ -599,14 +898,19 @@ describe('AppNexusAdapter', function () {
         'value': ['5']
       }, {
         'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
+        'value': ['value1', '2', 'value3', '4']
       }, {
         'key': 'singleValNum',
-        'value': ['123']
+        'value': ['123', '456']
       }, {
         'key': 'emptyStr'
       }, {
         'key': 'emptyArr'
+      }, {
+        'key': 'ortb2',
+        'value': ['yes']
+      }, {
+        'key': 'ortb2test'
       }]);
     });
 
@@ -627,6 +931,17 @@ describe('AppNexusAdapter', function () {
       expect(payload.tags[0].use_pmt_rule).to.equal(true);
     });
 
+    it('should add gpid to the request', function () {
+      let testGpid = '/12345/my-gpt-tag-0';
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.ortb2Imp = { ext: { data: { pbadslot: testGpid } } };
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].gpid).to.exist.and.equal(testGpid)
+    });
+
     it('should add gdpr consent information to the request', function () {
       let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
       let bidderRequest = {
@@ -636,21 +951,23 @@ describe('AppNexusAdapter', function () {
         'timeout': 3000,
         'gdprConsent': {
           consentString: consentString,
-          gdprApplies: true
+          gdprApplies: true,
+          addtlConsent: '1~7.12.35.62.66.70.89.93.108'
         }
       };
       bidderRequest.bids = bidRequests;
 
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.options).to.be.empty;
+      expect(request.options).to.deep.equal({ withCredentials: true });
       const payload = JSON.parse(request.data);
 
       expect(payload.gdpr_consent).to.exist;
       expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
       expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+      expect(payload.gdpr_consent.addtl_consent).to.exist.and.to.deep.equal([7, 12, 35, 62, 66, 70, 89, 93, 108]);
     });
 
-    it('should add us privacy string to payload', function() {
+    it('should add us privacy string to payload', function () {
       let consentString = '1YA-';
       let bidderRequest = {
         'bidderCode': 'appnexus',
@@ -668,6 +985,52 @@ describe('AppNexusAdapter', function () {
       expect(payload.us_privacy).to.exist.and.to.equal(consentString);
     });
 
+    it('should add gpp information to the request via bidderRequest.gppConsent', function () {
+      let consentString = 'abc1234';
+      let bidderRequest = {
+        'bidderCode': 'appnexus',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gppConsent': {
+          'gppString': consentString,
+          'applicableSections': [8]
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.privacy).to.exist;
+      expect(payload.privacy.gpp).to.equal(consentString);
+      expect(payload.privacy.gpp_sid).to.deep.equal([8]);
+    });
+
+    it('should add gpp information to the request via bidderRequest.ortb2.regs', function () {
+      let consentString = 'abc1234';
+      let bidderRequest = {
+        'bidderCode': 'appnexus',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'ortb2': {
+          'regs': {
+            'gpp': consentString,
+            'gpp_sid': [7]
+          }
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.privacy).to.exist;
+      expect(payload.privacy.gpp).to.equal(consentString);
+      expect(payload.privacy.gpp_sid).to.deep.equal([7]);
+    });
+
     it('supports sending hybrid mobile app parameters', function () {
       let appRequest = Object.assign({},
         bidRequests[0],
@@ -713,10 +1076,10 @@ describe('AppNexusAdapter', function () {
     });
 
     it('should add referer info to payload', function () {
-      const bidRequest = Object.assign({}, bidRequests[0])
+      const bidRequest = Object.assign({}, bidRequests[0]);
       const bidderRequest = {
         refererInfo: {
-          referer: 'https://example.com/page.html',
+          topmostLocation: 'https://example.com/page.html',
           reachedTop: true,
           numIframes: 2,
           stack: [
@@ -738,6 +1101,35 @@ describe('AppNexusAdapter', function () {
       });
     });
 
+    it('if defined, should include publisher pageUrl to normal referer info in payload', function () {
+      const bidRequest = Object.assign({}, bidRequests[0]);
+
+      const bidderRequest = {
+        refererInfo: {
+          canonicalUrl: 'https://mypub.override.com/test/page.html',
+          topmostLocation: 'https://example.com/page.html',
+          reachedTop: true,
+          numIframes: 2,
+          stack: [
+            'https://example.com/page.html',
+            'https://example.com/iframe1.html',
+            'https://example.com/iframe2.html'
+          ]
+        }
+      }
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.referrer_detection).to.exist;
+      expect(payload.referrer_detection).to.deep.equal({
+        rd_ref: 'https%3A%2F%2Fexample.com%2Fpage.html',
+        rd_top: true,
+        rd_ifs: 2,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(','),
+        rd_can: 'https://mypub.override.com/test/page.html'
+      });
+    });
+
     it('should populate schain if available', function () {
       const bidRequest = Object.assign({}, bidRequests[0], {
         schain: {
@@ -782,7 +1174,25 @@ describe('AppNexusAdapter', function () {
       config.getConfig.restore();
     });
 
-    it('should set withCredentials to false if purpose 1 consent is not given', function () {
+    it('should set the X-Is-Test customHeader if test flag is enabled', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('apn_test')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.customHeaders).to.deep.equal({ 'X-Is-Test': 1 });
+
+      config.getConfig.restore();
+    });
+
+    it('should always set withCredentials: true on the request.options', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.withCredentials).to.equal(true);
+    });
+
+    it('should set simple domain variant if purpose 1 consent is not given', function () {
       let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
       let bidderRequest = {
         'bidderCode': 'appnexus',
@@ -805,14 +1215,32 @@ describe('AppNexusAdapter', function () {
       bidderRequest.bids = bidRequests;
 
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.options).to.deep.equal({withCredentials: false});
+      expect(request.url).to.equal('https://ib.adnxs-simple.com/ut/v3/prebid');
     });
 
-    it('should populate eids array when ttd id and criteo is available', function () {
+    it('should populate eids when supported userIds are available', function () {
       const bidRequest = Object.assign({}, bidRequests[0], {
         userId: {
           tdid: 'sample-userid',
-          criteoId: 'sample-criteo-userid'
+          uid2: { id: 'sample-uid2-value' },
+          criteoId: 'sample-criteo-userid',
+          netId: 'sample-netId-userid',
+          idl_env: 'sample-idl-userid',
+          pubProvidedId: [{
+            source: 'puburl.com',
+            uids: [{
+              id: 'pubid1',
+              atype: 1,
+              ext: {
+                stype: 'ppuid'
+              }
+            }]
+          }, {
+            source: 'puburl2.com',
+            uids: [{
+              id: 'pubid2'
+            }]
+          }]
         }
       });
 
@@ -828,17 +1256,93 @@ describe('AppNexusAdapter', function () {
         source: 'criteo.com',
         id: 'sample-criteo-userid',
       });
+
+      expect(payload.eids).to.deep.include({
+        source: 'netid.de',
+        id: 'sample-netId-userid',
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'liveramp.com',
+        id: 'sample-idl-userid'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'uidapi.com',
+        id: 'sample-uid2-value',
+        rti_partner: 'UID2'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'puburl.com',
+        id: 'pubid1'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'puburl2.com',
+        id: 'pubid2'
+      });
+    });
+
+    it('should populate iab_support object at the root level if omid support is detected', function () {
+      // with bid.params.frameworks
+      let bidRequest_A = Object.assign({}, bidRequests[0], {
+        params: {
+          frameworks: [1, 2, 5, 6],
+          video: {
+            frameworks: [1, 2, 5, 6]
+          }
+        }
+      });
+      let request = spec.buildRequests([bidRequest_A]);
+      let payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.be.an('object');
+      expect(payload.iab_support).to.deep.equal({
+        omidpn: 'Appnexus',
+        omidpv: '$prebid.version$'
+      });
+      expect(payload.tags[0].banner_frameworks).to.be.an('array');
+      expect(payload.tags[0].banner_frameworks).to.deep.equal([1, 2, 5, 6]);
+      expect(payload.tags[0].video_frameworks).to.be.an('array');
+      expect(payload.tags[0].video_frameworks).to.deep.equal([1, 2, 5, 6]);
+      expect(payload.tags[0].video.frameworks).to.not.exist;
+
+      // without bid.params.frameworks
+      const bidRequest_B = Object.assign({}, bidRequests[0]);
+      request = spec.buildRequests([bidRequest_B]);
+      payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.not.exist;
+      expect(payload.tags[0].banner_frameworks).to.not.exist;
+      expect(payload.tags[0].video_frameworks).to.not.exist;
+
+      // with video.frameworks but it is not an array
+      const bidRequest_C = Object.assign({}, bidRequests[0], {
+        params: {
+          video: {
+            frameworks: "'1', '2', '3', '6'"
+          }
+        }
+      });
+      request = spec.buildRequests([bidRequest_C]);
+      payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.not.exist;
+      expect(payload.tags[0].banner_frameworks).to.not.exist;
+      expect(payload.tags[0].video_frameworks).to.not.exist;
     });
   })
 
   describe('interpretResponse', function () {
     let bfStub;
-    before(function() {
+    let bidderSettingsStorage;
+
+    before(function () {
       bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+      bidderSettingsStorage = $$PREBID_GLOBAL$$.bidderSettings;
     });
 
-    after(function() {
+    after(function () {
       bfStub.restore();
+      $$PREBID_GLOBAL$$.bidderSettings = bidderSettingsStorage;
     });
 
     let response = {
@@ -876,7 +1380,8 @@ describe('AppNexusAdapter', function () {
                 'trackers': [
                   {
                     'impression_urls': [
-                      'https://lax1-ib.adnxs.com/impression'
+                      'https://lax1-ib.adnxs.com/impression',
+                      'https://www.test.com/tracker'
                     ],
                     'video_events': {}
                   }
@@ -891,6 +1396,7 @@ describe('AppNexusAdapter', function () {
     it('should get correct bid response', function () {
       let expectedResponse = [
         {
+          'adId': '3a1f23123e',
           'requestId': '3db3773286ee59',
           'cpm': 0.5,
           'creativeId': 29681110,
@@ -905,6 +1411,15 @@ describe('AppNexusAdapter', function () {
           'adUnitCode': 'code',
           'appnexus': {
             'buyerMemberId': 958
+          },
+          'meta': {
+            'dchain': {
+              'ver': '1.0',
+              'complete': 0,
+              'nodes': [{
+                'bsid': '958'
+              }]
+            }
           }
         }
       ];
@@ -913,11 +1428,46 @@ describe('AppNexusAdapter', function () {
           bidId: '3db3773286ee59',
           adUnitCode: 'code'
         }]
-      }
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      };
+      let result = spec.interpretResponse({ body: response }, { bidderRequest });
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
     });
 
+    it('should reject 0 cpm bids', function () {
+      let zeroCpmResponse = deepClone(response);
+      zeroCpmResponse.tags[0].ads[0].cpm = 0;
+
+      let bidderRequest = {
+        bidderCode: 'appnexus'
+      };
+
+      let result = spec.interpretResponse({ body: zeroCpmResponse }, { bidderRequest });
+      expect(result.length).to.equal(0);
+    });
+
+    it('should allow 0 cpm bids if allowZeroCpmBids setConfig is true', function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        appnexus: {
+          allowZeroCpmBids: true
+        }
+      };
+
+      let zeroCpmResponse = deepClone(response);
+      zeroCpmResponse.tags[0].ads[0].cpm = 0;
+
+      let bidderRequest = {
+        bidderCode: 'appnexus',
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      };
+
+      let result = spec.interpretResponse({ body: zeroCpmResponse }, { bidderRequest });
+      expect(result.length).to.equal(1);
+      expect(result[0].cpm).to.equal(0);
+    });
+
     it('handles nobid responses', function () {
       let response = {
         'version': '0.0.1',
@@ -930,7 +1480,7 @@ describe('AppNexusAdapter', function () {
       };
       let bidderRequest;
 
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      let result = spec.interpretResponse({ body: response }, { bidderRequest });
       expect(result.length).to.equal(0);
     });
 
@@ -963,7 +1513,7 @@ describe('AppNexusAdapter', function () {
         }]
       }
 
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      let result = spec.interpretResponse({ body: response }, { bidderRequest });
       expect(result[0]).to.have.property('vastXml');
       expect(result[0]).to.have.property('vastImpUrl');
       expect(result[0]).to.have.property('mediaType', 'video');
@@ -998,7 +1548,7 @@ describe('AppNexusAdapter', function () {
         }]
       }
 
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      let result = spec.interpretResponse({ body: response }, { bidderRequest });
       expect(result[0]).to.have.property('vastUrl');
       expect(result[0]).to.have.property('vastImpUrl');
       expect(result[0]).to.have.property('mediaType', 'video');
@@ -1039,61 +1589,67 @@ describe('AppNexusAdapter', function () {
       };
       bfStub.returns('1');
 
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      let result = spec.interpretResponse({ body: response }, { bidderRequest });
       expect(result[0]).to.have.property('vastUrl');
       expect(result[0].video.context).to.equal('adpod');
       expect(result[0].video.durationSeconds).to.equal(30);
     });
 
-    it('handles native responses', function () {
-      let response1 = deepClone(response);
-      response1.tags[0].ads[0].ad_type = 'native';
-      response1.tags[0].ads[0].rtb.native = {
-        'title': 'Native Creative',
-        'desc': 'Cool description great stuff',
-        'desc2': 'Additional body text',
-        'ctatext': 'Do it',
-        'sponsored': 'AppNexus',
-        'icon': {
-          'width': 0,
-          'height': 0,
-          'url': 'https://cdn.adnxs.com/icon.png'
-        },
-        'main_img': {
-          'width': 2352,
-          'height': 1516,
-          'url': 'https://cdn.adnxs.com/img.png'
-        },
-        'link': {
-          'url': 'https://www.appnexus.com',
-          'fallback_url': '',
-          'click_trackers': ['https://nym1-ib.adnxs.com/click']
-        },
-        'impression_trackers': ['https://example.com'],
-        'rating': '5',
-        'displayurl': 'https://AppNexus.com/?url=display_url',
-        'likes': '38908320',
-        'downloads': '874983',
-        'price': '9.99',
-        'saleprice': 'FREE',
-        'phone': '1234567890',
-        'address': '28 W 23rd St, New York, NY 10010',
-        'privacy_link': 'https://appnexus.com/?url=privacy_url',
-        'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=;css_selector=.pb-click;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
-      };
-      let bidderRequest = {
-        bids: [{
-          bidId: '3db3773286ee59',
-          adUnitCode: 'code'
-        }]
-      }
+    if (FEATURES.NATIVE) {
+      it('handles native responses', function () {
+        let response1 = deepClone(response);
+        response1.tags[0].ads[0].ad_type = 'native';
+        response1.tags[0].ads[0].rtb.native = {
+          'title': 'Native Creative',
+          'desc': 'Cool description great stuff',
+          'desc2': 'Additional body text',
+          'ctatext': 'Do it',
+          'sponsored': 'AppNexus',
+          'icon': {
+            'width': 0,
+            'height': 0,
+            'url': 'https://cdn.adnxs.com/icon.png'
+          },
+          'main_img': {
+            'width': 2352,
+            'height': 1516,
+            'url': 'https://cdn.adnxs.com/img.png'
+          },
+          'link': {
+            'url': 'https://www.appnexus.com',
+            'fallback_url': '',
+            'click_trackers': ['https://nym1-ib.adnxs.com/click']
+          },
+          'impression_trackers': ['https://example.com'],
+          'rating': '5',
+          'displayurl': 'https://AppNexus.com/?url=display_url',
+          'likes': '38908320',
+          'downloads': '874983',
+          'price': '9.99',
+          'saleprice': 'FREE',
+          'phone': '1234567890',
+          'address': '28 W 23rd St, New York, NY 10010',
+          'privacy_link': 'https://appnexus.com/?url=privacy_url',
+          'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=;css_selector=.pb-click;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>',
+          'video': {
+            'content': '<?xml version=\"1.0\"></xml>'
+          }
+        };
+        let bidderRequest = {
+          bids: [{
+            bidId: '3db3773286ee59',
+            adUnitCode: 'code'
+          }]
+        }
 
-      let result = spec.interpretResponse({ body: response1 }, {bidderRequest});
-      expect(result[0].native.title).to.equal('Native Creative');
-      expect(result[0].native.body).to.equal('Cool description great stuff');
-      expect(result[0].native.cta).to.equal('Do it');
-      expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
-    });
+        let result = spec.interpretResponse({ body: response1 }, { bidderRequest });
+        expect(result[0].native.title).to.equal('Native Creative');
+        expect(result[0].native.body).to.equal('Cool description great stuff');
+        expect(result[0].native.cta).to.equal('Do it');
+        expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
+        expect(result[0].native.video.content).to.equal('<?xml version=\"1.0\"></xml>');
+      });
+    }
 
     it('supports configuring outstream renderers', function () {
       const outstreamResponse = deepClone(response);
@@ -1116,13 +1672,13 @@ describe('AppNexusAdapter', function () {
         }]
       };
 
-      const result = spec.interpretResponse({ body: outstreamResponse }, {bidderRequest});
+      const result = spec.interpretResponse({ body: outstreamResponse }, { bidderRequest });
       expect(result[0].renderer.config).to.deep.equal(
         bidderRequest.bids[0].renderer.options
       );
     });
 
-    it('should add deal_priority and deal_code', function() {
+    it('should add deal_priority and deal_code', function () {
       let responseWithDeal = deepClone(response);
       responseWithDeal.tags[0].ads[0].ad_type = 'video';
       responseWithDeal.tags[0].ads[0].deal_priority = 5;
@@ -1144,12 +1700,12 @@ describe('AppNexusAdapter', function () {
           }
         }]
       }
-      let result = spec.interpretResponse({ body: responseWithDeal }, {bidderRequest});
+      let result = spec.interpretResponse({ body: responseWithDeal }, { bidderRequest });
       expect(Object.keys(result[0].appnexus)).to.include.members(['buyerMemberId', 'dealPriority', 'dealCode']);
       expect(result[0].video.dealTier).to.equal(5);
     });
 
-    it('should add advertiser id', function() {
+    it('should add advertiser id', function () {
       let responseAdvertiserId = deepClone(response);
       responseAdvertiserId.tags[0].ads[0].advertiser_id = '123';
 
@@ -1159,8 +1715,88 @@ describe('AppNexusAdapter', function () {
           adUnitCode: 'code'
         }]
       }
-      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, { bidderRequest });
       expect(Object.keys(result[0].meta)).to.include.members(['advertiserId']);
-    })
+    });
+
+    it('should add brand id', function () {
+      let responseBrandId = deepClone(response);
+      responseBrandId.tags[0].ads[0].brand_id = 123;
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseBrandId }, { bidderRequest });
+      expect(Object.keys(result[0].meta)).to.include.members(['brandId']);
+    });
+
+    it('should add advertiserDomains', function () {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].adomain = '123';
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, { bidderRequest });
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserDomains']);
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['123']);
+    });
+  });
+
+  describe('transformBidParams', function () {
+    let gcStub;
+    let adUnit = { bids: [{ bidder: 'appnexus' }] }; ;
+
+    before(function () {
+      gcStub = sinon.stub(config, 'getConfig');
+    });
+
+    after(function () {
+      gcStub.restore();
+    });
+
+    it('convert keywords param differently for psp endpoint with single s2sConfig', function () {
+      gcStub.withArgs('s2sConfig').returns({
+        bidders: ['appnexus'],
+        endpoint: {
+          p1Consent: 'https://ib.adnxs.com/openrtb2/prebid'
+        }
+      });
+
+      const oldParams = {
+        keywords: {
+          genre: ['rock', 'pop'],
+          pets: 'dog'
+        }
+      };
+
+      const newParams = spec.transformBidParams(oldParams, true, adUnit);
+      expect(newParams.keywords).to.equal('genre=rock,genre=pop,pets=dog');
+    });
+
+    it('convert keywords param differently for psp endpoint with array s2sConfig', function () {
+      gcStub.withArgs('s2sConfig').returns([{
+        bidders: ['appnexus'],
+        endpoint: {
+          p1Consent: 'https://ib.adnxs.com/openrtb2/prebid'
+        }
+      }]);
+
+      const oldParams = {
+        keywords: {
+          genre: ['rock', 'pop'],
+          pets: 'dog'
+        }
+      };
+
+      const newParams = spec.transformBidParams(oldParams, true, adUnit);
+      expect(newParams.keywords).to.equal('genre=rock,genre=pop,pets=dog');
+    });
   });
 });
diff --git a/test/spec/modules/apstreamBidAdapter_spec.js b/test/spec/modules/apstreamBidAdapter_spec.js
new file mode 100644
index 00000000000..3efb5fd38d5
--- /dev/null
+++ b/test/spec/modules/apstreamBidAdapter_spec.js
@@ -0,0 +1,326 @@
+// jshint esversion: 6, es3: false, node: true
+import {assert, expect} from 'chai';
+import {config} from 'src/config.js';
+import {spec} from 'modules/apstreamBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const validBidRequests = [{
+  bidId: 'bidId',
+  adUnitCode: '/id/site1/header-ad',
+  sizes: [[980, 120], [980, 180]],
+  mediaTypes: {
+    banner: {
+      sizes: [[980, 120], [980, 180]]
+    }
+  },
+  params: {
+    publisherId: '1234'
+  }
+}];
+
+describe('AP Stream adapter', function() {
+  describe('isBidRequestValid', function() {
+    const bid = {
+      bidder: 'apstream',
+      mediaTypes: {
+        banner: {
+          sizes: [300, 250]
+        }
+      },
+      params: {
+      }
+    };
+
+    let mockConfig;
+    beforeEach(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        apstream: {
+          storageAllowed: true
+        }
+      };
+      mockConfig = {
+        apstream: {
+          publisherId: '4321'
+        }
+      };
+      sinon.stub(config, 'getConfig').callsFake((key) => {
+        return utils.deepAccess(mockConfig, key);
+      });
+    });
+
+    afterEach(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      config.getConfig.restore();
+    });
+
+    it('should return true when publisherId is configured and one media type', function() {
+      bid.params.publisherId = '1234';
+      assert(spec.isBidRequestValid(bid))
+    });
+
+    it('should return false when publisherId is configured and two media types', function() {
+      bid.mediaTypes.video = {sizes: [300, 250]};
+      assert.isFalse(spec.isBidRequestValid(bid))
+    });
+
+    it('should return true when publisherId is configured via config', function() {
+      delete bid.mediaTypes.video;
+      delete bid.params.publisherId;
+      assert.isTrue(spec.isBidRequestValid(bid))
+    });
+  });
+
+  describe('buildRequests', function() {
+    it('should send request with correct structure', function() {
+      const request = spec.buildRequests(validBidRequests, { })[0];
+
+      assert.equal(request.method, 'GET');
+      assert.deepEqual(request.options, {withCredentials: false});
+      assert.ok(request.data);
+    });
+
+    it('should send request with different endpoints', function() {
+      const validTwoBidRequests = [
+        ...validBidRequests,
+        ...[{
+          bidId: 'bidId2',
+          adUnitCode: '/id/site1/header-ad',
+          sizes: [[980, 980], [980, 900]],
+          mediaTypes: {
+            banner: {
+              sizes: [[980, 980], [980, 900]]
+            }
+          },
+          params: {
+            publisherId: '1234',
+            endpoint: 'site2.com'
+          }
+        }]
+      ];
+
+      const request = spec.buildRequests(validTwoBidRequests, {});
+      assert.isArray(request);
+      assert.lengthOf(request, 2);
+      assert.equal(request[1].data.bids, 'bidId2:t=b,s=980x980_980x900,c=/id/site1/header-ad');
+    });
+
+    it('should send request with adUnit code', function() {
+      const adunitCodeValidBidRequests = [
+        {
+          ...validBidRequests[0],
+          ...{
+            params: {
+              code: 'Site1_Leaderboard'
+            }
+          }
+        }
+      ];
+
+      const request = spec.buildRequests(adunitCodeValidBidRequests, { })[0];
+      assert.equal(request.data.bids, 'bidId:t=b,s=980x120_980x180,c=Site1_Leaderboard');
+    });
+
+    it('should send request with adUnit id', function() {
+      const adunitIdValidBidRequests = [
+        {
+          ...validBidRequests[0],
+          ...{
+            params: {
+              adunitId: '12345'
+            }
+          }
+        }
+      ];
+
+      const request = spec.buildRequests(adunitIdValidBidRequests, { })[0];
+      assert.equal(request.data.bids, 'bidId:t=b,s=980x120_980x180,u=12345');
+    });
+
+    it('should send request with different media type', function() {
+      const types = {
+        'audio': 'a',
+        'banner': 'b',
+        'native': 'n',
+        'video': 'v'
+      }
+      Object.keys(types).forEach(key => {
+        const adunitIdValidBidRequests = [
+          {
+            ...validBidRequests[0],
+            ...{
+              mediaTypes: {
+                [key]: {
+                  sizes: [300, 250]
+                }
+              }
+            }
+          }
+        ];
+
+        const request = spec.buildRequests(adunitIdValidBidRequests, { })[0];
+        assert.equal(request.data.bids, `bidId:t=${types[key]},s=980x120_980x180,c=/id/site1/header-ad`);
+      })
+    });
+
+    describe('gdpr', function() {
+      let mockConfig;
+
+      beforeEach(function () {
+        mockConfig = {
+          consentManagement: {
+            cmpApi: 'iab'
+          }
+        };
+        sinon.stub(config, 'getConfig').callsFake((key) => {
+          return utils.deepAccess(mockConfig, key);
+        });
+      });
+
+      afterEach(function () {
+        config.getConfig.restore();
+      });
+
+      it('should send GDPR Consent data', function() {
+        const bidderRequest = {
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentDataString',
+            vendorData: {
+              vendorConsents: {
+                '394': true
+              }
+            }
+          }
+        };
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        assert.equal(request.iab_consent, bidderRequest.gdprConsent.consentString);
+      });
+    });
+
+    describe('dsu', function() {
+      it('should pass DSU from local storage if set', function() {
+        const bidderRequest = {
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentDataString',
+            vendorData: {
+              vendorConsents: {
+                '394': true
+              }
+            }
+          }
+        };
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        assert.isNotEmpty(request.dsu);
+      });
+    });
+  });
+
+  describe('dsu config', function() {
+    let mockConfig;
+    beforeEach(function () {
+      mockConfig = {
+        apstream: {
+          noDsu: true
+        }
+      };
+      sinon.stub(config, 'getConfig').callsFake((key) => {
+        return utils.deepAccess(mockConfig, key);
+      });
+    });
+
+    afterEach(function () {
+      config.getConfig.restore();
+    });
+
+    it('should not send DSU if it is disabled in config', function() {
+      const request = spec.buildRequests(validBidRequests, { })[0];
+
+      assert.equal(request.data.dsu, '');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return empty array if no body in response', function () {
+      const serverResponse = {};
+      const bidRequest = {};
+
+      assert.isEmpty(spec.interpretResponse(serverResponse, bidRequest));
+    });
+
+    it('should map server response', function () {
+      const serverResponse = {
+        body: [
+          {
+            bidId: 123,
+            bidDetails: {
+              cpm: 1.23,
+              width: 980,
+              height: 300,
+              currency: 'DKK',
+              netRevenue: 'true',
+              creativeId: '1234',
+              dealId: '99008',
+              ad: '<p>Buy our something!</p>',
+              ttl: 360
+            }
+          }
+        ]
+      };
+      const bidRequest = {};
+
+      const response = spec.interpretResponse(serverResponse, bidRequest);
+
+      const expected = {
+        requestId: 123,
+        cpm: 1.23,
+        width: 980,
+        height: 300,
+        currency: 'DKK',
+        creativeId: '1234',
+        netRevenue: 'true',
+        dealId: '99008',
+        ad: '<p>Buy our something!</p>',
+        ttl: 360
+      };
+
+      assert.deepEqual(response[0], expected);
+    });
+
+    it('should add pixels to ad', function () {
+      const serverResponse = {
+        body: [
+          {
+            bidId: 123,
+            bidDetails: {
+              cpm: 1.23,
+              width: 980,
+              height: 300,
+              currency: 'DKK',
+              creativeId: '1234',
+              netRevenue: 'true',
+              dealId: '99008',
+              ad: '<p>Buy our something!</p>',
+              ttl: 360,
+              noticeUrls: [
+                'site1',
+                'site2'
+              ],
+              impressionScripts: [
+                'url_to_script'
+              ]
+            }
+          }
+        ]
+      };
+      const bidRequest = {};
+
+      const response = spec.interpretResponse(serverResponse, bidRequest);
+
+      assert.match(response[0].ad, /site1/);
+      assert.match(response[0].ad, /site2/);
+    });
+  });
+});
diff --git a/test/spec/modules/asealBidAdapter_spec.js b/test/spec/modules/asealBidAdapter_spec.js
new file mode 100644
index 00000000000..2dc1b47b7d0
--- /dev/null
+++ b/test/spec/modules/asealBidAdapter_spec.js
@@ -0,0 +1,213 @@
+import { expect } from 'chai';
+import {
+  spec,
+  BIDDER_CODE,
+  API_ENDPOINT,
+  HEADER_AOTTER_VERSION,
+  WEB_SESSION_ID_KEY,
+} from 'modules/asealBidAdapter.js';
+import { getRefererInfo } from 'src/refererDetection.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import * as utils from 'src/utils.js';
+import { storage } from 'modules/asealBidAdapter.js';
+
+const TEST_CLIENT_ID = 'TEST_CLIENT_ID';
+const TEST_WEB_SESSION_ID = 'TEST_WEB_SESSION_ID';
+
+describe('asealBidAdapter', () => {
+  const adapter = newBidder(spec);
+
+  let localStorageIsEnabledStub;
+  let getDataFromLocalStorageStub;
+  let sandbox;
+  let w;
+
+  beforeEach((done) => {
+    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    getDataFromLocalStorageStub = sinon.stub(
+      storage,
+      'getDataFromLocalStorage'
+    );
+
+    w = {
+      document: {
+        title: 'Aseal',
+        referrer: 'https://aseal.in/',
+        href: 'https://aseal.in/',
+      },
+      location: {
+        href: 'https://aseal.in/',
+      },
+    };
+
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(utils, 'getWindowTop').returns(w);
+    sandbox.stub(utils, 'getWindowSelf').returns(w);
+    done();
+  });
+
+  afterEach(() => {
+    localStorageIsEnabledStub.restore();
+    getDataFromLocalStorageStub.restore();
+    sandbox.restore();
+    config.resetConfig();
+  });
+
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', () => {
+    const bid = {
+      bidder: 'aseal',
+      params: {
+        placeUid: '123',
+      },
+    };
+
+    it('should return true when required params found', () => {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required param placeUid is not passed', () => {
+      bid.params = {
+        placeUid: '',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required param placeUid is wrong type', () => {
+      bid.params = {
+        placeUid: null,
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required params are not passed', () => {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', () => {
+    it('should return an empty array when there are no bid requests', () => {
+      const bidRequests = [];
+      const request = spec.buildRequests(bidRequests);
+
+      expect(request).to.be.an('array').that.is.empty;
+    });
+
+    it('should send `x-aotter-clientid` header as empty string when user not set config `clientId`', () => {
+      const bidRequests = [
+        {
+          bidder: BIDDER_CODE,
+          params: {
+            placeUid: '123',
+          },
+        },
+      ];
+
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+
+      expect(request.options.customHeaders['x-aotter-clientid']).equal('');
+    });
+
+    it('should send bid requests to ENDPOINT via POST', () => {
+      const bidRequests = [
+        {
+          bidder: BIDDER_CODE,
+          params: {
+            placeUid: '123',
+          },
+        },
+      ];
+
+      const bidderRequest = {
+        refererInfo: getRefererInfo(),
+      };
+
+      config.setConfig({
+        aseal: {
+          clientId: TEST_CLIENT_ID,
+        },
+      });
+
+      localStorageIsEnabledStub.returns(true);
+      getDataFromLocalStorageStub
+        .withArgs(WEB_SESSION_ID_KEY)
+        .returns(TEST_WEB_SESSION_ID);
+
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+
+      utils.getWindowTop.restore();
+      utils.getWindowSelf.restore();
+
+      sandbox.stub(utils, 'getWindowTop').returns(w);
+      sandbox.stub(utils, 'getWindowSelf').returns(w);
+
+      const payload = {
+        meta: {
+          dr: w.document.referrer,
+          drs: w.document.referrer,
+          drt: w.document.referrer,
+          dt: w.document.title,
+          dl: w.location.href,
+        },
+      };
+
+      expect(request.url).to.equal(API_ENDPOINT);
+      expect(request.method).to.equal('POST');
+      expect(request.options).deep.equal({
+        contentType: 'application/json',
+        withCredentials: true,
+        customHeaders: {
+          'x-aotter-clientid': TEST_CLIENT_ID,
+          'x-aotter-version': HEADER_AOTTER_VERSION,
+        },
+      });
+      expect(request.data.bids).deep.equal(bidRequests);
+      expect(request.data.payload).deep.equal(payload);
+      expect(request.data.device).deep.equal({
+        webSessionId: TEST_WEB_SESSION_ID,
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    it('should return an empty array when there are no bids', () => {
+      const serverResponse = {};
+      const response = spec.interpretResponse(serverResponse);
+
+      expect(response).is.an('array').that.is.empty;
+    });
+
+    it('should get correct bid response', () => {
+      const serverResponse = {
+        body: [
+          {
+            requestId: '2ef08f145b7a4f',
+            cpm: 3,
+            width: 300,
+            height: 250,
+            creativeId: '123abc',
+            dealId: '123abc',
+            currency: 'USD',
+            netRevenue: false,
+            mediaType: 'banner',
+            ttl: 300,
+            ad: '<!-- adtag -->',
+          },
+        ],
+      };
+      const response = spec.interpretResponse(serverResponse);
+
+      expect(response).deep.equal(serverResponse.body);
+    });
+  });
+});
diff --git a/test/spec/modules/asoBidAdapter_spec.js b/test/spec/modules/asoBidAdapter_spec.js
new file mode 100644
index 00000000000..88016d1902c
--- /dev/null
+++ b/test/spec/modules/asoBidAdapter_spec.js
@@ -0,0 +1,341 @@
+import {expect} from 'chai';
+import {spec} from 'modules/asoBidAdapter.js';
+import {parseUrl} from 'src/utils.js';
+import {BANNER, VIDEO} from 'src/mediaTypes.js';
+
+describe('Adserver.Online bidding adapter', function () {
+  const bannerRequest = {
+    bidder: 'aso',
+    params: {
+      zone: 1,
+      attr: {
+        keywords: ['a', 'b'],
+        tags: ['t1', 't2']
+      }
+    },
+    adUnitCode: 'adunit-banner',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [240, 400],
+        ]
+      }
+    },
+    bidId: 'bidid1',
+    bidderRequestId: 'bidreq1',
+    auctionId: 'auctionid1',
+    userIdAsEids: [{
+      source: 'src1',
+      uids: [
+        {
+          id: 'id123...'
+        }
+      ]
+    }]
+  };
+
+  const videoRequest = {
+    bidder: 'aso',
+    params: {
+      zone: 2,
+      video: {
+        api: [2],
+        maxduration: 30
+      }
+    },
+    mediaTypes: {
+      video: {
+        context: 'outstream',
+        playerSize: [[640, 480]],
+        protocols: [1, 2],
+        mimes: ['video/mp4'],
+      }
+    },
+    adUnitCode: 'adunit-video',
+    bidId: 'bidid12',
+    bidderRequestId: 'bidreq2',
+    auctionId: 'auctionid12'
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      numIframes: 0,
+      reachedTop: true,
+      page: 'https://example.com',
+      domain: 'example.com'
+    }
+  };
+
+  const gdprConsent = {
+    gdprApplies: true,
+    consentString: 'consentString',
+    vendorData: {
+      purpose: {
+        consents: {
+          1: true,
+          2: true,
+          3: false
+        }
+      }
+    }
+  };
+
+  const uspConsent = 'usp_consent';
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found in bidVideo', function () {
+      expect(spec.isBidRequestValid(videoRequest)).to.be.true
+    });
+
+    it('should return true when required params found in bidBanner', function () {
+      expect(spec.isBidRequestValid(bannerRequest)).to.be.true
+    });
+
+    it('should return false when required params not found', function () {
+      expect(spec.isBidRequestValid({})).to.be.false;
+    });
+
+    it('should return false when required params are not passed', function () {
+      const bid = Object.assign({}, bannerRequest);
+      delete bid.params;
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.be.false
+    });
+
+    it('should return false when required zone param not found', function () {
+      const bid = JSON.parse(JSON.stringify(videoRequest));
+      delete bid.params.zone;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('creates a valid banner request', function () {
+      bannerRequest.getFloor = () => ({ currency: 'USD', floor: 0.5 });
+
+      const requests = spec.buildRequests([bannerRequest], bidderRequest);
+      expect(requests).to.have.lengthOf(1);
+      const request = requests[0];
+
+      expect(request).to.exist;
+      expect(request.method).to.equal('POST');
+      const parsedRequestUrl = parseUrl(request.url);
+      expect(parsedRequestUrl.hostname).to.equal('srv.aso1.net');
+      expect(parsedRequestUrl.pathname).to.equal('/prebid/bidder');
+
+      const query = parsedRequestUrl.search;
+      expect(query.pbjs).to.contain('$prebid.version$');
+      expect(query.zid).to.equal('1');
+
+      expect(request.data).to.exist;
+
+      const payload = request.data;
+
+      expect(payload.site).to.not.equal(null);
+      expect(payload.site.ref).to.equal('');
+      expect(payload.site.page).to.equal('https://example.com');
+
+      expect(payload.device).to.not.equal(null);
+      expect(payload.device.w).to.equal(window.innerWidth);
+      expect(payload.device.h).to.equal(window.innerHeight);
+
+      expect(payload.imp).to.have.lengthOf(1);
+
+      expect(payload.imp[0].tagid).to.equal('adunit-banner');
+      expect(payload.imp[0].banner).to.not.equal(null);
+      expect(payload.imp[0].banner.w).to.equal(300);
+      expect(payload.imp[0].banner.h).to.equal(250);
+      expect(payload.imp[0].bidfloor).to.equal(0.5);
+      expect(payload.imp[0].bidfloorcur).to.equal('USD');
+    });
+
+    it('creates a valid video request', function () {
+      const requests = spec.buildRequests([videoRequest], bidderRequest);
+      expect(requests).to.have.lengthOf(1);
+      const request = requests[0];
+
+      expect(request).to.exist;
+      expect(request.method).to.equal('POST');
+      const parsedRequestUrl = parseUrl(request.url);
+      expect(parsedRequestUrl.hostname).to.equal('srv.aso1.net');
+      expect(parsedRequestUrl.pathname).to.equal('/prebid/bidder');
+
+      const query = parsedRequestUrl.search;
+      expect(query.pbjs).to.contain('$prebid.version$');
+      expect(query.zid).to.equal('2');
+
+      expect(request.data).to.not.be.empty;
+
+      const payload = request.data;
+
+      expect(payload.site).to.not.equal(null);
+      expect(payload.site.ref).to.equal('');
+      expect(payload.site.page).to.equal('https://example.com');
+
+      expect(payload.device).to.not.equal(null);
+      expect(payload.device.w).to.equal(window.innerWidth);
+      expect(payload.device.h).to.equal(window.innerHeight);
+
+      expect(payload.imp).to.have.lengthOf(1);
+
+      expect(payload.imp[0].tagid).to.equal('adunit-video');
+      expect(payload.imp[0].video).to.not.equal(null);
+      expect(payload.imp[0].video.w).to.equal(640);
+      expect(payload.imp[0].video.h).to.equal(480);
+      expect(payload.imp[0].banner).to.be.undefined;
+    });
+  });
+
+  describe('GDPR/USP compliance', function () {
+    it('should send GDPR/USP consent data if it applies', function () {
+      bidderRequest.gdprConsent = gdprConsent;
+      bidderRequest.uspConsent = uspConsent;
+
+      const requests = spec.buildRequests([bannerRequest], bidderRequest);
+      expect(requests).to.have.lengthOf(1);
+      const request = requests[0];
+
+      expect(request.data).to.not.be.empty;
+
+      const payload = request.data;
+
+      expect(payload.user.ext.consent).to.equal('consentString');
+      expect(payload.regs.ext.us_privacy).to.equal(uspConsent);
+      expect(payload.regs.ext.gdpr).to.equal(1);
+    });
+
+    it('should not send GDPR/USP consent data if it does not apply', function () {
+      bidderRequest.gdprConsent = null;
+      bidderRequest.uspConsent = null;
+
+      const requests = spec.buildRequests([bannerRequest], bidderRequest);
+      expect(requests).to.have.lengthOf(1);
+      const request = requests[0];
+
+      expect(request.data).to.not.be.empty;
+
+      const payload = request.data;
+
+      expect(payload).to.not.have.nested.property('regs.ext.gdpr');
+      expect(payload).to.not.have.nested.property('user.ext.consent');
+      expect(payload).to.not.have.nested.property('regs.ext.us_privacy');
+    });
+  });
+
+  describe('response handler', function () {
+    const bannerResponse = {
+      body: {
+        id: 'auctionid1',
+        bidid: 'bidid1',
+        seatbid: [{
+          bid: [
+            {
+              impid: 'impid1',
+              price: 0.3,
+              crid: 321,
+              adm: '<!-- HTML/JS -->',
+              w: 300,
+              h: 250,
+              adomain: ['example.com'],
+            }
+          ]
+        }],
+        cur: 'USD',
+        ext: {
+          user_syncs: [
+            {
+              url: 'sync_url',
+              type: 'iframe'
+            }
+          ]
+        }
+      },
+    };
+
+    const videoResponse = {
+      body: {
+        id: 'auctionid2',
+        bidid: 'bidid2',
+        seatbid: [{
+          bid: [
+            {
+              impid: 'impid2',
+              price: 0.5,
+              crid: 123,
+              adm: '<!-- VAST XML -->',
+              adomain: ['example.com'],
+              w: 640,
+              h: 480,
+            }
+          ]
+        }],
+        cur: 'USD'
+      },
+    };
+
+    it('handles banner responses', function () {
+      bannerRequest.bidRequest = {
+        mediaType: BANNER
+      };
+      const result = spec.interpretResponse(bannerResponse, bannerRequest);
+
+      expect(result).to.have.lengthOf(1);
+
+      expect(result[0]).to.exist;
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].mediaType).to.equal(BANNER);
+      expect(result[0].creativeId).to.equal(321);
+      expect(result[0].cpm).to.be.within(0.1, 0.5);
+      expect(result[0].ad).to.equal('<!-- HTML/JS -->');
+      expect(result[0].currency).to.equal('USD');
+      expect(result[0].netRevenue).to.equal(true);
+      expect(result[0].ttl).to.equal(300);
+      expect(result[0].dealId).to.not.exist;
+      expect(result[0].meta.advertiserDomains[0]).to.equal('example.com');
+    });
+
+    it('handles video responses', function () {
+      const request = {
+        bidRequest: videoRequest
+      };
+      request.bidRequest.mediaType = VIDEO;
+
+      const result = spec.interpretResponse(videoResponse, request);
+      expect(result).to.have.lengthOf(1);
+
+      expect(result[0].width).to.equal(640);
+      expect(result[0].height).to.equal(480);
+      expect(result[0].mediaType).to.equal(VIDEO);
+      expect(result[0].creativeId).to.equal(123);
+      expect(result[0].cpm).to.equal(0.5);
+      expect(result[0].vastXml).to.equal('<!-- VAST XML -->');
+      expect(result[0].renderer).to.be.a('object');
+      expect(result[0].currency).to.equal('USD');
+      expect(result[0].netRevenue).to.equal(true);
+      expect(result[0].ttl).to.equal(300);
+    });
+
+    it('handles empty responses', function () {
+      const response = [];
+      const bidderRequest = {};
+
+      const result = spec.interpretResponse(response, bidderRequest);
+      expect(result.length).to.equal(0);
+    });
+
+    describe('getUserSyncs', function () {
+      const syncOptions = {
+        iframeEnabled: true
+      };
+
+      it('should return iframe sync option', function () {
+        expect(spec.getUserSyncs(syncOptions, [bannerResponse], gdprConsent, uspConsent)[0].type).to.equal('iframe');
+        expect(spec.getUserSyncs(syncOptions, [bannerResponse], gdprConsent, uspConsent)[0].url).to.equal(
+          'sync_url?gdpr=1&consents_str=consentString&consents=1%2C2&us_privacy=usp_consent&'
+        );
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/astraoneBidAdapter_spec.js b/test/spec/modules/astraoneBidAdapter_spec.js
index e422f64b570..0e545081869 100644
--- a/test/spec/modules/astraoneBidAdapter_spec.js
+++ b/test/spec/modules/astraoneBidAdapter_spec.js
@@ -14,7 +14,7 @@ function getSlotConfigs(mediaTypes, params) {
 
 describe('AstraOne Adapter', function() {
   describe('isBidRequestValid method', function() {
-    const PLACE_ID = '5af45ad34d506ee7acad0c26';
+    const PLACE_ID = '5f477bf94d506ebe2c4240f3';
     const IMAGE_URL = 'https://creative.astraone.io/files/default_image-1-600x400.jpg';
 
     describe('returns true', function() {
@@ -176,21 +176,23 @@ describe('AstraOne Adapter', function() {
       describe('the bid is a banner', function() {
         it('should return a banner bid', function() {
           const serverResponse = {
-            body: [
-              {
-                bidId: '2df8c0733f284e',
-                price: 0.5,
-                currency: 'USD',
-                content: {
-                  content: 'html',
-                  actionUrls: {},
-                  seanceId: '123123'
-                },
-                width: 100,
-                height: 100,
-                ttl: 360
-              }
-            ]
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    actionUrls: {},
+                    seanceId: '123123'
+                  },
+                  width: 100,
+                  height: 100,
+                  ttl: 360
+                }
+              ]
+            }
           }
           const bids = spec.interpretResponse(serverResponse)
           expect(bids.length).to.equal(1)
diff --git a/test/spec/modules/atomxBidAdapter_spec.js b/test/spec/modules/atomxBidAdapter_spec.js
deleted file mode 100644
index d798bd6308c..00000000000
--- a/test/spec/modules/atomxBidAdapter_spec.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/atomxBidAdapter.js';
-
-describe('atomxAdapterTest', function () {
-  describe('bidRequestValidity', function () {
-    it('bidRequest with id param', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'atomx',
-        params: {
-          id: 1234,
-        },
-      })).to.equal(true);
-    });
-
-    it('bidRequest with no id param', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'atomx',
-        params: {
-        },
-      })).to.equal(false);
-    });
-  });
-
-  describe('bidRequest', function () {
-    const bidRequests = [{
-      'bidder': 'atomx',
-      'params': {
-        'id': '123'
-      },
-      'adUnitCode': 'aaa',
-      'transactionId': '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
-      'sizes': [300, 250],
-      'bidId': '1abgs362e0x48a8',
-      'bidderRequestId': '70deaff71c281d',
-      'auctionId': '5c66da22-426a-4bac-b153-77360bef5337'
-    },
-    {
-      'bidder': 'atomx',
-      'params': {
-        'id': '456',
-      },
-      'adUnitCode': 'bbb',
-      'transactionId': '193995b4-7122-4739-959b-2463282a138b',
-      'sizes': [[800, 600]],
-      'bidId': '22aidtbx5eabd9',
-      'bidderRequestId': '70deaff71c281d',
-      'auctionId': 'e97cafd0-ebfc-4f5c-b7c9-baa0fd335a4a'
-    }];
-
-    it('bidRequest HTTP method', function () {
-      const requests = spec.buildRequests(bidRequests);
-      requests.forEach(function(requestItem) {
-        expect(requestItem.method).to.equal('GET');
-      });
-    });
-
-    it('bidRequest url', function () {
-      const requests = spec.buildRequests(bidRequests);
-      requests.forEach(function(requestItem) {
-        expect(requestItem.url).to.match(new RegExp('p\\.ato\\.mx/placement'));
-      });
-    });
-
-    it('bidRequest data', function () {
-      const requests = spec.buildRequests(bidRequests);
-      expect(requests[0].data.id).to.equal('123');
-      expect(requests[0].data.size).to.equal('300x250');
-      expect(requests[0].data.prebid).to.equal('1abgs362e0x48a8');
-      expect(requests[1].data.id).to.equal('456');
-      expect(requests[1].data.size).to.equal('800x600');
-      expect(requests[1].data.prebid).to.equal('22aidtbx5eabd9');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const bidRequest = {
-      'method': 'GET',
-      'url': 'https://p.ato.mx/placement',
-      'data': {
-        'v': 12,
-        'id': '123',
-        'size': '300x250',
-        'prebid': '22aidtbx5eabd9',
-        'b': 0,
-        'h': '7t3y9',
-        'type': 'javascript',
-        'screen': '800x600x32',
-        'timezone': 0,
-        'domain': 'https://example.com',
-        'r': '',
-      }
-    };
-
-    const bidResponse = {
-      body: {
-        'cpm': 0.00009,
-        'width': 300,
-        'height': 250,
-        'url': 'https://atomx.com',
-        'creative_id': 456,
-        'code': '22aidtbx5eabd9',
-      },
-      headers: {}
-    };
-
-    it('result is correct', function () {
-      const result = spec.interpretResponse(bidResponse, bidRequest);
-
-      expect(result[0].requestId).to.equal('22aidtbx5eabd9');
-      expect(result[0].cpm).to.equal(0.00009 * 1000);
-      expect(result[0].width).to.equal(300);
-      expect(result[0].height).to.equal(250);
-      expect(result[0].creativeId).to.equal(456);
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].ttl).to.equal(60);
-      expect(result[0].adUrl).to.equal('https://atomx.com');
-    });
-  });
-});
diff --git a/test/spec/modules/atsAnalyticsAdapter_spec.js b/test/spec/modules/atsAnalyticsAdapter_spec.js
index 3dd6f261c11..cae90a19223 100644
--- a/test/spec/modules/atsAnalyticsAdapter_spec.js
+++ b/test/spec/modules/atsAnalyticsAdapter_spec.js
@@ -2,27 +2,49 @@ import atsAnalyticsAdapter from '../../../modules/atsAnalyticsAdapter.js';
 import { expect } from 'chai';
 import adapterManager from 'src/adapterManager.js';
 import {server} from '../../mocks/xhr.js';
-import {browserIsChrome, browserIsEdge, browserIsFirefox, browserIsSafari} from '../../../modules/atsAnalyticsAdapter.js';
+import {parseBrowser} from '../../../modules/atsAnalyticsAdapter.js';
+import {getStorageManager} from '../../../src/storageManager.js';
+import {analyticsUrl} from '../../../modules/atsAnalyticsAdapter.js';
+let utils = require('src/utils');
+
 let events = require('src/events');
 let constants = require('src/constants.json');
 
+export const storage = getStorageManager();
+let sandbox;
+let clock;
+let now = new Date();
+
 describe('ats analytics adapter', function () {
   beforeEach(function () {
     sinon.stub(events, 'getEvents').returns([]);
+    storage.setCookie('_lr_env_src_ats', 'true', 'Thu, 01 Jan 1970 00:00:01 GMT');
+    sandbox = sinon.sandbox.create();
+    clock = sandbox.useFakeTimers(now.getTime());
   });
 
   afterEach(function () {
     events.getEvents.restore();
+    atsAnalyticsAdapter.getUserAgent.restore();
     atsAnalyticsAdapter.disableAnalytics();
+    Math.random.restore();
+    sandbox.restore();
+    clock.restore();
   });
 
   describe('track', function () {
     it('builds and sends request and response data', function () {
-      sinon.spy(atsAnalyticsAdapter, 'track');
+      sinon.stub(Math, 'random').returns(0.99);
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+
+      now.setTime(now.getTime() + 3600000);
+      storage.setCookie('_lr_env_src_ats', 'true', now.toUTCString());
+      storage.setCookie('_lr_sampling_rate', '10', now.toUTCString());
+
+      this.timeout(2100);
 
       let initOptions = {
-        pid: '10433394',
-        host: 'https://example.com/dev',
+        pid: '10433394'
       };
       let auctionTimestamp = 1496510254326;
 
@@ -46,7 +68,7 @@ describe('ats analytics adapter', function () {
         'refererInfo': {
           'referer': 'https://example.com/dev'
         },
-        'auctionId': 'a5b849e5-87d7-4205-8300-d063084fcfb7',
+        'auctionId': 'a5b849e5-87d7-4205-8300-d063084fcfb7'
       };
       // prepare general auction - response
       let bidResponse = {
@@ -74,21 +96,43 @@ describe('ats analytics adapter', function () {
       let expectedAfterBid = {
         'Data': [{
           'has_envelope': true,
+          'adapter_version': 3,
           'bidder': 'appnexus',
           'bid_id': '30c77d079cdf17',
           'auction_id': 'a5b849e5-87d7-4205-8300-d063084fcfb7',
-          'user_browser': (browserIsFirefox() || browserIsEdge() || browserIsChrome() || browserIsSafari()),
+          'user_browser': parseBrowser(),
           'user_platform': navigator.platform,
           'auction_start': '2020-02-03T14:14:25.161Z',
           'domain': window.location.hostname,
+          'envelope_source': true,
           'pid': '10433394',
           'response_time_stamp': '2020-02-03T14:23:11.978Z',
           'currency': 'USD',
           'cpm': 0.5,
-          'net_revenue': true
+          'net_revenue': true,
+          'bid_won': true
         }]
       };
 
+      let wonRequest = {
+        'adId': '2eddfdc0c791dc',
+        'mediaType': 'banner',
+        'requestId': '30c77d079cdf17',
+        'cpm': 0.5,
+        'creativeId': 29681110,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'auctionId': 'a5b849e5-87d7-4205-8300-d063084fcfb7',
+        'statusMessage': 'Bid available',
+        'responseTimestamp': 1633525319061,
+        'requestTimestamp': 1633525319258,
+        'bidder': 'appnexus',
+        'adUnitCode': 'div-gpt-ad-1438287399331-0',
+        'size': '300x250',
+        'status': 'rendered'
+      };
+
       // lets simulate that some bidders timeout
       let bidTimeoutArgsV1 = [
         {
@@ -130,21 +174,104 @@ describe('ats analytics adapter', function () {
 
       // Step 5: Send auction end event
       events.emit(constants.EVENTS.AUCTION_END, {});
+      // Step 6: Send bid won event
+      events.emit(constants.EVENTS.BID_WON, wonRequest);
+
+      sandbox.stub($$PREBID_GLOBAL$$, 'getAllWinningBids').callsFake((key) => {
+        return [wonRequest]
+      });
+
+      clock.tick(2000);
 
       let requests = server.requests.filter(req => {
-        return req.url.indexOf(initOptions.host) > -1;
+        return req.url.indexOf(analyticsUrl) > -1;
       });
 
       expect(requests.length).to.equal(1);
 
       let realAfterBid = JSON.parse(requests[0].requestBody);
 
-      // Step 6: assert real data after bid and expected data
+      // Step 7: assert real data after bid and expected data
       expect(realAfterBid['Data']).to.deep.equal(expectedAfterBid['Data']);
 
-      // check that the host and publisher ID is configured via options
-      expect(atsAnalyticsAdapter.context.host).to.equal(initOptions.host);
+      // check that the publisher ID is configured via options
       expect(atsAnalyticsAdapter.context.pid).to.equal(initOptions.pid);
     })
+    it('check browser is safari', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      sinon.stub(Math, 'random').returns(0.99);
+      let browser = parseBrowser();
+      expect(browser).to.equal('Safari');
+    })
+    it('check browser is chrome', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (iPhone; CPU iPhone OS 13_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/80.0.3987.95 Mobile/15E148 Safari/604.1');
+      sinon.stub(Math, 'random').returns(0.99);
+      let browser = parseBrowser();
+      expect(browser).to.equal('Chrome');
+    })
+    it('check browser is edge', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43');
+      sinon.stub(Math, 'random').returns(0.99);
+      let browser = parseBrowser();
+      expect(browser).to.equal('Microsoft Edge');
+    })
+    it('check browser is firefox', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (iPhone; CPU OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/23.0  Mobile/15E148 Safari/605.1.15');
+      sinon.stub(Math, 'random').returns(0.99);
+      let browser = parseBrowser();
+      expect(browser).to.equal('Firefox');
+    })
+    it('check browser is unknown', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns(undefined);
+      sinon.stub(Math, 'random').returns(0.99);
+      let browser = parseBrowser();
+      expect(browser).to.equal('Unknown');
+    })
+    it('should not fire analytics request if sampling rate is 0', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      sinon.stub(Math, 'random').returns(0.99);
+      let result = atsAnalyticsAdapter.shouldFireRequest(0);
+      expect(result).to.equal(false);
+    })
+    it('should fire analytics request', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      sinon.stub(Math, 'random').returns(0.99);
+      // publisher can try to pass anything they want but we will set sampling rate to 100, which means we will have 1% of requests
+      let result = atsAnalyticsAdapter.shouldFireRequest(8);
+      expect(result).to.equal(true);
+    })
+    it('should not fire analytics request if math random is something other then 0.99', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      sinon.stub(Math, 'random').returns(0.98);
+      // publisher can try to pass anything they want but we will set sampling rate to 100, which means we will have 1% of requests
+      let result = atsAnalyticsAdapter.shouldFireRequest(10);
+      expect(result).to.equal(false);
+    })
+
+    it('should set cookie value to 10 for _lr_sampling_rate', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      sinon.stub(Math, 'random').returns(0.99);
+      atsAnalyticsAdapter.setSamplingCookie(10);
+      let samplingRate = storage.getCookie('_lr_sampling_rate');
+      expect(samplingRate).to.equal('10');
+    })
+
+    it('should set cookie value to 0 for _lr_sampling_rate', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      sinon.stub(Math, 'random').returns(0.99);
+      atsAnalyticsAdapter.setSamplingCookie(0);
+      let samplingRate = storage.getCookie('_lr_sampling_rate');
+      expect(samplingRate).to.equal('0');
+    })
+
+    it('enable analytics', function () {
+      sandbox.stub(utils, 'logError');
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      sinon.stub(Math, 'random').returns(0.99);
+      atsAnalyticsAdapter.enableAnalytics({
+        options: {}
+      });
+      expect(utils.logError.called).to.equal(true);
+    })
   })
 })
diff --git a/test/spec/modules/audienceNetworkBidAdapter_spec.js b/test/spec/modules/audienceNetworkBidAdapter_spec.js
deleted file mode 100644
index 04694731981..00000000000
--- a/test/spec/modules/audienceNetworkBidAdapter_spec.js
+++ /dev/null
@@ -1,568 +0,0 @@
-/**
- * @file Tests for AudienceNetwork adapter.
- */
-import { expect } from 'chai';
-
-import { spec } from 'modules/audienceNetworkBidAdapter.js';
-import * as utils from 'src/utils.js';
-
-const {
-  code,
-  supportedMediaTypes,
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse
-} = spec;
-
-const bidder = 'audienceNetwork';
-const placementId = 'test-placement-id';
-const playerwidth = 320;
-const playerheight = 180;
-const requestId = 'test-request-id';
-const debug = 'adapterver=1.3.0&platform=241394079772386&platver=$prebid.version$&cb=test-uuid';
-const expectedPageUrl = encodeURIComponent('http://www.prebid-test.com/audienceNetworkTest.html?pbjs_debug=true');
-const mockBidderRequest = {
-  bidderCode: 'audienceNetwork',
-  auctionId: '720146a0-8f32-4db0-bb30-21f1d057efb4',
-  bidderRequestId: '1312d48561657e',
-  auctionStart: 1579711852920,
-  timeout: 3000,
-  refererInfo: {
-    referer: 'http://www.prebid-test.com/audienceNetworkTest.html?pbjs_debug=true',
-    reachedTop: true,
-    numIframes: 0,
-    stack: ['http://www.prebid-test.com/audienceNetworkTest.html?pbjs_debug=true'],
-    canonicalUrl: undefined
-  },
-  start: 1579711852925
-};
-
-describe('AudienceNetwork adapter', function () {
-  describe('Public API', function () {
-    it('code', function () {
-      expect(code).to.equal(bidder);
-    });
-    it('supportedMediaTypes', function () {
-      expect(supportedMediaTypes).to.deep.equal(['banner', 'video']);
-    });
-    it('isBidRequestValid', function () {
-      expect(isBidRequestValid).to.be.a('function');
-    });
-    it('buildRequests', function () {
-      expect(buildRequests).to.be.a('function');
-    });
-    it('interpretResponse', function () {
-      expect(interpretResponse).to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    it('missing placementId parameter', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[300, 250]]
-      })).to.equal(false);
-    });
-
-    it('invalid sizes parameter', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: ['', undefined, null, '300x100', [300, 100], [300], {}],
-        params: { placementId }
-      })).to.equal(false);
-    });
-
-    it('valid when at least one valid size', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[1, 1], [300, 250]],
-        params: { placementId }
-      })).to.equal(true);
-    });
-
-    it('valid parameters', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[300, 250], [320, 50]],
-        params: { placementId }
-      })).to.equal(true);
-    });
-
-    it('fullwidth', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[300, 250], [336, 280]],
-        params: {
-          placementId,
-          format: 'fullwidth'
-        }
-      })).to.equal(true);
-    });
-
-    it('native', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[300, 250]],
-        params: {
-          placementId,
-          format: 'native'
-        }
-      })).to.equal(true);
-    });
-
-    it('native with non-IAB size', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[728, 90]],
-        params: {
-          placementId,
-          format: 'native'
-        }
-      })).to.equal(true);
-    });
-
-    it('video', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[playerwidth, playerheight]],
-        params: {
-          placementId,
-          format: 'video'
-        }
-      })).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    before(function () {
-      sinon
-        .stub(utils, 'generateUUID')
-        .returns('test-uuid');
-    });
-
-    after(function () {
-      utils.generateUUID.restore();
-    });
-
-    it('takes the canonicalUrl as priority over referer for pageurl', function () {
-      let expectedCanonicalUrl = encodeURIComponent('http://www.this-is-canonical-url.com/hello-world.html?pbjs_debug=true');
-      mockBidderRequest.refererInfo.canonicalUrl = 'http://www.this-is-canonical-url.com/hello-world.html?pbjs_debug=true';
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[300, 50], [300, 250], [320, 50]],
-        params: { placementId }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['300x250'],
-        method: 'GET',
-        pageurl: expectedCanonicalUrl,
-        requestIds: [requestId],
-        sizes: ['300x250'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=300x250&testmode=false&pageurl=${expectedCanonicalUrl}&sdk[]=6.0.web&${debug}`
-      }]);
-      mockBidderRequest.refererInfo.canonicalUrl = undefined;
-    });
-
-    it('can build URL for IAB unit', function () {
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[300, 50], [300, 250], [320, 50]],
-        params: { placementId }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['300x250'],
-        method: 'GET',
-        pageurl: expectedPageUrl,
-        requestIds: [requestId],
-        sizes: ['300x250'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=300x250&testmode=false&pageurl=${expectedPageUrl}&sdk[]=6.0.web&${debug}`
-      }]);
-    });
-
-    it('can build URL for video unit', function () {
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[640, 480]],
-        params: {
-          placementId,
-          format: 'video'
-        }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['video'],
-        method: 'GET',
-        pageurl: expectedPageUrl,
-        requestIds: [requestId],
-        sizes: ['640x480'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=video&testmode=false&pageurl=${expectedPageUrl}&sdk[]=&${debug}&playerwidth=640&playerheight=480`
-      }]);
-    });
-
-    it('can build URL for native unit in non-IAB size', function () {
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[728, 90]],
-        params: {
-          placementId,
-          format: 'native'
-        }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['native'],
-        method: 'GET',
-        pageurl: expectedPageUrl,
-        requestIds: [requestId],
-        sizes: ['728x90'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=native&testmode=false&pageurl=${expectedPageUrl}&sdk[]=6.0.web&${debug}`
-      }]);
-    });
-
-    it('can build URL for deprecated fullwidth unit, overriding platform', function () {
-      const platform = 'test-platform';
-      const debugPlatform = debug.replace('241394079772386', platform);
-
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[300, 250]],
-        params: {
-          placementId,
-          platform,
-          format: 'fullwidth'
-        }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['300x250'],
-        method: 'GET',
-        pageurl: expectedPageUrl,
-        requestIds: [requestId],
-        sizes: ['300x250'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=300x250&testmode=false&pageurl=${expectedPageUrl}&sdk[]=6.0.web&${debugPlatform}`
-      }]);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('error in response', function () {
-      expect(interpretResponse({
-        body: {
-          errors: ['test-error-message']
-        }
-      }, {})).to.deep.equal([]);
-    });
-
-    it('valid native bid in response', function () {
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: 'test-bid-id',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['native'],
-        requestIds: [requestId],
-        sizes: [[300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.width).to.equal(300);
-      expect(bidResponse.height).to.equal(250);
-      expect(bidResponse.ad)
-        .to.contain(`placementid: '${placementId}',`)
-        .and.to.contain(`format: 'native',`)
-        .and.to.contain(`bidid: 'test-bid-id',`)
-        .and.to.contain('getElementsByTagName("style")', 'ad missing native styles')
-        .and.to.contain('<div class="thirdPartyRoot"><a class="fbAdLink">', 'ad missing native container');
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.creativeId).to.equal(placementId);
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.currency).to.equal('USD');
-
-      expect(bidResponse.hb_bidder).to.equal('fan');
-      expect(bidResponse.fb_bidid).to.equal('test-bid-id');
-      expect(bidResponse.fb_format).to.equal('native');
-      expect(bidResponse.fb_placementid).to.equal(placementId);
-    });
-
-    it('valid IAB bid in response', function () {
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: 'test-bid-id',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['300x250'],
-        requestIds: [requestId],
-        sizes: [[300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.width).to.equal(300);
-      expect(bidResponse.height).to.equal(250);
-      expect(bidResponse.ad)
-        .to.contain(`placementid: '${placementId}',`)
-        .and.to.contain(`format: '300x250',`)
-        .and.to.contain(`bidid: 'test-bid-id',`)
-        .and.not.to.contain('getElementsByTagName("style")', 'ad should not contain native styles')
-        .and.not.to.contain('<div class="thirdPartyRoot"><a class="fbAdLink">', 'ad should not contain native container');
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.creativeId).to.equal(placementId);
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.currency).to.equal('USD');
-      expect(bidResponse.hb_bidder).to.equal('fan');
-      expect(bidResponse.fb_bidid).to.equal('test-bid-id');
-      expect(bidResponse.fb_format).to.equal('300x250');
-      expect(bidResponse.fb_placementid).to.equal(placementId);
-    });
-
-    it('filters invalid slot sizes', function () {
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: 'test-bid-id',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['300x250'],
-        requestIds: [requestId],
-        sizes: [[300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.width).to.equal(300);
-      expect(bidResponse.height).to.equal(250);
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.creativeId).to.equal(placementId);
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.currency).to.equal('USD');
-      expect(bidResponse.hb_bidder).to.equal('fan');
-      expect(bidResponse.fb_bidid).to.equal('test-bid-id');
-      expect(bidResponse.fb_format).to.equal('300x250');
-      expect(bidResponse.fb_placementid).to.equal(placementId);
-    });
-
-    it('valid multiple bids in response', function () {
-      const placementIdNative = 'test-placement-id-native';
-      const placementIdIab = 'test-placement-id-iab';
-
-      const [bidResponseNative, bidResponseIab] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementIdNative]: [{
-              placement_id: placementIdNative,
-              bid_id: 'test-bid-id-native',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }],
-            [placementIdIab]: [{
-              placement_id: placementIdIab,
-              bid_id: 'test-bid-id-iab',
-              bid_price_cents: 456,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['native', '300x250'],
-        requestIds: [requestId, requestId],
-        sizes: ['300x250', [300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponseNative.cpm).to.equal(1.23);
-      expect(bidResponseNative.requestId).to.equal(requestId);
-      expect(bidResponseNative.width).to.equal(300);
-      expect(bidResponseNative.height).to.equal(250);
-      expect(bidResponseNative.ad)
-        .to.contain(`placementid: '${placementIdNative}',`)
-        .and.to.contain(`format: 'native',`)
-        .and.to.contain(`bidid: 'test-bid-id-native',`);
-      expect(bidResponseNative.ttl).to.equal(600);
-      expect(bidResponseNative.creativeId).to.equal(placementIdNative);
-      expect(bidResponseNative.netRevenue).to.equal(true);
-      expect(bidResponseNative.currency).to.equal('USD');
-      expect(bidResponseNative.hb_bidder).to.equal('fan');
-      expect(bidResponseNative.fb_bidid).to.equal('test-bid-id-native');
-      expect(bidResponseNative.fb_format).to.equal('native');
-      expect(bidResponseNative.fb_placementid).to.equal(placementIdNative);
-
-      expect(bidResponseIab.cpm).to.equal(4.56);
-      expect(bidResponseIab.requestId).to.equal(requestId);
-      expect(bidResponseIab.width).to.equal(300);
-      expect(bidResponseIab.height).to.equal(250);
-      expect(bidResponseIab.ad)
-        .to.contain(`placementid: '${placementIdIab}',`)
-        .and.to.contain(`format: '300x250',`)
-        .and.to.contain(`bidid: 'test-bid-id-iab',`);
-      expect(bidResponseIab.ttl).to.equal(600);
-      expect(bidResponseIab.creativeId).to.equal(placementIdIab);
-      expect(bidResponseIab.netRevenue).to.equal(true);
-      expect(bidResponseIab.currency).to.equal('USD');
-      expect(bidResponseIab.hb_bidder).to.equal('fan');
-      expect(bidResponseIab.fb_bidid).to.equal('test-bid-id-iab');
-      expect(bidResponseIab.fb_format).to.equal('300x250');
-      expect(bidResponseIab.fb_placementid).to.equal(placementIdIab);
-    });
-
-    it('valid video bid in response', function () {
-      const bidId = 'test-bid-id-video';
-
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: bidId,
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['video'],
-        requestIds: [requestId],
-        sizes: [[playerwidth, playerheight]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.ttl).to.equal(3600);
-      expect(bidResponse.mediaType).to.equal('video');
-      expect(bidResponse.vastUrl).to.equal(`https://an.facebook.com/v1/instream/vast.xml?placementid=${placementId}&pageurl=${expectedPageUrl}&playerwidth=${playerwidth}&playerheight=${playerheight}&bidid=${bidId}`);
-      expect(bidResponse.width).to.equal(playerwidth);
-      expect(bidResponse.height).to.equal(playerheight);
-    });
-
-    it('mixed video and native bids', function () {
-      const videoPlacementId = 'test-video-placement-id';
-      const videoBidId = 'test-video-bid-id';
-      const nativePlacementId = 'test-native-placement-id';
-      const nativeBidId = 'test-native-bid-id';
-
-      const [bidResponseVideo, bidResponseNative] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [videoPlacementId]: [{
-              placement_id: videoPlacementId,
-              bid_id: videoBidId,
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }],
-            [nativePlacementId]: [{
-              placement_id: nativePlacementId,
-              bid_id: nativeBidId,
-              bid_price_cents: 456,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['video', 'native'],
-        requestIds: [requestId, requestId],
-        sizes: [[playerwidth, playerheight], [300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponseVideo.cpm).to.equal(1.23);
-      expect(bidResponseVideo.requestId).to.equal(requestId);
-      expect(bidResponseVideo.ttl).to.equal(3600);
-      expect(bidResponseVideo.mediaType).to.equal('video');
-      expect(bidResponseVideo.vastUrl).to.equal(`https://an.facebook.com/v1/instream/vast.xml?placementid=${videoPlacementId}&pageurl=${expectedPageUrl}&playerwidth=${playerwidth}&playerheight=${playerheight}&bidid=${videoBidId}`);
-      expect(bidResponseVideo.width).to.equal(playerwidth);
-      expect(bidResponseVideo.height).to.equal(playerheight);
-
-      expect(bidResponseNative.cpm).to.equal(4.56);
-      expect(bidResponseNative.requestId).to.equal(requestId);
-      expect(bidResponseNative.ttl).to.equal(600);
-      expect(bidResponseNative.width).to.equal(300);
-      expect(bidResponseNative.height).to.equal(250);
-      expect(bidResponseNative.ad)
-        .to.contain(`placementid: '${nativePlacementId}',`)
-        .and.to.contain(`format: 'native',`)
-        .and.to.contain(`bidid: '${nativeBidId}',`);
-    });
-
-    it('mixture of valid native bid and error in response', function () {
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: ['test-error-message'],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: 'test-bid-id',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['native'],
-        requestIds: [requestId],
-        sizes: [[300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.width).to.equal(300);
-      expect(bidResponse.height).to.equal(250);
-      expect(bidResponse.ad)
-        .to.contain(`placementid: '${placementId}',`)
-        .and.to.contain(`format: 'native',`)
-        .and.to.contain(`bidid: 'test-bid-id',`)
-        .and.to.contain('getElementsByTagName("style")', 'ad missing native styles')
-        .and.to.contain('<div class="thirdPartyRoot"><a class="fbAdLink">', 'ad missing native container');
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.creativeId).to.equal(placementId);
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.currency).to.equal('USD');
-
-      expect(bidResponse.hb_bidder).to.equal('fan');
-      expect(bidResponse.fb_bidid).to.equal('test-bid-id');
-      expect(bidResponse.fb_format).to.equal('native');
-      expect(bidResponse.fb_placementid).to.equal(placementId);
-    });
-  });
-});
diff --git a/test/spec/modules/audiencerunBidAdapter_spec.js b/test/spec/modules/audiencerunBidAdapter_spec.js
index 826944abaf5..57de8bdb0df 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',
-        'adId': '1234',
-        '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 -->'
-      }
-    ]
-  }
+        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,37 +79,46 @@ describe('AudienceRun bid adapter tests', function() {
     });
   });
 
-  describe('buildRequests', function() {
-    let bidRequests = [
+  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,
+          page: 'https://example.com',
+          topmostLocation: 'https://example.com',
+          numIframes: 0,
+          reachedTop: true,
+        },
       });
 
       expect(request.url).to.equal(ENDPOINT);
@@ -115,7 +127,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];
@@ -127,13 +141,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);
@@ -143,10 +157,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);
@@ -156,31 +170,139 @@ describe('AudienceRun bid adapter tests', function() {
       expect(payload2.gdpr.consent).to.equal(consentString);
       expect(payload2.gdpr.applies).to.equal(false);
     });
+
+    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,
+        },
+      });
+      const request = spec.buildRequests([bid]);
+      const payload = JSON.parse(request.data);
+      expect(payload.bids[0].bidfloor).to.exist.and.to.equal(0.2);
+    });
+
+    it('should use floors module value', function () {
+      const bid = Object.assign({}, bidRequest, {
+        params: {
+          bidfloor: 0.5,
+        },
+      });
+      bid.getFloor = () => {
+        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',
-      'adId': '12345abcde',
-      'cpm': 8.021951999999999999,
-      'width': '728',
-      'height': '90',
-      'creativeId': '5678',
-      'currency': 'USD',
-      'netRevenue': false,
-      'ttl': 300,
-      'ad': '<!-- test creative -->',
-      'mediaType': 'banner'
-    }];
+    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('handles empty bid response', function () {
+    it('should handle empty bid response', function () {
       const response = {
-        body: {}
+        body: {},
       };
       let result = spec.interpretResponse(response);
       expect(result.length).to.equal(0);
@@ -188,17 +310,25 @@ 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' },
+      ]);
+    });
+  });
+
+  describe('onTimeout', function () {
+    it('should exists and be a function', () => {
+      expect(spec.onTimeout).to.exist.and.to.be.a('function');
     });
   });
 });
diff --git a/test/spec/modules/automatadBidAdapter_spec.js b/test/spec/modules/automatadBidAdapter_spec.js
index 788fd3aefc4..e7b68b739c7 100644
--- a/test/spec/modules/automatadBidAdapter_spec.js
+++ b/test/spec/modules/automatadBidAdapter_spec.js
@@ -5,7 +5,25 @@ import { newBidder } from 'src/adapters/bidderFactory.js'
 describe('automatadBidAdapter', function () {
   const adapter = newBidder(spec)
 
-  let bidRequest = {
+  let bidRequestRequiredParams = {
+    bidder: 'automatad',
+    params: {siteId: '123ad'},
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 600]],
+      }
+    },
+    adUnitCode: 'some-ad-unit-code',
+    transactionId: '1465569e-52cc-4c36-88a1-7174cfef4b44',
+    sizes: [[300, 600]],
+    bidId: '123abc',
+    bidderRequestId: '3213887463c059',
+    auctionId: 'abc-123',
+    src: 'client',
+    bidRequestsCount: 1
+  }
+
+  let bidRequestAllParams = {
     bidder: 'automatad',
     params: {siteId: '123ad', placementId: '123abc345'},
     mediaTypes: {
@@ -30,6 +48,7 @@ describe('automatadBidAdapter', function () {
         {
           'bid': [
             {
+              'bidId': '123',
               'adm': '<!-- creative code -->',
               'adomain': [
                 'someAdDomain'
@@ -58,10 +77,14 @@ describe('automatadBidAdapter', function () {
   })
 
   describe('isBidRequestValid', function () {
-    let inValidBid = Object.assign({}, bidRequest)
+    let inValidBid = Object.assign({}, bidRequestRequiredParams)
     delete inValidBid.params
     it('should return true if all params present', function () {
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true)
+      expect(spec.isBidRequestValid(bidRequestAllParams)).to.equal(true)
+    })
+
+    it('should return true if only required params present', function() {
+      expect(spec.isBidRequestValid(bidRequestRequiredParams)).to.equal(true)
     })
 
     it('should return false if any parameter missing', function () {
@@ -70,9 +93,13 @@ describe('automatadBidAdapter', function () {
   })
 
   describe('buildRequests', function () {
-    let req = spec.buildRequests([ bidRequest ], { refererInfo: { } })
+    let req = spec.buildRequests([ bidRequestRequiredParams ], { refererInfo: { } })
     let rdata
 
+    it('should have withCredentials option as true', function() {
+      expect(req.options.withCredentials).to.equal(true)
+    })
+
     it('should return request object', function () {
       expect(req).to.not.be.null
     })
@@ -86,14 +113,19 @@ describe('automatadBidAdapter', function () {
       expect(rdata.imp.length).to.equal(1)
     })
 
+    it('should include siteId', function () {
+      let r = rdata.imp[0]
+      expect(r.siteId !== null).to.be.true
+    })
+
     it('should include media types', function () {
       let r = rdata.imp[0]
       expect(r.media_types !== null).to.be.true
     })
 
-    it('should include all publisher params', function () {
+    it('should include adunit code', function () {
       let r = rdata.imp[0]
-      expect(r.siteID !== null && r.placementID !== null).to.be.true
+      expect(r.adUnitCode !== null).to.be.true
     })
   })
 
@@ -101,6 +133,57 @@ describe('automatadBidAdapter', function () {
     it('should get the correct bid response', function () {
       let result = spec.interpretResponse(expectedResponse[0])
       expect(result).to.be.an('array').that.is.not.empty
+      expect(result[0].meta.advertiserDomains[0]).to.equal('someAdDomain');
+    })
+
+    it('should interpret multiple bids in seatbid', function () {
+      let multipleBidResponse = [{
+        'body': {
+          'id': 'abc-321',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'adm': '<!-- creative code -->',
+                  'adomain': [
+                    'someAdDomain'
+                  ],
+                  'crid': 123,
+                  'h': 600,
+                  'id': 'bid1',
+                  'impid': 'imp1',
+                  'nurl': 'https://example/win',
+                  'price': 0.5,
+                  'w': 300
+                }
+              ]
+            }, {
+              'bid': [
+                {
+                  'adm': '<!-- creative code -->',
+                  'adomain': [
+                    'someAdDomain'
+                  ],
+                  'crid': 321,
+                  'h': 600,
+                  'id': 'bid1',
+                  'impid': 'imp2',
+                  'nurl': 'https://example/win',
+                  'price': 0.5,
+                  'w': 300
+                }
+              ]
+            }
+          ]
+        }
+      }]
+      let result = spec.interpretResponse(multipleBidResponse[0]).map(bid => {
+        const {requestId} = bid;
+        return [ requestId ];
+      });
+
+      assert.equal(result.length, 2);
+      assert.deepEqual(result, [[ 'imp1' ], [ 'imp2' ]]);
     })
 
     it('handles empty bid response', function () {
@@ -112,14 +195,29 @@ describe('automatadBidAdapter', function () {
     })
   })
 
-  describe('getUserSyncs', function () {
-    it('should return iframe sync', function () {
-      let sync = spec.getUserSyncs()
-      expect(sync.length).to.equal(1)
-      expect(sync[0].type === 'iframe')
-      expect(typeof sync[0].url === 'string')
+  describe('onTimeout', function () {
+    const timeoutData = {
+      'bidId': '123',
+      'bidder': 'automatad',
+      'adUnitCode': 'div-13',
+      'auctionId': '1232',
+      'params': [
+        {
+          'siteId': 'test',
+          'placementId': 'test123'
+        }
+      ],
+      'timeout': 1000
+    }
+
+    it('should exists and be a function', function () {
+      expect(spec.onTimeout).to.exist.and.to.be.a('function');
+    });
+
+    it('should include timeoutData', function () {
+      expect(spec.onTimeout(timeoutData)).to.be.undefined;
     })
-  })
+  });
 
   describe('onBidWon', function () {
     let serverResponses = spec.interpretResponse(expectedResponse[0])
diff --git a/test/spec/modules/avocetBidAdapter_spec.js b/test/spec/modules/avocetBidAdapter_spec.js
deleted file mode 100644
index 4cfd8ab89d4..00000000000
--- a/test/spec/modules/avocetBidAdapter_spec.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/avocetBidAdapter';
-import { newBidder } from 'src/adapters/bidderFactory';
-import { config } from 'src/config';
-
-describe('Avocet adapter', function () {
-  beforeEach(function () {
-    config.setConfig({
-      currency: {
-        adServerCurrency: 'USD',
-      },
-      publisherDomain: 'test.com',
-      fpd: {
-        some: 'data',
-      },
-    });
-  });
-
-  afterEach(function () {
-    config.resetConfig();
-  });
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      const adapter = newBidder(spec);
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    it('should return false for bid request missing params', () => {
-      const invalidBidRequest = {
-        bid: {},
-      };
-      expect(spec.isBidRequestValid(invalidBidRequest)).to.equal(false);
-    });
-    it('should return false for an invalid type placement param', () => {
-      const invalidBidRequest = {
-        params: {
-          placement: 123,
-        },
-      };
-      expect(spec.isBidRequestValid(invalidBidRequest)).to.equal(false);
-    });
-    it('should return false for an invalid length placement param', () => {
-      const invalidBidRequest = {
-        params: {
-          placement: '123',
-        },
-      };
-      expect(spec.isBidRequestValid(invalidBidRequest)).to.equal(false);
-    });
-    it('should return true for a valid length placement param', () => {
-      const validBidRequest = {
-        params: {
-          placement: '012345678901234567890123',
-        },
-      };
-      expect(spec.isBidRequestValid(validBidRequest)).to.equal(true);
-    });
-  });
-  describe('buildRequests', function () {
-    it('constructs a valid POST request', function () {
-      const request = spec.buildRequests(
-        [
-          {
-            bidder: 'avct',
-            params: {
-              placement: '012345678901234567890123',
-            },
-            userId: {
-              id5id: 'test'
-            }
-          },
-          {
-            bidder: 'avct',
-            params: {
-              placement: '012345678901234567890123',
-            },
-          },
-        ],
-        exampleBidderRequest
-      );
-      expect(request.method).to.equal('POST');
-      expect(request.url).to.equal('https://ads.avct.cloud/prebid');
-
-      const requestData = JSON.parse(request.data);
-      expect(requestData.ext).to.be.an('object');
-      expect(requestData.ext.currency).to.equal('USD');
-      expect(requestData.ext.publisherDomain).to.equal('test.com');
-      expect(requestData.ext.fpd).to.deep.equal({ some: 'data' });
-      expect(requestData.ext.schain).to.deep.equal({
-        validation: 'strict',
-        config: {
-          ver: '1.0',
-          complete: 1,
-          nodes: [
-            {
-              asi: 'indirectseller.com',
-              sid: '00001',
-              hp: 1,
-            },
-          ],
-        },
-      });
-      expect(requestData.ext.id5id).to.equal('test');
-      expect(requestData.bids).to.be.an('array');
-      expect(requestData.bids.length).to.equal(2);
-    });
-  });
-  describe('interpretResponse', function () {
-    it('no response', function () {
-      const response = spec.interpretResponse();
-      expect(response).to.be.an('array');
-      expect(response.length).to.equal(0);
-    });
-    it('no body', function () {
-      const response = spec.interpretResponse({});
-      expect(response).to.be.an('array');
-      expect(response.length).to.equal(0);
-    });
-    it('null body', function () {
-      const response = spec.interpretResponse({ body: null });
-      expect(response).to.be.an('array');
-      expect(response.length).to.equal(0);
-    });
-    it('empty body', function () {
-      const response = spec.interpretResponse({ body: {} });
-      expect(response).to.be.an('array');
-      expect(response.length).to.equal(0);
-    });
-    it('null body.responses', function () {
-      const response = spec.interpretResponse({ body: { responses: null } });
-      expect(response).to.be.an('array');
-      expect(response.length).to.equal(0);
-    });
-    it('array body', function () {
-      const response = spec.interpretResponse({ body: [{}] });
-      expect(response).to.be.an('array');
-      expect(response.length).to.equal(1);
-    });
-    it('array body.responses', function () {
-      const response = spec.interpretResponse({ body: { responses: [{}] } });
-      expect(response).to.be.an('array');
-      expect(response.length).to.equal(1);
-    });
-  });
-});
-
-const exampleBidderRequest = {
-  schain: {
-    validation: 'strict',
-    config: {
-      ver: '1.0',
-      complete: 1,
-      nodes: [
-        {
-          asi: 'indirectseller.com',
-          sid: '00001',
-          hp: 1,
-        },
-      ],
-    },
-  },
-};
diff --git a/test/spec/modules/axonixBidAdapter_spec.js b/test/spec/modules/axonixBidAdapter_spec.js
new file mode 100644
index 00000000000..37f409e5769
--- /dev/null
+++ b/test/spec/modules/axonixBidAdapter_spec.js
@@ -0,0 +1,378 @@
+import { expect } from 'chai';
+import { spec } from 'modules/axonixBidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory';
+import * as utils from 'src/utils';
+
+describe('AxonixBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  const SUPPLY_ID_1 = '91fd110a-5685-11eb-8db6-a7e0eeefbbc7';
+  const SUPPLY_ID_2 = '22de2092-568b-11eb-bae3-cfa975dc72aa';
+  const REGION_1 = 'us-east-1';
+  const REGION_2 = 'eu-west-1';
+
+  const BANNER_REQUEST = {
+    adUnitCode: 'ad_code',
+    bidId: 'abcd1234',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 200]
+        ]
+      }
+    },
+    bidder: 'axonix',
+    params: {
+      supplyId: SUPPLY_ID_1,
+      region: REGION_1
+    },
+    requestId: 'q4owht8ofqi3ulwsd',
+    transactionId: 'fvpq3oireansdwo'
+  };
+
+  const VIDEO_REQUEST = {
+    adUnitCode: 'ad_code',
+    bidId: 'abcd1234',
+    mediaTypes: {
+      video: {
+        context: 'outstream',
+        mimes: ['video/mp4'],
+        playerSize: [400, 300],
+        renderer: {
+          url: 'https://url.com',
+          backupOnly: true,
+          render: () => true
+        },
+      }
+    },
+    bidder: 'axonix',
+    params: {
+      supplyId: SUPPLY_ID_1,
+      region: REGION_1
+    },
+    requestId: 'q4owht8ofqi3ulwsd',
+    transactionId: 'fvpq3oireansdwo'
+  };
+
+  const BIDDER_REQUEST = {
+    bidderCode: 'axonix',
+    auctionId: '18fd8b8b0bd757',
+    bidderRequestId: '418b37f85e772c',
+    timeout: 3000,
+    gdprConsent: {
+      consentString: 'BOKAVy4OKAVy4ABAB8AAAAAZ+A==',
+      gdprApplies: true
+    },
+    refererInfo: {
+      page: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    }
+  };
+
+  const BANNER_RESPONSE = {
+    body: [{
+      requestId: 'f08b3a8dcff747eabada295dcf94eee0',
+      cpm: 6,
+      currency: 'USD',
+      width: 300,
+      height: 250,
+      ad: '<html></html>',
+      creativeId: 'abc',
+      netRevenue: false,
+      meta: {
+        networkId: 'nid',
+        advertiserDomains: [
+          'https://the.url'
+        ],
+        secondaryCatIds: [
+          'IAB1'
+        ],
+        mediaType: 'banner'
+      },
+      nurl: 'https://win.url'
+    }]
+  };
+
+  const VIDEO_RESPONSE = {
+    body: [{
+      requestId: 'f08b3a8dcff747eabada295dcf94eee0',
+      cpm: 6,
+      currency: 'USD',
+      width: 300,
+      height: 250,
+      ad: '<?xml version="1.0" encoding="UTF-8" ?><VAST version="3.0"></VAST>',
+      creativeId: 'abc',
+      netRevenue: false,
+      meta: {
+        networkId: 'nid',
+        advertiserDomains: [
+          'https://the.url'
+        ],
+        secondaryCatIds: [
+          'IAB1'
+        ],
+        mediaType: 'video'
+      },
+      nurl: 'https://win.url'
+    }]
+  };
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let validBids = [
+      {
+        bidder: 'axonix',
+        params: {
+          supplyId: SUPPLY_ID_1,
+          region: REGION_1
+        },
+      },
+      {
+        bidder: 'axonix',
+        params: {
+          supplyId: SUPPLY_ID_2,
+          region: REGION_2
+        },
+        future_parameter: {
+          future: 'ididid'
+        }
+      },
+    ];
+
+    let invalidBids = [
+      {
+        bidder: 'axonix',
+        params: {},
+      },
+      {
+        bidder: 'axonix',
+      },
+    ];
+
+    it('should accept valid bids', function () {
+      for (let bid of validBids) {
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      }
+    });
+
+    it('should reject invalid bids', function () {
+      for (let bid of invalidBids) {
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      }
+    });
+  });
+
+  describe('buildRequests: can handle banner ad requests', function () {
+    it('creates ServerRequests with the correct data', function () {
+      const [request] = spec.buildRequests([BANNER_REQUEST], BIDDER_REQUEST);
+
+      expect(request).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(request).to.have.property('method', 'POST');
+      expect(request).to.have.property('data');
+
+      const { data } = request;
+      expect(data.app).to.be.undefined;
+
+      expect(data).to.have.property('site');
+      expect(data.site).to.have.property('page', 'https://www.prebid.org');
+
+      expect(data).to.have.property('validBidRequest', BANNER_REQUEST);
+      expect(data).to.have.property('connectionType').to.exist;
+      expect(data).to.have.property('effectiveType').to.exist;
+      expect(data).to.have.property('devicetype', 2);
+      expect(data).to.have.property('bidfloor', 0);
+      expect(data).to.have.property('dnt', 0);
+      expect(data).to.have.property('language').to.be.a('string');
+      expect(data).to.have.property('prebidVersion').to.be.a('string');
+      expect(data).to.have.property('screenHeight').to.be.a('number');
+      expect(data).to.have.property('screenWidth').to.be.a('number');
+      expect(data).to.have.property('tmax').to.be.a('number');
+      expect(data).to.have.property('ua').to.be.a('string');
+    });
+
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      const bannerRequests = [utils.deepClone(BANNER_REQUEST), utils.deepClone(BANNER_REQUEST)];
+      bannerRequests[0].params.endpoint = 'https://the.url';
+      bannerRequests[1].params.endpoint = 'https://the.other.url';
+
+      const requests = spec.buildRequests(bannerRequests, BIDDER_REQUEST);
+
+      requests.forEach((request, index) => {
+        expect(request).to.have.property('url', bannerRequests[index].params.endpoint);
+      });
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      const bannerRequests = [utils.deepClone(BANNER_REQUEST), utils.deepClone(BANNER_REQUEST)];
+      bannerRequests[1].params.supplyId = SUPPLY_ID_2;
+      bannerRequests[1].params.region = REGION_2;
+
+      const requests = spec.buildRequests(bannerRequests, BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(requests[1]).to.have.property('url', `https://openrtb-${REGION_2}.axonix.com/supply/prebid/${SUPPLY_ID_2}`);
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      const bannerRequest = utils.deepClone(BANNER_REQUEST);
+      delete bannerRequest.params.region;
+
+      const requests = spec.buildRequests([bannerRequest], BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+    });
+  });
+
+  describe('buildRequests: can handle video ad requests', function () {
+    it('creates ServerRequests with the correct data', function () {
+      const [request] = spec.buildRequests([VIDEO_REQUEST], BIDDER_REQUEST);
+
+      expect(request).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(request).to.have.property('method', 'POST');
+      expect(request).to.have.property('data');
+
+      const { data } = request;
+      expect(data.app).to.be.undefined;
+
+      expect(data).to.have.property('site');
+      expect(data.site).to.have.property('page', 'https://www.prebid.org');
+
+      expect(data).to.have.property('validBidRequest', VIDEO_REQUEST);
+      expect(data).to.have.property('connectionType').to.exist;
+      expect(data).to.have.property('effectiveType').to.exist;
+      expect(data).to.have.property('devicetype', 2);
+      expect(data).to.have.property('bidfloor', 0);
+      expect(data).to.have.property('dnt', 0);
+      expect(data).to.have.property('language').to.be.a('string');
+      expect(data).to.have.property('prebidVersion').to.be.a('string');
+      expect(data).to.have.property('screenHeight').to.be.a('number');
+      expect(data).to.have.property('screenWidth').to.be.a('number');
+      expect(data).to.have.property('tmax').to.be.a('number');
+      expect(data).to.have.property('ua').to.be.a('string');
+    });
+
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      const videoRequests = [utils.deepClone(VIDEO_REQUEST), utils.deepClone(VIDEO_REQUEST)];
+      videoRequests[0].params.endpoint = 'https://the.url';
+      videoRequests[1].params.endpoint = 'https://the.other.url';
+
+      const requests = spec.buildRequests(videoRequests, BIDDER_REQUEST);
+
+      requests.forEach((request, index) => {
+        expect(request).to.have.property('url', videoRequests[index].params.endpoint);
+      });
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      const videoRequests = [utils.deepClone(VIDEO_REQUEST), utils.deepClone(VIDEO_REQUEST)];
+      videoRequests[1].params.supplyId = SUPPLY_ID_2;
+      videoRequests[1].params.region = REGION_2;
+
+      const requests = spec.buildRequests(videoRequests, BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(requests[1]).to.have.property('url', `https://openrtb-${REGION_2}.axonix.com/supply/prebid/${SUPPLY_ID_2}`);
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      const videoRequest = utils.deepClone(VIDEO_REQUEST);
+      delete videoRequest.params.region;
+
+      const requests = spec.buildRequests([videoRequest], BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+    });
+  });
+
+  describe.skip('buildRequests: can handle native ad requests', function () {
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      // loop:
+      //   set supply id
+      //   set region/endpoint in ssp config
+      //   call buildRequests, validate request (url, method, supply id)
+      expect.fail('Not implemented');
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      // no endpoint in config means default value openrtb.axonix.com
+      expect.fail('Not implemented');
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      // no region in config means default value us-east-1
+      expect.fail('Not implemented');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('considers corner cases', function() {
+      expect(spec.interpretResponse(null)).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse()).to.be.an('array').that.is.empty;
+    });
+
+    it('ignores unparseable responses', function() {
+      expect(spec.interpretResponse('invalid')).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse(['invalid'])).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse({ body: [{ invalid: 'object' }] })).to.be.an('array').that.is.empty;
+    });
+
+    it('parses banner responses', function () {
+      const response = spec.interpretResponse(BANNER_RESPONSE);
+
+      expect(response).to.be.an('array').that.is.not.empty;
+      expect(response[0]).to.equal(BANNER_RESPONSE.body[0]);
+    });
+
+    it('parses 1 video responses', function () {
+      const response = spec.interpretResponse(VIDEO_RESPONSE);
+
+      expect(response).to.be.an('array').that.is.not.empty;
+      expect(response[0]).to.equal(VIDEO_RESPONSE.body[0]);
+    });
+
+    it.skip('parses 1 native responses', function () {
+      // passing 1 valid native in a response generates an array with 1 correct prebid response
+      // examine mediaType:native, native element
+      // check nativeBidIsValid from {@link file://./../../../src/native.js}
+      expect.fail('Not implemented');
+    });
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('called once', function () {
+      spec.onBidWon(BANNER_RESPONSE.body[0]);
+      expect(utils.triggerPixel.calledOnce).to.equal(true);
+    });
+
+    it('called false', function () {
+      spec.onBidWon({ cpm: '2.21' });
+      expect(utils.triggerPixel.called).to.equal(false);
+    });
+
+    it('when there is no notification expected server side, none is called', function () {
+      var response = spec.onBidWon({});
+      expect(utils.triggerPixel.called).to.equal(false);
+      expect(response).to.be.an('undefined')
+    });
+  });
+
+  describe('onTimeout', function () {
+    it('banner response', () => {
+      spec.onTimeout(spec.interpretResponse(BANNER_RESPONSE));
+    });
+
+    it('video response', () => {
+      spec.onTimeout(spec.interpretResponse(VIDEO_RESPONSE));
+    });
+  });
+});
diff --git a/test/spec/modules/beachfrontBidAdapter_spec.js b/test/spec/modules/beachfrontBidAdapter_spec.js
index 5711e111e30..addd4304c7d 100644
--- a/test/spec/modules/beachfrontBidAdapter_spec.js
+++ b/test/spec/modules/beachfrontBidAdapter_spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
-import sinon from 'sinon';
 import { spec, VIDEO_ENDPOINT, BANNER_ENDPOINT, OUTSTREAM_SRC, DEFAULT_MIMES } from 'modules/beachfrontBidAdapter.js';
-import { parseUrl } from 'src/utils.js';
+import { config } from 'src/config.js';
+import { parseUrl, deepAccess } from 'src/utils.js';
 
 describe('BeachfrontAdapter', function () {
   let bidRequests;
@@ -129,7 +129,7 @@ describe('BeachfrontAdapter', function () {
       it('should attach the bid request object', function () {
         bidRequests[0].mediaTypes = { video: {} };
         bidRequests[1].mediaTypes = { video: {} };
-        const requests = spec.buildRequests(bidRequests);
+        const requests = spec.buildRequests(bidRequests, {});
         expect(requests[0].bidRequest).to.equal(bidRequests[0]);
         expect(requests[1].bidRequest).to.equal(bidRequests[1]);
       });
@@ -137,7 +137,7 @@ describe('BeachfrontAdapter', function () {
       it('should create a POST request for each bid', function () {
         const bidRequest = bidRequests[0];
         bidRequest.mediaTypes = { video: {} };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         expect(requests[0].method).to.equal('POST');
         expect(requests[0].url).to.equal(VIDEO_ENDPOINT + bidRequest.params.appId);
       });
@@ -155,7 +155,7 @@ describe('BeachfrontAdapter', function () {
         const topLocation = parseUrl('http://www.example.com?foo=bar', { decodeSearchAsString: true });
         const bidderRequest = {
           refererInfo: {
-            referer: topLocation.href
+            page: topLocation.href
           }
         };
         const requests = spec.buildRequests([ bidRequest ], bidderRequest);
@@ -172,6 +172,24 @@ describe('BeachfrontAdapter', function () {
         expect(data.cur).to.deep.equal(['USD']);
       });
 
+      it('must read from the floors module if available', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.getFloor = () => ({ currency: 'USD', floor: 1.16 });
+        const requests = spec.buildRequests([ bidRequest ], {});
+        const data = requests[0].data;
+        expect(data.imp[0].bidfloor).to.equal(1.16);
+      });
+
+      it('must use the bid floor param if no value is returned from the floors module', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.getFloor = () => ({});
+        const requests = spec.buildRequests([ bidRequest ], {});
+        const data = requests[0].data;
+        expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
+      });
+
       it('must parse bid size from a nested array', function () {
         const width = 640;
         const height = 480;
@@ -181,7 +199,7 @@ describe('BeachfrontAdapter', function () {
             playerSize: [[ width, height ]]
           }
         };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
         expect(data.imp[0].video).to.deep.contain({ w: width, h: height });
       });
@@ -195,7 +213,7 @@ describe('BeachfrontAdapter', function () {
             playerSize: `${width}x${height}`
           }
         };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
         expect(data.imp[0].video).to.deep.contain({ w: width, h: height });
       });
@@ -207,7 +225,7 @@ describe('BeachfrontAdapter', function () {
             playerSize: []
           }
         };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
         expect(data.imp[0].video).to.deep.contain({ w: undefined, h: undefined });
       });
@@ -218,22 +236,38 @@ describe('BeachfrontAdapter', function () {
         const bidRequest = bidRequests[0];
         bidRequest.sizes = [ width, height ];
         bidRequest.mediaTypes = { video: {} };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
         expect(data.imp[0].video).to.deep.contain({ w: width, h: height });
       });
 
-      it('must override video targeting params', function () {
+      it('must set video params from the standard object', function () {
         const bidRequest = bidRequests[0];
         const mimes = ['video/webm'];
         const playbackmethod = 2;
         const maxduration = 30;
         const placement = 4;
-        bidRequest.mediaTypes = { video: {} };
-        bidRequest.params.video = { mimes, playbackmethod, maxduration, placement };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const skip = 1;
+        bidRequest.mediaTypes = {
+          video: { mimes, playbackmethod, maxduration, placement, skip }
+        };
+        const requests = spec.buildRequests([ bidRequest ], {});
+        const data = requests[0].data;
+        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, placement, skip });
+      });
+
+      it('must override video params from the bidder object', function () {
+        const bidRequest = bidRequests[0];
+        const mimes = ['video/webm'];
+        const playbackmethod = 2;
+        const maxduration = 30;
+        const placement = 4;
+        const skip = 1;
+        bidRequest.mediaTypes = { video: { placement: 3, skip: 0 } };
+        bidRequest.params.video = { mimes, playbackmethod, maxduration, placement, skip };
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
-        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, placement });
+        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, placement, skip });
       });
 
       it('must add US privacy data to the request', function () {
@@ -262,22 +296,75 @@ describe('BeachfrontAdapter', function () {
         expect(data.user.ext.consent).to.equal(consentString);
       });
 
-      it('must add the Trade Desk User ID to the request', () => {
-        const tdid = '4321';
+      it('must add schain data to the request', () => {
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'directseller.com',
+              sid: '00001',
+              rid: 'BidRequest1',
+              hp: 1
+            }
+          ]
+        };
         const bidRequest = bidRequests[0];
         bidRequest.mediaTypes = { video: {} };
-        bidRequest.userId = { tdid };
-        const requests = spec.buildRequests([ bidRequest ]);
+        bidRequest.schain = schain;
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
-        expect(data.user.ext.eids[0]).to.deep.equal({
-          source: 'adserver.org',
-          uids: [{
-            id: tdid,
-            ext: {
-              rtiPartner: 'TDID'
-            }
-          }]
-        });
+        expect(data.source.ext.schain).to.deep.equal(schain);
+      });
+
+      it('must add supported user IDs to the request', () => {
+        const userId = {
+          tdid: '54017816',
+          idl_env: '13024996',
+          uid2: { id: '45843401' },
+          hadronId: { hadronId: '60314917', auSeg: ['segment1', 'segment2'] }
+        };
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.userId = userId;
+        const requests = spec.buildRequests([ bidRequest ], {});
+        const data = requests[0].data;
+        expect(data.user.ext.eids).to.deep.equal([
+          {
+            source: 'adserver.org',
+            uids: [{
+              id: userId.tdid,
+              ext: {
+                rtiPartner: 'TDID'
+              }
+            }]
+          },
+          {
+            source: 'liveramp.com',
+            uids: [{
+              id: userId.idl_env,
+              ext: {
+                rtiPartner: 'idl'
+              }
+            }]
+          },
+          {
+            source: 'uidapi.com',
+            uids: [{
+              id: userId.uid2.id,
+              ext: {
+                rtiPartner: 'UID2'
+              }
+            }]
+          },
+          {
+            source: 'audigent.com',
+            uids: [{
+              id: userId.hadronId,
+              atype: 1,
+            }]
+          }
+        ]);
       });
     });
 
@@ -285,14 +372,14 @@ describe('BeachfrontAdapter', function () {
       it('should attach the bid requests array', function () {
         bidRequests[0].mediaTypes = { banner: {} };
         bidRequests[1].mediaTypes = { banner: {} };
-        const requests = spec.buildRequests(bidRequests);
+        const requests = spec.buildRequests(bidRequests, {});
         expect(requests[0].bidRequest).to.deep.equal(bidRequests);
       });
 
       it('should create a single POST request for all bids', function () {
         bidRequests[0].mediaTypes = { banner: {} };
         bidRequests[1].mediaTypes = { banner: {} };
-        const requests = spec.buildRequests(bidRequests);
+        const requests = spec.buildRequests(bidRequests, {});
         expect(requests.length).to.equal(1);
         expect(requests[0].method).to.equal('POST');
         expect(requests[0].url).to.equal(BANNER_ENDPOINT);
@@ -302,6 +389,7 @@ describe('BeachfrontAdapter', function () {
         const width = 300;
         const height = 250;
         const bidRequest = bidRequests[0];
+        bidRequest.params.tagid = '7cd7a7b4-ef3f-4aeb-9565-3627f255fa10';
         bidRequest.mediaTypes = {
           banner: {
             sizes: [ width, height ]
@@ -310,7 +398,7 @@ describe('BeachfrontAdapter', function () {
         const topLocation = parseUrl('http://www.example.com?foo=bar', { decodeSearchAsString: true });
         const bidderRequest = {
           refererInfo: {
-            referer: topLocation.href
+            page: topLocation.href
           }
         };
         const requests = spec.buildRequests([ bidRequest ], bidderRequest);
@@ -320,6 +408,7 @@ describe('BeachfrontAdapter', function () {
             slot: bidRequest.adUnitCode,
             id: bidRequest.params.appId,
             bidfloor: bidRequest.params.bidfloor,
+            tagid: bidRequest.params.tagid,
             sizes: [{ w: width, h: height }]
           }
         ]);
@@ -329,6 +418,24 @@ describe('BeachfrontAdapter', function () {
         expect(data.ua).to.equal(navigator.userAgent);
       });
 
+      it('must read from the floors module if available', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.getFloor = () => ({ currency: 'USD', floor: 1.16 });
+        const requests = spec.buildRequests([ bidRequest ], {});
+        const data = requests[0].data;
+        expect(data.slots[0].bidfloor).to.equal(1.16);
+      });
+
+      it('must use the bid floor param if no value is returned from the floors module', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.getFloor = () => ({});
+        const requests = spec.buildRequests([ bidRequest ], {});
+        const data = requests[0].data;
+        expect(data.slots[0].bidfloor).to.equal(bidRequest.params.bidfloor);
+      });
+
       it('must parse bid size from a nested array', function () {
         const width = 300;
         const height = 250;
@@ -338,7 +445,7 @@ describe('BeachfrontAdapter', function () {
             sizes: [[ width, height ]]
           }
         };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
         expect(data.slots[0].sizes).to.deep.equal([
           { w: width, h: height }
@@ -354,7 +461,7 @@ describe('BeachfrontAdapter', function () {
             sizes: `${width}x${height}`
           }
         };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
         expect(data.slots[0].sizes).to.deep.equal([
           { w: width, h: height }
@@ -368,7 +475,7 @@ describe('BeachfrontAdapter', function () {
             sizes: []
           }
         };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
         expect(data.slots[0].sizes).to.deep.equal([]);
       });
@@ -379,7 +486,7 @@ describe('BeachfrontAdapter', function () {
         const bidRequest = bidRequests[0];
         bidRequest.sizes = [ width, height ];
         bidRequest.mediaTypes = { banner: {} };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
         expect(data.slots[0].sizes).to.deep.contain({ w: width, h: height });
       });
@@ -410,14 +517,88 @@ describe('BeachfrontAdapter', function () {
         expect(data.gdprConsent).to.equal(consentString);
       });
 
-      it('must add the Trade Desk User ID to the request', () => {
-        const tdid = '4321';
+      it('must add schain data to the request', () => {
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'directseller.com',
+              sid: '00001',
+              rid: 'BidRequest1',
+              hp: 1
+            }
+          ]
+        };
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.schain = schain;
+        const requests = spec.buildRequests([ bidRequest ], {});
+        const data = requests[0].data;
+        expect(data.schain).to.deep.equal(schain);
+      });
+
+      it('must add supported user IDs to the request', () => {
+        const userId = {
+          tdid: '54017816',
+          idl_env: '13024996',
+          uid2: { id: '45843401' },
+          hadronId: { hadronId: '60314917', auSeg: ['segment1', 'segment2'] }
+        };
         const bidRequest = bidRequests[0];
         bidRequest.mediaTypes = { banner: {} };
-        bidRequest.userId = { tdid };
-        const requests = spec.buildRequests([ bidRequest ]);
+        bidRequest.userId = userId;
+        const requests = spec.buildRequests([ bidRequest ], {});
         const data = requests[0].data;
-        expect(data.tdid).to.equal(tdid);
+        expect(data.tdid).to.equal(userId.tdid);
+        expect(data.idl).to.equal(userId.idl_env);
+        expect(data.uid2).to.equal(userId.uid2.id);
+        expect(data.hadronid).to.equal(userId.hadronId);
+      });
+    });
+
+    describe('with first-party data', function () {
+      it('must add first-party data to the video bid request', function () {
+        const ortb2 = {
+          site: {
+            keywords: 'test keyword'
+          },
+          user: {
+            data: 'some user data'
+          }
+        };
+
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        const bidderRequest = {
+          refererInfo: {
+            page: 'http://example.com/page.html'
+          },
+          ortb2
+        };
+        const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+        const data = requests[0].data;
+        expect(data.user.data).to.equal('some user data');
+        expect(data.site.keywords).to.equal('test keyword');
+        expect(data.site.page).to.equal('http://example.com/page.html');
+        expect(data.site.domain).to.equal('example.com');
+      });
+
+      it('must add first-party data to the banner bid request', function () {
+        const ortb2 = {
+          site: {
+            keywords: 'test keyword'
+          },
+          user: {
+            data: 'some user data'
+          }
+        };
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        const requests = spec.buildRequests([ bidRequest ], {ortb2});
+        const data = requests[0].data;
+        expect(data.ortb2.user.data).to.equal('some user data');
+        expect(data.ortb2.site.keywords).to.equal('test keyword');
       });
     });
 
@@ -444,7 +625,7 @@ describe('BeachfrontAdapter', function () {
             appId: '3b16770b-17af-4d22-daff-9606bdf2c9c3'
           }
         };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         expect(requests.length).to.equal(2);
         expect(requests[0].url).to.contain(VIDEO_ENDPOINT);
         expect(requests[1].url).to.contain(BANNER_ENDPOINT);
@@ -470,7 +651,7 @@ describe('BeachfrontAdapter', function () {
             appId: '3b16770b-17af-4d22-daff-9606bdf2c9c3'
           }
         };
-        const requests = spec.buildRequests([ bidRequest ]);
+        const requests = spec.buildRequests([ bidRequest ], {});
         expect(requests[0].data.imp[0].video).to.deep.contain({ w: 640, h: 360 });
         expect(requests[1].data.slots[0].sizes).to.deep.equal([{ w: 300, h: 250 }]);
       });
@@ -486,16 +667,6 @@ describe('BeachfrontAdapter', function () {
         expect(bidResponse.length).to.equal(0);
       });
 
-      it('should return no bids if the response "url" is missing', function () {
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { video: {} };
-        const serverResponse = {
-          bidPrice: 5.00
-        };
-        const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        expect(bidResponse.length).to.equal(0);
-      });
-
       it('should return no bids if the response "bidPrice" is missing', function () {
         const bidRequest = bidRequests[0];
         bidRequest.mediaTypes = { video: {} };
@@ -518,6 +689,7 @@ describe('BeachfrontAdapter', function () {
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
+          vast: '<VAST version="3.0"></VAST>',
           crid: '123abc'
         };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
@@ -527,10 +699,11 @@ describe('BeachfrontAdapter', function () {
           cpm: serverResponse.bidPrice,
           creativeId: serverResponse.crid,
           vastUrl: serverResponse.url,
-          vastXml: undefined,
+          vastXml: serverResponse.vast,
           width: width,
           height: height,
           renderer: null,
+          meta: { mediaType: 'video', advertiserDomains: [] },
           mediaType: 'video',
           currency: 'USD',
           netRevenue: true,
@@ -538,7 +711,7 @@ describe('BeachfrontAdapter', function () {
         });
       });
 
-      it('should default to the legacy "cmpId" value for the creative ID', () => {
+      it('should return only vast url if the response type is "nurl"', () => {
         const width = 640;
         const height = 480;
         const bidRequest = bidRequests[0];
@@ -547,18 +720,19 @@ describe('BeachfrontAdapter', function () {
             playerSize: [ width, height ]
           }
         };
+        bidRequest.params.video = { responseType: 'nurl' };
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
-          cmpId: '123abc'
+          vast: '<VAST version="3.0"></VAST>',
+          crid: '123abc'
         };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        expect(bidResponse).to.deep.contain({
-          creativeId: serverResponse.cmpId
-        });
+        expect(bidResponse.vastUrl).to.equal(serverResponse.url);
+        expect(bidResponse.vastXml).to.equal(undefined);
       });
 
-      it('should return vast xml if found on the bid response', () => {
+      it('should return only vast xml if the response type is "adm"', () => {
         const width = 640;
         const height = 480;
         const bidRequest = bidRequests[0];
@@ -567,6 +741,7 @@ describe('BeachfrontAdapter', function () {
             playerSize: [ width, height ]
           }
         };
+        bidRequest.params.video = { responseType: 'adm' };
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
@@ -574,10 +749,8 @@ describe('BeachfrontAdapter', function () {
           crid: '123abc'
         };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        expect(bidResponse).to.deep.contain({
-          vastUrl: serverResponse.url,
-          vastXml: serverResponse.vast
-        });
+        expect(bidResponse.vastUrl).to.equal(undefined);
+        expect(bidResponse.vastXml).to.equal(serverResponse.vast);
       });
 
       it('should return a renderer for outstream video bids', function () {
@@ -597,63 +770,32 @@ describe('BeachfrontAdapter', function () {
           id: bidRequest.bidId,
           url: OUTSTREAM_SRC
         });
+        expect(bidResponse.renderer.render).to.be.a('function');
       });
 
-      it('should initialize a player for outstream bids', () => {
+      it('should return meta data for the bid response', () => {
         const width = 640;
         const height = 480;
         const bidRequest = bidRequests[0];
         bidRequest.mediaTypes = {
           video: {
-            context: 'outstream',
             playerSize: [ width, height ]
           }
         };
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
-          crid: '123abc'
-        };
-        const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        window.Beachfront = { Player: sinon.spy() };
-        bidResponse.adUnitCode = bidRequest.adUnitCode;
-        bidResponse.renderer.render(bidResponse);
-        sinon.assert.calledWith(window.Beachfront.Player, bidResponse.adUnitCode, sinon.match({
-          adTagUrl: bidResponse.vastUrl,
-          width: bidResponse.width,
-          height: bidResponse.height,
-          expandInView: false,
-          collapseOnComplete: true
-        }));
-        delete window.Beachfront;
-      });
-
-      it('should configure outstream player settings from the bidder params', () => {
-        const width = 640;
-        const height = 480;
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = {
-          video: {
-            context: 'outstream',
-            playerSize: [ width, height ]
+          meta: {
+            advertiserDomains: ['example.com'],
+            advertiserId: '123'
           }
         };
-        bidRequest.params.player = {
-          expandInView: true,
-          collapseOnComplete: false,
-          progressColor: 'green'
-        };
-        const serverResponse = {
-          bidPrice: 5.00,
-          url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
-          crid: '123abc'
-        };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        window.Beachfront = { Player: sinon.spy() };
-        bidResponse.adUnitCode = bidRequest.adUnitCode;
-        bidResponse.renderer.render(bidResponse);
-        sinon.assert.calledWith(window.Beachfront.Player, bidResponse.adUnitCode, sinon.match(bidRequest.params.player));
-        delete window.Beachfront;
+        expect(bidResponse.meta).to.deep.equal({
+          mediaType: 'video',
+          advertiserDomains: ['example.com'],
+          advertiserId: '123'
+        });
       });
     });
 
@@ -709,6 +851,7 @@ describe('BeachfrontAdapter', function () {
             cpm: serverResponse[ i ].price,
             width: serverResponse[ i ].w,
             height: serverResponse[ i ].h,
+            meta: { mediaType: 'banner', advertiserDomains: [] },
             mediaType: 'banner',
             currency: 'USD',
             netRevenue: true,
@@ -716,6 +859,32 @@ describe('BeachfrontAdapter', function () {
           });
         }
       });
+
+      it('should return meta data for the bid response', () => {
+        bidRequests[0].mediaTypes = {
+          banner: {
+            sizes: [[ 300, 250 ], [ 728, 90 ]]
+          }
+        };
+        const serverResponse = [{
+          slot: bidRequests[0].adUnitCode,
+          adm: '<div id="44851937"></div>',
+          crid: 'crid_1',
+          price: 3.02,
+          w: 728,
+          h: 90,
+          meta: {
+            advertiserDomains: ['example.com'],
+            advertiserId: '123'
+          }
+        }];
+        const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest: bidRequests });
+        expect(bidResponse[0].meta).to.deep.equal({
+          mediaType: 'banner',
+          advertiserDomains: ['example.com'],
+          advertiserId: '123'
+        });
+      });
     });
   });
 
diff --git a/test/spec/modules/beopBidAdapter_spec.js b/test/spec/modules/beopBidAdapter_spec.js
new file mode 100644
index 00000000000..ad096fd6526
--- /dev/null
+++ b/test/spec/modules/beopBidAdapter_spec.js
@@ -0,0 +1,271 @@
+import { expect } from 'chai';
+import { spec } from 'modules/beopBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+const utils = require('src/utils');
+
+const ENDPOINT = 'https://hb.beop.io/bid';
+
+let validBid = {
+  'bidder': 'beop',
+  'params': {
+    'accountId': '5a8af500c9e77c00017e4cad'
+  },
+  'adUnitCode': 'bellow-article',
+  'mediaTypes': {
+    'banner': {
+      'sizes': [[1, 1]]
+    }
+  },
+  'getFloor': () => {
+    return {
+      currency: 'USD',
+      floor: 10,
+    }
+  },
+  'bidId': '30b31c1838de1e',
+  'bidderRequestId': '22edbae2733bf6',
+  'auctionId': '1d1a030790a475',
+  'transactionId': '04f2659e-c005-4eb1-a57c-fa93145e3843',
+  'creativeId': 'er2ee'
+};
+
+describe('BeOp Bid Adapter tests', () => {
+  afterEach(function () {
+    config.setConfig({});
+  });
+
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function() {
+    it('should return true when accountId params found', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should return true if no accountId but networkId', function () {
+      let bid = Object.assign({}, validBid);
+      delete bid.params;
+      bid.params = {
+        'networkId': '5a8af500c9e77c00017e4aaa'
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false if neither account or network id param found', function () {
+      let bid = Object.assign({}, validBid);
+      delete bid.params;
+      bid.params = {
+        'someId': '5a8af500c9e77c00017e4aaa'
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false if account Id param is not an ObjectId', function () {
+      let bid = Object.assign({}, validBid);
+      delete bid.params;
+      bid.params = {
+        'someId': '12345'
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false if there is no banner media type', function () {
+      let bid = Object.assign({}, validBid);
+      delete bid.mediaTypes;
+      bid.mediaTypes = {
+        'native': {
+          'sizes': [[1, 1]]
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [];
+    bidRequests.push(validBid);
+
+    it('should build the request', function () {
+      config.setConfig({'currency': {'adServerCurrency': 'USD'}});
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      const url = request.url;
+      expect(url).to.equal(ENDPOINT);
+      expect(payload.pid).to.exist;
+      expect(payload.pid).to.equal('5a8af500c9e77c00017e4cad');
+      expect(payload.slts[0].name).to.exist;
+      expect(payload.slts[0].name).to.equal('bellow-article');
+      expect(payload.slts[0].flr).to.equal(10);
+    });
+
+    it('should call the endpoint with GDPR consent and pageURL info if found', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest =
+      {
+        'gdprConsent':
+        {
+          'gdprApplies': true,
+          'consentString': consentString
+        },
+        'refererInfo':
+        {
+          'canonicalUrl': 'test.te'
+        }
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.tc_string).to.exist;
+      expect(payload.tc_string).to.equal('BOJ8RZsOJ8RZsABAB8AAAAAZ+A==');
+      expect(payload.url).to.exist;
+      // check that the protocol is added correctly
+      expect(payload.url).to.equal('http://test.te');
+    });
+
+    it('should not prepend the protocol in page url if already present', function () {
+      const bidderRequest = {
+        'refererInfo': {
+          'canonicalUrl': 'https://test.te'
+        }
+      };
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.url).to.exist;
+      expect(payload.url).to.equal('https://test.te');
+    });
+  });
+
+  describe('interpretResponse', function() {
+    let serverResponse = {
+      'body': {
+        'bids': [
+          {
+            'requestId': 'aaaa',
+            'cpm': 1.0,
+            'currency': 'EUR',
+            'creativeId': '60f691be1515670a2a09aea2',
+            'netRevenue': true,
+            'width': 1,
+            'height': 1,
+            'ad': '<div class="BeOpWidget" data-content-id="60f691be1515670a2a09aea2" data-campaign-id="60f691bf1515670a2a09aea6" data-display-account-id="60f691be1515670a2a09aea1"></div>',
+            'meta': {
+              'advertiserId': '60f691be1515670a2a09aea1'
+            }
+          }
+        ]
+      }
+    }
+    it('should interpret the response by pushing it in the bids elem', function () {
+      const response = spec.interpretResponse(serverResponse, validBid);
+
+      expect(response[0].ad).to.exist;
+      expect(response[0].requestId).to.exist;
+      expect(response[0].requestId).to.equal('aaaa');
+    });
+  });
+
+  describe('timeout and bid won pixel trigger', function () {
+    let triggerPixelStub;
+
+    beforeEach(function () {
+      triggerPixelStub = sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('should call triggerPixel utils function when timed out is filled', function () {
+      spec.onTimeout({});
+      spec.onTimeout();
+      expect(triggerPixelStub.getCall(0)).to.be.null;
+      spec.onTimeout({params: {accountId: '5a8af500c9e77c00017e4cad'}, timeout: 2000});
+      expect(triggerPixelStub.getCall(0)).to.not.be.null;
+      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('https://t.beop.io');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ca=bid');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ac=timeout');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('pid=5a8af500c9e77c00017e4cad');
+    });
+
+    it('should call triggerPixel utils function on bid won', function () {
+      spec.onBidWon({});
+      spec.onBidWon();
+      expect(triggerPixelStub.getCall(0)).to.be.null;
+      spec.onBidWon({params: {accountId: '5a8af500c9e77c00017e4cad'}, cpm: 1.2});
+      expect(triggerPixelStub.getCall(0)).to.not.be.null;
+      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('https://t.beop.io');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ca=bid');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ac=won');
+      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('pid=5a8af500c9e77c00017e4cad');
+    });
+    it('should call triggerPixel utils function on bid won and work even if params is an array', function () {
+      spec.onBidWon({});
+      spec.onBidWon();
+      expect(triggerPixelStub.getCall(0)).to.be.null;
+      spec.onBidWon({params: [{accountId: '5a8af500c9e77c00017e4cad'}], cpm: 1.2});
+      expect(triggerPixelStub.getCall(0)).to.not.be.null;
+      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('https://t.beop.io');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ca=bid');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ac=won');
+      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('pid=5a8af500c9e77c00017e4cad');
+    });
+  });
+
+  describe('Ensure keywords is always array of string', function () {
+    let bidRequests = [];
+    afterEach(function () {
+      bidRequests = [];
+    });
+
+    it('should work with keywords as an array', function () {
+      let bid = Object.assign({}, validBid);
+      bid.params.keywords = ['a', 'b'];
+      bidRequests.push(bid);
+      config.setConfig({
+        currency: { adServerCurrency: 'USD' }
+      });
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      const url = request.url;
+      expect(payload.kwds).to.exist;
+      expect(payload.kwds).to.include('a');
+      expect(payload.kwds).to.include('b');
+    });
+
+    it('should work with keywords as a string', function () {
+      let bid = Object.assign({}, validBid);
+      bid.params.keywords = 'list of keywords';
+      bidRequests.push(bid);
+      config.setConfig({
+        currency: { adServerCurrency: 'USD' }
+      });
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      const url = request.url;
+      expect(payload.kwds).to.exist;
+      expect(payload.kwds).to.include('list of keywords');
+    });
+
+    it('should work with keywords as a string containing a comma', function () {
+      let bid = Object.assign({}, validBid);
+      bid.params.keywords = 'list, of, keywords';
+      bidRequests.push(bid);
+      config.setConfig({
+        currency: { adServerCurrency: 'USD' }
+      });
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      const url = request.url;
+      expect(payload.kwds).to.exist;
+      expect(payload.kwds).to.include('list');
+      expect(payload.kwds).to.include('of');
+      expect(payload.kwds).to.include('keywords');
+    })
+  })
+});
diff --git a/test/spec/modules/betweenBidAdapter_spec.js b/test/spec/modules/betweenBidAdapter_spec.js
index 94db41ba014..a4b89ab1b65 100644
--- a/test/spec/modules/betweenBidAdapter_spec.js
+++ b/test/spec/modules/betweenBidAdapter_spec.js
@@ -20,9 +20,35 @@ describe('betweenBidAdapterTests', function () {
       sizes: [[240, 400]]
     }]
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
     expect(req_data.bidid).to.equal('bid1234');
   });
+
+  it('validate_video_params', function () {
+    let bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'between',
+      params: {w: 240, h: 400, s: 1112},
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [970, 250],
+          maxd: 123,
+          mind: 234,
+          codeType: 'unknown code type'
+        }
+      },
+    }];
+    let request = spec.buildRequests(bidRequestData);
+    let req_data = JSON.parse(request.data)[0].data;
+
+    expect(req_data.mediaType).to.equal(2);
+    expect(req_data.maxd).to.equal(123);
+    expect(req_data.mind).to.equal(234);
+    expect(req_data.pos).to.equal('atf');
+    expect(req_data.codeType).to.equal('inpage');
+  });
+
   it('validate itu param', function() {
     let bidRequestData = [{
       bidId: 'bid1234',
@@ -37,7 +63,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.itu).to.equal('https://something.url');
   });
@@ -55,10 +81,27 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.cur).to.equal('THX');
   });
+  it('validate default cur USD', function() {
+    let bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'between',
+      params: {
+        w: 240,
+        h: 400,
+        s: 1112
+      },
+      sizes: [[240, 400]]
+    }];
+
+    let request = spec.buildRequests(bidRequestData);
+    let req_data = JSON.parse(request.data)[0].data;
+
+    expect(req_data.cur).to.equal('USD');
+  });
   it('validate subid param', function() {
     let bidRequestData = [{
       bidId: 'bid1234',
@@ -73,10 +116,58 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.subid).to.equal(1138);
   });
+
+  it('validate eids parameter', function() {
+    const USER_ID_DATA = [
+      {
+        source: 'admixer.net',
+        uids: [
+          { id: '5706411dc1c54268ac2ed668b27f92a3', atype: 3 }
+        ]
+      }
+    ];
+
+    let bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'between',
+      params: {
+        w: 240,
+        h: 400,
+        s: 1112,
+      },
+      sizes: [[240, 400]],
+      userIdAsEids: USER_ID_DATA,
+    }];
+
+    let request = spec.buildRequests(bidRequestData);
+    let req_data = JSON.parse(request.data)[0].data;
+
+    expect(req_data.eids).to.have.deep.members(USER_ID_DATA);
+  });
+
+  it('validate eids parameter, if userIdAsEids = undefined', function() {
+    let bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'between',
+      params: {
+        w: 240,
+        h: 400,
+        s: 1112,
+      },
+      sizes: [[240, 400]],
+      userIdAsEids: undefined
+    }];
+
+    let request = spec.buildRequests(bidRequestData);
+    let req_data = JSON.parse(request.data)[0].data;
+
+    expect(req_data.eids).to.have.deep.members([]);
+  });
+
   it('validate click3rd param', function() {
     let bidRequestData = [{
       bidId: 'bid1234',
@@ -91,7 +182,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.click3rd).to.equal('https://something.url');
   });
@@ -111,7 +202,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data['pubside_macro[param]']).to.equal('%26test%3Dtset');
   });
@@ -134,7 +225,7 @@ describe('betweenBidAdapterTests', function () {
     }
 
     let request = spec.buildRequests(bidRequestData, bidderRequest);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.gdprApplies).to.equal(bidderRequest.gdprConsent.gdprApplies);
     expect(req_data.consentString).to.equal(bidderRequest.gdprConsent.consentString);
@@ -182,6 +273,21 @@ describe('betweenBidAdapterTests', function () {
     expect(bid.requestId).to.equal('bid1234');
     expect(bid.ad).to.equal('Ad html');
   });
+
+  it('validate_response_video_params', function () {
+    let serverResponse = {
+      body: [{
+        mediaType: 2,
+        vastXml: 'vastXml',
+      }]
+    };
+    let bids = spec.interpretResponse(serverResponse);
+    expect(bids).to.have.lengthOf(1);
+    let bid = bids[0];
+    expect(bid.mediaType).to.equal(2);
+    expect(bid.vastXml).to.equal('vastXml');
+  });
+
   it('validate response params without currency', function () {
     let serverResponse = {
       body: [{
@@ -194,12 +300,13 @@ describe('betweenBidAdapterTests', function () {
     let bids = spec.interpretResponse(serverResponse);
     expect(bids).to.have.lengthOf(1);
     let bid = bids[0];
-    expect(bid.currency).to.equal('RUB');
+    expect(bid.currency).to.equal('USD');
   });
   it('check getUserSyncs', function() {
     const syncs = spec.getUserSyncs({}, {});
-    expect(syncs).to.be.an('array').that.to.have.lengthOf(1);
+    expect(syncs).to.be.an('array').that.to.have.lengthOf(2);
     expect(syncs[0]).to.deep.equal({type: 'iframe', url: 'https://ads.betweendigital.com/sspmatch-iframe'});
+    expect(syncs[1]).to.deep.equal({type: 'image', url: 'https://ads.betweendigital.com/sspmatch'});
   });
 
   it('check sizes', function() {
@@ -217,8 +324,42 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
+
+    expect(req_data.sizes).to.deep.equal(['970x250', '240x400', '728x90'])
+  });
 
-    expect(req_data.sizes).to.deep.equal('970x250%2C240x400%2C728x90');
+  it('check adomain', function() {
+    const serverResponse = {
+      body: [{
+        bidid: 'bid1234',
+        cpm: 1.12,
+        w: 240,
+        h: 400,
+        currency: 'USD',
+        ad: 'Ad html',
+        adomain: ['domain1.com', 'domain2.com']
+      }]
+    };
+    const bids = spec.interpretResponse(serverResponse);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.meta.advertiserDomains).to.deep.equal(['domain1.com', 'domain2.com']);
+  });
+  it('check server response without adomain', function() {
+    const serverResponse = {
+      body: [{
+        bidid: 'bid1234',
+        cpm: 1.12,
+        w: 240,
+        h: 400,
+        currency: 'USD',
+        ad: 'Ad html',
+      }]
+    };
+    const bids = spec.interpretResponse(serverResponse);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.meta.advertiserDomains).to.deep.equal([]);
   });
 });
diff --git a/test/spec/modules/beyondmediaBidAdapter_spec.js b/test/spec/modules/beyondmediaBidAdapter_spec.js
new file mode 100644
index 00000000000..a4c1125fa5f
--- /dev/null
+++ b/test/spec/modules/beyondmediaBidAdapter_spec.js
@@ -0,0 +1,400 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/beyondmediaBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'beyondmedia'
+
+describe('AndBeyondMediaBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+      expect(spec.isBidRequestValid(bids[1])).to.be.true;
+      expect(spec.isBidRequestValid(bids[2])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    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;
+      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://backend.andbeyond.media/pbjs');
+    });
+
+    it('Returns general data 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',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      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.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, 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 = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, 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([], bidderRequest);
+      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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cookies.andbeyond.media/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cookies.andbeyond.media/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/bidViewabilityIO_spec.js b/test/spec/modules/bidViewabilityIO_spec.js
new file mode 100644
index 00000000000..5b4944082bc
--- /dev/null
+++ b/test/spec/modules/bidViewabilityIO_spec.js
@@ -0,0 +1,145 @@
+import * as bidViewabilityIO from 'modules/bidViewabilityIO.js';
+import * as events from 'src/events.js';
+import * as utils from 'src/utils.js';
+import * as sinon from 'sinon';
+import { expect } from 'chai';
+import CONSTANTS from 'src/constants.json';
+
+describe('#bidViewabilityIO', function() {
+  const makeElement = (id) => {
+    const el = document.createElement('div');
+    el.setAttribute('id', id);
+    return el;
+  }
+  const banner_bid = {
+    adUnitCode: 'banner_id',
+    mediaType: 'banner',
+    width: 728,
+    height: 90
+  };
+
+  const large_banner_bid = {
+    adUnitCode: 'large_banner_id',
+    mediaType: 'banner',
+    width: 970,
+    height: 250
+  };
+
+  const video_bid = {
+    mediaType: 'video',
+  };
+
+  const native_bid = {
+    mediaType: 'native',
+  };
+
+  it('init to be a function', function() {
+    expect(bidViewabilityIO.init).to.be.a('function')
+  });
+
+  describe('isSupportedMediaType tests', function() {
+    it('banner to be supported', function() {
+      expect(bidViewabilityIO.isSupportedMediaType(banner_bid)).to.be.true
+    });
+
+    it('video not to be supported', function() {
+      expect(bidViewabilityIO.isSupportedMediaType(video_bid)).to.be.false
+    });
+
+    it('native not to be supported', function() {
+      expect(bidViewabilityIO.isSupportedMediaType(native_bid)).to.be.false
+    });
+  })
+
+  describe('getViewableOptions tests', function() {
+    it('normal banner has expected threshold in options object', function() {
+      expect(bidViewabilityIO.getViewableOptions(banner_bid).threshold).to.equal(bidViewabilityIO.IAB_VIEWABLE_DISPLAY_THRESHOLD);
+    });
+
+    it('large banner has expected threshold in options object', function() {
+      expect(bidViewabilityIO.getViewableOptions(large_banner_bid).threshold).to.equal(bidViewabilityIO.IAB_VIEWABLE_DISPLAY_LARGE_THRESHOLD)
+    });
+
+    it('video bid has undefined viewable options', function() {
+      expect(bidViewabilityIO.getViewableOptions(video_bid)).to.be.undefined
+    });
+
+    it('native bid has undefined viewable options', function() {
+      expect(bidViewabilityIO.getViewableOptions(native_bid)).to.be.undefined
+    });
+  })
+
+  describe('markViewed tests', function() {
+    let sandbox;
+    const mockObserver = {
+      unobserve: sinon.spy()
+    };
+    const mockEntry = {
+      target: makeElement('target_id')
+    };
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+    })
+
+    afterEach(function() {
+      sandbox.restore()
+    })
+
+    it('markViewed returns a function', function() {
+      expect(bidViewabilityIO.markViewed(banner_bid, mockEntry, mockObserver)).to.be.a('function')
+    });
+
+    it('markViewed unobserves', function() {
+      const emitSpy = sandbox.spy(events, ['emit']);
+      const func = bidViewabilityIO.markViewed(banner_bid, mockEntry, mockObserver);
+      func();
+      expect(mockObserver.unobserve.calledOnce).to.be.true;
+      expect(emitSpy.calledOnce).to.be.true;
+      // expect(emitSpy.firstCall.args).to.be.false;
+      expect(emitSpy.firstCall.args[0]).to.eq(CONSTANTS.EVENTS.BID_VIEWABLE);
+    });
+  })
+
+  describe('viewCallbackFactory tests', function() {
+    let sandbox;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+    })
+
+    afterEach(function() {
+      sandbox.restore()
+    })
+
+    it('viewCallbackFactory returns a function', function() {
+      expect(bidViewabilityIO.viewCallbackFactory(banner_bid)).to.be.a('function')
+    });
+
+    it('viewCallbackFactory function does stuff', function() {
+      const logMessageSpy = sandbox.spy(utils, ['logMessage']);
+      const mockObserver = {
+        unobserve: sandbox.spy()
+      };
+      const mockEntries = [{
+        isIntersecting: true,
+        target: makeElement('true_id')
+      },
+      {
+        isIntersecting: false,
+        target: makeElement('false_id')
+      },
+      {
+        isIntersecting: false,
+        target: makeElement('false_id')
+      }];
+      mockEntries[2].target.view_tracker = 8;
+
+      const func = bidViewabilityIO.viewCallbackFactory(banner_bid);
+      func(mockEntries, mockObserver);
+      expect(mockEntries[0].target.view_tracker).to.be.a('number');
+      expect(mockEntries[1].target.view_tracker).to.be.undefined;
+      expect(logMessageSpy.lastCall.lastArg).to.eq('bidViewabilityIO: viewable timer stopped for id: false_id code: banner_id');
+    });
+  })
+});
diff --git a/test/spec/modules/bidViewability_spec.js b/test/spec/modules/bidViewability_spec.js
new file mode 100644
index 00000000000..a822d86f852
--- /dev/null
+++ b/test/spec/modules/bidViewability_spec.js
@@ -0,0 +1,297 @@
+import * as bidViewability from 'modules/bidViewability.js';
+import { config } from 'src/config.js';
+import * as events from 'src/events.js';
+import * as utils from 'src/utils.js';
+import * as sinon from 'sinon';
+import {expect, spy} from 'chai';
+import * as prebidGlobal from 'src/prebidGlobal.js';
+import CONSTANTS from 'src/constants.json';
+import adapterManager, { gdprDataHandler, uspDataHandler } from 'src/adapterManager.js';
+import parse from 'url-parse';
+
+const GPT_SLOT = {
+  getAdUnitPath() {
+    return '/harshad/Jan/2021/';
+  },
+
+  getSlotElementId() {
+    return 'DIV-1';
+  }
+};
+
+const PBJS_WINNING_BID = {
+  'adUnitCode': '/harshad/Jan/2021/',
+  'bidderCode': 'pubmatic',
+  'bidder': 'pubmatic',
+  'width': 300,
+  'height': 250,
+  'statusMessage': 'Bid available',
+  'adId': 'id',
+  'requestId': 1024,
+  'source': 'client',
+  'no_bid': false,
+  'cpm': '1.1495',
+  'ttl': 180,
+  'creativeId': 'id',
+  'netRevenue': true,
+  'currency': 'USD',
+  'vurls': [
+    'https://domain-1.com/end-point?a=1',
+    'https://domain-2.com/end-point/',
+    'https://domain-3.com/end-point?a=1'
+  ]
+};
+
+describe('#bidViewability', function() {
+  let gptSlot;
+  let pbjsWinningBid;
+
+  beforeEach(function() {
+    gptSlot = Object.assign({}, GPT_SLOT);
+    pbjsWinningBid = Object.assign({}, PBJS_WINNING_BID);
+  });
+
+  describe('isBidAdUnitCodeMatchingSlot', function() {
+    it('match found by GPT Slot getAdUnitPath', function() {
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(true);
+    });
+
+    it('match found by GPT Slot getSlotElementId', function() {
+      pbjsWinningBid.adUnitCode = 'DIV-1';
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(true);
+    });
+
+    it('match not found', function() {
+      pbjsWinningBid.adUnitCode = 'DIV-10';
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(false);
+    });
+  });
+
+  describe('getMatchingWinningBidForGPTSlot', function() {
+    let winningBidsArray;
+    let sandbox
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      // mocking winningBidsArray
+      winningBidsArray = [];
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        getAllWinningBids: function (number) {
+          return winningBidsArray;
+        }
+      });
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    })
+
+    it('should find a match by using customMatchFunction provided in config', function() {
+      // Needs config to be passed with customMatchFunction
+      let bidViewabilityConfig = {
+        customMatchFunction(bid, slot) {
+          return ('AD-' + slot.getAdUnitPath()) === bid.adUnitCode;
+        }
+      };
+      let newWinningBid = Object.assign({}, PBJS_WINNING_BID, {adUnitCode: 'AD-' + PBJS_WINNING_BID.adUnitCode});
+      // Needs pbjs.getWinningBids to be implemented with match
+      winningBidsArray.push(newWinningBid);
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot(bidViewabilityConfig, gptSlot);
+      expect(wb).to.deep.equal(newWinningBid);
+    });
+
+    it('should NOT find a match by using customMatchFunction provided in config', function() {
+      // Needs config to be passed with customMatchFunction
+      let bidViewabilityConfig = {
+        customMatchFunction(bid, slot) {
+          return ('AD-' + slot.getAdUnitPath()) === bid.adUnitCode;
+        }
+      };
+      // Needs pbjs.getWinningBids to be implemented without match; winningBidsArray is set to empty in beforeEach
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot(bidViewabilityConfig, gptSlot);
+      expect(wb).to.equal(null);
+    });
+
+    it('should find a match by using default matching function', function() {
+      // Needs config to be passed without customMatchFunction
+      // Needs pbjs.getWinningBids to be implemented with match
+      winningBidsArray.push(PBJS_WINNING_BID);
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot({}, gptSlot);
+      expect(wb).to.deep.equal(PBJS_WINNING_BID);
+    });
+
+    it('should NOT find a match by using default matching function', function() {
+      // Needs config to be passed without customMatchFunction
+      // Needs pbjs.getWinningBids to be implemented without match; winningBidsArray is set to empty in beforeEach
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot({}, gptSlot);
+      expect(wb).to.equal(null);
+    });
+  });
+
+  describe('fireViewabilityPixels', function() {
+    let sandbox;
+    let triggerPixelSpy;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      triggerPixelSpy = sandbox.spy(utils, ['triggerPixel']);
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    });
+
+    it('DO NOT fire pixels if NOT mentioned in module config', function() {
+      let moduleConfig = {};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      expect(triggerPixelSpy.callCount).to.equal(0);
+    });
+
+    it('fire pixels if mentioned in module config', function() {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0]).to.equal(url);
+      });
+    });
+
+    it('USP: should include the us_privacy key when USP Consent is available', function () {
+      let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+      uspDataHandlerStub.returns('1YYY');
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.us_privacy).to.equal('1YYY');
+      });
+      uspDataHandlerStub.restore();
+    });
+
+    it('USP: should not include the us_privacy key when USP Consent is not available', function () {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.us_privacy).to.equal(undefined);
+      });
+    });
+
+    it('GDPR: should include the GDPR keys when GDPR Consent is available', function() {
+      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+      gdprDataHandlerStub.returns({
+        gdprApplies: true,
+        consentString: 'consent',
+        addtlConsent: 'moreConsent'
+      });
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal('1');
+        expect(queryObject.gdpr_consent).to.equal('consent');
+        expect(queryObject.addtl_consent).to.equal('moreConsent');
+      });
+      gdprDataHandlerStub.restore();
+    });
+
+    it('GDPR: should not include the GDPR keys when GDPR Consent is not available', function () {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal(undefined);
+        expect(queryObject.gdpr_consent).to.equal(undefined);
+        expect(queryObject.addtl_consent).to.equal(undefined);
+      });
+    });
+
+    it('GDPR: should only include the GDPR keys for GDPR Consent fields with values', function () {
+      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+      gdprDataHandlerStub.returns({
+        gdprApplies: true,
+        consentString: 'consent'
+      });
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal('1');
+        expect(queryObject.gdpr_consent).to.equal('consent');
+        expect(queryObject.addtl_consent).to.equal(undefined);
+      });
+      gdprDataHandlerStub.restore();
+    })
+  });
+
+  describe('impressionViewableHandler', function() {
+    let sandbox;
+    let triggerPixelSpy;
+    let eventsEmitSpy;
+    let logWinningBidNotFoundSpy;
+    let callBidViewableBidderSpy;
+    let winningBidsArray;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      triggerPixelSpy = sandbox.spy(utils, ['triggerPixel']);
+      eventsEmitSpy = sandbox.spy(events, ['emit']);
+      callBidViewableBidderSpy = sandbox.spy(adapterManager, ['callBidViewableBidder']);
+      // mocking winningBidsArray
+      winningBidsArray = [];
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        getAllWinningBids: function (number) {
+          return winningBidsArray;
+        }
+      });
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    })
+
+    it('matching winning bid is found', function() {
+      let moduleConfig = {
+        firePixels: true
+      };
+      winningBidsArray.push(PBJS_WINNING_BID);
+      bidViewability.impressionViewableHandler(moduleConfig, GPT_SLOT, null);
+      // fire pixels should be called
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0]).to.equal(url);
+      });
+      // adapterManager.callBidViewableBidder is called with required args
+      let call = callBidViewableBidderSpy.getCall(0);
+      expect(call.args[0]).to.equal(PBJS_WINNING_BID.bidder);
+      expect(call.args[1]).to.deep.equal(PBJS_WINNING_BID);
+      // CONSTANTS.EVENTS.BID_VIEWABLE is triggered
+      call = eventsEmitSpy.getCall(0);
+      expect(call.args[0]).to.equal(CONSTANTS.EVENTS.BID_VIEWABLE);
+      expect(call.args[1]).to.deep.equal(PBJS_WINNING_BID);
+    });
+
+    it('matching winning bid is NOT found', function() {
+      // fire pixels should NOT be called
+      expect(triggerPixelSpy.callCount).to.equal(0);
+      // adapterManager.callBidViewableBidder is NOT called
+      expect(callBidViewableBidderSpy.callCount).to.equal(0);
+      // CONSTANTS.EVENTS.BID_VIEWABLE is NOT triggered
+      expect(eventsEmitSpy.callCount).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/biddoBidAdapter_spec.js b/test/spec/modules/biddoBidAdapter_spec.js
new file mode 100644
index 00000000000..25986b3407f
--- /dev/null
+++ b/test/spec/modules/biddoBidAdapter_spec.js
@@ -0,0 +1,172 @@
+import {expect} from 'chai';
+import {spec} from 'modules/biddoBidAdapter.js';
+
+describe('biddo bid adapter tests', function () {
+  describe('bid requests', function () {
+    it('should accept valid bid', function () {
+      const validBid = {
+        bidder: 'biddo',
+        params: {zoneId: 123},
+      };
+
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should reject invalid bid', function () {
+      const invalidBid = {
+        bidder: 'biddo',
+        params: {},
+      };
+
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+
+    it('should correctly build payload string', function () {
+      const bidRequests = [{
+        bidder: 'biddo',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }];
+      const payload = spec.buildRequests(bidRequests)[0].data;
+
+      expect(payload).to.contain('ctype=div');
+      expect(payload).to.contain('pzoneid=123');
+      expect(payload).to.contain('width=300');
+      expect(payload).to.contain('height=250');
+    });
+
+    it('should support multiple bids', function () {
+      const bidRequests = [{
+        bidder: 'biddo',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }, {
+        bidder: 'biddo',
+        params: {zoneId: 321},
+        mediaTypes: {
+          banner: {
+            sizes: [[728, 90]],
+          },
+        },
+        bidId: '23acc48ad47af52',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba992',
+        bidderRequestId: '1c56ad30b9b8ca82',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea9347292',
+      }];
+      const payload = spec.buildRequests(bidRequests);
+
+      expect(payload).to.be.lengthOf(2);
+    });
+
+    it('should support multiple sizes', function () {
+      const bidRequests = [{
+        bidder: 'biddo',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }];
+      const payload = spec.buildRequests(bidRequests);
+
+      expect(payload).to.be.lengthOf(2);
+    });
+  });
+
+  describe('bid responses', function () {
+    it('should return complete bid response', function () {
+      const serverResponse = {
+        body: {
+          banner: {
+            hash: '1c56ad30b9b8ca8',
+          },
+          hb: {
+            cpm: 0.5,
+            netRevenue: false,
+            adomains: ['securepubads.g.doubleclick.net'],
+          },
+          template: {
+            html: '<ad></ad>',
+          },
+        },
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(1);
+      expect(bids[0].requestId).to.equal('23acc48ad47af5');
+      expect(bids[0].creativeId).to.equal('1c56ad30b9b8ca8');
+      expect(bids[0].width).to.equal(300);
+      expect(bids[0].height).to.equal(250);
+      expect(bids[0].ttl).to.equal(600);
+      expect(bids[0].cpm).to.equal(0.5);
+      expect(bids[0].netRevenue).to.equal(false);
+      expect(bids[0].currency).to.equal('USD');
+      expect(bids[0].meta.advertiserDomains).to.be.lengthOf(1);
+      expect(bids[0].meta.advertiserDomains[0]).to.equal('securepubads.g.doubleclick.net');
+    });
+
+    it('should return empty bid response', function () {
+      const serverResponse = {
+        body: {},
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(0);
+    });
+
+    it('should return empty bid response 2', function () {
+      const serverResponse = {
+        body: {
+          template: {
+            html: '',
+          }
+        },
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(0);
+    });
+  });
+});
diff --git a/test/spec/modules/bidfluenceBidAdapter_spec.js b/test/spec/modules/bidfluenceBidAdapter_spec.js
deleted file mode 100644
index 6b3a0c2b044..00000000000
--- a/test/spec/modules/bidfluenceBidAdapter_spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/bidfluenceBidAdapter.js';
-
-const BIDDER_CODE = 'bidfluence';
-const PLACEMENT_ID = '1000';
-const PUB_ID = '1000';
-const CONSENT_STRING = 'DUXDSDFSFWRRR8345F==';
-
-const validBidRequests = [{
-  'bidder': BIDDER_CODE,
-  'params': {
-    'placementId': PLACEMENT_ID,
-    'publisherId': PUB_ID,
-    'reservePrice': 0
-  },
-  'adUnitCode': 'adunit-code',
-  'sizes': [[300, 250]],
-  'bidId': '2b1f23307fb8ef',
-  'bidderRequestId': '10edf38ec1a719',
-  'auctionId': '1025ba77-5463-4877-b0eb-14b205cb9304'
-}];
-
-const bidderRequest = {
-  'bidderCode': 'bidfluence',
-  'auctionId': '1025ba77-5463-4877-b0eb-14b205cb9304',
-  'bidderRequestId': '10edf38ec1a719',
-  'refererInfo': {
-    'numIframes': 0,
-    'reachedTop': true,
-    'referer': 'test',
-    'stack': ['test']
-  },
-  'timeout': 1000,
-  'gdprConsent': {
-    'gdprApplies': true,
-    'consentString': CONSENT_STRING,
-    'vendorData': ''
-  }
-};
-
-bidderRequest.bids = validBidRequests;
-
-describe('Bidfluence Adapter test', () => {
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(validBidRequests[0])).to.equal(true);
-    });
-    it('should return the right bidder code', function () {
-      expect(spec.code).to.eql(BIDDER_CODE);
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('sends bid request to our endpoint via POST', function () {
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
-      expect(request.method).to.equal('POST');
-      const payload = JSON.parse(request.data);
-
-      expect(payload.bids[0].bid).to.equal(validBidRequests[0].bidId);
-      expect(payload.azr).to.equal(true);
-      expect(payload.ck).to.not.be.undefined;
-      expect(payload.bids[0].tid).to.equal(PLACEMENT_ID);
-      expect(payload.bids[0].pid).to.equal(PUB_ID);
-      expect(payload.bids[0].rp).to.be.a('number');
-      expect(payload.re).to.not.be.undefined;
-      expect(payload.st).to.not.be.undefined;
-      expect(payload.tz).to.not.be.undefined;
-      expect(payload.sr).to.not.be.undefined;
-      expect(payload.vp).to.not.be.undefined;
-      expect(payload.sdt).to.not.be.undefined;
-      expect(payload.bids[0].w).to.equal('300');
-      expect(payload.bids[0].h).to.equal('250');
-    });
-
-    it('sends gdpr info if exists', function () {
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.gdpr).to.equal(true);
-      expect(payload.gdprc).to.equal(CONSENT_STRING);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const response = {
-      body: {
-        Bids:
-          [{
-            'CreativeId': '1000',
-            'Cpm': 0.50,
-            'Ad': '<div></div>',
-            'Height': 250,
-            'Width': 300
-          }]
-      }
-    };
-
-    it('should get correct bid response', function () {
-      const expectedResponse = [{
-        requestId: response.body.Bids[0].BidId,
-        cpm: response.body.Bids[0].Cpm,
-        width: response.body.Bids[0].Width,
-        height: response.body.Bids[0].Height,
-        creativeId: response.body.Bids[0].CreativeId,
-        ad: response.body.Bids[0].Ad,
-        currency: 'USD',
-        netRevenue: true,
-        ttl: 360
-      }];
-
-      let result = spec.interpretResponse(response, { 'bidderRequest': validBidRequests[0] });
-      expect(result).to.deep.equal(expectedResponse);
-    });
-  });
-});
diff --git a/test/spec/modules/bidglassAdapter_spec.js b/test/spec/modules/bidglassAdapter_spec.js
index d153430103d..7b007f7cc1f 100644
--- a/test/spec/modules/bidglassAdapter_spec.js
+++ b/test/spec/modules/bidglassAdapter_spec.js
@@ -65,7 +65,10 @@ describe('Bid Glass Adapter', function () {
             'creativeId': '-1',
             'width': '300',
             'height': '250',
-            'requestId': '30b31c1838de1e'
+            'requestId': '30b31c1838de1e',
+            'meta': {
+              'advertiserDomains': ['https://example.com']
+            }
           }]
         }
       };
@@ -83,7 +86,10 @@ describe('Bid Glass Adapter', function () {
         'mediaType': 'banner',
         'netRevenue': true,
         'ttl': 10,
-        'ad': '<!-- Creative -->'
+        'ad': '<!-- Creative -->',
+        'meta': {
+          'advertiserDomains': ['https://example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
diff --git a/test/spec/modules/bidlabBidAdapter_spec.js b/test/spec/modules/bidlabBidAdapter_spec.js
deleted file mode 100644
index cffd43ae6ca..00000000000
--- a/test/spec/modules/bidlabBidAdapter_spec.js
+++ /dev/null
@@ -1,235 +0,0 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/bidlabBidAdapter.js';
-
-describe('BidlabBidAdapter', function () {
-  let bid = {
-    bidId: '23fhj33i987f',
-    bidder: 'bidlab',
-    params: {
-      placementId: 0,
-      traffic: 'banner'
-    }
-  };
-
-  describe('isBidRequestValid', function () {
-    it('Should return true if there are bidId, params and placementId 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]);
-    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://service.bidlab.ai/?c=o&m=multi');
-    });
-    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');
-      let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes');
-      expect(placement.placementId).to.equal(0);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal('banner');
-    });
-    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');
-      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');
-      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');
-      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;
-    });
-  });
-  describe('getUserSyncs', function () {
-    let userSync = spec.getUserSyncs();
-    it('Returns valid URL and type', function () {
-      if (spec.noSync) {
-        expect(userSync).to.be.equal(false);
-      } else {
-        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('image');
-        expect(userSync[0].url).to.be.equal('https://service.bidlab.ai/?c=o&m=sync');
-      }
-    });
-  });
-});
diff --git a/test/spec/modules/bidphysicsBidAdapter_spec.js b/test/spec/modules/bidphysicsBidAdapter_spec.js
deleted file mode 100644
index fc15c39cf81..00000000000
--- a/test/spec/modules/bidphysicsBidAdapter_spec.js
+++ /dev/null
@@ -1,261 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/bidphysicsBidAdapter.js';
-
-const REQUEST = {
-  'bidderCode': 'bidphysics',
-  'auctionId': 'auctionId-56a2-4f71-9098-720a68f2f708',
-  'bidderRequestId': 'requestId',
-  'bidRequest': [{
-    'bidder': 'bidphysics',
-    'params': {
-      'unitId': 123456,
-    },
-    'placementCode': 'div-gpt-dummy-placement-code',
-    'sizes': [
-      [300, 250]
-    ],
-    'bidId': 'bidId1',
-    'bidderRequestId': 'bidderRequestId',
-    'auctionId': 'auctionId-56a2-4f71-9098-720a68f2f708'
-  },
-  {
-    'bidder': 'bidphysics',
-    'params': {
-      'unitId': 123456,
-    },
-    'placementCode': 'div-gpt-dummy-placement-code',
-    'sizes': [
-      [300, 250]
-    ],
-    'bidId': 'bidId2',
-    'bidderRequestId': 'bidderRequestId',
-    'auctionId': 'auctionId-56a2-4f71-9098-720a68f2f708'
-  }],
-  'start': 1487883186070,
-  'auctionStart': 1487883186069,
-  'timeout': 3000
-};
-
-const RESPONSE = {
-  'headers': null,
-  'body': {
-    'id': 'responseId',
-    'seatbid': [
-      {
-        'bid': [
-          {
-            'id': 'bidId1',
-            'impid': 'bidId1',
-            'price': 0.18,
-            'adm': '<script>adm</script>',
-            'adid': '144762342',
-            'adomain': [
-              'https://dummydomain.com'
-            ],
-            'iurl': 'iurl',
-            'cid': '109',
-            'crid': 'creativeId',
-            'cat': [],
-            'w': 300,
-            'h': 250,
-            'ext': {
-              'prebid': {
-                'type': 'banner'
-              },
-              'bidder': {
-                'appnexus': {
-                  'brand_id': 334553,
-                  'auction_id': 514667951122925701,
-                  'bidder_id': 2,
-                  'bid_ad_type': 0
-                }
-              }
-            }
-          },
-          {
-            'id': 'bidId2',
-            'impid': 'bidId2',
-            'price': 0.1,
-            'adm': '<script>adm2</script>',
-            'adid': '144762342',
-            'adomain': [
-              'https://dummydomain.com'
-            ],
-            'iurl': 'iurl',
-            'cid': '109',
-            'crid': 'creativeId',
-            'cat': [],
-            'w': 300,
-            'h': 250,
-            'ext': {
-              'prebid': {
-                'type': 'banner'
-              },
-              'bidder': {
-                'appnexus': {
-                  'brand_id': 386046,
-                  'auction_id': 517067951122925501,
-                  'bidder_id': 2,
-                  'bid_ad_type': 0
-                }
-              }
-            }
-          }
-        ],
-        'seat': 'bidphysics'
-      }
-    ],
-    'ext': {
-      'usersync': {
-        'sovrn': {
-          'status': 'none',
-          'syncs': [
-            {
-              'url': 'urlsovrn',
-              'type': 'iframe'
-            }
-          ]
-        },
-        'appnexus': {
-          'status': 'none',
-          'syncs': [
-            {
-              'url': 'urlappnexus',
-              'type': 'pixel'
-            }
-          ]
-        }
-      },
-      'responsetimemillis': {
-        'appnexus': 127
-      }
-    }
-  }
-};
-
-describe('BidPhysics bid adapter', function () {
-  describe('isBidRequestValid', function () {
-    it('should accept request if only unitId is passed', function () {
-      let bid = {
-        bidder: 'bidphysics',
-        params: {
-          unitId: 'unitId',
-        }
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-    it('should accept request if only networkId is passed', function () {
-      let bid = {
-        bidder: 'bidphysics',
-        params: {
-          networkId: 'networkId',
-        }
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-    it('should accept request if only publisherId is passed', function () {
-      let bid = {
-        bidder: 'bidphysics',
-        params: {
-          publisherId: 'publisherId',
-        }
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('reject requests without params', function () {
-      let bid = {
-        bidder: 'bidphysics',
-        params: {}
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('creates request data', function () {
-      let request = spec.buildRequests(REQUEST.bidRequest, REQUEST);
-
-      expect(request).to.exist.and.to.be.a('object');
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0]).to.have.property('id', REQUEST.bidRequest[0].bidId);
-      expect(payload.imp[1]).to.have.property('id', REQUEST.bidRequest[1].bidId);
-    });
-
-    it('has gdpr data if applicable', function () {
-      const req = Object.assign({}, REQUEST, {
-        gdprConsent: {
-          consentString: 'consentString',
-          gdprApplies: true,
-        }
-      });
-      let request = spec.buildRequests(REQUEST.bidRequest, req);
-
-      const payload = JSON.parse(request.data);
-      expect(payload.user.ext).to.have.property('consent', req.gdprConsent.consentString);
-      expect(payload.regs.ext).to.have.property('gdpr', 1);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('have bids', function () {
-      let bids = spec.interpretResponse(RESPONSE, REQUEST);
-      expect(bids).to.be.an('array').that.is.not.empty;
-      validateBidOnIndex(0);
-      validateBidOnIndex(1);
-
-      function validateBidOnIndex(index) {
-        expect(bids[index]).to.have.property('currency', 'USD');
-        expect(bids[index]).to.have.property('requestId', RESPONSE.body.seatbid[0].bid[index].impid);
-        expect(bids[index]).to.have.property('cpm', RESPONSE.body.seatbid[0].bid[index].price);
-        expect(bids[index]).to.have.property('width', RESPONSE.body.seatbid[0].bid[index].w);
-        expect(bids[index]).to.have.property('height', RESPONSE.body.seatbid[0].bid[index].h);
-        expect(bids[index]).to.have.property('ad', RESPONSE.body.seatbid[0].bid[index].adm);
-        expect(bids[index]).to.have.property('creativeId', RESPONSE.body.seatbid[0].bid[index].crid);
-        expect(bids[index]).to.have.property('ttl', 30);
-        expect(bids[index]).to.have.property('netRevenue', true);
-      }
-    });
-
-    it('handles empty response', function () {
-      const EMPTY_RESP = Object.assign({}, RESPONSE, {'body': {}});
-      const bids = spec.interpretResponse(EMPTY_RESP, REQUEST);
-
-      expect(bids).to.be.empty;
-    });
-  });
-
-  describe('getUserSyncs', function () {
-    it('handles no parameters', function () {
-      let opts = spec.getUserSyncs({});
-      expect(opts).to.be.an('array').that.is.empty;
-    });
-    it('returns non if sync is not allowed', function () {
-      let opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
-
-      expect(opts).to.be.an('array').that.is.empty;
-    });
-
-    it('iframe sync enabled should return results', function () {
-      let opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [RESPONSE]);
-
-      expect(opts.length).to.equal(1);
-      expect(opts[0].type).to.equal('iframe');
-      expect(opts[0].url).to.equal(RESPONSE.body.ext.usersync['sovrn'].syncs[0].url);
-    });
-
-    it('pixel sync enabled should return results', function () {
-      let opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [RESPONSE]);
-
-      expect(opts.length).to.equal(1);
-      expect(opts[0].type).to.equal('image');
-      expect(opts[0].url).to.equal(RESPONSE.body.ext.usersync['appnexus'].syncs[0].url);
-    });
-
-    it('all sync enabled should return all results', function () {
-      let opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, [RESPONSE]);
-
-      expect(opts.length).to.equal(2);
-    });
-  });
-});
diff --git a/test/spec/modules/bidscubeBidAdapter_spec.js b/test/spec/modules/bidscubeBidAdapter_spec.js
new file mode 100644
index 00000000000..26cf19fc310
--- /dev/null
+++ b/test/spec/modules/bidscubeBidAdapter_spec.js
@@ -0,0 +1,226 @@
+import { expect } from 'chai'
+import { spec } from '../../../modules/bidscubeBidAdapter.js'
+import { deepStrictEqual, notEqual, ok, strictEqual } from 'assert'
+
+describe('BidsCubeAdapter', () => {
+  const bid = {
+    bidId: '9ec5b177515ee2e5',
+    bidder: 'bidscube',
+    params: {
+      placementId: 0,
+      traffic: 'banner',
+      allParams: '{}'
+    }
+  }
+
+  describe('isBidRequestValid', () => {
+    it('Should return true if there are bidId, params and placementId parameters present', () => {
+      strictEqual(true, spec.isBidRequestValid(bid))
+    })
+
+    it('Should return false if at least one of parameters is not present', () => {
+      const b = { ...bid }
+      delete b.params.placementId
+      strictEqual(false, spec.isBidRequestValid(b))
+    })
+  })
+
+  describe('buildRequests', () => {
+    const serverRequest = spec.buildRequests([bid])
+
+    it('Creates a ServerRequest object with method, URL and data', () => {
+      ok(serverRequest)
+      ok(serverRequest.method)
+      ok(serverRequest.url)
+      ok(serverRequest.data)
+    })
+
+    it('Returns POST method', () => {
+      strictEqual('POST', serverRequest.method)
+    })
+
+    it('Returns valid URL', () => {
+      strictEqual('https://supply.bidscube.com/?c=o&m=multi', serverRequest.url)
+    })
+
+    it('Returns valid data if array of bids is valid', () => {
+      const { data } = serverRequest
+      strictEqual('object', typeof data)
+      deepStrictEqual(['deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements'], Object.keys(data))
+      strictEqual('number', typeof data.deviceWidth)
+      strictEqual('number', typeof data.deviceHeight)
+      strictEqual('string', typeof data.language)
+      strictEqual('string', typeof data.host)
+      strictEqual('string', typeof data.page)
+      notEqual(-1, [0, 1].indexOf(data.secure))
+
+      const placement = data.placements[0]
+      deepStrictEqual(['placementId', 'bidId', 'traffic', 'allParams'], Object.keys(placement))
+      strictEqual(0, placement.placementId)
+      strictEqual('9ec5b177515ee2e5', placement.bidId)
+      strictEqual('banner', placement.traffic)
+      strictEqual('{"bidId":"9ec5b177515ee2e5","bidder":"bidscube","params":{"placementId":0,"traffic":"banner","allParams":"{}"}}', placement.allParams)
+    })
+
+    it('Returns empty data if no valid requests are passed', () => {
+      const { placements } = spec.buildRequests([]).data
+
+      expect(spec.buildRequests([]).data.placements).to.be.an('array')
+      strictEqual(0, placements.length)
+    })
+  })
+
+  describe('interpretResponse', () => {
+    const validData = [
+      {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      },
+      {
+        body: [{
+          vastUrl: 'bidscube.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'bidscube.com',
+          title: 'Test',
+          image: 'bidscube.com',
+          creativeId: '2',
+          impressionTrackers: ['bidscube.com'],
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '9ec5b177515ee2e5',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      }
+    ]
+
+    for (const obj of validData) {
+      const { mediaType } = obj.body[0]
+
+      it(`Should interpret ${mediaType} response`, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response).to.be.an('array')
+        strictEqual(1, response.length)
+
+        const copy = { ...obj.body[0] }
+        deepStrictEqual(copy, response[0])
+      })
+    }
+
+    for (const obj of validData) {
+      it(`Should interpret response has meta.advertiserDomains`, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response[0]['meta']['advertiserDomains']).to.be.an('array')
+        expect(response[0]['meta']['advertiserDomains'][0]).to.be.an('string')
+      })
+    }
+
+    const invalidData = [
+      {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'bidscube.com',
+          title: 'Test',
+          impressionTrackers: ['bidscube.com'],
+          ttl: 120,
+          requestId: '9ec5b177515ee2e5',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      }
+    ]
+
+    for (const obj of invalidData) {
+      const { mediaType } = obj.body[0]
+
+      it(`Should return an empty array if invalid ${mediaType} response is passed `, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response).to.be.an('array')
+        strictEqual(0, response.length)
+      })
+    }
+
+    it('Should return an empty array if invalid response is passed', () => {
+      const response = spec.interpretResponse({
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      })
+
+      expect(response).to.be.an('array')
+      strictEqual(0, response.length)
+    })
+  })
+
+  describe('getUserSyncs', () => {
+    it('Returns valid URL and type', () => {
+      const expectedResult = [{ type: 'image', url: 'https://supply.bidscube.com/?c=o&m=cookie' }]
+      deepStrictEqual(expectedResult, spec.getUserSyncs())
+    })
+  })
+})
diff --git a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..a72bb012fa1
--- /dev/null
+++ b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
@@ -0,0 +1,322 @@
+import bidwatchAnalytics from 'modules/bidwatchAnalyticsAdapter.js';
+import { expect } from 'chai';
+import { server } from 'test/mocks/xhr.js';
+let adapterManager = require('src/adapterManager').default;
+let events = require('src/events');
+let constants = require('src/constants.json');
+
+describe('BidWatch Analytics', function () {
+  let timestamp = new Date() - 256;
+  let auctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
+  let timeout = 1500;
+
+  let bidTimeout = [
+    {
+      'bidId': '5fe418f2d70364',
+      'bidder': 'appnexusAst',
+      'adUnitCode': 'tag_200124_banner',
+      'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b'
+    }
+  ];
+
+  const auctionEnd = {
+    'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+    'timestamp': 1647424261187,
+    'auctionEnd': 1647424261714,
+    'auctionStatus': 'completed',
+    'adUnits': [
+      {
+        'code': 'tag_200124_banner',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'bids': [
+          {
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 123456
+            }
+          },
+          {
+            'bidder': 'appnexusAst',
+            'params': {
+              'placementId': 234567
+            }
+          }
+        ],
+        'sizes': [
+          [
+            300,
+            600
+          ]
+        ],
+        'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b40'
+      }
+    ],
+    'adUnitCodes': [
+      'tag_200124_banner'
+    ],
+    'bidderRequests': [
+      {
+        'bidderCode': 'appnexus',
+        'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+        'bidderRequestId': '11dc6ff6378de7',
+        'bids': [
+          {
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 123456
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    300,
+                    600
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': 'tag_200124_banner',
+            'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b40',
+            'sizes': [
+              [
+                300,
+                600
+              ]
+            ],
+            'bidId': '34a63e5d5378a3',
+            'bidderRequestId': '11dc6ff6378de7',
+            'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }
+        ],
+        'auctionStart': 1647424261187,
+        'timeout': 1000,
+        'gdprConsent': {
+          'consentString': 'CONSENT',
+          'gdprApplies': true,
+          'apiVersion': 2,
+          'vendorData': 'a lot of borring stuff',
+        },
+        'start': 1647424261189
+      },
+    ],
+    'noBids': [
+      {
+        'bidder': 'appnexusAst',
+        'params': {
+          'placementId': 10471298
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'tag_200124_banner',
+        'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b40',
+        'sizes': [
+          [
+            300,
+            600
+          ]
+        ],
+        'bidId': '5fe418f2d70364',
+        'bidderRequestId': '4229a45ab8ea87',
+        'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      }
+    ],
+    'bidsReceived': [
+      {
+        'bidderCode': 'appnexus',
+        'width': 300,
+        'height': 600,
+        'statusMessage': 'Bid available',
+        'adId': '7a4ced80f33d33',
+        'requestId': '34a63e5d5378a3',
+        'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b40',
+        'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 27.4276,
+        'creativeId': '158534630',
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 2000,
+        'ad': 'some html',
+        'meta': {
+          'advertiserDomains': [
+            'example.com'
+          ]
+        },
+        'originalCpm': 25.02521,
+        'originalCurrency': 'EUR',
+        'responseTimestamp': 1647424261559,
+        'requestTimestamp': 1647424261189,
+        'bidder': 'appnexus',
+        'adUnitCode': 'tag_200124_banner',
+        'timeToRespond': 370,
+        'pbLg': '5.00',
+        'pbMg': '20.00',
+        'pbHg': '20.00',
+        'pbAg': '20.00',
+        'pbDg': '20.00',
+        'pbCg': '20.000000',
+        'size': '300x600',
+        'adserverTargeting': {
+          'hb_bidder': 'appnexus',
+          'hb_adid': '7a4ced80f33d33',
+          'hb_pb': '20.000000',
+          'hb_size': '300x600',
+          'hb_source': 'client',
+          'hb_format': 'banner',
+          'hb_adomain': 'example.com'
+        }
+      }
+    ],
+    'winningBids': [
+
+    ],
+    'timeout': 1000
+  };
+
+  let bidWon = {
+    'bidderCode': 'appnexus',
+    'width': 970,
+    'height': 250,
+    'statusMessage': 'Bid available',
+    'adId': '65d16ef039a97a',
+    'requestId': '2bd3e8ff8a113f',
+    'transactionId': '8b2a8629-d1ea-4bb1-aff0-e335b96dd002',
+    'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+    'mediaType': 'banner',
+    'source': 'client',
+    'cpm': 27.4276,
+    'creativeId': '158533702',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 2000,
+    'ad': 'some html',
+    'meta': {
+      'advertiserDomains': [
+        'example.com'
+      ]
+    },
+    'originalCpm': 25.02521,
+    'originalCurrency': 'EUR',
+    'responseTimestamp': 1647424261558,
+    'requestTimestamp': 1647424261189,
+    'bidder': 'appnexus',
+    'adUnitCode': 'tag_200123_banner',
+    'timeToRespond': 369,
+    'originalBidder': 'appnexus',
+    'pbLg': '5.00',
+    'pbMg': '20.00',
+    'pbHg': '20.00',
+    'pbAg': '20.00',
+    'pbDg': '20.00',
+    'pbCg': '20.000000',
+    'size': '970x250',
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_adid': '65d16ef039a97a',
+      'hb_pb': '20.000000',
+      'hb_size': '970x250',
+      'hb_source': 'client',
+      'hb_format': 'banner',
+      'hb_adomain': 'example.com'
+    },
+    'status': 'rendered',
+    'params': [
+      {
+        'placementId': 123456
+      }
+    ]
+  };
+
+  after(function () {
+    bidwatchAnalytics.disableAnalytics();
+  });
+
+  describe('main test flow', function () {
+    beforeEach(function () {
+      sinon.stub(events, 'getEvents').returns([]);
+      sinon.spy(bidwatchAnalytics, 'track');
+    });
+    afterEach(function () {
+      events.getEvents.restore();
+      bidwatchAnalytics.disableAnalytics();
+      bidwatchAnalytics.track.restore();
+    });
+
+    it('test auctionEnd', function () {
+      adapterManager.registerAnalyticsAdapter({
+        code: 'bidwatch',
+        adapter: bidwatchAnalytics
+      });
+
+      adapterManager.enableAnalytics({
+        provider: 'bidwatch',
+        options: {
+          domain: 'test'
+        }
+      });
+
+      events.emit(constants.EVENTS.BID_REQUESTED, auctionEnd['bidderRequests'][0]);
+      events.emit(constants.EVENTS.BID_RESPONSE, auctionEnd['bidsReceived'][0]);
+      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
+      events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
+      expect(server.requests.length).to.equal(1);
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.have.property('auctionEnd').exist;
+      expect(message.auctionEnd).to.have.lengthOf(1);
+      expect(message.auctionEnd[0]).to.have.property('bidsReceived').and.to.have.lengthOf(1);
+      expect(message.auctionEnd[0].bidsReceived[0]).not.to.have.property('ad');
+      expect(message.auctionEnd[0].bidsReceived[0]).to.have.property('meta');
+      expect(message.auctionEnd[0].bidsReceived[0].meta).to.have.property('advertiserDomains');
+      expect(message.auctionEnd[0].bidsReceived[0]).to.have.property('adId');
+      expect(message.auctionEnd[0]).to.have.property('bidderRequests').and.to.have.lengthOf(1);
+      expect(message.auctionEnd[0].bidderRequests[0]).to.have.property('gdprConsent');
+      expect(message.auctionEnd[0].bidderRequests[0].gdprConsent).not.to.have.property('vendorData');
+    });
+
+    it('test bidWon', function() {
+      adapterManager.registerAnalyticsAdapter({
+        code: 'bidwatch',
+        adapter: bidwatchAnalytics
+      });
+
+      adapterManager.enableAnalytics({
+        provider: 'bidwatch',
+        options: {
+          domain: 'test'
+        }
+      });
+      events.emit(constants.EVENTS.BID_WON, bidWon);
+      expect(server.requests.length).to.equal(1);
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).not.to.have.property('ad');
+      expect(message).to.have.property('adId')
+      expect(message).to.have.property('cpmIncrement').and.to.equal(27.4276);
+    });
+  });
+});
diff --git a/test/spec/modules/big-richmediaBidAdapter_spec.js b/test/spec/modules/big-richmediaBidAdapter_spec.js
new file mode 100644
index 00000000000..b2ee0725d49
--- /dev/null
+++ b/test/spec/modules/big-richmediaBidAdapter_spec.js
@@ -0,0 +1,311 @@
+import { expect } from 'chai';
+import { spec } from 'modules/big-richmediaBidAdapter.js';
+import { auctionManager } from 'src/auctionManager.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { deepClone } from 'src/utils.js';
+
+describe('bigRichMediaAdapterTests', function () {
+  before(function () {
+    config.setConfig({
+      bigRichmedia: {
+        publisherId: '123ABC'
+      }
+    });
+  });
+
+  after(function () {
+    config.resetConfig();
+  });
+
+  describe('bidRequestValidity', function () {
+    const bid = {
+      'bidder': 'bigRichmedia',
+      'params': {
+        'placementId': '10433394'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('bidRequest with zoneId and deliveryUrl params', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('bidRequest with no params is not valid', function () {
+      const localBid = Object.assign({}, bid);
+      localBid.params = {};
+      expect(spec.isBidRequestValid(localBid)).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', function () {
+    let getAdUnitsStub;
+    const bidRequests = [
+      {
+        'bidder': 'bigRichmedia',
+        'params': {
+          'placementId': '10433394'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [300, 600], [1800, 1000]]
+          }
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [300, 600], [1800, 1000]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'transactionId': '04f2659e-c005-4eb1-a57c-fa93145e3843'
+      }
+    ];
+
+    beforeEach(function() {
+      getAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits').callsFake(function() {
+        return [];
+      });
+    });
+
+    afterEach(function() {
+      getAdUnitsStub.restore();
+    });
+
+    it('should have skin size', function () {
+      const bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            format: 'skin'
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].sizes).to.exist;
+      expect(payload.tags[0].sizes).to.have.lengthOf(3);
+    });
+
+    it('should build video bid request', function() {
+      const bidRequest = deepClone(bidRequests[0]);
+      bidRequest.params = {
+        placementId: '1234235',
+        video: {
+          skippable: true,
+          playback_method: ['auto_play_sound_off', 'auto_play_sound_unknown'],
+          context: 'outstream',
+          format: 'sticky-top'
+        }
+      };
+      bidRequest.mediaTypes = {
+        video: {
+          playerSize: [640, 480],
+          context: 'outstream',
+          mimes: ['video/mp4'],
+          skip: 0,
+          minduration: 5,
+          api: [1, 5, 6],
+          playbackmethod: [2, 4]
+        }
+      };
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].video).to.deep.equal({
+        minduration: 5,
+        playback_method: 2,
+        skippable: true,
+        context: 4
+      });
+      expect(payload.tags[0].video_frameworks).to.deep.equal([1, 4])
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bfStub;
+
+    before(function() {
+      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+    });
+
+    after(function() {
+      bfStub.restore();
+    });
+
+    const response = {
+      'version': '3.0.0',
+      'tags': [
+        {
+          'uuid': '3db3773286ee59',
+          'tag_id': 10433394,
+          'auction_id': '4534722592064951574',
+          'nobid': false,
+          'no_ad_url': 'https://lax1-ib.adnxs.com/no-ad',
+          'timeout_ms': 10000,
+          'ad_profile_id': 27079,
+          'ads': [
+            {
+              'content_source': 'rtb',
+              'ad_type': 'banner',
+              'buyer_member_id': 958,
+              'creative_id': 29681110,
+              'media_type_id': 1,
+              'media_subtype_id': 1,
+              'cpm': 0.5,
+              'cpm_publisher_currency': 0.5,
+              'publisher_currency_code': '$',
+              'client_initiated_ad_counting': true,
+              'viewability': {
+                'config': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+              },
+              'rtb': {
+                'banner': {
+                  'content': '<!-- Creative -->',
+                  'width': 300,
+                  'height': 250
+                },
+                'trackers': [
+                  {
+                    'impression_urls': [
+                      'https://lax1-ib.adnxs.com/impression',
+                      'https://www.test.com/tracker'
+                    ],
+                    'video_events': {}
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    };
+
+    it('should get correct bid response', function () {
+      const expectedResponse = [
+        {
+          'adId': '3a1f23123e',
+          'requestId': '3db3773286ee59',
+          'cpm': 0.5,
+          'creativeId': 29681110,
+          'dealId': undefined,
+          'width': 300,
+          'height': 250,
+          'ad': '<!-- Creative -->',
+          'mediaType': 'banner',
+          'currency': 'USD',
+          'ttl': 300,
+          'netRevenue': true,
+          'adUnitCode': 'code',
+          'appnexus': {
+            'buyerMemberId': 958
+          },
+          'meta': {
+            'dchain': {
+              'ver': '1.0',
+              'complete': 0,
+              'nodes': [{
+                'bsid': '958'
+              }]
+            }
+          }
+        }
+      ];
+      const bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      };
+      const result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    it('handles outstream video responses', function () {
+      const response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'content': '<!-- VAST Creative -->'
+              }
+            },
+            'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+          }]
+        }]
+      };
+      const bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      }
+
+      const result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).not.to.have.property('vastXml');
+      expect(result[0]).not.to.have.property('vastUrl');
+      expect(result[0]).to.have.property('width', 1);
+      expect(result[0]).to.have.property('height', 1);
+      expect(result[0]).to.have.property('mediaType', 'banner');
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    const syncOptions = {
+      syncEnabled: false
+    };
+
+    it('should not return sync', function() {
+      const serverResponse = [{ body: '' }];
+      const result = spec.getUserSyncs(syncOptions, serverResponse);
+      expect(result).to.be.undefined;
+    });
+  });
+
+  describe('transformBidParams', function() {
+    it('cast placementId to number', function() {
+      const adUnit = {
+        code: 'adunit-code',
+        params: {
+          placementId: '456'
+        }
+      };
+      const bid = {
+        params: {
+          placementId: '456'
+        },
+        sizes: [[300, 250]],
+        mediaTypes: {
+          banner: { sizes: [[300, 250]] }
+        }
+      };
+
+      const params = spec.transformBidParams({ placementId: '456' }, true, adUnit, [{ bidderCode: 'bigRichmedia', auctionId: bid.auctionId, bids: [bid] }]);
+
+      expect(params.placement_id).to.exist;
+      expect(params.placement_id).to.be.a('number');
+    });
+  });
+
+  describe('onBidWon', function() {
+    it('Should not have any error', function() {
+      const result = spec.onBidWon({});
+      expect(true).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/bizzclickBidAdapter_spec.js b/test/spec/modules/bizzclickBidAdapter_spec.js
new file mode 100644
index 00000000000..f80051b0a50
--- /dev/null
+++ b/test/spec/modules/bizzclickBidAdapter_spec.js
@@ -0,0 +1,419 @@
+import { expect } from 'chai';
+import { spec } from 'modules/bizzclickBidAdapter.js';
+import {config} from 'src/config.js';
+
+const NATIVE_BID_REQUEST = {
+  code: 'native_example',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+        required: true
+      },
+      clickUrl: {
+        required: true
+      },
+      privacyLink: {
+        required: false
+      },
+      body: {
+        required: true
+      },
+      icon: {
+        required: true,
+        sizes: [50, 50]
+      }
+    }
+  },
+  bidder: 'bizzclick',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+};
+
+const BANNER_BID_REQUEST = {
+  code: 'banner_example',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]]
+    }
+  },
+  schain: {
+    ver: '1.0',
+    complete: 1,
+    nodes: [
+      {
+        asi: 'example.com',
+        sid: '164',
+        hp: 1
+      }
+    ]
+  },
+  bidder: 'bizzclick',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000,
+  gdprConsent: {
+    consentString: 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    gdprApplies: 1,
+  },
+  uspConsent: 'uspConsent'
+}
+
+const bidRequest = {
+  refererInfo: {
+    referer: 'test.com'
+  }
+}
+
+const VIDEO_BID_REQUEST = {
+  code: 'video1',
+  sizes: [640, 480],
+  mediaTypes: { video: {
+    minduration: 0,
+    maxduration: 999,
+    boxingallowed: 1,
+    skip: 0,
+    mimes: [
+      'application/javascript',
+      'video/mp4'
+    ],
+    w: 1920,
+    h: 1080,
+    protocols: [
+      2
+    ],
+    linearity: 1,
+    api: [
+      1,
+      2
+    ]
+  }
+  },
+
+  bidder: 'bizzclick',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+}
+
+const BANNER_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'banner'
+      }
+    }],
+  }],
+};
+
+const VIDEO_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'video',
+        vastUrl: 'http://example.vast',
+      }
+    }],
+  }],
+};
+
+let imgData = {
+  url: `https://example.com/image`,
+  w: 1200,
+  h: 627
+};
+
+const NATIVE_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: { native:
+          {
+            assets: [
+              {id: 0, title: 'dummyText'},
+              {id: 3, image: imgData},
+              {
+                id: 5,
+                data: {value: 'organization.name'}
+              }
+            ],
+            link: {url: 'example.com'},
+            imptrackers: ['tracker1.com', 'tracker2.com', 'tracker3.com'],
+            jstracker: 'tracker1.com'
+          }
+      },
+      crid: 'crid',
+      ext: {
+        mediaType: 'native'
+      }
+    }],
+  }],
+};
+
+describe('BizzclickAdapter', function() {
+  describe('with COPPA', function() {
+    beforeEach(function() {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+    });
+    afterEach(function() {
+      config.getConfig.restore();
+    });
+
+    it('should send the Coppa "required" flag set to "1" in the request', function () {
+      let serverRequest = spec.buildRequests([BANNER_BID_REQUEST]);
+      expect(serverRequest.data[0].regs.coppa).to.equal(1);
+    });
+  });
+
+  describe('isBidRequestValid', function() {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(NATIVE_BID_REQUEST)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, NATIVE_BID_REQUEST);
+      delete bid.params;
+      bid.params = {
+        'IncorrectParam': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('build Native Request', function () {
+    const request = spec.buildRequests([NATIVE_BID_REQUEST], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      let serverRequest = spec.buildRequests([]);
+      expect(serverRequest).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('build Banner Request', function () {
+    const request = spec.buildRequests([BANNER_BID_REQUEST]);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('check consent and ccpa string is set properly', function() {
+      expect(request.data[0].regs.ext.gdpr).to.equal(1);
+      expect(request.data[0].user.ext.consent).to.equal(BANNER_BID_REQUEST.gdprConsent.consentString);
+      expect(request.data[0].regs.ext.us_privacy).to.equal(BANNER_BID_REQUEST.uspConsent);
+    })
+
+    it('check schain is set properly', function() {
+      expect(request.data[0].source.ext.schain.complete).to.equal(1);
+      expect(request.data[0].source.ext.schain.ver).to.equal('1.0');
+    })
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
+    });
+  });
+
+  describe('build Video Request', function () {
+    const request = spec.buildRequests([VIDEO_BID_REQUEST]);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=accountId');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Empty response must return empty array', function() {
+      const emptyResponse = null;
+      let response = spec.interpretResponse(emptyResponse);
+
+      expect(response).to.be.an('array').that.is.empty;
+    })
+
+    it('Should interpret banner response', function () {
+      const bannerResponse = {
+        body: [BANNER_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: BANNER_BID_RESPONSE.id,
+        cpm: BANNER_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: BANNER_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: BANNER_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: BANNER_BID_RESPONSE.ttl || 1200,
+        currency: BANNER_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: BANNER_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: BANNER_BID_RESPONSE.seatbid[0].bid[0].dealid,
+
+        meta: {advertiserDomains: BANNER_BID_RESPONSE.seatbid[0].bid[0].adomain},
+        mediaType: 'banner',
+        ad: BANNER_BID_RESPONSE.seatbid[0].bid[0].adm
+      }
+
+      let bannerResponses = spec.interpretResponse(bannerResponse);
+
+      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', 'meta', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.ad).to.equal(expectedBidResponse.ad);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.meta.advertiserDomains).to.equal(expectedBidResponse.meta.advertiserDomains);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret video response', function () {
+      const videoResponse = {
+        body: [VIDEO_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: VIDEO_BID_RESPONSE.id,
+        cpm: VIDEO_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: VIDEO_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: VIDEO_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: VIDEO_BID_RESPONSE.ttl || 1200,
+        currency: VIDEO_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'video',
+        vastXml: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adm,
+        meta: {advertiserDomains: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adomain},
+        vastUrl: VIDEO_BID_RESPONSE.seatbid[0].bid[0].ext.vastUrl
+      }
+
+      let videoResponses = spec.interpretResponse(videoResponse);
+
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastXml', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'meta', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.vastXml).to.equal(expectedBidResponse.vastXml)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.meta.advertiserDomains).to.equal(expectedBidResponse.meta.advertiserDomains);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret native response', function () {
+      const nativeResponse = {
+        body: [NATIVE_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: NATIVE_BID_RESPONSE.id,
+        cpm: NATIVE_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: NATIVE_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: NATIVE_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: NATIVE_BID_RESPONSE.ttl || 1200,
+        currency: NATIVE_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'native',
+        meta: {advertiserDomains: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adomain},
+        native: {clickUrl: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adm.native.link.url}
+      }
+
+      let nativeResponses = spec.interpretResponse(nativeResponse);
+
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.meta.advertiserDomains).to.equal(expectedBidResponse.meta.advertiserDomains);
+      expect(dataItem.native.clickUrl).to.equal(expectedBidResponse.native.clickUrl)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+  });
+})
diff --git a/test/spec/modules/bliinkBidAdapter_spec.js b/test/spec/modules/bliinkBidAdapter_spec.js
new file mode 100644
index 00000000000..b8994b86847
--- /dev/null
+++ b/test/spec/modules/bliinkBidAdapter_spec.js
@@ -0,0 +1,802 @@
+import { expect } from 'chai'
+import { spec, buildBid, BLIINK_ENDPOINT_ENGINE, getMetaList, BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME } from 'modules/bliinkBidAdapter.js'
+
+/**
+ * @description Mockup bidRequest
+ * @return {{
+ * bidderWinsCount: number,
+ * adUnitCode: string,
+ * bidder: string,
+ * src: string,
+ * bidRequestsCount: number,
+ * params: {tagId: string, placement: string},
+ * bidId: string,
+ * transactionId: string,
+ * auctionId: string,
+ * bidderRequestId: string,
+ * bidderRequestsCount: number,
+ * mediaTypes: {banner: {sizes: number[][]}},
+ * sizes: number[][],
+ * crumbs: {pubcid: string},
+ * ortb2Imp: {ext: {data: {pbadslot: string}}}}}
+ */
+const getConfigBid = (placement) => {
+  return {
+    adUnitCode: '/19968336/test',
+    auctionId: '6752b51c-dcd4-4001-85dc-885ab5c504cf',
+    bidId: '2def0c5b2a7f6e',
+    bidRequestsCount: 1,
+    bidder: 'bliink',
+    bidderRequestId: '1592eb20088b18',
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    crumbs: {
+      pubcid: '55ffadc5-051f-428d-8ecc-dc585e0bde0d'
+    },
+    sizes: [[300, 250]],
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250]
+        ]
+      }
+    },
+    ortb2Imp: {
+      ext: {
+        data: {
+          pbadslot: '/19968336/test'
+        }
+      }
+    },
+    params: {
+      placement: placement,
+      tagId: '14f30eca-85d2-11e8-9eed-0242ac120007'
+    },
+    src: 'client',
+    transactionId: 'cc6678c4-9746-4082-b9e2-d8065d078ebf'
+  }
+}
+const getConfigBannerBid = () => {
+  return {
+    creative: {
+      banner: {
+        adm: '',
+        height: 250,
+        width: 300,
+      },
+      media_type: 'banner',
+      creativeId: 125,
+    },
+    price: 1,
+    id: '810',
+    token: 'token',
+    mode: 'rtb',
+    extras: {
+      deal_id: '34567erty',
+      transaction_id: '2def0c5b2a7f6e',
+    },
+    currency: 'EUR',
+  }
+}
+const getConfigVideoBid = () => {
+  return {
+    creative: {
+      video: {
+        content:
+          '<VAST></VAST>',
+        height: 250,
+        width: 300,
+      },
+      media_type: 'video',
+      creativeId: 0,
+    },
+    price: 1,
+    id: '8121',
+    token: 'token',
+    mode: 'rtb',
+    extras: {
+      deal_id: '34567ertyRTY',
+      transaction_id: '2def0c5b2a7f6e',
+    },
+    currency: 'EUR',
+  }
+}
+
+/**
+ * @description Mockup response from engine.bliink.io/xxxx
+ * @return {
+ *  {
+ *    viewability_percent_in_view: number,
+ *    viewability_duration: number,
+ *    ad_id: number,
+ *    id: number,
+ *    category: number,
+ *    type: number,
+ *    content: {
+ *      creative: {
+ *        adm: string
+ *      }
+ *    }
+ *    }
+ *    }
+*   }
+ */
+const getConfigCreative = () => {
+  return {
+    ad: '<iframe src="https://creative-stg.bliink.io/test-preview-jonathan/index.html?cb=54545&cb=1653984833&gdpr=1&gdpr_consent=#click=https://e-stg.api.bliink.io/c?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NTY0MTMzMzgsImlhdCI6MTY1NTgwODUzOCwiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6IjQ3ZmQyMmY1LThiM2MtNGI4Zi05MzgyLTAzNGEwNGJmNGNmZSIsIm5ldHdvcmtJZCI6MjEsInNpdGVJZCI6NDgsInRhZ0lkIjo4MSwiY29va2llSWQiOiI4NjkwZDEzMDkyNjM5YThhMDliM2MwZDgzMDFlMTBkNmM5MWRhMzBlZWY3NTA2OTRkNTQ5Y2ExYWEwN2M0OTU2IiwiZXZlbnRJZCI6MywidGFyZ2V0aW5nIjp7InBsYXRmb3JtIjoiV2Vic2l0ZSIsInJlZmVycmVyIjoiaHR0cDovL2xvY2FsaG9zdDo5OTk5L2ludGVncmF0aW9uRXhhbXBsZXMvZ3B0L2dkcHJfaGVsbG9fd29ybGQuaHRtbCIsInBhZ2VVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojk5OTkvaW50ZWdyYXRpb25FeGFtcGxlcy9ncHQvZ2Rwcl9oZWxsb193b3JsZC5odG1sIiwidGltZSI6MTY1NTgwODUzOCwibG9jYXRpb24iOnsibGF0aXR1ZGUiOjQ4LjgzMjMsImxvbmdpdHVkZSI6Mi40MDc1LCJyZWdpb24iOiJJREYiLCJjb3VudHJ5IjoiRlIiLCJjaXR5IjoiUGFyaXMiLCJ6aXBDb2RlIjoiNzUwMTUiLCJkZXBhcnRtZW50IjoiNzUifSwiY2l0eSI6IlBhcmlzIiwiY291bnRyeSI6IkZSIiwiZGV2aWNlT3MiOiJtYWNPUyIsImRldmljZVBsYXRmb3JtIjoiV2Vic2l0ZSIsInJhd1VzZXJBZ2VudCI6Ik1vemlsbGEvNS4wIChNYWNpbnRvc2g7IEludGVsIE1hYyBPUyBYIDEwXzE1XzcpIEFwcGxlV2ViS2l0LzUzNy4zNiAoS0hUTUwsIGxpa2UgR2Vja28pIENocm9tZS8xMDIuMC4wLjAgU2FmYXJpLzUzNy4zNiJ9LCJnZHByIjp7Imhhc0NvbnNlbnQiOmZhbHNlLCJjb25zZW50U3RyaW5nIjoiQlBhbzY5dVBhNHd2WkFBQUJBRlJBQkFBQUFBQUFBIn0sIm5wIjoiNGNCNHVhQW5ncFliZ0RRYXliUGFnUT09IiwiZ3AiOiI3K05UVjErK0ttWndkcDhuTVd3NGl3PT0iLCJjdXJyZW5jeSI6IkVVUiIsIndpbiI6ZmFsc2UsImZvcm1hdCI6MywiZGlzcGxheVR5cGUiOiJzdGlja3kiLCJhZElkIjoxNjgsImFkdmVydGlzZXJJZCI6MjEsImNhbXBhaWduSWQiOjUzNSwiY3JlYXRpdmVJZCI6NzEsImVycm9yIjpmYWxzZX19.8hkPblKo1y1hftESf7e0GN9EzJ1LNVposv_a0TS4h_8&redirect=" style="height: 100%; width: 100%; border: 0;"></iframe><script src="https://tag-stg.bliink.io/creative.min.js?cb=0.0.0"></script>',
+    mediaType: 'banner',
+    cpm: 4,
+    currency: 'EUR',
+    creativeId: '34567erty',
+    width: 300,
+    height: 250,
+    ttl: 3600,
+    netRevenue: true,
+  }
+}
+
+const getConfigCreativeVideo = (isNoVast) => {
+  return {
+    mediaType: 'video',
+    vastXml: isNoVast ? '' : '<VAST></VAST>',
+    cpm: 0,
+    currency: 'EUR',
+    creativeId: '34567ertyaza',
+    requestId: '6a204ce130280d',
+    width: 300,
+    height: 250,
+    ttl: 3600,
+    netRevenue: true,
+  }
+}
+
+/**
+ * @description Mockup BuildRequest function
+ * @return {{bidderRequestId: string, bidderCode: string, bids: {bidderWinsCount: number, adUnitCode: string, bidder: string, src: string, bidRequestsCount: number, params: {tagId: string, placement: string}, bidId: string, transactionId: string, auctionId: string, bidderRequestId: string, bidderRequestsCount: number, mediaTypes: {banner: {sizes: number[][]}}, sizes: number[][], crumbs: {pubcid: string}, ortb2Imp: {ext: {data: {pbadslot: string}}}}[], refererInfo: {referer: string, canonicalUrl: null, isAmp: boolean, reachedTop: boolean, numIframes: number}}}
+ */
+const getConfigBuildRequest = (placement) => {
+  let buildRequest = {
+    bidderRequestId: '164ddfd207e94d',
+    bidderCode: 'bliink',
+    bids: [getConfigBid(placement)],
+    refererInfo: {
+      canonicalUrl: null,
+      isAmp: false,
+      numIframes: 0,
+      reachedTop: true,
+      page: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+    },
+  }
+
+  if (!placement) {
+    return buildRequest
+  }
+
+  return Object.assign(buildRequest, {
+    params: {
+      bids: [getConfigBid(placement)],
+      placement: placement
+    },
+  })
+}
+
+/**
+ * @description Mockup response from API
+ * @param noAd
+ * @return {{mode: string, message: string}|{headers: {}, body: {mode: string, creative: {viewability_percent_in_view: number, viewability_duration: number, ad_id: number, adm: string, id: number, category: number, type: number}, token: string}}}
+ */
+const getConfigInterpretResponse = (noAd = false) => {
+  if (noAd) {
+    return {
+      message: 'invalid tag',
+      mode: 'no-ad'
+    }
+  }
+
+  return {
+    body: {
+      ...getConfigCreative(),
+      mode: 'ad',
+      transactionId: '2def0c5b2a7f6e',
+      token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MjgxNzA4MzEsImlhdCI6MTYyNzU2NjAzMSwiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6IjM1YmU1NDNjLTNkZTQtNGQ1Yy04N2NjLWIzYzEyOGZiYzU0MCIsIm5ldHdvcmtJZCI6MjEsInNpdGVJZCI6NTksInRhZ0lkIjo1OSwiY29va2llSWQiOiJjNGU4MWVhOS1jMjhmLTQwZDItODY1ZC1hNjQzZjE1OTcyZjUiLCJldmVudElkIjozLCJ0YXJnZXRpbmciOnsicGxhdGZvcm0iOiJXZWJzaXRlIiwiaXAiOiI3OC4xMjIuNzUuNzIiLCJ0aW1lIjoxNjI3NTY2MDMxLCJsb2NhdGlvbiI6eyJsYXRpdHVkZSI6NDguOTczOSwibG9uZ2l0dWRlIjozLjMxMTMsInJlZ2lvbiI6IkhERiIsImNvdW50cnkiOiJGUiIsImNpdHkiOiJTYXVsY2hlcnkiLCJ6aXBDb2RlIjoiMDIzMTAiLCJkZXBhcnRtZW50IjoiMDIifSwiY2l0eSI6IlNhdWxjaGVyeSIsImNvdW50cnkiOiJGUiIsImRldmljZU9zIjoibWFjT1MiLCJkZXZpY2VQbGF0Zm9ybSI6IldlYnNpdGUiLCJyYXdVc2VyQWdlbnQiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvOTEuMC40NDcyLjEyNCBTYWZhcmkvNTM3LjM2In0sImdkcHIiOnsiaGFzQ29uc2VudCI6dHJ1ZX0sIndpbiI6ZmFsc2UsImFkSWQiOjU2NDgsImFkdmVydGlzZXJJZCI6MSwiY2FtcGFpZ25JZCI6MSwiY3JlYXRpdmVJZCI6MjgyNSwiZXJyb3IiOmZhbHNlfX0.-UefQH4G0k-RJGemBYffs-KL7EEwma2Wuwgk2xnpij8'
+    },
+    headers: {},
+  }
+}
+
+/**
+ * @description Mockup response from API for RTB creative
+ * @param noAd
+ * @return {{body: string} | {mode: string, message: string}}
+ */
+const getConfigInterpretResponseRTB = (noAd = false, isInvalidVast = false) => {
+  if (noAd) {
+    return {
+      message: 'invalid tag',
+      mode: 'no-ad'
+    }
+  }
+
+  const validVast = `
+  <VAST version="3">
+    <Ad>
+      <Wrapper>
+        <AdSystem>BLIINK</AdSystem>
+        <VASTAdTagURI>https://vast.bliink.io/p/508379d0-9f65-4198-8ba5-f61f2b51224f.xml</VASTAdTagURI>
+        <Error>https://e.api.bliink.io/e?name=vast-error&token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MzQwMzA1MjcsImlhdCI6MTYzMzQyNTcyNywiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6ImE2NjJjZGJmLTkzNDYtNDI0MS1iMTU0LTJhOTc2OTg0NjNmOSIsIm5ldHdvcmtJZCI6MjUsInNpdGVJZCI6MTQzLCJ0YWdJZCI6MTI3MSwiY29va2llSWQiOiIwNWFhN2UwMi05MzgzLTQ1NGYtOTJmZC1jOTE2YWNlMmUyZjYiLCJldmVudElkIjozLCJ0YXJnZXRpbmciOnsicGxhdGZvcm0iOiJXZWJzaXRlIiwicmVmZXJyZXIiOiJodHRwOi8vbG9jYWxob3N0OjgxODEvaW50ZWdyYXRpb25FeGFtcGxlcy9ncHQvYmxpaW5rLWluc3RyZWFtLmh0bWwiLCJwYWdlVXJsIjoiaHR0cDovL2xvY2FsaG9zdDo4MTgxL2ludGVncmF0aW9uRXhhbXBsZXMvZ3B0L2JsaWluay1pbnN0cmVhbS5odG1sIiwiaXAiOiIzMS4zOS4xNDEuMTQwIiwidGltZSI6MTYzMzQyNTcyNywibG9jYXRpb24iOnsibGF0aXR1ZGUiOjQ4Ljk0MjIsImxvbmdpdHVkZSI6Mi41MDM5LCJyZWdpb24iOiJJREYiLCJjb3VudHJ5IjoiRlIiLCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsInppcENvZGUiOiI5MzYwMCIsImRlcGFydG1lbnQiOiI5MyJ9LCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsImNvdW50cnkiOiJGUiIsImRldmljZU9zIjoibWFjT1MiLCJkZXZpY2VQbGF0Zm9ybSI6IldlYnNpdGUiLCJyYXdVc2VyQWdlbnQiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvOTMuMC40NTc3LjYzIFNhZmFyaS81MzcuMzYiLCJjb250ZW50Q2xhc3NpZmljYXRpb24iOnsiYnJhbmRzYWZlIjpmYWxzZX19LCJnZHByIjp7Imhhc0NvbnNlbnQiOnRydWV9LCJ3aW4iOmZhbHNlLCJhZElkIjo1NzkzLCJhZHZlcnRpc2VySWQiOjEsImNhbXBhaWduSWQiOjEsImNyZWF0aXZlSWQiOjExOTQsImVycm9yIjpmYWxzZX19.nJSJPKovg0_jSHtLdrMPDqesAIlFKCuXPXYxpsyWBDw</Error>
+        <Impression>https://e.api.bliink.io/e?name=impression&token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MzQwMzA1MjcsImlhdCI6MTYzMzQyNTcyNywiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6ImE2NjJjZGJmLTkzNDYtNDI0MS1iMTU0LTJhOTc2OTg0NjNmOSIsIm5ldHdvcmtJZCI6MjUsInNpdGVJZCI6MTQzLCJ0YWdJZCI6MTI3MSwiY29va2llSWQiOiIwNWFhN2UwMi05MzgzLTQ1NGYtOTJmZC1jOTE2YWNlMmUyZjYiLCJldmVudElkIjozLCJ0YXJnZXRpbmciOnsicGxhdGZvcm0iOiJXZWJzaXRlIiwicmVmZXJyZXIiOiJodHRwOi8vbG9jYWxob3N0OjgxODEvaW50ZWdyYXRpb25FeGFtcGxlcy9ncHQvYmxpaW5rLWluc3RyZWFtLmh0bWwiLCJwYWdlVXJsIjoiaHR0cDovL2xvY2FsaG9zdDo4MTgxL2ludGVncmF0aW9uRXhhbXBsZXMvZ3B0L2JsaWluay1pbnN0cmVhbS5odG1sIiwiaXAiOiIzMS4zOS4xNDEuMTQwIiwidGltZSI6MTYzMzQyNTcyNywibG9jYXRpb24iOnsibGF0aXR1ZGUiOjQ4Ljk0MjIsImxvbmdpdHVkZSI6Mi41MDM5LCJyZWdpb24iOiJJREYiLCJjb3VudHJ5IjoiRlIiLCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsInppcENvZGUiOiI5MzYwMCIsImRlcGFydG1lbnQiOiI5MyJ9LCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsImNvdW50cnkiOiJGUiIsImRldmljZU9zIjoibWFjT1MiLCJkZXZpY2VQbGF0Zm9ybSI6IldlYnNpdGUiLCJyYXdVc2VyQWdlbnQiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvOTMuMC40NTc3LjYzIFNhZmFyaS81MzcuMzYiLCJjb250ZW50Q2xhc3NpZmljYXRpb24iOnsiYnJhbmRzYWZlIjpmYWxzZX19LCJnZHByIjp7Imhhc0NvbnNlbnQiOnRydWV9LCJ3aW4iOmZhbHNlLCJhZElkIjo1NzkzLCJhZHZlcnRpc2VySWQiOjEsImNhbXBhaWduSWQiOjEsImNyZWF0aXZlSWQiOjExOTQsImVycm9yIjpmYWxzZX19.nJSJPKovg0_jSHtLdrMPDqesAIlFKCuXPXYxpsyWBDw</Impression>
+        <Extensions><Price>1</Price><Currency>EUR</Currency>
+      </Wrapper>
+    </Ad>
+  </VAST>
+  `
+  const invalidVast = `
+  <VASTZ version="3">
+    <Ad>
+
+    </Ad>
+  </VAST>
+  `
+
+  return {
+    body: { bids: [
+      {
+        'creative': {
+          'video': {
+            'content': isInvalidVast ? invalidVast : validVast,
+            'height': 250,
+            'width': 300
+          },
+          'media_type': 'video',
+          'creativeId': 0,
+        },
+        'price': 0,
+        'id': '8121',
+        'token': 'token',
+        'mode': 'rtb',
+        'extras': {
+          'deal_id': '34567ertyaza',
+          'transaction_id': '2def0c5b2a7f6e'
+        },
+        'currency': 'EUR'
+      }
+    ],
+    userSyncs: []}
+  }
+}
+
+/**
+ *
+ *
+ *
+ * @description Below start tests for utils fonctions
+ *
+ *
+ *
+ */
+
+const testsGetMetaList = [
+  {
+    title: 'Should return empty array if there are no parameters',
+    args: {
+      fn: getMetaList()
+    },
+    want: []
+  },
+  {
+    title: 'Should return list of metas with name associated',
+    args: {
+      fn: getMetaList('test'),
+    },
+    want: [
+      {
+        key: 'name',
+        value: 'test',
+      },
+      {
+        key: 'name*',
+        value: 'test',
+      },
+      {
+        key: 'itemprop*',
+        value: 'test',
+      },
+      {
+        key: 'property',
+        value: `'og:${'test'}'`,
+      },
+      {
+        key: 'property',
+        value: `'twitter:${'test'}'`,
+      },
+      {
+        key: 'property',
+        value: `'article:${'test'}'`,
+      },
+    ]
+  }
+]
+
+describe('BLIINK Adapter getMetaList', function() {
+  for (const test of testsGetMetaList) {
+    it(test.title, () => {
+      const res = test.args.fn
+      expect(res).to.eql(test.want)
+    })
+  }
+})
+
+/**
+ * @description Array of tests used in describe function below
+ * @type {[{args: {fn: (string|Document)}, want: string, title: string}, {args: {fn: (string|Document)}, want: string, title: string}]}
+ */
+
+/**
+ *
+ *
+ *
+ * @description End tests for utils fonctions
+ *
+ *
+ *
+ */
+
+/**
+ * @description Array of tests used in describe function below
+ * @type {[{args: {fn}, want: boolean, title: string}, {args: {fn}, want: boolean, title: string}, {args: {fn}, want: boolean, title: string}]}
+ */
+const testsIsBidRequestValid = [
+  {
+    title: 'isBidRequestValid format not valid',
+    args: {
+      fn: spec.isBidRequestValid({})
+    },
+    want: false,
+  },
+  {
+    title: 'isBidRequestValid does not receive any bid',
+    args: {
+      fn: spec.isBidRequestValid()
+    },
+    want: false,
+  },
+  {
+    title: 'isBidRequestValid Receive a valid bid',
+    args: {
+      fn: spec.isBidRequestValid(getConfigBid('banner'))
+    },
+    want: true,
+  }
+]
+
+describe('BLIINK Adapter isBidRequestValid', function() {
+  for (const test of testsIsBidRequestValid) {
+    it(test.title, () => {
+      const res = test.args.fn
+      expect(res).to.eql(test.want)
+    })
+  }
+})
+
+const vastXml = getConfigInterpretResponseRTB().body.bids[0].creative.video.content
+
+const testsInterpretResponse = [
+  {
+    title: 'Should construct bid for video instream',
+    args: {
+      fn: spec.interpretResponse(getConfigInterpretResponseRTB(false))
+    },
+    want: [{
+      cpm: 0,
+      currency: 'EUR',
+      height: 250,
+      width: 300,
+      creativeId: '34567ertyaza',
+      mediaType: 'video',
+      netRevenue: true,
+      requestId: '2def0c5b2a7f6e',
+      ttl: 3600,
+      vastXml,
+      vastUrl: 'data:text/xml;charset=utf-8;base64,' + btoa(vastXml.replace(/\\"/g, '"'))
+    }]
+  },
+  {
+    title: 'ServerResponse with message: invalid tag, return empty array',
+    args: {
+      fn: spec.interpretResponse(getConfigInterpretResponse(true))
+    },
+    want: []
+  },
+  {
+    title: 'ServerResponse with mediaType banner',
+    args: {
+      fn: spec.interpretResponse({body: {bids: [getConfigBannerBid()]}}),
+    },
+    want: [{
+      ad: '',
+      cpm: 1,
+      creativeId: '34567erty',
+      currency: 'EUR',
+      height: 250,
+      mediaType: 'banner',
+      netRevenue: true,
+      requestId: '2def0c5b2a7f6e',
+      ttl: 3600,
+      width: 300
+    }]
+  },
+  {
+    title: 'ServerResponse with unhandled mediaType, return empty array',
+    args: {
+      fn: spec.interpretResponse({body: {bids: [{...getConfigBannerBid(),
+        creative: {
+          unknown: {
+            adm: '',
+            height: 250,
+            width: 300,
+          },
+          media_type: 'unknown',
+          creativeId: 125,
+          requestId: '2def0c5b2a7f6e',
+        }}]}}),
+    },
+    want: []
+  },
+]
+
+describe('BLIINK Adapter interpretResponse', function() {
+  for (const test of testsInterpretResponse) {
+    it(test.title, () => {
+      const res = test.args.fn
+
+      if (res) {
+        expect(res).to.eql(test.want)
+      }
+    })
+  }
+})
+
+/**
+ * @description Array of tests used in describe function below
+ * @type {[
+ * {args:
+ *  {fn: {
+     *    cpm: number,
+     *    netRevenue: boolean,
+     *    ad, requestId,
+     *    meta: {mediaType},
+     *    width: number,
+     *    currency: string,
+     *    ttl: number,
+     *    creativeId: number,
+     *    height: number
+ *      }
+ *    }, want, title: string}]}
+ */
+
+const testsBuildBid = [
+  {
+    title: 'Should return null if no bid passed in parameters',
+    args: {
+      fn: buildBid()
+    },
+    want: null
+  },
+  {
+    title: 'Input data must respect the output model',
+    args: {
+      fn: buildBid({ id: 1, test: '123' }, { id: 2, test: '345' }, false, false)
+    },
+    want: null
+  },
+  {
+    title: 'input data respect the output model for video',
+    args: {
+      fn: buildBid(getConfigVideoBid('video'), getConfigCreativeVideo())
+    },
+    want: {
+      requestId: getConfigBid('video').bidId,
+      cpm: 1,
+      currency: 'EUR',
+      mediaType: 'video',
+      width: 300,
+      height: 250,
+      creativeId: getConfigVideoBid().extras.deal_id,
+      netRevenue: true,
+      vastXml: getConfigCreativeVideo().vastXml,
+      vastUrl: 'data:text/xml;charset=utf-8;base64,' + btoa(getConfigCreativeVideo().vastXml.replace(/\\"/g, '"')),
+      ttl: 3600,
+    }
+  },
+  {
+    title: 'use default height width output model for video',
+    args: {
+      fn: buildBid({...getConfigVideoBid('video'),
+        creative: {
+          video: {
+            content:
+            '<VAST></VAST>',
+            height: null,
+            width: null,
+          },
+          media_type: 'video',
+          creativeId: getConfigVideoBid().extras.deal_id,
+          requestId: '2def0c5b2a7f6e',
+        }}, getConfigCreativeVideo())
+    },
+    want: {
+      requestId: getConfigBid('video').bidId,
+      cpm: 1,
+      currency: 'EUR',
+      mediaType: 'video',
+      width: 1,
+      height: 1,
+      creativeId: getConfigVideoBid().extras.deal_id,
+      netRevenue: true,
+      vastXml: getConfigCreativeVideo().vastXml,
+      vastUrl: 'data:text/xml;charset=utf-8;base64,' + btoa(getConfigCreativeVideo().vastXml.replace(/\\"/g, '"')),
+      ttl: 3600,
+    }
+  },
+  {
+    title: 'input data respect the output model for banner',
+    args: {
+      fn: buildBid(getConfigBannerBid())
+    },
+    want: {
+      requestId: getConfigBid('banner').bidId,
+      cpm: 1,
+      currency: 'EUR',
+      mediaType: 'banner',
+      width: 300,
+      height: 250,
+      creativeId: getConfigCreative().creativeId,
+      ad: getConfigBannerBid().creative.banner.adm,
+      ttl: 3600,
+      netRevenue: true,
+    }
+  }
+]
+
+describe('BLIINK Adapter buildBid', function() {
+  for (const test of testsBuildBid) {
+    it(test.title, () => {
+      const res = test.args.fn
+      expect(res).to.eql(test.want)
+    })
+  }
+})
+
+/**
+ * @description Array of tests used in describe function below
+ * @type {[{args: {fn}, want, title: string}]}
+ */
+const testsBuildRequests = [
+  {
+    title: 'Should not build request, no bidder request exist',
+    args: {
+      fn: spec.buildRequests()
+    },
+    want: null
+  },
+  {
+    title: 'Should build request if bidderRequest exist',
+    args: {
+      fn: spec.buildRequests([], getConfigBuildRequest('banner'))
+    },
+    want: {
+      method: 'POST',
+      url: BLIINK_ENDPOINT_ENGINE,
+      data: {
+        keywords: '',
+        pageDescription: '',
+        pageTitle: '',
+        pageUrl: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+        tags: [
+          {
+            transactionId: '2def0c5b2a7f6e',
+            id: '14f30eca-85d2-11e8-9eed-0242ac120007',
+            imageUrl: '',
+            mediaTypes: ['banner'],
+            sizes: [
+              {
+                h: 250,
+                w: 300,
+              },
+            ],
+          },
+        ]
+      }
+    }
+  },
+  {
+    title: 'Should build request width GDPR configuration',
+    args: {
+      fn: spec.buildRequests([], Object.assign(getConfigBuildRequest('banner'), {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'XXXX'
+        },
+      }))
+    },
+    want: {
+      method: 'POST',
+      url: BLIINK_ENDPOINT_ENGINE,
+      data: {
+        gdpr: true,
+        gdprConsent: 'XXXX',
+        pageDescription: '',
+        pageTitle: '',
+        keywords: '',
+        pageUrl: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+        tags: [
+          {
+            transactionId: '2def0c5b2a7f6e',
+            id: '14f30eca-85d2-11e8-9eed-0242ac120007',
+            imageUrl: '',
+            mediaTypes: ['banner'],
+            sizes: [
+              {
+                h: 250,
+                w: 300,
+              },
+            ],
+          },
+        ]
+      }
+    }
+  },
+  {
+    title: 'Should build request width schain if exists',
+    args: {
+      fn: spec.buildRequests([{schain: {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'ssp.test',
+          sid: '00001',
+          hp: 1
+        }]
+      }}], Object.assign(getConfigBuildRequest('banner'), {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'XXXX'
+        },
+      }))
+    },
+    want: {
+      method: 'POST',
+      url: BLIINK_ENDPOINT_ENGINE,
+      data: {
+        gdpr: true,
+        gdprConsent: 'XXXX',
+        pageDescription: '',
+        pageTitle: '',
+        keywords: '',
+        pageUrl: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+        schain: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [{
+            asi: 'ssp.test',
+            sid: '00001',
+            hp: 1
+          }]
+        },
+        tags: [
+          {
+            transactionId: '2def0c5b2a7f6e',
+            id: '14f30eca-85d2-11e8-9eed-0242ac120007',
+            imageUrl: '',
+            mediaTypes: ['banner'],
+            sizes: [
+              {
+                h: 250,
+                w: 300,
+              },
+            ],
+          },
+        ]
+      }
+    }
+  }
+]
+
+describe('BLIINK Adapter buildRequests', function() {
+  for (const test of testsBuildRequests) {
+    it(test.title, () => {
+      const res = test.args.fn
+      expect(res).to.eql(test.want)
+    })
+  }
+})
+
+const getSyncOptions = (pixelEnabled = true, iframeEnabled = false) => {
+  return {
+    pixelEnabled,
+    iframeEnabled
+  }
+}
+
+const getServerResponses = () => {
+  return [
+    {
+      body: {bids: [],
+        userSyncs: [ {
+          type: 'script',
+          url: 'https://prg.smartadserver.com/ac?out=js&nwid=3392&siteid=305791&pgname=rg&fmtid=81127&tgt=[sas_target]&visit=m&tmstp=[timestamp]&clcturl=[countgo]'
+        },
+        {
+          type: 'image',
+          url: 'https://sync.smartadserver.com/getuid?nwid=3392&consentString=XXX&url=https%3A%2F%2Fcookiesync.api.bliink.io%2Fcookiesync%3Fpartner%3Dsmart%26uid%3D%5Bsas_uid%5D'
+        }]},
+    }
+  ]
+}
+
+const getGdprConsent = () => {
+  return {
+    gdprApplies: 1,
+    consentString: 'XXX',
+    apiVersion: 2
+  }
+}
+
+const testsGetUserSyncs = [
+  {
+    title: 'Should not have gdprConsent exist',
+    args: {
+      fn: spec.getUserSyncs(getSyncOptions(), getServerResponses(), getGdprConsent())
+    },
+    want: [
+      {
+        type: 'script',
+        url: 'https://prg.smartadserver.com/ac?out=js&nwid=3392&siteid=305791&pgname=rg&fmtid=81127&tgt=[sas_target]&visit=m&tmstp=[timestamp]&clcturl=[countgo]'
+      },
+      {
+        type: 'image',
+        url: 'https://sync.smartadserver.com/getuid?nwid=3392&consentString=XXX&url=https%3A%2F%2Fcookiesync.api.bliink.io%2Fcookiesync%3Fpartner%3Dsmart%26uid%3D%5Bsas_uid%5D'
+      }
+    ]
+  },
+  {
+    title: 'Should return iframe cookie sync if iframeEnabled',
+    args: {
+      fn: spec.getUserSyncs(getSyncOptions(true, true), getServerResponses(), getGdprConsent())
+    },
+    want: [
+      {
+        type: 'iframe',
+        url: `${BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME}?gdpr=${getGdprConsent().gdprApplies}&coppa=0&gdprConsent=${getGdprConsent().consentString}&apiVersion=${getGdprConsent().apiVersion}`
+      },
+    ]
+  },
+  {
+    title: 'ccpa',
+    args: {
+      fn: spec.getUserSyncs(getSyncOptions(true, true), getServerResponses(), getGdprConsent(), 'ccpa-consent')
+    },
+    want: [
+      {
+        type: 'iframe',
+        url: `${BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME}?gdpr=${getGdprConsent().gdprApplies}&coppa=0&uspConsent=ccpa-consent&gdprConsent=${getGdprConsent().consentString}&apiVersion=${getGdprConsent().apiVersion}`
+      },
+    ]
+  },
+  {
+    title: 'Should output sync if no gdprConsent',
+    args: {
+      fn: spec.getUserSyncs(getSyncOptions(), getServerResponses())
+    },
+    want: getServerResponses()[0].body.userSyncs
+  }
+]
+
+describe('BLIINK Adapter getUserSyncs', function() {
+  for (const test of testsGetUserSyncs) {
+    it(test.title, () => {
+      const res = test.args.fn
+      expect(res).to.eql(test.want)
+    })
+  }
+})
diff --git a/test/spec/modules/bluebillywigBidAdapter_spec.js b/test/spec/modules/bluebillywigBidAdapter_spec.js
index 73bd4803358..0a9c6b30c94 100644
--- a/test/spec/modules/bluebillywigBidAdapter_spec.js
+++ b/test/spec/modules/bluebillywigBidAdapter_spec.js
@@ -40,6 +40,13 @@ describe('BlueBillywigAdapter', () => {
       expect(spec.isBidRequestValid(baseValidBid)).to.equal(true);
     });
 
+    it('should return false when params missing', () => {
+      const bid = deepClone(baseValidBid);
+      delete bid.params;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
     it('should return false when publicationName is missing', () => {
       const bid = deepClone(baseValidBid);
       delete bid.params.publicationName;
@@ -184,6 +191,44 @@ describe('BlueBillywigAdapter', () => {
       bid.mediaTypes[VIDEO].context = 'instream';
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('should fail if video is specified but is not an object', () => {
+      const bid = deepClone(baseValidBid);
+
+      bid.params.video = null;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.video = 'string';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.video = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.video = false;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.video = void (0);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should fail if rendererSettings is specified but is not an object', () => {
+      const bid = deepClone(baseValidBid);
+
+      bid.params.rendererSettings = null;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.rendererSettings = 'string';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.rendererSettings = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.rendererSettings = false;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.rendererSettings = void (0);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
   });
 
   describe('buildRequests', () => {
@@ -394,7 +439,7 @@ describe('BlueBillywigAdapter', () => {
     it('should add referrerInfo as site when no app is set', () => {
       const newValidBidderRequest = deepClone(validBidderRequest);
 
-      newValidBidderRequest.refererInfo = { referer: 'https://www.bluebillywig.com' };
+      newValidBidderRequest.refererInfo = { page: 'https://www.bluebillywig.com' };
 
       const request = spec.buildRequests(baseValidBidRequests, newValidBidderRequest);
       const payload = JSON.parse(request.data);
@@ -510,30 +555,64 @@ describe('BlueBillywigAdapter', () => {
       expect(deepAccess(payload, 'user.ext.eids')).to.be.undefined;
     });
 
-    it('should set digitrust when present on bid', () => {
-      const digiTrust = {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}};
+    it('should set imp.0.video.[w|h|placement] by default', () => {
+      const newBaseValidBidRequests = deepClone(baseValidBidRequests);
+
+      const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(deepAccess(payload, 'imp.0.video.w')).to.equal(768);
+      expect(deepAccess(payload, 'imp.0.video.h')).to.equal(432);
+      expect(deepAccess(payload, 'imp.0.video.placement')).to.equal(3);
+    });
 
+    it('should update imp0.video.[w|h] when present in config', () => {
       const newBaseValidBidRequests = deepClone(baseValidBidRequests);
-	    newBaseValidBidRequests[0].userId = { digitrustid: digiTrust };
+      newBaseValidBidRequests[0].mediaTypes.video.playerSize = [1, 1];
 
       const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
 
-      expect(payload).to.have.nested.property('user.ext.digitrust');
-      expect(payload.user.ext.digitrust.id).to.equal(digiTrust.data.id);
-      expect(payload.user.ext.digitrust.keyv).to.equal(digiTrust.data.keyv);
+      expect(deepAccess(payload, 'imp.0.video.w')).to.equal(1);
+      expect(deepAccess(payload, 'imp.0.video.h')).to.equal(1);
     });
 
-    it('should not set digitrust when opted out', () => {
-      const digiTrust = {data: {id: 'DTID', keyv: 4, privacy: {optout: true}, producer: 'ABC', version: 2}};
+    it('should allow overriding any imp0.video key through params.video', () => {
+      const newBaseValidBidRequests = deepClone(baseValidBidRequests);
+      newBaseValidBidRequests[0].params.video = {
+        w: 2,
+        h: 2,
+        placement: 1,
+        minduration: 15,
+        maxduration: 30
+      };
+
+      const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(deepAccess(payload, 'imp.0.video.w')).to.equal(2);
+      expect(deepAccess(payload, 'imp.0.video.h')).to.equal(2);
+      expect(deepAccess(payload, 'imp.0.video.placement')).to.equal(1);
+      expect(deepAccess(payload, 'imp.0.video.minduration')).to.equal(15);
+      expect(deepAccess(payload, 'imp.0.video.maxduration')).to.equal(30);
+    });
 
+    it('should not allow placing any non-OpenRTB 2.5 keys on imp.0.video through params.video', () => {
       const newBaseValidBidRequests = deepClone(baseValidBidRequests);
-	    newBaseValidBidRequests[0].userId = { digitrustid: digiTrust };
+      newBaseValidBidRequests[0].params.video = {
+        'true': true,
+        'testing': 'some',
+        123: {},
+        '': 'values'
+      };
 
       const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
 
-      expect(deepAccess(payload, 'user.ext.digitrust')).to.be.undefined;
+      expect(deepAccess(request, 'imp.0.video.true')).to.be.undefined;
+      expect(deepAccess(payload, 'imp.0.video.testing')).to.be.undefined;
+      expect(deepAccess(payload, 'imp.0.video.123')).to.be.undefined;
+      expect(deepAccess(payload, 'imp.0.video.')).to.be.undefined;
     });
   });
   describe('interpretResponse', () => {
@@ -571,7 +650,7 @@ describe('BlueBillywigAdapter', () => {
         bidder: BB_CONSTANTS.BIDDER_CODE,
         bidderRequestId: '1a2345b67c8d9e0',
         params: baseValidBid.params,
-        sizes: [[768, 432], [640, 480], [630, 360]],
+        sizes: [[640, 480], [630, 360]],
         transactionId: '2b34c5de-f67a-8901-bcd2-34567efabc89'
       }],
       start: 11585918458869,
@@ -681,6 +760,10 @@ describe('BlueBillywigAdapter', () => {
       expect(bid.currency).to.equal(serverResponse.body.cur);
       expect(bid.ttl).to.equal(BB_CONSTANTS.DEFAULT_TTL);
 
+      expect(bid).to.have.property('meta');
+      expect(bid.meta).to.have.property('advertiserDomains');
+      expect(bid.meta.advertiserDomains[0]).to.equal('bluebillywig.com');
+
       expect(bid.publicationName).to.equal(validBidderRequest.bids[0].params.publicationName);
       expect(bid.rendererCode).to.equal(validBidderRequest.bids[0].params.rendererCode);
       expect(bid.accountId).to.equal(validBidderRequest.bids[0].params.accountId);
@@ -759,6 +842,101 @@ describe('BlueBillywigAdapter', () => {
         expect(result.length).to.equal(0);
       }
     });
+
+    it('should take default width and height when w/h not present', () => {
+      const bidSizesMissing = deepClone(serverResponse);
+
+      delete bidSizesMissing.body.seatbid[0].bid[0].w;
+      delete bidSizesMissing.body.seatbid[0].bid[0].h;
+
+      const response = bidSizesMissing;
+      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(response, request);
+
+      expect(deepAccess(result, '0.width')).to.equal(768);
+      expect(deepAccess(result, '0.height')).to.equal(432);
+    });
+
+    it('should take nurl value when adm not present', () => {
+      const bidAdmMissing = deepClone(serverResponse);
+
+      delete bidAdmMissing.body.seatbid[0].bid[0].adm;
+      bidAdmMissing.body.seatbid[0].bid[0].nurl = 'https://bluebillywig.com';
+
+      const response = bidAdmMissing;
+      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(response, request);
+
+      expect(deepAccess(result, '0.vastXml')).to.be.undefined;
+      expect(deepAccess(result, '0.vastUrl')).to.equal('https://bluebillywig.com');
+    });
+
+    it('should not take nurl value when adm present', () => {
+      const bidAdmNurlPresent = deepClone(serverResponse);
+
+      bidAdmNurlPresent.body.seatbid[0].bid[0].nurl = 'https://bluebillywig.com';
+
+      const response = bidAdmNurlPresent;
+      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(response, request);
+
+      expect(deepAccess(result, '0.vastXml')).to.equal(bidAdmNurlPresent.body.seatbid[0].bid[0].adm);
+      expect(deepAccess(result, '0.vastUrl')).to.be.undefined;
+    });
+
+    it('should take ext.prebid.cache data when present, ignore ext.prebid.targeting and nurl', () => {
+      const bidExtPrebidCache = deepClone(serverResponse);
+
+      delete bidExtPrebidCache.body.seatbid[0].bid[0].adm;
+      bidExtPrebidCache.body.seatbid[0].bid[0].nurl = 'https://notnurl.com';
+
+      bidExtPrebidCache.body.seatbid[0].bid[0].ext = {
+        prebid: {
+          cache: {
+            vastXml: {
+              url: 'https://bluebillywig.com',
+              cacheId: '12345'
+            }
+          },
+          targeting: {
+            hb_uuid: '23456',
+            hb_cache_host: 'bluebillywig.com',
+            hb_cache_path: '/cache'
+          }
+        }
+      };
+
+      const response = bidExtPrebidCache;
+      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(response, request);
+
+      expect(deepAccess(result, '0.vastUrl')).to.equal('https://bluebillywig.com');
+      expect(deepAccess(result, '0.videoCacheKey')).to.equal('12345');
+    });
+
+    it('should take ext.prebid.targeting data when ext.prebid.cache not present, and ignore nurl', () => {
+      const bidExtPrebidTargeting = deepClone(serverResponse);
+
+      delete bidExtPrebidTargeting.body.seatbid[0].bid[0].adm;
+      bidExtPrebidTargeting.body.seatbid[0].bid[0].nurl = 'https://notnurl.com';
+
+      bidExtPrebidTargeting.body.seatbid[0].bid[0].ext = {
+        prebid: {
+          targeting: {
+            hb_uuid: '34567',
+            hb_cache_host: 'bluebillywig.com',
+            hb_cache_path: '/cache'
+          }
+        }
+      };
+
+      const response = bidExtPrebidTargeting;
+      const request = spec.buildRequests(baseValidBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(response, request);
+
+      expect(deepAccess(result, '0.vastUrl')).to.equal('https://bluebillywig.com/cache?uuid=34567');
+      expect(deepAccess(result, '0.videoCacheKey')).to.equal('34567');
+    });
   });
   describe('getUserSyncs', () => {
     const publicationName = 'bbprebid.dev';
diff --git a/test/spec/modules/blueconicRtdProvider_spec.js b/test/spec/modules/blueconicRtdProvider_spec.js
new file mode 100644
index 00000000000..174c1e58997
--- /dev/null
+++ b/test/spec/modules/blueconicRtdProvider_spec.js
@@ -0,0 +1,135 @@
+import {config} from 'src/config.js';
+import {RTD_LOCAL_NAME, addRealTimeData, getRealTimeData, blueconicSubmodule, storage} from 'modules/blueconicRtdProvider.js';
+
+describe('blueconicRtdProvider', function() {
+  let getDataFromLocalStorageStub;
+  beforeEach(function() {
+    config.resetConfig();
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+  });
+
+  afterEach(function () {
+    getDataFromLocalStorageStub.restore();
+  });
+
+  describe('blueconicSubmodule', function() {
+    it('successfully instantiates', function () {
+		  expect(blueconicSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Add Blueconic Real-Time Data', function() {
+    it('merges ortb2Fragment data', function() {
+      const setConfigUserObj1 = {
+        name: 'www.dataprovider1.com',
+        ext: {segtax: 1},
+        segment: [{id: '1776'}]
+      };
+      const setConfigUserObj2 = {
+        name: 'www.dataprovider2.com',
+        ext: {segtax: 1},
+        segment: [{id: '1914'}
+        ]
+      };
+
+      let bidConfig = {
+        ortb2Fragments: {
+          global: {
+            user: {
+              data: [setConfigUserObj1, setConfigUserObj2]
+            }
+          }
+        }
+      };
+
+      const rtdUserObj1 = {
+        name: 'www.dataprovider4.com',
+        ext: {segtax: 1},
+        segment: [{id: '1918'}, {id: '1939'}
+        ]
+      };
+
+      const rtd = {
+        ortb2: {
+          user: {
+            data: [rtdUserObj1]
+          }
+        }
+      };
+
+      addRealTimeData(bidConfig.ortb2Fragments.global, rtd);
+
+      let ortb2Config = bidConfig.ortb2Fragments.global;
+      expect(ortb2Config.user.data).to.deep.include.members([setConfigUserObj1, setConfigUserObj2, rtdUserObj1]);
+    });
+
+    it('merges data without duplication', function() {
+      const userObj1 = {
+        name: 'www.dataprovider1.com',
+        ext: {segtax: 1},
+        segment: [{id: '1776'}
+        ]
+      };
+
+      const userObj2 = {
+        ext: {segtax: 1},
+        name: 'www.dataprovider2.com',
+        segment: [{id: '1914'
+        }]
+      };
+
+      const bidConfig = {
+        ortb2Fragments:
+        {
+          global: {
+            user: {
+              data: [userObj1, userObj2]
+            }
+          }
+        }
+      };
+
+      const rtd = {
+        ortb2: {
+          user: {
+            data: [userObj1]
+          }
+        }
+      };
+
+      addRealTimeData(bidConfig.ortb2Fragments.global, rtd);
+
+      let ortb2Config = bidConfig.ortb2Fragments.global;
+
+      expect(ortb2Config.user.data).to.deep.include.members([userObj1, userObj2]);
+      expect(bidConfig.ortb2Fragments.global.user.data).to.have.lengthOf(2);
+    });
+  });
+
+  describe('Get BlueConic Real-Time Data', function() {
+    it('gets rtd from local storage cache', function() {
+      const rtdConfig = {
+        params: {
+          requestParams: {
+            publisherId: 'Publisher1',
+            coppa: true
+          }}
+      };
+
+      const bidConfig = {ortb2Fragments: {global: {}}};
+
+      const rtdUserObj1 = {
+        name: 'blueconic',
+        ext: {segtax: 1},
+        segment: [{id: 'bf23d802-931d-4619-8266-ce9a6328aa2a'}],
+        bidId: '1234'
+      };
+
+      const cachedRtd = {ext: {segtax: 1}, 'segment': [{id: 'bf23d802-931d-4619-8266-ce9a6328aa2a'}], 'bidId': '1234'}
+      getDataFromLocalStorageStub.withArgs(RTD_LOCAL_NAME).returns(JSON.stringify(cachedRtd));
+
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+    });
+  });
+});
diff --git a/test/spec/modules/boldwinBidAdapter_spec.js b/test/spec/modules/boldwinBidAdapter_spec.js
new file mode 100644
index 00000000000..5b51183ea6d
--- /dev/null
+++ b/test/spec/modules/boldwinBidAdapter_spec.js
@@ -0,0 +1,289 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/boldwinBidAdapter.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+
+describe('BoldwinBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'boldwin',
+    mediaTypes: {
+      banner: {
+        sizes: [ [300, 250], [320, 50] ],
+      }
+    },
+    params: {
+      placementId: 'testBanner',
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and placementId 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://ssp.videowalldirect.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', 'adFormat', 'sizes', 'hPlayer', 'wPlayer', 'schain', 'bidFloor', 'type');
+      expect(placement.placementId).to.equal('testBanner');
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.adFormat).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.type).to.exist.and.to.equal('publisher');
+    });
+
+    it('Returns valid data for mediatype video', function () {
+      const playerSize = [300, 300];
+      bid.mediaTypes = {};
+      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.adFormat).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+
+    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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    let userSync = spec.getUserSyncs();
+    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('image');
+      expect(userSync[0].url).to.be.equal('https://cs.videowalldirect.com');
+    });
+  });
+});
diff --git a/test/spec/modules/brandmetricsRtdProvider_spec.js b/test/spec/modules/brandmetricsRtdProvider_spec.js
new file mode 100644
index 00000000000..879ec7e1c7a
--- /dev/null
+++ b/test/spec/modules/brandmetricsRtdProvider_spec.js
@@ -0,0 +1,191 @@
+import * as brandmetricsRTD from '../../../modules/brandmetricsRtdProvider.js';
+import {config} from 'src/config.js';
+
+const VALID_CONFIG = {
+  name: 'brandmetrics',
+  waitForIt: true,
+  params: {
+    scriptId: '00000000-0000-0000-0000-000000000000',
+    bidders: ['ozone']
+  }
+};
+
+const NO_BIDDERS_CONFIG = {
+  name: 'brandmetrics',
+  waitForIt: true,
+  params: {
+    scriptId: '00000000-0000-0000-0000-000000000000'
+  }
+};
+
+const NO_SCRIPTID_CONFIG = {
+  name: 'brandmetrics',
+  waitForIt: true
+};
+
+const USER_CONSENT = {
+  gdpr: {
+    vendorData: {
+      vendor: {
+        consents: {
+          422: true
+        }
+      },
+      purpose: {
+        consents: {
+          1: true,
+          7: true
+        }
+      }
+    },
+    gdprApplies: true
+  }
+};
+
+const NO_TCF_CONSENT = {
+  gdpr: {
+    vendorData: {
+      vendor: {
+        consents: {
+          422: false
+        }
+      },
+      purpose: {
+        consents: {
+          1: false,
+          7: false
+        }
+      }
+    },
+    gdprApplies: true
+  }
+};
+
+const NO_USP_CONSENT = {
+  usp: '1NYY'
+};
+
+function mockSurveyLoaded(surveyConf) {
+  const commands = window._brandmetrics || [];
+  commands.forEach(command => {
+    if (command.cmd === '_addeventlistener') {
+      const conf = command.val;
+      if (conf.event === 'surveyloaded') {
+        conf.handler(surveyConf);
+      }
+    }
+  });
+}
+
+function scriptTagExists(url) {
+  const tags = document.getElementsByTagName('script');
+  for (let i = 0; i < tags.length; i++) {
+    if (tags[i].src === url) {
+      return true;
+    }
+  }
+  return false;
+}
+
+describe('BrandmetricsRTD module', () => {
+  beforeEach(function () {
+    const scriptTags = document.getElementsByTagName('script');
+    for (let i = 0; i < scriptTags.length; i++) {
+      if (scriptTags[i].src.indexOf('brandmetrics') !== -1) {
+        scriptTags[i].remove();
+      }
+    }
+  });
+
+  it('should init and return true', () => {
+    expect(brandmetricsRTD.brandmetricsSubmodule.init(VALID_CONFIG, USER_CONSENT)).to.equal(true);
+  });
+
+  it('should init and return true even if bidders is not included', () => {
+    expect(brandmetricsRTD.brandmetricsSubmodule.init(NO_BIDDERS_CONFIG, USER_CONSENT)).to.equal(true);
+  });
+
+  it('should init even if script- id is not configured', () => {
+    expect(brandmetricsRTD.brandmetricsSubmodule.init(NO_SCRIPTID_CONFIG, USER_CONSENT)).to.equal(true);
+  });
+
+  it('should not init when there is no TCF- consent', () => {
+    expect(brandmetricsRTD.brandmetricsSubmodule.init(VALID_CONFIG, NO_TCF_CONSENT)).to.equal(false);
+  });
+
+  it('should not init when there is no usp- consent', () => {
+    expect(brandmetricsRTD.brandmetricsSubmodule.init(VALID_CONFIG, NO_USP_CONSENT)).to.equal(false);
+  });
+});
+
+describe('getBidRequestData', () => {
+  beforeEach(function () {
+    config.resetConfig()
+  })
+
+  it('should set targeting keys for specified bidders', () => {
+    const bidderOrtb2 = {};
+    brandmetricsRTD.brandmetricsSubmodule.getBidRequestData({ortb2Fragments: {bidder: bidderOrtb2}}, () => {
+      const expected = VALID_CONFIG.params.bidders
+
+      expected.forEach(exp => {
+        expect(bidderOrtb2[exp].user.ext.data.mockTargetKey).to.equal('mockMeasurementId')
+      })
+    }, VALID_CONFIG);
+
+    mockSurveyLoaded({
+      available: true,
+      conf: {
+        displayOption: {
+          type: 'pbjs',
+          targetKey: 'mockTargetKey'
+        }
+      },
+      survey: {
+        measurementId: 'mockMeasurementId'
+      }
+    });
+  });
+
+  it('should only set targeting keys when the brandmetrics survey- type is "pbjs"', () => {
+    mockSurveyLoaded({
+      available: true,
+      conf: {
+        displayOption: {
+          type: 'dfp',
+          targetKey: 'mockTargetKey'
+        }
+      },
+      survey: {
+        measurementId: 'mockMeasurementId'
+      }
+    });
+
+    const bidderOrtb2 = {};
+    brandmetricsRTD.brandmetricsSubmodule.getBidRequestData({ortb2Fragments: {bidder: bidderOrtb2}}, () => {}, VALID_CONFIG);
+    expect(Object.keys(bidderOrtb2).length).to.equal(0)
+  });
+
+  it('should use a default targeting key name if the brandmetrics- configuration does not include one', () => {
+    mockSurveyLoaded({
+      available: true,
+      conf: {
+        displayOption: {
+          type: 'pbjs',
+        }
+      },
+      survey: {
+        measurementId: 'mockMeasurementId'
+      }
+    });
+
+    const bidderOrtb2 = {};
+    brandmetricsRTD.brandmetricsSubmodule.getBidRequestData({ortb2Fragments: {bidder: bidderOrtb2}}, () => {}, VALID_CONFIG);
+
+    const expected = VALID_CONFIG.params.bidders
+
+    expected.forEach(exp => {
+      expect(bidderOrtb2[exp].user.ext.data.brandmetrics_survey).to.equal('mockMeasurementId')
+    })
+  });
+});
diff --git a/test/spec/modules/braveBidAdapter_spec.js b/test/spec/modules/braveBidAdapter_spec.js
new file mode 100644
index 00000000000..392f3b9f263
--- /dev/null
+++ b/test/spec/modules/braveBidAdapter_spec.js
@@ -0,0 +1,363 @@
+import { expect } from 'chai';
+import { spec } from 'modules/braveBidAdapter.js';
+
+const request_native = {
+  code: 'brave-native-prebid',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+        required: true
+      },
+      clickUrl: {
+        required: true
+      },
+      privacyLink: {
+        required: false
+      },
+      body: {
+        required: true
+      },
+      icon: {
+        required: true,
+        sizes: [50, 50]
+      }
+    }
+  },
+  bidder: 'brave',
+  params: {
+    placementId: 'to0QI2aPgkbBZq6vgf0oHitouZduz0qw'
+  }
+};
+
+const request_banner = {
+  code: 'brave-prebid',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]]
+    }
+  },
+  bidder: 'brave',
+  params: {
+    placementId: 'to0QI2aPgkbBZq6vgf0oHitouZduz0qw'
+  }
+}
+
+const bidRequest = {
+  gdprConsent: {
+    consentString: 'HFIDUYFIUYIUYWIPOI87392DSU',
+    gdprApplies: true
+  },
+  uspConsent: 'uspConsentString',
+  bidderRequestId: 'testid',
+  refererInfo: {
+    referer: 'testdomain.com'
+  },
+  timeout: 700
+}
+
+const request_video = {
+  code: 'brave-video-prebid',
+  mediaTypes: { video: {
+    minduration: 1,
+    maxduration: 999,
+    boxingallowed: 1,
+    skip: 0,
+    mimes: [
+      'application/javascript',
+      'video/mp4'
+    ],
+    playerSize: [[768, 1024]],
+    protocols: [
+      2, 3
+    ],
+    linearity: 1,
+    api: [
+      1,
+      2
+    ]
+  }
+  },
+
+  bidder: 'brave',
+  params: {
+    placementId: 'to0QI2aPgkbBZq6vgf0oHitouZduz0qw'
+  }
+
+}
+
+const response_banner = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'banner'
+      }
+    }]
+  }]
+};
+
+const response_video = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'video'
+      }
+    }],
+  }],
+};
+
+let imgData = {
+  url: `https://example.com/image`,
+  w: 1200,
+  h: 627
+};
+
+const response_native = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: { native:
+          {
+            assets: [
+              {id: 1, title: 'dummyText'},
+              {id: 3, image: imgData},
+              {
+                id: 5,
+                data: {value: 'organization.name'}
+              }
+            ],
+            link: {url: 'example.com'},
+            imptrackers: ['tracker1.com', 'tracker2.com', 'tracker3.com'],
+            jstracker: 'tracker1.com'
+          }
+      },
+      crid: 'crid',
+      ext: {
+        mediaType: 'native'
+      }
+    }],
+  }],
+};
+
+describe('BraveBidAdapter', function() {
+  describe('isBidRequestValid', function() {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(request_banner)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, request_banner);
+      bid.params = {
+        'IncorrectParam': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('build Native Request', function () {
+    const request = spec.buildRequests([request_native], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://point.bravegroup.tv/?t=2&partner=to0QI2aPgkbBZq6vgf0oHitouZduz0qw');
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      let serverRequest = spec.buildRequests([]);
+      expect(serverRequest).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('build Banner Request', function () {
+    const request = spec.buildRequests([request_banner], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://point.bravegroup.tv/?t=2&partner=to0QI2aPgkbBZq6vgf0oHitouZduz0qw');
+    });
+  });
+
+  describe('build Video Request', function () {
+    const request = spec.buildRequests([request_video], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://point.bravegroup.tv/?t=2&partner=to0QI2aPgkbBZq6vgf0oHitouZduz0qw');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Empty response must return empty array', function() {
+      const emptyResponse = null;
+      let response = spec.interpretResponse(emptyResponse);
+
+      expect(response).to.be.an('array').that.is.empty;
+    })
+
+    it('Should interpret banner response', function () {
+      const bannerResponse = {
+        body: response_banner
+      }
+
+      const expectedBidResponse = {
+        requestId: response_banner.seatbid[0].bid[0].impid,
+        cpm: response_banner.seatbid[0].bid[0].price,
+        width: response_banner.seatbid[0].bid[0].w,
+        height: response_banner.seatbid[0].bid[0].h,
+        ttl: response_banner.ttl || 1200,
+        currency: response_banner.cur || 'USD',
+        netRevenue: true,
+        creativeId: response_banner.seatbid[0].bid[0].crid,
+        dealId: response_banner.seatbid[0].bid[0].dealid,
+        mediaType: 'banner',
+        ad: response_banner.seatbid[0].bid[0].adm
+      }
+
+      let bannerResponses = spec.interpretResponse(bannerResponse);
+
+      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');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.ad).to.equal(expectedBidResponse.ad);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret video response', function () {
+      const videoResponse = {
+        body: response_video
+      }
+
+      const expectedBidResponse = {
+        requestId: response_video.seatbid[0].bid[0].impid,
+        cpm: response_video.seatbid[0].bid[0].price,
+        width: response_video.seatbid[0].bid[0].w,
+        height: response_video.seatbid[0].bid[0].h,
+        ttl: response_video.ttl || 1200,
+        currency: response_video.cur || 'USD',
+        netRevenue: true,
+        creativeId: response_video.seatbid[0].bid[0].crid,
+        dealId: response_video.seatbid[0].bid[0].dealid,
+        mediaType: 'video',
+        vastUrl: response_video.seatbid[0].bid[0].adm
+      }
+
+      let videoResponses = spec.interpretResponse(videoResponse);
+
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.vastUrl).to.equal(expectedBidResponse.vastUrl)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret native response', function () {
+      const nativeResponse = {
+        body: response_native
+      }
+
+      const expectedBidResponse = {
+        requestId: response_native.seatbid[0].bid[0].impid,
+        cpm: response_native.seatbid[0].bid[0].price,
+        width: response_native.seatbid[0].bid[0].w,
+        height: response_native.seatbid[0].bid[0].h,
+        ttl: response_native.ttl || 1200,
+        currency: response_native.cur || 'USD',
+        netRevenue: true,
+        creativeId: response_native.seatbid[0].bid[0].crid,
+        dealId: response_native.seatbid[0].bid[0].dealid,
+        mediaType: 'native',
+        native: {clickUrl: response_native.seatbid[0].bid[0].adm.native.link.url}
+      }
+
+      let nativeResponses = spec.interpretResponse(nativeResponse);
+
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.native.clickUrl).to.equal(expectedBidResponse.native.clickUrl)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+  });
+})
diff --git a/test/spec/modules/bridgewellBidAdapter_spec.js b/test/spec/modules/bridgewellBidAdapter_spec.js
index 644f468abe8..77818f34a62 100644
--- a/test/spec/modules/bridgewellBidAdapter_spec.js
+++ b/test/spec/modules/bridgewellBidAdapter_spec.js
@@ -2,6 +2,13 @@ import { expect } from 'chai';
 import { spec } from 'modules/bridgewellBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 
+const userId = {
+  'criteoId': 'vYlICF9oREZlTHBGRVdrJTJCUUJnc3U2ckNVaXhrV1JWVUZVSUxzZmJlcnJZR0ZxbVhFRnU5bDAlMkJaUWwxWTlNcmdEeHFrJTJGajBWVlV4T3lFQ0FyRVcxNyUyQlIxa0lLSlFhcWJpTm9PSkdPVkx0JTJCbzlQRTQlM0Q',
+  'pubcid': '074864cb-3705-430e-9ff7-48ccf3c21b94',
+  'sharedid': {'id': '01F61MX53D786DSB2WYD38ZVM7', 'third': '01F61MX53D786DSB2WYD38ZVM7'},
+  'uid2': {'id': 'eb33b0cb-8d35-1234-b9c0-1a31d4064777'},
+}
+
 describe('bridgewellBidAdapter', function () {
   const adapter = newBidder(spec);
 
@@ -22,6 +29,16 @@ describe('bridgewellBidAdapter', function () {
       expect(spec.isBidRequestValid(validTag)).to.equal(true);
     });
 
+    it('should return true when required params found', function () {
+      const validTag = {
+        'bidder': 'bridgewell',
+        'params': {
+          'cid': 1234
+        },
+      };
+      expect(spec.isBidRequestValid(validTag)).to.equal(true);
+    });
+
     it('should return false when required params not found', function () {
       const invalidTag = {
         'bidder': 'bridgewell',
@@ -39,6 +56,26 @@ describe('bridgewellBidAdapter', function () {
       };
       expect(spec.isBidRequestValid(invalidTag)).to.equal(false);
     });
+
+    it('should return false when required params are empty', function () {
+      const invalidTag = {
+        'bidder': 'bridgewell',
+        'params': {
+          'cid': '',
+        },
+      };
+      expect(spec.isBidRequestValid(invalidTag)).to.equal(false);
+    });
+
+    it('should return false when required param cid is not a number', function () {
+      const invalidTag = {
+        'bidder': 'bridgewell',
+        'params': {
+          'cid': 'bad_cid',
+        },
+      };
+      expect(spec.isBidRequestValid(invalidTag)).to.equal(false);
+    });
   });
 
   describe('buildRequests', function () {
@@ -57,6 +94,7 @@ describe('bridgewellBidAdapter', function () {
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '1d1a030790a475',
+        'userId': userId,
       },
       {
         'bidder': 'bridgewell',
@@ -96,13 +134,17 @@ describe('bridgewellBidAdapter', function () {
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '1d1a030790a475',
+        'userId': userId,
       }
     ];
 
     it('should attach valid params to the tag', function () {
       const bidderRequest = {
         refererInfo: {
-          referer: 'https://www.bridgewell.com/'
+          page: 'https://www.bridgewell.com/',
+          legacy: {
+            referer: 'https://www.bridgewell.com/',
+          }
         }
       }
       const request = spec.buildRequests(bidRequests, bidderRequest);
@@ -112,13 +154,72 @@ describe('bridgewellBidAdapter', function () {
       expect(payload.adUnits).to.be.an('array');
       expect(payload.url).to.exist.and.to.equal('https://www.bridgewell.com/');
       for (let i = 0, max_i = payload.adUnits.length; i < max_i; i++) {
-        expect(payload.adUnits[i]).to.have.property('ChannelID').that.is.a('string');
-        expect(payload.adUnits[i]).to.have.property('adUnitCode').and.to.equal('adunit-code-2');
+        let u = payload.adUnits[i];
+        expect(u).to.have.property('ChannelID').that.is.a('string');
+        expect(u).to.not.have.property('cid');
+        expect(u).to.have.property('adUnitCode').and.to.equal('adunit-code-2');
+        expect(u).to.have.property('requestId').and.to.equal('3150ccb55da321');
+        expect(u).to.have.property('userIds');
+        expect(u.userIds).to.deep.equal(userId);
+      }
+    });
+
+    it('should attach valid params to the tag, part2', function() {
+      const bidderRequest = {
+        refererInfo: {
+          page: 'https://www.bridgewell.com/',
+          legacy: {
+            referer: 'https://www.bridgewell.com/'
+          }
+        }
+      }
+      const bidRequests2 = [
+        {
+          'bidder': 'bridgewell',
+          'params': {
+            'cid': 1234,
+          },
+          'adUnitCode': 'adunit-code-2',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [728, 90]
+            }
+          },
+          'bidId': '3150ccb55da321',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+          'userId': userId
+        },
+      ];
+
+      const request = spec.buildRequests(bidRequests2, bidderRequest);
+      const payload = request.data;
+
+      expect(payload).to.be.an('object');
+      expect(payload.adUnits).to.be.an('array');
+      expect(payload.url).to.exist.and.to.equal('https://www.bridgewell.com/');
+      for (let i = 0, max_i = payload.adUnits.length; i < max_i; i++) {
+        let u = payload.adUnits[i];
+        expect(u).to.have.property('cid').that.is.a('number');
+        expect(u).to.not.have.property('ChannelID');
+        expect(u).to.have.property('adUnitCode').and.to.equal('adunit-code-2');
+        expect(u).to.have.property('requestId').and.to.equal('3150ccb55da321');
+        expect(u).to.have.property('userIds');
+        expect(u.userIds).to.deep.equal(userId);
       }
     });
 
     it('should attach validBidRequests to the tag', function () {
-      const request = spec.buildRequests(bidRequests);
+      const bidderRequest = {
+        refererInfo: {
+          page: 'https://www.bridgewell.com/',
+          legacy: {
+            referer: 'https://www.bridgewell.com/',
+          }
+        }
+      }
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
       const validBidRequests = request.validBidRequests;
       expect(validBidRequests).to.deep.equal(bidRequests);
     });
@@ -168,6 +269,7 @@ describe('bridgewellBidAdapter', function () {
         },
       ]
     };
+
     const nativeServerResponses = [
       {
         'id': '0e4048d3-5c74-4380-a21a-00ba35629f7d',
@@ -175,6 +277,7 @@ describe('bridgewellBidAdapter', function () {
         'cpm': 7.0,
         'width': 1,
         'height': 1,
+        'adomain': ['response.com'],
         'mediaType': 'native',
         'native': {
           'image': {
@@ -199,6 +302,7 @@ describe('bridgewellBidAdapter', function () {
         'currency': 'NTD'
       },
     ];
+
     const bannerBidRequests = {
       validBidRequests: [
         {
@@ -211,6 +315,7 @@ describe('bridgewellBidAdapter', function () {
         },
       ]
     };
+
     const bannerServerResponses = [
       {
         'id': 'e5b10774-32bf-4931-85ee-05095e8cff21',
@@ -218,6 +323,7 @@ describe('bridgewellBidAdapter', function () {
         'cpm': 5.0,
         'width': 300,
         'height': 250,
+        'adomain': ['response.com'],
         'mediaType': 'banner',
         'ad': '<div>test 300x250</div>',
         'ttl': 360,
@@ -239,6 +345,7 @@ describe('bridgewellBidAdapter', function () {
       expect(result[0].currency).to.equal('NTD');
       expect(result[0].mediaType).to.equal('native');
       expect(result[0].native.image.url).to.equal('https://img.scupio.com/test/test-image.jpg');
+      expect(String(result[0].meta.advertiserDomains)).to.equal('response.com');
     });
 
     it('should return all required parameters banner', function () {
@@ -254,6 +361,7 @@ describe('bridgewellBidAdapter', function () {
       expect(result[0].currency).to.equal('NTD');
       expect(result[0].mediaType).to.equal('banner');
       expect(result[0].ad).to.equal('<div>test 300x250</div>');
+      expect(String(result[0].meta.advertiserDomains)).to.equal('response.com');
     });
 
     it('should give up bid if server response is undefiend', function () {
diff --git a/test/spec/modules/brightMountainMediaBidAdapter_spec.js b/test/spec/modules/brightMountainMediaBidAdapter_spec.js
new file mode 100644
index 00000000000..5e433abebd8
--- /dev/null
+++ b/test/spec/modules/brightMountainMediaBidAdapter_spec.js
@@ -0,0 +1,321 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/brightMountainMediaBidAdapter.js';
+
+const BIDDER_CODE = 'bmtm';
+const PLACEMENT_ID = 329;
+
+describe('brightMountainMediaBidAdapter_spec', function () {
+  let bidBanner = {
+    bidId: '2dd581a2b6281d',
+    bidder: BIDDER_CODE,
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      placement_id: PLACEMENT_ID
+    },
+    placementCode: 'placementid_0',
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+    getFloor: function () {
+      return {
+        currency: 'USD',
+        floor: 0.5,
+      }
+    },
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'directseller.com',
+          sid: '00001',
+          rid: 'BidRequest1',
+          hp: 1
+        }
+      ]
+    },
+    userIdAsEids: [
+      {
+        'source': 'id5-sync.com',
+        'uids': [
+          {
+            'id': 'ID5-ZHMOaW5vh_TJhKVSaTWmuoTpwqjGGwx5v0WbaSV8yw',
+            'atype': 1,
+            'ext': {
+              'linkType': 2
+            }
+          }
+        ]
+      },
+      {
+        'source': 'pubcid.org',
+        'uids': [
+          {
+            'id': '00000000000000000000000000',
+            'atype': 1
+          }
+        ]
+      }
+    ]
+  };
+
+  let bidVideo = {
+    bidId: '2dd581a2b6281d',
+    bidder: BIDDER_CODE,
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      placement_id: PLACEMENT_ID
+    },
+    placementCode: 'placementid_0',
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      video: {
+        playerSizes: [[300, 250]],
+        context: 'outstream',
+        skip: 0,
+        playbackmethod: [1, 2],
+        mimes: ['video/mp4']
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+  };
+
+  let bidderRequest = {
+    bidderCode: BIDDER_CODE,
+    auctionId: 'fffffff-ffff-ffff-ffff-ffffffffffff',
+    bidderRequestId: 'ffffffffffffff',
+    start: 1472239426002,
+    auctionStart: 1472239426000,
+    timeout: 5000,
+    uspConsent: '1YN-',
+    refererInfo: {
+      referer: 'http://www.example.com',
+      reachedTop: true,
+    },
+    gdprConsent: {
+      consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==',
+      gdprApplies: true
+    },
+    bids: [bidBanner],
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true when  when required params found', function () {
+      expect(spec.isBidRequestValid(bidBanner)).to.be.true;
+    });
+    it('Should return false when required params are not passed', function () {
+      bidBanner.params = {};
+      expect(spec.isBidRequestValid(bidBanner)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let request = spec.buildRequests([bidBanner], bidderRequest)[0];
+    let data = JSON.parse(request.data);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+      expect(request.method).to.be.a('string');
+      expect(request.url).to.be.a('string');
+      expect(request.data).to.be.an('string');
+    });
+
+    it('Returns valid data if array of bids is valid', function () {
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('at', 'site', 'device', 'cur', 'tmax', 'regs', 'user', 'source', 'imp', 'id');
+      expect(data.at).to.be.a('number');
+      expect(data.site).to.be.an('object');
+      expect(data.device).to.be.an('object');
+      expect(data.cur).to.be.an('array');
+      expect(data.tmax).to.be.a('number');
+      expect(data.regs).to.be.an('object');
+      expect(data.user).to.be.an('object');
+      expect(data.source).to.be.an('object');
+      expect(data.imp).to.be.an('array');
+      expect(data.id).to.be.a('string');
+    });
+
+    it('Sends bidfloor param if present', function () {
+      expect(data.imp[0].bidfloor).to.equal(0.5);
+    });
+
+    it('Sends regs info if exists', function () {
+      expect(data.regs.ext.gdpr).to.exist.and.to.be.a('number');
+      expect(data.regs.ext.gdprConsentString).to.exist.and.to.be.a('string');
+      expect(data.regs.ext.us_privacy).to.exist.and.to.be.a('string');
+    });
+
+    it('Sends schain info if exists', function () {
+      expect(data.source.ext).to.be.an('object');
+    });
+
+    it('sends userId info if exists', function () {
+      expect(data.user.ext).to.have.property('eids');
+      expect(data.user.ext.eids).to.not.equal(null).and.to.not.be.undefined;
+      expect(data.user.ext.eids.length).to.greaterThan(0);
+      for (let index in data.user.ext.eids) {
+        let eid = data.user.ext.eids[index];
+        expect(eid.source).to.not.equal(null).and.to.not.be.undefined;
+        expect(eid.uids).to.not.equal(null).and.to.not.be.undefined;
+        for (let uidsIndex in eid.uids) {
+          let uid = eid.uids[uidsIndex];
+          expect(uid.id).to.not.equal(null).and.to.not.be.undefined;
+        }
+      }
+    });
+
+    it('Returns valid data if array of bids is valid for banner', function () {
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('imp');
+      expect(data.imp.length).to.greaterThan(0);
+      expect(data.imp[0]).to.have.property('banner');
+      expect(data.imp[0].banner).to.be.an('object');
+      expect(data.imp[0].banner.h).to.exist.and.to.be.a('number');
+      expect(data.imp[0].banner.w).to.exist.and.to.be.a('number');
+    });
+
+    it('Returns valid data if array of bids is valid for video', function () {
+      bidderRequest.bids = [bidVideo];
+      let serverRequest = spec.buildRequests([bidVideo], bidderRequest)[0];
+      let data = JSON.parse(serverRequest.data);
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('imp');
+      expect(data.imp.length).to.greaterThan(0);
+      expect(data.imp[0]).to.have.property('video');
+      expect(data.imp[0].video).to.be.an('object');
+      expect(data.imp[0].video.h).to.exist.and.to.be.a('number');
+      expect(data.imp[0].video.w).to.exist.and.to.be.a('number');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let resObjectBanner = {
+      'id': '2763-05f22da29b3ffb6-6959',
+      'bidid': 'e5b41111bec9e4a4e94b85d082f8fb08',
+      'seatbid': [
+        {
+          'bid': [
+            {
+              'id': '9550c3e641761cfbf2a4dd672b50ddb9',
+              'impid': '968',
+              'price': 0.3,
+              'w': 300,
+              'h': 250,
+              'nurl': 'https://example.com/?w=nr&pf=${AUCTION_PRICE}&type=b&uq=483531c101942cbb270cd088b2eec43f',
+              'adomain': [
+                'example.com'
+              ],
+              'cid': '3845_105654',
+              'crid': '3845_305654',
+              'adm': '<h1>Test Ad</h1>',
+              'adid': '17794c46ca26',
+              'iurl': 'https://example.com/?t=preview2&k=17794c46ca26'
+            }
+          ],
+          'seat': '3845'
+        }
+      ],
+      'cur': 'USD'
+    };
+
+    let resObjectVideo = {
+      'id': '2763-05f22da29b3ffb6-6959',
+      'bidid': 'e5b41111bec9e4a4e94b85d082f8fb08',
+      'seatbid': [
+        {
+          'bid': [
+            {
+              'id': '9550c3e641761cfbf2a4dd672b50ddb9',
+              'impid': '968',
+              'price': 0.3,
+              'w': 300,
+              'h': 250,
+              'nurl': 'https://example.com/?w=nr&pf=${AUCTION_PRICE}&type=b&uq=483531c101942cbb270cd088b2eec43f',
+              'adomain': [
+                'example.com'
+              ],
+              'cid': '3845_105654',
+              'crid': '3845_305654',
+              'adm': '<VAST></VAST>',
+              'adid': '17794c46ca26',
+              'iurl': 'https://example.com/?t=preview2&k=17794c46ca26'
+            }
+          ],
+          'seat': '3845'
+        }
+      ],
+      'cur': 'USD'
+    };
+
+    it('Returns an array of valid response if response object is valid for banner', function () {
+      const bidResponse = spec.interpretResponse({
+        body: resObjectBanner
+      }, { bidRequest: bidBanner });
+
+      expect(bidResponse).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < bidResponse.length; i++) {
+        let dataItem = bidResponse[i];
+        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.ad).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.advertiserDomains[0]).to.be.a('string');
+      }
+    });
+
+    it('Returns an array of valid response if response object is valid for video', function () {
+      const bidResponse = spec.interpretResponse({
+        body: resObjectVideo
+      }, { bidRequest: bidVideo });
+
+      expect(bidResponse).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < bidResponse.length; i++) {
+        let dataItem = bidResponse[i];
+        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.vastXml).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.advertiserDomains[0]).to.be.a('string');
+      }
+    });
+
+    it('Returns an empty array if invalid response is passed', function () {
+      const bidResponse = spec.interpretResponse({
+        body: ''
+      }, { bidRequest: bidBanner });
+      expect(bidResponse).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    let syncoptionsIframe = {
+      'iframeEnabled': 'true'
+    }
+    it('should return iframe sync option', function () {
+      expect(spec.getUserSyncs(syncoptionsIframe)).to.be.an('array').with.lengthOf(1);
+      expect(spec.getUserSyncs(syncoptionsIframe)[0].type).to.exist;
+      expect(spec.getUserSyncs(syncoptionsIframe)[0].url).to.exist;
+      expect(spec.getUserSyncs(syncoptionsIframe)[0].type).to.equal('iframe')
+      expect(spec.getUserSyncs(syncoptionsIframe)[0].url).to.equal('https://console.brightmountainmedia.com:8443/cookieSync')
+    });
+  });
+});
diff --git a/test/spec/modules/brightcomBidAdapter_spec.js b/test/spec/modules/brightcomBidAdapter_spec.js
index 6477e94d9d6..1ae73708d00 100644
--- a/test/spec/modules/brightcomBidAdapter_spec.js
+++ b/test/spec/modules/brightcomBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import * as utils from 'src/utils.js';
 import { spec } from 'modules/brightcomBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import {config} from '../../../src/config';
 
 const URL = 'https://brightcombid.marphezis.com/hb';
 
@@ -52,7 +53,21 @@ describe('brightcomBidAdapter', function() {
       },
       'bidId': '5fb26ac22bde4',
       'bidderRequestId': '4bf93aeb730cb9',
-      'auctionId': 'ffe9a1f7-7b67-4bda-a8e0-9ee5dc9f442e'
+      'auctionId': 'ffe9a1f7-7b67-4bda-a8e0-9ee5dc9f442e',
+      'schain': {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'exchange1.com',
+            'sid': '1234',
+            'hp': 1,
+            'rid': 'bid-request-1',
+            'name': 'publisher',
+            'domain': 'publisher.com'
+          }
+        ]
+      },
     }];
 
     sandbox = sinon.sandbox.create();
@@ -141,6 +156,110 @@ describe('brightcomBidAdapter', function() {
       expect(payload.site.publisher.id).to.equal(1234567);
     });
 
+    it('sends gdpr info if exists', function () {
+      const consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      const bidderRequest = {
+        'bidderCode': 'brightcom',
+        'auctionId': '1d1a030790a437',
+        'bidderRequestId': '22edbae2744bf5',
+        'timeout': 3000,
+        gdprConsent: {
+          consentString: consentString,
+          gdprApplies: true
+        },
+        refererInfo: {
+          page: 'http://example.com/page.html',
+          domain: 'example.com',
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const data = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
+
+      expect(data.regs.ext.gdpr).to.exist.and.to.be.a('number');
+      expect(data.regs.ext.gdpr).to.equal(1);
+      expect(data.user.ext.consent).to.exist.and.to.be.a('string');
+      expect(data.user.ext.consent).to.equal(consentString);
+    });
+
+    it('sends us_privacy', function () {
+      const bidderRequest = {
+        uspConsent: '1YYY'
+      };
+      const data = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data)
+
+      expect(data.regs).to.not.equal(null);
+      expect(data.regs.ext).to.not.equal(null);
+      expect(data.regs.ext.us_privacy).to.equal('1YYY');
+    });
+
+    it('sends coppa', function () {
+      sandbox.stub(config, 'getConfig').withArgs('coppa').returns(true);
+
+      const data = JSON.parse(spec.buildRequests(bidRequests).data)
+      expect(data.regs).to.not.be.undefined;
+      expect(data.regs.coppa).to.equal(1);
+    });
+
+    it('sends schain', function () {
+      const data = JSON.parse(spec.buildRequests(bidRequests).data);
+      expect(data).to.not.be.undefined;
+      expect(data.source).to.not.be.undefined;
+      expect(data.source.ext).to.not.be.undefined;
+      expect(data.source.ext.schain).to.not.be.undefined;
+      expect(data.source.ext.schain.complete).to.equal(1);
+      expect(data.source.ext.schain.ver).to.equal('1.0');
+      expect(data.source.ext.schain.nodes).to.not.be.undefined;
+      expect(data.source.ext.schain.nodes).to.lengthOf(1);
+      expect(data.source.ext.schain.nodes[0].asi).to.equal('exchange1.com');
+      expect(data.source.ext.schain.nodes[0].sid).to.equal('1234');
+      expect(data.source.ext.schain.nodes[0].hp).to.equal(1);
+      expect(data.source.ext.schain.nodes[0].rid).to.equal('bid-request-1');
+      expect(data.source.ext.schain.nodes[0].name).to.equal('publisher');
+      expect(data.source.ext.schain.nodes[0].domain).to.equal('publisher.com');
+    });
+
+    it('sends user eid parameters', function () {
+      bidRequests[0].userIdAsEids = [{
+        source: 'pubcid.org',
+        uids: [{
+          id: 'userid_pubcid'
+        }]
+      }, {
+        source: 'adserver.org',
+        uids: [{
+          id: 'userid_ttd',
+          ext: {
+            rtiPartner: 'TDID'
+          }
+        }]
+      }
+      ];
+
+      const data = JSON.parse(spec.buildRequests(bidRequests).data);
+
+      expect(data.user).to.not.be.undefined;
+      expect(data.user.ext).to.not.be.undefined;
+      expect(data.user.ext.eids).to.not.be.undefined;
+      expect(data.user.ext.eids).to.deep.equal(bidRequests[0].userIdAsEids);
+    });
+
+    it('sends user id parameters', function () {
+      const userId = {
+        sharedid: {
+          id: '01*******',
+          third: '01E*******'
+        }
+      };
+
+      bidRequests[0].userId = userId;
+
+      const data = JSON.parse(spec.buildRequests(bidRequests).data);
+      expect(data.user).to.not.be.undefined;
+      expect(data.user.ext).to.not.be.undefined;
+      expect(data.user.ext.ids).is.deep.equal(userId);
+    });
+
     context('when element is fully in view', function() {
       it('returns 100', function() {
         Object.assign(element, { width: 600, height: 400 });
@@ -222,7 +341,8 @@ describe('brightcomBidAdapter', function() {
               'nurl': '<!-- NURL -->',
               'adm': '<!-- Creative -->',
               'w': 300,
-              'h': 250
+              'h': 250,
+              'adomain': ['example.com']
             }]
           }]
         }
@@ -240,7 +360,10 @@ describe('brightcomBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `<!-- Creative --><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="${encodeURI('<!-- NURL -->')}"></div>`,
-        'ttl': 60
+        'ttl': 60,
+        'meta': {
+          'advertiserDomains': ['example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
@@ -258,7 +381,10 @@ describe('brightcomBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `<!-- Creative --><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="${encodeURI('<!-- NURL -->')}"></div>`,
-        'ttl': 60
+        'ttl': 60,
+        'meta': {
+          'advertiserDomains': ['example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
diff --git a/test/spec/modules/britepoolIdSystem_spec.js b/test/spec/modules/britepoolIdSystem_spec.js
index 2c6dd234a90..ddb61806006 100644
--- a/test/spec/modules/britepoolIdSystem_spec.js
+++ b/test/spec/modules/britepoolIdSystem_spec.js
@@ -1,5 +1,5 @@
-import { expect } from 'chai';
 import {britepoolIdSubmodule} from 'modules/britepoolIdSystem.js';
+import * as utils from '../../../src/utils.js';
 
 describe('BritePool Submodule', () => {
   const api_key = '1111';
@@ -16,6 +16,32 @@ describe('BritePool Submodule', () => {
     };
   };
 
+  let triggerPixelStub;
+
+  beforeEach(function (done) {
+    triggerPixelStub = sinon.stub(utils, 'triggerPixel');
+    done();
+  });
+
+  afterEach(function () {
+    triggerPixelStub.restore();
+  });
+
+  it('trigger id resolution pixel when no identifiers set', () => {
+    britepoolIdSubmodule.getId({ params: {} });
+    expect(triggerPixelStub.called).to.be.true;
+  });
+
+  it('trigger id resolution pixel when no identifiers set with api_key param', () => {
+    britepoolIdSubmodule.getId({ params: { api_key } });
+    expect(triggerPixelStub.called).to.be.true;
+  });
+
+  it('does not trigger id resolution pixel when identifiers set', () => {
+    britepoolIdSubmodule.getId({ params: { api_key, aaid } });
+    expect(triggerPixelStub.called).to.be.false;
+  });
+
   it('sends x-api-key in header and one identifier', () => {
     const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid });
     assert(errors.length === 0, errors);
@@ -43,12 +69,48 @@ describe('BritePool Submodule', () => {
     expect(params.url).to.be.undefined;
   });
 
+  it('test gdpr consent string in url', () => {
+    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid }, { gdprApplies: true, consentString: 'expectedConsentString' });
+    expect(url).to.equal('https://api.britepool.com/v1/britepool/id?gdprString=expectedConsentString');
+  });
+
+  it('test gdpr consent string not in url if gdprApplies false', () => {
+    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid }, { gdprApplies: false, consentString: 'expectedConsentString' });
+    expect(url).to.equal('https://api.britepool.com/v1/britepool/id');
+  });
+
+  it('test gdpr consent string not in url if consent string undefined', () => {
+    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid }, { gdprApplies: true, consentString: undefined });
+    expect(url).to.equal('https://api.britepool.com/v1/britepool/id');
+  });
+
+  it('dynamic pub params should be added to params', () => {
+    window.britepool_pubparams = { ppid: '12345' };
+    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid });
+    expect(params).to.eql({ aaid, ppid: '12345' });
+    window.britepool_pubparams = undefined;
+  });
+
+  it('dynamic pub params should override submodule params', () => {
+    window.britepool_pubparams = { ppid: '67890' };
+    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, ppid: '12345' });
+    expect(params).to.eql({ ppid: '67890' });
+    window.britepool_pubparams = undefined;
+  });
+
+  it('if dynamic pub params undefined do nothing', () => {
+    window.britepool_pubparams = undefined;
+    const { params, headers, url, errors } = britepoolIdSubmodule.createParams({ api_key, aaid });
+    expect(params).to.eql({ aaid });
+    window.britepool_pubparams = undefined;
+  });
+
   it('test getter override with value', () => {
     const { params, headers, url, getter, errors } = britepoolIdSubmodule.createParams({ api_key, aaid, url: url_override, getter: getter_override });
     expect(getter).to.equal(getter_override);
     // Making sure it did not become part of params
     expect(params.getter).to.be.undefined;
-    const response = britepoolIdSubmodule.getId({ api_key, aaid, url: url_override, getter: getter_override });
+    const response = britepoolIdSubmodule.getId({ params: { api_key, aaid, url: url_override, getter: getter_override } });
     assert.deepEqual(response, { id: { 'primaryBPID': bpid } });
   });
 
@@ -57,7 +119,7 @@ describe('BritePool Submodule', () => {
     expect(getter).to.equal(getter_callback_override);
     // Making sure it did not become part of params
     expect(params.getter).to.be.undefined;
-    const response = britepoolIdSubmodule.getId({ api_key, aaid, url: url_override, getter: getter_callback_override });
+    const response = britepoolIdSubmodule.getId({ params: { api_key, aaid, url: url_override, getter: getter_callback_override } });
     expect(response.callback).to.not.be.undefined;
     response.callback(result => {
       assert.deepEqual(result, { 'primaryBPID': bpid });
diff --git a/test/spec/modules/browsiRtdProvider_spec.js b/test/spec/modules/browsiRtdProvider_spec.js
new file mode 100644
index 00000000000..75120aa7505
--- /dev/null
+++ b/test/spec/modules/browsiRtdProvider_spec.js
@@ -0,0 +1,275 @@
+import * as browsiRTD from '../../../modules/browsiRtdProvider.js';
+import {makeSlot} from '../integration/faker/googletag.js';
+import * as utils from '../../../src/utils'
+import * as events from '../../../src/events';
+import * as sinon from 'sinon';
+import {sendPageviewEvent} from '../../../modules/browsiRtdProvider.js';
+
+describe('browsi Real time  data sub module', function () {
+  const conf = {
+    'auctionDelay': 250,
+    dataProviders: [{
+      'name': 'browsi',
+      'params': {
+        'url': 'testUrl.com',
+        'siteKey': 'testKey',
+        'pubKey': 'testPub',
+        'keyName': 'bv'
+      }
+    }]
+  };
+  const auction = {adUnits: [
+    {
+      code: 'adMock',
+      transactionId: 1
+    },
+    {
+      code: 'hasPrediction',
+      transactionId: 1
+    }
+  ]};
+
+  let sandbox;
+  let eventsEmitSpy;
+
+  before(() => {
+    sandbox = sinon.sandbox.create();
+    eventsEmitSpy = sandbox.spy(events, ['emit']);
+  });
+
+  after(() => {
+    sandbox.restore();
+  });
+
+  it('should init and return true', function () {
+    browsiRTD.collectData();
+    expect(browsiRTD.browsiSubmodule.init(conf.dataProviders[0])).to.equal(true)
+  });
+
+  it('should create browsi script', function () {
+    const script = browsiRTD.addBrowsiTag('scriptUrl.com');
+    expect(script.getAttribute('data-sitekey')).to.equal('testKey');
+    expect(script.getAttribute('data-pubkey')).to.equal('testPub');
+    expect(script.async).to.equal(true);
+    expect(script.prebidData.kn).to.equal(conf.dataProviders[0].params.keyName);
+  });
+
+  it('should match placement with ad unit', function () {
+    const slot = makeSlot({code: '/123/abc', divId: 'browsiAd_1'});
+
+    const test1 = browsiRTD.isIdMatchingAdUnit(slot, ['/123/abc']); // true
+    const test2 = browsiRTD.isIdMatchingAdUnit(slot, ['/123/abc', '/456/def']); // true
+    const test3 = browsiRTD.isIdMatchingAdUnit(slot, ['/123/def']); // false
+    const test4 = browsiRTD.isIdMatchingAdUnit(slot, []); // true
+
+    expect(test1).to.equal(true);
+    expect(test2).to.equal(true);
+    expect(test3).to.equal(false);
+    expect(test4).to.equal(true);
+  });
+
+  it('should return correct macro values', function () {
+    const slot = makeSlot({code: '/123/abc', divId: 'browsiAd_1'});
+
+    slot.setTargeting('test', ['test', 'value']);
+    // slot getTargeting doesn't act like GPT so we can't expect real value
+    const macroResult = browsiRTD.getMacroId({p: '<AD_UNIT>/<KEY_test>'}, slot);
+    expect(macroResult).to.equal('/123/abc/NA');
+
+    const macroResultB = browsiRTD.getMacroId({}, slot);
+    expect(macroResultB).to.equal('browsiAd_1');
+
+    const macroResultC = browsiRTD.getMacroId({p: '<AD_UNIT>', s: {s: 0, e: 1}}, slot);
+    expect(macroResultC).to.equal('/');
+  });
+
+  describe('should return data to RTD module', function () {
+    it('should return empty if no ad units defined', function () {
+      browsiRTD.setData({});
+      expect(browsiRTD.browsiSubmodule.getTargetingData([], null, null, auction)).to.eql({});
+    });
+
+    it('should return NA if no prediction for ad unit', function () {
+      makeSlot({code: 'adMock', divId: 'browsiAd_2'});
+      browsiRTD.setData({});
+      expect(browsiRTD.browsiSubmodule.getTargetingData(['adMock'], null, null, auction)).to.eql({adMock: {bv: 'NA'}});
+    });
+
+    it('should return prediction from server', function () {
+      makeSlot({code: 'hasPrediction', divId: 'hasPrediction'});
+      const data = {
+        p: {'hasPrediction': {ps: {0: 0.234}}},
+        kn: 'bv',
+        pmd: undefined
+      };
+      browsiRTD.setData(data);
+      expect(browsiRTD.browsiSubmodule.getTargetingData(['hasPrediction'], null, null, auction)).to.eql({hasPrediction: {bv: '0.20'}});
+    })
+  })
+
+  describe('should return matching prediction', function () {
+    const predictions = {
+      0: 0.123,
+      1: 0.254,
+      3: 0,
+      4: 0.8
+    }
+    const singlePrediction = {
+      0: 0.123
+    }
+    it('should return raw value if valid', function () {
+      expect(browsiRTD.getCurrentData(predictions, 0)).to.equal(0.123);
+      expect(browsiRTD.getCurrentData(predictions, 1)).to.equal(0.254);
+    })
+    it('should return 0 for prediction = 0', function () {
+      expect(browsiRTD.getCurrentData(predictions, 3)).to.equal(0);
+    })
+    it('should return -1 for invalid params', function () {
+      expect(browsiRTD.getCurrentData(null, 3)).to.equal(-1);
+      expect(browsiRTD.getCurrentData(predictions, null)).to.equal(-1);
+    })
+    it('should return prediction according to object keys length ', function () {
+      expect(browsiRTD.getCurrentData(singlePrediction, 0)).to.equal(0.123);
+      expect(browsiRTD.getCurrentData(singlePrediction, 1)).to.equal(-1);
+      expect(browsiRTD.getCurrentData(singlePrediction, 2)).to.equal(-1);
+      expect(browsiRTD.getCurrentData(predictions, 4)).to.equal(0.8);
+      expect(browsiRTD.getCurrentData(predictions, 5)).to.equal(0.8);
+      expect(browsiRTD.getCurrentData(predictions, 8)).to.equal(0.8);
+    })
+  })
+  describe('should set bid request data', function () {
+    const data = {
+      p: {
+        'adUnit1': {ps: {0: 0.234}},
+        'adUnit2': {ps: {0: 0.134}}},
+      kn: 'bv',
+      pmd: undefined
+    };
+    browsiRTD.setData(data);
+    const fakeAdUnits = [
+      {
+        code: 'adUnit1'
+      },
+      {
+        code: 'adUnit2'
+      }
+    ]
+    browsiRTD.browsiSubmodule.getBidRequestData({adUnits: fakeAdUnits}, () => {}, {}, null);
+    it('should set ad unit params with prediction values', function () {
+      expect(utils.deepAccess(fakeAdUnits[0], 'ortb2Imp.ext.data.browsi')).to.eql({bv: '0.20'});
+      expect(utils.deepAccess(fakeAdUnits[1], 'ortb2Imp.ext.data.browsi')).to.eql({bv: '0.10'});
+    })
+  })
+
+  describe('should emit ad request billable event', function () {
+    before(() => {
+      const data = {
+        p: {
+          'adUnit1': {ps: {0: 0.234}},
+          'adUnit2': {ps: {0: 0.134}}},
+        kn: 'bv',
+        pmd: undefined,
+        bet: 'AD_REQUEST'
+      };
+      browsiRTD.setData(data);
+    })
+
+    beforeEach(() => {
+      eventsEmitSpy.resetHistory();
+    })
+    it('should send one event per ad unit code', function () {
+      const auction = {adUnits: [
+        {
+          code: 'a',
+          transactionId: 1
+        },
+        {
+          code: 'b',
+          transactionId: 2
+        },
+        {
+          code: 'a',
+          transactionId: 3
+        },
+      ]};
+
+      browsiRTD.browsiSubmodule.getTargetingData(['a', 'b'], null, null, auction);
+      expect(eventsEmitSpy.callCount).to.equal(2);
+    })
+    it('should send events only for received ad unit codes', function () {
+      const auction = {adUnits: [
+        {
+          code: 'a',
+          transactionId: 1
+        },
+        {
+          code: 'b',
+          transactionId: 2
+        },
+        {
+          code: 'c',
+          transactionId: 3
+        },
+      ]};
+
+      browsiRTD.browsiSubmodule.getTargetingData(['a'], null, null, auction);
+      expect(eventsEmitSpy.callCount).to.equal(1);
+      browsiRTD.browsiSubmodule.getTargetingData(['b'], null, null, auction);
+      expect(eventsEmitSpy.callCount).to.equal(2);
+    })
+    it('should use 1st transaction ID in case of twin ad unit codes', function () {
+      const auction = {
+        auctionId: '123',
+        adUnits: [
+          {
+            code: 'a',
+            transactionId: 1
+          },
+          {
+            code: 'a',
+            transactionId: 3
+          },
+        ]};
+
+      const expectedCall = {
+        vendor: 'browsi',
+        type: 'adRequest',
+        transactionId: 1,
+        auctionId: '123'
+      }
+
+      browsiRTD.browsiSubmodule.getTargetingData(['a'], null, null, auction);
+      const callArguments = eventsEmitSpy.getCalls()[0].args[1];
+      // billing id is random, we can't check its value
+      delete callArguments['billingId'];
+      expect(callArguments).to.eql(expectedCall);
+    })
+  })
+
+  describe('should emit pageveiw billable event', function () {
+    beforeEach(() => {
+      eventsEmitSpy.resetHistory();
+    })
+    it('should send event if type is correct', function () {
+      sendPageviewEvent('PAGEVIEW')
+      const pageViewEvent = new CustomEvent('browsi_pageview', {});
+      window.dispatchEvent(pageViewEvent);
+      const expectedCall = {
+        vendor: 'browsi',
+        type: 'pageview',
+      }
+
+      expect(eventsEmitSpy.callCount).to.equal(1);
+      const callArguments = eventsEmitSpy.getCalls()[0].args[1];
+      // billing id is random, we can't check its value
+      delete callArguments['billingId'];
+      expect(callArguments).to.eql(expectedCall);
+    })
+    it('should not send event if type is incorrect', function () {
+      sendPageviewEvent('AD_REQUEST');
+      sendPageviewEvent('INACTIVE');
+      sendPageviewEvent(undefined);
+      expect(eventsEmitSpy.callCount).to.equal(0);
+    })
+  })
+});
diff --git a/test/spec/modules/bucksenseBidAdapter_spec.js b/test/spec/modules/bucksenseBidAdapter_spec.js
index f49a63d2003..b977c3a9dd1 100644
--- a/test/spec/modules/bucksenseBidAdapter_spec.js
+++ b/test/spec/modules/bucksenseBidAdapter_spec.js
@@ -128,7 +128,10 @@ describe('Bucksense Adapter', function() {
           'creativeId': 'creative002',
           'currency': 'USD',
           'netRevenue': false,
-          'ad': '<div id=\"bks-banner\"><a href=\"https://www.bucksense.com\" target=\"_blank\"><img src=\"https://i.bksn.se/s/1334/c5acdc75ba096bk.jpg\" width=\"300\" height=\"250\"/></a></div>'
+          'ad': '<div id=\"bks-banner\"><a href=\"https://www.bucksense.com\" target=\"_blank\"><img src=\"https://i.bksn.se/s/1334/c5acdc75ba096bk.jpg\" width=\"300\" height=\"250\"/></a></div>',
+          'meta': {
+            'advertiserDomains': ['http://www.bucksense.com/']
+          }
         }
       };
     });
diff --git a/test/spec/modules/buzzoolaBidAdapter_spec.js b/test/spec/modules/buzzoolaBidAdapter_spec.js
index 8a04999219d..312441c4202 100644
--- a/test/spec/modules/buzzoolaBidAdapter_spec.js
+++ b/test/spec/modules/buzzoolaBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec} from 'modules/buzzoolaBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import '../../../src/prebid.js';
 import {executeRenderer, Renderer} from '../../../src/Renderer.js';
 import {deepClone} from '../../../src/utils.js';
 
@@ -54,7 +55,12 @@ const BANNER_RESPONSE = [{
   'netRevenue': true,
   'ttl': 10800,
   'ad': '<div id=\"2a11641ada3c6a\"><script>\n(function(w, d){\n\tvar env = \"prod\";\n\tvar playerData = unescape(\"\\u003ca href=\"https://buzzoola.com\" target="_blank"\\u003e\\u003cimg src="https://tube.buzzoola.com/xstatic/o42/buzzoola-test/240x400.jpg" width="240" height="400"/\\u003e\\u003c/a\\u003e\\u003cscript\\u003econsole.log("Im a buzzoola banner!");\\u003c/script\\u003e\");\n\tvar containerId = \"2a11641ada3c6a\";\n\n\tloadScript = function(src, cb){\n\t\tvar s = d.createElement(\"script\");\n\t\ts.onload = function(){cb && cb()};\n\t\ts.onerror = function(){cb && cb(true)};\n\t\ts.src = src;\n\t\ts.async = true;\n\t\td.body.appendChild(s);\n\t};\n\n\tthis.createPlayer = (function(containerId, env, playerData){ return function(){\n\t\tvar p = d.createElement(\"div\");\n\t\tif (env) p.setAttribute(\"data-debug_env\", env);\n\t\tvar container = d.getElementById(containerId)\n\t\tif(container){\n\t\t\tcontainer.appendChild(p);\n\n\t\t\tnew w.Buzzoola.Core(p, {\n\t\t\t\tdata: {\n\t\t\t\t\tcrs: [{\n\t\t\t\t\t\tcontent: {\n\t\t\t\t\t\t\tmain_content: playerData,\n\t\t\t\t\t\t\tbanner_height: 400,\n\t\t\t\t\t\t\tbanner_width: 240\n\t\t\t\t\t\t},\n\t\t\t\t\t\tevent_url: \"https://exchange.buzzoola.com/event/398e072c-4987-4745-6e72-109b214a79e0/3fa02874-3d73-48a1-4ba6-2129c6f99e1d/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75R6wziBhL0JAERGosa1adol78sahgLU5t/\",\n\t\t\t\t\t\tcontent_type: \"banner\",\n\t\t\t\t\t\tshare_buttons: [],\n\t\t\t\t\t\tbranding_template: \"\",\n\t\t\t\t\t\tplayer_show_skip_button_seconds: 5,\n\t\t\t\t\t\ttracking_url: {\"ctor\":[\"https://www.tns-counter.ru/V13a****buzzola_com/ru/CP1251/tmsec=buzzola_total/5786980942666966205\",\"https://www.tns-counter.ru/V13a****buzzoola_kz/ru/UTF-8/tmsec=buzzoola_video/3495102609460744232\",\"https://buzzoolaru.solution.weborama.fr/fcgi-bin/dispatch.fcgi?a.A=ev\\u0026a.si=3071\\u0026a.te=37\\u0026a.aap=1\\u0026a.agi=862\\u0026a.evn=PrebidJS.test\\u0026g.ra=7385909726626079306\",\"https://x01.aidata.io/0.gif?pid=BUZZOOLA\\u0026id=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://top-fwz1.mail.ru/counter?id=3026766\",\"https://dm.hybrid.ai/match?id=111\\u0026vid=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://px.adhigh.net/p/cm/buzzoola?u=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://ssp1.rtb.beeline.ru/userbind?src=buz\\u0026ssp_user_id=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://sync.upravel.com/image?source=buzzoola\\u0026id=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://relap.io/api/partners/bzcs.gif?uid=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://x.bidswitch.net/sync?ssp=sspicyads\",\"https://inv-nets.admixer.net/adxcm.aspx?ssp=3C5173FC-CA30-4692-9116-009C19CB1BF9\\u0026rurl=%2F%2Fexchange.buzzoola.com%2Fcookiesync%2Fdsp%2Fadmixer-video%2F%24%24visitor_cookie%24%24\",\"https://sync.datamind.ru/cookie/accepter?source=buzzoola\\u0026id=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://dmp.vihub.ru/match?sysid=buz\\u0026redir=no\\u0026uid=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://ad.adriver.ru/cgi-bin/rle.cgi?sid=1\\u0026ad=608223\\u0026bt=21\\u0026pid=2551979\\u0026bid=6150299\\u0026bn=6150299\\u0026rnd=8725366486107503947\",\"https://reichelcormier.bid/point/?method=match\\u0026type=ssp\\u0026key=4677290772f9000878093d69c199bfba\\u0026id=3509\\u0026extUid=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://sync.republer.com/match?src=buzzoola\\u0026id=dbdb5b13-e719-4987-7f6a-a882322bbfce\",\"https://sm.rtb.mts.ru/p?id=dbdb5b13-e719-4987-7f6a-a882322bbfce\\u0026ssp=buzzoola\",\"https://cm.mgid.com/m?cdsp=371151\\u0026adu=https%3A%2F%2Fexchange.buzzoola.com%2Fcookiesync%2Fdsp%2Fmarketgid-native%2F%7Bmuidn%7D\",\"https://dmp.gotechnology.io/dmp/syncsspdmp?sspid=122258\"]},\n\t\t\t\t\t\ttracking_js: {\"ctor\":[\"https://buzzoola.fraudscore.mobi/dooJ9sheeeDaZ3fe.js?s=268671\\u0026l=417846\"]}\n\t\t\t\t\t}],\n\t\t\t\t\tauction_id: \"398e072c-4987-4745-6e72-109b214a79e0\"\n\t\t        }\n\t\t    });\n\t\t}\n\t}})(containerId, env, playerData)\n\n\tif (w.Buzzoola !== null && w.Buzzoola !== undefined){\n\t\tthis.createPlayer();\n\t} else {\n\t\tloadScript(\"https://tube.buzzoola.com/new/build/buzzlibrary.js\", (function(context){return function(err){\n\t\t\tif (err){\n\t\t\t\t// TODO: error callback\n\t\t\t} else {\n\t\t\t\tcontext.createPlayer();\n\t\t\t}\n\t\t}})(this));\n\t}\n\n}).call({},window, document);\n</script></div>',
-  'mediaType': 'banner'
+  'mediaType': 'banner',
+  'meta': {
+    'advertiserDomains': [
+      'buzzoola.com'
+    ]
+  }
 }];
 
 const REQUIRED_BANNER_FIELDS = [
@@ -67,7 +73,8 @@ const REQUIRED_BANNER_FIELDS = [
   'creativeId',
   'netRevenue',
   'currency',
-  'mediaType'
+  'mediaType',
+  'meta'
 ];
 
 const VIDEO_BID = {
@@ -92,17 +99,22 @@ const VIDEO_BID_REQUEST = {
 
 const VIDEO_RESPONSE = [{
   'requestId': '325a54271dc40a',
-  'cpm': 4.6158956756756755,
+  'cpm': 5.528554074074074,
   'width': 640,
-  'height': 380,
+  'height': 480,
   'creativeId': '11774',
   'dealId': '',
   'currency': 'RUB',
   'netRevenue': true,
   'ttl': 10800,
   'ad': '{"crs":[{"advertiser_id":165,"title":"qa//PrebidJStestVideoURL","description":"qa//PrebidJStest","duration":0,"ya_id":"55038886","raw_content":"{\\"main_content\\": \\"https://tube.buzzoola.com/xstatic/o42/mcaug/2.mp4\\"}","content":{"main_content":"https://tube.buzzoola.com/xstatic/o42/mcaug/2.mp4"},"content_type":"video_url","sponsor_link":"","sponsor_name":"","overlay":"","overlay_start_after":0,"overlay_close_after":0,"action_button_title":"","tracking_url":{},"iframe_domains":[],"soc_share_url":"https://tube.buzzoola.com/share.html","player_show_skip_button_before_play":false,"player_show_skip_button_seconds":5,"player_show_title":true,"player_data_attributes":{"expandable":"default","overroll":"default"},"click_event_view":"default","share_panel_position":"left","auto_play":true,"logo_url":{},"share_buttons":["vkontakte","facebook","twitter","moimir","odnoklassniki","embed"],"player_show_panels":false,"thumbnail":"","tracking_js":{},"click_event_url":"https://exchange.buzzoola.com/event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/click/0/","vpaid_js_url":"https://tube.buzzoola.com/new/js/lib/vpaid_js_proxy.js","skip_clickthru":false,"landing_link_text":"","sound_enabled_by_default":false,"landing_link_position":"right","displayed_price":"","js_wrapper_url":"","enable_moat":false,"branding_template":"","event_url":"https://exchange.buzzoola.com/event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/","resend_event_url":"https://exchange.buzzoola.com/resend_event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/","creative_hash":"m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm","custom_html":"","custom_js":"","height":0,"width":0,"campaign_id":5758,"line_item_id":17319,"creative_id":11774,"extra":{"imp_id":"14795a96-6261-49dc-7241-207333ab1490","rtime":"2019-08-27 13:58:36"},"subcontent":"vast","auction_settings":{"price":"4.6158956756756755","currency":"RUB","event_name":"player_seen","time_slice":0},"hash_to_embed":"kbDH64c7yFYkSu0KCwSkoUD2bNHAnUTHBERqLGtWnaIF4Kow5peD5g","need_ad":false}],"tracking_urls":{"ctor":["https://www.tns-counter.ru/V13a****buzzola_com/ru/CP1251/tmsec=buzzola_total/1322650417245790778","https://www.tns-counter.ru/V13a****buzzoola_kz/ru/UTF-8/tmsec=buzzoola_video/5395765100939533275","https://buzzoolaru.solution.weborama.fr/fcgi-bin/dispatch.fcgi?a.A=ev&a.si=3071&a.te=37&a.aap=1&a.agi=862&a.evn=PrebidJS.test&g.ra=4581478478720298652","https://x01.aidata.io/0.gif?pid=BUZZOOLA&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://top-fwz1.mail.ru/counter?id=3026769","https://www.tns-counter.ru/V13a****buzzola_com/ru/UTF-8/tmsec=buzzola_inread/542059452789128996","https://dm.hybrid.ai/match?id=111&vid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://px.adhigh.net/p/cm/buzzoola?u=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://ssp1.rtb.beeline.ru/userbind?src=buz&ssp_user_id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sync.upravel.com/image?source=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://relap.io/api/partners/bzcs.gif?uid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://x.bidswitch.net/sync?ssp=sspicyads","https://inv-nets.admixer.net/adxcm.aspx?ssp=3C5173FC-CA30-4692-9116-009C19CB1BF9&rurl=%2F%2Fexchange.buzzoola.com%2Fcookiesync%2Fdsp%2Fadmixer-video%2F%24%24visitor_cookie%24%24","https://sync.datamind.ru/cookie/accepter?source=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://dmp.vihub.ru/match?sysid=buz&redir=no&uid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://ad.adriver.ru/cgi-bin/rle.cgi?sid=1&ad=608223&bt=21&pid=2551979&bid=6150299&bn=6150299&rnd=1279444531737367663","https://reichelcormier.bid/point/?method=match&type=ssp&key=4677290772f9000878093d69c199bfba&id=3509&extUid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sync.republer.com/match?src=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sm.rtb.mts.ru/p?id=dbdb5b13-e719-4987-7f6a-a882322bbfce&ssp=buzzoola","https://cm.mgid.com/m?cdsp=371151&adu=https%3A%2F%2Fexchange.buzzoola.com%2Fcookiesync%2Fdsp%2Fmarketgid-native%2F%7Bmuidn%7D","https://dmp.gotechnology.io/dmp/syncsspdmp?sspid=122258"]},"tracking_js":{"ctor":["https://buzzoola.fraudscore.mobi/dooJ9sheeeDaZ3fe.js?s=268671&l=417845"]},"placement":{"placement_id":417845,"unit_type":"inread","unit_settings":{"align":"left","autoplay_enable_sound":false,"creatives_amount":1,"debug_mode":false,"expandable":"never","sound_control":"default","target":"","width":"100%"},"unit_settings_list":["width","sound_control","debug_mode","target","creatives_amount","expandable","container_height","align","height"]},"uuid":"dbdb5b13-e719-4987-7f6a-a882322bbfce","auction_id":"f9382ceb-49c2-4683-50d8-5c516c53cd69","env":"prod"}',
-  'vastXml': '<?xml version="1.0" encoding="UTF-8"?>\n<VAST version="3.0"><Ad id="17319" sequence="1"><InLine><AdSystem><![CDATA[Buzzoola VAST 3.0]]></AdSystem><AdTitle><![CDATA[qa//PrebidJStestVideoURL]]></AdTitle><Creatives><Creative><Linear><Duration>00:00:30</Duration><AdParameters><![CDATA[{"crs":[{"advertiser_id":165,"title":"qa//PrebidJStestVideoURL","description":"qa//PrebidJStest","duration":0,"ya_id":"55038886","raw_content":"{\\"main_content\\": \\"https://tube.buzzoola.com/xstatic/o42/mcaug/2.mp4\\"}","content":{"main_content":"https://tube.buzzoola.com/xstatic/o42/mcaug/2.mp4"},"content_type":"video_url","sponsor_link":"","sponsor_name":"","overlay":"","overlay_start_after":0,"overlay_close_after":0,"action_button_title":"","tracking_url":{},"iframe_domains":[],"soc_share_url":"https://tube.buzzoola.com/share.html","player_show_skip_button_before_play":false,"player_show_skip_button_seconds":5,"player_show_title":true,"player_data_attributes":{"expandable":"default","overroll":"default"},"click_event_view":"default","share_panel_position":"left","auto_play":true,"logo_url":{},"share_buttons":["vkontakte","facebook","twitter","moimir","odnoklassniki","embed"],"player_show_panels":false,"thumbnail":"","tracking_js":{},"click_event_url":"https://exchange.buzzoola.com/event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/click/0/","vpaid_js_url":"https://tube.buzzoola.com/new/js/lib/vpaid_js_proxy.js","skip_clickthru":false,"landing_link_text":"","sound_enabled_by_default":false,"landing_link_position":"right","displayed_price":"","js_wrapper_url":"","enable_moat":false,"branding_template":"","event_url":"https://exchange.buzzoola.com/event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/","resend_event_url":"https://exchange.buzzoola.com/resend_event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/","creative_hash":"m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm","custom_html":"","custom_js":"","height":0,"width":0,"campaign_id":5758,"line_item_id":17319,"creative_id":11774,"extra":{"imp_id":"14795a96-6261-49dc-7241-207333ab1490","rtime":"2019-08-27 13:58:36"},"subcontent":"vast","auction_settings":{"price":"4.6158956756756755","currency":"RUB","event_name":"player_seen","time_slice":0},"hash_to_embed":"kbDH64c7yFYkSu0KCwSkoUD2bNHAnUTHBERqLGtWnaIF4Kow5peD5g","need_ad":false}],"tracking_urls":{"ctor":["https://www.tns-counter.ru/V13a****buzzola_com/ru/CP1251/tmsec=buzzola_total/1322650417245790778","https://www.tns-counter.ru/V13a****buzzoola_kz/ru/UTF-8/tmsec=buzzoola_video/5395765100939533275","https://buzzoolaru.solution.weborama.fr/fcgi-bin/dispatch.fcgi?a.A=ev&a.si=3071&a.te=37&a.aap=1&a.agi=862&a.evn=PrebidJS.test&g.ra=4581478478720298652","https://x01.aidata.io/0.gif?pid=BUZZOOLA&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://top-fwz1.mail.ru/counter?id=3026769","https://www.tns-counter.ru/V13a****buzzola_com/ru/UTF-8/tmsec=buzzola_inread/542059452789128996","https://dm.hybrid.ai/match?id=111&vid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://px.adhigh.net/p/cm/buzzoola?u=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://ssp1.rtb.beeline.ru/userbind?src=buz&ssp_user_id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sync.upravel.com/image?source=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://relap.io/api/partners/bzcs.gif?uid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://x.bidswitch.net/sync?ssp=sspicyads","https://inv-nets.admixer.net/adxcm.aspx?ssp=3C5173FC-CA30-4692-9116-009C19CB1BF9&rurl=%2F%2Fexchange.buzzoola.com%2Fcookiesync%2Fdsp%2Fadmixer-video%2F%24%24visitor_cookie%24%24","https://sync.datamind.ru/cookie/accepter?source=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://dmp.vihub.ru/match?sysid=buz&redir=no&uid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://ad.adriver.ru/cgi-bin/rle.cgi?sid=1&ad=608223&bt=21&pid=2551979&bid=6150299&bn=6150299&rnd=1279444531737367663","https://reichelcormier.bid/point/?method=match&type=ssp&key=4677290772f9000878093d69c199bfba&id=3509&extUid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sync.republer.com/match?src=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sm.rtb.mts.ru/p?id=dbdb5b13-e719-4987-7f6a-a882322bbfce&ssp=buzzoola","https://cm.mgid.com/m?cdsp=371151&adu=https%3A%2F%2Fexchange.buzzoola.com%2Fcookiesync%2Fdsp%2Fmarketgid-native%2F%7Bmuidn%7D","https://dmp.gotechnology.io/dmp/syncsspdmp?sspid=122258"]},"tracking_js":{"ctor":["https://buzzoola.fraudscore.mobi/dooJ9sheeeDaZ3fe.js?s=268671&l=417845"]},"placement":{"placement_id":417845,"unit_type":"inread","unit_settings":{"align":"left","autoplay_enable_sound":false,"creatives_amount":1,"debug_mode":false,"expandable":"never","sound_control":"default","target":"","width":"100%"},"unit_settings_list":["width","sound_control","debug_mode","target","creatives_amount","expandable","container_height","align","height"]},"uuid":"dbdb5b13-e719-4987-7f6a-a882322bbfce","auction_id":"f9382ceb-49c2-4683-50d8-5c516c53cd69","env":"prod"}]]></AdParameters><TrackingEvents></TrackingEvents><MediaFiles><MediaFile delivery="" type="application/javascript" width="0" height="0" apiFramework="VPAID"><![CDATA[https://tube.buzzoola.com/new/js/lib/vpaid_js_proxy_hash_only.js]]></MediaFile></MediaFiles></Linear></Creative></Creatives><Description></Description><Survey></Survey><Extensions></Extensions></InLine></Ad></VAST>',
-  'mediaType': 'video'
+  'vastUrl': 'https://exchange.buzzoola.com/prebid/adm/6cfa2ee1-f001-4fab-5582-a62eaee46205/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75R6wziBhL0JAERGosa1adogXgqjDml4Pm/?auction_id=92702ce1-2328-4c7a-57aa-41c738e8bb75',
+  'mediaType': 'video',
+  'meta': {
+    'advertiserDomains': [
+      'buzzoola.com'
+    ]
+  }
 }];
 
 const RENDERER_DATA = {
@@ -121,8 +133,107 @@ const REQUIRED_VIDEO_FIELDS = [
   'creativeId',
   'netRevenue',
   'currency',
-  'vastXml',
-  'mediaType'
+  'vastUrl',
+  'mediaType',
+  'meta'
+];
+
+const NATIVE_BID = {
+  'bidder': 'buzzoola',
+  'params': {'placementId': 417845},
+  'mediaTypes': {
+    'native': {
+      'image': {
+        'required': true,
+        'sizes': [640, 134]
+      },
+      'title': {
+        'required': true,
+        'len': 80
+      },
+      'sponsoredBy': {
+        'required': true
+      },
+      'clickUrl': {
+        'required': true
+      },
+      'privacyLink': {
+        'required': false
+      },
+      'body': {
+        'required': true
+      },
+      'icon': {
+        'required': true,
+        'sizes': [50, 50]
+      }
+    }
+  },
+  'bidId': '22a42cd3522c6f'
+};
+
+const NATIVE_BID_REQUEST = {
+  bidderCode: 'buzzoola',
+  bids: [NATIVE_BID]
+};
+
+const NATIVE_RESPONSE = [{
+  'requestId': '22a42cd3522c6f',
+  'cpm': 6.553015238095238,
+  'width': 600,
+  'height': 300,
+  'creativeId': '17970',
+  'dealId': '',
+  'currency': 'RUB',
+  'netRevenue': true,
+  'ttl': 10800,
+  'ad': 'https://tube.buzzoola.com/xstatic/o42/stoloto/6',
+  'mediaType': 'native',
+  'native': {
+    'body': 'В 1388-м тираже «Русского лото» джекпот',
+    'clickTrackers': [
+      'https://exchange.buzzoola.com/event/6cee890f-1878-4a37-46b3-0107b6c590ae/a1aedc5b-50f2-4a7c-6d24-e235bb1f87ed/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpJwP8cy-zNH8GX-_nWFkILh/click/'
+    ],
+    'clickUrl': 'https://ad.doubleclick.net/ddm/trackclk/N250204.3446512BUZZOOLA/B25801892.303578321;dc_trk_aid=496248119;dc_trk_cid=151207455;dc_lat=;dc_rdid=;tag_for_child_directed_treatment=;tfua=;ltd=?https://stoloto.onelink.me/mEJM?pid=Buzzoola_mb4&c=rl_10_05_2021&is_retargeting=true&af_ios_url=https%3A%2F%2Fapps.apple.com%2Fru%2Fapp%2F%25D1%2581%25D1%2582%25D0%25BE%25D0%25BB%25D0%25BE%25D1%2582%25D0%25BE-%25D1%2583-%25D0%25BD%25D0%25B0%25D1%2581-%25D0%25B2%25D1%258B%25D0%25B8%25D0%25B3%25D1%2580%25D1%258B%25D0%25B2%25D0%25B0%25D1%258E%25D1%2582%2Fid579961527&af_android_url=https%3A%2F%2Fgalaxystore.samsung.com%2Fdetail%2Fru.stoloto.mobile&af_dp=stolotoone%3A%2F%2Fgames&af_web_dp=https%3A%2F%2Fwww.stoloto.ru%2Fruslotto%2Fgame%3Flastdraw%3Fad%3Dbuzzoola_app_dx_rl_10_05_2021%26utm_source%3Dbuzzoola_app_dx%26utm_medium%3Dcpm%26utm_campaign%3Drl_10_05_2021%26utm_content%3Dbuzzoola_app_dx_mob_native_ios_mb4%26utm_term%3D__6ple2-9znjyg_',
+    'icon': {
+      'height': '100',
+      'url': 'https://tube.buzzoola.com/xstatic/o42/stoloto/logo3.png',
+      'width': '100'
+    },
+    'image': {
+      'height': '450',
+      'url': 'https://tube.buzzoola.com/xstatic/o42/stoloto/6/16x9.png',
+      'width': '800'
+    },
+    'impressionTrackers': [
+      'https://exchange.buzzoola.com/event/6cee890f-1878-4a37-46b3-0107b6c590ae/a1aedc5b-50f2-4a7c-6d24-e235bb1f87ed/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpJwP8cy-zNH8GX-_nWFkILh/ctor/',
+      'https://exchange.buzzoola.com/event/6cee890f-1878-4a37-46b3-0107b6c590ae/a1aedc5b-50f2-4a7c-6d24-e235bb1f87ed/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpJwP8cy-zNH8GX-_nWFkILh/impression/?price=${AUCTION_PRICE}&cur=${AUCTION_CURRENCY}',
+      'https://exchange.buzzoola.com/event/6cee890f-1878-4a37-46b3-0107b6c590ae/a1aedc5b-50f2-4a7c-6d24-e235bb1f87ed/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpJwP8cy-zNH8GX-_nWFkILh/player_seen/',
+      'https://cr.frontend.weborama.fr/cr?key=mailru&url=https%3A%2F%2Fad.mail.ru%2Fcm.gif%3Fp%3D68%26id%3D%7BWEBO_CID%7D'
+    ],
+    'sponsoredBy': 'Buzzoola',
+    'title': 'Test PrebidJS Native'
+  },
+  'meta': {
+    'advertiserDomains': [
+      'buzzoola.com'
+    ]
+  }
+}];
+
+const REQUIRED_NATIVE_FIELDS = [
+  'requestId',
+  'cpm',
+  'width',
+  'height',
+  'ad',
+  'native',
+  'ttl',
+  'creativeId',
+  'netRevenue',
+  'currency',
+  'mediaType',
+  'meta'
 ];
 
 describe('buzzoolaBidAdapter', () => {
@@ -149,18 +260,22 @@ describe('buzzoolaBidAdapter', () => {
   describe('buildRequests', () => {
     let videoBidRequests = [VIDEO_BID];
     let bannerBidRequests = [BANNER_BID];
+    let nativeBidRequests = [NATIVE_BID];
 
     const bannerRequest = spec.buildRequests(bannerBidRequests, BANNER_BID_REQUEST);
+    const nativeRequest = spec.buildRequests(nativeBidRequests, NATIVE_BID_REQUEST);
     const videoRequest = spec.buildRequests(videoBidRequests, VIDEO_BID_REQUEST);
 
     it('sends bid request to ENDPOINT via POST', () => {
       expect(videoRequest.method).to.equal('POST');
       expect(bannerRequest.method).to.equal('POST');
+      expect(nativeRequest.method).to.equal('POST');
     });
 
     it('sends bid request to correct ENDPOINT', () => {
       expect(videoRequest.url).to.equal(ENDPOINT);
       expect(bannerRequest.url).to.equal(ENDPOINT);
+      expect(nativeRequest.url).to.equal(ENDPOINT);
     });
 
     it('sends correct video bid parameters', () => {
@@ -170,6 +285,10 @@ describe('buzzoolaBidAdapter', () => {
     it('sends correct banner bid parameters', () => {
       expect(bannerRequest.data).to.deep.equal(BANNER_BID_REQUEST);
     });
+
+    it('sends correct native bid parameters', () => {
+      expect(nativeRequest.data).to.deep.equal(NATIVE_BID_REQUEST);
+    });
   });
 
   describe('interpretResponse', () => {
@@ -201,6 +320,10 @@ describe('buzzoolaBidAdapter', () => {
       nobidServerResponseCheck(BANNER_BID_REQUEST);
     });
 
+    it('handles native nobid responses', () => {
+      nobidServerResponseCheck(NATIVE_BID_REQUEST);
+    });
+
     it('handles video empty responses', () => {
       nobidServerResponseCheck(VIDEO_BID_REQUEST, emptyResponse);
     });
@@ -209,6 +332,10 @@ describe('buzzoolaBidAdapter', () => {
       nobidServerResponseCheck(BANNER_BID_REQUEST, emptyResponse);
     });
 
+    it('handles native empty responses', () => {
+      nobidServerResponseCheck(NATIVE_BID_REQUEST, emptyResponse);
+    });
+
     it('should get correct video bid response', () => {
       bidServerResponseCheck(VIDEO_RESPONSE, VIDEO_BID_REQUEST, REQUIRED_VIDEO_FIELDS);
     });
@@ -216,6 +343,10 @@ describe('buzzoolaBidAdapter', () => {
     it('should get correct banner bid response', () => {
       bidServerResponseCheck(BANNER_RESPONSE, BANNER_BID_REQUEST, REQUIRED_BANNER_FIELDS);
     });
+
+    it('should get correct native bid response', () => {
+      bidServerResponseCheck(NATIVE_RESPONSE, NATIVE_BID_REQUEST, REQUIRED_NATIVE_FIELDS);
+    });
   });
 
   describe('outstream renderer', () => {
@@ -268,6 +399,7 @@ describe('buzzoolaBidAdapter', () => {
       };
       const spy = sinon.spy(window.Buzzoola.Core, 'install');
       executeRenderer(renderer, result);
+      renderer.callback();
       expect(spy.called).to.be.true;
 
       const spyCall = spy.getCall(0);
diff --git a/test/spec/modules/byDataAnalyticsAdapter_spec.js b/test/spec/modules/byDataAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..1346284695c
--- /dev/null
+++ b/test/spec/modules/byDataAnalyticsAdapter_spec.js
@@ -0,0 +1,189 @@
+import ascAdapter from 'modules/byDataAnalyticsAdapter';
+import { expect } from 'chai';
+let adapterManager = require('src/adapterManager').default;
+let events = require('src/events');
+let constants = require('src/constants.json');
+let auctionId = 'b70ef967-5c5b-4602-831e-f2cf16e59af2';
+const initOptions = {
+  clientId: 'asc00000',
+  logFrequency: 1,
+};
+let userData = {
+  'uid': '271a8-2b86-f4a4-f59bc',
+  'cid': 'asc00000',
+  'pid': 'www.letsrun.com',
+  'os': 'Macintosh',
+  'osv': 10.157,
+  'br': 'Chrome',
+  'brv': 103,
+  'ss': {
+    'width': 1792,
+    'height': 1120
+  },
+  'de': 'Desktop',
+  'tz': 'Asia/Calcutta'
+};
+let bidTimeoutArgs = [{
+  auctionId,
+  bidId: '12e90cb5ddc5dea',
+  bidder: 'appnexus',
+  adUnitCode: 'div-gpt-ad-mrec1'
+}];
+let noBidArgs = {
+  adUnitCode: 'div-gpt-ad-mrec1',
+  auctionId,
+  bidId: '14480e9832f2d2b',
+  bidder: 'appnexus',
+  bidderRequestId: '13b87b6c20d3636',
+  mediaTypes: {banner: {sizes: [[300, 250], [250, 250]]}},
+  sizes: [[300, 250], [250, 250]],
+  src: 'client',
+  transactionId: 'c8ee3914-1ee0-4ce6-9126-748d5692188c'
+}
+let bidWonArgs = {
+  auctionId,
+  adUnitCode: 'div-gpt-ad-mrec1',
+  size: '300x250',
+  requestId: '15c86b6c10d3746',
+  bidder: 'appnexus',
+  timeToRespond: 114,
+  currency: 'USD',
+  mediaType: 'display',
+  cpm: 0.50
+}
+
+let auctionEndArgs = {
+  adUnitCodes: ['div-gpt-ad-mrec1'],
+  adUnits: [{
+    code: 'div-gpt-ad-mrec1',
+    mediaTypes: {banner: {sizes: [[300, 250], [250, 250]]}},
+    sizes: [[300, 250], [250, 250]],
+    bids: [{bidder: 'appnexus', params: {placementId: '19305195'}}],
+    transactionId: 'c8ee3914-1ee0-4ce6-9126-748d5692188c'
+  }],
+  auctionEnd: 1627973487504,
+  auctionId,
+  auctionStatus: 'completed',
+  timestamp: 1627973484504,
+  bidsReceived: [],
+  bidderRequests: [{
+    auctionId,
+    auctionStart: 1627973484504,
+    bidderCode: 'appnexus',
+    bidderRequestId: '13b87b6c20d3636',
+    bids: [
+      {
+        adUnitCode: 'div-gpt-ad-mrec1',
+        auctionId,
+        bidId: '14480e9832f2d2b',
+        bidder: 'appnexus',
+        bidderRequestId: '13b87b6c20d3636',
+        src: 'client',
+        mediaTypes: {banner: {sizes: [[300, 250], [250, 250]]}},
+        sizes: [[300, 250], [250, 250]],
+        transactionId: 'c8ee3914-1ee0-4ce6-9126-748d5692188c'
+      }
+    ]
+  }]
+}
+let expectedDataArgs = {
+  visitor_data: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiIyNzFhOC0yYjg2LWY0YTQtZjU5YmMiLCJjaWQiOiJhc2MwMDAwMCIsInBpZCI6Ind3dy5sZXRzcnVuLmNvbSIsIm9zIjoiTWFjaW50b3NoIiwib3N2IjoxMC4xNTcsImJyIjoiQ2hyb21lIiwiYnJ2IjoxMDMsInNzIjp7IndpZHRoIjoxNzkyLCJoZWlnaHQiOjExMjB9LCJkZSI6IkRlc2t0b3AiLCJ0eiI6IkFzaWEvQ2FsY3V0dGEifQ.Oj3qnh--t06XO-foVmrMJCGqFfOBed09A-f7LZX5rtfBf4w1_RNRZ4F3on4TMPLonSa7GgzbcEfJS9G_amnleQ',
+  aid: auctionId,
+  as: 1627973484504,
+  auctionData: [ {
+    au: 'div-gpt-ad-mrec1',
+    auc: 'div-gpt-ad-mrec1',
+    aus: '300x250',
+    bidadv: 'appnexus',
+    bid: '14480e9832f2d2b',
+    inb: 0,
+    ito: 0,
+    ipwb: 0,
+    iwb: 0,
+    mt: 'display',
+  }, {
+    au: 'div-gpt-ad-mrec1',
+    auc: 'div-gpt-ad-mrec1',
+    aus: '250x250',
+    bidadv: 'appnexus',
+    bid: '14480e9832f2d2b',
+    inb: 0,
+    ito: 0,
+    ipwb: 0,
+    iwb: 0,
+    mt: 'display',
+  }]
+}
+let expectedBidWonArgs = {
+  visitor_data: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiIyNzFhOC0yYjg2LWY0YTQtZjU5YmMiLCJjaWQiOiJhc2MwMDAwMCIsInBpZCI6Ind3dy5sZXRzcnVuLmNvbSIsIm9zIjoiTWFjaW50b3NoIiwib3N2IjoxMC4xNTcsImJyIjoiQ2hyb21lIiwiYnJ2IjoxMDMsInNzIjp7IndpZHRoIjoxNzkyLCJoZWlnaHQiOjExMjB9LCJkZSI6IkRlc2t0b3AiLCJ0eiI6IkFzaWEvQ2FsY3V0dGEifQ.Oj3qnh--t06XO-foVmrMJCGqFfOBed09A-f7LZX5rtfBf4w1_RNRZ4F3on4TMPLonSa7GgzbcEfJS9G_amnleQ',
+  aid: auctionId,
+  as: '',
+  auctionData: [{
+    au: 'div-gpt-ad-mrec1',
+    auc: 'div-gpt-ad-mrec1',
+    aus: '300x250',
+    bid: '15c86b6c10d3746',
+    bidadv: 'appnexus',
+    br_pb_mg: 0.50,
+    br_tr: 114,
+    bradv: 'appnexus',
+    brid: '15c86b6c10d3746',
+    brs: '300x250',
+    cur: 'USD',
+    inb: 0,
+    ito: 0,
+    ipwb: 1,
+    iwb: 1,
+    mt: 'display',
+  }]
+}
+
+describe('byData Analytics Adapter ', () => {
+  beforeEach(() => {
+    sinon.stub(events, 'getEvents').returns([]);
+  });
+  afterEach(() => {
+    events.getEvents.restore();
+  });
+
+  describe('enableAnalytics ', function () {
+    beforeEach(() => {
+      sinon.spy(ascAdapter, 'track');
+    });
+    afterEach(() => {
+      ascAdapter.disableAnalytics();
+      ascAdapter.track.restore();
+    });
+    it('should init with correct options', function () {
+      ascAdapter.enableAnalytics(initOptions)
+      // Step 1: Initialize adapter
+      adapterManager.enableAnalytics({
+        provider: 'bydata',
+        options: initOptions
+      });
+      expect(ascAdapter.initOptions).to.have.property('clientId', 'asc00000');
+      expect(ascAdapter.initOptions).to.have.property('logFrequency', 1);
+    });
+  });
+
+  describe('track-events', function () {
+    ascAdapter.enableAnalytics(initOptions)
+    // Step 1: Initialize adapter
+    adapterManager.enableAnalytics({
+      provider: 'bydata',
+      options: initOptions
+    });
+    it('sends and formatted auction data ', function () {
+      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgs);
+      events.emit(constants.EVENTS.NO_BID, noBidArgs);
+      events.emit(constants.EVENTS.BID_WON, bidWonArgs)
+      var userToken = ascAdapter.getVisitorData(userData);
+      var newAuData = ascAdapter.dataProcess(auctionEndArgs);
+      var newBwData = ascAdapter.getBidWonData(bidWonArgs);
+      newAuData['visitor_data'] = userToken;
+      newBwData['visitor_data'] = userToken;
+      expect(newAuData).to.deep.equal(expectedDataArgs);
+      expect(newBwData).to.deep.equal(expectedBidWonArgs);
+    });
+  });
+});
diff --git a/test/spec/modules/byplayBidAdapter_spec.js b/test/spec/modules/byplayBidAdapter_spec.js
deleted file mode 100644
index 57aad403c4e..00000000000
--- a/test/spec/modules/byplayBidAdapter_spec.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/byplayBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import * as bidderFactory from 'src/adapters/bidderFactory.js';
-
-describe('byplayBidAdapter', () => {
-  describe('isBidRequestValid', () => {
-    describe('exist sectionId', () => {
-      const bid = {
-        'bidder': 'byplay',
-        'params': {
-          'sectionId': '11111'
-        },
-      };
-
-      it('should equal true', () => {
-        expect(spec.isBidRequestValid(bid)).to.equal(true);
-      });
-    });
-
-    describe('not exist sectionId', () => {
-      const bid = {
-        'bidder': 'byplay',
-        'params': {
-        },
-      };
-
-      it('should equal false', () => {
-        expect(spec.isBidRequestValid(bid)).to.equal(false);
-      });
-    });
-  });
-
-  describe('buildRequests', () => {
-    const bids = [
-      {
-        'bidder': 'byplay',
-        'bidId': '1234',
-        'params': {
-          'sectionId': '1111'
-        },
-      }
-    ];
-
-    const request = spec.buildRequests(bids);
-
-    it('should return POST', () => {
-      expect(request[0].method).to.equal('POST');
-    });
-
-    it('should return data', () => {
-      expect(request[0].data).to.equal('{"requestId":"1234","sectionId":"1111"}');
-    });
-  });
-
-  describe('interpretResponse', () => {
-    const serverResponse = {
-      body: {
-        'cpm': 1500,
-        'width': 320,
-        'height': 180,
-        'netRevenue': true,
-        'creativeId': '1',
-        'requestId': '209c1fb5ad88f5',
-        'vastXml': '<?xml version="1.0" ?><VAST></VAST>'
-      }
-    };
-
-    const bidderRequest = {
-      'method': 'GET',
-      'url': 'https://tasp0g98f2.execute-api.ap-northeast-1.amazonaws.com/v1/bidder',
-      'data': '{"requestId":"209c1fb5ad88f5","sectionId":7986}'
-    };
-
-    const result = spec.interpretResponse(serverResponse, bidderRequest);
-
-    it('should return Array', () => {
-      expect(Array.isArray(result)).to.equal(true);
-    });
-
-    it('should get the correct bid response', () => {
-      expect(result[0].cpm).to.equal(1500);
-      expect(result[0].creativeId).to.equal('1');
-      expect(result[0].width).to.equal(320);
-      expect(result[0].height).to.equal(180);
-      expect(result[0].mediaType).to.equal('video');
-      expect(result[0].netRevenue).to.equal(true);
-      expect(result[0].requestId).to.equal('209c1fb5ad88f5');
-      expect(result[0].ttl).to.equal(3000);
-      expect(result[0].vastXml).to.equal('<?xml version="1.0" ?><VAST></VAST>');
-    });
-  });
-});
diff --git a/test/spec/modules/c1xBidAdapter_spec.js b/test/spec/modules/c1xBidAdapter_spec.js
index 00741abda7a..315680cba26 100644
--- a/test/spec/modules/c1xBidAdapter_spec.js
+++ b/test/spec/modules/c1xBidAdapter_spec.js
@@ -1,49 +1,55 @@
 import { expect } from 'chai';
-import { c1xAdapter } from 'modules/c1xBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
+import { newBidder } from 'src/adapters/bidderFactory';
+import { c1xAdapter } from '../../../modules/c1xBidAdapter.js';
 
-const ENDPOINT = 'https://ht.c1exchange.com/ht';
+const ENDPOINT = 'https://hb-stg.c1exchange.com/ht';
 const BIDDER_CODE = 'c1x';
 
-describe('C1XAdapter', function () {
+describe('C1XAdapter', () => {
   const adapter = newBidder(c1xAdapter);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
   });
-
-  describe('isBidRequestValid', function () {
+  describe('isBidRequestValid', () => {
     let bid = {
       'bidder': BIDDER_CODE,
       'adUnitCode': 'adunit-code',
       'sizes': [[300, 250], [300, 600]],
       'params': {
-        'siteId': '9999'
+        'placementId': 'div-gpt-ad-1654594619717-0'
       }
     };
-
-    it('should return true when required params are passed', function () {
+    it('should return true when required params found', function () {
       expect(c1xAdapter.isBidRequestValid(bid)).to.equal(true);
     });
 
-    it('should return false when required params are not found', function () {
+    it('should return false when placementId not passed correctly', function () {
+      bid.params.placementId = undefined;
+      expect(c1xAdapter.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when require params are not passed', function () {
       let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'siteId': null
-      };
+      bid.params = {};
       expect(c1xAdapter.isBidRequestValid(bid)).to.equal(false);
     });
   });
-
-  describe('buildRequests', function () {
+  describe('buildRequests', () => {
     let bidRequests = [
       {
         'bidder': BIDDER_CODE,
         'params': {
-          'siteId': '9999'
+          'placementId': 'div-gpt-ad-1654594619717-0',
+          'dealId': '1233'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [300, 250], [300, 600]
+            ]
+          }
         },
         'adUnitCode': 'adunit-code',
         'sizes': [[300, 250], [300, 600]],
@@ -52,7 +58,6 @@ describe('C1XAdapter', function () {
         'auctionId': '1d1a030790a475',
       }
     ];
-
     const parseRequest = (data) => {
       const parsedData = '{"' + data.replace(/=|&/g, (foundChar) => {
         if (foundChar == '=') return '":"';
@@ -60,62 +65,64 @@ describe('C1XAdapter', function () {
       }) + '"}'
       return parsedData;
     };
-
-    it('sends bid request to ENDPOINT via GET', function () {
+    it('sends bid request to ENDPOINT via GET', () => {
       const request = c1xAdapter.buildRequests(bidRequests);
-      expect(request.url).to.equal(ENDPOINT);
-      expect(request.method).to.equal('GET');
+      expect(request[0].url).to.contain(ENDPOINT);
+      expect(request[0].method).to.equal('GET');
     });
-
-    it('should generate correct bid Id tag', function () {
-      const request = c1xAdapter.buildRequests(bidRequests);
+    it('should generate correct bid Id tag', () => {
+      const request = c1xAdapter.buildRequests(bidRequests)[0];
       expect(request.bids[0].adUnitCode).to.equal('adunit-code');
       expect(request.bids[0].bidId).to.equal('30b31c1838de1e');
     });
-
-    it('should convert params to proper form and attach to request', function () {
-      const request = c1xAdapter.buildRequests(bidRequests);
+    it('should convert params to proper form and attach to request', () => {
+      const request = c1xAdapter.buildRequests(bidRequests)[0];
       const originalPayload = parseRequest(request.data);
       const payloadObj = JSON.parse(originalPayload);
       expect(payloadObj.adunits).to.equal('1');
       expect(payloadObj.a1s).to.equal('300x250,300x600');
       expect(payloadObj.a1).to.equal('adunit-code');
-      expect(payloadObj.site).to.equal('9999');
+      expect(payloadObj.a1d).to.equal('1233');
     });
-
-    it('should convert floor price to proper form and attach to request', function () {
+    it('should convert floor price to proper form and attach to request', () => {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
           'params': {
-            'siteId': '9999',
+            'placementId': 'div-gpt-ad-1654594619717-0',
+            'dealId': '1233',
             'floorPriceMap': {
               '300x250': 4.35
             }
           }
         });
-      const request = c1xAdapter.buildRequests([bidRequest]);
+      const request = c1xAdapter.buildRequests([bidRequest])[0];
       const originalPayload = parseRequest(request.data);
       const payloadObj = JSON.parse(originalPayload);
       expect(payloadObj.a1p).to.equal('4.35');
     });
-
-    it('should convert pageurl to proper form and attach to request', function () {
+    it('should convert pageurl to proper form and attach to request', () => {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
           'params': {
-            'siteId': '9999',
-            'pageurl': 'https://c1exchange.com/'
+            'placementId': 'div-gpt-ad-1654594619717-0',
+            'dealId': '1233',
+            'pageurl': 'http://c1exchange.com/'
           }
         });
-      const request = c1xAdapter.buildRequests([bidRequest]);
+
+      let bidderRequest = {
+        'bidderCode': 'c1x'
+      }
+      bidderRequest.bids = bidRequests;
+      const request = c1xAdapter.buildRequests([bidRequest], bidderRequest)[0];
       const originalPayload = parseRequest(request.data);
       const payloadObj = JSON.parse(originalPayload);
-      expect(payloadObj.pageurl).to.equal('https://c1exchange.com/');
+      expect(payloadObj.pageurl).to.equal('http://c1exchange.com/');
     });
 
-    it('should convert GDPR Consent to proper form and attach to request', function () {
+    it('should convert GDPR Consent to proper form and attach to request', () => {
       let consentString = 'BOP2gFWOQIFovABABAENBGAAAAAAMw';
       let bidderRequest = {
         'bidderCode': 'c1x',
@@ -126,7 +133,7 @@ describe('C1XAdapter', function () {
       }
       bidderRequest.bids = bidRequests;
 
-      const request = c1xAdapter.buildRequests(bidRequests, bidderRequest);
+      const request = c1xAdapter.buildRequests(bidRequests, bidderRequest)[0];
       const originalPayload = parseRequest(request.data);
       const payloadObj = JSON.parse(originalPayload);
       expect(payloadObj['consent_string']).to.equal('BOP2gFWOQIFovABABAENBGAAAAAAMw');
@@ -134,7 +141,7 @@ describe('C1XAdapter', function () {
     });
   });
 
-  describe('interpretResponse', function () {
+  describe('interpretResponse', () => {
     let response = {
       'bid': true,
       'cpm': 1.5,
@@ -145,8 +152,7 @@ describe('C1XAdapter', function () {
       'adId': 'c1x-test',
       'bidType': 'GROSS_BID'
     };
-
-    it('should get correct bid response', function () {
+    it('should get correct bid response', () => {
       let expectedResponse = [
         {
           width: 300,
@@ -162,14 +168,15 @@ describe('C1XAdapter', function () {
       ];
       let bidderRequest = {};
       bidderRequest.bids = [
-        { adUnitCode: 'c1x-test',
-          bidId: 'yyyy' }
+        {
+          adUnitCode: 'c1x-test',
+          bidId: 'yyyy'
+        }
       ];
       let result = c1xAdapter.interpretResponse({ body: [response] }, bidderRequest);
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
     });
-
-    it('handles nobid responses', function () {
+    it('handles nobid responses', () => {
       let response = {
         bid: false,
         adId: 'c1x-test'
diff --git a/test/spec/modules/captifyRtdProvider_spec.js b/test/spec/modules/captifyRtdProvider_spec.js
new file mode 100644
index 00000000000..2e1052e000f
--- /dev/null
+++ b/test/spec/modules/captifyRtdProvider_spec.js
@@ -0,0 +1,253 @@
+import {addSegmentData, captifySubmodule, getMatchingBidders, setCaptifyTargeting} from 'modules/captifyRtdProvider.js';
+import {server} from 'test/mocks/xhr.js';
+import {config} from 'src/config.js';
+import {deepAccess} from '../../../src/utils';
+
+const responseHeader = {'Content-Type': 'application/json'};
+const defaultRequestUrl = 'https://live-classification.cpx.to/prebid-segments';
+
+describe('captifyRtdProvider', function () {
+  describe('init function', function () {
+    it('successfully instantiates, when configured properly', function () {
+      const config = {
+        params: {
+          pubId: 123456,
+          bidders: ['appnexus'],
+        }
+      };
+      expect(captifySubmodule.init(config, null)).to.equal(true);
+    });
+
+    it('return false on init, when config is invalid', function () {
+      const config = {
+        params: {}
+      };
+      expect(captifySubmodule.init(config, null)).to.equal(false);
+      expect(captifySubmodule.init(null, null)).to.equal(false);
+    });
+
+    it('return false on init, when pubId is absent', function () {
+      const config = {
+        params: {
+          bidders: ['appnexus'],
+        }
+      };
+      expect(captifySubmodule.init(config, null)).to.equal(false);
+      expect(captifySubmodule.init(null, null)).to.equal(false);
+    });
+
+    it('return false on init, when bidders is empty array', function () {
+      const config = {
+        params: {
+          bidders: [],
+          pubId: 123,
+        }
+      };
+      expect(captifySubmodule.init(config, null)).to.equal(false);
+      expect(captifySubmodule.init(null, null)).to.equal(false);
+    });
+  });
+
+  describe('addSegmentData function', function () {
+    it('adds segment data', function () {
+      config.resetConfig();
+
+      let data = {
+        xandr: [111111, 222222],
+      };
+
+      addSegmentData(['appnexus'], data);
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.eql(data['xandr']);
+    });
+  });
+
+  describe('getMatchingBidders function', function () {
+    it('returns only bidders that used within adUnits', function () {
+      const moduleConfig = {
+        params: {
+          pubId: 123,
+          bidders: ['appnexus', 'pubmatic'],
+        }
+      };
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [{
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370
+            }
+          }]
+        }]
+      };
+
+      let matchedBidders = getMatchingBidders(moduleConfig, reqBidsConfigObj);
+      expect(matchedBidders).to.eql(['appnexus']);
+    });
+
+    it('return empty result, when there are no bidders configured for adUnits', function () {
+      const moduleConfig = {
+        params: {
+          pubId: 123,
+          bidders: ['pubmatic'],
+        }
+      };
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: []
+        }]
+      };
+      expect(getMatchingBidders(moduleConfig, reqBidsConfigObj)).to.be.empty;
+    });
+
+    it('return empty result, when there are no bidders matched', function () {
+      const moduleConfig = {
+        params: {
+          pubId: 123,
+          bidders: ['pubmatic'],
+        }
+      };
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [{
+            params: {
+              bidder: 'appnexus',
+              placementId: 13144370,
+            }
+          }]
+        }]
+      };
+      expect(getMatchingBidders(moduleConfig, reqBidsConfigObj)).to.be.empty;
+    });
+
+    it('return empty result, when there are no adUnits with bidders', function () {
+      const moduleConfig = {
+        params: {
+          pubId: 123,
+          bidders: ['pubmatic'],
+        }
+      };
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [{
+            params: {
+              placementId: 13144370,
+            }
+          }]
+        }]
+      };
+      expect(getMatchingBidders(moduleConfig, reqBidsConfigObj)).to.be.empty;
+    });
+  });
+
+  describe('integration test with mock live-classification response', function () {
+    const moduleConfig = {
+      params: {
+        pubId: 123456,
+        bidders: ['appnexus'],
+      }
+    };
+
+    const reqBidsConfigObj = {
+      adUnits: [{
+        bids: [{
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370
+          }
+        }, {
+          bidder: 'other'
+        }]
+      }]
+    };
+
+    const expectedUrlParam = 'http://localhost:9876/context.html';
+
+    it('gets data from async request and adds segment data', function () {
+      config.resetConfig();
+      let data = {xandr: [111111, 222222]};
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      let request = server.requests[0];
+      let requestBody = JSON.parse(server.requests[0].requestBody);
+      expect(request.url).to.be.eq(defaultRequestUrl);
+      expect(requestBody['pubId']).to.eq(moduleConfig.params.pubId);
+      expect(requestBody['url']).to.eq(expectedUrlParam);
+      request.respond(200, responseHeader, JSON.stringify(data));
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.eql(data['xandr']);
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('do not send classification request, if no matching adUnits on page', function () {
+      config.resetConfig();
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [
+            {bidder: 'pubmatic'}
+          ]
+        }]
+      };
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      expect(server.requests).to.be.empty;
+    });
+
+    it('gets data from async request and adds segment data, using URL from config', function () {
+      config.resetConfig();
+      let data = {xandr: [111111, 222222]};
+      const callbackSpy = sinon.spy();
+      const testUrl = 'http://my-test-server.com/path';
+      const conf = {
+        params: {
+          url: testUrl,
+          pubId: 123456,
+          bidders: ['appnexus'],
+        }
+      };
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, conf, {});
+      let request = server.requests[0];
+      let requestBody = JSON.parse(server.requests[0].requestBody);
+      expect(request.url).to.be.eq(testUrl);
+      expect(requestBody['pubId']).to.eq(conf.params.pubId);
+      expect(requestBody['url']).to.eq(expectedUrlParam);
+      request.respond(200, responseHeader, JSON.stringify(data));
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.eql(data['xandr']);
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('do not set anything, in case server responded with 202', function () {
+      config.resetConfig();
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      let request = server.requests[0];
+      let requestBody = JSON.parse(server.requests[0].requestBody);
+      expect(request.url).to.be.eq(defaultRequestUrl);
+      expect(requestBody['pubId']).to.eq(moduleConfig.params.pubId);
+      expect(requestBody['url']).to.eq(expectedUrlParam);
+      request.respond(202, responseHeader, '');
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.be.undefined;
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('do not set anything, in case server responded with error', function () {
+      config.resetConfig();
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      let request = server.requests[0];
+      expect(request.url).to.be.eq(defaultRequestUrl);
+      request.respond(500, null, '');
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.be.undefined;
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('do not set anything, in case request error', function () {
+      config.resetConfig();
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      let request = server.requests[0];
+      expect(request.url).to.be.eq(defaultRequestUrl);
+      request.abort('test error');
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.be.undefined;
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/carodaBidAdapter_spec.js b/test/spec/modules/carodaBidAdapter_spec.js
new file mode 100644
index 00000000000..f575e31e85d
--- /dev/null
+++ b/test/spec/modules/carodaBidAdapter_spec.js
@@ -0,0 +1,494 @@
+// jshint esversion: 6, es3: false, node: true
+import { assert } from 'chai';
+import { spec } from 'modules/carodaBidAdapter.js';
+import { config } from 'src/config.js';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+describe('Caroda adapter', function () {
+  let bids = [];
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'caroda',
+      'params': {
+        'ctok': 'adf232eef344'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      assert(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        ctok: 'adf232eef344',
+        placementId: 'someplacement'
+      };
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return false when required params are missing', function () {
+      bid.params = {};
+      assert.isFalse(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        placementId: 'someplacement'
+      };
+      assert.isFalse(spec.isBidRequestValid(bid));
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+      delete window.carodaPageViewId;
+    });
+    it('should send request with minimal structure', function () {
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: {
+          'ctok': 'adf232eef344'
+        }
+      }];
+      window.top.carodaPageViewId = 12345;
+      const request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0];
+      assert.equal(request.method, 'POST');
+      assert.equal(request.url, 'https://prebid.caroda.io/api/hb?entry_id=12345');
+      assert.equal(request.options, undefined);
+      const data = JSON.parse(request.data)
+      assert.equal(data.ctok, 'adf232eef344');
+      assert.ok(data.site);
+      assert.ok(data.hb_version);
+      assert.ok(data.device);
+      assert.equal(data.price_type, 'net');
+    });
+
+    it('should add test to request, if test is set in parameters', function () {
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: {
+          'ctok': 'adf232eef344',
+          'test': 1
+        }
+      }];
+      window.top.carodaPageViewId = 12345;
+      const request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0];
+      const data = JSON.parse(request.data)
+      assert.equal(data.test, 1);
+    });
+
+    it('should add placement_id to request when available', function () {
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: {
+          'ctok': 'adf232eef344',
+          'placementId': 'opzafe342f'
+        }
+      }];
+      window.top.carodaPageViewId = 12345;
+      const request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0];
+      const data = JSON.parse(request.data);
+      assert.equal(data.placement_id, 'opzafe342f');
+    });
+
+    it('should send info about device', function () {
+      config.setConfig({
+        device: { w: 100, h: 100 }
+      });
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: { 'ctok': 'adf232eef344' }
+      }];
+      const data = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+      assert.equal(data.device.ua, navigator.userAgent);
+      assert.equal(data.device.w, 100);
+      assert.equal(data.device.h, 100);
+    });
+
+    it('should pass supply chain object', function () {
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: {},
+        schain: {
+          validation: 'strict',
+          config: {
+            ver: '1.0'
+          }
+        }
+      }];
+
+      let data = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+      assert.deepEqual(data.schain, {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      });
+    });
+
+    it('should send app info', function () {
+      config.setConfig({
+        app: { id: 'appid' },
+      });
+      const ortb2 = { app: { name: 'appname' } };
+      let validBidRequests = [{
+        bid_id: 'bidId',
+        params: { mid: '1000' },
+        ortb2
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, ortb2 })[0].data);
+      assert.equal(request.app.id, 'appid');
+      assert.equal(request.app.name, 'appname');
+      assert.equal(request.site, undefined);
+    });
+
+    it('should send info about the site', function () {
+      config.setConfig({
+        site: {
+          id: '123123',
+          publisher: {
+            domain: 'publisher.domain.com'
+          }
+        },
+      });
+      const ortb2 = {
+        site: {
+          publisher: {
+            name: 'publisher\'s name'
+          }
+        }
+      };
+      let validBidRequests = [{
+        bid_id: 'bidId',
+        params: { mid: '1000' },
+        ortb2
+      }];
+      let refererInfo = { page: 'page' };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo, ortb2 })[0].data);
+
+      assert.deepEqual(request.site, {
+        page: refererInfo.page,
+        publisher: {
+          domain: 'publisher.domain.com',
+          name: 'publisher\'s name'
+        },
+        id: '123123'
+      });
+    });
+
+    it('should send correct priceType value', function () {
+      let validBidRequests = [{
+        bid_id: 'bidId',
+        params: { priceType: 'gross' }
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+
+      assert.equal(request.price_type, 'gross');
+    });
+
+    it('should send currency if defined', function () {
+      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
+      let validBidRequests = [{ params: {} }];
+      let refererInfo = { page: 'page' };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo })[0].data);
+
+      assert.deepEqual(request.currency, 'EUR');
+    });
+
+    it('should pass extended ids', function () {
+      let validBidRequests = [{
+        bid_id: 'bidId',
+        params: {},
+        userIdAsEids: createEidsArray({
+          tdid: 'TTD_ID_FROM_USER_ID_MODULE',
+          pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
+        })
+      }];
+
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+      assert.deepEqual(request.user.eids, [
+        { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
+        { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
+      ]);
+    });
+
+    describe('user privacy', function () {
+      it('should send GDPR Consent data to adform if gdprApplies', function () {
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.gdpr_consent, bidderRequest.gdprConsent.consentString);
+        assert.equal(request.privacy.gdpr, bidderRequest.gdprConsent.gdprApplies);
+        assert.equal(typeof request.privacy.gdpr, 'number');
+      });
+
+      it('should send gdpr as number', function () {
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(typeof request.privacy.gdpr, 'number');
+        assert.equal(request.privacy.gdpr, 1);
+      });
+
+      it('should send CCPA Consent data', function () {
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { uspConsent: '1YA-', refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.us_privacy, '1YA-');
+
+        bidderRequest = { uspConsent: '1YA-', gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.us_privacy, '1YA-');
+        assert.equal(request.privacy.gdpr_consent, 'consentDataString');
+        assert.equal(request.privacy.gdpr, 1);
+      });
+
+      it('should not set coppa when coppa is not provided or is set to false', function () {
+        config.setConfig({
+        });
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.coppa, undefined);
+
+        config.setConfig({
+          coppa: false
+        });
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.coppa, undefined);
+      });
+      it('should set coppa to 1 when coppa is provided with value true', function () {
+        config.setConfig({
+          coppa: true
+        });
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+
+        assert.equal(request.privacy.coppa, 1);
+      });
+    });
+
+    describe('bids', function () {
+      it('should be able to handle multiple bids', function () {
+        const validBidRequests = [{
+          bid_id: 'bidId',
+          params: { ctok: 'ctok1' }
+        }, {
+          bid_id: 'bidId2',
+          params: { ctok: 'ctok2' }
+        }];
+        const request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } });
+        assert.equal(request.length, 2);
+        const data = request.map(r => JSON.parse(r.data));
+        assert.equal(data[0].ctok, 'ctok1');
+        assert.equal(data[1].ctok, 'ctok2');
+      });
+
+      describe('price floors', function () {
+        it('should not add if floors module not configured', function () {
+          const validBidRequests = [{ bid_id: 'bidId', params: {ctok: 'ctok1'}, mediaTypes: {video: {}} }];
+          const imp = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, undefined);
+        });
+
+        it('should not add if floor price not defined', function () {
+          const validBidRequests = [ getBidWithFloor() ];
+          const imp = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'EUR');
+        });
+
+        it('should request floor price in adserver currency', function () {
+          config.setConfig({ currency: { adServerCurrency: 'DKK' } });
+          const validBidRequests = [ getBidWithFloor() ];
+          const imp = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'DKK');
+        });
+
+        it('should add correct floor values', function () {
+          const expectedFloors = [ 1, 1.3, 0.5 ];
+          const validBidRequests = expectedFloors.map(getBidWithFloor);
+          const imps = spec
+            .buildRequests(validBidRequests, { refererInfo: { page: 'page' } })
+            .map(r => JSON.parse(r.data));
+          expectedFloors.forEach((floor, index) => {
+            assert.equal(imps[index].bidfloor, floor);
+            assert.equal(imps[index].bidfloorcur, 'EUR');
+          });
+        });
+
+        function getBidWithFloor(floor) {
+          return {
+            params: { ctok: 'ctok1' },
+            mediaTypes: { video: {} },
+            getFloor: ({ currency }) => {
+              return {
+                currency: currency,
+                floor
+              };
+            }
+          };
+        }
+      });
+
+      describe('multiple media types', function () {
+        it('should use all configured media types for bidding', function () {
+          const validBidRequests = [{
+            bid_id: 'bidId',
+            params: { ctok: 'ctok1' },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              },
+              video: {}
+            }
+          }, {
+            bid_id: 'bidId2',
+            params: { ctok: 'ctok1' },
+            mediaTypes: {
+              video: {},
+              native: {}
+            }
+          }];
+          const [ first, second ] = spec
+            .buildRequests(validBidRequests, { refererInfo: { page: 'page' } })
+            .map(r => JSON.parse(r.data));
+
+          assert.ok(first.banner);
+          assert.ok(first.video);
+
+          assert.ok(second.video);
+          assert.equal(second.banner, undefined);
+        });
+      });
+
+      describe('banner', function () {
+        it('should convert sizes to openrtb format', function () {
+          const validBidRequests = [{
+            bid_id: 'bidId',
+            params: { mid: 1000 },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              }
+            }
+          }];
+          const { banner } = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.deepEqual(banner, {
+            format: [ { w: 100, h: 100 }, { w: 200, h: 300 } ]
+          });
+        });
+      });
+
+      describe('video', function () {
+        it('should pass video mediatype config', function () {
+          const validBidRequests = [{
+            bid_id: 'bidId',
+            params: { mid: 1000 },
+            mediaTypes: {
+              video: {
+                playerSize: [640, 480],
+                context: 'outstream',
+                mimes: ['video/mp4']
+              }
+            }
+          }];
+          const { video } = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.deepEqual(video, {
+            playerSize: [640, 480],
+            context: 'outstream',
+            mimes: ['video/mp4']
+          });
+        });
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return if no body in response', function () {
+      const serverResponse = {};
+      const bidRequest = {};
+      assert.ok(!spec.interpretResponse(serverResponse, bidRequest));
+    });
+    const basicBidResponse = () => ({
+      bid_id: 'bidId',
+      cpm: 10,
+      creative_id: '12345',
+      currency: 'CZK',
+      w: 100,
+      h: 100,
+      ad: '<script....',
+      placement_id: 'opzafe23'
+    });
+    const bidRequest = () => ({
+      data: {},
+      bids: [
+        {
+          bid_id: 'bidId1',
+          params: { ctok: 'ctok1' }
+        },
+        {
+          bid_id: 'bidId2',
+          params: { ctok: 'ctok2' }
+        }
+      ]
+    });
+    it('should parse a typical ok response', function () {
+      const serverResponse = {
+        body: { ok: { value: JSON.stringify([basicBidResponse()]) } }
+      };
+      bids = spec.interpretResponse(serverResponse, bidRequest());
+      assert.equal(bids.length, 1);
+      assert.deepEqual(bids[0],
+        {
+          requestId: 'bidId',
+          cpm: 10,
+          creativeId: '12345',
+          ttl: 300,
+          netRevenue: true,
+          currency: 'CZK',
+          width: 100,
+          height: 100,
+          meta: {
+            advertiserDomains: []
+          },
+          ad: '<script....',
+          placementId: 'opzafe23'
+        });
+    });
+    it('should add adserverTargeting', function () {
+      const serverResponse = {
+        body: {
+          ok: {
+            value: JSON.stringify([{
+              ...basicBidResponse(),
+              adserver_targeting: { tag: 'value' }
+            }])
+          }
+        }
+      };
+      bids = spec.interpretResponse(serverResponse, bidRequest());
+      assert.deepEqual(bids[0].adserverTargeting, { tag: 'value' });
+    });
+    it('should add adomains', function () {
+      const serverResponse = {
+        body: {
+          ok: {
+            value: JSON.stringify([{
+              ...basicBidResponse(),
+              adomain: ['a.b.c']
+            }])
+          }
+        }
+      };
+      bids = spec.interpretResponse(serverResponse, bidRequest());
+      assert.deepEqual(bids[0].meta.advertiserDomains, ['a.b.c']);
+    });
+  });
+});
diff --git a/test/spec/modules/ccxBidAdapter_spec.js b/test/spec/modules/ccxBidAdapter_spec.js
index f14612629b1..d346a14d38a 100644
--- a/test/spec/modules/ccxBidAdapter_spec.js
+++ b/test/spec/modules/ccxBidAdapter_spec.js
@@ -337,7 +337,10 @@ describe('ccxAdapter', function () {
           netRevenue: false,
           ttl: 5,
           currency: 'PLN',
-          ad: '<script>TEST</script>'
+          ad: '<script>TEST</script>',
+          meta: {
+            advertiserDomains: ['clickonometrics.com']
+          }
         },
         {
           requestId: '2e56e1af51a5d8',
@@ -348,7 +351,10 @@ describe('ccxAdapter', function () {
           netRevenue: false,
           ttl: 5,
           currency: 'PLN',
-          vastXml: '<xml>'
+          vastXml: '<xml>',
+          meta: {
+            advertiserDomains: ['clickonometrics.com']
+          }
         }
       ];
       expect(spec.interpretResponse({body: response})).to.deep.have.same.members(bidResponses);
@@ -366,7 +372,10 @@ describe('ccxAdapter', function () {
           netRevenue: false,
           ttl: 5,
           currency: 'PLN',
-          ad: '<script>TEST</script>'
+          ad: '<script>TEST</script>',
+          meta: {
+            advertiserDomains: ['clickonometrics.com']
+          }
         }
       ];
       expect(spec.interpretResponse({body: response})).to.deep.have.same.members(bidResponses);
@@ -425,4 +434,58 @@ describe('ccxAdapter', function () {
       expect(spec.getUserSyncs(syncOptions, [{body: response}])).to.be.empty;
     });
   });
+  describe('mediaTypesVideoParams', function () {
+    it('Valid video mediaTypes', function () {
+      let bids = [
+        {
+          adUnitCode: 'video',
+          auctionId: '0b9de793-8eda-481e-a548-c187d58b28d9',
+          bidId: '3u94t90ut39tt3t',
+          bidder: 'ccx',
+          bidderRequestId: '23ur20r239r2r',
+          mediaTypes: {
+            video: {
+              playerSize: [[640, 480]],
+              protocols: [2, 3, 5, 6],
+              mimes: ['video/mp4', 'video/x-flv'],
+              playbackmethod: [1, 2, 3, 4],
+              skip: 1,
+              skipafter: 5
+            }
+          },
+          params: {
+            placementId: 608
+          },
+          sizes: [[640, 480]],
+          transactionId: 'aefddd38-cfa0-48ab-8bdd-325de4bab5f9'
+        }
+      ];
+
+      let imps = [
+        {
+          video: {
+            w: 640,
+            h: 480,
+            protocols: [2, 3, 5, 6],
+            mimes: ['video/mp4', 'video/x-flv'],
+            playbackmethod: [1, 2, 3, 4],
+            skip: 1,
+            skipafter: 5
+          },
+          id: '3u94t90ut39tt3t',
+          secure: 1,
+          ext: {
+            pid: 608
+          }
+        }
+      ];
+
+      let bidsClone = utils.deepClone(bids);
+
+      let response = spec.buildRequests(bidsClone, {'bids': bidsClone});
+      let data = JSON.parse(response.data);
+
+      expect(data.imp).to.deep.have.same.members(imps);
+    });
+  });
 });
diff --git a/test/spec/modules/cedatoBidAdapter_spec.js b/test/spec/modules/cedatoBidAdapter_spec.js
deleted file mode 100644
index a7f4875afff..00000000000
--- a/test/spec/modules/cedatoBidAdapter_spec.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/cedatoBidAdapter.js';
-
-describe('the cedato adapter', function () {
-  function getValidBidObject() {
-    return {
-      bidId: '2f4a613a702b6c',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250]]
-        }
-      },
-      params: {
-        player_id: 1450133326,
-      }
-    };
-  };
-
-  describe('isBidRequestValid', function() {
-    var bid;
-
-    beforeEach(function() {
-      bid = getValidBidObject();
-    });
-
-    it('should fail validation if the bid isn\'t defined or not an object', function() {
-      var result = spec.isBidRequestValid();
-
-      expect(result).to.equal(false);
-
-      result = spec.isBidRequestValid('not an object');
-
-      expect(result).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function() {
-    var bid, bidRequestObj;
-
-    beforeEach(function() {
-      bid = getValidBidObject();
-      bidRequestObj = {
-        refererInfo: {referer: 'prebid.js'},
-        gdprConsent: {
-          consentString: 'test-string',
-          gdprApplies: true
-        },
-        uspConsent: '1NYN'
-      };
-    });
-
-    it('should build a very basic request', function() {
-      var [request] = spec.buildRequests([bid], bidRequestObj);
-      expect(request.method).to.equal('POST');
-    });
-
-    it('should pass gdpr and usp strings to server', function() {
-      var [request] = spec.buildRequests([bid], bidRequestObj);
-      var payload = JSON.parse(request.data);
-      expect(payload.gdpr_consent).to.not.be.undefined;
-      expect(payload.gdpr_consent.consent_string).to.equal(bidRequestObj.gdprConsent.consentString);
-      expect(payload.gdpr_consent.consent_required).to.equal(bidRequestObj.gdprConsent.gdprApplies);
-      expect(payload.us_privacy).to.equal(bidRequestObj.uspConsent);
-    });
-  });
-
-  describe('interpretResponse', function() {
-    var bid, serverResponse, bidderRequest;
-
-    beforeEach(function() {
-      bid = getValidBidObject();
-      serverResponse = {
-        body: {
-          bidid: '0.36157306192821',
-          seatbid: [
-            {
-              seat: '0',
-              bid: [{
-                gp: {
-                  'negative': 0.496954,
-                  'positive': 0.503046,
-                  'class': '0'
-                },
-                id: '0.75549202124378',
-                adomain: 'cedato.com',
-                uuid: bid.bidId,
-                crid: '1450133326',
-                adm: "<div id=\"cedato-unit\"></div>\n<script src=\"https://p.cedatoplayer.com/zplayer.js?p=952030718&cb=874433&d=localhost\" type=\"text/javascript\"></script>\n<img src='https://h.cedatoplayer.com/hbwon?cb=874433&p=0.1&pi=952030718&w=300&h=250&s=952030718&d=localhost&u=a4657bf1-c373-4676-b79a-0d9de0129e38&ab=2' width=\"1\" height=\"1\"/>\n",
-                h: 250,
-                w: 300,
-                price: '0.1'
-              }]
-            }
-          ],
-          cur: 'USD'
-        }
-      };
-      bidderRequest = {
-        bids: [bid]
-      };
-    });
-
-    it('should return an array of bid responses', function() {
-      var responses = spec.interpretResponse(serverResponse, {bidderRequest});
-      expect(responses).to.be.an('array').with.length(1);
-    });
-  });
-
-  describe('getUserSyncs', function() {
-    var bid;
-
-    beforeEach(function() {
-      bid = getValidBidObject();
-    });
-
-    it('should sync with iframe', function() {
-      var syncs = spec.getUserSyncs({ iframeEnabled: true }, null, {
-        consentString: '',
-        gdprApplies: true
-      });
-
-      expect(syncs).to.be.an('array').with.length(1);
-      expect(syncs[0].type).to.equal('iframe');
-    });
-
-    it('should sync with image', function() {
-      var syncs = spec.getUserSyncs({ pixelEnabled: true });
-
-      expect(syncs).to.be.an('array').with.length(1);
-      expect(syncs[0].type).to.equal('image');
-    });
-  });
-});
diff --git a/test/spec/modules/chtnwBidAdapter_spec.js b/test/spec/modules/chtnwBidAdapter_spec.js
new file mode 100644
index 00000000000..3875de6c4fa
--- /dev/null
+++ b/test/spec/modules/chtnwBidAdapter_spec.js
@@ -0,0 +1,105 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/chtnwBidAdapter.js';
+import * as utils from '../../../src/utils.js';
+
+describe('ChtnwAdapter', function () {
+  describe('isBidRequestValid', function () {
+    const bid = {
+      code: 'adunit-code',
+      bidder: 'chtnw',
+      params: {
+        placementId: '38EL412LO82XR9O6'
+      },
+      sizes: [
+        [300, 250]
+      ],
+    };
+
+    it('should return true when required params found', function () {
+      const bidRequest = utils.deepClone(bid);
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return false when required params are missing', function () {
+      const bidRequest = utils.deepClone(bid);
+      delete bidRequest.params;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [{
+      code: 'adunit-code',
+      bidder: 'chtnw',
+      params: {
+        placementId: '38EL412LO82XR9O6'
+      },
+      sizes: [
+        [300, 250]
+      ],
+    }];
+
+    const request = spec.buildRequests(bidRequests);
+
+    it('Returns POST method', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns general data valid', function () {
+      let data = request.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('bids');
+      expect(data).to.have.property('uuid');
+      expect(data).to.have.property('device');
+      expect(data).to.have.property('site');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let responseBody = [{
+      'requestId': 'test',
+      'cpm': 0.5,
+      'currency': 'USD',
+      'width': 300,
+      'height': 250,
+      'netRevenue': true,
+      'ttl': 60,
+      'creativeId': 'AD',
+      'ad': '<h1>AD<h1>',
+      'mediaType': 'banner',
+      'meta': {
+        'advertiserDomains': [
+          'www.example.com'
+        ]
+      }
+    }];
+
+    it('handles empty bid response', function () {
+      let response = {
+        body: responseBody
+      };
+      let result = spec.interpretResponse(response);
+      expect(result.length).to.not.equal(0);
+      expect(result[0].meta.advertiserDomains).to.be.an('array');
+    });
+
+    it('handles empty bid response', function () {
+      let response = {
+        body: []
+      };
+      let result = spec.interpretResponse(response);
+      expect(result.length).to.equal(0);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should register type is image', function () {
+      const syncOptions = {
+        'pixelEnabled': 'true'
+      }
+      let userSync = spec.getUserSyncs(syncOptions);
+      expect(userSync[0].type).to.equal('image');
+      expect(userSync[0].url).to.have.string('ssp');
+    });
+  });
+});
diff --git a/test/spec/modules/cleanioRtdProvider_spec.js b/test/spec/modules/cleanioRtdProvider_spec.js
new file mode 100644
index 00000000000..8453b633906
--- /dev/null
+++ b/test/spec/modules/cleanioRtdProvider_spec.js
@@ -0,0 +1,211 @@
+import * as utils from '../../../src/utils.js';
+import * as hook from '../../../src/hook.js'
+import * as events from '../../../src/events.js';
+import CONSTANTS from '../../../src/constants.json';
+
+import { __TEST__ } from '../../../modules/cleanioRtdProvider.js';
+
+const {
+  readConfig,
+  ConfigError,
+  pageInitStepPreloadScript,
+  pageInitStepProtectPage,
+  bidWrapStepAugmentHtml,
+  bidWrapStepProtectByWrapping,
+  beforeInit,
+} = __TEST__;
+
+sinon.assert.expose(chai.assert, { prefix: 'sinon' });
+
+const fakeScriptURL = 'https://example.com/script.js';
+
+function makeFakeBidResponse() {
+  return {
+    ad: '<body>hello ad</body>',
+    bidderCode: 'BIDDER',
+    creativeId: 'CREATIVE',
+    cpm: 1.23,
+  };
+}
+
+describe('clean.io RTD module', function () {
+  describe('readConfig()', function() {
+    it('should throw ConfigError on invalid configurations', function() {
+      expect(() => readConfig({})).to.throw(ConfigError);
+      expect(() => readConfig({ params: {} })).to.throw(ConfigError);
+      expect(() => readConfig({ params: { protectionMode: 'bids' } })).to.throw(ConfigError);
+      expect(() => readConfig({ params: { cdnUrl: 'abc' } })).to.throw(ConfigError);
+      expect(() => readConfig({ params: { cdnUrl: 'abc', protectionMode: 'bids' } })).to.throw(ConfigError);
+      expect(() => readConfig({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: '123' } })).to.throw(ConfigError);
+    });
+
+    it('should accept valid configurations', function() {
+      expect(() => readConfig({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'full' } })).to.not.throw();
+      expect(() => readConfig({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'bids' } })).to.not.throw();
+      expect(() => readConfig({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'bids-nowait' } })).to.not.throw();
+    });
+  });
+
+  describe('Module initialization step', function() {
+    let insertElementStub;
+    beforeEach(function() {
+      insertElementStub = sinon.stub(utils, 'insertElement');
+    });
+    afterEach(function() {
+      utils.insertElement.restore();
+    });
+
+    it('pageInitStepPreloadScript() should insert link/preload element', function() {
+      pageInitStepPreloadScript(fakeScriptURL);
+
+      sinon.assert.calledOnce(insertElementStub);
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.tagName === 'LINK'));
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.rel === 'preload'));
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.as === 'script'));
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.href === fakeScriptURL));
+    });
+
+    it('pageInitStepProtectPage() should insert script element', function() {
+      pageInitStepProtectPage(fakeScriptURL);
+
+      sinon.assert.calledOnce(insertElementStub);
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.tagName === 'SCRIPT'));
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.type === 'text/javascript'));
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.src === fakeScriptURL));
+    });
+  });
+
+  function ensurePrependToBidResponse(fakeBidResponse) {
+    expect(fakeBidResponse).to.have.own.property('ad').which.is.a('string');
+    expect(fakeBidResponse.ad).to.contain('<!-- pbad://creativeId=CREATIVE&bidderCode=BIDDER&cpm=1.23 -->');
+  }
+
+  function ensureWrapBidResponse(fakeBidResponse, scriptUrl) {
+    expect(fakeBidResponse).to.have.own.property('ad').which.is.a('string');
+    expect(fakeBidResponse.ad).to.contain(`src="${scriptUrl}"`);
+    expect(fakeBidResponse.ad).to.contain('agent.put(ad)');
+  }
+
+  describe('Bid processing step', function() {
+    it('bidWrapStepAugmentHtml() should prepend bid-specific information in a comment', function() {
+      const fakeBidResponse = makeFakeBidResponse();
+      bidWrapStepAugmentHtml(fakeBidResponse);
+      ensurePrependToBidResponse(fakeBidResponse);
+    });
+
+    it('bidWrapStepProtectByWrapping() should wrap payload into a script tag', function() {
+      const fakeBidResponse = makeFakeBidResponse();
+      bidWrapStepProtectByWrapping(fakeScriptURL, 0, fakeBidResponse);
+      ensureWrapBidResponse(fakeBidResponse, fakeScriptURL);
+    });
+  });
+
+  describe('Sumbodule execution', function() {
+    let submoduleStub;
+    let insertElementStub;
+    beforeEach(function () {
+      submoduleStub = sinon.stub(hook, 'submodule');
+      insertElementStub = sinon.stub(utils, 'insertElement');
+    });
+    afterEach(function () {
+      utils.insertElement.restore();
+      submoduleStub.restore();
+    });
+
+    function getModule() {
+      beforeInit();
+
+      expect(submoduleStub.calledOnceWith('realTimeData')).to.equal(true);
+
+      const registeredSubmoduleDefinition = submoduleStub.getCall(0).args[1];
+      expect(registeredSubmoduleDefinition).to.be.an('object');
+      expect(registeredSubmoduleDefinition).to.have.own.property('name', 'clean.io');
+      expect(registeredSubmoduleDefinition).to.have.own.property('init').that.is.a('function');
+      expect(registeredSubmoduleDefinition).to.have.own.property('onBidResponseEvent').that.is.a('function');
+
+      return registeredSubmoduleDefinition;
+    }
+
+    it('should register clean.io RTD submodule provider', function () {
+      getModule();
+    });
+
+    it('should refuse initialization with incorrect parameters', function () {
+      const { init } = getModule();
+      expect(init({ params: { cdnUrl: 'abc', protectionMode: 'full' } }, {})).to.equal(false); // too short distribution name
+      sinon.assert.notCalled(insertElementStub);
+    });
+
+    it('should iniitalize in full (page) protection mode', function () {
+      const { init, onBidResponseEvent } = getModule();
+      expect(init({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'full' } }, {})).to.equal(true);
+      sinon.assert.calledOnce(insertElementStub);
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.tagName === 'SCRIPT'));
+
+      const fakeBidResponse = makeFakeBidResponse();
+      onBidResponseEvent(fakeBidResponse, {}, {});
+      ensurePrependToBidResponse(fakeBidResponse);
+    });
+
+    it('should iniitalize in bids (frame) protection mode', function () {
+      const { init, onBidResponseEvent } = getModule();
+      expect(init({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'bids' } }, {})).to.equal(true);
+      sinon.assert.calledOnce(insertElementStub);
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.tagName === 'LINK'));
+
+      const fakeBidResponse = makeFakeBidResponse();
+      onBidResponseEvent(fakeBidResponse, {}, {});
+      ensureWrapBidResponse(fakeBidResponse, 'https://abc1234567890.cloudfront.net/script.js');
+    });
+
+    it('should respect preload status in bids-nowait protection mode', function () {
+      const { init, onBidResponseEvent } = getModule();
+      expect(init({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'bids-nowait' } }, {})).to.equal(true);
+      sinon.assert.calledOnce(insertElementStub);
+      sinon.assert.calledWith(insertElementStub, sinon.match(elem => elem.tagName === 'LINK'));
+      const preloadLink = insertElementStub.getCall(0).args[0];
+      expect(preloadLink).to.have.property('onload').which.is.a('function');
+      expect(preloadLink).to.have.property('onerror').which.is.a('function');
+
+      const fakeBidResponse1 = makeFakeBidResponse();
+      onBidResponseEvent(fakeBidResponse1, {}, {});
+      ensurePrependToBidResponse(fakeBidResponse1);
+
+      // Simulate successful preloading
+      preloadLink.onload();
+
+      const fakeBidResponse2 = makeFakeBidResponse();
+      onBidResponseEvent(fakeBidResponse2, {}, {});
+      ensureWrapBidResponse(fakeBidResponse2, 'https://abc1234567890.cloudfront.net/script.js');
+
+      // Simulate error
+      preloadLink.onerror();
+
+      // Now we should fallback to just prepending
+      const fakeBidResponse3 = makeFakeBidResponse();
+      onBidResponseEvent(fakeBidResponse3, {}, {});
+      ensurePrependToBidResponse(fakeBidResponse3);
+    });
+
+    it('should send billable event per bid won event', function () {
+      const { init } = getModule();
+      expect(init({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'full' } }, {})).to.equal(true);
+
+      const eventCounter = { registerCleanioBillingEvent: function() {} };
+      sinon.spy(eventCounter, 'registerCleanioBillingEvent');
+
+      events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, (evt) => {
+        if (evt.vendor === 'clean.io') {
+          eventCounter.registerCleanioBillingEvent()
+        }
+      });
+
+      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+
+      sinon.assert.callCount(eventCounter.registerCleanioBillingEvent, 4);
+    });
+  });
+});
diff --git a/test/spec/modules/cleanmedianetBidAdapter_spec.js b/test/spec/modules/cleanmedianetBidAdapter_spec.js
index 5438f6c8701..8c2ac34350b 100644
--- a/test/spec/modules/cleanmedianetBidAdapter_spec.js
+++ b/test/spec/modules/cleanmedianetBidAdapter_spec.js
@@ -31,22 +31,6 @@ describe('CleanmedianetAdapter', function () {
       ).to.equal(true);
     });
 
-    it('should validate bid floor', function() {
-      expect(
-        spec.isBidRequestValid({ params: { supplyPartnerId: '123' } })
-      ).to.equal(true); // bidfloor has a default
-      expect(
-        spec.isBidRequestValid({
-          params: { supplyPartnerId: '123', bidfloor: '123' }
-        })
-      ).to.equal(false);
-      expect(
-        spec.isBidRequestValid({
-          params: { supplyPartnerId: '123', bidfloor: 0.1 }
-        })
-      ).to.equal(true);
-    });
-
     it('should validate adpos', function() {
       expect(
         spec.isBidRequestValid({ params: { supplyPartnerId: '123' } })
@@ -101,7 +85,7 @@ describe('CleanmedianetAdapter', function () {
       },
       sizes: [[300, 250], [300, 600]],
       transactionId: 'a123456789',
-      refererInfo: { referer: 'https://examplereferer.com' },
+      refererInfo: { referer: 'https://examplereferer.com', domain: 'examplereferer.com' },
       gdprConsent: {
         consentString: 'some string',
         gdprApplies: true
@@ -130,11 +114,16 @@ describe('CleanmedianetAdapter', function () {
 
     it('builds request correctly', function() {
       let bidRequest2 = utils.deepClone(bidRequest);
-      bidRequest2.refererInfo.referer = 'https://www.test.com/page.html';
+      Object.assign(bidRequest2.refererInfo, {
+        page: 'https://www.test.com/page.html',
+        domain: 'test.com',
+        ref: 'https://referer.com'
+      })
+
       let response = spec.buildRequests([bidRequest], bidRequest2)[0];
-      expect(response.data.site.domain).to.equal('www.test.com');
+      expect(response.data.site.domain).to.equal('test.com');
       expect(response.data.site.page).to.equal('https://www.test.com/page.html');
-      expect(response.data.site.ref).to.equal('https://www.test.com/page.html');
+      expect(response.data.site.ref).to.equal('https://referer.com');
       expect(response.data.imp.length).to.equal(1);
       expect(response.data.imp[0].id).to.equal(bidRequest.transactionId);
       expect(response.data.imp[0].instl).to.equal(0);
@@ -159,15 +148,6 @@ describe('CleanmedianetAdapter', function () {
       expect(response.data.imp[0].instl).to.equal(
         bidRequestWithInstlEquals0.params.instl
       );
-      const bidRequestWithBidfloorEquals1 = utils.deepClone(bidRequest);
-      bidRequestWithBidfloorEquals1.params.bidfloor = 1;
-      response = spec.buildRequests(
-        [bidRequestWithBidfloorEquals1],
-        bidRequest2
-      )[0];
-      expect(response.data.imp[0].bidfloor).to.equal(
-        bidRequestWithBidfloorEquals1.params.bidfloor
-      );
     });
 
     it('builds request banner object correctly', function() {
diff --git a/test/spec/modules/clickforceBidAdapter_spec.js b/test/spec/modules/clickforceBidAdapter_spec.js
index dad00f94641..c4c4d77e954 100644
--- a/test/spec/modules/clickforceBidAdapter_spec.js
+++ b/test/spec/modules/clickforceBidAdapter_spec.js
@@ -75,7 +75,10 @@ describe('ClickforceAdapter', function () {
       'currency': 'USD',
       'ttl': 60,
       'netRevenue': true,
-      'zone': '6682'
+      'zone': '6682',
+      'adomain': [
+        'www.example.com'
+      ]
     }];
 
     let response1 = [{
@@ -116,6 +119,11 @@ describe('ClickforceAdapter', function () {
       'ttl': 60,
       'ad': '<!-- test creative -->',
       'mediaType': 'banner',
+      'meta': {
+        'advertiserDomains': [
+          'www.example.com'
+        ]
+      }
     }];
 
     let expectedResponse1 = [{
@@ -144,6 +152,9 @@ describe('ClickforceAdapter', function () {
         },
         'clickUrl': 'cu',
         'impressionTrackers': ['iu']
+      },
+      'meta': {
+        'advertiserDomains': []
       }
     }];
 
diff --git a/test/spec/modules/clicktripzBidAdapter_spec.js b/test/spec/modules/clicktripzBidAdapter_spec.js
deleted file mode 100644
index fed94811c4e..00000000000
--- a/test/spec/modules/clicktripzBidAdapter_spec.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/clicktripzBidAdapter.js';
-
-const ENDPOINT_URL = 'https://www.clicktripz.com/x/prebid/v1';
-
-describe('clicktripzBidAdapter', function () {
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'clicktripz',
-      'params': {
-        placementId: 'testPlacementId',
-        siteId: 'testSiteId'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '1234asdf1234',
-      'bidderRequestId': '1234asdf1234asdf',
-      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf120'
-    };
-
-    let bid2 = {
-      'bidder': 'clicktripz',
-      'params': {
-        placementId: 'testPlacementId'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '1234asdf1234',
-      'bidderRequestId': '1234asdf1234asdf',
-      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf120'
-    };
-
-    let bid3 = {
-      'bidder': 'clicktripz',
-      'params': {
-        siteId: 'testSiteId'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '1234asdf1234',
-      'bidderRequestId': '1234asdf1234asdf',
-      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf120'
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are NOT found', function () {
-      expect(spec.isBidRequestValid(bid2)).to.equal(false);
-      expect(spec.isBidRequestValid(bid3)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let validBidRequests = [{
-      'bidder': 'clicktripz',
-      'params': {
-        placementId: 'testPlacementId',
-        siteId: 'testSiteId'
-      },
-      'sizes': [
-        [300, 250],
-        [300, 300]
-      ],
-      'bidId': '23beaa6af6cdde',
-      'bidderRequestId': '19c0c1efdf37e7',
-      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
-    }, {
-      'bidder': 'clicktripz',
-      'params': {
-        placementId: 'testPlacementId2',
-        siteId: 'testSiteId2'
-      },
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '25beaa6af6cdde',
-      'bidderRequestId': '19c0c1efdf37e7',
-      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
-    }];
-
-    const request = spec.buildRequests(validBidRequests);
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('sends bid request to our endpoint at the correct URL', function () {
-      expect(request.url).to.equal(ENDPOINT_URL);
-    });
-    it('sends bid request to our endpoint at the correct URL', function () {
-      expect(request.url).to.equal(ENDPOINT_URL);
-    });
-
-    it('transforms sizes into an array of strings. Pairs of concatenated sizes joined with an x', function () {
-      expect(request.data[0].sizes.toString()).to.equal('300x250,300x300');
-    });
-    it('transforms sizes into an array of strings. Pairs of concatenated sizes joined with an x', function () {
-      expect(request.data[1].sizes.toString()).to.equal('300x250');
-    });
-
-    it('includes bidId, siteId, and placementId in payload', function () {
-      expect(request.data[0].bidId).to.equal('23beaa6af6cdde');
-      expect(request.data[0].siteId).to.equal('testSiteId');
-      expect(request.data[0].placementId).to.equal('testPlacementId');
-    });
-    it('includes bidId, siteId, and placementId in payload', function () {
-      expect(request.data[1].bidId).to.equal('25beaa6af6cdde');
-      expect(request.data[1].siteId).to.equal('testSiteId2');
-      expect(request.data[1].placementId).to.equal('testPlacementId2');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let serverResponse = {
-      body: [{
-        'bidId': 'bid-request-id',
-        'ttl': 120,
-        'netRevenue': true,
-        'size': '300x200',
-        'currency': 'USD',
-        'adUrl': 'https://www.clicktripz.com/n3/crane/v0/render?t=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXlsb2FkIjoiaHR0cHM6XC9cL3d3dy5jbGlja3RyaXB6LmNvbVwvY2xpY2sucGhwP2NhbXBhaWduSUQ9MTkxNTYmcHJlQ2hlY2tlZD0xJnB1Ymxpc2hlcklEPTM2MCZzZWFyY2hLZXk9N2M5MzQ0NzhlM2M1NTc3Y2EyN2ZmN2Y1NTg5N2NkMzkmc2VhcmNoRGlzcGxheVR5cGU9MSZkaXNwbGF5VHlwZT00JmNyZWF0aXZlVHlwZT1zaW5nbGUmaXNQb3BVbmRlcj0wJnBvc2l0aW9uPTEmdHlwZT0xJmNpdHk9TWFkcmlkJTJDK1NwYWluJmNoZWNrSW5EYXRlPTAzJTJGMDElMkYyMDIwJmNoZWNrT3V0RGF0ZT0wMyUyRjA1JTJGMjAyMCZndWVzdHM9MiZyb29tcz0xIn0.WBDGYr1qfkSvOuK02VpMW3iAua1E02jjDGDViFc2kaE',
-        'creativeId': '25ef9876abc5681f153',
-        'cpm': 50
-      }]
-    };
-    it('should get the correct bid response', function () {
-      let expectedResponse = [{
-        'requestId': 'bid-request-id',
-        'cpm': 50,
-        'netRevenue': true,
-        'width': '300',
-        'height': '200',
-        'creativeId': '25ef9876abc5681f153',
-        'currency': 'USD',
-        'adUrl': 'https://www.clicktripz.com/n3/crane/v0/render?t=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXlsb2FkIjoiaHR0cHM6XC9cL3d3dy5jbGlja3RyaXB6LmNvbVwvY2xpY2sucGhwP2NhbXBhaWduSUQ9MTkxNTYmcHJlQ2hlY2tlZD0xJnB1Ymxpc2hlcklEPTM2MCZzZWFyY2hLZXk9N2M5MzQ0NzhlM2M1NTc3Y2EyN2ZmN2Y1NTg5N2NkMzkmc2VhcmNoRGlzcGxheVR5cGU9MSZkaXNwbGF5VHlwZT00JmNyZWF0aXZlVHlwZT1zaW5nbGUmaXNQb3BVbmRlcj0wJnBvc2l0aW9uPTEmdHlwZT0xJmNpdHk9TWFkcmlkJTJDK1NwYWluJmNoZWNrSW5EYXRlPTAzJTJGMDElMkYyMDIwJmNoZWNrT3V0RGF0ZT0wMyUyRjA1JTJGMjAyMCZndWVzdHM9MiZyb29tcz0xIn0.WBDGYr1qfkSvOuK02VpMW3iAua1E02jjDGDViFc2kaE',
-        'ttl': 120
-      }];
-      let result = spec.interpretResponse(serverResponse);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-  });
-});
diff --git a/test/spec/modules/codefuelBidAdapter_spec.js b/test/spec/modules/codefuelBidAdapter_spec.js
new file mode 100644
index 00000000000..354cbe63ffa
--- /dev/null
+++ b/test/spec/modules/codefuelBidAdapter_spec.js
@@ -0,0 +1,317 @@
+import {expect} from 'chai';
+import {spec} from 'modules/codefuelBidAdapter.js';
+import {config} from 'src/config.js';
+import {server} from 'test/mocks/xhr';
+
+const USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/92.0.4515.159 Safari/537.36';
+const DEFAULT_USER_AGENT = window.navigator.userAgent;
+const setUADefault = () => { window.navigator.__defineGetter__('userAgent', function () { return DEFAULT_USER_AGENT }) };
+const setUAMock = () => { window.navigator.__defineGetter__('userAgent', function () { return USER_AGENT }) };
+
+describe('Codefuel Adapter', function () {
+  describe('Bid request and response', function () {
+    const commonBidRequest = {
+      bidder: 'codefuel',
+      params: {
+        publisher: {
+          id: 'publisher-id'
+        },
+      },
+      bidId: '2d6815a92ba1ba',
+      auctionId: '12043683-3254-4f74-8934-f941b085579e',
+    }
+    const nativeBidRequestParams = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [
+            120,
+            100
+          ],
+          sendId: true
+        },
+        title: {
+          required: true,
+          sendId: true
+        },
+        sponsoredBy: {
+          required: false
+        }
+      },
+    }
+
+    const displayBidRequestParams = {
+      sizes: [
+        [
+          300,
+          250
+        ]
+      ]
+    }
+
+    describe('isBidRequestValid', function () {
+      before(() => {
+        config.setConfig({
+          codefuel: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      it('should fail when bid is invalid', function () {
+        const bid = {
+          bidder: 'codefuel',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should not succeed when bid contains native params', function () {
+        const bid = {
+          bidder: 'codefuel',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should not succeed when bid contains only sizes', function () {
+        const bid = {
+          bidder: 'codefuel',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...displayBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should fail if publisher id is not set', function () {
+        const bid = {
+          bidder: 'codefuel',
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+
+      it('should fail if bidder url is not set', function () {
+        const bid = {
+          bidder: 'codefuel',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+    })
+
+    describe('buildRequests', function () {
+      before(() => {
+        setUAMock()
+        config.setConfig({
+          codefuel: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+        setUADefault()
+      })
+
+      const commonBidderRequest = {
+        timeout: 500,
+        auctionId: '12043683-3254-4f74-8934-f941b085579e',
+        refererInfo: {
+          page: 'https://example.com/',
+          domain: 'example.com'
+        }
+      }
+
+      it('should build display request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...displayBidRequestParams,
+        }
+        const expectedData = {
+          cur: [
+            'USD'
+          ],
+          device: {
+            devicetype: 2,
+            ua: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/92.0.4515.159 Safari/537.36'
+          },
+          id: '12043683-3254-4f74-8934-f941b085579e',
+          imp: [
+            {
+              banner: {
+                format: [
+                  {
+                    h: 250,
+                    w: 300
+                  }
+                ]
+              },
+              id: '1'
+            }
+          ],
+          site: {
+            domain: 'example.com',
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          source: {
+            fd: 1
+          },
+          tmax: 500
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://ai-p-codefuel-ds-rtb-us-east-1-k8s.seccint.com/prebid')
+        expect(res.data).to.deep.equal(expectedData)
+      })
+
+      it('should pass bidder timeout', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          timeout: 500
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = res.data
+        expect(resData.tmax).to.equal(500)
+      });
+    })
+
+    describe('interpretResponse', function () {
+      it('should return empty array if no valid bids', function () {
+        const res = spec.interpretResponse({}, [])
+        expect(res).to.be.an('array').that.is.empty
+      });
+
+      it('should interpret display response', function () {
+        const serverResponse = {
+          body: {
+            id: '6b2eedc8-8ff5-46ef-adcf-e701b508943e',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: 'd90fe7fa-28d7-11eb-8ce4-462a842a7cf9',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '<div>ad</div>',
+                    adomain: [
+                      'example.com'
+                    ],
+                    cid: '3865084',
+                    crid: '29998660',
+                    cat: [
+                      'IAB10-2'
+                    ],
+                    w: 300,
+                    h: 250
+                  }
+                ],
+                seat: 'acc-6536'
+              }
+            ],
+            bidid: 'd90fe7fa-28d7-11eb-8ce4-13d94bfa26f9',
+            cur: 'USD'
+          }
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...displayBidRequestParams
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '29998660',
+            ttl: 360,
+            netRevenue: true,
+            currency: 'USD',
+            mediaType: 'banner',
+            ad: '<div>ad</div>',
+            width: 300,
+            height: 250,
+            meta: {'advertiserDomains': []}
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+    })
+  })
+
+  describe('getUserSyncs', function () {
+    const usersyncUrl = 'https://usersync-url.com';
+    beforeEach(() => {
+      config.setConfig({
+        codefuel: {
+          usersyncUrl: usersyncUrl,
+        }
+      }
+      )
+    })
+    after(() => {
+      config.resetConfig()
+    })
+
+    it('should not return user sync if pixel enabled with codefuel config', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+
+    it('should not return user sync if pixel disabled', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: false})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+
+    it('should not return user sync if url is not set', function () {
+      config.resetConfig()
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+
+    it('should not pass GDPR consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, undefined)).to.to.be.an('array').that.is.empty
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: false, consentString: 'foo'}, undefined)).to.be.an('array').that.is.empty
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: undefined}, undefined)).to.be.an('array').that.is.empty
+    });
+
+    it('should not pass US consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, '1NYN')).to.be.an('array').that.is.empty
+    });
+
+    it('should pass GDPR and US consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, '1NYN')).to.be.an('array').that.is.empty
+    });
+  })
+})
diff --git a/test/spec/modules/cointrafficBidAdapter_spec.js b/test/spec/modules/cointrafficBidAdapter_spec.js
new file mode 100644
index 00000000000..24570de5083
--- /dev/null
+++ b/test/spec/modules/cointrafficBidAdapter_spec.js
@@ -0,0 +1,277 @@
+import { expect } from 'chai';
+import { spec } from 'modules/cointrafficBidAdapter.js';
+import { config } from 'src/config.js'
+import * as utils from 'src/utils.js'
+
+const ENDPOINT_URL = 'https://apps-pbd.ctengine.io/pb/tmp';
+
+describe('cointrafficBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let bid = {
+      bidder: 'cointraffic',
+      params: {
+        placementId: 'testPlacementId'
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [
+        [300, 250]
+      ],
+      bidId: 'bidId12345',
+      bidderRequestId: 'bidderRequestId12345',
+      auctionId: 'auctionId12345'
+    };
+
+    it('should return true where required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        bidder: 'cointraffic',
+        params: {
+          placementId: 'testPlacementId'
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [
+          [300, 250]
+        ],
+        bidId: 'bidId12345',
+        bidderRequestId: 'bidderRequestId12345',
+        auctionId: 'auctionId12345'
+      },
+      {
+        bidder: 'cointraffic',
+        params: {
+          placementId: 'testPlacementId'
+        },
+        adUnitCode: 'adunit-code2',
+        sizes: [
+          [300, 250]
+        ],
+        bidId: 'bidId67890"',
+        bidderRequestId: 'bidderRequestId67890',
+        auctionId: 'auctionId12345'
+      }
+    ];
+
+    let bidderRequests = {
+      refererInfo: {
+        numIframes: 0,
+        reachedTop: true,
+        referer: 'https://example.com',
+        stack: [
+          'https://example.com'
+        ]
+      }
+    };
+
+    it('replaces currency with EUR if there is no currency provided', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0].data.currency).to.equal('EUR');
+      expect(request[1].data.currency).to.equal('EUR');
+    });
+
+    it('replaces currency with EUR if there is no currency provided', function () {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'currency.bidderCurrencyDefault.cointraffic' ? 'USD' : 'EUR'
+      );
+
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0].data.currency).to.equal('USD');
+      expect(request[1].data.currency).to.equal('USD');
+
+      getConfigStub.restore();
+    });
+
+    it('throws an error if currency provided in params is not allowed', function () {
+      const utilsMock = sinon.mock(utils).expects('logError').twice()
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'currency.bidderCurrencyDefault.cointraffic' ? 'BTC' : 'EUR'
+      );
+
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0]).to.undefined;
+      expect(request[1]).to.undefined;
+
+      utilsMock.restore()
+      getConfigStub.restore();
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0].method).to.equal('POST');
+      expect(request[1].method).to.equal('POST');
+    });
+
+    it('attaches source and version to endpoint URL as query params', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+      expect(request[1].url).to.equal(ENDPOINT_URL);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should get the correct bid response', function () {
+      let bidRequest = [{
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: {
+          placementId: 'testPlacementId',
+          device: 'desktop',
+          currency: 'EUR',
+          sizes: ['300x250'],
+          bidId: 'bidId12345',
+          referer: 'www.example.com'
+        }
+      }];
+
+      let serverResponse = {
+        body: {
+          requestId: 'bidId12345',
+          cpm: 3.9,
+          currency: 'EUR',
+          netRevenue: true,
+          width: 300,
+          height: 250,
+          creativeId: 'creativeId12345',
+          ttl: 90,
+          ad: '<html><h3>I am an ad</h3></html> ',
+          mediaType: 'banner',
+          adomain: ['test.com']
+        }
+      };
+
+      let expectedResponse = [{
+        requestId: 'bidId12345',
+        cpm: 3.9,
+        currency: 'EUR',
+        netRevenue: true,
+        width: 300,
+        height: 250,
+        creativeId: 'creativeId12345',
+        ttl: 90,
+        ad: '<html><h3>I am an ad</h3></html>',
+        meta: {
+          mediaType: 'banner',
+          advertiserDomains: [
+            'test.com',
+          ]
+        }
+      }];
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+    });
+
+    it('should get the correct bid response with different currency', function () {
+      let bidRequest = [{
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: {
+          placementId: 'testPlacementId',
+          device: 'desktop',
+          currency: 'USD',
+          sizes: ['300x250'],
+          bidId: 'bidId12345',
+          referer: 'www.example.com'
+        }
+      }];
+
+      let serverResponse = {
+        body: {
+          requestId: 'bidId12345',
+          cpm: 3.9,
+          currency: 'USD',
+          netRevenue: true,
+          width: 300,
+          height: 250,
+          creativeId: 'creativeId12345',
+          ttl: 90,
+          ad: '<html><h3>I am an ad</h3></html> ',
+          mediaType: 'banner',
+          adomain: ['test.com']
+        }
+      };
+
+      let expectedResponse = [{
+        requestId: 'bidId12345',
+        cpm: 3.9,
+        currency: 'USD',
+        netRevenue: true,
+        width: 300,
+        height: 250,
+        creativeId: 'creativeId12345',
+        ttl: 90,
+        ad: '<html><h3>I am an ad</h3></html>',
+        meta: {
+          mediaType: 'banner',
+          advertiserDomains: [
+            'test.com',
+          ]
+        }
+      }];
+
+      const getConfigStub = sinon.stub(config, 'getConfig').returns('USD');
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+
+      getConfigStub.restore();
+    });
+
+    it('should get empty bid response requested currency is not available', function () {
+      let bidRequest = [{
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: {
+          placementId: 'testPlacementId',
+          device: 'desktop',
+          currency: 'BTC',
+          sizes: ['300x250'],
+          bidId: 'bidId12345',
+          referer: 'www.example.com'
+        }
+      }];
+
+      let serverResponse = {};
+
+      let expectedResponse = [];
+
+      const getConfigStub = sinon.stub(config, 'getConfig').returns('BTC');
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+
+      getConfigStub.restore();
+    });
+
+    it('should get empty bid response if no server response', function () {
+      let bidRequest = [{
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: {
+          placementId: 'testPlacementId',
+          device: 'desktop',
+          currency: 'EUR',
+          sizes: ['300x250'],
+          bidId: 'bidId12345',
+          referer: 'www.example.com'
+        }
+      }];
+
+      let serverResponse = {};
+
+      let expectedResponse = [];
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+    });
+  });
+});
diff --git a/test/spec/modules/coinzillaBidAdapter_spec.js b/test/spec/modules/coinzillaBidAdapter_spec.js
index a3438b80126..01f22722abf 100644
--- a/test/spec/modules/coinzillaBidAdapter_spec.js
+++ b/test/spec/modules/coinzillaBidAdapter_spec.js
@@ -85,7 +85,6 @@ describe('coinzillaBidAdapter', function () {
           'bidId': 'bidId123',
           'referer': 'www.example.com'
         }
-
       }
     ];
     let serverResponse = {
@@ -98,7 +97,9 @@ describe('coinzillaBidAdapter', function () {
         'requestId': 'bidId123',
         'width': 300,
         'height': 250,
-        'netRevenue': true
+        'netRevenue': true,
+        'mediaType': 'banner',
+        'advertiserDomain': ['none.com']
       }
     };
     it('should get the correct bid response', function () {
@@ -111,7 +112,9 @@ describe('coinzillaBidAdapter', function () {
         'currency': 'EUR',
         'netRevenue': true,
         'ttl': 3000,
-        'ad': '<html><h3>I am an ad</h3></html>'
+        'ad': '<html><h3>I am an ad</h3></html>',
+        'mediaType': 'banner',
+        'meta': {'advertiserDomains': ['none.com']}
       }];
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
       expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
diff --git a/test/spec/modules/collectcentBidAdapter_spec.js b/test/spec/modules/collectcentBidAdapter_spec.js
deleted file mode 100644
index 0ab83a8024b..00000000000
--- a/test/spec/modules/collectcentBidAdapter_spec.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/collectcentBidAdapter.js';
-
-describe('Collectcent', function () {
-  let bid = {
-    bidId: '2dd581a2b6281d',
-    bidder: 'collectcent',
-    bidderRequestId: '145e1d6a7837c9',
-    params: {
-      placementId: 123,
-      traffic: 'banner'
-    },
-    placementCode: 'placement_0',
-    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-    sizes: [[300, 250]],
-    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
-  };
-
-  describe('isBidRequestValid', function () {
-    it('Should return true when placementId can be cast to a number', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
-    });
-    it('Should return false when placementId is not a number', function () {
-      bid.params.placementId = 'aaa';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-    });
-  });
-
-  describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid]);
-    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://publishers.motionspots.com/?c=o&m=multi');
-    });
-    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', 'secure', 'host', 'page', 'placements');
-      expect(data.deviceWidth).to.be.a('number');
-      expect(data.deviceHeight).to.be.a('number');
-      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', 'bidId', 'traffic', 'sizes');
-        expect(placement.placementId).to.be.a('number');
-        expect(placement.bidId).to.be.a('string');
-        expect(placement.traffic).to.be.a('string');
-        expect(placement.sizes).to.be.an('array');
-      }
-    });
-    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 () {
-    let resObject = {
-      body: [ {
-        requestId: '123',
-        mediaType: 'banner',
-        cpm: 0.3,
-        width: 320,
-        height: 50,
-        ad: '<h1>Hello ad</h1>',
-        ttl: 1000,
-        creativeId: '123asd',
-        netRevenue: true,
-        currency: 'USD'
-      } ]
-    };
-    let serverResponses = spec.interpretResponse(resObject);
-    it('Returns an array of valid server responses if response object is valid', function () {
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType');
-        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.ad).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');
-      }
-      it('Returns an empty array if invalid response is passed', function () {
-        serverResponses = spec.interpretResponse('invalid_response');
-        expect(serverResponses).to.be.an('array').that.is.empty;
-      });
-    });
-  });
-
-  describe('getUserSyncs', function () {
-    let userSync = spec.getUserSyncs();
-    it('Returns valid URL and `', 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('image');
-      expect(userSync[0].url).to.be.equal('https://publishers.motionspots.com/?c=o&m=cookie');
-    });
-  });
-});
diff --git a/test/spec/modules/colombiaBidAdapter_spec.js b/test/spec/modules/colombiaBidAdapter_spec.js
deleted file mode 100644
index 4e80c6b1d9d..00000000000
--- a/test/spec/modules/colombiaBidAdapter_spec.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/colombiaBidAdapter';
-import { newBidder } from 'src/adapters/bidderFactory';
-
-const HOST_NAME = document.location.protocol + '//' + window.location.host;
-const ENDPOINT = 'https://ade.clmbtech.com/cde/prebid.htm';
-
-describe('colombiaBidAdapter', function() {
-  const adapter = newBidder(spec);
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'colombia',
-      'params': {
-        placementId: '307466'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '23beaa6af6cdde',
-      'bidderRequestId': '19c0c1efdf37e7',
-      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when placementId not passed correctly', function () {
-      bid.params.placementId = '';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when require params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        'bidder': 'colombia',
-        'params': {
-          placementId: '307466'
-        },
-        'adUnitCode': 'adunit-code1',
-        'sizes': [
-          [300, 250]
-        ],
-        'bidId': '23beaa6af6cdde',
-        'bidderRequestId': '19c0c1efdf37e7',
-        'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
-      },
-      {
-        'bidder': 'colombia',
-        'params': {
-          placementId: '307466'
-        },
-        'adUnitCode': 'adunit-code2',
-        'sizes': [
-          [300, 250]
-        ],
-        'bidId': '382091349b149f"',
-        'bidderRequestId': '"1f9c98192de251"',
-        'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
-      }
-    ];
-
-    const request = spec.buildRequests(bidRequests);
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request[0].method).to.equal('POST');
-      expect(request[1].method).to.equal('POST');
-    });
-
-    it('attaches source and version to endpoint URL as query params', function () {
-      expect(request[0].url).to.equal(ENDPOINT);
-      expect(request[1].url).to.equal(ENDPOINT);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let bidRequest = [
-      {
-        'method': 'POST',
-        'url': 'https://ade.clmbtech.com/cde/prebid.htm',
-        'data': {
-          'v': 'hb1',
-          'p': '307466',
-          'w': '300',
-          'h': '250',
-          'cb': 12892917383,
-          'r': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836',
-          'uid': '23beaa6af6cdde',
-          't': 'i',
-        }
-      }
-    ];
-
-    let serverResponse = {
-      body: {
-        'ad': '<div>This is test case for colombia adapter</div> ',
-        'cpm': 3.14,
-        'creativeId': '6b958110-612c-4b03-b6a9-7436c9f746dc-1sk24',
-        'currency': 'USD',
-        'uid': '23beaa6af6cdde',
-        'width': 728,
-        'height': 90,
-        'netRevenue': true,
-        'ttl': 600,
-        'dealid': '',
-        'referrer': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836'
-      }
-    };
-
-    it('should get the correct bid response', function () {
-      let expectedResponse = [{
-        'requestId': '23beaa6af6cdde',
-        'cpm': 3.14,
-        'width': 728,
-        'height': 90,
-        'creativeId': '6b958110-612c-4b03-b6a9-7436c9f746dc-1sk24',
-        'dealId': '',
-        'currency': 'USD',
-        'netRevenue': true,
-        'ttl': 300,
-        'referrer': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836',
-        'ad': '<div>This is test case for colombia adapter</div>'
-      }];
-      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
-
-    it('handles empty bid response', function () {
-      let response = {
-        body: {
-          'uid': '23beaa6af6cdde',
-          'height': 0,
-          'creativeId': '',
-          'statusMessage': 'Bid returned empty or error response',
-          'width': 0,
-          'cpm': 0
-        }
-      };
-      let result = spec.interpretResponse(response, bidRequest[0]);
-      expect(result.length).to.equal(0);
-    });
-  });
-});
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index df9bdcbd47b..adb9137d892 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -1,5 +1,5 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/colossussspBidAdapter.js';
+import { expect } from 'chai';
+import { spec } from '../../../modules/colossussspBidAdapter.js';
 
 describe('ColossussspAdapter', function () {
   let bid = {
@@ -7,7 +7,8 @@ describe('ColossussspAdapter', function () {
     bidder: 'colossusssp',
     bidderRequestId: '145e1d6a7837c9',
     params: {
-      placement_id: 0
+      placement_id: 0,
+      group_id: 0
     },
     placementCode: 'placementid_0',
     auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
@@ -16,6 +17,13 @@ describe('ColossussspAdapter', function () {
         sizes: [[300, 250]]
       }
     },
+    ortb2Imp: {
+      ext: {
+        data: {
+          pbadslot: '/19968336/prebid_cache_video_adunit'
+        }
+      }
+    },
     transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
     schain: {
       ver: '1.0',
@@ -40,10 +48,101 @@ describe('ColossussspAdapter', function () {
     auctionStart: 1472239426000,
     timeout: 5000,
     uspConsent: '1YN-',
+    gdprConsent: {
+      consentString: 'xxx',
+      gdprApplies: 1
+    },
     refererInfo: {
       referer: 'http://www.example.com',
       reachedTop: true,
     },
+    ortb2: {
+      app: {
+        name: 'myappname',
+        keywords: 'power tools, drills',
+        content: {
+          data: [
+            {
+              name: 'www.dataprovider1.com',
+              ext: {
+                segtax: 6
+              },
+              segment: [
+                {
+                  id: '687'
+                },
+                {
+                  id: '123'
+                }
+              ]
+            },
+            {
+              name: 'www.dataprovider1.com',
+              ext: {
+                segtax: 7
+              },
+              segment: [
+                {
+                  id: '456'
+                },
+                {
+                  id: '789'
+                }
+              ]
+            }
+          ]
+        }
+      },
+      site: {
+        name: 'example',
+        domain: 'page.example.com',
+        cat: ['IAB2'],
+        sectioncat: ['IAB2-2'],
+        pagecat: ['IAB2-2'],
+        page: 'https://page.example.com/here.html',
+        ref: 'https://ref.example.com',
+        keywords: 'power tools, drills',
+        search: 'drill',
+        content: {
+          userrating: '4',
+          data: [{
+            name: 'www.dataprovider1.com',
+            ext: {
+              segtax: 7,
+              cids: ['iris_c73g5jq96mwso4d8']
+            },
+            segment: [
+              { id: '687' },
+              { id: '123' }
+            ]
+          }]
+        },
+        ext: {
+          data: {
+            pageType: 'article',
+            category: 'repair'
+          }
+        }
+      },
+      user: {
+        yob: 1985,
+        gender: 'm',
+        keywords: 'a,b',
+        data: [{
+          name: 'dataprovider.com',
+          ext: { segtax: 4 },
+          segment: [
+            { id: '1' }
+          ]
+        }],
+        ext: {
+          data: {
+            registered: true,
+            interests: ['cars']
+          }
+        }
+      }
+    },
     bids: [bid]
   }
 
@@ -53,6 +152,7 @@ describe('ColossussspAdapter', function () {
     });
     it('Should return false when placement_id is not a number', function () {
       bid.params.placement_id = 'aaa';
+      delete bid.params.group_id;
       expect(spec.isBidRequestValid(bid)).to.be.false;
     });
   });
@@ -71,14 +171,55 @@ describe('ColossussspAdapter', function () {
     it('Returns valid URL', function () {
       expect(serverRequest.url).to.equal('https://colossusssp.com/?c=o&m=multi');
     });
-    it('Should contain ccpa', function() {
+    it('Should contain ccpa', function () {
       expect(serverRequest.data.ccpa).to.be.an('string')
     })
 
     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', 'userObj', 'siteObj', 'appObj');
+      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', 'sizes', 'schain', 'floor', 'gpid', 'tid');
+        expect(placement.schain).to.be.an('object')
+        expect(placement.placementId).to.be.a('number');
+        expect(placement.groupId).to.be.a('number');
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.traffic).to.be.a('string');
+        expect(placement.sizes).to.be.an('array');
+        expect(placement.floor).to.be.an('object');
+        expect(placement.gpid).to.be.an('string');
+        expect(placement.tid).to.be.an('string');
+      }
+    });
+
+    it('Returns valid video data if array of bids is valid', function () {
+      const videoBid = {
+        ...bid,
+        params: {
+          placement_id: 0,
+        },
+        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', 'userObj', 'siteObj', 'appObj');
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
@@ -88,16 +229,26 @@ describe('ColossussspAdapter', function () {
       let placements = data['placements'];
       for (let i = 0; i < placements.length; i++) {
         let placement = placements[i];
-        expect(placement).to.have.all.keys('placementId', 'eids', 'bidId', 'traffic', 'sizes', 'schain');
+        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', 'tid'
+        );
         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');
+        expect(placement.tid).to.be.an('string');
       }
     });
+
     it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
+      serverRequest = spec.buildRequests([], bidderRequest);
       let data = serverRequest.data;
       expect(data.placements).to.be.an('array').that.is.empty;
     });
@@ -108,7 +259,8 @@ describe('ColossussspAdapter', function () {
     bid.userId.britepoolid = 'britepoolid123';
     bid.userId.idl_env = 'idl_env123';
     bid.userId.tdid = 'tdid123';
-    bid.userId.id5id = 'id5id123'
+    bid.userId.id5id = { uid: 'id5id123' };
+    bid.userId.uid2 = { id: 'uid2id123' };
     let serverRequest = spec.buildRequests([bid], bidderRequest);
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
@@ -118,15 +270,14 @@ describe('ColossussspAdapter', function () {
         let placement = placements[i];
         expect(placement).to.have.property('eids')
         expect(placement.eids).to.be.an('array')
-        expect(placement.eids.length).to.be.equal(4)
+        expect(placement.eids.length).to.be.equal(5)
         for (let index in placement.eids) {
           let v = placement.eids[index];
           expect(v).to.have.all.keys('source', 'uids')
-          expect(v.source).to.be.oneOf(['britepool.com', 'identityLink', 'adserver.org', 'id5-sync.com'])
+          expect(v.source).to.be.oneOf(['britepool.com', 'identityLink', 'adserver.org', 'id5-sync.com', 'uidapi.com'])
           expect(v.uids).to.be.an('array');
           expect(v.uids.length).to.be.equal(1)
           expect(v.uids[0]).to.have.property('id')
-          expect(v.uids[0].id).to.be.oneOf(['britepoolid123', 'idl_env123', 'tdid123', 'id5id123'])
         }
       }
     });
@@ -134,7 +285,7 @@ describe('ColossussspAdapter', function () {
 
   describe('interpretResponse', function () {
     let resObject = {
-      body: [ {
+      body: [{
         requestId: '123',
         mediaType: 'banner',
         cpm: 0.3,
@@ -144,8 +295,12 @@ describe('ColossussspAdapter', function () {
         ttl: 1000,
         creativeId: '123asd',
         netRevenue: true,
-        currency: 'USD'
-      } ]
+        currency: 'USD',
+        meta: {
+          advertiserDomains: ['google.com'],
+          advertiserId: 1234
+        }
+      }]
     };
     let serverResponses = spec.interpretResponse(resObject);
     it('Returns an array of valid server responses if response object is valid', function () {
@@ -153,7 +308,7 @@ describe('ColossussspAdapter', function () {
       for (let i = 0; i < serverResponses.length; i++) {
         let dataItem = serverResponses[i];
         expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType');
+          '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');
@@ -164,22 +319,75 @@ describe('ColossussspAdapter', function () {
         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 () {
         serverResponses = spec.interpretResponse('invalid_response');
         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 () {
+    it('should make an ajax call', function () {
+      const bid = {
+        nurl: 'http://example.com/win',
+      };
+      expect(spec.onBidWon(bid)).to.equals(undefined);
+    });
+  })
+
   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('image');
-      expect(userSync[0].url).to.be.equal('https://colossusssp.com/?c=o&m=cookie');
+      expect(userSync[0].url).to.be.equal('https://sync.colossusssp.com/image?pbjs=1&gdpr=0&gdpr_consent=xxx&ccpa_consent=1YN-&coppa=0');
     });
   });
 });
diff --git a/test/spec/modules/compassBidAdapter_spec.js b/test/spec/modules/compassBidAdapter_spec.js
new file mode 100644
index 00000000000..28021c4f7c0
--- /dev/null
+++ b/test/spec/modules/compassBidAdapter_spec.js
@@ -0,0 +1,398 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/compassBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'compass'
+
+describe('CompassBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    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;
+      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://sa-lb.deliverimp.com/pbjs');
+    });
+
+    it('Returns general data 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',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      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.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, 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 = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, 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([], bidderRequest);
+      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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sa-cs.deliverimp.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sa-cs.deliverimp.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/concertAnalyticsAdapter_spec.js b/test/spec/modules/concertAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..1df73ae04fe
--- /dev/null
+++ b/test/spec/modules/concertAnalyticsAdapter_spec.js
@@ -0,0 +1,156 @@
+import concertAnalytics from 'modules/concertAnalyticsAdapter.js';
+import { expect } from 'chai';
+import {expectEvents} from '../../helpers/analytics.js';
+const sinon = require('sinon');
+let adapterManager = require('src/adapterManager').default;
+let events = require('src/events');
+let constants = require('src/constants.json');
+
+describe('ConcertAnalyticsAdapter', function() {
+  let sandbox;
+  let xhr;
+  let requests;
+  let clock;
+  let timestamp = 1896134400;
+  let auctionId = '9f894496-10fe-4652-863d-623462bf82b8';
+  let timeout = 1000;
+
+  before(function () {
+    sandbox = sinon.createSandbox();
+    xhr = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+
+    xhr.onCreate = function (request) {
+      requests.push(request);
+    };
+    clock = sandbox.useFakeTimers(1896134400);
+  });
+
+  after(function () {
+    sandbox.restore();
+  });
+
+  describe('track', function() {
+    beforeEach(function () {
+      sandbox.stub(events, 'getEvents').returns([]);
+
+      adapterManager.enableAnalytics({
+        provider: 'concert'
+      });
+    });
+
+    afterEach(function () {
+      events.getEvents.restore();
+      concertAnalytics.eventsStorage = [];
+      concertAnalytics.disableAnalytics();
+    });
+
+    it('should catch all events', function() {
+      sandbox.spy(concertAnalytics, 'track');
+      expectEvents().to.beTrackedBy(concertAnalytics.track);
+    });
+
+    it('should report data for BID_RESPONSE, BID_WON events', function() {
+      fireBidEvents(events);
+      clock.tick(3000 + 1000);
+
+      const eventsToReport = ['bidResponse', 'bidWon'];
+      for (var i = 0; i < concertAnalytics.eventsStorage.length; i++) {
+        expect(eventsToReport.indexOf(concertAnalytics.eventsStorage[i].event)).to.be.above(-1);
+      }
+
+      for (var i = 0; i < eventsToReport.length; i++) {
+        expect(concertAnalytics.eventsStorage.some(function(event) {
+          return event.event === eventsToReport[i]
+        })).to.equal(true);
+      }
+    });
+
+    it('should report data in the shape expected by analytics endpoint', function() {
+      fireBidEvents(events);
+      clock.tick(3000 + 1000);
+
+      const requiredFields = ['event', 'concert_rid', 'adId', 'auctionId', 'creativeId', 'position', 'url', 'cpm', 'width', 'height', 'timeToRespond'];
+
+      for (var i = 0; i < requiredFields.length; i++) {
+        expect(concertAnalytics.eventsStorage[0]).to.have.property(requiredFields[i]);
+      }
+    });
+  });
+
+  const adUnits = [{
+    code: 'desktop_leaderboard_variable',
+    sizes: [[1030, 590]],
+    mediaTypes: {
+      banner: {
+        sizes: [[1030, 590]]
+      }
+    },
+    bids: [
+      {
+        bidder: 'concert',
+        params: {
+          partnerId: 'test_partner'
+        }
+      }
+    ]
+  }];
+
+  const bidResponse = {
+    'bidderCode': 'concert',
+    'width': 1030,
+    'height': 590,
+    'statusMessage': 'Bid available',
+    'adId': '642f13fe18ab7dc',
+    'requestId': '4062fba2e039919',
+    'mediaType': 'banner',
+    'source': 'client',
+    'cpm': 6,
+    'ad': '<script>...</script>',
+    'ttl': 360,
+    'creativeId': '138308483085|62bac030-a5d3-11ea-b3be-55590c8153a5',
+    'netRevenue': false,
+    'currency': 'USD',
+    'originalCpm': 6,
+    'originalCurrency': 'USD',
+    'auctionId': '9f894496-10fe-4652-863d-623462bf82b8',
+    'responseTimestamp': 1591213790366,
+    'requestTimestamp': 1591213790017,
+    'bidder': 'concert',
+    'adUnitCode': 'desktop_leaderboard_variable',
+    'timeToRespond': 349,
+    'status': 'rendered',
+    'params': [
+      {
+        'partnerId': 'cst'
+      }
+    ]
+  }
+
+  const bidWon = {
+    'adId': '642f13fe18ab7dc',
+    'mediaType': 'banner',
+    'requestId': '4062fba2e039919',
+    'cpm': 6,
+    'creativeId': '138308483085|62bac030-a5d3-11ea-b3be-55590c8153a5',
+    'currency': 'USD',
+    'netRevenue': false,
+    'ttl': 360,
+    'auctionId': '9f894496-10fe-4652-863d-623462bf82b8',
+    'statusMessage': 'Bid available',
+    'responseTimestamp': 1591213790366,
+    'requestTimestamp': 1591213790017,
+    'bidder': 'concert',
+    'adUnitCode': 'desktop_leaderboard_variable',
+    'sizes': [[1030, 590]],
+    'size': [1030, 590]
+  }
+
+  function fireBidEvents(events) {
+    events.emit(constants.EVENTS.AUCTION_INIT, {timestamp, auctionId, timeout, adUnits});
+    events.emit(constants.EVENTS.BID_REQUESTED, {bidder: 'concert'});
+    events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+    events.emit(constants.EVENTS.AUCTION_END, {});
+    events.emit(constants.EVENTS.BID_WON, bidWon);
+  }
+});
diff --git a/test/spec/modules/concertBidAdapter_spec.js b/test/spec/modules/concertBidAdapter_spec.js
new file mode 100644
index 00000000000..00626472ecb
--- /dev/null
+++ b/test/spec/modules/concertBidAdapter_spec.js
@@ -0,0 +1,294 @@
+import { expect } from 'chai';
+import sinon from 'sinon';
+import { spec, storage } from 'modules/concertBidAdapter.js';
+import { hook } from 'src/hook.js';
+
+describe('ConcertAdapter', function () {
+  let bidRequests;
+  let bidRequest;
+  let bidResponse;
+  let element;
+  let sandbox;
+
+  before(function () {
+    hook.ready();
+  });
+
+  beforeEach(function () {
+    element = {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      getBoundingClientRect: () => {
+        return {
+          width: element.width,
+          height: element.height,
+
+          left: element.x,
+          top: element.y,
+          right: element.x + element.width,
+          bottom: element.y + element.height
+        };
+      }
+    };
+
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      concert: {
+        storageAllowed: true
+      }
+    };
+
+    bidRequests = [
+      {
+        bidder: 'concert',
+        params: {
+          partnerId: 'foo',
+          slotType: 'fizz'
+        },
+        adUnitCode: 'desktop_leaderboard_variable',
+        bidId: 'foo',
+        transactionId: '',
+        sizes: [[1030, 590]]
+      }
+    ];
+
+    bidRequest = {
+      refererInfo: {
+        page: 'https://www.google.com'
+      },
+      uspConsent: '1YYY',
+      gdprConsent: {}
+    };
+
+    bidResponse = {
+      body: {
+        bids: [
+          {
+            bidId: '16d2e73faea32d9',
+            cpm: '6',
+            width: '1030',
+            height: '590',
+            ad: '<script>...</script>',
+            ttl: '360',
+            creativeId: '123349|a7d62700-a4bf-11ea-829f-ad3b0b7a9383',
+            netRevenue: false,
+            currency: 'USD'
+          }
+        ]
+      }
+    }
+
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(document, 'getElementById').withArgs('desktop_leaderboard_variable').returns(element)
+  });
+
+  afterEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+    sandbox.restore();
+  });
+
+  describe('spec.isBidRequestValid', function() {
+    it('should return when it recieved all the required params', function() {
+      const bid = bidRequests[0];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when partner id is missing', function() {
+      const bid = {
+        bidder: 'concert',
+        params: {}
+      }
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('spec.buildRequests', function() {
+    it('should build a payload object with the shape expected by server', function() {
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload).to.have.property('meta');
+      expect(payload).to.have.property('slots');
+
+      const metaRequiredFields = ['prebidVersion', 'pageUrl', 'screen', 'debug', 'uid', 'optedOut', 'adapterVersion', 'uspConsent', 'gdprConsent'];
+      const slotsRequiredFields = ['name', 'bidId', 'transactionId', 'sizes', 'partnerId', 'slotType'];
+
+      metaRequiredFields.forEach(function(field) {
+        expect(payload.meta).to.have.property(field);
+      });
+      slotsRequiredFields.forEach(function(field) {
+        expect(payload.slots[0]).to.have.property(field);
+      });
+    });
+
+    it('should not generate uid if the user has opted out', function() {
+      storage.setDataInLocalStorage('c_nap', 'true');
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.meta.uid).to.equal(false);
+    });
+
+    it('should generate uid if the user has not opted out', function() {
+      storage.removeDataFromLocalStorage('c_nap');
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.meta.uid).to.not.equal(false);
+    });
+
+    it('should use sharedid if it exists', function() {
+      storage.removeDataFromLocalStorage('c_nap');
+      const request = spec.buildRequests(bidRequests, {
+        ...bidRequest,
+        userId: {
+          _sharedid: {
+            id: '123abc'
+          }
+        }
+      });
+      const payload = JSON.parse(request.data);
+      expect(payload.meta.uid).to.equal('123abc');
+    })
+
+    it('should grab uid from local storage if it exists and sharedid does not', function() {
+      storage.setDataInLocalStorage('vmconcert_uid', 'foo');
+      storage.removeDataFromLocalStorage('c_nap');
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.meta.uid).to.equal('foo');
+    });
+
+    it('should add uid2 to eids list if available', function() {
+      bidRequests[0].userId = { uid2: { id: 'uid123' } }
+
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+      const meta = payload.meta
+
+      expect(meta.eids.length).to.equal(1);
+      expect(meta.eids[0].uids[0].id).to.equal('uid123')
+      expect(meta.eids[0].uids[0].atype).to.equal(3)
+    })
+
+    it('should return empty eids list if none are available', function() {
+      bidRequests[0].userId = { testId: { id: 'uid123' } }
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+      const meta = payload.meta
+
+      expect(meta.eids.length).to.equal(0);
+    });
+
+    it('should return x/y offset coordiantes when element is present', function() {
+      Object.assign(element, { x: 100, y: 0, width: 400, height: 400 })
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+      const slot = payload.slots[0];
+
+      expect(slot.offsetCoordinates.x).to.equal(100)
+      expect(slot.offsetCoordinates.y).to.equal(0)
+    })
+  });
+
+  describe('spec.interpretResponse', function() {
+    it('should return bids in the shape expected by prebid', function() {
+      const bids = spec.interpretResponse(bidResponse, bidRequest);
+      const requiredFields = ['requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'meta', 'creativeId', 'netRevenue', 'currency'];
+
+      requiredFields.forEach(function(field) {
+        expect(bids[0]).to.have.property(field);
+      });
+    });
+
+    it('should return empty bids if there is no response from server', function() {
+      const bids = spec.interpretResponse({ body: null }, bidRequest);
+      expect(bids).to.have.lengthOf(0);
+    });
+
+    it('should return empty bids if there are no bids from the server', function() {
+      const bids = spec.interpretResponse({ body: {bids: []} }, bidRequest);
+      expect(bids).to.have.lengthOf(0);
+    });
+  });
+
+  describe('spec.getUserSyncs', function() {
+    it('should not register syncs when iframe is not enabled', function() {
+      const opts = {
+        iframeEnabled: false
+      }
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync).to.have.lengthOf(0);
+    });
+
+    it('should not register syncs when the user has opted out', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      storage.setDataInLocalStorage('c_nap', 'true');
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync).to.have.lengthOf(0);
+    });
+
+    it('should set gdprApplies flag to 1 if the user is in area where GDPR applies', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      storage.removeDataFromLocalStorage('c_nap');
+
+      bidRequest.gdprConsent = {
+        gdprApplies: true
+      };
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync[0].url).to.have.string('gdpr_applies=1');
+    });
+
+    it('should set gdprApplies flag to 1 if the user is in area where GDPR applies', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      storage.removeDataFromLocalStorage('c_nap');
+
+      bidRequest.gdprConsent = {
+        gdprApplies: false
+      };
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync[0].url).to.have.string('gdpr_applies=0');
+    });
+
+    it('should set gdpr consent param with the user\'s choices on consent', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      storage.removeDataFromLocalStorage('c_nap');
+
+      bidRequest.gdprConsent = {
+        gdprApplies: false,
+        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A=='
+      };
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync[0].url).to.have.string('gdpr_consent=BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
+    });
+
+    it('should set ccpa consent param with the user\'s choices on consent', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      storage.removeDataFromLocalStorage('c_nap');
+
+      bidRequest.gdprConsent = {
+        gdprApplies: false,
+        uspConsent: '1YYY'
+      };
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync[0].url).to.have.string('usp_consent=1YY');
+    });
+  });
+});
diff --git a/test/spec/modules/confiantRtdProvider_spec.js b/test/spec/modules/confiantRtdProvider_spec.js
new file mode 100644
index 00000000000..987aca2e020
--- /dev/null
+++ b/test/spec/modules/confiantRtdProvider_spec.js
@@ -0,0 +1,107 @@
+import * as utils from '../../../src/utils.js';
+import * as hook from '../../../src/hook.js'
+import * as events from '../../../src/events.js';
+import CONSTANTS from '../../../src/constants.json';
+
+import confiantModule from '../../../modules/confiantRtdProvider.js';
+
+const {
+  injectConfigScript,
+  setupPage,
+  subscribeToConfiantCommFrame,
+  registerConfiantSubmodule
+} = confiantModule;
+
+describe('Confiant RTD module', function () {
+  describe('setupPage()', function() {
+    it('should return false if propertId is not present in config', function() {
+      expect(setupPage({})).to.be.false;
+      expect(setupPage({ params: {} })).to.be.false;
+      expect(setupPage({ params: { propertyId: '' } })).to.be.false;
+    });
+
+    it('should return true if expected parameters are present', function() {
+      expect(setupPage({ params: { propertyId: 'clientId' } })).to.be.true;
+    });
+  });
+
+  describe('Module initialization', function() {
+    let insertElementStub;
+    beforeEach(function() {
+      insertElementStub = sinon.stub(utils, 'insertElement');
+    });
+    afterEach(function() {
+      utils.insertElement.restore();
+    });
+
+    it('should subscribe to rovided Window object', function () {
+      const mockWindow = { addEventListener: sinon.spy() };
+
+      subscribeToConfiantCommFrame(mockWindow);
+
+      sinon.assert.calledOnce(mockWindow.addEventListener);
+    });
+
+    it('should fire BillableEvent as a result for message in comm window', function() {
+      let listenerCallback;
+      const mockWindow = { addEventListener: (a, cb) => (listenerCallback = cb) };
+      let billableEventsCounter = 0;
+
+      events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, (e) => {
+        if (e.vendor === 'confiant') {
+          billableEventsCounter++;
+          expect(e.type).to.equal('impression');
+          expect(e.billingId).to.be.a('number');
+          expect(e.auctionId).to.equal('auctionId');
+          expect(e.transactionId).to.equal('transactionId');
+        }
+      });
+
+      subscribeToConfiantCommFrame(mockWindow);
+      listenerCallback({
+        data: {
+          auctionId: 'auctionId',
+          transactionId: 'transactionId'
+        }
+      });
+      listenerCallback({
+        data: {
+          auctionId: 'auctionId',
+          transactionId: 'transactionId'
+        }
+      });
+
+      expect(billableEventsCounter).to.equal(2);
+    });
+  });
+
+  describe('Sumbodule execution', function() {
+    let submoduleStub;
+    let insertElementStub;
+    beforeEach(function () {
+      submoduleStub = sinon.stub(hook, 'submodule');
+      insertElementStub = sinon.stub(utils, 'insertElement');
+    });
+    afterEach(function () {
+      utils.insertElement.restore();
+      submoduleStub.restore();
+    });
+
+    function initModule() {
+      registerConfiantSubmodule();
+
+      expect(submoduleStub.calledOnceWith('realTimeData')).to.equal(true);
+
+      const registeredSubmoduleDefinition = submoduleStub.getCall(0).args[1];
+      expect(registeredSubmoduleDefinition).to.be.an('object');
+      expect(registeredSubmoduleDefinition).to.have.own.property('name', 'confiant');
+      expect(registeredSubmoduleDefinition).to.have.own.property('init').that.is.a('function');
+
+      return registeredSubmoduleDefinition;
+    }
+
+    it('should register Confiant submodule', function () {
+      initModule();
+    });
+  });
+});
diff --git a/test/spec/modules/connectIdSystem_spec.js b/test/spec/modules/connectIdSystem_spec.js
new file mode 100644
index 00000000000..52639c39baf
--- /dev/null
+++ b/test/spec/modules/connectIdSystem_spec.js
@@ -0,0 +1,391 @@
+import {expect} from 'chai';
+import {parseQS} from 'src/utils.js';
+import {connectIdSubmodule} from 'modules/connectIdSystem.js';
+
+describe('Yahoo ConnectID Submodule', () => {
+  const HASHED_EMAIL = '6bda6f2fa268bf0438b5423a9861a2cedaa5dec163c03f743cfe05c08a8397b2';
+  const PUBLISHER_USER_ID = '975484817';
+  const PIXEL_ID = '1234';
+  const PROD_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PIXEL_ID}/fed`;
+  const OVERRIDE_ENDPOINT = 'https://foo/bar';
+
+  it('should have the correct module name declared', () => {
+    expect(connectIdSubmodule.name).to.equal('connectId');
+  });
+
+  it('should have the correct TCFv2 Vendor ID declared', () => {
+    expect(connectIdSubmodule.gvlid).to.equal(25);
+  });
+
+  describe('getId()', () => {
+    let ajaxStub;
+    let getAjaxFnStub;
+    let consentData;
+    beforeEach(() => {
+      ajaxStub = sinon.stub();
+      getAjaxFnStub = sinon.stub(connectIdSubmodule, 'getAjaxFn');
+      getAjaxFnStub.returns(ajaxStub);
+
+      consentData = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 'GDPR_CONSENT_STRING'
+        },
+        uspConsent: 'USP_CONSENT_STRING',
+        gppConsent: {
+          gppString: 'header~section6~section7',
+          applicableSections: [6, 7]
+        }
+      };
+    });
+
+    afterEach(() => {
+      getAjaxFnStub.restore();
+    });
+
+    function invokeGetIdAPI(configParams, consentData) {
+      let result = connectIdSubmodule.getId({
+        params: configParams
+      }, consentData);
+      if (typeof result === 'object') {
+        result.callback(sinon.stub());
+      }
+      return result;
+    }
+
+    it('returns undefined if he, pixelId and puid params are not passed', () => {
+      expect(invokeGetIdAPI({}, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns undefined if the pixelId param is not passed', () => {
+      expect(invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        puid: PUBLISHER_USER_ID
+      }, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns undefined if the pixelId param is passed, but the he and puid param are not passed', () => {
+      expect(invokeGetIdAPI({
+        pixelId: PIXEL_ID
+      }, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns an object with the callback function if the endpoint override param and the he params are passed', () => {
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the endpoint override param and the puid params are passed', () => {
+      let result = invokeGetIdAPI({
+        puid: PUBLISHER_USER_ID,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the endpoint override param and the puid and he params are passed', () => {
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        puid: PUBLISHER_USER_ID,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the pixelId and he params are passed', () => {
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the pixelId and puid params are passed', () => {
+      let result = invokeGetIdAPI({
+        puid: PUBLISHER_USER_ID,
+        pixelId: PIXEL_ID
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the pixelId, he and puid params are passed', () => {
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        puid: PUBLISHER_USER_ID,
+        pixelId: PIXEL_ID
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an undefined if the Yahoo specific opt-out key is present in local storage', () => {
+      localStorage.setItem('connectIdOptOut', '1');
+      expect(invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData)).to.be.undefined;
+      localStorage.removeItem('connectIdOptOut');
+    });
+
+    it('returns an object with the callback function if the correct params are passed and Yahoo opt-out value is not "1"', () => {
+      localStorage.setItem('connectIdOptOut', 'true');
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+      localStorage.removeItem('connectIdOptOut');
+    });
+
+    it('Makes an ajax GET request to the production API endpoint with pixelId and he query params', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+
+      const expectedParams = {
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent,
+        gpp: consentData.gppConsent.gppString,
+        gpp_sid: '6%2C7'
+      };
+      const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${PROD_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('Makes an ajax GET request to the production API endpoint with pixelId and puid query params', () => {
+      invokeGetIdAPI({
+        puid: PUBLISHER_USER_ID,
+        pixelId: PIXEL_ID
+      }, consentData);
+
+      const expectedParams = {
+        puid: PUBLISHER_USER_ID,
+        pixelId: PIXEL_ID,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent,
+        gpp: consentData.gppConsent.gppString,
+        gpp_sid: '6%2C7'
+      };
+      const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${PROD_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('Makes an ajax GET request to the production API endpoint with pixelId, puid and he query params', () => {
+      invokeGetIdAPI({
+        puid: PUBLISHER_USER_ID,
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+
+      const expectedParams = {
+        puid: PUBLISHER_USER_ID,
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent,
+        gpp: consentData.gppConsent.gppString,
+        gpp_sid: '6%2C7'
+      };
+      const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${PROD_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('Makes an ajax GET request to the specified override API endpoint with query params', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+
+      const expectedParams = {
+        he: HASHED_EMAIL,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent,
+        gpp: consentData.gppConsent.gppString,
+        gpp_sid: '6%2C7'
+      };
+      const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${OVERRIDE_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('sets the callbacks param of the ajax function call correctly', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      expect(ajaxStub.firstCall.args[1]).to.be.an('object').that.has.all.keys(['success', 'error']);
+    });
+
+    it('sets GDPR consent data flag correctly when call is under GDPR jurisdiction.', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+      expect(requestQueryParams.gdpr).to.equal('1');
+      expect(requestQueryParams.gdpr_consent).to.equal(consentData.gdpr.consentString);
+    });
+
+    it('sets GDPR consent data flag correctly when call is NOT under GDPR jurisdiction.', () => {
+      consentData.gdpr.gdprApplies = false;
+
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+      expect(requestQueryParams.gdpr).to.equal('0');
+      expect(requestQueryParams.gdpr_consent).to.equal('');
+    });
+
+    [1, '1', true].forEach(firstPartyParamValue => {
+      it(`sets 1p payload property to '1' for a config value of ${firstPartyParamValue}`, () => {
+        invokeGetIdAPI({
+          '1p': firstPartyParamValue,
+          he: HASHED_EMAIL,
+          pixelId: PIXEL_ID,
+        }, consentData);
+
+        const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+        expect(requestQueryParams['1p']).to.equal('1');
+      });
+    });
+  });
+
+  describe('decode()', () => {
+    let userHasOptedOutStub;
+    beforeEach(() => {
+      userHasOptedOutStub = sinon.stub(connectIdSubmodule, 'userHasOptedOut');
+      userHasOptedOutStub.returns(false);
+    });
+
+    afterEach(() => {
+      userHasOptedOutStub.restore()
+    });
+
+    const VALID_API_RESPONSES = [{
+      key: 'connectid',
+      expected: '4567',
+      payload: {
+        connectid: '4567'
+      }
+    }];
+    VALID_API_RESPONSES.forEach(responseData => {
+      it('should return a newly constructed object with the connect ID for a payload with ${responseData.key} key(s)', () => {
+        expect(connectIdSubmodule.decode(responseData.payload)).to.deep.equal(
+          {connectId: responseData.expected}
+        );
+      });
+    });
+
+    [{}, '', {foo: 'bar'}].forEach((response) => {
+      it(`should return undefined for an invalid response "${JSON.stringify(response)}"`, () => {
+        expect(connectIdSubmodule.decode(response)).to.be.undefined;
+      });
+    });
+
+    it('should return undefined if user has utilised the easy opt-out mechanism', () => {
+      userHasOptedOutStub.returns(true);
+      expect(connectIdSubmodule.decode(VALID_API_RESPONSES[0].payload)).to.be.undefined;
+    })
+  });
+
+  describe('getAjaxFn()', () => {
+    it('should return a function', () => {
+      expect(connectIdSubmodule.getAjaxFn()).to.be.a('function');
+    });
+  });
+
+  describe('isEUConsentRequired()', () => {
+    it('should return a function', () => {
+      expect(connectIdSubmodule.isEUConsentRequired).to.be.a('function');
+    });
+
+    it('should be false if consent data is empty', () => {
+      expect(connectIdSubmodule.isEUConsentRequired({})).to.be.false;
+    });
+
+    it('should be false if consent data.gdpr object is empty', () => {
+      expect(connectIdSubmodule.isEUConsentRequired({
+        gdpr: {}
+      })).to.be.false;
+    });
+
+    it('should return false if consent data.gdpr.applies is false', () => {
+      expect(connectIdSubmodule.isEUConsentRequired({
+        gdpr: {
+          gdprApplies: false
+        }
+      })).to.be.false;
+    });
+
+    it('should return true if consent data.gdpr.applies is true', () => {
+      expect(connectIdSubmodule.isEUConsentRequired({
+        gdpr: {
+          gdprApplies: true
+        }
+      })).to.be.true;
+    });
+  });
+
+  describe('userHasOptedOut()', () => {
+    afterEach(() => {
+      localStorage.removeItem('connectIdOptOut');
+    });
+
+    it('should return a function', () => {
+      expect(connectIdSubmodule.userHasOptedOut).to.be.a('function');
+    });
+
+    it('should return false when local storage key has not been set function', () => {
+      expect(connectIdSubmodule.userHasOptedOut()).to.be.false;
+    });
+
+    it('should return true when local storage key has been set to "1"', () => {
+      localStorage.setItem('connectIdOptOut', '1');
+      expect(connectIdSubmodule.userHasOptedOut()).to.be.true;
+    });
+
+    it('should return false when local storage key has not been set to "1"', () => {
+      localStorage.setItem('connectIdOptOut', 'hello');
+      expect(connectIdSubmodule.userHasOptedOut()).to.be.false;
+    });
+  });
+});
diff --git a/test/spec/modules/connectadBidAdapter_spec.js b/test/spec/modules/connectadBidAdapter_spec.js
index 626018241c4..7a70c4bacdb 100644
--- a/test/spec/modules/connectadBidAdapter_spec.js
+++ b/test/spec/modules/connectadBidAdapter_spec.js
@@ -14,7 +14,8 @@ describe('ConnectAd Adapter', function () {
         bidder: 'conntectad',
         params: {
           siteId: 123456,
-          networkId: 123456
+          networkId: 123456,
+          bidfloor: 0.50
         },
         adUnitCode: '/19968336/header-bid-tag-1',
         mediaTypes: {
@@ -46,8 +47,7 @@ describe('ConnectAd Adapter', function () {
       bidderRequestId: '1c56ad30b9b8ca8',
       transactionId: 'e76cbb58-f3e1-4ad9-9f4c-718c1919d0df',
       userId: {
-        tdid: '123456',
-        digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}}
+        tdid: '123456'
       }
     }];
 
@@ -84,7 +84,6 @@ describe('ConnectAd Adapter', function () {
           }
         };
         const isValid = spec.isBidRequestValid(validBid);
-
         expect(isValid).to.equal(true);
       });
 
@@ -154,6 +153,29 @@ describe('ConnectAd Adapter', function () {
         expect(requestparse.placements[0].networkId).to.equal(123456);
       });
 
+      it('should process floors module if available', function() {
+        const floorInfo = {
+          currency: 'USD',
+          floor: 5.20
+        };
+        bidRequests[0].getFloor = () => floorInfo;
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        expect(requestparse.placements[0].bidfloor).to.equal(5.20);
+      });
+
+      it('should be bidfloor if no floormodule is available', function() {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        expect(requestparse.placements[0].bidfloor).to.equal(0.50);
+      });
+
+      it('should have 0 bidfloor value', function() {
+        const request = spec.buildRequests(bidRequestsUserIds, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        expect(requestparse.placements[0].bidfloor).to.equal(0);
+      });
+
       it('should contain gdpr info', function () {
         const request = spec.buildRequests(bidRequests, bidderRequest);
         const requestparse = JSON.parse(request.data);
@@ -227,21 +249,23 @@ describe('ConnectAd Adapter', function () {
         const requestparse = JSON.parse(request.data);
         expect(requestparse.user.ext.eids).to.be.an('array');
         expect(requestparse.user.ext.eids[0].uids[0].id).to.equal('123456');
-        expect(requestparse.user.ext.digitrust.id).to.equal('DTID');
       });
 
       it('should add referer info', function () {
         const bidRequest = Object.assign({}, bidRequests[0])
         const bidderRequ = {
           refererInfo: {
-            referer: 'https://connectad.io/page.html',
-            reachedTop: true,
-            numIframes: 2,
-            stack: [
-              'https://connectad.io/page.html',
-              'https://connectad.io/iframe1.html',
-              'https://connectad.io/iframe2.html'
-            ]
+            page: 'https://connectad.io/page.html',
+            legacy: {
+              referer: 'https://connectad.io/page.html',
+              reachedTop: true,
+              numIframes: 2,
+              stack: [
+                'https://connectad.io/page.html',
+                'https://connectad.io/iframe1.html',
+                'https://connectad.io/iframe2.html'
+              ]
+            }
           }
         }
         const request = spec.buildRequests([bidRequest], bidderRequ);
@@ -282,7 +306,43 @@ describe('ConnectAd Adapter', function () {
     });
 
     describe('bid responses', function () {
-      it('should return complete bid response', function () {
+      it('should return complete bid response with adomain', function () {
+        const ADOMAINS = ['connectad.io'];
+
+        let serverResponse = {
+          body: {
+            decisions: {
+              '2f95c00074b931': {
+                adId: '0',
+                adomain: ['connectad.io'],
+                contents: [
+                  {
+                    body: '<<<---- Creative --->>>'
+                  }
+                ],
+                height: '250',
+                width: '300',
+                pricing: {
+                  clearPrice: 11.899999999999999
+                }
+              }
+            }
+          }
+        };
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const bids = spec.interpretResponse(serverResponse, request);
+
+        expect(bids).to.be.lengthOf(1);
+        expect(bids[0].cpm).to.equal(11.899999999999999);
+        expect(bids[0].width).to.equal('300');
+        expect(bids[0].height).to.equal('250');
+        expect(bids[0].ad).to.have.length.above(1);
+        expect(bids[0].meta.advertiserDomains).to.deep.equal(ADOMAINS);
+      });
+
+      it('should return complete bid response with empty adomain', function () {
+        const ADOMAINS = [];
+
         let serverResponse = {
           body: {
             decisions: {
@@ -310,6 +370,7 @@ describe('ConnectAd Adapter', function () {
         expect(bids[0].width).to.equal('300');
         expect(bids[0].height).to.equal('250');
         expect(bids[0].ad).to.have.length.above(1);
+        expect(bids[0].meta.advertiserDomains).to.deep.equal(ADOMAINS);
       });
 
       it('should return empty bid response', function () {
diff --git a/test/spec/modules/consentManagementGpp_spec.js b/test/spec/modules/consentManagementGpp_spec.js
new file mode 100644
index 00000000000..1170f418caf
--- /dev/null
+++ b/test/spec/modules/consentManagementGpp_spec.js
@@ -0,0 +1,577 @@
+import { setConsentConfig, requestBidsHook, resetConsentData, userCMP, consentTimeout, staticConsentData } from 'modules/consentManagementGpp.js';
+import { gppDataHandler } from 'src/adapterManager.js';
+import * as utils from 'src/utils.js';
+import { config } from 'src/config.js';
+import 'src/prebid.js';
+
+let expect = require('chai').expect;
+
+describe('consentManagementGpp', function () {
+  describe('setConsentConfig tests:', function () {
+    describe('empty setConsentConfig value', function () {
+      beforeEach(function () {
+        sinon.stub(utils, 'logInfo');
+        sinon.stub(utils, 'logWarn');
+      });
+
+      afterEach(function () {
+        utils.logInfo.restore();
+        utils.logWarn.restore();
+        config.resetConfig();
+        resetConsentData();
+      });
+
+      it('should use system default values', function () {
+        setConsentConfig({
+          gpp: {}
+        });
+        expect(userCMP).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(10000);
+        sinon.assert.callCount(utils.logInfo, 3);
+      });
+
+      it('should exit consent manager if config is not an object', function () {
+        setConsentConfig('');
+        expect(userCMP).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      });
+
+      it('should exit consentManagement module if config is "undefined"', function () {
+        setConsentConfig(undefined);
+        expect(userCMP).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      });
+
+      it('should not produce any consent metadata', function () {
+        setConsentConfig(undefined)
+        let consentMetadata = gppDataHandler.getConsentMeta();
+        expect(consentMetadata).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      })
+
+      it('should immediately look up consent data', () => {
+        setConsentConfig({
+          gpp: {
+            cmpApi: 'invalid'
+          }
+        });
+        expect(gppDataHandler.ready).to.be.true;
+      })
+    });
+
+    describe('valid setConsentConfig value', function () {
+      afterEach(function () {
+        config.resetConfig();
+      });
+
+      it('results in all user settings overriding system defaults', function () {
+        let allConfig = {
+          gpp: {
+            cmpApi: 'iab',
+            timeout: 7500
+          }
+        };
+
+        setConsentConfig(allConfig);
+        expect(userCMP).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(7500);
+      });
+
+      it('should recognize config.gpp, with default cmpApi and timeout', function () {
+        setConsentConfig({
+          gpp: {}
+        });
+
+        expect(userCMP).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(10000);
+      });
+
+      it('should enable gppDataHandler', () => {
+        setConsentConfig({
+          gpp: {}
+        });
+        expect(gppDataHandler.enabled).to.be.true;
+      });
+    });
+
+    describe('static consent string setConsentConfig value', () => {
+      afterEach(() => {
+        config.resetConfig();
+      });
+
+      it('results in user settings overriding system defaults for v2 spec', () => {
+        let staticConfig = {
+          gpp: {
+            cmpApi: 'static',
+            timeout: 7500,
+            consentData: {
+              applicableSections: [7],
+              gppString: 'ABCDEFG1234',
+              gppVersion: 1,
+              sectionId: 3,
+              sectionList: []
+            }
+          }
+        };
+
+        setConsentConfig(staticConfig);
+        expect(userCMP).to.be.equal('static');
+        expect(consentTimeout).to.be.equal(0); // should always return without a timeout when config is used
+        const consent = gppDataHandler.getConsentData();
+        expect(consent.gppString).to.eql(staticConfig.gpp.consentData.gppString);
+        expect(consent.fullGppData).to.eql(staticConfig.gpp.consentData);
+        expect(staticConsentData).to.be.equal(staticConfig.gpp.consentData);
+      });
+    });
+  });
+
+  describe('requestBidsHook tests:', function () {
+    let goodConfig = {
+      gpp: {
+        cmpApi: 'iab',
+        timeout: 7500,
+      }
+    };
+
+    const staticConfig = {
+      gpp: {
+        cmpApi: 'static',
+        timeout: 7500,
+        consentData: {
+          gppString: 'abc12345',
+          applicableSections: [7]
+        }
+      }
+    }
+
+    let didHookReturn;
+
+    beforeEach(resetConsentData);
+    after(resetConsentData);
+
+    describe('error checks:', function () {
+      beforeEach(function () {
+        didHookReturn = false;
+        sinon.stub(utils, 'logWarn');
+        sinon.stub(utils, 'logError');
+      });
+
+      afterEach(function () {
+        utils.logWarn.restore();
+        utils.logError.restore();
+        config.resetConfig();
+      });
+
+      it('should throw a warning and return to hooked function when an unknown CMP framework ID is used', function () {
+        let badCMPConfig = {
+          gpp: {
+            cmpApi: 'bad'
+          }
+        };
+        setConsentConfig(badCMPConfig);
+        expect(userCMP).to.be.equal(badCMPConfig.gpp.cmpApi);
+
+        requestBidsHook(() => {
+          didHookReturn = true;
+        }, {});
+        let consent = gppDataHandler.getConsentData();
+
+        sinon.assert.calledOnce(utils.logWarn);
+        expect(didHookReturn).to.be.true;
+        expect(consent).to.be.null;
+      });
+
+      it('should call gppDataHandler.setConsentData() when unknown CMP api is used', () => {
+        setConsentConfig({
+          gpp: {
+            cmpApi: 'invalid'
+          }
+        });
+        let hookRan = false;
+        requestBidsHook(() => {
+          hookRan = true;
+        }, {});
+        expect(hookRan).to.be.true;
+        expect(gppDataHandler.ready).to.be.true;
+      })
+
+      it('should throw proper errors when CMP is not found', function () {
+        setConsentConfig(goodConfig);
+
+        requestBidsHook(() => {
+          didHookReturn = true;
+        }, {});
+        let consent = gppDataHandler.getConsentData();
+        // throw 2 errors; one for no bidsBackHandler and for CMP not being found (this is an error due to gdpr config)
+        sinon.assert.calledTwice(utils.logError);
+        expect(didHookReturn).to.be.false;
+        expect(consent).to.be.null;
+        expect(gppDataHandler.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 gppDataHandler.promise.then(() => {
+          expect(ran).to.be.true;
+        });
+      });
+
+      it('should continue the auction immediately, without consent data, if timeout is 0', (done) => {
+        setConsentConfig({
+          gpp: {
+            cmpApi: 'iab',
+            timeout: 0
+          }
+        });
+        window.__gpp = function () {};
+        try {
+          requestBidsHook(() => {
+            const consent = gppDataHandler.getConsentData();
+            expect(consent.applicableSections).to.deep.equal([]);
+            expect(consent.gppString).to.be.undefined;
+            done();
+          }, {})
+        } finally {
+          delete window.__gpp;
+        }
+      });
+    });
+
+    describe('already known consentData:', function () {
+      let cmpStub = sinon.stub();
+
+      function mockCMP(cmpResponse) {
+        return function (...args) {
+          if (args[0] === 'addEventListener') {
+            args[1](({
+              eventName: 'sectionChange'
+            }));
+          } else if (args[0] === 'getGPPData') {
+            return cmpResponse;
+          }
+        }
+      }
+
+      beforeEach(function () {
+        didHookReturn = false;
+        window.__gpp = function () {};
+      });
+
+      afterEach(function () {
+        config.resetConfig();
+        cmpStub.restore();
+        delete window.__gpp;
+        resetConsentData();
+      });
+
+      it('should bypass CMP and simply use previously stored consentData', function () {
+        let testConsentData = {
+          applicableSections: [7],
+          gppString: 'xyz',
+        };
+
+        cmpStub = sinon.stub(window, '__gpp').callsFake(mockCMP(testConsentData));
+        setConsentConfig(goodConfig);
+        requestBidsHook(() => {}, {});
+        cmpStub.reset();
+
+        requestBidsHook(() => {
+          didHookReturn = true;
+        }, {});
+        let consent = gppDataHandler.getConsentData();
+
+        expect(didHookReturn).to.be.true;
+        expect(consent.gppString).to.equal(testConsentData.gppString);
+        expect(consent.applicableSections).to.deep.equal(testConsentData.applicableSections);
+        sinon.assert.notCalled(cmpStub);
+      });
+    });
+
+    describe('iframe tests', function () {
+      let cmpPostMessageCb = () => {};
+      let stringifyResponse;
+
+      function createIFrameMarker(frameName) {
+        let ifr = document.createElement('iframe');
+        ifr.width = 0;
+        ifr.height = 0;
+        ifr.name = frameName;
+        document.body.appendChild(ifr);
+        return ifr;
+      }
+
+      function creatCmpMessageHandler(prefix, returnEvtValue, returnGPPValue) {
+        return function (event) {
+          if (event && event.data) {
+            let data = event.data;
+            if (data[`${prefix}Call`]) {
+              let callId = data[`${prefix}Call`].callId;
+              let response;
+              if (data[`${prefix}Call`].command === 'addEventListener') {
+                response = {
+                  [`${prefix}Return`]: {
+                    callId,
+                    returnValue: returnEvtValue,
+                    success: true
+                  }
+                }
+              } else if (data[`${prefix}Call`].command === 'getGPPData') {
+                response = {
+                  [`${prefix}Return`]: {
+                    callId,
+                    returnValue: returnGPPValue,
+                    success: true
+                  }
+                }
+              }
+              event.source.postMessage(stringifyResponse ? JSON.stringify(response) : response, '*');
+            }
+          }
+        }
+      }
+
+      function testIFramedPage(testName, messageFormatString, tarConsentString, tarSections) {
+        it(`should return the consent string from a postmessage + addEventListener response - ${testName}`, (done) => {
+          stringifyResponse = messageFormatString;
+          setConsentConfig(goodConfig);
+          requestBidsHook(() => {
+            let consent = gppDataHandler.getConsentData();
+            sinon.assert.notCalled(utils.logError);
+            expect(consent.gppString).to.equal(tarConsentString);
+            expect(consent.applicableSections).to.deep.equal(tarSections);
+            done();
+          }, {});
+        });
+      }
+
+      beforeEach(function () {
+        sinon.stub(utils, 'logError');
+        sinon.stub(utils, 'logWarn');
+      });
+
+      afterEach(function () {
+        utils.logError.restore();
+        utils.logWarn.restore();
+        config.resetConfig();
+        resetConsentData();
+      });
+
+      describe('v2 CMP workflow for iframe pages:', function () {
+        stringifyResponse = false;
+        let ifr2 = null;
+
+        beforeEach(function () {
+          ifr2 = createIFrameMarker('__gppLocator');
+          cmpPostMessageCb = creatCmpMessageHandler('__gpp', {
+            eventName: 'sectionChange'
+          }, {
+            gppString: 'abc12345234',
+            applicableSections: [7]
+          });
+          window.addEventListener('message', cmpPostMessageCb, false);
+        });
+
+        afterEach(function () {
+          delete window.__gpp; // deletes the local copy made by the postMessage CMP call function
+          document.body.removeChild(ifr2);
+          window.removeEventListener('message', cmpPostMessageCb);
+        });
+
+        testIFramedPage('with/JSON response', false, 'abc12345234', [7]);
+        testIFramedPage('with/String response', true, 'abc12345234', [7]);
+      });
+    });
+
+    describe('direct calls to CMP API tests', function () {
+      let cmpStub = sinon.stub();
+
+      beforeEach(function () {
+        didHookReturn = false;
+        sinon.stub(utils, 'logError');
+        sinon.stub(utils, 'logWarn');
+      });
+
+      afterEach(function () {
+        config.resetConfig();
+        cmpStub.restore();
+        utils.logError.restore();
+        utils.logWarn.restore();
+        resetConsentData();
+      });
+
+      describe('v2 CMP workflow for normal pages:', function () {
+        beforeEach(function () {
+          window.__gpp = function () {};
+        });
+
+        afterEach(function () {
+          delete window.__gpp;
+        });
+
+        it('performs lookup check and stores consentData for a valid existing user', function () {
+          let testConsentData = {
+            gppString: 'abc12345234',
+            applicableSections: [7]
+          };
+          cmpStub = sinon.stub(window, '__gpp').callsFake((...args) => {
+            if (args[0] === 'addEventListener') {
+              args[1]({
+                eventName: 'sectionChange'
+              });
+            } else if (args[0] === 'getGPPData') {
+              return testConsentData;
+            }
+          });
+
+          setConsentConfig(goodConfig);
+
+          requestBidsHook(() => {
+            didHookReturn = true;
+          }, {});
+          let consent = gppDataHandler.getConsentData();
+          sinon.assert.notCalled(utils.logError);
+          expect(didHookReturn).to.be.true;
+          expect(consent.gppString).to.equal(testConsentData.gppString);
+          expect(consent.applicableSections).to.deep.equal(testConsentData.applicableSections);
+        });
+
+        it('produces gdpr metadata', function () {
+          let testConsentData = {
+            gppString: 'abc12345234',
+            applicableSections: [7]
+          };
+          cmpStub = sinon.stub(window, '__gpp').callsFake((...args) => {
+            if (args[0] === 'addEventListener') {
+              args[1]({
+                eventName: 'sectionChange'
+              });
+            } else if (args[0] === 'getGPPData') {
+              return testConsentData;
+            }
+          });
+
+          setConsentConfig(goodConfig);
+
+          requestBidsHook(() => {
+            didHookReturn = true;
+          }, {});
+          let consentMeta = gppDataHandler.getConsentMeta();
+          sinon.assert.notCalled(utils.logError);
+          expect(consentMeta.generatedAt).to.be.above(1644367751709);
+        });
+
+        it('throws an error when processCmpData check fails + does not call requestBids callback', function () {
+          let testConsentData = {};
+          let bidsBackHandlerReturn = false;
+
+          cmpStub = sinon.stub(window, '__gpp').callsFake((...args) => {
+            if (args[0] === 'addEventListener') {
+              args[1]({
+                eventName: 'sectionChange'
+              });
+            } else if (args[0] === 'getGPPData') {
+              return testConsentData;
+            }
+          });
+
+          setConsentConfig(goodConfig);
+
+          sinon.assert.notCalled(utils.logWarn);
+          sinon.assert.notCalled(utils.logError);
+
+          [utils.logWarn, utils.logError].forEach((stub) => stub.reset());
+
+          requestBidsHook(() => {
+            didHookReturn = true;
+          }, {
+            bidsBackHandler: () => bidsBackHandlerReturn = true
+          });
+          let consent = gppDataHandler.getConsentData();
+
+          sinon.assert.calledOnce(utils.logError);
+          sinon.assert.notCalled(utils.logWarn);
+          expect(didHookReturn).to.be.false;
+          expect(bidsBackHandlerReturn).to.be.true;
+          expect(consent).to.be.null;
+          expect(gppDataHandler.ready).to.be.true;
+        });
+
+        describe('when proper consent is not available', () => {
+          let gppStub;
+
+          function runAuction() {
+            setConsentConfig({
+              gpp: {
+                cmpApi: 'iab',
+                timeout: 10,
+              }
+            });
+            return new Promise((resolve, reject) => {
+              requestBidsHook(() => {
+                didHookReturn = true;
+              }, {});
+              setTimeout(() => didHookReturn ? resolve() : reject(new Error('Auction did not run')), 20);
+            })
+          }
+
+          function mockGppCmp(gppdata) {
+            gppStub.callsFake((api, cb) => {
+              if (api === 'addEventListener') {
+                // eslint-disable-next-line standard/no-callback-literal
+                cb({
+                  pingData: {
+                    cmpStatus: 'loaded'
+                  }
+                }, true);
+              }
+              if (api === 'getGPPData') {
+                return gppdata;
+              }
+            });
+          }
+
+          beforeEach(() => {
+            gppStub = sinon.stub(window, '__gpp');
+          });
+
+          afterEach(() => {
+            gppStub.restore();
+          })
+
+          it('should continue auction with null consent when CMP is unresponsive', () => {
+            return runAuction().then(() => {
+              const consent = gppDataHandler.getConsentData();
+              expect(consent.applicableSections).to.deep.equal([]);
+              expect(consent.gppString).to.be.undefined;
+              expect(gppDataHandler.ready).to.be.true;
+            });
+          });
+
+          it('should use consent provided by events other than sectionChange', () => {
+            mockGppCmp({
+              gppString: 'mock-consent-string',
+              applicableSections: [7]
+            });
+            return runAuction().then(() => {
+              const consent = gppDataHandler.getConsentData();
+              expect(consent.applicableSections).to.deep.equal([7]);
+              expect(consent.gppString).to.equal('mock-consent-string');
+              expect(gppDataHandler.ready).to.be.true;
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/consentManagementUsp_spec.js b/test/spec/modules/consentManagementUsp_spec.js
index 2e8d7db92b5..f9c3cd5890e 100644
--- a/test/spec/modules/consentManagementUsp_spec.js
+++ b/test/spec/modules/consentManagementUsp_spec.js
@@ -8,9 +8,10 @@ import {
 } from 'modules/consentManagementUsp.js';
 import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
-import { uspDataHandler } from 'src/adapterManager.js';
+import adapterManager, {uspDataHandler} from 'src/adapterManager.js';
+import 'src/prebid.js';
+import {defer} from '../../../src/utils/promise.js';
 
-let assert = require('chai').assert;
 let expect = require('chai').expect;
 
 function createIFrameMarker() {
@@ -23,8 +24,41 @@ function createIFrameMarker() {
 }
 
 describe('consentManagement', function () {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(adapterManager, 'callDataDeletionRequest');
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  it('should enable itself on requestBids using default values', (done) => {
+    requestBidsHook(() => {
+      expect(uspDataHandler.enabled).to.be.true;
+      expect(consentAPI).to.eql('iab');
+      done();
+    }, {});
+  });
+  it('should respect configuration set after activation', () => {
+    setConsentConfig({
+      usp: {
+        cmpApi: 'static',
+        consentData: {
+          getUSPData: {
+            uspString: '1YYY'
+          }
+        }
+      }
+    });
+    expect(uspDataHandler.getConsentData()).to.equal('1YYY');
+  })
+
   describe('setConsentConfig tests:', function () {
     describe('empty setConsentConfig value', function () {
+      before(resetConsentData);
+
       beforeEach(function () {
         sinon.stub(utils, 'logInfo');
         sinon.stub(utils, 'logWarn');
@@ -37,11 +71,11 @@ describe('consentManagement', function () {
         resetConsentData();
       });
 
-      it('should not run if no config', function () {
+      it('should run with defaults if no config', function () {
         setConsentConfig({});
-        expect(consentAPI).to.be.undefined;
-        expect(consentTimeout).to.be.undefined;
-        sinon.assert.callCount(utils.logWarn, 1);
+        expect(consentAPI).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(50);
+        sinon.assert.callCount(utils.logInfo, 3);
       });
 
       it('should use system default values', function () {
@@ -51,18 +85,36 @@ describe('consentManagement', function () {
         sinon.assert.callCount(utils.logInfo, 3);
       });
 
-      it('should exit the consent manager if config.usp is not an object', function() {
+      it('should not exit the consent manager if config.usp is not an object', function() {
         setConsentConfig({});
-        expect(consentAPI).to.be.undefined;
-        sinon.assert.calledOnce(utils.logWarn);
-        sinon.assert.notCalled(utils.logInfo);
+        expect(consentAPI).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(50);
+        sinon.assert.callCount(utils.logInfo, 3);
+      });
+
+      it('should not produce any USP metadata', function() {
+        setConsentConfig({});
+        let consentMeta = uspDataHandler.getConsentMeta();
+        expect(consentMeta).to.be.undefined;
       });
 
       it('should exit the consent manager if only config.gdpr is an object', function() {
         setConsentConfig({ gdpr: { cmpApi: 'iab' } });
-        expect(consentAPI).to.be.undefined;
-        sinon.assert.calledOnce(utils.logWarn);
-        sinon.assert.notCalled(utils.logInfo);
+        expect(consentAPI).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(50);
+        sinon.assert.callCount(utils.logInfo, 3);
+      });
+
+      it('should exit consentManagementUsp module if config is "undefined"', function() {
+        setConsentConfig(undefined);
+        expect(consentAPI).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(50);
+        sinon.assert.callCount(utils.logInfo, 3);
+      });
+
+      it('should immediately start looking up consent data', () => {
+        setConsentConfig({usp: {cmpApi: 'invalid'}});
+        expect(uspDataHandler.ready).to.be.true;
       });
     });
 
@@ -84,6 +136,21 @@ describe('consentManagement', function () {
         expect(consentAPI).to.be.equal('daa');
         expect(consentTimeout).to.be.equal(7500);
       });
+
+      it('should enable uspDataHandler', () => {
+        setConsentConfig({usp: {cmpApi: 'daa', timeout: 7500}});
+        expect(uspDataHandler.enabled).to.be.true;
+      });
+
+      it('should call setConsentData(null) on invalid CMP api', () => {
+        setConsentConfig({usp: {cmpApi: 'invalid'}});
+        let hookRan = false;
+        requestBidsHook(() => {
+          hookRan = true;
+        }, {});
+        expect(hookRan).to.be.true;
+        expect(uspDataHandler.ready).to.be.true;
+      });
     });
 
     describe('static consent string setConsentConfig value', () => {
@@ -107,6 +174,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);
       });
     });
@@ -185,7 +253,10 @@ describe('consentManagement', function () {
         resetConsentData();
       });
 
-      it('should bypass CMP and simply use previously stored consentData', function () {
+      // from prebid 4425 - "the USP (CCPA) api function __uspapi() always responds synchronously, whether or not privacy data is available, while the GDPR CMP may respond asynchronously
+      // Because the USP API does not wait for a user response, if it was not successfully obtained before the first auction, we should try again to retrieve privacy data before each subsequent auction.
+
+      it('should not bypass CMP and simply use previously stored consentData', function () {
         let testConsentData = {
           uspString: '1YY'
         };
@@ -208,15 +279,44 @@ describe('consentManagement', function () {
         let consent = uspDataHandler.getConsentData();
         expect(didHookReturn).to.be.true;
         expect(consent).to.equal(testConsentData.uspString);
-        sinon.assert.notCalled(uspStub);
+        sinon.assert.called(uspStub);
+      });
+
+      it('should call uspDataHandler.setConsentData(null) on error', () => {
+        let hookRan = false;
+        uspStub = sinon.stub(window, '__uspapi').callsFake((...args) => {
+          args[2](null, false);
+        });
+        requestBidsHook(() => {
+          hookRan = true;
+        }, {});
+        expect(hookRan).to.be.true;
+        expect(uspDataHandler.ready).to.be.true;
+        expect(uspDataHandler.getConsentData()).to.equal(null);
+      });
+
+      it('should call uspDataHandler.setConsentData(null) on timeout', (done) => {
+        setConsentConfig({usp: {timeout: 10}});
+        let hookRan = false;
+        uspStub = sinon.stub(window, '__uspapi').callsFake(() => {});
+        requestBidsHook(() => { hookRan = true; }, {});
+        setTimeout(() => {
+          expect(hookRan).to.be.true;
+          expect(uspDataHandler.ready).to.be.true;
+          expect(uspDataHandler.getConsentData()).to.equal(null);
+          done();
+        }, 20)
       });
     });
 
     describe('USPAPI workflow for iframed page', function () {
       let ifr = null;
       let stringifyResponse = false;
+      let mockApi, replySent;
 
       beforeEach(function () {
+        mockApi = sinon.stub();
+        replySent = defer();
         sinon.stub(utils, 'logError');
         sinon.stub(utils, 'logWarn');
         ifr = createIFrameMarker();
@@ -236,17 +336,21 @@ describe('consentManagement', function () {
 
       function uspapiMessageHandler(event) {
         if (event && event.data) {
-          var data = event.data;
+          const data = event.data;
           if (data.__uspapiCall) {
-            var callId = data.__uspapiCall.callId;
-            var response = {
-              __uspapiReturn: {
-                callId,
-                returnValue: { uspString: '1YY' },
-                success: true
+            const {command, version, callId} = data.__uspapiCall;
+            let response = mockApi(command, version, callId);
+            if (response) {
+              response = {
+                __uspapiReturn: {
+                  callId,
+                  returnValue: response,
+                  success: true
+                }
               }
-            };
-            event.source.postMessage(stringifyResponse ? JSON.stringify(response) : response, '*');
+              event.source.postMessage(stringifyResponse ? JSON.stringify(response) : response, '*');
+              replySent.resolve();
+            }
           }
         }
       }
@@ -259,6 +363,11 @@ describe('consentManagement', function () {
       function testIFramedPage(testName, messageFormatString) {
         it(`should return the consent string from a postmessage + addEventListener response - ${testName}`, (done) => {
           stringifyResponse = messageFormatString;
+          mockApi.callsFake((cmd) => {
+            if (cmd === 'getUSPData') {
+              return { uspString: '1YY' }
+            }
+          })
           setConsentConfig(goodConfig);
           requestBidsHook(() => {
             let consent = uspDataHandler.getConsentData();
@@ -269,6 +378,20 @@ describe('consentManagement', function () {
           }, {});
         });
       }
+
+      it('fires deletion request on registerDeletion', (done) => {
+        mockApi.callsFake((cmd) => {
+          return cmd === 'registerDeletion'
+        })
+        sinon.assert.notCalled(adapterManager.callDataDeletionRequest);
+        setConsentConfig(goodConfig);
+        replySent.promise.then(() => {
+          setTimeout(() => { // defer again to give time for the message to get through
+            sinon.assert.calledOnce(adapterManager.callDataDeletionRequest);
+            done()
+          }, 200)
+        })
+      });
     });
 
     describe('test without iframe locater', function() {
@@ -314,23 +437,19 @@ describe('consentManagement', function () {
     });
 
     describe('USPAPI workflow for normal pages:', function () {
-      let uspapiStub = sinon.stub();
       let ifr = null;
 
       beforeEach(function () {
         didHookReturn = false;
         ifr = createIFrameMarker();
-        sinon.stub(utils, 'logError');
-        sinon.stub(utils, 'logWarn');
+        sandbox.stub(utils, 'logError');
+        sandbox.stub(utils, 'logWarn');
         window.__uspapi = function() {};
       });
 
       afterEach(function () {
         config.resetConfig();
         $$PREBID_GLOBAL$$.requestBids.removeAll();
-        uspapiStub.restore();
-        utils.logError.restore();
-        utils.logWarn.restore();
         document.body.removeChild(ifr);
         delete window.__uspapi;
         resetConsentData();
@@ -341,7 +460,7 @@ describe('consentManagement', function () {
           uspString: '1NY'
         };
 
-        uspapiStub = sinon.stub(window, '__uspapi').callsFake((...args) => {
+        sandbox.stub(window, '__uspapi').callsFake((...args) => {
           args[2](testConsentData, true);
         });
 
@@ -356,6 +475,40 @@ describe('consentManagement', function () {
         expect(didHookReturn).to.be.true;
         expect(consent).to.equal(testConsentData.uspString);
       });
+
+      it('returns USP consent metadata', function () {
+        let testConsentData = {
+          uspString: '1NY'
+        };
+
+        sandbox.stub(window, '__uspapi').callsFake((...args) => {
+          args[2](testConsentData, true);
+        });
+
+        setConsentConfig(goodConfig);
+        requestBidsHook(() => { didHookReturn = true; }, {});
+
+        let consentMeta = uspDataHandler.getConsentMeta();
+
+        sinon.assert.notCalled(utils.logWarn);
+        sinon.assert.notCalled(utils.logError);
+
+        expect(consentMeta.usp).to.equal(testConsentData.uspString);
+        expect(consentMeta.generatedAt).to.be.above(1644367751709);
+      });
+
+      it('registers deletion request event listener', () => {
+        let listener;
+        sandbox.stub(window, '__uspapi').callsFake((cmd, _, cb) => {
+          if (cmd === 'registerDeletion') {
+            listener = cb;
+          }
+        });
+        setConsentConfig(goodConfig);
+        sinon.assert.notCalled(adapterManager.callDataDeletionRequest);
+        listener();
+        sinon.assert.calledOnce(adapterManager.callDataDeletionRequest);
+      })
     });
   });
 });
diff --git a/test/spec/modules/consentManagement_spec.js b/test/spec/modules/consentManagement_spec.js
index c4f6fe70dd1..47a2e2ab3d9 100644
--- a/test/spec/modules/consentManagement_spec.js
+++ b/test/spec/modules/consentManagement_spec.js
@@ -1,7 +1,8 @@
-import { setConsentConfig, requestBidsHook, resetConsentData, userCMP, consentTimeout, allowAuction, staticConsentData, gdprScope } from 'modules/consentManagement.js';
+import { setConsentConfig, requestBidsHook, resetConsentData, userCMP, consentTimeout, staticConsentData, gdprScope } from 'modules/consentManagement.js';
 import { gdprDataHandler } from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
+import 'src/prebid.js';
 
 let expect = require('chai').expect;
 
@@ -24,9 +25,8 @@ describe('consentManagement', function () {
         setConsentConfig({});
         expect(userCMP).to.be.equal('iab');
         expect(consentTimeout).to.be.equal(10000);
-        expect(allowAuction).to.be.true;
         expect(gdprScope).to.be.equal(false);
-        sinon.assert.callCount(utils.logInfo, 4);
+        sinon.assert.callCount(utils.logInfo, 3);
       });
 
       it('should exit consent manager if config is not an object', function () {
@@ -40,6 +40,24 @@ describe('consentManagement', function () {
         expect(userCMP).to.be.undefined;
         sinon.assert.calledOnce(utils.logWarn);
       });
+
+      it('should exit consentManagement module if config is "undefined"', function() {
+        setConsentConfig(undefined);
+        expect(userCMP).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      });
+
+      it('should not produce any consent metadata', function() {
+        setConsentConfig(undefined)
+        let consentMetadata = gdprDataHandler.getConsentMeta();
+        expect(consentMetadata).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      })
+
+      it('should immediately look up consent data', () => {
+        setConsentConfig({gdpr: {cmpApi: 'invalid'}});
+        expect(gdprDataHandler.ready).to.be.true;
+      })
     });
 
     describe('valid setConsentConfig value', function () {
@@ -51,14 +69,12 @@ describe('consentManagement', function () {
         let allConfig = {
           cmpApi: 'iab',
           timeout: 7500,
-          allowAuctionWithoutConsent: false,
           defaultGdprScope: true
         };
 
         setConsentConfig(allConfig);
         expect(userCMP).to.be.equal('iab');
         expect(consentTimeout).to.be.equal(7500);
-        expect(allowAuction).to.be.false;
         expect(gdprScope).to.be.true;
       });
 
@@ -104,75 +120,29 @@ describe('consentManagement', function () {
         setConsentConfig({
           cmpApi: 'iab',
           timeout: 3333,
-          allowAuctionWithoutConsent: false,
           gdpr: false
         });
 
         expect(userCMP).to.be.equal('iab');
         expect(consentTimeout).to.be.equal(3333);
-        expect(allowAuction).to.be.equal(false);
         expect(gdprScope).to.be.equal(false);
       });
+
+      it('should enable gdprDataHandler', () => {
+        setConsentConfig({gdpr: {}});
+        expect(gdprDataHandler.enabled).to.be.true;
+      });
     });
 
     describe('static consent string setConsentConfig value', () => {
       afterEach(() => {
         config.resetConfig();
       });
-      it('results in user settings overriding system defaults for v1 spec', () => {
-        let staticConfig = {
-          cmpApi: 'static',
-          timeout: 7500,
-          allowAuctionWithoutConsent: false,
-          consentData: {
-            getConsentData: {
-              'gdprApplies': true,
-              'hasGlobalScope': false,
-              'consentData': 'BOOgjO9OOgjO9APABAENAi-AAAAWd7_______9____7_9uz_Gv_r_ff_3nW0739P1A_r_Oz_rm_-zzV44_lpQQRCEA'
-            },
-            getVendorConsents: {
-              'metadata': 'BOOgjO9OOgjO9APABAENAi-AAAAWd7_______9____7_9uz_Gv_r_ff_3nW0739P1A_r_Oz_rm_-zzV44_lpQQRCEA',
-              'gdprApplies': true,
-              'hasGlobalScope': false,
-              'isEU': true,
-              'cookieVersion': 1,
-              'created': '2018-05-29T07:45:48.522Z',
-              'lastUpdated': '2018-05-29T07:45:48.522Z',
-              'cmpId': 15,
-              'cmpVersion': 1,
-              'consentLanguage': 'EN',
-              'vendorListVersion': 34,
-              'maxVendorId': 359,
-              'purposeConsents': {
-                '1': true,
-                '2': true,
-                '3': true,
-                '4': true,
-                '5': true
-              },
-              'vendorConsents': {
-                '1': true,
-                '2': true,
-                '3': true,
-                '4': true,
-                '5': false
-              }
-            }
-          }
-        };
-
-        setConsentConfig(staticConfig);
-        expect(userCMP).to.be.equal('static');
-        expect(consentTimeout).to.be.equal(0); // should always return without a timeout when config is used
-        expect(allowAuction).to.be.false;
-        expect(staticConsentData).to.be.equal(staticConfig.consentData);
-      });
 
       it('results in user settings overriding system defaults for v2 spec', () => {
         let staticConfig = {
           cmpApi: 'static',
           timeout: 7500,
-          allowAuctionWithoutConsent: false,
           consentData: {
             getTCData: {
               'tcString': 'COuqj-POu90rDBcBkBENAZCgAPzAAAPAACiQFwwBAABAA1ADEAbQC4YAYAAgAxAG0A',
@@ -244,32 +214,33 @@ describe('consentManagement', function () {
         setConsentConfig(staticConfig);
         expect(userCMP).to.be.equal('static');
         expect(consentTimeout).to.be.equal(0); // should always return without a timeout when config is used
-        expect(allowAuction).to.be.false;
         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);
       });
     });
   });
 
   describe('requestBidsHook tests:', function () {
-    let goodConfigWithCancelAuction = {
+    let goodConfig = {
       cmpApi: 'iab',
       timeout: 7500,
-      allowAuctionWithoutConsent: false
     };
 
-    let goodConfigWithAllowAuction = {
-      cmpApi: 'iab',
+    const staticConfig = {
+      cmpApi: 'static',
       timeout: 7500,
-      allowAuctionWithoutConsent: true
-    };
+      consentData: {
+        getTCData: {}
+      }
+    }
 
     let didHookReturn;
 
-    afterEach(function () {
-      gdprDataHandler.consentData = null;
-      resetConsentData();
-    });
+    beforeEach(resetConsentData);
+    after(resetConsentData)
 
     describe('error checks:', function () {
       beforeEach(function () {
@@ -282,7 +253,6 @@ describe('consentManagement', function () {
         utils.logWarn.restore();
         utils.logError.restore();
         config.resetConfig();
-        resetConsentData();
       });
 
       it('should throw a warning and return to hooked function when an unknown CMP framework ID is used', function () {
@@ -301,8 +271,16 @@ describe('consentManagement', function () {
         expect(consent).to.be.null;
       });
 
+      it('should call gpdrDataHandler.setConsentData() when unknown CMP api is used', () => {
+        setConsentConfig({gdpr: {cmpApi: 'invalid'}});
+        let hookRan = false;
+        requestBidsHook(() => { hookRan = true; }, {});
+        expect(hookRan).to.be.true;
+        expect(gdprDataHandler.ready).to.be.true;
+      })
+
       it('should throw proper errors when CMP is not found', function () {
-        setConsentConfig(goodConfigWithCancelAuction);
+        setConsentConfig(goodConfig);
 
         requestBidsHook(() => {
           didHookReturn = true;
@@ -312,41 +290,71 @@ describe('consentManagement', function () {
         sinon.assert.calledTwice(utils.logError);
         expect(didHookReturn).to.be.false;
         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;
+        });
       });
+
+      it('should continue the auction immediately, without consent data, if timeout is 0', (done) => {
+        setConsentConfig({
+          cmpApi: 'iab',
+          timeout: 0,
+          defaultGdprScope: true
+        });
+        window.__tcfapi = function () {};
+        try {
+          requestBidsHook(() => {
+            const consent = gdprDataHandler.getConsentData();
+            expect(consent.gdprApplies).to.be.true;
+            expect(consent.consentString).to.be.undefined;
+            done();
+          }, {})
+        } finally {
+          delete window.__tcfapi;
+        }
+      })
     });
 
     describe('already known consentData:', function () {
       let cmpStub = sinon.stub();
 
+      function mockCMP(cmpResponse) {
+        return function(...args) {
+          args[2](Object.assign({eventStatus: 'tcloaded'}, cmpResponse), true);
+        }
+      }
+
       beforeEach(function () {
         didHookReturn = false;
-        window.__cmp = function () { };
+        window.__tcfapi = function () { };
       });
 
       afterEach(function () {
         config.resetConfig();
         cmpStub.restore();
-        delete window.__cmp;
+        delete window.__tcfapi;
         resetConsentData();
       });
 
       it('should bypass CMP and simply use previously stored consentData', function () {
         let testConsentData = {
           gdprApplies: true,
-          consentData: 'xyz'
+          tcString: 'xyz',
         };
 
-        cmpStub = sinon.stub(window, '__cmp').callsFake((...args) => {
-          args[2](testConsentData);
-        });
-        setConsentConfig(goodConfigWithAllowAuction);
+        cmpStub = sinon.stub(window, '__tcfapi').callsFake(mockCMP(testConsentData));
+        setConsentConfig(goodConfig);
         requestBidsHook(() => { }, {});
-        cmpStub.restore();
-
-        // reset the stub to ensure it wasn't called during the second round of calls
-        cmpStub = sinon.stub(window, '__cmp').callsFake((...args) => {
-          args[2](testConsentData);
-        });
+        cmpStub.reset();
 
         requestBidsHook(() => {
           didHookReturn = true;
@@ -354,7 +362,7 @@ describe('consentManagement', function () {
         let consent = gdprDataHandler.getConsentData();
 
         expect(didHookReturn).to.be.true;
-        expect(consent.consentString).to.equal(testConsentData.consentData);
+        expect(consent.consentString).to.equal(testConsentData.tcString);
         expect(consent.gdprApplies).to.be.true;
         sinon.assert.notCalled(cmpStub);
       });
@@ -362,12 +370,10 @@ describe('consentManagement', function () {
       it('should not set consent.gdprApplies to true if defaultGdprScope is true', function () {
         let testConsentData = {
           gdprApplies: false,
-          consentData: 'xyz'
+          tcString: 'xyz',
         };
 
-        cmpStub = sinon.stub(window, '__cmp').callsFake((...args) => {
-          args[2](testConsentData);
-        });
+        cmpStub = sinon.stub(window, '__tcfapi').callsFake(mockCMP(testConsentData));
 
         setConsentConfig({
           cmpApi: 'iab',
@@ -420,10 +426,9 @@ describe('consentManagement', function () {
       function testIFramedPage(testName, messageFormatString, tarConsentString, ver) {
         it(`should return the consent string from a postmessage + addEventListener response - ${testName}`, (done) => {
           stringifyResponse = messageFormatString;
-          setConsentConfig(goodConfigWithAllowAuction);
+          setConsentConfig(goodConfig);
           requestBidsHook(() => {
             let consent = gdprDataHandler.getConsentData();
-            sinon.assert.notCalled(utils.logWarn);
             sinon.assert.notCalled(utils.logError);
             expect(consent.consentString).to.equal(tarConsentString);
             expect(consent.gdprApplies).to.be.true;
@@ -445,84 +450,6 @@ describe('consentManagement', function () {
         resetConsentData();
       });
 
-      describe('v1 CMP workflow for safeframe page', function () {
-        let registerStub = sinon.stub();
-        let ifrSf = null;
-        beforeEach(function () {
-          didHookReturn = false;
-          window.$sf = {
-            ext: {
-              register: function () { },
-              cmp: function () { }
-            }
-          };
-          ifrSf = createIFrameMarker('__cmpLocator');
-        });
-
-        afterEach(function () {
-          delete window.$sf;
-          registerStub.restore();
-          document.body.removeChild(ifrSf);
-        });
-
-        it('should return the consent data from a safeframe callback', function () {
-          let testConsentData = {
-            data: {
-              msgName: 'cmpReturn',
-              vendorConsents: {
-                metadata: 'abc123def',
-                gdprApplies: true
-              },
-              vendorConsentData: {
-                consentData: 'abc123def',
-                gdprApplies: true
-              }
-            }
-          };
-          registerStub = sinon.stub(window.$sf.ext, 'register').callsFake((...args) => {
-            args[2](testConsentData.data.msgName, testConsentData.data);
-          });
-
-          setConsentConfig(goodConfigWithAllowAuction);
-          requestBidsHook(() => {
-            didHookReturn = true;
-          }, { adUnits: [{ sizes: [[300, 250]] }] });
-          let consent = gdprDataHandler.getConsentData();
-
-          sinon.assert.notCalled(utils.logWarn);
-          sinon.assert.notCalled(utils.logError);
-          expect(didHookReturn).to.be.true;
-          expect(consent.consentString).to.equal('abc123def');
-          expect(consent.gdprApplies).to.be.true;
-          expect(consent.apiVersion).to.equal(1);
-        });
-      });
-
-      describe('v1 CMP workflow for iframe pages', function () {
-        stringifyResponse = false;
-        let ifr1 = null;
-
-        beforeEach(function () {
-          ifr1 = createIFrameMarker('__cmpLocator');
-          cmpPostMessageCb = creatCmpMessageHandler('__cmp', {
-            consentData: 'encoded_consent_data_via_post_message',
-            gdprApplies: true,
-          });
-          window.addEventListener('message', cmpPostMessageCb, false);
-        });
-
-        afterEach(function () {
-          delete window.__cmp; // deletes the local copy made by the postMessage CMP call function
-          document.body.removeChild(ifr1);
-          window.removeEventListener('message', cmpPostMessageCb);
-        });
-
-        // Run tests with JSON response and String response
-        // from CMP window postMessage listener.
-        testIFramedPage('with/JSON response', false, 'encoded_consent_data_via_post_message', 1);
-        testIFramedPage('with/String response', true, 'encoded_consent_data_via_post_message', 1);
-      });
-
       describe('v2 CMP workflow for iframe pages:', function () {
         stringifyResponse = false;
         let ifr2 = null;
@@ -546,6 +473,15 @@ describe('consentManagement', function () {
 
         testIFramedPage('with/JSON response', false, 'abc12345234', 2);
         testIFramedPage('with/String response', true, 'abc12345234', 2);
+
+        it('should contain correct v2 CMP definition', (done) => {
+          setConsentConfig(goodConfig);
+          requestBidsHook(() => {
+            const nbArguments = window.__tcfapi.toString().split('\n')[0].split(', ').length;
+            expect(nbArguments).to.equal(4);
+            done();
+          }, {});
+        });
       });
     });
 
@@ -566,52 +502,70 @@ describe('consentManagement', function () {
         resetConsentData();
       });
 
-      describe('v1 CMP workflow for normal pages:', function () {
-        beforeEach(function () {
-          window.__cmp = function () { };
+      describe('v2 CMP workflow for normal pages:', function () {
+        beforeEach(function() {
+          window.__tcfapi = function () { };
         });
 
         afterEach(function () {
-          delete window.__cmp;
+          delete window.__tcfapi;
         });
 
         it('performs lookup check and stores consentData for a valid existing user', function () {
           let testConsentData = {
+            tcString: 'abc12345234',
             gdprApplies: true,
-            consentData: 'BOJy+UqOJy+UqABAB+AAAAAZ+A=='
+            purposeOneTreatment: false,
+            eventStatus: 'tcloaded'
           };
-          cmpStub = sinon.stub(window, '__cmp').callsFake((...args) => {
-            args[2](testConsentData);
+          cmpStub = sinon.stub(window, '__tcfapi').callsFake((...args) => {
+            args[2](testConsentData, true);
           });
 
-          setConsentConfig(goodConfigWithAllowAuction);
+          setConsentConfig(goodConfig);
 
           requestBidsHook(() => {
             didHookReturn = true;
           }, {});
           let consent = gdprDataHandler.getConsentData();
-
-          sinon.assert.notCalled(utils.logWarn);
           sinon.assert.notCalled(utils.logError);
           expect(didHookReturn).to.be.true;
-          expect(consent.consentString).to.equal(testConsentData.consentData);
+          expect(consent.consentString).to.equal(testConsentData.tcString);
           expect(consent.gdprApplies).to.be.true;
-          expect(consent.apiVersion).to.equal(1);
+          expect(consent.apiVersion).to.equal(2);
         });
-      });
 
-      describe('v2 CMP workflow for normal pages:', function () {
-        beforeEach(function() {
-          window.__tcfapi = function () { };
-        });
+        it('produces gdpr metadata', function () {
+          let testConsentData = {
+            tcString: 'abc12345234',
+            gdprApplies: true,
+            purposeOneTreatment: false,
+            eventStatus: 'tcloaded',
+            vendorData: {
+              tcString: 'abc12345234'
+            }
+          };
+          cmpStub = sinon.stub(window, '__tcfapi').callsFake((...args) => {
+            args[2](testConsentData, true);
+          });
 
-        afterEach(function () {
-          delete window.__tcfapi;
+          setConsentConfig(goodConfig);
+
+          requestBidsHook(() => {
+            didHookReturn = true;
+          }, {});
+          let consentMeta = gdprDataHandler.getConsentMeta();
+          sinon.assert.notCalled(utils.logError);
+          expect(consentMeta.consentStringSize).to.be.above(0)
+          expect(consentMeta.gdprApplies).to.be.true;
+          expect(consentMeta.apiVersion).to.equal(2);
+          expect(consentMeta.generatedAt).to.be.above(1644367751709);
         });
 
-        it('performs lookup check and stores consentData for a valid existing user', function () {
+        it('performs lookup check and stores consentData for a valid existing user with additional consent', function () {
           let testConsentData = {
             tcString: 'abc12345234',
+            addtlConsent: 'superduperstring',
             gdprApplies: true,
             purposeOneTreatment: false,
             eventStatus: 'tcloaded'
@@ -620,21 +574,21 @@ describe('consentManagement', function () {
             args[2](testConsentData, true);
           });
 
-          setConsentConfig(goodConfigWithAllowAuction);
+          setConsentConfig(goodConfig);
 
           requestBidsHook(() => {
             didHookReturn = true;
           }, {});
           let consent = gdprDataHandler.getConsentData();
-          sinon.assert.notCalled(utils.logWarn);
           sinon.assert.notCalled(utils.logError);
           expect(didHookReturn).to.be.true;
           expect(consent.consentString).to.equal(testConsentData.tcString);
+          expect(consent.addtlConsent).to.equal(testConsentData.addtlConsent);
           expect(consent.gdprApplies).to.be.true;
           expect(consent.apiVersion).to.equal(2);
         });
 
-        it('throws an error when processCmpData check failed while config had allowAuction set to false', function () {
+        it('throws an error when processCmpData check fails + does not call requestBids callback', function () {
           let testConsentData = {};
           let bidsBackHandlerReturn = false;
 
@@ -642,7 +596,12 @@ describe('consentManagement', function () {
             args[2](testConsentData);
           });
 
-          setConsentConfig(goodConfigWithCancelAuction);
+          setConsentConfig(goodConfig);
+
+          sinon.assert.notCalled(utils.logWarn);
+          sinon.assert.notCalled(utils.logError);
+
+          [utils.logWarn, utils.logError].forEach((stub) => stub.reset());
 
           requestBidsHook(() => {
             didHookReturn = true;
@@ -650,9 +609,91 @@ describe('consentManagement', function () {
           let consent = gdprDataHandler.getConsentData();
 
           sinon.assert.calledOnce(utils.logError);
+          sinon.assert.notCalled(utils.logWarn);
           expect(didHookReturn).to.be.false;
           expect(bidsBackHandlerReturn).to.be.true;
           expect(consent).to.be.null;
+          expect(gdprDataHandler.ready).to.be.true;
+        });
+
+        describe('when proper consent is not available', () => {
+          let tcfStub;
+
+          function runAuction() {
+            setConsentConfig({
+              cmpApi: 'iab',
+              timeout: 10,
+              defaultGdprScope: true
+            });
+            return new Promise((resolve, reject) => {
+              requestBidsHook(() => {
+                didHookReturn = true;
+              }, {});
+              setTimeout(() => didHookReturn ? resolve() : reject(new Error('Auction did not run')), 20);
+            })
+          }
+
+          function mockTcfEvent(tcdata) {
+            tcfStub.callsFake((api, version, cb) => {
+              if (api === 'addEventListener' && version === 2) {
+                // eslint-disable-next-line standard/no-callback-literal
+                cb(tcdata, true)
+              }
+            });
+          }
+
+          beforeEach(() => {
+            tcfStub = sinon.stub(window, '__tcfapi');
+          });
+
+          afterEach(() => {
+            tcfStub.restore();
+          })
+
+          it('should continue auction with null consent when CMP is unresponsive', () => {
+            return runAuction().then(() => {
+              const consent = gdprDataHandler.getConsentData();
+              expect(consent.gdprApplies).to.be.true;
+              expect(consent.consentString).to.be.undefined;
+              expect(gdprDataHandler.ready).to.be.true;
+            });
+          });
+
+          it('should use consent provided by events other than tcloaded', () => {
+            mockTcfEvent({
+              eventStatus: 'cmpuishown',
+              tcString: 'mock-consent-string',
+              vendorData: {}
+            });
+            return runAuction().then(() => {
+              const consent = gdprDataHandler.getConsentData();
+              expect(consent.gdprApplies).to.be.true;
+              expect(consent.consentString).to.equal('mock-consent-string');
+              expect(consent.vendorData.vendorData).to.eql({});
+              expect(gdprDataHandler.ready).to.be.true;
+            });
+          });
+
+          Object.entries({
+            'null': null,
+            'empty': '',
+            'undefined': undefined
+          }).forEach(([t, cs]) => {
+            // some CMPs appear to reply with an empty consent string in 'cmpuishown' - make sure we don't use that
+            it(`should NOT use "default" consent if string is ${t}`, () => {
+              mockTcfEvent({
+                eventStatus: 'cmpuishown',
+                tcString: cs,
+                vendorData: {random: 'junk'}
+              });
+              return runAuction().then(() => {
+                const consent = gdprDataHandler.getConsentData();
+                expect(consent.gdprApplies).to.be.true;
+                expect(consent.consentString).to.be.undefined;
+                expect(consent.vendorData).to.be.undefined;
+              });
+            })
+          });
         });
 
         it('It still considers it a valid cmp response if gdprApplies is not a boolean', function () {
@@ -676,34 +717,12 @@ describe('consentManagement', function () {
             didHookReturn = true;
           }, {});
           let consent = gdprDataHandler.getConsentData();
-          sinon.assert.notCalled(utils.logWarn);
           sinon.assert.notCalled(utils.logError);
           expect(didHookReturn).to.be.true;
           expect(consent.consentString).to.equal(testConsentData.tcString);
           expect(consent.gdprApplies).to.be.true;
           expect(consent.apiVersion).to.equal(2);
         });
-
-        it('throws a warning + stores consentData + calls callback when processCmpData check failed while config had allowAuction set to true', function () {
-          let testConsentData = {};
-
-          cmpStub = sinon.stub(window, '__tcfapi').callsFake((...args) => {
-            args[2](testConsentData);
-          });
-
-          setConsentConfig(goodConfigWithAllowAuction);
-
-          requestBidsHook(() => {
-            didHookReturn = true;
-          }, {});
-          let consent = gdprDataHandler.getConsentData();
-
-          sinon.assert.calledOnce(utils.logWarn);
-          expect(didHookReturn).to.be.true;
-          expect(consent.consentString).to.be.undefined;
-          expect(consent.gdprApplies).to.be.false;
-          expect(consent.apiVersion).to.equal(2);
-        });
       });
     });
   });
diff --git a/test/spec/modules/consumableBidAdapter_spec.js b/test/spec/modules/consumableBidAdapter_spec.js
index 44076194885..d1b310624a6 100644
--- a/test/spec/modules/consumableBidAdapter_spec.js
+++ b/test/spec/modules/consumableBidAdapter_spec.js
@@ -1,6 +1,9 @@
 import {expect} from 'chai';
 import {spec} from 'modules/consumableBidAdapter.js';
 import {createBid} from 'src/bidfactory.js';
+import {config} from 'src/config.js';
+import {deepClone} from 'src/utils.js';
+import { createEidsArray } from 'modules/userId/eids.js';
 
 const ENDPOINT = 'https://e.serverbid.com/api/v2';
 const SMARTSYNC_CALLBACK = 'serverbidCallBids';
@@ -30,6 +33,22 @@ const BIDDER_REQUEST_1 = {
       transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
     }
   ],
+  schain: {
+    'ver': '1.0',
+    'complete': 1,
+    'nodes': [
+      {
+        'asi': 'indirectseller.com',
+        'sid': '00001',
+        'hp': 1
+      },
+      {
+        'asi': 'indirectseller-2.com',
+        'sid': '00002',
+        'hp': 2
+      },
+    ]
+  },
   gdprConsent: {
     consentString: 'consent-test',
     gdprApplies: false
@@ -110,6 +129,53 @@ const BIDDER_REQUEST_2 = {
   }
 };
 
+const BIDDER_REQUEST_VIDEO = {
+  bidderCode: 'consumable',
+  auctionId: 'a4713c32-3762-4798-b342-4ab810ca770d',
+  bidderRequestId: '109f2a181342a9',
+  bidRequest: [
+    {
+      bidder: 'consumable',
+      params: {
+        networkId: 9969,
+        siteId: 730181,
+        unitId: 123456,
+        unitName: 'cnsmbl-unit'
+      },
+      placementCode: 'div-gpt-ad-1487778092495-0',
+      mediaTypes: {
+        video: {
+          playerSize: [188, 106],
+          context: 'instream',
+          mimes: ['application/javascript', 'application/x-mpegurl', 'video/3gpp', 'video/mp4', 'video/mpeg', 'video/ogg', 'video/webm', 'video/x-m4v', 'video/x-ms-asf', 'video/x-ms-wmv', 'video/x-msvideo'],
+          minduration: 0,
+          maxduration: 120,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          api: [1, 2],
+          linearity: 1
+        }
+      },
+      bidId: '6202d555b2f94537',
+      bidderRequestId: '109f2a181342a9',
+      auctionId: 'a4713c32-3762-4798-b342-4ab810ca770d'
+    }
+  ],
+  gdprConsent: {
+    consentString: 'consent-test',
+    gdprApplies: true
+  },
+  refererInfo: {
+    referer: 'http://example.com/page.html',
+    reachedTop: true,
+    numIframes: 2,
+    stack: [
+      'http://example.com/page.html',
+      'http://example.com/iframe1.html',
+      'http://example.com/iframe2.html'
+    ]
+  }
+};
+
 const BIDDER_REQUEST_EMPTY = {
   bidderCode: 'consumable',
   auctionId: 'b06458ef-4fe5-4a0b-a61b-bccbcedb7b11',
@@ -177,6 +243,121 @@ const AD_SERVER_RESPONSE = {
   }
 };
 
+const AD_SERVER_RESPONSE_2 = {
+  'headers': null,
+  'body': {
+    'user': { 'key': 'ue1-2d33e91b71e74929b4aeecc23f4376f1' },
+    'pixels': [{ 'type': 'image', 'url': '//sync.serverbid.com/ss/' }],
+    'bdr': 'notcx',
+    'decisions': {
+      '2b0f82502298c9': {
+        'adId': 2364764,
+        'creativeId': 1950991,
+        'flightId': 2788300,
+        'campaignId': 542982,
+        'clickUrl': 'https://e.serverbid.com/r',
+        'impressionUrl': 'https://e.serverbid.com/i.gif',
+        'contents': [{
+          'type': 'html',
+          'body': '<html></html>',
+          'data': {
+            'height': 90,
+            'width': 728,
+            'imageUrl': 'https://static.adzerk.net/Advertisers/b0ab77db8a7848c8b78931aed022a5ef.gif',
+            'fileName': 'b0ab77db8a7848c8b78931aed022a5ef.gif'
+          },
+          'template': 'image'
+        }],
+        'height': 90,
+        'width': 728,
+        'events': [],
+        'pricing': {'price': 0.5, 'clearPrice': 0.5, 'revenue': 0.0005, 'rateType': 2, 'eCPM': 0.5},
+        'mediaType': 'banner',
+        'cats': ['IAB1', 'IAB2', 'IAB3'],
+        'networkId': 1234567,
+      },
+      '123': {
+        'adId': 2364764,
+        'creativeId': 1950991,
+        'flightId': 2788300,
+        'campaignId': 542982,
+        'clickUrl': 'https://e.serverbid.com/r',
+        'impressionUrl': 'https://e.serverbid.com/i.gif',
+        'contents': [{
+          'type': 'html',
+          'body': '<html></html>',
+          'data': {
+            'height': 90,
+            'width': 728,
+            'imageUrl': 'https://static.adzerk.net/Advertisers/b0ab77db8a7848c8b78931aed022a5ef.gif',
+            'fileName': 'b0ab77db8a7848c8b78931aed022a5ef.gif'
+          },
+          'template': 'image'
+        }],
+        'height': 90,
+        'width': 728,
+        'events': [],
+        'pricing': {'price': 0.5, 'clearPrice': 0.5, 'revenue': 0.0005, 'rateType': 2, 'eCPM': 0.5},
+        'mediaType': 'banner',
+        'cats': ['IAB1', 'IAB2'],
+        'networkId': 2345678,
+      }
+    }
+  }
+};
+
+const AD_SERVER_RESPONSE_VIDEO_1 = {
+  'headers': null,
+  'body': {
+    'user': { 'key': 'ue1-2d33e91b71e74929b4aeecc23f4376f1' },
+    'pixels': [{ 'type': 'image', 'url': '//sync.serverbid.com/ss/' }],
+    'decisions': {
+      '6202d555b2f94537': {
+        'adId': 3866158402,
+        'creativeId': 'C1-somo-test-video',
+        'width': 640,
+        'height': 480,
+        'pricing': {
+          'clearPrice': 1.58
+        },
+        'vastUrl': 'https://x.serverbid.com/rtb/v?auc=217c051d06b011ed9cbc72b17f01ec03&sc=1.575&s=22&a=9dcab16d340d664310c2135a76989fe946a9d46e5d5f24ff5e2f17bffbb7704a43638bd3f600951e&n=9&r=0&t=1658158906595',
+        'uuid': 'f1e7287514ce11ed9c1de2b3ba87449a',
+        'bidderName': 'consumable',
+        'adomain': ['consumabletv.com'],
+        'cats': ['IAB3-1'],
+        'mediaType': 'video',
+        'networkId': 1
+      }
+    }
+  }
+};
+
+const AD_SERVER_RESPONSE_VIDEO_2 = {
+  'headers': null,
+  'body': {
+    'user': { 'key': 'ue1-2d33e91b71e74929b4aeecc23f4376f1' },
+    'pixels': [{ 'type': 'image', 'url': '//sync.serverbid.com/ss/' }],
+    'decisions': {
+      '6202d555b2f94537': {
+        'adId': 3866158402,
+        'creativeId': 'C1-somo-test-video',
+        'width': 640,
+        'height': 480,
+        'pricing': {
+          'clearPrice': 1.58
+        },
+        'vastXml': '<VAST version="3.0">',
+        'uuid': 'f1e7287514ce11ed9c1de2b3ba87449a',
+        'bidderName': 'consumable',
+        'adomain': ['consumabletv.com'],
+        'cats': ['IAB3-1'],
+        'mediaType': 'video',
+        'networkId': 1
+      }
+    }
+  }
+};
+
 const BUILD_REQUESTS_OUTPUT = {
   method: 'POST',
   url: 'https://e.serverbid.com/api/v2',
@@ -185,6 +366,14 @@ const BUILD_REQUESTS_OUTPUT = {
   bidderRequest: BIDDER_REQUEST_2
 };
 
+const BUILD_REQUESTS_VIDEO_OUTPUT = {
+  method: 'POST',
+  url: 'https://e.serverbid.com/api/v2',
+  data: '',
+  bidRequest: BIDDER_REQUEST_VIDEO.bidRequest,
+  bidderRequest: BIDDER_REQUEST_VIDEO
+};
+
 describe('Consumable BidAdapter', function () {
   let adapter = spec;
 
@@ -269,7 +458,63 @@ describe('Consumable BidAdapter', function () {
       let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
 
       expect(request.bidderRequest).to.equal(BIDDER_REQUEST_1);
-    })
+    });
+
+    it('should contain schain if it exists in the bidRequest', function () {
+      let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+
+      expect(data.schain).to.deep.equal(BIDDER_REQUEST_1.schain)
+    });
+
+    it('should not contain schain if it does not exist in the bidRequest', function () {
+      let request = spec.buildRequests(BIDDER_REQUEST_2.bidRequest, BIDDER_REQUEST_2);
+      let data = JSON.parse(request.data);
+
+      expect(data.schain).to.be.undefined;
+    });
+
+    it('should contain coppa if configured', function () {
+      config.setConfig({ coppa: true });
+      let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+
+      expect(data.coppa).to.be.true;
+    });
+
+    it('should not contain coppa if not configured', function () {
+      config.setConfig({ coppa: false });
+      let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+
+      expect(data.coppa).to.be.undefined;
+    });
+
+    it('should contain video object for video requests', function () {
+      let request = spec.buildRequests(BIDDER_REQUEST_VIDEO.bidRequest, BIDDER_REQUEST_VIDEO);
+      let data = JSON.parse(request.data);
+
+      expect(data.placements[0].video).to.deep.equal(BIDDER_REQUEST_VIDEO.bidRequest[0].mediaTypes.video);
+    });
+
+    it('sets bidfloor param if present', function () {
+      let bidderRequest1 = deepClone(BIDDER_REQUEST_1);
+      let bidderRequest2 = deepClone(BIDDER_REQUEST_2);
+      bidderRequest1.bidRequest[0].params.bidFloor = 0.05;
+      bidderRequest2.bidRequest[0].getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 0.15
+        }
+      };
+      let request1 = spec.buildRequests(bidderRequest1.bidRequest, BIDDER_REQUEST_1);
+      let data1 = JSON.parse(request1.data);
+      let request2 = spec.buildRequests(bidderRequest2.bidRequest, BIDDER_REQUEST_2);
+      let data2 = JSON.parse(request2.data);
+
+      expect(data1.placements[0].bidfloor).to.equal(0.05);
+      expect(data2.placements[0].bidfloor).to.equal(0.15);
+    });
   });
   describe('interpretResponse validation', function () {
     it('response should have valid bidderCode', function () {
@@ -285,7 +530,7 @@ describe('Consumable BidAdapter', function () {
     });
 
     it('registers bids', function () {
-      let bids = spec.interpretResponse(AD_SERVER_RESPONSE, BUILD_REQUESTS_OUTPUT);
+      let bids = spec.interpretResponse(AD_SERVER_RESPONSE_2, BUILD_REQUESTS_OUTPUT);
       bids.forEach(b => {
         expect(b).to.have.property('cpm');
         expect(b.cpm).to.be.above(0);
@@ -301,9 +546,39 @@ describe('Consumable BidAdapter', function () {
         expect(b).to.have.property('ttl', 30);
         expect(b).to.have.property('netRevenue', true);
         expect(b).to.have.property('referrer');
+        expect(b.meta).to.have.property('advertiserDomains');
+        expect(b.meta).to.have.property('primaryCatId');
+        expect(b.meta).to.have.property('secondaryCatIds');
+        expect(b.meta).to.have.property('networkId');
+        expect(b.meta).to.have.property('mediaType');
       });
     });
 
+    it('registers video bids with vastUrl', function () {
+      let bids = spec.interpretResponse(AD_SERVER_RESPONSE_VIDEO_1, BUILD_REQUESTS_VIDEO_OUTPUT);
+
+      bids.forEach(b => {
+        expect(b.mediaType).to.equal('video');
+        expect(b.meta).to.have.property('mediaType', 'video');
+        expect(b.vastUrl).to.equal('https://x.serverbid.com/rtb/v?auc=217c051d06b011ed9cbc72b17f01ec03&sc=1.575&s=22&a=9dcab16d340d664310c2135a76989fe946a9d46e5d5f24ff5e2f17bffbb7704a43638bd3f600951e&n=9&r=0&t=1658158906595');
+        expect(b.vastXml).to.be.undefined;
+        expect(b.videoCacheKey).to.equal('f1e7287514ce11ed9c1de2b3ba87449a');
+      });
+    })
+
+    it('registers video bids with vastXml', function () {
+      let bids = spec.interpretResponse(AD_SERVER_RESPONSE_VIDEO_2, BUILD_REQUESTS_VIDEO_OUTPUT);
+
+      bids.forEach(b => {
+        expect(b.mediaType).to.equal('video');
+        expect(b.meta).to.have.property('mediaType', 'video');
+        expect(b.vastXml).to.equal('<VAST version="3.0">');
+        expect(b.vastUrl).to.be.undefined;
+        expect(b.ad).to.equal('<VAST version="3.0">');
+        expect(b.videoCacheKey).to.equal('f1e7287514ce11ed9c1de2b3ba87449a');
+      });
+    })
+
     it('handles nobid responses', function () {
       let EMPTY_RESP = Object.assign({}, AD_SERVER_RESPONSE, {'body': {'decisions': null}})
       let bids = spec.interpretResponse(EMPTY_RESP, BUILD_REQUESTS_OUTPUT);
@@ -332,6 +607,24 @@ describe('Consumable BidAdapter', function () {
       expect(opts.length).to.equal(1);
     });
 
+    it('should return a sync url if iframe syncs are enabled and server response is empty', function () {
+      let opts = spec.getUserSyncs(syncOptions, []);
+
+      expect(opts.length).to.equal(1);
+    });
+
+    it('should return a sync url if iframe syncs are enabled and server response does not contain a bdr attribute', function () {
+      let opts = spec.getUserSyncs(syncOptions, [AD_SERVER_RESPONSE]);
+
+      expect(opts.length).to.equal(1);
+    });
+
+    it('should return a sync url if iframe syncs are enabled and server response contains a bdr attribute that is not cx', function () {
+      let opts = spec.getUserSyncs(syncOptions, [AD_SERVER_RESPONSE_2]);
+
+      expect(opts.length).to.equal(1);
+    });
+
     it('should return a sync url if pixel syncs are enabled and some are returned from the server', function () {
       let syncOptions = {'pixelEnabled': true};
       let opts = spec.getUserSyncs(syncOptions, [AD_SERVER_RESPONSE]);
@@ -339,4 +632,76 @@ describe('Consumable BidAdapter', function () {
       expect(opts.length).to.equal(1);
     });
   });
+  describe('unifiedId from userId module', function() {
+    let sandbox, bidderRequest;
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      bidderRequest = deepClone(BIDDER_REQUEST_1);
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('Request should have unifiedId config params', function() {
+      bidderRequest.bidRequest[0].userId = {};
+      bidderRequest.bidRequest[0].userId.tdid = 'TTD_ID';
+      bidderRequest.bidRequest[0].userIdAsEids = createEidsArray(bidderRequest.bidRequest[0].userId);
+      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+      expect(data.user.eids).to.deep.equal([{
+        'source': 'adserver.org',
+        'uids': [{
+          'id': 'TTD_ID',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      }]);
+    });
+
+    it('Request should have adsrvrOrgId from UserId Module if config and userId module both have TTD ID', function() {
+      sandbox.stub(config, 'getConfig').callsFake((key) => {
+        var config = {
+          adsrvrOrgId: {
+            'TDID': 'TTD_ID_FROM_CONFIG',
+            'TDID_LOOKUP': 'TRUE',
+            'TDID_CREATED_AT': '2022-06-21T09:47:00'
+          }
+        };
+        return config[key];
+      });
+      bidderRequest.bidRequest[0].userId = {};
+      bidderRequest.bidRequest[0].userId.tdid = 'TTD_ID';
+      bidderRequest.bidRequest[0].userIdAsEids = createEidsArray(bidderRequest.bidRequest[0].userId);
+      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+      expect(data.user.eids).to.deep.equal([{
+        'source': 'adserver.org',
+        'uids': [{
+          'id': 'TTD_ID',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      }]);
+    });
+
+    it('Request should NOT have adsrvrOrgId params if userId is NOT object', function() {
+      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+      expect(data.user.eids).to.deep.equal(undefined);
+    });
+
+    it('Request should NOT have adsrvrOrgId params if userId.tdid is NOT string', function() {
+      bidderRequest.bidRequest[0].userId = {
+        tdid: 1234
+      };
+      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+      expect(data.user.eids).to.deep.equal(undefined);
+    });
+  });
 });
diff --git a/test/spec/modules/contentexchangeBidAdapter_spec.js b/test/spec/modules/contentexchangeBidAdapter_spec.js
new file mode 100644
index 00000000000..368ca8d9e3f
--- /dev/null
+++ b/test/spec/modules/contentexchangeBidAdapter_spec.js
@@ -0,0 +1,399 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/contentexchangeBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'contentexchange'
+
+describe('ContentexchangeBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'test',
+        adFormat: BANNER
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'test',
+        adFormat: VIDEO
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'test',
+        adFormat: NATIVE
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      adFormat: BANNER
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    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;
+      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://eu2.adnetwork.agency/pbjs');
+    });
+
+    it('Returns general data 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',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      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.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.equal('test');
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, 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 = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, 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([], bidderRequest);
+      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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync2.adnetwork.agency/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://sync2.adnetwork.agency/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/convergeBidAdapter_spec.js b/test/spec/modules/convergeBidAdapter_spec.js
deleted file mode 100644
index e92ed475497..00000000000
--- a/test/spec/modules/convergeBidAdapter_spec.js
+++ /dev/null
@@ -1,899 +0,0 @@
-import { expect } from 'chai';
-import { spec, resetUserSync, getSyncUrl } from 'modules/convergeBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-describe('ConvergeAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'converge',
-      'params': {
-        'uid': '1'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'uid': 0
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    function parseRequest(url) {
-      const res = {};
-      url.split('&').forEach((it) => {
-        const couple = it.split('=');
-        res[couple[0]] = decodeURIComponent(couple[1]);
-      });
-      return res;
-    }
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-    const referrer = bidderRequest.refererInfo.referer;
-
-    let bidRequests = [
-      {
-        'bidder': 'converge',
-        'params': {
-          'uid': '59'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      },
-      {
-        'bidder': 'converge',
-        'params': {
-          'uid': '59'
-        },
-        'adUnitCode': 'adunit-code-2',
-        'sizes': [[728, 90], [300, 250]],
-        'bidId': '3150ccb55da321',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      },
-      {
-        'bidder': 'converge',
-        'params': {
-          'uid': '60'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '42dbe3a7168a6a',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      }
-    ];
-
-    it('should attach valid params to the tag', function () {
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '59');
-      expect(payload).to.have.property('sizes', '300x250,300x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('wrapperType', 'Prebid_js');
-      expect(payload).to.have.property('wrapperVersion', '$prebid.version$');
-    });
-
-    it('sizes must not be duplicated', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '59,59,60');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-    });
-
-    it('pt parameter must be "gross" if params.priceType === "gross"', function () {
-      bidRequests[1].params.priceType = 'gross';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'gross');
-      expect(payload).to.have.property('auids', '59,59,60');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      delete bidRequests[1].params.priceType;
-    });
-
-    it('pt parameter must be "net" or "gross"', function () {
-      bidRequests[1].params.priceType = 'some';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '59,59,60');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      delete bidRequests[1].params.priceType;
-    });
-
-    it('if gdprConsent is present payload must have gdpr params', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
-    });
-
-    it('if gdprApplies is false gdpr_applies must be 0', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: false}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '0');
-    });
-
-    it('if gdprApplies is undefined gdpr_applies must be 1', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA'}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
-    });
-
-    it('if usPrivacy is present payload must have us_privacy param', function () {
-      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('us_privacy', '1YNN');
-    });
-
-    it('should convert keyword params to proper form and attaches to request', function () {
-      const bidRequestWithKeywords = [].concat(bidRequests);
-      bidRequestWithKeywords[1] = Object.assign({},
-        bidRequests[1],
-        {
-          params: {
-            uid: '59',
-            keywords: {
-              single: 'val',
-              singleArr: ['val'],
-              singleArrNum: [5],
-              multiValMixed: ['value1', 2, 'value3'],
-              singleValNum: 123,
-              emptyStr: '',
-              emptyArr: [''],
-              badValue: {'foo': 'bar'} // should be dropped
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload.keywords).to.be.an('string');
-      payload.keywords = JSON.parse(payload.keywords);
-
-      expect(payload.keywords).to.deep.equal([{
-        'key': 'single',
-        'value': ['val']
-      }, {
-        'key': 'singleArr',
-        'value': ['val']
-      }, {
-        'key': 'singleArrNum',
-        'value': ['5']
-      }, {
-        'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
-      }, {
-        'key': 'singleValNum',
-        'value': ['123']
-      }, {
-        'key': 'emptyStr'
-      }, {
-        'key': 'emptyArr'
-      }]);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const responses = [
-      {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 59, 'h': 250, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 60, 'h': 600, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 59, 'h': 90, 'w': 728}], 'seat': '1'},
-      {'bid': [{'price': 0, 'auid': 61, 'h': 250, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0, 'adm': '<div>test content 5</div>', 'h': 250, 'w': 300}], 'seat': '1'},
-      undefined,
-      {'bid': [], 'seat': '1'},
-      {'seat': '1'},
-    ];
-
-    it('should get correct bid response', function () {
-      const bidRequests = [
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '659423fff799cb',
-          'bidderRequestId': '5f2009617a7c0a',
-          'auctionId': '1cbd2feafe5e8b',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '659423fff799cb',
-          'cpm': 1.15,
-          'creativeId': 59,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': [responses[0]]}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('should get correct multi bid response', function () {
-      const bidRequests = [
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71a5b',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '60'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '4dff80cc4ee346',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '5703af74d0472a',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '300bfeb0d71a5b',
-          'cpm': 1.15,
-          'creativeId': 59,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '4dff80cc4ee346',
-          'cpm': 0.5,
-          'creativeId': 60,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '5703af74d0472a',
-          'cpm': 0.15,
-          'creativeId': 59,
-          'dealId': undefined,
-          'width': 728,
-          'height': 90,
-          'ad': '<div>test content 3</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': responses.slice(0, 3)}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('handles wrong and nobid responses', function () {
-      const bidRequests = [
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '61'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d7190gf',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '65'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71321',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '70'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '300bfeb0d7183bb',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const result = spec.interpretResponse({'body': {'seatbid': responses.slice(3)}}, request);
-      expect(result.length).to.equal(0);
-    });
-
-    it('complicated case', function () {
-      const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 59, 'h': 250, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 60, 'h': 600, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 59, 'h': 90, 'w': 728}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 4</div>', 'auid': 59, 'h': 600, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 5</div>', 'auid': 60, 'h': 600, 'w': 350}], 'seat': '1'},
-      ];
-      const bidRequests = [
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '2164be6358b9',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '326bde7fbf69',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '60'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '4e111f1b66e4',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '26d6f897b516',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '60'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '1751cd90161',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '2164be6358b9',
-          'cpm': 1.15,
-          'creativeId': 59,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '4e111f1b66e4',
-          'cpm': 0.5,
-          'creativeId': 60,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '26d6f897b516',
-          'cpm': 0.15,
-          'creativeId': 59,
-          'dealId': undefined,
-          'width': 728,
-          'height': 90,
-          'ad': '<div>test content 3</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '326bde7fbf69',
-          'cpm': 0.15,
-          'creativeId': 59,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 4</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('dublicate uids and sizes in one slot', function () {
-      const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 59, 'h': 250, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 59, 'h': 250, 'w': 300}], 'seat': '1'},
-      ];
-      const bidRequests = [
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '5126e301f4be',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '57b2ebe70e16',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        },
-        {
-          'bidder': 'converge',
-          'params': {
-            'uid': '59'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '225fcd44b18c',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '5126e301f4be',
-          'cpm': 1.15,
-          'creativeId': 59,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '57b2ebe70e16',
-          'cpm': 0.5,
-          'creativeId': 59,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'converge',
-          'currency': 'EUR',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-  });
-
-  it('should get correct video bid response', function () {
-    const bidRequests = [
-      {
-        'bidder': 'converge',
-        'params': {
-          'uid': '58'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '57dfefb80eca',
-        'bidderRequestId': '20394420a762a2',
-        'auctionId': '140132d07b031',
-        'mediaTypes': {
-          'video': {
-            'context': 'instream'
-          }
-        }
-      },
-      {
-        'bidder': 'converge',
-        'params': {
-          'uid': '60'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'e893c787c22dd',
-        'bidderRequestId': '20394420a762a2',
-        'auctionId': '140132d07b031',
-        'mediaTypes': {
-          'video': {
-            'context': 'instream'
-          }
-        }
-      }
-    ];
-    const response = [
-      {'bid': [{'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>', 'auid': 58, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
-      {'bid': [{'price': 1.00, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>', 'auid': 60, content_type: 'video'}], 'seat': '2'}
-    ];
-    const request = spec.buildRequests(bidRequests);
-    const expectedResponse = [
-      {
-        'requestId': '57dfefb80eca',
-        'cpm': 1.15,
-        'creativeId': 58,
-        'dealId': undefined,
-        'width': 300,
-        'height': 600,
-        'bidderCode': 'converge',
-        'currency': 'EUR',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>'
-        }
-      }
-    ];
-
-    const result = spec.interpretResponse({'body': {'seatbid': response}}, request);
-    expect(result).to.deep.equal(expectedResponse);
-  });
-
-  it('should have right renderer in the bid response', function () {
-    const spySetRenderer = sinon.spy();
-    const stubRenderer = {
-      setRender: spySetRenderer
-    };
-    const spyRendererInstall = sinon.spy(function() { return stubRenderer; });
-    const stubRendererConst = {
-      install: spyRendererInstall
-    };
-    const bidRequests = [
-      {
-        'bidder': 'converge',
-        'params': {
-          'uid': '58'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'e6e65553fc8',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3',
-        'mediaTypes': {
-          'video': {
-            'context': 'outstream'
-          }
-        }
-      },
-      {
-        'bidder': 'converge',
-        'params': {
-          'uid': '60'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c8fdcb3f269f',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3'
-      },
-      {
-        'bidder': 'converge',
-        'params': {
-          'uid': '61'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '1de036c37685',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3',
-        'renderer': {}
-      }
-    ];
-    const response = [
-      {'bid': [{'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>', 'auid': 58, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
-      {'bid': [{'price': 1.00, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>', 'auid': 60, content_type: 'video', w: 300, h: 250}], 'seat': '2'},
-      {'bid': [{'price': 1.20, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21376532\"><\/Ad>\n<\/VAST>', 'auid': 61, content_type: 'video', w: 300, h: 250}], 'seat': '2'}
-    ];
-    const request = spec.buildRequests(bidRequests);
-    const expectedResponse = [
-      {
-        'requestId': 'e6e65553fc8',
-        'cpm': 1.15,
-        'creativeId': 58,
-        'dealId': undefined,
-        'width': 300,
-        'height': 600,
-        'bidderCode': 'converge',
-        'currency': 'EUR',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>'
-        },
-        'renderer': stubRenderer
-      },
-      {
-        'requestId': 'c8fdcb3f269f',
-        'cpm': 1.00,
-        'creativeId': 60,
-        'dealId': undefined,
-        'width': 300,
-        'height': 250,
-        'bidderCode': 'converge',
-        'currency': 'EUR',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>'
-        },
-        'renderer': stubRenderer
-      },
-      {
-        'requestId': '1de036c37685',
-        'cpm': 1.20,
-        'creativeId': 61,
-        'dealId': undefined,
-        'width': 300,
-        'height': 250,
-        'bidderCode': 'converge',
-        'currency': 'EUR',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21376532\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"21376532\"><\/Ad>\n<\/VAST>'
-        }
-      }
-    ];
-
-    const result = spec.interpretResponse({'body': {'seatbid': response}}, request, stubRendererConst);
-
-    expect(spySetRenderer.calledTwice).to.equal(true);
-    expect(spySetRenderer.getCall(0).args[0]).to.be.a('function');
-    expect(spySetRenderer.getCall(1).args[0]).to.be.a('function');
-
-    expect(spyRendererInstall.calledTwice).to.equal(true);
-    expect(spyRendererInstall.getCall(0).args[0]).to.deep.equal({
-      id: 'e6e65553fc8',
-      url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
-      loaded: false
-    });
-    expect(spyRendererInstall.getCall(1).args[0]).to.deep.equal({
-      id: 'c8fdcb3f269f',
-      url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
-      loaded: false
-    });
-
-    expect(result).to.deep.equal(expectedResponse);
-  });
-
-  describe('user sync', function () {
-    const syncUrl = getSyncUrl();
-
-    beforeEach(function () {
-      resetUserSync();
-    });
-
-    it('should register sync image', function () {
-      let syncs = spec.getUserSyncs({
-        pixelEnabled: true
-      });
-
-      expect(syncs).to.deep.equal({type: 'image', url: syncUrl});
-    });
-
-    it('should not register sync image more than once', function () {
-      let syncs = spec.getUserSyncs({
-        pixelEnabled: true
-      });
-      expect(syncs).to.deep.equal({type: 'image', url: syncUrl});
-
-      // when called again, should still have only been called once
-      syncs = spec.getUserSyncs();
-      expect(syncs).to.equal(undefined);
-    });
-
-    it('should pass gdpr params if consent is true', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {
-        gdprApplies: true, consentString: 'foo'
-      })).to.deep.equal({
-        type: 'image', url: `${syncUrl}&gdpr=1&gdpr_consent=foo`
-      });
-    });
-
-    it('should pass gdpr params if consent is false', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {
-        gdprApplies: false, consentString: 'foo'
-      })).to.deep.equal({
-        type: 'image', url: `${syncUrl}&gdpr=0&gdpr_consent=foo`
-      });
-    });
-
-    it('should pass gdpr param gdpr_consent only when gdprApplies is undefined', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {
-        consentString: 'foo'
-      })).to.deep.equal({
-        type: 'image', url: `${syncUrl}&gdpr_consent=foo`
-      });
-    });
-
-    it('should pass no params if gdpr consentString is not defined', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {})).to.deep.equal({
-        type: 'image', url: syncUrl
-      });
-    });
-
-    it('should pass no params if gdpr consentString is a number', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {
-        consentString: 0
-      })).to.deep.equal({
-        type: 'image', url: syncUrl
-      });
-    });
-
-    it('should pass no params if gdpr consentString is null', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {
-        consentString: null
-      })).to.deep.equal({
-        type: 'image', url: syncUrl
-      });
-    });
-
-    it('should pass no params if gdpr consentString is a object', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {
-        consentString: {}
-      })).to.deep.equal({
-        type: 'image', url: syncUrl
-      });
-    });
-
-    it('should pass no params if gdpr is not defined', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined)).to.deep.equal({
-        type: 'image', url: syncUrl
-      });
-    });
-
-    it('should pass usPrivacy param if it is available', function() {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {}, '1YNN')).to.deep.equal({
-        type: 'image', url: `${syncUrl}&us_privacy=1YNN`
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/conversantAnalyticsAdapter_spec.js b/test/spec/modules/conversantAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..48b68d09bc7
--- /dev/null
+++ b/test/spec/modules/conversantAnalyticsAdapter_spec.js
@@ -0,0 +1,963 @@
+import sinon from 'sinon';
+import {expect} from 'chai';
+import {default as conversantAnalytics, CNVR_CONSTANTS, cnvrHelper} from 'modules/conversantAnalyticsAdapter';
+import * as utils from 'src/utils.js';
+import * as prebidGlobal from 'src/prebidGlobal';
+
+import constants from 'src/constants.json'
+
+let events = require('src/events');
+
+describe('Conversant analytics adapter tests', function() {
+  let sandbox; // sinon sandbox to make restoring all stubbed objects easier
+  let xhr; // xhr stub from sinon for capturing data sent via ajax
+  let clock; // clock stub from sinon to mock our cache cleanup interval
+
+  const PREBID_VERSION = '1.2';
+  const SITE_ID = 108060;
+
+  let requests = [];
+  const DATESTAMP = Date.now();
+
+  const VALID_CONFIGURATION = {
+    options: {
+      site_id: SITE_ID
+    }
+  };
+
+  const VALID_ALWAYS_SAMPLE_CONFIG = {
+    options: {
+      site_id: SITE_ID,
+      cnvr_sampling: 1
+    }
+  };
+
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(events, 'getEvents').returns([]); // need to stub this otherwise unwanted events seem to get fired during testing
+    xhr = sandbox.useFakeXMLHttpRequest(); // allows us to capture ajax requests
+    xhr.onCreate = function (req) { requests.push(req); }; // save ajax requests in a private array for testing purposes
+    let getGlobalStub = {
+      version: PREBID_VERSION,
+      getUserIds: function() { // userIdTargeting.js init() gets called on AUCTION_END so we need to mock this function.
+        return {};
+      }
+    };
+    sandbox.stub(prebidGlobal, 'getGlobal').returns(getGlobalStub); // getGlobal does not seem to be available in testing so need to mock it
+    clock = sandbox.useFakeTimers(DATESTAMP); // to use sinon fake timers they MUST be created before the interval/timeout is created in the code you are testing.
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    requests = []; // clean up any requests in our ajax request capture array.
+  });
+
+  describe('Initialization Tests', function() {
+    it('should log error if site id is not passed', function() {
+      sandbox.stub(utils, 'logError');
+
+      conversantAnalytics.enableAnalytics();
+      expect(utils.logError.calledWith(CNVR_CONSTANTS.LOG_PREFIX + 'siteId is required.')).to.be.true;
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should not log error if valid config is passed', function() {
+      sandbox.stub(utils, 'logError');
+      sandbox.stub(utils, 'logInfo');
+
+      conversantAnalytics.enableAnalytics(VALID_CONFIGURATION);
+      expect(utils.logError.called).to.equal(false);
+      expect(utils.logInfo.called).to.equal(true);
+      expect(
+        utils.logInfo.calledWith(
+          CNVR_CONSTANTS.LOG_PREFIX + 'Conversant sample rate set to ' + CNVR_CONSTANTS.DEFAULT_SAMPLE_RATE
+        )
+      ).to.be.true;
+      expect(
+        utils.logInfo.calledWith(
+          CNVR_CONSTANTS.LOG_PREFIX + 'Global sample rate set to 1'
+        )
+      ).to.be.true;
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should sample when sampling set to 1', function() {
+      sandbox.stub(utils, 'logError');
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+      expect(utils.logError.called).to.equal(false);
+      expect(cnvrHelper.doSample).to.equal(true);
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should NOT sample when sampling set to 0', function() {
+      sandbox.stub(utils, 'logError');
+      const NEVER_SAMPLE_CONFIG = utils.deepClone(VALID_ALWAYS_SAMPLE_CONFIG);
+      NEVER_SAMPLE_CONFIG['options'].cnvr_sampling = 0;
+      conversantAnalytics.enableAnalytics(NEVER_SAMPLE_CONFIG);
+      expect(utils.logError.called).to.equal(false);
+      expect(cnvrHelper.doSample).to.equal(false);
+      conversantAnalytics.disableAnalytics();
+    });
+  });
+
+  describe('Helper Function Tests', function() {
+    it('should cleanup up cache objects', function() {
+      conversantAnalytics.enableAnalytics(VALID_CONFIGURATION);
+
+      cnvrHelper.adIdLookup['keep'] = {timeReceived: DATESTAMP + 1};
+      cnvrHelper.adIdLookup['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+
+      cnvrHelper.timeoutCache['keep'] = {timeReceived: DATESTAMP + 1};
+      cnvrHelper.timeoutCache['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+
+      cnvrHelper.auctionIdTimestampCache['keep'] = {timeReceived: DATESTAMP + 1};
+      cnvrHelper.auctionIdTimestampCache['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(2);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(2);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(2);
+
+      clock.tick(CNVR_CONSTANTS.CACHE_CLEANUP_TIME_IN_MILLIS);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(1);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(1);
+
+      conversantAnalytics.disableAnalytics();
+
+      // After disable we should cleanup the cache
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(0);
+    });
+
+    it('createBid() should return correct object', function() {
+      const EVENT_CODE = 1;
+      const TIME = 2;
+      let bid = cnvrHelper.createBid(EVENT_CODE, 2);
+      expect(bid).to.deep.equal({'eventCodes': [EVENT_CODE], 'timeToRespond': TIME});
+    });
+
+    it('createAdUnit() should return correct object', function() {
+      let adUnit = cnvrHelper.createAdUnit();
+      expect(adUnit).to.deep.equal({
+        sizes: [],
+        mediaTypes: [],
+        bids: {}
+      });
+    });
+
+    it('createAdSize() should return correct object', function() {
+      let adSize = cnvrHelper.createAdSize(1, 2);
+      expect(adSize).to.deep.equal({w: 1, h: 2});
+
+      adSize = cnvrHelper.createAdSize();
+      expect(adSize).to.deep.equal({w: -1, h: -1});
+
+      adSize = cnvrHelper.createAdSize('foo', 'bar');
+      expect(adSize).to.deep.equal({w: -1, h: -1});
+    });
+
+    it('getLookupKey() should return correct object', function() {
+      let key = cnvrHelper.getLookupKey(undefined, undefined, undefined);
+      expect(key).to.equal('undefined-undefined-undefined');
+
+      key = cnvrHelper.getLookupKey('foo', 'bar', 'baz');
+      expect(key).to.equal('foo-bar-baz');
+    });
+
+    it('createPayload() should return correct object', function() {
+      const REQUEST_TYPE = 'foo';
+      const AUCTION_ID = '124 abc';
+      const myDate = Date.now();
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+
+      let payload = cnvrHelper.createPayload(REQUEST_TYPE, AUCTION_ID, myDate);
+      expect(payload).to.deep.equal({
+        cnvrSampleRate: 1,
+        globalSampleRate: 1,
+        requestType: REQUEST_TYPE,
+        auction: {
+          auctionId: AUCTION_ID,
+          auctionTimestamp: myDate,
+          sid: VALID_ALWAYS_SAMPLE_CONFIG.options.site_id,
+          preBidVersion: PREBID_VERSION
+        },
+        adUnits: {}
+      });
+
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('keyExistsAndIsObject() should return correct data', function() {
+      let data = {
+        a: [],
+        b: 1,
+        c: 'foo',
+        d: function () { return true; },
+        e: {}
+      };
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'foobar')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'a')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'b')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'c')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'd')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'e')).to.be.true;
+    });
+
+    it('deduplicateArray() should return correct data', function () {
+      let arrayOfObjects = [{w: 1, h: 2}, {w: 2, h: 3}, {w: 1, h: 2}];
+      let array = [3, 2, 1, 1, 2, 3];
+      let empty;
+      let notArray = 3;
+      let emptyArray = [];
+
+      expect(JSON.stringify(cnvrHelper.deduplicateArray(array))).to.equal(JSON.stringify([3, 2, 1]));
+      expect(JSON.stringify(cnvrHelper.deduplicateArray(arrayOfObjects))).to.equal(JSON.stringify([{w: 1, h: 2}, {w: 2, h: 3}]));
+      expect(JSON.stringify(cnvrHelper.deduplicateArray(emptyArray))).to.equal(JSON.stringify([]));
+      expect(cnvrHelper.deduplicateArray(empty)).to.be.undefined;
+      expect(cnvrHelper.deduplicateArray(notArray)).to.equal(notArray);
+    });
+
+    it('getSampleRate() should return correct data', function () {
+      let obj = {
+        sampling: 1,
+        cnvr_sampling: 0.5,
+        too_big: 1.2,
+        too_small: -1,
+        string: 'foo',
+        object: {},
+      }
+      const DEFAULT_VAL = 0.11;
+      expect(cnvrHelper.getSampleRate(obj, 'sampling', DEFAULT_VAL)).to.equal(1);
+      expect(cnvrHelper.getSampleRate(obj, 'cnvr_sampling', DEFAULT_VAL)).to.equal(0.5);
+      expect(cnvrHelper.getSampleRate(obj, 'too_big', DEFAULT_VAL)).to.equal(DEFAULT_VAL);
+      expect(cnvrHelper.getSampleRate(obj, 'string', DEFAULT_VAL)).to.equal(DEFAULT_VAL);
+      expect(cnvrHelper.getSampleRate(obj, 'object', DEFAULT_VAL)).to.equal(DEFAULT_VAL);
+      expect(cnvrHelper.getSampleRate(obj, 'not_a_key', DEFAULT_VAL)).to.equal(DEFAULT_VAL);
+      expect(cnvrHelper.getSampleRate(obj, 'too_small', DEFAULT_VAL)).to.equal(0);
+    });
+  });
+
+  describe('Bid Timeout Event Tests', function() {
+    const BID_TIMEOUT_PAYLOAD = [{
+      'bidId': '80882409358b8a8',
+      'bidder': 'conversant',
+      'adUnitCode': 'MedRect',
+      'auctionId': 'afbd6e0b-e45b-46ab-87bf-c0bac0cb8881'
+    }, {
+      'bidId': '9da4c107a6f24c8',
+      'bidder': 'conversant',
+      'adUnitCode': 'Leaderboard',
+      'auctionId': 'afbd6e0b-e45b-46ab-87bf-c0bac0cb8881'
+    }];
+
+    beforeEach(function () {
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+    });
+
+    afterEach(function () {
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should put both items in timeout cache', function() {
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(0);
+      events.emit(constants.EVENTS.BID_TIMEOUT, BID_TIMEOUT_PAYLOAD);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(2);
+
+      BID_TIMEOUT_PAYLOAD.forEach(timeoutBid => {
+        const key = cnvrHelper.getLookupKey(timeoutBid.auctionId, timeoutBid.adUnitCode, timeoutBid.bidder);
+        expect(cnvrHelper.timeoutCache[key].timeReceived).to.not.be.undefined;
+      });
+      expect(requests).to.have.lengthOf(0);
+    });
+  });
+
+  describe('Render Failed Tests', function() {
+    const RENDER_FAILED_PAYLOAD = {
+      reason: 'reason',
+      message: 'value',
+      adId: '57e03aeafd83a68'
+    };
+
+    const RENDER_FAILED_PAYLOAD_NO_ADID = {
+      reason: 'reason',
+      message: 'value'
+    };
+
+    beforeEach(function () {
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+    });
+
+    afterEach(function () {
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should empty adIdLookup and send data', function() {
+      cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId] = {
+        bidderCode: 'bidderCode',
+        adUnitCode: 'adUnitCode',
+        auctionId: 'auctionId',
+        timeReceived: Date.now()
+      };
+
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0); // object should be removed
+      expect(requests).to.have.lengthOf(1);
+      const data = JSON.parse(requests[0].requestBody);
+
+      expect(data.auction.auctionId).to.equal('auctionId');
+      expect(data.auction.preBidVersion).to.equal(PREBID_VERSION);
+      expect(data.auction.sid).to.equal(SITE_ID);
+      expect(data.adUnits['adUnitCode'].bids['bidderCode'][0].eventCodes.includes(CNVR_CONSTANTS.RENDER_FAILED)).to.be.true;
+      expect(data.adUnits['adUnitCode'].bids['bidderCode'][0].message).to.have.lengthOf.above(0);
+    });
+
+    it('should not send data if no adId', function() {
+      cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId] = {
+        bidderCode: 'bidderCode',
+        adUnitCode: 'adUnitCode',
+        auctionId: 'auctionId',
+        timeReceived: Date.now()
+      };
+
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD_NO_ADID);
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1); // same object in cache as before... no change
+      expect(cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId]).to.not.be.undefined;
+    });
+
+    it('should not send data if bad data in lookup', function() {
+      cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId] = {
+        bidderCode: 'bidderCode',
+        auctionId: 'auctionId',
+        timeReceived: Date.now()
+      };
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0); // object should be removed but no call made to send data
+      expect(requests).to.have.lengthOf(0);
+    });
+  });
+
+  describe('Bid Won Tests', function() {
+    const GOOD_BID_WON_ARGS = {
+      bidderCode: 'conversant',
+      width: 300,
+      height: 250,
+      statusMessage: 'Bid available',
+      adId: '57e03aeafd83a68',
+      requestId: '2c2a5485a076898',
+      mediaType: 'banner',
+      source: 'client',
+      currency: 'USD',
+      cpm: 4,
+      creativeId: '29123_55016759',
+      ttl: 300,
+      netRevenue: true,
+      ad: '<foobar add goes here />',
+      originalCpm: 0.04,
+      originalCurrency: 'USD',
+      auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+      responseTimestamp: 1583851418626,
+      requestTimestamp: 1583851418292,
+      bidder: 'conversant',
+      adUnitCode: 'div-gpt-ad-1460505748561-0',
+      timeToRespond: 334,
+      pbLg: '4.00',
+      pbMg: '4.00',
+      pbHg: '4.00',
+      pbAg: '4.00',
+      pbDg: '4.00',
+      pbCg: '',
+      size: '300x250',
+      adserverTargeting: {
+        hb_bidder: 'conversant',
+        hb_adid: '57e03aeafd83a68',
+        hb_pb: '4.00',
+        hb_size: '300x250',
+        hb_source: 'client',
+        hb_format: 'banner'
+      },
+      status: 'rendered',
+      params: [
+        {
+          site_id: '108060'
+        }
+      ]
+    };
+
+    // no adUnitCode, auctionId or bidderCode will cause a failure
+    const BAD_BID_WON_ARGS = {
+      bidderCode: 'conversant',
+      width: 300,
+      height: 250,
+      statusMessage: 'Bid available',
+      adId: '57e03aeafd83a68',
+      requestId: '2c2a5485a076898',
+      mediaType: 'banner',
+      source: 'client',
+      currency: 'USD',
+      cpm: 4,
+      originalCpm: 0.04,
+      originalCurrency: 'USD',
+      bidder: 'conversant',
+      adUnitCode: 'div-gpt-ad-1460505748561-0',
+      size: '300x250',
+      status: 'rendered',
+      params: [
+        {
+          site_id: '108060'
+        }
+      ]
+    };
+
+    beforeEach(function () {
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+    });
+
+    afterEach(function () {
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should not send data or put a record in adIdLookup when bad data provided', function() {
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
+      events.emit(constants.EVENTS.BID_WON, BAD_BID_WON_ARGS);
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
+    });
+
+    it('should send data and put a record in adIdLookup', function() {
+      const myAuctionStart = Date.now();
+      cnvrHelper.auctionIdTimestampCache[GOOD_BID_WON_ARGS.auctionId] = {timeReceived: myAuctionStart};
+
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
+      events.emit(constants.EVENTS.BID_WON, GOOD_BID_WON_ARGS);
+
+      // Check that adIdLookup was set correctly
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      expect(cnvrHelper.adIdLookup[GOOD_BID_WON_ARGS.adId].auctionId).to.equal(GOOD_BID_WON_ARGS.auctionId);
+      expect(cnvrHelper.adIdLookup[GOOD_BID_WON_ARGS.adId].adUnitCode).to.equal(GOOD_BID_WON_ARGS.adUnitCode);
+      expect(cnvrHelper.adIdLookup[GOOD_BID_WON_ARGS.adId].bidderCode).to.equal(GOOD_BID_WON_ARGS.bidderCode);
+      expect(cnvrHelper.adIdLookup[GOOD_BID_WON_ARGS.adId].timeReceived).to.not.be.undefined;
+
+      expect(requests).to.have.lengthOf(1);
+      const data = JSON.parse(requests[0].requestBody);
+      expect(data.requestType).to.equal('bid_won');
+      expect(data.auction.auctionId).to.equal(GOOD_BID_WON_ARGS.auctionId);
+      expect(data.auction.preBidVersion).to.equal(PREBID_VERSION);
+      expect(data.auction.sid).to.equal(VALID_ALWAYS_SAMPLE_CONFIG.options.site_id);
+      expect(data.auction.auctionTimestamp).to.equal(myAuctionStart);
+
+      expect(typeof data.adUnits).to.equal('object');
+      expect(Object.keys(data.adUnits)).to.have.lengthOf(1);
+
+      expect(Object.keys(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids)).to.have.lengthOf(1);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].eventCodes.includes(CNVR_CONSTANTS.WIN)).to.be.true;
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].cpm).to.equal(GOOD_BID_WON_ARGS.cpm);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].originalCpm).to.equal(GOOD_BID_WON_ARGS.originalCpm);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].currency).to.equal(GOOD_BID_WON_ARGS.currency);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].timeToRespond).to.equal(GOOD_BID_WON_ARGS.timeToRespond);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].adSize.w).to.equal(GOOD_BID_WON_ARGS.width);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].adSize.h).to.equal(GOOD_BID_WON_ARGS.height);
+    });
+  });
+
+  describe('Auction End Tests', function() {
+    const AUCTION_END_PAYLOAD = {
+      auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+      timestamp: 1583851418288,
+      auctionEnd: 1583851418628,
+      auctionStatus: 'completed',
+      adUnits: [
+        {
+          code: 'div-gpt-ad-1460505748561-0',
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250],
+                [100, 200]
+              ]
+            }
+          },
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144370
+              }
+            },
+            {
+              bidder: 'conversant',
+              params: {
+                site_id: '108060'
+              }
+            }
+          ],
+          sizes: [
+            [300, 250],
+            [100, 200]
+          ],
+          transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17'
+        },
+        {
+          code: 'div-gpt-ad-1460505748561-0',
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250],
+                [100, 200]
+              ]
+            },
+            video: {
+              playerSize: [
+                [300, 250],
+                [600, 400]
+              ]
+            }
+          },
+          sizes: [
+            [300, 250],
+            [100, 200],
+            [600, 400]
+          ],
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144370
+              }
+            },
+            {
+              bidder: 'conversant',
+              params: {
+                site_id: '108060'
+              }
+            }
+          ],
+          transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba18'
+        },
+        {
+          code: 'div-gpt-ad-1460505748561-1',
+          mediaTypes: {
+            native: {
+              type: 'image'
+            }
+          },
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144371
+              }
+            }
+          ],
+          transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba10'
+        }
+      ],
+      adUnitCodes: [
+        'div-gpt-ad-1460505748561-0'
+      ],
+      bidderRequests: [
+        {
+          bidderCode: 'conversant',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          bidderRequestId: '13f16db358d4c58',
+          bids: [
+            {
+              bidder: 'conversant',
+              params: {
+                site_id: '108060'
+              },
+              mediaTypes: {
+                banner: {
+                  sizes: [
+                    [
+                      300,
+                      250
+                    ]
+                  ]
+                }
+              },
+              adUnitCode: 'div-gpt-ad-1460505748561-0',
+              transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17',
+              sizes: [
+                [
+                  300,
+                  250
+                ]
+              ],
+              bidId: '2c2a5485a076898',
+              bidderRequestId: '13f16db358d4c58',
+              auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+              src: 'client',
+              bidRequestsCount: 1,
+              bidderRequestsCount: 1,
+              bidderWinsCount: 0
+            }
+          ],
+          auctionStart: 1583851418288,
+          timeout: 3000,
+          refererInfo: {
+            referer: 'http://localhost:9999/integrationExamples/gpt/hello_analytics1.html',
+            reachedTop: true,
+            numIframes: 0,
+            stack: [
+              'http://localhost:9999/integrationExamples/gpt/hello_analytics1.html'
+            ]
+          },
+          start: 1583851418292
+        },
+        {
+          bidderCode: 'appnexus',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          bidderRequestId: '3e8179f67f31b98',
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144370
+              },
+              mediaTypes: {
+                banner: {
+                  sizes: [
+                    [
+                      300,
+                      250
+                    ]
+                  ]
+                }
+              },
+              adUnitCode: 'div-gpt-ad-1460505748561-0',
+              transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17',
+              sizes: [
+                [
+                  300,
+                  250
+                ]
+              ],
+              bidId: '40a1d3ac6b79668',
+              bidderRequestId: '3e8179f67f31b98',
+              auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+              src: 'client',
+              bidRequestsCount: 1,
+              bidderRequestsCount: 1,
+              bidderWinsCount: 0
+            },
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144370
+              },
+              mediaTypes: {
+                native: {
+                  type: 'image'
+                }
+              },
+              adUnitCode: 'div-gpt-ad-1460505748561-1',
+              transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17',
+              sizes: [],
+              bidId: '40a1d3ac6b79668',
+              bidderRequestId: '3e8179f67f31b98',
+              auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+              src: 'client',
+              bidRequestsCount: 1,
+              bidderRequestsCount: 1,
+              bidderWinsCount: 0
+            }
+          ],
+          auctionStart: 1583851418288,
+          timeout: 3000,
+          refererInfo: {
+            referer: 'http://localhost:9999/integrationExamples/gpt/hello_analytics1.html',
+            reachedTop: true,
+            numIframes: 0,
+            stack: [
+              'http://localhost:9999/integrationExamples/gpt/hello_analytics1.html'
+            ]
+          },
+          start: 1583851418295
+        }
+      ],
+      noBids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          adUnitCode: 'div-gpt-ad-1460505748561-0',
+          transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17',
+          sizes: [
+            [
+              300,
+              250
+            ]
+          ],
+          bidId: '40a1d3ac6b79668',
+          bidderRequestId: '3e8179f67f31b98',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          src: 'client',
+          bidRequestsCount: 1,
+          bidderRequestsCount: 1,
+          bidderWinsCount: 0
+        }
+      ],
+      bidsReceived: [
+        {
+          bidderCode: 'conversant',
+          width: 300,
+          height: 250,
+          statusMessage: 'Bid available',
+          adId: '57e03aeafd83a68',
+          requestId: '2c2a5485a076898',
+          mediaType: 'banner',
+          source: 'client',
+          currency: 'USD',
+          cpm: 4,
+          creativeId: '29123_55016759',
+          ttl: 300,
+          netRevenue: true,
+          ad: '<foobar add goes here />',
+          originalCpm: 0.04,
+          originalCurrency: 'USD',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          responseTimestamp: 1583851418626,
+          requestTimestamp: 1583851418292,
+          bidder: 'conversant',
+          adUnitCode: 'div-gpt-ad-1460505748561-0',
+          timeToRespond: 334,
+          pbLg: '4.00',
+          pbMg: '4.00',
+          pbHg: '4.00',
+          pbAg: '4.00',
+          pbDg: '4.00',
+          pbCg: '',
+          size: '300x250',
+          adserverTargeting: {
+            hb_bidder: 'conversant',
+            hb_adid: '57e03aeafd83a68',
+            hb_pb: '4.00',
+            hb_size: '300x250',
+            hb_source: 'client',
+            hb_format: 'banner'
+          }
+        }, {
+          bidderCode: 'conversant',
+          height: 100,
+          statusMessage: 'Bid available',
+          width: 200,
+          adId: '57e03aeafd83a68',
+          requestId: '2c2a5485a076898',
+          mediaType: 'banner',
+          source: 'client',
+          currency: 'USD',
+          cpm: 4,
+          creativeId: '29123_55016759',
+          ttl: 300,
+          netRevenue: true,
+          ad: '<foobar add goes here />',
+          originalCpm: 0.04,
+          originalCurrency: 'USD',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          responseTimestamp: 1583851418626,
+          requestTimestamp: 1583851418292,
+          bidder: 'conversant',
+          adUnitCode: 'div-gpt-ad-1460505748561-0',
+          timeToRespond: 334,
+          pbLg: '4.00',
+          pbMg: '4.00',
+          pbHg: '4.00',
+          pbAg: '4.00',
+          pbDg: '4.00',
+          pbCg: '',
+          size: '100x200',
+          adserverTargeting: {
+            hb_bidder: 'conversant',
+            hb_adid: '57e03aeafd83a68',
+            hb_pb: '4.00',
+            hb_size: '300x250',
+            hb_source: 'client',
+            hb_format: 'banner'
+          }
+        }, {
+          bidderCode: 'appnexus',
+          statusMessage: 'Bid available',
+          adId: '57e03aeafd83a68',
+          requestId: '2c2a5485a076898',
+          mediaType: 'native',
+          source: 'client',
+          currency: 'USD',
+          cpm: 4,
+          creativeId: '29123_55016759',
+          ttl: 300,
+          netRevenue: true,
+          ad: '<foobar add goes here />',
+          originalCpm: 0.04,
+          originalCurrency: 'USD',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          responseTimestamp: 1583851418626,
+          requestTimestamp: 1583851418292,
+          bidder: 'appnexus',
+          adUnitCode: 'div-gpt-ad-1460505748561-1',
+          timeToRespond: 334,
+          pbLg: '4.00',
+          pbMg: '4.00',
+          pbHg: '4.00',
+          pbAg: '4.00',
+          pbDg: '4.00',
+          pbCg: '',
+          adserverTargeting: {
+            hb_bidder: 'appnexus',
+            hb_adid: '57e03aeafd83a68',
+            hb_pb: '4.00',
+            hb_size: '300x250',
+            hb_source: 'client',
+            hb_format: 'banner'
+          }
+        }
+      ],
+      winningBids: [],
+      timeout: 3000
+    };
+
+    beforeEach(function () {
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+    });
+
+    afterEach(function () {
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should not do anything when auction id doesnt exist', function() {
+      sandbox.stub(utils, 'logError');
+
+      let BAD_ARGS = JSON.parse(JSON.stringify(AUCTION_END_PAYLOAD));
+      delete BAD_ARGS.auctionId;
+      expect(requests).to.have.lengthOf(0);
+      events.emit(constants.EVENTS.AUCTION_END, BAD_ARGS);
+      expect(requests).to.have.lengthOf(0);
+      expect(
+        utils.logError.calledWith(
+          CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): No auctionId in args supplied so unable to process event.'
+        )
+      ).to.be.true;
+    });
+
+    it('should send the expected data', function() {
+      sandbox.stub(utils, 'logError');
+      sandbox.stub(utils, 'logWarn'); /* .callsFake((arg, arg1, arg2) => { //debugging stuff
+        console.error(arg);
+        if (arg1) console.error(arg1);
+        if (arg2) console.error(arg2);
+      }); */
+      expect(requests).to.have.lengthOf(0);
+      const AUCTION_ID = AUCTION_END_PAYLOAD.auctionId;
+      const AD_UNIT_CODE = AUCTION_END_PAYLOAD.adUnits[0].code;
+      const AD_UNIT_CODE_NATIVE = AUCTION_END_PAYLOAD.adUnits[2].code;
+      const timeoutKey = cnvrHelper.getLookupKey(AUCTION_ID, AD_UNIT_CODE, 'appnexus');
+      cnvrHelper.timeoutCache[timeoutKey] = { timeReceived: Date.now() };
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(1);
+      expect(utils.logError.called).to.equal(false);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(0);
+
+      events.emit(constants.EVENTS.AUCTION_END, AUCTION_END_PAYLOAD);
+      expect(utils.logError.called).to.equal(false);
+      expect(requests).to.have.lengthOf(1);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(1);
+      expect(cnvrHelper.auctionIdTimestampCache[AUCTION_END_PAYLOAD.auctionId].timeReceived).to.equal(AUCTION_END_PAYLOAD.timestamp);
+
+      const data = JSON.parse(requests[0].requestBody);
+      expect(data.requestType).to.equal('auction_end');
+      expect(data.auction.auctionId).to.equal(AUCTION_ID);
+      expect(data.auction.preBidVersion).to.equal(PREBID_VERSION);
+      expect(data.auction.sid).to.equal(VALID_ALWAYS_SAMPLE_CONFIG.options.site_id);
+
+      expect(Object.keys(data.adUnits)).to.have.lengthOf(2);
+
+      expect(data.adUnits[AD_UNIT_CODE].sizes).to.have.lengthOf(3);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[0].w).to.equal(300);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[0].h).to.equal(250);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[1].w).to.equal(100);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[1].h).to.equal(200);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[2].w).to.equal(600);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[2].h).to.equal(400);
+
+      expect(data.adUnits[AD_UNIT_CODE].mediaTypes).to.have.lengthOf(2);
+      expect(data.adUnits[AD_UNIT_CODE].mediaTypes[0]).to.equal('banner');
+      expect(data.adUnits[AD_UNIT_CODE].mediaTypes[1]).to.equal('video');
+
+      expect(data.adUnits[AD_UNIT_CODE_NATIVE].mediaTypes).to.have.lengthOf(1);
+      expect(data.adUnits[AD_UNIT_CODE_NATIVE].mediaTypes[0]).to.equal('native');
+      expect(data.adUnits[AD_UNIT_CODE_NATIVE].sizes).to.have.lengthOf(0);
+
+      expect(Object.keys(data.adUnits[AD_UNIT_CODE].bids)).to.have.lengthOf(2);
+      const cnvrBidsArray = data.adUnits[AD_UNIT_CODE].bids['conversant'];
+      // testing multiple bids from same bidder
+      expect(cnvrBidsArray).to.have.lengthOf(2);
+      expect(cnvrBidsArray[0].eventCodes.includes(CNVR_CONSTANTS.BID)).to.be.true;
+      expect(cnvrBidsArray[0].cpm).to.equal(4);
+      expect(cnvrBidsArray[0].originalCpm).to.equal(0.04);
+      expect(cnvrBidsArray[0].currency).to.equal('USD');
+      expect(cnvrBidsArray[0].timeToRespond).to.equal(334);
+      expect(cnvrBidsArray[0].adSize.w).to.equal(300);
+      expect(cnvrBidsArray[0].adSize.h).to.equal(250);
+      expect(cnvrBidsArray[0].mediaType).to.equal('banner');
+      // 2nd bid different size
+      expect(cnvrBidsArray[1].eventCodes.includes(CNVR_CONSTANTS.BID)).to.be.true;
+      expect(cnvrBidsArray[1].cpm).to.equal(4);
+      expect(cnvrBidsArray[1].originalCpm).to.equal(0.04);
+      expect(cnvrBidsArray[1].currency).to.equal('USD');
+      expect(cnvrBidsArray[1].timeToRespond).to.equal(334);
+      expect(cnvrBidsArray[1].adSize.w).to.equal(200);
+      expect(cnvrBidsArray[1].adSize.h).to.equal(100);
+      expect(cnvrBidsArray[1].mediaType).to.equal('banner');
+
+      const apnBidsArray = data.adUnits[AD_UNIT_CODE].bids['appnexus'];
+      expect(apnBidsArray).to.have.lengthOf(2);
+      let apnBid = apnBidsArray[0];
+      expect(apnBid.originalCpm).to.be.undefined;
+      expect(apnBid.eventCodes.includes(CNVR_CONSTANTS.TIMEOUT)).to.be.true;
+      expect(apnBid.cpm).to.be.undefined;
+      expect(apnBid.currency).to.be.undefined;
+      expect(apnBid.timeToRespond).to.equal(3000);
+      expect(apnBid.adSize).to.be.undefined;
+      expect(apnBid.mediaType).to.be.undefined;
+      apnBid = apnBidsArray[1];
+      expect(apnBid.originalCpm).to.be.undefined;
+      expect(apnBid.eventCodes.includes(CNVR_CONSTANTS.NO_BID)).to.be.true;
+      expect(apnBid.cpm).to.be.undefined;
+      expect(apnBid.currency).to.be.undefined;
+      expect(apnBid.timeToRespond).to.equal(0);
+      expect(apnBid.adSize).to.be.undefined;
+      expect(apnBid.mediaType).to.be.undefined;
+
+      expect(Object.keys(data.adUnits[AD_UNIT_CODE_NATIVE].bids)).to.have.lengthOf(1);
+      const apnNativeBidsArray = data.adUnits[AD_UNIT_CODE_NATIVE].bids['appnexus'];
+      expect(apnNativeBidsArray).to.have.lengthOf(1);
+      const apnNativeBid = apnNativeBidsArray[0];
+      expect(apnNativeBid.eventCodes.includes(CNVR_CONSTANTS.BID)).to.be.true;
+      expect(apnNativeBid.cpm).to.equal(4);
+      expect(apnNativeBid.originalCpm).to.equal(0.04);
+      expect(apnNativeBid.currency).to.equal('USD');
+      expect(apnNativeBid.timeToRespond).to.equal(334);
+      expect(apnNativeBid.adSize.w).to.be.undefined;
+      expect(apnNativeBid.adSize.h).to.be.undefined;
+      expect(apnNativeBid.mediaType).to.equal('native');
+    });
+  });
+});
diff --git a/test/spec/modules/conversantBidAdapter_spec.js b/test/spec/modules/conversantBidAdapter_spec.js
index d802cd288ef..c63dc8f9c3b 100644
--- a/test/spec/modules/conversantBidAdapter_spec.js
+++ b/test/spec/modules/conversantBidAdapter_spec.js
@@ -1,7 +1,9 @@
 import {expect} from 'chai';
 import {spec, storage} from 'modules/conversantBidAdapter.js';
 import * as utils from 'src/utils.js';
-import { createEidsArray } from 'modules/userId/eids.js';
+import {createEidsArray} from 'modules/userId/eids.js';
+import { config } from '../../../src/config.js';
+import {deepAccess} from 'src/utils';
 
 describe('Conversant adapter tests', function() {
   const siteId = '108060';
@@ -70,6 +72,7 @@ describe('Conversant adapter tests', function() {
         video: {
           context: 'instream',
           playerSize: [632, 499],
+          pos: 3
         }
       },
       placementCode: 'pcode003',
@@ -106,12 +109,14 @@ describe('Conversant adapter tests', function() {
     {
       bidder: 'conversant',
       params: {
-        site_id: siteId
+        site_id: siteId,
+        position: 2,
       },
       mediaTypes: {
         video: {
           context: 'instream',
-          mimes: ['video/mp4', 'video/x-flv']
+          mimes: ['video/mp4', 'video/x-flv'],
+          pos: 7,
         }
       },
       placementCode: 'pcode005',
@@ -119,7 +124,51 @@ describe('Conversant adapter tests', function() {
       bidId: 'bid005',
       bidderRequestId: '117d765b87bed38',
       auctionId: 'req000'
-    }];
+    },
+    // video with first party data
+    {
+      bidder: 'conversant',
+      params: {
+        site_id: siteId
+      },
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          mimes: ['video/mp4', 'video/x-flv']
+        }
+      },
+      ortb2Imp: {
+        instl: 1,
+        ext: {
+          data: {
+            pbadslot: 'homepage-top-rect'
+          }
+        }
+      },
+      placementCode: 'pcode006',
+      transactionId: 'tx006',
+      bidId: 'bid006',
+      bidderRequestId: '117d765b87bed38',
+      auctionId: 'req000'
+    },
+    {
+      bidder: 'conversant',
+      params: {
+        site_id: siteId
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90], [468, 60]],
+          pos: 5
+        }
+      },
+      placementCode: 'pcode001',
+      transactionId: 'tx001',
+      bidId: 'bid007',
+      bidderRequestId: '117d765b87bed38',
+      auctionId: 'req000'
+    }
+  ];
 
   const bidResponses = {
     body: {
@@ -205,7 +254,7 @@ describe('Conversant adapter tests', function() {
     const page = 'http://test.com?a=b&c=123';
     const bidderRequest = {
       refererInfo: {
-        referer: page
+        page: page
       }
     };
     const request = spec.buildRequests(bidRequests, bidderRequest);
@@ -216,7 +265,7 @@ describe('Conversant adapter tests', function() {
     expect(payload).to.have.property('id', 'req000');
     expect(payload).to.have.property('at', 1);
     expect(payload).to.have.property('imp');
-    expect(payload.imp).to.be.an('array').with.lengthOf(6);
+    expect(payload.imp).to.be.an('array').with.lengthOf(8);
 
     expect(payload.imp[0]).to.have.property('id', 'bid000');
     expect(payload.imp[0]).to.have.property('secure', 1);
@@ -258,7 +307,7 @@ describe('Conversant adapter tests', function() {
     expect(payload.imp[3]).to.have.property('displaymanagerver').that.matches(versionPattern);
     expect(payload.imp[3]).to.not.have.property('tagid');
     expect(payload.imp[3]).to.have.property('video');
-    expect(payload.imp[3].video).to.not.have.property('pos');
+    expect(payload.imp[3].video).to.have.property('pos', 3);
     expect(payload.imp[3].video).to.have.property('w', 632);
     expect(payload.imp[3].video).to.have.property('h', 499);
     expect(payload.imp[3].video).to.have.property('mimes');
@@ -296,7 +345,7 @@ describe('Conversant adapter tests', function() {
     expect(payload.imp[5]).to.have.property('displaymanagerver').that.matches(versionPattern);
     expect(payload.imp[5]).to.not.have.property('tagid');
     expect(payload.imp[5]).to.have.property('video');
-    expect(payload.imp[5].video).to.not.have.property('pos');
+    expect(payload.imp[5].video).to.have.property('pos', 2);
     expect(payload.imp[5].video).to.not.have.property('w');
     expect(payload.imp[5].video).to.not.have.property('h');
     expect(payload.imp[5].video).to.have.property('mimes');
@@ -306,6 +355,27 @@ describe('Conversant adapter tests', function() {
     expect(payload.imp[5].video).to.not.have.property('maxduration');
     expect(payload.imp[5]).to.not.have.property('banner');
 
+    expect(payload.imp[6]).to.have.property('id', 'bid006');
+    expect(payload.imp[6]).to.have.property('video');
+    expect(payload.imp[6].video).to.have.property('mimes');
+    expect(payload.imp[6].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
+    expect(payload.imp[6]).to.not.have.property('banner');
+    expect(payload.imp[6]).to.have.property('instl');
+    expect(payload.imp[6]).to.have.property('ext');
+    expect(payload.imp[6].ext).to.have.property('data');
+    expect(payload.imp[6].ext.data).to.have.property('pbadslot');
+
+    expect(payload.imp[7]).to.have.property('id', 'bid007');
+    expect(payload.imp[7]).to.have.property('secure', 1);
+    expect(payload.imp[7]).to.have.property('bidfloor', 0);
+    expect(payload.imp[7]).to.have.property('displaymanager', 'Prebid.js');
+    expect(payload.imp[7]).to.have.property('displaymanagerver').that.matches(versionPattern);
+    expect(payload.imp[7]).to.not.have.property('tagid');
+    expect(payload.imp[7]).to.have.property('banner');
+    expect(payload.imp[7].banner).to.have.property('pos', 5);
+    expect(payload.imp[7].banner).to.have.property('format');
+    expect(payload.imp[7].banner.format).to.deep.equal([{w: 728, h: 90}, {w: 468, h: 60}]);
+
     expect(payload).to.have.property('site');
     expect(payload.site).to.have.property('id', siteId);
     expect(payload.site).to.have.property('mobile').that.is.oneOf([0, 1]);
@@ -321,14 +391,42 @@ describe('Conversant adapter tests', function() {
     expect(payload).to.not.have.property('user'); // there should be no user by default
   });
 
+  it('Verify first party data', () => {
+    const bidderRequest = {
+      refererInfo: {page: 'http://test.com?a=b&c=123'},
+      ortb2: {site: {content: {series: 'MySeries', season: 'MySeason', episode: 3, title: 'MyTitle'}}}
+    };
+    const request = spec.buildRequests(bidRequests, bidderRequest);
+    const payload = request.data;
+    expect(payload.site).to.have.property('content');
+    expect(payload.site.content).to.have.property('series');
+    expect(payload.site.content).to.have.property('season');
+    expect(payload.site.content).to.have.property('episode');
+    expect(payload.site.content).to.have.property('title');
+  });
+
+  it('Verify supply chain data', () => {
+    const bidderRequest = {refererInfo: {page: 'http://test.com?a=b&c=123'}};
+    const schain = {complete: 1, ver: '1.0', nodes: [{asi: 'bidderA.com', sid: '00001', hp: 1}]};
+    const bidsWithSchain = bidRequests.map((bid) => {
+      return Object.assign({
+        schain: schain
+      }, bid);
+    });
+    const request = spec.buildRequests(bidsWithSchain, bidderRequest);
+    const payload = request.data;
+    expect(deepAccess(payload, 'source.ext.schain.nodes')).to.exist;
+    expect(payload.source.ext.schain.nodes[0].asi).equals(schain.nodes[0].asi);
+  });
+
   it('Verify override url', function() {
     const testUrl = 'https://someurl?name=value';
-    const request = spec.buildRequests([{params: {white_label_url: testUrl}}]);
+    const request = spec.buildRequests([{params: {white_label_url: testUrl}}], {});
     expect(request.url).to.equal(testUrl);
   });
 
   it('Verify interpretResponse', function() {
-    const request = spec.buildRequests(bidRequests);
+    const request = spec.buildRequests(bidRequests, {});
     const response = spec.interpretResponse(bidResponses, request);
     expect(response).to.be.an('array').with.lengthOf(4);
 
@@ -339,6 +437,7 @@ describe('Conversant adapter tests', function() {
     expect(bid).to.have.property('creativeId', '1000');
     expect(bid).to.have.property('width', 300);
     expect(bid).to.have.property('height', 250);
+    expect(bid.meta.advertiserDomains).to.deep.equal(['https://example.com']);
     expect(bid).to.have.property('ad', 'markup000<img src="notify000" />');
     expect(bid).to.have.property('ttl', 300);
     expect(bid).to.have.property('netRevenue', true);
@@ -390,7 +489,7 @@ describe('Conversant adapter tests', function() {
       Object.assign(unit, {crumbs: {pubcid: 12345}});
     });
     //  construct http post payload
-    const payload = spec.buildRequests(requests).data;
+    const payload = spec.buildRequests(requests, {}).data;
     expect(payload).to.have.deep.nested.property('user.ext.fpc', 12345);
     expect(payload).to.not.have.nested.property('user.ext.eids');
   });
@@ -405,7 +504,7 @@ describe('Conversant adapter tests', function() {
       Object.assign(unit, {userIdAsEids: createEidsArray(unit.userId)});
     });
     //  construct http post payload
-    const payload = spec.buildRequests(requests).data;
+    const payload = spec.buildRequests(requests, {}).data;
     expect(payload).to.have.deep.nested.property('user.ext.fpc', 67890);
     expect(payload).to.not.have.nested.property('user.ext.eids');
   });
@@ -480,10 +579,10 @@ describe('Conversant adapter tests', function() {
         Object.assign(unit, {userIdAsEids: createEidsArray(unit.userId)});
       });
       //  construct http post payload
-      const payload = spec.buildRequests(requests).data;
+      const payload = spec.buildRequests(requests, {}).data;
       expect(payload).to.have.deep.nested.property('user.ext.eids', [
         {source: 'adserver.org', uids: [{id: '223344', atype: 1, ext: {rtiPartner: 'TDID'}}]},
-        {source: 'liveramp.com', uids: [{id: '334455', atype: 1}]}
+        {source: 'liveramp.com', uids: [{id: '334455', atype: 3}]}
       ]);
     });
   });
@@ -504,7 +603,15 @@ describe('Conversant adapter tests', function() {
       return (new Date(Date.now() + timeout * 60 * 60 * 24 * 1000)).toUTCString();
     }
 
+    beforeEach(() => {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        conversant: {
+          storageAllowed: true
+        }
+      };
+    });
     afterEach(() => {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
       cleanUp(ID_NAME);
       cleanUp(CUSTOM_ID_NAME);
     });
@@ -517,7 +624,7 @@ describe('Conversant adapter tests', function() {
       storage.setCookie(ID_NAME, '12345', expStr(TIMEOUT));
 
       //  construct http post payload
-      const payload = spec.buildRequests(requests).data;
+      const payload = spec.buildRequests(requests, {}).data;
       expect(payload).to.have.deep.nested.property('user.ext.fpc', '12345');
     });
 
@@ -530,7 +637,7 @@ describe('Conversant adapter tests', function() {
       storage.setCookie(CUSTOM_ID_NAME, '12345', expStr(TIMEOUT));
 
       //  construct http post payload
-      const payload = spec.buildRequests(requests).data;
+      const payload = spec.buildRequests(requests, {}).data;
       expect(payload).to.have.deep.nested.property('user.ext.fpc', '12345');
     });
 
@@ -543,7 +650,7 @@ describe('Conversant adapter tests', function() {
       storage.setDataInLocalStorage(ID_NAME, 'abcde');
 
       //  construct http post payload
-      const payload = spec.buildRequests(requests).data;
+      const payload = spec.buildRequests(requests, {}).data;
       expect(payload).to.have.deep.nested.property('user.ext.fpc', 'abcde');
     });
 
@@ -556,7 +663,7 @@ describe('Conversant adapter tests', function() {
       storage.setDataInLocalStorage(ID_NAME, 'fghijk');
 
       //  construct http post payload
-      const payload = spec.buildRequests(requests).data;
+      const payload = spec.buildRequests(requests, {}).data;
       expect(payload).to.have.deep.nested.property('user.ext.fpc', 'fghijk');
     });
 
@@ -569,7 +676,7 @@ describe('Conversant adapter tests', function() {
       storage.setDataInLocalStorage(ID_NAME, 'lmnopq');
 
       //  construct http post payload
-      const payload = spec.buildRequests(requests).data;
+      const payload = spec.buildRequests(requests, {}).data;
       expect(payload).to.not.have.deep.nested.property('user.ext.fpc');
     });
 
@@ -583,8 +690,137 @@ describe('Conversant adapter tests', function() {
       storage.setDataInLocalStorage(CUSTOM_ID_NAME, 'fghijk');
 
       //  construct http post payload
-      const payload = spec.buildRequests(requests).data;
+      const payload = spec.buildRequests(requests, {}).data;
       expect(payload).to.have.deep.nested.property('user.ext.fpc', 'fghijk');
     });
   });
+
+  describe('price floor module', function() {
+    let bidRequest;
+    beforeEach(function() {
+      bidRequest = [utils.deepClone(bidRequests[0])];
+      delete bidRequest[0].params.bidfloor;
+    });
+
+    it('obtain floor from getFloor', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.21
+        };
+      };
+
+      const payload = spec.buildRequests(bidRequest, {}).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 3.21);
+    });
+
+    it('obtain floor from params', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.21
+        };
+      };
+      bidRequest[0].params.bidfloor = 0.6;
+
+      const payload = spec.buildRequests(bidRequest, {}).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0.6);
+    });
+
+    it('unsupported currency', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 1.23
+        };
+      };
+
+      const payload = spec.buildRequests(bidRequest, {}).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0);
+    });
+
+    it('bad floor value', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 'test'
+        };
+      };
+
+      const payload = spec.buildRequests(bidRequest, {}).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0);
+    });
+
+    it('empty floor object', function() {
+      bidRequest[0].getFloor = () => {
+        return {};
+      };
+
+      const payload = spec.buildRequests(bidRequest, {}).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0);
+    });
+
+    it('undefined floor result', function() {
+      bidRequest[0].getFloor = () => {};
+
+      const payload = spec.buildRequests(bidRequest, {}).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0);
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    const syncurl_iframe = 'https://sync.dotomi.com:8080/iframe';
+    const syncurl_image = 'https://sync.dotomi.com:8080/pixel';
+    const cnvrResponse = {ext: {psyncs: [syncurl_image], fsyncs: [syncurl_iframe]}};
+    let sandbox;
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+    afterEach(function() {
+      sandbox.restore();
+    });
+
+    it('empty params', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, undefined))
+        .to.deep.equal([]);
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {ext: {}}, undefined, undefined))
+        .to.deep.equal([]);
+      expect(spec.getUserSyncs({ iframeEnabled: true }, cnvrResponse, undefined, undefined))
+        .to.deep.equal([{ type: 'iframe', url: syncurl_iframe }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, cnvrResponse, undefined, undefined))
+        .to.deep.equal([{ type: 'image', url: syncurl_image }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, cnvrResponse, undefined, undefined))
+        .to.deep.equal([{type: 'iframe', url: syncurl_iframe}, {type: 'image', url: syncurl_image}]);
+    });
+
+    it('URL building', function() {
+      expect(spec.getUserSyncs({pixelEnabled: true}, {ext: {psyncs: [`${syncurl_image}?sid=1234`]}}, undefined, undefined))
+        .to.deep.equal([{type: 'image', url: `${syncurl_image}?sid=1234`}]);
+      expect(spec.getUserSyncs({pixelEnabled: true}, {ext: {psyncs: [`${syncurl_image}?sid=1234`]}}, undefined, '1NYN'))
+        .to.deep.equal([{type: 'image', url: `${syncurl_image}?sid=1234&us_privacy=1NYN`}]);
+    });
+
+    it('GDPR', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, cnvrResponse, {gdprApplies: true, consentString: 'consentstring'}, undefined))
+        .to.deep.equal([{ type: 'iframe', url: `${syncurl_iframe}?gdpr=1&gdpr_consent=consentstring` }]);
+      expect(spec.getUserSyncs({ iframeEnabled: true }, cnvrResponse, {gdprApplies: false, consentString: 'consentstring'}, undefined))
+        .to.deep.equal([{ type: 'iframe', url: `${syncurl_iframe}?gdpr=0&gdpr_consent=consentstring` }]);
+      expect(spec.getUserSyncs({ iframeEnabled: true }, cnvrResponse, {gdprApplies: true, consentString: undefined}, undefined))
+        .to.deep.equal([{ type: 'iframe', url: `${syncurl_iframe}?gdpr=1&gdpr_consent=` }]);
+
+      expect(spec.getUserSyncs({ pixelEnabled: true }, cnvrResponse, {gdprApplies: true, consentString: 'consentstring'}, undefined))
+        .to.deep.equal([{ type: 'image', url: `${syncurl_image}?gdpr=1&gdpr_consent=consentstring` }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, cnvrResponse, {gdprApplies: false, consentString: 'consentstring'}, undefined))
+        .to.deep.equal([{ type: 'image', url: `${syncurl_image}?gdpr=0&gdpr_consent=consentstring` }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, cnvrResponse, {gdprApplies: true, consentString: undefined}, undefined))
+        .to.deep.equal([{ type: 'image', url: `${syncurl_image}?gdpr=1&gdpr_consent=` }]);
+    });
+
+    it('US_Privacy', function() {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, cnvrResponse, undefined, '1NYN'))
+        .to.deep.equal([{ type: 'iframe', url: `${syncurl_iframe}?us_privacy=1NYN` }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, cnvrResponse, undefined, '1NYN'))
+        .to.deep.equal([{ type: 'image', url: `${syncurl_image}?us_privacy=1NYN` }]);
+    });
+  });
 });
diff --git a/test/spec/modules/cosmosBidAdapter_spec.js b/test/spec/modules/cosmosBidAdapter_spec.js
deleted file mode 100644
index b33f53221e2..00000000000
--- a/test/spec/modules/cosmosBidAdapter_spec.js
+++ /dev/null
@@ -1,355 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/cosmosBidAdapter.js';
-import * as utils from 'src/utils.js';
-const constants = require('src/constants.json');
-
-describe('Cosmos adapter', function () {
-  let bannerBidRequests;
-  let bannerBidResponse;
-  let videoBidRequests;
-  let videoBidResponse;
-
-  beforeEach(function () {
-    bannerBidRequests = [
-      {
-        bidder: 'cosmos',
-        mediaTypes: {
-          banner: {
-            sizes: [[300, 250], [300, 600]],
-          }
-        },
-        params: {
-          publisherId: '1001',
-          currency: 'USD',
-          geo: {
-            lat: '09.5',
-            lon: '21.2',
-          }
-        },
-        bidId: '29f8bd96defe76'
-      }
-    ];
-
-    videoBidRequests =
-      [
-        {
-          mediaTypes: {
-            video: {
-              mimes: ['video/mp4', 'video/x-flv'],
-              context: 'instream'
-            }
-          },
-          bidder: 'cosmos',
-          params: {
-            publisherId: 1001,
-            video: {
-              skippable: true,
-              minduration: 5,
-              maxduration: 30
-            }
-          },
-          bidId: '39f5cc6eff9b37'
-        }
-      ];
-
-    bannerBidResponse = {
-      'body': {
-        'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
-        'seatbid': [{
-          'bid': [{
-            'id': '82DAAE22-FF66-4FAB-84AB-347B0C5CD02C',
-            'impid': '29f8bd96defe76',
-            'price': 1.858309,
-            'adm': '<div style=\"background-color:#3399ff;\"><p style=\"color:#ff0000;font-size:30px;font-family:Courier, monospace;\">COSMOS<span style=\"color:white;font-style:italic;font-size:20px;\">\"Connecting Advertisers and Publishers directly\"</span></p></div><script src=\"https://track.cosmoshq.com/event?data=%7B%22id%22%3A%221566015675167%22%2C%22bid%22%3A%2282DAAE22-FF66-4FAB-84AB-347B0C5CD02C%22%2C%22ts%22%3A%2220190817042115%22%2C%22pid%22%3A1001%2C%22plcid%22%3A1%2C%22aid%22%3A1%2C%22did%22%3A1%2C%22cid%22%3A%2222918%22%2C%22af%22%3A2%2C%22at%22%3A1%2C%22w%22%3A300%2C%22h%22%3A250%2C%22crid%22%3A%22v55jutrh%22%2C%22pp%22%3A1.858309%2C%22cp%22%3A1.858309%2C%22mg%22%3A0%7D&type=1\" type=\"text/javascript\"></script>',
-            'adid': 'v55jutrh',
-            'adomain': ['febreze.com'],
-            'iurl': 'https://thetradedesk-t-general.s3.amazonaws.com/AdvertiserLogos/vgl908z.png',
-            'cid': '1234',
-            'crid': 'v55jutrh',
-            'w': 300,
-            'h': 250,
-            'ext': {
-              'prebid': {
-                'type': 'banner'
-              }
-            }
-          }],
-          'seat': 'zeta'
-        }]
-      }
-    };
-
-    videoBidResponse = {
-      'body': {
-        'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
-        'seatbid': [{
-          'bid': [{
-            'id': '82DAAE22-FF66-4FAB-84AB-347B0C5CD02C',
-            'impid': '39f5cc6eff9b37',
-            'price': 0.858309,
-            'adm': '<?xml version=\"1.0" encoding=\"UTF-8"?><VAST version=\"2.0"><Ad id=\"1"><InLine><AdSystem>CosmosHQ</AdSystem><AdTitle>VAST 2.0 Instream Test 1</AdTitle><Description>VAST 2.0 Instream Test 1</Description><Impression>https://track.cosmoshq.com/event?data=%7B%22id%22%3A%221566011421045%22%2C%22bid%22%3A%2282DAAE22-FF66-4FAB-84AB-347B0C5CD02C%22%2C%22ts%22%3A%2220190817031021%22%2C%22pid%22%3A1001%2C%22plcid%22%3A1%2C%22aid%22%3A1%2C%22did%22%3A1%2C%22cid%22%3A%2222918%22%2C%22af%22%3A3%2C%22at%22%3A1%2C%22w%22%3A300%2C%22h%22%3A250%2C%22crid%22%3A%22v55jutrh%22%2C%22pp%22%3A0.858309%2C%22cp%22%3A0.858309%2C%22mg%22%3A0%7D&amp;type=1</Impression><Impression>https//track.dsp.impression.com/impression</Impression><Creatives><Creative AdID=\"1"><Linear><Duration>00:00:60</Duration><TrackingEvents/><MediaFiles><MediaFile delivery=\"progressive" type=\"video/mp4" bitrate=\"500" width=\"400" height=\"300" scalable=\"true" maintainAspectRatio=\"true">https//sync.cosmoshq.com/static/video/SampleVideo_1280x720_10mb.mp4</MediaFile></MediaFiles></Linear></Creative></Creatives></InLine></Ad></VAST>',
-            'adid': 'v55jutrh',
-            'adomain': ['febreze.com'],
-            'iurl': 'https://thetradedesk-t-general.s3.amazonaws.com/AdvertiserLogos/vgl908z.png',
-            'cid': '1234',
-            'crid': 'v55jutrh',
-            'w': 300,
-            'h': 250,
-            'ext': {
-              'prebid': {
-                'type': 'video'
-              }
-            }
-          }],
-          'seat': 'zeta'
-        }]
-      }
-    };
-  });
-
-  describe('isBidRequestValid', function () {
-    describe('validate the bid object: valid bid', function () {
-      it('valid bid case', function () {
-        let validBid = {
-            bidder: 'cosmos',
-            params: {
-              publisherId: 1001,
-              tagId: 1
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(true);
-      });
-
-      it('validate the bid object: nil/empty bid object', function () {
-        let validBid = {
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-      });
-
-      it('validate the bid object: publisherId not passed', function () {
-        let validBid = {
-            bidder: 'cosmos',
-            params: {
-              tagId: 1
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-      });
-
-      it('validate the bid object: publisherId is not number', function () {
-        let validBid = {
-            bidder: 'cosmos',
-            params: {
-              publisherId: '301',
-              tagId: 1
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-      });
-
-      it('validate the bid object: mimes absent', function () {
-        let validBid = {
-            bidder: 'cosmos',
-            mediaTypes: {
-              video: {}
-            },
-            params: {
-              publisherId: 1001
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-      });
-
-      it('validate the bid object: mimes present', function () {
-        let validBid = {
-            bidder: 'cosmos',
-            mediaTypes: {
-              video: {
-                mimes: ['video/mp4', 'application/javascript']
-              }
-            },
-            params: {
-              publisherId: 1001
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(true);
-      });
-
-      it('validate the bid object: tagId is not passed', function () {
-        let validBid = {
-            bidder: 'cosmos',
-            params: {
-              publisherId: 1001
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(true);
-      });
-    });
-
-    describe('buildRequests', function () {
-      it('build request object: buildRequests function should not modify original bannerBidRequests object', function () {
-        let originalBidRequests = utils.deepClone(bannerBidRequests);
-        let request = spec.buildRequests(bannerBidRequests);
-        expect(bannerBidRequests).to.deep.equal(originalBidRequests);
-      });
-
-      it('build request object: endpoint check', function () {
-        let request = spec.buildRequests(bannerBidRequests);
-        expect(request[0].url).to.equal('https://bid.cosmoshq.com/openrtb2/bids');
-        expect(request[0].method).to.equal('POST');
-      });
-
-      it('build request object: request params check', function () {
-        let request = spec.buildRequests(bannerBidRequests);
-        let data = JSON.parse(request[0].data);
-        expect(data.site.publisher.id).to.equal(bannerBidRequests[0].params.publisherId); // publisher Id
-        expect(data.imp[0].bidfloorcur).to.equal(bannerBidRequests[0].params.currency);
-      });
-
-      it('build request object: request params check without tagId', function () {
-        delete bannerBidRequests[0].params.tagId;
-        let request = spec.buildRequests(bannerBidRequests);
-        let data = JSON.parse(request[0].data);
-        expect(data.site.publisher.id).to.equal(bannerBidRequests[0].params.publisherId); // publisher Id
-        expect(data.imp[0].tagid).to.equal(undefined); // tagid
-        expect(data.imp[0].bidfloorcur).to.equal(bannerBidRequests[0].params.currency);
-      });
-
-      it('build request object: request params multi size format object check', function () {
-        let bidRequest = [
-          {
-            bidder: 'cosmos',
-            mediaTypes: {
-              banner: {
-                sizes: [[300, 250], [300, 600]],
-              }
-            },
-            params: {
-              publisherId: 1001,
-              currency: 'USD'
-            }
-          }
-        ];
-        /* case 1 - size passed in adslot */
-        let request = spec.buildRequests(bidRequest);
-        let data = JSON.parse(request[0].data);
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(250); // height
-
-        /* case 2 - size passed in adslot as well as in sizes array */
-        bidRequest[0].sizes = [[300, 600], [300, 250]];
-        bidRequest[0].mediaTypes = {
-          banner: {
-            sizes: [[300, 600], [300, 250]]
-          }
-        };
-        request = spec.buildRequests(bidRequest);
-        data = JSON.parse(request[0].data);
-
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(600); // height
-
-        /* case 3 - size passed in sizes but not in adslot */
-        bidRequest[0].params.tagId = 1;
-        bidRequest[0].sizes = [[300, 250], [300, 600]];
-        bidRequest[0].mediaTypes = {
-          banner: {
-            sizes: [[300, 250], [300, 600]]
-          }
-        };
-        request = spec.buildRequests(bidRequest);
-        data = JSON.parse(request[0].data);
-
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(250); // height
-        expect(data.imp[0].banner.format).exist.and.to.be.an('array');
-        expect(data.imp[0].banner.format[0]).exist.and.to.be.an('object');
-        expect(data.imp[0].banner.format[0].w).to.equal(300); // width
-        expect(data.imp[0].banner.format[0].h).to.equal(250); // height
-      });
-
-      it('build request object: request params currency check', function () {
-        let bidRequest = [
-          {
-            bidder: 'cosmos',
-            mediaTypes: {
-              banner: {
-                sizes: [[300, 250], [300, 600]],
-              }
-            },
-            params: {
-              publisherId: 1001,
-              tagId: 1,
-              currency: 'USD'
-            },
-            sizes: [[300, 250], [300, 600]]
-          }
-        ];
-
-        /* case 1 -
-            currency specified in adunits
-            output: imp[0] use currency specified in bannerBidRequests[0].params.currency
-
-        */
-        let request = spec.buildRequests(bidRequest);
-        let data = JSON.parse(request[0].data);
-        expect(data.imp[0].bidfloorcur).to.equal(bidRequest[0].params.currency);
-
-        /* case 2 -
-            currency specified in adunit
-            output: imp[0] use default currency - USD
-
-        */
-        delete bidRequest[0].params.currency;
-        request = spec.buildRequests(bidRequest);
-        data = JSON.parse(request[0].data);
-        expect(data.imp[0].bidfloorcur).to.equal('USD');
-      });
-
-      it('build request object: request params check for video ad', function () {
-        let request = spec.buildRequests(videoBidRequests);
-        let data = JSON.parse(request[0].data);
-        expect(data.imp[0].video).to.exist;
-        expect(data.imp[0]['video']['mimes']).to.exist.and.to.be.an('array');
-        expect(data.imp[0]['video']['mimes'][0]).to.equal(videoBidRequests[0].mediaTypes.video['mimes'][0]);
-        expect(data.imp[0]['video']['mimes'][1]).to.equal(videoBidRequests[0].mediaTypes.video['mimes'][1]);
-        expect(data.imp[0]['video']['minduration']).to.equal(videoBidRequests[0].params.video['minduration']);
-        expect(data.imp[0]['video']['maxduration']).to.equal(videoBidRequests[0].params.video['maxduration']);
-      });
-
-      describe('interpretResponse', function () {
-        it('check for banner response', function () {
-          let request = spec.buildRequests(bannerBidRequests);
-          let data = JSON.parse(request[0].data);
-          let response = spec.interpretResponse(bannerBidResponse, request[0]);
-          expect(response).to.be.an('array').with.length.above(0);
-          expect(response[0].requestId).to.equal(bannerBidResponse.body.seatbid[0].bid[0].impid);
-          expect(response[0].cpm).to.equal((bannerBidResponse.body.seatbid[0].bid[0].price).toFixed(2));
-          expect(response[0].width).to.equal(bannerBidResponse.body.seatbid[0].bid[0].w);
-          expect(response[0].height).to.equal(bannerBidResponse.body.seatbid[0].bid[0].h);
-          if (bannerBidResponse.body.seatbid[0].bid[0].crid) {
-            expect(response[0].creativeId).to.equal(bannerBidResponse.body.seatbid[0].bid[0].crid);
-          } else {
-            expect(response[0].creativeId).to.equal(bannerBidResponse.body.seatbid[0].bid[0].id);
-          }
-          expect(response[0].dealId).to.equal(bannerBidResponse.body.seatbid[0].bid[0].dealid);
-          expect(response[0].currency).to.equal('USD');
-          expect(response[0].netRevenue).to.equal(false);
-          expect(response[0].ttl).to.equal(300);
-        });
-        it('check for video response', function () {
-          let request = spec.buildRequests(videoBidRequests);
-          let data = JSON.parse(request[0].data);
-          let response = spec.interpretResponse(videoBidResponse, request[0]);
-        });
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/cpexIdSystem_spec.js b/test/spec/modules/cpexIdSystem_spec.js
new file mode 100644
index 00000000000..e1320d82a6a
--- /dev/null
+++ b/test/spec/modules/cpexIdSystem_spec.js
@@ -0,0 +1,38 @@
+import { cpexIdSubmodule, storage } from 'modules/cpexIdSystem.js';
+
+describe('cpexId module', function () {
+  let getCookieStub;
+
+  beforeEach(function (done) {
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    done();
+  });
+
+  afterEach(function () {
+    getCookieStub.restore();
+  });
+
+  const cookieTestCasesForEmpty = [undefined, null, '']
+
+  describe('getId()', function () {
+    it('should return the uid when it exists in cookie', function () {
+      getCookieStub.withArgs('czaid').returns('cpexIdTest');
+      const id = cpexIdSubmodule.getId();
+      expect(id).to.be.deep.equal({ id: 'cpexIdTest' });
+    });
+
+    cookieTestCasesForEmpty.forEach(testCase => it('should not return the uid when it doesnt exist in cookie', function () {
+      getCookieStub.withArgs('czaid').returns(testCase);
+      const id = cpexIdSubmodule.getId();
+      expect(id).to.be.undefined;
+    }));
+  });
+
+  describe('decode()', function () {
+    it('should return the uid when it exists in cookie', function () {
+      getCookieStub.withArgs('czaid').returns('cpexIdTest');
+      const decoded = cpexIdSubmodule.decode();
+      expect(decoded).to.be.deep.equal({ cpexId: 'cpexIdTest' });
+    });
+  });
+});
diff --git a/test/spec/modules/cpmstarBidAdapter_spec.js b/test/spec/modules/cpmstarBidAdapter_spec.js
index 1993f28e5d5..285fca9690a 100755
--- a/test/spec/modules/cpmstarBidAdapter_spec.js
+++ b/test/spec/modules/cpmstarBidAdapter_spec.js
@@ -3,6 +3,41 @@ import { spec } from 'modules/cpmstarBidAdapter.js';
 import { deepClone } from 'src/utils.js';
 import { config } from 'src/config.js';
 
+const valid_bid_requests = [{
+  'bidder': 'cpmstar',
+  'params': {
+    'placementId': '57'
+  },
+  'sizes': [[300, 250]],
+  'bidId': 'bidId'
+}];
+
+const bidderRequest = {
+  refererInfo: {
+    referer: 'referer',
+    reachedTop: false,
+  }
+};
+
+const serverResponse = {
+  body: [{
+    creatives: [{
+      cpm: 1,
+      width: 0,
+      height: 0,
+      currency: 'USD',
+      netRevenue: true,
+      ttl: 1,
+      creativeid: '1234',
+      requestid: '11123',
+      code: 'no idea',
+      media: 'banner',
+    }
+    ],
+    syncs: [{ type: 'image', url: 'https://server.cpmstar.com/pixel.aspx' }]
+  }]
+};
+
 describe('Cpmstar Bid Adapter', function () {
   describe('isBidRequestValid', function () {
     it('should return true since the bid is valid',
@@ -42,23 +77,6 @@ describe('Cpmstar Bid Adapter', function () {
   });
 
   describe('buildRequests', function () {
-    const valid_bid_requests = [{
-      'bidder': 'cpmstar',
-      'params': {
-        'placementId': '57'
-      },
-      'sizes': [[300, 250]],
-      'bidId': 'bidId'
-    }];
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'referer',
-        reachedTop: false,
-      }
-
-    };
-
     it('should produce a valid production request', function () {
       var requests = spec.buildRequests(valid_bid_requests, bidderRequest);
       expect(requests[0]).to.have.property('method');
@@ -109,7 +127,30 @@ describe('Cpmstar Bid Adapter', function () {
       expect(requests[0]).to.have.property('url');
       expect(requests[0].url).to.include('tfcd=1');
     });
-  })
+  });
+
+  it('should produce a request with support for OpenRTB SupplyChain', function () {
+    var reqs = deepClone(valid_bid_requests);
+    reqs[0].schain = {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [
+        {
+          'asi': 'exchange1.com',
+          'sid': '1234',
+          'hp': 1
+        },
+        {
+          'asi': 'exchange2.com',
+          'sid': 'abcd',
+          'hp': 1
+        }
+      ]
+    };
+    var requests = spec.buildRequests(reqs, bidderRequest);
+    expect(requests[0]).to.have.property('url');
+    expect(requests[0].url).to.include('&schain=1.0,1!exchange1.com,1234,1,,,!exchange2.com,abcd,1,,,');
+  });
 
   describe('interpretResponse', function () {
     const request = {
@@ -117,23 +158,6 @@ describe('Cpmstar Bid Adapter', function () {
         mediaType: 'BANNER'
       }
     };
-    const serverResponse = {
-      body: [{
-        creatives: [{
-          cpm: 1,
-          width: 0,
-          height: 0,
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 1,
-          creativeid: '1234',
-          requestid: '11123',
-          code: 'no idea',
-          media: 'banner',
-        }
-        ],
-      }]
-    };
 
     it('should return a valid bidresponse array', function () {
       var r = spec.interpretResponse(serverResponse, request)
@@ -185,4 +209,23 @@ describe('Cpmstar Bid Adapter', function () {
       expect(spec.interpretResponse(dealServer, request)[0].dealId).to.equal('deal');
     });
   });
+
+  describe('getUserSyncs', function () {
+    var sres = [deepClone(serverResponse)];
+
+    it('should return a valid pixel sync', function () {
+      var syncs = spec.getUserSyncs({ pixelEnabled: true }, sres);
+      expect(syncs.length).equal(1);
+      expect(syncs[0].type).equal('image');
+      expect(syncs[0].url).equal('https://server.cpmstar.com/pixel.aspx');
+    });
+
+    it('should return a valid iframe sync', function () {
+      sres[0].body[0].syncs[0].type = 'iframe';
+      var syncs = spec.getUserSyncs({ iframeEnabled: true }, sres);
+      expect(syncs.length).equal(1);
+      expect(syncs[0].type).equal('iframe');
+      expect(syncs[0].url).equal('https://server.cpmstar.com/pixel.aspx');
+    });
+  });
 });
diff --git a/test/spec/modules/craftBidAdapter_spec.js b/test/spec/modules/craftBidAdapter_spec.js
index ef7dd7c3232..dfdbebde738 100644
--- a/test/spec/modules/craftBidAdapter_spec.js
+++ b/test/spec/modules/craftBidAdapter_spec.js
@@ -14,11 +14,17 @@ describe('craftAdapter', function () {
 
   describe('isBidRequestValid', function () {
     before(function() {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        craft: {
+          storageAllowed: true
+        }
+      };
       this.windowContext = window.context;
       window.context = null;
     });
 
     after(function() {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
       window.context = this.windowContext;
     });
     let bid = {
@@ -60,6 +66,16 @@ describe('craftAdapter', function () {
   });
 
   describe('buildRequests', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        craft: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
     let bidRequests = [{
       bidder: 'craft',
       params: {
@@ -75,13 +91,13 @@ describe('craftAdapter', function () {
     }];
     let bidderRequest = {
       refererInfo: {
-        referer: 'https://www.gacraft.jp/publish/craft-prebid-example.html'
+        topmostLocation: 'https://www.gacraft.jp/publish/craft-prebid-example.html'
       }
     };
     it('sends bid request to ENDPOINT via POST', function () {
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.method).to.equal('POST');
-      expect(request.url).to.equal('https://gacraft.jp/prebid-v3');
+      expect(request.url).to.equal('https://gacraft.jp/prebid-v3/craft-prebid-example');
       let data = JSON.parse(request.data);
       expect(data.tags).to.deep.equals([{
         sitekey: 'craft-prebid-example',
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index c5068d11d31..c54453bd7fc 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -1,15 +1,29 @@
 import { expect } from 'chai';
-import { tryGetCriteoFastBid, spec, PROFILE_ID_PUBLISHERTAG, ADAPTER_VERSION } from 'modules/criteoBidAdapter.js';
+import {
+  tryGetCriteoFastBid,
+  spec,
+  storage,
+  PROFILE_ID_PUBLISHERTAG,
+  ADAPTER_VERSION,
+  canFastBid, getFastBidUrl, FAST_BID_VERSION_CURRENT
+} from 'modules/criteoBidAdapter.js';
 import { createBid } from 'src/bidfactory.js';
 import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
+import * as refererDetection from 'src/refererDetection.js';
 import { config } from '../../../src/config.js';
-import { NATIVE, VIDEO } from '../../../src/mediaTypes.js';
+import * as storageManager from 'src/storageManager.js';
+import { BANNER, NATIVE, VIDEO } from '../../../src/mediaTypes.js';
 
 describe('The Criteo bidding adapter', function () {
   let utilsMock, sandbox;
 
   beforeEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      criteo: {
+        storageAllowed: true
+      }
+    };
     // Remove FastBid to avoid side effects
     localStorage.removeItem('criteo_fast_bid');
     utilsMock = sinon.mock(utils);
@@ -17,12 +31,190 @@ describe('The Criteo bidding adapter', function () {
     sandbox = sinon.sandbox.create();
   });
 
-  afterEach(function() {
+  afterEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {};
     global.Criteo = undefined;
     utilsMock.restore();
     sandbox.restore();
   });
 
+  describe('getUserSyncs', function () {
+    const syncOptionsIframeEnabled = {
+      iframeEnabled: true
+    };
+
+    const expectedHash = {
+      cw: true,
+      lsw: true,
+      origin: 'criteoPrebidAdapter',
+      requestId: '123456',
+      tld: 'www.abc.com',
+      topUrl: 'www.abc.com',
+      version: '$prebid.version$'.replace(/\./g, '_'),
+    };
+
+    let randomStub,
+      getConfigStub,
+      getRefererInfoStub,
+      cookiesAreEnabledStub,
+      localStorageIsEnabledStub,
+      getCookieStub,
+      getDataFromLocalStorageStub;
+
+    beforeEach(function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('criteo.fastBidVersion').returns('none');
+
+      randomStub = sinon.stub(Math, 'random');
+      randomStub.returns(123456);
+
+      getRefererInfoStub = sinon.stub(refererDetection, 'getRefererInfo');
+      getRefererInfoStub.returns({
+        domain: 'www.abc.com'
+      });
+
+      cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+      cookiesAreEnabledStub.returns(true);
+      localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+      localStorageIsEnabledStub.returns(true);
+
+      getCookieStub = sinon.stub(storage, 'getCookie')
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(function () {
+      randomStub.restore();
+      getConfigStub.restore();
+      getRefererInfoStub.restore();
+      cookiesAreEnabledStub.restore();
+      localStorageIsEnabledStub.restore();
+      getCookieStub.restore();
+      getDataFromLocalStorageStub.restore();
+    });
+
+    it('should not trigger sync if publisher is using fast bid', function () {
+      getConfigStub.withArgs('criteo.fastBidVersion').returns('latest');
+
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([]);
+    });
+
+    it('should not trigger sync if publisher did not enable iframe based syncs', function () {
+      const userSyncs = spec.getUserSyncs({
+        iframeEnabled: false
+      }, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([]);
+    });
+
+    it('should not trigger sync if purpose one is not granted', function () {
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: 'ABC',
+        vendorData: {
+          purpose: {
+            consents: {
+              1: false
+            }
+          }
+        }
+      };
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, gdprConsent, undefined);
+
+      expect(userSyncs).to.eql([]);
+    });
+
+    it('forwards ids from cookies', function () {
+      const cookieData = {
+        'cto_bundle': 'a',
+        'cto_sid': 'b',
+        'cto_lwid': 'c',
+        'cto_idcpy': 'd',
+        'cto_optout': 'e'
+      };
+
+      const expectedHashWithCookieData = {
+        ...expectedHash,
+        ...{
+          bundle: cookieData['cto_bundle'],
+          localWebId: cookieData['cto_lwid'],
+          secureIdCookie: cookieData['cto_sid'],
+          uid: cookieData['cto_idcpy'],
+          optoutCookie: cookieData['cto_optout']
+        }
+      };
+
+      getCookieStub.callsFake(cookieName => cookieData[cookieName]);
+
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com#${JSON.stringify(expectedHashWithCookieData, Object.keys(expectedHashWithCookieData).sort()).replace(/"/g, '%22')}`
+      }]);
+    });
+
+    it('forwards ids from local storage', function () {
+      const localStorageData = {
+        'cto_bundle': 'a',
+        'cto_sid': 'b',
+        'cto_lwid': 'c',
+        'cto_idcpy': 'd',
+        'cto_optout': 'e'
+      };
+
+      const expectedHashWithLocalStorageData = {
+        ...expectedHash,
+        ...{
+          bundle: localStorageData['cto_bundle'],
+          localWebId: localStorageData['cto_lwid'],
+          secureIdCookie: localStorageData['cto_sid'],
+          uid: localStorageData['cto_idcpy'],
+          optoutCookie: localStorageData['cto_optout']
+        }
+      };
+
+      getDataFromLocalStorageStub.callsFake(localStorageName => localStorageData[localStorageName]);
+
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com#${JSON.stringify(expectedHashWithLocalStorageData, Object.keys(expectedHashWithLocalStorageData).sort()).replace(/"/g, '%22')}`
+      }]);
+    });
+
+    it('forwards gdpr data', function () {
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: 'ABC',
+        vendorData: {
+          purpose: {
+            consents: {
+              1: true
+            }
+          }
+        }
+      };
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, gdprConsent, undefined);
+
+      expect(userSyncs).to.eql([{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&gdpr=1&gdpr_consent=ABC#${JSON.stringify(expectedHash).replace(/"/g, '%22')}`
+      }]);
+    });
+
+    it('forwards usp data', function () {
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, 'ABC');
+
+      expect(userSyncs).to.eql([{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&us_privacy=ABC#${JSON.stringify(expectedHash).replace(/"/g, '%22')}`
+      }]);
+    });
+  });
+
   describe('isBidRequestValid', function () {
     it('should return false when given an invalid bid', function () {
       const bid = {
@@ -66,7 +258,7 @@ describe('The Criteo bidding adapter', function () {
       expect(isValid).to.equal(true);
     });
 
-    it('should return true when given a valid video bid request', function () {
+    it('should return true when given a valid video bid request using mix custom bidder video parameters', function () {
       expect(spec.isBidRequestValid({
         bidder: 'criteo',
         mediaTypes: {
@@ -112,6 +304,30 @@ describe('The Criteo bidding adapter', function () {
       })).to.equal(true);
     });
 
+    it('should return true when given a valid video bid request using only mediaTypes.video parameters', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'criteo',
+        mediaTypes: {
+          video: {
+            context: 'instream',
+            mimes: ['video/mpeg'],
+            playerSize: [640, 480],
+            protocols: [5, 6],
+            maxduration: 30,
+            api: [1, 2],
+            skip: 1,
+            placement: 1,
+            minduration: 0,
+            playbackmethod: 1,
+            startdelay: 0
+          }
+        },
+        params: {
+          networkId: 456
+        },
+      })).to.equal(true);
+    });
+
     it('should return false when given an invalid video bid request', function () {
       expect(spec.isBidRequestValid({
         bidder: 'criteo',
@@ -374,7 +590,8 @@ describe('The Criteo bidding adapter', function () {
     const refererUrl = 'https://criteo.com?pbt_debug=1&pbt_nolog=1';
     const bidderRequest = {
       refererInfo: {
-        referer: refererUrl
+        page: refererUrl,
+        topmostLocation: refererUrl
       },
       timeout: 3000,
       gdprConsent: {
@@ -389,7 +606,15 @@ describe('The Criteo bidding adapter', function () {
       },
     };
 
+    let localStorageIsEnabledStub;
+
+    this.beforeEach(function () {
+      localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+      localStorageIsEnabledStub.returns(true);
+    });
+
     afterEach(function () {
+      localStorageIsEnabledStub.restore();
       config.resetConfig();
     });
 
@@ -400,7 +625,11 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {}
         },
       ];
@@ -415,17 +644,21 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123,
             publisherSubId: '123',
-            nativeCallback: function() {},
+            nativeCallback: function () { },
             integrationMode: 'amp'
           },
         },
       ];
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&im=1&debug=1&nolog=1/);
+      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d+&lsavail=1&im=1&debug=1&nolog=1/);
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
       expect(ortbRequest.publisher.url).to.equal(refererUrl);
@@ -443,7 +676,11 @@ describe('The Criteo bidding adapter', function () {
     it('should keep undefined sizes for non native banner', function () {
       const bidRequests = [
         {
-          sizes: [[undefined, undefined]],
+          mediaTypes: {
+            banner: {
+              sizes: [[undefined, undefined]]
+            }
+          },
           params: {},
         },
       ];
@@ -456,7 +693,11 @@ describe('The Criteo bidding adapter', function () {
     it('should keep undefined size for non native banner', function () {
       const bidRequests = [
         {
-          sizes: [undefined, undefined],
+          mediaTypes: {
+            banner: {
+              sizes: [undefined, undefined]
+            }
+          },
           params: {},
         },
       ];
@@ -466,40 +707,47 @@ describe('The Criteo bidding adapter', function () {
       expect(ortbRequest.slots[0].sizes[0]).to.equal('undefinedxundefined');
     });
 
-    it('should properly detect and get sizes of native sizeless banner', function () {
+    it('should properly detect and forward native flag', function () {
       const bidRequests = [
         {
-          sizes: [[undefined, undefined]],
+          mediaTypes: {
+            banner: {
+              sizes: [[undefined, undefined]]
+            }
+          },
           params: {
-            nativeCallback: function() {}
+            nativeCallback: function () { }
           },
         },
       ];
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('2x2');
+      expect(ortbRequest.slots[0].native).to.equal(true);
     });
 
-    it('should properly detect and get size of native sizeless banner', function () {
+    it('should properly detect and forward native flag', function () {
       const bidRequests = [
         {
-          sizes: [undefined, undefined],
+          mediaTypes: {
+            banner: {
+              sizes: [undefined, undefined]
+            }
+          },
           params: {
-            nativeCallback: function() {}
+            nativeCallback: function () { }
           },
         },
       ];
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('2x2');
+      expect(ortbRequest.slots[0].native).to.equal(true);
     });
 
     it('should properly build a networkId request', function () {
       const bidderRequest = {
         refererInfo: {
-          referer: refererUrl
+          page: refererUrl,
+          topmostLocation: refererUrl,
         },
         timeout: 3000,
         gdprConsent: {
@@ -546,7 +794,8 @@ describe('The Criteo bidding adapter', function () {
     it('should properly build a mixed request', function () {
       const bidderRequest = {
         refererInfo: {
-          referer: refererUrl
+          page: refererUrl,
+          topmostLocation: refererUrl,
         },
         timeout: 3000
       };
@@ -555,7 +804,11 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123,
           },
@@ -564,7 +817,11 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-234',
           transactionId: 'transaction-234',
-          sizes: [[300, 250], [728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [728, 90]]
+            }
+          },
           params: {
             networkId: 456,
           },
@@ -595,7 +852,11 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123,
           },
@@ -617,7 +878,11 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123,
           },
@@ -633,13 +898,42 @@ describe('The Criteo bidding adapter', function () {
       expect(request.data.user.uspIab).to.equal('1YNY');
     });
 
+    it('should properly build a request with schain object', function () {
+      const expectedSchain = {
+        someProperty: 'someValue'
+      };
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          schain: expectedSchain,
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
+          params: {
+            zoneId: 123,
+          },
+        },
+      ];
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.source.ext.schain).to.equal(expectedSchain);
+    });
+
     it('should properly build a request with if ccpa consent field is not provided', function () {
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123,
           },
@@ -660,7 +954,7 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          sizes: [[640, 480]],
           mediaTypes: {
             video: {
               playerSize: [640, 480],
@@ -687,6 +981,7 @@ describe('The Criteo bidding adapter', function () {
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
       expect(ortbRequest.slots[0].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
+      expect(ortbRequest.slots[0].sizes).to.deep.equal([]);
       expect(ortbRequest.slots[0].video.playersizes).to.deep.equal(['640x480']);
       expect(ortbRequest.slots[0].video.maxduration).to.equal(30);
       expect(ortbRequest.slots[0].video.api).to.deep.equal([1, 2]);
@@ -704,7 +999,7 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          sizes: [[640, 480], [800, 600]],
           mediaTypes: {
             video: {
               playerSize: [[640, 480], [800, 600]],
@@ -730,6 +1025,7 @@ describe('The Criteo bidding adapter', function () {
       expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
       expect(request.method).to.equal('POST');
       const ortbRequest = request.data;
+      expect(ortbRequest.slots[0].sizes).to.deep.equal([]);
       expect(ortbRequest.slots[0].video.mimes).to.deep.equal(['video/mp4', 'video/x-flv']);
       expect(ortbRequest.slots[0].video.playersizes).to.deep.equal(['640x480', '800x600']);
       expect(ortbRequest.slots[0].video.maxduration).to.equal(30);
@@ -742,13 +1038,56 @@ describe('The Criteo bidding adapter', function () {
       expect(ortbRequest.slots[0].video.placement).to.equal(2);
     });
 
+    it('should properly build a video request when mediaTypes.video.skip=0', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          sizes: [[300, 250]],
+          mediaTypes: {
+            video: {
+              playerSize: [[300, 250]],
+              mimes: ['video/mp4', 'video/MPV', 'video/H264', 'video/webm', 'video/ogg'],
+              minduration: 1,
+              maxduration: 30,
+              playbackmethod: [2, 3, 4, 5, 6],
+              api: [1, 2, 3, 4, 5, 6],
+              protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+              skip: 0
+            }
+          },
+          params: {
+            networkId: 123
+          }
+        }
+      ];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.match(/^https:\/\/bidder\.criteo\.com\/cdb\?profileId=207&av=\d+&wv=[^&]+&cb=\d/);
+      expect(request.method).to.equal('POST');
+      const ortbRequest = request.data;
+      expect(ortbRequest.slots[0].sizes).to.deep.equal([]);
+      expect(ortbRequest.slots[0].video.playersizes).to.deep.equal(['300x250']);
+      expect(ortbRequest.slots[0].video.mimes).to.deep.equal(['video/mp4', 'video/MPV', 'video/H264', 'video/webm', 'video/ogg']);
+      expect(ortbRequest.slots[0].video.minduration).to.equal(1);
+      expect(ortbRequest.slots[0].video.maxduration).to.equal(30);
+      expect(ortbRequest.slots[0].video.playbackmethod).to.deep.equal([2, 3, 4, 5, 6]);
+      expect(ortbRequest.slots[0].video.api).to.deep.equal([1, 2, 3, 4, 5, 6]);
+      expect(ortbRequest.slots[0].video.protocols).to.deep.equal([1, 2, 3, 4, 5, 6, 7, 8]);
+      expect(ortbRequest.slots[0].video.skip).to.equal(0);
+    });
+
     it('should properly build a request with ceh', function () {
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123,
           },
@@ -770,32 +1109,35 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123
           }
         },
       ];
 
-      sandbox.stub(config, 'getConfig').callsFake(key => {
-        const config = {
-        };
-        return utils.deepAccess(config, key);
-      });
-
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2: {} });
       expect(request.data.publisher.ext).to.equal(undefined);
       expect(request.data.user.ext).to.equal(undefined);
       expect(request.data.slots[0].ext).to.equal(undefined);
     });
 
     it('should properly build a request with criteo specific ad unit first party data', function () {
+      // TODO: this test does not do what it says
       const bidRequests = [
         {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123,
             ext: {
@@ -805,29 +1147,27 @@ describe('The Criteo bidding adapter', function () {
         },
       ];
 
-      sandbox.stub(config, 'getConfig').callsFake(key => {
-        const config = {
-        };
-        return utils.deepAccess(config, key);
-      });
-
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2: {} });
       expect(request.data.slots[0].ext).to.deep.equal({
         bidfloor: 0.75,
       });
     });
 
     it('should properly build a request with first party data', function () {
-      const contextData = {
+      const siteData = {
         keywords: ['power tools'],
-        data: {
-          pageType: 'article'
+        ext: {
+          data: {
+            pageType: 'article'
+          }
         }
       };
       const userData = {
         gender: 'M',
-        data: {
-          registered: true
+        ext: {
+          data: {
+            registered: true
+          }
         }
       };
       const bidRequests = [
@@ -835,15 +1175,19 @@ describe('The Criteo bidding adapter', function () {
           bidder: 'criteo',
           adUnitCode: 'bid-123',
           transactionId: 'transaction-123',
-          sizes: [[728, 90]],
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90]]
+            }
+          },
           params: {
             zoneId: 123,
             ext: {
               bidfloor: 0.75
             }
           },
-          fpd: {
-            context: {
+          ortb2Imp: {
+            ext: {
               data: {
                 someContextAttribute: 'abc'
               }
@@ -852,19 +1196,14 @@ describe('The Criteo bidding adapter', function () {
         },
       ];
 
-      sandbox.stub(config, 'getConfig').callsFake(key => {
-        const config = {
-          fpd: {
-            context: contextData,
-            user: userData
-          }
-        };
-        return utils.deepAccess(config, key);
-      });
+      const ortb2 = {
+        site: siteData,
+        user: userData
+      };
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.publisher.ext).to.deep.equal(contextData);
-      expect(request.data.user.ext).to.deep.equal(userData);
+      const request = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2 });
+      expect(request.data.publisher.ext).to.deep.equal({ data: { pageType: 'article' } });
+      expect(request.data.user.ext).to.deep.equal({ data: { registered: true } });
       expect(request.data.slots[0].ext).to.deep.equal({
         bidfloor: 0.75,
         data: {
@@ -872,6 +1211,213 @@ describe('The Criteo bidding adapter', function () {
         }
       });
     });
+
+    it('should properly build a request when coppa flag is true', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      config.setConfig({ coppa: true });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.regs.coppa).to.not.be.undefined;
+      expect(request.data.regs.coppa).to.equal(1);
+    });
+
+    it('should properly build a request when coppa flag is false', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      config.setConfig({ coppa: false });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.regs.coppa).to.not.be.undefined;
+      expect(request.data.regs.coppa).to.equal(0);
+    });
+
+    it('should properly build a request when coppa flag is not defined', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.regs.coppa).to.be.undefined;
+    });
+
+    it('should properly build a banner request with floors', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [728, 90]]
+            }
+          },
+          params: {
+            networkId: 456,
+          },
+
+          getFloor: inputParams => {
+            if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+              return {
+                currency: 'USD',
+                floor: 1.0
+              };
+            } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+              return {
+                currency: 'USD',
+                floor: 2.0
+              };
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.slots[0].ext.floors).to.deep.equal({
+        'banner': {
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
+        }
+      });
+    });
+
+    it('should properly build a request with static floors', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [728, 90]]
+            }
+          },
+          params: {
+            networkId: 456,
+            bidFloor: 1,
+            bidFloorCur: 'EUR'
+          },
+        },
+      ];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.slots[0].ext.floors).to.deep.equal({
+        'banner': {
+          '300x250': { 'currency': 'EUR', 'floor': 1 },
+          '728x90': { 'currency': 'EUR', 'floor': 1 }
+        }
+      });
+    });
+
+    it('should properly build a video request with several player sizes with floors', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            video: {
+              playerSize: [[300, 250], [728, 90]]
+            }
+          },
+          params: {
+            networkId: 456,
+          },
+
+          getFloor: inputParams => {
+            if (inputParams.mediaType === VIDEO && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+              return {
+                currency: 'USD',
+                floor: 1.0
+              };
+            } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+              return {
+                currency: 'USD',
+                floor: 2.0
+              };
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.slots[0].ext.floors).to.deep.equal({
+        'video': {
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
+        }
+      });
+    });
+
+    it('should properly build a multi format request with floors', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [728, 90]]
+            },
+            video: {
+              playerSize: [640, 480],
+            },
+            native: {}
+          },
+          params: {
+            networkId: 456,
+          },
+          ortb2Imp: {
+            ext: {
+              data: {
+                someContextAttribute: 'abc'
+              }
+            }
+          },
+
+          getFloor: inputParams => {
+            if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+              return {
+                currency: 'USD',
+                floor: 1.0
+              };
+            } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+              return {
+                currency: 'USD',
+                floor: 2.0
+              };
+            } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 640 && inputParams.size[1] === 480) {
+              return {
+                currency: 'EUR',
+                floor: 3.2
+              };
+            } else if (inputParams.mediaType === NATIVE && inputParams.size === '*') {
+              return {
+                currency: 'YEN',
+                floor: 4.99
+              };
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.slots[0].ext.data.someContextAttribute).to.deep.equal('abc');
+      expect(request.data.slots[0].ext.floors).to.deep.equal({
+        'banner': {
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
+        },
+        'video': {
+          '640x480': { 'currency': 'EUR', 'floor': 3.2 }
+        },
+        'native': {
+          '*': { 'currency': 'YEN', 'floor': 4.99 }
+        }
+      });
+    });
   });
 
   describe('interpretResponse', function () {
@@ -889,9 +1435,11 @@ describe('The Criteo bidding adapter', function () {
             impid: 'test-requestId',
             cpm: 1.23,
             creative: 'test-ad',
+            creativecode: 'test-crId',
             width: 728,
             height: 90,
             dealCode: 'myDealCode',
+            adomain: ['criteo.com'],
           }],
         },
       };
@@ -909,9 +1457,11 @@ describe('The Criteo bidding adapter', function () {
       expect(bids[0].requestId).to.equal('test-bidId');
       expect(bids[0].cpm).to.equal(1.23);
       expect(bids[0].ad).to.equal('test-ad');
+      expect(bids[0].creativeId).to.equal('test-crId');
       expect(bids[0].width).to.equal(728);
       expect(bids[0].height).to.equal(90);
       expect(bids[0].dealId).to.equal('myDealCode');
+      expect(bids[0].meta.advertiserDomains[0]).to.equal('criteo.com');
     });
 
     it('should properly parse a bid response with a zoneId', function () {
@@ -940,7 +1490,6 @@ describe('The Criteo bidding adapter', function () {
       const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
       expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].adId).to.equal('abc123');
       expect(bids[0].cpm).to.equal(1.23);
       expect(bids[0].ad).to.equal('test-ad');
       expect(bids[0].width).to.equal(728);
@@ -974,7 +1523,6 @@ describe('The Criteo bidding adapter', function () {
       const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
       expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].adId).to.equal('abc123');
       expect(bids[0].cpm).to.equal(1.23);
       expect(bids[0].vastUrl).to.equal('http://test-ad');
       expect(bids[0].mediaType).to.equal(VIDEO);
@@ -992,6 +1540,7 @@ describe('The Criteo bidding adapter', function () {
             zoneid: 123,
             native: {
               'products': [{
+                'sendTargetingKeys': false,
                 'title': 'Product title',
                 'description': 'Product desc',
                 'price': '100',
@@ -1006,13 +1555,13 @@ describe('The Criteo bidding adapter', function () {
               'advertiser': {
                 'description': 'sponsor',
                 'domain': 'criteo.com',
-                'logo': {'url': 'https://www.criteo.com/images/criteo-logo.svg', 'height': 300, 'width': 300}
+                'logo': { 'url': 'https://www.criteo.com/images/criteo-logo.svg', 'height': 300, 'width': 300 }
               },
               'privacy': {
                 'optout_click_url': 'https://info.criteo.com/privacy/informations',
                 'optout_image_url': 'https://static.criteo.net/flash/icon/nai_small.png',
               },
-              'impression_pixels': [{'url': 'https://my-impression-pixel/test/impression'}, {'url': 'https://cas.com/lg.com'}]
+              'impression_pixels': [{ 'url': 'https://my-impression-pixel/test/impression' }, { 'url': 'https://cas.com/lg.com' }]
             }
           }],
         },
@@ -1027,70 +1576,94 @@ describe('The Criteo bidding adapter', function () {
           native: true,
         }]
       };
-      config.setConfig({'enableSendAllBids': false});
       const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
       expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].adId).to.equal('abc123');
       expect(bids[0].cpm).to.equal(1.23);
       expect(bids[0].mediaType).to.equal(NATIVE);
     });
 
-    it('should not parse bid response with native when enableSendAllBids is true', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            native: {}
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
+    it('should warn only once if sendTargetingKeys set to true on required fields for native bidRequest', () => {
+      const bidderRequest = {};
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          sizes: [[728, 90]],
           params: {
             zoneId: 123,
+            publisherSubId: '123',
+            nativeCallback: function () { }
           },
-          native: true,
-        }]
-      };
-      config.setConfig({'enableSendAllBids': true});
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('should not parse bid response with native when enableSendAllBids is not set', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            native: {}
-          }],
         },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-456',
+          transactionId: 'transaction-456',
+          sizes: [[728, 90]],
           params: {
-            zoneId: 123,
+            zoneId: 456,
+            publisherSubId: '456',
+            nativeCallback: function () { }
           },
-          native: true,
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
+        },
+      ];
+
+      const nativeParamsWithSendTargetingKeys = [
+        {
+          nativeParams: {
+            image: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            icon: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            clickUrl: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            displayUrl: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            privacyLink: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            privacyIcon: {
+              sendTargetingKeys: true
+            },
+          }
+        }
+      ];
+
+      utilsMock.expects('logWarn')
+        .withArgs('Criteo: all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)')
+        .exactly(nativeParamsWithSendTargetingKeys.length * bidRequests.length);
+      nativeParamsWithSendTargetingKeys.forEach(nativeParams => {
+        let transformedBidRequests = { ...bidRequests };
+        transformedBidRequests = [Object.assign(transformedBidRequests[0], nativeParams), Object.assign(transformedBidRequests[1], nativeParams)];
+        spec.buildRequests(transformedBidRequests, bidderRequest);
+      });
+      utilsMock.verify();
     });
 
     it('should properly parse a bid response with a zoneId passed as a string', function () {
@@ -1124,38 +1697,105 @@ describe('The Criteo bidding adapter', function () {
       expect(bids[0].height).to.equal(90);
     });
 
-    it('should generate unique adIds if none are returned by the endpoint', function () {
+    [{
+      hasBidResponseLevelPafData: true,
+      hasBidResponseBidLevelPafData: true,
+      shouldContainsBidMetaPafData: true
+    },
+    {
+      hasBidResponseLevelPafData: false,
+      hasBidResponseBidLevelPafData: true,
+      shouldContainsBidMetaPafData: false
+    },
+    {
+      hasBidResponseLevelPafData: true,
+      hasBidResponseBidLevelPafData: false,
+      shouldContainsBidMetaPafData: false
+    },
+    {
+      hasBidResponseLevelPafData: false,
+      hasBidResponseBidLevelPafData: false,
+      shouldContainsBidMetaPafData: false
+    }].forEach(testCase => {
+      const bidPafContentId = 'abcdef';
+      const pafTransmission = {
+        version: '12'
+      };
       const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            cpm: 1.23,
-            creative: 'test-ad',
+        slots: [
+          {
             width: 300,
             height: 250,
-          }, {
-            impid: 'test-requestId',
-            cpm: 4.56,
-            creative: 'test-ad',
-            width: 728,
-            height: 90,
-          }],
-        },
+            cpm: 10,
+            impid: 'adUnitId',
+            ext: (testCase.hasBidResponseBidLevelPafData ? {
+              paf: {
+                content_id: bidPafContentId
+              }
+            } : undefined)
+          }
+        ],
+        ext: (testCase.hasBidResponseLevelPafData ? {
+          paf: {
+            transmission: pafTransmission
+          }
+        } : undefined)
       };
+
       const request = {
         bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          sizes: [[300, 250], [728, 90]],
+          adUnitCode: 'adUnitId',
+          sizes: [[300, 250]],
           params: {
             networkId: 456,
           }
         }]
       };
+
       const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(2);
-      const prebidBids = bids.map(bid => Object.assign(createBid(CONSTANTS.STATUS.GOOD, request.bidRequests[0]), bid));
-      expect(prebidBids[0].adId).to.not.equal(prebidBids[1].adId);
+
+      expect(bids).to.have.lengthOf(1);
+
+      const theoreticalBidMetaPafData = {
+        paf: {
+          content_id: bidPafContentId,
+          transmission: pafTransmission
+        }
+      };
+
+      if (testCase.shouldContainsBidMetaPafData) {
+        expect(bids[0].meta).to.deep.equal(theoreticalBidMetaPafData);
+      } else {
+        expect(bids[0].meta).not.to.deep.equal(theoreticalBidMetaPafData);
+      }
+    });
+  });
+
+  describe('canFastBid', function () {
+    it('should properly detect if can do fastbid', function () {
+      const testCasesAndExpectedResult = [['none', false], ['', true], [undefined, true], [123, true]];
+      testCasesAndExpectedResult.forEach(testCase => {
+        const result = canFastBid(testCase[0]);
+        expect(result).to.equal(testCase[1]);
+      })
+    });
+  });
+
+  describe('getFastBidUrl', function () {
+    it('should properly detect the version of fastbid', function () {
+      const testCasesAndExpectedResult = [
+        ['', 'https://static.criteo.net/js/ld/publishertag.prebid.' + FAST_BID_VERSION_CURRENT + '.js'],
+        [undefined, 'https://static.criteo.net/js/ld/publishertag.prebid.' + FAST_BID_VERSION_CURRENT + '.js'],
+        [null, 'https://static.criteo.net/js/ld/publishertag.prebid.' + FAST_BID_VERSION_CURRENT + '.js'],
+        [NaN, 'https://static.criteo.net/js/ld/publishertag.prebid.' + FAST_BID_VERSION_CURRENT + '.js'],
+        [123, 'https://static.criteo.net/js/ld/publishertag.prebid.123.js'],
+        ['123', 'https://static.criteo.net/js/ld/publishertag.prebid.123.js'],
+        ['latest', 'https://static.criteo.net/js/ld/publishertag.prebid.js']
+      ];
+      testCasesAndExpectedResult.forEach(testCase => {
+        const result = getFastBidUrl(testCase[0]);
+        expect(result).to.equal(testCase[1]);
+      })
     });
   });
 
@@ -1222,7 +1862,7 @@ describe('The Criteo bidding adapter', function () {
 
   describe('when pubtag prebid adapter is not available', function () {
     it('should not warn if sendId is provided on required fields for native bidRequest', () => {
-      const bidderRequest = { };
+      const bidderRequest = {};
       const bidRequestsWithSendId = [
         {
           bidder: 'criteo',
@@ -1232,7 +1872,7 @@ describe('The Criteo bidding adapter', function () {
           params: {
             zoneId: 123,
             publisherSubId: '123',
-            nativeCallback: function() {}
+            nativeCallback: function () { }
           },
           nativeParams: {
             image: {
@@ -1263,7 +1903,7 @@ describe('The Criteo bidding adapter', function () {
     });
 
     it('should warn only once if sendId is not provided on required fields for native bidRequest', () => {
-      const bidderRequest = { };
+      const bidderRequest = {};
       const bidRequests = [
         {
           bidder: 'criteo',
@@ -1273,7 +1913,7 @@ describe('The Criteo bidding adapter', function () {
           params: {
             zoneId: 123,
             publisherSubId: '123',
-            nativeCallback: function() {}
+            nativeCallback: function () { }
           },
         },
         {
@@ -1284,7 +1924,7 @@ describe('The Criteo bidding adapter', function () {
           params: {
             zoneId: 456,
             publisherSubId: '456',
-            nativeCallback: function() {}
+            nativeCallback: function () { }
           },
         },
       ];
@@ -1338,7 +1978,7 @@ describe('The Criteo bidding adapter', function () {
         .withArgs('Criteo: all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)')
         .exactly(nativeParamsWithoutSendId.length * bidRequests.length);
       nativeParamsWithoutSendId.forEach(nativeParams => {
-        let transformedBidRequests = {...bidRequests};
+        let transformedBidRequests = { ...bidRequests };
         transformedBidRequests = [Object.assign(transformedBidRequests[0], nativeParams), Object.assign(transformedBidRequests[1], nativeParams)];
         spec.buildRequests(transformedBidRequests, bidderRequest);
       });
@@ -1351,10 +1991,10 @@ describe('The Criteo bidding adapter', function () {
       const response = {};
       const request = {};
 
-      const adapter = { interpretResponse: function() {} };
+      const adapter = { interpretResponse: function () { } };
       const adapterMock = sinon.mock(adapter);
       adapterMock.expects('interpretResponse').withExactArgs(response, request).once().returns('ok');
-      const prebidAdapter = { GetAdapter: function() {} };
+      const prebidAdapter = { GetAdapter: function () { } };
       const prebidAdapterMock = sinon.mock(prebidAdapter);
       prebidAdapterMock.expects('GetAdapter').withExactArgs(request).once().returns(adapter);
 
@@ -1374,10 +2014,10 @@ describe('The Criteo bidding adapter', function () {
     it('should forward bid to pubtag when calling onBidWon', () => {
       const bid = { auctionId: 123 };
 
-      const adapter = { handleBidWon: function() {} };
+      const adapter = { handleBidWon: function () { } };
       const adapterMock = sinon.mock(adapter);
       adapterMock.expects('handleBidWon').withExactArgs(bid).once();
-      const prebidAdapter = { GetAdapter: function() {} };
+      const prebidAdapter = { GetAdapter: function () { } };
       const prebidAdapterMock = sinon.mock(prebidAdapter);
       prebidAdapterMock.expects('GetAdapter').withExactArgs(bid.auctionId).once().returns(adapter);
 
@@ -1397,10 +2037,10 @@ describe('The Criteo bidding adapter', function () {
     it('should forward bid to pubtag when calling onSetTargeting', () => {
       const bid = { auctionId: 123 };
 
-      const adapter = { handleSetTargeting: function() {} };
+      const adapter = { handleSetTargeting: function () { } };
       const adapterMock = sinon.mock(adapter);
       adapterMock.expects('handleSetTargeting').withExactArgs(bid).once();
-      const prebidAdapter = { GetAdapter: function() {} };
+      const prebidAdapter = { GetAdapter: function () { } };
       const prebidAdapterMock = sinon.mock(prebidAdapter);
       prebidAdapterMock.expects('GetAdapter').withExactArgs(bid.auctionId).once().returns(adapter);
 
@@ -1420,10 +2060,10 @@ describe('The Criteo bidding adapter', function () {
     it('should forward bid to pubtag when calling onTimeout', () => {
       const timeoutData = [{ auctionId: 123 }];
 
-      const adapter = { handleBidTimeout: function() {} };
+      const adapter = { handleBidTimeout: function () { } };
       const adapterMock = sinon.mock(adapter);
       adapterMock.expects('handleBidTimeout').once();
-      const prebidAdapter = { GetAdapter: function() {} };
+      const prebidAdapter = { GetAdapter: function () { } };
       const prebidAdapterMock = sinon.mock(prebidAdapter);
       prebidAdapterMock.expects('GetAdapter').withExactArgs(timeoutData[0].auctionId).once().returns(adapter);
 
@@ -1441,15 +2081,15 @@ describe('The Criteo bidding adapter', function () {
     });
 
     it('should return a POST method with url & data from pubtag', () => {
-      const bidRequests = { };
-      const bidderRequest = { };
+      const bidRequests = {};
+      const bidderRequest = {};
 
-      const prebidAdapter = { buildCdbUrl: function() {}, buildCdbRequest: function() {} };
+      const prebidAdapter = { buildCdbUrl: function () { }, buildCdbRequest: function () { } };
       const prebidAdapterMock = sinon.mock(prebidAdapter);
       prebidAdapterMock.expects('buildCdbUrl').once().returns('cdbUrl');
       prebidAdapterMock.expects('buildCdbRequest').once().returns('cdbRequest');
 
-      const adapters = { Prebid: function() {} };
+      const adapters = { Prebid: function () { } };
       const adaptersMock = sinon.mock(adapters);
       adaptersMock.expects('Prebid').withExactArgs(PROFILE_ID_PUBLISHERTAG, ADAPTER_VERSION, bidRequests, bidderRequest, '$prebid.version$').once().returns(prebidAdapter);
 
diff --git a/test/spec/modules/criteoIdSystem_spec.js b/test/spec/modules/criteoIdSystem_spec.js
index aa5807da0da..76d5222c8b2 100644
--- a/test/spec/modules/criteoIdSystem_spec.js
+++ b/test/spec/modules/criteoIdSystem_spec.js
@@ -1,15 +1,9 @@
 import { criteoIdSubmodule, storage } from 'modules/criteoIdSystem.js';
 import * as utils from 'src/utils.js';
-import * as ajaxLib from 'src/ajax.js';
+import { server } from '../../mocks/xhr';
 
 const pastDateString = new Date(0).toString()
 
-function mockResponse(responseText, fakeResponse = (url, callback) => callback(responseText)) {
-  return function() {
-    return fakeResponse;
-  }
-}
-
 describe('CriteoId module', function () {
   const cookiesMaxAge = 13 * 30 * 24 * 60 * 60 * 1000;
 
@@ -22,7 +16,6 @@ describe('CriteoId module', function () {
   let removeFromLocalStorageStub;
   let timeStampStub;
   let parseUrlStub;
-  let ajaxBuilderStub;
   let triggerPixelStub;
 
   beforeEach(function (done) {
@@ -32,8 +25,7 @@ describe('CriteoId module', function () {
     setLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
     removeFromLocalStorageStub = sinon.stub(storage, 'removeDataFromLocalStorage');
     timeStampStub = sinon.stub(utils, 'timestamp').returns(nowTimestamp);
-    ajaxBuilderStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockResponse('{}'));
-    parseUrlStub = sinon.stub(utils, 'parseUrl').returns({protocol: 'https', hostname: 'testdev.com'})
+    parseUrlStub = sinon.stub(utils, 'parseUrl').returns({ protocol: 'https', hostname: 'testdev.com' })
     triggerPixelStub = sinon.stub(utils, 'triggerPixel');
     done();
   });
@@ -45,7 +37,6 @@ describe('CriteoId module', function () {
     setLocalStorageStub.restore();
     removeFromLocalStorageStub.restore();
     timeStampStub.restore();
-    ajaxBuilderStub.restore();
     triggerPixelStub.restore();
     parseUrlStub.restore();
   });
@@ -61,8 +52,9 @@ describe('CriteoId module', function () {
     getCookieStub.withArgs('cto_bidid').returns(testCase.cookie);
     getLocalStorageStub.withArgs('cto_bidid').returns(testCase.localStorage);
 
-    const id = criteoIdSubmodule.getId();
-    expect(id).to.be.deep.equal({id: testCase.expected ? { criteoId: testCase.expected } : undefined});
+    const result = criteoIdSubmodule.getId();
+    expect(result.id).to.be.deep.equal(testCase.expected ? { criteoId: testCase.expected } : undefined);
+    expect(result.callback).to.be.a('function');
   }))
 
   it('decode() should return the bidId when it exists in local storages', function () {
@@ -71,20 +63,25 @@ describe('CriteoId module', function () {
   });
 
   it('should call user sync url with the right params', function () {
-    getCookieStub.withArgs('cto_test_cookie').returns('1');
     getCookieStub.withArgs('cto_bundle').returns('bundle');
+    getCookieStub.withArgs('cto_dna_bundle').returns('info');
     window.criteo_pubtag = {}
 
-    const emptyObj = '{}';
-    let ajaxStub = sinon.stub().callsFake((url, callback) => callback(emptyObj));
-    ajaxBuilderStub.callsFake(mockResponse(undefined, ajaxStub))
+    let callBackSpy = sinon.spy();
+    let result = criteoIdSubmodule.getId();
+    result.callback(callBackSpy);
 
-    criteoIdSubmodule.getId();
-    const expectedUrl = `https://gum.criteo.com/sid/json?origin=prebid&topUrl=https%3A%2F%2Ftestdev.com%2F&domain=testdev.com&bundle=bundle&cw=1&pbt=1`;
+    const expectedUrl = `https://gum.criteo.com/sid/json?origin=prebid&topUrl=https%3A%2F%2Ftestdev.com%2F&domain=testdev.com&bundle=bundle&info=info&cw=1&pbt=1&lsw=1`;
 
-    expect(ajaxStub.calledWith(expectedUrl)).to.be.true;
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(expectedUrl);
 
-    window.criteo_pubtag = undefined;
+    request.respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
   });
 
   const responses = [
@@ -102,31 +99,37 @@ describe('CriteoId module', function () {
   responses.forEach(response => describe('test user sync response behavior', function () {
     const expirationTs = new Date(nowTimestamp + cookiesMaxAge).toString();
 
-    beforeEach(function (done) {
-      const fakeResponse = (url, callback) => {
-        callback(JSON.stringify(response));
-        setTimeout(done, 0);
-      }
-      ajaxBuilderStub.callsFake(mockResponse(undefined, fakeResponse));
-      criteoIdSubmodule.getId();
-    })
-
     it('should save bidId if it exists', function () {
+      const result = criteoIdSubmodule.getId();
+      result.callback((id) => {
+        expect(id).to.be.deep.equal(response.bidId ? { criteoId: response.bidId } : undefined);
+      });
+
+      let request = server.requests[0];
+      request.respond(
+        200,
+        { 'Content-Type': 'application/json' },
+        JSON.stringify(response)
+      );
+
       if (response.acwsUrl) {
         expect(triggerPixelStub.called).to.be.true;
         expect(setCookieStub.calledWith('cto_bundle')).to.be.false;
         expect(setLocalStorageStub.calledWith('cto_bundle')).to.be.false;
       } else if (response.bundle) {
-        expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs)).to.be.true;
+        expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs, null, '.com')).to.be.true;
+        expect(setCookieStub.calledWith('cto_bundle', response.bundle, expirationTs, null, '.testdev.com')).to.be.true;
         expect(setLocalStorageStub.calledWith('cto_bundle', response.bundle)).to.be.true;
         expect(triggerPixelStub.called).to.be.false;
       }
 
       if (response.bidId) {
-        expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs)).to.be.true;
+        expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs, null, '.com')).to.be.true;
+        expect(setCookieStub.calledWith('cto_bidid', response.bidId, expirationTs, null, '.testdev.com')).to.be.true;
         expect(setLocalStorageStub.calledWith('cto_bidid', response.bidId)).to.be.true;
       } else {
-        expect(setCookieStub.calledWith('cto_bidid', '', pastDateString)).to.be.true;
+        expect(setCookieStub.calledWith('cto_bidid', '', pastDateString, null, '.com')).to.be.true;
+        expect(setCookieStub.calledWith('cto_bidid', '', pastDateString, null, '.testdev.com')).to.be.true;
         expect(removeFromLocalStorageStub.calledWith('cto_bidid')).to.be.true;
       }
     });
@@ -140,17 +143,66 @@ describe('CriteoId module', function () {
     { consentData: undefined, expected: undefined }
   ];
 
-  gdprConsentTestCases.forEach(testCase => it('should call user sync url with the gdprConsent', function () {
-    const emptyObj = '{}';
-    let ajaxStub = sinon.stub().callsFake((url, callback) => callback(emptyObj));
-    ajaxBuilderStub.callsFake(mockResponse(undefined, ajaxStub))
+  it('should call sync pixels if request by backend', function () {
+    const expirationTs = new Date(nowTimestamp + cookiesMaxAge).toString();
+
+    const result = criteoIdSubmodule.getId();
+    result.callback((id) => {
 
-    criteoIdSubmodule.getId(undefined, testCase.consentData);
+    });
+
+    const response = {
+      pixels: [
+        {
+          pixelUrl: 'pixelUrlWithBundle',
+          writeBundleInStorage: true,
+          bundlePropertyName: 'abc',
+          storageKeyName: 'cto_pixel_test'
+        },
+        {
+          pixelUrl: 'pixelUrl'
+        }
+      ]
+    };
+
+    server.requests[0].respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      JSON.stringify(response)
+    );
+
+    server.requests[1].respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      JSON.stringify({
+        abc: 'ok'
+      })
+    );
+
+    expect(triggerPixelStub.called).to.be.true;
+    expect(setCookieStub.calledWith('cto_pixel_test', 'ok', expirationTs, null, '.com')).to.be.true;
+    expect(setCookieStub.calledWith('cto_pixel_test', 'ok', expirationTs, null, '.testdev.com')).to.be.true;
+    expect(setLocalStorageStub.calledWith('cto_pixel_test', 'ok')).to.be.true;
+  });
 
+  gdprConsentTestCases.forEach(testCase => it('should call user sync url with the gdprConsent', function () {
+    let callBackSpy = sinon.spy();
+    let result = criteoIdSubmodule.getId(undefined, testCase.consentData);
+    result.callback(callBackSpy);
+
+    let request = server.requests[0];
     if (testCase.expected) {
-      expect(ajaxStub.calledWithMatch(`gdprString=${testCase.expected}`)).to.be.true;
+      expect(request.url).to.have.string(`gdprString=${testCase.expected}`);
     } else {
-      expect(ajaxStub.calledWithMatch('gdprString')).not.to.be.true;
+      expect(request.url).to.not.have.string('gdprString');
     }
+
+    request.respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      JSON.stringify({})
+    );
+
+    expect(callBackSpy.calledOnce).to.be.true;
   }));
 });
diff --git a/test/spec/modules/currency_spec.js b/test/spec/modules/currency_spec.js
index ccd205964a9..b674cb5976d 100644
--- a/test/spec/modules/currency_spec.js
+++ b/test/spec/modules/currency_spec.js
@@ -9,8 +9,11 @@ import {
   setConfig,
   addBidResponseHook,
   currencySupportEnabled,
-  currencyRates
+  currencyRates,
+  ready
 } from 'modules/currency.js';
+import {createBid} from '../../../src/bidfactory.js';
+import CONSTANTS from '../../../src/constants.json';
 
 var assert = require('chai').assert;
 var expect = require('chai').expect;
@@ -22,8 +25,13 @@ describe('currency', function () {
 
   let fn = sinon.spy();
 
+  function makeBid(bidProps) {
+    return Object.assign(createBid(CONSTANTS.STATUS.GOOD), bidProps);
+  }
+
   beforeEach(function () {
     fakeCurrencyFileServer = sinon.fakeServer.create();
+    ready.reset();
   });
 
   afterEach(function () {
@@ -161,6 +169,28 @@ describe('currency', function () {
       expect(getGlobal().convertCurrency(1.0, 'USD', 'EUR')).to.equal(4);
       expect(getGlobal().convertCurrency(1.0, 'USD', 'JPY')).to.equal(200);
     });
+    it('uses default rates until currency file is loaded', function () {
+      setConfig({
+        adServerCurrency: 'USD',
+        defaultRates: {
+          USD: {
+            JPY: 100
+          }
+        }
+      });
+
+      // Race condition where a bid is converted before the file has been loaded
+      expect(getGlobal().convertCurrency(1.0, 'USD', 'JPY')).to.equal(100);
+
+      fakeCurrencyFileServer.respondWith(JSON.stringify({
+        'dataAsOf': '2017-04-25',
+        'conversions': {
+          'USD': { JPY: 200 }
+        }
+      }));
+      fakeCurrencyFileServer.respond();
+      expect(getGlobal().convertCurrency(1.0, 'USD', 'JPY')).to.equal(200);
+    });
   });
   describe('bidder override', function () {
     it('allows setConfig to set bidder currency', function () {
@@ -286,7 +316,7 @@ describe('currency', function () {
   });
 
   describe('currency.addBidResponseDecorator bidResponseQueue', function () {
-    it('not run until currency rates file is loaded', function () {
+    it('not run until currency rates file is loaded', function (done) {
       setConfig({});
 
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
@@ -296,21 +326,39 @@ describe('currency', function () {
       setConfig({ 'adServerCurrency': 'JPY' });
 
       var marker = false;
-      addBidResponseHook(function() {
+      let promiseResolved = false;
+      addBidResponseHook(Object.assign(function() {
         marker = true;
-      }, 'elementId', bid);
+      }, {
+        bail: function (promise) {
+          promise.then(() => promiseResolved = true);
+        }
+      }), 'elementId', bid);
 
       expect(marker).to.equal(false);
 
-      fakeCurrencyFileServer.respond();
-      expect(marker).to.equal(true);
+      setTimeout(() => {
+        expect(promiseResolved).to.be.false;
+        fakeCurrencyFileServer.respond();
+
+        setTimeout(() => {
+          expect(marker).to.equal(true);
+          expect(promiseResolved).to.be.true;
+          done();
+        });
+      });
     });
   });
 
   describe('currency.addBidResponseDecorator', function () {
+    let reject;
+    beforeEach(() => {
+      reject = sinon.stub().returns({status: 'rejected'});
+    });
+
     it('should leave bid at 1 when currency support is not enabled and fromCurrency is USD', function () {
       setConfig({});
-      var bid = { 'cpm': 1, 'currency': 'USD' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'USD' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
@@ -321,19 +369,20 @@ describe('currency', function () {
     it('should result in NO_BID when currency support is not enabled and fromCurrency is not USD', function () {
       setConfig({});
 
-      var bid = { 'cpm': 1, 'currency': 'GBP' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'GBP' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
-      }, 'elementId', bid);
-      expect(innerBid.statusMessage).to.equal('Bid returned empty or error response');
+      }, 'elementId', bid, reject);
+      expect(innerBid.status).to.equal('rejected');
+      expect(reject.calledOnce).to.be.true;
     });
 
     it('should not buffer bid when currency is already in desired currency', function () {
       setConfig({
         'adServerCurrency': 'USD'
       });
-      var bid = { 'cpm': 1, 'currency': 'USD' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'USD' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
@@ -348,31 +397,33 @@ describe('currency', function () {
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
       setConfig({ 'adServerCurrency': 'JPY' });
       fakeCurrencyFileServer.respond();
-      var bid = { 'cpm': 1, 'currency': 'ABC' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'ABC' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
-      }, 'elementId', bid);
-      expect(innerBid.statusMessage).to.equal('Bid returned empty or error response');
+      }, 'elementId', bid, reject);
+      expect(innerBid.status).to.equal('rejected');
+      expect(reject.calledOnce).to.be.true;
     });
 
     it('should result in NO_BID when adServerCurrency is not supported in file', function () {
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
       setConfig({ 'adServerCurrency': 'ABC' });
       fakeCurrencyFileServer.respond();
-      var bid = { 'cpm': 1, 'currency': 'GBP' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'GBP' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
-      }, 'elementId', bid);
-      expect(innerBid.statusMessage).to.equal('Bid returned empty or error response');
+      }, 'elementId', bid, reject);
+      expect(innerBid.status).to.equal('rejected');
+      expect(reject.calledOnce).to.be.true;
     });
 
     it('should return 1 when currency support is enabled and same currency code is requested as is set to adServerCurrency', function () {
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
       setConfig({ 'adServerCurrency': 'JPY' });
       fakeCurrencyFileServer.respond();
-      var bid = { 'cpm': 1, 'currency': 'JPY' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'JPY' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
@@ -385,7 +436,7 @@ describe('currency', function () {
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
       setConfig({ 'adServerCurrency': 'GBP' });
       fakeCurrencyFileServer.respond();
-      var bid = { 'cpm': 1, 'currency': 'USD' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'USD' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
@@ -398,7 +449,7 @@ describe('currency', function () {
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
       setConfig({ 'adServerCurrency': 'GBP' });
       fakeCurrencyFileServer.respond();
-      var bid = { 'cpm': 1, 'currency': 'CNY' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'CNY' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
@@ -411,7 +462,7 @@ describe('currency', function () {
       fakeCurrencyFileServer.respondWith(JSON.stringify(getCurrencyRates()));
       setConfig({ 'adServerCurrency': 'CNY' });
       fakeCurrencyFileServer.respond();
-      var bid = { 'cpm': 1, 'currency': 'JPY' };
+      var bid = makeBid({ 'cpm': 1, 'currency': 'JPY' });
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
diff --git a/test/spec/modules/cwireBidAdapter_spec.js b/test/spec/modules/cwireBidAdapter_spec.js
new file mode 100644
index 00000000000..f116b184b8c
--- /dev/null
+++ b/test/spec/modules/cwireBidAdapter_spec.js
@@ -0,0 +1,382 @@
+import { expect } from 'chai';
+import * as utils from '../../../src/utils.js';
+import { config } from '../../../src/config.js';
+import {
+  spec,
+  CW_PAGE_VIEW_ID,
+  ENDPOINT_URL,
+  RENDERER_URL,
+} from '../../../modules/cwireBidAdapter.js';
+import * as prebidGlobal from 'src/prebidGlobal.js';
+
+// ------------------------------------
+// Bid Request Builder
+// ------------------------------------
+
+const BID_DEFAULTS = {
+  request: {
+    bidder: 'cwire',
+    auctionId: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
+    transactionId: 'txaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
+    bidId: 'bid123445',
+    bidderRequestId: 'brid12345',
+    code: 'original-div',
+  },
+  params: {
+    placementId: 123456,
+    pageId: 777,
+  },
+  sizes: [[300, 250], [1, 1]],
+};
+
+const BidderRequestBuilder = function BidderRequestBuilder(options) {
+  const defaults = {
+    bidderCode: 'cwire',
+    auctionId: BID_DEFAULTS.request.auctionId,
+    bidderRequestId: BID_DEFAULTS.request.bidderRequestId,
+    transactionId: BID_DEFAULTS.request.transactionId,
+    timeout: 3000,
+  };
+
+  const request = {
+    ...defaults,
+    ...options
+  };
+
+  this.build = () => request;
+};
+
+const BidRequestBuilder = function BidRequestBuilder(options, deleteKeys) {
+  const defaults = JSON.parse(JSON.stringify(BID_DEFAULTS));
+
+  const request = {
+    ...defaults.request,
+    ...options
+  };
+
+  if (request && utils.isArray(deleteKeys)) {
+    deleteKeys.forEach((k) => {
+      delete request[k];
+    })
+  }
+
+  this.withParams = (options, deleteKeys) => {
+    request.params = {
+      ...defaults.params,
+      ...options
+    };
+    if (request && utils.isArray(deleteKeys)) {
+      deleteKeys.forEach((k) => {
+        delete request.params[k];
+      })
+    }
+    return this;
+  };
+
+  this.build = () => request;
+};
+
+describe('C-WIRE bid adapter', () => {
+  let sandbox;
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox();
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+    config.resetConfig();
+  });
+
+  // START TESTING
+  describe('C-WIRE - isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      expect(spec.isBidRequestValid(bid01)).to.equal(true);
+    });
+
+    it('should fail if there is no placementId', function () {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      delete bid01.params.placementId
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+    });
+
+    it('should fail if invalid placementId type', function () {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      delete bid01.params.placementId;
+      bid01.placementId = '322';
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+    });
+
+    it('should fail if there is no pageId', function () {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      delete bid01.params.pageId
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+    });
+
+    it('should fail if invalid pageId type', function () {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      delete bid01.params.pageId;
+      bid01.params.pageId = '3320';
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+    });
+
+    it('should fail if cwcreative of type number', function () {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      delete bid01.params.cwcreative;
+      bid01.params.cwcreative = 3320;
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+    });
+
+    it('should pass with valid cwcreative of type string', function () {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      bid01.params.cwcreative = 'i-am-a-string';
+      expect(spec.isBidRequestValid(bid01)).to.equal(true);
+    });
+  });
+
+  describe('C-WIRE - buildRequests()', function () {
+    it('creates a valid request', function () {
+      const bid01 = new BidRequestBuilder({
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 1]],
+          }
+        }
+      }).withParams({
+        cwcreative: '54321',
+        cwapikey: 'xxx-xxx-yyy-zzz-uuid',
+        refgroups: 'group_1',
+      }).build();
+
+      const bidderRequest01 = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bid01], bidderRequest01);
+
+      expect(requests.data.slots.length).to.equal(1);
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.slots[0].sizes[0]).to.equal('1x1');
+      expect(requests.data.cwcreative).to.equal('54321');
+      expect(requests.data.cwapikey).to.equal('xxx-xxx-yyy-zzz-uuid');
+      expect(requests.data.refgroups[0]).to.equal('group_1');
+    });
+
+    it('creates a valid request - read debug params from second bid', function () {
+      const bid01 = new BidRequestBuilder().withParams().build();
+
+      const bid02 = new BidRequestBuilder({
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 1]],
+          }
+        }
+      }).withParams({
+        cwcreative: '1234',
+        cwapikey: 'api_key_5',
+        refgroups: 'group_5',
+      }).build();
+
+      const bidderRequest01 = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bid01, bid02], bidderRequest01);
+
+      expect(requests.data.slots.length).to.equal(2);
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwcreative).to.equal('1234');
+      expect(requests.data.cwapikey).to.equal('api_key_5');
+      expect(requests.data.refgroups[0]).to.equal('group_5');
+    });
+
+    it('creates a valid request - read debug params from first bid, ignore second', function () {
+      const bid01 = new BidRequestBuilder()
+        .withParams({
+          cwcreative: '33',
+          cwapikey: 'api_key_33',
+          refgroups: 'group_33',
+        }).build();
+
+      const bid02 = new BidRequestBuilder()
+        .withParams({
+          cwcreative: '1234',
+          cwapikey: 'api_key_5',
+          refgroups: 'group_5',
+        }).build();
+
+      const bidderRequest01 = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bid01, bid02], bidderRequest01);
+
+      expect(requests.data.slots.length).to.equal(2);
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwcreative).to.equal('33');
+      expect(requests.data.cwapikey).to.equal('api_key_33');
+      expect(requests.data.refgroups[0]).to.equal('group_33');
+    });
+
+    it('creates a valid request - read debug params from 3 different slots', function () {
+      const bid01 = new BidRequestBuilder()
+        .withParams({
+          cwcreative: '33',
+        }).build();
+
+      const bid02 = new BidRequestBuilder()
+        .withParams({
+          cwapikey: 'api_key_5',
+        }).build();
+
+      const bid03 = new BidRequestBuilder()
+        .withParams({
+          refgroups: 'group_5',
+        }).build();
+      const bidderRequest01 = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bid01, bid02, bid03], bidderRequest01);
+
+      expect(requests.data.slots.length).to.equal(3);
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwcreative).to.equal('33');
+      expect(requests.data.cwapikey).to.equal('api_key_5');
+      expect(requests.data.refgroups[0]).to.equal('group_5');
+    });
+
+    it('creates a valid request - config is overriden by URL params', function () {
+      // for whatever reason stub for getWindowLocation does not work
+      // so this was the closest way to test for get params
+      const params = sandbox.stub(utils, 'getParameterByName');
+      params.withArgs('cwgroups').returns('group_2');
+      params.withArgs('cwcreative').returns('654321');
+
+      const bid01 = new BidRequestBuilder({
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 1]],
+          }
+        }
+      }).withParams({
+        cwcreative: '54321',
+        cwapikey: 'xxx-xxx-yyy-zzz',
+        refgroups: 'group_1',
+      }).build();
+
+      const bidderRequest01 = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bid01], bidderRequest01);
+
+      expect(requests.data.slots.length).to.equal(1);
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.slots[0].sizes[0]).to.equal('1x1');
+      expect(requests.data.cwcreative).to.equal('654321');
+      expect(requests.data.cwapikey).to.equal('xxx-xxx-yyy-zzz');
+      expect(requests.data.refgroups[0]).to.equal('group_2');
+    });
+
+    it('creates a valid request - if params are not set, null or empty array are sent to the API', function () {
+      const bid01 = new BidRequestBuilder({
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 1]],
+          }
+        }
+      }).withParams().build();
+
+      const bidderRequest01 = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bid01], bidderRequest01);
+
+      expect(requests.data.slots.length).to.equal(1);
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.cwid).to.be.null;
+      expect(requests.data.slots[0].sizes[0]).to.equal('1x1');
+      expect(requests.data.cwcreative).to.equal(null);
+      expect(requests.data.cwapikey).to.equal(null);
+      expect(requests.data.refgroups.length).to.equal(0);
+    });
+  });
+
+  describe('C-WIRE - interpretResponse()', function () {
+    const serverResponse = {
+      body: {
+        bids: [{
+          html: '<div><h2>AD CONTENT</h2></div>',
+          currency: 'CHF',
+          cpm: 43.37,
+          dimensions: [1, 1],
+          netRevenue: true,
+          creativeId: '1337',
+          requestId: BID_DEFAULTS.request.bidId,
+          ttl: 3500,
+        }],
+      }
+    };
+
+    const expectedResponse = [{
+      ad: JSON.parse(JSON.stringify(serverResponse.body.bids[0].html)),
+      bidderCode: BID_DEFAULTS.request.bidder,
+      cpm: JSON.parse(JSON.stringify(serverResponse.body.bids[0].cpm)),
+      creativeId: JSON.parse(JSON.stringify(serverResponse.body.bids[0].creativeId)),
+      currency: JSON.parse(JSON.stringify(serverResponse.body.bids[0].currency)),
+      height: JSON.parse(JSON.stringify(serverResponse.body.bids[0].dimensions[0])),
+      width: JSON.parse(JSON.stringify(serverResponse.body.bids[0].dimensions[1])),
+      netRevenue: JSON.parse(JSON.stringify(serverResponse.body.bids[0].netRevenue)),
+      requestId: JSON.parse(JSON.stringify(serverResponse.body.bids[0].requestId)),
+      ttl: JSON.parse(JSON.stringify(serverResponse.body.bids[0].ttl)),
+      meta: {
+        advertiserDomains: [],
+      },
+      mediaType: 'banner',
+    }]
+
+    it('correctly parses response', function () {
+      const bid01 = new BidRequestBuilder({
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 1]],
+          }
+        }
+      }).withParams().build();
+
+      const bidderRequest01 = new BidderRequestBuilder().build();
+      const requests = spec.buildRequests([bid01], bidderRequest01);
+
+      const response = spec.interpretResponse(serverResponse, requests);
+      expect(response).to.deep.equal(expectedResponse);
+    });
+
+    it('attaches renderer', function () {
+      const bid01 = new BidRequestBuilder({
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'outstream',
+          }
+        }
+      }).withParams().build();
+      const bidderRequest01 = new BidderRequestBuilder().build();
+
+      const _serverResponse = utils.deepClone(serverResponse);
+      _serverResponse.body.bids[0].vastXml = '<xml></xml>';
+
+      const _expectedResponse = utils.deepClone(expectedResponse);
+      _expectedResponse[0].mediaType = 'video';
+      _expectedResponse[0].videoScript = JSON.parse(JSON.stringify(_serverResponse.body.bids[0].html));
+      _expectedResponse[0].vastXml = JSON.parse(JSON.stringify(_serverResponse.body.bids[0].vastXml));
+      delete _expectedResponse[0].ad;
+
+      const requests = spec.buildRequests([bid01], bidderRequest01);
+      expect(requests.data.slots[0].sizes).to.deep.equal(['640x480']);
+
+      const response = spec.interpretResponse(_serverResponse, requests);
+      expect(response[0].renderer).to.exist;
+      expect(response[0].renderer.url).to.equals(RENDERER_URL);
+      expect(response[0].renderer.loaded).to.equals(false);
+
+      delete response[0].renderer;
+      expect(response).to.deep.equal(_expectedResponse);
+    });
+  });
+});
diff --git a/test/spec/modules/dacIdSystem_spec.js b/test/spec/modules/dacIdSystem_spec.js
new file mode 100644
index 00000000000..0246e65a310
--- /dev/null
+++ b/test/spec/modules/dacIdSystem_spec.js
@@ -0,0 +1,133 @@
+import {
+  dacIdSystemSubmodule,
+  storage,
+  FUUID_COOKIE_NAME,
+  AONEID_COOKIE_NAME
+} from 'modules/dacIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+
+const FUUID_DUMMY_VALUE = 'dacIdTest';
+const AONEID_DUMMY_VALUE = '12345'
+const DACID_DUMMY_OBJ = {
+  fuuid: FUUID_DUMMY_VALUE,
+  uid: AONEID_DUMMY_VALUE
+};
+
+describe('dacId module', function () {
+  let getCookieStub;
+
+  beforeEach(function (done) {
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    done();
+  });
+
+  afterEach(function () {
+    getCookieStub.restore();
+  });
+
+  const cookieTestCasesForEmpty = [
+    undefined,
+    null,
+    ''
+  ]
+
+  const configParamTestCase = {
+    params: {
+      oid: [
+        '637c1b6fc26bfad0', // valid
+        'e8316b39c08029e1' // invalid
+      ]
+    }
+  }
+
+  describe('getId()', function () {
+    it('should return undefined when oid & fuuid not exist', function () {
+      // no oid, no fuuid
+      const id = dacIdSystemSubmodule.getId();
+      expect(id).to.equal(undefined);
+    });
+
+    it('should return fuuid when oid not exists but fuuid exists', function () {
+      // no oid, fuuid
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      const id = dacIdSystemSubmodule.getId();
+      expect(id).to.be.deep.equal({
+        id: {
+          fuuid: FUUID_DUMMY_VALUE,
+          uid: undefined
+        }
+      });
+    });
+
+    it('should return fuuid when oid is invalid but fuuid exists', function () {
+      // invalid oid, fuuid, no AoneId
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      const id = dacIdSystemSubmodule.getId(configParamTestCase.params.oid[1]);
+      expect(id).to.be.deep.equal({
+        id: {
+          fuuid: FUUID_DUMMY_VALUE,
+          uid: undefined
+        }
+      });
+    });
+
+    cookieTestCasesForEmpty.forEach(testCase => it('should return undefined when fuuid not exists', function () {
+      // valid oid, no fuuid, no AoneId
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(testCase);
+      const id = dacIdSystemSubmodule.getId(configParamTestCase.params.oid[0]);
+      expect(id).to.equal(undefined);
+    }));
+
+    it('should return AoneId when AoneId not exists', function () {
+      // valid oid, fuuid, no AoneId
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      const callbackSpy = sinon.spy();
+      const callback = dacIdSystemSubmodule.getId({params: {oid: configParamTestCase.params.oid[0]}}).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({'uid': AONEID_DUMMY_VALUE}));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({fuuid: 'dacIdTest', uid: AONEID_DUMMY_VALUE});
+    });
+
+    cookieTestCasesForEmpty.forEach(testCase => it('should return undefined when AoneId not exists & API result is empty', function () {
+      // valid oid, fuuid, no AoneId, API result empty
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      const callbackSpy = sinon.spy();
+      const callback = dacIdSystemSubmodule.getId({params: {oid: configParamTestCase.params.oid[0]}}).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({'uid': testCase}));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({fuuid: 'dacIdTest', uid: undefined});
+    }));
+
+    it('should return the fuuid & AoneId when they exist', function () {
+      // valid oid, fuuid, AoneId
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      getCookieStub.withArgs(AONEID_COOKIE_NAME).returns(AONEID_DUMMY_VALUE);
+      const id = dacIdSystemSubmodule.getId(configParamTestCase.params.oid[0]);
+      expect(id).to.be.deep.equal({
+        id: {
+          fuuid: FUUID_DUMMY_VALUE,
+          uid: AONEID_DUMMY_VALUE
+        }
+      });
+    });
+  });
+
+  describe('decode()', function () {
+    it('should return fuuid & AoneId when they exist', function () {
+      const decoded = dacIdSystemSubmodule.decode(DACID_DUMMY_OBJ);
+      expect(decoded).to.be.deep.equal({
+        dacId: {
+          fuuid: FUUID_DUMMY_VALUE,
+          id: AONEID_DUMMY_VALUE
+        }
+      });
+    });
+
+    it('should return the undefined when decode id is not "string"', function () {
+      const decoded = dacIdSystemSubmodule.decode(1);
+      expect(decoded).to.equal(undefined);
+    });
+  });
+});
diff --git a/test/spec/modules/dailyhuntBidAdapter_spec.js b/test/spec/modules/dailyhuntBidAdapter_spec.js
index d571150dbee..f347d6cec5b 100644
--- a/test/spec/modules/dailyhuntBidAdapter_spec.js
+++ b/test/spec/modules/dailyhuntBidAdapter_spec.js
@@ -283,7 +283,8 @@ describe('DailyhuntAdapter', function () {
           currency: 'USD',
           ad: 'adm',
           mediaType: 'banner',
-          winUrl: 'winUrl'
+          winUrl: 'winUrl',
+          adomain: 'dailyhunt'
         },
         {
           requestId: '2',
@@ -296,6 +297,7 @@ describe('DailyhuntAdapter', function () {
           currency: 'USD',
           mediaType: 'video',
           winUrl: 'winUrl',
+          adomain: 'dailyhunt',
           videoCacheKey: 'cache_key',
           vastUrl: 'vastUrl',
         },
@@ -310,6 +312,7 @@ describe('DailyhuntAdapter', function () {
           currency: 'USD',
           mediaType: 'native',
           winUrl: 'winUrl',
+          adomain: 'dailyhunt',
           native: {
             clickUrl: 'https%3A%2F%2Fmontu1996.github.io%2F',
             clickTrackers: [],
@@ -336,6 +339,7 @@ describe('DailyhuntAdapter', function () {
           currency: 'USD',
           mediaType: 'video',
           winUrl: 'winUrl',
+          adomain: 'dailyhunt',
           vastXml: 'adm',
         },
       ];
diff --git a/test/spec/modules/dataController_spec.js b/test/spec/modules/dataController_spec.js
new file mode 100644
index 00000000000..25f55047377
--- /dev/null
+++ b/test/spec/modules/dataController_spec.js
@@ -0,0 +1,210 @@
+import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {filterBidData, init} from 'modules/dataControllerModule/index.js';
+import {startAuction} from 'src/prebid.js';
+
+describe('data controller', function () {
+  let spyFn;
+
+  beforeEach(function () {
+    spyFn = sinon.spy();
+  });
+
+  afterEach(function () {
+    config.resetConfig();
+  });
+
+  describe('data controller', function () {
+    let result;
+    let callbackFn;
+    let req;
+
+    beforeEach(function () {
+      init();
+      result = null;
+      req = {
+        'adUnits': [{
+          'bids': [
+            {
+              'bidder': 'ix',
+              'userId': {
+                'id5id': {
+                  'uid': 'ID5*19RudTU8mWiRdKfG-0E9oyyJCdbgb8MvcaEtPAxM29QZYT5DW9r01vBozMD93UZy',
+                  'ext': {
+                    'linkType': 2
+                  }
+                }
+              },
+              'userIdAsEids': [
+                {
+                  'source': 'id5-sync.com',
+                  'uids': [
+                    {
+                      'id': 'ID5*UJzjz7J0FNIWPCp8fAmwGavBhGxnJ06V9umghosEVm4ZPjpn2iWahAoiPal59yKa',
+                      'atype': 1,
+                      'ext': {
+                        'linkType': 2
+                      }
+                    }
+                  ]
+                }
+              ],
+
+            }
+          ]
+        }],
+        'ortb2Fragments': {
+          'bidder': {
+            'ix': {
+              'user': {
+                'data': [
+                  {
+                    'name': 'permutive.com',
+                    'ext': {
+                      'segtax': 4
+                    },
+                    'segment': [
+                      {
+                        'id': '777777'
+                      },
+                      {
+                        'id': '888888'
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
+          }
+        }
+      };
+      callbackFn = function (request) {
+        result = request;
+      };
+    });
+
+    afterEach(function () {
+      config.resetConfig();
+      startAuction.getHooks({hook: filterBidData}).remove();
+    });
+
+    it('filterEIDwhenSDA for All SDA ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterEIDwhenSDA: ['*']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.adUnits[0].bids[0].userIdAsEids).that.is.empty;
+      expect(req.adUnits[0].bids[0].userId).that.is.empty;
+      expect(req.ortb2Fragments.bidder.ix.user.ext.eids).that.is.empty;
+      expect(req.ortb2Fragments.global.user.ext.eids).that.is.empty;
+    });
+
+    it('filterEIDwhenSDA for available SAD permutive.com:4:777777 ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterEIDwhenSDA: ['permutive.com:4:777777']
+        }
+
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.adUnits[0].bids[0].userIdAsEids).that.is.empty;
+      expect(req.adUnits[0].bids[0].userId).that.is.empty;
+
+      expect(req.ortb2Fragments.bidder.ix.user.ext.eids).that.is.empty;
+      expect(req.ortb2Fragments.global.user.ext.eids).that.is.empty;
+    });
+
+    it('filterEIDwhenSDA for unavailable SAD test.com:4:9999 ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterEIDwhenSDA: ['test.com:4:99999']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.adUnits[0].bids[0].userIdAsEids).that.is.not.empty;
+      expect(req.adUnits[0].bids[0].userId).that.is.not.empty;
+    });
+    // Test for global
+    it('filterEIDwhenSDA for available global SAD test.com:4:777777 ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterEIDwhenSDA: ['test.com:5:11111']
+        }
+
+      };
+      config.setConfig(dataControllerConfiguration);
+      let globalObject = {
+        'ortb2Fragments': {
+          'global': {
+            'user': {
+              'yob': 1985,
+              'gender': 'm',
+              'keywords': 'a,b',
+              'data': [
+                {
+                  'name': 'test.com',
+                  'ext': {
+                    'segtax': 5
+                  },
+                  'segment': [
+                    {
+                      'id': '11111'
+                    },
+                    {
+                      'id': '22222'
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      };
+      let globalRequest = Object.assign({}, req, globalObject);
+      filterBidData(callbackFn, globalRequest);
+      expect(globalRequest.adUnits[0].bids[0].userIdAsEids).that.is.empty;
+      expect(globalRequest.adUnits[0].bids[0].userId).that.is.empty;
+    });
+
+    it('filterSDAwhenEID for id5-sync.com EID ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterSDAwhenEID: ['id5-sync.com']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.ortb2Fragments.bidder.ix.user.data).that.is.empty;
+    });
+
+    it('filterSDAwhenEID for All EID ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterSDAwhenEID: ['*']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+
+      filterBidData(callbackFn, req);
+      expect(req.ortb2Fragments.bidder.ix.user.data).that.is.empty;
+      expect(req.ortb2Fragments.global.user.data).that.is.empty;
+    });
+
+    it('filterSDAwhenEID for unavailable source test-sync.com EID ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterSDAwhenEID: ['test-sync.com']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.ortb2Fragments.bidder.ix.user.data).that.is.not.empty;
+    });
+  }
+  );
+});
diff --git a/test/spec/modules/datablocksBidAdapter_spec.js b/test/spec/modules/datablocksBidAdapter_spec.js
index 18b8aac7371..8e203510b10 100644
--- a/test/spec/modules/datablocksBidAdapter_spec.js
+++ b/test/spec/modules/datablocksBidAdapter_spec.js
@@ -1,12 +1,15 @@
 import { expect } from 'chai';
 import { spec } from '../../../modules/datablocksBidAdapter.js';
+import { BotClientTests } from '../../../modules/datablocksBidAdapter.js';
+import { getStorageManager } from '../../../src/storageManager.js';
+export let storage = getStorageManager();
 
-let bid = {
+const bid = {
   bidId: '2dd581a2b6281d',
   bidder: 'datablocks',
   bidderRequestId: '145e1d6a7837c9',
   params: {
-    sourceId: 7560,
+    source_id: 7560,
     host: 'v5demo.datablocks.net'
   },
   adUnitCode: '/19968336/header-bid-tag-0',
@@ -24,12 +27,12 @@ let bid = {
   transactionId: '1ccbee15-f6f6-46ce-8998-58fe5542e8e1'
 };
 
-let bid2 = {
+const bid2 = {
   bidId: '2dd581a2b624324g',
   bidder: 'datablocks',
   bidderRequestId: '145e1d6a7837543',
   params: {
-    sourceId: 7560,
+    source_id: 7560,
     host: 'v5demo.datablocks.net'
   },
   adUnitCode: '/19968336/header-bid-tag-0',
@@ -43,7 +46,7 @@ let bid2 = {
   transactionId: '1ccbee15-f6f6-46ce-8998-58fe55425432'
 };
 
-let nativeBid = {
+const nativeBid = {
   adUnitCode: '/19968336/header-bid-tag-0',
   auctionId: '160c78a4-f808-410f-b682-d8728f3a79ee',
   bidId: '332045ee374a99',
@@ -78,253 +81,446 @@ let nativeBid = {
     }
   },
   params: {
-    sourceId: 7560,
+    source_id: 7560,
     host: 'v5demo.datablocks.net'
   },
   transactionId: '0a4e9788-4def-4b94-bc25-564d7cac99f6'
 }
 
-let videoBid = {
-  adUnitCode: '/19968336/header-bid-tag-0',
-  auctionId: '160c78a4-f808-410f-b682-d8728f3a79e1',
-  bidId: '332045ee374b99',
-  bidder: 'datablocks',
-  bidderRequestId: '15d9012765e36d',
-  mediaTypes: {
-    video: {
-      context: 'instream',
-      playerSize: [501, 400],
-      durationRangeSec: [15, 60]
-    }
-  },
-  params: {
-    sourceId: 7560,
-    host: 'v5demo.datablocks.net',
-    video: {
-      minduration: 14
-    }
-  },
-  transactionId: '0a4e9788-4def-4b94-bc25-564d7cac99f7'
-}
-
 const bidderRequest = {
   auctionId: '8bfef1be-d3ac-4d18-8859-754c7b4cf017',
   auctionStart: Date.now(),
   biddeCode: 'datablocks',
   bidderRequestId: '10c47a5fc3c41',
-  bids: [bid, bid2, nativeBid, videoBid],
+  bids: [bid, bid2, nativeBid],
   refererInfo: {
     numIframes: 0,
     reachedTop: true,
-    referer: 'https://v5demo.datablocks.net/test',
-    stack: ['https://v5demo.datablocks.net/test']
+    referer: 'https://7560.v5demo.datablocks.net/test',
+    stack: ['https://7560.v5demo.datablocks.net/test']
   },
   start: Date.now(),
   timeout: 10000
 };
 
-let resObject = {
+const res_object = {
   body: {
-    id: '10c47a5fc3c41',
-    bidid: '166895245-28-11347-1',
-    seatbid: [{
-      seat: '7560',
-      bid: [{
-        id: '1090738570',
-        impid: '2966b257c81d27',
-        price: 24.000000,
-        adm: '<a href="https://click.v5demo.datablocks.net/c//?fcid=1090738570"><img src="https://impression.v5demo.datablocks.net/i//?fcid=1090738570&mime=image/png" alt="RON" height="250" width="300"></a><img alt="" src="https://impression.v5demo.datablocks.net/i//?fcid=1090738570&pixel=1" width="1" height="1" >',
-        cid: '55',
-        adid: '177654',
-        crid: '177656',
-        cat: [],
-        api: [],
-        w: 300,
-        h: 250
-      }, {
-        id: '1090738571',
-        impid: '2966b257c81d28',
-        price: 24.000000,
-        adm: '<a href="https://click.v5demo.datablocks.net/c//?fcid=1090738570"><img src="https://impression.v5demo.datablocks.net/i//?fcid=1090738570&mime=image/png" alt="RON" height="250" width="300"></a><img alt="" src="https://impression.v5demo.datablocks.net/i//?fcid=1090738570&pixel=1" width="1" height="1" >',
-        cid: '55',
-        adid: '177654',
-        crid: '177656',
-        cat: [],
-        api: [],
-        w: 728,
-        h: 90
-      }, {
-        id: '1090738570',
-        impid: '15d9012765e36c',
-        price: 24.000000,
-        adm: '{"native":{"ver":"1.2","assets":[{"id":1,"required":1,"title":{"text":"Example Title"}},{"id":2,"required":1,"data":{"value":"Example Body"}},{"id":3,"required":1,"img":{"url":"https://example.image.com/"}}],"link":{"url":"https://click.example.com/c/264597/?fcid=29699699045816"},"imptrackers":["https://impression.example.com/i/264597/?fcid=29699699045816"]}}',
-        cid: '132145',
-        adid: '154321',
-        crid: '177432',
-        cat: [],
-        api: []
-      }, {
-        id: '1090738575',
-        impid: '15d9012765e36f',
-        price: 25.000000,
-        cid: '12345',
-        adid: '12345',
-        crid: '123456',
-        nurl: 'https://click.v5demo.datablocks.net/m//?fcid=435235435432',
-        cat: [],
-        api: [],
-        w: 500,
-        h: 400
-      }]
-    }],
-    cur: 'USD',
-    ext: {}
+    'id': '10c47a5fc3c41',
+    'bidid': '217868445-30021-19053-0',
+    'seatbid': [
+      {
+        'id': '22621593137287',
+        'impid': '1',
+        'adm': 'John is great',
+        'adomain': ['medianet.com'],
+        'price': 0.430000,
+        'cid': '2524568',
+        'adid': '0',
+        'crid': '0',
+        'cat': [],
+        'w': 300,
+        'h': 250,
+        'ext': {
+          'type': 'CPM',
+          'mtype': 'banner'
+        }
+      },
+      {
+        'id': '22645215457415',
+        'impid': '2',
+        'adm': 'john is the best',
+        'adomain': ['td.com'],
+        'price': 0.580000,
+        'cid': '2524574',
+        'adid': '0',
+        'crid': '0',
+        'cat': [],
+        'w': 728,
+        'h': 90,
+        'ext': {
+          'type': 'CPM',
+          'mtype': 'banner'
+        }
+      },
+
+      {
+        'id': '22645215457416',
+        'impid': '3',
+        'adm': '{"native":{"ver":"1.2","assets":[{"id":1,"required":1,"title":{"text":"John is amazing"}},{"id":5,"required":1,"data":{"value":"Sponsored by John"}},{"id":3,"required":1,"img":{"url":"https://example.image.com/", "h":"360", "w":"360"}}],"link":{"url":"https://click.example.com/c/264597/?fcid=29699699045816"},"imptrackers":["https://impression.example.com/i/264597/?fcid=29699699045816"]}}',
+        'adomain': ['td.com'],
+        'price': 10.00,
+        'cid': '2524574',
+        'adid': '0',
+        'crid': '0',
+        'cat': [],
+        'ext': {
+          'type': 'CPM',
+          'mtype': 'native'
+        }
+      }
+    ],
+    'cur': 'USD',
+    'ext': {
+      'version': '1.2.93',
+      'buyerid': '1234567',
+      'syncs': [
+        {
+          'type': 'iframe',
+          'url': 'https://s.0cf.io'
+        },
+        {
+          'type': 'image',
+          'url': 'https://us.dblks.net/set_uid/'
+        }
+      ]
+    }
   }
-};
-let bidRequest = {
+}
+
+let bid_request = {
   method: 'POST',
-  url: 'https://v5demo.datablocks.net/search/?sid=7560',
+  url: 'https://prebid.datablocks.net/openrtb/?sid=2523014',
   options: {
-    withCredentials: false
+    withCredentials: true
   },
   data: {
-    device: {
-      ip: 'peer',
-      ua: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) Ap…ML, like Gecko) Chrome/73.0.3683.86 Safari/537.36',
-      js: 1,
-      language: 'en'
-    },
-    id: '10c47a5fc3c41',
-    imp: [{
-      banner: { w: 300, h: 250 },
-      id: '2966b257c81d27',
-      secure: false,
-      tagid: '/19968336/header-bid-tag-0'
-    }, {
-      banner: { w: 728, h: 90 },
-      id: '2966b257c81d28',
-      secure: false,
-      tagid: '/19968336/header-bid-tag-0'
-    }, {
-      id: '15d9012765e36c',
-      native: {request: '{"native":{"assets":[{"id":"1","required":true,"title":{"len":140}},{"id":"2","required":true,"data":{"type":2}},{"id":"3","img":{"w":728,"h":90,"type":3}}]}}'},
-      secure: false,
-      tagid: '/19968336/header-bid-tag-0'
-    }, {
-      id: '15d9012765e36f',
-      video: {w: 500, h: 400, minduration: 15, maxduration: 60},
-      secure: false,
-      tagid: '/19968336/header-bid-tag-0'
-    }],
-    site: {
-      domain: '',
-      id: 'blank',
-      page: 'https://v5demo.datablocks.net/test'
-    }
+	    'id': 'c09c6e47-8bdb-4884-a46d-93165322b368',
+	    'imp': [{
+	        'id': '1',
+	        'tagid': '/19968336/header-bid-tag-0',
+	        'placement_id': 0,
+	        'secure': true,
+	        'banner': {
+	            'w': 300,
+	            'h': 250,
+	            'format': [{
+	                'w': 300,
+	                'h': 250
+	            }, {
+	                'w': 300,
+	                'h': 600
+	            }]
+	        }
+	    }, {
+	        'id': '2',
+	        'tagid': '/19968336/header-bid-tag-1',
+	        'placement_id': 12345,
+	        'secure': true,
+	        'banner': {
+	            'w': 729,
+	            'h': 90,
+	            'format': [{
+	                'w': 729,
+	                'h': 90
+	            }, {
+	                'w': 970,
+	                'h': 250
+	            }]
+	        }
+	    }, {
+	        'id': '3',
+	        'tagid': '/19968336/prebid_multiformat_test',
+	        'placement_id': 0,
+	        'secure': true,
+	        'native': {
+	            'ver': '1.2',
+	            'request': {
+	                'assets': [{
+	                    'required': 1,
+	                    'id': 1,
+	                    'title': {}
+	                }, {
+	                    'required': 1,
+	                    'id': 3,
+	                    'img': {
+	                        'type': 3
+	                    }
+	                }, {
+	                    'required': 1,
+	                    'id': 5,
+	                    'data': {
+	                        'type': 1
+	                    }
+	                }],
+	                'context': 1,
+	                'plcmttype': 1,
+	                'ver': '1.2'
+	            }
+	        }
+	    }],
+	    'site': {
+	        'domain': 'test.datablocks.net',
+	        'page': 'https://test.datablocks.net/index.html',
+	        'schain': {},
+	        'ext': {
+	            'p_domain': 'https://test.datablocks.net',
+	            'rt': true,
+	            'frames': 0,
+	            'stack': ['https://test.datablocks.net/index.html'],
+	            'timeout': 3000
+	        },
+	        'keywords': 'HTML, CSS, JavaScript'
+	    },
+	    'device': {
+	        'ip': 'peer',
+	        'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36',
+	        'js': 1,
+	        'language': 'en',
+	        'buyerid': '1234567',
+	        'ext': {
+	            'pb_eids': [{
+	                'source': 'criteo.com',
+	                'uids': [{
+	                    'id': 'test',
+	                    'atype': 1
+	                }]
+	            }],
+	            'syncs': {
+	                '1000': 'db_4044853',
+	                '1001': true
+	            },
+	            'coppa': 0,
+	            'gdpr': {},
+	            'usp': {},
+	            'client_info': {
+	                'wiw': 2560,
+	                'wih': 1281,
+	                'saw': 2560,
+	                'sah': 1417,
+	                'scd': 24,
+	                'sw': 2560,
+	                'sh': 1440,
+	                'whl': 4,
+	                'wxo': 0,
+	                'wyo': 0,
+	                'wpr': 2,
+	                'is_bot': false,
+	                'is_hid': false,
+	                'vs': 'hidden'
+	            },
+	            'fpd': {}
+	        }
+	    }
   }
 }
 
 describe('DatablocksAdapter', function() {
+  before(() => {
+    // stub out queue metric to avoid it polluting the global xhr mock during other tests
+    sinon.stub(spec, 'queue_metric').callsFake(() => null);
+  });
+
+  after(() => {
+    spec.queue_metric.restore();
+  });
+
+  describe('All needed functions are available', function() {
+    it(`isBidRequestValid is present and type function`, function () {
+      expect(spec.isBidRequestValid).to.exist.and.to.be.a('function')
+    });
+
+    it(`buildRequests is present and type function`, function () {
+      expect(spec.buildRequests).to.exist.and.to.be.a('function')
+    });
+
+    it(`getUserSyncs is present and type function`, function () {
+      expect(spec.getUserSyncs).to.exist.and.to.be.a('function')
+    });
+
+    it(`onBidWon is present and type function`, function () {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function')
+    });
+
+    it(`onSetTargeting is present and type function`, function () {
+      expect(spec.onSetTargeting).to.exist.and.to.be.a('function')
+    });
+
+    it(`interpretResponse is present and type function`, function () {
+      expect(spec.interpretResponse).to.exist.and.to.be.a('function')
+    });
+
+    it(`store_dbid is present and type function`, function () {
+      expect(spec.store_dbid).to.exist.and.to.be.a('function')
+    });
+
+    it(`get_dbid is present and type function`, function () {
+      expect(spec.get_dbid).to.exist.and.to.be.a('function')
+    });
+
+    it(`store_syncs is present and type function`, function () {
+      expect(spec.store_syncs).to.exist.and.to.be.a('function')
+    });
+
+    it(`get_syncs is present and type function`, function () {
+      expect(spec.get_syncs).to.exist.and.to.be.a('function')
+    });
+
+    it(`queue_metric is present and type function`, function () {
+      expect(spec.queue_metric).to.exist.and.to.be.a('function')
+    });
+
+    it(`send_metrics is present and type function`, function () {
+      expect(spec.send_metrics).to.exist.and.to.be.a('function')
+    });
+
+    it(`get_client_info is present and type function`, function () {
+      expect(spec.get_client_info).to.exist.and.to.be.a('function')
+    });
+
+    it(`get_viewability is present and type function`, function () {
+      expect(spec.get_viewability).to.exist.and.to.be.a('function')
+    });
+  });
+
+  describe('get / store dbid', function() {
+    it('Should return true / undefined', function() {
+      expect(spec.store_dbid('12345')).to.be.true;
+      expect(spec.get_dbid()).to.be.a('string');
+    });
+  })
+
+  describe('get / store syncs', function() {
+    it('Should return true / array', function() {
+      expect(spec.store_syncs([{id: 1, uid: 'test'}])).to.be.true;
+      expect(spec.get_syncs()).to.be.a('object');
+    });
+  })
+
+  describe('get_viewability', function() {
+    it('Should return undefined', function() {
+      expect(spec.get_viewability()).to.equal(undefined);
+    });
+  })
+
+  describe('get client info', function() {
+    it('Should return object', function() {
+      let client_info = spec.get_client_info()
+      expect(client_info).to.be.a('object');
+      expect(client_info).to.have.all.keys('wiw', 'wih', 'saw', 'sah', 'scd', 'sw', 'sh', 'whl', 'wxo', 'wyo', 'wpr', 'is_bot', 'is_hid', 'vs');
+    });
+
+    it('bot test should return boolean', function() {
+      let bot_test = new BotClientTests();
+      expect(bot_test.doTests()).to.be.a('boolean');
+    });
+  })
+
   describe('isBidRequestValid', function() {
-    it('Should return true when sourceId and Host are set', function() {
+    it('Should return true when source_id and Host are set', function() {
       expect(spec.isBidRequestValid(bid)).to.be.true;
     });
-    it('Should return false when host/sourceId is not set', function() {
+    it('Should return false when host/source_id is not set', function() {
+      let moddedBid = Object.assign({}, bid);
+      delete moddedBid.params.source_id;
+      expect(spec.isBidRequestValid(moddedBid)).to.be.false;
+    });
+
+    it('Should return true when viewability reporting is opted out', function() {
       let moddedBid = Object.assign({}, bid);
-      delete moddedBid.params.sourceId;
-      delete moddedBid.params.host;
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      moddedBid.params.vis_optout = true;
+      spec.isBidRequestValid(moddedBid);
+      expect(spec.db_obj.vis_optout).to.be.true;
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    it('Should return array of syncs', function() {
+      expect(spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, [res_object], {gdprApplies: true, gdpr: 1, gdpr_consent: 'consent_string'}, {})).to.be.an('array');
+    });
+  });
+
+  describe('onSetTargeting', function() {
+    it('Should return undefined', function() {
+      expect(spec.onSetTargeting()).to.equal(undefined);
+    });
+  });
+
+  describe('onBidWon', function() {
+    it('Should return undefined', function() {
+      let won_bid = {params: [{source_id: 1}], requestId: 1, adUnitCode: 'unit', auctionId: 1, size: '300x250', cpm: 10, adserverTargeting: {hb_pb: 10}, timeToRespond: 10, ttl: 10};
+      expect(spec.onBidWon(won_bid)).to.equal(undefined);
     });
   });
 
   describe('buildRequests', function() {
-    let requests = spec.buildRequests([bid, bid2, nativeBid, videoBid], bidderRequest);
+    let request = spec.buildRequests([bid, bid2, nativeBid], bidderRequest);
+
+    expect(request).to.exist;
+    it('Returns POST method', function() {
+      expect(request.method).to.exist;
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function() {
+      expect(request.url).to.exist;
+      expect(request.url).to.equal('https://v5demo.datablocks.net/openrtb/?sid=7560');
+    });
+
     it('Creates an array of request objects', function() {
-      expect(requests).to.be.an('array').that.is.not.empty;
+      expect(request.data.imp).to.be.an('array').that.is.not.empty;
     });
 
-    requests.forEach(request => {
-      expect(request).to.exist;
-      it('Returns POST method', function() {
-        expect(request.method).to.exist;
-        expect(request.method).to.equal('POST');
-      });
-      it('Returns valid URL', function() {
-        expect(request.url).to.exist;
-        expect(request.url).to.equal('https://v5demo.datablocks.net/search/?sid=7560');
-      });
+    it('Should be a valid openRTB request', function() {
+      let data = request.data;
 
-      it('Should be a valid openRTB request', function() {
-        let data = request.data;
-        expect(data).to.be.an('object');
-        expect(data).to.have.all.keys('device', 'imp', 'site', 'id');
-        expect(data.id).to.be.a('string');
-
-        let imps = data['imp'];
-        imps.forEach((imp, index) => {
-          let curBid = bidderRequest.bids[index];
-          if (imp.banner) {
-            expect(imp).to.have.all.keys('banner', 'id', 'secure', 'tagid');
-            expect(imp.banner).to.be.a('object');
-          } else if (imp.native) {
-            expect(imp).to.have.all.keys('native', 'id', 'secure', 'tagid');
-            expect(imp.native).to.have.all.keys('request');
-            expect(imp.native.request).to.be.a('string');
-            let native = JSON.parse(imp.native.request);
-            expect(native).to.be.a('object');
-          } else if (imp.video) {
-            expect(imp).to.have.all.keys('video', 'id', 'secure', 'tagid');
-            expect(imp.video).to.have.all.keys('w', 'h', 'minduration', 'maxduration')
-          } else {
-            expect(true).to.equal(false);
-          }
-
-          expect(imp.id).to.be.a('string');
-          expect(imp.id).to.equal(curBid.bidId);
-          expect(imp.tagid).to.be.a('string');
-          expect(imp.tagid).to.equal(curBid.adUnitCode);
-          expect(imp.secure).to.equal(false);
-        })
-
-        expect(data.device.ip).to.equal('peer');
-      });
-    })
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('device', 'imp', 'site', 'id');
+      expect(data.id).to.be.a('string');
+      expect(data.imp).to.be.a('array');
+      expect(data.device.ip).to.equal('peer');
+
+      let imps = data['imp'];
+      imps.forEach((imp, index) => {
+        let curBid = bidderRequest.bids[index];
+        if (imp.banner) {
+          expect(imp.banner).to.be.a('object');
+          expect(imp).to.have.all.keys('banner', 'id', 'secure', 'tagid', 'placement_id', 'ortb2', 'floor');
+        } else if (imp.native) {
+          expect(imp).to.have.all.keys('native', 'id', 'secure', 'tagid', 'placement_id', 'ortb2', 'floor');
+          expect(imp.native).to.have.all.keys('request', 'ver');
+          expect(imp.native.request).to.be.a('object');
+        } else {
+          expect(true).to.equal(false);
+        }
+
+        expect(imp.id).to.be.a('string');
+        expect(imp.id).to.equal(curBid.bidId);
+        expect(imp.tagid).to.be.a('string');
+        expect(imp.tagid).to.equal(curBid.adUnitCode);
+        expect(imp.secure).to.equal(false);
+      })
+    });
 
     it('Returns empty data if no valid requests are passed', function() {
-      let request = spec.buildRequests([]);
-      expect(request).to.be.an('array').that.is.empty;
+      let test_request = spec.buildRequests([]);
+      expect(test_request).to.be.an('array').that.is.empty;
     });
   });
+
   describe('interpretResponse', function() {
-    let serverResponses = spec.interpretResponse(resObject, bidRequest);
+    let response = spec.interpretResponse(res_object, bid_request);
+
     it('Returns an array of valid server responses if response object is valid', function() {
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(Object.keys(dataItem)).to.include('cpm', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType', 'requestId');
-        expect(dataItem.requestId).to.be.a('string');
-        expect(dataItem.cpm).to.be.a('number');
-        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');
-
-        if (dataItem.mediaType == 'banner') {
-          expect(dataItem.ad).to.be.a('string');
-          expect(dataItem.width).to.be.a('number');
-          expect(dataItem.height).to.be.a('number');
-        } else if (dataItem.mediaType == 'native') {
-          expect(dataItem.native.title).to.be.a('string');
-          expect(dataItem.native.body).to.be.a('string');
-          expect(dataItem.native.clickUrl).to.be.a('string');
-        } else if (dataItem.mediaType == 'video') {
-          expect(dataItem.vastUrl).to.be.a('string');
-          expect(dataItem.width).to.be.a('number');
-          expect(dataItem.height).to.be.a('number');
+      expect(response).to.be.an('array').that.is.not.empty;
+
+      response.forEach(bid => {
+        expect(parseInt(bid.requestId)).to.be.a('number').greaterThan(0);
+        expect(bid.cpm).to.be.a('number');
+        expect(bid.creativeId).to.be.a('string');
+        expect(bid.currency).to.be.a('string');
+        expect(bid.netRevenue).to.be.a('boolean');
+        expect(bid.ttl).to.be.a('number');
+        expect(bid.mediaType).to.be.a('string');
+
+        if (bid.mediaType == 'banner') {
+          expect(bid.width).to.be.a('number');
+          expect(bid.height).to.be.a('number');
+          expect(bid.ad).to.be.a('string');
+        } else if (bid.mediaType == 'native') {
+          expect(bid.native).to.be.a('object');
         }
-      }
+      })
+
       it('Returns an empty array if invalid response is passed', function() {
         serverResponses = spec.interpretResponse('invalid_response');
         expect(serverResponses).to.be.an('array').that.is.empty;
diff --git a/test/spec/modules/datawrkzBidAdapter_spec.js b/test/spec/modules/datawrkzBidAdapter_spec.js
new file mode 100644
index 00000000000..3ddc2bad1cf
--- /dev/null
+++ b/test/spec/modules/datawrkzBidAdapter_spec.js
@@ -0,0 +1,656 @@
+import { expect } from 'chai';
+import { config } from 'src/config.js';
+import { spec } from 'modules/datawrkzBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'datawrkz';
+const ENDPOINT_URL = 'https://at.datawrkz.com/exchange/openrtb23/';
+const SITE_ID = 'site_id';
+const FINAL_URL = ENDPOINT_URL + SITE_ID + '?hb=1';
+
+describe('datawrkzAdapterTests', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': BIDDER_CODE,
+      'params': {
+        'site_id': SITE_ID,
+        'bidfloor': '1.0'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when params not found', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required site_id param not found', function () {
+      let bid = Object.assign({}, bid);
+      bid.params = {'bidfloor': '1.0'}
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when adunit is adpod video', function () {
+      let bid = Object.assign({}, bid);
+      bid.params = {'bidfloor': '1.0', 'site_id': SITE_ID};
+      bid.mediaTypes = {
+        'video': {
+          'context': 'adpod'
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const consentString = '1YA-';
+    const bidderRequest = {
+      'bidderCode': 'datawrkz',
+      'auctionId': '1d1a030790a475',
+      'bidderRequestId': '22edbae2733bf6',
+      'timeout': 3000,
+      'uspConsent': consentString,
+      'gdprConsent': {'gdprApplies': true},
+    };
+    const bannerBidRequests = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'banner': {'sizes': [[300, 250], [300, 600]]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const bannerBidRequestsSingleArraySlotAndDeals = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00, 'deals': [{id: 'deal_1'}, {id: 'deal_2'}]},
+      'mediaTypes': {'banner': {}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'sizes': [300, 250],
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const nativeBidRequests = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'native': {
+        'title': {'required': true, 'len': 80},
+        'image': {'required': true, 'sizes': [[300, 250]]},
+        'icon': {'required': true, 'sizes': [[50, 50]]},
+        'sponsoredBy': {'required': true},
+        'cta': {'required': true},
+        'body': {'required': true, 'len': 100}
+      }},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const nativeBidRequestsSingleArraySlotAndDeals = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00, 'deals': [{id: 'deal_1'}, {id: 'deal_2'}]},
+      'mediaTypes': {'native': {
+        'title': {'len': 80},
+        'image': {'sizes': [300, 250]},
+        'icon': {'sizes': [50, 50]},
+        'sponsoredBy': {},
+        'cta': {},
+        'body': {'len': 100}
+      }},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const instreamVideoBidRequests = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'video': {'context': 'instream', 'playerSize': [[640, 480]]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const instreamVideoBidRequestsSingleArraySlotAndDeals = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00, 'deals': [{id: 'deal_1'}, {id: 'deal_2'}]},
+      'mediaTypes': {'video': {'context': 'instream', 'playerSize': [640, 480]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const outstreamVideoBidRequests = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'video': {'context': 'outstream', 'playerSize': [[640, 480]], 'mimes': ['video/mp4', 'video/x-flv']}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const outstreamVideoBidRequestsSingleArraySlotAndDeals = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00, 'deals': [{id: 'deal_1'}, {id: 'deal_2'}]},
+      'mediaTypes': {'video': {'context': 'outstream', 'playerSize': [640, 480], 'mimes': ['video/mp4', 'video/x-flv']}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const bidRequestsWithNoMediaType = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+
+    it('empty bid requests', function () {
+      const requests = spec.buildRequests([], bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('mediaTypes missing in bid request', function () {
+      const requests = spec.buildRequests(bidRequestsWithNoMediaType, bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('invalid media type in bid request', function () {
+      bidRequestsWithNoMediaType[0].mediaTypes = {'test': {}};
+      const requests = spec.buildRequests(bidRequestsWithNoMediaType, bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('size missing in bid request for banner', function () {
+      delete bidRequestsWithNoMediaType[0].mediaTypes.test;
+      bidRequestsWithNoMediaType[0].mediaTypes.banner = {};
+      const requests = spec.buildRequests(bidRequestsWithNoMediaType, bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('size array empty in bid request for banner', function () {
+      bidRequestsWithNoMediaType[0].mediaTypes.banner.sizes = [];
+      const requests = spec.buildRequests(bidRequestsWithNoMediaType, bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('banner bidRequest with slot size as 2 dimensional array', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+      const requests = spec.buildRequests(bannerBidRequests, bidderRequest);
+      config.getConfig.restore();
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload.imp).to.exist;
+      expect(payload).to.nested.include({'imp[0].banner.w': 300});
+      expect(payload).to.nested.include({'imp[0].banner.h': 250});
+      expect(payload).to.nested.include({'regs.ext.us_privacy': consentString});
+      expect(payload).to.nested.include({'regs.ext.gdpr': '1'});
+      expect(payload).to.nested.include({'regs.coppa': '1'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('banner');
+    });
+
+    it('banner bidRequest with deals and slot size as 1 dimensional array', function () {
+      const requests = spec.buildRequests(bannerBidRequestsSingleArraySlotAndDeals, bidderRequest);
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload.imp).to.exist;
+      expect(payload).to.nested.include({'imp[0].banner.w': 300});
+      expect(payload).to.nested.include({'imp[0].banner.h': 250});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[0].id': 'deal_1'});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[1].id': 'deal_2'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('banner');
+    });
+
+    it('native bidRequest fields with slot size as 2 dimensional array', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+      const requests = spec.buildRequests(nativeBidRequests, bidderRequest);
+      config.getConfig.restore();
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload.imp[0].native.request).to.exist;
+      expect(payload).to.nested.include({'regs.ext.us_privacy': consentString});
+      expect(payload).to.nested.include({'regs.ext.gdpr': '1'});
+      expect(payload).to.nested.include({'regs.coppa': '1'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('native');
+    });
+
+    it('native bidRequest fields with deals and slot size as 1 dimensional array', function () {
+      const requests = spec.buildRequests(nativeBidRequestsSingleArraySlotAndDeals, bidderRequest);
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload.imp).to.exist;
+      expect(payload.imp[0].native.request).to.exist;
+      expect(payload).to.nested.include({'imp[0].pmp.deals[0].id': 'deal_1'});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[1].id': 'deal_2'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('native');
+    });
+
+    it('instream video bidRequest fields with slot size as 2 dimensional array', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+      const requests = spec.buildRequests(instreamVideoBidRequests, bidderRequest);
+      config.getConfig.restore();
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload).to.nested.include({'regs.ext.us_privacy': consentString});
+      expect(payload).to.nested.include({'regs.ext.gdpr': '1'});
+      expect(payload).to.nested.include({'regs.coppa': '1'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('video');
+    });
+
+    it('instream video bidRequest with deals and slot size as 1 dimensional array', function () {
+      const requests = spec.buildRequests(instreamVideoBidRequestsSingleArraySlotAndDeals, bidderRequest);
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('video');
+    });
+
+    it('outstream video bidRequest fields with slot size as 2 dimensional array', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+      const requests = spec.buildRequests(outstreamVideoBidRequests, bidderRequest);
+      config.getConfig.restore();
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload).to.nested.include({'imp[0].video.w': 640});
+      expect(payload).to.nested.include({'imp[0].video.h': 480});
+      expect(payload).to.nested.include({'regs.ext.us_privacy': consentString});
+      expect(payload).to.nested.include({'regs.ext.gdpr': '1'});
+      expect(payload).to.nested.include({'regs.coppa': '1'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('video');
+    });
+
+    it('outstream video bidRequest fields with deals and slot size as 1 dimensional array', function () {
+      const requests = spec.buildRequests(outstreamVideoBidRequestsSingleArraySlotAndDeals, bidderRequest);
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload).to.nested.include({'imp[0].video.w': 640});
+      expect(payload).to.nested.include({'imp[0].video.h': 480});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[0].id': 'deal_1'});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[1].id': 'deal_2'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('video');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidRequest = {
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'banner': {'sizes': [[300, 250], [300, 600]]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+      'requestedMediaType': 'banner'
+    };
+    const nativeBidRequest = {
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'native': {
+        'title': {'required': true, 'len': 80},
+        'image': {'required': true, 'sizes': [300, 250]},
+        'icon': {'required': true, 'sizes': [50, 50]},
+        'sponsoredBy': {'required': true},
+        'cta': {'required': true},
+        'body': {'required': true}
+      }},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+      'requestedMediaType': 'native',
+      'assets': [
+        {'id': 1, 'required': 1, 'title': {'len': 80}},
+        {'id': 2, 'required': 1, 'img': {'type': 3, 'w': 300, 'h': 250}},
+        {'id': 3, 'required': 1, 'img': {'type': 1, 'w': 50, 'h': 50}},
+        {'id': 4, 'required': 1, 'data': {'type': 1}},
+        {'id': 5, 'required': 1, 'data': {'type': 12}},
+        {'id': 6, 'required': 1, 'data': {'type': 2, 'len': 100}}
+      ]
+    };
+    const instreamVideoBidRequest = {
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'video': {'context': 'instream', 'playerSize': [640, 480]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+      'requestedMediaType': 'video'
+    };
+    const outstreamVideoBidRequest = {
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID,
+        'bidfloor': 1.00,
+        'outstreamType': 'slider_top_left',
+        'outstreamConfig':
+          {'ad_unit_audio': 1, 'show_player_close_button_after': 5, 'hide_player_control': 0}},
+      'mediaTypes': {'video': {'context': 'outstream', 'playerSize': [640, 480]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+      'requestedMediaType': 'video'
+    };
+    const request = {
+      'method': 'POST',
+      'url': FINAL_URL,
+      'data': '',
+      bidRequest
+    };
+
+    it('check empty response', function () {
+      const result = spec.interpretResponse({}, request);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('check if id missing in response', function () {
+      const serverResponse = {'body': {'seatbid': [{}]}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('check if seatbid present in response', function () {
+      const serverResponse = {'body': {'id': 'id'}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('check empty array response seatbid', function () {
+      const serverResponse = {'body': {'id': 'id', 'seatbid': []}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('check bid present in seatbid', function () {
+      const serverResponse = {'body': {'id': 'id', 'seatbid': [{}]}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(0);
+    });
+
+    it('check empty array bid in seatbid', function () {
+      const serverResponse = {'body': {'id': 'id', 'seatbid': [{'bid': []}]}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(0);
+    });
+
+    it('banner response missing bid price', function () {
+      const serverResponse = {'body': {'id': 'id', 'seatbid': [{'bid': [{'id': 1}]}]}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+    });
+
+    it('banner response', function () {
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'price': 1,
+                  'w': 300,
+                  'h': 250,
+                  'adm': 'test adm',
+                  'nurl': 'url'
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].size).to.equal(bidRequest.mediaTypes.banner.sizes);
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].ad).to.equal(decodeURIComponent(serverResponse.body.seatbid[0].bid[0].adm + '<img src="' + serverResponse.body.seatbid[0].bid[0].nurl + '" height="0px" width="0px">'));
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+      expect(result[0].transactionId).to.equal(request.bidRequest.transactionId);
+      expect(result[0].mediaType).to.equal('banner');
+    });
+
+    it('native response missing bid price', function () {
+      request.bidRequest = nativeBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'w': 300,
+                  'h': 250,
+                  'adm': '{"native": {"link": {"url": "test_url"}, "imptrackers": [], "assets": [' +
+                    '{"id": 1, "title": {"text": "Test title"}},' +
+                    '{"id": 2, "img": {"type": 3,"url": "https://test/image", "w": 300, "h": 250}},' +
+                    '{"id": 3, "img": {"type": 1, "url": "https://test/icon", "w": 50, "h": 50}},' +
+                    '{"id": 4, "data": {"type": 1, "value": "Test sponsored by"}},' +
+                    '{"id": 5, "data": {"type": 12, "value": "Test CTA"}},' +
+                    '{"id": 6, "data": {"type": 2, "value": "Test body"}}]}}'
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+    });
+
+    it('native response', function () {
+      request.bidRequest = nativeBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'price': 1,
+                  'w': 300,
+                  'h': 250,
+                  'adm': '{"native": {"link": {"url": "test_url"}, "imptrackers": ["tracker1", "tracker2"], "assets": [' +
+                    '{"id": 1, "title": {"text": "Test title"}},' +
+                    '{"id": 2, "img": {"type": 3,"url": "https://test/image", "w": 300, "h": 250}},' +
+                    '{"id": 3, "img": {"type": 1, "url": "https://test/icon", "w": 50, "h": 50}},' +
+                    '{"id": 4, "data": {"type": 1, "value": "Test sponsored by"}},' +
+                    '{"id": 5, "data": {"type": 12, "value": "Test CTA"}},' +
+                    '{"id": 6, "data": {"type": 2, "value": "Test body"}}]}}'
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].native.clickUrl).to.equal('test_url');
+      expect(result[0].native.impressionTrackers).to.have.lengthOf(2);
+      expect(result[0].native.title).to.equal('Test title');
+      expect(result[0].native.image.url).to.equal('https://test/image');
+      expect(result[0].native.icon.url).to.equal('https://test/icon');
+      expect(result[0].native.sponsored).to.equal('Test sponsored by');
+      expect(result[0].native.cta).to.equal('Test CTA');
+      expect(result[0].native.desc).to.equal('Test body');
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+      expect(result[0].transactionId).to.equal(request.bidRequest.transactionId);
+      expect(result[0].mediaType).to.equal('native');
+    });
+
+    it('video response missing bid price', function () {
+      request.bidRequest = instreamVideoBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'w': 640,
+                  'h': 480,
+                  'adm': '<VAST></VAST>',
+                  'ext': {
+                    'vast_url': 'vast_url'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+    });
+
+    it('instream video response', function () {
+      request.bidRequest = instreamVideoBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'price': 1,
+                  'w': 640,
+                  'h': 480,
+                  'adm': '<VAST></VAST>',
+                  'ext': {
+                    'vast_url': 'test_vast_url?kcid=123&kaid=12&protocol=3'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(640);
+      expect(result[0].height).to.equal(480);
+      expect(result[0].vastUrl).to.equal('test_vast_url?kcid=123&kaid=12&protocol=3');
+      expect(result[0].adserverTargeting.hb_kcid).to.equal('123');
+      expect(result[0].adserverTargeting.hb_kaid).to.equal('12');
+      expect(result[0].adserverTargeting.hb_protocol).to.equal('3');
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+      expect(result[0].transactionId).to.equal(request.bidRequest.transactionId);
+      expect(result[0].mediaType).to.equal('video');
+    });
+
+    it('outstream video response', function () {
+      request.bidRequest = outstreamVideoBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'price': 1,
+                  'w': 640,
+                  'h': 480,
+                  'adm': '<VAST></VAST>',
+                  'ext': {
+                    'vast_url': 'vast_url'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(640);
+      expect(result[0].height).to.equal(480);
+      expect(result[0].outstreamType).to.equal('slider_top_left');
+      expect(result[0].ad).to.equal('<VAST></VAST>');
+      expect(result[0].renderer).to.exist;
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+      expect(result[0].transactionId).to.equal(request.bidRequest.transactionId);
+      expect(result[0].mediaType).to.equal('video');
+    });
+  });
+});
diff --git a/test/spec/modules/dchain_spec.js b/test/spec/modules/dchain_spec.js
new file mode 100644
index 00000000000..45061c539c1
--- /dev/null
+++ b/test/spec/modules/dchain_spec.js
@@ -0,0 +1,329 @@
+import { checkDchainSyntax, addBidResponseHook } from '../../../modules/dchain.js';
+import { config } from '../../../src/config.js';
+import { expect } from 'chai';
+
+describe('dchain module', function () {
+  const STRICT = 'strict';
+  const RELAX = 'relaxed';
+  const OFF = 'off';
+
+  describe('checkDchainSyntax', function () {
+    let bid;
+
+    beforeEach(function () {
+      bid = {
+        meta: {
+          dchain: {
+            'ver': '1.0',
+            'complete': 0,
+            'ext': {},
+            'nodes': [{
+              'asi': 'domain.com',
+              'bsid': '12345',
+            }, {
+              'name': 'bidder',
+              'domain': 'bidder.com',
+              'ext': {}
+            }]
+          }
+        }
+      };
+    });
+
+    it('Returns false if complete param is not 0 or 1', function () {
+      let dchainConfig = bid.meta.dchain;
+      dchainConfig.complete = 0; // integer
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.complete = 1; // integer
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.complete = '1'; // string
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.complete = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.complete = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      delete dchainConfig.complete; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.complete = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.complete = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if ver param is not a String', function () {
+      let dchainConfig = bid.meta.dchain;
+      dchainConfig.ver = 1; // integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.ver = '1'; // string
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.ver = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.ver = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      delete dchainConfig.ver; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.ver = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.ver = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if ext param is not an Object', function () {
+      let dchainConfig = bid.meta.dchain;
+      dchainConfig.ext = 1; // integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.ext = '1'; // string
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.ext = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.ext = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      delete dchainConfig.ext; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.ext = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.ext = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if nodes param is not an Array', function () {
+      let dchainConfig = bid.meta.dchain;
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes = 1; // integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes = '1'; // string
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      delete dchainConfig.nodes; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if unknown field is used in main dchain', function () {
+      let dchainConfig = bid.meta.dchain;
+      dchainConfig.test = '1'; // String
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if nodes[].asi is not a String', function () {
+      let dchainConfig = bid.meta.dchain;
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].asi = 1; // Integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].asi = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].asi = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      delete dchainConfig.nodes[0].asi; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].asi = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].asi = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if nodes[].bsid is not a String', function () {
+      let dchainConfig = bid.meta.dchain;
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].bsid = 1; // Integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].bsid = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].bsid = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      delete dchainConfig.nodes[0].bsid; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].bsid = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].bsid = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if nodes[].rid is not a String', function () {
+      let dchainConfig = bid.meta.dchain;
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].rid = 1; // Integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].rid = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].rid = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      delete dchainConfig.nodes[0].rid; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].rid = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].rid = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if nodes[].name is not a String', function () {
+      let dchainConfig = bid.meta.dchain;
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].name = 1; // Integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].name = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].name = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      delete dchainConfig.nodes[0].name; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].name = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].name = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if nodes[].domain is not a String', function () {
+      let dchainConfig = bid.meta.dchain;
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].domain = 1; // Integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].domain = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].domain = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      delete dchainConfig.nodes[0].domain; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].domain = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].domain = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if nodes[].ext is not an Object', function () {
+      let dchainConfig = bid.meta.dchain;
+      dchainConfig.nodes[0].ext = '1'; // String
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].ext = 1; // Integer
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].ext = 1.1; // float
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].ext = {}; // object
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      delete dchainConfig.nodes[0].ext; // undefined
+      expect(checkDchainSyntax(bid, STRICT)).to.true;
+      dchainConfig.nodes[0].ext = true; // boolean
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+      dchainConfig.nodes[0].ext = []; // array
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Returns false if unknown field is used in nodes[]', function () {
+      let dchainConfig = bid.meta.dchain;
+      dchainConfig.nodes[0].test = '1'; // String
+      expect(checkDchainSyntax(bid, STRICT)).to.false;
+    });
+
+    it('Relaxed mode: returns true even for invalid config', function () {
+      bid.meta.dchain = {
+        ver: 1.1,
+        complete: '0',
+        nodes: [{
+          name: 'asdf',
+          domain: ['domain.com']
+        }]
+      };
+
+      expect(checkDchainSyntax(bid, RELAX)).to.true;
+    });
+  });
+
+  describe('addBidResponseHook', function () {
+    let bid;
+    let adUnitCode = 'adUnit1';
+
+    beforeEach(function () {
+      bid = {
+        bidderCode: 'bidderA',
+        meta: {
+          dchain: {
+            'ver': '1.0',
+            'complete': 0,
+            'ext': {},
+            'nodes': [{
+              'asi': 'domain.com',
+              'bsid': '12345',
+            }, {
+              'name': 'bidder',
+              'domain': 'bidder.com',
+              'ext': {}
+            }]
+          },
+          networkName: 'myNetworkName',
+          networkId: 8475
+        }
+      };
+    });
+
+    afterEach(function () {
+      config.resetConfig();
+    });
+
+    it('good strict config should append a node object to existing bid.meta.dchain object', function () {
+      function testCallback(adUnitCode, bid) {
+        expect(bid.meta.dchain).to.exist;
+        expect(bid.meta.dchain.nodes[1]).to.exist.and.to.deep.equal({
+          'name': 'bidder',
+          'domain': 'bidder.com',
+          'ext': {}
+        });
+        expect(bid.meta.dchain.nodes[2]).to.exist.and.to.deep.equal({ asi: 'bidderA' });
+      }
+
+      config.setConfig({ dchain: { validation: STRICT } });
+      addBidResponseHook(testCallback, adUnitCode, bid);
+    });
+
+    it('bad strict config should delete the bid.meta.dchain object', function () {
+      function testCallback(adUnitCode, bid) {
+        expect(bid.meta.dchain).to.not.exist;
+      }
+
+      config.setConfig({ dchain: { validation: STRICT } });
+      bid.meta.dchain.complete = 3;
+      addBidResponseHook(testCallback, adUnitCode, bid);
+    });
+
+    it('relaxed config should allow bid.meta.dchain to proceed, even with bad values', function () {
+      function testCallback(adUnitCode, bid) {
+        expect(bid.meta.dchain).to.exist;
+        expect(bid.meta.dchain.complete).to.exist.and.to.equal(3);
+        expect(bid.meta.dchain.nodes[2]).to.exist.and.to.deep.equal({ asi: 'bidderA' });
+      }
+
+      config.setConfig({ dchain: { validation: RELAX } });
+      bid.meta.dchain.complete = 3;
+      addBidResponseHook(testCallback, adUnitCode, bid);
+    });
+
+    it('off config should allow the bid.meta.dchain to proceed', function () {
+      // check for missing nodes
+      function testCallback(adUnitCode, bid) {
+        expect(bid.meta.dchain).to.exist;
+        expect(bid.meta.dchain.complete).to.exist.and.to.equal(0);
+        expect(bid.meta.dchain.nodes).to.exist.and.to.deep.equal({ test: 123 });
+      }
+
+      config.setConfig({ dchain: { validation: OFF } });
+      bid.meta.dchain.nodes = { test: 123 };
+      addBidResponseHook(testCallback, adUnitCode, bid);
+    });
+
+    it('no bidder dchain', function () {
+      function testCallback(adUnitCode, bid) {
+        expect(bid.meta.dchain).to.exist;
+        expect(bid.meta.dchain.ver).to.exist.and.to.equal('1.0');
+        expect(bid.meta.dchain.complete).to.exist.and.to.equal(0);
+        expect(bid.meta.dchain.nodes).to.exist.and.to.deep.equal([{ name: 'myNetworkName', bsid: '8475' }, { name: 'bidderA' }]);
+      }
+
+      delete bid.meta.dchain;
+      config.setConfig({ dchain: { validation: RELAX } });
+      addBidResponseHook(testCallback, adUnitCode, bid);
+    });
+  });
+});
diff --git a/test/spec/modules/debugging_mod_spec.js b/test/spec/modules/debugging_mod_spec.js
new file mode 100644
index 00000000000..8c7f0e84bce
--- /dev/null
+++ b/test/spec/modules/debugging_mod_spec.js
@@ -0,0 +1,695 @@
+import {expect} from 'chai';
+import {BidInterceptor} from '../../../modules/debugging/bidInterceptor.js';
+import {
+  bidderBidInterceptor,
+  disableDebugging,
+  getConfig,
+  sessionLoader,
+} from '../../../modules/debugging/debugging.js';
+import '../../../modules/debugging/index.js';
+import {makePbsInterceptor} from '../../../modules/debugging/pbsInterceptor.js';
+import {config} from '../../../src/config.js';
+import {hook} from '../../../src/hook.js';
+import {
+  addBidderRequestsBound,
+  addBidderRequestsHook,
+  addBidResponseBound,
+  addBidResponseHook,
+} from '../../../modules/debugging/legacy.js';
+
+import {addBidderRequests, addBidResponse} from '../../../src/auction.js';
+import {prefixLog} from '../../../src/utils.js';
+import {createBid} from '../../../src/bidfactory.js';
+
+describe('bid interceptor', () => {
+  let interceptor, mockSetTimeout;
+  beforeEach(() => {
+    mockSetTimeout = sinon.stub().callsFake((fn) => fn());
+    interceptor = new BidInterceptor({setTimeout: mockSetTimeout, logger: prefixLog('TEST')});
+  });
+
+  function setRules(...rules) {
+    interceptor.updateConfig({
+      intercept: rules
+    });
+  }
+
+  describe('serializeConfig', () => {
+    Object.entries({
+      regexes: /pat/,
+      functions: () => ({})
+    }).forEach(([test, arg]) => {
+      it(`should filter out ${test}`, () => {
+        const valid = [{key1: 'value'}, {key2: 'value'}];
+        const ser = interceptor.serializeConfig([...valid, {outer: {inner: arg}}]);
+        expect(ser).to.eql(valid);
+      });
+    });
+  });
+
+  describe('match()', () => {
+    Object.entries({
+      value: {key: 'value'},
+      regex: {key: /^value$/},
+      'function': (o) => o.key === 'value'
+    }).forEach(([test, matcher]) => {
+      describe(`by ${test}`, () => {
+        it('should work on matching top-level properties', () => {
+          setRules({when: matcher});
+          const rule = interceptor.match({key: 'value'});
+          expect(rule).to.not.eql(null);
+        });
+
+        it('should work on matching nested properties', () => {
+          setRules({when: {outer: {inner: matcher}}});
+          const rule = interceptor.match({outer: {inner: {key: 'value'}}});
+          expect(rule).to.not.eql(null);
+        });
+
+        it('should not work on non-matching inputs', () => {
+          setRules({when: matcher});
+          expect(interceptor.match({key: 'different-value'})).to.not.be.ok;
+          expect(interceptor.match({differentKey: 'value'})).to.not.be.ok;
+        });
+      });
+    });
+
+    it('should respect rule order', () => {
+      setRules({when: {key: 'value'}}, {when: {}}, {when: {}});
+      const rule = interceptor.match({});
+      expect(rule.no).to.equal(2);
+    });
+
+    it('should pass extra arguments to property function matchers', () => {
+      let matchDef = {
+        key: sinon.stub(),
+        outer: {inner: {key: sinon.stub()}}
+      };
+      const extraArgs = [{}, {}];
+      setRules({when: matchDef});
+      interceptor.match({key: {}, outer: {inner: {key: {}}}}, ...extraArgs);
+      [matchDef.key, matchDef.outer.inner.key].forEach((fn) => {
+        expect(fn.calledOnceWith(sinon.match.any, ...extraArgs.map(sinon.match.same))).to.be.true;
+      });
+    });
+
+    it('should pass extra arguments to single-function matcher', () => {
+      let matchDef = sinon.stub();
+      setRules({when: matchDef});
+      const args = [{}, {}, {}];
+      interceptor.match(...args);
+      expect(matchDef.calledOnceWith(...args.map(sinon.match.same))).to.be.true;
+    });
+  });
+
+  describe('rule', () => {
+    function matchingRule({replace, options}) {
+      setRules({when: {}, then: replace, options: options});
+      return interceptor.match({});
+    }
+
+    describe('.replace()', () => {
+      const REQUIRED_KEYS = [
+        // https://docs.prebid.org/dev-docs/bidder-adaptor.html#bidder-adaptor-Interpreting-the-Response
+        'requestId', 'cpm', 'currency', 'width', 'height', 'ttl',
+        'creativeId', 'netRevenue', 'meta', 'ad'
+      ];
+      it('should include required bid response keys by default', () => {
+        expect(matchingRule({}).replace({})).to.include.keys(REQUIRED_KEYS);
+      });
+
+      Object.entries({
+        value: {key: 'value'},
+        'function': () => ({key: 'value'})
+      }).forEach(([test, replDef]) => {
+        describe(`by ${test}`, () => {
+          it('should merge top-level properties with replace definition', () => {
+            const result = matchingRule({replace: replDef}).replace({});
+            expect(result).to.include.keys(REQUIRED_KEYS);
+            expect(result.key).to.equal('value');
+          });
+
+          it('should merge nested properties with replace definition', () => {
+            const result = matchingRule({replace: {outer: {inner: replDef}}}).replace({});
+            expect(result).to.include.keys(REQUIRED_KEYS);
+            expect(result.outer.inner).to.eql({key: 'value'});
+          });
+
+          it('should respect array vs object definitions', () => {
+            const result = matchingRule({replace: {item: [replDef]}}).replace({});
+            expect(result.item).to.be.an('array');
+            expect(result.item.length).to.equal(1);
+            expect(result.item[0]).to.eql({key: 'value'});
+          });
+        });
+      });
+
+      it('should pass extra arguments to single function replacer', () => {
+        const replDef = sinon.stub();
+        const args = [{}, {}, {}];
+        matchingRule({replace: replDef}).replace(...args);
+        expect(replDef.calledOnceWith(...args.map(sinon.match.same))).to.be.true;
+      });
+
+      it('should pass extra arguments to function property replacers', () => {
+        const replDef = {
+          key: sinon.stub(),
+          outer: {inner: {key: sinon.stub()}}
+        };
+        const args = [{}, {}, {}];
+        matchingRule({replace: replDef}).replace(...args);
+        [replDef.key, replDef.outer.inner.key].forEach((repl) => {
+          expect(repl.calledOnceWith(...args.map(sinon.match.same))).to.be.true;
+        });
+      });
+    });
+
+    describe('.options', () => {
+      it('should include default rule options', () => {
+        const optDef = {someOption: 'value'};
+        const ruleOptions = matchingRule({options: optDef}).options;
+        expect(ruleOptions).to.include(optDef);
+        expect(ruleOptions).to.include(interceptor.DEFAULT_RULE_OPTIONS);
+      });
+
+      it('should override defaults', () => {
+        const optDef = {delay: 123};
+        const ruleOptions = matchingRule({options: optDef}).options;
+        expect(ruleOptions).to.eql(optDef);
+      });
+    });
+  });
+
+  describe('intercept()', () => {
+    let done, addBid;
+
+    function intercept(args = {}) {
+      const bidRequest = {bids: args.bids || []};
+      return interceptor.intercept(Object.assign({bidRequest, done, addBid}, args));
+    }
+
+    beforeEach(() => {
+      done = sinon.spy();
+      addBid = sinon.spy();
+    });
+
+    describe('on no match', () => {
+      it('should return untouched bids and bidRequest', () => {
+        const bids = [{}, {}];
+        const bidRequest = {};
+        const result = intercept({bids, bidRequest});
+        expect(result.bids).to.equal(bids);
+        expect(result.bidRequest).to.equal(bidRequest);
+      });
+
+      it('should call done() immediately', () => {
+        intercept();
+        expect(done.calledOnce).to.be.true;
+        expect(mockSetTimeout.args[0][1]).to.equal(0);
+      });
+
+      it('should not call addBid', () => {
+        intercept();
+        expect(addBid.called).to.not.be.ok;
+      });
+    });
+
+    describe('on match', () => {
+      let match1, match2, repl1, repl2;
+      const DELAY_1 = 123;
+      const DELAY_2 = 321;
+      const REQUEST = {
+        bids: [
+          {id: 1, match: false},
+          {id: 2, match: 1},
+          {id: 3, match: 2}
+        ]
+      };
+
+      beforeEach(() => {
+        match1 = sinon.stub().callsFake((bid) => bid.match === 1);
+        match2 = sinon.stub().callsFake((bid) => bid.match === 2);
+        repl1 = sinon.stub().returns({replace: 1});
+        repl2 = sinon.stub().returns({replace: 2});
+        setRules(
+          {when: match1, then: repl1, options: {delay: DELAY_1}},
+          {when: match2, then: repl2, options: {delay: DELAY_2}},
+        );
+      });
+
+      it('should return only non-matching bids', () => {
+        const {bids, bidRequest} = intercept({bidRequest: REQUEST});
+        expect(bids).to.eql([REQUEST.bids[0]]);
+        expect(bidRequest.bids).to.eql([REQUEST.bids[0]]);
+      });
+
+      it('should call addBid for each matching bid', () => {
+        intercept({bidRequest: REQUEST});
+        expect(addBid.callCount).to.equal(2);
+        expect(addBid.calledWith(sinon.match({replace: 1, isDebug: true}), REQUEST.bids[1])).to.be.true;
+        expect(addBid.calledWith(sinon.match({replace: 2, isDebug: true}), REQUEST.bids[2])).to.be.true;
+        [DELAY_1, DELAY_2].forEach((delay) => {
+          expect(mockSetTimeout.calledWith(sinon.match.any, delay)).to.be.true;
+        });
+      });
+
+      it('should call done()', () => {
+        intercept({bidRequest: REQUEST});
+        expect(done.calledOnce).to.be.true;
+      });
+
+      it('should pass bid and bidRequest to match and replace functions', () => {
+        intercept({bidRequest: REQUEST});
+        Object.entries({
+          1: [match1, repl1],
+          2: [match2, repl2]
+        }).forEach(([index, fns]) => {
+          fns.forEach((fn) => {
+            expect(fn.calledWith(REQUEST.bids[index], REQUEST)).to.be.true;
+          });
+        });
+      });
+    });
+  });
+});
+
+describe('Debugging config', () => {
+  it('should behave gracefully when sessionStorage throws', () => {
+    const logError = sinon.stub();
+    const getStorage = () => { throw new Error() };
+    getConfig({enabled: false}, {getStorage, logger: {logError}, hook});
+    expect(logError.called).to.be.true;
+  });
+});
+
+describe('bidderBidInterceptor', () => {
+  let next, interceptBids, onCompletion, interceptResult, done, addBid;
+
+  function interceptorArgs({spec = {}, bids = [], bidRequest = {}, ajax = {}, wrapCallback = {}, cbs = {}} = {}) {
+    return [next, interceptBids, spec, bids, bidRequest, ajax, wrapCallback, Object.assign({onCompletion}, cbs)];
+  }
+
+  beforeEach(() => {
+    next = sinon.spy();
+    interceptBids = sinon.stub().callsFake((opts) => {
+      done = opts.done;
+      addBid = opts.addBid;
+      return interceptResult;
+    });
+    onCompletion = sinon.spy();
+    interceptResult = {bids: [], bidRequest: {}};
+  });
+
+  it('should pass to interceptBid an addBid that triggers onBid', () => {
+    const onBid = sinon.spy();
+    bidderBidInterceptor(...interceptorArgs({cbs: {onBid}}));
+    const bid = {};
+    addBid(bid);
+    expect(onBid.calledWith(sinon.match.same(bid))).to.be.true;
+  });
+
+  describe('with no remaining bids', () => {
+    it('should pass a done callback that triggers onCompletion', () => {
+      bidderBidInterceptor(...interceptorArgs());
+      expect(onCompletion.calledOnce).to.be.false;
+      interceptBids.args[0][0].done();
+      expect(onCompletion.calledOnce).to.be.true;
+    });
+
+    it('should not call next()', () => {
+      bidderBidInterceptor(...interceptorArgs());
+      expect(next.called).to.be.false;
+    });
+  });
+
+  describe('with remaining bids', () => {
+    const REMAINING_BIDS = [{id: 1}, {id: 2}];
+    beforeEach(() => {
+      interceptResult = {bids: REMAINING_BIDS, bidRequest: {bids: REMAINING_BIDS}};
+    });
+
+    it('should call next', () => {
+      const callbacks = {
+        onResponse: {},
+        onRequest: {},
+        onBid: {}
+      };
+      const args = interceptorArgs({cbs: callbacks});
+      const expectedNextArgs = [
+        args[2],
+        interceptResult.bids,
+        interceptResult.bidRequest,
+        ...args.slice(5, args.length - 1),
+      ].map(sinon.match.same)
+        .concat([sinon.match({
+          onResponse: sinon.match.same(callbacks.onResponse),
+          onRequest: sinon.match.same(callbacks.onRequest),
+          onBid: sinon.match.same(callbacks.onBid)
+        })]);
+      bidderBidInterceptor(...args);
+      expect(next.calledOnceWith(...expectedNextArgs)).to.be.true;
+    });
+
+    it('should trigger onCompletion once both interceptBids.done and next.cbs.onCompletion are called ', () => {
+      bidderBidInterceptor(...interceptorArgs());
+      expect(onCompletion.calledOnce).to.be.false;
+      next.args[0][next.args[0].length - 1].onCompletion();
+      expect(onCompletion.calledOnce).to.be.false;
+      done();
+      expect(onCompletion.calledOnce).to.be.true;
+    });
+  });
+});
+
+describe('pbsBidInterceptor', () => {
+  const EMPTY_INT_RES = {bids: [], bidRequest: {bids: []}};
+  let next, interceptBids, s2sBidRequest, bidRequests, ajax, onResponse, onError, onBid, interceptResults,
+    addBids, dones, reqIdx;
+
+  beforeEach(() => {
+    reqIdx = 0;
+    [addBids, dones] = [[], []];
+    next = sinon.spy();
+    ajax = sinon.spy();
+    onResponse = sinon.spy();
+    onError = sinon.spy();
+    onBid = sinon.spy();
+    interceptBids = sinon.stub().callsFake((opts) => {
+      addBids.push(opts.addBid);
+      dones.push(opts.done);
+      return interceptResults[reqIdx++];
+    });
+    s2sBidRequest = {};
+    bidRequests = [{bids: []}, {bids: []}];
+    interceptResults = [EMPTY_INT_RES, EMPTY_INT_RES];
+  });
+
+  const pbsBidInterceptor = makePbsInterceptor({createBid});
+  function callInterceptor() {
+    return pbsBidInterceptor(next, interceptBids, s2sBidRequest, bidRequests, ajax, {onResponse, onError, onBid});
+  }
+
+  it('passes addBids that trigger onBid', () => {
+    callInterceptor();
+    bidRequests.forEach((_, i) => {
+      const bid = {adUnitCode: i, prop: i};
+      const bidRequest = {req: i};
+      addBids[i](bid, bidRequest);
+      expect(onBid.calledWith({adUnit: i, bid: sinon.match(bid)}));
+    });
+  });
+
+  describe('on no match', () => {
+    it('should not call next', () => {
+      callInterceptor();
+      expect(next.called).to.be.false;
+    });
+
+    it('should pass done callbacks that trigger a dummy onResponse once they all run', () => {
+      callInterceptor();
+      expect(onResponse.called).to.be.false;
+      bidRequests.forEach((_, i) => {
+        dones[i]();
+        expect(onResponse.called).to.equal(i === bidRequests.length - 1);
+      });
+      expect(onResponse.calledWith(true, [])).to.be.true;
+    });
+  });
+
+  describe('on match', () => {
+    let matchingBids;
+    beforeEach(() => {
+      matchingBids = [
+        [{bidId: 1, matching: true}, {bidId: 2, matching: true}],
+        [],
+        [{bidId: 3, matching: true}]
+      ];
+      interceptResults = matchingBids.map((bids) => ({bids, bidRequest: {bids}}));
+      s2sBidRequest = {
+        ad_units: [
+          {bids: [{bid_id: 1, matching: true}, {bid_id: 3, matching: true}, {bid_id: 100}, {bid_id: 101}]},
+          {bids: [{bid_id: 2, matching: true}, {bid_id: 110}, {bid_id: 111}]},
+          {bids: [{bid_id: 120}]}
+        ]
+      };
+      bidRequests = matchingBids.map((mBids, i) => [
+        {bidId: 100 + (i * 10)},
+        {bidId: 101 + (i * 10)},
+        ...mBids
+      ]);
+    });
+
+    it('should call next', () => {
+      callInterceptor();
+      expect(next.calledOnceWith(
+        sinon.match.any,
+        sinon.match.any,
+        ajax,
+        sinon.match({
+          onError,
+          onBid
+        })
+      )).to.be.true;
+    });
+
+    it('should filter out intercepted bids from s2sBidRequest', () => {
+      callInterceptor();
+      const interceptedS2SReq = next.args[0][0];
+      const allMatching = interceptedS2SReq.ad_units.every((u) => u.bids.length > 0 && u.bids.every((b) => b.matching));
+      expect(allMatching).to.be.true;
+    });
+
+    it('should pass bidRequests as returned by interceptBids', () => {
+      callInterceptor();
+      const passedBidReqs = next.args[0][1];
+      interceptResults
+        .filter((r) => r.bids.length > 0)
+        .forEach(({bidRequest}, i) => {
+          expect(passedBidReqs[i]).to.equal(bidRequest);
+        });
+    });
+
+    it('should pass an onResponse that triggers original onResponse only once all intercept dones are called', () => {
+      callInterceptor();
+      const interceptedOnResponse = next.args[0][next.args[0].length - 1].onResponse;
+      expect(onResponse.called).to.be.false;
+      const responseArgs = ['dummy', 'args'];
+      interceptedOnResponse(...responseArgs);
+      expect(onResponse.called).to.be.false;
+      dones.forEach((f, i) => {
+        f();
+        expect(onResponse.called).to.equal(i === dones.length - 1);
+      });
+      expect(onResponse.calledOnceWith(...responseArgs)).to.be.true;
+    });
+  });
+});
+
+describe('bid overrides', function () {
+  let sandbox;
+  const logger = prefixLog('TEST');
+
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function () {
+    window.sessionStorage.clear();
+    config.resetConfig();
+    sandbox.restore();
+  });
+
+  describe('initialization', function () {
+    beforeEach(function () {
+      sandbox.stub(config, 'setConfig');
+    });
+
+    afterEach(function () {
+      disableDebugging({hook, logger});
+    });
+
+    it('should happen when enabled with setConfig', function () {
+      getConfig({
+        enabled: true
+      }, {config, hook, logger});
+
+      expect(addBidResponse.getHooks().some(hook => hook.hook === addBidResponseBound)).to.equal(true);
+      expect(addBidderRequests.getHooks().some(hook => hook.hook === addBidderRequestsBound)).to.equal(true);
+    });
+    it('should happen when configuration found in sessionStorage', function () {
+      sessionLoader({
+        storage: {getItem: () => ('{"enabled": true}')},
+        config,
+        hook,
+        logger
+      });
+      expect(addBidResponse.getHooks().some(hook => hook.hook === addBidResponseBound)).to.equal(true);
+      expect(addBidderRequests.getHooks().some(hook => hook.hook === addBidderRequestsBound)).to.equal(true);
+    });
+
+    it('should not throw if sessionStorage is inaccessible', function () {
+      expect(() => {
+        sessionLoader({
+          getItem() {
+            throw new Error('test');
+          }
+        });
+      }).not.to.throw();
+    });
+  });
+
+  describe('bidResponse hook', function () {
+    let mockBids;
+    let bids;
+
+    beforeEach(function () {
+      let baseBid = {
+        'bidderCode': 'rubicon',
+        'width': 970,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'mediaType': 'banner',
+        'source': 'client',
+        'currency': 'USD',
+        'cpm': 0.5,
+        'ttl': 300,
+        'netRevenue': false,
+        'adUnitCode': '/19968336/header-bid-tag-0'
+      };
+      mockBids = [];
+      mockBids.push(baseBid);
+      mockBids.push(Object.assign({}, baseBid, {
+        bidderCode: 'appnexus'
+      }));
+
+      bids = [];
+    });
+
+    function run(overrides) {
+      mockBids.forEach(bid => {
+        let next = (adUnitCode, bid) => {
+          bids.push(bid);
+        };
+        addBidResponseHook.bind({overrides, logger})(next, bid.adUnitCode, bid);
+      });
+    }
+
+    it('should allow us to exclude bidders', function () {
+      run({
+        enabled: true,
+        bidders: ['appnexus']
+      });
+
+      expect(bids.length).to.equal(1);
+      expect(bids[0].bidderCode).to.equal('appnexus');
+    });
+
+    it('should allow us to override all bids', function () {
+      run({
+        enabled: true,
+        bids: [{
+          cpm: 2
+        }]
+      });
+
+      expect(bids.length).to.equal(2);
+      sinon.assert.match(bids[0], {
+        cpm: 2,
+        isDebug: true,
+      });
+      sinon.assert.match(bids[1], {
+        cpm: 2,
+        isDebug: true,
+      });
+    });
+
+    it('should allow us to override bids by bidder', function () {
+      run({
+        enabled: true,
+        bids: [{
+          bidder: 'rubicon',
+          cpm: 2
+        }]
+      });
+
+      expect(bids.length).to.equal(2);
+      sinon.assert.match(bids[0], {
+        cpm: 2,
+        isDebug: true
+      });
+      sinon.assert.match(bids[1], {
+        cpm: 0.5,
+        isDebug: sinon.match.falsy
+      });
+    });
+
+    it('should allow us to override bids by adUnitCode', function () {
+      mockBids[1].adUnitCode = 'test';
+
+      run({
+        enabled: true,
+        bids: [{
+          adUnitCode: 'test',
+          cpm: 2
+        }]
+      });
+
+      expect(bids.length).to.equal(2);
+      sinon.assert.match(bids[0], {
+        cpm: 0.5,
+        isDebug: sinon.match.falsy,
+      });
+      sinon.assert.match(bids[1], {
+        cpm: 2,
+        isDebug: true,
+      });
+    });
+  });
+
+  describe('bidRequests hook', function () {
+    let mockBidRequests;
+    let bidderRequests;
+
+    beforeEach(function () {
+      let baseBidderRequest = {
+        'bidderCode': 'rubicon',
+        'bids': [{
+          'width': 970,
+          'height': 250,
+          'statusMessage': 'Bid available',
+          'mediaType': 'banner',
+          'source': 'client',
+          'currency': 'USD',
+          'cpm': 0.5,
+          'ttl': 300,
+          'netRevenue': false,
+          'adUnitCode': '/19968336/header-bid-tag-0'
+        }]
+      };
+      mockBidRequests = [];
+      mockBidRequests.push(baseBidderRequest);
+      mockBidRequests.push(Object.assign({}, baseBidderRequest, {
+        bidderCode: 'appnexus'
+      }));
+
+      bidderRequests = [];
+    });
+
+    function run(overrides) {
+      let next = (b) => {
+        bidderRequests = b;
+      };
+      addBidderRequestsHook.bind({overrides, logger})(next, mockBidRequests);
+    }
+
+    it('should allow us to exclude bidders', function () {
+      run({
+        enabled: true,
+        bidders: ['appnexus']
+      });
+
+      expect(bidderRequests.length).to.equal(1);
+      expect(bidderRequests[0].bidderCode).to.equal('appnexus');
+    });
+  });
+});
diff --git a/test/spec/modules/deepintentBidAdapter_spec.js b/test/spec/modules/deepintentBidAdapter_spec.js
index 6d9b883e2bb..d2a351b4089 100644
--- a/test/spec/modules/deepintentBidAdapter_spec.js
+++ b/test/spec/modules/deepintentBidAdapter_spec.js
@@ -3,8 +3,8 @@ import {spec} from 'modules/deepintentBidAdapter.js';
 import * as utils from '../../../src/utils.js';
 
 describe('Deepintent adapter', function () {
-  let request;
-  let bannerResponse;
+  let request, videoBidRequests;
+  let bannerResponse, videoBidResponse, invalidResponse;
 
   beforeEach(function () {
     request = [
@@ -32,6 +32,38 @@ describe('Deepintent adapter', function () {
         }
       }
     ];
+    videoBidRequests =
+    [
+      {
+        code: 'video1',
+        mediaTypes: {
+          video: {
+            playerSize: [640, 480],
+            context: 'instream'
+          }
+        },
+        bidder: 'deepintent',
+        bidId: '22bddb28db77d',
+        params: {
+          tagId: '100013',
+          video: {
+            mimes: ['video/mp4', 'video/x-flv'],
+            skippable: true,
+            testwrongparam: 3,
+            testwrongparam1: 'wrong',
+            minduration: 5,
+            maxduration: 30,
+            startdelay: 5,
+            playbackmethod: [1, 3],
+            api: [1, 2],
+            protocols: [2, 3],
+            battr: [13, 14],
+            minbitrate: 10,
+            maxbitrate: 10
+          }
+        }
+      }
+    ];
     bannerResponse = {
       'body': {
         'id': '303e1fae-9677-41e2-9a92-15a23445363f',
@@ -53,7 +85,47 @@ describe('Deepintent adapter', function () {
         }],
         'bidid': '0b08b09f-aaa1-4c14-b1c8-7debb1a7c1cd'
       }
-    }
+    };
+    invalidResponse = {
+      'body': {
+        'id': '303e1fae-9677-41e2-9a92-15a23445363f',
+        'seatbid': [{
+          'bid': [{
+            'id': '11447bb1-a266-470d-b0d7-8810f5b1b75f',
+            'impid': 'a7e92b9b-d9db-4de8-9c3f-f90737335445',
+            'price': 0.6,
+            'adid': '10001',
+            'adm': 'invalid response',
+            'adomain': ['deepintent.com'],
+            'cid': '103389',
+            'crid': '13665',
+            'w': 300,
+            'h': 250,
+            'dealId': 'dee_12312stdszzsx'
+          }],
+          'seat': '10000'
+        }],
+        'bidid': '0b08b09f-aaa1-4c14-b1c8-7debb1a7c1cd'
+      }
+    };
+    videoBidResponse = {
+      'body': {
+        'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
+        'seatbid': [{
+          'bid': [{
+            'id': '74858439-49D7-4169-BA5D-44A046315B2F',
+            'impid': '22bddb28db77d',
+            'price': 1.3,
+            'adm': '<VAST version="3.0"><Ad id="601364"><InLine><AdSystem>Acudeo Compatible</AdSystem><AdTitle>VAST 2.0 Instream Test 1</AdTitle><Description>VAST 2.0 Instream Test 1</Description><Impression><![CDATA[http://172.16.4.213/AdServer/AdDisplayTrackerServlet?operId=1&pubId=5890&siteId=47163&adId=1405268&adType=13&adServerId=243&kefact=70.000000&kaxefact=70.000000&kadNetFrequecy=0&kadwidth=0&kadheight=0&kadsizeid=97&kltstamp=1529929473&indirectAdId=0&adServerOptimizerId=2&ranreq=0.1&kpbmtpfact=100.000000&dcId=1&tldId=0&passback=0&svr=MADS1107&ekefact=Ad8wW91TCwCmdG0jlfjXn7Tyzh20hnTVx-m5DoNSep-RXGDr&ekaxefact=Ad8wWwRUCwAGir4Zzl1eF0bKiC-qrCV0D0yp_eE7YizB_BQk&ekpbmtpfact=Ad8wWxRUCwD7qgzwwPE2LnS5-Ou19uO5amJl1YT6-XVFvQ41&imprId=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&oid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&crID=creative-1_1_2&ucrid=160175026529250297&campaignId=17050&creativeId=0&pctr=0.000000&wDSPByrId=511&wDspId=6&wbId=0&wrId=0&wAdvID=3170&isRTB=1&rtbId=EBCA079F-8D7C-45B8-B733-92951F670AA1&pmZoneId=zone1&pageURL=www.yahoo.com&lpu=ae.com]]></Impression><Impression>https://dsptracker.com/{PSPM}</Impression><Error><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&er=[ERRORCODE]]]></Error><Error><![CDATA[https://Errortrack.com?p=1234&er=[ERRORCODE]]]></Error><Creatives><Creative AdID="601364"><Linear skipoffset="20%"><TrackingEvents><Tracking event="close"><![CDATA[https://mytracking.com/linear/close]]></Tracking><Tracking event="skip"><![CDATA[https://mytracking.com/linear/skip]]></Tracking><Tracking event="creativeView"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=1]]></Tracking><Tracking event="start"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=2]]></Tracking><Tracking event="midpoint"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=3]]></Tracking><Tracking event="firstQuartile"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=4]]></Tracking><Tracking event="thirdQuartile"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=5]]></Tracking><Tracking event="complete"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=6]]></Tracking></TrackingEvents><Duration>00:00:04</Duration><VideoClicks><ClickTracking><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=99]]></ClickTracking><ClickThrough>https://www.deepintent.com</ClickThrough></VideoClicks><MediaFiles><MediaFile delivery="progressive" type="video/mp4" bitrate="500" width="400" height="300" scalable="true" maintainAspectRatio="true"><![CDATA[https://staging.deepintent.com:8443/video/Shashank/mediaFileHost/media/mp4-sample-2.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives></InLine></Ad></VAST>',
+            'h': 250,
+            'w': 300,
+            'ext': {
+              'deal_channel': 6
+            }
+          }]
+        }]
+      }
+    };
   });
 
   describe('validations', function () {
@@ -88,6 +160,45 @@ describe('Deepintent adapter', function () {
         isValid = spec.isBidRequestValid(bid);
       expect(isValid).to.equals(false);
     });
+    it('should check for context if video is present', function() {
+      let bid = {
+          bidder: 'deepintent',
+          params: {
+            tagId: '12345',
+            video: {
+              mimes: ['video/mp4', 'video/x-flv'],
+              skippable: true,
+            }
+          },
+          mediaTypes: {
+            video: {
+              playerSize: [640, 480],
+              context: 'instream'
+            }
+          },
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equal(true);
+    });
+    it('should error out if context is not present and is Video', function() {
+      let bid = {
+          bidder: 'deepintent',
+          params: {
+            tagId: '12345',
+            video: {
+              mimes: ['video/mp4', 'video/x-flv'],
+              skippable: true,
+            }
+          },
+          mediaTypes: {
+            video: {
+              playerSize: [640, 480]
+            }
+          },
+        },
+        isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.equal(false);
+    })
   });
   describe('request check', function () {
     it('unmutaable bid request check', function () {
@@ -179,6 +290,28 @@ describe('Deepintent adapter', function () {
       expect(data2.regs).to.equal(undefined);
       expect(data2.user.ext).to.equal(undefined);
     });
+    it('bid request check: Video params check ', function() {
+      let bRequest = spec.buildRequests(videoBidRequests);
+      let data = JSON.parse(bRequest.data);
+      expect(data.imp[0].video).to.be.a('object');
+      expect(data.imp[0].video.minduration).to.be.a('number');
+      expect(data.imp[0].video.maxduration).to.be.a('number');
+      expect(data.imp[0].video.startdelay).to.be.a('number');
+      expect(data.imp[0].video.playbackmethod).to.be.an('array');
+      expect(data.imp[0].video.api).to.be.an('array');
+      expect(data.imp[0].video.protocols).to.be.an('array');
+      expect(data.imp[0].video.battr).to.be.an('array');
+      expect(data.imp[0].video.minbitrate).to.be.a('number');
+      expect(data.imp[0].video.maxbitrate).to.be.a('number');
+      expect(data.imp[0].video.w).to.be.a('number');
+    });
+    it('bid request param check : invalid video params', function() {
+      let bRequest = spec.buildRequests(videoBidRequests);
+      let data = JSON.parse(bRequest.data);
+      expect(data.imp[0].video).to.be.a('object');
+      expect(data.imp[0].video.testwrongparam).to.equal(undefined);
+      expect(data.imp[0].video.testwrongparam1).to.equal(undefined);
+    });
   });
   describe('user sync check', function () {
     it('user sync url check', function () {
@@ -202,9 +335,27 @@ describe('Deepintent adapter', function () {
       expect(bResponse[0].height).to.equal(bannerResponse.body.seatbid[0].bid[0].h);
       expect(bResponse[0].currency).to.equal('USD');
       expect(bResponse[0].netRevenue).to.equal(false);
+      expect(bResponse[0].mediaType).to.equal('banner');
+      expect(bResponse[0].meta.advertiserDomains).to.deep.equal(['deepintent.com']);
       expect(bResponse[0].ttl).to.equal(300);
       expect(bResponse[0].creativeId).to.equal(bannerResponse.body.seatbid[0].bid[0].crid);
       expect(bResponse[0].dealId).to.equal(bannerResponse.body.seatbid[0].bid[0].dealId);
     });
+    it('bid response check: valid video bid response', function() {
+      let request = spec.buildRequests(videoBidRequests);
+      let response = spec.interpretResponse(videoBidResponse, request);
+      expect(response[0].mediaType).to.equal('video');
+      expect(response[0].vastXml).to.not.equal(undefined);
+    });
+    it('invalid bid response check ', function() {
+      let bRequest = spec.buildRequests(request);
+      let response = spec.interpretResponse(invalidResponse, bRequest);
+      expect(response[0].mediaType).to.equal(undefined);
+    });
+    it('invalid bid response check ', function() {
+      let bRequest = spec.buildRequests(videoBidRequests);
+      let response = spec.interpretResponse(invalidResponse, bRequest);
+      expect(response[0].mediaType).to.equal(undefined);
+    });
   })
 });
diff --git a/test/spec/modules/deepintentDpesIdsystem_spec.js b/test/spec/modules/deepintentDpesIdsystem_spec.js
new file mode 100644
index 00000000000..4c26b118a98
--- /dev/null
+++ b/test/spec/modules/deepintentDpesIdsystem_spec.js
@@ -0,0 +1,76 @@
+import { expect } from 'chai';
+import {find} from 'src/polyfill.js';
+import { storage, deepintentDpesSubmodule } from 'modules/deepintentDpesIdSystem.js';
+import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
+import { config } from 'src/config.js';
+
+const DI_COOKIE_NAME = '_dpes_id';
+const DI_COOKIE_STORED = '{"id":"2cf40748c4f7f60d343336e08f80dc99"}';
+const DI_COOKIE_OBJECT = {id: '2cf40748c4f7f60d343336e08f80dc99'};
+
+const cookieConfig = {
+  name: 'deepintentId',
+  storage: {
+    type: 'cookie',
+    name: '_dpes_id',
+    expires: 28
+  }
+};
+
+const html5Config = {
+  name: 'deepintentId',
+  storage: {
+    type: 'html5',
+    name: '_dpes_id',
+    expires: 28
+  }
+}
+
+describe('Deepintent DPES System', () => {
+  let getDataFromLocalStorageStub, localStorageIsEnabledStub;
+  let getCookieStub, cookiesAreEnabledStub;
+
+  beforeEach(() => {
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+  });
+
+  afterEach(() => {
+    getDataFromLocalStorageStub.restore();
+    localStorageIsEnabledStub.restore();
+    getCookieStub.restore();
+    cookiesAreEnabledStub.restore();
+  });
+
+  describe('Deepintent Dpes Sytsem: test "getId" method', () => {
+    it('Wrong config should fail the tests', () => {
+      // no config
+      expect(deepintentDpesSubmodule.getId()).to.be.eq(undefined);
+      expect(deepintentDpesSubmodule.getId({ })).to.be.eq(undefined);
+
+      expect(deepintentDpesSubmodule.getId({params: {}, storage: {}})).to.be.eq(undefined);
+      expect(deepintentDpesSubmodule.getId({params: {}, storage: {type: 'cookie'}})).to.be.eq(undefined);
+      expect(deepintentDpesSubmodule.getId({params: {}, storage: {name: '_dpes_id'}})).to.be.eq(undefined);
+    });
+
+    it('Get value stored in cookie for getId', () => {
+      getCookieStub.withArgs(DI_COOKIE_NAME).returns(DI_COOKIE_STORED);
+      let diId = deepintentDpesSubmodule.getId(cookieConfig, undefined, DI_COOKIE_OBJECT);
+      expect(diId).to.deep.equal(DI_COOKIE_OBJECT);
+    });
+
+    it('provides the stored deepintentId if cookie is absent but present in local storage', () => {
+      getDataFromLocalStorageStub.withArgs(DI_COOKIE_NAME).returns(DI_COOKIE_STORED);
+      let idx = deepintentDpesSubmodule.getId(html5Config, undefined, DI_COOKIE_OBJECT);
+      expect(idx).to.deep.equal(DI_COOKIE_OBJECT);
+    });
+  });
+
+  describe('Deepintent Dpes System : test "decode" method', () => {
+    it('Get the correct decoded value for dpes id', () => {
+      expect(deepintentDpesSubmodule.decode(DI_COOKIE_OBJECT, cookieConfig)).to.deep.equal({'deepintentId': {'id': '2cf40748c4f7f60d343336e08f80dc99'}});
+    });
+  });
+});
diff --git a/test/spec/modules/deltaprojectsBidAdapter_spec.js b/test/spec/modules/deltaprojectsBidAdapter_spec.js
new file mode 100644
index 00000000000..b966d1580ca
--- /dev/null
+++ b/test/spec/modules/deltaprojectsBidAdapter_spec.js
@@ -0,0 +1,400 @@
+import { expect } from 'chai';
+import {
+  BIDDER_CODE,
+  BIDDER_ENDPOINT_URL,
+  spec, USERSYNC_URL,
+  getBidFloor
+} from 'modules/deltaprojectsBidAdapter.js';
+
+const BID_REQ_REFER = 'http://example.com/page?param=val';
+const BID_REQ_DOMAIN = 'example.com'
+
+describe('deltaprojectsBidAdapter', function() {
+  describe('isBidRequestValid', function () {
+    function makeBid() {
+      return {
+        bidder: BIDDER_CODE,
+        params: {
+          publisherId: '12345'
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [
+          [300, 250],
+        ],
+        bidId: '30b31c1838de1e',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+      };
+    }
+
+    it('should return true when bidder set correctly', function () {
+      expect(spec.isBidRequestValid(makeBid())).to.equal(true);
+    });
+
+    it('should return false when bid request is null', function () {
+      expect(spec.isBidRequestValid(undefined)).to.equal(false);
+    });
+
+    it('should return false when bidder not set correctly', function () {
+      let bid = makeBid();
+      delete bid.bidder;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisher id is not set', function () {
+      let bid = makeBid();
+      delete bid.params.publisherId;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const BIDREQ = {
+      bidder: BIDDER_CODE,
+      params: {
+        tagId: '403370',
+        siteId: 'example.com',
+      },
+      sizes: [
+        [300, 250],
+      ],
+      bidId: '30b31c1838de1e',
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '1d1a030790a475',
+    }
+    const bidRequests = [BIDREQ];
+    const bannerRequest = spec.buildRequests(bidRequests, {refererInfo: { page: BID_REQ_REFER, domain: BID_REQ_DOMAIN }})[0];
+    const bannerRequestBody = bannerRequest.data;
+
+    it('send bid request with test tag if it is set in the param', function () {
+      const TEST_TAG = 1;
+      const bidRequest = Object.assign({}, BIDREQ, {
+        params: { ...BIDREQ.params, test: TEST_TAG },
+      });
+      const bidderRequest = { refererInfo: { referer: BID_REQ_REFER } };
+      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      expect(request.data.test).to.equal(TEST_TAG);
+    });
+
+    it('send bid request with correct timeout', function () {
+      const TMAX = 10;
+      const bidderRequest = { refererInfo: { referer: BID_REQ_REFER }, timeout: TMAX };
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.tmax).to.equal(TMAX);
+    });
+
+    it('send bid request to the correct endpoint URL', function () {
+      expect(bannerRequest.url).to.equal(BIDDER_ENDPOINT_URL);
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(bannerRequest.method).to.equal('POST');
+    });
+
+    it('sends screen dimensions', function () {
+      expect(bannerRequestBody.device.w).to.equal(screen.width);
+      expect(bannerRequestBody.device.h).to.equal(screen.height);
+    });
+
+    it('includes the ad size in the bid request', function () {
+      expect(bannerRequestBody.imp[0].banner.format[0].w).to.equal(BIDREQ.sizes[0][0]);
+      expect(bannerRequestBody.imp[0].banner.format[0].h).to.equal(BIDREQ.sizes[0][1]);
+    });
+
+    it('sets domain and href correctly', function () {
+      expect(bannerRequestBody.site.domain).to.equal(BIDREQ.params.siteId);
+      expect(bannerRequestBody.site.page).to.equal(BID_REQ_REFER);
+    });
+
+    const gdprBidRequests = [{
+      bidder: BIDDER_CODE,
+      params: {
+        tagId: '403370',
+        siteId: 'example.com'
+      },
+      sizes: [
+        [300, 250]
+      ],
+      bidId: '30b31c1838de1e',
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '1d1a030790a475'
+    }];
+    const consentString = 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==';
+
+    const GDPR_REQ_REFERER = 'http://localhost:9876/'
+    function getGdprRequestBody(gdprApplies, consentString) {
+      const gdprRequest = spec.buildRequests(gdprBidRequests, {
+        gdprConsent: {
+          gdprApplies: gdprApplies,
+          consentString: consentString,
+        },
+        refererInfo: {
+          referer: GDPR_REQ_REFERER,
+        },
+      })[0];
+      return gdprRequest.data;
+    }
+
+    it('should handle gdpr applies being present and true', function() {
+      const gdprRequestBody = getGdprRequestBody(true, consentString);
+      expect(gdprRequestBody.regs.ext.gdpr).to.equal(1);
+      expect(gdprRequestBody.user.ext.consent).to.equal(consentString);
+    })
+
+    it('should handle gdpr applies being present and false', function() {
+      const gdprRequestBody = getGdprRequestBody(false, consentString);
+      expect(gdprRequestBody.regs.ext.gdpr).to.equal(0);
+      expect(gdprRequestBody.user.ext.consent).to.equal(consentString);
+    })
+
+    it('should handle gdpr applies  being undefined', function() {
+      const gdprRequestBody = getGdprRequestBody(undefined, consentString);
+      expect(gdprRequestBody.regs).to.deep.equal({ext: {}});
+      expect(gdprRequestBody.user.ext.consent).to.equal(consentString);
+    })
+
+    it('should handle gdpr consent being undefined', function() {
+      const gdprRequest = spec.buildRequests(gdprBidRequests, {refererInfo: { referer: GDPR_REQ_REFERER }})[0];
+      const gdprRequestBody = gdprRequest.data;
+      expect(gdprRequestBody.regs).to.deep.equal({ ext: {} });
+      expect(gdprRequestBody.user).to.deep.equal({ ext: {} });
+    })
+  });
+
+  describe('interpretResponse', function () {
+    const bidRequests = [
+      {
+        bidder: BIDDER_CODE,
+        params: {
+          tagId: '403370',
+          siteId: 'example.com',
+          currency: 'USD',
+        },
+        sizes: [
+          [300, 250],
+        ],
+        bidId: '30b31c1838de1e',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+      },
+    ];
+    const request = spec.buildRequests(bidRequests, {refererInfo: { referer: BID_REQ_REFER }})[0];
+    function makeResponse() {
+      return {
+        body: {
+          id: '5e5c23a5ba71e78',
+          seatbid: [
+            {
+              bid: [
+                {
+                  id: '6vmb3isptf',
+                  crid: 'deltaprojectscreative',
+                  impid: '322add653672f68',
+                  price: 1.22,
+                  adm: '<!-- creative -->',
+                  attr: [5],
+                  h: 90,
+                  nurl: 'http://nurl',
+                  w: 728,
+                }
+              ],
+              seat: 'MOCK'
+            }
+          ],
+          bidid: '5e5c23a5ba71e78',
+          cur: 'USD'
+        }
+      };
+    }
+    const expectedBid = {
+      requestId: '322add653672f68',
+      cpm: 1.22,
+      width: 728,
+      height: 90,
+      creativeId: 'deltaprojectscreative',
+      dealId: null,
+      currency: 'USD',
+      netRevenue: true,
+      mediaType: 'banner',
+      ttl: 60,
+      ad: '<!-- creative --><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="http://nurl"></div>'
+    };
+
+    it('should get incorrect bid response if response body is missing', function () {
+      let response = makeResponse();
+      delete response.body;
+      let result = spec.interpretResponse(response, request);
+      expect(result.length).to.equal(0);
+    });
+
+    it('should get incorrect bid response if id or seat id of response body is missing', function () {
+      let response1 = makeResponse();
+      delete response1.body.id;
+      let result1 = spec.interpretResponse(response1, request);
+      expect(result1.length).to.equal(0);
+
+      let response2 = makeResponse();
+      delete response2.body.seatbid;
+      let result2 = spec.interpretResponse(response2, request);
+      expect(result2.length).to.equal(0);
+    });
+
+    it('should get the correct bid response', function () {
+      let result = spec.interpretResponse(makeResponse(), request);
+      expect(result.length).to.equal(1);
+      expect(result[0]).to.deep.equal(expectedBid);
+    });
+
+    it('should handle a missing crid', function () {
+      let noCridResponse = makeResponse();
+      delete noCridResponse.body.seatbid[0].bid[0].crid;
+      const fallbackCrid = noCridResponse.body.seatbid[0].bid[0].id;
+      let noCridResult = Object.assign({}, expectedBid, {'creativeId': fallbackCrid});
+      let result = spec.interpretResponse(noCridResponse, request);
+      expect(result.length).to.equal(1);
+      expect(result[0]).to.deep.equal(noCridResult);
+    });
+
+    it('should handle a missing nurl', function () {
+      let noNurlResponse = makeResponse();
+      delete noNurlResponse.body.seatbid[0].bid[0].nurl;
+      let noNurlResult = Object.assign({}, expectedBid);
+      noNurlResult.ad = '<!-- creative -->';
+      let result = spec.interpretResponse(noNurlResponse, request);
+      expect(result.length).to.equal(1);
+      expect(result[0]).to.deep.equal(noNurlResult);
+    });
+
+    it('handles empty bid response', function () {
+      let response = {
+        body: {
+          id: '5e5c23a5ba71e78',
+          seatbid: []
+        }
+      };
+      let result = spec.interpretResponse(response, request);
+      expect(result.length).to.equal(0);
+    });
+
+    it('should keep custom properties', () => {
+      const customProperties = {test: 'a test message', param: {testParam: 1}};
+      const expectedResult = Object.assign({}, expectedBid, {[spec.code]: customProperties});
+      const response = makeResponse();
+      response.body.seatbid[0].bid[0].ext = customProperties;
+      const result = spec.interpretResponse(response, request);
+      expect(result.length).to.equal(1);
+      expect(result[0]).to.deep.equal(expectedResult);
+    });
+  });
+
+  describe('onBidWon', function () {
+    const OPEN_RTB_RESP = {
+      body: {
+        id: 'abc',
+        seatbid: [
+          {
+            bid: [
+              {
+                'id': 'abc*123*456',
+                'impid': 'xxxxxxx',
+                'price': 46.657196,
+                'adm': '<iframe id="dsp_iframe_228285197" src="https//abc/${AUCTION_PRICE:B64}&creative_id=123"></script>',
+                'adomain': ['deltaprojects.com'],
+                'h': 600,
+                'w': 300,
+                'cid': '868253',
+                'crid': '732935',
+                'cat': [],
+              },
+            ],
+            'seat': '2147483647',
+          },
+        ],
+        bidid: 'xyz',
+        cur: 'USD',
+      },
+    }
+    it('should replace auction price macro', () => {
+      const bid = spec.interpretResponse(OPEN_RTB_RESP)[0];
+      spec.onBidWon(bid);
+      expect(bid.ad).to.contains(`${Math.round(bid.cpm * 1000000)}`);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should not do user sync when pixel is disabled', () => {
+      const syncOptions = { pixelEnabled: false }
+      const result = spec.getUserSyncs(syncOptions)
+      expect(result.length).to.equal(0);
+    });
+
+    it('should do user sync without gdpr params when gdprConsent missing', () => {
+      const syncOptions = { pixelEnabled: true }
+      const gdprConsent = undefined
+      const result = spec.getUserSyncs(syncOptions, gdprConsent)
+      expect(result[0].url).to.equal(USERSYNC_URL);
+    });
+
+    it('should do user sync with gdpr params when gdprConsent exists', () => {
+      const syncOptions = { pixelEnabled: true }
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: 'ABCABCABC'
+      }
+      const expectedResult1 = USERSYNC_URL + `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`
+      const result1 = spec.getUserSyncs(syncOptions, {}, gdprConsent)
+      expect(result1[0].url).to.equal(expectedResult1);
+
+      delete gdprConsent.gdprApplies
+      const result2 = spec.getUserSyncs(syncOptions, {}, gdprConsent)
+      const expectedResult2 = USERSYNC_URL + `?gdpr_consent=${gdprConsent.consentString}`
+      expect(result2[0].url).to.equal(expectedResult2);
+    });
+  });
+
+  describe('getBidFloor', () => {
+    it('should not get bid floor when getFloor is not defined', () => {
+      const bid = {};
+      const currency = 'SEK';
+      const result = getBidFloor(bid, 'banner', '*', currency);
+      expect(result).to.be.undefined;
+    });
+
+    it('should not get bid floor when getFloor is not a function', () => {
+      const bid = { getFloor: 1.0 };
+      const currency = 'SEK';
+      const result = getBidFloor(bid, 'banner', '*', currency);
+      expect(result).to.be.undefined;
+    });
+
+    it('should not get bid floor when getFloor return empty', () => {
+      const bid = { getFloor: () => ({}) };
+      const currency = 'SEK';
+      const result = getBidFloor(bid, 'banner', '*', currency);
+      expect(result).to.be.undefined;
+    });
+
+    it('should not get bid floor in SEK when floor is not a number', () => {
+      const bid = { getFloor: () => ({ currency: 'SEK', floor: '1.0' }) };
+      const currency = 'SEK';
+      const result = getBidFloor(bid, 'banner', '*', currency);
+      expect(result).to.be.undefined;
+    });
+
+    it('should get bid floor in USD when currency is not defined', () => {
+      const bid = { getFloor: () => ({ currency: 'USD', floor: 1.0 }) };
+      const currency = undefined;
+      const result = getBidFloor(bid, 'banner', '*', currency);
+      expect(result.floor).to.equal(1.0);
+      expect(result.currency).to.equal('USD');
+    });
+
+    it('should get bid floor in SEK when currency is SEK', () => {
+      const bid = { getFloor: () => ({ currency: 'SEK', floor: 1.0 }) };
+      const currency = 'SEK';
+      const result = getBidFloor(bid, 'banner', '*', currency);
+      expect(result.floor).to.equal(1.0);
+      expect(result.currency).to.equal('SEK');
+    });
+  });
+});
diff --git a/test/spec/modules/dfpAdServerVideo_spec.js b/test/spec/modules/dfpAdServerVideo_spec.js
index cd412530d2b..943b7cc0162 100644
--- a/test/spec/modules/dfpAdServerVideo_spec.js
+++ b/test/spec/modules/dfpAdServerVideo_spec.js
@@ -7,8 +7,12 @@ import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { targeting } from 'src/targeting.js';
 import { auctionManager } from 'src/auctionManager.js';
+import { gdprDataHandler, uspDataHandler } from 'src/adapterManager.js';
 import * as adpod from 'modules/adpod.js';
 import { server } from 'test/mocks/xhr.js';
+import * as adServer from 'src/adserver.js';
+import {deepClone} from 'src/utils.js';
+import {hook} from '../../../src/hook.js';
 
 const bid = {
   videoCacheKey: 'abc',
@@ -19,6 +23,10 @@ const bid = {
 };
 
 describe('The DFP video support module', function () {
+  before(() => {
+    hook.ready();
+  });
+
   it('should make a legal request URL when given the required params', function () {
     const url = parse(buildDfpVideoUrl({
       adUnit: adUnit,
@@ -38,7 +46,7 @@ describe('The DFP video support module', function () {
     expect(queryParams).to.have.property('env', 'vp');
     expect(queryParams).to.have.property('gdfp_req', '1');
     expect(queryParams).to.have.property('iu', 'my/adUnit');
-    expect(queryParams).to.have.property('output', 'xml_vast3');
+    expect(queryParams).to.have.property('output', 'vast');
     expect(queryParams).to.have.property('sz', '640x480');
     expect(queryParams).to.have.property('unviewed_position_start', '1');
     expect(queryParams).to.have.property('url');
@@ -115,6 +123,154 @@ describe('The DFP video support module', function () {
     expect(customParams).to.have.property('hb_cache_id', bid.videoCacheKey);
   });
 
+  it('should include the us_privacy key when USP Consent is available', function () {
+    let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+    uspDataHandlerStub.returns('1YYY');
+
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.us_privacy).to.equal('1YYY');
+    uspDataHandlerStub.restore();
+  });
+
+  it('should not include the us_privacy key when USP Consent is not available', function () {
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.us_privacy).to.equal(undefined);
+  });
+
+  it('should include the GDPR keys when GDPR Consent is available', function () {
+    let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+    gdprDataHandlerStub.returns({
+      gdprApplies: true,
+      consentString: 'consent',
+      addtlConsent: 'moreConsent'
+    });
+
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.gdpr).to.equal('1');
+    expect(queryObject.gdpr_consent).to.equal('consent');
+    expect(queryObject.addtl_consent).to.equal('moreConsent');
+    gdprDataHandlerStub.restore();
+  });
+
+  it('should not include the GDPR keys when GDPR Consent is not available', function () {
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.gdpr).to.equal(undefined);
+    expect(queryObject.gdpr_consent).to.equal(undefined);
+    expect(queryObject.addtl_consent).to.equal(undefined);
+  });
+
+  it('should only include the GDPR keys for GDPR Consent fields with values', function () {
+    let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+    gdprDataHandlerStub.returns({
+      gdprApplies: true,
+      consentString: 'consent',
+    });
+
+    const bidCopy = utils.deepClone(bid);
+    bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
+      hb_adid: 'ad_id',
+    });
+
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bidCopy,
+      params: {
+        'iu': 'my/adUnit'
+      }
+    }));
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.gdpr).to.equal('1');
+    expect(queryObject.gdpr_consent).to.equal('consent');
+    expect(queryObject.addtl_consent).to.equal(undefined);
+    gdprDataHandlerStub.restore();
+  });
+
+  describe('GAM PPID', () => {
+    let ppid;
+    let getPPIDStub;
+    beforeEach(() => {
+      getPPIDStub = sinon.stub(adServer, 'getPPID').callsFake(() => ppid);
+    });
+    afterEach(() => {
+      getPPIDStub.restore();
+    });
+
+    Object.entries({
+      'params': {params: {'iu': 'mock/unit'}},
+      'url': {url: 'https://video.adserver.mock/', params: {'iu': 'mock/unit'}}
+    }).forEach(([t, opts]) => {
+      describe(`when using ${t}`, () => {
+        function buildUrlAndGetParams() {
+          const url = parse(buildDfpVideoUrl(Object.assign({
+            adUnit: adUnit,
+            bid: deepClone(bid),
+          }, opts)));
+          return utils.parseQS(url.query);
+        }
+
+        it('should be included if available', () => {
+          ppid = 'mockPPID';
+          const q = buildUrlAndGetParams();
+          expect(q.ppid).to.equal('mockPPID');
+        });
+
+        it('should not be included if not available', () => {
+          ppid = undefined;
+          const q = buildUrlAndGetParams();
+          expect(q.hasOwnProperty('ppid')).to.be.false;
+        })
+      })
+    })
+  })
+
   describe('special targeting unit test', function () {
     const allTargetingData = {
       'hb_format': 'video',
@@ -299,6 +455,59 @@ describe('The DFP video support module', function () {
     expect(customParams).to.have.property('hb_cache_id', 'def');
   });
 
+  it('should keep the url protocol, host, and pathname when using url and params', function () {
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bid,
+      url: 'http://video.adserver.example/ads?sz=640x480&iu=/123/aduniturl&impl=s',
+      params: {
+        cust_params: {
+          hb_rand: 'random'
+        }
+      }
+    }));
+
+    expect(url.protocol).to.equal('http:');
+    expect(url.host).to.equal('video.adserver.example');
+    expect(url.pathname).to.equal('/ads');
+  });
+
+  it('should append to the url size param', () => {
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bid,
+      url: 'http://video.adserver.example/ads?sz=360x240&iu=/123/aduniturl&impl=s',
+      params: {
+        cust_params: {
+          hb_rand: 'random'
+        }
+      }
+    }));
+
+    const queryObject = utils.parseQS(url.query);
+    expect(queryObject.sz).to.equal('360x240|640x480');
+  });
+
+  it('should append to the existing url cust params', () => {
+    const url = parse(buildDfpVideoUrl({
+      adUnit: adUnit,
+      bid: bid,
+      url: 'http://video.adserver.example/ads?sz=360x240&iu=/123/aduniturl&impl=s&cust_params=existing_key%3Dexisting_value%26other_key%3Dother_value',
+      params: {
+        cust_params: {
+          hb_rand: 'random'
+        }
+      }
+    }));
+
+    const queryObject = utils.parseQS(url.query);
+    const customParams = utils.parseQS('?' + decodeURIComponent(queryObject.cust_params));
+
+    expect(customParams).to.have.property('existing_key', 'existing_value');
+    expect(customParams).to.have.property('other_key', 'other_value');
+    expect(customParams).to.have.property('hb_rand', 'random');
+  });
+
   describe('adpod unit tests', function () {
     let amStub;
     let amGetAdUnitsStub;
@@ -350,6 +559,14 @@ describe('The DFP video support module', function () {
 
     it('should return masterTag url', function() {
       amStub.returns(getBidsReceived());
+      let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+      uspDataHandlerStub.returns('1YYY');
+      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+      gdprDataHandlerStub.returns({
+        gdprApplies: true,
+        consentString: 'consent',
+        addtlConsent: 'moreConsent'
+      });
       let url;
       parse(buildAdpodVideoUrl({
         code: 'adUnitCode-1',
@@ -375,15 +592,21 @@ describe('The DFP video support module', function () {
         expect(queryParams).to.have.property('env', 'vp');
         expect(queryParams).to.have.property('gdfp_req', '1');
         expect(queryParams).to.have.property('iu', 'my/adUnit');
-        expect(queryParams).to.have.property('output', 'xml_vast3');
+        expect(queryParams).to.have.property('output', 'vast');
         expect(queryParams).to.have.property('sz', '640x480');
         expect(queryParams).to.have.property('unviewed_position_start', '1');
         expect(queryParams).to.have.property('url');
         expect(queryParams).to.have.property('cust_params');
+        expect(queryParams).to.have.property('us_privacy', '1YYY');
+        expect(queryParams).to.have.property('gdpr', '1');
+        expect(queryParams).to.have.property('gdpr_consent', 'consent');
+        expect(queryParams).to.have.property('addtl_consent', 'moreConsent');
 
         const custParams = utils.parseQS(decodeURIComponent(queryParams.cust_params));
         expect(custParams).to.have.property('hb_cache_id', '123');
         expect(custParams).to.have.property('hb_pb_cat_dur', '15.00_395_15s,15.00_406_30s,10.00_395_15s');
+        uspDataHandlerStub.restore();
+        gdprDataHandlerStub.restore();
       }
     });
 
diff --git a/test/spec/modules/dgkeywordRtdProvider_spec.js b/test/spec/modules/dgkeywordRtdProvider_spec.js
new file mode 100644
index 00000000000..754740b7a64
--- /dev/null
+++ b/test/spec/modules/dgkeywordRtdProvider_spec.js
@@ -0,0 +1,433 @@
+import * as dgRtd from 'modules/dgkeywordRtdProvider.js';
+import { cloneDeep } from 'lodash';
+import { server } from 'test/mocks/xhr.js';
+import { config } from 'src/config.js';
+
+const DG_GET_KEYWORDS_TIMEOUT = 1950;
+const IGNORE_SET_ORTB2 = true;
+const DEF_CONFIG = {
+  name: 'dgkeyword',
+  waitForIt: true,
+  params: {
+    timeout: DG_GET_KEYWORDS_TIMEOUT,
+  },
+};
+const DUMMY_RESPONSE_HEADER = { 'Content-Type': 'application/json' };
+const DUMMY_RESPONSE = { s: ['s1', 's2'], t: ['t1', 't2'] };
+const SUCCESS_RESULT = { opeaud: ['s1', 's2'], opectx: ['t1', 't2'] };
+const SUCCESS_ORTB2 = {
+  ortb2: {
+    site: { keywords: SUCCESS_RESULT },
+    user: { keywords: SUCCESS_RESULT },
+  },
+};
+
+describe('Digital Garage Keyword Module', function () {
+  it('should init and return always true', function () {
+    expect(dgRtd.dgkeywordSubmodule.init()).to.equal(true);
+  });
+
+  describe('dgkeyword target test', function () {
+    it('should have no target', function () {
+      const adUnits_no_target = [
+        {
+          code: 'code1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          bids: [
+            {
+              bidder: 'dg',
+              params: {
+                placementId: 99999999,
+              },
+            },
+            {
+              bidder: 'dg2',
+              params: {
+                placementId: 99999998,
+                dgkeyword: false,
+              },
+            },
+            {
+              bidder: 'dg3',
+              params: {
+                placementId: 99999997,
+              },
+            },
+          ],
+        },
+        {
+          code: 'code2',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          bids: [
+            {
+              bidder: 'dg',
+              params: {
+                placementId: 99999996,
+              },
+            },
+            {
+              bidder: 'dg2',
+              params: {
+                placementId: 99999995,
+              },
+            },
+            {
+              bidder: 'dg3',
+              params: {
+                placementId: 99999994,
+              },
+            },
+          ],
+        },
+      ];
+      expect(dgRtd.getTargetBidderOfDgKeywords(adUnits_no_target)).an('array')
+        .that.is.empty;
+    });
+    it('should have targets', function () {
+      const adUnits_targets = [
+        {
+          code: 'code1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          bids: [
+            {
+              bidder: 'dg',
+              params: {
+                placementId: 99999999,
+              },
+            },
+            {
+              bidder: 'dg2',
+              params: {
+                placementId: 99999998,
+                dgkeyword: true,
+              },
+            },
+            {
+              bidder: 'dg3',
+              params: {
+                placementId: 99999997,
+                dgkeyword: false,
+              },
+            },
+          ],
+        },
+        {
+          code: 'code2',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          bids: [
+            {
+              bidder: 'dg',
+              params: {
+                placementId: 99999996,
+                dgkeyword: true,
+              },
+            },
+            {
+              bidder: 'dg2',
+              params: {
+                placementId: 99999995,
+                dgkeyword: 'aa',
+              },
+            },
+            {
+              bidder: 'dg3',
+              params: {
+                placementId: 99999994,
+                dgkeyword: true,
+              },
+            },
+          ],
+        },
+      ];
+      const targets = dgRtd.getTargetBidderOfDgKeywords(adUnits_targets);
+      expect(targets[0].bidder).to.be.equal('dg2');
+      expect(targets[0].params.placementId).to.be.equal(99999998);
+      expect(targets[0].params.dgkeyword).to.be.an('undefined');
+      expect(targets[1].bidder).to.be.equal('dg');
+      expect(targets[1].params.placementId).to.be.equal(99999996);
+      expect(targets[1].params.dgkeyword).to.be.an('undefined');
+      expect(targets[2].bidder).to.be.equal('dg3');
+      expect(targets[2].params.placementId).to.be.equal(99999994);
+      expect(targets[2].params.dgkeyword).to.be.an('undefined');
+    });
+  });
+
+  describe('get profile.', function () {
+    const AD_UNITS = [
+      {
+        code: 'code1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bids: [
+          {
+            bidder: 'dg',
+            params: {
+              placementId: 99999999,
+            },
+          },
+          {
+            bidder: 'dg2',
+            params: {
+              placementId: 99999998,
+              dgkeyword: true,
+            },
+          },
+          {
+            bidder: 'dg3',
+            params: {
+              placementId: 99999997,
+              dgkeyword: false,
+            },
+          },
+        ],
+      },
+      {
+        code: 'code2',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bids: [
+          {
+            bidder: 'dg',
+            params: {
+              placementId: 99999996,
+              dgkeyword: true,
+            },
+          },
+          {
+            bidder: 'dg2',
+            params: {
+              placementId: 99999995,
+              dgkeyword: 'aa',
+            },
+          },
+          {
+            bidder: 'dg3',
+            params: {
+              placementId: 99999994,
+            },
+          },
+        ],
+      },
+    ];
+    it('should get profiles error(404).', function (done) {
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          let targets = pbjs.adUnits[0].bids;
+          expect(targets[1].bidder).to.be.equal('dg2');
+          expect(targets[1].params.placementId).to.be.equal(99999998);
+          expect(targets[1].params.dgkeyword).to.be.an('undefined');
+          expect(targets[1].params.keywords).to.be.an('undefined');
+          targets = pbjs.adUnits[1].bids;
+          expect(targets[0].bidder).to.be.equal('dg');
+          expect(targets[0].params.placementId).to.be.equal(99999996);
+          expect(targets[0].params.dgkeyword).to.be.an('undefined');
+          expect(targets[0].params.keywords).to.be.an('undefined');
+          expect(targets[2].bidder).to.be.equal('dg3');
+          expect(targets[2].params.placementId).to.be.equal(99999994);
+          expect(targets[2].params.dgkeyword).to.be.an('undefined');
+          expect(targets[2].params.keywords).to.be.an('undefined');
+
+          expect(pbjs.getBidderConfig()).to.be.deep.equal({});
+
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(404);
+    });
+    it('should get profiles timeout.', function (done) {
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      moduleConfig.params.timeout = 10;
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          let targets = pbjs.adUnits[0].bids;
+          expect(targets[1].bidder).to.be.equal('dg2');
+          expect(targets[1].params.placementId).to.be.equal(99999998);
+          expect(targets[1].params.dgkeyword).to.be.an('undefined');
+          expect(targets[1].params.keywords).to.be.an('undefined');
+          targets = pbjs.adUnits[1].bids;
+          expect(targets[0].bidder).to.be.equal('dg');
+          expect(targets[0].params.placementId).to.be.equal(99999996);
+          expect(targets[0].params.dgkeyword).to.be.an('undefined');
+          expect(targets[0].params.keywords).to.be.an('undefined');
+          expect(targets[2].bidder).to.be.equal('dg3');
+          expect(targets[2].params.placementId).to.be.equal(99999994);
+          expect(targets[2].params.dgkeyword).to.be.an('undefined');
+          expect(targets[2].params.keywords).to.be.an('undefined');
+
+          expect(pbjs.getBidderConfig()).to.be.deep.equal({});
+
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      setTimeout(() => {
+        if (request) {
+          request.respond(
+            200,
+            DUMMY_RESPONSE_HEADER,
+            JSON.stringify(DUMMY_RESPONSE)
+          );
+        }
+      }, 50);
+    });
+    it('should get profiles ok(200).', function (done) {
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      if (IGNORE_SET_ORTB2) {
+        pbjs._ignoreSetOrtb2 = true;
+      }
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          let targets = pbjs.adUnits[0].bids;
+          expect(targets[1].bidder).to.be.equal('dg2');
+          expect(targets[1].params.placementId).to.be.equal(99999998);
+          expect(targets[1].params.dgkeyword).to.be.an('undefined');
+          expect(targets[1].params.keywords).to.be.deep.equal(SUCCESS_RESULT);
+          targets = pbjs.adUnits[1].bids;
+          expect(targets[0].bidder).to.be.equal('dg');
+          expect(targets[0].params.placementId).to.be.equal(99999996);
+          expect(targets[0].params.dgkeyword).to.be.an('undefined');
+          expect(targets[0].params.keywords).to.be.deep.equal(SUCCESS_RESULT);
+          expect(targets[2].bidder).to.be.equal('dg3');
+          expect(targets[2].params.placementId).to.be.equal(99999994);
+          expect(targets[2].params.dgkeyword).to.be.an('undefined');
+          expect(targets[2].params.keywords).to.be.an('undefined');
+
+          if (!IGNORE_SET_ORTB2) {
+            expect(pbjs.getBidderConfig()).to.be.deep.equal({
+              dg2: SUCCESS_ORTB2,
+              dg: SUCCESS_ORTB2,
+            });
+          }
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(
+        200,
+        DUMMY_RESPONSE_HEADER,
+        JSON.stringify(DUMMY_RESPONSE)
+      );
+    });
+    it('change url.', function (done) {
+      const dummyUrl = 'https://www.test.com/test'
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      if (IGNORE_SET_ORTB2) {
+        pbjs._ignoreSetOrtb2 = true;
+      }
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      moduleConfig.params.url = dummyUrl;
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          const url = dgRtd.getProfileApiUrl(dummyUrl);
+          expect(url.indexOf('?fpid=') === -1).to.equal(true);
+          expect(url).to.equal(server.requests[0].url);
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(
+        200,
+        DUMMY_RESPONSE_HEADER,
+        JSON.stringify(DUMMY_RESPONSE)
+      );
+    });
+    it('add fpid stored in local strage.', function (done) {
+      const uuid = 'uuid_abcdefghijklmnopqrstuvwxyz';
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      if (IGNORE_SET_ORTB2) {
+        pbjs._ignoreSetOrtb2 = true;
+      }
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      window.localStorage.setItem('ope_fpid', uuid);
+      moduleConfig.params.enableReadFpid = true;
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          const url = dgRtd.getProfileApiUrl(null, moduleConfig.params.enableReadFpid);
+          expect(url.indexOf(uuid) > 0).to.equal(true);
+          expect(url).to.equal(server.requests[0].url);
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(
+        200,
+        DUMMY_RESPONSE_HEADER,
+        JSON.stringify(DUMMY_RESPONSE)
+      );
+    });
+    it('disable fpid stored in local strage.', function (done) {
+      const uuid = 'uuid_abcdefghijklmnopqrstuvwxyz';
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      if (IGNORE_SET_ORTB2) {
+        pbjs._ignoreSetOrtb2 = true;
+      }
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      window.localStorage.setItem('ope_fpid', uuid);
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          const url = dgRtd.getProfileApiUrl(null);
+          expect(url.indexOf(uuid) > 0).to.equal(false);
+          expect(url).to.equal(server.requests[0].url);
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(
+        200,
+        DUMMY_RESPONSE_HEADER,
+        JSON.stringify(DUMMY_RESPONSE)
+      );
+    });
+  });
+});
diff --git a/test/spec/modules/dianomiBidAdapter_spec.js b/test/spec/modules/dianomiBidAdapter_spec.js
new file mode 100644
index 00000000000..61509913c41
--- /dev/null
+++ b/test/spec/modules/dianomiBidAdapter_spec.js
@@ -0,0 +1,1542 @@
+// jshint esversion: 6, es3: false, node: true
+import { assert } from 'chai';
+import { spec } from 'modules/dianomiBidAdapter.js';
+import { config } from 'src/config.js';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+describe('Dianomi adapter', () => {
+  let bids = [];
+
+  describe('isBidRequestValid', () => {
+    let bid = {
+      bidder: 'dianomi',
+      params: {
+        smartadId: 1234,
+      },
+    };
+
+    it('should return true when required params found', () => {
+      assert(spec.isBidRequestValid(bid));
+      bid.params = {
+        smartadId: 4332,
+      };
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return false when required params are missing', () => {
+      bid.params = {};
+      assert.isFalse(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        smartadId: null,
+      };
+      assert.isFalse(spec.isBidRequestValid(bid));
+    });
+  });
+
+  describe('buildRequests', () => {
+    beforeEach(() => {
+      config.resetConfig();
+    });
+    it('should send request with correct structure', () => {
+      let validBidRequests = [
+        {
+          bidId: 'bidId',
+          params: { smartadId: 1234 },
+        },
+      ];
+      let request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } });
+
+      assert.equal(request.method, 'POST');
+      assert.equal(request.url, 'https://www-prebid.dianomi.com/cgi-bin/smartads_prebid.pl');
+      assert.ok(request.data);
+    });
+
+    describe('user privacy', () => {
+      it('should send GDPR Consent data to Dianomi if gdprApplies', () => {
+        let validBidRequests = [{ bidId: 'bidId', params: { smartadId: 1234 } }];
+        let bidderRequest = {
+          gdprConsent: { gdprApplies: true, consentString: 'consentDataString' },
+          refererInfo: { page: 'page' },
+        };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user.ext.consent, bidderRequest.gdprConsent.consentString);
+        assert.equal(request.regs.ext.gdpr, bidderRequest.gdprConsent.gdprApplies);
+        assert.equal(typeof request.regs.ext.gdpr, 'number');
+      });
+
+      it('should send gdpr as number', () => {
+        let validBidRequests = [{ bidId: 'bidId', params: { smartadId: 1234 } }];
+        let bidderRequest = {
+          gdprConsent: { gdprApplies: true, consentString: 'consentDataString' },
+          refererInfo: { page: 'page' },
+        };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(typeof request.regs.ext.gdpr, 'number');
+        assert.equal(request.regs.ext.gdpr, 1);
+      });
+
+      it('should send CCPA Consent data to dianomi', () => {
+        let validBidRequests = [{ bidId: 'bidId', params: { smartadId: 1234 } }];
+        let bidderRequest = { uspConsent: '1YA-', refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.regs.ext.us_privacy, '1YA-');
+
+        bidderRequest = {
+          uspConsent: '1YA-',
+          gdprConsent: { gdprApplies: true, consentString: 'consentDataString' },
+          refererInfo: { page: 'page' },
+        };
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.regs.ext.us_privacy, '1YA-');
+        assert.equal(request.user.ext.consent, 'consentDataString');
+        assert.equal(request.regs.ext.gdpr, 1);
+      });
+
+      it('should not send GDPR Consent data to dianomi if gdprApplies is undefined', () => {
+        let validBidRequests = [
+          {
+            bidId: 'bidId',
+            params: { smartadId: 1234 },
+          },
+        ];
+        let bidderRequest = {
+          gdprConsent: { gdprApplies: false, consentString: 'consentDataString' },
+          refererInfo: { page: 'page' },
+        };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user.ext.consent, 'consentDataString');
+        assert.equal(request.regs.ext.gdpr, 0);
+
+        bidderRequest = {
+          gdprConsent: { consentString: 'consentDataString' },
+          refererInfo: { page: 'page' },
+        };
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
+
+        assert.equal(request.user, undefined);
+        assert.equal(request.regs, undefined);
+      });
+      it('should send default GDPR Consent data to dianomi', () => {
+        let validBidRequests = [
+          {
+            bidId: 'bidId',
+            params: { smartadId: 1234 },
+          },
+        ];
+        let request = JSON.parse(
+          spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+        );
+
+        assert.equal(request.user, undefined);
+        assert.equal(request.regs, undefined);
+      });
+    });
+
+    it('should have default request structure', () => {
+      let keys = 'site,device,source,ext,imp'.split(',');
+      let validBidRequests = [
+        {
+          bidId: 'bidId',
+          params: { smartadId: 1234 },
+        },
+      ];
+      let request = JSON.parse(
+        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+      );
+      let data = Object.keys(request);
+
+      assert.deepEqual(keys, data);
+    });
+
+    it('should set request keys correct values', () => {
+      let validBidRequests = [
+        {
+          bidId: 'bidId',
+          params: { smartadId: 1234 },
+        },
+      ];
+      let request = JSON.parse(
+        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, auctionId: 'tid' }).data
+      );
+
+      assert.equal(request.source.tid, 'tid');
+      assert.equal(request.source.fd, 1);
+    });
+
+    it('should send info about device', () => {
+      config.setConfig({
+        device: { w: 100, h: 100 },
+      });
+      let validBidRequests = [
+        {
+          bidId: 'bidId',
+          params: { smartadId: 1234 },
+        },
+      ];
+      let request = JSON.parse(
+        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+      );
+
+      assert.equal(request.device.ua, navigator.userAgent);
+      assert.equal(request.device.w, 100);
+      assert.equal(request.device.h, 100);
+    });
+
+    it('should send app info', () => {
+      config.setConfig({
+        app: { id: 'appid' },
+      });
+      const ortb2 = { app: { name: 'appname' } };
+      let validBidRequests = [
+        {
+          bidId: 'bidId',
+          params: { smartadId: 1234 },
+          ortb2,
+        },
+      ];
+      let request = JSON.parse(
+        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, ortb2 }).data
+      );
+
+      assert.equal(request.app.id, 'appid');
+      assert.equal(request.app.name, 'appname');
+      assert.equal(request.site, undefined);
+    });
+
+    it('should send info about the site', () => {
+      config.setConfig({
+        site: {
+          id: '123123',
+          publisher: {
+            domain: 'publisher.domain.com',
+          },
+        },
+      });
+      const ortb2 = {
+        site: {
+          publisher: {
+            name: "publisher's name",
+          },
+        },
+      };
+      let validBidRequests = [
+        {
+          bidId: 'bidId',
+          params: { smartadId: 1234 },
+          ortb2,
+        },
+      ];
+      let refererInfo = { page: 'page' };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo, ortb2 }).data);
+
+      assert.deepEqual(request.site, {
+        page: refererInfo.page,
+        publisher: {
+          domain: 'publisher.domain.com',
+          name: "publisher's name",
+        },
+        id: '123123',
+      });
+    });
+
+    it('should pass extended ids', () => {
+      let validBidRequests = [
+        {
+          bidId: 'bidId',
+          params: { smartadId: 1234 },
+          userIdAsEids: createEidsArray({
+            tdid: 'TTD_ID_FROM_USER_ID_MODULE',
+            pubcid: 'pubCommonId_FROM_USER_ID_MODULE',
+          }),
+        },
+      ];
+
+      let request = JSON.parse(
+        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+      );
+      assert.deepEqual(request.user.ext.eids, [
+        {
+          source: 'adserver.org',
+          uids: [{ id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } }],
+        },
+        { source: 'pubcid.org', uids: [{ id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 }] },
+      ]);
+    });
+
+    it('should send currency if defined', () => {
+      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
+      let validBidRequests = [{ params: { smartadId: 1234 } }];
+      let refererInfo = { page: 'page' };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo }).data);
+
+      assert.deepEqual(request.cur, ['EUR']);
+    });
+
+    it('should pass supply chain object', () => {
+      let validBidRequests = [
+        {
+          bidId: 'bidId',
+          params: { smartadId: 1234 },
+          schain: {
+            validation: 'strict',
+            config: {
+              ver: '1.0',
+            },
+          },
+        },
+      ];
+
+      let request = JSON.parse(
+        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+      );
+      assert.deepEqual(request.source.ext.schain, {
+        validation: 'strict',
+        config: {
+          ver: '1.0',
+        },
+      });
+    });
+
+    describe('priceType', () => {
+      it('should send default priceType', () => {
+        let validBidRequests = [
+          {
+            bidId: 'bidId',
+            params: { smartadId: 1234 },
+          },
+        ];
+        let request = JSON.parse(
+          spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+        );
+
+        assert.equal(request.ext.pt, 'net');
+      });
+      it('should send correct priceType value', () => {
+        let validBidRequests = [
+          {
+            bidId: 'bidId',
+            params: { smartadId: 1234 },
+          },
+        ];
+        let request = JSON.parse(
+          spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+        );
+
+        assert.equal(request.ext.pt, 'net');
+      });
+    });
+
+    describe('bids', () => {
+      it('should add more than one bid to the request', () => {
+        let validBidRequests = [
+          {
+            bidId: 'bidId',
+            params: { smartadId: 1234 },
+          },
+          {
+            bidId: 'bidId2',
+            params: { smartadId: 1234 },
+          },
+        ];
+        let request = JSON.parse(
+          spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+        );
+
+        assert.equal(request.imp.length, 2);
+      });
+      it('should add incrementing values of id', () => {
+        let validBidRequests = [
+          {
+            bidId: 'bidId',
+            params: { smartadId: 1234 },
+            mediaTypes: { video: {} },
+          },
+          {
+            bidId: 'bidId2',
+            params: { smartadId: 1234 },
+            mediaTypes: { video: {} },
+          },
+          {
+            bidId: 'bidId3',
+            params: { smartadId: 1234 },
+            mediaTypes: { video: {} },
+          },
+        ];
+        let imps = JSON.parse(
+          spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+        ).imp;
+
+        for (let i = 0; i < 3; i++) {
+          assert.equal(imps[i].id, i + 1);
+        }
+      });
+
+      describe('price floors', () => {
+        it('should not add if floors module not configured', () => {
+          const validBidRequests = [
+            { bidId: 'bidId', params: { smartadId: 1234 }, mediaTypes: { video: {} } },
+          ];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, undefined);
+        });
+
+        it('should not add if floor price not defined', () => {
+          const validBidRequests = [getBidWithFloor()];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'USD');
+        });
+
+        it('should request floor price in adserver currency', () => {
+          config.setConfig({ currency: { adServerCurrency: 'GBP' } });
+          const validBidRequests = [getBidWithFloor()];
+          let imp = getRequestImps(validBidRequests)[0];
+
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'GBP');
+        });
+
+        it('should add correct floor values', () => {
+          const expectedFloors = [1, 1.3, 0.5];
+          const validBidRequests = expectedFloors.map(getBidWithFloor);
+          let imps = getRequestImps(validBidRequests);
+
+          expectedFloors.forEach((floor, index) => {
+            assert.equal(imps[index].bidfloor, floor);
+            assert.equal(imps[index].bidfloorcur, 'USD');
+          });
+        });
+
+        function getBidWithFloor(floor) {
+          return {
+            params: { smartadId: 1234 },
+            mediaTypes: { video: {} },
+            getFloor: ({ currency }) => {
+              return {
+                currency: currency,
+                floor,
+              };
+            },
+          };
+        }
+      });
+
+      describe('multiple media types', () => {
+        it('should use all configured media types for bidding', () => {
+          let validBidRequests = [
+            {
+              bidId: 'bidId',
+              params: { smartadId: 1234 },
+              mediaTypes: {
+                banner: {
+                  sizes: [
+                    [100, 100],
+                    [200, 300],
+                  ],
+                },
+                video: {},
+              },
+            },
+            {
+              bidId: 'bidId1',
+              params: { smartadId: 1234 },
+              mediaTypes: {
+                video: {},
+                native: {},
+              },
+            },
+            {
+              bidId: 'bidId2',
+              params: { smartadId: 1234 },
+              nativeParams: {
+                title: { required: true, len: 140 },
+              },
+              mediaTypes: {
+                banner: {
+                  sizes: [
+                    [100, 100],
+                    [200, 300],
+                  ],
+                },
+                native: {},
+                video: {},
+              },
+            },
+          ];
+          let [first, second, third] = JSON.parse(
+            spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+          ).imp;
+
+          assert.ok(first.banner);
+          assert.ok(first.video);
+          assert.equal(first.native, undefined);
+
+          assert.ok(second.video);
+          assert.equal(second.banner, undefined);
+          assert.equal(second.native, undefined);
+
+          assert.ok(third.native);
+          assert.ok(third.video);
+          assert.ok(third.banner);
+        });
+      });
+
+      describe('banner', () => {
+        it('should convert sizes to openrtb format', () => {
+          let validBidRequests = [
+            {
+              bidId: 'bidId',
+              params: { smartadId: 1234 },
+              mediaTypes: {
+                banner: {
+                  sizes: [
+                    [100, 100],
+                    [200, 300],
+                  ],
+                },
+              },
+            },
+          ];
+          let { banner } = JSON.parse(
+            spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+          ).imp[0];
+          assert.deepEqual(banner, {
+            format: [
+              { w: 100, h: 100 },
+              { w: 200, h: 300 },
+            ],
+          });
+        });
+      });
+
+      describe('video', () => {
+        it('should pass video mediatype config', () => {
+          let validBidRequests = [
+            {
+              bidId: 'bidId',
+              params: { smartadId: 1234 },
+              mediaTypes: {
+                video: {
+                  playerSize: [640, 480],
+                  context: 'outstream',
+                  mimes: ['video/mp4'],
+                },
+              },
+            },
+          ];
+          let { video } = JSON.parse(
+            spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+          ).imp[0];
+          assert.deepEqual(video, {
+            playerSize: [640, 480],
+            context: 'outstream',
+            mimes: ['video/mp4'],
+          });
+        });
+      });
+
+      describe('native', () => {
+        describe('assets', () => {
+          it('should set correct asset id', () => {
+            let validBidRequests = [
+              {
+                bidId: 'bidId',
+                params: { smartadId: 1234 },
+                nativeParams: {
+                  title: { required: true, len: 140 },
+                  image: {
+                    required: false,
+                    wmin: 836,
+                    hmin: 627,
+                    w: 325,
+                    h: 300,
+                    mimes: ['image/jpg', 'image/gif'],
+                  },
+                  body: { len: 140 },
+                },
+              },
+            ];
+            let assets = JSON.parse(
+              spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+            ).imp[0].native.assets;
+
+            assert.equal(assets[0].id, 0);
+            assert.equal(assets[1].id, 3);
+            assert.equal(assets[2].id, 4);
+          });
+          it('should add required key if it is necessary', () => {
+            let validBidRequests = [
+              {
+                bidId: 'bidId',
+                params: { smartadId: 1234 },
+                nativeParams: {
+                  title: { required: true, len: 140 },
+                  image: {
+                    required: false,
+                    wmin: 836,
+                    hmin: 627,
+                    w: 325,
+                    h: 300,
+                    mimes: ['image/jpg', 'image/gif'],
+                  },
+                  body: { len: 140 },
+                  sponsoredBy: { required: true, len: 140 },
+                },
+              },
+            ];
+
+            let assets = JSON.parse(
+              spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+            ).imp[0].native.assets;
+
+            assert.equal(assets[0].required, 1);
+            assert.ok(!assets[1].required);
+            assert.ok(!assets[2].required);
+            assert.equal(assets[3].required, 1);
+          });
+
+          it('should map img and data assets', () => {
+            let validBidRequests = [
+              {
+                bidId: 'bidId',
+                params: { smartadId: 1234 },
+                nativeParams: {
+                  title: { required: true, len: 140 },
+                  image: { required: true, sizes: [150, 50] },
+                  icon: { required: false, sizes: [50, 50] },
+                  body: { required: false, len: 140 },
+                  sponsoredBy: { required: true },
+                  cta: { required: false },
+                  clickUrl: { required: false },
+                },
+              },
+            ];
+
+            let assets = JSON.parse(
+              spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+            ).imp[0].native.assets;
+            assert.ok(assets[0].title);
+            assert.equal(assets[0].title.len, 140);
+            assert.deepEqual(assets[1].img, { type: 3, w: 150, h: 50 });
+            assert.deepEqual(assets[2].img, { type: 1, w: 50, h: 50 });
+            assert.deepEqual(assets[3].data, { type: 2, len: 140 });
+            assert.deepEqual(assets[4].data, { type: 1 });
+            assert.deepEqual(assets[5].data, { type: 12 });
+            assert.ok(!assets[6]);
+          });
+
+          describe('icon/image sizing', () => {
+            it('should flatten sizes and utilise first pair', () => {
+              const validBidRequests = [
+                {
+                  bidId: 'bidId',
+                  params: { smartadId: 1234 },
+                  nativeParams: {
+                    image: {
+                      sizes: [
+                        [200, 300],
+                        [100, 200],
+                      ],
+                    },
+                  },
+                },
+              ];
+
+              let assets = JSON.parse(
+                spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+              ).imp[0].native.assets;
+              assert.ok(assets[0].img);
+              assert.equal(assets[0].img.w, 200);
+              assert.equal(assets[0].img.h, 300);
+            });
+          });
+
+          it('should utilise aspect_ratios', () => {
+            const validBidRequests = [
+              {
+                bidId: 'bidId',
+                params: { smartadId: 1234 },
+                nativeParams: {
+                  image: {
+                    aspect_ratios: [
+                      {
+                        min_width: 100,
+                        ratio_height: 3,
+                        ratio_width: 1,
+                      },
+                    ],
+                  },
+                  icon: {
+                    aspect_ratios: [
+                      {
+                        min_width: 10,
+                        ratio_height: 5,
+                        ratio_width: 2,
+                      },
+                    ],
+                  },
+                },
+              },
+            ];
+
+            let assets = JSON.parse(
+              spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+            ).imp[0].native.assets;
+            assert.ok(assets[0].img);
+            assert.equal(assets[0].img.wmin, 100);
+            assert.equal(assets[0].img.hmin, 300);
+
+            assert.ok(assets[1].img);
+            assert.equal(assets[1].img.wmin, 10);
+            assert.equal(assets[1].img.hmin, 25);
+          });
+
+          it('should not throw error if aspect_ratios config is not defined', () => {
+            const validBidRequests = [
+              {
+                bidId: 'bidId',
+                params: { smartadId: 1234 },
+                nativeParams: {
+                  image: {
+                    aspect_ratios: [],
+                  },
+                  icon: {
+                    aspect_ratios: [],
+                  },
+                },
+              },
+            ];
+
+            assert.doesNotThrow(() =>
+              spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })
+            );
+          });
+        });
+      });
+    });
+
+    function getRequestImps(validBidRequests) {
+      return JSON.parse(
+        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+      ).imp;
+    }
+  });
+
+  describe('interpretResponse', () => {
+    it('should return if no body in response', () => {
+      let serverResponse = {};
+      let bidRequest = {};
+
+      assert.ok(!spec.interpretResponse(serverResponse, bidRequest));
+    });
+    it('should return more than one bids', () => {
+      let serverResponse = {
+        body: {
+          seatbid: [
+            {
+              bid: [
+                {
+                  impid: '1',
+                  native: {
+                    ver: '1.1',
+                    link: { url: 'link' },
+                    assets: [{ id: 1, title: { text: 'Asset title text' } }],
+                  },
+                },
+              ],
+            },
+            {
+              bid: [
+                {
+                  impid: '2',
+                  native: {
+                    ver: '1.1',
+                    link: { url: 'link' },
+                    assets: [{ id: 1, data: { value: 'Asset title text' } }],
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      };
+      let bidRequest = {
+        data: {},
+        bids: [
+          {
+            bidId: 'bidId1',
+            params: { smartadId: 1234 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: {
+                required: false,
+                wmin: 836,
+                hmin: 627,
+                w: 325,
+                h: 300,
+                mimes: ['image/jpg', 'image/gif'],
+              },
+              body: { len: 140 },
+            },
+          },
+          {
+            bidId: 'bidId2',
+            params: { smartadId: 1234 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: {
+                required: false,
+                wmin: 836,
+                hmin: 627,
+                w: 325,
+                h: 300,
+                mimes: ['image/jpg', 'image/gif'],
+              },
+              body: { len: 140 },
+            },
+          },
+        ],
+      };
+
+      bids = spec.interpretResponse(serverResponse, bidRequest);
+      assert.equal(spec.interpretResponse(serverResponse, bidRequest).length, 2);
+    });
+
+    it('should parse seatbids', () => {
+      let serverResponse = {
+        body: {
+          seatbid: [
+            {
+              bid: [
+                {
+                  impid: '1',
+                  native: {
+                    ver: '1.1',
+                    link: { url: 'link1' },
+                    assets: [{ id: 1, title: { text: 'Asset title text' } }],
+                  },
+                },
+                {
+                  impid: '4',
+                  native: {
+                    ver: '1.1',
+                    link: { url: 'link4' },
+                    assets: [{ id: 1, title: { text: 'Asset title text' } }],
+                  },
+                },
+              ],
+            },
+            {
+              bid: [
+                {
+                  impid: '2',
+                  native: {
+                    ver: '1.1',
+                    link: { url: 'link2' },
+                    assets: [{ id: 1, data: { value: 'Asset title text' } }],
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      };
+      let bidRequest = {
+        data: {},
+        bids: [
+          {
+            bidId: 'bidId1',
+            params: { smartadId: 1234 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: {
+                required: false,
+                wmin: 836,
+                hmin: 627,
+                w: 325,
+                h: 300,
+                mimes: ['image/jpg', 'image/gif'],
+              },
+              body: { len: 140 },
+            },
+          },
+          {
+            bidId: 'bidId2',
+            params: { smartadId: 1234 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: {
+                required: false,
+                wmin: 836,
+                hmin: 627,
+                w: 325,
+                h: 300,
+                mimes: ['image/jpg', 'image/gif'],
+              },
+              body: { len: 140 },
+            },
+          },
+          {
+            bidId: 'bidId3',
+            params: { smartadId: 1234 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: {
+                required: false,
+                wmin: 836,
+                hmin: 627,
+                w: 325,
+                h: 300,
+                mimes: ['image/jpg', 'image/gif'],
+              },
+              body: { len: 140 },
+            },
+          },
+          {
+            bidId: 'bidId4',
+            params: { smartadId: 1234 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: {
+                required: false,
+                wmin: 836,
+                hmin: 627,
+                w: 325,
+                h: 300,
+                mimes: ['image/jpg', 'image/gif'],
+              },
+              body: { len: 140 },
+            },
+          },
+        ],
+      };
+
+      bids = spec.interpretResponse(serverResponse, bidRequest).map((bid) => {
+        const {
+          requestId,
+          native: { clickUrl },
+        } = bid;
+        return [requestId, clickUrl];
+      });
+
+      assert.equal(bids.length, 3);
+      assert.deepEqual(bids, [
+        ['bidId1', 'link1'],
+        ['bidId2', 'link2'],
+        ['bidId4', 'link4'],
+      ]);
+    });
+
+    it('should set correct values to bid', () => {
+      let serverResponse = {
+        body: {
+          id: null,
+          bidid: null,
+          seatbid: [
+            {
+              bid: [
+                {
+                  impid: '1',
+                  price: 93.1231,
+                  crid: '12312312',
+                  native: {
+                    assets: [],
+                    link: { url: 'link' },
+                    imptrackers: ['imptrackers url1', 'imptrackers url2'],
+                  },
+                  dealid: 'deal-id',
+                  adomain: ['demo.com'],
+                  ext: {
+                    prebid: {
+                      type: 'native',
+                    },
+                  },
+                },
+              ],
+            },
+          ],
+          cur: 'USD',
+        },
+      };
+      let bidRequest = {
+        data: {},
+        bids: [
+          {
+            bidId: 'bidId1',
+            params: { smartadId: 1234 },
+            nativeParams: {
+              title: { required: true, len: 140 },
+              image: {
+                required: false,
+                wmin: 836,
+                hmin: 627,
+                w: 325,
+                h: 300,
+                mimes: ['image/jpg', 'image/gif'],
+              },
+              body: { len: 140 },
+            },
+          },
+        ],
+      };
+
+      const bids = spec.interpretResponse(serverResponse, bidRequest);
+      const bid = serverResponse.body.seatbid[0].bid[0];
+      assert.deepEqual(bids[0].requestId, bidRequest.bids[0].bidId);
+      assert.deepEqual(bids[0].cpm, bid.price);
+      assert.deepEqual(bids[0].creativeId, bid.crid);
+      assert.deepEqual(bids[0].ttl, 360);
+      assert.deepEqual(bids[0].netRevenue, false);
+      assert.deepEqual(bids[0].currency, serverResponse.body.cur);
+      assert.deepEqual(bids[0].mediaType, 'native');
+      assert.deepEqual(bids[0].meta.mediaType, 'native');
+      assert.deepEqual(bids[0].meta.advertiserDomains, ['demo.com']);
+      assert.deepEqual(bids[0].dealId, 'deal-id');
+    });
+    it('should set correct native params', () => {
+      const bid = [
+        {
+          impid: '1',
+          price: 93.1231,
+          crid: '12312312',
+          native: {
+            assets: [
+              {
+                data: null,
+                id: 0,
+                img: null,
+                required: 0,
+                title: { text: 'title', len: null },
+                video: null,
+              },
+              {
+                data: null,
+                id: 2,
+                img: { type: null, url: 'test.url.com/Files/58345/308185.jpgbv=1', w: 30, h: 10 },
+                required: 0,
+                title: null,
+                video: null,
+              },
+              {
+                data: null,
+                id: 3,
+                img: {
+                  type: null,
+                  url: 'test.url.com/Files/58345/308200.jpgbv=1',
+                  w: 100,
+                  h: 100,
+                },
+                required: 0,
+                title: null,
+                video: null,
+              },
+              {
+                data: { type: null, len: null, value: 'body' },
+                id: 4,
+                img: null,
+                required: 0,
+                title: null,
+                video: null,
+              },
+              {
+                data: { type: null, len: null, value: 'cta' },
+                id: 1,
+                img: null,
+                required: 0,
+                title: null,
+                video: null,
+              },
+              {
+                data: { type: null, len: null, value: 'sponsoredBy' },
+                id: 5,
+                img: null,
+                required: 0,
+                title: null,
+                video: null,
+              },
+            ],
+            link: { url: 'clickUrl', clicktrackers: ['clickTracker1', 'clickTracker2'] },
+            imptrackers: ['imptrackers url1', 'imptrackers url2'],
+            jstracker: 'jstracker',
+          },
+        },
+      ];
+      const serverResponse = {
+        body: {
+          id: null,
+          bidid: null,
+          seatbid: [{ bid }],
+          cur: 'USD',
+        },
+      };
+      let bidRequest = {
+        data: {},
+        bids: [{ bidId: 'bidId1' }],
+      };
+
+      const result = spec.interpretResponse(serverResponse, bidRequest)[0].native;
+      const native = bid[0].native;
+      const assets = native.assets;
+      assert.deepEqual(
+        {
+          clickUrl: native.link.url,
+          clickTrackers: native.link.clicktrackers,
+          impressionTrackers: native.imptrackers,
+          javascriptTrackers: [native.jstracker],
+          title: assets[0].title.text,
+          icon: { url: assets[1].img.url, width: assets[1].img.w, height: assets[1].img.h },
+          image: { url: assets[2].img.url, width: assets[2].img.w, height: assets[2].img.h },
+          body: assets[3].data.value,
+          cta: assets[4].data.value,
+          sponsoredBy: assets[5].data.value,
+        },
+        result
+      );
+    });
+    it('should return empty when there is no bids in response', () => {
+      const serverResponse = {
+        body: {
+          id: null,
+          bidid: null,
+          seatbid: [{ bid: [] }],
+          cur: 'USD',
+        },
+      };
+      let bidRequest = {
+        data: {},
+        bids: [{ bidId: 'bidId1' }],
+      };
+      const result = spec.interpretResponse(serverResponse, bidRequest)[0];
+      assert.ok(!result);
+    });
+
+    describe('banner', () => {
+      it('should set ad content on response', () => {
+        let serverResponse = {
+          body: {
+            seatbid: [
+              {
+                bid: [{ impid: '1', adm: '<banner>', ext: { prebid: { type: 'banner' } } }],
+              },
+            ],
+          },
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { smartadId: 1234 },
+            },
+          ],
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].ad, '<banner>');
+        assert.equal(bids[0].mediaType, 'banner');
+        assert.equal(bids[0].meta.mediaType, 'banner');
+      });
+    });
+
+    describe('video', () => {
+      it('should set vastXml on response', () => {
+        let serverResponse = {
+          body: {
+            seatbid: [
+              {
+                bid: [{ impid: '1', adm: '<vast>', ext: { prebid: { type: 'video' } } }],
+              },
+            ],
+          },
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { smartadId: 1234 },
+            },
+          ],
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].vastXml, '<vast>');
+        assert.equal(bids[0].mediaType, 'video');
+        assert.equal(bids[0].meta.mediaType, 'video');
+      });
+
+      it('should add renderer for outstream bids', () => {
+        let serverResponse = {
+          body: {
+            seatbid: [
+              {
+                bid: [
+                  { impid: '1', adm: '<vast>', ext: { prebid: { type: 'video' } } },
+                  { impid: '2', adm: '<vast>', ext: { prebid: { type: 'video' } } },
+                ],
+              },
+            ],
+          },
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { smartadId: 1234 },
+              mediaTypes: {
+                video: {
+                  context: 'outstream',
+                },
+              },
+            },
+            {
+              bidId: 'bidId2',
+              params: { smartadId: 1234 },
+              mediaTypes: {
+                video: {
+                  constext: 'instream',
+                },
+              },
+            },
+          ],
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.ok(bids[0].renderer);
+        assert.equal(bids[1].renderer, undefined);
+      });
+    });
+  });
+
+  describe('UserSyncs', () => {
+    let usersyncIframeUrl = 'https://www-prebid.dianomi.com/prebid/usersync/index.html?';
+    let usersyncRedirectUrl = 'https://data.dianomi.com/frontend/usync?';
+    it('should register the usersync iframe', function () {
+      let syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+      });
+
+      expect(syncs).to.deep.equal({ type: 'iframe', url: usersyncIframeUrl });
+    });
+
+    it('should register the usersync redirect', function () {
+      let syncs = spec.getUserSyncs({
+        pixelEnabled: true,
+      });
+
+      expect(syncs).to.deep.equal({ type: 'image', url: usersyncRedirectUrl });
+    });
+
+    it('should pass gdpr params if consent is true', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr=1&gdpr_consent=foo`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr=1&gdpr_consent=foo`,
+      });
+    });
+
+    it('should pass gdpr params if consent is false', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            gdprApplies: false,
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr=0&gdpr_consent=foo`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            gdprApplies: false,
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr=0&gdpr_consent=foo`,
+      });
+    });
+
+    it('should pass gdpr param gdpr_consent only when gdprApplies is undefined', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr_consent=foo`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr_consent=foo`,
+      });
+    });
+
+    it('should pass no params if gdpr consentString is not defined', function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {})).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {})).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass no params if gdpr consentString is a number', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: 0,
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: 0,
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass no params if gdpr consentString is null', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: null,
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: null,
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass no params if gdpr consentString is a object', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: {},
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: {},
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass no params if gdpr is not defined', function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined)).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined)).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass us_privacy if uspConsent is defined', function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, '1NYN')).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}us_privacy=1NYN`,
+      });
+
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, '1NYN')).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}us_privacy=1NYN`,
+      });
+    });
+
+    it('should pass us_privacy after gdpr if both are present', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: 'foo',
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr_consent=foo&us_privacy=1NYN`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: 'foo',
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr_consent=foo&us_privacy=1NYN`,
+      });
+    });
+
+    it('should pass gdprApplies', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr=1&us_privacy=1NYN`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr=1&us_privacy=1NYN`,
+      });
+    });
+
+    it('should pass all correctly', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+            consentString: 'foo',
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr=1&gdpr_consent=foo&us_privacy=1NYN`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+            consentString: 'foo',
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr=1&gdpr_consent=foo&us_privacy=1NYN`,
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/digitrustIdSystem_spec.js b/test/spec/modules/digitrustIdSystem_spec.js
deleted file mode 100644
index befd6eb75b6..00000000000
--- a/test/spec/modules/digitrustIdSystem_spec.js
+++ /dev/null
@@ -1,131 +0,0 @@
-import {
-  digiTrustIdSubmodule,
-  surfaceTestHook
-} from 'modules/digiTrustIdSystem.js';
-
-let assert = require('chai').assert;
-let expect = require('chai').expect;
-var testHook = null;
-
-/**
-* A mock implementation of IAB Consent Provider
-*/
-function mockCmp(command, version, callback, parameter) {
-  var resultVal;
-  if (command == 'ping') {
-    resultVal = {
-      gdprAppliesGlobally: mockCmp.stubSettings.isGlobal
-    };
-    callback(resultVal);
-  } else if (command == 'getVendorConsents') {
-    let cbResult = {
-      vendorConsents: []
-    }
-    cbResult.vendorConsents[version] = mockCmp.stubSettings.consents;
-    callback(cbResult);
-  }
-}
-
-mockCmp.stubSettings = {
-  isGlobal: false,
-  consents: true
-};
-
-function setupCmpMock(isGlobal, consents) {
-  window.__cmp = mockCmp;
-  mockCmp.stubSettings.isGlobal = isGlobal;
-  mockCmp.stubSettings.consents = consents;
-}
-
-describe('DigiTrust Id System', function () {
-  it('Should create the test hook', function (done) {
-    testHook = surfaceTestHook();
-    assert.isNotNull(testHook, 'The test hook failed to surface');
-    var conf = {
-      init: {
-        member: 'unit_test',
-        site: 'foo'
-      },
-      callback: function (result) {
-      }
-    };
-    testHook.initDigitrustFacade(conf);
-    window.DigiTrust.getUser(conf);
-    expect(window.DigiTrust).to.exist;
-    expect(window.DigiTrust.isMock).to.be.true;
-    done();
-  });
-
-  it('Should report as client', function (done) {
-    delete window.DigiTrust;
-    testHook = surfaceTestHook();
-
-    var conf = {
-      init: {
-        member: 'unit_test',
-        site: 'foo'
-      },
-      callback: function (result) {
-        expect(window.DigiTrust).to.exist;
-        expect(result).to.exist;
-        expect(window.DigiTrust.isMock).to.be.true;
-      }
-    };
-    testHook.initDigitrustFacade(conf);
-    expect(window.DigiTrust).to.exist;
-    expect(window.DigiTrust.isClient).to.be.true;
-    done();
-  });
-
-  it('Should allow consent when given', function (done) {
-    testHook = surfaceTestHook();
-    setupCmpMock(true, true);
-    var handler = function(result) {
-      expect(result).to.be.true;
-      done();
-    }
-
-    testHook.gdpr.hasConsent(null, handler);
-  });
-
-  it('Should consent if does not apply', function (done) {
-    testHook = surfaceTestHook();
-    setupCmpMock(false, true);
-    var handler = function (result) {
-      expect(result).to.be.true;
-      done();
-    }
-
-    testHook.gdpr.hasConsent(null, handler);
-  });
-
-  it('Should not allow consent when not given', function (done) {
-    testHook = surfaceTestHook();
-    setupCmpMock(true, false);
-    var handler = function (result) {
-      expect(result).to.be.false;
-      done();
-    }
-
-    testHook.gdpr.hasConsent(null, handler);
-  });
-  it('Should deny consent if timeout', function (done) {
-    window.__cmp = function () { };
-    var handler = function (result) {
-      expect(result).to.be.false;
-      done();
-    }
-
-    testHook.gdpr.hasConsent({ consentTimeout: 1 }, handler);
-  });
-  it('Should pass consent test if cmp not present', function (done) {
-    delete window.__cmp
-    testHook = surfaceTestHook();
-    var handler = function (result) {
-      expect(result).to.be.true;
-      done();
-    }
-
-    testHook.gdpr.hasConsent(null, handler);
-  });
-});
diff --git a/test/spec/modules/discoveryBidAdapter_spec.js b/test/spec/modules/discoveryBidAdapter_spec.js
new file mode 100644
index 00000000000..078add73046
--- /dev/null
+++ b/test/spec/modules/discoveryBidAdapter_spec.js
@@ -0,0 +1,93 @@
+import { expect } from 'chai';
+import { spec } from 'modules/discoveryBidAdapter.js';
+
+describe('discovery:BidAdapterTests', function () {
+  let bidRequestData = {
+    bidderCode: 'discovery',
+    auctionId: 'ff66e39e-4075-4d18-9854-56fde9b879ac',
+    bidderRequestId: '4fec04e87ad785',
+    bids: [
+      {
+        bidder: 'discovery',
+        params: {
+          token: 'd0f4902b616cc5c38cbe0a08676d0ed9',
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        adUnitCode: 'regular_iframe',
+        transactionId: 'd163f9e2-7ecd-4c2c-a3bd-28ceb52a60ee',
+        sizes: [[300, 250]],
+        bidId: '276092a19e05eb',
+        bidderRequestId: '1fadae168708b',
+        auctionId: 'ff66e39e-4075-4d18-9854-56fde9b879ac',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+      },
+    ],
+  };
+  let request = [];
+
+  it('discovery:validate_pub_params', function () {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'discovery',
+        params: {
+          token: ['d0f4902b616cc5c38cbe0a08676d0ed9'],
+          tagid: ['test_tagid'],
+          publisher: ['test_publisher']
+        },
+      })
+    ).to.equal(true);
+  });
+
+  it('discovery:validate_generated_params', function () {
+    request = spec.buildRequests(bidRequestData.bids, bidRequestData);
+    let req_data = JSON.parse(request.data);
+    expect(req_data.imp).to.have.lengthOf(1);
+  });
+
+  it('discovery:validate_response_params', function () {
+    let tempAdm = '<link rel=\"stylesheet\" href=\"https://cdn.mediago.io/js/style/style_banner_336x280_standard.css\"><div id=\"mgcontainer-e1746bcc817beaba9d63bd4254aad533\" class=\"mediago-placement_46ee9c c336x280_standard_46ee9c mediago-placement c336x280_standard\" style=\"width:336px;height:280px;overflow:hidden\"><a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-placement-top_46ee9c mediago-placement-top\" style=\"background-image:url(https://d2cli4kgl5uxre.cloudfront.net/ML/d8e9b4aa20fae1739d2aad8c926d3f15__scv1__306x304.png)\"></div></a><div class=\"mediago-placement-bottom_46ee9c mediago-placement-bottom\"><div class=\"mediago-middle_46ee9c mediago-middle\"><a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-title_46ee9c mediago-title\">秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた</div></a><div style=\"margin-top:10px;\"><a class=\"mediago-ad-icon_46ee9c mediago-ad-icon\" title=\"ad\" href=\"//www.mediago.io/privacy\" target=\"_blank\">AD</a> <a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-brand-name_46ee9c mediago-brand-name\">Factable</div></a></div></div></div></div>'
+    tempAdm += '%3Cscr';
+    tempAdm += 'ipt%3E';
+    tempAdm += '!function(){\"use strict\";function f(t){return(f=\"function\"==typeof Symbol&&\"symbol\"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&\"function\"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?\"symbol\":typeof t})(t)}function l(t){var e=0<arguments.length&&void 0!==t?t:{};try{e.random_t=(new Date).getTime(),g(function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:\"\";if(\"object\"!==f(t))return e;var n=function(t){for(var e,n=[],o=0,i=Object.keys(t);o<i.length;o++)e=i[o],n.push(\"\".concat(e,\"=\").concat(t[e]));return n}(t).join(\"&\"),o=e.indexOf(\"#\"),i=e,t=\"\";return-1!==o&&(i=e.slice(0,o),t=e.slice(o)),n&&(i&&-1!==i.indexOf(\"?\")?i+=\"&\"+n:i+=\"?\"+n),i+t}(e,\"https://trace.mediago.io/api/log/track\"))}catch(e){}}function g(t,e,n){(t=t?t.split(\";;;\"):[]).map(function(t){try{0<=t.indexOf(\"/api/bidder/track\")&&n&&(t+=\"&inIframe=\".concat(!(!self.frameElement||\"IFRAME\"!=self.frameElement.tagName)||window.frames.length!=parent.frames.length||self!=top),t+=\"&pos_x=\".concat(n.left,\"&pos_y=\").concat(n.top,\"&page_w=\").concat(n.page_width,\"&page_h=\").concat(n.page_height))}catch(t){l({tn:p,winloss:1,fe:2,pos_err_c:1002,pos_err_m:t.toString()})}var e=new Image;e.src=t,e.style.display=\"none\",e.style.visibility=\"hidden\",e.width=0,e.height=0,document.body.appendChild(e)})}var d=[\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=101&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&de=infoseek.co.jp&iv=0\",\"${ITRACKER2}\",\"${ITRACKER3}\",\"${ITRACKER4}\",\"${ITRACKER5}\",\"${ITRACKER6}\"],u=[\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=104&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&sid=38__149__12__24__144__163__47__1__99&format=&crid=d8e9b4aa20fae1739d2aad8c926d3f15&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&de=infoseek.co.jp&iv=0\",\"${VTRACKER2}\",\"${VTRACKER3}\",\"${VTRACKER4}\",\"${VTRACKER5}\",\"${VTRACKER6}\"],p=\"f9f2b1ef23fe2759c2cad0953029a94b\",n=document.getElementById(\"mgcontainer-e1746bcc817beaba9d63bd4254aad533\");n&&function(){var a=n.getElementsByClassName(\"mediago-placement-track\");if(a&&a.length){var t,e=function(t){var e,n,o,i,c,r;\"object\"===f(r=a[t])&&(e=function(t){try{var e=t.getBoundingClientRect(),n=e&&e.top||-1,o=e&&e.left||-1,i=document.body.scrollWidth||-1,c=document.body.scrollHeight||-1;return{top:n.toFixed(0),left:o.toFixed(0),page_width:i,page_height:c}}catch(t){return l({tn:p,winloss:1,fe:2,pos_err_c:1001,pos_err_m:t.toString()}),{top:\"-1\",left:\"-1\",page_width:\"-1\",page_height:\"-1\"}}}(r),(n=d[t])&&g(n,0,e),o=u[t],c=!(i=function(){o&&g(o)}),function n(){setTimeout(function(){var t,e;!c&&(t=r,e=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight,(t.getBoundingClientRect()&&t.getBoundingClientRect().top)<=e-.75*(t.offsetHeight||t.clientHeight))?(c=!0,i()):n()},500)}())};for(t in a)e(t)}}()}();'
+    let serverResponse = {
+      body: {
+        id: 'pp_hbjs_2405029787417735524',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '3f6700b5e61e1476bed629b6ea6c7a4d',
+                impid: '1',
+                price: 0.2,
+                adm: tempAdm,
+                cid: '1366258',
+                adid: '373310507',
+                nurl: 'https://trace.mediago.cc/api/log/winnotice?tn=d0f4902b616cc5c38cbe0a08676d0ed9&winloss=1&id=3f6700b5e61e1476bed629b6ea6c7a4d&seat_id=${AUCTION_SEAT_ID}&currency=${AUCTION_CURRENCY}&bid_id=${AUCTION_BID_ID}&ad_id=${AUCTION_AD_ID}&loss=&imp_id=1&price=${AUCTION_PRICE}&test=0&time=1660811542&dp=wvO7WSz-cc9cIMKfTKLEV4Wxq2bmfn3b7m1-eCXRY1g&dsp_id=22&url=GDlAk_HBNSXBOzdKhhvt8xajglRd4lKSZa1p6n_jRygw27m5Zfp-B5yN7ofsn9N-9LkOtOK9HmnrRW-rhROSzRkQdNNrbPQDXeiO2eRi_gVHuZ0AXrxvU4hnGLTR8qeXxFVQkDpzI1_GRaZgcHjPXyhf_Thj5s6oTdKWCPj5Bui8R-ED5NNPv0KH8jhaA_LFXaaa89e8yoi04RX7ouASR_JB6LKofkZEpl2333zEMxl_FatV9NKzCWyZeYMR7m9VVRtkvNv-TUpN61y5cUGMVBfBHPe47sN773IM2Lys3iWP-p-dY1sE0bMrgEFiXHL_E5Y2kydBncLHV9cjzLsjnDtHUd5ourda_bzVApcQYtJn58m_3-_hz_04vjAqLuL1A4dVlorZq65NCWzR6vTN-xemSRp1D4ZQAR2nRU3YVNyubFAeSFyBgUBEx2t8u76oKLz_luOXvFm1I81mRqI-HhDEg827PW51xmrJT9TpLU3i16ULlbcKfoKk3C4RrFLNsC8fLGWcqky0T7Ese0o2BMcGBVXBxlnbkvabzFN6h4Y0-vYDvVRWWm_G3YzfApqhCnTgcaGCDsyLIptJuX36N4GltCTBcpQvhprn5VA_kZop5G8uhHGOE2oJ8g4HyVF5N752EZMFSe5H6Wz2pvH2gmm0KpYOdcGR1PopuJ-M9NaneEl6_cKiCtizBUxdSnxa-WADwkTJ-WwnTP2acy4M0r9puv1rk6myLl32TFmcCgd-6BtT7m9QRZiVOhlvxfWIHbyNgdb-BZ0GHwiKOVd5jMDj4hsDWqNq4hEtBlKDDpYXbdgpB-mK3z24wS_VgsgB1vnMw0yLekWK5_yDqqb_n8VEV6N7LLHyb-Ry5X-0EyRQw-IlXLjjfC7MqZwfMCTTElx2lt9Xd1DYbWM43q2EVEI0j6Vn8pITBBIfg-ygthG26htPBxgIDh8qXQaTkbldLyX_don-BYhs7U3TPv9u2FYE6ACLjvo9iUnMj_8MSD4&sp=wvO7WSz-cc9cIMKfTKLEV4Wxq2bmfn3b7m1-eCXRY1g',
+                w: 300,
+                h: 250,
+              },
+            ],
+          },
+        ],
+        cur: 'USD',
+      },
+    };
+
+    let bids = spec.interpretResponse(serverResponse);
+
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+    expect(bid.creativeId).to.equal('1366258');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
+  });
+});
diff --git a/test/spec/modules/displayioBidAdapter_spec.js b/test/spec/modules/displayioBidAdapter_spec.js
new file mode 100644
index 00000000000..56b8b85384b
--- /dev/null
+++ b/test/spec/modules/displayioBidAdapter_spec.js
@@ -0,0 +1,203 @@
+import {spec} from 'modules/displayioBidAdapter.js'
+import {BANNER} from '/src/mediaTypes'
+
+describe('Displayio adapter', function () {
+  const BIDDER = 'displayio'
+  const bidRequests = [{
+    bidId: 'bidId_001',
+    bidder: BIDDER,
+    adUnitCode: 'adUnit_001',
+    auctionId: 'auctionId_001',
+    bidderRequestId: 'bidderRequestId_001',
+    mediaTypes: {
+      banner: {
+        sizes: [[320, 480]]
+      }
+    },
+    params: {
+      siteId: 1,
+      placementId: 1,
+      adsSrvDomain: 'adsSrvDomain',
+      cdnDomain: 'cdnDomain',
+    }
+  }]
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'testprebid.com'
+    }
+  }
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function() {
+      const validBid = spec.isBidRequestValid(bidRequests[0])
+      expect(validBid).to.be.true
+    })
+
+    const bidRequestsNoParams = [{
+      bidder: BIDDER,
+    }]
+    it('should not validate without params', function () {
+      const request = spec.isBidRequestValid(bidRequestsNoParams, bidderRequest)
+      expect(request).to.be.false
+    })
+
+    const noSiteId = {
+      bidder: BIDDER,
+      params: {
+        placementId: 1,
+        adsSrvDomain: 'adsSrvDomain',
+        cdnDomain: 'cdnDomain',
+      }
+    }
+    it('should not validate without siteId', function() {
+      const invalidBid = spec.isBidRequestValid(noSiteId)
+      expect(invalidBid).to.be.false
+    })
+
+    const noPlacementId = {
+      bidder: BIDDER,
+      params: {
+        siteId: 1,
+        adsSrvDomain: 'adsSrvDomain',
+        cdnDomain: 'cdnDomain',
+      }
+    }
+    it('should not validate without placementId', function() {
+      const invalidBid = spec.isBidRequestValid(noPlacementId)
+      expect(invalidBid).to.be.false
+    })
+
+    const noAdsSrvDomain = {
+      bidder: BIDDER,
+      params: {
+        siteId: 1,
+        placementId: 1,
+        cdnDomain: 'cdnDomain',
+      }
+    }
+    it('should not validate without adsSrvDomain', function() {
+      const invalidBid = spec.isBidRequestValid(noAdsSrvDomain)
+      expect(invalidBid).to.be.false
+    })
+
+    const noCdnDomain = {
+      bidder: BIDDER,
+      params: {
+        siteId: 1,
+        placementId: 1,
+        adsSrvDomain: 'adsSrvDomain',
+      }
+    }
+    it('should not validate without cdnDomain', function() {
+      const invalidBid = spec.isBidRequestValid(noCdnDomain)
+      expect(invalidBid).to.be.false
+    })
+  })
+
+  describe('buildRequests', function () {
+    it('should build request', function() {
+      const request = spec.buildRequests(bidRequests, bidderRequest)
+      expect(request).to.not.be.empty
+    })
+
+    it('sends bid request to the endpoint via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)
+      expect(request[0].method).to.equal('POST')
+    })
+
+    it('sends all bid parameters', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)
+      expect(request[0]).to.have.keys(['headers', 'data', 'method', 'url'])
+    })
+
+    it('should not crash when there is no media types', function () {
+      const bidRequestsNoMediaTypes = [{
+        bidder: BIDDER,
+        params: {
+          siteId: 1,
+          placementId: 1,
+          adsSrvDomain: 'adsSrvDomain',
+          cdnDomain: 'cdnDomain',
+        }
+      }]
+      const request = spec.buildRequests(bidRequestsNoMediaTypes, bidderRequest)
+      expect(request[0]).to.have.keys(['headers', 'data', 'method', 'url'])
+    })
+  })
+
+  describe('interpretResponse', function () {
+    const response = {
+      body: {
+        status: 'ok',
+        data: {
+          ads: [{
+            ad: {
+              data: {
+                id: '001',
+                ecpm: 100,
+                w: 32,
+                h: 480,
+                markup: 'test ad'
+              }
+            },
+            subtype: 'html'
+          }],
+        }
+      }
+    }
+    const serverRequest = {
+      data: {
+        data: {
+          id: 'id_001',
+          adUnitCode: 'test-div',
+          renderURL: 'testprebid.com/render.js',
+          data: {
+            ref: 'testprebid.com'
+          }
+        }
+      }
+    }
+
+    let ir = spec.interpretResponse(response, serverRequest)
+
+    expect(ir.length).to.equal(1)
+
+    ir = ir[0]
+
+    it('should have requestId', function() {
+      expect(ir.requestId).to.be.a('string')
+    })
+
+    it('should have cpm', function() {
+      expect(ir.cpm).to.be.a('number')
+    })
+
+    it('should have width', function() {
+      expect(ir.width).to.be.a('number')
+    })
+
+    it('should have height', function() {
+      expect(ir.height).to.be.a('number')
+    })
+
+    it('should have creativeId', function() {
+      expect(ir.creativeId).to.be.a('number')
+    })
+
+    it('should have ad', function() {
+      expect(ir.ad).to.be.a('string')
+    })
+
+    it('should have mediaType', function() {
+      expect(ir.mediaType).to.be.equal(BANNER)
+    })
+
+    it('should have adUnitCode', function() {
+      expect(ir.adUnitCode).to.be.a('string')
+    })
+
+    it('should have renderURL', function() {
+      expect(ir.renderURL).to.be.a('string')
+    })
+  })
+})
diff --git a/test/spec/modules/districtmDmxBidAdapter_spec.js b/test/spec/modules/districtmDmxBidAdapter_spec.js
deleted file mode 100644
index d8f0beb9a36..00000000000
--- a/test/spec/modules/districtmDmxBidAdapter_spec.js
+++ /dev/null
@@ -1,659 +0,0 @@
-import {expect} from 'chai';
-import * as _ from 'lodash';
-import {spec, matchRequest, checkDeepArray, defaultSize, upto5, cleanSizes, shuffle} from '../../../modules/districtmDMXBidAdapter.js';
-
-const supportedSize = [
-  {
-    size: [300, 250],
-    s: 100
-  },
-  {
-    size: [728, 90],
-    s: 95
-  },
-  {
-    size: [300, 600],
-    s: 90
-  },
-  {
-    size: [160, 600],
-    s: 88
-  },
-  {
-    size: [320, 50],
-    s: 85
-  },
-  {
-    size: [300, 50],
-    s: 80
-  },
-  {
-    size: [970, 250],
-    s: 75
-  },
-  {
-    size: [970, 90],
-    s: 60
-  },
-];
-const bidRequest = [{
-  'bidder': 'districtmDMX',
-  'params': {
-    'dmxid': 100001,
-    'memberid': 100003,
-  },
-  'adUnitCode': 'div-gpt-ad-12345678-1',
-  'transactionId': 'f6d13fa6-ebc1-41ac-9afa-d8171d22d2c2',
-  'sizes': [
-    [300, 250],
-    [300, 600]
-  ],
-  'bidId': '29a28a1bbc8a8d',
-  'bidderRequestId': '124b579a136515',
-  'auctionId': '3d62f2d3-56a2-4991-888e-f7754619ddcf'
-}];
-
-const bidRequestNoCoppa = [{
-  'bidder': 'districtmDMX',
-  'params': {
-    'dmxid': 100001,
-    'memberid': 100003
-  },
-  'adUnitCode': 'div-gpt-ad-12345678-1',
-  'transactionId': 'f6d13fa6-ebc1-41ac-9afa-d8171d22d2c2',
-  'sizes': [
-    [300, 250],
-    [300, 600]
-  ],
-  'bidId': '29a28a1bbc8a8d',
-  'bidderRequestId': '124b579a136515',
-  'auctionId': '3d62f2d3-56a2-4991-888e-f7754619ddcf'
-}];
-const bidderRequest = {
-  'bidderCode': 'districtmDMX',
-  'auctionId': '3d62f2d3-56a2-4991-888e-f7754619ddcf',
-  'bidderRequestId': '124b579a136515',
-  'bids': [{
-    'bidder': 'districtmDMX',
-    'params': {
-      'dmxid': 100001,
-      'memberid': 100003,
-    },
-    'adUnitCode': 'div-gpt-ad-12345678-1',
-    'transactionId': 'f6d13fa6-ebc1-41ac-9afa-d8171d22d2c2',
-    'sizes': [
-      [300, 250],
-      [300, 600]
-    ],
-    'bidId': '29a28a1bbc8a8d',
-    'bidderRequestId': '124b579a136515',
-    'auctionId': '3d62f2d3-56a2-4991-888e-f7754619ddcf'
-  }],
-  'auctionStart': 1529511035677,
-  'timeout': 700,
-  'uspConsent': '1NY',
-  'gdprConsent': {
-    'consentString': 'BOPqNzUOPqNzUAHABBAAA5AAAAAAAA',
-    'vendorData': {
-      'metadata': 'BOPqNzUOPqNzUAHABBAAA5AAAAAAAA',
-      'hasGlobalScope': false,
-      'gdprApplies': true,
-      'purposeConsents': {
-        '1': false,
-        '2': false,
-        '3': false,
-        '4': false,
-        '5': false
-      },
-      'vendorConsents': {
-        '1': false,
-        '2': false,
-        '3': false,
-        '4': false,
-        '6': false,
-        '7': false,
-        '8': false,
-        '9': false,
-        '10': false,
-        '11': false,
-        '12': false,
-        '13': false,
-        '14': false,
-        '15': false,
-        '16': false,
-        '17': false,
-        '18': false,
-        '19': false,
-        '20': false,
-        '21': false,
-        '22': false,
-        '23': false,
-        '24': false,
-        '25': false,
-        '26': false,
-        '27': false,
-        '28': false,
-        '29': false,
-        '30': false,
-        '31': false,
-        '32': false,
-        '33': false,
-        '34': false,
-        '35': false,
-        '36': false,
-        '37': false,
-        '38': false,
-        '39': false,
-        '40': false,
-        '41': false,
-        '42': false,
-        '43': false,
-        '44': false,
-        '45': false,
-        '46': false,
-        '47': false,
-        '48': false,
-        '49': false,
-        '50': false,
-        '51': false,
-        '52': false,
-        '53': false,
-        '55': false,
-        '56': false,
-        '57': false,
-        '58': false,
-        '59': false,
-        '60': false,
-        '61': false,
-        '62': false,
-        '63': false,
-        '64': false,
-        '65': false,
-        '66': false,
-        '67': false,
-        '68': false,
-        '69': false,
-        '70': false,
-        '71': false,
-        '72': false,
-        '73': false,
-        '74': false,
-        '75': false,
-        '76': false,
-        '77': false,
-        '78': false,
-        '79': false,
-        '80': false,
-        '81': false,
-        '82': false,
-        '83': false,
-        '84': false,
-        '85': false,
-        '86': false,
-        '87': false,
-        '88': false,
-        '89': false,
-        '90': false,
-        '91': false,
-        '92': false,
-        '93': false,
-        '94': false,
-        '95': false,
-        '97': false,
-        '98': false,
-        '100': false,
-        '101': false,
-        '102': false,
-        '104': false,
-        '105': false,
-        '108': false,
-        '109': false,
-        '110': false,
-        '111': false,
-        '112': false,
-        '113': false,
-        '114': false,
-        '115': false,
-        '119': false,
-        '120': false,
-        '122': false,
-        '124': false,
-        '125': false,
-        '126': false,
-        '127': false,
-        '128': false,
-        '129': false,
-        '130': false,
-        '131': false,
-        '132': false,
-        '133': false,
-        '134': false,
-        '136': false,
-        '138': false,
-        '139': false,
-        '140': false,
-        '141': false,
-        '142': false,
-        '143': false,
-        '144': false,
-        '145': false,
-        '147': false,
-        '148': false,
-        '149': false,
-        '150': false,
-        '151': false,
-        '152': false,
-        '153': false,
-        '154': false,
-        '155': false,
-        '156': false,
-        '157': false,
-        '158': false,
-        '159': false,
-        '160': false,
-        '161': false,
-        '162': false,
-        '163': false,
-        '164': false,
-        '165': false,
-        '167': false,
-        '168': false,
-        '169': false,
-        '170': false,
-        '171': false,
-        '173': false,
-        '174': false,
-        '175': false,
-        '177': false,
-        '178': false,
-        '179': false,
-        '180': false,
-        '182': false,
-        '183': false,
-        '184': false,
-        '185': false,
-        '188': false,
-        '189': false,
-        '190': false,
-        '191': false,
-        '192': false,
-        '193': false,
-        '194': false,
-        '195': false,
-        '197': false,
-        '198': false,
-        '199': false,
-        '200': false,
-        '201': false,
-        '202': false,
-        '203': false,
-        '205': false,
-        '206': false,
-        '208': false,
-        '209': false,
-        '210': false,
-        '211': false,
-        '212': false,
-        '213': false,
-        '214': false,
-        '215': false,
-        '216': false,
-        '217': false,
-        '218': false,
-        '223': false,
-        '224': false,
-        '225': false,
-        '226': false,
-        '227': false,
-        '228': false,
-        '229': false,
-        '230': false,
-        '231': false,
-        '232': false,
-        '234': false,
-        '235': false,
-        '236': false,
-        '237': false,
-        '238': false,
-        '239': false,
-        '240': false,
-        '241': false,
-        '242': false,
-        '244': false,
-        '245': false,
-        '246': false,
-        '248': false,
-        '249': false,
-        '250': false,
-        '251': false,
-        '252': false,
-        '253': false,
-        '254': false,
-        '255': false,
-        '256': false,
-        '257': false,
-        '258': false,
-        '259': false,
-        '260': false,
-        '261': false,
-        '262': false,
-        '263': false,
-        '264': false,
-        '265': false,
-        '266': false,
-        '269': false,
-        '270': false,
-        '272': false,
-        '273': false,
-        '274': false,
-        '275': false,
-        '276': false,
-        '277': false,
-        '278': false,
-        '279': false,
-        '280': false,
-        '281': false,
-        '282': false,
-        '284': false,
-        '285': false,
-        '288': false,
-        '289': false,
-        '290': false,
-        '291': false,
-        '294': false,
-        '295': false,
-        '297': false,
-        '299': false,
-        '301': false,
-        '302': false,
-        '303': false,
-        '304': false,
-        '308': false,
-        '309': false,
-        '310': false,
-        '311': false,
-        '312': false,
-        '314': false,
-        '315': false,
-        '316': false,
-        '317': false,
-        '318': false,
-        '319': false,
-        '320': false,
-        '323': false,
-        '325': false,
-        '326': false,
-        '328': false,
-        '329': false,
-        '330': false,
-        '331': false,
-        '333': false,
-        '337': false,
-        '339': false,
-        '341': false,
-        '343': false,
-        '344': false,
-        '345': false,
-        '347': false,
-        '349': false,
-        '350': false,
-        '351': false,
-        '354': false,
-        '358': false,
-        '359': false,
-        '360': false,
-        '361': false,
-        '368': false,
-        '369': false,
-        '371': false,
-        '373': false,
-        '376': false,
-        '377': false,
-        '378': false,
-        '380': false,
-        '382': false,
-        '384': false,
-        '385': false,
-        '387': false,
-        '388': false,
-        '389': false,
-        '390': false,
-        '391': false,
-        '398': false,
-        '400': false,
-        '402': false,
-        '403': false,
-        '404': false,
-        '413': false,
-        '415': false,
-        '421': false,
-        '422': false
-      }
-    },
-    'gdprApplies': true
-  },
-  'start': 1529511035686,
-  'doneCbCallCount': 0
-};
-
-const bidderRequestNoCoppa = {
-  'bidderCode': 'districtmDMX',
-  'auctionId': '3d62f2d3-56a2-4991-888e-f7754619ddcf',
-  'bidderRequestId': '124b579a136515',
-  'bids': [{
-    'bidder': 'districtmDMX',
-    'params': {
-      'dmxid': 100001,
-      'memberid': 100003,
-    },
-    'adUnitCode': 'div-gpt-ad-12345678-1',
-    'transactionId': 'f6d13fa6-ebc1-41ac-9afa-d8171d22d2c2',
-    'sizes': [
-      [300, 250],
-      [300, 600]
-    ],
-    'bidId': '29a28a1bbc8a8d',
-    'bidderRequestId': '124b579a136515',
-    'auctionId': '3d62f2d3-56a2-4991-888e-f7754619ddcf'
-  }],
-  'auctionStart': 1529511035677,
-  'timeout': 700,
-  'start': 1529511035686,
-  'doneCbCallCount': 0
-};
-
-const responses = {
-  'body': {
-    'id': '1f45b37c-5298-4934-b517-4d911aadabfd',
-    'cur': 'USD',
-    'seatbid': [{
-      'bid': [{
-        'id': '29a28a1bbc8a8d',
-        'impid': '29a28a1bbc8a8d',
-        'price': '6.42',
-        'adm': '<div style=\'width: 100px; height: 100px;\'><img src=\'https://placeholdit.imgix.net/~text?txtsize=33&txt=29a28a1bbc8a8d&w=300&h=600\'></div>'
-      }]
-    }]
-  },
-  'headers': {}
-};
-
-const responsesNegative = {
-  'body': {
-    'id': '1f45b37c-5298-4934-b517-4d911aadabfd',
-    'cur': 'USD',
-    'seatbid': [{
-      'bid': [{
-        'id': '29a28a1bbc8a8d',
-        'impid': '29a28a1bbc8a8d',
-        'price': '-0.10',
-        'adm': '<div style=\'width: 100px; height: 100px;\'><img src=\'https://placeholdit.imgix.net/~text?txtsize=33&txt=29a28a1bbc8a8d&w=300&h=600\'></div>'
-      }]
-    }]
-  },
-  'headers': {}
-};
-
-const emptyResponse = { body: {} };
-const emptyResponseSeatBid = { body: { seatbid: [] } };
-
-describe('DistrictM Adaptor', function () {
-  const districtm = spec;
-  describe('verification of upto5', function() {
-    it('upto5 function should always break 12 imps into 3 request same for 15', function() {
-      expect(upto5([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], bidRequest, bidderRequest, 'https://google').length).to.be.equal(3)
-      expect(upto5([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], bidRequest, bidderRequest, 'https://google').length).to.be.equal(3)
-    })
-  })
-  describe('All needed functions are available', function () {
-    it(`isBidRequestValid is present and type function`, function () {
-      expect(districtm.isBidRequestValid).to.exist.and.to.be.a('function')
-    });
-
-    it(`BuildRequests is present and type function`, function () {
-      expect(districtm.buildRequests).to.exist.and.to.be.a('function')
-    });
-
-    it(`interpretResponse is present and type function`, function () {
-      expect(districtm.interpretResponse).to.exist.and.to.be.a('function')
-    });
-
-    it(`getUserSyncs is present and type function`, function () {
-      expect(districtm.getUserSyncs).to.exist.and.to.be.a('function')
-    });
-  });
-
-  describe(`these properties are available or not`, function () {
-    it(`code should have a value of districtmDMX`, function () {
-      expect(districtm.code).to.be.equal('districtmDMX');
-    });
-
-    it(`timeout should not be defined`, function () {
-      expect(districtm.onTimeout).to.be.an('undefined');
-    });
-  });
-
-  describe(`isBidRequestValid test response`, function () {
-    let params = {
-      dmxid: 10001,
-      memberid: 10003,
-    };
-    it(`function should return true`, function () {
-      expect(districtm.isBidRequestValid({params})).to.be.equal(true);
-    });
-    it(`function should return false`, function () {
-      expect(districtm.isBidRequestValid({ params: { memberid: 12345 } })).to.be.equal(false);
-    });
-    it(`expect to have two property available dmxid and memberid`, function () {
-      expect(params).to.have.property('dmxid');
-      expect(params).to.have.property('memberid');
-    });
-  });
-
-  describe(`getUserSyncs test usage`, function () {
-    it(`return value should be an array`, function () {
-      expect(districtm.getUserSyncs({ iframeEnabled: true })).to.be.an('array');
-    });
-    it(`array should have only one object and it should have a property type = 'iframe'`, function () {
-      expect(districtm.getUserSyncs({ iframeEnabled: true }).length).to.be.equal(1);
-      let [userSync] = districtm.getUserSyncs({ iframeEnabled: true });
-      expect(userSync).to.have.property('type');
-      expect(userSync.type).to.be.equal('iframe');
-    });
-  });
-
-  describe(`buildRequests test usage`, function () {
-    const buildRequestResults = districtm.buildRequests(bidRequest, bidderRequest);
-    const buildRequestResultsNoCoppa = districtm.buildRequests(bidRequestNoCoppa, bidderRequestNoCoppa);
-    it(`the function should return an array`, function () {
-      expect(buildRequestResults).to.be.an('object');
-    });
-    it(`contain gdpr consent & ccpa`, function() {
-      const bidr = JSON.parse(buildRequestResults.data)
-      expect(bidr.regs.ext.gdpr).to.be.equal(1);
-      expect(bidr.regs.ext.us_privacy).to.be.equal('1NY');
-      expect(bidr.user.ext.consent).to.be.an('string');
-    });
-    it(`test contain COPPA`, function() {
-      const bidr = JSON.parse(buildRequestResults.data)
-      bidr.regs = bidr.regs || {};
-      bidr.regs.coppa = 1;
-      expect(bidr.regs.coppa).to.be.equal(1)
-    })
-    it(`test should not contain COPPA`, function() {
-      const bidr = JSON.parse(buildRequestResultsNoCoppa.data)
-      expect(bidr.regs.coppa).to.be.equal(0)
-    })
-    it(`the function should return array length of 1`, function () {
-      expect(buildRequestResults.data).to.be.a('string');
-    });
-  });
-
-  describe(`interpretResponse test usage`, function () {
-    const responseResults = districtm.interpretResponse(responses, {bidderRequest});
-    const emptyResponseResults = districtm.interpretResponse(emptyResponse, {bidderRequest});
-    const emptyResponseResultsNegation = districtm.interpretResponse(responsesNegative, {bidderRequest});
-    const emptyResponseResultsEmptySeat = districtm.interpretResponse(emptyResponseSeatBid, {bidderRequest});
-    it(`the function should return an array`, function () {
-      expect(responseResults).to.be.an('array');
-    });
-    it(`the function should return array length of 1`, function () {
-      expect(responseResults.length).to.be.equal(1);
-    });
-    it(`the response return nothing`, function () {
-      expect(emptyResponseResults.length).to.be.equal(0);
-    });
-    it(`the response seatbid return nothing`, function () {
-      expect(emptyResponseResultsEmptySeat.length).to.be.equal(0);
-    });
-
-    it(`on invalid CPM`, function () {
-      expect(emptyResponseResultsNegation.length).to.be.equal(0);
-    });
-  });
-
-  describe(`check validation for id sync gdpr ccpa`, () => {
-    let allin = spec.getUserSyncs({iframeEnabled: true}, {}, bidderRequest.gdprConsent, bidderRequest.uspConsent)[0]
-    let noCCPA = spec.getUserSyncs({iframeEnabled: true}, {}, bidderRequest.gdprConsent, null)[0]
-    let noGDPR = spec.getUserSyncs({iframeEnabled: true}, {}, null, bidderRequest.uspConsent)[0]
-    let nothing = spec.getUserSyncs({iframeEnabled: true}, {}, null, null)[0]
-
-    /*
-
-    'uspConsent': '1NY',
-  'gdprConsent': {
-    'consentString': 'BOPqNzUOPqNzUAHABBAAA5AAAAAAAA',
-     */
-    it(`gdpr & ccpa should be present`, () => {
-      expect(allin.url).to.be.equal('https://cdn.districtm.io/ids/index.html?gdpr=BOPqNzUOPqNzUAHABBAAA5AAAAAAAA&ccpa=1NY')
-    })
-    it(`ccpa should be present`, () => {
-      expect(noGDPR.url).to.be.equal('https://cdn.districtm.io/ids/index.html?ccpa=1NY')
-    })
-    it(`gdpr should be present`, () => {
-      expect(noCCPA.url).to.be.equal('https://cdn.districtm.io/ids/index.html?gdpr=BOPqNzUOPqNzUAHABBAAA5AAAAAAAA')
-    })
-    it(`gdpr & ccpa shouldn't be present`, () => {
-      expect(nothing.url).to.be.equal('https://cdn.districtm.io/ids/index.html')
-    })
-  })
-
-  describe(`Helper function testing`, function () {
-    const bid = matchRequest('29a28a1bbc8a8d', {bidderRequest});
-    const {width, height} = defaultSize(bid);
-    it(`test matchRequest`, function () {
-      expect(matchRequest('29a28a1bbc8a8d', {bidderRequest})).to.be.an('object');
-    });
-    it(`test checkDeepArray`, function () {
-      expect(_.isEqual(checkDeepArray([728, 90]), [728, 90])).to.be.equal(true);
-      expect(_.isEqual(checkDeepArray([[728, 90]]), [728, 90])).to.be.equal(true);
-      expect(_.isEqual(checkDeepArray([[728, 90], [300, 250]]), [728, 90])).to.be.equal(true);
-      expect(_.isEqual(checkDeepArray([[300, 250], [300, 250]]), [728, 90])).to.be.equal(false);
-      expect(_.isEqual(checkDeepArray([300, 250]), [300, 250])).to.be.equal(true);
-    });
-    it(`test defaultSize`, function () {
-      expect(width).to.be.equal(300);
-      expect(height).to.be.equal(250);
-    });
-  });
-});
diff --git a/test/spec/modules/distroscaleBidAdapter_spec.js b/test/spec/modules/distroscaleBidAdapter_spec.js
new file mode 100644
index 00000000000..e5a78bbad11
--- /dev/null
+++ b/test/spec/modules/distroscaleBidAdapter_spec.js
@@ -0,0 +1,213 @@
+import { expect } from 'chai';
+import { spec } from 'modules/distroscaleBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+describe('distroscaleBidAdapter', function() {
+  const DSNAME = 'distroscale';
+
+  describe('isBidRequestValid', function() {
+    it('with no param', function() {
+      expect(spec.isBidRequestValid({
+        bidder: DSNAME,
+        params: {}
+      })).to.equal(false);
+    });
+
+    it('with pubid param', function() {
+      expect(spec.isBidRequestValid({
+        bidder: DSNAME,
+        params: {
+          pubid: '12345'
+        }
+      })).to.equal(true);
+    });
+
+    it('with pubid and zoneid params', function() {
+      expect(spec.isBidRequestValid({
+        bidder: DSNAME,
+        params: {
+          pubid: '12345',
+          zoneid: '67890'
+        }
+      })).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function() {
+    const CONSENT_STRING = 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw';
+    const BID_REQUESTS = [{
+      'bidder': DSNAME,
+      'params': {
+        'pubid': '12345',
+        'zoneid': '67890'
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[970, 250], [300, 250]]
+        }
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': 'ca59932f-90f4-4dff-bed2-b90ffa2c2b6a',
+      'sizes': [[970, 250], [300, 250]],
+      'bidId': '20b96f0310083c',
+      'bidderRequestId': '1dd684edba2006',
+      'auctionId': '22ed3053-f76f-476c-a08e-dcda5862443d'
+    }];
+    const BIDDER_REQUEST = {
+      'bidderCode': DSNAME,
+      'auctionId': '22ed3053-f76f-476c-a08e-dcda5862443d',
+      'bidderRequestId': '1dd684edba2006',
+      'refererInfo': {
+        'referer': 'https://publisher.com/homepage.html',
+        'reachedTop': true,
+        'isAmp': false,
+        'numIframes': 0,
+        'stack': [
+          'https://publisher.com/homepage.html'
+        ],
+        'canonicalUrl': null
+      },
+      'gdprConsent': {
+        'consentString': CONSENT_STRING,
+        'gdprApplies': true
+      }
+    };
+
+    it('basic', function() {
+      const request = spec.buildRequests(BID_REQUESTS, BIDDER_REQUEST);
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.have.string('https://hb.jsrdn.com/hb?from=pbjs');
+      expect(request.bidderRequest).to.deep.equal(BIDDER_REQUEST);
+      expect(request.data).to.exist;
+      expect(request.data.id).to.be.a('string').that.is.not.empty;
+      expect(request.data.at).to.equal(1);
+      expect(request.data.cur).to.deep.equal(['USD']);
+      expect(request.data.device).to.exist;
+      expect(request.data.site).to.exist;
+      expect(request.data.user).to.exist;
+      expect(request.data.imp).to.be.an('array').that.is.not.empty;
+      expect(request.data.imp[0]).to.exist;
+      expect(request.data.imp[0].id).to.equal(BID_REQUESTS[0].bidId);
+      expect(request.data.imp[0].tagid).to.equal(BID_REQUESTS[0].params.zoneid || '');
+      expect(request.data.imp[0].secure).to.equal(1);
+      expect(request.data.imp[0].banner).to.exist;
+      expect(request.data.imp[0].banner.format).to.be.an('array').that.is.not.empty;
+      expect(request.data.imp[0].banner.format[0]).to.exist;
+      expect(request.data.imp[0].banner.format[0].w).to.equal(970);
+      expect(request.data.imp[0].banner.format[0].h).to.equal(250);
+      expect(request.data.imp[0].banner.w).to.equal(970);
+      expect(request.data.imp[0].banner.h).to.equal(250);
+      expect(request.data.imp[0].banner.pos).to.equal(0);
+      expect(request.data.imp[0].banner.topframe).to.be.oneOf([0, 1]);
+      expect(request.data.imp[0].ext).to.exist;
+      expect(request.data.imp[0].ext.pubid).to.equal(BID_REQUESTS[0].params.pubid);
+      expect(request.data.imp[0].ext.zoneid).to.equal(BID_REQUESTS[0].params.zoneid || '');
+    });
+
+    it('gdpr', function() {
+      const request = spec.buildRequests(BID_REQUESTS, BIDDER_REQUEST);
+      expect(request.data).to.exist;
+      expect(request.data.regs).to.exist;
+      expect(request.data.regs.gdpr).to.equal(1);
+      expect(request.data.user).to.exist;
+      expect(request.data.user.consent).to.equal(CONSENT_STRING);
+    });
+  });
+
+  describe('interpretResponse', function() {
+    const REQUEST = {
+      'method': 'POST',
+      'url': 'https://hb.jsrdn.com/hb?from=pbjs',
+      'data': '{"id":"1648161050749","at":1,"cur":["USD"],"site":{"page":"https://publisher.com/homepage.html","domain":"publisher.com"},"device":{"ua":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.83 Safari/537.36","js":1,"h":1200,"w":1920,"language":"en","dnt":0},"imp":[{"id":"20b96f0310083c","tagid":"67890","secure":1,"ext":{"pubid":"12345","zoneid":"67890"},"banner":{"pos":0,"w":970,"h":250,"topframe":1,"format":[{"w":970,"h":250}]}}],"user":{},"ext":{}}',
+      'bidderRequest': {
+        'bidderCode': DSNAME,
+        'auctionId': '22ed3053-f76f-476c-a08e-dcda5862443d',
+        'bidderRequestId': '1dd684edba2006',
+        'bids': [{
+          'bidder': DSNAME,
+          'params': {
+            'pubid': '12345',
+            'zoneid': '67890'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[970, 250], [300, 250]]
+            }
+          },
+          'adUnitCode': 'div-gpt-ad-1460505748561-0',
+          'transactionId': 'ca59932f-90f4-4dff-bed2-b90ffa2c2b6a',
+          'sizes': [[970, 250], [300, 250]],
+          'bidId': '20b96f0310083c',
+          'bidderRequestId': '1dd684edba2006',
+          'auctionId': '22ed3053-f76f-476c-a08e-dcda5862443d'
+        }],
+        'refererInfo': {
+          'referer': 'https://publisher.com/homepage.html',
+          'reachedTop': true,
+          'isAmp': false,
+          'numIframes': 0,
+          'stack': [
+            'https://publisher.com/homepage.html'
+          ],
+          'canonicalUrl': null
+        }
+      }
+    };
+    const RESPONSE = {
+      'body': {
+        'id': '1648161050749',
+        'seatbid': [{
+          'bid': [{
+            'id': '212f1c7b-378b-47e4-8294-ac38658b33f6_0',
+            'impid': '20b96f0310083c',
+            'price': 0.1,
+            'w': 970,
+            'h': 250,
+            'adm': "<div class='dsunit-test' id='20b96f0310083c' style='width:970px;height:250px;background-image:url(https://advertiser.dsp.com/creatives/aaaaaaaa-fa90-46ec-a0f9-1a898452ade3/banner.jpg);background-size:cover'></div>"
+          }]
+        }],
+        'cur': 'USD'
+      },
+      'headers': {}
+    };
+    const SAMPLE_PARSED = [{
+      'requestId': '20b96f0310083c',
+      'cpm': 0.1,
+      'currency': 'USD',
+      'width': 970,
+      'height': 250,
+      'creativeId': 'bbbbbbbb-648d-4e03-a5e2-7198bcd07cfe',
+      'netRevenue': true,
+      'ttl': 300,
+      'ad': "<div class='dsunit-test' id='2f0dfc70a1c251' style='width:970px;height:250px;background-image:url(https://dummyimage.com/970x250/444444/ffffff?text=Test%20Ad);background-size:cover'></div>",
+      'meta': {
+        'advertiserDomains': []
+      }
+    }];
+
+    it('valid bid response for banner ad', function() {
+      const result = spec.interpretResponse(RESPONSE, REQUEST);
+      const bid = RESPONSE.body.seatbid[0].bid[0];
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal(bid.impid);
+      expect(result[0].cpm).to.equal(Number(bid.price));
+      expect(result[0].currency).to.equal(RESPONSE.body.cur);
+      expect(result[0].width).to.equal(Number(bid.w));
+      expect(result[0].height).to.equal(Number(bid.h));
+      expect(result[0].creativeId).to.be.a('string').that.is.not.empty;
+      expect(result[0].netRevenue).to.equal(true);
+      expect(result[0].ttl).to.equal(300);
+      expect(result[0].ad).to.equal(bid.adm);
+      expect(result[0].meta).to.exist;
+      expect(result[0].meta.advertiserDomains).to.exist;
+    });
+
+    it('advertiserDomains is included when sent by server', function() {
+      const ADOMAIN = ['advertiser_adomain'];
+      let RESPONSE_CLONE = utils.deepClone(RESPONSE);
+      RESPONSE_CLONE.body.seatbid[0].bid[0].adomain = utils.deepClone(ADOMAIN); ;
+      let result = spec.interpretResponse(RESPONSE_CLONE, REQUEST);
+      expect(result[0].meta.advertiserDomains).to.deep.equal(ADOMAIN);
+    });
+  });
+});
diff --git a/test/spec/modules/djaxBidAdapter_spec.js b/test/spec/modules/djaxBidAdapter_spec.js
deleted file mode 100644
index bef2b1fddc5..00000000000
--- a/test/spec/modules/djaxBidAdapter_spec.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/djaxBidAdapter.js';
-
-const ENDPOINT = 'https://demo.reviveadservermod.com/headerbidding_adminshare/www/admin/plugins/Prebid/getAd.php';
-
-describe('The Djax bidding adapter', function () {
-  describe('isBidRequestValid', function () {
-    it('should return false when given an invalid bid', function () {
-      const bid = {
-        bidder: 'djax',
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(false);
-    });
-
-    it('should return true when given a publisherId in bid', function () {
-      const bid = {
-        bidder: 'djax',
-        params: {
-          publisherId: 2
-        },
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bidRequests = [{
-      'bidder': 'djax',
-      'params': {
-        'publisherId': 2
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250],
-        [300, 600]
-      ]
-    }];
-
-    const request = spec.buildRequests(bidRequests);
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('check endpoint url', function () {
-      expect(request.url).to.equal(ENDPOINT)
-    });
-
-    it('sets the proper banner object', function () {
-      expect(bidRequests[0].params.publisherId).to.equal(2);
-    })
-  });
-  const response = {
-    body: [
-      {
-        'requestId': '2ee937f15015c6',
-        'cpm': '0.2000',
-        'width': 300,
-        'height': 600,
-        'creativeId': '4',
-        'currency': 'USD',
-        'netRevenue': true,
-        'ad': 'ads.html',
-        'mediaType': 'banner'
-      },
-      {
-        'requestId': '3e1af92622bdc',
-        'cpm': '0.2000',
-        'creativeId': '4',
-        'context': 'outstream',
-        'currency': 'USD',
-        'netRevenue': true,
-        'vastUrl': 'tezt.xml',
-        'width': 640,
-        'height': 480,
-        'mediaType': 'video'
-      }]
-  };
-
-  const request = [
-    {
-      'bidder': 'djax',
-      'params': {
-        'publisherId': 2
-      },
-      'mediaTypes': {
-        'banner': {
-          'sizes': [
-            [300, 600]
-          ]
-        }
-      },
-      'bidId': '2ee937f15015c6',
-      'src': 'client',
-    },
-    {
-      'bidder': 'djax',
-      'params': {
-        'publisherId': 2
-      },
-      'mediaTypes': {
-        'video': {
-          'context': 'outstream',
-          'playerSize': [
-            [640, 480]
-          ]
-        }
-      },
-      'bidId': '3e1af92622bdc',
-      'src': 'client',
-    }
-  ];
-
-  describe('interpretResponse', function () {
-    it('return empty array when no ad found', function () {
-      const response = {};
-      const request = { bidRequests: [] };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('check response for banner and video', function () {
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(2);
-      expect(bids[0].requestId).to.equal('2ee937f15015c6');
-      expect(bids[0].cpm).to.equal('0.2000');
-      expect(bids[1].cpm).to.equal('0.2000');
-      expect(bids[0].width).to.equal(300);
-      expect(bids[0].height).to.equal(600);
-      expect(bids[1].vastUrl).to.not.equal('');
-      expect(bids[0].ad).to.not.equal('');
-      expect(bids[1].adResponse).to.not.equal('');
-      expect(bids[1].renderer).not.to.be.an('undefined');
-    });
-  });
-
-  describe('On winning bid', function () {
-    const bids = spec.interpretResponse(response, request);
-    spec.onBidWon(bids);
-  });
-
-  describe('On bid Time out', function () {
-    const bids = spec.interpretResponse(response, request);
-    spec.onTimeout(bids);
-  });
-
-  describe('user sync', function () {
-    it('to check the user sync iframe', function () {
-      let syncs = spec.getUserSyncs({
-        iframeEnabled: true
-      });
-      expect(syncs).to.not.be.an('undefined');
-      expect(syncs).to.have.lengthOf(1);
-      expect(syncs[0].type).to.equal('iframe');
-    });
-  });
-});
diff --git a/test/spec/modules/dmdIdSystem_spec.js b/test/spec/modules/dmdIdSystem_spec.js
new file mode 100644
index 00000000000..3096a8e55f5
--- /dev/null
+++ b/test/spec/modules/dmdIdSystem_spec.js
@@ -0,0 +1,96 @@
+import * as utils from '../../../src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+import { dmdIdSubmodule } from 'modules/dmdIdSystem.js';
+
+describe('Dmd ID System', function () {
+  let logErrorStub;
+  const config = {
+    params: {
+      api_key: '33344ffjddk22k22k222k22234k',
+      api_url: 'https://aix.hcn.health/api/v1/auths'
+    }
+  };
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+  });
+
+  it('should log an error if no configParams were passed into getId', function () {
+    dmdIdSubmodule.getId();
+    expect(logErrorStub.calledOnce).to.be.true;
+  });
+
+  it('should log an error if configParams doesnot have api_key passed to getId', function () {
+    dmdIdSubmodule.getId({params: {}});
+    expect(logErrorStub.calledOnce).to.be.true;
+  });
+
+  it('should log an error if configParams has invalid api_key passed into getId', function () {
+    dmdIdSubmodule.getId({params: {api_key: 123}});
+    expect(logErrorStub.calledOnce).to.be.true;
+  });
+
+  it('should not log an error if configParams has valid api_key passed into getId', function () {
+    dmdIdSubmodule.getId({params: {api_key: '3fdbe297-3690-4f5c-9e11-ee9186a6d77c'}});
+    expect(logErrorStub.calledOnce).to.be.false;
+  });
+
+  it('should return undefined if empty value passed into decode', function () {
+    expect(dmdIdSubmodule.decode()).to.be.undefined;
+  });
+
+  it('should return undefined if invalid dmd-dgid passed into decode', function () {
+    expect(dmdIdSubmodule.decode(123)).to.be.undefined;
+  });
+
+  it('should return dmdId if valid dmd-dgid passed into decode', function () {
+    let data = { 'dmdId': 'U12345' };
+    expect(dmdIdSubmodule.decode('U12345')).to.deep.equal(data);
+  });
+
+  it('should return cacheObj if cacheObj is passed into getId', function () {
+    let data = { 'dmdId': 'U12345' };
+    expect(dmdIdSubmodule.getId(config, {}, { cookie: 'dmd-dgid' })).to.deep.equal({ cookie: 'dmd-dgid' });
+    expect(server.requests.length).to.eq(0);
+  });
+
+  it('Should invoke callback with response from API call', function () {
+    const callbackSpy = sinon.spy();
+    const domain = utils.getWindowLocation()
+    const callback = dmdIdSubmodule.getId(config).callback;
+    callback(callbackSpy);
+    const request = server.requests[0];
+    expect(request.method).to.eq('GET');
+    expect(request.requestHeaders['x-domain']).to.be.eq(domain);
+    expect(request.url).to.eq(config.params.api_url);
+    request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ dgid: 'U12345' }));
+    expect(callbackSpy.lastCall.lastArg).to.deep.equal('U12345');
+  });
+
+  it('Should log error if API response is not valid', function () {
+    const callbackSpy = sinon.spy();
+    const domain = utils.getWindowLocation()
+    const callback = dmdIdSubmodule.getId(config).callback;
+    callback(callbackSpy);
+    const request = server.requests[0];
+    expect(request.method).to.eq('GET');
+    expect(request.requestHeaders['x-domain']).to.be.eq(domain);
+    expect(request.url).to.eq(config.params.api_url);
+    request.respond(400, { 'Content-Type': 'application/json' }, undefined);
+    expect(logErrorStub.calledOnce).to.be.true;
+  });
+
+  it('Should log error if API call throws error', function () {
+    const callbackSpy = sinon.spy();
+    const callback = dmdIdSubmodule.getId(config).callback;
+    callback(callbackSpy);
+    const request = server.requests[0];
+    expect(request.url).to.eq(config.params.api_url);
+    request.error();
+    expect(logErrorStub.calledOnce).to.be.true;
+  });
+});
diff --git a/test/spec/modules/docereeBidAdapter_spec.js b/test/spec/modules/docereeBidAdapter_spec.js
new file mode 100644
index 00000000000..dadbb56b0c0
--- /dev/null
+++ b/test/spec/modules/docereeBidAdapter_spec.js
@@ -0,0 +1,105 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/docereeBidAdapter.js';
+import { config } from '../../../src/config.js';
+
+describe('BidlabBidAdapter', function () {
+  config.setConfig({
+    doceree: {
+      context: {
+        data: {
+          token: 'testing-token', // required
+        }
+      },
+      user: {
+        data: {
+          gender: '',
+          email: '',
+          hashedEmail: '',
+          firstName: '',
+          lastName: '',
+          npi: '',
+          hashedNPI: '',
+          city: '',
+          zipCode: '',
+          specialization: '',
+        }
+      }
+    }
+  });
+  let bid = {
+    bidId: 'testing',
+    bidder: 'doceree',
+    params: {
+      placementId: 'DOC_7jm9j5eqkl0xvc5w',
+      gdpr: '1',
+      gdprConsent: 'CPQfU1jPQfU1jG0AAAENAwCAAAAAAAAAAAAAAAAAAAAA.IGLtV_T9fb2vj-_Z99_tkeYwf95y3p-wzhheMs-8NyZeH_B4Wv2MyvBX4JiQKGRgksjLBAQdtHGlcTQgBwIlViTLMYk2MjzNKJrJEilsbO2dYGD9Pn8HT3ZCY70-vv__7v3ff_3g'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if placementId is present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if placementId is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('isGdprConsentPresent', function () {
+    it('Should return true if gdpr consent is present', function () {
+      expect(spec.isGdprConsentPresent(bid)).to.be.true;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid]);
+    serverRequest = serverRequest[0]
+    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;
+    });
+    it('Returns GET method', function () {
+      expect(serverRequest.method).to.equal('GET');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://bidder.doceree.com/v1/adrequest?id=DOC_7jm9j5eqkl0xvc5w&pubRequestedURL=undefined&loggedInUser=JTdCJTIyZ2VuZGVyJTIyJTNBJTIyJTIyJTJDJTIyZW1haWwlMjIlM0ElMjIlMjIlMkMlMjJoYXNoZWRFbWFpbCUyMiUzQSUyMiUyMiUyQyUyMmZpcnN0TmFtZSUyMiUzQSUyMiUyMiUyQyUyMmxhc3ROYW1lJTIyJTNBJTIyJTIyJTJDJTIybnBpJTIyJTNBJTIyJTIyJTJDJTIyaGFzaGVkTlBJJTIyJTNBJTIyJTIyJTJDJTIyY2l0eSUyMiUzQSUyMiUyMiUyQyUyMnppcENvZGUlMjIlM0ElMjIlMjIlMkMlMjJzcGVjaWFsaXphdGlvbiUyMiUzQSUyMiUyMiU3RA%3D%3D&prebidjs=true&requestId=testing&gdpr=1&gdpr_consent=CPQfU1jPQfU1jG0AAAENAwCAAAAAAAAAAAAAAAAAAAAA.IGLtV_T9fb2vj-_Z99_tkeYwf95y3p-wzhheMs-8NyZeH_B4Wv2MyvBX4JiQKGRgksjLBAQdtHGlcTQgBwIlViTLMYk2MjzNKJrJEilsbO2dYGD9Pn8HT3ZCY70-vv__7v3ff_3g&');
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: {
+          DIVID: 'DOC_7jm9j5eqkl0xvc5w',
+          creativeType: 'banner',
+          guid: 'G125fzC5NKl3FHeOT8yvL98ILfQS9TVUgk6Q',
+          currency: 'USD',
+          cpmBid: 2,
+          height: '250',
+          width: '300',
+          ctaLink: 'https://doceree.com/',
+          sourceURL: '',
+          sourceHTML: '<div>test</div>',
+          advertiserDomain: 'doceree.com',
+        }
+      };
+      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',
+        'netRevenue', 'currency', 'mediaType', 'creativeId', 'meta');
+      expect(dataItem.requestId).to.equal('G125fzC5NKl3FHeOT8yvL98ILfQS9TVUgk6Q');
+      expect(dataItem.cpm).to.equal(2);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('<div>test</div>');
+      expect(dataItem.ttl).to.equal(30);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.creativeId).to.equal('DOC_7jm9j5eqkl0xvc5w');
+      expect(dataItem.meta.advertiserDomains).to.be.an('array').that.is.not.empty;
+      expect(dataItem.meta.advertiserDomains[0]).to.equal('doceree.com')
+    });
+  })
+});
diff --git a/test/spec/modules/dspxBidAdapter_spec.js b/test/spec/modules/dspxBidAdapter_spec.js
index cf36c3f62c4..2869385d7e7 100644
--- a/test/spec/modules/dspxBidAdapter_spec.js
+++ b/test/spec/modules/dspxBidAdapter_spec.js
@@ -61,7 +61,12 @@ describe('dspxAdapter', function () {
       ],
       'bidId': '30b31c1838de1e1',
       'bidderRequestId': '22edbae2733bf61',
-      'auctionId': '1d1a030790a475'
+      'auctionId': '1d1a030790a475',
+      'adUnitCode': 'testDiv1',
+      'userId': {
+        'netId': '123',
+        'uid2': '456'
+      }
     },
     {
       'bidder': 'dspx',
@@ -94,7 +99,8 @@ describe('dspxAdapter', function () {
       ],
       'bidId': '30b31c1838de1e3',
       'bidderRequestId': '22edbae2733bf69',
-      'auctionId': '1d1a030790a477'
+      'auctionId': '1d1a030790a477',
+      'adUnitCode': 'testDiv2'
     },
     {
       'bidder': 'dspx',
@@ -102,18 +108,29 @@ describe('dspxAdapter', function () {
         'placement': '101',
         'devMode': true
       },
-      'sizes': [
-        [300, 250]
-      ],
+      'mediaTypes': {
+        'video': {
+          'playerSize': [640, 480],
+          'context': 'instream'
+        },
+        'banner': {
+          'sizes': [
+            [300, 250]
+          ]
+        }
+      },
+
       'bidId': '30b31c1838de1e4',
       'bidderRequestId': '22edbae2733bf67',
-      'auctionId': '1d1a030790a478'
+      'auctionId': '1d1a030790a478',
+      'adUnitCode': 'testDiv3'
     },
     {
       'bidder': 'dspx',
       'params': {
         'placement': '101',
-        'devMode': true
+        'devMode': true,
+        'vastFormat': 'vast4'
       },
       'mediaTypes': {
         'video': {
@@ -123,7 +140,8 @@ describe('dspxAdapter', function () {
       },
       'bidId': '30b31c1838de1e41',
       'bidderRequestId': '22edbae2733bf67',
-      'auctionId': '1d1a030790a478'
+      'auctionId': '1d1a030790a478',
+      'adUnitCode': 'testDiv4'
     }
 
     ];
@@ -144,16 +162,16 @@ describe('dspxAdapter', function () {
     it('sends bid request to our endpoint via GET', function () {
       expect(request1.method).to.equal('GET');
       expect(request1.url).to.equal(ENDPOINT_URL);
-      let data = request1.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
-      expect(data).to.equal('_f=html&alternative=prebid_js&inventory_item_id=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e1&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bprivate_auction%5D=0&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&bcat=IAB2%2CIAB4&dvt=desktop');
+      let data = request1.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
+      expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e1&pbver=test&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bprivate_auction%5D=0&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&bcat=IAB2%2CIAB4&dvt=desktop&did_netid=123&did_uid2=456&auctionId=1d1a030790a475&pbcode=testDiv1&media_types%5Bbanner%5D=300x250');
     });
 
     var request2 = spec.buildRequests([bidRequests[1]], bidderRequest)[0];
     it('sends bid request to our DEV endpoint via GET', function () {
       expect(request2.method).to.equal('GET');
       expect(request2.url).to.equal(ENDPOINT_URL_DEV);
-      let data = request2.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
-      expect(data).to.equal('_f=html&alternative=prebid_js&inventory_item_id=101&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e2&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&prebidDevMode=1');
+      let data = request2.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
+      expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=101&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e2&pbver=test&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&prebidDevMode=1&auctionId=1d1a030790a476&media_types%5Bbanner%5D=300x250');
     });
 
     // Without gdprConsent
@@ -166,23 +184,23 @@ describe('dspxAdapter', function () {
     it('sends bid request without gdprConsent to our endpoint via GET', function () {
       expect(request3.method).to.equal('GET');
       expect(request3.url).to.equal(ENDPOINT_URL);
-      let data = request3.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
-      expect(data).to.equal('_f=html&alternative=prebid_js&inventory_item_id=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e3&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bprivate_auction%5D=0&pfilter%5Bgeo%5D%5Bcountry%5D=DE&bcat=IAB2%2CIAB4&dvt=desktop');
+      let data = request3.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
+      expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e3&pbver=test&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bprivate_auction%5D=0&pfilter%5Bgeo%5D%5Bcountry%5D=DE&bcat=IAB2%2CIAB4&dvt=desktop&auctionId=1d1a030790a477&pbcode=testDiv2&media_types%5Bbanner%5D=300x250');
     });
 
     var request4 = spec.buildRequests([bidRequests[3]], bidderRequestWithoutGdpr)[0];
     it('sends bid request without gdprConsent  to our DEV endpoint via GET', function () {
       expect(request4.method).to.equal('GET');
       expect(request4.url).to.equal(ENDPOINT_URL_DEV);
-      let data = request4.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
-      expect(data).to.equal('_f=html&alternative=prebid_js&inventory_item_id=101&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e4&prebidDevMode=1');
+      let data = request4.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
+      expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=101&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e4&pbver=test&prebidDevMode=1&auctionId=1d1a030790a478&pbcode=testDiv3&media_types%5Bvideo%5D=640x480&media_types%5Bbanner%5D=300x250');
     });
 
     var request5 = spec.buildRequests([bidRequests[4]], bidderRequestWithoutGdpr)[0];
-    it('sends bid video request to our rads endpoint via GET', function () {
+    it('sends bid video request to our endpoint via GET', function () {
       expect(request5.method).to.equal('GET');
-      let data = request5.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
-      expect(data).to.equal('_f=vast2&alternative=prebid_js&inventory_item_id=101&srw=640&srh=480&idt=100&bid_id=30b31c1838de1e41&prebidDevMode=1');
+      let data = request5.data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid').replace(/pbver=.*?&/g, 'pbver=test&');
+      expect(data).to.equal('_f=auto&alternative=prebid_js&inventory_item_id=101&srw=640&srh=480&idt=100&bid_id=30b31c1838de1e41&pbver=test&vf=vast4&prebidDevMode=1&auctionId=1d1a030790a478&pbcode=testDiv4&media_types%5Bvideo%5D=640x480');
     });
   });
 
@@ -199,7 +217,8 @@ describe('dspxAdapter', function () {
         'currency': 'EUR',
         'ttl': 60,
         'netRevenue': true,
-        'zone': '6682'
+        'zone': '6682',
+        'adomain': ['bdomain']
       }
     };
     let serverVideoResponse = {
@@ -229,7 +248,8 @@ describe('dspxAdapter', function () {
       netRevenue: true,
       ttl: 300,
       type: 'sspHTML',
-      ad: '<!-- test creative -->'
+      ad: '<!-- test creative -->',
+      meta: {advertiserDomains: ['bdomain']}
     }, {
       requestId: '23beaa6af6cdde',
       cpm: 0.5,
@@ -242,7 +262,8 @@ describe('dspxAdapter', function () {
       ttl: 300,
       type: 'vast2',
       vastXml: '{"reason":7001,"status":"accepted"}',
-      mediaType: 'video'
+      mediaType: 'video',
+      meta: {advertiserDomains: []}
     }];
 
     it('should get the correct bid response by display ad', function () {
@@ -255,6 +276,8 @@ describe('dspxAdapter', function () {
       }];
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains.length).to.equal(1);
+      expect(result[0].meta.advertiserDomains[0]).to.equal(expectedResponse[0].meta.advertiserDomains[0]);
     });
 
     it('should get the correct dspx video bid response by display ad', function () {
@@ -273,6 +296,7 @@ describe('dspxAdapter', function () {
       }];
       let result = spec.interpretResponse(serverVideoResponse, bidRequest[0]);
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[1]));
+      expect(result[0].meta.advertiserDomains.length).to.equal(0);
     });
 
     it('handles empty bid response', function () {
@@ -283,4 +307,83 @@ describe('dspxAdapter', function () {
       expect(result.length).to.equal(0);
     });
   });
+
+  describe(`getUserSyncs test usage`, function () {
+    let serverResponses;
+
+    beforeEach(function () {
+      serverResponses = [{
+        body: {
+          requestId: '23beaa6af6cdde',
+          cpm: 0.5,
+          width: 0,
+          height: 0,
+          creativeId: 100500,
+          dealId: '',
+          currency: 'EUR',
+          netRevenue: true,
+          ttl: 300,
+          type: 'sspHTML',
+          ad: '<!-- test creative -->',
+          userSync: {
+            iframeUrl: ['anyIframeUrl?a=1'],
+            imageUrl: ['anyImageUrl', 'anyImageUrl2']
+          }
+        }
+      }];
+    });
+
+    it(`return value should be an array`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true })).to.be.an('array');
+    });
+    it(`array should have only one object and it should have a property type = 'iframe'`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, serverResponses).length).to.be.equal(1);
+      let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, serverResponses);
+      expect(userSync).to.have.property('type');
+      expect(userSync.type).to.be.equal('iframe');
+    });
+    it(`we have valid sync url for iframe`, function () {
+      let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, serverResponses, {consentString: 'anyString'});
+      expect(userSync.url).to.be.equal('anyIframeUrl?a=1&gdpr_consent=anyString')
+      expect(userSync.type).to.be.equal('iframe');
+    });
+    it(`we have valid sync url for image`, function () {
+      let [userSync] = spec.getUserSyncs({ pixelEnabled: true }, serverResponses, {gdprApplies: true, consentString: 'anyString'});
+      expect(userSync.url).to.be.equal('anyImageUrl?gdpr=1&gdpr_consent=anyString')
+      expect(userSync.type).to.be.equal('image');
+    });
+    it(`we have valid sync url for image and iframe`, function () {
+      let userSync = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses, {gdprApplies: true, consentString: 'anyString'});
+      expect(userSync.length).to.be.equal(3);
+      expect(userSync[0].url).to.be.equal('anyIframeUrl?a=1&gdpr=1&gdpr_consent=anyString')
+      expect(userSync[0].type).to.be.equal('iframe');
+      expect(userSync[1].url).to.be.equal('anyImageUrl?gdpr=1&gdpr_consent=anyString')
+      expect(userSync[1].type).to.be.equal('image');
+      expect(userSync[2].url).to.be.equal('anyImageUrl2?gdpr=1&gdpr_consent=anyString')
+      expect(userSync[2].type).to.be.equal('image');
+    });
+  });
+
+  describe(`getUserSyncs test usage in passback response`, function () {
+    let serverResponses;
+
+    beforeEach(function () {
+      serverResponses = [{
+        body: {
+          reason: 8002,
+          status: 'error',
+          msg: 'passback',
+        }
+      }];
+    });
+
+    it(`check for zero array when iframeEnabled`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true })).to.be.an('array');
+      expect(spec.getUserSyncs({ iframeEnabled: true }, serverResponses).length).to.be.equal(0);
+    });
+    it(`check for zero array when iframeEnabled`, function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true })).to.be.an('array');
+      expect(spec.getUserSyncs({ pixelEnabled: true }, serverResponses).length).to.be.equal(0);
+    });
+  });
 });
diff --git a/test/spec/modules/e_volutionBidAdapter_spec.js b/test/spec/modules/e_volutionBidAdapter_spec.js
index 447420616d1..d488048060a 100644
--- a/test/spec/modules/e_volutionBidAdapter_spec.js
+++ b/test/spec/modules/e_volutionBidAdapter_spec.js
@@ -2,27 +2,65 @@ import {expect} from 'chai';
 import {spec} from '../../../modules/e_volutionBidAdapter.js';
 
 describe('EvolutionTechBidAdapter', function () {
-  let bid = {
+  let bids = [{
     bidId: '23fhj33i987f',
     bidder: 'e_volution',
     params: {
-      placementId: 0,
-      traffic: 'banner'
+      placementId: 0
+    },
+    mediaTypes: {
+      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;
@@ -38,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');
+      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([]);
@@ -71,14 +126,17 @@ describe('EvolutionTechBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            adomain: [ 'example.com' ]
+          }
         }]
       };
       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');
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
       expect(dataItem.requestId).to.equal('23fhj33i987f');
       expect(dataItem.cpm).to.equal(0.4);
       expect(dataItem.width).to.equal(300);
@@ -100,7 +158,10 @@ describe('EvolutionTechBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {
+            adomain: [ 'example.com' ]
+          }
         }]
       };
       let videoResponses = spec.interpretResponse(video);
@@ -108,7 +169,7 @@ describe('EvolutionTechBidAdapter', function () {
 
       let dataItem = videoResponses[0];
       expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
-        'netRevenue', 'currency', 'dealId', 'mediaType');
+        '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');
@@ -133,13 +194,16 @@ describe('EvolutionTechBidAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
+          meta: {
+            adomain: [ 'example.com' ]
+          }
         }]
       };
       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');
+      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);
diff --git a/test/spec/modules/ebdrBidAdapter_spec.js b/test/spec/modules/ebdrBidAdapter_spec.js
index ba1cad475da..1c46381500f 100644
--- a/test/spec/modules/ebdrBidAdapter_spec.js
+++ b/test/spec/modules/ebdrBidAdapter_spec.js
@@ -160,7 +160,12 @@ describe('ebdrBidAdapter', function () {
           currency: 'USD',
           netRevenue: true,
           ttl: 3600,
-          vastUrl: serverResponse.seatbid[0].bid[0].nurl
+          vastUrl: serverResponse.seatbid[0].bid[0].nurl,
+          meta: {
+            advertiserDomains: [
+              'advertiserdomain.com'
+            ]
+          }
         });
       });
     });
@@ -201,7 +206,12 @@ describe('ebdrBidAdapter', function () {
           height: serverResponse.seatbid[0].bid[0].h,
           currency: 'USD',
           netRevenue: true,
-          ttl: 3600
+          ttl: 3600,
+          meta: {
+            advertiserDomains: [
+              'advertiserdomain.com'
+            ]
+          },
         });
       });
     });
diff --git a/test/spec/modules/edgequeryxBidAdapter_spec.js b/test/spec/modules/edgequeryxBidAdapter_spec.js
deleted file mode 100644
index a66c546bd7c..00000000000
--- a/test/spec/modules/edgequeryxBidAdapter_spec.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import {
-  expect
-} from 'chai';
-import {
-  spec
-} from 'modules/edgequeryxBidAdapter.js';
-import {
-  newBidder
-} from 'src/adapters/bidderFactory.js';
-import {
-  config
-} from 'src/config.js';
-import * as utils from 'src/utils.js';
-import { requestBidsHook } from 'modules/consentManagement.js';
-
-// Default params with optional ones
-describe('Edge Query X bid adapter tests', function () {
-  var DEFAULT_PARAMS = [{
-    bidId: 'abcd1234',
-    mediaTypes: {
-      banner: {
-        sizes: [
-          [1, 1]
-        ]
-      }
-    },
-    bidder: 'edgequeryx',
-    params: {
-      accountId: 'test',
-      widgetId: 'test'
-    },
-    requestId: 'efgh5678',
-    transactionId: 'zsfgzzg'
-  }];
-  var BID_RESPONSE = {
-    body: {
-      requestId: 'abcd1234',
-      cpm: 22,
-      width: 1,
-      height: 1,
-      creativeId: 'EQXTest',
-      currency: 'EUR',
-      netRevenue: true,
-      ttl: 360,
-      ad: '< --- awesome script --- >'
-    }
-  };
-
-  it('Verify build request', function () {
-    config.setConfig({
-      'currency': {
-        'adServerCurrency': 'EUR'
-      }
-    });
-    const request = spec.buildRequests(DEFAULT_PARAMS);
-    expect(request[0]).to.have.property('url').and.to.equal('https://deep.edgequery.io/prebid/x');
-    expect(request[0]).to.have.property('method').and.to.equal('POST');
-    const requestContent = JSON.parse(request[0].data);
-
-    expect(requestContent).to.have.property('accountId').and.to.equal('test');
-    expect(requestContent).to.have.property('widgetId').and.to.equal('test');
-    expect(requestContent).to.have.property('sizes');
-    expect(requestContent.sizes[0]).to.have.property('w').and.to.equal(1);
-    expect(requestContent.sizes[0]).to.have.property('h').and.to.equal(1);
-  });
-
-  it('Verify parse response', function () {
-    const request = spec.buildRequests(DEFAULT_PARAMS);
-    const bids = spec.interpretResponse(BID_RESPONSE, request[0]);
-    expect(bids).to.have.lengthOf(1);
-    const bid = bids[0];
-    expect(bid.cpm).to.equal(22);
-    expect(bid.ad).to.equal('< --- awesome script --- >');
-    expect(bid.width).to.equal(1);
-    expect(bid.height).to.equal(1);
-    expect(bid.creativeId).to.equal('EQXTest');
-    expect(bid.currency).to.equal('EUR');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.ttl).to.equal(360);
-    expect(bid.requestId).to.equal(DEFAULT_PARAMS[0].bidId);
-
-    expect(function () {
-      spec.interpretResponse(BID_RESPONSE, {
-        data: 'invalid Json'
-      })
-    }).to.not.throw();
-  });
-
-  it('Verifies bidder code', function () {
-    expect(spec.code).to.equal('edgequeryx');
-  });
-
-  it('Verifies bidder aliases', function () {
-    expect(spec.aliases).to.have.lengthOf(1);
-    expect(spec.aliases[0]).to.equal('eqx');
-  });
-
-  it('Verifies if bid request valid', function () {
-    expect(spec.isBidRequestValid(DEFAULT_PARAMS[0])).to.equal(true);
-    expect(spec.isBidRequestValid({})).to.equal(false);
-    expect(spec.isBidRequestValid({
-      params: {}
-    })).to.equal(false);
-    expect(spec.isBidRequestValid({
-      params: {
-        widgetyId: 'abcdef'
-      }
-    })).to.equal(false);
-    expect(spec.isBidRequestValid({
-      params: {
-        widgetId: 'test',
-        accountId: 'test'
-      }
-    })).to.equal(true);
-  });
-});
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index 1cbc2911ef5..78c8f2b3148 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -29,27 +29,118 @@ describe('eids array generation for known sub-modules', function() {
     });
   });
 
-  it('id5Id', function() {
+  describe('id5Id', function() {
+    it('does not include an ext if not provided', function() {
+      const userId = {
+        id5id: {
+          uid: 'some-random-id-value'
+        }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'id5-sync.com',
+        uids: [{ id: 'some-random-id-value', atype: 1 }]
+      });
+    });
+
+    it('includes ext if provided', function() {
+      const userId = {
+        id5id: {
+          uid: 'some-random-id-value',
+          ext: {
+            linkType: 0
+          }
+        }
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'id5-sync.com',
+        uids: [{
+          id: 'some-random-id-value',
+          atype: 1,
+          ext: {
+            linkType: 0
+          }
+        }]
+      });
+    });
+  });
+
+  it('parrableId', function() {
     const userId = {
-      id5id: 'some-random-id-value'
+      parrableId: {
+        eid: 'some-random-id-value'
+      }
     };
     const newEids = createEidsArray(userId);
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'id5-sync.com',
+      source: 'parrable.com',
       uids: [{id: 'some-random-id-value', atype: 1}]
     });
   });
 
-  it('parrableId', function() {
+  it('merkleId (legacy) - supports single id', function() {
     const userId = {
-      parrableid: 'some-random-id-value'
+      merkleId: {
+        id: 'some-random-id-value', keyID: 1
+      }
     };
     const newEids = createEidsArray(userId);
+
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'parrable.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
+      source: 'merkleinc.com',
+      uids: [{
+        id: 'some-random-id-value',
+        atype: 3,
+        ext: { keyID: 1 }
+      }]
+    });
+  });
+
+  it('merkleId supports multiple source providers', function() {
+    const userId = {
+      merkleId: [{
+        id: 'some-random-id-value', ext: { enc: 1, keyID: 16, idName: 'pamId', ssp: 'ssp1' }
+      }, {
+        id: 'another-random-id-value',
+        ext: {
+          enc: 1,
+          idName: 'pamId',
+          third: 4,
+          ssp: 'ssp2'
+        }
+      }]
+    }
+
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(2);
+    expect(newEids[0]).to.deep.equal({
+      source: 'ssp1.merkleinc.com',
+      uids: [{id: 'some-random-id-value',
+        atype: 3,
+        ext: {
+          enc: 1,
+          keyID: 16,
+          idName: 'pamId',
+          ssp: 'ssp1'
+        }
+      }]
+    });
+    expect(newEids[1]).to.deep.equal({
+      source: 'ssp2.merkleinc.com',
+      uids: [{id: 'another-random-id-value',
+        atype: 3,
+        ext: {
+          third: 4,
+          enc: 1,
+          idName: 'pamId',
+          ssp: 'ssp2'
+        }
+      }]
     });
   });
 
@@ -61,7 +152,7 @@ describe('eids array generation for known sub-modules', function() {
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
       source: 'liveramp.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
+      uids: [{id: 'some-random-id-value', atype: 3}]
     });
   });
 
@@ -76,7 +167,7 @@ describe('eids array generation for known sub-modules', function() {
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
       source: 'liveintent.com',
-      uids: [{id: 'some-random-id-value', atype: 1}],
+      uids: [{id: 'some-random-id-value', atype: 3}],
       ext: {segments: ['s1', 's2']}
     });
   });
@@ -91,7 +182,7 @@ describe('eids array generation for known sub-modules', function() {
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
       source: 'liveintent.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
+      uids: [{id: 'some-random-id-value', atype: 3}]
     });
   });
 
@@ -103,7 +194,7 @@ describe('eids array generation for known sub-modules', function() {
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
       source: 'britepool.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
+      uids: [{id: 'some-random-id-value', atype: 3}]
     });
   });
 
@@ -119,34 +210,42 @@ describe('eids array generation for known sub-modules', function() {
     });
   });
 
-  it('DigiTrust; getValue call', function() {
+  it('criteo', function() {
     const userId = {
-      digitrustid: {
-        data: {
-          id: 'some-random-id-value'
-        }
-      }
+      criteoId: 'some-random-id-value'
     };
     const newEids = createEidsArray(userId);
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'digitru.st',
+      source: 'criteo.com',
       uids: [{id: 'some-random-id-value', atype: 1}]
     });
   });
 
-  it('criteo', function() {
+  it('tapadId', function() {
     const userId = {
-      criteoId: 'some-random-id-value'
+      tapadId: 'some-random-id-value'
     };
     const newEids = createEidsArray(userId);
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'criteo.com',
+      source: 'tapad.com',
       uids: [{id: 'some-random-id-value', atype: 1}]
     });
   });
 
+  it('deepintentId', function() {
+    const userId = {
+      deepintentId: 'some-random-id-value'
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'deepintent.com',
+      uids: [{id: 'some-random-id-value', atype: 3}]
+    });
+  });
+
   it('NetId', function() {
     const userId = {
       netId: 'some-random-id-value'
@@ -158,45 +257,258 @@ describe('eids array generation for known sub-modules', function() {
       uids: [{id: 'some-random-id-value', atype: 1}]
     });
   });
-  it('Sharedid', function() {
+
+  it('zeotapIdPlus', function() {
     const userId = {
-      sharedid: {
-        id: 'test_sharedId',
-        third: 'test_sharedId'
-      }
+      IDP: 'some-random-id-value'
     };
     const newEids = createEidsArray(userId);
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'sharedid.org',
+      source: 'zeotap.com',
       uids: [{
-        id: 'test_sharedId',
-        atype: 1,
+        id: 'some-random-id-value',
+        atype: 1
+      }]
+    });
+  });
+
+  it('hadronId', function() {
+    const userId = {
+      hadronId: 'some-random-id-value'
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'audigent.com',
+      uids: [{
+        id: 'some-random-id-value',
+        atype: 1
+      }]
+    });
+  });
+
+  it('quantcastId', function() {
+    const userId = {
+      quantcastId: 'some-random-id-value'
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'quantcast.com',
+      uids: [{
+        id: 'some-random-id-value',
+        atype: 1
+      }]
+    });
+  });
+
+  it('uid2', function() {
+    const userId = {
+      uid2: {'id': 'Sample_AD_Token'}
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'uidapi.com',
+      uids: [{
+        id: 'Sample_AD_Token',
+        atype: 3
+      }]
+    });
+  });
+
+  it('kpuid', function() {
+    const userId = {
+      kpuid: 'Sample_Token'
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'kpuid.com',
+      uids: [{
+        id: 'Sample_Token',
+        atype: 3
+      }]
+    });
+  });
+
+  it('tncid', function() {
+    const userId = {
+      tncid: 'TEST_TNCID'
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'thenewco.it',
+      uids: [{
+        id: 'TEST_TNCID',
+        atype: 3
+      }]
+    });
+  });
+
+  it('pubProvidedId', function() {
+    const userId = {
+      pubProvidedId: [{
+        source: 'example.com',
+        uids: [{
+          id: 'value read from cookie or local storage',
+          ext: {
+            stype: 'ppuid'
+          }
+        }]
+      }, {
+        source: 'id-partner.com',
+        uids: [{
+          id: 'value read from cookie or local storage'
+        }]
+      }]
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(2);
+    expect(newEids[0]).to.deep.equal({
+      source: 'example.com',
+      uids: [{
+        id: 'value read from cookie or local storage',
         ext: {
-          third: 'test_sharedId'
+          stype: 'ppuid'
         }
       }]
     });
+    expect(newEids[1]).to.deep.equal({
+      source: 'id-partner.com',
+      uids: [{
+        id: 'value read from cookie or local storage'
+      }]
+    });
+  });
+
+  it('amxId', () => {
+    const id = 'c4bcadb0-124f-4468-a91a-d3d44cf311c5'
+    const userId = {
+      amxId: id
+    };
+
+    const [eid] = createEidsArray(userId);
+    expect(eid).to.deep.equal({
+      source: 'amxrtb.com',
+      uids: [{
+        atype: 1,
+        id,
+      }]
+    });
+  });
+
+  it('qid', function() {
+    const userId = {
+      qid: 'some-random-id-value'
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'adquery.io',
+      uids: [{
+        id: 'some-random-id-value',
+        atype: 1
+      }]
+    });
   });
-  it('Sharedid: Not Synched', function() {
+
+  it('33acrossId', function() {
     const userId = {
-      sharedid: {
-        id: 'test_sharedId'
+      '33acrossId': {
+        envelope: 'some-random-id-value'
       }
     };
     const newEids = createEidsArray(userId);
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'sharedid.org',
+      source: '33across.com',
       uids: [{
-        id: 'test_sharedId',
+        id: 'some-random-id-value',
         atype: 1
       }]
     });
   });
+
+  it('cpexId', () => {
+    const id = 'some-random-id-value'
+    const userId = { cpexId: id };
+    const [eid] = createEidsArray(userId);
+    expect(eid).to.deep.equal({
+      source: 'czechadid.cz',
+      uids: [{ id: 'some-random-id-value', atype: 1 }]
+    });
+  });
+
+  describe('ftrackId', () => {
+    it('should return the correct EID schema', () => {
+      // This is the schema returned from the ftrack decode() method
+      expect(createEidsArray({
+        ftrackId: {
+          uid: 'test-device-id',
+          ext: {
+            DeviceID: 'test-device-id',
+            SingleDeviceID: 'test-single-device-id',
+            HHID: 'test-household-id'
+          }
+        },
+        foo: {
+          bar: 'baz'
+        },
+        lorem: {
+          ipsum: ''
+        }
+      })).to.deep.equal([{
+        source: 'flashtalking.com',
+        uids: [{
+          atype: 1,
+          id: 'test-device-id',
+          ext: {
+            DeviceID: 'test-device-id',
+            SingleDeviceID: 'test-single-device-id',
+            HHID: 'test-household-id'
+          }
+        }]
+      }]);
+    });
+  });
+
+  describe('imuid', function() {
+    it('should return the correct EID schema with imuid', function() {
+      const userId = {
+        imuid: 'testimuid'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'intimatemerger.com',
+        uids: [{
+          id: 'testimuid',
+          atype: 1
+        }]
+      });
+    });
+
+    it('should return the correct EID schema with imppid', function() {
+      const userId = {
+        imppid: 'imppid-value-imppid-value-imppid-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'ppid.intimatemerger.com',
+        uids: [{
+          id: 'imppid-value-imppid-value-imppid-value',
+          atype: 1
+        }]
+      });
+    });
+  });
 });
 
-describe('Negative case', function() {
+describe('Negative case', function () {
   it('eids array generation for UN-known sub-module', function() {
     // UnknownCommonId
     const userId = {
diff --git a/test/spec/modules/emoteevBidAdapter_spec.js b/test/spec/modules/emoteevBidAdapter_spec.js
deleted file mode 100644
index 43ae62f1eb9..00000000000
--- a/test/spec/modules/emoteevBidAdapter_spec.js
+++ /dev/null
@@ -1,876 +0,0 @@
-import {
-  assert, expect
-} from 'chai';
-import {
-  ADAPTER_VERSION,
-  DOMAIN,
-  DOMAIN_DEVELOPMENT,
-  DOMAIN_STAGING,
-  domain,
-  BIDDER_PATH,
-  bidderUrl,
-  buildRequests,
-  conformBidRequest,
-  DEFAULT_ENV,
-  DEVELOPMENT,
-  EVENTS_PATH,
-  eventsUrl,
-  FOOTER,
-  gdprConsent,
-  getDeviceDimensions,
-  getDeviceInfo,
-  getDocumentDimensions,
-  getUserSyncs,
-  getViewDimensions,
-  IN_CONTENT,
-  interpretResponse,
-  isBidRequestValid,
-  ON_ADAPTER_CALLED,
-  ON_BID_WON,
-  ON_BIDDER_TIMEOUT,
-  onBidWon,
-  onAdapterCalled,
-  onTimeout,
-  OVERLAY,
-  PRODUCTION,
-  requestsPayload,
-  resolveDebug,
-  resolveEnv,
-  spec,
-  STAGING,
-  USER_SYNC_IFRAME_PATH,
-  USER_SYNC_IMAGE_PATH,
-  userSyncIframeUrl,
-  userSyncImageUrl,
-  validateSizes,
-  validateContext,
-  validateExternalId,
-  VENDOR_ID,
-  WALLPAPER,
-  storage
-} from 'modules/emoteevBidAdapter.js';
-import * as utils from '../../../src/utils.js';
-import {config} from '../../../src/config.js';
-
-const cannedValidBidRequests = [{
-  adUnitCode: '/19968336/header-bid-tag-1',
-  auctionId: 'fcbf2b27-a951-496f-b5bb-1324ce7c0558',
-  bidId: '2b8de6572e8193',
-  bidRequestsCount: 1,
-  bidder: 'emoteev',
-  bidderRequestId: '1203b39fecc6a5',
-  crumbs: {pubcid: 'f3371d16-4e8b-42b5-a770-7e5be1fdf03d'},
-  params: {
-    adSpaceId: 5084,
-    context: IN_CONTENT,
-    externalId: 42
-  },
-  sizes: [[300, 250], [250, 300], [300, 600]],
-  transactionId: '58dbd732-7a39-45f1-b23e-1c24051a941c',
-}];
-const cannedBidderRequest = {
-  auctionId: 'fcbf2b27-a951-496f-b5bb-1324ce7c0558',
-  auctionStart: 1544200122837,
-  bidderCode: 'emoteev',
-  bidderRequestId: '1203b39fecc6a5',
-  doneCbCallCount: 0,
-  refererInfo: {
-    canonicalUrl: undefined,
-    numIframes: 0,
-    reachedTop: true,
-    referer: 'https://localhost:9999/integrationExamples/gpt/hello_world_emoteev.html',
-    stack: ['https://localhost:9999/integrationExamples/gpt/hello_world_emoteev.html']
-  },
-  start: 1544200012839,
-  timeout: 3000,
-  gdprConsent: {
-    gdprApplies: true,
-    vendorData: {vendorConsents: {[VENDOR_ID]: true}},
-  }
-};
-const serverResponse =
-  {
-    body: [
-      {
-        requestId: cannedValidBidRequests[0].bidId,
-        cpm: 1,
-        width: cannedValidBidRequests[0].sizes[0][0],
-        height: cannedValidBidRequests[0].sizes[0][1],
-        ad: '<div><script src="https://some.sources"></script></div>',
-        ttl: 360,
-        creativeId: 123,
-        netRevenue: false,
-        currency: 'EUR',
-      }
-    ]
-  };
-
-describe('emoteevBidAdapter', function () {
-  describe('isBidRequestValid', function () {
-    it('should return true when valid', function () {
-      const validBid = {
-        bidder: 'emoteev',
-        bidId: '23a45b4e3',
-        params: {
-          adSpaceId: 12345,
-          context: IN_CONTENT,
-          externalId: 42
-        },
-        mediaTypes: {
-          banner: {
-            sizes: [[750, 200]]
-          }
-        },
-      };
-      expect(isBidRequestValid(validBid)).to.equal(true);
-
-      expect(spec.isBidRequestValid(validBid)).to.exist.and.to.be.a('boolean');
-      expect(spec.isBidRequestValid({})).to.exist.and.to.be.a('boolean');
-    });
-
-    it('should return false when required params are invalid', function () {
-      expect(isBidRequestValid({
-        bidder: '', // invalid bidder
-        params: {
-          adSpaceId: 12345,
-          context: IN_CONTENT,
-          externalId: 42
-        },
-        mediaTypes: {
-          banner: {
-            sizes: [[750, 200]]
-          }
-        },
-      })).to.equal(false);
-      expect(isBidRequestValid({
-        bidder: 'emoteev',
-        params: {
-          adSpaceId: '', // invalid adSpaceId
-          context: IN_CONTENT,
-          externalId: 42
-        },
-        mediaTypes: {
-          banner: {
-            sizes: [[750, 200]]
-          }
-        },
-      })).to.equal(false);
-      expect(isBidRequestValid({
-        bidder: 'emoteev',
-        params: {
-          adSpaceId: 12345,
-          context: 'something', // invalid context
-          externalId: 42
-        },
-        mediaTypes: {
-          banner: {
-            sizes: [[750, 200]]
-          }
-        },
-      })).to.equal(false);
-      expect(isBidRequestValid({
-        bidder: 'emoteev',
-        params: {
-          adSpaceId: 12345,
-          context: IN_CONTENT,
-          externalId: 'lol' // invalid externalId
-        },
-        mediaTypes: {
-          banner: {
-            sizes: [[750, 200]]
-          }
-        },
-      })).to.equal(false);
-      expect(isBidRequestValid({
-        bidder: 'emoteev',
-        params: {
-          adSpaceId: 12345,
-          context: IN_CONTENT,
-          externalId: 42
-        },
-        mediaTypes: {
-          banner: {
-            sizes: [[750]] // invalid size
-          }
-        },
-      })).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const
-      env = DEFAULT_ENV,
-      debug = true,
-      currency = 'EUR',
-      request = buildRequests(env, debug, currency, cannedValidBidRequests, cannedBidderRequest);
-
-    expect(request).to.exist.and.have.all.keys(
-      'method',
-      'url',
-      'data',
-    );
-
-    expect(request.method).to.equal('POST');
-    expect(request.url).to.equal(bidderUrl(env));
-
-    expect(spec.buildRequests(cannedValidBidRequests, cannedBidderRequest)).to.exist.and.to.be.an('object');
-  });
-
-  describe('interpretResponse', function () {
-    it('bid objects from response', function () {
-      const bidResponses = interpretResponse(serverResponse);
-      expect(bidResponses).to.be.an('array').that.is.not.empty;
-      expect(bidResponses[0]).to.have.property('requestId', cannedValidBidRequests[0].bidId);
-      expect(bidResponses[0]).to.have.property('cpm', serverResponse.body[0].cpm);
-      expect(bidResponses[0]).to.have.property('width', serverResponse.body[0].width);
-      expect(bidResponses[0]).to.have.property('height', serverResponse.body[0].height);
-      expect(bidResponses[0]).to.have.property('ad', serverResponse.body[0].ad);
-      expect(bidResponses[0]).to.have.property('ttl', serverResponse.body[0].ttl);
-      expect(bidResponses[0]).to.have.property('creativeId', serverResponse.body[0].creativeId);
-      expect(bidResponses[0]).to.have.property('netRevenue', serverResponse.body[0].netRevenue);
-      expect(bidResponses[0]).to.have.property('currency', serverResponse.body[0].currency);
-    });
-  });
-
-  describe('onAdapterCalled', function () {
-    const
-      bidRequest = cannedValidBidRequests[0],
-      url = onAdapterCalled(DEFAULT_ENV, bidRequest);
-
-    expect(url).to.have.property('protocol');
-    expect(url).to.have.property('hostname');
-    expect(url).to.have.property('pathname', EVENTS_PATH);
-    expect(url).to.have.nested.property('search.eventName', ON_ADAPTER_CALLED);
-    expect(url).to.have.nested.property('search.pubcId', bidRequest.crumbs.pubcid);
-    expect(url).to.have.nested.property('search.bidId', bidRequest.bidId);
-    expect(url).to.have.nested.property('search.adSpaceId', bidRequest.params.adSpaceId);
-    expect(url).to.have.nested.property('search.cache_buster');
-  });
-
-  describe('onBidWon', function () {
-    const
-      pubcId = cannedValidBidRequests[0].crumbs.pubcid,
-      bidObject = serverResponse.body[0],
-      url = onBidWon(DEFAULT_ENV, pubcId, bidObject);
-
-    expect(url).to.have.property('protocol');
-    expect(url).to.have.property('hostname');
-    expect(url).to.have.property('pathname', EVENTS_PATH);
-    expect(url).to.have.nested.property('search.eventName', ON_BID_WON);
-    expect(url).to.have.nested.property('search.pubcId', pubcId);
-    expect(url).to.have.nested.property('search.bidId', bidObject.requestId);
-    expect(url).to.have.nested.property('search.cache_buster');
-  });
-
-  describe('onTimeout', function () {
-    const
-      data = {
-        ...cannedValidBidRequests[0],
-        timeout: 123,
-      },
-      url = onTimeout(DEFAULT_ENV, data);
-
-    expect(url).to.have.property('protocol');
-    expect(url).to.have.property('hostname');
-    expect(url).to.have.property('pathname', EVENTS_PATH);
-    expect(url).to.have.nested.property('search.eventName', ON_BIDDER_TIMEOUT);
-    expect(url).to.have.nested.property('search.bidId', data.bidId);
-    expect(url).to.have.nested.property('search.pubcId', data.crumbs.pubcid);
-    expect(url).to.have.nested.property('search.adSpaceId', data.params.adSpaceId);
-    expect(url).to.have.nested.property('search.timeout', data.timeout);
-    expect(url).to.have.nested.property('search.cache_buster');
-  });
-
-  describe('getUserSyncs', function () {
-    expect(getUserSyncs(
-      DEFAULT_ENV,
-      {
-        iframeEnabled: false,
-        pixelEnabled: false
-      })).to.deep.equal([]);
-    expect(getUserSyncs(
-      PRODUCTION,
-      {
-        iframeEnabled: false,
-        pixelEnabled: true
-      })).to.deep.equal([{
-      type: 'image',
-      url: userSyncImageUrl(PRODUCTION)
-    }]);
-    expect(getUserSyncs(
-      STAGING,
-      {
-        iframeEnabled: true,
-        pixelEnabled: false
-      })).to.deep.equal([{
-      type: 'iframe',
-      url: userSyncIframeUrl(STAGING)
-    }]);
-    expect(getUserSyncs(
-      DEVELOPMENT,
-      {
-        iframeEnabled: true,
-        pixelEnabled: true
-      })).to.deep.equal([{
-      type: 'image',
-      url: userSyncImageUrl(DEVELOPMENT)
-    }, {
-      type: 'iframe',
-      url: userSyncIframeUrl(DEVELOPMENT)
-    }]);
-  });
-
-  describe('domain', function () {
-    expect(domain(null)).to.deep.equal(DOMAIN);
-    expect(domain('anything')).to.deep.equal(DOMAIN);
-    expect(domain(PRODUCTION)).to.deep.equal(DOMAIN);
-    expect(domain(STAGING)).to.deep.equal(DOMAIN_STAGING);
-    expect(domain(DEVELOPMENT)).to.deep.equal(DOMAIN_DEVELOPMENT);
-  });
-
-  describe('eventsUrl', function () {
-    expect(eventsUrl(null)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(DEFAULT_ENV),
-      pathname: EVENTS_PATH
-    }));
-    expect(eventsUrl('anything')).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(DEFAULT_ENV),
-      pathname: EVENTS_PATH
-    }));
-    expect(eventsUrl(PRODUCTION)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(PRODUCTION),
-      pathname: EVENTS_PATH
-    }));
-    expect(eventsUrl(STAGING)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(STAGING),
-      pathname: EVENTS_PATH
-    }));
-    expect(eventsUrl(DEVELOPMENT)).to.deep.equal(utils.buildUrl({
-      hostname: domain(DEVELOPMENT),
-      pathname: EVENTS_PATH
-    }));
-  });
-
-  describe('bidderUrl', function () {
-    expect(bidderUrl(null)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(DEFAULT_ENV),
-      pathname: BIDDER_PATH
-    }));
-    expect(bidderUrl('anything')).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(DEFAULT_ENV),
-      pathname: BIDDER_PATH
-    }));
-    expect(bidderUrl(PRODUCTION)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(PRODUCTION),
-      pathname: BIDDER_PATH
-    }));
-    expect(bidderUrl(STAGING)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(STAGING),
-      pathname: BIDDER_PATH
-    }));
-    expect(bidderUrl(DEVELOPMENT)).to.deep.equal(utils.buildUrl({
-      hostname: domain(DEVELOPMENT),
-      pathname: BIDDER_PATH
-    }));
-  });
-
-  describe('userSyncIframeUrl', function () {
-    expect(userSyncIframeUrl(null)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(DEFAULT_ENV),
-      pathname: USER_SYNC_IFRAME_PATH
-    }));
-    expect(userSyncIframeUrl('anything')).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(DEFAULT_ENV),
-      pathname: USER_SYNC_IFRAME_PATH
-    }));
-    expect(userSyncIframeUrl(PRODUCTION)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(PRODUCTION),
-      pathname: USER_SYNC_IFRAME_PATH
-    }));
-    expect(userSyncIframeUrl(STAGING)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(STAGING),
-      pathname: USER_SYNC_IFRAME_PATH
-    }));
-    expect(userSyncIframeUrl(DEVELOPMENT)).to.deep.equal(utils.buildUrl({
-      hostname: domain(DEVELOPMENT),
-      pathname: USER_SYNC_IFRAME_PATH
-    }));
-  });
-
-  describe('userSyncImageUrl', function () {
-    expect(userSyncImageUrl(null)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(DEFAULT_ENV),
-      pathname: USER_SYNC_IMAGE_PATH
-    }));
-    expect(userSyncImageUrl('anything')).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(DEFAULT_ENV),
-      pathname: USER_SYNC_IMAGE_PATH
-    }));
-    expect(userSyncImageUrl(PRODUCTION)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(PRODUCTION),
-      pathname: USER_SYNC_IMAGE_PATH
-    }));
-    expect(userSyncImageUrl(STAGING)).to.deep.equal(utils.buildUrl({
-      protocol: 'https',
-      hostname: domain(STAGING),
-      pathname: USER_SYNC_IMAGE_PATH
-    }));
-    expect(userSyncImageUrl(DEVELOPMENT)).to.deep.equal(utils.buildUrl({
-      hostname: domain(DEVELOPMENT),
-      pathname: USER_SYNC_IMAGE_PATH
-    }));
-  });
-
-  describe('conformBidRequest', function () {
-    expect(conformBidRequest(cannedValidBidRequests[0])).to.deep.equal({
-      params: cannedValidBidRequests[0].params,
-      crumbs: cannedValidBidRequests[0].crumbs,
-      sizes: cannedValidBidRequests[0].sizes,
-      bidId: cannedValidBidRequests[0].bidId,
-      bidderRequestId: cannedValidBidRequests[0].bidderRequestId,
-    });
-  });
-
-  describe('gdprConsent', function () {
-    describe('gdpr applies, consent given', function () {
-      const bidderRequest = {
-        ...cannedBidderRequest,
-        gdprConsent: {
-          gdprApplies: true,
-          vendorData: {vendorConsents: {[VENDOR_ID]: true}},
-        }
-      };
-      expect(gdprConsent(bidderRequest)).to.deep.equal(true);
-    });
-    describe('gdpr applies, consent withdrawn', function () {
-      const bidderRequest = {
-        ...cannedBidderRequest,
-        gdprConsent: {
-          gdprApplies: true,
-          vendorData: {vendorConsents: {[VENDOR_ID]: false}},
-        }
-      };
-      expect(gdprConsent(bidderRequest)).to.deep.equal(false);
-    });
-    describe('gdpr applies, consent unknown', function () {
-      const bidderRequest = {
-        ...cannedBidderRequest,
-        gdprConsent: {
-          gdprApplies: true,
-          vendorData: {},
-        }
-      };
-      expect(gdprConsent(bidderRequest)).to.deep.equal(undefined);
-    });
-  });
-
-  describe('requestsPayload', function () {
-    const
-      currency = 'EUR',
-      debug = true;
-
-    const payload = requestsPayload(debug, currency, cannedValidBidRequests, cannedBidderRequest);
-
-    expect(payload).to.exist.and.have.all.keys(
-      'akPbjsVersion',
-      'bidRequests',
-      'currency',
-      'debug',
-      'language',
-      'refererInfo',
-      'deviceInfo',
-      'userAgent',
-      'gdprApplies',
-      'gdprConsent',
-    );
-
-    expect(payload.bidRequests[0]).to.exist.and.have.all.keys(
-      'params',
-      'crumbs',
-      'sizes',
-      'bidId',
-      'bidderRequestId',
-    );
-
-    expect(payload.akPbjsVersion).to.deep.equal(ADAPTER_VERSION);
-    expect(payload.bidRequests[0].params).to.deep.equal(cannedValidBidRequests[0].params);
-    expect(payload.bidRequests[0].crumbs).to.deep.equal(cannedValidBidRequests[0].crumbs);
-    expect(payload.bidRequests[0].mediaTypes).to.deep.equal(cannedValidBidRequests[0].mediaTypes);
-    expect(payload.bidRequests[0].bidId).to.deep.equal(cannedValidBidRequests[0].bidId);
-    expect(payload.bidRequests[0].bidderRequestId).to.deep.equal(cannedValidBidRequests[0].bidderRequestId);
-    expect(payload.currency).to.deep.equal(currency);
-    expect(payload.debug).to.deep.equal(debug);
-    expect(payload.language).to.deep.equal(navigator.language);
-    expect(payload.deviceInfo).to.exist.and.have.all.keys(
-      'browserWidth',
-      'browserHeight',
-      'deviceWidth',
-      'deviceHeight',
-      'documentWidth',
-      'documentHeight',
-      'webGL',
-    );
-    expect(payload.userAgent).to.deep.equal(navigator.userAgent);
-    expect(payload.gdprApplies).to.deep.equal(cannedBidderRequest.gdprConsent.gdprApplies);
-  });
-
-  describe('getViewDimensions', function () {
-    const window = {
-      innerWidth: 1024,
-      innerHeight: 768
-    };
-    const documentWithElement = {
-      documentElement:
-        {
-          clientWidth: 512,
-          clientHeight: 384
-        }
-    };
-    const documentWithBody = {
-      body:
-        {
-          clientWidth: 512,
-          clientHeight: 384
-        }
-    };
-    expect(getViewDimensions(window, documentWithElement)).to.deep.equal({
-      width: 1024,
-      height: 768
-    });
-    expect(getViewDimensions(window, documentWithBody)).to.deep.equal({width: 1024, height: 768});
-    expect(getViewDimensions(window, documentWithElement)).to.deep.equal({
-      width: 1024,
-      height: 768
-    });
-    expect(getViewDimensions(window, documentWithBody)).to.deep.equal({width: 1024, height: 768});
-    expect(getViewDimensions({}, documentWithElement)).to.deep.equal({width: 512, height: 384});
-    expect(getViewDimensions({}, documentWithBody)).to.deep.equal({width: 512, height: 384});
-  });
-
-  describe('getDeviceDimensions', function () {
-    const window = {screen: {width: 1024, height: 768}};
-    expect(getDeviceDimensions(window)).to.deep.equal({width: 1024, height: 768});
-    expect(getDeviceDimensions({})).to.deep.equal({width: '', height: ''});
-  });
-
-  describe('getDocumentDimensions', function () {
-    expect(getDocumentDimensions({
-      documentElement: {
-        clientWidth: 1,
-        clientHeight: 1,
-        offsetWidth: 0,
-        offsetHeight: 0,
-        scrollWidth: 0,
-        scrollHeight: 0,
-      },
-    })).to.deep.equal({width: 1, height: 1});
-
-    expect(getDocumentDimensions({
-      documentElement: {
-        clientWidth: 1,
-        clientHeight: 1,
-        offsetWidth: 0,
-        offsetHeight: 0,
-        scrollWidth: 0,
-        scrollHeight: 0,
-      },
-      body: {
-        scrollHeight: 0,
-        offsetHeight: 0,
-      }
-    })).to.deep.equal({width: 1, height: 1});
-
-    expect(getDocumentDimensions({
-      documentElement: {
-        clientWidth: 0,
-        clientHeight: 0,
-        offsetWidth: 1,
-        offsetHeight: 1,
-        scrollWidth: 0,
-        scrollHeight: 0,
-      },
-      body: {
-        scrollHeight: 0,
-        offsetHeight: 0,
-      }
-    })).to.deep.equal({width: 1, height: 1});
-
-    expect(getDocumentDimensions({
-      documentElement: {
-        clientWidth: 0,
-        clientHeight: 0,
-        offsetWidth: 0,
-        offsetHeight: 0,
-        scrollWidth: 1,
-        scrollHeight: 1,
-      },
-      body: {
-        scrollHeight: 0,
-        offsetHeight: 0,
-      }
-    })).to.deep.equal({width: 1, height: 1});
-
-    expect(getDocumentDimensions({
-      documentElement: {
-        clientWidth: undefined,
-        clientHeight: undefined,
-        offsetWidth: undefined,
-        offsetHeight: undefined,
-        scrollWidth: undefined,
-        scrollHeight: undefined,
-      },
-      body: {
-        scrollHeight: undefined,
-        offsetHeight: undefined,
-      }
-    })).to.deep.equal({width: '', height: ''});
-  });
-
-  // describe('isWebGLEnabled', function () {
-  //   it('handles no webgl', function () {
-  //     const
-  //       document = new Document(),
-  //       canvas = sinon.createStubInstance(HTMLCanvasElement);
-  //     sinon.stub(document, 'createElement').withArgs('canvas').returns(canvas);
-  //     canvas.getContext.withArgs('webgl').returns(undefined);
-  //     canvas.getContext.withArgs('experimental-webgl').returns(undefined);
-  //     expect(isWebGLEnabled(document)).to.equal(false);
-  //   });
-  //
-  //   it('handles webgl exception', function () {
-  //     const
-  //       document = new Document(),
-  //       canvas = sinon.createStubInstance(HTMLCanvasElement);
-  //     sinon.stub(document, 'createElement').withArgs('canvas').returns(canvas);
-  //     canvas.getContext.withArgs('webgl').throws(DOMException);
-  //     expect(isWebGLEnabled(document)).to.equal(false);
-  //   });
-  //
-  //   it('handles experimental webgl', function () {
-  //     const
-  //       document = new Document(),
-  //       canvas = sinon.createStubInstance(HTMLCanvasElement);
-  //     sinon.stub(document, 'createElement').withArgs('canvas').returns(canvas);
-  //     canvas.getContext.withArgs('webgl').returns(undefined);
-  //     canvas.getContext.withArgs('experimental-webgl').returns(true);
-  //     expect(isWebGLEnabled(document)).to.equal(true);
-  //   });
-  //
-  //   it('handles experimental webgl exception', function () {
-  //     const
-  //       document = new Document(),
-  //       canvas = sinon.createStubInstance(HTMLCanvasElement);
-  //     sinon.stub(document, 'createElement').withArgs('canvas').returns(canvas);
-  //     canvas.getContext.withArgs('webgl').returns(undefined);
-  //     canvas.getContext.withArgs('experimental-webgl').throws(DOMException);
-  //     expect(isWebGLEnabled(document)).to.equal(false);
-  //   });
-  //
-  //   it('handles webgl', function () {
-  //     const
-  //       document = new Document(),
-  //       canvas = sinon.createStubInstance(HTMLCanvasElement);
-  //     sinon.stub(document, 'createElement').withArgs('canvas').returns(canvas);
-  //     canvas.getContext.withArgs('webgl').returns(true);
-  //     expect(isWebGLEnabled(document)).to.equal(true);
-  //   });
-  // });
-
-  describe('getDeviceInfo', function () {
-    expect(getDeviceInfo(
-      {width: 1, height: 2},
-      {width: 3, height: 4},
-      {width: 5, height: 6},
-      true
-    )).to.deep.equal({
-      deviceWidth: 1,
-      deviceHeight: 2,
-      browserWidth: 3,
-      browserHeight: 4,
-      documentWidth: 5,
-      documentHeight: 6,
-      webGL: true
-    });
-  });
-
-  describe('resolveEnv', function () {
-    it('defaults to production', function () {
-      expect(resolveEnv({}, null)).to.deep.equal(DEFAULT_ENV);
-    });
-    expect(resolveEnv({}, PRODUCTION)).to.deep.equal(PRODUCTION);
-    expect(resolveEnv({}, STAGING)).to.deep.equal(STAGING);
-    expect(resolveEnv({}, DEVELOPMENT)).to.deep.equal(DEVELOPMENT);
-    expect(resolveEnv({emoteev: {env: PRODUCTION}}, null)).to.deep.equal(PRODUCTION);
-    expect(resolveEnv({emoteev: {env: STAGING}}, null)).to.deep.equal(STAGING);
-    expect(resolveEnv({emoteev: {env: DEVELOPMENT}}, null)).to.deep.equal(DEVELOPMENT);
-    it('prioritizes parameter over configuration', function () {
-      expect(resolveEnv({emoteev: {env: STAGING}}, DEVELOPMENT)).to.deep.equal(DEVELOPMENT);
-    });
-  });
-
-  describe('resolveDebug', function () {
-    it('defaults to production', function () {
-      expect(resolveDebug({}, null)).to.deep.equal(false);
-    });
-    expect(resolveDebug({}, 'false')).to.deep.equal(false);
-    expect(resolveDebug({}, 'true')).to.deep.equal(true);
-    expect(resolveDebug({debug: true}, null)).to.deep.equal(true);
-    it('prioritizes parameter over configuration', function () {
-      expect(resolveDebug({debug: true}, 'false')).to.deep.equal(false);
-    });
-  });
-
-  describe('side effects', function () {
-    let triggerPixelStub;
-    let getCookieSpy;
-    let getConfigSpy;
-    let getParameterByNameSpy;
-
-    before(function() {
-      config.resetConfig();
-    });
-    after(function() {
-      config.resetConfig();
-    });
-    beforeEach(function () {
-      triggerPixelStub = sinon.stub(utils, 'triggerPixel');
-      getCookieSpy = sinon.spy(storage, 'getCookie');
-      getConfigSpy = sinon.spy(config, 'getConfig');
-      getParameterByNameSpy = sinon.spy(utils, 'getParameterByName');
-    });
-    afterEach(function () {
-      triggerPixelStub.restore();
-      getCookieSpy.restore();
-      getConfigSpy.restore();
-      getParameterByNameSpy.restore();
-    });
-
-    describe('isBidRequestValid', function () {
-      it('has intended side-effects', function () {
-        const validBidRequest = {
-          bidder: 'emoteev',
-          bidId: '23a45b4e3',
-          params: {
-            adSpaceId: 12345,
-          },
-          mediaTypes: {
-            banner: {
-              sizes: [[750, 200]]
-            }
-          },
-        };
-        spec.isBidRequestValid(validBidRequest);
-        sinon.assert.notCalled(utils.triggerPixel);
-        sinon.assert.notCalled(storage.getCookie);
-        // sinon.assert.notCalled(config.getConfig);
-        sinon.assert.notCalled(utils.getParameterByName);
-      });
-    });
-    describe('isBidRequestValid empty request', function() {
-      it('has intended side-effects empty request', function () {
-        const invalidBidRequest = {};
-        spec.isBidRequestValid(invalidBidRequest);
-        sinon.assert.notCalled(utils.triggerPixel);
-        sinon.assert.notCalled(storage.getCookie);
-        // disabling these getConfig tests as they have been flaky in browserstack testing
-        // sinon.assert.notCalled(config.getConfig);
-        sinon.assert.notCalled(utils.getParameterByName);
-      });
-    });
-    describe('buildRequests', function () {
-      it('has intended side-effects', function () {
-        spec.buildRequests(cannedValidBidRequests, cannedBidderRequest);
-        sinon.assert.notCalled(utils.triggerPixel);
-        sinon.assert.notCalled(storage.getCookie);
-        // sinon.assert.callCount(config.getConfig, 3);
-        sinon.assert.callCount(utils.getParameterByName, 2);
-      });
-    });
-    describe('interpretResponse', function () {
-      it('has intended side-effects', function () {
-        spec.interpretResponse(serverResponse);
-        sinon.assert.notCalled(utils.triggerPixel);
-        sinon.assert.notCalled(storage.getCookie);
-        // sinon.assert.notCalled(config.getConfig);
-        sinon.assert.notCalled(utils.getParameterByName);
-      });
-    });
-    describe('onBidWon', function () {
-      it('has intended side-effects', function () {
-        const bidObject = serverResponse.body[0];
-        spec.onBidWon(bidObject);
-        sinon.assert.calledOnce(utils.triggerPixel);
-        sinon.assert.calledOnce(storage.getCookie);
-        // sinon.assert.calledOnce(config.getConfig);
-        sinon.assert.calledOnce(utils.getParameterByName);
-      });
-    });
-    describe('onTimeout', function () {
-      it('has intended side-effects', function () {
-        spec.onTimeout(cannedValidBidRequests[0]);
-        sinon.assert.calledOnce(utils.triggerPixel);
-        sinon.assert.notCalled(storage.getCookie);
-        // sinon.assert.calledOnce(config.getConfig);
-        sinon.assert.calledOnce(utils.getParameterByName);
-      });
-    });
-    describe('getUserSyncs', function () {
-      it('has intended side-effects', function () {
-        spec.getUserSyncs({});
-        sinon.assert.notCalled(utils.triggerPixel);
-        sinon.assert.notCalled(storage.getCookie);
-        // sinon.assert.calledOnce(config.getConfig);
-        sinon.assert.calledOnce(utils.getParameterByName);
-      });
-    });
-  });
-
-  describe('validateSizes', function () {
-    it('only accepts valid array of sizes', function () {
-      expect(validateSizes([])).to.deep.equal(false);
-      expect(validateSizes([[]])).to.deep.equal(false);
-      expect(validateSizes([[450, 450], undefined])).to.deep.equal(false);
-      expect(validateSizes([[450, 450], 'size'])).to.deep.equal(false);
-      expect(validateSizes([[1, 1]])).to.deep.equal(true);
-      expect(validateSizes([[1, 1], [450, 450]])).to.deep.equal(true);
-    });
-  });
-
-  describe('validateContext', function () {
-    it('only accepts valid context', function () {
-      expect(validateContext(IN_CONTENT)).to.deep.equal(true);
-      expect(validateContext(FOOTER)).to.deep.equal(true);
-      expect(validateContext(OVERLAY)).to.deep.equal(true);
-      expect(validateContext(WALLPAPER)).to.deep.equal(true);
-      expect(validateContext(null)).to.deep.equal(false);
-      expect(validateContext('anything else')).to.deep.equal(false);
-    });
-  });
-
-  describe('validateExternalId', function () {
-    it('only accepts a positive integer or null', function () {
-      expect(validateExternalId(0)).to.deep.equal(false);
-      expect(validateExternalId(42)).to.deep.equal(true);
-      expect(validateExternalId(42.0)).to.deep.equal(true); // edge case: valid externalId
-      expect(validateExternalId(3.14159)).to.deep.equal(false);
-      expect(validateExternalId('externalId')).to.deep.equal(false);
-      expect(validateExternalId(undefined)).to.deep.equal(true);
-      expect(validateExternalId(null)).to.deep.equal(true);
-    });
-  });
-});
diff --git a/test/spec/modules/emx_digitalBidAdapter_spec.js b/test/spec/modules/emx_digitalBidAdapter_spec.js
index 7be8a2ce5ac..d99318b5ddc 100644
--- a/test/spec/modules/emx_digitalBidAdapter_spec.js
+++ b/test/spec/modules/emx_digitalBidAdapter_spec.js
@@ -211,7 +211,9 @@ describe('emx_digital Adapter', function () {
       'refererInfo': {
         'numIframes': 0,
         'reachedTop': true,
-        'referer': 'https://example.com/index.html?pbjs_debug=true'
+        'page': 'https://example.com/index.html?pbjs_debug=true',
+        'domain': 'example.com',
+        'ref': 'https://referrer.com'
       },
       'bids': [{
         'bidder': 'emx_digital',
@@ -253,12 +255,38 @@ describe('emx_digital Adapter', function () {
       expect(queryParams[1]).to.match(new RegExp('^ts=\d*', 'g'));
     });
 
-    it('builds with bid floor', function () {
-      const bidRequestWithBidFloor = utils.deepClone(bidderRequest.bids);
-      bidRequestWithBidFloor[0].params.bidfloor = 1;
-      const requestWithFloor = spec.buildRequests(bidRequestWithBidFloor, bidderRequest);
+    it('builds bidfloor value from bid param when getFloor function does not exist', function () {
+      const bidRequestWithFloor = utils.deepClone(bidderRequest.bids);
+      bidRequestWithFloor[0].params.bidfloor = 1;
+      const requestWithFloor = spec.buildRequests(bidRequestWithFloor, bidderRequest);
       const data = JSON.parse(requestWithFloor.data);
-      expect(data.imp[0].bidfloor).to.equal(bidRequestWithBidFloor[0].params.bidfloor);
+      expect(data.imp[0].bidfloor).to.equal(bidRequestWithFloor[0].params.bidfloor);
+    });
+
+    it('builds bidfloor value from getFloor function when it exists', function () {
+      const floorResponse = { currency: 'USD', floor: 3 };
+      const bidRequestWithGetFloor = utils.deepClone(bidderRequest.bids);
+      bidRequestWithGetFloor[0].getFloor = () => floorResponse;
+      const requestWithGetFloor = spec.buildRequests(bidRequestWithGetFloor, bidderRequest);
+      const data = JSON.parse(requestWithGetFloor.data);
+      expect(data.imp[0].bidfloor).to.equal(3);
+    });
+
+    it('builds bidfloor value from getFloor when both floor and getFloor function exists', function () {
+      const floorResponse = { currency: 'USD', floor: 3 };
+      const bidRequestWithBothFloors = utils.deepClone(bidderRequest.bids);
+      bidRequestWithBothFloors[0].params.bidfloor = 1;
+      bidRequestWithBothFloors[0].getFloor = () => floorResponse;
+      const requestWithBothFloors = spec.buildRequests(bidRequestWithBothFloors, bidderRequest);
+      const data = JSON.parse(requestWithBothFloors.data);
+      expect(data.imp[0].bidfloor).to.equal(3);
+    });
+
+    it('empty bidfloor value when floor and getFloor is not defined', function () {
+      const bidRequestWithoutFloor = utils.deepClone(bidderRequest.bids);
+      const requestWithoutFloor = spec.buildRequests(bidRequestWithoutFloor, bidderRequest);
+      const data = JSON.parse(requestWithoutFloor.data);
+      expect(data.imp[0].bidfloor).to.not.exist;
     });
 
     it('builds request properly', function () {
@@ -278,7 +306,7 @@ describe('emx_digital Adapter', function () {
       request = JSON.parse(request.data);
       expect(request.site).to.have.property('domain', 'example.com');
       expect(request.site).to.have.property('page', 'https://example.com/index.html?pbjs_debug=true');
-      expect(request.site).to.have.property('ref', window.top.document.referrer);
+      expect(request.site).to.have.property('ref', 'https://referrer.com');
     });
 
     it('builds correctly formatted request banner object', function () {
@@ -367,6 +395,71 @@ describe('emx_digital Adapter', function () {
       expect(request.us_privacy).to.exist;
       expect(request.us_privacy).to.exist.and.to.equal(consentString);
     });
+
+    it('should add schain object to request', function() {
+      const schainBidderRequest = utils.deepClone(bidderRequest);
+      schainBidderRequest.bids[0].schain = {
+        'complete': 1,
+        'ver': '1.0',
+        'nodes': [
+          {
+            'asi': 'testing.com',
+            'sid': 'abc',
+            'hp': 1
+          }
+        ]
+      };
+      let request = spec.buildRequests(schainBidderRequest.bids, schainBidderRequest);
+      request = JSON.parse(request.data);
+      expect(request.source.ext.schain).to.exist;
+      expect(request.source.ext.schain).to.have.property('complete', 1);
+      expect(request.source.ext.schain).to.have.property('ver', '1.0');
+      expect(request.source.ext.schain.nodes[0].asi).to.equal(schainBidderRequest.bids[0].schain.nodes[0].asi);
+    });
+
+    it('should add liveramp identitylink id to request', () => {
+      const idl_env = '123';
+      const bidRequestWithID = utils.deepClone(bidderRequest);
+      bidRequestWithID.userId = { idl_env };
+      let requestWithID = spec.buildRequests(bidRequestWithID.bids, bidRequestWithID);
+      requestWithID = JSON.parse(requestWithID.data);
+      expect(requestWithID.user.ext.eids[0]).to.deep.equal({
+        source: 'liveramp.com',
+        uids: [{
+          id: idl_env,
+          ext: {
+            rtiPartner: 'idl'
+          }
+        }]
+      });
+    });
+
+    it('should add gpid to request if present', () => {
+      const gpid = '/12345/my-gpt-tag-0';
+      let bid = utils.deepClone(bidderRequest.bids[0]);
+      bid.ortb2Imp = { ext: { data: { adserver: { adslot: gpid } } } };
+      bid.ortb2Imp = { ext: { data: { pbadslot: gpid } } };
+      let requestWithGPID = spec.buildRequests([bid], bidderRequest);
+      requestWithGPID = JSON.parse(requestWithGPID.data);
+      expect(requestWithGPID.imp[0].ext.gpid).to.exist.and.equal(gpid);
+    });
+
+    it('should add UID 2.0 to request', () => {
+      const uid2 = { id: '456' };
+      const bidRequestWithUID = utils.deepClone(bidderRequest);
+      bidRequestWithUID.userId = { uid2 };
+      let requestWithUID = spec.buildRequests(bidRequestWithUID.bids, bidRequestWithUID);
+      requestWithUID = JSON.parse(requestWithUID.data);
+      expect(requestWithUID.user.ext.eids[0]).to.deep.equal({
+        source: 'uidapi.com',
+        uids: [{
+          id: uid2.id,
+          ext: {
+            rtiPartner: 'UID2'
+          }
+        }]
+      });
+    });
   });
 
   describe('interpretResponse', function () {
@@ -449,7 +542,8 @@ describe('emx_digital Adapter', function () {
           'id': '987654321cba',
           'price': 0.5,
           'ttl': 300,
-          'w': 300
+          'w': 300,
+          'adomain': ['example.com']
         }],
         'seat': '1356'
       }, {
@@ -477,7 +571,10 @@ describe('emx_digital Adapter', function () {
       'netRevneue': true,
       'mediaType': 'banner',
       'ad': '<!-- Creative -->',
-      'ttl': 300
+      'ttl': 300,
+      'meta': {
+        'advertiserDomains': ['example.com']
+      }
     }, {
       'requestId': '12819a18-56e1-4256-b836-b69a10202668',
       'cpm': 0.7,
@@ -609,15 +706,34 @@ describe('emx_digital Adapter', function () {
         body: badAdmServerResponse
       }));
     });
+
+    it('returns valid advertiser domain', function () {
+      const bidResponse = utils.deepClone(serverResponse);
+      let result = spec.interpretResponse({body: bidResponse});
+      expect(result[0].meta.advertiserDomains).to.deep.equal(expectedResponse[0].meta.advertiserDomains);
+      // case where adomains are not in request
+      expect(result[1].meta).to.not.exist;
+    });
   });
 
   describe('getUserSyncs', function () {
-    let syncOptionsIframe = { iframeEnabled: true };
-    let syncOptionsPixel = { pixelEnabled: true };
-    it('Should push the correct sync type depending on the config', function () {
-      let iframeSync = spec.getUserSyncs(syncOptionsIframe);
-      expect(iframeSync.length).to.equal(1);
-      expect(iframeSync[0].type).to.equal('iframe');
+    it('should register the iframe sync url', function () {
+      let syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      });
+      expect(syncs).to.not.be.an('undefined');
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+    });
+
+    it('should pass gdpr params', function () {
+      let syncs = spec.getUserSyncs({ iframeEnabled: true }, {}, {
+        gdprApplies: false, consentString: 'test'
+      });
+      expect(syncs).to.not.be.an('undefined');
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.contains('gdpr=0');
     });
   });
 });
diff --git a/test/spec/modules/engageyaBidAdapter_spec.js b/test/spec/modules/engageyaBidAdapter_spec.js
new file mode 100644
index 00000000000..283f0148402
--- /dev/null
+++ b/test/spec/modules/engageyaBidAdapter_spec.js
@@ -0,0 +1,524 @@
+import { expect } from 'chai';
+import { spec } from 'modules/engageyaBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT_URL = 'https://recs.engageya.com/rec-api/getrecs.json';
+
+describe('Engageya adapter', function () {
+  let bidRequests;
+  let nativeBidRequests;
+
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        }
+      }
+    ]
+
+    nativeBidRequests = [
+      {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        },
+        nativeParams: {
+          title: {
+            required: true,
+            len: 80
+          },
+          image: {
+            required: true,
+            sizes: [150, 50]
+          },
+          sponsoredBy: {
+            required: true
+          }
+        }
+      }
+    ]
+  })
+
+  describe('isValidSize', function () {
+    const bid = {
+      bidder: 'engageya',
+      params: {
+        widgetId: 85610,
+        websiteId: 91140,
+        pageUrl: '[PAGE_URL]'
+      }
+    };
+    it('Exact match, 236X202', function () {
+      bid.sizes = [[236, 202]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+    it('Exact match, 300X200', function () {
+      bid.sizes = [[300, 200]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+    it('Exact match, 600X500', function () {
+      bid.sizes = [[600, 500]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+
+    it('Ratio max limit, 236X212', function () {
+      bid.sizes = [[236, 212]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+    it('Ratio max limit, 300X209', function () {
+      bid.sizes = [[300, 209]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+    it('Ratio max limit, 600X524', function () {
+      bid.sizes = [[600, 524]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+
+    it('Ratio & width max limit, 248X222', function () {
+      bid.sizes = [[248, 222]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+    it('Ratio & width max limit, 315X220', function () {
+      bid.sizes = [[315, 220]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+    it('Ratio & width max limit, 631X551', function () {
+      bid.sizes = [[631, 551]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+
+    it('Width too big, 320X285', function () {
+      bid.sizes = [[320, 285]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.false;
+    });
+    it('Width too big, 316X220', function () {
+      bid.sizes = [[316, 220]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.false;
+    });
+    it('Width too big, 632X551', function () {
+      bid.sizes = [[632, 551]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.false;
+    });
+
+    it('Ratio too big, 600X525', function () {
+      bid.sizes = [[600, 525]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.false;
+    });
+
+    it('Ratio min limit, 236X192', function () {
+      bid.sizes = [[236, 192]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+    it('Ratio min limit, 300X190', function () {
+      bid.sizes = [[300, 190]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+    it('Ratio min limit, 600X475', function () {
+      bid.sizes = [[600, 475]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.true;
+    });
+
+    it('Ratio too small, 600X474', function () {
+      bid.sizes = [[600, 474]];
+      const isValid = spec.isBidRequestValid(bid);
+      expect(isValid).to.be.false;
+    });
+  })
+
+  describe('isBidRequestValid', function () {
+    it('Valid bid case', function () {
+      let validBid = {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        },
+        sizes: [[300, 250]]
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.be.true;
+    });
+
+    it('Invalid bid case: widgetId and websiteId is not passed', function () {
+      let validBid = {
+        bidder: 'engageya',
+        params: {}
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.be.false;
+    })
+
+    it('Invalid bid case: widget id must be number', function () {
+      let invalidBid = {
+        bidder: 'engageya',
+        params: {
+          widgetId: '157746a',
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        },
+        sizes: [[300, 250]]
+      }
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.be.false;
+    })
+
+    it('Invalid bid case: unsupported sizes', function () {
+      let invalidBid = {
+        bidder: 'engageya',
+        params: {
+          widgetId: '157746a',
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        },
+        sizes: [[250, 250]]
+      }
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.be.false;
+    })
+  })
+
+  describe('buildRequests', function () {
+    it('sends bid request to ENDPOINT via GET', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.include(ENDPOINT_URL);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('buildRequests function should not modify original bidRequests object', function () {
+      let originalBidRequests = utils.deepClone(bidRequests);
+      let request = spec.buildRequests(bidRequests);
+      expect(bidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('buildRequests function should not modify original nativeBidRequests object', function () {
+      let originalBidRequests = utils.deepClone(nativeBidRequests);
+      let request = spec.buildRequests(nativeBidRequests);
+      expect(nativeBidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('Request params check', function () {
+      let request = spec.buildRequests(bidRequests)[0];
+      const urlParams = new URL(request.url).searchParams;
+      expect(parseInt(urlParams.get('wid'))).to.exist.and.to.equal(bidRequests[0].params.widgetId);
+      expect(parseInt(urlParams.get('webid'))).to.exist.and.to.equal(bidRequests[0].params.websiteId);
+    });
+
+    it('Request pageUrl - use param', function () {
+      const pageUrl = 'https://url.test';
+      bidRequests[0].params.pageUrl = pageUrl;
+      const request = spec.buildRequests(bidRequests)[0];
+      const urlParams = new URL(request.url).searchParams;
+      expect(urlParams.get('url')).to.exist.and.to.equal(pageUrl);
+    });
+  })
+
+  describe('interpretResponse', function () {
+    let nativeResponse;
+    let bannerResponse;
+
+    beforeEach(() => {
+      const recsResponse = {
+        recs: [
+          {
+            ecpm: 9.20,
+            pecpm: 0.0520,
+            postId: '<!-- CREATIVE ID -->',
+            thumbnail_path: 'https://engageya.live/wp-content/uploads/2019/05/images.png',
+            domain: 'domain.test',
+            title: 'Test title',
+            clickUrl: '//click.test',
+            url: '//url.test',
+            displayName: 'Test displayName',
+            trackers: {
+              impressionPixels: ['//impression.test'],
+              viewPixels: ['//view.test'],
+            }
+          }
+        ],
+        imageWidth: 300,
+        imageHeight: 250,
+        ireqId: '1d236f7890b',
+        viewPxl: '//view.pixel',
+      };
+
+      nativeResponse = {
+        ...recsResponse,
+        pbtypeId: 1,
+      }
+
+      bannerResponse = {
+        ...recsResponse,
+        pbtypeId: 2,
+        widget: {
+          additionalData: '{"css":".eng_tag_ttl{display:block!important}"}'
+        },
+      }
+    })
+
+    it('should return empty array if no response', function () {
+      const result = spec.interpretResponse({}, [])
+      expect(result).to.be.an('array').that.is.empty
+    });
+
+    it('should return empty array if no valid bids', function () {
+      let response = {
+        recs: [],
+        imageWidth: 300,
+        imageHeight: 250,
+        ireqId: '1d236f7890b',
+        pbtypeId: 2,
+        viewPxl: '//view.pixel',
+      };
+      let request = spec.buildRequests(bidRequests)[0];
+      const result = spec.interpretResponse({ body: response }, request)
+      expect(result).to.be.an('array').that.is.empty
+    });
+
+    it('should interpret native response', function () {
+      let expectedResult = [
+        {
+          requestId: '1d236f7890b',
+          cpm: 0.0520,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          currency: 'USD',
+          creativeId: '<!-- CREATIVE ID -->',
+          ttl: 360,
+          meta: {
+            advertiserDomains: ['domain.test']
+          },
+          native: {
+            title: 'Test title',
+            body: '',
+            image: {
+              url: 'https://engageya.live/wp-content/uploads/2019/05/images.png',
+              width: 300,
+              height: 250
+            },
+            privacyLink: '',
+            clickUrl: '//click.test',
+            displayUrl: '//url.test',
+            cta: '',
+            sponsoredBy: 'Test displayName',
+            impressionTrackers: ['//impression.test', '//view.test', '//view.pixel'],
+          },
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({ body: nativeResponse }, request);
+      expect(result).to.deep.equal(expectedResult);
+    });
+
+    it('should interpret native response - without pecpm', function () {
+      delete nativeResponse.recs[0].pecpm;
+      let expectedResult = [
+        {
+          requestId: '1d236f7890b',
+          cpm: 0.0920,
+          width: 300,
+          height: 250,
+          netRevenue: false,
+          currency: 'USD',
+          creativeId: '<!-- CREATIVE ID -->',
+          ttl: 360,
+          meta: {
+            advertiserDomains: ['domain.test']
+          },
+          native: {
+            title: 'Test title',
+            body: '',
+            image: {
+              url: 'https://engageya.live/wp-content/uploads/2019/05/images.png',
+              width: 300,
+              height: 250
+            },
+            privacyLink: '',
+            clickUrl: '//click.test',
+            displayUrl: '//url.test',
+            cta: '',
+            sponsoredBy: 'Test displayName',
+            impressionTrackers: ['//impression.test', '//view.test', '//view.pixel'],
+          },
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({ body: nativeResponse }, request);
+      expect(result).to.deep.equal(expectedResult);
+    });
+
+    it('should interpret native response - without trackers', function () {
+      delete nativeResponse.recs[0].trackers;
+      let expectedResult = [
+        {
+          requestId: '1d236f7890b',
+          cpm: 0.0520,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          currency: 'USD',
+          creativeId: '<!-- CREATIVE ID -->',
+          ttl: 360,
+          meta: {
+            advertiserDomains: ['domain.test']
+          },
+          native: {
+            title: 'Test title',
+            body: '',
+            image: {
+              url: 'https://engageya.live/wp-content/uploads/2019/05/images.png',
+              width: 300,
+              height: 250
+            },
+            privacyLink: '',
+            clickUrl: '//click.test',
+            displayUrl: '//url.test',
+            cta: '',
+            sponsoredBy: 'Test displayName',
+            impressionTrackers: ['//view.pixel'],
+          },
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({ body: nativeResponse }, request);
+      expect(result).to.deep.equal(expectedResult);
+    });
+
+    it('should interpret display response', function () {
+      let expectedResult = [
+        {
+          requestId: '1d236f7890b',
+          cpm: 0.0520,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          currency: 'USD',
+          creativeId: '<!-- CREATIVE ID -->',
+          ttl: 360,
+          meta: {
+            advertiserDomains: ['domain.test']
+          },
+          ad: `<html><body><style>.eng_tag_ttl{display:block!important}</style><div id="ENG_TAG"><a href="//click.test" target=_blank><img class="eng_tag_img" src="https://engageya.live/wp-content/uploads/2019/05/images.png" style="width:300px;height:250px;" alt="Test title"/><div class="eng_tag_brnd" style="display: none">Test displayName</div><div class="eng_tag_ttl" style="display: none">Test title</div></a><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//impression.test"></div><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.test"></div><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.pixel"></div></div></body></html>`,
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({ body: bannerResponse }, request);
+      expect(result).to.deep.equal(expectedResult);
+    });
+
+    it('should interpret display response - without pecpm', function () {
+      delete bannerResponse.recs[0].pecpm;
+      let expectedResult = [
+        {
+          requestId: '1d236f7890b',
+          cpm: 0.0920,
+          width: 300,
+          height: 250,
+          netRevenue: false,
+          currency: 'USD',
+          creativeId: '<!-- CREATIVE ID -->',
+          ttl: 360,
+          meta: {
+            advertiserDomains: ['domain.test']
+          },
+          ad: `<html><body><style>.eng_tag_ttl{display:block!important}</style><div id="ENG_TAG"><a href="//click.test" target=_blank><img class="eng_tag_img" src="https://engageya.live/wp-content/uploads/2019/05/images.png" style="width:300px;height:250px;" alt="Test title"/><div class="eng_tag_brnd" style="display: none">Test displayName</div><div class="eng_tag_ttl" style="display: none">Test title</div></a><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//impression.test"></div><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.test"></div><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.pixel"></div></div></body></html>`,
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({ body: bannerResponse }, request);
+      expect(result).to.deep.equal(expectedResult);
+    });
+
+    it('should interpret display response - without title', function () {
+      bannerResponse.recs[0].title = ' ';
+      let expectedResult = [
+        {
+          requestId: '1d236f7890b',
+          cpm: 0.0520,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          currency: 'USD',
+          creativeId: '<!-- CREATIVE ID -->',
+          ttl: 360,
+          meta: {
+            advertiserDomains: ['domain.test']
+          },
+          ad: `<html><body><style>.eng_tag_ttl{display:block!important}</style><div id="ENG_TAG"><a href="//click.test" target=_blank><img class="eng_tag_img" src="https://engageya.live/wp-content/uploads/2019/05/images.png" style="width:300px;height:250px;" alt=" "/></a><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//impression.test"></div><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.test"></div><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.pixel"></div></div></body></html>`,
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({ body: bannerResponse }, request);
+      expect(result).to.deep.equal(expectedResult);
+    });
+
+    it('should interpret display response - without widget additional data', function () {
+      bannerResponse.widget.additionalData = null;
+      let expectedResult = [
+        {
+          requestId: '1d236f7890b',
+          cpm: 0.0520,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          currency: 'USD',
+          creativeId: '<!-- CREATIVE ID -->',
+          ttl: 360,
+          meta: {
+            advertiserDomains: ['domain.test']
+          },
+          ad: `<html><body><div id="ENG_TAG"><a href="//click.test" target=_blank><img class="eng_tag_img" src="https://engageya.live/wp-content/uploads/2019/05/images.png" style="width:300px;height:250px;" alt="Test title"/><div class="eng_tag_brnd" style="display: none">Test displayName</div><div class="eng_tag_ttl" style="display: none">Test title</div></a><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//impression.test"></div><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.test"></div><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.pixel"></div></div></body></html>`,
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({ body: bannerResponse }, request);
+      expect(result).to.deep.equal(expectedResult);
+    });
+
+    it('should interpret display response - without trackers', function () {
+      bannerResponse.recs[0].trackers = null;
+      let expectedResult = [
+        {
+          requestId: '1d236f7890b',
+          cpm: 0.0520,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          currency: 'USD',
+          creativeId: '<!-- CREATIVE ID -->',
+          ttl: 360,
+          meta: {
+            advertiserDomains: ['domain.test']
+          },
+          ad: `<html><body><style>.eng_tag_ttl{display:block!important}</style><div id="ENG_TAG"><a href="//click.test" target=_blank><img class="eng_tag_img" src="https://engageya.live/wp-content/uploads/2019/05/images.png" style="width:300px;height:250px;" alt="Test title"/><div class="eng_tag_brnd" style="display: none">Test displayName</div><div class="eng_tag_ttl" style="display: none">Test title</div></a><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="//view.pixel"></div></div></body></html>`,
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({ body: bannerResponse }, request);
+      expect(result).to.deep.equal(expectedResult);
+    });
+  })
+})
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/spec/modules/envivoBidAdapter_spec.js b/test/spec/modules/envivoBidAdapter_spec.js
deleted file mode 100644
index 7bd1dd1ccf1..00000000000
--- a/test/spec/modules/envivoBidAdapter_spec.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/envivoBidAdapter.js';
-
-const ENDPOINT = 'https://ad.nvivo.tv/ads/www/admin/plugins/Prebid/getAd.php';
-
-describe('The Envivo bidding adapter', function () {
-  describe('isBidRequestValid', function () {
-    it('should return false when given an invalid bid', function () {
-      const bid = {
-        bidder: 'envivo',
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(false);
-    });
-
-    it('should return true when given a publisherId in bid', function () {
-      const bid = {
-        bidder: 'envivo',
-        params: {
-          publisherId: 14
-        },
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bidRequests = [{
-      'bidder': 'envivo',
-      'params': {
-        'publisherId': 14
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250],
-        [300, 600]
-      ]
-    }];
-
-    const request = spec.buildRequests(bidRequests);
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('check endpoint url', function () {
-      expect(request.url).to.equal(ENDPOINT)
-    });
-
-    it('sets the proper banner object', function () {
-      expect(bidRequests[0].params.publisherId).to.equal(14);
-    })
-  });
-  const response = {
-    body: [
-      {
-        'requestId': '2ee937f15015c6',
-        'cpm': '0.2000',
-        'width': 300,
-        'height': 600,
-        'creativeId': '4',
-        'currency': 'USD',
-        'netRevenue': true,
-        'ad': 'ads.html',
-        'mediaType': 'banner'
-      },
-      {
-        'requestId': '3e1af92622bdc',
-        'cpm': '0.2000',
-        'creativeId': '4',
-        'context': 'outstream',
-        'currency': 'USD',
-        'netRevenue': true,
-        'vastUrl': 'tezt.xml',
-        'width': 640,
-        'height': 480,
-        'mediaType': 'video'
-      }]
-  };
-
-  const request = [
-    {
-      'bidder': 'envivo',
-      'params': {
-        'publisherId': 14
-      },
-      'mediaTypes': {
-        'banner': {
-          'sizes': [
-            [300, 600]
-          ]
-        }
-      },
-      'bidId': '2ee937f15015c6',
-      'src': 'client',
-    },
-    {
-      'bidder': 'envivo',
-      'params': {
-        'publisherId': 14
-      },
-      'mediaTypes': {
-        'video': {
-          'context': 'outstream',
-          'playerSize': [
-            [640, 480]
-          ]
-        }
-      },
-      'bidId': '3e1af92622bdc',
-      'src': 'client',
-    }
-  ];
-
-  describe('interpretResponse', function () {
-    it('return empty array when no ad found', function () {
-      const response = {};
-      const request = { bidRequests: [] };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('check response for banner and video', function () {
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(2);
-      expect(bids[0].requestId).to.equal('2ee937f15015c6');
-      expect(bids[0].cpm).to.equal('0.2000');
-      expect(bids[1].cpm).to.equal('0.2000');
-      expect(bids[0].width).to.equal(300);
-      expect(bids[0].height).to.equal(600);
-      expect(bids[1].vastUrl).to.not.equal('');
-      expect(bids[0].ad).to.not.equal('');
-      expect(bids[1].adResponse).to.not.equal('');
-      expect(bids[1].renderer).not.to.be.an('undefined');
-    });
-  });
-
-  describe('On winning bid', function () {
-    const bids = spec.interpretResponse(response, request);
-    spec.onBidWon(bids);
-  });
-
-  describe('On bid Time out', function () {
-    const bids = spec.interpretResponse(response, request);
-    spec.onTimeout(bids);
-  });
-
-  describe('user sync', function () {
-    it('to check the user sync iframe', function () {
-      let syncs = spec.getUserSyncs({
-        iframeEnabled: true
-      });
-      expect(syncs).to.not.be.an('undefined');
-      expect(syncs).to.have.lengthOf(1);
-      expect(syncs[0].type).to.equal('iframe');
-    });
-  });
-});
diff --git a/test/spec/modules/eplanningAnalyticsAdapter_spec.js b/test/spec/modules/eplanningAnalyticsAdapter_spec.js
index 255d116a0ff..419181de983 100644
--- a/test/spec/modules/eplanningAnalyticsAdapter_spec.js
+++ b/test/spec/modules/eplanningAnalyticsAdapter_spec.js
@@ -1,5 +1,5 @@
 import eplAnalyticsAdapter from 'modules/eplanningAnalyticsAdapter.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {includes} from 'src/polyfill.js';
 import { expect } from 'chai';
 import { parseUrl } from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
@@ -152,9 +152,6 @@ describe('eplanning analytics adapter', function () {
 
       // Step 10 check that the host to send the ajax request is configurable via options
       expect(eplAnalyticsAdapter.context.host).to.equal(initOptions.host);
-
-      // Step 11 verify that we received 6 events
-      sinon.assert.callCount(eplAnalyticsAdapter.track, 6);
     });
   });
 });
diff --git a/test/spec/modules/eplanningBidAdapter_spec.js b/test/spec/modules/eplanningBidAdapter_spec.js
index f267680b46b..cb8393a29b8 100644
--- a/test/spec/modules/eplanningBidAdapter_spec.js
+++ b/test/spec/modules/eplanningBidAdapter_spec.js
@@ -1,6 +1,13 @@
 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, 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';
+import { makeSlot } from '../integration/faker/googletag.js';
+import {BANNER, VIDEO} from '../../../src/mediaTypes.js';
 
 describe('E-Planning Adapter', function () {
   const adapter = newBidder('spec');
@@ -13,6 +20,7 @@ describe('E-Planning Adapter', function () {
   const CLEAN_ADUNIT_CODE2 = '300x250_1';
   const CLEAN_ADUNIT_CODE = '300x250_0';
   const CLEAN_ADUNIT_CODE_ML = 'adunitco_de';
+  const CLEAN_ADUNIT_CODE_VAST = 'VIDEO_300x250_0';
   const BID_ID = '123456789';
   const BID_ID2 = '987654321';
   const BID_ID3 = '998877665';
@@ -23,6 +31,10 @@ describe('E-Planning Adapter', function () {
   const I_ID = '7854abc56248f873';
   const CRID = '1234567890';
   const TEST_ISV = 'leles.e-planning.net';
+  const ADOMAIN = 'adomain.com';
+  const ADM_VAST = '<VAST version=\"2.0\">\n<Ad id=\"602833\">\n<Wrapper>\n<AdSystem>Acudeo Compatible</AdSystem>\n<VASTAdTagURI>\nhttp://demo.tremormedia.com/proddev/vast/vast_inline_linear.xml\n</VASTAdTagURI>\n<Impression><![CDATA[https://cndigrazia34.devel.e-planning.net:444/eli/4/19911d/6584303d5d0da8bc?i=0123456789012345&fi=0123456789abcdef&pb=<% EXCHANGE_EPBID_49 %>&nfc=1&S=<% SERVER_ID %>&rnd=733663791&bk=0123456789abcdef]]></Impression><Impression>http://myTrackingURL/wrapper/impression</Impression>\n<Creatives>\n<Creative AdID=\"602833\">\n<Linear>\n<TrackingEvents></TrackingEvents>\n</Linear>\n</Creative>\n<Creative AdID=\"602833-Companion\">\n<CompanionAds>\n<Companion width=\"300\" height=\"250\">\n<StaticResource creativeType=\"image/jpeg\">\nhttp://demo.tremormedia.com/proddev/vast/300x250_banner1.jpg\n</StaticResource>\n<TrackingEvents>\n<Tracking event=\"creativeView\">\nhttp://myTrackingURL/wrapper/firstCompanionCreativeView\n</Tracking>\n</TrackingEvents>\n<CompanionClickThrough>http://www.tremormedia.com</CompanionClickThrough>\n</Companion>\n<Companion width=\"728\" height=\"90\">\n<StaticResource creativeType=\"image/jpeg\">\nhttp://demo.tremormedia.com/proddev/vast/728x90_banner1.jpg\n</StaticResource>\n<CompanionClickThrough>http://www.tremormedia.com</CompanionClickThrough>\n</Companion>\n</CompanionAds>\n</Creative>\n</Creatives>\n</Wrapper>\n</Ad>\n</VAST>\n';
+  const ADM_VAST_VV_1 = '<VideoAdServingTemplate xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"vast_loose.xsd\">test</VideoAdServingTemplate>';
+  const DEFAULT_SIZE_VAST = '640x480';
   const validBid = {
     'bidder': 'eplanning',
     'bidId': BID_ID,
@@ -32,6 +44,15 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': ADUNIT_CODE,
     'sizes': [[300, 250], [300, 600]],
   };
+  const validBid2 = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID2,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE2,
+    'sizes': [[300, 250], [300, 600]],
+  };
   const ML = '1';
   const validBidMappingLinear = {
     'bidder': 'eplanning',
@@ -43,15 +64,120 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': ADUNIT_CODE,
     'sizes': [[300, 250], [300, 600]],
   };
-  const validBid2 = {
+  const SN = 'spaceName';
+  const validBidSpaceName = {
     'bidder': 'eplanning',
-    'bidId': BID_ID2,
+    'bidId': BID_ID,
     'params': {
       'ci': CI,
+      'sn': SN,
     },
-    'adUnitCode': ADUNIT_CODE2,
     'sizes': [[300, 250], [300, 600]],
   };
+  const validBidSpaceOutstream = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'outstream',
+        'playerSize': [300, 600],
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const validBidOutstreamNoSize = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'outstream',
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const validBidOutstreamNSizes = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'outstream',
+        'playerSize': [[300, 600], [400, 500], [500, 500]],
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const bidOutstreamInvalidSizes = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'outstream',
+        'playerSize': 'invalidSize',
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const validBidSpaceInstream = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'instream',
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const validBidSpaceVastNoContext = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
   const validBidView = {
     'bidder': 'eplanning',
     'bidId': BID_ID,
@@ -95,6 +221,47 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': 'adunit-code',
     'sizes': [[300, 250], [300, 600]],
   };
+  const validBidExistingSizesInPriorityListForMobile = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [320, 50], [300, 50]],
+  };
+  const validBidSizesNotExistingInPriorityListForMobile = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [300, 70], [160, 600]],
+  };
+  const validBidExistingSizesInPriorityListForDesktop = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [300, 600], [300, 250]],
+    'ext': {
+      'screen': {
+        'w': 1025,
+        'h': 1025
+      }
+    }
+  };
+  const validBidNoSize = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    }
+  };
   const response = {
     body: {
       'sI': {
@@ -126,6 +293,68 @@ describe('E-Planning Adapter', function () {
       ]
     }
   };
+  const responseVast = {
+    body: {
+      'sI': {
+        'k': '12345'
+      },
+      'sec': {
+        'k': 'ROS'
+      },
+      'sp': [{
+        'k': CLEAN_ADUNIT_CODE_VAST,
+        'a': [{
+          'adm': ADM_VAST,
+          'id': '7854abc56248f874',
+          'i': I_ID,
+          'fi': '7854abc56248f872',
+          'ip': '45621afd87462104',
+          'w': W,
+          'h': H,
+          'crid': CRID,
+          'pr': CPM
+        }],
+      }],
+      'cs': [
+        'http://a-sync-url.com/',
+        {
+          'u': 'http://another-sync-url.com/test.php?&partner=123456&endpoint=us-east',
+          'ifr': true
+        }
+      ]
+    }
+  };
+  const responseVastVV1 = {
+    body: {
+      'sI': {
+        'k': '12345'
+      },
+      'sec': {
+        'k': 'ROS'
+      },
+      'sp': [{
+        'k': CLEAN_ADUNIT_CODE_VAST,
+        'a': [{
+          'adm': ADM_VAST_VV_1,
+          'id': '7854abc56248f874',
+          'i': I_ID,
+          'fi': '7854abc56248f872',
+          'ip': '45621afd87462104',
+          'w': W,
+          'h': H,
+          'crid': CRID,
+          'pr': CPM
+        }],
+      }],
+      'cs': [
+        'http://a-sync-url.com/',
+        {
+          'u': 'http://another-sync-url.com/test.php?&partner=123456&endpoint=us-east',
+          'ifr': true
+        }
+      ]
+    }
+  };
   const responseWithTwoAdunits = {
     body: {
       'sI': {
@@ -191,6 +420,39 @@ describe('E-Planning Adapter', function () {
       ]
     }
   };
+  const responseWithAdomain = {
+    body: {
+      'sI': {
+        'k': '12345'
+      },
+      'sec': {
+        'k': 'ROS'
+      },
+      'sp': [{
+        'k': CLEAN_ADUNIT_CODE,
+        'a': [{
+          'adm': ADM,
+          'id': '7854abc56248f874',
+          'i': I_ID,
+          'fi': '7854abc56248f872',
+          'ip': '45621afd87462104',
+          'w': W,
+          'h': H,
+          'crid': CRID,
+          'pr': CPM,
+          'adom': ADOMAIN
+        }],
+      }],
+      'cs': [
+        'http://a-sync-url.com/',
+        {
+          'u': 'http://another-sync-url.com/test.php?&partner=123456&endpoint=us-east',
+          'ifr': true
+        }
+      ]
+    }
+  };
+
   const responseWithNoSpace = {
     body: {
       'sI': {
@@ -211,7 +473,9 @@ describe('E-Planning Adapter', function () {
   const refererUrl = 'https://localhost';
   const bidderRequest = {
     refererInfo: {
-      referer: refererUrl
+      page: refererUrl,
+      domain: 'localhost',
+      ref: refererUrl,
     },
     gdprConsent: {
       gdprApplies: 1,
@@ -225,6 +489,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');
@@ -247,9 +515,35 @@ describe('E-Planning Adapter', function () {
 
   describe('buildRequests', function () {
     let bidRequests = [validBid];
+    let sandbox;
+    let getWindowSelfStub;
+    let innerWidth;
+    beforeEach(() => {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        eplanning: {
+          storageAllowed: true
+        }
+      };
+      sandbox = sinon.sandbox.create();
+      getWindowSelfStub = sandbox.stub(utils, 'getWindowSelf');
+      getWindowSelfStub.returns(createWindow(800));
+    });
+
+    afterEach(() => {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      sandbox.restore();
+    });
+
+    const createWindow = (innerWidth) => {
+      const win = {};
+      win.self = win;
+      win.innerWidth = innerWidth;
+      return win;
+    };
+
     it('should create the url correctly', function () {
       const url = spec.buildRequests(bidRequests, bidderRequest).url;
-      expect(url).to.equal('https://ads.us.e-planning.net/hb/1/' + CI + '/1/localhost/ROS');
+      expect(url).to.equal('https://pbjs.e-planning.net/pbjs/1/' + CI + '/1/localhost/ROS');
     });
 
     it('should return GET method', function () {
@@ -257,11 +551,6 @@ describe('E-Planning Adapter', function () {
       expect(method).to.equal('GET');
     });
 
-    it('should return r parameter with value pbjs', function () {
-      const r = spec.buildRequests(bidRequests, bidderRequest).data.r;
-      expect(r).to.equal('pbjs');
-    });
-
     it('should return pbv parameter with value prebid version', function () {
       const pbv = spec.buildRequests(bidRequests, bidderRequest).data.pbv;
       expect(pbv).to.equal('$prebid.version$');
@@ -278,6 +567,12 @@ describe('E-Planning Adapter', function () {
       expect(e).to.equal(CLEAN_ADUNIT_CODE_ML + ':300x250,300x600');
     });
 
+    it('should return e parameter with space name attribute with value according to the adunit sizes', function () {
+      let bidRequestsSN = [validBidSpaceName];
+      const e = spec.buildRequests(bidRequestsSN, bidderRequest).data.e;
+      expect(e).to.equal(SN + ':300x250,300x600');
+    });
+
     it('should return correct e parameter with more than one adunit', function () {
       const NEW_CODE = ADUNIT_CODE + '2';
       const CLEAN_NEW_CODE = CLEAN_ADUNIT_CODE + '2';
@@ -295,6 +590,77 @@ describe('E-Planning Adapter', function () {
       expect(e).to.equal('300x250_0:300x250,300x600+100x100_0:100x100');
     });
 
+    it('should return correct e parameter with support vast with one space with size outstream', function () {
+      let bidRequests = [validBidSpaceOutstream];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_300x600_0:300x600;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should correctly return the e parameter with n sizes in playerSize', function () {
+      let bidRequests = [validBidOutstreamNSizes];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_300x600_0:300x600;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should correctly return the e parameter with invalid sizes in playerSize', function () {
+      let bidRequests = [bidOutstreamInvalidSizes];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_' + DEFAULT_SIZE_VAST + '_0:' + DEFAULT_SIZE_VAST + ';1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should return correct e parameter with support vast with one space with size default outstream', function () {
+      let bidRequests = [validBidOutstreamNoSize];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_640x480_0:640x480;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should return correct e parameter with support vast with one space with size instream', function () {
+      let bidRequests = [validBidSpaceInstream];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_640x480_0:640x480;1');
+      expect(data.vctx).to.equal(1);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should return correct e parameter with support vast with one space with size default and vctx default', function () {
+      let bidRequests = [validBidSpaceVastNoContext];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_640x480_0:640x480;1');
+      expect(data.vctx).to.equal(1);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('if 2 bids arrive, one outstream and the other instream, instream has more priority', function () {
+      let bidRequests = [validBidSpaceOutstream, validBidSpaceInstream];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_640x480_0:640x480;1');
+      expect(data.vctx).to.equal(1);
+      expect(data.vv).to.equal(3);
+    });
+    it('if 2 bids arrive, one outstream and another banner, outstream has more priority', function () {
+      let bidRequests = [validBidSpaceOutstream, validBidSpaceName];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_300x600_0:300x600;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should return correct e parameter with support vast with one space outstream', function () {
+      let bidRequests = [validBidSpaceOutstream, validBidOutstreamNoSize];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_300x600_0:300x600;1+video_640x480_1:640x480;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
     it('should return correct e parameter with linear mapping attribute with more than one adunit', function () {
       let bidRequestsML = [validBidMappingLinear];
       const NEW_CODE = ADUNIT_CODE + '2';
@@ -314,6 +680,23 @@ describe('E-Planning Adapter', function () {
       expect(e).to.equal(CLEAN_ADUNIT_CODE_ML + ':300x250,300x600+' + CLEAN_NEW_CODE + ':100x100');
     });
 
+    it('should return correct e parameter with space name attribute with more than one adunit', function () {
+      let bidRequestsSN = [validBidSpaceName];
+      const NEW_SN = 'anotherNameSpace';
+      const anotherBid = {
+        'bidder': 'eplanning',
+        'params': {
+          'ci': CI,
+          'sn': NEW_SN,
+        },
+        'sizes': [[100, 100]],
+      };
+      bidRequestsSN.push(anotherBid);
+
+      const e = spec.buildRequests(bidRequestsSN, bidderRequest).data.e;
+      expect(e).to.equal(SN + ':300x250,300x600+' + NEW_SN + ':100x100');
+    });
+
     it('should return correct e parameter when the adunit has no size', function () {
       const noSizeBid = {
         'bidder': 'eplanning',
@@ -343,7 +726,7 @@ describe('E-Planning Adapter', function () {
 
     it('should return ur parameter with current window url', function () {
       const ur = spec.buildRequests(bidRequests, bidderRequest).data.ur;
-      expect(ur).to.equal(bidderRequest.refererInfo.referer);
+      expect(ur).to.equal(bidderRequest.refererInfo.page);
     });
 
     it('should return fr parameter when there is a referrer', function () {
@@ -388,6 +771,26 @@ describe('E-Planning Adapter', function () {
       const dataRequest = request.data;
       expect(dataRequest.ccpa).to.equal('consentCcpa');
     });
+
+    it('should return the e parameter with a value according to the sizes in order corresponding to the mobile priority list of the ad units', function () {
+      let bidRequestsPrioritySizes = [validBidExistingSizesInPriorityListForMobile];
+      const e = spec.buildRequests(bidRequestsPrioritySizes, bidderRequest).data.e;
+      expect(e).to.equal('320x50_0:320x50,300x50,970x250');
+    });
+
+    it('should return the e parameter with a value according to the sizes in order corresponding to the desktop priority list of the ad units', function () {
+      let bidRequestsPrioritySizes = [validBidExistingSizesInPriorityListForDesktop];
+      // overwrite default innerWdith for tests with a larger one we consider "Desktop" or NOT Mobile
+      getWindowSelfStub.returns(createWindow(1025));
+      const e = spec.buildRequests(bidRequestsPrioritySizes, bidderRequest).data.e;
+      expect(e).to.equal('300x250_0:300x250,300x600,970x250');
+    });
+
+    it('should return the e parameter with a value according to the sizes in order as they are sent from the ad units', function () {
+      let bidRequestsPrioritySizes2 = [validBidSizesNotExistingInPriorityListForMobile];
+      const e = spec.buildRequests(bidRequestsPrioritySizes2, bidderRequest).data.e;
+      expect(e).to.equal('970x250_0:970x250,300x70,160x600');
+    });
   });
 
   describe('interpretResponse', function () {
@@ -416,6 +819,59 @@ describe('E-Planning Adapter', function () {
       };
       expect(bidResponse).to.deep.equal(expectedResponse);
     });
+
+    it('should pass advertiserDomains when present', function () {
+      const bidResponse = spec.interpretResponse(responseWithAdomain, { adUnitToBidId: { [CLEAN_ADUNIT_CODE]: BID_ID } })[0];
+      const expectedResponse = {
+        requestId: BID_ID,
+        cpm: CPM,
+        width: W,
+        height: H,
+        ad: ADM,
+        ttl: 120,
+        creativeId: CRID,
+        netRevenue: true,
+        currency: 'USD',
+        meta: {
+          advertiserDomains: ADOMAIN
+        }
+      };
+      expect(bidResponse).to.deep.equal(expectedResponse);
+    });
+
+    it('should correctly map the parameters in the response vast', function () {
+      const bidResponse = spec.interpretResponse(responseVast, { adUnitToBidId: { [CLEAN_ADUNIT_CODE_VAST]: BID_ID }, data: { vv: 2 } })[0];
+      const expectedResponse = {
+        requestId: BID_ID,
+        cpm: CPM,
+        width: W,
+        height: H,
+        ttl: 120,
+        creativeId: CRID,
+        netRevenue: true,
+        currency: 'USD',
+        vastXml: ADM_VAST,
+        mediaType: VIDEO
+      };
+      expect(bidResponse).to.deep.equal(expectedResponse);
+    });
+
+    it('should correctly map the parameters in the response vast vv 1', function () {
+      const bidResponse = spec.interpretResponse(responseVastVV1, { adUnitToBidId: { [CLEAN_ADUNIT_CODE_VAST]: BID_ID }, data: { vv: 1 } })[0];
+      const expectedResponse = {
+        requestId: BID_ID,
+        cpm: CPM,
+        width: W,
+        height: H,
+        ttl: 120,
+        creativeId: CRID,
+        netRevenue: true,
+        currency: 'USD',
+        vastXml: ADM_VAST_VV_1,
+        mediaType: VIDEO
+      };
+      expect(bidResponse).to.deep.equal(expectedResponse);
+    });
   });
 
   describe('getUserSyncs', function () {
@@ -478,7 +934,24 @@ describe('E-Planning Adapter', function () {
     let element;
     let getBoundingClientRectStub;
     let sandbox = sinon.sandbox.create();
-    let focusStub;
+    let intersectionObserverStub;
+    let intersectionCallback;
+
+    function setIntersectionObserverMock(params) {
+      let fakeIntersectionObserver = (stateChange, options) => {
+        intersectionCallback = stateChange;
+        return {
+          unobserve: (element) => {
+            return element;
+          },
+          observe: (element) => {
+            intersectionCallback([{'target': {'id': element.id}, 'isIntersecting': params[element.id].isIntersecting, 'intersectionRatio': params[element.id].ratio, 'boundingClientRect': {'width': params[element.id].width, 'height': params[element.id].height}}]);
+          },
+        };
+      };
+
+      intersectionObserverStub = sandbox.stub(window, 'IntersectionObserver').callsFake(fakeIntersectionObserver);
+    }
     function createElement(id) {
       element = document.createElement('div');
       element.id = id || ADUNIT_CODE_VIEW;
@@ -558,6 +1031,11 @@ describe('E-Planning Adapter', function () {
       });
     }
     beforeEach(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        eplanning: {
+          storageAllowed: true
+        }
+      };
       getLocalStorageSpy = sandbox.spy(storage, 'getDataFromLocalStorage');
       setDataInLocalStorageSpy = sandbox.spy(storage, 'setDataInLocalStorage');
 
@@ -565,11 +1043,9 @@ describe('E-Planning Adapter', function () {
       hasLocalStorageStub.returns(true);
 
       clock = sandbox.useFakeTimers();
-
-      focusStub = sandbox.stub(window.top.document, 'hasFocus');
-      focusStub.returns(true);
     });
     afterEach(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
       sandbox.restore();
       if (document.getElementById(ADUNIT_CODE_VIEW)) {
         document.body.removeChild(element);
@@ -583,7 +1059,7 @@ describe('E-Planning Adapter', function () {
       hasLocalStorageStub.returns(false);
       const response = spec.buildRequests(bidRequests, bidderRequest);
 
-      expect(response.url).to.equal('https://ads.us.e-planning.net/hb/1/' + CI + '/1/localhost/ROS');
+      expect(response.url).to.equal('https://pbjs.e-planning.net/pbjs/1/' + CI + '/1/localhost/ROS');
       expect(response.data.vs).to.equal('F');
 
       sinon.assert.notCalled(getLocalStorageSpy);
@@ -593,7 +1069,7 @@ describe('E-Planning Adapter', function () {
     it('should create the url correctly with LocalStorage', function() {
       createElementVisible();
       const response = spec.buildRequests(bidRequests, bidderRequest);
-      expect(response.url).to.equal('https://ads.us.e-planning.net/hb/1/' + CI + '/1/localhost/ROS');
+      expect(response.url).to.equal('https://pbjs.e-planning.net/pbjs/1/' + CI + '/1/localhost/ROS');
 
       expect(response.data.vs).to.equal('F');
 
@@ -609,6 +1085,7 @@ describe('E-Planning Adapter', function () {
       let respuesta;
       beforeEach(function () {
         createElementVisible();
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200}});
       });
       it('when you have a render', function() {
         respuesta = spec.buildRequests(bidRequests, bidderRequest);
@@ -646,6 +1123,7 @@ describe('E-Planning Adapter', function () {
       let respuesta;
       beforeEach(function () {
         createElementOutOfView();
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200}});
       });
 
       it('when you have a render', function() {
@@ -671,6 +1149,7 @@ describe('E-Planning Adapter', function () {
       let respuesta;
       it('should register visibility with more than 50%', function() {
         createPartiallyVisibleElement();
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 0.6, 'isIntersecting': true, 'width': 200, 'height': 200}});
         respuesta = spec.buildRequests(bidRequests, bidderRequest);
         clock.tick(1005);
 
@@ -679,6 +1158,7 @@ describe('E-Planning Adapter', function () {
       });
       it('you should not register visibility with less than 50%', function() {
         createPartiallyInvisibleElement();
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 0.4, 'isIntersecting': true, 'width': 200, 'height': 200}});
         respuesta = spec.buildRequests(bidRequests, bidderRequest);
         clock.tick(1005);
 
@@ -686,12 +1166,29 @@ describe('E-Planning Adapter', function () {
         expect(storage.getDataFromLocalStorage(storageIdView)).to.equal(null);
       });
     });
+    context('when element id is not equal to adunitcode', function() {
+      let respuesta;
+      it('should register visibility with more than 50%', function() {
+        const code = ADUNIT_CODE_VIEW;
+        const divId = 'div-gpt-ad-123';
+        createPartiallyVisibleElement(divId);
+        window.googletag.pubads().setSlots([makeSlot({ code, divId })]);
+        setIntersectionObserverMock({[divId]: {'ratio': 0.6, 'isIntersecting': true, 'width': 200, 'height': 200}});
+
+        respuesta = spec.buildRequests(bidRequests, bidderRequest);
+        clock.tick(1005);
+
+        expect(storage.getDataFromLocalStorage(storageIdRender)).to.equal('1');
+        expect(storage.getDataFromLocalStorage(storageIdView)).to.equal('1');
+      });
+    });
     context('when width or height of the element is zero', function() {
       beforeEach(function () {
         createElementVisible();
       });
       it('if the width is zero but the height is within the range', function() {
         element.style.width = '0px';
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 0.4, 'isIntersecting': true, 'width': 200, 'height': 200}});
         spec.buildRequests(bidRequests, bidderRequest)
         clock.tick(1005);
 
@@ -700,6 +1197,7 @@ describe('E-Planning Adapter', function () {
       });
       it('if the height is zero but the width is within the range', function() {
         element.style.height = '0px';
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 500, 'height': 0}});
         spec.buildRequests(bidRequests, bidderRequest)
         clock.tick(1005);
 
@@ -709,6 +1207,7 @@ describe('E-Planning Adapter', function () {
       it('if both are zero', function() {
         element.style.height = '0px';
         element.style.width = '0px';
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 0, 'height': 0}});
         spec.buildRequests(bidRequests, bidderRequest)
         clock.tick(1005);
 
@@ -716,16 +1215,6 @@ describe('E-Planning Adapter', function () {
         expect(storage.getDataFromLocalStorage(storageIdView)).to.equal(null);
       });
     });
-    context('when tab is inactive', function() {
-      it('I should not register if it is not in focus', function() {
-        createElementVisible();
-        focusStub.returns(false);
-        spec.buildRequests(bidRequests, bidderRequest);
-        clock.tick(1005);
-        expect(storage.getDataFromLocalStorage(storageIdRender)).to.equal('1');
-        expect(storage.getDataFromLocalStorage(storageIdView)).to.equal(null);
-      });
-    });
     context('segmentBeginsBeforeTheVisibleRange', function() {
       it('segmentBeginsBeforeTheVisibleRange', function() {
         createElementOutOfRange();
@@ -756,7 +1245,11 @@ describe('E-Planning Adapter', function () {
         createElementVisible(ADUNIT_CODE_VIEW);
         createElementVisible(ADUNIT_CODE_VIEW2);
         createElementVisible(ADUNIT_CODE_VIEW3);
-
+        setIntersectionObserverMock({
+          [ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW2]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW3]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200}
+        });
         respuesta = spec.buildRequests(bidRequestMultiple, bidderRequest);
         clock.tick(1005);
         [ADUNIT_CODE_VIEW, ADUNIT_CODE_VIEW2, ADUNIT_CODE_VIEW3].forEach(ac => {
@@ -769,7 +1262,11 @@ describe('E-Planning Adapter', function () {
         createElementOutOfView(ADUNIT_CODE_VIEW);
         createElementOutOfView(ADUNIT_CODE_VIEW2);
         createElementOutOfView(ADUNIT_CODE_VIEW3);
-
+        setIntersectionObserverMock({
+          [ADUNIT_CODE_VIEW]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW2]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW3]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200}
+        });
         respuesta = spec.buildRequests(bidRequestMultiple, bidderRequest);
         clock.tick(1005);
         [ADUNIT_CODE_VIEW, ADUNIT_CODE_VIEW2, ADUNIT_CODE_VIEW3].forEach(ac => {
@@ -783,7 +1280,11 @@ describe('E-Planning Adapter', function () {
         createElementVisible(ADUNIT_CODE_VIEW);
         createElementOutOfView(ADUNIT_CODE_VIEW2);
         createElementOutOfView(ADUNIT_CODE_VIEW3);
-
+        setIntersectionObserverMock({
+          [ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW2]: {'ratio': 0.3, 'isIntersecting': true, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW3]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200}
+        });
         respuesta = spec.buildRequests(bidRequestMultiple, bidderRequest);
         clock.tick(1005);
         expect(storage.getDataFromLocalStorage('pbsr_' + ADUNIT_CODE_VIEW)).to.equal('6');
@@ -796,4 +1297,31 @@ 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() {
+      let bidRequests = [validBidView];
+      const expected_id5id = encodeURIComponent(JSON.stringify({ uid: 'ID5-ZHMOL_IfFSt7_lVYX8rBZc6GH3XMWyPQOBUfr4bm0g!', ext: { linkType: 1 } }));
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const dataRequest = request.data;
+
+      expect('D6885E90-2A7A-4E0F-87CB-7734ED1B99A3').to.equal(dataRequest.e_tdid);
+      expect('c29cb2ae-769d-42f6-891a-f53cadee823d').to.equal(dataRequest.e_pubcid);
+      expect(expected_id5id).to.equal(dataRequest.e_id5id);
+    });
+  });
 });
diff --git a/test/spec/modules/etargetBidAdapter_spec.js b/test/spec/modules/etargetBidAdapter_spec.js
index 4f5e0c224ec..55394dcdeea 100644
--- a/test/spec/modules/etargetBidAdapter_spec.js
+++ b/test/spec/modules/etargetBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {assert, expect} from 'chai';
 import {spec} from 'modules/etargetBidAdapter.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import { deepClone } from 'src/utils.js';
 
 describe('etarget adapter', function () {
   let serverResponse, bidRequest, bidResponses;
@@ -26,6 +27,11 @@ describe('etarget adapter', function () {
       assert.lengthOf(parsedUrl.items, 7);
     });
 
+    it('should be an object', function () {
+      let request = spec.buildRequests(bids);
+      assert.isNotNull(request.metaData);
+    });
+
     it('should handle global request parameters', function () {
       let parsedUrl = parseUrl(spec.buildRequests([bids[0]]).url);
       assert.equal(parsedUrl.path, 'https://sk.search.etargetnet.com/hb');
@@ -36,6 +42,16 @@ describe('etarget adapter', function () {
       assert.equal(request.method, 'POST');
     });
 
+    it('should attach floor param when either bid param or getFloor function exists', function () {
+      // let getFloorResponse = { currency: 'EUR', floor: 5 };
+      let request = null;
+      let bidRequest = deepClone(bids[0]);
+
+      // floor param has to be NULL
+      request = spec.buildRequests([bidRequest]);
+      assert.equal(typeof request.floors, 'undefined');
+    });
+
     it('should correctly form bid items', function () {
       let bidList = bids;
       let request = spec.buildRequests(bidList);
@@ -154,6 +170,7 @@ describe('etarget adapter', function () {
       assert.equal(result.height, 250);
       assert.equal(result.currency, 'EUR');
       assert.equal(result.netRevenue, true);
+      assert.isNotNull(result.reason);
       assert.equal(result.ttl, 360);
       assert.equal(result.ad, '<tag1>');
       assert.equal(result.transactionId, '5f33781f-9552-4ca1');
diff --git a/test/spec/modules/fabrickIdSystem_spec.js b/test/spec/modules/fabrickIdSystem_spec.js
new file mode 100644
index 00000000000..4f3ed55ec03
--- /dev/null
+++ b/test/spec/modules/fabrickIdSystem_spec.js
@@ -0,0 +1,134 @@
+import * as utils from '../../../src/utils.js';
+import {server} from '../../mocks/xhr.js';
+
+import {fabrickIdSubmodule, appendUrl} from 'modules/fabrickIdSystem.js';
+
+const defaultConfigParams = {
+  apiKey: '123',
+  e: 'abc',
+  p: ['def', 'hij'],
+  url: 'http://localhost:9999/test/mocks/fabrickId.json?'
+};
+const responseHeader = {'Content-Type': 'application/json'}
+
+describe('Fabrick ID System', function() {
+  let logErrorStub;
+
+  beforeEach(function () {
+  });
+
+  afterEach(function () {
+  });
+
+  it('should log an error if no configParams were passed into getId', function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+    fabrickIdSubmodule.getId();
+    expect(logErrorStub.calledOnce).to.be.true;
+    logErrorStub.restore();
+  });
+
+  it('should error on json parsing', function() {
+    logErrorStub = sinon.stub(utils, 'logError');
+    let submoduleCallback = fabrickIdSubmodule.getId({
+      name: 'fabrickId',
+      params: defaultConfigParams
+    }).callback;
+    let callBackSpy = sinon.spy();
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    request.respond(
+      200,
+      responseHeader,
+      '] this is not json {'
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(logErrorStub.calledOnce).to.be.true;
+    logErrorStub.restore();
+  });
+
+  it('should truncate the params', function() {
+    let r = '';
+    for (let i = 0; i < 1500; i++) {
+      r += 'r';
+    }
+    let configParams = Object.assign({}, defaultConfigParams, {
+      refererInfo: {
+        topmostLocation: r,
+        stack: ['s-0'],
+        canonicalUrl: 'cu-0'
+      }
+    });
+    let submoduleCallback = fabrickIdSubmodule.getId({
+      name: 'fabrickId',
+      params: configParams
+    }).callback;
+    let callBackSpy = sinon.spy();
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    r = '';
+    for (let i = 0; i < 1000 - 3; i++) {
+      r += 'r';
+    }
+    expect(request.url).to.match(new RegExp(`r=${r}&r=`));
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should complete successfully', function() {
+    let configParams = Object.assign({}, defaultConfigParams, {
+      refererInfo: {
+        topmostLocation: 'r-0',
+        stack: ['s-0'],
+        canonicalUrl: 'cu-0'
+      }
+    });
+    let submoduleCallback = fabrickIdSubmodule.getId({
+      name: 'fabrickId',
+      params: configParams
+    }).callback;
+    let callBackSpy = sinon.spy();
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.match(/r=r-0&r=s-0&r=cu-0&r=http/);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should truncate 2', function() {
+    let configParams = {
+      maxUrlLen: 10,
+      maxRefLen: 5,
+      maxSpaceAvailable: 2
+    };
+
+    let url = appendUrl('', 'r', '123', configParams);
+    expect(url).to.equal('&r=12');
+
+    url = appendUrl('12345', 'r', '678', configParams);
+    expect(url).to.equal('12345&r=67');
+
+    url = appendUrl('12345678', 'r', '9', configParams);
+    expect(url).to.equal('12345678');
+
+    configParams.maxRefLen = 8;
+    url = appendUrl('', 'r', '1234&', configParams);
+    expect(url).to.equal('&r=1234');
+
+    url = appendUrl('', 'r', '123&', configParams);
+    expect(url).to.equal('&r=123');
+
+    url = appendUrl('', 'r', '12&', configParams);
+    expect(url).to.equal('&r=12%26');
+
+    url = appendUrl('', 'r', '1&&', configParams);
+    expect(url).to.equal('&r=1%26');
+  });
+});
diff --git a/test/spec/modules/feedadBidAdapter_spec.js b/test/spec/modules/feedadBidAdapter_spec.js
index 066ab6b21f6..8cbd6907890 100644
--- a/test/spec/modules/feedadBidAdapter_spec.js
+++ b/test/spec/modules/feedadBidAdapter_spec.js
@@ -4,6 +4,7 @@ import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes.js';
 import {server} from 'test/mocks/xhr.js';
 
 const CODE = 'feedad';
+const EXPECTED_ADAPTER_VERSION = '1.0.5';
 
 describe('FeedAdAdapter', function () {
   describe('Public API', function () {
@@ -13,7 +14,7 @@ describe('FeedAdAdapter', function () {
     it('should only support video and banner ads', function () {
       expect(spec.supportedMediaTypes).to.be.a('array');
       expect(spec.supportedMediaTypes).to.include(BANNER);
-      expect(spec.supportedMediaTypes).to.include(VIDEO);
+      expect(spec.supportedMediaTypes).not.to.include(VIDEO);
       expect(spec.supportedMediaTypes).not.to.include(NATIVE);
     });
     it('should export the BidderSpec functions', function () {
@@ -23,6 +24,9 @@ describe('FeedAdAdapter', function () {
       expect(spec.onTimeout).to.be.a('function');
       expect(spec.onBidWon).to.be.a('function');
     });
+    it('should export the TCF vendor ID', function () {
+      expect(spec.gvlid).to.equal(781);
+    })
   });
 
   describe('isBidRequestValid', function () {
@@ -105,7 +109,7 @@ describe('FeedAdAdapter', function () {
   describe('buildRequests', function () {
     const bidderRequest = {
       refererInfo: {
-        referer: 'the referer'
+        page: 'the referer'
       },
       some: 'thing'
     };
@@ -168,6 +172,21 @@ describe('FeedAdAdapter', function () {
       expect(result.data.bids).to.be.lengthOf(1);
       expect(result.data.bids[0]).to.deep.equal(bid);
     });
+    it('should pass through additional bid parameters', function () {
+      let bid = {
+        code: 'feedad',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 250]]
+          }
+        },
+        params: {clientToken: 'clientToken', placementId: 'placement-id', another: 'parameter', more: 'parameters'}
+      };
+      let result = spec.buildRequests([bid], bidderRequest);
+      expect(result.data.bids).to.be.lengthOf(1);
+      expect(result.data.bids[0].params.another).to.equal('parameter');
+      expect(result.data.bids[0].params.more).to.equal('parameters');
+    });
     it('should detect empty media types', function () {
       let bid = {
         code: 'feedad',
@@ -248,27 +267,242 @@ describe('FeedAdAdapter', function () {
       let result = spec.buildRequests([bid, bid, bid]);
       expect(result).to.be.empty;
     });
+    it('should not include GDPR data if the bidder request has none available', function () {
+      let bid = {
+        code: 'feedad',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 250]]
+          }
+        },
+        params: {clientToken: 'clientToken', placementId: 'placement-id'}
+      };
+      let result = spec.buildRequests([bid], bidderRequest);
+      expect(result.data.gdprApplies).to.be.undefined;
+      expect(result.data.consentIabTcf).to.be.undefined;
+    });
+    it('should include GDPR data if the bidder requests contains it', function () {
+      let bid = {
+        code: 'feedad',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 250]]
+          }
+        },
+        params: {clientToken: 'clientToken', placementId: 'placement-id'}
+      };
+      let request = Object.assign({}, bidderRequest, {
+        gdprConsent: {
+          consentString: 'the consent string',
+          gdprApplies: true
+        }
+      });
+      let result = spec.buildRequests([bid], request);
+      expect(result.data.gdprApplies).to.equal(request.gdprConsent.gdprApplies);
+      expect(result.data.consentIabTcf).to.equal(request.gdprConsent.consentString);
+    });
+    it('should include adapter and prebid version', function () {
+      let bid = {
+        code: 'feedad',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 250]]
+          }
+        },
+        params: {clientToken: 'clientToken', placementId: 'placement-id'}
+      };
+      let result = spec.buildRequests([bid], bidderRequest);
+      expect(result.data.bids[0].params.prebid_adapter_version).to.equal(EXPECTED_ADAPTER_VERSION);
+      expect(result.data.bids[0].params.prebid_sdk_version).to.equal('$prebid.version$');
+    });
   });
 
   describe('interpretResponse', function () {
-    const body = [{
-      foo: 'bar',
-      sub: {
-        obj: 5
-      }
-    }, {
-      bar: 'foo'
-    }];
-
     it('should convert string bodies to JSON', function () {
+      const body = [{
+        ad: 'bar',
+      }];
       let result = spec.interpretResponse({body: JSON.stringify(body)});
       expect(result).to.deep.equal(body);
     });
 
-    it('should pass through body objects', function () {
+    it('should pass through object bodies', function () {
+      const body = [{
+        ad: 'bar',
+      }];
       let result = spec.interpretResponse({body});
       expect(result).to.deep.equal(body);
     });
+
+    it('should pass through only bodies with ad fields', function () {
+      const bid1 = {
+        ad: 'bar',
+        other: 'field',
+        some: 'thing'
+      };
+      const bid2 = {
+        foo: 'bar'
+      };
+      const bid3 = {
+        ad: 'ad html',
+      };
+      const body = [bid1, bid2, bid3];
+      let result = spec.interpretResponse({body: JSON.stringify(body)});
+      expect(result).to.deep.equal([bid1, bid3]);
+    });
+
+    it('should remove extension fields from bid responses', function () {
+      const bid = {
+        ext: {},
+        ad: 'ad html',
+        cpm: 100
+      };
+      const result = spec.interpretResponse({body: JSON.stringify([bid])});
+      expect(result[0]).not.to.haveOwnProperty('ext');
+    });
+
+    it('should return an empty array if the response is not an array', function () {
+      const bid = {};
+      const result = spec.interpretResponse({body: JSON.stringify(bid)});
+      expect(result).to.deep.equal([]);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const pixelSync1 = {type: 'image', url: 'the pixel url 1'};
+    const pixelSync2 = {type: 'image', url: 'the pixel url 2'};
+    const iFrameSync1 = {type: 'iframe', url: 'the iFrame url 1'};
+    const iFrameSync2 = {type: 'iframe', url: 'the iFrame url 2'};
+    const mockServerResponse = (content) => {
+      if (!(content instanceof Array)) {
+        content = [content];
+      }
+      return content.map(it => ({body: it}));
+    };
+
+    it('should pass through the syncs out of the extension fields of the server response', function () {
+      const serverResponse = mockServerResponse([{
+        ext: {
+          pixels: [pixelSync1, pixelSync2],
+          iframes: [iFrameSync1, iFrameSync2],
+        }
+      }]);
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse)
+      expect(result).to.deep.equal([
+        pixelSync1,
+        pixelSync2,
+        iFrameSync1,
+        iFrameSync2,
+      ]);
+    });
+
+    it('should concat the syncs of all responses', function () {
+      const serverResponse = mockServerResponse([{
+        ext: {
+          pixels: [pixelSync1],
+          iframes: [iFrameSync2],
+        },
+        ad: 'ad html',
+        cpm: 100
+      }, {
+        ext: {
+          iframes: [iFrameSync1],
+        }
+      }, {
+        ext: {
+          pixels: [pixelSync2],
+        }
+      }]);
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
+      expect(result).to.deep.equal([
+        pixelSync1,
+        iFrameSync2,
+        iFrameSync1,
+        pixelSync2,
+      ]);
+    });
+
+    it('should filter out duplicates', function () {
+      const serverResponse = mockServerResponse([{
+        ext: {
+          pixels: [pixelSync1, pixelSync1],
+          iframes: [iFrameSync2, iFrameSync2],
+        }
+      }, {
+        ext: {
+          iframes: [iFrameSync2, iFrameSync2],
+        }
+      }]);
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
+      expect(result).to.deep.equal([
+        pixelSync1,
+        iFrameSync2,
+      ]);
+    });
+
+    it('should not include iFrame syncs if the option is disabled', function () {
+      const serverResponse = mockServerResponse([{
+        ext: {
+          pixels: [pixelSync1, pixelSync2],
+          iframes: [iFrameSync1, iFrameSync2],
+        }
+      }]);
+      const result = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, serverResponse);
+      expect(result).to.deep.equal([
+        pixelSync1,
+        pixelSync2,
+      ]);
+    });
+
+    it('should not include pixel syncs if the option is disabled', function () {
+      const serverResponse = mockServerResponse([{
+        ext: {
+          pixels: [pixelSync1, pixelSync2],
+          iframes: [iFrameSync1, iFrameSync2],
+        }
+      }]);
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, serverResponse);
+      expect(result).to.deep.equal([
+        iFrameSync1,
+        iFrameSync2,
+      ]);
+    });
+
+    it('should not include any syncs if the sync options are disabled or missing', function () {
+      const serverResponse = mockServerResponse([{
+        ext: {
+          pixels: [pixelSync1, pixelSync2],
+          iframes: [iFrameSync1, iFrameSync2],
+        }
+      }]);
+      const result = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false}, serverResponse);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('should handle empty responses', function () {
+      const serverResponse = mockServerResponse([]);
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse)
+      expect(result).to.deep.equal([]);
+    });
+
+    it('should not throw if the server response is weird', function () {
+      const responses = [
+        mockServerResponse(null),
+        mockServerResponse('null'),
+        mockServerResponse(1234),
+        mockServerResponse({}),
+        mockServerResponse([{}, 123]),
+      ];
+      responses.forEach(it => {
+        expect(() => spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, it)).not.to.throw;
+      });
+    });
+
+    it('should return empty array if the body extension is null', function () {
+      const response = mockServerResponse({ext: null});
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, response);
+      expect(result).to.deep.equal([]);
+    });
   });
 
   describe('event tracking calls', function () {
@@ -280,7 +514,7 @@ describe('FeedAdAdapter', function () {
     const referer = 'the referer';
     const bidderRequest = {
       refererInfo: {
-        referer: referer
+        page: referer
       },
       some: 'thing'
     };
@@ -404,7 +638,8 @@ describe('FeedAdAdapter', function () {
             prebid_bid_id: bidId,
             prebid_transaction_id: transactionId,
             referer,
-            sdk_version: '1.0.0'
+            prebid_adapter_version: EXPECTED_ADAPTER_VERSION,
+            prebid_sdk_version: '$prebid.version$',
           };
           subject(data);
           expect(server.requests.length).to.equal(1);
diff --git a/test/spec/modules/fidelityBidAdapter_spec.js b/test/spec/modules/fidelityBidAdapter_spec.js
deleted file mode 100644
index 304a98675b3..00000000000
--- a/test/spec/modules/fidelityBidAdapter_spec.js
+++ /dev/null
@@ -1,233 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/fidelityBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-describe('FidelityAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'fidelity',
-      'params': {
-        'zoneid': '27248',
-        'floor': '0.05',
-        'server': 'x.fidelity-media.com',
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'zoneid': '27248',
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'zoneid': 0,
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidderRequest = {
-      bidderCode: 'fidelity',
-      requestId: 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
-      bidderRequestId: '178e34bad3658f',
-      bids: [
-        {
-          bidder: 'fidelity',
-          params: {
-            zoneid: '27248',
-            floor: '0.05',
-            server: 'x.fidelity-media.com',
-          },
-          placementCode: '/19968336/header-bid-tag-0',
-          sizes: [[300, 250], [320, 50]],
-          bidId: '2ffb201a808da7',
-          bidderRequestId: '178e34bad3658f',
-          requestId: 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
-          transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
-          schain: {
-            ver: '1.0',
-            complete: 1,
-            nodes: [{
-              asi: 'exchange1.com',
-              sid: '1234',
-              hp: 1,
-              rid: 'bid-request-1',
-              name: 'publisher',
-              domain: 'publisher.com'
-            }]
-          }
-        }
-      ],
-      start: 1472239426002,
-      auctionStart: 1472239426000,
-      timeout: 5000,
-      refererInfo: {
-        referer: 'http://test.com/index.html'
-      }
-    };
-
-    it('should add params to the request', function () {
-      let schainString = '1.0,1!exchange1.com,1234,1,bid-request-1,publisher,publisher.com';
-      const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-      const payload = request.data;
-      expect(payload.from).to.exist;
-      expect(payload.v).to.exist;
-      expect(payload.requestid).to.exist;
-      expect(payload.impid).to.exist;
-      expect(payload.zoneid).to.exist;
-      expect(payload.floor).to.exist;
-      expect(payload.charset).to.exist;
-      expect(payload.subid).to.exist;
-      expect(payload.flashver).to.exist;
-      expect(payload.tmax).to.exist;
-      expect(payload.defloc).to.exist;
-      expect(payload.schain).to.exist.and.to.be.a('string');
-      expect(payload.schain).to.equal(schainString);
-    });
-
-    it('should add consent information to the request - TCF v1', function () {
-      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
-      let uspConsentString = '1YN-';
-      bidderRequest.gdprConsent = {
-        gdprApplies: true,
-        allowAuctionWithoutConsent: true,
-        consentString: consentString,
-        vendorData: {
-          vendorConsents: {
-            '408': true
-          },
-        },
-        apiVersion: 1
-      };
-      bidderRequest.uspConsent = uspConsentString;
-      const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-      const payload = request.data;
-      expect(payload.gdpr).to.exist.and.to.be.a('number');
-      expect(payload.gdpr).to.equal(1);
-      expect(payload.consent_str).to.exist.and.to.be.a('string');
-      expect(payload.consent_str).to.equal(consentString);
-      expect(payload.consent_given).to.exist.and.to.be.a('number');
-      expect(payload.consent_given).to.equal(1);
-      expect(payload.us_privacy).to.exist.and.to.be.a('string');
-      expect(payload.us_privacy).to.equal(uspConsentString);
-    });
-
-    it('should add consent information to the request - TCF v2', function () {
-      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
-      let uspConsentString = '1YN-';
-      bidderRequest.gdprConsent = {
-        gdprApplies: true,
-        allowAuctionWithoutConsent: true,
-        consentString: consentString,
-        vendorData: {
-          vendor: {
-            consents: {
-              '408': true
-            }
-          },
-        },
-        apiVersion: 2
-      };
-      bidderRequest.uspConsent = uspConsentString;
-      const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-      const payload = request.data;
-      expect(payload.gdpr).to.exist.and.to.be.a('number');
-      expect(payload.gdpr).to.equal(1);
-      expect(payload.consent_str).to.exist.and.to.be.a('string');
-      expect(payload.consent_str).to.equal(consentString);
-      expect(payload.consent_given).to.exist.and.to.be.a('number');
-      expect(payload.consent_given).to.equal(1);
-      expect(payload.us_privacy).to.exist.and.to.be.a('string');
-      expect(payload.us_privacy).to.equal(uspConsentString);
-    });
-
-    it('sends bid request to ENDPOINT via GET', function () {
-      const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-      expect(request.url).to.equal('https://x.fidelity-media.com/delivery/hb.php');
-      expect(request.method).to.equal('GET');
-    });
-  })
-
-  describe('interpretResponse', function () {
-    let response = {
-      'id': '543210',
-      'seatbid': [ {
-        'bid': [ {
-          'id': '1111111',
-          'impid': 'bidId-123456-1',
-          'price': 0.09,
-          'adm': '<!-- Creative -->',
-          'width': 728,
-          'height': 90,
-        } ]
-      } ]
-    };
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {
-          requestId: 'bidId-123456-1',
-          creativeId: 'bidId-123456-1',
-          cpm: 0.09,
-          width: 728,
-          height: 90,
-          ad: '<!-- Creative -->',
-          netRevenue: true,
-          currency: 'USD',
-          ttl: 360,
-        }
-      ];
-
-      let result = spec.interpretResponse({ body: response });
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
-
-    it('handles nobid responses', function () {
-      let response = {
-        'id': '543210',
-        'seatbid': [ ]
-      };
-
-      let result = spec.interpretResponse({ body: response });
-      expect(result.length).to.equal(0);
-    });
-  });
-
-  describe('user sync', function () {
-    const syncUrl = 'https://x.fidelity-media.com/delivery/matches.php?type=iframe';
-
-    it('should register the sync iframe', function () {
-      expect(spec.getUserSyncs({})).to.be.undefined;
-      expect(spec.getUserSyncs({iframeEnabled: false})).to.be.undefined;
-      const options = spec.getUserSyncs({iframeEnabled: true});
-      expect(options).to.not.be.undefined;
-      expect(options).to.have.lengthOf(1);
-      expect(options[0].type).to.equal('iframe');
-      expect(options[0].url).to.equal(syncUrl);
-    });
-  });
-});
diff --git a/test/spec/modules/finativeBidAdapter_spec.js b/test/spec/modules/finativeBidAdapter_spec.js
new file mode 100644
index 00000000000..7b3f23d8b9e
--- /dev/null
+++ b/test/spec/modules/finativeBidAdapter_spec.js
@@ -0,0 +1,186 @@
+// jshint esversion: 6, es3: false, node: true
+import {assert, expect} from 'chai';
+import {spec} from 'modules/finativeBidAdapter.js';
+import { NATIVE } from 'src/mediaTypes.js';
+import { config } from 'src/config.js';
+
+describe('Finative adapter', function () {
+  let serverResponse, bidRequest, bidResponses;
+  let bid = {
+    'bidder': 'finative',
+    'params': {
+      'adUnitId': '1uyo'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return false when AdUnitId is not set', function () {
+      delete bid.params.adUnitId;
+      assert.isFalse(spec.isBidRequestValid(bid));
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('should send request with correct structure', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {}
+      }];
+
+      let request = spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } });
+
+      assert.equal(request.method, 'POST');
+      assert.ok(request.data);
+    });
+
+    it('should have default request structure', function () {
+      let keys = 'site,device,cur,imp,user,regs'.split(',');
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {}
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
+      let data = Object.keys(request);
+
+      assert.deepEqual(keys, data);
+    });
+
+    it('Verify the auction ID', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {},
+        auctionId: 'auctionId'
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' }, auctionId: validBidRequests[0].auctionId }).data);
+
+      assert.equal(request.id, validBidRequests[0].auctionId);
+    });
+
+    it('Verify the device', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {}
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
+
+      assert.equal(request.device.ua, navigator.userAgent);
+    });
+
+    it('Verify native asset ids', function () {
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: {},
+        nativeParams: {
+          body: {
+            required: true,
+            len: 350
+          },
+          image: {
+            required: true
+          },
+          title: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          },
+          cta: {
+            required: true
+          },
+          icon: {
+            required: true
+          }
+        }
+      }];
+
+      let assets = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp[0].native.request.assets;
+
+      assert.equal(assets[0].id, 1);
+      assert.equal(assets[1].id, 3);
+      assert.equal(assets[2].id, 0);
+      assert.equal(assets[3].id, 2);
+      assert.equal(assets[4].id, 4);
+      assert.equal(assets[5].id, 5);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const goodResponse = {
+      body: {
+        cur: 'EUR',
+        id: '4b516b80-886e-4ec0-82ae-9209e6d625fb',
+        seatbid: [
+          {
+          	seat: 'finative',
+          	bid: [{
+              adm: {
+            	native: {
+            		assets: [
+            			{id: 0, title: {text: 'this is a title'}}
+            		],
+            		imptrackers: ['https://domain.for/imp/tracker?price=${AUCTION_PRICE}'],
+            		link: {
+            			clicktrackers: ['https://domain.for/imp/tracker?price=${AUCTION_PRICE}'],
+            			url: 'https://domain.for/ad/'
+            		}
+            	}
+              },
+              impid: 1,
+              price: 0.55
+            }]
+          }
+        ]
+      }
+    };
+    const badResponse = { body: {
+      cur: 'EUR',
+      id: '4b516b80-886e-4ec0-82ae-9209e6d625fb',
+      seatbid: []
+    }};
+
+    const bidRequest = {
+      data: {},
+      bids: [{ bidId: 'bidId1' }]
+    };
+
+    it('should return null if body is missing or empty', function () {
+      const result = spec.interpretResponse(badResponse, bidRequest);
+      assert.equal(result.length, 0);
+
+      delete badResponse.body
+
+      const result1 = spec.interpretResponse(badResponse, bidRequest);
+      assert.equal(result.length, 0);
+    });
+
+    it('should return the correct params', function () {
+      const result = spec.interpretResponse(goodResponse, bidRequest);
+      const bid = goodResponse.body.seatbid[0].bid[0];
+
+      assert.deepEqual(result[0].currency, goodResponse.body.cur);
+      assert.deepEqual(result[0].requestId, bidRequest.bids[0].bidId);
+      assert.deepEqual(result[0].cpm, bid.price);
+      assert.deepEqual(result[0].creativeId, bid.crid);
+      assert.deepEqual(result[0].mediaType, 'native');
+      assert.deepEqual(result[0].bidderCode, 'finative');
+    });
+
+    it('should return the correct tracking links', function () {
+      const result = spec.interpretResponse(goodResponse, bidRequest);
+      const bid = goodResponse.body.seatbid[0].bid[0];
+      const regExpPrice = new RegExp('price=' + bid.price);
+
+      result[0].native.clickTrackers.forEach(function (clickTracker) {
+        	assert.ok(clickTracker.search(regExpPrice) > -1);
+      });
+
+      result[0].native.impressionTrackers.forEach(function (impTracker) {
+        	assert.ok(impTracker.search(regExpPrice) > -1);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/fintezaAnalyticsAdapter_spec.js b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
index 29136c85241..cddffc63554 100644
--- a/test/spec/modules/fintezaAnalyticsAdapter_spec.js
+++ b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
@@ -1,5 +1,5 @@
 import fntzAnalyticsAdapter from 'modules/fintezaAnalyticsAdapter.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {includes} from 'src/polyfill.js';
 import { expect } from 'chai';
 import { parseUrl } from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
@@ -12,7 +12,7 @@ function setCookie(name, value, expires) {
   document.cookie = name + '=' + value +
     '; path=/' +
     (expires ? ('; expires=' + expires.toUTCString()) : '') +
-    '; SameSite=None';
+    '; SameSite=Lax';
 }
 
 describe('finteza analytics adapter', function () {
@@ -51,7 +51,7 @@ describe('finteza analytics adapter', function () {
 
   describe('track', () => {
     describe('bid request', () => {
-      it('builds and sends data', function () {
+      it('builds and sends request data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -95,7 +95,7 @@ describe('finteza analytics adapter', function () {
     });
 
     describe('bid response', () => {
-      it('builds and sends data', function () {
+      it('builds and sends response data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -119,11 +119,11 @@ describe('finteza analytics adapter', function () {
         // Emit the events with the "real" arguments
         events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
 
-        expect(server.requests.length).to.equal(2);
-
         expect(server.requests[0].method).to.equal('GET');
         expect(server.requests[0].withCredentials).to.equal(true);
 
+        expect(server.requests.length).to.equal(2);
+
         let url = parseUrl(server.requests[0].url);
 
         expect(url.protocol).to.equal('https');
@@ -154,7 +154,7 @@ describe('finteza analytics adapter', function () {
     });
 
     describe('bid won', () => {
-      it('builds and sends data', function () {
+      it('builds and sends bid won data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -173,11 +173,11 @@ describe('finteza analytics adapter', function () {
         // Emit the events with the "real" arguments
         events.emit(constants.EVENTS.BID_WON, bidWon);
 
-        expect(server.requests.length).to.equal(1);
-
         expect(server.requests[0].method).to.equal('GET');
         expect(server.requests[0].withCredentials).to.equal(true);
 
+        expect(server.requests.length).to.equal(1);
+
         const url = parseUrl(server.requests[0].url);
 
         expect(url.protocol).to.equal('https');
@@ -189,12 +189,13 @@ describe('finteza analytics adapter', function () {
         expect(url.search.value).to.equal(String(cpm));
         expect(url.search.unit).to.equal('usd');
 
-        sinon.assert.callCount(fntzAnalyticsAdapter.track, 1);
+        // 1 Finteza event + 1 Clean.io event
+        sinon.assert.callCount(fntzAnalyticsAdapter.track, 2);
       });
     });
 
     describe('bid timeout', () => {
-      it('builds and sends data', function () {
+      it('builds and sends timeout data', function () {
         const bidderCode = 'biDDer789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -212,11 +213,11 @@ describe('finteza analytics adapter', function () {
         // Emit the events with the "real" arguments
         events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
 
-        expect(server.requests.length).to.equal(1);
-
         expect(server.requests[0].method).to.equal('GET');
         expect(server.requests[0].withCredentials).to.equal(true);
 
+        expect(server.requests.length).to.equal(1);
+
         const url = parseUrl(server.requests[0].url);
 
         expect(url.protocol).to.equal('https');
diff --git a/test/spec/modules/fledge_spec.js b/test/spec/modules/fledge_spec.js
new file mode 100644
index 00000000000..2094ab42438
--- /dev/null
+++ b/test/spec/modules/fledge_spec.js
@@ -0,0 +1,37 @@
+import {
+  expect
+} from 'chai';
+import * as fledge from 'modules/fledgeForGpt.js';
+
+const CODE = 'sampleBidder';
+const AD_UNIT_CODE = 'mock/placement';
+
+describe('fledgeForGpt module', function() {
+  let nextFnSpy;
+  fledge.init({enabled: true})
+
+  const bidRequest = {
+    adUnitCode: AD_UNIT_CODE,
+    bids: [{
+      bidId: '1',
+      bidder: CODE,
+      auctionId: 'first-bid-id',
+      adUnitCode: AD_UNIT_CODE,
+      transactionId: 'au',
+    }]
+  };
+  const fledgeAuctionConfig = {
+    bidId: '1',
+  }
+
+  describe('addComponentAuctionHook', function() {
+    beforeEach(function() {
+      nextFnSpy = sinon.spy();
+    });
+
+    it('should call next() when a proper bidrequest and fledgeAuctionConfig are provided', function() {
+      fledge.addComponentAuctionHook(nextFnSpy, bidRequest, fledgeAuctionConfig);
+      expect(nextFnSpy.called).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/fluctBidAdapter_spec.js b/test/spec/modules/fluctBidAdapter_spec.js
index 6530a3c36cf..92a4b42f6f8 100644
--- a/test/spec/modules/fluctBidAdapter_spec.js
+++ b/test/spec/modules/fluctBidAdapter_spec.js
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
-import {spec} from 'modules/fluctBidAdapter.js';
-import {newBidder} from 'src/adapters/bidderFactory.js';
-import {config} from 'src/config.js';
+import {spec} from 'modules/fluctBidAdapter';
+import {newBidder} from 'src/adapters/bidderFactory';
+import {config} from 'src/config';
 
 describe('fluctAdapter', function () {
   const adapter = newBidder(spec);
@@ -78,6 +78,139 @@ describe('fluctAdapter', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest)[0];
       expect(request.method).to.equal('POST');
     });
+
+    it('sends bid request to ENDPOINT with query parameter', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.url).to.equal('https://hb.adingo.jp/prebid?dfpUnitCode=%2F100000%2Funit_code&tagId=10000%3A100000001&groupId=1000000002');
+    });
+
+    it('includes data.user.eids = [] by default', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.user.eids).to.eql([]);
+    });
+
+    it('includes no data.params.kv by default', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.params.kv).to.eql(undefined);
+    });
+
+    it('includes no data.schain by default', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.schain).to.eql(undefined);
+    });
+
+    it('includes filtered user.eids if any exist', function () {
+      const bidRequests2 = bidRequests.map(
+        (bidReq) => Object.assign(bidReq, {
+          userIdAsEids: [
+            {
+              source: 'foobar.com',
+              uids: [
+                { id: 'foobar-id' }
+              ],
+            },
+            {
+              source: 'adserver.org',
+              uids: [
+                { id: 'tdid' }
+              ],
+            },
+            {
+              source: 'criteo.com',
+              uids: [
+                { id: 'criteo-id' }
+              ],
+            },
+            {
+              source: 'intimatemerger.com',
+              uids: [
+                { id: 'imuid' }
+              ],
+            },
+            {
+              source: 'liveramp.com',
+              uids: [
+                { id: 'idl-env' }
+              ],
+            },
+          ],
+        })
+      );
+      const request = spec.buildRequests(bidRequests2, bidderRequest)[0];
+      expect(request.data.user.eids).to.eql([
+        {
+          source: 'adserver.org',
+          uids: [
+            { id: 'tdid' }
+          ],
+        },
+        {
+          source: 'criteo.com',
+          uids: [
+            { id: 'criteo-id' }
+          ],
+        },
+        {
+          source: 'intimatemerger.com',
+          uids: [
+            { id: 'imuid' }
+          ],
+        },
+        {
+          source: 'liveramp.com',
+          uids: [
+            { id: 'idl-env' }
+          ],
+        },
+      ]);
+    });
+
+    it('includes data.params.kv if any exists', function () {
+      const bidRequests2 = bidRequests.map(
+        (bidReq) => Object.assign(bidReq, {
+          params: {
+            kv: {
+              imsids: ['imsid1', 'imsid2']
+            }
+          }
+        })
+      );
+      const request = spec.buildRequests(bidRequests2, bidderRequest)[0];
+      expect(request.data.params.kv).to.eql({
+        imsids: ['imsid1', 'imsid2']
+      });
+    });
+
+    it('includes data.schain if any exists', function () {
+      // this should be done by schain.js
+      const bidRequests2 = bidRequests.map(
+        (bidReq) => Object.assign(bidReq, {
+          schain: {
+            ver: '1.0',
+            complete: 1,
+            nodes: [
+              {
+                asi: 'example.com',
+                sid: 'publisher-id',
+                hp: 1
+              }
+            ]
+          }
+        })
+      );
+      const request = spec.buildRequests(bidRequests2, bidderRequest)[0];
+      expect(request.data.schain).to.eql({
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'example.com',
+            sid: 'publisher-id',
+            hp: 1
+          }
+        ]
+      });
+    });
   });
 
   describe('interpretResponse', function() {
@@ -114,6 +247,7 @@ describe('fluctAdapter', function () {
               adm: '<!-- test creative -->',
               burl: 'https://i.adingo.jp/?test=1&et=hb&bidid=237f4d1a293f99',
               crid: 'test_creative',
+              adomain: ['test_adomain']
             }]
           }]
         }
@@ -131,6 +265,9 @@ describe('fluctAdapter', function () {
           creativeId: 'test_creative',
           ttl: 300,
           ad: '<!-- test creative -->' + callBeaconSnippet,
+          meta: {
+            advertiserDomains: ['test_adomain'],
+          },
         }
       ];
 
@@ -186,6 +323,9 @@ describe('fluctAdapter', function () {
           ttl: 300,
           ad: '<!-- test creative -->' + callBeaconSnippet,
           dealId: 'test_deal',
+          meta: {
+            advertiserDomains: [],
+          },
         }
       ];
 
diff --git a/test/spec/modules/fpdModule_spec.js b/test/spec/modules/fpdModule_spec.js
new file mode 100644
index 00000000000..4536b304f9d
--- /dev/null
+++ b/test/spec/modules/fpdModule_spec.js
@@ -0,0 +1,51 @@
+import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {registerSubmodules, reset, startAuctionHook} from 'modules/fpdModule/index.js';
+
+describe('the first party data module', function () {
+  afterEach(function () {
+    config.resetConfig();
+  });
+  after(() => {
+    reset();
+  })
+
+  describe('startAuctionHook', () => {
+    const mockFpd = {
+      global: {key: 'value'},
+      bidder: {A: {bkey: 'bvalue'}}
+    }
+    beforeEach(() => {
+      reset();
+    });
+
+    it('should run ortb2Fragments through fpd submodules', () => {
+      registerSubmodules({
+        name: 'test',
+        processFpd: function () {
+          return mockFpd;
+        }
+      });
+      const req = {ortb2Fragments: {}};
+      return new Promise((resolve) => startAuctionHook(resolve, req))
+        .then(() => {
+          expect(req.ortb2Fragments).to.eql(mockFpd);
+        })
+    });
+
+    it('should work with fpd submodules that return promises', () => {
+      registerSubmodules({
+        name: 'test',
+        processFpd: function () {
+          return Promise.resolve(mockFpd);
+        }
+      });
+      const req = {ortb2Fragments: {}};
+      return new Promise((resolve) => {
+        startAuctionHook(resolve, req);
+      }).then(() => {
+        expect(req.ortb2Fragments).to.eql(mockFpd);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/freewheel-sspBidAdapter_spec.js b/test/spec/modules/freewheel-sspBidAdapter_spec.js
index 3047b635d13..7ef576fc7ec 100644
--- a/test/spec/modules/freewheel-sspBidAdapter_spec.js
+++ b/test/spec/modules/freewheel-sspBidAdapter_spec.js
@@ -98,6 +98,19 @@ describe('freewheelSSP BidAdapter Test', () => {
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '1d1a030790a475',
+        'schain': {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [
+            {
+              'asi': 'example.com',
+              'sid': '0',
+              'hp': 1,
+              'rid': 'bidrequestid',
+              'domain': 'example.com'
+            }
+          ]
+        }
       }
     ];
 
@@ -112,6 +125,12 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(payload.playerSize).to.equal('300x600');
     });
 
+    it('should return a properly formatted request with schain defined', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = request[0].data;
+      expect(payload.schain).to.deep.equal(bidRequests[0].schain)
+    });
+
     it('sends bid request to ENDPOINT via GET', () => {
       const request = spec.buildRequests(bidRequests);
       expect(request[0].url).to.contain(ENDPOINT);
@@ -152,6 +171,19 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(payload.playerSize).to.equal('300x600');
       expect(payload._fw_gdpr_consent).to.exist.and.to.be.a('string');
       expect(payload._fw_gdpr_consent).to.equal(gdprConsentString);
+
+      let gdprConsent = {
+        'gdprApplies': true,
+        'consentString': gdprConsentString
+      }
+      let syncOptions = {
+        'pixelEnabled': true
+      }
+      const userSyncs = spec.getUserSyncs(syncOptions, null, gdprConsent, null);
+      expect(userSyncs).to.deep.equal([{
+        type: 'image',
+        url: 'https://ads.stickyadstv.com/auto-user-sync?gdpr=1&gdpr_consent=1FW-SSP-gdprConsent-'
+      }]);
     });
   })
 
@@ -226,6 +258,19 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(payload.playerSize).to.equal('300x600');
       expect(payload._fw_gdpr_consent).to.exist.and.to.be.a('string');
       expect(payload._fw_gdpr_consent).to.equal(gdprConsentString);
+
+      let gdprConsent = {
+        'gdprApplies': true,
+        'consentString': gdprConsentString
+      }
+      let syncOptions = {
+        'pixelEnabled': true
+      }
+      const userSyncs = spec.getUserSyncs(syncOptions, null, gdprConsent, null);
+      expect(userSyncs).to.deep.equal([{
+        type: 'image',
+        url: 'https://ads.stickyadstv.com/auto-user-sync?gdpr=1&gdpr_consent=1FW-SSP-gdprConsent-'
+      }]);
     });
   })
 
@@ -297,7 +342,10 @@ describe('freewheelSSP BidAdapter Test', () => {
     '  <InLine>' +
     '   <AdSystem>Adswizz</AdSystem>' +
     '   <Impression id="dmp-1617899169-2513"></Impression>' +
-    '   <Impression id="user-sync-1617899169-1">https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-00008</Impression>' +
+    '   <Impression id="user-sync-1617899169-1">https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-12008</Impression>' +
+    '   <Impression id="727435745">' +
+    '   <![CDATA[ https://ads.stickyadstv.com/www/delivery/swfIndex.php?reqType=AdsDisplayStarted&dealId=NRJ-PRO-00008&campaignId=SMF-WOW-55555&adId=12345&viewKey=1607626986121029-54&sessionId=e3230a6bef6e0d2327422ff5282435&zoneId=2003&impId=1&cb=1932360&trackingIds=19651873%2C28161297%2C28161329%2C29847601%2C29967745%2C61392385&listenerId=eddf2aebad29655bb2b6abac276c50ef& ]]>' +
+    '   </Impression>' +
     '   <Creatives>' +
     '    <Creative id=\'28517153\' sequence=\'1\'>' +
     '     <Linear>' +
@@ -332,13 +380,17 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           ad: ad
         }
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('should get correct bid response with formated ad', () => {
@@ -355,13 +407,17 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           ad: formattedAd
         }
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('handles nobid responses', () => {
@@ -372,6 +428,7 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(result.length).to.equal(0);
     });
   });
+
   describe('interpretResponseForVideo', () => {
     let bidRequests = [
       {
@@ -426,6 +483,23 @@ describe('freewheelSSP BidAdapter Test', () => {
         'bidId': '2',
         'bidderRequestId': '3',
         'auctionId': '4',
+      },
+      {
+        'bidder': 'freewheelssp',
+        'params': {
+          'zoneId': '277225',
+          'format': 'test'
+        },
+        'adUnitCode': 'adunit-code',
+        'mediaTypes': {
+          'video': {
+            'playerSize': [300, 600],
+          }
+        },
+        'sizes': [[300, 400]],
+        'bidId': '2',
+        'bidderRequestId': '3',
+        'auctionId': '4',
       }
     ];
 
@@ -435,6 +509,12 @@ describe('freewheelSSP BidAdapter Test', () => {
     '   <AdSystem>Adswizz</AdSystem>' +
     '   <Impression id="dmp-1617899169-2513"></Impression>' +
     '   <Impression id="user-sync-1617899169-1">https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-00008</Impression>' +
+    '   <Impression id="727435745">' +
+    '   <![CDATA[ https://ads.stickyadstv.com/www/delivery/swfIndex.php?reqType=AdsDisplayStarted&dealId=NRJ-PRO-00008&campaignId=SMF-WOW-55555&adId=12345&rootViewKey=1607626986121029-54&sessionId=e3230a6bef6e0d2327422ff5282435&zoneId=2003&impId=1&cb=1932360&trackingIds=19651873%2C28161297%2C28161329%2C29847601%2C29967745%2C61392385&listenerId=eddf2aebad29655bb2b6abac276c50ef& ]]>' +
+    '   </Impression>' +
+    '   <Impression id="727435745">' +
+    '   <![CDATA[ https://ads.stickyadstv.com/www/delivery/swfIndex.php?reqType=AdsDisplayStarted&dealId=NRJ-PRO-00128&campaignId=SMF-WOW-22222&adId=77777&sessionId=e3230a6bef6e0d2327422ff5282435&zoneId=2003&impId=1&cb=1932360&trackingIds=19651873%2C28161297%2C28161329%2C29847601%2C29967745%2C61392385&listenerId=eddf2aebad29655bb2b6abac276c50ef& ]]>' +
+    '   </Impression>' +
     '   <Creatives>' +
     '    <Creative id=\'28517153\' sequence=\'1\'>' +
     '     <Linear>' +
@@ -447,7 +527,8 @@ describe('freewheelSSP BidAdapter Test', () => {
     '   </Creatives>' +
     '   <Extensions>' +
     '     <Extension type=\'StickyPricing\'><Price currency="EUR">0.2000</Price></Extension>' +
-    '    </Extensions>' +
+    '     <Extension type=\'StickyBrand\'><Domain><![CDATA[minotaur.com]]></Domain><Sector><![CDATA[BEAUTY & HYGIENE]]></Sector><Advertiser><![CDATA[James Bond Trademarks]]></Advertiser><Brand><![CDATA[007 Seven]]></Brand></Extension>' +
+    '   </Extensions>' +
     '  </InLine>' +
     ' </Ad>' +
     '</VAST>';
@@ -469,15 +550,22 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           vastXml: response,
           mediaType: 'video',
-          ad: ad
+          ad: ad,
+          meta: {
+            advertiserDomains: 'minotaur.com'
+          }
         }
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['minotaur.com']);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('should get correct bid response with formated ad', () => {
@@ -494,6 +582,8 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           vastXml: response,
           mediaType: 'video',
           ad: formattedAd
@@ -501,8 +591,10 @@ describe('freewheelSSP BidAdapter Test', () => {
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['minotaur.com']);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('handles nobid responses', () => {
diff --git a/test/spec/modules/ftrackIdSystem_spec.js b/test/spec/modules/ftrackIdSystem_spec.js
new file mode 100644
index 00000000000..ecd610a12fb
--- /dev/null
+++ b/test/spec/modules/ftrackIdSystem_spec.js
@@ -0,0 +1,562 @@
+import { ftrackIdSubmodule } from 'modules/ftrackIdSystem.js';
+import * as utils from 'src/utils.js';
+import { uspDataHandler } from 'src/adapterManager.js';
+import { loadExternalScript } from 'src/adloader.js';
+import { getGlobal } from 'src/prebidGlobal.js';
+import { init, setSubmoduleRegistry } from 'modules/userId/index.js';
+import {createEidsArray} from 'modules/userId/eids.js';
+import {config} from 'src/config.js';
+let expect = require('chai').expect;
+
+let server;
+
+let configMock = {
+  name: 'ftrack',
+  params: {
+    url: 'https://d9.flashtalking.com/d9core',
+    ids: {
+      'device id': true,
+      'single device id': true
+    }
+  },
+  storage: {
+    name: 'ftrackId',
+    type: 'html5',
+    expires: 90,
+    refreshInSeconds: 8 * 3600
+  },
+  debug: true
+};
+
+let consentDataMock = {
+  gdprApplies: 0,
+  consentString: '<CONSENT_STRING>'
+};
+
+describe('FTRACK ID System', () => {
+  describe(`Global Module Rules`, () => {
+    it(`should not use the "PREBID_GLOBAL" variable nor otherwise obtain a pointer to the global PBJS object`, () => {
+      expect((/PREBID_GLOBAL/gi).test(JSON.stringify(ftrackIdSubmodule))).to.not.be.ok;
+    });
+  });
+
+  describe('ftrackIdSubmodule.isConfigOk():', () => {
+    let logWarnStub;
+    let logErrorStub;
+
+    beforeEach(() => {
+      logWarnStub = sinon.stub(utils, 'logWarn');
+      logErrorStub = sinon.stub(utils, 'logError');
+    });
+
+    afterEach(() => {
+      logWarnStub.restore();
+      logErrorStub.restore();
+    });
+
+    it(`should be rejected if 'config.storage' property is missing`, () => {
+      let configMock1 = JSON.parse(JSON.stringify(configMock));
+      delete configMock1.storage;
+      delete configMock1.params;
+
+      ftrackIdSubmodule.isConfigOk(configMock1);
+      expect(logErrorStub.args[0][0]).to.equal(`FTRACK - config.storage required to be set.`);
+    });
+
+    it(`should be rejected if 'config.storage.name' property is missing`, () => {
+      let configMock1 = JSON.parse(JSON.stringify(configMock));
+      delete configMock1.storage.name;
+
+      ftrackIdSubmodule.isConfigOk(configMock1);
+      expect(logErrorStub.args[0][0]).to.equal(`FTRACK - config.storage required to be set.`);
+    });
+
+    it(`should be rejected if 'config.storage.name' is not 'ftrackId'`, () => {
+      let configMock1 = JSON.parse(JSON.stringify(configMock));
+      configMock1.storage.name = 'not-ftrack';
+
+      ftrackIdSubmodule.isConfigOk(configMock1);
+      expect(logWarnStub.args[0][0]).to.equal(`FTRACK - config.storage.name recommended to be "ftrackId".`);
+    });
+
+    it(`should be rejected if 'congig.storage.type' property is missing`, () => {
+      let configMock1 = JSON.parse(JSON.stringify(configMock));
+      delete configMock1.storage.type;
+
+      ftrackIdSubmodule.isConfigOk(configMock1);
+      expect(logErrorStub.args[0][0]).to.equal(`FTRACK - config.storage required to be set.`);
+    });
+
+    it(`should be rejected if 'config.storage.type' is not 'html5'`, () => {
+      let configMock1 = JSON.parse(JSON.stringify(configMock));
+      configMock1.storage.type = 'not-html5';
+
+      ftrackIdSubmodule.isConfigOk(configMock1);
+      expect(logWarnStub.args[0][0]).to.equal(`FTRACK - config.storage.type recommended to be "html5".`);
+    });
+
+    it(`should be rejected if 'config.params.url' does not exist`, () => {
+      let configMock1 = JSON.parse(JSON.stringify(configMock));
+      delete configMock1.params.url;
+
+      ftrackIdSubmodule.isConfigOk(configMock1);
+      expect(logWarnStub.args[0][0]).to.equal(`FTRACK - config.params.url is required for ftrack to run.`);
+    });
+  });
+
+  describe(`ftrackIdSubmodule.isThereConsent():`, () => {
+    let uspDataHandlerStub;
+    beforeEach(() => {
+      uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+    });
+
+    afterEach(() => {
+      uspDataHandlerStub.restore();
+    });
+
+    describe(`returns 'false' if:`, () => {
+      it(`GDPR: if gdprApplies is truthy`, () => {
+        expect(ftrackIdSubmodule.isThereConsent({gdprApplies: 1})).to.not.be.ok;
+        expect(ftrackIdSubmodule.isThereConsent({gdprApplies: true})).to.not.be.ok;
+      });
+
+      it(`US_PRIVACY version 1: if 'Opt Out Sale' is 'Y'`, () => {
+        uspDataHandlerStub.returns('1YYY');
+        expect(ftrackIdSubmodule.isThereConsent({})).to.not.be.ok;
+      });
+    });
+
+    describe(`returns 'true' if`, () => {
+      it(`GDPR: if gdprApplies is undefined, false or 0`, () => {
+        expect(ftrackIdSubmodule.isThereConsent({gdprApplies: 0})).to.be.ok;
+        expect(ftrackIdSubmodule.isThereConsent({gdprApplies: false})).to.be.ok;
+        expect(ftrackIdSubmodule.isThereConsent({gdprApplies: null})).to.be.ok;
+        expect(ftrackIdSubmodule.isThereConsent({})).to.be.ok;
+      });
+
+      it(`US_PRIVACY version 1: if 'Opt Out Sale' is not 'Y' ('N','-')`, () => {
+        uspDataHandlerStub.returns('1NNN');
+        expect(ftrackIdSubmodule.isThereConsent(null)).to.be.ok;
+
+        uspDataHandlerStub.returns('1---');
+        expect(ftrackIdSubmodule.isThereConsent(null)).to.be.ok;
+      });
+    });
+  });
+
+  describe('getId() method', () => {
+    it(`should be using the StorageManager to set cookies or localstorage, as opposed to doing it directly`, () => {
+      expect((/localStorage/gi).test(JSON.stringify(ftrackIdSubmodule))).to.not.be.ok;
+      expect((/cookie/gi).test(JSON.stringify(ftrackIdSubmodule))).to.not.be.ok;
+    });
+
+    it(`should be the only method that gets a new ID aka hits the D9 endpoint`, () => {
+      ftrackIdSubmodule.getId(configMock, null, null).callback(() => {});
+      expect(loadExternalScript.called).to.be.ok;
+      expect(loadExternalScript.args[0][0]).to.deep.equal('https://d9.flashtalking.com/d9core');
+      loadExternalScript.resetHistory();
+
+      ftrackIdSubmodule.decode('value', configMock);
+      expect(loadExternalScript.called).to.not.be.ok;
+      expect(loadExternalScript.args).to.deep.equal([]);
+      loadExternalScript.resetHistory();
+
+      ftrackIdSubmodule.extendId(configMock, null, {cache: {id: ''}});
+      expect(loadExternalScript.called).to.not.be.ok;
+      expect(loadExternalScript.args).to.deep.equal([]);
+
+      loadExternalScript.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,
+        forceCallback = false;
+
+      // Confirm that our item is not in localStorage yet
+      expect(window.localStorage.getItem('ftrack-rtd')).to.not.be.ok;
+      expect(window.localStorage.getItem('ftrack-rtd_exp')).to.not.be.ok;
+
+      ftrackIdSubmodule.getId(configMock, consentDataMock, null).callback(() => {});
+      return new Promise(function(resolve, reject) {
+        window.testTimer = function () {
+          // Sinon fake server is NOT changing the readyState to 4, so instead
+          // we are forcing the callback to run and just passing in the expected Object
+          if (!forceCallback && window.hasOwnProperty('D9r')) {
+            window.D9r.callback({ 'DeviceID': ['<DEVICE_ID>'], 'SingleDeviceID': ['<SINGLE_DEVICE_ID>'] });
+            forceCallback = true;
+          }
+
+          ftrackId = window.localStorage.getItem('ftrackId');
+          ftrackIdExp = window.localStorage.getItem('ftrackId_exp');
+
+          if (!!ftrackId && !!ftrackIdExp) {
+            expect(window.localStorage.getItem('ftrackId')).to.be.ok;
+            expect(window.localStorage.getItem('ftrackId_exp')).to.be.ok;
+            resolve();
+          } else {
+            window.setTimeout(window.testTimer, 25);
+          }
+        };
+        window.testTimer();
+      });
+    });
+  });
+
+  describe(`decode() method`, () => {
+    it(`should respond with an object with the key 'ftrackId'`, () => {
+      const MOCK_VALUE_STRINGS = {
+          HHID: 'household_test_id',
+          DeviceID: 'device_test_id',
+          SingleDeviceID: 'single_device_test_id'
+        },
+        MOCK_VALUE_ARRAYS = {
+          HHID: ['household_test_id', 'a', 'b'],
+          DeviceID: ['device_test_id', 'c', 'd'],
+          SingleDeviceID: ['single_device_test_id', 'e', 'f']
+        },
+        MOCK_VALUE_BOTH = {
+          foo: ['foo', 'a', 'b'],
+          bar: 'bar',
+          baz: ['baz', 'baz', 'baz']
+        };
+
+      // strings are just passed through
+      expect(ftrackIdSubmodule.decode(MOCK_VALUE_STRINGS, configMock)).to.deep.equal({
+        ftrackId: {
+          ext: {
+            HHID: 'household_test_id',
+            DeviceID: 'device_test_id',
+            SingleDeviceID: 'single_device_test_id'
+          },
+          uid: 'device_test_id',
+        },
+      });
+
+      // arrays are converted to strings
+      expect(ftrackIdSubmodule.decode(MOCK_VALUE_ARRAYS, configMock)).to.deep.equal({
+        ftrackId: {
+          ext: {
+            HHID: 'household_test_id|a|b',
+            DeviceID: 'device_test_id|c|d',
+            SingleDeviceID: 'single_device_test_id|e|f'
+          },
+          uid: 'device_test_id|c|d',
+        },
+      });
+
+      // mix of both but uid should be empty string because DeviceId is not defined
+      expect(ftrackIdSubmodule.decode(MOCK_VALUE_BOTH, configMock)).to.deep.equal({
+        ftrackId: {
+          ext: {
+            foo: 'foo|a|b',
+            bar: 'bar',
+            baz: 'baz|baz|baz'
+          },
+          uid: '',
+        },
+      });
+    });
+
+    it(`should not be making requests to retrieve a new ID, it should just be decoding a response`, () => {
+      server = sinon.createFakeServer();
+      ftrackIdSubmodule.decode('value', configMock);
+
+      expect(server.requests).to.have.length(0);
+
+      server.restore();
+    })
+  });
+
+  describe(`extendId() method`, () => {
+    it(`should not be making requests to retrieve a new ID, it should just be adding additional data to the id object`, () => {
+      server = sinon.createFakeServer();
+      ftrackIdSubmodule.extendId(configMock, null, {cache: {id: ''}});
+
+      expect(server.requests).to.have.length(0);
+
+      server.restore();
+    });
+
+    it(`should return cacheIdObj`, () => {
+      expect(ftrackIdSubmodule.extendId(configMock, null, {cache: {id: ''}})).to.deep.equal({cache: {id: ''}});
+    });
+  });
+
+  describe('pbjs "get id" methods', () => {
+    beforeEach(() => {
+      init(config);
+      setSubmoduleRegistry([ftrackIdSubmodule]);
+    });
+
+    describe('pbjs.getUserIdsAsync()', () => {
+      it('should return the IDs in the correct schema - flat schema', () => {
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'ftrack',
+              value: {
+                ftrackId: {
+                  uid: 'device_test_id',
+                  ext: {
+                    HHID: 'household_test_id',
+                    DeviceID: 'device_test_id',
+                    SingleDeviceID: 'single_device_test_id'
+                  }
+                }
+              }
+            }]
+          }
+        });
+
+        getGlobal().getUserIdsAsync().then(ids => {
+          expect(ids).to.deep.equal({
+            uid: 'device_test_id',
+            ftrackId: {
+              HHID: 'household_test_id',
+              DeviceID: 'device_test_id',
+              SingleDeviceID: 'single_device_test_id'
+            }
+          });
+        });
+      });
+    });
+
+    describe('pbjs.getUserIds()', () => {
+      it('should return the IDs in the correct schema', () => {
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'ftrack',
+              value: {
+                ftrackId: {
+                  uid: 'device_test_id',
+                  ext: {
+                    HHID: 'household_test_id',
+                    DeviceID: 'device_test_id',
+                    SingleDeviceID: 'single_device_test_id'
+                  }
+                }
+              }
+            }]
+          }
+        });
+
+        expect(getGlobal().getUserIds()).to.deep.equal({
+          ftrackId: {
+            uid: 'device_test_id',
+            ext: {
+              HHID: 'household_test_id',
+              DeviceID: 'device_test_id',
+              SingleDeviceID: 'single_device_test_id'
+            }
+          }
+        });
+      });
+    });
+
+    describe('pbjs.getUserIdsAsEids()', () => {
+      it('should return the correct EIDs schema ', () => {
+        // Pass all three IDs
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'ftrack',
+              value: {
+                ftrackId: {
+                  uid: 'device_test_id',
+                  ext: {
+                    HHID: 'household_test_id',
+                    DeviceID: 'device_test_id',
+                    SingleDeviceID: 'single_device_test_id'
+                  }
+                }
+              }
+            }]
+          }
+        });
+
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+          source: 'flashtalking.com',
+          uids: [{
+            id: 'device_test_id',
+            atype: 1,
+            ext: {
+              HHID: 'household_test_id',
+              DeviceID: 'device_test_id',
+              SingleDeviceID: 'single_device_test_id'
+            }
+          }]
+        }]);
+      });
+
+      describe('by ID type:', () => {
+        it('- DeviceID', () => {
+          // Pass DeviceID only
+          config.setConfig({
+            userSync: {
+              auctionDelay: 10,
+              userIds: [{
+                name: 'ftrack',
+                value: {
+                  ftrackId: {
+                    uid: 'device_test_id',
+                    ext: {
+                      DeviceID: 'device_test_id',
+                    }
+                  }
+                }
+              }]
+            }
+          });
+
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+            source: 'flashtalking.com',
+            uids: [{
+              id: 'device_test_id',
+              atype: 1,
+              ext: {
+                DeviceID: 'device_test_id'
+              }
+            }]
+          }]);
+        });
+
+        it('- HHID', () => {
+          // Pass HHID only
+          config.setConfig({
+            userSync: {
+              auctionDelay: 10,
+              userIds: [{
+                name: 'ftrack',
+                value: {
+                  ftrackId: {
+                    uid: '',
+                    ext: {
+                      HHID: 'household_test_id'
+                    }
+                  }
+                }
+              }]
+            }
+          });
+
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+            source: 'flashtalking.com',
+            uids: [{
+              id: '',
+              atype: 1,
+              ext: {
+                HHID: 'household_test_id'
+              }
+            }]
+          }]);
+        });
+
+        it('- SingleDeviceID', () => {
+          // Pass SingleDeviceID only
+          config.setConfig({
+            userSync: {
+              auctionDelay: 10,
+              userIds: [{
+                name: 'ftrack',
+                value: {
+                  ftrackId: {
+                    uid: '',
+                    ext: {
+                      SingleDeviceID: 'single_device_test_id'
+                    }
+                  }
+                }
+              }]
+            }
+          });
+
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+            source: 'flashtalking.com',
+            uids: [{
+              id: '',
+              atype: 1,
+              ext: {
+                SingleDeviceID: 'single_device_test_id'
+              }
+            }]
+          }]);
+        });
+      });
+    });
+  })
+});
diff --git a/test/spec/modules/gammaBidAdapter_spec.js b/test/spec/modules/gammaBidAdapter_spec.js
index cdaa1b5448a..35394df7d11 100644
--- a/test/spec/modules/gammaBidAdapter_spec.js
+++ b/test/spec/modules/gammaBidAdapter_spec.js
@@ -69,7 +69,8 @@ describe('gammaBidAdapter', function() {
               'adid': '1515999070',
               'dealid': 'gax-paj2qarjf2g',
               'h': 250,
-              'w': 300
+              'w': 300,
+              'adomain': ['testdomain.com']
             }]
           }]
         }
@@ -87,7 +88,8 @@ describe('gammaBidAdapter', function() {
         'currency': 'USD',
         'netRevenue': true,
         'ttl': 300,
-        'ad': '<!-- adtag -->'
+        'ad': '<!-- adtag -->',
+        'meta': {'advertiserDomains': ['testdomain.com']}
       }];
       let result = spec.interpretResponse(serverResponse);
       expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
diff --git a/test/spec/modules/gamoshiBidAdapter_spec.js b/test/spec/modules/gamoshiBidAdapter_spec.js
index 79f58470cb3..8f8e3f03736 100644
--- a/test/spec/modules/gamoshiBidAdapter_spec.js
+++ b/test/spec/modules/gamoshiBidAdapter_spec.js
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import {spec, helper} from 'modules/gamoshiBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {newBidder} from '../../../src/adapters/bidderFactory.js';
+import {deepClone} from 'src/utils';
 
 const supplyPartnerId = '123';
 const adapter = newBidder(spec);
@@ -200,10 +201,6 @@ describe('GamoshiAdapter', () => {
     it('check if you are in the top frame', () => {
       expect(helper.getTopFrame()).to.equal(0);
     });
-
-    it('verify domain parsing', () => {
-      expect(helper.getTopWindowDomain('http://www.domain.com')).to.equal('www.domain.com');
-    });
   });
 
   describe('Is String start with search', () => {
@@ -240,6 +237,40 @@ describe('GamoshiAdapter', () => {
       expect(spec.isBidRequestValid({params: {supplyPartnerId: '123'}})).to.equal(true); // bidfloor has a default
       expect(spec.isBidRequestValid({params: {supplyPartnerId: '123', bidfloor: '123'}})).to.equal(false);
       expect(spec.isBidRequestValid({params: {supplyPartnerId: '123', bidfloor: 0.1}})).to.equal(true);
+
+      const getFloorResponse = {currency: 'USD', floor: 5};
+      let testBidRequest = deepClone(bidRequest);
+      let request = spec.buildRequests([testBidRequest], bidRequest)[0];
+
+      // 1. getBidFloor not exist AND bidfloor not exist - return 0
+      let payload = request.data;
+      expect(payload.imp[0].bidfloor).to.exist.and.equal(0);
+
+      // 2. getBidFloor not exist AND bidfloor exist - use bidfloor property
+      testBidRequest = deepClone(bidRequest);
+      testBidRequest.params = {
+        'bidfloor': 0.3
+      };
+      request = spec.buildRequests([testBidRequest], bidRequest)[0];
+      payload = request.data;
+      expect(payload.imp[0].bidfloor).to.exist.and.to.equal(0.3)
+
+      // 3. getBidFloor exist AND bidfloor not exist - use getFloor method
+      testBidRequest = deepClone(bidRequest);
+      testBidRequest.getFloor = () => getFloorResponse;
+      request = spec.buildRequests([testBidRequest], bidRequest)[0];
+      payload = request.data;
+      expect(payload.imp[0].bidfloor).to.exist.and.to.equal(5)
+
+      // 4. getBidFloor exist AND bidfloor exist -> use getFloor method
+      testBidRequest = deepClone(bidRequest);
+      testBidRequest.getFloor = () => getFloorResponse;
+      testBidRequest.params = {
+        'bidfloor': 0.3
+      };
+      request = spec.buildRequests([testBidRequest], bidRequest)[0];
+      payload = request.data;
+      expect(payload.imp[0].bidfloor).to.exist.and.to.equal(5)
     });
 
     it('should validate adpos', () => {
@@ -288,12 +319,16 @@ describe('GamoshiAdapter', () => {
 
     it('builds request correctly', () => {
       let bidRequest2 = utils.deepClone(bidRequest);
-      bidRequest2.refererInfo.referer = 'http://www.test.com/page.html';
+      Object.assign(bidRequest2.refererInfo, {
+        page: 'http://www.test.com/page.html',
+        domain: 'www.test.com',
+        ref: 'http://referrer.com'
+      })
       let response = spec.buildRequests([bidRequest], bidRequest2)[0];
 
       expect(response.data.site.domain).to.equal('www.test.com');
       expect(response.data.site.page).to.equal('http://www.test.com/page.html');
-      expect(response.data.site.ref).to.equal('http://www.test.com/page.html');
+      expect(response.data.site.ref).to.equal('http://referrer.com');
       expect(response.data.imp.length).to.equal(1);
       expect(response.data.imp[0].id).to.equal(bidRequest.transactionId);
       expect(response.data.imp[0].instl).to.equal(0);
@@ -339,19 +374,42 @@ describe('GamoshiAdapter', () => {
     it('builds request video object correctly', () => {
       let response;
       const bidRequestWithVideo = utils.deepClone(bidRequest);
+
+      bidRequestWithVideo.params.video = {
+        placement: 1,
+        minduration: 1,
+      }
+
       bidRequestWithVideo.mediaTypes = {
         video: {
-          playerSize: [[302, 252]]
+          playerSize: [[302, 252]],
+          mimes: ['video/mpeg'],
+          playbackmethod: 1,
+          startdelay: 1,
         }
       };
       response = spec.buildRequests([bidRequestWithVideo], bidRequest)[0];
       expect(response.data.imp[0].video.w).to.equal(bidRequestWithVideo.mediaTypes.video.playerSize[0][0]);
       expect(response.data.imp[0].video.h).to.equal(bidRequestWithVideo.mediaTypes.video.playerSize[0][1]);
       expect(response.data.imp[0].video.pos).to.equal(0);
+
+      expect(response.data.imp[0].video.mimes).to.equal(bidRequestWithVideo.mediaTypes.video.mimes);
+      expect(response.data.imp[0].video.skip).to.not.exist;
+      expect(response.data.imp[0].video.placement).to.equal(1);
+      expect(response.data.imp[0].video.minduration).to.equal(1);
+      expect(response.data.imp[0].video.playbackmethod).to.equal(1);
+      expect(response.data.imp[0].video.startdelay).to.equal(1);
+
       bidRequestWithVideo.mediaTypes = {
         video: {
-          playerSize: [302, 252]
-        }
+          playerSize: [302, 252],
+          mimes: ['video/mpeg'],
+          skip: 1,
+          placement: 1,
+          minduration: 1,
+          playbackmethod: 1,
+          startdelay: 1,
+        },
       };
 
       const bidRequestWithPosEquals1 = utils.deepClone(bidRequestWithVideo);
@@ -367,7 +425,13 @@ describe('GamoshiAdapter', () => {
       const bidRequestWithVideo = utils.deepClone(bidRequest);
       bidRequestWithVideo.mediaTypes = {
         video: {
-          context: 'instream'
+          context: 'instream',
+          mimes: ['video/mpeg'],
+          skip: 1,
+          placement: 1,
+          minduration: 1,
+          playbackmethod: 1,
+          startdelay: 1,
         }
       };
       let response = spec.buildRequests([bidRequestWithVideo], bidRequest)[0];
@@ -390,7 +454,13 @@ describe('GamoshiAdapter', () => {
       const bidRequestWithVideo = utils.deepClone(bidRequest);
       bidRequestWithVideo.mediaTypes.video = {
         playerSize: [[304, 254], [305, 255]],
-        context: 'instream'
+        context: 'instream',
+        mimes: ['video/mpeg'],
+        skip: 1,
+        placement: 1,
+        minduration: 1,
+        playbackmethod: 1,
+        startdelay: 1,
       };
 
       response = spec.buildRequests([bidRequestWithVideo], bidRequest)[0];
@@ -423,7 +493,7 @@ describe('GamoshiAdapter', () => {
     it('build request with ID5 Id', () => {
       const bidRequestClone = utils.deepClone(bidRequest);
       bidRequestClone.userId = {};
-      bidRequestClone.userId.id5id = 'id5-user-id';
+      bidRequestClone.userId.id5id = { uid: 'id5-user-id' };
       let request = spec.buildRequests([bidRequestClone], bidRequestClone)[0];
       expect(request.data.user.ext.eids).to.deep.equal([{
         'source': 'id5-sync.com',
@@ -480,6 +550,7 @@ describe('GamoshiAdapter', () => {
       expect(ad0.ad).to.equal(rtbResponse.seatbid[1].bid[0].adm);
       expect(ad0.vastXml).to.be.an('undefined');
       expect(ad0.vastUrl).to.be.an('undefined');
+      expect(ad0.meta.advertiserDomains).to.be.equal(rtbResponse.seatbid[1].bid[0].adomain);
     });
 
     it('aggregates video bids from all seat bids', () => {
diff --git a/test/spec/modules/gdprEnforcement_spec.js b/test/spec/modules/gdprEnforcement_spec.js
index 7f4828267a9..8d58990bb66 100644
--- a/test/spec/modules/gdprEnforcement_spec.js
+++ b/test/spec/modules/gdprEnforcement_spec.js
@@ -1,11 +1,28 @@
-import { deviceAccessHook, setEnforcementConfig, userSyncHook, userIdHook } from 'modules/gdprEnforcement.js';
+import {
+  deviceAccessHook,
+  setEnforcementConfig,
+  userSyncHook,
+  userIdHook,
+  makeBidRequestsHook,
+  validateRules,
+  enforcementRules,
+  purpose1Rule,
+  purpose2Rule,
+  enableAnalyticsHook,
+  getGvlid,
+  internal, STRICT_STORAGE_ENFORCEMENT
+} from 'modules/gdprEnforcement.js';
 import { config } from 'src/config.js';
 import adapterManager, { gdprDataHandler } from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import { validateStorageEnforcement } from 'src/storageManager.js';
-import { executeStorageCallbacks } from 'src/prebid.js';
+import * as events from 'src/events.js';
+import 'modules/appnexusBidAdapter.js'; // some tests expect this to be in the adapter registry
+import 'src/prebid.js'
+import {hook} from '../../../src/hook.js';
+import {VENDORLESS_GVLID} from '../../../src/consentHandler.js';
 
-describe('gdpr enforcement', function() {
+describe('gdpr enforcement', function () {
   let nextFnSpy;
   let logWarnSpy;
   let gdprDataHandlerStub;
@@ -34,11 +51,12 @@ describe('gdpr enforcement', function() {
           'consents': {
             '1': true,
             '2': true,
-            '3': true
+            '3': true,
+            '7': true
           },
           'legitimateInterests': {
             '1': false,
-            '2': false,
+            '2': true,
             '3': false
           }
         },
@@ -46,7 +64,9 @@ describe('gdpr enforcement', function() {
           'consents': {
             '1': true,
             '2': true,
-            '3': false
+            '3': false,
+            '4': true,
+            '5': false
           },
           'legitimateInterests': {
             '1': false,
@@ -81,23 +101,42 @@ describe('gdpr enforcement', function() {
     }
   };
 
-  after(function() {
-    validateStorageEnforcement.getHooks({hook: deviceAccessHook}).remove();
-    $$PREBID_GLOBAL$$.requestBids.getHooks({hook: executeStorageCallbacks}).remove();
+  before(() => {
+    hook.ready();
+  });
+
+  after(function () {
+    validateStorageEnforcement.getHooks({ hook: deviceAccessHook }).remove();
+    $$PREBID_GLOBAL$$.requestBids.getHooks().remove();
+    adapterManager.makeBidRequests.getHooks({ hook: makeBidRequestsHook }).remove();
   })
 
-  describe('deviceAccessHook', function() {
-    beforeEach(function() {
+  describe('deviceAccessHook', function () {
+    let adapterManagerStub;
+
+    function getBidderSpec(gvlid) {
+      return {
+        getSpec: () => {
+          return {
+            gvlid
+          }
+        }
+      }
+    }
+
+    beforeEach(function () {
       nextFnSpy = sinon.spy();
       gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
       logWarnSpy = sinon.spy(utils, 'logWarn');
+      adapterManagerStub = sinon.stub(adapterManager, 'getBidAdapter');
     });
-    afterEach(function() {
+    afterEach(function () {
       config.resetConfig();
       gdprDataHandler.getConsentData.restore();
       logWarnSpy.restore();
+      adapterManagerStub.restore();
     });
-    it('should not allow device access when device access flag is set to false', function() {
+    it('should not allow device access when device access flag is set to false', function () {
       config.setConfig({
         deviceAccess: false,
         consentManagement: {
@@ -118,10 +157,12 @@ describe('gdpr enforcement', function() {
         hasEnforcementHook: true,
         valid: false
       }
-      expect(nextFnSpy.calledWith(undefined, result));
+      sinon.assert.calledWith(nextFnSpy, undefined, undefined, result);
     });
 
-    it('should only check for consent for vendor exceptions when enforcePurpose and enforceVendor are false', function() {
+    it('should only check for consent for vendor exceptions when enforcePurpose and enforceVendor are false', function () {
+      adapterManagerStub.withArgs('appnexus').returns(getBidderSpec(1));
+      adapterManagerStub.withArgs('rubicon').returns(getBidderSpec(5));
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -143,7 +184,9 @@ describe('gdpr enforcement', function() {
       expect(logWarnSpy.callCount).to.equal(0);
     });
 
-    it('should check consent for all vendors when enforcePurpose and enforceVendor are true', function() {
+    it('should check consent for all vendors when enforcePurpose and enforceVendor are true', function () {
+      adapterManagerStub.withArgs('appnexus').returns(getBidderSpec(1));
+      adapterManagerStub.withArgs('rubicon').returns(getBidderSpec(3));
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -164,7 +207,8 @@ describe('gdpr enforcement', function() {
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
-    it('should allow device access when gdprApplies is false and hasDeviceAccess flag is true', function() {
+    it('should allow device access when gdprApplies is false and hasDeviceAccess flag is true', function () {
+      adapterManagerStub.withArgs('appnexus').returns(getBidderSpec(1));
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -187,15 +231,96 @@ describe('gdpr enforcement', function() {
         hasEnforcementHook: true,
         valid: true
       }
-      expect(nextFnSpy.calledWith(undefined, result));
+      sinon.assert.calledWith(nextFnSpy, 1, 'appnexus', result);
+    });
+
+    it('should use gvlMapping set by publisher', function() {
+      config.setConfig({
+        'gvlMapping': {
+          'appnexus': 4
+        }
+      });
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'storage',
+            enforcePurpose: true,
+            enforceVendor: true,
+            vendorExceptions: []
+          }]
+        }
+      });
+      let consentData = {}
+      consentData.vendorData = staticConfig.consentData.getTCData;
+      consentData.gdprApplies = true;
+      consentData.apiVersion = 2;
+      gdprDataHandlerStub.returns(consentData);
+
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      let result = {
+        hasEnforcementHook: true,
+        valid: true
+      }
+      sinon.assert.calledWith(nextFnSpy, 4, 'appnexus', result);
+      config.resetConfig();
+    });
+
+    it('should use gvl id of alias and not of parent', function() {
+      let curBidderStub = sinon.stub(config, 'getCurrentBidder');
+      curBidderStub.returns('appnexus-alias');
+      adapterManager.aliasBidAdapter('appnexus', 'appnexus-alias');
+      config.setConfig({
+        'gvlMapping': {
+          'appnexus-alias': 4
+        }
+      });
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'storage',
+            enforcePurpose: true,
+            enforceVendor: true,
+            vendorExceptions: []
+          }]
+        }
+      });
+      let consentData = {}
+      consentData.vendorData = staticConfig.consentData.getTCData;
+      consentData.gdprApplies = true;
+      consentData.apiVersion = 2;
+      gdprDataHandlerStub.returns(consentData);
+
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      let result = {
+        hasEnforcementHook: true,
+        valid: true
+      }
+      sinon.assert.calledWith(nextFnSpy, 4, 'appnexus', result);
+      config.resetConfig();
+      curBidderStub.restore();
     });
+
+    it(`should not enforce consent for vendorless modules if ${STRICT_STORAGE_ENFORCEMENT} is not set`, () => {
+      setEnforcementConfig({});
+      let consentData = {
+        vendorData: staticConfig.consentData.getTCData,
+        gdprApplies: true
+      }
+      gdprDataHandlerStub.returns(consentData);
+      const validate = sinon.stub().callsFake(() => false);
+      deviceAccessHook(nextFnSpy, VENDORLESS_GVLID, 'mockModule', undefined, {validate});
+      sinon.assert.callCount(validate, 0);
+      sinon.assert.calledWith(nextFnSpy, VENDORLESS_GVLID, 'mockModule', {hasEnforcementHook: true, valid: true});
+    })
   });
 
-  describe('userSyncHook', function() {
+  describe('userSyncHook', function () {
     let curBidderStub;
     let adapterManagerStub;
 
-    beforeEach(function() {
+    beforeEach(function () {
       gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
       logWarnSpy = sinon.spy(utils, 'logWarn');
       curBidderStub = sinon.stub(config, 'getCurrentBidder');
@@ -203,7 +328,7 @@ describe('gdpr enforcement', function() {
       nextFnSpy = sinon.spy();
     });
 
-    afterEach(function() {
+    afterEach(function () {
       config.getCurrentBidder.restore();
       config.resetConfig();
       gdprDataHandler.getConsentData.restore();
@@ -211,7 +336,7 @@ describe('gdpr enforcement', function() {
       logWarnSpy.restore();
     });
 
-    it('should allow bidder to do user sync if consent is true', function() {
+    it('should allow bidder to do user sync if consent is true', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -230,7 +355,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder1');
       adapterManagerStub.withArgs('sampleBidder1').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 1
           }
@@ -240,7 +365,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder2');
       adapterManagerStub.withArgs('sampleBidder2').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 3
           }
@@ -250,7 +375,7 @@ describe('gdpr enforcement', function() {
       expect(nextFnSpy.calledTwice).to.equal(true);
     });
 
-    it('should not allow bidder to do user sync if user has denied consent', function() {
+    it('should not allow bidder to do user sync if user has denied consent', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -269,7 +394,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder1');
       adapterManagerStub.withArgs('sampleBidder1').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 1
           }
@@ -279,7 +404,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder2');
       adapterManagerStub.withArgs('sampleBidder2').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 3
           }
@@ -290,7 +415,7 @@ describe('gdpr enforcement', function() {
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
-    it('should not check vendor consent when enforceVendor is false', function() {
+    it('should not check vendor consent when enforceVendor is false', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -309,7 +434,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder1');
       adapterManagerStub.withArgs('sampleBidder1').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 1
           }
@@ -319,7 +444,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder2');
       adapterManagerStub.withArgs('sampleBidder2').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 3
           }
@@ -331,16 +456,16 @@ describe('gdpr enforcement', function() {
     });
   });
 
-  describe('userIdHook', function() {
-    beforeEach(function() {
+  describe('userIdHook', function () {
+    beforeEach(function () {
       logWarnSpy = sinon.spy(utils, 'logWarn');
       nextFnSpy = sinon.spy();
     });
-    afterEach(function() {
+    afterEach(function () {
       config.resetConfig();
       logWarnSpy.restore();
     });
-    it('should allow user id module if consent is given', function() {
+    it('should allow user id module if consent is given', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -366,9 +491,10 @@ describe('gdpr enforcement', function() {
       const args = nextFnSpy.getCalls()[0].args;
       expect(args[1].hasValidated).to.be.true;
       expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, submodules, { ...consentData, hasValidated: true });
     });
 
-    it('should allow userId module if gdpr not in scope', function() {
+    it('should allow userId module if gdpr not in scope', function () {
       let submodules = [{
         submodule: {
           gvlid: 1,
@@ -381,10 +507,10 @@ describe('gdpr enforcement', function() {
       const args = nextFnSpy.getCalls()[0].args;
       expect(args[1]).to.be.null;
       expect(nextFnSpy.calledOnce).to.equal(true);
-      expect(nextFnSpy.calledWith(undefined, submodules, consentData));
+      sinon.assert.calledWith(nextFnSpy, submodules, consentData);
     });
 
-    it('should not enforce if not apiVersion 2', function() {
+    it('should not allow user id module if user denied consent', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -397,57 +523,711 @@ describe('gdpr enforcement', function() {
       });
       let consentData = {}
       consentData.vendorData = staticConfig.consentData.getTCData;
-      consentData.apiVersion = 1;
+      consentData.apiVersion = 2;
       consentData.gdprApplies = true;
+
       let submodules = [{
         submodule: {
           gvlid: 1,
           name: 'sampleUserId'
         }
+      }, {
+        submodule: {
+          gvlid: 3,
+          name: 'sampleUserId1'
+        }
       }]
       userIdHook(nextFnSpy, submodules, consentData);
-      // Should not pass back hasValidated flag since version 1
-      const args = nextFnSpy.getCalls()[0].args;
-      expect(args[1].hasValidated).to.be.undefined;
-      expect(args[0]).to.deep.equal(submodules);
-      expect(nextFnSpy.calledOnce).to.equal(true);
+      expect(logWarnSpy.callCount).to.equal(1);
+      let expectedSubmodules = [{
+        submodule: {
+          gvlid: 1,
+          name: 'sampleUserId'
+        }
+      }]
+      sinon.assert.calledWith(nextFnSpy, expectedSubmodules, { ...consentData, hasValidated: true });
+    });
+  });
+
+  describe('makeBidRequestsHook', function () {
+    let sandbox;
+    let adapterManagerStub;
+    let emitEventSpy;
+
+    const MOCK_AD_UNITS = [{
+      code: 'ad-unit-1',
+      mediaTypes: {},
+      bids: [{
+        bidder: 'bidder_1' // has consent
+      }, {
+        bidder: 'bidder_2' // doesn't have consent, but liTransparency is true. Bidder remains active.
+      }]
+    }, {
+      code: 'ad-unit-2',
+      mediaTypes: {},
+      bids: [{
+        bidder: 'bidder_2'
+      }, {
+        bidder: 'bidder_3'
+      }]
+    }];
+
+    beforeEach(function () {
+      sandbox = sinon.createSandbox();
+      gdprDataHandlerStub = sandbox.stub(gdprDataHandler, 'getConsentData');
+      adapterManagerStub = sandbox.stub(adapterManager, 'getBidAdapter');
+      logWarnSpy = sandbox.spy(utils, 'logWarn');
+      nextFnSpy = sandbox.spy();
+      emitEventSpy = sandbox.spy(events, 'emit');
+    });
+    afterEach(function () {
+      config.resetConfig();
+      sandbox.restore();
     });
 
-    it('should not allow user id module if user denied consent', function() {
+    it('should block bidder which does not have consent and allow bidder which has consent (liTransparency is established)', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
-            purpose: 'storage',
-            enforcePurpose: false,
+            purpose: 'basicAds',
+            enforcePurpose: true,
             enforceVendor: true,
             vendorExceptions: []
           }]
         }
       });
-      let consentData = {}
+      const consentData = {};
       consentData.vendorData = staticConfig.consentData.getTCData;
       consentData.apiVersion = 2;
       consentData.gdprApplies = true;
-      let submodules = [{
-        submodule: {
-          gvlid: 1,
-          name: 'sampleUserId'
+
+      gdprDataHandlerStub.returns(consentData);
+      adapterManagerStub.withArgs('bidder_1').returns({
+        getSpec: function () {
+          return { 'gvlid': 4 }
+        }
+      });
+      adapterManagerStub.withArgs('bidder_2').returns({
+        getSpec: function () {
+          return { 'gvlid': 5 }
+        }
+      });
+      adapterManagerStub.withArgs('bidder_3').returns({
+        getSpec: function () {
+          return { 'gvlid': undefined }
         }
+      });
+      makeBidRequestsHook(nextFnSpy, MOCK_AD_UNITS, []);
+
+      // Assertions
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, [{
+        code: 'ad-unit-1',
+        mediaTypes: {},
+        bids: [
+          sinon.match({ bidder: 'bidder_1' }),
+          sinon.match({ bidder: 'bidder_2' })
+        ]
       }, {
-        submodule: {
-          gvlid: 3,
-          name: 'sampleUserId1'
+        code: 'ad-unit-2',
+        mediaTypes: {},
+        bids: [
+          sinon.match({ bidder: 'bidder_2' }),
+          sinon.match({ bidder: 'bidder_3' }) // should be allowed even though it's doesn't have a gvlId because liTransparency is established.
+        ]
+      }], []);
+    });
+
+    it('should block bidder which does not have consent and allow bidder which has consent (liTransparency is NOT established)', function() {
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'basicAds',
+            enforcePurpose: true,
+            enforceVendor: true,
+            vendorExceptions: ['bidder_3']
+          }]
         }
-      }]
-      userIdHook(nextFnSpy, submodules, consentData);
-      expect(logWarnSpy.callCount).to.equal(1);
-      let expectedSubmodules = [{
-        submodule: {
-          gvlid: 1,
-          name: 'sampleUserId'
+      });
+      const consentData = {};
+
+      // set li for purpose 2 to false
+      const newConsentData = utils.deepClone(staticConfig);
+      newConsentData.consentData.getTCData.purpose.legitimateInterests['2'] = false;
+
+      consentData.vendorData = newConsentData.consentData.getTCData;
+      consentData.apiVersion = 2;
+      consentData.gdprApplies = true;
+
+      gdprDataHandlerStub.returns(consentData);
+      adapterManagerStub.withArgs('bidder_1').returns({
+        getSpec: function () {
+          return { 'gvlid': 4 }
+        }
+      });
+      adapterManagerStub.withArgs('bidder_2').returns({
+        getSpec: function () {
+          return { 'gvlid': 5 }
         }
+      });
+      adapterManagerStub.withArgs('bidder_3').returns({
+        getSpec: function () {
+          return { 'gvlid': undefined }
+        }
+      });
+
+      makeBidRequestsHook(nextFnSpy, MOCK_AD_UNITS, []);
+
+      // Assertions
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, [{
+        code: 'ad-unit-1',
+        mediaTypes: {},
+        bids: [
+          sinon.match({ bidder: 'bidder_1' }), // 'bidder_2' is not present because it doesn't have vendorConsent
+        ]
+      }, {
+        code: 'ad-unit-2',
+        mediaTypes: {},
+        bids: [
+          sinon.match({ bidder: 'bidder_3' }), // 'bidder_3' is allowed despite gvlId being undefined because it's part of vendorExceptions
+        ]
+      }], []);
+
+      expect(logWarnSpy.calledOnce).to.equal(true);
+    });
+
+    it('should skip validation checks if GDPR version is not equal to "2"', function () {
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'storage',
+            enforePurpose: false,
+            enforceVendor: false,
+            vendorExceptions: []
+          }]
+        }
+      });
+
+      const consentData = {};
+      consentData.vendorData = staticConfig.consentData.getTCData;
+      consentData.apiVersion = 1;
+      consentData.gdprApplies = true;
+      gdprDataHandlerStub.returns(consentData);
+
+      makeBidRequestsHook(nextFnSpy, MOCK_AD_UNITS, []);
+
+      // Assertions
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, sinon.match.array.deepEquals(MOCK_AD_UNITS), []);
+      expect(emitEventSpy.notCalled).to.equal(true);
+      expect(logWarnSpy.notCalled).to.equal(true);
+    });
+  });
+
+  describe('enableAnalyticsHook', function () {
+    let sandbox;
+    let adapterManagerStub;
+
+    const MOCK_ANALYTICS_ADAPTER_CONFIG = [{
+      provider: 'analyticsAdapter_A',
+      options: {}
+    }, {
+      provider: 'analyticsAdapter_B',
+      options: {}
+    }, {
+      provider: 'analyticsAdapter_C',
+      options: {}
+    }];
+
+    beforeEach(function () {
+      sandbox = sinon.createSandbox();
+      gdprDataHandlerStub = sandbox.stub(gdprDataHandler, 'getConsentData');
+      adapterManagerStub = sandbox.stub(adapterManager, 'getAnalyticsAdapter');
+      logWarnSpy = sandbox.spy(utils, 'logWarn');
+      nextFnSpy = sandbox.spy();
+    });
+
+    afterEach(function() {
+      config.resetConfig();
+      sandbox.restore();
+    });
+
+    it('should block analytics adapter which does not have consent and allow the one(s) which have consent', function() {
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'measurement',
+            enforcePurpose: true,
+            enforceVendor: true,
+            vendorExceptions: ['analyticsAdapter_B']
+          }]
+        }
+      });
+
+      const consentData = {};
+      consentData.vendorData = staticConfig.consentData.getTCData;
+      consentData.apiVersion = 2;
+      consentData.gdprApplies = true;
+
+      gdprDataHandlerStub.returns(consentData);
+      adapterManagerStub.withArgs('analyticsAdapter_A').returns({ gvlid: 3 });
+      adapterManagerStub.withArgs('analyticsAdapter_B').returns({ gvlid: 5 });
+      adapterManagerStub.withArgs('analyticsAdapter_C').returns({ gvlid: 1 });
+
+      enableAnalyticsHook(nextFnSpy, MOCK_ANALYTICS_ADAPTER_CONFIG);
+
+      // Assertions
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, [{
+        provider: 'analyticsAdapter_B',
+        options: {}
+      }, {
+        provider: 'analyticsAdapter_C',
+        options: {}
+      }]);
+      expect(logWarnSpy.calledOnce).to.equal(true);
+    });
+  });
+
+  describe('validateRules', function () {
+    const createGdprRule = (purposeName = 'storage', enforcePurpose = true, enforceVendor = true, vendorExceptions = [], softVendorExceptions = []) => ({
+      purpose: purposeName,
+      enforcePurpose,
+      enforceVendor,
+      vendorExceptions,
+      softVendorExceptions,
+    });
+
+    const consentData = {
+      vendorData: staticConfig.consentData.getTCData,
+      apiVersion: 2,
+      gdprApplies: true
+    };
+
+    // Bidder - 'bidderA' has vendorConsent
+    const vendorAllowedModule = 'bidderA';
+    const vendorAllowedGvlId = 1;
+
+    // Bidder = 'bidderB' doesn't have vendorConsent
+    const vendorBlockedModule = 'bidderB';
+    const vendorBlockedGvlId = 3;
+
+    const consentDataWithPurposeConsentFalse = utils.deepClone(consentData);
+    consentDataWithPurposeConsentFalse.vendorData.purpose.consents['1'] = false;
+
+    it('should return true when enforcePurpose=true AND purposeConsent[p]==true AND enforceVendor[p,v]==true AND vendorConsent[v]==true', function () {
+      // 'enforcePurpose' and 'enforceVendor' both are 'true'
+      const gdprRule = createGdprRule('storage', true, true, []);
+
+      // case 1 - Both purpose consent and vendor consent is 'true'. validateRules must return 'true'
+      let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 2 - Purpose consent is 'true' but vendor consent is 'false'. validateRules must return 'false'
+      isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(false);
+
+      // case 3 - Purpose consent is 'false' but vendor consent is 'true'. validateRules must return 'false'
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(false);
+
+      // case 4 - Both purpose consent and vendor consent is 'false'. validateRules must return 'false'
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(false);
+    });
+
+    it('should return true when enforcePurpose=true AND purposeConsent[p]==true AND enforceVendor[p,v]==false', function () {
+      // 'enforcePurpose' is 'true' and 'enforceVendor' is 'false'
+      const gdprRule = createGdprRule('storage', true, false, []);
+
+      // case 1 - Both purpose consent and vendor consent is 'true'. validateRules must return 'true'
+      let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 2 - Purpose consent is 'true' but vendor consent is 'false'. validateRules must return 'true' because vendorConsent doens't matter
+      isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 3 - Purpose consent is 'false' but vendor consent is 'true'. validateRules must return 'false' because vendorConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(false);
+
+      // case 4 - Both purpose consent and vendor consent is 'false'. validateRules must return 'false' and vendorConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(false);
+    });
+
+    it('should return true when enforcePurpose=false AND enforceVendor[p,v]==true AND vendorConsent[v]==true', function () {
+      // 'enforcePurpose' is 'false' and 'enforceVendor' is 'true'
+      const gdprRule = createGdprRule('storage', false, true, []);
+
+      // case 1 - Both purpose consent and vendor consent is 'true'. validateRules must return 'true'
+      let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 2 - Purpose consent is 'true' but vendor consent is 'false'. validateRules must return 'false' because purposeConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(false);
+
+      // case 3 - urpose consent is 'false' but vendor consent is 'true'. validateRules must return 'true' because purposeConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 4 - Both purpose consent and vendor consent is 'false'. validateRules must return 'false' and purposeConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(false);
+    });
+
+    it('should return true when enforcePurpose=false AND enforceVendor[p,v]==false', function () {
+      // 'enforcePurpose' is 'false' and 'enforceVendor' is 'false'
+      const gdprRule = createGdprRule('storage', false, false, []);
+
+      // case 1 - Both purpose consent and vendor consent is 'true'. validateRules must return 'true', both the consents do not matter.
+      let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 2 - Purpose consent is 'true' but vendor consent is 'false'. validateRules must return 'true', both the consents do not matter.
+      isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 3 - urpose consent is 'false' but vendor consent is 'true'. validateRules must return 'true', both the consents do not matter.
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 4 - Both purpose consent and vendor consent is 'false'. validateRules must return 'true', both the consents do not matter.
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(true);
+    });
+
+    it('should return true when "vendorExceptions" contains the name of the vendor under test', function () {
+      // 'vendorExceptions' contains 'bidderB' which doesn't have vendor consent.
+      const gdprRule = createGdprRule('storage', false, true, [vendorBlockedModule]);
+
+      /* 'bidderB' gets a free pass since it's included in the 'vendorExceptions' array. validateRules must disregard
+      user's choice for purpose and vendor consent and return 'true' for this bidder(s) */
+      const isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(true);
+    });
+
+    describe('when the vendor has a softVendorException', () => {
+      const gdprRule = createGdprRule('storage', true, true, [], [vendorBlockedModule]);
+
+      it('should return false if general consent was not given', () => {
+        const isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.be.false;
+      })
+      it('should return true if general consent was given', () => {
+        const isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.be.true;
+      })
+    })
+
+    describe('when module does not need vendor consent', () => {
+      Object.entries({
+        'storage': 1,
+        'basicAds': 2,
+        'measurement': 7
+      }).forEach(([purpose, purposeNo]) => {
+        describe(`for purpose ${purpose}`, () => {
+          const rule = createGdprRule(purpose);
+          Object.entries({
+            'allowed': true,
+            'not allowed': false
+          }).forEach(([t, consentGiven]) => {
+            it(`should be ${t} when purpose is ${t}`, () => {
+              const consent = utils.deepClone(consentData);
+              consent.vendorData.purpose.consents[purposeNo] = consentGiven;
+              // take legitimate interest out of the picture for this test
+              consent.vendorData.purpose.legitimateInterests = {};
+              const actual = validateRules(rule, consent, 'mockModule', VENDORLESS_GVLID);
+              expect(actual).to.equal(consentGiven);
+            })
+          })
+        })
+      })
+    })
+
+    describe('Purpose 2 special case', function () {
+      const consentDataWithLIFalse = utils.deepClone(consentData);
+      consentDataWithLIFalse.vendorData.purpose.legitimateInterests['2'] = false;
+
+      const consentDataWithPurposeConsentFalse = utils.deepClone(consentData);
+      consentDataWithPurposeConsentFalse.vendorData.purpose.consents['2'] = false;
+
+      const consentDataWithPurposeConsentFalseAndLIFalse = utils.deepClone(consentData);
+      consentDataWithPurposeConsentFalseAndLIFalse.vendorData.purpose.legitimateInterests['2'] = false;
+      consentDataWithPurposeConsentFalseAndLIFalse.vendorData.purpose.consents['2'] = false;
+
+      it('should return true when (enforcePurpose=true AND purposeConsent[p]===true AND enforceVendor[p.v]===true AND vendorConsent[v]===true) OR (purposesLITransparency[p]===true)', function () {
+        // both 'enforcePurpose' and 'enforceVendor' is 'true'
+        const gdprRule = createGdprRule('basicAds', true, true, []);
+
+        // case 1 - Both purpose consent and vendor consent is 'true', but legitimateInterests for purpose 2 is 'false'. validateRules must return 'true'.
+        let isAllowed = validateRules(gdprRule, consentDataWithLIFalse, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 2 - Purpose consent is 'true' but vendor consent is 'false', but legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 3 - Purpose consent is 'true' and vendor consent is 'true', as well as legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 4 - Purpose consent is 'true' and vendor consent is 'false', and legitimateInterests for purpose 2 is 'false'. validateRules must return 'false'.
+        isAllowed = validateRules(gdprRule, consentDataWithLIFalse, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(false);
+      });
+
+      it('should return true when (enforcePurpose=true AND purposeConsent[p]===true AND enforceVendor[p.v]===false) OR (purposesLITransparency[p]===true)', function () {
+        // 'enforcePurpose' is 'true' and 'enforceVendor' is 'false'
+        const gdprRule = createGdprRule('basicAds', true, false, []);
+
+        // case 1 - Purpose consent is 'true', vendor consent doesn't matter and legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        let isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 2 - Purpose consent is 'false', vendor consent doesn't matter and legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 3 - Purpose consent is 'false', vendor consent doesn't matter and legitimateInterests for purpose 2 is 'false'. validateRules must return 'false'.
+        isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalseAndLIFalse, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(false);
+      });
+
+      it('should return true when (enforcePurpose=false AND enforceVendor[p,v]===true AND vendorConsent[v]===true) OR (purposesLITransparency[p]===true)', function () {
+        // 'enforcePurpose' is 'false' and 'enforceVendor' is 'true'
+        const gdprRule = createGdprRule('basicAds', false, true, []);
+
+        // case - 1 Vendor consent is 'true', purpose consent doesn't matter and legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 2 - Vendor consent is 'false', purpose consent doesn't matter and legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 3 - Vendor consent is 'false', purpose consent doesn't matter and legitimateInterests for purpose 2 is 'false'. validateRules must return 'false'.
+        isAllowed = validateRules(gdprRule, consentDataWithLIFalse, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(false);
+      });
+    });
+  })
+
+  describe('setEnforcementConfig', function () {
+    let sandbox;
+    const DEFAULT_RULES = [{
+      purpose: 'storage',
+      enforcePurpose: true,
+      enforceVendor: true,
+      vendorExceptions: []
+    }, {
+      purpose: 'basicAds',
+      enforcePurpose: true,
+      enforceVendor: true,
+      vendorExceptions: []
+    }];
+    beforeEach(function () {
+      sandbox = sinon.createSandbox();
+      logWarnSpy = sandbox.spy(utils, 'logWarn');
+    });
+    afterEach(function () {
+      config.resetConfig();
+      sandbox.restore();
+    });
+
+    it('should enforce TCF2 Purpose1 and Purpose 2 if no "rules" found in the config', function () {
+      setEnforcementConfig({
+        gdpr: {
+          cmpApi: 'iab',
+          allowAuctionWithoutConsent: true,
+          timeout: 5000
+        }
+      });
+
+      expect(logWarnSpy.calledOnce).to.equal(true);
+      expect(enforcementRules).to.deep.equal(DEFAULT_RULES);
+    });
+
+    it('should enforce TCF2 Purpose 2 also if only Purpose 1 is defined in "rules"', function () {
+      const purpose1RuleDefinedInConfig = {
+        purpose: 'storage',
+        enforcePurpose: false,
+        enforceVendor: true,
+        vendorExceptions: ['bidderA']
+      }
+      setEnforcementConfig({
+        gdpr: {
+          rules: [purpose1RuleDefinedInConfig]
+        }
+      });
+
+      expect(purpose1Rule).to.deep.equal(purpose1RuleDefinedInConfig);
+      expect(purpose2Rule).to.deep.equal(DEFAULT_RULES[1]);
+    });
+
+    it('should enforce TCF2 Purpose 1 also if only Purpose 2 is defined in "rules"', function () {
+      const purpose2RuleDefinedInConfig = {
+        purpose: 'basicAds',
+        enforcePurpose: false,
+        enforceVendor: true,
+        vendorExceptions: ['bidderA']
+      }
+      setEnforcementConfig({
+        gdpr: {
+          rules: [purpose2RuleDefinedInConfig]
+        }
+      });
+
+      expect(purpose1Rule).to.deep.equal(DEFAULT_RULES[0]);
+      expect(purpose2Rule).to.deep.equal(purpose2RuleDefinedInConfig);
+    });
+
+    it('should use the "rules" defined in config if a definition found', function() {
+      const rules = [{
+        purpose: 'storage',
+        enforcePurpose: false,
+        enforceVendor: false
+      }, {
+        purpose: 'basicAds',
+        enforcePurpose: false,
+        enforceVendor: false
       }]
-      expect(nextFnSpy.calledWith(undefined, expectedSubmodules, consentData));
+      setEnforcementConfig({gdpr: { rules }});
+
+      expect(enforcementRules).to.deep.equal(rules);
     });
   });
+
+  describe('TCF2FinalResults', function() {
+    let sandbox;
+    beforeEach(function() {
+      sandbox = sinon.createSandbox();
+      sandbox.spy(events, 'emit');
+    });
+    afterEach(function() {
+      config.resetConfig();
+      sandbox.restore();
+    });
+    it('should emit TCF2 enforcement data on auction end', function() {
+      const rules = [{
+        purpose: 'storage',
+        enforcePurpose: false,
+        enforceVendor: false
+      }, {
+        purpose: 'basicAds',
+        enforcePurpose: false,
+        enforceVendor: false
+      }]
+      setEnforcementConfig({gdpr: { rules }});
+
+      events.emit('auctionEnd', {})
+
+      // Assertions
+      sinon.assert.calledWith(events.emit.getCall(1), 'tcf2Enforcement', sinon.match.object);
+    })
+  });
+
+  describe('gvlid resolution', () => {
+    let sandbox;
+    beforeEach(function() {
+      sandbox = sinon.createSandbox();
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+      config.resetConfig();
+    });
+
+    describe('getGvlid', function() {
+      let getGvlidForBidAdapterStub;
+      let getGvlidForUserIdModuleStub;
+      let getGvlidForAnalyticsAdapterStub;
+      beforeEach(function() {
+        getGvlidForBidAdapterStub = sandbox.stub(internal, 'getGvlidForBidAdapter');
+        getGvlidForUserIdModuleStub = sandbox.stub(internal, 'getGvlidForUserIdModule');
+        getGvlidForAnalyticsAdapterStub = sandbox.stub(internal, 'getGvlidForAnalyticsAdapter');
+      });
+
+      it('should return "null" if called without passing any argument', function() {
+        const gvlid = getGvlid();
+        expect(gvlid).to.equal(null);
+      });
+
+      it('should return "null" if GVL ID is not defined for any of these modules: Bid adapter, UserId submodule and Analytics adapter', function() {
+        getGvlidForBidAdapterStub.withArgs('moduleA').returns(null);
+        getGvlidForUserIdModuleStub.withArgs('moduleA').returns(null);
+        getGvlidForAnalyticsAdapterStub.withArgs('moduleA').returns(null);
+
+        const gvlid = getGvlid('moduleA');
+        expect(gvlid).to.equal(null);
+      });
+
+      it('should return the GVL ID from gvlMapping if it is defined in setConfig', function() {
+        config.setConfig({
+          gvlMapping: {
+            moduleA: 1
+          }
+        });
+
+        // Actual GVL ID for moduleA is 2, as defined on its the bidAdapter.js file.
+        getGvlidForBidAdapterStub.withArgs('moduleA').returns(2);
+
+        const gvlid = getGvlid('moduleA');
+        expect(gvlid).to.equal(1);
+      });
+
+      it('should return the GVL ID by calling getGvlidForBidAdapter -> getGvlidForUserIdModule -> getGvlidForAnalyticsAdapter in sequence', function() {
+        getGvlidForBidAdapterStub.withArgs('moduleA').returns(null);
+        getGvlidForUserIdModuleStub.withArgs('moduleA').returns(null);
+        getGvlidForAnalyticsAdapterStub.withArgs('moduleA').returns(7);
+
+        expect(getGvlid('moduleA')).to.equal(7);
+      });
+
+      it('should pass extra arguments to analytics\' getGvlid', () => {
+        getGvlidForAnalyticsAdapterStub.withArgs('analytics').returns(321);
+        const cfg = {some: 'args'};
+        getGvlid('analytics', cfg);
+        sinon.assert.calledWith(getGvlidForAnalyticsAdapterStub, 'analytics', cfg);
+      });
+    });
+
+    describe('getGvlidForAnalyticsAdapter', () => {
+      let getAnalyticsAdapter, adapter, adapterEntry;
+
+      beforeEach(() => {
+        adapter = {};
+        adapterEntry = {
+          adapter
+        };
+        getAnalyticsAdapter = sandbox.stub(adapterManager, 'getAnalyticsAdapter');
+        getAnalyticsAdapter.withArgs('analytics').returns(adapterEntry);
+      });
+
+      it('should return gvlid from adapterManager if defined', () => {
+        adapterEntry.gvlid = 123;
+        adapter.gvlid = 321
+        expect(internal.getGvlidForAnalyticsAdapter('analytics')).to.equal(123);
+      });
+
+      it('should return gvlid from adapter if defined', () => {
+        adapter.gvlid = 321;
+        expect(internal.getGvlidForAnalyticsAdapter('analytics')).to.equal(321);
+      });
+
+      it('should invoke adapter.gvlid if it\'s a function', () => {
+        adapter.gvlid = (cfg) => cfg.k
+        const cfg = {k: 231};
+        expect(internal.getGvlidForAnalyticsAdapter('analytics', cfg)).to.eql(231);
+      });
+
+      it('should not choke if adapter gvlid fn throws', () => {
+        adapter.gvlid = () => { throw new Error(); };
+        expect(internal.getGvlidForAnalyticsAdapter('analytics')).to.not.be.ok;
+      });
+    });
+  })
 });
diff --git a/test/spec/modules/genericAnalyticsAdapter_spec.js b/test/spec/modules/genericAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..a5a6074c425
--- /dev/null
+++ b/test/spec/modules/genericAnalyticsAdapter_spec.js
@@ -0,0 +1,284 @@
+import {defaultHandler, GenericAnalytics} from '../../../modules/genericAnalyticsAdapter.js';
+import * as events from 'src/events.js';
+import * as CONSTANTS from 'src/constants.json';
+
+const {AUCTION_INIT, BID_RESPONSE} = CONSTANTS.EVENTS;
+
+describe('Generic analytics', () => {
+  describe('adapter', () => {
+    let adapter, sandbox, clock;
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(events, 'getEvents').returns([]);
+      clock = sandbox.useFakeTimers();
+      adapter = new GenericAnalytics();
+    });
+
+    afterEach(() => {
+      adapter.disableAnalytics();
+      sandbox.restore();
+    });
+
+    describe('configuration', () => {
+      it('should be accepted if valid', () => {
+        adapter.enableAnalytics({
+          options: {
+            url: 'mock',
+            method: 'GET',
+            batchSize: 123,
+            batchDelay: 321
+          }
+        });
+        expect(adapter.enabled).to.be.true;
+      });
+
+      describe('should not work if', () => {
+        afterEach(function() {
+          expect(adapter.enabled).to.equal(false, this.currentTest.title);
+        });
+
+        it('neither handler nor url are specified', () => {
+          adapter.enableAnalytics({});
+        });
+
+        ['batchSize', 'batchDelay', 'handler'].forEach(option => {
+          it(`${option} is not valid`, () => {
+            adapter.enableAnalytics({
+              options: {
+                url: 'mock',
+                [option]: false
+              }
+            });
+          });
+        });
+
+        it('method is not GET or POST', () => {
+          adapter.enableAnalytics({
+            options: {
+              url: 'mock',
+              method: 'PATCH'
+            }
+          });
+        });
+
+        it('events is not an object', () => {
+          adapter.enableAnalytics({
+            options: {
+              url: 'mock',
+              events: null
+            }
+          });
+        });
+
+        it('events\' properties are not functions', () => {
+          adapter.enableAnalytics({
+            options: {
+              url: 'mock',
+              events: {
+                bidResponse: null
+              }
+            }
+          });
+        });
+      });
+    });
+
+    describe('when handler is specified', () => {
+      let handler;
+      beforeEach(() => {
+        handler = sinon.stub();
+      });
+
+      it('should collect events in batches, and call handler', () => {
+        adapter.enableAnalytics({
+          options: {
+            handler,
+            batchSize: 2
+          }
+        });
+        events.emit(AUCTION_INIT, {i: 0});
+        sinon.assert.notCalled(handler);
+        events.emit(BID_RESPONSE, {i: 0});
+        sinon.assert.calledWith(handler, sinon.match((arg) => {
+          return sinon.match({eventType: AUCTION_INIT, args: {i: 0}}).test(arg[0]) &&
+            sinon.match({eventType: BID_RESPONSE, args: {i: 0}}).test(arg[1]);
+        }));
+      });
+
+      it('should not choke if handler throws', () => {
+        adapter.enableAnalytics({
+          options: {
+            handler,
+            batchSize: 1
+          }
+        });
+        handler.throws(new Error());
+        events.emit(AUCTION_INIT, {i: 0});
+        let recv;
+        handler.reset();
+        handler.callsFake((arg) => {
+          recv = arg;
+        });
+        events.emit(BID_RESPONSE, {i: 1});
+        expect(recv).to.eql([{eventType: BID_RESPONSE, args: {i: 1}}]);
+      });
+
+      it('should not cause infinite recursion, if handler triggers more events', () => {
+        let i = 0;
+        handler.callsFake(() => {
+          if (i <= 100) {
+            i++;
+            events.emit(BID_RESPONSE, {});
+          }
+        });
+        adapter.enableAnalytics({
+          options: {
+            handler,
+          }
+        });
+        events.emit(AUCTION_INIT, {});
+        expect(i >= 100).to.be.false;
+      });
+
+      it('should send incomplete batch after batchDelay', () => {
+        adapter.enableAnalytics({
+          options: {
+            batchDelay: 100,
+            batchSize: 2,
+            handler
+          }
+        });
+        [0, 1, 2].forEach(i => events.emit(BID_RESPONSE, {i}));
+        sinon.assert.calledOnce(handler);
+        clock.tick(100);
+        sinon.assert.calledTwice(handler);
+      });
+
+      it('does not send empty batches', () => {
+        adapter.enableAnalytics({
+          options: {
+            batchDelay: 100,
+            batchSize: 2,
+            handler
+          }
+        });
+        [0, 1, 2].forEach(i => events.emit(BID_RESPONSE, {i}));
+        sinon.assert.calledOnce(handler);
+        clock.tick(50);
+        events.emit(BID_RESPONSE, {i: 3});
+        sinon.assert.calledTwice(handler);
+        clock.tick(100);
+        sinon.assert.calledTwice(handler);
+      });
+
+      describe('and options.events is specified', () => {
+        it('filters out other events', () => {
+          adapter.enableAnalytics({
+            options: {
+              handler,
+              events: {
+                bidResponse(bid) {
+                  return bid;
+                }
+              }
+            }
+          });
+          events.emit(AUCTION_INIT, {});
+          sinon.assert.notCalled(handler);
+        });
+
+        it('transforms event data', () => {
+          adapter.enableAnalytics({
+            options: {
+              handler,
+              events: {
+                bidResponse(bid) {
+                  return {
+                    extra: 'data',
+                    prop: bid.prop
+                  }
+                }
+              }
+            }
+          });
+          events.emit(BID_RESPONSE, {prop: 'value', i: 0});
+          sinon.assert.calledWith(handler, sinon.match(data => sinon.match({extra: 'data', prop: 'value'}).test(data[0])));
+        });
+
+        it('does not choke if an event handler throws', () => {
+          adapter.enableAnalytics({
+            options: {
+              handler,
+              events: {
+                bidResponse(bid) {
+                  return bid;
+                },
+                auctionInit(auction) {
+                  throw new Error();
+                }
+              }
+            }
+          });
+          events.emit(AUCTION_INIT, {});
+          events.emit(BID_RESPONSE, {i: 0});
+          sinon.assert.calledOnce(handler);
+          sinon.assert.calledWith(handler, sinon.match(data => sinon.match({i: 0}).test(data[0])));
+        });
+
+        it('filters out events when their handler returns undefined', () => {
+          adapter.enableAnalytics({
+            options: {
+              handler,
+              events: {
+                auctionInit(auction) {
+                  return auction;
+                },
+                bidResponse(bid) {}
+              }
+            }
+          });
+          events.emit(AUCTION_INIT, {i: 0});
+          events.emit(BID_RESPONSE, {i: 1});
+          sinon.assert.calledOnce(handler);
+          sinon.assert.calledWith(handler, sinon.match(data => sinon.match({i: 0}).test(data[0])));
+        });
+      });
+    });
+  });
+
+  describe('default handler', () => {
+    const url = 'mock-url';
+
+    let ajax;
+    beforeEach(() => {
+      ajax = sinon.stub();
+    });
+
+    Object.entries({
+      'GET': (data) => JSON.parse(data.data),
+      'POST': (data) => JSON.parse(data)
+    }).forEach(([method, parse]) => {
+      describe(`when HTTP method is ${method}`, () => {
+        it('should send single event when batchSize is 1', () => {
+          const handler = defaultHandler({url, method, batchSize: 1, ajax});
+          const payload = {i: 0};
+          handler([payload, {}]);
+          sinon.assert.calledWith(ajax, url, sinon.match.any,
+            sinon.match(data => sinon.match(payload).test(parse(data))),
+            {method}
+          );
+        });
+
+        it('should send multiple events when batchSize is greater than 1', () => {
+          const handler = defaultHandler({url, method, batchSize: 10, ajax});
+          const payload = [{i: 0}, {i: 1}];
+          handler(payload);
+          sinon.assert.calledWith(ajax, url, sinon.match.any,
+            sinon.match(data => sinon.match(payload).test(parse(data))),
+            {method}
+          );
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/geoedgeRtdProvider_spec.js b/test/spec/modules/geoedgeRtdProvider_spec.js
new file mode 100644
index 00000000000..eec1feff87a
--- /dev/null
+++ b/test/spec/modules/geoedgeRtdProvider_spec.js
@@ -0,0 +1,126 @@
+import * as utils from '../../../src/utils.js';
+import * as hook from '../../../src/hook.js'
+import { beforeInit, geoedgeSubmodule, setWrapper, wrapper, htmlPlaceholder, WRAPPER_URL, getClientUrl } from '../../../modules/geoedgeRtdProvider.js';
+import { server } from '../../../test/mocks/xhr.js';
+import * as events from '../../../src/events.js';
+import CONSTANTS from '../../../src/constants.json';
+
+let key = '123123123';
+function makeConfig() {
+  return {
+    name: 'geoedge',
+    params: {
+      wap: false,
+      key: key,
+      bidders: {
+        bidderA: true,
+        bidderB: false
+      }
+    }
+  };
+}
+
+function mockBid(bidderCode) {
+  return {
+    'ad': '<creative/>',
+    'cpm': '1.00',
+    'width': 300,
+    'height': 250,
+    'bidderCode': bidderCode,
+    'requestId': utils.getUniqueIdentifierStr(),
+    'creativeId': 'id',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 360
+  };
+}
+
+let mockWrapper = `<wrapper>${htmlPlaceholder}</wrapper>`;
+
+describe('Geoedge RTD module', function () {
+  describe('beforeInit', function () {
+    let submoduleStub;
+
+    before(function () {
+      submoduleStub = sinon.stub(hook, 'submodule');
+    });
+    after(function () {
+      submoduleStub.restore();
+    });
+    it('should fetch the wrapper', function () {
+      beforeInit();
+      let request = server.requests[0];
+      let isWrapperRequest = request && request.url && request.url && request.url === WRAPPER_URL;
+      expect(isWrapperRequest).to.equal(true);
+    });
+    it('should register RTD submodule provider', function () {
+      expect(submoduleStub.calledWith('realTimeData', geoedgeSubmodule)).to.equal(true);
+    });
+  });
+  describe('setWrapper', function () {
+    it('should set the wrapper', function () {
+      setWrapper(mockWrapper);
+      expect(wrapper).to.equal(mockWrapper);
+    });
+  });
+  describe('submodule', function () {
+    describe('name', function () {
+      it('should be geoedge', function () {
+        expect(geoedgeSubmodule.name).to.equal('geoedge');
+      });
+    });
+    describe('init', function () {
+      let insertElementStub;
+
+      before(function () {
+        insertElementStub = sinon.stub(utils, 'insertElement');
+      });
+      after(function () {
+        utils.insertElement.restore();
+      });
+      it('should return false when missing params or key', function () {
+        let missingParams = geoedgeSubmodule.init({});
+        let missingKey = geoedgeSubmodule.init({ params: {} });
+        expect(missingParams || missingKey).to.equal(false);
+      });
+      it('should return true when params are ok', function () {
+        expect(geoedgeSubmodule.init(makeConfig())).to.equal(true);
+      });
+      it('should preload the client', function () {
+        let isLinkPreloadAsScript = arg => arg.tagName === 'LINK' && arg.rel === 'preload' && arg.as === 'script' && arg.href === getClientUrl(key);
+        expect(insertElementStub.calledWith(sinon.match(isLinkPreloadAsScript))).to.equal(true);
+      });
+      it('should emit billable events with applicable winning bids', function () {
+        let applicableBid = mockBid('bidderA');
+        let nonApplicableBid = mockBid('bidderB');
+        let counter = 0;
+        events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, function (event) {
+          if (event.vendor === 'geoedge' && event.type === 'impression') {
+            counter += 1;
+          }
+        });
+        events.emit(CONSTANTS.EVENTS.BID_WON, applicableBid);
+        events.emit(CONSTANTS.EVENTS.BID_WON, nonApplicableBid);
+        expect(counter).to.equal(1);
+      });
+    });
+    describe('onBidResponseEvent', function () {
+      let bidFromA = mockBid('bidderA');
+      it('should wrap bid html when bidder is configured', function () {
+        geoedgeSubmodule.onBidResponseEvent(bidFromA, makeConfig());
+        expect(bidFromA.ad.indexOf('<wrapper>')).to.equal(0);
+      });
+      it('should not wrap bid html when bidder is not configured', function () {
+        let bidFromB = mockBid('bidderB');
+        geoedgeSubmodule.onBidResponseEvent(bidFromB, makeConfig());
+        expect(bidFromB.ad.indexOf('<wrapper>')).to.equal(-1);
+      });
+      it('should only muatate the bid ad porperty', function () {
+        let copy = Object.assign({}, bidFromA);
+        delete copy.ad;
+        let equalsOriginal = Object.keys(copy).every(key => copy[key] === bidFromA[key]);
+        expect(equalsOriginal).to.equal(true);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/getintentBidAdapter_spec.js b/test/spec/modules/getintentBidAdapter_spec.js
index 1959bda5c39..bb0b5ba826c 100644
--- a/test/spec/modules/getintentBidAdapter_spec.js
+++ b/test/spec/modules/getintentBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import { expect } from 'chai'
 import { spec } from 'modules/getintentBidAdapter.js'
+import {deepClone} from 'src/utils';
 
 describe('GetIntent Adapter Tests:', function () {
   const bidRequests = [{
@@ -17,8 +18,41 @@ describe('GetIntent Adapter Tests:', function () {
       tid: 't1000'
     },
     sizes: [[50, 50], [100, 100]]
-  }]
+  }];
   const videoBidRequest = {
+    mediaTypes: {
+      video: {
+        protocols: [1, 2, 3],
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 30,
+        minbitrate: 500,
+        maxbitrate: 1000,
+        api: [2],
+        skip: 1
+      }
+    },
+    bidId: 'bid789',
+    params: {
+      pid: 'p1001',
+      tid: 't1001',
+    },
+    sizes: [300, 250],
+    mediaType: 'video'
+  };
+  const videoBidRequestWithVideoParams = {
+    mediaTypes: {
+      video: {
+        protocols: [1, 2, 3],
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 30,
+        minbitrate: 500,
+        maxbitrate: 1000,
+        api: [2],
+        skip: 0
+      }
+    },
     bidId: 'bid789',
     params: {
       pid: 'p1001',
@@ -27,7 +61,7 @@ describe('GetIntent Adapter Tests:', function () {
         mimes: ['video/mp4', 'application/javascript'],
         max_dur: 20,
         api: [1, 2],
-        skippable: true
+        skippable: 'ALLOW'
       }
     },
     sizes: [300, 250],
@@ -58,10 +92,54 @@ describe('GetIntent Adapter Tests:', function () {
     expect(serverRequest.data.tid).to.equal('t1001');
     expect(serverRequest.data.size).to.equal('300x250');
     expect(serverRequest.data.is_video).to.equal(true);
+    expect(serverRequest.data.protocols).to.equal('1,2,3');
+    expect(serverRequest.data.mimes).to.equal('video/mp4');
+    expect(serverRequest.data.min_dur).to.equal(5);
+    expect(serverRequest.data.max_dur).to.equal(30);
+    expect(serverRequest.data.min_btr).to.equal(500);
+    expect(serverRequest.data.max_btr).to.equal(1000);
+    expect(serverRequest.data.api).to.equal('2');
+    expect(serverRequest.data.skippable).to.equal('ALLOW');
+  });
+
+  it('Verify build video request with video params', function () {
+    const serverRequests = spec.buildRequests([videoBidRequestWithVideoParams]);
+    let serverRequest = serverRequests[0];
+    expect(serverRequest.url).to.equal('https://px.adhigh.net/rtb/direct_vast');
+    expect(serverRequest.method).to.equal('GET');
+    expect(serverRequest.data.bid_id).to.equal('bid789');
+    expect(serverRequest.data.pid).to.equal('p1001');
+    expect(serverRequest.data.tid).to.equal('t1001');
+    expect(serverRequest.data.size).to.equal('300x250');
+    expect(serverRequest.data.is_video).to.equal(true);
     expect(serverRequest.data.mimes).to.equal('video/mp4,application/javascript');
     expect(serverRequest.data.max_dur).to.equal(20);
     expect(serverRequest.data.api).to.equal('1,2');
-    expect(serverRequest.data.skippable).to.equal(true);
+    expect(serverRequest.data.skippable).to.equal('ALLOW');
+  });
+
+  it('Verify bid floor without price floors module', function() {
+    const bidRequestWithFloor = deepClone(bidRequests[0]);
+    bidRequestWithFloor.params.floor = 10
+    bidRequestWithFloor.params.cur = 'USD'
+
+    const serverRequests = spec.buildRequests([bidRequestWithFloor]);
+    let serverRequest = serverRequests[0];
+    expect(serverRequest.data.cur).to.equal('USD');
+    expect(serverRequest.data.floor).to.equal(10);
+  });
+
+  it('Verify bid floor with price floors module', function() {
+    const bidRequestWithFloor = deepClone(bidRequests[0]);
+    bidRequestWithFloor.params.floor = 10
+    bidRequestWithFloor.params.cur = 'USD'
+    const getFloorResponse = {floor: 5, currency: 'EUR'};
+    bidRequestWithFloor.getFloor = () => getFloorResponse;
+
+    const serverRequests = spec.buildRequests([bidRequestWithFloor]);
+    let serverRequest = serverRequests[0];
+    expect(serverRequest.data.cur).to.equal('EUR');
+    expect(serverRequest.data.floor).to.equal(5);
   });
 
   it('Verify parse response', function () {
diff --git a/test/spec/modules/gjirafaBidAdapter_spec.js b/test/spec/modules/gjirafaBidAdapter_spec.js
new file mode 100644
index 00000000000..96bf319dfd2
--- /dev/null
+++ b/test/spec/modules/gjirafaBidAdapter_spec.js
@@ -0,0 +1,185 @@
+import { expect } from 'chai';
+import { spec } from 'modules/gjirafaBidAdapter';
+
+describe('gjirafaAdapterTest', () => {
+  describe('bidRequestValidity', () => {
+    it('bidRequest with propertyId and placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'gjirafa',
+        params: {
+          propertyId: '{propertyId}',
+          placementId: '{placementId}'
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest without propertyId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'gjirafa',
+        params: {
+          placementId: '{placementId}'
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'gjirafa',
+        params: {
+          propertyId: '{propertyId}',
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without propertyId or placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'gjirafa',
+        params: {}
+      })).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', () => {
+    const bidRequests = [{
+      'bidder': 'gjirafa',
+      'params': {
+        'propertyId': '{propertyId}',
+        'placementId': '{placementId}',
+        'data': {
+          'catalogs': [{
+            'catalogId': 1,
+            'items': ['1', '2', '3']
+          }],
+          'inventory': {
+            'category': ['category1', 'category2'],
+            'query': ['query']
+          }
+        }
+      },
+      'adUnitCode': 'hb-leaderboard',
+      'transactionId': 'b6b889bb-776c-48fd-bc7b-d11a1cf0425e',
+      'sizes': [[728, 90]],
+      'bidId': '10bdc36fe0b48c8',
+      'bidderRequestId': '70deaff71c281d',
+      'auctionId': 'f9012acc-b6b7-4748-9098-97252914f9dc'
+    }];
+
+    it('bidRequest HTTP method', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+
+    it('bidRequest url', () => {
+      const endpointUrl = 'https://central.gjirafa.com/bid';
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.url).to.match(new RegExp(`${endpointUrl}`));
+      });
+    });
+
+    it('bidRequest data', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data).to.exist;
+      });
+    });
+
+    it('bidRequest sizes', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data.placements).to.exist;
+        expect(requestItem.data.placements.length).to.equal(1);
+        expect(requestItem.data.placements[0].sizes).to.equal('728x90');
+      });
+    });
+
+    it('bidRequest data param', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach((requestItem) => {
+        expect(requestItem.data.data).to.exist;
+        expect(requestItem.data.data.catalogs).to.exist;
+        expect(requestItem.data.data.inventory).to.exist;
+        expect(requestItem.data.data.catalogs.length).to.equal(1);
+        expect(requestItem.data.data.catalogs[0].items.length).to.equal(3);
+        expect(Object.keys(requestItem.data.data.inventory).length).to.equal(2);
+        expect(requestItem.data.data.inventory.category.length).to.equal(2);
+        expect(requestItem.data.data.inventory.query.length).to.equal(1);
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    const bidRequest = {
+      'method': 'POST',
+      'url': 'https://central.gjirafa.com/bid',
+      'data': {
+        'sizes': '728x90',
+        'adUnitId': 'hb-leaderboard',
+        'placementId': '{placementId}',
+        'propertyId': '{propertyId}',
+        'pageViewGuid': '{pageViewGuid}',
+        'url': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'requestid': '26ee8fe87940da7',
+        'bidid': '2962dbedc4768bf'
+      }
+    };
+
+    const bidResponse = {
+      body: [{
+        'CPM': 1,
+        'Width': 728,
+        'Height': 90,
+        'Referrer': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'Ad': '<div>Test ad</div>',
+        'CreativeId': '123abc',
+        'NetRevenue': false,
+        'Currency': 'EUR',
+        'TTL': 360,
+        'ADomain': ['somedomain.com']
+      }],
+      headers: {}
+    };
+
+    it('all keys present', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      let keys = [
+        'requestId',
+        'cpm',
+        'width',
+        'height',
+        'creativeId',
+        'currency',
+        'netRevenue',
+        'ttl',
+        'referrer',
+        'ad',
+        'vastUrl',
+        'mediaType',
+        'meta'
+      ];
+
+      let resultKeys = Object.keys(result[0]);
+      resultKeys.forEach(function (key) {
+        expect(keys.indexOf(key) !== -1).to.equal(true);
+      });
+    })
+
+    it('all values correct', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(728);
+      expect(result[0].height).to.equal(90);
+      expect(result[0].creativeId).to.equal('123abc');
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(360);
+      expect(result[0].referrer).to.equal('http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true');
+      expect(result[0].ad).to.equal('<div>Test ad</div>');
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['somedomain.com']);
+    })
+  });
+});
diff --git a/test/spec/modules/glimpseBidAdapter_spec.js b/test/spec/modules/glimpseBidAdapter_spec.js
index cc11efcb2af..353e61c7859 100644
--- a/test/spec/modules/glimpseBidAdapter_spec.js
+++ b/test/spec/modules/glimpseBidAdapter_spec.js
@@ -1,179 +1,422 @@
 import { expect } from 'chai';
 import { spec } from 'modules/glimpseBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config';
+import { BANNER } from '../../../src/mediaTypes';
 
-/**
- * Test Helpers
- */
+const ENDPOINT = 'https://market.glimpsevault.io/public/v1/prebid';
 
-const API = 'https://api.glimpseprotocol.io/cloud/v1/vault/prebid';
+const nonStringValues = [null, undefined, 123, true, {}, [], () => {}];
+const nonArrayValues = [null, undefined, 123, true, {}, 'str', () => {}];
 
-const templateBidRequest = {
-  bidder: 'glimpse',
-  params: {
-    placementId: 'glimpse-demo-300x250',
+const mock = {
+  bidRequest: {
+    bidder: 'glimpse',
+    bidId: '26a80b71cfd671',
+    bidderRequestId: '133baeded6ac94',
+    auctionId: '96692a73-307b-44b8-8e4f-ddfb40341570',
+    adUnitCode: 'banner-div-a',
+    sizes: [[300, 250]],
+    params: {
+      pid: 'glimpse-demo-300x250',
+    },
   },
-  adUnitCode: 'banner-div-a',
-  sizes: [[300, 250]],
-  bidId: '26a80b71cfd671',
-  bidderRequestId: '133baeded6ac94',
-  auctionId: '96692a73-307b-44b8-8e4f-ddfb40341570',
-};
-
-const templateBidderRequest = {
-  bidderCode: 'glimpse',
-  auctionId: '96692a73-307b-44b8-8e4f-ddfb40341570',
-  bidderRequestId: '133baeded6ac94',
-  timeout: 3000,
-  gdprConsent: {
-    apiVersion: 2,
-    consentString:
-      'COzP517OzP517AcABBENAlCsAP_AAAAAAAwIF8NX-T5eL2vju2Zdt7JEaYwfZxyigOgThgQIsW8NwIeFbBoGP2EgHBG4JCQAGBAkkgCBAQMsHGBcCQAAgIgRiRKMYE2MjzNKBJJAigkbc0FACDVunsHS2ZCY70-8O__bPAviADAvUC-AAAAA.YAAAAAAAAAAA',
-    gdprApplies: true,
-    vendorData: {},
+  bidderRequest: {
+    bidderCode: 'glimpse',
+    bidderRequestId: '133baeded6ac94',
+    auctionId: '96692a73-307b-44b8-8e4f-ddfb40341570',
+    timeout: 3000,
+    gdprConsent: {
+      consentString:
+        'COzP517OzP517AcABBENAlCsAP_AAAAAAAwIF8NX-T5eL2vju2Zdt7JEaYwfZxyigOgThgQIsW8NwIeFbBoGP2EgHBG4JCQAGBAkkgCBAQMsHGBcCQAAgIgRiRKMYE2MjzNKBJJAigkbc0FACDVunsHS2ZCY70-8O__bPAviADAvUC-AAAAA.YAAAAAAAAAAA',
+      vendorData: {},
+      gdprApplies: true,
+    },
+    uspConsent: '1YYY',
+    refererInfo: {
+      numIframes: 0,
+      reachedTop: true,
+      page: 'https://demo.glimpseprotocol.io/prebid/desktop',
+      stack: ['https://demo.glimpseprotocol.io/prebid/desktop'],
+    },
   },
-  refererInfo: {
-    referer: 'https://demo.glimpseprotocol.io/prebid/desktop',
-    reachedTop: true,
-    numIframes: 0,
-    stack: ['https://demo.glimpseprotocol.io/prebid/desktop'],
+  bidResponse: {
+    auth: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJoZWxsbyI6IndvcmxkISJ9.1p6T0ORhJ6riLprhXBGdzRhG3Q1egM27uFhPGNapPxs',
+    data: {
+      bids: [
+        {
+          requestId: '133baeded6ac94',
+          creativeId: 'glimpse-demo-300x250',
+          adUnitCode: 'banner-div-a',
+          currency: 'GBP',
+          ad: '<div>Hello, World!</div>',
+          width: 300,
+          height: 250,
+          cpm: 1.04,
+          netRevenue: true,
+          mediaType: 'banner',
+          ttl: 300,
+        },
+      ],
+    },
   },
 };
 
-const templateBidResponse = {
-  ad: '<div>HelloWorld</div>',
-  adUnitCode: 'banner-div-a',
-  bidder: 'glimpse',
-  cpm: 1.04,
-  creativeId: 'glimpse-demo-300x250',
-  currency: 'GBP',
-  height: 250,
-  mediaType: 'banner',
-  netRevenue: true,
-  pbAg: '1.04',
-  pbDg: '1.04',
-  pbHg: '1.04',
-  pbLg: '1.00',
-  pbMg: '1.05',
-  requestId: '133baeded6ac94',
-  ttl: 60,
-  width: 300,
-};
-
-const copyBidResponse = () => ({ ...templateBidResponse });
-const copyBidderRequest = () => ({ ...templateBidderRequest, bids: copyBidRequests() });
-const copyBidRequest = () => ({ ...templateBidRequest });
+const getBidRequest = () => getDeepCopy(mock.bidRequest);
+const getBidderRequest = () => ({
+  bids: [getBidRequest()],
+  ...getDeepCopy(mock.bidderRequest),
+});
 
-const copyBidRequests = () => [copyBidRequest()];
-const copyBidResponses = () => ({
-  body: [copyBidResponse()],
+const getBidResponse = () => ({
+  body: getDeepCopy(mock.bidResponse),
 });
 
-/**
- * Tests
- */
+function getDeepCopy(object) {
+  return JSON.parse(JSON.stringify(object));
+}
+
+describe('GlimpseProtocolAdapter', () => {
+  const glimpseAdapter = newBidder(spec);
+
+  describe('spec', () => {
+    it('Has defined the glimpse gvlid', () => {
+      expect(spec.gvlid).to.equal(1012);
+    });
+
+    it('Has defined glimpse as the bidder', () => {
+      expect(spec.code).to.equal('glimpse');
+    });
 
-describe('GlimpseProtocolAdapter', function () {
-  const adapter = newBidder(spec);
+    it('Has defined valid mediaTypes', () => {
+      expect(spec.supportedMediaTypes).to.deep.equal([BANNER]);
+    });
+  });
 
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-      expect(adapter.getSpec).to.exist.and.to.be.a('function');
+  describe('Inherited functions', () => {
+    it('Functions exist and are valid types', () => {
+      expect(glimpseAdapter.callBids).to.exist.and.to.be.a('function');
+      expect(glimpseAdapter.getSpec).to.exist.and.to.be.a('function');
     });
   });
 
-  describe('isBidRequestValid', function () {
-    it('should return true when params.placementId is valid', function () {
-      expect(spec.isBidRequestValid(templateBidRequest)).to.equal(true);
+  describe('isBidRequestValid', () => {
+    it('Returns true if placement id is non-empty string', () => {
+      const bidRequest = getBidRequest();
+
+      const isValidBidRequest = spec.isBidRequestValid(bidRequest);
+      expect(isValidBidRequest).to.be.true;
     });
 
-    it('should return false when params.placementId is invalid', function () {
-      let bid = copyBidRequest();
-      delete bid.params;
-      bid.params = {
-        placementId: 0,
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('Returns false if no pid is provided', () => {
+      const bidRequest = getBidRequest();
+      delete bidRequest.params.pid;
+
+      const isValidBidRequest = spec.isBidRequestValid(bidRequest);
+      expect(isValidBidRequest).to.be.false;
     });
 
-    it('should return false when params is not passed', function () {
-      let bid = copyBidRequest();
-      delete bid.params;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('Returns false if pid is empty string', () => {
+      const bidRequest = getBidRequest();
+      bidRequest.params.pid = '';
+
+      const isValidBidRequest = spec.isBidRequestValid(bidRequest);
+      expect(isValidBidRequest).to.be.false;
     });
 
-    it('should return false when params.placementId is not passed', function () {
-      let bid = copyBidRequest();
-      delete bid.params.placementId;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('Returns false if pid is not string', () => {
+      const bidRequest = getBidRequest();
+      const invalidPids = nonStringValues;
+
+      invalidPids.forEach((invalidPid) => {
+        bidRequest.params.pid = invalidPid;
+        const isValidBidRequest = spec.isBidRequestValid(bidRequest);
+        expect(isValidBidRequest).to.be.false;
+      });
     });
   });
 
-  describe('buildRequests', function () {
-    const bidRequest = copyBidRequest();
-    const bidRequests = [bidRequest];
+  describe('buildRequests', () => {
+    const bidRequests = [getBidRequest()];
+    const bidderRequest = getBidderRequest();
 
-    it('should add version and source information', function () {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
+    it('Adds additional info to api request query', () => {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const url = new URL(request.url);
+      const queries = new URLSearchParams(url.search);
 
-      expect(payload.sdk).to.exist;
-      expect(payload.sdk).to.deep.equal({
-        source: 'pbjs',
-        version: '$prebid.version$',
-      });
+      expect(queries.get('ver')).to.exist;
+      expect(queries.get('tmax')).to.exist;
+      expect(queries.get('gdpr')).to.equal(
+        bidderRequest.gdprConsent.consentString
+      );
+      expect(queries.get('ccpa')).to.equal(bidderRequest.uspConsent);
     });
 
-    it('should send request to API via POST', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal(API);
-      expect(request.method).to.equal('POST');
+    it('Has correct payload shape', () => {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.auth).to.be.a('string');
+      expect(payload.data).to.be.an('object');
+      expect(payload.data.referer).to.be.a('string');
+      expect(payload.data.imp).to.be.an('array');
+      expect(payload.data.fpd).to.be.an('object');
     });
 
-    it('should add GDPR consent', function () {
-      const bidderRequest = copyBidderRequest();
+    it('Has referer information', () => {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
+      const expected = mock.bidderRequest.refererInfo.page;
 
-      expect(payload.gdprConsent).to.exist;
-      const { gdprConsent } = payload;
-      expect(gdprConsent.gdprApplies).to.be.true;
-      expect(gdprConsent.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(payload.data.referer).to.equal(expected);
     });
 
-    it('should add referer info', function () {
-      const bidderRequest = copyBidderRequest();
+    it('Has correct bids (imp) shape', () => {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
+      const imp = payload.data.imp;
 
-      expect(payload.refererInfo.referer).to.equal(templateBidderRequest.refererInfo.referer);
+      imp.forEach((i) => {
+        expect(i.bid).to.be.a('string');
+        expect(i.pid).to.be.a('string');
+        expect(i.sizes).to.be.an('array').that.deep.include([300, 250]);
+      });
     });
   });
 
-  describe('interpretResponse', function () {
-    it('should handle valid bid responses', function () {
-      const response = copyBidResponses();
+  describe('interpretResponse', () => {
+    it('Returns valid bids', () => {
+      const bidResponse = getBidResponse();
+      const bids = spec.interpretResponse(bidResponse);
+
+      expect(bids).to.have.lengthOf(1);
+      expect(bids[0].adUnitCode).to.equal(mock.bidRequest.adUnitCode);
+    });
+
+    it('Returns no bids if auth is not string', () => {
+      const bidResponse = getBidResponse();
+      const invalidAuths = nonStringValues;
+
+      invalidAuths.forEach((invalidAuth) => {
+        bidResponse.body.auth = invalidAuth;
 
-      const bids = spec.interpretResponse(response);
-      expect(bids).to.have.length(1);
-      expect(bids[0].adUnitCode).to.equal(templateBidRequest.adUnitCode);
+        const bids = spec.interpretResponse(bidResponse);
+        expect(bids).to.have.lengthOf(0);
+      });
     });
 
-    it('should handle no bid responses', function () {
-      const response = copyBidResponses();
-      response.body = [];
+    it('Returns no bids if bids is empty', () => {
+      const bidResponse = getBidResponse();
+      bidResponse.body.data.bids = [];
 
-      const bids = spec.interpretResponse(response);
-      expect(bids).to.have.length(0);
+      const bids = spec.interpretResponse(bidResponse);
+      expect(bids).to.have.lengthOf(0);
     });
 
-    it('should return no bid on an invalid response', function () {
-      const response = copyBidResponses();
-      delete response.body;
+    it('Returns no bids if bids is not array', () => {
+      const bidResponse = getBidResponse();
+      const invalidBids = nonArrayValues;
+
+      invalidBids.forEach((invalidBid) => {
+        bidResponse.body.data.bids = invalidBid;
+
+        const bids = spec.interpretResponse(bidResponse);
+        expect(bids).to.have.lengthOf(0);
+      });
+    });
+
+    it('Contains advertiserDomains', () => {
+      const bidResponse = getBidResponse();
+
+      const bids = spec.interpretResponse(bidResponse);
+      bids.forEach((bid) => {
+        expect(bid.meta.advertiserDomains).to.be.an('array');
+      });
+    });
+  });
+
+  describe('optimize request fpd data', () => {
+    const bidRequests = [getBidRequest()];
+    const bidderRequest = getBidderRequest();
+
+    const fpdMockBase = {
+      site: {
+        keywords: 'site,keywords',
+        ext: {
+          data: {
+            fpdProvider: {
+              dataArray: ['data1', 'data2'],
+              dataObject: {
+                data1: 'data1',
+                data2: 'data2',
+              },
+              dataString: 'data1,data2',
+            },
+          },
+        },
+      },
+      user: {
+        keywords: 'user,keywords',
+        ext: {
+          data: {
+            fpdProvider: {
+              dataArray: ['data1', 'data2'],
+              dataObject: {
+                data1: 'data1',
+                data2: 'data2',
+              },
+              dataString: 'data1,data2',
+            },
+          },
+        },
+      },
+    };
+
+    it('should keep all non-empty fields', () => {
+      const fpdMock = fpdMockBase;
+      const expected = fpdMockBase;
+
+      const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: fpdMock});
+      const payload = JSON.parse(request.data);
+      const fpd = payload.data.fpd;
+
+      expect(fpd).to.deep.equal(expected);
+    });
+
+    it('should remove all empty objects', () => {
+      const fpdMock = getDeepCopy(fpdMockBase);
+      fpdMock.site.ext.data.fpdProvider.dataObject = {};
+      fpdMock.user.ext.data.fpdProvider = {};
+
+      const expected = {
+        site: {
+          keywords: 'site,keywords',
+          ext: {
+            data: {
+              fpdProvider: {
+                dataArray: ['data1', 'data2'],
+                dataString: 'data1,data2',
+              },
+            },
+          },
+        },
+        user: {
+          keywords: 'user,keywords',
+        },
+      };
+
+      const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: fpdMock});
+      const payload = JSON.parse(request.data);
+      const fpd = payload.data.fpd;
+
+      expect(fpd).to.deep.equal(expected);
+    });
+
+    it('should remove all empty arrays', () => {
+      const fpdMock = getDeepCopy(fpdMockBase);
+      fpdMock.site.ext.data.fpdProvider.dataArray = [];
+      fpdMock.user.ext.data.fpdProvider.dataArray = [];
+
+      const expected = {
+        site: {
+          keywords: 'site,keywords',
+          ext: {
+            data: {
+              fpdProvider: {
+                dataObject: {
+                  data1: 'data1',
+                  data2: 'data2',
+                },
+                dataString: 'data1,data2',
+              },
+            },
+          },
+        },
+        user: {
+          keywords: 'user,keywords',
+          ext: {
+            data: {
+              fpdProvider: {
+                dataObject: {
+                  data1: 'data1',
+                  data2: 'data2',
+                },
+                dataString: 'data1,data2',
+              },
+            },
+          },
+        },
+      };
+
+      const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: fpdMock});
+      const payload = JSON.parse(request.data);
+      const fpd = payload.data.fpd;
+
+      expect(fpd).to.deep.equal(expected);
+    });
+
+    it('should remove all empty strings', () => {
+      const fpdMock = getDeepCopy(fpdMockBase);
+      fpdMock.site.keywords = '';
+      fpdMock.site.ext.data.fpdProvider.dataString = '';
+      fpdMock.user.keywords = '';
+      fpdMock.user.ext.data.fpdProvider.dataString = '';
+
+      const expected = {
+        site: {
+          ext: {
+            data: {
+              fpdProvider: {
+                dataArray: ['data1', 'data2'],
+                dataObject: {
+                  data1: 'data1',
+                  data2: 'data2',
+                },
+              },
+            },
+          },
+        },
+        user: {
+          ext: {
+            data: {
+              fpdProvider: {
+                dataArray: ['data1', 'data2'],
+                dataObject: {
+                  data1: 'data1',
+                  data2: 'data2',
+                },
+              },
+            },
+          },
+        },
+      };
+
+      const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: fpdMock});
+      const payload = JSON.parse(request.data);
+      const fpd = payload.data.fpd;
+
+      expect(fpd).to.deep.equal(expected);
+    });
+
+    it('should remove all empty fields', () => {
+      const fpdMock = getDeepCopy(fpdMockBase);
+      fpdMock.site.keywords = '';
+      fpdMock.site.ext.data.fpdProvider.dataArray = [];
+      fpdMock.site.ext.data.fpdProvider.dataObject = {};
+      fpdMock.site.ext.data.fpdProvider.dataString = '';
+      fpdMock.user.keywords = '';
+      fpdMock.user.ext.data.fpdProvider.dataArray = [];
+      fpdMock.user.ext.data.fpdProvider.dataObject = {};
+      fpdMock.user.ext.data.fpdProvider.dataString = '';
+
+      const expected = {};
+
+      const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: fpdMock});
+      const payload = JSON.parse(request.data);
+      const fpd = payload.data.fpd;
 
-      const bids = spec.interpretResponse(response);
-      expect(bids).to.have.length(0);
+      expect(fpd).to.deep.equal(expected);
     });
   });
 });
diff --git a/test/spec/modules/globalsunBidAdapter_spec.js b/test/spec/modules/globalsunBidAdapter_spec.js
new file mode 100644
index 00000000000..3795f3038a7
--- /dev/null
+++ b/test/spec/modules/globalsunBidAdapter_spec.js
@@ -0,0 +1,398 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/globalsunBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'globalsun'
+
+describe('GlobalsunBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    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;
+      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://endpoint.globalsun.io/pbjs');
+    });
+
+    it('Returns general data 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',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      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.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, 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 = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, 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([], bidderRequest);
+      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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.globalsun.io/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.globalsun.io/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/glomexBidAdapter_spec.js b/test/spec/modules/glomexBidAdapter_spec.js
new file mode 100644
index 00000000000..8c53db8d605
--- /dev/null
+++ b/test/spec/modules/glomexBidAdapter_spec.js
@@ -0,0 +1,144 @@
+import { expect } from 'chai'
+import { spec } from 'modules/glomexBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const REQUEST = {
+  bidder: 'glomex',
+  params: {
+    integrationId: 'abcdefg',
+    playlistId: 'defghjk'
+  },
+  bidderRequestId: '143346cf0f1732',
+  auctionId: '2e41f65424c87c',
+  adUnitCode: 'adunit-code',
+  bidId: '2d925f27f5079f',
+  sizes: [640, 360]
+}
+
+const BIDDER_REQUEST = {
+  auctionId: '2d921234f5079f',
+  refererInfo: {
+    isAmp: true,
+    numIframes: 0,
+    reachedTop: true,
+    topmostLocation: 'https://glomex.com'
+  },
+  gdprConsent: {
+    gdprApplies: true,
+    consentString: 'CO5asbJO5asbJE-AAAENAACAAAAAAAAAAAYgAAAAAAAA.IAAA'
+  }
+}
+
+const RESPONSE = {
+  bids: [
+    {
+      id: '2d925f27f5079f',
+      cpm: 3.5,
+      width: 640,
+      height: 360,
+      creativeId: 'creative-1j75x4ln1kk6m1ius',
+      dealId: 'deal-1j75x4ln1kk6m1iut',
+      currency: 'EUR',
+      netRevenue: true,
+      ttl: 300,
+      ad: '<ad />',
+      adomain: ['glomex.com']
+    }
+  ]
+}
+describe('glomexBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  it('should expose gvlid', function() {
+    expect(spec.gvlid).to.equal(967)
+  });
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      const request = {
+        'params': {
+          'integrationId': 'abcdefg'
+        }
+      }
+      expect(spec.isBidRequestValid(request)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      expect(spec.isBidRequestValid({})).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    const bidRequests = [REQUEST]
+    const request = spec.buildRequests(bidRequests, BIDDER_REQUEST)
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      expect(request.method).to.equal('POST')
+    })
+
+    it('returns a list of valid requests', function () {
+      expect(request.validBidRequests).to.eql([REQUEST])
+    })
+
+    it('sends params.integrationId', function () {
+      expect(request.validBidRequests[0].params.integrationId).to.eql(REQUEST.params.integrationId)
+    })
+
+    it('sends params.playlistId', function () {
+      expect(request.validBidRequests[0].params.playlistId).to.eql(REQUEST.params.playlistId)
+    })
+
+    it('sends refererInfo', function () {
+      const expected = {
+        ...BIDDER_REQUEST.refererInfo,
+        referer: BIDDER_REQUEST.refererInfo.topmostLocation
+      }
+      delete expected.topmostLocation;
+      expect(request.data.refererInfo).to.eql(expected)
+    })
+
+    it('sends gdprConsent', function () {
+      expect(request.data.gdprConsent).to.eql(BIDDER_REQUEST.gdprConsent)
+    })
+
+    it('sends the auctionId', function () {
+      expect(request.data.auctionId).to.eql(BIDDER_REQUEST.auctionId)
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('handles nobid responses', function () {
+      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0)
+      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0)
+    })
+
+    it('handles the server response', function () {
+      const result = spec.interpretResponse(
+        {
+          body: RESPONSE
+        },
+        {
+          validBidRequests: [REQUEST]
+        }
+      )
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f')
+      expect(result[0].cpm).to.equal(3.5)
+      expect(result[0].width).to.equal(640)
+      expect(result[0].height).to.equal(360)
+      expect(result[0].creativeId).to.equal('creative-1j75x4ln1kk6m1ius')
+      expect(result[0].dealId).to.equal('deal-1j75x4ln1kk6m1iut')
+      expect(result[0].currency).to.equal('EUR')
+      expect(result[0].netRevenue).to.equal(true)
+      expect(result[0].ttl).to.equal(300)
+      expect(result[0].ad).to.equal('<ad />')
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['glomex.com'])
+    })
+  })
+})
diff --git a/test/spec/modules/gmosspBidAdapter_spec.js b/test/spec/modules/gmosspBidAdapter_spec.js
index 5de3db623c5..6d290504194 100644
--- a/test/spec/modules/gmosspBidAdapter_spec.js
+++ b/test/spec/modules/gmosspBidAdapter_spec.js
@@ -35,7 +35,7 @@ describe('GmosspAdapter', function () {
   });
 
   describe('buildRequests', function () {
-    const bidRequests = [
+    let bidRequests = [
       {
         bidder: 'gmossp',
         params: {
@@ -50,21 +50,40 @@ describe('GmosspAdapter', function () {
         bidId: '2b84475b5b636e',
         bidderRequestId: '1f4001782ac16c',
         auctionId: 'aba03555-4802-4c45-9f15-05ffa8594cff',
-        transactionId: '791e9d84-af92-4903-94da-24c7426d9d0c'
+        transactionId: '791e9d84-af92-4903-94da-24c7426d9d0c',
+        userId: {
+          imuid: 'h.0a4749e7ffe09fa6',
+          pubcid: '1111',
+          idl_env: '1111',
+        }
       }
     ];
 
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://hoge.com'
-      }
-    };
-
     it('sends bid request to ENDPOINT via GET', function () {
+      const bidderRequest = {
+        refererInfo: {
+          topmostLocation: 'https://hoge.com'
+        }
+      };
       const requests = spec.buildRequests(bidRequests, bidderRequest);
       expect(requests[0].url).to.equal(ENDPOINT);
       expect(requests[0].method).to.equal('GET');
-      expect(requests[0].data).to.equal('tid=791e9d84-af92-4903-94da-24c7426d9d0c&bid=2b84475b5b636e&ver=$prebid.version$&sid=123456&url=https%3A%2F%2Fhoge.com&cur=JPY&dnt=0&');
+      expect(requests[0].data).to.equal('tid=791e9d84-af92-4903-94da-24c7426d9d0c&bid=2b84475b5b636e&ver=$prebid.version$&sid=123456&im_uid=h.0a4749e7ffe09fa6&shared_id=1111&idl_env=1111&url=https%3A%2F%2Fhoge.com' + '&ref=' + encodeURIComponent(document.referrer) + '&cur=JPY&dnt=0&');
+    });
+
+    it('should use fallback if refererInfo.referer in bid request is empty and im_uid ,shared_id, idl_env cookie is empty', function () {
+      const bidderRequest = {
+        refererInfo: {
+          topmostLocation: ''
+        },
+      };
+      bidRequests[0].userId.imuid = '';
+      bidRequests[0].userId.pubcid = '';
+      bidRequests[0].userId.idl_env = '';
+
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      const result = 'tid=791e9d84-af92-4903-94da-24c7426d9d0c&bid=2b84475b5b636e&ver=$prebid.version$&sid=123456&ref=' + encodeURIComponent(document.referrer) + '&cur=JPY&dnt=0&';
+      expect(requests[0].data).to.equal(result);
     });
   });
 
@@ -88,12 +107,15 @@ describe('GmosspAdapter', function () {
       }
     ];
 
-    it('should get correct banner bid response', function() {
+    it('should get correct banner bid response', function () {
       const response = {
         bid: '2b84475b5b636e',
         price: 20,
         w: 300,
         h: 250,
+        adomains: [
+          'test.com'
+        ],
         ad: '<div class="gmossp"></div>',
         creativeId: '985ec572b32be309.76973017',
         cur: 'JPY',
@@ -114,6 +136,11 @@ describe('GmosspAdapter', function () {
           currency: 'JPY',
           width: 300,
           height: 250,
+          meta: {
+            advertiserDomains: [
+              'test.com'
+            ]
+          },
           ad: '<div class="gmossp"></div>',
           creativeId: '985ec572b32be309.76973017',
           netRevenue: true,
diff --git a/test/spec/modules/gnetBidAdapter_spec.js b/test/spec/modules/gnetBidAdapter_spec.js
new file mode 100644
index 00000000000..21526aba201
--- /dev/null
+++ b/test/spec/modules/gnetBidAdapter_spec.js
@@ -0,0 +1,158 @@
+import {
+  expect
+} from 'chai';
+import {
+  spec
+} from 'modules/gnetBidAdapter.js';
+import {
+  newBidder
+} from 'src/adapters/bidderFactory.js';
+
+const ENDPOINT = 'https://service.gnetrtb.com/api/adrequest';
+
+describe('gnetAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      bidder: 'gnet',
+      params: {
+        websiteId: '1', adunitId: '1'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('onBidWon', function () {
+    const bid = {
+      requestId: '29d5b1d3a520f8'
+    };
+
+    it('return success adserver won bid endpoint', () => {
+      const result = spec.onBidWon(bid);
+      assert.ok(result);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [{
+      bidder: 'gnet',
+      params: {
+        websiteId: '1', adunitId: '1'
+      },
+      adUnitCode: '/150790500/4_ZONA_IAB_300x250_5',
+      sizes: [
+        [300, 250],
+      ],
+      bidId: '2a19afd5173318',
+      bidderRequestId: '1f4001782ac16c',
+      auctionId: 'aba03555-4802-4c45-9f15-05ffa8594cff',
+      transactionId: '894bdff6-61ec-4bec-a5a9-f36a5bfccef5',
+      gftuid: null
+    }];
+
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://gnetrtb.com'
+      }
+    };
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].url).to.equal(ENDPOINT);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].data).to.equal(JSON.stringify({
+        'referer': 'https://gnetrtb.com',
+        'adUnitCode': '/150790500/4_ZONA_IAB_300x250_5',
+        'bidId': '2a19afd5173318',
+        'transactionId': '894bdff6-61ec-4bec-a5a9-f36a5bfccef5',
+        'gftuid': null,
+        'sizes': ['300x250'],
+        'params': {
+          'websiteId': '1', 'adunitId': '1'
+        }
+      }));
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidderRequests = [{
+      bidder: 'gnet',
+      params: {
+        clientId: '123456'
+      },
+      adUnitCode: '/150790500/4_ZONA_IAB_300x250_5',
+      sizes: [
+        [300, 250],
+      ],
+      bidId: '2a19afd5173318',
+      bidderRequestId: '1f4001782ac16c',
+      auctionId: 'aba03555-4802-4c45-9f15-05ffa8594cff',
+      transactionId: '894bdff6-61ec-4bec-a5a9-f36a5bfccef5'
+    }];
+
+    it('should get correct banner bid response', function () {
+      const response = {
+        bids: [
+          {
+            bidId: '2a19afd5173318',
+            cpm: 0.1,
+            currency: 'BRL',
+            width: 300,
+            height: 250,
+            ad: '<html><h3>I am an ad</h3></html>',
+            creativeId: '173560700',
+          }
+        ]
+      };
+
+      const expectedResponse = [
+        {
+          requestId: '2a19afd5173318',
+          cpm: 0.1,
+          currency: 'BRL',
+          width: 300,
+          height: 250,
+          ad: '<html><h3>I am an ad</h3></html>',
+          ttl: 300,
+          meta: {
+            advertiserDomains: []
+          },
+          creativeId: '173560700',
+          netRevenue: true
+        }
+      ];
+
+      const result = spec.interpretResponse({
+        body: response
+      }, bidderRequests);
+      expect(result).to.have.lengthOf(1);
+      expect(result).to.deep.have.same.members(expectedResponse);
+    });
+
+    it('handles nobid responses', function () {
+      const response = '';
+
+      const result = spec.interpretResponse({
+        body: response
+      }, bidderRequests);
+      expect(result.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/goldbachBidAdapter_spec.js b/test/spec/modules/goldbachBidAdapter_spec.js
new file mode 100644
index 00000000000..fc2c1beb900
--- /dev/null
+++ b/test/spec/modules/goldbachBidAdapter_spec.js
@@ -0,0 +1,1350 @@
+import { expect } from 'chai';
+import { spec } from 'modules/goldbachBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { auctionManager } from 'src/auctionManager.js';
+import { deepClone } from 'src/utils.js';
+import { config } from 'src/config.js';
+
+const ENDPOINT = 'https://ib.adnxs.com/ut/v3/prebid';
+const PRICING_ENDPOINT = 'https://templates.da-services.ch/01_universal/burda_prebid/1.0/json/sizeCPMMapping.json';
+
+describe('GoldbachXandrAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'goldbach',
+      'params': {
+        'placementId': '10433394'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when required params found', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'member': '1234',
+        'invCode': 'ABCD'
+      };
+
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'placementId': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let getAdUnitsStub;
+    let bidRequests = [
+      {
+        'bidder': 'goldbach',
+        'params': {
+          'placementId': '10433394'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'transactionId': '04f2659e-c005-4eb1-a57c-fa93145e3843'
+      }
+    ];
+
+    beforeEach(function() {
+      getAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits').callsFake(function() {
+        return [];
+      });
+    });
+
+    afterEach(function() {
+      getAdUnitsStub.restore();
+    });
+
+    it('should parse out private sizes', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            privateSizes: [300, 250]
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].private_sizes).to.exist;
+      expect(payload.tags[0].private_sizes).to.deep.equal([{width: 300, height: 250}]);
+    });
+
+    it('should add publisher_id in request', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            publisherId: '1231234'
+          }
+        });
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].publisher_id).to.exist;
+      expect(payload.tags[0].publisher_id).to.deep.equal(1231234);
+      expect(payload.publisher_id).to.exist;
+      expect(payload.publisher_id).to.deep.equal(1231234);
+    })
+
+    it('should add source and verison to the tag', function () {
+      const request = spec.buildRequests(bidRequests)[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.sdk).to.exist;
+      expect(payload.sdk).to.deep.equal({
+        source: 'pbjs',
+        version: '$prebid.version$'
+      });
+    });
+
+    it('should populate the ad_types array on all requests', function () {
+      let adUnits = [{
+        code: 'adunit-code',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        bids: [{
+          bidder: 'goldbach',
+          params: {
+            placementId: '10433394'
+          }
+        }],
+        transactionId: '04f2659e-c005-4eb1-a57c-fa93145e3843'
+      }];
+
+      ['banner', 'video', 'native'].forEach(type => {
+        getAdUnitsStub.callsFake(function(...args) {
+          return adUnits;
+        });
+
+        const bidRequest = Object.assign({}, bidRequests[0]);
+        bidRequest.mediaTypes = {};
+        bidRequest.mediaTypes[type] = {};
+
+        const request = spec.buildRequests([bidRequest])[1];
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].ad_types).to.deep.equal([type]);
+
+        if (type === 'banner') {
+          delete adUnits[0].mediaTypes;
+        }
+      });
+    });
+
+    it('should not populate the ad_types array when adUnit.mediaTypes is undefined', function() {
+      const bidRequest = Object.assign({}, bidRequests[0]);
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].ad_types).to.not.exist;
+    });
+
+    it('should populate the ad_types array on outstream requests', function () {
+      const bidRequest = Object.assign({}, bidRequests[0]);
+      bidRequest.mediaTypes = {};
+      bidRequest.mediaTypes.video = {context: 'outstream'};
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].ad_types).to.deep.equal(['video']);
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests)[1];
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to ENDPOINT via GET', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.equal(PRICING_ENDPOINT);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('should attach valid video params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            video: {
+              id: 123,
+              minduration: 100,
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].video).to.deep.equal({
+        id: 123,
+        minduration: 100
+      });
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('should include ORTB video values when video params were not set', function() {
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.params = {
+        placementId: '1234235',
+        video: {
+          skippable: true,
+          playback_method: ['auto_play_sound_off', 'auto_play_sound_unknown'],
+          context: 'outstream'
+        }
+      };
+      bidRequest.mediaTypes = {
+        video: {
+          playerSize: [640, 480],
+          context: 'outstream',
+          mimes: ['video/mp4'],
+          skip: 0,
+          minduration: 5,
+          api: [1, 5, 6],
+          playbackmethod: [2, 4]
+        }
+      };
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].video).to.deep.equal({
+        minduration: 5,
+        playback_method: 2,
+        skippable: true,
+        context: 4
+      });
+      expect(payload.tags[0].video_frameworks).to.deep.equal([1, 4])
+    });
+
+    it('should add video property when adUnit includes a renderer', function () {
+      const videoData = {
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            mimes: ['video/mp4']
+          }
+        },
+        params: {
+          placementId: '10433394',
+          video: {
+            skippable: true,
+            playback_method: ['auto_play_sound_off']
+          }
+        }
+      };
+
+      let bidRequest1 = deepClone(bidRequests[0]);
+      bidRequest1 = Object.assign({}, bidRequest1, videoData, {
+        renderer: {
+          url: 'https://test.renderer.url',
+          render: function () {}
+        }
+      });
+
+      let bidRequest2 = deepClone(bidRequests[0]);
+      bidRequest2.adUnitCode = 'adUnit_code_2';
+      bidRequest2 = Object.assign({}, bidRequest2, videoData);
+
+      const request = spec.buildRequests([bidRequest1, bidRequest2])[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].video).to.deep.equal({
+        skippable: true,
+        playback_method: 2,
+        custom_renderer_present: true
+      });
+      expect(payload.tags[1].video).to.deep.equal({
+        skippable: true,
+        playback_method: 2
+      });
+    });
+
+    it('should attach valid user params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            user: {
+              externalUid: '123',
+              segments: [123, { id: 987, value: 876 }],
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user).to.exist;
+      expect(payload.user).to.deep.equal({
+        external_uid: '123',
+        segments: [{id: 123}, {id: 987, value: 876}]
+      });
+    });
+
+    it('should attach reserve param when either bid param or getFloor function exists', function () {
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      let request, payload = null;
+      let bidRequest = deepClone(bidRequests[0]);
+
+      // 1 -> reserve not defined, getFloor not defined > empty
+      request = spec.buildRequests([bidRequest])[1];
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.not.exist;
+
+      // 2 -> reserve is defined, getFloor not defined > reserve is used
+      bidRequest.params = {
+        'placementId': '10433394',
+        'reserve': 0.5
+      };
+      request = spec.buildRequests([bidRequest])[1];
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(0.5);
+
+      // 3 -> reserve is defined, getFloor is defined > getFloor is used
+      bidRequest.getFloor = () => getFloorResponse;
+
+      request = spec.buildRequests([bidRequest])[1];
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(3);
+    });
+
+    it('should duplicate adpod placements into batches and set correct maxduration', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 300,
+              durationRangeSec: [15, 30],
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload1 = JSON.parse(request[0].data);
+      const payload2 = JSON.parse(request[1].data);
+
+      // 300 / 15 = 20 total
+      expect(payload1.tags.length).to.equal(15);
+      expect(payload2.tags.length).to.equal(5);
+
+      expect(payload1.tags[0]).to.deep.equal(payload1.tags[1]);
+      expect(payload1.tags[0].video.maxduration).to.equal(30);
+
+      expect(payload2.tags[0]).to.deep.equal(payload1.tags[1]);
+      expect(payload2.tags[0].video.maxduration).to.equal(30);
+    });
+
+    it('should round down adpod placements when numbers are uneven', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 123,
+              durationRangeSec: [45],
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.tags.length).to.equal(2);
+    });
+
+    it('should duplicate adpod placements when requireExactDuration is set', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 300,
+              durationRangeSec: [15, 30],
+              requireExactDuration: true,
+            }
+          }
+        }
+      );
+
+      // 20 total placements with 15 max impressions = 2 requests
+      const request = spec.buildRequests([bidRequest])[1];
+      expect(request.length).to.equal(2);
+
+      // 20 spread over 2 requests = 15 in first request, 5 in second
+      const payload1 = JSON.parse(request[0].data);
+      const payload2 = JSON.parse(request[1].data);
+      expect(payload1.tags.length).to.equal(15);
+      expect(payload2.tags.length).to.equal(5);
+
+      // 10 placements should have max/min at 15
+      // 10 placemenst should have max/min at 30
+      const payload1tagsWith15 = payload1.tags.filter(tag => tag.video.maxduration === 15);
+      const payload1tagsWith30 = payload1.tags.filter(tag => tag.video.maxduration === 30);
+      expect(payload1tagsWith15.length).to.equal(10);
+      expect(payload1tagsWith30.length).to.equal(5);
+
+      // 5 placemenst with min/max at 30 were in the first request
+      // so 5 remaining should be in the second
+      const payload2tagsWith30 = payload2.tags.filter(tag => tag.video.maxduration === 30);
+      expect(payload2tagsWith30.length).to.equal(5);
+    });
+
+    it('should set durations for placements when requireExactDuration is set and numbers are uneven', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 105,
+              durationRangeSec: [15, 30, 60],
+              requireExactDuration: true,
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.tags.length).to.equal(7);
+
+      const tagsWith15 = payload.tags.filter(tag => tag.video.maxduration === 15);
+      const tagsWith30 = payload.tags.filter(tag => tag.video.maxduration === 30);
+      const tagsWith60 = payload.tags.filter(tag => tag.video.maxduration === 60);
+      expect(tagsWith15.length).to.equal(3);
+      expect(tagsWith30.length).to.equal(3);
+      expect(tagsWith60.length).to.equal(1);
+    });
+
+    it('should break adpod request into batches', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 225,
+              durationRangeSec: [5],
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload1 = JSON.parse(request[0].data);
+      const payload2 = JSON.parse(request[1].data);
+      const payload3 = JSON.parse(request[2].data);
+
+      expect(payload1.tags.length).to.equal(15);
+      expect(payload2.tags.length).to.equal(15);
+      expect(payload3.tags.length).to.equal(15);
+    });
+
+    // it('should contain hb_source value for adpod', function() {
+    //   let bidRequest = Object.assign({},
+    //     bidRequests[0],
+    //     {
+    //       params: { placementId: '14542875' }
+    //     },
+    //     {
+    //       mediaTypes: {
+    //         video: {
+    //           context: 'adpod',
+    //           playerSize: [640, 480],
+    //           adPodDurationSec: 300,
+    //           durationRangeSec: [15, 30],
+    //         }
+    //       }
+    //     }
+    //   );
+    //   const request = spec.buildRequests([bidRequest])[1];
+    //   const payload = JSON.parse(request.data);
+    //   expect(payload.tags[0].hb_source).to.deep.equal(7);
+    // });
+
+    it('should contain hb_source value for other media', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'banner',
+          params: {
+            sizes: [[300, 250], [300, 600]],
+            placementId: 13144370
+          }
+        }
+      );
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('adds brand_category_exclusion to request when set', function() {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon
+        .stub(config, 'getConfig')
+        .withArgs('adpod.brandCategoryExclusion')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.brand_category_uniqueness).to.equal(true);
+
+      config.getConfig.restore();
+    });
+
+    it('should attach native params to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'native',
+          nativeParams: {
+            title: {required: true},
+            body: {required: true},
+            body2: {required: true},
+            image: {required: true, sizes: [100, 100]},
+            icon: {required: true},
+            cta: {required: false},
+            rating: {required: true},
+            sponsoredBy: {required: true},
+            privacyLink: {required: true},
+            displayUrl: {required: true},
+            address: {required: true},
+            downloads: {required: true},
+            likes: {required: true},
+            phone: {required: true},
+            price: {required: true},
+            salePrice: {required: true}
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].native.layouts[0]).to.deep.equal({
+        title: {required: true},
+        description: {required: true},
+        desc2: {required: true},
+        main_image: {required: true, sizes: [{ width: 100, height: 100 }]},
+        icon: {required: true},
+        ctatext: {required: false},
+        rating: {required: true},
+        sponsored_by: {required: true},
+        privacy_link: {required: true},
+        displayurl: {required: true},
+        address: {required: true},
+        downloads: {required: true},
+        likes: {required: true},
+        phone: {required: true},
+        price: {required: true},
+        saleprice: {required: true},
+        privacy_supported: true
+      });
+      expect(payload.tags[0].hb_source).to.equal(1);
+    });
+
+    it('should always populated tags[].sizes with 1,1 for native if otherwise not defined', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'native',
+          nativeParams: {
+            image: { required: true }
+          }
+        }
+      );
+      bidRequest.sizes = [[150, 100], [300, 250]];
+
+      let request = spec.buildRequests([bidRequest])[1];
+      let payload = JSON.parse(request.data);
+      expect(payload.tags[0].sizes).to.deep.equal([{width: 150, height: 100}, {width: 300, height: 250}]);
+
+      delete bidRequest.sizes;
+
+      request = spec.buildRequests([bidRequest])[1];
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].sizes).to.deep.equal([{width: 1, height: 1}]);
+    });
+
+    it('should convert keyword params to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            keywords: {
+              single: 'val',
+              singleArr: ['val'],
+              singleArrNum: [5],
+              multiValMixed: ['value1', 2, 'value3'],
+              singleValNum: 123,
+              emptyStr: '',
+              emptyArr: [''],
+              badValue: {'foo': 'bar'} // should be dropped
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'single',
+        'value': ['val']
+      }, {
+        'key': 'singleArr',
+        'value': ['val']
+      }, {
+        'key': 'singleArrNum',
+        'value': ['5']
+      }, {
+        'key': 'multiValMixed',
+        'value': ['value1', '2', 'value3']
+      }, {
+        'key': 'singleValNum',
+        'value': ['123']
+      }, {
+        'key': 'emptyStr'
+      }, {
+        'key': 'emptyArr'
+      }]);
+    });
+
+    it('should add payment rules to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            usePaymentRule: true
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].use_pmt_rule).to.equal(true);
+    });
+
+    it('should add gpid to the request', function () {
+      let testGpid = '/12345/my-gpt-tag-0';
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.ortb2Imp = { ext: { data: { pbadslot: testGpid } } };
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].gpid).to.exist.and.equal(testGpid)
+    });
+
+    it('should add gdpr consent information to the request', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'goldbach',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true,
+          addtlConsent: '1~7.12.35.62.66.70.89.93.108'
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest)[1];
+      expect(request.options).to.deep.equal({withCredentials: true});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr_consent).to.exist;
+      expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
+      expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+      expect(payload.gdpr_consent.addtl_consent).to.exist.and.to.deep.equal([7, 12, 35, 62, 66, 70, 89, 93, 108]);
+    });
+
+    it('should add us privacy string to payload', function() {
+      let consentString = '1YA-';
+      let bidderRequest = {
+        'bidderCode': 'goldbach',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'uspConsent': consentString
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest)[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.us_privacy).to.exist;
+      expect(payload.us_privacy).to.exist.and.to.equal(consentString);
+    });
+
+    it('supports sending hybrid mobile app parameters', function () {
+      let appRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            app: {
+              id: 'B1O2W3M4AN.com.prebid.webview',
+              geo: {
+                lat: 40.0964439,
+                lng: -75.3009142
+              },
+              device_id: {
+                idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE', // Apple advertising identifier
+                aaid: '38400000-8cf0-11bd-b23e-10b96e40000d', // Android advertising identifier
+                md5udid: '5756ae9022b2ea1e47d84fead75220c8', // MD5 hash of the ANDROID_ID
+                sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF', // SHA1 hash of the ANDROID_ID
+                windowsadid: '750c6be243f1c4b5c9912b95a5742fc5' // Windows advertising identifier
+              }
+            }
+          }
+        }
+      );
+      const request = spec.buildRequests([appRequest])[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.app).to.exist;
+      expect(payload.app).to.deep.equal({
+        appid: 'B1O2W3M4AN.com.prebid.webview'
+      });
+      expect(payload.device.device_id).to.exist;
+      expect(payload.device.device_id).to.deep.equal({
+        aaid: '38400000-8cf0-11bd-b23e-10b96e40000d',
+        idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE',
+        md5udid: '5756ae9022b2ea1e47d84fead75220c8',
+        sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF',
+        windowsadid: '750c6be243f1c4b5c9912b95a5742fc5'
+      });
+      expect(payload.device.geo).to.exist;
+      expect(payload.device.geo).to.deep.equal({
+        lat: 40.0964439,
+        lng: -75.3009142
+      });
+    });
+
+    it('should add referer info to payload', function () {
+      const bidRequest = Object.assign({}, bidRequests[0])
+      const bidderRequest = {
+        refererInfo: {
+          topmostLocation: 'https://example.com/page.html',
+          reachedTop: true,
+          numIframes: 2,
+          stack: [
+            'https://example.com/page.html',
+            'https://example.com/iframe1.html',
+            'https://example.com/iframe2.html'
+          ]
+        }
+      }
+      const request = spec.buildRequests([bidRequest], bidderRequest)[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.referrer_detection).to.exist;
+      expect(payload.referrer_detection).to.deep.equal({
+        rd_ref: 'https%3A%2F%2Fexample.com%2Fpage.html',
+        rd_top: true,
+        rd_ifs: 2,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      });
+    });
+
+    it('should populate schain if available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        schain: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              'asi': 'blob.com',
+              'sid': '001',
+              'hp': 1
+            }
+          ]
+        }
+      });
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.schain).to.deep.equal({
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            'asi': 'blob.com',
+            'sid': '001',
+            'hp': 1
+          }
+        ]
+      });
+    });
+
+    it('should populate coppa if set in config', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user.coppa).to.equal(true);
+
+      config.getConfig.restore();
+    });
+
+    it('should set the X-Is-Test customHeader if test flag is enabled', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('apn_test')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest])[1];
+      expect(request.options.customHeaders).to.deep.equal({'X-Is-Test': 1});
+
+      config.getConfig.restore();
+    });
+
+    it('should always set withCredentials: true on the request.options', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      const request = spec.buildRequests([bidRequest])[1];
+      expect(request.options.withCredentials).to.equal(true);
+    });
+
+    it('should set simple domain variant if purpose 1 consent is not given', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'goldbach',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true,
+          apiVersion: 2,
+          vendorData: {
+            purpose: {
+              consents: {
+                1: false
+              }
+            }
+          }
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest)[1];
+      expect(request.url).to.equal('https://ib.adnxs-simple.com/ut/v3/prebid');
+    });
+
+    it('should populate eids when supported userIds are available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        userId: {
+          tdid: 'sample-userid',
+          uid2: { id: 'sample-uid2-value' },
+          criteoId: 'sample-criteo-userid',
+          netId: 'sample-netId-userid',
+          idl_env: 'sample-idl-userid'
+        }
+      });
+
+      const request = spec.buildRequests([bidRequest])[1];
+      const payload = JSON.parse(request.data);
+      expect(payload.eids).to.deep.include({
+        source: 'adserver.org',
+        id: 'sample-userid',
+        rti_partner: 'TDID'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'criteo.com',
+        id: 'sample-criteo-userid',
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'netid.de',
+        id: 'sample-netId-userid',
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'liveramp.com',
+        id: 'sample-idl-userid'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'uidapi.com',
+        id: 'sample-uid2-value',
+        rti_partner: 'UID2'
+      });
+    });
+
+    it('should populate iab_support object at the root level if omid support is detected', function () {
+      // with bid.params.frameworks
+      let bidRequest_A = Object.assign({}, bidRequests[0], {
+        params: {
+          frameworks: [1, 2, 5, 6],
+          video: {
+            frameworks: [1, 2, 5, 6]
+          }
+        }
+      });
+      let request = spec.buildRequests([bidRequest_A])[1];
+      let payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.be.an('object');
+      expect(payload.iab_support).to.deep.equal({
+        omidpn: 'Appnexus',
+        omidpv: '$prebid.version$'
+      });
+      expect(payload.tags[0].banner_frameworks).to.be.an('array');
+      expect(payload.tags[0].banner_frameworks).to.deep.equal([1, 2, 5, 6]);
+      expect(payload.tags[0].video_frameworks).to.be.an('array');
+      expect(payload.tags[0].video_frameworks).to.deep.equal([1, 2, 5, 6]);
+      expect(payload.tags[0].video.frameworks).to.not.exist;
+
+      // without bid.params.frameworks
+      const bidRequest_B = Object.assign({}, bidRequests[0]);
+      request = spec.buildRequests([bidRequest_B])[1];
+      payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.not.exist;
+      expect(payload.tags[0].banner_frameworks).to.not.exist;
+      expect(payload.tags[0].video_frameworks).to.not.exist;
+
+      // with video.frameworks but it is not an array
+      const bidRequest_C = Object.assign({}, bidRequests[0], {
+        params: {
+          video: {
+            frameworks: "'1', '2', '3', '6'"
+          }
+        }
+      });
+      request = spec.buildRequests([bidRequest_C])[1];
+      payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.not.exist;
+      expect(payload.tags[0].banner_frameworks).to.not.exist;
+      expect(payload.tags[0].video_frameworks).to.not.exist;
+    });
+  })
+
+  describe('interpretResponse', function () {
+    let bfStub;
+    before(function() {
+      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+    });
+
+    after(function() {
+      bfStub.restore();
+    });
+
+    let response = {
+      'version': '3.0.0',
+      'tags': [
+        {
+          'uuid': '3db3773286ee59',
+          'tag_id': 10433394,
+          'auction_id': '4534722592064951574',
+          'nobid': false,
+          'no_ad_url': 'https://lax1-ib.adnxs.com/no-ad',
+          'timeout_ms': 10000,
+          'ad_profile_id': 27079,
+          'ads': [
+            {
+              'content_source': 'rtb',
+              'ad_type': 'banner',
+              'buyer_member_id': 958,
+              'creative_id': 29681110,
+              'media_type_id': 1,
+              'media_subtype_id': 1,
+              'cpm': 0.5,
+              'cpm_publisher_currency': 0.5,
+              'publisher_currency_code': '$',
+              'client_initiated_ad_counting': true,
+              'viewability': {
+                'config': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+              },
+              'rtb': {
+                'banner': {
+                  'content': '<!-- Creative -->',
+                  'width': 300,
+                  'height': 250
+                },
+                'trackers': [
+                  {
+                    'impression_urls': [
+                      'https://lax1-ib.adnxs.com/impression'
+                    ],
+                    'video_events': {}
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'requestId': '3db3773286ee59',
+          'cpm': 0.5,
+          'creativeId': 29681110,
+          'dealId': undefined,
+          'width': 300,
+          'height': 250,
+          'ad': '<!-- Creative -->',
+          'mediaType': 'banner',
+          'currency': 'USD',
+          'ttl': 300,
+          'netRevenue': true,
+          'adUnitCode': 'code',
+          'appnexus': {
+            'buyerMemberId': 958
+          }
+        }
+      ];
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    it('handles nobid responses', function () {
+      let response = {
+        'version': '0.0.1',
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'tag_id': 5976557,
+          'auction_id': '297492697822162468',
+          'nobid': true
+        }]
+      };
+      let bidderRequest;
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result.length).to.equal(0);
+    });
+
+    it('handles outstream video responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'content': '<!-- VAST Creative -->'
+              }
+            },
+            'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+          }]
+        }]
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastXml');
+      expect(result[0]).to.have.property('vastImpUrl');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+
+    it('handles instream video responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'asset_url': 'https://sample.vastURL.com/here/vid'
+              }
+            },
+            'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+          }]
+        }]
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'instream'
+            }
+          }
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastUrl');
+      expect(result[0]).to.have.property('vastImpUrl');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+
+    it('handles adpod responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'brand_category_id': 10,
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'asset_url': 'https://sample.vastURL.com/here/adpod',
+                'duration_ms': 30000,
+              }
+            },
+            'viewability': {
+              'config': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+            }
+          }]
+        }]
+      };
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'adpod'
+            }
+          }
+        }]
+      };
+      bfStub.returns('1');
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastUrl');
+      expect(result[0].video.context).to.equal('adpod');
+      expect(result[0].video.durationSeconds).to.equal(30);
+    });
+
+    it('handles native responses', function () {
+      let response1 = deepClone(response);
+      response1.tags[0].ads[0].ad_type = 'native';
+      response1.tags[0].ads[0].rtb.native = {
+        'title': 'Native Creative',
+        'desc': 'Cool description great stuff',
+        'desc2': 'Additional body text',
+        'ctatext': 'Do it',
+        'sponsored': 'AppNexus',
+        'icon': {
+          'width': 0,
+          'height': 0,
+          'url': 'https://cdn.adnxs.com/icon.png'
+        },
+        'main_img': {
+          'width': 2352,
+          'height': 1516,
+          'url': 'https://cdn.adnxs.com/img.png'
+        },
+        'link': {
+          'url': 'https://www.appnexus.com',
+          'fallback_url': '',
+          'click_trackers': ['https://nym1-ib.adnxs.com/click']
+        },
+        'impression_trackers': ['https://example.com'],
+        'rating': '5',
+        'displayurl': 'https://AppNexus.com/?url=display_url',
+        'likes': '38908320',
+        'downloads': '874983',
+        'price': '9.99',
+        'saleprice': 'FREE',
+        'phone': '1234567890',
+        'address': '28 W 23rd St, New York, NY 10010',
+        'privacy_link': 'https://appnexus.com/?url=privacy_url',
+        'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=;css_selector=.pb-click;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response1 }, {bidderRequest});
+      expect(result[0].native.title).to.equal('Native Creative');
+      expect(result[0].native.body).to.equal('Cool description great stuff');
+      expect(result[0].native.cta).to.equal('Do it');
+      expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
+    });
+
+    it('supports configuring outstream renderers', function () {
+      const outstreamResponse = deepClone(response);
+      outstreamResponse.tags[0].ads[0].rtb.video = {};
+      outstreamResponse.tags[0].ads[0].renderer_url = 'renderer.js';
+
+      const bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          renderer: {
+            options: {
+              adText: 'configured'
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      };
+
+      const result = spec.interpretResponse({ body: outstreamResponse }, {bidderRequest});
+      expect(result[0].renderer.config).to.deep.equal(
+        bidderRequest.bids[0].renderer.options
+      );
+    });
+
+    it('should add deal_priority and deal_code', function() {
+      let responseWithDeal = deepClone(response);
+      responseWithDeal.tags[0].ads[0].ad_type = 'video';
+      responseWithDeal.tags[0].ads[0].deal_priority = 5;
+      responseWithDeal.tags[0].ads[0].deal_code = '123';
+      responseWithDeal.tags[0].ads[0].rtb.video = {
+        duration_ms: 1500,
+        player_width: 640,
+        player_height: 340,
+      };
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'adpod'
+            }
+          }
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseWithDeal }, {bidderRequest});
+      expect(Object.keys(result[0].appnexus)).to.include.members(['buyerMemberId', 'dealPriority', 'dealCode']);
+      expect(result[0].video.dealTier).to.equal(5);
+    });
+
+    it('should add advertiser id', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].advertiser_id = '123';
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserId']);
+    });
+
+    it('should add advertiserDomains', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].adomain = ['123'];
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserDomains']);
+      expect(Object.keys(result[0].meta.advertiserDomains)).to.deep.equal([]);
+    });
+  });
+});
diff --git a/test/spec/modules/gothamadsBidAdapter_spec.js b/test/spec/modules/gothamadsBidAdapter_spec.js
new file mode 100644
index 00000000000..f0a3ea253f3
--- /dev/null
+++ b/test/spec/modules/gothamadsBidAdapter_spec.js
@@ -0,0 +1,416 @@
+import { expect } from 'chai';
+import { spec } from 'modules/gothamadsBidAdapter.js';
+import { config } from 'src/config.js';
+
+const NATIVE_BID_REQUEST = {
+  code: 'native_example',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+        required: true
+      },
+      clickUrl: {
+        required: true
+      },
+      privacyLink: {
+        required: false
+      },
+      body: {
+        required: true
+      },
+      icon: {
+        required: true,
+        sizes: [50, 50]
+      }
+    }
+  },
+  bidder: 'gothamads',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+};
+
+const BANNER_BID_REQUEST = {
+  code: 'banner_example',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 600]
+      ]
+    }
+  },
+  bidder: 'gothamads',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000,
+  gdprConsent: {
+    consentString: 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    gdprApplies: 1,
+  },
+  uspConsent: 'uspConsent'
+}
+
+const bidRequest = {
+  refererInfo: {
+    referer: 'test.com'
+  }
+}
+
+const VIDEO_BID_REQUEST = {
+  code: 'video1',
+  sizes: [640, 480],
+  mediaTypes: {
+    video: {
+      minduration: 0,
+      maxduration: 999,
+      boxingallowed: 1,
+      skip: 0,
+      mimes: [
+        'application/javascript',
+        'video/mp4'
+      ],
+      w: 1920,
+      h: 1080,
+      protocols: [
+        2
+      ],
+      linearity: 1,
+      api: [
+        1,
+        2
+      ]
+    }
+  },
+
+  bidder: 'gothamads',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+}
+
+const BANNER_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'banner'
+      }
+    }],
+  }],
+};
+
+const VIDEO_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'video',
+        vastUrl: 'http://example.vast',
+      }
+    }],
+  }],
+};
+
+let imgData = {
+  url: `https://example.com/image`,
+  w: 1200,
+  h: 627
+};
+
+const NATIVE_BID_RESPONSE = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: {
+        native: {
+          assets: [{
+            id: 0,
+            title: 'dummyText'
+          },
+          {
+            id: 3,
+            image: imgData
+          },
+          {
+            id: 5,
+            data: {
+              value: 'organization.name'
+            }
+          }
+          ],
+          link: {
+            url: 'example.com'
+          },
+          imptrackers: ['tracker1.com', 'tracker2.com', 'tracker3.com'],
+          jstracker: 'tracker1.com'
+        }
+      },
+      crid: 'crid',
+      ext: {
+        mediaType: 'native'
+      }
+    }],
+  }],
+};
+
+describe('GothamAdsAdapter', function () {
+  describe('with COPPA', function () {
+    beforeEach(function () {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+    });
+    afterEach(function () {
+      config.getConfig.restore();
+    });
+
+    it('should send the Coppa "required" flag set to "1" in the request', function () {
+      let serverRequest = spec.buildRequests([BANNER_BID_REQUEST]);
+      expect(serverRequest.data[0].regs.coppa).to.equal(1);
+    });
+  });
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(NATIVE_BID_REQUEST)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, NATIVE_BID_REQUEST);
+      delete bid.params;
+      bid.params = {
+        'IncorrectParam': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('build Native Request', function () {
+    const request = spec.buildRequests([NATIVE_BID_REQUEST], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      let serverRequest = spec.buildRequests([]);
+      expect(serverRequest).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('build Banner Request', function () {
+    const request = spec.buildRequests([BANNER_BID_REQUEST]);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('check consent and ccpa string is set properly', function () {
+      expect(request.data[0].regs.ext.gdpr).to.equal(1);
+      expect(request.data[0].user.ext.consent).to.equal(BANNER_BID_REQUEST.gdprConsent.consentString);
+      expect(request.data[0].regs.ext.us_privacy).to.equal(BANNER_BID_REQUEST.uspConsent);
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+  });
+
+  describe('build Video Request', function () {
+    const request = spec.buildRequests([VIDEO_BID_REQUEST]);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://us-e-node1.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Empty response must return empty array', function () {
+      const emptyResponse = null;
+      let response = spec.interpretResponse(emptyResponse);
+
+      expect(response).to.be.an('array').that.is.empty;
+    })
+
+    it('Should interpret banner response', function () {
+      const bannerResponse = {
+        body: [BANNER_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: BANNER_BID_RESPONSE.id,
+        cpm: BANNER_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: BANNER_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: BANNER_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: BANNER_BID_RESPONSE.ttl || 1200,
+        currency: BANNER_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: BANNER_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: BANNER_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'banner',
+        meta: BANNER_BID_RESPONSE.seatbid[0].bid[0].adomain,
+        ad: BANNER_BID_RESPONSE.seatbid[0].bid[0].adm
+      }
+
+      let bannerResponses = spec.interpretResponse(bannerResponse);
+
+      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(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.ad).to.equal(expectedBidResponse.ad);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.meta).to.have.property('advertiserDomains', expectedBidResponse.meta);
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret video response', function () {
+      const videoResponse = {
+        body: [VIDEO_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: VIDEO_BID_RESPONSE.id,
+        cpm: VIDEO_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: VIDEO_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: VIDEO_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: VIDEO_BID_RESPONSE.ttl || 1200,
+        currency: VIDEO_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: VIDEO_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        mediaType: 'video',
+        meta: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adomain,
+        vastXml: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adm,
+        vastUrl: VIDEO_BID_RESPONSE.seatbid[0].bid[0].ext.vastUrl
+      }
+
+      let videoResponses = spec.interpretResponse(videoResponse);
+
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastXml', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.vastXml).to.equal(expectedBidResponse.vastXml);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.meta).to.have.property('advertiserDomains', expectedBidResponse.meta);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret native response', function () {
+      const nativeResponse = {
+        body: [NATIVE_BID_RESPONSE]
+      }
+
+      const expectedBidResponse = {
+        requestId: NATIVE_BID_RESPONSE.id,
+        cpm: NATIVE_BID_RESPONSE.seatbid[0].bid[0].price,
+        width: NATIVE_BID_RESPONSE.seatbid[0].bid[0].w,
+        height: NATIVE_BID_RESPONSE.seatbid[0].bid[0].h,
+        ttl: NATIVE_BID_RESPONSE.ttl || 1200,
+        currency: NATIVE_BID_RESPONSE.cur || 'USD',
+        netRevenue: true,
+        creativeId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].crid,
+        dealId: NATIVE_BID_RESPONSE.seatbid[0].bid[0].dealid,
+        meta: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adomain,
+        mediaType: 'native',
+        native: {
+          clickUrl: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adm.native.link.url
+        }
+      }
+
+      let nativeResponses = spec.interpretResponse(nativeResponse);
+
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.native.clickUrl).to.equal(expectedBidResponse.native.clickUrl);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.meta).to.have.property('advertiserDomains', expectedBidResponse.meta);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+  });
+})
diff --git a/test/spec/modules/gptPreAuction_spec.js b/test/spec/modules/gptPreAuction_spec.js
new file mode 100644
index 00000000000..2bfce71806e
--- /dev/null
+++ b/test/spec/modules/gptPreAuction_spec.js
@@ -0,0 +1,445 @@
+import {
+  appendGptSlots,
+  appendPbAdSlot,
+  _currentConfig,
+  makeBidRequestsHook
+} from 'modules/gptPreAuction.js';
+import { config } from 'src/config.js';
+import { makeSlot } from '../integration/faker/googletag.js';
+
+describe('GPT pre-auction module', () => {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+  afterEach(() => {
+    sandbox.restore();
+    config.setConfig({ gptPreAuction: { enabled: false } });
+  });
+
+  const testSlots = [
+    makeSlot({ code: 'slotCode1', divId: 'div1' }),
+    makeSlot({ code: 'slotCode2', divId: 'div2' }),
+    makeSlot({ code: 'slotCode3', divId: 'div3' }),
+    makeSlot({ code: 'slotCode4', divId: 'div4' }),
+    makeSlot({ code: 'slotCode4', divId: 'div5' })
+  ];
+
+  describe('appendPbAdSlot', () => {
+    // sets up our document body to test the pbAdSlot dom actions against
+    document.body.innerHTML = '<div id="foo1" data-adslotid="bar1">test1</div>' +
+          '<div id="foo2" data-adslotid="bar2">test2</div>' +
+          '<div id="foo3">test2</div>';
+
+    it('should be unchanged if already defined on adUnit', () => {
+      const adUnit = { ortb2Imp: { ext: { data: { pbadslot: '12345' } } } };
+      appendPbAdSlot(adUnit);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('12345');
+    });
+
+    it('should use adUnit.code if matching id exists', () => {
+      const adUnit = { code: 'foo1', ortb2Imp: { ext: { data: {} } } };
+      appendPbAdSlot(adUnit);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('bar1');
+    });
+
+    it('should use the gptSlot.adUnitPath if the adUnit.code matches a div id but does not have a data-adslotid', () => {
+      const adUnit = { code: 'foo3', mediaTypes: { banner: { sizes: [[250, 250]] } }, ortb2Imp: { ext: { data: { adserver: { name: 'gam', adslot: '/baz' } } } } };
+      appendPbAdSlot(adUnit);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('/baz');
+    });
+
+    it('should use the video adUnit.code (which *should* match the configured "adSlotName", but is not being tested) if there is no matching div with "data-adslotid" defined', () => {
+      const adUnit = { code: 'foo4', mediaTypes: { video: { sizes: [[250, 250]] } }, ortb2Imp: { ext: { data: {} } } };
+      adUnit.code = 'foo5';
+      appendPbAdSlot(adUnit, undefined);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('foo5');
+    });
+
+    it('should use the adUnit.code if all other sources failed', () => {
+      const adUnit = { code: 'foo4', ortb2Imp: { ext: { data: {} } } };
+      appendPbAdSlot(adUnit, undefined);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('foo4');
+    });
+
+    it('should use the customPbAdSlot function if one is given', () => {
+      config.setConfig({
+        gptPreAuction: {
+          customPbAdSlot: () => 'customPbAdSlotName'
+        }
+      });
+
+      const adUnit = { code: 'foo1', ortb2Imp: { ext: { data: {} } } };
+      appendPbAdSlot(adUnit);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('customPbAdSlotName');
+    });
+  });
+
+  describe('appendGptSlots', () => {
+    it('should not add adServer object to context if no slots defined', () => {
+      const adUnit = { code: 'adUnitCode', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.undefined;
+    });
+
+    it('should not add adServer object to context if no slot matches', () => {
+      window.googletag.pubads().setSlots(testSlots);
+      const adUnit = { code: 'adUnitCode', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.undefined;
+    });
+
+    it('should add adServer object to context if matching slot is found', () => {
+      window.googletag.pubads().setSlots(testSlots);
+      const adUnit = { code: 'slotCode2', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.an('object');
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: 'slotCode2' });
+    });
+
+    it('will trim child id if mcmEnabled is set to true', () => {
+      config.setConfig({ gptPreAuction: { enabled: true, mcmEnabled: true } });
+      window.googletag.pubads().setSlots([
+        makeSlot({ code: '/12345,21212/slotCode1', divId: 'div1' }),
+        makeSlot({ code: '/12345,21212/slotCode2', divId: 'div2' }),
+        makeSlot({ code: '/12345,21212/slotCode3', divId: 'div3' })
+      ]);
+      const adUnit = { code: '/12345,21212/slotCode2', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.an('object');
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: '/12345/slotCode2' });
+    });
+
+    it('will not trim child id if mcmEnabled is not set to true', () => {
+      window.googletag.pubads().setSlots([
+        makeSlot({ code: '/12345,21212/slotCode1', divId: 'div1' }),
+        makeSlot({ code: '/12345,21212/slotCode2', divId: 'div2' }),
+        makeSlot({ code: '/12345,21212/slotCode3', divId: 'div3' })
+      ]);
+      const adUnit = { code: '/12345,21212/slotCode2', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.an('object');
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: '/12345,21212/slotCode2' });
+    });
+
+    it('should use the customGptSlotMatching function if one is given', () => {
+      config.setConfig({
+        gptPreAuction: {
+          customGptSlotMatching: slot =>
+            adUnitCode => adUnitCode.toUpperCase() === slot.getAdUnitPath().toUpperCase()
+        }
+      });
+
+      window.googletag.pubads().setSlots(testSlots);
+      const adUnit = { code: 'SlOtCoDe1', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.an('object');
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: 'slotCode1' });
+    });
+  });
+
+  describe('handleSetGptConfig', () => {
+    it('should enable the module by default', () => {
+      config.setConfig({ gptPreAuction: {} });
+      expect(_currentConfig.enabled).to.equal(true);
+    });
+
+    it('should disable the module if told to in set config', () => {
+      config.setConfig({ gptPreAuction: { enabled: false } });
+      expect(_currentConfig).to.be.an('object').that.is.empty;
+    });
+
+    it('should accept custom functions in config', () => {
+      config.setConfig({
+        gptPreAuction: {
+          customGptSlotMatching: () => 'customGptSlot',
+          customPbAdSlot: () => 'customPbAdSlot'
+        }
+      });
+
+      expect(_currentConfig.enabled).to.equal(true);
+      expect(_currentConfig.customGptSlotMatching).to.a('function');
+      expect(_currentConfig.customPbAdSlot).to.a('function');
+      expect(_currentConfig.customGptSlotMatching()).to.equal('customGptSlot');
+      expect(_currentConfig.customPbAdSlot()).to.equal('customPbAdSlot');
+    });
+
+    it('should check that custom functions in config are type function', () => {
+      config.setConfig({
+        gptPreAuction: {
+          customGptSlotMatching: 12345,
+          customPbAdSlot: 'test'
+        }
+      });
+      expect(_currentConfig).to.deep.equal({
+        enabled: true,
+        customGptSlotMatching: false,
+        customPbAdSlot: false,
+        customPreAuction: false,
+        useDefaultPreAuction: false
+      });
+    });
+  });
+
+  describe('makeBidRequestsHook', () => {
+    let returnedAdUnits;
+    const runMakeBidRequests = adUnits => {
+      const next = adUnits => {
+        returnedAdUnits = adUnits;
+      };
+      makeBidRequestsHook(next, adUnits);
+    };
+
+    it('should append PB Ad Slot and GPT Slot info to first-party data in each ad unit', () => {
+      const testAdUnits = [{
+        code: 'adUnit1',
+        ortb2Imp: { ext: { data: { pbadslot: '12345' } } }
+      }, {
+        code: 'slotCode1',
+        ortb2Imp: { ext: { data: { pbadslot: '67890' } } }
+      }, {
+        code: 'slotCode3',
+      }];
+
+      // first two adUnits directly pass in pbadslot => gpid is same
+      const expectedAdUnits = [{
+        code: 'adUnit1',
+        ortb2Imp: {
+          ext: {
+            data: {
+              pbadslot: '12345'
+            },
+            gpid: '12345'
+          }
+        }
+      },
+      // second adunit
+      {
+        code: 'slotCode1',
+        ortb2Imp: {
+          ext: {
+            data: {
+              pbadslot: '67890',
+              adserver: {
+                name: 'gam',
+                adslot: 'slotCode1'
+              }
+            },
+            gpid: '67890'
+          }
+        }
+      }, {
+        code: 'slotCode3',
+        ortb2Imp: {
+          ext: {
+            data: {
+              pbadslot: 'slotCode3',
+              adserver: {
+                name: 'gam',
+                adslot: 'slotCode3'
+              }
+            },
+            gpid: 'slotCode3'
+          }
+        }
+      }];
+
+      window.googletag.pubads().setSlots(testSlots);
+      runMakeBidRequests(testAdUnits);
+      expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
+    });
+
+    it('should not apply gpid if pbadslot was set by adUnitCode', () => {
+      const testAdUnits = [{
+        code: 'noMatchCode',
+      }];
+
+      // first two adUnits directly pass in pbadslot => gpid is same
+      const expectedAdUnits = [{
+        code: 'noMatchCode',
+        ortb2Imp: {
+          ext: {
+            data: {
+              pbadslot: 'noMatchCode'
+            },
+          }
+        }
+      }];
+
+      window.googletag.pubads().setSlots(testSlots);
+      runMakeBidRequests(testAdUnits);
+      expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
+    });
+
+    it('should use the passed customPreAuction logic', () => {
+      let counter = 0;
+      config.setConfig({
+        gptPreAuction: {
+          enabled: true,
+          customPreAuction: (adUnit, slotName) => {
+            counter += 1;
+            return `${adUnit.code}-${slotName || counter}`;
+          }
+        }
+      });
+      const testAdUnits = [
+        {
+          code: 'adUnit1',
+          ortb2Imp: { ext: { data: { pbadslot: '12345' } } }
+        },
+        {
+          code: 'adUnit2',
+        },
+        {
+          code: 'slotCode3',
+        },
+        {
+          code: 'div4',
+        }
+      ];
+
+      // all slots should be passed in same time and have slot-${index}
+      const expectedAdUnits = [{
+        code: 'adUnit1',
+        ortb2Imp: {
+          ext: {
+            // no slotname match so uses adUnit.code-counter
+            data: {
+              pbadslot: 'adUnit1-1'
+            },
+            gpid: 'adUnit1-1'
+          }
+        }
+      },
+      // second adunit
+      {
+        code: 'adUnit2',
+        ortb2Imp: {
+          ext: {
+            // no slotname match so uses adUnit.code-counter
+            data: {
+              pbadslot: 'adUnit2-2'
+            },
+            gpid: 'adUnit2-2'
+          }
+        }
+      }, {
+        code: 'slotCode3',
+        ortb2Imp: {
+          ext: {
+            // slotname found, so uses code + slotname (which is same)
+            data: {
+              pbadslot: 'slotCode3-slotCode3',
+              adserver: {
+                name: 'gam',
+                adslot: 'slotCode3'
+              }
+            },
+            gpid: 'slotCode3-slotCode3'
+          }
+        }
+      }, {
+        code: 'div4',
+        ortb2Imp: {
+          ext: {
+            // slotname found, so uses code + slotname
+            data: {
+              pbadslot: 'div4-slotCode4',
+              adserver: {
+                name: 'gam',
+                adslot: 'slotCode4'
+              }
+            },
+            gpid: 'div4-slotCode4'
+          }
+        }
+      }];
+
+      window.googletag.pubads().setSlots(testSlots);
+      runMakeBidRequests(testAdUnits);
+      expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
+    });
+
+    it('should use useDefaultPreAuction logic', () => {
+      config.setConfig({
+        gptPreAuction: {
+          enabled: true,
+          useDefaultPreAuction: true
+        }
+      });
+      const testAdUnits = [
+        // First adUnit should use the preset pbadslot
+        {
+          code: 'adUnit1',
+          ortb2Imp: { ext: { data: { pbadslot: '12345' } } }
+        },
+        // Second adUnit should not match a gam slot, so no slot set
+        {
+          code: 'adUnit2',
+        },
+        // third adunit matches a single slot so uses it
+        {
+          code: 'slotCode3',
+        },
+        // fourth adunit matches multiple slots so combination
+        {
+          code: 'div4',
+        }
+      ];
+
+      const expectedAdUnits = [{
+        code: 'adUnit1',
+        ortb2Imp: {
+          ext: {
+            data: {
+              pbadslot: '12345'
+            },
+            gpid: '12345'
+          }
+        }
+      },
+      // second adunit
+      {
+        code: 'adUnit2',
+        ortb2Imp: {
+          ext: {
+            data: {
+            },
+          }
+        }
+      }, {
+        code: 'slotCode3',
+        ortb2Imp: {
+          ext: {
+            data: {
+              pbadslot: 'slotCode3',
+              adserver: {
+                name: 'gam',
+                adslot: 'slotCode3'
+              }
+            },
+            gpid: 'slotCode3'
+          }
+        }
+      }, {
+        code: 'div4',
+        ortb2Imp: {
+          ext: {
+            data: {
+              pbadslot: 'slotCode4#div4',
+              adserver: {
+                name: 'gam',
+                adslot: 'slotCode4'
+              }
+            },
+            gpid: 'slotCode4#div4'
+          }
+        }
+      }];
+
+      window.googletag.pubads().setSlots(testSlots);
+      runMakeBidRequests(testAdUnits);
+      expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
+    });
+  });
+});
diff --git a/test/spec/modules/gravitoIdSystem_spec.js b/test/spec/modules/gravitoIdSystem_spec.js
new file mode 100644
index 00000000000..9584f60c81d
--- /dev/null
+++ b/test/spec/modules/gravitoIdSystem_spec.js
@@ -0,0 +1,51 @@
+import { gravitoIdSystemSubmodule, storage, cookieKey } from 'modules/gravitoIdSystem.js';
+
+const GRAVITOID_TEST_VALUE = 'gravitompIdTest';
+const GRAVITOID_TEST_OBJ = {
+  gravitompId: GRAVITOID_TEST_VALUE
+};
+
+describe('gravitompId module', function () {
+  let getCookieStub;
+
+  beforeEach(function (done) {
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    done();
+  });
+
+  afterEach(function () {
+    getCookieStub.restore();
+  });
+
+  const cookieTestCasesForEmpty = [
+    undefined,
+    null,
+    ''
+  ]
+
+  describe('getId()', function () {
+    it('should return the gravitompId when it exists in cookie', function () {
+      getCookieStub.withArgs(cookieKey).returns(GRAVITOID_TEST_VALUE);
+      const id = gravitoIdSystemSubmodule.getId();
+      expect(id).to.be.deep.equal({id: {gravitompId: GRAVITOID_TEST_VALUE}});
+    });
+
+    cookieTestCasesForEmpty.forEach(testCase => it('should return the gravitompId when it not exists in cookie', function () {
+      getCookieStub.withArgs(cookieKey).returns(testCase);
+      const id = gravitoIdSystemSubmodule.getId();
+      expect(id).to.be.deep.equal(undefined);
+    }));
+  });
+
+  describe('decode()', function () {
+    it('should return the gravitompId when it exists in cookie', function () {
+      const decoded = gravitoIdSystemSubmodule.decode(GRAVITOID_TEST_OBJ);
+      expect(decoded).to.be.deep.equal({gravitompId: GRAVITOID_TEST_VALUE});
+    });
+
+    it('should return the undefined when decode id is not "string"', function () {
+      const decoded = gravitoIdSystemSubmodule.decode(1);
+      expect(decoded).to.equal(undefined);
+    });
+  });
+});
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index c8d04113aeb..d411f33ab50 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { spec, resetUserSync, getSyncUrl } from 'modules/gridBidAdapter.js';
+import { spec, resetUserSync, getSyncUrl, storage } from 'modules/gridBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { config } from 'src/config.js';
 
@@ -40,234 +40,985 @@ describe('TheMediaGrid Adapter', function () {
   });
 
   describe('buildRequests', function () {
-    function parseRequest(url) {
-      const res = {};
-      url.split('&').forEach((it) => {
-        const couple = it.split('=');
-        res[couple[0]] = decodeURIComponent(couple[1]);
-      });
-      return res;
+    function parseRequest(data) {
+      return JSON.parse(data);
     }
-    const bidderRequest = {refererInfo: {referer: 'https://example.com'}};
-    const referrer = bidderRequest.refererInfo.referer;
+    const bidderRequest = {
+      refererInfo: { page: 'https://example.com' },
+      bidderRequestId: '22edbae2733bf6',
+      transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
+      auctionId: '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+      timeout: 3000
+    };
+    const referrer = encodeURIComponent(bidderRequest.refererInfo.page);
     let bidRequests = [
       {
         'bidder': 'grid',
         'params': {
-          'uid': '1'
+          'uid': '1',
+          'bidFloor': 1.25
+        },
+        'adUnitCode': 'adunit-code-1',
+        'sizes': [[300, 250], [300, 600]],
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '42dbe3a7168a6a',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+        transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
+      },
+      {
+        'bidder': 'grid',
+        'params': {
+          'uid': '2'
         },
         'adUnitCode': 'adunit-code-1',
         'sizes': [[300, 250], [300, 600]],
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+        transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
       },
       {
         'bidder': 'grid',
         'params': {
-          'uid': '1'
+          'uid': '11'
         },
         'adUnitCode': 'adunit-code-2',
         'sizes': [[728, 90]],
         'mediaTypes': {
           'video': {
-            'playerSize': [400, 600]
-          },
-          'banner': {
-            'sizes': [[728, 90]]
+            'playerSize': [[400, 600]],
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg']
           }
         },
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+        transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
       },
       {
         'bidder': 'grid',
         'params': {
-          'uid': '2'
+          'uid': '3'
         },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
+        'adUnitCode': 'adunit-code-2',
+        'sizes': [[728, 90]],
         'mediaTypes': {
           'video': {
-            'playerSize': [400, 600]
+            'playerSize': [[400, 600]],
+            'protocols': [1, 2, 3]
           },
           'banner': {
-            'sizes': [[300, 250], [300, 600]]
+            'sizes': [[728, 90]]
           }
         },
-        'bidId': '42dbe3a7168a6a',
+        'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+        transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
       }
     ];
 
+    it('should be content categories and genre', function () {
+      const site = {
+        cat: ['IAB2'],
+        pagecat: ['IAB2-2'],
+        content: {
+          genre: 'Adventure'
+        }
+      };
+      const [request] = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2: {site}});
+      const payload = parseRequest(request.data);
+      expect(payload.site.cat).to.deep.equal([...site.cat, ...site.pagecat]);
+      expect(payload.site.content.genre).to.deep.equal(site.content.genre);
+    });
+
     it('should attach valid params to the tag', function () {
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdVal : null);
+
+      const [request] = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('auids', '1');
-      expect(payload).to.have.property('sizes', '300x250,300x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('wrapperType', 'Prebid_js');
-      expect(payload).to.have.property('wrapperVersion', '$prebid.version$');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'user': {
+          'id': fpdUserIdVal
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }]
+      });
+
+      getDataFromLocalStorageStub.restore();
     });
 
-    it('sizes must be added from mediaTypes', function () {
-      const request = spec.buildRequests([bidRequests[0], bidRequests[1]], bidderRequest);
+    it('make possible to process request without mediaTypes', function () {
+      const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdVal : null);
+
+      const [request] = spec.buildRequests([bidRequests[0], bidRequests[1]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('auids', '1,1');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90,400x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'user': {
+          'id': fpdUserIdVal
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }]
+      });
+
+      getDataFromLocalStorageStub.restore();
     });
 
-    it('sizes must not be duplicated', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+    it('should attach valid params to the video tag', function () {
+      const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdVal : null);
+
+      const [request] = spec.buildRequests(bidRequests.slice(0, 3), bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('auids', '1,1,2');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90,400x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'user': {
+          'id': fpdUserIdVal
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[2].bidId,
+          'tagid': bidRequests[2].params.uid,
+          'ext': {'divid': bidRequests[2].adUnitCode},
+          'video': {
+            'w': 400,
+            'h': 600,
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg']
+          }
+        }]
+      });
+
+      getDataFromLocalStorageStub.restore();
     });
 
-    it('if gdprConsent is present payload must have gdpr params', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA', gdprApplies: true}, refererInfo: bidderRequest.refererInfo});
+    it('should attach valid params to the tags with multiRequest', function () {
+      const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdVal : null);
+
+      const bidMultiRequests = bidRequests.slice(0, 3).map((bidReq) => ({
+        ...bidReq,
+        params: { ...bidReq.params, multiRequest: true }
+      }));
+      bidMultiRequests[1].params.pubid = 'some_pub_id';
+      bidMultiRequests[2].params.source = 'jwp';
+      const requests = spec.buildRequests(bidMultiRequests, bidderRequest);
+      requests.forEach((request, i) => {
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        const banner = bidMultiRequests[i].mediaTypes ? bidRequests[i].mediaTypes.banner : { sizes: bidMultiRequests[i].sizes };
+        const video = bidMultiRequests[i].mediaTypes && bidMultiRequests[i].mediaTypes.video;
+        const source = bidMultiRequests[i].params.source;
+        const url = `https://grid.bidswitch.net/hbjson?no_mapping=1${source ? `&sp=${source}` : ''}`;
+        expect(request.url).to.equal(url);
+        expect(payload).to.deep.equal({
+          'id': bidderRequest.bidderRequestId,
+          'site': {
+            'page': referrer,
+            ...(bidMultiRequests[i].params.pubid && { 'publisher': { 'id': bidMultiRequests[i].params.pubid } })
+          },
+          'tmax': bidderRequest.timeout,
+          'source': {
+            'tid': bidderRequest.auctionId,
+            'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+          },
+          'user': {
+            'id': fpdUserIdVal
+          },
+          'imp': [{
+            'id': bidMultiRequests[i].bidId,
+            'tagid': bidMultiRequests[i].params.uid,
+            'ext': {'divid': bidMultiRequests[i].adUnitCode},
+            ...(bidMultiRequests[i].params.bidFloor && { 'bidfloor': bidMultiRequests[i].params.bidFloor }),
+            ...(banner && { banner: {
+              'w': banner.sizes[0][0],
+              'h': banner.sizes[0][1],
+              'format': banner.sizes.map(([w, h]) => ({ w, h }))
+            }}),
+            ...(video && { video: {
+              'w': video.playerSize[0][0],
+              'h': video.playerSize[0][1],
+              'mimes': video.mimes
+            }})
+          }]
+        });
+      });
+
+      getDataFromLocalStorageStub.restore();
+    });
+
+    it('should support mixed mediaTypes', function () {
+      const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdVal : null);
+
+      const [request] = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'user': {
+          'id': fpdUserIdVal
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[2].bidId,
+          'tagid': bidRequests[2].params.uid,
+          'ext': {'divid': bidRequests[2].adUnitCode},
+          'video': {
+            'w': 400,
+            'h': 600,
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg'],
+          }
+        }, {
+          'id': bidRequests[3].bidId,
+          'tagid': bidRequests[3].params.uid,
+          'ext': {'divid': bidRequests[3].adUnitCode},
+          'banner': {
+            'w': 728,
+            'h': 90,
+            'format': [{'w': 728, 'h': 90}]
+          },
+          'video': {
+            'w': 400,
+            'h': 600,
+            'protocols': [1, 2, 3]
+          }
+        }]
+      });
+
+      getDataFromLocalStorageStub.restore();
     });
 
-    it('if gdprApplies is false gdpr_applies must be 0', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA', gdprApplies: false}});
+    it('should send additional request with adUnits with withCriteo parameter', function () {
+      const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdVal : null);
+
+      const bidRequestsWithCriteo = bidRequests.map((bid, i) =>
+        i % 2 ? bid : {
+          ...bid,
+          params: {
+            ...bid.params,
+            withCriteo: true,
+            networkId: 123 + i
+          },
+          mediaTypes: {
+            ...bid.mediaTypes,
+            ...(bid.mediaTypes.video && { video: {
+              ...bid.mediaTypes.video,
+              context: 'instream',
+              protocols: [1, 2, 3],
+              maxduration: 30,
+              api: [1, 2],
+              skip: 1,
+              placement: 1,
+              minduration: 0,
+              playbackmethod: 1,
+              startdelay: 0
+            }
+            })
+          }
+        });
+
+      const [request, criteoRequest] = spec.buildRequests(bidRequestsWithCriteo, bidderRequest);
       expect(request.data).to.be.an('string');
+      expect(criteoRequest.data).to.be.an('object');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '0');
+      const criteoPayload = criteoRequest.data;
+      expect(request.url).to.equal('https://grid.bidswitch.net/hbjson');
+      expect(criteoRequest.url.replace(/\?.*$/, ''))
+        .to.equal('https://bidder.criteo.com/cdb');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'user': {
+          'id': fpdUserIdVal
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[2].bidId,
+          'tagid': bidRequests[2].params.uid,
+          'ext': {'divid': bidRequests[2].adUnitCode},
+          'video': {
+            'w': 400,
+            'h': 600,
+            'protocols': [1, 2, 3],
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg'],
+          }
+        }, {
+          'id': bidRequests[3].bidId,
+          'tagid': bidRequests[3].params.uid,
+          'ext': {'divid': bidRequests[3].adUnitCode},
+          'banner': {
+            'w': 728,
+            'h': 90,
+            'format': [{'w': 728, 'h': 90}]
+          },
+          'video': {
+            'w': 400,
+            'h': 600,
+            'protocols': [1, 2, 3]
+          }
+        }]
+      });
+
+      expect(criteoPayload).to.deep.equal({
+        'publisher': {
+          'ext': undefined,
+          'url': bidderRequest.refererInfo.page,
+          'networkid': 125
+        },
+        'regs': {
+          'coppa': undefined
+        },
+        'slots': [{
+          'impid': bidRequests[0].adUnitCode,
+          'transactionid': bidderRequest.transactionId,
+          'auctionId': bidderRequest.auctionId,
+          'sizes': ['300x250', '300x600']
+        }, {
+          'impid': bidRequests[2].adUnitCode,
+          'transactionid': bidderRequest.transactionId,
+          'auctionId': bidderRequest.auctionId,
+          'sizes': [],
+          'video': {
+            'api': [
+              1,
+              2
+            ],
+            'maxduration': 30,
+            'mimes': [
+              'video/mp4',
+              'video/webm',
+              'application/javascript',
+              'video/ogg',
+            ],
+            'minduration': 0,
+            'placement': 1,
+            'playbackmethod': 1,
+            'playersizes': [
+              '400x600'
+            ],
+            'protocols': [
+              1,
+              2,
+              3
+            ],
+            'skip': 1,
+            'startdelay': 0
+          }
+        }],
+        'user': {
+          'ext': undefined
+        }
+      });
+
+      getDataFromLocalStorageStub.restore();
     });
 
-    it('if gdprApplies is undefined gdpr_applies must be 1', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA'}});
+    it('if gdprConsent is present payload must have gdpr params', function () {
+      const gdprBidderRequest = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
+      const [request] = spec.buildRequests(bidRequests, gdprBidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext).to.have.property('consent', 'AAA');
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('ext');
+      expect(payload.regs.ext).to.have.property('gdpr', 1);
     });
 
     it('if usPrivacy is present payload must have us_privacy param', function () {
       const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      const [request] = spec.buildRequests(bidRequests, bidderRequestWithUSP);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('us_privacy', '1YNN');
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('ext');
+      expect(payload.regs.ext).to.have.property('us_privacy', '1YNN');
     });
 
-    it('should convert keyword params to proper form and attaches to request', function () {
-      const bidRequestWithKeywords = [].concat(bidRequests);
-      bidRequestWithKeywords[1] = Object.assign({},
-        bidRequests[1],
+    it('if userId is present payload must have user.ext param with right keys', function () {
+      const eids = [
         {
-          params: {
-            uid: '1',
-            keywords: {
-              single: 'val',
-              singleArr: ['val'],
-              singleArrNum: [3],
-              multiValMixed: ['value1', 2, 'value3'],
-              singleValNum: 123,
-              emptyStr: '',
-              emptyArr: [''],
-              badValue: {'foo': 'bar'} // should be dropped
+          source: 'pubcid.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+          }]
+        },
+        {
+          source: 'adserver.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1,
+            ext: {
+              rtiPartner: 'TDID'
             }
-          }
+          }]
         }
-      );
+      ];
+      const bidRequestsWithUserIds = bidRequests.map((bid) => {
+        return Object.assign({
+          userIdAsEids: eids
+        }, bid);
+      });
+      const [request] = spec.buildRequests(bidRequestsWithUserIds, bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext.eids).to.deep.equal(eids);
+    });
+
+    it('if userId is present payload must have user.ext param with right keys', function () {
+      const ortb2UserExtDevice = {
+        screenWidth: 1200,
+        screenHeight: 800,
+        language: 'ru'
+      };
+      const ortb2 = {user: {ext: {device: ortb2UserExtDevice}}};
 
-      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest);
+      const [request] = spec.buildRequests(bidRequests, {...bidderRequest, ortb2});
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload.keywords).to.be.an('string');
-      payload.keywords = JSON.parse(payload.keywords);
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext.device).to.deep.equal(ortb2UserExtDevice);
+    });
 
-      expect(payload.keywords).to.deep.equal([{
-        'key': 'single',
-        'value': ['val']
-      }, {
-        'key': 'singleArr',
-        'value': ['val']
-      }, {
-        'key': 'singleArrNum',
-        'value': ['3']
-      }, {
-        'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
-      }, {
-        'key': 'singleValNum',
-        'value': ['123']
-      }, {
-        'key': 'emptyStr'
-      }, {
-        'key': 'emptyArr'
+    it('if schain is present payload must have source.ext.schain param', function () {
+      const schain = {
+        complete: 1,
+        nodes: [
+          {
+            asi: 'indirectseller.com',
+            sid: '00001',
+            hp: 1
+          }
+        ]
+      };
+      const bidRequestsWithSChain = bidRequests.map((bid) => {
+        return Object.assign({
+          schain: schain
+        }, bid);
+      });
+      const [request] = spec.buildRequests(bidRequestsWithSChain, bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('source');
+      expect(payload.source).to.have.property('ext');
+      expect(payload.source.ext).to.have.property('schain');
+      expect(payload.source.ext.schain).to.deep.equal(schain);
+    });
+
+    it('if content and segment is present in jwTargeting, payload must have right params', function () {
+      const jsContent = {id: 'test_jw_content_id'};
+      const jsSegments = ['test_seg_1', 'test_seg_2'];
+      const bidRequestsWithJwTargeting = bidRequests.map((bid) => {
+        return Object.assign({
+          rtd: {
+            jwplayer: {
+              targeting: {
+                segments: jsSegments,
+                content: jsContent
+              }
+            }
+          }
+        }, bid);
+      });
+      const [request] = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('user');
+      expect(payload.user.data).to.deep.equal([{
+        name: 'iow_labs_pub_data',
+        segment: [
+          {name: 'jwpseg', value: jsSegments[0]},
+          {name: 'jwpseg', value: jsSegments[1]}
+        ]
       }]);
+      expect(payload).to.have.property('site');
+      expect(payload.site.content).to.deep.equal(jsContent);
     });
 
-    it('should mix keyword param with keywords from config', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
-        arg => arg === 'fpd.user' ? {'keywords': ['a', 'b']} : arg === 'fpd.context' ? {'keywords': ['any words']} : null);
+    it('should contain the keyword values if it present in ortb2.(site/user)', function () {
+      const ortb2 = {
+        user: {'keywords': 'foo,any'},
+        site: {'keywords': 'bar'}
+      };
+      const keywords = {
+        'site': {
+          'somePublisher': [
+            {
+              'name': 'someName',
+              'brandsafety': ['disaster'],
+              'topic': ['stress', 'fear']
+            }
+          ]
+        },
+        'user': {
+          'formatedPublisher': [
+            {
+              'name': 'fomatedName',
+              'segments': [
+                { 'name': 'segName1', 'value': 'segVal1' },
+                { 'name': 'segName2', 'value': 'segVal2' }
+              ]
+            }
+          ]
+        }
+      };
+      const bidRequestWithKW = { ...bidRequests[0], params: { ...bidRequests[0].params, keywords } }
+      const [request] = spec.buildRequests([bidRequestWithKW], {...bidderRequest, ortb2});
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.ext.keywords).to.deep.equal({
+        'site': {
+          'somePublisher': [
+            {
+              'name': 'someName',
+              'segments': [
+                { 'name': 'brandsafety', 'value': 'disaster' },
+                { 'name': 'topic', 'value': 'stress' },
+                { 'name': 'topic', 'value': 'fear' }
+              ]
+            }
+          ],
+          'ortb2': [
+            {
+              'name': 'keywords',
+              'segments': [
+                { 'name': 'keywords', 'value': 'bar' }
+              ]
+            }
+          ]
+        },
+        'user': {
+          'formatedPublisher': [
+            {
+              'name': 'fomatedName',
+              'segments': [
+                { 'name': 'segName1', 'value': 'segVal1' },
+                { 'name': 'segName2', 'value': 'segVal2' }
+              ]
+            }
+          ],
+          'ortb2': [
+            {
+              'name': 'keywords',
+              'segments': [
+                { 'name': 'keywords', 'value': 'foo' },
+                { 'name': 'keywords', 'value': 'any' }
+              ]
+            }
+          ]
+        }
+      });
+    });
 
-      const bidRequestWithKeywords = [].concat(bidRequests);
-      bidRequestWithKeywords[1] = Object.assign({},
-        bidRequests[1],
+    it('should have user.data filled from config ortb2.user.data', function () {
+      const userData = [
         {
-          params: {
-            uid: '1',
-            keywords: {
-              single: 'val',
-              singleArr: ['val'],
-              multiValMixed: ['value1', 2, 'value3']
+          name: 'someName',
+          segment: [1, 2, { anyKey: 'anyVal' }, 'segVal', { id: 'segId' }, { value: 'segValue' }, { id: 'segId2', name: 'segName' }]
+        },
+        {
+          name: 'permutive.com',
+          segment: [1, 2, 'segVal', { id: 'segId' }, { anyKey: 'anyVal' }, { value: 'segValue' }, { id: 'segId2', name: 'segName' }]
+        },
+        {
+          someKey: 'another data'
+        }
+      ];
+      const ortb2 = {user: {data: userData}};
+      const [request] = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
+      const payload = parseRequest(request.data);
+      expect(payload.user.data).to.deep.equal(userData);
+    });
+
+    it('should have site.content.data filled from config ortb2.site.content.data', function () {
+      const contentData = [
+        {
+          'name': 'someName',
+          'ext': {
+            'segtax': 7
+          },
+          'segments': [
+            { 'id': 'segId1' },
+            { 'id': 'segId2' }
+          ]
+        }
+      ];
+      const ortb2 = {site: { content: { data: contentData } }};
+      const [request] = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
+      const payload = parseRequest(request.data);
+      expect(payload.site.content.data).to.deep.equal(contentData);
+    });
+
+    it('should have right value in user.data when jwpsegments are present', function () {
+      const userData = [
+        {
+          name: 'someName',
+          segment: [1, 2, { anyKey: 'anyVal' }, 'segVal', { id: 'segId' }, { value: 'segValue' }, { id: 'segId2', name: 'segName' }]
+        },
+        {
+          name: 'permutive.com',
+          segment: [1, 2, 'segVal', { id: 'segId' }, { anyKey: 'anyVal' }, { value: 'segValue' }, { id: 'segId2', name: 'segName' }]
+        },
+        {
+          someKey: 'another data'
+        }
+      ];
+      const ortb2 = {user: {data: userData}};
+
+      const jsContent = {id: 'test_jw_content_id'};
+      const jsSegments = ['test_seg_1', 'test_seg_2'];
+      const bidRequestsWithJwTargeting = Object.assign({}, bidRequests[0], {
+        rtd: {
+          jwplayer: {
+            targeting: {
+              segments: jsSegments,
+              content: jsContent
             }
           }
         }
-      );
+      });
+      const [request] = spec.buildRequests([bidRequestsWithJwTargeting], {...bidderRequest, ortb2});
+      const payload = parseRequest(request.data);
+      expect(payload.user.data).to.deep.equal([{
+        name: 'iow_labs_pub_data',
+        segment: [
+          {name: 'jwpseg', value: jsSegments[0]},
+          {name: 'jwpseg', value: jsSegments[1]}
+        ]
+      }, ...userData]);
+    });
 
-      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest);
-      expect(request.data).to.be.an('string');
+    it('should have site.content.id filled from config ortb2.site.content.id', function () {
+      const contentId = 'jw_abc';
+      const ortb2 = {site: {content: {id: contentId}}};
+      const [request] = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
       const payload = parseRequest(request.data);
-      expect(payload.keywords).to.be.an('string');
-      payload.keywords = JSON.parse(payload.keywords);
+      expect(payload.site.content.id).to.equal(contentId);
+    });
 
-      expect(payload.keywords).to.deep.equal([{
-        'key': 'single',
-        'value': ['val']
-      }, {
-        'key': 'singleArr',
-        'value': ['val']
-      }, {
-        'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
+    it('should contain regs.coppa if coppa is true in config', function () {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'coppa' ? true : null);
+      const [request] = spec.buildRequests([bidRequests[0]], bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('coppa', 1);
+      getConfigStub.restore();
+    });
+    it('should contain imp[].ext.data.adserver if available', function() {
+      const ortb2Imp = [{
+        ext: {
+          data: {
+            adserver: {
+              name: 'ad_server_name',
+              adslot: '/111111/slot'
+            },
+            pbadslot: '/111111/slot'
+          }
+        }
       }, {
-        'key': 'user',
-        'value': ['a', 'b']
+        ext: {
+          data: {
+            adserver: {
+              name: 'ad_server_name',
+              adslot: '/222222/slot'
+            },
+            pbadslot: '/222222/slot'
+          }
+        }
+      }];
+      const bidRequestsWithOrtb2Imp = bidRequests.slice(0, 3).map((bid, ind) => {
+        return Object.assign(ortb2Imp[ind] ? { ortb2Imp: ortb2Imp[ind] } : {}, bid);
+      });
+      const [request] = spec.buildRequests(bidRequestsWithOrtb2Imp, bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.imp[0].ext).to.deep.equal({
+        divid: bidRequests[0].adUnitCode,
+        data: ortb2Imp[0].ext.data,
+        gpid: ortb2Imp[0].ext.data.adserver.adslot
+      });
+      expect(payload.imp[1].ext).to.deep.equal({
+        divid: bidRequests[1].adUnitCode,
+        data: ortb2Imp[1].ext.data,
+        gpid: ortb2Imp[1].ext.data.adserver.adslot
+      });
+      expect(payload.imp[2].ext).to.deep.equal({
+        divid: bidRequests[2].adUnitCode
+      });
+    });
+
+    it('should contain imp[].instl if available', function() {
+      const ortb2Imp = [{
+        instl: 1
       }, {
-        'key': 'context',
-        'value': ['any words']
-      }]);
+        instl: 2,
+        ext: {
+          data: {
+            adserver: {
+              name: 'ad_server_name',
+              adslot: '/222222/slot'
+            },
+            pbadslot: '/222222/slot'
+          }
+        }
+      }];
+      const bidRequestsWithOrtb2Imp = bidRequests.slice(0, 3).map((bid, ind) => {
+        return Object.assign(ortb2Imp[ind] ? { ortb2Imp: ortb2Imp[ind] } : {}, bid);
+      });
+      const [request] = spec.buildRequests(bidRequestsWithOrtb2Imp, bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.imp[0].instl).to.equal(1);
+      expect(payload.imp[1].instl).to.equal(2);
+      expect(payload.imp[2].instl).to.be.undefined;
+    });
 
-      getConfigStub.restore();
+    it('all id must be a string', function() {
+      const fpdUserIdNumVal = 2345543345;
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdNumVal : null);
+      let bidRequestWithNumId = {
+        'bidder': 'grid',
+        'params': {
+          'uid': 1,
+        },
+        'adUnitCode': 1233,
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': 123123123,
+        'bidderRequestId': 345345345,
+        'auctionId': 654645,
+      };
+      const bidderRequestWithNumId = {
+        refererInfo: {page: 'https://example.com'},
+        bidderRequestId: 345345345,
+        auctionId: 654645,
+        timeout: 3000
+      };
+      const parsedReferrer = encodeURIComponent(bidderRequestWithNumId.refererInfo.page);
+      const [request] = spec.buildRequests([bidRequestWithNumId], bidderRequestWithNumId);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.deep.equal({
+        'id': '345345345',
+        'site': {
+          'page': parsedReferrer
+        },
+        'tmax': bidderRequestWithNumId.timeout,
+        'source': {
+          'tid': '654645',
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'user': {
+          'id': '2345543345'
+        },
+        'imp': [{
+          'id': '123123123',
+          'tagid': '1',
+          'ext': {'divid': '1233'},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }]
+      });
+
+      getDataFromLocalStorageStub.restore();
+    })
+
+    describe('floorModule', function () {
+      const floorTestData = {
+        'currency': 'USD',
+        'floor': 1.50
+      };
+      const bidRequest = Object.assign({
+        getFloor: (_) => {
+          return floorTestData;
+        }
+      }, bidRequests[1]);
+      it('should return the value from getFloor if present', function () {
+        const [request] = spec.buildRequests([bidRequest], bidderRequest);
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(floorTestData.floor);
+      });
+      it('should return the getFloor.floor value if it is greater than bidfloor', function () {
+        const bidfloor = 0.80;
+        const bidRequestsWithFloor = { ...bidRequest };
+        bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
+        const [request] = spec.buildRequests([bidRequestsWithFloor], bidderRequest);
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(floorTestData.floor);
+      });
+      it('should return the bidfloor value if it is greater than getFloor.floor', function () {
+        const bidfloor = 1.80;
+        const bidRequestsWithFloor = { ...bidRequest };
+        bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
+        const [request] = spec.buildRequests([bidRequestsWithFloor], bidderRequest);
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(bidfloor);
+      });
     });
   });
 
   describe('interpretResponse', function () {
     const responses = [
-      {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
-      {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 2, 'h': 600, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
-      {'bid': [{'price': 0, 'auid': 3, 'h': 250, 'w': 300}], 'seat': '1'},
+      {'bid': [{'impid': '659423fff799cb', 'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 1, 'h': 250, 'w': 300, 'dealid': 11}], 'seat': '1'},
+      {'bid': [{'impid': '4dff80cc4ee346', 'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 2, 'h': 600, 'w': 300}], 'seat': '1'},
+      {'bid': [{'impid': '5703af74d0472a', 'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
+      {'bid': [{'impid': '2344da98f78b42', 'price': 0, 'auid': 3, 'h': 250, 'w': 300}], 'seat': '1'},
       {'bid': [{'price': 0, 'adm': '<div>test content 5</div>', 'h': 250, 'w': 300}], 'seat': '1'},
       undefined,
       {'bid': [], 'seat': '1'},
@@ -288,7 +1039,7 @@ describe('TheMediaGrid Adapter', function () {
           'auctionId': '1cbd2feafe5e8b',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '659423fff799cb',
@@ -298,11 +1049,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         }
       ];
 
@@ -319,7 +1072,7 @@ describe('TheMediaGrid Adapter', function () {
           },
           'adUnitCode': 'adunit-code-1',
           'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71a5b',
+          'bidId': '659423fff799cb',
           'bidderRequestId': '2c2bb1972df9a',
           'auctionId': '1fa09aee5c8c99',
         },
@@ -346,21 +1099,23 @@ describe('TheMediaGrid Adapter', function () {
           'auctionId': '1fa09aee5c8c99',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
-          'requestId': '300bfeb0d71a5b',
+          'requestId': '659423fff799cb',
           'cpm': 1.15,
           'creativeId': 1,
           'dealId': 11,
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '4dff80cc4ee346',
@@ -370,11 +1125,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 2</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '5703af74d0472a',
@@ -384,11 +1141,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 728,
           'height': 90,
           'ad': '<div>test content 3</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         }
       ];
 
@@ -429,13 +1188,64 @@ describe('TheMediaGrid Adapter', function () {
               'context': 'instream'
             }
           }
+        },
+        {
+          'bidder': 'grid',
+          'params': {
+            'uid': '13'
+          },
+          'adUnitCode': 'adunit-code-2',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '23312a43bc42',
+          'bidderRequestId': '5f2009617a7c0a',
+          'auctionId': '1cbd2feafe5e8b',
+          'mediaTypes': {
+            'video': {
+              'context': 'instream'
+            }
+          }
+        },
+        {
+          'bidder': 'grid',
+          'params': {
+            'uid': '14'
+          },
+          'adUnitCode': 'adunit-code-2',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '112432ab4f34',
+          'bidderRequestId': '5f2009617a7c0a',
+          'auctionId': '1cbd2feafe5e8b',
+          'mediaTypes': {
+            'video': {
+              'context': 'instream'
+            }
+          }
+        },
+        {
+          'bidder': 'grid',
+          'params': {
+            'uid': '15'
+          },
+          'adUnitCode': 'adunit-code-2',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': 'a74b342f8cd',
+          'bidderRequestId': '5f2009617a7c0a',
+          'auctionId': '1cbd2feafe5e8b',
+          'mediaTypes': {
+            'video': {
+              'context': 'instream'
+            }
+          }
         }
       ];
       const response = [
-        {'bid': [{'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>', 'auid': 11, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
-        {'bid': [{'price': 1.00, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>', 'auid': 12, content_type: 'video'}], 'seat': '2'}
+        {'bid': [{'impid': '659423fff799cb', 'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>', 'auid': 11, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
+        {'bid': [{'impid': '2bc598e42b6a', 'price': 1.00, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>', 'auid': 12, content_type: 'video'}], 'seat': '2'},
+        {'bid': [{'impid': '23312a43bc42', 'price': 2.00, 'nurl': 'https://some_test_vast_url.com', 'auid': 13, content_type: 'video', 'adomain': ['example.com'], w: 300, h: 600}], 'seat': '2'},
+        {'bid': [{'impid': '112432ab4f34', 'price': 1.80, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"32115432\"><\/Ad>\n<\/VAST>', 'nurl': 'https://wrong_url.com', 'auid': 14, content_type: 'video', 'adomain': ['example.com'], w: 300, h: 600}], 'seat': '2'},
+        {'bid': [{'impid': 'a74b342f8cd', 'price': 1.50, 'nurl': '', 'auid': 15, content_type: 'video'}], 'seat': '2'}
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '659423fff799cb',
@@ -444,16 +1254,72 @@ describe('TheMediaGrid Adapter', function () {
           'dealId': undefined,
           'width': 300,
           'height': 600,
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'video',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
           'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>',
           'adResponse': {
             'content': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>'
           }
-        }
+        },
+        {
+          'requestId': '2bc598e42b6a',
+          'cpm': 1.00,
+          'creativeId': 12,
+          'dealId': undefined,
+          'width': undefined,
+          'height': undefined,
+          'currency': 'USD',
+          'mediaType': 'video',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
+          'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>',
+          'adResponse': {
+            'content': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>'
+          }
+        },
+        {
+          'requestId': '23312a43bc42',
+          'cpm': 2.00,
+          'creativeId': 13,
+          'dealId': undefined,
+          'width': 300,
+          'height': 600,
+          'currency': 'USD',
+          'mediaType': 'video',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: ['example.com']
+          },
+          'vastUrl': 'https://some_test_vast_url.com',
+        },
+        {
+          'requestId': '112432ab4f34',
+          'cpm': 1.80,
+          'creativeId': 14,
+          'dealId': undefined,
+          'width': 300,
+          'height': 600,
+          'currency': 'USD',
+          'mediaType': 'video',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: ['example.com']
+          },
+          'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"32115432\"><\/Ad>\n<\/VAST>',
+          'adResponse': {
+            'content': '<VAST version=\"3.0\">\n<Ad id=\"32115432\"><\/Ad>\n<\/VAST>'
+          }
+        },
       ];
 
       const result = spec.interpretResponse({'body': {'seatbid': response}}, request);
@@ -496,18 +1362,18 @@ describe('TheMediaGrid Adapter', function () {
           'auctionId': '1fa09aee5c84d34',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const result = spec.interpretResponse({'body': {'seatbid': responses.slice(2)}}, request);
       expect(result.length).to.equal(0);
     });
 
     it('complicated case', function () {
       const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 2, 'h': 600, 'w': 300, dealid: 12}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 4</div>', 'auid': 1, 'h': 600, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 5</div>', 'auid': 2, 'h': 600, 'w': 350}], 'seat': '1'},
+        {'bid': [{'impid': '2164be6358b9', 'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
+        {'bid': [{'impid': '4e111f1b66e4', 'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 2, 'h': 600, 'w': 300, dealid: 12}], 'seat': '1'},
+        {'bid': [{'impid': '26d6f897b516', 'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
+        {'bid': [{'impid': '326bde7fbf69', 'price': 0.15, 'adm': '<div>test content 4</div>', 'auid': 1, 'h': 600, 'w': 300}], 'seat': '1'},
+        {'bid': [{'impid': '2234f233b22a', 'price': 0.5, 'adm': '<div>test content 5</div>', 'auid': 2, 'h': 600, 'w': 350}], 'seat': '1'},
       ];
       const bidRequests = [
         {
@@ -566,7 +1432,7 @@ describe('TheMediaGrid Adapter', function () {
           'auctionId': '32a1f276cb87cb8',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '2164be6358b9',
@@ -576,11 +1442,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '4e111f1b66e4',
@@ -590,11 +1458,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 2</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '26d6f897b516',
@@ -604,11 +1474,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 728,
           'height': 90,
           'ad': '<div>test content 3</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '326bde7fbf69',
@@ -618,11 +1490,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '<div>test content 4</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         }
       ];
 
@@ -630,79 +1504,197 @@ describe('TheMediaGrid Adapter', function () {
       expect(result).to.deep.equal(expectedResponse);
     });
 
-    it('dublicate uids and sizes in one slot', function () {
-      const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 1, 'h': 250, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 1, 'h': 250, 'w': 300}], 'seat': '1'},
+    it('should add response with biggest price', function () {
+      const mainResponse = [
+        {'bid': [{'impid': '2164be6358b9', 'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
+        {'bid': [{'impid': '4e111f1b66e4', 'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 2, 'h': 600, 'w': 300, dealid: 12}], 'seat': '1'},
       ];
-      const bidRequests = [
+      const criteoResponse = [
         {
-          'bidder': 'grid',
-          'params': {
-            'uid': '1'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '5126e301f4be',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
+          impid: 'adunit-code-1',
+          cpm: 0.15,
+          creative: '<div>test content 3</div>',
+          creativecode: 1,
+          bidId: '2164be6358b9',
+          currency: 'USD',
+          width: 300,
+          height: 250,
+          dealCode: 11,
+          zoneid: 123,
+          ttl: 360,
+          adomain: ['criteo.com'],
         },
+        {
+          impid: 'adunit-code-1',
+          cpm: 1,
+          creative: '<div>test content 4</div>',
+          creativecode: 2,
+          bidId: '4e111f1b66e4',
+          currency: 'USD',
+          width: 300,
+          height: 600,
+          dealCode: 12,
+          zoneid: 456,
+          ttl: 360,
+          adomain: ['criteo.com'],
+        }
+      ];
+      const bidRequests = [
         {
           'bidder': 'grid',
           'params': {
-            'uid': '1'
+            'uid': '1',
+            'zoneId': 123,
+            'withCriteo': true
           },
           'adUnitCode': 'adunit-code-1',
           'sizes': [[300, 250], [300, 600]],
-          'bidId': '57b2ebe70e16',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
+          'bidId': '2164be6358b9',
+          'bidderRequestId': '106efe3247',
+          'auctionId': '32a1f276cb87cb8',
+          'transactionId': '43534f55b213ac',
         },
         {
           'bidder': 'grid',
           'params': {
-            'uid': '1'
+            'uid': '2',
+            'zoneId': 456,
+            'withCriteo': true
           },
           'adUnitCode': 'adunit-code-1',
           'sizes': [[300, 250], [300, 600]],
-          'bidId': '225fcd44b18c',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
+          'bidId': '4e111f1b66e4',
+          'bidderRequestId': '106efe3247',
+          'auctionId': '32a1f276cb87cb8',
+          'transactionId': '43534f55b213ac',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
+      const bidderRequest = {
+        refererInfo: { page: 'https://example.com' },
+        bidderRequestId: '106efe3247',
+        transactionId: '43534f55b213ac',
+        auctionId: '32a1f276cb87cb8',
+        timeout: 3000
+      };
+      const [mainRequest, criteoRequest] = spec.buildRequests(bidRequests, bidderRequest);
+      const expectedMainResponse = [
         {
-          'requestId': '5126e301f4be',
+          'requestId': '2164be6358b9',
           'cpm': 1.15,
           'creativeId': 1,
-          'dealId': undefined,
+          'dealId': 11,
           'width': 300,
           'height': 250,
           'ad': '<div>test content 1</div>',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
-          'requestId': '57b2ebe70e16',
+          'requestId': '4e111f1b66e4',
           'cpm': 0.5,
+          'creativeId': 2,
+          'dealId': 12,
+          'width': 300,
+          'height': 600,
+          'ad': '<div>test content 2</div>',
+          'currency': 'USD',
+          'mediaType': 'banner',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
+        }
+      ];
+      const expectedCriteoResponse = [
+        {
+          'requestId': '4e111f1b66e4',
+          'cpm': 1,
+          'creativeId': 2,
+          'dealId': 12,
+          'width': 300,
+          'height': 600,
+          'ad': '<div>test content 4</div>',
+          'currency': 'USD',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: ['criteo.com']
+          },
+        }
+      ];
+
+      const mainResult = spec.interpretResponse({'body': {'seatbid': mainResponse}}, mainRequest);
+      const criteoResult = spec.interpretResponse({'body': {'slots': criteoResponse}}, criteoRequest);
+      expect(mainResult).to.deep.equal(expectedMainResponse);
+      expect(criteoResult).to.deep.equal(expectedCriteoResponse);
+    });
+
+    it('response with ext.bidder.grid.demandSource', function () {
+      const bidRequests = [
+        {
+          'bidder': 'grid',
+          'params': {
+            'uid': '1'
+          },
+          'adUnitCode': 'adunit-code-1',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '26d6f897b516',
+          'bidderRequestId': '5f2009617a7c0a',
+          'auctionId': '1cbd2feafe5e8b',
+        }
+      ];
+      const serverResponse = {
+        'bid': [
+          {
+            'impid': '26d6f897b516',
+            'price': 1.15,
+            'adm': '<div>test content 1</div>',
+            'auid': 1,
+            'h': 250,
+            'w': 300,
+            'dealid': 11,
+            'ext': {
+              'bidder': {
+                'grid': {
+                  'demandSource': 'someValue'
+                }
+              }
+            }
+          }
+        ],
+        'seat': '1'
+      };
+      const [request] = spec.buildRequests(bidRequests);
+      const expectedResponse = [
+        {
+          'requestId': '26d6f897b516',
+          'cpm': 1.15,
           'creativeId': 1,
-          'dealId': undefined,
+          'dealId': 11,
           'width': 300,
           'height': 250,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'grid',
+          'ad': '<div>test content 1</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: [],
+            demandSource: 'someValue'
+          },
+          'adserverTargeting': {
+            'hb_ds': 'someValue'
+          }
         }
       ];
 
-      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
+      const result = spec.interpretResponse({'body': {'seatbid': [serverResponse]}}, request);
       expect(result).to.deep.equal(expectedResponse);
     });
   });
diff --git a/test/spec/modules/gridNMBidAdapter_spec.js b/test/spec/modules/gridNMBidAdapter_spec.js
index 0dbaac0c526..b400ef3394d 100644
--- a/test/spec/modules/gridNMBidAdapter_spec.js
+++ b/test/spec/modules/gridNMBidAdapter_spec.js
@@ -132,6 +132,43 @@ describe('TheMediaGridNM Adapter', function () {
         expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
       });
     });
+
+    it('should return true when required params is absent, but available in mediaTypes', function () {
+      const paramsList = [
+        {
+          'source': 'jwp',
+          'secid': '11',
+          'pubid': '22',
+          'video': {
+            'protocols': [1, 2, 3, 4, 5, 6]
+          }
+        },
+        {
+          'source': 'jwp',
+          'secid': '11',
+          'pubid': '22',
+          'video': {
+            'mimes': ['video/mp4', 'video/x-ms-wmv'],
+          }
+        }
+      ];
+
+      const mediaTypes = {
+        video: {
+          mimes: ['video/mp4', 'video/x-ms-wmv'],
+          playerSize: [200, 300],
+          protocols: [1, 2, 3, 4, 5, 6]
+        }
+      };
+
+      paramsList.forEach((params) => {
+        const validBid = Object.assign({}, bid);
+        delete validBid.params;
+        validBid.params = params;
+        validBid.mediaTypes = mediaTypes;
+        expect(spec.isBidRequestValid(validBid)).to.equal(true);
+      });
+    });
   });
 
   describe('buildRequests', function () {
@@ -143,13 +180,19 @@ describe('TheMediaGridNM Adapter', function () {
       });
       return res;
     }
-    const bidderRequest = {refererInfo: {referer: 'https://example.com'}};
-    const referrer = bidderRequest.refererInfo.referer;
+    const bidderRequest = {
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '1d1a030790a475',
+      timeout: 3000,
+      refererInfo: { page: 'https://example.com' }
+    };
+    const referrer = encodeURIComponent(bidderRequest.refererInfo.page);
     let bidRequests = [
       {
         'bidder': 'gridNM',
         'params': {
           'source': 'jwp',
+          'floorcpm': 2,
           'secid': '11',
           'pubid': '22',
           'video': {
@@ -183,59 +226,154 @@ describe('TheMediaGridNM Adapter', function () {
       }
     ];
 
+    it('if content and segment is present in jwTargeting, payload must have right params', function () {
+      const jsContent = {id: 'test_jw_content_id'};
+      const jsSegments = ['test_seg_1', 'test_seg_2'];
+      const bidRequestsWithJwTargeting = bidRequests.map((bid) => {
+        return Object.assign({
+          rtd: {
+            jwplayer: {
+              targeting: {
+                segments: jsSegments,
+                content: jsContent
+              }
+            }
+          }
+        }, bid);
+      });
+      const requests = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest);
+      requests.forEach((req, i) => {
+        const payload = req.data;
+        expect(req).to.have.property('data');
+        expect(payload).to.have.property('user');
+        expect(payload.user.data).to.deep.equal([{
+          name: 'iow_labs_pub_data',
+          segment: [
+            {name: 'jwpseg', value: jsSegments[0]},
+            {name: 'jwpseg', value: jsSegments[1]}
+          ]
+        }]);
+        expect(payload).to.have.property('site');
+        expect(payload.site.content).to.deep.equal(jsContent);
+      });
+    });
+
     it('should attach valid params to the tag', function () {
       const requests = spec.buildRequests(bidRequests, bidderRequest);
       const requestsSizes = ['300x250,300x600', '728x90'];
       requests.forEach((req, i) => {
         expect(req.url).to.be.an('string');
         const payload = parseRequestUrl(req.url);
-        expect(payload).to.have.property('u', referrer);
-        expect(payload).to.have.property('r', '22edbae2733bf6');
-        expect(payload).to.have.property('wrapperType', 'Prebid_js');
-        expect(payload).to.have.property('wrapperVersion', '$prebid.version$');
-        expect(payload).to.have.property('sizes', requestsSizes[i]);
-        expect(req.data).to.deep.equal(bidRequests[i].params);
-      });
-    });
+        expect(payload).to.have.property('no_mapping', '1');
+        expect(payload).to.have.property('sp', 'jwp');
+
+        const sizes = { w: bidRequests[i].sizes[0][0], h: bidRequests[i].sizes[0][1] };
+        const impObj = {
+          'id': bidRequests[i].bidId,
+          'tagid': bidRequests[i].params.secid,
+          'ext': {'divid': bidRequests[i].adUnitCode},
+          'video': Object.assign(sizes, bidRequests[i].params.video)
+        };
+
+        if (bidRequests[i].params.floorcpm) {
+          impObj.bidfloor = bidRequests[i].params.floorcpm;
+        }
 
-    it('if gdprConsent is present payload must have gdpr params', function () {
-      const [request] = spec.buildRequests([bidRequests[0]], {gdprConsent: {consentString: 'AAA', gdprApplies: true}, refererInfo: bidderRequest.refererInfo});
-      expect(request.url).to.be.an('string');
-      const payload = parseRequestUrl(request.url);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
+        expect(req.data).to.deep.equal({
+          'id': bidderRequest.bidderRequestId,
+          'site': {
+            'page': referrer,
+            'publisher': {
+              'id': bidRequests[i].params.pubid
+            }
+          },
+          'tmax': bidderRequest.timeout,
+          'source': {
+            'tid': bidderRequest.auctionId,
+            'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+          },
+          'imp': [impObj]
+        });
+      });
     });
 
-    it('if gdprApplies is false gdpr_applies must be 0', function () {
-      const [request] = spec.buildRequests([bidRequests[0]], {gdprConsent: {consentString: 'AAA', gdprApplies: false}});
-      expect(request.url).to.be.an('string');
-      const payload = parseRequestUrl(request.url);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '0');
+    it('should attach valid params from mediaTypes', function () {
+      const mediaTypes = {
+        video: {
+          skipafter: 10,
+          minduration: 10,
+          maxduration: 100,
+          protocols: [1, 3, 4],
+          playerSize: [[300, 250]]
+        }
+      };
+      const bidRequest = Object.assign({ mediaTypes }, bidRequests[0]);
+      const req = spec.buildRequests([bidRequest], bidderRequest)[0];
+      const expectedVideo = {
+        'skipafter': 10,
+        'minduration': 10,
+        'maxduration': 100,
+        'mimes': ['video/mp4', 'video/x-ms-wmv'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'w': 300,
+        'h': 250
+      };
+
+      expect(req.url).to.be.an('string');
+      const payload = parseRequestUrl(req.url);
+      expect(payload).to.have.property('no_mapping', '1');
+      expect(payload).to.have.property('sp', 'jwp');
+      expect(req.data).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer,
+          'publisher': {
+            'id': bidRequest.params.pubid
+          }
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequest.bidId,
+          'bidfloor': bidRequest.params.floorcpm,
+          'tagid': bidRequest.params.secid,
+          'ext': {'divid': bidRequest.adUnitCode},
+          'video': expectedVideo
+        }]
+      });
     });
 
-    it('if gdprApplies is undefined gdpr_applies must be 1', function () {
-      const [request] = spec.buildRequests([bidRequests[0]], {gdprConsent: {consentString: 'AAA'}});
-      expect(request.url).to.be.an('string');
-      const payload = parseRequestUrl(request.url);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
+    it('if gdprConsent is present payload must have gdpr params', function () {
+      const gdprBidderRequest = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
+      const request = spec.buildRequests([bidRequests[0]], gdprBidderRequest)[0];
+      const payload = request.data;
+      expect(request).to.have.property('data');
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext).to.have.property('consent', 'AAA');
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('ext');
+      expect(payload.regs.ext).to.have.property('gdpr', 1);
     });
 
     it('if usPrivacy is present payload must have us_privacy param', function () {
       const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
-      const [request] = spec.buildRequests([bidRequests[0]], bidderRequestWithUSP);
-      expect(request.url).to.be.an('string');
-      const payload = parseRequestUrl(request.url);
-      expect(payload).to.have.property('us_privacy', '1YNN');
+      const request = spec.buildRequests([bidRequests[0]], bidderRequestWithUSP)[0];
+      const payload = request.data;
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('ext');
+      expect(payload.regs.ext).to.have.property('us_privacy', '1YNN');
     });
   });
 
   describe('interpretResponse', function () {
     const responses = [
       {'bid': [{'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>', 'content_type': 'video', 'h': 250, 'w': 300, 'dealid': 11}], 'seat': '2'},
-      {'bid': [{'price': 0.5, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341235\"><\/Ad>\n<\/VAST>', 'content_type': 'video', 'h': 600, 'w': 300}], 'seat': '2'},
+      {'bid': [{'price': 0.5, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341235\"><\/Ad>\n<\/VAST>', 'content_type': 'video', 'h': 600, 'w': 300, adomain: ['my_domain.ru']}], 'seat': '2'},
+      {'bid': [{'price': 2.00, 'nurl': 'https://some_test_vast_url.com', 'content_type': 'video', 'adomain': ['example.com'], 'w': 300, 'h': 600}], 'seat': '2'},
       {'bid': [{'price': 0, 'h': 250, 'w': 300}], 'seat': '2'},
       {'bid': [{'price': 0, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341237\"><\/Ad>\n<\/VAST>', 'h': 250, 'w': 300}], 'seat': '2'},
       undefined,
@@ -289,6 +427,28 @@ describe('TheMediaGridNM Adapter', function () {
               'context': 'instream'
             }
           }
+        },
+        {
+          'bidder': 'gridNM',
+          'params': {
+            'source': 'jwp',
+            'secid': '11',
+            'pubid': '22',
+            'video': {
+              'mimes': ['video/mp4'],
+              'protocols': [1, 2, 3],
+            }
+          },
+          'adUnitCode': 'adunit-code-1',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '127f4b12a432c',
+          'bidderRequestId': 'a75bc868f32',
+          'auctionId': '1cbd2feafe5e8b',
+          'mediaTypes': {
+            'video': {
+              'context': 'instream'
+            }
+          }
         }
       ];
       const requests = spec.buildRequests(bidRequests);
@@ -300,12 +460,14 @@ describe('TheMediaGridNM Adapter', function () {
           'dealId': 11,
           'width': 300,
           'height': 250,
-          'bidderCode': 'gridNM',
           'currency': 'USD',
           'mediaType': 'video',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
           'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>',
+          'meta': {
+            'advertiserDomains': []
+          },
           'adResponse': {
             'content': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>'
           }
@@ -317,15 +479,33 @@ describe('TheMediaGridNM Adapter', function () {
           'dealId': undefined,
           'width': 300,
           'height': 600,
-          'bidderCode': 'gridNM',
           'currency': 'USD',
           'mediaType': 'video',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
           'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21341235\"><\/Ad>\n<\/VAST>',
+          'meta': {
+            'advertiserDomains': ['my_domain.ru']
+          },
           'adResponse': {
             'content': '<VAST version=\"3.0\">\n<Ad id=\"21341235\"><\/Ad>\n<\/VAST>'
           }
+        },
+        {
+          'requestId': '127f4b12a432c',
+          'cpm': 2.00,
+          'creativeId': 'a75bc868f32',
+          'dealId': undefined,
+          'width': 300,
+          'height': 600,
+          'currency': 'USD',
+          'mediaType': 'video',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: ['example.com']
+          },
+          'vastUrl': 'https://some_test_vast_url.com',
         }
       ];
 
@@ -336,7 +516,7 @@ describe('TheMediaGridNM Adapter', function () {
     });
 
     it('handles wrong and nobid responses', function () {
-      responses.slice(2).forEach((resp) => {
+      responses.slice(3).forEach((resp) => {
         const request = spec.buildRequests([{
           'bidder': 'gridNM',
           'params': {
@@ -354,6 +534,9 @@ describe('TheMediaGridNM Adapter', function () {
           'bidId': '2bc598e42b6a',
           'bidderRequestId': '39d74f5b71464',
           'auctionId': '1cbd2feafe5e8b',
+          'meta': {
+            'advertiserDomains': []
+          },
           'mediaTypes': {
             'video': {
               'context': 'instream'
diff --git a/test/spec/modules/growadvertisingBidAdapter_spec.js b/test/spec/modules/growadvertisingBidAdapter_spec.js
new file mode 100644
index 00000000000..55eea06cca8
--- /dev/null
+++ b/test/spec/modules/growadvertisingBidAdapter_spec.js
@@ -0,0 +1,228 @@
+import { expect } from 'chai';
+import { spec } from 'modules/growadvertisingBidAdapter.js';
+import * as utils from '../../../src/utils.js';
+import {BANNER, NATIVE} from '../../../src/mediaTypes.js';
+
+describe('GrowAdvertising Adapter', function() {
+  const ZONE_ID = 'unique-zone-id';
+  const serverResponseBanner = {
+    body: {
+      status: 'success',
+      width: 300,
+      height: 250,
+      creativeId: 'ULqaukILu0RnMa0FyidOtkji4Po3qbgQ9ceRVGlhjLLKnrrLAATmGNCwtE99Ems8',
+      ad: '<img src="https://image.source.com/img" alt="" title="" width="300" height="250" />',
+      cpm: 1,
+      ttl: 180,
+      currency: 'USD',
+      type: BANNER,
+    }
+  };
+  const serverResponseNative = {
+    body: {
+      status: 'success',
+      width: 400,
+      height: 300,
+      creativeId: 'ULqaukILu0RnMa0FyidOtkji4Po3qbgQ9ceRVGlhjLLKnrrLAATmGNCwtE99Ems9',
+      cpm: 2,
+      ttl: 180,
+      currency: 'USD',
+      native: {
+        title: 'Test title',
+        body: 'Test body',
+        body2: null,
+        sponsoredBy: 'Sponsored by',
+        cta: null,
+        clickUrl: 'https://example.org',
+        image: {
+          width: 400,
+          height: 300,
+          url: 'https://image.source.com/img',
+        }
+      },
+      type: NATIVE
+    }
+  };
+  let bidRequests = [];
+
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'growads',
+        params: {
+          zoneId: ZONE_ID,
+          maxCPM: 5,
+          minCPM: 1
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]],
+          },
+        },
+      },
+      {
+        bidder: 'growads',
+        params: {
+          zoneId: ZONE_ID,
+        },
+        mediaTypes: {
+          native: {
+            title: {
+              required: true
+            },
+            image: {
+              required: true
+            },
+            sponsoredBy: {
+              required: true
+            }
+          },
+        },
+      }
+    ];
+  });
+
+  describe('implementation', function () {
+    describe('for requests', function () {
+      it('should accept valid bid', function () {
+        let validBid = {
+          bidder: 'growads',
+          params: {
+            zoneId: ZONE_ID
+          }
+        };
+
+        let isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(true);
+      });
+
+      it('should reject null zoneId bid', function () {
+        let zoneNullBid = {
+          bidder: 'growads',
+          params: {
+            zoneId: null
+          }
+        };
+
+        let isValid = spec.isBidRequestValid(zoneNullBid);
+        expect(isValid).to.equal(false);
+      });
+
+      it('should reject absent zoneId bid', function () {
+        let absentZoneBid = {
+          bidder: 'growads',
+          params: {
+            param: ZONE_ID
+          }
+        };
+
+        let isValid = spec.isBidRequestValid(absentZoneBid);
+        expect(isValid).to.equal(false);
+      });
+
+      it('should use custom domain', function () {
+        let validBid = {
+          bidder: 'growads',
+          params: {
+            zoneId: ZONE_ID,
+            domain: 'test.subdomain.growadvertising.com',
+          },
+        };
+
+        let requests = spec.buildRequests([validBid]);
+        expect(requests[0].url).to.have.string('test.subdomain.');
+      });
+
+      it('should use default domain', function () {
+        let validBid = {
+          bidder: 'growads',
+          params: {
+            zoneId: ZONE_ID,
+          },
+        };
+
+        let requests = spec.buildRequests([validBid]);
+        expect(requests[0].url).to.have.string('portal.growadvertising.com');
+      });
+
+      it('should increment zone index', function () {
+        let validBids = [
+          {
+            bidder: 'growads',
+            params: {
+              zoneId: ZONE_ID,
+            },
+          },
+          {
+            bidder: 'growads',
+            params: {
+              zoneId: ZONE_ID,
+            },
+          }
+        ];
+
+        let requests = spec.buildRequests(validBids);
+        expect(requests[0].data).to.include({i: 0});
+        expect(requests[1].data).to.include({i: 1});
+      });
+    });
+
+    describe('bid responses', function () {
+      describe(BANNER, function () {
+        it('should return complete bid response banner', function () {
+          let bids = spec.interpretResponse(serverResponseBanner, {bidRequest: bidRequests[0]});
+
+          expect(bids).to.be.lengthOf(1);
+          expect(bids[0].bidderCode).to.equal('growads');
+          expect(bids[0].cpm).to.equal(1);
+          expect(bids[0].width).to.equal(300);
+          expect(bids[0].height).to.equal(250);
+          expect(bids[0].creativeId).to.have.length.above(1);
+          expect(bids[0].ad).to.have.length.above(1);
+          expect(bids[0].mediaType).to.equal(BANNER);
+        });
+
+        it('should return empty bid on incorrect size', function () {
+          let response = utils.mergeDeep(serverResponseBanner, {
+            body: {
+              width: 150,
+              height: 150
+            }
+          });
+
+          let bids = spec.interpretResponse(response, {bidRequest: bidRequests[0]});
+          expect([]).to.be.lengthOf(0);
+        });
+
+        it('should return empty bid on incorrect CPM', function () {
+          let response = utils.mergeDeep(serverResponseBanner, {
+            body: {
+              cpm: 10
+            }
+          });
+
+          let bids = spec.interpretResponse(response, {bidRequest: bidRequests[0]});
+          expect([]).to.be.lengthOf(0);
+        });
+      });
+
+      describe(NATIVE, function () {
+        it('should return complete bid response banner', function () {
+          let bids = spec.interpretResponse(serverResponseNative, {bidRequest: bidRequests[1]});
+
+          expect(bids).to.be.lengthOf(1);
+          expect(bids[0].bidderCode).to.equal('growads');
+          expect(bids[0].cpm).to.equal(2);
+          expect(bids[0].width).to.equal(400);
+          expect(bids[0].height).to.equal(300);
+          expect(bids[0].creativeId).to.have.length.above(1);
+          expect(bids[0]).property('native');
+          expect(bids[0].native.title).to.have.length.above(1);
+          expect(bids[0].native.body).to.have.length.above(1);
+          expect(bids[0].native).property('image');
+          expect(bids[0].mediaType).to.equal(NATIVE);
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/growthCodeAnalyticsAdapter_spec.js b/test/spec/modules/growthCodeAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..e542a2641e8
--- /dev/null
+++ b/test/spec/modules/growthCodeAnalyticsAdapter_spec.js
@@ -0,0 +1,70 @@
+import adapterManager from '../../../src/adapterManager.js';
+import growthCodeAnalyticsAdapter from '../../../modules/growthCodeAnalyticsAdapter.js';
+import { expect } from 'chai';
+import * as events from '../../../src/events.js';
+import constants from '../../../src/constants.json';
+import { generateUUID } from '../../../src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+
+describe('growthCode analytics adapter', () => {
+  beforeEach(() => {
+    growthCodeAnalyticsAdapter.enableAnalytics({
+      provider: 'growthCodeAnalytics',
+      options: {
+        pid: 'TEST01',
+        trackEvents: [
+          'auctionInit',
+          'auctionEnd',
+          'bidAdjustment',
+          'bidTimeout',
+          'bidTimeout',
+          'bidRequested',
+          'bidResponse',
+          'setTargeting',
+          'requestBids',
+          'addAdUnits',
+          'noBid',
+          'bidWon',
+          'bidderDone']
+      }
+    });
+  });
+
+  afterEach(() => {
+    growthCodeAnalyticsAdapter.disableAnalytics();
+  });
+
+  it('registers itself with the adapter manager', () => {
+    const adapter = adapterManager.getAnalyticsAdapter('growthCodeAnalytics');
+    expect(adapter).to.exist;
+    expect(adapter.adapter).to.equal(growthCodeAnalyticsAdapter);
+  });
+
+  it('tolerates undefined or empty config', () => {
+    growthCodeAnalyticsAdapter.enableAnalytics(undefined);
+    growthCodeAnalyticsAdapter.enableAnalytics({});
+  });
+
+  it('sends auction end events to the backend', () => {
+    const auction = {
+      auctionId: generateUUID(),
+      adUnits: [{
+        code: 'usr1234',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600], [728, 90]]
+          }
+        },
+        adUnitCodes: ['usr1234']
+      }],
+    };
+    events.emit(constants.EVENTS.AUCTION_END, auction);
+    assert(server.requests.length > 0)
+    const body = JSON.parse(server.requests[0].requestBody);
+    var eventTypes = [];
+    body.events.forEach(e => eventTypes.push(e.eventType));
+    assert(eventTypes.length > 0)
+    assert(eventTypes.indexOf(constants.EVENTS.AUCTION_END) > -1);
+    growthCodeAnalyticsAdapter.disableAnalytics();
+  });
+});
diff --git a/test/spec/modules/growthCodeIdSystem_spec.js b/test/spec/modules/growthCodeIdSystem_spec.js
new file mode 100644
index 00000000000..dce995d25e0
--- /dev/null
+++ b/test/spec/modules/growthCodeIdSystem_spec.js
@@ -0,0 +1,83 @@
+import { growthCodeIdSubmodule } from 'modules/growthCodeIdSystem.js';
+import * as utils from 'src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+import { uspDataHandler } from 'src/adapterManager.js';
+import {expect} from 'chai';
+import {getStorageManager} from '../../../src/storageManager.js';
+
+const GCID_EXPIRY = 45;
+const MODULE_NAME = 'growthCodeId';
+const SHAREDID = 'fe9c5c89-7d56-4666-976d-e07e73b3b664';
+
+export const storage = getStorageManager({ gvlid: undefined, moduleName: MODULE_NAME });
+
+const getIdParams = {params: {
+  pid: 'TEST01',
+  publisher_id: '_sharedid',
+  publisher_id_storage: 'html5',
+}};
+
+describe('growthCodeIdSystem', () => {
+  let logErrorStub;
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+    storage.setDataInLocalStorage('_sharedid', SHAREDID);
+    const expiresStr = (new Date(Date.now() + (GCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
+    if (storage.cookiesAreEnabled()) {
+      storage.setCookie('_sharedid', SHAREDID, expiresStr, 'LAX');
+    }
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+  });
+
+  describe('name', () => {
+    it('should expose the name of the submodule', () => {
+      expect(growthCodeIdSubmodule.name).to.equal('growthCodeId');
+    });
+  });
+
+  it('should NOT call the growthcode id endpoint if gdpr applies but consent string is missing', function () {
+    let submoduleCallback = growthCodeIdSubmodule.getId(getIdParams, { gdprApplies: true }, undefined);
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should log an error if pid configParam was not passed when getId', function () {
+    growthCodeIdSubmodule.getId();
+    expect(logErrorStub.callCount).to.be.equal(1);
+  });
+
+  it('should log an error if sharedId (LocalStore) is not setup correctly', function () {
+    growthCodeIdSubmodule.getId({params: {
+      pid: 'TEST01',
+      publisher_id: '_sharedid_bad',
+      publisher_id_storage: 'html5',
+    }});
+    expect(logErrorStub.callCount).to.be.equal(1);
+  });
+
+  it('should log an error if sharedId (LocalStore) is not setup correctly', function () {
+    growthCodeIdSubmodule.getId({params: {
+      pid: 'TEST01',
+      publisher_id: '_sharedid_bad',
+      publisher_id_storage: 'cookie',
+    }});
+    expect(logErrorStub.callCount).to.be.equal(1);
+  });
+
+  it('should call the growthcode id endpoint', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = growthCodeIdSubmodule.getId(getIdParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url.substr(0, 85)).to.be.eq('https://p2.gcprivacy.com/v1/pb?pid=TEST01&uid=' + SHAREDID + '&u=');
+    request.respond(
+      200,
+      {},
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+})
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index 7022f8f96dd..a2dacb16b73 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -1,3 +1,6 @@
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+
+import { config } from 'src/config.js';
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { spec } from 'modules/gumgumBidAdapter.js';
@@ -33,7 +36,11 @@ describe('gumgumAdapter', function () {
     };
 
     it('should return true when required params found', function () {
+      const zoneBid = { ...bid, params: { 'zone': '123' } };
+      const pubIdBid = { ...bid, params: { 'pubId': 123 } };
       expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(zoneBid)).to.equal(true);
+      expect(spec.isBidRequestValid(pubIdBid)).to.equal(true);
     });
 
     it('should return true when required params found', function () {
@@ -46,6 +53,17 @@ describe('gumgumAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
+    it('should return true when inslot sends sizes and trackingid', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'inSlot': '789',
+        'sizes': [[0, 1], [2, 3], [4, 5], [6, 7]]
+      };
+
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
     it('should return false when no unit type is specified', function () {
       let bid = Object.assign({}, bid);
       delete bid.params;
@@ -81,39 +99,244 @@ describe('gumgumAdapter', function () {
   });
 
   describe('buildRequests', function () {
+    let sizesArray = [[300, 250], [300, 600]];
     let bidRequests = [
       {
-        'bidder': 'gumgum',
-        'params': {
-          'inSlot': '9'
+        bidder: 'gumgum',
+        params: {
+          inSlot: 9
         },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'schain': {
-          'ver': '1.0',
-          'complete': 1,
-          'nodes': [
+        mediaTypes: {
+          banner: {
+            sizes: sizesArray
+          }
+        },
+        adUnitCode: 'adunit-code',
+        sizes: sizesArray,
+        bidId: '30b31c1838de1e',
+        schain: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
             {
-              'asi': 'exchange1.com',
-              'sid': '1234',
-              'hp': 1,
-              'rid': 'bid-request-1',
-              'name': 'publisher',
-              'domain': 'publisher.com'
+              asi: 'exchange1.com',
+              sid: '1234',
+              hp: 1,
+              rid: 'bid-request-1',
+              name: 'publisher',
+              domain: 'publisher.com'
             },
             {
-              'asi': 'exchange2.com',
-              'sid': 'abcd',
-              'hp': 1,
-              'rid': 'bid-request-2',
-              'name': 'intermediary',
-              'domain': 'intermediary.com'
+              asi: 'exchange2.com',
+              sid: 'abcd',
+              hp: 1,
+              rid: 'bid-request-2',
+              name: 'intermediary',
+              domain: 'intermediary.com'
             }
           ]
         }
       }
     ];
+    const vidMediaTypes = {
+      video: {
+        playerSize: [640, 480],
+        context: 'instream',
+        minduration: 1,
+        maxduration: 2,
+        linearity: 1,
+        startdelay: 1,
+        placement: 123456,
+        protocols: [1, 2]
+      }
+    };
+    const zoneParam = { 'zone': '123a' };
+    const pubIdParam = { 'pubId': 123 };
+
+    it('should set aun if the adUnitCode is available', function () {
+      const request = { ...bidRequests[0] };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.aun).to.equal(bidRequests[0].adUnitCode);
+    });
+
+    it('should set pubId param if found', function () {
+      const request = { ...bidRequests[0], params: pubIdParam };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.pubId).to.equal(pubIdParam.pubId);
+    });
+
+    it('should set t param when zone param is found', function () {
+      const request = { ...bidRequests[0], params: zoneParam };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.t).to.equal(zoneParam.zone);
+    });
+
+    it('should send the banner dimension with the greatest width or height for slot ads', function () {
+      const legacyRequest = { ...bidRequests[0] };
+      const slotZoneRequest = { ...bidRequests[0], params: { ...zoneParam, slot: 9 } }
+      const slotPubIdRequest = { ...bidRequests[0], params: { ...pubIdParam, slot: 9 } }
+      const legacyBidRequest = spec.buildRequests([legacyRequest])[0];
+      const slotZoneBidRequest = spec.buildRequests([slotZoneRequest])[0];
+      const slotPubIdBidRequest = spec.buildRequests([slotPubIdRequest])[0];
+      expect(legacyBidRequest.data.maxw).to.equal(300);
+      expect(legacyBidRequest.data.maxh).to.equal(600);
+      expect(slotZoneBidRequest.data.maxw).to.equal(300);
+      expect(slotZoneBidRequest.data.maxh).to.equal(600);
+      expect(slotPubIdBidRequest.data.maxw).to.equal(300);
+      expect(slotPubIdBidRequest.data.maxh).to.equal(600);
+    });
+
+    // if slot ID is set up incorrectly by a pub, we should send the invalid ID to be
+    // invalidated by ad server instead of trying to force integer type. forcing
+    // integer type can result in incorrect slot IDs that correlate to the incorrect pub ID
+    it('should send params.slot or params.inSlot as string when configured incorrectly', function () {
+      const invalidSlotId = '9gkal1cn';
+      const slotRequest = { ...bidRequests[0] };
+      const legacySlotRequest = { ...bidRequests[0] };
+      let req;
+      let legReq;
+
+      slotRequest.params.slot = invalidSlotId;
+      legacySlotRequest.params.inSlot = invalidSlotId;
+
+      req = spec.buildRequests([slotRequest])[0];
+      legReq = spec.buildRequests([legacySlotRequest])[0];
+
+      expect(req.data.si).to.equal(invalidSlotId);
+      expect(legReq.data.si).to.equal(invalidSlotId);
+    });
+
+    it('should set the iriscat param when found', function () {
+      const request = { ...bidRequests[0], params: { iriscat: 'abc123' } }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.have.property('iriscat');
+    });
+
+    it('should not set the iriscat param when not found', function () {
+      const request = { ...bidRequests[0] }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.not.have.property('iriscat');
+    });
+
+    it('should set the irisid param when found', function () {
+      const request = { ...bidRequests[0], params: { irisid: 'abc123' } }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.have.property('irisid');
+    });
+
+    it('should not set the irisid param when not found', function () {
+      const request = { ...bidRequests[0] }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.not.have.property('irisid');
+    });
+
+    it('should not set the irisid param when not of type string', function () {
+      const request = { ...bidRequests[0], params: { irisid: 123456 } }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.not.have.property('irisid');
+    });
+
+    it('should set the global placement id (gpid) if in adserver property', function () {
+      const req = { ...bidRequests[0], ortb2Imp: { ext: { data: { adserver: { name: 'test', adslot: 123456 } } } } }
+      const bidRequest = spec.buildRequests([req])[0];
+      expect(bidRequest.data).to.have.property('gpid');
+      expect(bidRequest.data.gpid).to.equal(123456);
+    });
+
+    it('should set the global placement id (gpid) if in pbadslot property', function () {
+      const pbadslot = 'abc123'
+      const req = { ...bidRequests[0], ortb2Imp: { ext: { data: { pbadslot } } } }
+      const bidRequest = spec.buildRequests([req])[0];
+      expect(bidRequest.data).to.have.property('gpid');
+      expect(bidRequest.data.gpid).to.equal(pbadslot);
+    });
+
+    it('should set the bid floor if getFloor module is not present but static bid floor is defined', function () {
+      const req = { ...bidRequests[0], params: { bidfloor: 42 } }
+      const bidRequest = spec.buildRequests([req])[0];
+      expect(bidRequest.data).to.have.property('fp');
+      expect(bidRequest.data.fp).to.equal(42);
+    });
+
+    describe('product id', function () {
+      it('should set the correct pi param if native param is found', function () {
+        const request = { ...bidRequests[0], params: { ...zoneParam, native: 2 } };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(5);
+      });
+      it('should set the correct pi param for video', function () {
+        const request = { ...bidRequests[0], params: zoneParam, mediaTypes: vidMediaTypes };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(7);
+      });
+      it('should set the correct pi param for invideo', function () {
+        const invideo = { video: { ...vidMediaTypes.video, linearity: 2 } };
+        const request = { ...bidRequests[0], params: zoneParam, mediaTypes: invideo };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(6);
+      });
+      it('should set the correct pi param if slot param is found', function () {
+        const request = { ...bidRequests[0], params: { ...zoneParam, slot: '123s' } };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(3);
+      });
+      it('should set the correct pi param if product param is found and is equal to skins', function () {
+        const request = { ...bidRequests[0], params: { ...zoneParam, product: 'Skins' } };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(8);
+      });
+      it('should default the pi param to 2 if only zone or pubId param is found', function () {
+        const zoneRequest = { ...bidRequests[0], params: zoneParam };
+        const pubIdRequest = { ...bidRequests[0], params: pubIdParam };
+        const zoneBidRequest = spec.buildRequests([zoneRequest])[0];
+        const pubIdBidRequest = spec.buildRequests([pubIdRequest])[0];
+        expect(zoneBidRequest.data.pi).to.equal(2);
+        expect(pubIdBidRequest.data.pi).to.equal(2);
+      });
+    });
+
+    it('should return a defined sizes field for video', function () {
+      const request = { ...bidRequests[0], mediaTypes: vidMediaTypes, params: { 'videoPubID': 123 } };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.sizes).to.equal(vidMediaTypes.video.playerSize);
+    });
+    it('should handle multiple sizes for inslot', function () {
+      const mediaTypes = { banner: { sizes: [[300, 250], [300, 600]] } }
+      const request = { ...bidRequests[0], mediaTypes };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.bf).to.equal('300x250,300x600');
+    });
+    describe('floorModule', function () {
+      const floorTestData = {
+        'currency': 'USD',
+        'floor': 1.50
+      };
+      bidRequests[0].getFloor = _ => {
+        return floorTestData;
+      };
+      it('should return the value from getFloor if present', function () {
+        const request = spec.buildRequests(bidRequests)[0];
+        expect(request.data.fp).to.equal(floorTestData.floor);
+      });
+      it('should return the getFloor.floor value if it is greater than bidfloor', function () {
+        const bidfloor = 0.80;
+        const request = { ...bidRequests[0] };
+        request.params.bidfloor = bidfloor;
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.fp).to.equal(floorTestData.floor);
+      });
+      it('should return the bidfloor value if it is greater than getFloor.floor', function () {
+        const bidfloor = 1.80;
+        const request = { ...bidRequests[0] };
+        request.params.bidfloor = bidfloor;
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.fp).to.equal(bidfloor);
+      });
+      it('should return a floor currency', function () {
+        const request = spec.buildRequests(bidRequests)[0];
+        expect(request.data.fpc).to.equal(floorTestData.currency);
+      })
+    });
 
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(bidRequests)[0];
@@ -133,6 +356,25 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data).to.include.any.keys('t');
       expect(bidRequest.data).to.include.any.keys('fp');
     });
+    it('should set iriscat parameter if iriscat param is found and is of type string', function () {
+      const iriscat = 'segment';
+      const request = { ...bidRequests[0] };
+      request.params = { ...request.params, iriscat };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.iriscat).to.equal(iriscat);
+    });
+    it('should not send iriscat parameter if iriscat param is not found', function () {
+      const request = { ...bidRequests[0] };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.iriscat).to.be.undefined;
+    });
+    it('should not send iriscat parameter if iriscat param is not of type string', function () {
+      const iriscat = 123;
+      const request = { ...bidRequests[0] };
+      request.params = { ...request.params, iriscat };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.iriscat).to.be.undefined;
+    });
     it('should send pubId if inScreenPubID param is specified', function () {
       const request = Object.assign({}, bidRequests[0]);
       delete request.params;
@@ -145,21 +387,7 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data).to.not.include.any.keys('t');
     });
     it('should send pubId if videoPubID param is specified', function () {
-      const mediaTypes = {
-        video: {
-          playerSize: [640, 480],
-          context: 'instream',
-          minduration: 1,
-          maxduration: 2,
-          linearity: 1,
-          startdelay: 1,
-          placement: 123456,
-          protocols: [1, 2]
-        }
-      };
-      const request = Object.assign({}, bidRequests[0]);
-      request.mediaTypes = mediaTypes
-      request.params = { 'videoPubID': 123 };
+      const request = { ...bidRequests[0], mediaTypes: vidMediaTypes, params: { 'videoPubID': 123 } };
       const bidRequest = spec.buildRequests([request])[0];
       expect(bidRequest.data).to.include.any.keys('pubId');
       expect(bidRequest.data.pubId).to.equal(request.params.videoPubID);
@@ -257,6 +485,20 @@ describe('gumgumAdapter', function () {
       const bidRequest = spec.buildRequests(bidRequests, fakeBidRequest)[0];
       expect(bidRequest.data).to.not.include.any.keys('gdprConsent')
     });
+    it('should not set coppa parameter if coppa config is set to false', function () {
+      config.setConfig({
+        coppa: false
+      });
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.coppa).to.eq(undefined);
+    });
+    it('should set coppa parameter to 1 if coppa config is set to true', function () {
+      config.setConfig({
+        coppa: true
+      });
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.coppa).to.eq(1);
+    });
     it('should add uspConsent parameter if it is present in the bidderRequest', function () {
       const noUspBidRequest = spec.buildRequests(bidRequests)[0];
       const uspConsentObj = { uspConsent: '1YYY' };
@@ -279,6 +521,20 @@ describe('gumgumAdapter', function () {
       const request = spec.buildRequests(bidRequests)[0];
       expect(request.data).to.not.include.any.keys('tdid');
     });
+    it('should send IDL envelope ID if available', function () {
+      const idl_env = 'abc123';
+      const request = { ...bidRequests[0], userId: { idl_env } };
+      const bidRequest = spec.buildRequests([request])[0];
+
+      expect(bidRequest.data).to.have.property('idl_env');
+      expect(bidRequest.data.idl_env).to.equal(idl_env);
+    });
+    it('should not send IDL envelope if not available', function () {
+      const request = { ...bidRequests[0] };
+      const bidRequest = spec.buildRequests([request])[0];
+
+      expect(bidRequest.data).to.not.have.property('idl_env');
+    });
     it('should send schain parameter in serialized form', function () {
       const serializedForm = '1.0,1!exchange1.com,1234,1,bid-request-1,publisher,publisher.com!exchange2.com,abcd,1,bid-request-2,intermediary,intermediary.com'
       const request = spec.buildRequests(bidRequests)[0];
@@ -301,66 +557,141 @@ describe('gumgumAdapter', function () {
       const jcsi = JSON.stringify(JCSI);
       const bidRequest = spec.buildRequests(bidRequests)[0];
       const actualKeys = Object.keys(JSON.parse(bidRequest.data.jcsi)).sort();
-      expect(actualKeys).to.eq(actualKeys);
+      expect(actualKeys).to.eql(expectedKeys);
       expect(bidRequest.data.jcsi).to.eq(jcsi);
     });
+    it('should include the local time and timezone offset', function () {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(!!bidRequest.data.lt).to.be.true;
+    });
+
+    it('should handle no gg params', function () {
+      const bidRequest = spec.buildRequests(bidRequests, { refererInfo: { page: 'https://www.prebid.org/?param1=foo&param2=bar&param3=baz' } })[0];
+
+      // no params are in object
+      expect(bidRequest.data.hasOwnProperty('eAdBuyId')).to.be.false;
+      expect(bidRequest.data.hasOwnProperty('adBuyId')).to.be.false;
+      expect(bidRequest.data.hasOwnProperty('ggdeal')).to.be.false;
+    });
+
+    it('should handle encrypted ad buy id', function () {
+      const bidRequest = spec.buildRequests(bidRequests, { refererInfo: { page: 'https://www.prebid.org/?param1=foo&ggad=bar&param3=baz' } })[0];
+
+      // correct params are in object
+      expect(bidRequest.data.hasOwnProperty('eAdBuyId')).to.be.true;
+      expect(bidRequest.data.hasOwnProperty('adBuyId')).to.be.false;
+      expect(bidRequest.data.hasOwnProperty('ggdeal')).to.be.false;
+
+      // params are stripped from pu property
+      expect(bidRequest.data.pu.includes('ggad')).to.be.false;
+    });
+
+    it('should handle unencrypted ad buy id', function () {
+      const bidRequest = spec.buildRequests(bidRequests, { refererInfo: { page: 'https://www.prebid.org/?param1=foo&ggad=123&param3=baz' } })[0];
+
+      // correct params are in object
+      expect(bidRequest.data.hasOwnProperty('eAdBuyId')).to.be.false;
+      expect(bidRequest.data.hasOwnProperty('adBuyId')).to.be.true;
+      expect(bidRequest.data.hasOwnProperty('ggdeal')).to.be.false;
+
+      // params are stripped from pu property
+      expect(bidRequest.data.pu.includes('ggad')).to.be.false;
+    });
+
+    it('should handle multiple gg params', function () {
+      const bidRequest = spec.buildRequests(bidRequests, { refererInfo: { page: 'https://www.prebid.org/?ggdeal=foo&ggad=bar&param3=baz' } })[0];
+
+      // correct params are in object
+      expect(bidRequest.data.hasOwnProperty('eAdBuyId')).to.be.true;
+      expect(bidRequest.data.hasOwnProperty('adBuyId')).to.be.false;
+      expect(bidRequest.data.hasOwnProperty('ggdeal')).to.be.true;
+
+      // params are stripped from pu property
+      expect(bidRequest.data.pu.includes('ggad')).to.be.false;
+      expect(bidRequest.data.pu.includes('ggdeal')).to.be.false;
+    });
   })
 
   describe('interpretResponse', function () {
-    let serverResponse = {
-      'ad': {
-        'id': 29593,
-        'width': 300,
-        'height': 250,
-        'ipd': 2000,
-        'markup': '<html><h3>I am an ad</h3></html>',
-        'ii': true,
-        'du': null,
-        'price': 0,
-        'zi': 0,
-        'impurl': 'http://g2.gumgum.com/ad/view',
-        'clsurl': 'http://g2.gumgum.com/ad/close'
+    const metaData = { adomain: ['advertiser.com'], mediaType: BANNER }
+    const serverResponse = {
+      ad: {
+        id: 29593,
+        width: 300,
+        height: 250,
+        ipd: 2000,
+        markup: '<html><h3>I am an ad</h3></html>',
+        ii: true,
+        du: null,
+        price: 0,
+        zi: 0,
+        impurl: 'http://g2.gumgum.com/ad/view',
+        clsurl: 'http://g2.gumgum.com/ad/close'
       },
-      'pag': {
-        't': 'ggumtest',
-        'pvid': 'aa8bbb65-427f-4689-8cee-e3eed0b89eec',
-        'css': 'html { overflow-y: auto }',
-        'js': 'console.log("environment", env);'
+      pag: {
+        t: 'ggumtest',
+        pvid: 'aa8bbb65-427f-4689-8cee-e3eed0b89eec',
+        css: 'html { overflow-y: auto }',
+        js: 'console.log("environment", env);'
       },
-      'jcsi': { t: 0, rq: 8 },
-      'thms': 10000
+      jcsi: { t: 0, rq: 8 },
+      thms: 10000,
+      meta: metaData
     }
-    let bidRequest = {
+    const bidRequest = {
       id: 12345,
       sizes: [[300, 250], [1, 1]],
       url: ENDPOINT,
       method: 'GET',
       pi: 3
     }
-    let expectedResponse = {
-      'ad': '<html><h3>I am an ad</h3></html>',
-      'cpm': 0,
-      'creativeId': 29593,
-      'currency': 'USD',
-      'height': '250',
-      'netRevenue': true,
-      'requestId': 12345,
-      'width': '300',
-      // dealId: DEAL_ID,
-      // referrer: REFERER,
-      ttl: 60
+    const expectedMetaData = { advertiserDomains: ['advertiser.com'], mediaType: BANNER };
+    const expectedResponse = {
+      ad: '<html><h3>I am an ad</h3></html>',
+      cpm: 0,
+      creativeId: 29593,
+      currency: 'USD',
+      height: '250',
+      netRevenue: true,
+      requestId: 12345,
+      width: '300',
+      mediaType: BANNER,
+      ttl: 60,
+      meta: expectedMetaData
     };
 
     it('should get correct bid response', function () {
       expect(spec.interpretResponse({ body: serverResponse }, bidRequest)).to.deep.equal([expectedResponse]);
     });
 
+    it('should set a default value for advertiserDomains if adomain is not found', function () {
+      const meta = { ...metaData };
+      delete meta.adomain;
+
+      const response = { ...serverResponse, meta };
+      const expectedMeta = { ...expectedMetaData, advertiserDomains: [] };
+      const expected = { ...expectedResponse, meta: expectedMeta };
+
+      expect(spec.interpretResponse({ body: response }, bidRequest)).to.deep.equal([expected]);
+    });
+
+    it('should set a default value for meta.mediaType if mediaType is not found in the response', function () {
+      const meta = { ...metaData };
+      delete meta.mediaType;
+      const response = { ...serverResponse, meta };
+      const expected = { ...expectedResponse };
+
+      expect(spec.interpretResponse({ body: response }, bidRequest)).to.deep.equal([expected]);
+    });
+
     it('should pass correct currency if found in bid response', function () {
       const cur = 'EURO';
-      let response = Object.assign({}, serverResponse);
-      let expected = Object.assign({}, expectedResponse);
+      const response = { ...serverResponse };
       response.ad.cur = cur;
+
+      const expected = { ...expectedResponse };
       expected.currency = cur;
+
       expect(spec.interpretResponse({ body: response }, bidRequest)).to.deep.equal([expected]);
     });
 
@@ -385,49 +716,102 @@ describe('gumgumAdapter', function () {
       expect(result.length).to.equal(0);
     });
 
-    it('returns 1x1 when eligible product and size available', function () {
-      let inscreenBidRequest = {
-        id: 12346,
-        sizes: [[300, 250], [1, 1]],
-        url: ENDPOINT,
-        method: 'GET',
-        data: {
-          pi: 2,
-          t: 'ggumtest'
+    describe('bidResponse width and height', function () {
+      it('uses response maxw and maxh for when found in bidresponse', function () {
+        const maxSlotAdResponse = { ...serverResponse.ad, maxw: 300, maxh: 600 };
+        const result = spec.interpretResponse({ body: { ...serverResponse, ad: maxSlotAdResponse } }, bidRequest)[0];
+        expect(result.width).to.equal(maxSlotAdResponse.maxw.toString());
+        expect(result.height).to.equal(maxSlotAdResponse.maxh.toString());
+      });
+
+      it('returns 1x1 when eligible product and size are available', function () {
+        let bidRequest = {
+          id: 12346,
+          sizes: [[300, 250], [1, 1]],
+          url: ENDPOINT,
+          method: 'GET',
+          data: {
+            pi: 5,
+            t: 'ggumtest'
+          }
         }
-      }
-      let inscreenServerResponse = {
-        'ad': {
-          'id': 2065333,
-          'height': 90,
-          'ipd': 2000,
-          'markup': '<html><h3>I am an inscreen ad</h3></html>',
-          'ii': true,
-          'du': null,
-          'price': 1,
-          'zi': 0,
-          'impurl': 'http://g2.gumgum.com/ad/view',
-          'clsurl': 'http://g2.gumgum.com/ad/close'
-        },
-        'pag': {
-          't': 'ggumtest',
-          'pvid': 'aa8bbb65-427f-4689-8cee-e3eed0b89eec',
-          'css': 'html { overflow-y: auto }',
-          'js': 'console.log("environment", env);'
-        },
-        'thms': 10000
-      }
-      let result = spec.interpretResponse({ body: inscreenServerResponse }, inscreenBidRequest);
-      expect(result[0].width).to.equal('1');
-      expect(result[0].height).to.equal('1');
+        let serverResponse = {
+          'ad': {
+            'id': 2065333,
+            'height': 90,
+            'ipd': 2000,
+            'markup': '<html><h3>Hello</h3></html>',
+            'ii': true,
+            'du': null,
+            'price': 1,
+            'zi': 0,
+            'impurl': 'http://g2.gumgum.com/ad/view',
+            'clsurl': 'http://g2.gumgum.com/ad/close'
+          },
+          'pag': {
+            't': 'ggumtest',
+            'pvid': 'aa8bbb65-427f-4689-8cee-e3eed0b89eec',
+          },
+          'thms': 10000
+        }
+        let result = spec.interpretResponse({ body: serverResponse }, bidRequest);
+        expect(result[0].width).to.equal('1');
+        expect(result[0].height).to.equal('1');
+      });
+
+      it('uses request size that nearest matches response size for in-screen', function () {
+        const request = { ...bidRequest };
+        const body = { ...serverResponse };
+        const expectedSize = [300, 50];
+        let result;
+
+        request.pi = 2;
+        request.sizes.unshift(expectedSize);
+
+        // typical ad server response values for in-screen
+        body.ad.width = 300;
+        body.ad.height = 100;
+
+        result = spec.interpretResponse({ body }, request)[0];
+
+        expect(result.width = expectedSize[0]);
+        expect(result.height = expectedSize[1]);
+      })
+
+      it('defaults to use bidRequest sizes', function () {
+        const { ad, jcsi, pag, thms, meta } = serverResponse
+        const noAdSizes = { ...ad }
+        delete noAdSizes.width
+        delete noAdSizes.height
+        const responseWithoutSizes = { jcsi, pag, thms, meta, ad: noAdSizes }
+        const request = { ...bidRequest, sizes: [[100, 200]] }
+        const result = spec.interpretResponse({ body: responseWithoutSizes }, request)[0];
+
+        expect(result.width).to.equal(request.sizes[0][0].toString())
+        expect(result.height).to.equal(request.sizes[0][1].toString())
+      });
     });
 
     it('updates jcsi object when the server response jcsi prop is found', function () {
-      const response = Object.assign({cw: 'AD_JSON'}, serverResponse);
+      const response = Object.assign({ cw: 'AD_JSON' }, serverResponse);
       const bidResponse = spec.interpretResponse({ body: response }, bidRequest)[0].ad;
       const decodedResponse = JSON.parse(atob(bidResponse));
       expect(decodedResponse.jcsi).to.eql(JCSI);
     });
+
+    it('sets the correct mediaType depending on product', function () {
+      const bannerBidResponse = spec.interpretResponse({ body: serverResponse }, bidRequest)[0];
+      const invideoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 6 } })[0];
+      const videoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 7 } })[0];
+      expect(bannerBidResponse.mediaType).to.equal(BANNER);
+      expect(invideoBidResponse.mediaType).to.equal(VIDEO);
+      expect(videoBidResponse.mediaType).to.equal(VIDEO);
+    });
+
+    it('sets a vastXml property if mediaType is video', function () {
+      const videoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 7 } })[0];
+      expect(videoBidResponse.vastXml).to.exist;
+    });
   })
   describe('getUserSyncs', function () {
     const syncOptions = {
diff --git a/test/spec/modules/h12mediaBidAdapter_spec.js b/test/spec/modules/h12mediaBidAdapter_spec.js
index 08a83ce981f..9861069f260 100644
--- a/test/spec/modules/h12mediaBidAdapter_spec.js
+++ b/test/spec/modules/h12mediaBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec} from 'modules/h12mediaBidAdapter';
 import {newBidder} from 'src/adapters/bidderFactory';
+import * as utils from 'src/utils';
 
 describe('H12 Media Adapter', function () {
   const DEFAULT_CURRENCY = 'USD';
@@ -21,6 +22,7 @@ describe('H12 Media Adapter', function () {
     auctionId: '9adc85ed-43ee-4a78-816b-52b7e578f313',
     params: {
       pubid: 123321,
+      pubsubid: 'pubsubtestid',
     },
   };
 
@@ -72,34 +74,34 @@ describe('H12 Media Adapter', function () {
     currency: 'EUR',
     netRevenue: true,
     ttl: 500,
-    bids: [{
+    bid: {
       bidId: validBid.bidId,
       cpm: 0.33,
       width: 300,
       height: 600,
       creativeId: '335566',
       ad: '<div>my ad</div>',
-      usersync: [
-        {url: 'https://cookiesync.3rdpartypartner.com/?3rdparty_partner_user_id={user_id}&partner_id=h12media&gdpr_applies={gdpr}&gdpr_consent_string={gdpr_cs}', type: 'image'},
-        {url: 'https://cookiesync.3rdpartypartner.com/?3rdparty_partner_user_id={user_id}&partner_id=h12media&gdpr_applies={gdpr}&gdpr_consent_string={gdpr_cs}', type: 'iframe'}
-      ],
       meta: {
         advertiserId: '54321',
         advertiserName: 'My advertiser',
         advertiserDomains: ['test.com']
       }
-    }]
+    },
+    usersync: [
+      {url: 'https://cookiesync.3rdpartypartner.com/?3rdparty_partner_user_id={user_id}&partner_id=h12media&gdpr_applies={gdpr}&gdpr_consent_string={gdpr_cs}', type: 'image'},
+      {url: 'https://cookiesync.3rdpartypartner.com/?3rdparty_partner_user_id={user_id}&partner_id=h12media&gdpr_applies={gdpr}&gdpr_consent_string={gdpr_cs}', type: 'iframe'}
+    ],
   };
 
   const serverResponse2 = {
-    bids: [{
+    bid: {
       bidId: validBid2.bidId,
       cpm: 0.33,
       width: 300,
       height: 600,
       creativeId: '335566',
       ad: '<div>my ad 2</div>',
-    }]
+    }
   };
 
   function removeElement(id) {
@@ -152,6 +154,10 @@ describe('H12 Media Adapter', function () {
 
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
+    sandbox.stub(frameElement, 'getBoundingClientRect').returns({
+      left: 10,
+      top: 10,
+    });
   });
 
   afterEach(function () {
@@ -186,36 +192,62 @@ describe('H12 Media Adapter', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.include({adunitSize: validBid.mediaTypes.banner.sizes});
+      expect(requestsData).to.include({adunitSize: validBid.mediaTypes.banner.sizes});
     });
 
     it('should return empty bid size', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData2 = requests[1].data.bidrequest;
+
+      expect(requestsData2).to.deep.include({adunitSize: []});
+    });
+
+    it('should return pubsubid from params', function () {
+      createElementVisible(validBid.adUnitCode);
+      createElementVisible(validBid2.adUnitCode);
+      const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
+      const requestsData = requests[0].data.bidrequest;
+      const requestsData2 = requests[1].data.bidrequest;
+
+      expect(requestsData).to.include({pubsubid: 'pubsubtestid'});
+      expect(requestsData2).to.include({pubsubid: ''});
+    });
 
-      expect(requestsData.bidrequests[1]).to.deep.include({adunitSize: []});
+    it('should return empty for incorrect pubsubid from params', function () {
+      createElementVisible(validBid.adUnitCode);
+      createElementVisible(validBid2.adUnitCode);
+      const bidWithPub = {...validBid};
+      bidWithPub.params.pubsubid = 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii'; // More than 32 chars
+      const requests = spec.buildRequests([bidWithPub], bidderRequest);
+      const requestsData = requests[0].data.bidrequest;
+
+      expect(requestsData).to.include({pubsubid: ''});
     });
 
     it('should return bid size from params', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
+      const requestsData2 = requests[1].data.bidrequest;
 
-      expect(requestsData.bidrequests[1]).to.include({size: validBid2.params.size});
+      expect(requestsData).to.include({size: ''});
+      expect(requestsData2).to.include({size: validBid2.params.size});
     });
 
     it('should return GDPR info', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data;
+      const requestsData2 = requests[1].data;
 
       expect(requestsData).to.include({gdpr: true, gdpr_cs: bidderRequest.gdprConsent.consentString});
+      expect(requestsData2).to.include({gdpr: true, gdpr_cs: bidderRequest.gdprConsent.consentString});
     });
 
     it('should not have error on empty GDPR', function () {
@@ -223,9 +255,23 @@ describe('H12 Media Adapter', function () {
       createElementVisible(validBid2.adUnitCode);
       const bidderRequestWithoutGDRP = {...bidderRequest, gdprConsent: null};
       const requests = spec.buildRequests([validBid, validBid2], bidderRequestWithoutGDRP);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data;
+      const requestsData2 = requests[1].data;
 
       expect(requestsData).to.include({gdpr: false});
+      expect(requestsData2).to.include({gdpr: false});
+    });
+
+    it('should not have error on empty USP', function () {
+      createElementVisible(validBid.adUnitCode);
+      createElementVisible(validBid2.adUnitCode);
+      const bidderRequestWithoutUSP = {...bidderRequest, uspConsent: null};
+      const requests = spec.buildRequests([validBid, validBid2], bidderRequestWithoutUSP);
+      const requestsData = requests[0].data;
+      const requestsData2 = requests[1].data;
+
+      expect(requestsData).to.include({usp: false});
+      expect(requestsData2).to.include({usp: false});
     });
 
     it('should create single POST', function () {
@@ -233,7 +279,8 @@ describe('H12 Media Adapter', function () {
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
 
-      expect(requests.method).to.equal('POST');
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[1].method).to.equal('POST');
     });
   });
 
@@ -241,42 +288,44 @@ describe('H12 Media Adapter', function () {
     it('should return coords', function () {
       createElementVisible(validBid.adUnitCode);
       const requests = spec.buildRequests([validBid], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.deep.include({coords: {x: 10, y: 10}});
+      expect(requestsData).to.deep.include({coords: {x: 10, y: 10}});
     });
 
-    it('should define not iframe', function () {
+    it('should define iframe', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data;
+      const requestsData2 = requests[1].data;
 
-      expect(requestsData).to.include({isiframe: false});
+      expect(requestsData).to.include({isiframe: true});
+      expect(requestsData2).to.include({isiframe: true});
     });
 
     it('should define visible element', function () {
       createElementVisible(validBid.adUnitCode);
       const requests = spec.buildRequests([validBid], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.include({ishidden: false});
+      expect(requestsData).to.include({ishidden: false});
     });
 
     it('should define invisible element', function () {
       createElementInvisible(validBid.adUnitCode);
       const requests = spec.buildRequests([validBid], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.include({ishidden: true});
+      expect(requestsData).to.include({ishidden: true});
     });
 
     it('should define hidden element', function () {
       createElementHidden(validBid.adUnitCode);
       const requests = spec.buildRequests([validBid], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.include({ishidden: true});
+      expect(requestsData).to.include({ishidden: true});
     });
   });
 
@@ -290,27 +339,27 @@ describe('H12 Media Adapter', function () {
     it('should return no bids if the response is empty', function () {
       const bidResponse = spec.interpretResponse({ body: [] }, { validBid });
 
-      expect(bidResponse.length).to.equal(0);
+      expect(bidResponse).to.be.empty;
     });
 
     it('should return valid bid responses', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const request = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const bidResponse = spec.interpretResponse({body: serverResponse}, request);
+      const bidResponse = spec.interpretResponse({body: serverResponse}, request[0]);
 
       expect(bidResponse[0]).to.deep.include({
         requestId: validBid.bidId,
-        ad: serverResponse.bids[0].ad,
+        ad: serverResponse.bid.ad,
         mediaType: 'banner',
-        creativeId: serverResponse.bids[0].creativeId,
-        cpm: serverResponse.bids[0].cpm,
-        width: serverResponse.bids[0].width,
-        height: serverResponse.bids[0].height,
+        creativeId: serverResponse.bid.creativeId,
+        cpm: serverResponse.bid.cpm,
+        width: serverResponse.bid.width,
+        height: serverResponse.bid.height,
         currency: 'EUR',
         netRevenue: true,
         ttl: 500,
-        meta: serverResponse.bids[0].meta,
+        meta: serverResponse.bid.meta,
         pubid: validBid.params.pubid
       });
     });
@@ -319,17 +368,17 @@ describe('H12 Media Adapter', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const request = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const bidResponse = spec.interpretResponse({body: serverResponse2}, request);
+      const bidResponse = spec.interpretResponse({body: serverResponse2}, request[0]);
 
       expect(bidResponse[0]).to.deep.include({
         requestId: validBid2.bidId,
-        ad: serverResponse2.bids[0].ad,
+        ad: serverResponse2.bid.ad,
         mediaType: 'banner',
-        creativeId: serverResponse2.bids[0].creativeId,
-        cpm: serverResponse2.bids[0].cpm,
-        width: serverResponse2.bids[0].width,
-        height: serverResponse2.bids[0].height,
-        meta: serverResponse2.bids[0].meta,
+        creativeId: serverResponse2.bid.creativeId,
+        cpm: serverResponse2.bid.cpm,
+        width: serverResponse2.bid.width,
+        height: serverResponse2.bid.height,
+        meta: serverResponse2.bid.meta,
         pubid: validBid2.params.pubid,
         currency: DEFAULT_CURRENCY,
         netRevenue: DEFAULT_NET_REVENUE,
diff --git a/test/spec/modules/hadronAnalyticsAdapter_spec.js b/test/spec/modules/hadronAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..bea131fb78f
--- /dev/null
+++ b/test/spec/modules/hadronAnalyticsAdapter_spec.js
@@ -0,0 +1,60 @@
+import adapterManager from '../../../src/adapterManager.js';
+import hadronAnalyticsAdapter from '../../../modules/hadronAnalyticsAdapter.js';
+import { expect } from 'chai';
+import * as events from '../../../src/events.js';
+import constants from '../../../src/constants.json';
+import { generateUUID } from '../../../src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+
+describe('Hadron analytics adapter', () => {
+  beforeEach(() => {
+    hadronAnalyticsAdapter.enableAnalytics({
+      options: {
+        partnerId: 12349,
+        eventsToTrack: ['auctionInit', 'auctionEnd', 'bidWon',
+          'bidderDone', 'requestBids', 'addAdUnits', 'setTargeting', 'adRenderFailed',
+          'bidResponse', 'bidTimeout', 'bidRequested', 'bidAdjustment', 'nonExistingEvent'
+        ],
+      }
+    });
+  });
+
+  afterEach(() => {
+    hadronAnalyticsAdapter.disableAnalytics();
+  });
+
+  it('registers itself with the adapter manager', () => {
+    const adapter = adapterManager.getAnalyticsAdapter('hadronAnalytics');
+    expect(adapter).to.exist;
+    expect(adapter.gvlid).to.be.a('number');
+    expect(adapter.adapter).to.equal(hadronAnalyticsAdapter);
+  });
+
+  it('tolerates undefined or empty config', () => {
+    hadronAnalyticsAdapter.enableAnalytics(undefined);
+    hadronAnalyticsAdapter.enableAnalytics({});
+  });
+
+  it('sends auction end events to the backend', () => {
+    const auction = {
+      auctionId: generateUUID(),
+      adUnits: [{
+        code: 'usr1234',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600], [728, 90]]
+          }
+        },
+        adUnitCodes: ['usr1234']
+      }],
+    };
+    events.emit(constants.EVENTS.AUCTION_END, auction);
+    assert(server.requests.length > 0)
+    const body = JSON.parse(server.requests[0].requestBody);
+    var eventTypes = [];
+    body.events.forEach(e => eventTypes.push(e.eventType));
+    assert(eventTypes.length > 0)
+    assert(eventTypes.indexOf(constants.EVENTS.AUCTION_END) > -1);
+    hadronAnalyticsAdapter.disableAnalytics();
+  });
+});
diff --git a/test/spec/modules/hadronIdSystem_spec.js b/test/spec/modules/hadronIdSystem_spec.js
new file mode 100644
index 00000000000..ca9eadc7fd4
--- /dev/null
+++ b/test/spec/modules/hadronIdSystem_spec.js
@@ -0,0 +1,57 @@
+import { hadronIdSubmodule, storage } from 'modules/hadronIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+import * as utils from 'src/utils.js';
+
+describe('HadronIdSystem', function () {
+  describe('getId', function() {
+    let getDataFromLocalStorageStub;
+
+    beforeEach(function() {
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(function () {
+      getDataFromLocalStorageStub.restore();
+    });
+
+    it('gets a hadronId', function() {
+      const config = {
+        params: {}
+      };
+      const callbackSpy = sinon.spy();
+      const callback = hadronIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.eq(`https://id.hadron.ad.gt/api/v1/pbhid?partner_id=0&_it=prebid`);
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ hadronId: 'testHadronId1' }));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({hadronId: 'testHadronId1'});
+    });
+
+    it('gets a cached hadronid', function() {
+      const config = {
+        params: {}
+      };
+      getDataFromLocalStorageStub.withArgs('auHadronId').returns('tstCachedHadronId1');
+
+      const callbackSpy = sinon.spy();
+      const callback = hadronIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({hadronId: 'tstCachedHadronId1'});
+    });
+
+    it('allows configurable id url', function() {
+      const config = {
+        params: {
+          url: 'https://hadronid.publync.com'
+        }
+      };
+      const callbackSpy = sinon.spy();
+      const callback = hadronIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.eq('https://hadronid.publync.com?partner_id=0&_it=prebid');
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ hadronId: 'testHadronId1' }));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({hadronId: 'testHadronId1'});
+    });
+  });
+});
diff --git a/test/spec/modules/hadronRtdProvider_spec.js b/test/spec/modules/hadronRtdProvider_spec.js
new file mode 100644
index 00000000000..b9e07c97f84
--- /dev/null
+++ b/test/spec/modules/hadronRtdProvider_spec.js
@@ -0,0 +1,753 @@
+// TODO: this and hadronRtdProvider_spec are a copy-paste of each other
+
+import {config} from 'src/config.js';
+import {HALOID_LOCAL_NAME, RTD_LOCAL_NAME, addRealTimeData, getRealTimeData, hadronSubmodule, storage} from 'modules/hadronRtdProvider.js';
+import {server} from 'test/mocks/xhr.js';
+
+const responseHeader = {'Content-Type': 'application/json'};
+
+describe('hadronRtdProvider', function() {
+  let getDataFromLocalStorageStub;
+
+  beforeEach(function() {
+    config.resetConfig();
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+  });
+
+  afterEach(function () {
+    getDataFromLocalStorageStub.restore();
+  });
+
+  describe('hadronSubmodule', function() {
+    it('successfully instantiates', function () {
+		  expect(hadronSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Add Real-Time Data', function() {
+    it('merges ortb2 data', function() {
+      let rtdConfig = {};
+
+      const setConfigUserObj1 = {
+        name: 'www.dataprovider1.com',
+        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        segment: [{
+          id: '1776'
+        }]
+      };
+
+      const setConfigUserObj2 = {
+        name: 'www.dataprovider2.com',
+        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        segment: [{
+          id: '1914'
+        }]
+      };
+
+      const setConfigSiteObj1 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1812'
+          },
+          {
+            id: '1955'
+          }
+        ]
+      }
+
+      let bidConfig = {
+        ortb2Fragments: {
+          global: {
+            user: {
+              data: [setConfigUserObj1, setConfigUserObj2]
+            },
+            site: {
+              content: {
+                data: [setConfigSiteObj1]
+              }
+            }
+          }
+        }
+      };
+
+      const rtdUserObj1 = {
+        name: 'www.dataprovider4.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1918'
+          },
+          {
+            id: '1939'
+          }
+        ]
+      };
+
+      const rtdSiteObj1 = {
+        name: 'www.dataprovider5.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1945'
+          },
+          {
+            id: '2003'
+          }
+        ]
+      };
+
+      const rtd = {
+        ortb2: {
+          user: {
+            data: [rtdUserObj1]
+          },
+          site: {
+            content: {
+              data: [rtdSiteObj1]
+            }
+          }
+        }
+      };
+
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+
+      let ortb2Config = bidConfig.ortb2Fragments.global;
+
+      expect(ortb2Config.user.data).to.deep.include.members([setConfigUserObj1, setConfigUserObj2, rtdUserObj1]);
+      expect(ortb2Config.site.content.data).to.deep.include.members([setConfigSiteObj1, rtdSiteObj1]);
+    });
+
+    it('merges ortb2 data without duplication', function() {
+      let rtdConfig = {};
+
+      const userObj1 = {
+        name: 'www.dataprovider1.com',
+        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        segment: [{
+          id: '1776'
+        }]
+      };
+
+      const userObj2 = {
+        name: 'www.dataprovider2.com',
+        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        segment: [{
+          id: '1914'
+        }]
+      };
+
+      const siteObj1 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1812'
+          },
+          {
+            id: '1955'
+          }
+        ]
+      }
+
+      let bidConfig = {
+        ortb2Fragments: {
+          global: {
+            user: {
+              data: [userObj1, userObj2]
+            },
+            site: {
+              content: {
+                data: [siteObj1]
+              }
+            }
+          }
+        }
+      };
+
+      const rtd = {
+        ortb2: {
+          user: {
+            data: [userObj1]
+          },
+          site: {
+            content: {
+              data: [siteObj1]
+            }
+          }
+        }
+      };
+
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+
+      let ortb2Config = bidConfig.ortb2Fragments.global;
+
+      expect(ortb2Config.user.data).to.deep.include.members([userObj1, userObj2]);
+      expect(ortb2Config.site.content.data).to.deep.include.members([siteObj1]);
+      expect(ortb2Config.user.data).to.have.lengthOf(2);
+      expect(ortb2Config.site.content.data).to.have.lengthOf(1);
+    });
+
+    it('merges bidder-specific ortb2 data', function() {
+      let rtdConfig = {};
+
+      const configUserObj1 = {
+        name: 'www.dataprovider1.com',
+        ext: { segtax: 3 },
+        segment: [{
+          id: '1776'
+        }]
+      };
+
+      const configUserObj2 = {
+        name: 'www.dataprovider2.com',
+        ext: { segtax: 3 },
+        segment: [{
+          id: '1914'
+        }]
+      };
+
+      const configUserObj3 = {
+        name: 'www.dataprovider1.com',
+        ext: { segtax: 3 },
+        segment: [{
+          id: '2003'
+        }]
+      };
+
+      const configSiteObj1 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          segtax: 1
+        },
+        segment: [
+          {
+            id: '1812'
+          },
+          {
+            id: '1955'
+          }
+        ]
+      };
+
+      const configSiteObj2 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          segtax: 1
+        },
+        segment: [
+          {
+            id: '1812'
+          }
+        ]
+      };
+
+      let bidConfig = {
+        ortb2Fragments: {
+          bidder: {
+            adbuzz: {
+              user: {
+                data: [configUserObj1, configUserObj2]
+              },
+              site: {
+                content: {
+                  data: [configSiteObj1]
+                }
+              }
+            },
+            pubvisage: {
+              user: {
+                data: [configUserObj3]
+              },
+              site: {
+                content: {
+                  data: [configSiteObj2]
+                }
+              }
+            }
+          }
+        }
+      };
+
+      const rtdUserObj1 = {
+        name: 'www.dataprovider4.com',
+        ext: {
+          segtax: 501
+        },
+        segment: [
+          {
+            id: '1918'
+          },
+          {
+            id: '1939'
+          }
+        ]
+      };
+
+      const rtdUserObj2 = {
+        name: 'www.dataprovider2.com',
+        ext: {
+          segtax: 502
+        },
+        segment: [
+          {
+            id: '1939'
+          }
+        ]
+      };
+
+      const rtdSiteObj1 = {
+        name: 'www.dataprovider5.com',
+        ext: {
+          segtax: 1
+        },
+        segment: [
+          {
+            id: '441'
+          },
+          {
+            id: '442'
+          }
+        ]
+      };
+
+      const rtdSiteObj2 = {
+        name: 'www.dataprovider6.com',
+        ext: {
+          segtax: 2
+        },
+        segment: [
+          {
+            id: '676'
+          }
+        ]
+      };
+
+      const rtd = {
+        ortb2b: {
+          adbuzz: {
+            ortb2: {
+              user: {
+                data: [rtdUserObj1]
+              },
+              site: {
+                content: {
+                  data: [rtdSiteObj1]
+                }
+              }
+            }
+          },
+          pubvisage: {
+            ortb2: {
+              user: {
+                data: [rtdUserObj2]
+              },
+              site: {
+                content: {
+                  data: [rtdSiteObj2]
+                }
+              }
+            }
+          }
+        }
+      };
+
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+
+      let ortb2Config = bidConfig.ortb2Fragments.bidder.adbuzz;
+
+      expect(ortb2Config.user.data).to.deep.include.members([configUserObj1, configUserObj2, rtdUserObj1]);
+      expect(ortb2Config.site.content.data).to.deep.include.members([configSiteObj1, rtdSiteObj1]);
+
+      ortb2Config = bidConfig.ortb2Fragments.bidder.pubvisage;
+
+      expect(ortb2Config.user.data).to.deep.include.members([configUserObj3, rtdUserObj2]);
+      expect(ortb2Config.site.content.data).to.deep.include.members([configSiteObj2, rtdSiteObj2]);
+    });
+
+    it('merges bidder-specific ortb2 data without duplication', function() {
+      let rtdConfig = {};
+
+      const userObj1 = {
+        name: 'www.dataprovider1.com',
+        ext: { segtax: 3 },
+        segment: [{
+          id: '1776'
+        }]
+      };
+
+      const userObj2 = {
+        name: 'www.dataprovider2.com',
+        ext: { segtax: 3 },
+        segment: [{
+          id: '1914'
+        }]
+      };
+
+      const userObj3 = {
+        name: 'www.dataprovider1.com',
+        ext: { segtax: 3 },
+        segment: [{
+          id: '2003'
+        }]
+      };
+
+      const siteObj1 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          segtax: 1
+        },
+        segment: [
+          {
+            id: '1812'
+          },
+          {
+            id: '1955'
+          }
+        ]
+      };
+
+      const siteObj2 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          segtax: 1
+        },
+        segment: [
+          {
+            id: '1812'
+          }
+        ]
+      };
+
+      let bidConfig = {
+        ortb2Fragments: {
+          bidder: {
+            adbuzz: {
+              user: {
+                data: [userObj1, userObj2]
+              },
+              site: {
+                content: {
+                  data: [siteObj1]
+                }
+              }
+            },
+            pubvisage: {
+              user: {
+                data: [userObj3]
+              },
+              site: {
+                content: {
+                  data: [siteObj2]
+                }
+              }
+            }
+          }
+        }
+      };
+
+      const rtd = {
+        ortb2b: {
+          adbuzz: {
+            ortb2: {
+              user: {
+                data: [userObj1]
+              },
+              site: {
+                content: {
+                  data: [siteObj1]
+                }
+              }
+            }
+          },
+          pubvisage: {
+            ortb2: {
+              user: {
+                data: [userObj2, userObj3]
+              },
+              site: {
+                content: {
+                  data: [siteObj1, siteObj2]
+                }
+              }
+            }
+          }
+        }
+      };
+
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+
+      let ortb2Config = bidConfig.ortb2Fragments.bidder.adbuzz;
+
+      expect(ortb2Config.user.data).to.deep.include.members([userObj1]);
+      expect(ortb2Config.site.content.data).to.deep.include.members([siteObj1]);
+
+      expect(ortb2Config.user.data).to.have.lengthOf(2);
+      expect(ortb2Config.site.content.data).to.have.lengthOf(1);
+
+      ortb2Config = bidConfig.ortb2Fragments.bidder.pubvisage;
+
+      expect(ortb2Config.user.data).to.deep.include.members([userObj3, userObj3]);
+      expect(ortb2Config.site.content.data).to.deep.include.members([siteObj1, siteObj2]);
+
+      expect(ortb2Config.user.data).to.have.lengthOf(2);
+      expect(ortb2Config.site.content.data).to.have.lengthOf(2);
+    });
+
+    it('allows publisher defined rtd ortb2 logic', function() {
+      const rtdConfig = {
+        params: {
+          handleRtd: function(bidConfig, rtd, rtdConfig, pbConfig) {
+            if (rtd.ortb2.user.data[0].segment[0].id == '1776') {
+              pbConfig.setConfig({ortb2: rtd.ortb2});
+            } else {
+              pbConfig.setConfig({ortb2: {}});
+            }
+          }
+        }
+      };
+
+      let bidConfig = {};
+
+      const rtdUserObj1 = {
+        name: 'www.dataprovider.com',
+        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        segment: [{
+          id: '1776'
+        }]
+      };
+
+      let rtd = {
+        ortb2: {
+          user: {
+            data: [rtdUserObj1]
+          }
+        }
+      };
+
+      config.resetConfig();
+
+      let pbConfig = config.getConfig();
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+      expect(config.getConfig().ortb2.user.data).to.deep.include.members([rtdUserObj1]);
+
+      const rtdUserObj2 = {
+        name: 'www.audigent.com',
+        ext: {
+          segtax: '1',
+          taxprovider: '1'
+        },
+        segment: [{
+          id: 'pubseg1'
+        }]
+      };
+
+      rtd = {
+        ortb2: {
+          user: {
+            data: [rtdUserObj2]
+          }
+        }
+      };
+
+      config.resetConfig();
+
+      pbConfig = config.getConfig();
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+      expect(config.getConfig().ortb2).to.deep.equal({});
+    });
+
+    it('allows publisher defined adunit logic', function() {
+      const rtdConfig = {
+        params: {
+          handleRtd: function(bidConfig, rtd, rtdConfig, pbConfig) {
+            var adUnits = bidConfig.adUnits;
+            for (var i = 0; i < adUnits.length; i++) {
+              var adUnit = adUnits[i];
+              for (var j = 0; j < adUnit.bids.length; j++) {
+                var bid = adUnit.bids[j];
+                if (bid.bidder == 'adBuzz') {
+                  for (var k = 0; k < rtd.adBuzz.length; k++) {
+                    bid.adBuzzData.segments.adBuzz.push(rtd.adBuzz[k]);
+                  }
+                } else if (bid.bidder == 'trueBid') {
+                  for (var k = 0; k < rtd.trueBid.length; k++) {
+                    bid.trueBidSegments.push(rtd.trueBid[k]);
+                  }
+                }
+              }
+            }
+          }
+        }
+      };
+
+      let bidConfig = {
+        adUnits: [
+          {
+            bids: [
+              {
+                bidder: 'adBuzz',
+                adBuzzData: {
+                  segments: {
+                    adBuzz: [
+                      {
+                        id: 'adBuzzSeg1'
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                bidder: 'trueBid',
+                trueBidSegments: []
+              }
+            ]
+          }
+        ]
+      };
+
+      const rtd = {
+        adBuzz: [{id: 'adBuzzSeg2'}, {id: 'adBuzzSeg3'}],
+        trueBid: [{id: 'truebidSeg1'}, {id: 'truebidSeg2'}, {id: 'truebidSeg3'}]
+      };
+
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+
+      expect(bidConfig.adUnits[0].bids[0].adBuzzData.segments.adBuzz[0].id).to.equal('adBuzzSeg1');
+      expect(bidConfig.adUnits[0].bids[0].adBuzzData.segments.adBuzz[1].id).to.equal('adBuzzSeg2');
+      expect(bidConfig.adUnits[0].bids[0].adBuzzData.segments.adBuzz[2].id).to.equal('adBuzzSeg3');
+      expect(bidConfig.adUnits[0].bids[1].trueBidSegments[0].id).to.equal('truebidSeg1');
+      expect(bidConfig.adUnits[0].bids[1].trueBidSegments[1].id).to.equal('truebidSeg2');
+      expect(bidConfig.adUnits[0].bids[1].trueBidSegments[2].id).to.equal('truebidSeg3');
+    });
+  });
+
+  describe('Get Real-Time Data', function() {
+    it('gets rtd from local storage cache', function() {
+      const rtdConfig = {
+        params: {
+          segmentCache: true
+        }
+      };
+
+      const bidConfig = {ortb2Fragments: {global: {}}};
+
+      const rtdUserObj1 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1918'
+          },
+          {
+            id: '1939'
+          }
+        ]
+      };
+
+      const cachedRtd = {
+        rtd: {
+          ortb2: {
+            user: {
+              data: [rtdUserObj1]
+            }
+          }
+        }
+      };
+
+      getDataFromLocalStorageStub.withArgs(RTD_LOCAL_NAME).returns(JSON.stringify(cachedRtd));
+
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+    });
+
+    it('gets real-time data via async request', function() {
+      const setConfigSiteObj1 = {
+        name: 'www.audigent.com',
+        ext: {
+          segtax: '1',
+          taxprovider: '1'
+        },
+        segment: [
+          {
+            id: 'pubseg1'
+          },
+          {
+            id: 'pubseg2'
+          }
+        ]
+      }
+
+      const rtdConfig = {
+        params: {
+          segmentCache: false,
+          usePubHadron: true,
+          requestParams: {
+            publisherId: 'testPub1'
+          }
+        }
+      };
+
+      let bidConfig = {
+        ortb2Fragments: {
+          global: {
+            site: {
+              content: {
+                data: [setConfigSiteObj1]
+              }
+            }
+          }
+        }
+      };
+
+      const rtdUserObj1 = {
+        name: 'www.audigent.com',
+        ext: {
+          segtax: '1',
+          taxprovider: '1'
+        },
+        segment: [
+          {
+            id: 'pubseg1'
+          },
+          {
+            id: 'pubseg2'
+          }
+        ]
+      };
+
+      const data = {
+        rtd: {
+          ortb2: {
+            user: {
+              data: [rtdUserObj1]
+            }
+          }
+        }
+      };
+
+      getDataFromLocalStorageStub.withArgs(HALOID_LOCAL_NAME).returns('testHadronId1');
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+
+      let request = server.requests[0];
+      let postData = JSON.parse(request.requestBody);
+      expect(postData.config).to.have.deep.property('publisherId', 'testPub1');
+      expect(postData.userIds).to.have.deep.property('hadronId', 'testHadronId1');
+
+      request.respond(200, responseHeader, JSON.stringify(data));
+
+      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+    });
+  });
+});
diff --git a/test/spec/modules/holidBidAdapter_spec.js b/test/spec/modules/holidBidAdapter_spec.js
new file mode 100644
index 00000000000..e18a5ac58f4
--- /dev/null
+++ b/test/spec/modules/holidBidAdapter_spec.js
@@ -0,0 +1,165 @@
+import { expect } from 'chai'
+import { spec } from 'modules/holidBidAdapter.js'
+
+describe('holidBidAdapterTests', () => {
+  const bidRequestData = {
+    bidder: 'holid',
+    adUnitCode: 'test-div',
+    bidId: 'bid-id',
+    auctionId: 'test-id',
+    params: { adUnitID: '12345' },
+    mediaTypes: { banner: {} },
+    sizes: [[300, 250]],
+    ortb2: {
+      site: {
+        publisher: {
+          domain: 'https://foo.bar',
+        }
+      },
+      regs: {
+        gdpr: 1,
+      },
+      user: {
+        ext: {
+          consent: 'G4ll0p1ng_Un1c0rn5',
+        }
+      },
+      device: {
+        h: 410,
+        w: 1860,
+      }
+    }
+  }
+
+  describe('isBidRequestValid', () => {
+    const bid = JSON.parse(JSON.stringify(bidRequestData))
+
+    it('should return true', () => {
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', () => {
+      const bid = JSON.parse(JSON.stringify(bidRequestData))
+      delete bid.params.adUnitID
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', () => {
+    const bid = JSON.parse(JSON.stringify(bidRequestData))
+    const request = spec.buildRequests([bid], bid)
+    const payload = JSON.parse(request[0].data)
+
+    it('should include ext in imp', () => {
+      expect(payload.imp[0].ext).to.exist
+      expect(payload.imp[0].ext).to.deep.equal({
+        prebid: { storedrequest: { id: '12345' } },
+      })
+    })
+
+    it('should include banner format in imp', () => {
+      expect(payload.imp[0].banner).to.exist
+      expect(payload.imp[0].banner).to.deep.equal({
+        format: [{ w: 300, h: 250 }],
+      })
+    })
+
+    it('should include ortb2 first party data', () => {
+      expect(payload.device.w).to.equal(1860)
+      expect(payload.device.h).to.equal(410)
+      expect(payload.user.ext.consent).to.equal('G4ll0p1ng_Un1c0rn5')
+      expect(payload.regs.gdpr).to.equal(1)
+    })
+  })
+
+  describe('interpretResponse', () => {
+    const serverResponse = {
+      body: {
+        id: 'test-id',
+        cur: 'USD',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: 'testbidid',
+                price: 0.4,
+                adm: 'test-ad',
+                adid: 789456,
+                crid: 1234,
+                w: 300,
+                h: 250,
+              },
+            ],
+          },
+        ],
+      },
+    }
+
+    const interpretedResponse = spec.interpretResponse(
+      serverResponse,
+      bidRequestData
+    )
+
+    it('should interpret response', () => {
+      expect(interpretedResponse[0].requestId).to.equal(bidRequestData.bidId)
+      expect(interpretedResponse[0].cpm).to.equal(
+        serverResponse.body.seatbid[0].bid[0].price
+      )
+      expect(interpretedResponse[0].ad).to.equal(
+        serverResponse.body.seatbid[0].bid[0].adm
+      )
+      expect(interpretedResponse[0].creativeId).to.equal(
+        serverResponse.body.seatbid[0].bid[0].crid
+      )
+      expect(interpretedResponse[0].width).to.equal(
+        serverResponse.body.seatbid[0].bid[0].w
+      )
+      expect(interpretedResponse[0].height).to.equal(
+        serverResponse.body.seatbid[0].bid[0].h
+      )
+      expect(interpretedResponse[0].currency).to.equal(serverResponse.body.cur)
+    })
+  })
+
+  describe('getUserSyncs', () => {
+    it('should return user sync', () => {
+      const optionsType = {
+        iframeEnabled: true,
+        pixelEnabled: true,
+      }
+      const serverResponse = [
+        {
+          body: {
+            ext: {
+              responsetimemillis: {
+                'test seat 1': 2,
+                'test seat 2': 1,
+              },
+            },
+          },
+        },
+      ]
+      const gdprConsent = {
+        gdprApplies: 1,
+        consentString: 'dkj49Sjmfjuj34as:12jaf90123hufabidfy9u23brfpoig',
+      }
+      const uspConsent = 'mkjvbiniwot4827obfoy8sdg8203gb'
+      const expectedUserSyncs = [
+        {
+          type: 'iframe',
+          url: 'https://null.holid.io/sync.html?bidders=%5B%22test%20seat%201%22%2C%22test%20seat%202%22%5D&gdpr=1&gdpr_consent=dkj49Sjmfjuj34as:12jaf90123hufabidfy9u23brfpoig&usp_consent=mkjvbiniwot4827obfoy8sdg8203gb&type=iframe',
+        },
+      ]
+
+      const userSyncs = spec.getUserSyncs(
+        optionsType,
+        serverResponse,
+        gdprConsent,
+        uspConsent
+      )
+
+      expect(userSyncs).to.deep.equal(expectedUserSyncs)
+    })
+  })
+})
diff --git a/test/spec/modules/hpmdnetworkBidAdapter_spec.js b/test/spec/modules/hpmdnetworkBidAdapter_spec.js
deleted file mode 100644
index 9023fb248e9..00000000000
--- a/test/spec/modules/hpmdnetworkBidAdapter_spec.js
+++ /dev/null
@@ -1,148 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/hpmdnetworkBidAdapter.js';
-
-describe('HPMDNetwork Adapter', function() {
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found', function () {
-      const validBid = {
-        bidder: 'hpmdnetwork',
-        params: {
-          placementId: '1'
-        }
-      };
-
-      expect(spec.isBidRequestValid(validBid)).to.equal(true);
-    });
-
-    it('should return false for when required params are not passed', function () {
-      const invalidBid = {
-        bidder: 'hpmdnetwork',
-        params: {}
-      };
-
-      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bidRequests = [
-      {
-        bidId: 'bid1',
-        bidder: 'hpmdnetwork',
-        params: {
-          placementId: '1'
-        }
-      },
-      {
-        bidId: 'bid2',
-        bidder: 'hpmdnetwork',
-        params: {
-          placementId: '2',
-        }
-      }
-    ];
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://example.com?foo=bar'
-      }
-    };
-
-    const bidRequest = spec.buildRequests(bidRequests, bidderRequest);
-
-    it('should build single POST request for multiple bids', function() {
-      expect(bidRequest.method).to.equal('POST');
-      expect(bidRequest.url).to.equal('https://banner.hpmdnetwork.ru/bidder/request');
-      expect(bidRequest.data).to.be.an('object');
-      expect(bidRequest.data.places).to.be.an('array');
-      expect(bidRequest.data.places).to.have.lengthOf(2);
-    });
-
-    it('should pass bid parameters', function() {
-      const place1 = bidRequest.data.places[0];
-      const place2 = bidRequest.data.places[1];
-
-      expect(place1.placementId).to.equal('1');
-      expect(place2.placementId).to.equal('2');
-      expect(place1.id).to.equal('bid1');
-      expect(place2.id).to.equal('bid2');
-    });
-
-    it('should pass site parameters', function() {
-      const url = bidRequest.data.url;
-
-      expect(url).to.be.an('String');
-      expect(url).to.equal('https://example.com?foo=bar');
-    });
-
-    it('should pass settings', function() {
-      const settings = bidRequest.data.settings;
-
-      expect(settings).to.be.an('object');
-      expect(settings.currency).to.equal('RUB');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const serverResponse = {
-      body: {
-        'bids':
-          [
-            {
-              'cpm': 20,
-              'currency': 'RUB',
-              'displayUrl': 'https://banner.hpmdnetwork.ru/bidder/display?dbid=0&vbid=168',
-              'id': '1',
-              'creativeId': '11111',
-            },
-            {
-              'cpm': 30,
-              'currency': 'RUB',
-              'displayUrl': 'https://banner.hpmdnetwork.ru/bidder/display?dbid=0&vbid=170',
-              'id': '2',
-              'creativeId': '22222',
-              'width': 300,
-              'height': 250,
-            },
-          ]
-      }
-    };
-
-    const bids = spec.interpretResponse(serverResponse);
-
-    it('should return empty array for response with no bids', function() {
-      const emptyBids = spec.interpretResponse({ body: {} });
-
-      expect(emptyBids).to.have.lengthOf(0);
-    });
-
-    it('should parse all bids from response', function() {
-      expect(bids).to.have.lengthOf(2);
-    });
-
-    it('should parse bid without sizes', function() {
-      expect(bids[0].requestId).to.equal('1');
-      expect(bids[0].cpm).to.equal(20);
-      expect(bids[0].width).to.equal(1);
-      expect(bids[0].height).to.equal(1);
-      expect(bids[0].ttl).to.equal(300);
-      expect(bids[0].currency).to.equal('RUB');
-      expect(bids[0]).to.have.property('creativeId');
-      expect(bids[0].creativeId).to.equal('11111');
-      expect(bids[0].netRevenue).to.equal(true);
-      expect(bids[0].ad).to.include('<script async src="https://banner.hpmdnetwork.ru/bidder/display?dbid=0&vbid=168"></script>');
-    });
-
-    it('should parse bid with sizes', function() {
-      expect(bids[1].requestId).to.equal('2');
-      expect(bids[1].cpm).to.equal(30);
-      expect(bids[1].width).to.equal(300);
-      expect(bids[1].height).to.equal(250);
-      expect(bids[1].ttl).to.equal(300);
-      expect(bids[1].currency).to.equal('RUB');
-      expect(bids[1]).to.have.property('creativeId');
-      expect(bids[1].creativeId).to.equal('22222');
-      expect(bids[1].netRevenue).to.equal(true);
-      expect(bids[1].ad).to.include('<script async src="https://banner.hpmdnetwork.ru/bidder/display?dbid=0&vbid=170"></script>');
-    });
-  });
-});
diff --git a/test/spec/modules/hybridBidAdapter_spec.js b/test/spec/modules/hybridBidAdapter_spec.js
index e5ad878c9b1..6c98264c06f 100644
--- a/test/spec/modules/hybridBidAdapter_spec.js
+++ b/test/spec/modules/hybridBidAdapter_spec.js
@@ -15,7 +15,7 @@ function getSlotConfigs(mediaTypes, params) {
 describe('Hybrid.ai Adapter', function() {
   const PLACE_ID = '5af45ad34d506ee7acad0c26';
   const bidderRequest = {
-    refererInfo: { referer: 'referer' }
+    refererInfo: { page: 'referer' }
   }
   const bannerMandatoryParams = {
     placeId: PLACE_ID,
@@ -25,16 +25,22 @@ describe('Hybrid.ai Adapter', function() {
     placeId: PLACE_ID,
     placement: 'video'
   }
+  const inImageMandatoryParams = {
+    placeId: PLACE_ID,
+    placement: 'inImage',
+    imageUrl: 'https://hybrid.ai/images/image.jpg'
+  }
   const validBidRequests = [
     getSlotConfigs({ banner: {} }, bannerMandatoryParams),
-    getSlotConfigs({ video: {playerSize: [[640, 480]]} }, videoMandatoryParams)
+    getSlotConfigs({ video: {playerSize: [[640, 480]], context: 'outstream'} }, videoMandatoryParams),
+    getSlotConfigs({ banner: {sizes: [0, 0]} }, inImageMandatoryParams)
   ]
   describe('isBidRequestValid method', function() {
     describe('returns true', function() {
       describe('when banner slot config has all mandatory params', () => {
-        describe('and placement has the correct value', function() {
+        describe('and banner placement has the correct value', function() {
           const slotConfig = getSlotConfigs(
-            { banner: {} },
+            {banner: {}},
             {
               placeId: PLACE_ID,
               placement: 'banner'
@@ -43,6 +49,22 @@ describe('Hybrid.ai Adapter', function() {
           const isBidRequestValid = spec.isBidRequestValid(slotConfig)
           expect(isBidRequestValid).to.equal(true)
         })
+        describe('and In-Image placement has the correct value', function() {
+          const slotConfig = getSlotConfigs(
+            {
+              banner: {
+                sizes: [[0, 0]]
+              }
+            },
+            {
+              placeId: PLACE_ID,
+              placement: 'inImage',
+              imageUrl: 'imageUrl'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
         describe('when video slot has all mandatory params.', function() {
           it('should return true, when video mediatype object are correct.', function() {
             const slotConfig = getSlotConfigs(
@@ -84,6 +106,15 @@ describe('Hybrid.ai Adapter', function() {
           )
           expect(isBidRequestValid).to.equal(false)
         })
+        it('does not have the imageUrl.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placeId: PLACE_ID,
+              placement: 'inImage'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
         it('does not have a the correct placement.', function() {
           const isBidRequestValid = spec.isBidRequestValid(
             createSlotconfig({
@@ -224,7 +255,8 @@ describe('Hybrid.ai Adapter', function() {
                   currency: 'USD',
                   content: 'html',
                   width: 100,
-                  height: 100
+                  height: 100,
+                  advertiserDomains: ['hybrid.ai']
                 }
               ]
             }
@@ -238,6 +270,37 @@ describe('Hybrid.ai Adapter', function() {
           expect(bids[0].height).to.equal(100)
           expect(bids[0].currency).to.equal('USD')
           expect(bids[0].netRevenue).to.equal(true)
+          expect(bids[0].meta.advertiserDomains).to.deep.equal(['hybrid.ai'])
+          expect(typeof bids[0].ad).to.equal('string')
+        })
+        it('should return a In-Image bid', function() {
+          const request = spec.buildRequests([validBidRequests[2]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: 'html',
+                  inImage: {
+                    actionUrls: {}
+                  },
+                  width: 100,
+                  height: 100,
+                  ttl: 360
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].width).to.equal(100)
+          expect(bids[0].height).to.equal(100)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
           expect(typeof bids[0].ad).to.equal('string')
         })
       })
@@ -253,7 +316,8 @@ describe('Hybrid.ai Adapter', function() {
                   currency: 'USD',
                   content: 'html',
                   width: 100,
-                  height: 100
+                  height: 100,
+                  transactionId: '31a58515-3634-4e90-9c96-f86196db1459'
                 }
               ]
             }
diff --git a/test/spec/modules/iasBidAdapter_spec.js b/test/spec/modules/iasBidAdapter_spec.js
deleted file mode 100644
index 1743ac947e6..00000000000
--- a/test/spec/modules/iasBidAdapter_spec.js
+++ /dev/null
@@ -1,343 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/iasBidAdapter.js';
-
-describe('iasBidAdapter is an adapter that', function () {
-  it('has the correct bidder code', function () {
-    expect(spec.code).to.equal('ias');
-  });
-  describe('has a method `isBidRequestValid` that', function () {
-    it('exists', function () {
-      expect(spec.isBidRequestValid).to.be.a('function');
-    });
-    it('returns false if bid params misses `pubId`', function () {
-      expect(spec.isBidRequestValid(
-        {
-          params: {
-            adUnitPath: 'someAdUnitPath'
-          }
-        })).to.equal(false);
-    });
-    it('returns false if bid params misses `adUnitPath`', function () {
-      expect(spec.isBidRequestValid(
-        {
-          params: {
-            pubId: 'somePubId'
-          }
-        })).to.equal(false);
-    });
-    it('returns true otherwise', function () {
-      expect(spec.isBidRequestValid(
-        {
-          params: {
-            adUnitPath: 'someAdUnitPath',
-            pubId: 'somePubId',
-            someOtherParam: 'abc'
-          }
-        })).to.equal(true);
-    });
-  });
-
-  describe('has a method `buildRequests` that', function () {
-    it('exists', function () {
-      expect(spec.buildRequests).to.be.a('function');
-    });
-    describe('given bid requests, returns a `ServerRequest` instance that', function () {
-      let bidRequests, IAS_HOST;
-      beforeEach(function () {
-        IAS_HOST = 'https://pixel.adsafeprotected.com/services/pub';
-        bidRequests = [
-          {
-            adUnitCode: 'one-div-id',
-            auctionId: 'someAuctionId',
-            bidId: 'someBidId',
-            bidder: 'ias',
-            bidderRequestId: 'someBidderRequestId',
-            params: {
-              pubId: '1234',
-              adUnitPath: '/a/b/c'
-            },
-            sizes: [
-              [10, 20],
-              [300, 400]
-            ],
-            transactionId: 'someTransactionId'
-          },
-          {
-            adUnitCode: 'two-div-id',
-            auctionId: 'someAuctionId',
-            bidId: 'someBidId',
-            bidder: 'ias',
-            bidderRequestId: 'someBidderRequestId',
-            params: {
-              pubId: '1234',
-              adUnitPath: '/d/e/f'
-            },
-            sizes: [
-              [50, 60]
-            ],
-            transactionId: 'someTransactionId'
-          }
-        ];
-      });
-      it('has property `method` of `GET`', function () {
-        expect(spec.buildRequests(bidRequests)).to.deep.include({
-          method: 'GET'
-        });
-      });
-      it('has property `url` to be the correct IAS endpoint', function () {
-        expect(spec.buildRequests(bidRequests)).to.deep.include({
-          url: IAS_HOST
-        });
-      });
-      it('only includes the first `bidRequest` as the bidRequest variable on a multiple slot request', function () {
-        expect(spec.buildRequests(bidRequests).bidRequest.adUnitCode).to.equal(bidRequests[0].adUnitCode);
-      });
-      describe('has property `data` that is an encode query string containing information such as', function () {
-        let val;
-        const ANID_PARAM = 'anId';
-        const SLOT_PARAM = 'slot';
-        const SLOT_ID_PARAM = 'id';
-        const SLOT_SIZE_PARAM = 'ss';
-        const SLOT_AD_UNIT_PATH_PARAM = 'p';
-
-        beforeEach(function () {
-          val = decodeURI(spec.buildRequests(bidRequests).data);
-        });
-        it('publisher id', function () {
-          expect(val).to.have.string(`${ANID_PARAM}=1234`);
-        });
-        it('ad slot`s id, size and ad unit path', function () {
-          expect(val).to.have.string(`${SLOT_PARAM}={${SLOT_ID_PARAM}:one-div-id,${SLOT_SIZE_PARAM}:[10.20,300.400],${SLOT_AD_UNIT_PATH_PARAM}:/a/b/c}`);
-          expect(val).to.have.string(`${SLOT_PARAM}={${SLOT_ID_PARAM}:two-div-id,${SLOT_SIZE_PARAM}:[50.60],${SLOT_AD_UNIT_PATH_PARAM}:/d/e/f}`);
-        });
-        it('window size', function () {
-          expect(val).to.match(/.*wr=[0-9]*\.[0-9]*/);
-        });
-        it('screen size', function () {
-          expect(val).to.match(/.*sr=[0-9]*\.[0-9]*/);
-        });
-        it('url value', function () {
-          expect(val).to.match(/.*url=https?%3A%2F%2F[^\s$.?#].[^\s]*/);
-        });
-      });
-      it('has property `bidRequest` that is the first passed in bid request', function () {
-        expect(spec.buildRequests(bidRequests)).to.deep.include({
-          bidRequest: bidRequests[0]
-        });
-      });
-    });
-  });
-  describe('has a method `interpretResponse` that', function () {
-    it('exists', function () {
-      expect(spec.interpretResponse).to.be.a('function');
-    });
-    describe('returns a list of bid response that', function () {
-      let bidRequests, bidResponse, slots, serverResponse;
-      beforeEach(function () {
-        bidRequests = [
-          {
-            adUnitCode: 'one-div-id',
-            auctionId: 'someAuctionId',
-            bidId: 'someBidId1',
-            bidder: 'ias',
-            bidderRequestId: 'someBidderRequestId',
-            params: {
-              pubId: '1234',
-              adUnitPath: '/a/b/c'
-            },
-            sizes: [
-              [10, 20],
-              [300, 400]
-            ],
-            transactionId: 'someTransactionId'
-          },
-          {
-            adUnitCode: 'two-div-id',
-            auctionId: 'someAuctionId',
-            bidId: 'someBidId2',
-            bidder: 'ias',
-            bidderRequestId: 'someBidderRequestId',
-            params: {
-              pubId: '1234',
-              adUnitPath: '/d/e/f'
-            },
-            sizes: [
-              [50, 60]
-            ],
-            transactionId: 'someTransactionId'
-          }
-        ];
-        const request = {
-          bidRequest: {
-            bidId: '102938'
-          }
-        };
-        slots = {};
-        slots['test-div-id'] = {
-          id: '1234',
-          vw: ['60', '70']
-        };
-        slots['test-div-id-two'] = {
-          id: '5678',
-          vw: ['80', '90']
-        };
-        serverResponse = {
-          body: {
-            brandSafety: {
-              adt: 'adtVal',
-              alc: 'alcVal',
-              dlm: 'dlmVal',
-              drg: 'drgVal',
-              hat: 'hatVal',
-              off: 'offVal',
-              vio: 'vioVal'
-            },
-            fr: 'false',
-            slots: slots
-          },
-          headers: {}
-        };
-        bidResponse = spec.interpretResponse(serverResponse, request);
-      });
-      it('has IAS keyword `adt` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ adt: 'adtVal' });
-      });
-      it('has IAS keyword `alc` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ alc: 'alcVal' });
-      });
-      it('has IAS keyword `dlm` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ dlm: 'dlmVal' });
-      });
-      it('has IAS keyword `drg` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ drg: 'drgVal' });
-      });
-      it('has IAS keyword `hat` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ hat: 'hatVal' });
-      });
-      it('has IAS keyword `off` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ off: 'offVal' });
-      });
-      it('has IAS keyword `vio` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ vio: 'vioVal' });
-      });
-      it('has IAS keyword `fr` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ fr: 'false' });
-      });
-      it('has property `slots`', function () {
-        expect(bidResponse[0]).to.deep.include({ slots: slots });
-      });
-      it('response is the same for multiple slots', function () {
-        var adapter = spec;
-        var requests = adapter.buildRequests(bidRequests);
-        expect(adapter.interpretResponse(serverResponse, requests)).to.length(2);
-      });
-    });
-    describe('returns a list of bid response that with custom value', function () {
-      let bidRequests, bidResponse, slots, custom, serverResponse;
-      beforeEach(function () {
-        bidRequests = [
-          {
-            adUnitCode: 'one-div-id',
-            auctionId: 'someAuctionId',
-            bidId: 'someBidId1',
-            bidder: 'ias',
-            bidderRequestId: 'someBidderRequestId',
-            params: {
-              pubId: '1234',
-              adUnitPath: '/a/b/c'
-            },
-            sizes: [
-              [10, 20],
-              [300, 400]
-            ],
-            transactionId: 'someTransactionId'
-          },
-          {
-            adUnitCode: 'two-div-id',
-            auctionId: 'someAuctionId',
-            bidId: 'someBidId2',
-            bidder: 'ias',
-            bidderRequestId: 'someBidderRequestId',
-            params: {
-              pubId: '1234',
-              adUnitPath: '/d/e/f'
-            },
-            sizes: [
-              [50, 60]
-            ],
-            transactionId: 'someTransactionId'
-          }
-        ];
-        const request = {
-          bidRequest: {
-            bidId: '102938'
-          }
-        };
-        slots = {};
-        slots['test-div-id'] = {
-          id: '1234',
-          vw: ['60', '70']
-        };
-        slots['test-div-id-two'] = {
-          id: '5678',
-          vw: ['80', '90']
-        };
-        custom = {};
-        custom['ias-kw'] = ['IAS_1_KW', 'IAS_2_KW'];
-        serverResponse = {
-          body: {
-            brandSafety: {
-              adt: 'adtVal',
-              alc: 'alcVal',
-              dlm: 'dlmVal',
-              drg: 'drgVal',
-              hat: 'hatVal',
-              off: 'offVal',
-              vio: 'vioVal'
-            },
-            fr: 'false',
-            slots: slots,
-            custom: custom
-          },
-          headers: {}
-        };
-        bidResponse = spec.interpretResponse(serverResponse, request);
-      });
-      it('has IAS keyword `adt` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ adt: 'adtVal' });
-      });
-      it('has IAS keyword `alc` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ alc: 'alcVal' });
-      });
-      it('has IAS keyword `dlm` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ dlm: 'dlmVal' });
-      });
-      it('has IAS keyword `drg` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ drg: 'drgVal' });
-      });
-      it('has IAS keyword `hat` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ hat: 'hatVal' });
-      });
-      it('has IAS keyword `off` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ off: 'offVal' });
-      });
-      it('has IAS keyword `vio` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ vio: 'vioVal' });
-      });
-      it('has IAS keyword `fr` as property', function () {
-        expect(bidResponse[0]).to.deep.include({ fr: 'false' });
-      });
-      it('has property `slots`', function () {
-        expect(bidResponse[0]).to.deep.include({ slots: slots });
-      });
-      it('has property `custom`', function () {
-        expect(bidResponse[0]).to.deep.include({ custom: custom });
-      });
-      it('response is the same for multiple slots', function () {
-        var adapter = spec;
-        var requests = adapter.buildRequests(bidRequests);
-        expect(adapter.interpretResponse(serverResponse, requests)).to.length(3);
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/iasRtdProvider_spec.js b/test/spec/modules/iasRtdProvider_spec.js
new file mode 100644
index 00000000000..ec4d2bd437a
--- /dev/null
+++ b/test/spec/modules/iasRtdProvider_spec.js
@@ -0,0 +1,238 @@
+import { iasSubModule, iasTargeting } from 'modules/iasRtdProvider.js';
+import { expect } from 'chai';
+import { server } from 'test/mocks/xhr.js';
+
+const responseHeader = { 'Content-Type': 'application/json' };
+
+describe('iasRtdProvider is a RTD provider that', function () {
+  it('has the correct module name', function () {
+    expect(iasSubModule.name).to.equal('ias');
+  });
+  describe('has a method `init` that', function () {
+    it('exists', function () {
+      expect(iasSubModule.init).to.be.a('function');
+    });
+    it('returns false missing config params', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(false);
+    });
+    it('returns false missing pubId param', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {}
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(false);
+    });
+    it('returns true with only the pubId param', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {
+          pubId: '123456'
+        }
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(true);
+    });
+    it('returns true with the pubId and keyMappings params', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {
+          pubId: '123456',
+          keyMappings: {
+            'id': 'ias_id'
+          }
+        }
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(true);
+    });
+    it('returns true with the pubId, keyMappings and adUnitPath params', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {
+          pubId: '123456',
+          keyMappings: {
+            'id': 'ias_id'
+          },
+          adUnitPath: {'one-div-id': '/012345/ad/unit/path'}
+        }
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(true);
+    });
+    it('returns true with the pubId and adUnitPath params with multiple keys', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {
+          pubId: '123456',
+          keyMappings: {
+            'id': 'ias_id'
+          },
+          adUnitPath: {
+            'one-div-id': '/012345/ad/unit/path',
+            'another-div-id': '/012345/ad/unit/path',
+            'third-div-id': '/012345/another/ad/unit/path'
+          }
+        }
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(true);
+    });
+    it('returns true with the pubId and adUnitPath params with empty values', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {
+          pubId: '123456',
+          keyMappings: {
+            'id': 'ias_id'
+          },
+          adUnitPath: {
+            'one-div-id': '/012345/ad/unit/path',
+            'another-div-id': '',
+            'third-div-id': ''
+          }
+        }
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(true);
+    });
+  });
+  describe('has a method `getBidRequestData` that', function () {
+    it('exists', function () {
+      expect(iasSubModule.getBidRequestData).to.be.a('function');
+    });
+    it('verify config params', function () {
+      expect(config.name).to.not.be.undefined;
+      expect(config.name).to.equal('ias');
+      expect(config.params.pubId).to.not.be.undefined;
+      expect(config.params).to.have.property('pubId');
+    });
+    it('invoke method', function () {
+      const callback = sinon.spy();
+      let request;
+      const adUnitsOriginal = adUnits;
+      iasSubModule.getBidRequestData({ adUnits: adUnits }, callback, config);
+      request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(data));
+      expect(request.url).to.be.include(`https://pixel.adsafeprotected.com/services/pub?anId=1234`);
+      expect(request.url).to.be.include('url=https%253A%252F%252Fintegralads.com%252Ftest')
+      expect(adUnits).to.length(2);
+      expect(adUnits[0]).to.be.eq(adUnitsOriginal[0]);
+      const targetingKeys = Object.keys(iasTargeting);
+      const dataKeys = Object.keys(data);
+      expect(targetingKeys.length).to.equal(dataKeys.length);
+      expect(targetingKeys['fr']).to.be.eq(dataKeys['fr']);
+      expect(targetingKeys['brandSafety']).to.be.eq(dataKeys['brandSafety']);
+      expect(targetingKeys['ias-kw']).to.be.eq(dataKeys['ias-kw']);
+      expect(targetingKeys['slots']).to.be.eq(dataKeys['slots']);
+    });
+  });
+
+  describe('has a method `getTargetingData` that', function () {
+    it('exists', function () {
+      expect(iasSubModule.getTargetingData).to.be.a('function');
+    });
+    describe('invoke method', function () {
+      it('returns a targeting object with the right shape', function () {
+        const targeting = iasSubModule.getTargetingData(adUnitsCode, config);
+        expect(adUnitsCode).to.length(2);
+        expect(targeting).to.be.not.null;
+        expect(targeting).to.be.not.empty;
+        expect(targeting['one-div-id']).to.be.not.null;
+      });
+      it('returns the right keys', function () {
+        const targeting = iasSubModule.getTargetingData(adUnitsCode, config);
+        const targetingKeys = Object.keys(targeting['one-div-id']);
+        expect(targetingKeys.length).to.equal(10);
+        expect(targetingKeys).to.include('adt', 'adt key missing from the targeting object');
+        expect(targetingKeys).to.include('alc', 'alc key missing from the targeting object');
+        expect(targetingKeys).to.include('dlm', 'dlm key missing from the targeting object');
+        expect(targetingKeys).to.include('drg', 'drg key missing from the targeting object');
+        expect(targetingKeys).to.include('hat', 'hat key missing from the targeting object');
+        expect(targetingKeys).to.include('off', 'off key missing from the targeting object');
+        expect(targetingKeys).to.include('vio', 'vio key missing from the targeting object');
+        expect(targetingKeys).to.include('fr', 'fr key missing from the targeting object');
+        expect(targetingKeys).to.include('ias-kw', 'ias-kw key missing from the targeting object');
+        expect(targetingKeys).to.not.include('id', 'id key present in the targeting object, should have been renamed to ias_id');
+        expect(targetingKeys).to.include('ias_id', 'ias_id key missing from the targeting object');
+      });
+      it('returns the right values', function () {
+        const targeting = iasSubModule.getTargetingData(adUnitsCode, config);
+        expect(targeting['one-div-id']['adt']).to.be.eq('veryLow');
+        expect(targeting['one-div-id']['alc']).to.be.eq('veryLow');
+        expect(targeting['one-div-id']['dlm']).to.be.eq('veryLow');
+        expect(targeting['one-div-id']['drg']).to.be.eq('veryLow');
+        expect(targeting['one-div-id']['hat']).to.be.eq('veryLow');
+        expect(targeting['one-div-id']['off']).to.be.eq('veryLow');
+        expect(targeting['one-div-id']['vio']).to.be.eq('veryLow');
+        expect(targeting['one-div-id']['fr']).to.be.eq('false');
+        expect(targeting['one-div-id']['ias_id']).to.be.eq('4813f7a2-1f22-11ec-9bfd-0a1107f94461');
+      });
+    })
+  });
+});
+
+const config = {
+  name: 'ias',
+  waitForIt: true,
+  params: {
+    pubId: 1234,
+    keyMappings: {
+      'id': 'ias_id'
+    },
+    pageUrl: 'https://integralads.com/test',
+    adUnitPath: {
+      'one-div-id': '/012345/ad/unit/path'
+    }
+  }
+};
+
+const adUnitsCode = ['one-div-id', 'two-div-id'];
+
+const adUnits = [
+  {
+    code: 'one-div-id',
+    mediaTypes: {
+      banner: {
+        sizes: [970, 250]
+      }
+    },
+    bids: [
+      {
+        bidder: 'appnexus',
+        params: {
+          placementId: 12345370,
+        }
+      }]
+  },
+  {
+    code: 'two-div-id',
+    mediaTypes: {
+      banner: { sizes: [300, 250] }
+    },
+    bids: [
+      {
+        bidder: 'appnexus',
+        params: {
+          placementId: 12345370,
+        }
+      }]
+  }];
+
+const data = {
+  brandSafety: { adt: 'veryLow', alc: 'veryLow', dlm: 'veryLow', drg: 'veryLow', hat: 'veryLow', off: 'veryLow', vio: 'veryLow' },
+  custom: { 'ias-kw': ['IAS_5995_KW', 'IAS_7066_KW', 'IAS_7232_KW', 'IAS_7364_KW', 'IAS_3894_KW', 'IAS_6535_KW', 'IAS_6153_KW', 'IAS_5238_KW', 'IAS_7393_KW', 'IAS_1499_KW', 'IAS_7376_KW', 'IAS_1035_KW', 'IAS_6566_KW', 'IAS_1058_KW', 'IAS_11338_724_KW', 'IAS_7301_KW', 'IAS_15969_725_KW', 'IAS_6358_KW', 'IAS_710_KW', 'IAS_5445_KW', 'IAS_3822_KW', 'IAS_4901_KW', 'IAS_5806_KW', 'IAS_460_KW', 'IAS_11461_702_KW', 'IAS_5681_KW', 'IAS_17609_1240_KW', 'IAS_6634_KW', 'IAS_5597_KW'] },
+  fr: 'false',
+  slots: { 'one-div-id': { id: '4813f7a2-1f22-11ec-9bfd-0a1107f94461' } }
+};
diff --git a/test/spec/modules/id5AnalyticsAdapter_spec.js b/test/spec/modules/id5AnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..83951c3a6e9
--- /dev/null
+++ b/test/spec/modules/id5AnalyticsAdapter_spec.js
@@ -0,0 +1,462 @@
+import adapterManager from '../../../src/adapterManager.js';
+import id5AnalyticsAdapter from '../../../modules/id5AnalyticsAdapter.js';
+import { expect } from 'chai';
+import sinon from 'sinon';
+import * as events from '../../../src/events.js';
+import constants from '../../../src/constants.json';
+import { generateUUID } from '../../../src/utils.js';
+
+const CONFIG_URL = 'https://api.id5-sync.com/analytics/12349/pbjs';
+const INGEST_URL = 'https://test.me/ingest';
+
+describe('ID5 analytics adapter', () => {
+  let server;
+  let config;
+
+  beforeEach(() => {
+    server = sinon.createFakeServer();
+    config = {
+      options: {
+        partnerId: 12349,
+      }
+    };
+  });
+
+  afterEach(() => {
+    server.restore();
+  });
+
+  it('registers itself with the adapter manager', () => {
+    const adapter = adapterManager.getAnalyticsAdapter('id5Analytics');
+    expect(adapter).to.exist;
+    expect(adapter.gvlid).to.be.a('number');
+    expect(adapter.adapter).to.equal(id5AnalyticsAdapter);
+  });
+
+  it('tolerates undefined or empty config', () => {
+    id5AnalyticsAdapter.enableAnalytics(undefined);
+    id5AnalyticsAdapter.enableAnalytics({});
+  });
+
+  it('calls configuration endpoint', () => {
+    server.respondWith('GET', CONFIG_URL, [200,
+      {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*'
+      },
+      `{ "sampling": 0, "ingestUrl": "${INGEST_URL}" }`
+    ]);
+    id5AnalyticsAdapter.enableAnalytics(config);
+    server.respond();
+
+    expect(server.requests).to.have.length(1);
+
+    id5AnalyticsAdapter.disableAnalytics();
+  });
+
+  it('does not call configuration endpoint when partner id is missing', () => {
+    id5AnalyticsAdapter.enableAnalytics({});
+    server.respond();
+
+    expect(server.requests).to.have.length(0);
+
+    id5AnalyticsAdapter.disableAnalytics();
+  });
+
+  describe('after configuration', () => {
+    let auction;
+
+    beforeEach(() => {
+      server.respondWith('GET', CONFIG_URL, [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        `{ "sampling": 1, "ingestUrl": "${INGEST_URL}" }`
+      ]);
+
+      server.respondWith('POST', INGEST_URL, [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        ''
+      ]);
+
+      auction = {
+        auctionId: generateUUID(),
+        adUnits: [{
+          'code': 'user-728',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600], [728, 90]]
+            }
+          },
+          adUnitCodes: ['user-728']
+        }],
+      };
+    });
+
+    afterEach(() => {
+      id5AnalyticsAdapter.disableAnalytics();
+    });
+
+    it('sends auction end events to the backend', () => {
+      id5AnalyticsAdapter.enableAnalytics(config);
+      server.respond();
+      events.emit(constants.EVENTS.AUCTION_END, auction);
+      server.respond();
+
+      // Why 3? 1: config, 2: tcfEnforcement, 3: auctionEnd
+      // tcfEnforcement? yes, gdprEnforcement module emits in reaction to auctionEnd
+      expect(server.requests).to.have.length(3);
+
+      const body1 = JSON.parse(server.requests[1].requestBody);
+      expect(body1.source).to.equal('pbjs');
+      expect(body1.event).to.equal('tcf2Enforcement');
+      expect(body1.partnerId).to.equal(12349);
+      expect(body1.meta).to.be.a('object');
+      expect(body1.meta.pbjs).to.equal($$PREBID_GLOBAL$$.version);
+      expect(body1.meta.sampling).to.equal(1);
+      expect(body1.meta.tz).to.be.a('number');
+
+      const body2 = JSON.parse(server.requests[2].requestBody);
+      expect(body2.source).to.equal('pbjs');
+      expect(body2.event).to.equal('auctionEnd');
+      expect(body2.partnerId).to.equal(12349);
+      expect(body2.meta).to.be.a('object');
+      expect(body2.meta.pbjs).to.equal($$PREBID_GLOBAL$$.version);
+      expect(body2.meta.sampling).to.equal(1);
+      expect(body2.meta.tz).to.be.a('number');
+      expect(body2.payload).to.eql(auction);
+    });
+
+    it('filters unwanted IDs from the events it sends', () => {
+      auction.adUnits[0].bids = [{
+        'bidder': 'appnexus',
+        'params': {
+          'placementId': '16618951'
+        },
+        'userId': {
+          'criteoId': '_h_y_19IMUhMZG1TOTRReHFNc29TekJ3TzQ3elhnRU81ayUyQjhiRkdJJTJGaTFXJTJCdDRnVmN4S0FETUhQbXdmQWg0M3g1NWtGbGolMkZXalclMkJvWjJDOXFDSk1HU3ZKaVElM0QlM0Q',
+          'id5id': {
+            'uid': 'ID5-ZHMOQ99ulpk687Fd9xVwzxMsYtkQIJnI-qm3iWdtww!ID5*FSycZQy7v7zWXiKbEpPEWoB3_UiWdPGzh554ncYDvOkAAA3rajiR0yNrFAU7oDTu',
+            'ext': { 'linkType': 1 }
+          },
+          'tdid': '888a6042-8f99-483b-aa26-23c44bc9166b'
+        },
+        'userIdAsEids': [{
+          'source': 'criteo.com',
+          'uids': [{
+            'id': '_h_y_19IMUhMZG1TOTRReHFNc29TekJ3TzQ3elhnRU81ayUyQjhiRkdJJTJGaTFXJTJCdDRnVmN4S0FETUhQbXdmQWg0M3g1NWtGbGolMkZXalclMkJvWjJDOXFDSk1HU3ZKaVElM0QlM0Q',
+            'atype': 1
+          }]
+        }, {
+          'source': 'id5-sync.com',
+          'uids': [{
+            'id': 'ID5-ZHMOQ99ulpk687Fd9xVwzxMsYtkQIJnI-qm3iWdtww!ID5*FSycZQy7v7zWXiKbEpPEWoB3_UiWdPGzh554ncYDvOkAAA3rajiR0yNrFAU7oDTu',
+            'atype': 1,
+            'ext': { 'linkType': 1 }
+          }]
+        }]
+      }];
+
+      auction.bidderRequests = [{
+        'bidderCode': 'appnexus',
+        'auctionId': 'e8d15df4-d89c-44c9-8b36-812f75cbf227',
+        'bidderRequestId': '1451a3c759c60359',
+        'bids': [
+          {
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': '16824712'
+            },
+            'userId': {
+              'id5id': {
+                'uid': 'ID5-ZHMOQ99ulpk687Fd9xVwzxMsYtkQIJnI-qm3iWdtww!ID5*CmuuahP8jbPJGRCUDdT2VZ8wz0eJM8O8mNlKktlEjuYAABFEjc2c9faqDencf2hR',
+                'ext': {
+                  'linkType': 1
+                }
+              },
+              'sharedid': {
+                'id': '01F6J4T72MRFYVWTN65WFA0H7N',
+                'third': '01F6J4T72MRFYVWTN65WFA0H7N'
+              },
+              'tdid': '0e45f56b-ad09-4c91-b090-8bd03e0d0754'
+            },
+            'userIdAsEids': [
+              {
+                'source': 'id5-sync.com',
+                'uids': [
+                  {
+                    'id': 'ID5-ZHMOQ99ulpk687Fd9xVwzxMsYtkQIJnI-qm3iWdtww!ID5*CmuuahP8jbPJGRCUDdT2VZ8wz0eJM8O8mNlKktlEjuYAABFEjc2c9faqDencf2hR',
+                    'atype': 1,
+                    'ext': {
+                      'linkType': 1
+                    }
+                  }
+                ]
+              },
+              {
+                'source': 'sharedid.org',
+                'uids': [
+                  {
+                    'id': '01F6J4T72MRFYVWTN65WFA0H7N',
+                    'atype': 1,
+                    'ext': {
+                      'third': '01F6J4T72MRFYVWTN65WFA0H7N'
+                    }
+                  }
+                ]
+              },
+              {
+                'source': 'adserver.org',
+                'uids': [
+                  {
+                    'id': '0e45f56b-ad09-4c91-b090-8bd03e0d0754',
+                    'atype': 1,
+                    'ext': {
+                      'rtiPartner': 'TDID'
+                    }
+                  }
+                ]
+              }
+            ],
+            'ortb2Imp': {
+              'ext': {
+                'data': {
+                  'adserver': {
+                    'name': 'gam',
+                    'adslot': '/6783/Kiwi/portail'
+                  },
+                  'pbadslot': '/6783/Kiwi/portail'
+                }
+              }
+            },
+            'adUnitCode': 'btf_leaderboard',
+            'transactionId': '3ce8216e-7898-4a22-86ba-01519b62bfce',
+            'sizes': [
+              [
+                728,
+                90
+              ]
+            ],
+            'bidId': '146661c05209a56e',
+            'bidderRequestId': '1451a3c759c60359',
+            'auctionId': 'e8d15df4-d89c-44c9-8b36-812f75cbf227',
+            'src': 'client',
+            'bidRequestsCount': 2,
+            'bidderRequestsCount': 2,
+            'bidderWinsCount': 0
+          }
+        ],
+        'auctionStart': 1621959214757,
+        'timeout': 2000,
+        'refererInfo': {
+          'referer': 'https://www.blog.com/?pbjs_debug=true',
+          'reachedTop': true,
+          'isAmp': false,
+          'numIframes': 0,
+          'stack': [
+            'https://www.blog.com/?pbjs_debug=true'
+          ],
+          'canonicalUrl': null
+        },
+        'gdprConsent': {
+          'consentString': 'CPGw1WAPGw1WAAHABBENBbCsAP_AAH_AAAAAH3tf_X__b3_j-_59__t0eY1f9_7_v-0zjhfdt-8N2f_X_L8X42M7vF36pq4KuR4Eu3LBIQdlHOHcTUmw6okVrTPsbk2Mr7NKJ7PEmnMbe2dYGH9_n93TuZKY7__8___z__-v_v____f_r-3_3__59X---_e_V399zLv9__3__9gfaASYal8AF2JY4Mk0aVQogQhWEh0AoAKKAYWiawgZXBTsrgI9QQMAEJqAjAiBBiCjFgEAAgEASERASAHggEQBEAgABACpAQgAI2AQWAFgYBAAKAaFiBFAEIEhBkcFRymBARItFBPZWAJRd7GmEIZRYAUCj-iowEShBAsDISFg4AAA.f_gAD_gAAAAA',
+          'vendorData': {
+            'cmpId': 7,
+            'cmpVersion': 1,
+            'gdprApplies': true,
+            'tcfPolicyVersion': 2,
+            'eventStatus': 'useractioncomplete',
+            'cmpStatus': 'loaded',
+            'listenerId': 47,
+            'tcString': 'CPGw1WAPGw1WAAHABBENBbCsAP_AAH_AAAAAH3tf_X__b3_j-_59__t0eY1f9_7_v-0zjhfdt-8N2f_X_L8X42M7vF36pq4KuR4Eu3LBIQdlHOHcTUmw6okVrTPsbk2Mr7NKJ7PEmnMbe2dYGH9_n93TuZKY7__8___z__-v_v____f_r-3_3__59X---_e_V399zLv9__3__9gfaASYal8AF2JY4Mk0aVQogQhWEh0AoAKKAYWiawgZXBTsrgI9QQMAEJqAjAiBBiCjFgEAAgEASERASAHggEQBEAgABACpAQgAI2AQWAFgYBAAKAaFiBFAEIEhBkcFRymBARItFBPZWAJRd7GmEIZRYAUCj-iowEShBAsDISFg4AAA.f_gAD_gAAAAA',
+          },
+          'gdprApplies': true,
+          'addtlConsent': '1~7.12.35.62.66.70.89.93.108.122.144.149.153.162.167.184.196.221.241.253.259.272.311.317.323.326.338.348.350.415.440.448.449.482.486.491.494.495.540.571.574.585.587.588.590.725.733.780.817.839.864.867.932.938.981.986.1031.1033.1051.1092.1097.1126.1127.1170.1171.1186.1201.1204.1205.1211.1215.1230.1232.1236.1248.1276.1290.1301.1313.1344.1364.1365.1415.1419.1428.1449.1451.1509.1558.1564.1570.1577.1591.1651.1669.1712.1716.1720.1721.1725.1733.1753.1765.1799.1810.1834.1842.1870.1878.1889.1896.1911.1922.1929.2012.2072.2078.2079.2109.2177.2202.2253.2290.2299.2316.2357.2373.2526.2531.2571.2572.2575.2628.2663.2677.2776.2778.2779.2985.3033.3052.3154',
+          'apiVersion': 2
+        },
+        'start': 1621959214763
+      }];
+
+      auction.bidsReceived = [{
+        'bidderCode': 'appnexus',
+        'width': 728,
+        'height': 90,
+        'statusMessage': 'Bid available',
+        'adId': '99e7838aa7f1c4f',
+        'requestId': '21e0b32208ee9a',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.020601,
+        'creativeId': 209272535,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'adUnitCode': 'user-728',
+        'appnexus': {
+          'buyerMemberId': 11563
+        },
+        'meta': {
+          'advertiserId': 4388779
+        },
+        'ad': 'stuff i am not interested in',
+        'originalCpm': 0.020601,
+        'originalCurrency': 'USD',
+        'auctionId': 'c7694dbb-a583-4a73-a933-b16f1f821ba4',
+        // Make sure cleanup is resilient
+        'someNullObject': null,
+        'someUndefinedProperty': undefined
+      }];
+
+      id5AnalyticsAdapter.enableAnalytics(config);
+      server.respond();
+      events.emit(constants.EVENTS.AUCTION_END, auction);
+      server.respond();
+
+      expect(server.requests).to.have.length(3);
+
+      const body = JSON.parse(server.requests[2].requestBody);
+      expect(body.event).to.equal('auctionEnd');
+      expect(body.payload.adUnits[0].bids[0].userId).to.eql({
+        'criteoId': '__ID5_REDACTED__',
+        'id5id': {
+          'uid': '__ID5_REDACTED__',
+          'ext': {
+            'linkType': 1
+          }
+        },
+        'tdid': '__ID5_REDACTED__'
+      });
+      expect(body.payload.bidderRequests[0].bids[0].userId).to.eql({
+        'sharedid': '__ID5_REDACTED__',
+        'id5id': {
+          'uid': '__ID5_REDACTED__',
+          'ext': {
+            'linkType': 1
+          }
+        },
+        'tdid': '__ID5_REDACTED__'
+      });
+      body.payload.adUnits[0].bids[0].userIdAsEids.forEach((userId) => {
+        expect(userId.uids[0].id).to.equal('__ID5_REDACTED__');
+        if (userId.uids[0].ext) {
+          expect(userId.uids[0].ext).to.equal('__ID5_REDACTED__');
+        }
+      });
+      body.payload.bidderRequests[0].bids[0].userIdAsEids.forEach((userId) => {
+        expect(userId.uids[0].id).to.equal('__ID5_REDACTED__');
+        if (userId.uids[0].ext) {
+          expect(userId.uids[0].ext).to.equal('__ID5_REDACTED__');
+        }
+      });
+      expect(body.payload.bidsReceived[0].ad).to.equal(undefined);
+      expect(body.payload.bidsReceived[0].requestId).to.equal('21e0b32208ee9a');
+    });
+
+    it('can override events to collect if configured to do so', () => {
+      server.respondWith('GET', CONFIG_URL, [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        `{ "sampling": 1, "ingestUrl": "${INGEST_URL}", "eventsToTrack": ["tcf2Enforcement"] }`
+      ]);
+      id5AnalyticsAdapter.enableAnalytics(config);
+      server.respond();
+      events.emit(constants.EVENTS.AUCTION_END, auction);
+      server.respond();
+
+      expect(server.requests).to.have.length(2);
+      const body1 = JSON.parse(server.requests[1].requestBody);
+      expect(body1.event).to.equal('tcf2Enforcement');
+    });
+
+    it('can extend cleanup rules from server side', () => {
+      auction.bidsReceived = [{
+        'bidderCode': 'appnexus',
+        'width': 728,
+        'height': 90,
+        'statusMessage': 'Bid available',
+        'adId': '99e7838aa7f1c4f',
+        'requestId': '21e0b32208ee9a',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.020601,
+        'creativeId': 209272535,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'adUnitCode': 'user-728',
+        'appnexus': {
+          'buyerMemberId': 11563
+        },
+        'meta': {
+          'advertiserId': 4388779
+        },
+        'ad': 'stuff i am not interested in',
+        'originalCpm': 0.020601,
+        'originalCurrency': 'USD',
+        'auctionId': 'c7694dbb-a583-4a73-a933-b16f1f821ba4'
+      }, {
+        'bidderCode': 'ix',
+        'width': 728,
+        'height': 90,
+        'statusMessage': 'Bid available',
+        'adId': '228f725de4a9ff09',
+        'requestId': '225a42b4a8ec7287',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.06,
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': '8838044',
+        'ad': 'lots of HTML code',
+        'ttl': 300,
+        'meta': {
+          'networkId': 85,
+          'brandId': 822,
+          'brandName': 'Microsoft Brands',
+          'advertiserDomains': [
+            'microsoftstore.com'
+          ]
+        },
+        'originalCpm': 0.06,
+        'originalCurrency': 'USD',
+        'auctionId': 'fe28ce44-61bb-4ed8-be3c-3e801dfddcb9',
+        'responseTimestamp': 1621954632648,
+        'requestTimestamp': 1621954632498,
+        'bidder': 'ix',
+        'adUnitCode': 'sticky_footer',
+        'timeToRespond': 150,
+        'pbLg': '0.00',
+        'pbCg': '0.06',
+        'size': '728x90',
+        'adserverTargeting': {
+          'hb_bidder': 'ix',
+        }
+      }];
+      server.respondWith('GET', CONFIG_URL, [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        `{ "sampling": 1, "ingestUrl": "${INGEST_URL}", "additionalCleanupRules": {"auctionEnd": [{"match":["bidsReceived", "*", "requestId"],"apply":"erase"}]} }`
+      ]);
+      id5AnalyticsAdapter.enableAnalytics(config);
+      server.respond();
+      events.emit(constants.EVENTS.AUCTION_END, auction);
+      server.respond();
+
+      expect(server.requests).to.have.length(3);
+      const body = JSON.parse(server.requests[2].requestBody);
+      expect(body.event).to.equal('auctionEnd');
+      expect(body.payload.bidsReceived[0].requestId).to.equal(undefined);
+      expect(body.payload.bidsReceived[1].requestId).to.equal(undefined);
+      expect(body.payload.bidsReceived[0].bidderCode).to.equal('appnexus');
+      expect(body.payload.bidsReceived[1].bidderCode).to.equal('ix');
+    });
+  });
+});
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index 5080cd94bd8..8c0f8ad9cf3 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -1,43 +1,63 @@
-import { init, requestBidsHook, setSubmoduleRegistry, coreStorage } from 'modules/userId/index.js';
-import { config } from 'src/config.js';
-import { id5IdSubmodule } from 'modules/id5IdSystem.js';
-import { server } from 'test/mocks/xhr.js';
-import events from 'src/events.js';
+import {
+  expDaysStr,
+  getFromLocalStorage,
+  getNbFromCache,
+  ID5_PRIVACY_STORAGE_NAME,
+  ID5_STORAGE_NAME,
+  id5IdSubmodule,
+  nbCacheName,
+  storage,
+  storeInLocalStorage,
+  storeNbInCache,
+} from 'modules/id5IdSystem.js';
+import {coreStorage, init, requestBidsHook, setSubmoduleRegistry} from 'modules/userId/index.js';
+import {config} from 'src/config.js';
+import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
+import * as utils from 'src/utils.js';
+import {uspDataHandler} from 'src/adapterManager.js';
+import 'src/prebid.js';
+import {hook} from '../../../src/hook.js';
+import {mockGdprConsent} from '../../helpers/consentData.js';
 
 let expect = require('chai').expect;
 
-describe('ID5 ID System', function() {
+describe('ID5 ID System', function () {
   const ID5_MODULE_NAME = 'id5Id';
   const ID5_EIDS_NAME = ID5_MODULE_NAME.toLowerCase();
   const ID5_SOURCE = 'id5-sync.com';
-  const ID5_PARTNER = 173;
-  const ID5_ENDPOINT = `https://id5-sync.com/g/v2/${ID5_PARTNER}.json`;
-  const ID5_COOKIE_NAME = 'id5idcookie';
-  const ID5_NB_COOKIE_NAME = `pbjs-id5id-${ID5_PARTNER}-nb`;
-  const ID5_EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+  const ID5_TEST_PARTNER_ID = 173;
+  const ID5_ENDPOINT = `https://id5-sync.com/g/v2/${ID5_TEST_PARTNER_ID}.json`;
+  const ID5_API_CONFIG_URL = `https://id5-sync.com/api/config/prebid`;
+  const ID5_EXTENSIONS_ENDPOINT = 'https://extensions.id5-sync.com/test';
+  const ID5_API_CONFIG = {
+    fetchCall: {
+      url: ID5_ENDPOINT
+    }
+  };
+  const ID5_NB_STORAGE_NAME = nbCacheName(ID5_TEST_PARTNER_ID);
   const ID5_STORED_ID = 'storedid5id';
   const ID5_STORED_SIGNATURE = '123456';
+  const ID5_STORED_LINK_TYPE = 1;
   const ID5_STORED_OBJ = {
     'universal_uid': ID5_STORED_ID,
-    'signature': ID5_STORED_SIGNATURE
+    'signature': ID5_STORED_SIGNATURE,
+    'link_type': ID5_STORED_LINK_TYPE
   };
-  const ID5_LEGACY_STORED_OBJ = {
-    'ID5ID': ID5_STORED_ID
-  }
   const ID5_RESPONSE_ID = 'newid5id';
   const ID5_RESPONSE_SIGNATURE = 'abcdef';
+  const ID5_RESPONSE_LINK_TYPE = 2;
   const ID5_JSON_RESPONSE = {
     'universal_uid': ID5_RESPONSE_ID,
     'signature': ID5_RESPONSE_SIGNATURE,
-    'link_type': 0
+    'link_type': ID5_RESPONSE_LINK_TYPE
   };
 
-  function getId5FetchConfig(storageName = ID5_COOKIE_NAME, storageType = 'cookie') {
+  function getId5FetchConfig(storageName = ID5_STORAGE_NAME, storageType = 'html5') {
     return {
       name: ID5_MODULE_NAME,
       params: {
-        partner: ID5_PARTNER
+        partner: ID5_TEST_PARTNER_ID
       },
       storage: {
         name: storageName,
@@ -46,14 +66,18 @@ describe('ID5 ID System', function() {
       }
     }
   }
+
   function getId5ValueConfig(value) {
     return {
       name: ID5_MODULE_NAME,
       value: {
-        id5id: value
+        id5id: {
+          uid: value
+        }
       }
     }
   }
+
   function getUserSyncConfig(userIds) {
     return {
       userSync: {
@@ -62,15 +86,15 @@ describe('ID5 ID System', function() {
       }
     }
   }
-  function getFetchCookieConfig() {
-    return getUserSyncConfig([getId5FetchConfig()]);
-  }
+
   function getFetchLocalStorageConfig() {
-    return getUserSyncConfig([getId5FetchConfig(ID5_COOKIE_NAME, 'html5')]);
+    return getUserSyncConfig([getId5FetchConfig(ID5_STORAGE_NAME, 'html5')]);
   }
+
   function getValueConfig(value) {
     return getUserSyncConfig([getId5ValueConfig(value)]);
   }
+
   function getAdUnitMock(code = 'adUnit-code') {
     return {
       code,
@@ -80,304 +104,790 @@ describe('ID5 ID System', function() {
     };
   }
 
-  describe('Xhr Requests from getId()', function() {
-    const responseHeader = { 'Content-Type': 'application/json' };
-    let callbackSpy = sinon.spy();
+  function callSubmoduleGetId(config, consentData, cacheIdObj) {
+    return new Promise((resolve) => {
+      id5IdSubmodule.getId(config, consentData, cacheIdObj).callback((response) => {
+        resolve(response)
+      })
+    });
+  }
+
+  class XhrServerMock {
+    constructor(server) {
+      this.currentRequestIdx = 0
+      this.server = server
+    }
+
+    expectFirstRequest() {
+      return this.#expectRequest(0);
+    }
+
+    expectNextRequest() {
+      return this.#expectRequest(++this.currentRequestIdx)
+    }
+
+    expectConfigRequest() {
+      return this.expectFirstRequest()
+        .then(configRequest => {
+          expect(configRequest.url).is.eq(ID5_API_CONFIG_URL);
+          expect(configRequest.method).is.eq('POST');
+          return configRequest;
+        })
+    }
+
+    respondWithConfigAndExpectNext(configRequest, config = ID5_API_CONFIG) {
+      configRequest.respond(200, {'Content-Type': 'application/json'}, JSON.stringify(config));
+      return this.expectNextRequest()
+    }
+
+    expectFetchRequest() {
+      return this.expectConfigRequest()
+        .then(configRequest => {
+          return this.respondWithConfigAndExpectNext(configRequest, ID5_API_CONFIG);
+        }).then(request => {
+          expect(request.url).is.eq(ID5_API_CONFIG.fetchCall.url);
+          expect(request.method).is.eq('POST');
+          return request;
+        })
+    }
+
+    #expectRequest(index) {
+      let server = this.server
+      return new Promise(function (resolve) {
+        (function waitForCondition() {
+          if (server.requests && server.requests.length > index) return resolve(server.requests[index]);
+          setTimeout(waitForCondition, 30);
+        })();
+      })
+        .then(request => {
+          return request
+        });
+    }
+
+    hasReceivedAnyRequest() {
+      let requests = this.server.requests;
+      return requests && requests.length > 0;
+    }
+  }
+
+  before(() => {
+    hook.ready();
+  });
+
+  describe('Check for valid publisher config', function () {
+    it('should fail with invalid config', function () {
+      // no config
+      expect(id5IdSubmodule.getId()).is.eq(undefined);
+      expect(id5IdSubmodule.getId({})).is.eq(undefined);
+
+      // valid params, invalid storage
+      expect(id5IdSubmodule.getId({ params: { partner: 123 } })).to.be.eq(undefined);
+      expect(id5IdSubmodule.getId({ params: { partner: 123 }, storage: {} })).to.be.eq(undefined);
+      expect(id5IdSubmodule.getId({ params: { partner: 123 }, storage: { name: '' } })).to.be.eq(undefined);
+      expect(id5IdSubmodule.getId({ params: { partner: 123 }, storage: { type: '' } })).to.be.eq(undefined);
+
+      // valid storage, invalid params
+      expect(id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, })).to.be.eq(undefined);
+      expect(id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, params: { } })).to.be.eq(undefined);
+      expect(id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, params: { partner: 'abc' } })).to.be.eq(undefined);
+    });
+
+    it('should warn with non-recommended storage params', function () {
+      let logWarnStub = sinon.stub(utils, 'logWarn');
+
+      id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, params: { partner: 123 } });
+      expect(logWarnStub.calledOnce).to.be.true;
+      logWarnStub.restore();
+
+      id5IdSubmodule.getId({ storage: { name: ID5_STORAGE_NAME, type: 'cookie', }, params: { partner: 123 } });
+      expect(logWarnStub.calledOnce).to.be.true;
+      logWarnStub.restore();
+    });
+  });
+
+  describe('Xhr Requests from getId()', function () {
+    const responseHeader = {'Content-Type': 'application/json'};
 
-    beforeEach(function() {
-      callbackSpy.resetHistory();
+    beforeEach(function () {
     });
+
     afterEach(function () {
+      uspDataHandler.reset()
+    });
+
+    it('should call the ID5 server and handle a valid response', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let config = getId5FetchConfig();
+      let submoduleResponse = callSubmoduleGetId(config, undefined, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(fetchRequest.url).to.contain(ID5_ENDPOINT);
+          expect(fetchRequest.withCredentials).is.true;
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.o).is.eq('pbjs');
+          expect(requestBody.pd).is.undefined;
+          expect(requestBody.s).is.undefined;
+          expect(requestBody.provider).is.undefined
+          expect(requestBody.v).is.eq('$prebid.version$');
+          expect(requestBody.gdpr).is.eq(0);
+          expect(requestBody.gdpr_consent).is.undefined;
+          expect(requestBody.us_privacy).is.undefined;
+          expect(requestBody.storage).is.deep.eq(config.storage)
+
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(submoduleResponse => {
+          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+        });
+    });
+
+    it('should call the ID5 server with gdpr data ', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let consentData = {
+        gdprApplies: true,
+        consentString: 'consentString'
+      }
+
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.gdpr).to.eq(1);
+          expect(requestBody.gdpr_consent).is.eq(consentData.consentString);
+
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(submoduleResponse => {
+          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+        });
+    });
+
+    it('should call the ID5 server without gdpr data when gdpr not applies ', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let consentData = {
+        gdprApplies: false,
+        consentString: 'consentString'
+      }
+
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.gdpr).to.eq(0);
+          expect(requestBody.gdpr_consent).is.undefined
+
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(submoduleResponse => {
+          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+        });
+    });
+
+    it('should call the ID5 server with us privacy consent', function () {
+      let usPrivacyString = '1YN-';
+      uspDataHandler.setConsentData(usPrivacyString)
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let consentData = {
+        gdprApplies: true,
+        consentString: 'consentString'
+      }
+
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.us_privacy).to.eq(usPrivacyString);
 
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(submoduleResponse => {
+          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+        });
     });
 
-    it('should fail if no partner is provided in the config', function() {
-      expect(id5IdSubmodule.getId()).to.be.eq(undefined);
+    it('should call the ID5 server with no signature field when no stored object', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.s).is.undefined;
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
     });
 
-    it('should call the ID5 server with 1puid field for legacy storedObj format', function () {
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig().params, undefined, ID5_LEGACY_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+    it('should call the ID5 server for config with submodule config object', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let id5FetchConfig = getId5FetchConfig();
+      id5FetchConfig.params.extraParam = {
+        x: 'X',
+        y: {
+          a: 1,
+          b: '3'
+        }
+      }
+      let submoduleResponse = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
+
+      return xhrServerMock.expectConfigRequest()
+        .then(configRequest => {
+          let requestBody = JSON.parse(configRequest.requestBody)
+          expect(requestBody).is.deep.eq(id5FetchConfig)
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest)
+        })
+        .then(fetchRequest => {
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.s).to.eq('');
-      expect(requestBody.partner).to.eq(ID5_PARTNER);
-      expect(requestBody['1puid']).to.eq(ID5_STORED_ID);
+    it('should call the ID5 server for config with overridden url', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let id5FetchConfig = getId5FetchConfig();
+      id5FetchConfig.params.configUrl = 'http://localhost/x/y/z'
+
+      let submoduleResponse = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
+
+      return xhrServerMock.expectFirstRequest()
+        .then(configRequest => {
+          expect(configRequest.url).is.eq('http://localhost/x/y/z')
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest)
+        })
+        .then(fetchRequest => {
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
+    it('should call the ID5 server with additional data when provided', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      return xhrServerMock.expectConfigRequest()
+        .then(configRequest => {
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+            fetchCall: {
+              url: ID5_ENDPOINT,
+              overrides: {
+                arg1: '123',
+                arg2: {
+                  x: '1',
+                  y: 2
+                }
+              }
+            }
+          });
+        })
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.o).is.eq('pbjs');
+          expect(requestBody.v).is.eq('$prebid.version$');
+          expect(requestBody.arg1).is.eq('123')
+          expect(requestBody.arg2).is.deep.eq({
+            x: '1',
+            y: 2
+          })
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
     });
 
-    it('should call the ID5 server with signature field for new storedObj format', function () {
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig().params, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+    it('should call the ID5 server with extensions', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      return xhrServerMock.expectConfigRequest()
+        .then(configRequest => {
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+            fetchCall: {
+              url: ID5_ENDPOINT
+            },
+            extensionsCall: {
+              url: ID5_EXTENSIONS_ENDPOINT,
+              method: 'GET'
+            }
+          });
+        })
+        .then(extensionsRequest => {
+          expect(extensionsRequest.url).is.eq(ID5_EXTENSIONS_ENDPOINT)
+          expect(extensionsRequest.method).is.eq('GET')
+          extensionsRequest.respond(200, responseHeader, JSON.stringify({
+            lb: 'ex'
+          }))
+          return xhrServerMock.expectNextRequest();
+        })
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.o).is.eq('pbjs');
+          expect(requestBody.v).is.eq('$prebid.version$');
+          expect(requestBody.extensions).is.deep.eq({
+            lb: 'ex'
+          })
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
-      expect(requestBody.partner).to.eq(ID5_PARTNER);
-      expect(requestBody['1puid']).to.eq('');
+    it('should call the ID5 server with extensions fetched with POST', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      return xhrServerMock.expectConfigRequest()
+        .then(configRequest => {
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+            fetchCall: {
+              url: ID5_ENDPOINT
+            },
+            extensionsCall: {
+              url: ID5_EXTENSIONS_ENDPOINT,
+              method: 'POST',
+              body: {
+                x: '1',
+                y: 2
+              }
+            }
+          });
+        })
+        .then(extensionsRequest => {
+          expect(extensionsRequest.url).is.eq(ID5_EXTENSIONS_ENDPOINT)
+          expect(extensionsRequest.method).is.eq('POST')
+          let requestBody = JSON.parse(extensionsRequest.requestBody)
+          expect(requestBody).is.deep.eq({
+            x: '1',
+            y: 2
+          })
+          extensionsRequest.respond(200, responseHeader, JSON.stringify({
+            lb: 'post',
+          }))
+          return xhrServerMock.expectNextRequest();
+        })
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.o).is.eq('pbjs');
+          expect(requestBody.v).is.eq('$prebid.version$');
+          expect(requestBody.extensions).is.deep.eq({
+            lb: 'post'
+          })
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
+    it('should call the ID5 server with signature field from stored object', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.s).is.eq(ID5_STORED_SIGNATURE);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
     });
 
     it('should call the ID5 server with pd field when pd config is set', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       const pubData = 'b50ca08271795a8e7e4012813f23d505193d75c0f2e2bb99baa63aa822f66ed3';
 
-      let config = getId5FetchConfig().params;
-      config.pd = pubData;
-
-      let submoduleCallback = id5IdSubmodule.getId(config, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+      let id5Config = getId5FetchConfig();
+      id5Config.params.pd = pubData;
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
-      expect(requestBody.pd).to.eq(pubData);
-      expect(requestBody['1puid']).to.eq('');
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.pd).is.eq(pubData);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
+        })
     });
 
-    it('should call the ID5 server with empty pd field when pd config is not set', function () {
-      let config = getId5FetchConfig().params;
-      config.pd = undefined;
+    it('should call the ID5 server with no pd field when pd config is not set', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let id5Config = getId5FetchConfig();
+      id5Config.params.pd = undefined;
 
-      let submoduleCallback = id5IdSubmodule.getId(config, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.pd).is.undefined;
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
+        })
+    });
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.pd).to.eq('');
+    it('should call the ID5 server with nb=1 when no stored value exists and reset after', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
+
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.nbPage).is.eq(1);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(() => {
+          expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
+        })
+    });
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
+    it('should call the ID5 server with incremented nb when stored value exists and reset after', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
+
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.nbPage).is.eq(2);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(() => {
+          expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
+        })
     });
 
-    it('should call the ID5 server with nb=1 when no stored value exists', function () {
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
+    it('should call the ID5 server with ab_testing object when abTesting is turned on', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let id5Config = getId5FetchConfig();
+      id5Config.params.abTesting = {enabled: true, controlGroupPct: 0.234}
+
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig().params, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.ab_testing.enabled).is.eq(true);
+          expect(requestBody.ab_testing.control_group_pct).is.eq(0.234);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
+        });
+    });
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.nbPage).to.eq(1);
+    it('should call the ID5 server without ab_testing object when abTesting is turned off', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let id5Config = getId5FetchConfig();
+      id5Config.params.abTesting = {enabled: false, controlGroupPct: 0.55}
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('0');
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.ab_testing).is.undefined;
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        });
     });
 
-    it('should call the ID5 server with incremented nb when stored value exists', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '1', expStr);
+    it('should call the ID5 server without ab_testing when when abTesting is not set', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let id5Config = getId5FetchConfig();
 
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig().params, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.nbPage).to.eq(2);
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.ab_testing).is.undefined;
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        });
+    });
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
+    it('should store the privacy object from the ID5 server response', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      const privacy = {
+        jurisdiction: 'gdpr',
+        id5_consent: true
+      };
+
+      return xhrServerMock.expectFetchRequest()
+        .then(request => {
+          let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
+          responseObject.privacy = privacy;
+          request.respond(200, responseHeader, JSON.stringify(responseObject));
+          return submoduleResponse
+        })
+        .then(() => {
+          expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).is.eq(JSON.stringify(privacy));
+          coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+        })
+    });
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('0');
+    it('should not store a privacy object if not part of ID5 server response', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(request => {
+          let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
+          responseObject.privacy = undefined;
+          request.respond(200, responseHeader, JSON.stringify(responseObject));
+          return submoduleResponse
+        })
+        .then(() => {
+          expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).is.null;
+        });
     });
+
+    describe('when legacy cookies are set', () => {
+      let sandbox;
+      beforeEach(() => {
+        sandbox = sinon.sandbox.create();
+        sandbox.stub(storage, 'getCookie');
+      });
+      afterEach(() => {
+        sandbox.restore();
+      });
+      it('should not throw if malformed JSON is forced into cookies', () => {
+        storage.getCookie.callsFake(() => ' Not JSON ');
+        id5IdSubmodule.getId(getId5FetchConfig());
+      });
+    })
   });
 
-  describe('Request Bids Hook', function() {
+  describe('Request Bids Hook', function () {
     let adUnits;
+    let sandbox;
 
-    beforeEach(function() {
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+      mockGdprConsent(sandbox);
       sinon.stub(events, 'getEvents').returns([]);
-      coreStorage.setCookie(ID5_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie(`${ID5_COOKIE_NAME}_last`, '', ID5_EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
+      coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME);
+      coreStorage.removeDataFromLocalStorage(`${ID5_STORAGE_NAME}_last`);
+      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
       adUnits = [getAdUnitMock()];
     });
-    afterEach(function() {
+    afterEach(function () {
       events.getEvents.restore();
-      coreStorage.setCookie(ID5_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie(`${ID5_COOKIE_NAME}_last`, '', ID5_EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
+      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 cookie to bids', function (done) {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_STORED_OBJ), expStr);
+    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);
-      config.setConfig(getFetchCookieConfig());
+      setSubmoduleRegistry([id5IdSubmodule]);
+      config.setConfig(getFetchLocalStorageConfig());
 
       requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
-            expect(bid.userId.id5id).to.equal(ID5_STORED_ID);
-            expect(bid.userIdAsEids[0]).to.deep.equal({
+            expect(bid.userId.id5id.uid).is.equal(ID5_STORED_ID);
+            expect(bid.userIdAsEids[0]).is.deep.equal({
               source: ID5_SOURCE,
-              uids: [{ id: ID5_STORED_ID, atype: 1 }]
+              uids: [{
+                id: ID5_STORED_ID,
+                atype: 1,
+                ext: {
+                  linkType: ID5_STORED_LINK_TYPE
+                }
+              }]
             });
           });
         });
         done();
-      }, { adUnits });
+      }, {adUnits});
     });
 
     it('should add config value ID to bids', function (done) {
-      setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
+      setSubmoduleRegistry([id5IdSubmodule]);
       config.setConfig(getValueConfig(ID5_STORED_ID));
 
       requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
-            expect(bid.userId.id5id).to.equal(ID5_STORED_ID);
-            expect(bid.userIdAsEids[0]).to.deep.equal({
+            expect(bid.userId.id5id.uid).is.equal(ID5_STORED_ID);
+            expect(bid.userIdAsEids[0]).is.deep.equal({
               source: ID5_SOURCE,
-              uids: [{ id: ID5_STORED_ID, atype: 1 }]
+              uids: [{id: ID5_STORED_ID, atype: 1}]
             });
           });
         });
         done();
-      }, { adUnits });
+      }, {adUnits});
     });
 
-    it('should set nb=1 in cookie when no stored value exists', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_STORED_OBJ), expStr);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
+    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);
-      config.setConfig(getFetchCookieConfig());
-
-      let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+      setSubmoduleRegistry([id5IdSubmodule]);
+      config.setConfig(getFetchLocalStorageConfig());
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('1');
+      requestBidsHook((adUnitConfig) => {
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(1);
+        done()
+      }, {adUnits});
     });
 
-    it('should increment nb in cookie when stored value exists', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_STORED_OBJ), expStr);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '1', expStr);
+    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);
-      config.setConfig(getFetchCookieConfig());
-
-      let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+      setSubmoduleRegistry([id5IdSubmodule]);
+      config.setConfig(getFetchLocalStorageConfig());
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('2');
+      requestBidsHook(() => {
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(2);
+        done()
+      }, {adUnits});
     });
 
     it('should call ID5 servers with signature and incremented nb post auction if refresh needed', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_STORED_OBJ), expStr);
-      coreStorage.setCookie(`${ID5_COOKIE_NAME}_last`, (new Date(Date.now() - 50000).toUTCString()), expStr);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '1', expStr);
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let initialLocalStorageValue = JSON.stringify(ID5_STORED_OBJ);
+      storeInLocalStorage(ID5_STORAGE_NAME, initialLocalStorageValue, 1);
+      storeInLocalStorage(`${ID5_STORAGE_NAME}_last`, expDaysStr(-1), 1);
 
-      let id5Config = getFetchCookieConfig();
+      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
+      let id5Config = getFetchLocalStorageConfig();
       id5Config.userSync.userIds[0].storage.refreshInSeconds = 2;
-
-      setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
+      setSubmoduleRegistry([id5IdSubmodule]);
       config.setConfig(id5Config);
 
-      let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
-
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).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);
+      return new Promise((resolve) => {
+        requestBidsHook(() => {
+          resolve()
+        }, {adUnits});
+      }).then(() => {
+        expect(xhrServerMock.hasReceivedAnyRequest()).is.false;
+        events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+        return xhrServerMock.expectFetchRequest()
+      }).then(request => {
+        let requestBody = JSON.parse(request.requestBody);
+        expect(requestBody.s).is.eq(ID5_STORED_SIGNATURE);
+        expect(requestBody.nbPage).is.eq(2);
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(2);
+        const responseHeader = {'Content-Type': 'application/json'};
+        request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+
+        return new Promise(function (resolve) {
+          (function waitForCondition() {
+            if (getFromLocalStorage(ID5_STORAGE_NAME) !== initialLocalStorageValue) return resolve();
+            setTimeout(waitForCondition, 30);
+          })();
+        })
+      }).then(() => {
+        expect(decodeURIComponent(getFromLocalStorage(ID5_STORAGE_NAME))).is.eq(JSON.stringify(ID5_JSON_RESPONSE));
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
+      })
+    });
+  });
 
-      const responseHeader = { 'Content-Type': 'application/json' };
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+  describe('Decode stored object', function () {
+    const expectedDecodedObject = {id5id: {uid: ID5_STORED_ID, ext: {linkType: ID5_STORED_LINK_TYPE}}};
 
-      expect(coreStorage.getCookie(ID5_COOKIE_NAME)).to.be.eq(JSON.stringify(ID5_JSON_RESPONSE));
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('0');
+    it('should properly decode from a stored object', function () {
+      expect(id5IdSubmodule.decode(ID5_STORED_OBJ, getId5FetchConfig())).is.deep.equal(expectedDecodedObject);
     });
+    it('should return undefined if passed a string', function () {
+      expect(id5IdSubmodule.decode('somestring', getId5FetchConfig())).is.eq(undefined);
+    });
+  });
 
-    it('should call ID5 servers with 1puid and nb=1 post auction if refresh needed for legacy stored object', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_LEGACY_STORED_OBJ), expStr);
-      coreStorage.setCookie(`${ID5_COOKIE_NAME}_last`, (new Date(Date.now() - 50000).toUTCString()), expStr);
-
-      let id5Config = getFetchCookieConfig();
-      id5Config.userSync.userIds[0].storage.refreshInSeconds = 2;
+  describe('A/B Testing', function () {
+    const expectedDecodedObjectWithIdAbOff = {id5id: {uid: ID5_STORED_ID, ext: {linkType: ID5_STORED_LINK_TYPE}}};
+    const expectedDecodedObjectWithIdAbOn = {
+      id5id: {
+        uid: ID5_STORED_ID,
+        ext: {linkType: ID5_STORED_LINK_TYPE, abTestingControlGroup: false}
+      }
+    };
+    const expectedDecodedObjectWithoutIdAbOn = {id5id: {uid: '', ext: {linkType: 0, abTestingControlGroup: true}}};
+    let testConfig, storedObject;
 
-      setSubmoduleRegistry([id5IdSubmodule]);
-      init(config);
-      config.setConfig(id5Config);
+    beforeEach(function () {
+      testConfig = getId5FetchConfig();
+      storedObject = utils.deepClone(ID5_STORED_OBJ);
+    });
 
-      let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+    describe('A/B Testing Config is Set', function () {
+      let randStub;
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('1');
+      beforeEach(function () {
+        randStub = sinon.stub(Math, 'random').callsFake(function () {
+          return 0.25;
+        });
+      });
+      afterEach(function () {
+        randStub.restore();
+      });
 
-      expect(server.requests).to.be.empty;
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+      describe('Decode', function () {
+        let logErrorSpy;
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(requestBody['1puid']).to.eq(ID5_STORED_ID);
-      expect(requestBody.nbPage).to.eq(1);
+        beforeEach(function () {
+          logErrorSpy = sinon.spy(utils, 'logError');
+        });
+        afterEach(function () {
+          logErrorSpy.restore();
+        });
 
-      const responseHeader = { 'Content-Type': 'application/json' };
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+        it('should not set abTestingControlGroup extension when A/B testing is off', function () {
+          let decoded = id5IdSubmodule.decode(storedObject, testConfig);
+          expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOff);
+        });
 
-      expect(coreStorage.getCookie(ID5_COOKIE_NAME)).to.be.eq(JSON.stringify(ID5_JSON_RESPONSE));
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('0');
-    });
-  });
+        it('should set abTestingControlGroup to false when A/B testing is on but in normal group', function () {
+          storedObject.ab_testing = {result: 'normal'};
+          let decoded = id5IdSubmodule.decode(storedObject, testConfig);
+          expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOn);
+        });
 
-  describe('Decode stored object', function() {
-    const decodedObject = { 'id5id': ID5_STORED_ID };
+        it('should not expose ID when everyone is in control group', function () {
+          storedObject.ab_testing = {result: 'control'};
+          storedObject.universal_uid = '';
+          storedObject.link_type = 0;
+          let decoded = id5IdSubmodule.decode(storedObject, testConfig);
+          expect(decoded).is.deep.equal(expectedDecodedObjectWithoutIdAbOn);
+        });
 
-    it('should properly decode from a stored object', function() {
-      expect(id5IdSubmodule.decode(ID5_STORED_OBJ)).to.deep.equal(decodedObject);
-    });
-    it('should properly decode from a legacy stored object', function() {
-      expect(id5IdSubmodule.decode(ID5_LEGACY_STORED_OBJ)).to.deep.equal(decodedObject);
-    });
-    it('should return undefined if passed a string', function() {
-      expect(id5IdSubmodule.decode('somestring')).to.eq(undefined);
+        it('should log A/B testing errors', function () {
+          storedObject.ab_testing = {result: 'error'};
+          let decoded = id5IdSubmodule.decode(storedObject, testConfig);
+          expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOff);
+          sinon.assert.calledOnce(logErrorSpy);
+        });
+      });
     });
   });
 });
diff --git a/test/spec/modules/idImportLibrary_spec.js b/test/spec/modules/idImportLibrary_spec.js
new file mode 100644
index 00000000000..d5b3e32546d
--- /dev/null
+++ b/test/spec/modules/idImportLibrary_spec.js
@@ -0,0 +1,256 @@
+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 = {
+  observe: () => {
+    return null
+  }
+}
+
+describe('IdImportLibrary Tests', function () {
+  let fakeServer;
+  let sandbox;
+  let clock;
+  let fn = sinon.spy();
+
+  before(() => {
+    hook.ready();
+    init(config);
+  });
+
+  beforeEach(function () {
+    fakeServer = sinon.fakeServer.create();
+    sinon.stub(utils, 'logInfo');
+    sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    utils.logInfo.restore();
+    utils.logError.restore();
+    fakeServer.restore();
+    idImportlibrary.setConfig({});
+  });
+
+  describe('setConfig', function () {
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+      clock.restore();
+    });
+
+    it('results when no config is set', function () {
+      idImportlibrary.setConfig();
+      sinon.assert.called(utils.logError);
+    });
+    it('results when config is empty', function () {
+      idImportlibrary.setConfig({});
+      sinon.assert.called(utils.logError);
+    });
+    it('results with config available with url and debounce', function () {
+      idImportlibrary.setConfig({ 'url': 'URL', 'debounce': 0 });
+      sinon.assert.called(utils.logInfo);
+    });
+    it('results with config debounce ', function () {
+      let config = { 'url': 'URL', 'debounce': 300 }
+      idImportlibrary.setConfig(config);
+      expect(config.debounce).to.be.equal(300);
+    });
+
+    it('results with config default debounce ', function () {
+      let config = { 'url': 'URL' }
+      idImportlibrary.setConfig(config);
+      expect(config.debounce).to.be.equal(250);
+    });
+    it('results with config default fullscan ', function () {
+      let config = { 'url': 'URL', 'debounce': 0 }
+      idImportlibrary.setConfig(config);
+      expect(config.fullscan).to.be.equal(false);
+    });
+    it('results with config fullscan ', function () {
+      let config = { 'url': 'URL', 'fullscan': true, 'debounce': 0 }
+      idImportlibrary.setConfig(config);
+      expect(config.fullscan).to.be.equal(true);
+      expect(config.inputscan).to.be.equal(false);
+    });
+    it('results with config inputscan ', function () {
+      let config = { 'inputscan': true, 'debounce': 0 }
+      idImportlibrary.setConfig(config);
+      expect(config.inputscan).to.be.equal(true);
+    });
+  });
+  describe('Test with email is found', function () {
+    let mutationObserverStub;
+    let userId;
+    let refreshUserIdSpy;
+    beforeEach(function() {
+      let sandbox = sinon.createSandbox();
+      refreshUserIdSpy = sinon.stub(getGlobal(), 'refreshUserIds');
+      clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z
+      mutationObserverStub = sinon.stub(window, 'MutationObserver').returns(mockMutationObserver);
+      userId = sandbox.stub(getGlobal(), 'getUserIds').returns({id: {'MOCKID': '1111'}});
+      fakeServer.respondWith('POST', 'URL', [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        ''
+      ]);
+    });
+    afterEach(function () {
+      sandbox.restore();
+      clock.restore();
+      userId.restore();
+      refreshUserIdSpy.restore();
+      mutationObserverStub.restore();
+      document.body.innerHTML = '';
+    });
+
+    it('results with config fullscan with email found in html ', function () {
+      document.body.innerHTML = '<body><div>test@test.com</div></body>';
+      let config = { 'url': 'URL', 'fullscan': true, 'debounce': 0 }
+      idImportlibrary.setConfig(config);
+      expect(config.fullscan).to.be.equal(true);
+      expect(config.inputscan).to.be.equal(false);
+      expect(refreshUserIdSpy.calledOnce).to.equal(true);
+    });
+
+    it('results with config fullscan with no email found in html ', function () {
+      document.body.innerHTML = '<body><div>test</div></body>';
+      let config = { 'url': 'URL', 'fullscan': true, 'debounce': 0 }
+      idImportlibrary.setConfig(config);
+      expect(config.fullscan).to.be.equal(true);
+      expect(config.inputscan).to.be.equal(false);
+      expect(refreshUserIdSpy.calledOnce).to.equal(false);
+    });
+
+    it('results with config formElementId without listner ', function () {
+      let config = { url: 'testUrl', 'formElementId': 'userid', 'debounce': 0 }
+      document.body.innerHTML = '<body><input type="text" id="userid" value="test@test.com"></body>';
+      idImportlibrary.setConfig(config);
+      expect(config.formElementId).to.be.equal('userid');
+      expect(refreshUserIdSpy.calledOnce).to.equal(true);
+    });
+
+    it('results with config formElementId with listner ', function () {
+      let config = { url: 'testUrl', 'formElementId': 'userid', 'debounce': 0 }
+      document.body.innerHTML = '<body><input type="text" id="userid" value=""></body>';
+      idImportlibrary.setConfig(config);
+      expect(config.formElementId).to.be.equal('userid');
+      expect(refreshUserIdSpy.calledOnce).to.equal(false);
+    });
+
+    it('results with config target without listner ', function () {
+      let config = { url: 'testUrl', 'target': 'userid', 'debounce': 0 }
+      document.body.innerHTML = '<body><div id="userid">test@test.com<div></div></body>';
+      idImportlibrary.setConfig(config);
+      expect(config.target).to.be.equal('userid');
+      expect(refreshUserIdSpy.calledOnce).to.equal(true);
+    });
+    it('results with config target with listner ', function () {
+      let config = { url: 'testUrl', 'target': 'userid', 'debounce': 0 }
+      document.body.innerHTML = '<body><div id="userid"><div></div></body>';
+      idImportlibrary.setConfig(config);
+
+      expect(config.target).to.be.equal('userid');
+      expect(refreshUserIdSpy.calledOnce).to.equal(false);
+    });
+
+    it('results with config target with listner', function () {
+      let config = { url: 'testUrl', 'target': 'userid', 'debounce': 0 }
+      idImportlibrary.setConfig(config);
+      document.body.innerHTML = '<body><div id="userid">test@test.com<div></div></body>';
+      expect(config.target).to.be.equal('userid');
+      expect(refreshUserIdSpy.calledOnce).to.equal(false);
+    });
+    it('results with config fullscan ', function () {
+      let config = { url: 'testUrl', 'fullscan': true, 'debounce': 0 }
+      idImportlibrary.setConfig(config);
+      document.body.innerHTML = '<body><div id="userid"><div></div></body>';
+      expect(config.fullscan).to.be.equal(true);
+      expect(refreshUserIdSpy.calledOnce).to.equal(false);
+    });
+    it('results with config inputscan with listner', function () {
+      let config = { url: 'testUrl', 'inputscan': true, 'debounce': 0 }
+      var input = document.createElement('input');
+      input.setAttribute('type', 'text');
+      document.body.appendChild(input);
+      idImportlibrary.setConfig(config);
+      expect(config.inputscan).to.be.equal(true);
+      input.setAttribute('value', 'text@text.com');
+      const inputEvent = new InputEvent('blur');
+      input.dispatchEvent(inputEvent);
+      expect(refreshUserIdSpy.calledOnce).to.equal(true);
+    });
+
+    it('results with config inputscan with listner and no user ids ', function () {
+      let config = { 'url': 'testUrl', 'inputscan': true, 'debounce': 0 }
+      document.body.innerHTML = '<body><input  id="userid" value=""></body>';
+      idImportlibrary.setConfig(config);
+      expect(config.inputscan).to.be.equal(true);
+      expect(refreshUserIdSpy.calledOnce).to.equal(false);
+    });
+
+    it('results with config inputscan with listner ', function () {
+      let config = { 'url': 'testUrl', 'inputscan': true, 'debounce': 0 }
+      document.body.innerHTML = '<body><input  id="userid" type=text value=""></body>';
+      idImportlibrary.setConfig(config);
+      expect(config.inputscan).to.be.equal(true);
+      expect(refreshUserIdSpy.calledOnce).to.equal(false);
+    });
+
+    it('results with config inputscan without listner ', 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(refreshUserIdSpy.calledOnce).to.equal(true);
+    });
+  });
+  describe('Tests with no user ids', function () {
+    let mutationObserverStub;
+    let userId;
+    let jsonSpy;
+    beforeEach(function() {
+      let sandbox = sinon.createSandbox();
+      clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z
+      mutationObserverStub = sinon.stub(window, 'MutationObserver');
+      jsonSpy = sinon.spy(JSON, 'stringify');
+      fakeServer.respondWith('POST', 'URL', [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        ''
+      ]);
+    });
+    afterEach(function () {
+      sandbox.restore();
+      clock.restore();
+      jsonSpy.restore();
+      mutationObserverStub.restore();
+    });
+    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 #2', function () {
+      let config = { 'url': 'testUrl', 'inputscan': true, 'debounce': 0 }
+      document.body.innerHTML = '<body><input  id="userid"></body>';
+      idImportlibrary.setConfig(config);
+      expect(config.inputscan).to.be.equal(true);
+      expect(jsonSpy.calledOnce).to.equal(false);
+    });
+  });
+});
diff --git a/test/spec/modules/idWardRtdProvider_spec.js b/test/spec/modules/idWardRtdProvider_spec.js
new file mode 100644
index 00000000000..924a3794c7b
--- /dev/null
+++ b/test/spec/modules/idWardRtdProvider_spec.js
@@ -0,0 +1,116 @@
+import {config} from 'src/config.js';
+import {getRealTimeData, idWardRtdSubmodule, storage} from 'modules/idWardRtdProvider.js';
+
+describe('idWardRtdProvider', function() {
+  let getDataFromLocalStorageStub;
+
+  const testReqBidsConfigObj = {
+    adUnits: [
+      {
+        bids: ['bid1', 'bid2']
+      }
+    ]
+  };
+
+  const onDone = function() { return true };
+
+  const cmoduleConfig = {
+    'name': 'idWard',
+    'params': {
+      'cohortStorageKey': 'cohort_ids'
+    }
+  }
+
+  beforeEach(function() {
+    config.resetConfig();
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage')
+  });
+
+  afterEach(function () {
+    getDataFromLocalStorageStub.restore();
+  });
+
+  describe('idWardRtdSubmodule', function() {
+    it('successfully instantiates', function () {
+		  expect(idWardRtdSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Get Real-Time Data', function() {
+    it('gets rtd from local storage', function() {
+      const rtdConfig = {
+        params: {
+          cohortStorageKey: 'cohort_ids',
+          segtax: 503
+        }
+      };
+
+      const bidConfig = {
+        ortb2Fragments: {
+          global: {}
+        }
+      };
+
+      const rtdUserObj1 = {
+        name: 'id-ward.com',
+        ext: {
+          segtax: 503
+        },
+        segment: [
+          {
+            id: 'TCZPQOWPEJG3MJOTUQUF793A'
+          },
+          {
+            id: '93SUG3H540WBJMYNT03KX8N3'
+          }
+        ]
+      };
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns(JSON.stringify(['TCZPQOWPEJG3MJOTUQUF793A', '93SUG3H540WBJMYNT03KX8N3']));
+
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(bidConfig.ortb2Fragments.global.user.data).to.deep.include.members([rtdUserObj1]);
+    });
+
+    it('do not set rtd if local storage empty', function() {
+      const rtdConfig = {
+        params: {
+          cohortStorageKey: 'cohort_ids',
+          segtax: 503
+        }
+      };
+
+      const bidConfig = {};
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns(null);
+
+      expect(config.getConfig().ortb2).to.be.undefined;
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(config.getConfig().ortb2).to.be.undefined;
+    });
+
+    it('do not set rtd if local storage has incorrect value', function() {
+      const rtdConfig = {
+        params: {
+          cohortStorageKey: 'cohort_ids',
+          segtax: 503
+        }
+      };
+
+      const bidConfig = {};
+
+      getDataFromLocalStorageStub.withArgs('cohort_ids')
+        .returns('wrong cohort ids value');
+
+      expect(config.getConfig().ortb2).to.be.undefined;
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(config.getConfig().ortb2).to.be.undefined;
+    });
+
+    it('should initalise and return with config', function () {
+      expect(getRealTimeData(testReqBidsConfigObj, onDone, cmoduleConfig)).to.equal(undefined)
+    });
+  });
+});
diff --git a/test/spec/modules/identityLinkIdSystem_spec.js b/test/spec/modules/identityLinkIdSystem_spec.js
index 0d539d5988c..a31270c86c7 100644
--- a/test/spec/modules/identityLinkIdSystem_spec.js
+++ b/test/spec/modules/identityLinkIdSystem_spec.js
@@ -1,29 +1,36 @@
 import {identityLinkSubmodule} from 'modules/identityLinkIdSystem.js';
 import * as utils from 'src/utils.js';
 import {server} from 'test/mocks/xhr.js';
+import {getStorageManager} from '../../../src/storageManager.js';
+
+export const storage = getStorageManager();
 
 const pid = '14';
-const defaultConfigParams = {pid: pid};
+let defaultConfigParams;
 const responseHeader = {'Content-Type': 'application/json'}
 
 describe('IdentityLinkId tests', function () {
   let logErrorStub;
 
   beforeEach(function () {
+    defaultConfigParams = { params: {pid: pid} };
     logErrorStub = sinon.stub(utils, 'logError');
+    // remove _lr_retry_request cookie before test
+    storage.setCookie('_lr_retry_request', 'true', 'Thu, 01 Jan 1970 00:00:01 GMT');
   });
 
   afterEach(function () {
+    defaultConfigParams = {};
     logErrorStub.restore();
   });
 
   it('should log an error if no configParams were passed when getId', function () {
-    identityLinkSubmodule.getId();
+    identityLinkSubmodule.getId({ params: {} });
     expect(logErrorStub.calledOnce).to.be.true;
   });
 
   it('should log an error if pid configParam was not passed when getId', function () {
-    identityLinkSubmodule.getId({});
+    identityLinkSubmodule.getId({ params: {} });
     expect(logErrorStub.calledOnce).to.be.true;
   });
 
@@ -41,7 +48,22 @@ describe('IdentityLinkId tests', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should call the LiveRamp envelope endpoint with consent string', function () {
+  it('should NOT call the LiveRamp envelope endpoint if gdpr applies but consent string is empty string', function () {
+    let consentData = {
+      gdprApplies: true,
+      consentString: ''
+    };
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams, consentData);
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should NOT call the LiveRamp envelope endpoint if gdpr applies but consent string is missing', function () {
+    let consentData = { gdprApplies: true };
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams, consentData);
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should call the LiveRamp envelope endpoint with IAB consent string v1', function () {
     let callBackSpy = sinon.spy();
     let consentData = {
       gdprApplies: true,
@@ -59,6 +81,27 @@ describe('IdentityLinkId tests', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
+  it('should call the LiveRamp envelope endpoint with IAB consent string v2', function () {
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      consentString: 'CO4VThZO4VTiuADABBENAzCgAP_AAEOAAAAAAwwAgAEABhAAgAgAAA.YAAAAAAAAAA',
+      vendorData: {
+        tcfPolicyVersion: 2
+      }
+    };
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams, consentData).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://api.rlcdn.com/api/identity/envelope?pid=14&ct=4&cv=CO4VThZO4VTiuADABBENAzCgAP_AAEOAAAAAAwwAgAEABhAAgAgAAA.YAAAAAAAAAA');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
   it('should not throw Uncaught TypeError when envelope endpoint returns empty response', function () {
     let callBackSpy = sinon.spy();
     let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
@@ -88,4 +131,38 @@ describe('IdentityLinkId tests', function () {
     );
     expect(callBackSpy.calledOnce).to.be.true;
   });
+
+  it('should not call the LiveRamp envelope endpoint if cookie _lr_retry_request exist', function () {
+    let now = new Date();
+    now.setTime(now.getTime() + 3000);
+    storage.setCookie('_lr_retry_request', 'true', now.toUTCString());
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request).to.be.eq(undefined);
+  });
+
+  it('should call the LiveRamp envelope endpoint if cookie _lr_retry_request does not exist and notUse3P config property was not set', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://api.rlcdn.com/api/identity/envelope?pid=14');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should not call the LiveRamp envelope endpoint if config property notUse3P is set to true', function () {
+    defaultConfigParams.params.notUse3P = true;
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request).to.be.eq(undefined);
+  });
 });
diff --git a/test/spec/modules/idxBidAdapter_spec.js b/test/spec/modules/idxBidAdapter_spec.js
new file mode 100644
index 00000000000..4721b0d4b6e
--- /dev/null
+++ b/test/spec/modules/idxBidAdapter_spec.js
@@ -0,0 +1,103 @@
+import { expect } from 'chai'
+import { spec } from 'modules/idxBidAdapter.js'
+
+const BIDDER_CODE = 'idx'
+const ENDPOINT_URL = 'https://dev-event.dxmdp.com/rest/api/v1/bid'
+const DEFAULT_PRICE = 1
+const DEFAULT_CURRENCY = 'USD'
+const DEFAULT_BANNER_WIDTH = 300
+const DEFAULT_BANNER_HEIGHT = 250
+
+describe('idxBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let validBid = {
+      bidder: BIDDER_CODE,
+      mediaTypes: {
+        banner: {
+          sizes: [[DEFAULT_BANNER_WIDTH, DEFAULT_BANNER_HEIGHT]]
+        }
+      }
+    }
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, validBid)
+      bid.mediaTypes = {}
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+  })
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        bidder: BIDDER_CODE,
+        bidId: 'asdf12345',
+        mediaTypes: {
+          banner: {
+            sizes: [[DEFAULT_BANNER_WIDTH, DEFAULT_BANNER_HEIGHT]]
+          }
+        },
+      }
+    ]
+    let bidderRequest = {
+      bidderCode: BIDDER_CODE,
+      bidderRequestId: '12345asdf',
+      bids: [
+        {
+          ...bidRequests[0]
+        }
+      ],
+    }
+
+    it('sends video bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)
+      expect(request.url).to.equal(ENDPOINT_URL)
+      expect(request.method).to.equal('POST')
+    })
+  })
+  describe('interpretResponse', function () {
+    it('should get correct bid response', function () {
+      let response = {
+        id: 'f6adb85f-4e19-45a0-b41e-2a5b9a48f23a',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '123',
+                impid: 'b4f290d7-d4ab-4778-ab94-2baf06420b22',
+                price: DEFAULT_PRICE,
+                adm: '<b>hi</b>',
+                cid: 'test_cid',
+                crid: 'test_banner_crid',
+                w: DEFAULT_BANNER_WIDTH,
+                h: DEFAULT_BANNER_HEIGHT,
+                adomain: [],
+              }
+            ],
+            seat: BIDDER_CODE
+          }
+        ],
+      }
+
+      let expectedResponse = [
+        {
+          requestId: 'b4f290d7-d4ab-4778-ab94-2baf06420b22',
+          cpm: DEFAULT_PRICE,
+          width: DEFAULT_BANNER_WIDTH,
+          height: DEFAULT_BANNER_HEIGHT,
+          creativeId: 'test_banner_crid',
+          ad: '<b>hi</b>',
+          currency: DEFAULT_CURRENCY,
+          netRevenue: true,
+          ttl: 300,
+          meta: { advertiserDomains: [] },
+        }
+      ]
+      let result = spec.interpretResponse({ body: response })
+
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]))
+    })
+  })
+})
diff --git a/test/spec/modules/idxIdSystem_spec.js b/test/spec/modules/idxIdSystem_spec.js
new file mode 100644
index 00000000000..56e1c709c8b
--- /dev/null
+++ b/test/spec/modules/idxIdSystem_spec.js
@@ -0,0 +1,125 @@
+import { expect } from 'chai';
+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';
+const IDX_COOKIE_STORED = '{ "idx": "' + IDX_DUMMY_VALUE + '" }';
+const ID_COOKIE_OBJECT = { id: IDX_DUMMY_VALUE };
+const IDX_COOKIE_OBJECT = { idx: IDX_DUMMY_VALUE };
+
+function getConfigMock() {
+  return {
+    userSync: {
+      syncDelay: 0,
+      userIds: [{
+        name: 'idx'
+      }]
+    }
+  }
+}
+
+function getAdUnitMock(code = 'adUnit-code') {
+  return {
+    code,
+    mediaTypes: {banner: {}, native: {}},
+    sizes: [
+      [300, 200],
+      [300, 600]
+    ],
+    bids: [{
+      bidder: 'sampleBidder',
+      params: { placementId: 'banner-only-bidder' }
+    }]
+  };
+}
+
+describe('IDx ID System', () => {
+  let getDataFromLocalStorageStub, localStorageIsEnabledStub;
+  let getCookieStub, cookiesAreEnabledStub;
+
+  beforeEach(() => {
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+  });
+
+  afterEach(() => {
+    getDataFromLocalStorageStub.restore();
+    localStorageIsEnabledStub.restore();
+    getCookieStub.restore();
+    cookiesAreEnabledStub.restore();
+  });
+
+  describe('IDx: test "getId" method', () => {
+    it('provides the stored IDx if a cookie exists', () => {
+      getCookieStub.withArgs(IDX_COOKIE_NAME).returns(IDX_COOKIE_STORED);
+      let idx = idxIdSubmodule.getId();
+      expect(idx).to.deep.equal(ID_COOKIE_OBJECT);
+    });
+
+    it('provides the stored IDx if cookie is absent but present in local storage', () => {
+      getDataFromLocalStorageStub.withArgs(IDX_COOKIE_NAME).returns(IDX_COOKIE_STORED);
+      let idx = idxIdSubmodule.getId();
+      expect(idx).to.deep.equal(ID_COOKIE_OBJECT);
+    });
+
+    it('returns undefined if both cookie and local storage are empty', () => {
+      let idx = idxIdSubmodule.getId();
+      expect(idx).to.be.undefined;
+    })
+  });
+
+  describe('IDx: test "decode" method', () => {
+    it('provides the IDx from a stored object', () => {
+      expect(idxIdSubmodule.decode(ID_COOKIE_OBJECT)).to.deep.equal(IDX_COOKIE_OBJECT);
+    });
+
+    it('provides the IDx from a stored string', () => {
+      expect(idxIdSubmodule.decode(IDX_DUMMY_VALUE)).to.deep.equal(IDX_COOKIE_OBJECT);
+    });
+  });
+
+  describe('requestBids hook', () => {
+    let adUnits;
+    let sandbox;
+
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      mockGdprConsent(sandbox);
+      adUnits = [getAdUnitMock()];
+      init(config);
+      setSubmoduleRegistry([idxIdSubmodule]);
+      getCookieStub.withArgs(IDX_COOKIE_NAME).returns(IDX_COOKIE_STORED);
+      config.setConfig(getConfigMock());
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    })
+
+    it('when a stored IDx exists it is added to bids', (done) => {
+      requestBidsHook(() => {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.idx');
+            expect(bid.userId.idx).to.equal(IDX_DUMMY_VALUE);
+            const idxIdAsEid = find(bid.userIdAsEids, e => e.source == 'idx.lat');
+            expect(idxIdAsEid).to.deep.equal({
+              source: 'idx.lat',
+              uids: [{
+                id: IDX_DUMMY_VALUE,
+                atype: 1,
+              }]
+            });
+          });
+        });
+        done();
+      }, { adUnits });
+    });
+  });
+});
diff --git a/test/spec/modules/imRtdProvider_spec.js b/test/spec/modules/imRtdProvider_spec.js
new file mode 100644
index 00000000000..89328b91529
--- /dev/null
+++ b/test/spec/modules/imRtdProvider_spec.js
@@ -0,0 +1,209 @@
+import {
+  imRtdSubmodule,
+  storage,
+  getBidderFunction,
+  getCustomBidderFunction,
+  setRealTimeData,
+  getRealTimeData,
+  getApiCallback,
+  imUidLocalName,
+  imVidCookieName,
+  imRtdLocalName
+} from 'modules/imRtdProvider.js'
+import { timestamp } from '../../../src/utils.js'
+
+describe('imRtdProvider', function () {
+  let getLocalStorageStub;
+  let getCookieStub;
+
+  const testReqBidsConfigObj = {
+    adUnits: [
+      {
+        bids: ['test1', 'test2']
+      }
+    ]
+  };
+  const onDone = function() { return true };
+  const moduleConfig = {
+    params: {
+      cid: 5126,
+      setGptKeyValues: true,
+      maxSegments: 2
+    }
+  }
+
+  beforeEach(function (done) {
+    getLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    done();
+  });
+
+  afterEach(function () {
+    getLocalStorageStub.restore();
+    getCookieStub.restore();
+  });
+
+  describe('imRtdSubmodule', function () {
+    it('should initalise and return true', function () {
+      expect(imRtdSubmodule.init()).to.equal(true)
+    })
+  })
+
+  describe('getBidderFunction', function () {
+    const assumedBidder = [
+      'pubmatic',
+      'fluct'
+    ];
+    assumedBidder.forEach(bidderName => {
+      it(`should return bidderFunction with assumed bidder: ${bidderName}`, function () {
+        expect(getBidderFunction(bidderName)).to.exist.and.to.be.a('function');
+      });
+
+      it(`should return bid with correct key data: ${bidderName}`, function () {
+        const bid = {bidder: bidderName};
+        expect(getBidderFunction(bidderName)(bid, {'im_segments': ['12345', '67890']}, {params: {}})).to.equal(bid);
+      });
+      it(`should return bid without data: ${bidderName}`, function () {
+        const bid = {bidder: bidderName};
+        expect(getBidderFunction(bidderName)(bid, '', {params: {}})).to.equal(bid);
+      });
+    });
+    it(`should return null with unexpected bidder`, function () {
+      expect(getBidderFunction('test')).to.equal(null);
+    });
+    describe('fluct bidder function', function () {
+      it('should return a bid w/o im_segments if not any exists', function () {
+        const bid = {bidder: 'fluct'};
+        expect(getBidderFunction('fluct')(bid, '', {params: {}})).to.eql(bid);
+      });
+      it('should return a bid w/ im_segments if any exists', function () {
+        const bid = {
+          bidder: 'fluct',
+          params: {
+            kv: {
+              foo: ['foo1']
+            }
+          }
+        };
+        expect(getBidderFunction('fluct')(
+          bid,
+          {im_segments: ['12345', '67890', '09876']},
+          {params: {maxSegments: 2}}
+        ))
+          .to.eql(
+            {
+              bidder: 'fluct',
+              params: {
+                kv: {
+                  foo: ['foo1'],
+                  imsids: ['12345', '67890']
+                }
+              }
+            }
+          );
+      });
+    });
+  })
+
+  describe('getCustomBidderFunction', function () {
+    it('should return config function', function () {
+      const config = {
+        params: {
+          overwrites: {
+            testBidder: function() {
+              return 'testString';
+            }
+          }
+        }
+      };
+      const bidder = 'testBidder'
+      expect(getCustomBidderFunction(config, bidder)).to.exist.and.to.be.a('function');
+      expect(getCustomBidderFunction(config, bidder)()).to.equal('testString');
+    })
+    it('should return null when overwrites falsy', function () {
+      const config = {
+        params: {
+          overwrites: {
+            testBidder: null
+          }
+        }
+      };
+      const bidder = 'testBidder'
+      expect(getCustomBidderFunction(config, bidder)).to.equal(null);
+    })
+  })
+
+  describe('processBidderFunction', function () {
+
+  })
+
+  describe('setRealTimeData', function () {
+    it('should return true when empty params', function () {
+      expect(setRealTimeData({adUnits: []}, {params: {}}, {im_segments: []})).to.equal(undefined)
+    });
+    it('should return true when overwrites and bid params', function () {
+      const config = {
+        params: {
+          overwrites: {
+            testBidder: function() { return true }
+          }
+        }
+      };
+      expect(setRealTimeData(testReqBidsConfigObj, config, {im_segments: []})).to.equal(undefined)
+    });
+  })
+
+  describe('getRealTimeData', function () {
+    it('should initalise and return when empty params', function () {
+      expect(getRealTimeData({}, function() {}, {})).to.equal(undefined)
+    });
+
+    it('should initalise and return with config', function () {
+      expect(getRealTimeData(testReqBidsConfigObj, onDone, moduleConfig)).to.equal(undefined)
+    });
+
+    it('should return the uid when sids(rtd) not expired', function () {
+      getLocalStorageStub.withArgs(imUidLocalName).returns('testUid');
+      getLocalStorageStub.withArgs(imRtdLocalName).returns('testSids');
+      getCookieStub.withArgs(imVidCookieName).returns('testUid');
+      getLocalStorageStub.withArgs(`${imRtdLocalName}_mt`).returns(new Date(timestamp()).toUTCString());
+      expect(getRealTimeData(testReqBidsConfigObj, onDone, moduleConfig)).to.equal(undefined)
+    });
+
+    it('should return the uid when it exists uid, sids(rtd), vid in storages and sids(rtd) expired', function () {
+      getLocalStorageStub.withArgs(imUidLocalName).returns('testUid');
+      getLocalStorageStub.withArgs(imRtdLocalName).returns('testSids');
+      getCookieStub.withArgs(imVidCookieName).returns('testUid');
+      getLocalStorageStub.withArgs(`${imRtdLocalName}_mt`).returns(0);
+      expect(getRealTimeData(testReqBidsConfigObj, onDone, moduleConfig)).to.equal(undefined)
+    });
+
+    it('should return the uid when uid not expired', function () {
+      getLocalStorageStub.withArgs(imUidLocalName).returns('testUid');
+      getLocalStorageStub.withArgs(imRtdLocalName).returns('testSids');
+      getCookieStub.withArgs(imVidCookieName).returns('testUid');
+      getLocalStorageStub.withArgs(`${imUidLocalName}_mt`).returns(new Date(timestamp()).toUTCString());
+      expect(getRealTimeData(testReqBidsConfigObj, onDone, moduleConfig)).to.equal(undefined)
+    });
+  })
+
+  describe('getApiCallback', function () {
+    it('should return success and error functions', function () {
+      const res = getApiCallback(testReqBidsConfigObj, false, moduleConfig);
+      expect(res.success).to.exist.and.to.be.a('function');
+      expect(res.error).to.exist.and.to.be.a('function');
+    });
+
+    it('should return "undefined" success', function () {
+      const res = getApiCallback(testReqBidsConfigObj, false, moduleConfig);
+      const successResponse = '{"uid": "testid", "segments": "testsegment", "vid": "testvid"}';
+      expect(res.success(successResponse, {status: 200})).to.equal(undefined);
+      expect(res.error()).to.equal(undefined);
+    });
+
+    it('should return "undefined" catch error response', function () {
+      const res = getApiCallback(testReqBidsConfigObj, false, moduleConfig);
+      expect(res.success('error response', {status: 400})).to.equal(undefined);
+    });
+  })
+})
diff --git a/test/spec/modules/imonomyBidAdapter_spec.js b/test/spec/modules/imonomyBidAdapter_spec.js
deleted file mode 100644
index 45b3bed6e77..00000000000
--- a/test/spec/modules/imonomyBidAdapter_spec.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/imonomyBidAdapter.js';
-
-describe('Imonomy Adapter Tests', function () {
-  const bidsRequest = [
-    {
-      bidder: 'imonomy',
-      params: {
-        placementId: '170577',
-        hbid: '14567718624',
-      },
-      placementCode: 'div-gpt-ad-1460505748561-0',
-      transactionId: '9f801c02-bbe8-4683-8ed4-bc816ea186bb',
-      sizes: [
-        [300, 250]
-      ],
-      bidId: '2faedf1095f815',
-      bidderRequestId: '18065867f8ae39',
-      auctionId: '529e1518-b872-45cf-807c-2d41dfa5bcd3'
-    },
-    {
-      bidder: 'imonomy',
-      params: {
-        placementId: '281277',
-        hbid: '14567718624',
-        floorPrice: 0.5
-      },
-      placementCode: 'div-gpt-ad-1460505748561-0',
-      transactionId: '9f801c02-bbe8-4683-8ed4-bc816ea186bb',
-      sizes: [
-        [728, 90]
-      ],
-      bidId: '3c34e2367a3f59',
-      bidderRequestId: '18065867f8ae39',
-      auctionId: '529e1518-b872-45cf-807c-2d41dfa5bcd3'
-    }];
-
-  const bidsResponse = {
-    body: {
-      bids: [
-        {
-          placementid: '170577',
-          uuid: '2faedf1095f815',
-          width: 300,
-          height: 250,
-          cpm: 0.51,
-          creative: '<script type="text/javascript" src="https://creative.com/pathToNiceCreative"></script>',
-          ttl: 360,
-          currency: 'USD',
-          netRevenue: true,
-          creativeId: 'd30b58c2ba'
-        }
-      ]
-    }
-  };
-
-  it('Verifies imonomyAdapter bidder code', function () {
-    expect(spec.code).to.equal('imonomy');
-  });
-
-  it('Verifies imonomyAdapter bid request validation', function () {
-    expect(spec.isBidRequestValid(bidsRequest[0])).to.equal(true);
-    expect(spec.isBidRequestValid(bidsRequest[1])).to.equal(true);
-    expect(spec.isBidRequestValid({})).to.equal(false);
-    expect(spec.isBidRequestValid({ params: {} })).to.equal(false);
-    expect(spec.isBidRequestValid({ params: { hbid: 12345 } })).to.equal(false);
-    expect(spec.isBidRequestValid({ params: { placementid: 12345 } })).to.equal(false);
-    expect(spec.isBidRequestValid({ params: { hbid: 12345, placementId: 67890 } })).to.equal(true);
-    expect(spec.isBidRequestValid({ params: { hbid: 12345, placementId: 67890, floorPrice: 0.8 } })).to.equal(true);
-  });
-
-  it('Verify imonomyAdapter build request', function () {
-    var startTime = new Date().getTime();
-
-    const request = spec.buildRequests(bidsRequest);
-    expect(request.url).to.equal('https://b.imonomy.com/openrtb/hb/14567718624');
-    expect(request.method).to.equal('POST');
-    const requestData = JSON.parse(request.data);
-
-    // bids object
-    let bids = requestData.bids;
-    expect(bids).to.have.lengthOf(2);
-
-    // first bid request: no floor price
-    expect(bids[0].uuid).to.equal('2faedf1095f815');
-    expect(bids[0].floorprice).to.be.undefined;
-    expect(bids[0].placementid).to.equal('170577');
-    expect(bids[0].hbid).to.equal('14567718624');
-    expect(bids[0].trid).to.equal('9f801c02-bbe8-4683-8ed4-bc816ea186bb');
-    expect(bids[0].sizes).to.have.lengthOf(1);
-    expect(bids[0].sizes[0][0]).to.equal(300);
-    expect(bids[0].sizes[0][1]).to.equal(250);
-
-    // second bid request: with floor price
-    expect(bids[1].uuid).to.equal('3c34e2367a3f59');
-    expect(bids[1].floorprice).to.equal(0.5);
-    expect(bids[1].placementid).to.equal('281277');
-    expect(bids[1].hbid).to.equal('14567718624');
-    expect(bids[1].trid).to.equal('9f801c02-bbe8-4683-8ed4-bc816ea186bb');
-    expect(bids[1]).to.have.property('sizes')
-      .that.is.an('array')
-      .of.length(1)
-      .that.deep.equals([[728, 90]]);
-
-    // kbConf object
-    let kbConf = requestData.kbConf;
-    expect(kbConf.hdbdid).to.equal(bids[0].hbid);
-    expect(kbConf.hdbdid).to.equal(bids[1].hbid);
-    expect(kbConf.encode_bid).to.be.undefined;
-    // kbConf timezone and cb
-    expect(kbConf.cb).not.to.be.undefined;
-    expect(kbConf.ts_as).to.be.above(startTime - 1);
-    expect(kbConf.tz).to.equal(new Date().getTimezoneOffset());
-    // kbConf bid ids
-    expect(kbConf.hb_placement_bidids)
-      .to.have.property(bids[0].placementid)
-      .that.equal(bids[0].uuid);
-    expect(kbConf.hb_placement_bidids)
-      .to.have.property(bids[1].placementid)
-      .that.equal(bids[1].uuid);
-    // kbConf floor price
-    expect(kbConf.hb_floors).not.to.have.property(bids[0].placementid)
-    expect(kbConf.hb_floors).to.have.property(bids[1].placementid).that.equal(bids[1].floorprice);
-    // kbConf placement ids
-    expect(kbConf.hb_placements).to.have.lengthOf(2);
-    expect(kbConf.hb_placements[0]).to.equal(bids[0].placementid);
-    expect(kbConf.hb_placements[1]).to.equal(bids[1].placementid);
-  });
-
-  it('Verify imonomyAdapter build response', function () {
-    const request = spec.buildRequests(bidsRequest);
-    const bids = spec.interpretResponse(bidsResponse, request);
-
-    // 'server' return single bid
-    expect(bids).to.have.lengthOf(1);
-
-    // verify bid object
-    const bid = bids[0];
-    const responseBids = bidsResponse.body.bids;
-
-    expect(bid.cpm).to.equal(responseBids[0].cpm);
-    expect(bid.ad).to.equal(responseBids[0].creative);
-    expect(bid.requestId).equal(responseBids[0].uuid);
-    expect(bid.uuid).equal(responseBids[0].uuid);
-    expect(bid.width).to.equal(responseBids[0].width);
-    expect(bid.height).to.equal(responseBids[0].height);
-    expect(bid.ttl).to.equal(responseBids[0].ttl);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.creativeId).to.equal(responseBids[0].creativeId);
-  });
-
-  it('Verifies imonomyAdapter sync options', function () {
-    // user sync disabled
-    expect(spec.getUserSyncs({})).to.be.undefined;
-    expect(spec.getUserSyncs({ iframeEnabled: false })).to.be.undefined;
-    // user sync enabled
-    const options = spec.getUserSyncs({ iframeEnabled: true });
-    expect(options).to.not.be.undefined;
-    expect(options).to.have.lengthOf(1);
-    expect(options[0].type).to.equal('iframe');
-    expect(options[0].url).to.equal('https://b.imonomy.com/UserMatching/b/');
-  });
-});
diff --git a/test/spec/modules/impactifyBidAdapter_spec.js b/test/spec/modules/impactifyBidAdapter_spec.js
new file mode 100644
index 00000000000..215972ff450
--- /dev/null
+++ b/test/spec/modules/impactifyBidAdapter_spec.js
@@ -0,0 +1,426 @@
+import { expect } from 'chai';
+import { spec } from 'modules/impactifyBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const BIDDER_CODE = 'impactify';
+const BIDDER_ALIAS = ['imp'];
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_VIDEO_WIDTH = 640;
+const DEFAULT_VIDEO_HEIGHT = 480;
+const ORIGIN = 'https://sonic.impactify.media';
+const LOGGER_URI = 'https://logger.impactify.media';
+const AUCTIONURI = '/bidder';
+const COOKIESYNCURI = '/static/cookie_sync.html';
+const GVLID = 606;
+
+var gdprData = {
+  'consentString': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
+  'gdprApplies': true
+};
+
+describe('ImpactifyAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let validBid = {
+      bidder: 'impactify',
+      params: {
+        appId: '1',
+        format: 'screen',
+        style: 'inline'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, validBid);
+      delete bid.params;
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when appId is missing', () => {
+      const bid = utils.deepClone(validBid);
+      delete bid.params.appId;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when appId is not a string', () => {
+      const bid = utils.deepClone(validBid);
+
+      bid.params.appId = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.appId = false;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.appId = void (0);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.appId = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when format is missing', () => {
+      const bid = utils.deepClone(validBid);
+      delete bid.params.format;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when format is not a string', () => {
+      const bid = utils.deepClone(validBid);
+
+      bid.params.format = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.format = false;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.format = void (0);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.format = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when format is not equals to screen or display', () => {
+      const bid = utils.deepClone(validBid);
+      if (bid.params.format != 'screen' && bid.params.format != 'display') {
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      }
+    });
+
+    it('should return false when style is missing', () => {
+      const bid = utils.deepClone(validBid);
+      delete bid.params.style;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when style is not a string', () => {
+      const bid = utils.deepClone(validBid);
+
+      bid.params.style = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.style = false;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.style = void (0);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.style = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+  describe('buildRequests', function () {
+    let videoBidRequests = [
+      {
+        bidder: 'impactify',
+        params: {
+          appId: '1',
+          format: 'screen',
+          style: 'inline'
+        },
+        mediaTypes: {
+          video: {
+            context: 'instream'
+          }
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[DEFAULT_VIDEO_WIDTH, DEFAULT_VIDEO_HEIGHT]],
+        bidId: '123456789',
+        bidderRequestId: '987654321',
+        auctionId: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+        transactionId: 'f7b2c372-7a7b-11eb-9439-0242ac130002',
+        userId: {
+          pubcid: '87a0327b-851c-4bb3-a925-0c7be94548f5'
+        },
+        userIdAsEids: [
+          {
+            source: 'pubcid.org',
+            uids: [
+              {
+                id: '87a0327b-851c-4bb3-a925-0c7be94548f5',
+                atype: 1
+              }
+            ]
+          }
+        ]
+      }
+    ];
+    let videoBidderRequest = {
+      bidderRequestId: '98845765110',
+      auctionId: '165410516454',
+      bidderCode: 'impactify',
+      bids: [
+        {
+          ...videoBidRequests[0]
+        }
+      ],
+      refererInfo: {
+        referer: 'https://impactify.io'
+      }
+    };
+
+    it('should pass bidfloor', function () {
+      videoBidRequests[0].getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 1.23,
+        }
+      }
+
+      const res = spec.buildRequests(videoBidRequests, videoBidderRequest)
+      const resData = JSON.parse(res.data)
+      expect(resData.imp[0].bidfloor).to.equal(1.23)
+    });
+
+    it('sends video bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(videoBidRequests, videoBidderRequest);
+      expect(request.url).to.equal(ORIGIN + AUCTIONURI);
+      expect(request.method).to.equal('POST');
+    });
+  });
+  describe('interpretResponse', function () {
+    it('should get correct bid response', function () {
+      let response = {
+        id: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '65820304700829014',
+                impid: '462c08f20d428',
+                price: 3.40,
+                adm: '<script type="text/javascript" src="https://ad.impactify.io/static/ad/tag.js"></script>',
+                adid: '97517771',
+                iurl: 'https://fra1-ib.adnxs.com/cr?id=97517771',
+                cid: '9325',
+                crid: '97517771',
+                w: 1,
+                h: 1,
+                hash: 'test',
+                expiry: 166192938,
+                meta: {'advertiserDomains': ['testdomain.com']},
+                ext: {
+                  prebid: {
+                    'type': 'video'
+                  },
+                  bidder: {
+                    prebid: {
+                      type: 'video',
+                      video: {
+                        duration: 30,
+                        primary_category: ''
+                      }
+                    },
+                    bidder: {
+                      appnexus: {
+                        brand_id: 182979,
+                        auction_id: 8657683934873599656,
+                        bidder_id: 2,
+                        bid_ad_type: 1,
+                        creative_info: {
+                          video: {
+                            duration: 30,
+                            mimes: [
+                              'video/x-flv',
+                              'video/mp4',
+                              'video/webm'
+                            ]
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            seat: 'impactify'
+          }
+        ],
+        cur: DEFAULT_CURRENCY,
+        ext: {
+          responsetimemillis: {
+            impactify: 114
+          },
+          prebid: {
+            auctiontimestamp: 1614587024591
+          }
+        }
+      };
+      let bidderRequest = {
+        bids: [
+          {
+            bidId: '462c08f20d428',
+            adUnitCode: '/19968336/header-bid-tag-1',
+            auctionId: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+            bidder: 'impactify',
+            sizes: [[DEFAULT_VIDEO_WIDTH, DEFAULT_VIDEO_HEIGHT]],
+            mediaTypes: {
+              video: {
+                context: 'outstream'
+              }
+            }
+          },
+        ]
+      }
+      let expectedResponse = [
+        {
+          id: '65820304700829014',
+          requestId: '462c08f20d428',
+          cpm: 3.40,
+          currency: DEFAULT_CURRENCY,
+          netRevenue: true,
+          ad: '<script type="text/javascript" src="https://ad.impactify.io/static/ad/tag.js"></script>',
+          width: 1,
+          height: 1,
+          hash: 'test',
+          expiry: 166192938,
+          meta: {'advertiserDomains': ['testdomain.com']},
+          ttl: 300,
+          creativeId: '97517771'
+        }
+      ];
+      let result = spec.interpretResponse({ body: response }, bidderRequest);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+  });
+  describe('getUserSyncs', function () {
+    let videoBidRequests = [
+      {
+        bidder: 'impactify',
+        params: {
+          appId: '1',
+          format: 'screen',
+          style: 'inline'
+        },
+        mediaTypes: {
+          video: {
+            context: 'instream'
+          }
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[DEFAULT_VIDEO_WIDTH, DEFAULT_VIDEO_HEIGHT]],
+        bidId: '123456789',
+        bidderRequestId: '987654321',
+        auctionId: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+        transactionId: 'f7b2c372-7a7b-11eb-9439-0242ac130002'
+      }
+    ];
+    let videoBidderRequest = {
+      bidderRequestId: '98845765110',
+      auctionId: '165410516454',
+      bidderCode: 'impactify',
+      bids: [
+        {
+          ...videoBidRequests[0]
+        }
+      ],
+      refererInfo: {
+        referer: 'https://impactify.io'
+      }
+    };
+    let validResponse = {
+      id: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+      seatbid: [
+        {
+          bid: [
+            {
+              id: '65820304700829014',
+              impid: '462c08f20d428',
+              price: 3.40,
+              adm: '<script type="text/javascript" src="https://ad.impactify.io/static/ad/tag.js"></script>',
+              adid: '97517771',
+              iurl: 'https://fra1-ib.adnxs.com/cr?id=97517771',
+              cid: '9325',
+              crid: '97517771',
+              w: 1,
+              h: 1,
+              hash: 'test',
+              expiry: 166192938,
+              meta: {'advertiserDomains': ['testdomain.com']},
+              ext: {
+                prebid: {
+                  'type': 'video'
+                },
+                bidder: {
+                  prebid: {
+                    type: 'video',
+                    video: {
+                      duration: 30,
+                      primary_category: ''
+                    }
+                  },
+                  bidder: {
+                    appnexus: {
+                      brand_id: 182979,
+                      auction_id: 8657683934873599656,
+                      bidder_id: 2,
+                      bid_ad_type: 1,
+                      creative_info: {
+                        video: {
+                          duration: 30,
+                          mimes: [
+                            'video/x-flv',
+                            'video/mp4',
+                            'video/webm'
+                          ]
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          seat: 'impactify'
+        }
+      ],
+      cur: DEFAULT_CURRENCY,
+      ext: {
+        responsetimemillis: {
+          impactify: 114
+        },
+        prebid: {
+          auctiontimestamp: 1614587024591
+        }
+      }
+    };
+    it('should return empty response if server response is false', function () {
+      const result = spec.getUserSyncs('bad', false, gdprData);
+      expect(result).to.be.empty;
+    });
+    it('should return empty response if server response is empty', function () {
+      const result = spec.getUserSyncs('bad', [], gdprData);
+      expect(result).to.be.empty;
+    });
+    it('should append the various values if they exist', function() {
+      const result = spec.getUserSyncs({iframeEnabled: true}, validResponse, gdprData);
+      expect(result[0].url).to.include('gdpr=1');
+      expect(result[0].url).to.include('gdpr_consent=BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
+    });
+  });
+
+  describe('On winning bid', function () {
+    const bid = {
+      ad: '<script type="text/javascript" src="https://ad.impactify.io/static/ad/tag.js"></script>',
+      cpm: '2'
+    };
+    const result = spec.onBidWon(bid);
+    assert.ok(result);
+  });
+
+  describe('On bid Time out', function () {
+    const bid = {
+      ad: '<script type="text/javascript" src="https://ad.impactify.io/static/ad/tag.js"></script>',
+      cpm: '2'
+    };
+    const result = spec.onTimeout(bid);
+    assert.ok(result);
+  });
+})
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index 5a20944a6ed..400b9145e0b 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -1,14 +1,34 @@
 import { expect } from 'chai';
-import { ImproveDigitalAdServerJSClient, spec } from 'modules/improvedigitalBidAdapter.js';
+import {CONVERTER, spec} from 'modules/improvedigitalBidAdapter.js';
 import { config } from 'src/config.js';
-import * as utils from 'src/utils.js';
+import { deepClone } from 'src/utils.js';
+import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes';
+import { deepSetValue } from '../../../src/utils';
+// load modules that register ORTB processors
+import 'src/prebid.js';
+import 'modules/currency.js';
+import 'modules/userId/index.js';
+import 'modules/multibid/index.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagement.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
+import {decorateAdUnitsWithNativeParams, toLegacyResponse} from '../../../src/native.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
+import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
+import {hook} from '../../../src/hook.js';
 
 describe('Improve Digital Adapter Tests', function () {
-  const idClient = new ImproveDigitalAdServerJSClient('hb');
-
-  const METHOD = 'GET';
-  const URL = 'https://ice.360yield.com/hb';
-  const PARAM_PREFIX = 'jsonp=';
+  const METHOD = 'POST';
+  const AD_SERVER_BASE_URL = 'https://ad.360yield.com';
+  const BASIC_ADS_BASE_URL = 'https://ad.360yield-basic.com';
+  const PB_ENDPOINT = 'pb';
+  const AD_SERVER_URL = `${AD_SERVER_BASE_URL}/${PB_ENDPOINT}`;
+  const BASIC_ADS_URL = `${BASIC_ADS_BASE_URL}/${PB_ENDPOINT}`;
+  const EXTEND_URL = 'https://pbs.360yield.com/openrtb2/auction';
+  const IFRAME_SYNC_URL = 'https://hb.360yield.com/prebid-universal-creative/load-cookie.html';
+  const INSTREAM_TYPE = 1;
+  const OUTSTREAM_TYPE = 3;
 
   const simpleBidRequest = {
     bidder: 'improvedigital',
@@ -22,21 +42,40 @@ describe('Improve Digital Adapter Tests', function () {
     auctionId: '192721e36a0239',
     mediaTypes: {
       banner: {
-        sizes: [[300, 250], [160, 600], ['blah', 150], [-1, 300], [300, -5]]
+        sizes: [[300, 250], [160, 600]]
       }
     },
-    sizes: [[300, 250], [160, 600], ['blah', 150], [-1, 300], [300, -5]]
+    sizes: [[300, 250], [160, 600]]
   };
 
-  const instreamBidRequest = utils.deepClone(simpleBidRequest);
-  instreamBidRequest.mediaTypes = {
-    video: {
-      context: 'instream',
-      playerSize: [640, 480]
+  const extendBidRequest = deepClone(simpleBidRequest);
+  extendBidRequest.params.extend = true;
+
+  const videoParams = {
+    skip: 1,
+    skipmin: 5,
+    skipafter: 30
+  }
+
+  const instreamBidRequest = {
+    bidder: 'improvedigital',
+    params: {
+      placementId: 123456
+    },
+    adUnitCode: 'video1',
+    transactionId: 'vf183e871-fbed-45f0-a427-c8a63c4c01eb',
+    bidId: '33e9500b21129f',
+    bidderRequestId: 'v2772c1e566670b',
+    auctionId: 'v192721e36a0239',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480]
+      }
     }
   };
 
-  const outstreamBidRequest = utils.deepClone(simpleBidRequest);
+  const outstreamBidRequest = deepClone(instreamBidRequest);
   outstreamBidRequest.mediaTypes = {
     video: {
       context: 'outstream',
@@ -44,18 +83,33 @@ describe('Improve Digital Adapter Tests', function () {
     }
   };
 
-  const multiFormatBidRequest = utils.deepClone(simpleBidRequest);
+  const nativeBidRequest = deepClone(simpleBidRequest);
+  nativeBidRequest.mediaTypes = { native: {} };
+  nativeBidRequest.nativeParams = {
+    title: {required: true},
+    body: {required: true}
+  };
+
+  const multiFormatBidRequest = deepClone(simpleBidRequest);
   multiFormatBidRequest.mediaTypes = {
     banner: {
-      sizes: [[300, 250], [160, 600], ['blah', 150], [-1, 300], [300, -5]]
+      sizes: [[300, 250], [160, 600]]
     },
+    native: {},
     video: {
       context: 'outstream',
       playerSize: [640, 480]
     }
   };
 
+  multiFormatBidRequest.nativeParams = {
+    body: {
+      required: true
+    }
+  };
+
   const simpleSmartTagBidRequest = {
+    mediaTypes: {},
     bidder: 'improvedigital',
     bidId: '1a2b3c',
     placementCode: 'placement1',
@@ -66,37 +120,60 @@ describe('Improve Digital Adapter Tests', function () {
   };
 
   const bidderRequest = {
-    bids: [simpleBidRequest]
+    bids: [simpleBidRequest],
+  };
+
+  const extendBidderRequest = {
+    bids: [extendBidRequest],
   };
 
   const instreamBidderRequest = {
-    bids: [instreamBidRequest]
+    bids: [instreamBidRequest],
   };
 
   const outstreamBidderRequest = {
-    bids: [outstreamBidRequest]
+    bids: [outstreamBidRequest],
   };
 
   const multiFormatBidderRequest = {
-    bids: [multiFormatBidRequest]
+    bids: [multiFormatBidRequest],
+  };
+
+  const nativeBidderRequest = {
+    bids: [nativeBidRequest],
+  };
+
+  const gdprConsent = {
+    apiVersion: 2,
+    consentString: 'CONSENT',
+    vendorData: { purpose: { consents: { 1: true } } },
+    gdprApplies: true,
+    addtlConsent: '1~1.35.41.101',
   };
 
   const bidderRequestGdpr = {
     bids: [simpleBidRequest],
-    gdprConsent: {
-      consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
-      vendorData: {},
-      gdprApplies: true
-    },
+    gdprConsent
   };
 
   const bidderRequestReferrer = {
     bids: [simpleBidRequest],
     refererInfo: {
-      referer: 'https://blah.com/test.html',
+      page: 'https://blah.com/test.html',
+      domain: 'blah.com'
     },
   };
 
+  function updateNativeParams(bidRequests) {
+    bidRequests = deepClone(bidRequests);
+    decorateAdUnitsWithNativeParams(bidRequests);
+    return bidRequests;
+  }
+
+  before(() => {
+    hook.ready();
+  });
+
   describe('isBidRequestValid', function () {
     it('should return false when no bid', function () {
       expect(spec.isBidRequestValid()).to.equal(false);
@@ -137,65 +214,135 @@ describe('Improve Digital Adapter Tests', function () {
   });
 
   describe('buildRequests', function () {
-    it('should make a well-formed request objects', function () {
-      const requests = spec.buildRequests([simpleBidRequest], bidderRequest);
-      expect(requests).to.be.an('array');
-      expect(requests.length).to.equal(1);
+    let getConfigStub = null;
 
-      const request = requests[0];
+    afterEach(function () {
+      if (getConfigStub) {
+        getConfigStub.restore();
+        getConfigStub = null;
+      }
+    });
+
+    it('should make a well-formed request objects', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
+      const request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequest))[0];
+      expect(request).to.be.an('object');
       expect(request.method).to.equal(METHOD);
-      expect(request.url).to.equal(URL);
-      expect(request.bidderRequest).to.deep.equal(bidderRequest);
-      expect(request.data.substring(0, PARAM_PREFIX.length)).to.equal(PARAM_PREFIX);
-
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request).to.be.an('object');
-      expect(params.bid_request.id).to.be.a('string');
-      expect(params.bid_request.version).to.equal(`${spec.version}-${idClient.CONSTANTS.CLIENT_VERSION}`);
-      expect(params.bid_request.gdpr).to.not.exist;
-      expect(params.bid_request.us_privacy).to.not.exist;
-      expect(params.bid_request.imp).to.deep.equal([
-        {
+      expect(request.url).to.equal(AD_SERVER_URL);
+
+      const payload = JSON.parse(request.data);
+      expect(payload).to.be.an('object');
+      expect(payload.id).to.be.a('string');
+      expect(payload.tmax).not.to.exist;
+      expect(payload.regs).to.not.exist;
+      expect(payload.schain).to.not.exist;
+      sinon.assert.match(payload.source, {tid: 'f183e871-fbed-45f0-a427-c8a63c4c01eb'})
+      expect(payload.device).to.be.an('object');
+      expect(payload.user).to.not.exist;
+      sinon.assert.match(payload.imp, [
+        sinon.match({
           id: '33e9500b21129f',
-          pid: 1053688,
-          tid: 'f183e871-fbed-45f0-a427-c8a63c4c01eb',
-          banner: {}
-        }
+          secure: 0,
+          ext: {
+            bidder: {
+              placementId: 1053688,
+            }
+          },
+          banner: {
+            format: [
+              {w: 300, h: 250},
+              {w: 160, h: 600},
+            ]
+          }
+        })
       ]);
     });
 
     it('should make a well-formed request object for multi-format ad unit', function () {
-      const requests = spec.buildRequests([multiFormatBidRequest], multiFormatBidderRequest);
-      expect(requests).to.be.an('array');
-      expect(requests.length).to.equal(1);
-
-      const request = requests[0];
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
+      const request = spec.buildRequests(updateNativeParams([multiFormatBidRequest]), multiFormatBidderRequest)[0];
+      expect(request).to.be.an('object');
       expect(request.method).to.equal(METHOD);
-      expect(request.url).to.equal(URL);
-      expect(request.bidderRequest).to.deep.equal(multiFormatBidderRequest);
-      expect(request.data.substring(0, PARAM_PREFIX.length)).to.equal(PARAM_PREFIX);
-
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request).to.be.an('object');
-      expect(params.bid_request.id).to.be.a('string');
-      expect(params.bid_request.version).to.equal(`${spec.version}-${idClient.CONSTANTS.CLIENT_VERSION}`);
-      expect(params.bid_request.gdpr).to.not.exist;
-      expect(params.bid_request.us_privacy).to.not.exist;
-      expect(params.bid_request.imp).to.deep.equal([
-        {
+      expect(request.url).to.equal(AD_SERVER_URL);
+
+      const payload = JSON.parse(request.data);
+      expect(payload).to.be.an('object');
+      sinon.assert.match(payload.imp, [
+        sinon.match({
           id: '33e9500b21129f',
-          pid: 1053688,
-          tid: 'f183e871-fbed-45f0-a427-c8a63c4c01eb',
-          banner: {}
-        }
+          secure: 0,
+          ext: {
+            bidder: {
+              placementId: 1053688,
+            }
+          },
+          video: {
+            placement: OUTSTREAM_TYPE,
+            w: 640,
+            h: 480,
+            mimes: ['video/mp4'],
+          },
+          banner: {
+            format: [
+              {w: 300, h: 250},
+              {w: 160, h: 600},
+            ]
+          }
+        })
       ]);
+      if (FEATURES.NATIVE) {
+        sinon.assert.match(payload.imp[0], {
+          native: {
+            ver: '1.2'
+          },
+        })
+        const nativeReq = JSON.parse(payload.imp[0].native.request);
+        sinon.assert.match(nativeReq, {
+          eventtrackers: [
+            {event: 1, methods: [1, 2]},
+          ],
+          'assets': [
+            sinon.match({'required': 1, 'data': {'type': 2}})
+          ]
+        });
+      }
     });
 
+    if (FEATURES.NATIVE) {
+      it('should make a well-formed native request', function () {
+        const payload = JSON.parse(spec.buildRequests(updateNativeParams([nativeBidRequest]), {})[0].data);
+        const nativeReq = JSON.parse(payload.imp[0].native.request);
+        sinon.assert.match(nativeReq, {
+          eventtrackers: [
+            {event: 1, methods: [1, 2]},
+          ],
+          assets: [
+            sinon.match({required: 1, title: {len: 140}}),
+            sinon.match({required: 1, data: {type: 2}})
+          ]
+        })
+      });
+
+      it('should not make native request when nativeOrtbRequest is undefined', function () {
+        const requests = updateNativeParams([nativeBidRequest]);
+        delete requests[0].nativeOrtbRequest;
+        const payload = JSON.parse(spec.buildRequests(requests, {})[0].data);
+        expect(payload.imp[0].native).to.not.exist;
+      });
+
+      it('should not make native request when no assets', function () {
+        const requests = updateNativeParams([{...nativeBidRequest, nativeParams: {}}])
+        const payload = JSON.parse(spec.buildRequests(requests, {})[0].data);
+        expect(payload.imp[0].native).to.not.exist;
+      });
+    }
+
     it('should set placementKey and publisherId for smart tags', function () {
-      const requests = spec.buildRequests([simpleSmartTagBidRequest], bidderRequest);
-      const params = JSON.parse(decodeURIComponent(requests[0].data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].pubid).to.equal(1032);
-      expect(params.bid_request.imp[0].pkey).to.equal('data_team_test_hb_smoke_test');
+      const payload = JSON.parse(spec.buildRequests([simpleSmartTagBidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].ext.bidder.publisherId).to.equal(1032);
+      expect(payload.imp[0].ext.bidder.placementKey).to.equal('data_team_test_hb_smoke_test');
     });
 
     it('should add keyValues', function () {
@@ -206,134 +353,216 @@ describe('Improve Digital Adapter Tests', function () {
         ]
       };
       bidRequest.params.keyValues = keyValues;
-      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].kvw).to.deep.equal(keyValues);
-    });
-
-    it('should add single size filter', function () {
-      const bidRequest = Object.assign({}, simpleBidRequest);
-      const size = {
-        w: 800,
-        h: 600
-      };
-      bidRequest.params.size = size;
-      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].banner).to.deep.equal(size);
-      // When single size filter is set, format shouldn't be populated. This
-      // is to maintain backward compatibily
-      expect(params.bid_request.imp[0].banner.format).to.not.exist;
+      const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].ext.bidder.keyValues).to.deep.equal(keyValues);
     });
 
     it('should add currency', function () {
-      const bidRequest = Object.assign({}, simpleBidRequest);
-      const getConfigStub = sinon.stub(config, 'getConfig').returns('JPY');
-      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].currency).to.equal('JPY');
-      getConfigStub.restore();
+      config.setConfig({currency: {adServerCurrency: 'JPY'}});
+      try {
+        const bidRequest = Object.assign({}, simpleBidRequest);
+        const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+        expect(payload.cur).to.deep.equal(['JPY']);
+      } finally {
+        config.resetConfig();
+      }
     });
 
     it('should add bid floor', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
-      let request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      let params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      let payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
       // Floor price currency shouldn't be populated without a floor price
-      expect(params.bid_request.imp[0].bidfloorcur).to.not.exist;
+      expect(payload.imp[0].bidfloorcur).to.not.exist;
 
       // Default floor price currency
       bidRequest.params.bidFloor = 0.05;
-      request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].bidfloor).to.equal(0.05);
-      expect(params.bid_request.imp[0].bidfloorcur).to.equal('USD');
+      payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].bidfloor).to.equal(0.05);
+      expect(payload.imp[0].bidfloorcur).to.equal('USD');
 
       // Floor price currency
       bidRequest.params.bidFloorCur = 'eUR';
-      request = spec.buildRequests([bidRequest])[0];
-      params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].bidfloor).to.equal(0.05);
-      expect(params.bid_request.imp[0].bidfloorcur).to.equal('EUR');
+      payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].bidfloor).to.equal(0.05);
+      expect(payload.imp[0].bidfloorcur).to.equal('EUR');
+
+      // getFloor defined -> use it over bidFloor
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      bidRequest.getFloor = () => getFloorResponse;
+      payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].bidfloor).to.equal(3);
+      // expect(payload.imp[0].bidfloorcur).to.equal('USD');
     });
 
     it('should add GDPR consent string', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
-      const request = spec.buildRequests([bidRequest], bidderRequestGdpr)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.gdpr).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
+      const payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
+      expect(payload.regs.ext.gdpr).to.exist.and.to.equal(1);
+      expect(payload.user.ext.consent).to.equal('CONSENT');
+      expect(payload.user.ext.ConsentedProvidersSettings).to.not.exist;
+      expect(payload.user.ext.consented_providers_settings.consented_providers).to.exist.and.to.deep.equal([1, 35, 41, 101]);
+    });
+
+    it('should not add consented providers when empty', function () {
+      const bidderRequestGdprEmptyAddtl = deepClone(bidderRequestGdpr);
+      bidderRequestGdprEmptyAddtl.gdprConsent.addtlConsent = '1~';
+      const bidRequest = Object.assign({}, simpleBidRequest);
+      const payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdprEmptyAddtl))[0].data);
+      expect(payload.user.ext.consented_providers_settings).to.not.exist;
+    });
+
+    it('should add ConsentedProvidersSettings when extend mode enabled', function () {
+      const bidRequest = deepClone(extendBidRequest);
+      const payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
+      expect(payload.regs.ext.gdpr).to.exist.and.to.equal(1);
+      expect(payload.user.ext.consent).to.equal('CONSENT');
+      expect(payload.user.ext.ConsentedProvidersSettings.consented_providers).to.exist.and.to.equal('1~1.35.41.101');
+      expect(payload.user.ext.consented_providers_settings).to.not.exist;
     });
 
     it('should add CCPA consent string', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
-      const request = spec.buildRequests([bidRequest], { uspConsent: '1YYY' })[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.us_privacy).to.equal('1YYY');
+      const request = spec.buildRequests([bidRequest], syncAddFPDToBidderRequest({...bidderRequest, ...{ uspConsent: '1YYY' }}));
+      const payload = JSON.parse(request[0].data);
+      expect(payload.regs.ext.us_privacy).to.equal('1YYY');
+    });
+
+    it('should add COPPA flag', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('coppa').returns(true);
+      let bidRequest = Object.assign({}, simpleBidRequest);
+      let payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
+      expect(payload.regs.coppa).to.equal(1);
+      getConfigStub.withArgs('coppa').returns(false);
+      bidRequest = Object.assign({}, simpleBidRequest);
+      payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
+      expect(payload.regs.coppa).to.equal(0);
     });
 
     it('should add referrer', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
-      const request = spec.buildRequests([bidRequest], bidderRequestReferrer)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.referrer).to.equal('https://blah.com/test.html');
+      const request = spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestReferrer))[0];
+      const payload = JSON.parse(request.data);
+      expect(payload.site.page).to.equal('https://blah.com/test.html');
     });
 
-    it('should add ad type for instream video', function () {
-      let bidRequest = Object.assign({}, simpleBidRequest);
-      bidRequest.mediaType = 'video';
-      let request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      let params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].ad_types).to.deep.equal(['video']);
+    it('should add timeout', function () {
+      const bidderRequestTimeout = deepClone(bidderRequest);
+      // Int
+      bidderRequestTimeout.timeout = 300;
+      const bidRequest = Object.assign({}, simpleBidRequest);
+      let request = spec.buildRequests([bidRequest], bidderRequestTimeout)[0];
+      expect(JSON.parse(request.data).tmax).to.equal(300);
 
-      bidRequest = Object.assign({}, simpleBidRequest);
+      // String
+      bidderRequestTimeout.timeout = '500';
+      request = spec.buildRequests([bidRequest], bidderRequestTimeout)[0];
+      expect(JSON.parse(request.data).tmax).to.equal(500);
+    });
+
+    it('should not add video params for banner', function () {
+      const bidRequest = deepClone(simpleBidRequest);
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].video).to.not.exist;
+    });
+
+    it('should add correct placement value for instream and outstream video', function () {
+      let bidRequest = deepClone(simpleBidRequest);
+      let payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].video).to.not.exist;
+
+      bidRequest = deepClone(simpleBidRequest);
       bidRequest.mediaTypes = {
         video: {
           context: 'instream',
           playerSize: [640, 480]
         }
       };
-      request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].ad_types).to.deep.equal(['video']);
+      payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].video.placement).to.exist.and.equal(1);
+      bidRequest.mediaTypes.video.context = 'outstream';
+      payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+      expect(payload.imp[0].video.placement).to.exist.and.equal(3);
     });
 
-    it('should not set ad type for outstream video', function() {
-      const request = spec.buildRequests([outstreamBidRequest])[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].ad_types).to.not.exist;
+    it('should set video params for instream', function() {
+      const bidRequest = deepClone(instreamBidRequest);
+      delete bidRequest.mediaTypes.video.playerSize;
+      const videoParams = {
+        mimes: ['video/mp4'],
+        skip: 1,
+        skipmin: 5,
+        skipafter: 30,
+        minduration: 15,
+        maxduration: 60,
+        startdelay: 5,
+        minbitrate: 500,
+        maxbitrate: 2000,
+        w: 1024,
+        h: 640,
+        placement: INSTREAM_TYPE,
+      };
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].video).to.deep.equal(videoParams);
     });
 
-    it('should not set ad type for multi-format bids', function() {
-      const request = spec.buildRequests([multiFormatBidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].ad_types).to.not.exist;
+    it('should set video playerSize over video params', () => {
+      const bidRequest = deepClone(instreamBidRequest);
+      bidRequest.params.video = {
+        w: 1024, h: 640
+      }
+      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].video.h).equal(480);
+      expect(payload.imp[0].video.w).equal(640);
     });
 
-    it('should not set Prebid sizes in bid request for instream video', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
-      const request = spec.buildRequests([instreamBidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].banner.format).to.not.exist;
-      getConfigStub.restore();
+    it('should ignore invalid/unexpected video params', function() {
+      const bidRequest = deepClone(instreamBidRequest);
+      // 1
+      const videoTest = {
+        skip: 1,
+        skipmin: 5,
+        skipafter: 30
+      }
+      const videoTestInvParam = Object.assign({}, videoTest);
+      videoTestInvParam.blah = 1;
+      bidRequest.params.video = videoTestInvParam;
+      let request = spec.buildRequests([bidRequest], {})[0];
+      let payload = JSON.parse(request.data);
+      expect(payload.imp[0].video.blah).not.to.exist;
     });
 
-    it('should not set Prebid sizes in bid request for outstream video', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
-      const request = spec.buildRequests([outstreamBidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].banner.format).to.not.exist;
-      getConfigStub.restore();
+    it('should set video params for outstream', function() {
+      const bidRequest = deepClone(outstreamBidRequest);
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest], {})[0];
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].video).to.deep.equal({...{
+        mimes: ['video/mp4'],
+        placement: OUTSTREAM_TYPE,
+        w: bidRequest.mediaTypes.video.playerSize[0],
+        h: bidRequest.mediaTypes.video.playerSize[1],
+      },
+      ...videoParams});
     });
-
-    it('should not set Prebid sizes in multi-format bid request', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig');
-      getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
-      const request = spec.buildRequests([multiFormatBidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].banner.format).to.not.exist;
-      getConfigStub.restore();
+    //
+    it('should set video params for multi-format', function() {
+      const bidRequest = deepClone(multiFormatBidRequest);
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest], {})[0];
+      const payload = JSON.parse(request.data);
+      const testVideoParams = Object.assign({
+        placement: OUTSTREAM_TYPE,
+        w: 640,
+        h: 480,
+        mimes: ['video/mp4'],
+      }, videoParams);
+      expect(payload.imp[0].video).to.deep.equal(testVideoParams);
     });
 
     it('should add schain', function () {
@@ -341,8 +570,24 @@ describe('Improve Digital Adapter Tests', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
       bidRequest.schain = schain;
       const request = spec.buildRequests([bidRequest], bidderRequestReferrer)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.schain).to.equal(schain);
+      const payload = JSON.parse(request.data);
+      expect(payload.source.ext.schain).to.equal(schain);
+    });
+
+    it('should add eids', function () {
+      const userId = { id5id:	{ uid: '1111' } };
+      const expectedUserObject = { ext: { eids: [{
+        source: 'id5-sync.com',
+        uids: [{
+          atype: 1,
+          id: '1111'
+        }]
+      }]}};
+      const bidRequest = Object.assign({}, simpleBidRequest);
+      bidRequest.userIdAsEids = createEidsArray(userId);
+      const request = spec.buildRequests([bidRequest], bidderRequestReferrer)[0];
+      const payload = JSON.parse(request.data);
+      expect(payload.user).to.deep.equal(expectedUserObject);
     });
 
     it('should return 2 requests', function () {
@@ -352,38 +597,50 @@ describe('Improve Digital Adapter Tests', function () {
       ], bidderRequest);
       expect(requests).to.be.an('array');
       expect(requests.length).to.equal(2);
-      expect(requests[0].bidderRequest).to.deep.equal(bidderRequest);
-      expect(requests[1].bidderRequest).to.deep.equal(bidderRequest);
     });
 
     it('should return one request in a single request mode', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub = sinon.stub(config, 'getConfig');
       getConfigStub.withArgs('improvedigital.singleRequest').returns(true);
-      const requests = spec.buildRequests([
-        simpleBidRequest,
-        simpleSmartTagBidRequest
-      ], bidderRequest);
+      const requests = spec.buildRequests([ simpleBidRequest, instreamBidRequest ], bidderRequest);
       expect(requests).to.be.an('array');
       expect(requests.length).to.equal(1);
-      getConfigStub.restore();
+      expect(requests[0].url).to.equal(AD_SERVER_URL);
+      const request = JSON.parse(requests[0].data);
+      expect(request.imp.length).to.equal(2);
+      expect(request.imp[0].banner).to.exist;
+      expect(request.imp[1].video).to.exist;
+    });
+
+    it('should create one request per endpoint in a single request mode', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.singleRequest').returns(true);
+      const requests = spec.buildRequests([ extendBidRequest, simpleBidRequest, instreamBidRequest ], bidderRequest);
+      expect(requests).to.be.an('array');
+      expect(requests.length).to.equal(2);
+      expect(requests[0].url).to.equal(EXTEND_URL);
+      expect(requests[1].url).to.equal(AD_SERVER_URL);
+      const adServerRequest = JSON.parse(requests[1].data);
+      expect(adServerRequest.imp.length).to.equal(2);
+      expect(adServerRequest.imp[0].banner).to.exist;
+      expect(adServerRequest.imp[1].video).to.exist;
     });
 
     it('should set Prebid sizes in bid request', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub = sinon.stub(config, 'getConfig');
       getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
       const request = spec.buildRequests([simpleBidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].banner).to.deep.equal({
+      const payload = JSON.parse(request.data);
+      sinon.assert.match(payload.imp[0].banner, {
         format: [
           { w: 300, h: 250 },
           { w: 160, h: 600 }
         ]
       });
-      getConfigStub.restore();
     });
 
     it('should not add single size filter when using Prebid sizes', function () {
-      const getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub = sinon.stub(config, 'getConfig');
       getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
       const bidRequest = Object.assign({}, simpleBidRequest);
       const size = {
@@ -392,525 +649,729 @@ describe('Improve Digital Adapter Tests', function () {
       };
       bidRequest.params.size = size;
       const request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
-      expect(params.bid_request.imp[0].banner).to.deep.equal({
+      const payload = JSON.parse(request.data);
+      sinon.assert.match(payload.imp[0].banner, {
         format: [
           { w: 300, h: 250 },
           { w: 160, h: 600 }
         ]
       });
-      getConfigStub.restore();
+    });
+
+    it('should not set site when app is defined in FPD', function () {
+      const ortb2 = {app: {content: 'XYZ'}};
+      let request = spec.buildRequests([simpleBidRequest], {...bidderRequest, ortb2})[0];
+      let payload = JSON.parse(request.data);
+      expect(payload.site).does.not.exist;
+      expect(payload.app).does.exist;
+      expect(payload.app.content).does.exist.and.equal('XYZ');
+    });
+
+    it('should not set site when app is defined in CONFIG', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('app').returns({ content: 'XYZ' });
+      let request = spec.buildRequests([simpleBidRequest], bidderRequest)[0];
+      let payload = JSON.parse(request.data);
+      expect(payload.site).does.not.exist;
+      expect(payload.app).does.exist;
+      expect(payload.app.content).does.exist.and.equal('XYZ');
+    });
+
+    it('should set correct site params', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('site').returns({
+        content: 'XYZ',
+        page: 'https://improveditigal.com/',
+        domain: 'improveditigal.com'
+      });
+      let request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequestReferrer))[0];
+      let payload = JSON.parse(request.data);
+      expect(payload.site.content).does.exist.and.equal('XYZ');
+      expect(payload.site.page).does.exist.and.equal('https://improveditigal.com/');
+      expect(payload.site.domain).does.exist.and.equal('improveditigal.com');
+      getConfigStub.reset();
+
+      request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequestReferrer))[0];
+      payload = JSON.parse(request.data);
+      expect(payload.site.content).does.not.exist;
+      expect(payload.site.page).does.exist.and.equal('https://blah.com/test.html');
+      expect(payload.site.domain).does.exist.and.equal('blah.com');
+
+      const ortb2 = {site: {content: 'ZZZ'}};
+      request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest({...bidderRequestReferrer, ortb2}))[0];
+      payload = JSON.parse(request.data);
+      expect(payload.site.content).does.exist.and.equal('ZZZ');
+      expect(payload.site.page).does.exist.and.equal('https://blah.com/test.html');
+      expect(payload.site.domain).does.exist.and.equal('blah.com');
+    });
+
+    it('should set site when app not available', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('app').returns(undefined);
+      getConfigStub.withArgs('site').returns({});
+      let request = spec.buildRequests([simpleBidRequest], bidderRequest)[0];
+      let payload = JSON.parse(request.data);
+      expect(payload.site).does.exist;
+      expect(payload.app).does.not.exist;
+    });
+
+    it('should call basic ads endpoint when no consent for purpose 1', function () {
+      const consent = deepClone(gdprConsent);
+      deepSetValue(consent, 'vendorData.purpose.consents.1', false);
+      const bidderRequestWithConsent = deepClone(bidderRequest);
+      bidderRequestWithConsent.gdprConsent = consent;
+      const request = spec.buildRequests([simpleBidRequest], bidderRequestWithConsent)[0];
+      expect(request.url).to.equal(BASIC_ADS_URL);
+    });
+
+    it('should set extend params when extend mode enabled from global configuration', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      const bannerRequest = deepClone(simpleBidRequest);
+      const keyValues = { testKey: [ 'testValue' ] };
+      bannerRequest.params.keyValues = keyValues;
+
+      getConfigStub.withArgs('improvedigital.extend').returns(true);
+      const requests = spec.buildRequests([bannerRequest, instreamBidRequest], bidderRequest);
+      expect(requests[0].method).to.equal(METHOD);
+      expect(requests[0].url).to.equal(EXTEND_URL);
+      expect(requests[1].url).to.equal(EXTEND_URL);
+      // banner
+      let payload = JSON.parse(requests[0].data);
+      expect(payload.imp[0].ext.bidder).to.not.exist;
+      expect(payload.imp[0].ext.prebid.bidder.improvedigital).to.deep.equal({
+        placementId: 1053688,
+        keyValues
+      });
+      expect(payload.imp[0].ext.prebid.storedrequest.id).to.equal('1053688');
+      // video
+      payload = JSON.parse(requests[1].data);
+      expect(payload.imp[0].ext.bidder).to.not.exist;
+      expect(payload.imp[0].ext.prebid.bidder.improvedigital.placementId).to.equal(123456);
+      expect(payload.imp[0].ext.prebid.storedrequest.id).to.equal('123456');
+    });
+
+    it('should set extend url when extend mode enabled in adunit params', function () {
+      const bidRequest = deepClone(extendBidRequest);
+      let request = spec.buildRequests([bidRequest], { bids: [bidRequest] })[0];
+      expect(request.url).to.equal(EXTEND_URL);
+
+      getConfigStub = sinon.stub(config, 'getConfig');
+
+      // adunit param takes precedence over the global config
+      getConfigStub.withArgs('improvedigital.extend').returns(false);
+      request = spec.buildRequests([bidRequest], { bids: [bidRequest] })[0];
+      expect(request.url).to.equal(EXTEND_URL);
+
+      bidRequest.params.extend = false;
+      getConfigStub.withArgs('improvedigital.extend').returns(true);
+      request = spec.buildRequests([bidRequest], { bids: [bidRequest] })[0];
+      expect(request.url).to.equal(AD_SERVER_URL);
+
+      const requests = spec.buildRequests([bidRequest, instreamBidRequest], { bids: [bidRequest, instreamBidRequest] });
+      expect(requests.length).to.equal(2);
+      expect(requests[0].url).to.equal(AD_SERVER_URL);
+      expect(requests[1].url).to.equal(EXTEND_URL);
+    });
+
+    it('should add publisherId to request URL when available in request params', function() {
+      function formatPublisherUrl(baseUrl, publisherId) {
+        return `${baseUrl}/${publisherId}/${PB_ENDPOINT}`;
+      }
+      const bidRequest = deepClone(simpleBidRequest);
+      bidRequest.params.publisherId = 1000;
+      let request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      expect(request).to.be.an('object');
+      sinon.assert.match(request, {
+        method: METHOD,
+        url: formatPublisherUrl(AD_SERVER_BASE_URL, 1000),
+        bidderRequest
+      });
+
+      const bidRequest2 = deepClone(simpleBidRequest)
+      bidRequest2.params.publisherId = 1002;
+
+      const bidRequest3 = deepClone(extendBidRequest)
+      bidRequest3.params.publisherId = 1002;
+
+      const request1 = spec.buildRequests([bidRequest, bidRequest2], bidderRequest)[0];
+      expect(request1.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1000));
+      const request2 = spec.buildRequests([bidRequest, bidRequest2], bidderRequest)[1];
+      expect(request2.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1002));
+      const request3 = spec.buildRequests([bidRequest, bidRequest3], bidderRequest)[1];
+      expect(request3.url).to.equal(EXTEND_URL);
+
+      // Enable single request mode
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.singleRequest').returns(true);
+      try {
+        spec.buildRequests([bidRequest, bidRequest2], bidderRequest)[0];
+      } catch (e) {
+        expect(e.name).to.exist.equal('Error')
+        expect(e.message).to.exist.equal(`All Improve Digital placements in a single call must have the same publisherId. Please check your 'params.publisherId' or turn off the single request mode.`)
+      }
+
+      bidRequest2.params.publisherId = null;
+      request = spec.buildRequests([bidRequest, bidRequest2], bidderRequest)[0];
+      expect(request.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1000));
+
+      const consent = deepClone(gdprConsent);
+      deepSetValue(consent, 'vendorData.purpose.consents.1', false);
+      const bidderRequestWithConsent = deepClone(bidderRequest);
+      bidderRequestWithConsent.gdprConsent = consent;
+      request = spec.buildRequests([bidRequest], bidderRequestWithConsent)[0];
+      expect(request.url).to.equal(formatPublisherUrl(BASIC_ADS_BASE_URL, 1000));
+
+      deepSetValue(consent, 'vendorData.purpose.consents.1', true);
+      bidderRequestWithConsent.gdprConsent = consent;
+      request = spec.buildRequests([bidRequest], bidderRequestWithConsent)[0];
+      expect(request.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1000));
+
+      delete bidRequest.params.publisherId;
+      request = spec.buildRequests([bidRequest], bidderRequestWithConsent)[0];
+      expect(request.url).to.equal(AD_SERVER_URL);
     });
   });
 
   const serverResponse = {
     'body': {
-      'id': '687a06c541d8d1',
-      'site_id': 191642,
-      'bid': [
+      'id': '99f9a9e6-5126-425b-822c-8b4edad2a719',
+      'cur': 'EUR',
+      'seatbid': [
         {
-          'isNet': false,
-          'id': '33e9500b21129f',
-          'advid': '5279',
-          'price': 1.45888594164456,
-          'nurl': 'https://ice.360yield.com/imp_pixel?ic=wVmhKI07hCVyGC1sNdFp.6buOSiGYOw8jPyZLlcMY2RCwD4ek3Fy6.xUI7U002skGBs3objMBoNU-Frpvmb9js3NKIG0YZJgWaNdcpXY9gOXE9hY4-wxybCjVSNzhOQB-zic73hzcnJnKeoGgcfvt8fMy18-yD0aVdYWt4zbqdoITOkKNCPBEgbPFu1rcje-o7a64yZ7H3dKvtnIixXQYc1Ep86xGSBGXY6xW2KfUOMT6vnkemxO72divMkMdhR8cAuqIubbx-ZID8-xf5c9k7p6DseeBW0I8ionrlTHx.rGosgxhiFaMqtr7HiA7PBzKvPdeEYN0hQ8RYo8JzYL82hA91A3V2m9Ij6y0DfIJnnrKN8YORffhxmJ6DzwEl1zjrVFbD01bqB3Vdww8w8PQJSkKQkd313tr-atU8LS26fnBmOngEkVHwAr2WCKxuUvxHmuVBTA-Lgz7wKwMoOJCA3hFxMavVb0ZFB7CK0BUTVU6z0De92Q.FJKNCHLMbjX3vcAQ90=',
-          'h': 290,
-          'pid': 1053688,
-          'sync': [
-            'https://link1',
-            'https://link2'
+          'bid': [
+            {
+              'ext': {
+                'improvedigital': {
+                  'line_item_id': 320896,
+                  'bidder_id': 0,
+                  'brand_name': '',
+                  'buying_type': 'classic',
+                  'agency_id': '0'
+                }
+              },
+              'crid': '510265',
+              'price': 1.9200543539802946,
+              'id': '35adfe19-d6e9-46b9-9f7d-20da7026b965',
+              'w': 728,
+              'impid': '33e9500b21129f',
+              'h': 90,
+              'adm': '<html><body style="margin:0%"><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+              'cid': '123159'
+            }
           ],
-          'crid': '422031',
-          'w': 600,
-          'cid': '99006',
-          'adm': 'document.writeln(\"<a href=\\\"https:\\/\\/ice.360yield.com\\/click\\/wVmhKEKFeJufyP3hFfp7fv95ynoKe7vnG9V-j8EyAzklSoKRkownAclw4Zzcw-OcbJMg2KfjNiO8GoO9WP1jbNM8Q5GtmClbG9hZPBS4v6oBBiDi50AjRqHQsDAoBOJrIJtVyCfrnAIxvbysozCpLt20ov6jz2JPi6fe.D55HNeDLDyiLNgxVPa3y9jJZf65JBirCjOoZ-1Mj1BLB.57VdMaEhpGjjl5HnPgw0Pv7Hm1BO7PB9nCXJ9IwOH3IrKo.Wyy1iKDk6zeGwGOkQHSOMuQnCHyD35x6bhDQrpl5H6fTRTR8D2m5.-Zjh3fs8SKlo0i25EjKPw65iF.tvgcnq01U08OIh86EeSciamJgV0hNsk20TcTubfsoPN4are4nQ0y2gB-lz9tf3AjqHpSz5NoJWrpWtnrBHbjm.dS1XUQB1tzcLpIkA34nDe2eNxRZbZkZNSSs.Y8jQemfbjuLpttcemHqidFZo3xp37eSfUImw.HbyFdnK-wxFDYudgsIDxGJWI=\\/\\/https%3A%2F%2Fwww.improvedigital.com\\\" target=\\\"_blank\\\"><img style=\\\"border: 0;\\\" border=\\\"0\\\" width=\\\"600\\\" height=\\\"290\\\" src=\\\"https:\\/\\/creative.360yield.com\\/file\\/221728\\/ImproveDigital600x290.jpg\\\" alt=\\\"\\\"\\/><\\/a>\");document.writeln(\"<improvedigital_ad_output_information tp_id=\\\"\\\" buyer_id=\\\"0\\\" rtb_advertiser=\\\"\\\" campaign_id=\\\"99006\\\" line_item_id=\\\"268515\\\" creative_id=\\\"422031\\\" crid=\\\"0\\\" placement_id=\\\"1053688\\\"><\\/improvedigital_ad_output_information>\");'
+          'seat': 'improvedigital'
         }
       ],
-      'debug': ''
+      ext: {
+        improvedigital: {
+          sync: [
+            'https://link1',
+            'https://link2',
+            'https://link3',
+          ]
+        }
+      }
     }
   };
 
   const serverResponseTwoBids = {
     'body': {
-      'id': '687a06c541d8d1',
-      'site_id': 191642,
-      'bid': [
-        serverResponse.body.bid[0],
+      'id': '99f9a9e6-5126-425b-822c-8b4edad2a719',
+      'cur': 'EUR',
+      'seatbid': [
         {
-          'isNet': true,
-          'id': '1234',
-          'advid': '5280',
-          'price': 1.23,
-          'nurl': 'https://link/imp_pixel?ic=wVmhKI07hCVyGC1sNdFp.6buOSiGYOw8jPyZLlcMY2RCwD4ek3Fy6.xUI7U002skGBs3objMBoNU-Frpvmb9js3NKIG0YZJgWaNdcpXY9gOXE9hY4-wxybCjVSNzhOQB-zic73hzcnJnKeoGgcfvt8fMy18-yD0aVdYWt4zbqdoITOkKNCPBEgbPFu1rcje-o7a64yZ7H3dKvtnIixXQYc1Ep86xGSBGXY6xW2KfUOMT6vnkemxO72divMkMdhR8cAuqIubbx-ZID8-xf5c9k7p6DseeBW0I8ionrlTHx.rGosgxhiFaMqtr7HiA7PBzKvPdeEYN0hQ8RYo8JzYL82hA91A3V2m9Ij6y0DfIJnnrKN8YORffhxmJ6DzwEl1zjrVFbD01bqB3Vdww8w8PQJSkKQkd313tr-atU8LS26fnBmOngEkVHwAr2WCKxuUvxHmuVBTA-Lgz7wKwMoOJCA3hFxMavVb0ZFB7CK0BUTVU6z0De92Q.FJKNCHLMbjX3vcAQ90=',
-          'h': 400,
-          'pid': 1053688,
-          'sync': [
-            'https://link3'
+          'bid': [
+            {
+              'ext': {
+                'improvedigital': {
+                  'line_item_id': 320896,
+                  'bidder_id': 0,
+                  'brand_name': '',
+                  'buying_type': 'classic',
+                  'agency_id': '0'
+                }
+              },
+              'crid': '510265',
+              'price': 1.9200543539802946,
+              'id': '35adfe19-d6e9-46b9-9f7d-20da7026b965',
+              'w': 728,
+              'impid': '33e9500b21129f',
+              'h': 90,
+              'adm': '<html><body style="margin:0%"><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+              'cid': '123159'
+            },
+            {
+              'ext': {
+                'improvedigital': {
+                  'line_item_id': 320896,
+                  'bidder_id': 0,
+                  'brand_name': '',
+                  'buying_type': 'classic',
+                  'agency_id': '0'
+                }
+              },
+              'crid': '479163',
+              'price': 1.9200543539802946,
+              'id': '83c8d524-0955-4d0c-b558-4c9f3600e09b',
+              'w': 300,
+              'impid': '33e9500b21129f',
+              'h': 250,
+              'adm': '<html><body style="margin:0%"><a href="https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com" target="_blank"><img style="border: 0;" border="0" width=300 height=250 src="https://creative.360yield.com/file/238052/test_ads-300x250.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="479163" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+              'cid': '123159'
+            }
           ],
-          'crid': '422033',
-          'w': 700,
-          'cid': '99006',
-          'adm': 'document.writeln(\"<a href=\\\"https:\\/\\/ice.360yield.com\\/click\\/wVmhKEKFeJufyP3hFfp7fv95ynoKe7vnG9V-j8EyAzklSoKRkownAclw4Zzcw-OcbJMg2KfjNiO8GoO9WP1jbNM8Q5GtmClbG9hZPBS4v6oBBiDi50AjRqHQsDAoBOJrIJtVyCfrnAIxvbysozCpLt20ov6jz2JPi6fe.D55HNeDLDyiLNgxVPa3y9jJZf65JBirCjOoZ-1Mj1BLB.57VdMaEhpGjjl5HnPgw0Pv7Hm1BO7PB9nCXJ9IwOH3IrKo.Wyy1iKDk6zeGwGOkQHSOMuQnCHyD35x6bhDQrpl5H6fTRTR8D2m5.-Zjh3fs8SKlo0i25EjKPw65iF.tvgcnq01U08OIh86EeSciamJgV0hNsk20TcTubfsoPN4are4nQ0y2gB-lz9tf3AjqHpSz5NoJWrpWtnrBHbjm.dS1XUQB1tzcLpIkA34nDe2eNxRZbZkZNSSs.Y8jQemfbjuLpttcemHqidFZo3xp37eSfUImw.HbyFdnK-wxFDYudgsIDxGJWI=\\/\\/https%3A%2F%2Fwww.improvedigital.com\\\" target=\\\"_blank\\\"><img style=\\\"border: 0;\\\" border=\\\"0\\\" width=\\\"600\\\" height=\\\"290\\\" src=\\\"https:\\/\\/creative.360yield.com\\/file\\/221728\\/ImproveDigital600x290.jpg\\\" alt=\\\"\\\"\\/><\\/a>\");document.writeln(\"<improvedigital_ad_output_information tp_id=\\\"\\\" buyer_id=\\\"0\\\" rtb_advertiser=\\\"\\\" campaign_id=\\\"99006\\\" line_item_id=\\\"268515\\\" creative_id=\\\"422031\\\" crid=\\\"0\\\" placement_id=\\\"1053688\\\"><\\/improvedigital_ad_output_information>\");'
+          'seat': 'improvedigital_improvedigital'
         }
       ],
-      'debug': ''
+      ext: {
+        improvedigital: {
+          sync: [
+            'https://link1',
+            'https://link2',
+            'https://link4',
+          ]
+        }
+      }
     }
   };
 
   const serverResponseNative = {
     body: {
-      id: '687a06c541d8d1',
-      site_id: 191642,
-      bid: [
+      'id': '8201e669-bbbf-4f61-b9a2-4cb854033c82',
+      'cur': 'EUR',
+      'seatbid': [
         {
-          isNet: false,
-          id: '33e9500b21129f',
-          advid: '5279',
-          price: 1.45888594164456,
-          nurl: 'https://ice.360yield.com/imp_pixel?ic=wVm',
-          h: 290,
-          pid: 1053688,
-          sync: [
-            'https://link1',
-            'https://link2'
-          ],
-          crid: '422031',
-          w: 600,
-          cid: '99006',
-          native: {
-            assets: [
-              {
-                title: {
-                  text: 'Native title'
+          'bid': [
+            {
+              'ext': {
+                'improvedigital': {
+                  'line_item_id': 411331,
+                  'bidder_id': 0,
+                  'brand_name': '',
+                  'buying_type': 'classic',
+                  'agency_id': '0',
+                  'is_net': true
                 }
               },
-              {
-                data: {
-                  type: 1,
-                  value: 'Improve Digital'
-                }
-              },
-              {
-                data: {
-                  type: 2,
-                  value: 'Native body'
-                }
-              },
-              {
-                data: {
-                  type: 3,
-                  value: '4' // rating
-                }
-              },
-              {
-                data: {
-                  type: 4,
-                  value: '10105' // likes
-                }
-              },
-              {
-                data: {
-                  type: 5,
-                  value: '150000' // downloads
-                }
-              },
-              {
-                data: {
-                  type: 6,
-                  value: '3.99' // price
-                }
-              },
-              {
-                data: {
-                  type: 7,
-                  value: '4.49' // salePrice
-                }
-              },
-              {
-                data: {
-                  type: 8,
-                  value: '(123) 456-7890' // phone
-                }
-              },
-              {
-                data: {
-                  type: 9,
-                  value: '123 Main Street, Anywhere USA' // address
-                }
-              },
-              {
-                data: {
-                  type: 10,
-                  value: 'body2'
-                }
-              },
-              {
-                data: {
-                  type: 11,
-                  value: 'https://myurl.com' // displayUrl
-                }
-              },
-              {
-                data: {
-                  type: 12,
-                  value: 'Do it' // cta
-                }
-              },
-              {
-                img: {
-                  type: 1,
-                  url: 'Should get ignored',
-                  h: 300,
-                  w: 400
-                }
-              },
-              {
-                img: {
-                  type: 2,
-                  url: 'https://blah.com/icon.jpg',
-                  h: 30,
-                  w: 40
-                }
-
-              },
-              {
-                img: {
-                  type: 3,
-                  url: 'https://blah.com/image.jpg',
-                  h: 200,
-                  w: 800
-                }
-              }
-            ],
-            link: {
-              url: 'https://advertiser.com',
-              clicktrackers: [
-                'https://click.tracker.com/click?impid=123'
-              ]
-            },
-            imptrackers: [
-              'https://imptrack1.com',
-              'https://imptrack2.com'
-            ],
-            jstracker: '<script src=\"https://www.foobar.js\"></script>',
-            privacy: 'https://www.myprivacyurl.com'
-          }
+              'crid': '544456',
+              'id': '52098fad-20c1-476b-a4fa-41e275e5a4a5',
+              'price': 1.8600000000000003,
+              'adm': "{\"ver\":\"1.1\",\"imptrackers\":[\"https://secure.adnxs.com/imptr?id=52311&t=2\",\"https://euw-ice.360yield.com/imp_pixel?ic=hcUBlCANx1FabHBf6FR2gC7UO4xEyXahdZAn0-B5qL-bb3A74BJ1smyWIyW7IWcC0SOjSXzVpevTHXxTqJ.sf.Qhahyy6tSo.0j1QWfXlH8sM4-8vKWjMjw-x.IrJJNlwkQ0s1CdwcwTefcLXm5l2E-W19VhACuV7f3mgrZMNjiSw.SjJAfyPC3SIyAMRjYfj53UmjriQ46T7lhmkqxK8wHmksYCdbZc3PZESk8NWl28sxdjNvnYYCFMcJbeav.LOLabyTXfwy-1cEPbQs.IKMRZIKaqccTDPV3wOtzbNv0jQzatd3Nnv-PGFQcjQ-GW3i27W04Fws4kodpFSn-B6VwZAjzLzoyd5gBncyRnAyCplEbgHU5sZ1IyKHWjgCl3ZtRIK5vqrRD5D-xqgSnOi7-phG.CqZWDZ4bMDSfQg2ZnbvUTyGKcEl0WR59dW5izTMV4Fjizcrvr5T-t.zMbGwz.hGnmLIyhTqh.IcwW.GiDLVExlDlix5S1LXIWVsSyrQ==\"],\"assets\":[{\"id\":1,\"data\":{\"value\":\"ImproveDigital\",\"type\":1}},{\"id\":3,\"data\":{\"value\":\"Test content.\",\"type\":2}},{\"id\":0,\"title\":{\"text\":\"Sample Prebid Test Title\"}}],\"link\":{\"url\":\"https://euw-ice.360yield.com/click/hcUBlHOV7YhVse8RyBa0ajjyPa9Vt17e4g-1m3cRj3E67vq-RYux.SiUeAmBfNBcoOqkUc6A15AWmi4yFu5K-BdkaYjildyyk7fNLyR6hWr411kv4vrFwm5jrIBceuHS6K8oN69f.uCo8zGTdR2TbSlldwcpahQPlufZU.6VaMsu4IC53uEiUT5vb7kAw6TTlxuGBNq6zaGryiWEV2.N3YYJDTyYPh8tv-ZFyeFZFm0Gnjv.xWbC.70JcRUVU9UelQaPsTpTWYTXBhJt84YJUw1-GNtaLNVLSjjZbVoA2fsMti5p6OBmF.7u39on2OPgvseIkSmge7Pqg63pRqdP75hp.DAEk6OkcN1jGnwP2DSbvpaSbin5lVqjfO0B-wnQgfQTCUtM5v4JmkNweLhUf9Q-x.nPKLW5SccEk9ZFXzY2-1wpT3PWm8Tix3NRscLPZub9wHzL..pl6ip8cQ9hp16UjwT4H6RMAxL0R7bl-h2pAicGAzYmuO7ntRESKUoIWA==//http%3A%2F%2Fquantum-advertising.com%2Ffr%2F\"},\"jstracker\":\"<script type=\\\"application/javascript\\\">var js_tracker = ['https://secure.adnxs.com/imptr?id=52312&t=1', 'https://pixel.adsafeprotected.com/rjss/st/291611/36974035/skeleton.js?ias_adpath=[class~=ea_improve_pid_${TAG_ID}]']</script>\"}",
+              'impid': '33e9500b21129f',
+              'cid': '196108'
+            }
+          ],
+          'seat': 'improvedigital'
         }
-      ],
-      debug: ''
+      ]
     }
   };
 
   const serverResponseVideo = {
     'body': {
-      'id': '687a06c541d8d1',
-      'site_id': 191642,
-      'bid': [
+      'id': '8ed20675-8934-430c-b645-1ccd17b35839',
+      'cur': 'EUR',
+      'seatbid': [
         {
-          'isNet': false,
-          'id': '33e9500b21129f',
-          'advid': '5279',
-          'price': 1.45888594164456,
-          'nurl': 'http://ice.360yield.com/imp_pixel?ic=wVmhKI07hCVyGC1sNdFp.6buOSiGYOw8jPyZLlcMY2RCwD4ek3Fy6.xUI7U002skGBs3objMBoNU-Frpvmb9js3NKIG0YZJgWaNdcpXY9gOXE9hY4-wxybCjVSNzhOQB-zic73hzcnJnKeoGgcfvt8fMy18-yD0aVdYWt4zbqdoITOkKNCPBEgbPFu1rcje-o7a64yZ7H3dKvtnIixXQYc1Ep86xGSBGXY6xW2KfUOMT6vnkemxO72divMkMdhR8cAuqIubbx-ZID8-xf5c9k7p6DseeBW0I8ionrlTHx.rGosgxhiFaMqtr7HiA7PBzKvPdeEYN0hQ8RYo8JzYL82hA91A3V2m9Ij6y0DfIJnnrKN8YORffhxmJ6DzwEl1zjrVFbD01bqB3Vdww8w8PQJSkKQkd313tr-atU8LS26fnBmOngEkVHwAr2WCKxuUvxHmuVBTA-Lgz7wKwMoOJCA3hFxMavVb0ZFB7CK0BUTVU6z0De92Q.FJKNCHLMbjX3vcAQ90=',
-          'h': 290,
-          'pid': 1053688,
-          'sync': [
-            'http://link1',
-            'http://link2'
+          'bid': [
+            {
+              'ext': {
+                'improvedigital': {
+                  'line_item_id': 321329,
+                  'bidder_id': 0,
+                  'brand_name': '',
+                  'buying_type': 'classic',
+                  'agency_id': '0'
+                }
+              },
+              'crid': '484367',
+              'price': 9.600271769901472,
+              'id': 'b131fd7b-5759-4b72-800e-60e69291e7d9',
+              'adomain': [
+                'improvedigital.com'
+              ],
+              'impid': '33e9500b21129f',
+              'adm': '<VAST></VAST>',
+              'w': 640,
+              'h': 480,
+              'cid': '123159'
+            }
           ],
-          'crid': '422031',
-          'w': 600,
-          'cid': '99006',
-          'adm': '<VAST></VAST>',
-          'ad_type': 'video'
+          'seat': 'improvedigital'
         }
       ],
-      'debug': ''
     }
   };
 
-  const nativeEventtrackers = [
-    {
-      event: 1,
-      method: 1,
-      url: 'https://www.mytracker.com/imptracker'
-    },
-    {
-      event: 1,
-      method: 2,
-      url: 'https://www.mytracker.com/tracker.js'
+  const serverResponseRazr = {
+    body: {
+      'id': '2adac6a5fe04df',
+      'cur': 'EUR',
+      'ext': {
+        'improvedigital': {
+          'sync': [
+            'https://d5p.de17a.com/getuid/improve_digital?publisher_user_id=ce26f11e-567a-4eb7-bf94-51752e293ca5&publisher_dsp_id=61&publisher_call_type=redirect&gdpr=1&gdpr_consent=CPU22FrPU22FrAcABBENCDCsAP_AAH_AAChQIltf_X__b3_j-_5_f_t0eY1P9_7_v-0zjhfdt-8N3f_X_L8X42M7vF36pq4KuR4Eu3LBIQdlHOHcTUmw6okVrzPsbk2cr7NKJ7PEmnMbO2dYGH9_n93TuZKY7______z_v-v_v____f_7-3_3__5_3---_e_V_99zLv9____39nP___9v-_9_____4IhgEmGpeQBdmWODJtGlUKIEYVhIdAKACigGFoisIHVwU7K4CfUELABCagJwIgQYgowYBAAIJAEhEQEgB4IBEARAIAAQAqwEIACNgEFgBYGAQACgGhYgRQBCBIQZHBUcpgQFSLRQT2ViCUHexphCGWeBFAo_oqEBGs0QLAyEhYOY4AkBLxZIHmKF8gAAAAA.f_gAD_gAAAAA&publisher_redirecturl=https://euw-ice.360yield.com/match'
+          ]
+        }
+      },
+      'seatbid': [
+        {
+          'bid': [
+            {
+              'ext': {
+                'improvedigital': {
+                  'line_item_id': 410573,
+                  'bidder_id': 0,
+                  'brand_name': '',
+                  'buying_type': 'classic',
+                  'agency_id': '0'
+                }
+              },
+              'crid': '544063',
+              'price': 1.9199364935359489,
+              'id': '1fcf4dd8-a783-48ed-b59c-8fc8eeccb024',
+              'adomain': [
+                'improvedigital.com'
+              ],
+              'w': 970,
+              'impid': '33e9500b21129f',
+              'h': 250,
+              'adm': '<html><body style="margin:0%"><!-- Integration Test Camapigns -->\n<!-- Pageskin Plus Desktop -->\n<!-- Desktop -->\n<!-- Size: 970x250 -->\n<!-- DSP: Other -->\n\n<script async src="https://cdn.inskinad.com/isfe/tags/dsp.js"></script>\n<script type="text/javascript">\n      (function() {\n        var ns = window.inskin = window.inskin || {};\n        ns.dsp = ns.dsp || [];\n        ns.dsp.push({\n          uri: "razr://inskin/pageskinplus?eyJwbHJfTWFuaWZlc3RQYXRoIjoicHNfY3JlYXRvcngvZGlzdC82MDQwYjg3NWQ5ZmZkNTAwMWExZjQxNzAvbWFuaWZlc3QuanNvbiIsImkiOiJodHRwczovL2Nkbi5pbnNraW5hZC5jb20vQ3JlYXRpdmVTdG9yZS9wc19jcmVhdG9yeC9maWxlcy82MDQwYWI1NGQ5ZmZkNTAwMWExZjQxNjdfMTYzNjcxNDEzNTU4MS85NzB4MjUwLmpwZyIsImwiOiJodHRwczovL3d3dy5pbnNraW5tZWRpYS5jb20vIiwic2l6ZSI6Ijk3MHgyNTAiLCJkc3AiOiJPdGhlciIsImNyZWF0aXZlX2lkIjoiNTAwMDAwMDA2NSIsIm1hc3MiOnsiZW5kcG9pbnQiOiJodHRwczovL2Nkbi5pbnNraW5hZC5jb20vaXNmZS90YWdzL2lwdC5qcyJ9fQ==&gdpr=1&gdpr_consent=CPU22FrPU22FrAcABBENCDCsAP_AAH_AAChQIltf_X__b3_j-_5_f_t0eY1P9_7_v-0zjhfdt-8N3f_X_L8X42M7vF36pq4KuR4Eu3LBIQdlHOHcTUmw6okVrzPsbk2cr7NKJ7PEmnMbO2dYGH9_n93TuZKY7______z_v-v_v____f_7-3_3__5_3---_e_V_99zLv9____39nP___9v-_9_____4IhgEmGpeQBdmWODJtGlUKIEYVhIdAKACigGFoisIHVwU7K4CfUELABCagJwIgQYgowYBAAIJAEhEQEgB4IBEARAIAAQAqwEIACNgEFgBYGAQACgGhYgRQBCBIQZHBUcpgQFSLRQT2ViCUHexphCGWeBFAo_oqEBGs0QLAyEhYOY4AkBLxZIHmKF8gAAAAA.f_gAD_gAAAAA&c=https%3A%2F%2Feuw-ice.360yield.com%2Fclick%2FicS49rk9QboLEcCd2ow-WFM9F-uuu.xuH-D.JKa4FBO3Vxze.r6Uf644oAHkoUAxfF-CS-TZMM5vuXryUCtFZY.0iu4Uva6MWyjId5sB-BkTdMYZonq6EFX7D--DhmqReLb-AXr9GCFaLePzLe3jG0QYG.-ZsKp9nMiVsUXOoeCZvH.DTvtGo1gvOi3rVoeBw7XaRuwtcfhfr7VPrrWzovbtyMrMZsWzMIbU-WQZ0qYJSXHRn0PECOMxw.kHptceQ8-.TPHiSdW2O-Mk97IgJ5GNdnPwqO3pc8TXzaWvxtuKywsYQ-8Fk5o4FaUSFh1wa2fQEvUnh1A5sOgB.F.D8PaDrLofK3FfWxAa0hLcsi3nO2DYX-oppQZ1r2qYsaUlrSp-yVVSw.PoAQdSFCgrZnY-j7fpezyE.DBSsabWkCdSuMFnmaGUbToYca5PgblpDAxTk.fn13QijCoq3sVMQ.lgbUEdaruATWGbviYrO8tOYThvOTO.U1XqP0lE-kMNQOM6912RGYH9wEavr-xI4QRwG6Qa.ms5EJG-gPq8%2F%2F"\n        });\n      })();\n</script><noscript class="MOAT-improvedigitaldisplay945272226933?moatClientLevel1=5279&amp;moatClientLevel2=187354&amp;moatClientLevel3=410573&amp;moatClientLevel4=544063&amp;moatClientSlicer1=291098&amp;moatClientSlicer2=22655158&amp;zMoatRTBADV=improvedigital.com&amp;zMoatRTBCR=&amp;zMoatReferrer=localhost&amp;zMoatSZ=970x250&amp;zMoatBundle="></noscript>\n<script src="https://z.moatads.com/improvedigitaldisplay945272226933/moatad.js#moatClientLevel1=5279&moatClientLevel2=187354&moatClientLevel3=410573&moatClientLevel4=544063&moatClientSlicer1=291098&moatClientSlicer2=22655158&zMoatRTBADV=improvedigital.com&zMoatRTBCR=&zMoatReferrer=localhost&zMoatSZ=970x250&zMoatBundle=" type="text/javascript"></script><img src="https://euw-ice.360yield.com/imp_pixel?ic=icS49pIfpuQmwz1qwTyow94dtPYFJ1jd5AmVkPxrq5AiMd6kj6SEjlT305kiOHKmTXMmbZXHwoVeXjv3RYo.3Y2aERPh6YXuUAUpd9q4kwk81vxha7.45yIGHQewfVQasIsWALCaw..GbNmjZcezJcWCYCyOVobUgm2IQCRNqm8eTb5YZIPQtYU5SB6P.f3kf7J64jQuqILOmuizstXUQQeJM.S0F12arPFAPswnbIm-mZHGqMEG4ShDG5LqIAwBwWTAp71MHD9ztPR34GkXnVd8Ub-OErWFbH5z6g-150kngZ90er.RUXOiFCQNK-69nU0NrzWNsZYCSg.c5xZ39RsTUOOROb52aTRuHn4nd--2FnI5EMnjBV..-KZVX6b33J0qHaqyO8Xfp7JwtSQ2pmk.yHziRMTAl2K0rm0Afn5O.SXV5GT.b7Aua8soa.YGd.h9R.FC34NwClsGgD9OalhEhyqnWZoHyLFUdeYnw9EljptBDIMkFQ9FXP0mJsqZCMWZXE20zGW24QmsWqNelt0Hqs0r7V-ca.WvrYxJ" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="187354" line_item_id="410573" creative_id="544063" crid="0" placement_id="22655158"></improvedigital_ad_output_information></body></html>',
+              'cid': '187354'
+            }
+          ],
+          'seat': 'improvedigital'
+        }
+      ]
     }
-  ];
+  };
 
   describe('interpretResponse', function () {
     const expectedBid = [
       {
-        'ad': '<img src=\"https://ice.360yield.com/imp_pixel?ic=wVmhKI07hCVyGC1sNdFp.6buOSiGYOw8jPyZLlcMY2RCwD4ek3Fy6.xUI7U002skGBs3objMBoNU-Frpvmb9js3NKIG0YZJgWaNdcpXY9gOXE9hY4-wxybCjVSNzhOQB-zic73hzcnJnKeoGgcfvt8fMy18-yD0aVdYWt4zbqdoITOkKNCPBEgbPFu1rcje-o7a64yZ7H3dKvtnIixXQYc1Ep86xGSBGXY6xW2KfUOMT6vnkemxO72divMkMdhR8cAuqIubbx-ZID8-xf5c9k7p6DseeBW0I8ionrlTHx.rGosgxhiFaMqtr7HiA7PBzKvPdeEYN0hQ8RYo8JzYL82hA91A3V2m9Ij6y0DfIJnnrKN8YORffhxmJ6DzwEl1zjrVFbD01bqB3Vdww8w8PQJSkKQkd313tr-atU8LS26fnBmOngEkVHwAr2WCKxuUvxHmuVBTA-Lgz7wKwMoOJCA3hFxMavVb0ZFB7CK0BUTVU6z0De92Q.FJKNCHLMbjX3vcAQ90=\" width=\"0\" height=\"0\" style=\"display:none\"><script>document.writeln(\"<a href=\\\"https:\\/\\/ice.360yield.com\\/click\\/wVmhKEKFeJufyP3hFfp7fv95ynoKe7vnG9V-j8EyAzklSoKRkownAclw4Zzcw-OcbJMg2KfjNiO8GoO9WP1jbNM8Q5GtmClbG9hZPBS4v6oBBiDi50AjRqHQsDAoBOJrIJtVyCfrnAIxvbysozCpLt20ov6jz2JPi6fe.D55HNeDLDyiLNgxVPa3y9jJZf65JBirCjOoZ-1Mj1BLB.57VdMaEhpGjjl5HnPgw0Pv7Hm1BO7PB9nCXJ9IwOH3IrKo.Wyy1iKDk6zeGwGOkQHSOMuQnCHyD35x6bhDQrpl5H6fTRTR8D2m5.-Zjh3fs8SKlo0i25EjKPw65iF.tvgcnq01U08OIh86EeSciamJgV0hNsk20TcTubfsoPN4are4nQ0y2gB-lz9tf3AjqHpSz5NoJWrpWtnrBHbjm.dS1XUQB1tzcLpIkA34nDe2eNxRZbZkZNSSs.Y8jQemfbjuLpttcemHqidFZo3xp37eSfUImw.HbyFdnK-wxFDYudgsIDxGJWI=\\/\\/https%3A%2F%2Fwww.improvedigital.com\\\" target=\\\"_blank\\\"><img style=\\\"border: 0;\\\" border=\\\"0\\\" width=\\\"600\\\" height=\\\"290\\\" src=\\\"https:\\/\\/creative.360yield.com\\/file\\/221728\\/ImproveDigital600x290.jpg\\\" alt=\\\"\\\"\\/><\\/a>\");document.writeln(\"<improvedigital_ad_output_information tp_id=\\\"\\\" buyer_id=\\\"0\\\" rtb_advertiser=\\\"\\\" campaign_id=\\\"99006\\\" line_item_id=\\\"268515\\\" creative_id=\\\"422031\\\" crid=\\\"0\\\" placement_id=\\\"1053688\\\"><\\/improvedigital_ad_output_information>\");</script>',
-        'adId': '33e9500b21129f',
-        'creativeId': '422031',
-        'cpm': 1.45888594164456,
-        'currency': 'USD',
-        'height': 290,
-        'mediaType': 'banner',
-        'netRevenue': false,
-        'requestId': '33e9500b21129f',
-        'ttl': 300,
-        'width': 600
+        requestId: '33e9500b21129f',
+        cpm: 1.9200543539802946,
+        currency: 'EUR',
+        width: 728,
+        height: 90,
+        ttl: 300,
+        ad: '<html><body style="margin:0%">\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=728 height=90 src=\\"https://creative.360yield.com/file/241121/728x90.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"510265\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","requestId":"33e9500b21129f","seatBidId":"35adfe19-d6e9-46b9-9f7d-20da7026b965","cpm":1.9200543539802946,"currency":"EUR","width":728,"height":90,"creative_id":"510265","creativeId":"510265","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+        creativeId: '510265',
+        dealId: 320896,
+        netRevenue: false,
+        mediaType: BANNER,
       }
     ];
 
-    const expectedTwoBids = [
-      expectedBid[0],
-      {
-        'ad': '<img src=\"https://link/imp_pixel?ic=wVmhKI07hCVyGC1sNdFp.6buOSiGYOw8jPyZLlcMY2RCwD4ek3Fy6.xUI7U002skGBs3objMBoNU-Frpvmb9js3NKIG0YZJgWaNdcpXY9gOXE9hY4-wxybCjVSNzhOQB-zic73hzcnJnKeoGgcfvt8fMy18-yD0aVdYWt4zbqdoITOkKNCPBEgbPFu1rcje-o7a64yZ7H3dKvtnIixXQYc1Ep86xGSBGXY6xW2KfUOMT6vnkemxO72divMkMdhR8cAuqIubbx-ZID8-xf5c9k7p6DseeBW0I8ionrlTHx.rGosgxhiFaMqtr7HiA7PBzKvPdeEYN0hQ8RYo8JzYL82hA91A3V2m9Ij6y0DfIJnnrKN8YORffhxmJ6DzwEl1zjrVFbD01bqB3Vdww8w8PQJSkKQkd313tr-atU8LS26fnBmOngEkVHwAr2WCKxuUvxHmuVBTA-Lgz7wKwMoOJCA3hFxMavVb0ZFB7CK0BUTVU6z0De92Q.FJKNCHLMbjX3vcAQ90=\" width=\"0\" height=\"0\" style=\"display:none\"><script>document.writeln(\"<a href=\\\"https:\\/\\/ice.360yield.com\\/click\\/wVmhKEKFeJufyP3hFfp7fv95ynoKe7vnG9V-j8EyAzklSoKRkownAclw4Zzcw-OcbJMg2KfjNiO8GoO9WP1jbNM8Q5GtmClbG9hZPBS4v6oBBiDi50AjRqHQsDAoBOJrIJtVyCfrnAIxvbysozCpLt20ov6jz2JPi6fe.D55HNeDLDyiLNgxVPa3y9jJZf65JBirCjOoZ-1Mj1BLB.57VdMaEhpGjjl5HnPgw0Pv7Hm1BO7PB9nCXJ9IwOH3IrKo.Wyy1iKDk6zeGwGOkQHSOMuQnCHyD35x6bhDQrpl5H6fTRTR8D2m5.-Zjh3fs8SKlo0i25EjKPw65iF.tvgcnq01U08OIh86EeSciamJgV0hNsk20TcTubfsoPN4are4nQ0y2gB-lz9tf3AjqHpSz5NoJWrpWtnrBHbjm.dS1XUQB1tzcLpIkA34nDe2eNxRZbZkZNSSs.Y8jQemfbjuLpttcemHqidFZo3xp37eSfUImw.HbyFdnK-wxFDYudgsIDxGJWI=\\/\\/https%3A%2F%2Fwww.improvedigital.com\\\" target=\\\"_blank\\\"><img style=\\\"border: 0;\\\" border=\\\"0\\\" width=\\\"600\\\" height=\\\"290\\\" src=\\\"https:\\/\\/creative.360yield.com\\/file\\/221728\\/ImproveDigital600x290.jpg\\\" alt=\\\"\\\"\\/><\\/a>\");document.writeln(\"<improvedigital_ad_output_information tp_id=\\\"\\\" buyer_id=\\\"0\\\" rtb_advertiser=\\\"\\\" campaign_id=\\\"99006\\\" line_item_id=\\\"268515\\\" creative_id=\\\"422031\\\" crid=\\\"0\\\" placement_id=\\\"1053688\\\"><\\/improvedigital_ad_output_information>\");</script>',
-        'adId': '1234',
-        'creativeId': '422033',
-        'cpm': 1.23,
-        'currency': 'USD',
-        'height': 400,
-        'mediaType': 'banner',
-        'netRevenue': true,
-        'requestId': '1234',
-        'ttl': 300,
-        'width': 700
-      }
+    const multiFormatExpectedBid = [
+      Object.assign({}, expectedBid[0], {
+        ad: '<html><body style="margin:0%">\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]},"native":{},"video":{"context":"outstream","playerSize":[640,480]}},"sizes":[[300,250],[160,600]],"nativeParams":{"body":{"required":true}}},"bid":{"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=728 height=90 src=\\"https://creative.360yield.com/file/241121/728x90.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"510265\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","requestId":"33e9500b21129f","seatBidId":"35adfe19-d6e9-46b9-9f7d-20da7026b965","cpm":1.9200543539802946,"currency":"EUR","width":728,"height":90,"creative_id":"510265","creativeId":"510265","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+      })
     ];
 
-    const expectedBidNative = [
+    const expectedTwoBids = [
+      expectedBid[0],
       {
-        mediaType: 'native',
-        adId: '33e9500b21129f',
-        creativeId: '422031',
-        cpm: 1.45888594164456,
-        currency: 'USD',
-        height: 290,
-        netRevenue: false,
         requestId: '33e9500b21129f',
+        cpm: 1.9200543539802946,
+        currency: 'EUR',
+        width: 300,
+        height: 250,
         ttl: 300,
-        width: 600,
-        native: {
-          title: 'Native title',
-          body: 'Native body',
-          body2: 'body2',
-          cta: 'Do it',
-          sponsoredBy: 'Improve Digital',
-          rating: '4',
-          likes: '10105',
-          downloads: '150000',
-          price: '3.99',
-          salePrice: '4.49',
-          phone: '(123) 456-7890',
-          address: '123 Main Street, Anywhere USA',
-          displayUrl: 'https://myurl.com',
-          icon: {
-            url: 'https://blah.com/icon.jpg',
-            height: 30,
-            width: 40
-          },
-          image: {
-            url: 'https://blah.com/image.jpg',
-            height: 200,
-            width: 800
-          },
-          clickUrl: 'https://advertiser.com',
-          clickTrackers: ['https://click.tracker.com/click?impid=123'],
-          impressionTrackers: [
-            'https://ice.360yield.com/imp_pixel?ic=wVm',
-            'https://imptrack1.com',
-            'https://imptrack2.com'
-          ],
-          javascriptTrackers: '<script src=\"https://www.foobar.js\"></script>',
-          privacyLink: 'https://www.myprivacyurl.com'
-        }
+        ad: '<html><body style="margin:0%">\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=300 height=250 src=\\"https://creative.360yield.com/file/238052/test_ads-300x250.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"479163\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","requestId":"33e9500b21129f","seatBidId":"83c8d524-0955-4d0c-b558-4c9f3600e09b","cpm":1.9200543539802946,"currency":"EUR","width":300,"height":250,"creative_id":"479163","creativeId":"479163","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script><a href="https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com" target="_blank"><img style="border: 0;" border="0" width=300 height=250 src="https://creative.360yield.com/file/238052/test_ads-300x250.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="479163" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+        creativeId: '479163',
+        dealId: 320896,
+        netRevenue: false,
+        mediaType: BANNER,
       }
     ];
 
     const expectedBidInstreamVideo = [
       {
-        'vastXml': '<VAST></VAST>',
-        'adId': '33e9500b21129f',
-        'creativeId': '422031',
-        'cpm': 1.45888594164456,
-        'currency': 'USD',
-        'height': 290,
-        'mediaType': 'video',
-        'netRevenue': false,
-        'requestId': '33e9500b21129f',
-        'ttl': 300,
-        'width': 600
+        requestId: '33e9500b21129f',
+        cpm: 9.600271769901472,
+        currency: 'EUR',
+        ttl: 300,
+        vastXml: '<VAST></VAST>',
+        creativeId: '484367',
+        dealId: 321329,
+        netRevenue: false,
+        mediaType: VIDEO,
+        meta: {
+          advertiserDomains: ['improvedigital.com'],
+        }
       }
     ];
 
-    const expectedBidOutstreamVideo = utils.deepClone(expectedBidInstreamVideo);
+    const expectedBidOutstreamVideo = deepClone(expectedBidInstreamVideo);
     expectedBidOutstreamVideo[0].adResponse = {
-      content: expectedBidOutstreamVideo[0].vastXml,
-      height: expectedBidOutstreamVideo[0].height,
-      width: expectedBidOutstreamVideo[0].width
+      content: expectedBidOutstreamVideo[0].vastXml
     };
 
+    function makeRequest(bidderRequest) {
+      return {
+        ortbRequest: CONVERTER.toORTB({bidderRequest})
+      }
+    }
+
+    function expectMatch(actual, expected) {
+      sinon.assert.match(actual, expected.map(i => sinon.match(i)));
+    }
+
     it('should return a well-formed display bid', function () {
-      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
-      expect(bids).to.deep.equal(expectedBid);
+      const bids = spec.interpretResponse(serverResponse, makeRequest(bidderRequest));
+      expectMatch(bids, expectedBid);
     });
 
     it('should return a well-formed display bid for multi-format ad unit', function () {
-      const bids = spec.interpretResponse(serverResponse, {bidderRequest: multiFormatBidderRequest});
-      expect(bids).to.deep.equal(expectedBid);
+      const bids = spec.interpretResponse(serverResponse, makeRequest(multiFormatBidderRequest));
+
+      expectMatch(bids, multiFormatExpectedBid);
     });
 
     it('should return two bids', function () {
-      const bids = spec.interpretResponse(serverResponseTwoBids, {bidderRequest});
-      expect(bids).to.deep.equal(expectedTwoBids);
+      const bids = spec.interpretResponse(serverResponseTwoBids, makeRequest(bidderRequest));
+      expectMatch(bids, expectedTwoBids);
     });
 
     it('should set dealId correctly', function () {
-      const response = JSON.parse(JSON.stringify(serverResponse));
+      const request = makeRequest(bidderRequest);
+      const response = deepClone(serverResponse);
       let bids;
 
-      delete response.body.bid[0].lid;
-      response.body.bid[0].buying_type = 'deal_id';
-      bids = spec.interpretResponse(response, {bidderRequest});
+      delete response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id;
+      response.body.seatbid[0].bid[0].ext.improvedigital.buying_type = 'deal_id';
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.not.exist;
 
-      response.body.bid[0].lid = 268515;
-      delete response.body.bid[0].buying_type;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id = 268515;
+      delete response.body.seatbid[0].bid[0].ext.improvedigital.buying_type;
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.not.exist;
 
-      response.body.bid[0].lid = 268515;
-      response.body.bid[0].buying_type = 'rtb';
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id = 268515;
+      response.body.seatbid[0].bid[0].ext.improvedigital.buying_type = 'rtb';
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.not.exist;
 
-      response.body.bid[0].lid = 268515;
-      response.body.bid[0].buying_type = 'classic';
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id = 268515;
+      response.body.seatbid[0].bid[0].ext.improvedigital.buying_type = 'classic';
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.equal(268515);
 
-      response.body.bid[0].lid = 268515;
-      response.body.bid[0].buying_type = 'deal_id';
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id = 268515;
+      response.body.seatbid[0].bid[0].ext.improvedigital.buying_type = 'deal_id';
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.equal(268515);
-
-      response.body.bid[0].lid = [ 268515, 12456, 34567 ];
-      response.body.bid[0].buying_type = 'deal_id';
-      bids = spec.interpretResponse(response, {bidderRequest});
-      expect(bids[0].dealId).to.not.exist;
-
-      response.body.bid[0].lid = [ 268515, 12456, 34567 ];
-      response.body.bid[0].buying_type = [ 'deal_id', 'classic' ];
-      bids = spec.interpretResponse(response, {bidderRequest});
-      expect(bids[0].dealId).to.not.exist;
-
-      response.body.bid[0].lid = [ 268515, 12456, 34567 ];
-      response.body.bid[0].buying_type = [ 'rtb', 'deal_id', 'deal_id' ];
-      bids = spec.interpretResponse(response, {bidderRequest});
-      expect(bids[0].dealId).to.equal(12456);
     });
 
     it('should set currency', function () {
-      const response = JSON.parse(JSON.stringify(serverResponse));
-      response.body.bid[0].currency = 'eur';
-      const bids = spec.interpretResponse(response, {bidderRequest});
+      const response = deepClone(serverResponse);
+      response.body.cur = 'EUR';
+      const bids = spec.interpretResponse(response, makeRequest(bidderRequest));
       expect(bids[0].currency).to.equal('EUR');
     });
 
     it('should return empty array for bad response or no price', function () {
-      let response = JSON.parse(JSON.stringify(serverResponse));
+      const request = makeRequest(bidderRequest);
+      let response = deepClone(serverResponse);
       let bids;
 
       // Price missing or 0
-      response.body.bid[0].price = 0;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response.body.seatbid[0].bid[0].price = 0;
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
-      delete response.body.bid[0].price;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      delete response.body.seatbid[0].bid[0];
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
-      response.body.bid[0].price = null;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response.body.seatbid[0].bid[0] = [];
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
 
       // errorCode present
-      response = JSON.parse(JSON.stringify(serverResponse));
-      response.body.bid[0].errorCode = undefined;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response = deepClone(serverResponse);
+      response.body.seatbid[0].bid[0].errorCode = undefined;
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
 
       // adm and native missing
-      response = JSON.parse(JSON.stringify(serverResponse));
-      delete response.body.bid[0].adm;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response = deepClone(serverResponse);
+      delete response.body.seatbid[0].bid[0].adm;
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
-      response.body.bid[0].adm = null;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      response.body.seatbid[0].bid[0].adm = null;
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
     });
 
     it('should set netRevenue', function () {
-      const response = JSON.parse(JSON.stringify(serverResponse));
-      response.body.bid[0].isNet = true;
-      const bids = spec.interpretResponse(response, {bidderRequest});
+      const response = deepClone(serverResponse);
+      response.body.seatbid[0].bid[0].ext.improvedigital.is_net = true;
+      const bids = spec.interpretResponse(response, makeRequest(bidderRequest));
       expect(bids[0].netRevenue).to.equal(true);
     });
 
-    // Native ads
-    it('should return a well-formed native ad bid', function () {
-      let bids = spec.interpretResponse(serverResponseNative, {bidderRequest});
-      expect(bids[0].ortbNative).to.deep.equal(serverResponseNative.body.bid[0].native);
-      delete bids[0].ortbNative;
-      expect(bids).to.deep.equal(expectedBidNative);
-
-      // eventtrackers
-      const response = JSON.parse(JSON.stringify(serverResponseNative));
-      const expectedBids = JSON.parse(JSON.stringify(expectedBidNative));
-      response.body.bid[0].native.eventtrackers = nativeEventtrackers;
-      expectedBids[0].native.impressionTrackers = [
-        'https://ice.360yield.com/imp_pixel?ic=wVm',
-        'https://www.mytracker.com/imptracker'
-      ];
-      expectedBids[0].native.javascriptTrackers = '<script src=\"https://www.mytracker.com/tracker.js\"></script>';
-      bids = spec.interpretResponse(response, {bidderRequest});
-      delete bids[0].ortbNative;
-      expect(bids).to.deep.equal(expectedBids);
+    it('should set advertiserDomains', function () {
+      const adomain = ['domain.com'];
+      const response = deepClone(serverResponse);
+      response.body.seatbid[0].bid[0].adomain = adomain;
+      const bids = spec.interpretResponse(response, makeRequest(bidderRequest));
+      expect(bids[0].meta.advertiserDomains).to.equal(adomain);
     });
+    //
+    // Native ads
+    if (FEATURES.NATIVE) {
+      it('should return a well-formed native ad bid', function () {
+        const reqBids = updateNativeParams(nativeBidderRequest.bids);
+        const request = makeRequest({
+          ...nativeBidderRequest,
+          reqBids
+        })
+        const bids = spec.interpretResponse(serverResponseNative, request);
+        expect(bids[0].native.ortb).to.eql(JSON.parse(serverResponseNative.body.seatbid[0].bid[0].adm))
+      });
+
+      it('should return a well-formed native bid for multi-format ad unit', function () {
+        const bids = spec.interpretResponse(serverResponseNative, makeRequest(multiFormatBidderRequest));
+        expect(bids[0].mediaType).to.equal(NATIVE);
+      });
+    }
 
     // Video
     it('should return a well-formed instream video bid', function () {
-      const bids = spec.interpretResponse(serverResponseVideo, {bidderRequest: instreamBidderRequest});
-      expect(bids).to.deep.equal(expectedBidInstreamVideo);
+      const bids = spec.interpretResponse(serverResponseVideo, makeRequest(instreamBidderRequest));
+      expectMatch(bids, expectedBidInstreamVideo);
     });
 
     it('should return a well-formed outstream video bid', function () {
-      const bids = spec.interpretResponse(serverResponseVideo, {bidderRequest: outstreamBidderRequest});
+      const bids = spec.interpretResponse(serverResponseVideo, makeRequest(outstreamBidderRequest));
       expect(bids[0].renderer).to.exist;
-      delete (bids[0].renderer);
-      expect(bids).to.deep.equal(expectedBidOutstreamVideo);
+      expectMatch(bids, expectedBidOutstreamVideo);
     });
 
     it('should return a well-formed outstream video bid for multi-format ad unit', function () {
-      const bids = spec.interpretResponse(serverResponseVideo, {bidderRequest: multiFormatBidderRequest});
+      const request = makeRequest(multiFormatBidderRequest);
+      const videoResponse = deepClone(serverResponseVideo);
+      let bids = spec.interpretResponse(videoResponse, request);
       expect(bids[0].renderer).to.exist;
-      delete (bids[0].renderer);
-      expect(bids).to.deep.equal(expectedBidOutstreamVideo);
+      expectMatch(bids, expectedBidOutstreamVideo);
+
+      videoResponse.body.seatbid[0].bid[0].adm = '<vAst';
+      bids = spec.interpretResponse(videoResponse, request);
+      expect(bids[0].mediaType).to.equal(VIDEO);
+
+      videoResponse.body.seatbid[0].bid[0].adm = '<?xml';
+      bids = spec.interpretResponse(videoResponse, request);
+      expect(bids[0].mediaType).to.equal(VIDEO);
     });
   });
 
   describe('getUserSyncs', function () {
-    const serverResponses = [ serverResponseTwoBids ];
+    const serverResponses = [ serverResponse, serverResponseTwoBids ];
+    const pixelSyncs = [
+      { type: 'image', url: 'https://link1' },
+      { type: 'image', url: 'https://link2' },
+      { type: 'image', url: 'https://link3' },
+      { type: 'image', url: 'https://link4' }
+    ];
+
+    const basicIframeSyncUrl = `${IFRAME_SYNC_URL}?placement_id=1053688`;
+
+    const uspConsent = '1YYY';
+
+    let getConfigStub = null;
+
+    beforeEach(function () {
+      spec.syncStore = { extendMode: false, placementId: null };
+    });
+
+    afterEach(function () {
+      if (getConfigStub) {
+        getConfigStub.restore();
+        getConfigStub = null;
+      }
+    });
+
+    it('should return no syncs when neither iframe nor pixel syncing is enabled', function () {
+      const syncs = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: false }, serverResponses);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should return no syncs for COPPA users', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('coppa').returns(true);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses);
+      expect(syncs).to.deep.equal([]);
+    });
 
-    it('should return no syncs when pixel syncing is disabled', function () {
-      const syncs = spec.getUserSyncs({ pixelEnabled: false }, serverResponses);
+    it('should return no syncs for when GDPR consent for purpose 1 not given', function () {
+      const consent = deepClone(gdprConsent);
+      deepSetValue(consent, 'vendorData.purpose.consents.1', false);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses, consent);
       expect(syncs).to.deep.equal([]);
     });
 
-    it('should return user syncs', function () {
+    it('should return pixel user syncs for the ad server mode', function () {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, serverResponses);
+      expect(syncs).to.deep.equal(pixelSyncs);
+    });
+
+    it('should return pixel user syncs for extend mode when iframe mode disabled', function () {
+      // Set spec.syncStore vars
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.extend').returns(true);
+      spec.buildRequests([simpleBidRequest], bidderRequest);
+
       const syncs = spec.getUserSyncs({ pixelEnabled: true }, serverResponses);
-      const expected = [
-        { type: 'image', url: 'https://link1' },
-        { type: 'image', url: 'https://link2' },
-        { type: 'image', url: 'https://link3' }
-      ];
-      expect(syncs).to.deep.equal(expected);
+      expect(syncs).to.deep.equal(pixelSyncs);
+    });
+
+    it('should return iframe user sync for the ad server mode when pixel mode disabled', function () {
+      spec.buildRequests([simpleBidRequest], bidderRequest);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: false }, serverResponses);
+      expect(syncs).to.deep.equal([{ type: 'iframe', url: basicIframeSyncUrl }]);
+    });
+
+    it('should attach gdpr consent to iframe sync url', function () {
+      spec.buildRequests([simpleBidRequest], bidderRequest);
+      let syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: false }, serverResponses, gdprConsent);
+      expect(syncs).to.deep.equal([{ type: 'iframe', url: `${basicIframeSyncUrl}&gdpr=1&gdpr_consent=CONSENT` }]);
+
+      syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: false }, serverResponses, { gdprApplies: false });
+      expect(syncs).to.deep.equal([{ type: 'iframe', url: `${basicIframeSyncUrl}&gdpr=0` }]);
+    });
+
+    it('should attach usp consent to iframe sync url', function () {
+      spec.buildRequests([simpleBidRequest], bidderRequest);
+      let syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: false }, serverResponses, null, uspConsent);
+      expect(syncs).to.deep.equal([{ type: 'iframe', url: `${basicIframeSyncUrl}&us_privacy=${uspConsent}` }]);
+    });
+
+    it('should return iframe user sync for the adunit extend mode if iframe mode enabled', function () {
+      // buildRequests() sets spec.syncStore vars
+      spec.buildRequests([simpleBidRequest, extendBidRequest], {});
+      const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses);
+      expect(syncs).to.deep.equal([{ type: 'iframe', url: basicIframeSyncUrl + '&pbs=1' }]);
+    });
+
+    it('should return iframe user sync for the global extend mode if iframe mode enabled', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.extend').returns(true);
+      // buildRequests() sets spec.syncStore vars
+      spec.buildRequests([simpleBidRequest], {});
+      const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses);
+      expect(syncs).to.deep.equal([{ type: 'iframe', url: basicIframeSyncUrl + '&pbs=1' }]);
+    });
+
+    it('should add bidders to iframe user sync url', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.extend').returns(true);
+      spec.buildRequests([simpleBidRequest], {});
+      const rawResponse = deepClone(serverResponse)
+      deepSetValue(rawResponse, 'body.ext.responsetimemillis', {a: 1, b: 1, c: 1, d: 1, e: 1})
+      let syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, [rawResponse]);
+      let url = basicIframeSyncUrl + '&pbs=1' + '&bidders=a,b,c,d,e'
+      expect(syncs).to.deep.equal([{ type: 'iframe', url }]);
     });
   });
 });
diff --git a/test/spec/modules/imuIdSystem_spec.js b/test/spec/modules/imuIdSystem_spec.js
new file mode 100644
index 00000000000..3650302a2ed
--- /dev/null
+++ b/test/spec/modules/imuIdSystem_spec.js
@@ -0,0 +1,184 @@
+import {
+  imuIdSubmodule,
+  storage,
+  getApiUrl,
+  apiSuccessProcess,
+  getLocalData,
+  callImuidApi,
+  getApiCallback,
+  storageKey,
+  storagePpKey,
+  cookieKey,
+  apiUrl
+} from 'modules/imuIdSystem.js';
+
+import * as utils from 'src/utils.js';
+
+describe('imuId module', function () {
+  // let setLocalStorageStub;
+  let getLocalStorageStub;
+  let getCookieStub;
+  // let ajaxBuilderStub;
+
+  beforeEach(function (done) {
+    // setLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
+    getLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    // ajaxBuilderStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockResponse('{}'));
+    done();
+  });
+
+  afterEach(function () {
+    getLocalStorageStub.restore();
+    getCookieStub.restore();
+    // ajaxBuilderStub.restore();
+  });
+
+  const storageTestCasesForEmpty = [
+    undefined,
+    null,
+    ''
+  ]
+
+  const configParamTestCase = {
+    params: {
+      cid: 5126
+    }
+  }
+
+  describe('getId()', function () {
+    it('should return the uid when it exists in local storages', function () {
+      getLocalStorageStub.withArgs(storageKey).returns('testUid');
+      getLocalStorageStub.withArgs(storagePpKey).returns('testPpid');
+      const id = imuIdSubmodule.getId(configParamTestCase);
+      expect(id).to.be.deep.equal({id: {
+        imuid: 'testUid',
+        imppid: 'testPpid'
+      }});
+    });
+
+    storageTestCasesForEmpty.forEach(testCase => it('should return the callback when it not exists in local storages', function () {
+      getLocalStorageStub.withArgs(storageKey).returns(testCase);
+      getLocalStorageStub.withArgs(storagePpKey).returns(testCase);
+      const id = imuIdSubmodule.getId(configParamTestCase);
+      expect(id).have.all.keys('callback');
+    }));
+
+    it('should return "undefined" when empty param', function () {
+      const id = imuIdSubmodule.getId();
+      expect(id).to.be.deep.equal(undefined);
+    });
+
+    it('should return the callback when it not exists in local storages (and has vid)', function () {
+      getCookieStub.withArgs(cookieKey).returns('test');
+      const id = imuIdSubmodule.getId(configParamTestCase);
+      expect(id).have.all.keys('callback');
+    });
+  });
+
+  describe('getApiUrl()', function () {
+    it('should return default url when cid only', function () {
+      const url = getApiUrl(5126);
+      expect(url).to.be.equal(`https://sync6.im-apps.net/5126/pid`);
+    });
+
+    it('should return param url when set url', function () {
+      const url = getApiUrl(5126, 'testurl');
+      expect(url).to.be.equal('testurl?cid=5126');
+    });
+  });
+
+  describe('decode()', function () {
+    it('should return the uid when it exists in local storages', function () {
+      const id = imuIdSubmodule.decode({
+        imppid: 'imppid-value-imppid-value-imppid-value',
+        imuid: 'testDecodeImPpid'
+      });
+      expect(id).to.be.deep.equal({
+        imppid: 'imppid-value-imppid-value-imppid-value',
+        imuid: 'testDecodeImPpid'
+      });
+    });
+
+    it('should return the undefined when decode id is not "string"', function () {
+      const id = imuIdSubmodule.decode(1);
+      expect(id).to.equal(undefined);
+    });
+  });
+
+  describe('getLocalData()', function () {
+    it('always have the same key', function () {
+      getLocalStorageStub.withArgs(storageKey).returns('testid');
+      getLocalStorageStub.withArgs(storagePpKey).returns('imppid-value-imppid-value-imppid-value');
+      getCookieStub.withArgs(cookieKey).returns('testvid');
+      getLocalStorageStub.withArgs(`${storageKey}_mt`).returns(new Date(utils.timestamp()).toUTCString());
+      const localData = getLocalData();
+      expect(localData).to.be.deep.equal({
+        id: 'testid',
+        ppid: 'imppid-value-imppid-value-imppid-value',
+        vid: 'testvid',
+        expired: false
+      });
+    });
+
+    it('should return expired is true', function () {
+      getLocalStorageStub.withArgs(`${storageKey}_mt`).returns(0);
+      const localData = getLocalData();
+      expect(localData).to.be.deep.equal({
+        id: undefined,
+        ppid: undefined,
+        vid: undefined,
+        expired: true
+      });
+    });
+  });
+
+  describe('apiSuccessProcess()', function () {
+    it('should return the undefined when success response', function () {
+      const res = apiSuccessProcess({
+        uid: 'test',
+        ppid: 'imppid-value-imppid-value-imppid-value',
+        vid: 'test'
+      });
+      expect(res).to.equal(undefined);
+    });
+
+    it('should return the undefined when empty response', function () {
+      const res = apiSuccessProcess();
+      expect(res).to.equal(undefined);
+    });
+
+    it('should return the undefined when error response', function () {
+      const res = apiSuccessProcess({
+        error: 'error response'
+      });
+      expect(res).to.equal(undefined);
+    });
+  });
+
+  describe('callImuidApi()', function () {
+    it('should return function when set url', function () {
+      const res = callImuidApi(`${apiUrl}?cid=5126`);
+      expect(res).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('getApiCallback()', function () {
+    it('should return success and error functions', function () {
+      const res = getApiCallback();
+      expect(res.success).to.exist.and.to.be.a('function');
+      expect(res.error).to.exist.and.to.be.a('function');
+    });
+
+    it('should return "undefined" success', function () {
+      const res = getApiCallback(function(uid) { return uid });
+      expect(res.success('{"uid": "testid"}')).to.equal(undefined);
+      expect(res.error()).to.equal(undefined);
+    });
+
+    it('should return "undefined" catch error response', function () {
+      const res = getApiCallback(function(uid) { return uid });
+      expect(res.success('error response')).to.equal(undefined);
+    });
+  });
+});
diff --git a/test/spec/modules/incrxBidAdapter_spec.js b/test/spec/modules/incrxBidAdapter_spec.js
new file mode 100644
index 00000000000..8fb95742766
--- /dev/null
+++ b/test/spec/modules/incrxBidAdapter_spec.js
@@ -0,0 +1,100 @@
+import { expect } from 'chai';
+import { spec } from 'modules/incrxBidAdapter.js';
+
+describe('IncrementX', function () {
+  const METHOD = 'POST';
+  const URL = 'https://hb.incrementxserv.com/vzhbidder/bid';
+
+  const bidRequest = {
+    bidder: 'IncrementX',
+    params: {
+      placementId: 'PNX-HB-F796830VCF3C4B'
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    sizes: [
+      [300, 250],
+      [300, 600]
+    ],
+    bidId: 'bid-id-123456',
+    adUnitCode: 'ad-unit-code-1',
+    bidderRequestId: 'bidder-request-id-123456',
+    auctionId: 'auction-id-123456',
+    transactionId: 'transaction-id-123456'
+  };
+
+  describe('isBidRequestValid', function () {
+    it('should return true where required params found', function () {
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidderRequest = {
+      refererInfo: {
+        page: 'https://www.test.com',
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 0,
+        stack: [
+          'https://www.test.com'
+        ],
+        canonicalUrl: null
+      }
+    };
+
+    it('should build correct POST request for banner bid', function () {
+      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      expect(request).to.be.an('object');
+      expect(request.method).to.equal(METHOD);
+      expect(request.url).to.equal(URL);
+
+      const payload = JSON.parse(decodeURI(request.data.q));
+      expect(payload).to.be.an('object');
+      expect(payload._vzPlacementId).to.be.a('string');
+      expect(payload.sizes).to.be.an('array');
+      expect(payload._slotBidId).to.be.a('string');
+      expect(payload._rqsrc).to.be.a('string');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let serverResponse = {
+      body: {
+        vzhPlacementId: 'PNX-HB-F796830VCF3C4B',
+        bid: 'BID-XXXX-XXXX',
+        adWidth: '300',
+        adHeight: '250',
+        cpm: '0.7',
+        ad: '<html><h1>Ad from IncrementX</h1></html>',
+        slotBidId: 'bid-id-123456',
+        nurl: 'htt://nurl.com',
+        statusText: 'Success'
+      }
+    };
+
+    let expectedResponse = [{
+      requestId: 'bid-id-123456',
+      cpm: '0.7',
+      currency: 'USD',
+      netRevenue: false,
+      width: '300',
+      height: '250',
+      creativeId: 0,
+      ttl: 300,
+      ad: '<html><h1>Ad from IncrementX</h1></html>',
+      meta: {
+        mediaType: 'banner',
+        advertiserDomains: []
+      }
+    }];
+
+    it('should correctly interpret valid banner response', function () {
+      let result = spec.interpretResponse(serverResponse);
+      expect(result).to.deep.equal(expectedResponse);
+    });
+  });
+});
diff --git a/test/spec/modules/inmarBidAdapter_spec.js b/test/spec/modules/inmarBidAdapter_spec.js
new file mode 100644
index 00000000000..d21fcbc377b
--- /dev/null
+++ b/test/spec/modules/inmarBidAdapter_spec.js
@@ -0,0 +1,242 @@
+// import or require modules necessary for the test, e.g.:
+import {expect} from 'chai'; // may prefer 'assert' in place of 'expect'
+import {
+  spec
+} from 'modules/inmarBidAdapter.js';
+import {config} from 'src/config.js';
+
+describe('Inmar adapter tests', function () {
+  var DEFAULT_PARAMS_NEW_SIZES = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250], [300, 600], [728, 90], [970, 250]]
+      }
+    },
+    bidder: 'inmar',
+    params: {
+      partnerId: 12345
+    },
+    auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    transactionId: '29df2112-348b-4961-8863-1b33684d95e6',
+    user: {}
+  }];
+
+  var DEFAULT_PARAMS_VIDEO = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    mediaTypes: {
+      video: {
+        context: 'instream', // or 'outstream'
+        playerSize: [640, 480],
+        mimes: ['video/mp4']
+      }
+    },
+    bidder: 'inmar',
+    params: {
+      partnerId: 12345
+    },
+    auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    transactionId: '29df2112-348b-4961-8863-1b33684d95e6',
+    user: {}
+  }];
+
+  var DEFAULT_PARAMS_WO_OPTIONAL = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    sizes: [
+      [300, 250],
+      [300, 600],
+      [728, 90],
+      [970, 250]
+    ],
+    bidder: 'inmar',
+    params: {
+      partnerId: 12345,
+    },
+    auctionId: '851adee7-d843-48f9-a7e9-9ff00573fcbf',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    transactionId: '29df2112-348b-4961-8863-1b33684d95e6'
+  }];
+
+  var BID_RESPONSE = {
+    body: {
+      cpm: 1.50,
+      ad: '<!-- script -->',
+      meta: {
+        mediaType: 'banner',
+      },
+      width: 300,
+      height: 250,
+      creativeId: '189198063',
+      netRevenue: true,
+      currency: 'USD',
+      ttl: 300,
+      dealId: 'dealId'
+
+    }
+  };
+
+  var BID_RESPONSE_VIDEO = {
+    body: {
+      cpm: 1.50,
+      meta: {
+        mediaType: 'video',
+      },
+      width: 1,
+      height: 1,
+      creativeId: '189198063',
+      netRevenue: true,
+      currency: 'USD',
+      ttl: 300,
+      vastUrl: 'https://vast.com/vast.xml',
+      dealId: 'dealId'
+    }
+  };
+
+  it('Verify build request to prebid 3.0 display test', function() {
+    const request = spec.buildRequests(DEFAULT_PARAMS_NEW_SIZES, {
+      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
+      },
+      refererInfo: {
+        legacy: {
+          referer: 'https://domain.com',
+          numIframes: 0
+        }
+      }
+    });
+
+    expect(request).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request.data);
+    expect(requestContent.bidRequests[0].params).to.have.property('partnerId').and.to.equal(12345);
+    expect(requestContent.bidRequests[0]).to.have.property('auctionId').and.to.equal('0cb3144c-d084-4686-b0d6-f5dbe917c563');
+    expect(requestContent.bidRequests[0]).to.have.property('bidId').and.to.equal('2c7c8e9c900244');
+    expect(requestContent.bidRequests[0]).to.have.property('bidRequestsCount').and.to.equal(1);
+    expect(requestContent.bidRequests[0]).to.have.property('bidder').and.to.equal('inmar');
+    expect(requestContent.bidRequests[0]).to.have.property('bidderRequestId').and.to.equal('1858b7382993ca');
+    expect(requestContent.bidRequests[0]).to.have.property('adUnitCode').and.to.equal('test-div');
+    expect(requestContent.refererInfo).to.have.property('referer').and.to.equal('https://domain.com');
+    expect(requestContent.bidRequests[0].mediaTypes.banner).to.have.property('sizes');
+    expect(requestContent.bidRequests[0].mediaTypes.banner.sizes[0]).to.have.ordered.members([300, 250]);
+    expect(requestContent.bidRequests[0].mediaTypes.banner.sizes[1]).to.have.ordered.members([300, 600]);
+    expect(requestContent.bidRequests[0].mediaTypes.banner.sizes[2]).to.have.ordered.members([728, 90]);
+    expect(requestContent.bidRequests[0].mediaTypes.banner.sizes[3]).to.have.ordered.members([970, 250]);
+    expect(requestContent.bidRequests[0]).to.have.property('transactionId').and.to.equal('29df2112-348b-4961-8863-1b33684d95e6');
+    expect(requestContent.refererInfo).to.have.property('numIframes').and.to.equal(0);
+  })
+
+  it('Verify interprete response', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS_NEW_SIZES, {
+      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
+      },
+      refererInfo: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    const bids = spec.interpretResponse(BID_RESPONSE, request);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.ad).to.equal('<!-- script -->');
+    expect(bid.meta.mediaType).to.equal('banner');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('189198063');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.ttl).to.equal(300);
+    expect(bid.dealId).to.equal('dealId');
+  });
+
+  it('no banner media response', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS_NEW_SIZES, {
+      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
+      },
+      refererInfo: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    const bids = spec.interpretResponse(BID_RESPONSE_VIDEO, request);
+    const bid = bids[0];
+    expect(bid.vastUrl).to.equal('https://vast.com/vast.xml');
+  });
+
+  it('Verifies bidder_code', function () {
+    expect(spec.code).to.equal('inmar');
+  });
+
+  it('Verifies bidder aliases', function () {
+    expect(spec.aliases).to.have.lengthOf(1);
+    expect(spec.aliases[0]).to.equal('inm');
+  });
+
+  it('Verifies if bid request is valid', function () {
+    expect(spec.isBidRequestValid(DEFAULT_PARAMS_NEW_SIZES[0])).to.equal(true);
+    expect(spec.isBidRequestValid(DEFAULT_PARAMS_WO_OPTIONAL[0])).to.equal(true);
+    expect(spec.isBidRequestValid({})).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {}
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        partnerId: 12345
+      }
+    })).to.equal(true);
+  });
+
+  it('Verifies user syncs image', function () {
+    var syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [BID_RESPONSE], {
+      consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+      referer: 'http://domain.com',
+      gdprApplies: true
+    })
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0].type).to.equal('image');
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [BID_RESPONSE], {
+      consentString: '',
+      referer: 'http://domain.com',
+      gdprApplies: true
+    })
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0].type).to.equal('image');
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [], {
+      consentString: null,
+      referer: 'http://domain.com',
+      gdprApplies: true
+    })
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0].type).to.equal('image');
+  });
+});
diff --git a/test/spec/modules/innityBidAdapter_spec.js b/test/spec/modules/innityBidAdapter_spec.js
index 80c00252632..192ab4911ee 100644
--- a/test/spec/modules/innityBidAdapter_spec.js
+++ b/test/spec/modules/innityBidAdapter_spec.js
@@ -37,9 +37,9 @@ describe('innityAdapterTest', () => {
       'auctionId': '18fd8b8b0bd757'
     }];
 
-    const bidderRequest = {
+    let bidderRequest = {
       refererInfo: {
-        referer: 'https://example.com'
+        page: 'https://refererExample.com'
       }
     };
 
@@ -50,14 +50,21 @@ describe('innityAdapterTest', () => {
       });
     });
 
-    it('bidRequest data', () => {
+    it('bidRequest with complete data', () => {
       const requests = spec.buildRequests(bidRequests, bidderRequest);
       expect(requests[0].data.pub).to.equal(267);
       expect(requests[0].data.zone).to.equal(62546);
       expect(requests[0].data.width).to.equal('300');
       expect(requests[0].data.height).to.equal('250');
+      expect(requests[0].data.url).to.equal(encodeURIComponent('https://refererExample.com'));
       expect(requests[0].data.callback_uid).to.equal('51ef8751f9aead');
     });
+
+    it('bidRequest without referer URL', () => {
+      delete bidderRequest.refererInfo;
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].data.url).to.equal('');
+    });
   });
 
   describe('interpretResponse', () => {
@@ -74,12 +81,14 @@ describe('innityAdapterTest', () => {
         'height': '250',
         'callback': 'json',
         'callback_uid': '51ef8751f9aead',
-        'url': 'https://example.com',
+        'url': 'https://refererExample.com',
         'cb': '',
       }
     };
 
-    const bidResponse = {
+    let advDomains = ['advertiserExample.com'];
+
+    let bidResponse = {
       body: {
         'cpm': 100,
         'width': '300',
@@ -87,6 +96,7 @@ describe('innityAdapterTest', () => {
         'creative_id': '148186',
         'callback_uid': '51ef8751f9aead',
         'tag': '<script>innity=true;</script>',
+        'adomain': advDomains,
       },
       headers: {}
     };
@@ -101,6 +111,14 @@ describe('innityAdapterTest', () => {
       expect(result[0].currency).to.equal('USD');
       expect(result[0].ttl).to.equal(60);
       expect(result[0].ad).to.equal('<script src="https://cdn.innity.net/frame_util.js"></script><script>innity=true;</script>');
+      expect(result[0].meta.advertiserDomains).to.equal(advDomains);
+    });
+
+    it('result with no advertiser domain', () => {
+      bidResponse.body.adomain = [];
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+      expect(result[0].meta.advertiserDomains.length).to.equal(0);
+      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
     });
   });
 });
diff --git a/test/spec/modules/inskinBidAdapter_spec.js b/test/spec/modules/inskinBidAdapter_spec.js
index e817b3e3b81..3d0ec82fca5 100644
--- a/test/spec/modules/inskinBidAdapter_spec.js
+++ b/test/spec/modules/inskinBidAdapter_spec.js
@@ -12,7 +12,8 @@ const REQUEST = {
     'bidder': 'inskin',
     'params': {
       'networkId': 9874,
-      'siteId': 730181
+      'siteId': 730181,
+      'publisherId': 123456
     },
     'placementCode': 'div-gpt-ad-1487778092495-0',
     'sizes': [
@@ -250,7 +251,7 @@ describe('InSkin BidAdapter', function () {
       const payload = JSON.parse(request.data);
 
       expect(payload.keywords).to.be.an('array').that.is.empty;
-      expect(payload.placements[0].properties).to.be.undefined;
+      expect(payload.placements[0].properties.restrictions).to.be.undefined;
     });
 
     it('should add keywords if TCF v2 purposes are not granted', function () {
@@ -328,6 +329,7 @@ describe('InSkin BidAdapter', function () {
         expect(b).to.have.property('currency', 'USD');
         expect(b).to.have.property('creativeId');
         expect(b).to.have.property('ttl', 360);
+        expect(b.meta).to.have.property('advertiserDomains');
         expect(b).to.have.property('netRevenue', true);
       });
     });
@@ -373,4 +375,12 @@ describe('InSkin BidAdapter', function () {
       expect(opts.length).to.equal(3);
     });
   });
+  describe('supply chain id', function () {
+    it('should use publisherId as sid', function () {
+      const request = spec.buildRequests(REQUEST.bidRequest, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.rtb.schain.ext.sid).to.equal('123456');
+    });
+  });
 });
diff --git a/test/spec/modules/insticatorBidAdapter_spec.js b/test/spec/modules/insticatorBidAdapter_spec.js
new file mode 100644
index 00000000000..fc7ed1833ac
--- /dev/null
+++ b/test/spec/modules/insticatorBidAdapter_spec.js
@@ -0,0 +1,565 @@
+import { expect } from 'chai';
+import { spec, storage } from '../../../modules/insticatorBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const USER_ID_KEY = 'hb_insticator_uid';
+const USER_ID_DUMMY_VALUE = '74f78609-a92d-4cf1-869f-1b244bbfb5d2';
+const USER_ID_STUBBED = '12345678-1234-1234-1234-123456789abc';
+
+let utils = require('src/utils.js');
+
+describe('InsticatorBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  const bidderRequestId = '22edbae2733bf6';
+  let bidRequest = {
+    bidder: 'insticator',
+    adUnitCode: 'adunit-code',
+    params: {
+      adUnitId: '1a2b3c4d5e6f1a2b3c4d',
+      user: {
+        yob: 1984,
+        gender: 'M'
+      },
+    },
+    sizes: [[300, 250], [300, 600]],
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]],
+        pos: 4,
+      },
+      video: {
+        mimes: [
+          'video/mp4',
+          'video/mpeg',
+        ],
+        w: 250,
+        h: 300,
+        placement: 2,
+      },
+    },
+    bidId: '30b31c1838de1e',
+    ortb2Imp: {
+      instl: 1,
+      ext: {
+        gpid: '1111/homepage'
+      }
+    },
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'insticator.com',
+          sid: '00001',
+          hp: 1,
+          rid: bidderRequestId
+        }
+      ]
+    },
+    userIdAsEids: [
+      {
+        source: 'criteo.com',
+        uids: [
+          {
+            id: '123',
+            atype: 1
+          }
+        ]
+      }
+    ],
+  };
+
+  let bidderRequest = {
+    bidderRequestId,
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    timeout: 300,
+    gdprConsent: {
+      consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+      vendorData: {},
+      gdprApplies: true
+    },
+    refererInfo: {
+      numIframes: 0,
+      reachedTop: true,
+      page: 'https://example.com',
+      domain: 'example.com',
+      ref: 'https://referrer.com',
+      stack: ['https://example.com']
+    },
+  };
+
+  describe('.code', function () {
+    it('should return a bidder code of insticator', function () {
+      expect(spec.code).to.equal('insticator')
+    })
+  })
+
+  describe('inherited functions', function () {
+    it('should exist and be a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('should return true if the bid is valid', function () {
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true;
+    });
+
+    it('should return false if there is no adUnitId param', () => {
+      expect(spec.isBidRequestValid({ ...bidRequest, ...{ params: {} } })).to.be.false;
+    });
+
+    it('should return false if there is no mediaTypes', () => {
+      expect(spec.isBidRequestValid({ ...bidRequest, ...{ mediaTypes: {} } })).to.be.false;
+    });
+
+    it('should return false if there are no banner sizes and no sizes', () => {
+      bidRequest.mediaTypes.banner = {};
+      expect(spec.isBidRequestValid({ ...bidRequest, ...{ sizes: {} } })).to.be.false;
+    });
+
+    it('should return true if there is sizes and no banner sizes', () => {
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true;
+    });
+
+    it('should return true if there is banner sizes and no sizes', () => {
+      bidRequest.mediaTypes.banner.sizes = [[300, 250], [300, 600]];
+      expect(spec.isBidRequestValid({ ...bidRequest, ...{ sizes: {} } })).to.be.true;
+    });
+
+    it('should return true if there is video and video sizes', () => {
+      expect(spec.isBidRequestValid({
+        ...bidRequest,
+        ...{
+          mediaTypes: {
+            video: {
+              mimes: [
+                'video/mp4',
+                'video/mpeg',
+              ],
+              w: 250,
+              h: 300,
+            },
+          }
+        }
+      })).to.be.true;
+    });
+
+    it('should return false if there is no video sizes', () => {
+      expect(spec.isBidRequestValid({
+        ...bidRequest,
+        ...{
+          mediaTypes: {
+            video: {},
+          }
+        }
+      })).to.be.false;
+    });
+
+    it('should return false if video placement is not a number', () => {
+      expect(spec.isBidRequestValid({
+        ...bidRequest,
+        ...{
+          mediaTypes: {
+            video: {
+              mimes: [
+                'video/mp4',
+                'video/mpeg',
+              ],
+              w: 250,
+              h: 300,
+              placement: 'NaN',
+            },
+          }
+        }
+      })).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let getDataFromLocalStorageStub, localStorageIsEnabledStub;
+    let getCookieStub, cookiesAreEnabledStub;
+    let sandbox;
+
+    beforeEach(() => {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        insticator: {
+          storageAllowed: true
+        }
+      };
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+      getCookieStub = sinon.stub(storage, 'getCookie');
+      cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(utils, 'generateUUID').returns(USER_ID_STUBBED);
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+      getDataFromLocalStorageStub.restore();
+      localStorageIsEnabledStub.restore();
+      getCookieStub.restore();
+      cookiesAreEnabledStub.restore();
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+
+    const serverRequests = spec.buildRequests([bidRequest], bidderRequest);
+    it('should create a request', function () {
+      expect(serverRequests).to.have.length(1);
+    });
+
+    const serverRequest = serverRequests[0];
+    it('should create a request object with method, URL, options and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.options).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('should return POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('should return valid URL', function () {
+      expect(serverRequest.url).to.equal('https://ex.ingage.tech/v1/openrtb');
+    });
+
+    it('should return valid options', function () {
+      expect(serverRequest.options).to.be.an('object');
+      expect(serverRequest.options.contentType).to.equal('application/json');
+      expect(serverRequest.options.withCredentials).to.be.true;
+    });
+
+    it('should return valid data if array of bids is valid', function () {
+      localStorageIsEnabledStub.returns(true);
+      cookiesAreEnabledStub.returns(false);
+      localStorage.setItem(USER_ID_KEY, USER_ID_DUMMY_VALUE);
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('id', 'tmax', 'source', 'site', 'device', 'regs', 'user', 'imp', 'ext');
+      expect(data.id).to.equal(bidderRequest.bidderRequestId);
+      expect(data.tmax).to.equal(bidderRequest.timeout);
+      expect(data.source).to.have.all.keys('fd', 'tid', 'ext');
+      expect(data.source.fd).to.equal(1);
+      expect(data.source.tid).to.equal(bidderRequest.auctionId);
+      expect(data.source.ext).to.have.property('schain').to.deep.equal({
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'insticator.com',
+            sid: '00001',
+            hp: 1,
+            rid: bidderRequest.bidderRequestId
+          }
+        ]
+      });
+      expect(data.site).to.be.an('object');
+      expect(data.site.domain).not.to.be.empty;
+      expect(data.site.page).not.to.be.empty;
+      expect(data.site.ref).to.equal(bidderRequest.refererInfo.ref);
+      expect(data.device).to.be.an('object');
+      expect(data.device.w).to.equal(window.innerWidth);
+      expect(data.device.h).to.equal(window.innerHeight);
+      expect(data.device.js).to.equal(true);
+      expect(data.device.ext).to.be.an('object');
+      expect(data.device.ext.localStorage).to.equal(true);
+      expect(data.device.ext.cookies).to.equal(false);
+      expect(data.regs).to.be.an('object');
+      expect(data.regs.ext.gdpr).to.equal(1);
+      expect(data.regs.ext.gdprConsentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(data.user).to.be.an('object');
+      expect(data.user).to.have.property('yob');
+      expect(data.user.yob).to.equal(1984);
+      expect(data.user).to.have.property('gender');
+      expect(data.user.gender).to.equal('M');
+      expect(data.user.ext).to.have.property('eids');
+      expect(data.user.ext.eids).to.deep.equal([
+        {
+          source: 'criteo.com',
+          uids: [
+            {
+              id: '123',
+              atype: 1
+            }
+          ]
+        }
+      ]);
+      expect(data.imp).to.be.an('array').that.have.lengthOf(1);
+      expect(data.imp).to.deep.equal([{
+        id: bidRequest.bidId,
+        tagid: bidRequest.adUnitCode,
+        instl: 1,
+        secure: 0,
+        banner: {
+          format: [
+            { w: 300, h: 250 },
+            { w: 300, h: 600 }
+          ]
+        },
+        video: {
+          mimes: [
+            'video/mp4',
+            'video/mpeg',
+          ],
+          h: 300,
+          w: 250,
+          placement: 2,
+        },
+        ext: {
+          gpid: bidRequest.ortb2Imp.ext.gpid,
+          insticator: {
+            adUnitId: bidRequest.params.adUnitId,
+          },
+        }
+      }]);
+      expect(data.ext).to.be.an('object');
+      expect(data.ext.insticator).to.be.an('object')
+      expect(data.ext.insticator).to.deep.equal({
+        adapter: {
+          vendor: 'prebid',
+          prebid: '$prebid.version$'
+        }
+      });
+    });
+
+    it('should generate new userId if not valid user is stored', function () {
+      localStorageIsEnabledStub.returns(true);
+      localStorage.setItem(USER_ID_KEY, 'fake-user-id');
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+
+      expect(data.user.id).to.equal(USER_ID_STUBBED);
+    });
+    it('should return empty regs object if no gdprConsent is passed', function () {
+      const requests = spec.buildRequests([bidRequest], { ...bidderRequest, ...{ gdprConsent: false } });
+      const data = JSON.parse(requests[0].data);
+      expect(data.regs).to.be.an('object').that.is.empty;
+    });
+    it('should return empty array if no valid requests are passed', function () {
+      expect(spec.buildRequests([], bidderRequest)).to.be.an('array').that.have.lengthOf(0);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidRequests = {
+      method: 'POST',
+      url: 'https://ex.ingage.tech/v1/openrtb',
+      options: {
+        contentType: 'application/json',
+        withCredentials: true,
+      },
+      data: '',
+      bidderRequest: {
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+        timeout: 300,
+        bids: [
+          {
+            bidder: 'insticator',
+            params: {
+              adUnitId: '1a2b3c4d5e6f1a2b3c4d'
+            },
+            adUnitCode: 'adunit-code-1',
+            sizes: [[300, 250], [300, 600]],
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250], [300, 600]]
+              }
+            },
+            bidId: 'bid1',
+          },
+          {
+            bidder: 'insticator',
+            params: {
+              adUnitId: '1a2b3c4d5e6f1a2b3c4d'
+            },
+            adUnitCode: 'adunit-code-2',
+            sizes: [[120, 600], [300, 600], [160, 600]],
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250], [300, 600]]
+              }
+            },
+            bidId: 'bid2',
+          },
+          {
+            bidder: 'insticator',
+            params: {
+              adUnitId: '1a2b3c4d5e6f1a2b3c4d'
+            },
+            adUnitCode: 'adunit-code-3',
+            sizes: [[120, 600], [300, 600], [160, 600]],
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250], [300, 600]]
+              }
+            },
+            bidId: 'bid3',
+          }
+        ]
+      }
+    };
+
+    const bidResponse = {
+      body: {
+        id: '22edbae2733bf6',
+        bidid: 'foo9876',
+        cur: 'USD',
+        seatbid: [
+          {
+            seat: 'some-dsp',
+            bid: [
+              {
+                impid: 'bid1',
+                crid: 'crid1',
+                price: 0.5,
+                w: 300,
+                h: 200,
+                adm: 'adm1',
+                exp: 60,
+                adomain: ['test1.com'],
+                ext: {
+                  meta: {
+                    test: 1
+                  }
+                }
+              },
+              {
+                impid: 'bid2',
+                crid: 'crid2',
+                price: 1.5,
+                w: 600,
+                h: 200,
+                adm: 'adm2',
+                adomain: ['test2.com'],
+              },
+              {
+                impid: 'bid3',
+                crid: 'crid3',
+                price: 5.0,
+                w: 300,
+                h: 200,
+                adm: 'adm3',
+                adomain: ['test3.com'],
+              }
+            ],
+          },
+        ]
+      }
+    };
+
+    const prebidResponse = [
+      {
+        requestId: 'bid1',
+        creativeId: 'crid1',
+        cpm: 0.5,
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 60,
+        width: 300,
+        height: 200,
+        mediaType: 'banner',
+        ad: 'adm1',
+        adUnitCode: 'adunit-code-1',
+        meta: {
+          advertiserDomains: ['test1.com'],
+          test: 1
+        }
+      },
+      {
+        requestId: 'bid2',
+        creativeId: 'crid2',
+        cpm: 1.5,
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 300,
+        width: 600,
+        height: 200,
+        mediaType: 'banner',
+        meta: {
+          advertiserDomains: [
+            'test2.com'
+          ]
+        },
+        ad: 'adm2',
+        adUnitCode: 'adunit-code-2',
+      },
+      {
+        requestId: 'bid3',
+        creativeId: 'crid3',
+        cpm: 5.0,
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 300,
+        width: 300,
+        height: 200,
+        mediaType: 'banner',
+        meta: {
+          advertiserDomains: [
+            'test3.com'
+          ]
+        },
+        ad: 'adm3',
+        adUnitCode: 'adunit-code-3',
+      },
+    ];
+
+    it('should map bidResponse to prebidResponse', function () {
+      const response = spec.interpretResponse(bidResponse, bidRequests);
+      response.forEach((resp, i) => {
+        expect(resp).to.deep.equal(prebidResponse[i]);
+      });
+    });
+
+    it('should return empty response if bidderRequestId is invalid', function () {
+      const response = Object.assign({}, bidResponse);
+      response.body.id = 'fake-id';
+      expect(spec.interpretResponse(response, bidRequests)).to.have.length(0);
+    });
+
+    it('should return empty response if there is no seatbid array in response', function () {
+      const response = Object.assign({}, bidResponse);
+      delete response.body.seatbid;
+      expect(spec.interpretResponse(response, bidRequests)).to.have.length(0);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const bidResponse = [{
+      body: {
+        ext: {
+          sync: [{
+            code: 'so',
+            delay: 0
+          }]
+        }
+      }
+    }];
+
+    it('should return one user sync', function () {
+      expect(spec.getUserSyncs({}, bidResponse)).to.deep.equal([{
+        code: 'so',
+        delay: 0
+      }]);
+    })
+
+    it('should return an empty array when sync is enabled but there are no bidResponses', function () {
+      expect(spec.getUserSyncs({}, [])).to.have.length(0);
+    })
+
+    it('should return an empty array when sync is enabled but no sync ext returned', function () {
+      const response = Object.assign({}, bidResponse[0]);
+      delete response.body.ext.sync;
+      expect(spec.getUserSyncs({}, [response])).to.have.length(0);
+    })
+  });
+});
diff --git a/test/spec/modules/instreamTracking_spec.js b/test/spec/modules/instreamTracking_spec.js
new file mode 100644
index 00000000000..8c49da76ab6
--- /dev/null
+++ b/test/spec/modules/instreamTracking_spec.js
@@ -0,0 +1,221 @@
+import { assert } from 'chai';
+import { trackInstreamDeliveredImpressions } from 'modules/instreamTracking.js';
+import { config } from 'src/config.js';
+import * as events from 'src/events.js';
+import * as utils from 'src/utils.js';
+import * as sinon from 'sinon';
+import { INSTREAM, OUTSTREAM } from 'src/video.js';
+
+const BIDDER_CODE = 'sampleBidder';
+const VIDEO_CACHE_KEY = '4cf395af-8fee-4960-af0e-88d44e399f14';
+
+let sandbox;
+
+function enableInstreamTracking(regex) {
+  let configStub = sandbox.stub(config, 'getConfig');
+  configStub.withArgs('instreamTracking').returns(Object.assign(
+    {
+      enabled: true,
+      maxWindow: 10,
+      pollingFreq: 0
+    },
+    regex && {urlPattern: regex},
+  ));
+}
+
+function mockPerformanceApi({adServerCallSent, videoPresent}) {
+  let performanceStub = sandbox.stub(window.performance, 'getEntriesByType');
+  let entries = [{
+    name: 'https://domain.com/img.png',
+    initiatorType: 'img'
+  }, {
+    name: 'https://domain.com/script.js',
+    initiatorType: 'script'
+  }, {
+    name: 'https://domain.com/xhr',
+    initiatorType: 'xmlhttprequest'
+  }, {
+    name: 'https://domain.com/fetch',
+    initiatorType: 'fetch'
+  }];
+
+  if (adServerCallSent || videoPresent) {
+    entries.push({
+      name: 'https://adserver.com/ads?custom_params=hb_uuid%3D' + VIDEO_CACHE_KEY + '%26pos%3D' + VIDEO_CACHE_KEY,
+      initiatorType: 'xmlhttprequest'
+    });
+  }
+
+  if (videoPresent) {
+    entries.push({
+      name: 'https://prebid-vast-cache.com/cache?key=' + VIDEO_CACHE_KEY,
+      initiatorType: 'xmlhttprequest'
+    });
+  }
+
+  performanceStub.withArgs('resource').returns(entries);
+}
+
+function mockBidResponse(adUnit, requestId) {
+  const bid = {
+    'adUnitCod': adUnit.code,
+    'bidderCode': adUnit.bids[0].bidder,
+    'width': adUnit.sizes[0][0],
+    'height': adUnit.sizes[0][1],
+    'statusMessage': 'Bid available',
+    'adId': 'id',
+    'requestId': requestId,
+    'source': 'client',
+    'no_bid': false,
+    'cpm': '1.1495',
+    'ttl': 180,
+    'creativeId': 'id',
+    'netRevenue': true,
+    'currency': 'USD',
+  }
+  if (adUnit.mediaTypes.video) {
+    bid.videoCacheKey = VIDEO_CACHE_KEY;
+  }
+  return bid
+}
+
+function mockBidRequest(adUnit, bidResponse) {
+  return {
+    'bidderCode': bidResponse.bidderCode,
+    'auctionId': '20882439e3238c',
+    'bidderRequestId': 'bidderRequestId',
+    'bids': [
+      {
+        'adUnitCode': adUnit.code,
+        'mediaTypes': adUnit.mediaTypes,
+        'bidder': bidResponse.bidderCode,
+        'bidId': bidResponse.requestId,
+        'sizes': adUnit.sizes,
+        'params': adUnit.bids[0].params,
+        'bidderRequestId': 'bidderRequestId',
+        'auctionId': '20882439e3238c',
+      }
+    ],
+    'auctionStart': 1505250713622,
+    'timeout': 3000
+  };
+}
+
+function getMockInput(mediaType) {
+  const bannerAdUnit = {
+    code: 'banner',
+    mediaTypes: {banner: {sizes: [[300, 250]]}},
+    sizes: [[300, 250]],
+    bids: [{bidder: BIDDER_CODE, params: {placementId: 'id'}}]
+  };
+  const outStreamAdUnit = {
+    code: 'video-' + OUTSTREAM,
+    mediaTypes: {video: {playerSize: [640, 480], context: OUTSTREAM}},
+    sizes: [[640, 480]],
+    bids: [{bidder: BIDDER_CODE, params: {placementId: 'id'}}]
+  };
+  const inStreamAdUnit = {
+    code: 'video-' + INSTREAM,
+    mediaTypes: {video: {playerSize: [640, 480], context: INSTREAM}},
+    sizes: [[640, 480]],
+    bids: [{bidder: BIDDER_CODE, params: {placementId: 'id'}}]
+  };
+
+  let adUnit;
+  switch (mediaType) {
+    default:
+    case 'banner':
+      adUnit = bannerAdUnit;
+      break;
+    case OUTSTREAM:
+      adUnit = outStreamAdUnit;
+      break;
+    case INSTREAM:
+      adUnit = inStreamAdUnit;
+      break;
+  }
+
+  const bidResponse = mockBidResponse(adUnit, utils.getUniqueIdentifierStr());
+  const bidderRequest = mockBidRequest(adUnit, bidResponse);
+  return {
+    adUnits: [adUnit],
+    bidsReceived: [bidResponse],
+    bidderRequests: [bidderRequest],
+  };
+}
+
+describe('Instream Tracking', function () {
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
+
+  describe('gaurd checks', function () {
+    it('skip if tracking not enable', function () {
+      sandbox.stub(config, 'getConfig').withArgs('instreamTracking').returns(undefined);
+      assert.isNotOk(trackInstreamDeliveredImpressions({
+        adUnits: [],
+        bidsReceived: [],
+        bidderRequests: []
+      }), 'should not start tracking when tracking is disabled');
+    });
+
+    it('run only if instream bids are present', function () {
+      enableInstreamTracking();
+      assert.isNotOk(trackInstreamDeliveredImpressions({adUnits: [], bidsReceived: [], bidderRequests: []}));
+    });
+
+    it('checks for instream bids', function (done) {
+      enableInstreamTracking();
+      assert.isNotOk(trackInstreamDeliveredImpressions(getMockInput('banner')), 'should not start tracking when banner bids are present')
+      assert.isNotOk(trackInstreamDeliveredImpressions(getMockInput(OUTSTREAM)), 'should not start tracking when outstream bids are present')
+      mockPerformanceApi({});
+      assert.isOk(trackInstreamDeliveredImpressions(getMockInput(INSTREAM)), 'should start tracking when instream bids are present')
+      setTimeout(done, 10);
+    });
+  });
+
+  describe('instream bids check', function () {
+    let spyEventsOn;
+
+    beforeEach(function () {
+      spyEventsOn = sandbox.spy(events, 'emit');
+    });
+
+    it('BID WON event is not emitted when no video cache key entries are present', function (done) {
+      enableInstreamTracking();
+      trackInstreamDeliveredImpressions(getMockInput(INSTREAM));
+      mockPerformanceApi({});
+      setTimeout(function () {
+        assert.isNotOk(spyEventsOn.calledWith('bidWon'))
+        done()
+      }, 10);
+    });
+
+    it('BID WON event is not emitted when ad server call is sent', function (done) {
+      enableInstreamTracking();
+      mockPerformanceApi({adServerCallSent: true});
+      setTimeout(function () {
+        assert.isNotOk(spyEventsOn.calledWith('bidWon'))
+        done()
+      }, 10);
+    });
+
+    it('BID WON event is emitted when video cache key is present', function (done) {
+      enableInstreamTracking(/cache/);
+      const bidWonSpy = sandbox.spy();
+      events.on('bidWon', bidWonSpy);
+      mockPerformanceApi({adServerCallSent: true, videoPresent: true});
+
+      trackInstreamDeliveredImpressions(getMockInput(INSTREAM));
+      setTimeout(function () {
+        assert.isOk(spyEventsOn.calledWith('bidWon'))
+        assert(bidWonSpy.args[0][0].videoCacheKey, VIDEO_CACHE_KEY, 'Video cache key in bid won should be equal to video cache call');
+        done()
+      }, 10);
+    });
+  });
+});
diff --git a/test/spec/modules/integr8BidAdapter_spec.js b/test/spec/modules/integr8BidAdapter_spec.js
new file mode 100644
index 00000000000..8c5a4b47903
--- /dev/null
+++ b/test/spec/modules/integr8BidAdapter_spec.js
@@ -0,0 +1,226 @@
+import { expect } from 'chai';
+import { spec, getBidFloor } from 'modules/integr8BidAdapter';
+
+describe('integr8AdapterTest', () => {
+  describe('bidRequestValidity', () => {
+    it('bidRequest with propertyId and placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'integr8',
+        params: {
+          propertyId: '{propertyId}',
+          placementId: '{placementId}'
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest without propertyId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'integr8',
+        params: {
+          placementId: '{placementId}'
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'integr8',
+        params: {
+          propertyId: '{propertyId}',
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without propertyId or placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'integr8',
+        params: {}
+      })).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', () => {
+    const bidRequests = [{
+      'bidder': 'integr8',
+      'params': {
+        'propertyId': '{propertyId}',
+        'placementId': '{placementId}',
+        'data': {
+          'catalogs': [{
+            'catalogId': '699229',
+            'items': ['1', '2', '3']
+          }],
+          'inventory': {
+            'category': ['category1', 'category2'],
+            'query': ['query']
+          }
+        }
+      },
+      'adUnitCode': 'hb-leaderboard',
+      'transactionId': 'b6b889bb-776c-48fd-bc7b-d11a1cf0425e',
+      'sizes': [[728, 90]],
+      'bidId': '10bdc36fe0b48c8',
+      'bidderRequestId': '70deaff71c281d',
+      'auctionId': 'f9012acc-b6b7-4748-9098-97252914f9dc'
+    }];
+
+    it('bidRequest HTTP method', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+
+    it('bidRequest url', () => {
+      const endpointUrl = 'https://integr8.central.gjirafa.tech/bid';
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.url).to.match(new RegExp(`${endpointUrl}`));
+      });
+    });
+
+    it('bidRequest data', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data).to.exist;
+      });
+    });
+
+    it('bidRequest sizes', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data.placements).to.exist;
+        expect(requestItem.data.placements.length).to.equal(1);
+        expect(requestItem.data.placements[0].sizes).to.equal('728x90');
+      });
+    });
+
+    it('bidRequest data param', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach((requestItem) => {
+        expect(requestItem.data.data).to.exist;
+        expect(requestItem.data.data.catalogs).to.exist;
+        expect(requestItem.data.data.inventory).to.exist;
+        expect(requestItem.data.data.catalogs.length).to.equal(1);
+        expect(requestItem.data.data.catalogs[0].items.length).to.equal(3);
+        expect(Object.keys(requestItem.data.data.inventory).length).to.equal(2);
+        expect(requestItem.data.data.inventory.category.length).to.equal(2);
+        expect(requestItem.data.data.inventory.query.length).to.equal(1);
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    const bidRequest = {
+      'method': 'POST',
+      'url': 'https://integr8.central.gjirafa.tech/bid',
+      'data': {
+        'sizes': '728x90',
+        'adUnitId': 'hb-leaderboard',
+        'placementId': '{placementId}',
+        'propertyId': '{propertyId}',
+        'pageViewGuid': '{pageViewGuid}',
+        'url': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'requestid': '26ee8fe87940da7',
+        'bidid': '2962dbedc4768bf'
+      }
+    };
+
+    const bidResponse = {
+      body: [{
+        'CPM': 1,
+        'Width': 728,
+        'Height': 90,
+        'Referrer': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'Ad': '<div>Test ad</div>',
+        'CreativeId': '123abc',
+        'NetRevenue': false,
+        'Currency': 'EUR',
+        'TTL': 360,
+        'ADomain': ['somedomain.com']
+      }],
+      headers: {}
+    };
+
+    it('all keys present', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      let keys = [
+        'requestId',
+        'cpm',
+        'width',
+        'height',
+        'creativeId',
+        'currency',
+        'netRevenue',
+        'ttl',
+        'referrer',
+        'ad',
+        'vastUrl',
+        'mediaType',
+        'meta'
+      ];
+
+      let resultKeys = Object.keys(result[0]);
+      resultKeys.forEach(function (key) {
+        expect(keys.indexOf(key) !== -1).to.equal(true);
+      });
+    })
+
+    it('all values correct', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(728);
+      expect(result[0].height).to.equal(90);
+      expect(result[0].creativeId).to.equal('123abc');
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(360);
+      expect(result[0].referrer).to.equal('http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true');
+      expect(result[0].ad).to.equal('<div>Test ad</div>');
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['somedomain.com']);
+    })
+  });
+
+  describe('floor pricing', () => {
+    it('should return null when getFloor is not a function', () => {
+      const bid = { getFloor: 2 };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when getFloor doesnt return an object', () => {
+      const bid = { getFloor: () => 2 };
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when floor is not a number', () => {
+      const bid = {
+        getFloor: () => ({ floor: 'string', currency: 'EUR' })
+      };
+
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return null when currency is not EUR', () => {
+      const bid = {
+        getFloor: () => ({ floor: 5, currency: 'USD' })
+      };
+
+      const result = getBidFloor(bid);
+      expect(result).to.be.null;
+    });
+
+    it('should return floor value when everything is correct', () => {
+      const bid = {
+        getFloor: () => ({ floor: 5, currency: 'EUR' })
+      };
+
+      const result = getBidFloor(bid);
+      expect(result).to.equal(5);
+    });
+  });
+});
diff --git a/test/spec/modules/intentIqIdSystem_spec.js b/test/spec/modules/intentIqIdSystem_spec.js
new file mode 100644
index 00000000000..f9bfa577e3a
--- /dev/null
+++ b/test/spec/modules/intentIqIdSystem_spec.js
@@ -0,0 +1,231 @@
+import { expect } from 'chai';
+import { intentIqIdSubmodule, readData, FIRST_PARTY_KEY } from 'modules/intentIqIdSystem.js';
+import * as utils from 'src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+
+const partner = 10;
+const pai = '11';
+const pcid = '12';
+const defaultConfigParams = { params: { partner: partner } };
+const paiConfigParams = { params: { partner: partner, pai: pai } };
+const pcidConfigParams = { params: { partner: partner, pcid: pcid } };
+const allConfigParams = { params: { partner: partner, pai: pai, pcid: pcid } };
+const responseHeader = { 'Content-Type': 'application/json' }
+
+describe('IntentIQ tests', function () {
+  let logErrorStub;
+  let testLSValue = {
+    'date': 1651945280759,
+    'cttl': 2000,
+    'rrtt': 123
+  }
+  let testLSValueWithData = {
+    'date': 1651945280759,
+    'cttl': 9999999999999,
+    'rrtt': 123,
+    'data': 'previousTestData'
+  }
+  let testResponseWithValues = {
+    'abPercentage': 90,
+    'adt': 1,
+    'ct': 2,
+    'data': 'testdata',
+    'dbsaved': 'false',
+    'ls': true,
+    'mde': true,
+    'tc': 4
+  }
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+  });
+
+  it('should log an error if no configParams were passed when getId', function () {
+    let submodule = intentIqIdSubmodule.getId({ params: {} });
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(submodule).to.be.undefined;
+  });
+
+  it('should log an error if partner configParam was not passed when getId', function () {
+    let submodule = intentIqIdSubmodule.getId({ params: {} });
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(submodule).to.be.undefined;
+  });
+
+  it('should log an error if partner configParam was not a numeric value', function () {
+    let submodule = intentIqIdSubmodule.getId({ params: { partner: '10' } });
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(submodule).to.be.undefined;
+  });
+
+  it('should call the IntentIQ endpoint with only partner', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should ignore INVALID_ID and invalid responses in decode', function () {
+    // let resp = JSON.stringify({'RESULT': 'NA'});
+    // expect(intentIqIdSubmodule.decode(resp)).to.equal(undefined);
+    expect(intentIqIdSubmodule.decode('INVALID_ID')).to.equal(undefined);
+    expect(intentIqIdSubmodule.decode('')).to.equal(undefined);
+    expect(intentIqIdSubmodule.decode(undefined)).to.equal(undefined);
+  });
+
+  it('should call the IntentIQ endpoint with only partner, pai', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(paiConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pai=11&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the IntentIQ endpoint with only partner, pcid', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(pcidConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pcid=12&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the IntentIQ endpoint with partner, pcid, pai', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pcid=12&pai=11&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should not throw Uncaught TypeError when IntentIQ endpoint returns empty response', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&iiqidtype=2&iiqpcid=');
+    request.respond(
+      204,
+      responseHeader,
+      ''
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(request.response).to.equal('');
+  });
+
+  it('should log an error and continue to callback if ajax request errors', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&iiqidtype=2&iiqpcid=');
+    request.respond(
+      503,
+      responseHeader,
+      'Unavailable'
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('save result if ls=true', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pcid=12&pai=11&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({ pid: 'test_pid', data: 'test_personid', ls: true })
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.eq('test_personid');
+  });
+
+  it('dont save result if ls=false', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pcid=12&pai=11&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({ pid: 'test_pid', data: 'test_personid', ls: false })
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.undefined;
+  });
+
+  it('save result as INVALID_ID on empty data and ls=true ', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pcid=12&pai=11&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({ pid: 'test_pid', data: '', ls: true })
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.eq('INVALID_ID');
+  });
+
+  it('send addition parameters if were found in localstorage', function () {
+    localStorage.setItem('_iiq_fdata_' + partner, JSON.stringify(testLSValue))
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+
+    expect(request.url).to.contain('https://api.intentiq.com/profiles_engine/ProfilesEngineServlet?at=39&mi=10&dpi=10&pt=17&dpn=1&pcid=12&pai=11&iiqidtype=2&iiqpcid=');
+    expect(request.url).to.contain('cttl=' + testLSValue.cttl);
+    expect(request.url).to.contain('rrtt=' + testLSValue.rrtt);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify(testResponseWithValues)
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.eq(testResponseWithValues.data);
+  });
+
+  it('return data stored in local storage ', function () {
+    localStorage.setItem('_iiq_fdata_' + partner, JSON.stringify(testLSValueWithData))
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(allConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    expect(server.requests.length).to.be.equal(0);
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.equal(testLSValueWithData.data);
+  });
+});
diff --git a/test/spec/modules/interactiveOffersBidAdapter_spec.js b/test/spec/modules/interactiveOffersBidAdapter_spec.js
new file mode 100644
index 00000000000..ff9ca123def
--- /dev/null
+++ b/test/spec/modules/interactiveOffersBidAdapter_spec.js
@@ -0,0 +1,43 @@
+import { expect } from 'chai';
+import {spec} from 'modules/interactiveOffersBidAdapter.js';
+
+describe('Interactive Offers Prebbid.js Adapter', function() {
+  describe('isBidRequestValid function', function() {
+    let bid = {bidder: 'interactiveOffers', params: {partnerId: '100', tmax: 300}, mediaTypes: {banner: {sizes: [[300, 250]]}}, adUnitCode: 'pageAd01', transactionId: '16526f30-3be2-43f6-ab37-f1ab1f2ac25d', sizes: [[300, 250]], bidId: '227faa83f86546', bidderRequestId: '1eb79bc9dd44a', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0};
+
+    it('returns true if all the required params are present and properly formatted', function() {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('returns false if any if the required params is missing', function() {
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('returns false if any if the required params is not properly formatted', function() {
+      bid.params = {partnerid: '100', tmax: 250};
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      bid.params = {partnerId: '100', tmax: '+250'};
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+  describe('buildRequests function', function() {
+    let validBidRequests = [{bidder: 'interactiveOffers', params: {partnerId: '100', tmax: 300}, mediaTypes: {banner: {sizes: [[300, 250]]}}, adUnitCode: 'pageAd01', transactionId: '16526f30-3be2-43f6-ab37-f1ab1f2ac25d', sizes: [[300, 250]], bidId: '227faa83f86546', bidderRequestId: '1eb79bc9dd44a', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0}];
+    let bidderRequest = {bidderCode: 'interactiveOffers', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', bidderRequestId: '1eb79bc9dd44a', bids: [{bidder: 'interactiveOffers', params: {partnerId: '100', tmax: 300}, mediaTypes: {banner: {sizes: [[300, 250]]}}, adUnitCode: 'pageAd01', transactionId: '16526f30-3be2-43f6-ab37-f1ab1f2ac25d', sizes: [[300, 250]], bidId: '227faa83f86546', bidderRequestId: '1eb79bc9dd44a', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0}], timeout: 5000, refererInfo: {referer: 'http://www.google.com', reachedTop: true, isAmp: false, numIframes: 0, stack: ['http://www.google.com'], canonicalUrl: null}};
+
+    it('returns a Prebid.js request object with a valid json string at the "data" property', function() {
+      let request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).length !== 0;
+    });
+  });
+  describe('interpretResponse function', function() {
+    let openRTBResponse = {body: [{cur: 'USD', id: '2052afa35febb79baa9893cc3ae8b83b89740df65fe98b1bd358dbae6e912801', seatbid: [{seat: 1493, bid: [{ext: {tagid: '227faa83f86546'}, crid: '24477', adm: '<a href="http://url.com" border="0"></a><img src="http://url.com" border="0" width="1" height="1"><img src="http://url.com/linkTrack/" border="0" width="1" height="1">', nurl: '', adid: '1138', adomain: ['url.com'], price: '1.53', w: 300, h: 250, iurl: 'http://url.com', cat: ['IAB13-11'], id: '5507ced7a39c06942d3cb260197112ba712e4180', attr: [], impid: 1, cid: '13280'}]}], 'bidid': '0959b9d58ba71b3db3fa29dce3b117c01fc85de0'}], 'headers': {}};
+    let prebidRequest = {method: 'POST', url: 'https://url.com', data: '{"id": "1aad860c-e04b-482b-acac-0da55ed491c8", "site": {"id": "url.com", "name": "url.com", "domain": "url.com", "page": "http://url.com", "ref": "http://url.com", "publisher": {"id": 100, "name": "http://url.com", "domain": "url.com"}, "content": {"language": "pt-PT"}}, "source": {"fd": 0, "tid": "1aad860c-e04b-482b-acac-0da55ed491c8", "pchain": ""}, "device": {"ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.192 Safari/537.36", "language": "pt-PT"}, "user": {}, "imp": [{"id":1, "secure": 0, "tagid": "227faa83f86546", "banner": {"pos": 0, "w": 300, "h": 250, "format": [{"w": 300, "h": 250}]}}], "tmax": 300}', bidderRequest: {bidderCode: 'interactiveOffers', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', bidderRequestId: '1eb79bc9dd44a', bids: [{bidder: 'interactiveOffers', params: {partnerId: '100', tmax: 300}, mediaTypes: {banner: {sizes: [[300, 250]]}}, adUnitCode: 'pageAd01', transactionId: '16526f30-3be2-43f6-ab37-f1ab1f2ac25d', sizes: [[300, 250]], bidId: '227faa83f86546', bidderRequestId: '1eb79bc9dd44a', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0}], timeout: 5000, refererInfo: {referer: 'http://url.com', reachedTop: true, isAmp: false, numIframes: 0, stack: ['http://url.com'], canonicalUrl: null}}};
+
+    it('returns an array of Prebid.js response objects', function() {
+      let prebidResponses = spec.interpretResponse(openRTBResponse, prebidRequest);
+      expect(prebidResponses).to.not.be.empty;
+      expect(prebidResponses[0].meta.advertiserDomains[0]).to.equal('url.com');
+    });
+  });
+});
diff --git a/test/spec/modules/intersectionRtdProvider_spec.js b/test/spec/modules/intersectionRtdProvider_spec.js
new file mode 100644
index 00000000000..0621c4f67e0
--- /dev/null
+++ b/test/spec/modules/intersectionRtdProvider_spec.js
@@ -0,0 +1,141 @@
+import {config as _config, config} from 'src/config.js';
+import { expect } from 'chai';
+import * as events from 'src/events.js';
+import * as prebidGlobal from 'src/prebidGlobal.js';
+import { intersectionSubmodule } from 'modules/intersectionRtdProvider.js';
+import * as utils from 'src/utils.js';
+import {getGlobal} from 'src/prebidGlobal.js';
+import 'src/prebid.js';
+
+describe('Intersection RTD Provider', function () {
+  let sandbox;
+  let placeholder;
+  const pbjs = getGlobal();
+  const adUnit = {
+    code: 'ad-slot-1',
+    mediaTypes: {
+      banner: {
+        sizes: [ [300, 250] ]
+      }
+    },
+    bids: [
+      {
+        bidder: 'fake'
+      }
+    ]
+  };
+  const providerConfig = {name: 'intersection', waitForIt: true};
+  const rtdConfig = {realTimeData: {auctionDelay: 200, dataProviders: [providerConfig]}}
+  describe('IntersectionObserver not supported', function() {
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+    });
+    afterEach(function() {
+      sandbox.restore();
+      sandbox = undefined;
+    });
+    it('init should return false', function () {
+      sandbox.stub(window, 'IntersectionObserver').value(undefined);
+      expect(intersectionSubmodule.init({})).is.false;
+    });
+  });
+  describe('IntersectionObserver supported', function() {
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      placeholder = createDiv();
+      append();
+      const __config = {};
+      sandbox.stub(_config, 'getConfig').callsFake(function (path) {
+        return utils.deepAccess(__config, path);
+      });
+      sandbox.stub(_config, 'setConfig').callsFake(function (obj) {
+        utils.mergeDeep(__config, obj);
+      });
+    });
+    afterEach(function() {
+      sandbox.restore();
+      remove();
+      sandbox = undefined;
+      placeholder = undefined;
+      pbjs.removeAdUnit();
+    });
+    it('init should return true', function () {
+      expect(intersectionSubmodule.init({})).is.true;
+    });
+    it('should set intersection. (request with "adUnitCodes")', function(done) {
+      pbjs.addAdUnits([utils.deepClone(adUnit)]);
+      config.setConfig(rtdConfig);
+      const onDone = sandbox.stub();
+      const requestBidObject = {adUnitCodes: [adUnit.code]};
+      intersectionSubmodule.init({});
+      intersectionSubmodule.getBidRequestData(
+        requestBidObject,
+        onDone,
+        providerConfig
+      );
+      setTimeout(function() {
+        expect(pbjs.adUnits[0].bids[0]).to.have.property('intersection');
+        done();
+      }, 200);
+    });
+    it('should set intersection. (request with "adUnits")', function(done) {
+      config.setConfig(rtdConfig);
+      const onDone = sandbox.stub();
+      const requestBidObject = {adUnits: [utils.deepClone(adUnit)]};
+      intersectionSubmodule.init();
+      intersectionSubmodule.getBidRequestData(
+        requestBidObject,
+        onDone,
+        providerConfig
+      );
+      setTimeout(function() {
+        expect(requestBidObject.adUnits[0].bids[0]).to.have.property('intersection');
+        done();
+      }, 200);
+    });
+    it('should set intersection. (request all)', function(done) {
+      pbjs.addAdUnits([utils.deepClone(adUnit)]);
+      config.setConfig(rtdConfig);
+      const onDone = sandbox.stub();
+      const requestBidObject = {};
+      intersectionSubmodule.init({});
+      intersectionSubmodule.getBidRequestData(
+        requestBidObject,
+        onDone,
+        providerConfig
+      );
+      setTimeout(function() {
+        expect(pbjs.adUnits[0].bids[0]).to.have.property('intersection');
+        done();
+      }, 200);
+    });
+    it('should call done due timeout', function(done) {
+      config.setConfig(rtdConfig);
+      remove();
+      const onDone = sandbox.stub();
+      const requestBidObject = {adUnits: [utils.deepClone(adUnit)]};
+      intersectionSubmodule.init({});
+      intersectionSubmodule.getBidRequestData(
+        requestBidObject,
+        onDone,
+        {...providerConfig, test: 1}
+      );
+      setTimeout(function() {
+        sinon.assert.calledOnce(onDone);
+        expect(requestBidObject.adUnits[0].bids[0]).to.not.have.property('intersection');
+        done();
+      }, 300);
+    });
+  });
+  function createDiv() {
+    const div = document.createElement('div');
+    div.id = adUnit.code;
+    return div;
+  }
+  function append() {
+    placeholder && document.body.appendChild(placeholder);
+  }
+  function remove() {
+    placeholder && placeholder.parentElement && placeholder.parentElement.removeChild(placeholder);
+  }
+});
diff --git a/test/spec/modules/invamiaBidAdapter_spec.js b/test/spec/modules/invamiaBidAdapter_spec.js
new file mode 100644
index 00000000000..2f8f0612e44
--- /dev/null
+++ b/test/spec/modules/invamiaBidAdapter_spec.js
@@ -0,0 +1,172 @@
+import {expect} from 'chai';
+import {spec} from 'modules/invamiaBidAdapter.js';
+
+describe('invamia bid adapter tests', function () {
+  describe('bid requests', function () {
+    it('should accept valid bid', function () {
+      const validBid = {
+        bidder: 'invamia',
+        params: {zoneId: 123},
+      };
+
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should reject invalid bid', function () {
+      const invalidBid = {
+        bidder: 'invamia',
+        params: {},
+      };
+
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+
+    it('should correctly build payload string', function () {
+      const bidRequests = [{
+        bidder: 'invamia',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }];
+      const payload = spec.buildRequests(bidRequests)[0].data;
+
+      expect(payload).to.contain('ctype=div');
+      expect(payload).to.contain('pzoneid=123');
+      expect(payload).to.contain('width=300');
+      expect(payload).to.contain('height=250');
+    });
+
+    it('should support multiple bids', function () {
+      const bidRequests = [{
+        bidder: 'invamia',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }, {
+        bidder: 'invamia',
+        params: {zoneId: 321},
+        mediaTypes: {
+          banner: {
+            sizes: [[728, 90]],
+          },
+        },
+        bidId: '23acc48ad47af52',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba992',
+        bidderRequestId: '1c56ad30b9b8ca82',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea9347292',
+      }];
+      const payload = spec.buildRequests(bidRequests);
+
+      expect(payload).to.be.lengthOf(2);
+    });
+
+    it('should support multiple sizes', function () {
+      const bidRequests = [{
+        bidder: 'invamia',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }];
+      const payload = spec.buildRequests(bidRequests);
+
+      expect(payload).to.be.lengthOf(2);
+    });
+  });
+
+  describe('bid responses', function () {
+    it('should return complete bid response', function () {
+      const serverResponse = {
+        body: {
+          banner: {
+            hash: '1c56ad30b9b8ca8',
+          },
+          hb: {
+            cpm: 0.5,
+            netRevenue: false,
+            adomains: ['securepubads.g.doubleclick.net'],
+          },
+          template: {
+            html: '<ad></ad>',
+          },
+        },
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(1);
+      expect(bids[0].requestId).to.equal('23acc48ad47af5');
+      expect(bids[0].creativeId).to.equal('1c56ad30b9b8ca8');
+      expect(bids[0].width).to.equal(300);
+      expect(bids[0].height).to.equal(250);
+      expect(bids[0].ttl).to.equal(600);
+      expect(bids[0].cpm).to.equal(0.5);
+      expect(bids[0].netRevenue).to.equal(false);
+      expect(bids[0].currency).to.equal('USD');
+      expect(bids[0].meta.advertiserDomains).to.be.lengthOf(1);
+      expect(bids[0].meta.advertiserDomains[0]).to.equal('securepubads.g.doubleclick.net');
+    });
+
+    it('should return empty bid response', function () {
+      const serverResponse = {
+        body: {},
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(0);
+    });
+
+    it('should return empty bid response 2', function () {
+      const serverResponse = {
+        body: {
+          template: {
+            html: '',
+          }
+        },
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(0);
+    });
+  });
+});
diff --git a/test/spec/modules/invibesBidAdapter_spec.js b/test/spec/modules/invibesBidAdapter_spec.js
index b75c6a4578f..2b98a9f8960 100644
--- a/test/spec/modules/invibesBidAdapter_spec.js
+++ b/test/spec/modules/invibesBidAdapter_spec.js
@@ -1,4 +1,5 @@
 import {expect} from 'chai';
+import { config } from 'src/config.js';
 import {spec, resetInvibes, stubDomainOptions, readGdprConsent} from 'modules/invibesBidAdapter.js';
 
 describe('invibesBidAdapter:', function () {
@@ -13,9 +14,11 @@ describe('invibesBidAdapter:', function () {
       bidder: BIDDER_CODE,
       bidderRequestId: 'r1',
       params: {
-        placementId: PLACEMENT_ID
+        placementId: PLACEMENT_ID,
+        disableUserSyncs: false
+
       },
-      adUnitCode: 'test-div',
+      adUnitCode: 'test-div1',
       auctionId: 'a1',
       sizes: [
         [300, 250],
@@ -23,6 +26,44 @@ describe('invibesBidAdapter:', function () {
         [125, 125]
       ],
       transactionId: 't1'
+    }, {
+      bidId: 'b2',
+      bidder: BIDDER_CODE,
+      bidderRequestId: 'r2',
+      params: {
+        placementId: 'abcde',
+        disableUserSyncs: false
+      },
+      adUnitCode: 'test-div2',
+      auctionId: 'a2',
+      sizes: [
+        [300, 250],
+        [400, 300]
+      ],
+      transactionId: 't2'
+    }
+  ];
+
+  let bidRequestsWithUserId = [
+    {
+      bidId: 'b1',
+      bidder: BIDDER_CODE,
+      bidderRequestId: 'r1',
+      params: {
+        placementId: PLACEMENT_ID
+      },
+      adUnitCode: 'test-div1',
+      auctionId: 'a1',
+      sizes: [
+        [300, 250],
+        [400, 300],
+        [125, 125]
+      ],
+      transactionId: 't1',
+      userId: {
+        pubcid: 'pub-cid-code',
+        pubProvidedId: 'pub-provided-id'
+      }
     }, {
       bidId: 'b2',
       bidder: BIDDER_CODE,
@@ -30,7 +71,7 @@ describe('invibesBidAdapter:', function () {
       params: {
         placementId: 'abcde'
       },
-      adUnitCode: 'test-div',
+      adUnitCode: 'test-div2',
       auctionId: 'a2',
       sizes: [
         [300, 250],
@@ -56,13 +97,30 @@ describe('invibesBidAdapter:', function () {
     }
   };
 
+  let SetBidderAccess = function() {
+    config.setConfig({
+      deviceAccess: true
+    });
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      invibes: {
+        storageAllowed: true
+      }
+    };
+  }
+
   beforeEach(function () {
     resetInvibes();
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      invibes: {
+        storageAllowed: true
+      }
+    };
     document.cookie = '';
     this.cStub1 = sinon.stub(console, 'info');
   });
 
   afterEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {};
     this.cStub1.restore();
   });
 
@@ -100,7 +158,7 @@ describe('invibesBidAdapter:', function () {
         expect(spec.isBidRequestValid(invalidBid)).to.be.false;
       });
 
-      it('returns false when bid response was previously received', function () {
+      it('returns true when bid response was previously received', function () {
         const validBid = {
           bidder: BIDDER_CODE,
           params: {
@@ -109,18 +167,147 @@ describe('invibesBidAdapter:', function () {
         }
 
         top.window.invibes.bidResponse = {prop: 'prop'};
-        expect(spec.isBidRequestValid(validBid)).to.be.false;
+        expect(spec.isBidRequestValid(validBid)).to.be.true;
       });
     });
   });
 
   describe('buildRequests', function () {
+    it('sends preventPageViewEvent as false on first call', function () {
+      let request = spec.buildRequests(bidRequests);
+      expect(request.data.preventPageViewEvent).to.be.false;
+    });
+
+    it('sends preventPageViewEvent as true on 2nd call', function () {
+      let request = spec.buildRequests(bidRequests);
+      expect(request.data.preventPageViewEvent).to.be.true;
+    });
+
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(bidRequests);
       expect(request.url).to.equal(ENDPOINT);
       expect(request.method).to.equal('GET');
     });
 
+    it('sends bid request to custom endpoint via GET', function () {
+      const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+          placementId: 'placement',
+          customEndpoint: 'sub.domain.com/Bid/VideoAdContent'
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal('sub.domain.com/Bid/VideoAdContent');
+      expect(request.method).to.equal('GET');
+    });
+
+    it('sends bid request to default endpoint when no placement', function () {
+      const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('sends bid request to default endpoint when null placement', function () {
+      const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+          placementId: null
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('sends bid request to default endpoint 1 via GET', function () {
+	  const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+          placementId: 'placement'
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal('https://bid.videostep.com/Bid/VideoAdContent');
+      expect(request.method).to.equal('GET');
+    });
+
+    it('sends bid request to network id endpoint 1 via GET', function () {
+      const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+          placementId: 'placement',
+          domainId: 1001
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal('https://bid.videostep.com/Bid/VideoAdContent');
+      expect(request.method).to.equal('GET');
+    });
+
+    it('sends bid request to network id endpoint 2 via GET', function () {
+      const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+          placementId: 'placement',
+          domainId: 1002
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal('https://bid2.videostep.com/Bid/VideoAdContent');
+      expect(request.method).to.equal('GET');
+    });
+
+    it('sends bid request to network id by placement 1 via GET', function () {
+      const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+          placementId: 'infeed_ivbs1'
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal('https://bid.videostep.com/Bid/VideoAdContent');
+      expect(request.method).to.equal('GET');
+    });
+
+    it('sends bid request to network id by placement 2 via GET', function () {
+      const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+          placementId: 'infeed_ivbs2'
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal('https://bid2.videostep.com/Bid/VideoAdContent');
+      expect(request.method).to.equal('GET');
+    });
+
+    it('sends bid request to network id by placement 10 via GET', function () {
+      const request = spec.buildRequests([{
+        bidId: 'b1',
+        bidder: BIDDER_CODE,
+        params: {
+          placementId: 'infeed_ivbs10'
+        },
+        adUnitCode: 'test-div1'
+      }]);
+      expect(request.url).to.equal('https://bid10.videostep.com/Bid/VideoAdContent');
+      expect(request.method).to.equal('GET');
+    });
+
     it('sends cookies with the bid request', function () {
       const request = spec.buildRequests(bidRequests);
       expect(request.options.withCredentials).to.equal(true);
@@ -137,11 +324,46 @@ describe('invibesBidAdapter:', function () {
     });
 
     it('has capped ids if local storage variable is correctly formatted', function () {
+      top.window.invibes.optIn = 1;
+      top.window.invibes.purposes = [true, false, false, false, false, false, false, false, false, false];
       localStorage.ivvcap = '{"9731":[1,1768600800000]}';
+      SetBidderAccess();
+
       const request = spec.buildRequests(bidRequests, {auctionStart: Date.now()});
+
       expect(request.data.capCounts).to.equal('9731=1');
     });
 
+    it('does not have capped ids if local storage variable is correctly formatted but no opt in', function () {
+      let bidderRequest = {
+        auctionStart: Date.now(),
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            purpose: {
+              consents: {
+                1: false,
+                2: false,
+                3: false,
+                4: false,
+                5: false,
+                6: false,
+                7: false,
+                8: false,
+                9: false,
+                10: false
+              }
+            }
+          }
+        }
+      };
+
+      localStorage.ivvcap = '{"9731":[1,1768600800000]}';
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.capCounts).to.equal('');
+    });
+
     it('does not have capped ids if local storage variable is incorrectly formatted', function () {
       localStorage.ivvcap = ':[1,1574334216992]}';
       const request = spec.buildRequests(bidRequests, {auctionStart: Date.now()});
@@ -178,107 +400,163 @@ describe('invibesBidAdapter:', function () {
       expect(JSON.parse(request.data.bidParamsJson).placementIds).to.contain(bidRequests[1].params.placementId);
     });
 
-    it('uses cookies', function () {
-      global.document.cookie = 'ivNoCookie=1';
-      let request = spec.buildRequests(bidRequests);
-      expect(request.data.lId).to.be.undefined;
-    });
-
-    it('doesnt send the domain id if not graduated', function () {
-      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":1522929537626,"hc":1}';
-      let request = spec.buildRequests(bidRequests);
-      expect(request.data.lId).to.not.exist;
+    it('sends all adUnitCodes', function () {
+      const request = spec.buildRequests(bidRequests);
+      expect(JSON.parse(request.data.bidParamsJson).adUnitCodes).to.contain(bidRequests[0].adUnitCode);
+      expect(JSON.parse(request.data.bidParamsJson).adUnitCodes).to.contain(bidRequests[1].adUnitCode);
     });
 
-    it('try to graduate but not enough count - doesnt send the domain id', function () {
-      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":1521818537626,"hc":0}';
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
+    it('sends all Placement Ids and userId', function () {
+      const request = spec.buildRequests(bidRequestsWithUserId);
+      expect(JSON.parse(request.data.bidParamsJson).userId).to.exist;
     });
 
-    it('try to graduate but not old enough - doesnt send the domain id', function () {
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":' + Date.now() + ',"hc":5}';
-      let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
+    it('sends undefined lid when no cookie', function () {
+      let request = spec.buildRequests(bidRequests);
+      expect(request.data.lId).to.be.undefined;
     });
 
-    it('graduate and send the domain id', function () {
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      stubDomainOptions(new StubbedPersistence('{"id":"dvdjkams6nkq","cr":1521818537626,"hc":7}'));
-      let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.exist;
+    it('sends pushed cids if they exist', function () {
+      top.window.invibes.pushedCids = { 981: [] };
+      let request = spec.buildRequests(bidRequests);
+      expect(request.data.pcids).to.contain(981);
     });
 
-    it('send the domain id if already graduated', function () {
+    it('sends lid when comes on cookie', function () {
+      top.window.invibes.optIn = 1;
+      top.window.invibes.purposes = [true, false, false, false, false, false, false, false, false, false];
+      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":' + Date.now() + ',"hc":0}';
       let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi"}'));
-      let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.exist;
-      expect(top.window.invibes.dom.tempId).to.exist;
-    });
+      SetBidderAccess();
 
-    it('send the domain id after replacing it with new format', function () {
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi.8537626"}'));
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.lId).to.exist;
-      expect(top.window.invibes.dom.tempId).to.exist;
     });
 
-    it('dont send the domain id if consent declined on tcf v1', function () {
+    it('should send purpose 1', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
             gdprApplies: true,
             hasGlobalConsent: false,
-            vendorConsents: {436: false}
+            vendor: {consents: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
           }
         }
       };
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi.8537626"}'));
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-      expect(top.window.invibes.dom.tempId).to.not.exist;
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.purposes.split(',')[0]).to.equal('true');
     });
 
-    it('dont send the domain id if consent declined on tcf v2', function () {
+    it('should send purpose 2 & 7', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
             gdprApplies: true,
             hasGlobalConsent: false,
-            vendor: {consents: {436: false}}
+            vendor: {consents: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
           }
         }
       };
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi.8537626"}'));
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-      expect(top.window.invibes.dom.tempId).to.not.exist;
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.purposes.split(',')[1] && request.data.purposes.split(',')[6]).to.equal('true');
     });
 
-    it('dont send the domain id if no consent', function () {
-      let bidderRequest = {};
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi.8537626"}'));
+    it('should send purpose 9', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
+          }
+        }
+      };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-      expect(top.window.invibes.dom.tempId).to.not.exist;
+      expect(request.data.purposes.split(',')[9]).to.equal('true');
     });
 
-    it('try to init id but was already loaded on page - does not increment the id again', function () {
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":1521818537626,"hc":0}';
+    it('should send legitimateInterests 2 & 7', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              },
+              legitimateInterests: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
+          }
+        }
+      };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-      expect(top.window.invibes.dom.tempId).to.exist;
+      expect(request.data.li.split(',')[1] && request.data.li.split(',')[6]).to.equal('true');
     });
-
-    it('should send oi = 0 when vendorData is null', function () {
+    it('should send oi = 1 when vendorData is null (calculation will be performed by ADWEB)', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: null
@@ -315,7 +593,6 @@ describe('invibesBidAdapter:', function () {
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.oi).to.equal(2);
     });
-
     it('should send oi = 0 when vendor consents for invibes are false on tcf v2', function () {
       let bidderRequest = {
         gdprConsent: {
@@ -343,8 +620,76 @@ describe('invibesBidAdapter:', function () {
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.oi).to.equal(0);
     });
+    it('should send oi = 2 when vendor consent for invibes are false and vendor legitimate interest for invibes are true on tcf v2', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: false}, legitimateInterests: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
+          }
+        }
+      };
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.oi).to.equal(2);
+    });
+    it('should send oi = 0 when vendor consents and legitimate interests for invibes are false on tcf v2', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: false}, legitimateInterests: {436: false}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
+          }
+        }
+      };
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.oi).to.equal(0);
+    });
+    it('should send oi = 0 when purpose consents is null', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: false}},
+            purpose: {}
+          }
+        }
+      };
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.oi).to.equal(0);
+    });
 
-    it('should send oi = 0 when purpose consents weren\'t approved on tcf v2', function () {
+    it('should send oi = 2 when purpose consents weren\'t approved on tcf v2', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
@@ -369,10 +714,10 @@ describe('invibesBidAdapter:', function () {
         }
       };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.oi).to.equal(2);
     });
 
-    it('should send oi = 0 when purpose consents are less then 10 on tcf v2', function () {
+    it('should send oi = 2 when purpose consents are less then 10 on tcf v2', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
@@ -392,7 +737,7 @@ describe('invibesBidAdapter:', function () {
         }
       };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.oi).to.equal(2);
     });
 
     it('should send oi = 4 when vendor consents are null on tcf v2', function () {
@@ -527,7 +872,7 @@ describe('invibesBidAdapter:', function () {
       expect(request.data.oi).to.equal(2);
     });
 
-    it('should send oi = 0 when purpose consents weren\'t approved on tcf v1', function () {
+    it('should send oi = 2 when purpose consents weren\'t approved on tcf v1', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
@@ -545,10 +890,10 @@ describe('invibesBidAdapter:', function () {
         }
       };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.oi).to.equal(2);
     });
 
-    it('should send oi = 0 when purpose consents are less then 5 on tcf v1', function () {
+    it('should send oi = 2 when purpose consents are less then 5 on tcf v1', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
@@ -564,7 +909,7 @@ describe('invibesBidAdapter:', function () {
         }
       };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.oi).to.equal(2);
     });
 
     it('should send oi = 0 when vendor consents for invibes are false on tcf v1', function () {
@@ -617,9 +962,108 @@ describe('invibesBidAdapter:', function () {
           <body style='margin : 0; padding: 0;'>
           <!-- Creative -->
           </body>
-        </html>`
+        </html>`,
+      meta: {}
     }];
 
+    let multiResponse = {
+      MultipositionEnabled: true,
+      AdPlacements: [{
+        Ads: [{
+          BidPrice: 0.5,
+          VideoExposedId: 123
+        }],
+        BidModel: {
+          BidVersion: 1,
+          PlacementId: '12345',
+          AuctionStartTime: Date.now(),
+          CreativeHtml: '<!-- Creative -->'
+        }
+      }]
+    };
+
+    let invalidResponse = {
+      AdPlacements: [{
+        Ads: [{
+          BidPrice: 0.5,
+          VideoExposedId: 123
+        }]
+      }]
+    };
+
+    let responseWithMeta = {
+      Ads: [{
+        BidPrice: 0.5,
+        VideoExposedId: 123
+      }],
+      BidModel: {
+        BidVersion: 1,
+        PlacementId: '12345',
+        AuctionStartTime: Date.now(),
+        CreativeHtml: '<!-- Creative -->',
+        Meta: {
+          advertiserDomains: ['theadvertiser.com', 'theadvertiser_2.com'],
+          advertiserName: 'theadvertiser'
+        }
+      }
+    };
+
+    let responseWithAdUnit = {
+      Ads: [{
+        BidPrice: 0.5,
+        VideoExposedId: 123
+      }],
+      BidModel: {
+        BidVersion: 1,
+        PlacementId: '12345_test-div1',
+        AuctionStartTime: Date.now(),
+        CreativeHtml: '<!-- Creative -->'
+      },
+	  UseAdUnitCode: true
+    };
+
+    var buildResponse = function(placementId, cid, blcids, creativeId, ShouldSetLId) {
+      if (ShouldSetLId) {
+        return {
+          MultipositionEnabled: true,
+          AdPlacements: [{
+            Ads: [{
+              BidPrice: 0.5,
+              VideoExposedId: creativeId,
+              Cid: cid,
+              Blcids: blcids
+            }],
+            BidModel: {
+              BidVersion: 1,
+              PlacementId: placementId,
+              AuctionStartTime: Date.now(),
+              CreativeHtml: '<!-- Creative -->'
+            }
+          }],
+          ShouldSetLId: true,
+          LId: 'dvdjkams6nkq'
+        }
+      }
+
+      return {
+        MultipositionEnabled: true,
+        AdPlacements: [{
+          Ads: [{
+            BidPrice: 0.5,
+            VideoExposedId: creativeId,
+            Cid: cid,
+            Blcids: blcids
+          }],
+          BidModel: {
+            BidVersion: 1,
+            PlacementId: placementId,
+            AuctionStartTime: Date.now(),
+            CreativeHtml: '<!-- Creative -->'
+          }
+        }]
+      };
+    };
+
     context('when the response is not valid', function () {
       it('handles response with no bids requested', function () {
         let emptyResult = spec.interpretResponse({body: response});
@@ -665,33 +1109,119 @@ describe('invibesBidAdapter:', function () {
         let emptyResult = spec.interpretResponse({BidModel: {}, Ads: [{BidPrice: 1}]}, {bidRequests});
         expect(emptyResult).to.be.empty;
       });
+
+      it('handles response when bid model is missing', function () {
+        let emptyResult = spec.interpretResponse(invalidResponse);
+        expect(emptyResult).to.be.empty;
+      });
     });
 
-    context('when the response is valid', function () {
-      it('responds with a valid bid', function () {
-        top.window.invibes.setCookie('a', 'b', 370);
-        top.window.invibes.setCookie('c', 'd', 0);
-        let result = spec.interpretResponse({body: response}, {bidRequests});
+    context('when the multiresponse is valid', function () {
+      it('responds with a valid multiresponse bid', function () {
+        let result = spec.interpretResponse({body: multiResponse}, {bidRequests});
         expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
       });
 
-      it('responds with a valid bid and uses logger', function () {
-        localStorage.InvibesDEBUG = true;
+      it('responds with a valid singleresponse bid', function () {
         let result = spec.interpretResponse({body: response}, {bidRequests});
         expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
       });
 
       it('does not make multiple bids', function () {
-        localStorage.InvibesDEBUG = false;
         let result = spec.interpretResponse({body: response}, {bidRequests});
         let secondResult = spec.interpretResponse({body: response}, {bidRequests});
         expect(secondResult).to.be.empty;
       });
+
+      it('bids using the adUnitCode', function () {
+        let result = spec.interpretResponse({body: responseWithAdUnit}, {bidRequests});
+        expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      });
+    });
+
+    context('when the response has meta', function () {
+      it('responds with a valid bid, with the meta info', function () {
+        let result = spec.interpretResponse({body: responseWithMeta}, {bidRequests});
+        expect(result[0].meta.advertiserName).to.equal('theadvertiser');
+        expect(result[0].meta.advertiserDomains).to.contain('theadvertiser.com');
+        expect(result[0].meta.advertiserDomains).to.contain('theadvertiser_2.com');
+      });
+    });
+
+    context('AdWeb generates LIDs', function() {
+      it('works when no LID is not sent from AdWeb', function() {
+        var firstResponse = buildResponse('12345', 1, [], 123);
+
+        var firstResult = spec.interpretResponse({body: firstResponse}, {bidRequests});
+        expect(firstResult[0].creativeId).to.equal(123);
+      });
+
+      it('sets lid when AdWeb sends it', function() {
+        var firstResponse = buildResponse('12345', 1, [], 123, true);
+
+        spec.interpretResponse({body: firstResponse}, {bidRequests});
+        expect(global.document.cookie.indexOf('ivbsdid')).to.greaterThanOrEqual(0);
+      });
+    });
+
+    context('in multiposition context, with conflicting ads', function() {
+      it('registers the second ad when no conflict', function() {
+        var firstResponse = buildResponse('12345', 1, [1], 123);
+        var secondResponse = buildResponse('abcde', 2, [2], 456);
+
+        var firstResult = spec.interpretResponse({body: firstResponse}, {bidRequests});
+        var secondResult = spec.interpretResponse({body: secondResponse}, {bidRequests});
+        expect(secondResult[0].creativeId).to.equal(456);
+      });
+
+      it('registers the second ad when no conflict - empty arrays', function() {
+        var firstResponse = buildResponse('12345', 1, [], 123);
+        var secondResponse = buildResponse('abcde', 2, [], 456);
+
+        var firstResult = spec.interpretResponse({body: firstResponse}, {bidRequests});
+        var secondResult = spec.interpretResponse({body: secondResponse}, {bidRequests});
+        expect(secondResult[0].creativeId).to.equal(456);
+      });
+
+      it('doesnt register the second ad when it is blacklisted by the first', function() {
+        var firstResponse = buildResponse('12345', 1, [2], 123);
+        var secondResponse = buildResponse('abcde', 2, [], 456);
+
+        var firstResult = spec.interpretResponse({body: firstResponse}, {bidRequests});
+        var secondResult = spec.interpretResponse({body: secondResponse}, {bidRequests});
+        expect(secondResult).to.be.empty;
+      });
+
+      it('doesnt register the second ad when it is blacklisting the first', function() {
+        var firstResponse = buildResponse('12345', 1, [], 123);
+        var secondResponse = buildResponse('abcde', 2, [1], 456);
+
+        var firstResult = spec.interpretResponse({body: firstResponse}, {bidRequests});
+        var secondResult = spec.interpretResponse({body: secondResponse}, {bidRequests});
+        expect(secondResult).to.be.empty;
+      });
+
+      it('doesnt register the second ad when it has same ids as the first', function() {
+        var firstResponse = buildResponse('12345', 1, [1], 123);
+        var secondResponse = buildResponse('abcde', 1, [1], 456);
+
+        var firstResult = spec.interpretResponse({body: firstResponse}, {bidRequests});
+        var secondResult = spec.interpretResponse({body: secondResponse}, {bidRequests});
+        expect(secondResult).to.be.empty;
+      });
     });
   });
 
   describe('getUserSyncs', function () {
+    it('returns undefined if disableUserSyncs not passed as bid request param ', function () {
+      spec.buildRequests(bidRequestsWithUserId);
+      let response = spec.getUserSyncs({iframeEnabled: true});
+      expect(response).to.equal(undefined);
+    });
+
     it('returns an iframe if enabled', function () {
+      spec.buildRequests(bidRequests);
+
       let response = spec.getUserSyncs({iframeEnabled: true});
       expect(response.type).to.equal('iframe');
       expect(response.url).to.include(SYNC_ENDPOINT);
@@ -699,16 +1229,45 @@ describe('invibesBidAdapter:', function () {
 
     it('returns an iframe with params if enabled', function () {
       top.window.invibes.optIn = 1;
-      global.document.cookie = 'ivvbks=17639.0,1,2';
+      spec.buildRequests(bidRequests);
+
+      let response = spec.getUserSyncs({iframeEnabled: true});
+      expect(response.type).to.equal('iframe');
+      expect(response.url).to.include(SYNC_ENDPOINT);
+      expect(response.url).to.include('optIn');
+    });
+
+    it('returns an iframe with params including if enabled', function () {
+      top.window.invibes.optIn = 1;
+      spec.buildRequests(bidRequests);
+
+      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":' + Date.now() + ',"hc":0}';
+      SetBidderAccess();
+
+      let response = spec.getUserSyncs({iframeEnabled: true});
+      expect(response.type).to.equal('iframe');
+      expect(response.url).to.include(SYNC_ENDPOINT);
+      expect(response.url).to.include('optIn');
+      expect(response.url).to.include('ivbsdid');
+    });
+
+    it('returns an iframe with params including if enabled read from LocalStorage', function () {
+      spec.buildRequests(bidRequests);
+      top.window.invibes.optIn = 1;
+
+      localStorage.ivbsdid = 'dvdjkams6nkq';
+      SetBidderAccess();
+
       let response = spec.getUserSyncs({iframeEnabled: true});
       expect(response.type).to.equal('iframe');
       expect(response.url).to.include(SYNC_ENDPOINT);
       expect(response.url).to.include('optIn');
-      expect(response.url).to.include('ivvbks');
       expect(response.url).to.include('ivbsdid');
     });
 
     it('returns undefined if iframe not enabled ', function () {
+      spec.buildRequests(bidRequests);
+
       let response = spec.getUserSyncs({iframeEnabled: false});
       expect(response).to.equal(undefined);
     });
diff --git a/test/spec/modules/invisiblyAnalyticsAdapter_spec.js b/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
index e13b16661b0..3b3542d43b0 100644
--- a/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
+++ b/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
@@ -1,5 +1,6 @@
 import invisiblyAdapter from 'modules/invisiblyAnalyticsAdapter.js';
 import { expect } from 'chai';
+import {expectEvents} from '../../helpers/analytics.js';
 let events = require('src/events');
 let constants = require('src/constants.json');
 
@@ -197,12 +198,8 @@ describe('Invisibly Analytics Adapter test suite', function () {
               account: 'invisibly',
             },
           });
-          events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
-          events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END);
-          events.emit(constants.EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
-          events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
-          events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON);
-          sinon.assert.callCount(invisiblyAdapter.track, 5);
+
+          expectEvents().to.beTrackedBy(invisiblyAdapter.track);
         });
 
         it('should not catch events triggered without invisibly account config', function () {
@@ -380,7 +377,6 @@ describe('Invisibly Analytics Adapter test suite', function () {
         expect(invisiblyEvents.event_data.pageViewId).to.exist;
         expect(invisiblyEvents.event_data.ver).to.equal(1);
         expect(invisiblyEvents.event_type).to.equal('PREBID_bidWon');
-        sinon.assert.callCount(invisiblyAdapter.track, 1);
       });
 
       // spec for bidder done event
@@ -518,7 +514,6 @@ describe('Invisibly Analytics Adapter test suite', function () {
         expect(invisiblyEvents.event_data.auctionId).to.equal(
           MOCK.AUCTION_END.auctionId
         );
-        sinon.assert.callCount(invisiblyAdapter.track, 1);
       });
 
       // should not call sendEvent for events not supported by the adapter
@@ -537,21 +532,21 @@ describe('Invisibly Analytics Adapter test suite', function () {
       it('track all event without errors', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
 
-        events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
-        events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END);
-        events.emit(constants.EVENTS.BID_ADJUSTMENT, MOCK.BID_ADJUSTMENT);
-        events.emit(constants.EVENTS.BID_TIMEOUT, MOCK.BID_TIMEOUT);
-        events.emit(constants.EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
-        events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
-        events.emit(constants.EVENTS.NO_BID, MOCK.NO_BID);
-        events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON);
-        events.emit(constants.EVENTS.BIDDER_DONE, MOCK.BIDDER_DONE);
-        events.emit(constants.EVENTS.SET_TARGETING, MOCK.SET_TARGETING);
-        events.emit(constants.EVENTS.REQUEST_BIDS, MOCK.REQUEST_BIDS);
-        events.emit(constants.EVENTS.ADD_AD_UNITS, MOCK.ADD_AD_UNITS);
-        events.emit(constants.EVENTS.AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED);
-
-        sinon.assert.callCount(invisiblyAdapter.track, 13);
+        expectEvents([
+          constants.EVENTS.AUCTION_INIT,
+          constants.EVENTS.AUCTION_END,
+          constants.EVENTS.BID_ADJUSTMENT,
+          constants.EVENTS.BID_TIMEOUT,
+          constants.EVENTS.BID_REQUESTED,
+          constants.EVENTS.BID_RESPONSE,
+          constants.EVENTS.NO_BID,
+          constants.EVENTS.BID_WON,
+          constants.EVENTS.BIDDER_DONE,
+          constants.EVENTS.SET_TARGETING,
+          constants.EVENTS.REQUEST_BIDS,
+          constants.EVENTS.ADD_AD_UNITS,
+          constants.EVENTS.AD_RENDER_FAILED
+        ]).to.beTrackedBy(invisiblyAdapter.track);
       });
     });
 
diff --git a/test/spec/modules/ipromBidAdapter_spec.js b/test/spec/modules/ipromBidAdapter_spec.js
new file mode 100644
index 00000000000..bb2f364bece
--- /dev/null
+++ b/test/spec/modules/ipromBidAdapter_spec.js
@@ -0,0 +1,197 @@
+import {expect} from 'chai';
+import {spec} from 'modules/ipromBidAdapter.js';
+
+describe('iPROM Adapter', function () {
+  let bidRequests;
+  let bidderRequest;
+
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: '300x250',
+        },
+        adUnitCode: '/19966331/header-bid-tag-1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]],
+          }
+        },
+        bidId: '29a72b151f7bd3',
+        auctionId: 'e36abb27-g3b1-1ad6-8a4c-701c8919d3hh',
+        bidderRequestId: '2z76da40m1b3cb8',
+        transactionId: 'j51lhf58-1ad6-g3b1-3j6s-912c9493g0gu'
+      }
+    ];
+
+    bidderRequest = {
+      timeout: 3000,
+      refererInfo: {
+        legacy: {
+          referer: 'https://adserver.si/index.html',
+          reachedTop: true,
+          numIframes: 1,
+          stack: [
+            'https://adserver.si/index.html',
+            'https://adserver.si/iframe1.html',
+          ]
+        }
+      }
+    }
+  });
+
+  describe('validating bids', function () {
+    it('should accept valid bid', function () {
+      let validBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: '300x250',
+        },
+      };
+
+      const isValid = spec.isBidRequestValid(validBid);
+
+      expect(isValid).to.equal(true);
+    });
+
+    it('should reject bid if missing dimension and id', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {}
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if missing dimension', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if dimension is not a string', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: 404,
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if missing id', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          dimension: '300x250',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if id is not a string', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: 1234,
+          dimension: '300x250',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('building requests', function () {
+    it('should go to correct endpoint', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      expect(request.method).to.exist;
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.exist;
+      expect(request.url).to.equal('https://core.iprom.net/programmatic');
+    });
+
+    it('should add referer info', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.referer).to.exist;
+      expect(requestparse.referer.referer).to.equal('https://adserver.si/index.html');
+    });
+
+    it('should add adapter version', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.version).to.exist;
+    });
+
+    it('should contain id and dimension', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.bids[0].params.id).to.equal('1234');
+      expect(requestparse.bids[0].params.dimension).to.equal('300x250');
+    });
+  });
+
+  describe('handling responses', function () {
+    it('should return complete bid response', function () {
+      const serverResponse = {
+        body: [{
+          requestId: '29a72b151f7bd3',
+          cpm: 0.5,
+          width: '300',
+          height: '250',
+          creativeId: 1234,
+          ad: '<html><head><title>Iprom Header bidding example</title></head><body><img src="https://iprom.si/files/2015/08/iprom-logo.svg"></body></html>',
+          aDomains: ['https://example.com'],
+        }
+        ]};
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const bids = spec.interpretResponse(serverResponse, request);
+
+      expect(bids).to.be.lengthOf(1);
+      expect(bids[0].requestId).to.equal('29a72b151f7bd3');
+      expect(bids[0].cpm).to.equal(0.5);
+      expect(bids[0].width).to.equal('300');
+      expect(bids[0].height).to.equal('250');
+      expect(bids[0].ad).to.have.length.above(1);
+      expect(bids[0].meta.advertiserDomains).to.deep.equal(['https://example.com']);
+    });
+
+    it('should return empty bid response', function () {
+      const emptyServerResponse = {
+        body: []
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const bids = spec.interpretResponse(emptyServerResponse, request);
+
+      expect(bids).to.be.lengthOf(0);
+    });
+  });
+});
diff --git a/test/spec/modules/iqmBidAdapter_spec.js b/test/spec/modules/iqmBidAdapter_spec.js
new file mode 100644
index 00000000000..2f8b5811b2f
--- /dev/null
+++ b/test/spec/modules/iqmBidAdapter_spec.js
@@ -0,0 +1,414 @@
+import { expect } from 'chai';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import {spec} from 'modules/iqmBidAdapter';
+
+const ENDPOINT = 'https://pbd.bids.iqm.com';
+
+describe('iqmAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid =
+      {
+        bidder: 'iqm',
+        params: {
+          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+          placementId: 23451,
+          bidfloor: 0.50
+        },
+
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+
+    it('should return false when no bid', function () {
+      expect(spec.isBidRequestValid()).to.equal(false);
+    });
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return false when it is video and mimes and protcol are not present', function () {
+      const bid = {
+        adUnitCode: 'div-gpt-ad-1460505748561-0',
+        auctionId: 'a0aca162-e3d0-44db-a465-5c96a64fa5fb',
+        bidId: '2cbdc9b506be33',
+        bidRequestsCount: 1,
+        bidder: 'iqm',
+        bidderRequestId: '185c3a4c7f88ec',
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+        crumbs: {pubcid: 'f56a553d-370d-4cea-b31a-7214a3d8f8e1'},
+        mediaTypes: {
+          video: {
+            context: 'instream',
+            playerSize: [
+              [
+                640,
+                480
+              ]
+            ]
+          }
+        },
+        params: {
+          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+          placementId: 23451,
+          geo: {
+            country: 'USA'
+          },
+
+          bidfloor: 0.50,
+          video: {
+            placement: 2,
+            mimes: null,
+            protocols: null,
+            skipppable: true,
+            playback_method: ['auto_play_sound_off']
+          }
+        },
+        src: 'client',
+        transactionId: 'a57d06fd-cc6d-4a90-87af-c10727998f0b' };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+    it('should return false when required params are not found', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        placementId: 0,
+        publisherId: null
+
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let validBidRequests = [
+      {bidder: 'iqm',
+        params: {
+          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+          placementId: 23451,
+          bidfloor: 0.5},
+        crumbs: {
+          pubcid: 'a0f51f64-6d86-41d0-abaf-7ece71404d94'},
+        ortb2Imp: {ext: {data: {'pbadslot': '/19968336/header-bid-tag-0'}}},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]}},
+        adUnitCode: '/19968336/header-bid-tag-0',
+        transactionId: '56fe8d92-ff6e-4c34-90ad-2f743cd0eae8',
+        sizes: [[300, 250]],
+        bidId: '266d810da21904',
+        bidderRequestId: '13c05d264c7ffe',
+        auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0}];
+
+    let bidderRequest = {
+      bidderCode: 'iqm',
+      auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
+      bidderRequestId: '13c05d264c7ffe',
+      bids: [{
+        bidder: 'iqm',
+        params: {publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a', placementId: 23451, bidfloor: 0.5},
+        crumbs: {pubcid: 'a0f51f64-6d86-41d0-abaf-7ece71404d94'},
+        ortb2Imp: {ext: {data: {'pbadslot': '/19968336/header-bid-tag-0'}}},
+        mediaTypes: {banner: {sizes: [[300, 250]]}},
+        adUnitCode: '/19968336/header-bid-tag-0',
+        transactionId: '56fe8d92-ff6e-4c34-90ad-2f743cd0eae8',
+        sizes: [[300, 250]],
+        bidId: '266d810da21904',
+        bidderRequestId: '13c05d264c7ffe',
+        auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0
+      }],
+      auctionStart: 1615205942159,
+      timeout: 7000,
+      refererInfo: {
+        page: 'http://test.localhost:9999/integrationExamples/gpt/hello_world.html',
+        domain: 'test.localhost.com:9999',
+        ref: null,
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 0,
+        stack: ['http://test.localhost:9999/integrationExamples/gpt/hello_world.html'],
+        canonicalUrl: null
+      },
+      start: 1615205942162
+    };
+
+    it('should parse out  sizes', function () {
+      let temp = [];
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = request[0].data;
+
+      expect(payload.sizes).to.exist;
+      expect(payload.sizes[0]).to.deep.equal([300, 250]);
+    });
+
+    it('should populate the ad_types array on all requests', function () {
+      // const bidRequest = Object.assign({}, bidRequests[0]);
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = request[0].data;
+
+      expect(payload.imp.mediatype).to.deep.equal('banner');
+    });
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request[0].url).to.equal(ENDPOINT);
+      expect(request[0].method).to.equal('POST');
+    });
+    it('should attach valid video params to the tag', function () {
+      let validBidRequests_video = [{
+        bidder: 'iqm',
+        params: {
+          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+          placementId: 23451,
+          bidfloor: 0.5,
+          video: {
+            placement: 2,
+            mimes: ['video/mp4'],
+            protocols: [2, 5],
+            skipppable: true,
+            playback_method: ['auto_play_sound_off']
+          }
+        },
+        crumbs: {pubcid: '09b8f065-9d1b-4a36-bd0c-ea22e2dad807'},
+        ortb2Imp: {ext: {data: {'pbadslot': 'video1'}}},
+        mediaTypes: {video: {playerSize: [[640, 480]], context: 'instream'}},
+        adUnitCode: 'video1',
+        transactionId: '86795c66-acf9-4dd5-998f-6d5362aaa541',
+        sizes: [[640, 480]],
+        bidId: '28bfb7e2d12897',
+        bidderRequestId: '16e1ce8481bc6d',
+        auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0
+      }];
+      let bidderRequest_video = {
+        bidderCode: 'iqm',
+        auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
+        bidderRequestId: '16e1ce8481bc6d',
+        bids: [{
+          bidder: 'iqm',
+          params: {
+            publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+            placementId: 23451,
+            bidfloor: 0.5,
+            video: {
+              placement: 2,
+              mimes: ['video/mp4'],
+              protocols: [2, 5],
+              skipppable: true,
+              playback_method: ['auto_play_sound_off']
+            }
+          },
+          crumbs: {pubcid: '09b8f065-9d1b-4a36-bd0c-ea22e2dad807'},
+          fpd: {context: {pbAdSlot: 'video1'}},
+          mediaTypes: {video: {playerSize: [[640, 480]], context: 'instream'}},
+          adUnitCode: 'video1',
+          transactionId: '86795c66-acf9-4dd5-998f-6d5362aaa541',
+          sizes: [[640, 480]],
+          bidId: '28bfb7e2d12897',
+          bidderRequestId: '16e1ce8481bc6d',
+          auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
+          src: 'client',
+          bidRequestsCount: 1,
+          bidderRequestsCount: 1,
+          bidderWinsCount: 0
+        }],
+        auctionStart: 1615271191985,
+        timeout: 3000,
+        refererInfo: {
+          page: 'http://test.localhost:9999/integrationExamples/gpt/pbjs_video_adUnit.html',
+          domain: 'test.localhost.com:9999',
+          ref: null,
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['http://test.localhost:9999/integrationExamples/gpt/pbjs_video_adUnit.html'],
+          canonicalUrl: null
+        },
+        start: 1615271191988
+      };
+      const request = spec.buildRequests(validBidRequests_video, bidderRequest_video);
+      const payload = request[0].data;
+      expect(payload.imp.id).to.exist;
+      expect(payload.imp.displaymanager).to.exist;
+      expect(payload.imp.displaymanagerver).to.exist;
+
+      expect(payload.imp.video).to.deep.equal({
+        context: 'instream',
+        w: 640,
+        h: 480,
+        mimes: ['video/mp4'],
+        placement: 1,
+        protocols: [2, 5],
+        startdelay: 0
+      });
+    });
+
+    it('should add referer info to payload', function () {
+      // TODO: this is wrong on multiple levels
+      // The payload contains everything in `bidderRequest`; that is sometimes not even serializable
+      // this should not be testing the validity of internal Prebid structures
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = request[0].data;
+
+      expect(payload.bidderRequest.refererInfo).to.exist;
+    });
+  })
+
+  describe('interpretResponse', function () {
+    let tempResult = {requestId: '2d9601dd8328f8', currency: 'USD', cpm: 4.5, netRevenue: true, creativeId: 'cr-121004', adUnitCode: 'div-gpt-ad-1460505748561-0', 'auctionId': '22a4f3d8-511f-46ba-91be-53b9949e4b48', mediaType: 'banner', ttl: 3000, ad: "<html> <body>   <script type='text/javascript' src='http://pxl.ownrtb.com/i/dev/cookie/service?reqId\\\\=2d9601dd8328f8&pId\\\\=cGJk' async></script>   <a target='_blank' href='https://click.iqm.com/pbd?raw=mW-fVT2nAH2SZM0C5fdVOmoRi7AaqOuzczrnvJpHlR7Y4RUUCzglj8BT4riBv1AyMTiWKMsiQt0ybBB12c5SrCeMBEmKkYEzrXO9tqDWdQuumULdfG1s0pGulNvgY1Ykg0W3zbFyW_Habopgpb_YhIGhzkvwJKjNu1qgMUblXTyi9kl99CYekkcktYgkjS8-2oxukt5B8fBnfLRWGqfnfX9FnqlqSHCEY9J6gYrd2L8%3D&req_id=2d9601dd8328f8'></a>  <div id='politicalAdCSS' style='{IAA_POLITICAL_AD_STYLE}'>   <a target='_blank' href='https://click.iqm.com/pbd?raw=mW-fVT2nAH2SZM0C5fdVOmoRi7AaqOuzczrnvJpHlR7Y4RUUCzglj8BT4riBv1AyMTiWKMsiQt0ybBB12c5SrCeMBEmKkYEzrXO9tqDWdQuumULdfG1s0pGulNvgY1Ykg0W3zbFyW_Habopgpb_YhIGhzkvwJKjNu1qgMUblXTyi9kl99CYekkcktYgkjS8-2oxukt5B8fBnfLRWGqfnfX9FnqlqSHCEY9J6gYrd2L8%3D&req_id=2d9601dd8328f8'> <img class='mainCreative' src='https://win.iqm.com/pbd?raw=mW-fVT2nAH2SZM0C5fdVOmoRi7AaqOuzczrnvJpHlR7Y4RUUCzglj8BT4riBv1AyMTiWKMsiQt0ybBB12c5SrCeMBEmKkYEzrXO9tqDWdQuumULdfG1s0pGulNvgY1Ykg0W3zbFyW_Habopgpb_YhIGhzkvwJKjNQkzLZ7ZoHeAoSmo2_QbJ3PUqqw8x9VBg8iXtyg776fTaaMOI3_8gHBSJF5HdfZBc0kcXJ_ioD25LBMfdBRc8_nk82kJEKTu5WGwq_nzJZC2gEVjXF2u-eeyHlhj28jxlokgH8h8EBBpzo70zGhsaRtV2Vuk_dwJA_Fdal2UoT2w9ziBe9ZRp1Kzv_Z39qwlu5tXgLHMXkSZUzj9sFb-OcKnpKTpUzoxTz3yBidPdPc4%3D&req_id=2d9601dd8328f8&ap=${AUCTION_PRICE}' width='240' height='198'></a>  </div>   </body></html>", width: 844, height: 617};
+    let validBidRequests_temp = [
+      {bidder: 'iqm',
+        params: {
+          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+          placementId: 23451,
+          bidfloor: 0.5},
+        crumbs: {
+          pubcid: 'a0f51f64-6d86-41d0-abaf-7ece71404d94'},
+        ortb2Imp: {ext: {data: {'pbadslot': '/19968336/header-bid-tag-0'}}},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]}},
+        adUnitCode: '/19968336/header-bid-tag-0',
+        transactionId: '56fe8d92-ff6e-4c34-90ad-2f743cd0eae8',
+        sizes: [[300, 250]],
+        bidId: '266d810da21904',
+        bidderRequestId: '13c05d264c7ffe',
+        auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0}];
+    let bidderRequest = {
+      bidderCode: 'iqm',
+      auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
+      bidderRequestId: '13c05d264c7ffe',
+      bids: [{
+        bidder: 'iqm',
+        params: {publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a', placementId: 23451, bidfloor: 0.5},
+        crumbs: {pubcid: 'a0f51f64-6d86-41d0-abaf-7ece71404d94'},
+        ortb2Imp: {ext: {data: {'pbadslot': '/19968336/header-bid-tag-0'}}},
+        mediaTypes: {banner: {sizes: [[300, 250]]}},
+        adUnitCode: '/19968336/header-bid-tag-0',
+        transactionId: '56fe8d92-ff6e-4c34-90ad-2f743cd0eae8',
+        sizes: [[300, 250]],
+        bidId: '266d810da21904',
+        bidderRequestId: '13c05d264c7ffe',
+        auctionId: '565ab569-ab95-40d6-8b42-b9707a92062f',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0
+      }],
+      auctionStart: 1615205942159,
+      timeout: 7000,
+      refererInfo: {
+        page: 'http://test.localhost:9999/integrationExamples/gpt/hello_world.html',
+        domain: 'test.localhost.com:9999',
+        ref: null,
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 0,
+        stack: ['http://test.localhost:9999/integrationExamples/gpt/hello_world.html'],
+        canonicalUrl: null
+      },
+      start: 1615205942162
+    };
+    let response = {
+
+      id: '5bdbab92aae961cfbdf7465d',
+      seatbid: [{bid: [{id: 'bid-5bdbab92aae961cfbdf7465d-5bdbab92aae961cfbdf74653', impid: '5bdbab92aae961cfbdf74653', price: 9.9, nurl: 'https://winn.stage.iqm.com/smaato?raw=w9XViV4dovBHrxujHhBj-l-uWB08CUOMW_oR-EUxZbaWLL0ENzcMlP3CJFEURN6FgRp_HdjAjxTYHR7uG4S6h6dl_vjU_YNABiPd607-iTqxOCl-2cKLo-hhQus4sMw01VIqyqrPmzOTHTwJm4vTjUIoWMPZbARgQvUnBzjRH9xeYS-Bv3kgAW9NSBfgBZeLyT3WJJ_3VKIE_Iurt8OjpA%3D%3D&req_id=5bdbab92aae961cfbdf7465d&ap=${AUCTION_PRICE}', adm: "<html> <body>   <script type='text/javascript' src='https://pxl.iqm.com/i/cookie/service?reqId=5bdbab92aae961cfbdf7465d&pId=c21hYXRv' async></script>   <div id='politicalAdCSS' style='{IAA_POLITICAL_AD_STYLE}'>    <a target='_blank' href='https://click.stage.iqm.com/smaato?raw=mW-fVT2nAH3D1dWJXh2i8EevG6MeEGP6X65YHTwJQ4xb-hH4RTFltpYsvQQ3NwyU_cIkURRE3oWBGn8d2MCPFNgdHu4bhLqHp2X--NT9g0AGI93rTv6JOrE4KX7Zwouj6GFC6ziwzDTVUirKqs-bM5MdPAmbi9ONQihYw9lsBGBC9ScHONEf3F5hL4G_eSABTwuRDS8DlwfdO2ToEsTcZ73-vQg1ChxuHAzPd8tFgm0hMaR2YvQEix_8t29Ku0_X&req_id=5bdbab92aae961cfbdf7465d'><img class='mainCreative' src='https://win.stage.iqm.com/smaato?raw=mW-fVT2nAH3D1dWJXh2i8EevG6MeEGP6X65YHTwJQ4xb-hH4RTFltpYsvQQ3NwyU_cIkURRE3oWBGn8d2MCPFNgdHu4bhLqHp2X--NT9g0AGI93rTv6JOrE4KX7Zwouj6GFC6ziwzDTVUirKqs-bM5MdPAmbi9ONQihYw9lsBGBC9ScHONEf3F5hL4G_eSAB27rX7yddm6gveXrinvITdKrrsCL6Z2KFNPT5b0XXcEFywmQ29Mi9e0naWSS6JEiEtNl8gTaMug_SLzgZtxhoJ5tmRuNfzO3ZL749sTyGU7R6UqffiNRQ3enOOXFNozI-YUO_g2YzC3WyQvavvuaVrZLWry3QrGvXJMicow51nMuJNa2FdTKHfhSJF5HdfZBc0kcXJ_ioD2439u-8Q9bMkSauDRRTL3YTbwozJFPPFqVxAh_Os6RlYXiEcpf0SFoFo2_-ks52yUlsTL4G34kXA1YUtTiEOdptgbDp0n6Rvq9Hc1kgm37jp-RtyWTj7n2EFpuBUmdnIyMItomcvTd7gQ%3D%3D&req_id=5bdbab92aae961cfbdf7465d&ap=${AUCTION_PRICE}' width='250' height='250'> </a>  </div>    <script type='text/javascript' src='https://q.adrta.com/s/iqm/aa.js?cb=d7011a54-f43d-42bd-be57-8bbfca208ed2#iqm;paid=iqm;avid=100404;caid=169218;plid=301435;siteId=20851;lineItemId={IAA_LINE_ITEM_ID};kv2=www.enotes.com;priceBid=9.9;pricePaid={IAA_PAID_PRICE};publisherId=0;kv1=250x250;kv3=IQBU77n5POSeE_p7t0rqrNcvY8z4LLpJ3bY8p94HdxUX;kv4=71.95.98.65;kv6=5bdbab92aae961cfbdf74653;kv5=smaato;kv10=Cellular+One;kv11=5bdbab92aae961cfbdf7465d;kv12={IAA_PLACEMENT_ID};kv14=3,5;kv16=45.594555;kv17=-121.14975;kv18=0;kv19=8d8303ec-6b62-5d49-bc56-10ff5479219;kv32=20851;kv23={IAA_CARRIER_ID};kv26=ios;kv24=CTV;kv25={IAA_APP_NAME};kv27=Mozilla%2F5.0+%28iPhone%3B+U%3B+CPU+iPhone+OS+4_2_1+like+Mac+OS+X%3B+en-us%29+AppleWebKit%2F533.17.9+%28KHTML%2C+like+Gecko%29+Mobile%2F8C148a;kv28=Apple;kv52=0;kv15=NY;kv7=Unknown'> </script>  </body></html>", adomain: ['click.iqm.com'], iurl: 'https://d3jme5si7t6llb.cloudfront.net/image/1/404/owVo6mc_1588902031079.png', cid: '169218', crid: 'cr-301435', attr: [], h: 250, w: 250}]}],
+      bidid: '5bdbab92aae961cfbdf7465d'
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {requestId: '49ad5f21156efd', currency: 'USD', cpm: 9.9, netRevenue: true, creativeId: 'cr-301435', adUnitCode: '/19968336/header-bid-tag-0', auctionId: '853cddf1-8d13-4482-bd88-f5ef927d5ab3', mediaType: 'banner', ttl: 3000, ad: "<html> <body>   <script type='text/javascript' src='https://pxl.iqm.com/i/cookie/service?reqId=5bdbab92aae961cfbdf7465d&pId=c21hYXRv' async></script>   <div id='politicalAdCSS' style='{IAA_POLITICAL_AD_STYLE}'>    <a target='_blank' href='https://click.stage.iqm.com/smaato?raw=mW-fVT2nAH3D1dWJXh2i8EevG6MeEGP6X65YHTwJQ4xb-hH4RTFltpYsvQQ3NwyU_cIkURRE3oWBGn8d2MCPFNgdHu4bhLqHp2X--NT9g0AGI93rTv6JOrE4KX7Zwouj6GFC6ziwzDTVUirKqs-bM5MdPAmbi9ONQihYw9lsBGBC9ScHONEf3F5hL4G_eSABTwuRDS8DlwfdO2ToEsTcZ73-vQg1ChxuHAzPd8tFgm0hMaR2YvQEix_8t29Ku0_X&req_id=5bdbab92aae961cfbdf7465d'><img class='mainCreative' src='https://win.stage.iqm.com/smaato?raw=mW-fVT2nAH3D1dWJXh2i8EevG6MeEGP6X65YHTwJQ4xb-hH4RTFltpYsvQQ3NwyU_cIkURRE3oWBGn8d2MCPFNgdHu4bhLqHp2X--NT9g0AGI93rTv6JOrE4KX7Zwouj6GFC6ziwzDTVUirKqs-bM5MdPAmbi9ONQihYw9lsBGBC9ScHONEf3F5hL4G_eSAB27rX7yddm6gveXrinvITdKrrsCL6Z2KFNPT5b0XXcEFywmQ29Mi9e0naWSS6JEiEtNl8gTaMug_SLzgZtxhoJ5tmRuNfzO3ZL749sTyGU7R6UqffiNRQ3enOOXFNozI-YUO_g2YzC3WyQvavvuaVrZLWry3QrGvXJMicow51nMuJNa2FdTKHfhSJF5HdfZBc0kcXJ_ioD2439u-8Q9bMkSauDRRTL3YTbwozJFPPFqVxAh_Os6RlYXiEcpf0SFoFo2_-ks52yUlsTL4G34kXA1YUtTiEOdptgbDp0n6Rvq9Hc1kgm37jp-RtyWTj7n2EFpuBUmdnIyMItomcvTd7gQ%3D%3D&req_id=5bdbab92aae961cfbdf7465d&ap=${AUCTION_PRICE}' width='250' height='250'> </a>  </div>    <script type='text/javascript' src='https://q.adrta.com/s/iqm/aa.js?cb=d7011a54-f43d-42bd-be57-8bbfca208ed2#iqm;paid=iqm;avid=100404;caid=169218;plid=301435;siteId=20851;lineItemId={IAA_LINE_ITEM_ID};kv2=www.enotes.com;priceBid=9.9;pricePaid={IAA_PAID_PRICE};publisherId=0;kv1=250x250;kv3=IQBU77n5POSeE_p7t0rqrNcvY8z4LLpJ3bY8p94HdxUX;kv4=71.95.98.65;kv6=5bdbab92aae961cfbdf74653;kv5=smaato;kv10=Cellular+One;kv11=5bdbab92aae961cfbdf7465d;kv12={IAA_PLACEMENT_ID};kv14=3,5;kv16=45.594555;kv17=-121.14975;kv18=0;kv19=8d8303ec-6b62-5d49-bc56-10ff5479219;kv32=20851;kv23={IAA_CARRIER_ID};kv26=ios;kv24=CTV;kv25={IAA_APP_NAME};kv27=Mozilla%2F5.0+%28iPhone%3B+U%3B+CPU+iPhone+OS+4_2_1+like+Mac+OS+X%3B+en-us%29+AppleWebKit%2F533.17.9+%28KHTML%2C+like+Gecko%29+Mobile%2F8C148a;kv28=Apple;kv52=0;kv15=NY;kv7=Unknown'> </script>  </body></html>", width: 250, height: 250}
+      ];
+      let temprequest = spec.buildRequests(validBidRequests_temp, bidderRequest);
+
+      let result = spec.interpretResponse({ body: response }, temprequest[0]);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    let validBidRequests_temp_video =
+      [{bidder: 'iqm', params: {publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a', placementId: 23451, bidfloor: 0.5, video: {placement: 2, mimes: ['video/mp4'], protocols: [2, 5], skipppable: true, playback_method: ['auto_play_sound_off']}}, crumbs: {pubcid: 'cd86c3ff-d630-40e6-83ab-420e9e800594'}, fpd: {context: {pbAdSlot: 'video1'}}, mediaTypes: {video: {playerSize: [[640, 480]], context: 'instream'}}, adUnitCode: 'video1', transactionId: '8335b266-7a41-45f9-86a2-92fdc7cf0cd9', sizes: [[640, 480]], bidId: '26274beff25455', bidderRequestId: '17c5d8c3168761', auctionId: '2c592dcf-7dfc-4823-8203-dd1ebab77fe0', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0}];
+    let bidderRequest_video = {
+      bidderCode: 'iqm',
+      auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
+      bidderRequestId: '16e1ce8481bc6d',
+      bids: [{
+        bidder: 'iqm',
+        params: {
+          publisherId: 'df5fd732-c5f3-11e7-abc4-cec278b6b50a',
+          placementId: 23451,
+          bidfloor: 0.5,
+          video: {
+            placement: 2,
+            mimes: ['video/mp4'],
+            protocols: [2, 5],
+            skipppable: true,
+            playback_method: ['auto_play_sound_off']
+          }
+        },
+        crumbs: {pubcid: '09b8f065-9d1b-4a36-bd0c-ea22e2dad807'},
+        ortb2Imp: {ext: {data: {'pbadslot': 'video1'}}},
+        mediaTypes: {video: {playerSize: [[640, 480]], context: 'instream'}},
+        adUnitCode: 'video1',
+        transactionId: '86795c66-acf9-4dd5-998f-6d5362aaa541',
+        sizes: [[640, 480]],
+        bidId: '28bfb7e2d12897',
+        bidderRequestId: '16e1ce8481bc6d',
+        auctionId: '3140a2ec-d567-4db0-9bbb-eb6fa20ccb71',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0
+      }],
+      auctionStart: 1615271191985,
+      timeout: 3000,
+      refererInfo: {
+        page: 'http://test.localhost:9999/integrationExamples/gpt/pbjs_video_adUnit.html',
+        domain: 'test.localhost.com:9999',
+        ref: '',
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 0,
+        stack: ['http://test.localhost:9999/integrationExamples/gpt/pbjs_video_adUnit.html'],
+        canonicalUrl: null
+      },
+      start: 1615271191988
+    };
+
+    it('handles non-banner media responses', function () {
+      let response = {id: '2341234', seatbid: [{bid: [{id: 'bid-2341234-1', impid: '1', price: 9, nurl: 'https://frontend.stage.iqm.com/static/vast-01.xml', adm: 'http://cdn.iqm.com/pbd?raw=312730_203cf73dc83fb_2824348636878_pbd', adomain: ['app1.stage.iqm.com'], cid: '168900', crid: 'cr-304503', attr: []}]}], bidid: '2341234'};
+
+      let temprequest_video = spec.buildRequests(validBidRequests_temp_video, bidderRequest_video);
+
+      let result = spec.interpretResponse({ body: response }, temprequest_video[0]);
+      expect(result[0]).to.have.property('vastUrl');
+    });
+  });
+});
diff --git a/test/spec/modules/iqzoneBidAdapter_spec.js b/test/spec/modules/iqzoneBidAdapter_spec.js
new file mode 100644
index 00000000000..de0459f4714
--- /dev/null
+++ b/test/spec/modules/iqzoneBidAdapter_spec.js
@@ -0,0 +1,397 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/iqzoneBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'iqzone'
+
+describe('IQZoneBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    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;
+      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://smartssp-us-east.iqzone.com/pbjs');
+    });
+
+    it('Returns general data 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',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      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.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, 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 = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, 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([], bidderRequest);
+      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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.smartssp.iqzone.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.smartssp.iqzone.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 114a2226770..0de300e4a32 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -2,10 +2,12 @@ import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-import { spec } from 'modules/ixBidAdapter.js';
+import { spec, storage, ERROR_CODES, FEATURE_TOGGLES, LOCAL_STORAGE_FEATURE_TOGGLES_KEY } from '../../../modules/ixBidAdapter.js';
+import { createEidsArray } from 'modules/userId/eids.js';
+import { deepAccess, deepClone } from '../../../src/utils.js';
 
 describe('IndexexchangeAdapter', function () {
-  const IX_SECURE_ENDPOINT = 'https://as-sec.casalemedia.com/cygnus';
+  const IX_SECURE_ENDPOINT = 'https://htlb.casalemedia.com/openrtb/pbjs';
   const VIDEO_ENDPOINT_VERSION = 8.1;
   const BANNER_ENDPOINT_VERSION = 7.2;
 
@@ -18,7 +20,6 @@ describe('IndexexchangeAdapter', function () {
         'sid': '00001',
         'hp': 1
       },
-
       {
         'asi': 'indirectseller-2.com',
         'sid': '00002',
@@ -26,6 +27,139 @@ describe('IndexexchangeAdapter', function () {
       }
     ]
   };
+  const LARGE_SET_OF_SIZES = [
+    [300, 250],
+    [600, 410],
+    [336, 280],
+    [400, 300],
+    [320, 50],
+    [360, 360],
+    [250, 250],
+    [320, 250],
+    [400, 250],
+    [387, 359],
+    [300, 50],
+    [372, 250],
+    [320, 320],
+    [412, 412],
+    [327, 272],
+    [312, 260],
+    [384, 320],
+    [335, 250],
+    [366, 305],
+    [374, 250],
+    [375, 375],
+    [272, 391],
+    [364, 303],
+    [414, 414],
+    [366, 375],
+    [272, 360],
+    [364, 373],
+    [366, 359],
+    [320, 100],
+    [360, 250],
+    [468, 60],
+    [480, 300],
+    [600, 400],
+    [600, 300],
+    [33, 28],
+    [40, 30],
+    [32, 5],
+    [36, 36],
+    [25, 25],
+    [320, 25],
+    [400, 25],
+    [387, 35],
+    [300, 5],
+    [372, 20],
+    [320, 32],
+    [412, 41],
+    [327, 27],
+    [312, 26],
+    [384, 32],
+    [335, 25],
+    [366, 30],
+    [374, 25],
+    [375, 37],
+    [272, 31],
+    [364, 303],
+    [414, 41],
+    [366, 35],
+    [272, 60],
+    [364, 73],
+    [366, 59],
+    [320, 10],
+    [360, 25],
+    [468, 6],
+    [480, 30],
+    [600, 40],
+    [600, 30]
+  ];
+
+  const ONE_VIDEO = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '456',
+        video: {
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [2]
+        },
+        size: [400, 100]
+      },
+      sizes: [[400, 100]],
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[400, 100]]
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const ONE_BANNER = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '123',
+        size: [300, 250]
+      },
+      sizes: [[300, 250]],
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47229'
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748561-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47229',
+      bidId: '1a2b3c4d',
+      bidderRequestId: '11a22b33c44d',
+      auctionId: '1aa2bb3cc4dd',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
 
   const DEFAULT_BANNER_VALID_BID = [
     {
@@ -35,11 +169,42 @@ describe('IndexexchangeAdapter', function () {
         size: [300, 250]
       },
       sizes: [[300, 250], [300, 600]],
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]],
+          pos: 0
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47229'
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748561-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47229',
+      bidId: '1a2b3c4d',
+      bidderRequestId: '11a22b33c44d',
+      auctionId: '1aa2bb3cc4dd',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const DEFAULT_BANNER_VALID_BID_PARAM_NO_SIZE = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '123'
+      },
       mediaTypes: {
         banner: {
           sizes: [[300, 250], [300, 600]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47229'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748561-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47229',
       bidId: '1a2b3c4d',
@@ -49,6 +214,40 @@ describe('IndexexchangeAdapter', function () {
     }
   ];
 
+  const DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '456'
+      },
+      sizes: [400, 100],
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[400, 100]],
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [2]
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
   const DEFAULT_VIDEO_VALID_BID = [
     {
       bidder: 'ix',
@@ -60,7 +259,9 @@ describe('IndexexchangeAdapter', function () {
             'video/mp4',
             'video/webm'
           ],
-          minduration: 0
+          minduration: 0,
+          maxduration: 60,
+          protocols: [2]
         },
         size: [400, 100]
       },
@@ -71,6 +272,11 @@ describe('IndexexchangeAdapter', function () {
           playerSize: [[400, 100], [200, 400]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
       bidId: '1a2b3c4e',
@@ -80,777 +286,2633 @@ describe('IndexexchangeAdapter', function () {
     }
   ];
 
-  const DEFAULT_BANNER_BID_RESPONSE = {
-    cur: 'USD',
-    id: '11a22b33c44d',
-    seatbid: [
-      {
-        bid: [
-          {
-            crid: '12345',
-            adomain: ['www.abc.com'],
-            adid: '14851455',
-            impid: '1a2b3c4d',
-            cid: '3051266',
-            price: 100,
-            w: 300,
-            h: 250,
-            id: '1',
-            ext: {
-              dspid: 50,
-              pricelevel: '_100',
-              advbrandid: 303325,
-              advbrand: 'OECTA'
-            },
-            adm: '<a target="_blank" href="https://www.indexexchange.com"></a>'
-          }
-        ],
-        seat: '3970'
-      }
-    ]
-  };
-
-  const DEFAULT_VIDEO_BID_RESPONSE = {
-    cur: 'USD',
-    id: '1aa2bb3cc4de',
-    seatbid: [
-      {
-        bid: [
-          {
-            crid: '12346',
-            adomain: ['www.abcd.com'],
-            adid: '14851456',
-            impid: '1a2b3c4e',
-            cid: '3051267',
-            price: 110,
-            id: '2',
-            ext: {
-              vasturl: 'www.abcd.com/vast',
-              errorurl: 'www.abcd.com/error',
-              dspid: 51,
-              pricelevel: '_110',
-              advbrandid: 303326,
-              advbrand: 'OECTB'
-            }
-          }
-        ],
-        seat: '3971'
-      }
-    ]
-  };
-
-  const DEFAULT_OPTION = {
-    gdprConsent: {
-      gdprApplies: true,
-      consentString: '3huaa11=qu3198ae',
-      vendorData: {}
-    },
-    refererInfo: {
-      referer: 'https://www.prebid.org',
-      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+  const DEFAULT_VIDEO_VALID_BID_MEDIUM_SIZE = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '456',
+        video: {
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [2]
+        },
+        size: [640, 480]
+      },
+      sizes: [[640, 480], [200, 400]],
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[640, 480], [200, 400]]
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
     }
-  };
+  ];
 
-  const DEFAULT_IDENTITY_RESPONSE = {
-    IdentityIp: {
-      responsePending: false,
-      data: {
-        source: 'identityinc.com',
-        uids: [
-          {
-            id: 'identityid'
+  const DEFAULT_MULTIFORMAT_BANNER_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        tagId: '123',
+        siteId: '123',
+        size: [300, 250],
+      },
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [[600, 700]]
+        },
+        banner: {
+          sizes: [[300, 250], [300, 600], [400, 500]]
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230',
+          data: {
+            pbadslot: 'div-gpt-ad-1460505748562-0'
           }
-        ]
-      }
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
     }
-  };
+  ];
 
-  const DEFAULT_BIDDER_REQUEST_DATA = {
-    ac: 'j',
-    r: JSON.stringify({
-      id: '345',
-      imp: [
-        {
-          id: '1a2b3c4e',
-          video: {
-            w: 640,
-            h: 480,
-            placement: 1
+  const DEFAULT_MULTIFORMAT_VIDEO_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        tagId: '123',
+        siteId: '456',
+        video: {
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [1]
+        },
+        size: [300, 250]
+      },
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [[300, 250]]
+        },
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230',
+          data: {
+            pbadslot: 'div-gpt-ad-1460505748562-0'
           }
         }
-      ],
-      site: {
-        ref: 'https://ref.com/ref.html',
-        page: 'https://page.com'
       },
-    }),
-    s: '21',
-    sd: 1,
-    t: 1000,
-    v: 8.1
-  };
-
-  describe('inherited functions', function () {
-    it('should exists and is a function', function () {
-      const adapter = newBidder(spec);
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '273f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const DEFAULT_MULTIFORMAT_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        tagId: '123',
+        siteId: '456',
+        video: {
+          siteId: '1111'
+        },
+        banner: {
+          siteId: '2222'
+        },
+        native: {
+          siteId: '3333'
+        },
+        size: [300, 250]
+      },
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [[300, 250]],
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [1]
+        },
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        },
+        native: {
+          icon: {
+            required: false
+          },
+          title: {
+            len: 25,
+            required: true
+          },
+          body: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          }
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230',
+          data: {
+            pbadslot: 'div-gpt-ad-1460505748562-0'
+          }
+        }
+      },
+      nativeOrtbRequest: {
+        assets: [{id: 0, required: 0, img: {type: 1}}, {id: 1, required: 1, title: {len: 140}}, {id: 2, required: 1, data: {type: 2}}, {id: 3, required: 1, img: {type: 3}}, {id: 4, required: false, video: {mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6]}}]
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '273f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const DEFAULT_NATIVE_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '123',
+        size: [300, 250]
+      },
+      sizes: [[300, 250], [300, 600]],
+      mediaTypes: {
+        native: {
+          icon: {
+            required: false
+          },
+          title: {
+            len: 25,
+            required: true
+          },
+          body: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          video: {
+            required: false,
+            mimes: ['video/mp4', 'video/webm'],
+            minduration: 0,
+            maxduration: 120,
+            protocols: [2, 3, 5, 6]
+          },
+          sponsoredBy: {
+            required: true
+          }
+        }
+      },
+      nativeOrtbRequest: {
+        assets: [{ id: 0, required: 0, img: { type: 1 } }, { id: 1, required: 1, title: { len: 140 } }, { id: 2, required: 1, data: { type: 2 } }, { id: 3, required: 1, img: { type: 3 } }, { id: 4, required: false, video: { mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6] } }]
+      },
+      adUnitCode: 'div-gpt-ad-1460505748563-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47231',
+      bidId: '1a2b3c4f',
+      bidderRequestId: '11a22b33c44f',
+      auctionId: '1aa2bb3cc4df',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const DEFAULT_MULTIFORMAT_NATIVE_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '123',
+        size: [300, 250],
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600], [400, 500]]
+        },
+        native: {
+          title: {
+            required: true
+          },
+          body: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          },
+          icon: {
+            required: false
+          }
+        }
+      },
+      nativeOrtbRequest: {
+        assets: [{ id: 0, required: 0, img: { type: 1 } }, { id: 1, required: 1, title: { len: 140 } }, { id: 2, required: 1, data: { type: 2 } }, { id: 3, required: 1, img: { type: 3 } }, { id: 4, required: false, video: { mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6] } }]
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const DEFAULT_NATIVE_IMP = {
+    request: '{"assets":[{"id":0,"required":0,"img":{"type":1}},{"id":1,"required":1,"title":{"len":140}},{"id":2,"required":1,"data":{"type":2}},{"id":3,"required":1,"img":{"type":3}},{"id":4,"required":false,"video":{"mimes":["video/mp4","video/webm"],"minduration":0,"maxduration":120,"protocols":[2,3,5,6]}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}',
+    ver: '1.2'
+  }
+
+  const DEFAULT_BANNER_BID_RESPONSE = {
+    cur: 'USD',
+    id: '11a22b33c44d',
+    seatbid: [
+      {
+        bid: [
+          {
+            crid: '12345',
+            adomain: ['www.abc.com'],
+            adid: '14851455',
+            impid: '1a2b3c4d',
+            cid: '3051266',
+            price: 100,
+            w: 300,
+            h: 250,
+            id: '1',
+            ext: {
+              dspid: 50,
+              pricelevel: '_100',
+              advbrandid: 303325,
+              advbrand: 'OECTA'
+            },
+            adm: '<a target="_blank" href="https://www.indexexchange.com"></a>'
+          }
+        ],
+        seat: '3970'
+      }
+    ]
+  };
+
+  const DEFAULT_BANNER_BID_RESPONSE_WITHOUT_ADOMAIN = {
+    cur: 'USD',
+    id: '11a22b33c44d',
+    seatbid: [
+      {
+        bid: [
+          {
+            crid: '12345',
+            adid: '14851455',
+            impid: '1a2b3c4d',
+            cid: '3051266',
+            price: 100,
+            w: 300,
+            h: 250,
+            id: '1',
+            ext: {
+              dspid: 50,
+              pricelevel: '_100',
+              advbrandid: 303325,
+              advbrand: 'OECTA'
+            },
+            adm: '<a target="_blank" href="https://www.indexexchange.com"></a>'
+          }
+        ],
+        seat: '3970'
+      }
+    ]
+  };
+
+  const DEFAULT_VIDEO_BID_RESPONSE = {
+    cur: 'USD',
+    id: '1aa2bb3cc4de',
+    seatbid: [
+      {
+        bid: [
+          {
+            crid: '12346',
+            adomain: ['www.abcd.com'],
+            adid: '14851456',
+            impid: '1a2b3c4e',
+            cid: '3051267',
+            price: 110,
+            id: '2',
+            ext: {
+              vasturl: 'www.abcd.com/vast',
+              errorurl: 'www.abcd.com/error',
+              dspid: 51,
+              pricelevel: '_110',
+              advbrandid: 303326,
+              advbrand: 'OECTB'
+            }
+          }
+        ],
+        seat: '3971'
+      }
+    ],
+    ext: {
+      videoplayerurl: 'https://test.com/video-renderer.js'
+    }
+  };
+
+  const DEFAULT_VIDEO_BID_RESPONSE_WITH_MTYPE_SET = {
+    cur: 'USD',
+    id: '1aa2bb3cc4de',
+    seatbid: [
+      {
+        bid: [
+          {
+            crid: '12346',
+            adomain: ['www.abcd.com'],
+            adid: '14851456',
+            impid: '1a2b3c4e',
+            cid: '3051267',
+            price: 110,
+            id: '2',
+            mtype: 2,
+            adm: '<?xml version=\"1.0\" encoding=\"UTF-8\"?><VAST xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"vast.xsd\" version=\"3.0\"> <Ad id=\"488427365\">  <InLine>   <AdSystem>Test</AdSystem>   <AdTitle>In-Stream Video</AdTitle> </InLine> </Ad></VAST',
+            ext: {
+              vasturl: 'www.abcd.com/vast',
+              errorurl: 'www.abcd.com/error',
+              dspid: 51,
+              pricelevel: '_110',
+              advbrandid: 303326,
+              advbrand: 'OECTB'
+            }
+          }
+        ],
+        seat: '3971'
+      }
+    ]
+  };
+
+  const DEFAULT_NATIVE_BID_RESPONSE = {
+    cur: 'USD',
+    id: '11a22b33c44d',
+    seatbid: [
+      {
+        bid: [
+          {
+            crid: '12345',
+            adomain: ['www.abc.com'],
+            adid: '14851455',
+            impid: '1a2b3c4d',
+            cid: '3051266',
+            price: 100,
+            id: '1',
+            ext: {
+              dspid: 50,
+              pricelevel: '_100',
+              advbrandid: 303325,
+              advbrand: 'OECTA'
+            },
+            adm: '{"native":{"ver":"1.2","assets":[{"id":0,"img":{"url":"https://cdn.liftoff.io/customers/1209/creatives/2501-icon-250x250.png","w":250,"h":250}},{"id":1,"img":{"url":"https://cdn.liftoff.io/customers/5a9cab9cc6/image/lambda_png/a0355879b06c09b09232.png","w":1200,"h":627}},{"id":2,"data":{"value":"autodoc.co.uk"}},{"id":3,"data":{"value":"Les pièces automobiles dont vous avez besoin, toujours sous la main."}},{"id":4,"title":{"text":"Autodoc"}},{"id":5,"video":{"vasttag":"<VAST>blah</VAST>"}}],"link":{"url":"https://play.google.com/store/apps/details?id=de.autodoc.gmbh","clicktrackers":["https://click.liftoff.io/v1/campaign_click/blah"]},"eventtrackers":[{"event":1,"method":1,"url":"https://impression-europe.liftoff.io/index/impression"},{"event":1,"method":1,"url":"https://a701.casalemedia.com/impression/v1"}],"privacy":"https://privacy.link.com"}}'
+          }
+        ],
+        seat: '3970'
+      }
+    ]
+  };
+
+  const DEFAULT_OPTION = {
+    gdprConsent: {
+      gdprApplies: true,
+      consentString: '3huaa11=qu3198ae',
+      vendorData: {}
+    },
+    refererInfo: {
+      page: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    }
+  };
+
+  const DEFAULT_IDENTITY_RESPONSE = {
+    IdentityIp: {
+      responsePending: false,
+      data: {
+        source: 'identityinc.com',
+        uids: [
+          {
+            id: 'identityid'
+          }
+        ]
+      }
+    }
+  };
+
+  const DEFAULT_USERID_DATA = {
+    idl_env: '1234-5678-9012-3456', // Liveramp
+    netId: 'testnetid123', // NetId
+    IDP: 'userIDP000', // IDP
+    fabrickId: 'fabrickId9000', // FabrickId
+    // so structured because when calling createEidsArray, UID2's getValue func takes .id to set in uids
+    uid2: { id: 'testuid2' }, // UID 2.0
+    // similar to uid2, but id5's getValue takes .uid
+    id5id: { uid: 'testid5id' } // ID5
+  };
+
+  const DEFAULT_USERIDASEIDS_DATA = createEidsArray(DEFAULT_USERID_DATA);
+
+  const DEFAULT_USERID_PAYLOAD = [
+    {
+      source: 'liveramp.com',
+      uids: [{
+        id: DEFAULT_USERID_DATA.idl_env,
+        ext: {
+          rtiPartner: 'idl'
+        }
+      }]
+    }, {
+      source: 'netid.de',
+      uids: [{
+        id: DEFAULT_USERID_DATA.netId,
+        ext: {
+          rtiPartner: 'NETID'
+        }
+      }]
+    }, {
+      source: 'neustar.biz',
+      uids: [{
+        id: DEFAULT_USERID_DATA.fabrickId,
+        ext: {
+          rtiPartner: 'fabrickId'
+        }
+      }]
+    }, {
+      source: 'zeotap.com',
+      uids: [{
+        id: DEFAULT_USERID_DATA.IDP,
+        ext: {
+          rtiPartner: 'zeotapIdPlus'
+        }
+      }]
+    }, {
+      source: 'uidapi.com',
+      uids: [{
+        id: DEFAULT_USERID_DATA.uid2.id,
+        ext: {
+          rtiPartner: 'UID2'
+        }
+      }]
+    }, {
+      source: 'id5-sync.com',
+      uids: [{
+        id: DEFAULT_USERID_DATA.id5id.uid
+      }]
+    }
+  ];
+
+  const DEFAULT_USERID_BID_DATA = {
+    lotamePanoramaId: 'bd738d136bdaa841117fe9b331bb4'
+  };
+
+  const extractPayload = function (bidRequest) { return bidRequest.data }
+
+  describe('inherited functions', function () {
+    it('should exists and is a function', function () {
+      const adapter = newBidder(spec);
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('getUserSync tests', function () {
+    it('UserSync test : check type = iframe, check usermatch URL', function () {
+      const syncOptions = {
+        'iframeEnabled': true
+      }
+      let userSync = spec.getUserSyncs(syncOptions, []);
+      expect(userSync[0].type).to.equal('iframe');
+      const USER_SYNC_URL = 'https://js-sec.indexww.com/um/ixmatch.html';
+      expect(userSync[0].url).to.equal(USER_SYNC_URL);
+    });
+
+    it('When iframeEnabled = false, default to img', function () {
+      const syncOptions = {
+        'iframeEnabled': false,
+      }
+      let userSync = spec.getUserSyncs(syncOptions, []);
+      expect(userSync[0].type).to.equal('image');
+      const USER_SYNC_URL = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=1&i=0&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      expect(userSync[0].url).to.equal(USER_SYNC_URL);
+    });
+
+    it('UserSync test : check type = pixel, check usermatch URL, no exchange data, only drop 1', function () {
+      const syncOptions = {
+        'pixelEnabled': true
+      }
+      config.setConfig({
+        userSync: {
+          pixelEnabled: true,
+          syncsPerBidder: 3
+        }
+      })
+      let userSync = spec.getUserSyncs(syncOptions, []);
+      expect(userSync[0].type).to.equal('image');
+      const USER_SYNC_URL = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=1&i=0&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      expect(userSync[0].url).to.equal(USER_SYNC_URL);
+    });
+
+    it('UserSync test : check type = pixel, check usermatch URL with override set to 0', function () {
+      const syncOptions = {
+        'pixelEnabled': true
+      }
+      config.setConfig({
+        userSync: {
+          pixelEnabled: true,
+          syncsPerBidder: 3
+        }
+      });
+      let userSync = spec.getUserSyncs(syncOptions, [{ 'body': { 'ext': { 'publishersyncsperbidderoverride': 0 } } }]);
+      expect(userSync.length).to.equal(0);
+    });
+
+    it('UserSync test : check type = pixel, check usermatch URL with override set', function () {
+      const syncOptions = {
+        'pixelEnabled': true
+      }
+      config.setConfig({
+        userSync: {
+          pixelEnabled: true,
+          syncsPerBidder: 3
+        }
+      });
+      let userSync = spec.getUserSyncs(syncOptions, [{ 'body': { 'ext': { 'publishersyncsperbidderoverride': 2 } } }]);
+      expect(userSync[0].type).to.equal('image');
+      const USER_SYNC_URL_0 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=2&i=0&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      const USER_SYNC_URL_1 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=2&i=1&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      expect(userSync[0].url).to.equal(USER_SYNC_URL_0);
+      expect(userSync[1].url).to.equal(USER_SYNC_URL_1);
+      expect(userSync.length).to.equal(2);
+    });
+
+    it('UserSync test : check type = pixel, check usermatch URL with override greater than publisher syncs per bidder , use syncsperbidder', function () {
+      const syncOptions = {
+        'pixelEnabled': true
+      }
+      config.setConfig({
+        userSync: {
+          pixelEnabled: true,
+          syncsPerBidder: 3
+        }
+      });
+      let userSync = spec.getUserSyncs(syncOptions, [{ 'body': { 'ext': { 'publishersyncsperbidderoverride': 4 } } }]);
+      expect(userSync[0].type).to.equal('image');
+      const USER_SYNC_URL_0 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=3&i=0&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      const USER_SYNC_URL_1 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=3&i=1&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      const USER_SYNC_URL_2 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=3&i=2&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      expect(userSync[0].url).to.equal(USER_SYNC_URL_0);
+      expect(userSync[1].url).to.equal(USER_SYNC_URL_1);
+      expect(userSync[2].url).to.equal(USER_SYNC_URL_2);
+      expect(userSync.length).to.equal(3);
+    });
+
+    it('UserSync test : check type = pixel, syncsPerBidder = 0, still use override', function () {
+      const syncOptions = {
+        'pixelEnabled': true
+      }
+      config.setConfig({
+        userSync: {
+          pixelEnabled: true,
+          syncsPerBidder: 0
+        }
+      });
+      let userSync = spec.getUserSyncs(syncOptions, [{ 'body': { 'ext': { 'publishersyncsperbidderoverride': 2 } } }]);
+      expect(userSync[0].type).to.equal('image');
+      const USER_SYNC_URL_0 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=2&i=0&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      const USER_SYNC_URL_1 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=2&i=1&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
+      expect(userSync[0].url).to.equal(USER_SYNC_URL_0);
+      expect(userSync[1].url).to.equal(USER_SYNC_URL_1);
+      expect(userSync.length).to.equal(2);
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return false if outstream player size is less than 144x144 and IX renderer is preferred', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.w = [[300, 143]];
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.mediaTypes.video.w = [[143, 300]];
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false if outstream video w & h  is less than 144x144 and IX renderer is preferred', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.playerSize = [[300, 250]];
+      bid.mediaTypes.video.w = 300;
+      bid.mediaTypes.video.h = 142;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.mediaTypes.video.h = 300;
+      bid.mediaTypes.video.w = 142;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true if outstream player size is less than 300x250 and IX renderer is not preferred', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.renderer = {
+        url: 'test',
+        render: () => { }
+      };
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.playerSize = [[300, 249]];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when required params found for a banner, video or native ad', function () {
+      expect(spec.isBidRequestValid(DEFAULT_BANNER_VALID_BID[0])).to.equal(true);
+      expect(spec.isBidRequestValid(DEFAULT_VIDEO_VALID_BID[0])).to.equal(true);
+      expect(spec.isBidRequestValid(DEFAULT_NATIVE_VALID_BID[0])).to.equal(true);
+    });
+
+    it('should return true when optional bidFloor params found for an ad', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.bidFloor = 50;
+      bid.params.bidFloorCur = 'USD';
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when siteID is number', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.siteId = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when siteID is missing', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      delete bid.params.siteId;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return True when size is missing ', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      delete bid.params.size;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when size array is wrong length', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.size = [
+        300,
+        250,
+        250
+      ];
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when size array is array of strings', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.size = ['300', '250'];
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when mediaTypes.banner does not have sizes', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.mediaTypes = {
+        banner: {
+          size: [[300, 250]]
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when mediaTypes.video.playerSize does not include params.size', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes = {
+        video: {
+          playerSize: [[300, 250]]
+        }
+      };
+      bid.params.size = [100, 200];
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true when mediaTypes.video.playerSize includes params.size', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes = {
+        video: {
+          playerSize: [[300, 250], [200, 300]]
+        }
+      };
+      bid.params.size = [[300, 250]];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when bid.params.size is missing', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.size;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when minduration is missing', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.minduration;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when mediaType is native', function () {
+      const bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID[0]);
+      delete bid.params.mediaTypes;
+      bid.mediaType = 'native';
+      bid.sizes = [[300, 250]];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when mediaType is missing and has sizes', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      delete bid.mediaTypes;
+      bid.sizes = [[300, 250]];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when mediaType is banner', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      delete bid.mediaTypes;
+      bid.mediaType = 'banner';
+      bid.sizes = [[300, 250]];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when mediaType is video', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.mediaTypes;
+      bid.mediaType = 'video';
+      bid.sizes = [[400, 100]];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true for banner bid when there are multiple mediaTypes (banner, outstream)', function () {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true for video bid when there are multiple mediaTypes (banner, outstream)', function () {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('shoult return true for native bid when there are multiple mediaTypes (banner, native)', function () {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_NATIVE_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should return false when there is only bidFloor', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.bidFloor = 50;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when there is only bidFloorCur', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.bidFloorCur = 'USD';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when bidFloor is string', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.bidFloor = '50';
+      bid.params.bidFloorCur = 'USD';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when bidFloorCur is number', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.bidFloor = 50;
+      bid.params.bidFloorCur = 70;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required video properties are missing on both adunit & param levels', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.mimes;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true when required video properties are at the adunit level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.mimes;
+      bid.mediaTypes.video.mimes = ['video/mp4'];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true if protocols exists but protocol doesn\'t', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      delete bid.params.video.protocols;
+      bid.mediaTypes.video.protocols = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true if protocol exists but protocols doesn\'t', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.protocols;
+      bid.params.video.protocol = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      delete bid.params.video.protocol;
+      bid.mediaTypes.video.protocol = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false if both protocol/protocols are missing', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.protocols;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should fail if native openRTB object contains no valid assets', function () {
+      let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID[0]);
+      bid.nativeOrtbRequest = {}
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+
+      bid.nativeOrtbRequest = { assets: [] }
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('Roundel alias adapter', function () {
+    const vaildBids = [DEFAULT_BANNER_VALID_BID, DEFAULT_VIDEO_VALID_BID, DEFAULT_MULTIFORMAT_BANNER_VALID_BID, DEFAULT_MULTIFORMAT_VIDEO_VALID_BID];
+    const ALIAS_OPTIONS = Object.assign({
+      bidderCode: 'roundel'
+    }, DEFAULT_OPTION);
+
+    it('should not build requests for mediaTypes if liveramp data is unavaliable', function () {
+      vaildBids.forEach((validBid) => {
+        const request = spec.buildRequests(validBid, ALIAS_OPTIONS);
+        expect(request).to.be.an('array');
+        expect(request).to.have.lengthOf(0);
+      });
+    });
+
+    it('should build requests for mediaTypes if liveramp data is avaliable', function () {
+      vaildBids.forEach((validBid) => {
+        const cloneValidBid = utils.deepClone(validBid);
+        cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+        const request = spec.buildRequests(cloneValidBid, ALIAS_OPTIONS);
+        const payload = extractPayload(request[0]);
+        expect(request).to.be.an('array');
+        expect(request).to.have.lengthOf.above(0); // should be 1 or more
+        expect(payload.user.eids).to.have.lengthOf(6);
+        expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      });
+    });
+  });
+
+  describe('buildRequestsIdentity', function () {
+    let request;
+    let payload;
+    let testCopy;
+
+    beforeEach(function () {
+      window.headertag = {};
+      window.headertag.getIdentityInfo = function () {
+        return testCopy;
+      };
+      request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+      payload = extractPayload(request);
+    });
+
+    afterEach(function () {
+      delete window.headertag;
+    });
+
+    describe('buildRequestSingleRTI', function () {
+      before(function () {
+        testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
+      });
+
+      it('payload should have correct format and value (single identity partner)', function () {
+        expect(payload.user).to.exist;
+        expect(payload.user.eids).to.exist;
+        expect(payload.user.eids).to.be.an('array');
+        expect(payload.user.eids).to.have.lengthOf(1);
+      });
+
+      it('identity data in impression should have correct format and value (single identity partner)', function () {
+        const impression = payload.user.eids;
+        expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
+        expect(impression[0].uids[0].id).to.equal(testCopy.IdentityIp.data.uids[0].id);
+      });
+    });
+
+    describe('buildRequestMultipleIds', function () {
+      before(function () {
+        testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
+        testCopy.IdentityIp.data.uids.push(
+          {
+            id: '1234567'
+          },
+          {
+            id: '2019-04-01TF2:34:41'
+          }
+        );
+      });
+
+      it('payload should have correct format and value (single identity w/ multi ids)', function () {
+        expect(payload.user).to.exist;
+        expect(payload.user.eids).to.exist;
+        expect(payload.user.eids).to.be.an('array');
+        expect(payload.user.eids).to.have.lengthOf(1);
+      });
+
+      it('identity data in impression should have correct format and value (single identity w/ multi ids)', function () {
+        const impression = payload.user.eids;
+
+        expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
+        expect(impression[0].uids).to.have.lengthOf(3);
+      });
+    });
+
+    describe('buildRequestMultipleRTI', function () {
+      before(function () {
+        testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
+        testCopy.JackIp = {
+          responsePending: false,
+          data: {
+            source: 'jackinc.com',
+            uids: [
+              {
+                id: 'jackid'
+              }
+            ]
+          }
+        }
+        testCopy.GenericIp = {
+          responsePending: false,
+          data: {
+            source: 'genericip.com',
+            uids: [
+              {
+                id: 'genericipenvelope'
+              }
+            ]
+          }
+        }
+      });
+
+      it('payload should have correct format and value (multiple identity partners)', function () {
+        expect(payload.user).to.exist;
+        expect(payload.user.eids).to.exist;
+        expect(payload.user.eids).to.be.an('array');
+        expect(payload.user.eids).to.have.lengthOf(3);
+      });
+
+      it('identity data in impression should have correct format and value (multiple identity partners)', function () {
+        const impression = payload.user.eids;
+
+        expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
+        expect(impression[0].uids).to.have.lengthOf(1);
+
+        expect(impression[1].source).to.equal(testCopy.JackIp.data.source);
+        expect(impression[1].uids).to.have.lengthOf(1);
+
+        expect(impression[2].source).to.equal(testCopy.GenericIp.data.source);
+        expect(impression[2].uids).to.have.lengthOf(1);
+      });
+    });
+
+    describe('buildRequestNoData', function () {
+      beforeEach(function () {
+        testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
+      });
+
+      it('payload should not have any user eids with an undefined identity data response', function () {
+        window.headertag.getIdentityInfo = function () {
+          return undefined;
+        };
+        request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+        payload = extractPayload(request);
+
+        expect(payload.user).to.exist;
+        expect(payload.user.eids).to.not.exist;
+      });
+
+      it('payload should have user eids if least one partner data is available', function () {
+        testCopy.GenericIp = {
+          responsePending: true,
+          data: {}
+        }
+        request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+        payload = extractPayload(request);
+
+        expect(payload.user).to.exist;
+        expect(payload.user.eids).to.exist;
+      });
+
+      it('payload should not have any user eids if identity data is pending for all partners', function () {
+        testCopy.IdentityIp.responsePending = true;
+        request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+        payload = extractPayload(request);
+
+        expect(payload.user).to.exist;
+        expect(payload.user.eids).to.not.exist;
+      });
+
+      it('payload should not have any user eids if identity data is pending or not available for all partners', function () {
+        testCopy.IdentityIp.responsePending = false;
+        testCopy.IdentityIp.data = {};
+        request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+        payload = extractPayload(request);
+
+        expect(payload.user).to.exist;
+        expect(payload.user.eids).to.not.exist;
+      });
+    });
   });
 
-  describe('getUserSync tests', function () {
-    it('UserSync test : check type = iframe, check usermatch URL', function () {
-      const syncOptions = {
-        'iframeEnabled': true
-      }
-      let userSync = spec.getUserSyncs(syncOptions);
-      expect(userSync[0].type).to.equal('iframe');
-      const USER_SYNC_URL = 'https://js-sec.indexww.com/um/ixmatch.html';
-      expect(userSync[0].url).to.equal(USER_SYNC_URL);
+  describe('buildRequestsUserId', function () {
+    let validIdentityResponse;
+    let validUserIdPayload;
+
+    beforeEach(function () {
+      window.headertag = {};
+      window.headertag.getIdentityInfo = function () {
+        return validIdentityResponse;
+      };
     });
 
-    it('When iframeEnabled is false, no userSync should be returned', function () {
-      const syncOptions = {
-        'iframeEnabled': false
-      }
-      let userSync = spec.getUserSyncs(syncOptions);
-      expect(userSync).to.be.an('array').that.is.empty;
+    afterEach(function () {
+      delete window.headertag;
     });
-  });
 
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found for a banner or video ad', function () {
-      expect(spec.isBidRequestValid(DEFAULT_BANNER_VALID_BID[0])).to.equal(true);
-      expect(spec.isBidRequestValid(DEFAULT_VIDEO_VALID_BID[0])).to.equal(true);
+    it('IX adapter reads supported user modules from Prebid and adds it to Video', function () {
+      const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = extractPayload(request);
+
+      expect(payload.user.eids).to.have.lengthOf(6);
+      expect(payload.user.eids).to.have.deep.members(DEFAULT_USERID_PAYLOAD);
     });
 
-    it('should return true when optional bidFloor params found for an ad', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.bidFloor = 50;
-      bid.params.bidFloorCur = 'USD';
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    it('We continue to send in IXL identity info and Prebid takes precedence over IXL', function () {
+      validIdentityResponse = {
+        AdserverOrgIp: {
+          responsePending: false,
+          data: {
+            source: 'adserver.org',
+            uids: [
+              {
+                id: '1234-5678-9012-3456',
+                ext: {
+                  rtiPartner: 'TDID'
+                }
+              },
+              {
+                id: 'FALSE',
+                ext: {
+                  rtiPartner: 'TDID_LOOKUP'
+                }
+              },
+              {
+                id: '2020-06-24T14:43:48.860Z',
+                ext: {
+                  rtiPartner: 'TDID_CREATED_AT'
+                }
+              }
+            ]
+          }
+        },
+        MerkleIp: {
+          responsePending: false,
+          data: {
+            source: 'merkle.com',
+            uids: [{
+              id: '1234-5678-9012-3456',
+              ext: {
+                keyID: '1234-5678',
+                enc: 1
+              }
+            }]
+          }
+        },
+        LiveRampIp: {
+          source: 'liveramp.com',
+          uids: [
+            {
+              id: '0000-1234-4567-8901',
+              ext: {
+                rtiPartner: 'idl'
+              }
+            }
+          ]
+        },
+        NetIdIp: {
+          source: 'netid.de',
+          uids: [
+            {
+              id: 'testnetid',
+              ext: {
+                rtiPartner: 'NETID'
+              }
+            }
+          ]
+        },
+        NeustarIp: {
+          source: 'neustar.biz',
+          uids: [
+            {
+              id: 'testfabrick',
+              ext: {
+                rtiPartner: 'fabrickId'
+              }
+            }
+          ]
+        },
+        ZeotapIp: {
+          source: 'zeotap.com',
+          uids: [
+            {
+              id: 'testzeotap',
+              ext: {
+                rtiPartner: 'zeotapIdPlus'
+              }
+            }
+          ]
+        }
+      };
+
+      const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = extractPayload(request);
+
+      validUserIdPayload = utils.deepClone(DEFAULT_USERID_PAYLOAD);
+      validUserIdPayload.push({
+        source: 'merkle.com',
+        uids: [{
+          id: '1234-5678-9012-3456',
+          ext: {
+            keyID: '1234-5678',
+            enc: 1
+          }
+        }]
+      })
+      validUserIdPayload.push({
+        source: 'adserver.org',
+        uids: [
+          {
+            id: '1234-5678-9012-3456',
+            ext: {
+              rtiPartner: 'TDID'
+            }
+          },
+          {
+            id: 'FALSE',
+            ext: {
+              rtiPartner: 'TDID_LOOKUP'
+            }
+          },
+          {
+            id: '2020-06-24T14:43:48.860Z',
+            ext: {
+              rtiPartner: 'TDID_CREATED_AT'
+            }
+          }
+        ]
+      })
+
+      expect(payload.user).to.exist;
+      expect(payload.user.eids).to.have.lengthOf(8);
+
+      expect(payload.user.eids).to.have.deep.members(validUserIdPayload);
     });
 
-    it('should return true when siteID is number', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.siteId = 123;
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    it('IXL and Prebid are mutually exclusive', function () {
+      validIdentityResponse = {
+        LiveIntentIp: {
+          responsePending: false,
+          data: {
+            source: 'liveintent.com',
+            uids: [{
+              id: '1234-5678-9012-3456',
+              ext: {
+                keyID: '1234-5678',
+                rtiPartner: 'LDID',
+                enc: 1
+              }
+            }]
+          }
+        }
+      };
+
+      const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+
+      validUserIdPayload = utils.deepClone(DEFAULT_USERID_PAYLOAD);
+      validUserIdPayload.push({
+        source: 'liveintent.com',
+        uids: [{
+          id: '1234-5678-9012-3456',
+          ext: {
+            keyID: '1234-5678',
+            rtiPartner: 'LDID',
+            enc: 1
+          }
+        }]
+      });
+
+      const payload = extractPayload(request);
+      expect(payload.user.eids).to.have.lengthOf(7);
+      expect(payload.user.eids).to.have.deep.members(validUserIdPayload);
     });
+  });
+
+  describe('getUserIds', function () {
+    it('request should contain userId information if configured and within bid request', function () {
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            { name: 'lotamePanoramaId' },
+            { name: 'merkleId' },
+            { name: 'parrableId' },
+          ]
+        }
+      });
 
-    it('should return false when siteID is missing', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      delete bid.params.siteId;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.userId = DEFAULT_USERID_BID_DATA;
+
+      const request = spec.buildRequests([bid], DEFAULT_OPTION)[0];
+      const r = extractPayload(request);
+
+      expect(r.ext.ixdiag.userIds).to.be.an('array');
+      expect(r.ext.ixdiag.userIds.should.not.include('lotamePanoramaId'));
+      expect(r.ext.ixdiag.userIds.should.not.include('merkleId'));
+      expect(r.ext.ixdiag.userIds.should.not.include('parrableId'));
     });
+  });
 
-    it('should return false when size is missing', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      delete bid.params.size;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+  describe('First party data', function () {
+    it('should not set ixdiag.fpd value if not defined', function () {
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2: {} })[0];
+      const r = extractPayload(request);
+
+      expect(r.ext.ixdiag.fpd).to.be.undefined;
     });
 
-    it('should return false when size array is wrong length', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.size = [
-        300,
-        250,
-        250
-      ];
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('should set ixdiag.fpd value if it exists using ortb2', function () {
+      const ortb2 = {
+        site: {
+          ext: {
+            data: {
+              pageType: 'article'
+            }
+          }
+        }
+      };
+
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2 })[0];
+      const r = extractPayload(request);
+
+      expect(r.ext.ixdiag.fpd).to.exist;
     });
 
-    it('should return false when size array is array of strings', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.size = ['300', '250'];
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('should set ixdiag.tmax value if it exists using tmax', function () {
+      config.setConfig({
+        bidderTimeout: 250
+      });
+
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID)[0];
+      const r = extractPayload(request);
+
+      expect(r.ext.ixdiag.tmax).to.equal(250);
     });
 
-    it('should return false when mediaTypes is not banner or video', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.mediaTypes = {
-        native: {
-          sizes: [[300, 250]]
+    it('should not set ixdiag.tmax value if bidderTimeout is undefined', function () {
+      config.setConfig({
+        bidderTimeout: null
+      })
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID)[0];
+      const r = extractPayload(request);
+
+      expect(r.ext.ixdiag.tmax).to.be.undefined
+    });
+
+    it('should set ixdiag.imps to number of impressions', function () {
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID)[0];
+      const r = extractPayload(request);
+
+      expect(r.ext.ixdiag.imps).to.equal(1);
+    });
+
+    it('should not send information that is not part of openRTB spec v2.5 using ortb2', function () {
+      const ortb2 = {
+        site: {
+          keywords: 'power tools, drills',
+          search: 'drill',
+          testProperty: 'test_string'
+        },
+        user: {
+          keywords: ['a'],
+          testProperty: 'test_string'
         }
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2 })[0];
+      const r = extractPayload(request);
+
+      expect(r.site.keywords).to.exist;
+      expect(r.site.search).to.exist;
+      expect(r.site.testProperty).to.be.undefined;
+      expect(r.user.keywords).to.exist;
+      expect(r.user.testProperty).to.be.undefined;
     });
 
-    it('should return false when mediaTypes.banner does not have sizes', function () {
+    it('should not add fpd data to r object if it exceeds maximum request', function () {
+      const ortb2 = {
+        site: {
+          keywords: 'power tools, drills',
+          search: 'drill',
+        },
+        user: {
+          keywords: Array(1200).join('#'),
+        }
+      };
+
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.mediaTypes = {
-        banner: {
-          size: [[300, 250]]
+      bid.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+
+      const request = spec.buildRequests([bid], { ortb2 })[0];
+      const r = extractPayload(request);
+
+      expect(r.site.ref).to.exist;
+      expect(r.site.keywords).to.be.undefined;
+      expect(r.user).to.be.undefined;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+    const requestUrl = request.url;
+    const requestMethod = request.method;
+    const payloadData = request.data;
+
+    const bidWithoutSchain = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+    delete bidWithoutSchain[0].schain;
+    const requestWithoutSchain = spec.buildRequests(bidWithoutSchain, DEFAULT_OPTION)[0];
+    const payloadWithoutSchain = extractPayload(requestWithoutSchain);
+    const GPID = '/19968336/some-adunit-path';
+
+    it('request should be made to IX endpoint with POST method and siteId in query param', function () {
+      expect(requestMethod).to.equal('POST');
+      expect(requestUrl).to.equal(IX_SECURE_ENDPOINT + '?s=' + DEFAULT_BANNER_VALID_BID[0].params.siteId);
+      expect(request.option.contentType).to.equal('text/plain')
+    });
+
+    it('auction type should be set correctly', function () {
+      const at = payloadData.at;
+      expect(at).to.equal(1);
+    })
+
+    it('should send dfp_adunit_code in request if ortb2Imp.ext.data.adserver.adslot exists', function () {
+      const AD_UNIT_CODE = '/19968336/some-adunit-path';
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      validBids[0].ortb2Imp = {
+        ext: {
+          data: {
+            adserver: {
+              name: 'gam',
+              adslot: AD_UNIT_CODE
+            }
+          }
         }
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const { ext: { dfp_ad_unit_code } } = extractPayload(requests[0]).imp[0];
+      expect(dfp_ad_unit_code).to.equal(AD_UNIT_CODE);
     });
 
-    it('should return false when mediaTypes.video does not have sizes', function () {
-      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
-      bid.mediaTypes = {
-        video: {
-          size: [[300, 250]]
+    it('should send gpid in request if ortb2Imp.ext.gpid exists', function () {
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      validBids[0].ortb2Imp = {
+        ext: {
+          gpid: GPID
         }
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const { ext: { gpid } } = extractPayload(requests[0]).imp[0];
+      expect(gpid).to.equal(GPID);
     });
 
-    it('should return false when mediaType is native', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      delete bid.params.mediaTypes;
-      bid.mediaType = 'native';
-      bid.sizes = [[300, 250]];
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('should send gpid in request if ortb2Imp.ext.gpid exists when no size present', function () {
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID_PARAM_NO_SIZE);
+      validBids[0].ortb2Imp = {
+        ext: {
+          gpid: GPID
+        }
+      };
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const { ext: { gpid } } = extractPayload(requests[0]).imp[0];
+      expect(gpid).to.equal(GPID);
     });
 
-    it('should return true when mediaType is missing and has sizes', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      delete bid.mediaTypes;
-      bid.sizes = [[300, 250]];
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    it('should not send dfp_adunit_code in request if ortb2Imp.ext.data.adserver.adslot does not exists', function () {
+      const GPID = '/19968336/some-adunit-path';
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      validBids[0].ortb2Imp = {
+        ext: {
+          gpid: GPID
+        }
+      };
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const imp = extractPayload(requests[0]).imp[0];
+      expect(deepAccess(imp, 'ext.dfp_ad_unit_code')).to.not.exist;
     });
 
-    it('should return true when mediaType is banner', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      delete bid.mediaTypes;
-      bid.mediaType = 'banner';
-      bid.sizes = [[300, 250]];
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    it('should not send gpid in request if ortb2Imp.ext.gpid does not exists', function () {
+      const AD_UNIT_CODE = '/19968336/some-adunit-path';
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      validBids[0].ortb2Imp = {
+        ext: {
+          data: {
+            adserver: {
+              name: 'gam',
+              adslot: AD_UNIT_CODE
+            }
+          }
+        }
+      };
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const imp = extractPayload(requests[0]).imp[0];
+      expect(deepAccess(imp, 'ext.gpid')).to.not.exist;
+    });
+
+    it('should send gpid & dfp_adunit_code if they exist in ortb2Imp.ext', function () {
+      const AD_UNIT_CODE = '/1111/home';
+      const GPID = '/1111/home-left';
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      validBids[0].ortb2Imp = {
+        ext: {
+          gpid: GPID,
+          data: {
+            adserver: {
+              name: 'gam',
+              adslot: AD_UNIT_CODE
+            }
+          }
+        }
+      };
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const imp = extractPayload(requests[0]).imp[0];
+      expect(deepAccess(imp, 'ext.gpid')).to.equal(GPID);
+      expect(deepAccess(imp, 'ext.dfp_ad_unit_code')).to.equal(AD_UNIT_CODE);
+    });
+
+    it('payload should have correct format and value', function () {
+      const payload = payloadData;
+      expect(payload.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidderRequestId);
+      expect(payload.id).to.be.a('string');
+      expect(payload.site.page).to.equal(DEFAULT_OPTION.refererInfo.page);
+      expect(payload.site.ref).to.equal(document.referrer);
+      expect(payload.ext.source).to.equal('prebid');
+      expect(payload.source.ext.schain).to.deep.equal(SAMPLE_SCHAIN);
+      expect(payload.imp).to.be.an('array');
+      expect(payload.imp).to.have.lengthOf(1);
+      expect(payload.source.tid).to.equal(DEFAULT_BANNER_VALID_BID[0].auctionId);
+    });
+
+    it('payload should have correct format and value for r.id when bidderRequestId is a number ', function () {
+      const bidWithIntId = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      bidWithIntId[0].bidderRequestId = 123456;
+
+      request = spec.buildRequests(bidWithIntId, DEFAULT_OPTION)[0];
+
+      const payload = extractPayload(request);
+      expect(bidWithIntId[0].bidderRequestId).to.be.a('number');
+      expect(payload.id).to.equal(bidWithIntId[0].bidderRequestId.toString());
+      expect(payload.id).to.be.a('string');
+    });
+
+    it('payload should have correct format and value for r.id when bidderRequestId is a number ', function () {
+      const bidWithIntId = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      bidWithIntId[0].bidderRequestId = 123456;
+
+      request = spec.buildRequests(bidWithIntId, DEFAULT_OPTION)[0];
+
+      const payload = extractPayload(request);
+      expect(bidWithIntId[0].bidderRequestId).to.be.a('number');
+      expect(payload.id).to.equal(bidWithIntId[0].bidderRequestId.toString());
+      expect(payload.id).to.be.a('string');
     });
 
-    it('should return true when mediaType is video', function () {
-      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
-      delete bid.mediaTypes;
-      bid.mediaType = 'video';
-      bid.sizes = [[400, 100]];
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    it('payload should not include schain when not provided', function () {
+      const payload = payloadWithoutSchain;
+
+      const actualSchain = (((payload || {}).source || {}).ext || {}).schain;
+      expect(actualSchain).to.not.exist;
     });
 
-    it('should return false when there is only bidFloor', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.bidFloor = 50;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    it('impression should have correct format and value', function () {
+      const impression = payloadData.imp[0];
+      const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
+
+      expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
+      expect(impression.banner.format).to.be.length(2);
+      expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+      expect(impression.banner.pos).to.equal(0);
+      expect(impression.ext.tid).to.equal(DEFAULT_BANNER_VALID_BID[0].transactionId);
+      expect(impression.ext.sid).to.equal(sidValue);
+
+      impression.banner.format.map(({ w, h, ext }, index) => {
+        const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
+
+        expect(w).to.equal(size[0]);
+        expect(h).to.equal(size[1]);
+        expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
+      });
     });
 
-    it('should return false when there is only bidFloorCur', function () {
+    it('payload should have imp[].banner.format[].ext.siteID as string ', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.bidFloorCur = 'USD';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params.siteId = 1234;
+
+      request = spec.buildRequests([bid], DEFAULT_OPTION)[0];
+
+      const payload = extractPayload(request);
+      payload.imp[0].banner.format.forEach((imp) => {
+        expect(imp.ext.siteID).to.be.a('string');
+      });
     });
 
-    it('should return false when bidFloor is string', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.bidFloor = '50';
-      bid.params.bidFloorCur = 'USD';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    describe('build requests with price floors', () => {
+      const highFloor = 4.5;
+      const lowFloor = 3.5;
+      const currency = 'USD';
+
+      it('video impression should contain floors from priceFloors module', function () {
+        const bid = utils.deepClone(ONE_VIDEO[0]);
+        const expectedFloor = 3.25;
+        bid.getFloor = () => ({ floor: expectedFloor, currency });
+        const request = spec.buildRequests([bid], {})[0];
+        const impression = extractPayload(request).imp[0];
+
+        expect(impression.bidfloor).to.equal(expectedFloor);
+        expect(impression.bidfloorcur).to.equal(currency);
+        expect(impression.ext.fl).to.equal('p');
+      });
+
+      it('banner impression should contain floors from priceFloors module', function () {
+        const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0])
+        const expectedFloor = 3.25;
+        bid.getFloor = () => ({ floor: expectedFloor, currency });
+        const request = spec.buildRequests([bid], {})[0];
+        const impression = extractPayload(request).imp[0];
+
+        expect(impression.bidfloor).to.equal(expectedFloor);
+        expect(impression.bidfloorcur).to.equal(currency);
+        expect(impression.banner.format[0].ext.fl).to.equal('p');
+      });
+
+      it('should default to ix floors when priceFloors Module is not implemented', function () {
+        const bid = utils.deepClone(ONE_BANNER[0]);
+        bid.params.bidFloor = highFloor;
+        bid.params.bidFloorCur = 'USD'
+        const request = spec.buildRequests([bid], {})[0];
+        const impression = extractPayload(request).imp[0];
+
+        expect(impression.bidfloor).to.equal(highFloor);
+        expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
+        expect(impression.banner.format[0].ext.fl).to.equal('x');
+      });
+
+      it('should prioritize priceFloors Module over IX param floors', function () {
+        const bid = utils.deepClone(ONE_BANNER[0]);
+        bid.params.bidFloor = lowFloor;
+        bid.params.bidFloorCur = 'USD';
+        const expectedFloor = highFloor;
+        bid.getFloor = () => ({ floor: expectedFloor, currency });
+        const requestBidFloor = spec.buildRequests([bid], {})[0];
+        const impression = extractPayload(requestBidFloor).imp[0];
+
+        expect(impression.bidfloor).to.equal(highFloor);
+        expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
+        expect(impression.banner.format[0].ext.fl).to.equal('p');
+      });
+
+      it('impression should have bidFloor and bidFloorCur if configured', function () {
+        const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+        bid.params.bidFloor = 50;
+        bid.params.bidFloorCur = 'USD';
+        const requestBidFloor = spec.buildRequests([bid], {})[0];
+        const impression = extractPayload(requestBidFloor).imp[0];
+
+        expect(impression.bidfloor).to.equal(bid.params.bidFloor);
+        expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
+        expect(impression.banner.format[0].ext.fl).to.equal('x');
+      });
+
+      it('banner multi size impression should have bidFloor both in imp and format ext obejcts', function () {
+        const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+        bid.params.bidFloor = 50;
+        bid.params.bidFloorCur = 'USD';
+        const requestBidFloor = spec.buildRequests([bid], {})[0];
+        const impression = extractPayload(requestBidFloor).imp[0];
+
+        expect(impression.bidfloor).to.equal(bid.params.bidFloor);
+        expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
+        expect(impression.banner.format[0].ext.bidfloor).to.equal(50);
+      });
+
+      it('missing sizes impressions should contain floors from priceFloors module ', function () {
+        const bid = utils.deepClone(ONE_BANNER[0]);
+        bid.mediaTypes.banner.sizes.push([500, 400])
+
+        const expectedFloor = 3.25;
+        bid.getFloor = () => ({ floor: expectedFloor, currency });
+
+        sinon.spy(bid, 'getFloor');
+
+        const requestBidFloor = spec.buildRequests([bid], {})[0];
+        expect(bid.getFloor.getCall(0).args[0].mediaType).to.equal('banner');
+        expect(bid.getFloor.getCall(0).args[0].size[0]).to.equal(300);
+        expect(bid.getFloor.getCall(0).args[0].size[1]).to.equal(250);
+
+        expect(bid.getFloor.getCall(1).args[0].mediaType).to.equal('banner');
+        expect(bid.getFloor.getCall(1).args[0].size[0]).to.equal(500);
+        expect(bid.getFloor.getCall(1).args[0].size[1]).to.equal(400);
+
+        const impression = extractPayload(requestBidFloor).imp[0];
+        expect(impression.bidfloor).to.equal(expectedFloor);
+        expect(impression.bidfloorcur).to.equal(currency);
+      });
+
+      it('banner impressions should have pricefloors in AdUnit', function () {
+        const bid = utils.deepClone(ONE_BANNER[0]);
+
+        const expectedFloor = 4.3;
+        bid.floors = {
+          currency: 'USD',
+          schema: {
+            delimiter: '|',
+            fields: ['mediaType', 'size']
+          },
+          values: {
+            'banner|300x250': expectedFloor,
+            'banner|600x500': 6.5,
+            'banner|*': 7.5
+          }
+        };
+        bid.getFloor = () => ({ floor: expectedFloor, currency });
+
+        sinon.spy(bid, 'getFloor');
+
+        const requestBidFloor = spec.buildRequests([bid], {})[0];
+        expect(bid.getFloor.getCall(0).args[0].mediaType).to.equal('banner');
+        expect(bid.getFloor.getCall(0).args[0].size[0]).to.equal(300);
+        expect(bid.getFloor.getCall(0).args[0].size[1]).to.equal(250);
+
+        const impression = extractPayload(requestBidFloor).imp[0];
+        expect(impression.bidfloor).to.equal(expectedFloor);
+        expect(impression.bidfloorcur).to.equal(currency);
+      });
     });
 
-    it('should return false when bidFloorCur is number', function () {
+    it('impression should have sid if id is configured as number', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.bidFloor = 50;
-      bid.params.bidFloorCur = 70;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      bid.params.id = 50;
+      const requestBidFloor = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
+
+      expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
+      expect(impression.banner.format[0].w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
+      expect(impression.banner.format[0].h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
+      expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+      expect(impression.banner.format[0].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
+      expect(impression.ext.sid).to.equal('50');
     });
-  });
 
-  describe('buildRequestsIdentity', function () {
-    let request;
-    let query;
-    let testCopy;
+    it('impression should have sid if id is configured as string', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.id = 'abc';
+      const requestBidFloor = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
 
-    beforeEach(function () {
-      window.headertag = {};
-      window.headertag.getIdentityInfo = function () {
-        return testCopy;
-      };
-      request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-      query = request.data;
-    });
-    afterEach(function () {
-      delete window.headertag;
+      expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
+      expect(impression.banner.format[0].w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
+      expect(impression.banner.format[0].h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
+      expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+      expect(impression.banner.format[0].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
+      expect(impression.ext.sid).to.equal('abc');
     });
-    describe('buildRequestSingleRTI', function () {
-      before(function () {
-        testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
-      });
-      it('payload should have correct format and value (single identity partner)', function () {
-        const payload = JSON.parse(query.r);
 
-        expect(payload.user).to.exist;
-        expect(payload.user.eids).to.exist;
-        expect(payload.user.eids).to.be.an('array');
-        expect(payload.user.eids).to.have.lengthOf(1);
+    describe('first party data', () => {
+      beforeEach(() => {
+        config.resetConfig();
       });
 
-      it('identity data in impression should have correct format and value (single identity partner)', function () {
-        const impression = JSON.parse(query.r).user.eids;
-        expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
-        expect(impression[0].uids[0].id).to.equal(testCopy.IdentityIp.data.uids[0].id);
+      it('should add first party data to page url in bid request if it exists in config', function () {
+        config.setConfig({
+          ix: {
+            firstPartyData: {
+              ab: 123,
+              cd: '123#ab',
+              'e/f': 456,
+              'h?g': '456#cd'
+            }
+          }
+        });
+
+        const requestWithFirstPartyData = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+        const pageUrl = extractPayload(requestWithFirstPartyData).site.page;
+        const expectedPageUrl = DEFAULT_OPTION.refererInfo.page + '?ab=123&cd=123%23ab&e%2Ff=456&h%3Fg=456%23cd';
+        expect(pageUrl).to.equal(expectedPageUrl);
       });
-    });
 
-    describe('buildRequestMultipleIds', function () {
-      before(function () {
-        testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
-        testCopy.IdentityIp.data.uids.push(
-          {
-            id: '1234567'
-          },
-          {
-            id: '2019-04-01TF2:34:41'
+      it('should not set first party data if it is not an object', function () {
+        config.setConfig({
+          ix: {
+            firstPartyData: 500
           }
-        );
+        });
+
+        const requestFirstPartyDataNumber = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+        const pageUrl = extractPayload(requestFirstPartyDataNumber).site.page;
+
+        expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.page);
       });
-      it('payload should have correct format and value (single identity w/ multi ids)', function () {
-        const payload = JSON.parse(query.r);
 
-        expect(payload.user).to.exist;
-        expect(payload.user.eids).to.exist;
-        expect(payload.user.eids).to.be.an('array');
-        expect(payload.user.eids).to.have.lengthOf(1);
+      it('should not set first party or timeout if it is not present', function () {
+        config.setConfig({
+          ix: {}
+        });
+
+        const requestWithoutConfig = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+        const pageUrl = extractPayload(requestWithoutConfig).site.page;
+
+        expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.page);
+        expect(requestWithoutConfig.data.t).to.be.undefined;
       });
 
-      it('identity data in impression should have correct format and value (single identity w/ multi ids)', function () {
-        const impression = JSON.parse(query.r).user.eids;
+      it('should not set first party or timeout if it is setConfig is not called', function () {
+        const requestWithoutConfig = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+        const pageUrl = extractPayload(requestWithoutConfig).site.page;
 
-        expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
-        expect(impression[0].uids).to.have.lengthOf(3);
+        expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.page);
+        expect(requestWithoutConfig.data.t).to.be.undefined;
       });
-    });
 
-    describe('buildRequestMultipleRTI', function () {
-      before(function () {
-        testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
-        testCopy.JackIp = {
-          responsePending: false,
-          data: {
-            source: 'jackinc.com',
-            uids: [
-              {
-                id: 'jackid'
-              }
-            ]
-          }
-        }
-        testCopy.GenericIp = {
-          responsePending: false,
-          data: {
-            source: 'genericip.com',
-            uids: [
-              {
-                id: 'genericipenvelope'
-              }
-            ]
+      it('should no longer set timeout even if publisher set it through setConfig', function () {
+        config.setConfig({
+          ix: {
+            timeout: 500
           }
-        }
+        });
+        const requestWithTimeout = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {})[0];
+
+        expect(requestWithTimeout.data.t).to.be.undefined;
       });
-      it('payload should have correct format and value (multiple identity partners)', function () {
-        const payload = JSON.parse(query.r);
 
-        expect(payload.user).to.exist;
-        expect(payload.user.eids).to.exist;
-        expect(payload.user.eids).to.be.an('array');
-        expect(payload.user.eids).to.have.lengthOf(3);
+      it('should no longer set timeout even if timeout is a string', function () {
+        config.setConfig({
+          ix: {
+            timeout: '500'
+          }
+        });
+        const requestStringTimeout = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {})[0];
+
+        expect(requestStringTimeout.data.t).to.be.undefined;
       });
+    });
 
-      it('identity data in impression should have correct format and value (multiple identity partners)', function () {
-        const impression = JSON.parse(query.r).user.eids;
+    describe('request should contain both banner and video requests', function () {
+      const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], DEFAULT_VIDEO_VALID_BID[0]], {});
+      it('should have banner request', () => {
+        const bannerImpression = extractPayload(request[0]).imp[0];
+        const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
-        expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
-        expect(impression[0].uids).to.have.lengthOf(1);
+        expect(extractPayload(request[0]).imp).to.have.lengthOf(1);
+        expect(bannerImpression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
 
-        expect(impression[1].source).to.equal(testCopy.JackIp.data.source);
-        expect(impression[1].uids).to.have.lengthOf(1);
+        expect(bannerImpression.banner.format).to.be.length(2);
+        expect(bannerImpression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(bannerImpression.ext.sid).to.equal(sidValue);
 
-        expect(impression[2].source).to.equal(testCopy.GenericIp.data.source);
-        expect(impression[2].uids).to.have.lengthOf(1);
+        bannerImpression.banner.format.map(({ w, h, ext }, index) => {
+          const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
+
+          expect(w).to.equal(size[0]);
+          expect(h).to.equal(size[1]);
+          expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
+        });
       });
-    });
 
-    describe('buildRequestNoData', function () {
-      beforeEach(function () {
-        testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
+      it('should have video request', () => {
+        const videoImpression = extractPayload(request[1]).imp[0];
+
+        expect(videoImpression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
+        expect(videoImpression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
+        expect(videoImpression.video.h).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[1]);
       });
+    });
 
-      it('payload should not have any user eids with an undefined identity data response', function () {
-        window.headertag.getIdentityInfo = function () {
-          return undefined;
-        };
-        request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        query = request.data;
-        const payload = JSON.parse(query.r);
+    describe('request should contain both banner and native requests', function () {
+      const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], DEFAULT_NATIVE_VALID_BID[0]]);
 
-        expect(payload.user).to.exist;
-        expect(payload.user.eids).to.not.exist;
+      it('should have banner request', () => {
+        const bannerImpression = extractPayload(request[0]).imp[0];
+        const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
+
+        expect(extractPayload(request[0]).imp).to.have.lengthOf(1);
+        expect(bannerImpression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
+
+        expect(bannerImpression.banner.format).to.be.length(2);
+        expect(bannerImpression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(bannerImpression.ext.sid).to.equal(sidValue);
+
+        bannerImpression.banner.format.map(({ w, h, ext }, index) => {
+          const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
+
+          expect(w).to.equal(size[0]);
+          expect(h).to.equal(size[1]);
+          expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
+        });
       });
 
-      it('payload should have user eids if least one partner data is available', function () {
-        testCopy.GenericIp = {
-          responsePending: true,
-          data: {}
-        }
-        request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        query = request.data;
-        const payload = JSON.parse(query.r);
+      it('should have native request', () => {
+        const nativeImpression = extractPayload(request[1]).imp[0];
 
-        expect(payload.user).to.exist;
-        expect(payload.user.eids).to.exist;
+        expect(request[1].data.hasOwnProperty('v')).to.equal(false);
+        expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
+        expect(nativeImpression.native).to.deep.equal(DEFAULT_NATIVE_IMP);
       });
+    });
 
-      it('payload should not have any user eids if identity data is pending for all partners', function () {
-        testCopy.IdentityIp.responsePending = true;
-        request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        query = request.data;
-        const payload = JSON.parse(query.r);
+    it('single request under 8k size limit for large ad unit', function () {
+      const options = {};
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+      const requests = spec.buildRequests([bid], options);
+
+      const reqSize = `${requests[0].url}?${utils.parseQueryStringParameters(requests[0].data)}`.length;
+      expect(requests).to.be.an('array');
+      expect(requests).to.have.lengthOf(1);
+      expect(reqSize).to.be.lessThan(8000);
+      expect(requests[0].data.sn).to.be.undefined;
+    });
 
-        expect(payload.user).to.exist;
-        expect(payload.user.eids).to.not.exist;
+    it('2 requests due to 2 ad units, one larger than url size', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+      bid.params.siteId = '124';
+      bid.adUnitCode = 'div-gpt-1'
+      bid.transactionId = '152e36d1-1241-4242-t35e-y1dv34d12315';
+      bid.bidId = '2f6g5s5e';
+
+      const requests = spec.buildRequests([bid, DEFAULT_BANNER_VALID_BID[0]], DEFAULT_OPTION);
+      expect(requests).to.be.an('array');
+      expect(requests).to.have.lengthOf(2);
+    });
+
+    it('6 ad units should generate only 4 requests', function () {
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+      bid1.params.siteId = '121';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = 'tr1';
+      bid1.bidId = '2f6g5s5e';
+
+      const bid2 = utils.deepClone(bid1);
+      bid2.transactionId = 'tr2';
+
+      const bid3 = utils.deepClone(bid1);
+      bid3.transactionId = 'tr3';
+
+      const bid4 = utils.deepClone(bid1);
+      bid4.transactionId = 'tr4';
+
+      const bid5 = utils.deepClone(bid1);
+      bid5.transactionId = 'tr5';
+
+      const bid6 = utils.deepClone(bid1);
+      bid6.transactionId = 'tr6';
+
+      const requests = spec.buildRequests([bid1, bid2, bid3, bid4, bid5, bid6], DEFAULT_OPTION);
+
+      expect(requests).to.be.an('array');
+      expect(requests).to.have.lengthOf(4);
+
+      for (var i = 0; i < requests.length; i++) {
+        const reqSize = `${requests[i].url}?${utils.parseQueryStringParameters(requests[i].data)}`.length;
+        expect(reqSize).to.be.lessThan(8000);
+        let payload = extractPayload(requests[i]);
+        expect(payload.source.ext.schain).to.deep.equal(SAMPLE_SCHAIN);
+      }
+    });
+
+    it('multiple ad units in one request', function () {
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = [[300, 250], [300, 600], [100, 200]];
+      bid1.params.siteId = '121';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = 'tr1';
+      bid1.bidId = '2f6g5s5e';
+
+      const bid2 = utils.deepClone(bid1);
+      bid2.transactionId = 'tr2';
+      bid2.mediaTypes.banner.sizes = [[220, 221], [222, 223], [300, 250]];
+      const bid3 = utils.deepClone(bid1);
+      bid3.transactionId = 'tr3';
+      bid3.mediaTypes.banner.sizes = [[330, 331], [332, 333], [300, 250]];
+
+      const requests = spec.buildRequests([bid1, bid2, bid3], DEFAULT_OPTION);
+
+      expect(requests).to.be.an('array');
+      expect(requests).to.have.lengthOf(1);
+
+      const impressions = extractPayload(requests[0]).imp;
+      expect(impressions).to.be.an('array');
+      expect(impressions).to.have.lengthOf(3);
+      expect(requests[0].data.sn).to.be.undefined;
+    });
+
+    it('request should contain the extra banner ad sizes that IX is not configured for using the first site id in the ad unit', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.sizes.push([336, 280], [970, 90]);
+      bid.mediaTypes.banner.sizes.push([336, 280], [970, 90]);
+      const bid2 = utils.deepClone(bid);
+      bid2.params.siteId = '124';
+      bid2.params.size = [300, 600];
+      bid2.params.bidId = '2b3c4d5e';
+
+      const request = spec.buildRequests([bid, bid2], DEFAULT_OPTION)[0];
+      const impression = extractPayload(request).imp[0];
+      const sidValue = bid.params.id;
+
+      expect(impression.id).to.equal(bid.bidId);
+      expect(impression.banner.format).to.be.length(bid.mediaTypes.banner.sizes.length);
+      expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+      expect(impression.ext.sid).to.equal(sidValue);
+
+      impression.banner.format.map(({ w, h, ext }, index) => {
+        const size = bid.mediaTypes.banner.sizes[index];
+
+        expect(w).to.equal(size[0]);
+        expect(h).to.equal(size[1]);
+        expect(ext.siteID).to.equal(index === 1 ? bid2.params.siteId : bid.params.siteId);
       });
+    });
 
-      it('payload should not have any user eids if identity data is pending or not available for all partners', function () {
-        testCopy.IdentityIp.responsePending = false;
-        testCopy.IdentityIp.data = {};
-        request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        query = request.data;
-        const payload = JSON.parse(query.r);
+    it('request should contain the extra banner ad sizes and their corresponding site ids when there is multiple ad units', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.siteId = '124';
+      bid.adUnitCode = 'div-gpt-ad-156456451554-1'
+      bid.transactionId = '152e36d1-1241-4242-t35e-y1dv34d12315';
+      bid.bidId = '2f6g5s5e';
+      bid.params.size = [336, 280]
+      bid.sizes = [[336, 280], [970, 90]]
+      bid.mediaTypes.banner.sizes = [[336, 280], [970, 90]]
+
+      const bids = [DEFAULT_BANNER_VALID_BID[0], bid];
+      const request = spec.buildRequests(bids, DEFAULT_OPTION)[0];
+
+      const impressions = extractPayload(request).imp;
+      expect(impressions).to.be.an('array');
+      expect(impressions).to.have.lengthOf(2);
+      expect(request.data.sn).to.be.undefined;
+
+      impressions.map((impression, impressionIndex) => {
+        const firstSizeObject = bids[impressionIndex].mediaTypes.banner.sizes[0];
+        const sidValue = bids[impressionIndex].params.id;
+
+        expect(impression.banner.format).to.be.length(2);
+        expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(impression.ext.sid).to.equal(sidValue);
+
+        impression.banner.format.map(({ w, h, ext }, index) => {
+          const size = bids[impressionIndex].mediaTypes.banner.sizes[index];
+
+          expect(w).to.equal(size[0]);
+          expect(h).to.equal(size[1]);
+          expect(ext.siteID).to.equal(bids[impressionIndex].params.siteId);
+        });
+      });
+    });
 
-        expect(payload.user).to.exist;
-        expect(payload.user.eids).to.not.exist;
+    it('request should not contain the extra video ad sizes that IX is not configured for', function () {
+      const request = spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION);
+      const impressions = extractPayload(request[0]).imp;
+
+      expect(impressions).to.be.an('array');
+      expect(impressions).to.have.lengthOf(1);
+    });
+
+    describe('detect missing sizes', function () {
+      it('request should always contain missing sizes', function () {
+        const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+        bid1.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+
+        const requests = spec.buildRequests([bid1, DEFAULT_BANNER_VALID_BID[0]], DEFAULT_OPTION);
+
+        const impressions = extractPayload(requests[0]).imp;
+
+        expect(impressions).to.be.an('array');
+        expect(impressions).to.have.lengthOf(1);
       });
     });
   });
 
-  describe('buildRequests', function () {
-    const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-    const requestUrl = request.url;
-    const requestMethod = request.method;
-    const query = request.data;
+  describe('buildRequestVideo', function () {
+    const request = spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION);
+    const payloadData = request[0].data;
 
-    const bidWithoutSchain = utils.deepClone(DEFAULT_BANNER_VALID_BID);
-    delete bidWithoutSchain[0].schain;
-    const requestWithoutSchain = spec.buildRequests(bidWithoutSchain, DEFAULT_OPTION)[0];
-    const queryWithoutSchain = requestWithoutSchain.data;
+    it('auction type should be set correctly', function () {
+      const at = payloadData.at;
+      expect(at).to.equal(1);
+    })
+
+    it('impression should have correct format and value', function () {
+      const impression = payloadData.imp[0];
 
-    const bidWithoutMediaType = utils.deepClone(DEFAULT_BANNER_VALID_BID);
-    delete bidWithoutMediaType[0].mediaTypes;
-    bidWithoutMediaType[0].sizes = [[300, 250], [300, 600]];
-    const requestWithoutMediaType = spec.buildRequests(bidWithoutMediaType, DEFAULT_OPTION)[0];
-    const queryWithoutMediaType = requestWithoutMediaType.data;
+      expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
+      expect(impression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
+      expect(impression.video.h).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[1]);
+      expect(impression.video.placement).to.equal(1);
+      expect(impression.video.minduration).to.exist;
+      expect(impression.video.minduration).to.equal(0);
+      expect(impression.video.mimes[0]).to.equal('video/mp4');
+      expect(impression.video.mimes[1]).to.equal('video/webm');
 
-    it('request should be made to IX endpoint with GET method', function () {
-      expect(requestMethod).to.equal('GET');
-      expect(requestUrl).to.equal(IX_SECURE_ENDPOINT);
+      expect(impression.video.skippable).to.equal(false);
     });
 
-    it('query object (version, siteID and request) should be correct', function () {
-      expect(query.v).to.equal(BANNER_ENDPOINT_VERSION);
-      expect(query.s).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-      expect(query.r).to.exist;
-      expect(query.ac).to.equal('j');
-      expect(query.sd).to.equal(1);
-      expect(query.nf).not.to.exist;
-    });
+    it('should not use default placement values when placement is defined at adUnit level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.placement = 2;
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(request).imp[0];
 
-    it('payload should have correct format and value', function () {
-      const payload = JSON.parse(query.r);
-      expect(payload.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidderRequestId);
-      expect(payload.site).to.exist;
-      expect(payload.site.page).to.equal(DEFAULT_OPTION.refererInfo.referer);
-      expect(payload.site.ref).to.equal(document.referrer);
-      expect(payload.ext).to.exist;
-      expect(payload.ext.source).to.equal('prebid');
-      expect(payload.source.ext.schain).to.deep.equal(SAMPLE_SCHAIN);
-      expect(payload.imp).to.exist;
-      expect(payload.imp).to.be.an('array');
-      expect(payload.imp).to.have.lengthOf(1);
+      expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
+      expect(impression.video.placement).to.equal(2);
     });
 
-    it('payload should not include schain when not provided', function () {
-      const payload = JSON.parse(queryWithoutSchain.r);
-      expect(payload.source).to.not.exist; // source object currently only written for schain
+    it('should set imp.ext.sid for video imps if params.id exists', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.params.id = 50;
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(request).imp[0];
+
+      expect(impression.ext.sid).to.equal('50');
     });
 
-    it('impression should have correct format and value', function () {
-      const impression = JSON.parse(query.r).imp[0];
-      const sidValue = `${DEFAULT_BANNER_VALID_BID[0].params.size[0].toString()}x${DEFAULT_BANNER_VALID_BID[0].params.size[1].toString()}`;
+    it('should set correct default placement, if context is instream', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'instream';
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(request).imp[0];
 
-      expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
-      expect(impression.banner).to.exist;
-      expect(impression.banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
-      expect(impression.banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
-      expect(impression.banner.topframe).to.exist;
-      expect(impression.banner.topframe).to.be.oneOf([0, 1]);
-      expect(impression.ext).to.exist;
-      expect(impression.ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString());
-      expect(impression.ext.sid).to.equal(sidValue);
+      expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
+      expect(impression.video.placement).to.equal(1);
     });
 
-    it('impression should have bidFloor and bidFloorCur if configured', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.bidFloor = 50;
-      bid.params.bidFloorCur = 'USD';
-      const requestBidFloor = spec.buildRequests([bid])[0];
-      const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+    it('should set correct default placement, if context is outstream', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(request).imp[0];
 
-      expect(impression.bidfloor).to.equal(bid.params.bidFloor);
-      expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
+      expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
+      expect(impression.video.placement).to.equal(4);
     });
 
-    it('payload without mediaType should have correct format and value', function () {
-      const payload = JSON.parse(queryWithoutMediaType.r);
-
-      expect(payload.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidderRequestId);
-      expect(payload.site).to.exist;
-      expect(payload.site.page).to.equal(DEFAULT_OPTION.refererInfo.referer);
-      expect(payload.site.ref).to.equal(document.referrer);
-      expect(payload.ext).to.exist;
-      expect(payload.ext.source).to.equal('prebid');
-      expect(payload.imp).to.exist;
-      expect(payload.imp).to.be.an('array');
-      expect(payload.imp).to.have.lengthOf(1);
+    it('should handle unexpected context', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'not-valid';
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(request).imp[0];
+      expect(impression.video.placement).to.be.undefined;
     });
 
-    it('impression without mediaType should have correct format and value', function () {
-      const impression = JSON.parse(queryWithoutMediaType.r).imp[0];
-      const sidValue = `${DEFAULT_BANNER_VALID_BID[0].params.size[0].toString()}x${DEFAULT_BANNER_VALID_BID[0].params.size[1].toString()}`;
+    it('should not override video properties if they are already configured at the params video level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.protocols = [1];
+      bid.mediaTypes.video.mimes = ['video/override'];
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(request).imp[0];
 
-      expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
-      expect(impression.banner).to.exist;
-      expect(impression.banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
-      expect(impression.banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
-      expect(impression.banner.topframe).to.exist;
-      expect(impression.banner.topframe).to.be.oneOf([0, 1]);
-      expect(impression.ext).to.exist;
-      expect(impression.ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString());
-      expect(impression.ext.sid).to.equal(sidValue);
+      expect(impression.video.protocols[0]).to.equal(2);
+      expect(impression.video.mimes[0]).to.not.equal('video/override');
     });
 
-    it('impression should have sid if id is configured as number', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.id = 50;
-      const requestBidFloor = spec.buildRequests([bid])[0];
-      const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+    it('should not add video adunit level properties in imp object if they are not allowlisted', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.random = true;
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(request).imp[0];
 
-      expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
-      expect(impression.banner).to.exist;
-      expect(impression.banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
-      expect(impression.banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
-      expect(impression.banner.topframe).to.exist;
-      expect(impression.banner.topframe).to.be.oneOf([0, 1]);
-      expect(impression.ext).to.exist;
-      expect(impression.ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString());
-      expect(impression.ext.sid).to.equal('50');
+      expect(impression.video.random).to.not.exist;
     });
 
-    it('impression should have sid if id is configured as string', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
-      bid.params.id = 'abc';
-      const requestBidFloor = spec.buildRequests([bid])[0];
-      const impression = JSON.parse(requestBidFloor.data.r).imp[0];
-      expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
-      expect(impression.banner).to.exist;
-      expect(impression.banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
-      expect(impression.banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
-      expect(impression.banner.topframe).to.exist;
-      expect(impression.banner.topframe).to.be.oneOf([0, 1]);
-      expect(impression.ext).to.exist;
-      expect(impression.ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString());
-      expect(impression.ext.sid).to.equal('abc');
+    it('should add allowlisted adunit level video properties in imp object if they are not configured at params level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      delete bid.params.video.protocols;
+      delete bid.params.video.mimes;
+      bid.mediaTypes.video.protocols = [6];
+      bid.mediaTypes.video.mimes = ['video/mp4'];
+      bid.mediaTypes.video.api = 2;
+      bid.mediaTypes.video.pos = 0;
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = extractPayload(request).imp[0];
+
+      expect(impression.video.protocols[0]).to.equal(6);
+      expect(impression.video.api).to.equal(2);
+      expect(impression.video.pos).to.equal(0);
+      expect(impression.video.mimes[0]).to.equal('video/mp4');
     });
 
-    it('should add first party data to page url in bid request if it exists in config', function () {
-      config.setConfig({
-        ix: {
-          firstPartyData: {
-            ab: 123,
-            cd: '123#ab',
-            'e/f': 456,
-            'h?g': '456#cd'
-          }
+    it('should send gpid in request if ortb2Imp.ext.gpid exists', function () {
+      const GPID = '/19968336/some-adunit-path';
+      const validBids = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
+      validBids[0].ortb2Imp = {
+        ext: {
+          gpid: GPID
         }
-      });
+      };
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const { ext: { gpid } } = extractPayload(requests[0]).imp[0];
+      expect(gpid).to.equal(GPID);
+    });
 
-      const requestWithFirstPartyData = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-      const pageUrl = JSON.parse(requestWithFirstPartyData.data.r).site.page;
-      const expectedPageUrl = DEFAULT_OPTION.refererInfo.referer + '?ab=123&cd=123%23ab&e%2Ff=456&h%3Fg=456%23cd';
+    it('should build video request when if video obj is not provided at params level', () => {
+      const request = spec.buildRequests([DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS[0]], {});
+      const videoImpression = extractPayload(request[0]).imp[0];
 
-      expect(pageUrl).to.equal(expectedPageUrl);
+      expect(videoImpression.id).to.equal(DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS[0].bidId);
+      expect(videoImpression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS[0].mediaTypes.video.playerSize[0][0]);
+      expect(videoImpression.video.h).to.equal(DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS[0].mediaTypes.video.playerSize[0][1]);
     });
 
-    it('should not set first party data if it is not an object', function () {
-      config.setConfig({
-        ix: {
-          firstPartyData: 500
-        }
-      });
+    it('should set different placement for floating ad units', () => {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.params.video.playerConfig = {
+        floatOnScroll: true
+      };
+
+      const request = spec.buildRequests([bid]);
+      const videoImpression = extractPayload(request[0]).imp[0];
 
-      const requestFirstPartyDataNumber = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-      const pageUrl = JSON.parse(requestFirstPartyDataNumber.data.r).site.page;
+      expect(videoImpression.video.placement).to.eq(5);
+    })
+  });
+
+  describe('buildRequestNative', function () {
+    it('should build request with expected params', function () {
+      const request = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION)[0];
 
-      expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.referer);
+      expect(request.data).to.exist;
+      expect(request.method).to.equal('POST')
     });
 
-    it('should not set first party or timeout if it is not present', function () {
-      config.setConfig({
-        ix: {}
-      });
+    it('should send gpid in request if ortb2Imp.ext.gpid exists', function () {
+      const GPID = '/19968336/some-adunit-path';
+      const bids = utils.deepClone(DEFAULT_NATIVE_VALID_BID);
+      bids[0].ortb2Imp = {
+        ext: {
+          gpid: GPID
+        }
+      };
+      const requests = spec.buildRequests(bids, DEFAULT_OPTION);
+      const { ext: { gpid } } = extractPayload(requests[0]).imp[0];
+      expect(gpid).to.equal(GPID);
+    });
 
-      const requestWithoutConfig = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-      const pageUrl = JSON.parse(requestWithoutConfig.data.r).site.page;
+    it('should build request with required asset properties with default values', function () {
+      const request = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION);
+      const nativeImpression = extractPayload(request[0]).imp[0];
 
-      expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.referer);
-      expect(requestWithoutConfig.data.t).to.be.undefined;
+      expect(request[0].data.hasOwnProperty('v')).to.equal(false);
+      expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
+      expect(nativeImpression.native).to.deep.equal(DEFAULT_NATIVE_IMP);
     });
 
-    it('should not set first party or timeout if it is setConfig is not called', function () {
-      const requestWithoutConfig = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-      const pageUrl = JSON.parse(requestWithoutConfig.data.r).site.page;
+    it('should set imp.ext.sid for native imps if params.id exist', function () {
+      const bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID);
+      bid[0].params.id = 'abc'
+      const request = spec.buildRequests(bid, DEFAULT_OPTION);
+      const nativeImpression = extractPayload(request[0]).imp[0];
 
-      expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.referer);
-      expect(requestWithoutConfig.data.t).to.be.undefined;
+      expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
+      expect(nativeImpression.ext.sid).to.equal('abc');
     });
 
-    it('should set timeout if publisher set it through setConfig', function () {
-      config.setConfig({
-        ix: {
-          timeout: 500
-        }
-      });
-      const requestWithTimeout = spec.buildRequests(DEFAULT_BANNER_VALID_BID)[0];
+    it('should build request with given asset properties', function () {
+      let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID)
+      bid[0].nativeOrtbRequest = {
+        assets: [{ id: 0, required: 0, title: { len: 140 } }, { id: 1, required: 0, video: { mimes: ['javascript'], minduration: 10, maxduration: 60, protocols: [1] } }]
+      }
+      const request = spec.buildRequests(bid, DEFAULT_OPTION);
+      const nativeImpression = extractPayload(request[0]).imp[0];
+      expect(nativeImpression.native).to.deep.equal({ request: '{"assets":[{"id":0,"required":0,"title":{"len":140}},{"id":1,"required":0,"video":{"mimes":["javascript"],"minduration":10,"maxduration":60,"protocols":[1]}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2' });
+    });
+
+    it('should build request with all possible Prebid asset properties', function () {
+      let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID)
+      bid[0].nativeOrtbRequest = {
+        'ver': '1.2',
+        'assets': [
+          {
+            'id': 0,
+            'required': 0,
+            'title': {
+              'len': 140
+            }
+          },
+          {
+            'id': 1,
+            'required': 0,
+            'data': {
+              'type': 2
+            }
+          },
+          {
+            'id': 2,
+            'required': 0,
+            'data': {
+              'type': 10
+            }
+          },
+          {
+            'id': 3,
+            'required': 0,
+            'data': {
+              'type': 1
+            }
+          },
+          {
+            'id': 4,
+            'required': 0,
+            'img': {
+              'type': 1
+            }
+          },
+          {
+            'id': 5,
+            'required': 0,
+            'img': {
+              'type': 3
+            }
+          },
+          {
+            'id': 6,
+            'required': 0
+          },
+          {
+            'id': 7,
+            'required': 0,
+            'data': {
+              'type': 11
+            }
+          },
+          {
+            'id': 8,
+            'required': 0
+          },
+          {
+            'id': 9,
+            'required': 0
+          },
+          {
+            'id': 10,
+            'required': 0,
+            'data': {
+              'type': 12
+            }
+          },
+          {
+            'id': 11,
+            'required': 0,
+            'data': {
+              'type': 3
+            }
+          },
+          {
+            'id': 12,
+            'required': 0,
+            'data': {
+              'type': 5
+            }
+          },
+          {
+            'id': 13,
+            'required': 0,
+            'data': {
+              'type': 4
+            }
+          },
+          {
+            'id': 14,
+            'required': 0,
+            'data': {
+              'type': 6
+            }
+          },
+          {
+            'id': 15,
+            'required': 0,
+            'data': {
+              'type': 7
+            }
+          },
+          {
+            'id': 16,
+            'required': 0,
+            'data': {
+              'type': 9
+            }
+          },
+          {
+            'id': 17,
+            'required': 0,
+            'data': {
+              'type': 8
+            }
+          }
+        ]
+      }
+      const request = spec.buildRequests(bid, DEFAULT_OPTION);
+      const nativeImpression = extractPayload(request[0]).imp[0];
+      expect(nativeImpression.native).to.deep.equal({ request: '{"ver":"1.2","assets":[{"id":0,"required":0,"title":{"len":140}},{"id":1,"required":0,"data":{"type":2}},{"id":2,"required":0,"data":{"type":10}},{"id":3,"required":0,"data":{"type":1}},{"id":4,"required":0,"img":{"type":1}},{"id":5,"required":0,"img":{"type":3}},{"id":6,"required":0},{"id":7,"required":0,"data":{"type":11}},{"id":8,"required":0},{"id":9,"required":0},{"id":10,"required":0,"data":{"type":12}},{"id":11,"required":0,"data":{"type":3}},{"id":12,"required":0,"data":{"type":5}},{"id":13,"required":0,"data":{"type":4}},{"id":14,"required":0,"data":{"type":6}},{"id":15,"required":0,"data":{"type":7}},{"id":16,"required":0,"data":{"type":9}},{"id":17,"required":0,"data":{"type":8}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2' });
+    })
+  });
 
-      expect(requestWithTimeout.data.t).to.equal(500);
+  describe('buildRequestMultiFormat', function () {
+    it('only banner bidder params set', function () {
+      const request = spec.buildRequests(DEFAULT_MULTIFORMAT_BANNER_VALID_BID, {})
+      const bannerImpression = extractPayload(request[0]).imp[0];
+      expect(extractPayload(request[0]).imp).to.have.lengthOf(1);
+      expect(bannerImpression.id).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].bidId);
+      expect(bannerImpression.banner.format[0].w).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[0]);
+      expect(bannerImpression.banner.format[0].h).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[1]);
     });
 
-    it('should set timeout if timeout is a string', function () {
-      config.setConfig({
-        ix: {
-          timeout: '500'
-        }
+    describe('only video bidder params set', function () {
+      it('should generate video impression', function () {
+        const request = spec.buildRequests(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID, {});
+        const videoImp = extractPayload(request[1]).imp[0];
+        expect(extractPayload(request[1]).imp).to.have.lengthOf(1);
+        expect(videoImp.id).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].bidId);
+        expect(videoImp.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[0]);
+        expect(videoImp.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[1]);
       });
-      const requestStringTimeout = spec.buildRequests(DEFAULT_BANNER_VALID_BID)[0];
-
-      expect(requestStringTimeout.data.t).to.be.undefined;
     });
 
-    it('request should contain both banner and video requests', function () {
-      const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], DEFAULT_VIDEO_VALID_BID[0]]);
+    describe('both banner and video bidder params set', function () {
+      const bids = [DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0], DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]];
+      const request = spec.buildRequests(bids, {});
 
-      const bannerImp = JSON.parse(request[0].data.r).imp[0];
-      expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
-      expect(bannerImp.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
-      expect(bannerImp.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
-      expect(bannerImp.banner).to.exist;
-      expect(bannerImp.banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
-      expect(bannerImp.banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
+      it('should return valid banner requests', function () {
+        const impressions = extractPayload(request[0]).imp;
 
-      const videoImp = JSON.parse(request[1].data.r).imp[0];
-      expect(JSON.parse(request[1].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
-      expect(videoImp.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
-      expect(videoImp.video).to.exist;
-      expect(videoImp.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
-      expect(videoImp.video.h).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[1]);
-    });
-  });
+        expect(impressions).to.have.lengthOf(2);
 
-  describe('buildRequestVideo', function () {
-    const request = spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION);
-    const query = request[0].data;
+        impressions.map((impression, index) => {
+          const bid = bids[index];
 
-    it('query object (version, siteID and request) should be correct', function () {
-      expect(query.v).to.equal(VIDEO_ENDPOINT_VERSION);
-      expect(query.s).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.siteId);
-      expect(query.r).to.exist;
-      expect(query.ac).to.equal('j');
-      expect(query.sd).to.equal(1);
-      expect(query.nf).to.equal(1);
-    });
+          expect(impression.id).to.equal(bid.bidId);
+          expect(impression.banner.format).to.be.length(bid.mediaTypes.banner.sizes.length);
+          expect(impression.banner.topframe).to.be.oneOf([0, 1]);
 
-    it('impression should have correct format and value', function () {
-      const impression = JSON.parse(query.r).imp[0];
-      const sidValue = `${DEFAULT_VIDEO_VALID_BID[0].params.size[0].toString()}x${DEFAULT_VIDEO_VALID_BID[0].params.size[1].toString()}`;
+          impression.banner.format.map(({ w, h, ext }, index) => {
+            const size = bid.mediaTypes.banner.sizes[index];
 
-      expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
-      expect(impression.video).to.exist;
-      expect(impression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
-      expect(impression.video.h).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[1]);
-      expect(impression.video.placement).to.exist;
-      expect(impression.video.placement).to.equal(1);
-      expect(impression.video.minduration).to.exist;
-      expect(impression.video.minduration).to.equal(0);
-      expect(impression.video.mimes).to.exist;
-      expect(impression.video.mimes[0]).to.equal('video/mp4');
-      expect(impression.video.mimes[1]).to.equal('video/webm');
+            expect(w).to.equal(size[0]);
+            expect(h).to.equal(size[1]);
+            expect(ext.siteID).to.equal(bid.params.siteId);
+          });
+        });
+      });
 
-      expect(impression.video.skippable).to.equal(false);
-      expect(impression.ext).to.exist;
-      expect(impression.ext.siteID).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.siteId.toString());
-      expect(impression.ext.sid).to.equal(sidValue);
-    });
+      it('should return valid banner and video requests', function () {
+        const videoImpression = extractPayload(request[1]).imp[0];
 
-    it('impression should have correct format when mediaType is specified.', function () {
-      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
-      delete bid.mediaTypes;
-      bid.mediaType = 'video';
-      const requestBidFloor = spec.buildRequests([bid])[0];
-      const impression = JSON.parse(requestBidFloor.data.r).imp[0];
-      const sidValue = `${DEFAULT_VIDEO_VALID_BID[0].params.size[0].toString()}x${DEFAULT_VIDEO_VALID_BID[0].params.size[1].toString()}`;
+        expect(extractPayload(request[1]).imp).to.have.lengthOf(1);
+        expect(videoImpression.id).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].bidId);
+        expect(videoImpression.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].mediaTypes.video.playerSize[0][0]);
+        expect(videoImpression.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].mediaTypes.video.playerSize[0][1]);
+      });
 
-      expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
-      expect(impression.video).to.exist;
-      expect(impression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
-      expect(impression.video.h).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[1]);
-      expect(impression.video.placement).to.not.exist;
-      expect(impression.ext).to.exist;
-      expect(impression.ext.siteID).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.siteId.toString());
-      expect(impression.ext.sid).to.equal(sidValue);
+      it('should contain all correct IXdiag properties', function () {
+        const diagObj = extractPayload(request[0]).ext.ixdiag;
+        expect(diagObj.iu).to.equal(0);
+        expect(diagObj.nu).to.equal(0);
+        expect(diagObj.ou).to.equal(2);
+        expect(diagObj.ren).to.equal(true);
+        expect(diagObj.mfu).to.equal(2);
+        expect(diagObj.allu).to.equal(2);
+        expect(diagObj.version).to.equal('$prebid.version$');
+        expect(diagObj.url).to.equal('http://localhost:9876/context.html')
+        expect(diagObj.pbadslot).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].ortb2Imp.ext.data.pbadslot)
+        expect(diagObj.tagid).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.tagId)
+        expect(diagObj.adunitcode).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].adUnitCode)
+      });
     });
 
-    it('should set correct placement if context is outstream', function () {
-      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
-      bid.mediaTypes.video.context = 'outstream';
-      const request = spec.buildRequests([bid])[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+    describe('siteId overrides', function () {
+      it('should use siteId override', function () {
+        const validBids = DEFAULT_MULTIFORMAT_VALID_BID;
+        const request = spec.buildRequests(validBids, {});
+        const bannerImps = request[0].data.imp[0];
+        const videoImps = request[1].data.imp[0];
+        const nativeImps = request[2].data.imp[0];
+        expect(videoImps.ext.siteID).to.equal('1111');
+        bannerImps.banner.format.map(({ ext }) => {
+          expect(ext.siteID).to.equal('2222');
+        });
+        expect(nativeImps.ext.siteID).to.equal('3333');
+      });
 
-      expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
-      expect(impression.video).to.exist;
-      expect(impression.video.placement).to.exist;
-      expect(impression.video.placement).to.equal(4);
+      it('should use default siteId if overrides are not provided', function () {
+        const validBids = DEFAULT_MULTIFORMAT_VALID_BID;
+        delete validBids[0].params.banner;
+        delete validBids[0].params.video;
+        delete validBids[0].params.native;
+        const request = spec.buildRequests(validBids, {});
+        const bannerImps = request[0].data.imp[0];
+        const videoImps = request[1].data.imp[0];
+        const nativeImps = request[2].data.imp[0];
+        expect(videoImps.ext.siteID).to.equal('456');
+        bannerImps.banner.format.map(({ ext }) => {
+          expect(ext.siteID).to.equal('456');
+        });
+        expect(nativeImps.ext.siteID).to.equal('456');
+      });
     });
   });
 
   describe('interpretResponse', function () {
+    // generate bidderRequest with real buildRequest logic for intepretResponse testing
+    let bannerBidderRequest
+    let videoBidderRequest
+    let nativeBidderRequest
+
+    beforeEach(() => {
+      bannerBidderRequest = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {})[0]
+      videoBidderRequest = spec.buildRequests(DEFAULT_VIDEO_VALID_BID_MEDIUM_SIZE, {})[0]
+      nativeBidderRequest = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, {})[0]
+    });
+
     it('should get correct bid response for banner ad', function () {
       const expectedParse = [
         {
           requestId: '1a2b3c4d',
-          cpm: 1,
+          cpm: 1,
+          creativeId: '12345',
+          width: 300,
+          height: 250,
+          mediaType: 'banner',
+          ad: '<a target="_blank" href="https://www.indexexchange.com"></a>',
+          currency: 'USD',
+          ttl: 300,
+          netRevenue: true,
+          meta: {
+            networkId: 50,
+            brandId: 303325,
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, bannerBidderRequest);
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    });
+
+    it('should get correct bid response for banner ad with missing adomain', function () {
+      const expectedParse = [
+        {
+          requestId: '1a2b3c4d',
+          cpm: 1,
+          creativeId: '12345',
+          width: 300,
+          height: 250,
+          mediaType: 'banner',
+          ad: '<a target="_blank" href="https://www.indexexchange.com"></a>',
+          currency: 'USD',
+          ttl: 300,
+          netRevenue: true,
+          meta: {
+            networkId: 50,
+            brandId: 303325,
+            brandName: 'OECTA'
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE_WITHOUT_ADOMAIN }, bannerBidderRequest);
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    });
+
+    it('should set creativeId to default value if not provided', function () {
+      const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
+      delete bidResponse.seatbid[0].bid[0].crid;
+      const expectedParse = [
+        {
+          requestId: '1a2b3c4d',
+          cpm: 1,
+          creativeId: '-',
+          width: 300,
+          height: 250,
+          mediaType: 'banner',
+          ad: '<a target="_blank" href="https://www.indexexchange.com"></a>',
+          currency: 'USD',
+          ttl: 300,
+          netRevenue: true,
+          meta: {
+            networkId: 50,
+            brandId: 303325,
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
+    });
+
+    it('should set Japanese price correctly', function () {
+      const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
+      bidResponse.cur = 'JPY';
+      const expectedParse = [
+        {
+          requestId: '1a2b3c4d',
+          cpm: 100,
           creativeId: '12345',
           width: 300,
           height: 250,
           mediaType: 'banner',
           ad: '<a target="_blank" href="https://www.indexexchange.com"></a>',
-          currency: 'USD',
+          currency: 'JPY',
           ttl: 300,
           netRevenue: true,
-          dealId: undefined,
           meta: {
             networkId: 50,
             brandId: 303325,
-            brandName: 'OECTA'
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
           }
         }
       ];
-      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
-    it('should set creativeId to default value if not provided', function () {
+    it('should prioritize bid[].dealid over bid[].ext.dealid ', function () {
       const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
-      delete bidResponse.seatbid[0].bid[0].crid;
+      bidResponse.seatbid[0].bid[0].ext.dealid = 'ext-deal';
+      bidResponse.seatbid[0].bid[0].dealid = 'outter-deal';
       const expectedParse = [
         {
           requestId: '1a2b3c4d',
           cpm: 1,
-          creativeId: '-',
+          creativeId: '12345',
           width: 300,
           height: 250,
           mediaType: 'banner',
@@ -858,47 +2920,49 @@ describe('IndexexchangeAdapter', function () {
           currency: 'USD',
           ttl: 300,
           netRevenue: true,
-          dealId: undefined,
+          dealId: 'outter-deal',
           meta: {
             networkId: 50,
             brandId: 303325,
-            brandName: 'OECTA'
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
           }
         }
       ];
-      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
+
+      expect(result[0].dealId).to.equal(expectedParse[0].dealId);
     });
 
-    it('should set Japanese price correctly', function () {
+    it('should not set bid[].dealid if dealid is not present', function () {
       const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
-      bidResponse.cur = 'JPY';
       const expectedParse = [
         {
           requestId: '1a2b3c4d',
-          cpm: 100,
+          cpm: 1,
           creativeId: '12345',
           width: 300,
           height: 250,
           mediaType: 'banner',
           ad: '<a target="_blank" href="https://www.indexexchange.com"></a>',
-          currency: 'JPY',
+          currency: 'USD',
           ttl: 300,
           netRevenue: true,
-          dealId: undefined,
           meta: {
             networkId: 50,
             brandId: 303325,
-            brandName: 'OECTA'
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
           }
         }
       ];
-      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
-    it('should set dealId correctly', function () {
+    it('should use set bid[].ext.dealid if bid[].dealid is not present', function () {
       const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
-      bidResponse.seatbid[0].bid[0].ext.dealid = 'deal';
+      bidResponse.seatbid[0].bid[0].ext.dealid = 'ext-deal';
       const expectedParse = [
         {
           requestId: '1a2b3c4d',
@@ -910,17 +2974,18 @@ describe('IndexexchangeAdapter', function () {
           ad: '<a target="_blank" href="https://www.indexexchange.com"></a>',
           currency: 'USD',
           ttl: 300,
+          dealId: 'ext-deal',
           netRevenue: true,
-          dealId: 'deal',
           meta: {
             networkId: 50,
             brandId: 303325,
-            brandName: 'OECTA'
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
           }
         }
       ];
-      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA });
-      expect(result[0]).to.deep.equal(expectedParse[0]);
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
+      expect(result[0].dealId).to.deep.equal(expectedParse[0].dealId);
     });
 
     it('should get correct bid response for video ad', function () {
@@ -930,31 +2995,147 @@ describe('IndexexchangeAdapter', function () {
           cpm: 1.1,
           creativeId: '12346',
           mediaType: 'video',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [
+                [
+                  400,
+                  100
+                ]
+              ]
+            }
+          },
           width: 640,
           height: 480,
           currency: 'USD',
           ttl: 3600,
           netRevenue: true,
-          dealId: undefined,
           vastUrl: 'www.abcd.com/vast',
           meta: {
             networkId: 51,
             brandId: 303326,
-            brandName: 'OECTB'
+            brandName: 'OECTB',
+            advertiserDomains: ['www.abcd.com']
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
+        data: videoBidderRequest.data, validBidRequests: ONE_VIDEO
+      });
+
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    });
+
+    it('should set bid[].renderer if renderer not defined at mediaType.video level', function () {
+      const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
+        data: videoBidderRequest.data, validBidRequests: DEFAULT_MULTIFORMAT_BANNER_VALID_BID
+      });
+      expect(bid[0].renderer).to.exist;
+    });
+
+    it('should set renderer URL by parsing video response', function () {
+      const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
+        data: videoBidderRequest.data, validBidRequests: DEFAULT_MULTIFORMAT_BANNER_VALID_BID
+      });
+      expect(bid[0].renderer.url).to.equal(DEFAULT_VIDEO_BID_RESPONSE.ext.videoplayerurl);
+    });
+
+    it('should not set bid[].renderer if renderer defined at mediaType.video level', function () {
+      let outstreamAdUnit = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID);
+      outstreamAdUnit[0].mediaTypes.video.renderer = {
+        url: 'test',
+        render: function () { }
+      };
+      const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
+        data: videoBidderRequest.data, validBidRequests: outstreamAdUnit
+      });
+      expect(bid[0].renderer).to.be.undefined;
+    });
+
+    it('should not set bid[].renderer if renderer defined at the ad unit level', function () {
+      let outstreamAdUnit = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID);
+      outstreamAdUnit[0].renderer = {
+        url: 'test',
+        render: function () { }
+      };
+      const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
+        data: videoBidderRequest.data, validBidRequests: outstreamAdUnit
+      });
+      expect(bid[0].renderer).to.be.undefined;
+    });
+
+    it('should set bid[].renderer if ad unit renderer is invalid', function () {
+      let outstreamAdUnit = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID);
+      outstreamAdUnit[0].mediaTypes.video.renderer = {
+        url: 'test'
+      };
+      const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
+        data: videoBidderRequest.data, validBidRequests: outstreamAdUnit
+      });
+      expect(bid[0].renderer).to.exist;
+    });
+
+    it('should set bid[].renderer if ad unit renderer is a backup', function () {
+      let outstreamAdUnit = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID);
+      outstreamAdUnit[0].mediaTypes.video.renderer = {
+        url: 'test',
+        render: function () { },
+        backupOnly: true
+      };
+      const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
+        data: videoBidderRequest.data, validBidRequests: outstreamAdUnit
+      });
+      expect(bid[0].renderer).to.exist;
+    });
+
+    it('should get correct bid response for video ad and set bid.vastXml when mtype is 2 (video)', function () {
+      const expectedParse = [
+        {
+          requestId: '1a2b3c4e',
+          cpm: 1.1,
+          creativeId: '12346',
+          mediaType: 'video',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [
+                [
+                  400,
+                  100
+                ]
+              ]
+            }
+          },
+          width: 640,
+          height: 480,
+          currency: 'USD',
+          ttl: 3600,
+          netRevenue: true,
+          vastXml: '<?xml version=\"1.0\" encoding=\"UTF-8\"?><VAST xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"vast.xsd\" version=\"3.0\"> <Ad id=\"488427365\">  <InLine>   <AdSystem>Test</AdSystem>   <AdTitle>In-Stream Video</AdTitle> </InLine> </Ad></VAST',
+          meta: {
+            networkId: 51,
+            brandId: 303326,
+            brandName: 'OECTB',
+            advertiserDomains: ['www.abcd.com']
           }
         }
       ];
-      const result = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+      const result = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE_WITH_MTYPE_SET }, {
+        data: videoBidderRequest.data, validBidRequests: ONE_VIDEO
+      });
+
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
     it('bidrequest should not have page if options is undefined', function () {
       const options = {};
       const validBidWithoutreferInfo = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithoutreferInfo = JSON.parse(validBidWithoutreferInfo[0].data.r);
+      const requestWithoutreferInfo = extractPayload(validBidWithoutreferInfo[0]);
 
+      const expectedURL = IX_SECURE_ENDPOINT + '?s=' + DEFAULT_BANNER_VALID_BID[0].params.siteId
       expect(requestWithoutreferInfo.site.page).to.be.undefined;
-      expect(validBidWithoutreferInfo[0].url).to.equal(IX_SECURE_ENDPOINT);
+      expect(validBidWithoutreferInfo[0].url).to.equal(expectedURL);
     });
 
     it('bidrequest should not have page if options.refererInfo is an empty object', function () {
@@ -962,10 +3143,11 @@ describe('IndexexchangeAdapter', function () {
         refererInfo: {}
       };
       const validBidWithoutreferInfo = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithoutreferInfo = JSON.parse(validBidWithoutreferInfo[0].data.r);
+      const requestWithoutreferInfo = extractPayload(validBidWithoutreferInfo[0]);
 
+      const expectedURL = IX_SECURE_ENDPOINT + '?s=' + DEFAULT_BANNER_VALID_BID[0].params.siteId
       expect(requestWithoutreferInfo.site.page).to.be.undefined;
-      expect(validBidWithoutreferInfo[0].url).to.equal(IX_SECURE_ENDPOINT);
+      expect(validBidWithoutreferInfo[0].url).to.equal(expectedURL);
     });
 
     it('bidrequest should sent to secure endpoint if page url is secure', function () {
@@ -975,17 +3157,128 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const validBidWithoutreferInfo = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithoutreferInfo = JSON.parse(validBidWithoutreferInfo[0].data.r);
+      const requestWithoutreferInfo = extractPayload(validBidWithoutreferInfo[0]);
+
+      const expectedURL = IX_SECURE_ENDPOINT + '?s=' + DEFAULT_BANNER_VALID_BID[0].params.siteId
+      expect(requestWithoutreferInfo.site.page).to.equal(options.refererInfo.page);
+      expect(validBidWithoutreferInfo[0].url).to.equal(expectedURL);
+    });
 
-      expect(requestWithoutreferInfo.site.page).to.equal(options.refererInfo.referer);
-      expect(validBidWithoutreferInfo[0].url).to.equal(IX_SECURE_ENDPOINT);
+    it('should set bid[].ttl to seatbid[].bid[].exp value from response', function () {
+      const BANNER_RESPONSE_WITH_EXP = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
+      const VIDEO_RESPONSE_WITH_EXP = utils.deepClone(DEFAULT_VIDEO_BID_RESPONSE);
+      VIDEO_RESPONSE_WITH_EXP.seatbid[0].bid[0].exp = 200;
+      BANNER_RESPONSE_WITH_EXP.seatbid[0].bid[0].exp = 100;
+      const bannerResult = spec.interpretResponse({ body: BANNER_RESPONSE_WITH_EXP }, bannerBidderRequest);
+      const videoResult = spec.interpretResponse({ body: VIDEO_RESPONSE_WITH_EXP }, videoBidderRequest);
+
+      expect(bannerResult[0].ttl).to.equal(100);
+      expect(videoResult[0].ttl).to.equal(200);
+    });
+
+    it('should default bid[].ttl if seat[].bid[].exp is not in the resposne', function () {
+      const bannerResult = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, bannerBidderRequest);
+      const videoResult = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, videoBidderRequest);
+
+      expect(bannerResult[0].ttl).to.equal(300);
+      expect(videoResult[0].ttl).to.equal(3600);
+    });
+
+    it('should get correct bid response for native ad', function () {
+      const expectedParse = [
+        {
+          requestId: '1a2b3c4d',
+          cpm: 1,
+          creativeId: '12345',
+          mediaType: 'native',
+          width: 1,
+          height: 1,
+          currency: 'USD',
+          netRevenue: true,
+          meta: {
+            networkId: 50,
+            brandId: 303325,
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
+          },
+          native: {
+            ortb: {
+              assets: [
+                {
+                  'id': 0,
+                  'img': {
+                    'h': 250,
+                    'url': 'https://cdn.liftoff.io/customers/1209/creatives/2501-icon-250x250.png',
+                    'w': 250
+                  }
+                },
+                {
+                  'id': 1,
+                  'img': {
+                    'h': 627,
+                    'url': 'https://cdn.liftoff.io/customers/5a9cab9cc6/image/lambda_png/a0355879b06c09b09232.png',
+                    'w': 1200
+                  }
+                },
+                {
+                  'data': {
+                    'value': 'autodoc.co.uk'
+                  },
+                  'id': 2
+                },
+                {
+                  'data': {
+                    'value': 'Les pièces automobiles dont vous avez besoin, toujours sous la main.'
+                  },
+                  'id': 3
+                },
+                {
+                  'id': 4,
+                  'title': {
+                    'text': 'Autodoc'
+                  }
+                },
+                {
+                  'id': 5,
+                  'video': {
+                    'vasttag': '<VAST>blah</VAST>'
+                  }
+                }
+              ],
+              'eventtrackers': [
+                {
+                  'event': 1,
+                  'method': 1,
+                  'url': 'https://impression-europe.liftoff.io/index/impression'
+                },
+                {
+                  'event': 1,
+                  'method': 1,
+                  'url': 'https://a701.casalemedia.com/impression/v1'
+                }
+              ],
+              'link': {
+                'clicktrackers': [
+                  'https://click.liftoff.io/v1/campaign_click/blah'
+                ],
+                'url': 'https://play.google.com/store/apps/details?id=de.autodoc.gmbh'
+              },
+              'privacy': 'https://privacy.link.com',
+              'ver': '1.2'
+            }
+          },
+          ttl: 3600
+        }
+      ];
+      const result = spec.interpretResponse({ body: DEFAULT_NATIVE_BID_RESPONSE }, nativeBidderRequest);
+      expect(result[0]).to.deep.equal(expectedParse[0]);
     });
   });
 
   describe('bidrequest consent', function () {
     it('should have consent info if gdprApplies and consentString exist', function () {
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
 
       expect(requestWithConsent.regs.ext.gdpr).to.equal(1);
       expect(requestWithConsent.user.ext.consent).to.equal('3huaa11=qu3198ae');
@@ -999,7 +3292,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
 
       expect(requestWithConsent.regs.ext.gdpr).to.equal(1);
       expect(requestWithConsent.user).to.be.undefined;
@@ -1013,7 +3306,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
 
       expect(requestWithConsent.regs).to.be.undefined;
       expect(requestWithConsent.user.ext.consent).to.equal('3huaa11=qu3198ae');
@@ -1022,7 +3315,7 @@ describe('IndexexchangeAdapter', function () {
     it('should not have consent info if options.gdprConsent is undefined', function () {
       const options = {};
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
 
       expect(requestWithConsent.regs).to.be.undefined;
       expect(requestWithConsent.user).to.be.undefined;
@@ -1033,7 +3326,7 @@ describe('IndexexchangeAdapter', function () {
         uspConsent: '1YYN'
       };
       const validBidWithUspConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithUspConsent = JSON.parse(validBidWithUspConsent[0].data.r);
+      const requestWithUspConsent = extractPayload(validBidWithUspConsent[0]);
 
       expect(requestWithUspConsent.regs.ext.us_privacy).to.equal('1YYN');
     });
@@ -1041,7 +3334,7 @@ describe('IndexexchangeAdapter', function () {
     it('should not have us_privacy if uspConsent undefined', function () {
       const options = {};
       const validBidWithUspConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithUspConsent = JSON.parse(validBidWithUspConsent[0].data.r);
+      const requestWithUspConsent = extractPayload(validBidWithUspConsent[0]);
 
       expect(requestWithUspConsent.regs).to.be.undefined;
     });
@@ -1055,9 +3348,463 @@ describe('IndexexchangeAdapter', function () {
         uspConsent: '1YYN'
       };
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
       expect(requestWithConsent.regs.ext.gdpr).to.equal(1);
       expect(requestWithConsent.regs.ext.us_privacy).to.equal('1YYN');
     });
+
+    it('should contain `consented_providers_settings.consented_providers` & consent on user.ext when both are provided', function () {
+      const options = {
+        gdprConsent: {
+          consentString: '3huaa11=qu3198ae',
+          addtlConsent: '1~1.35.41.101',
+        }
+      };
+
+      const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
+      expect(requestWithConsent.user.ext.consented_providers_settings.consented_providers).to.equal('1~1.35.41.101');
+      expect(requestWithConsent.user.ext.consent).to.equal('3huaa11=qu3198ae');
+    });
+
+    it('should not contain `consented_providers_settings.consented_providers` on user.ext when consent is not provided', function () {
+      const options = {
+        gdprConsent: {
+          addtlConsent: '1~1.35.41.101',
+        }
+      };
+
+      const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
+      expect(utils.deepAccess(requestWithConsent, 'user.ext.consented_providers_settings')).to.not.exist;
+      expect(utils.deepAccess(requestWithConsent, 'user.ext.consent')).to.not.exist;
+    });
+
+    it('should set coppa to 1 in config when enabled', () => {
+      config.setConfig({ coppa: true })
+      const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
+      const r = extractPayload(bid[0]);
+
+      expect(r.regs.coppa).to.equal(1);
+    });
+    it('should not set coppa in config when disabled', () => {
+      config.setConfig({ coppa: false })
+      const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
+      const r = extractPayload(bid[0]);
+
+      expect(r.regs.coppa).to.be.undefined;
+    });
+    it('should not set coppa when not specified in config', () => {
+      config.resetConfig();
+      const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
+      const r = extractPayload(bid[0]);
+
+      expect(r.regs.coppa).to.be.undefined;
+    });
+  });
+
+  describe('Features', () => {
+    let localStorageValues = {};
+    let sandbox = sinon.sandbox.create();
+    let setDataInLocalStorageStub;
+    let getDataFromLocalStorageStub;
+    let removeDataFromLocalStorageStub;
+    const serverResponse = {
+      body: {
+        ext: {
+          features: {
+            test: {
+              activated: false
+            }
+          }
+        }
+      }
+    };
+
+    beforeEach(() => {
+      localStorageValues = {};
+      sandbox = sinon.sandbox.create();
+      setDataInLocalStorageStub = sandbox.stub(storage, 'setDataInLocalStorage').callsFake((key, value) => localStorageValues[key] = value);
+      getDataFromLocalStorageStub = sandbox.stub(storage, 'getDataFromLocalStorage').callsFake((key) => localStorageValues[key]);
+      removeDataFromLocalStorageStub = sandbox.stub(storage, 'removeDataFromLocalStorage').callsFake((key) => delete localStorageValues[key]);
+    });
+
+    afterEach(() => {
+      setDataInLocalStorageStub.restore();
+      getDataFromLocalStorageStub.restore();
+      removeDataFromLocalStorageStub.restore();
+      serverResponse.body.ext.features = {
+        test: {
+          activated: false
+        }
+      };
+      localStorageValues = {};
+      sandbox.restore();
+    });
+
+    it('should store features in internal cache', () => {
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.false;
+    });
+
+    it('should retrieve features from internal cache', () => {
+      const feature = {
+        ext: {
+          features: {
+            test: {
+              activated: true
+            }
+          }
+        }
+      }
+      FEATURE_TOGGLES.setFeatureToggles(feature);
+      feature.ext.features.test.activated = false;
+      FEATURE_TOGGLES.featureToggles = {
+        features: feature.ext.features
+      };
+      expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.false;
+    });
+
+    it('should store features in localstorage when enabled', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.test.activated = true;
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+
+      const lsData = JSON.parse(storage.getDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY));
+      expect(lsData.features.test.activated).to.be.true;
+    });
+
+    it('should retrive features from localstorage when enabled', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.test.activated = true;
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      FEATURE_TOGGLES.featureToggles = {};
+      FEATURE_TOGGLES.getFeatureToggles(LOCAL_STORAGE_FEATURE_TOGGLES_KEY);
+      expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.true;
+    });
+
+    it('should remove features from after expiry', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      const expiryTime = new Date();
+      localStorageValues = {
+        expiry: expiryTime.setHours(expiryTime.getHours() - 2),
+        features: {
+          test: {
+            activated: true
+          }
+        }
+      }
+      FEATURE_TOGGLES.getFeatureToggles(LOCAL_STORAGE_FEATURE_TOGGLES_KEY);
+      expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.undefined;
+      expect(FEATURE_TOGGLES.featureToggles).to.deep.equal({});
+    });
+
+    it('should set request size limit to 32KB when its feature enabled', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.pbjs_use_32kb_size_limit = {
+        activated: true
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.bidderRequestId = Array(10000).join('#');
+
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+      spec.buildRequests([bid], {});
+      const lsData = JSON.parse(storage.getDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY));
+      expect(lsData.features.pbjs_use_32kb_size_limit.activated).to.be.true;
+    });
+
+    it('6 ad units should generate only 2 requests if 32kb size limit FT is enabled', function () {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.pbjs_use_32kb_size_limit = {
+        activated: true
+      };
+      serverResponse.body.ext.features.pbjs_enable_post = {
+        activated: true
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+      bid1.params.siteId = '121';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = 'tr1';
+      bid1.bidId = '2f6g5s5e';
+
+      const bid2 = utils.deepClone(bid1);
+      bid2.transactionId = 'tr2';
+
+      const bid3 = utils.deepClone(bid1);
+      bid3.transactionId = 'tr3';
+
+      const bid4 = utils.deepClone(bid1);
+      bid4.transactionId = 'tr4';
+
+      const bid5 = utils.deepClone(bid1);
+      bid5.transactionId = 'tr5';
+
+      const bid6 = utils.deepClone(bid1);
+      bid6.transactionId = 'tr6';
+
+      const requests = spec.buildRequests([bid1, bid2, bid3, bid4, bid5, bid6], DEFAULT_OPTION);
+
+      expect(requests).to.be.an('array');
+      // 32KB size limit causes only 2 requests to get generated.
+      expect(requests).to.have.lengthOf(2);
+      for (let request of requests) {
+        expect(request.method).to.equal('POST');
+      }
+    });
+
+    it('4 ad units should generate only 1 requests if 32kb size limit FT is enabled', function () {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.pbjs_use_32kb_size_limit = {
+        activated: true
+      };
+      serverResponse.body.ext.features.pbjs_enable_post = {
+        activated: true
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+      bid1.params.siteId = '121';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = 'tr1';
+      bid1.bidId = '2f6g5s5e';
+
+      const bid2 = utils.deepClone(bid1);
+      bid2.transactionId = 'tr2';
+
+      const bid3 = utils.deepClone(bid1);
+      bid3.transactionId = 'tr3';
+
+      const bid4 = utils.deepClone(bid1);
+      bid4.transactionId = 'tr4';
+
+      const requests = spec.buildRequests([bid1, bid2, bid3, bid4], DEFAULT_OPTION);
+
+      expect(requests).to.be.an('array');
+      // 32KB size limit causes only 1 requests to get generated.
+      expect(requests).to.have.lengthOf(1);
+      for (let request of requests) {
+        expect(request.method).to.equal('POST');
+      }
+    });
+  });
+
+  describe('LocalStorage error codes', () => {
+    let TODAY = new Date().toISOString().slice(0, 10);
+    const key = 'ixdiag';
+
+    let sandbox;
+    let setDataInLocalStorageStub;
+    let getDataFromLocalStorageStub;
+    let removeDataFromLocalStorageStub;
+    let localStorageValues = {};
+
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      setDataInLocalStorageStub = sandbox.stub(storage, 'setDataInLocalStorage').callsFake((key, value) => localStorageValues[key] = value)
+      getDataFromLocalStorageStub = sandbox.stub(storage, 'getDataFromLocalStorage').callsFake((key) => localStorageValues[key])
+      removeDataFromLocalStorageStub = sandbox.stub(storage, 'removeDataFromLocalStorage').callsFake((key) => delete localStorageValues[key])
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+    });
+
+    afterEach(() => {
+      setDataInLocalStorageStub.restore();
+      getDataFromLocalStorageStub.restore();
+      removeDataFromLocalStorageStub.restore();
+      localStorageValues = {};
+      sandbox.restore();
+
+      config.setConfig({
+        ortb2: {},
+        ix: {},
+      })
+    });
+
+    it('should not log error in LocalStorage when there is no logError called.', () => {
+      const bid = DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0];
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+      expect(localStorageValues[key]).to.be.undefined;
+    });
+
+    it('should log ERROR_CODES.BID_SIZE_INVALID_FORMAT in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.size = ['400', 100];
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.BID_SIZE_INVALID_FORMAT]: 1 } });
+    });
+
+    it('should log ERROR_CODES.BID_SIZE_NOT_INCLUDED in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.size = [407, 100];
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.BID_SIZE_NOT_INCLUDED]: 1 } });
+    });
+
+    it('should log ERROR_CODES.PROPERTY_NOT_INCLUDED in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.video = {};
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.PROPERTY_NOT_INCLUDED]: 4 } });
+    });
+
+    it('should log ERROR_CODES.SITE_ID_INVALID_VALUE in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.siteId = false;
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.SITE_ID_INVALID_VALUE]: 1 } });
+    });
+
+    it('should log ERROR_CODES.BID_FLOOR_INVALID_FORMAT in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.bidFloor = true;
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.BID_FLOOR_INVALID_FORMAT]: 1 } });
+    });
+
+    it('should log ERROR_CODES.IX_FPD_EXCEEDS_MAX_SIZE in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+
+      config.setConfig({
+        ix: {
+          firstPartyData: {
+            cd: Array(1700).join('#')
+          }
+        }
+      });
+
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+      spec.buildRequests([bid], {});
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.IX_FPD_EXCEEDS_MAX_SIZE]: 2 } });
+    });
+
+    it('should log ERROR_CODES.EXCEEDS_MAX_SIZE in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.bidderRequestId = Array(8000).join('#');
+
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+      spec.buildRequests([bid], {});
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.EXCEEDS_MAX_SIZE]: 2 } });
+    });
+
+    it('should log ERROR_CODES.PB_FPD_EXCEEDS_MAX_SIZE in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      const ortb2 = {
+        site: {
+          ext: {
+            data: {
+              pageType: Array(5700).join('#')
+            }
+          }
+        }
+      };
+
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+      spec.buildRequests([bid], { ortb2 });
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.PB_FPD_EXCEEDS_MAX_SIZE]: 2 } });
+    });
+
+    it('should log ERROR_CODES.VIDEO_DURATION_INVALID in LocalStorage when there is logError called.', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.video.minduration = 1;
+      bid.params.video.maxduration = 0;
+
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+      spec.buildRequests([bid]);
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.VIDEO_DURATION_INVALID]: 2 } });
+    });
+
+    it('should increment errors for errorCode', () => {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.video = {};
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.PROPERTY_NOT_INCLUDED]: 4 } });
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.PROPERTY_NOT_INCLUDED]: 8 } });
+    });
+
+    it('should add new errorCode to ixdiag.', () => {
+      let bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.size = ['400', 100];
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.BID_SIZE_INVALID_FORMAT]: 1 } });
+
+      bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.siteId = false;
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({
+        [TODAY]: {
+          [ERROR_CODES.BID_SIZE_INVALID_FORMAT]: 1,
+          [ERROR_CODES.SITE_ID_INVALID_VALUE]: 1
+        }
+      });
+    });
+
+    it('should clear errors with successful response', () => {
+      const ixdiag = { [TODAY]: { '1': 1, '3': 8, '4': 1 } };
+      setDataInLocalStorageStub(key, JSON.stringify(ixdiag));
+
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal(ixdiag);
+
+      const request = DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0];
+      expect(spec.isBidRequestValid(request)).to.be.true;
+
+      const data = {
+        id: '345',
+        imp: [
+          {
+            id: '1a2b3c4e',
+          }
+        ],
+        ext: {
+          ixdiag: {
+            err: {
+              '4': 8
+            }
+          }
+        }
+      };
+
+      const validBidRequest = DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0];
+
+      spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data, validBidRequest });
+
+      expect(localStorageValues[key]).to.be.undefined;
+    });
+
+    it('should clear errors after 7 day expiry errorCode', () => {
+      const EXPIRED_DATE = '2019-12-12';
+
+      const ixdiag = { [EXPIRED_DATE]: { '1': 1, '3': 8, '4': 1 }, [TODAY]: { '3': 8, '4': 1 } };
+      setDataInLocalStorageStub(key, JSON.stringify(ixdiag));
+
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.size = ['400', 100];
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(JSON.parse(localStorageValues[key])[EXPIRED_DATE]).to.be.undefined;
+      expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { '1': 1, '3': 8, '4': 1 } })
+    });
+
+    it('should not save error data into localstorage if consent is not given', () => {
+      config.setConfig({ deviceAccess: false });
+      storage.localStorageIsEnabled.restore(); // let core manage device access
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.params.size = ['400', 100];
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      expect(localStorageValues[key]).to.be.undefined;
+    });
   });
 });
diff --git a/test/spec/modules/jcmBidAdapter_spec.js b/test/spec/modules/jcmBidAdapter_spec.js
deleted file mode 100644
index 9d84bca5513..00000000000
--- a/test/spec/modules/jcmBidAdapter_spec.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/jcmBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-const ENDPOINT = 'https://media.adfrontiers.com/';
-
-describe('jcmAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'jcm',
-      'params': {
-        'siteId': '3608'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        'bidder': 'jcm',
-        'params': {
-          'siteId': '3608'
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      }
-
-    ];
-
-    const request = spec.buildRequests(bidRequests);
-
-    it('sends bid request to ENDPOINT via GET', function () {
-      expect(request.method).to.equal('GET');
-    });
-
-    it('sends correct bid parameters', function () {
-      const payloadArr = request.data.split('&');
-      expect(request.method).to.equal('GET');
-      expect(payloadArr.length).to.equal(4);
-      expect(payloadArr[0]).to.equal('t=hb');
-      expect(payloadArr[1]).to.equal('ver=1.0');
-      expect(payloadArr[2]).to.equal('compact=true');
-      const adReqStr = request.data.split('&bids=')[1];
-      const adReq = JSON.parse(decodeURIComponent(adReqStr));
-      const adReqBid = JSON.parse(decodeURIComponent(adReqStr)).bids[0];
-      expect(adReqBid.siteId).to.equal('3608');
-      expect(adReqBid.callbackId).to.equal('30b31c1838de1e');
-      expect(adReqBid.adSizes).to.equal('300x250,300x600');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('should get correct bid response', function () {
-      let serverResponse = {'bids': [{'width': 300, 'height': 250, 'creativeId': '29681110', 'ad': '<!-- Creative -->', 'cpm': 0.5, 'callbackId': '30b31c1838de1e'}]};
-
-      let expectedResponse = [
-        {
-          'requestId': '30b31c1838de1e',
-          'bidderCode': 'jcm',
-          'cpm': 0.5,
-          'creativeId': '29681110',
-          'width': 300,
-          'height': 250,
-          'ttl': 60,
-          'currency': 'USA',
-          'netRevenue': true,
-          'ad': '<!-- Creative -->',
-        }
-      ];
-
-      let result = spec.interpretResponse({ body: serverResponse });
-      expect(Object.keys(result[0]).length).to.equal(Object.keys(expectedResponse[0]).length);
-      expect(Object.keys(result[0]).requestId).to.equal(Object.keys(expectedResponse[0]).requestId);
-      expect(Object.keys(result[0]).bidderCode).to.equal(Object.keys(expectedResponse[0]).bidderCode);
-      expect(Object.keys(result[0]).cpm).to.equal(Object.keys(expectedResponse[0]).cpm);
-      expect(Object.keys(result[0]).creativeId).to.equal(Object.keys(expectedResponse[0]).creativeId);
-      expect(Object.keys(result[0]).width).to.equal(Object.keys(expectedResponse[0]).width);
-      expect(Object.keys(result[0]).height).to.equal(Object.keys(expectedResponse[0]).height);
-      expect(Object.keys(result[0]).ttl).to.equal(Object.keys(expectedResponse[0]).ttl);
-      expect(Object.keys(result[0]).currency).to.equal(Object.keys(expectedResponse[0]).currency);
-      expect(Object.keys(result[0]).netRevenue).to.equal(Object.keys(expectedResponse[0]).netRevenue);
-
-      expect(Object.keys(result[0]).ad).to.equal(Object.keys(expectedResponse[0]).ad);
-    });
-
-    it('handles nobid responses', function () {
-      let serverResponse = {'bids': []};
-
-      let result = spec.interpretResponse({ body: serverResponse });
-      expect(result.length).to.equal(0);
-    });
-  });
-  describe('getUserSyncs', function () {
-    it('Verifies sync iframe option', function () {
-      expect(spec.getUserSyncs({})).to.be.undefined;
-      expect(spec.getUserSyncs({ iframeEnabled: false })).to.be.undefined;
-      const options = spec.getUserSyncs({ iframeEnabled: true });
-      expect(options).to.not.be.undefined;
-      expect(options).to.have.lengthOf(1);
-      expect(options[0].type).to.equal('iframe');
-      expect(options[0].url).to.equal('https://media.adfrontiers.com/hb/jcm_usersync.html');
-    });
-
-    it('Verifies sync image option', function () {
-      expect(spec.getUserSyncs({ image: false })).to.be.undefined;
-      const options = spec.getUserSyncs({ image: true });
-      expect(options).to.not.be.undefined;
-      expect(options).to.have.lengthOf(1);
-      expect(options[0].type).to.equal('image');
-      expect(options[0].url).to.equal('https://media.adfrontiers.com/hb/jcm_usersync.png');
-    });
-  });
-});
diff --git a/test/spec/modules/jixieBidAdapter_spec.js b/test/spec/modules/jixieBidAdapter_spec.js
new file mode 100644
index 00000000000..c354de3c3ac
--- /dev/null
+++ b/test/spec/modules/jixieBidAdapter_spec.js
@@ -0,0 +1,741 @@
+import { expect } from 'chai';
+import { spec, internal as jixieaux, storage } from 'modules/jixieBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+
+describe('jixie Adapter', function () {
+  const pageurl_ = 'https://testdomain.com/testpage.html';
+  const domain_ = 'https://testdomain.com';
+  const device_ = 'desktop';
+  const timeout_ = 1000;
+  const currency_ = 'USD';
+  const keywords_ = '';
+
+  /**
+   * Basic
+   */
+  const adapter = newBidder(spec);
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  /**
+   * isBidRequestValid
+   */
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'jixie',
+      'params': {
+        'unit': 'prebidsampleunit'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params obj does not exist', function () {
+      let bid0 = Object.assign({}, bid);
+      delete bid0.params;
+      expect(spec.isBidRequestValid(bid0)).to.equal(false);
+    });
+
+    it('should return false when params obj does not contain unit property', function () {
+      let bid1 = Object.assign({}, bid);
+      bid1.params = { rubbish: '' };
+      expect(spec.isBidRequestValid(bid1)).to.equal(false);
+    });
+  });// describe
+
+  /**
+   * buildRequests
+   */
+  describe('buildRequests', function () {
+    const adUnitCode0_ = 'adunit-code-0';
+    const adUnitCode1_ = 'adunit-code-1';
+    const adUnitCode2_ = 'adunit-code-2';
+
+    const bidId0_ = '22a9eb5004cf082';
+    const bidId1_ = '230fceb12fd754f';
+    const bidId2_ = '24dbe5c4fb80ed8';
+
+    const bidderRequestId_ = '2131ce076eeaa1b';
+    const auctionId_ = '26d68819-d6ce-4a2c-a4d3-f1a97b159d66';
+
+    const clientIdTest1_ = '1aba6a40-f711-11e9-868c-53a2ae972xxx';
+    const sessionIdTest1_ = '1594782644-1aba6a40-f711-11e9-868c-53a2ae972xxx';
+    const jxtokoTest1_ = 'eyJJRCI6ImFiYyJ9';
+
+    // to serve as the object that prebid will call jixie buildRequest with: (param2)
+    const bidderRequest_ = {
+      refererInfo: {referer: pageurl_},
+      auctionId: auctionId_,
+      timeout: timeout_
+    };
+    // to serve as the object that prebid will call jixie buildRequest with: (param1)
+    let bidRequests_ = [
+      {
+        'bidder': 'jixie',
+        'params': {
+          'unit': 'prebidsampleunit'
+        },
+        'sizes': [[300, 250], [300, 600]],
+        'adUnitCode': adUnitCode0_,
+        'bidId': bidId0_,
+        'bidderRequestId': bidderRequestId_,
+        'auctionId': auctionId_
+      },
+      {
+        'bidder': 'jixie',
+        'params': {
+          'unit': 'prebidsampleunit'
+        },
+        'sizes': [[300, 250]],
+        'mediaTypes': {
+          'video': {
+            'playerSize': [640, 360]
+          },
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'adUnitCode': adUnitCode1_,
+        'bidId': bidId1_,
+        'bidderRequestId': bidderRequestId_,
+        'auctionId': auctionId_
+      },
+      {
+        'bidder': 'jixie',
+        'params': {
+          'unit': 'prebidsampleunit'
+        },
+        'sizes': [[300, 250], [300, 600]],
+        'mediaTypes': {
+          'video': {
+            'playerSize': [640, 360]
+          },
+          'banner': {
+            'sizes': [[300, 250], [300, 600]]
+          }
+        },
+        'adUnitCode': adUnitCode2_,
+        'bidId': bidId2_,
+        'bidderRequestId': bidderRequestId_,
+        'auctionId': auctionId_
+      }
+    ];
+
+    // To serve as a reference to check against the bids array portion of the blob that the call to
+    // buildRequest returns
+    const refBids_ = [
+      {
+        'bidId': bidId0_,
+        'adUnitCode': adUnitCode0_,
+        'sizes': [[300, 250], [300, 600]],
+        'params': {
+          'unit': 'prebidsampleunit'
+        }
+      },
+      {
+        'bidId': bidId1_,
+        'adUnitCode': adUnitCode1_,
+        'mediaTypes': {
+          'video': {
+            'playerSize': [640, 360]
+          },
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'sizes': [[300, 250]],
+        'params': {
+          'unit': 'prebidsampleunit'
+        }
+      },
+      {
+        'bidId': bidId2_,
+        'adUnitCode': adUnitCode2_,
+        'mediaTypes': {
+          'video': {
+            'playerSize': [640, 360]
+          },
+          'banner': {
+            'sizes': [[300, 250], [300, 600]]
+          }
+        },
+        'sizes': [[300, 250], [300, 600]],
+        'params': {
+          'unit': 'prebidsampleunit'
+        }
+      }
+    ];
+
+    it('should attach valid params to the adserver endpoint (1)', function () {
+      // this one we do not intercept the cookie stuff so really don't know
+      // what will be in there. so we do not check here (using expect)
+      // The next next below we check
+      const request = spec.buildRequests(bidRequests_, bidderRequest_);
+      it('sends bid request to ENDPOINT via POST', function () {
+        expect(request.method).to.equal('POST')
+      })
+      expect(request.data).to.be.an('string');
+      const payload = JSON.parse(request.data);
+      expect(payload).to.have.property('auctionid', auctionId_);
+      expect(payload).to.have.property('timeout', timeout_);
+      expect(payload).to.have.property('currency', currency_);
+      expect(payload).to.have.property('bids').that.deep.equals(refBids_);
+    });// it
+
+    it('should attach valid params to the adserver endpoint (2)', function () {
+      // similar to above test case but here we force some clientid sessionid values
+      // and domain, pageurl
+      // get the interceptors ready:
+      let getCookieStub = sinon.stub(storage, 'getCookie');
+      let getLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      getCookieStub
+        .withArgs('_jxtoko')
+        .returns(jxtokoTest1_);
+      getCookieStub
+        .withArgs('_jxx')
+        .returns(clientIdTest1_);
+      getCookieStub
+        .withArgs('_jxxs')
+        .returns(sessionIdTest1_);
+      getLocalStorageStub
+        .withArgs('_jxx')
+        .returns(clientIdTest1_);
+      getLocalStorageStub
+        .withArgs('_jxxs')
+        .returns(sessionIdTest1_
+        );
+      let miscDimsStub = sinon.stub(jixieaux, 'getMiscDims');
+      miscDimsStub
+        .returns({ device: device_, pageurl: pageurl_, domain: domain_, mkeywords: keywords_ });
+
+      // actual api call:
+      const request = spec.buildRequests(bidRequests_, bidderRequest_);
+      it('sends bid request to ENDPOINT via POST', function () {
+        expect(request.method).to.equal('POST')
+      })
+      expect(request.data).to.be.an('string');
+      const payload = JSON.parse(request.data);
+      expect(payload).to.have.property('auctionid', auctionId_);
+      expect(payload).to.have.property('client_id_c', clientIdTest1_);
+      expect(payload).to.have.property('client_id_ls', clientIdTest1_);
+      expect(payload).to.have.property('session_id_c', sessionIdTest1_);
+      expect(payload).to.have.property('session_id_ls', sessionIdTest1_);
+      expect(payload).to.have.property('jxtoko_id', jxtokoTest1_);
+      expect(payload).to.have.property('device', device_);
+      expect(payload).to.have.property('domain', domain_);
+      expect(payload).to.have.property('pageurl', pageurl_);
+      expect(payload).to.have.property('mkeywords', keywords_);
+      expect(payload).to.have.property('timeout', timeout_);
+      expect(payload).to.have.property('currency', currency_);
+      expect(payload).to.have.property('bids').that.deep.equals(refBids_);
+
+      // unwire interceptors
+      getCookieStub.restore();
+      getLocalStorageStub.restore();
+      miscDimsStub.restore();
+    });// it
+
+    it('it should popular the pricegranularity when info is available', function () {
+      let content = {
+        'ranges': [{
+          'max': 12,
+          'increment': 0.5
+        },
+        {
+          'max': 5,
+          'increment': 0.1
+        }],
+        precision: 1
+      };
+      let getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.callsFake(function fakeFn(prop) {
+        if (prop == 'priceGranularity') {
+          return content;
+        }
+        return null;
+      });
+
+      const oneSpecialBidReq = Object.assign({}, bidRequests_[0]);
+      const request = spec.buildRequests([oneSpecialBidReq], bidderRequest_);
+      const payload = JSON.parse(request.data);
+      getConfigStub.restore();
+      expect(payload.pricegranularity).to.deep.include(content);
+    });
+
+    it('it should popular the device info when it is available', function () {
+      let getConfigStub = sinon.stub(config, 'getConfig');
+      let content = {w: 500, h: 400};
+      getConfigStub.callsFake(function fakeFn(prop) {
+        if (prop == 'device') {
+          return content;
+        }
+        return null;
+      });
+      const oneSpecialBidReq = Object.assign({}, bidRequests_[0]);
+      const request = spec.buildRequests([oneSpecialBidReq], bidderRequest_);
+      const payload = JSON.parse(request.data);
+      getConfigStub.restore();
+      expect(payload.device).to.have.property('ua', navigator.userAgent);
+      expect(payload.device).to.deep.include(content);
+    });
+
+    it('schain info should be accessible when available', function () {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'ssp.test',
+          sid: '00001',
+          hp: 1
+        }]
+      };
+      const oneSpecialBidReq = Object.assign({}, bidRequests_[0], { schain: schain });
+      const request = spec.buildRequests([oneSpecialBidReq], bidderRequest_);
+      const payload = JSON.parse(request.data);
+      expect(payload.schain).to.deep.equal(schain);
+      expect(payload.schain).to.deep.include(schain);
+    });
+
+    it('should populate eids when supported userIds are available', function () {
+      const oneSpecialBidReq = Object.assign({}, bidRequests_[0], {
+        userId: {
+          tdid: '11111111-2222-3333-4444-555555555555',
+          uid2: { id: 'AbCdEfGhIjKlMnO9qdQBW7qtMw8f1WTUvtkHe6u+fqLfhbtsqrJ697Z6YoI3IB9klGUv1wvlFIbwH7ELDlqQBGtj8AC1v7fMJ/Q45E7W90dts7UQLTDMLNmtHBRDXVb0Fpas4Vh3yN1jGVQNhzXC/RpGIVtZE8dCxcjfa7VfcTNcvxxxxx==' },
+          pubProvidedId: [{
+            source: 'puburl1.com',
+            uids: [{
+              id: 'pubid1',
+              atype: 1,
+              ext: {
+                stype: 'ppuid'
+              }
+            }]
+          }, {
+            source: 'puburl2.com',
+            uids: [{
+              id: 'pubid2'
+            }]
+          }]
+        }
+      });
+      const request = spec.buildRequests([oneSpecialBidReq], bidderRequest_);
+      const payload = JSON.parse(request.data);
+      expect(payload.eids).to.deep.include({
+        'source': 'adserver.org',
+        'uids': [
+          {
+            'id': '11111111-2222-3333-4444-555555555555',
+            'atype': 1,
+            'ext': {
+              'rtiPartner': 'TDID'
+            }
+          }
+        ]
+      });
+      expect(payload.eids).to.deep.include({
+        'source': 'uidapi.com',
+        'uids': [
+          {
+            'id': 'AbCdEfGhIjKlMnO9qdQBW7qtMw8f1WTUvtkHe6u+fqLfhbtsqrJ697Z6YoI3IB9klGUv1wvlFIbwH7ELDlqQBGtj8AC1v7fMJ/Q45E7W90dts7UQLTDMLNmtHBRDXVb0Fpas4Vh3yN1jGVQNhzXC/RpGIVtZE8dCxcjfa7VfcTNcvxxxxx==',
+            'atype': 3
+          }
+        ]
+      });
+
+      expect(payload.eids).to.deep.include({
+        'source': 'puburl1.com',
+        'uids': [
+          {
+            'id': 'pubid1',
+            'atype': 1,
+            'ext': {
+              'stype': 'ppuid'
+            }
+          }
+        ]
+      });
+
+      expect(payload.eids).to.deep.include({
+        'source': 'puburl2.com',
+        'uids': [
+          {
+            'id': 'pubid2'
+          }
+        ]
+      });
+    });
+  });// describe
+
+  /**
+   * interpretResponse:
+   */
+  const JX_OTHER_OUTSTREAM_RENDERER_URL = 'https://scripts.jixie.media/dummyscript.js';
+  const JX_OUTSTREAM_RENDERER_URL = 'https://scripts.jixie.media/jxhbrenderer.1.1.min.js';
+
+  const mockVastXml_ = `<?xml version="1.0" encoding="UTF-8"?><VAST xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vast.xsd" version="3.0"><Ad id="JXAD521"><InLine><AdSystem>JXADSERVER</AdSystem><AdTitle>Alway%20Live%20Prebid%20Creative</AdTitle><Description>Hybrid in-stream</Description><Error><![CDATA[https://demo.com?action=error&errorcode=[ERRORCODE]&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Error><Impression><![CDATA[https://demo.com?action=impression&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Impression><Creatives><Creative id="JXAD521" sequence="1"><Linear><Duration>00:00:10</Duration><TrackingEvents><Tracking event="start"><![CDATA[https://demo.com?action=start&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://demo.com?action=firstQuartile&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="midpoint"><![CDATA[https://demo.com?action=midpoint&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://demo.com?action=thirdQuartile&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="complete"><![CDATA[https://demo.com?action=complete&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="mute"><![CDATA[https://demo.com?action=mute&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="unmute"><![CDATA[https://demo.com?action=unmute&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="rewind"><![CDATA[https://demo.com?action=rewind&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="pause"><![CDATA[https://demo.com?action=pause&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="resume"><![CDATA[https://demo.com?action=resume&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="fullscreen"><![CDATA[https://demo.com?action=fullscreen&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking><Tracking event="creativeView"><![CDATA[https://demo.com?action=creativeView&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></Tracking></TrackingEvents><VideoClicks><ClickThrough><![CDATA[https://toko-iot.com/search/?q=Sonos&utm_source=ivs&utm_medium=video&utm_campaign=promo&utm_content=sonos_category]]></ClickThrough><ClickTracking id="521"><![CDATA[https://demo.com?action=click&mediaurl=[ASSETURI]&abc=1&stackidx=0]]></ClickTracking></VideoClicks><MediaFiles><MediaFile apiFramework="VPAID" type="application/javascript"><![CDATA[https://creatives.b-cdn.net/js/jxvpaid_1_0.min.js]]></MediaFile></MediaFiles><AdParameters><![CDATA[{"embed":true,"videos":[{"url":"https://creative-ivstream.ivideosmart.com/3001004/954006/3001004-954006_240.mp4","bitrate":186,"mimetype":"video/mp4"},{"url":"https://creative-ivstream.ivideosmart.com/3001004/954006/3001004-954006_360.mp4","bitrate":229,"mimetype":"video/mp4"},{"url":"https://creative-ivstream.ivideosmart.com/3001004/954006/3001004-954006_480.mp4","bitrate":279,"mimetype":"video/mp4"},{"url":"https://creative-ivstream.ivideosmart.com/3001004/954006/3001004-954006_720.mp4","bitrate":325,"mimetype":"video/mp4"}],"countpos":"left","hotspots":[{"type":"direct_url","start":0,"duration":10,"position":"top-right","direct_url":"https://toko-iot.com/catalogue/category/audio_8/?utm_source=ivs&utm_medium=banner&utm_campaign=promo&utm_content=audio_category","thumbnail_url":"https://creatives.ivideosmart.com/hotspots/TokoIOT_1.gif","thumbnail_style":"full-height"}],"clickthru":"https://toko-iot.com/search/?q=Sonos&utm_source=ivs&utm_medium=video&utm_campaign=promo&utm_content=sonos_category","reporting":{},"skipoffset":5}]]></AdParameters><Icons><Icon program="AdChoices" width="20" height="20" xPosition="right" yPosition="top" offset="00:00:02"><StaticResource creativeType="image/png"><![CDATA[https://creatives.jixie.media/jxadchoice.png]]></StaticResource><IconClicks><IconClickThrough><![CDATA[https://www.jixie.io/privacy-policy]]></IconClickThrough></IconClicks></Icon></Icons></Linear></Creative><Creative sequence="1"/></Creatives></InLine></Ad></VAST>`;
+  const responseBody_ = {
+    'bids': [
+      // video (vast tag url) returned here
+      {
+        'trackingUrlBase': 'https://traid.jixie.io/sync/ad?',
+        'jxBidId': '62847e4c696edcb-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        'requestId': '62847e4c696edcb',
+        'cpm': 2.19,
+        'width': 640,
+        'height': 360,
+        'ttl': 300,
+        'adUnitCode': 'demoslot3-div',
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': 'jixie522',
+        'meta': {
+          'networkId': 123,
+          'networkName': 'network123',
+          'agencyId': 123,
+          'agencyName': 'agency123',
+          'advertiserId': 123,
+          'advertiserName': 'advertiser123',
+          'brandId': 123,
+          'brandName': 'brand123',
+          'primaryCatId': 1,
+          'secondaryCatIds': [
+            2,
+            3,
+            4
+          ],
+          'mediaType': 'VIDEO'
+        },
+        'vastUrl': 'https://ad.jixie.io/v1/video?creativeid=522'
+      },
+      // display ad returned here: This one there is advertiserDomains
+      // in the response . Will be checked in the unit tests below
+      {
+        'trackingUrlBase': 'https://traid.jixie.io/sync/ad?',
+        'jxBidId': '600c9ae6fda1acb-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        'requestId': '600c9ae6fda1acb',
+        'cpm': 1.999,
+        'width': 300,
+        'height': 250,
+        'ttl': 300,
+        'adUnitCode': 'demoslot1-div',
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': 'jixie520',
+        'meta': {
+          'networkId': 123,
+          'networkName': 'network123',
+          'agencyId': 123,
+          'agencyName': 'agency123',
+          'advertiserId': 123,
+          'advertiserName': 'advertiser123',
+          'advertiserDomains': [
+            'advdom1',
+            'advdom2',
+            'advdom3'
+          ],
+          'brandId': 123,
+          'brandName': 'brand123',
+          'primaryCatId': 1,
+          'secondaryCatIds': [
+            2,
+            3,
+            4
+          ],
+          'mediaType': 'BANNER'
+        },
+        'ad': '<div id="jxoutstream" style="width: 100%;"> <script type="text/javascript" src="https://scripts.jixie.media/jxfriendly.1.3.min.js" defer=""></script> <script> var p ={ responsive: 1, nested: 1, maxwidth: 640,  container: "jxoutstream", creativeid: 520}; function jxdefer(p) { if (window.jxuniversal) { window.jxuniversal.init(p); } else { setTimeout(function() { jxdefer(p) }, 100); } } jxdefer(p); </script> </div>'
+      },
+      // outstream, jx non-default renderer specified:
+      {
+        'trackingUrlBase': 'https://traid.jixie.io/sync/ad?',
+        'jxBidId': '99bc539c81b00ce-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        'requestId': '99bc539c81b00ce',
+        'cpm': 2.99,
+        'width': 640,
+        'height': 360,
+        'ttl': 300,
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': 'jixie521',
+        'adUnitCode': 'demoslot4-div',
+        'osplayer': 'jixie',
+        'osparams': {
+          'script': JX_OTHER_OUTSTREAM_RENDERER_URL
+        },
+        'vastXml': mockVastXml_
+      },
+      // outstream, jx default renderer:
+      {
+        'trackingUrlBase': 'https://traid.jixie.io/sync/ad?',
+        'jxBidId': '61bc539c81b00ce-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        'requestId': '61bc539c81b00ce',
+        'cpm': 1.99,
+        'width': 640,
+        'height': 360,
+        'ttl': 300,
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': 'jixie521',
+        'meta': {
+          'networkId': 123,
+          'networkName': 'network123',
+          'agencyId': 123,
+          'agencyName': 'agency123',
+          'advertiserId': 123,
+          'advertiserName': 'advertiser123',
+          'brandId': 123,
+          'brandName': 'brand123',
+          'primaryCatId': 1,
+          'secondaryCatIds': [
+            2,
+            3,
+            4
+          ],
+          'mediaType': 'VIDEO'
+        },
+        'adUnitCode': 'demoslot2-div',
+        'osplayer': 'jixie',
+        'osparams': {},
+        'vastXml': mockVastXml_
+      }
+    ],
+    'setids': {
+      'client_id': '43aacc10-f643-11ea-8a10-c5fe2d394e7e',
+      'session_id': '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e'
+    },
+  };
+  const requestObj_ =
+  {
+    'method': 'POST',
+    'url': 'http://localhost:8080/v2/hbpost',
+    'data': '{"auctionid":"028d5dee-2c83-44e3-bed1-b75002475cdf","timeout":1000,"currency":"USD","timestamp":1600057934665,"device":"desktop","domain":"mock.com","pageurl":"https://mock.com/tests/jxprebidtest_pbjs.html","bids":[{"bidId":"600c9ae6fda1acb","adUnitCode":"demoslot1-div","mediaTypes":{"banner":{"sizes":[[300,250],[300,600],[728,90]]}},"params":{"unit":"prebidsampleunit"}},{"bidId":"61bc539c81b00ce","adUnitCode":"demoslot2-div","mediaTypes":{"video":{"playerSize":[[640,360]],"context":"outstream"}},"params":{"unit":"prebidsampleunit"}},{"bidId":"99bc539c81b00ce","adUnitCode":"demoslot4-div","mediaTypes":{"video":{"playerSize":[[640,360]],"context":"outstream"}},"params":{"unit":"prebidsampleunit"}},{"bidId":"62847e4c696edcb","adUnitCode":"demoslot3-div","mediaTypes":{"video":{"playerSize":[[640,360]],"context":"instream"}},"params":{"unit":"prebidsampleunit"}},{"bidId":"6360235ab01d2cd","adUnitCode":"woo-div","mediaTypes":{"video":{"context":"outstream","playerSize":[[640,360]]}},"params":{"unit":"80b76fc951e161d7c019d21b6639e408"}},{"bidId":"64d9724c7a5e512","adUnitCode":"test-div","mediaTypes":{"video":{"context":"outstream","playerSize":[[300,250]]}},"params":{"unit":"80b76fc951e161d7c019d21b6639e408"}},{"bidId":"65bea7e80fed44b","adUnitCode":"test-div","mediaTypes":{"banner":{"sizes":[[300,250],[300,600],[728,90]]}},"params":{"unit":"7854f723e932b951b6c51fc80b23a410"}},{"bidId":"6642054c4ba1b7f","adUnitCode":"div-banner-native-1","mediaTypes":{"banner":{"sizes":[[640,360]]},"video":{"context":"outstream","sizes":[[640,361]],"playerSize":[[640,360]]},"native":{"type":"image"}},"params":{"unit":"632e7695f0910ce0fa74c19859060a04"}},{"bidId":"675ecf4b44db228","adUnitCode":"div-banner-native-2","mediaTypes":{"banner":{"sizes":[[300,250]]},"native":{"title":{"required":true},"image":{"required":true},"sponsoredBy":{"required":true}}},"params":{"unit":"1000008-b1Q2UMQfZx"}},{"bidId":"68f2dbf5dc23f94","adUnitCode":"div-Top-MediumRectangle","mediaTypes":{"banner":{"sizes":[[300,250],[300,100],[320,50]]}},"params":{"unit":"1000008-b1Q2UMQfZx"}},{"bidId":"6991cf107bb7f1a","adUnitCode":"div-Middle-MediumRectangle","mediaTypes":{"banner":{"sizes":[[300,250],[300,100],[320,50]]}},"params":{"unit":"1000008-b1Q2UMQfZx"}},{"bidId":"706be1b011eac83","adUnitCode":"div-Inside-MediumRectangle","mediaTypes":{"banner":{"sizes":[[300,600],[300,250],[300,100],[320,480]]}},"params":{"unit":"1000008-b1Q2UMQfZx"}}],"client_id_c":"ebd0dea0-f5c8-11ea-a2c7-a5b37aa7fe95","client_id_ls":"ebd0dea0-f5c8-11ea-a2c7-a5b37aa7fe95","session_id_c":"","session_id_ls":"1600005388-ebd0dea0-f5c8-11ea-a2c7-a5b37aa7fe95"}',
+    'currency': 'USD'
+  };
+
+  describe('interpretResponse', function () {
+    it('handles nobid responses', function () {
+      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0)
+      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0)
+    });
+
+    it('should get correct bid response', function () {
+      let setCookieSpy = sinon.spy(storage, 'setCookie');
+      let setLocalStorageSpy = sinon.spy(storage, 'setDataInLocalStorage');
+      const result = spec.interpretResponse({body: responseBody_}, requestObj_)
+      expect(setLocalStorageSpy.calledWith('_jxx', '43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setLocalStorageSpy.calledWith('_jxxs', '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setCookieSpy.calledWith('_jxxs', '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setCookieSpy.calledWith('_jxx', '43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+
+      // video ad with vastUrl returned by adserver
+      expect(result[0].requestId).to.equal('62847e4c696edcb')
+      expect(result[0].cpm).to.equal(2.19)
+      expect(result[0].width).to.equal(640)
+      expect(result[0].height).to.equal(360)
+      expect(result[0].creativeId).to.equal('jixie522')
+      expect(result[0].currency).to.equal('USD')
+      expect(result[0].netRevenue).to.equal(true)
+      expect(result[0].ttl).to.equal(300)
+      expect(result[0].vastUrl).to.include('https://ad.jixie.io/v1/video?creativeid=')
+      expect(result[0].trackingUrlBase).to.include('sync')
+      // We will always make sure the meta->advertiserDomains property is there
+      // If no info it is an empty array.
+      expect(result[0].meta.advertiserDomains.length).to.equal(0)
+
+      // display ad
+      expect(result[1].requestId).to.equal('600c9ae6fda1acb')
+      expect(result[1].cpm).to.equal(1.999)
+      expect(result[1].width).to.equal(300)
+      expect(result[1].height).to.equal(250)
+      expect(result[1].creativeId).to.equal('jixie520')
+      expect(result[1].currency).to.equal('USD')
+      expect(result[1].netRevenue).to.equal(true)
+      expect(result[1].ttl).to.equal(300)
+      expect(result[1].ad).to.include('jxoutstream')
+      expect(result[1].meta.advertiserDomains.length).to.equal(3)
+      expect(result[1].trackingUrlBase).to.include('sync')
+
+      // should pick up about using alternative outstream renderer
+      expect(result[2].requestId).to.equal('99bc539c81b00ce')
+      expect(result[2].cpm).to.equal(2.99)
+      expect(result[2].width).to.equal(640)
+      expect(result[2].height).to.equal(360)
+      expect(result[2].creativeId).to.equal('jixie521')
+      expect(result[2].currency).to.equal('USD')
+      expect(result[2].netRevenue).to.equal(true)
+      expect(result[2].ttl).to.equal(300)
+      expect(result[2].vastXml).to.include('<?xml version="1.0" encoding="UTF-8"?>')
+      expect(result[2].trackingUrlBase).to.include('sync');
+      expect(result[2].renderer.id).to.equal('demoslot4-div')
+      expect(result[2].meta.advertiserDomains.length).to.equal(0)
+      expect(result[2].renderer.url).to.equal(JX_OTHER_OUTSTREAM_RENDERER_URL);
+
+      // should know to use default outstream renderer
+      expect(result[3].requestId).to.equal('61bc539c81b00ce')
+      expect(result[3].cpm).to.equal(1.99)
+      expect(result[3].width).to.equal(640)
+      expect(result[3].height).to.equal(360)
+      expect(result[3].creativeId).to.equal('jixie521')
+      expect(result[3].currency).to.equal('USD')
+      expect(result[3].netRevenue).to.equal(true)
+      expect(result[3].ttl).to.equal(300)
+      expect(result[3].vastXml).to.include('<?xml version="1.0" encoding="UTF-8"?>')
+      expect(result[3].trackingUrlBase).to.include('sync');
+      expect(result[3].renderer.id).to.equal('demoslot2-div')
+      expect(result[3].meta.advertiserDomains.length).to.equal(0)
+      expect(result[3].renderer.url).to.equal(JX_OUTSTREAM_RENDERER_URL)
+
+      setLocalStorageSpy.restore();
+      setCookieSpy.restore();
+    });// it
+  });// describe
+
+  /**
+   * onBidWon
+   */
+  describe('onBidWon', function() {
+    let ajaxStub;
+    let miscDimsStub;
+    beforeEach(function() {
+      miscDimsStub = sinon.stub(jixieaux, 'getMiscDims');
+      ajaxStub = sinon.stub(jixieaux, 'ajax');
+
+      miscDimsStub
+        .returns({ device: device_, pageurl: pageurl_, domain: domain_, mkeywords: keywords_ });
+    })
+
+    afterEach(function() {
+      miscDimsStub.restore();
+      ajaxStub.restore();
+    })
+
+    let TRACKINGURL_ = 'https://abc.com/sync?action=bidwon';
+
+    it('Should fire if the adserver trackingUrl flag says so', function() {
+      spec.onBidWon({ trackingUrl: TRACKINGURL_ })
+      expect(jixieaux.ajax.calledWith(TRACKINGURL_)).to.equal(true);
+    })
+
+    it('Should not fire if the adserver response indicates no firing', function() {
+      let called = false;
+      ajaxStub.callsFake(function fakeFn() {
+        called = true;
+      });
+      spec.onBidWon({ notrack: 1 })
+      expect(called).to.equal(false);
+    });
+
+    // A reference to check again:
+    const QPARAMS_ = {
+      action: 'hbbidwon',
+      device: device_,
+      pageurl: encodeURIComponent(pageurl_),
+      domain: encodeURIComponent(domain_),
+      cid: 121,
+      cpid: 99,
+      jxbidid: '62847e4c696edcb-028d5dee-2c83-44e3-bed1-b75002475cdf',
+      auctionid: '028d5dee-2c83-44e3-bed1-b75002475cdf',
+      cpm: 1.11,
+      requestid: '62847e4c696edcb'
+    };
+
+    it('check it is sending the correct ajax url and qparameters', function() {
+      spec.onBidWon({
+        trackingUrlBase: 'https://mytracker.com/sync?',
+        cid: 121,
+        cpid: 99,
+        jxBidId: '62847e4c696edcb-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf',
+        cpm: 1.11,
+        requestId: '62847e4c696edcb'
+      })
+      expect(jixieaux.ajax.calledWith('https://mytracker.com/sync?', null, QPARAMS_)).to.equal(true);
+    });
+  }); // describe
+
+  /**
+   * onTimeout
+   */
+  describe('onTimeout', function() {
+    let ajaxStub;
+    let miscDimsStub;
+    beforeEach(function() {
+      ajaxStub = sinon.stub(jixieaux, 'ajax');
+      miscDimsStub = sinon.stub(jixieaux, 'getMiscDims');
+      miscDimsStub
+        .returns({ device: device_, pageurl: pageurl_, domain: domain_, mkeywords: keywords_ });
+    })
+
+    afterEach(function() {
+      miscDimsStub.restore();
+      ajaxStub.restore();
+    })
+
+    // reference to check against:
+    const QPARAMS_ = {
+      action: 'hbtimeout',
+      device: device_,
+      pageurl: encodeURIComponent(pageurl_),
+      domain: encodeURIComponent(domain_),
+      auctionid: '028d5dee-2c83-44e3-bed1-b75002475cdf',
+      timeout: 1000,
+      count: 2
+    };
+
+    it('check it is sending the correct ajax url and qparameters', function() {
+      spec.onTimeout([
+        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000},
+        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000}
+      ])
+      expect(jixieaux.ajax.calledWith(spec.EVENTS_URL, null, QPARAMS_)).to.equal(true);
+    })
+
+    it('if turned off via config then dont do onTimeout sending of event', function() {
+      let getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.callsFake(function fakeFn(prop) {
+        if (prop == 'jixie') {
+          return { onTimeout: 'off' };
+        }
+        return null;
+      });
+      let called = false;
+      ajaxStub.callsFake(function fakeFn() {
+        called = true;
+      });
+      spec.onTimeout([
+        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000},
+        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000}
+      ])
+      expect(called).to.equal(false);
+      getConfigStub.restore();
+    })
+
+    const otherUrl_ = 'https://other.azurewebsites.net/sync/evt?';
+    it('if config specifies a different endpoint then should send there instead', function() {
+      let getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.callsFake(function fakeFn(prop) {
+        if (prop == 'jixie') {
+          return { onTimeoutUrl: otherUrl_ };
+        }
+        return null;
+      });
+      spec.onTimeout([
+        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000},
+        {auctionId: '028d5dee-2c83-44e3-bed1-b75002475cdf', timeout: 1000}
+      ])
+      expect(jixieaux.ajax.calledWith(otherUrl_, null, QPARAMS_)).to.equal(true);
+      getConfigStub.restore();
+    })
+  });// describe
+});
diff --git a/test/spec/modules/justIdSystem_spec.js b/test/spec/modules/justIdSystem_spec.js
new file mode 100644
index 00000000000..b6a8cd2d310
--- /dev/null
+++ b/test/spec/modules/justIdSystem_spec.js
@@ -0,0 +1,216 @@
+import { justIdSubmodule, ConfigWrapper, jtUtils, EX_URL_REQUIRED, EX_INVALID_MODE } from 'modules/justIdSystem.js';
+import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
+import * as utils from 'src/utils.js';
+
+const DEFAULT_PARTNER = 'pbjs-just-id-module';
+
+const url = 'https://example.com/getId.js';
+
+describe('JustIdSystem', function () {
+  describe('configWrapper', function() {
+    it('invalid mode', function() {
+      expect(() => new ConfigWrapper({ params: { mode: 'invalidmode' } })).to.throw(EX_INVALID_MODE);
+    })
+
+    it('url is required', function() {
+      expect(() => new ConfigWrapper(configModeCombined())).to.throw(EX_URL_REQUIRED);
+    })
+
+    it('defaultPartner', function() {
+      expect(new ConfigWrapper(configModeCombined(url)).getUrl()).to.eq(expectedUrl(url, DEFAULT_PARTNER));
+    })
+
+    it('customPartner', function() {
+      const partner = 'abc';
+      expect(new ConfigWrapper(configModeCombined(url, partner)).getUrl()).to.eq(expectedUrl(url, partner));
+    })
+  });
+
+  describe('decode', function() {
+    it('decode justId', function() {
+      const justId = 'aaa';
+      expect(justIdSubmodule.decode({uid: justId})).to.deep.eq({justId: justId});
+    })
+  });
+
+  describe('getId basic', function() {
+    var atmMock = (cmd, param) => {
+      switch (cmd) {
+        case 'getReadyState':
+          param('ready')
+          return;
+        case 'getVersion':
+          return Promise.resolve('1.0');
+        case 'getUid':
+          param('user123');
+      }
+    }
+
+    var currentAtm;
+
+    var getAtmStub = sinon.stub(jtUtils, 'getAtm').callsFake(() => currentAtm);
+
+    var logErrorStub;
+
+    beforeEach(function() {
+      logErrorStub = sinon.spy(utils, 'logError');
+    });
+
+    afterEach(function() {
+      logErrorStub.restore();
+    });
+
+    it('all ok', function(done) {
+      currentAtm = atmMock;
+      const callbackSpy = sinon.stub();
+
+      callbackSpy.callsFake(idObj => {
+        try {
+          expect(idObj.uid).to.equal('user123');
+          done();
+        } catch (err) {
+          done(err);
+        }
+      })
+
+      const atmVarName = '__fakeAtm';
+
+      justIdSubmodule.getId({params: {atmVarName: atmVarName}}).callback(callbackSpy);
+
+      expect(getAtmStub.lastCall.lastArg).to.equal(atmVarName);
+    });
+
+    it('unsuported version', function(done) {
+      currentAtm = (cmd, param) => {
+        switch (cmd) {
+          case 'getReadyState':
+            param('ready')
+        }
+      }
+
+      const callbackSpy = sinon.stub();
+
+      callbackSpy.callsFake(idObj => {
+        try {
+          expect(logErrorStub.calledOnce).to.be.true;
+          expect(idObj).to.be.undefined
+          done();
+        } catch (err) {
+          done(err);
+        }
+      })
+
+      justIdSubmodule.getId({}).callback(callbackSpy);
+    });
+
+    it('work with stub', function(done) {
+      var calls = [];
+      currentAtm = (cmd, param) => {
+        calls.push({cmd: cmd, param: param});
+      }
+
+      const callbackSpy = sinon.stub();
+
+      callbackSpy.callsFake(idObj => {
+        try {
+          expect(idObj.uid).to.equal('user123');
+          done();
+        } catch (err) {
+          done(err);
+        }
+      })
+
+      justIdSubmodule.getId({}).callback(callbackSpy);
+
+      currentAtm = atmMock;
+      expect(calls.length).to.equal(1);
+      expect(calls[0].cmd).to.equal('getReadyState');
+      calls[0].param('ready')
+    });
+  });
+
+  describe('getId combined', function() {
+    const scriptTag = document.createElement('script');
+
+    const onPrebidGetId = sinon.stub().callsFake(event => {
+      var cacheIdObj = event.detail && event.detail.cacheIdObj;
+      var justId = (cacheIdObj && cacheIdObj.uid && cacheIdObj.uid + '-x') || 'user123';
+      scriptTag.dispatchEvent(new CustomEvent('justIdReady', { detail: { justId: justId } }));
+    });
+
+    scriptTag.addEventListener('prebidGetId', onPrebidGetId)
+
+    var scriptTagCallback;
+
+    beforeEach(() => {
+      loadExternalScriptStub.callsFake((url, moduleCode, callback) => {
+        scriptTagCallback = callback;
+        return scriptTag;
+      });
+    })
+
+    var logErrorStub;
+
+    beforeEach(() => {
+      logErrorStub = sinon.spy(utils, 'logError');
+    });
+
+    afterEach(() => {
+      logErrorStub.restore();
+    });
+
+    it('url is required', function() {
+      expect(justIdSubmodule.getId(configModeCombined())).to.be.undefined;
+      expect(logErrorStub.calledOnce).to.be.true;
+    });
+
+    it('without cachedIdObj', function() {
+      const callbackSpy = sinon.spy();
+      justIdSubmodule.getId(configModeCombined(url)).callback(callbackSpy);
+
+      scriptTagCallback();
+
+      expect(callbackSpy.lastCall.lastArg.uid).to.equal('user123');
+    });
+
+    it('with cachedIdObj', function() {
+      const callbackSpy = sinon.spy();
+
+      justIdSubmodule.getId(configModeCombined(url), undefined, { uid: 'userABC' }).callback(callbackSpy);
+
+      scriptTagCallback();
+
+      expect(callbackSpy.lastCall.lastArg.uid).to.equal('userABC-x');
+    });
+
+    it('check if getId arguments are passed to prebidGetId event', function() {
+      const callbackSpy = sinon.spy();
+
+      const a = configModeCombined(url);
+      const b = { y: 'y' }
+      const c = { z: 'z' }
+
+      justIdSubmodule.getId(a, b, c).callback(callbackSpy);
+
+      scriptTagCallback();
+
+      expect(onPrebidGetId.lastCall.lastArg.detail).to.deep.eq({ config: a, consentData: b, cacheIdObj: c });
+    });
+  });
+});
+
+function expectedUrl(url, srcId) {
+  return `${url}?sourceId=${srcId}`
+}
+
+function configModeCombined(url, partner) {
+  var conf = {
+    params: {
+      mode: 'COMBINED'
+    }
+  }
+  url && (conf.params.url = url);
+  partner && (conf.params.partner = partner);
+
+  return conf;
+}
diff --git a/test/spec/modules/justpremiumBidAdapter_spec.js b/test/spec/modules/justpremiumBidAdapter_spec.js
index c162b785aed..b08be01461b 100644
--- a/test/spec/modules/justpremiumBidAdapter_spec.js
+++ b/test/spec/modules/justpremiumBidAdapter_spec.js
@@ -12,6 +12,18 @@ describe('justpremium adapter', function () {
     sandbox.restore();
   });
 
+  let schainConfig = {
+    'ver': '1.0',
+    'complete': 1,
+    'nodes': [
+      {
+        'asi': 'indirectseller.com',
+        'sid': '00001',
+        'hp': 1
+      }
+    ]
+  }
+
   let adUnits = [
     {
       adUnitCode: 'div-gpt-ad-1471513102552-1',
@@ -21,7 +33,9 @@ describe('justpremium adapter', function () {
       },
       userId: {
         tdid: '1111111',
-        id5id: '2222222',
+        id5id: {
+          uid: '2222222'
+        },
         digitrustid: {
           data: {
             id: '3333333'
@@ -31,7 +45,8 @@ describe('justpremium adapter', function () {
       params: {
         zone: 28313,
         allow: ['lb', 'wp']
-      }
+      },
+      schain: schainConfig
     },
     {
       adUnitCode: 'div-gpt-ad-1471513102552-2',
@@ -50,6 +65,24 @@ describe('justpremium adapter', function () {
     }
   }
 
+  const serverResponses = [
+    {
+      'body': {
+        'bid': {},
+        'pass': {
+          '141952': true
+        },
+        'deals': {},
+        'pxs': [
+          {
+            'url': 'https://url.com',
+            'type': 'image'
+          }
+        ]
+      }
+    }
+  ]
+
   describe('isBidRequestValid', function () {
     it('Verifies bidder code', function () {
       expect(spec.code).to.equal('justpremium')
@@ -73,6 +106,7 @@ describe('justpremium adapter', function () {
       expect(jpxRequest).to.not.equal(null)
       expect(jpxRequest.zone).to.not.equal('undefined')
       expect(bidderRequest.refererInfo.referer).to.equal('https://justpremium.com')
+      expect(jpxRequest.schain).to.deep.equal(schainConfig)
       expect(jpxRequest.sw).to.equal(window.top.screen.width)
       expect(jpxRequest.sh).to.equal(window.top.screen.height)
       expect(jpxRequest.ww).to.equal(window.top.innerWidth)
@@ -81,12 +115,13 @@ describe('justpremium adapter', function () {
       expect(jpxRequest.id).to.equal(adUnits[0].params.zone)
       expect(jpxRequest.mediaTypes && jpxRequest.mediaTypes.banner && jpxRequest.mediaTypes.banner.sizes).to.not.equal('undefined')
       expect(jpxRequest.version.prebid).to.equal('$prebid.version$')
-      expect(jpxRequest.version.jp_adapter).to.equal('1.7')
+      expect(jpxRequest.version.jp_adapter).to.equal('1.8.3')
       expect(jpxRequest.pubcid).to.equal('0000000')
       expect(jpxRequest.uids.tdid).to.equal('1111111')
-      expect(jpxRequest.uids.id5id).to.equal('2222222')
+      expect(jpxRequest.uids.id5id.uid).to.equal('2222222')
       expect(jpxRequest.uids.digitrustid.data.id).to.equal('3333333')
       expect(jpxRequest.us_privacy).to.equal('1YYN')
+      expect(jpxRequest.ggExt).to.be.null
     })
   })
 
@@ -101,7 +136,11 @@ describe('justpremium adapter', function () {
             'width': 970,
             'price': 0.52,
             'format': 'lb',
-            'adm': 'creative code'
+            'adm': 'creative code',
+            'adomain': ['justpremium.com'],
+            'ext': {
+              'pg': true
+            }
           }]
         },
         'pass': {
@@ -121,7 +160,13 @@ describe('justpremium adapter', function () {
           netRevenue: true,
           currency: 'USD',
           ttl: 60000,
-          format: 'lb'
+          format: 'lb',
+          meta: {
+            advertiserDomains: ['justpremium.com']
+          },
+          adserverTargeting: {
+            'hb_deal_justpremium': 'jp_pg'
+          }
         }
       ]
 
@@ -138,6 +183,8 @@ describe('justpremium adapter', function () {
       expect(result[0].creativeId).to.equal(3213123)
       expect(result[0].netRevenue).to.equal(true)
       expect(result[0].format).to.equal('lb')
+      expect(result[0].meta.advertiserDomains[0]).to.equal('justpremium.com')
+      expect(result[0].adserverTargeting).to.deep.equal({'hb_deal_justpremium': 'jp_pg'})
     })
 
     it('Verify wrong server response', function () {
@@ -156,7 +203,7 @@ describe('justpremium adapter', function () {
   })
 
   describe('getUserSyncs', function () {
-    it('Verifies sync options', function () {
+    it('Verifies sync options for iframe', function () {
       const options = spec.getUserSyncs({iframeEnabled: true}, {}, {gdprApplies: true, consentString: 'BOOgjO9OOgjO9APABAENAi-AAAAWd'}, '1YYN')
       expect(options).to.not.be.undefined
       expect(options[0].type).to.equal('iframe')
@@ -164,5 +211,11 @@ describe('justpremium adapter', function () {
       expect(options[0].url).to.match(/&consentString=BOOgjO9OOgjO9APABAENAi-AAAAWd/)
       expect(options[0].url).to.match(/&usPrivacy=1YYN/)
     })
+    it('Returns array of user sync pixels', function () {
+      const options = spec.getUserSyncs({pixelEnabled: true}, serverResponses)
+      expect(options).to.not.be.undefined
+      expect(Array.isArray(options)).to.be.true
+      expect(options[0].type).to.equal('image')
+    })
   })
 })
diff --git a/test/spec/modules/jwplayerRtdProvider_spec.js b/test/spec/modules/jwplayerRtdProvider_spec.js
new file mode 100644
index 00000000000..5a38a971e09
--- /dev/null
+++ b/test/spec/modules/jwplayerRtdProvider_spec.js
@@ -0,0 +1,1113 @@
+import { fetchTargetingForMediaId, getVatFromCache, extractPublisherParams,
+  formatTargetingResponse, getVatFromPlayer, enrichAdUnits, addTargetingToBid,
+  fetchTargetingInformation, jwplayerSubmodule, getContentId, getContentSegments, getContentData, addOrtbSiteContent } from 'modules/jwplayerRtdProvider.js';
+import { server } from 'test/mocks/xhr.js';
+import { config as prebidConfig } from 'src/config.js';
+import {deepClone} from '../../../src/utils.js';
+
+describe('jwplayerRtdProvider', function() {
+  const testIdForSuccess = 'test_id_for_success';
+  const testIdForFailure = 'test_id_for_failure';
+  const validSegments = ['test_seg_1', 'test_seg_2'];
+  const responseHeader = {'Content-Type': 'application/json'};
+
+  describe('Fetch targeting for mediaID tests', function () {
+    let request;
+
+    describe('Fetch succeeds', function () {
+      beforeEach(function () {
+        fetchTargetingForMediaId(testIdForSuccess);
+        request = server.requests[0];
+      });
+
+      afterEach(function () {
+        server.respond();
+      });
+
+      it('should reach out to media endpoint', function () {
+        expect(request.url).to.be.eq(`https://cdn.jwplayer.com/v2/media/${testIdForSuccess}`);
+      });
+
+      it('should write to cache when successful', function () {
+        request.respond(
+          200,
+          responseHeader,
+          JSON.stringify({
+            playlist: [
+              {
+                file: 'test.mp4',
+                jwpseg: validSegments
+              }
+            ]
+          })
+        );
+
+        const targetingInfo = getVatFromCache(testIdForSuccess);
+
+        const validTargeting = {
+          segments: validSegments,
+          mediaID: testIdForSuccess
+        };
+
+        expect(targetingInfo).to.deep.equal(validTargeting);
+      });
+    });
+
+    describe('Fetch fails', function () {
+      beforeEach(function () {
+        fetchTargetingForMediaId(testIdForFailure);
+        request = server.requests[0]
+      });
+
+      it('should not write to cache when response is malformed', function() {
+        request.respond('{]');
+        const targetingInfo = getVatFromCache(testIdForFailure);
+        expect(targetingInfo).to.be.null;
+      });
+
+      it('should not write to cache when playlist is absent', function() {
+        request.respond({});
+        const targetingInfo = getVatFromCache(testIdForFailure);
+        expect(targetingInfo).to.be.null;
+      });
+
+      it('should not write to cache when segments are absent', function() {
+        request.respond(
+          200,
+          responseHeader,
+          JSON.stringify({
+            playlist: [
+              {
+                file: 'test.mp4'
+              }
+            ]
+          })
+        );
+        const targetingInfo = getVatFromCache(testIdForFailure);
+        expect(targetingInfo).to.be.null;
+      });
+
+      it('should not write to cache when request errors', function() {
+        request.error();
+        const targetingInfo = getVatFromCache(testIdForFailure);
+        expect(targetingInfo).to.be.null;
+      });
+    });
+  });
+
+  describe('Format targeting response', function () {
+    it('should exclude segment key when absent', function () {
+      const targeting = formatTargetingResponse({ mediaID: 'test' });
+      expect(targeting).to.not.have.property('segments');
+    });
+
+    it('should exclude content block when mediaId is absent', function () {
+      const targeting = formatTargetingResponse({ segments: ['test'] });
+      expect(targeting).to.not.have.property('content');
+    });
+
+    it('should return proper format', function () {
+      const segments = ['123'];
+      const mediaID = 'test';
+      const expectedContentId = 'jw_' + mediaID;
+      const expectedContent = {
+        id: expectedContentId
+      };
+      const targeting = formatTargetingResponse({
+        segments,
+        mediaID
+      });
+      expect(targeting).to.have.deep.property('segments', segments);
+      expect(targeting).to.have.deep.property('content', expectedContent);
+    });
+  });
+
+  describe('Get VAT from player', function () {
+    const mediaIdWithSegment = 'media_ID_1';
+    const mediaIdNoSegment = 'media_ID_2';
+    const mediaIdForCurrentItem = 'media_ID_current';
+    const mediaIdNotCached = 'media_test_ID';
+
+    const validPlayerID = 'player_test_ID_valid';
+    const invalidPlayerID = 'player_test_ID_invalid';
+
+    it('returns null when jwplayer.js is absent from page', function () {
+      const targeting = getVatFromPlayer(invalidPlayerID, mediaIdNotCached);
+      expect(targeting).to.be.null;
+    });
+
+    describe('When jwplayer.js is on page', function () {
+      const playlistItemWithSegmentMock = {
+        mediaid: mediaIdWithSegment,
+        jwpseg: validSegments
+      };
+
+      const targetingForMediaWithSegment = {
+        segments: validSegments,
+        mediaID: mediaIdWithSegment
+      };
+
+      const playlistItemNoSegmentMock = {
+        mediaid: mediaIdNoSegment
+      };
+
+      const currentItemSegments = ['test_seg_3', 'test_seg_4'];
+      const currentPlaylistItemMock = {
+        mediaid: mediaIdForCurrentItem,
+        jwpseg: currentItemSegments
+      };
+      const targetingForCurrentItem = {
+        segments: currentItemSegments,
+        mediaID: mediaIdForCurrentItem
+      };
+
+      const playerInstanceMock = {
+        getPlaylist: function () {
+          return [playlistItemWithSegmentMock, playlistItemNoSegmentMock];
+        },
+
+        getPlaylistItem: function () {
+          return currentPlaylistItemMock;
+        }
+      };
+
+      const jwplayerMock = function(playerID) {
+        if (playerID === validPlayerID) {
+          return playerInstanceMock;
+        } else {
+          return {};
+        }
+      };
+
+      beforeEach(function () {
+        window.jwplayer = jwplayerMock;
+      });
+
+      it('returns null when player ID does not match player on page', function () {
+        const targeting = getVatFromPlayer(invalidPlayerID, mediaIdNotCached);
+        expect(targeting).to.be.null;
+      });
+
+      it('returns segments when media ID matches a playlist item with segments', function () {
+        const targeting = getVatFromPlayer(validPlayerID, mediaIdWithSegment);
+        expect(targeting).to.deep.equal(targetingForMediaWithSegment);
+      });
+
+      it('caches segments when media ID matches a playist item with segments', function () {
+        getVatFromPlayer(validPlayerID, mediaIdWithSegment);
+        const vat = getVatFromCache(mediaIdWithSegment);
+        expect(vat.segments).to.deep.equal(validSegments);
+      });
+
+      it('returns segments of current item when media ID is missing', function () {
+        const targeting = getVatFromPlayer(validPlayerID);
+        expect(targeting).to.deep.equal(targetingForCurrentItem);
+      });
+
+      it('caches segments from the current item', function () {
+        getVatFromPlayer(validPlayerID);
+
+        window.jwplayer = null;
+        const targeting = getVatFromCache(mediaIdForCurrentItem);
+        expect(targeting).to.deep.equal(targetingForCurrentItem);
+      });
+
+      it('returns undefined segments when segments are absent', function () {
+        const targeting = getVatFromPlayer(validPlayerID, mediaIdNoSegment);
+        expect(targeting).to.deep.equal({
+          mediaID: mediaIdNoSegment,
+          segments: undefined
+        });
+      });
+
+      describe('Get Bid Request Data', function () {
+        it('executes immediately while request is active if player has item', function () {
+          const bidRequestSpy = sinon.spy();
+          const fakeServer = sinon.createFakeServer();
+          fakeServer.respondImmediately = false;
+          fakeServer.autoRespond = false;
+
+          fetchTargetingForMediaId(mediaIdWithSegment);
+
+          const bid = {};
+          const adUnit = {
+            ortb2Imp: {
+              ext: {
+                data: {
+                  jwTargeting: {
+                    mediaID: mediaIdWithSegment,
+                    playerID: validPlayerID
+                  }
+                }
+              }
+            },
+            bids: [
+              bid
+            ]
+          };
+          const expectedContentId = 'jw_' + mediaIdWithSegment;
+          const expectedTargeting = {
+            segments: validSegments,
+            content: {
+              id: expectedContentId
+            }
+          };
+          jwplayerSubmodule.getBidRequestData({ adUnits: [adUnit] }, bidRequestSpy);
+          expect(bidRequestSpy.calledOnce).to.be.true;
+          expect(bid.rtd.jwplayer).to.have.deep.property('targeting', expectedTargeting);
+          fakeServer.respond();
+          expect(bidRequestSpy.calledOnce).to.be.true;
+        });
+      });
+    });
+  });
+
+  describe('Enrich ad units', function () {
+    const contentIdForSuccess = 'jw_' + testIdForSuccess;
+    const expectedTargetingForSuccess = {
+      segments: validSegments,
+      content: {
+        id: contentIdForSuccess
+      }
+    };
+    let bidRequestSpy;
+    let fakeServer;
+    let clock;
+
+    beforeEach(function () {
+      bidRequestSpy = sinon.spy();
+
+      fakeServer = sinon.createFakeServer();
+      fakeServer.respondImmediately = false;
+      fakeServer.autoRespond = false;
+
+      clock = sinon.useFakeTimers();
+    });
+
+    afterEach(function () {
+      clock.restore();
+      fakeServer.respond();
+    });
+
+    it('adds targeting when pending request succeeds', function () {
+      fetchTargetingForMediaId(testIdForSuccess);
+      const bids = [
+        {
+          id: 'bid1'
+        },
+        {
+          id: 'bid2'
+        }
+      ];
+      const adUnit = {
+        ortb2Imp: {
+          ext: {
+            data: {
+              jwTargeting: {
+                mediaID: testIdForSuccess
+              }
+            }
+          }
+        },
+        bids
+      };
+
+      enrichAdUnits([adUnit]);
+      const bid1 = bids[0];
+      const bid2 = bids[1];
+      expect(bid1).to.not.have.property('rtd');
+      expect(bid2).to.not.have.property('rtd');
+
+      const request = fakeServer.requests[0];
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          playlist: [
+            {
+              file: 'test.mp4',
+              jwpseg: validSegments
+            }
+          ]
+        })
+      );
+
+      expect(bid1.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForSuccess);
+      expect(bid2.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForSuccess);
+    });
+
+    it('immediately adds cached targeting', function () {
+      fetchTargetingForMediaId(testIdForSuccess);
+      const bids = [
+        {
+          id: 'bid1'
+        },
+        {
+          id: 'bid2'
+        }
+      ];
+      const adUnit = {
+        ortb2Imp: {
+          ext: {
+            data: {
+              jwTargeting: {
+                mediaID: testIdForSuccess
+              }
+            }
+          }
+        },
+        bids
+      };
+      const request = fakeServer.requests[0];
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          playlist: [
+            {
+              file: 'test.mp4',
+              jwpseg: validSegments
+            }
+          ]
+        })
+      );
+
+      enrichAdUnits([adUnit]);
+      const bid1 = bids[0];
+      const bid2 = bids[1];
+      expect(bid1.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForSuccess);
+      expect(bid2.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForSuccess);
+    });
+
+    it('adds content block when segments are absent and no request is pending', function () {
+      const expectedTargetingForFailure = {
+        content: {
+          id: 'jw_' + testIdForFailure
+        }
+      };
+      const bids = [
+        {
+          id: 'bid1'
+        },
+        {
+          id: 'bid2'
+        }
+      ];
+      const adUnit = {
+        ortb2Imp: {
+          ext: {
+            data: {
+              jwTargeting: {
+                mediaID: testIdForFailure
+              }
+            }
+          }
+        },
+        bids
+      };
+
+      enrichAdUnits([adUnit]);
+      const bid1 = bids[0];
+      const bid2 = bids[1];
+      expect(bid1.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForFailure);
+      expect(bid2.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForFailure);
+    });
+
+    it('should write to config', function () {
+      fetchTargetingForMediaId(testIdForSuccess);
+      const bids = [
+        {
+          id: 'bid1'
+        },
+        {
+          id: 'bid2'
+        }
+      ];
+      const adUnit = {
+        ortb2Imp: {
+          ext: {
+            data: {
+              jwTargeting: {
+                mediaID: testIdForSuccess
+              }
+            }
+          }
+        },
+        bids
+      };
+
+      const ortb2Fragments = {global: {}};
+      enrichAdUnits([adUnit], ortb2Fragments);
+      const bid1 = bids[0];
+      const bid2 = bids[1];
+      expect(bid1).to.not.have.property('rtd');
+      expect(bid2).to.not.have.property('rtd');
+
+      const request = fakeServer.requests[0];
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          playlist: [
+            {
+              file: 'test.mp4',
+              jwpseg: validSegments
+            }
+          ]
+        })
+      );
+
+      expect(ortb2Fragments.global).to.have.property('site');
+      expect(ortb2Fragments.global.site).to.have.property('content');
+      expect(ortb2Fragments.global.site.content).to.have.property('id', 'jw_' + testIdForSuccess);
+      expect(ortb2Fragments.global.site.content).to.have.property('data');
+      const data = ortb2Fragments.global.site.content.data;
+      expect(data).to.have.length(1);
+      const datum = data[0];
+      expect(datum).to.have.property('name', 'jwplayer.com');
+      expect(datum).to.have.property('ext');
+      expect(datum.ext).to.have.property('segtax', 502);
+      expect(datum.segment).to.have.length(2);
+      const segment1 = datum.segment[0];
+      const segment2 = datum.segment[1];
+      expect(segment1).to.have.property('id', 'test_seg_1');
+      expect(segment2).to.have.property('id', 'test_seg_2');
+    });
+
+    it('should remove obsolete jwplayer data', function () {
+      fetchTargetingForMediaId(testIdForSuccess);
+      const bids = [
+        {
+          id: 'bid1'
+        }
+      ];
+      const adUnit = {
+        ortb2Imp: {
+          ext: {
+            data: {
+              jwTargeting: {
+                mediaID: testIdForSuccess
+              }
+            }
+          }
+        },
+        bids
+      };
+
+      const ortb2Fragments = {
+        global: {
+          site: {
+            content: {
+              id: 'randomContentId',
+              data: [{
+                name: 'random',
+                segment: [{id: 'random'}]
+              }, {
+                name: 'jwplayer.com',
+                segment: [{id: 'randomJwPlayer'}]
+              }, {
+                name: 'random2',
+                segment: [{id: 'random2'}]
+              }]
+            }
+          }
+        }
+      };
+
+      enrichAdUnits([adUnit], ortb2Fragments);
+      const bid1 = bids[0];
+      expect(bid1).to.not.have.property('rtd');
+
+      const request = fakeServer.requests[0];
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          playlist: [
+            {
+              file: 'test.mp4',
+              jwpseg: validSegments
+            }
+          ]
+        })
+      );
+
+      expect(ortb2Fragments.global).to.have.property('site');
+      expect(ortb2Fragments.global.site).to.have.property('content');
+      expect(ortb2Fragments.global.site.content).to.have.property('id', 'jw_' + testIdForSuccess);
+      expect(ortb2Fragments.global.site.content).to.have.property('data');
+      const data = ortb2Fragments.global.site.content.data;
+      expect(data).to.have.length(3);
+
+      const randomDatum = data[0];
+      expect(randomDatum).to.have.property('name', 'random');
+      expect(randomDatum.segment).to.deep.equal([{id: 'random'}]);
+
+      const randomDatum2 = data[1];
+      expect(randomDatum2).to.have.property('name', 'random2');
+      expect(randomDatum2.segment).to.deep.equal([{id: 'random2'}]);
+
+      const jwplayerDatum = data[2];
+      expect(jwplayerDatum).to.have.property('name', 'jwplayer.com');
+      expect(jwplayerDatum).to.have.property('ext');
+      expect(jwplayerDatum.ext).to.have.property('segtax', 502);
+      expect(jwplayerDatum.segment).to.have.length(2);
+      const segment1 = jwplayerDatum.segment[0];
+      const segment2 = jwplayerDatum.segment[1];
+      expect(segment1).to.have.property('id', 'test_seg_1');
+      expect(segment2).to.have.property('id', 'test_seg_2');
+    });
+  });
+
+  describe('Extract Publisher Params', function () {
+    const config = { mediaID: 'test' };
+
+    it('should exclude adUnits that do not support instream video and do not specify jwTargeting', function () {
+      const oustreamAdUnit = { mediaTypes: { video: { context: 'outstream' } } };
+      const oustreamTargeting = extractPublisherParams(oustreamAdUnit, config);
+      expect(oustreamTargeting).to.be.undefined;
+
+      const bannerAdUnit = { mediaTypes: { banner: {} } };
+      const bannerTargeting = extractPublisherParams(bannerAdUnit, config);
+      expect(bannerTargeting).to.be.undefined;
+
+      const targeting = extractPublisherParams({}, config);
+      expect(targeting).to.be.undefined;
+    });
+
+    it('should include ad unit when media type is video and is instream', function () {
+      const adUnit = { mediaTypes: { video: { context: 'instream' } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should include banner ad units that specify jwTargeting', function() {
+      const adUnit = { mediaTypes: { banner: {} }, ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should include outstream ad units that specify jwTargeting', function() {
+      const adUnit = { mediaTypes: { video: { context: 'outstream' } }, ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should fallback to config when empty jwTargeting is defined in ad unit', function () {
+      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should prioritize adUnit properties ', function () {
+      const expectedMediaID = 'test_media_id';
+      const expectedPlayerID = 'test_player_id';
+      const config = { playerID: 'bad_id', mediaID: 'bad_id' };
+
+      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: { mediaID: expectedMediaID, playerID: expectedPlayerID } } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.have.property('mediaID', expectedMediaID);
+      expect(targeting).to.have.property('playerID', expectedPlayerID);
+    });
+
+    it('should use config properties as fallbacks', function () {
+      const expectedMediaID = 'test_media_id';
+      const expectedPlayerID = 'test_player_id';
+      const config = { playerID: expectedPlayerID, mediaID: 'bad_id' };
+
+      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: { mediaID: expectedMediaID } } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.have.property('mediaID', expectedMediaID);
+      expect(targeting).to.have.property('playerID', expectedPlayerID);
+    });
+
+    it('should return undefined when Publisher Params are absent', function () {
+      const targeting = extractPublisherParams({}, null);
+      expect(targeting).to.be.undefined;
+    })
+  });
+
+  describe('Get content id', function() {
+    it('prefixes jw_ to the media id', function () {
+      const mediaId = 'mediaId';
+      const contentId = getContentId(mediaId);
+      expect(contentId).to.equal('jw_mediaId');
+    });
+
+    it('returns undefined when media id is empty', function () {
+      let contentId = getContentId();
+      expect(contentId).to.be.undefined;
+      contentId = getContentId('');
+      expect(contentId).to.be.undefined;
+      contentId = getContentId(null);
+      expect(contentId).to.be.undefined;
+    });
+  });
+
+  describe('Get Content Segments', function () {
+    it('returns undefined when segments are empty', function () {
+      let contentSegments = getContentSegments(null);
+      expect(contentSegments).to.be.undefined;
+      contentSegments = getContentSegments(undefined);
+      expect(contentSegments).to.be.undefined;
+      contentSegments = getContentSegments([]);
+      expect(contentSegments).to.be.undefined;
+    });
+
+    it('returns proper format', function () {
+      const segment1 = 'segment1';
+      const segment2 = 'segment2';
+      const segment3 = 'segment3';
+      const contentSegments = getContentSegments([segment1, segment2, segment3]);
+      expect(contentSegments[0]).to.deep.equal({ id: segment1 });
+      expect(contentSegments[1]).to.deep.equal({ id: segment2 });
+      expect(contentSegments[2]).to.deep.equal({ id: segment3 });
+    });
+  });
+
+  describe('Get Content Data', function () {
+    it('should return proper format', function () {
+      const testMediaId = 'test_media_id';
+      const testSegments = [{ id: 1 }, { id: 2 }];
+      const contentData = getContentData(testMediaId, testSegments);
+      expect(contentData).to.have.property('name', 'jwplayer.com');
+      expect(contentData.ext).to.have.property('segtax', 502);
+      expect(contentData.ext).to.have.property('cids');
+      expect(contentData.ext.cids).to.have.length(1);
+      expect(contentData.ext.cids[0]).to.equal(testMediaId);
+      expect(contentData.segment).to.deep.equal(testSegments);
+    });
+
+    it('should only set segtax and segment when segments are provided', function () {
+      const testMediaId = 'test_media_id';
+      const contentData = getContentData(testMediaId);
+      expect(contentData).to.have.property('name', 'jwplayer.com');
+      expect(contentData.ext.segtax).to.be.undefined;
+      expect(contentData.ext).to.have.property('cids');
+      expect(contentData.ext.cids).to.have.length(1);
+      expect(contentData.ext.cids[0]).to.equal(testMediaId);
+      expect(contentData.segment).to.be.undefined;
+    });
+
+    it('should only set cids when a media id is provided', function () {
+      const testSegments = [{ id: 1 }, { id: 2 }];
+      const contentData = getContentData(null, testSegments);
+      expect(contentData).to.have.property('name', 'jwplayer.com');
+      expect(contentData.ext).to.have.property('segtax', 502);
+      expect(contentData.ext).to.not.have.property('cids');
+      expect(contentData.segment).to.deep.equal(testSegments);
+    });
+
+    it('should return undefined when no params are provided', function () {
+      expect(getContentData()).to.be.undefined;
+    });
+  });
+
+  describe(' Add Ortb Site Content', function () {
+    it('should maintain object structure when id and data params are empty', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            id: 'randomId'
+          },
+          random: {
+            random_sub: 'randomSub'
+          }
+        },
+        app: {
+          content: {
+            id: 'appId'
+          }
+        }
+      }
+      const copy = deepClone(ortb2);
+      addOrtbSiteContent(copy);
+      expect(copy).to.eql(ortb2);
+    });
+
+    it('should create a structure compliant with the oRTB 2 spec', function() {
+      const ortb2 = {}
+      const expectedId = 'expectedId';
+      const expectedData = { datum: 'datum' };
+      addOrtbSiteContent(ortb2, expectedId, expectedData);
+      expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+      expect(ortb2).to.have.nested.property('site.content.data');
+      expect(ortb2.site.content.data[0]).to.be.deep.equal(expectedData);
+    });
+
+    it('should respect existing structure when adding adding fields', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            id: 'oldId'
+          },
+          random: {
+            random_sub: 'randomSub'
+          }
+        },
+        app: {
+          content: {
+            id: 'appId'
+          }
+        }
+      };
+
+      const expectedId = 'expectedId';
+      const expectedData = { datum: 'datum' };
+      addOrtbSiteContent(ortb2, expectedId, expectedData);
+      expect(ortb2).to.have.nested.property('site.random.random_sub', 'randomSub');
+      expect(ortb2).to.have.nested.property('app.content.id', 'appId');
+      expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+      expect(ortb2).to.have.nested.property('site.content.data');
+      expect(ortb2.site.content.data[0]).to.be.deep.equal(expectedData);
+    });
+
+    it('should set content id', function () {
+      const ortb2 = {};
+      const expectedId = 'expectedId';
+      addOrtbSiteContent(ortb2, expectedId);
+      expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+    });
+
+    it('should override content id', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            id: 'oldId'
+          }
+        }
+      };
+
+      const expectedId = 'expectedId';
+      addOrtbSiteContent(ortb2, expectedId);
+      expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+    });
+
+    it('should keep previous content id when not set', function () {
+      const previousId = 'oldId';
+      const ortb2 = {
+        site: {
+          content: {
+            id: previousId,
+            data: [{ datum: 'first_datum' }]
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, null, { datum: 'new_datum' });
+      expect(ortb2).to.have.nested.property('site.content.id', previousId);
+    });
+
+    it('should set content data', function () {
+      const ortb2 = {};
+      const expectedData = { datum: 'datum' };
+      addOrtbSiteContent(ortb2, null, expectedData);
+      expect(ortb2).to.have.nested.property('site.content.data');
+      expect(ortb2.site.content.data).to.have.length(1);
+      expect(ortb2.site.content.data[0]).to.be.deep.equal(expectedData);
+    });
+
+    it('should append content data', function () {
+      const ortb2 = {
+        site: {
+          content: {
+            data: [{ datum: 'first_datum' }]
+          }
+        }
+      };
+
+      const expectedData = { datum: 'datum' };
+      addOrtbSiteContent(ortb2, null, expectedData);
+      expect(ortb2).to.have.nested.property('site.content.data');
+      expect(ortb2.site.content.data).to.have.length(2);
+      expect(ortb2.site.content.data.pop()).to.be.deep.equal(expectedData);
+    });
+
+    it('should keep previous data when not set', function () {
+      const expectedId = 'expectedId';
+      const expectedData = { datum: 'first_datum' };
+      const ortb2 = {
+        site: {
+          content: {
+            data: [expectedData]
+          }
+        }
+      };
+
+      addOrtbSiteContent(ortb2, expectedId);
+      expect(ortb2).to.have.nested.property('site.content.data');
+      expect(ortb2.site.content.data).to.have.length(1);
+      expect(ortb2.site.content.data[0]).to.be.deep.equal(expectedData);
+      expect(ortb2).to.have.nested.property('site.content.id', expectedId);
+    });
+  });
+
+  describe('Add Targeting to Bid', function () {
+    const targeting = {foo: 'bar'};
+
+    it('creates realTimeData when absent from Bid', function () {
+      const targeting = {foo: 'bar'};
+      const bid = {};
+      addTargetingToBid(bid, targeting);
+      expect(bid).to.have.property('rtd');
+      expect(bid).to.have.nested.property('rtd.jwplayer.targeting', targeting);
+    });
+
+    it('adds to existing realTimeData', function () {
+      const otherRtd = {
+        targeting: {
+          seg: 'rtd seg'
+        }
+      };
+
+      const bid = {
+        rtd: {
+          otherRtd
+        }
+      };
+
+      addTargetingToBid(bid, targeting);
+      expect(bid).to.have.property('rtd');
+      const rtd = bid.rtd;
+      expect(rtd).to.have.property('jwplayer');
+      expect(rtd).to.have.nested.property('jwplayer.targeting', targeting);
+
+      expect(rtd).to.have.deep.property('otherRtd', otherRtd);
+    });
+
+    it('adds to existing realTimeData.jwplayer', function () {
+      const otherInfo = { seg: 'rtd seg' };
+      const bid = {
+        rtd: {
+          jwplayer: {
+            otherInfo
+          }
+        }
+      };
+      addTargetingToBid(bid, targeting);
+
+      expect(bid).to.have.property('rtd');
+      const rtd = bid.rtd;
+      expect(rtd).to.have.property('jwplayer');
+      expect(rtd).to.have.nested.property('jwplayer.otherInfo', otherInfo);
+      expect(rtd).to.have.nested.property('jwplayer.targeting', targeting);
+    });
+
+    it('overrides existing jwplayer.targeting', function () {
+      const otherInfo = { seg: 'rtd seg' };
+      const bid = {
+        rtd: {
+          jwplayer: {
+            targeting: {
+              otherInfo
+            }
+          }
+        }
+      };
+      addTargetingToBid(bid, targeting);
+
+      expect(bid).to.have.property('rtd');
+      const rtd = bid.rtd;
+      expect(rtd).to.have.property('jwplayer');
+      expect(rtd).to.have.nested.property('jwplayer.targeting', targeting);
+    });
+
+    it('creates jwplayer when absent from realTimeData', function () {
+      const bid = { rtd: {} };
+      addTargetingToBid(bid, targeting);
+
+      expect(bid).to.have.property('rtd');
+      const rtd = bid.rtd;
+      expect(rtd).to.have.property('jwplayer');
+      expect(rtd).to.have.nested.property('jwplayer.targeting', targeting);
+    });
+  });
+
+  describe('jwplayerSubmodule', function () {
+    it('successfully instantiates', function () {
+      expect(jwplayerSubmodule.init()).to.equal(true);
+    });
+
+    describe('Get Bid Request Data', function () {
+      const validMediaIDs = ['media_ID_1', 'media_ID_2', 'media_ID_3'];
+      let bidRequestSpy;
+      let fakeServer;
+      let clock;
+      let bidReqConfig;
+
+      beforeEach(function () {
+        bidReqConfig = {
+          adUnits: [
+            {
+              ortb2Imp: {
+                ext: {
+                  data: {
+                    jwTargeting: {
+                      mediaID: validMediaIDs[0]
+                    }
+                  }
+                }
+              },
+              bids: [
+                {}, {}
+              ]
+            },
+            {
+              ortb2Imp: {
+                ext: {
+                  data: {
+                    jwTargeting: {
+                      mediaID: validMediaIDs[1]
+                    }
+                  }
+                }
+              },
+              bids: [
+                {}, {}
+              ]
+            }
+          ]
+        };
+
+        bidRequestSpy = sinon.spy();
+
+        fakeServer = sinon.createFakeServer();
+        fakeServer.respondImmediately = false;
+        fakeServer.autoRespond = false;
+
+        clock = sinon.useFakeTimers();
+      });
+
+      afterEach(function () {
+        clock.restore();
+        fakeServer.respond();
+      });
+
+      it('executes callback immediately when ad units are missing', function () {
+        jwplayerSubmodule.getBidRequestData({ adUnits: [] }, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+      });
+
+      it('executes callback immediately when no requests are pending', function () {
+        fetchTargetingInformation({
+          mediaIDs: []
+        });
+        jwplayerSubmodule.getBidRequestData(bidReqConfig, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+      });
+
+      it('executes callback only after requests in adUnit complete', function() {
+        fetchTargetingInformation({
+          mediaIDs: validMediaIDs
+        });
+        jwplayerSubmodule.getBidRequestData(bidReqConfig, bidRequestSpy);
+        expect(bidRequestSpy.notCalled).to.be.true;
+
+        const req1 = fakeServer.requests[0];
+        const req2 = fakeServer.requests[1];
+        const req3 = fakeServer.requests[2];
+
+        req1.respond();
+        expect(bidRequestSpy.notCalled).to.be.true;
+
+        req2.respond();
+        expect(bidRequestSpy.calledOnce).to.be.true;
+
+        req3.respond();
+        expect(bidRequestSpy.calledOnce).to.be.true;
+      });
+
+      it('sets targeting data in proper structure', function () {
+        const bid = {};
+        const adUnitWithMediaId = {
+          ortb2Imp: {
+            ext: {
+              data: {
+                jwTargeting: {
+                  mediaID: testIdForSuccess
+                }
+              }
+            }
+          },
+          bids: [
+            bid
+          ]
+        };
+        const adUnitEmpty = {
+          code: 'test_ad_unit_empty'
+        };
+        const expectedContentId = 'jw_' + testIdForSuccess;
+        const expectedTargeting = {
+          segments: validSegments,
+          content: {
+            id: expectedContentId
+          }
+        };
+        jwplayerSubmodule.getBidRequestData({ adUnits: [adUnitWithMediaId, adUnitEmpty] }, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+        expect(bid.rtd.jwplayer).to.have.deep.property('targeting', expectedTargeting);
+      });
+
+      it('excludes segments when absent', function () {
+        const adUnitCode = 'test_ad_unit';
+        const bid = {};
+        const adUnit = {
+          ortb2Imp: {
+            ext: {
+              data: {
+                jwTargeting: {
+                  mediaID: testIdForFailure
+                }
+              }
+            }
+          },
+          bids: [ bid ]
+        };
+        const expectedContentId = 'jw_' + adUnit.ortb2Imp.ext.data.jwTargeting.mediaID;
+        const expectedTargeting = {
+          content: {
+            id: expectedContentId
+          }
+        };
+
+        jwplayerSubmodule.getBidRequestData({ adUnits: [ adUnit ] }, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+        expect(bid.rtd.jwplayer.targeting).to.not.have.property('segments');
+        expect(bid.rtd.jwplayer.targeting).to.not.have.property('segments');
+        expect(bid.rtd.jwplayer).to.have.deep.property('targeting', expectedTargeting);
+      });
+
+      it('does not modify bid when jwTargeting block is absent', function () {
+        const adUnitCode = 'test_ad_unit';
+        const bid1 = {};
+        const bid2 = {};
+        const bid3 = {};
+        const adUnitWithMediaId = {
+          code: adUnitCode,
+          mediaID: testIdForSuccess,
+          bids: [ bid1 ]
+        };
+        const adUnitEmpty = {
+          code: 'test_ad_unit_empty',
+          bids: [ bid2 ]
+        };
+
+        const adUnitEmptyfpd = {
+          code: 'test_ad_unit_empty_fpd',
+          ortb2Imp: {
+            ext: {
+              id: 'sthg'
+            }
+          },
+          bids: [ bid3 ]
+        };
+
+        jwplayerSubmodule.getBidRequestData({ adUnits: [adUnitWithMediaId, adUnitEmpty, adUnitEmptyfpd] }, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+        expect(bid1).to.not.have.property('rtd');
+        expect(bid2).to.not.have.property('rtd');
+        expect(bid3).to.not.have.property('rtd');
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/kargoAnalyticsAdapter_spec.js b/test/spec/modules/kargoAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..c27c8499aa1
--- /dev/null
+++ b/test/spec/modules/kargoAnalyticsAdapter_spec.js
@@ -0,0 +1,42 @@
+import kargoAnalyticsAdapter from 'modules/kargoAnalyticsAdapter.js';
+import { expect } from 'chai';
+import { server } from 'test/mocks/xhr.js';
+let events = require('src/events');
+let constants = require('src/constants.json');
+
+describe('Kargo Analytics Adapter', function () {
+  const adapterConfig = {
+    provider: 'kargoAnalytics',
+  };
+
+  after(function () {
+    kargoAnalyticsAdapter.disableAnalytics();
+  });
+
+  describe('main test flow', function () {
+    beforeEach(function () {
+      kargoAnalyticsAdapter.enableAnalytics(adapterConfig);
+      sinon.stub(events, 'getEvents').returns([]);
+    });
+
+    afterEach(function () {
+      events.getEvents.restore();
+    });
+
+    it('bid response data should send one request with auction ID, auction timeout, and response time', function() {
+      const bidResponse = {
+        bidder: 'kargo',
+        auctionId: '66529d4c-8998-47c2-ab3e-5b953490b98f',
+        timeToRespond: 192,
+      };
+
+      events.emit(constants.EVENTS.AUCTION_INIT, {
+        timeout: 1000
+      });
+      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+
+      expect(server.requests.length).to.equal(1);
+      expect(server.requests[0].url).to.equal('https://krk.kargo.com/api/v1/event/auction-data?aid=66529d4c-8998-47c2-ab3e-5b953490b98f&ato=1000&rt=192&it=0');
+    });
+  });
+});
diff --git a/test/spec/modules/kargoBidAdapter_spec.js b/test/spec/modules/kargoBidAdapter_spec.js
index be73e140839..565b83704fa 100644
--- a/test/spec/modules/kargoBidAdapter_spec.js
+++ b/test/spec/modules/kargoBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect, assert} from 'chai';
 import {spec} from 'modules/kargoBidAdapter.js';
 import {config} from 'src/config.js';
+const utils = require('src/utils');
 
 describe('kargo adapter tests', function () {
   var sandbox, clock, frozenNow = new Date();
@@ -37,6 +38,11 @@ describe('kargo adapter tests', function () {
     var bids, undefinedCurrency, noAdServerCurrency, cookies = [], localStorageItems = [], sessionIds = [], requestCount = 0;
 
     beforeEach(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kargo: {
+          storageAllowed: true
+        }
+      };
       undefinedCurrency = false;
       noAdServerCurrency = false;
       sandbox.stub(config, 'getConfig').callsFake(function(key) {
@@ -63,7 +69,33 @@ describe('kargo adapter tests', function () {
           userId: {
             tdid: 'fake-tdid'
           },
-          sizes: [[320, 50], [300, 250], [300, 600]]
+          sizes: [[320, 50], [300, 250], [300, 600]],
+          ortb2: {
+            device: {
+              sua: {
+                platform: {
+                  brand: 'macOS',
+                  version: [ '12', '6', '0' ]
+                },
+                browsers: [
+                  {
+                    brand: 'Chromium',
+                    version: [ '106', '0', '5249', '119' ]
+                  },
+                  {
+                    brand: 'Google Chrome',
+                    version: [ '106', '0', '5249', '119' ]
+                  },
+                  {
+                    brand: 'Not;A=Brand',
+                    version: [ '99', '0', '0', '0' ]
+                  }
+                ],
+                mobile: 0,
+                model: ''
+              }
+            }
+          }
         },
         {
           params: {
@@ -95,6 +127,7 @@ describe('kargo adapter tests', function () {
 
       cookies.length = 0;
       localStorageItems.length = 0;
+      $$PREBID_GLOBAL$$.bidderSettings = {};
     });
 
     function setCookie(cname, cvalue, exdays = 1) {
@@ -134,20 +167,27 @@ describe('kargo adapter tests', function () {
       noAdServerCurrency = true;
     }
 
-    function initializeKruxUser() {
-      setLocalStorageItem('kxkar_user', 'rsgr9pnij');
+    function generateGDPR(applies, haveConsent) {
+      var data = {
+        consentString: 'gdprconsentstring',
+        gdprApplies: applies,
+      };
+      return data;
     }
 
-    function initializeKruxSegments() {
-      setLocalStorageItem('kxkar_segs', 'qv9v984dy,rpx2gy365,qrd5u4axv,rnub9nmtd,reha00jnu');
+    function generateGDPRExpect(applies, haveConsent) {
+      return {
+        consent: 'gdprconsentstring',
+        applies: applies,
+      };
     }
 
     function getKrgCrb() {
-      return 'eyJzeW5jSWRzIjp7IjIiOiI4MmZhMjU1NS01OTY5LTQ2MTQtYjRjZS00ZGNmMTA4MGU5ZjkiLCIxNiI6IlZveElrOEFvSnowQUFFZENleUFBQUFDMiY1MDIiLCIyMyI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjI0IjoiVm94SWs4QW9KejBBQUVkQ2V5QUFBQUMyJjUwMiIsIjI1IjoiNWVlMjQxMzgtNWUwMy00YjlkLWE5NTMtMzhlODMzZjI4NDlmIiwiMl84MCI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjJfOTMiOiI1ZWUyNDEzOC01ZTAzLTRiOWQtYTk1My0zOGU4MzNmMjg0OWYifSwidXNlcklkIjoiNWYxMDg4MzEtMzAyZC0xMWU3LWJmNmItNDU5NWFjZDNiZjZjIiwiY2xpZW50SWQiOiIyNDEwZDhmMi1jMTExLTQ4MTEtODhhNS03YjVlMTkwZTQ3NWYiLCJvcHRPdXQiOmZhbHNlLCJleHBpcmVUaW1lIjoxNDk3NDQ5MzgyNjY4LCJsYXN0U3luY2VkQXQiOjE0OTczNjI5NzkwMTJ9';
+      return 'eyJzeW5jSWRzIjp7IjIiOiI4MmZhMjU1NS01OTY5LTQ2MTQtYjRjZS00ZGNmMTA4MGU5ZjkiLCIxNiI6IlZveElrOEFvSnowQUFFZENleUFBQUFDMiY1MDIiLCIyMyI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjI0IjoiVm94SWs4QW9KejBBQUVkQ2V5QUFBQUMyJjUwMiIsIjI1IjoiNWVlMjQxMzgtNWUwMy00YjlkLWE5NTMtMzhlODMzZjI4NDlmIiwiMl84MCI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjJfOTMiOiI1ZWUyNDEzOC01ZTAzLTRiOWQtYTk1My0zOGU4MzNmMjg0OWYifSwibGV4SWQiOiI1ZjEwODgzMS0zMDJkLTExZTctYmY2Yi00NTk1YWNkM2JmNmMiLCJjbGllbnRJZCI6IjI0MTBkOGYyLWMxMTEtNDgxMS04OGE1LTdiNWUxOTBlNDc1ZiIsIm9wdE91dCI6ZmFsc2UsImV4cGlyZVRpbWUiOjE0OTc0NDkzODI2NjgsImxhc3RTeW5jZWRBdCI6MTQ5NzM2Mjk3OTAxMn0=';
     }
 
     function getKrgCrbOldStyle() {
-      return '%7B%22v%22%3A%22eyJzeW5jSWRzIjp7IjIiOiI4MmZhMjU1NS01OTY5LTQ2MTQtYjRjZS00ZGNmMTA4MGU5ZjkiLCIxNiI6IlZveElrOEFvSnowQUFFZENleUFBQUFDMiY1MDIiLCIyMyI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjI0IjoiVm94SWs4QW9KejBBQUVkQ2V5QUFBQUMyJjUwMiIsIjI1IjoiNWVlMjQxMzgtNWUwMy00YjlkLWE5NTMtMzhlODMzZjI4NDlmIiwiMl84MCI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjJfOTMiOiI1ZWUyNDEzOC01ZTAzLTRiOWQtYTk1My0zOGU4MzNmMjg0OWYifSwidXNlcklkIjoiNWYxMDg4MzEtMzAyZC0xMWU3LWJmNmItNDU5NWFjZDNiZjZjIiwiY2xpZW50SWQiOiIyNDEwZDhmMi1jMTExLTQ4MTEtODhhNS03YjVlMTkwZTQ3NWYiLCJvcHRPdXQiOmZhbHNlLCJleHBpcmVUaW1lIjoxNDk3NDQ5MzgyNjY4LCJsYXN0U3luY2VkQXQiOjE0OTczNjI5NzkwMTJ9%22%7D';
+      return '{"v":"eyJzeW5jSWRzIjp7IjIiOiI4MmZhMjU1NS01OTY5LTQ2MTQtYjRjZS00ZGNmMTA4MGU5ZjkiLCIxNiI6IlZveElrOEFvSnowQUFFZENleUFBQUFDMiY1MDIiLCIyMyI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjI0IjoiVm94SWs4QW9KejBBQUVkQ2V5QUFBQUMyJjUwMiIsIjI1IjoiNWVlMjQxMzgtNWUwMy00YjlkLWE5NTMtMzhlODMzZjI4NDlmIiwiMl84MCI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjJfOTMiOiI1ZWUyNDEzOC01ZTAzLTRiOWQtYTk1My0zOGU4MzNmMjg0OWYifSwibGV4SWQiOiI1ZjEwODgzMS0zMDJkLTExZTctYmY2Yi00NTk1YWNkM2JmNmMiLCJjbGllbnRJZCI6IjI0MTBkOGYyLWMxMTEtNDgxMS04OGE1LTdiNWUxOTBlNDc1ZiIsIm9wdE91dCI6ZmFsc2UsImV4cGlyZVRpbWUiOjE0OTc0NDkzODI2NjgsImxhc3RTeW5jZWRBdCI6MTQ5NzM2Mjk3OTAxMn0="}';
     }
 
     function initializeKrgCrb(cookieOnly) {
@@ -174,7 +214,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getInvalidKrgCrbType2OldStyle() {
-      return '%7B%22v%22%3A%22%26%26%26%26%26%26%22%7D';
+      return '{"v":"&&&&&&"}';
     }
 
     function initializeInvalidKrgCrbType2() {
@@ -186,7 +226,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getInvalidKrgCrbType3OldStyle() {
-      return '%7B%22v%22%3A%22Ly8v%22%7D';
+      return '{"v":"Ly8v"}';
     }
 
     function initializeInvalidKrgCrbType3Cookie() {
@@ -194,7 +234,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getInvalidKrgCrbType4OldStyle() {
-      return '%7B%22v%22%3A%22bnVsbA%3D%3D%22%7D';
+      return '{"v":"bnVsbA=="}';
     }
 
     function initializeInvalidKrgCrbType4Cookie() {
@@ -206,7 +246,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getEmptyKrgCrbOldStyle() {
-      return '%7B%22v%22%3A%22eyJleHBpcmVUaW1lIjoxNDk3NDQ5MzgyNjY4LCJsYXN0U3luY2VkQXQiOjE0OTczNjI5NzkwMTJ9%22%7D';
+      return '{"v":"eyJleHBpcmVUaW1lIjoxNDk3NDQ5MzgyNjY4LCJsYXN0U3luY2VkQXQiOjE0OTczNjI5NzkwMTJ9"}';
     }
 
     function initializeEmptyKrgCrb() {
@@ -221,7 +261,7 @@ describe('kargo adapter tests', function () {
       return spec._getSessionId();
     }
 
-    function getExpectedKrakenParams(excludeUserIds, excludeKrux, expectedRawCRB, expectedRawCRBCookie) {
+    function getExpectedKrakenParams(excludeUserIds, expectedRawCRB, expectedRawCRBCookie, expectedGDPR) {
       var base = {
         timeout: 200,
         requestCount: requestCount++,
@@ -242,6 +282,32 @@ describe('kargo adapter tests', function () {
           2: [[320, 50], [300, 250], [300, 600]],
           3: [[320, 50], [300, 250], [300, 600]]
         },
+        device: {
+          width: screen.width,
+          height: screen.height,
+          sua: {
+            platform: {
+              brand: 'macOS',
+              version: [ '12', '6', '0' ]
+            },
+            browsers: [
+              {
+                brand: 'Chromium',
+                version: [ '106', '0', '5249', '119' ]
+              },
+              {
+                brand: 'Google Chrome',
+                version: [ '106', '0', '5249', '119' ]
+              },
+              {
+                brand: 'Not;A=Brand',
+                version: [ '99', '0', '0', '0' ]
+              }
+            ],
+            mobile: 0,
+            model: '',
+          },
+        },
         userIDs: {
           kargoID: '5f108831-302d-11e7-bf6b-4595acd3bf6c',
           clientID: '2410d8f2-c111-4811-88a5-7b5e190e475f',
@@ -258,27 +324,43 @@ describe('kargo adapter tests', function () {
           optOut: false,
           usp: '1---'
         },
-        krux: {
-          userID: 'rsgr9pnij',
-          segments: [
-            'qv9v984dy',
-            'rpx2gy365',
-            'qrd5u4axv',
-            'rnub9nmtd',
-            'reha00jnu'
-          ]
-        },
-        pageURL: window.location.href,
+        pageURL: 'https://www.prebid.org',
         prebidRawBidRequests: [
           {
             bidId: 1,
+            ortb2: {
+              device: {
+                sua: {
+                  platform: {
+                    brand: 'macOS',
+                    version: [ '12', '6', '0' ]
+                  },
+                  browsers: [
+                    {
+                      brand: 'Chromium',
+                      version: [ '106', '0', '5249', '119' ]
+                    },
+                    {
+                      brand: 'Google Chrome',
+                      version: [ '106', '0', '5249', '119' ]
+                    },
+                    {
+                      brand: 'Not;A=Brand',
+                      version: [ '99', '0', '0', '0' ]
+                    }
+                  ],
+                  mobile: 0,
+                  model: ''
+                }
+              }
+            },
             params: {
               placementId: 'foo'
             },
             userId: {
               tdid: 'fake-tdid'
             },
-            sizes: [[320, 50], [300, 250], [300, 600]]
+            sizes: [[320, 50], [300, 250], [300, 600]],
           },
           {
             bidId: 2,
@@ -299,6 +381,10 @@ describe('kargo adapter tests', function () {
         rawCRBLocalStorage: expectedRawCRB
       };
 
+      if (expectedGDPR) {
+        base.userIDs['gdpr'] = expectedGDPR;
+      }
+
       if (excludeUserIds === true) {
         base.userIDs = {
           crbIDs: {},
@@ -307,22 +393,27 @@ describe('kargo adapter tests', function () {
         delete base.prebidRawBidRequests[0].userId.tdid;
       }
 
-      if (excludeKrux) {
-        base.krux = {
-          userID: null,
-          segments: []
-        };
-      }
-
       return base;
     }
 
-    function testBuildRequests(excludeTdid, expected) {
+    function testBuildRequests(excludeTdid, expected, gdpr) {
       var clonedBids = JSON.parse(JSON.stringify(bids));
       if (excludeTdid) {
         delete clonedBids[0].userId.tdid;
       }
-      var request = spec.buildRequests(clonedBids, {timeout: 200, uspConsent: '1---', foo: 'bar'});
+      var payload = {
+        timeout: 200,
+        uspConsent: '1---',
+        refererInfo: {
+          page: 'https://www.prebid.org',
+        },
+      };
+
+      if (gdpr) {
+        payload['gdprConsent'] = gdpr
+      }
+
+      var request = spec.buildRequests(clonedBids, payload);
       expected.sessionId = getSessionId();
       sessionIds.push(expected.sessionId);
       var krakenParams = JSON.parse(decodeURIComponent(request.data.slice(5)));
@@ -331,7 +422,6 @@ describe('kargo adapter tests', function () {
       expect(request.method).to.equal('GET');
       expect(request.currency).to.equal('USD');
       expect(request.timeout).to.equal(200);
-      expect(request.foo).to.equal('bar');
       expect(krakenParams).to.deep.equal(expected);
       // Make sure session ID stays the same across requests simulating multiple auctions on one page load
       for (let i in sessionIds) {
@@ -344,92 +434,77 @@ describe('kargo adapter tests', function () {
     }
 
     it('works when all params and localstorage and cookies are correctly set', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeKrgCrb();
-      testBuildRequests(false, getExpectedKrakenParams(undefined, undefined, getKrgCrb(), getKrgCrbOldStyle()));
+      testBuildRequests(false, getExpectedKrakenParams(undefined, getKrgCrb(), getKrgCrbOldStyle()));
     });
 
     it('works when all params and cookies are correctly set but no localstorage', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeKrgCrb(true);
-      testBuildRequests(false, getExpectedKrakenParams(undefined, undefined, null, getKrgCrbOldStyle()));
+      testBuildRequests(false, getExpectedKrakenParams(undefined, null, getKrgCrbOldStyle()));
     });
 
     it('gracefully handles nothing being set', function() {
-      testBuildRequests(true, getExpectedKrakenParams(true, true, null, null));
+      testBuildRequests(true, getExpectedKrakenParams(true, null, null));
     });
 
     it('gracefully handles browsers without localStorage', function() {
       simulateNoLocalStorage();
-      testBuildRequests(true, getExpectedKrakenParams(true, true, null, null));
+      testBuildRequests(true, getExpectedKrakenParams(true, null, null));
     });
 
     it('handles empty yet valid Kargo CRB', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeEmptyKrgCrb();
       initializeEmptyKrgCrbCookie();
-      testBuildRequests(true, getExpectedKrakenParams(true, undefined, getEmptyKrgCrb(), getEmptyKrgCrbOldStyle()));
+      testBuildRequests(true, getExpectedKrakenParams(true, getEmptyKrgCrb(), getEmptyKrgCrbOldStyle()));
     });
 
     it('handles broken Kargo CRBs where base64 encoding is invalid', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeInvalidKrgCrbType1();
-      testBuildRequests(true, getExpectedKrakenParams(true, undefined, getInvalidKrgCrbType1(), null));
+      testBuildRequests(true, getExpectedKrakenParams(true, getInvalidKrgCrbType1(), null));
     });
 
     it('handles broken Kargo CRBs where top level JSON is invalid on cookie', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeInvalidKrgCrbType1Cookie();
-      testBuildRequests(true, getExpectedKrakenParams(true, undefined, null, getInvalidKrgCrbType1()));
+      testBuildRequests(true, getExpectedKrakenParams(true, null, getInvalidKrgCrbType1()));
     });
 
     it('handles broken Kargo CRBs where decoded JSON is invalid', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeInvalidKrgCrbType2();
-      testBuildRequests(true, getExpectedKrakenParams(true, undefined, getInvalidKrgCrbType2(), null));
+      testBuildRequests(true, getExpectedKrakenParams(true, getInvalidKrgCrbType2(), null));
     });
 
     it('handles broken Kargo CRBs where inner base 64 is invalid on cookie', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeInvalidKrgCrbType2Cookie();
-      testBuildRequests(true, getExpectedKrakenParams(true, undefined, null, getInvalidKrgCrbType2OldStyle()));
+      testBuildRequests(true, getExpectedKrakenParams(true, null, getInvalidKrgCrbType2OldStyle()));
     });
 
     it('handles broken Kargo CRBs where inner JSON is invalid on cookie', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeInvalidKrgCrbType3Cookie();
-      testBuildRequests(true, getExpectedKrakenParams(true, undefined, null, getInvalidKrgCrbType3OldStyle()));
+      testBuildRequests(true, getExpectedKrakenParams(true, null, getInvalidKrgCrbType3OldStyle()));
     });
 
     it('handles broken Kargo CRBs where inner JSON is falsey', function() {
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeInvalidKrgCrbType4Cookie();
-      testBuildRequests(true, getExpectedKrakenParams(true, undefined, null, getInvalidKrgCrbType4OldStyle()));
+      testBuildRequests(true, getExpectedKrakenParams(true, null, getInvalidKrgCrbType4OldStyle()));
     });
 
     it('handles a non-existant currency object on the config', function() {
       simulateNoCurrencyObject();
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeKrgCrb();
-      testBuildRequests(false, getExpectedKrakenParams(undefined, undefined, getKrgCrb(), getKrgCrbOldStyle()));
+      testBuildRequests(false, getExpectedKrakenParams(undefined, getKrgCrb(), getKrgCrbOldStyle()));
     });
 
     it('handles no ad server currency being set on the currency object in the config', function() {
       simulateNoAdServerCurrency();
-      initializeKruxUser();
-      initializeKruxSegments();
       initializeKrgCrb();
-      testBuildRequests(false, getExpectedKrakenParams(undefined, undefined, getKrgCrb(), getKrgCrbOldStyle()));
+      testBuildRequests(false, getExpectedKrakenParams(undefined, getKrgCrb(), getKrgCrbOldStyle()));
+    });
+
+    it('sends gdpr consent', function () {
+      initializeKrgCrb();
+      testBuildRequests(false, getExpectedKrakenParams(undefined, getKrgCrb(), getKrgCrbOldStyle(), generateGDPRExpect(true, true)), generateGDPR(true, true));
+      testBuildRequests(false, getExpectedKrakenParams(undefined, getKrgCrb(), getKrgCrbOldStyle(), generateGDPRExpect(false, true)), generateGDPR(false, true));
+      testBuildRequests(false, getExpectedKrakenParams(undefined, getKrgCrb(), getKrgCrbOldStyle(), generateGDPRExpect(false, false)), generateGDPR(false, false));
     });
   });
 
@@ -452,7 +527,7 @@ describe('kargo adapter tests', function () {
           height: 250,
           targetingCustom: 'dmpmptest1234',
           metadata: {
-            landingPageDomain: 'https://foobar.com'
+            landingPageDomain: ['https://foobar.com']
           }
         },
         3: {
@@ -461,6 +536,26 @@ describe('kargo adapter tests', function () {
           adm: '<div id="2"></div>',
           width: 300,
           height: 250
+        },
+        4: {
+          id: 'bar',
+          cpm: 2.5,
+          adm: '<div id="4"></div>',
+          width: 300,
+          height: 250,
+          mediaType: 'banner',
+          metadata: {},
+          currency: 'EUR'
+        },
+        5: {
+          id: 'bar',
+          cpm: 2.5,
+          adm: '<VAST></VAST>',
+          width: 300,
+          height: 250,
+          mediaType: 'video',
+          metadata: {},
+          currency: 'EUR'
         }
       }}, {
         currency: 'USD',
@@ -479,6 +574,16 @@ describe('kargo adapter tests', function () {
           params: {
             placementId: 'bar'
           }
+        }, {
+          bidId: 4,
+          params: {
+            placementId: 'bar'
+          }
+        }, {
+          bidId: 5,
+          params: {
+            placementId: 'bar'
+          }
         }]
       });
       var expectation = [{
@@ -492,7 +597,10 @@ describe('kargo adapter tests', function () {
         dealId: undefined,
         netRevenue: true,
         currency: 'USD',
-        meta: undefined
+        mediaType: 'banner',
+        meta: {
+          mediaType: 'banner'
+        }
       }, {
         requestId: '2',
         cpm: 2.5,
@@ -504,8 +612,11 @@ describe('kargo adapter tests', function () {
         dealId: 'dmpmptest1234',
         netRevenue: true,
         currency: 'USD',
+        mediaType: 'banner',
         meta: {
-          clickUrl: 'https://foobar.com'
+          mediaType: 'banner',
+          clickUrl: 'https://foobar.com',
+          advertiserDomains: ['https://foobar.com']
         }
       }, {
         requestId: '3',
@@ -518,7 +629,41 @@ describe('kargo adapter tests', function () {
         dealId: undefined,
         netRevenue: true,
         currency: 'USD',
-        meta: undefined
+        mediaType: 'banner',
+        meta: {
+          mediaType: 'banner'
+        }
+      }, {
+        requestId: '4',
+        cpm: 2.5,
+        width: 300,
+        height: 250,
+        ad: '<div id="4"></div>',
+        ttl: 300,
+        creativeId: 'bar',
+        dealId: undefined,
+        netRevenue: true,
+        currency: 'EUR',
+        mediaType: 'banner',
+        meta: {
+          mediaType: 'banner'
+        }
+      }, {
+        requestId: '5',
+        cpm: 2.5,
+        width: 300,
+        height: 250,
+        ad: '<VAST></VAST>',
+        vastXml: '<VAST></VAST>',
+        ttl: 300,
+        creativeId: 'bar',
+        dealId: undefined,
+        netRevenue: true,
+        currency: 'EUR',
+        mediaType: 'video',
+        meta: {
+          mediaType: 'video'
+        }
       }];
       expect(resp).to.deep.equal(expectation);
     });
@@ -529,6 +674,11 @@ describe('kargo adapter tests', function () {
     var shouldSimulateOutdatedBrowser, crb, isActuallyOutdatedBrowser;
 
     beforeEach(() => {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kargo: {
+          storageAllowed: true
+        }
+      };
       crb = {};
       shouldSimulateOutdatedBrowser = false;
       isActuallyOutdatedBrowser = false;
@@ -557,8 +707,8 @@ describe('kargo adapter tests', function () {
       });
     });
 
-    function getUserSyncsWhenAllowed() {
-      return spec.getUserSyncs({iframeEnabled: true});
+    function getUserSyncsWhenAllowed(gdprConsent, usPrivacy) {
+      return spec.getUserSyncs({iframeEnabled: true}, null, gdprConsent, usPrivacy);
     }
 
     function getUserSyncsWhenForbidden() {
@@ -573,17 +723,17 @@ describe('kargo adapter tests', function () {
       shouldSimulateOutdatedBrowser = true;
     }
 
-    function getSyncUrl(index) {
+    function getSyncUrl(index, gdprApplies, gdprConsentString, usPrivacy) {
       return {
         type: 'iframe',
-        url: `https://crb.kargo.com/api/v1/initsyncrnd/${clientId}?seed=3205e885-8d37-4139-b47e-f82cff268000&idx=${index}`
+        url: `https://crb.kargo.com/api/v1/initsyncrnd/${clientId}?seed=3205e885-8d37-4139-b47e-f82cff268000&idx=${index}&gdpr=${gdprApplies}&gdpr_consent=${gdprConsentString}&us_privacy=${usPrivacy}`
       };
     }
 
-    function getSyncUrls() {
+    function getSyncUrls(gdprApplies, gdprConsentString, usPrivacy) {
       var syncs = [];
       for (var i = 0; i < 5; i++) {
-        syncs[i] = getSyncUrl(i);
+        syncs[i] = getSyncUrl(i, gdprApplies || 0, gdprConsentString || '', usPrivacy || '');
       }
       return syncs;
     }
@@ -605,6 +755,21 @@ describe('kargo adapter tests', function () {
       safelyRun(() => expect(getUserSyncsWhenAllowed()).to.be.an('array').that.is.empty);
     });
 
+    it('no user syncs when there is no us privacy consent', function() {
+      turnOnClientId();
+      safelyRun(() => expect(getUserSyncsWhenAllowed(null, '1YYY')).to.be.an('array').that.is.empty);
+    });
+
+    it('pass through us privacy consent', function() {
+      turnOnClientId();
+      safelyRun(() => expect(getUserSyncsWhenAllowed(null, '1YNY')).to.deep.equal(getSyncUrls(0, '', '1YNY')));
+    });
+
+    it('pass through gdpr consent', function() {
+      turnOnClientId();
+      safelyRun(() => expect(getUserSyncsWhenAllowed({ gdprApplies: true, consentString: 'consentstring' })).to.deep.equal(getSyncUrls(1, 'consentstring', '')));
+    });
+
     it('no user syncs when there is outdated browser', function() {
       turnOnClientId();
       simulateOutdatedBrowser();
@@ -616,4 +781,26 @@ describe('kargo adapter tests', function () {
       safelyRun(() => expect(getUserSyncsWhenForbidden()).to.be.an('array').that.is.empty);
     });
   });
+
+  describe('timeout pixel trigger', function () {
+    let triggerPixelStub;
+
+    beforeEach(function () {
+      triggerPixelStub = sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('should call triggerPixel utils function when timed out is filled', function () {
+      spec.onTimeout();
+      expect(triggerPixelStub.getCall(0)).to.be.null;
+      spec.onTimeout([{ auctionId: '1234', timeout: 2000 }]);
+      expect(triggerPixelStub.getCall(0)).to.not.be.null;
+      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('https://krk.kargo.com/api/v1/event/timeout');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('aid=1234');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('ato=2000');
+    });
+  });
 });
diff --git a/test/spec/modules/koblerBidAdapter_spec.js b/test/spec/modules/koblerBidAdapter_spec.js
new file mode 100644
index 00000000000..5bcf62ff95d
--- /dev/null
+++ b/test/spec/modules/koblerBidAdapter_spec.js
@@ -0,0 +1,741 @@
+import {expect} from 'chai';
+import {spec} from 'modules/koblerBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+import {getRefererInfo} from 'src/refererDetection.js';
+
+function createBidderRequest(auctionId, timeout, pageUrl) {
+  return {
+    auctionId: auctionId || 'c1243d83-0bed-4fdb-8c76-42b456be17d0',
+    timeout: timeout || 2000,
+    refererInfo: {
+      page: pageUrl || 'example.com'
+    }
+  };
+}
+
+function createValidBidRequest(params, bidId, sizes) {
+  const validBidRequest = {
+    adUnitCode: 'adunit-code',
+    bidId: bidId || '22c4871113f461',
+    bidder: 'kobler',
+    bidderRequestId: '15246a574e859f',
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    mediaTypes: {
+      banner: {
+        sizes: sizes || [[300, 250], [320, 100]]
+      }
+    },
+    transactionTd: '04314114-15bd-4638-8664-bdb8bdc60bff'
+  };
+  if (params) {
+    validBidRequest.params = params;
+  }
+  return validBidRequest;
+}
+
+describe('KoblerAdapter', function () {
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      const adapter = newBidder(spec);
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should not accept a request without bidId as valid', function () {
+      const bid = {
+        params: {
+          someParam: 'abc'
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without mediaTypes and sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589'
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without mediaTypes and string sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        sizes: 'string'
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without mediaTypes and empty sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        sizes: []
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without mediaTypes.banner and sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        mediaTypes: {}
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without mediaTypes.banner and empty sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        sizes: [],
+        mediaTypes: {}
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without sizes and string mediaTypes.banner as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        mediaTypes: {
+          banner: 'string'
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without sizes and mediaTypes.banner.sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        mediaTypes: {
+          banner: {}
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without sizes and string mediaTypes.banner.sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        mediaTypes: {
+          banner: {
+            sizes: 'string'
+          }
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without sizes and empty mediaTypes.banner.sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        mediaTypes: {
+          banner: {
+            sizes: []
+          }
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should accept a request with bidId and sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        sizes: [[5, 5]]
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.true;
+    });
+
+    it('should accept a request with bidId and mediaTypes.banner.sizes as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        mediaTypes: {
+          banner: {
+            sizes: [[0, 0]]
+          }
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.true;
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('should read data from bidder request', function () {
+      const testUrl = 'kobler.no';
+      const auctionId = '8319af54-9795-4642-ba3a-6f57d6ff9100';
+      const timeout = 5000;
+      const validBidRequests = [createValidBidRequest()];
+      const bidderRequest = createBidderRequest(auctionId, timeout, testUrl);
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.tmax).to.be.equal(timeout);
+      expect(openRtbRequest.id).to.be.equal(auctionId);
+      expect(openRtbRequest.site.page).to.be.equal(testUrl);
+    });
+
+    it('should read data from valid bid requests', function () {
+      const firstSize = [400, 800];
+      const secondSize = [450, 950];
+      const sizes = [firstSize, secondSize];
+      const bidId = '3a56a019-4835-4f75-811c-76fac6853a2c';
+      const validBidRequests = [
+        createValidBidRequest(
+          undefined,
+          bidId,
+          sizes
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].id).to.be.equal(bidId);
+      expect(openRtbRequest.imp[0].banner.w).to.be.equal(firstSize[0]);
+      expect(openRtbRequest.imp[0].banner.h).to.be.equal(firstSize[1]);
+      expect(openRtbRequest.imp[0].banner.format.length).to.be.equal(2);
+      expect(openRtbRequest.imp[0].banner.format[0].w).to.be.equal(firstSize[0]);
+      expect(openRtbRequest.imp[0].banner.format[0].h).to.be.equal(firstSize[1]);
+      expect(openRtbRequest.imp[0].banner.format[1].w).to.be.equal(secondSize[0]);
+      expect(openRtbRequest.imp[0].banner.format[1].h).to.be.equal(secondSize[1]);
+    });
+
+    it('should use 0x0 as default size', function () {
+      const validBidRequests = [
+        createValidBidRequest(
+          undefined,
+          undefined,
+          []
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].banner.w).to.be.equal(0);
+      expect(openRtbRequest.imp[0].banner.h).to.be.equal(0);
+      expect(openRtbRequest.imp[0].banner.format.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].banner.format[0].w).to.be.equal(0);
+      expect(openRtbRequest.imp[0].banner.format[0].h).to.be.equal(0);
+    });
+
+    it('should read test from valid bid requests', function () {
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            test: true
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(result.url).to.be.equal('https://bid-service.dev.essrtb.com/bid/prebid_rtb_call');
+
+      const openRtbRequest = JSON.parse(result.data);
+      expect(openRtbRequest.site.page).to.be.equal('example.com');
+      expect(openRtbRequest.test).to.be.equal(1);
+    });
+
+    it('should read pageUrl from config when testing', function () {
+      config.setConfig({
+        pageUrl: 'https://testing-url.com'
+      });
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            test: true
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(result.url).to.be.equal('https://bid-service.dev.essrtb.com/bid/prebid_rtb_call');
+
+      const openRtbRequest = JSON.parse(result.data);
+      expect(openRtbRequest.site.page).to.be.equal('https://testing-url.com');
+      expect(openRtbRequest.test).to.be.equal(1);
+    });
+
+    it('should not read pageUrl from config when not testing', function () {
+      config.setConfig({
+        pageUrl: 'https://testing-url.com'
+      });
+      const validBidRequests = [
+        createValidBidRequest()
+      ];
+      const bidderRequest = createBidderRequest(
+        'f85d61cc-ed11-4b6c-aefb-87943263cedb',
+        2000,
+        'https://non-testing-url.net'
+      );
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(result.url).to.be.equal('https://bid.essrtb.com/bid/prebid_rtb_call');
+
+      const openRtbRequest = JSON.parse(result.data);
+      expect(openRtbRequest.site.page).to.be.equal('https://non-testing-url.net');
+      expect(openRtbRequest.test).to.be.equal(0);
+    });
+
+    it('should read floorPrice from valid bid requests', function () {
+      const floorPrice = 4.343;
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            floorPrice: floorPrice
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].bidfloor).to.be.equal(floorPrice);
+    });
+
+    it('should read dealIds from valid bid requests', function () {
+      const dealIds1 = ['78214682234823'];
+      const dealIds2 = ['89913861235234', '27368423545328640'];
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            dealIds: dealIds1
+          }
+        ),
+        createValidBidRequest(
+          {
+            dealIds: dealIds2
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(2);
+      expect(openRtbRequest.imp[0].pmp.deals.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].pmp.deals[0].id).to.be.equal(dealIds1[0]);
+      expect(openRtbRequest.imp[1].pmp.deals.length).to.be.equal(2);
+      expect(openRtbRequest.imp[1].pmp.deals[0].id).to.be.equal(dealIds2[0]);
+      expect(openRtbRequest.imp[1].pmp.deals[1].id).to.be.equal(dealIds2[1]);
+    });
+
+    it('should read timeout from config', function () {
+      const timeout = 4000;
+      const validBidRequests = [createValidBidRequest()];
+      // No timeout field
+      const bidderRequest = {
+        auctionId: 'c1243d83-0bed-4fdb-8c76-42b456be17d0',
+        refererInfo: {
+          page: 'example.com'
+        }
+      };
+      config.setConfig({
+        bidderTimeout: timeout
+      });
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.tmax).to.be.equal(timeout);
+    });
+
+    it('should read floor price using floors module', function () {
+      const floorPriceFor580x400 = 6.5148;
+      const floorPriceForAnySize = 4.2343;
+      const validBidRequests = [
+        createValidBidRequest(undefined, '98efe127-f926-4dde-b988-db8e5dba5a76', [[580, 400]]),
+        createValidBidRequest(undefined, 'c7698d4a-94f4-4a6b-a928-7e1facfbf752', [])
+      ];
+      validBidRequests.forEach(validBidRequest => {
+        validBidRequest.getFloor = function (params) {
+          let floorPrice;
+          if (utils.isArray(params.size) && params.size[0] === 580 && params.size[1] === 400) {
+            floorPrice = floorPriceFor580x400;
+          } else if (params.size === '*') {
+            floorPrice = floorPriceForAnySize
+          } else {
+            floorPrice = 0
+          }
+          return {
+            currency: params.currency,
+            floor: floorPrice
+          }
+        }
+      })
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(2);
+      expect(openRtbRequest.imp[0].id).to.be.equal('98efe127-f926-4dde-b988-db8e5dba5a76');
+      expect(openRtbRequest.imp[0].bidfloor).to.be.equal(floorPriceFor580x400);
+      expect(openRtbRequest.imp[1].id).to.be.equal('c7698d4a-94f4-4a6b-a928-7e1facfbf752');
+      expect(openRtbRequest.imp[1].bidfloor).to.be.equal(floorPriceForAnySize);
+    });
+
+    it('should create whole OpenRTB request', function () {
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            floorPrice: 5.6234,
+            dealIds: ['623472534328234']
+          },
+          '953ee65d-d18a-484f-a840-d3056185a060',
+          [[400, 600]]
+        ),
+        createValidBidRequest(
+          {
+            floorPrice: 3.2543,
+            dealIds: ['92368234753283', '263845832942']
+          },
+          '8320bf79-9d90-4a17-87c6-5d505706a921',
+          [[400, 500], [200, 250], [300, 350]]
+        ),
+        createValidBidRequest(
+          undefined,
+          'd0de713b-32e3-4191-a2df-a007f08ffe72',
+          [[800, 900]]
+        )
+      ];
+      const bidderRequest = createBidderRequest(
+        '9ff580cf-e10e-4b66-add7-40ac0c804e21',
+        4500,
+        'bid.kobler.no'
+      );
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      const expectedOpenRtbRequest = {
+        id: '9ff580cf-e10e-4b66-add7-40ac0c804e21',
+        at: 1,
+        tmax: 4500,
+        cur: ['USD'],
+        imp: [
+          {
+            id: '953ee65d-d18a-484f-a840-d3056185a060',
+            banner: {
+              format: [
+                {
+                  w: 400,
+                  h: 600
+                }
+              ],
+              w: 400,
+              h: 600
+            },
+            bidfloor: 5.6234,
+            bidfloorcur: 'USD',
+            pmp: {
+              deals: [
+                {
+                  id: '623472534328234'
+                }
+              ]
+            }
+          },
+          {
+            id: '8320bf79-9d90-4a17-87c6-5d505706a921',
+            banner: {
+              format: [
+                {
+                  w: 400,
+                  h: 500
+                },
+                {
+                  w: 200,
+                  h: 250
+                },
+                {
+                  w: 300,
+                  h: 350
+                }
+              ],
+              w: 400,
+              h: 500
+            },
+            bidfloor: 3.2543,
+            bidfloorcur: 'USD',
+            pmp: {
+              deals: [
+                {
+                  id: '92368234753283'
+                },
+                {
+                  id: '263845832942'
+                }
+              ]
+            }
+          },
+          {
+            id: 'd0de713b-32e3-4191-a2df-a007f08ffe72',
+            banner: {
+              format: [
+                {
+                  w: 800,
+                  h: 900
+                }
+              ],
+              w: 800,
+              h: 900
+            },
+            bidfloor: 0,
+            bidfloorcur: 'USD',
+            pmp: {}
+          }
+        ],
+        device: {
+          devicetype: 2
+        },
+        site: {
+          page: 'bid.kobler.no'
+        },
+        test: 0
+      };
+
+      expect(openRtbRequest).to.deep.equal(expectedOpenRtbRequest);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should handle empty body', function () {
+      const responseWithEmptyBody = {
+        body: undefined
+      };
+      const bids = spec.interpretResponse(responseWithEmptyBody)
+
+      expect(bids.length).to.be.equal(0);
+    });
+
+    it('should generate bids from OpenRTB response', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'NOK'
+        }
+      });
+      const responseWithTwoBids = {
+        body: {
+          seatbid: [
+            {
+              bid: [
+                {
+                  impid: '6194ddef-89a4-404f-9efd-6b718fc23308',
+                  price: 7.981,
+                  nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=sdhfusdaobfadslf234324&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
+                  crid: 'edea9b03-3a57-41aa-9c00-abd673e22006',
+                  dealid: '',
+                  w: 320,
+                  h: 250,
+                  adm: '<script src="https://atag.essrtb.com/serve/prebid_ad_tag?payload=sdhfusdaobfadslf234324"></script>',
+                  adomain: [
+                    'https://kobler.no'
+                  ]
+                },
+                {
+                  impid: '2ec0b40f-d3ca-4ba5-8ce3-48290565690f',
+                  price: 6.71234,
+                  nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=nbashgufvishdafjk23432&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
+                  crid: 'fa2d5af7-2678-4204-9023-44c526160742',
+                  dealid: '2783483223432342',
+                  w: 580,
+                  h: 400,
+                  adm: '<script src="https://atag.essrtb.com/serve/prebid_ad_tag?payload=nbashgufvishdafjk23432"></script>',
+                  adomain: [
+                    'https://bid.kobler.no'
+                  ]
+                }
+              ]
+            }
+          ],
+          cur: 'USD'
+        }
+      };
+      const bids = spec.interpretResponse(responseWithTwoBids)
+
+      const expectedBids = [
+        {
+          requestId: '6194ddef-89a4-404f-9efd-6b718fc23308',
+          cpm: 7.981,
+          currency: 'USD',
+          width: 320,
+          height: 250,
+          creativeId: 'edea9b03-3a57-41aa-9c00-abd673e22006',
+          dealId: '',
+          netRevenue: true,
+          ttl: 600,
+          ad: '<script src="https://atag.essrtb.com/serve/prebid_ad_tag?payload=sdhfusdaobfadslf234324"></script>',
+          nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=sdhfusdaobfadslf234324&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
+          meta: {
+            advertiserDomains: [
+              'https://kobler.no'
+            ]
+          }
+        },
+        {
+          requestId: '2ec0b40f-d3ca-4ba5-8ce3-48290565690f',
+          cpm: 6.71234,
+          currency: 'USD',
+          width: 580,
+          height: 400,
+          creativeId: 'fa2d5af7-2678-4204-9023-44c526160742',
+          dealId: '2783483223432342',
+          netRevenue: true,
+          ttl: 600,
+          ad: '<script src="https://atag.essrtb.com/serve/prebid_ad_tag?payload=nbashgufvishdafjk23432"></script>',
+          nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=nbashgufvishdafjk23432&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
+          meta: {
+            advertiserDomains: [
+              'https://bid.kobler.no'
+            ]
+          }
+        }
+      ];
+      expect(bids).to.deep.equal(expectedBids);
+    });
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if bid does not contain nurl', function () {
+      spec.onBidWon({});
+
+      expect(utils.triggerPixel.called).to.be.false;
+    });
+
+    it('Should not trigger pixel if nurl is empty', function () {
+      spec.onBidWon({
+        nurl: ''
+      });
+
+      expect(utils.triggerPixel.called).to.be.false;
+    });
+
+    it('Should trigger pixel with replaced nurl if nurl is not empty', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'NOK'
+        }
+      });
+      spec.onBidWon({
+        originalCpm: 1.532,
+        cpm: 8.341,
+        currency: 'NOK',
+        nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=sdhfusdaobfadslf234324&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
+        adserverTargeting: {
+          hb_pb: 8
+        }
+      });
+
+      expect(utils.triggerPixel.callCount).to.be.equal(1);
+      expect(utils.triggerPixel.firstCall.args[0]).to.be.equal(
+        'https://atag.essrtb.com/serve/prebid_win_notification?payload=sdhfusdaobfadslf234324&sp=8.341&sp_cur=NOK&asp=8&asp_cur=NOK'
+      );
+    });
+  });
+
+  describe('onTimeout', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if timeout data is not array', function () {
+      spec.onTimeout(null);
+
+      expect(utils.triggerPixel.called).to.be.false;
+    });
+
+    it('Should not trigger pixel if timeout data is empty', function () {
+      spec.onTimeout([]);
+
+      expect(utils.triggerPixel.called).to.be.false;
+    });
+
+    it('Should trigger pixel with query parameters if timeout data not empty', function () {
+      spec.onTimeout([
+        {
+          adUnitCode: 'adunit-code',
+          auctionId: 'a1fba829-dd41-409f-acfb-b7b0ac5f30c6',
+          bidId: 'ef236c6c-e934-406b-a877-d7be8e8a839a',
+          timeout: 100,
+          params: [],
+        },
+        {
+          adUnitCode: 'adunit-code-2',
+          auctionId: 'a1fba829-dd41-409f-acfb-b7b0ac5f30c6',
+          bidId: 'ca4121c8-9a4a-46ba-a624-e9b64af206f2',
+          timeout: 100,
+          params: [],
+        }
+      ]);
+
+      expect(utils.triggerPixel.callCount).to.be.equal(2);
+      expect(utils.triggerPixel.getCall(0).args[0]).to.be.equal(
+        'https://bid.essrtb.com/notify/prebid_timeout?ad_unit_code=adunit-code&' +
+        'auction_id=a1fba829-dd41-409f-acfb-b7b0ac5f30c6&bid_id=ef236c6c-e934-406b-a877-d7be8e8a839a&timeout=100&' +
+        'page_url=' + encodeURIComponent(getRefererInfo().page)
+      );
+      expect(utils.triggerPixel.getCall(1).args[0]).to.be.equal(
+        'https://bid.essrtb.com/notify/prebid_timeout?ad_unit_code=adunit-code-2&' +
+        'auction_id=a1fba829-dd41-409f-acfb-b7b0ac5f30c6&bid_id=ca4121c8-9a4a-46ba-a624-e9b64af206f2&timeout=100&' +
+        'page_url=' + encodeURIComponent(getRefererInfo().page)
+      );
+    });
+  });
+});
diff --git a/test/spec/modules/komoonaBidAdapter_spec.js b/test/spec/modules/komoonaBidAdapter_spec.js
deleted file mode 100644
index 3d62f91cae6..00000000000
--- a/test/spec/modules/komoonaBidAdapter_spec.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/komoonaBidAdapter.js';
-
-describe('Komoona.com Adapter Tests', function () {
-  const bidsRequest = [
-    {
-      bidder: 'komoona',
-      params: {
-        placementId: '170577',
-        hbid: 'abc12345678',
-      },
-      placementCode: 'div-gpt-ad-1460505748561-0',
-      transactionId: '9f801c02-bbe8-4683-8ed4-bc816ea186bb',
-      sizes: [
-        [300, 250]
-      ],
-      bidId: '2faedf1095f815',
-      bidderRequestId: '18065867f8ae39',
-      auctionId: '529e1518-b872-45cf-807c-2d41dfa5bcd3'
-    },
-    {
-      bidder: 'komoona',
-      params: {
-        placementId: '281277',
-        hbid: 'abc12345678',
-        floorPrice: 0.5
-      },
-      placementCode: 'div-gpt-ad-1460505748561-0',
-      transactionId: '9f801c02-bbe8-4683-8ed4-bc816ea186bb',
-      sizes: [
-        [728, 90]
-      ],
-      bidId: '3c34e2367a3f59',
-      bidderRequestId: '18065867f8ae39',
-      auctionId: '529e1518-b872-45cf-807c-2d41dfa5bcd3'
-    }];
-
-  const bidsResponse = {
-    body: {
-      bids: [
-        {
-          placementid: '170577',
-          uuid: '2faedf1095f815',
-          width: 300,
-          height: 250,
-          cpm: 0.51,
-          creative: '<script type="text/javascript" src="https://creative.com/pathToNiceCreative"></script>',
-          ttl: 360,
-          currency: 'USD',
-          netRevenue: true,
-          creativeId: 'd30b58c2ba'
-        }
-      ]
-    }
-  };
-
-  it('Verifies komoonaAdapter bidder code', function () {
-    expect(spec.code).to.equal('komoona');
-  });
-
-  it('Verifies komoonaAdapter bid request validation', function () {
-    expect(spec.isBidRequestValid(bidsRequest[0])).to.equal(true);
-    expect(spec.isBidRequestValid(bidsRequest[1])).to.equal(true);
-    expect(spec.isBidRequestValid({})).to.equal(false);
-    expect(spec.isBidRequestValid({ params: {} })).to.equal(false);
-    expect(spec.isBidRequestValid({ params: { hbid: 12345 } })).to.equal(false);
-    expect(spec.isBidRequestValid({ params: { placementid: 12345 } })).to.equal(false);
-    expect(spec.isBidRequestValid({ params: { hbid: 12345, placementId: 67890 } })).to.equal(true);
-    expect(spec.isBidRequestValid({ params: { hbid: 12345, placementId: 67890, floorPrice: 0.8 } })).to.equal(true);
-  });
-
-  it('Verify komoonaAdapter build request', function () {
-    var startTime = new Date().getTime();
-
-    const request = spec.buildRequests(bidsRequest);
-    expect(request.url).to.equal('https://bidder.komoona.com/v1/GetSBids');
-    expect(request.method).to.equal('POST');
-    const requestData = JSON.parse(request.data);
-
-    // bids object
-    let bids = requestData.bids;
-    expect(bids).to.have.lengthOf(2);
-
-    // first bid request: no floor price
-    expect(bids[0].uuid).to.equal('2faedf1095f815');
-    expect(bids[0].floorprice).to.be.undefined;
-    expect(bids[0].placementid).to.equal('170577');
-    expect(bids[0].hbid).to.equal('abc12345678');
-    expect(bids[0].trid).to.equal('9f801c02-bbe8-4683-8ed4-bc816ea186bb');
-    expect(bids[0].sizes).to.have.lengthOf(1);
-    expect(bids[0].sizes[0][0]).to.equal(300);
-    expect(bids[0].sizes[0][1]).to.equal(250);
-
-    // second bid request: with floor price
-    expect(bids[1].uuid).to.equal('3c34e2367a3f59');
-    expect(bids[1].floorprice).to.equal(0.5);
-    expect(bids[1].placementid).to.equal('281277');
-    expect(bids[1].hbid).to.equal('abc12345678');
-    expect(bids[1].trid).to.equal('9f801c02-bbe8-4683-8ed4-bc816ea186bb');
-    expect(bids[1]).to.have.property('sizes')
-      .that.is.an('array')
-      .of.length(1)
-      .that.deep.equals([[728, 90]]);
-
-    // kbConf object
-    let kbConf = requestData.kbConf;
-    expect(kbConf.hdbdid).to.equal(bids[0].hbid);
-    expect(kbConf.hdbdid).to.equal(bids[1].hbid);
-    expect(kbConf.encode_bid).to.be.undefined;
-    // kbConf timezone and cb
-    expect(kbConf.cb).not.to.be.undefined;
-    expect(kbConf.ts_as).to.be.above(startTime - 1);
-    expect(kbConf.tz).to.equal(new Date().getTimezoneOffset());
-    // kbConf bid ids
-    expect(kbConf.hb_placement_bidids)
-      .to.have.property(bids[0].placementid)
-      .that.equal(bids[0].uuid);
-    expect(kbConf.hb_placement_bidids)
-      .to.have.property(bids[1].placementid)
-      .that.equal(bids[1].uuid);
-    // kbConf floor price
-    expect(kbConf.hb_floors).not.to.have.property(bids[0].placementid)
-    expect(kbConf.hb_floors).to.have.property(bids[1].placementid).that.equal(bids[1].floorprice);
-    // kbConf placement ids
-    expect(kbConf.hb_placements).to.have.lengthOf(2);
-    expect(kbConf.hb_placements[0]).to.equal(bids[0].placementid);
-    expect(kbConf.hb_placements[1]).to.equal(bids[1].placementid);
-  });
-
-  it('Verify komoonaAdapter build response', function () {
-    const request = spec.buildRequests(bidsRequest);
-    const bids = spec.interpretResponse(bidsResponse, request);
-
-    // 'server' return single bid
-    expect(bids).to.have.lengthOf(1);
-
-    // verify bid object
-    const bid = bids[0];
-    const responseBids = bidsResponse.body.bids;
-
-    expect(bid.cpm).to.equal(responseBids[0].cpm);
-    expect(bid.ad).to.equal(responseBids[0].creative);
-    expect(bid.requestId).equal(responseBids[0].uuid);
-    expect(bid.uuid).equal(responseBids[0].uuid);
-    expect(bid.width).to.equal(responseBids[0].width);
-    expect(bid.height).to.equal(responseBids[0].height);
-    expect(bid.ttl).to.equal(responseBids[0].ttl);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.creativeId).to.equal(responseBids[0].creativeId);
-  });
-
-  it('Verifies komoonaAdapter sync options', function () {
-    // user sync disabled
-    expect(spec.getUserSyncs({})).to.be.undefined;
-    expect(spec.getUserSyncs({ iframeEnabled: false })).to.be.undefined;
-    // user sync enabled
-    const options = spec.getUserSyncs({ iframeEnabled: true });
-    expect(options).to.not.be.undefined;
-    expect(options).to.have.lengthOf(1);
-    expect(options[0].type).to.equal('iframe');
-    expect(options[0].url).to.equal('https://s.komoona.com/sync/usync.html');
-  });
-});
diff --git a/test/spec/modules/konduitAnalyticsAdapter_spec.js b/test/spec/modules/konduitAnalyticsAdapter_spec.js
index ac557d27f90..e79ae2feeeb 100644
--- a/test/spec/modules/konduitAnalyticsAdapter_spec.js
+++ b/test/spec/modules/konduitAnalyticsAdapter_spec.js
@@ -121,6 +121,5 @@ describe(`Konduit Analytics Adapter`, () => {
     expect(requestBody.konduitId).to.be.equal(konduitId);
     expect(requestBody.prebidVersion).to.be.equal('$prebid.version$');
     expect(requestBody.environment).to.be.an('object');
-    sinon.assert.callCount(konduitAnalyticsAdapter.track, 6);
   });
 });
diff --git a/test/spec/modules/konduitWrapper_spec.js b/test/spec/modules/konduitWrapper_spec.js
index c88287c7066..506d2189049 100644
--- a/test/spec/modules/konduitWrapper_spec.js
+++ b/test/spec/modules/konduitWrapper_spec.js
@@ -53,7 +53,6 @@ describe('The Konduit vast wrapper module', function () {
       const callback = sinon.spy();
       processBids({ bid, callback });
       server.respond();
-
       expect(server.requests.length).to.equal(1);
 
       const requestBody = JSON.parse(server.requests[0].requestBody);
diff --git a/test/spec/modules/krushmediaBidAdapter_spec.js b/test/spec/modules/krushmediaBidAdapter_spec.js
new file mode 100644
index 00000000000..fcdcc942290
--- /dev/null
+++ b/test/spec/modules/krushmediaBidAdapter_spec.js
@@ -0,0 +1,334 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/krushmediaBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('KrushmediabBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'krushmedia',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      key: 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.key;
+      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://ads4.krushmedia.com/?c=rtb&m=hb');
+    });
+    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('key', 'bidId', 'traffic', 'sizes', 'schain', 'bidFloor');
+      expect(placement.key).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');
+    });
+
+    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('key', 'bidId', 'traffic', '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('key', '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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('iframe')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/html?src=pbjs&gdpr=1&gdpr_consent=ALL')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1NNN'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('iframe')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.krushmedia.com/html?src=pbjs&ccpa_consent=1NNN')
+    });
+  });
+});
diff --git a/test/spec/modules/kubientBidAdapter_spec.js b/test/spec/modules/kubientBidAdapter_spec.js
new file mode 100644
index 00000000000..a6241aa8d41
--- /dev/null
+++ b/test/spec/modules/kubientBidAdapter_spec.js
@@ -0,0 +1,495 @@
+import { expect, assert } from 'chai';
+import { spec } from 'modules/kubientBidAdapter.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import {config} from '../../../src/config';
+
+function encodeQueryData(data) {
+  return Object.keys(data).map(function(key) {
+    return [key, data[key]].map(encodeURIComponent).join('=');
+  }).join('&');
+}
+
+describe('KubientAdapter', function () {
+  let bidBanner = {
+    bidId: '2dd581a2b6281d',
+    bidder: 'kubient',
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      zoneid: '5678'
+    },
+    getFloor: function(params) {
+      return {
+        floor: 0,
+        currency: 'USD'
+      };
+    },
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+    schain: {
+      ver: '1.1',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '0',
+          hp: 1,
+          rid: 'bidrequestid',
+          domain: 'example.com'
+        }
+      ]
+    }
+  };
+  let bidVideo = {
+    bidId: '1dd581a2b6281d',
+    bidder: 'kubient',
+    bidderRequestId: '245e1d6a7837c9',
+    params: {
+      zoneid: '5676'
+    },
+    getFloor: function(params) {
+      return {
+        floor: 1.0,
+        currency: 'USD'
+      };
+    },
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d1',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [1]
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e61',
+    schain: {
+      ver: '1.1',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '0',
+          hp: 1,
+          rid: 'bidrequestid',
+          domain: 'example.com'
+        }
+      ]
+    }
+  };
+  let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+  let uspConsentData = '1YCC';
+  let bidderRequest = {
+    bidderCode: 'kubient',
+    auctionId: 'fffffff-ffff-ffff-ffff-ffffffffffff',
+    bidderRequestId: 'ffffffffffffff',
+    start: 1472239426002,
+    auctionStart: 1472239426000,
+    timeout: 5000,
+    refererInfo: {
+      page: 'http://www.example.com',
+      reachedTop: true,
+    },
+    gdprConsent: {
+      consentString: consentString,
+      gdprApplies: true
+    },
+    uspConsent: uspConsentData
+  };
+  describe('buildRequestBanner', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('Creates Banner 1 ServerRequest object with method, URL and data', function () {
+      config.setConfig({'coppa': false});
+      let serverRequests = spec.buildRequests([bidBanner], Object.assign({}, bidderRequest, {bids: [bidBanner]}));
+      expect(serverRequests).to.be.an('array');
+      for (let i = 0; i < serverRequests.length; i++) {
+        let serverRequest = serverRequests[i];
+        expect(serverRequest.method).to.be.a('string');
+        expect(serverRequest.url).to.be.a('string');
+        expect(serverRequest.data).to.be.a('string');
+        expect(serverRequest.method).to.equal('POST');
+        expect(serverRequest.url).to.equal('https://kssp.kbntx.ch/kubprebidjs');
+        let data = JSON.parse(serverRequest.data);
+        expect(data).to.be.an('object');
+        expect(data).to.have.all.keys('v', 'requestId', 'adSlots', 'gdpr', 'referer', 'tmax', 'consent', 'consentGiven', 'uspConsent');
+        expect(data.v).to.exist.and.to.be.a('string');
+        expect(data.requestId).to.exist.and.to.be.a('string');
+        expect(data.referer).to.be.a('string');
+        expect(data.tmax).to.exist.and.to.be.a('number');
+        expect(data.gdpr).to.exist.and.to.be.within(0, 1);
+        expect(data.consent).to.equal(consentString);
+        expect(data.uspConsent).to.exist.and.to.equal(uspConsentData);
+        for (let j = 0; j < data['adSlots'].length; j++) {
+          let adSlot = data['adSlots'][i];
+          expect(adSlot).to.have.all.keys('bidId', 'zoneId', 'banner', 'schain');
+          expect(adSlot.bidId).to.be.a('string').and.to.equal(bidBanner.bidId);
+          expect(adSlot.zoneId).to.be.a('string').and.to.equal(bidBanner.params.zoneid);
+          expect(adSlot.schain).to.be.an('object');
+          expect(adSlot.banner).to.be.an('object');
+        }
+      }
+    });
+  });
+  describe('buildRequestVideo', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('Creates Video 1 ServerRequest object with method, URL and data', function () {
+      config.setConfig({'coppa': false});
+      let serverRequests = spec.buildRequests([bidVideo], Object.assign({}, bidderRequest, {bids: [bidVideo]}));
+      expect(serverRequests).to.be.an('array');
+      for (let i = 0; i < serverRequests.length; i++) {
+        let serverRequest = serverRequests[i];
+        expect(serverRequest.method).to.be.a('string');
+        expect(serverRequest.url).to.be.a('string');
+        expect(serverRequest.data).to.be.a('string');
+        expect(serverRequest.method).to.equal('POST');
+        expect(serverRequest.url).to.equal('https://kssp.kbntx.ch/kubprebidjs');
+        let data = JSON.parse(serverRequest.data);
+        expect(data).to.be.an('object');
+        expect(data).to.have.all.keys('v', 'requestId', 'adSlots', 'gdpr', 'referer', 'tmax', 'consent', 'consentGiven', 'uspConsent');
+        expect(data.v).to.exist.and.to.be.a('string');
+        expect(data.requestId).to.exist.and.to.be.a('string');
+        expect(data.referer).to.be.a('string');
+        expect(data.tmax).to.exist.and.to.be.a('number');
+        expect(data.gdpr).to.exist.and.to.be.within(0, 1);
+        expect(data.consent).to.equal(consentString);
+        expect(data.uspConsent).to.exist.and.to.equal(uspConsentData);
+        for (let j = 0; j < data['adSlots'].length; j++) {
+          let adSlot = data['adSlots'][i];
+          expect(adSlot).to.have.all.keys('bidId', 'zoneId', 'floor', 'video', 'schain');
+          expect(adSlot.bidId).to.be.a('string').and.to.equal(bidVideo.bidId);
+          expect(adSlot.zoneId).to.be.a('string').and.to.equal(bidVideo.params.zoneid);
+          expect(adSlot.floor).to.be.a('number');
+          expect(adSlot.schain).to.be.an('object');
+          expect(adSlot.video).to.be.an('object');
+        }
+      }
+    });
+  });
+  describe('buildRequestBanner', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('Creates Banner 2 ServerRequest object with method, URL and data with bidBanner', function () {
+      config.setConfig({'coppa': true});
+      let serverRequests = spec.buildRequests([bidBanner], Object.assign({}, bidderRequest, {bids: [bidBanner]}));
+      expect(serverRequests).to.be.an('array');
+      for (let i = 0; i < serverRequests.length; i++) {
+        let serverRequest = serverRequests[i];
+        expect(serverRequest.method).to.be.a('string');
+        expect(serverRequest.url).to.be.a('string');
+        expect(serverRequest.data).to.be.a('string');
+        expect(serverRequest.method).to.equal('POST');
+        expect(serverRequest.url).to.equal('https://kssp.kbntx.ch/kubprebidjs');
+        let data = JSON.parse(serverRequest.data);
+        expect(data).to.be.an('object');
+        expect(data).to.have.all.keys('v', 'requestId', 'adSlots', 'gdpr', 'coppa', 'referer', 'tmax', 'consent', 'consentGiven', 'uspConsent');
+        expect(data.v).to.exist.and.to.be.a('string');
+        expect(data.requestId).to.exist.and.to.be.a('string');
+        expect(data.coppa).to.be.a('number').and.to.equal(1);
+        expect(data.referer).to.be.a('string');
+        expect(data.tmax).to.exist.and.to.be.a('number');
+        expect(data.gdpr).to.exist.and.to.be.within(0, 1);
+        expect(data.consent).to.equal(consentString);
+        expect(data.uspConsent).to.exist.and.to.equal(uspConsentData);
+        for (let j = 0; j < data['adSlots'].length; j++) {
+          let adSlot = data['adSlots'][i];
+          expect(adSlot).to.have.all.keys('bidId', 'zoneId', 'banner', 'schain');
+          expect(adSlot.bidId).to.be.a('string').and.to.equal(bidBanner.bidId);
+          expect(adSlot.zoneId).to.be.a('string').and.to.equal(bidBanner.params.zoneid);
+          expect(adSlot.schain).to.be.an('object');
+          expect(adSlot.banner).to.be.an('object');
+        }
+      }
+    });
+  });
+  describe('buildRequestVideo', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('Creates Video 2 ServerRequest object with method, URL and data', function () {
+      config.setConfig({'coppa': true});
+      let serverRequests = spec.buildRequests([bidVideo], Object.assign({}, bidderRequest, {bids: [bidVideo]}));
+      expect(serverRequests).to.be.an('array');
+      for (let i = 0; i < serverRequests.length; i++) {
+        let serverRequest = serverRequests[i];
+        expect(serverRequest.method).to.be.a('string');
+        expect(serverRequest.url).to.be.a('string');
+        expect(serverRequest.data).to.be.a('string');
+        expect(serverRequest.method).to.equal('POST');
+        expect(serverRequest.url).to.equal('https://kssp.kbntx.ch/kubprebidjs');
+        let data = JSON.parse(serverRequest.data);
+        expect(data).to.be.an('object');
+        expect(data).to.have.all.keys('v', 'requestId', 'adSlots', 'gdpr', 'coppa', 'referer', 'tmax', 'consent', 'consentGiven', 'uspConsent');
+        expect(data.v).to.exist.and.to.be.a('string');
+        expect(data.requestId).to.exist.and.to.be.a('string');
+        expect(data.coppa).to.be.a('number').and.to.equal(1);
+        expect(data.referer).to.be.a('string');
+        expect(data.tmax).to.exist.and.to.be.a('number');
+        expect(data.gdpr).to.exist.and.to.be.within(0, 1);
+        expect(data.consent).to.equal(consentString);
+        expect(data.uspConsent).to.exist.and.to.equal(uspConsentData);
+        for (let j = 0; j < data['adSlots'].length; j++) {
+          let adSlot = data['adSlots'][i];
+          expect(adSlot).to.have.all.keys('bidId', 'zoneId', 'floor', 'video', 'schain');
+          expect(adSlot.bidId).to.be.a('string').and.to.equal(bidVideo.bidId);
+          expect(adSlot.zoneId).to.be.a('string').and.to.equal(bidVideo.params.zoneid);
+          expect(adSlot.floor).to.be.a('number');
+          expect(adSlot.schain).to.be.an('object');
+          expect(adSlot.video).to.be.an('object');
+        }
+      }
+    });
+  });
+  describe('isBidRequestValid', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('Should return true when required params are found', function () {
+      expect(spec.isBidRequestValid(bidBanner)).to.be.true;
+      expect(spec.isBidRequestValid(bidVideo)).to.be.true;
+    });
+    it('Should return false when required params are not found', function () {
+      expect(spec.isBidRequestValid(bidBanner)).to.be.true;
+      expect(spec.isBidRequestValid(bidVideo)).to.be.true;
+    });
+    it('Should return false when params are not found', function () {
+      delete bidBanner.params;
+      expect(spec.isBidRequestValid(bidBanner)).to.be.false;
+      delete bidVideo.params;
+      expect(spec.isBidRequestValid(bidVideo)).to.be.false;
+    });
+  });
+  describe('interpretResponse', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('Should interpret response', function () {
+      const serverResponse = {
+        body:
+          {
+            seatbid: [
+              {
+                bid: [
+                  {
+                    bidId: '000',
+                    price: 1.5,
+                    adm: '<div>test</div>',
+                    creativeId: 'creativeId',
+                    w: 300,
+                    h: 250,
+                    cur: 'USD',
+                    netRevenue: false,
+                    ttl: 360,
+                    meta: {adomain: ['google.com', 'yahoo.com']}
+                  }
+                ]
+              }
+            ]
+          }
+      };
+      let bannerResponses = spec.interpretResponse(serverResponse);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'ad', 'creativeId', 'width', 'height', 'currency', 'netRevenue', 'ttl', 'meta');
+      expect(dataItem.requestId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].bidId);
+      expect(dataItem.cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
+      expect(dataItem.ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+      expect(dataItem.creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].creativeId);
+      expect(dataItem.width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
+      expect(dataItem.height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
+      expect(dataItem.currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].cur);
+      expect(dataItem.netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(serverResponse.body.seatbid[0].bid[0].netRevenue);
+      expect(dataItem.ttl).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].ttl);
+      expect(dataItem.meta).to.exist.and.to.be.a('object');
+      expect(dataItem.meta.advertiserDomains).to.exist.and.to.be.a('array').and.to.equal(serverResponse.body.seatbid[0].bid[0].meta.adomain);
+    });
+    it('Should return no ad when not given a server response', function () {
+      const ads = spec.interpretResponse(null);
+      expect(ads).to.be.an('array').and.to.have.length(0);
+    });
+  });
+
+  describe('interpretResponse Video', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('Should interpret response', function () {
+      const serverResponse = {
+        body:
+          {
+            seatbid: [
+              {
+                bid: [
+                  {
+                    bidId: '000',
+                    price: 1.5,
+                    adm: '<div>test</div>',
+                    creativeId: 'creativeId',
+                    w: 300,
+                    h: 250,
+                    mediaType: VIDEO,
+                    cur: 'USD',
+                    netRevenue: false,
+                    ttl: 360,
+                    meta: {adomain: ['google.com', 'yahoo.com']}
+                  }
+                ]
+              }
+            ]
+          }
+      };
+      let bannerResponses = spec.interpretResponse(serverResponse);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'ad', 'creativeId', 'width', 'height', 'currency', 'netRevenue', 'ttl', 'meta', 'mediaType', 'vastXml');
+      expect(dataItem.requestId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].bidId);
+      expect(dataItem.cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
+      expect(dataItem.ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+      expect(dataItem.creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].creativeId);
+      expect(dataItem.width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
+      expect(dataItem.height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
+      expect(dataItem.currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].cur);
+      expect(dataItem.netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(serverResponse.body.seatbid[0].bid[0].netRevenue);
+      expect(dataItem.ttl).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].ttl);
+      expect(dataItem.meta).to.exist.and.to.be.a('object');
+      expect(dataItem.meta.advertiserDomains).to.exist.and.to.be.a('array').and.to.equal(serverResponse.body.seatbid[0].bid[0].meta.adomain);
+      expect(dataItem.mediaType).to.exist.and.to.equal(VIDEO);
+      expect(dataItem.vastXml).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+    });
+    it('Should return no ad when not given a server response', function () {
+      const ads = spec.interpretResponse(null);
+      expect(ads).to.be.an('array').and.to.have.length(0);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
+    it('should register the sync image without gdpr', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let values = {};
+      let serverResponses = null;
+      let gdprConsent = {
+        consentString: consentString
+      };
+      let uspConsent = null;
+      config.setConfig({
+        userSync: {
+          filterSettings: {
+            image: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      values['consent'] = consentString;
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://matching.kubient.net/match/sp?' + encodeQueryData(values));
+    });
+    it('should register the sync image with gdpr', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let values = {};
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString
+      };
+      let uspConsent = null;
+      config.setConfig({
+        userSync: {
+          filterSettings: {
+            image: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      values['gdpr'] = 1;
+      values['consent'] = consentString;
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://matching.kubient.net/match/sp?' + encodeQueryData(values));
+    });
+    it('should register the sync image with gdpr vendor', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let values = {};
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString,
+        apiVersion: 2,
+        vendorData: {
+          vendor: {
+            consents: {
+              794: 1
+            }
+          }
+        }
+      };
+      let uspConsent = null;
+      config.setConfig({
+        userSync: {
+          filterSettings: {
+            image: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      values['gdpr'] = 1;
+      values['consent'] = consentString;
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://matching.kubient.net/match/sp?' + encodeQueryData(values));
+    });
+    it('should register the sync image without gdpr and with uspConsent', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let values = {};
+      let serverResponses = null;
+      let gdprConsent = {
+        consentString: consentString
+      };
+      let uspConsent = '1YNN';
+      config.setConfig({
+        userSync: {
+          filterSettings: {
+            image: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      values['consent'] = consentString;
+      values['usp'] = uspConsent;
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://matching.kubient.net/match/sp?' + encodeQueryData(values));
+    });
+  })
+});
diff --git a/test/spec/modules/kueezBidAdapter_spec.js b/test/spec/modules/kueezBidAdapter_spec.js
new file mode 100644
index 00000000000..cd95a9ebdc6
--- /dev/null
+++ b/test/spec/modules/kueezBidAdapter_spec.js
@@ -0,0 +1,482 @@
+import { expect } from 'chai';
+import { spec } from 'modules/kueezBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT = 'https://hb.kueezssp.com/hb-kz-multi';
+const TEST_ENDPOINT = 'https://hb.kueezssp.com/hb-multi-kz-test';
+const TTL = 360;
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
+
+describe('kueezBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      'bidder': spec.code,
+      'adUnitCode': 'adunit-code',
+      'sizes': [['640', '480']],
+      'params': {
+        'org': 'test-publisher-id'
+      }
+    };
+
+    it('should return true when required params are passed', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'org': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'test-publisher-id'
+        },
+        'bidId': '5wfg9887sd5478',
+        'loop': 1,
+        'bidderRequestId': 'op87952ewq8567',
+        'auctionId': '87se98rt-5789-8735-2546-t98yh5678231',
+        'mediaTypes': {
+          'video': {
+            'playerSize': [[640, 480]],
+            'context': 'instream'
+          }
+        },
+        'vastXml': '"<VAST version=\\\"2.0\\\">...</VAST>"'
+      },
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'params': {
+          'org': 'test-publisher-id'
+        },
+        'bidId': '5wfg9887sd5478',
+        'loop': 1,
+        'bidderRequestId': 'op87952ewq8567',
+        'auctionId': '87se98rt-5789-8735-2546-t98yh5678231',
+        'mediaTypes': {
+          'banner': {
+          }
+        },
+        'ad': '"<img src=\"https://...\"/>"'
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'test-publisher-id',
+          'testMode': true
+        },
+        'bidId': '5wfg9887sd5478',
+        'loop': 2,
+        'bidderRequestId': 'op87952ewq8567',
+        'auctionId': '87se98rt-5789-8735-2546-t98yh5678231',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'kueez',
+    }
+    const placementId = '12345678';
+
+    it('sends the placementId to ENDPOINT via POST', function () {
+      bidRequests[0].params.placementId = placementId;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].placementId).to.equal(placementId);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to TEST ENDPOINT via POST', function () {
+      const request = spec.buildRequests(testModeBidRequests, bidderRequest);
+      expect(request.url).to.equal(TEST_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the correct bid Id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].bidId).to.equal('5wfg9887sd5478');
+    });
+
+    it('should send the correct sizes array', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sizes).to.be.an('array');
+      expect(request.data.bids[0].sizes).to.equal(bidRequests[0].sizes)
+      expect(request.data.bids[1].sizes).to.be.an('array');
+      expect(request.data.bids[1].sizes).to.equal(bidRequests[1].sizes)
+    });
+
+    it('should send the correct media type', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].mediaType).to.equal(VIDEO)
+      expect(request.data.bids[1].mediaType).to.equal(BANNER)
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should respect "iframe" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            iframe: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should respect "all" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            all: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should send the pixel user sync param if userSync is enabled and no "iframe" or "all" configs are present', function () {
+      config.resetConfig();
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'pixel');
+    });
+
+    it('should respect total exclusion', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            image: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            },
+            iframe: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should have us_privacy param if usPrivacy is available in the bidRequest', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('us_privacy', '1YNN');
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('us_privacy');
+    });
+
+    it('should not send the gdpr param if gdprApplies is false in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: false}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gdpr');
+      expect(request.data.params).to.not.have.property('gdpr_consent');
+    });
+
+    it('should send the gdpr param if gdprApplies is true in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: true, consentString: 'test-consent-string'}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gdpr', true);
+      expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
+    });
+
+    it('should have schain param if it is available in the bidRequest', () => {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
+      };
+      bidRequests[0].schain = schain;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('schain', '1.0,1!indirectseller.com,00001,1,,,');
+    });
+
+    it('should set flooPrice to getFloor.floor value if it is greater than params.floorPrice', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.32
+        }
+      }
+      bid.params.floorPrice = 0.64;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 3.32);
+    });
+
+    it('should set floorPrice to params.floorPrice value if it is greater than getFloor.floor', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 0.8
+        }
+      }
+      bid.params.floorPrice = 1.5;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 1.5);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      params: {
+        currency: 'USD',
+        netRevenue: true,
+      },
+      bids: [{
+        cpm: 12.5,
+        vastXml: '<VAST version="3.0"></VAST>',
+        width: 640,
+        height: 480,
+        requestId: '21e12606d47ba7',
+        adomain: ['abc.com'],
+        mediaType: VIDEO
+      },
+      {
+        cpm: 12.5,
+        ad: '"<img src=\"https://...\"/>"',
+        width: 300,
+        height: 250,
+        requestId: '21e12606d47ba7',
+        adomain: ['abc.com'],
+        mediaType: BANNER
+      }]
+    };
+
+    const expectedVideoResponse = {
+      cpm: 12.5,
+      creativeId: '21e12606d47ba7',
+      currency: 'USD',
+      height: 480,
+      mediaType: VIDEO,
+      meta: {
+        mediaType: VIDEO,
+        advertiserDomains: ['abc.com']
+      },
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      requestId: '21e12606d47ba7',
+      ttl: TTL,
+      width: 640,
+      vastXml: '<VAST version="3.0"></VAST>'
+    };
+
+    const expectedBannerResponse = {
+      cpm: 12.5,
+      creativeId: '21e12606d47ba7',
+      currency: 'USD',
+      height: 480,
+      mediaType: BANNER,
+      meta: {
+        mediaType: BANNER,
+        advertiserDomains: ['abc.com']
+      },
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      requestId: '21e12606d47ba7',
+      ttl: TTL,
+      width: 640,
+      ad: '"<img src=\"https://...\"/>"'
+    };
+
+    it('should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedVideoResponse));
+      expect(Object.keys(result[1])).to.deep.equal(Object.keys(expectedBannerResponse));
+    });
+
+    it('video type should have vastXml key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[0].vastXml).to.equal(expectedVideoResponse.vastXml)
+    });
+
+    it('banner type should have ad key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[1].ad).to.equal(expectedBannerResponse.ad)
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        params: {
+          userSyncPixels: [
+            'https://image-sync-url.test/1',
+            'https://image-sync-url.test/2',
+            'https://image-sync-url.test/3'
+          ]
+        }
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        params: {
+          userSyncURL: 'https://iframe-sync-url.test'
+        }
+      }
+    };
+
+    it('should register all img urls from the response', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should register the iframe url from the response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [iframeSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        }
+      ]);
+    });
+
+    it('should register both image and iframe urls from the responses', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, [iframeSyncResponse, imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should handle an empty response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should handle when user syncs are disabled', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: false }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([]);
+    });
+  })
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should trigger pixel if bid nurl', function() {
+      const bid = {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [['640', '480']],
+        'nurl': 'http://example.com/win/1234',
+        'params': {
+          'org': 'test-publisher-id'
+        }
+      };
+
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    })
+  })
+});
diff --git a/test/spec/modules/kueezRtbBidAdapter_spec.js b/test/spec/modules/kueezRtbBidAdapter_spec.js
new file mode 100644
index 00000000000..30b2a46cefb
--- /dev/null
+++ b/test/spec/modules/kueezRtbBidAdapter_spec.js
@@ -0,0 +1,519 @@
+import { expect } from 'chai';
+import {
+  spec as adapter,
+  SUPPORTED_ID_SYSTEMS,
+  createDomain,
+  hashCode,
+  extractPID,
+  extractCID,
+  extractSubDomain,
+  getStorageItem,
+  setStorageItem,
+  tryParseJSON,
+  getUniqueDealId,
+} from 'modules/kueezRtbBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { version } from 'package.json';
+import { useFakeTimers } from 'sinon';
+import { BANNER, VIDEO } from '../../../src/mediaTypes';
+
+const SUB_DOMAIN = 'exchange';
+
+const BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': 'div-gpt-ad-12345-0',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '59db6b3b4ffaa70004f45cdc',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1,
+    'ext': {
+      'param1': 'loremipsum',
+      'param2': 'dolorsitamet'
+    }
+  },
+  'placementCode': 'div-gpt-ad-1460505748561-0',
+  'transactionId': 'c881914b-a3b5-4ecf-ad9c-1c2f37c6aabf',
+  'sizes': [[300, 250], [300, 600]],
+  'bidderRequestId': '1fdb5ff1b6eaa7',
+  'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'mediaTypes': [BANNER]
+};
+
+const VIDEO_BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': '63550ad1ff6642d368cba59dh5884270560',
+  'bidderRequestId': '12a8ae9ada9c13',
+  'transactionId': '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '635509f7ff6642d368cb9837',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1
+  },
+  'sizes': [[545, 307]],
+  'mediaTypes': {
+    'video': {
+      'playerSize': [[545, 307]],
+      'context': 'instream',
+      'mimes': [
+        'video/mp4',
+        'application/javascript'
+      ],
+      'protocols': [2, 3, 5, 6],
+      'maxduration': 60,
+      'minduration': 0,
+      'startdelay': 0,
+      'linearity': 1,
+      'api': [2],
+      'placement': 1
+    }
+  }
+}
+
+const BIDDER_REQUEST = {
+  'gdprConsent': {
+    'consentString': 'consent_string',
+    'gdprApplies': true
+  },
+  'uspConsent': 'consent_string',
+  'refererInfo': {
+    'page': 'https://www.greatsite.com',
+    'ref': 'https://www.somereferrer.com'
+  }
+};
+
+const SERVER_RESPONSE = {
+  body: {
+    cid: 'testcid123',
+    results: [{
+      'ad': '<iframe>console.log("hello world")</iframe>',
+      'price': 0.8,
+      'creativeId': '12610997325162499419',
+      'exp': 30,
+      'width': 300,
+      'height': 250,
+      'advertiserDomains': ['securepubads.g.doubleclick.net'],
+      'cookies': [{
+        'src': 'https://sync.com',
+        'type': 'iframe'
+      }, {
+        'src': 'https://sync.com',
+        'type': 'img'
+      }]
+    }]
+  }
+};
+
+const VIDEO_SERVER_RESPONSE = {
+  body: {
+    'cid': '635509f7ff6642d368cb9837',
+    'results': [{
+      'ad': '<VAST version=\"3.0\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"></VAST>',
+      'advertiserDomains': ['kueezrtb.com'],
+      'exp': 60,
+      'width': 545,
+      'height': 307,
+      'mediaType': 'video',
+      'creativeId': '12610997325162499419',
+      'price': 2,
+      'cookies': []
+    }]
+  }
+};
+
+const REQUEST = {
+  data: {
+    width: 300,
+    height: 250,
+    bidId: '2d52001cabd527'
+  }
+};
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = utils.parseUrl(window.top.document.URL, { decodeSearchAsString: true });
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
+describe('KueezRtbBidAdapter', function () {
+  describe('validtae spec', function () {
+    it('exists and is a function', function () {
+      expect(adapter.isBidRequestValid).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.buildRequests).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.interpretResponse).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.getUserSyncs).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a string', function () {
+      expect(adapter.code).to.exist.and.to.be.a('string');
+    });
+
+    it('exists and contains media types', function () {
+      expect(adapter.supportedMediaTypes).to.exist.and.to.be.an('array').with.length(2);
+      expect(adapter.supportedMediaTypes).to.contain.members([BANNER, VIDEO]);
+    });
+  });
+
+  describe('validate bid requests', function () {
+    it('should require cId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should require pId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should validate correctly', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid',
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.true;
+    });
+  });
+
+  describe('build requests', function () {
+    let sandbox;
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kueezrtb: {
+          storageAllowed: true
+        }
+      };
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(Date, 'now').returns(1000);
+    });
+
+    it('should build video request', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      const requests = adapter.buildRequests([VIDEO_BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/635509f7ff6642d368cb9837`,
+        data: {
+          adUnitCode: '63550ad1ff6642d368cba59dh5884270560',
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          bidderVersion: adapter.version,
+          cb: 1000,
+          gdpr: 1,
+          gdprConsent: 'consent_string',
+          usPrivacy: 'consent_string',
+          prebidVersion: version,
+          publisherId: '59ac17c192832d0011283fe3',
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          schain: VIDEO_BID.schain,
+          sizes: ['545x307'],
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          uqs: getTopWindowQueryParams(),
+          mediaTypes: {
+            video: {
+              api: [2],
+              context: 'instream',
+              linearity: 1,
+              maxduration: 60,
+              mimes: [
+                'video/mp4',
+                'application/javascript'
+              ],
+              minduration: 0,
+              placement: 1,
+              playerSize: [[545, 307]],
+              protocols: [2, 3, 5, 6],
+              startdelay: 0
+            }
+          }
+        }
+      });
+    });
+
+    it('should build banner request for each size', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/59db6b3b4ffaa70004f45cdc`,
+        data: {
+          gdprConsent: 'consent_string',
+          gdpr: 1,
+          usPrivacy: 'consent_string',
+          sizes: ['300x250', '300x600'],
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          cb: 1000,
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          adUnitCode: 'div-gpt-ad-12345-0',
+          publisherId: '59ac17c192832d0011283fe3',
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          bidderVersion: adapter.version,
+          prebidVersion: version,
+          schain: BID.schain,
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          mediaTypes: [BANNER],
+          uqs: getTopWindowQueryParams(),
+          'ext.param1': 'loremipsum',
+          'ext.param2': 'dolorsitamet',
+        }
+      });
+    });
+
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      sandbox.restore();
+    });
+  });
+  describe('getUserSyncs', function () {
+    it('should have valid user sync with iframeEnabled', function () {
+      const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.kueezrtb.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with cid on response', function () {
+      const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.kueezrtb.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with pixelEnabled', function () {
+      const result = adapter.getUserSyncs({ pixelEnabled: true }, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        'url': 'https://sync.kueezrtb.com/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
+        'type': 'image'
+      }]);
+    })
+  });
+
+  describe('interpret response', function () {
+    it('should return empty array when there is no response', function () {
+      const responses = adapter.interpretResponse(null);
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no ad', function () {
+      const responses = adapter.interpretResponse({ price: 1, ad: '' });
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no price', function () {
+      const responses = adapter.interpretResponse({ price: null, ad: 'great ad' });
+      expect(responses).to.be.empty;
+    });
+
+    it('should return an array of interpreted banner responses', function () {
+      const responses = adapter.interpretResponse(SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 0.8,
+        width: 300,
+        height: 250,
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 30,
+        ad: '<iframe>console.log("hello world")</iframe>',
+        meta: {
+          advertiserDomains: ['securepubads.g.doubleclick.net']
+        }
+      });
+    });
+
+    it('should return an array of interpreted video responses', function () {
+      const responses = adapter.interpretResponse(VIDEO_SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 2,
+        width: 545,
+        height: 307,
+        mediaType: 'video',
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 60,
+        vastXml: '<VAST version=\"3.0\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"></VAST>',
+        meta: {
+          advertiserDomains: ['kueezrtb.com']
+        }
+      });
+    });
+
+    it('should take default TTL', function () {
+      const serverResponse = utils.deepClone(SERVER_RESPONSE);
+      delete serverResponse.body.results[0].exp;
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0].ttl).to.equal(300);
+    });
+  });
+
+  describe('user id system', function () {
+    Object.keys(SUPPORTED_ID_SYSTEMS).forEach((idSystemProvider) => {
+      const id = Date.now().toString();
+      const bid = utils.deepClone(BID);
+
+      const userId = (function () {
+        switch (idSystemProvider) {
+          case 'lipb':
+            return { lipbid: id };
+          case 'parrableId':
+            return { eid: id };
+          case 'id5id':
+            return { uid: id };
+          default:
+            return id;
+        }
+      })();
+
+      bid.userId = {
+        [idSystemProvider]: userId
+      };
+
+      it(`should include 'uid.${idSystemProvider}' in request params`, function () {
+        const requests = adapter.buildRequests([bid], BIDDER_REQUEST);
+        expect(requests[0].data[`uid.${idSystemProvider}`]).to.equal(id);
+      });
+    });
+  });
+
+  describe('alternate param names extractors', function () {
+    it('should return undefined when param not supported', function () {
+      const cid = extractCID({ 'c_id': '1' });
+      const pid = extractPID({ 'p_id': '1' });
+      const subDomain = extractSubDomain({ 'sub_domain': 'prebid' });
+      expect(cid).to.be.undefined;
+      expect(pid).to.be.undefined;
+      expect(subDomain).to.be.undefined;
+    });
+
+    it('should return value when param supported', function () {
+      const cid = extractCID({ 'cID': '1' });
+      const pid = extractPID({ 'Pid': '2' });
+      const subDomain = extractSubDomain({ 'subDOMAIN': 'prebid' });
+      expect(cid).to.be.equal('1');
+      expect(pid).to.be.equal('2');
+      expect(subDomain).to.be.equal('prebid');
+    });
+  });
+
+  describe('unique deal id', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kueezrtb: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    const key = 'myKey';
+    let uniqueDealId;
+    beforeEach(() => {
+      uniqueDealId = getUniqueDealId(key, 0);
+    })
+
+    it('should get current unique deal id', function (done) {
+      // waiting some time so `now` will become past
+      setTimeout(() => {
+        const current = getUniqueDealId(key);
+        expect(current).to.be.equal(uniqueDealId);
+        done();
+      }, 200);
+    });
+
+    it('should get new unique deal id on expiration', function (done) {
+      setTimeout(() => {
+        const current = getUniqueDealId(key, 100);
+        expect(current).to.not.be.equal(uniqueDealId);
+        done();
+      }, 200)
+    });
+  });
+
+  describe('storage utils', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kueezrtb: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    it('should get value from storage with create param', function () {
+      const now = Date.now();
+      const clock = useFakeTimers({
+        shouldAdvanceTime: true,
+        now
+      });
+      setStorageItem('myKey', 2020);
+      const { value, created } = getStorageItem('myKey');
+      expect(created).to.be.equal(now);
+      expect(value).to.be.equal(2020);
+      expect(typeof value).to.be.equal('number');
+      expect(typeof created).to.be.equal('number');
+      clock.restore();
+    });
+
+    it('should get external stored value', function () {
+      const value = 'superman'
+      window.localStorage.setItem('myExternalKey', value);
+      const item = getStorageItem('myExternalKey');
+      expect(item).to.be.equal(value);
+    });
+
+    it('should parse JSON value', function () {
+      const data = JSON.stringify({ event: 'send' });
+      const { event } = tryParseJSON(data);
+      expect(event).to.be.equal('send');
+    });
+
+    it('should get original value on parse fail', function () {
+      const value = 21;
+      const parsed = tryParseJSON(value);
+      expect(typeof parsed).to.be.equal('number');
+      expect(parsed).to.be.equal(value);
+    });
+  });
+});
diff --git a/test/spec/modules/lassoBidAdapter_spec.js b/test/spec/modules/lassoBidAdapter_spec.js
new file mode 100644
index 00000000000..5825927a931
--- /dev/null
+++ b/test/spec/modules/lassoBidAdapter_spec.js
@@ -0,0 +1,177 @@
+import { expect } from 'chai';
+import { spec } from 'modules/lassoBidAdapter.js';
+import { server } from '../../mocks/xhr';
+
+const ENDPOINT_URL = 'https://trc.lhmos.com/prebid';
+
+const bid = {
+  bidder: 'lasso',
+  params: {
+    adUnitId: 123456
+  },
+  auctionStart: Date.now(),
+  adUnitCode: 'adunit-code',
+  auctionId: 'cfa6f46d-4584-46e1-9c00-54769abb51e3',
+  bidderRequestId: 'a123b456c789d',
+  bidId: '123a456b789',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]]
+    }
+  },
+  sizes: [[300, 250]],
+  src: 'client',
+  transactionId: '26740296-0111-4b7a-80df-7196823026f4'
+};
+
+const bidderRequest = {
+  auctionId: 'cfa6f46d-4584-46e1-9c00-54769abb51e3',
+  auctionStart: Date.now(),
+  start: Date.now(),
+  biddeCode: 'lasso',
+  bidderRequestId: 'a123b456c789d',
+  bids: [bid],
+  timeout: 10000
+};
+
+describe('lassoBidAdapter', function () {
+  describe('All needed functions are available', function() {
+    it(`isBidRequestValid is present and type function`, function () {
+      expect(spec.isBidRequestValid).to.exist.and.to.be.a('function')
+    });
+
+    it(`buildRequests is present and type function`, function () {
+      expect(spec.buildRequests).to.exist.and.to.be.a('function')
+    });
+
+    it(`interpretResponse is present and type function`, function () {
+      expect(spec.interpretResponse).to.exist.and.to.be.a('function')
+    });
+
+    it(`onTimeout is present and type function`, function () {
+      expect(spec.onTimeout).to.exist.and.to.be.a('function')
+    });
+
+    it(`onBidWon is present and type function`, function () {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function')
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return true when there are extra params', function () {
+      const bid = Object.assign({}, bid, {
+        params: {
+          adUnitId: 123456,
+          zone: 1,
+          publisher: 'test'
+        }
+      })
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+    it('should return false when there are no params', function () {
+      const invalidBid = { ...bid };
+      delete invalidBid.params;
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const validBidRequests = spec.buildRequests([bid], bidderRequest);
+    expect(validBidRequests).to.be.an('array').that.is.not.empty;
+
+    const bidRequest = validBidRequests[0];
+
+    it('Returns valid bidRequest', function () {
+      expect(bidRequest).to.exist;
+      expect(bidRequest.method).to.exist;
+      expect(bidRequest.url).to.exist;
+      expect(bidRequest.data).to.exist;
+    });
+
+    it('Returns GET method', function() {
+      expect(bidRequest.method).to.exist;
+      expect(bidRequest.method).to.equal('GET');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let serverResponse = {
+      body: {
+        bidid: '123456789',
+        id: '33302780340222111',
+        bid: {
+          price: 1,
+          w: 728,
+          h: 90,
+          crid: 123456,
+          ad: '<script>console.log("ad");</script>',
+          mediaType: 'banner'
+        },
+        meta: {
+          cat: ['1', '2', '3', '4'],
+          advertiserDomains: ['lassomarketing.io'],
+          advertiserName: 'Lasso'
+        },
+        cur: 'USD',
+        netRevenue: false,
+        ttl: 300,
+      }
+    };
+
+    it('should get the correct bid response', function () {
+      let expectedResponse = {
+        requestId: '123456789',
+        cpm: 1,
+        currency: 'USD',
+        width: 728,
+        height: 90,
+        creativeId: 123456,
+        netRevenue: false,
+        ttl: 300,
+        ad: '<script>console.log("ad");</script>',
+        mediaType: 'banner',
+        meta: {
+          secondaryCatIds: ['1', '2', '3', '4'],
+          advertiserDomains: ['lassomarketing.io'],
+          advertiserName: 'Lasso',
+          mediaType: 'banner'
+        }
+      };
+      let result = spec.interpretResponse(serverResponse);
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse));
+    });
+  });
+
+  describe('onTimeout', () => {
+    it('should send timeout', () => {
+      const timeoutData = {
+        bidder: 'lasso',
+        auctionId: 'cfa6f46d-4584-46e1-9c00-54769abb51e3',
+        dUnitCode: 'adunit-code',
+        bidId: '123a456b789',
+        params: {
+          adUnitId: 123456,
+        },
+        timeout: 3000
+      };
+      spec.onTimeout(timeoutData);
+
+      expect(server.requests[0].method).to.equal('POST');
+      expect(server.requests[0].url).to.equal(ENDPOINT_URL + '/timeout');
+      expect(JSON.parse(server.requests[0].requestBody)).to.deep.equal(timeoutData);
+    });
+  });
+
+  describe('onBidWon', () => {
+    it('should send bid won request', () => {
+      spec.onBidWon(bid);
+
+      expect(server.requests[0].method).to.equal('POST');
+      expect(server.requests[0].url).to.equal(ENDPOINT_URL + '/won');
+      expect(JSON.parse(server.requests[0].requestBody)).to.deep.equal(bid);
+    });
+  });
+});
diff --git a/test/spec/modules/lemmaBidAdapter_spec.js b/test/spec/modules/lemmaBidAdapter_spec.js
deleted file mode 100644
index a236ac17d71..00000000000
--- a/test/spec/modules/lemmaBidAdapter_spec.js
+++ /dev/null
@@ -1,335 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/lemmaBidAdapter.js';
-import * as utils from 'src/utils.js';
-const constants = require('src/constants.json');
-
-describe('lemmaBidAdapter', function() {
-  var bidRequests;
-  var videoBidRequests;
-  var bidResponses;
-  beforeEach(function() {
-    bidRequests = [{
-      bidder: 'lemma',
-      mediaType: 'banner',
-      mediaTypes: {
-        banner: {
-          sizes: [
-            [300, 250],
-            [300, 600]
-          ],
-        }
-      },
-      params: {
-        pubId: 1001,
-        adunitId: 1,
-        currency: 'AUD',
-        geo: {
-          lat: '12.3',
-          lon: '23.7',
-        }
-      },
-      sizes: [
-        [300, 250],
-        [300, 600]
-      ]
-    }];
-    videoBidRequests = [{
-      code: 'video1',
-      mediaType: 'video',
-      mediaTypes: {
-        video: {
-          playerSize: [640, 480],
-          context: 'instream'
-        }
-      },
-      bidder: 'lemma',
-      params: {
-        pubId: 1001,
-        adunitId: 1,
-        video: {
-          mimes: ['video/mp4', 'video/x-flv'],
-          skippable: true,
-          minduration: 5,
-          maxduration: 30
-        }
-      }
-    }];
-    bidResponses = {
-      'body': {
-        'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
-        'seatbid': [{
-          'bid': [{
-            'id': '74858439-49D7-4169-BA5D-44A046315B2F',
-            'impid': '22bddb28db77d',
-            'price': 1.3,
-            'adm': '<div style="background-color:#3399ff;"><p style="color:#ff0000;font-size:30px;font-family:Courier, monospace;">lemma<span style="color:white;font-style:italic;font-size:20px;">"Connecting Advertisers and Publishers directly"</span></p></div><script src="https://track.lemmahq.com/event?data=%7B%22id%22%3A%2216c8a49b-3f40-4000-870c-0c34c7fc8d00%22%2C%22bid%22%3A%2282DAAE22-FF66-4FAB-84AB-347B0C5CD02C%22%2C%22ts%22%3A%2220190813092302%22%2C%22pid%22%3A1001%2C%22plcid%22%3A1%2C%22aid%22%3A1%2C%22did%22%3A1%2C%22cid%22%3A%2222918%22%2C%22af%22%3A2%2C%22at%22%3A1%2C%22w%22%3A300%2C%22h%22%3A250%2C%22crid%22%3A%22v55jutrh%22%2C%22pp%22%3A1.858309%2C%22cp%22%3A1.858309%2C%22mg%22%3A0%7D&type=1" type="text/javascript"></script>',
-            'adomain': ['amazon.com'],
-            'iurl': 'https://thetradedesk-t-general.s3.amazonaws.com/AdvertiserLogos/vgl908z.png',
-            'cid': '22918',
-            'crid': 'v55jutrh',
-            'h': 250,
-            'w': 300,
-            'ext': {}
-          }]
-        }]
-      }
-    };
-  });
-  describe('implementation', function() {
-    describe('Bid validations', function() {
-      it('valid bid case', function() {
-        var validBid = {
-            bidder: 'lemma',
-            params: {
-              pubId: 1001,
-              adunitId: 1
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(true);
-      });
-      it('invalid bid case', function() {
-        var isValid = spec.isBidRequestValid();
-        expect(isValid).to.equal(false);
-      });
-      it('invalid bid case: pubId not passed', function() {
-        var validBid = {
-            bidder: 'lemma',
-            params: {
-              adunitId: 1
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-      });
-      it('invalid bid case: pubId is not number', function() {
-        var validBid = {
-            bidder: 'lemma',
-            params: {
-              pubId: '301',
-              adunitId: 1
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-      });
-      it('invalid bid case: adunitId is not passed', function() {
-        var validBid = {
-            bidder: 'lemma',
-            params: {
-              pubId: 1001
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-      });
-      it('invalid bid case: video bid request mimes is not passed', function() {
-        var validBid = {
-            bidder: 'lemma',
-            params: {
-              pubId: 1001,
-              adunitId: 1,
-              video: {
-                skippable: true,
-                minduration: 5,
-                maxduration: 30
-              }
-            }
-          },
-          isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-        validBid.params.video.mimes = [];
-        isValid = spec.isBidRequestValid(validBid);
-        expect(isValid).to.equal(false);
-      });
-    });
-    describe('Request formation', function() {
-      it('buildRequests function should not modify original bidRequests object', function() {
-        var originalBidRequests = utils.deepClone(bidRequests);
-        var request = spec.buildRequests(bidRequests);
-        expect(bidRequests).to.deep.equal(originalBidRequests);
-      });
-      it('Endpoint checking', function() {
-        var request = spec.buildRequests(bidRequests);
-        expect(request.url).to.equal('https://ads.lemmatechnologies.com/lemma/servad?pid=1001&aid=1');
-        expect(request.method).to.equal('POST');
-      });
-      it('Request params check', function() {
-        var request = spec.buildRequests(bidRequests);
-        var data = JSON.parse(request.data);
-        expect(data.site.domain).to.be.a('string'); // domain should be set
-        expect(data.site.publisher.id).to.equal(bidRequests[0].params.pubId.toString()); // publisher Id
-        expect(data.imp[0].tagid).to.equal('1'); // tagid
-        expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
-      });
-      it('Request params check without mediaTypes object', function() {
-        var bidRequests = [{
-          bidder: 'lemma',
-          params: {
-            pubId: 1001,
-            adunitId: 1,
-            currency: 'AUD'
-          },
-          sizes: [
-            [300, 250],
-            [300, 600]
-          ]
-        }];
-        var request = spec.buildRequests(bidRequests);
-        var data = JSON.parse(request.data);
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(250); // height
-        expect(data.imp[0].banner.format).exist.and.to.be.an('array');
-        expect(data.imp[0].banner.format[0]).exist.and.to.be.an('object');
-        expect(data.imp[0].banner.format[0].w).to.equal(300); // width
-        expect(data.imp[0].banner.format[0].h).to.equal(600); // height
-      });
-      it('Request params check: without tagId', function() {
-        delete bidRequests[0].params.adunitId;
-        var request = spec.buildRequests(bidRequests);
-        var data = JSON.parse(request.data);
-        expect(data.site.domain).to.be.a('string'); // domain should be set
-        expect(data.site.publisher.id).to.equal(bidRequests[0].params.pubId.toString()); // publisher Id
-        expect(data.imp[0].tagid).to.equal(undefined); // tagid
-        expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
-      });
-      it('Request params multi size format object check', function() {
-        var bidRequests = [{
-          bidder: 'lemma',
-          mediaTypes: {
-            banner: {
-              sizes: [
-                [300, 250],
-                [300, 600]
-              ],
-            }
-          },
-          params: {
-            pubId: 1001,
-            adunitId: 1,
-            currency: 'AUD'
-          },
-          sizes: [
-            [300, 250],
-            [300, 600]
-          ]
-        }];
-        /* case 1 - size passed in adslot */
-        var request = spec.buildRequests(bidRequests);
-        var data = JSON.parse(request.data);
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(250); // height
-        /* case 2 - size passed in adslot as well as in sizes array */
-        bidRequests[0].sizes = [
-          [300, 600],
-          [300, 250]
-        ];
-        bidRequests[0].mediaTypes = {
-          banner: {
-            sizes: [
-              [300, 600],
-              [300, 250]
-            ]
-          }
-        };
-        request = spec.buildRequests(bidRequests);
-        data = JSON.parse(request.data);
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(600); // height
-        /* case 3 - size passed in sizes but not in adslot */
-        bidRequests[0].params.adunitId = 1;
-        bidRequests[0].sizes = [
-          [300, 250],
-          [300, 600]
-        ];
-        bidRequests[0].mediaTypes = {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600]
-            ]
-          }
-        };
-        request = spec.buildRequests(bidRequests);
-        data = JSON.parse(request.data);
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(250); // height
-        expect(data.imp[0].banner.format).exist.and.to.be.an('array');
-        expect(data.imp[0].banner.format[0]).exist.and.to.be.an('object');
-        expect(data.imp[0].banner.format[0].w).to.equal(300); // width
-        expect(data.imp[0].banner.format[0].h).to.equal(250); // height
-      });
-      it('Request params currency check', function() {
-        var bidRequest = [{
-          bidder: 'lemma',
-          mediaTypes: {
-            banner: {
-              sizes: [
-                [300, 250],
-                [300, 600]
-              ],
-            }
-          },
-          params: {
-            pubId: 1001,
-            adunitId: 1,
-            currency: 'AUD'
-          },
-          sizes: [
-            [300, 250],
-            [300, 600]
-          ]
-        }];
-        /* case 1 -
-      currency specified in adunits
-      output: imp[0] use currency specified in bidRequests[0].params.currency
-        */
-        var request = spec.buildRequests(bidRequest);
-        var data = JSON.parse(request.data);
-        expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
-        /* case 2 -
-      currency specified in adunit
-      output: imp[0] use default currency - USD
-      */
-        delete bidRequest[0].params.currency;
-        request = spec.buildRequests(bidRequest);
-        data = JSON.parse(request.data);
-        expect(data.imp[0].bidfloorcur).to.equal('USD');
-      });
-      it('Request params check for video ad', function() {
-        var request = spec.buildRequests(videoBidRequests);
-        var data = JSON.parse(request.data);
-        expect(data.imp[0].video).to.exist;
-        expect(data.imp[0].tagid).to.equal('1');
-        expect(data.imp[0]['video']['mimes']).to.exist.and.to.be.an('array');
-        expect(data.imp[0]['video']['mimes'][0]).to.equal(videoBidRequests[0].params.video['mimes'][0]);
-        expect(data.imp[0]['video']['mimes'][1]).to.equal(videoBidRequests[0].params.video['mimes'][1]);
-        expect(data.imp[0]['video']['minduration']).to.equal(videoBidRequests[0].params.video['minduration']);
-        expect(data.imp[0]['video']['maxduration']).to.equal(videoBidRequests[0].params.video['maxduration']);
-        expect(data.imp[0]['video']['w']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[0]);
-        expect(data.imp[0]['video']['h']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[1]);
-      });
-      describe('Response checking', function() {
-        it('should check for valid response values', function() {
-          var request = spec.buildRequests(bidRequests);
-          var data = JSON.parse(request.data);
-          var response = spec.interpretResponse(bidResponses, request);
-          expect(response).to.be.an('array').with.length.above(0);
-          expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
-          expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
-          expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
-          expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
-          if (bidResponses.body.seatbid[0].bid[0].crid) {
-            expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
-          } else {
-            expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
-          }
-          expect(response[0].dealId).to.equal(bidResponses.body.seatbid[0].bid[0].dealid);
-          expect(response[0].currency).to.equal('USD');
-          expect(response[0].netRevenue).to.equal(false);
-          expect(response[0].ttl).to.equal(300);
-        });
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/limelightDigitalBidAdapter_spec.js b/test/spec/modules/limelightDigitalBidAdapter_spec.js
new file mode 100644
index 00000000000..4efb4f4e84d
--- /dev/null
+++ b/test/spec/modules/limelightDigitalBidAdapter_spec.js
@@ -0,0 +1,642 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/limelightDigitalBidAdapter.js';
+
+describe('limelightDigitalAdapter', function () {
+  const bid1 = {
+    bidId: '2dd581a2b6281d',
+    bidder: 'limelightDigital',
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      host: 'exchange.ortb.net',
+      adUnitId: 123,
+      adUnitType: 'banner',
+      publisherId: 'perfectPublisher'
+    },
+    placementCode: 'placement_0',
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+    userIdAsEids: [
+      {
+        source: 'test1.org',
+        uids: [
+          {
+            id: '123',
+          }
+        ]
+      }
+    ],
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '1',
+          hp: 1
+        }
+      ]
+    }
+  }
+  const bid2 = {
+    bidId: '58ee9870c3164a',
+    bidder: 'limelightDigital',
+    bidderRequestId: '209fdaf1c81649',
+    params: {
+      host: 'ads.project-limelight.com',
+      adUnitId: 456,
+      adUnitType: 'banner'
+    },
+    placementCode: 'placement_1',
+    auctionId: '482f88de-29ab-45c8-981a-d25e39454a34',
+    sizes: [[350, 200]],
+    transactionId: '068867d1-46ec-40bb-9fa0-e24611786fb4',
+    userIdAsEids: [
+      {
+        source: 'test2.org',
+        uids: [
+          {
+            id: '234',
+          }
+        ]
+      }
+    ],
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '1',
+          hp: 1
+        },
+        {
+          asi: 'example1.com',
+          sid: '2',
+          hp: 1
+        }
+      ]
+    }
+  }
+  const bid3 = {
+    bidId: '019645c7d69460',
+    bidder: 'limelightDigital',
+    bidderRequestId: 'f2b15f89e77ba6',
+    params: {
+      host: 'exchange.ortb.net',
+      adUnitId: 789,
+      adUnitType: 'video',
+      publisherId: 'secondPerfectPublisher'
+    },
+    placementCode: 'placement_2',
+    auctionId: 'e4771143-6aa7-41ec-8824-ced4342c96c8',
+    sizes: [[800, 600]],
+    transactionId: '738d5915-6651-43b9-9b6b-d50517350917',
+    userIdAsEids: [
+      {
+        source: 'test3.org',
+        uids: [
+          {
+            id: '345',
+          },
+          {
+            id: '456',
+          }
+        ]
+      }
+    ],
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '1',
+          hp: 1
+        }
+      ]
+    }
+  }
+  const bid4 = {
+    bidId: '019645c7d69460',
+    bidder: 'limelightDigital',
+    bidderRequestId: 'f2b15f89e77ba6',
+    params: {
+      host: 'exchange.ortb.net',
+      adUnitId: 789,
+      adUnitType: 'video'
+    },
+    placementCode: 'placement_2',
+    auctionId: 'e4771143-6aa7-41ec-8824-ced4342c96c8',
+    video: {
+      playerSize: [800, 600]
+    },
+    transactionId: '738d5915-6651-43b9-9b6b-d50517350917',
+    userIdAsEids: [
+      {
+        source: 'test.org',
+        uids: [
+          {
+            id: '111',
+          }
+        ]
+      }
+    ],
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '1',
+          hp: 1
+        }
+      ]
+    }
+  }
+
+  describe('buildRequests', function () {
+    const serverRequests = spec.buildRequests([bid1, bid2, bid3, bid4])
+    it('Creates two ServerRequests', function() {
+      expect(serverRequests).to.exist
+      expect(serverRequests).to.have.lengthOf(2)
+    })
+    serverRequests.forEach(serverRequest => {
+      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 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',
+          'secure',
+          'adUnits'
+        );
+        expect(data.deviceWidth).to.be.a('number');
+        expect(data.deviceHeight).to.be.a('number');
+        expect(data.secure).to.be.a('boolean');
+        data.adUnits.forEach(adUnit => {
+          expect(adUnit).to.have.all.keys(
+            'id',
+            'bidId',
+            'type',
+            'sizes',
+            'transactionId',
+            'publisherId',
+            'userIdAsEids',
+            'supplyChain'
+          );
+          expect(adUnit.id).to.be.a('number');
+          expect(adUnit.bidId).to.be.a('string');
+          expect(adUnit.type).to.be.a('string');
+          expect(adUnit.transactionId).to.be.a('string');
+          expect(adUnit.sizes).to.be.an('array');
+          expect(adUnit.userIdAsEids).to.be.an('array');
+          expect(adUnit.supplyChain).to.be.an('object');
+        })
+      })
+    })
+    it('Returns valid URL', function () {
+      expect(serverRequests[0].url).to.equal('https://exchange.ortb.net/hb')
+      expect(serverRequests[1].url).to.equal('https://ads.project-limelight.com/hb')
+    })
+    it('Returns valid adUnits', function () {
+      validateAdUnit(serverRequests[0].data.adUnits[0], bid1)
+      validateAdUnit(serverRequests[1].data.adUnits[0], bid2)
+      validateAdUnit(serverRequests[0].data.adUnits[1], bid3)
+    })
+    it('Returns empty data if no valid requests are passed', function () {
+      const serverRequests = spec.buildRequests([])
+      expect(serverRequests).to.be.an('array').that.is.empty
+    })
+  })
+  describe('interpretBannerResponse', function () {
+    let resObject = {
+      body: [ {
+        requestId: '123',
+        cpm: 0.3,
+        width: 320,
+        height: 50,
+        ad: '<h1>Hello ad</h1>',
+        ttl: 1000,
+        creativeId: '123asd',
+        netRevenue: true,
+        currency: 'USD',
+        meta: {
+          advertiserDomains: ['example.com'],
+          mediaType: 'banner'
+        }
+      } ]
+    };
+    let serverResponses = spec.interpretResponse(resObject);
+    it('Returns an array of valid server responses if response object is valid', function () {
+      expect(serverResponses).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < serverResponses.length; i++) {
+        let dataItem = serverResponses[i];
+        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+          'netRevenue', 'currency', '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.ad).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.meta.advertiserDomains).to.be.an('array');
+        expect(dataItem.meta.mediaType).to.be.a('string');
+      }
+      it('Returns an empty array if invalid response is passed', function () {
+        serverResponses = spec.interpretResponse('invalid_response');
+        expect(serverResponses).to.be.an('array').that.is.empty;
+      });
+    });
+  });
+  describe('interpretVideoResponse', function () {
+    let resObject = {
+      body: [ {
+        requestId: '123',
+        cpm: 0.3,
+        width: 320,
+        height: 50,
+        vastXml: '<VAST></VAST>',
+        ttl: 1000,
+        creativeId: '123asd',
+        netRevenue: true,
+        currency: 'USD',
+        meta: {
+          advertiserDomains: ['example.com'],
+          mediaType: 'video'
+        }
+      } ]
+    };
+    let serverResponses = spec.interpretResponse(resObject);
+    it('Returns an array of valid server responses if response object is valid', function () {
+      expect(serverResponses).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < serverResponses.length; i++) {
+        let dataItem = serverResponses[i];
+        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastXml', 'ttl', 'creativeId',
+          'netRevenue', 'currency', '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.vastXml).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.meta.advertiserDomains).to.be.an('array');
+        expect(dataItem.meta.mediaType).to.be.a('string');
+      }
+      it('should return an empty array if invalid response is passed', function () {
+        serverResponses = spec.interpretResponse('invalid_response');
+        expect(serverResponses).to.be.an('array').that.is.empty;
+      });
+    });
+  });
+  describe('isBidRequestValid', function() {
+    let bid = {
+      bidId: '2dd581a2b6281d',
+      bidder: 'limelightDigital',
+      bidderRequestId: '145e1d6a7837c9',
+      params: {
+        host: 'exchange.ortb.net',
+        adUnitId: 123,
+        adUnitType: 'banner'
+      },
+      placementCode: 'placement_0',
+      auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+      sizes: [[300, 250]],
+      transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
+    };
+
+    it('should return true when required params found', function() {
+      [bid, bid1, bid2, bid3].forEach(bid => {
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+
+    it('should return true when adUnitId is zero', function() {
+      bid.params.adUnitId = 0;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function() {
+      let bidFailed = {
+        bidder: 'limelightDigital',
+        bidderRequestId: '145e1d6a7837c9',
+        params: {
+          adUnitId: 123,
+          adUnitType: 'banner'
+        },
+        placementCode: 'placement_0',
+        auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+        sizes: [[300, 250]],
+        transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
+      };
+      expect(spec.isBidRequestValid(bidFailed)).to.equal(false);
+    });
+  });
+  describe('interpretResponse', function() {
+    let resObject = {
+      requestId: '123',
+      cpm: 0.3,
+      width: 320,
+      height: 50,
+      ad: '<h1>Hello ad</h1>',
+      ttl: 1000,
+      creativeId: '123asd',
+      netRevenue: true,
+      currency: 'USD',
+      meta: {
+        advertiserDomains: ['example.com'],
+        mediaType: 'banner'
+      }
+    };
+    it('should skip responses which do not contain required params', function() {
+      let bidResponses = {
+        body: [ {
+          cpm: 0.3,
+          ttl: 1000,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['example.com'],
+            mediaType: 'banner'
+          }
+        }, resObject ]
+      }
+      expect(spec.interpretResponse(bidResponses)).to.deep.equal([ resObject ]);
+    });
+    it('should skip responses which do not contain advertiser domains', function() {
+      let resObjectWithoutAdvertiserDomains = Object.assign({}, resObject);
+      resObjectWithoutAdvertiserDomains.meta = Object.assign({}, resObject.meta);
+      delete resObjectWithoutAdvertiserDomains.meta.advertiserDomains;
+      let bidResponses = {
+        body: [ resObjectWithoutAdvertiserDomains, resObject ]
+      }
+      expect(spec.interpretResponse(bidResponses)).to.deep.equal([ resObject ]);
+    });
+    it('should return responses which contain empty advertiser domains', function() {
+      let resObjectWithEmptyAdvertiserDomains = Object.assign({}, resObject);
+      resObjectWithEmptyAdvertiserDomains.meta = Object.assign({}, resObject.meta);
+      resObjectWithEmptyAdvertiserDomains.meta.advertiserDomains = [];
+      let bidResponses = {
+        body: [ resObjectWithEmptyAdvertiserDomains, resObject ]
+      }
+      expect(spec.interpretResponse(bidResponses)).to.deep.equal([resObjectWithEmptyAdvertiserDomains, resObject]);
+    });
+    it('should skip responses which do not contain meta media type', function() {
+      let resObjectWithoutMetaMediaType = Object.assign({}, resObject);
+      resObjectWithoutMetaMediaType.meta = Object.assign({}, resObject.meta);
+      delete resObjectWithoutMetaMediaType.meta.mediaType;
+      let bidResponses = {
+        body: [ resObjectWithoutMetaMediaType, resObject ]
+      }
+      expect(spec.interpretResponse(bidResponses)).to.deep.equal([ resObject ]);
+    });
+  });
+  describe('getUserSyncs', function () {
+    it('should return trackers for lm(only iframe) if server responses contain lm user sync header and iframe and image enabled', function () {
+      const serverResponses = [
+        {
+          headers: {
+            get: function (header) {
+              if (header === 'X-PLL-UserSync-Image') {
+                return 'https://tracker-lm.ortb.net/sync';
+              }
+              if (header === 'X-PLL-UserSync-Iframe') {
+                return 'https://tracker-lm.ortb.net/sync.html';
+              }
+            }
+          },
+          body: []
+        }
+      ];
+      const syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true
+      };
+      expect(spec.getUserSyncs(syncOptions, serverResponses)).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://tracker-lm.ortb.net/sync.html'
+        }
+      ]);
+    });
+    it('should return empty array if all sync types are disabled', function () {
+      const serverResponses = [
+        {
+          headers: {
+            get: function (header) {
+              if (header === 'X-PLL-UserSync-Image') {
+                return 'https://tracker-1.ortb.net/sync';
+              }
+              if (header === 'X-PLL-UserSync-Iframe') {
+                return 'https://tracker-1.ortb.net/sync.html';
+              }
+            }
+          },
+          body: []
+        }
+      ];
+      const syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: false
+      };
+      expect(spec.getUserSyncs(syncOptions, serverResponses)).to.be.an('array').that.is.empty;
+    });
+    it('should return no pixels if iframe sync is enabled and headers are blank', function () {
+      const serverResponses = [
+        {
+          headers: null,
+          body: []
+        }
+      ];
+      const syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: false
+      };
+      expect(spec.getUserSyncs(syncOptions, serverResponses)).to.be.an('array').that.is.empty;
+    });
+    it('should return image sync urls for lm if pixel sync is enabled and headers have lm pixel', function () {
+      const serverResponses = [
+        {
+          headers: {
+            get: function (header) {
+              if (header === 'X-PLL-UserSync-Image') {
+                return 'https://tracker-lm.ortb.net/sync';
+              }
+              if (header === 'X-PLL-UserSync-Iframe') {
+                return 'https://tracker-lm.ortb.net/sync.html';
+              }
+            }
+          },
+          body: []
+        }
+      ];
+      const syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: true
+      };
+      expect(spec.getUserSyncs(syncOptions, serverResponses)).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://tracker-lm.ortb.net/sync'
+        }
+      ]);
+    });
+    it('should return image sync urls for client1 and clien2 if pixel sync is enabled and two responses and headers have two pixels', function () {
+      const serverResponses = [
+        {
+          headers: {
+            get: function (header) {
+              if (header === 'X-PLL-UserSync-Image') {
+                return 'https://tracker-1.ortb.net/sync';
+              }
+              if (header === 'X-PLL-UserSync-Iframe') {
+                return 'https://tracker-1.ortb.net/sync.html';
+              }
+            }
+          },
+          body: []
+        },
+        {
+          headers: {
+            get: function (header) {
+              if (header === 'X-PLL-UserSync-Image') {
+                return 'https://tracker-2.ortb.net/sync';
+              }
+              if (header === 'X-PLL-UserSync-Iframe') {
+                return 'https://tracker-2.ortb.net/sync.html';
+              }
+            }
+          },
+          body: []
+        }
+      ];
+      const syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: true
+      };
+      expect(spec.getUserSyncs(syncOptions, serverResponses)).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://tracker-1.ortb.net/sync'
+        },
+        {
+          type: 'image',
+          url: 'https://tracker-2.ortb.net/sync'
+        }
+      ]);
+    });
+    it('should return image sync url for pll if pixel sync is enabled and two responses and headers have two same pixels', function () {
+      const serverResponses = [
+        {
+          headers: {
+            get: function (header) {
+              if (header === 'X-PLL-UserSync-Image') {
+                return 'https://tracker-lm.ortb.net/sync';
+              }
+              if (header === 'X-PLL-UserSync-Iframe') {
+                return 'https://tracker-lm.ortb.net/sync.html';
+              }
+            }
+          },
+          body: []
+        },
+        {
+          headers: {
+            get: function (header) {
+              if (header === 'X-PLL-UserSync-Image') {
+                return 'https://tracker-lm.ortb.net/sync';
+              }
+              if (header === 'X-PLL-UserSync-Iframe') {
+                return 'https://tracker-lm.ortb.net/sync.html';
+              }
+            }
+          },
+          body: []
+        }
+      ];
+      const syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: true
+      };
+      expect(spec.getUserSyncs(syncOptions, serverResponses)).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://tracker-lm.ortb.net/sync'
+        }
+      ]);
+    });
+    it('should return iframe sync url for pll if pixel sync is enabled and iframe is enables and headers have both iframe and img pixels', function () {
+      const serverResponses = [
+        {
+          headers: {
+            get: function (header) {
+              if (header === 'X-PLL-UserSync-Image') {
+                return 'https://tracker-lm.ortb.net/sync';
+              }
+              if (header === 'X-PLL-UserSync-Iframe') {
+                return 'https://tracker-lm.ortb.net/sync.html';
+              }
+            }
+          },
+          body: []
+        }
+      ];
+      const syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true
+      };
+      expect(spec.getUserSyncs(syncOptions, serverResponses)).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://tracker-lm.ortb.net/sync.html'
+        }
+      ]);
+    });
+  });
+});
+
+function validateAdUnit(adUnit, bid) {
+  expect(adUnit.id).to.equal(bid.params.adUnitId);
+  expect(adUnit.bidId).to.equal(bid.bidId);
+  expect(adUnit.type).to.equal(bid.params.adUnitType.toUpperCase());
+  expect(adUnit.transactionId).to.equal(bid.transactionId);
+  let bidSizes = [];
+  if (bid.mediaTypes) {
+    if (bid.mediaTypes.video && bid.mediaTypes.video.playerSize) {
+      bidSizes = bidSizes.concat([bid.mediaTypes.video.playerSize]);
+    }
+    if (bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) {
+      bidSizes = bidSizes.concat(bid.mediaTypes.banner.sizes);
+    }
+  }
+  if (bid.sizes) {
+    bidSizes = bidSizes.concat(bid.sizes || []);
+  }
+  expect(adUnit.sizes).to.deep.equal(bidSizes.map(size => {
+    return {
+      width: size[0],
+      height: size[1]
+    }
+  }));
+  expect(adUnit.publisherId).to.equal(bid.params.publisherId);
+  expect(adUnit.userIdAsEids).to.deep.equal(bid.userIdAsEids);
+  expect(adUnit.supplyChain).to.deep.equal(bid.schain);
+}
diff --git a/test/spec/modules/liveIntentAnalyticsAdapter_spec.js b/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..fa4c5cd8cad
--- /dev/null
+++ b/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
@@ -0,0 +1,294 @@
+import liAnalytics from 'modules/liveIntentAnalyticsAdapter';
+import { expect } from 'chai';
+import { server } from 'test/mocks/xhr.js';
+import { auctionManager } from 'src/auctionManager.js';
+import {expectEvents} from '../../helpers/analytics.js';
+
+let utils = require('src/utils');
+let refererDetection = require('src/refererDetection');
+let instanceId = '77abbc81-c1f1-41cd-8f25-f7149244c800';
+let url = 'https://www.test.com'
+let sandbox;
+let clock;
+let now = new Date();
+
+let events = require('src/events');
+let constants = require('src/constants.json');
+let auctionId = '99abbc81-c1f1-41cd-8f25-f7149244c897'
+
+const config = {
+  provider: 'liveintent',
+  options: {
+    bidWonTimeout: 2000,
+    sampling: 1
+  }
+}
+
+let args = {
+  auctionId: auctionId,
+  timestamp: 1660915379703,
+  auctionEnd: 1660915381635,
+  adUnits: [
+    {
+      code: 'ID_Bot100AdJ1',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [
+              300,
+              250
+            ],
+            [
+              320,
+              50
+            ]
+          ]
+        }
+      },
+      ortb2Imp: {
+        gpid: '/777/test/home/ID_Bot100AdJ1',
+        ext: {
+          data: {
+            aupName: '/777/test/home/ID_Bot100AdJ1',
+            adserver: {
+              name: 'gam',
+              adslot: '/777/test/home/ID_Bot100AdJ1'
+            },
+            pbadslot: '/777/test/home/ID_Bot100AdJ1'
+          },
+          gpid: '/777/test/home/ID_Bot100AdJ1'
+        }
+      },
+      bids: [
+        {
+          bidder: 'testBidder',
+          params: {
+            siteId: 321218,
+            zoneId: 1732558,
+            position: 'bug',
+            accountId: 10777
+          },
+          userIdAsEids: [
+            {
+              source: 'source1.com',
+              uids: [
+                {
+                  id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+                  atype: 1,
+                  ext: {
+                    linkType: 2
+                  }
+                }
+              ]
+            },
+            {
+              source: 'source2.com',
+              uids: [
+                {
+                  id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+                  atype: 1,
+                  ext: {
+                    linkType: 2
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          bidder: 'testBidder2',
+          params: {
+            adSlot: '2926251',
+            publisherId: '159423'
+          },
+          userIdAsEids: [
+            {
+              source: 'source1.com',
+              uids: [
+                {
+                  id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+                  atype: 1,
+                  ext: {
+                    linkType: 2
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  bidderRequests: [
+    {
+      bidderCode: 'tripl_ss1',
+      auctionId: '8e5a5eda-a7dc-49a3-bc7f-654fc',
+      bidderRequestId: '953fe1ee8a1645',
+      uniquePbsTid: '0da1f980-8351-415d-860d-ebbdb4274179',
+      auctionStart: 1660915379703
+    },
+    {
+      bidderCode: 'tripl_ss2',
+      auctionId: '8e5a5eda-a7dc-49a3-bc7f-6ca682ae893c',
+      bidderRequestId: '953fe1ee8a164e',
+      uniquePbsTid: '0da1f980-8351-415d-860d-ebbdb4274180',
+      auctionStart: 1660915379703
+    }
+  ],
+  bidsReceived: [
+    {
+      adUnitCode: 'ID_Bot100AdJ1',
+      timeToRespond: 824,
+      cpm: 0.447,
+      currency: 'USD',
+      ttl: 300,
+      bidder: 'testBidder'
+    }
+  ],
+  winningBids: []
+}
+
+let winningBids = [
+  {
+    adUnitCode: 'ID_Bot100AdJ1',
+    timeToRespond: 824,
+    cpm: 0.447,
+    currency: 'USD',
+    ttl: 300,
+    bidder: 'testBidder'
+  }
+];
+
+let expectedEvent = {
+  instanceId: instanceId,
+  url: url,
+  bidsReceived: [
+    {
+      adUnitCode: 'ID_Bot100AdJ1',
+      timeToRespond: 824,
+      cpm: 0.447,
+      currency: 'USD',
+      ttl: 300,
+      bidder: 'testBidder'
+    }
+  ],
+  auctionStart: 1660915379703,
+  auctionEnd: 1660915381635,
+  adUnits: [
+    {
+      code: 'ID_Bot100AdJ1',
+      mediaType: 'banner',
+      sizes: [
+        {
+          w: 300,
+          h: 250
+        },
+        {
+          w: 320,
+          h: 50
+        }
+      ],
+      ortb2Imp: {
+        gpid: '/777/test/home/ID_Bot100AdJ1',
+        ext: {
+          data: {
+            aupName: '/777/test/home/ID_Bot100AdJ1',
+            adserver: {
+              name: 'gam',
+              adslot: '/777/test/home/ID_Bot100AdJ1'
+            },
+            pbadslot: '/777/test/home/ID_Bot100AdJ1'
+          },
+          gpid: '/777/test/home/ID_Bot100AdJ1'
+        }
+      }
+    }
+  ],
+  winningBids: [
+    {
+      adUnitCode: 'ID_Bot100AdJ1',
+      timeToRespond: 824,
+      cpm: 0.447,
+      currency: 'USD',
+      ttl: 300,
+      bidder: 'testBidder'
+    }
+  ],
+  auctionId: auctionId,
+  userIds: [
+    {
+      source: 'source1.com',
+      uids: [
+        {
+          id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+          atype: 1,
+          ext: {
+            linkType: 2
+          }
+        }
+      ]
+    },
+    {
+      source: 'source2.com',
+      uids: [
+        {
+          id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+          atype: 1,
+          ext: {
+            linkType: 2
+          }
+        }
+      ]
+    }
+  ],
+  bidders: [
+    {
+      bidder: 'testBidder',
+      params: {
+        siteId: 321218,
+        zoneId: 1732558,
+        position: 'bug',
+        accountId: 10777
+      }
+    },
+    {
+      bidder: 'testBidder2',
+      params: {
+        adSlot: '2926251',
+        publisherId: '159423'
+      }
+    }
+  ]
+};
+
+describe('LiveIntent Analytics Adapter ', () => {
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(events, 'getEvents').returns([]);
+    clock = sandbox.useFakeTimers(now.getTime());
+  });
+  afterEach(function () {
+    liAnalytics.disableAnalytics();
+    sandbox.restore();
+    clock.restore();
+  });
+
+  it('request is computed and sent correctly', () => {
+    liAnalytics.enableAnalytics(config);
+    sandbox.stub(utils, 'generateUUID').returns(instanceId);
+    sandbox.stub(refererDetection, 'getRefererInfo').returns({page: url});
+    sandbox.stub(auctionManager.index, 'getAuction').withArgs(auctionId).returns({ getWinningBids: () => winningBids });
+    events.emit(constants.EVENTS.AUCTION_END, args);
+    clock.tick(2000);
+    expect(server.requests.length).to.equal(1);
+
+    let requestBody = JSON.parse(server.requests[0].requestBody);
+    expect(requestBody).to.deep.equal(expectedEvent);
+  });
+
+  it('track is called', () => {
+    sandbox.stub(liAnalytics, 'track');
+    liAnalytics.enableAnalytics(config);
+    expectEvents().to.beTrackedBy(liAnalytics.track);
+  })
+});
diff --git a/test/spec/modules/liveIntentIdMinimalSystem_spec.js b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
new file mode 100644
index 00000000000..6a5afa58da2
--- /dev/null
+++ b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
@@ -0,0 +1,242 @@
+import * as utils from 'src/utils.js';
+import { gdprDataHandler, uspDataHandler } from '../../../src/adapterManager.js';
+import { server } from 'test/mocks/xhr.js';
+import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } from 'modules/liveIntentIdSystem.js';
+
+const PUBLISHER_ID = '89899';
+const defaultConfigParams = { params: {publisherId: PUBLISHER_ID} };
+const responseHeader = {'Content-Type': 'application/json'};
+
+describe('LiveIntentMinimalId', function() {
+  let logErrorStub;
+  let uspConsentDataStub;
+  let gdprConsentDataStub;
+  let getCookieStub;
+  let getDataFromLocalStorageStub;
+  let imgStub;
+
+  beforeEach(function() {
+    liveIntentIdSubmodule.setModuleMode('minimal');
+    imgStub = sinon.stub(utils, 'triggerPixel');
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    logErrorStub = sinon.stub(utils, 'logError');
+    uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    gdprConsentDataStub = sinon.stub(gdprDataHandler, 'getConsentData');
+  });
+
+  afterEach(function() {
+    imgStub.restore();
+    getCookieStub.restore();
+    getDataFromLocalStorageStub.restore();
+    logErrorStub.restore();
+    uspConsentDataStub.restore();
+    gdprConsentDataStub.restore();
+    liveIntentIdSubmodule.setModuleMode('minimal');
+    resetLiveIntentIdSubmodule();
+  });
+  it('should not fire an event when getId', function() {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: true,
+      consentString: 'consentDataString'
+    })
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    expect(server.requests[0]).to.eql(undefined)
+  });
+
+  it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
+    const result = liveIntentIdSubmodule.decode({ additionalData: 'data' });
+    expect(result).to.be.eql({});
+  });
+
+  it('should initialize LiveConnect and send no data', function() {
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    expect(server.requests.length).to.be.eq(0);
+  });
+
+  it('should call the Custom URL of the LiveIntent Identity Exchange endpoint', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {...defaultConfigParams.params, ...{'url': 'https://dummy.liveintent.com/idex'}} }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899?resolve=nonId');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the default url of the LiveIntent Identity Exchange endpoint, with a partner', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{
+        'url': 'https://dummy.liveintent.com/idex',
+        'partner': 'rubicon'
+      }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899?resolve=nonId');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the LiveIntent Identity Exchange endpoint, with no additional query params', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should log an error and continue to callback if ajax request errors', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
+    request.respond(
+      503,
+      responseHeader,
+      'Unavailable'
+    );
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include the LiveConnect identifier when calling the LiveIntent Identity Exchange endpoint', function() {
+    const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
+    getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&resolve=nonId`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include the LiveConnect identifier and additional Identifiers to resolve', function() {
+    const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
+    getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
+    getDataFromLocalStorageStub.withArgs('_thirdPC').returns('third-pc');
+    const configParams = { params: {
+      ...defaultConfigParams.params,
+      ...{
+        'identifiersToResolve': ['_thirdPC']
+      }
+    }};
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc&resolve=nonId`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include an additional identifier value to resolve even if it is an object', function() {
+    getCookieStub.returns(null);
+    getDataFromLocalStorageStub.withArgs('_thirdPC').returns({'key': 'value'});
+    const configParams = { params: {
+      ...defaultConfigParams.params,
+      ...{
+        'identifiersToResolve': ['_thirdPC']
+      }
+    }};
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D&resolve=nonId');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should decode a unifiedId to lipbId and remove it', function() {
+    const result = liveIntentIdSubmodule.decode({ unifiedId: 'data' });
+    expect(result).to.eql({'lipb': {'lipbid': 'data'}});
+  });
+
+  it('should decode a nonId to lipbId', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'data' });
+    expect(result).to.eql({'lipb': {'lipbid': 'data', 'nonId': 'data'}});
+  });
+
+  it('should resolve extra attributes', function() {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'foo': true, 'bar': false } }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=nonId&resolve=foo`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should decode a uid2 to a seperate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', uid2: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'uid2': 'bar'}, 'uid2': {'id': 'bar'}});
+  });
+
+  it('should decode values with uid2 but no nonId', function() {
+    const result = liveIntentIdSubmodule.decode({ uid2: 'bar' });
+    expect(result).to.eql({'uid2': {'id': 'bar'}});
+  });
+
+  it('should allow disabling nonId resolution', function() {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'nonId': false, 'uid2': true } }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=uid2`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+});
diff --git a/test/spec/modules/liveIntentIdSystem_spec.js b/test/spec/modules/liveIntentIdSystem_spec.js
index b19d38d5859..3c22cda1154 100644
--- a/test/spec/modules/liveIntentIdSystem_spec.js
+++ b/test/spec/modules/liveIntentIdSystem_spec.js
@@ -1,62 +1,85 @@
-import {liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage} from 'modules/liveIntentIdSystem.js';
+import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } from 'modules/liveIntentIdSystem.js';
 import * as utils from 'src/utils.js';
-import {uspDataHandler} from '../../../src/adapterManager.js';
-import {server} from 'test/mocks/xhr.js';
-
+import { gdprDataHandler, uspDataHandler } from '../../../src/adapterManager.js';
+import { server } from 'test/mocks/xhr.js';
+resetLiveIntentIdSubmodule();
+liveIntentIdSubmodule.setModuleMode('standard')
 const PUBLISHER_ID = '89899';
-const defaultConfigParams = {publisherId: PUBLISHER_ID};
+const defaultConfigParams = { params: {publisherId: PUBLISHER_ID} };
 const responseHeader = {'Content-Type': 'application/json'}
 
-describe('LiveIntentId', function () {
-  let pixel = {};
+describe('LiveIntentId', function() {
   let logErrorStub;
-  let consentDataStub;
+  let uspConsentDataStub;
+  let gdprConsentDataStub;
   let getCookieStub;
   let getDataFromLocalStorageStub;
   let imgStub;
 
-  beforeEach(function () {
-    imgStub = sinon.stub(window, 'Image').returns(pixel);
+  beforeEach(function() {
+    liveIntentIdSubmodule.setModuleMode('standard');
+    imgStub = sinon.stub(utils, 'triggerPixel');
     getCookieStub = sinon.stub(storage, 'getCookie');
     getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
     logErrorStub = sinon.stub(utils, 'logError');
-    consentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    gdprConsentDataStub = sinon.stub(gdprDataHandler, 'getConsentData');
   });
 
-  afterEach(function () {
-    pixel = {};
+  afterEach(function() {
     imgStub.restore();
     getCookieStub.restore();
     getDataFromLocalStorageStub.restore();
     logErrorStub.restore();
-    consentDataStub.restore();
+    uspConsentDataStub.restore();
+    gdprConsentDataStub.restore();
     resetLiveIntentIdSubmodule();
   });
 
-  it('should initialize LiveConnect with a us privacy string when getId, and include it in all requests', function () {
-    consentDataStub.returns('1YNY');
+  it('should initialize LiveConnect with a privacy string when getId, and include it in the resolution request', function () {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: true,
+      consentString: 'consentDataString'
+    })
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
-    expect(pixel.src).to.match(/.*us_privacy=1YNY/);
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.match(/.*us_privacy=1YNY/);
+    let request = server.requests[1];
+    expect(request.url).to.match(/.*us_privacy=1YNY.*&gdpr=1&n3pc=1&gdpr_consent=consentDataString.*/);
+    const response = {
+      unifiedId: 'a_unified_id',
+      segments: [123, 234]
+    }
     request.respond(
       200,
       responseHeader,
-      JSON.stringify({})
+      JSON.stringify(response)
     );
-    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.calledOnceWith(response)).to.be.true;
   });
 
-  it('should fire an event when getId', function () {
+  it('should fire an event when getId', function() {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: true,
+      consentString: 'consentDataString'
+    })
     liveIntentIdSubmodule.getId(defaultConfigParams);
-    expect(pixel.src).to.match(/https:\/\/rp.liadm.com\/p\?wpn=prebid.*/)
+    expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*&us_privacy=1YNY.*&wpn=prebid.*&gdpr=1&n3pc=1&n3pct=1&nb=1&gdpr_consent=consentDataString.*/);
   });
 
-  it('should initialize LiveConnect with the config params when decode and emit an event', function () {
-    liveIntentIdSubmodule.decode({}, {
+  it('should fire an event when getId and a hash is provided', function() {
+    liveIntentIdSubmodule.getId({ params: {
       ...defaultConfigParams,
+      emailHash: '58131bc547fb87af94cebdaf3102321f'
+    }});
+    expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*e=58131bc547fb87af94cebdaf3102321f.+/)
+  });
+
+  it('should initialize LiveConnect with the config params when decode and emit an event', function () {
+    liveIntentIdSubmodule.decode({}, { params: {
+      ...defaultConfigParams.params,
       ...{
         url: 'https://dummy.liveintent.com',
         liCollectConfig: {
@@ -64,62 +87,73 @@ describe('LiveIntentId', function () {
           collectorUrl: 'https://collector.liveintent.com'
         }
       }
-    });
-    expect(pixel.src).to.match(/https:\/\/collector.liveintent.com\/p\?aid=a-0001&wpn=prebid.*/)
+    }});
+    expect(server.requests[0].url).to.match(/https:\/\/collector.liveintent.com\/j\?.*aid=a-0001.*&wpn=prebid.*/);
   });
 
-  it('should initialize LiveConnect and emit an event with a us privacy string when decode', function () {
-    consentDataStub.returns('1YNY');
+  it('should initialize LiveConnect and emit an event with a privacy string when decode', function() {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: false,
+      consentString: 'consentDataString'
+    })
     liveIntentIdSubmodule.decode({}, defaultConfigParams);
-    expect(pixel.src).to.match(/.*us_privacy=1YNY/);
+    expect(server.requests[0].url).to.match(/.*us_privacy=1YNY.*&gdpr=0&gdpr_consent=consentDataString.*/);
+  });
+
+  it('should fire an event when decode and a hash is provided', function() {
+    liveIntentIdSubmodule.decode({}, { params: {
+      ...defaultConfigParams.params,
+      emailHash: '58131bc547fb87af94cebdaf3102321f'
+    }});
+    expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*e=58131bc547fb87af94cebdaf3102321f.+/);
   });
 
-  it('should not return a decoded identifier when the unifiedId is not present in the value', function () {
-    const result = liveIntentIdSubmodule.decode({additionalData: 'data'});
-    expect(result).to.be.undefined;
+  it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
+    const result = liveIntentIdSubmodule.decode({ additionalData: 'data' });
+    expect(result).to.be.eql({});
   });
 
-  it('should fire an event when decode', function () {
+  it('should fire an event when decode', function() {
     liveIntentIdSubmodule.decode({}, defaultConfigParams);
-    expect(pixel.src).to.be.not.null
+    expect(server.requests[0].url).to.be.not.null
   });
 
-  it('should initialize LiveConnect and send data only once', function () {
+  it('should initialize LiveConnect and send data only once', function() {
     liveIntentIdSubmodule.getId(defaultConfigParams);
     liveIntentIdSubmodule.decode({}, defaultConfigParams);
     liveIntentIdSubmodule.getId(defaultConfigParams);
     liveIntentIdSubmodule.decode({}, defaultConfigParams);
-    expect(imgStub.calledOnce).to.be.true;
+    expect(server.requests.length).to.be.eq(1);
   });
 
-  it('should call the Custom URL of the LiveIntent Identity Exchange endpoint', function () {
+  it('should call the Custom URL of the LiveIntent Identity Exchange endpoint', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId({...defaultConfigParams, ...{'url': 'https://dummy.liveintent.com/idex'}}).callback;
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {...defaultConfigParams.params, ...{'url': 'https://dummy.liveintent.com/idex'}} }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899');
+    let request = server.requests[1];
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899?resolve=nonId');
     request.respond(
-      200,
-      responseHeader,
-      JSON.stringify({})
+      204,
+      responseHeader
     );
-    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.calledOnceWith({})).to.be.true;
   });
 
-  it('should call the default url of the LiveIntent Identity Exchange endpoint, with a partner', function () {
+  it('should call the default url of the LiveIntent Identity Exchange endpoint, with a partner', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId({
-      ...defaultConfigParams,
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
       ...{
         'url': 'https://dummy.liveintent.com/idex',
         'partner': 'rubicon'
       }
-    }).callback;
+    } }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899');
+    let request = server.requests[1];
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899?resolve=nonId');
     request.respond(
       200,
       responseHeader,
@@ -128,13 +162,13 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should call the LiveIntent Identity Exchange endpoint, with no additional query params', function () {
+  it('should call the LiveIntent Identity Exchange endpoint, with no additional query params', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    let request = server.requests[1];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
     request.respond(
       200,
       responseHeader,
@@ -143,13 +177,13 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should log an error and continue to callback if ajax request errors', function () {
+  it('should log an error and continue to callback if ajax request errors', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    let request = server.requests[1];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
     request.respond(
       503,
       responseHeader,
@@ -159,14 +193,14 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should include the LiveConnect identifier when calling the LiveIntent Identity Exchange endpoint', function () {
+  it('should include the LiveConnect identifier when calling the LiveIntent Identity Exchange endpoint', function() {
     const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
-    getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
+    getCookieStub.withArgs('_lc2_fpi').returns(oldCookie)
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}`);
+    let request = server.requests[1];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&resolve=nonId`);
     request.respond(
       200,
       responseHeader,
@@ -175,21 +209,21 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should include the LiveConnect identifier and additional Identifiers to resolve', function () {
+  it('should include the LiveConnect identifier and additional Identifiers to resolve', function() {
     const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
-    getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
+    getCookieStub.withArgs('_lc2_fpi').returns(oldCookie);
     getDataFromLocalStorageStub.withArgs('_thirdPC').returns('third-pc');
-    const configParams = {
-      ...defaultConfigParams,
+    const configParams = { params: {
+      ...defaultConfigParams.params,
       ...{
         'identifiersToResolve': ['_thirdPC']
       }
-    };
+    }};
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc`);
+    let request = server.requests[1];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc&resolve=nonId`);
     request.respond(
       200,
       responseHeader,
@@ -198,20 +232,80 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should include an additional identifier value to resolve even if it is an object', function () {
+  it('should include an additional identifier value to resolve even if it is an object', function() {
     getCookieStub.returns(null);
     getDataFromLocalStorageStub.withArgs('_thirdPC').returns({'key': 'value'});
-    const configParams = {
-      ...defaultConfigParams,
+    const configParams = { params: {
+      ...defaultConfigParams.params,
       ...{
         'identifiersToResolve': ['_thirdPC']
       }
-    };
+    }};
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D');
+    let request = server.requests[1];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D&resolve=nonId');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should send an error when the cookie jar throws an unexpected error', function() {
+    getCookieStub.throws('CookieError', 'A message');
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    expect(imgStub.getCall(0).args[0]).to.match(/.*ae=.+/);
+  });
+
+  it('should decode a unifiedId to lipbId and remove it', function() {
+    const result = liveIntentIdSubmodule.decode({ unifiedId: 'data' });
+    expect(result).to.eql({'lipb': {'lipbid': 'data'}});
+  });
+
+  it('should decode a nonId to lipbId', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'data' });
+    expect(result).to.eql({'lipb': {'lipbid': 'data', 'nonId': 'data'}});
+  });
+
+  it('should resolve extra attributes', function() {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'foo': true, 'bar': false } }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[1];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=nonId&resolve=foo`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should decode a uid2 to a seperate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', uid2: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'uid2': 'bar'}, 'uid2': {'id': 'bar'}});
+  });
+
+  it('should decode values with uid2 but no nonId', function() {
+    const result = liveIntentIdSubmodule.decode({ uid2: 'bar' });
+    expect(result).to.eql({'uid2': {'id': 'bar'}});
+  });
+
+  it('should allow disabling nonId resolution', function() {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'nonId': false, 'uid2': true } }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[1];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=uid2`);
     request.respond(
       200,
       responseHeader,
diff --git a/test/spec/modules/livewrappedAnalyticsAdapter_spec.js b/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
index 4e05d1a31ff..bab7a68287d 100644
--- a/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
+++ b/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
@@ -2,6 +2,7 @@ import livewrappedAnalyticsAdapter, { BID_WON_TIMEOUT } from 'modules/livewrappe
 import CONSTANTS from 'src/constants.json';
 import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr.js';
+import { setConfig } from 'modules/currency.js';
 
 let events = require('src/events');
 let utils = require('src/utils');
@@ -16,7 +17,8 @@ const {
     BIDDER_DONE,
     BID_WON,
     BID_TIMEOUT,
-    SET_TARGETING
+    SET_TARGETING,
+    AD_RENDER_FAILED
   },
   STATUS: {
     GOOD
@@ -27,12 +29,19 @@ const BID1 = {
   width: 980,
   height: 240,
   cpm: 1.1,
+  originalCpm: 12.0,
+  currency: 'USD',
+  originalCurrency: 'FOO',
   timeToRespond: 200,
   bidId: '2ecff0db240757',
   requestId: '2ecff0db240757',
   adId: '2ecff0db240757',
   auctionId: '25c6d7f5-699a-4bfc-87c9-996f915341fa',
   mediaType: 'banner',
+  meta: {
+    data: 'value1'
+  },
+  dealId: 'dealid',
   getStatusCode() {
     return CONSTANTS.STATUS.GOOD;
   }
@@ -42,10 +51,17 @@ const BID2 = Object.assign({}, BID1, {
   width: 300,
   height: 250,
   cpm: 2.2,
+  originalCpm: 23.0,
+  currency: 'USD',
+  originalCurrency: 'FOO',
   timeToRespond: 300,
   bidId: '3ecff0db240757',
   requestId: '3ecff0db240757',
   adId: '3ecff0db240757',
+  meta: {
+    data: 'value2'
+  },
+  dealId: undefined
 });
 
 const BID3 = {
@@ -115,67 +131,105 @@ const MOCK = {
       'bidId': '2ecff0db240757',
       'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
     }
+  ],
+  AD_RENDER_FAILED: [
+    {
+      'bidId': '2ecff0db240757',
+      'reason': CONSTANTS.AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
+      'message': 'message',
+      'bid': BID1
+    }
   ]
 };
 
 const ANALYTICS_MESSAGE = {
   publisherId: 'CC411485-42BC-4F92-8389-42C503EE38D7',
+  gdpr: [{}],
+  auctionIds: ['25c6d7f5-699a-4bfc-87c9-996f915341fa'],
   bidAdUnits: [
     {
       adUnit: 'panorama_d_1',
+      adUnitId: 'adunitid',
       timeStamp: 1519149562216
     },
     {
       adUnit: 'box_d_1',
+      adUnitId: 'adunitid',
       timeStamp: 1519149562216
     }
   ],
   requests: [
     {
       adUnit: 'panorama_d_1',
+      adUnitId: 'adunitid',
       bidder: 'livewrapped',
-      timeStamp: 1519149562216
+      timeStamp: 1519149562216,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       adUnit: 'box_d_1',
+      adUnitId: 'adunitid',
       bidder: 'livewrapped',
-      timeStamp: 1519149562216
+      timeStamp: 1519149562216,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       adUnit: 'box_d_2',
+      adUnitId: 'adunitid',
       bidder: 'livewrapped',
-      timeStamp: 1519149562216
+      timeStamp: 1519149562216,
+      gdpr: 0,
+      auctionId: 0
     }
   ],
   responses: [
     {
       timeStamp: 1519149562216,
       adUnit: 'panorama_d_1',
+      adUnitId: 'adunitid',
       bidder: 'livewrapped',
       width: 980,
       height: 240,
       cpm: 1.1,
+      orgCpm: 120,
       ttr: 200,
       IsBid: true,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0,
+      meta: {
+        data: 'value1'
+      }
     },
     {
       timeStamp: 1519149562216,
       adUnit: 'box_d_1',
+      adUnitId: 'adunitid',
       bidder: 'livewrapped',
       width: 300,
       height: 250,
       cpm: 2.2,
+      orgCpm: 230,
       ttr: 300,
       IsBid: true,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0,
+      meta: {
+        data: 'value2'
+      }
     },
     {
       timeStamp: 1519149562216,
       adUnit: 'box_d_2',
+      adUnitId: 'adunitid',
       bidder: 'livewrapped',
       ttr: 200,
-      IsBid: false
+      IsBid: false,
+      gdpr: 0,
+      auctionId: 0
     }
   ],
   timeouts: [],
@@ -183,21 +237,47 @@ const ANALYTICS_MESSAGE = {
     {
       timeStamp: 1519149562216,
       adUnit: 'panorama_d_1',
+      adUnitId: 'adunitid',
       bidder: 'livewrapped',
       width: 980,
       height: 240,
       cpm: 1.1,
-      mediaType: 1
+      orgCpm: 120,
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0,
+      meta: {
+        data: 'value1'
+      },
+      dealId: 'dealid'
     },
     {
       timeStamp: 1519149562216,
       adUnit: 'box_d_1',
+      adUnitId: 'adunitid',
       bidder: 'livewrapped',
       width: 300,
       height: 250,
       cpm: 2.2,
-      mediaType: 1
+      orgCpm: 230,
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0,
+      meta: {
+        data: 'value2'
+      }
     }
+  ],
+  rf: [
+    {
+      timeStamp: 1519149562216,
+      adUnit: 'panorama_d_1',
+      adUnitId: 'adunitid',
+      bidder: 'livewrapped',
+      auctionId: 0,
+      rsn: CONSTANTS.AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
+      msg: 'message'
+    },
   ]
 };
 
@@ -211,6 +291,7 @@ function performStandardAuction() {
   events.emit(SET_TARGETING, MOCK.SET_TARGETING);
   events.emit(BID_WON, MOCK.BID_WON[0]);
   events.emit(BID_WON, MOCK.BID_WON[1]);
+  events.emit(AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED[0]);
 }
 
 describe('Livewrapped analytics adapter', function () {
@@ -220,10 +301,24 @@ describe('Livewrapped analytics adapter', function () {
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
 
+    let element = {
+      getAttribute: function() {
+        return 'adunitid';
+      }
+    }
     sandbox.stub(events, 'getEvents').returns([]);
     sandbox.stub(utils, 'timestamp').returns(1519149562416);
+    sandbox.stub(document, 'getElementById').returns(element);
 
     clock = sandbox.useFakeTimers(1519767013781);
+    setConfig({
+      adServerCurrency: 'USD',
+      rates: {
+        USD: {
+          FOO: 0.1
+        }
+      }
+    });
   });
 
   afterEach(function () {
@@ -266,7 +361,7 @@ describe('Livewrapped analytics adapter', function () {
       expect(message).to.deep.equal(ANALYTICS_MESSAGE);
     });
 
-    it('should send batched message without BID_WON if necessary and further BID_WON events individually', function () {
+    it('should send batched message without BID_WON AND AD_RENDER_FAILED if necessary and further BID_WON and AD_RENDER_FAILED events individually', function () {
       events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
       events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
       events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
@@ -279,8 +374,9 @@ describe('Livewrapped analytics adapter', function () {
       clock.tick(BID_WON_TIMEOUT + 1000);
 
       events.emit(BID_WON, MOCK.BID_WON[1]);
+      events.emit(AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED[0]);
 
-      expect(server.requests.length).to.equal(2);
+      expect(server.requests.length).to.equal(3);
 
       let message = JSON.parse(server.requests[0].requestBody);
       expect(message.wins.length).to.equal(1);
@@ -290,6 +386,10 @@ describe('Livewrapped analytics adapter', function () {
       message = JSON.parse(server.requests[1].requestBody);
       expect(message.wins.length).to.equal(1);
       expect(message.wins[0]).to.deep.equal(ANALYTICS_MESSAGE.wins[1]);
+
+      message = JSON.parse(server.requests[2].requestBody);
+      expect(message.rf.length).to.equal(1);
+      expect(message.rf[0]).to.deep.equal(ANALYTICS_MESSAGE.rf[0]);
     });
 
     it('should properly mark bids as timed out', function () {
@@ -321,6 +421,180 @@ describe('Livewrapped analytics adapter', function () {
 
       expect(message.rcv).to.equal(true);
     });
+
+    it('should forward GDPR data', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, {
+        'bidder': 'livewrapped',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'panorama_d_1',
+            'bidId': '2ecff0db240757',
+          },
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'box_d_1',
+            'bidId': '3ecff0db240757',
+          }
+        ],
+        'start': 1519149562216,
+        'gdprConsent': {
+          'gdprApplies': true,
+          'consentString': 'consentstring'
+        }
+      },
+      );
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      clock.tick(BID_WON_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      expect(message.gdpr.length).to.equal(1);
+      expect(message.gdpr[0].gdprApplies).to.equal(true);
+      expect(message.gdpr[0].gdprConsent).to.equal('consentstring');
+      expect(message.requests.length).to.equal(2);
+      expect(message.requests[0].gdpr).to.equal(0);
+      expect(message.requests[1].gdpr).to.equal(0);
+
+      expect(message.responses.length).to.equal(1);
+      expect(message.responses[0].gdpr).to.equal(0);
+
+      expect(message.wins.length).to.equal(1);
+      expect(message.wins[0].gdpr).to.equal(0);
+    });
+
+    it('should forward floor data', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, {
+        'bidder': 'livewrapped',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'panorama_d_1',
+            'bidId': '2ecff0db240757'
+          }
+        ],
+        'start': 1519149562216
+      });
+
+      events.emit(BID_RESPONSE, Object.assign({},
+        MOCK.BID_RESPONSE[0],
+        {
+          'floorData': {
+            'floorValue': 1.1,
+            'floorCurrency': 'FOO'
+          }
+        }));
+      events.emit(BID_WON, Object.assign({},
+        MOCK.BID_WON[0],
+        {
+          'floorData': {
+            'floorValue': 1.1,
+            'floorCurrency': 'FOO'
+          }
+        }));
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      clock.tick(BID_WON_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      expect(message.gdpr.length).to.equal(1);
+
+      expect(message.responses.length).to.equal(1);
+      expect(message.responses[0].floor).to.equal(1.1);
+      expect(message.responses[0].floorCur).to.equal('FOO');
+
+      expect(message.wins.length).to.equal(1);
+      expect(message.wins[0].floor).to.equal(1.1);
+      expect(message.wins[0].floorCur).to.equal('FOO');
+    });
+
+    it('should forward Livewrapped floor data', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, {
+        'bidder': 'livewrapped',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'panorama_d_1',
+            'bidId': '2ecff0db240757',
+            'lwflr': {
+              'flr': 1.1
+            }
+          },
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'box_d_1',
+            'bidId': '3ecff0db240757',
+            'lwflr': {
+              'flr': 1.1,
+              'bflrs': {'livewrapped': 2.2}
+            }
+          }
+        ],
+        'start': 1519149562216
+      });
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      clock.tick(BID_WON_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      expect(message.gdpr.length).to.equal(1);
+
+      expect(message.responses.length).to.equal(2);
+      expect(message.responses[0].floor).to.equal(1.1);
+      expect(message.responses[1].floor).to.equal(2.2);
+
+      expect(message.wins.length).to.equal(2);
+      expect(message.wins[0].floor).to.equal(1.1);
+      expect(message.wins[1].floor).to.equal(2.2);
+    });
+
+    it('should forward runner-up data as given by Livewrapped wrapper', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_WON, Object.assign({},
+        MOCK.BID_WON[0],
+        {
+          'rUp': 'rUpObject'
+        }));
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      clock.tick(BID_WON_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      expect(message.wins.length).to.equal(1);
+      expect(message.wins[0].rUp).to.equal('rUpObject');
+    });
   });
 
   describe('when given other endpoint', function () {
diff --git a/test/spec/modules/livewrappedBidAdapter_spec.js b/test/spec/modules/livewrappedBidAdapter_spec.js
index fb676f75343..a4fee5e3b26 100644
--- a/test/spec/modules/livewrappedBidAdapter_spec.js
+++ b/test/spec/modules/livewrappedBidAdapter_spec.js
@@ -2,7 +2,7 @@ import {expect} from 'chai';
 import {spec, storage} from 'modules/livewrappedBidAdapter.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
-import { BANNER, NATIVE } from 'src/mediaTypes.js';
+import { NATIVE, VIDEO } from 'src/mediaTypes.js';
 
 describe('Livewrapped adapter tests', function () {
   let sandbox,
@@ -102,7 +102,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -139,7 +139,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -177,7 +177,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -208,7 +208,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -238,7 +238,7 @@ describe('Livewrapped adapter tests', function () {
       let expectedQuery = {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -270,7 +270,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         deviceId: 'deviceid',
@@ -303,7 +303,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         tid: 'tracking id',
@@ -335,7 +335,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -366,7 +366,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -397,7 +397,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -428,7 +428,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -445,6 +445,37 @@ describe('Livewrapped adapter tests', function () {
       expect(data).to.deep.equal(expectedQuery);
     });
 
+    it('should make a well-formed single request object with video only parameters', function() {
+      sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
+      sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
+      let testbidRequest = clone(bidderRequest);
+      delete testbidRequest.bids[0].params.userId;
+      delete testbidRequest.bids[0].params.seats;
+      delete testbidRequest.bids[0].params.adUnitId;
+      testbidRequest.bids[0].mediaTypes = {'video': {'videodata': 'content parsed serverside only'}};
+      let result = spec.buildRequests(testbidRequest.bids, testbidRequest);
+      let data = JSON.parse(result.data);
+
+      let expectedQuery = {
+        auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
+        publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
+        url: 'https://www.domain.com',
+        version: '1.4',
+        width: 100,
+        height: 100,
+        cookieSupport: true,
+        adRequests: [{
+          callerAdUnitId: 'panorama_d_1',
+          bidId: '2ffb201a808da7',
+          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          formats: [{width: 980, height: 240}, {width: 980, height: 120}],
+          video: {'videodata': 'content parsed serverside only'}
+        }]
+      };
+
+      expect(data).to.deep.equal(expectedQuery);
+    });
+
     it('should use app objects', function() {
       sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
       sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
@@ -474,7 +505,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://appdomain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 300,
         height: 200,
         ifa: 'ifa',
@@ -507,7 +538,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -541,7 +572,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -577,7 +608,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -594,6 +625,79 @@ describe('Livewrapped adapter tests', function () {
       expect(data).to.deep.equal(expectedQuery);
     });
 
+    it('should pass us privacy parameter', function() {
+      sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
+      sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
+      let testRequest = clone(bidderRequest);
+      testRequest.uspConsent = '1---';
+      let result = spec.buildRequests(testRequest.bids, testRequest);
+      let data = JSON.parse(result.data);
+
+      expect(result.url).to.equal('https://lwadm.com/ad');
+
+      let expectedQuery = {
+        auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
+        publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
+        userId: 'user id',
+        url: 'https://www.domain.com',
+        seats: {'dsp': ['seat 1']},
+        version: '1.4',
+        width: 100,
+        height: 100,
+        cookieSupport: true,
+        usPrivacy: '1---',
+        adRequests: [{
+          adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
+          callerAdUnitId: 'panorama_d_1',
+          bidId: '2ffb201a808da7',
+          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          formats: [{width: 980, height: 240}, {width: 980, height: 120}]
+        }]
+      };
+
+      expect(data).to.deep.equal(expectedQuery);
+    });
+
+    it('should pass coppa parameter', function() {
+      sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
+      sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
+
+      let origGetConfig = config.getConfig;
+      sandbox.stub(config, 'getConfig').callsFake(function (key) {
+        if (key === 'coppa') {
+          return true;
+        }
+        return origGetConfig.apply(config, arguments);
+      });
+
+      let result = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      let data = JSON.parse(result.data);
+
+      expect(result.url).to.equal('https://lwadm.com/ad');
+
+      let expectedQuery = {
+        auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
+        publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
+        userId: 'user id',
+        url: 'https://www.domain.com',
+        seats: {'dsp': ['seat 1']},
+        version: '1.4',
+        width: 100,
+        height: 100,
+        cookieSupport: true,
+        coppa: true,
+        adRequests: [{
+          adUnitId: '9E153CED-61BC-479E-98DF-24DC0D01BA37',
+          callerAdUnitId: 'panorama_d_1',
+          bidId: '2ffb201a808da7',
+          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          formats: [{width: 980, height: 240}, {width: 980, height: 120}]
+        }]
+      };
+
+      expect(data).to.deep.equal(expectedQuery);
+    });
+
     it('should pass no cookie support', function() {
       sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => false);
       sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
@@ -608,7 +712,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: false,
@@ -638,7 +742,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: false,
@@ -654,9 +758,9 @@ describe('Livewrapped adapter tests', function () {
       expect(data).to.deep.equal(expectedQuery);
     });
 
-    it('should use params.url, then config pageUrl, then bidderRequest.refererInfo.referer', function() {
+    it('should use params.url, then bidderRequest.refererInfo.page', function() {
       let testRequest = clone(bidderRequest);
-      testRequest.refererInfo = {referer: 'https://www.topurl.com'};
+      testRequest.refererInfo = {page: 'https://www.topurl.com'};
 
       let result = spec.buildRequests(testRequest.bids, testRequest);
       let data = JSON.parse(result.data);
@@ -669,19 +773,6 @@ describe('Livewrapped adapter tests', function () {
       data = JSON.parse(result.data);
 
       expect(data.url).to.equal('https://www.topurl.com');
-
-      let origGetConfig = config.getConfig;
-      sandbox.stub(config, 'getConfig').callsFake(function (key) {
-        if (key === 'pageUrl') {
-          return 'https://www.configurl.com';
-        }
-        return origGetConfig.apply(config, arguments);
-      });
-
-      result = spec.buildRequests(testRequest.bids, testRequest);
-      data = JSON.parse(result.data);
-
-      expect(data.url).to.equal('https://www.configurl.com');
     });
 
     it('should make use of pubcid if available', function() {
@@ -701,7 +792,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'pubcid 123',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -733,7 +824,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -750,42 +841,61 @@ describe('Livewrapped adapter tests', function () {
     });
   });
 
-  it('should make use of Id5-Id if available', function() {
+  it('should make use of user ids if available', function() {
     sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
     sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
     let testbidRequest = clone(bidderRequest);
     delete testbidRequest.bids[0].params.userId;
-    testbidRequest.bids[0].userId = {};
-    testbidRequest.bids[0].userId.id5id = 'id5-user-id';
+    testbidRequest.bids[0].userIdAsEids = [
+      {
+        'source': 'id5-sync.com',
+        'uids': [{
+          'id': 'ID5-id',
+          'atype': 1,
+          'ext': {
+            'linkType': 2
+          }
+        }]
+      },
+      {
+        'source': 'pubcid.org',
+        'uids': [{
+          'id': 'publisher-common-id',
+          'atype': 1
+        }]
+      }
+    ];
+
     let result = spec.buildRequests(testbidRequest.bids, testbidRequest);
     let data = JSON.parse(result.data);
 
-    expect(data.rtbData.user.ext.eids).to.deep.equal([{
-      'source': 'id5-sync.com',
-      'uids': [{
-        'id': 'id5-user-id',
-        'atype': 1
-      }]
-    }]);
+    expect(data.rtbData.user.ext.eids).to.deep.equal(testbidRequest.bids[0].userIdAsEids);
   });
 
-  it('should make use of publisher common Id if available', function() {
+  it('should merge user ids with existing ortb2', function() {
     sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
     sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
-    let testbidRequest = clone(bidderRequest);
+
+    const ortb2 = {user: {ext: {prop: 'value'}}};
+
+    let testbidRequest = {...clone(bidderRequest), ortb2};
     delete testbidRequest.bids[0].params.userId;
-    testbidRequest.bids[0].userId = {};
-    testbidRequest.bids[0].userId.pubcid = 'publisher-common-id';
+    testbidRequest.bids[0].userIdAsEids = [
+      {
+        'source': 'pubcid.org',
+        'uids': [{
+          'id': 'publisher-common-id',
+          'atype': 1
+        }]
+      }
+    ];
+
     let result = spec.buildRequests(testbidRequest.bids, testbidRequest);
     let data = JSON.parse(result.data);
+    var expected = {user: {ext: {prop: 'value', eids: testbidRequest.bids[0].userIdAsEids}}}
 
-    expect(data.rtbData.user.ext.eids).to.deep.equal([{
-      'source': 'pubcommon',
-      'uids': [{
-        'id': 'publisher-common-id',
-        'atype': 1
-      }]
-    }]);
+    expect(data.rtbData).to.deep.equal(expected);
+    expect(ortb2).to.deep.equal({user: {ext: {prop: 'value'}}});
   });
 
   it('should send schain object if available', function() {
@@ -895,6 +1005,48 @@ describe('Livewrapped adapter tests', function () {
       expect(bids).to.deep.equal(expectedResponse);
     })
 
+    it('should handle single video success response', function() {
+      let lwResponse = {
+        ads: [
+          {
+            id: '28e5ddf4-3c01-11e8-86a7-0a44794250d4',
+            callerId: 'site_outsider_0',
+            tag: 'VAST XML',
+            video: {},
+            width: 300,
+            height: 250,
+            cpmBid: 2.565917,
+            bidId: '32e50fad901ae89',
+            auctionId: '13e674db-d4d8-4e19-9d28-ff38177db8bf',
+            creativeId: '52cbd598-2715-4c43-a06f-229fc170f945:427077',
+            ttl: 120,
+            meta: undefined
+          }
+        ],
+        currency: 'USD'
+      };
+
+      let expectedResponse = [{
+        requestId: '32e50fad901ae89',
+        bidderCode: 'livewrapped',
+        cpm: 2.565917,
+        width: 300,
+        height: 250,
+        ad: 'VAST XML',
+        ttl: 120,
+        creativeId: '52cbd598-2715-4c43-a06f-229fc170f945:427077',
+        netRevenue: true,
+        currency: 'USD',
+        meta: undefined,
+        vastXml: 'VAST XML',
+        mediaType: VIDEO
+      }];
+
+      let bids = spec.interpretResponse({body: lwResponse});
+
+      expect(bids).to.deep.equal(expectedResponse);
+    })
+
     it('should handle multiple success response', function() {
       let lwResponse = {
         ads: [
diff --git a/test/spec/modules/lkqdBidAdapter_spec.js b/test/spec/modules/lkqdBidAdapter_spec.js
index f10d936a28b..7fee9bf6e41 100644
--- a/test/spec/modules/lkqdBidAdapter_spec.js
+++ b/test/spec/modules/lkqdBidAdapter_spec.js
@@ -1,29 +1,44 @@
 import { spec } from 'modules/lkqdBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-const { expect } = require('chai');
+import { config } from 'src/config.js';
+import { expect } from 'chai';
 
-describe('LKQD Bid Adapter Test', () => {
-  const adapter = newBidder(spec);
+describe('lkqdBidAdapter', () => {
+  const BIDDER_CODE = 'lkqd';
+  const SITE_ID = '662921';
+  const PUBLISHER_ID = '263';
+  const END_POINT = new URL('https://rtb.lkqd.net/ad');
+  const ADAPTER = newBidder(spec);
 
-  describe('inherited functions', () => {
+  let sandbox;
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox();
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  context('inherited functions', () => {
     it('exists and is a function', () => {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
+      expect(ADAPTER.callBids).to.exist.and.to.be.a('function');
     });
   });
 
-  describe('isBidRequestValid', () => {
-    let bid = {
-      'bidder': 'lkqd',
-      'params': {
-        'siteId': '662921',
-        'placementId': '263'
+  context('isBidRequestValid', () => {
+    const bid = {
+      bidder: BIDDER_CODE,
+      params: {
+        'siteId': SITE_ID,
+        'placementId': PUBLISHER_ID
       },
-      'adUnitCode': 'video1',
-      'sizes': [[300, 250], [640, 480]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'requestId': 'a09c66c3-53e3-4428-b296-38fc08e7cd2a',
-      'transactionId': 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
+      adUnitCode: 'video1',
+      sizes: [[300, 250], [640, 480]],
+      bidId: '30b31c1838de1e',
+      bidderRequestId: '22edbae2733bf6',
+      requestId: 'a09c66c3-53e3-4428-b296-38fc08e7cd2a',
+      transactionId: 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
     };
 
     it('should return true when required params found', () => {
@@ -40,16 +55,17 @@ describe('LKQD Bid Adapter Test', () => {
     });
   });
 
-  describe('buildRequests', () => {
-    const ENDPOINT = 'https://v.lkqd.net/ad';
-    let bidRequests = [
+  context('buildRequests', () => {
+    const bidRequests = [
       {
-        'bidder': 'lkqd',
+        'bidder': BIDDER_CODE,
         'params': {
-          'siteId': '662921',
-          'placementId': '263'
+          'siteId': SITE_ID,
+          'placementId': PUBLISHER_ID,
+          'c1': 'newWindow',
+          'c20': 'lkqdCustom'
         },
-        'adUnitCode': 'lkqd',
+        'adUnitCode': BIDDER_CODE,
         'sizes': [[300, 250], [640, 480]],
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
@@ -57,15 +73,15 @@ describe('LKQD Bid Adapter Test', () => {
         'transactionId': 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
       }
     ];
-    let bidRequest = [
+    const bidRequest = [
       {
-        'bidder': 'lkqd',
+        'bidder': BIDDER_CODE,
         'params': {
-          'siteId': '662921',
-          'placementId': '263',
+          'siteId': SITE_ID,
+          'placementId': PUBLISHER_ID,
           'schain': '1.0,1!exchange1.com,1234%21abcd,1,bid-request-1,publisher%2c%20Inc.,publisher.com'
         },
-        'adUnitCode': 'lkqd',
+        'adUnitCode': BIDDER_CODE,
         'sizes': [640, 480],
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
@@ -74,261 +90,216 @@ describe('LKQD Bid Adapter Test', () => {
       }
     ];
 
-    it('should populate available parameters', () => {
-      const requests = spec.buildRequests(bidRequests);
-      expect(requests.length).to.equal(2);
-      const r1 = requests[0].data;
-      expect(r1).to.have.string('pid=263&');
-      expect(r1).to.have.string('&sid=662921&');
-      expect(r1).to.have.string('&width=300&');
-      expect(r1).to.have.string('&height=250&');
-      const r2 = requests[1].data;
-      expect(r2).to.have.string('pid=263&');
-      expect(r2).to.have.string('&sid=662921&');
-      expect(r2).to.have.string('&width=640&');
-      expect(r2).to.have.string('&height=480&');
+    it('should have correct url params, method', () => {
+      const requests = spec.buildRequests(bidRequests, {});
+      expect(requests[0].method).to.eq('POST');
+
+      const url1 = new URL(requests[0].url);
+      expect(url1.origin).to.eq(END_POINT.origin);
+
+      const params1 = new URLSearchParams(url1.search);
+      const object1 = Object.fromEntries(params1.entries());
+      expect(object1.pid).to.eq(PUBLISHER_ID);
+      expect(object1.sid).to.eq(SITE_ID);
+      expect(object1.output).to.eq('rtb');
+      expect(object1.prebid).to.eq('true');
+    });
+
+    it('should populate height, width, c1, c20, coppa with 2 imp', () => {
+      sandbox.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+
+      const requests = spec.buildRequests(bidRequests, {});
+      expect(requests.length).to.equal(1);
+
+      const serverRequestObject = requests[0];
+      expect(serverRequestObject.data.imp.length).to.equal(2);
+      expect(serverRequestObject.data.regs.coppa).to.be.a('number');
+      expect(serverRequestObject.data.regs.coppa).to.eq(1);
+
+      const imp1 = serverRequestObject.data.imp[0];
+      expect(imp1.video.w).to.be.a('number');
+      expect(imp1.video.w).to.eq(300);
+      expect(imp1.video.h).to.be.a('number');
+      expect(imp1.video.h).to.eq(250);
+      expect(imp1.video.ext.lkqdcustomparameters.c1).to.be.a('string');
+      expect(imp1.video.ext.lkqdcustomparameters.c1).to.eq('newWindow');
+      expect(imp1.video.ext.lkqdcustomparameters.c20).to.be.a('string');
+      expect(imp1.video.ext.lkqdcustomparameters.c20).to.eq('lkqdCustom');
+
+      const imp2 = serverRequestObject.data.imp[1];
+      expect(imp2.video.w).to.be.a('number');
+      expect(imp2.video.w).to.eq(640);
+      expect(imp2.video.h).to.be.a('number');
+      expect(imp2.video.h).to.eq(480);
+      expect(imp2.video.ext.lkqdcustomparameters.c1).to.be.a('string');
+      expect(imp2.video.ext.lkqdcustomparameters.c1).to.eq('newWindow');
+      expect(imp2.video.ext.lkqdcustomparameters.c20).to.be.a('string');
+      expect(imp2.video.ext.lkqdcustomparameters.c20).to.eq('lkqdCustom');
     });
 
     it('should not populate unspecified parameters', () => {
       const requests = spec.buildRequests(bidRequests);
-      expect(requests.length).to.equal(2);
-      const r1 = requests[0].data;
-      expect(r1).to.not.have.string('&dnt=');
-      expect(r1).to.not.have.string('&contentid=');
-      expect(r1).to.not.have.string('&contenttitle=');
-      expect(r1).to.not.have.string('&contentlength=');
-      expect(r1).to.not.have.string('&contenturl=');
-      expect(r1).to.not.have.string('&schain=');
-      const r2 = requests[1].data;
-      expect(r2).to.not.have.string('&dnt=');
-      expect(r2).to.not.have.string('&contentid=');
-      expect(r2).to.not.have.string('&contenttitle=');
-      expect(r2).to.not.have.string('&contentlength=');
-      expect(r2).to.not.have.string('&contenturl=');
-      expect(r2).to.not.have.string('&schain=');
+
+      const serverRequestObject = requests[0];
+      expect(serverRequestObject.data.device.dnt).to.be.a('undefined');
+      expect(serverRequestObject.data.content).to.be.a('undefined');
+      expect(serverRequestObject.data.regs.coppa).to.be.a('undefined');
+      expect(serverRequestObject.data.source).to.be.a('undefined');
+
+      const imp1 = serverRequestObject.data.imp[0];
+      expect(imp1.video.ext.lkqdcustomparameters.c10).to.be.a('undefined');
+
+      const imp2 = serverRequestObject.data.imp[1];
+      expect(imp2.video.ext.lkqdcustomparameters.c39).to.be.a('undefined');
     });
 
     it('should handle single size request', () => {
-      const requests = spec.buildRequests(bidRequest);
-      expect(requests.length).to.equal(1);
-      const r1 = requests[0].data;
-      expect(r1).to.have.string('pid=263&');
-      expect(r1).to.have.string('&sid=662921&');
-      expect(r1).to.have.string('&width=640&');
-      expect(r1).to.have.string('&height=480&');
-      expect(r1).to.have.string('&schain=1.0,1!exchange1.com,1234%21abcd,1,bid-request-1,publisher%2c%20Inc.,publisher.com&');
-    });
+      const requests = spec.buildRequests(bidRequest, {});
+      const serverRequestObject = requests[0];
+      expect(serverRequestObject.data.imp.length).to.equal(1);
+      expect(serverRequestObject.data.source).to.not.be.a('undefined');
+      expect(serverRequestObject.data.source.ext).to.not.be.a('undefined');
+      expect(serverRequestObject.data.source.ext.schain).to.not.be.a('undefined');
 
-    it('sends bid request to ENDPOINT via GET', () => {
-      const requests = spec.buildRequests(bidRequests);
-      expect(requests.length).to.equal(2);
-      const r1 = requests[0];
-      expect(r1.url).to.contain(ENDPOINT);
-      expect(r1.method).to.equal('GET');
-      const r2 = requests[1]
-      expect(r2.url).to.contain(ENDPOINT);
-      expect(r2.method).to.equal('GET');
+      const imp1 = serverRequestObject.data.imp[0];
+      expect(imp1.video.w).to.be.a('number');
+      expect(imp1.video.w).to.eq(640);
+      expect(imp1.video.h).to.be.a('number');
+      expect(imp1.video.h).to.eq(480);
+
+      const schain = serverRequestObject.data.source.ext.schain;
+      expect(schain.validation).to.have.string('strict');
+      expect(schain.config.ver).to.have.string('1.0');
+      expect(schain.config.complete).to.eq(1);
+      expect(schain.config.nodes[0].asi).to.have.string('exchange1.com');
+      expect(schain.config.nodes[0].sid).to.have.string('1234!abcd');
+      expect(schain.config.nodes[0].hp).to.eq(1);
+      expect(schain.config.nodes[0].rid).to.have.string('bid-request-1');
+      expect(schain.config.nodes[0].name).to.have.string('publisher, Inc.');
+      expect(schain.config.nodes[0].domain).to.have.string('publisher.com');
     });
   });
 
-  describe('interpretResponse', () => {
-    let bidRequest = {
-      'url': 'https://ssp.lkqd.net/ad?pid=263&sid=662921&output=vast&execution=any&placement=&playinit=auto&volume=100&timeout=&width=300%E2%80%8C&height=250&pbt=[PREBID_TOKEN]%E2%80%8C&dnt=[DO_NOT_TRACK]%E2%80%8C&pageurl=[PAGEURL]%E2%80%8C&contentid=[CONTENT_ID]%E2%80%8C&contenttitle=[CONTENT_TITLE]%E2%80%8C&contentlength=[CONTENT_LENGTH]%E2%80%8C&contenturl=[CONTENT_URL]&prebid=true%E2%80%8C&rnd=874313435?bidId=253dcb69fb2577&bidWidth=300&bidHeight=250&',
-      'data': 'pid=263&sid=662921&prebid=true&output=vast&execution=any&support=html5&playinit=auto&volume=100&width=640&height=480&rnd=89811791&bidId=20d2f9095ba4e3&bidWidth=640&bidHeight=480&'
+  context('interpretResponse', () => {
+    const bidRequest = {
+      'method': 'POST',
+      'url': `https://rtb.lkqd.net/ad?pid=${PUBLISHER_ID}&sid=${SITE_ID}&output=rtb&prebid=true`,
+      'id': '5511262729333416592',
+      'imp': [{
+        'id': '5511262729333416592',
+        'displaymanager': 'LKQD SDK',
+        'video': {
+          'mimes': ['application/x-mpegURL', 'video/mp4', 'video/H264'],
+          'protocols': [1, 2, 3, 4, 5, 6, 7, 8],
+          'w': 1920,
+          'h': 1080,
+          'startdelay': 0,
+          'placement': 1,
+          'playbackmethod': [1],
+          'ext': {
+            'lkqdcustomparameters': {
+              'custom1': 'cus1',
+              'custom4': 'cus4',
+              'custom7': 'cus7'
+            }
+          }
+        },
+        'bidfloorcur': 'USD',
+        'secure': 1
+      }],
+      'app': {
+        'id': '1112444-5742940365329809425',
+        'name': 'lkqdappfortesting',
+        'bundle': 'com.lkqdbundleid.fortesting',
+        'content': {
+          'id': '123456',
+          'title': 'MyLkqdContent',
+          'url': 'https://lkqd.com',
+          'len': 600
+        }
+      },
+      'device': {
+        'ua': 'Mozilla/5.0 (SMART-TV; Linux; Tizen 4.0) AppleWebKit/538.1 (KHTML, like Gecko) Version/4.0 TV Safari/538.1',
+        'geo': {
+          'utcoffset': -420,
+        },
+        'dnt': 0,
+        'ifa': 'f4254ada-4174-6cfd-83c7-2f999c457c1d'
+      },
+      'user': {
+        'ext': {}
+      },
+      'test': 0,
+      'at': 2,
+      'tmax': 100,
+      'cur': ['USD'],
+      'source': {
+        'ext': {
+          'schain': {
+            'ver': '1.0',
+            'complete': 0,
+            'nodes': [{
+              'asi': 'lkqd.net',
+              'sid': '604',
+              'hp': 1
+            }]
+          }
+        }
+      },
+      'regs': {
+        'coppa': 1,
+        'ext': {
+          'gdpr': 0,
+          'us_privacy': '1NNN'
+        }
+      }
+    };
+
+    const serverResponse = {
+      body: {
+        'id': '5511262729333416592',
+        'seatbid': [{
+          'bid': [{
+            'id': '281063413403658952',
+            'impid': '5511262729333416592',
+            'price': 5.409,
+            'adm': '<?xml version="1.0" ?><VAST version="3.0"><Ad id="1030666"><InLine><AdSystem version="1.2">LKQD</AdSystem><AdTitle><![CDATA[In-Stream Video]]></AdTitle><Survey><![CDATA[https://pixel.adsafeprotected.com/jload?anId=6635&advId=2069924&campId=8080001&pubId=1035147&chanId=57858819&placementId=108204362&planId=281550531&adsafe_par&impId=2475219281617420376]]></Survey><Impression><![CDATA[https://sb.scorecardresearch.com/p?c1=19&c2=23229166&c3=platform&c12=240805ed2d34ef1d54be675bdf483c89393d7acc&ns_ap_pn=js&ns_ap_sv=2.1602.11&ns_type=hidden&ns_st_it=a&ns_st_sv=4.0.0&ns_st_ad=1&ns_st_sq=1&ns_st_id=1643240042&ns_st_ec=1&ns_st_cn=1&ns_st_ev=play&ns_st_ct=va&ns_st_cl=15000&ns_st_pt=0&ns_ap_device=&ns_ts=1643240042]]></Impression><Impression><![CDATA[https://t.lkqd.net/t?ev=3&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=6&sid=4973&spid=15&psid=1114710&ppid=320&lkqdtagtype=platform-connection&tlr=0&adid=1030666&asrc=38308&aoid=114070&dealid=985193&pbid=79&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&key=jdddddddd8&sc=dddihdmdd8&prcid=0&bp=ldddddddd8&rfp=jdddddddd8&segkey=&dur=15.0&cs=1719831200]]></Impression><Impression><![CDATA[https://t.lkqd.net/t?ev=3&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=320&sid=1114710&spid=54540&psid=&ppid=&lkqdtagtype=rtb&tlr=1&adid=98425&asrc=13785&aoid=75809&dealid=89211&pbid=4&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&c7=cus7&c1=cus1&c4=cus4&key=ihdmddddd8&sc=${AUCTION_PRICE}&prcid=0&bp=&rfp=&segkey=&dur=&cs=-221930846]]></Impression><Impression><![CDATA[http://googleads4.g.doubleclick.net/pagead/adview?ai=B6-UrK2BtU4bfEue6lAL59YCQCgAAAAAQASAAOABQ16C09ANYg7bLG2DJ5uOGyKOQGYIBCWNhLWdvb2dsZcgBBagDAeAEApoFGAiLlz8QyqLMMxjDvaCGASCDtssbKKSrftoFAggBoAY64Aakq34&sigh=xpLvymKV8ew&adurl=]]></Impression><Impression><![CDATA[http://d.agkn.com/pixel/2387/?ct=US&st=CA&city=13326&dma=195&zp=92614&bw=4&che=2267971988&col=8080001,1035147,108204362,281550531,57858819]]></Impression><Impression><![CDATA[http://test.com/?auctionId=281063413403658952&auctionBidId=12345&auctionImpId=281063413403658952&auctionSeatId=&auctionAdId=&auctionPrice=6.01&auctionCurrency=USD]]></Impression><Impression><![CDATA[https://s.adxyield.com/2/954655/analytics.gif?dt=9546551552428162383000&si=1114710&pi=320&cr=98425&cb=1311901165&di=&dm=1920x1080&c1=&c2=lkqdsappfortesting&c3=com.lkqdsbundleid.fortesting&c4=connected%20tv&c5=US&c6=tizen&ui=f4254ada-4174-6cfd-83c7-2f999c457c1d&ti=281063413403658952&r1=f4254ada-4174-6cfd-83c7-2f999c457c1d&r2=184.103.177.205&r3=${WODETECTIONID}&pv=&to=]]></Impression><Error><![CDATA[https://t.lkqd.net/t?ev=9&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=6&sid=4973&spid=15&psid=1114710&ppid=320&lkqdtagtype=platform-connection&tlr=0&adid=1030666&asrc=38308&aoid=114070&dealid=985193&pbid=79&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&dur=15.0&cs=1839662101]]></Error><Error><![CDATA[https://t.lkqd.net/t?ev=9&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=320&sid=1114710&spid=54540&psid=&ppid=&lkqdtagtype=rtb&tlr=1&adid=98425&asrc=13785&aoid=75809&dealid=89211&pbid=4&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&c7=cus7&c1=cus1&c4=cus4&dur=&cs=619373796]]></Error><Creatives><Creative id="lkqd-rtb-79-1030666"><Linear><Duration>00:00:15</Duration><TrackingEvents><Tracking event="firstQuartile"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=960584;]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://t.lkqd.net/t?ev=4&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=6&sid=4973&spid=15&psid=1114710&ppid=320&lkqdtagtype=platform-connection&tlr=0&adid=1030666&asrc=38308&aoid=114070&dealid=985193&pbid=79&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&dur=15.0&cs=1505347799]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://t.lkqd.net/t?ev=4&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=320&sid=1114710&spid=54540&psid=&ppid=&lkqdtagtype=rtb&tlr=1&adid=98425&asrc=13785&aoid=75809&dealid=89211&pbid=4&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&c7=cus7&c1=cus1&c4=cus4&dur=&cs=-2080286040]]></Tracking><Tracking event="pause"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=15;]]></Tracking><Tracking event="fullscreen"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=19;]]></Tracking><Tracking event="mute"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=16;]]></Tracking><Tracking event="unmute"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=149645;]]></Tracking><Tracking event="complete"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=13;]]></Tracking><Tracking event="complete"><![CDATA[https://t.lkqd.net/t?ev=7&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=6&sid=4973&spid=15&psid=1114710&ppid=320&lkqdtagtype=platform-connection&tlr=0&adid=1030666&asrc=38308&aoid=114070&dealid=985193&pbid=79&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&dur=15.0&cs=41549411]]></Tracking><Tracking event="complete"><![CDATA[https://t.lkqd.net/t?ev=7&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=320&sid=1114710&spid=54540&psid=&ppid=&lkqdtagtype=rtb&tlr=1&adid=98425&asrc=13785&aoid=75809&dealid=89211&pbid=4&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&c7=cus7&c1=cus1&c4=cus4&dur=&cs=-695766357]]></Tracking><Tracking event="thirdQuartile"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=960585;]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://t.lkqd.net/t?ev=6&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=6&sid=4973&spid=15&psid=1114710&ppid=320&lkqdtagtype=platform-connection&tlr=0&adid=1030666&asrc=38308&aoid=114070&dealid=985193&pbid=79&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&dur=15.0&cs=-2112426448]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://t.lkqd.net/t?ev=6&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=320&sid=1114710&spid=54540&psid=&ppid=&lkqdtagtype=rtb&tlr=1&adid=98425&asrc=13785&aoid=75809&dealid=89211&pbid=4&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&c7=cus7&c1=cus1&c4=cus4&dur=&cs=-419075414]]></Tracking><Tracking event="midpoint"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=18;]]></Tracking><Tracking event="midpoint"><![CDATA[https://t.lkqd.net/t?ev=5&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=6&sid=4973&spid=15&psid=1114710&ppid=320&lkqdtagtype=platform-connection&tlr=0&adid=1030666&asrc=38308&aoid=114070&dealid=985193&pbid=79&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&dur=15.0&cs=-640231292]]></Tracking><Tracking event="midpoint"><![CDATA[https://t.lkqd.net/t?ev=5&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=320&sid=1114710&spid=54540&psid=&ppid=&lkqdtagtype=rtb&tlr=1&adid=98425&asrc=13785&aoid=75809&dealid=89211&pbid=4&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&c7=cus7&c1=cus1&c4=cus4&dur=&cs=-1249688919]]></Tracking><Tracking event="start"><![CDATA[http://ad.doubleclick.net/activity;src=2069924;met=1;v=1;pid=108204362;aid=281550531;ko=0;cid=57858819;rid=57747926;rv=1;timestamp=2267971988;ecn1=1;etm1=0;eid1=11;]]></Tracking><Tracking event="start"><![CDATA[https://t.lkqd.net/t?ev=2&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=6&sid=4973&spid=15&psid=1114710&ppid=320&lkqdtagtype=platform-connection&tlr=0&adid=1030666&asrc=38308&aoid=114070&dealid=985193&pbid=79&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&dur=15.0&cs=-298211905]]></Tracking><Tracking event="start"><![CDATA[https://t.lkqd.net/t?ev=2&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=320&sid=1114710&spid=54540&psid=&ppid=&lkqdtagtype=rtb&tlr=1&adid=98425&asrc=13785&aoid=75809&dealid=89211&pbid=4&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&c7=cus7&c1=cus1&c4=cus4&dur=&cs=554502830]]></Tracking><Tracking event="start"><![CDATA[https://testPixel.lkqd.net?level=account]]></Tracking></TrackingEvents><VideoClicks><ClickThrough><![CDATA[http://d.agkn.com/pixel/2389/?che=2267971988&col=8080001,1035147,108204362,281550531,57858819&l0=http://thinkaboutyoureyes.com/?utm_source=N5371.288332.ACCUEN.COM&utm_medium=video&utm_campaign=8080001]]></ClickThrough><ClickTracking><![CDATA[https://t.lkqd.net/t?ev=8&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=6&sid=4973&spid=15&psid=1114710&ppid=320&lkqdtagtype=platform-connection&tlr=0&adid=1030666&asrc=38308&aoid=114070&dealid=985193&pbid=79&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&dur=15.0&cs=-305654714]]></ClickTracking><ClickTracking><![CDATA[https://t.lkqd.net/t?ev=8&tsid=1114710&env=4&cb=821620021026&format=0&did=11&osid=28&osv=4.0&adtype=video&pubtagtype=rtb&render=&apt=&uimp=281063413403658952&svrs=0.124&srvid=10.20.4.43&oip=184.103.177.205&hip=QalMfPQtFIsOv2mwg3B1hyMlXkZqTWFbjCevgob3-Fo&vrs=&tsl=&ear=&width=1920&height=1080&phost=&host=&thost=&appname=lkqdsappfortesting&idfa=f4254ada-4174-6cfd-83c7-2f999c457c1d&aid=f4254ada-4174-6cfd-83c7-2f999c457c1d&bundleid=com.lkqdsbundleid.fortesting&lsid=&loclat=&loclong=&contentid=123456&contenttitle=MylkqdContent&contentlength=600.0&contenturl=https%3A%2F%2Flkqd.com&appstoreurl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dlkqd.tv.plus.140&execution=&placement=&browserid=0&browserv=&adplayersize=&gdpr=0&trm=&csr=&pid=320&sid=1114710&spid=54540&psid=&ppid=&lkqdtagtype=rtb&tlr=1&adid=98425&asrc=13785&aoid=75809&dealid=89211&pbid=4&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=IAB8&c7=cus7&c1=cus1&c4=cus4&dur=&cs=359202021]]></ClickTracking><ClickTracking><![CDATA[http://adclick.g.doubleclick.net/aclk?sa=L&ai=B6-UrK2BtU4bfEue6lAL59YCQCgAAAAAQASAAOABQ16C09ANYg7bLG2DJ5uOGyKOQGYIBCWNhLWdvb2dsZcgBBagDAeAEApoFGAiLlz8QyqLMMxjDvaCGASCDtssbKKSrftoFAggBoAY64Aakq34&num=0&sig=AOD64_39RE7mD4okzbSR4BppsqcsWRqBHg&client=&adurl=]]></ClickTracking></VideoClicks><MediaFiles><MediaFile type="video/x-flv" delivery="progressive" width="426" height="240" bitrate="268" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/5/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633433/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/251A147CD4ABAECCEA161A0076B6E023EAF0B86F.A5693967D3A13B73BD8A8A0D66914D38A39C60DA/key/ck2/file/file.flv]]></MediaFile><MediaFile type="video/x-flv" delivery="progressive" width="640" height="360" bitrate="598" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/34/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633441/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/AEFA788E2BDA4EE3CCA312680BC77354DCB5E364.611D7B93D8DA65C6DDFA2A3EBDDC7446D68EB16E/key/ck2/file/file.flv]]></MediaFile><MediaFile type="video/x-flv" delivery="progressive" width="854" height="480" bitrate="957" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/35/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633448/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/95733EF286EA8739EB1C797136B351D1BE696848.1E9D19581A489C6F950EE46F4BFEE4A685ECCE50/key/ck2/file/file.flv]]></MediaFile><MediaFile type="video/3gpp" delivery="progressive" width="176" height="144" bitrate="56" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/17/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633419/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/BB76570CD855F1DE3AA608C21D480FCE013223F9.155A1E326665A207F980C98090F389A91E97C9A0/key/ck2/file/file.3gpp]]></MediaFile><MediaFile type="video/3gpp" delivery="progressive" width="320" height="180" bitrate="185" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/36/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633423/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/5809918D8EC632351D8634A9130C98FB3ED5D839.82037CACB6356F27FE7FAF15FBBB323F218854F5/key/ck2/file/file.3gpp]]></MediaFile><MediaFile type="video/mp4" delivery="progressive" width="640" height="360" bitrate="624" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/18/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633438/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/3E9CE9016B64E62F0926F228967EAAB8BF3CB959.51F9775683EB50E982438CAEEB9619F94094B758/key/ck2/file/file.mp4]]></MediaFile><MediaFile type="video/mp4" delivery="progressive" width="1200" height="800" bitrate="2332" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/22/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633479/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/9F0541D77C2BA7D20A487BB9B5C4E07817BB268E.21DEE7CAFBB72ABEE6071AFDB74D62B55844FE4B/key/ck2/file/file.mp4]]></MediaFile><MediaFile type="video/webm" delivery="progressive" width="640" height="360" bitrate="708" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/43/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633463/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/4CC1CC1997C7998BE4995619195354C4B0859EEB.43E8AD874A6CDE8C747788EFA00D79E031DA606F/key/ck2/file/file.webm]]></MediaFile><MediaFile type="video/webm" delivery="progressive" width="854" height="480" bitrate="1054" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/44/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633470/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/15A5F1E3BAB1358A8D4D11231EA6E7015ABF886D.5CCA7A23FED43A44E26B0AE6F865344F0ED6F02F/key/ck2/file/file.webm]]></MediaFile><MediaFile type="video/webm" delivery="progressive" width="1280" height="720" bitrate="2566" scalable="false" maintainAspectRatio="false"><![CDATA[http://gcdn.2mdn.net/videoplayback/id/6ad0b8020d1b0faf/itag/45/source/doubleclick_dmm/ratebypass/yes/ip/0.0.0.0/ipbits/0/expire/3542633480/sparams/id,itag,source,ratebypass,ip,ipbits,expire/signature/995DC316FCAEEABEDE178832C776B6D8071EEEDE.24692AD16EFC48A6ABAF744FA281CB6FC05A4AB5/key/ck2/file/file.webm]]></MediaFile></MediaFiles></Linear></Creative><Creative id="lkqd-rtb-79-1030666"><CompanionAds><Companion width="300" height="250"><StaticResource creativeType="image/jpeg"><![CDATA[http://s0.2mdn.net/viewad/2069924/1-Specific_Media_Companion_Banner_300x250.jpg]]></StaticResource><TrackingEvents><Tracking event="creativeView"><![CDATA[http://googleads4.g.doubleclick.net/pagead/adview?ai=BRpm8K2BtU4bfEue6lAL59YCQCgAAAAAQAiAAOABQ16C09ANYnK3LG2DJ5uOGyKOQGYIBCWNhLWdvb2dsZcgBAqgDAeAEApoFGAiLlz8QyqLMMxjDvaCGASCcrcsbKKSrftoFAggBoAYU4Aakq34&sigh=O_8MyWF9Eqw&adurl=]]></Tracking></TrackingEvents><CompanionClickThrough><![CDATA[http://adclick.g.doubleclick.net/aclk?sa=L&ai=BRpm8K2BtU4bfEue6lAL59YCQCgAAAAAQAiAAOABQ16C09ANYnK3LG2DJ5uOGyKOQGYIBCWNhLWdvb2dsZcgBAqgDAeAEApoFGAiLlz8QyqLMMxjDvaCGASCcrcsbKKSrftoFAggBoAYU4Aakq34&num=0&sig=AOD64_3mxlFjey90eqTalLRHC49IZUNfPg&client=&adurl=http://d.agkn.com/pixel/2389/%3Fche%3D2267971988%26col%3D8080001,1035147,108204362,281550531,57858819%26l0%3Dhttp://thinkaboutyoureyes.com/%3Futm_source%3DN5371.288332.ACCUEN.COM%26utm_medium%3Dvideo%26utm_campaign%3D8080001]]></CompanionClickThrough></Companion></CompanionAds></Creative></Creatives><Extensions><Extension><AuctionId><![CDATA[${AUCTION_ID}]]></AuctionId><AuctionBidId><![CDATA[${AUCTION_BID_ID}]]></AuctionBidId><AuctionImpId><![CDATA[${AUCTION_IMP_ID}]]></AuctionImpId><AuctionSeatId><![CDATA[${AUCTION_SEAT_ID}]]></AuctionSeatId><AuctionAdId><![CDATA[${AUCTION_AD_ID}]]></AuctionAdId><AuctionPrice><![CDATA[${AUCTION_PRICE}]]></AuctionPrice><AuctionCurrency><![CDATA[${AUCTION_CURRENCY}]]></AuctionCurrency></Extension><Extension type="dart"><AdServingData><DeliveryData><GeoData><![CDATA[ct=US&st=CA&city=13326&dma=195&zp=92614&bw=4]]></GeoData></DeliveryData></AdServingData></Extension></Extensions></InLine></Ad></VAST>',
+            'adomain': ['lkqd.com'],
+            'crid': 'lkqd-rtb-79-1030666',
+            'protocol': 3,
+            'w': 1920,
+            'h': 1080,
+            'ext': {
+              'imptrackers': []
+            }
+          }]
+        }],
+        'cur': 'USD'
+      }
     };
-    let serverResponse = {};
-    serverResponse.body = `<VAST version="2.0">
-<Ad id="677477">
-<InLine>
-<AdSystem version="1.2">LKQD</AdSystem>
-<AdTitle>
-<![CDATA[ Mobile Video QA ]]>
-</AdTitle>
-<Pricing model="CPM" currency="USD">2.87</Pricing>
-<Impression>
-<![CDATA[
-https://sb.scorecardresearch.com/p?C1=1&C2=23229166&C3=platform&C5=01&C7=
-]]>
-</Impression>
-<Impression>
-<![CDATA[
-https://sb.scorecardresearch.com/p?c1=2&c2=23229166&c3=platform&ns_ap_sv=2.1511.10&ns_type=hidden&ns_st_it=a&ns_st_sv=4.0.0&ns_st_ad=1&ns_st_sq=1&ns_st_id=1522437348&ns_st_ec=1&ns_st_cn=1&ns_st_ev=play&ns_st_ct=va&ns_st_cl=30000&ns_st_pt=0&ns_ts=1522437348
-]]>
-</Impression>
-<Impression>
-<![CDATA[
-https://t.lkqd.net/t?ev=3&tsid=662921&env=3&cb=761218674439&format=0&did=2&osid=6&osv=10.12.6&pubtagtype=vast&render=&apt=auto&uimp=93862023567791182&svrs=0.90&srvid=10.10.4.4&oip=208.59.120.2&vrs=&tsl=&ear=100&width=&height=250&phost=&host=&thost=&appname=&idfa=&aid=&bundleid=&lsid=&loclat=&loclong=&contentid=%5BCONTENT_ID%5D%E2%80%8C&contenttitle=%5BCONTENT_TITLE%5D%E2%80%8C&contentlength=&contenturl=&appstoreurl=&execution=any&placement=&browserid=1&browserv=65.0&adplayersize=small&pid=263&sid=662921&spid=44784&psid=&ppid=&lkqdtagtype=vast&tlr=1&adid=677477&asrc=33062&aoid=96110&dealid=654322&pbid=0&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=&key=hiddddddd8&sc=dddflkddd8&prcid=0&bp=&rfp=&segkey=&dur=30.0&cs=-1294926671
-]]>
-</Impression>
-<Impression>
-<![CDATA[ https//t.lkqd.net/t?ev=16&env=1&pid=2&sid=71 ]]>
-</Impression>
-<Impression>
-<![CDATA[
-https://test.com/?iamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatch&pageurl=&deviceid=&siteid=1374&cookie=8295056521223792901&cpm=4.5&avid=96110&plid=677477&publisherId=662921&siteId=662921&caid=654322&kv1=&kv2=
-]]>
-</Impression>
-<Error>
-<![CDATA[
-https://t.lkqd.net/t?ev=9&tsid=662921&env=3&cb=761218674439&format=0&did=2&osid=6&osv=10.12.6&pubtagtype=vast&render=&apt=auto&uimp=93862023567791182&svrs=0.90&srvid=10.10.4.4&oip=208.59.120.2&vrs=&tsl=&ear=100&width=&height=250&phost=&host=&thost=&appname=&idfa=&aid=&bundleid=&lsid=&loclat=&loclong=&contentid=%5BCONTENT_ID%5D%E2%80%8C&contenttitle=%5BCONTENT_TITLE%5D%E2%80%8C&contentlength=&contenturl=&appstoreurl=&execution=any&placement=&browserid=1&browserv=65.0&adplayersize=small&pid=263&sid=662921&spid=44784&psid=&ppid=&lkqdtagtype=vast&tlr=1&adid=677477&asrc=33062&aoid=96110&dealid=654322&pbid=0&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=&dur=30.0&cs=1262611271
-]]>
-</Error>
-<Error>
-<![CDATA[ https//t.lkqd.net/t?ev=17&env=1&pid=2&sid=71 ]]>
-</Error>
-<Creatives>
-<Creative>
-<Linear>
-<Duration>00:00:30</Duration>
-<TrackingEvents>
-<Tracking event="firstQuartile">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="firstQuartile">
-<![CDATA[
-https://t.lkqd.net/t?ev=4&tsid=662921&env=3&cb=761218674439&format=0&did=2&osid=6&osv=10.12.6&pubtagtype=vast&render=&apt=auto&uimp=93862023567791182&svrs=0.90&srvid=10.10.4.4&oip=208.59.120.2&vrs=&tsl=&ear=100&width=&height=250&phost=&host=&thost=&appname=&idfa=&aid=&bundleid=&lsid=&loclat=&loclong=&contentid=%5BCONTENT_ID%5D%E2%80%8C&contenttitle=%5BCONTENT_TITLE%5D%E2%80%8C&contentlength=&contenturl=&appstoreurl=&execution=any&placement=&browserid=1&browserv=65.0&adplayersize=small&pid=263&sid=662921&spid=44784&psid=&ppid=&lkqdtagtype=vast&tlr=1&adid=677477&asrc=33062&aoid=96110&dealid=654322&pbid=0&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=&dur=30.0&cs=-573688932
-]]>
-</Tracking>
-<Tracking event="firstQuartile">
-<![CDATA[
-https://test.com/?iamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatch&pageurl=&deviceid=&siteid=1374
-]]>
-</Tracking>
-<Tracking event="pause">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="fullscreen">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="mute">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="unmute">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="complete">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="complete">
-<![CDATA[
-https://t.lkqd.net/t?ev=7&tsid=662921&env=3&cb=761218674439&format=0&did=2&osid=6&osv=10.12.6&pubtagtype=vast&render=&apt=auto&uimp=93862023567791182&svrs=0.90&srvid=10.10.4.4&oip=208.59.120.2&vrs=&tsl=&ear=100&width=&height=250&phost=&host=&thost=&appname=&idfa=&aid=&bundleid=&lsid=&loclat=&loclong=&contentid=%5BCONTENT_ID%5D%E2%80%8C&contenttitle=%5BCONTENT_TITLE%5D%E2%80%8C&contentlength=&contenturl=&appstoreurl=&execution=any&placement=&browserid=1&browserv=65.0&adplayersize=small&pid=263&sid=662921&spid=44784&psid=&ppid=&lkqdtagtype=vast&tlr=1&adid=677477&asrc=33062&aoid=96110&dealid=654322&pbid=0&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=&dur=30.0&cs=-1387907
-]]>
-</Tracking>
-<Tracking event="complete">
-<![CDATA[
-https://test.com/?iamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatch&pageurl=&deviceid=&siteid=1374
-]]>
-</Tracking>
-<Tracking event="thirdQuartile">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="thirdQuartile">
-<![CDATA[
-https://t.lkqd.net/t?ev=6&tsid=662921&env=3&cb=761218674439&format=0&did=2&osid=6&osv=10.12.6&pubtagtype=vast&render=&apt=auto&uimp=93862023567791182&svrs=0.90&srvid=10.10.4.4&oip=208.59.120.2&vrs=&tsl=&ear=100&width=&height=250&phost=&host=&thost=&appname=&idfa=&aid=&bundleid=&lsid=&loclat=&loclong=&contentid=%5BCONTENT_ID%5D%E2%80%8C&contenttitle=%5BCONTENT_TITLE%5D%E2%80%8C&contentlength=&contenturl=&appstoreurl=&execution=any&placement=&browserid=1&browserv=65.0&adplayersize=small&pid=263&sid=662921&spid=44784&psid=&ppid=&lkqdtagtype=vast&tlr=1&adid=677477&asrc=33062&aoid=96110&dealid=654322&pbid=0&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=&dur=30.0&cs=-503935710
-]]>
-</Tracking>
-<Tracking event="thirdQuartile">
-<![CDATA[
-https://test.com/?iamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatch&pageurl=&deviceid=&siteid=1374
-]]>
-</Tracking>
-<Tracking event="midpoint">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="midpoint">
-<![CDATA[
-https://t.lkqd.net/t?ev=5&tsid=662921&env=3&cb=761218674439&format=0&did=2&osid=6&osv=10.12.6&pubtagtype=vast&render=&apt=auto&uimp=93862023567791182&svrs=0.90&srvid=10.10.4.4&oip=208.59.120.2&vrs=&tsl=&ear=100&width=&height=250&phost=&host=&thost=&appname=&idfa=&aid=&bundleid=&lsid=&loclat=&loclong=&contentid=%5BCONTENT_ID%5D%E2%80%8C&contenttitle=%5BCONTENT_TITLE%5D%E2%80%8C&contentlength=&contenturl=&appstoreurl=&execution=any&placement=&browserid=1&browserv=65.0&adplayersize=small&pid=263&sid=662921&spid=44784&psid=&ppid=&lkqdtagtype=vast&tlr=1&adid=677477&asrc=33062&aoid=96110&dealid=654322&pbid=0&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=&dur=30.0&cs=-1009619773
-]]>
-</Tracking>
-<Tracking event="midpoint">
-<![CDATA[
-https://test.com/?iamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatch&pageurl=&deviceid=&siteid=1374
-]]>
-</Tracking>
-<Tracking event="start">
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</Tracking>
-<Tracking event="start">
-<![CDATA[
-https://t.lkqd.net/t?ev=2&tsid=662921&env=3&cb=761218674439&format=0&did=2&osid=6&osv=10.12.6&pubtagtype=vast&render=&apt=auto&uimp=93862023567791182&svrs=0.90&srvid=10.10.4.4&oip=208.59.120.2&vrs=&tsl=&ear=100&width=&height=250&phost=&host=&thost=&appname=&idfa=&aid=&bundleid=&lsid=&loclat=&loclong=&contentid=%5BCONTENT_ID%5D%E2%80%8C&contenttitle=%5BCONTENT_TITLE%5D%E2%80%8C&contentlength=&contenturl=&appstoreurl=&execution=any&placement=&browserid=1&browserv=65.0&adplayersize=small&pid=263&sid=662921&spid=44784&psid=&ppid=&lkqdtagtype=vast&tlr=1&adid=677477&asrc=33062&aoid=96110&dealid=654322&pbid=0&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=&dur=30.0&cs=-1719144354
-]]>
-</Tracking>
-<Tracking event="start">
-<![CDATA[
-https://test.com/?iamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatch&pageurl=&deviceid=&siteid=1374
-]]>
-</Tracking>
-</TrackingEvents>
-<VideoClicks>
-<ClickThrough>
-<![CDATA[ https//www.lkqd.com/ ]]>
-</ClickThrough>
-<ClickTracking>
-<![CDATA[
-https://t.lkqd.net/t?ev=8&tsid=662921&env=3&cb=761218674439&format=0&did=2&osid=6&osv=10.12.6&pubtagtype=vast&render=&apt=auto&uimp=93862023567791182&svrs=0.90&srvid=10.10.4.4&oip=208.59.120.2&vrs=&tsl=&ear=100&width=&height=250&phost=&host=&thost=&appname=&idfa=&aid=&bundleid=&lsid=&loclat=&loclong=&contentid=%5BCONTENT_ID%5D%E2%80%8C&contenttitle=%5BCONTENT_TITLE%5D%E2%80%8C&contentlength=&contenturl=&appstoreurl=&execution=any&placement=&browserid=1&browserv=65.0&adplayersize=small&pid=263&sid=662921&spid=44784&psid=&ppid=&lkqdtagtype=vast&tlr=1&adid=677477&asrc=33062&aoid=96110&dealid=654322&pbid=0&rseat=&radomain=&rcid=&rcrid=&rdealid=&iabc=&dur=30.0&cs=1432204312
-]]>
-</ClickTracking>
-<ClickTracking>
-<![CDATA[ https//t.lkqd.net/t?ev=18&env=1&pid=2&sid=71 ]]>
-</ClickTracking>
-<ClickTracking>
-<![CDATA[
-https://test.com/?iamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatchiamatrackingpixelforcloudwatch&pageurl=&deviceid=&siteid=1374
-]]>
-</ClickTracking>
-</VideoClicks>
-<MediaFiles>
-<MediaFile type="video/mp4" delivery="progressive" width="800" height="450" bitrate="1499" scalable="true" maintainAspectRatio="false">
-<![CDATA[
-https://creative.lkqd.net/internal/lkqd_800x450.mp4
-]]>
-</MediaFile>
-<MediaFile type="video/mp4" delivery="progressive" width="300" height="170" bitrate="626" scalable="true" maintainAspectRatio="false">
-<![CDATA[
-https://creative.lkqd.net/internal/lkqd_300x250.mp4
-]]>
-</MediaFile>
-</MediaFiles>
-</Linear>
-</Creative>
-<Creative>
-<CompanionAds>
-<Companion width="300" height="250" id="medium_rectangle">
-<HTMLResource>
-<![CDATA[
-<a href="https://www.lkqd.com/" border="0" target="_blank"><img style="border:0; width:300px; height:250px;" src="https://ad.lkqd.net/serve/87123789f4ede3dcb692a277cff145ad.jpg"/></a>
-]]>
-</HTMLResource>
-</Companion>
-</CompanionAds>
-</Creative>
-</Creatives>
-<Extensions/>
-</InLine>
-</Ad>
-</VAST>`;
 
     it('should correctly parse valid bid response', () => {
-      const BIDDER_CODE = 'lkqd';
-      let bidResponses = spec.interpretResponse(serverResponse, bidRequest);
+      const bidResponses = spec.interpretResponse(serverResponse, bidRequest);
       expect(bidResponses.length).to.equal(1);
-      let bidResponse = bidResponses[0];
-      expect(bidResponse.requestId).to.equal('20d2f9095ba4e3');
-      expect(bidResponse.bidderCode).to.equal(BIDDER_CODE);
-      expect(bidResponse.ad).to.equal('');
-      expect(bidResponse.cpm).to.equal(2.87);
-      expect(bidResponse.width).to.equal('640');
-      expect(bidResponse.height).to.equal('480');
+
+      const bidResponse = bidResponses[0];
+      expect(bidResponse.requestId).to.equal('5511262729333416592');
+      expect(bidResponse.ad).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+      expect(bidResponse.cpm).to.equal(5.409);
+      expect(bidResponse.width).to.equal(1920);
+      expect(bidResponse.height).to.equal(1080);
       expect(bidResponse.ttl).to.equal(300);
-      expect(bidResponse.creativeId).to.equal('677477');
+      expect(bidResponse.creativeId).to.equal('lkqd-rtb-79-1030666');
       expect(bidResponse.currency).to.equal('USD');
       expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.mediaType).to.equal('video');
+      expect(bidResponse.meta.mediaType).to.equal('video');
     });
 
-    it('safely handles XML parsing failure from invalid bid response', () => {
+    it('safely handles invalid bid response', () => {
       let invalidServerResponse = {};
-      invalidServerResponse.body = '<Ad id="677477"><InLine></AdSystem></InLine></Ad>';
+      invalidServerResponse.body = '';
 
       let result = spec.interpretResponse(invalidServerResponse, bidRequest);
       expect(result.length).to.equal(0);
@@ -336,7 +307,13 @@ https://creative.lkqd.net/internal/lkqd_300x250.mp4
 
     it('handles nobid responses', () => {
       let nobidResponse = {};
-      nobidResponse.body = '<?xml version=\'1.0\' encoding=\'UTF-8\'?><VAST version=\'2.0\'></VAST>';
+      nobidResponse.body = {
+        seatbid: [
+          {
+            bid: []
+          }
+        ]
+      };
 
       let result = spec.interpretResponse(nobidResponse, bidRequest);
       expect(result.length).to.equal(0);
diff --git a/test/spec/modules/lockerdomeBidAdapter_spec.js b/test/spec/modules/lockerdomeBidAdapter_spec.js
index 42e3f52e533..d65837c39ab 100644
--- a/test/spec/modules/lockerdomeBidAdapter_spec.js
+++ b/test/spec/modules/lockerdomeBidAdapter_spec.js
@@ -74,7 +74,7 @@ describe('LockerDomeAdapter', function () {
       const bidderRequest = {
         refererInfo: {
           canonicalUrl: 'https://example.com/canonical',
-          referer: 'https://example.com'
+          topmostLocation: 'https://example.com'
         }
       };
       const request = spec.buildRequests(bidRequests, bidderRequest);
@@ -88,7 +88,7 @@ describe('LockerDomeAdapter', function () {
       expect(bids).to.have.lengthOf(2);
 
       expect(requestData.url).to.equal(encodeURIComponent(bidderRequest.refererInfo.canonicalUrl));
-      expect(requestData.referrer).to.equal(encodeURIComponent(bidderRequest.refererInfo.referer));
+      expect(requestData.referrer).to.equal(encodeURIComponent(bidderRequest.refererInfo.topmostLocation));
 
       expect(bids[0].requestId).to.equal('2652ca954bce9');
       expect(bids[0].adUnitCode).to.equal('ad-1');
@@ -180,7 +180,8 @@ describe('LockerDomeAdapter', function () {
             currency: 'USD',
             netRevenue: true,
             ad: '<!-- AD 1 CREATIVE -->',
-            ttl: 300
+            ttl: 300,
+            adomain: ['example.com']
           },
           {
             requestId: '4510f2834773ce',
@@ -191,7 +192,8 @@ describe('LockerDomeAdapter', function () {
             currency: 'USD',
             netRevenue: true,
             ad: '<!-- AD 2 CREATIVE -->',
-            ttl: 300
+            ttl: 300,
+            adomain: ['example.com']
           }]
         }
       };
@@ -217,6 +219,9 @@ describe('LockerDomeAdapter', function () {
       expect(interpretedResponse[0].netRevenue).to.equal(serverResponse.body.bids[0].netRevenue);
       expect(interpretedResponse[0].ad).to.equal(serverResponse.body.bids[0].ad);
       expect(interpretedResponse[0].ttl).to.equal(serverResponse.body.bids[0].ttl);
+      expect(interpretedResponse[0]).to.have.property('meta');
+      expect(interpretedResponse[0].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[0].meta.advertiserDomains).to.deep.equal(serverResponse.body.bids[0].adomain);
 
       expect(interpretedResponse[1].requestId).to.equal(serverResponse.body.bids[1].requestId);
       expect(interpretedResponse[1].cpm).to.equal(serverResponse.body.bids[1].cpm);
@@ -227,6 +232,9 @@ describe('LockerDomeAdapter', function () {
       expect(interpretedResponse[1].netRevenue).to.equal(serverResponse.body.bids[1].netRevenue);
       expect(interpretedResponse[1].ad).to.equal(serverResponse.body.bids[1].ad);
       expect(interpretedResponse[1].ttl).to.equal(serverResponse.body.bids[1].ttl);
+      expect(interpretedResponse[1]).to.have.property('meta');
+      expect(interpretedResponse[1].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[1].meta.advertiserDomains).to.deep.equal(serverResponse.body.bids[1].adomain);
     });
   });
 });
diff --git a/test/spec/modules/loganBidAdapter_spec.js b/test/spec/modules/loganBidAdapter_spec.js
new file mode 100644
index 00000000000..a9859bbd4ae
--- /dev/null
+++ b/test/spec/modules/loganBidAdapter_spec.js
@@ -0,0 +1,337 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/loganBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('LoganBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'logan',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+    }
+  };
+
+  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://USeast2.logan.ai/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', 'adFormat', 'sizes', 'schain', 'bidfloor');
+      expect(placement.placementId).to.equal(783);
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.adFormat).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+      expect(placement.bidfloor).to.exist.and.to.equal(0);
+    });
+
+    it('Returns valid data for mediatype video', function () {
+      const playerSize = [300, 300];
+      bid.mediaTypes = {};
+      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', 'adFormat', 'wPlayer', 'hPlayer', 'schain', 'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity', 'bidfloor');
+      expect(placement.adFormat).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+      expect(placement.bidfloor).to.exist.and.to.equal(0);
+    });
+
+    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.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', 'adFormat', 'native', 'schain', 'bidfloor');
+      expect(placement.adFormat).to.equal(NATIVE);
+      expect(placement.native).to.equal(native);
+      expect(placement.bidfloor).to.exist.and.to.equal(0);
+    });
+
+    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',
+          meta: {}
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          vastXml: '<VAST>',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {}
+        }]
+      };
+      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', 'vastXml', '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.vastXml).to.equal('<VAST>');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {}
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://ssp-cookie.logan.ai/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1NNN'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://ssp-cookie.logan.ai/image?pbjs=1&ccpa_consent=1NNN&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/logicadBidAdapter_spec.js b/test/spec/modules/logicadBidAdapter_spec.js
index eddcaecac7b..6abca6b2e98 100644
--- a/test/spec/modules/logicadBidAdapter_spec.js
+++ b/test/spec/modules/logicadBidAdapter_spec.js
@@ -19,7 +19,65 @@ describe('LogicadAdapter', function () {
       banner: {
         sizes: [[300, 250], [300, 600]]
       }
-    }
+    },
+    userId: {
+      sharedid: {
+        id: 'fakesharedid',
+        third: 'fakesharedid'
+      }
+    },
+    userIdAsEids: [{
+      source: 'sharedid.org',
+      uids: [{
+        id: 'fakesharedid',
+        atype: 1,
+        ext: {
+          third: 'fakesharedid'
+        }
+      }]
+    }]
+  }];
+  const nativeBidRequests = [{
+    bidder: 'logicad',
+    bidId: '51ef8751f9aead',
+    params: {
+      tid: 'bgjD1',
+      page: 'https://www.logicad.com/'
+    },
+    adUnitCode: 'div-gpt-ad-1460505748561-1',
+    transactionId: 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+    sizes: [[1, 1]],
+    bidderRequestId: '418b37f85e772c',
+    auctionId: '18fd8b8b0bd757',
+    mediaTypes: {
+      native: {
+        title: {
+          required: true
+        },
+        image: {
+          required: true
+        },
+        sponsoredBy: {
+          required: true
+        }
+      }
+    },
+    userId: {
+      sharedid: {
+        id: 'fakesharedid',
+        third: 'fakesharedid'
+      }
+    },
+    userIdAsEids: [{
+      source: 'sharedid.org',
+      uids: [{
+        id: 'fakesharedid',
+        atype: 1,
+        ext: {
+          third: 'fakesharedid'
+        }
+      }]
+    }]
   }];
   const bidderRequest = {
     refererInfo: {
@@ -43,7 +101,47 @@ describe('LogicadAdapter', function () {
             currency: 'JPY',
             netRevenue: true,
             ttl: 60,
-            ad: '<div>TEST</div>'
+            ad: '<div>TEST</div>',
+            meta: {
+              advertiserDomains: ['logicad.com']
+            }
+          }
+        }],
+      userSync: {
+        type: 'image',
+        url: 'https://cr-p31.ladsp.jp/cookiesender/31'
+      }
+    }
+  };
+  const nativeServerResponse = {
+    body: {
+      seatbid:
+        [{
+          bid: {
+            requestId: '51ef8751f9aead',
+            cpm: 101.0234,
+            width: 1,
+            height: 1,
+            creativeId: '2019',
+            currency: 'JPY',
+            netRevenue: true,
+            ttl: 60,
+            native: {
+              clickUrl: 'https://www.logicad.com',
+              image: {
+                url: 'https://cd.ladsp.com/img.png',
+                width: '1200',
+                height: '628'
+              },
+              impressionTrackers: [
+                'https://example.com'
+              ],
+              sponsoredBy: 'Logicad',
+              title: 'Native Creative',
+            },
+            meta: {
+              advertiserDomains: ['logicad.com']
+            }
           }
         }],
       userSync: {
@@ -69,6 +167,10 @@ describe('LogicadAdapter', function () {
       delete bidRequest[0].params;
       expect(spec.isBidRequestValid(bidRequest)).to.be.false;
     });
+
+    it('should return true if the tid parameter is present for native request', function () {
+      expect(spec.isBidRequestValid(nativeBidRequests[0])).to.be.true;
+    });
   });
 
   describe('buildRequests', function () {
@@ -77,6 +179,11 @@ describe('LogicadAdapter', function () {
       expect(request.method).to.equal('POST');
       expect(request.url).to.equal('https://pb.ladsp.com/adrequest/prebid');
       expect(request.data).to.exist;
+
+      const data = JSON.parse(request.data);
+      expect(data.auctionId).to.equal('18fd8b8b0bd757');
+      expect(data.eids[0].source).to.equal('sharedid.org');
+      expect(data.eids[0].uids[0].id).to.equal('fakesharedid');
     });
   });
 
@@ -101,6 +208,29 @@ describe('LogicadAdapter', function () {
       expect(interpretedResponse[0].netRevenue).to.equal(serverResponse.body.seatbid[0].bid.netRevenue);
       expect(interpretedResponse[0].ad).to.equal(serverResponse.body.seatbid[0].bid.ad);
       expect(interpretedResponse[0].ttl).to.equal(serverResponse.body.seatbid[0].bid.ttl);
+      expect(interpretedResponse[0].meta.advertiserDomains).to.equal(serverResponse.body.seatbid[0].bid.meta.advertiserDomains);
+
+      // native
+      const nativeRequest = spec.buildRequests(nativeBidRequests, bidderRequest)[0];
+      const interpretedResponseForNative = spec.interpretResponse(nativeServerResponse, nativeRequest);
+
+      expect(interpretedResponseForNative).to.have.lengthOf(1);
+
+      expect(interpretedResponseForNative[0].requestId).to.equal(nativeServerResponse.body.seatbid[0].bid.requestId);
+      expect(interpretedResponseForNative[0].cpm).to.equal(nativeServerResponse.body.seatbid[0].bid.cpm);
+      expect(interpretedResponseForNative[0].width).to.equal(nativeServerResponse.body.seatbid[0].bid.width);
+      expect(interpretedResponseForNative[0].height).to.equal(nativeServerResponse.body.seatbid[0].bid.height);
+      expect(interpretedResponseForNative[0].creativeId).to.equal(nativeServerResponse.body.seatbid[0].bid.creativeId);
+      expect(interpretedResponseForNative[0].currency).to.equal(nativeServerResponse.body.seatbid[0].bid.currency);
+      expect(interpretedResponseForNative[0].netRevenue).to.equal(nativeServerResponse.body.seatbid[0].bid.netRevenue);
+      expect(interpretedResponseForNative[0].ttl).to.equal(nativeServerResponse.body.seatbid[0].bid.ttl);
+      expect(interpretedResponseForNative[0].native.clickUrl).to.equal(nativeServerResponse.body.seatbid[0].bid.native.clickUrl);
+      expect(interpretedResponseForNative[0].native.image.url).to.equal(nativeServerResponse.body.seatbid[0].bid.native.image.url);
+      expect(interpretedResponseForNative[0].native.image.width).to.equal(nativeServerResponse.body.seatbid[0].bid.native.image.width);
+      expect(interpretedResponseForNative[0].native.impressionTrackers).to.equal(nativeServerResponse.body.seatbid[0].bid.native.impressionTrackers);
+      expect(interpretedResponseForNative[0].native.sponsoredBy).to.equal(nativeServerResponse.body.seatbid[0].bid.native.sponsoredBy);
+      expect(interpretedResponseForNative[0].native.title).to.equal(nativeServerResponse.body.seatbid[0].bid.native.title);
+      expect(interpretedResponseForNative[0].meta.advertiserDomains[0]).to.equal(serverResponse.body.seatbid[0].bid.meta.advertiserDomains[0]);
     });
   });
 
diff --git a/test/spec/modules/loglyliftBidAdapter_spec.js b/test/spec/modules/loglyliftBidAdapter_spec.js
new file mode 100644
index 00000000000..8ff2eb97463
--- /dev/null
+++ b/test/spec/modules/loglyliftBidAdapter_spec.js
@@ -0,0 +1,250 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/loglyliftBidAdapter';
+import * as utils from 'src/utils.js';
+
+describe('loglyliftBidAdapter', function () {
+  const bannerBidRequests = [{
+    bidder: 'loglylift',
+    bidId: '51ef8751f9aead',
+    params: {
+      adspotId: 16
+    },
+    adUnitCode: '/19968336/prebid_native_example_1',
+    transactionId: '10aee457-617c-4572-ab5b-99df1d73ccb4',
+    sizes: [[300, 250], [300, 600]],
+    bidderRequestId: '15da3afd9632d7',
+    auctionId: 'f890b7d9-e787-4237-ac21-6d8554abac9f',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    }
+  }];
+
+  const nativeBidRequests = [{
+    bidder: 'loglylift',
+    bidId: '254304ac29e265',
+    params: {
+      adspotId: 16
+    },
+    adUnitCode: '/19968336/prebid_native_example_1',
+    transactionId: '10aee457-617c-4572-ab5b-99df1d73ccb4',
+    sizes: [
+      []
+    ],
+    bidderRequestId: '15da3afd9632d7',
+    auctionId: 'f890b7d9-e787-4237-ac21-6d8554abac9f',
+    mediaTypes: {
+      native: {
+        body: {
+          required: true
+        },
+        icon: {
+          required: false
+        },
+        title: {
+          required: true
+        },
+        image: {
+          required: true
+        },
+        sponsoredBy: {
+          required: true
+        },
+        cta: {
+          required: true
+        },
+        privacyLink: {
+          required: true
+        }
+      }
+    }
+  }];
+
+  const bidderRequest = {
+    refererInfo: {
+      domain: 'domain',
+      page: 'fakeReferer',
+      reachedTop: true,
+      numIframes: 1,
+      stack: []
+    },
+    auctionStart: 1632194172781,
+    bidderCode: 'loglylift',
+    bidderRequestId: '15da3afd9632d7',
+    auctionId: 'f890b7d9-e787-4237-ac21-6d8554abac9f',
+    timeout: 3000
+  };
+
+  const bannerServerResponse = {
+    body: {
+      bids: [{
+        requestId: '51ef8751f9aead',
+        cpm: 101.0234,
+        width: 300,
+        height: 250,
+        creativeId: '16',
+        currency: 'JPY',
+        netRevenue: true,
+        ttl: 60,
+        meta: {
+          advertiserDomains: ['advertiserexample.com']
+        },
+        ad: '<div>TEST</div>',
+      }]
+    }
+  };
+
+  const nativeServerResponse = {
+    body: {
+      bids: [{
+        requestId: '254304ac29e265',
+        cpm: 10.123,
+        width: 360,
+        height: 360,
+        creativeId: '123456789',
+        currency: 'JPY',
+        netRevenue: true,
+        ttl: 30,
+        meta: {
+          advertiserDomains: ['advertiserexample.com']
+        },
+        native: {
+          clickUrl: 'https://dsp.logly.co.jp/click?ad=EXAMPECLICKURL',
+          image: {
+            url: 'https://cdn.logly.co.jp/images/000/194/300/normal.jpg',
+            width: '360',
+            height: '360'
+          },
+          impressionTrackers: [
+            'https://b.logly.co.jp/sorry.html'
+          ],
+          sponsoredBy: 'logly',
+          title: 'Native Title',
+          privacyLink: 'https://www.logly.co.jp/optout.html',
+          cta: '詳細はこちら',
+        }
+      }],
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    [nativeBidRequests, bannerBidRequests].forEach(bidRequests => {
+      it('should return true if the adspotId parameter is present', function () {
+        expect(spec.isBidRequestValid(bidRequests[0])).to.be.true;
+      });
+
+      it('should return false if the adspotId parameter is not present', function () {
+        let bidRequest = utils.deepClone(bidRequests[0]);
+        delete bidRequest.params.adspotId;
+        expect(spec.isBidRequestValid(bidRequest)).to.be.false;
+      });
+    });
+  });
+
+  describe('buildRequests', function () {
+    [nativeBidRequests, bannerBidRequests].forEach(bidRequests => {
+      it('should generate a valid single POST request for multiple bid requests', function () {
+        const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+        expect(request.method).to.equal('POST');
+        expect(request.url).to.equal('https://bid.logly.co.jp/prebid/client/v1?adspot_id=16');
+        expect(request.data).to.exist;
+
+        const data = JSON.parse(request.data);
+        expect(data.auctionId).to.equal(bidRequests[0].auctionId);
+        expect(data.bidderRequestId).to.equal(bidRequests[0].bidderRequestId);
+        expect(data.transactionId).to.equal(bidRequests[0].transactionId);
+        expect(data.adUnitCode).to.equal(bidRequests[0].adUnitCode);
+        expect(data.bidId).to.equal(bidRequests[0].bidId);
+        expect(data.mediaTypes).to.deep.equal(bidRequests[0].mediaTypes);
+        expect(data.params).to.deep.equal(bidRequests[0].params);
+        expect(data.prebidJsVersion).to.equal('$prebid.version$');
+        expect(data.url).to.exist;
+        expect(data.domain).to.exist;
+        expect(data.referer).to.equal(bidderRequest.refererInfo.page);
+        expect(data.auctionStartTime).to.equal(bidderRequest.auctionStart);
+        expect(data.currency).to.exist;
+        expect(data.timeout).to.equal(bidderRequest.timeout);
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return an empty array if an invalid response is passed', function () {
+      const interpretedResponse = spec.interpretResponse({}, {});
+      expect(interpretedResponse).to.be.an('array').that.is.empty;
+    });
+
+    describe('nativeServerResponse', function () {
+      it('should return valid response when passed valid server response', function () {
+        const request = spec.buildRequests(nativeBidRequests, bidderRequest)[0];
+        const interpretedResponse = spec.interpretResponse(nativeServerResponse, request);
+
+        expect(interpretedResponse).to.have.lengthOf(1);
+        expect(interpretedResponse[0].cpm).to.equal(nativeServerResponse.body.bids[0].cpm);
+        expect(interpretedResponse[0].width).to.equal(nativeServerResponse.body.bids[0].width);
+        expect(interpretedResponse[0].height).to.equal(nativeServerResponse.body.bids[0].height);
+        expect(interpretedResponse[0].creativeId).to.equal(nativeServerResponse.body.bids[0].creativeId);
+        expect(interpretedResponse[0].currency).to.equal(nativeServerResponse.body.bids[0].currency);
+        expect(interpretedResponse[0].netRevenue).to.equal(nativeServerResponse.body.bids[0].netRevenue);
+        expect(interpretedResponse[0].ttl).to.equal(nativeServerResponse.body.bids[0].ttl);
+        expect(interpretedResponse[0].native).to.deep.equal(nativeServerResponse.body.bids[0].native);
+        expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal(nativeServerResponse.body.bids[0].meta.advertiserDomains[0]);
+      });
+    });
+
+    describe('bannerServerResponse', function () {
+      it('should return valid response when passed valid server response', function () {
+        const request = spec.buildRequests(bannerBidRequests, bidderRequest)[0];
+        const interpretedResponse = spec.interpretResponse(bannerServerResponse, request);
+
+        expect(interpretedResponse).to.have.lengthOf(1);
+        expect(interpretedResponse[0].cpm).to.equal(bannerServerResponse.body.bids[0].cpm);
+        expect(interpretedResponse[0].width).to.equal(bannerServerResponse.body.bids[0].width);
+        expect(interpretedResponse[0].height).to.equal(bannerServerResponse.body.bids[0].height);
+        expect(interpretedResponse[0].creativeId).to.equal(bannerServerResponse.body.bids[0].creativeId);
+        expect(interpretedResponse[0].currency).to.equal(bannerServerResponse.body.bids[0].currency);
+        expect(interpretedResponse[0].netRevenue).to.equal(bannerServerResponse.body.bids[0].netRevenue);
+        expect(interpretedResponse[0].ttl).to.equal(bannerServerResponse.body.bids[0].ttl);
+        expect(interpretedResponse[0].ad).to.equal(bannerServerResponse.body.bids[0].ad);
+        expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal(bannerServerResponse.body.bids[0].meta.advertiserDomains[0]);
+      });
+    });
+  });
+
+  describe('getUserSync tests', function () {
+    it('UserSync test : check type = iframe, check usermatch URL', function () {
+      const syncOptions = {
+        'iframeEnabled': true
+      }
+      let userSync = spec.getUserSyncs(syncOptions, [nativeServerResponse]);
+      expect(userSync[0].type).to.equal('iframe');
+      const USER_SYNC_URL = 'https://sync.logly.co.jp/sync/sync.html';
+      expect(userSync[0].url).to.equal(USER_SYNC_URL);
+    });
+
+    it('When iframeEnabled is false, no userSync should be returned', function () {
+      const syncOptions = {
+        'iframeEnabled': false
+      }
+      let userSync = spec.getUserSyncs(syncOptions, [nativeServerResponse]);
+      expect(userSync).to.be.an('array').that.is.empty;
+    });
+
+    it('When serverResponses empty, no userSync should be returned', function () {
+      const syncOptions = {
+        'iframeEnabled': true
+      }
+      let userSync = spec.getUserSyncs(syncOptions, []);
+      expect(userSync).to.be.an('array').that.is.empty;
+    });
+
+    it('When mediaType is banner, no userSync should be returned', function () {
+      const syncOptions = {
+        'iframeEnabled': true
+      }
+      let userSync = spec.getUserSyncs(syncOptions, [bannerServerResponse]);
+      expect(userSync).to.be.an('array').that.is.empty;
+    });
+  });
+});
diff --git a/test/spec/modules/loopmeBidAdapter_spec.js b/test/spec/modules/loopmeBidAdapter_spec.js
deleted file mode 100644
index a47bdfe47df..00000000000
--- a/test/spec/modules/loopmeBidAdapter_spec.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import { expect } from 'chai';
-import { spec } from '../../../modules/loopmeBidAdapter.js';
-import * as utils from 'src/utils.js';
-
-describe('LoopMeAdapter', function () {
-  const bidRequests = [{
-    bidder: 'loopme',
-    params: {
-      ak: 'b510d5bcda'
-    },
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]]
-      }
-    },
-    adUnitCode: 'ad-1',
-    bidId: '2652ca954bce9'
-  }, {
-    bidder: 'loopme',
-    params: {
-      ak: 'b510d5bcda'
-    },
-    mediaTypes: {
-      video: {
-        playerSize: [[640, 480]],
-        context: 'outstream'
-      }
-    },
-    adUnitCode: 'ad-1',
-    bidId: '2652ca954bce9'
-  }
-  ];
-
-  describe('isBidRequestValid', function () {
-    it('should return true if the ak parameter is present', function () {
-      expect(spec.isBidRequestValid(bidRequests[0])).to.be.true;
-      expect(spec.isBidRequestValid(bidRequests[1])).to.be.true;
-    });
-
-    it('should return false if the ak parameter is not present', function () {
-      let bannerBidRequest = utils.deepClone(bidRequests[0]);
-      delete bannerBidRequest.params.ak;
-      expect(spec.isBidRequestValid(bannerBidRequest)).to.be.false;
-
-      let videoBidRequest = utils.deepClone(bidRequests[1]);
-      delete videoBidRequest.params.ak;
-      expect(spec.isBidRequestValid(videoBidRequest)).to.be.false;
-    });
-
-    it('should return false if the params object is not present', function () {
-      let bannerBidRequest = utils.deepClone(bidRequests)[0];
-      delete bannerBidRequest.params;
-      expect(spec.isBidRequestValid(bannerBidRequest)).to.be.false;
-
-      let videoBidRequest = utils.deepClone(bidRequests)[1];
-      delete videoBidRequest.params;
-      expect(spec.isBidRequestValid(videoBidRequest)).to.be.false;
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('should generate a valid single GET request for multiple bid requests', function () {
-      const bannerRequest = spec.buildRequests(bidRequests)[0];
-      expect(bannerRequest.method).to.equal('GET');
-      expect(bannerRequest.url).to.equal('https://loopme.me/api/hb');
-      expect(bannerRequest.bidId).to.equal('2652ca954bce9');
-      expect(bannerRequest.data).to.exist;
-
-      const bannerRequestData = bannerRequest.data;
-      expect(bannerRequestData).to.contain('ak=b510d5bcda');
-      expect(bannerRequestData).to.contain('sizes=300x250');
-
-      const videoRequest = spec.buildRequests(bidRequests)[1];
-      expect(videoRequest.method).to.equal('GET');
-      expect(videoRequest.url).to.equal('https://loopme.me/api/hb');
-      expect(videoRequest.bidId).to.equal('2652ca954bce9');
-      expect(videoRequest.data).to.exist;
-
-      const videoRquestData = videoRequest.data;
-      expect(videoRquestData).to.contain('ak=b510d5bcda');
-      expect(videoRquestData).to.contain('sizes=640x480');
-      expect(videoRquestData).to.contain('media_type=video');
-    });
-
-    it('should add GDPR data to request if available', function () {
-      const bidderRequest = {
-        gdprConsent: {
-          consentString: 'AAABBB'
-        }
-      };
-      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
-      const requestData = request.data;
-
-      expect(requestData).to.contain('user_consent=AAABBB');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('should return an empty array if an invalid response is passed', function () {
-      const interpretedResponse = spec.interpretResponse({});
-      expect(interpretedResponse).to.be.an('array').that.is.empty;
-    });
-
-    xit('should return valid response when passed valid server response', function () {
-      const serverResponse = {
-        body: {
-          'requestId': '2652ca954bce9',
-          'cpm': 1,
-          'width': 480,
-          'height': 320,
-          'creativeId': '20154',
-          'currency': 'USD',
-          'netRevenue': false,
-          'ttl': 360,
-          'ad': `<div>Hello</div>`
-        }
-      };
-
-      const request = spec.buildRequests(bidRequests)[0];
-      const interpretedResponse = spec.interpretResponse(serverResponse, request);
-
-      expect(interpretedResponse).to.have.lengthOf(1);
-
-      expect(interpretedResponse[0].requestId).to.equal(serverResponse.body.requestId);
-      expect(interpretedResponse[0].cpm).to.equal(serverResponse.body.cpm);
-      expect(interpretedResponse[0].width).to.equal(serverResponse.body.width);
-      expect(interpretedResponse[0].height).to.equal(serverResponse.body.height);
-      expect(interpretedResponse[0].creativeId).to.equal(serverResponse.body.creativeId);
-      expect(interpretedResponse[0].currency).to.equal(serverResponse.body.currency);
-      expect(interpretedResponse[0].netRevenue).to.equal(serverResponse.body.netRevenue);
-      expect(interpretedResponse[0].ad).to.equal(serverResponse.body.ad);
-      expect(interpretedResponse[0].ttl).to.equal(serverResponse.body.ttl);
-    });
-
-    it('should return valid VAST response when passed valid server response', function () {
-      const serverResponse = {
-        body: {
-          'requestId': '2652ca954bce9',
-          'cpm': 1,
-          'width': 640,
-          'height': 480,
-          'creativeId': '20154',
-          'currency': 'USD',
-          'netRevenue': false,
-          'ttl': 360,
-          'vastUrl': 'https://loopme.me/ads/vast?ak=cc885e3acc'
-        }
-      };
-
-      const request = spec.buildRequests(bidRequests)[1];
-      const interpretedResponse = spec.interpretResponse(serverResponse, request);
-
-      expect(interpretedResponse).to.have.lengthOf(1);
-
-      expect(interpretedResponse[0].requestId).to.equal(serverResponse.body.requestId);
-      expect(interpretedResponse[0].cpm).to.equal(serverResponse.body.cpm);
-      expect(interpretedResponse[0].width).to.equal(serverResponse.body.width);
-      expect(interpretedResponse[0].height).to.equal(serverResponse.body.height);
-      expect(interpretedResponse[0].creativeId).to.equal(serverResponse.body.creativeId);
-      expect(interpretedResponse[0].currency).to.equal(serverResponse.body.currency);
-      expect(interpretedResponse[0].netRevenue).to.equal(serverResponse.body.netRevenue);
-      expect(interpretedResponse[0].vastUrl).to.equal(serverResponse.body.vastUrl);
-      expect(interpretedResponse[0].ttl).to.equal(serverResponse.body.ttl);
-      expect(interpretedResponse[0].renderer).to.have.property('render');
-    });
-  });
-});
diff --git a/test/spec/modules/lotamePanoramaIdSystem_spec.js b/test/spec/modules/lotamePanoramaIdSystem_spec.js
index c6d3383374a..5dc055ac080 100644
--- a/test/spec/modules/lotamePanoramaIdSystem_spec.js
+++ b/test/spec/modules/lotamePanoramaIdSystem_spec.js
@@ -2,8 +2,10 @@ import {
   lotamePanoramaIdSubmodule,
   storage,
 } from 'modules/lotamePanoramaIdSystem.js';
+import { uspDataHandler } from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
+import sinon from 'sinon';
 
 const responseHeader = { 'Content-Type': 'application/json' };
 
@@ -15,6 +17,7 @@ describe('LotameId', function() {
   let setLocalStorageStub;
   let removeFromLocalStorageStub;
   let timeStampStub;
+  let uspConsentDataStub;
 
   const nowTimestamp = new Date().getTime();
 
@@ -29,6 +32,7 @@ describe('LotameId', function() {
       'removeDataFromLocalStorage'
     );
     timeStampStub = sinon.stub(utils, 'timestamp').returns(nowTimestamp);
+    uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
   });
 
   afterEach(function () {
@@ -39,6 +43,7 @@ describe('LotameId', function() {
     setLocalStorageStub.restore();
     removeFromLocalStorageStub.restore();
     timeStampStub.restore();
+    uspConsentDataStub.restore();
   });
 
   describe('caching initial data received from the remote server', function () {
@@ -65,7 +70,6 @@ describe('LotameId', function() {
 
     it('should call the remote server when getId is called', function () {
       expect(request.url).to.be.eq('https://id.crwdcntrl.net/id');
-
       expect(callBackSpy.calledOnce).to.be.true;
     });
 
@@ -440,10 +444,512 @@ describe('LotameId', function() {
     });
   });
 
-  it('should retrieve the id when decode is called', function() {
-    var id = lotamePanoramaIdSubmodule.decode('1234');
-    expect(id).to.be.eql({
-      'lotamePanoramaId': '1234'
+  describe('when gdpr applies and falls back to eupubconsent cookie', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      consentString: undefined
+    };
+
+    beforeEach(function () {
+      getCookieStub
+        .withArgs('eupubconsent-v2')
+        .returns('consentGiven');
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_applies=true&gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when gdpr applies and falls back to euconsent cookie', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      consentString: undefined
+    };
+
+    beforeEach(function () {
+      getCookieStub
+        .withArgs('euconsent-v2')
+        .returns('consentGiven');
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_applies=true&gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when gdpr applies but no consent string is available', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      consentString: undefined
+    };
+
+    beforeEach(function () {
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should not include the gdpr consent string on the url', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_applies=true'
+      );
+    });
+  });
+
+  describe('when no consentData and falls back to eupubconsent cookie', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData;
+
+    beforeEach(function () {
+      getCookieStub
+        .withArgs('eupubconsent-v2')
+        .returns('consentGiven');
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when no consentData and falls back to euconsent cookie', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData;
+
+    beforeEach(function () {
+      getCookieStub
+        .withArgs('euconsent-v2')
+        .returns('consentGiven');
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when no consentData and no cookies', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData;
+
+    beforeEach(function () {
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}, consentData).callback;
+      submoduleCallback(callBackSpy);
+
+      // the contents of the response don't matter for this
+      request = server.requests[0];
+      request.respond(200, responseHeader, '');
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should pass the gdpr consent string back', function() {
+      expect(request.url).to.be.eq('https://id.crwdcntrl.net/id');
+    });
+  });
+
+  describe('with an empty cache, ignore profile id for error 111', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+
+    beforeEach(function () {
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}).callback;
+      submoduleCallback(callBackSpy);
+
+      request = server.requests[0];
+
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          profile_id: '4ec137245858469eb94a4e248f238694',
+          expiry_ts: 10,
+          errors: [111],
+          core_id:
+            'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a',
+        })
+      );
+    });
+
+    it('should not save the first party id', function () {
+      sinon.assert.neverCalledWith(
+        setLocalStorageStub,
+        '_cc_id',
+        '4ec137245858469eb94a4e248f238694'
+      );
+      sinon.assert.neverCalledWith(
+        setCookieStub,
+        '_cc_id',
+        '4ec137245858469eb94a4e248f238694'
+      );
+    });
+
+    it('should save the expiry', function () {
+      sinon.assert.calledWith(setLocalStorageStub, 'panoramaId_expiry', 10);
+
+      sinon.assert.calledWith(setCookieStub, 'panoramaId_expiry', 10);
+    });
+
+    it('should save the id', function () {
+      sinon.assert.calledWith(
+        setLocalStorageStub,
+        'panoramaId',
+        'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a'
+      );
+
+      sinon.assert.calledWith(
+        setCookieStub,
+        'panoramaId',
+        'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a'
+      );
+    });
+  });
+
+  describe('receives an optout request with an error 111', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+
+    beforeEach(function () {
+      getCookieStub.withArgs('panoramaId_expiry').returns('1000');
+      getCookieStub
+        .withArgs('panoramaId')
+        .returns(
+          'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87d'
+        );
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}).callback;
+      submoduleCallback(callBackSpy);
+
+      request = server.requests[0];
+
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          errors: [111],
+          expiry_ts: Date.now() + 30 * 24 * 60 * 60 * 1000,
+        })
+      );
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should clear the panorama id', function () {
+      sinon.assert.calledWith(removeFromLocalStorageStub, 'panoramaId');
+
+      sinon.assert.calledWith(
+        setCookieStub,
+        'panoramaId',
+        '',
+        'Thu, 01 Jan 1970 00:00:00 GMT',
+        'Lax'
+      );
+    });
+
+    it('should not clear the profile id', function () {
+      sinon.assert.neverCalledWith(removeFromLocalStorageStub, '_cc_id');
+
+      sinon.assert.neverCalledWith(
+        setCookieStub,
+        '_cc_id',
+        '',
+        'Thu, 01 Jan 1970 00:00:00 GMT',
+        'Lax'
+      );
+    });
+  });
+
+  describe('with a custom client id', function () {
+    describe('with a client expiry set', function () {
+      beforeEach(function () {
+        getCookieStub
+          .withArgs('panoramaId_expiry_1234')
+          .returns(String(Date.now() + 500 * 1000));
+      });
+
+      describe('and an existing pano id', function() {
+        let submoduleCallback;
+        beforeEach(function () {
+          getCookieStub
+            .withArgs('panoramaId_expiry')
+            .returns(String(Date.now() + 100000));
+          getCookieStub
+            .withArgs('panoramaId')
+            .returns(
+              'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87c'
+            );
+          submoduleCallback = lotamePanoramaIdSubmodule.getId(
+            {
+              params: {
+                clientId: '1234',
+              },
+            },
+            {
+              gdprApplies: false,
+            }
+          );
+        });
+
+        it('should not call the remote server when getId is called nor get an id', function () {
+          expect(submoduleCallback).to.be.eql({
+            id: undefined,
+            reason: 'NO_CLIENT_CONSENT',
+          });
+        });
+      });
+
+      describe('and no existing pano id', function () {
+        let submoduleCallback;
+
+        beforeEach(function () {
+          // Let the panoramaId_expiry be empty
+
+          submoduleCallback = lotamePanoramaIdSubmodule.getId(
+            {
+              params: {
+                clientId: '1234',
+              },
+            },
+            {
+              gdprApplies: false,
+            }
+          );
+        });
+
+        it('should not call the remote server nor return an id', function () {
+          expect(submoduleCallback).to.be.eql({
+            id: undefined,
+            reason: 'NO_CLIENT_CONSENT',
+          });
+        });
+      });
+    });
+
+    describe('with no client expiry set', function () {
+      describe('and no existing pano id', function () {
+        let request;
+        let callBackSpy = sinon.spy();
+
+        beforeEach(function () {
+          uspConsentDataStub.returns('1NNN');
+          let submoduleCallback = lotamePanoramaIdSubmodule.getId(
+            {
+              params: {
+                clientId: '1234',
+              },
+            },
+            {
+              gdprApplies: false,
+            }
+          ).callback;
+          submoduleCallback(callBackSpy);
+
+          request = server.requests[0];
+
+          request.respond(
+            200,
+            responseHeader,
+            JSON.stringify({
+              profile_id: '4ec137245858469eb94a4e248f238694',
+              core_id:
+                'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87f',
+              expiry_ts: 3600000,
+            })
+          );
+        });
+
+        it('should call the remote server when getId is called', function () {
+          expect(callBackSpy.calledOnce).to.be.true;
+        });
+
+        it('should pass the usp consent string and client id back', function () {
+          expect(request.url).to.be.eq(
+            'https://id.crwdcntrl.net/id?gdpr_applies=false&us_privacy=1NNN&c=1234'
+          );
+        });
+
+        it('should NOT set an expiry for the client', function () {
+          sinon.assert.neverCalledWith(
+            setCookieStub,
+            'panoramaId_expiry_1234',
+            sinon.match.number
+          );
+        });
+      });
+
+      describe('and an existing pano id', function () {
+        let submoduleCallback;
+
+        beforeEach(function () {
+          getCookieStub
+            .withArgs('panoramaId_expiry')
+            .returns(String(Date.now() + 100000));
+          getCookieStub
+            .withArgs('panoramaId')
+            .returns(
+              'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87c'
+            );
+          submoduleCallback = lotamePanoramaIdSubmodule.getId(
+            {
+              params: {
+                clientId: '1234',
+              },
+            },
+            {
+              gdprApplies: false,
+            }
+          );
+        });
+
+        it('should not call the remote server but use the cached value', function () {
+          expect(submoduleCallback).to.be.eql({
+            id: 'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87c',
+          });
+        });
+
+        it('should NOT set an expiry for the client', function () {
+          sinon.assert.neverCalledWith(
+            setCookieStub,
+            'panoramaId_expiry_1234',
+            sinon.match.number
+          );
+        });
+      });
+    });
+    describe('when client consent has errors', function () {
+      let request;
+      let callBackSpy = sinon.spy();
+
+      beforeEach(function () {
+        let submoduleCallback = lotamePanoramaIdSubmodule.getId(
+          {
+            params: {
+              clientId: '1234',
+            },
+          },
+          {
+            gdprApplies: false,
+          }
+        ).callback;
+        submoduleCallback(callBackSpy);
+
+        request = server.requests[0];
+
+        request.respond(
+          200,
+          responseHeader,
+          JSON.stringify({
+            expiry_ts: 3600000,
+            errors: [111],
+            no_consent: 'CLIENT',
+          })
+        );
+      });
+
+      it('should call the remote server when getId is called', function () {
+        expect(callBackSpy.calledOnce).to.be.true;
+      });
+
+      it('should pass client id back', function () {
+        expect(request.url).to.be.eq(
+          'https://id.crwdcntrl.net/id?gdpr_applies=false&c=1234'
+        );
+      });
+
+      it('should set the received expiry for the client', function() {
+        sinon.assert.calledWith(
+          setCookieStub,
+          'panoramaId_expiry_1234',
+          3600000
+        );
+      });
+
+      it('should not clear the cache for the panorama id', function() {
+        sinon.assert.neverCalledWith(
+          setCookieStub,
+          'panoramaId',
+          sinon.match.any
+        );
+      });
+
+      it('should not clear the cache for the panorama id expiry', function () {
+        sinon.assert.neverCalledWith(
+          setCookieStub,
+          'panoramaId_expiry',
+          sinon.match.any
+        );
+      });
     });
   });
 });
diff --git a/test/spec/modules/lunamediaBidAdapter_spec.js b/test/spec/modules/lunamediaBidAdapter_spec.js
deleted file mode 100755
index fc8648bf8a0..00000000000
--- a/test/spec/modules/lunamediaBidAdapter_spec.js
+++ /dev/null
@@ -1,137 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/lunamediaBidAdapter.js';
-import { BANNER, VIDEO } from 'src/mediaTypes.js';
-
-describe('lunamediaBidAdapter', function () {
-  let bidRequests;
-  let bidRequestsVid;
-
-  beforeEach(function () {
-    bidRequests = [{'bidder': 'lunamedia', 'params': {'pubid': '0cf8d6d643e13d86a5b6374148a4afac', 'floor': 0.5, 'placement': 1234}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': 'f72931e6-2b0e-4e37-a2bc-1ea912141f81', 'sizes': [[300, 250]], 'bidId': '2aa73f571eaf29', 'bidderRequestId': '1bac84515a7af3', 'auctionId': '5dbc60fa-1aa1-41ce-9092-e6bbd4d478f7', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
-
-    bidRequestsVid = [{'bidder': 'lunamedia', 'params': {'pubid': '8537f00948fc37cc03c5f0f88e198a76', 'floor': 1.0, 'placement': 1234, 'video': {'id': 123, 'skip': 1, 'mimes': ['video/mp4', 'application/javascript'], 'playbackmethod': [2, 6], 'maxduration': 30}}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'video': {'playerSize': [[320, 480]], 'context': 'instream'}}, 'adUnitCode': 'video1', 'transactionId': '8b060952-93f7-4863-af44-bb8796b97c42', 'sizes': [], 'bidId': '25c6ab92aa0e81', 'bidderRequestId': '1d420b73a013fc', 'auctionId': '9a69741c-34fb-474c-83e1-cfa003aaee17', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
-  });
-
-  describe('spec.isBidRequestValid', function () {
-    it('should return true when the required params are passed for banner', function () {
-      const bidRequest = bidRequests[0];
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
-
-    it('should return true when the required params are passed for video', function () {
-      const bidRequests = bidRequestsVid[0];
-      expect(spec.isBidRequestValid(bidRequests)).to.equal(true);
-    });
-
-    it('should return false when no pub id params are passed', function () {
-      const bidRequest = bidRequests[0];
-      bidRequest.params.pubid = '';
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    });
-
-    it('should return false when no placement params are passed', function () {
-      const bidRequest = bidRequests[0];
-      bidRequest.params.placement = '';
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    });
-
-    it('should return false when a bid request is not passed', function () {
-      expect(spec.isBidRequestValid()).to.equal(false);
-      expect(spec.isBidRequestValid({})).to.equal(false);
-    });
-  });
-
-  describe('spec.buildRequests', function () {
-    it('should create a POST request for each bid', function () {
-      const bidRequest = bidRequests[0];
-      const requests = spec.buildRequests([ bidRequest ]);
-      expect(requests[0].method).to.equal('POST');
-    });
-
-    it('should create a POST request for each bid in video request', function () {
-      const bidRequest = bidRequestsVid[0];
-      const requests = spec.buildRequests([ bidRequest ]);
-      expect(requests[0].method).to.equal('POST');
-    });
-
-    it('should have domain in request', function () {
-      const bidRequest = bidRequests[0];
-      const requests = spec.buildRequests([ bidRequest ]);
-      expect(requests[0].data.site.domain).length !== 0;
-    });
-  });
-
-  describe('spec.interpretResponse', function () {
-    describe('for banner bids', function () {
-      it('should return no bids if the response is not valid', function () {
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { banner: {} };
-        const bidResponse = spec.interpretResponse({ body: null }, { bidRequest });
-
-        if (typeof bidResponse !== 'undefined') {
-          expect(bidResponse.length).to.equal(0);
-        } else {
-          expect(true).to.equal(true);
-        }
-      });
-
-      it('should return no bids if the response is empty', function () {
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { banner: {} };
-        const bidResponse = spec.interpretResponse({ body: [] }, { bidRequest });
-        if (typeof bidResponse !== 'undefined') {
-          expect(bidResponse.length).to.equal(0);
-        } else { expect(true).to.equal(true); }
-      });
-
-      it('should return valid video bid responses', function () {
-        let _mediaTypes = VIDEO;
-        const lunamediabidreqVid = {'bidRequest': {'mediaTypes': {'video': {'w': 320, 'h': 480}}}};
-        const serverResponseVid = {'cur': 'USD', 'id': '25c6ab92aa0e81', 'seatbid': [{'seat': '3', 'bid': [{'crid': '1855', 'h': 480, 'protocol': 2, 'nurl': 'http://api.lunamedia.io/xp/evt?pp=1MO1wiaMhhq7wLRzZZwwwPkJxxKpYEnM5k5MH4qSGm1HR8rp3Nl7vDocvzZzSAvE4pnREL9mQ1kf5PDjk6E8em6DOk7vVrYUH1TYQyqCucd58PFpJNN7h30RXKHHFg3XaLuQ3PKfMuI1qZATBJ6WHcu875y0hqRdiewn0J4JsCYF53M27uwmcV0HnQxARQZZ72mPqrW95U6wgkZljziwKrICM3aBV07TU6YK5R5AyzJRuD6mtrQ2xtHlQ3jXVYKE5bvWFiUQd90t0jOGhPtYBNoOfP7uQ4ZZj4pyucxbr96orHe9PSOn9UpCSWArdx7s8lOfDpwOvbMuyGxynbStDWm38sDgd4bMHnIt762m5VMDNJfiUyX0vWzp05OsufJDVEaWhAM62i40lQZo7mWP4ipoOWLkmlaAzFIMsTcNaHAHiKKqGEOZLkCEhFNM0SLcvgN2HFRULOOIZvusq7TydOKxuXgCS91dLUDxDDDFUK83BFKlMkTxnCzkLbIR1bd9GKcr1TRryOrulyvRWAKAIhEsUzsc5QWFUhmI2dZ1eqnBQJ0c89TaPcnoaP2WipF68UgyiOstf2CBy0M34858tC5PmuQwQYwXscg6zyqDwR0i9MzGH4FkTyU5yeOlPcsA0ht6UcoCdFpHpumDrLUwAaxwGk1Nj8S6YlYYT5wNuTifDGbg22QKXzZBkUARiyVvgPn9nRtXnrd7WmiMYq596rya9RQj7LC0auQW8bHVQLEe49shsZDnAwZTWr4QuYKqgRGZcXteG7RVJe0ryBZezOq11ha9C0Lv0siNVBahOXE35Wzoq4c4BDaGpqvhaKN7pjeWLGlQR04ufWekwxiMWAvjmfgAfexBJ7HfbYNZpq__', 'adid': '61_1855', 'adomain': ['chevrolet.com.ar'], 'price': 2, 'w': 320, 'iurl': 'https://daf37cpxaja7f.cloudfront.net/c61/creative_url_14922301369663_1.png', 'cat': ['IAB2'], 'id': '7f570b40-aca1-4806-8ea8-818ea679c82b_0', 'attr': [], 'impid': '0', 'cid': '61'}]}], 'bidid': '7f570b40-aca1-4806-8ea8-818ea679c82b'}
-        const bidResponseVid = spec.interpretResponse({ body: serverResponseVid }, lunamediabidreqVid);
-        delete bidResponseVid['vastUrl'];
-        delete bidResponseVid['ad'];
-        expect(bidResponseVid).to.deep.equal({
-          requestId: bidRequestsVid[0].bidId,
-          bidderCode: 'lunamedia',
-          creativeId: serverResponseVid.seatbid[0].bid[0].crid,
-          cpm: serverResponseVid.seatbid[0].bid[0].price,
-          width: serverResponseVid.seatbid[0].bid[0].w,
-          height: serverResponseVid.seatbid[0].bid[0].h,
-          mediaType: 'video',
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 60
-        });
-      });
-
-      it('should return valid banner bid responses', function () {
-        const lunamediabidreq = {bids: {}};
-        bidRequests.forEach(bid => {
-          let _mediaTypes = (bid.mediaTypes && bid.mediaTypes.video ? VIDEO : BANNER);
-          lunamediabidreq.bids[bid.bidId] = {mediaTypes: _mediaTypes,
-            w: _mediaTypes == BANNER ? bid.mediaTypes[_mediaTypes].sizes[0][0] : bid.mediaTypes[_mediaTypes].playerSize[0],
-            h: _mediaTypes == BANNER ? bid.mediaTypes[_mediaTypes].sizes[0][1] : bid.mediaTypes[_mediaTypes].playerSize[1]
-
-          };
-        });
-        const serverResponse = {'id': '2aa73f571eaf29', 'seatbid': [{'bid': [{'id': '2c5e8a1a84522d', 'impid': '2c5e8a1a84522d', 'price': 0.81, 'adid': 'abcde-12345', 'nurl': '', 'adm': '<div><img src=\'http://cdnin.bnmla.com/0b1c6e85e9376e3092df8c9fc8ab9095.gif\' width=350 height=250 /></div>', 'adomain': ['advertiserdomain.com'], 'iurl': '', 'cid': 'campaign1', 'crid': 'abcde-12345', 'w': 300, 'h': 250}], 'seat': '19513bcfca8006'}], 'bidid': '19513bcfca8006', 'cur': 'USD', 'w': 300, 'h': 250};
-
-        const bidResponse = spec.interpretResponse({ body: serverResponse }, lunamediabidreq);
-        expect(bidResponse).to.deep.equal({
-          requestId: bidRequests[0].bidId,
-          ad: serverResponse.seatbid[0].bid[0].adm,
-          bidderCode: 'lunamedia',
-          creativeId: serverResponse.seatbid[0].bid[0].crid,
-          cpm: serverResponse.seatbid[0].bid[0].price,
-          width: serverResponse.seatbid[0].bid[0].w,
-          height: serverResponse.seatbid[0].bid[0].h,
-          mediaType: 'banner',
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 60
-        });
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/lunamediahbBidAdapter_spec.js b/test/spec/modules/lunamediahbBidAdapter_spec.js
new file mode 100644
index 00000000000..181b6e75fe7
--- /dev/null
+++ b/test/spec/modules/lunamediahbBidAdapter_spec.js
@@ -0,0 +1,330 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/lunamediahbBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('LunamediaHBBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'lunamediahb',
+    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://balancer.lmgssp.com/?c=o&m=multi');
+    });
+    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');
+      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');
+    });
+
+    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', 'wPlayer', 'hPlayer', 'schain', 'videoContext');
+      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');
+      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');
+      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');
+      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');
+      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;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cookie.lmgssp.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cookie.lmgssp.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/luponmediaBidAdapter_spec.js b/test/spec/modules/luponmediaBidAdapter_spec.js
old mode 100644
new mode 100755
index 39c915e38b8..9f109ff1892
--- a/test/spec/modules/luponmediaBidAdapter_spec.js
+++ b/test/spec/modules/luponmediaBidAdapter_spec.js
@@ -135,7 +135,7 @@ describe('luponmediaBidAdapter', function () {
       'auctionStart': 1587413920820,
       'timeout': 2000,
       'refererInfo': {
-        'referer': 'https://novi.ba/clanak/176067/fast-car-beginner-s-guide-to-tuning-turbo-engines',
+        'page': 'https://novi.ba/clanak/176067/fast-car-beginner-s-guide-to-tuning-turbo-engines',
         'reachedTop': true,
         'numIframes': 0,
         'stack': [
@@ -364,4 +364,49 @@ describe('luponmediaBidAdapter', function () {
       expect(checkSchain).to.equal(false);
     });
   });
+
+  describe('onBidWon', function () {
+    const bidWonEvent = {
+      'bidderCode': 'luponmedia',
+      'width': 300,
+      'height': 250,
+      'statusMessage': 'Bid available',
+      'adId': '105bbf8c54453ff',
+      'requestId': '934b8752185955',
+      'mediaType': 'banner',
+      'source': 'client',
+      'cpm': 0.364,
+      'creativeId': '443801010',
+      'currency': 'USD',
+      'netRevenue': false,
+      'ttl': 300,
+      'referrer': '',
+      'ad': '',
+      'auctionId': '926a8ea3-3dd4-4bf2-95ab-c85c2ce7e99b',
+      'responseTimestamp': 1598527728026,
+      'requestTimestamp': 1598527727629,
+      'bidder': 'luponmedia',
+      'adUnitCode': 'div-gpt-ad-1533155193780-5',
+      'timeToRespond': 397,
+      'size': '300x250',
+      'status': 'rendered'
+    };
+
+    let ajaxStub;
+
+    beforeEach(() => {
+      ajaxStub = sinon.stub(spec, 'sendWinningsToServer')
+    })
+
+    afterEach(() => {
+      ajaxStub.restore()
+    })
+
+    it('calls luponmedia\'s callback endpoint', () => {
+      const result = spec.onBidWon(bidWonEvent);
+      expect(result).to.equal(undefined);
+      expect(ajaxStub.calledOnce).to.equal(true);
+      expect(ajaxStub.firstCall.args[0]).to.deep.equal(JSON.stringify(bidWonEvent));
+    });
+  });
 });
diff --git a/test/spec/modules/mabidderBidAdapter_spec.js b/test/spec/modules/mabidderBidAdapter_spec.js
new file mode 100644
index 00000000000..cd9599b375c
--- /dev/null
+++ b/test/spec/modules/mabidderBidAdapter_spec.js
@@ -0,0 +1,125 @@
+import { expect } from 'chai'
+import { baseUrl, spec } from 'modules/mabidderBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+import { BANNER } from '../../../src/mediaTypes.js';
+
+describe('mabidderBidAdapter', () => {
+  const adapter = newBidder(spec)
+  const bidRequestBanner = {
+    'bidId': '12345',
+    'bidder': 'mabidder',
+    'sizes': [[300, 250]],
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250]]
+      }
+    },
+    'params': {
+      'ppid': 'string1',
+    }
+
+  }
+
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', () => {
+    it('should return true when required params are found', () => {
+      expect(spec.isBidRequestValid(bidRequestBanner)).to.equal(true)
+    })
+
+    it('should return false when required params are not found', () => {
+      let bid = Object.assign({}, bidRequestBanner)
+      const ppid = bid.params.ppid
+      delete bid.params.ppid
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+      bid.params.ppid = ppid
+
+      bid = Object.assign({}, bidRequestBanner)
+      const params = bidRequestBanner.params
+      delete bid.params
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+      bidRequestBanner.params = params
+    })
+  })
+
+  describe('buildRequests', () => {
+    const bidRequests = [bidRequestBanner]
+    const req = spec.buildRequests(bidRequests, {
+      auctionId: '123',
+      refererInfo: {
+        referer: 'http://test.com/path.html'
+      }
+    })
+
+    it('sends bid request to ENDPOINT via POST', () => {
+      expect(req.method).to.equal('POST')
+      expect(req.url.indexOf('https://')).to.equal(0)
+      expect(req.url).to.equal(baseUrl)
+    })
+
+    it('contains prebid version parameter', () => {
+      expect(req.data.v).to.equal($$PREBID_GLOBAL$$.version)
+    })
+
+    it('sends the correct bid parameters for banner', () => {
+      expect(req.data.bids[0].bidId).to.equal(bidRequestBanner.bidId)
+      expect(req.data.bids[0].ppid).to.equal(bidRequestBanner.params.ppid)
+      expect(req.data.bids[0].sizes[0].width).to.equal(bidRequestBanner.sizes[0][0])
+      expect(req.data.bids[0].sizes[0].height).to.equal(bidRequestBanner.sizes[0][1])
+    })
+
+    it('accepts an optional fpd parameter', () => {
+      expect(req.data.fpd).to.exist.and.to.be.a('Object')
+    })
+  })
+
+  describe('interpretResponse', () => {
+    it('handles banner request and should get correct bid response', () => {
+      const BIDDER_RESPONSE_BANNER = {
+        'Responses': [{
+          'width': 300,
+          'height': 250,
+          'creativeId': '123abc',
+          'ad': '<!-- Creative -->',
+          'cpm': 0.5,
+          'requestId': 'abc123',
+          'ttl': 60,
+          'netRevenue': true,
+          'currency': 'USD',
+          'mediaType': BANNER,
+          'meta': {
+            'advertiserDomains': ['https://loblaws.ca']
+          }
+        }]
+      }
+      const results = spec.interpretResponse({ body: BIDDER_RESPONSE_BANNER }, {})
+      const response = results[0]
+      expect(results.length).to.equal(BIDDER_RESPONSE_BANNER.Responses.length)
+      expect(response).to.have.property('ad').equal('<!-- Creative -->')
+      expect(response).to.have.property('requestId').equal('abc123')
+      expect(response).to.have.property('cpm').equal(0.5)
+      expect(response).to.have.property('currency').equal('USD')
+      expect(response).to.have.property('width').equal(300)
+      expect(response).to.have.property('height').equal(250)
+      expect(response).to.have.property('ttl').equal(60)
+      expect(response).to.have.property('creativeId').equal('123abc')
+      expect(response).to.have.property('mediaType').equal(BANNER)
+      expect(response).to.have.property('meta')
+      expect(response.meta).to.have.property('advertiserDomains')
+      expect(response.meta.advertiserDomains).to.be.an('array')
+      expect(response.meta.advertiserDomains[0]).equal('https://loblaws.ca')
+    })
+
+    it('handles no bid response by returning empty array', () => {
+      let result = spec.interpretResponse({ body: undefined }, {})
+      expect(result).to.deep.equal([])
+
+      result = spec.interpretResponse({ body: '' }, {})
+      expect(result).to.deep.equal([])
+    })
+  })
+})
diff --git a/test/spec/modules/madvertiseBidAdapter_spec.js b/test/spec/modules/madvertiseBidAdapter_spec.js
index 041b49ef69e..466d30acdd3 100644
--- a/test/spec/modules/madvertiseBidAdapter_spec.js
+++ b/test/spec/modules/madvertiseBidAdapter_spec.js
@@ -1,57 +1,57 @@
 import {expect} from 'chai';
-import {config} from 'src/config.js';
-import * as utils from 'src/utils.js';
-import {spec} from 'modules/madvertiseBidAdapter.js';
+import {config} from 'src/config';
+import * as utils from 'src/utils';
+import {spec} from 'modules/madvertiseBidAdapter';
 
-describe('madvertise adapater', function () {
-  describe('Test validate req', function () {
-    it('should accept minimum valid bid', function () {
+describe('madvertise adapater', () => {
+  describe('Test validate req', () => {
+    it('should accept minimum valid bid', () => {
       let bid = {
         bidder: 'madvertise',
         sizes: [[728, 90]],
         params: {
-          s: 'test'
+          zoneId: 'test'
         }
       };
       const isValid = spec.isBidRequestValid(bid);
 
-      expect(isValid).to.equal(true);
+      expect(isValid).to.equal(false);
     });
-    it('should reject no sizes', function () {
+    it('should reject no sizes', () => {
       let bid = {
         bidder: 'madvertise',
         params: {
-          s: 'test'
+          zoneId: 'test'
         }
       };
       const isValid = spec.isBidRequestValid(bid);
 
       expect(isValid).to.equal(false);
     });
-    it('should reject empty sizes', function () {
+    it('should reject empty sizes', () => {
       let bid = {
         bidder: 'madvertise',
         sizes: [],
         params: {
-          s: 'test'
+          zoneId: 'test'
         }
       };
       const isValid = spec.isBidRequestValid(bid);
 
       expect(isValid).to.equal(false);
     });
-    it('should reject wrong format sizes', function () {
+    it('should reject wrong format sizes', () => {
       let bid = {
         bidder: 'madvertise',
         sizes: [['728x90']],
         params: {
-          s: 'test'
+          zoneId: 'test'
         }
       };
       const isValid = spec.isBidRequestValid(bid);
       expect(isValid).to.equal(false);
     });
-    it('should reject no params', function () {
+    it('should reject no params', () => {
       let bid = {
         bidder: 'madvertise',
         sizes: [[728, 90]]
@@ -60,7 +60,7 @@ describe('madvertise adapater', function () {
 
       expect(isValid).to.equal(false);
     });
-    it('should reject missing s', function () {
+    it('should reject missing s', () => {
       let bid = {
         bidder: 'madvertise',
         params: {}
@@ -71,7 +71,7 @@ describe('madvertise adapater', function () {
     });
   });
 
-  describe('Test build request', function () {
+  describe('Test build request', () => {
     beforeEach(function () {
       let mockConfig = {
         consentManagement: {
@@ -97,13 +97,13 @@ describe('madvertise adapater', function () {
       auctionId: '18fd8b8b0bd757',
       bidderRequestId: '418b37f85e772c',
       params: {
-        s: 'test',
+        zoneId: 'test',
       }
     }];
-    it('minimum request with gdpr consent', function () {
+    it('minimum request with gdpr consent', () => {
       let bidderRequest = {
         gdprConsent: {
-          consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+          consentString: 'CO_5mtSPHOmEIAsAkBFRBOCsAP_AAH_AAAqIHQgB7SrERyNAYWB5gusAKYlfQAQCA2AABAYdASgJQQBAMJYEkGAIuAnAACAKAAAEIHQAAAAlCCmABAEAAIABBSGMAQgABZAAIiAEEAATAABACAABGYCSCAIQjIAAAAEAgEKEAAoAQGBAAAEgBABAAAogACADAgXmACIKkQBAkBAYAkAYQAogAhAAAAAIAAAAAAAKAABAAAghAAQQAAAAAAAAAgAAAAABAAAAAAAAQAAAAAAAAABAAgAAAAAAAAAIAAAAAAAAAAAAAAAABAAAAAAAAAAAQCAKCgBgEQALgAqkJADAIgAXABVIaACAAERABAACKgAgABA',
           vendorData: {},
           gdprApplies: true
         }
@@ -114,15 +114,15 @@ describe('madvertise adapater', function () {
       expect(req[0]).to.have.property('method');
       expect(req[0].method).to.equal('GET');
       expect(req[0]).to.have.property('url');
-      expect(req[0].url).to.contain('https://mobile.mng-ads.com/?rt=bid_request&v=1.0');
-      expect(req[0].url).to.contain(`&s=test`);
+      expect(req[0].url).to.contain('//mobile.mng-ads.com/?rt=bid_request&v=1.0');
+      expect(req[0].url).to.contain(`&zoneId=test`);
       expect(req[0].url).to.contain(`&sizes[0]=728x90`);
       expect(req[0].url).to.contain(`&gdpr=1`);
       expect(req[0].url).to.contain(`&consent[0][format]=IAB`);
-      expect(req[0].url).to.contain(`&consent[0][value]=BOJ/P2HOJ/P2HABABMAAAAAZ+A==`)
+      expect(req[0].url).to.contain(`&consent[0][value]=CO_5mtSPHOmEIAsAkBFRBOCsAP_AAH_AAAqIHQgB7SrERyNAYWB5gusAKYlfQAQCA2AABAYdASgJQQBAMJYEkGAIuAnAACAKAAAEIHQAAAAlCCmABAEAAIABBSGMAQgABZAAIiAEEAATAABACAABGYCSCAIQjIAAAAEAgEKEAAoAQGBAAAEgBABAAAogACADAgXmACIKkQBAkBAYAkAYQAogAhAAAAAIAAAAAAAKAABAAAghAAQQAAAAAAAAAgAAAAABAAAAAAAAQAAAAAAAAABAAgAAAAAAAAAIAAAAAAAAAAAAAAAABAAAAAAAAAAAQCAKCgBgEQALgAqkJADAIgAXABVIaACAAERABAACKgAgABA`)
     });
 
-    it('minimum request without gdpr consent', function () {
+    it('minimum request without gdpr consent', () => {
       let bidderRequest = {};
       const req = spec.buildRequests(bid, bidderRequest);
 
@@ -130,8 +130,8 @@ describe('madvertise adapater', function () {
       expect(req[0]).to.have.property('method');
       expect(req[0].method).to.equal('GET');
       expect(req[0]).to.have.property('url');
-      expect(req[0].url).to.contain('https://mobile.mng-ads.com/?rt=bid_request&v=1.0');
-      expect(req[0].url).to.contain(`&s=test`);
+      expect(req[0].url).to.contain('//mobile.mng-ads.com/?rt=bid_request&v=1.0');
+      expect(req[0].url).to.contain(`&zoneId=test`);
       expect(req[0].url).to.contain(`&sizes[0]=728x90`);
       expect(req[0].url).not.to.contain(`&gdpr=1`);
       expect(req[0].url).not.to.contain(`&consent[0][format]=`);
@@ -139,8 +139,8 @@ describe('madvertise adapater', function () {
     });
   });
 
-  describe('Test interpret response', function () {
-    it('General banner response', function () {
+  describe('Test interpret response', () => {
+    it('General banner response', () => {
       let bid = {
         bidder: 'madvertise',
         sizes: [[728, 90]],
@@ -150,7 +150,7 @@ describe('madvertise adapater', function () {
         auctionId: '18fd8b8b0bd757',
         bidderRequestId: '418b37f85e772c',
         params: {
-          s: 'test',
+          zoneId: 'test',
           connection_type: 'WIFI',
           age: 25,
         }
@@ -165,7 +165,8 @@ describe('madvertise adapater', function () {
         dealId: 'DEAL_ID',
         ttl: 180,
         currency: 'EUR',
-        netRevenue: true
+        netRevenue: true,
+        adomain: ['madvertise.com']
       }}, {bidId: bid.bidId});
 
       expect(resp).to.exist.and.to.be.a('array');
@@ -179,8 +180,9 @@ describe('madvertise adapater', function () {
       expect(resp[0]).to.have.property('netRevenue', true);
       expect(resp[0]).to.have.property('currency', 'EUR');
       expect(resp[0]).to.have.property('dealId', 'DEAL_ID');
+      // expect(resp[0].adomain).to.deep.equal(['madvertise.com']);
     });
-    it('No response', function () {
+    it('No response', () => {
       let bid = {
         bidder: 'madvertise',
         sizes: [[728, 90]],
@@ -190,7 +192,7 @@ describe('madvertise adapater', function () {
         auctionId: '18fd8b8b0bd757',
         bidderRequestId: '418b37f85e772c',
         params: {
-          s: 'test',
+          zoneId: 'test',
           connection_type: 'WIFI',
           age: 25,
         }
diff --git a/test/spec/modules/magniteAnalyticsAdapter_spec.js b/test/spec/modules/magniteAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..3606b4b4550
--- /dev/null
+++ b/test/spec/modules/magniteAnalyticsAdapter_spec.js
@@ -0,0 +1,2010 @@
+import magniteAdapter, {
+  parseBidResponse,
+  getHostNameFromReferer,
+  storage,
+  rubiConf,
+} from '../../../modules/magniteAnalyticsAdapter.js';
+import CONSTANTS from 'src/constants.json';
+import { config } from 'src/config.js';
+import { server } from 'test/mocks/xhr.js';
+import * as mockGpt from '../integration/faker/googletag.js';
+import {
+  setConfig,
+  addBidResponseHook,
+} from 'modules/currency.js';
+import { getGlobal } from '../../../src/prebidGlobal.js';
+import { deepAccess } from '../../../src/utils.js';
+
+let events = require('src/events.js');
+let utils = require('src/utils.js');
+
+const {
+  EVENTS: {
+    AUCTION_INIT,
+    AUCTION_END,
+    BID_REQUESTED,
+    BID_RESPONSE,
+    BIDDER_DONE,
+    BID_WON,
+    BID_TIMEOUT,
+    BILLABLE_EVENT
+  }
+} = CONSTANTS;
+
+const STUBBED_UUID = '12345678-1234-1234-1234-123456789abc';
+
+// Mock Event Data
+const MOCK = {
+  AUCTION_INIT: {
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'timestamp': 1658868383741,
+    'adUnits': [
+      {
+        'code': 'box',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ]
+          }
+        },
+        'bids': [
+          {
+            'bidder': 'rubicon',
+            'params': {
+              'accountId': 1001,
+              'siteId': 267318,
+              'zoneId': 1861698
+            }
+          }
+        ],
+        'sizes': [
+          [
+            300,
+            250
+          ]
+        ],
+        'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+        'ortb2Imp': {
+          'ext': {
+            'tid': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+            'data': {
+              'adserver': {
+                'name': 'gam',
+                'adslot': '/1234567/prebid-slot'
+              },
+              'pbadslot': '/1234567/prebid-slot'
+            },
+            'gpid': '/1234567/prebid-slot'
+          }
+        }
+      }
+    ],
+    'bidderRequests': [
+      {
+        'bidderCode': 'rubicon',
+        'bids': [
+          {
+            'bidder': 'rubicon',
+            'params': {
+              'accountId': 1001,
+              'siteId': 267318,
+              'zoneId': 1861698,
+            },
+            'adUnitCode': 'box',
+            'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+            'bidId': '23fcd8cf4bf0d7',
+            'src': 'client',
+            'startTime': 1658868383748
+          }
+        ],
+        'refererInfo': {
+          'page': 'http://a-test-domain.com:8000/test_pages/sanity/TEMP/prebidTest.html?pbjs_debug=true',
+        },
+      }
+    ],
+    'timeout': 3000,
+    'config': {
+      'accountId': 1001,
+      'endpoint': 'https://pba-event-service-alb-dev.use1.fanops.net/event'
+    }
+  },
+  BID_REQUESTED: {
+    'bidderCode': 'rubicon',
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+    'bids': [
+      {
+        'bidder': 'rubicon',
+        'params': {
+          'accountId': 1001,
+          'siteId': 267318,
+          'zoneId': 1861698,
+        },
+        'adUnitCode': 'box',
+        'bidId': '23fcd8cf4bf0d7',
+        'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+        'src': 'client',
+      }
+    ]
+  },
+  BID_RESPONSE: {
+    'bidderCode': 'rubicon',
+    'width': 300,
+    'height': 250,
+    'adId': '3c0b59947ced11',
+    'requestId': '23fcd8cf4bf0d7',
+    'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'mediaType': 'banner',
+    'source': 'client',
+    'currency': 'USD',
+    'creativeId': '4954828',
+    'cpm': 3.4,
+    'ttl': 300,
+    'netRevenue': true,
+    'ad': '<html></html>',
+    'bidder': 'rubicon',
+    'adUnitCode': 'box',
+    'timeToRespond': 271,
+    'size': '300x250',
+    'status': 'rendered',
+    getStatusCode: () => 1,
+  },
+  AUCTION_END: {
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'auctionEnd': 1658868384019,
+  },
+  BIDDER_DONE: {
+    'bidderCode': 'rubicon',
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'bids': [
+      {
+        'bidder': 'rubicon',
+        'adUnitCode': 'box',
+        'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+        'bidId': '23fcd8cf4bf0d7',
+        'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+        'src': 'client',
+      }
+    ]
+  },
+  BID_WON: {
+    'bidderCode': 'rubicon',
+    'bidId': '23fcd8cf4bf0d7',
+    'adId': '3c0b59947ced11',
+    'requestId': '23fcd8cf4bf0d7',
+    'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'mediaType': 'banner',
+    'currency': 'USD',
+    'cpm': 3.4,
+    'ttl': 300,
+    'bidder': 'rubicon',
+    'adUnitCode': 'box',
+    'status': 'rendered',
+  }
+}
+
+const ANALYTICS_MESSAGE = {
+  'channel': 'web',
+  'integration': 'pbjs',
+  'referrerUri': 'http://a-test-domain.com:8000/test_pages/sanity/TEMP/prebidTest.html?pbjs_debug=true',
+  'version': '$prebid.version$',
+  'referrerHostname': 'a-test-domain.com',
+  'timestamps': {
+    'timeSincePageLoad': 500,
+    'eventTime': 1519767014281,
+    'prebidLoaded': magniteAdapter.MODULE_INITIALIZED_TIME
+  },
+  'wrapper': {
+    'name': '10000_fakewrapper_test'
+  },
+  'session': {
+    'id': '12345678-1234-1234-1234-123456789abc',
+    'pvid': '12345678',
+    'start': 1519767013781,
+    'expires': 1519788613781
+  },
+  'auctions': [
+    {
+      'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+      'auctionStart': 1658868383741,
+      'samplingFactor': 1,
+      'clientTimeoutMillis': 3000,
+      'accountId': 1001,
+      'bidderOrder': [
+        'rubicon'
+      ],
+      'serverTimeoutMillis': 1000,
+      'adUnits': [
+        {
+          'adUnitCode': 'box',
+          'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+          'mediaTypes': [
+            'banner'
+          ],
+          'dimensions': [
+            {
+              'width': 300,
+              'height': 250
+            }
+          ],
+          'pbAdSlot': '/1234567/prebid-slot',
+          'gpid': '/1234567/prebid-slot',
+          'bids': [
+            {
+              'bidder': 'rubicon',
+              'bidId': '23fcd8cf4bf0d7',
+              'source': 'client',
+              'status': 'success',
+              'clientLatencyMillis': 271,
+              'bidResponse': {
+                'bidPriceUSD': 3.4,
+                'mediaType': 'banner',
+                'dimensions': {
+                  'width': 300,
+                  'height': 250
+                }
+              }
+            }
+          ],
+          'accountId': 1001,
+          'siteId': 267318,
+          'zoneId': 1861698,
+          'status': 'success'
+        }
+      ],
+      'auctionEnd': 1658868384019
+    }
+  ],
+  'gamRenders': [
+    {
+      'adSlot': 'box',
+      'advertiserId': 1111,
+      'creativeId': 2222,
+      'lineItemId': 3333,
+      'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+      'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a'
+    }
+  ],
+  'bidsWon': [
+    {
+      'bidder': 'rubicon',
+      'bidId': '23fcd8cf4bf0d7',
+      'source': 'client',
+      'status': 'success',
+      'clientLatencyMillis': 271,
+      'bidResponse': {
+        'bidPriceUSD': 3.4,
+        'mediaType': 'banner',
+        'dimensions': {
+          'width': 300,
+          'height': 250
+        }
+      },
+      'sourceAuctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+      'renderAuctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+      'sourceTransactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+      'renderTransactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+      'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+      'accountId': 1001,
+      'siteId': 267318,
+      'zoneId': 1861698,
+      'mediaTypes': [
+        'banner'
+      ],
+      'adUnitCode': 'box'
+    }
+  ],
+  'trigger': 'gam-delayed'
+}
+
+describe('magnite analytics adapter', function () {
+  let sandbox;
+  let clock;
+  let getDataFromLocalStorageStub, setDataInLocalStorageStub, localStorageIsEnabledStub, removeDataFromLocalStorageStub;
+  let gptSlot0;
+  let gptSlotRenderEnded0;
+  beforeEach(function () {
+    mockGpt.enable();
+    gptSlot0 = mockGpt.makeSlot({ code: 'box' });
+    gptSlotRenderEnded0 = {
+      eventName: 'slotRenderEnded',
+      params: {
+        slot: gptSlot0,
+        isEmpty: false,
+        advertiserId: 1111,
+        sourceAgnosticCreativeId: 2222,
+        sourceAgnosticLineItemId: 3333
+      }
+    };
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    setDataInLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
+    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    removeDataFromLocalStorageStub = sinon.stub(storage, 'removeDataFromLocalStorage')
+    sandbox = sinon.sandbox.create();
+
+    localStorageIsEnabledStub.returns(true);
+
+    sandbox.stub(events, 'getEvents').returns([]);
+
+    sandbox.stub(utils, 'generateUUID').returns(STUBBED_UUID);
+
+    clock = sandbox.useFakeTimers(1519767013781);
+
+    magniteAdapter.referrerHostname = '';
+
+    config.setConfig({
+      s2sConfig: {
+        timeout: 1000,
+        accountId: 10000,
+      },
+      rubicon: {
+        wrapperName: '10000_fakewrapper_test'
+      }
+    })
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    config.resetConfig();
+    mockGpt.enable();
+    getDataFromLocalStorageStub.restore();
+    setDataInLocalStorageStub.restore();
+    localStorageIsEnabledStub.restore();
+    removeDataFromLocalStorageStub.restore();
+    magniteAdapter.disableAnalytics();
+  });
+
+  it('should require accountId', function () {
+    sandbox.stub(utils, 'logError');
+
+    magniteAdapter.enableAnalytics({
+      options: {
+        endpoint: '//localhost:9999/event'
+      }
+    });
+
+    expect(utils.logError.called).to.equal(true);
+  });
+
+  it('should require endpoint', function () {
+    sandbox.stub(utils, 'logError');
+
+    magniteAdapter.enableAnalytics({
+      options: {
+        accountId: 1001
+      }
+    });
+
+    expect(utils.logError.called).to.equal(true);
+  });
+
+  describe('config subscribe', function () {
+    it('should update the pvid if user asks', function () {
+      expect(utils.generateUUID.called).to.equal(false);
+      config.setConfig({ rubicon: { updatePageView: true } });
+      expect(utils.generateUUID.called).to.equal(true);
+    });
+    it('should merge in and preserve older set configs', function () {
+      config.setConfig({
+        rubicon: {
+          wrapperName: '1001_general',
+          int_type: 'dmpbjs',
+          fpkvs: {
+            source: 'fb'
+          },
+          updatePageView: true
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 500,
+        analyticsBatchTimeout: 5000,
+        analyticsProcessDelay: 1,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          source: 'fb'
+        },
+        updatePageView: true
+      });
+
+      // update it with stuff
+      config.setConfig({
+        rubicon: {
+          analyticsBatchTimeout: 3000,
+          fpkvs: {
+            link: 'email'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 500,
+        analyticsBatchTimeout: 3000,
+        analyticsProcessDelay: 1,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          source: 'fb',
+          link: 'email'
+        },
+        updatePageView: true
+      });
+
+      // overwriting specific edge keys should update them
+      config.setConfig({
+        rubicon: {
+          fpkvs: {
+            link: 'iMessage',
+            source: 'twitter'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 500,
+        analyticsBatchTimeout: 3000,
+        analyticsProcessDelay: 1,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          link: 'iMessage',
+          source: 'twitter'
+        },
+        updatePageView: true
+      });
+    });
+  });
+
+  describe('when handling events', function () {
+    function performStandardAuction({
+      gptEvents = [gptSlotRenderEnded0],
+      auctionId = MOCK.AUCTION_INIT.auctionId,
+      eventDelay = rubiConf.analyticsEventDelay,
+      sendBidWon = true
+    } = {}) {
+      events.emit(AUCTION_INIT, { ...MOCK.AUCTION_INIT, auctionId });
+      events.emit(BID_REQUESTED, { ...MOCK.BID_REQUESTED, auctionId });
+      events.emit(BID_RESPONSE, { ...MOCK.BID_RESPONSE, auctionId });
+      events.emit(BIDDER_DONE, { ...MOCK.BIDDER_DONE, auctionId });
+      events.emit(AUCTION_END, { ...MOCK.AUCTION_END, auctionId });
+
+      if (gptEvents && gptEvents.length) {
+        gptEvents.forEach(gptEvent => mockGpt.emitEvent(gptEvent.eventName, gptEvent.params));
+      }
+
+      if (sendBidWon) {
+        events.emit(BID_WON, { ...MOCK.BID_WON, auctionId });
+      }
+
+      if (eventDelay > 0) {
+        clock.tick(eventDelay);
+      }
+    }
+
+    beforeEach(function () {
+      magniteAdapter.enableAnalytics({
+        options: {
+          endpoint: '//localhost:9999/event',
+          accountId: 1001
+        }
+      });
+      config.setConfig({ rubicon: { updatePageView: true } });
+    });
+
+    it('should build a batched message from prebid events', function () {
+      performStandardAuction();
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+
+      expect(request.url).to.equal('//localhost:9999/event');
+
+      let message = JSON.parse(request.requestBody);
+
+      expect(message).to.deep.equal(ANALYTICS_MESSAGE);
+    });
+
+    it('should pass along bidderOrder correctly', function () {
+      const auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+
+      auctionInit.bidderRequests = auctionInit.bidderRequests.concat([
+        { bidderCode: 'pubmatic' },
+        { bidderCode: 'ix' },
+        { bidderCode: 'appnexus' }
+      ])
+
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message.auctions[0].bidderOrder).to.deep.equal([
+        'rubicon',
+        'pubmatic',
+        'ix',
+        'appnexus'
+      ]);
+    });
+
+    it('should pass along 1x1 size if no sizes in adUnit', function () {
+      const auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+
+      delete auctionInit.adUnits[0].sizes;
+
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message.auctions[0].adUnits[0].dimensions).to.deep.equal([
+        {
+          width: 1,
+          height: 1
+        }
+      ]);
+    });
+
+    it('should pass along user ids', function () {
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.bidderRequests[0].bids[0].userId = {
+        criteoId: 'sadfe4334',
+        lotamePanoramaId: 'asdf3gf4eg',
+        pubcid: 'dsfa4545-svgdfs5',
+        sharedId: { id1: 'asdf', id2: 'sadf4344' }
+      };
+
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+
+      expect(message.auctions[0].user).to.deep.equal({
+        ids: [
+          { provider: 'criteoId', 'hasId': true },
+          { provider: 'lotamePanoramaId', 'hasId': true },
+          { provider: 'pubcid', 'hasId': true },
+          { provider: 'sharedId', 'hasId': true },
+        ]
+      });
+    });
+
+    // A-Domain tests
+    [
+      { input: ['magnite.com'], expected: ['magnite.com'] },
+      { input: ['magnite.com', 'prebid.org'], expected: ['magnite.com', 'prebid.org'] },
+      { input: [123, 'prebid.org', false, true, [], 'magnite.com', {}], expected: ['prebid.org', 'magnite.com'] },
+      { input: 'not array', expected: undefined },
+      { input: [], expected: undefined },
+    ].forEach((test, index) => {
+      it(`should handle adomain correctly - #${index + 1}`, function () {
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+        let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+        bidResponse.meta = {
+          advertiserDomains: test.input
+        }
+
+        events.emit(BID_RESPONSE, bidResponse);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+        events.emit(BID_WON, MOCK.BID_WON);
+        clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+        let message = JSON.parse(server.requests[0].requestBody);
+        expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.deep.equal(test.expected);
+      });
+
+      // Network Id tests
+      [
+        { input: 'magnite.com', expected: 'magnite.com' },
+        { input: 12345, expected: '12345' },
+        { input: ['magnite.com', 12345], expected: 'magnite.com,12345' }
+      ].forEach((test, index) => {
+        it(`should handle networkId correctly - #${index + 1}`, function () {
+          events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+          events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+          let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+          bidResponse.meta = {
+            networkId: test.input
+          };
+
+          events.emit(BID_RESPONSE, bidResponse);
+          events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+          events.emit(AUCTION_END, MOCK.AUCTION_END);
+          events.emit(BID_WON, MOCK.BID_WON);
+          clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+          let message = JSON.parse(server.requests[0].requestBody);
+          expect(message.auctions[0].adUnits[0].bids[0].bidResponse.networkId).to.equal(test.expected);
+        });
+      });
+    });
+
+    describe('with session handling', function () {
+      const expectedPvid = STUBBED_UUID.slice(0, 8);
+      beforeEach(function () {
+        config.setConfig({ rubicon: { updatePageView: true } });
+      });
+
+      it('should not log any session data if local storage is not enabled', function () {
+        localStorageIsEnabledStub.returns(false);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        delete expectedMessage.session;
+        delete expectedMessage.fpkvs;
+
+        performStandardAuction();
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+
+        expect(request.url).to.equal('//localhost:9999/event');
+
+        let message = JSON.parse(request.requestBody);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should should pass along custom rubicon kv and pvid when defined', function () {
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              source: 'fb',
+              link: 'email'
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'fb' },
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should convert kvs to strings before sending', function () {
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              number: 24,
+              boolean: false,
+              string: 'hello',
+              array: ['one', 2, 'three'],
+              object: { one: 'two' }
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'number', value: '24' },
+          { key: 'boolean', value: 'false' },
+          { key: 'string', value: 'hello' },
+          { key: 'array', value: 'one,2,three' },
+          { key: 'object', value: '[object Object]' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should use the query utm param rubicon kv value and pass updated kv and pvid when defined', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({ 'search': '?utm_source=other', 'pbjs_debug': 'true' });
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              source: 'fb',
+              link: 'email'
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'other' },
+          { key: 'link', value: 'email' }
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should pick up existing localStorage and use its values', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519767017881, // 15 mins before "now"
+          expires: 1519767039481, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('mgniSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519767017881,
+          expires: 1519767039481,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'tw' },
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519767017881, // should have stayed same
+          expires: 1519767039481, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our auction init time
+          fpkvs: { source: 'tw', link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should overwrite matching localstorge value and use its remaining values', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({ 'search': '?utm_source=fb&utm_click=dog' });
+
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519766113781, // 15 mins before "now"
+          expires: 1519787713781, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw', link: 'email' }
+        };
+        getDataFromLocalStorageStub.withArgs('mgniSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519766113781,
+          expires: 1519787713781,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'fb' },
+          { key: 'link', value: 'email' },
+          { key: 'click', value: 'dog' }
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519766113781, // should have stayed same
+          expires: 1519787713781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our auction init time
+          fpkvs: { source: 'fb', link: 'email', click: 'dog' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should throw out session if lastSeen > 30 mins ago and create new one', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519764313781, // 45 mins before "now"
+          expires: 1519785913781, // six hours later
+          lastSeen: 1519764313781, // 45 mins before "now"
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('mgniSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        // session should match what is already in ANALYTICS_MESSAGE, just need to add pvid
+        expectedMessage.session.pvid = expectedPvid;
+
+        // the saved fpkvs should have been thrown out since session expired
+        expectedMessage.fpkvs = [
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: STUBBED_UUID, // should have generated not used input
+          start: 1519767013781, // updated to whenever auction init started
+          expires: 1519788613781, // 6 hours after start
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should throw out session if past expires time and create new one', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519745353781, // 6 hours before "expires"
+          expires: 1519766953781, // little more than six hours ago
+          lastSeen: 1519767008781, // 5 seconds ago
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('mgniSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        // session should match what is already in ANALYTICS_MESSAGE, just need to add pvid
+        expectedMessage.session.pvid = expectedPvid;
+
+        // the saved fpkvs should have been thrown out since session expired
+        expectedMessage.fpkvs = [
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: STUBBED_UUID, // should have generated and not used same one
+          start: 1519767013781, // updated to whenever auction init started
+          expires: 1519788613781, // 6 hours after start
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+    });
+
+    it('should send gam data if adunit has elementid ortb2 fields', function () {
+      // update auction init mock to have the elementids in the adunit
+      // and change adUnitCode to be hashes
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.adUnits[0].ortb2Imp.ext.data.elementid = [gptSlot0.getSlotElementId()];
+      auctionInit.adUnits[0].code = '1a2b3c4d';
+
+      // bid request
+      let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequested.bids[0].adUnitCode = '1a2b3c4d';
+
+      // bid response
+      let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+      bidResponse.adUnitCode = '1a2b3c4d';
+
+      // bidder done
+      let bidderDone = utils.deepClone(MOCK.BIDDER_DONE);
+      bidderDone.bids[0].adUnitCode = '1a2b3c4d';
+
+      // bidder done
+      let bidWon = utils.deepClone(MOCK.BID_WON);
+      bidWon.adUnitCode = '1a2b3c4d';
+
+      // Run auction
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, bidRequested);
+      events.emit(BID_RESPONSE, bidResponse);
+      events.emit(BIDDER_DONE, bidderDone);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      events.emit(BID_WON, bidWon);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // new adUnitCodes in payload
+      expectedMessage.auctions[0].adUnits[0].adUnitCode = '1a2b3c4d';
+      expectedMessage.bidsWon[0].adUnitCode = '1a2b3c4d';
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    it('should delay the event call depending on analyticsEventDelay config', function () {
+      config.setConfig({
+        rubicon: {
+          analyticsEventDelay: 2000
+        }
+      });
+      performStandardAuction({ eventDelay: 0 });
+
+      // Should not be sent until delay
+      expect(server.requests.length).to.equal(0);
+
+      // tick the clock and it should fire
+      clock.tick(2000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      // The timestamps should be changed from the default by (set eventDelay (2000) - eventDelay default (500))
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+      expectedMessage.timestamps.eventTime = expectedMessage.timestamps.eventTime + 1500;
+      expectedMessage.timestamps.timeSincePageLoad = expectedMessage.timestamps.timeSincePageLoad + 1500;
+
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    ['seatBidId', 'pbsBidId'].forEach(pbsParam => {
+      it(`should overwrite prebid bidId with incoming PBS ${pbsParam}`, function () {
+        // bid response
+        let seatBidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+        seatBidResponse[pbsParam] = 'abc-123-do-re-me';
+
+        // Run auction
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, seatBidResponse);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+        // emmit gpt events and bidWon
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+        events.emit(BID_WON, MOCK.BID_WON);
+
+        // tick the event delay time plus processing delay
+        clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+        // new adUnitCodes in payload
+        expectedMessage.auctions[0].adUnits[0].bids[0].bidId = 'abc-123-do-re-me';
+        expectedMessage.auctions[0].adUnits[0].bids[0].oldBidId = '23fcd8cf4bf0d7';
+        expectedMessage.bidsWon[0].bidId = 'abc-123-do-re-me';
+        expect(message).to.deep.equal(expectedMessage);
+      });
+    });
+
+    [0, '0'].forEach(pbsParam => {
+      it(`should generate new bidId if incoming pbsBidId is ${pbsParam}`, function () {
+        // bid response
+        let seatBidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+        seatBidResponse.pbsBidId = pbsParam;
+
+        // Run auction
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, seatBidResponse);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+        // emmit gpt events and bidWon
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+        events.emit(BID_WON, MOCK.BID_WON);
+
+        // tick the event delay time plus processing delay
+        clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+        // new adUnitCodes in payload
+        expectedMessage.auctions[0].adUnits[0].bids[0].bidId = STUBBED_UUID;
+        expectedMessage.auctions[0].adUnits[0].bids[0].oldBidId = '23fcd8cf4bf0d7';
+        expectedMessage.bidsWon[0].bidId = STUBBED_UUID;
+        expect(message).to.deep.equal(expectedMessage);
+      });
+    });
+
+    it(`should pick highest cpm if more than one bidResponse comes in`, function () {
+      // Run auction
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      const bidResp = utils.deepClone(MOCK.BID_RESPONSE);
+
+      // emit some bid responses
+      [1.0, 5.5, 0.1].forEach(cpm => {
+        events.emit(BID_RESPONSE, { ...bidResp, cpm });
+      });
+
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // highest cpm in payload
+      expectedMessage.auctions[0].adUnits[0].bids[0].bidResponse.bidPriceUSD = 5.5;
+      expectedMessage.bidsWon[0].bidResponse.bidPriceUSD = 5.5;
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    it('should send bid won events by themselves if emitted after auction pba payload is sent', function () {
+      performStandardAuction({ sendBidWon: false });
+
+      // Now send bidWon
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      // should see two server requests
+      expect(server.requests.length).to.equal(2);
+
+      // first is normal analytics event without bidWon
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+      delete expectedMessage.bidsWon;
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.deep.equal(expectedMessage);
+
+      // second is just a bidWon (remove gam and auction event)
+      message = JSON.parse(server.requests[1].requestBody);
+
+      let expectedMessage2 = utils.deepClone(ANALYTICS_MESSAGE);
+      delete expectedMessage2.auctions;
+      delete expectedMessage2.gamRenders;
+
+      // second event should be event delay time after first one
+      expectedMessage2.timestamps.eventTime = expectedMessage.timestamps.eventTime + rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay;
+      expectedMessage2.timestamps.timeSincePageLoad = expectedMessage.timestamps.timeSincePageLoad + rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay;
+
+      // trigger is `batched-bidsWon`
+      expectedMessage2.trigger = 'batched-bidsWon';
+
+      expect(message).to.deep.equal(expectedMessage2);
+    });
+
+    it('should send gamRender events by themselves if emitted after auction pba payload is sent', function () {
+      // dont send extra events and hit the batch timeout
+      performStandardAuction({ gptEvents: [], sendBidWon: false, eventDelay: rubiConf.analyticsBatchTimeout });
+
+      // Now send gptEvent and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      // should see two server requests
+      expect(server.requests.length).to.equal(2);
+
+      // first is normal analytics event without bidWon or gam
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+      delete expectedMessage.bidsWon;
+      delete expectedMessage.gamRenders;
+
+      // timing changes a bit -> timestamps should be batchTimeout - event delay later
+      const expectedExtraTime = rubiConf.analyticsBatchTimeout - rubiConf.analyticsEventDelay;
+      expectedMessage.timestamps.eventTime = expectedMessage.timestamps.eventTime + expectedExtraTime;
+      expectedMessage.timestamps.timeSincePageLoad = expectedMessage.timestamps.timeSincePageLoad + expectedExtraTime;
+
+      // since gam event did not fire, the trigger should be auctionEnd
+      expectedMessage.trigger = 'auctionEnd';
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.deep.equal(expectedMessage);
+
+      // second is gam and bid won
+      message = JSON.parse(server.requests[1].requestBody);
+
+      let expectedMessage2 = utils.deepClone(ANALYTICS_MESSAGE);
+      // second event should be event delay time after first one
+      expectedMessage2.timestamps.eventTime = expectedMessage.timestamps.eventTime + rubiConf.analyticsEventDelay;
+      expectedMessage2.timestamps.timeSincePageLoad = expectedMessage.timestamps.timeSincePageLoad + rubiConf.analyticsEventDelay;
+      delete expectedMessage2.auctions;
+
+      // trigger should be `batched-bidsWon-gamRender`
+      expectedMessage2.trigger = 'batched-bidsWon-gamRenders';
+
+      expect(message).to.deep.equal(expectedMessage2);
+    });
+
+    it('should send all events solo if delay and batch set to 0', function () {
+      const defaultDelay = rubiConf.analyticsEventDelay;
+      config.setConfig({
+        rubicon: {
+          analyticsBatchTimeout: 0,
+          analyticsEventDelay: 0,
+          analyticsProcessDelay: 0
+        }
+      });
+
+      performStandardAuction({ eventDelay: 0 });
+
+      // should be 3 requests
+      expect(server.requests.length).to.equal(3);
+
+      // grab expected 3 requests from default message
+      let { auctions, gamRenders, bidsWon, ...rest } = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // rest of payload should have timestamps changed to be - default eventDelay since we changed it to 0
+      rest.timestamps.eventTime = rest.timestamps.eventTime - defaultDelay;
+      rest.timestamps.timeSincePageLoad = rest.timestamps.timeSincePageLoad - defaultDelay;
+
+      // loop through and assert events fired in correct order with correct stuff
+      [
+        { expectedMessage: { auctions, ...rest }, trigger: 'solo-auction' },
+        { expectedMessage: { gamRenders, ...rest }, trigger: 'solo-gam' },
+        { expectedMessage: { bidsWon, ...rest }, trigger: 'solo-bidWon' },
+      ].forEach((stuff, requestNum) => {
+        let message = JSON.parse(server.requests[requestNum].requestBody);
+        stuff.expectedMessage.trigger = stuff.trigger;
+        expect(message).to.deep.equal(stuff.expectedMessage);
+      });
+    });
+
+    it(`should correctly mark bids as timed out`, function () {
+      // Run auction (simulate bidder timed out in 1000 ms)
+      const auctionStart = Date.now() - 1000;
+      events.emit(AUCTION_INIT, { ...MOCK.AUCTION_INIT, timestamp: auctionStart });
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // emit bid timeout
+      events.emit(BID_TIMEOUT, [
+        {
+          auctionId: MOCK.AUCTION_INIT.auctionId,
+          adUnitCode: MOCK.AUCTION_INIT.adUnits[0].code,
+          bidId: MOCK.BID_REQUESTED.bids[0].bidId,
+          transactionId: MOCK.AUCTION_INIT.adUnits[0].transactionId,
+        }
+      ]);
+
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // should see error time out bid
+      expectedMessage.auctions[0].adUnits[0].bids[0].status = 'error';
+      expectedMessage.auctions[0].adUnits[0].bids[0].error = {
+        code: 'timeout-error',
+        description: 'prebid.js timeout' // will help us diff if timeout was set by PBS or PBJS
+      };
+
+      // should not see bidResponse or bidsWon
+      delete expectedMessage.auctions[0].adUnits[0].bids[0].bidResponse;
+      delete expectedMessage.bidsWon;
+
+      // adunit should be marked as error
+      expectedMessage.auctions[0].adUnits[0].status = 'error';
+
+      // timed out in 1000 ms
+      expectedMessage.auctions[0].adUnits[0].bids[0].clientLatencyMillis = 1000;
+
+      expectedMessage.auctions[0].auctionStart = auctionStart;
+
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    [
+      { name: 'aupname', adUnitPath: 'adUnits.0.ortb2Imp.ext.data.aupname', eventPath: 'auctions.0.adUnits.0.pattern', input: '1234/mycoolsite/*&gpt_leaderboard&deviceType=mobile' },
+      { name: 'gpid', adUnitPath: 'adUnits.0.ortb2Imp.ext.gpid', eventPath: 'auctions.0.adUnits.0.gpid', input: '1234/gpid/path' },
+      { name: 'pbadslot', adUnitPath: 'adUnits.0.ortb2Imp.ext.data.pbadslot', eventPath: 'auctions.0.adUnits.0.pbAdSlot', input: '1234/pbadslot/path' }
+    ].forEach(test => {
+      it(`should correctly pass ${test.name}`, function () {
+        // bid response
+        let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+        utils.deepSetValue(auctionInit, test.adUnitPath, test.input);
+
+        // Run auction
+        events.emit(AUCTION_INIT, auctionInit);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+        // emmit gpt events and bidWon
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+        events.emit(BID_WON, MOCK.BID_WON);
+
+        // tick the event delay time plus processing delay
+        clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        // pattern in payload
+        expect(deepAccess(message, test.eventPath)).to.equal(test.input);
+      });
+    });
+
+    it('should pass bidderDetail for multibid auctions', function () {
+      let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+      bidResponse.targetingBidder = 'rubi2';
+      bidResponse.originalRequestId = bidResponse.requestId;
+      bidResponse.requestId = '1a2b3c4d5e6f7g8h9';
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, bidResponse);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      let bidWon = utils.deepClone(MOCK.BID_WON);
+      bidWon.bidId = bidWon.requestId = '1a2b3c4d5e6f7g8h9';
+      bidWon.bidderDetail = 'rubi2';
+      events.emit(BID_WON, bidWon);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // expect an extra bid added
+      expectedMessage.auctions[0].adUnits[0].bids.push({
+        ...ANALYTICS_MESSAGE.auctions[0].adUnits[0].bids[0],
+        bidderDetail: 'rubi2',
+        bidId: '1a2b3c4d5e6f7g8h9'
+      });
+
+      // bid won is our extra bid
+      expectedMessage.bidsWon[0].bidderDetail = 'rubi2';
+      expectedMessage.bidsWon[0].bidId = '1a2b3c4d5e6f7g8h9';
+
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    it('should pass bidderDetail for multibid auctions', function () {
+      // Set the rates
+      setConfig({
+        adServerCurrency: 'JPY',
+        rates: {
+          USD: {
+            JPY: 100
+          }
+        }
+      });
+
+      // set our bid response to JPY
+      let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+      bidResponse.currency = 'JPY';
+      bidResponse.cpm = 100;
+
+      // Now add the bidResponse hook which hooks on the currenct conversion function onto the bid response
+      let innerBid;
+      addBidResponseHook(function (adCodeId, bid) {
+        innerBid = bid;
+      }, 'elementId', bidResponse);
+
+      // Use the rubi analytics parseBidResponse Function to get the resulting cpm from the bid response!
+      const bidResponseObj = parseBidResponse(innerBid);
+      expect(bidResponseObj).to.have.property('bidPriceUSD');
+      expect(bidResponseObj.bidPriceUSD).to.equal(1.0);
+    });
+
+    it('should use the integration type provided in the config instead of the default', () => {
+      config.setConfig({
+        rubicon: {
+          int_type: 'testType'
+        }
+      })
+
+      performStandardAuction();
+
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.integration).to.equal('testType');
+    });
+
+    it('should correctly pass bid.source when is s2s', () => {
+      // Run auction
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+
+      const bidReq = utils.deepClone(MOCK.BID_REQUESTED);
+      bidReq.bids[0].src = 's2s';
+
+      events.emit(BID_REQUESTED, bidReq);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // bid source should be 'server'
+      expectedMessage.auctions[0].adUnits[0].bids[0].source = 'server';
+      expectedMessage.bidsWon[0].source = 'server';
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    describe('when handling bid caching', () => {
+      let auctionInits, bidRequests, bidResponses, bidsWon;
+      beforeEach(function () {
+        // set timing stuff to 0 so we clearly know when things fire
+        config.setConfig({
+          useBidCache: true,
+          rubicon: {
+            analyticsEventDelay: 0,
+            analyticsBatchTimeout: 0,
+            analyticsProcessDelay: 0
+          }
+        });
+
+        // setup 3 auctions
+        auctionInits = [
+          { ...MOCK.AUCTION_INIT, auctionId: 'auctionId-1', adUnits: [{ ...MOCK.AUCTION_INIT.adUnits[0], transactionId: 'tid-1' }] },
+          { ...MOCK.AUCTION_INIT, auctionId: 'auctionId-2', adUnits: [{ ...MOCK.AUCTION_INIT.adUnits[0], transactionId: 'tid-2' }] },
+          { ...MOCK.AUCTION_INIT, auctionId: 'auctionId-3', adUnits: [{ ...MOCK.AUCTION_INIT.adUnits[0], transactionId: 'tid-3' }] }
+        ];
+        bidRequests = [
+          { ...MOCK.BID_REQUESTED, auctionId: 'auctionId-1', bids: [{ ...MOCK.BID_REQUESTED.bids[0], bidId: 'bidId-1', transactionId: 'tid-1' }] },
+          { ...MOCK.BID_REQUESTED, auctionId: 'auctionId-2', bids: [{ ...MOCK.BID_REQUESTED.bids[0], bidId: 'bidId-2', transactionId: 'tid-2' }] },
+          { ...MOCK.BID_REQUESTED, auctionId: 'auctionId-3', bids: [{ ...MOCK.BID_REQUESTED.bids[0], bidId: 'bidId-3', transactionId: 'tid-3' }] }
+        ];
+        bidResponses = [
+          { ...MOCK.BID_RESPONSE, auctionId: 'auctionId-1', transactionId: 'tid-1', requestId: 'bidId-1' },
+          { ...MOCK.BID_RESPONSE, auctionId: 'auctionId-2', transactionId: 'tid-2', requestId: 'bidId-2' },
+          { ...MOCK.BID_RESPONSE, auctionId: 'auctionId-3', transactionId: 'tid-3', requestId: 'bidId-3' },
+        ];
+        bidsWon = [
+          { ...MOCK.BID_WON, auctionId: 'auctionId-1', transactionId: 'tid-1', bidId: 'bidId-1', requestId: 'bidId-1' },
+          { ...MOCK.BID_WON, auctionId: 'auctionId-2', transactionId: 'tid-2', bidId: 'bidId-2', requestId: 'bidId-2' },
+          { ...MOCK.BID_WON, auctionId: 'auctionId-3', transactionId: 'tid-3', bidId: 'bidId-3', requestId: 'bidId-3' },
+        ];
+      });
+      function runBasicAuction(auctionNum) {
+        events.emit(AUCTION_INIT, auctionInits[auctionNum]);
+        events.emit(BID_REQUESTED, bidRequests[auctionNum]);
+        events.emit(BID_RESPONSE, bidResponses[auctionNum]);
+        events.emit(BIDDER_DONE, { ...MOCK.BIDDER_DONE, auctionId: auctionInits[auctionNum].auctionId });
+        events.emit(AUCTION_END, { ...MOCK.AUCTION_END, auctionId: auctionInits[auctionNum].auctionId });
+      }
+      it('should select earliest auction to attach to', () => {
+        // get 3 auctions pending to send events
+        runBasicAuction(0);
+        runBasicAuction(1);
+        runBasicAuction(2);
+
+        // emmit a gptEvent should attach to first auction
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+        // should be 4 requests so far (3 auctions + 1 gamRender)
+        expect(server.requests.length).to.equal(4);
+
+        // 4th should be gamRender and should have Auciton # 1's id's
+        const message = JSON.parse(server.requests[3].requestBody);
+        const expectedMessage = {
+          ...ANALYTICS_MESSAGE.gamRenders[0],
+          auctionId: 'auctionId-1',
+          transactionId: 'tid-1'
+        };
+        expect(message.gamRenders).to.deep.equal([expectedMessage]);
+
+        // emit bidWon from first auction
+        events.emit(BID_WON, bidsWon[0]);
+
+        // another request which is bidWon
+        expect(server.requests.length).to.equal(5);
+        const message1 = JSON.parse(server.requests[4].requestBody);
+        const expectedMessage1 = {
+          ...ANALYTICS_MESSAGE.bidsWon[0],
+          sourceAuctionId: 'auctionId-1',
+          renderAuctionId: 'auctionId-1',
+          sourceTransactionId: 'tid-1',
+          renderTransactionId: 'tid-1',
+          transactionId: 'tid-1',
+          bidId: 'bidId-1',
+        };
+        expect(message1.bidsWon).to.deep.equal([expectedMessage1]);
+      });
+
+      [
+        { useBidCache: true, expectedRenderId: 3 },
+        { useBidCache: false, expectedRenderId: 2 }
+      ].forEach(test => {
+        it(`should match bidWon to correct render auction if useBidCache is ${test.useBidCache}`, () => {
+          config.setConfig({ useBidCache: test.useBidCache });
+          // get 3 auctions pending to send events
+          runBasicAuction(0);
+          runBasicAuction(1);
+          runBasicAuction(2);
+
+          // emmit 3 gpt Events, first two "empty"
+          mockGpt.emitEvent(gptSlotRenderEnded0.eventName, {
+            slot: gptSlot0,
+            isEmpty: true,
+          });
+          mockGpt.emitEvent(gptSlotRenderEnded0.eventName, {
+            slot: gptSlot0,
+            isEmpty: true,
+          });
+          // last one is valid
+          mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+          // should be 6 requests so far (3 auctions + 3 gamRender)
+          expect(server.requests.length).to.equal(6);
+
+          // 4th should be gamRender and should have Auciton # 1's id's
+          const message = JSON.parse(server.requests[3].requestBody);
+          const expectedMessage = {
+            auctionId: 'auctionId-1',
+            transactionId: 'tid-1',
+            isSlotEmpty: true,
+            adSlot: 'box'
+          };
+          expect(message.gamRenders).to.deep.equal([expectedMessage]);
+
+          // 5th should be gamRender and should have Auciton # 2's id's
+          const message1 = JSON.parse(server.requests[4].requestBody);
+          const expectedMessage1 = {
+            auctionId: 'auctionId-2',
+            transactionId: 'tid-2',
+            isSlotEmpty: true,
+            adSlot: 'box'
+          };
+          expect(message1.gamRenders).to.deep.equal([expectedMessage1]);
+
+          // 6th should be gamRender and should have Auciton # 3's id's
+          const message2 = JSON.parse(server.requests[5].requestBody);
+          const expectedMessage2 = {
+            ...ANALYTICS_MESSAGE.gamRenders[0],
+            auctionId: 'auctionId-3',
+            transactionId: 'tid-3'
+          };
+          expect(message2.gamRenders).to.deep.equal([expectedMessage2]);
+
+          // emit bidWon from second auction
+          // it should pick out render information from 3rd auction and source from 1st
+          events.emit(BID_WON, bidsWon[1]);
+
+          // another request which is bidWon
+          expect(server.requests.length).to.equal(7);
+          const message3 = JSON.parse(server.requests[6].requestBody);
+          const expectedMessage3 = {
+            ...ANALYTICS_MESSAGE.bidsWon[0],
+            sourceAuctionId: 'auctionId-2',
+            renderAuctionId: `auctionId-${test.expectedRenderId}`,
+            sourceTransactionId: 'tid-2',
+            renderTransactionId: `tid-${test.expectedRenderId}`,
+            transactionId: 'tid-2',
+            bidId: 'bidId-2'
+          };
+          if (test.useBidCache) expectedMessage3.isCachedBid = true
+          expect(message3.bidsWon).to.deep.equal([expectedMessage3]);
+        });
+      });
+
+      it('should still fire bidWon if no gam match found', () => {
+        // get 3 auctions pending to send events
+        runBasicAuction(0);
+        runBasicAuction(1);
+        runBasicAuction(2);
+
+        // emit bidWon from 3rd auction - it should still fire even though no associated gamRender found
+        events.emit(BID_WON, bidsWon[2]);
+
+        // another request which is bidWon
+        expect(server.requests.length).to.equal(4);
+        const message1 = JSON.parse(server.requests[3].requestBody);
+        const expectedMessage1 = {
+          ...ANALYTICS_MESSAGE.bidsWon[0],
+          sourceAuctionId: 'auctionId-3',
+          renderAuctionId: 'auctionId-3',
+          sourceTransactionId: 'tid-3',
+          renderTransactionId: 'tid-3',
+          transactionId: 'tid-3',
+          bidId: 'bidId-3',
+        };
+        expect(message1.bidsWon).to.deep.equal([expectedMessage1]);
+      });
+    });
+  });
+
+  describe('billing events integration', () => {
+    beforeEach(function () {
+      magniteAdapter.enableAnalytics({
+        options: {
+          endpoint: '//localhost:9999/event',
+          accountId: 1001
+        }
+      });
+      // default dmBilling
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: false,
+            vendors: [],
+            waitForAuction: true
+          }
+        }
+      })
+    });
+    afterEach(function () {
+      magniteAdapter.disableAnalytics();
+    });
+    const basicBillingAuction = (billingEvents = []) => {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      billingEvents.forEach(ev => events.emit(BILLABLE_EVENT, ev));
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+    }
+    it('should ignore billing events when not enabled', () => {
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should ignore billing events when enabled but vendor is not whitelisted', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true
+          }
+        }
+      });
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should ignore billing events if billingId is not defined or billingId is not a string', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: true
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 1233434
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: null
+        }
+      ]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should pass along billing event in same payload if same auctionId', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'pageView',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+        auctionId: MOCK.AUCTION_INIT.auctionId
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([{
+        accountId: 1001,
+        vendor: 'vendorName',
+        type: 'pageView',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+        auctionId: MOCK.AUCTION_INIT.auctionId
+      }]);
+    });
+    it('should pass NOT pass along billing event in same payload if no auctionId', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+      }]);
+      expect(server.requests.length).to.equal(2);
+
+      // first is the billing event
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.not.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([{
+        accountId: 1001,
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+
+      // second is auctions
+      message = JSON.parse(server.requests[1].requestBody);
+      expect(message).to.haveOwnProperty('auctions');
+      expect(message).to.not.haveOwnProperty('billableEvents');
+    });
+    it('should pass along multiple billing events but filter out duplicates', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        },
+        {
+          vendor: 'vendorName',
+          type: 'impression',
+          billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        }
+      ]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        },
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'impression',
+          billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        }
+      ]);
+    });
+    it('should pass along event right away if no pending auction', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          analyticsEventDelay: 0,
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+
+      events.emit(BILLABLE_EVENT, {
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      });
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.not.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        }
+      ]);
+    });
+    it('should pass along event right away if pending auction but not waiting', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName'],
+            waitForAuction: false
+          }
+        }
+      });
+      // should fire right away, and then auction later
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(2);
+      const billingRequest = server.requests[0];
+      const billingMessage = JSON.parse(billingRequest.requestBody);
+      expect(billingMessage).to.not.haveOwnProperty('auctions');
+      expect(billingMessage.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        }
+      ]);
+      // auction event after
+      const auctionRequest = server.requests[1];
+      const auctionMessage = JSON.parse(auctionRequest.requestBody);
+      // should not double pass events!
+      expect(auctionMessage).to.not.haveOwnProperty('billableEvents');
+    });
+  });
+
+  describe('getHostNameFromReferer', () => {
+    it('correctly grabs hostname from an input URL', function () {
+      let inputUrl = 'https://www.prebid.org/some/path?pbjs_debug=true';
+      expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.org');
+      inputUrl = 'https://www.prebid.com/some/path?pbjs_debug=true';
+      expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.com');
+      inputUrl = 'https://prebid.org/some/path?pbjs_debug=true';
+      expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
+      inputUrl = 'http://xn--p8j9a0d9c9a.xn--q9jyb4c/';
+      expect(typeof getHostNameFromReferer(inputUrl)).to.equal('string');
+
+      // not non-UTF char's in query / path which break if noDecodeWholeURL not set
+      inputUrl = 'https://prebid.org/search_results/%95x%8Em%92%CA/?category=000';
+      expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
+    });
+  });
+
+  describe(`handle currency conversions`, () => {
+    const origConvertCurrency = getGlobal().convertCurrency;
+    afterEach(() => {
+      if (origConvertCurrency != null) {
+        getGlobal().convertCurrency = origConvertCurrency;
+      } else {
+        delete getGlobal().convertCurrency;
+      }
+    });
+
+    it(`should convert successfully`, () => {
+      getGlobal().convertCurrency = () => 1.0;
+      const bidCopy = utils.deepClone(MOCK.BID_RESPONSE);
+      bidCopy.currency = 'JPY';
+      bidCopy.cpm = 100;
+
+      const bidResponseObj = parseBidResponse(bidCopy);
+      expect(bidResponseObj.conversionError).to.equal(undefined);
+      expect(bidResponseObj.ogCurrency).to.equal(undefined);
+      expect(bidResponseObj.ogPrice).to.equal(undefined);
+      expect(bidResponseObj.bidPriceUSD).to.equal(1.0);
+    });
+
+    it(`should catch error and set to zero with conversionError flag true`, () => {
+      getGlobal().convertCurrency = () => {
+        throw new Error('I am an error');
+      };
+      const bidCopy = utils.deepClone(MOCK.BID_RESPONSE);
+      bidCopy.currency = 'JPY';
+      bidCopy.cpm = 100;
+
+      const bidResponseObj = parseBidResponse(bidCopy);
+      expect(bidResponseObj.conversionError).to.equal(true);
+      expect(bidResponseObj.ogCurrency).to.equal('JPY');
+      expect(bidResponseObj.ogPrice).to.equal(100);
+      expect(bidResponseObj.bidPriceUSD).to.equal(0);
+    });
+  });
+
+  describe('onDataDeletionRequest', () => {
+    it('attempts to delete the magnite cookie when local storage is enabled', () => {
+      magniteAdapter.onDataDeletionRequest();
+
+      expect(removeDataFromLocalStorageStub.getCall(0).args[0]).to.equal('mgniSession');
+    });
+
+    it('throws an error if it cannot access the cookie', (done) => {
+      localStorageIsEnabledStub.returns(false);
+      try {
+        magniteAdapter.onDataDeletionRequest();
+      } catch (error) {
+        expect(error.message).to.equal('Unable to access local storage, no data deleted');
+        done();
+      }
+    })
+  });
+});
diff --git a/test/spec/modules/malltvAnalyticsAdapter_spec.js b/test/spec/modules/malltvAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..c96069df0f9
--- /dev/null
+++ b/test/spec/modules/malltvAnalyticsAdapter_spec.js
@@ -0,0 +1,540 @@
+import {
+  malltvAnalyticsAdapter, parseBidderCode, parseAdUnitCode,
+  ANALYTICS_VERSION, BIDDER_STATUS, DEFAULT_SERVER
+} from 'modules/malltvAnalyticsAdapter.js'
+import { expect } from 'chai'
+import { getCpmInEur } from '../../../modules/malltvAnalyticsAdapter'
+import * as events from 'src/events'
+import constants from 'src/constants.json'
+
+const auctionId = 'b0b39610-b941-4659-a87c-de9f62d3e13e'
+const propertyId = '123456'
+const server = 'https://analytics.server.url/v1'
+
+describe('Malltv Prebid AnalyticsAdapter Testing', function () {
+  describe('event tracking and message cache manager', function () {
+    beforeEach(function () {
+      const configOptions = { propertyId }
+
+      sinon.stub(events, 'getEvents').returns([])
+      malltvAnalyticsAdapter.enableAnalytics({
+        provider: 'malltvAnalytics',
+        options: configOptions
+      })
+    })
+
+    afterEach(function () {
+      malltvAnalyticsAdapter.disableAnalytics()
+      events.getEvents.restore()
+    })
+
+    describe('#getCpmInEur()', function() {
+      it('should get bid cpm as currency is EUR', function() {
+        const receivedBids = [
+          {
+            auctionId: auctionId,
+            adUnitCode: 'adunit_1',
+            bidder: 'malltv',
+            bidderCode: 'MALLTV',
+            requestId: 'a1b2c3d4',
+            timeToRespond: 72,
+            cpm: 0.1,
+            currency: 'EUR',
+            originalCpm: 0.1,
+            originalCurrency: 'EUR',
+            ad: '<html>fake ad1</html>'
+          },
+        ]
+        const result = getCpmInEur(receivedBids[0])
+        expect(result).to.equal(0.1)
+      })
+    })
+
+    describe('#parseBidderCode()', function() {
+      it('should get lower case bidder code from bidderCode field value', function() {
+        const receivedBids = [
+          {
+            auctionId: auctionId,
+            adUnitCode: 'adunit_1',
+            bidder: 'malltv',
+            bidderCode: 'MALLTV',
+            requestId: 'a1b2c3d4',
+            timeToRespond: 72,
+            cpm: 0.1,
+            currency: 'EUR',
+            originalCpm: 0.1,
+            originalCurrency: 'EUR',
+            ad: '<html>fake ad1</html>'
+          },
+        ]
+        const result = parseBidderCode(receivedBids[0])
+        expect(result).to.equal('malltv')
+      })
+
+      it('should get lower case bidder code from bidder field value as bidderCode field is missing', function() {
+        const receivedBids = [
+          {
+            auctionId: auctionId,
+            adUnitCode: 'adunit_1',
+            bidder: 'MALLTV',
+            bidderCode: '',
+            requestId: 'a1b2c3d4',
+            timeToRespond: 72,
+            cpm: 0.1,
+            currency: 'EUR',
+            originalCpm: 0.1,
+            originalCurrency: 'EUR',
+            ad: '<html>fake ad1</html>'
+          },
+        ]
+        const result = parseBidderCode(receivedBids[0])
+        expect(result).to.equal('malltv')
+      })
+    })
+
+    describe('#parseAdUnitCode()', function() {
+      it('should get lower case adUnit code from adUnitCode field value', function() {
+        const receivedBids = [
+          {
+            auctionId: auctionId,
+            adUnitCode: 'ADUNIT',
+            bidder: 'malltv',
+            bidderCode: 'MALLTV',
+            requestId: 'a1b2c3d4',
+            timeToRespond: 72,
+            cpm: 0.1,
+            currency: 'EUR',
+            originalCpm: 0.1,
+            originalCurrency: 'EUR',
+            ad: '<html>fake ad1</html>'
+          },
+        ]
+        const result = parseAdUnitCode(receivedBids[0])
+        expect(result).to.equal('adunit')
+      })
+    })
+
+    describe('#getCachedAuction()', function() {
+      const existing = {timeoutBids: [{}]}
+      malltvAnalyticsAdapter.cachedAuctions['test_auction_id'] = existing
+
+      it('should get the existing cached object if it exists', function() {
+        const result = malltvAnalyticsAdapter.getCachedAuction('test_auction_id')
+
+        expect(result).to.equal(existing)
+      })
+
+      it('should create a new object and store it in the cache on cache miss', function() {
+        const result = malltvAnalyticsAdapter.getCachedAuction('no_such_id')
+
+        expect(result).to.deep.include({
+          timeoutBids: [],
+        })
+      })
+    })
+
+    describe('when formatting JSON payload sent to backend', function() {
+      const receivedBids = [
+        {
+          auctionId: auctionId,
+          adUnitCode: 'adunit_1',
+          bidder: 'malltv',
+          bidderCode: 'malltv',
+          requestId: 'a1b2c3d4',
+          timeToRespond: 72,
+          cpm: 0.1,
+          currency: 'EUR',
+          originalCpm: 0.1,
+          originalCurrency: 'EUR',
+          ad: '<html>fake ad1</html>',
+          vastUrl: null
+        },
+        {
+          auctionId: auctionId,
+          adUnitCode: 'adunit_1',
+          bidder: 'gjirafa',
+          bidderCode: 'gjirafa',
+          requestId: 'b2c3d4e5',
+          timeToRespond: 100,
+          cpm: 0.08,
+          currency: 'EUR',
+          originalCpm: 0.08,
+          originalCurrency: 'EUR',
+          ad: '<html>fake ad2</html>',
+          vastUrl: null
+        },
+        {
+          auctionId: auctionId,
+          adUnitCode: 'adunit_2',
+          bidder: 'malltv',
+          bidderCode: 'malltv',
+          requestId: 'c3d4e5f6',
+          timeToRespond: 120,
+          cpm: 0.09,
+          currency: 'EUR',
+          originalCpm: 0.09,
+          originalCurrency: 'EUR',
+          ad: '<html>fake ad3</html>',
+          vastUrl: null
+        },
+      ]
+      const highestCpmBids = [
+        {
+          auctionId: auctionId,
+          adUnitCode: 'adunit_1',
+          bidder: 'malltv',
+          bidderCode: 'malltv',
+          // No requestId
+          timeToRespond: 72,
+          cpm: 0.1,
+          currency: 'EUR',
+          originalCpm: 0.1,
+          originalCurrency: 'EUR',
+          ad: '<html>fake ad1</html>',
+          vastUrl: null
+        }
+      ]
+      const noBids = [
+        {
+          auctionId: auctionId,
+          adUnitCode: 'adunit_2',
+          bidder: 'malltv',
+          bidderCode: 'malltv',
+          bidId: 'a1b2c3d4',
+        }
+      ]
+      const timeoutBids = [
+        {
+          auctionId: auctionId,
+          adUnitCode: 'adunit_2',
+          bidder: 'gjirafa',
+          bidderCode: 'gjirafa',
+          bidId: '00123d4c',
+        }
+      ]
+      const withoutOriginalCpmBids = [
+        {
+          auctionId: auctionId,
+          adUnitCode: 'adunit_2',
+          bidder: 'malltv',
+          bidderCode: 'malltv',
+          requestId: 'c3d4e5f6',
+          timeToRespond: 120,
+          cpm: 0.29,
+          currency: 'EUR',
+          originalCpm: '',
+          originalCurrency: 'EUR',
+          ad: '<html>fake ad3</html>'
+        },
+      ]
+      const withoutOriginalCurrencyBids = [
+        {
+          auctionId: auctionId,
+          adUnitCode: 'adunit_2',
+          bidder: 'malltv',
+          bidderCode: 'malltv',
+          requestId: 'c3d4e5f6',
+          timeToRespond: 120,
+          cpm: 0.09,
+          currency: 'EUR',
+          originalCpm: 0.09,
+          originalCurrency: '',
+          ad: '<html>fake ad3</html>'
+        },
+      ]
+
+      function assertHavingRequiredMessageFields(message) {
+        expect(message).to.include({
+          analyticsVersion: ANALYTICS_VERSION,
+          auctionId: auctionId,
+          propertyId: propertyId,
+          prebidVersion: '$prebid.version$',
+        })
+      }
+
+      describe('#createCommonMessage', function() {
+        it('should correctly serialize some common fields', function() {
+          const message = malltvAnalyticsAdapter.createCommonMessage(auctionId)
+
+          assertHavingRequiredMessageFields(message)
+        })
+      })
+
+      describe('#serializeBidResponse', function() {
+        it('should handle BID properly and serialize bid price related fields', function() {
+          const result = malltvAnalyticsAdapter.serializeBidResponse(receivedBids[0], BIDDER_STATUS.BID)
+
+          expect(result).to.include({
+            prebidWon: false,
+            isTimeout: false,
+            status: BIDDER_STATUS.BID,
+            time: 72,
+            cpm: 0.1,
+            currency: 'EUR',
+            originalCpm: 0.1,
+            originalCurrency: 'EUR',
+            cpmEur: 0.1,
+          })
+        })
+
+        it('should handle NO_BID properly and set status to noBid', function() {
+          const result = malltvAnalyticsAdapter.serializeBidResponse(noBids[0], BIDDER_STATUS.NO_BID)
+
+          expect(result).to.include({
+            prebidWon: false,
+            isTimeout: false,
+            status: BIDDER_STATUS.NO_BID,
+          })
+        })
+
+        it('should handle BID_WON properly and serialize bid price related fields', function() {
+          const result = malltvAnalyticsAdapter.serializeBidResponse(receivedBids[0], BIDDER_STATUS.BID_WON)
+
+          expect(result).to.include({
+            prebidWon: true,
+            isTimeout: false,
+            status: BIDDER_STATUS.BID_WON,
+            time: 72,
+            cpm: 0.1,
+            currency: 'EUR',
+            originalCpm: 0.1,
+            originalCurrency: 'EUR',
+            cpmEur: 0.1,
+          })
+        })
+
+        it('should handle TIMEOUT properly and set status to timeout and isTimeout to true', function() {
+          const result = malltvAnalyticsAdapter.serializeBidResponse(noBids[0], BIDDER_STATUS.TIMEOUT)
+
+          expect(result).to.include({
+            prebidWon: false,
+            isTimeout: true,
+            status: BIDDER_STATUS.TIMEOUT,
+          })
+        })
+
+        it('should handle BID_WON properly and fill originalCpm field with cpm in missing originalCpm case', function() {
+          const result = malltvAnalyticsAdapter.serializeBidResponse(withoutOriginalCpmBids[0], BIDDER_STATUS.BID_WON)
+
+          expect(result).to.include({
+            prebidWon: true,
+            isTimeout: false,
+            status: BIDDER_STATUS.BID_WON,
+            time: 120,
+            cpm: 0.29,
+            currency: 'EUR',
+            originalCpm: 0.29,
+            originalCurrency: 'EUR',
+            cpmEur: 0.29,
+          })
+        })
+
+        it('should handle BID_WON properly and fill originalCurrency field with currency in missing originalCurrency case', function() {
+          const result = malltvAnalyticsAdapter.serializeBidResponse(withoutOriginalCurrencyBids[0], BIDDER_STATUS.BID_WON)
+          expect(result).to.include({
+            prebidWon: true,
+            isTimeout: false,
+            status: BIDDER_STATUS.BID_WON,
+            time: 120,
+            cpm: 0.09,
+            currency: 'EUR',
+            originalCpm: 0.09,
+            originalCurrency: 'EUR',
+            cpmEur: 0.09,
+          })
+        })
+      })
+
+      describe('#addBidResponseToMessage()', function() {
+        it('should add a bid response in the output message, grouped by adunit_id and bidder', function() {
+          const message = {
+            adUnits: {}
+          }
+          malltvAnalyticsAdapter.addBidResponseToMessage(message, noBids[0], BIDDER_STATUS.NO_BID)
+
+          expect(message.adUnits).to.deep.include({
+            'adunit_2': {
+              'malltv': {
+                prebidWon: false,
+                isTimeout: false,
+                status: BIDDER_STATUS.NO_BID,
+              }
+            }
+          })
+        })
+      })
+
+      describe('#createBidMessage()', function() {
+        it('should format auction message sent to the backend', function() {
+          const args = {
+            auctionId: auctionId,
+            timestamp: 1234567890,
+            timeout: 3000,
+            auctionEnd: 1234567990,
+            adUnitCodes: ['adunit_1', 'adunit_2'],
+            bidsReceived: receivedBids,
+            noBids: noBids
+          }
+
+          const result = malltvAnalyticsAdapter.createBidMessage(args, highestCpmBids, timeoutBids)
+
+          assertHavingRequiredMessageFields(result)
+          expect(result).to.deep.include({
+            auctionElapsed: 100,
+            timeout: 3000,
+            adUnits: {
+              'adunit_1': {
+                'malltv': {
+                  prebidWon: true,
+                  isTimeout: false,
+                  status: BIDDER_STATUS.BID,
+                  time: 72,
+                  cpm: 0.1,
+                  currency: 'EUR',
+                  originalCpm: 0.1,
+                  originalCurrency: 'EUR',
+                  cpmEur: 0.1,
+                  vastUrl: null
+                },
+                'gjirafa': {
+                  prebidWon: false,
+                  isTimeout: false,
+                  status: BIDDER_STATUS.BID,
+                  time: 100,
+                  cpm: 0.08,
+                  currency: 'EUR',
+                  originalCpm: 0.08,
+                  originalCurrency: 'EUR',
+                  cpmEur: 0.08,
+                  vastUrl: null
+                }
+              },
+              'adunit_2': {
+                // this bid result exists in both bid and noBid arrays and should be treated as bid
+                'malltv': {
+                  prebidWon: false,
+                  isTimeout: false,
+                  time: 120,
+                  cpm: 0.09,
+                  currency: 'EUR',
+                  originalCpm: 0.09,
+                  originalCurrency: 'EUR',
+                  cpmEur: 0.09,
+                  status: BIDDER_STATUS.BID,
+                  vastUrl: null
+                },
+                'gjirafa': {
+                  prebidWon: false,
+                  isTimeout: true,
+                  status: BIDDER_STATUS.TIMEOUT,
+                }
+              }
+            }
+          })
+        })
+      })
+
+      describe('#handleBidTimeout()', function() {
+        it('should cached the timeout bid as BID_TIMEOUT event was triggered', function() {
+          malltvAnalyticsAdapter.cachedAuctions['test_timeout_auction_id'] = { 'timeoutBids': [] }
+          const args = [{
+            auctionId: 'test_timeout_auction_id',
+            timestamp: 1234567890,
+            timeout: 3000,
+            auctionEnd: 1234567990,
+            bidsReceived: receivedBids,
+            noBids: noBids
+          }]
+
+          malltvAnalyticsAdapter.handleBidTimeout(args)
+          const result = malltvAnalyticsAdapter.getCachedAuction('test_timeout_auction_id')
+          expect(result).to.deep.include({
+            timeoutBids: [{
+              auctionId: 'test_timeout_auction_id',
+              timestamp: 1234567890,
+              timeout: 3000,
+              auctionEnd: 1234567990,
+              bidsReceived: receivedBids,
+              noBids: noBids
+            }]
+          })
+        })
+      })
+    })
+  })
+
+  describe('Malltv Analytics Adapter track handler ', function () {
+    const configOptions = { propertyId }
+
+    beforeEach(function () {
+      sinon.stub(events, 'getEvents').returns([])
+      malltvAnalyticsAdapter.enableAnalytics({
+        provider: 'malltvAnalytics',
+        options: configOptions
+      })
+    })
+
+    afterEach(function () {
+      malltvAnalyticsAdapter.disableAnalytics()
+      events.getEvents.restore()
+    })
+
+    it('should call handleBidTimeout as BID_TIMEOUT trigger event', function() {
+      sinon.spy(malltvAnalyticsAdapter, 'handleBidTimeout')
+      events.emit(constants.EVENTS.BID_TIMEOUT, {})
+      sinon.assert.callCount(malltvAnalyticsAdapter.handleBidTimeout, 1)
+      malltvAnalyticsAdapter.handleBidTimeout.restore()
+    })
+
+    it('should call handleAuctionEnd as AUCTION_END trigger event', function() {
+      sinon.spy(malltvAnalyticsAdapter, 'handleAuctionEnd')
+      events.emit(constants.EVENTS.AUCTION_END, {})
+      sinon.assert.callCount(malltvAnalyticsAdapter.handleAuctionEnd, 1)
+      malltvAnalyticsAdapter.handleAuctionEnd.restore()
+    })
+  })
+
+  describe('enableAnalytics and config parser', function () {
+    const configOptions = { propertyId, server }
+
+    beforeEach(function () {
+      sinon.stub(events, 'getEvents').returns([])
+      malltvAnalyticsAdapter.enableAnalytics({
+        provider: 'malltvAnalytics',
+        options: configOptions
+      })
+    })
+
+    afterEach(function () {
+      malltvAnalyticsAdapter.disableAnalytics()
+      events.getEvents.restore()
+    })
+
+    it('should parse config correctly with optional values', function () {
+      const { options, propertyId, server } = malltvAnalyticsAdapter.getAnalyticsOptions()
+
+      expect(options).to.deep.equal(configOptions)
+      expect(propertyId).to.equal(configOptions.propertyId)
+      expect(server).to.equal(configOptions.server)
+    })
+
+    it('should not enable Analytics when propertyId is missing', function() {
+      const configOptions = {
+        options: { }
+      }
+
+      const isConfigValid = malltvAnalyticsAdapter.initConfig(configOptions)
+      expect(isConfigValid).to.equal(false)
+    })
+
+    it('should use DEFAULT_SERVER when server is missing', function () {
+      const configOptions = {
+        options: {
+          propertyId
+        }
+      }
+      malltvAnalyticsAdapter.initConfig(configOptions)
+      expect(malltvAnalyticsAdapter.getAnalyticsOptions().server).to.equal(DEFAULT_SERVER)
+    })
+  })
+})
diff --git a/test/spec/modules/malltvBidAdapter_spec.js b/test/spec/modules/malltvBidAdapter_spec.js
new file mode 100644
index 00000000000..c31e91992f7
--- /dev/null
+++ b/test/spec/modules/malltvBidAdapter_spec.js
@@ -0,0 +1,185 @@
+import { expect } from 'chai';
+import { spec } from 'modules/malltvBidAdapter';
+
+describe('malltvAdapterTest', () => {
+  describe('bidRequestValidity', () => {
+    it('bidRequest with propertyId and placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'malltv',
+        params: {
+          propertyId: '{propertyId}',
+          placementId: '{placementId}'
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest without propertyId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'malltv',
+        params: {
+          placementId: '{placementId}'
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'malltv',
+        params: {
+          propertyId: '{propertyId}',
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without propertyId or placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'malltv',
+        params: {}
+      })).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', () => {
+    const bidRequests = [{
+      'bidder': 'malltv',
+      'params': {
+        'propertyId': '{propertyId}',
+        'placementId': '{placementId}',
+        'data': {
+          'catalogs': [{
+            'catalogId': 1,
+            'items': ['1', '2', '3']
+          }],
+          'inventory': {
+            'category': ['category1', 'category2'],
+            'query': ['query']
+          }
+        }
+      },
+      'adUnitCode': 'hb-leaderboard',
+      'transactionId': 'b6b889bb-776c-48fd-bc7b-d11a1cf0425e',
+      'sizes': [[300, 250]],
+      'bidId': '10bdc36fe0b48c8',
+      'bidderRequestId': '70deaff71c281d',
+      'auctionId': 'f9012acc-b6b7-4748-9098-97252914f9dc'
+    }];
+
+    it('bidRequest HTTP method', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+
+    it('bidRequest url', () => {
+      const endpointUrl = 'https://central.mall.tv/bid';
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.url).to.match(new RegExp(`${endpointUrl}`));
+      });
+    });
+
+    it('bidRequest data', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data).to.exist;
+      });
+    });
+
+    it('bidRequest sizes', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data.placements).to.exist;
+        expect(requestItem.data.placements.length).to.equal(1);
+        expect(requestItem.data.placements[0].sizes).to.equal('300x250');
+      });
+    });
+
+    it('bidRequest data param', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach((requestItem) => {
+        expect(requestItem.data.data).to.exist;
+        expect(requestItem.data.data.catalogs).to.exist;
+        expect(requestItem.data.data.inventory).to.exist;
+        expect(requestItem.data.data.catalogs.length).to.equal(1);
+        expect(requestItem.data.data.catalogs[0].items.length).to.equal(3);
+        expect(Object.keys(requestItem.data.data.inventory).length).to.equal(2);
+        expect(requestItem.data.data.inventory.category.length).to.equal(2);
+        expect(requestItem.data.data.inventory.query.length).to.equal(1);
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    const bidRequest = {
+      'method': 'POST',
+      'url': 'https://central.mall.tv/bid',
+      'data': {
+        'sizes': '300x250',
+        'adUnitId': 'rectangle',
+        'placementId': '{placementId}',
+        'propertyId': '{propertyId}',
+        'pageViewGuid': '{pageViewGuid}',
+        'url': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'requestid': '26ee8fe87940da7',
+        'bidid': '2962dbedc4768bf'
+      }
+    };
+
+    const bidResponse = {
+      body: [{
+        'CPM': 1,
+        'Width': 300,
+        'Height': 250,
+        'Referrer': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'Ad': '<div>Test ad</div>',
+        'CreativeId': '123abc',
+        'NetRevenue': false,
+        'Currency': 'EUR',
+        'TTL': 360,
+        'ADomain': ['somedomain.com']
+      }],
+      headers: {}
+    };
+
+    it('all keys present', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      let keys = [
+        'requestId',
+        'cpm',
+        'width',
+        'height',
+        'creativeId',
+        'currency',
+        'netRevenue',
+        'ttl',
+        'referrer',
+        'ad',
+        'vastUrl',
+        'mediaType',
+        'meta'
+      ];
+
+      let resultKeys = Object.keys(result[0]);
+      resultKeys.forEach(function (key) {
+        expect(keys.indexOf(key) !== -1).to.equal(true);
+      });
+    })
+
+    it('all values correct', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].creativeId).to.equal('123abc');
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(360);
+      expect(result[0].referrer).to.equal('http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true');
+      expect(result[0].ad).to.equal('<div>Test ad</div>');
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['somedomain.com']);
+    })
+  });
+});
diff --git a/test/spec/modules/mantisBidAdapter_spec.js b/test/spec/modules/mantisBidAdapter_spec.js
index 1dad60f5d98..579f41e620d 100644
--- a/test/spec/modules/mantisBidAdapter_spec.js
+++ b/test/spec/modules/mantisBidAdapter_spec.js
@@ -1,9 +1,20 @@
 import {expect} from 'chai';
-import {spec} from 'modules/mantisBidAdapter.js';
+import {spec, storage} from 'modules/mantisBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import {sfPostMessage, iframePostMessage} from 'modules/mantisBidAdapter';
 
 describe('MantisAdapter', function () {
   const adapter = newBidder(spec);
+  const sandbox = sinon.sandbox.create();
+  let clock;
+
+  beforeEach(function () {
+    clock = sandbox.useFakeTimers();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
 
   describe('isBidRequestValid', function () {
     let bid = {
@@ -31,6 +42,68 @@ describe('MantisAdapter', function () {
     });
   });
 
+  describe('viewability', function() {
+    it('iframe (viewed)', () => {
+      let viewed = false;
+
+      sandbox.stub(document, 'getElementsByTagName').withArgs('iframe').returns([
+        {
+          name: 'mantis',
+          getBoundingClientRect: () => ({
+            top: 10,
+            bottom: 260,
+            left: 10,
+            right: 190,
+            width: 300,
+            height: 250
+          })
+        }
+      ]);
+
+      iframePostMessage({innerHeight: 500, innerWidth: 500}, 'mantis', () => viewed = true);
+
+      sandbox.clock.runAll();
+
+      expect(viewed).to.equal(true);
+    });
+
+    it('safeframe (viewed)', () => {
+      let viewed = false;
+
+      sfPostMessage({
+        ext: {
+          register: (width, height, callback) => {
+            expect(width).to.equal(100);
+            expect(height).to.equal(200);
+
+            callback();
+          },
+          inViewPercentage: () => 60
+        }
+      }, 100, 200, () => viewed = true);
+
+      expect(viewed).to.equal(true);
+    });
+
+    it('safeframe (unviewed)', () => {
+      let viewed = false;
+
+      sfPostMessage({
+        ext: {
+          register: (width, height, callback) => {
+            expect(width).to.equal(100);
+            expect(height).to.equal(200);
+
+            callback();
+          },
+          inViewPercentage: () => 30
+        }
+      }, 100, 200, () => viewed = true);
+
+      expect(viewed).to.equal(false);
+    });
+  });
+
   describe('buildRequests', function () {
     let bidRequests = [
       {
@@ -47,6 +120,24 @@ describe('MantisAdapter', function () {
       }
     ];
 
+    it('gdpr consent not required', function () {
+      const request = spec.buildRequests(bidRequests, {gdprConsent: {gdprApplies: false}});
+
+      expect(request.url).not.to.include('consent=false');
+    });
+
+    it('gdpr consent required', function () {
+      const request = spec.buildRequests(bidRequests, {gdprConsent: {gdprApplies: true}});
+
+      expect(request.url).to.include('consent=false');
+    });
+
+    it('usp consent', function () {
+      const request = spec.buildRequests(bidRequests, {uspConsent: 'foobar'});
+
+      expect(request.url).to.include('usp=foobar');
+    });
+
     it('domain override', function () {
       window.mantis_domain = 'https://foo';
       const request = spec.buildRequests(bidRequests);
@@ -79,13 +170,12 @@ describe('MantisAdapter', function () {
     });
 
     it('use storage uuid', function () {
-      window.localStorage.setItem('mantis:uuid', 'bar');
+      sandbox.stub(storage, 'hasLocalStorage').callsFake(() => true);
+      sandbox.stub(storage, 'getDataFromLocalStorage').withArgs('mantis:uuid').returns('bar');
 
       const request = spec.buildRequests(bidRequests);
 
       expect(request.url).to.include('uuid=bar');
-
-      window.localStorage.removeItem('mantis:uuid');
     });
 
     it('detect amp', function () {
@@ -157,6 +247,9 @@ describe('MantisAdapter', function () {
           ad: '<!-- Creative -->',
           creativeId: 'view',
           netRevenue: true,
+          meta: {
+            advertiserDomains: []
+          },
           currency: 'USD'
         }
       ];
@@ -176,6 +269,7 @@ describe('MantisAdapter', function () {
               bid: 'bid',
               cpm: 1,
               view: 'view',
+              domains: ['foobar.com'],
               width: 300,
               height: 250,
               html: '<!-- Creative -->'
@@ -194,6 +288,9 @@ describe('MantisAdapter', function () {
           ad: '<!-- Creative -->',
           creativeId: 'view',
           netRevenue: true,
+          meta: {
+            advertiserDomains: ['foobar.com']
+          },
           currency: 'USD'
         }
       ];
@@ -213,6 +310,7 @@ describe('MantisAdapter', function () {
               cpm: 1,
               view: 'view',
               width: 300,
+              domains: ['foobar.com'],
               height: 250,
               html: '<!-- Creative -->'
             }
@@ -230,15 +328,22 @@ describe('MantisAdapter', function () {
           ad: '<!-- Creative -->',
           creativeId: 'view',
           netRevenue: true,
+          meta: {
+            advertiserDomains: ['foobar.com']
+          },
           currency: 'USD'
         }
       ];
       let bidderRequest;
 
+      sandbox.stub(storage, 'hasLocalStorage').returns(true);
+      const spy = sandbox.spy(storage, 'setDataInLocalStorage');
+
       let result = spec.interpretResponse(response, {bidderRequest});
+
+      expect(spy.calledWith('mantis:uuid', 'uuid'));
       expect(result[0]).to.deep.equal(expectedResponse[0]);
       expect(window.mantis_uuid).to.equal(response.body.uuid);
-      expect(window.localStorage.getItem('mantis:uuid')).to.equal(response.body.uuid);
     });
 
     it('no ads returned', function () {
diff --git a/test/spec/modules/marsmediaBidAdapter_spec.js b/test/spec/modules/marsmediaBidAdapter_spec.js
index b4c2fe68f34..055b05700b2 100644
--- a/test/spec/modules/marsmediaBidAdapter_spec.js
+++ b/test/spec/modules/marsmediaBidAdapter_spec.js
@@ -1,42 +1,84 @@
-import {spec} from '../../../modules/marsmediaBidAdapter.js';
-import * as utils from '../../../src/utils.js';
-import * as sinon from 'sinon';
+import { spec } from 'modules/marsmediaBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { config } from 'src/config.js';
 
-var r1adapter = spec;
+var marsAdapter = spec;
 
 describe('marsmedia adapter tests', function () {
+  let element, win;
+  let sandbox;
+
   beforeEach(function() {
+    element = {
+      x: 0,
+      y: 0,
+
+      width: 0,
+      height: 0,
+
+      getBoundingClientRect: () => {
+        return {
+          width: element.width,
+          height: element.height,
+
+          left: element.x,
+          top: element.y,
+          right: element.x + element.width,
+          bottom: element.y + element.height
+        };
+      }
+    };
+    win = {
+      document: {
+        visibilityState: 'visible'
+      },
+
+      innerWidth: 800,
+      innerHeight: 600
+    };
     this.defaultBidderRequest = {
       'refererInfo': {
-        'referer': 'Reference Page',
+        'ref': 'Reference Page',
         'stack': [
           'aodomain.dvl',
           'page.dvl'
         ]
       }
     };
+
+    this.defaultBidRequestList = [
+      {
+        'bidder': 'marsmedia',
+        'params': {
+          'zoneId': 9999
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'adUnitCode': 'Unit-Code',
+        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+        'bidderRequestId': '418b37f85e772c',
+        'auctionId': '18fd8b8b0bd757',
+        'bidRequestsCount': 1,
+        'bidId': '51ef8751f9aead'
+      }
+    ];
+
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(document, 'getElementById').withArgs('Unit-Code').returns(element);
+    sandbox.stub(utils, 'getWindowTop').returns(win);
+    sandbox.stub(utils, 'getWindowSelf').returns(win);
+  });
+
+  afterEach(function() {
+    sandbox.restore();
   });
 
   describe('Verify 1.0 POST Banner Bid Request', function () {
     it('buildRequests works', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaType': 'banner',
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
 
       expect(bidRequest.url).to.have.string('https://hb.go2speed.media/bidder/?bid=3mhdom&zoneId=9999&hbv=');
       expect(bidRequest.method).to.equal('POST');
@@ -52,11 +94,11 @@ describe('marsmedia adapter tests', function () {
       expect(openrtbRequest.imp[0].ext.bidder.zoneId).to.equal(9999);
     });
 
-    it('interpretResponse works', function() {
+    /* it('interpretResponse works', function() {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-0',
+            'impid': 'Unit-Code',
             'w': 300,
             'h': 250,
             'adm': '<div>My Compelling Ad</div>',
@@ -67,7 +109,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var bannerBids = r1adapter.interpretResponse(bidList);
+      var bannerBids = marsAdapter.interpretResponse(bidList);
 
       expect(bannerBids.length).to.equal(1);
       const bid = bannerBids[0];
@@ -78,7 +120,7 @@ describe('marsmedia adapter tests', function () {
       expect(bid.netRevenue).to.equal(true);
       expect(bid.cpm).to.equal(1.0);
       expect(bid.ttl).to.equal(350);
-    });
+    }); */
   });
 
   describe('Verify POST Video Bid Request', function() {
@@ -95,7 +137,7 @@ describe('marsmedia adapter tests', function () {
               'context': 'instream'
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'sizes': [
             [300, 250]
           ],
@@ -107,7 +149,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       expect(bidRequest.url).to.have.string('https://hb.go2speed.media/bidder/?bid=3mhdom&zoneId=9999&hbv=');
       expect(bidRequest.method).to.equal('POST');
@@ -132,7 +174,7 @@ describe('marsmedia adapter tests', function () {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-1',
+            'impid': 'Unit-Code',
             'price': 1,
             'adm': 'https://example.com/',
             'adomain': [
@@ -147,7 +189,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var videoBids = r1adapter.interpretResponse(bidList);
+      var videoBids = marsAdapter.interpretResponse(bidList);
 
       expect(videoBids.length).to.equal(1);
       const bid = videoBids[0];
@@ -166,7 +208,7 @@ describe('marsmedia adapter tests', function () {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-1',
+            'impid': 'Unit-Code',
             'price': 1,
             'adm': '<?xml><VAST></VAST>',
             'adomain': [
@@ -181,7 +223,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var videoBids = r1adapter.interpretResponse(bidList);
+      var videoBids = marsAdapter.interpretResponse(bidList);
 
       expect(videoBids.length).to.equal(1);
       const bid = videoBids[0];
@@ -199,26 +241,6 @@ describe('marsmedia adapter tests', function () {
 
   describe('misc buildRequests', function() {
     it('should send GDPR Consent data to Marsmedia tag', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 250]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-3',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
       var consentString = 'testConsentString';
       var gdprBidderRequest = this.defaultBidderRequest;
       gdprBidderRequest.gdprConsent = {
@@ -226,13 +248,50 @@ describe('marsmedia adapter tests', function () {
         'consentString': consentString
       };
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, gdprBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, gdprBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.user.ext.consent).to.equal(consentString);
       expect(openrtbRequest.regs.ext.gdpr).to.equal(true);
     });
 
+    it('should have CCPA Consent if defined', function () {
+      const ccpaBidderRequest = this.defaultBidderRequest;
+      ccpaBidderRequest.uspConsent = '1YYN';
+      const bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, ccpaBidderRequest);
+      const openrtbRequest = JSON.parse(bidRequest.data);
+
+      expect(openrtbRequest.regs.ext.us_privacy).to.equal('1YYN');
+    });
+
+    it('should submit coppa if set in config', function () {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+      const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.regs.coppa).to.equal(1);
+      config.getConfig.restore();
+    });
+
+    it('should process floors module if available', function() {
+      const floorBidderRequest = this.defaultBidRequestList;
+      const floorInfo = {
+        currency: 'USD',
+        floor: 1.20
+      };
+      floorBidderRequest[0].getFloor = () => floorInfo;
+      const request = marsAdapter.buildRequests(floorBidderRequest, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.imp[0].bidfloor).to.equal(1.20);
+    });
+
+    it('should have 0 bidfloor value', function() {
+      const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.imp[0].bidfloor).to.equal(0);
+    });
+
     it('prefer 2.0 sizes', function () {
       var bidRequestList = [
         {
@@ -245,7 +304,7 @@ describe('marsmedia adapter tests', function () {
               'sizes': [[300, 600]]
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'sizes': [[300, 250]],
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
@@ -255,7 +314,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].banner.format[0].w).to.equal(300);
@@ -274,7 +333,7 @@ describe('marsmedia adapter tests', function () {
               'sizes': [[300]]
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -283,7 +342,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       expect(bidRequest.method).to.be.undefined;
     });
 
@@ -297,7 +356,7 @@ describe('marsmedia adapter tests', function () {
           'mediaTypes': {
             'banner': {}
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -306,7 +365,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       expect(bidRequest.method).to.be.undefined;
     });
 
@@ -320,7 +379,7 @@ describe('marsmedia adapter tests', function () {
           'mediaTypes': {
             'banner': {'sizes': [['400', '500'], ['4n0', '5g0']]}
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -329,35 +388,15 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].banner.format.length).to.equal(1);
     });
 
     it('dnt is correctly set to 1', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 600]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
       var dntStub = sinon.stub(utils, 'getDNT').returns(1);
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
 
       dntStub.restore();
 
@@ -378,7 +417,7 @@ describe('marsmedia adapter tests', function () {
               'playerSize': ['600', '300']
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -387,7 +426,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.equal(600);
@@ -407,7 +446,7 @@ describe('marsmedia adapter tests', function () {
               'playerSize': ['badWidth', 'badHeight']
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -416,7 +455,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.be.undefined;
@@ -435,7 +474,7 @@ describe('marsmedia adapter tests', function () {
               'context': 'instream'
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -444,7 +483,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.be.undefined;
@@ -453,52 +492,74 @@ describe('marsmedia adapter tests', function () {
 
     it('should return empty site data when refererInfo is missing', function() {
       delete this.defaultBidderRequest.refererInfo;
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaType': 'banner',
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
       const openrtbRequest = JSON.parse(bidRequest.data);
 
       expect(openrtbRequest.site.domain).to.equal('');
       expect(openrtbRequest.site.page).to.equal('');
       expect(openrtbRequest.site.ref).to.equal('');
     });
+
+    context('when element is fully in view', function() {
+      it('returns 100', function() {
+        Object.assign(element, { width: 600, height: 400 });
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(100);
+      });
+    });
+
+    context('when element is out of view', function() {
+      it('returns 0', function() {
+        Object.assign(element, { x: -300, y: 0, width: 207, height: 320 });
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(0);
+      });
+    });
+
+    context('when element is partially in view', function() {
+      it('returns percentage', function() {
+        Object.assign(element, { width: 800, height: 800 });
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(75);
+      });
+    });
+
+    context('when nested iframes', function() {
+      it('returns \'na\'', function() {
+        Object.assign(element, { width: 600, height: 400 });
+
+        utils.getWindowTop.restore();
+        utils.getWindowSelf.restore();
+        sandbox.stub(utils, 'getWindowTop').returns(win);
+        sandbox.stub(utils, 'getWindowSelf').returns({});
+
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal('na');
+      });
+    });
+
+    context('when tab is inactive', function() {
+      it('returns 0', function() {
+        Object.assign(element, { width: 600, height: 400 });
+
+        utils.getWindowTop.restore();
+        win.document.visibilityState = 'hidden';
+        sandbox.stub(utils, 'getWindowTop').returns(win);
+
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(0);
+      });
+    });
   });
 
   it('should return empty site.domain and site.page when refererInfo.stack is empty', function() {
     this.defaultBidderRequest.refererInfo.stack = [];
-    var bidRequestList = [
-      {
-        'bidder': 'marsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.site.domain).to.equal('');
@@ -508,24 +569,7 @@ describe('marsmedia adapter tests', function () {
 
   it('should secure correctly', function() {
     this.defaultBidderRequest.refererInfo.stack[0] = ['https://securesite.dvl'];
-    var bidRequestList = [
-      {
-        'bidder': 'marsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.imp[0].secure).to.equal(1);
@@ -551,9 +595,12 @@ describe('marsmedia adapter tests', function () {
         'params': {
           'zoneId': 9999
         },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'adUnitCode': 'Unit-Code',
         'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
         'bidderRequestId': '418b37f85e772c',
         'auctionId': '18fd8b8b0bd757',
@@ -563,7 +610,7 @@ describe('marsmedia adapter tests', function () {
       }
     ];
 
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.source.ext.schain).to.deep.equal(schain);
@@ -571,7 +618,7 @@ describe('marsmedia adapter tests', function () {
 
   describe('misc interpretResponse', function () {
     it('No bid response', function() {
-      var noBidResponse = r1adapter.interpretResponse({
+      var noBidResponse = marsAdapter.interpretResponse({
         'body': ''
       });
       expect(noBidResponse.length).to.equal(0);
@@ -589,22 +636,22 @@ describe('marsmedia adapter tests', function () {
           'sizes': [[300, 250]]
         }
       },
-      'adUnitCode': 'bannerDiv'
+      'adUnitCode': 'Unit-Code'
     };
 
     it('should return true when required params found', function () {
-      expect(r1adapter.isBidRequestValid(bid)).to.equal(true);
+      expect(marsAdapter.isBidRequestValid(bid)).to.equal(true);
     });
 
     it('should return false when placementId missing', function () {
       delete bid.params.zoneId;
-      expect(r1adapter.isBidRequestValid(bid)).to.equal(false);
+      expect(marsAdapter.isBidRequestValid(bid)).to.equal(false);
     });
   });
 
   describe('getUserSyncs', function () {
     it('returns an empty string', function () {
-      expect(r1adapter.getUserSyncs()).to.deep.equal([]);
+      expect(marsAdapter.getUserSyncs()).to.deep.equal([]);
     });
   });
 
diff --git a/test/spec/modules/mass_spec.js b/test/spec/modules/mass_spec.js
new file mode 100644
index 00000000000..3b5d89b0a8c
--- /dev/null
+++ b/test/spec/modules/mass_spec.js
@@ -0,0 +1,139 @@
+import { expect } from 'chai';
+import {
+  init,
+  addBidResponseHook,
+  addListenerOnce,
+  isMassBid,
+  useDefaultMatch,
+  useDefaultRender,
+  updateRenderers,
+  listenerAdded,
+  isEnabled
+} from 'modules/mass';
+import { logInfo } from 'src/utils.js';
+
+// mock a MASS bid:
+const mockedMassBids = [
+  {
+    bidder: 'ix',
+    bidId: 'mass-bid-1',
+    requestId: 'mass-bid-1',
+    bidderRequestId: 'bidder-request-id-1',
+    dealId: 'MASS1234',
+    ad: 'mass://provider/product/etc...',
+    meta: {}
+  },
+  {
+    bidder: 'ix',
+    bidId: 'mass-bid-2',
+    requestId: 'mass-bid-2',
+    bidderRequestId: 'bidder-request-id-1',
+    dealId: '1234',
+    ad: 'mass://provider/product/etc...',
+    meta: {
+      mass: true
+    }
+  },
+];
+
+// mock non-MASS bids:
+const mockedNonMassBids = [
+  {
+    bidder: 'ix',
+    bidId: 'non-mass-bid-1',
+    requstId: 'non-mass-bid-1',
+    bidderRequestId: 'bidder-request-id-1',
+    dealId: 'MASS1234',
+    ad: '<creative />',
+    meta: {
+      mass: true
+    }
+  },
+  {
+    bidder: 'ix',
+    bidId: 'non-mass-bid-2',
+    requestId: 'non-mass-bid-2',
+    bidderRequestId: 'bidder-request-id-1',
+    dealId: '1234',
+    ad: 'mass://provider/product/etc...',
+    meta: {}
+  },
+];
+
+const noop = function() {};
+
+describe('MASS Module', function() {
+  it('should be enabled by default', function() {
+    expect(isEnabled).to.equal(true);
+  });
+
+  it('can be disabled', function() {
+    init({enabled: false});
+    expect(isEnabled).to.equal(false);
+  });
+
+  it('should only affect MASS bids', function() {
+    init({renderUrl: 'https://...'});
+    mockedNonMassBids.forEach(function(mockedBid) {
+      const originalBid = Object.assign({}, mockedBid);
+      const bid = Object.assign({}, originalBid);
+
+      addBidResponseHook(noop, 'ad-code-id', bid);
+
+      expect(bid).to.deep.equal(originalBid);
+    });
+  });
+
+  it('should only update the ad markup field', function() {
+    init({renderUrl: 'https://...'});
+    mockedMassBids.forEach(function(mockedBid) {
+      const originalBid = Object.assign({}, mockedBid);
+      const bid = Object.assign({}, originalBid);
+
+      addBidResponseHook(noop, 'ad-code-id', bid);
+
+      expect(bid.ad).to.not.equal(originalBid.ad);
+
+      delete bid.ad;
+      delete originalBid.ad;
+
+      expect(bid).to.deep.equal(originalBid);
+    });
+  });
+
+  it('should add a message listener', function() {
+    addListenerOnce();
+    expect(listenerAdded).to.equal(true);
+  });
+
+  it('should support custom renderers', function() {
+    init({
+      renderUrl: 'https://...',
+      custom: [
+        {
+          dealIdPattern: /abc/,
+          render: function() {}
+        }
+      ]
+    });
+
+    const renderers = updateRenderers();
+
+    expect(renderers.length).to.equal(2);
+  });
+
+  it('should match bids by deal ID with the default matcher', function() {
+    const match = useDefaultMatch(/abc/);
+
+    expect(match({dealId: 'abc'})).to.equal(true);
+    expect(match({dealId: 'xyz'})).to.equal(false);
+  });
+
+  it('should have a default renderer', function() {
+    const render = useDefaultRender('https://example.com/render.js', 'abc');
+    render({});
+
+    expect(window.abc.loaded).to.equal(true);
+    expect(window.abc.queue.length).to.equal(1);
+  });
+});
diff --git a/test/spec/modules/mathildeadsBidAdapter_spec.js b/test/spec/modules/mathildeadsBidAdapter_spec.js
new file mode 100644
index 00000000000..0f0da6032eb
--- /dev/null
+++ b/test/spec/modules/mathildeadsBidAdapter_spec.js
@@ -0,0 +1,394 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/mathildeadsBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'mathildeads'
+
+describe('MathildeAdsBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {}
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    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;
+      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://endpoint2.mathilde-ads.com/pbjs');
+    });
+
+    it('Returns general data 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',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      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.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, 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 = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, 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([], bidderRequest);
+      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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    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;
+    });
+  });
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs2.mathilde-ads.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs2.mathilde-ads.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});
diff --git a/test/spec/modules/meazyBidAdapter_spec.js b/test/spec/modules/meazyBidAdapter_spec.js
deleted file mode 100644
index 2c24791f515..00000000000
--- a/test/spec/modules/meazyBidAdapter_spec.js
+++ /dev/null
@@ -1,177 +0,0 @@
-import * as utils from 'src/utils.js';
-import { expect } from 'chai';
-import { spec } from 'modules/meazyBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-const MEAZY_PID = '6910b7344ae566a1'
-const VALID_ENDPOINT = `https://rtb-filter.meazy.co/pbjs?host=${utils.getOrigin()}&api_key=${MEAZY_PID}`;
-
-const bidderRequest = {
-  refererInfo: {
-    referer: 'page',
-    stack: ['page', 'page1']
-  }
-};
-
-const bidRequest = {
-  bidder: 'meazy',
-  adUnitCode: 'test-div',
-  sizes: [[300, 250], [300, 600]],
-  params: {
-    pid: MEAZY_PID
-  },
-  bidId: '30b31c1838de1e',
-  bidderRequestId: '22edbae2733bf6',
-  auctionId: '1d1a030790a475',
-};
-
-const bidContent = {
-  'id': '30b31c1838de1e',
-  'bidid': '9780a52ff05c0e92780f5baf9cf3f4e8',
-  'cur': 'USD',
-  'seatbid': [{
-    'bid': [{
-      'id': 'ccf05fb8effb3d02',
-      'impid': 'B19C34BBD69DAF9F',
-      'burl': 'https://track.meazy.co/imp?bidid=9780a52ff05c0e92780f5baf9cf3f4e8&user=fdc401a2-92f1-42bd-ac22-d570520ad0ec&burl=1&ssp=5&project=2&cost=${AUCTION_PRICE}',
-      'adm': '<iframe src="https://ads.meazy.co/ad?u=fdc401a2-92f1-42bd-ac22-d570520ad0ec&s=6&p=2&g=e97b3549dc62c94d7e6b1d6db50917f9&gu=%252Fsergi-s-podvesnoy-chastyu%252Fserebryanye-serezhki-s-fianitami-302-00130-16373%252F&r=9780a52ff05c0e92780f5baf9cf3f4e8&si=75&sz=300x250&ssp=5&ts=1563820889&iph=6712b60796a2ed8ce4da786a7715ff2c25295aea&pl=ukr.net&bp=1.5&sp=${AUCTION_PRICE}" width="300" height="250" scrolling="no" style="overflow:hidden" frameBorder="0"></iframe>',
-      'adid': 'ad-2.6.75.300x250',
-      'price': 1.5,
-      'w': 300,
-      'h': 250,
-      'cid': '2.6.75',
-      'crid': '2.6.75.300x250',
-      'dealid': 'default'
-    }],
-    'seat': '2'
-  }]
-};
-
-const bidContentExt = {
-  ...bidContent,
-  ext: {
-    'syncUrl': 'https://sync.meazy.co/sync/img?api_key=6910b7344ae566a1'
-  }
-};
-
-const bidResponse = {
-  body: bidContent
-};
-
-const noBidResponse = { body: {'nbr': 2} };
-
-describe('meazyBidAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    it('should return false', function () {
-      let bid = Object.assign({}, bidRequest);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return true', function () {
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('should format valid url', function () {
-      const request = spec.buildRequests([bidRequest], bidderRequest);
-      expect(request.url).to.equal(VALID_ENDPOINT);
-    });
-
-    it('should format valid url', function () {
-      const request = spec.buildRequests([bidRequest], bidderRequest);
-      expect(request.url).to.equal(VALID_ENDPOINT);
-    });
-
-    it('should format valid request body', function () {
-      const request = spec.buildRequests([bidRequest], bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.id).to.exist;
-      expect(payload.imp).to.exist;
-      expect(payload.imp[0]).to.exist;
-      expect(payload.imp[0].banner).to.exist;
-      expect(payload.imp[0].banner.format).to.exist;
-      expect(payload.device).to.exist;
-      expect(payload.site).to.exist;
-      expect(payload.site.domain).to.exist;
-      expect(payload.cur).to.exist;
-    });
-
-    it('should format valid url', function () {
-      const request = spec.buildRequests([bidRequest], bidderRequest);
-      expect(request.url).to.equal(VALID_ENDPOINT);
-    });
-
-    it('should not fill user.ext object', function () {
-      const request = spec.buildRequests([bidRequest], bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.user.ext).to.equal(undefined);
-    });
-
-    it('should fill user.ext object', function () {
-      const consentString = 'hellogdpr';
-      const request = spec.buildRequests([bidRequest], { ...bidderRequest, gdprConsent: { gdprApplies: true, consentString } });
-      const payload = JSON.parse(request.data);
-      expect(payload.user.ext).to.exist.and.to.be.a('object');
-      expect(payload.user.ext.consent).to.equal(consentString);
-      expect(payload.user.ext.gdpr).to.equal(1);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('should get correct bid response', function () {
-      const result = spec.interpretResponse(bidResponse);
-      const validResponse = [{
-        requestId: '30b31c1838de1e',
-        cpm: 1.5,
-        width: 300,
-        height: 250,
-        creativeId: '2.6.75.300x250',
-        netRevenue: true,
-        dealId: 'default',
-        currency: 'USD',
-        ttl: 900,
-        ad: '<iframe src="https://ads.meazy.co/ad?u=fdc401a2-92f1-42bd-ac22-d570520ad0ec&s=6&p=2&g=e97b3549dc62c94d7e6b1d6db50917f9&gu=%252Fsergi-s-podvesnoy-chastyu%252Fserebryanye-serezhki-s-fianitami-302-00130-16373%252F&r=9780a52ff05c0e92780f5baf9cf3f4e8&si=75&sz=300x250&ssp=5&ts=1563820889&iph=6712b60796a2ed8ce4da786a7715ff2c25295aea&pl=ukr.net&bp=1.5&sp=${AUCTION_PRICE}" width="300" height="250" scrolling="no" style="overflow:hidden" frameBorder="0"></iframe>'
-      }];
-
-      expect(result).to.deep.equal(validResponse);
-    });
-
-    it('handles nobid responses', function () {
-      let result = spec.interpretResponse(noBidResponse);
-      expect(result.length).to.equal(0);
-    });
-  });
-
-  describe('getUserSyncs', function () {
-    const syncOptionsFF = { iframeEnabled: false };
-    const syncOptionsEF = { iframeEnabled: true };
-    const syncOptionsEE = { pixelEnabled: true, iframeEnabled: true };
-    const syncOptionsFE = { pixelEnabled: true, iframeEnabled: false };
-
-    const successIFrame = { type: 'iframe', url: 'https://sync.meazy.co/sync/iframe' };
-    const successPixel = { type: 'image', url: 'https://sync.meazy.co/sync/img?api_key=6910b7344ae566a1' };
-
-    it('should return an empty array', function () {
-      expect(spec.getUserSyncs(syncOptionsFF, [])).to.be.empty;
-      expect(spec.getUserSyncs(syncOptionsFF, [ bidResponse ])).to.be.empty;
-      expect(spec.getUserSyncs(syncOptionsFE, [ bidResponse ])).to.be.empty;
-    });
-
-    it('should be equal to the expected result', function () {
-      expect(spec.getUserSyncs(syncOptionsEF, [ bidResponse ])).to.deep.equal([successIFrame]);
-      expect(spec.getUserSyncs(syncOptionsFE, [ { body: bidContentExt } ])).to.deep.equal([successPixel]);
-      expect(spec.getUserSyncs(syncOptionsEE, [ { body: bidContentExt } ])).to.deep.equal([successPixel, successIFrame]);
-      expect(spec.getUserSyncs(syncOptionsEE, [])).to.deep.equal([successIFrame]);
-    })
-  });
-});
diff --git a/test/spec/modules/mediaforceBidAdapter_spec.js b/test/spec/modules/mediaforceBidAdapter_spec.js
index 09d997e9349..22f584306a9 100644
--- a/test/spec/modules/mediaforceBidAdapter_spec.js
+++ b/test/spec/modules/mediaforceBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {assert} from 'chai';
 import {spec} from 'modules/mediaforceBidAdapter.js';
 import * as utils from '../../../src/utils.js';
+import {BANNER, NATIVE} from '../../../src/mediaTypes.js';
 
 describe('mediaforce bid adapter', function () {
   let sandbox;
@@ -19,14 +20,14 @@ describe('mediaforce bid adapter', function () {
   }
 
   const language = getLanguage();
-  const baseUrl = 'https://rtb.mfadsrvr.com'
+  const baseUrl = 'https://rtb.mfadsrvr.com';
 
   describe('isBidRequestValid()', function () {
     const defaultBid = {
       bidder: 'mediaforce',
       params: {
         property: '10433394',
-        bidfloor: 0.3,
+        bidfloor: 0,
       },
     };
 
@@ -56,17 +57,6 @@ describe('mediaforce bid adapter', function () {
       bid.params = {publisher_id: 2, placement_id: '123'};
       assert.equal(spec.isBidRequestValid(bid), true);
     });
-
-    it('should return false when mediaTypes == native passed (native is not supported yet)', function () {
-      let bid = utils.deepClone(defaultBid);
-      bid.mediaTypes = {
-        native: {
-          sizes: [[300, 250]]
-        }
-      };
-      bid.params = {publisher_id: 2, placement_id: '123'};
-      assert.equal(spec.isBidRequestValid(bid), true);
-    });
   });
 
   describe('buildRequests()', function () {
@@ -76,16 +66,73 @@ describe('mediaforce bid adapter', function () {
         publisher_id: 'pub123',
         placement_id: '202',
       },
+      nativeParams: {
+        title: {
+          required: true,
+          len: 800
+        },
+        image: {
+          required: true,
+          sizes: [300, 250],
+        },
+        sponsoredBy: {
+          required: true
+        }
+      },
       mediaTypes: {
         banner: {
           sizes: [[300, 250]]
+        },
+        native: {
+          title: {
+            required: true,
+            len: 800
+          },
+          image: {
+            required: true,
+            sizes: [300, 250],
+          },
+          sponsoredBy: {
+            required: true
+          }
         }
       },
       transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
     };
 
+    const multiBid = [
+      {
+        publisher_id: 'pub123',
+        placement_id: '202',
+      },
+      {
+        publisher_id: 'pub123',
+        placement_id: '203',
+      },
+      {
+        publisher_id: 'pub124',
+        placement_id: '202',
+      },
+      {
+        publisher_id: 'pub123',
+        placement_id: '203',
+        transactionId: '8df76688-1618-417a-87b1-60ad046841c9'
+      }
+    ].map(({publisher_id, placement_id, transactionId}) => {
+      return {
+        bidder: 'mediaforce',
+        params: {publisher_id, placement_id},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [600, 400]]
+          }
+        },
+        transactionId: transactionId || 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+      }
+    });
+
     const refererInfo = {
-      referer: 'https://www.prebid.org',
+      ref: 'https://www.prebid.org',
       reachedTop: true,
       stack: [
         'https://www.prebid.org/page.html',
@@ -95,7 +142,9 @@ describe('mediaforce bid adapter', function () {
 
     const requestUrl = `${baseUrl}/header_bid`;
     const dnt = utils.getDNT() ? 1 : 0;
-    const secure = 1
+    const secure = window.location.protocol === 'https:' ? 1 : 0;
+    const pageUrl = window.location.href;
+    const timeout = 1500;
 
     it('should return undefined if no validBidRequests passed', function () {
       assert.equal(spec.buildRequests([]), undefined);
@@ -108,21 +157,32 @@ describe('mediaforce bid adapter', function () {
 
     it('should return proper banner imp', function () {
       let bid = utils.deepClone(defaultBid);
-      bid.params.bidfloor = 0.5;
+      bid.params.bidfloor = 0;
 
       let bidRequests = [bid];
-      let bidderRequest = {bids: bidRequests, refererInfo: refererInfo};
+      let bidderRequest = {
+        bids: bidRequests,
+        refererInfo: refererInfo,
+        timeout: timeout,
+        auctionId: '210a474e-88f0-4646-837f-4253b7cf14fb'
+      };
 
       let [request] = spec.buildRequests(bidRequests, bidderRequest);
 
       let data = JSON.parse(request.data);
       assert.deepEqual(data, {
-        id: bid.transactionId,
+        id: data.id,
+        tmax: timeout,
+        ext: {
+          mediaforce: {
+            hb_key: bidderRequest.auctionId
+          }
+        },
         site: {
           id: bid.params.publisher_id,
           publisher: {id: bid.params.publisher_id},
-          ref: encodeURIComponent(refererInfo.referer),
-          page: encodeURIComponent(refererInfo.referer),
+          ref: encodeURIComponent(refererInfo.ref),
+          page: pageUrl,
         },
         device: {
           ua: navigator.userAgent,
@@ -134,14 +194,32 @@ describe('mediaforce bid adapter', function () {
           tagid: bid.params.placement_id,
           secure: secure,
           bidfloor: bid.params.bidfloor,
+          ext: {
+            mediaforce: {
+              transactionId: bid.transactionId
+            }
+          },
           banner: {w: 300, h: 250},
+          native: {
+            ver: '1.2',
+            request: {
+              assets: [
+                {id: 1, title: {len: 800}, required: 1},
+                {id: 3, img: {w: 300, h: 250, type: 3}, required: 1},
+                {id: 5, data: {type: 1}, required: 1}
+              ],
+              context: 1,
+              plcmttype: 1,
+              ver: '1.2'
+            }
+          },
         }],
       });
 
       assert.deepEqual(request, {
         method: 'POST',
         url: requestUrl,
-        data: '{"id":"d45dd707-a418-42ec-b8a7-b70a6c6fab0b","site":{"page":"https%3A%2F%2Fwww.prebid.org","ref":"https%3A%2F%2Fwww.prebid.org","id":"pub123","publisher":{"id":"pub123"}},"device":{"ua":"' + navigator.userAgent + '","js":1,"dnt":' + dnt + ',"language":"' + language + '"},"imp":[{"tagid":"202","secure":1,"bidfloor":0.5,"banner":{"w":300,"h":250}}]}',
+        data: '{"id":"' + data.id + '","site":{"page":"' + pageUrl + '","ref":"https%3A%2F%2Fwww.prebid.org","id":"pub123","publisher":{"id":"pub123"}},"device":{"ua":"' + navigator.userAgent + '","js":1,"dnt":' + dnt + ',"language":"' + language + '"},"ext":{"mediaforce":{"hb_key":"210a474e-88f0-4646-837f-4253b7cf14fb"}},"tmax":1500,"imp":[{"tagid":"202","secure":' + secure + ',"bidfloor":0,"ext":{"mediaforce":{"transactionId":"d45dd707-a418-42ec-b8a7-b70a6c6fab0b"}},"banner":{"w":300,"h":250},"native":{"ver":"1.2","request":{"assets":[{"required":1,"id":1,"title":{"len":800}},{"required":1,"id":3,"img":{"type":3,"w":300,"h":250}},{"required":1,"id":5,"data":{"type":1}}],"context":1,"plcmttype":1,"ver":"1.2"}}}]}',
       });
     });
 
@@ -157,6 +235,116 @@ describe('mediaforce bid adapter', function () {
       let data = JSON.parse(request.data);
       assert.deepEqual(data.imp[0].banner, {w: 300, h: 600, format: [{w: 300, h: 250}]});
     });
+
+    it('should return proper requests for multiple imps', function () {
+      let bidderRequest = {
+        bids: multiBid,
+        refererInfo: refererInfo,
+        timeout: timeout,
+        auctionId: '210a474e-88f0-4646-837f-4253b7cf14fb'
+      };
+
+      let requests = spec.buildRequests(multiBid, bidderRequest);
+      assert.equal(requests.length, 2);
+      requests.forEach((req) => {
+        req.data = JSON.parse(req.data);
+      });
+
+      assert.deepEqual(requests, [
+        {
+          method: 'POST',
+          url: requestUrl,
+          data: {
+            id: requests[0].data.id,
+            tmax: timeout,
+            ext: {
+              mediaforce: {
+                hb_key: bidderRequest.auctionId
+              }
+            },
+            site: {
+              id: 'pub123',
+              publisher: {id: 'pub123'},
+              ref: encodeURIComponent(refererInfo.ref),
+              page: pageUrl,
+            },
+            device: {
+              ua: navigator.userAgent,
+              dnt: dnt,
+              js: 1,
+              language: language,
+            },
+            imp: [{
+              tagid: '202',
+              secure: secure,
+              bidfloor: 0,
+              ext: {
+                mediaforce: {
+                  transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+                }
+              },
+              banner: {w: 300, h: 250, format: [{w: 600, h: 400}]},
+            }, {
+              tagid: '203',
+              secure: secure,
+              bidfloor: 0,
+              ext: {
+                mediaforce: {
+                  transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+                }
+              },
+              banner: {w: 300, h: 250, format: [{w: 600, h: 400}]},
+            }, {
+              tagid: '203',
+              secure: secure,
+              bidfloor: 0,
+              ext: {
+                mediaforce: {
+                  transactionId: '8df76688-1618-417a-87b1-60ad046841c9'
+                }
+              },
+              banner: {w: 300, h: 250, format: [{w: 600, h: 400}]},
+            }]
+          }
+        },
+        {
+          method: 'POST',
+          url: requestUrl,
+          data: {
+            id: requests[1].data.id,
+            tmax: timeout,
+            ext: {
+              mediaforce: {
+                hb_key: bidderRequest.auctionId
+              }
+            },
+            site: {
+              id: 'pub124',
+              publisher: {id: 'pub124'},
+              ref: encodeURIComponent(refererInfo.ref),
+              page: pageUrl,
+            },
+            device: {
+              ua: navigator.userAgent,
+              dnt: dnt,
+              js: 1,
+              language: language,
+            },
+            imp: [{
+              tagid: '202',
+              secure: secure,
+              bidfloor: 0,
+              ext: {
+                mediaforce: {
+                  transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+                }
+              },
+              banner: {w: 300, h: 250, format: [{w: 600, h: 400}]},
+            }]
+          }
+        }
+      ]);
+    });
   });
 
   describe('interpretResponse() banner', function () {
@@ -173,6 +361,7 @@ describe('mediaforce bid adapter', function () {
         cid: '2_ssl',
         h: 100,
         cat: ['IAB1-1'],
+        dealid: '3901521',
         crid: '2_ssl',
         impid: '2b3c9d103723a7',
         adid: '2_ssl',
@@ -193,18 +382,191 @@ describe('mediaforce bid adapter', function () {
       assert.deepEqual(bids, ([{
         ad: bid.adm,
         cpm: bid.price,
+        dealId: bid.dealid,
         creativeId: bid.adid,
         currency: response.body.cur,
         height: bid.h,
         netRevenue: true,
         burl: bid.burl,
+        mediaType: BANNER,
         requestId: bid.impid,
         ttl: 300,
+        meta: { advertiserDomains: [] },
         width: bid.w,
       }]));
     });
   });
 
+  describe('interpretResponse() native as object', function () {
+    it('successfull response', function () {
+      let titleText = 'Colorado Drivers With No DUI\'s Getting A Pay Day on Friday';
+      let imgData = {
+        url: `${baseUrl}/image`,
+        w: 1200,
+        h: 627
+      };
+      let nativeLink = `${baseUrl}/click/`;
+      let nativeTracker = `${baseUrl}/imp-image`;
+      let sponsoredByValue = 'Comparisons.org';
+      let bodyValue = 'Drivers With No Tickets In 3 Years Should Do This On June';
+      let bid = {
+        price: 3,
+        id: '65599d0a-42d2-446a-9d39-6086c1433ffe',
+        burl: `${baseUrl}/burl/\${AUCTION_PRICE}`,
+        cid: '2_ssl',
+        cat: ['IAB1-1'],
+        crid: '2_ssl',
+        impid: '2b3c9d103723a7',
+        adid: '2_ssl',
+        ext: {
+          advertiser_name: 'MediaForce',
+          native: {
+            link: {url: nativeLink},
+            assets: [{
+              id: 1,
+              title: {text: titleText},
+              required: 1
+            }, {
+              id: 3,
+              img: imgData
+            }, {
+              id: 5,
+              data: {value: sponsoredByValue}
+            }, {
+              id: 4,
+              data: {value: bodyValue}
+            }],
+            imptrackers: [nativeTracker],
+            ver: '1'
+          },
+          language: 'en',
+          agency_name: 'MediaForce DSP'
+        }
+      };
+
+      let response = {
+        body: {
+          seatbid: [{
+            bid: [bid]
+          }],
+          cur: 'USD',
+          id: '620190c2-7eef-42fa-91e2-f5c7fbc2bdd3'
+        }
+      };
+
+      let bids = spec.interpretResponse(response);
+      assert.deepEqual(bids, ([{
+        native: {
+          clickUrl: nativeLink,
+          clickTrackers: [],
+          impressionTrackers: [nativeTracker],
+          javascriptTrackers: [],
+          title: titleText,
+          image: {
+            url: imgData.url,
+            width: imgData.w,
+            height: imgData.h
+          },
+          sponsoredBy: sponsoredByValue,
+          body: bodyValue
+        },
+        cpm: bid.price,
+        creativeId: bid.adid,
+        currency: response.body.cur,
+        netRevenue: true,
+        burl: bid.burl,
+        mediaType: NATIVE,
+        requestId: bid.impid,
+        ttl: 300,
+        meta: { advertiserDomains: [] },
+      }]));
+    });
+  });
+
+  describe('interpretResponse() native as string', function () {
+    it('successfull response', function () {
+      let titleText = 'Colorado Drivers With No DUI\'s Getting A Pay Day on Friday';
+      let imgData = {
+        url: `${baseUrl}/image`,
+        w: 1200,
+        h: 627
+      };
+      let nativeLink = `${baseUrl}/click/`;
+      let nativeTracker = `${baseUrl}/imp-image`;
+      let sponsoredByValue = 'Comparisons.org';
+      let bodyValue = 'Drivers With No Tickets In 3 Years Should Do This On June';
+      let adm = JSON.stringify({
+        native: {
+          link: {url: nativeLink},
+          assets: [{
+            id: 1,
+            title: {text: titleText},
+            required: 1
+          }, {
+            id: 3,
+            img: imgData
+          }, {
+            id: 5,
+            data: {value: sponsoredByValue}
+          }, {
+            id: 4,
+            data: {value: bodyValue}
+          }],
+          imptrackers: [nativeTracker],
+          ver: '1'
+        }
+      });
+      let bid = {
+        price: 3,
+        id: '65599d0a-42d2-446a-9d39-6086c1433ffe',
+        burl: `${baseUrl}/burl/\${AUCTION_PRICE}`,
+        cid: '2_ssl',
+        cat: ['IAB1-1'],
+        crid: '2_ssl',
+        impid: '2b3c9d103723a7',
+        adid: '2_ssl',
+        adm: adm
+      };
+
+      let response = {
+        body: {
+          seatbid: [{
+            bid: [bid]
+          }],
+          cur: 'USD',
+          id: '620190c2-7eef-42fa-91e2-f5c7fbc2bdd3'
+        }
+      };
+
+      let bids = spec.interpretResponse(response);
+      assert.deepEqual(bids, ([{
+        native: {
+          clickUrl: nativeLink,
+          clickTrackers: [],
+          impressionTrackers: [nativeTracker],
+          javascriptTrackers: [],
+          title: titleText,
+          image: {
+            url: imgData.url,
+            width: imgData.w,
+            height: imgData.h
+          },
+          sponsoredBy: sponsoredByValue,
+          body: bodyValue
+        },
+        cpm: bid.price,
+        creativeId: bid.adid,
+        currency: response.body.cur,
+        netRevenue: true,
+        burl: bid.burl,
+        mediaType: NATIVE,
+        requestId: bid.impid,
+        ttl: 300,
+        meta: { advertiserDomains: [] },
+      }]));
+    });
+  });
+
   describe('onBidWon()', function () {
     beforeEach(function() {
       sinon.stub(utils, 'triggerPixel');
diff --git a/test/spec/modules/mediafuseBidAdapter_spec.js b/test/spec/modules/mediafuseBidAdapter_spec.js
new file mode 100644
index 00000000000..bb9bbd34d1d
--- /dev/null
+++ b/test/spec/modules/mediafuseBidAdapter_spec.js
@@ -0,0 +1,1433 @@
+import { expect } from 'chai';
+import { spec } from 'modules/mediafuseBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { auctionManager } from 'src/auctionManager.js';
+import { deepClone } from 'src/utils.js';
+import { config } from 'src/config.js';
+
+const ENDPOINT = 'https://ib.adnxs.com/ut/v3/prebid';
+
+describe('MediaFuseAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'mediafuse',
+      'params': {
+        'placementId': '10433394'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when required params found', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'member': '1234',
+        'invCode': 'ABCD'
+      };
+
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'placementId': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let getAdUnitsStub;
+    let bidRequests = [
+      {
+        'bidder': 'mediafuse',
+        'params': {
+          'placementId': '10433394'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'transactionId': '04f2659e-c005-4eb1-a57c-fa93145e3843'
+      }
+    ];
+
+    beforeEach(function() {
+      getAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits').callsFake(function() {
+        return [];
+      });
+    });
+
+    afterEach(function() {
+      getAdUnitsStub.restore();
+    });
+
+    it('should parse out private sizes', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            privateSizes: [300, 250]
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].private_sizes).to.exist;
+      expect(payload.tags[0].private_sizes).to.deep.equal([{width: 300, height: 250}]);
+    });
+
+    it('should add publisher_id in request', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            publisherId: '1231234'
+          }
+        });
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].publisher_id).to.exist;
+      expect(payload.tags[0].publisher_id).to.deep.equal(1231234);
+      expect(payload.publisher_id).to.exist;
+      expect(payload.publisher_id).to.deep.equal(1231234);
+    })
+
+    it('should add source and verison to the tag', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.sdk).to.exist;
+      expect(payload.sdk).to.deep.equal({
+        source: 'pbjs',
+        version: '$prebid.version$'
+      });
+    });
+
+    it('should populate the ad_types array on all requests', function () {
+      let adUnits = [{
+        code: 'adunit-code',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        bids: [{
+          bidder: 'mediafuse',
+          params: {
+            placementId: '10433394'
+          }
+        }],
+        transactionId: '04f2659e-c005-4eb1-a57c-fa93145e3843'
+      }];
+
+      ['banner', 'video', 'native'].forEach(type => {
+        getAdUnitsStub.callsFake(function(...args) {
+          return adUnits;
+        });
+
+        const bidRequest = Object.assign({}, bidRequests[0]);
+        bidRequest.mediaTypes = {};
+        bidRequest.mediaTypes[type] = {};
+
+        const request = spec.buildRequests([bidRequest]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].ad_types).to.deep.equal([type]);
+
+        if (type === 'banner') {
+          delete adUnits[0].mediaTypes;
+        }
+      });
+    });
+
+    it('should not populate the ad_types array when adUnit.mediaTypes is undefined', function() {
+      const bidRequest = Object.assign({}, bidRequests[0]);
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].ad_types).to.not.exist;
+    });
+
+    it('should populate the ad_types array on outstream requests', function () {
+      const bidRequest = Object.assign({}, bidRequests[0]);
+      bidRequest.mediaTypes = {};
+      bidRequest.mediaTypes.video = {context: 'outstream'};
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].ad_types).to.deep.equal(['video']);
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should attach valid video params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            video: {
+              id: 123,
+              minduration: 100,
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].video).to.deep.equal({
+        id: 123,
+        minduration: 100
+      });
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('should include ORTB video values when video params were not set', function() {
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.params = {
+        placementId: '1234235',
+        video: {
+          skippable: true,
+          playback_method: ['auto_play_sound_off', 'auto_play_sound_unknown'],
+          context: 'outstream'
+        }
+      };
+      bidRequest.mediaTypes = {
+        video: {
+          playerSize: [640, 480],
+          context: 'outstream',
+          mimes: ['video/mp4'],
+          skip: 0,
+          minduration: 5,
+          api: [1, 5, 6],
+          playbackmethod: [2, 4]
+        }
+      };
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].video).to.deep.equal({
+        minduration: 5,
+        playback_method: 2,
+        skippable: true,
+        context: 4
+      });
+      expect(payload.tags[0].video_frameworks).to.deep.equal([1, 4])
+    });
+
+    it('should add video property when adUnit includes a renderer', function () {
+      const videoData = {
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            mimes: ['video/mp4']
+          }
+        },
+        params: {
+          placementId: '10433394',
+          video: {
+            skippable: true,
+            playback_method: ['auto_play_sound_off']
+          }
+        }
+      };
+
+      let bidRequest1 = deepClone(bidRequests[0]);
+      bidRequest1 = Object.assign({}, bidRequest1, videoData, {
+        renderer: {
+          url: 'https://test.renderer.url',
+          render: function () {}
+        }
+      });
+
+      let bidRequest2 = deepClone(bidRequests[0]);
+      bidRequest2.adUnitCode = 'adUnit_code_2';
+      bidRequest2 = Object.assign({}, bidRequest2, videoData);
+
+      const request = spec.buildRequests([bidRequest1, bidRequest2]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].video).to.deep.equal({
+        skippable: true,
+        playback_method: 2,
+        custom_renderer_present: true
+      });
+      expect(payload.tags[1].video).to.deep.equal({
+        skippable: true,
+        playback_method: 2
+      });
+    });
+
+    it('should attach valid user params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            user: {
+              externalUid: '123',
+              segments: [123, { id: 987, value: 876 }],
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user).to.exist;
+      expect(payload.user).to.deep.equal({
+        external_uid: '123',
+        segments: [{id: 123}, {id: 987, value: 876}]
+      });
+    });
+
+    it('should attach reserve param when either bid param or getFloor function exists', function () {
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      let request, payload = null;
+      let bidRequest = deepClone(bidRequests[0]);
+
+      // 1 -> reserve not defined, getFloor not defined > empty
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.not.exist;
+
+      // 2 -> reserve is defined, getFloor not defined > reserve is used
+      bidRequest.params = {
+        'placementId': '10433394',
+        'reserve': 0.5
+      };
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(0.5);
+
+      // 3 -> reserve is defined, getFloor is defined > getFloor is used
+      bidRequest.getFloor = () => getFloorResponse;
+
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(3);
+    });
+
+    it('should duplicate adpod placements into batches and set correct maxduration', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 300,
+              durationRangeSec: [15, 30],
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload1 = JSON.parse(request[0].data);
+      const payload2 = JSON.parse(request[1].data);
+
+      // 300 / 15 = 20 total
+      expect(payload1.tags.length).to.equal(15);
+      expect(payload2.tags.length).to.equal(5);
+
+      expect(payload1.tags[0]).to.deep.equal(payload1.tags[1]);
+      expect(payload1.tags[0].video.maxduration).to.equal(30);
+
+      expect(payload2.tags[0]).to.deep.equal(payload1.tags[1]);
+      expect(payload2.tags[0].video.maxduration).to.equal(30);
+    });
+
+    it('should round down adpod placements when numbers are uneven', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 123,
+              durationRangeSec: [45],
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags.length).to.equal(2);
+    });
+
+    it('should duplicate adpod placements when requireExactDuration is set', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 300,
+              durationRangeSec: [15, 30],
+              requireExactDuration: true,
+            }
+          }
+        }
+      );
+
+      // 20 total placements with 15 max impressions = 2 requests
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.length).to.equal(2);
+
+      // 20 spread over 2 requests = 15 in first request, 5 in second
+      const payload1 = JSON.parse(request[0].data);
+      const payload2 = JSON.parse(request[1].data);
+      expect(payload1.tags.length).to.equal(15);
+      expect(payload2.tags.length).to.equal(5);
+
+      // 10 placements should have max/min at 15
+      // 10 placemenst should have max/min at 30
+      const payload1tagsWith15 = payload1.tags.filter(tag => tag.video.maxduration === 15);
+      const payload1tagsWith30 = payload1.tags.filter(tag => tag.video.maxduration === 30);
+      expect(payload1tagsWith15.length).to.equal(10);
+      expect(payload1tagsWith30.length).to.equal(5);
+
+      // 5 placemenst with min/max at 30 were in the first request
+      // so 5 remaining should be in the second
+      const payload2tagsWith30 = payload2.tags.filter(tag => tag.video.maxduration === 30);
+      expect(payload2tagsWith30.length).to.equal(5);
+    });
+
+    it('should set durations for placements when requireExactDuration is set and numbers are uneven', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 105,
+              durationRangeSec: [15, 30, 60],
+              requireExactDuration: true,
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags.length).to.equal(7);
+
+      const tagsWith15 = payload.tags.filter(tag => tag.video.maxduration === 15);
+      const tagsWith30 = payload.tags.filter(tag => tag.video.maxduration === 30);
+      const tagsWith60 = payload.tags.filter(tag => tag.video.maxduration === 60);
+      expect(tagsWith15.length).to.equal(3);
+      expect(tagsWith30.length).to.equal(3);
+      expect(tagsWith60.length).to.equal(1);
+    });
+
+    it('should break adpod request into batches', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 225,
+              durationRangeSec: [5],
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload1 = JSON.parse(request[0].data);
+      const payload2 = JSON.parse(request[1].data);
+      const payload3 = JSON.parse(request[2].data);
+
+      expect(payload1.tags.length).to.equal(15);
+      expect(payload2.tags.length).to.equal(15);
+      expect(payload3.tags.length).to.equal(15);
+    });
+
+    it('should contain hb_source value for adpod', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: { placementId: '14542875' }
+        },
+        {
+          mediaTypes: {
+            video: {
+              context: 'adpod',
+              playerSize: [640, 480],
+              adPodDurationSec: 300,
+              durationRangeSec: [15, 30],
+            }
+          }
+        }
+      );
+      const request = spec.buildRequests([bidRequest])[0];
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].hb_source).to.deep.equal(7);
+    });
+
+    it('should contain hb_source value for other media', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'banner',
+          params: {
+            sizes: [[300, 250], [300, 600]],
+            placementId: 13144370
+          }
+        }
+      );
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('adds brand_category_exclusion to request when set', function() {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon
+        .stub(config, 'getConfig')
+        .withArgs('adpod.brandCategoryExclusion')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.brand_category_uniqueness).to.equal(true);
+
+      config.getConfig.restore();
+    });
+
+    it('adds auction level keywords to request when set', function() {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon
+        .stub(config, 'getConfig')
+        .withArgs('mediafuseAuctionKeywords')
+        .returns({
+          gender: 'm',
+          music: ['rock', 'pop'],
+          test: ''
+        });
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.keywords).to.deep.equal([{
+        'key': 'gender',
+        'value': ['m']
+      }, {
+        'key': 'music',
+        'value': ['rock', 'pop']
+      }, {
+        'key': 'test'
+      }]);
+
+      config.getConfig.restore();
+    });
+
+    it('should attach native params to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'native',
+          nativeParams: {
+            title: {required: true},
+            body: {required: true},
+            body2: {required: true},
+            image: {required: true, sizes: [100, 100]},
+            icon: {required: true},
+            cta: {required: false},
+            rating: {required: true},
+            sponsoredBy: {required: true},
+            privacyLink: {required: true},
+            displayUrl: {required: true},
+            address: {required: true},
+            downloads: {required: true},
+            likes: {required: true},
+            phone: {required: true},
+            price: {required: true},
+            salePrice: {required: true}
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].native.layouts[0]).to.deep.equal({
+        title: {required: true},
+        description: {required: true},
+        desc2: {required: true},
+        main_image: {required: true, sizes: [{ width: 100, height: 100 }]},
+        icon: {required: true},
+        ctatext: {required: false},
+        rating: {required: true},
+        sponsored_by: {required: true},
+        privacy_link: {required: true},
+        displayurl: {required: true},
+        address: {required: true},
+        downloads: {required: true},
+        likes: {required: true},
+        phone: {required: true},
+        price: {required: true},
+        saleprice: {required: true},
+        privacy_supported: true
+      });
+      expect(payload.tags[0].hb_source).to.equal(1);
+    });
+
+    it('should always populated tags[].sizes with 1,1 for native if otherwise not defined', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'native',
+          nativeParams: {
+            image: { required: true }
+          }
+        }
+      );
+      bidRequest.sizes = [[150, 100], [300, 250]];
+
+      let request = spec.buildRequests([bidRequest]);
+      let payload = JSON.parse(request.data);
+      expect(payload.tags[0].sizes).to.deep.equal([{width: 150, height: 100}, {width: 300, height: 250}]);
+
+      delete bidRequest.sizes;
+
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].sizes).to.deep.equal([{width: 1, height: 1}]);
+    });
+
+    it('should convert keyword params to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            keywords: {
+              single: 'val',
+              singleArr: ['val'],
+              singleArrNum: [5],
+              multiValMixed: ['value1', 2, 'value3'],
+              singleValNum: 123,
+              emptyStr: '',
+              emptyArr: [''],
+              badValue: {'foo': 'bar'} // should be dropped
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'single',
+        'value': ['val']
+      }, {
+        'key': 'singleArr',
+        'value': ['val']
+      }, {
+        'key': 'singleArrNum',
+        'value': ['5']
+      }, {
+        'key': 'multiValMixed',
+        'value': ['value1', '2', 'value3']
+      }, {
+        'key': 'singleValNum',
+        'value': ['123']
+      }, {
+        'key': 'emptyStr'
+      }, {
+        'key': 'emptyArr'
+      }]);
+    });
+
+    it('should add payment rules to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            usePaymentRule: true
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].use_pmt_rule).to.equal(true);
+    });
+
+    it('should add gpid to the request', function () {
+      let testGpid = '/12345/my-gpt-tag-0';
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.ortb2Imp = { ext: { data: { pbadslot: testGpid } } };
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].gpid).to.exist.and.equal(testGpid)
+    });
+
+    it('should add gdpr consent information to the request', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'mediafuse',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true,
+          addtlConsent: '1~7.12.35.62.66.70.89.93.108'
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.options).to.deep.equal({withCredentials: true});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr_consent).to.exist;
+      expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
+      expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+      expect(payload.gdpr_consent.addtl_consent).to.exist.and.to.deep.equal([7, 12, 35, 62, 66, 70, 89, 93, 108]);
+    });
+
+    it('should add us privacy string to payload', function() {
+      let consentString = '1YA-';
+      let bidderRequest = {
+        'bidderCode': 'mediafuse',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'uspConsent': consentString
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.us_privacy).to.exist;
+      expect(payload.us_privacy).to.exist.and.to.equal(consentString);
+    });
+
+    it('supports sending hybrid mobile app parameters', function () {
+      let appRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            app: {
+              id: 'B1O2W3M4AN.com.prebid.webview',
+              geo: {
+                lat: 40.0964439,
+                lng: -75.3009142
+              },
+              device_id: {
+                idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE', // Apple advertising identifier
+                aaid: '38400000-8cf0-11bd-b23e-10b96e40000d', // Android advertising identifier
+                md5udid: '5756ae9022b2ea1e47d84fead75220c8', // MD5 hash of the ANDROID_ID
+                sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF', // SHA1 hash of the ANDROID_ID
+                windowsadid: '750c6be243f1c4b5c9912b95a5742fc5' // Windows advertising identifier
+              }
+            }
+          }
+        }
+      );
+      const request = spec.buildRequests([appRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.app).to.exist;
+      expect(payload.app).to.deep.equal({
+        appid: 'B1O2W3M4AN.com.prebid.webview'
+      });
+      expect(payload.device.device_id).to.exist;
+      expect(payload.device.device_id).to.deep.equal({
+        aaid: '38400000-8cf0-11bd-b23e-10b96e40000d',
+        idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE',
+        md5udid: '5756ae9022b2ea1e47d84fead75220c8',
+        sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF',
+        windowsadid: '750c6be243f1c4b5c9912b95a5742fc5'
+      });
+      expect(payload.device.geo).to.exist;
+      expect(payload.device.geo).to.deep.equal({
+        lat: 40.0964439,
+        lng: -75.3009142
+      });
+    });
+
+    it('should add referer info to payload', function () {
+      const bidRequest = Object.assign({}, bidRequests[0])
+      const bidderRequest = {
+        refererInfo: {
+          topmostLocation: 'https://example.com/page.html',
+          reachedTop: true,
+          numIframes: 2,
+          stack: [
+            'https://example.com/page.html',
+            'https://example.com/iframe1.html',
+            'https://example.com/iframe2.html'
+          ]
+        }
+      }
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.referrer_detection).to.exist;
+      expect(payload.referrer_detection).to.deep.equal({
+        rd_ref: 'https%3A%2F%2Fexample.com%2Fpage.html',
+        rd_top: true,
+        rd_ifs: 2,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      });
+    });
+
+    it('should populate schain if available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        schain: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              'asi': 'blob.com',
+              'sid': '001',
+              'hp': 1
+            }
+          ]
+        }
+      });
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.schain).to.deep.equal({
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            'asi': 'blob.com',
+            'sid': '001',
+            'hp': 1
+          }
+        ]
+      });
+    });
+
+    it('should populate coppa if set in config', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user.coppa).to.equal(true);
+
+      config.getConfig.restore();
+    });
+
+    it('should set the X-Is-Test customHeader if test flag is enabled', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('apn_test')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.customHeaders).to.deep.equal({'X-Is-Test': 1});
+
+      config.getConfig.restore();
+    });
+
+    it('should always set withCredentials: true on the request.options', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.withCredentials).to.equal(true);
+    });
+
+    it('should set simple domain variant if purpose 1 consent is not given', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'mediafuse',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true,
+          apiVersion: 2,
+          vendorData: {
+            purpose: {
+              consents: {
+                1: false
+              }
+            }
+          }
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal('https://ib.adnxs-simple.com/ut/v3/prebid');
+    });
+
+    it('should populate eids when supported userIds are available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        userId: {
+          tdid: 'sample-userid',
+          uid2: { id: 'sample-uid2-value' },
+          criteoId: 'sample-criteo-userid',
+          netId: 'sample-netId-userid',
+          idl_env: 'sample-idl-userid'
+        }
+      });
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.eids).to.deep.include({
+        source: 'adserver.org',
+        id: 'sample-userid',
+        rti_partner: 'TDID'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'criteo.com',
+        id: 'sample-criteo-userid',
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'netid.de',
+        id: 'sample-netId-userid',
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'liveramp.com',
+        id: 'sample-idl-userid'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'uidapi.com',
+        id: 'sample-uid2-value',
+        rti_partner: 'UID2'
+      });
+    });
+
+    it('should populate iab_support object at the root level if omid support is detected', function () {
+      // with bid.params.frameworks
+      let bidRequest_A = Object.assign({}, bidRequests[0], {
+        params: {
+          frameworks: [1, 2, 5, 6],
+          video: {
+            frameworks: [1, 2, 5, 6]
+          }
+        }
+      });
+      let request = spec.buildRequests([bidRequest_A]);
+      let payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.be.an('object');
+      expect(payload.iab_support).to.deep.equal({
+        omidpn: 'Mediafuse',
+        omidpv: '$prebid.version$'
+      });
+      expect(payload.tags[0].banner_frameworks).to.be.an('array');
+      expect(payload.tags[0].banner_frameworks).to.deep.equal([1, 2, 5, 6]);
+      expect(payload.tags[0].video_frameworks).to.be.an('array');
+      expect(payload.tags[0].video_frameworks).to.deep.equal([1, 2, 5, 6]);
+      expect(payload.tags[0].video.frameworks).to.not.exist;
+
+      // without bid.params.frameworks
+      const bidRequest_B = Object.assign({}, bidRequests[0]);
+      request = spec.buildRequests([bidRequest_B]);
+      payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.not.exist;
+      expect(payload.tags[0].banner_frameworks).to.not.exist;
+      expect(payload.tags[0].video_frameworks).to.not.exist;
+
+      // with video.frameworks but it is not an array
+      const bidRequest_C = Object.assign({}, bidRequests[0], {
+        params: {
+          video: {
+            frameworks: "'1', '2', '3', '6'"
+          }
+        }
+      });
+      request = spec.buildRequests([bidRequest_C]);
+      payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.not.exist;
+      expect(payload.tags[0].banner_frameworks).to.not.exist;
+      expect(payload.tags[0].video_frameworks).to.not.exist;
+    });
+  })
+
+  describe('interpretResponse', function () {
+    let bfStub;
+    let bidderSettingsStorage;
+
+    before(function() {
+      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+      bidderSettingsStorage = $$PREBID_GLOBAL$$.bidderSettings;
+    });
+
+    after(function() {
+      bfStub.restore();
+      $$PREBID_GLOBAL$$.bidderSettings = bidderSettingsStorage;
+    });
+
+    let response = {
+      'version': '3.0.0',
+      'tags': [
+        {
+          'uuid': '3db3773286ee59',
+          'tag_id': 10433394,
+          'auction_id': '4534722592064951574',
+          'nobid': false,
+          'no_ad_url': 'https://lax1-ib.adnxs.com/no-ad',
+          'timeout_ms': 10000,
+          'ad_profile_id': 27079,
+          'ads': [
+            {
+              'content_source': 'rtb',
+              'ad_type': 'banner',
+              'buyer_member_id': 958,
+              'creative_id': 29681110,
+              'media_type_id': 1,
+              'media_subtype_id': 1,
+              'cpm': 0.5,
+              'cpm_publisher_currency': 0.5,
+              'publisher_currency_code': '$',
+              'client_initiated_ad_counting': true,
+              'viewability': {
+                'config': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=mediafuse.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+              },
+              'rtb': {
+                'banner': {
+                  'content': '<!-- Creative -->',
+                  'width': 300,
+                  'height': 250
+                },
+                'trackers': [
+                  {
+                    'impression_urls': [
+                      'https://lax1-ib.adnxs.com/impression',
+                      'https://www.test.com/tracker'
+                    ],
+                    'video_events': {}
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'requestId': '3db3773286ee59',
+          'cpm': 0.5,
+          'creativeId': 29681110,
+          'dealId': undefined,
+          'width': 300,
+          'height': 250,
+          'ad': '<!-- Creative -->',
+          'mediaType': 'banner',
+          'currency': 'USD',
+          'ttl': 300,
+          'netRevenue': true,
+          'adUnitCode': 'code',
+          'mediafuse': {
+            'buyerMemberId': 958
+          },
+          'meta': {
+            'dchain': {
+              'ver': '1.0',
+              'complete': 0,
+              'nodes': [{
+                'bsid': '958'
+              }]
+            }
+          }
+        }
+      ];
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      };
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    it('should reject 0 cpm bids', function () {
+      let zeroCpmResponse = deepClone(response);
+      zeroCpmResponse.tags[0].ads[0].cpm = 0;
+
+      let bidderRequest = {
+        bidderCode: 'mediafuse'
+      };
+
+      let result = spec.interpretResponse({ body: zeroCpmResponse }, { bidderRequest });
+      expect(result.length).to.equal(0);
+    });
+
+    it('should allow 0 cpm bids if allowZeroCpmBids setConfig is true', function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        mediafuse: {
+          allowZeroCpmBids: true
+        }
+      };
+
+      let zeroCpmResponse = deepClone(response);
+      zeroCpmResponse.tags[0].ads[0].cpm = 0;
+
+      let bidderRequest = {
+        bidderCode: 'mediafuse',
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      };
+
+      let result = spec.interpretResponse({ body: zeroCpmResponse }, { bidderRequest });
+      expect(result.length).to.equal(1);
+      expect(result[0].cpm).to.equal(0);
+    });
+
+    it('handles nobid responses', function () {
+      let response = {
+        'version': '0.0.1',
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'tag_id': 5976557,
+          'auction_id': '297492697822162468',
+          'nobid': true
+        }]
+      };
+      let bidderRequest;
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result.length).to.equal(0);
+    });
+
+    it('handles outstream video responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'content': '<!-- VAST Creative -->'
+              }
+            },
+            'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=mediafuse.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+          }]
+        }]
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastXml');
+      expect(result[0]).to.have.property('vastImpUrl');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+
+    it('handles instream video responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'asset_url': 'https://sample.vastURL.com/here/vid'
+              }
+            },
+            'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=mediafuse.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+          }]
+        }]
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'instream'
+            }
+          }
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastUrl');
+      expect(result[0]).to.have.property('vastImpUrl');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+
+    it('handles adpod responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'brand_category_id': 10,
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'asset_url': 'https://sample.vastURL.com/here/adpod',
+                'duration_ms': 30000,
+              }
+            },
+            'viewability': {
+              'config': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=mediafuse.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+            }
+          }]
+        }]
+      };
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'adpod'
+            }
+          }
+        }]
+      };
+      bfStub.returns('1');
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastUrl');
+      expect(result[0].video.context).to.equal('adpod');
+      expect(result[0].video.durationSeconds).to.equal(30);
+    });
+
+    it('handles native responses', function () {
+      let response1 = deepClone(response);
+      response1.tags[0].ads[0].ad_type = 'native';
+      response1.tags[0].ads[0].rtb.native = {
+        'title': 'Native Creative',
+        'desc': 'Cool description great stuff',
+        'desc2': 'Additional body text',
+        'ctatext': 'Do it',
+        'sponsored': 'MediaFuse',
+        'icon': {
+          'width': 0,
+          'height': 0,
+          'url': 'https://cdn.adnxs.com/icon.png'
+        },
+        'main_img': {
+          'width': 2352,
+          'height': 1516,
+          'url': 'https://cdn.adnxs.com/img.png'
+        },
+        'link': {
+          'url': 'https://www.mediafuse.com',
+          'fallback_url': '',
+          'click_trackers': ['https://nym1-ib.adnxs.com/click']
+        },
+        'impression_trackers': ['https://example.com'],
+        'rating': '5',
+        'displayurl': 'https://mediafuse.com/?url=display_url',
+        'likes': '38908320',
+        'downloads': '874983',
+        'price': '9.99',
+        'saleprice': 'FREE',
+        'phone': '1234567890',
+        'address': '28 W 23rd St, New York, NY 10010',
+        'privacy_link': 'https://www.mediafuse.com/privacy-policy-agreement/',
+        'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=mediafuse.com-omid;tv=native1-18h;dom_id=;css_selector=.pb-click;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response1 }, {bidderRequest});
+      expect(result[0].native.title).to.equal('Native Creative');
+      expect(result[0].native.body).to.equal('Cool description great stuff');
+      expect(result[0].native.cta).to.equal('Do it');
+      expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
+    });
+
+    it('supports configuring outstream renderers', function () {
+      const outstreamResponse = deepClone(response);
+      outstreamResponse.tags[0].ads[0].rtb.video = {};
+      outstreamResponse.tags[0].ads[0].renderer_url = 'renderer.js';
+
+      const bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          renderer: {
+            options: {
+              adText: 'configured'
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      };
+
+      const result = spec.interpretResponse({ body: outstreamResponse }, {bidderRequest});
+      expect(result[0].renderer.config).to.deep.equal(
+        bidderRequest.bids[0].renderer.options
+      );
+    });
+
+    it('should add deal_priority and deal_code', function() {
+      let responseWithDeal = deepClone(response);
+      responseWithDeal.tags[0].ads[0].ad_type = 'video';
+      responseWithDeal.tags[0].ads[0].deal_priority = 5;
+      responseWithDeal.tags[0].ads[0].deal_code = '123';
+      responseWithDeal.tags[0].ads[0].rtb.video = {
+        duration_ms: 1500,
+        player_width: 640,
+        player_height: 340,
+      };
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'adpod'
+            }
+          }
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseWithDeal }, {bidderRequest});
+      expect(Object.keys(result[0].mediafuse)).to.include.members(['buyerMemberId', 'dealPriority', 'dealCode']);
+      expect(result[0].video.dealTier).to.equal(5);
+    });
+
+    it('should add advertiser id', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].advertiser_id = '123';
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserId']);
+    });
+
+    it('should add brand id', function() {
+      let responseBrandId = deepClone(response);
+      responseBrandId.tags[0].ads[0].brand_id = 123;
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseBrandId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['brandId']);
+    });
+
+    it('should add advertiserDomains', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].adomain = ['123'];
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserDomains']);
+      expect(Object.keys(result[0].meta.advertiserDomains)).to.deep.equal([]);
+    });
+  });
+});
diff --git a/test/spec/modules/mediagoBidAdapter_spec.js b/test/spec/modules/mediagoBidAdapter_spec.js
new file mode 100644
index 00000000000..e77af544429
--- /dev/null
+++ b/test/spec/modules/mediagoBidAdapter_spec.js
@@ -0,0 +1,97 @@
+import { expect } from 'chai';
+import { spec } from 'modules/mediagoBidAdapter.js';
+
+describe('mediago:BidAdapterTests', function () {
+  let bidRequestData = {
+    bidderCode: 'mediago',
+    auctionId: '7fae02a9-0195-472f-ba94-708d3bc2c0d9',
+    bidderRequestId: '4fec04e87ad785',
+    bids: [
+      {
+        bidder: 'mediago',
+        params: {
+          token: '85a6b01e41ac36d49744fad726e3655d',
+          bidfloor: 0.01,
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        adUnitCode: 'regular_iframe',
+        transactionId: '7b26fdae-96e6-4c35-a18b-218dda11397d',
+        sizes: [[300, 250]],
+        bidId: '54d73f19c9d47a', // todo
+        bidderRequestId: '4fec04e87ad785', // todo
+        auctionId: '883a346a-6d62-4adb-a600-0f3a869061d1',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+      },
+    ],
+  };
+  let request = [];
+
+  it('mediago:validate_pub_params', function () {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'mediago',
+        params: {
+          token: ['85a6b01e41ac36d49744fad726e3655d'],
+        },
+      })
+    ).to.equal(true);
+  });
+
+  it('mediago:validate_generated_params', function () {
+    request = spec.buildRequests(bidRequestData.bids, bidRequestData);
+    let req_data = JSON.parse(request.data);
+    expect(req_data.imp).to.have.lengthOf(1);
+  });
+
+  it('mediago:validate_response_params', function () {
+    let adm = "<link rel=\"stylesheet\" href=\"https://cdn.mediago.io/js/style/style_banner_300*250.css\"><div id=\"mgcontainer-99afea272c2b0e8626489674ddb7a0bb\" class=\"mediago-placement imgTopTitleBottom\" style=\"position:relative;width:298px;height:248px;overflow:hidden\"><a href=\"https://trace.mediago.io/api/bidder/track?tn=39934c2bda4debbe4c680be1dd02f5d3&price=djUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk&evt=102&rid=6e28cfaf115a354ea1ad8e1304d6d7b8&campaignid=1339145&impid=44-300x250-1&offerid=24054386&test=0&time=1660789795&cp=jZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM&clickid=44_6e28cfaf115a354ea1ad8e1304d6d7b8_44-300x250-1&acid=599&trackingid=99afea272c2b0e8626489674ddb7a0bb&uid=a865b9ae-fa9e-4c09-8204-2db99ac7c8f7&jt=2&url=oxZA2i2aUVY76Xy2t3HffaK_ZtBDsgFwFc_Nbnw-bz3yCxmoUyZvATKnFc9ZkUfT1eQizhtczCwDzjHwwwDgTehUnp1EwdY4g1LRcuOwlRpXnVTt3zPQdaVx5nVDw25by7lQ0q469LCv2eEFDTAv_FOuVT32WiOx_ArOIlxCnDGpjPLUNyxm3cTZFGOJn4B7&bm=2&la=en&cn=us&cid=3998296&info=Si3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk&sid=128__110__1__12__28__38__163__96__58__24__47__99&sp=djUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk&scp=zK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg&acu=USD&scu=USD&sgcp=zK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg&gprice=djUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk&gcp=zK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg&ah=&pb=&de=wjh.popin.cc&cat=&iv=0\" target=\"_blank\" class=\"mediago-placement-track\" style=\"display: inline-block;\"><img alt=\"Ranger's spot giant lion - vet is shocked when looking at the ultrasound\" src=\"https://d2cli4kgl5uxre.cloudfront.net/ML/ff32b6f9b3bbc45c00b78b6674a2952e__scv1__300x175.png\" style=\"height:70%;width:100%;border-width:0;border:none;\"><h3 class=\"title\" style=\"font-size:16px;\">Ranger's spot giant lion - vet is shocked when looking at the ultrasound</h3></a><span class=\"source\"><a class=\"sourcename\" href=\"//www.mediago.io\" target=\"_blank\"><span>Ad</span> </a><a class=\"mgmgsrcnameadslabelurl\" href=\"//www.mediago.io/privacy\" target=\"_blank\"><span>soo-healthy</span></a></span></div>";
+    let temp = '%3Cscr';
+    temp += 'ipt%3E';
+    temp += '!function()%7B%22use%20strict%22%3Bfunction%20f(t)%7Breturn(f%3D%22function%22%3D%3Dtypeof%20Symbol%26%26%22symbol%22%3D%3Dtypeof%20Symbol.iterator%3Ffunction(t)%7Breturn%20typeof%20t%7D%3Afunction(t)%7Breturn%20t%26%26%22function%22%3D%3Dtypeof%20Symbol%26%26t.constructor%3D%3D%3DSymbol%26%26t!%3D%3DSymbol.prototype%3F%22symbol%22%3Atypeof%20t%7D)(t)%7Dfunction%20l(t)%7Bvar%20e%3D0%3Carguments.length%26%26void%200!%3D%3Dt%3Ft%3A%7B%7D%3Btry%7Be.random_t%3D(new%20Date).getTime()%2Cg(function(t)%7Bvar%20e%3D1%3Carguments.length%26%26void%200!%3D%3Darguments%5B1%5D%3Farguments%5B1%5D%3A%22%22%3Bif(%22object%22!%3D%3Df(t))return%20e%3Bvar%20n%3Dfunction(t)%7Bfor(var%20e%2Cn%3D%5B%5D%2Co%3D0%2Ci%3DObject.keys(t)%3Bo%3Ci.length%3Bo%2B%2B)e%3Di%5Bo%5D%2Cn.push(%22%22.concat(e%2C%22%3D%22).concat(t%5Be%5D))%3Breturn%20n%7D(t).join(%22%26%22)%2Co%3De.indexOf(%22%23%22)%2Ci%3De%2Ct%3D%22%22%3Breturn-1!%3D%3Do%26%26(i%3De.slice(0%2Co)%2Ct%3De.slice(o))%2Cn%26%26(i%26%26-1!%3D%3Di.indexOf(%22%3F%22)%3Fi%2B%3D%22%26%22%2Bn%3Ai%2B%3D%22%3F%22%2Bn)%2Ci%2Bt%7D(e%2C%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Flog%2Ftrack%22))%7Dcatch(t)%7B%7D%7Dfunction%20g(t%2Ce%2Cn)%7B(t%3Dt%3Ft.split(%22%3B%3B%3B%22)%3A%5B%5D).map(function(t)%7Btry%7B0%3C%3Dt.indexOf(%22%2Fapi%2Fbidder%2Ftrack%22)%26%26n%26%26(t%2B%3D%22%26inIframe%3D%22.concat(!(!self.frameElement%7C%7C%22IFRAME%22!%3Dself.frameElement.tagName)%7C%7Cwindow.frames.length!%3Dparent.frames.length%7C%7Cself!%3Dtop)%2Ct%2B%3D%22%26pos_x%3D%22.concat(n.left%2C%22%26pos_y%3D%22).concat(n.top%2C%22%26page_w%3D%22).concat(n.page_width%2C%22%26page_h%3D%22).concat(n.page_height))%7Dcatch(t)%7Bl(%7Btn%3As%2Cwinloss%3A1%2Cfe%3A2%2Cpos_err_c%3A1002%2Cpos_err_m%3At.toString()%7D)%7Dvar%20e%3Dnew%20Image%3Be.src%3Dt%2Ce.style.display%3D%22none%22%2Ce.style.visibility%3D%22hidden%22%2Ce.width%3D0%2Ce.height%3D0%2Cdocument.body.appendChild(e)%7D)%7Dvar%20d%3D%5B%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Fbidder%2Ftrack%3Ftn%3D39934c2bda4debbe4c680be1dd02f5d3%26price%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26evt%3D101%26rid%3D6e28cfaf115a354ea1ad8e1304d6d7b8%26campaignid%3D1339145%26impid%3D44-300x250-1%26offerid%3D24054386%26test%3D0%26time%3D1660789795%26cp%3DjZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM%26acid%3D599%26trackingid%3D99afea272c2b0e8626489674ddb7a0bb%26uid%3Da865b9ae-fa9e-4c09-8204-2db99ac7c8f7%26bm%3D2%26la%3Den%26cn%3Dus%26cid%3D3998296%26info%3DSi3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk%26sid%3D128__110__1__12__28__38__163__96__58__24__47__99%26sp%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26scp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26acu%3DUSD%26scu%3DUSD%26sgcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26gprice%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26gcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26ah%3D%26de%3Dwjh.popin.cc%26iv%3D0%22%2C%22%24%7BITRACKER2%7D%22%2C%22%24%7BITRACKER3%7D%22%2C%22%24%7BITRACKER4%7D%22%2C%22%24%7BITRACKER5%7D%22%2C%22%24%7BITRACKER6%7D%22%5D%2Cp%3D%5B%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Fbidder%2Ftrack%3Ftn%3D39934c2bda4debbe4c680be1dd02f5d3%26price%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26evt%3D104%26rid%3D6e28cfaf115a354ea1ad8e1304d6d7b8%26campaignid%3D1339145%26impid%3D44-300x250-1%26offerid%3D24054386%26test%3D0%26time%3D1660789795%26cp%3DjZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM%26acid%3D599%26trackingid%3D99afea272c2b0e8626489674ddb7a0bb%26uid%3Da865b9ae-fa9e-4c09-8204-2db99ac7c8f7%26sid%3D128__110__1__12__28__38__163__96__58__24__47__99%26format%3D%26crid%3Dff32b6f9b3bbc45c00b78b6674a2952e%26bm%3D2%26la%3Den%26cn%3Dus%26cid%3D3998296%26info%3DSi3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk%26sp%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26scp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26acu%3DUSD%26scu%3DUSD%26sgcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26gprice%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26gcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26ah%3D%26de%3Dwjh.popin.cc%26iv%3D0%22%2C%22%24%7BVTRACKER2%7D%22%2C%22%24%7BVTRACKER3%7D%22%2C%22%24%7BVTRACKER4%7D%22%2C%22%24%7BVTRACKER5%7D%22%2C%22%24%7BVTRACKER6%7D%22%5D%2Cs%3D%22f9f2b1ef23fe2759c2cad0953029a94b%22%2Cn%3Ddocument.getElementById(%22mgcontainer-99afea272c2b0e8626489674ddb7a0bb%22)%3Bn%26%26function()%7Bvar%20a%3Dn.getElementsByClassName(%22mediago-placement-track%22)%3Bif(a%26%26a.length)%7Bvar%20t%2Ce%3Dfunction(t)%7Bvar%20e%2Cn%2Co%2Ci%2Cc%2Cr%3B%22object%22%3D%3D%3Df(r%3Da%5Bt%5D)%26%26(e%3Dfunction(t)%7Btry%7Bvar%20e%3Dt.getBoundingClientRect()%2Cn%3De%26%26e.top%7C%7C-1%2Co%3De%26%26e.left%7C%7C-1%2Ci%3Ddocument.body.scrollWidth%7C%7C-1%2Ce%3Ddocument.body.scrollHeight%7C%7C-1%3Breturn%7Btop%3An.toFixed(0)%2Cleft%3Ao.toFixed(0)%2Cpage_width%3Ai%2Cpage_height%3Ae%7D%7Dcatch(o)%7Breturn%20l(%7Btn%3As%2Cwinloss%3A1%2Cfe%3A2%2Cpos_err_c%3A1001%2Cpos_err_m%3Ao.toString()%7D)%2C%7Btop%3A%22-1%22%2Cleft%3A%22-1%22%2Cpage_width%3A%22-1%22%2Cpage_height%3A%22-1%22%7D%7D%7D(r)%2C(n%3Dd%5Bt%5D)%26%26g(n%2C0%2Ce)%2Co%3Dp%5Bt%5D%2Ci%3D!1%2C(c%3Dfunction()%7BsetTimeout(function()%7Bvar%20t%2Ce%3B!i%26%26(t%3Dr%2Ce%3Dwindow.innerHeight%7C%7Cdocument.documentElement.clientHeight%7C%7Cdocument.body.clientHeight%2C(t.getBoundingClientRect()%26%26t.getBoundingClientRect().top)%3C%3De-.75*(t.offsetHeight%7C%7Ct.clientHeight))%3F(i%3D!0%2Co%26%26g(o))%3Ac()%7D%2C500)%7D)())%7D%3Bfor(t%20in%20a)e(t)%7D%7D()%7D()';
+    temp += '%3B%3C%2Fscri';
+    temp += 'pt%3E';
+    adm += decodeURIComponent(temp);
+    let serverResponse = {
+      body: {
+        id: 'mgprebidjs_0b6572fc-ceba-418f-b6fd-33b41ad0ac8a',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '6e28cfaf115a354ea1ad8e1304d6d7b8',
+                impid: '1',
+                price: 0.087581,
+                adm: adm,
+                cid: '1339145',
+                crid: 'ff32b6f9b3bbc45c00b78b6674a2952e',
+                w: 300,
+                h: 250,
+              },
+            ],
+          },
+        ],
+        cur: 'USD',
+      },
+    };
+
+    let bids = spec.interpretResponse(serverResponse);
+    // console.log({
+    //   bids
+    // });
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+
+    expect(bid.creativeId).to.equal('ff32b6f9b3bbc45c00b78b6674a2952e');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
+  });
+});
diff --git a/test/spec/modules/mediakeysBidAdapter_spec.js b/test/spec/modules/mediakeysBidAdapter_spec.js
new file mode 100644
index 00000000000..393b6ac6764
--- /dev/null
+++ b/test/spec/modules/mediakeysBidAdapter_spec.js
@@ -0,0 +1,909 @@
+import { expect } from 'chai';
+import {find} from 'src/polyfill.js';
+import { spec } from 'modules/mediakeysBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as utils from 'src/utils.js';
+import { config } from 'src/config.js';
+import { BANNER, NATIVE, VIDEO } from '../../../src/mediaTypes.js';
+import { OUTSTREAM } from '../../../src/video.js';
+
+describe('mediakeysBidAdapter', function () {
+  const adapter = newBidder(spec);
+  let utilsMock;
+  let sandbox;
+
+  const bid = {
+    bidder: 'mediakeys',
+    params: {},
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 600],
+        ],
+      },
+    },
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    transactionId: '47789656-9e5c-4250-b7e0-2ce4cbe71a55',
+    sizes: [
+      [300, 250],
+      [300, 600],
+    ],
+    bidId: '299320f4de980d',
+    bidderRequestId: '1c1b642f803242',
+    auctionId: '84212956-c377-40e8-b000-9885a06dc692',
+    src: 'client',
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    ortb2Imp: {
+      ext: { data: { something: 'test' } }
+    }
+  };
+
+  const bidNative = {
+    bidder: 'mediakeys',
+    params: {},
+    mediaTypes: {
+      native: {
+        body: {
+          required: true
+        },
+        title: {
+          required: true,
+          len: 800
+        },
+        sponsoredBy: {
+          required: true
+        },
+        body2: {
+          required: true
+        },
+        image: {
+          required: true,
+          sizes: [[300, 250], [300, 600], [100, 150]],
+        },
+        icon: {
+          required: true,
+          sizes: [50, 50],
+        },
+      },
+    },
+    nativeParams: {
+      body: {
+        required: true
+      },
+      title: {
+        required: true,
+        len: 800
+      },
+      sponsoredBy: {
+        required: true
+      },
+      body2: {
+        required: true
+      },
+      image: {
+        required: true,
+        sizes: [[300, 250], [300, 600], [100, 150]],
+      },
+      icon: {
+        required: true,
+        sizes: [50, 50],
+      },
+    },
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    transactionId: '47789656-9e5c-4250-b7e0-2ce4cbe71a55',
+    bidId: '299320f4de980d',
+    bidderRequestId: '1c1b642f803242',
+    auctionId: '84212956-c377-40e8-b000-9885a06dc692',
+    src: 'client',
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    ortb2Imp: {
+      ext: { data: { something: 'test' } }
+    }
+  };
+
+  const bidVideo = {
+    bidder: 'mediakeys',
+    params: {},
+    mediaTypes: {
+      video: {
+        context: OUTSTREAM,
+        playerSize: [480, 320]
+      }
+    },
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    transactionId: '47789656-9e5c-4250-b7e0-2ce4cbe71a55',
+    bidId: '299320f4de980d',
+    bidderRequestId: '1c1b642f803242',
+    auctionId: '84212956-c377-40e8-b000-9885a06dc692',
+    src: 'client',
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    ortb2Imp: {
+      ext: { data: { something: 'test' } }
+    }
+  };
+
+  const bidderRequest = {
+    bidderCode: 'mediakeys',
+    auctionId: '84212956-c377-40e8-b000-9885a06dc692',
+    bidderRequestId: '1c1b642f803242',
+    bids: [
+      bid
+    ],
+    auctionStart: 1620973766319,
+    timeout: 1000,
+    refererInfo: {
+      referer:
+        'https://local.url/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+      reachedTop: true,
+      isAmp: false,
+      numIframes: 0,
+      stack: [
+        'https://local.url/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+      ],
+      canonicalUrl: null,
+    },
+    start: 1620973766325,
+  };
+
+  beforeEach(function () {
+    utilsMock = sinon.mock(utils);
+    sandbox = sinon.createSandbox();
+  });
+
+  afterEach(function () {
+    utilsMock.restore();
+    sandbox.restore();
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should returns true when bid is provided even with empty params', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should returns false when bid is falsy or empty', function () {
+      const emptyBid = {};
+      expect(spec.isBidRequestValid()).to.equal(false);
+      expect(spec.isBidRequestValid(false)).to.equal(false);
+      expect(spec.isBidRequestValid(emptyBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('should create imp for supported mediaType only', function() {
+      const bidRequests = [utils.deepClone(bid)];
+      const bidderRequestCopy = utils.deepClone(bidderRequest);
+      bidderRequestCopy.bids = bidRequests;
+
+      bidRequests[0].mediaTypes.video = {
+        playerSize: [300, 250],
+        context: OUTSTREAM
+      }
+
+      bidRequests[0].mediaTypes.native = bidNative.mediaTypes.native;
+      bidRequests[0].nativeParams = bidNative.mediaTypes.native;
+
+      bidderRequestCopy.bids = bidRequests[0];
+
+      const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+      const data = request.data;
+
+      expect(data.imp.length).to.equal(1);
+      expect(data.imp[0].banner).to.exist;
+      expect(data.imp[0].video).to.exist;
+      expect(data.imp[0].native).to.exist;
+    });
+
+    it('should get expected properties with default values (no params set)', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const data = request.data;
+
+      // openRTB 2.5
+      expect(data.at).to.equal(1);
+      expect(data.cur[0]).to.equal('USD'); // default currency
+      expect(data.source.tid).to.equal(bidderRequest.auctionId);
+
+      expect(data.imp.length).to.equal(1);
+      expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+      expect(data.imp[0].banner.w).to.equal(300);
+      expect(data.imp[0].banner.h).to.equal(250);
+      expect(data.imp[0].banner.format[0].w).to.equal(300);
+      expect(data.imp[0].banner.format[0].h).to.equal(250);
+      expect(data.imp[0].banner.format[1].w).to.equal(300);
+      expect(data.imp[0].banner.format[1].h).to.equal(600);
+      expect(data.imp[0].banner.topframe).to.equal(0);
+      expect(data.imp[0].banner.pos).to.equal(0);
+
+      // Ortb2Imp ext
+      expect(data.imp[0].ext).to.exist;
+      expect(data.imp[0].ext.data.something).to.equal('test');
+    });
+
+    describe('native imp', function() {
+      it('should get a native object in request', function() {
+        const bidRequests = [utils.deepClone(bidNative)];
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+        const data = request.data;
+
+        expect(data.imp.length).to.equal(1);
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+        expect(data.imp[0].native).to.exist;
+        expect(data.imp[0].native.request.ver).to.equal('1.2');
+        expect(data.imp[0].native.request.context).to.equal(1);
+        expect(data.imp[0].native.request.plcmttype).to.equal(1);
+        expect(data.imp[0].native.request.assets.length).to.equal(6);
+        // find the asset body
+        const bodyAsset = find(data.imp[0].native.request.assets, asset => asset.id === 6);
+        expect(bodyAsset.data.type).to.equal(2);
+      });
+
+      it('should get a native object in request with properties filled with params values', function() {
+        const bidRequests = [utils.deepClone(bidNative)];
+        bidRequests[0].params = {
+          native: {
+            context: 3,
+            plcmttype: 3,
+          }
+        }
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+        const data = request.data;
+
+        expect(data.imp.length).to.equal(1);
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+        expect(data.imp[0].native).to.exist;
+        expect(data.imp[0].native.request.ver).to.equal('1.2');
+        expect(data.imp[0].native.request.context).to.equal(3);
+        expect(data.imp[0].native.request.plcmttype).to.equal(3);
+        expect(data.imp[0].native.request.assets.length).to.equal(6);
+      });
+
+      it('should get a native object in request when native type ,image" has been set', function() {
+        const bidRequests = [utils.deepClone(bidNative)];
+        bidRequests[0].mediaTypes.native = { type: 'image' };
+        bidRequests[0].nativeParams = {
+          image: { required: true },
+          title: { required: true },
+          sponsoredBy: { required: true },
+          clickUrl: { required: true }, // [1] Will be ignored as it is used in response validation only
+          body: { required: false },
+          icon: { required: false },
+        };
+
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+        const data = request.data;
+
+        expect(data.imp.length).to.equal(1);
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+        expect(data.imp[0].native).to.exist;
+        expect(data.imp[0].native.request.ver).to.equal('1.2');
+        expect(data.imp[0].native.request.context).to.equal(1);
+        expect(data.imp[0].native.request.plcmttype).to.equal(1);
+        expect(data.imp[0].native.request.assets.length).to.equal(5); // [1] clickUrl ignored
+      });
+
+      it('should log errors and ignore misformated assets', function() {
+        const bidRequests = [utils.deepClone(bidNative)];
+        delete bidRequests[0].nativeParams.title.len;
+        bidRequests[0].nativeParams.unregistred = {required: true};
+
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        utilsMock.expects('logWarn').twice();
+
+        const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+        const data = request.data;
+
+        expect(data.imp.length).to.equal(1);
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+        expect(data.imp[0].native).to.exist;
+        expect(data.imp[0].native.request.assets.length).to.equal(5);
+      });
+    });
+
+    describe('video imp', function() {
+      it('should get a video object in request', function() {
+        const bidRequests = [utils.deepClone(bidVideo)];
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+        const data = request.data;
+
+        expect(data.imp.length).to.equal(1);
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+        expect(data.imp[0].banner).to.not.exist;
+        expect(data.imp[0].video).to.exist;
+        expect(data.imp[0].video.w).to.equal(480);
+        expect(data.imp[0].video.h).to.equal(320);
+      });
+
+      it('should ignore and warn misformated ORTB video properties', function() {
+        const bidRequests = [utils.deepClone(bidVideo)];
+        bidRequests[0].mediaTypes.video.unknown = 'foo';
+        bidRequests[0].mediaTypes.video.placement = 10;
+        bidRequests[0].mediaTypes.video.skipmin = 5;
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+        const data = request.data;
+
+        expect(data.imp.length).to.equal(1);
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+        expect(data.imp[0].banner).to.not.exist;
+        expect(data.imp[0].video).to.exist;
+        expect(data.imp[0].video.w).to.equal(480);
+        expect(data.imp[0].video.h).to.equal(320);
+        expect(data.imp[0].video.skipmin).to.equal(5);
+        expect(data.imp[0].video.placement).to.not.exist;
+        expect(data.imp[0].video.unknown).to.not.exist;
+      });
+
+      it('should merge adUnit mediaTypes level and bidder level params properties ', function() {
+        const bidRequests = [utils.deepClone(bidVideo)];
+        bidRequests[0].mediaTypes.video.placement = 1;
+        bidRequests[0].mediaTypes.video.mimes = ['video/mpeg4'];
+        bidRequests[0].mediaTypes.video.protocols = [1];
+        bidRequests[0].mediaTypes.video.minduration = 10;
+        bidRequests[0].mediaTypes.video.maxduration = 45;
+        bidRequests[0].mediaTypes.video.skipmin = 5;
+        bidRequests[0].mediaTypes.video.sequence = 3;
+        bidRequests[0].mediaTypes.video.linearity = 1;
+        bidRequests[0].mediaTypes.video.battr = [12];
+        bidRequests[0].mediaTypes.video.maxextended = 10;
+        bidRequests[0].mediaTypes.video.minbitrate = 720;
+        bidRequests[0].mediaTypes.video.maxbitrate = 720;
+        bidRequests[0].mediaTypes.video.boxingallowed = 1;
+        bidRequests[0].mediaTypes.video.playbackmethod = [1];
+        bidRequests[0].mediaTypes.video.playbackend = 2;
+        bidRequests[0].mediaTypes.video.delivery = 2;
+        bidRequests[0].mediaTypes.video.pos = 0;
+        bidRequests[0].mediaTypes.video.companionad = [{ w: 360, h: 80 }]
+        bidRequests[0].mediaTypes.video.api = [1];
+        bidRequests[0].mediaTypes.video.companiontype = [1];
+
+        // bidder level
+        bidRequests[0].params.video = {
+          pos: 2, // override
+          skip: 1,
+          skipafter: 10,
+          startdelay: 3
+        };
+
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        utilsMock.expects('logWarn').never();
+
+        const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+        const data = request.data;
+
+        expect(data.imp.length).to.equal(1);
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+        expect(data.imp[0].banner).to.not.exist;
+        expect(data.imp[0].video).to.exist;
+
+        expect(Object.keys(data.imp[0].video).length).to.equal(23); // 21 ortb params (2 skipped) + computed width/height.
+        expect(data.imp[0].video.w).to.equal(480);
+        expect(data.imp[0].video.h).to.equal(320);
+        expect(data.imp[0].video.mimes[0]).to.equal('video/mpeg4');
+        expect(data.imp[0].video.pos).to.equal(2);
+        expect(data.imp[0].video.skip).to.equal(1);
+        expect(data.imp[0].video.skipafter).to.equal(10);
+        expect(data.imp[0].video.startdelay).to.equal(3);
+        expect(data.imp[0].video.companionad).to.not.exist;
+        expect(data.imp[0].video.companiontype).to.not.exist;
+      });
+
+      it('should log warn message when OpenRTB validation fails ', function() {
+        const bidRequests = [utils.deepClone(bidVideo)];
+        bidRequests[0].mediaTypes.video.placement = 'string';
+        bidRequests[0].mediaTypes.video.api = 1;
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        utilsMock.expects('logWarn').twice();
+
+        spec.buildRequests(bidRequests, bidderRequestCopy);
+      });
+    });
+
+    it('should get expected properties with values from params', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      bidRequests[0].params = {
+        pos: 2,
+      };
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const data = request.data;
+      expect(data.imp[0].banner.pos).to.equal(2);
+    });
+
+    it('should get expected properties with schain', function () {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'ssp.test',
+            sid: '00001',
+            hp: 1,
+          },
+        ],
+      };
+      const bidRequests = [utils.deepClone(bid)];
+      bidRequests[0].schain = schain;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const data = request.data;
+      expect(data.source.ext.schain).to.equal(schain);
+    });
+
+    it('should get expected properties with coppa', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+
+      const bidRequests = [utils.deepClone(bid)];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const data = request.data;
+      expect(data.regs.coppa).to.equal(1);
+
+      config.getConfig.restore();
+    });
+
+    it('should get expected properties with US privacy', function () {
+      const consent = 'Y11N';
+      const bidRequests = [utils.deepClone(bid)];
+      const bidderRequestWithUsPrivcay = utils.deepClone(bidderRequest);
+      bidderRequestWithUsPrivcay.uspConsent = consent;
+      const request = spec.buildRequests(
+        bidRequests,
+        bidderRequestWithUsPrivcay
+      );
+      const data = request.data;
+      expect(data.regs.ext.us_privacy).to.equal(consent);
+    });
+
+    it('should get expected properties with GDPR', function () {
+      const consent = {
+        consentString: 'kjfdniwjnifwenrif3',
+        gdprApplies: true,
+      };
+      const bidRequests = [utils.deepClone(bid)];
+      const bidderRequestWithGDPR = utils.deepClone(bidderRequest);
+      bidderRequestWithGDPR.gdprConsent = consent;
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      const data = request.data;
+      expect(data.regs.ext.gdpr).to.equal(1);
+      expect(data.user.ext.consent).to.equal(consent.consentString);
+    });
+
+    describe('PriceFloors module support', function() {
+      const getFloorTest = (options) => {
+        switch (options.mediaType) {
+          case BANNER:
+            return { floor: 1, currency: 'USD' }
+          case VIDEO:
+            return { floor: 5, currency: 'USD' }
+          case NATIVE:
+            return { floor: 3, currency: 'USD' }
+          default:
+            return false
+        }
+      };
+
+      it('should not set `imp[]bidfloor` property when priceFloors module is not available', function () {
+        const bidRequests = [bid];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const data = request.data;
+        expect(data.imp[0].banner).to.exist;
+        expect(data.imp[0].bidfloor).to.not.exist
+      });
+
+      it('should not set `imp[]bidfloor` property when priceFloors module returns false', function () {
+        const bidWithPriceFloors = utils.deepClone(bid);
+
+        bidWithPriceFloors.getFloor = () => {
+          return false;
+        };
+
+        const bidRequests = [bidWithPriceFloors];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const data = request.data;
+
+        expect(data.imp[0].banner).to.exist;
+        expect(data.imp[0].bidfloor).to.not.exist;
+      });
+
+      it('should get the highest floorPrice found when bid have several mediaTypes', function() {
+        const bidWithPriceFloors = utils.deepClone(bid);
+
+        bidWithPriceFloors.mediaTypes.video = {
+          playerSize: [600, 480]
+        };
+
+        bidWithPriceFloors.mediaTypes.native = {
+          body: {
+            required: true
+          }
+        };
+
+        bidWithPriceFloors.nativeParams = {
+          body: {
+            required: true
+          }
+        };
+
+        bidWithPriceFloors.getFloor = getFloorTest;
+
+        const bidRequests = [bidWithPriceFloors];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const data = request.data;
+
+        expect(data.imp[0].banner).to.exist;
+        expect(data.imp[0].video).to.exist;
+        expect(data.imp[0].native).to.exist;
+        expect(data.imp[0].bidfloor).to.equal(5);
+      });
+
+      it('should set properties at payload level from FPD', function() {
+        const ortb2 = {
+          site: {
+            domain: 'domain.example',
+            cat: ['IAB12'],
+            ext: {
+              data: {
+                category: 'sport',
+              }
+            }
+          },
+          user: {
+            yob: 1985,
+            gender: 'm',
+            geo: {
+              country: 'FR',
+              city: 'Marseille'
+            },
+            ext: {
+              data: {
+                registered: true
+              }
+            }
+          }
+        };
+
+        const bidRequests = [utils.deepClone(bid)];
+        const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2});
+        const data = request.data;
+        expect(data.site.domain).to.equal('domain.example');
+        expect(data.site.cat[0]).to.equal('IAB12');
+        expect(data.site.ext.data.category).to.equal('sport');
+        expect(data.user.yob).to.equal(1985);
+        expect(data.user.gender).to.equal('m');
+        expect(data.user.geo.country).to.equal('FR');
+        expect(data.user.geo.city).to.equal('Marseille');
+        expect(data.user.ext.data.registered).to.be.true;
+      });
+    });
+
+    describe('should support userId modules', function() {
+      const userId = {
+        pubcid: '01EAJWWNEPN3CYMM5N8M5VXY22',
+        unsuported: '666'
+      };
+
+      it('should send "user.eids" in the request for Prebid.js supported modules only', function() {
+        const bidCopy = utils.deepClone(bid);
+        bidCopy.userId = userId;
+
+        const bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids[0].userId = userId;
+
+        const bidRequests = [utils.deepClone(bidCopy)];
+        const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+        const data = request.data;
+
+        const expected = [{
+          source: 'pubcid.org',
+          uids: [
+            {
+              atype: 1,
+              id: '01EAJWWNEPN3CYMM5N8M5VXY22'
+            }
+          ]
+        }];
+        expect(data.user.ext).to.exist;
+        expect(data.user.ext.eids).to.have.lengthOf(1);
+        expect(data.user.ext.eids).to.deep.equal(expected);
+      });
+    });
+  });
+
+  describe('intrepretResponse', function () {
+    const rawServerResponse = {
+      body: {
+        id: '60839f99-d5f2-3ab3-b6ac-736b4fe9d0ae',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '60839f99-d5f2-3ab3-b6ac-736b4fe9d0ae_0_0',
+                impid: '1',
+                price: 0.4319,
+                nurl: 'https://local.url/notif?index=ab-cd-ef&price=${AUCTION_PRICE}',
+                burl: 'https://local.url/notif?index=ab-cd-ef&price=${AUCTION_PRICE}',
+                adm: '<iframe src="https://local.url"></iframe>',
+                adomain: ['domain.io'],
+                iurl: 'https://local.url',
+                cid: 'string-id',
+                crid: 'string-id',
+                cat: ['IAB2'],
+                attr: [],
+                w: 300,
+                h: 250,
+                ext: {
+                  advertiser_name: 'Advertiser',
+                  agency_name: 'mediakeys',
+                  prebid: {
+                    type: 'B'
+                  }
+                },
+              },
+            ],
+            seat: '337',
+          },
+        ],
+        cur: 'USD',
+        ext: { protocol: '5.3' },
+      }
+    }
+
+    it('Returns empty array if no bid', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const response01 = spec.interpretResponse({ body: { seatbid: [{ bid: [] }] } }, request);
+      const response02 = spec.interpretResponse({ body: { seatbid: [] } }, request);
+      const response03 = spec.interpretResponse({ body: { seatbid: null } }, request);
+      const response04 = spec.interpretResponse({ body: { seatbid: null } }, request);
+      const response05 = spec.interpretResponse({ body: {} }, request);
+      const response06 = spec.interpretResponse({}, request);
+
+      expect(response01.length).to.equal(0);
+      expect(response02.length).to.equal(0);
+      expect(response03.length).to.equal(0);
+      expect(response04.length).to.equal(0);
+      expect(response05.length).to.equal(0);
+      expect(response06.length).to.equal(0);
+    });
+
+    it('Log an error', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      sinon.stub(utils, 'isArray').throws();
+      utilsMock.expects('logError').once();
+      spec.interpretResponse(rawServerResponse, request);
+      utils.isArray.restore();
+    });
+
+    it('Meta Primary category handling', function() {
+      const rawServerResponseCopy = utils.deepClone(rawServerResponse);
+      const rawServerResponseCopy2 = utils.deepClone(rawServerResponse);
+      const rawServerResponseCopy3 = utils.deepClone(rawServerResponse);
+      const rawServerResponseCopy4 = utils.deepClone(rawServerResponse);
+      const rawServerResponseCopy5 = utils.deepClone(rawServerResponse);
+      const rawServerResponseCopy6 = utils.deepClone(rawServerResponse);
+      rawServerResponseCopy.body.seatbid[0].bid[0].cat = 'IAB12-1';
+      rawServerResponseCopy2.body.seatbid[0].bid[0].cat = ['IAB12', 'IAB12-1'];
+      rawServerResponseCopy3.body.seatbid[0].bid[0].cat = '';
+      rawServerResponseCopy4.body.seatbid[0].bid[0].cat = [];
+      rawServerResponseCopy5.body.seatbid[0].bid[0].cat = 123;
+      delete rawServerResponseCopy6.body.seatbid[0].bid[0].cat;
+
+      const bidRequests = [utils.deepClone(bid)];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const response = spec.interpretResponse(rawServerResponseCopy, request);
+      const response2 = spec.interpretResponse(rawServerResponseCopy2, request);
+      const response3 = spec.interpretResponse(rawServerResponseCopy3, request);
+      const response4 = spec.interpretResponse(rawServerResponseCopy4, request);
+      const response5 = spec.interpretResponse(rawServerResponseCopy5, request);
+      const response6 = spec.interpretResponse(rawServerResponseCopy6, request);
+      expect(response[0].meta.primaryCatId).to.equal('IAB12-1');
+      expect(response2[0].meta.primaryCatId).to.equal('IAB12');
+      expect(response3[0].meta.primaryCatId).to.not.exist;
+      expect(response4[0].meta.primaryCatId).to.not.exist;
+      expect(response5[0].meta.primaryCatId).to.not.exist;
+      expect(response6[0].meta.primaryCatId).to.not.exist;
+    });
+
+    it('Build banner response', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const response = spec.interpretResponse(rawServerResponse, request);
+
+      expect(response.length).to.equal(1);
+      expect(response[0].requestId).to.equal(rawServerResponse.body.seatbid[0].bid[0].impid);
+      expect(response[0].cpm).to.equal(rawServerResponse.body.seatbid[0].bid[0].price);
+      expect(response[0].width).to.equal(rawServerResponse.body.seatbid[0].bid[0].w);
+      expect(response[0].height).to.equal(rawServerResponse.body.seatbid[0].bid[0].h);
+      expect(response[0].creativeId).to.equal(rawServerResponse.body.seatbid[0].bid[0].crid);
+      expect(response[0].dealId).to.equal(null);
+      expect(response[0].currency).to.equal(rawServerResponse.body.cur);
+      expect(response[0].netRevenue).to.equal(true);
+      expect(response[0].ttl).to.equal(360);
+      expect(response[0].referrer).to.equal('');
+      expect(response[0].ad).to.equal(rawServerResponse.body.seatbid[0].bid[0].adm);
+      expect(response[0].mediaType).to.equal('banner');
+      expect(response[0].burl).to.equal(rawServerResponse.body.seatbid[0].bid[0].burl);
+      expect(response[0].meta).to.deep.equal({
+        advertiserDomains: rawServerResponse.body.seatbid[0].bid[0].adomain,
+        advertiserName: 'Advertiser',
+        agencyName: 'mediakeys',
+        primaryCatId: 'IAB2',
+        mediaType: 'banner'
+      });
+    });
+
+    it('interprets video bid response', function () {
+      const vastUrl = 'https://url.local?req=content';
+      const bidRequests = [utils.deepClone(bidVideo)];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      const rawServerResponseVideo = utils.deepClone(rawServerResponse);
+      rawServerResponseVideo.body.seatbid[0].bid[0].ext.prebid.type = 'V';
+      rawServerResponseVideo.body.seatbid[0].bid[0].ext.vast_url = vastUrl;
+
+      const response = spec.interpretResponse(rawServerResponseVideo, request);
+
+      expect(response.length).to.equal(1);
+      expect(response[0].mediaType).to.equal('video');
+      expect(response[0].meta.mediaType).to.equal('video');
+      expect(response[0].vastXml).to.not.exist;
+      expect(response[0].vastUrl).to.equal(vastUrl + '&no_cache');
+      expect(response[0].videoCacheKey).to.equal('no_cache');
+    });
+
+    describe('Native response', function () {
+      let bidRequests;
+      let bidderRequestCopy;
+      let request;
+      let rawServerResponseNative;
+      let nativeObject;
+
+      beforeEach(function() {
+        bidRequests = [utils.deepClone(bidNative)];
+        bidderRequestCopy = utils.deepClone(bidderRequest);
+        bidderRequestCopy.bids = bidRequests;
+
+        request = spec.buildRequests(bidRequests, bidderRequestCopy);
+
+        nativeObject = {
+          ver: '1.2',
+          privacy: 'https://privacy.me',
+          assets: [
+            { id: 5, data: { type: 1, value: 'Sponsor Brand' } },
+            { id: 6, data: { type: 2, value: 'Brand Body' } },
+            { id: 14, data: { type: 10, value: 'Brand Body 2' } },
+            { id: 1, title: { text: 'Brand Title' } },
+            { id: 2, img: { type: 3, url: 'https://url.com/img.jpg', w: 300, h: 250 } },
+            { id: 3, img: { type: 1, url: 'https://url.com/ico.png', w: 50, h: 50 } },
+          ],
+          link: {
+            url: 'https://brand.me',
+            clicktrackers: [
+              'https://click.me'
+            ]
+          },
+          eventtrackers: [
+            { event: 1, method: 1, url: 'https://eventrack.me/impression' },
+            { event: 1, method: 2, url: 'https://eventrack-js.me/impression-1' }
+          ]
+        };
+
+        rawServerResponseNative = utils.deepClone(rawServerResponse);
+        rawServerResponseNative.body.seatbid[0].bid[0].ext.prebid.type = 'N';
+        rawServerResponseNative.body.seatbid[0].bid[0].adm = JSON.stringify(nativeObject)
+      });
+
+      it('should ignore invalid native response', function() {
+        const nativeObjectCopy = utils.deepClone(nativeObject);
+        nativeObjectCopy.assets = [];
+        const rawServerResponseNativeCopy = utils.deepClone(rawServerResponseNative);
+        rawServerResponseNativeCopy.body.seatbid[0].bid[0].adm = JSON.stringify(nativeObjectCopy)
+        const response = spec.interpretResponse(rawServerResponseNativeCopy, request);
+        expect(response.length).to.equal(1);
+        expect(response[0].native).to.not.exist;
+      });
+
+      it('should build a classic Prebid.js native object for response', function() {
+        const rawServerResponseNativeCopy = utils.deepClone(rawServerResponseNative);
+        const response = spec.interpretResponse(rawServerResponseNativeCopy, request);
+        expect(response.length).to.equal(1);
+        expect(response[0].mediaType).to.equal('native');
+        expect(response[0].meta.mediaType).to.equal('native');
+        expect(response[0].native).to.exist;
+        expect(response[0].native.body).to.exist;
+        expect(response[0].native.privacyLink).to.exist;
+        expect(response[0].native.body2).to.exist;
+        expect(response[0].native.sponsoredBy).to.exist;
+        expect(response[0].native.image).to.exist;
+        expect(response[0].native.icon).to.exist;
+        expect(response[0].native.title).to.exist;
+        expect(response[0].native.clickUrl).to.exist;
+        expect(response[0].native.clickTrackers).to.exist;
+        expect(response[0].native.clickTrackers.length).to.equal(1);
+        expect(response[0].native.impressionTrackers).to.exist;
+        expect(response[0].native.impressionTrackers.length).to.equal(1);
+        expect(response[0].native.impressionTrackers[0]).to.equal('https://eventrack.me/impression');
+        expect(response[0].native.javascriptTrackers).to.exist;
+        expect(response[0].native.javascriptTrackers).to.equal('<script async src="https://eventrack-js.me/impression-1"></script>');
+      });
+
+      it('should ignore eventtrackers with a unsupported type', function() {
+        const rawServerResponseNativeCopy = utils.deepClone(rawServerResponseNative);
+        const nativeObjectCopy = utils.deepClone(nativeObject);
+        nativeObjectCopy.eventtrackers[0].event = 2;
+        rawServerResponseNativeCopy.body.seatbid[0].bid[0].adm = JSON.stringify(nativeObjectCopy);
+        const response = spec.interpretResponse(rawServerResponseNativeCopy, request);
+        expect(response[0].native.impressionTrackers).to.exist;
+        expect(response[0].native.impressionTrackers.length).to.equal(0);
+      })
+
+      it('Should handle multiple javascriptTrackers in one single string', () => {
+        const rawServerResponseNativeCopy = utils.deepClone(rawServerResponseNative);
+        const nativeObjectCopy = utils.deepClone(nativeObject);
+        nativeObjectCopy.eventtrackers.push(
+          {
+            event: 1,
+            method: 2,
+            url: 'https://eventrack-js.me/impression-2'
+          },)
+        rawServerResponseNativeCopy.body.seatbid[0].bid[0].adm = JSON.stringify(nativeObjectCopy);
+        const response = spec.interpretResponse(rawServerResponseNativeCopy, request);
+        const expected = '<script async src=\"https://eventrack-js.me/impression-1\"></script>\n<script async src=\"https://eventrack-js.me/impression-2\"></script>';
+        expect(response[0].native.javascriptTrackers).to.equal(expected);
+      });
+    });
+  });
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if bid does not contain burl', function() {
+      const result = spec.onBidWon({});
+      expect(result).to.be.undefined;
+      expect(utils.triggerPixel.callCount).to.equal(0);
+    })
+
+    it('Should trigger pixel if bid.burl exists', function() {
+      const result = spec.onBidWon({
+        cpm: 4.2,
+        burl: 'https://example.com/p=${AUCTION_PRICE}&foo=bar'
+      });
+
+      expect(utils.triggerPixel.callCount).to.equal(1)
+      expect(utils.triggerPixel.firstCall.args[0]).to.be.equal(
+        'https://example.com/p=4.2&foo=bar'
+      );
+    })
+  })
+});
diff --git a/test/spec/modules/medianetAnalyticsAdapter_spec.js b/test/spec/modules/medianetAnalyticsAdapter_spec.js
index dcec1050652..c408f23c4f4 100644
--- a/test/spec/modules/medianetAnalyticsAdapter_spec.js
+++ b/test/spec/modules/medianetAnalyticsAdapter_spec.js
@@ -2,25 +2,50 @@ import { expect } from 'chai';
 import medianetAnalytics from 'modules/medianetAnalyticsAdapter.js';
 import * as utils from 'src/utils.js';
 import CONSTANTS from 'src/constants.json';
-import events from 'src/events.js';
+import * as events from 'src/events.js';
+import {clearEvents} from 'src/events.js';
 
 const {
   EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, NO_BID, BID_TIMEOUT, AUCTION_END, SET_TARGETING, BID_WON }
 } = CONSTANTS;
 
+const ERROR_WINNING_BID_ABSENT = 'winning_bid_absent';
+
 const MOCK = {
-  AUCTION_INIT: {'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'timestamp': 1584563605739},
+  Ad_Units: [{'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'bids': [], 'ext': {'prop1': 'value1'}}],
+  MULTI_FORMAT_TWIN_AD_UNITS: [{'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 250]]}, 'native': {'image': {'required': true, 'sizes': [150, 50]}}}, 'bids': [], 'ext': {'prop1': 'value1'}}, {'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'video': {'playerSize': [640, 480], 'context': 'instream'}}, 'bids': [], 'ext': {'prop1': 'value1'}}],
+  TWIN_AD_UNITS: [{'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 100]]}}, 'ask': '300x100', 'bids': [{'bidder': 'bidder1', 'params': {'siteId': '451465'}}]}, {'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 250], [300, 100]]}}, 'bids': [{'bidder': 'medianet', 'params': {'cid': 'TEST_CID', 'crid': '451466393'}}]}, {'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'bids': [{'bidder': 'bidder1', 'params': {'siteId': '451466'}}]}],
+  AUCTION_INIT: {'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'timestamp': 1584563605739, 'timeout': 6000},
+  AUCTION_INIT_WITH_FLOOR: {'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'timestamp': 1584563605739, 'timeout': 6000, 'bidderRequests': [{'bids': [{ 'floorData': {'enforcements': {'enforceJS': true}} }]}]},
   BID_REQUESTED: {'bidderCode': 'medianet', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bids': [{'bidder': 'medianet', 'params': {'cid': 'TEST_CID', 'crid': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'sizes': [[300, 250]], 'bidId': '28248b0e6aece2', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'}], 'auctionStart': 1584563605739, 'timeout': 6000, 'uspConsent': '1YY', 'start': 1584563605743},
-  BID_RESPONSE: {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]},
+  MULTI_FORMAT_BID_REQUESTED: {'bidderCode': 'medianet', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bids': [{'bidder': 'medianet', 'params': {'cid': 'TEST_CID', 'crid': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]]}, 'video': {'playerSize': [640, 480], 'context': 'instream'}, 'native': {'image': {'required': true, 'sizes': [150, 50]}, 'title': {'required': true, 'len': 80}}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'sizes': [[300, 250]], 'bidId': '28248b0e6aece2', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'}], 'auctionStart': 1584563605739, 'timeout': 6000, 'uspConsent': '1YY', 'start': 1584563605743},
+  TWIN_AD_UNITS_BID_REQUESTED: [{'bidderCode': 'bidder1', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bidderRequestId': '16f0746ff657b5', 'bids': [{'bidder': 'bidder1', 'params': {'siteId': '451465'}, 'mediaTypes': {'banner': {'sizes': [[300, 100]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '9615b5d1-7a4f-4c65-9464-4178b91da9e3', 'sizes': [[300, 100]], 'bidId': '2984d18e18bdfe', 'bidderRequestId': '16f0746ff657b5', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client', 'bidRequestsCount': 3, 'bidderRequestsCount': 2, 'bidderWinsCount': 0}, {'bidder': 'bidder1', 'params': {'siteId': '451466'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '8bd7c9f2-0fe6-4ac5-8f2a-7f4a88af1b71', 'sizes': [[300, 250]], 'bidId': '3dced609066035', 'bidderRequestId': '16f0746ff657b5', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client', 'bidRequestsCount': 3, 'bidderRequestsCount': 2, 'bidderWinsCount': 0}], 'auctionStart': 1584563605739, 'timeout': 3000, 'start': 1584563605743}, {'bidderCode': 'medianet', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bidderRequestId': '4b45d1de1fa8fe', 'bids': [{'bidder': 'medianet', 'params': {'cid': 'TEST_CID', 'crid': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250], [300, 100]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '215c038e-3b6a-465b-8937-d32e2ad8de45', 'sizes': [[300, 250], [300, 100]], 'bidId': '58d34adcb09c99', 'bidderRequestId': '4b45d1de1fa8fe', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client', 'bidRequestsCount': 3, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}], 'auctionStart': 1584563605739, 'timeout': 3000, 'start': 1584563605743}],
+  BID_RESPONSE: {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.10, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]},
   AUCTION_END: {'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'auctionEnd': 1584563605739},
   SET_TARGETING: {'div-gpt-ad-1460505748561-0': {'prebid_test': '1', 'hb_format': 'banner', 'hb_source': 'client', 'hb_size': '300x250', 'hb_pb': '2.00', 'hb_adid': '3e6e4bce5c8fb3', 'hb_bidder': 'medianet', 'hb_format_medianet': 'banner', 'hb_source_medianet': 'client', 'hb_size_medianet': '300x250', 'hb_pb_medianet': '2.00', 'hb_adid_medianet': '3e6e4bce5c8fb3', 'hb_bidder_medianet': 'medianet'}},
+  NO_BID_SET_TARGETING: {'div-gpt-ad-1460505748561-0': {}},
   BID_WON: {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'statusMessage': 'Bid available', 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]},
+  BID_WON_2: {'bidderCode': 'appnexus', 'width': 300, 'height': 250, 'statusMessage': 'Bid available', 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aecd5', 'mediaType': 'banner', 'source': 'client', 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'appnexus', 'hb_adid': '3e6e4bce5c8fb4', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'publisherId': 'test123', 'placementId': '451466393'}]},
+  BID_WON_UNKNOWN: {'bidderCode': 'appnexus', 'width': 300, 'height': 250, 'statusMessage': 'Bid available', 'adId': '3e6e4bce5c8fkk', 'requestId': '28248b0e6aecd5', 'mediaType': 'banner', 'source': 'client', 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'appnexus', 'hb_adid': '3e6e4bce5c8fb4', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'publisherId': 'test123', 'placementId': '451466393'}]},
   NO_BID: {'bidder': 'medianet', 'params': {'cid': 'test123', 'crid': '451466393', 'site': {}}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '303fa0c6-682f-4aea-8e4a-dc68f0d5c7d5', 'sizes': [[300, 250], [300, 600]], 'bidId': '28248b0e6aece2', 'bidderRequestId': '13fccf3809fe43', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'},
-  BID_TIMEOUT: [{'bidId': '28248b0e6aece2', 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'params': [{'cid': 'test123', 'crid': '451466393', 'site': {}}, {'cid': '8CUX0H51P', 'crid': '451466393', 'site': {}}], 'timeout': 6}]
+  BID_TIMEOUT: [{'bidId': '28248b0e6aece2', 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'params': [{'cid': 'test123', 'crid': '451466393', 'site': {}}, {'cid': '8CUX0H51P', 'crid': '451466393', 'site': {}}], 'timeout': 6}],
+  BIDS_SAME_REQ_DIFF_CPM: [{'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.10, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}, {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 1.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.10, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 278, 'pbLg': '1.00', 'pbMg': '1.20', 'pbHg': '1.29', 'pbAg': '1.25', 'pbDg': '1.29', 'pbCg': '1.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '1.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}],
+  BIDS_SAME_REQ_EQUAL_CPM: [{'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}, {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 286, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}],
+  BID_RESPONSES: [{'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'params': [{'cid': 'test123', 'crid': '451466393'}]}, {'bidderCode': 'appnexus', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aecd5', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 1.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 278, 'pbLg': '1.00', 'pbMg': '1.20', 'pbHg': '1.29', 'pbAg': '1.25', 'pbDg': '1.29', 'pbCg': '1.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'appnexus', 'hb_adid': '3e6e4bce5c8fb4', 'hb_pb': '1.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'params': [{'publisherId': 'test123', 'placementId': '451466393'}]}],
+  BID_REQUESTS: [{'bidderCode': 'medianet', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bids': [{'bidder': 'medianet', 'params': {'cid': 'TEST_CID', 'crid': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'sizes': [[300, 250]], 'bidId': '28248b0e6aece2', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'}], 'auctionStart': 1584563605739, 'timeout': 6000, 'uspConsent': '1YY', 'start': 1584563605743}, {'bidderCode': 'appnexus', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bids': [{'bidder': 'appnexus', 'params': {'publisherId': 'TEST_CID', 'placementId': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'sizes': [[300, 250]], 'bidId': '28248b0e6aecd5', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'}], 'auctionStart': 1584563605739, 'timeout': 6000, 'uspConsent': '1YY', 'start': 1584563605743}]
+};
+
+function performAuctionWithFloorConfig() {
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT_WITH_FLOOR, {adUnits: MOCK.Ad_Units}));
+  events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+  events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+  events.emit(AUCTION_END, MOCK.AUCTION_END);
+  events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+  events.emit(BID_WON, MOCK.BID_WON);
 }
 
 function performStandardAuctionWithWinner() {
-  events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT, {adUnits: MOCK.Ad_Units}));
   events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
   events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
   events.emit(AUCTION_END, MOCK.AUCTION_END);
@@ -28,26 +53,62 @@ function performStandardAuctionWithWinner() {
   events.emit(BID_WON, MOCK.BID_WON);
 }
 
+function performMultiFormatAuctionWithNoBid() {
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT, {adUnits: MOCK.MULTI_FORMAT_TWIN_AD_UNITS}));
+  events.emit(BID_REQUESTED, MOCK.MULTI_FORMAT_BID_REQUESTED);
+  events.emit(NO_BID, MOCK.NO_BID);
+  events.emit(AUCTION_END, MOCK.AUCTION_END);
+  events.emit(SET_TARGETING, MOCK.NO_BID_SET_TARGETING);
+}
+
+function performTwinAdUnitAuctionWithNoBid() {
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT, {adUnits: MOCK.TWIN_AD_UNITS}));
+  MOCK.TWIN_AD_UNITS_BID_REQUESTED.forEach(bidRequested => events.emit(BID_REQUESTED, bidRequested));
+  MOCK.TWIN_AD_UNITS_BID_REQUESTED.forEach(bidRequested => bidRequested.bids.forEach(noBid => events.emit(NO_BID, noBid)));
+  events.emit(AUCTION_END, MOCK.AUCTION_END);
+  events.emit(SET_TARGETING, MOCK.NO_BID_SET_TARGETING);
+}
+
 function performStandardAuctionWithNoBid() {
-  events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT, {adUnits: MOCK.Ad_Units}));
   events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
   events.emit(NO_BID, MOCK.NO_BID);
   events.emit(AUCTION_END, MOCK.AUCTION_END);
-  events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+  events.emit(SET_TARGETING, MOCK.NO_BID_SET_TARGETING);
 }
 
 function performStandardAuctionWithTimeout() {
-  events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT, {adUnits: MOCK.Ad_Units}));
   events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
   events.emit(BID_TIMEOUT, MOCK.BID_TIMEOUT);
   events.emit(AUCTION_END, MOCK.AUCTION_END);
+  events.emit(SET_TARGETING, MOCK.NO_BID_SET_TARGETING);
+}
+
+function performStandardAuctionMultiBidWithSameRequestId(bidRespArray) {
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT, {adUnits: MOCK.Ad_Units}));
+  events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+  bidRespArray.forEach(bidResp => events.emit(BID_RESPONSE, bidResp));
+  events.emit(AUCTION_END, MOCK.AUCTION_END);
+  events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+  events.emit(BID_WON, MOCK.BID_WON);
+}
+
+function performStandardAuctionMultiBidResponseNoWin() {
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT, {adUnits: MOCK.Ad_Units}));
+  MOCK.BID_REQUESTS.forEach(bidReq => events.emit(BID_REQUESTED, bidReq));
+  MOCK.BID_RESPONSES.forEach(bidResp => events.emit(BID_RESPONSE, bidResp));
+  events.emit(AUCTION_END, MOCK.AUCTION_END);
   events.emit(SET_TARGETING, MOCK.SET_TARGETING);
 }
 
-function getQueryData(url) {
+function getQueryData(url, decode = false) {
   const queryArgs = url.split('?')[1].split('&');
   return queryArgs.reduce((data, arg) => {
-    const [key, val] = arg.split('=');
+    let [key, val] = arg.split('=');
+    if (decode) {
+      val = decodeURIComponent(val);
+    }
     if (data[key] !== undefined) {
       if (!Array.isArray(data[key])) {
         data[key] = [data[key]];
@@ -68,6 +129,11 @@ describe('Media.net Analytics Adapter', function() {
       cid: CUSTOMER_ID
     }
   }
+
+  before(() => {
+    clearEvents();
+  });
+
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
   });
@@ -104,8 +170,10 @@ describe('Media.net Analytics Adapter', function() {
           cid: 'test123'
         }
       });
+      medianetAnalytics.clearlogsQueue();
     });
     afterEach(function () {
+      medianetAnalytics.clearlogsQueue();
       medianetAnalytics.disableAnalytics();
     });
 
@@ -115,6 +183,35 @@ describe('Media.net Analytics Adapter', function() {
       expect(medianetAnalytics.getlogsQueue().length).to.equal(0);
     });
 
+    it('should have all applicable sizes in request', function() {
+      medianetAnalytics.clearlogsQueue();
+      performMultiFormatAuctionWithNoBid();
+      const noBidLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log))[0];
+      medianetAnalytics.clearlogsQueue();
+      expect(noBidLog.mtype).to.have.ordered.members([encodeURIComponent('banner|native|video'), encodeURIComponent('banner|video|native')]);
+      expect(noBidLog.szs).to.have.ordered.members([encodeURIComponent('300x250|1x1|640x480'), encodeURIComponent('300x250|1x1|640x480')]);
+      expect(noBidLog.vplcmtt).to.equal('instream');
+    });
+
+    it('twin ad units should have correct sizes', function() {
+      performTwinAdUnitAuctionWithNoBid();
+      const noBidLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log, true))[0];
+      const banner = 'banner';
+      expect(noBidLog.pvnm).to.have.ordered.members(['-2', 'bidder1', 'bidder1', 'medianet']);
+      expect(noBidLog.mtype).to.have.ordered.members([banner, banner, banner, banner]);
+      expect(noBidLog.status).to.have.ordered.members(['1', '2', '2', '2']);
+      expect(noBidLog.size).to.have.ordered.members(['', '', '', '']);
+      expect(noBidLog.szs).to.have.ordered.members(['300x100|300x250', '300x100', '300x250', '300x250|300x100']);
+    });
+
+    it('AP log should fire only once', function() {
+      performStandardAuctionWithNoBid();
+      events.emit(SET_TARGETING, MOCK.NO_BID_SET_TARGETING);
+      const logs = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log, true));
+      expect(logs.length).to.equal(1);
+      expect(logs[0].lgtp).to.equal('APPR');
+    });
+
     it('should have winner log in standard auction', function() {
       medianetAnalytics.clearlogsQueue();
       performStandardAuctionWithWinner();
@@ -137,12 +234,30 @@ describe('Media.net Analytics Adapter', function() {
         src: 'client',
         size: '300x250',
         mtype: 'banner',
+        gdpr: '0',
         cid: 'test123',
         lper: '1',
         ogbdp: '1.1495',
         flt: '1',
         supcrid: 'div-gpt-ad-1460505748561-0',
-        mpvid: '123'
+        mpvid: '123',
+        bidflr: '1.1'
+      });
+    });
+
+    it('should have correct bid floor data in winner log', function() {
+      medianetAnalytics.clearlogsQueue();
+      performAuctionWithFloorConfig();
+      let winnerLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter((log) => log.winner);
+      medianetAnalytics.clearlogsQueue();
+
+      expect(winnerLog[0]).to.include({
+        winner: '1',
+        curr: 'USD',
+        ogbdp: '1.1495',
+        bidflr: '1.1',
+        flrrule: 'banner',
+        flrdata: encodeURIComponent('ln=||skp=||enfj=true||enfd=||sr=||fs=')
       });
     });
 
@@ -158,7 +273,7 @@ describe('Media.net Analytics Adapter', function() {
       expect(noBidLog.status).to.have.ordered.members(['1', '2']);
       expect(noBidLog.src).to.have.ordered.members(['client', 'client']);
       expect(noBidLog.curr).to.have.ordered.members(['', '']);
-      expect(noBidLog.mtype).to.have.ordered.members(['', '']);
+      expect(noBidLog.mtype).to.have.ordered.members(['banner', 'banner']);
       expect(noBidLog.ogbdp).to.have.ordered.members(['', '']);
       expect(noBidLog.mpvid).to.have.ordered.members(['', '']);
       expect(noBidLog.crid).to.have.ordered.members(['', '451466393']);
@@ -176,10 +291,62 @@ describe('Media.net Analytics Adapter', function() {
       expect(timeoutLog.status).to.have.ordered.members(['1', '3']);
       expect(timeoutLog.src).to.have.ordered.members(['client', 'client']);
       expect(timeoutLog.curr).to.have.ordered.members(['', '']);
-      expect(timeoutLog.mtype).to.have.ordered.members(['', '']);
+      expect(timeoutLog.mtype).to.have.ordered.members(['banner', 'banner']);
       expect(timeoutLog.ogbdp).to.have.ordered.members(['', '']);
       expect(timeoutLog.mpvid).to.have.ordered.members(['', '']);
       expect(timeoutLog.crid).to.have.ordered.members(['', '451466393']);
     });
+
+    it('should pick winning bid if multibids with same request id', function() {
+      performStandardAuctionMultiBidWithSameRequestId(MOCK.BIDS_SAME_REQ_DIFF_CPM);
+      let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      expect(winningBid.adid).equals('3e6e4bce5c8fb3');
+      medianetAnalytics.clearlogsQueue();
+
+      const reversedResponseArray = [].concat(MOCK.BIDS_SAME_REQ_DIFF_CPM).reverse();
+      performStandardAuctionMultiBidWithSameRequestId(reversedResponseArray);
+      winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      expect(winningBid.adid).equals('3e6e4bce5c8fb3');
+    });
+
+    it('should pick winning bid if multibids with same request id and equal cpm', function() {
+      performStandardAuctionMultiBidWithSameRequestId(MOCK.BIDS_SAME_REQ_EQUAL_CPM);
+      let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      expect(winningBid.adid).equals('3e6e4bce5c8fb3');
+      medianetAnalytics.clearlogsQueue();
+
+      const reversedResponseArray = [].concat(MOCK.BIDS_SAME_REQ_EQUAL_CPM).reverse();
+      performStandardAuctionMultiBidWithSameRequestId(reversedResponseArray);
+      winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
+      expect(winningBid.adid).equals('3e6e4bce5c8fb3');
+    });
+
+    it('should pick single winning bid per bid won', function() {
+      performStandardAuctionMultiBidResponseNoWin();
+      const queue = medianetAnalytics.getlogsQueue();
+      queue.length = 0;
+
+      events.emit(BID_WON, MOCK.BID_WON);
+      let winningBids = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log));
+      expect(winningBids[0].adid).equals(MOCK.BID_WON.adId);
+      expect(winningBids.length).equals(1);
+      events.emit(BID_WON, MOCK.BID_WON_2);
+      winningBids = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log));
+      expect(winningBids[1].adid).equals(MOCK.BID_WON_2.adId);
+      expect(winningBids.length).equals(2);
+    });
+
+    it('should ignore unknown winning bid and log error', function() {
+      performStandardAuctionMultiBidResponseNoWin();
+      const queue = medianetAnalytics.getlogsQueue();
+      queue.length = 0;
+
+      events.emit(BID_WON, MOCK.BID_WON_UNKNOWN);
+      let winningBids = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log));
+      let errors = medianetAnalytics.getErrorQueue().map((log) => getQueryData(log));
+      expect(winningBids.length).equals(0);
+      expect(errors.length).equals(1);
+      expect(errors[0].event).equals(ERROR_WINNING_BID_ABSENT);
+    });
   });
 });
diff --git a/test/spec/modules/medianetBidAdapter_spec.js b/test/spec/modules/medianetBidAdapter_spec.js
index fcfdcdf8c2f..9180bbad68c 100644
--- a/test/spec/modules/medianetBidAdapter_spec.js
+++ b/test/spec/modules/medianetBidAdapter_spec.js
@@ -1,7 +1,9 @@
-import {expect} from 'chai';
+import {expect, assert} from 'chai';
 import {spec} from 'modules/medianetBidAdapter.js';
+import { makeSlot } from '../integration/faker/googletag.js';
 import { config } from 'src/config.js';
 
+$$PREBID_GLOBAL$$.version = $$PREBID_GLOBAL$$.version || 'version';
 let VALID_BID_REQUEST = [{
     'bidder': 'medianet',
     'params': {
@@ -37,6 +39,11 @@ let VALID_BID_REQUEST = [{
     },
     'adUnitCode': 'div-gpt-ad-1460505748561-123',
     'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 251]],
+      }
+    },
     'sizes': [[300, 251]],
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
@@ -81,10 +88,65 @@ let VALID_BID_REQUEST = [{
     },
     'adUnitCode': 'div-gpt-ad-1460505748561-123',
     'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 251]],
+      }
+    },
+    'sizes': [[300, 251]],
+    'bidId': '3f97ca71b1e5c2',
+    'bidderRequestId': '1e9b1f07797c1c',
+    'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'bidRequestsCount': 1
+  }],
+  VALID_BID_REQUEST_WITH_ORTB2 = [{
+    'bidder': 'medianet',
+    'params': {
+      'crid': 'crid',
+      'cid': 'customer_id',
+      'site': {
+        'page': 'http://media.net/prebidtest',
+        'domain': 'media.net',
+        'ref': 'http://media.net/prebidtest',
+        'isTop': true
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250]],
+      }
+    },
+    'bidId': '28f8f8130a583e',
+    'bidderRequestId': '1e9b1f07797c1c',
+    'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'ortb2Imp': { 'ext': { 'data': { 'pbadslot': '/12345/my-gpt-tag-0' } } },
+    'bidRequestsCount': 1
+  }, {
+    'bidder': 'medianet',
+    'params': {
+      'crid': 'crid',
+      'cid': 'customer_id',
+      'site': {
+        'page': 'http://media.net/prebidtest',
+        'domain': 'media.net',
+        'ref': 'http://media.net/prebidtest',
+        'isTop': true
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-123',
+    'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 251]],
+      }
+    },
     'sizes': [[300, 251]],
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
     'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'ortb2Imp': { 'ext': { 'data': { 'pbadslot': '/12345/my-gpt-tag-0' } } },
     'bidRequestsCount': 1
   }],
   VALID_BID_REQUEST_WITH_USERID = [{
@@ -127,6 +189,11 @@ let VALID_BID_REQUEST = [{
     },
     'adUnitCode': 'div-gpt-ad-1460505748561-123',
     'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 251]],
+      }
+    },
     'sizes': [[300, 251]],
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
@@ -294,6 +361,9 @@ let VALID_BID_REQUEST = [{
     'refererInfo': {
       referer: 'http://media.net/prebidtest',
       stack: ['http://media.net/prebidtest'],
+      page: 'http://media.net/page',
+      domain: 'media.net',
+      topmostLocation: 'http://media.net/topmost',
       reachedTop: true
     }
   },
@@ -302,6 +372,7 @@ let VALID_BID_REQUEST = [{
       'page': 'http://media.net/prebidtest',
       'domain': 'media.net',
       'ref': 'http://media.net/prebidtest',
+      'topMostLocation': 'http://media.net/topmost',
       'isTop': true
     },
     'ext': {
@@ -318,6 +389,7 @@ let VALID_BID_REQUEST = [{
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
     'imp': [{
       'id': '28f8f8130a583e',
+      'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-0',
         'visibility': 1,
@@ -350,6 +422,7 @@ let VALID_BID_REQUEST = [{
       }
     }, {
       'id': '3f97ca71b1e5c2',
+      'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-123',
         'visibility': 1,
@@ -387,6 +460,7 @@ let VALID_BID_REQUEST = [{
       'page': 'http://media.net/prebidtest',
       'domain': 'media.net',
       'ref': 'http://media.net/prebidtest',
+      'topMostLocation': 'http://media.net/topmost',
       'isTop': true
     },
     'ext': {
@@ -403,6 +477,7 @@ let VALID_BID_REQUEST = [{
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
     'imp': [{
       'id': '28f8f8130a583e',
+      'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-0',
         'visibility': 1,
@@ -435,6 +510,7 @@ let VALID_BID_REQUEST = [{
       }
     }, {
       'id': '3f97ca71b1e5c2',
+      'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-123',
         'visibility': 1,
@@ -473,6 +549,7 @@ let VALID_BID_REQUEST = [{
       'page': 'http://media.net/prebidtest',
       'domain': 'media.net',
       'ref': 'http://media.net/prebidtest',
+      'topMostLocation': 'http://media.net/topmost',
       'isTop': true
     },
     'ext': {
@@ -489,6 +566,7 @@ let VALID_BID_REQUEST = [{
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
     'imp': [{
       'id': '28f8f8130a583e',
+      'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-0',
         'visibility': 1,
@@ -520,6 +598,7 @@ let VALID_BID_REQUEST = [{
       }
     }, {
       'id': '3f97ca71b1e5c2',
+      'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-123',
         'visibility': 1,
@@ -557,6 +636,7 @@ let VALID_BID_REQUEST = [{
       'page': 'http://media.net/prebidtest',
       'domain': 'media.net',
       'ref': 'http://media.net/prebidtest',
+      'topMostLocation': 'http://media.net/topmost',
       'isTop': true
     },
     'ext': {
@@ -576,6 +656,7 @@ let VALID_BID_REQUEST = [{
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
     'imp': [{
       'id': '28f8f8130a583e',
+      'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
       'tagid': 'crid',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-0',
@@ -609,6 +690,7 @@ let VALID_BID_REQUEST = [{
       }
     }, {
       'id': '3f97ca71b1e5c2',
+      'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
       'tagid': 'crid',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-123',
@@ -648,6 +730,7 @@ let VALID_BID_REQUEST = [{
       'page': 'http://media.net/prebidtest',
       'domain': 'media.net',
       'ref': 'http://media.net/prebidtest',
+      'topMostLocation': 'http://media.net/topmost',
       'isTop': true
     },
     'ext': {
@@ -664,6 +747,7 @@ let VALID_BID_REQUEST = [{
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
     'imp': [{
       'id': '28f8f8130a583e',
+      'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
       'tagid': 'crid',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-0',
@@ -697,6 +781,7 @@ let VALID_BID_REQUEST = [{
       }
     }, {
       'id': '3f97ca71b1e5c2',
+      'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
       'tagid': 'crid',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-123',
@@ -731,6 +816,28 @@ let VALID_BID_REQUEST = [{
     }],
     'tmax': config.getConfig('bidderTimeout')
   },
+
+  VALID_VIDEO_BID_REQUEST = [{
+    'bidder': 'medianet',
+    'params': {
+      'cid': 'customer_id',
+      'video': {
+        'skipppable': true
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
+    'mediaTypes': {
+      'video': {
+        'context': 'instream',
+      }
+    },
+    'bidId': '28f8f8130a583e',
+    'bidderRequestId': '1e9b1f07797c1c',
+    'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'bidRequestsCount': 1
+  }],
+
   VALID_PAYLOAD_PAGE_META = (() => {
     let PAGE_META;
     try {
@@ -749,25 +856,50 @@ let VALID_BID_REQUEST = [{
       cid: '8CUV090'
     }
   },
+  VALID_PARAMS_AAX = {
+    bidder: 'aax',
+    params: {
+      cid: 'AAXG123'
+    }
+  },
   PARAMS_MISSING = {
     bidder: 'medianet',
   },
+  PARAMS_MISSING_AAX = {
+    bidder: 'aax',
+  },
   PARAMS_WITHOUT_CID = {
     bidder: 'medianet',
     params: {}
   },
+  PARAMS_WITHOUT_CID_AAX = {
+    bidder: 'aax',
+    params: {}
+  },
   PARAMS_WITH_INTEGER_CID = {
     bidder: 'medianet',
     params: {
       cid: 8867587
     }
   },
+  PARAMS_WITH_INTEGER_CID_AAX = {
+    bidder: 'aax',
+    params: {
+      cid: 8867587
+    }
+  },
   PARAMS_WITH_EMPTY_CID = {
     bidder: 'medianet',
     params: {
       cid: ''
     }
   },
+  PARAMS_WITH_EMPTY_CID_AAX = {
+    bidder: 'aax',
+    params: {
+      cid: ''
+    }
+  },
   SYNC_OPTIONS_BOTH_ENABLED = {
     iframeEnabled: true,
     pixelEnabled: true,
@@ -913,6 +1045,42 @@ let VALID_BID_REQUEST = [{
       }
     }
   },
+  SERVER_VIDEO_OUTSTREAM_RESPONSE_VALID_BID = {
+    body: {
+      'id': 'd90ca32f-3877-424a-b2f2-6a68988df57a',
+      'bidList': [{
+        'no_bid': false,
+        'requestId': '27210feac00e96',
+        'cpm': 12.00,
+        'width': 640,
+        'height': 480,
+        'ttl': 180,
+        'creativeId': '370637746',
+        'netRevenue': true,
+        'vastXml': '',
+        'currency': 'USD',
+        'dfp_id': 'video1',
+        'mediaType': 'video',
+        'vto': 5000,
+        'mavtr': 10,
+        'avp': true,
+        'ap': true,
+        'pl': true,
+        'mt': true,
+        'jslt': 3000,
+        'context': 'outstream'
+      }],
+      'ext': {
+        'csUrl': [{
+          'type': 'image',
+          'url': 'http://cs.media.net/cksync.php'
+        }, {
+          'type': 'iframe',
+          'url': 'http://contextual.media.net/checksync.php?&vsSync=1'
+        }]
+      }
+    }
+  },
   SERVER_VALID_BIDS = [{
     'no_bid': false,
     'requestId': '27210feac00e96',
@@ -980,6 +1148,9 @@ let VALID_BID_REQUEST = [{
     refererInfo: {
       referer: 'http://media.net/prebidtest',
       stack: ['http://media.net/prebidtest'],
+      page: 'http://media.net/page',
+      domain: 'media.net',
+      topmostLocation: 'http://media.net/topmost',
       reachedTop: true
     }
   },
@@ -988,8 +1159,8 @@ let VALID_BID_REQUEST = [{
       'domain': 'media.net',
       'page': 'http://media.net/prebidtest',
       'ref': 'http://media.net/prebidtest',
+      'topMostLocation': 'http://media.net/topmost',
       'isTop': true
-
     },
     'ext': {
       'customer_id': 'customer_id',
@@ -1007,6 +1178,7 @@ let VALID_BID_REQUEST = [{
     'id': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
     'imp': [{
       'id': '28f8f8130a583e',
+      'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-0',
         'visibility': 1,
@@ -1038,6 +1210,7 @@ let VALID_BID_REQUEST = [{
       }
     }, {
       'id': '3f97ca71b1e5c2',
+      'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
       'ext': {
         'dfp_id': 'div-gpt-ad-1460505748561-123',
         'visibility': 1,
@@ -1156,6 +1329,11 @@ describe('Media.net bid adapter', function () {
       expect(JSON.parse(bidReq.data)).to.deep.equal(VALID_PAYLOAD_NATIVE);
     });
 
+    it('should parse params for video request', function () {
+      let bidReq = spec.buildRequests(VALID_VIDEO_BID_REQUEST, VALID_AUCTIONDATA);
+      expect(JSON.stringify(bidReq.data)).to.include('instream');
+    });
+
     it('should have valid crid present in bid request', function() {
       sandbox.stub(config, 'getConfig').callsFake((key) => {
         const config = {
@@ -1167,6 +1345,17 @@ describe('Media.net bid adapter', function () {
       expect(JSON.parse(bidreq.data)).to.deep.equal(VALID_PAYLOAD_WITH_CRID);
     });
 
+    it('should have valid ortb2Imp param present in bid request', function() {
+      let bidreq = spec.buildRequests(VALID_BID_REQUEST_WITH_ORTB2, VALID_AUCTIONDATA);
+      let actual = JSON.parse(bidreq.data).imp[0].ortb2Imp;
+      const expected = VALID_BID_REQUEST_WITH_ORTB2[0].ortb2Imp
+      assert.equal(JSON.stringify(actual), JSON.stringify(expected))
+
+      bidreq = spec.buildRequests(VALID_BID_REQUEST, VALID_AUCTIONDATA);
+      actual = JSON.parse(bidreq.data).imp[0].ortb2Imp;
+      assert.equal(actual, undefined)
+    });
+
     it('should have userid in bid request', function () {
       let bidReq = spec.buildRequests(VALID_BID_REQUEST_WITH_USERID, VALID_AUCTIONDATA);
       expect(JSON.parse(bidReq.data)).to.deep.equal(VALID_PAYLOAD_WITH_USERID);
@@ -1264,6 +1453,30 @@ describe('Media.net bid adapter', function () {
       expect(data.imp[1].ext).to.not.have.ownPropertyDescriptor('viewability');
       expect(data.imp[1].ext.visibility).to.equal(0);
     });
+    it('slot visibility should be calculable even in case of adUnitPath', function () {
+      const code = '/19968336/header-bid-tag-0';
+      const divId = 'div-gpt-ad-1460505748561-0';
+      window.googletag.pubads().setSlots([makeSlot({ code, divId })]);
+
+      let boundingRect = {
+        top: 1010,
+        left: 1010,
+        bottom: 1050,
+        right: 1050
+      };
+      documentStub.withArgs(divId).returns({
+        getBoundingClientRect: () => boundingRect
+      });
+      documentStub.withArgs('div-gpt-ad-1460505748561-123').returns({
+        getBoundingClientRect: () => boundingRect
+      });
+
+      const bidRequest = [{...VALID_BID_REQUEST[0], adUnitCode: code}]
+      const bidReq = spec.buildRequests(bidRequest, VALID_AUCTIONDATA);
+      const data = JSON.parse(bidReq.data);
+      expect(data.imp[0].ext.visibility).to.equal(2);
+      expect(data.imp[0].ext.viewability).to.equal(0);
+    });
   });
 
   describe('getUserSyncs', function () {
@@ -1337,4 +1550,101 @@ describe('Media.net bid adapter', function () {
       expect(response).to.deep.equal(undefined);
     });
   });
+
+  it('context should be outstream', function () {
+    let bids = spec.interpretResponse(SERVER_VIDEO_OUTSTREAM_RESPONSE_VALID_BID, []);
+    expect(bids[0].context).to.equal('outstream');
+  });
+  describe('buildRequests floor tests', function () {
+    let floor;
+    let getFloor = function(req) {
+      return floor[req.mediaType];
+    };
+    beforeEach(function () {
+      floor = {
+        'banner': {
+          'currency': 'USD',
+          'floor': 1
+        }
+      };
+      $$PREBID_GLOBAL$$.medianetGlobals = {};
+
+      let documentStub = sandbox.stub(document, 'getElementById');
+      let boundingRect = {
+        top: 50,
+        left: 50,
+        bottom: 100,
+        right: 100
+      };
+      documentStub.withArgs('div-gpt-ad-1460505748561-123').returns({
+        getBoundingClientRect: () => boundingRect
+      });
+      documentStub.withArgs('div-gpt-ad-1460505748561-0').returns({
+        getBoundingClientRect: () => boundingRect
+      });
+      let windowSizeStub = sandbox.stub(spec, 'getWindowSize');
+      windowSizeStub.returns({
+        w: 1000,
+        h: 1000
+      });
+      VALID_BID_REQUEST[0].getFloor = getFloor;
+    });
+
+    it('should build valid payload with floor', function () {
+      let requestObj = spec.buildRequests(VALID_BID_REQUEST, VALID_AUCTIONDATA);
+      requestObj = JSON.parse(requestObj.data);
+      expect(requestObj.imp[0].hasOwnProperty('bidfloors')).to.equal(true);
+    });
+  });
+
+  describe('isBidRequestValid aax', function () {
+    it('should accept valid bid params', function () {
+      let isValid = spec.isBidRequestValid(VALID_PARAMS_AAX);
+      expect(isValid).to.equal(true);
+    });
+
+    it('should reject bid if cid is not present', function () {
+      let isValid = spec.isBidRequestValid(PARAMS_WITHOUT_CID_AAX);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if cid is not a string', function () {
+      let isValid = spec.isBidRequestValid(PARAMS_WITH_INTEGER_CID_AAX);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if cid is a empty string', function () {
+      let isValid = spec.isBidRequestValid(PARAMS_WITH_EMPTY_CID_AAX);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should have missing params', function () {
+      let isValid = spec.isBidRequestValid(PARAMS_MISSING_AAX);
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('interpretResponse aax', function () {
+    it('should not push response if no-bid', function () {
+      let validBids = [];
+      let bids = spec.interpretResponse(SERVER_RESPONSE_NOBID, []);
+      expect(bids).to.deep.equal(validBids);
+    });
+
+    it('should have empty bid response', function() {
+      let bids = spec.interpretResponse(SERVER_RESPONSE_NOBODY, []);
+      expect(bids).to.deep.equal([]);
+    });
+
+    it('should have valid bids', function () {
+      let bids = spec.interpretResponse(SERVER_RESPONSE_VALID_BID, []);
+      expect(bids).to.deep.equal(SERVER_VALID_BIDS);
+    });
+
+    it('should have empty bid list', function() {
+      let validBids = [];
+      let bids = spec.interpretResponse(SERVER_RESPONSE_EMPTY_BIDLIST, []);
+      expect(bids).to.deep.equal(validBids);
+    });
+  });
 });
diff --git a/test/spec/modules/medianetRtdProvider_spec.js b/test/spec/modules/medianetRtdProvider_spec.js
new file mode 100644
index 00000000000..f9d4ef7c2cf
--- /dev/null
+++ b/test/spec/modules/medianetRtdProvider_spec.js
@@ -0,0 +1,146 @@
+import * as medianetRTD from '../../../modules/medianetRtdProvider.js';
+import * as sinon from 'sinon';
+import { assert } from 'chai';
+
+let sandbox;
+let setDataSpy;
+let getTargetingDataSpy;
+let onPrebidRequestBidSpy;
+
+const conf = {
+  dataProviders: [{
+    'name': 'medianet',
+    'params': {
+      'cid': 'customer_id',
+    }
+  }]
+};
+
+describe('medianet realtime module', function () {
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    window.mnjs = window.mnjs || {};
+    window.mnjs.que = window.mnjs.que || [];
+    window.mnjs.setData = setDataSpy = sandbox.spy();
+    window.mnjs.getTargetingData = getTargetingDataSpy = sandbox.spy();
+    window.mnjs.onPrebidRequestBid = onPrebidRequestBidSpy = sandbox.spy();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    window.mnjs = {};
+  });
+
+  it('init should return false when customer id is passed', function () {
+    assert.equal(medianetRTD.medianetRtdModule.init({}), false);
+  });
+
+  it('init should return true when customer id is passed', function () {
+    assert.equal(medianetRTD.medianetRtdModule.init(conf.dataProviders[0]), true);
+  });
+
+  it('init should pass config to js when loaded', function () {
+    medianetRTD.medianetRtdModule.init(conf.dataProviders[0]);
+
+    const command = window.mnjs.que.pop();
+    assert.isFunction(command);
+    command();
+
+    assert.equal(setDataSpy.called, true);
+    assert.equal(setDataSpy.args[0][0].name, 'initIRefresh');
+  });
+
+  it('auctionInit should pass information to js when loaded', function () {
+    const auctionObject = {adUnits: []};
+    medianetRTD.medianetRtdModule.onAuctionInitEvent(auctionObject);
+
+    const command = window.mnjs.que.pop();
+    assert.isFunction(command);
+    command();
+
+    assert.equal(setDataSpy.called, true);
+    assert.equal(setDataSpy.args[0][0].name, 'auctionInit');
+    assert.deepEqual(setDataSpy.args[0][0].data, {auction: auctionObject});
+  });
+
+  describe('getTargeting should work correctly', function () {
+    it('should return empty if not loaded', function () {
+      window.mnjs.loaded = false;
+      assert.deepEqual(medianetRTD.medianetRtdModule.getTargetingData([], {}, {}, {}), {});
+    });
+
+    it('should return ad unit codes when ad units are present', function () {
+      const adUnitCodes = ['code1', 'code2'];
+      assert.deepEqual(medianetRTD.medianetRtdModule.getTargetingData(adUnitCodes, {}, {}, {}), {
+        code1: {'mnadc': 'code1'},
+        code2: {'mnadc': 'code2'},
+      });
+    });
+
+    it('should call mnjs.getTargetingData if loaded', function () {
+      window.mnjs.loaded = true;
+      medianetRTD.medianetRtdModule.getTargetingData([], {}, {}, {});
+      assert.equal(getTargetingDataSpy.called, true);
+    });
+  });
+
+  describe('getBidRequestData should work correctly', function () {
+    it('callback should be called when we are not interested in request', function () {
+      const requestBidsProps = {
+        adUnits: [{
+          code: 'code1', bids: [],
+        }],
+        adUnitCodes: ['code1'],
+      };
+      const callbackSpy = sandbox.spy();
+      medianetRTD.medianetRtdModule.getBidRequestData(requestBidsProps, callbackSpy, conf.dataProviders[0], {});
+
+      const command = window.mnjs.que.pop();
+      assert.isFunction(command);
+      command();
+
+      assert.equal(onPrebidRequestBidSpy.called, true, 'onPrebidRequest should always be called');
+      assert.equal(callbackSpy.called, true, 'when onPrebidRequest returns nothing callback should be called immediately');
+    });
+
+    it('we should wait for callback till onComplete', function () {
+      const requestBidsProps = {
+        adUnits: [{
+          code: 'code1', bids: [],
+        }],
+        adUnitCodes: ['code1'],
+      };
+
+      const refreshInformation = {
+        mnrf: '1',
+        mnrfc: 2,
+      };
+
+      const callbackSpy = sandbox.spy();
+      const onCompleteSpy = sandbox.spy();
+      window.mnjs.onPrebidRequestBid = onPrebidRequestBidSpy = () => {
+        onPrebidRequestBidSpy.called = true;
+        return {onComplete: onCompleteSpy};
+      };
+      medianetRTD.medianetRtdModule.getBidRequestData(requestBidsProps, callbackSpy, conf.dataProviders[0], {});
+
+      const command = window.mnjs.que.pop();
+      assert.isFunction(command);
+      command();
+
+      assert.equal(callbackSpy.called, false, 'callback should not be called, as we are returning a request from onPrebidRequestBid');
+      assert.equal(onPrebidRequestBidSpy.called, true, 'onPrebidRequestBid should be called once');
+      assert.equal(onCompleteSpy.called, true, 'onComplete should be passed callback');
+      assert.isFunction(onCompleteSpy.args[0][0], 'onCompleteSpy first argument error callback should be a function');
+      assert.isFunction(onCompleteSpy.args[0][1], 'onCompleteSpy second argument success callback should be a function');
+      onCompleteSpy.args[0][0]();
+      assert.equal(callbackSpy.callCount, 1, 'callback should be called when error callback is triggered');
+      onCompleteSpy.args[0][1]({}, {
+        'code1': {ext: {refresh: refreshInformation}}
+      });
+      assert.equal(callbackSpy.callCount, 2, 'callback should be called when success callback is triggered');
+      assert.isObject(requestBidsProps.adUnits[0].ortb2Imp, 'ORTB object should be set');
+      assert.deepEqual(requestBidsProps.adUnits[0].ortb2Imp.ext.refresh, refreshInformation, 'ORTB should have refresh information should be set');
+    });
+  });
+});
diff --git a/test/spec/modules/mediasniperBidAdapter_spec.js b/test/spec/modules/mediasniperBidAdapter_spec.js
new file mode 100644
index 00000000000..21ce5297c8f
--- /dev/null
+++ b/test/spec/modules/mediasniperBidAdapter_spec.js
@@ -0,0 +1,506 @@
+import { expect } from 'chai';
+import { spec } from 'modules/mediasniperBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as utils from 'src/utils.js';
+import { BANNER } from '../../../src/mediaTypes.js';
+
+const DEFAULT_CURRENCY = 'RUB';
+const DEFAULT_BID_TTL = 360;
+
+describe('mediasniperBidAdapter', function () {
+  const adapter = newBidder(spec);
+  let utilsMock;
+  let sandbox;
+
+  const bid = {
+    bidder: 'mediasniper',
+    params: { siteid: 'testSiteID', placementId: '12345' },
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 600],
+        ],
+      },
+    },
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    transactionId: '47789656-9e5c-4250-b7e0-2ce4cbe71a55',
+    sizes: [
+      [300, 250],
+      [300, 600],
+    ],
+    bidId: '299320f4de980d',
+    bidderRequestId: '1c1b642f803242',
+    auctionId: '84212956-c377-40e8-b000-9885a06dc692',
+    src: 'client',
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+  };
+
+  const bidderRequest = {
+    bidderCode: 'mediasniper',
+    auctionId: '84212956-c377-40e8-b000-9885a06dc692',
+    bidderRequestId: '1c1b642f803242',
+    bids: [bid],
+    auctionStart: 1620973766319,
+    timeout: 1000,
+    refererInfo: {
+      referer:
+        'https://local.url/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+      reachedTop: true,
+      isAmp: false,
+      numIframes: 0,
+      stack: [
+        'https://local.url/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+      ],
+      canonicalUrl: null,
+    },
+    start: 1620973766325,
+  };
+
+  beforeEach(function () {
+    utilsMock = sinon.mock(utils);
+    sandbox = sinon.createSandbox();
+  });
+
+  afterEach(function () {
+    utilsMock.restore();
+    sandbox.restore();
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should returns true when bid is provided with params', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should returns false when bid is provided with empty params', function () {
+      const noParamsBid = {
+        bidder: 'mediasniper',
+        params: {},
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [300, 250],
+              [300, 600],
+            ],
+          },
+        },
+        adUnitCode: 'div-gpt-ad-1460505748561-0',
+        transactionId: '47789656-9e5c-4250-b7e0-2ce4cbe71a55',
+        sizes: [
+          [300, 250],
+          [300, 600],
+        ],
+        bidId: '299320f4de980d',
+      };
+
+      expect(spec.isBidRequestValid(noParamsBid)).to.equal(false);
+    });
+
+    it('should returns false when bid is falsy or empty', function () {
+      const emptyBid = {};
+      expect(spec.isBidRequestValid()).to.equal(false);
+      expect(spec.isBidRequestValid(false)).to.equal(false);
+      expect(spec.isBidRequestValid(emptyBid)).to.equal(false);
+    });
+
+    it('should return false when no sizes', function () {
+      const bannerNoSizeBid = {
+        bidder: 'mediasniper',
+        params: { placementId: '123' },
+        mediaTypes: {
+          banner: {},
+        },
+      };
+
+      expect(spec.isBidRequestValid(bannerNoSizeBid)).to.equal(false);
+    });
+
+    it('should return false when empty sizes', function () {
+      const bannerEmptySizeBid = {
+        bidder: 'mediasniper',
+        params: { placementId: '123' },
+        mediaTypes: {
+          banner: { sizes: [] },
+        },
+      };
+
+      expect(spec.isBidRequestValid(bannerEmptySizeBid)).to.equal(false);
+    });
+
+    it('should return false when mediaType is not supported', function () {
+      const bannerVideoBid = {
+        bidder: 'mediasniper',
+        params: { placementId: '123' },
+        mediaTypes: {
+          video: {},
+        },
+      };
+
+      expect(spec.isBidRequestValid(bannerVideoBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('should create imp for supported mediaType only', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const bidderRequestCopy = utils.deepClone(bidderRequest);
+
+      bidderRequestCopy.bids = bidRequests[0];
+
+      const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+      const data = JSON.parse(request.data);
+
+      expect(data.imp.length).to.equal(1);
+      expect(data.imp[0].banner).to.exist;
+    });
+
+    it('should fill pmp only if dealid exists', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const bidderRequestCopy = utils.deepClone(bidderRequest);
+
+      bidRequests[0].params.dealid = '123';
+
+      const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+      const data = JSON.parse(request.data);
+
+      expect(data.imp.length).to.equal(1);
+      expect(data.imp[0].pmp).to.exist;
+      expect(data.imp[0].pmp.deals).to.exist;
+      expect(data.imp[0].pmp.deals.length).to.equal(1);
+      expect(data.imp[0].pmp.deals[0].id).to.equal(
+        bidRequests[0].params.dealid
+      );
+    });
+
+    it('should fill site only if referer exists', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const bidderRequestCopy = utils.deepClone(bidderRequest);
+
+      bidderRequestCopy.refererInfo = {};
+
+      const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+      const data = JSON.parse(request.data);
+
+      expect(data.site.domain).to.not.exist;
+      expect(data.site.page).to.not.exist;
+      expect(data.site.ref).to.not.exist;
+    });
+
+    it('should fill site only if referer exists', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const bidderRequestCopy = utils.deepClone(bidderRequest);
+
+      bidderRequestCopy.refererInfo = null;
+
+      const request = spec.buildRequests(bidRequests, bidderRequestCopy);
+      const data = JSON.parse(request.data);
+
+      expect(data.site.domain).to.not.exist;
+      expect(data.site.page).to.not.exist;
+      expect(data.site.ref).to.not.exist;
+    });
+
+    it('should get expected properties with default values (no params set)', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const data = JSON.parse(request.data);
+
+      // openRTB 2.5
+      expect(data.cur[0]).to.equal(DEFAULT_CURRENCY);
+      expect(data.id).to.equal(bidderRequest.auctionId);
+
+      expect(data.imp.length).to.equal(1);
+      expect(data.imp[0].id).to.equal(bidRequests[0].bidId);
+      expect(data.imp[0].banner.w).to.equal(300);
+      expect(data.imp[0].banner.h).to.equal(250);
+      expect(data.imp[0].banner.format[0].w).to.equal(300);
+      expect(data.imp[0].banner.format[0].h).to.equal(250);
+      expect(data.imp[0].banner.format[1].w).to.equal(300);
+      expect(data.imp[0].banner.format[1].h).to.equal(600);
+      expect(data.imp[0].banner.topframe).to.equal(0);
+      expect(data.imp[0].banner.pos).to.equal(0);
+    });
+
+    it('should get expected properties with values from params', function () {
+      const bidRequests = [utils.deepClone(bid)];
+      bidRequests[0].params = {
+        pos: 2,
+      };
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].banner.pos).to.equal(2);
+    });
+
+    describe('PriceFloors module support', function () {
+      it('should not set `imp[]bidfloor` property when priceFloors module is not available', function () {
+        const bidRequests = [bid];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.imp[0].banner).to.exist;
+        expect(data.imp[0].bidfloor).to.not.exist;
+      });
+
+      it('should not set `imp[]bidfloor` property when priceFloors module returns false', function () {
+        const bidWithPriceFloors = utils.deepClone(bid);
+
+        bidWithPriceFloors.getFloor = () => {
+          return false;
+        };
+
+        const bidRequests = [bidWithPriceFloors];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+
+        expect(data.imp[0].banner).to.exist;
+        expect(data.imp[0].bidfloor).to.not.exist;
+      });
+
+      it('should get the highest floorPrice found when bid have several mediaTypes', function () {
+        const getFloorTest = (options) => {
+          switch (options.mediaType) {
+            case BANNER:
+              return { floor: 1, currency: DEFAULT_CURRENCY };
+            default:
+              return false;
+          }
+        };
+
+        const bidWithPriceFloors = utils.deepClone(bid);
+
+        bidWithPriceFloors.mediaTypes.video = {
+          playerSize: [600, 480],
+        };
+
+        bidWithPriceFloors.getFloor = getFloorTest;
+
+        const bidRequests = [bidWithPriceFloors];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+
+        expect(data.imp[0].banner).to.exist;
+        expect(data.imp[0].bidfloor).to.equal(1);
+      });
+    });
+  });
+
+  describe('intrepretResponse', function () {
+    const rawServerResponse = {
+      body: {
+        id: '60839f99-d5f2-3ab3-b6ac-736b4fe9d0ae',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '60839f99-d5f2-3ab3-b6ac-736b4fe9d0ae_0_0',
+                impid: '1',
+                price: 58.01,
+                adid: 'string-id',
+                cid: 'string-id',
+                crid: 'string-id',
+                nurl: 'https://local.url/notif?index=ab-cd-ef&price=${AUCTION_PRICE}',
+                w: 300,
+                h: 250,
+                adomain: ['domain.io'],
+                adm: '<iframe src="https://local.url"></iframe>',
+              },
+            ],
+            seat: '',
+          },
+        ],
+        cur: DEFAULT_CURRENCY,
+        ext: { protocol: '5.3' },
+      },
+    };
+
+    it('Returns empty array if no bid', function () {
+      const request = '';
+      const response01 = spec.interpretResponse(
+        { body: { seatbid: [{ bid: [] }] } },
+        request
+      );
+      const response02 = spec.interpretResponse(
+        { body: { seatbid: [] } },
+        request
+      );
+      const response03 = spec.interpretResponse(
+        { body: { seatbid: null } },
+        request
+      );
+      const response04 = spec.interpretResponse(
+        { body: { seatbid: null } },
+        request
+      );
+      const response05 = spec.interpretResponse({ body: {} }, request);
+      const response06 = spec.interpretResponse({}, request);
+
+      expect(response01.length).to.equal(0);
+      expect(response02.length).to.equal(0);
+      expect(response03.length).to.equal(0);
+      expect(response04.length).to.equal(0);
+      expect(response05.length).to.equal(0);
+      expect(response06.length).to.equal(0);
+    });
+
+    it('Log an error', function () {
+      const request = '';
+      sinon.stub(utils, 'isArray').throws();
+      utilsMock.expects('logError').once();
+      spec.interpretResponse(rawServerResponse, request);
+      utils.isArray.restore();
+    });
+
+    describe('Build banner response', function () {
+      it('Retrurn successful response', function () {
+        const request = '';
+        const response = spec.interpretResponse(rawServerResponse, request);
+
+        expect(response.length).to.equal(1);
+        expect(response[0].requestId).to.equal(
+          rawServerResponse.body.seatbid[0].bid[0].impid
+        );
+        expect(response[0].cpm).to.equal(
+          rawServerResponse.body.seatbid[0].bid[0].price
+        );
+        expect(response[0].width).to.equal(
+          rawServerResponse.body.seatbid[0].bid[0].w
+        );
+        expect(response[0].height).to.equal(
+          rawServerResponse.body.seatbid[0].bid[0].h
+        );
+        expect(response[0].creativeId).to.equal(
+          rawServerResponse.body.seatbid[0].bid[0].crid
+        );
+        expect(response[0].dealId).to.equal(null);
+        expect(response[0].currency).to.equal(rawServerResponse.body.cur);
+        expect(response[0].netRevenue).to.equal(true);
+        expect(response[0].ttl).to.equal(DEFAULT_BID_TTL);
+        expect(response[0].ad).to.equal(
+          rawServerResponse.body.seatbid[0].bid[0].adm
+        );
+        expect(response[0].mediaType).to.equal(BANNER);
+        expect(response[0].burl).to.equal(
+          rawServerResponse.body.seatbid[0].bid[0].nurl
+        );
+        expect(response[0].meta).to.deep.equal({
+          advertiserDomains: rawServerResponse.body.seatbid[0].bid[0].adomain,
+          mediaType: BANNER,
+        });
+      });
+
+      it('shoud use adid if no crid', function () {
+        const raw = {
+          body: {
+            seatbid: [
+              {
+                bid: [
+                  {
+                    adid: 'string-id',
+                  },
+                ],
+              },
+            ],
+          },
+        };
+        const response = spec.interpretResponse(raw, '');
+
+        expect(response[0].creativeId).to.equal(
+          raw.body.seatbid[0].bid[0].adid
+        );
+      });
+
+      it('shoud use id if no crid or adid', function () {
+        const raw = {
+          body: {
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: '60839f99-d5f2-3ab3-b6ac-736b4fe9d0ae_0_0',
+                  },
+                ],
+              },
+            ],
+          },
+        };
+        const response = spec.interpretResponse(raw, '');
+
+        expect(response[0].creativeId).to.equal(raw.body.seatbid[0].bid[0].id);
+      });
+
+      it('shoud use 0 if no cpm', function () {
+        const raw = {
+          body: {
+            seatbid: [
+              {
+                bid: [{}],
+              },
+            ],
+          },
+        };
+        const response = spec.interpretResponse(raw, '');
+
+        expect(response[0].cpm).to.equal(0);
+      });
+
+      it('shoud use dealid if exists', function () {
+        const raw = {
+          body: {
+            seatbid: [
+              {
+                bid: [{ dealid: '123' }],
+              },
+            ],
+          },
+        };
+        const response = spec.interpretResponse(raw, '');
+
+        expect(response[0].dealId).to.equal(raw.body.seatbid[0].bid[0].dealid);
+      });
+
+      it('shoud use DEFAUL_CURRENCY if no cur', function () {
+        const raw = {
+          body: {
+            seatbid: [
+              {
+                bid: [{}],
+              },
+            ],
+          },
+        };
+        const response = spec.interpretResponse(raw, '');
+
+        expect(response[0].currency).to.equal(DEFAULT_CURRENCY);
+      });
+    });
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if bid does not contain burl', function () {
+      const result = spec.onBidWon({});
+      expect(result).to.be.undefined;
+      expect(utils.triggerPixel.callCount).to.equal(0);
+    });
+
+    it('Should trigger pixel if bid.burl exists', function () {
+      const result = spec.onBidWon({
+        cpm: 4.2,
+        burl: 'https://example.com/p=${AUCTION_PRICE}&foo=bar',
+      });
+
+      expect(utils.triggerPixel.callCount).to.equal(1);
+      expect(utils.triggerPixel.firstCall.args[0]).to.be.equal(
+        'https://example.com/p=4.2&foo=bar'
+      );
+    });
+  });
+});
diff --git a/test/spec/modules/mediasquareBidAdapter_spec.js b/test/spec/modules/mediasquareBidAdapter_spec.js
index 351fbb40228..346d02d91d0 100644
--- a/test/spec/modules/mediasquareBidAdapter_spec.js
+++ b/test/spec/modules/mediasquareBidAdapter_spec.js
@@ -24,7 +24,63 @@ describe('MediaSquare bid adapter tests', function () {
       code: 'publishername_atf_desktop_rg_pave'
     },
   }];
-
+  var VIDEO_PARAMS = [{
+    adUnitCode: 'banner-div',
+    bidId: 'aaaa1234',
+    auctionId: 'bbbb1234',
+    transactionId: 'cccc1234',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+      }
+    },
+    bidder: 'mediasquare',
+    params: {
+      owner: 'test',
+      code: 'publishername_atf_desktop_rg_pave'
+    },
+  }];
+  var NATIVE_PARAMS = [{
+    adUnitCode: 'banner-div',
+    bidId: 'aaaa1234',
+    auctionId: 'bbbb1234',
+    transactionId: 'cccc1234',
+    mediaTypes: {
+      native: {
+        title: {
+          required: true,
+          len: 80
+        },
+      }
+    },
+    bidder: 'mediasquare',
+    params: {
+      owner: 'test',
+      code: 'publishername_atf_desktop_rg_pave'
+    },
+  }];
+  var FLOORS_PARAMS = [{
+    adUnitCode: 'banner-div',
+    bidId: 'aaaa1234',
+    auctionId: 'bbbb1234',
+    transactionId: 'cccc1234',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250]
+        ]
+      }
+    },
+    bidder: 'mediasquare',
+    params: {
+      owner: 'test',
+      code: 'publishername_atf_desktop_rg_pave'
+    },
+    sizes: [[300, 250]],
+    getFloor: function (a) { return { currency: 'USD', floor: 1.0 }; },
+  }];
   var BID_RESPONSE = {'body': {
     'responses': [{
       'transaction_id': 'cccc1234',
@@ -33,12 +89,15 @@ describe('MediaSquare bid adapter tests', function () {
       'height': 250,
       'creative_id': '158534630',
       'currency': 'USD',
+      'originalCpm': 25.0123,
+      'originalCurrency': 'USD',
       'net_revenue': true,
       'ttl': 300,
       'ad': '< --- creative code --- >',
       'bidder': 'msqClassic',
       'code': 'test/publishername_atf_desktop_rg_pave',
       'bid_id': 'aaaa1234',
+      'adomain': ['test.com'],
     }],
   }};
 
@@ -53,7 +112,7 @@ describe('MediaSquare bid adapter tests', function () {
       canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
     },
     uspConsent: '111222333',
-    userId: {'id5id': '1111'},
+    userId: { 'id5id': { uid: '1111' } },
     schain: {
       'ver': '1.0',
       'complete': 1,
@@ -79,6 +138,12 @@ describe('MediaSquare bid adapter tests', function () {
     expect(requestContent.codes[0]).to.have.property('auctionId').and.to.equal('bbbb1234');
     expect(requestContent.codes[0]).to.have.property('transactionId').and.to.equal('cccc1234');
     expect(requestContent.codes[0]).to.have.property('mediatypes').exist;
+    expect(requestContent.codes[0]).to.have.property('floor').exist;
+    expect(requestContent.codes[0].floor).to.deep.equal({});
+    const requestfloor = spec.buildRequests(FLOORS_PARAMS, DEFAULT_OPTIONS);
+    const responsefloor = JSON.parse(requestfloor.data);
+    expect(responsefloor.codes[0]).to.have.property('floor').exist;
+    expect(responsefloor.codes[0].floor).to.have.property('300x250').and.to.have.property('floor').and.to.equal(1);
   });
 
   it('Verify parse response', function () {
@@ -98,8 +163,26 @@ describe('MediaSquare bid adapter tests', function () {
     expect(bid.mediasquare).to.exist;
     expect(bid.mediasquare.bidder).to.equal('msqClassic');
     expect(bid.mediasquare.code).to.equal([DEFAULT_PARAMS[0].params.owner, DEFAULT_PARAMS[0].params.code].join('/'));
+    expect(bid.meta).to.exist;
+    expect(bid.meta.advertiserDomains).to.exist;
+    expect(bid.meta.advertiserDomains).to.have.lengthOf(1);
+  });
+  it('Verifies match', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS, DEFAULT_OPTIONS);
+    BID_RESPONSE.body.responses[0].match = true;
+    const response = spec.interpretResponse(BID_RESPONSE, request);
+    const bid = response[0];
+    expect(bid.mediasquare.match).to.exist;
+    expect(bid.mediasquare.match).to.equal(true);
+  });
+  it('Verifies hasConsent', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS, DEFAULT_OPTIONS);
+    BID_RESPONSE.body.responses[0].hasConsent = true;
+    const response = spec.interpretResponse(BID_RESPONSE, request);
+    const bid = response[0];
+    expect(bid.mediasquare.hasConsent).to.exist;
+    expect(bid.mediasquare.hasConsent).to.equal(true);
   });
-
   it('Verifies bidder code', function () {
     expect(spec.code).to.equal('mediasquare');
   });
@@ -113,13 +196,15 @@ describe('MediaSquare bid adapter tests', function () {
   });
   it('Verifies bid won', function () {
     const request = spec.buildRequests(DEFAULT_PARAMS, DEFAULT_OPTIONS);
+    BID_RESPONSE.body.responses[0].match = true
+    BID_RESPONSE.body.responses[0].hasConsent = true;
     const response = spec.interpretResponse(BID_RESPONSE, request);
     const won = spec.onBidWon(response[0]);
     expect(won).to.equal(true);
   });
   it('Verifies user sync without cookie in bid response', function () {
     var syncs = spec.getUserSyncs({}, [BID_RESPONSE], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
-    expect(syncs).to.have.property('type').and.to.equal('iframe');
+    expect(syncs).to.have.lengthOf(0);
   });
   it('Verifies user sync with cookies in bid response', function () {
     BID_RESPONSE.body.cookies = [{'type': 'image', 'url': 'http://www.cookie.sync.org/'}];
@@ -128,4 +213,34 @@ describe('MediaSquare bid adapter tests', function () {
     expect(syncs[0]).to.have.property('type').and.to.equal('image');
     expect(syncs[0]).to.have.property('url').and.to.equal('http://www.cookie.sync.org/');
   });
+  it('Verifies user sync with no bid response', function() {
+    var syncs = spec.getUserSyncs({}, null, DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+  });
+  it('Verifies user sync with no bid body response', function() {
+    var syncs = spec.getUserSyncs({}, [], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+    var syncs = spec.getUserSyncs({}, [{}], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+  });
+  it('Verifies native in bid response', function () {
+    const request = spec.buildRequests(NATIVE_PARAMS, DEFAULT_OPTIONS);
+    BID_RESPONSE.body.responses[0].native = {'title': 'native title'};
+    const response = spec.interpretResponse(BID_RESPONSE, request);
+    expect(response).to.have.lengthOf(1);
+    const bid = response[0];
+    expect(bid).to.have.property('native');
+    delete BID_RESPONSE.body.responses[0].native;
+  });
+  it('Verifies video in bid response', function () {
+    const request = spec.buildRequests(VIDEO_PARAMS, DEFAULT_OPTIONS);
+    BID_RESPONSE.body.responses[0].video = {'xml': 'my vast XML', 'url': 'my vast url'};
+    const response = spec.interpretResponse(BID_RESPONSE, request);
+    expect(response).to.have.lengthOf(1);
+    const bid = response[0];
+    expect(bid).to.have.property('vastXml');
+    expect(bid).to.have.property('vastUrl');
+    expect(bid).to.have.property('renderer');
+    delete BID_RESPONSE.body.responses[0].video;
+  });
 });
diff --git a/test/spec/modules/merkleIdSystem_spec.js b/test/spec/modules/merkleIdSystem_spec.js
new file mode 100644
index 00000000000..82c17336d20
--- /dev/null
+++ b/test/spec/modules/merkleIdSystem_spec.js
@@ -0,0 +1,251 @@
+import * as ajaxLib from 'src/ajax.js';
+import * as utils from 'src/utils.js';
+import {merkleIdSubmodule} from 'modules/merkleIdSystem.js';
+
+import sinon from 'sinon';
+
+let expect = require('chai').expect;
+
+const CONFIG_PARAMS = {
+  endpoint: undefined,
+  ssp_ids: ['ssp-1'],
+  sv_pubid: '11314',
+  sv_domain: 'www.testDomain.com',
+  sv_session: 'testsession'
+};
+
+const STORAGE_PARAMS = {
+  type: 'cookie',
+  name: 'merkle',
+  expires: 10,
+  refreshInSeconds: 10
+};
+
+const MOCK_RESPONSE = {
+  c: {
+    name: '_svsid',
+    value: '123876327647627364236478'
+  }
+};
+
+function mockResponse(
+  responseText,
+  response = (url, successCallback) => successCallback(responseText)) {
+  return function() {
+    return response;
+  }
+}
+
+describe('Merkle System', function () {
+  describe('merkleIdSystem.decode()', function() {
+    it('provides multiple Merkle IDs (EID) from a stored object', function() {
+      let storage = {
+        merkleId: [{
+          id: 'some-random-id-value', ext: { enc: 1, keyID: 16, idName: 'pamId', ssp: 'ssp1' }
+        }, {
+          id: 'another-random-id-value',
+          ext: {
+            enc: 1,
+            idName: 'pamId',
+            third: 4,
+            ssp: 'ssp2'
+          }
+        }],
+        _svsid: 'some-identifier'
+      };
+
+      expect(merkleIdSubmodule.decode(storage)).to.deep.equal({
+        merkleId: storage.merkleId
+      });
+    });
+
+    it('can decode legacy stored object', function() {
+      let merkleId = {'pam_id': {'id': 'testmerkleId', 'keyID': 1}};
+
+      expect(merkleIdSubmodule.decode(merkleId)).to.deep.equal({
+        merkleId: {'id': 'testmerkleId', 'keyID': 1}
+      });
+    })
+
+    it('returns undefined', function() {
+      let merkleId = {};
+      expect(merkleIdSubmodule.decode(merkleId)).to.be.undefined;
+    })
+  });
+
+  describe('Merkle System getId()', function () {
+    const callbackSpy = sinon.spy();
+    let sandbox;
+    let ajaxStub;
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+      sinon.stub(utils, 'logInfo');
+      sinon.stub(utils, 'logWarn');
+      sinon.stub(utils, 'logError');
+      callbackSpy.resetHistory();
+      ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockResponse(JSON.stringify(MOCK_RESPONSE)));
+    });
+
+    afterEach(function () {
+      utils.logInfo.restore();
+      utils.logWarn.restore();
+      utils.logError.restore();
+      ajaxStub.restore();
+    });
+
+    it('getId() should fail on missing sv_pubid', function () {
+      let config = {
+        params: {
+          ...CONFIG_PARAMS,
+          sv_pubid: undefined
+        },
+        storage: STORAGE_PARAMS
+      };
+
+      let submoduleCallback = merkleIdSubmodule.getId(config, undefined);
+      expect(submoduleCallback).to.be.undefined;
+      expect(utils.logError.args[0][0]).to.exist.and.to.equal('User ID - merkleId submodule requires a valid sv_pubid string to be defined');
+    });
+
+    it('getId() should fail on missing ssp_ids', function () {
+      let config = {
+        params: {
+          ...CONFIG_PARAMS,
+          ssp_ids: undefined
+        },
+        storage: STORAGE_PARAMS
+      };
+
+      let submoduleCallback = merkleIdSubmodule.getId(config, undefined);
+      expect(submoduleCallback).to.be.undefined;
+      expect(utils.logError.args[0][0]).to.exist.and.to.equal('User ID - merkleId submodule requires a valid ssp_ids array to be defined');
+    });
+
+    it('getId() should warn on missing endpoint', function () {
+      let config = {
+        params: {
+          ...CONFIG_PARAMS,
+          endpoint: undefined
+        },
+        storage: STORAGE_PARAMS
+      };
+
+      let submoduleCallback = merkleIdSubmodule.getId(config, undefined).callback;
+      submoduleCallback(callbackSpy);
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(utils.logWarn.args[0][0]).to.exist.and.to.equal('User ID - merkleId submodule endpoint string is not defined');
+    });
+
+    it('getId() should handle callback with valid configuration', function () {
+      let config = {
+        params: CONFIG_PARAMS,
+        storage: STORAGE_PARAMS
+      };
+
+      let submoduleCallback = merkleIdSubmodule.getId(config, undefined).callback;
+      submoduleCallback(callbackSpy);
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('getId() does not handle consent strings', function () {
+      let config = {
+        params: {
+          ...CONFIG_PARAMS,
+          ssp_ids: []
+        },
+        storage: STORAGE_PARAMS
+      };
+
+      let submoduleCallback = merkleIdSubmodule.getId(config, { gdprApplies: true });
+      expect(submoduleCallback).to.be.undefined;
+      expect(utils.logError.args[0][0]).to.exist.and.to.equal('User ID - merkleId submodule does not currently handle consent strings');
+    });
+  });
+
+  describe('Merkle System extendId()', function () {
+    const callbackSpy = sinon.spy();
+    let sandbox;
+    let ajaxStub;
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+      sinon.stub(utils, 'logInfo');
+      sinon.stub(utils, 'logWarn');
+      sinon.stub(utils, 'logError');
+      callbackSpy.resetHistory();
+      ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockResponse(JSON.stringify(MOCK_RESPONSE)));
+    });
+
+    afterEach(function () {
+      utils.logInfo.restore();
+      utils.logWarn.restore();
+      utils.logError.restore();
+      ajaxStub.restore();
+    });
+
+    it('extendId() get storedid', function () {
+      let config = {
+        params: {
+          ...CONFIG_PARAMS,
+        },
+        storage: STORAGE_PARAMS
+      };
+
+      let id = merkleIdSubmodule.extendId(config, undefined, 'Merkle_Stored_ID');
+      expect(id.id).to.exist.and.to.equal('Merkle_Stored_ID');
+    });
+
+    it('extendId() get storedId on configured storageParam.refreshInSeconds', function () {
+      let config = {
+        params: {
+          ...CONFIG_PARAMS,
+          refreshInSeconds: 1000
+        },
+        storage: STORAGE_PARAMS
+      };
+
+      let yesterday = new Date(Date.now() - 86400000).toUTCString();
+      let storedId = {value: 'Merkle_Stored_ID', date: yesterday};
+
+      let id = merkleIdSubmodule.extendId(config, undefined,
+        storedId);
+
+      expect(id.id).to.exist.and.to.equal(storedId);
+    });
+    it('extendId() should warn on missing endpoint', function () {
+      let config = {
+        params: {
+          ...CONFIG_PARAMS,
+          endpoint: undefined
+        },
+        storage: STORAGE_PARAMS
+      };
+
+      let yesterday = new Date(Date.now() - 86400000).toUTCString();
+      let storedId = {value: 'Merkle_Stored_ID', date: yesterday};
+
+      let submoduleCallback = merkleIdSubmodule.extendId(config, undefined,
+        storedId).callback;
+      submoduleCallback(callbackSpy);
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(utils.logWarn.args[0][0]).to.exist.and.to.equal('User ID - merkleId submodule endpoint string is not defined');
+    });
+
+    it('extendId() callback on configured storageParam.refreshInSeconds', function () {
+      let config = {
+        params: {
+          ...CONFIG_PARAMS,
+          refreshInSeconds: 1
+        }
+      };
+
+      let yesterday = new Date(Date.now() - 86400000).toUTCString();
+      let storedId = {value: 'Merkle_Stored_ID', date: yesterday};
+
+      let submoduleCallback = merkleIdSubmodule.extendId(config, undefined, storedId).callback;
+      submoduleCallback(callbackSpy);
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/mgidBidAdapter_spec.js b/test/spec/modules/mgidBidAdapter_spec.js
index 16f4f0b4607..c79cad6245d 100644
--- a/test/spec/modules/mgidBidAdapter_spec.js
+++ b/test/spec/modules/mgidBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import {assert, expect} from 'chai';
-import {spec} from 'modules/mgidBidAdapter.js';
+import { spec, storage } from 'modules/mgidBidAdapter.js';
+import { version } from 'package.json';
 import * as utils from '../../../src/utils.js';
 
 describe('Mgid bid adapter', function () {
@@ -28,9 +29,12 @@ describe('Mgid bid adapter', function () {
   }
   const secure = window.location.protocol === 'https:' ? 1 : 0;
   const mgid_ver = spec.VERSION;
-  const prebid_ver = $$PREBID_GLOBAL$$.version;
   const utcOffset = (new Date()).getTimezoneOffset().toString();
 
+  it('should expose gvlid', function() {
+    expect(spec.gvlid).to.equal(358)
+  });
+
   describe('isBidRequestValid', function () {
     let bid = {
       'adUnitCode': 'div',
@@ -311,10 +315,6 @@ describe('Mgid bid adapter', function () {
   });
 
   describe('buildRequests', function () {
-    it('should return undefined if no validBidRequests passed', function () {
-      expect(spec.buildRequests([])).to.be.undefined;
-    });
-
     let abid = {
       adUnitCode: 'div',
       bidder: 'mgid',
@@ -323,8 +323,14 @@ describe('Mgid bid adapter', function () {
         placementId: '2',
       },
     };
-    it('should return proper request url', function () {
-      localStorage.setItem('mgMuidn', 'xxx');
+
+    it('should return undefined if no validBidRequests passed', function () {
+      expect(spec.buildRequests([])).to.be.undefined;
+    });
+    it('should return request url with muid', function () {
+      let getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      getDataFromLocalStorageStub.withArgs('mgMuidn').returns('xxx');
+
       let bid = Object.assign({}, abid);
       bid.mediaTypes = {
         banner: {
@@ -334,7 +340,8 @@ describe('Mgid bid adapter', function () {
       let bidRequests = [bid];
       const request = spec.buildRequests(bidRequests);
       expect(request.url).deep.equal('https://prebid.mgid.com/prebid/1?muid=xxx');
-      localStorage.removeItem('mgMuidn')
+
+      getDataFromLocalStorageStub.restore();
     });
     it('should proper handle gdpr', function () {
       let bid = Object.assign({}, abid);
@@ -379,7 +386,7 @@ describe('Mgid bid adapter', function () {
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': '{\"site\":{\"domain\":\"' + domain + '\",\"page\":\"' + page + '\"},\"cur\":[\"USD\"],\"geo\":{\"utcoffset\":' + utcOffset + '},\"device\":{\"ua\":\"' + ua + '\",\"js\":1,\"dnt\":' + dnt + ',\"h\":' + screenHeight + ',\"w\":' + screenWidth + ',\"language\":\"' + lang + '\"},\"ext\":{\"mgid_ver\":\"' + mgid_ver + '\",\"prebid_ver\":\"' + prebid_ver + '\"},\"imp\":[{\"tagid\":\"2/div\",\"secure\":' + secure + ',\"banner\":{\"w\":300,\"h\":250}}]}',
+        'data': '{"site":{"domain":"' + domain + '","page":"' + page + '"},"cur":["USD"],"geo":{"utcoffset":' + utcOffset + '},"device":{"ua":"' + ua + '","js":1,"dnt":' + dnt + ',"h":' + screenHeight + ',"w":' + screenWidth + ',"language":"' + lang + '"},"ext":{"mgid_ver":"' + mgid_ver + '","prebid_ver":"' + version + '"},"imp":[{"tagid":"2/div","secure":' + secure + ',"banner":{"w":300,"h":250}}]}',
       });
     });
     it('should not return native imp if minimum asset list not requested', function () {
@@ -428,10 +435,10 @@ describe('Mgid bid adapter', function () {
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': '{\"site\":{\"domain\":\"' + domain + '\",\"page\":\"' + page + '\"},\"cur\":[\"USD\"],\"geo\":{\"utcoffset\":' + utcOffset + '},\"device\":{\"ua\":\"' + ua + '\",\"js\":1,\"dnt\":' + dnt + ',\"h\":' + screenHeight + ',\"w\":' + screenWidth + ',\"language\":\"' + lang + '\"},\"ext\":{\"mgid_ver\":\"' + mgid_ver + '\",\"prebid_ver\":\"' + prebid_ver + '\"},\"imp\":[{\"tagid\":\"2/div\",\"secure\":' + secure + ',\"native\":{\"request\":{\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":80}},{\"id\":2,\"required\":0,\"img\":{\"type\":3,\"w\":80,\"h\":80}},{\"id\":11,\"required\":0,\"data\":{\"type\":1}}]}}}]}',
+        'data': '{"site":{"domain":"' + domain + '","page":"' + page + '"},"cur":["USD"],"geo":{"utcoffset":' + utcOffset + '},"device":{"ua":"' + ua + '","js":1,"dnt":' + dnt + ',"h":' + screenHeight + ',"w":' + screenWidth + ',"language":"' + lang + '"},"ext":{"mgid_ver":"' + mgid_ver + '","prebid_ver":"' + version + '"},"imp":[{"tagid":"2/div","secure":' + secure + ',"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":0,"img":{"type":3,"w":80,"h":80}},{"id":11,"required":0,"data":{"type":1}}]}}}]}',
       });
     });
-    it('should return proper native imp', function () {
+    it('should return proper native imp with image altered', function () {
       let bid = Object.assign({}, abid);
       bid.mediaTypes = {
         native: '',
@@ -465,7 +472,7 @@ describe('Mgid bid adapter', function () {
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': '{\"site\":{\"domain\":\"' + domain + '\",\"page\":\"' + page + '\"},\"cur\":[\"USD\"],\"geo\":{\"utcoffset\":' + utcOffset + '},\"device\":{\"ua\":\"' + ua + '\",\"js\":1,\"dnt\":' + dnt + ',\"h\":' + screenHeight + ',\"w\":' + screenWidth + ',\"language\":\"' + lang + '\"},\"ext\":{\"mgid_ver\":\"' + mgid_ver + '\",\"prebid_ver\":\"' + prebid_ver + '\"},\"imp\":[{\"tagid\":\"2/div\",\"secure\":' + secure + ',\"native\":{\"request\":{\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":80}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"w\":492,\"h\":328,\"wmin\":50,\"hmin\":50}},{\"id\":3,\"required\":0,\"img\":{\"type\":1,\"w\":50,\"h\":50}},{\"id\":11,\"required\":0,\"data\":{\"type\":1}}]}}}]}',
+        'data': '{"site":{"domain":"' + domain + '","page":"' + page + '"},"cur":["USD"],"geo":{"utcoffset":' + utcOffset + '},"device":{"ua":"' + ua + '","js":1,"dnt":' + dnt + ',"h":' + screenHeight + ',"w":' + screenWidth + ',"language":"' + lang + '"},"ext":{"mgid_ver":"' + mgid_ver + '","prebid_ver":"' + version + '"},"imp":[{"tagid":"2/div","secure":' + secure + ',"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":1,"img":{"type":3,"w":492,"h":328,"wmin":50,"hmin":50}},{"id":3,"required":0,"img":{"type":1,"w":50,"h":50}},{"id":11,"required":0,"data":{"type":1}}]}}}]}',
       });
     });
     it('should return proper native imp with sponsoredBy', function () {
@@ -501,7 +508,7 @@ describe('Mgid bid adapter', function () {
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': '{\"site\":{\"domain\":\"' + domain + '\",\"page\":\"' + page + '\"},\"cur\":[\"USD\"],\"geo\":{\"utcoffset\":' + utcOffset + '},\"device\":{\"ua\":\"' + ua + '\",\"js\":1,\"dnt\":' + dnt + ',\"h\":' + screenHeight + ',\"w\":' + screenWidth + ',\"language\":\"' + lang + '\"},\"ext\":{\"mgid_ver\":\"' + mgid_ver + '\",\"prebid_ver\":\"' + prebid_ver + '\"},\"imp\":[{\"tagid\":\"2/div\",\"secure\":' + secure + ',\"native\":{\"request\":{\"plcmtcnt\":1,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":80}},{\"id\":2,\"required\":0,\"img\":{\"type\":3,\"w\":80,\"h\":80}},{\"id\":4,\"required\":0,\"data\":{\"type\":1}}]}}}]}',
+        'data': '{"site":{"domain":"' + domain + '","page":"' + page + '"},"cur":["USD"],"geo":{"utcoffset":' + utcOffset + '},"device":{"ua":"' + ua + '","js":1,"dnt":' + dnt + ',"h":' + screenHeight + ',"w":' + screenWidth + ',"language":"' + lang + '"},"ext":{"mgid_ver":"' + mgid_ver + '","prebid_ver":"' + version + '"},"imp":[{"tagid":"2/div","secure":' + secure + ',"native":{"request":{"plcmtcnt":1,"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":2,"required":0,"img":{"type":3,"w":80,"h":80}},{"id":4,"required":0,"data":{"type":1}}]}}}]}',
       });
     });
     it('should return proper banner request', function () {
@@ -509,7 +516,8 @@ describe('Mgid bid adapter', function () {
       bid.mediaTypes = {
         banner: {
           sizes: [[300, 600], [300, 250]],
-        }
+          pos: 1,
+        },
       };
       let bidRequests = [bid];
       const request = spec.buildRequests(bidRequests);
@@ -528,68 +536,85 @@ describe('Mgid bid adapter', function () {
       expect(data.device.w).equal(screenWidth);
       expect(data.device.language).to.deep.equal(lang);
       expect(data.imp[0].tagid).to.deep.equal('2/div');
-      expect(data.imp[0].banner).to.deep.equal({w: 300, h: 600, format: [{w: 300, h: 600}, {w: 300, h: 250}]});
+      expect(data.imp[0].banner).to.deep.equal({w: 300, h: 600, format: [{w: 300, h: 600}, {w: 300, h: 250}], pos: 1});
       expect(data.imp[0].secure).to.deep.equal(secure);
 
       expect(request).to.deep.equal({
         'method': 'POST',
         'url': 'https://prebid.mgid.com/prebid/1',
-        'data': '{\"site\":{\"domain\":\"' + domain + '\",\"page\":\"' + page + '\"},\"cur\":[\"USD\"],\"geo\":{\"utcoffset\":' + utcOffset + '},\"device\":{\"ua\":\"' + ua + '\",\"js\":1,\"dnt\":' + dnt + ',\"h\":' + screenHeight + ',\"w\":' + screenWidth + ',\"language\":\"' + lang + '\"},\"ext\":{\"mgid_ver\":\"' + mgid_ver + '\",\"prebid_ver\":\"' + prebid_ver + '\"},\"imp\":[{\"tagid\":\"2/div\",\"secure\":' + secure + ',\"banner\":{\"w\":300,\"h\":600,\"format\":[{\"w\":300,\"h\":600},{\"w\":300,\"h\":250}]}}]}',
+        'data': '{"site":{"domain":"' + domain + '","page":"' + page + '"},"cur":["USD"],"geo":{"utcoffset":' + utcOffset + '},"device":{"ua":"' + ua + '","js":1,"dnt":' + dnt + ',"h":' + screenHeight + ',"w":' + screenWidth + ',"language":"' + lang + '"},"ext":{"mgid_ver":"' + mgid_ver + '","prebid_ver":"' + version + '"},"imp":[{"tagid":"2/div","secure":' + secure + ',"banner":{"w":300,"h":600,"format":[{"w":300,"h":600},{"w":300,"h":250}],"pos":1}}]}',
       });
     });
-  });
-  describe('interpretResponse banner', function () {
-    it('should not push bid response', function () {
-      let bids = spec.interpretResponse();
-      expect(bids).to.be.undefined;
-    });
-    it('should push proper banner bid response', function () {
-      let resp = {
-        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': '', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'adm': 'html: adm', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2']}], 'seat': '44082'}]}
+    it('should proper handle ortb2 data', function () {
+      let bid = Object.assign({}, abid);
+      bid.mediaTypes = {
+        banner: {
+          sizes: [[300, 250]]
+        }
       };
-      let bids = spec.interpretResponse(resp);
-      expect(bids).to.deep.equal([
-        {
-          'ad': 'html: adm',
-          'cpm': 1.5,
-          'creativeId': '2898532/2419121/2592854/2499195',
-          'currency': 'USD',
-          'dealId': '',
-          'height': 600,
-          'isBurl': true,
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'nurl': 'https nurl',
-          'burl': 'https burl',
-          'requestId': '61e40632c53fc2',
-          'ttl': 300,
-          'width': 300,
+      let bidRequests = [bid];
+
+      let bidderRequest = {
+        ortb2: {
+          site: {
+            content: {
+              data: [{
+                name: 'mgid.com',
+                ext: {
+                  segtax: 1,
+                },
+                segment: [
+                  {id: '123'},
+                  {id: '456'},
+                ],
+              }]
+            }
+          },
+          user: {
+            data: [{
+              name: 'mgid.com',
+              ext: {
+                segtax: 2,
+              },
+              segment: [
+                {'id': '789'},
+                {'id': '987'},
+              ],
+            }]
+          }
         }
-      ]);
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).deep.equal('https://prebid.mgid.com/prebid/1');
+      expect(request.method).deep.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext).deep.include(bidderRequest.ortb2);
     });
   });
-  describe('interpretResponse native', function () {
+
+  describe('interpretResponse', function () {
     it('should not push proper native bid response if adm is missing', function () {
       let resp = {
-        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': 'GBP', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'ext': {'place': 0, 'crtype': 'native'}}], 'seat': '44082'}]}
+        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': 'GBP', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'ext': {'place': 0, 'crtype': 'native'}, 'adomain': ['test.com']}], 'seat': '44082'}]}
       };
       let bids = spec.interpretResponse(resp);
       expect(bids).to.deep.equal([])
     });
     it('should not push proper native bid response if assets is empty', function () {
       let resp = {
-        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': 'GBP', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'adm': '{\"native\":{\"ver\":\"1.1\",\"link\":{\"url\":\"link_url\"},\"assets\":[],\"imptrackers\":[\"imptrackers1\"]}}', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'ext': {'place': 0, 'crtype': 'native'}}], 'seat': '44082'}]}
+        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': 'GBP', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'adm': '{"native":{"ver":"1.1","link":{"url":"link_url"},"assets":[],"imptrackers":["imptrackers1"]}}', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'ext': {'place': 0, 'crtype': 'native'}, 'adomain': ['test.com']}], 'seat': '44082'}]}
       };
       let bids = spec.interpretResponse(resp);
       expect(bids).to.deep.equal([])
     });
-    it('should push proper native bid response', function () {
+    it('should push proper native bid response, assets1', function () {
       let resp = {
-        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': 'GBP', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'adm': '{\"native\":{\"ver\":\"1.1\",\"link\":{\"url\":\"link_url\"},\"assets\":[{\"id\":1,\"required\":0,\"title\":{\"text\":\"title1\"}},{\"id\":2,\"required\":0,\"img\":{\"w\":80,\"h\":80,\"type\":3,\"url\":\"image_src\"}},{\"id\":3,\"required\":0,\"img\":{\"w\":50,\"h\":50,\"type\":1,\"url\":\"icon_src\"}},{\"id\":4,\"required\":0,\"data\":{\"type\":4,\"value\":\"sponsored\"}},{\"id\":5,\"required\":0,\"data\":{\"type\":6,\"value\":\"price1\"}},{\"id\":6,\"required\":0,\"data\":{\"type\":7,\"value\":\"price2\"}}],\"imptrackers\":[\"imptrackers1\"]}}', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'ext': {'place': 0, 'crtype': 'native'}}], 'seat': '44082'}], ext: {'muidn': 'userid'}}
+        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': 'GBP', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'adm': '{"native":{"ver":"1.1","link":{"url":"link_url"},"assets":[{"id":1,"required":0,"title":{"text":"title1"}},{"id":2,"required":0,"img":{"w":80,"h":80,"type":3,"url":"image_src"}},{"id":3,"required":0,"img":{"w":50,"h":50,"type":1,"url":"icon_src"}},{"id":4,"required":0,"data":{"type":4,"value":"sponsored"}},{"id":5,"required":0,"data":{"type":6,"value":"price1"}},{"id":6,"required":0,"data":{"type":7,"value":"price2"}}],"imptrackers":["imptrackers1"]}}', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'ext': {'place': 0, 'crtype': 'native'}, 'adomain': ['test.com']}], 'seat': '44082'}], ext: {'muidn': 'userid'}}
       };
       let bids = spec.interpretResponse(resp);
       expect(bids).to.deep.equal([{
-        'ad': '{\"native\":{\"ver\":\"1.1\",\"link\":{\"url\":\"link_url\"},\"assets\":[{\"id\":1,\"required\":0,\"title\":{\"text\":\"title1\"}},{\"id\":2,\"required\":0,\"img\":{\"w\":80,\"h\":80,\"type\":3,\"url\":\"image_src\"}},{\"id\":3,\"required\":0,\"img\":{\"w\":50,\"h\":50,\"type\":1,\"url\":\"icon_src\"}},{\"id\":4,\"required\":0,\"data\":{\"type\":4,\"value\":\"sponsored\"}},{\"id\":5,\"required\":0,\"data\":{\"type\":6,\"value\":\"price1\"}},{\"id\":6,\"required\":0,\"data\":{\"type\":7,\"value\":\"price2\"}}],\"imptrackers\":[\"imptrackers1\"]}}',
+        'ad': '{"native":{"ver":"1.1","link":{"url":"link_url"},"assets":[{"id":1,"required":0,"title":{"text":"title1"}},{"id":2,"required":0,"img":{"w":80,"h":80,"type":3,"url":"image_src"}},{"id":3,"required":0,"img":{"w":50,"h":50,"type":1,"url":"icon_src"}},{"id":4,"required":0,"data":{"type":4,"value":"sponsored"}},{"id":5,"required":0,"data":{"type":6,"value":"price1"}},{"id":6,"required":0,"data":{"type":7,"value":"price2"}}],"imptrackers":["imptrackers1"]}}',
         'burl': 'https burl',
         'cpm': 1.5,
         'creativeId': '2898532/2419121/2592854/2499195',
@@ -598,6 +623,7 @@ describe('Mgid bid adapter', function () {
         'height': 0,
         'isBurl': true,
         'mediaType': 'native',
+        'meta': {'advertiserDomains': ['test.com']},
         'native': {
           'clickTrackers': [],
           'clickUrl': 'link_url',
@@ -626,14 +652,14 @@ describe('Mgid bid adapter', function () {
         'width': 0
       }])
     });
-    it('should push proper native bid response', function () {
+    it('should push proper native bid response, assets2', function () {
       let resp = {
-        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': 'GBP', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'adm': '{\"native\":{\"ver\":\"1.1\",\"link\":{\"url\":\"link_url\"},\"assets\":[{\"id\":1,\"required\":0,\"title\":{\"text\":\"title1\"}},{\"id\":2,\"required\":0,\"img\":{\"w\":80,\"h\":80,\"type\":3,\"url\":\"image_src\"}},{\"id\":3,\"required\":0,\"img\":{\"w\":50,\"h\":50,\"type\":1,\"url\":\"icon_src\"}}],\"imptrackers\":[\"imptrackers1\"]}}', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'ext': {'place': 0, 'crtype': 'native'}}], 'seat': '44082'}]}
+        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': 'GBP', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'adm': '{"native":{"ver":"1.1","link":{"url":"link_url"},"assets":[{"id":1,"required":0,"title":{"text":"title1"}},{"id":2,"required":0,"img":{"w":80,"h":80,"type":3,"url":"image_src"}},{"id":3,"required":0,"img":{"w":50,"h":50,"type":1,"url":"icon_src"}}],"imptrackers":["imptrackers1"]}}', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'ext': {'place': 0, 'crtype': 'native'}, 'adomain': ['test.com']}], 'seat': '44082'}]}
       };
       let bids = spec.interpretResponse(resp);
       expect(bids).to.deep.equal([
         {
-          'ad': '{\"native\":{\"ver\":\"1.1\",\"link\":{\"url\":\"link_url\"},\"assets\":[{\"id\":1,\"required\":0,\"title\":{\"text\":\"title1\"}},{\"id\":2,\"required\":0,\"img\":{\"w\":80,\"h\":80,\"type\":3,\"url\":\"image_src\"}},{\"id\":3,\"required\":0,\"img\":{\"w\":50,\"h\":50,\"type\":1,\"url\":\"icon_src\"}}],\"imptrackers\":[\"imptrackers1\"]}}',
+          'ad': '{"native":{"ver":"1.1","link":{"url":"link_url"},"assets":[{"id":1,"required":0,"title":{"text":"title1"}},{"id":2,"required":0,"img":{"w":80,"h":80,"type":3,"url":"image_src"}},{"id":3,"required":0,"img":{"w":50,"h":50,"type":1,"url":"icon_src"}}],"imptrackers":["imptrackers1"]}}',
           'cpm': 1.5,
           'creativeId': '2898532/2419121/2592854/2499195',
           'currency': 'GBP',
@@ -641,6 +667,7 @@ describe('Mgid bid adapter', function () {
           'height': 0,
           'isBurl': true,
           'mediaType': 'native',
+          'meta': {'advertiserDomains': ['test.com']},
           'netRevenue': true,
           'nurl': 'https nurl',
           'burl': 'https burl',
@@ -667,6 +694,36 @@ describe('Mgid bid adapter', function () {
         }
       ]);
     });
+
+    it('should not push bid response', function () {
+      let bids = spec.interpretResponse();
+      expect(bids).to.be.undefined;
+    });
+    it('should push proper banner bid response', function () {
+      let resp = {
+        body: {'id': '57c0c2b1b732ca', 'bidid': '57c0c2b1b732ca', 'cur': '', 'seatbid': [{'bid': [{'price': 1.5, 'h': 600, 'w': 300, 'id': '1', 'impid': '61e40632c53fc2', 'adid': '2898532/2419121/2592854/2499195', 'nurl': 'https nurl', 'burl': 'https burl', 'adm': 'html: adm', 'cid': '44082', 'crid': '2898532/2419121/2592854/2499195', 'cat': ['IAB7', 'IAB14', 'IAB18-3', 'IAB1-2'], 'adomain': ['test.com']}], 'seat': '44082'}]}
+      };
+      let bids = spec.interpretResponse(resp);
+      expect(bids).to.deep.equal([
+        {
+          'ad': 'html: adm',
+          'cpm': 1.5,
+          'creativeId': '2898532/2419121/2592854/2499195',
+          'currency': 'USD',
+          'dealId': '',
+          'height': 600,
+          'isBurl': true,
+          'mediaType': 'banner',
+          'meta': {'advertiserDomains': ['test.com']},
+          'netRevenue': true,
+          'nurl': 'https nurl',
+          'burl': 'https burl',
+          'requestId': '61e40632c53fc2',
+          'ttl': 300,
+          'width': 300,
+        }
+      ]);
+    });
   });
 
   describe('getUserSyncs', function () {
@@ -674,6 +731,7 @@ describe('Mgid bid adapter', function () {
       spec.getUserSyncs()
     });
   });
+
   describe('on bidWon', function () {
     beforeEach(function() {
       sinon.stub(utils, 'triggerPixel');
@@ -684,7 +742,7 @@ describe('Mgid bid adapter', function () {
     it('should replace nurl and burl for native', function () {
       const burl = 'burl&s=${' + 'AUCTION_PRICE}';
       const nurl = 'nurl&s=${' + 'AUCTION_PRICE}';
-      const bid = {'bidderCode': 'mgid', 'width': 0, 'height': 0, 'statusMessage': 'Bid available', 'adId': '3d0b6ff1dda89', 'requestId': '2a423489e058a1', 'mediaType': 'native', 'source': 'client', 'ad': '{\"native\":{\"ver\":\"1.1\",\"link\":{\"url\":\"LinkURL\"},\"assets\":[{\"id\":1,\"required\":0,\"title\":{\"text\":\"TITLE\"}},{\"id\":2,\"required\":0,\"img\":{\"w\":80,\"h\":80,\"type\":3,\"url\":\"ImageURL\"}},{\"id\":3,\"required\":0,\"img\":{\"w\":50,\"h\":50,\"type\":1,\"url\":\"IconURL\"}},{\"id\":11,\"required\":0,\"data\":{\"type\":1,\"value\":\"sponsored\"}}],\"imptrackers\":[\"ImpTrackerURL\"]}}', 'cpm': 0.66, 'creativeId': '353538_591471', 'currency': 'USD', 'dealId': '', 'netRevenue': true, 'ttl': 300, 'nurl': nurl, 'burl': burl, 'isBurl': true, 'native': {'title': 'TITLE', 'image': {'url': 'ImageURL', 'height': 80, 'width': 80}, 'icon': {'url': 'IconURL', 'height': 50, 'width': 50}, 'sponsored': 'sponsored', 'clickUrl': 'LinkURL', 'clickTrackers': [], 'impressionTrackers': ['ImpTrackerURL'], 'jstracker': []}, 'auctionId': 'a92bffce-14d2-4f8f-a78a-7b9b5e4d28fa', 'responseTimestamp': 1556867386065, 'requestTimestamp': 1556867385916, 'bidder': 'mgid', 'adUnitCode': 'div-gpt-ad-1555415275793-0', 'timeToRespond': 149, 'pbLg': '0.50', 'pbMg': '0.60', 'pbHg': '0.66', 'pbAg': '0.65', 'pbDg': '0.66', 'pbCg': '', 'size': '0x0', 'adserverTargeting': {'hb_bidder': 'mgid', 'hb_adid': '3d0b6ff1dda89', 'hb_pb': '0.66', 'hb_size': '0x0', 'hb_source': 'client', 'hb_format': 'native', 'hb_native_title': 'TITLE', 'hb_native_image': 'hb_native_image:3d0b6ff1dda89', 'hb_native_icon': 'IconURL', 'hb_native_linkurl': 'hb_native_linkurl:3d0b6ff1dda89'}, 'status': 'targetingSet', 'params': [{'accountId': '184', 'placementId': '353538'}]};
+      const bid = {'bidderCode': 'mgid', 'width': 0, 'height': 0, 'statusMessage': 'Bid available', 'adId': '3d0b6ff1dda89', 'requestId': '2a423489e058a1', 'mediaType': 'native', 'source': 'client', 'ad': '{"native":{"ver":"1.1","link":{"url":"LinkURL"},"assets":[{"id":1,"required":0,"title":{"text":"TITLE"}},{"id":2,"required":0,"img":{"w":80,"h":80,"type":3,"url":"ImageURL"}},{"id":3,"required":0,"img":{"w":50,"h":50,"type":1,"url":"IconURL"}},{"id":11,"required":0,"data":{"type":1,"value":"sponsored"}}],"imptrackers":["ImpTrackerURL"]}}', 'cpm': 0.66, 'creativeId': '353538_591471', 'currency': 'USD', 'dealId': '', 'netRevenue': true, 'ttl': 300, 'nurl': nurl, 'burl': burl, 'isBurl': true, 'native': {'title': 'TITLE', 'image': {'url': 'ImageURL', 'height': 80, 'width': 80}, 'icon': {'url': 'IconURL', 'height': 50, 'width': 50}, 'sponsored': 'sponsored', 'clickUrl': 'LinkURL', 'clickTrackers': [], 'impressionTrackers': ['ImpTrackerURL'], 'jstracker': []}, 'auctionId': 'a92bffce-14d2-4f8f-a78a-7b9b5e4d28fa', 'responseTimestamp': 1556867386065, 'requestTimestamp': 1556867385916, 'bidder': 'mgid', 'adUnitCode': 'div-gpt-ad-1555415275793-0', 'timeToRespond': 149, 'pbLg': '0.50', 'pbMg': '0.60', 'pbHg': '0.66', 'pbAg': '0.65', 'pbDg': '0.66', 'pbCg': '', 'size': '0x0', 'adserverTargeting': {'hb_bidder': 'mgid', 'hb_adid': '3d0b6ff1dda89', 'hb_pb': '0.66', 'hb_size': '0x0', 'hb_source': 'client', 'hb_format': 'native', 'hb_native_title': 'TITLE', 'hb_native_image': 'hb_native_image:3d0b6ff1dda89', 'hb_native_icon': 'IconURL', 'hb_native_linkurl': 'hb_native_linkurl:3d0b6ff1dda89'}, 'status': 'targetingSet', 'params': [{'accountId': '184', 'placementId': '353538'}]};
       spec.onBidWon(bid);
       expect(bid.nurl).to.deep.equal('nurl&s=0.66');
       expect(bid.burl).to.deep.equal('burl&s=0.66');
@@ -699,4 +757,120 @@ describe('Mgid bid adapter', function () {
       expect(bid.ad).to.deep.equal('burl&s=0.66');
     });
   });
+
+  describe('price floor module', function() {
+    let bidRequest;
+    let bidRequests0 = {
+      adUnitCode: 'div',
+      bidder: 'mgid',
+      params: {
+        accountId: '1',
+        placementId: '2',
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      sizes: [[300, 250]],
+    }
+    beforeEach(function() {
+      bidRequest = [utils.deepClone(bidRequests0)];
+    });
+
+    it('obtain floor from getFloor', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 1.23
+        };
+      };
+
+      const payload = JSON.parse(spec.buildRequests(bidRequest).data);
+      expect(payload.imp[0]).to.have.property('bidfloor', 1.23);
+      expect(payload.imp[0]).to.not.have.property('bidfloorcur');
+    });
+    it('obtain floor from params', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 1.23
+        };
+      };
+      bidRequest[0].params.bidfloor = 0.1;
+
+      const payload = JSON.parse(spec.buildRequests(bidRequest).data);
+      expect(payload.imp[0]).to.have.property('bidfloor', 0.1);
+      expect(payload.imp[0]).to.not.have.property('bidfloorcur');
+    });
+
+    it('undefined currency -> USD', function() {
+      bidRequest[0].params.currency = 'EUR'
+      bidRequest[0].getFloor = () => {
+        return {
+          floor: 1.23
+        };
+      };
+
+      const payload = JSON.parse(spec.buildRequests(bidRequest).data);
+      expect(payload.imp[0]).to.have.property('bidfloor', 1.23);
+      expect(payload.imp[0]).to.have.property('bidfloorcur', 'USD');
+    });
+    it('altered currency', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 1.23
+        };
+      };
+
+      const payload = JSON.parse(spec.buildRequests(bidRequest).data);
+      expect(payload.imp[0]).to.have.property('bidfloor', 1.23);
+      expect(payload.imp[0]).to.have.property('bidfloorcur', 'EUR');
+    });
+    it('altered currency, same as in request', function() {
+      bidRequest[0].params.cur = 'EUR'
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 1.23
+        };
+      };
+
+      const payload = JSON.parse(spec.buildRequests(bidRequest).data);
+      expect(payload.imp[0]).to.have.property('bidfloor', 1.23);
+      expect(payload.imp[0]).to.not.have.property('bidfloorcur');
+    });
+
+    it('bad floor value', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 'test'
+        };
+      };
+
+      const payload = JSON.parse(spec.buildRequests(bidRequest).data);
+      expect(payload.imp[0]).to.not.have.property('bidfloor');
+      expect(payload.imp[0]).to.not.have.property('bidfloorcur');
+    });
+
+    it('empty floor object', function() {
+      bidRequest[0].getFloor = () => {
+        return {};
+      };
+
+      const payload = JSON.parse(spec.buildRequests(bidRequest).data);
+      expect(payload.imp[0]).to.not.have.property('bidfloor');
+      expect(payload.imp[0]).to.not.have.property('bidfloorcur');
+    });
+
+    it('undefined floor result', function() {
+      bidRequest[0].getFloor = () => {};
+
+      const payload = JSON.parse(spec.buildRequests(bidRequest).data);
+      expect(payload.imp[0]).to.not.have.property('bidfloor');
+      expect(payload.imp[0]).to.not.have.property('bidfloorcur');
+    });
+  });
 });
diff --git a/test/spec/modules/mgidRtdProvider_spec.js b/test/spec/modules/mgidRtdProvider_spec.js
new file mode 100644
index 00000000000..4f70b4d8b7c
--- /dev/null
+++ b/test/spec/modules/mgidRtdProvider_spec.js
@@ -0,0 +1,366 @@
+import { mgidSubmodule, storage } from '../../../modules/mgidRtdProvider.js';
+import {expect} from 'chai';
+import * as refererDetection from '../../../src/refererDetection';
+
+describe('Mgid RTD submodule', () => {
+  let server;
+  let clock;
+  let getRefererInfoStub;
+  let getDataFromLocalStorageStub;
+
+  beforeEach(() => {
+    server = sinon.fakeServer.create();
+
+    clock = sinon.useFakeTimers();
+
+    getRefererInfoStub = sinon.stub(refererDetection, 'getRefererInfo');
+    getRefererInfoStub.returns({
+      canonicalUrl: 'https://www.test.com/abc'
+    });
+
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').returns('qwerty654321');
+  });
+
+  afterEach(() => {
+    server.restore();
+    clock.restore();
+    getRefererInfoStub.restore();
+    getDataFromLocalStorageStub.restore();
+  });
+
+  it('init is successfull, when clientSiteId is defined', () => {
+    expect(mgidSubmodule.init({params: {clientSiteId: 123}})).to.be.true;
+  });
+
+  it('init is unsuccessfull, when clientSiteId is not defined', () => {
+    expect(mgidSubmodule.init({})).to.be.false;
+  });
+
+  it('getBidRequestData send all params to our endpoint and succesfully modifies ortb2', () => {
+    const responseObj = {
+      userSegments: ['100', '200'],
+      userSegtax: 5,
+      siteSegments: ['300', '400'],
+      siteSegtax: 7,
+      muid: 'qwerty654321',
+    };
+
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {
+          site: {
+            content: {
+              language: 'en',
+            }
+          }
+        },
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {
+        gdpr: {
+          gdprApplies: true,
+          consentString: 'testConsent',
+        },
+        usp: '1YYY',
+      }
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify(responseObj)
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.host).to.be.eq('servicer.mgid.com');
+    expect(requestUrl.searchParams.get('gdprApplies')).to.be.eq('true');
+    expect(requestUrl.searchParams.get('consentData')).to.be.eq('testConsent');
+    expect(requestUrl.searchParams.get('uspString')).to.be.eq('1YYY');
+    expect(requestUrl.searchParams.get('muid')).to.be.eq('qwerty654321');
+    expect(requestUrl.searchParams.get('clientSiteId')).to.be.eq('123');
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://www.test.com/abc');
+    expect(requestUrl.searchParams.get('cxlang')).to.be.eq('en');
+
+    assert.deepInclude(
+      reqBidsConfigObj.ortb2Fragments.global,
+      {
+        site: {
+          content: {
+            language: 'en',
+            data: [
+              {
+                name: 'www.mgid.com',
+                ext: {
+                  segtax: 7
+                },
+                segment: [
+                  { id: '300' },
+                  { id: '400' },
+                ]
+              }
+            ],
+          }
+        },
+        user: {
+          data: [
+            {
+              name: 'www.mgid.com',
+              ext: {
+                segtax: 5
+              },
+              segment: [
+                { id: '100' },
+                { id: '200' },
+              ]
+            }
+          ],
+        },
+      });
+  });
+
+  it('getBidRequestData doesn\'t send params (consent and cxlang), if we haven\'t received them', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify({})
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.host).to.be.eq('servicer.mgid.com');
+    expect(requestUrl.searchParams.get('gdprApplies')).to.be.null;
+    expect(requestUrl.searchParams.get('consentData')).to.be.null;
+    expect(requestUrl.searchParams.get('uspString')).to.be.null;
+    expect(requestUrl.searchParams.get('muid')).to.be.eq('qwerty654321');
+    expect(requestUrl.searchParams.get('clientSiteId')).to.be.eq('123');
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://www.test.com/abc');
+    expect(requestUrl.searchParams.get('cxlang')).to.be.null;
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData send gdprApplies event if it is false', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {
+        gdpr: {
+          gdprApplies: false,
+          consentString: 'testConsent',
+        },
+        usp: '1YYY',
+      }
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify({})
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.host).to.be.eq('servicer.mgid.com');
+    expect(requestUrl.searchParams.get('gdprApplies')).to.be.eq('false');
+    expect(requestUrl.searchParams.get('consentData')).to.be.eq('testConsent');
+    expect(requestUrl.searchParams.get('uspString')).to.be.eq('1YYY');
+    expect(requestUrl.searchParams.get('muid')).to.be.eq('qwerty654321');
+    expect(requestUrl.searchParams.get('clientSiteId')).to.be.eq('123');
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://www.test.com/abc');
+    expect(requestUrl.searchParams.get('cxlang')).to.be.null;
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData use og:url for cxurl, if it is available', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    let metaStub = sinon.stub(document, 'getElementsByTagName').returns([
+      { getAttribute: () => 'og:test', content: 'fake' },
+      { getAttribute: () => 'og:url', content: 'https://realOgUrl.com/' }
+    ]);
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify({})
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://realOgUrl.com/');
+    expect(onDone.calledOnce).to.be.true;
+
+    metaStub.restore();
+  });
+
+  it('getBidRequestData use topMostLocation for cxurl, if nothing else left', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    getRefererInfoStub.returns({
+      topmostLocation: 'https://www.test.com/topMost'
+    });
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify({})
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://www.test.com/topMost');
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData won\'t modify ortb2 if response is broken', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      '{'
+    );
+
+    assert.deepEqual(reqBidsConfigObj.ortb2Fragments.global, {});
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData won\'t modify ortb2 if response status is not 200', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      204,
+      {'Content-Type': 'application/json'},
+      '{}'
+    );
+
+    assert.deepEqual(reqBidsConfigObj.ortb2Fragments.global, {});
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData won\'t modify ortb2 if response results in error', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      500,
+      {'Content-Type': 'application/json'},
+      '{}'
+    );
+
+    assert.deepEqual(reqBidsConfigObj.ortb2Fragments.global, {});
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData won\'t modify ortb2 if response time hits timeout', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123, timeout: 500}},
+      {}
+    );
+
+    clock.tick(510);
+
+    assert.deepEqual(reqBidsConfigObj.ortb2Fragments.global, {});
+    expect(onDone.calledOnce).to.be.true;
+  });
+});
diff --git a/test/spec/modules/microadBidAdapter_spec.js b/test/spec/modules/microadBidAdapter_spec.js
index 8298e2bd559..98edfce20bc 100644
--- a/test/spec/modules/microadBidAdapter_spec.js
+++ b/test/spec/modules/microadBidAdapter_spec.js
@@ -61,8 +61,8 @@ describe('microadBidAdapter', () => {
   describe('buildRequests', () => {
     const bidderRequest = {
       refererInfo: {
-        canonicalUrl: 'https://example.com/to',
-        referer: 'https://example.com/from'
+        page: 'https://example.com/to',
+        ref: 'https://example.com/from'
       }
     };
     const expectedResultTemplate = {
@@ -124,10 +124,10 @@ describe('microadBidAdapter', () => {
       ]);
     });
 
-    it('should use window.location.href if there is no canonicalUrl', () => {
+    it('should use window.location.href if there is no page', () => {
       const bidderRequestWithoutCanonicalUrl = {
         refererInfo: {
-          referer: 'https://example.com/from'
+          ref: 'https://example.com/from'
         }
       };
       const requests = spec.buildRequests([bidRequestTemplate], bidderRequestWithoutCanonicalUrl);
@@ -265,6 +265,119 @@ describe('microadBidAdapter', () => {
         expect(request.url.lastIndexOf('https', 0) === 0).to.be.true;
       });
     });
+
+    it('should not add Liveramp identity link and Audience ID if it is not available in request parameters', () => {
+      const bidRequestWithOutLiveramp = Object.assign({}, bidRequestTemplate, {
+        userId: {}
+      });
+      const requests = spec.buildRequests([bidRequestWithOutLiveramp], bidderRequest)
+      requests.forEach(request => {
+        expect(request.data).to.deep.equal(
+          Object.assign({}, expectedResultTemplate, {
+            cbt: request.data.cbt
+          })
+        );
+      })
+    });
+
+    Object.entries({
+      'IM-UID': {
+        userId: {imuid: 'imuid-sample'},
+        expected: {aids: JSON.stringify([{type: 6, id: 'imuid-sample'}])}
+      },
+      'ID5 ID': {
+        userId: {id5id: {uid: 'id5id-sample'}},
+        expected: {aids: JSON.stringify([{type: 8, id: 'id5id-sample'}])}
+      },
+      'Unified ID': {
+        userId: {tdid: 'unified-sample'},
+        expected: {aids: JSON.stringify([{type: 9, id: 'unified-sample'}])}
+      },
+      'Novatiq Snowflake ID': {
+        userId: {novatiq: {snowflake: 'novatiq-sample'}},
+        expected: {aids: JSON.stringify([{type: 10, id: 'novatiq-sample'}])}
+      },
+      'Parrable ID': {
+        userId: {parrableId: {eid: 'parrable-sample'}},
+        expected: {aids: JSON.stringify([{type: 11, id: 'parrable-sample'}])}
+      },
+      'AudienceOne User ID': {
+        userId: {dacId: {id: 'audience-one-sample'}},
+        expected: {aids: JSON.stringify([{type: 12, id: 'audience-one-sample'}])}
+      },
+      'Ramp ID and Liveramp identity': {
+        userId: {idl_env: 'idl-env-sample'},
+        expected: {idl_env: 'idl-env-sample', aids: JSON.stringify([{type: 13, id: 'idl-env-sample'}])}
+      },
+      'Criteo ID': {
+        userId: {criteoId: 'criteo-id-sample'},
+        expected: {aids: JSON.stringify([{type: 14, id: 'criteo-id-sample'}])}
+      },
+      'Shared ID': {
+        userId: {pubcid: 'shared-id-sample'},
+        expected: {aids: JSON.stringify([{type: 15, id: 'shared-id-sample'}])}
+      }
+    }).forEach(([test, arg]) => {
+      it(`should add ${test} if it is available in request parameters`, () => {
+        const bidRequestWithUserId = { ...bidRequestTemplate, userId: arg.userId }
+        const requests = spec.buildRequests([bidRequestWithUserId], bidderRequest)
+        requests.forEach((request) => {
+          expect(request.data).to.deep.equal({
+            ...expectedResultTemplate,
+            cbt: request.data.cbt,
+            ...arg.expected
+          })
+        })
+      })
+    })
+
+    Object.entries({
+      'ID5 ID': {
+        userId: {id5id: {uid: 'id5id-sample'}},
+        userIdAsEids: [
+          {
+            source: 'id5-sync.com',
+            uids: [{id: 'id5id-sample', aType: 1, ext: {linkType: 2, abTestingControlGroup: false}}]
+          }
+        ],
+        expected: {
+          aids: JSON.stringify([{type: 8, id: 'id5id-sample', ext: {linkType: 2, abTestingControlGroup: false}}])
+        }
+      },
+      'Unified ID': {
+        userId: {tdid: 'unified-sample'},
+        userIdAsEids: [
+          {
+            source: 'adserver.org',
+            uids: [{id: 'unified-sample', aType: 1, ext: {rtiPartner: 'TDID'}}]
+          }
+        ],
+        expected: {aids: JSON.stringify([{type: 9, id: 'unified-sample', ext: {rtiPartner: 'TDID'}}])}
+      },
+      'not add': {
+        userId: {id5id: {uid: 'id5id-sample'}},
+        userIdAsEids: [],
+        expected: {
+          aids: JSON.stringify([{type: 8, id: 'id5id-sample'}])
+        }
+      }
+    }).forEach(([test, arg]) => {
+      it(`should ${test} ext if it is available in request parameters`, () => {
+        const bidRequestWithUserId = {
+          ...bidRequestTemplate,
+          userId: arg.userId,
+          userIdAsEids: arg.userIdAsEids
+        }
+        const requests = spec.buildRequests([bidRequestWithUserId], bidderRequest)
+        requests.forEach((request) => {
+          expect(request.data).to.deep.equal({
+            ...expectedResultTemplate,
+            cbt: request.data.cbt,
+            ...arg.expected
+          })
+        })
+      });
+    })
   });
 
   describe('interpretResponse', () => {
@@ -278,7 +391,10 @@ describe('microadBidAdapter', () => {
         ttl: 10,
         creativeId: 'creative-id',
         netRevenue: true,
-        currency: 'JPY'
+        currency: 'JPY',
+        meta: {
+          advertiserDomains: ['foobar.com']
+        }
       }
     };
     const expectedBidResponseTemplate = {
@@ -290,7 +406,10 @@ describe('microadBidAdapter', () => {
       ttl: 10,
       creativeId: 'creative-id',
       netRevenue: true,
-      currency: 'JPY'
+      currency: 'JPY',
+      meta: {
+        advertiserDomains: ['foobar.com']
+      }
     };
 
     it('should return nothing if server response body does not contain cpm', () => {
@@ -324,6 +443,16 @@ describe('microadBidAdapter', () => {
 
       expect(spec.interpretResponse(serverResponseWithDealId)).to.deep.equal([expectedBidResponse]);
     });
+
+    it('should return a valid bidResponse without meta if serverResponse is valid, has a nonzero cpm and no deal id', () => {
+      const serverResponseWithoutMeta = Object.assign({}, utils.deepClone(serverResponseTemplate));
+      delete serverResponseWithoutMeta.body.meta;
+      const expectedBidResponse = Object.assign({}, expectedBidResponseTemplate, {
+        meta: { advertiserDomains: [] }
+      });
+
+      expect(spec.interpretResponse(serverResponseWithoutMeta)).to.deep.equal([expectedBidResponse]);
+    });
   });
 
   describe('getUserSyncs', () => {
diff --git a/test/spec/modules/minutemediaBidAdapter_spec.js b/test/spec/modules/minutemediaBidAdapter_spec.js
new file mode 100644
index 00000000000..bbd23918031
--- /dev/null
+++ b/test/spec/modules/minutemediaBidAdapter_spec.js
@@ -0,0 +1,482 @@
+import { expect } from 'chai';
+import { spec } from 'modules/minutemediaBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT = 'https://hb.minutemedia-prebid.com/hb-mm-multi';
+const TEST_ENDPOINT = 'https://hb.minutemedia-prebid.com/hb-multi-mm-test';
+const TTL = 360;
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
+
+describe('minutemediaAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      'bidder': spec.code,
+      'adUnitCode': 'adunit-code',
+      'sizes': [['640', '480']],
+      'params': {
+        'org': 'jdye8weeyirk00000001'
+      }
+    };
+
+    it('should return true when required params are passed', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'org': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'video': {
+            'playerSize': [[640, 480]],
+            'context': 'instream'
+          }
+        },
+        'vastXml': '"<VAST version=\\\"2.0\\\">...</VAST>"'
+      },
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'banner': {
+          }
+        },
+        'ad': '"<img src=\"https://...\"/>"'
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001',
+          'testMode': true
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 2,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'minutemedia',
+    }
+    const placementId = '12345678';
+
+    it('sends the placementId to ENDPOINT via POST', function () {
+      bidRequests[0].params.placementId = placementId;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].placementId).to.equal(placementId);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to TEST ENDPOINT via POST', function () {
+      const request = spec.buildRequests(testModeBidRequests, bidderRequest);
+      expect(request.url).to.equal(TEST_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the correct bid Id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].bidId).to.equal('299ffc8cca0b87');
+    });
+
+    it('should send the correct sizes array', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sizes).to.be.an('array');
+      expect(request.data.bids[0].sizes).to.equal(bidRequests[0].sizes)
+      expect(request.data.bids[1].sizes).to.be.an('array');
+      expect(request.data.bids[1].sizes).to.equal(bidRequests[1].sizes)
+    });
+
+    it('should send the correct media type', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].mediaType).to.equal(VIDEO)
+      expect(request.data.bids[1].mediaType).to.equal(BANNER)
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should respect "iframe" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            iframe: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should respect "all" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            all: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should send the pixel user sync param if userSync is enabled and no "iframe" or "all" configs are present', function () {
+      config.resetConfig();
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'pixel');
+    });
+
+    it('should respect total exclusion', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            image: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            },
+            iframe: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should have us_privacy param if usPrivacy is available in the bidRequest', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('us_privacy', '1YNN');
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('us_privacy');
+    });
+
+    it('should not send the gdpr param if gdprApplies is false in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: false}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gdpr');
+      expect(request.data.params).to.not.have.property('gdpr_consent');
+    });
+
+    it('should send the gdpr param if gdprApplies is true in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: true, consentString: 'test-consent-string'}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gdpr', true);
+      expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
+    });
+
+    it('should have schain param if it is available in the bidRequest', () => {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
+      };
+      bidRequests[0].schain = schain;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('schain', '1.0,1!indirectseller.com,00001,1,,,');
+    });
+
+    it('should set flooPrice to getFloor.floor value if it is greater than params.floorPrice', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.32
+        }
+      }
+      bid.params.floorPrice = 0.64;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 3.32);
+    });
+
+    it('should set floorPrice to params.floorPrice value if it is greater than getFloor.floor', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 0.8
+        }
+      }
+      bid.params.floorPrice = 1.5;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 1.5);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      params: {
+        currency: 'USD',
+        netRevenue: true,
+      },
+      bids: [{
+        cpm: 12.5,
+        vastXml: '<VAST version="3.0"></VAST>',
+        width: 640,
+        height: 480,
+        requestId: '21e12606d47ba7',
+        adomain: ['abc.com'],
+        mediaType: VIDEO
+      },
+      {
+        cpm: 12.5,
+        ad: '"<img src=\"https://...\"/>"',
+        width: 300,
+        height: 250,
+        requestId: '21e12606d47ba7',
+        adomain: ['abc.com'],
+        mediaType: BANNER
+      }]
+    };
+
+    const expectedVideoResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 640,
+      height: 480,
+      ttl: TTL,
+      creativeId: '21e12606d47ba7',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: VIDEO,
+      meta: {
+        mediaType: VIDEO,
+        advertiserDomains: ['abc.com']
+      },
+      vastXml: '<VAST version="3.0"></VAST>',
+    };
+
+    const expectedBannerResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 640,
+      height: 480,
+      ttl: TTL,
+      creativeId: '21e12606d47ba7',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: BANNER,
+      meta: {
+        mediaType: BANNER,
+        advertiserDomains: ['abc.com']
+      },
+      ad: '"<img src=\"https://...\"/>"'
+    };
+
+    it('should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedVideoResponse));
+      expect(Object.keys(result[1])).to.deep.equal(Object.keys(expectedBannerResponse));
+    });
+
+    it('video type should have vastXml key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[0].vastXml).to.equal(expectedVideoResponse.vastXml)
+    });
+
+    it('banner type should have ad key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[1].ad).to.equal(expectedBannerResponse.ad)
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        params: {
+          userSyncPixels: [
+            'https://image-sync-url.test/1',
+            'https://image-sync-url.test/2',
+            'https://image-sync-url.test/3'
+          ]
+        }
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        params: {
+          userSyncURL: 'https://iframe-sync-url.test'
+        }
+      }
+    };
+
+    it('should register all img urls from the response', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should register the iframe url from the response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [iframeSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        }
+      ]);
+    });
+
+    it('should register both image and iframe urls from the responses', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, [iframeSyncResponse, imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should handle an empty response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should handle when user syncs are disabled', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: false }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([]);
+    });
+  })
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should trigger pixel if bid nurl', function() {
+      const bid = {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [['640', '480']],
+        'nurl': 'http://example.com/win/1234',
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        }
+      };
+
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    })
+  })
+});
diff --git a/test/spec/modules/missenaBidAdapter_spec.js b/test/spec/modules/missenaBidAdapter_spec.js
new file mode 100644
index 00000000000..157137b4730
--- /dev/null
+++ b/test/spec/modules/missenaBidAdapter_spec.js
@@ -0,0 +1,179 @@
+import { expect } from 'chai';
+import { spec, _getPlatform } from 'modules/missenaBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+describe('Missena Adapter', function () {
+  const adapter = newBidder(spec);
+
+  const bidId = 'abc';
+
+  const bid = {
+    bidder: 'missena',
+    bidId: bidId,
+    sizes: [[1, 1]],
+    params: {
+      apiKey: 'PA-34745704',
+    },
+  };
+
+  describe('codes', function () {
+    it('should return a bidder code of missena', function () {
+      expect(spec.code).to.equal('missena');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true if the apiKey param is present', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false if the apiKey is missing', function () {
+      expect(
+        spec.isBidRequestValid(Object.assign(bid, { params: {} }))
+      ).to.equal(false);
+    });
+
+    it('should return false if the apiKey is an empty string', function () {
+      expect(
+        spec.isBidRequestValid(Object.assign(bid, { params: { apiKey: '' } }))
+      ).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const consentString = 'AAAAAAAAA==';
+
+    const bidderRequest = {
+      gdprConsent: {
+        consentString: consentString,
+        gdprApplies: true,
+      },
+      refererInfo: {
+        topmostLocation: 'https://referer',
+        canonicalUrl: 'https://canonical',
+      },
+    };
+
+    const requests = spec.buildRequests([bid, bid], bidderRequest);
+    const request = requests[0];
+    const payload = JSON.parse(request.data);
+
+    it('should return as many server requests as bidder requests', function () {
+      expect(requests.length).to.equal(2);
+    });
+
+    it('should have a post method', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the bidder id', function () {
+      expect(payload.request_id).to.equal(bidId);
+    });
+
+    it('should send referer information to the request', function () {
+      expect(payload.referer).to.equal('https://referer');
+      expect(payload.referer_canonical).to.equal('https://canonical');
+    });
+
+    it('should send gdpr consent information to the request', function () {
+      expect(payload.consent_string).to.equal(consentString);
+      expect(payload.consent_required).to.equal(true);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const serverResponse = {
+      requestId: bidId,
+      cpm: 0.5,
+      currency: 'USD',
+      ad: '<!-- -->',
+      meta: {
+        advertiserDomains: ['missena.com'],
+      },
+    };
+
+    const serverTimeoutResponse = {
+      requestId: bidId,
+      timeout: true,
+      ad: '<!-- -->',
+    };
+
+    const serverEmptyAdResponse = {
+      requestId: bidId,
+      cpm: 0.5,
+      currency: 'USD',
+      ad: '',
+    };
+
+    it('should return a proper bid response', function () {
+      const result = spec.interpretResponse({ body: serverResponse }, bid);
+
+      expect(result.length).to.equal(1);
+
+      expect(Object.keys(result[0])).to.have.members(
+        Object.keys(serverResponse)
+      );
+    });
+
+    it('should return an empty response when the server answers with a timeout', function () {
+      const result = spec.interpretResponse(
+        { body: serverTimeoutResponse },
+        bid
+      );
+      expect(result).to.deep.equal([]);
+    });
+
+    it('should return an empty response when the server answers with an empty ad', function () {
+      const result = spec.interpretResponse(
+        { body: serverEmptyAdResponse },
+        bid
+      );
+      expect(result).to.deep.equal([]);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const syncFrameUrl = 'https://sync.missena.io/iframe';
+    const consentString = 'sampleString';
+    const iframeEnabledOptions = {
+      iframeEnabled: true,
+    };
+    const iframeDisabledOptions = {
+      iframeEnabled: false,
+    };
+
+    it('should return userSync when iframeEnabled', function () {
+      const userSync = spec.getUserSyncs(iframeEnabledOptions, []);
+
+      expect(userSync.length).to.be.equal(1);
+      expect(userSync[0].type).to.be.equal('iframe');
+      expect(userSync[0].url).to.be.equal(syncFrameUrl);
+    });
+
+    it('should return empty array when iframeEnabled is false', function () {
+      const userSync = spec.getUserSyncs(iframeDisabledOptions, []);
+      expect(userSync.length).to.be.equal(0);
+    });
+
+    it('sync frame url should contain gdpr data when present', function () {
+      const userSync = spec.getUserSyncs(iframeEnabledOptions, [], {
+        gdprApplies: true,
+        consentString,
+      });
+      const expectedUrl = `${syncFrameUrl}?gdpr=1&gdpr_consent=${consentString}`;
+      expect(userSync.length).to.be.equal(1);
+      expect(userSync[0].type).to.be.equal('iframe');
+      expect(userSync[0].url).to.be.equal(expectedUrl);
+    });
+    it('sync frame url should contain gdpr data when present (gdprApplies false)', function () {
+      const userSync = spec.getUserSyncs(iframeEnabledOptions, [], {
+        gdprApplies: false,
+        consentString,
+      });
+      const expectedUrl = `${syncFrameUrl}?gdpr=0&gdpr_consent=${consentString}`;
+      expect(userSync.length).to.be.equal(1);
+      expect(userSync[0].type).to.be.equal('iframe');
+      expect(userSync[0].url).to.be.equal(expectedUrl);
+    });
+  });
+});
diff --git a/test/spec/modules/mobfoxBidAdapter_spec.js b/test/spec/modules/mobfoxBidAdapter_spec.js
deleted file mode 100644
index d3178d77a1a..00000000000
--- a/test/spec/modules/mobfoxBidAdapter_spec.js
+++ /dev/null
@@ -1,123 +0,0 @@
-describe('mobfox adapter tests', function () {
-  const expect = require('chai').expect;
-  const utils = require('src/utils');
-  const adapter = require('modules/mobfoxBidAdapter');
-
-  const bidRequest = [{
-    code: 'div-gpt-ad-1460505748561-0',
-    sizes: [[320, 480], [300, 250], [300, 600]],
-    // Replace this object to test a new Adapter!
-    bidder: 'mobfox',
-    bidId: '5t5t5t5',
-    params: {
-      s: '267d72ac3f77a3f447b32cf7ebf20673', // required - The hash of your inventory to identify which app is making the request,
-      imp_instl: 1 // optional - set to 1 if using interstitial otherwise delete or set to 0
-    },
-    placementCode: 'div-gpt-ad-1460505748561-0',
-    auctionId: 'c241c810-18d9-4aa4-a62f-8c1980d8d36b',
-    transactionId: '31f42cba-5920-4e47-adad-69c79d0d4fb4'
-  }];
-
-  describe('validRequests', function () {
-    let bidRequestInvalid1 = [{
-      code: 'div-gpt-ad-1460505748561-0',
-      sizes: [[320, 480], [300, 250], [300, 600]],
-      // Replace this object to test a new Adapter!
-      bidder: 'mobfox',
-      bidId: '5t5t5t5',
-      params: {
-        imp_instl: 1 // optional - set to 1 if using interstitial otherwise delete or set to 0
-      },
-      placementCode: 'div-gpt-ad-1460505748561-0',
-      auctionId: 'c241c810-18d9-4aa4-a62f-8c1980d8d36b',
-      transactionId: '31f42cba-5920-4e47-adad-69c79d0d4fb4'
-    }];
-
-    it('test valid MF request success', function () {
-      let isValid = adapter.spec.isBidRequestValid(bidRequest[0]);
-      expect(isValid).to.equal(true);
-    });
-
-    it('test valid MF request failed1', function () {
-      let isValid = adapter.spec.isBidRequestValid(bidRequestInvalid1[0]);
-      expect(isValid).to.equal(false);
-    });
-  })
-
-  describe('buildRequests', function () {
-    it('test build MF request', function () {
-      let request = adapter.spec.buildRequests(bidRequest);
-      let payload = request.data.split('&');
-      expect(payload[0]).to.equal('rt=api-fetchip');
-      expect(payload[1]).to.equal('r_type=banner');
-      expect(payload[2]).to.equal('r_resp=json');
-      expect(payload[3]).to.equal('s=267d72ac3f77a3f447b32cf7ebf20673');
-      expect(payload[5]).to.equal('adspace_width=320');
-      expect(payload[6]).to.equal('adspace_height=480');
-      expect(payload[7]).to.equal('imp_instl=1');
-    });
-
-    it('test build MF request', function () {
-      let request = adapter.spec.buildRequests(bidRequest);
-      let payload = request.data.split('&');
-      expect(payload[0]).to.equal('rt=api-fetchip');
-      expect(payload[1]).to.equal('r_type=banner');
-      expect(payload[2]).to.equal('r_resp=json');
-      expect(payload[3]).to.equal('s=267d72ac3f77a3f447b32cf7ebf20673');
-      expect(payload[5]).to.equal('adspace_width=320');
-      expect(payload[6]).to.equal('adspace_height=480');
-      expect(payload[7]).to.equal('imp_instl=1');
-    });
-  })
-
-  describe('interceptResponse', function () {
-    let mockServerResponse = {
-      body: {
-        request: {
-          clicktype: 'safari',
-          clickurl: 'https://tokyo-my.mobfox.com/exchange.click.php?h=494ef76d5b0287a8b5ac8724855cb5e0',
-          cpmPrice: 50,
-          htmlString: 'test',
-          refresh: '30',
-          scale: 'no',
-          skippreflight: 'yes',
-          type: 'textAd',
-          urltype: 'link'
-        }
-      },
-      headers: {
-        get: function (header) {
-          if (header === 'X-Pricing-CPM') {
-            return 50;
-          }
-        }
-      }
-    };
-    it('test intercept response', function () {
-      let request = adapter.spec.buildRequests(bidRequest);
-      let bidResponses = adapter.spec.interpretResponse(mockServerResponse, request);
-      expect(bidResponses.length).to.equal(1);
-      expect(bidResponses[0].ad).to.equal('test');
-      expect(bidResponses[0].cpm).to.equal(50);
-      expect(bidResponses[0].creativeId).to.equal('267d72ac3f77a3f447b32cf7ebf20673');
-      expect(bidResponses[0].requestId).to.equal('5t5t5t5');
-      expect(bidResponses[0].currency).to.equal('USD');
-      expect(bidResponses[0].height).to.equal('480');
-      expect(bidResponses[0].netRevenue).to.equal(true);
-      expect(bidResponses[0].referrer).to.equal('https://tokyo-my.mobfox.com/exchange.click.php?h=494ef76d5b0287a8b5ac8724855cb5e0');
-      expect(bidResponses[0].ttl).to.equal(360);
-      expect(bidResponses[0].width).to.equal('320');
-    });
-
-    it('test intercept response with empty server response', function () {
-      let request = adapter.spec.buildRequests(bidRequest);
-      let serverResponse = {
-        request: {
-          error: 'cannot get response'
-        }
-      };
-      let bidResponses = adapter.spec.interpretResponse(serverResponse, request);
-      expect(bidResponses.length).to.equal(0);
-    })
-  })
-});
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/mobsmartBidAdapter_spec.js b/test/spec/modules/mobsmartBidAdapter_spec.js
deleted file mode 100644
index b48878adff6..00000000000
--- a/test/spec/modules/mobsmartBidAdapter_spec.js
+++ /dev/null
@@ -1,214 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/mobsmartBidAdapter.js';
-
-describe('mobsmartBidAdapter', function () {
-  describe('isBidRequestValid', function () {
-    let bid;
-    beforeEach(function() {
-      bid = {
-        bidder: 'mobsmart',
-        params: {
-          floorPrice: 100,
-          currency: 'JPY'
-        },
-        mediaTypes: {
-          banner: {
-            size: [[300, 250]]
-          }
-        }
-      };
-    });
-
-    it('should return true when valid bid request is set', function() {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when bidder is not set to "mobsmart"', function() {
-      bid.bidder = 'bidder';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return true when params are not set', function() {
-      delete bid.params.floorPrice;
-      delete bid.params.currency;
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidRequests;
-    beforeEach(function() {
-      bidRequests = [
-        {
-          bidder: 'mobsmart',
-          adUnitCode: 'mobsmart-ad-code',
-          auctionId: 'auctionid-123',
-          bidId: 'bidid123',
-          bidRequestsCount: 1,
-          bidderRequestId: 'bidderrequestid123',
-          transactionId: 'transaction-id-123',
-          sizes: [[300, 250]],
-          requestId: 'requestid123',
-          params: {
-            floorPrice: 100,
-            currency: 'JPY'
-          },
-          mediaTypes: {
-            banner: {
-              size: [[300, 250]]
-            }
-          },
-          userId: {
-            pubcid: 'pubc-id-123'
-          }
-        }, {
-          bidder: 'mobsmart',
-          adUnitCode: 'mobsmart-ad-code2',
-          auctionId: 'auctionid-456',
-          bidId: 'bidid456',
-          bidRequestsCount: 1,
-          bidderRequestId: 'bidderrequestid456',
-          transactionId: 'transaction-id-456',
-          sizes: [[320, 50]],
-          requestId: 'requestid456',
-          params: {
-            floorPrice: 100,
-            currency: 'JPY'
-          },
-          mediaTypes: {
-            banner: {
-              size: [[320, 50]]
-            }
-          },
-          userId: {
-            pubcid: 'pubc-id-456'
-          }
-        }
-      ];
-    });
-
-    let bidderRequest = {
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-
-    it('should not contain a sizes when sizes is not set', function() {
-      delete bidRequests[0].sizes;
-      delete bidRequests[1].sizes;
-      let requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests[0].data.sizes).to.be.an('undefined');
-      expect(requests[1].data.sizes).to.be.an('undefined');
-    });
-
-    it('should not contain a userId when userId is not set', function() {
-      delete bidRequests[0].userId;
-      delete bidRequests[1].userId;
-      let requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests[0].data.userId).to.be.an('undefined');
-      expect(requests[1].data.userId).to.be.an('undefined');
-    });
-
-    it('should have a post method', function() {
-      let requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests[0].method).to.equal('POST');
-      expect(requests[1].method).to.equal('POST');
-    });
-
-    it('should contain a request id equals to the bid id', function() {
-      let requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(JSON.parse(requests[0].data).requestId).to.equal(bidRequests[0].bidId);
-      expect(JSON.parse(requests[1].data).requestId).to.equal(bidRequests[1].bidId);
-    });
-
-    it('should have an url that match the default endpoint', function() {
-      let requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests[0].url).to.equal('https://prebid.mobsmart.net/prebid/endpoint');
-      expect(requests[1].url).to.equal('https://prebid.mobsmart.net/prebid/endpoint');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let serverResponse;
-    beforeEach(function() {
-      serverResponse = {
-        body: {
-          'requestId': 'request-id',
-          'cpm': 100,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>ad</div>',
-          'ttl': 300,
-          'creativeId': 'creative-id',
-          'netRevenue': true,
-          'currency': 'JPY'
-        }
-      };
-    });
-
-    it('should return a valid response', () => {
-      var responses = spec.interpretResponse(serverResponse);
-      expect(responses).to.be.an('array').that.is.not.empty;
-
-      let response = responses[0];
-      expect(response).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-        'netRevenue', 'currency');
-      expect(response.requestId).to.equal('request-id');
-      expect(response.cpm).to.equal(100);
-      expect(response.width).to.equal(300);
-      expect(response.height).to.equal(250);
-      expect(response.ad).to.equal('<div>ad</div>');
-      expect(response.ttl).to.equal(300);
-      expect(response.creativeId).to.equal('creative-id');
-      expect(response.netRevenue).to.be.true;
-      expect(response.currency).to.equal('JPY');
-    });
-
-    it('should return an empty array when serverResponse is empty', () => {
-      serverResponse = {};
-      var responses = spec.interpretResponse(serverResponse);
-      expect(responses).to.deep.equal([]);
-    });
-  });
-
-  describe('getUserSyncs', function () {
-    it('should return nothing when sync is disabled', function () {
-      const syncOptions = {
-        'iframeEnabled': false,
-        'pixelEnabled': false
-      }
-      let syncs = spec.getUserSyncs(syncOptions);
-      expect(syncs).to.deep.equal([]);
-    });
-
-    it('should register iframe sync when iframe is enabled', function () {
-      const syncOptions = {
-        'iframeEnabled': true,
-        'pixelEnabled': false
-      }
-      let syncs = spec.getUserSyncs(syncOptions);
-      expect(syncs[0].type).to.equal('iframe');
-      expect(syncs[0].url).to.equal('https://tags.mobsmart.net/tags/iframe');
-    });
-
-    it('should register image sync when image is enabled', function () {
-      const syncOptions = {
-        'iframeEnabled': false,
-        'pixelEnabled': true
-      }
-      let syncs = spec.getUserSyncs(syncOptions);
-      expect(syncs[0].type).to.equal('image');
-      expect(syncs[0].url).to.equal('https://tags.mobsmart.net/tags/image');
-    });
-
-    it('should register iframe sync when iframe is enabled', function () {
-      const syncOptions = {
-        'iframeEnabled': true,
-        'pixelEnabled': true
-      }
-      let syncs = spec.getUserSyncs(syncOptions);
-      expect(syncs[0].type).to.equal('iframe');
-      expect(syncs[0].url).to.equal('https://tags.mobsmart.net/tags/iframe');
-    });
-  });
-});
diff --git a/test/spec/modules/multibid_spec.js b/test/spec/modules/multibid_spec.js
new file mode 100644
index 00000000000..eaf8fa33a66
--- /dev/null
+++ b/test/spec/modules/multibid_spec.js
@@ -0,0 +1,844 @@
+import {expect} from 'chai';
+import {
+  validateMultibid,
+  adjustBidderRequestsHook,
+  addBidResponseHook,
+  resetMultibidUnits,
+  sortByMultibid,
+  targetBidPoolHook,
+  resetMultiConfig
+} from 'modules/multibid/index.js';
+import {parse as parseQuery} from 'querystring';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+
+describe('multibid adapter', function () {
+  let bidArray = [{
+    'bidderCode': 'bidderA',
+    'requestId': '1c5f0a05d3629a',
+    'cpm': 75,
+    'originalCpm': 75,
+    'bidder': 'bidderA',
+  }, {
+    'bidderCode': 'bidderA',
+    'cpm': 52,
+    'requestId': '2e6j8s05r4363h',
+    'originalCpm': 52,
+    'bidder': 'bidderA',
+  }];
+  let bidCacheArray = [{
+    'bidderCode': 'bidderA',
+    'requestId': '1c5f0a05d3629a',
+    'cpm': 66,
+    'originalCpm': 66,
+    'bidder': 'bidderA',
+    'originalBidder': 'bidderA',
+    'multibidPrefix': 'bidA'
+  }, {
+    'bidderCode': 'bidderA',
+    'cpm': 38,
+    'requestId': '2e6j8s05r4363h',
+    'originalCpm': 38,
+    'bidder': 'bidderA',
+    'originalBidder': 'bidderA',
+    'multibidPrefix': 'bidA'
+  }];
+  let bidArrayAlt = [{
+    'bidderCode': 'bidderA',
+    'requestId': '1c5f0a05d3629a',
+    'cpm': 29,
+    'originalCpm': 29,
+    'bidder': 'bidderA'
+  }, {
+    'bidderCode': 'bidderA',
+    'cpm': 52,
+    'requestId': '2e6j8s05r4363h',
+    'originalCpm': 52,
+    'bidder': 'bidderA'
+  }, {
+    'bidderCode': 'bidderB',
+    'cpm': 3,
+    'requestId': '7g8h5j45l7654i',
+    'originalCpm': 3,
+    'bidder': 'bidderB'
+  }, {
+    'bidderCode': 'bidderC',
+    'cpm': 12,
+    'requestId': '9d7f4h56t6483u',
+    'originalCpm': 12,
+    'bidder': 'bidderC'
+  }];
+  let bidderRequests = [{
+    'bidderCode': 'bidderA',
+    'auctionId': 'e6bd4400-28fc-459b-9905-ad64d044daaa',
+    'bidderRequestId': '10e78266423c0e',
+    'bids': [{
+      'bidder': 'bidderA',
+      'params': {'placementId': 1234567},
+      'crumbs': {'pubcid': 'fb4cfc66-ff3d-4fda-bef8-3f2cb6fe9412'},
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 250]]
+        }
+      },
+      'adUnitCode': 'test.div',
+      'transactionId': 'c153f3da-84f0-4be8-95cb-0647c458bc60',
+      'sizes': [[300, 250]],
+      'bidId': '2408ef83b84c9d',
+      'bidderRequestId': '10e78266423c0e',
+      'auctionId': 'e6bd4400-28fc-459b-9905-ad64d044daaa',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }]
+  }, {
+    'bidderCode': 'bidderB',
+    'auctionId': 'e6bd4400-28fc-459b-9905-ad64d044daaa',
+    'bidderRequestId': '10e78266423c0e',
+    'bids': [{
+      'bidder': 'bidderB',
+      'params': {'placementId': 1234567},
+      'crumbs': {'pubcid': 'fb4cfc66-ff3d-4fda-bef8-3f2cb6fe9412'},
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 250]]
+        }
+      },
+      'adUnitCode': 'test.div',
+      'transactionId': 'c153f3da-84f0-4be8-95cb-0647c458bc60',
+      'sizes': [[300, 250]],
+      'bidId': '2408ef83b84c9d',
+      'bidderRequestId': '10e78266423c0e',
+      'auctionId': 'e6bd4400-28fc-459b-9905-ad64d044daaa',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }]
+  }];
+
+  afterEach(function () {
+    config.resetConfig();
+    resetMultiConfig();
+    resetMultibidUnits();
+  });
+
+  describe('adjustBidderRequestsHook', function () {
+    let result;
+    let callbackFn = function (bidderRequests) {
+      result = bidderRequests;
+    };
+
+    beforeEach(function() {
+      result = null;
+    });
+
+    it('does not modify bidderRequest when no multibid config exists', function () {
+      let bidRequests = [{...bidderRequests[0]}];
+
+      adjustBidderRequestsHook(callbackFn, bidRequests);
+
+      expect(result).to.not.equal(null);
+      expect(result).to.deep.equal(bidRequests);
+    });
+
+    it('does modify bidderRequest when multibid config exists', function () {
+      let bidRequests = [{...bidderRequests[0]}];
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2}]});
+
+      adjustBidderRequestsHook(callbackFn, [{...bidderRequests[0]}]);
+
+      expect(result).to.not.equal(null);
+      expect(result).to.not.deep.equal(bidRequests);
+      expect(result[0].bidLimit).to.equal(2);
+    });
+
+    it('does modify bidderRequest when multibid config exists using bidders array', function () {
+      let bidRequests = [{...bidderRequests[0]}];
+
+      config.setConfig({multibid: [{bidders: ['bidderA'], maxBids: 2}]});
+
+      adjustBidderRequestsHook(callbackFn, [{...bidderRequests[0]}]);
+
+      expect(result).to.not.equal(null);
+      expect(result).to.not.deep.equal(bidRequests);
+      expect(result[0].bidLimit).to.equal(2);
+    });
+
+    it('does only modifies bidderRequest when multibid config exists for bidder', function () {
+      let bidRequests = [{...bidderRequests[0]}, {...bidderRequests[1]}];
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2}]});
+
+      adjustBidderRequestsHook(callbackFn, [{...bidderRequests[0]}, {...bidderRequests[1]}]);
+
+      expect(result).to.not.equal(null);
+      expect(result[0]).to.not.deep.equal(bidRequests[0]);
+      expect(result[0].bidLimit).to.equal(2);
+      expect(result[1]).to.deep.equal(bidRequests[1]);
+      expect(result[1].bidLimit).to.equal(undefined);
+    });
+  });
+
+  describe('addBidResponseHook', function () {
+    let result;
+    let callbackFn = function (adUnitCode, bid) {
+      result = {
+        'adUnitCode': adUnitCode,
+        'bid': bid
+      };
+    };
+
+    beforeEach(function() {
+      result = null;
+    });
+
+    it('adds original bids and does not modify', function () {
+      let adUnitCode = 'test.div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+    });
+
+    it('modifies and adds both bids based on multibid configuration', function () {
+      let adUnitCode = 'test.div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      bids[1].multibidPrefix = 'bidA';
+      bids[1].originalBidder = 'bidderA';
+      bids[1].targetingBidder = 'bidA2';
+      bids[1].originalRequestId = '2e6j8s05r4363h';
+
+      delete bids[1].requestId;
+      delete result.bid.requestId;
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+    });
+
+    it('only modifies bids defined in the multibid configuration', function () {
+      let adUnitCode = 'test.div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      bids.push({
+        'bidderCode': 'bidderB',
+        'cpm': 33,
+        'requestId': '1j8s5f89y2345l',
+        'originalCpm': 33,
+        'bidder': 'bidderB',
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      bids[1].multibidPrefix = 'bidA';
+      bids[1].originalBidder = 'bidderA';
+      bids[1].targetingBidder = 'bidA2';
+      bids[1].originalRequestId = '2e6j8s05r4363h';
+      bids[1].requestId = result.bid.requestId;
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[2]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[2]);
+    });
+
+    it('only modifies and returns bids under limit for a specifc bidder in the multibid configuration', function () {
+      let adUnitCode = 'test.div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      bids.push({
+        'bidderCode': 'bidderA',
+        'cpm': 33,
+        'requestId': '1j8s5f89y2345l',
+        'originalCpm': 33,
+        'bidder': 'bidderA',
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      bids[1].multibidPrefix = 'bidA';
+      bids[1].originalBidder = 'bidderA';
+      bids[1].targetingBidder = 'bidA2';
+      bids[1].originalRequestId = '2e6j8s05r4363h';
+      bids[1].requestId = result.bid.requestId;
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[2]});
+
+      expect(result).to.equal(null);
+    });
+
+    it('if no prefix in multibid configuration, modifies and returns bids under limit without preifx property', function () {
+      let adUnitCode = 'test.div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      bids.push({
+        'bidderCode': 'bidderA',
+        'cpm': 33,
+        'requestId': '1j8s5f89y2345l',
+        'originalCpm': 33,
+        'bidder': 'bidderA',
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      bids[1].originalBidder = 'bidderA';
+      bids[1].originalRequestId = '2e6j8s05r4363h';
+      bids[1].requestId = result.bid.requestId;
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[2]});
+
+      expect(result).to.equal(null);
+    });
+
+    it('does not include extra bids if cpm is less than floor value', function () {
+      let adUnitCode = 'test.div';
+      let bids = [{...bidArrayAlt[1]}, {...bidArrayAlt[0]}, {...bidArrayAlt[2]}, {...bidArrayAlt[3]}];
+
+      bids.map(bid => {
+        bid.floorData = {
+          cpmAfterAdjustments: bid.cpm,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: false,
+            bidAdjustment: true
+          },
+          floorCurrency: 'USD',
+          floorRule: '*|banner',
+          floorRuleValue: 65,
+          floorValue: 65,
+          matchedFields: {
+            gptSlot: 'test.div',
+            mediaType: 'banner'
+          }
+        }
+
+        return bid;
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderA');
+      expect(result.bid.targetingBidder).to.equal(undefined);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      expect(result).to.equal(null);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[2]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderB');
+      expect(result.bid.targetingBidder).to.equal(undefined);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[3]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderC');
+      expect(result.bid.targetingBidder).to.equal(undefined);
+    });
+
+    it('does  include extra bids if cpm is not less than floor value', function () {
+      let adUnitCode = 'test.div';
+      let bids = [{...bidArrayAlt[1]}, {...bidArrayAlt[0]}];
+
+      bids.map(bid => {
+        bid.floorData = {
+          cpmAfterAdjustments: bid.cpm,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: false,
+            bidAdjustment: true
+          },
+          floorCurrency: 'USD',
+          floorRule: '*|banner',
+          floorRuleValue: 25,
+          floorValue: 25,
+          matchedFields: {
+            gptSlot: 'test.div',
+            mediaType: 'banner'
+          }
+        }
+
+        return bid;
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderA');
+      expect(result.bid.targetingBidder).to.equal(undefined);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test.div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderA');
+      expect(result.bid.targetingBidder).to.equal('bidA2');
+    });
+  });
+
+  describe('targetBidPoolHook', function () {
+    let result;
+    let bidResult;
+    let callbackFn = function (bidsReceived, highestCpmCallback, adUnitBidLimit = 0, hasModified = false) {
+      result = {
+        'bidsReceived': bidsReceived,
+        'adUnitBidLimit': adUnitBidLimit,
+        'hasModified': hasModified
+      };
+    };
+    let bidResponseCallback = function (adUnitCode, bid) {
+      bidResult = bid;
+    };
+
+    beforeEach(function() {
+      result = null;
+      bidResult = null;
+    });
+
+    it('it does not run filter on bidsReceived if no multibid configuration found', function () {
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+      targetBidPoolHook(callbackFn, bids, utils.getHighestCpm);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(2);
+      expect(result.bidsReceived).to.deep.equal(bids);
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(false);
+    });
+
+    it('it does filter on bidsReceived if multibid configuration found with no prefix', function () {
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2}]});
+
+      targetBidPoolHook(callbackFn, bids, utils.getHighestCpm);
+      bids.pop();
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(1);
+      expect(result.bidsReceived).to.deep.equal(bids);
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+
+    it('it sorts and creates dynamic alias on bidsReceived if multibid configuration found with prefix', function () {
+      let modifiedBids = [{...bidArray[1]}, {...bidArray[0]}].map(bid => {
+        addBidResponseHook(bidResponseCallback, 'test.div', {...bid});
+
+        return bidResult;
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      targetBidPoolHook(callbackFn, modifiedBids, utils.getHighestCpm);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(2);
+      expect(result.bidsReceived).to.deep.equal([modifiedBids[1], modifiedBids[0]]);
+      expect(result.bidsReceived[0].bidderCode).to.equal('bidderA');
+      expect(result.bidsReceived[0].bidder).to.equal('bidderA');
+      expect(result.bidsReceived[1].bidderCode).to.equal('bidA2');
+      expect(result.bidsReceived[1].bidder).to.equal('bidderA');
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+
+    it('it sorts by cpm treating dynamic alias as unique bid when no bid limit defined', function () {
+      let modifiedBids = [{...bidArrayAlt[0]}, {...bidArrayAlt[2]}, {...bidArrayAlt[3]}, {...bidArrayAlt[1]}].map(bid => {
+        addBidResponseHook(bidResponseCallback, 'test.div', {...bid});
+
+        return bidResult;
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      targetBidPoolHook(callbackFn, modifiedBids, utils.getHighestCpm);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(4);
+      expect(result.bidsReceived).to.deep.equal([modifiedBids[3], modifiedBids[0], modifiedBids[2], modifiedBids[1]]);
+      expect(result.bidsReceived[0].bidderCode).to.equal('bidderA');
+      expect(result.bidsReceived[0].bidder).to.equal('bidderA');
+      expect(result.bidsReceived[0].cpm).to.equal(52);
+      expect(result.bidsReceived[1].bidderCode).to.equal('bidA2');
+      expect(result.bidsReceived[1].bidder).to.equal('bidderA');
+      expect(result.bidsReceived[1].cpm).to.equal(29);
+      expect(result.bidsReceived[2].bidderCode).to.equal('bidderC');
+      expect(result.bidsReceived[2].bidder).to.equal('bidderC');
+      expect(result.bidsReceived[2].cpm).to.equal(12);
+      expect(result.bidsReceived[3].bidderCode).to.equal('bidderB');
+      expect(result.bidsReceived[3].bidder).to.equal('bidderB');
+      expect(result.bidsReceived[3].cpm).to.equal(3);
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+
+    it('it should filter out dynamic bid when bid limit is less than unique bid pool', function () {
+      let modifiedBids = [{...bidArrayAlt[0]}, {...bidArrayAlt[2]}, {...bidArrayAlt[3]}, {...bidArrayAlt[1]}].map(bid => {
+        addBidResponseHook(bidResponseCallback, 'test.div', {...bid});
+
+        return bidResult;
+      });
+
+      config.setConfig({ multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}] });
+
+      targetBidPoolHook(callbackFn, modifiedBids, utils.getHighestCpm, 3);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(3);
+      expect(result.bidsReceived).to.deep.equal([modifiedBids[3], modifiedBids[2], modifiedBids[1]]);
+      expect(result.bidsReceived[0].bidderCode).to.equal('bidderA');
+      expect(result.bidsReceived[1].bidderCode).to.equal('bidderC');
+      expect(result.bidsReceived[2].bidderCode).to.equal('bidderB');
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(3);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+
+    it('it should collect all bids from auction and bid cache then sort and filter', function () {
+      config.setConfig({ multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}] });
+
+      let modifiedBids = [{...bidArrayAlt[0]}, {...bidArrayAlt[2]}, {...bidArrayAlt[3]}, {...bidArrayAlt[1]}].map(bid => {
+        addBidResponseHook(bidResponseCallback, 'test.div', {...bid});
+
+        return bidResult;
+      });
+
+      let bidPool = [].concat.apply(modifiedBids, [{...bidCacheArray[0]}, {...bidCacheArray[1]}]);
+
+      expect(bidPool.length).to.equal(6);
+
+      targetBidPoolHook(callbackFn, bidPool, utils.getHighestCpm);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(4);
+      expect(result.bidsReceived).to.deep.equal([bidPool[4], bidPool[3], bidPool[2], bidPool[1]]);
+      expect(result.bidsReceived[0].bidderCode).to.equal('bidderA');
+      expect(result.bidsReceived[1].bidderCode).to.equal('bidA2');
+      expect(result.bidsReceived[2].bidderCode).to.equal('bidderC');
+      expect(result.bidsReceived[3].bidderCode).to.equal('bidderB');
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+  });
+
+  describe('validate multibid', function () {
+    it('should fail validation for missing bidder name in entry', function () {
+      let conf = [{maxBids: 1}];
+      let result = validateMultibid(conf);
+
+      expect(result).to.equal(false);
+    });
+
+    it('should pass validation on all multibid entries', function () {
+      let conf = [{bidder: 'bidderA', maxBids: 1}, {bidder: 'bidderB', maxBids: 2}];
+      let result = validateMultibid(conf);
+
+      expect(result).to.equal(true);
+    });
+
+    it('should fail validation for maxbids less than 1 in entry', function () {
+      let conf = [{bidder: 'bidderA', maxBids: 0}, {bidder: 'bidderB', maxBids: 2}];
+      let result = validateMultibid(conf);
+
+      expect(result).to.equal(false);
+    });
+
+    it('should fail validation for maxbids greater than 9 in entry', function () {
+      let conf = [{bidder: 'bidderA', maxBids: 10}, {bidder: 'bidderB', maxBids: 2}];
+      let result = validateMultibid(conf);
+
+      expect(result).to.equal(false);
+    });
+
+    it('should add multbid entries to global config', function () {
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 1}]});
+      let conf = config.getConfig('multibid');
+
+      expect(conf).to.deep.equal([{bidder: 'bidderA', maxBids: 1}]);
+    });
+
+    it('should modify multbid entries and add to global config', function () {
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 0}, {bidder: 'bidderB', maxBids: 15}]});
+      let conf = config.getConfig('multibid');
+
+      expect(conf).to.deep.equal([{bidder: 'bidderA', maxBids: 1}, {bidder: 'bidderB', maxBids: 9}]);
+    });
+
+    it('should filter multbid entry and add modified to global config', function () {
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 0}, {maxBids: 15}]});
+      let conf = config.getConfig('multibid');
+
+      expect(conf.length).to.equal(1);
+      expect(conf).to.deep.equal([{bidder: 'bidderA', maxBids: 1}]);
+    });
+  });
+
+  describe('sort multibid', function () {
+    it('should not alter order', function () {
+      let bids = [{
+        'bidderCode': 'bidderA',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidA2',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }];
+
+      let expected = [{
+        'bidderCode': 'bidderA',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidA2',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }];
+      let result = bids.sort(sortByMultibid);
+
+      expect(result).to.deep.equal(expected);
+    });
+
+    it('should sort dynamic alias bidders to end', function () {
+      let bids = [{
+        'bidderCode': 'bidA2',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidderA',
+        'cpm': 22,
+        'originalCpm': 22,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidderB',
+        'cpm': 4,
+        'originalCpm': 4,
+        'multibidPrefix': 'bidB',
+        'originalBidder': 'bidderB',
+        'bidder': 'bidderB',
+      }, {
+        'bidderCode': 'bidB',
+        'cpm': 2,
+        'originalCpm': 2,
+        'multibidPrefix': 'bidB',
+        'originalBidder': 'bidderB',
+        'bidder': 'bidderB',
+      }];
+      let expected = [{
+        'bidderCode': 'bidderA',
+        'cpm': 22,
+        'originalCpm': 22,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidderB',
+        'cpm': 4,
+        'originalCpm': 4,
+        'multibidPrefix': 'bidB',
+        'originalBidder': 'bidderB',
+        'bidder': 'bidderB',
+      }, {
+        'bidderCode': 'bidA2',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidB',
+        'cpm': 2,
+        'originalCpm': 2,
+        'multibidPrefix': 'bidB',
+        'originalBidder': 'bidderB',
+        'bidder': 'bidderB',
+      }];
+      let result = bids.sort(sortByMultibid);
+
+      expect(result).to.deep.equal(expected);
+    });
+  });
+});
diff --git a/test/spec/modules/mwOpenLinkIdSystem_spec.js b/test/spec/modules/mwOpenLinkIdSystem_spec.js
new file mode 100644
index 00000000000..fb082b8cd16
--- /dev/null
+++ b/test/spec/modules/mwOpenLinkIdSystem_spec.js
@@ -0,0 +1,20 @@
+import { writeCookie, mwOpenLinkIdSubModule } from 'modules/mwOpenLinkIdSystem.js';
+
+const P_CONFIG_MOCK = {
+  params: {
+    accountId: '123',
+    partnerId: '123'
+  }
+};
+
+describe('mwOpenLinkId module', function () {
+  beforeEach(function() {
+    writeCookie('');
+  });
+
+  it('getId() should return a MediaWallah openLink Id when the MediaWallah openLink first party cookie exists', function () {
+    writeCookie({eid: 'XX-YY-ZZ-123'});
+    const id = mwOpenLinkIdSubModule.getId(P_CONFIG_MOCK);
+    expect(id).to.be.deep.equal({id: {eid: 'XX-YY-ZZ-123'}});
+  });
+});
diff --git a/test/spec/modules/mytargetBidAdapter_spec.js b/test/spec/modules/mytargetBidAdapter_spec.js
index ea998303fe3..8880efd3d7c 100644
--- a/test/spec/modules/mytargetBidAdapter_spec.js
+++ b/test/spec/modules/mytargetBidAdapter_spec.js
@@ -1,6 +1,5 @@
 import { expect } from 'chai';
-import { config } from 'src/config.js';
-import { spec } from 'modules/mytargetBidAdapter.js';
+import { spec } from 'modules/mytargetBidAdapter';
 
 describe('MyTarget Adapter', function() {
   describe('isBidRequestValid', function () {
@@ -47,7 +46,7 @@ describe('MyTarget Adapter', function() {
     ];
     let bidderRequest = {
       refererInfo: {
-        referer: 'https://example.com?param=value'
+        page: 'https://example.com?param=value'
       }
     };
 
@@ -55,7 +54,7 @@ describe('MyTarget Adapter', function() {
 
     it('should build single POST request for multiple bids', function() {
       expect(bidRequest.method).to.equal('POST');
-      expect(bidRequest.url).to.equal('https://ad.mail.ru/hbid_prebid/');
+      expect(bidRequest.url).to.equal('//ad.mail.ru/hbid_prebid/');
       expect(bidRequest.data).to.be.an('object');
       expect(bidRequest.data.places).to.be.an('array');
       expect(bidRequest.data.places).to.have.lengthOf(2);
@@ -115,74 +114,45 @@ describe('MyTarget Adapter', function() {
       expect(settings.windowSize.width).to.equal(window.screen.width);
       expect(settings.windowSize.height).to.equal(window.screen.height);
     });
-
-    it('should pass currency from currency.adServerCurrency', function() {
-      const configStub = sinon.stub(config, 'getConfig').callsFake(
-        key => key === 'currency.adServerCurrency' ? 'USD' : '');
-
-      let bidRequest = spec.buildRequests(bidRequests, bidderRequest);
-      let settings = bidRequest.data.settings;
-
-      expect(settings).to.be.an('object');
-      expect(settings.currency).to.equal('USD');
-      expect(settings.windowSize).to.be.an('object');
-      expect(settings.windowSize.width).to.equal(window.screen.width);
-      expect(settings.windowSize.height).to.equal(window.screen.height);
-
-      configStub.restore();
-    });
-
-    it('should ignore currency other than "RUB" or "USD"', function() {
-      const configStub = sinon.stub(config, 'getConfig').callsFake(
-        key => key === 'currency.adServerCurrency' ? 'EUR' : '');
-
-      let bidRequest = spec.buildRequests(bidRequests, bidderRequest);
-      let settings = bidRequest.data.settings;
-
-      expect(settings).to.be.an('object');
-      expect(settings.currency).to.equal('RUB');
-
-      configStub.restore();
-    });
   });
 
   describe('interpretResponse', function () {
     let serverResponse = {
       body: {
         'bidder_status':
-       [
-         {
-           'bidder': 'mail.ru',
-           'response_time_ms': 100,
-           'num_bids': 2
-         }
-       ],
+          [
+            {
+              'bidder': 'mail.ru',
+              'response_time_ms': 100,
+              'num_bids': 2
+            }
+          ],
         'bids':
-        [
-          {
-            'displayUrl': 'https://ad.mail.ru/hbid_imp/12345',
-            'size':
+          [
             {
-              'height': '400',
-              'width': '240'
+              'displayUrl': 'https://ad.mail.ru/hbid_imp/12345',
+              'size':
+                {
+                  'height': '400',
+                  'width': '240'
+                },
+              'id': '1',
+              'currency': 'RUB',
+              'price': 100,
+              'ttl': 360,
+              'creativeId': '123456'
             },
-            'id': '1',
-            'currency': 'RUB',
-            'price': 100,
-            'ttl': 360,
-            'creativeId': '123456'
-          },
-          {
-            'adm': '<p>Ad</p>',
-            'size':
             {
-              'height': '250',
-              'width': '300'
-            },
-            'id': '2',
-            'price': 200
-          }
-        ]
+              'adm': '<p>Ad</p>',
+              'size':
+                {
+                  'height': '250',
+                  'width': '300'
+                },
+              'id': '2',
+              'price': 200
+            }
+          ]
       }
     };
 
diff --git a/test/spec/modules/nafdigitalBidAdapter_spec.js b/test/spec/modules/nafdigitalBidAdapter_spec.js
deleted file mode 100644
index c8ffb9fbbaf..00000000000
--- a/test/spec/modules/nafdigitalBidAdapter_spec.js
+++ /dev/null
@@ -1,283 +0,0 @@
-import { expect } from 'chai';
-import * as utils from 'src/utils.js';
-import { spec } from 'modules/nafdigitalBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-const URL = 'https://nafdigitalbidder.com/hb';
-
-describe('nafdigitalBidAdapter', function() {
-  const adapter = newBidder(spec);
-  let element, win;
-  let bidRequests;
-  let sandbox;
-
-  beforeEach(function() {
-    element = {
-      x: 0,
-      y: 0,
-
-      width: 0,
-      height: 0,
-
-      getBoundingClientRect: () => {
-        return {
-          width: element.width,
-          height: element.height,
-
-          left: element.x,
-          top: element.y,
-          right: element.x + element.width,
-          bottom: element.y + element.height
-        };
-      }
-    };
-    win = {
-      document: {
-        visibilityState: 'visible'
-      },
-
-      innerWidth: 800,
-      innerHeight: 600
-    };
-    bidRequests = [{
-      'bidder': 'nafdigital',
-      'params': {
-        'publisherId': 1234567
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250],
-        [300, 600]
-      ],
-      'bidId': '5fb26ac22bde4',
-      'bidderRequestId': '4bf93aeb730cb9',
-      'auctionId': 'ffe9a1f7-7b67-4bda-a8e0-9ee5dc9f442e'
-    }];
-
-    sandbox = sinon.sandbox.create();
-    sandbox.stub(document, 'getElementById').withArgs('adunit-code').returns(element);
-    sandbox.stub(utils, 'getWindowTop').returns(win);
-    sandbox.stub(utils, 'getWindowSelf').returns(win);
-  });
-
-  afterEach(function() {
-    sandbox.restore();
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'nafdigital',
-      'params': {
-        'publisherId': 1234567
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250],
-        [300, 600]
-      ],
-      'bidId': '5fb26ac22bde4',
-      'bidderRequestId': '4bf93aeb730cb9',
-      'auctionId': 'ffe9a1f7-7b67-4bda-a8e0-9ee5dc9f442e',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when tagid not passed correctly', function () {
-      bid.params.publisherId = undefined;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when require params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('sends bid request to our endpoint via POST', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.method).to.equal('POST');
-    });
-
-    it('request url should match our endpoint url', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal(URL);
-    });
-
-    it('sets the proper banner object', function() {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
-    });
-
-    it('accepts a single array as a size', function() {
-      bidRequests[0].sizes = [300, 250];
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}]);
-    });
-
-    it('sends bidfloor param if present', function () {
-      bidRequests[0].params.bidFloor = 0.05;
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].bidfloor).to.equal(0.05);
-    });
-
-    it('sends tagid', function () {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].tagid).to.equal('adunit-code');
-    });
-
-    it('sends publisher id', function () {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.site.publisher.id).to.equal(1234567);
-    });
-
-    context('when element is fully in view', function() {
-      it('returns 100', function() {
-        Object.assign(element, { width: 600, height: 400 });
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(100);
-      });
-    });
-
-    context('when element is out of view', function() {
-      it('returns 0', function() {
-        Object.assign(element, { x: -300, y: 0, width: 207, height: 320 });
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(0);
-      });
-    });
-
-    context('when element is partially in view', function() {
-      it('returns percentage', function() {
-        Object.assign(element, { width: 800, height: 800 });
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(75);
-      });
-    });
-
-    context('when width or height of the element is zero', function() {
-      it('try to use alternative values', function() {
-        Object.assign(element, { width: 0, height: 0 });
-        bidRequests[0].sizes = [[800, 2400]];
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(25);
-      });
-    });
-
-    context('when nested iframes', function() {
-      it('returns \'na\'', function() {
-        Object.assign(element, { width: 600, height: 400 });
-
-        utils.getWindowTop.restore();
-        utils.getWindowSelf.restore();
-        sandbox.stub(utils, 'getWindowTop').returns(win);
-        sandbox.stub(utils, 'getWindowSelf').returns({});
-
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal('na');
-      });
-    });
-
-    context('when tab is inactive', function() {
-      it('returns 0', function() {
-        Object.assign(element, { width: 600, height: 400 });
-
-        utils.getWindowTop.restore();
-        win.document.visibilityState = 'hidden';
-        sandbox.stub(utils, 'getWindowTop').returns(win);
-
-        const request = spec.buildRequests(bidRequests);
-        const payload = JSON.parse(request.data);
-        expect(payload.imp[0].banner.ext.viewability).to.equal(0);
-      });
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let response;
-    beforeEach(function () {
-      response = {
-        body: {
-          'id': '37386aade21a71',
-          'seatbid': [{
-            'bid': [{
-              'id': '376874781',
-              'impid': '283a9f4cd2415d',
-              'price': 0.35743275,
-              'nurl': '<!-- NURL -->',
-              'adm': '<!-- Creative -->',
-              'w': 300,
-              'h': 250
-            }]
-          }]
-        }
-      };
-    });
-
-    it('should get the correct bid response', function () {
-      let expectedResponse = [{
-        'requestId': '283a9f4cd2415d',
-        'cpm': 0.35743275,
-        'width': 300,
-        'height': 250,
-        'creativeId': '376874781',
-        'currency': 'USD',
-        'netRevenue': true,
-        'mediaType': 'banner',
-        'ad': `<!-- Creative --><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="${encodeURI('<!-- NURL -->')}"></div>`,
-        'ttl': 60
-      }];
-
-      let result = spec.interpretResponse(response);
-      expect(result[0]).to.deep.equal(expectedResponse[0]);
-    });
-
-    it('crid should default to the bid id if not on the response', function () {
-      let expectedResponse = [{
-        'requestId': '283a9f4cd2415d',
-        'cpm': 0.35743275,
-        'width': 300,
-        'height': 250,
-        'creativeId': response.body.seatbid[0].bid[0].id,
-        'currency': 'USD',
-        'netRevenue': true,
-        'mediaType': 'banner',
-        'ad': `<!-- Creative --><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="${encodeURI('<!-- NURL -->')}"></div>`,
-        'ttl': 60
-      }];
-
-      let result = spec.interpretResponse(response);
-      expect(result[0]).to.deep.equal(expectedResponse[0]);
-    });
-
-    it('handles empty bid response', function () {
-      let response = {
-        body: ''
-      };
-      let result = spec.interpretResponse(response);
-      expect(result.length).to.equal(0);
-    });
-  });
-
-  describe('getUserSyncs ', () => {
-    let syncOptions = {iframeEnabled: true, pixelEnabled: true};
-
-    it('should not return', () => {
-      let returnStatement = spec.getUserSyncs(syncOptions, []);
-      expect(returnStatement).to.be.empty;
-    });
-  });
-});
diff --git a/test/spec/modules/nanointeractiveBidAdapter_spec.js b/test/spec/modules/nanointeractiveBidAdapter_spec.js
deleted file mode 100644
index 715a26a4597..00000000000
--- a/test/spec/modules/nanointeractiveBidAdapter_spec.js
+++ /dev/null
@@ -1,466 +0,0 @@
-import {expect} from 'chai';
-import * as utils from 'src/utils.js';
-import * as sinon from 'sinon';
-
-import {
-  BIDDER_CODE,
-  CATEGORY,
-  CATEGORY_NAME,
-  SSP_PLACEMENT_ID,
-  END_POINT_URL,
-  NQ,
-  NQ_NAME,
-  REF,
-  spec,
-  SUB_ID
-} from '../../../modules/nanointeractiveBidAdapter.js';
-
-describe('nanointeractive adapter tests', function () {
-  const SIZES_PARAM = 'sizes';
-  const BID_ID_PARAM = 'bidId';
-  const BID_ID_VALUE = '24a1c9ec270973';
-  const DATA_PARTNER_PIXEL_ID_VALUE = 'testPID';
-  const NQ_VALUE = 'rumpelstiltskin';
-  const NQ_NAME_QUERY_PARAM = 'nqName';
-  const CATEGORY_VALUE = 'some category';
-  const CATEGORY_NAME_QUERY_PARAM = 'catName';
-  const SUB_ID_VALUE = '123';
-  const REF_NO_VALUE = 'none';
-  const REF_OTHER_VALUE = 'other';
-  const WIDTH1 = 300;
-  const HEIGHT1 = 250;
-  const WIDTH2 = 468;
-  const HEIGHT2 = 60;
-  const SIZES_VALUE = [[WIDTH1, HEIGHT1], [WIDTH2, HEIGHT2]];
-  const AD = '<script type="text/javascript" src="https://trc.audiencemanager.de/ad/?pl=58c2829beb0a193456047a27&cb=${CACHEBUSTER}&tc=${CLICK_URL_ENC}"></script> <noscript> <a href="https://trc.audiencemanager.de/ad/?t=c&pl=58c2829beb0a193456047a27&cb=${CACHEBUSTER}&tc=${CLICK_URL_ENC}"> <img src="https://trc.audiencemanager.de/ad/?t=i&pl=58c2829beb0a193456047a27&cb=${CACHEBUSTER}" alt="Click Here" border="0"> </a> </noscript>';
-  const CPM = 1;
-
-  function getBidRequest(params) {
-    return {
-      bidder: BIDDER_CODE,
-      params: params,
-      placementCode: 'div-gpt-ad-1460505748561-0',
-      transactionId: 'ee335735-ddd3-41f2-b6c6-e8aa99f81c0f',
-      [SIZES_PARAM]: SIZES_VALUE,
-      [BID_ID_PARAM]: BID_ID_VALUE,
-      bidderRequestId: '189135372acd55',
-      auctionId: 'ac15bb68-4ef0-477f-93f4-de91c47f00a9'
-    };
-  }
-
-  describe('NanoAdapter', function () {
-    let nanoBidAdapter = spec;
-
-    describe('Methods', function () {
-      it('Test isBidRequestValid() with valid param(s): pid', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nq', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nq, category', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ,
-          [CATEGORY]: CATEGORY_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nq, categoryName', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ,
-          [CATEGORY_NAME_QUERY_PARAM]: CATEGORY_NAME_QUERY_PARAM,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nq, subId', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ,
-          [SUB_ID]: SUB_ID_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nqName', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ_NAME]: NQ_NAME_QUERY_PARAM,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nqName, category', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ_NAME]: NQ_NAME_QUERY_PARAM,
-          [CATEGORY]: CATEGORY_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nqName, categoryName', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ_NAME]: NQ_NAME_QUERY_PARAM,
-          [CATEGORY_NAME_QUERY_PARAM]: CATEGORY_NAME_QUERY_PARAM,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nqName, subId', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ_NAME]: NQ_NAME_QUERY_PARAM,
-          [SUB_ID]: SUB_ID_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, category', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, category, subId', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, subId', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nq, category, subId', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nqName, categoryName, subId', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ_NAME]: NQ_NAME_QUERY_PARAM,
-          [CATEGORY_NAME]: CATEGORY_NAME_QUERY_PARAM,
-          [SUB_ID]: SUB_ID_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nq, category, subId, ref (value none)', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-          [REF]: REF_NO_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with valid param(s): pid, nq, category, subId, ref (value other)', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-          [REF]: REF_OTHER_VALUE,
-        }))).to.equal(true);
-      });
-      it('Test isBidRequestValid() with invalid param(s): empty', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({}))).to.equal(false);
-      });
-      it('Test isBidRequestValid() with invalid param(s): pid missing', function () {
-        expect(nanoBidAdapter.isBidRequestValid(getBidRequest({
-          [NQ]: NQ_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-        }))).to.equal(false);
-      });
-
-      let sandbox;
-
-      function getMocks() {
-        let mockOriginAddress = 'https://localhost';
-        let mockRefAddress = 'https://some-ref.test';
-        return {
-          'windowLocationAddress': mockRefAddress,
-          'originAddress': mockOriginAddress,
-          'refAddress': '',
-        };
-      }
-
-      function setUpMocks() {
-        sinon.sandbox.restore();
-        sandbox = sinon.sandbox.create();
-        sandbox.stub(utils, 'getOrigin').callsFake(() => getMocks()['originAddress']);
-        sandbox.stub(utils, 'deepAccess').callsFake(() => getMocks()['windowLocationAddress']);
-
-        sandbox.stub(utils, 'getParameterByName').callsFake((arg) => {
-          switch (arg) {
-            case CATEGORY_NAME_QUERY_PARAM:
-              return CATEGORY_VALUE;
-            case NQ_NAME_QUERY_PARAM:
-              return NQ_VALUE;
-          }
-        });
-      }
-
-      function assert(
-        request,
-        expectedPid,
-        expectedNq,
-        expectedCategory,
-        expectedSubId
-      ) {
-        const requestData = JSON.parse(request.data);
-
-        expect(request.method).to.equal('POST');
-        expect(request.url).to.equal(END_POINT_URL + '/hb');
-        expect(requestData[0].pid).to.equal(expectedPid);
-        expect(requestData[0].nq.toString()).to.equal(expectedNq.toString());
-        expect(requestData[0].category.toString()).to.equal(expectedCategory.toString());
-        expect(requestData[0].subId).to.equal(expectedSubId);
-      }
-
-      function tearDownMocks() {
-        sandbox.restore();
-      }
-
-      it('Test buildRequest() - pid', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [null];
-        let expectedCategory = [null];
-        let expectedSubId = null;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, nq', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [NQ_VALUE];
-        let expectedCategory = [null];
-        let expectedSubId = null;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, nq, category', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [NQ_VALUE];
-        let expectedCategory = [CATEGORY_VALUE];
-        let expectedSubId = null;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, nq, categoryName', function () {
-        setUpMocks();
-
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ_VALUE,
-          [CATEGORY_NAME]: CATEGORY_NAME_QUERY_PARAM,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [NQ_VALUE];
-        let expectedCategory = [CATEGORY_VALUE];
-        let expectedSubId = null;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, nq, subId', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [NQ_VALUE];
-        let expectedCategory = [null];
-        let expectedSubId = SUB_ID_VALUE;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, category', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [null];
-        let expectedCategory = [CATEGORY_VALUE];
-        let expectedSubId = null;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, category, subId', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [null];
-        let expectedCategory = [CATEGORY_VALUE];
-        let expectedSubId = SUB_ID_VALUE;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, subId', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [null];
-        let expectedCategory = [null];
-        let expectedSubId = SUB_ID_VALUE;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, nq, category, subId', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ]: NQ_VALUE,
-          [CATEGORY]: CATEGORY_VALUE,
-          [SUB_ID]: SUB_ID_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [NQ_VALUE];
-        let expectedCategory = [CATEGORY_VALUE];
-        let expectedSubId = SUB_ID_VALUE;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test buildRequest() - pid, nqName, categoryName, subId', function () {
-        setUpMocks();
-        let requestParams = {
-          [SSP_PLACEMENT_ID]: DATA_PARTNER_PIXEL_ID_VALUE,
-          [NQ_NAME]: NQ_NAME_QUERY_PARAM,
-          [CATEGORY_NAME]: CATEGORY_NAME_QUERY_PARAM,
-          [SUB_ID]: SUB_ID_VALUE,
-        };
-        let expectedPid = DATA_PARTNER_PIXEL_ID_VALUE;
-        let expectedNq = [NQ_VALUE];
-        let expectedCategory = [CATEGORY_VALUE];
-        let expectedSubId = SUB_ID_VALUE;
-
-        let request = nanoBidAdapter.buildRequests([getBidRequest(requestParams)]);
-
-        assert(request, expectedPid, expectedNq, expectedCategory, expectedSubId);
-        tearDownMocks();
-      });
-      it('Test interpretResponse() length', function () {
-        let bids = nanoBidAdapter.interpretResponse({
-          body: [
-            // valid
-            {
-              id: '24a1c9ec270973',
-              cpm: CPM,
-              width: WIDTH1,
-              height: HEIGHT1,
-              ad: AD,
-              ttl: 360,
-              creativeId: 'TEST_ID',
-              netRevenue: false,
-              currency: 'EUR',
-            },
-            // invalid
-            {
-              id: '24a1c9ec270973',
-              cpm: null,
-              width: WIDTH1,
-              height: HEIGHT1,
-              ad: AD,
-              ttl: 360,
-              creativeId: 'TEST_ID',
-              netRevenue: false,
-              currency: 'EUR',
-            }
-          ]
-        });
-        expect(bids.length).to.equal(1);
-      });
-      it('Test interpretResponse() bids', function () {
-        let bid = nanoBidAdapter.interpretResponse({
-          body: [
-            // valid
-            {
-              id: '24a1c9ec270973',
-              cpm: CPM,
-              width: WIDTH1,
-              height: HEIGHT1,
-              ad: AD,
-              ttl: 360,
-              creativeId: 'TEST_ID',
-              netRevenue: false,
-              currency: 'EUR',
-            },
-            // invalid
-            {
-              id: '24a1c9ec270973',
-              cpm: null,
-              width: WIDTH1,
-              height: HEIGHT1,
-              ad: AD,
-              ttl: 360,
-              creativeId: 'TEST_ID',
-              netRevenue: false,
-              currency: 'EUR',
-            }
-          ]
-        })[0];
-        expect(bid.requestId).to.equal('24a1c9ec270973');
-        expect(bid.cpm).to.equal(CPM);
-        expect(bid.width).to.equal(WIDTH1);
-        expect(bid.height).to.equal(HEIGHT1);
-        expect(bid.ad).to.equal(AD);
-        expect(bid.ttl).to.equal(360);
-        expect(bid.creativeId).to.equal('TEST_ID');
-        expect(bid.currency).to.equal('EUR');
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/nasmediaAdmixerBidAdapter_spec.js b/test/spec/modules/nasmediaAdmixerBidAdapter_spec.js
deleted file mode 100644
index 4731b1a77d3..00000000000
--- a/test/spec/modules/nasmediaAdmixerBidAdapter_spec.js
+++ /dev/null
@@ -1,143 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/nasmediaAdmixerBidAdapter.js';
-import {newBidder} from 'src/adapters/bidderFactory.js';
-
-describe('nasmediaAdmixerBidAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    const bid = {
-      'bidder': 'nasmediaAdmixer',
-      'params': {
-        'media_key': 'media_key',
-        'adunit_id': 'adunit_id',
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250]],
-      'bidId': '3361d01e67dbd6',
-      'bidderRequestId': '2b60dcd392628a',
-      'auctionId': '124cb070528662',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      const bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'media_key': '',
-        'adunit_id': '',
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bidRequests = [
-      {
-        'bidder': 'nasmediaAdmixer',
-        'params': {
-          'media_key': '19038695',
-          'adunit_id': '24190632',
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250]],
-        'bidId': '3361d01e67dbd6',
-        'bidderRequestId': '2b60dcd392628a',
-        'auctionId': '124cb070528662',
-      }
-    ];
-    const bidderRequest = {refererInfo: {referer: 'https://example.com'}};
-
-    it('sends bid request to url via GET', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
-      expect(request.method).to.equal('GET');
-      expect(request.url).to.match(new RegExp(`https://adn.admixer.co.kr`));
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const response = {
-      'body': {
-        'bidder': 'nasmediaAdmixer',
-        'req_id': '861a8e7952c82c',
-        'error_code': 0,
-        'error_msg': 'OK',
-        'body': [{
-          'ad_id': '20049',
-          'width': 300,
-          'height': 250,
-          'currency': 'USD',
-          'cpm': 1.769221,
-          'ad': '<!-- Creative -->'
-        }]
-      },
-      'headers': {
-        'get': function () {
-        }
-      }
-    };
-
-    const bidRequest = {
-      'bidder': 'nasmediaAdmixer',
-      'params': {
-        'media_key': '19038695',
-        'adunit_id': '24190632',
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [320, 480]],
-      'bidId': '31300c8b9697cd',
-      'bidderRequestId': '2bf570adcf83fa',
-      'auctionId': '169827a33f03cc',
-    };
-
-    it('should get correct bid response', function () {
-      const expectedResponse = [
-        {
-          'requestId': '861a8e7952c82c',
-          'cpm': 1.769221,
-          'currency': 'USD',
-          'width': 300,
-          'height': 250,
-          'ad': '<!-- Creative -->',
-          'creativeId': '20049',
-          'ttl': 360,
-          'netRevenue': false
-        }
-      ];
-
-      const result = spec.interpretResponse(response, bidRequest);
-      expect(result).to.have.lengthOf(1);
-      let resultKeys = Object.keys(result[0]);
-      expect(resultKeys.sort()).to.deep.equal(Object.keys(expectedResponse[0]).sort());
-      resultKeys.forEach(function (k) {
-        if (k === 'ad') {
-          expect(result[0][k]).to.match(/<!-- Creative -->$/);
-        } else {
-          expect(result[0][k]).to.equal(expectedResponse[0][k]);
-        }
-      });
-    });
-
-    it('handles nobid responses', function () {
-      response.body = {
-        'bidder': 'nasmediaAdmixer',
-        'req_id': '861a8e7952c82c',
-        'error_code': 0,
-        'error_msg': 'OK',
-        'body': []
-      };
-
-      const result = spec.interpretResponse(response, bidRequest);
-      expect(result).to.have.lengthOf(0);
-    });
-  });
-});
diff --git a/test/spec/modules/nativoBidAdapter_spec.js b/test/spec/modules/nativoBidAdapter_spec.js
new file mode 100644
index 00000000000..4d70e6f7071
--- /dev/null
+++ b/test/spec/modules/nativoBidAdapter_spec.js
@@ -0,0 +1,733 @@
+import { expect } from 'chai'
+import { spec, BidDataMap } from 'modules/nativoBidAdapter.js'
+import {
+  getSizeWildcardPrice,
+  getMediaWildcardPrices,
+  sizeToString,
+  parseFloorPriceData,
+  getPageUrlFromBidRequest,
+  hasProtocol,
+  addProtocol,
+} from '../../../modules/nativoBidAdapter'
+
+describe('bidDataMap', function () {
+  it('Should fail gracefully if no key value pairs have been added and no key is sent', function () {
+    const bdm = new BidDataMap()
+    const bidData = bdm.getBidData()
+    expect(bidData).to.be.undefined
+  })
+
+  it('Should fail gracefully if no key value pairs have been added', function () {
+    const bdm = new BidDataMap()
+    const bidData = bdm.getBidData('testKey')
+    expect(bidData).to.be.undefined
+  })
+
+  it('Should add bid data to corresponding keys', function () {
+    const keys = ['key1', 'anotherKey', 6]
+    const bidData = { prop: 'value' }
+
+    const bdm = new BidDataMap()
+    bdm.addBidData(bidData, keys)
+    const bidDataKey0 = bdm.getBidData(keys[0])
+    const bidDataKey1 = bdm.getBidData(keys[1])
+    const bidDataKey2 = bdm.getBidData(keys[2])
+    expect(bidDataKey0).to.be.equal(bidData)
+    expect(bidDataKey1).to.be.equal(bidData)
+    expect(bidDataKey2).to.be.equal(bidData)
+  })
+})
+
+describe('nativoBidAdapterTests', function () {
+  describe('isBidRequestValid', function () {
+    let bid = {
+      bidder: 'nativo',
+    }
+
+    it('should return true if no params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should return true for valid placementId value', function () {
+      bid.params = {
+        placementId: '10433394',
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should return true for valid placementId value', function () {
+      bid.params = {
+        placementId: 10433394,
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should return false for invalid placementId value', function () {
+      bid.params = {
+        placementId: true,
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+
+    it('should return true for valid placementId value', function () {
+      bid.params = {
+        url: 'www.test.com',
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should return false for invalid placementId value', function () {
+      bid.params = {
+        url: 4567890,
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    const bidRequest = {
+      bidder: 'nativo',
+      params: {
+        placementId: '10433394',
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [
+        [300, 250],
+        [300, 600],
+      ],
+      bidId: '27b02036ccfa6e',
+      bidderRequestId: '1372cd8bd8d6a8',
+      auctionId: 'cfc467e4-2707-48da-becb-bcaab0b2c114',
+      transactionId: '3b36e7e0-0c3e-4006-a279-a741239154ff',
+    }
+    const bidRequestString = JSON.stringify(bidRequest)
+    let bidRequests
+
+    beforeEach(function () {
+      // Clone bidRequest each time
+      bidRequests = [JSON.parse(bidRequestString)]
+    })
+
+    it('url should contain query string parameters', function () {
+      const request = spec.buildRequests(bidRequests, {
+        bidderRequestId: 123456,
+        refererInfo: {
+          referer: 'https://www.test.com',
+        },
+      })
+
+      expect(request.url).to.exist
+      expect(request.url).to.be.a('string')
+
+      expect(request.url).to.include('?')
+      expect(request.url).to.include('ntv_ptd')
+      expect(request.url).to.include('ntv_pb_rid')
+      expect(request.url).to.include('ntv_ppc')
+      expect(request.url).to.include('ntv_url')
+      expect(request.url).to.include('ntv_dbr')
+      expect(request.url).to.include('ntv_pas')
+    })
+
+    it('ntv_url should contain query params', function () {
+      const request = spec.buildRequests(bidRequests, {
+        bidderRequestId: 123456,
+        refererInfo: {
+          location: 'https://www.test.com?queryTest=true',
+        },
+      })
+      console.log(request.url) // eslint-disable-line no-console
+      expect(request.url).to.include(encodeURIComponent('?queryTest=true'))
+    })
+
+    it('ntv_url parameter should NOT be empty even if the utl parameter was set as an empty value', function () {
+      bidRequests[0].params.url = ''
+      const request = spec.buildRequests(bidRequests, {
+        bidderRequestId: 123456,
+        refererInfo: {
+          location: 'https://www.test.com',
+        },
+      })
+
+      expect(request.url).to.exist
+      expect(request.url).to.be.a('string')
+      expect(request.url).to.not.be.empty
+    })
+
+    it('url should NOT contain placement specific query string parameters if placementId option is not provided', function () {
+      bidRequests[0].params = {}
+      const request = spec.buildRequests(bidRequests, {
+        bidderRequestId: 123456,
+        refererInfo: {
+          location: 'https://www.test.com',
+        },
+      })
+
+      expect(request.url).to.exist
+      expect(request.url).to.be.a('string')
+
+      expect(request.url).to.not.include('ntv_pas')
+      expect(request.url).to.not.include('ntv_ptd')
+    })
+  })
+})
+
+describe('interpretResponse', function () {
+  let response = {
+    id: '126456',
+    seatbid: [
+      {
+        seat: 'seat_0',
+        bid: [
+          {
+            id: 'f70362ac-f3cf-4225-82a5-948b690927a6',
+            impid: '1',
+            price: 3.569,
+            adm: '<creative>',
+            h: 300,
+            w: 250,
+            cat: [],
+            adomain: ['test.com'],
+            crid: '1060_72_6760217',
+          },
+        ],
+      },
+    ],
+    cur: 'USD',
+  }
+
+  it('should get correct bid response', function () {
+    let expectedResponse = [
+      {
+        requestId: '1F254428-AB11-4D5E-9887-567B3F952CA5',
+        cpm: 3.569,
+        currency: 'USD',
+        width: 300,
+        height: 250,
+        creativeId: '1060_72_6760217',
+        dealId: 'f70362ac-f3cf-4225-82a5-948b690927a6',
+        netRevenue: true,
+        ttl: 360,
+        ad: '<creative>',
+        meta: {
+          advertiserDomains: ['test.com'],
+        },
+      },
+    ]
+
+    let bidderRequest = {
+      id: 123456,
+      bids: [
+        {
+          params: {
+            placementId: 1,
+          },
+        },
+      ],
+    }
+
+    // mock
+    spec.getAdUnitData = () => {
+      return {
+        bidId: 123456,
+        sizes: [300, 250],
+      }
+    }
+
+    let result = spec.interpretResponse({ body: response }, { bidderRequest })
+    expect(Object.keys(result[0])).to.have.deep.members(
+      Object.keys(expectedResponse[0])
+    )
+  })
+
+  it('handles nobid responses', function () {
+    let response = {}
+    let bidderRequest
+
+    let result = spec.interpretResponse({ body: response }, { bidderRequest })
+    expect(result.length).to.equal(0)
+  })
+})
+
+describe('getUserSyncs', function () {
+  const response = [
+    {
+      body: {
+        cur: 'USD',
+        id: 'a136dbd8-4387-48bf-b8e4-ff9c1d6056ee',
+        seatbid: [
+          {
+            bid: [{}],
+            seat: 'seat_0',
+            syncUrls: [
+              {
+                type: 'image',
+                url: 'pixel-tracker-test-url/?{GDPR_params}',
+              },
+              {
+                type: 'iframe',
+                url: 'iframe-tracker-test-url/?{GDPR_params}',
+              },
+            ],
+          },
+        ],
+      },
+    },
+  ]
+
+  const gdprConsent = {
+    gdprApplies: true,
+    consentString: '111111',
+  }
+
+  const uspConsent = {
+    uspConsent: '1YYY',
+  }
+
+  it('Returns empty array if no supported user syncs', function () {
+    let userSync = spec.getUserSyncs(
+      {
+        iframeEnabled: false,
+        pixelEnabled: false,
+      },
+      response,
+      gdprConsent,
+      uspConsent
+    )
+    expect(userSync).to.be.an('array').with.lengthOf(0)
+  })
+
+  it('Returns valid iframe user sync', function () {
+    let userSync = spec.getUserSyncs(
+      {
+        iframeEnabled: true,
+        pixelEnabled: false,
+      },
+      response,
+      gdprConsent,
+      uspConsent
+    )
+    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('iframe')
+    expect(userSync[0].url).to.contain(
+      'gdpr=1&gdpr_consent=111111&us_privacy=1YYY'
+    )
+  })
+
+  it('Returns valid URL and type', function () {
+    let userSync = spec.getUserSyncs(
+      {
+        iframeEnabled: false,
+        pixelEnabled: true,
+      },
+      response,
+      gdprConsent,
+      uspConsent
+    )
+    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('image')
+    expect(userSync[0].url).to.contain(
+      'gdpr=1&gdpr_consent=111111&us_privacy=1YYY'
+    )
+  })
+})
+
+describe('getAdUnitData', () => {
+  afterEach(() => {
+    if (window.bidRequestMap) delete window.bidRequestMap
+  })
+
+  it('Matches placementId value', () => {
+    const adUnitData = {
+      bidId: 123456,
+      sizes: [300, 250],
+    }
+
+    window.bidRequestMap = {
+      9876543: {
+        12345: adUnitData,
+      },
+    }
+
+    const data = spec.getAdUnitData(9876543, { impid: 12345 })
+    expect(Object.keys(data)).to.have.deep.members(Object.keys(adUnitData))
+  })
+
+  it('Falls back to ad unit code value', () => {
+    const adUnitData = {
+      bidId: 123456,
+      sizes: [300, 250],
+    }
+
+    window.bidRequestMap = {
+      9876543: {
+        '#test-code': adUnitData,
+      },
+    }
+
+    const data = spec.getAdUnitData(9876543, {
+      impid: 12345,
+      ext: { ad_unit_code: '#test-code' },
+    })
+    expect(Object.keys(data)).to.have.deep.members(Object.keys(adUnitData))
+  })
+})
+
+describe('Response to Request Filter Flow', () => {
+  let bidRequests = [
+    {
+      bidder: 'nativo',
+      params: {
+        placementId: '10433394',
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [
+        [300, 250],
+        [300, 600],
+      ],
+      bidId: '27b02036ccfa6e',
+      bidderRequestId: '1372cd8bd8d6a8',
+      auctionId: 'cfc467e4-2707-48da-becb-bcaab0b2c114',
+      transactionId: '3b36e7e0-0c3e-4006-a279-a741239154ff',
+    },
+  ]
+
+  let response
+
+  beforeEach(() => {
+    response = {
+      id: '126456',
+      seatbid: [
+        {
+          seat: 'seat_0',
+          bid: [
+            {
+              id: 'f70362ac-f3cf-4225-82a5-948b690927a6',
+              impid: '1',
+              price: 3.569,
+              adm: '<creative>',
+              h: 300,
+              w: 250,
+              cat: [],
+              adomain: ['test.com'],
+              crid: '1060_72_6760217',
+            },
+          ],
+        },
+      ],
+      cur: 'USD',
+    }
+  })
+
+  let bidderRequest = {
+    id: 123456,
+    bids: [
+      {
+        params: {
+          placementId: 1,
+        },
+      },
+    ],
+  }
+
+  // mock
+  spec.getAdUnitData = () => {
+    return {
+      bidId: 123456,
+      size: [300, 250],
+    }
+  }
+
+  it('Appends NO filter based on previous response', () => {
+    // Getting the mock response
+    let result = spec.interpretResponse({ body: response }, { bidderRequest })
+
+    // Winning the bid
+    spec.onBidWon(result[0])
+
+    // Making another request
+    const request = spec.buildRequests(bidRequests, {
+      bidderRequestId: 123456,
+      refererInfo: {
+        referer: 'https://www.test.com',
+      },
+    })
+    expect(request.url).to.not.include('ntv_aft')
+    expect(request.url).to.not.include('ntv_avtf')
+    expect(request.url).to.not.include('ntv_ctf')
+  })
+
+  it('Appends Ads filter based on previous response', () => {
+    response.seatbid[0].bid[0].ext = { adsToFilter: ['12345'] }
+
+    // Getting the mock response
+    let result = spec.interpretResponse({ body: response }, { bidderRequest })
+
+    // Winning the bid
+    spec.onBidWon(result[0])
+
+    // Making another request
+    const request = spec.buildRequests(bidRequests, {
+      bidderRequestId: 123456,
+      refererInfo: {
+        referer: 'https://www.test.com',
+      },
+    })
+    expect(request.url).to.include(`ntv_atf=12345`)
+    expect(request.url).to.not.include('ntv_avtf')
+    expect(request.url).to.not.include('ntv_ctf')
+  })
+
+  it('Appends Advertiser filter based on previous response', () => {
+    response.seatbid[0].bid[0].ext = { advertisersToFilter: ['1'] }
+
+    // Getting the mock response
+    let result = spec.interpretResponse({ body: response }, { bidderRequest })
+
+    // Winning the bid
+    spec.onBidWon(result[0])
+
+    // Making another request
+    const request = spec.buildRequests(bidRequests, {
+      bidderRequestId: 123456,
+      refererInfo: {
+        referer: 'https://www.test.com',
+      },
+    })
+    expect(request.url).to.include(`ntv_atf=12345`)
+    expect(request.url).to.include('ntv_avtf=1')
+    expect(request.url).to.not.include('ntv_ctf')
+  })
+
+  it('Appends Campaign filter based on previous response', () => {
+    response.seatbid[0].bid[0].ext = { campaignsToFilter: ['234'] }
+
+    // Getting the mock response
+    let result = spec.interpretResponse({ body: response }, { bidderRequest })
+
+    // Winning the bid
+    spec.onBidWon(result[0])
+
+    // Making another request
+    const request = spec.buildRequests(bidRequests, {
+      bidderRequestId: 123456,
+      refererInfo: {
+        referer: 'https://www.test.com',
+      },
+    })
+    expect(request.url).to.include(`ntv_atf=12345`)
+    expect(request.url).to.include('ntv_avtf=1')
+    expect(request.url).to.include('ntv_ctf=234')
+  })
+})
+
+describe('sizeToString', () => {
+  it('Formats size array correctly', () => {
+    const sizeString = sizeToString([300, 250])
+    expect(sizeString).to.be.equal('300x250')
+  })
+
+  it('Returns an empty array for invalid data', () => {
+    // Not an array
+    let sizeString = sizeToString(300, 350)
+    expect(sizeString).to.be.equal('')
+    // Single entry
+    sizeString = sizeToString([300])
+    expect(sizeString).to.be.equal('')
+    // Undefined
+    sizeString = sizeToString(undefined)
+    expect(sizeString).to.be.equal('')
+  })
+})
+
+describe('getSizeWildcardPrice', () => {
+  it('Generates the correct floor price data', () => {
+    let floorPrice = {
+      currency: 'USD',
+      floor: 1.0,
+    }
+    let getFloorMock = () => {
+      return floorPrice
+    }
+    let floorMockSpy = sinon.spy(getFloorMock)
+    let bidRequest = {
+      getFloor: floorMockSpy,
+      mediaTypes: {
+        banner: {
+          sizes: [300, 250],
+        },
+      },
+    }
+
+    let result = getSizeWildcardPrice(bidRequest, 'banner')
+    expect(
+      floorMockSpy.calledWith({
+        currency: 'USD',
+        mediaType: 'banner',
+        size: '*',
+      })
+    ).to.be.true
+    expect(result).to.equal(floorPrice)
+  })
+})
+
+describe('getMediaWildcardPrices', () => {
+  it('Generates the correct floor price data', () => {
+    let defaultFloorPrice = {
+      currency: 'USD',
+      floor: 1.1,
+    }
+    let sizefloorPrice = {
+      currency: 'USD',
+      floor: 2.2,
+    }
+    let getFloorMock = ({ currency, mediaType, size }) => {
+      if (Array.isArray(size)) return sizefloorPrice
+
+      return defaultFloorPrice
+    }
+    let floorMockSpy = sinon.spy(getFloorMock)
+    let bidRequest = {
+      getFloor: floorMockSpy,
+      mediaTypes: {
+        banner: {
+          sizes: [300, 250],
+        },
+      },
+    }
+
+    let result = getMediaWildcardPrices(bidRequest, ['*', [300, 250]])
+    expect(
+      floorMockSpy.calledWith({
+        currency: 'USD',
+        mediaType: '*',
+        size: '*',
+      })
+    ).to.be.true
+    expect(
+      floorMockSpy.calledWith({
+        currency: 'USD',
+        mediaType: '*',
+        size: [300, 250],
+      })
+    ).to.be.true
+    expect(result).to.deep.equal({ '*': 1.1, '300x250': 2.2 })
+  })
+})
+
+describe('parseFloorPriceData', () => {
+  it('Generates the correct floor price data', () => {
+    let defaultFloorPrice = {
+      currency: 'USD',
+      floor: 1.1,
+    }
+    let sizefloorPrice = {
+      currency: 'USD',
+      floor: 2.2,
+    }
+    let getFloorMock = ({ currency, mediaType, size }) => {
+      if (Array.isArray(size)) return sizefloorPrice
+
+      return defaultFloorPrice
+    }
+    let floorMockSpy = sinon.spy(getFloorMock)
+    let bidRequest = {
+      getFloor: floorMockSpy,
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        },
+      },
+    }
+
+    let result = parseFloorPriceData(bidRequest)
+    expect(result).to.deep.equal({
+      '*': { '*': 1.1, '300x250': 2.2 },
+      banner: { '*': 1.1, '300x250': 2.2 },
+    })
+  })
+})
+
+describe('hasProtocol', () => {
+  it('https://www.testpage.com', () => {
+    expect(hasProtocol('https://www.testpage.com')).to.be.true
+  })
+  it('http://www.testpage.com', () => {
+    expect(hasProtocol('http://www.testpage.com')).to.be.true
+  })
+  it('//www.testpage.com', () => {
+    expect(hasProtocol('//www.testpage.com')).to.be.false
+  })
+  it('www.testpage.com', () => {
+    expect(hasProtocol('www.testpage.com')).to.be.false
+  })
+  it('httpsgsjhgflih', () => {
+    expect(hasProtocol('httpsgsjhgflih')).to.be.false
+  })
+})
+
+describe('addProtocol', () => {
+  it('www.testpage.com', () => {
+    expect(addProtocol('www.testpage.com')).to.be.equal('https://www.testpage.com')
+  })
+  it('//www.testpage.com', () => {
+    expect(addProtocol('//www.testpage.com')).to.be.equal('https://www.testpage.com')
+  })
+  it('http://www.testpage.com', () => {
+    expect(addProtocol('http://www.testpage.com')).to.be.equal('http://www.testpage.com')
+  })
+  it('https://www.testpage.com', () => {
+    expect(addProtocol('https://www.testpage.com')).to.be.equal('https://www.testpage.com')
+  })
+})
+
+describe('getPageUrlFromBidRequest', () => {
+  const bidRequest = {}
+
+  beforeEach(() => {
+    bidRequest.params = {}
+  })
+
+  it('Returns undefined for no url param', () => {
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).to.be.undefined
+  })
+
+  it('@testUrl', () => {
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).to.be.undefined
+  })
+
+  it('https://www.testpage.com', () => {
+    bidRequest.params.url = 'https://www.testpage.com'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+
+  it('https://www.testpage.com/test/path', () => {
+    bidRequest.params.url = 'https://www.testpage.com/test/path'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+
+  it('www.testpage.com', () => {
+    bidRequest.params.url = 'www.testpage.com'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+
+  it('http://www.testpage.com', () => {
+    bidRequest.params.url = 'http://www.testpage.com'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+
+  it('//www.testpage.com', () => {
+    bidRequest.params.url = '//www.testpage.com'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+})
diff --git a/test/spec/modules/naveggIdSystem_spec.js b/test/spec/modules/naveggIdSystem_spec.js
new file mode 100644
index 00000000000..2c4f1cda859
--- /dev/null
+++ b/test/spec/modules/naveggIdSystem_spec.js
@@ -0,0 +1,45 @@
+import { naveggIdSubmodule, storage } from 'modules/naveggIdSystem.js';
+
+describe('naveggId', function () {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(storage, 'getDataFromLocalStorage');
+  });
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  it('should NOT find navegg id', function () {
+    let id = naveggIdSubmodule.getId();
+
+    expect(id).to.be.undefined;
+  });
+
+  it('getId() should return "test-nid" id from cookie OLD_NAVEGG_ID', function() {
+    sinon.stub(storage, 'getCookie').withArgs('nid').returns('test-nid');
+    let id = naveggIdSubmodule.getId();
+    expect(id).to.be.deep.equal({id: 'test-nid'})
+  })
+
+  it('getId() should return "test-nvggid" id from local storage NAVEGG_ID', function() {
+    storage.getDataFromLocalStorage.callsFake(() => 'test-ninvggidd')
+
+    let id = naveggIdSubmodule.getId();
+    expect(id).to.be.deep.equal({id: 'test-ninvggidd'})
+  })
+
+  it('getId() should return "test-nvggid" id from local storage NAV0', function() {
+    storage.getDataFromLocalStorage.callsFake(() => 'nvgid-nav0')
+
+    let id = naveggIdSubmodule.getId();
+    expect(id).to.be.deep.equal({id: 'nvgid-nav0'})
+  })
+
+  it('getId() should return "test-nvggid" id from local storage NVG0', function() {
+    storage.getDataFromLocalStorage.callsFake(() => 'nvgid-nvg0')
+
+    let id = naveggIdSubmodule.getId();
+    expect(id).to.be.deep.equal({id: 'nvgid-nvg0'})
+  })
+});
diff --git a/test/spec/modules/newborntownWebBidAdapter_spec.js b/test/spec/modules/newborntownWebBidAdapter_spec.js
deleted file mode 100644
index 3d3285328fe..00000000000
--- a/test/spec/modules/newborntownWebBidAdapter_spec.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import { expect } from 'chai';
-import {spec} from 'modules/newborntownWebBidAdapter.js';
-describe('NewborntownWebAdapter', function() {
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'newborntownWeb',
-      'params': {
-        'publisher_id': '1238122',
-        'slot_id': '123123',
-        'bidfloor': 0.3
-      },
-      'adUnitCode': '/19968336/header-bid-tag-1',
-      'sizes': [[300, 250]],
-      'bidId': '2e9cf65f23dbd9',
-      'bidderRequestId': '1f01d9d22ee657',
-      'auctionId': '2bf455a4-a889-41d5-b48f-9b56b89fbec7',
-    }
-    it('should return true where required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  })
-  describe('buildRequests', function () {
-    let bidderRequest = {
-      'bidderCode': 'newborntownWeb',
-      'bidderRequestId': '1f5c279a4c5de3',
-      'bids': [
-        {
-          'bidder': 'newborntownWeb',
-          'params': {
-            'publisher_id': '1238122',
-            'slot_id': '123123',
-            'bidfloor': 0.3
-          },
-          'mediaTypes': {
-            'banner': {'sizes': [[300, 250]]}
-          },
-          'adUnitCode': '/19968336/header-bid-tag-1',
-          'transactionId': '9b954797-d6f4-4730-9cbe-5a1bc8480f52',
-          'sizes': [[300, 250]],
-          'bidId': '215f48d07eb8b8',
-          'bidderRequestId': '1f5c279a4c5de3',
-          'auctionId': '5ed4f607-e11c-45b0-aba9-f67768e1f9f4',
-          'src': 'client',
-          'bidRequestsCount': 1
-        }
-      ],
-      'auctionStart': 1573123289380,
-      'timeout': 9000,
-      'start': 1573123289383
-    }
-    it('Returns POST method', function () {
-      const request = spec.buildRequests(bidderRequest['bids'], bidderRequest);
-      expect(request[0].method).to.equal('POST');
-      expect(request[0].url.indexOf('//us-west.solortb.com/adx/api/rtb?from=4') !== -1).to.equal(true);
-      expect(request[0].data).to.exist;
-    });
-    it('request params multi size format object check', function () {
-      let bidderRequest = {
-        'bidderCode': 'newborntownWeb',
-        'bidderRequestId': '1f5c279a4c5de3',
-        'bids': [
-          {
-            'bidder': 'newborntownWeb',
-            'params': {
-              'publisher_id': '1238122',
-              'slot_id': '123123',
-              'bidfloor': 0.3
-            },
-            'mediaTypes': {
-              'native': {'sizes': [[300, 250]]}
-            },
-            'adUnitCode': '/19968336/header-bid-tag-1',
-            'transactionId': '9b954797-d6f4-4730-9cbe-5a1bc8480f52',
-            'sizes': [300, 250],
-            'bidId': '215f48d07eb8b8',
-            'bidderRequestId': '1f5c279a4c5de3',
-            'auctionId': '5ed4f607-e11c-45b0-aba9-f67768e1f9f4',
-            'src': 'client',
-            'bidRequestsCount': 1
-          }
-        ],
-        'auctionStart': 1573123289380,
-        'timeout': 9000,
-        'start': 1573123289383
-      }
-      let requstTest = spec.buildRequests(bidderRequest['bids'], bidderRequest)
-      expect(requstTest[0].data.imp[0].banner.w).to.equal(300);
-      expect(requstTest[0].data.imp[0].banner.h).to.equal(250);
-    });
-  })
-  describe('interpretResponse', function () {
-    let serverResponse;
-    let bidRequest = {
-      data: {
-        bidId: '2d359291dcf53b'
-      }
-    };
-    beforeEach(function () {
-      serverResponse = {
-        'body': {
-          'id': '174548259807190369860081',
-          'seatbid': [
-            {
-              'bid': [
-                {
-                  'id': '1573540665390298996',
-                  'impid': '1',
-                  'price': 0.3001,
-                  'adid': '1573540665390299172',
-                  'nurl': 'https://us-west.solortb.com/winnotice?price=${AUCTION_PRICE}&ssp=4&req_unique_id=740016d1-175b-4c19-9744-58a59632dabe&unique_id=06b08e40-2489-439a-8f9e-6413f3dd0bc8&isbidder=1&up=bQyvVo7tgbBVW2dDXzTdBP95Mv35YqqEika0T_btI1h6xjqA8GSXQe51_2CCHQcfuwAEOgdwN8u3VgUHmCuqNPKiBmIPaYUOQBBKjJr05zeKtabKnGT7_JJKcurrXqQ5Sl804xJear_qf2-jOaKB4w',
-                  'adm': "<div id='grumi-container'></div>",
-                  'adomain': [
-                    'newborntown.com'
-                  ],
-                  'iurl': 'https://sdkvideo.s3.amazonaws.com/4aa1d9533c4ce71bb1cf750ed38e3a58.png',
-                  'cid': '345',
-                  'crid': '41_11113',
-                  'cat': [
-                    ''
-                  ],
-                  'h': 250,
-                  'w': 300
-                }
-              ],
-              'seat': '1'
-            }
-          ],
-          'bidid': 'bid1573540665390298585'
-        },
-        'headers': {
-
-        }
-      }
-    });
-    it('result is correct', function () {
-      const result = spec.interpretResponse(serverResponse, bidRequest);
-      if (result && result[0]) {
-        expect(result[0].requestId).to.equal('2d359291dcf53b');
-        expect(result[0].cpm).to.equal(0.3001);
-        expect(result[0].width).to.equal(300);
-        expect(result[0].height).to.equal(250);
-        expect(result[0].creativeId).to.equal('345');
-      }
-    });
-  })
-})
diff --git a/test/spec/modules/newspassidBidAdapter_spec.js b/test/spec/modules/newspassidBidAdapter_spec.js
new file mode 100644
index 00000000000..bec6eea7bf2
--- /dev/null
+++ b/test/spec/modules/newspassidBidAdapter_spec.js
@@ -0,0 +1,1793 @@
+import { expect } from 'chai';
+import { spec, defaultSize } from 'modules/newspassidBidAdapter.js';
+import { config } from 'src/config.js';
+import {getGranularityKeyName, getGranularityObject} from '../../../modules/newspassidBidAdapter.js';
+import * as utils from '../../../src/utils.js';
+const NEWSPASSURI = 'https://bidder.newspassid.com/openrtb2/auction';
+const BIDDER_CODE = 'newspassid';
+var validBidRequests = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsNoCustomData = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsMulti = [
+  {
+    testId: 1,
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  },
+  {
+    testId: 2,
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff0',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c0',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsWithUserIdData = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87',
+    userId: {
+      'pubcid': '12345678',
+      'tdid': '1111tdid',
+      'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+      'criteoId': '1111criteoId',
+      'idl_env': 'liverampId',
+      'lipb': {'lipbid': 'lipbidId123'},
+      'parrableId': {'eid': '01.5678.parrableid'},
+      'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
+    },
+    userIdAsEids: [
+      {
+        'source': 'pubcid.org',
+        'uids': [
+          {
+            'id': '12345678',
+            'atype': 1
+          }
+        ]
+      },
+      {
+        'source': 'adserver.org',
+        'uids': [{
+          'id': '1111tdid',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      },
+      {
+        'source': 'id5-sync.com',
+        'uids': [{
+          'id': 'ID5-someId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'criteoId',
+        'uids': [{
+          'id': '1111criteoId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'idl_env',
+        'uids': [{
+          'id': 'liverampId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'lipb',
+        'uids': [{
+          'id': {'lipbid': 'lipbidId123'},
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'parrableId',
+        'uids': [{
+          'id': {'eid': '01.5678.parrableid'},
+          'atype': 1,
+        }]
+      }
+    ]
+  }
+];
+var validBidRequestsMinimal = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    params: { publisherId: '9876abcd12-3', placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsNoSizes = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsWithBannerMediaType = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    mediaTypes: {banner: {sizes: [[300, 250], [300, 600]]}},
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsIsThisCamelCaseEnough = [
+  {
+    'bidder': 'newspassid',
+    'testname': 'validBidRequestsIsThisCamelCaseEnough',
+    'params': {
+      'publisherId': 'newspassRUP0001',
+      'placementId': '8000000009',
+      'siteId': '4204204201',
+      'customData': [
+        {
+          'settings': {},
+          'targeting': {
+            'sens': 'f',
+            'pt1': '/uk',
+            'pt2': 'uk',
+            'pt3': 'network-front',
+            'pt4': 'ng',
+            'pt5': [
+              'uk'
+            ],
+            'pt7': 'desktop',
+            'pt8': [
+              'tfmqxwj7q',
+              'penl4dfdk',
+              'sek9ghqwi'
+            ],
+            'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+          }
+        }
+      ],
+      'userId': {
+        'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
+      },
+      'userIdAsEids': [
+        {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56',
+              'atype': 1
+            }
+          ]
+        }
+      ]
+    },
+    mediaTypes: {banner: {sizes: [[300, 250], [300, 600]]}},
+    'adUnitCode': 'some-ad',
+    'transactionId': '02c1ea7d-0bf2-451b-a122-1420040d1cf8',
+    'bidId': '2899ec066a91ff8',
+    'bidderRequestId': '1c1586b27a1b5c8',
+    'auctionId': '0456c9b7-5ab2-4fec-9e10-f418d3d1f04c',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }
+];
+var validBidderRequest = {
+  auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+  auctionStart: 1536838908986,
+  bidderCode: 'newspassid',
+  bidderRequestId: '1c1586b27a1b5c8',
+  bids: [{
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }],
+  doneCbCallCount: 1,
+  start: 1536838908987,
+  timeout: 3000
+};
+var emptyObject = {};
+var validResponse = {
+  'body': {
+    'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '677903815252395017',
+            'impid': '2899ec066a91ff8',
+            'price': 0.5,
+            'adm': '<script src="https://fra1-ib.adnxs.com/ab?e=wqT_3QLXB6DXAwAAAwDWAAUBCNDh6dwFENjt4vTs9Y6bWhjxtI3siuOTmREqNgkAAAECCOA_EQEHNAAA4D8ZAAAAgOtR4D8hERIAKREJADERG6gwsqKiBjjtSEDtSEgCUI3J-y5YnPFbYABotc95eMuOBYABAYoBA1VTRJIBAQbwUpgBrAKgAdgEqAEBsAEAuAECwAEDyAEC0AEA2AEA4AEA8AEAigI7dWYoJ2EnLCAyNTI5ODg1LCAxNTM2ODQ4MDgwKTt1ZigncicsIDk4NDkzNTgxNh4A8JySAv0BIWJ6YWpPQWl1c0s0S0VJM0oteTRZQUNDYzhWc3dBRGdBUUFSSTdVaFFzcUtpQmxnQVlQX19fXzhQYUFCd0FYZ0JnQUVCaUFFQmtBRUJtQUVCb0FFQnFBRURzQUVBdVFFcGk0aURBQURnUDhFQktZdUlnd0FBNERfSkFUMDR0TTFxYXZFXzJRRUFBQUFBQUFEd1AtQUJBUFVCBQ8oSmdDQUtBQ0FMVUMFEARMMAkI8FBNQUNBY2dDQWRBQ0FkZ0NBZUFDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEcnJDdUNyb0RDVVpTUVRFNk16WTROT0FER2cuLpoCPSFLQXVvRkE2AAFwblBGYklBUW9BRG9KUmxKQk1Ub3pOamcwUUJwSkENAfBAOEQ4LsICL2h0dHA6Ly9wcmViaWQub3JnL2Rldi1kb2NzL2dldHRpbmctc3RhcnRlZC5odG1s2AIA4AKtmEjqAiINOthkZW1vLnRnpS1vem9uZS1wcm9qZWN0LmNvbS_yAhMKD0NVU1RPTV9NT0RFTF9JRBIA8gIaChZDLhYAIExFQUZfTkFNRQEdCB4KGjIzAPCHTEFTVF9NT0RJRklFRBIAgAMAiAMBkAMAmAMUoAMBqgMAwAOsAsgDANgDAOADAOgDAPgDA4AEAJIECS9vcGVucnRiMpgEAKIECTEyNy4wLjAuMagEALIEDAgAEAAYACAAMAA4ALgEAMAEAMgEANIEDjkzMjUjRlJBMTnpNjg02gQCCAHgBADwBEHvIIgFAZgFAKAF_xEBsAGqBSRkNjE5ODgwNy03YTUzLTQxNDEtYjJkYi1kMmNiNzU0ZDY4YmHABQDJBWlQFPA_0gUJCQkMpAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYAmAYAuAYAwQYAAAAAAAAAAMgGAA..&s=ab84b182eef7d9b4e58c74fe8987705c25ed803c&referrer=http%3A%2F%2Fdemo.the-some-project.com%2F&pp=${AUCTION_PRICE}"></script>',
+            'adid': '98493581',
+            'adomain': [
+              'http://prebid.org'
+            ],
+            'iurl': 'https://fra1-ib.adnxs.com/cr?id=98493581',
+            'cid': '9325',
+            'crid': '98493581',
+            'cat': [
+              'IAB3-1'
+            ],
+            'w': 300,
+            'h': 600,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'appnexus': {
+                  'brand_id': 555545,
+                  'auction_id': 6500448734132353000,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            }
+          }
+        ],
+        'seat': 'appnexus'
+      }
+    ],
+    'cur': 'GBP', /* NOTE - this is where cur is, not in the seatbids. */
+    'ext': {
+      'responsetimemillis': {
+        'appnexus': 47,
+        'openx': 30
+      }
+    },
+    'timing': {
+      'start': 1536848078.089177,
+      'end': 1536848078.142203,
+      'TimeTaken': 0.05302619934082031
+    }
+  },
+  'headers': {}
+};
+var validResponse2BidsSameAdunit = {
+  'body': {
+    'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '677903815252395017',
+            'impid': '2899ec066a91ff8',
+            'price': 0.5,
+            'adm': '<script src="src-1"></script>',
+            'adid': '98493581',
+            'adomain': [
+              'http://prebid.org'
+            ],
+            'iurl': 'https://fra1-ib.adnxs.com/cr?id=98493581',
+            'cid': '9325',
+            'crid': '98493581',
+            'cat': [
+              'IAB3-1'
+            ],
+            'w': 300,
+            'h': 600,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'appnexus': {
+                  'brand_id': 555545,
+                  'auction_id': 6500448734132353000,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            }
+          },
+          {
+            'id': '677903815252395010',
+            'impid': '2899ec066a91ff8',
+            'price': 0.9,
+            'adm': '<script src="src-2"></script>',
+            'adid': '98493580',
+            'adomain': [
+              'http://prebid.org'
+            ],
+            'iurl': 'https://fra1-ib.adnxs.com/cr?id=98493581',
+            'cid': '9320',
+            'crid': '98493580',
+            'cat': [
+              'IAB3-1'
+            ],
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'appnexus': {
+                  'brand_id': 555540,
+                  'auction_id': 6500448734132353000,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            }
+          } ],
+        'seat': 'npappnexus'
+      }
+    ],
+    'cur': 'GBP', /* NOTE - this is where cur is, not in the seatbids. */
+    'ext': {
+      'responsetimemillis': {
+        'appnexus': 47,
+        'openx': 30
+      }
+    },
+    'timing': {
+      'start': 1536848078.089177,
+      'end': 1536848078.142203,
+      'TimeTaken': 0.05302619934082031
+    }
+  },
+  'headers': {}
+};
+var validBidResponse1adWith2Bidders = {
+  'body': {
+    'id': '91221f96-b931-4acc-8f05-c2a1186fa5ac',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
+            'impid': '2899ec066a91ff8',
+            'price': 0.36754,
+            'adm': '<script>removed</script>',
+            'adid': '134928661',
+            'adomain': [
+              'somecompany.com'
+            ],
+            'iurl': 'https:\/\/ams1-ib.adnxs.com\/cr?id=134928661',
+            'cid': '8825',
+            'crid': '134928661',
+            'cat': [
+              'IAB8-15',
+              'IAB8-16',
+              'IAB8-4',
+              'IAB8-1',
+              'IAB8-14',
+              'IAB8-6',
+              'IAB8-13',
+              'IAB8-3',
+              'IAB8-17',
+              'IAB8-12',
+              'IAB8-8',
+              'IAB8-7',
+              'IAB8-2',
+              'IAB8-9',
+              'IAB8',
+              'IAB8-11'
+            ],
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'appnexus': {
+                  'brand_id': 14640,
+                  'auction_id': 1.8369641905139e+18,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            }
+          }
+        ],
+        'seat': 'appnexus'
+      },
+      {
+        'bid': [
+          {
+            'id': '75665207-a1ca-49db-ba0e-a5e9c7d26f32',
+            'impid': '37fff511779365a',
+            'price': 1.046,
+            'adm': '<div>removed</div>',
+            'adomain': [
+              'kx.com'
+            ],
+            'crid': '13005',
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              }
+            }
+          }
+        ],
+        'seat': 'openx'
+      }
+    ],
+    'ext': {
+      'responsetimemillis': {
+        'appnexus': 91,
+        'openx': 109,
+        'npappnexus': 46,
+        'npbeeswax': 2,
+        'pangaea': 91
+      }
+    }
+  },
+  'headers': {}
+};
+var multiRequest1 = [
+  {
+    'bidder': 'newspassid',
+    'params': {
+      'publisherId': 'newspassRUP0001',
+      'siteId': '4204204201',
+      'placementId': '0420420421',
+      'customData': [
+        {
+          'settings': {},
+          'targeting': {
+            'sens': 'f',
+            'pt1': '/uk',
+            'pt2': 'uk',
+            'pt3': 'network-front',
+            'pt4': 'ng',
+            'pt5': [
+              'uk'
+            ],
+            'pt7': 'desktop',
+            'pt8': [
+              'tfmqxwj7q',
+              'penl4dfdk',
+              'uayf5jmv3',
+              't8nyiude5',
+              'sek9ghqwi'
+            ],
+            'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+          }
+        }
+      ]
+    },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ]
+      }
+    },
+    'adUnitCode': 'mpu',
+    'transactionId': '6480bac7-31b5-4723-9145-ad8966660651',
+    'sizes': [
+      [
+        300,
+        250
+      ],
+      [
+        300,
+        600
+      ]
+    ],
+    'bidId': '2d30e86db743a8',
+    'bidderRequestId': '1d03a1dfc563fc',
+    'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  },
+  {
+    'bidder': 'newspassid',
+    'params': {
+      'publisherId': 'newspassRUP0001',
+      'siteId': '4204204201',
+      'placementId': '0420420421',
+      'customData': [
+        {
+          'settings': {},
+          'targeting': {
+            'sens': 'f',
+            'pt1': '/uk',
+            'pt2': 'uk',
+            'pt3': 'network-front',
+            'pt4': 'ng',
+            'pt5': [
+              'uk'
+            ],
+            'pt7': 'desktop',
+            'pt8': [
+              'tfmqxwj7q',
+              'penl4dfdk',
+              't8nxz6qzd',
+              't8nyiude5',
+              'sek9ghqwi'
+            ],
+            'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+          }
+        }
+      ]
+    },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            728,
+            90
+          ],
+          [
+            970,
+            250
+          ]
+        ]
+      }
+    },
+    'adUnitCode': 'leaderboard',
+    'transactionId': 'a49988e6-ae7c-46c4-9598-f18db49892a0',
+    'sizes': [
+      [
+        728,
+        90
+      ],
+      [
+        970,
+        250
+      ]
+    ],
+    'bidId': '3025f169863b7f8',
+    'bidderRequestId': '1d03a1dfc563fc',
+    'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }
+];
+var multiBidderRequest1 = {
+  bidderRequest: {
+    'bidderCode': 'newspassid',
+    'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+    'bidderRequestId': '1d03a1dfc563fc',
+    'bids': [
+      {
+        'bidder': 'newspassid',
+        'params': {
+          'publisherId': 'newspassRUP0001',
+          'siteId': '4204204201',
+          'placementId': '0420420421',
+          'customData': [
+            {
+              'settings': {},
+              'targeting': {
+                'sens': 'f',
+                'pt1': '/uk',
+                'pt2': 'uk',
+                'pt3': 'network-front',
+                'pt4': 'ng',
+                'pt5': [
+                  'uk'
+                ],
+                'pt7': 'desktop',
+                'pt8': [
+                  'tfmqxwj7q',
+                  'txeh7uyo0',
+                  't8nxz6qzd',
+                  't8nyiude5',
+                  'sek9ghqwi'
+                ],
+                'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+              }
+            }
+          ]
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'mpu',
+        'transactionId': '6480bac7-31b5-4723-9145-ad8966660651',
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ],
+        'bidId': '2d30e86db743a8',
+        'bidderRequestId': '1d03a1dfc563fc',
+        'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      },
+      {
+        'bidder': 'newspassid',
+        'params': {
+          'publisherId': 'newspassRUP0001',
+          'siteId': '4204204201',
+          'placementId': '0420420421',
+          'customData': [
+            {
+              'settings': {},
+              'targeting': {
+                'sens': 'f',
+                'pt1': '/uk',
+                'pt2': 'uk',
+                'pt3': 'network-front',
+                'pt4': 'ng',
+                'pt5': [
+                  'uk'
+                ],
+                'pt7': 'desktop',
+                'pt8': [
+                  'tfmqxwj7q',
+                  'penl4dfdk',
+                  't8nxz6qzd',
+                  't8nyiude5',
+                  'sek9ghqwi'
+                ],
+                'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+              }
+            }
+          ]
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                728,
+                90
+              ],
+              [
+                970,
+                250
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'leaderboard',
+        'transactionId': 'a49988e6-ae7c-46c4-9598-f18db49892a0',
+        'sizes': [
+          [
+            728,
+            90
+          ],
+          [
+            970,
+            250
+          ]
+        ],
+        'bidId': '3025f169863b7f8',
+        'bidderRequestId': '1d03a1dfc563fc',
+        'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      }
+    ],
+    'auctionStart': 1592918645574,
+    'timeout': 3000,
+    'refererInfo': {
+      'referer': 'http://some.referrer.com',
+      'reachedTop': true,
+      'numIframes': 0,
+      'stack': [
+        'http://some.referrer.com'
+      ]
+    },
+    'start': 1592918645578
+  }
+};
+var multiResponse1 = {
+  'body': {
+    'id': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '4419718600113204943',
+            'impid': '2d30e86db743a8',
+            'price': 0.2484,
+            'adm': '<scr .. .iv>',
+            'adid': '119683582',
+            'adomain': [
+              'https://someurl.com'
+            ],
+            'iurl': 'https://ams1-ib.adnxs.com/cr?id=119683582',
+            'cid': '9979',
+            'crid': '119683582',
+            'cat': [
+              'IAB3'
+            ],
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {},
+                'appnexus': {
+                  'brand_id': 734921,
+                  'auction_id': 2995348111857539600,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            },
+            'cpm': 0.2484,
+            'bidId': '2d30e86db743a8',
+            'requestId': '2d30e86db743a8',
+            'width': 300,
+            'height': 250,
+            'ad': '<scr...iv>',
+            'netRevenue': true,
+            'creativeId': '119683582',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.2484,
+            'originalCurrency': 'USD'
+          },
+          {
+            'id': '18552976939844681',
+            'impid': '3025f169863b7f8',
+            'price': 0.0621,
+            'adm': '<sc..this ad will lose to the next one.div>',
+            'adid': '120179216',
+            'adomain': [
+              'appnexus.com'
+            ],
+            'iurl': 'https://ams1-ib.adnxs.com/cr?id=120179216',
+            'cid': '9979',
+            'crid': '120179216',
+            'w': 970,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {},
+                'appnexus': {
+                  'brand_id': 1,
+                  'auction_id': 3449036134472542700,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            },
+            'cpm': 0.0621,
+            'bidId': '3025f169863b7f8',
+            'requestId': '3025f169863b7f8',
+            'width': 970,
+            'height': 250,
+            'ad': '<scr...iv>',
+            'netRevenue': true,
+            'creativeId': '120179216',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.0621,
+            'originalCurrency': 'USD'
+          },
+          {
+            'id': '18552976939844999',
+            'impid': '3025f169863b7f8',
+            'price': 0.521,
+            'adm': '<sc. second bid for bidId 3025f169863b7f8 ..div>',
+            'adid': '120179216',
+            'adomain': [
+              'appnexus.com'
+            ],
+            'iurl': 'https://ams1-ib.adnxs.com/cr?id=120179216',
+            'cid': '9999',
+            'crid': '120179299',
+            'w': 728,
+            'h': 90,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {},
+                'appnexus': {
+                  'brand_id': 1,
+                  'auction_id': 3449036134472542700,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            },
+            'cpm': 0.521,
+            'bidId': '3025f169863b7f8',
+            'requestId': '3025f169863b7f8',
+            'width': 728,
+            'height': 90,
+            'ad': '<scr...iv>',
+            'netRevenue': true,
+            'creativeId': '120179299',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.0621,
+            'originalCurrency': 'USD'
+          }
+        ],
+        'seat': 'npappnexus'
+      },
+      {
+        'bid': [
+          {
+            'id': '1c605e8a-4992-4ec6-8a5c-f82e2938c2db',
+            'impid': '2d30e86db743a8',
+            'price': 0.01,
+            'adm': '<div  ... div>',
+            'crid': '540463358',
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {}
+              }
+            },
+            'cpm': 0.01,
+            'bidId': '2d30e86db743a8',
+            'requestId': '2d30e86db743a8',
+            'width': 300,
+            'height': 250,
+            'ad': '<div ...div>',
+            'netRevenue': true,
+            'creativeId': '540463358',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.01,
+            'originalCurrency': 'USD'
+          },
+          {
+            'id': '3edeb4f7-d91d-44e2-8aeb-4a2f6d295ce5',
+            'impid': '3025f169863b7f8',
+            'price': 0.01,
+            'adm': '<div ... div>',
+            'crid': '540221061',
+            'w': 970,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {}
+              }
+            },
+            'cpm': 0.01,
+            'bidId': '3025f169863b7f8',
+            'requestId': '3025f169863b7f8',
+            'width': 970,
+            'height': 250,
+            'ad': '<div ... div>',
+            'netRevenue': true,
+            'creativeId': '540221061',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.01,
+            'originalCurrency': 'USD'
+          }
+        ],
+        'seat': 'openx'
+      }
+    ],
+    'ext': {
+      'debug': {},
+      'responsetimemillis': {
+        'beeswax': 6,
+        'openx': 91,
+        'npappnexus': 40,
+        'npbeeswax': 6
+      }
+    }
+  },
+  'headers': {}
+};
+describe('newspassid Adapter', function () {
+  describe('isBidRequestValid', function () {
+    let validBidReq = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1310000099',
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
+    });
+    var validBidReq2 = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1310000099',
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890',
+        customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}]
+      },
+      siteId: 1234567890
+    }
+    it('should return true when required params found and all optional params are valid', function () {
+      expect(spec.isBidRequestValid(validBidReq2)).to.equal(true);
+    });
+    var xEmptyPlacement = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '',
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate empty placementId', function () {
+      expect(spec.isBidRequestValid(xEmptyPlacement)).to.equal(false);
+    });
+    var xMissingPlacement = {
+      bidder: BIDDER_CODE,
+      params: {
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate missing placementId', function () {
+      expect(spec.isBidRequestValid(xMissingPlacement)).to.equal(false);
+    });
+    var xBadPlacement = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '123X45',
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate placementId with a non-numeric value', function () {
+      expect(spec.isBidRequestValid(xBadPlacement)).to.equal(false);
+    });
+    var xBadPlacementTooShort = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: 123456789, /* should be exactly 10 chars */
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate placementId with a numeric value of wrong length', function () {
+      expect(spec.isBidRequestValid(xBadPlacementTooShort)).to.equal(false);
+    });
+    var xBadPlacementTooLong = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: 12345678901, /* should be exactly 10 chars */
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate placementId with a numeric value of wrong length', function () {
+      expect(spec.isBidRequestValid(xBadPlacementTooLong)).to.equal(false);
+    });
+    var xMissingPublisher = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate missing publisherId', function () {
+      expect(spec.isBidRequestValid(xMissingPublisher)).to.equal(false);
+    });
+    var xMissingSiteId = {
+      bidder: BIDDER_CODE,
+      params: {
+        publisherId: '9876abcd12-3',
+        placementId: '1234567890',
+      }
+    };
+    it('should not validate missing sitetId', function () {
+      expect(spec.isBidRequestValid(xMissingSiteId)).to.equal(false);
+    });
+    var xBadPublisherTooShort = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: '9876abcd12a',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate publisherId being too short', function () {
+      expect(spec.isBidRequestValid(xBadPublisherTooShort)).to.equal(false);
+    });
+    var xBadPublisherTooLong = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: '9876abcd12abc',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate publisherId being too long', function () {
+      expect(spec.isBidRequestValid(xBadPublisherTooLong)).to.equal(false);
+    });
+    var publisherNumericOk = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: 123456789012,
+        siteId: '1234567890'
+      }
+    };
+    it('should validate publisherId being 12 digits', function () {
+      expect(spec.isBidRequestValid(publisherNumericOk)).to.equal(true);
+    });
+    var xEmptyPublisher = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: '',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate empty publisherId', function () {
+      expect(spec.isBidRequestValid(xEmptyPublisher)).to.equal(false);
+    });
+    var xBadSite = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: '9876abcd12-3',
+        siteId: '12345Z'
+      }
+    };
+    it('should not validate bad siteId', function () {
+      expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
+    });
+    it('should not validate siteId too long', function () {
+      expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
+    });
+    it('should not validate siteId too short', function () {
+      expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
+    });
+    var allNonStrings = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: 1234567890,
+        publisherId: '9876abcd12-3',
+        siteId: 1234567890
+      }
+    };
+    it('should validate all numeric values being sent as non-string numbers', function () {
+      expect(spec.isBidRequestValid(allNonStrings)).to.equal(true);
+    });
+    var emptySiteId = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: 1234567890,
+        publisherId: '9876abcd12-3',
+        siteId: ''
+      }
+    };
+    it('should not validate siteId being empty string (it is required now)', function () {
+      expect(spec.isBidRequestValid(emptySiteId)).to.equal(false);
+    });
+    var xBadCustomData = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'siteId': '1234567890',
+        'customData': 'this aint gonna work'
+      }
+    };
+    it('should not validate customData not being an array', function () {
+      expect(spec.isBidRequestValid(xBadCustomData)).to.equal(false);
+    });
+    var xBadCustomDataOldCustomdataValue = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'siteId': '1234567890',
+        'customData': {'gender': 'bart', 'age': 'low'}
+      }
+    };
+    it('should not validate customData being an object, not an array', function () {
+      expect(spec.isBidRequestValid(xBadCustomDataOldCustomdataValue)).to.equal(false);
+    });
+    var xBadCustomDataZerocd = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1111111110',
+        'publisherId': '9876abcd12-3',
+        'siteId': '1234567890',
+        'customData': []
+      }
+    };
+    it('should not validate customData array having no elements', function () {
+      expect(spec.isBidRequestValid(xBadCustomDataZerocd)).to.equal(false);
+    });
+    var xBadCustomDataNotargeting = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'customData': [{'settings': {}, 'xx': {'gender': 'bart', 'age': 'low'}}],
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate customData[] having no "targeting"', function () {
+      expect(spec.isBidRequestValid(xBadCustomDataNotargeting)).to.equal(false);
+    });
+    var xBadCustomDataTgtNotObj = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'customData': [{'settings': {}, 'targeting': 'this should be an object'}],
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate customData[0].targeting not being an object', function () {
+      expect(spec.isBidRequestValid(xBadCustomDataTgtNotObj)).to.equal(false);
+    });
+    var xBadCustomParams = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'siteId': '1234567890',
+        'customParams': 'this key is no longer valid'
+      }
+    };
+    it('should not validate customParams - this is a renamed key', function () {
+      expect(spec.isBidRequestValid(xBadCustomParams)).to.equal(false);
+    });
+  });
+  describe('buildRequests', function () {
+    it('sends bid request to NEWSPASSURI via POST', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.url).to.equal(NEWSPASSURI);
+      expect(request.method).to.equal('POST');
+    });
+    it('sends data as a string', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.data).to.be.a('string');
+    });
+    it('sends all bid parameters', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+    });
+    it('adds all parameters inside the ext object only', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.data).to.be.a('string');
+      var data = JSON.parse(request.data);
+      expect(data.imp[0].ext.newspassid.customData).to.be.an('array');
+      expect(request).not.to.have.key('lotameData');
+      expect(request).not.to.have.key('customData');
+    });
+    it('adds all parameters inside the ext object only - lightning', function () {
+      let localBidReq = JSON.parse(JSON.stringify(validBidRequests));
+      const request = spec.buildRequests(localBidReq, validBidderRequest);
+      expect(request.data).to.be.a('string');
+      var data = JSON.parse(request.data);
+      expect(data.imp[0].ext.newspassid.customData).to.be.an('array');
+      expect(request).not.to.have.key('lotameData');
+      expect(request).not.to.have.key('customData');
+    });
+    it('has correct bidder', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.bidderRequest.bids[0].bidder).to.equal(BIDDER_CODE);
+    });
+    it('handles mediaTypes element correctly', function () {
+      const request = spec.buildRequests(validBidRequestsWithBannerMediaType, validBidderRequest);
+      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+    });
+    it('handles no newspassid or custom data', function () {
+      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+    });
+    it('should not crash when there is no sizes element at all', function () {
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+    });
+    it('should be able to handle non-single requests', function () {
+      config.setConfig({'newspassid': {'singleRequest': false}});
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      expect(request).to.be.a('array');
+      expect(request[0]).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+      config.setConfig({'newspassid': {'singleRequest': true}});
+    });
+    it('should not have imp[N].ext.newspassid.userId', function () {
+      let bidderRequest = validBidderRequest;
+      let bidRequests = validBidRequests;
+      bidRequests[0]['userId'] = {
+        'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
+        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+        'idl_env': '3333',
+        'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
+        'pubcid': '5555',
+        'tdid': '6666',
+        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
+      };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      let firstBid = payload.imp[0].ext.newspassid;
+      expect(firstBid).to.not.have.property('userId');
+      delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
+    });
+    it('should pick up the value of pubcid when built using the pubCommonId module (not userId)', function () {
+      let bidRequests = validBidRequests;
+      bidRequests[0]['userId'] = {
+        'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
+        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+        'idl_env': '3333',
+        'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
+        'tdid': '6666',
+        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
+      };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
+      const request = spec.buildRequests(bidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.newspassid.pubcid).to.equal(bidRequests[0]['crumbs']['pubcid']);
+      delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
+    });
+    it('should add a user.ext.eids object to contain user ID data in the new location (Nov 2019) Updated Aug 2020', function() {
+      const request = spec.buildRequests(validBidRequestsWithUserIdData, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.user).to.exist;
+      expect(payload.user.ext).to.exist;
+      expect(payload.user.ext.eids).to.exist;
+      expect(payload.user.ext.eids[0]['source']).to.equal('pubcid.org');
+      expect(payload.user.ext.eids[0]['uids'][0]['id']).to.equal('12345678');
+      expect(payload.user.ext.eids[1]['source']).to.equal('adserver.org');
+      expect(payload.user.ext.eids[1]['uids'][0]['id']).to.equal('1111tdid');
+      expect(payload.user.ext.eids[2]['source']).to.equal('id5-sync.com');
+      expect(payload.user.ext.eids[2]['uids'][0]['id']).to.equal('ID5-someId');
+      expect(payload.user.ext.eids[3]['source']).to.equal('criteoId');
+      expect(payload.user.ext.eids[3]['uids'][0]['id']).to.equal('1111criteoId');
+      expect(payload.user.ext.eids[4]['source']).to.equal('idl_env');
+      expect(payload.user.ext.eids[4]['uids'][0]['id']).to.equal('liverampId');
+      expect(payload.user.ext.eids[5]['source']).to.equal('lipb');
+      expect(payload.user.ext.eids[5]['uids'][0]['id']['lipbid']).to.equal('lipbidId123');
+      expect(payload.user.ext.eids[6]['source']).to.equal('parrableId');
+      expect(payload.user.ext.eids[6]['uids'][0]['id']['eid']).to.equal('01.5678.parrableid');
+    });
+    it('replaces the auction url for a config override', function () {
+      spec.propertyBag.config = null;
+      let fakeOrigin = 'http://sometestendpoint';
+      config.setConfig({'newspassid': {'endpointOverride': {'origin': fakeOrigin}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.url).to.equal(fakeOrigin + '/openrtb2/auction');
+      expect(request.method).to.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.origin).to.equal(fakeOrigin);
+      config.setConfig({'newspassid': {'kvpPrefix': null, 'endpointOverride': null}});
+    });
+    it('replaces the FULL auction url for a config override', function () {
+      spec.propertyBag.config = null;
+      let fakeurl = 'http://sometestendpoint/myfullurl';
+      config.setConfig({'newspassid': {'endpointOverride': {'auctionUrl': fakeurl}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.url).to.equal(fakeurl);
+      expect(request.method).to.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.origin).to.equal(fakeurl);
+      config.setConfig({'newspassid': {'kvpPrefix': null, 'endpointOverride': null}});
+    });
+    it('should ignore kvpPrefix', function () {
+      spec.propertyBag.config = null;
+      config.setConfig({'newspassid': {'kvpPrefix': 'np'}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0].adserverTargeting).to.have.own.property('np_appnexus_crid');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_crid')).to.equal('98493581');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_adId')).to.equal('2899ec066a91ff8-0-np-0');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_size')).to.equal('300x600');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_pb_r')).to.equal('0.50');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_bid')).to.equal('true');
+      config.resetConfig();
+    });
+    it('should create a meta object on each bid returned', function () {
+      spec.propertyBag.config = null;
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0]).to.have.own.property('meta');
+      expect(result[0].meta.advertiserDomains[0]).to.equal('http://prebid.org');
+      config.resetConfig();
+    });
+    it('should use nptestmode GET value if set', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'nptestmode': 'mytestvalue_123'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].ext.newspassid.customData).to.be.an('array');
+      expect(data.imp[0].ext.newspassid.customData[0].targeting.nptestmode).to.equal('mytestvalue_123');
+    });
+    it('should pass through GET params if present: npf, nppf, nprp, npip', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {npf: '1', nppf: '0', nprp: '2', npip: '123'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.npf).to.equal(1);
+      expect(data.ext.newspassid.nppf).to.equal(0);
+      expect(data.ext.newspassid.nprp).to.equal(2);
+      expect(data.ext.newspassid.npip).to.equal(123);
+    });
+    it('should pass through GET params if present: npf, nppf, nprp, npip with alternative values', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {npf: 'false', nppf: 'true', nprp: 'xyz', npip: 'hello'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.npf).to.equal(0);
+      expect(data.ext.newspassid.nppf).to.equal(1);
+      expect(data.ext.newspassid).to.not.haveOwnProperty('nprp');
+      expect(data.ext.newspassid).to.not.haveOwnProperty('npip');
+    });
+    it('should use nptestmode GET value if set, even if there is no customdata in config', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'nptestmode': 'mytestvalue_123'};
+      };
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].ext.newspassid.customData).to.be.an('array');
+      expect(data.imp[0].ext.newspassid.customData[0].targeting.nptestmode).to.equal('mytestvalue_123');
+    });
+    it('should use GET values auction=[encoded URL] & cookiesync=[encoded url] if set', function() {
+      spec.propertyBag.config = null;
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {};
+      };
+      let request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      let url = request.url;
+      expect(url).to.equal('https://bidder.newspassid.com/openrtb2/auction');
+      let cookieUrl = specMock.getCookieSyncUrl();
+      expect(cookieUrl).to.equal('https://bidder.newspassid.com/static/load-cookie.html');
+      specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'auction': 'https://www.someurl.com/auction', 'cookiesync': 'https://www.someurl.com/sync'};
+      };
+      request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      url = request.url;
+      expect(url).to.equal('https://www.someurl.com/auction');
+      cookieUrl = specMock.getCookieSyncUrl();
+      expect(cookieUrl).to.equal('https://www.someurl.com/sync');
+    });
+    it('should use a valid npstoredrequest GET value if set to override the placementId values, and set np_rw if we find it', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'npstoredrequest': '1122334455'}; // 10 digits are valid
+      };
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.np_rw).to.equal(1);
+      expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1122334455');
+    });
+    it('should NOT use an invalid npstoredrequest GET value if set to override the placementId values, and set np_rw to 0', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'npstoredrequest': 'BADVAL'}; // 10 digits are valid
+      };
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.np_rw).to.equal(0);
+      expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1310000099');
+    });
+    it('should pick up the config value of coppa & set it in the request', function () {
+      config.setConfig({'coppa': true});
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.regs).to.include.keys('coppa');
+      expect(payload.regs.coppa).to.equal(1);
+      config.resetConfig();
+    });
+    it('should pick up the config value of coppa & only set it in the request if its true', function () {
+      config.setConfig({'coppa': false});
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(utils.deepAccess(payload, 'regs.coppa')).to.be.undefined;
+      config.resetConfig();
+    });
+    it('should should contain a unique page view id in the auction request which persists across calls', function () {
+      let request = spec.buildRequests(validBidRequests, validBidderRequest);
+      let payload = JSON.parse(request.data);
+      expect(utils.deepAccess(payload, 'ext.newspassid.pv')).to.be.a('string');
+      request = spec.buildRequests(validBidRequestsIsThisCamelCaseEnough, validBidderRequest);
+      let payload2 = JSON.parse(request.data);
+      expect(utils.deepAccess(payload2, 'ext.newspassid.pv')).to.be.a('string');
+      expect(utils.deepAccess(payload2, 'ext.newspassid.pv')).to.equal(utils.deepAccess(payload, 'ext.newspassid.pv'));
+    });
+    it('should indicate that the whitelist was used when it contains valid data', function () {
+      config.setConfig({'newspassid': {'np_whitelist_adserver_keys': ['np_appnexus_pb', 'np_appnexus_imp_id']}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.newspassid.np_kvp_rw).to.equal(1);
+      config.resetConfig();
+    });
+    it('should indicate that the whitelist was not used when it contains no data', function () {
+      config.setConfig({'newspassid': {'np_whitelist_adserver_keys': []}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.newspassid.np_kvp_rw).to.equal(0);
+      config.resetConfig();
+    });
+    it('should indicate that the whitelist was not used when it is not set in the config', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.newspassid.np_kvp_rw).to.equal(0);
+    });
+    it('should handle ortb2 site data', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'site': {
+          'name': 'example_ortb2_name',
+          'domain': 'page.example.com',
+          'cat': ['IAB2'],
+          'sectioncat': ['IAB2-2'],
+          'pagecat': ['IAB2-2'],
+          'page': 'https://page.example.com/here.html',
+          'ref': 'https://ref.example.com',
+          'keywords': 'power tools, drills',
+          'search': 'drill'
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.newspassid.customData[0].targeting.name).to.equal('example_ortb2_name');
+      expect(payload.user.ext).to.not.have.property('gender');
+    });
+    it('should add ortb2 site data when there is no customData already created', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'site': {
+          'name': 'example_ortb2_name',
+          'domain': 'page.example.com',
+          'cat': ['IAB2'],
+          'sectioncat': ['IAB2-2'],
+          'pagecat': ['IAB2-2'],
+          'page': 'https://page.example.com/here.html',
+          'ref': 'https://ref.example.com',
+          'keywords': 'power tools, drills',
+          'search': 'drill'
+        }
+      };
+      const request = spec.buildRequests(validBidRequestsNoCustomData, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.newspassid.customData[0].targeting.name).to.equal('example_ortb2_name');
+      expect(payload.imp[0].ext.newspassid.customData[0].targeting).to.not.have.property('gender')
+    });
+    it('should add ortb2 user data to the user object', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'user': {
+          'gender': 'I identify as a box of rocks'
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.gender).to.equal('I identify as a box of rocks');
+    });
+    it('handles schain object in each bidrequest (will be the same in each br)', function () {
+      let br = JSON.parse(JSON.stringify(validBidRequests));
+      let schainConfigObject = {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'bidderA.com',
+            'sid': '00001',
+            'hp': 1
+          }
+        ]
+      };
+      br[0]['schain'] = schainConfigObject;
+      const request = spec.buildRequests(br, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.source.ext).to.haveOwnProperty('schain');
+      expect(data.source.ext.schain).to.deep.equal(schainConfigObject); // .deep.equal() : Target object deeply (but not strictly) equals `{a: 1}`
+    });
+  });
+  describe('interpretResponse', function () {
+    it('should build bid array', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result.length).to.equal(1);
+    });
+    it('should have all relevant fields', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      const bid = result[0];
+      expect(bid.cpm).to.equal(validResponse.body.seatbid[0].bid[0].cpm);
+      expect(bid.width).to.equal(validResponse.body.seatbid[0].bid[0].width);
+      expect(bid.height).to.equal(validResponse.body.seatbid[0].bid[0].height);
+    });
+    it('should build bid array with usp/CCPA', function () {
+      let validBR = JSON.parse(JSON.stringify(validBidderRequest));
+      validBR.uspConsent = '1YNY';
+      const request = spec.buildRequests(validBidRequests, validBR);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.uspConsent).not.to.exist;
+      expect(payload.regs.ext.us_privacy).to.equal('1YNY');
+    });
+    it('should fail ok if no seatbid in server response', function () {
+      const result = spec.interpretResponse({}, {});
+      expect(result).to.be.an('array');
+      expect(result).to.be.empty;
+    });
+    it('should fail ok if seatbid is not an array', function () {
+      const result = spec.interpretResponse({'body': {'seatbid': 'nothing_here'}}, {});
+      expect(result).to.be.an('array');
+      expect(result).to.be.empty;
+    });
+    it('should correctly parse response where there are more bidders than ad slots', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validBidResponse1adWith2Bidders, request);
+      expect(result.length).to.equal(2);
+    });
+    it('should have a ttl of 600', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0].ttl).to.equal(300);
+    });
+    it('should handle a valid whitelist, removing items not on the list & leaving others', function () {
+      config.setConfig({'newspassid': {'np_whitelist_adserver_keys': ['np_appnexus_crid', 'np_appnexus_adId']}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_adv')).to.be.undefined;
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_adId')).to.equal('2899ec066a91ff8-0-np-0');
+      config.resetConfig();
+    });
+    it('should ignore a whitelist if enhancedAdserverTargeting is false', function () {
+      config.setConfig({'newspassid': {'np_whitelist_adserver_keys': ['np_appnexus_crid', 'np_appnexus_imp_id'], 'enhancedAdserverTargeting': false}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_adv')).to.be.undefined;
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_imp_id')).to.be.undefined;
+      config.resetConfig();
+    });
+    it('should correctly handle enhancedAdserverTargeting being false', function () {
+      config.setConfig({'newspassid': {'enhancedAdserverTargeting': false}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_adv')).to.be.undefined;
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_imp_id')).to.be.undefined;
+      config.resetConfig();
+    });
+    it('should add unique adId values to each bid', function() {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      let validres = JSON.parse(JSON.stringify(validResponse2BidsSameAdunit));
+      const result = spec.interpretResponse(validres, request);
+      expect(result.length).to.equal(1);
+      expect(result[0]['price']).to.equal(0.9);
+      expect(result[0]['adserverTargeting']['np_npappnexus_adId']).to.equal('2899ec066a91ff8-0-np-1');
+    });
+    it('should correctly process an auction with 2 adunits & multiple bidders one of which bids for both adslots', function() {
+      let validres = JSON.parse(JSON.stringify(multiResponse1));
+      let request = spec.buildRequests(multiRequest1, multiBidderRequest1.bidderRequest);
+      let result = spec.interpretResponse(validres, request);
+      expect(result.length).to.equal(4); // one of the 5 bids will have been removed
+      expect(result[1]['price']).to.equal(0.521);
+      expect(result[1]['impid']).to.equal('3025f169863b7f8');
+      expect(result[1]['id']).to.equal('18552976939844999');
+      expect(result[1]['adserverTargeting']['np_npappnexus_adId']).to.equal('3025f169863b7f8-0-np-2');
+      validres = JSON.parse(JSON.stringify(multiResponse1));
+      validres.body.seatbid[0].bid[1].price = 1.1;
+      validres.body.seatbid[0].bid[1].cpm = 1.1;
+      request = spec.buildRequests(multiRequest1, multiBidderRequest1.bidderRequest);
+      result = spec.interpretResponse(validres, request);
+      expect(result[1]['price']).to.equal(1.1);
+      expect(result[1]['impid']).to.equal('3025f169863b7f8');
+      expect(result[1]['id']).to.equal('18552976939844681');
+      expect(result[1]['adserverTargeting']['np_npappnexus_adId']).to.equal('3025f169863b7f8-0-np-1');
+    });
+  });
+  describe('userSyncs', function () {
+    it('should fail gracefully if no server response', function () {
+      const result = spec.getUserSyncs('bad', false, emptyObject);
+      expect(result).to.be.empty;
+    });
+    it('should fail gracefully if server response is empty', function () {
+      const result = spec.getUserSyncs('bad', [], emptyObject);
+      expect(result).to.be.empty;
+    });
+    it('should append the various values if they exist', function() {
+      spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', emptyObject);
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('publisherId=9876abcd12-3');
+      expect(result[0].url).to.include('siteId=1234567890');
+    });
+    it('should append ccpa (usp data)', function() {
+      spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', emptyObject, '1YYN');
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('usp_consent=1YYN');
+    });
+    it('should use "" if no usp is sent to cookieSync', function() {
+      spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', emptyObject);
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('usp_consent=&');
+    });
+  });
+  describe('default size', function () {
+    it('should should return default sizes if no obj is sent', function () {
+      let obj = '';
+      const result = defaultSize(obj);
+      expect(result.defaultHeight).to.equal(250);
+      expect(result.defaultWidth).to.equal(300);
+    });
+  });
+  describe('getGranularityKeyName', function() {
+    it('should return a string granularity as-is', function() {
+      const result = getGranularityKeyName('', 'this is it', '');
+      expect(result).to.equal('this is it');
+    });
+    it('should return "custom" for a mediaTypeGranularity object', function() {
+      const result = getGranularityKeyName('', {}, '');
+      expect(result).to.equal('custom');
+    });
+    it('should return "custom" for a mediaTypeGranularity object', function() {
+      const result = getGranularityKeyName('', false, 'string buckets');
+      expect(result).to.equal('string buckets');
+    });
+  });
+  describe('getGranularityObject', function() {
+    it('should return an object as-is', function() {
+      const result = getGranularityObject('', {'name': 'mark'}, '', '');
+      expect(result.name).to.equal('mark');
+    });
+    it('should return an object as-is', function() {
+      const result = getGranularityObject('', false, 'custom', {'name': 'rupert'});
+      expect(result.name).to.equal('rupert');
+    });
+  });
+  describe('blockTheRequest', function() {
+    it('should return true if np_request is false', function() {
+      config.setConfig({'newspassid': {'np_request': false}});
+      let result = spec.blockTheRequest();
+      expect(result).to.be.true;
+      config.resetConfig();
+    });
+    it('should return false if np_request is true', function() {
+      config.setConfig({'newspassid': {'np_request': true}});
+      let result = spec.blockTheRequest();
+      expect(result).to.be.false;
+      config.resetConfig();
+    });
+  });
+  describe('getPageId', function() {
+    it('should return the same Page ID for multiple calls', function () {
+      let result = spec.getPageId();
+      expect(result).to.be.a('string');
+      let result2 = spec.getPageId();
+      expect(result2).to.equal(result);
+    });
+  });
+  describe('getBidRequestForBidId', function() {
+    it('should locate a bid inside a bid array', function () {
+      let result = spec.getBidRequestForBidId('2899ec066a91ff8', validBidRequestsMulti);
+      expect(result.testId).to.equal(1);
+      result = spec.getBidRequestForBidId('2899ec066a91ff0', validBidRequestsMulti);
+      expect(result.testId).to.equal(2);
+    });
+  });
+  describe('removeSingleBidderMultipleBids', function() {
+    it('should remove the multi bid by npappnexus for adslot 2d30e86db743a8', function() {
+      let validres = JSON.parse(JSON.stringify(multiResponse1));
+      expect(validres.body.seatbid[0].bid.length).to.equal(3);
+      expect(validres.body.seatbid[0].seat).to.equal('npappnexus');
+      let response = spec.removeSingleBidderMultipleBids(validres.body.seatbid);
+      expect(response.length).to.equal(2);
+      expect(response[0].bid.length).to.equal(2);
+      expect(response[0].seat).to.equal('npappnexus');
+      expect(response[1].bid.length).to.equal(2);
+    });
+  });
+});
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index f4d929b439c..90f0d8ae15c 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -2,90 +2,422 @@ import { expect } from 'chai';
 import { spec } from 'modules/nextMillenniumBidAdapter.js';
 
 describe('nextMillenniumBidAdapterTests', function() {
-  let bidRequestData = {
-    bids: [
-      {
-        bidId: 'transaction_1234',
-        bidder: 'nextMillennium',
-        params: {
-          placement_id: 12345
+  const bidRequestData = [
+    {
+      adUnitCode: 'test-div',
+      bidId: 'bid1234',
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidder: 'nextMillennium',
+      params: { placement_id: '-1' },
+      sizes: [[300, 250]],
+      uspConsent: '1---',
+      gdprConsent: {
+        consentString: 'kjfdniwjnifwenrif3',
+        gdprApplies: true
+      },
+      ortb2: {
+        device: {
+          w: 1500,
+          h: 1000
         },
-        sizes: [[300, 250]]
+        site: {
+          domain: 'example.com',
+          page: 'http://example.com'
+        }
+      }
+    }
+  ];
+
+  const serverResponse = {
+    body: {
+      id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
+      seatbid: [
+        {
+          bid: [
+            {
+              id: '7457329903666272789',
+              price: 0.5,
+              adm: 'Hello! It\'s a test ad!',
+              adid: '96846035',
+              adomain: ['test.addomain.com'],
+              w: 300,
+              h: 250
+            }
+          ]
+        }
+      ],
+      cur: 'USD',
+      ext: {
+        sync: {
+          image: ['urlA'],
+          iframe: ['urlB'],
+        }
       }
-    ]
+    }
   };
-  let request = [];
-
-  it('validate_pub_params', function() {
-    expect(
-      spec.isBidRequestValid({
-        bidder: 'nextMillennium',
-        params: {
-          placement_id: 12345
+
+  const bidRequestDataGI = [
+    {
+      adUnitCode: 'test-banner-gi',
+      bidId: 'bid1234',
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidder: 'nextMillennium',
+      params: { group_id: '1234' },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
         }
-      })
-    ).to.equal(true);
+      },
+
+      sizes: [[300, 250]],
+      uspConsent: '1---',
+      gdprConsent: {
+        consentString: 'kjfdniwjnifwenrif3',
+        gdprApplies: true
+      }
+    },
+
+    {
+      adUnitCode: 'test-banner-gi',
+      bidId: 'bid1234',
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidder: 'nextMillennium',
+      params: { group_id: '1234' },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 300]]
+        }
+      },
+
+      sizes: [[300, 250], [300, 300]],
+      uspConsent: '1---',
+      gdprConsent: {
+        consentString: 'kjfdniwjnifwenrif3',
+        gdprApplies: true
+      }
+    },
+
+    {
+      adUnitCode: 'test-video-gi',
+      bidId: 'bid1234',
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidder: 'nextMillennium',
+      params: { group_id: '1234' },
+      mediaTypes: {
+        video: {
+          playerSize: [640, 480],
+        }
+      },
+
+      uspConsent: '1---',
+      gdprConsent: {
+        consentString: 'kjfdniwjnifwenrif3',
+        gdprApplies: true
+      }
+    },
+  ];
+
+  it('Request params check with GDPR and USP Consent', function () {
+    const request = spec.buildRequests(bidRequestData, bidRequestData[0]);
+    expect(JSON.parse(request[0].data).user.ext.consent).to.equal('kjfdniwjnifwenrif3');
+    expect(JSON.parse(request[0].data).regs.ext.us_privacy).to.equal('1---');
+    expect(JSON.parse(request[0].data).regs.ext.gdpr).to.equal(1);
+  });
+
+  it('Test getUserSyncs function', function () {
+    const syncOptions = {
+      'iframeEnabled': false,
+      'pixelEnabled': true
+    }
+    let userSync = spec.getUserSyncs(syncOptions, [serverResponse], bidRequestData[0].gdprConsent, bidRequestData[0].uspConsent);
+    expect(userSync).to.be.an('array').with.lengthOf(1);
+    expect(userSync[0].type).to.equal('image');
+    expect(userSync[0].url).to.equal('urlA');
+
+    syncOptions.iframeEnabled = true;
+    syncOptions.pixelEnabled = false;
+    userSync = spec.getUserSyncs(syncOptions, [serverResponse], bidRequestData[0].gdprConsent, bidRequestData[0].uspConsent);
+    expect(userSync).to.be.an('array').with.lengthOf(1);
+    expect(userSync[0].type).to.equal('iframe');
+    expect(userSync[0].url).to.equal('urlB');
+  });
+
+  it('Request params check without GDPR Consent', function () {
+    delete bidRequestData[0].gdprConsent
+    const request = spec.buildRequests(bidRequestData, bidRequestData[0]);
+    expect(JSON.parse(request[0].data).regs.ext.gdpr).to.be.undefined;
+    expect(JSON.parse(request[0].data).regs.ext.us_privacy).to.equal('1---');
   });
 
   it('validate_generated_params', function() {
-    let bidRequestData = [
-      {
-        bidId: 'bid1234',
-        bidder: 'nextMillennium',
-        params: { placement_id: -1 },
-        sizes: [[300, 250]]
-      }
-    ];
-    let request = spec.buildRequests(bidRequestData);
+    const request = spec.buildRequests(bidRequestData);
     expect(request[0].bidId).to.equal('bid1234');
+    expect(JSON.parse(request[0].data).id).to.equal('b06c5141-fe8f-4cdf-9d7d-54415490a917');
   });
 
-  it('validate_getUserSyncs_function', function() {
-    expect(spec.getUserSyncs({ iframeEnabled: true })).to.have.lengthOf(1);
-    expect(spec.getUserSyncs({ iframeEnabled: false })).to.have.lengthOf(0);
+  it('use parameters group_id', function() {
+    for (let test of bidRequestDataGI) {
+      const request = spec.buildRequests([test]);
+      const requestData = JSON.parse(request[0].data);
+      const storeRequestId = requestData.ext.prebid.storedrequest.id;
+      const templateRE = /^g[1-9]\d*;(?:[1-9]\d*x[1-9]\d*\|)*[1-9]\d*x[1-9]\d*;/;
+      expect(templateRE.test(storeRequestId)).to.be.true;
+    };
+  });
+
+  it('Check if refresh_count param is incremented', function() {
+    const request = spec.buildRequests(bidRequestData);
+    expect(JSON.parse(request[0].data).ext.nextMillennium.refresh_count).to.equal(3);
+  });
+
+  it('Check if domain was added', function() {
+    const request = spec.buildRequests(bidRequestData)
+    expect(JSON.parse(request[0].data).site.domain).to.exist
+  })
+
+  it('Check if elOffsets was added', function() {
+    const request = spec.buildRequests(bidRequestData)
+    expect(JSON.parse(request[0].data).ext.nextMillennium.elOffsets).to.be.an('object')
+  })
+
+  it('Check if imp object was added', function() {
+    const request = spec.buildRequests(bidRequestData)
+    expect(JSON.parse(request[0].data).imp).to.be.an('array')
+  });
 
-    let pixel = spec.getUserSyncs({ iframeEnabled: true });
-    expect(pixel[0].type).to.equal('iframe');
-    expect(pixel[0].url).to.equal('https://brainlyads.com/hb/s2s/matching');
+  it('Check if imp prebid stored id is correct', function() {
+    const request = spec.buildRequests(bidRequestData)
+    const requestData = JSON.parse(request[0].data);
+    const storedReqId = requestData.ext.prebid.storedrequest.id;
+    expect(requestData.imp[0].ext.prebid.storedrequest.id).to.equal(storedReqId)
   });
 
   it('validate_response_params', function() {
-    let serverResponse = {
+    let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+
+    expect(bid.creativeId).to.equal('96846035');
+    expect(bid.ad).to.equal('Hello! It\'s a test ad!');
+    expect(bid.cpm).to.equal(0.5);
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
+  });
+
+  it('validate_videowrapper_response_params', function() {
+    const serverResponse = {
       body: {
-        cpm: 1.7,
-        width: 300,
-        height: 250,
-        creativeId: 'p35t0enob6twbt9mofjc8e',
-        ad: 'Hello! It\'s a test ad!'
+        id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '7457329903666272789',
+                price: 0.5,
+                adm: 'https://some_vast_host.com/vast.xml',
+                adid: '96846035',
+                adomain: ['test.addomain.com'],
+                w: 300,
+                h: 250,
+                ext: {
+                  prebid: {
+                    type: 'video'
+                  }
+                }
+              }
+            ]
+          }
+        ],
+        cur: 'USD'
       }
     };
 
-    let bids = spec.interpretResponse(serverResponse, bidRequestData.bids[0]);
+    let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
     expect(bids).to.have.lengthOf(1);
 
     let bid = bids[0];
 
-    expect(bid.creativeId).to.equal('p35t0enob6twbt9mofjc8e');
-    expect(bid.ad).to.equal('Hello! It\'s a test ad!');
-    expect(bid.cpm).to.equal(1.7);
+    expect(bid.creativeId).to.equal('96846035');
+    expect(bid.vastUrl).to.equal('https://some_vast_host.com/vast.xml');
+    expect(bid.cpm).to.equal(0.5);
     expect(bid.width).to.equal(300);
     expect(bid.height).to.equal(250);
     expect(bid.currency).to.equal('USD');
   });
 
-  it('validate_response_params_with passback', function() {
-    let serverResponse = {
-      body: [
-        {
-          hash: '1e100887dd614b0909bf6c49ba7f69fdd1360437',
-          content: 'Ad html passback',
-          size: [300, 250],
-          is_passback: 1
-        }
-      ]
+  it('validate_videoxml_response_params', function() {
+    const serverResponse = {
+      body: {
+        id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '7457329903666272789',
+                price: 0.5,
+                adm: '<vast><ad></ad></vast>',
+                adid: '96846035',
+                adomain: ['test.addomain.com'],
+                w: 300,
+                h: 250,
+                ext: {
+                  prebid: {
+                    type: 'video'
+                  }
+                }
+              }
+            ]
+          }
+        ],
+        cur: 'USD'
+      }
     };
-    let bids = spec.interpretResponse(serverResponse);
 
-    expect(bids).to.have.lengthOf(0);
+    let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+
+    expect(bid.creativeId).to.equal('96846035');
+    expect(bid.vastXml).to.equal('<vast><ad></ad></vast>');
+    expect(bid.cpm).to.equal(0.5);
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
   });
+
+  it('Check function of getting URL for sending statistics data', function() {
+    const dataForTests = [
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'appnexus',
+          bids: [{bidder: 'appnexus', params: {}}],
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'appnexus',
+          bids: [{bidder: 'appnexus', params: {placement_id: '807'}}],
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'nextMillennium',
+          bids: [{bidder: 'nextMillennium', params: {placement_id: '807'}}],
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&placements=807',
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'nextMillennium',
+          bids: [
+            {bidder: 'nextMillennium', params: {placement_id: '807'}},
+            {bidder: 'nextMillennium', params: {placement_id: '111'}},
+          ],
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&placements=807;111',
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'nextMillennium',
+          bids: [{bidder: 'nextMillennium', params: {placement_id: '807', group_id: '123'}}],
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&groups=123',
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'nextMillennium',
+          bids: [
+            {bidder: 'nextMillennium', params: {placement_id: '807', group_id: '123'}},
+            {bidder: 'nextMillennium', params: {group_id: '456'}},
+            {bidder: 'nextMillennium', params: {placement_id: '222'}},
+          ],
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&groups=123;456&placements=222',
+      },
+
+      {
+        eventName: 'bidResponse',
+        bid: {
+          bidderCode: 'appnexus',
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'bidResponse',
+        bid: {
+          bidderCode: 'nextMillennium',
+          params: {placement_id: '807'},
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidResponse&bidder=nextMillennium&source=pbjs&placements=807',
+      },
+
+      {
+        eventName: 'noBid',
+        bid: {
+          bidder: 'appnexus',
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'noBid',
+        bid: {
+          bidder: 'nextMillennium',
+          params: {placement_id: '807'},
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=noBid&bidder=nextMillennium&source=pbjs&placements=807',
+      },
+
+      {
+        eventName: 'bidTimeout',
+        bid: {
+          bidder: 'appnexus',
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'bidTimeout',
+        bid: {
+          bidder: 'nextMillennium',
+          params: {placement_id: '807'},
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidTimeout&bidder=nextMillennium&source=pbjs&placements=807',
+      },
+    ];
+
+    for (let {eventName, bid, expected} of dataForTests) {
+      const url = spec.getUrlPixelMetric(eventName, bid);
+      expect(url).to.equal(expected);
+    };
+  })
 });
diff --git a/test/spec/modules/nextrollBidAdapter_spec.js b/test/spec/modules/nextrollBidAdapter_spec.js
index 7722443e584..d4779120248 100644
--- a/test/spec/modules/nextrollBidAdapter_spec.js
+++ b/test/spec/modules/nextrollBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
-import { spec, tryGetPubtag, hasCCPAConsent } from 'modules/nextrollBidAdapter.js';
+import { spec } from 'modules/nextrollBidAdapter.js';
 import * as utils from 'src/utils.js';
+import { deepClone } from '../../../src/utils';
 
 describe('nextrollBidAdapter', function() {
   let utilsMock;
@@ -116,6 +117,27 @@ describe('nextrollBidAdapter', function() {
       expect(request.data.imp.ext.zone.id).to.be.equal('zone1');
     });
 
+    it('builds a request with the correct floor object', function () {
+      // bidfloor is defined, getFloor isn't
+      let bid = deepClone(validBid);
+      let request = spec.buildRequests([bid], {})[0];
+      expect(request.data.imp.bidfloor).to.be.equal(1);
+
+      // bidfloor not defined, getFloor not defined
+      bid = deepClone(validBid);
+      bid.params.bidfloor = null;
+      request = spec.buildRequests([bid], {})[0];
+      expect(request.data.imp.bidfloor).to.not.exist;
+
+      // bidfloor defined, getFloor defined, use getFloor
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      bid = deepClone(validBid);
+      bid.getFloor = () => getFloorResponse;
+      request = spec.buildRequests([bid], {})[0];
+
+      expect(request.data.imp.bidfloor).to.exist.and.to.equal(3);
+    });
+
     it('includes the sizes into the request correctly', function () {
       const bannerObject = spec.buildRequests([validBid], {})[0].data.imp.banner;
 
@@ -222,8 +244,8 @@ describe('nextrollBidAdapter', function() {
       let expectedResponse = {
         clickUrl: clickUrl,
         impressionTrackers: [impUrl],
-        privacyLink: 'https://info.evidon.com/pub_info/573',
-        privacyIcon: 'https://c.betrad.com/pub/icon1.png',
+        privacyLink: 'https://app.adroll.com/optout/personalized',
+        privacyIcon: 'https://s.adroll.com/j/ad-choices-small.png',
         title: titleText,
         image: {url: imgUrl, width: imgW, height: imgH},
         sponsoredBy: brandText,
@@ -252,8 +274,8 @@ describe('nextrollBidAdapter', function() {
         impressionTrackers: [impUrl],
         jstracker: [],
         clickTrackers: [],
-        privacyLink: 'https://info.evidon.com/pub_info/573',
-        privacyIcon: 'https://c.betrad.com/pub/icon1.png',
+        privacyLink: 'https://app.adroll.com/optout/personalized',
+        privacyIcon: 'https://s.adroll.com/j/ad-choices-small.png',
         title: titleText,
         image: {url: imgUrl, width: imgW, height: imgH},
         icon: {url: iconUrl, width: iconW, height: iconH},
diff --git a/test/spec/modules/nexx360BidAdapter_spec.js b/test/spec/modules/nexx360BidAdapter_spec.js
new file mode 100644
index 00000000000..a5da8b29fbc
--- /dev/null
+++ b/test/spec/modules/nexx360BidAdapter_spec.js
@@ -0,0 +1,525 @@
+import {expect} from 'chai';
+import {spec} from 'modules/nexx360BidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+import { requestBidsHook } from 'modules/consentManagement.js';
+
+describe('Nexx360 bid adapter tests', function () {
+  const DISPLAY_BID_REQUEST = {
+    'id': '77b3f21a-e0df-4495-8bce-4e8a1d2309c1',
+    'imp': [
+      {'id': '2b4d8fc1c1c7ea',
+        'tagid': 'div-1',
+        'ext': {'divId': 'div-1', 'nexx360': {'account': '1067', 'tag_id': 'luvxjvgn'}},
+        'banner': {'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}], 'topframe': 1}}, {'id': '38fc428ab96638', 'tagid': 'div-2', 'ext': {'divId': 'div-2', 'nexx360': {'account': '1067', 'tag_id': 'luvxjvgn'}}, 'banner': {'format': [{'w': 728, 'h': 90}, {'w': 970, 'h': 250}], 'topframe': 1}}],
+    'cur': ['USD'],
+    'at': 1,
+    'tmax': 3000,
+    'site': {'page': 'https://test.nexx360.io/adapter/index.html?nexx360_test=1', 'domain': 'test.nexx360.io'},
+    'regs': {'coppa': 0, 'ext': {'gdpr': 1}},
+    'device': {
+      'dnt': 0,
+      'h': 844,
+      'w': 390,
+      'ua': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1',
+      'language': 'fr'
+    },
+    'user': {
+      'ext': {
+        'consent': 'CPgocUAPgocUAAKAsAENCkCsAP_AAH_AAAqIJDtd_H__bW9r-f5_aft0eY1P9_r37uQzDhfNk-8F3L_W_LwX52E7NF36tq4KmR4ku1LBIUNlHMHUDUmwaokVryHsak2cpzNKJ7BEknMZOydYGF9vmxtj-QKY7_5_d3bx2D-t_9v239z3z81Xn3d53-_03LCdV5_9Dfn9fR_bc9KPt_58v8v8_____3_e__3_7994JEAEmGrcQBdmWODNoGEUCIEYVhIVQKACCgGFogMAHBwU7KwCfWECABAKAIwIgQ4AowIBAAAJAEhEAEgRYIAAARAIAAQAIhEIAGBgEFgBYGAQAAgGgYohQACBIQZEBEUpgQFQJBAa2VCCUF0hphAHWWAFBIjYqABEEgIrAAEBYOAYIkBKxYIEmKN8gBGCFAKJUK1EAAAA.YAAAAAAAAAAA',
+        'ConsentedProvidersSettings': {'consented_providers': '1~39.43.46.55.61.70.83.89.93.108.117.122.124.131.135.136.143.144.147.149.159.162.167.171.192.196.202.211.218.228.230.239.241.259.266.272.286.291.311.317.322.323.326.327.338.367.371.385.389.394.397.407.413.415.424.430.436.445.449.453.482.486.491.494.495.501.503.505.522.523.540.550.559.560.568.574.576.584.587.591.733.737.745.787.802.803.817.820.821.829.839.864.867.874.899.904.922.931.938.979.981.985.1003.1024.1027.1031.1033.1040.1046.1051.1053.1067.1085.1092.1095.1097.1099.1107.1127.1135.1143.1149.1152.1162.1166.1186.1188.1201.1205.1211.1215.1226.1227.1230.1252.1268.1270.1276.1284.1286.1290.1301.1307.1312.1345.1356.1364.1365.1375.1403.1415.1416.1419.1440.1442.1449.1455.1456.1465.1495.1512.1516.1525.1540.1548.1555.1558.1564.1570.1577.1579.1583.1584.1591.1603.1616.1638.1651.1653.1665.1667.1677.1678.1682.1697.1699.1703.1712.1716.1721.1725.1732.1745.1750.1765.1769.1782.1786.1800.1808.1810.1825.1827.1832.1838.1840.1842.1843.1845.1859.1866.1870.1878.1880.1889.1899.1917.1929.1942.1944.1962.1963.1964.1967.1968.1969.1978.2003.2007.2008.2027.2035.2039.2044.2047.2052.2056.2064.2068.2070.2072.2074.2088.2090.2103.2107.2109.2115.2124.2130.2133.2137.2140.2145.2147.2150.2156.2166.2177.2183.2186.2202.2205.2216.2219.2220.2222.2225.2234.2253.2264.2279.2282.2292.2299.2305.2309.2312.2316.2322.2325.2328.2331.2334.2335.2336.2337.2343.2354.2357.2358.2359.2370.2376.2377.2387.2392.2394.2400.2403.2405.2407.2411.2414.2416.2418.2425.2440.2447.2459.2461.2462.2465.2468.2472.2477.2481.2484.2486.2488.2493.2496.2497.2498.2499.2501.2510.2511.2517.2526.2527.2532.2534.2535.2542.2552.2563.2564.2567.2568.2569.2571.2572.2575.2577.2583.2584.2596.2601.2604.2605.2608.2609.2610.2612.2614.2621.2628.2629.2633.2634.2636.2642.2643.2645.2646.2647.2650.2651.2652.2656.2657.2658.2660.2661.2669.2670.2677.2681.2684.2686.2687.2690.2695.2698.2707.2713.2714.2729.2739.2767.2768.2770.2772.2784.2787.2791.2792.2798.2801.2805.2812.2813.2816.2817.2818.2821.2822.2827.2830.2831.2834.2838.2839.2840.2844.2846.2847.2849.2850.2852.2854.2856.2860.2862.2863.2865.2867.2869.2873.2874.2875.2876.2878.2880.2881.2882.2883.2884.2886.2887.2888.2889.2891.2893.2894.2895.2897.2898.2900.2901.2908.2909.2911.2912.2913.2914.2916.2917.2918.2919.2920.2922.2923.2924.2927.2929.2930.2931.2939.2940.2941.2947.2949.2950.2956.2961.2962.2963.2964.2965.2966.2968.2970.2973.2974.2975.2979.2980.2981.2983.2985.2986.2987.2991.2994.2995.2997.2999.3000.3002.3003.3005.3008.3009.3010.3012.3016.3017.3018.3019.3024.3025.3028.3034.3037.3038.3043.3045.3048.3052.3053.3055.3058.3059.3063.3065.3066.3068.3070.3072.3073.3074.3075.3076.3077.3078.3089.3090.3093.3094.3095.3097.3099.3104.3106.3109.3112.3117.3118.3119.3120.3124.3126.3127.3128.3130.3135.3136.3145.3149.3150.3151.3154.3155.3162.3163.3167.3172.3173.3180.3182.3183.3184.3185.3187.3188.3189.3190.3194.3196.3197.3209.3210.3211.3214.3215.3217.3219.3222.3223.3225.3226.3227.3228.3230.3231.3232.3234.3235.3236.3237.3238.3240.3241.3244.3245.3250.3251.3253.3257.3260.3268.3270.3272.3281.3288.3290.3292.3293.3295.3296.3300.3306.3307.3308.3314.3315.3316.3318.3324.3327.3328.3330'},
+        'eids': [{'source': 'id5-sync.com',
+          'uids': [{'id': 'ID5*tdrSpYbccONIbxmulXFRLEil1aozZGGVMo9eEZgydgYoYFZQRYoae3wJyY0YtmXGKGJ7uXIQByQ6f7uzcpy9Oyhj1jGRzCf0BCoI4VkkKZIoZBubolUKUXXxOIdQOz7ZKGV0E3sqi9Zut0BbOuoJAihpLbgfNgDJ0xRmQw04rDooaxn7_TIPzEX5_L5ohNkUKG01Gnh2djvcrcPigKlk7ChwnauCwHIetHYI32yYAnAocYyqoM9XkoVOHtyOTC_UKHIR0qVBVIzJ1Nn_g7kLqyhzfosadKVvf7RQCsE6QrYodtpOJKg7i72-tnMXkzgmKHjh98aEDfTQrZOkKebmAyh6GlOHtYn_sZBFjJwtWp4oe9j2QTNbzK3G0jp1PlJqKHxiu4LawFEKJ3yi5-NFUyh-YkEalJUWyl1cDlWo5NQogAy2HM8N_w0qrVQgNbrTKIHK3KzTXztH7WzBgYrk8g',
+            'atype': 1,
+            'ext': {'linkType': 2}}]},
+        {'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}]}},
+    'ext': {
+      'source': 'prebid.js',
+      'version': '7.20.0-pre',
+      'pageViewId': '5b970aba-51e9-4e0a-8299-f3f5618c695e'
+    }}
+
+  const VIDEO_BID_REQUEST = [
+    {
+      'bidder': 'nexx360',
+      'params': {
+        'account': '1067',
+        'tagId': 'yqsc1tfj'
+      },
+      'mediaTypes': {
+        'video': {
+          'context': 'instream',
+          'playerSize': [[640, 480]],
+          'mimes': ['video/mp4'],
+          'protocols': [1, 2, 3, 4, 5, 6],
+          'playbackmethod': [2],
+          'skip': 1
+        }
+      },
+      'adUnitCode': 'video1',
+      'transactionId': '5434c81c-7210-44ae-9014-67c75dee48d0',
+      'sizes': [[640, 480]],
+      'bidId': '22f90541e576a3',
+      'bidderRequestId': '1d4549243f3bfd',
+      'auctionId': 'ed21b528-bcab-47e2-8605-ec9b71000c89',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }
+  ]
+
+  const DEFAULT_OPTIONS = {
+    gdprConsent: {
+      gdprApplies: true,
+      consentString: 'BOzZdA0OzZdA0AGABBENDJ-AAAAvh7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__79__3z3_9pxP78k89r7337Mw_v-_v-b7JCPN_Y3v-8Kg',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    },
+    uspConsent: '111222333',
+    userId: { 'id5id': { uid: '1111' } },
+    schain: {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [{
+        'asi': 'exchange1.com',
+        'sid': '1234',
+        'hp': 1,
+        'rid': 'bid-request-1',
+        'name': 'publisher',
+        'domain': 'publisher.com'
+      }]
+    },
+  };
+
+  describe('isBidRequestValid()', function() {
+    let bannerBid;
+    beforeEach(function () {
+      bannerBid = {
+        'bidder': 'nexx360',
+        'mediaTypes': {'banner': {'sizes': [[300, 250], [300, 600]]}},
+        'adUnitCode': 'div-1',
+        'transactionId': '70bdc37e-9475-4b27-8c74-4634bdc2ee66',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '4906582fc87d0c',
+        'bidderRequestId': '332fda16002dbe',
+        'auctionId': '98932591-c822-42e3-850e-4b3cf748d063',
+      }
+    });
+    it('We verify isBidRequestValid with uncorrect tagid', function() {
+      bannerBid.params = { 'tagid': 'luvxjvgn' };
+      expect(spec.isBidRequestValid(bannerBid)).to.be.equal(false);
+    });
+
+    it('We verify isBidRequestValid with correct tagId', function() {
+      bannerBid.params = { 'tagId': 'luvxjvgn' };
+      expect(spec.isBidRequestValid(bannerBid)).to.be.equal(true);
+    });
+  });
+
+  describe('when request is for a multiformat ad', function () {
+    describe('and request config uses mediaTypes video and banner', () => {
+      const multiformatBid = {
+        'bidder': 'nexx360',
+        'params': {'tagId': 'luvxjvgn'},
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250]]
+          },
+          'video': {
+            'playerSize': [300, 250]
+          }
+        },
+        'adUnitCode': 'div-1',
+        'transactionId': '70bdc37e-9475-4b27-8c74-4634bdc2ee66',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '4906582fc87d0c',
+        'bidderRequestId': '332fda16002dbe',
+        'auctionId': '98932591-c822-42e3-850e-4b3cf748d063',
+      }
+      it('should return true multisize when required params found', function () {
+        expect(spec.isBidRequestValid(multiformatBid)).to.equal(true);
+      });
+    });
+  });
+
+  describe('when request is for a video ad', function () {
+    describe('and request config uses mediaTypes video and banner', () => {
+      const videoBid = {
+        'bidder': 'nexx360',
+        'params': {'tagId': 'luvxjvgn'},
+        'mediaTypes': {
+          'video': {
+            'playerSize': [300, 250]
+          }
+        },
+        'adUnitCode': 'div-1',
+        'transactionId': '70bdc37e-9475-4b27-8c74-4634bdc2ee66',
+        'bidId': '4906582fc87d0c',
+        'bidderRequestId': '332fda16002dbe',
+        'auctionId': '98932591-c822-42e3-850e-4b3cf748d063',
+      }
+      it('should return true multisize when required params found', function () {
+        expect(spec.isBidRequestValid(videoBid)).to.equal(true);
+      });
+    });
+  });
+
+  describe('buildRequests()', function() {
+    describe('We test with a multiple display bids', function() {
+      const sampleBids = [
+        {
+          bidder: 'nexx360',
+          params: {
+            tagId: 'luvxjvgn'
+          },
+          adUnitCode: 'div-1',
+          transactionId: '469a570d-f187-488d-b1cb-48c1a2009be9',
+          sizes: [[300, 250], [300, 600]],
+          bidId: '44a2706ac3574',
+          bidderRequestId: '359bf8a3c06b2e',
+          auctionId: '2e684815-b44e-4e04-b812-56da54adbe74',
+          userIdAsEids: [
+            {
+              source: 'id5-sync.com',
+              uids: [
+                {
+                  id: 'ID5*xe3R0Pbrc5Y4WBrb5UZSWTiS1t9DU2LgQrhdZOgFdXMoglhqmjs_SfBbyHfSYGZKKIT4Gf-XOQ_anA3iqi0hJSiFyD3aICGHDJFxNS8LO84ohwTQ0EiwOexZAbBlH0chKIhbvdGBfuouNuVF_YHCoyiLQJDp3WQiH96lE9MH2T0ojRqoyR623gxAWlBCBPh7KI4bYtZlet3Vtr-gH5_xqCiSEd7aYV37wHxUTSN38Isok_0qDCHg4pKXCcVM2h6FKJSGmvw-xPm9HkfkIcbh1CiVVG4nREP142XrBecdzhQomNlcalmwdzGHsuHPjTP-KJraa15yvvZDceq-f_YfECicDllYBLEsg24oPRM-ibMonWtT9qOm5dSfWS5G_r09KJ4HMB6REICq1wleDD1mwSigXkM_nxIKa4TxRaRqEekoooWRwuKA5-euHN3xxNfIKKP19EtGhuNTs0YdCSe8_w',
+                  atype: 1,
+                  ext: {
+                    linkType: 2
+                  }
+                }
+              ]
+            },
+            {
+              source: 'domain.com',
+              uids: [
+                {
+                  id: 'value read from cookie or local storage',
+                  atype: 1,
+                  ext: {
+                    stype: 'ppuid'
+                  }
+                }
+              ]
+            }
+          ],
+        },
+        {
+          bidder: 'nexx360',
+          params: {
+            tagId: 'luvxjvgn',
+            allBids: true,
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90], [970, 250]]
+            }
+          },
+          adUnitCode: 'div-2',
+          transactionId: '6196885d-4e76-40dc-a09c-906ed232626b',
+          sizes: [[728, 90], [970, 250]],
+          bidId: '5ba94555219a03',
+          bidderRequestId: '359bf8a3c06b2e',
+          auctionId: '2e684815-b44e-4e04-b812-56da54adbe74',
+        }
+      ]
+      const bidderRequest = {
+        bidderCode: 'nexx360',
+        auctionId: '2e684815-b44e-4e04-b812-56da54adbe74',
+        bidderRequestId: '359bf8a3c06b2e',
+        refererInfo: {
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: [
+            'https://test.nexx360.io/adapter/index.html'
+          ],
+          topmostLocation: 'https://test.nexx360.io/adapter/index.html',
+          location: 'https://test.nexx360.io/adapter/index.html',
+          canonicalUrl: null,
+          page: 'https://test.nexx360.io/adapter/index.html',
+          domain: 'test.nexx360.io',
+          ref: null,
+          legacy: {
+            reachedTop: true,
+            isAmp: false,
+            numIframes: 0,
+            stack: [
+              'https://test.nexx360.io/adapter/index.html'
+            ],
+            referer: 'https://test.nexx360.io/adapter/index.html',
+            canonicalUrl: null
+          },
+        },
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'CPhdLUAPhdLUAAKAsAENCmCsAP_AAE7AAAqIJFNd_H__bW9r-f5_aft0eY1P9_r37uQzDhfNk-8F3L_W_LwX52E7NF36tq4KmR4ku1LBIUNlHMHUDUmwaokVryHsak2cpzNKJ7BEknMZOydYGF9vmxtj-QKY7_5_d3bx2D-t_9v239z3z81Xn3d53-_03LCdV5_9Dfn9fR_bc9KPt_58v8v8_____3_e__3_7997BIiAaADgAJYBnwEeAJXAXmAwQBj4DtgHcgPBAeKBIgAA.YAAAAAAAAAAA',
+        }
+      };
+      it('We perform a test with 2 display adunits', function() {
+        const displayBids = [...sampleBids];
+        displayBids[0].mediaTypes = {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        };
+        const request = spec.buildRequests(displayBids, bidderRequest);
+        const requestContent = request.data;
+        expect(request).to.have.property('method').and.to.equal('POST');
+        expect(requestContent.id).to.be.eql('2e684815-b44e-4e04-b812-56da54adbe74');
+        expect(requestContent.cur[0]).to.be.eql('USD');
+        expect(requestContent.imp.length).to.be.eql(2);
+        expect(requestContent.imp[0].id).to.be.eql('44a2706ac3574');
+        expect(requestContent.imp[0].tagid).to.be.eql('div-1');
+        expect(requestContent.imp[0].ext.divId).to.be.eql('div-1');
+        expect(requestContent.imp[0].ext.nexx360.tagId).to.be.eql('luvxjvgn');
+        expect(requestContent.imp[0].ext.nexx360.allBids).to.be.eql(false);
+        expect(requestContent.imp[0].banner.format.length).to.be.eql(2);
+        expect(requestContent.imp[0].banner.format[0].w).to.be.eql(300);
+        expect(requestContent.imp[0].banner.format[0].h).to.be.eql(250);
+        expect(requestContent.imp[1].ext.nexx360.allBids).to.be.eql(true);
+        expect(requestContent.regs.ext.gdpr).to.be.eql(1);
+        expect(requestContent.user.ext.consent).to.be.eql(bidderRequest.gdprConsent.consentString);
+        expect(requestContent.user.ext.eids.length).to.be.eql(2);
+      });
+
+      it('We perform a test with a multiformat adunit', function() {
+        const multiformatBids = [...sampleBids];
+        multiformatBids[0].mediaTypes = {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          },
+          video: {
+            context: 'outstream',
+            playerSize: [640, 480],
+            mimes: ['video/mp4'],
+            protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+            playbackmethod: [2],
+            skip: 1,
+            playback_method: ['auto_play_sound_off']
+          }
+        };
+        const request = spec.buildRequests(multiformatBids, bidderRequest);
+        const requestContent = request.data;
+        expect(requestContent.imp[0].video.context).to.be.eql('outstream');
+        expect(requestContent.imp[0].video.playbackmethod[0]).to.be.eql(2);
+      });
+
+      it('We perform a test with a video adunit', function() {
+        const videoBids = [sampleBids[0]];
+        videoBids[0].mediaTypes = {
+          video: {
+            context: 'instream',
+            playerSize: [640, 480],
+            mimes: ['video/mp4'],
+            protocols: [1, 2, 3, 4, 5, 6],
+            playbackmethod: [2],
+            skip: 1
+          }
+        };
+        const request = spec.buildRequests(videoBids, bidderRequest);
+        const requestContent = request.data;
+        expect(request).to.have.property('method').and.to.equal('POST');
+        expect(requestContent.imp[0].video.context).to.be.eql('instream');
+        expect(requestContent.imp[0].video.playbackmethod[0]).to.be.eql(2);
+      })
+    });
+  });
+
+  describe('interpretResponse()', function() {
+    it('banner responses', function() {
+      const response = {
+        body: {
+          'id': 'a8d3a675-a4ba-4d26-807f-c8f2fad821e0',
+          'cur': 'USD',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '4427551302944024629',
+                  'impid': '226175918ebeda',
+                  'price': 1.5,
+                  'type': 'banner',
+                  'adomain': [
+                    'http://prebid.org'
+                  ],
+                  'crid': '98493581',
+                  'ssp': 'appnexus',
+                  'h': 600,
+                  'w': 300,
+                  'cat': [
+                    'IAB3-1'
+                  ],
+                  'creativeuuid': 'fdddcebc-1edf-489d-880d-1418d8bdc493',
+                  'adUrl': 'https://fast.nexx360.io/cache?uuid=fdddcebc-1edf-489d-880d-1418d8bdc493',
+                  'ext': {
+                    'dsp_id': 'ssp1',
+                    'buyer_id': 'foo',
+                    'brand_id': 'bar'
+                  }
+                }
+              ],
+              'seat': 'appnexus'
+            }
+          ],
+          'cookies': []
+        }
+      };
+      const output = spec.interpretResponse(response);
+      expect(output[0].bidderCode).to.be.eql('nexx360');
+      expect(output[0].adUrl).to.be.eql(response.body.seatbid[0].bid[0].adUrl);
+      expect(output[0].mediaType).to.be.eql(response.body.seatbid[0].bid[0].type);
+      expect(output[0].currency).to.be.eql(response.body.cur);
+      expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
+      expect(output[0].meta.networkId).to.be.eql(response.body.seatbid[0].bid[0].ext.dsp_id);
+      expect(output[0].meta.advertiserId).to.be.eql(response.body.seatbid[0].bid[0].ext.buyer_id);
+      expect(output[0].meta.brandId).to.be.eql(response.body.seatbid[0].bid[0].ext.brand_id);
+    });
+    it('video responses', function() {
+      const response = {
+        body: {
+          'id': '33894759-0ea2-41f1-84b3-75132eefedb6',
+          'cur': 'USD',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '294478680080716675',
+                  'impid': '2c835a6039e65f',
+                  'price': 5,
+                  'type': 'instream',
+                  'adomain': [
+                    ''
+                  ],
+                  'crid': '97517771',
+                  'ssp': 'appnexus',
+                  'h': 1,
+                  'w': 1,
+                  'vastXml': '<VAST version="3.0">\n    <Ad>\n      <Wrapper>\n        <AdSystem>prebid.org wrapper</AdSystem>\n        <VASTAdTagURI><![CDATA[https://fast.nexx360.io/cache?uuid=9987328a-b15a-4549-974b-203cd9bbe5d3]]></VASTAdTagURI>\n        <Impression><![CDATA[https://fast.nexx360.io/track-imp?ssp=appnexus&type=booster&price=5.002000800320127&cur=EUR&user_agent=Mozilla%2F5.0+%28iPhone%3B+CPU+iPhone+OS+13_2_3+like+Mac+OS+X%29+AppleWebKit%2F605.1.15+%28KHTML%2C+like+Gecko%29+Version%2F13.0.3+Mobile%2F15E148+Safari%2F604.1&consent=1&abtest_id=0&tag_id=yqsc1tfj&mediatype=video]]></Impression>\n        <Creatives></Creatives>\n      </Wrapper>\n    </Ad>\n  </VAST>'
+                }
+              ],
+              'seat': 'appnexus'
+            }
+          ],
+          'cookies': []
+        }
+      };
+      const output = spec.interpretResponse(response);
+      expect(output[0].bidderCode).to.be.eql('nexx360');
+      expect(output[0].vastXml).to.be.eql(response.body.seatbid[0].bid[0].vastXml);
+      expect(output[0].mediaType).to.be.eql('video');
+      expect(output[0].currency).to.be.eql(response.body.cur);
+      expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
+    });
+  });
+
+  describe('interpretResponse()', function() {
+    it('banner responses', function() {
+      const response = {
+        body: {
+          'id': 'a8d3a675-a4ba-4d26-807f-c8f2fad821e0',
+          'cur': 'USD',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '4427551302944024629',
+                  'impid': '226175918ebeda',
+                  'price': 1.5,
+                  'type': 'banner',
+                  'adomain': [
+                    'http://prebid.org'
+                  ],
+                  'crid': '98493581',
+                  'ssp': 'appnexus',
+                  'h': 600,
+                  'w': 300,
+                  'cat': [
+                    'IAB3-1'
+                  ],
+                  'creativeuuid': 'fdddcebc-1edf-489d-880d-1418d8bdc493',
+                  'adUrl': 'https://fast.nexx360.io/cache?uuid=fdddcebc-1edf-489d-880d-1418d8bdc493'
+                }
+              ],
+              'seat': 'appnexus'
+            }
+          ],
+          'cookies': []
+        }
+      };
+      const output = spec.interpretResponse(response);
+      expect(output[0].bidderCode).to.be.eql('nexx360');
+      expect(output[0].adUrl).to.be.eql(response.body.seatbid[0].bid[0].adUrl);
+      expect(output[0].mediaType).to.be.eql(response.body.seatbid[0].bid[0].type);
+      expect(output[0].currency).to.be.eql(response.body.cur);
+      expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
+    });
+    it('video responses', function() {
+      const response = {
+        body: {
+          'id': '33894759-0ea2-41f1-84b3-75132eefedb6',
+          'cur': 'USD',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '294478680080716675',
+                  'impid': '2c835a6039e65f',
+                  'price': 5,
+                  'type': 'instream',
+                  'adomain': [
+                    ''
+                  ],
+                  'crid': '97517771',
+                  'ssp': 'appnexus',
+                  'h': 1,
+                  'w': 1,
+                  'vastXml': '<VAST version="3.0">\n    <Ad>\n      <Wrapper>\n        <AdSystem>prebid.org wrapper</AdSystem>\n        <VASTAdTagURI><![CDATA[https://fast.nexx360.io/cache?uuid=9987328a-b15a-4549-974b-203cd9bbe5d3]]></VASTAdTagURI>\n        <Impression><![CDATA[https://fast.nexx360.io/track-imp?ssp=appnexus&type=booster&price=5.002000800320127&cur=EUR&user_agent=Mozilla%2F5.0+%28iPhone%3B+CPU+iPhone+OS+13_2_3+like+Mac+OS+X%29+AppleWebKit%2F605.1.15+%28KHTML%2C+like+Gecko%29+Version%2F13.0.3+Mobile%2F15E148+Safari%2F604.1&consent=1&abtest_id=0&tag_id=yqsc1tfj&mediatype=video]]></Impression>\n        <Creatives></Creatives>\n      </Wrapper>\n    </Ad>\n  </VAST>'
+                }
+              ],
+              'seat': 'appnexus'
+            }
+          ],
+          'cookies': []
+        }
+      };
+      const output = spec.interpretResponse(response);
+      expect(output[0].bidderCode).to.be.eql('nexx360');
+      expect(output[0].vastXml).to.be.eql(response.body.seatbid[0].bid[0].vastXml);
+      expect(output[0].mediaType).to.be.eql('video');
+      expect(output[0].currency).to.be.eql(response.body.cur);
+      expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
+    });
+  });
+
+  describe('getUserSyncs()', function() {
+    const response = { body: { cookies: [] } };
+    it('Verifies user sync without cookie in bid response', function () {
+      var syncs = spec.getUserSyncs({}, [response], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+      expect(syncs).to.have.lengthOf(0);
+    });
+    it('Verifies user sync with cookies in bid response', function () {
+      response.body.cookies = [{'type': 'image', 'url': 'http://www.cookie.sync.org/'}];
+      var syncs = spec.getUserSyncs({}, [response], DEFAULT_OPTIONS.gdprConsent);
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0]).to.have.property('type').and.to.equal('image');
+      expect(syncs[0]).to.have.property('url').and.to.equal('http://www.cookie.sync.org/');
+    });
+    it('Verifies user sync with no bid response', function() {
+      var syncs = spec.getUserSyncs({}, null, DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+      expect(syncs).to.have.lengthOf(0);
+    });
+    it('Verifies user sync with no bid body response', function() {
+      var syncs = spec.getUserSyncs({}, [], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+      expect(syncs).to.have.lengthOf(0);
+      var syncs = spec.getUserSyncs({}, [{}], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+      expect(syncs).to.have.lengthOf(0);
+    });
+  });
+});
diff --git a/test/spec/modules/nobidBidAdapter_spec.js b/test/spec/modules/nobidBidAdapter_spec.js
index 3b8fd32160b..7ea89f7dd3f 100644
--- a/test/spec/modules/nobidBidAdapter_spec.js
+++ b/test/spec/modules/nobidBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import * as utils from 'src/utils.js';
 import { spec } from 'modules/nobidBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
 import * as bidderFactory from 'src/adapters/bidderFactory.js';
 
 describe('Nobid Adapter', function () {
@@ -50,6 +51,204 @@ describe('Nobid Adapter', function () {
     });
   });
 
+  describe('Request with ORTB2', function () {
+    const SITE_ID = 2;
+    const REFERER = 'https://www.examplereferer.com';
+    const BIDDER_CODE = 'duration';
+    let bidRequests = [
+      {
+        'bidder': BIDDER_CODE,
+        'params': {
+          'siteId': SITE_ID
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      }
+    ];
+
+    let bidderRequest = {
+      refererInfo: {page: REFERER}, bidderCode: BIDDER_CODE
+    }
+
+    const siteName = 'example';
+    const siteDomain = 'page.example.com';
+    const sitePage = 'https://page.example.com/here.html';
+    const siteRef = 'https://ref.example.com';
+    const siteKeywords = 'power tools, drills';
+    const siteSearch = 'drill';
+    const siteCat = 'IAB2';
+    const siteSectionCat = 'IAB2-2';
+    const sitePageCat = 'IAB2-12';
+
+    it('ortb2 should exist', function () {
+      const ortb2 = {
+        site: {
+          name: siteName,
+          domain: siteDomain,
+          cat: [ siteCat ],
+          sectioncat: [ siteSectionCat ],
+          pagecat: [ sitePageCat ],
+          page: sitePage,
+          ref: siteRef,
+          keywords: siteKeywords,
+          search: siteSearch
+        }
+      };
+      const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2});
+      let payload = JSON.parse(request.data);
+      payload = JSON.parse(JSON.stringify(payload));
+      expect(payload.sid).to.equal(SITE_ID);
+      expect(payload.ortb2.site.name).to.equal(siteName);
+      expect(payload.ortb2.site.domain).to.equal(siteDomain);
+      expect(payload.ortb2.site.page).to.equal(sitePage);
+      expect(payload.ortb2.site.ref).to.equal(siteRef);
+      expect(payload.ortb2.site.keywords).to.equal(siteKeywords);
+      expect(payload.ortb2.site.search).to.equal(siteSearch);
+      expect(payload.ortb2.site.cat[0]).to.equal(siteCat);
+      expect(payload.ortb2.site.sectioncat[0]).to.equal(siteSectionCat);
+      expect(payload.ortb2.site.pagecat[0]).to.equal(sitePageCat);
+    });
+  });
+
+  describe('isDurationBidRequestValid', function () {
+    const SITE_ID = 2;
+    const REFERER = 'https://www.examplereferer.com';
+    const BIDDER_CODE = 'duration';
+    let bidRequests = [
+      {
+        'bidder': BIDDER_CODE,
+        'params': {
+          'siteId': SITE_ID
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      }
+    ];
+
+    let bidderRequest = {
+      refererInfo: {page: REFERER}, bidderCode: BIDDER_CODE
+    }
+
+    it('should add source and version to the tag', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.sid).to.equal(SITE_ID);
+      expect(payload.pjbdr).to.equal(BIDDER_CODE);
+      expect(payload.l).to.exist.and.to.equal(encodeURIComponent(REFERER));
+      expect(payload.tt).to.exist;
+      expect(payload.a).to.exist;
+      expect(payload.t).to.exist;
+      expect(payload.tz).to.exist;
+      expect(payload.r).to.exist;
+      expect(payload.lang).to.exist;
+      expect(payload.ref).to.exist;
+      expect(payload.gdpr).to.exist;
+    });
+
+    it('sends bid request to ad size', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.a).to.exist;
+      expect(payload.a.length).to.exist.and.to.equal(1);
+      expect(payload.a[0].z[0][0]).to.equal(300);
+      expect(payload.a[0].z[0][1]).to.equal(250);
+    });
+
+    it('sends bid request to div id', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.a).to.exist;
+      expect(payload.a[0].d).to.equal('adunit-code');
+    });
+
+    it('sends bid request to site id', function () {
+	  const request = spec.buildRequests(bidRequests);
+	  const payload = JSON.parse(request.data);
+	  expect(payload.a).to.exist;
+	  expect(payload.a[0].sid).to.equal(2);
+	  expect(payload.a[0].at).to.equal('banner');
+	  expect(payload.a[0].params.siteId).to.equal(2);
+    });
+
+    it('sends bid request to ad type', function () {
+  	  const request = spec.buildRequests(bidRequests);
+  	  const payload = JSON.parse(request.data);
+  	  expect(payload.a).to.exist;
+  	  expect(payload.a[0].at).to.equal('banner');
+  	});
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.contain('ads.servenobid.com/adreq');
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should add gdpr consent information to the request', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'nobid',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr).to.exist;
+      expect(payload.gdpr.consentString).to.exist.and.to.equal(consentString);
+      expect(payload.gdpr.consentRequired).to.exist.and.to.be.true;
+    });
+
+    it('should add gdpr consent information to the request', function () {
+      let bidderRequest = {
+        'bidderCode': 'nobid',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          gdprApplies: false
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr).to.exist;
+      expect(payload.gdpr.consentString).to.not.exist;
+      expect(payload.gdpr.consentRequired).to.exist.and.to.be.false;
+    });
+
+    it('should add usp consent information to the request', function () {
+      let bidderRequest = {
+        'bidderCode': 'nobid',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'uspConsent': '1Y-N'
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.usp).to.exist;
+      expect(payload.usp).to.exist.and.to.equal('1Y-N');
+    });
+  });
+
   describe('isVideoBidRequestValid', function () {
     let bid = {
       bidder: 'nobid',
@@ -107,18 +306,18 @@ describe('Nobid Adapter', function () {
     ];
 
     let bidderRequest = {
-      refererInfo: {referer: REFERER}
+      refererInfo: {page: REFERER}
     }
 
     it('should add source and version to the tag', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.sid).to.equal(SITE_ID);
+      expect(payload.pjbdr).to.equal('nobid');
       expect(payload.l).to.exist.and.to.equal(encodeURIComponent(REFERER));
       expect(payload.a).to.exist;
       expect(payload.t).to.exist;
       expect(payload.tz).to.exist;
-      expect(payload.r).to.exist;
       expect(payload.lang).to.exist;
       expect(payload.ref).to.exist;
       expect(payload.a[0].d).to.exist.and.to.equal('adunit-code');
@@ -196,12 +395,13 @@ describe('Nobid Adapter', function () {
     ];
 
     let bidderRequest = {
-      refererInfo: {referer: REFERER}
+      refererInfo: {page: REFERER}
     }
 
     it('should add source and version to the tag', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
+      expect(payload.pjbdr).to.equal('nobid');
       expect(payload.sid).to.equal(SITE_ID);
       expect(payload.l).to.exist.and.to.equal(encodeURIComponent(REFERER));
       expect(payload.a).to.exist;
@@ -228,6 +428,75 @@ describe('Nobid Adapter', function () {
     });
   });
 
+  describe('buildRequestsEIDs', function () {
+    const SITE_ID = 2;
+    const REFERER = 'https://www.examplereferer.com';
+    let bidRequests = [
+      {
+        'bidder': 'nobid',
+        'params': {
+          'siteId': SITE_ID
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'userIdAsEids': [
+          {
+            'source': 'criteo.com',
+            'uids': [
+              {
+                'id': 'CRITEO_ID',
+                'atype': 1
+              }
+            ]
+          },
+          {
+            'source': 'id5-sync.com',
+            'uids': [
+              {
+                'id': 'ID5_ID',
+                'atype': 1
+              }
+            ],
+            'ext': {
+              'linkType': 0
+            }
+          },
+          {
+            'source': 'adserver.org',
+            'uids': [
+              {
+                'id': 'TD_ID',
+                'atype': 1,
+                'ext': {
+                  'rtiPartner': 'TDID'
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ];
+
+    let bidderRequest = {
+      refererInfo: {page: REFERER}
+    }
+
+    it('should criteo eid', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.sid).to.exist.and.to.equal(2);
+      expect(payload.eids[0].source).to.exist.and.to.equal('criteo.com');
+      expect(payload.eids[0].uids[0].id).to.exist.and.to.equal('CRITEO_ID');
+      expect(payload.eids[1].source).to.exist.and.to.equal('id5-sync.com');
+      expect(payload.eids[1].uids[0].id).to.exist.and.to.equal('ID5_ID');
+      expect(payload.eids[2].source).to.exist.and.to.equal('adserver.org');
+      expect(payload.eids[2].uids[0].id).to.exist.and.to.equal('TD_ID');
+    });
+  });
+
   describe('buildRequests', function () {
     const SITE_ID = 2;
     const REFERER = 'https://www.examplereferer.com';
@@ -246,7 +515,7 @@ describe('Nobid Adapter', function () {
     ];
 
     let bidderRequest = {
-      refererInfo: {referer: REFERER}
+      refererInfo: {page: REFERER}
     }
 
     it('should add source and version to the tag', function () {
@@ -264,6 +533,38 @@ describe('Nobid Adapter', function () {
       expect(payload.gdpr).to.exist;
     });
 
+    it('sends bid request to ad size', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.a).to.exist;
+      expect(payload.a.length).to.exist.and.to.equal(1);
+      expect(payload.a[0].z[0][0]).to.equal(300);
+      expect(payload.a[0].z[0][1]).to.equal(250);
+    });
+
+    it('sends bid request to div id', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.a).to.exist;
+      expect(payload.a[0].d).to.equal('adunit-code');
+    });
+
+    it('sends bid request to site id', function () {
+	  const request = spec.buildRequests(bidRequests);
+	  const payload = JSON.parse(request.data);
+	  expect(payload.a).to.exist;
+	  expect(payload.a[0].sid).to.equal(2);
+	  expect(payload.a[0].at).to.equal('banner');
+	  expect(payload.a[0].params.siteId).to.equal(2);
+    });
+
+    it('sends bid request to ad type', function () {
+  	  const request = spec.buildRequests(bidRequests);
+  	  const payload = JSON.parse(request.data);
+  	  expect(payload.a).to.exist;
+  	  expect(payload.a[0].at).to.equal('banner');
+  	});
+
     it('sends bid request to ENDPOINT via POST', function () {
       const request = spec.buildRequests(bidRequests);
       expect(request.url).to.contain('ads.servenobid.com/adreq');
@@ -291,6 +592,43 @@ describe('Nobid Adapter', function () {
       expect(payload.gdpr.consentString).to.exist.and.to.equal(consentString);
       expect(payload.gdpr.consentRequired).to.exist.and.to.be.true;
     });
+
+    it('should add gdpr consent information to the request', function () {
+      let bidderRequest = {
+        'bidderCode': 'nobid',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          gdprApplies: false
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr).to.exist;
+      expect(payload.gdpr.consentString).to.not.exist;
+      expect(payload.gdpr.consentRequired).to.exist.and.to.be.false;
+    });
+
+    it('should add usp consent information to the request', function () {
+      let bidderRequest = {
+        'bidderCode': 'nobid',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'uspConsent': '1Y-N'
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.usp).to.exist;
+      expect(payload.usp).to.exist.and.to.equal('1Y-N');
+    });
   });
 
   describe('buildRequestsRefreshCount', function () {
@@ -311,7 +649,7 @@ describe('Nobid Adapter', function () {
     ];
 
     let bidderRequest = {
-      refererInfo: {referer: REFERER}
+      refererInfo: {page: REFERER}
     }
 
     it('should refreshCount = 4', function () {
@@ -460,6 +798,47 @@ describe('Nobid Adapter', function () {
     });
   });
 
+  describe('interpretResponseWithMeta', function () {
+    const CREATIVE_ID_300x250 = 'CREATIVE-100';
+    const ADUNIT_300x250 = 'ADUNIT-1';
+    const ADMARKUP_300x250 = 'ADMARKUP-300x250';
+    const PRICE_300x250 = 0.51;
+    const REQUEST_ID = '3db3773286ee59';
+    const DEAL_ID = 'deal123';
+    const ADOMAINS = ['adomain1', 'adomain2'];
+    let response = {
+      country: 'US',
+      ip: '68.83.15.75',
+      device: 'COMPUTER',
+      site: 2,
+      bids: [
+        {id: 1,
+          bdrid: 101,
+          divid: ADUNIT_300x250,
+          dealid: DEAL_ID,
+          creativeid: CREATIVE_ID_300x250,
+          size: {'w': 300, 'h': 250},
+          adm: ADMARKUP_300x250,
+          price: '' + PRICE_300x250,
+          meta: {
+        	  advertiserDomains: ADOMAINS
+          }
+        }
+      ]
+    };
+
+    it('should meta.advertiserDomains be respected', function () {
+      let bidderRequest = {
+        bids: [{
+          bidId: REQUEST_ID,
+          adUnitCode: ADUNIT_300x250
+        }]
+      }
+      let result = spec.interpretResponse({ body: response }, {bidderRequest: bidderRequest});
+      expect(result[0].meta.advertiserDomains).to.equal(ADOMAINS);
+    });
+  });
+
   describe('buildRequestsWithSupplyChain', function () {
     const SITE_ID = 2;
     let bidRequests = [
diff --git a/test/spec/modules/novatiqIdSystem_spec.js b/test/spec/modules/novatiqIdSystem_spec.js
new file mode 100644
index 00000000000..b92fb0d219a
--- /dev/null
+++ b/test/spec/modules/novatiqIdSystem_spec.js
@@ -0,0 +1,153 @@
+import { novatiqIdSubmodule } from 'modules/novatiqIdSystem.js';
+import * as utils from 'src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+
+describe('novatiqIdSystem', function () {
+  let urlParams = {
+    novatiqId: 'snowflake',
+    useStandardUuid: false,
+    useSspId: true,
+    useSspHost: true
+  }
+
+  describe('getSrcId', function() {
+    it('getSrcId should set srcId value to 000 due to undefined parameter in config section', function() {
+      const config = { params: { } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams, urlParams);
+      expect(response).to.eq('000');
+    });
+
+    it('getSrcId should set srcId value to 000 due to missing value in config section', function() {
+      const config = { params: { sourceid: '' } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams, urlParams);
+      expect(response).to.eq('000');
+    });
+
+    it('getSrcId should set value to 000 due to null value in config section', function() {
+      const config = { params: { sourceid: null } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams, urlParams);
+      expect(response).to.eq('000');
+    });
+
+    it('getSrcId should set value to 001 due to wrong length in config section max 3 chars', function() {
+      const config = { params: { sourceid: '1234' } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams, urlParams);
+      expect(response).to.eq('001');
+    });
+  });
+
+  describe('getId', function() {
+    it('should log message if novatiqId has wrong format', function() {
+      const config = { params: { sourceid: '123' } };
+      const response = novatiqIdSubmodule.getId(config);
+      expect(response.id).to.have.length(40);
+    });
+
+    it('should log message if novatiqId not provided', function() {
+      const config = { params: { sourceid: '123' } };
+      const response = novatiqIdSubmodule.getId(config);
+      expect(response.id).should.be.not.empty;
+    });
+
+    it('should set sharedStatus if sharedID is configured but returned null', function() {
+      const config = { params: { sourceid: '123', useSharedId: true } };
+      const response = novatiqIdSubmodule.getId(config);
+      expect(response.sharedStatus).to.equal('Not Found');
+    });
+
+    it('should set sharedStatus if sharedID is configured and is valid', function() {
+      const config = { params: { sourceid: '123', useSharedId: true } };
+
+      let stub = sinon.stub(novatiqIdSubmodule, 'getSharedId').returns('fakeId');
+
+      const response = novatiqIdSubmodule.getId(config);
+
+      stub.restore();
+
+      expect(response.sharedStatus).to.equal('Found');
+    });
+
+    it('should set sharedStatus if sharedID is configured and is valid when making an async call', function() {
+      const config = { params: { sourceid: '123', useSharedId: true, useCallbacks: true } };
+
+      let stub = sinon.stub(novatiqIdSubmodule, 'getSharedId').returns('fakeId');
+
+      const response = novatiqIdSubmodule.getId(config);
+
+      stub.restore();
+
+      expect(response.sharedStatus).to.equal('Found');
+    });
+  });
+
+  describe('getUrlParams', function() {
+    it('should return default url parameters when none set', function() {
+      const defaultUrlParams = {
+        novatiqId: 'snowflake',
+        useStandardUuid: false,
+        useSspId: true,
+        useSspHost: true
+      }
+
+      const config = { params: { sourceid: '123' } };
+      const response = novatiqIdSubmodule.getUrlParams(config);
+
+      expect(response).to.deep.equal(defaultUrlParams);
+    });
+
+    it('should return custom url parameters when set', function() {
+      let customUrlParams = {
+        novatiqId: 'hyperid',
+        useStandardUuid: true,
+        useSspId: false,
+        useSspHost: false
+      }
+
+      const config = {
+        sourceid: '123',
+        urlParams: {
+          novatiqId: 'hyperid',
+          useStandardUuid: true,
+          useSspId: false,
+          useSspHost: false
+        }
+      };
+      const response = novatiqIdSubmodule.getUrlParams(config);
+
+      expect(response).to.deep.equal(customUrlParams);
+    });
+  });
+
+  describe('sendAsyncSyncRequest', function() {
+    it('should return an async function when called asynchronously', function() {
+      const defaultUrlParams = {
+        novatiqId: 'snowflake',
+        useStandardUuid: false,
+        useSspId: true,
+        useSspHost: true
+      }
+
+      const url = novatiqIdSubmodule.getSyncUrl(false, '', defaultUrlParams);
+      const response = novatiqIdSubmodule.sendAsyncSyncRequest('testuuid', url);
+      expect(response.callback).should.not.be.empty;
+    });
+  });
+
+  describe('decode', function() {
+    it('should log message if novatiqId has wrong format', function() {
+      const novatiqId = '81b001ec-8914-488c-a96e-8c220d4ee08895ef';
+      const response = novatiqIdSubmodule.decode(novatiqId);
+      expect(response.novatiq.snowflake).to.have.length(40);
+    });
+
+    it('should log message if novatiqId has wrong format', function() {
+      const novatiqId = '81b001ec-8914-488c-a96e-8c220d4ee08895ef';
+      const response = novatiqIdSubmodule.decode(novatiqId);
+      expect(response.novatiq.snowflake).should.be.not.empty;
+    });
+  });
+})
diff --git a/test/spec/modules/oguryBidAdapter_spec.js b/test/spec/modules/oguryBidAdapter_spec.js
new file mode 100644
index 00000000000..f7cdcc0d11a
--- /dev/null
+++ b/test/spec/modules/oguryBidAdapter_spec.js
@@ -0,0 +1,847 @@
+import { expect } from 'chai';
+import { spec } from 'modules/oguryBidAdapter';
+import * as utils from 'src/utils.js';
+
+const BID_URL = 'https://mweb-hb.presage.io/api/header-bidding-request';
+const TIMEOUT_URL = 'https://ms-ads-monitoring-events.presage.io/bid_timeout'
+
+describe('OguryBidAdapter', function () {
+  let bidRequests;
+  let bidderRequest;
+
+  bidRequests = [
+    {
+      adUnitCode: 'adUnitCode',
+      auctionId: 'auctionId',
+      bidId: 'bidId',
+      bidder: 'ogury',
+      params: {
+        assetKey: 'OGY-assetkey',
+        adUnitId: 'adunitId',
+        xMargin: 20,
+        yMarging: 20,
+        gravity: 'TOP_LEFT',
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      getFloor: ({ size, currency, mediaType }) => {
+        const floorResult = {
+          currency: 'USD',
+          floor: 0
+        };
+
+        if (mediaType === 'banner') {
+          floorResult.floor = 4;
+        } else {
+          floorResult.floor = 1000;
+        }
+
+        return floorResult;
+      },
+      transactionId: 'transactionId'
+    },
+    {
+      adUnitCode: 'adUnitCode2',
+      auctionId: 'auctionId',
+      bidId: 'bidId2',
+      bidder: 'ogury',
+      params: {
+        assetKey: 'OGY-assetkey',
+        adUnitId: 'adunitId2'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[600, 500]]
+        }
+      },
+      transactionId: 'transactionId2'
+    },
+  ];
+
+  bidderRequest = {
+    auctionId: bidRequests[0].auctionId,
+    gdprConsent: {consentString: 'myConsentString', vendorData: {}, gdprApplies: true},
+  };
+
+  describe('isBidRequestValid', function () {
+    it('should validate correct bid', () => {
+      let validBid = utils.deepClone(bidRequests[0]);
+
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('should not validate incorrect bid', () => {
+      let invalidBid = utils.deepClone(bidRequests[0]);
+      delete invalidBid.sizes;
+      delete invalidBid.mediaTypes;
+
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should not validate bid if adunit is not present', () => {
+      let invalidBid = utils.deepClone(bidRequests[0]);
+      delete invalidBid.params.adUnitId;
+
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should not validate bid if assetKet is not present', () => {
+      let invalidBid = utils.deepClone(bidRequests[0]);
+      delete invalidBid.params.assetKey;
+
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should validate bid if getFloor is not present', () => {
+      let invalidBid = utils.deepClone(bidRequests[1]);
+      delete invalidBid.getFloor;
+
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(true);
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    let syncOptions, gdprConsent;
+
+    beforeEach(() => {
+      syncOptions = {pixelEnabled: true};
+      gdprConsent = {
+        gdprApplies: true,
+        consentString: 'CPJl4C8PJl4C8OoAAAENAwCMAP_AAH_AAAAAAPgAAAAIAPgAAAAIAAA.IGLtV_T9fb2vj-_Z99_tkeYwf95y3p-wzhheMs-8NyZeH_B4Wv2MyvBX4JiQKGRgksjLBAQdtHGlcTQgBwIlViTLMYk2MjzNKJrJEilsbO2dYGD9Pn8HT3ZCY70-vv__7v3ff_3g'
+      };
+    });
+
+    it('should return syncs array with three elements of type image', () => {
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+
+      expect(userSyncs).to.have.lengthOf(3);
+      expect(userSyncs[0].type).to.equal('image');
+      expect(userSyncs[0].url).to.contain('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch');
+      expect(userSyncs[1].type).to.equal('image');
+      expect(userSyncs[1].url).to.contain('https://ms-cookie-sync.presage.io/ttd/init-sync');
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.contain('https://ms-cookie-sync.presage.io/xandr/init-sync');
+    });
+
+    it('should set the source as query param', () => {
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+      expect(userSyncs[0].url).to.contain('source=prebid');
+      expect(userSyncs[1].url).to.contain('source=prebid');
+      expect(userSyncs[2].url).to.contain('source=prebid');
+    });
+
+    it('should set the tcString as query param', () => {
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+      expect(userSyncs[0].url).to.contain(`iab_string=${gdprConsent.consentString}`);
+      expect(userSyncs[1].url).to.contain(`iab_string=${gdprConsent.consentString}`);
+      expect(userSyncs[2].url).to.contain(`iab_string=${gdprConsent.consentString}`);
+    });
+
+    it('should return an empty array when pixel is disable', () => {
+      syncOptions.pixelEnabled = false;
+      expect(spec.getUserSyncs(syncOptions, [], gdprConsent)).to.have.lengthOf(0);
+    });
+
+    it('should return syncs array with three elements of type image when consentString is undefined', () => {
+      gdprConsent = {
+        gdprApplies: true,
+        consentString: undefined
+      };
+
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+      expect(userSyncs).to.have.lengthOf(3);
+      expect(userSyncs[0].type).to.equal('image');
+      expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+      expect(userSyncs[1].type).to.equal('image');
+      expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+    });
+
+    it('should return syncs array with three elements of type image when consentString is null', () => {
+      gdprConsent = {
+        gdprApplies: true,
+        consentString: null
+      };
+
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+      expect(userSyncs).to.have.lengthOf(3);
+      expect(userSyncs[0].type).to.equal('image');
+      expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+      expect(userSyncs[1].type).to.equal('image');
+      expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+    });
+
+    it('should return syncs array with three elements of type image when gdprConsent is undefined', () => {
+      gdprConsent = undefined;
+
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+      expect(userSyncs).to.have.lengthOf(3);
+      expect(userSyncs[0].type).to.equal('image');
+      expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+      expect(userSyncs[1].type).to.equal('image');
+      expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+    });
+
+    it('should return syncs array with three elements of type image when gdprConsent is null', () => {
+      gdprConsent = null;
+
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+      expect(userSyncs).to.have.lengthOf(3);
+      expect(userSyncs[0].type).to.equal('image');
+      expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+      expect(userSyncs[1].type).to.equal('image');
+      expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+    });
+
+    it('should return syncs array with three elements of type image when gdprConsent is null and gdprApplies is false', () => {
+      gdprConsent = {
+        gdprApplies: false,
+        consentString: null
+      };
+
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+      expect(userSyncs).to.have.lengthOf(3);
+      expect(userSyncs[0].type).to.equal('image');
+      expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+      expect(userSyncs[1].type).to.equal('image');
+      expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+    });
+
+    it('should return syncs array with three elements of type image when gdprConsent is empty string and gdprApplies is false', () => {
+      gdprConsent = {
+        gdprApplies: false,
+        consentString: ''
+      };
+
+      const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
+      expect(userSyncs).to.have.lengthOf(3);
+      expect(userSyncs[0].type).to.equal('image');
+      expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
+      expect(userSyncs[1].type).to.equal('image');
+      expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
+    });
+  });
+
+  describe('buildRequests', function () {
+    const stubbedWidth = 200
+    const stubbedHeight = 600
+    const stubbedCurrentTime = 1234567890
+    const stubbedWidthMethod = sinon.stub(window.top.document.documentElement, 'clientWidth').get(function() {
+      return stubbedWidth;
+    });
+    const stubbedHeightMethod = sinon.stub(window.top.document.documentElement, 'clientHeight').get(function() {
+      return stubbedHeight;
+    });
+    const stubbedCurrentTimeMethod = sinon.stub(document.timeline, 'currentTime').get(function() {
+      return stubbedCurrentTime;
+    });
+
+    const defaultTimeout = 1000;
+    const expectedRequestObject = {
+      id: bidRequests[0].auctionId,
+      at: 1,
+      tmax: defaultTimeout,
+      imp: [{
+        id: bidRequests[0].bidId,
+        tagid: bidRequests[0].params.adUnitId,
+        bidfloor: 4,
+        banner: {
+          format: [{
+            w: 300,
+            h: 250
+          }]
+        },
+        ext: {
+          ...bidRequests[0].params,
+          timeSpentOnPage: stubbedCurrentTime
+        }
+      }, {
+        id: bidRequests[1].bidId,
+        tagid: bidRequests[1].params.adUnitId,
+        banner: {
+          format: [{
+            w: 600,
+            h: 500
+          }]
+        },
+        ext: {
+          ...bidRequests[1].params,
+          timeSpentOnPage: stubbedCurrentTime
+        }
+      }],
+      regs: {
+        ext: {
+          gdpr: 1
+        },
+      },
+      site: {
+        id: bidRequests[0].params.assetKey,
+        domain: window.location.hostname,
+        page: window.location.href
+      },
+      user: {
+        ext: {
+          consent: bidderRequest.gdprConsent.consentString
+        },
+      },
+      ext: {
+        prebidversion: '$prebid.version$',
+        adapterversion: '1.4.0'
+      },
+      device: {
+        w: stubbedWidth,
+        h: stubbedHeight
+      }
+    };
+
+    after(function() {
+      stubbedWidthMethod.restore();
+      stubbedHeightMethod.restore();
+      stubbedCurrentTimeMethod.restore();
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const validBidRequests = utils.deepClone(bidRequests)
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.url).to.equal(BID_URL);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('timeSpentOnpage should be 0 if timeline is undefined', function () {
+      const stubbedTimelineMethod = sinon.stub(document, 'timeline').get(function() {
+        return undefined;
+      });
+      const validBidRequests = utils.deepClone(bidRequests)
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data.imp[0].ext.timeSpentOnPage).to.equal(0);
+      stubbedTimelineMethod.restore();
+    });
+
+    it('bid request object should be conform', function () {
+      const validBidRequests = utils.deepClone(bidRequests)
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestObject);
+      expect(request.data.regs.ext.gdpr).to.be.a('number');
+    });
+
+    describe('getClientWidth', () => {
+      function testGetClientWidth(testGetClientSizeParams) {
+        const stubbedClientWidth = sinon.stub(window.top.document.documentElement, 'clientWidth').get(function() {
+          return testGetClientSizeParams.docClientSize
+        })
+
+        const stubbedInnerWidth = sinon.stub(window.top, 'innerWidth').get(function() {
+          return testGetClientSizeParams.innerSize
+        })
+
+        const stubbedOuterWidth = sinon.stub(window.top, 'outerWidth').get(function() {
+          return testGetClientSizeParams.outerSize
+        })
+
+        const stubbedWidth = sinon.stub(window.top.screen, 'width').get(function() {
+          return testGetClientSizeParams.screenSize
+        })
+
+        const validBidRequests = utils.deepClone(bidRequests)
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        expect(request.data.device.w).to.equal(testGetClientSizeParams.expectedSize);
+
+        stubbedClientWidth.restore();
+        stubbedInnerWidth.restore();
+        stubbedOuterWidth.restore();
+        stubbedWidth.restore();
+      }
+
+      it('should get documentElementClientWidth by default', () => {
+        testGetClientWidth({
+          docClientSize: 22,
+          innerSize: 50,
+          outerSize: 45,
+          screenSize: 10,
+          expectedSize: 22,
+        })
+      })
+
+      it('should get innerWidth as first fallback', () => {
+        testGetClientWidth({
+          docClientSize: undefined,
+          innerSize: 700,
+          outerSize: 650,
+          screenSize: 10,
+          expectedSize: 700,
+        })
+      })
+
+      it('should get outerWidth as second fallback', () => {
+        testGetClientWidth({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: 650,
+          screenSize: 10,
+          expectedSize: 650,
+        })
+      })
+
+      it('should get screenWidth as last fallback', () => {
+        testGetClientWidth({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: undefined,
+          screenSize: 10,
+          expectedSize: 10,
+        });
+      });
+
+      it('should return 0 if all window width values are undefined', () => {
+        testGetClientWidth({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: undefined,
+          screenSize: undefined,
+          expectedSize: 0,
+        });
+      });
+    });
+
+    describe('getClientHeight', () => {
+      function testGetClientHeight(testGetClientSizeParams) {
+        const stubbedClientHeight = sinon.stub(window.top.document.documentElement, 'clientHeight').get(function() {
+          return testGetClientSizeParams.docClientSize
+        })
+
+        const stubbedInnerHeight = sinon.stub(window.top, 'innerHeight').get(function() {
+          return testGetClientSizeParams.innerSize
+        })
+
+        const stubbedOuterHeight = sinon.stub(window.top, 'outerHeight').get(function() {
+          return testGetClientSizeParams.outerSize
+        })
+
+        const stubbedHeight = sinon.stub(window.top.screen, 'height').get(function() {
+          return testGetClientSizeParams.screenSize
+        })
+
+        const validBidRequests = utils.deepClone(bidRequests)
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        expect(request.data.device.h).to.equal(testGetClientSizeParams.expectedSize);
+
+        stubbedClientHeight.restore();
+        stubbedInnerHeight.restore();
+        stubbedOuterHeight.restore();
+        stubbedHeight.restore();
+      }
+
+      it('should get documentElementClientHeight by default', () => {
+        testGetClientHeight({
+          docClientSize: 420,
+          innerSize: 500,
+          outerSize: 480,
+          screenSize: 230,
+          expectedSize: 420,
+        });
+      });
+
+      it('should get innerHeight as first fallback', () => {
+        testGetClientHeight({
+          docClientSize: undefined,
+          innerSize: 500,
+          outerSize: 480,
+          screenSize: 230,
+          expectedSize: 500,
+        });
+      });
+
+      it('should get outerHeight as second fallback', () => {
+        testGetClientHeight({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: 480,
+          screenSize: 230,
+          expectedSize: 480,
+        });
+      });
+
+      it('should get screenHeight as last fallback', () => {
+        testGetClientHeight({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: undefined,
+          screenSize: 230,
+          expectedSize: 230,
+        });
+      });
+
+      it('should return 0 if all window height values are undefined', () => {
+        testGetClientHeight({
+          docClientSize: undefined,
+          innerSize: undefined,
+          outerSize: undefined,
+          screenSize: undefined,
+          expectedSize: 0,
+        });
+      });
+    });
+
+    it('should not add gdpr infos if not present', () => {
+      const bidderRequestWithoutGdpr = {
+        ...bidderRequest,
+        gdprConsent: {},
+      }
+      const expectedRequestObjectWithoutGdpr = {
+        ...expectedRequestObject,
+        regs: {
+          ext: {
+            gdpr: 0
+          },
+        },
+        user: {
+          ext: {
+            consent: ''
+          },
+        }
+      };
+
+      const validBidRequests = bidRequests
+
+      const request = spec.buildRequests(validBidRequests, bidderRequestWithoutGdpr);
+      expect(request.data).to.deep.equal(expectedRequestObjectWithoutGdpr);
+      expect(request.data.regs.ext.gdpr).to.be.a('number');
+    });
+
+    it('should not add gdpr infos if gdprConsent is undefined', () => {
+      const bidderRequestWithoutGdpr = {
+        ...bidderRequest,
+        gdprConsent: undefined,
+      }
+      const expectedRequestObjectWithoutGdpr = {
+        ...expectedRequestObject,
+        regs: {
+          ext: {
+            gdpr: 0
+          },
+        },
+        user: {
+          ext: {
+            consent: ''
+          },
+        }
+      };
+
+      const validBidRequests = bidRequests
+
+      const request = spec.buildRequests(validBidRequests, bidderRequestWithoutGdpr);
+      expect(request.data).to.deep.equal(expectedRequestObjectWithoutGdpr);
+      expect(request.data.regs.ext.gdpr).to.be.a('number');
+    });
+
+    it('should not add tcString and turn off gdpr-applies if consentString and gdprApplies are undefined', () => {
+      const bidderRequestWithoutGdpr = {
+        ...bidderRequest,
+        gdprConsent: { consentString: undefined, gdprApplies: undefined },
+      }
+      const expectedRequestObjectWithoutGdpr = {
+        ...expectedRequestObject,
+        regs: {
+          ext: {
+            gdpr: 0
+          },
+        },
+        user: {
+          ext: {
+            consent: ''
+          },
+        }
+      };
+
+      const validBidRequests = bidRequests
+
+      const request = spec.buildRequests(validBidRequests, bidderRequestWithoutGdpr);
+      expect(request.data).to.deep.equal(expectedRequestObjectWithoutGdpr);
+      expect(request.data.regs.ext.gdpr).to.be.a('number');
+    });
+
+    it('should handle bidFloor undefined', () => {
+      const expectedRequestWithUndefinedFloor = {
+        ...expectedRequestObject
+      };
+
+      const validBidRequests = utils.deepClone(bidRequests);
+      validBidRequests[1] = {
+        ...validBidRequests[1],
+        getFloor: undefined
+      };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithUndefinedFloor);
+    });
+
+    it('should handle bidFloor when is not function', () => {
+      const expectedRequestWithNotAFunctionFloor = {
+        ...expectedRequestObject
+      };
+
+      let validBidRequests = utils.deepClone(bidRequests);
+      validBidRequests[1] = {
+        ...validBidRequests[1],
+        getFloor: 'getFloor'
+      };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithNotAFunctionFloor);
+    });
+
+    it('should handle bidFloor when currency is not USD', () => {
+      const expectedRequestWithUnsupportedFloorCurrency = utils.deepClone(expectedRequestObject)
+      delete expectedRequestWithUnsupportedFloorCurrency.imp[0].bidfloor;
+      let validBidRequests = utils.deepClone(bidRequests);
+      validBidRequests[0] = {
+        ...validBidRequests[0],
+        getFloor: ({ size, currency, mediaType }) => {
+          return {
+            currency: 'EUR',
+            floor: 4
+          }
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithUnsupportedFloorCurrency);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let openRtbBidResponse = {
+      body: {
+        id: 'id_of_bid_response',
+        seatbid: [{
+          bid: [{
+            id: 'advertId',
+            impid: 'bidId',
+            price: 100,
+            nurl: 'url',
+            adm: `<html><head><title>test creative</title></head><body style="margin: 0;"><div><img style="width: 300px; height: 250px;" src="https://assets.afcdn.com/recipe/20190529/93153_w1024h768c1cx2220cy1728cxt0cyt0cxb4441cyb3456.jpg" alt="cookies" /></div></body></html>`,
+            adomain: ['renault.fr'],
+            ext: {
+              adcontent: 'sample_creative',
+              advertid: '1a278c48-b79a-4bbf-b69f-3824803e7d87',
+              campaignid: '31724',
+              mediatype: 'image',
+              userid: 'ab4aabed-5230-49d9-9f1a-f06280d28366',
+              usersync: true,
+              advertiserid: '1',
+              isomidcompliant: false
+            },
+            w: 180,
+            h: 101
+          }, {
+            id: 'advertId2',
+            impid: 'bidId2',
+            price: 150,
+            nurl: 'url2',
+            adm: `<html><head><title>test creative</title></head><body style="margin: 0;"><div><img style="width: 600px; height: 500px;" src="https://assets.afcdn.com/recipe/20190529/93153_w1024h768c1cx2220cy1728cxt0cyt0cxb4441cyb3456.jpg" alt="cookies" /></div></body></html>`,
+            adomain: ['peugeot.fr'],
+            ext: {
+              adcontent: 'sample_creative',
+              advertid: '2a278c48-b79a-4bbf-b69f-3824803e7d87',
+              campaignid: '41724',
+              userid: 'bb4aabed-5230-49d9-9f1a-f06280d28366',
+              usersync: false,
+              advertiserid: '2',
+              isomidcompliant: true,
+              mediatype: 'image',
+              landingpageurl: 'https://ogury.com'
+            },
+            w: 600,
+            h: 500
+          }],
+        }]
+      }
+    };
+
+    it('should correctly interpret bidResponse', () => {
+      let expectedInterpretedBidResponse = [{
+        requestId: openRtbBidResponse.body.seatbid[0].bid[0].impid,
+        cpm: openRtbBidResponse.body.seatbid[0].bid[0].price,
+        currency: 'USD',
+        width: openRtbBidResponse.body.seatbid[0].bid[0].w,
+        height: openRtbBidResponse.body.seatbid[0].bid[0].h,
+        ad: openRtbBidResponse.body.seatbid[0].bid[0].adm,
+        ttl: 60,
+        ext: openRtbBidResponse.body.seatbid[0].bid[0].ext,
+        creativeId: openRtbBidResponse.body.seatbid[0].bid[0].id,
+        netRevenue: true,
+        meta: {
+          advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[0].adomain
+        },
+        nurl: openRtbBidResponse.body.seatbid[0].bid[0].nurl,
+        adapterVersion: '1.4.0',
+        prebidVersion: '$prebid.version$'
+      }, {
+        requestId: openRtbBidResponse.body.seatbid[0].bid[1].impid,
+        cpm: openRtbBidResponse.body.seatbid[0].bid[1].price,
+        currency: 'USD',
+        width: openRtbBidResponse.body.seatbid[0].bid[1].w,
+        height: openRtbBidResponse.body.seatbid[0].bid[1].h,
+        ad: openRtbBidResponse.body.seatbid[0].bid[1].adm,
+        ttl: 60,
+        ext: openRtbBidResponse.body.seatbid[0].bid[1].ext,
+        creativeId: openRtbBidResponse.body.seatbid[0].bid[1].id,
+        netRevenue: true,
+        meta: {
+          advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[1].adomain
+        },
+        nurl: openRtbBidResponse.body.seatbid[0].bid[1].nurl,
+        adapterVersion: '1.4.0',
+        prebidVersion: '$prebid.version$'
+      }]
+
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      let result = spec.interpretResponse(openRtbBidResponse, request);
+
+      expect(result).to.deep.equal(expectedInterpretedBidResponse)
+    });
+
+    it('should return empty array if error during parsing', () => {
+      const wrongOpenRtbBidReponse = 'wrong data'
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      let result = spec.interpretResponse(wrongOpenRtbBidReponse, request);
+
+      expect(result).to.be.instanceof(Array);
+      expect(result.length).to.equal(0)
+    })
+  });
+
+  describe('onBidWon', function() {
+    const nurl = 'https://fakewinurl.test';
+    let xhr;
+    let requests;
+
+    beforeEach(function() {
+      xhr = sinon.useFakeXMLHttpRequest();
+      requests = [];
+      xhr.onCreate = (xhr) => {
+        requests.push(xhr);
+      };
+    })
+
+    afterEach(function() {
+      xhr.restore()
+    })
+
+    it('Should not create nurl request if bid is undefined', function() {
+      spec.onBidWon()
+      expect(requests.length).to.equal(0);
+    })
+
+    it('Should not create nurl request if bid does not contains nurl', function() {
+      spec.onBidWon({})
+      expect(requests.length).to.equal(0);
+    })
+
+    it('Should not create nurl request if bid contains undefined nurl', function() {
+      spec.onBidWon({ nurl: undefined })
+      expect(requests.length).to.equal(0);
+    })
+
+    it('Should create nurl request if bid nurl', function() {
+      spec.onBidWon({ nurl })
+      expect(requests.length).to.equal(1);
+      expect(requests[0].url).to.equal(nurl);
+      expect(requests[0].method).to.equal('GET')
+    })
+
+    it('Should trigger getWindowContext method', function() {
+      const bidSample = {
+        id: 'advertId',
+        impid: 'bidId',
+        price: 100,
+        nurl: 'url',
+        adm: `<html><head><title>test creative</title></head><body style="margin: 0;"><div><img style="width: 300px; height: 250px;" src="https://assets.afcdn.com/recipe/20190529/93153_w1024h768c1cx2220cy1728cxt0cyt0cxb4441cyb3456.jpg" alt="cookies" /></div></body></html>`,
+        adomain: ['renault.fr'],
+        ext: {
+          adcontent: 'sample_creative',
+          advertid: '1a278c48-b79a-4bbf-b69f-3824803e7d87',
+          campaignid: '31724',
+          mediatype: 'image',
+          userid: 'ab4aabed-5230-49d9-9f1a-f06280d28366',
+          usersync: true,
+          advertiserid: '1',
+          isomidcompliant: false
+        },
+        w: 180,
+        h: 101
+      }
+      spec.onBidWon(bidSample)
+      expect(window.top.OG_PREBID_BID_OBJECT).to.deep.equal(bidSample)
+    })
+  })
+
+  describe('getWindowContext', function() {
+    it('Should return top window if exist', function() {
+      const res = spec.getWindowContext()
+      expect(res).to.equal(window.top)
+      expect(res).to.not.be.undefined;
+    })
+
+    it('Should return self window if getting top window throw an error', function() {
+      const stub = sinon.stub(utils, 'getWindowTop')
+      stub.throws()
+      const res = spec.getWindowContext()
+      expect(res).to.equal(window.self)
+      utils.getWindowTop.restore()
+    })
+  })
+
+  describe('onTimeout', function () {
+    let xhr;
+    let requests;
+
+    beforeEach(function() {
+      xhr = sinon.useFakeXMLHttpRequest();
+      requests = [];
+      xhr.onCreate = (xhr) => {
+        requests.push(xhr);
+      };
+    })
+
+    afterEach(function() {
+      xhr.restore()
+    })
+
+    it('should send on bid timeout notification', function() {
+      const bid = {
+        ad: '<img style="width: 300px; height: 250px;" src="https://assets.afcdn.com/recipe/20190529/93153_w1024h768c1cx2220cy1728cxt0cyt0cxb4441cyb3456.jpg" alt="cookies" />',
+        cpm: 3
+      }
+      spec.onTimeout(bid);
+      expect(requests).to.not.be.undefined;
+      expect(requests.length).to.equal(1);
+      expect(requests[0].url).to.equal(TIMEOUT_URL);
+      expect(requests[0].method).to.equal('POST');
+      expect(JSON.parse(requests[0].requestBody).location).to.equal(window.location.href);
+    })
+  });
+});
diff --git a/test/spec/modules/oneKeyIdSystem_spec.js b/test/spec/modules/oneKeyIdSystem_spec.js
new file mode 100644
index 00000000000..9172a61df79
--- /dev/null
+++ b/test/spec/modules/oneKeyIdSystem_spec.js
@@ -0,0 +1,107 @@
+import { oneKeyIdSubmodule } from 'modules/oneKeyIdSystem'
+
+const defaultConf = {
+  params: {
+    proxyHostName: 'proxy.com'
+  }
+};
+
+const defaultIdsAndPreferences = {
+  identifiers: [
+    {
+      version: '0.1',
+      type: 'paf_browser_id',
+      value: 'df0a5664-987d-4074-bbd9-e9b12ebae6ef',
+      source: {
+        domain: 'crto-poc-1.onekey.network',
+        timestamp: 1657100291,
+        signature: 'ikjV6WwpcroNB5XyLOr3MgYHLpS6UjICEOuv/jEr00uVrjZm0zluDSWh11OeGDZrMhxMBPeTabtQ4U2rNk3IzQ=='
+      }
+    }
+  ],
+  preferences: {
+    version: '0.1',
+    data: {
+      use_browsing_for_personalization: true
+    },
+    source: {
+      domain: 'cmp.pafdemopublisher.com',
+      timestamp: 1657100294,
+      signature: 'aAbMThxyeKpe/EgT5ARI1xecjCwwh0uRagsTuPXNY2fzh7foeW31qljDZf6h8UwOd9M2bAN7XNtM2LYBbJzskQ=='
+    }
+  }
+};
+
+const defaultIdsAndPreferencesResult = {
+  status: 'PARTICIPATING',
+  data: defaultIdsAndPreferences
+};
+
+describe('oneKeyData module', () => {
+  describe('getId function', () => {
+    beforeEach(() => {
+      setUpOneKey();
+    });
+
+    it('return a callback for handling asynchron results', () => {
+      const moduleIdResponse = oneKeyIdSubmodule.getId(defaultConf);
+
+      expect(moduleIdResponse.callback).to.be.an('function');
+    });
+
+    it(`return a callback that waits for OneKey to be loaded`, () => {
+      const moduleIdResponse = oneKeyIdSubmodule.getId(defaultConf);
+
+      moduleIdResponse.callback(function() {})
+
+      expect(window.OneKey.queue.length).to.equal(1);
+    });
+
+    it('return a callback that gets ids and prefs', () => {
+      const moduleIdResponse = oneKeyIdSubmodule.getId(defaultConf);
+
+      // Act
+      return new Promise((resolve) => {
+        moduleIdResponse.callback(resolve);
+        executeOneKeyQueue();
+      })
+
+      // Assert
+        .then((idsAndPrefs) => {
+          expect(idsAndPrefs).to.equal(defaultIdsAndPreferences);
+        });
+    });
+
+    it('return a callback with undefined if impossible to get ids and prefs', () => {
+      window.OneKey.getIdsAndPreferences = () => {
+        return Promise.reject(new Error(`Impossible to get ids and prefs`));
+      };
+      const moduleIdResponse = oneKeyIdSubmodule.getId(defaultConf);
+
+      // Act
+      return new Promise((resolve) => {
+        moduleIdResponse.callback(resolve);
+        executeOneKeyQueue();
+      })
+
+      // Assert
+        .then((idsAndPrefs) => {
+          expect(idsAndPrefs).to.be.undefined;
+        });
+    });
+  });
+});
+
+const setUpOneKey = () => {
+  window.OneKey.queue = [];
+  window.OneKey.getIdsAndPreferences = () => {
+    return Promise.resolve(defaultIdsAndPreferencesResult);
+  };
+}
+
+const executeOneKeyQueue = () => {
+  while (window.OneKey.queue.length > 0) {
+    window.OneKey.queue[0]();
+    window.OneKey.queue.shift();
+  }
+}
diff --git a/test/spec/modules/oneKeyRtdProvider_spec.js b/test/spec/modules/oneKeyRtdProvider_spec.js
new file mode 100644
index 00000000000..70023e35196
--- /dev/null
+++ b/test/spec/modules/oneKeyRtdProvider_spec.js
@@ -0,0 +1,152 @@
+import {oneKeyDataSubmodule} from 'modules/oneKeyRtdProvider.js';
+import {getAdUnits} from '../../fixtures/fixtures.js';
+
+const defaultSeed = {
+  version: '0.1',
+  transaction_ids: [
+    'd566b02a-a6e2-4c87-98dc-f5623cd9e828',
+    'f7ffe3cc-0d58-4ec4-b687-1d3d410a48fe'
+  ],
+  publisher: 'cmp.pafdemopublisher.com',
+  source: {
+    domain: 'cmp.pafdemopublisher.com',
+    timestamp: 1657116880,
+    signature: '6OmdrSGwagPpugGFuQ4VGjzqYadHxWIXPaLItk0vA1lmi/EQyRvNF5seXStfwKWRnC7HZlOIGSjA6g7HAuofWw=='
+
+  }
+};
+
+const defaultOrb2WithTransmission = {
+  user: {
+    ext: {
+      paf: {
+        transmission: {
+          seed: defaultSeed
+        }
+      }
+    }
+  }
+};
+
+const defaultRtdConfig = {
+  params: {
+    proxyHostName: 'host'
+  }
+};
+
+describe('oneKeyDataSubmodule', () => {
+  var bidsConfig;
+  beforeEach(() => {
+    // Fresh bidsConfig because it can be altered
+    // during the tests.
+    bidsConfig = getReqBidsConfig();
+    setUpOneKey();
+  });
+
+  it('successfully instantiates', () => {
+    expect(oneKeyDataSubmodule.init()).to.equal(true);
+  });
+
+  it('call OneKey API once it is loaded', () => {
+    const done = sinon.spy();
+
+    oneKeyDataSubmodule.getBidRequestData(bidsConfig, done, defaultRtdConfig);
+
+    expect(bidsConfig).to.eql(getReqBidsConfig());
+    expect(done.callCount).to.equal(0);
+    expect(window.OneKey.queue.length).to.equal(1);
+  });
+
+  it('don\'t change anything without a seed', () => {
+    window.OneKey.generateSeed = (_transactionIds) => {
+      return Promise.resolve(undefined);
+    };
+
+    // Act
+    return new Promise(resolve => {
+      oneKeyDataSubmodule.getBidRequestData(bidsConfig, resolve, defaultRtdConfig);
+      executeOneKeyQueue();
+    })
+
+    // Assert
+      .then(() => {
+        expect(bidsConfig).to.eql(getReqBidsConfig());
+      });
+  });
+
+  [ // Test cases
+    {
+      description: 'global orb2',
+      rtdConfig: defaultRtdConfig,
+      expectedFragment: {
+        global: {
+          ...defaultOrb2WithTransmission
+        },
+        bidder: {}
+      }
+    },
+
+    {
+      description: 'bidder-specific orb2',
+      rtdConfig: {
+        params: {
+          proxyHostName: 'host',
+          bidders: [ 'bidder42', 'bidder24' ]
+        }
+      },
+      expectedFragment: {
+        global: { },
+        bidder: {
+          bidder42: {
+            ...defaultOrb2WithTransmission
+          },
+          bidder24: {
+            ...defaultOrb2WithTransmission
+          }
+        }
+      }
+    }
+  ].forEach(testCase => {
+    it(`update adUnits with transaction-ids and transmission in ${testCase.description}`, () => {
+      // Act
+      return new Promise(resolve => {
+        oneKeyDataSubmodule.getBidRequestData(bidsConfig, resolve, testCase.rtdConfig);
+        executeOneKeyQueue();
+      })
+
+      // Assert
+        .then(() => {
+        // Verify transaction-ids without equality
+        // because they are generated UUID.
+          bidsConfig.adUnits.forEach((adUnit) => {
+            expect(adUnit.ortb2Imp.ext.data.paf.transaction_id).to.not.be.undefined;
+          });
+          expect(bidsConfig.ortb2Fragments).to.eql(testCase.expectedFragment);
+        });
+    });
+  });
+});
+
+const getReqBidsConfig = () => {
+  return {
+    adUnits: getAdUnits(),
+    ortb2Fragments: {
+      global: {},
+      bidder: {}
+    }
+  }
+}
+
+const setUpOneKey = () => {
+  window.OneKey.queue = [];
+  OneKey.generateSeed = (_transactionIds) => {
+    return Promise.resolve(defaultSeed);
+  };
+}
+
+const executeOneKeyQueue = () => {
+  while (window.OneKey.queue.length > 0) {
+    window.OneKey.queue[0]();
+    window.OneKey.queue.shift();
+  }
+}
diff --git a/test/spec/modules/oneVideoBidAdapter_spec.js b/test/spec/modules/oneVideoBidAdapter_spec.js
deleted file mode 100644
index a91e9ac27e8..00000000000
--- a/test/spec/modules/oneVideoBidAdapter_spec.js
+++ /dev/null
@@ -1,606 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/oneVideoBidAdapter.js';
-import * as utils from 'src/utils.js';
-
-describe('OneVideoBidAdapter', function () {
-  let bidRequest;
-  let bidderRequest = {
-    'bidderCode': 'oneVideo',
-    'auctionId': 'e158486f-8c7f-472f-94ce-b0cbfbb50ab4',
-    'bidderRequestId': '1e498b84fffc39',
-    'bids': bidRequest,
-    'auctionStart': 1520001292880,
-    'timeout': 3000,
-    'start': 1520001292884,
-    'doneCbCallCount': 0,
-    'refererInfo': {
-      'numIframes': 1,
-      'reachedTop': true,
-      'referer': 'test.com'
-    }
-  };
-  let mockConfig;
-
-  beforeEach(function () {
-    bidRequest = {
-      mediaTypes: {
-        video: {
-          context: 'instream',
-          playerSize: [640, 480]
-        }
-      },
-      bidder: 'oneVideo',
-      sizes: [640, 480],
-      bidId: '30b3efwfwe1e',
-      adUnitCode: 'video1',
-      params: {
-        video: {
-          playerWidth: 640,
-          playerHeight: 480,
-          mimes: ['video/mp4', 'application/javascript'],
-          protocols: [2, 5],
-          api: [2],
-          position: 1,
-          delivery: [2],
-          playbackmethod: [1, 5],
-          sid: 134,
-          rewarded: 1,
-          placement: 1,
-          hp: 1,
-          inventoryid: 123
-        },
-        site: {
-          id: 1,
-          page: 'https://news.yahoo.com/portfolios',
-          referrer: 'http://www.yahoo.com'
-        },
-        pubId: 'brxd'
-      }
-    };
-  });
-
-  describe('spec.isBidRequestValid', function () {
-    it('should return true when the required params are passed', function () {
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
-
-    it('should return false when the "video" param is missing', function () {
-      bidRequest.params = {
-        pubId: 'brxd'
-      };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    });
-
-    it('should return false when the "pubId" param is missing', function () {
-      bidRequest.params = {
-        video: {
-          playerWidth: 480,
-          playerHeight: 640,
-          mimes: ['video/mp4', 'application/javascript'],
-          protocols: [2, 5],
-          api: [2],
-          position: 1,
-          delivery: [2],
-          playbackmethod: [1, 5],
-          sid: 134,
-          rewarded: 1,
-          placement: 1,
-          inventoryid: 123
-        }
-      };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    });
-    it('should return true when the "pubId" param exists', function () {
-      bidRequest.params = {
-        video: {
-          playerWidth: 480,
-          playerHeight: 640,
-          mimes: ['video/mp4', 'application/javascript'],
-          protocols: [2, 5],
-          api: [2],
-          position: 1,
-          delivery: [2],
-          playbackmethod: [1, 5],
-          sid: 134,
-          rewarded: 1,
-          placement: 1,
-          inventoryid: 123
-        },
-        pubId: 'brxd'
-      };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
-
-    it('should return false when no bid params are passed', function () {
-      bidRequest.params = {};
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    });
-
-    it('should return false when the mediaType is "banner" and display="undefined" (DAP 3P)', function () {
-      bidRequest = {
-        mediaTypes: {
-          banner: {
-            sizes: [640, 480]
-          }
-        }
-      }
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    })
-
-    it('should return true when the mediaType is "banner" and display=1 (DAP 3P)', function () {
-      bidRequest = {
-        mediaTypes: {
-          banner: {
-            sizes: [640, 480]
-          }
-        },
-        bidder: 'oneVideo',
-        sizes: [640, 480],
-        bidId: '30b3efwfwe1e',
-        adUnitCode: 'video1',
-        params: {
-          video: {
-            playerWidth: 640,
-            playerHeight: 480,
-            mimes: ['video/mp4', 'application/javascript'],
-            protocols: [2, 5],
-            api: [2],
-            position: 1,
-            delivery: [2],
-            playbackmethod: [1, 5],
-            sid: 134,
-            rewarded: 1,
-            placement: 1,
-            inventoryid: 123,
-            display: 1
-          },
-          site: {
-            id: 1,
-            page: 'https://news.yahoo.com/portfolios',
-            referrer: 'http://www.yahoo.com'
-          },
-          pubId: 'brxd'
-        }
-      };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    })
-
-    it('should return false when the mediaType is "video" and context="outstream" and display=1 (DAP 3P)', function () {
-      bidRequest = {
-        mediaTypes: {
-          video: {
-            context: 'outstream',
-            playerSize: [640, 480]
-          }
-        },
-        params: {
-          video: {
-            display: 1
-          }
-        }
-      }
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    })
-
-    it('should return true for Multi-Format AdUnits, when the mediaTypes are both "banner" and "video" (Multi-Format Support)', function () {
-      bidRequest = {
-        mediaTypes: {
-          banner: {
-            sizes: [640, 480]
-          },
-          video: {
-            context: 'outstream',
-            playerSize: [640, 480]
-          }
-        }
-      }
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    })
-  });
-
-  describe('spec.buildRequests', function () {
-    it('should create a POST request for every bid', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      expect(requests[0].method).to.equal('POST');
-      expect(requests[0].url).to.equal(spec.ENDPOINT + bidRequest.params.pubId);
-    });
-
-    it('should attach the bid request object', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      expect(requests[0].bidRequest).to.equal(bidRequest);
-    });
-
-    it('should attach request data', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      const [ width, height ] = bidRequest.sizes;
-      const placement = bidRequest.params.video.placement;
-      const rewarded = bidRequest.params.video.rewarded;
-      const inventoryid = bidRequest.params.video.inventoryid;
-      const VERSION = '3.0.3';
-      expect(data.imp[0].video.w).to.equal(width);
-      expect(data.imp[0].video.h).to.equal(height);
-      expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
-      expect(data.imp[0].ext.rewarded).to.equal(rewarded);
-      expect(data.imp[0].video.placement).to.equal(placement);
-      expect(data.imp[0].ext.inventoryid).to.equal(inventoryid);
-      expect(data.imp[0].ext.prebidver).to.equal('$prebid.version$');
-      expect(data.imp[0].ext.adapterver).to.equal(VERSION);
-    });
-
-    it('must parse bid size from a nested array', function () {
-      const width = 640;
-      const height = 480;
-      bidRequest.sizes = [[ width, height ]];
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      expect(data.imp[0].video.w).to.equal(width);
-      expect(data.imp[0].video.h).to.equal(height);
-    });
-
-    it('should set pubId to HBExchange when bid.params.video.e2etest = true', function () {
-      bidRequest.params.video.e2etest = true;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      expect(requests[0].method).to.equal('POST');
-      expect(requests[0].url).to.equal(spec.E2ETESTENDPOINT + 'HBExchange');
-    });
-
-    it('should attach End 2 End test data', function () {
-      bidRequest.params.video.e2etest = true;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      expect(data.imp[0].bidfloor).to.not.exist;
-      expect(data.imp[0].video.w).to.equal(300);
-      expect(data.imp[0].video.h).to.equal(250);
-      expect(data.imp[0].video.mimes).to.eql(['video/mp4', 'application/javascript']);
-      expect(data.imp[0].video.api).to.eql([2]);
-      expect(data.site.page).to.equal('https://verizonmedia.com');
-      expect(data.site.ref).to.equal('https://verizonmedia.com');
-      expect(data.tmax).to.equal(1000);
-    });
-
-    it('it should create new schain and send it if video.params.sid exists', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      const schain = data.source.ext.schain;
-      expect(schain.nodes.length).to.equal(1);
-      expect(schain.nodes[0].sid).to.equal(bidRequest.params.video.sid);
-      expect(schain.nodes[0].rid).to.equal(data.id);
-    })
-
-    it('should send Global or Bidder specific schain if sid is not passed in video.params.sid', function () {
-      bidRequest.params.video.sid = null;
-      const globalSchain = {
-        ver: '1.0',
-        complete: 1,
-        nodes: [{
-          asi: 'some-platform.com',
-          sid: '111111',
-          rid: bidRequest.id,
-          hp: 1
-        }]
-      };
-      bidRequest.schain = globalSchain;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      const schain = data.source.ext.schain;
-      expect(schain.nodes.length).to.equal(1);
-      expect(schain).to.equal(globalSchain);
-    });
-
-    it('should ignore Global or Bidder specific schain if video.params.sid exists and send new schain', function () {
-      const globalSchain = {
-        ver: '1.0',
-        complete: 1,
-        nodes: [{
-          asi: 'some-platform.com',
-          sid: '111111',
-          rid: bidRequest.id,
-          hp: 1
-        }]
-      };
-      bidRequest.schain = globalSchain;
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      const schain = data.source.ext.schain;
-      expect(schain.nodes.length).to.equal(1);
-      expect(schain.complete).to.equal(1);
-      expect(schain.nodes[0].sid).to.equal(bidRequest.params.video.sid);
-      expect(schain.nodes[0].rid).to.equal(data.id);
-    })
-
-    it('should append hp to new schain created by sid if video.params.hp is passed', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      const schain = data.source.ext.schain;
-      expect(schain.nodes[0].hp).to.equal(bidRequest.params.video.hp);
-    })
-  });
-
-  describe('spec.interpretResponse', function () {
-    it('should return no bids if the response is not valid', function () {
-      const bidResponse = spec.interpretResponse({ body: null }, { bidRequest });
-      expect(bidResponse.length).to.equal(0);
-    });
-
-    it('should return no bids if the response "nurl" and "adm" are missing', function () {
-      const serverResponse = {seatbid: [{bid: [{price: 6.01}]}]};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-      expect(bidResponse.length).to.equal(0);
-    });
-
-    it('should return no bids if the response "price" is missing', function () {
-      const serverResponse = {seatbid: [{bid: [{adm: '<VAST></VAST>'}]}]};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-      expect(bidResponse.length).to.equal(0);
-    });
-
-    it('should return a valid video bid response with just "adm"', function () {
-      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-      let o = {
-        requestId: bidRequest.bidId,
-        bidderCode: spec.code,
-        cpm: serverResponse.seatbid[0].bid[0].price,
-        adId: serverResponse.seatbid[0].bid[0].adid,
-        creativeId: serverResponse.seatbid[0].bid[0].crid,
-        vastXml: serverResponse.seatbid[0].bid[0].adm,
-        width: 640,
-        height: 480,
-        mediaType: 'video',
-        currency: 'USD',
-        ttl: 100,
-        netRevenue: true,
-        adUnitCode: bidRequest.adUnitCode,
-        renderer: (bidRequest.mediaTypes.video.context === 'outstream') ? newRenderer(bidRequest, bidResponse) : undefined,
-      };
-      expect(bidResponse).to.deep.equal(o);
-    });
-    // @abrowning14 check that banner DAP response is appended to o.ad + mediaType: 'banner'
-    it('should return a valid DAP banner bid-response', function () {
-      bidRequest = {
-        mediaTypes: {
-          banner: {
-            sizes: [640, 480]
-          }
-        },
-        params: {
-          video: {
-            display: 1
-          }
-        }
-      }
-      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<div>DAP UNIT HERE</div>'}]}], cur: 'USD'};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-      expect(bidResponse.ad).to.equal('<div>DAP UNIT HERE</div>');
-      expect(bidResponse.mediaType).to.equal('banner');
-      expect(bidResponse.renderer).to.be.undefined;
-    });
-  });
-
-  describe('when GDPR and uspConsent applies', function () {
-    beforeEach(function () {
-      bidderRequest = {
-        'gdprConsent': {
-          'consentString': 'test-gdpr-consent-string',
-          'gdprApplies': true
-        },
-        'uspConsent': '1YN-',
-        'bidderCode': 'oneVideo',
-        'auctionId': 'e158486f-8c7f-472f-94ce-b0cbfbb50ab4',
-        'bidderRequestId': '1e498b84fffc39',
-        'bids': bidRequest,
-        'auctionStart': 1520001292880,
-        'timeout': 3000,
-        'start': 1520001292884,
-        'doneCbCallCount': 0,
-        'refererInfo': {
-          'numIframes': 1,
-          'reachedTop': true,
-          'referer': 'test.com'
-        }
-      };
-
-      mockConfig = {
-        consentManagement: {
-          gdpr: {
-            cmpApi: 'iab',
-            timeout: 3000,
-            allowAuctionWithoutConsent: 'cancel'
-          },
-          usp: {
-            cmpApi: 'iab',
-            timeout: 1000,
-            allowAuctionWithoutConsent: 'cancel'
-          }
-        }
-      };
-    });
-
-    it('should send a signal to specify that GDPR applies to this request', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
-      expect(request[0].data.regs.ext.gdpr).to.equal(1);
-    });
-
-    it('should send the consent string', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
-      expect(request[0].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
-    });
-
-    it('should send the uspConsent string', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
-      expect(request[0].data.regs.ext.us_privacy).to.equal(bidderRequest.uspConsent);
-    });
-
-    it('should send the uspConsent and GDPR ', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
-      expect(request[0].data.regs.ext.gdpr).to.equal(1);
-      expect(request[0].data.regs.ext.us_privacy).to.equal(bidderRequest.uspConsent);
-    });
-  });
-
-  describe('should send banner object', function () {
-    it('should send banner object when display is 1 and context="instream" (DAP O&O)', function () {
-      bidRequest = {
-        mediaTypes: {
-          video: {
-            context: 'instream',
-            playerSize: [640, 480]
-          }
-        },
-        bidder: 'oneVideo',
-        sizes: [640, 480],
-        bidId: '30b3efwfwe1e',
-        adUnitCode: 'video1',
-        params: {
-          video: {
-            playerWidth: 640,
-            playerHeight: 480,
-            mimes: ['video/mp4', 'application/javascript'],
-            protocols: [2, 5],
-            api: [2],
-            position: 1,
-            delivery: [2],
-            playbackmethod: [1, 5],
-            placement: 1,
-            inventoryid: 123,
-            sid: 134,
-            display: 1,
-            minduration: 10,
-            maxduration: 30
-          },
-          site: {
-            id: 1,
-            page: 'https://www.yahoo.com/',
-            referrer: 'http://www.yahoo.com'
-          },
-          pubId: 'OneMDisplay'
-        }
-      };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      const width = bidRequest.params.video.playerWidth;
-      const height = bidRequest.params.video.playerHeight;
-      const position = bidRequest.params.video.position;
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-      expect(data.imp[0].banner.w).to.equal(width);
-      expect(data.imp[0].banner.h).to.equal(height);
-      expect(data.imp[0].banner.pos).to.equal(position);
-      expect(data.imp[0].ext.inventoryid).to.equal(bidRequest.params.video.inventoryid);
-      expect(data.imp[0].banner.mimes).to.equal(bidRequest.params.video.mimes);
-      expect(data.imp[0].banner.placement).to.equal(bidRequest.params.video.placement);
-      expect(data.imp[0].banner.ext.minduration).to.equal(bidRequest.params.video.minduration);
-      expect(data.imp[0].banner.ext.maxduration).to.equal(bidRequest.params.video.maxduration);
-      expect(data.site.id).to.equal(bidRequest.params.site.id);
-    });
-    it('should send video object when display is other than 1 (VAST for All)', function () {
-      bidRequest = {
-        mediaTypes: {
-          video: {
-            context: 'instream',
-            playerSize: [640, 480]
-          }
-        },
-        bidder: 'oneVideo',
-        sizes: [640, 480],
-        bidId: '30b3efwfwe1e',
-        adUnitCode: 'video1',
-        params: {
-          video: {
-            playerWidth: 640,
-            playerHeight: 480,
-            mimes: ['video/mp4', 'application/javascript'],
-            protocols: [2, 5],
-            api: [2],
-            position: 1,
-            delivery: [2],
-            playbackmethod: [1, 5],
-            placement: 123,
-            sid: 134,
-            display: 12
-          },
-          site: {
-            id: 1,
-            page: 'https://www.yahoo.com/',
-            referrer: 'http://www.yahoo.com'
-          },
-          pubId: 'OneMDisplay'
-        }
-      };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      const width = bidRequest.params.video.playerWidth;
-      const height = bidRequest.params.video.playerHeight;
-      const position = bidRequest.params.video.position;
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-      expect(data.imp[0].video.w).to.equal(width);
-      expect(data.imp[0].video.h).to.equal(height);
-      expect(data.imp[0].video.pos).to.equal(position);
-      expect(data.imp[0].video.mimes).to.equal(bidRequest.params.video.mimes);
-    });
-    it('should send video object when display is not passed (VAST for All)', function () {
-      bidRequest = {
-        mediaTypes: {
-          video: {
-            context: 'instream',
-            playerSize: [640, 480]
-          }
-        },
-        bidder: 'oneVideo',
-        sizes: [640, 480],
-        bidId: '30b3efwfwe1e',
-        adUnitCode: 'video1',
-        params: {
-          video: {
-            playerWidth: 640,
-            playerHeight: 480,
-            mimes: ['video/mp4', 'application/javascript'],
-            protocols: [2, 5],
-            api: [2],
-            position: 1,
-            delivery: [2],
-            playbackmethod: [1, 5],
-            placement: 123,
-            sid: 134,
-            minduration: 10,
-            maxduration: 30
-          },
-          site: {
-            id: 1,
-            page: 'https://www.yahoo.com/',
-            referrer: 'http://www.yahoo.com'
-          },
-          pubId: 'OneMDisplay'
-        }
-      };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      const width = bidRequest.params.video.playerWidth;
-      const height = bidRequest.params.video.playerHeight;
-      const position = bidRequest.params.video.position;
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-      expect(data.imp[0].video.w).to.equal(width);
-      expect(data.imp[0].video.h).to.equal(height);
-      expect(data.imp[0].video.pos).to.equal(position);
-      expect(data.imp[0].video.mimes).to.equal(bidRequest.params.video.mimes);
-      expect(data.imp[0].video.protocols).to.equal(bidRequest.params.video.protocols);
-      expect(data.imp[0].video.linearity).to.equal(1);
-      expect(data.imp[0].video.maxduration).to.equal(bidRequest.params.video.maxduration);
-      expect(data.imp[0].video.minduration).to.equal(bidRequest.params.video.minduration);
-    });
-    describe('getUserSyncs', function () {
-      const GDPR_CONSENT_STRING = 'GDPR_CONSENT_STRING';
-
-      it('should get correct user sync when iframeEnabled', function () {
-        let pixel = spec.getUserSyncs({pixelEnabled: true}, {}, {gdprApplies: true, consentString: GDPR_CONSENT_STRING})
-        expect(pixel[2].type).to.equal('image');
-        expect(pixel[2].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=1&gdpr_consent=' + GDPR_CONSENT_STRING + '&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=1&gdpr_consent=' + encodeURI(GDPR_CONSENT_STRING));
-      });
-
-      it('should default to gdprApplies=0 when consentData is undefined', function () {
-        let pixel = spec.getUserSyncs({pixelEnabled: true}, {}, undefined);
-        expect(pixel[2].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=0&gdpr_consent=&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=0&gdpr_consent=');
-      });
-    });
-  });
-});
diff --git a/test/spec/modules/onetagBidAdapter_spec.js b/test/spec/modules/onetagBidAdapter_spec.js
index a951c74b20b..71e897c7f9e 100644
--- a/test/spec/modules/onetagBidAdapter_spec.js
+++ b/test/spec/modules/onetagBidAdapter_spec.js
@@ -1,8 +1,8 @@
-import { spec, isValid, hasTypeVideo } from 'modules/onetagBidAdapter.js';
+import { spec, isValid, hasTypeVideo, isSchainValid } from 'modules/onetagBidAdapter.js';
 import { expect } from 'chai';
-import find from 'core-js-pure/features/array/find.js';
+import { find } from 'src/polyfill.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
-import {INSTREAM, OUTSTREAM} from 'src/video.js';
+import { INSTREAM, OUTSTREAM } from 'src/video.js';
 
 describe('onetag', function () {
   function createBid() {
@@ -15,7 +15,21 @@ describe('onetag', function () {
       'bidId': '30b31c1838de1e',
       'bidderRequestId': '22edbae2733bf6',
       'auctionId': '1d1a030790a475',
-      'transactionId': 'qwerty123'
+      'transactionId': 'qwerty123',
+      'schain': {
+        'validation': 'off',
+        'config': {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [
+            {
+              'asi': 'indirectseller.com',
+              'sid': '00001',
+              'hp': 1
+            }
+          ]
+        }
+      },
     };
   }
 
@@ -105,9 +119,36 @@ describe('onetag', function () {
       });
     });
     describe('multi format bidRequest', function () {
-      const multiFormatBid = createMultiFormatBid();
       it('Should return true when correct multi format bid is passed', function () {
-        expect(spec.isBidRequestValid(multiFormatBid)).to.be.true;
+        expect(spec.isBidRequestValid(createMultiFormatBid())).to.be.true;
+      });
+      it('Should split multi format bid into two single format bid with same bidId', function () {
+        const bids = JSON.parse(spec.buildRequests([createMultiFormatBid()]).data).bids;
+        expect(bids.length).to.equal(2);
+        expect(bids[0].bidId).to.equal(bids[1].bidId);
+      });
+      it('Should retrieve correct request bid when extracting video request data', function () {
+        const requestBid = createMultiFormatBid();
+        const multiFormatRequest = spec.buildRequests([requestBid]);
+        const serverResponse = {
+          body: {
+            bids: [
+              {
+                mediaType: BANNER,
+                requestId: requestBid.bidId,
+                ad: 'test-banner'
+              }, {
+                mediaType: VIDEO,
+                requestId: requestBid.bidId,
+                vastUrl: 'test-video'
+              }
+            ]
+          }
+        };
+        const responseBids = spec.interpretResponse(serverResponse, multiFormatRequest);
+        expect(responseBids.length).to.equal(2);
+        expect(responseBids[0].ad).to.equal('test-banner');
+        expect(responseBids[1].vastUrl).to.equal('test-video');
       });
     });
   });
@@ -132,10 +173,13 @@ describe('onetag', function () {
       const data = JSON.parse(d);
       it('Should contain all keys', function () {
         expect(data).to.be.an('object');
-        expect(data).to.include.all.keys('location', 'referrer', 'masked', 'sHeight', 'sWidth', 'docHeight', 'wHeight', 'wWidth', 'oHeight', 'oWidth', 'aWidth', 'aHeight', 'sLeft', 'sTop', 'hLength', 'bids', 'docHidden', 'xOffset', 'yOffset', 'onetagSid');
-        expect(data.location).to.be.a('string');
-        expect(data.masked).to.be.a('number');
-        expect(data.referrer).to.be.a('string');
+        expect(data).to.include.all.keys('location', 'referrer', 'stack', 'numIframes', 'sHeight', 'sWidth', 'docHeight', 'wHeight', 'wWidth', 'oHeight', 'oWidth', 'aWidth', 'aHeight', 'sLeft', 'sTop', 'hLength', 'bids', 'docHidden', 'xOffset', 'yOffset', 'networkConnectionType', 'networkEffectiveConnectionType', 'timing', 'version');
+        expect(data.location).to.satisfy(function (value) {
+          return value === null || typeof value === 'string';
+        });
+        expect(data.referrer).to.satisfy(referrer => referrer === null || typeof referrer === 'string');
+        expect(data.stack).to.be.an('array');
+        expect(data.numIframes).to.be.a('number');
         expect(data.sHeight).to.be.a('number');
         expect(data.sWidth).to.be.a('number');
         expect(data.wWidth).to.be.a('number');
@@ -147,27 +191,60 @@ describe('onetag', function () {
         expect(data.sLeft).to.be.a('number');
         expect(data.sTop).to.be.a('number');
         expect(data.hLength).to.be.a('number');
+        expect(data.networkConnectionType).to.satisfy(function (value) {
+          return value === null || typeof value === 'string'
+        });
+        expect(data.networkEffectiveConnectionType).to.satisfy(function (value) {
+          return value === null || typeof value === 'string'
+        });
         expect(data.bids).to.be.an('array');
+        expect(data.version).to.have.all.keys('prebid', 'adapter');
         const bids = data['bids'];
         for (let i = 0; i < bids.length; i++) {
           const bid = bids[i];
           if (hasTypeVideo(bid)) {
-            expect(bid).to.have.all.keys('adUnitCode', 'auctionId', 'bidId', 'bidderRequestId', 'pubId', 'transactionId', 'context', 'mimes', 'playerSize', 'protocols', 'maxDuration', 'api', 'type');
+            expect(bid).to.have.all.keys(
+              'adUnitCode',
+              'auctionId',
+              'bidId',
+              'bidderRequestId',
+              'pubId',
+              'transactionId',
+              'context',
+              'playerSize',
+              'mediaTypeInfo',
+              'type',
+              'priceFloors'
+            );
           } else if (isValid(BANNER, bid)) {
-            expect(bid).to.have.all.keys('adUnitCode', 'auctionId', 'bidId', 'bidderRequestId', 'pubId', 'transactionId', 'sizes', 'type');
+            expect(bid).to.have.all.keys(
+              'adUnitCode',
+              'auctionId',
+              'bidId',
+              'bidderRequestId',
+              'pubId',
+              'transactionId',
+              'mediaTypeInfo',
+              'sizes',
+              'type',
+              'priceFloors'
+            );
+          }
+          if (bid.schain && isSchainValid(bid.schain)) {
+            expect(data).to.have.all.keys('schain');
           }
           expect(bid.bidId).to.be.a('string');
           expect(bid.pubId).to.be.a('string');
         }
       });
-    } catch (e) {}
+    } catch (e) { }
     it('Returns empty data if no valid requests are passed', function () {
       serverRequest = spec.buildRequests([]);
       let dataString = serverRequest.data;
       try {
         let dataObj = JSON.parse(dataString);
         expect(dataObj.bids).to.be.an('array').that.is.empty;
-      } catch (e) {}
+      } catch (e) { }
     });
     it('should send GDPR consent data', function () {
       let consentString = 'consentString';
@@ -216,7 +293,7 @@ describe('onetag', function () {
         let dataItem = interpretedResponse[i];
         expect(dataItem).to.include.all.keys('requestId', 'cpm', 'width', 'height', 'ttl', 'creativeId', 'netRevenue', 'currency', 'meta', 'dealId');
         if (dataItem.meta.mediaType === VIDEO) {
-          const {context} = find(requestData.bids, (item) => item.bidId === dataItem.requestId);
+          const { context } = find(requestData.bids, (item) => item.bidId === dataItem.requestId);
           if (context === INSTREAM) {
             expect(dataItem).to.include.all.keys('videoCacheKey', 'vastUrl');
             expect(dataItem.vastUrl).to.be.a('string');
@@ -239,6 +316,7 @@ describe('onetag', function () {
         expect(dataItem.creativeId).to.be.a('string');
         expect(dataItem.netRevenue).to.be.a('boolean');
         expect(dataItem.currency).to.be.a('string');
+        expect(dataItem.meta.advertiserDomains).to.be.an('array');
       }
     });
     it('Returns an empty array if response is not valid', function () {
@@ -249,7 +327,7 @@ describe('onetag', function () {
   describe('getUserSyncs', function () {
     const sync_endpoint = 'https://onetag-sys.com/usync/';
     it('Returns an iframe if iframeEnabled is true', function () {
-      const syncs = spec.getUserSyncs({iframeEnabled: true});
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
       expect(syncs).to.be.an('array');
       expect(syncs.length).to.equal(1);
       expect(syncs[0].type).to.equal('iframe');
@@ -305,6 +383,36 @@ describe('onetag', function () {
       expect(syncs[0].url).to.match(/(?:[?&](?:us_privacy=us_foo(?:[&][^&]*)*))+$/);
     });
   });
+  describe('isSchainValid', function () {
+    it('Should return false when schain is null or undefined', function () {
+      expect(isSchainValid(null)).to.be.false;
+      expect(isSchainValid(undefined)).to.be.false;
+    });
+    it('Should return false when schain is missing nodes key', function () {
+      const schain = { 'otherKey': 'otherValue' };
+      expect(isSchainValid(schain)).to.be.false;
+    });
+    it('Should return false when schain is missing one of the required SupplyChainNode attribute', function () {
+      const missingAsiNode = { 'sid': '00001', 'hp': 1 };
+      const missingSidNode = { 'asi': 'indirectseller.com', 'hp': 1 };
+      const missingHpNode = { 'asi': 'indirectseller.com', 'sid': '00001' };
+      expect(isSchainValid({ 'config': { 'nodes': [missingAsiNode] } })).to.be.false;
+      expect(isSchainValid({ 'config': { 'nodes': [missingSidNode] } })).to.be.false;
+      expect(isSchainValid({ 'config': { 'nodes': [missingHpNode] } })).to.be.false;
+    });
+    it('Should return true when schain contains all required attributes', function () {
+      const validSchain = {
+        'nodes': [
+          {
+            'asi': 'indirectseller.com',
+            'sid': '00001',
+            'hp': 1
+          }
+        ]
+      };
+      expect(isSchainValid(validSchain)).to.be.true;
+    })
+  });
 });
 
 function getBannerVideoResponse() {
@@ -322,6 +430,7 @@ function getBannerVideoResponse() {
           currency: 'USD',
           requestId: 'banner',
           mediaType: BANNER,
+          adomain: []
         },
         {
           cpm: 13,
@@ -333,7 +442,8 @@ function getBannerVideoResponse() {
           requestId: 'videoInstream',
           vastUrl: 'https://videoinstream.org',
           videoCacheKey: 'key',
-          mediaType: VIDEO
+          mediaType: VIDEO,
+          adomain: ['test_domain']
         },
         {
           cpm: 13,
@@ -346,7 +456,8 @@ function getBannerVideoResponse() {
           requestId: 'videoOutstream',
           ad: '<?xml version="1.0" encoding="UTF-8"?><VAST version="2.0"></VAST>',
           rendererUrl: 'https://testRenderer',
-          mediaType: VIDEO
+          mediaType: VIDEO,
+          adomain: []
         }
       ]
     }
diff --git a/test/spec/modules/onomagicBidAdapter_spec.js b/test/spec/modules/onomagicBidAdapter_spec.js
index 7c71c3e5764..6ddc0edd477 100644
--- a/test/spec/modules/onomagicBidAdapter_spec.js
+++ b/test/spec/modules/onomagicBidAdapter_spec.js
@@ -222,7 +222,8 @@ describe('onomagicBidAdapter', function() {
               'nurl': '<!-- NURL -->',
               'adm': '<!-- Creative -->',
               'w': 300,
-              'h': 250
+              'h': 250,
+              'adomain': ['example.com']
             }]
           }]
         }
@@ -240,7 +241,10 @@ describe('onomagicBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `<!-- Creative --><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="${encodeURI('<!-- NURL -->')}"></div>`,
-        'ttl': 60
+        'ttl': 60,
+        'meta': {
+          'advertiserDomains': ['example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
@@ -258,7 +262,10 @@ describe('onomagicBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `<!-- Creative --><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="${encodeURI('<!-- NURL -->')}"></div>`,
-        'ttl': 60
+        'ttl': 60,
+        'meta': {
+          'advertiserDomains': ['example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
diff --git a/test/spec/modules/ooloAnalyticsAdapter_spec.js b/test/spec/modules/ooloAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..a6030e972ce
--- /dev/null
+++ b/test/spec/modules/ooloAnalyticsAdapter_spec.js
@@ -0,0 +1,793 @@
+import ooloAnalytics, { PAGEVIEW_ID } from 'modules/ooloAnalyticsAdapter.js';
+import {expect} from 'chai';
+import {server} from 'test/mocks/xhr.js';
+import constants from 'src/constants.json'
+import * as events from 'src/events'
+import { config } from 'src/config';
+import { buildAuctionData, generatePageViewId } from 'modules/ooloAnalyticsAdapter';
+
+const auctionId = '0ea14159-2058-4b87-a966-9d7652176a56';
+const auctionStart = 1598513385415
+const timeout = 3000
+const adUnit1 = 'top_1';
+const adUnit2 = 'top_2';
+const bidId1 = '392b5a6b05d648'
+const bidId2 = '392b5a6b05d649'
+const bidId3 = '392b5a6b05d650'
+
+const auctionInit = {
+  timestamp: auctionStart,
+  auctionId: auctionId,
+  timeout: timeout,
+  auctionStart,
+  adUnits: [{
+    code: adUnit1,
+    transactionId: 'abalksdkjfh-12sade'
+  }, {
+    code: adUnit2,
+    transactionId: 'abalksdkjfh-12sadf'
+  }]
+};
+
+const bidRequested = {
+  auctionId,
+  bidderCode: 'appnexus',
+  bidderRequestId: '2946b569352ef2',
+  start: 1598513405254,
+  bids: [
+    {
+      auctionId,
+      bidId: bidId1,
+      bidderRequestId: '2946b569352ef2',
+      bidder: 'appnexus',
+      adUnitCode: adUnit1,
+      sizes: [[728, 90], [970, 90]],
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90], [970, 90]],
+        },
+      },
+      params: {
+        placementId: '4799418',
+      },
+      schain: {}
+    },
+    {
+      auctionId,
+      bidId: bidId2,
+      bidderRequestId: '2946b569352ef3',
+      bidder: 'rubicon',
+      adUnitCode: adUnit2,
+      sizes: [[728, 90], [970, 90]],
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90], [970, 90]],
+        },
+      },
+      params: {
+        placementId: '4799418',
+      },
+      schain: {}
+    },
+    {
+      auctionId,
+      bidId: bidId3,
+      bidderRequestId: '2946b569352ef4',
+      bidder: 'ix',
+      adUnitCode: adUnit2,
+      sizes: [[728, 90], [970, 90]],
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90], [970, 90]],
+        },
+      },
+      params: {
+        placementId: '4799418',
+      },
+      schain: {}
+    },
+  ],
+}
+
+const noBid = {
+  auctionId,
+  adUnitCode: adUnit2,
+  bidId: bidId2,
+  requestId: bidId2
+}
+
+const bidResponse = {
+  auctionId,
+  bidderCode: 'appnexus',
+  mediaType: 'banner',
+  width: 0,
+  height: 0,
+  statusMessage: 'Bid available',
+  adId: '222bb26f9e8bd',
+  cpm: 0.112256,
+  responseTimestamp: 1598513485254,
+  requestTimestamp: 1462919238936,
+  bidder: 'appnexus',
+  adUnitCode: adUnit1,
+  timeToRespond: 401,
+  pbLg: '0.00',
+  pbMg: '0.10',
+  pbHg: '0.11',
+  pbAg: '0.10',
+  size: '0x0',
+  requestId: bidId1,
+  creativeId: '123456',
+  adserverTargeting: {
+    hb_bidder: 'appnexus',
+    hb_adid: '222bb26f9e8bd',
+    hb_pb: '10.00',
+    hb_size: '0x0',
+    foobar: '0x0',
+  },
+  netRevenue: true,
+  currency: 'USD',
+  ttl: 300,
+}
+
+const auctionEnd = {
+  auctionId: auctionId
+};
+
+const bidTimeout = [
+  {
+    adUnitCode: adUnit2,
+    auctionId: auctionId,
+    bidId: bidId3,
+    bidder: 'ix',
+    timeout: timeout
+  }
+];
+
+const bidWon = {
+  auctionId,
+  adUnitCode: adUnit1,
+  bidId: bidId1,
+  cpm: 0.5
+}
+
+function simulateAuction () {
+  events.emit(constants.EVENTS.AUCTION_INIT, auctionInit);
+  events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
+  events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+  events.emit(constants.EVENTS.NO_BID, noBid);
+  events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
+  events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
+}
+
+describe('oolo Prebid Analytic', () => {
+  let clock
+
+  beforeEach(() => {
+    sinon.stub(events, 'getEvents').returns([]);
+    clock = sinon.useFakeTimers()
+  });
+
+  afterEach(() => {
+    ooloAnalytics.disableAnalytics();
+    events.getEvents.restore()
+    clock.restore();
+  })
+
+  describe('enableAnalytics init options', () => {
+    it('should not enable analytics if invalid config', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: undefined
+        }
+      })
+
+      expect(server.requests).to.have.length(0)
+    })
+
+    it('should send prebid config to the server', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      const conf = {}
+      const pbjsConfig = config.getConfig()
+
+      Object.keys(pbjsConfig).forEach(key => {
+        if (key[0] !== '_') {
+          conf[key] = pbjsConfig[key]
+        }
+      })
+
+      expect(server.requests[1].url).to.contain('/hbconf')
+      expect(JSON.parse(server.requests[1].requestBody)).to.deep.equal(conf)
+    })
+
+    it('should request server config and send page data', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      expect(server.requests[0].url).to.contain('?pid=123')
+
+      const pageData = JSON.parse(server.requests[2].requestBody)
+
+      expect(pageData).to.have.property('timestamp')
+      expect(pageData).to.have.property('screenWidth')
+      expect(pageData).to.have.property('screenHeight')
+      expect(pageData).to.have.property('url')
+      expect(pageData).to.have.property('protocol')
+      expect(pageData).to.have.property('origin')
+      expect(pageData).to.have.property('referrer')
+      expect(pageData).to.have.property('pbVersion')
+      expect(pageData).to.have.property('pvid')
+      expect(pageData).to.have.property('pid')
+      expect(pageData).to.have.property('pbModuleVersion')
+      expect(pageData).to.have.property('domContentLoadTime')
+      expect(pageData).to.have.property('pageLoadTime')
+    })
+  })
+
+  describe('data handling and sending events', () => {
+    it('should send an "auction" event to the server', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(500)
+
+      simulateAuction()
+
+      expect(server.requests.length).to.equal(3)
+      clock.tick(2000)
+      expect(server.requests.length).to.equal(4)
+
+      const request = JSON.parse(server.requests[3].requestBody);
+
+      expect(request).to.include({
+        eventType: 'auction',
+        pid: 123,
+        auctionId,
+        auctionStart,
+        auctionEnd: 0,
+        timeout,
+      })
+      expect(request.pvid).to.be.a('number')
+      expect(request.adUnits).to.have.length(2)
+
+      const auctionAdUnit1 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit1)[0]
+      const auctionAdUnit2 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit2)[0]
+
+      expect(auctionAdUnit1.auctionId).to.equal(auctionId)
+      expect(auctionAdUnit1.bids).to.be.an('array')
+      expect(auctionAdUnit1.bids).to.have.length(1)
+
+      // bid response
+      expect(auctionAdUnit1.bids[0].bidId).to.equal(bidId1)
+      expect(auctionAdUnit1.bids[0].bst).to.equal('bidReceived')
+      expect(auctionAdUnit1.bids[0].bidder).to.equal('appnexus')
+      expect(auctionAdUnit1.bids[0].cpm).to.equal(0.112256)
+      expect(auctionAdUnit1.bids[0].cur).to.equal('USD')
+      expect(auctionAdUnit1.bids[0].s).to.equal(bidRequested.start)
+      expect(auctionAdUnit1.bids[0].e).to.equal(bidResponse.responseTimestamp)
+      expect(auctionAdUnit1.bids[0].rs).to.equal(bidRequested.start - auctionStart)
+      expect(auctionAdUnit1.bids[0].re).to.equal(bidResponse.responseTimestamp - auctionStart)
+      expect(auctionAdUnit1.bids[0].h).to.equal(0)
+      expect(auctionAdUnit1.bids[0].w).to.equal(0)
+      expect(auctionAdUnit1.bids[0].mt).to.equal('banner')
+      expect(auctionAdUnit1.bids[0].nrv).to.equal(true)
+      expect(auctionAdUnit1.bids[0].params).to.have.keys('placementId')
+      expect(auctionAdUnit1.bids[0].size).to.equal('0x0')
+      expect(auctionAdUnit1.bids[0].crId).to.equal('123456')
+      expect(auctionAdUnit1.bids[0].ttl).to.equal(bidResponse.ttl)
+      expect(auctionAdUnit1.bids[0].ttr).to.equal(bidResponse.timeToRespond)
+
+      expect(auctionAdUnit2.auctionId).to.equal(auctionId)
+      expect(auctionAdUnit2.bids).to.be.an('array')
+      expect(auctionAdUnit2.bids).to.have.length(2)
+
+      // no bid
+      expect(auctionAdUnit2.bids[0].bidId).to.equal(bidId2)
+      expect(auctionAdUnit2.bids[0].bst).to.equal('noBid')
+      expect(auctionAdUnit2.bids[0].bidder).to.equal('rubicon')
+      expect(auctionAdUnit2.bids[0].s).to.be.a('number')
+      expect(auctionAdUnit2.bids[0].e).to.be.a('number')
+      expect(auctionAdUnit2.bids[0].params).to.have.keys('placementId')
+
+      // timeout
+      expect(auctionAdUnit2.bids[1].bidId).to.equal(bidId3)
+      expect(auctionAdUnit2.bids[1].bst).to.equal('bidTimedOut')
+      expect(auctionAdUnit2.bids[1].bidder).to.equal('ix')
+      expect(auctionAdUnit2.bids[1].s).to.be.a('number')
+      expect(auctionAdUnit2.bids[1].e).to.be.a('undefined')
+    })
+
+    it('should push events to a queue and process them once server configuration returns', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit);
+      events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
+      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+
+      // configuration returned in an arbitrary moment
+      server.requests[0].respond(500)
+
+      events.emit(constants.EVENTS.NO_BID, noBid);
+      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
+      events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
+
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody);
+
+      expect(request).to.include({
+        eventType: 'auction',
+        pid: 123,
+        auctionId,
+        auctionStart,
+        auctionEnd: 0,
+        timeout,
+      })
+      expect(request.pvid).to.be.a('number')
+      expect(request.adUnits).to.have.length(2)
+
+      const auctionAdUnit1 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit1)[0]
+      const auctionAdUnit2 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit2)[0]
+
+      expect(auctionAdUnit1.auctionId).to.equal(auctionId)
+      expect(auctionAdUnit1.bids).to.be.an('array')
+      expect(auctionAdUnit1.bids).to.have.length(1)
+
+      // bid response
+      expect(auctionAdUnit1.bids[0].bidId).to.equal(bidId1)
+      expect(auctionAdUnit1.bids[0].bst).to.equal('bidReceived')
+      expect(auctionAdUnit1.bids[0].bidder).to.equal('appnexus')
+      expect(auctionAdUnit1.bids[0].cpm).to.equal(0.112256)
+      expect(auctionAdUnit1.bids[0].cur).to.equal('USD')
+      expect(auctionAdUnit1.bids[0].s).to.equal(bidRequested.start)
+      expect(auctionAdUnit1.bids[0].e).to.equal(bidResponse.responseTimestamp)
+      expect(auctionAdUnit1.bids[0].rs).to.equal(bidRequested.start - auctionStart)
+      expect(auctionAdUnit1.bids[0].re).to.equal(bidResponse.responseTimestamp - auctionStart)
+      expect(auctionAdUnit1.bids[0].h).to.equal(0)
+      expect(auctionAdUnit1.bids[0].w).to.equal(0)
+      expect(auctionAdUnit1.bids[0].mt).to.equal('banner')
+      expect(auctionAdUnit1.bids[0].nrv).to.equal(true)
+      expect(auctionAdUnit1.bids[0].params).to.have.keys('placementId')
+      expect(auctionAdUnit1.bids[0].size).to.equal('0x0')
+      expect(auctionAdUnit1.bids[0].crId).to.equal('123456')
+      expect(auctionAdUnit1.bids[0].ttl).to.equal(bidResponse.ttl)
+      expect(auctionAdUnit1.bids[0].ttr).to.equal(bidResponse.timeToRespond)
+
+      expect(auctionAdUnit2.auctionId).to.equal(auctionId)
+      expect(auctionAdUnit2.bids).to.be.an('array')
+      expect(auctionAdUnit2.bids).to.have.length(2)
+
+      // no bid
+      expect(auctionAdUnit2.bids[0].bidId).to.equal(bidId2)
+      expect(auctionAdUnit2.bids[0].bst).to.equal('noBid')
+      expect(auctionAdUnit2.bids[0].bidder).to.equal('rubicon')
+      expect(auctionAdUnit2.bids[0].s).to.be.a('number')
+      expect(auctionAdUnit2.bids[0].e).to.be.a('number')
+      expect(auctionAdUnit2.bids[0].params).to.have.keys('placementId')
+
+      // timeout
+      expect(auctionAdUnit2.bids[1].bidId).to.equal(bidId3)
+      expect(auctionAdUnit2.bids[1].bst).to.equal('bidTimedOut')
+      expect(auctionAdUnit2.bids[1].bidder).to.equal('ix')
+      expect(auctionAdUnit2.bids[1].s).to.be.a('number')
+      expect(auctionAdUnit2.bids[1].e).to.be.a('undefined')
+    })
+
+    it('should send "auction" event without all the fields that were set to undefined', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(500)
+
+      simulateAuction()
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody);
+
+      const auctionAdUnit1 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit1)[0]
+      const auctionAdUnit2 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit2)[0]
+
+      expect(auctionAdUnit1.code).to.equal(undefined)
+      expect(auctionAdUnit1.transactionId).to.equal(undefined)
+      expect(auctionAdUnit1.adUnitCode).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].auctionStart).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bids).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].refererInfo).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bidRequestsCount).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bidderRequestId).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bidderRequestsCount).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bidderWinsCount).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].schain).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].src).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].transactionId).to.equal(undefined)
+
+      // no bid
+      expect(auctionAdUnit2.bids[0].schain).to.equal(undefined)
+      expect(auctionAdUnit2.bids[0].src).to.equal(undefined)
+      expect(auctionAdUnit2.bids[0].transactionId).to.equal(undefined)
+    })
+
+    it('should mark bid winner and send to the server along with the auction data', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(500)
+      simulateAuction()
+      events.emit(constants.EVENTS.BID_WON, bidWon);
+      clock.tick(1500)
+
+      // no bidWon
+      expect(server.requests).to.have.length(4)
+
+      const request = JSON.parse(server.requests[3].requestBody);
+      expect(request.adUnits[0].bids[0].isW).to.equal(true)
+    })
+
+    it('should take BID_WON_TIMEOUT from server config if exists', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {},
+        'BID_WON_TIMEOUT': 500
+      }))
+
+      simulateAuction()
+      events.emit(constants.EVENTS.BID_WON, bidWon);
+      clock.tick(499)
+
+      // no auction data
+      expect(server.requests).to.have.length(3)
+
+      clock.tick(1)
+
+      // auction data
+      expect(server.requests).to.have.length(4)
+      const request = JSON.parse(server.requests[3].requestBody);
+      expect(request.adUnits[0].bids[0].isW).to.equal(true)
+    })
+
+    it('should send a "bidWon" event to the server', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(500)
+      simulateAuction()
+      clock.tick(1500)
+      events.emit(constants.EVENTS.BID_WON, bidWon);
+
+      expect(server.requests).to.have.length(5)
+
+      const request = JSON.parse(server.requests[4].requestBody);
+
+      expect(request.eventType).to.equal('bidWon')
+      expect(request.auctionId).to.equal(auctionId)
+      expect(request.adunid).to.equal(adUnit1)
+      expect(request.bid.bst).to.equal('bidWon')
+      expect(request.bid.cur).to.equal('USD')
+      expect(request.bid.cpm).to.equal(0.5)
+    })
+
+    it('should sent adRenderFailed to the server', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(500)
+      simulateAuction()
+      clock.tick(1500)
+      events.emit(constants.EVENTS.AD_RENDER_FAILED, { bidId: 'abcdef', reason: 'exception' });
+
+      expect(server.requests).to.have.length(5)
+
+      const request = JSON.parse(server.requests[4].requestBody);
+
+      expect(request.eventType).to.equal('adRenderFailed')
+      expect(request.pvid).to.equal(PAGEVIEW_ID)
+      expect(request.bidId).to.equal('abcdef')
+      expect(request.reason).to.equal('exception')
+    })
+
+    it('should pick fields according to server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'bidRequested': {
+            'sendRaw': 0,
+            'pickFields': ['transactionId']
+          },
+          'noBid': {
+            'sendRaw': 0,
+            'pickFields': ['src']
+          },
+          'bidResponse': {
+            'sendRaw': 0,
+            'pickFields': ['adUrl', 'statusMessage']
+          },
+          'auctionEnd': {
+            'sendRaw': 0,
+            'pickFields': ['winningBids']
+          },
+        }
+      }))
+
+      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit });
+      events.emit(constants.EVENTS.BID_REQUESTED, { ...bidRequested, bids: bidRequested.bids.map(b => { b.transactionId = '123'; return b }) });
+      events.emit(constants.EVENTS.NO_BID, { ...noBid, src: 'client' });
+      events.emit(constants.EVENTS.BID_RESPONSE, { ...bidResponse, adUrl: '...' });
+      events.emit(constants.EVENTS.AUCTION_END, { ...auctionEnd, winningBids: [] });
+      events.emit(constants.EVENTS.BID_WON, { ...bidWon, statusMessage: 'msg2' });
+
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody)
+
+      expect(request.adUnits[0].bids[0].transactionId).to.equal('123')
+      expect(request.adUnits[0].bids[0].adUrl).to.equal('...')
+      expect(request.adUnits[0].bids[0].statusMessage).to.equal('msg2')
+      expect(request.adUnits[1].bids[0].src).to.equal('client')
+    })
+
+    it('should omit fields according to server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 0,
+            'omitFields': ['custom_1']
+          },
+          'bidResponse': {
+            'sendRaw': 0,
+            'omitFields': ['custom_2', 'custom_4', 'custom_5']
+          }
+        }
+      }))
+
+      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit, custom_1: true });
+      events.emit(constants.EVENTS.BID_REQUESTED, { ...bidRequested, bids: bidRequested.bids.map(b => { b.custom_2 = true; return b }) });
+      events.emit(constants.EVENTS.NO_BID, { ...noBid, custom_3: true });
+      events.emit(constants.EVENTS.BID_RESPONSE, { ...bidResponse, custom_4: true });
+      events.emit(constants.EVENTS.AUCTION_END, { ...auctionEnd });
+      events.emit(constants.EVENTS.BID_WON, { ...bidWon, custom_5: true });
+
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody)
+
+      expect(request.custom_1).to.equal(undefined)
+      expect(request.custom_6).to.equal(undefined)
+      expect(request.adUnits[0].bids[0].custom_2).to.equal(undefined)
+      expect(request.adUnits[0].bids[0].custom_4).to.equal(undefined)
+      expect(request.adUnits[0].bids[0].custom_5).to.equal(undefined)
+      expect(request.adUnits[0].bids[0].custom_7).to.equal(undefined)
+    })
+
+    it('should omit fields from raw data according to server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 1,
+            'omitRawFields': ['custom_1']
+          },
+        }
+      }))
+
+      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit, custom_1: true });
+
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody)
+
+      expect(request.eventType).to.equal('auctionInit')
+      expect(request.custom_1).to.equal(undefined)
+    })
+
+    it('should send raw data to custom endpoint if exists in server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 1,
+            'endpoint': 'https://pbjs.com'
+          },
+        }
+      }))
+
+      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit });
+
+      expect(server.requests[3].url).to.equal('https://pbjs.com')
+    })
+
+    it('should send raw events based on server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 0,
+          },
+          'bidRequested': {
+            'sendRaw': 1,
+          }
+        }
+      }))
+
+      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit)
+      events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
+
+      const request = JSON.parse(server.requests[3].requestBody)
+
+      expect(request).to.deep.equal({
+        eventType: 'bidRequested',
+        pid: 123,
+        pvid: PAGEVIEW_ID,
+        pbModuleVersion: '1.0.0',
+        ...bidRequested
+      })
+    })
+
+    it('should queue events and raw events until server configuration resolves', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      simulateAuction()
+      clock.tick(1500)
+
+      expect(server.requests).to.have.length(3)
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 1,
+          },
+          'bidRequested': {
+            'sendRaw': 1,
+          }
+        }
+      }))
+
+      expect(server.requests).to.have.length(5)
+      expect(JSON.parse(server.requests[3].requestBody).eventType).to.equal('auctionInit')
+      expect(JSON.parse(server.requests[4].requestBody).eventType).to.equal('bidRequested')
+    })
+  });
+
+  describe('buildAuctionData', () => {
+    let auction = {
+      auctionId,
+      auctionStart,
+      auctionEnd,
+      adUnitCodes: ['mid_1'],
+      auctionStatus: 'running',
+      bidderRequests: [],
+      bidsReceived: [],
+      noBids: [],
+      winningBids: [],
+      timestamp: 1234567,
+      config: {},
+      adUnits: {
+        mid_1: {
+          adUnitCode: 'mid_1',
+          code: 'mid_1',
+          transactionId: '123dsafasdf',
+          bids: {
+            [bidId1]: {
+              adUnitCode: 'mid_1',
+              cpm: 0.5
+            }
+          }
+        }
+      }
+    }
+
+    it('should turn adUnits and bids objects into arrays', () => {
+      const auctionData = buildAuctionData(auction, [])
+
+      expect(auctionData.adUnits).to.be.an('array')
+      expect(auctionData.adUnits[0].bids).to.be.an('array')
+    })
+
+    it('should remove fields from the auction', () => {
+      const auctionData = buildAuctionData(auction, [])
+      const auctionFields = Object.keys(auctionData)
+      const adUnitFields = Object.keys(auctionData.adUnits[0])
+
+      expect(auctionFields).not.to.contain('adUnitCodes')
+      expect(auctionFields).not.to.contain('auctionStatus')
+      expect(auctionFields).not.to.contain('bidderRequests')
+      expect(auctionFields).not.to.contain('bidsReceived')
+      expect(auctionFields).not.to.contain('noBids')
+      expect(auctionFields).not.to.contain('winningBids')
+      expect(auctionFields).not.to.contain('timestamp')
+      expect(auctionFields).not.to.contain('config')
+
+      expect(adUnitFields).not.to.contain('adUnitCoe')
+      expect(adUnitFields).not.to.contain('code')
+      expect(adUnitFields).not.to.contain('transactionId')
+    })
+  })
+
+  describe('generatePageViewId', () => {
+    it('should generate a 19 digits number', () => {
+      expect(generatePageViewId()).length(19)
+    })
+  })
+});
diff --git a/test/spec/modules/open8BidAdapter_spec.js b/test/spec/modules/open8BidAdapter_spec.js
index 506742bef9e..27e460bad9d 100644
--- a/test/spec/modules/open8BidAdapter_spec.js
+++ b/test/spec/modules/open8BidAdapter_spec.js
@@ -1,5 +1,5 @@
-import { spec } from 'modules/open8BidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
+import { spec } from 'modules/open8BidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory';
 
 const ENDPOINT = 'https://as.vt.open8.com/v1/control/prebid';
 
@@ -53,14 +53,15 @@ describe('Open8Adapter', function() {
     });
   });
   describe('interpretResponse', function() {
+    const adomin = ['example.com']
     const bannerResponse = {
       slotKey: 'slotkey1234',
       userId: 'userid1234',
       impId: 'impid1234',
       media: 'TEST_MEDIA',
-      nurl: 'https://example/win',
+      nurl: '//example/win',
       isAdReturn: true,
-      syncPixels: ['https://example/sync/pixel.gif'],
+      syncPixels: ['//example/sync/pixel.gif'],
       syncIFs: [],
       ad: {
         bidId: 'TEST_BID_ID',
@@ -73,14 +74,15 @@ describe('Open8Adapter', function() {
         fa: 5678,
         pr: 'pr1234',
         mr: 'mr1234',
-        nurl: 'https://example/win',
+        nurl: '//example/win',
         adType: 2,
         banner: {
           w: 300,
           h: 250,
           adm: '<div></div>',
-          imps: ['https://example.com/imp']
-        }
+          imps: ['//example.com/imp']
+        },
+        adomain: adomin
       }
     };
     const videoResponse = {
@@ -89,7 +91,7 @@ describe('Open8Adapter', function() {
       impId: 'impid1234',
       media: 'TEST_MEDIA',
       isAdReturn: true,
-      syncPixels: ['https://example/sync/pixel.gif'],
+      syncPixels: ['//example/sync/pixel.gif'],
       syncIFs: [],
       ad: {
         bidId: 'TEST_BID_ID',
@@ -102,14 +104,15 @@ describe('Open8Adapter', function() {
         fa: 5678,
         pr: 'pr1234',
         mr: 'mr1234',
-        nurl: 'https://example/win',
+        nurl: '//example/win',
         adType: 1,
         video: {
-          purl: 'https://playerexample.js',
+          purl: '//playerexample.js',
           vastXml: '<VAST></VAST>',
           w: 320,
           h: 180
         },
+        adomain: adomin
       }
     };
 
@@ -124,23 +127,25 @@ describe('Open8Adapter', function() {
         'fa': 5678,
         'pr': 'pr1234',
         'mr': 'mr1234',
-        'nurl': 'https://example/win',
+        'nurl': '//example/win',
         'requestId': 'requestid1234',
         'cpm': 1234.56,
         'creativeId': 'creativeid1234',
         'dealId': 'TEST_DEAL_ID',
         'width': 300,
         'height': 250,
-        'ad': "<div></div><img src='https://example/sync/pixel.gif' />",
+        'ad': "<div></div><img src='//example/sync/pixel.gif' />",
         'mediaType': 'banner',
         'currency': 'JPY',
         'ttl': 360,
-        'netRevenue': true
+        'netRevenue': true,
+        'meta': { }
       }];
 
       let bidderRequest;
       let result = spec.interpretResponse({ body: bannerResponse }, { bidderRequest });
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0]).to.nested.contain.property('meta.advertiserDomains', adomin);
     });
 
     it('handles video responses', function() {
@@ -154,7 +159,7 @@ describe('Open8Adapter', function() {
         'fa': 5678,
         'pr': 'pr1234',
         'mr': 'mr1234',
-        'nurl': 'https://example/win',
+        'nurl': '//example/win',
         'requestId': 'requestid1234',
         'cpm': 1234.56,
         'creativeId': 'creativeid1234',
@@ -167,12 +172,14 @@ describe('Open8Adapter', function() {
         'adResponse': {},
         'currency': 'JPY',
         'ttl': 360,
-        'netRevenue': true
+        'netRevenue': true,
+        'meta': { }
       }];
 
       let bidderRequest;
       let result = spec.interpretResponse({ body: videoResponse }, { bidderRequest });
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0]).to.nested.contain.property('meta.advertiserDomains', adomin);
     });
 
     it('handles nobid responses', function() {
diff --git a/test/spec/modules/openwebBidAdapter_spec.js b/test/spec/modules/openwebBidAdapter_spec.js
new file mode 100644
index 00000000000..c515c21690a
--- /dev/null
+++ b/test/spec/modules/openwebBidAdapter_spec.js
@@ -0,0 +1,387 @@
+import { expect } from 'chai';
+import { spec } from 'modules/openwebBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+
+const DEFAULT_ADATPER_REQ = { bidderCode: 'openweb' };
+const DISPLAY_REQUEST = {
+  'bidder': 'openweb',
+  'params': {
+    'aid': 12345
+  },
+  'schain': { ver: 1 },
+  'userId': { criteo: 2 },
+  'mediaTypes': { 'banner': { 'sizes': [300, 250] } },
+  'bidderRequestId': '7101db09af0db2',
+  'auctionId': '2e41f65424c87c',
+  'adUnitCode': 'adunit-code',
+  'bidId': '84ab500420319d',
+};
+
+const VIDEO_REQUEST = {
+  'bidder': 'openweb',
+  'mediaTypes': {
+    'video': {
+      'playerSize': [[480, 360], [640, 480]]
+    }
+  },
+  'params': {
+    'aid': 12345
+  },
+  'bidderRequestId': '7101db09af0db2',
+  'auctionId': '2e41f65424c87c',
+  'adUnitCode': 'adunit-code',
+  'bidId': '84ab500420319d'
+};
+
+const ADPOD_REQUEST = {
+  'bidder': 'openweb',
+  'mediaTypes': {
+    'video': {
+      'context': 'adpod',
+      'playerSize': [[640, 480]],
+      'anyField': 10
+    }
+  },
+  'params': {
+    'aid': 12345
+  },
+  'bidderRequestId': '7101db09af0db2',
+  'auctionId': '2e41f65424c87c',
+  'adUnitCode': 'adunit-code',
+  'bidId': '2e41f65424c87c'
+};
+
+const SERVER_VIDEO_RESPONSE = {
+  'source': { 'aid': 12345, 'pubId': 54321 },
+  'bids': [{
+    'vastUrl': 'vastUrl',
+    'requestId': '2e41f65424c87c',
+    'url': '44F2AEB9BFC881B3',
+    'creative_id': 342516,
+    'durationSeconds': 30,
+    'cmpId': 342516,
+    'height': 480,
+    'cur': 'USD',
+    'width': 640,
+    'cpm': 0.9,
+    'adomain': ['a.com']
+  }]
+};
+const SERVER_OUSTREAM_VIDEO_RESPONSE = SERVER_VIDEO_RESPONSE;
+const SERVER_DISPLAY_RESPONSE = {
+  'source': { 'aid': 12345, 'pubId': 54321 },
+  'bids': [{
+    'ad': '<!-- Creative -->',
+    'adUrl': 'adUrl',
+    'requestId': '2e41f65424c87c',
+    'creative_id': 342516,
+    'cmpId': 342516,
+    'height': 250,
+    'cur': 'USD',
+    'width': 300,
+    'cpm': 0.9
+  }],
+  'cookieURLs': ['link1', 'link2']
+};
+const SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS = {
+  'source': { 'aid': 12345, 'pubId': 54321 },
+  'bids': [{
+    'ad': '<!-- Creative -->',
+    'requestId': '2e41f65424c87c',
+    'creative_id': 342516,
+    'cmpId': 342516,
+    'height': 250,
+    'cur': 'USD',
+    'width': 300,
+    'cpm': 0.9
+  }],
+  'cookieURLs': ['link3', 'link4'],
+  'cookieURLSTypes': ['image', 'iframe']
+};
+
+const videoBidderRequest = {
+  bidderCode: 'bidderCode',
+  bids: [{ mediaTypes: { video: {} }, bidId: '2e41f65424c87c' }]
+};
+
+const displayBidderRequest = {
+  bidderCode: 'bidderCode',
+  bids: [{ bidId: '2e41f65424c87c' }]
+};
+
+const displayBidderRequestWithConsents = {
+  bidderCode: 'bidderCode',
+  bids: [{ bidId: '2e41f65424c87c' }],
+  gdprConsent: {
+    gdprApplies: true,
+    consentString: 'test'
+  },
+  uspConsent: 'iHaveIt'
+};
+
+const videoEqResponse = [{
+  vastUrl: 'vastUrl',
+  requestId: '2e41f65424c87c',
+  creativeId: 342516,
+  mediaType: 'video',
+  netRevenue: true,
+  currency: 'USD',
+  height: 480,
+  width: 640,
+  ttl: 300,
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: ['a.com']
+  }
+}];
+
+const displayEqResponse = [{
+  requestId: '2e41f65424c87c',
+  creativeId: 342516,
+  mediaType: 'banner',
+  netRevenue: true,
+  currency: 'USD',
+  ad: '<!-- Creative -->',
+  adUrl: 'adUrl',
+  height: 250,
+  width: 300,
+  ttl: 300,
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: []
+  }
+
+}];
+
+describe('openwebBidAdapter', () => {
+  const adapter = newBidder(spec);
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('user syncs', () => {
+    describe('as image', () => {
+      it('should be returned if pixel enabled', () => {
+        const syncs = spec.getUserSyncs({ pixelEnabled: true }, [{ body: SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS }]);
+
+        expect(syncs.map(s => s.url)).to.deep.equal([SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS.cookieURLs[0]]);
+        expect(syncs.map(s => s.type)).to.deep.equal(['image']);
+      })
+    })
+
+    describe('as iframe', () => {
+      it('should be returned if iframe enabled', () => {
+        const syncs = spec.getUserSyncs({ iframeEnabled: true }, [{ body: SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS }]);
+
+        expect(syncs.map(s => s.url)).to.deep.equal([SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS.cookieURLs[1]]);
+        expect(syncs.map(s => s.type)).to.deep.equal(['iframe']);
+      })
+    })
+
+    describe('user sync', () => {
+      it('should not  be returned if passed syncs where already used', () => {
+        const syncs = spec.getUserSyncs({
+          iframeEnabled: true,
+          pixelEnabled: true
+        }, [{ body: SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS }]);
+
+        expect(syncs).to.deep.equal([]);
+      })
+
+      it('should not be returned if pixel not set', () => {
+        const syncs = spec.getUserSyncs({}, [{ body: SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS }]);
+
+        expect(syncs).to.be.empty;
+      });
+    });
+    describe('user syncs with both types', () => {
+      it('should be returned if pixel and iframe enabled', () => {
+        const mockedServerResponse = Object.assign({}, SERVER_DISPLAY_RESPONSE_WITH_MIXED_SYNCS, { 'cookieURLs': ['link5', 'link6'] });
+        const syncs = spec.getUserSyncs({
+          iframeEnabled: true,
+          pixelEnabled: true
+        }, [{ body: mockedServerResponse }]);
+
+        expect(syncs.map(s => s.url)).to.deep.equal(mockedServerResponse.cookieURLs);
+        expect(syncs.map(s => s.type)).to.deep.equal(mockedServerResponse.cookieURLSTypes);
+      });
+    });
+  });
+
+  describe('isBidRequestValid', () => {
+    it('should return true when required params found', () => {
+      expect(spec.isBidRequestValid(VIDEO_REQUEST)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', () => {
+      let bid = Object.assign({}, VIDEO_REQUEST);
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', () => {
+    let videoBidRequests = [VIDEO_REQUEST];
+    let displayBidRequests = [DISPLAY_REQUEST];
+    let videoAndDisplayBidRequests = [DISPLAY_REQUEST, VIDEO_REQUEST];
+    const displayRequest = spec.buildRequests(displayBidRequests, DEFAULT_ADATPER_REQ);
+    const videoRequest = spec.buildRequests(videoBidRequests, DEFAULT_ADATPER_REQ);
+    const videoAndDisplayRequests = spec.buildRequests(videoAndDisplayBidRequests, DEFAULT_ADATPER_REQ);
+
+    it('building requests as arrays', () => {
+      expect(videoRequest).to.be.a('array');
+      expect(displayRequest).to.be.a('array');
+      expect(videoAndDisplayRequests).to.be.a('array');
+    })
+
+    it('sending as POST', () => {
+      const postActionMethod = 'POST'
+      const comparator = br => br.method === postActionMethod;
+      expect(videoRequest.every(comparator)).to.be.true;
+      expect(displayRequest.every(comparator)).to.be.true;
+      expect(videoAndDisplayRequests.every(comparator)).to.be.true;
+    });
+    it('forms correct ADPOD request', () => {
+      const pbBidReqData = spec.buildRequests([ADPOD_REQUEST], DEFAULT_ADATPER_REQ)[0].data;
+      const impRequest = pbBidReqData.BidRequests[0]
+      expect(impRequest.AdType).to.be.equal('video');
+      expect(impRequest.Adpod).to.be.a('object');
+      expect(impRequest.Adpod.anyField).to.be.equal(10);
+    })
+    it('sends correct video bid parameters', () => {
+      const data = videoRequest[0].data;
+
+      const eq = {
+        CallbackId: '84ab500420319d',
+        AdType: 'video',
+        Aid: 12345,
+        Sizes: '480x360,640x480',
+        PlacementId: 'adunit-code'
+      };
+      expect(data.BidRequests[0]).to.deep.equal(eq);
+    });
+
+    it('sends correct display bid parameters', () => {
+      const data = displayRequest[0].data;
+
+      const eq = {
+        CallbackId: '84ab500420319d',
+        AdType: 'display',
+        Aid: 12345,
+        Sizes: '300x250',
+        PlacementId: 'adunit-code'
+      };
+
+      expect(data.BidRequests[0]).to.deep.equal(eq);
+    });
+
+    it('sends correct video and display bid parameters', () => {
+      const bidRequests = videoAndDisplayRequests[0].data;
+      const expectedBidReqs = [{
+        CallbackId: '84ab500420319d',
+        AdType: 'display',
+        Aid: 12345,
+        Sizes: '300x250',
+        PlacementId: 'adunit-code'
+      }, {
+        CallbackId: '84ab500420319d',
+        AdType: 'video',
+        Aid: 12345,
+        Sizes: '480x360,640x480',
+        PlacementId: 'adunit-code'
+      }]
+
+      expect(bidRequests.BidRequests).to.deep.equal(expectedBidReqs);
+    });
+
+    describe('publisher environment', () => {
+      const sandbox = sinon.sandbox.create();
+      sandbox.stub(config, 'getConfig').callsFake((key) => {
+        const config = {
+          'coppa': true
+        };
+        return config[key];
+      });
+      const bidRequestWithPubSettingsData = spec.buildRequests([DISPLAY_REQUEST], displayBidderRequestWithConsents)[0].data;
+      sandbox.restore();
+      it('sets GDPR', () => {
+        expect(bidRequestWithPubSettingsData.GDPR).to.be.equal(1);
+        expect(bidRequestWithPubSettingsData.GDPRConsent).to.be.equal(displayBidderRequestWithConsents.gdprConsent.consentString);
+      });
+      it('sets USP', () => {
+        expect(bidRequestWithPubSettingsData.USP).to.be.equal(displayBidderRequestWithConsents.uspConsent);
+      })
+      it('sets Coppa', () => {
+        expect(bidRequestWithPubSettingsData.Coppa).to.be.equal(1);
+      })
+      it('sets Schain', () => {
+        expect(bidRequestWithPubSettingsData.Schain).to.be.deep.equal(DISPLAY_REQUEST.schain);
+      })
+      it('sets UserId\'s', () => {
+        expect(bidRequestWithPubSettingsData.UserIds).to.be.deep.equal(DISPLAY_REQUEST.userId);
+      })
+    })
+  });
+
+  describe('interpretResponse', () => {
+    let serverResponse;
+    let adapterRequest;
+    let eqResponse;
+
+    afterEach(() => {
+      serverResponse = null;
+      adapterRequest = null;
+      eqResponse = null;
+    });
+
+    it('should get correct video bid response', () => {
+      serverResponse = SERVER_VIDEO_RESPONSE;
+      adapterRequest = videoBidderRequest;
+      eqResponse = videoEqResponse;
+
+      bidServerResponseCheck();
+    });
+
+    it('should get correct display bid response', () => {
+      serverResponse = SERVER_DISPLAY_RESPONSE;
+      adapterRequest = displayBidderRequest;
+      eqResponse = displayEqResponse;
+
+      bidServerResponseCheck();
+    });
+
+    function bidServerResponseCheck() {
+      const result = spec.interpretResponse({ body: serverResponse }, { adapterRequest });
+
+      expect(result).to.deep.equal(eqResponse);
+    }
+
+    function nobidServerResponseCheck() {
+      const noBidServerResponse = { bids: [] };
+      const noBidResult = spec.interpretResponse({ body: noBidServerResponse }, { adapterRequest });
+
+      expect(noBidResult.length).to.equal(0);
+    }
+
+    it('handles video nobid responses', () => {
+      adapterRequest = videoBidderRequest;
+
+      nobidServerResponseCheck();
+    });
+
+    it('handles display nobid responses', () => {
+      adapterRequest = displayBidderRequest;
+
+      nobidServerResponseCheck();
+    });
+
+    it('forms correct ADPOD response', () => {
+      const videoBids = spec.interpretResponse({ body: SERVER_VIDEO_RESPONSE }, { adapterRequest: { bids: [ADPOD_REQUEST] } });
+      expect(videoBids[0].video.durationSeconds).to.be.equal(30);
+      expect(videoBids[0].video.context).to.be.equal('adpod');
+    })
+  });
+});
diff --git a/test/spec/modules/openxAnalyticsAdapter_spec.js b/test/spec/modules/openxAnalyticsAdapter_spec.js
index 805435abf80..1b1adeb8807 100644
--- a/test/spec/modules/openxAnalyticsAdapter_spec.js
+++ b/test/spec/modules/openxAnalyticsAdapter_spec.js
@@ -1,444 +1,21 @@
 import { expect } from 'chai';
 import openxAdapter from 'modules/openxAnalyticsAdapter.js';
-import { config } from 'src/config.js';
-import events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
-import { server } from 'test/mocks/xhr.js';
-
-const {
-  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, BID_TIMEOUT, BID_WON }
-} = CONSTANTS;
-
-const SLOT_LOADED = 'slotOnload';
 
 describe('openx analytics adapter', function() {
-  it('should require publisher id', function() {
-    sinon.spy(utils, 'logError');
-
-    openxAdapter.enableAnalytics();
-    expect(
-      utils.logError.calledWith(
-        'OpenX analytics adapter: publisherId is required.'
-      )
-    ).to.be.true;
-
-    utils.logError.restore();
-  });
-
-  describe('sending analytics event', function() {
-    const auctionInit = { auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79' };
-
-    const bidRequestedOpenX = {
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-      auctionStart: 1540944528017,
-      bids: [
-        {
-          adUnitCode: 'div-1',
-          bidId: '2f0c647b904e25',
-          bidder: 'openx',
-          params: { unit: '540249866' },
-          transactionId: 'ac66c3e6-3118-4213-a3ae-8cdbe4f72873'
-        }
-      ],
-      start: 1540944528021
-    };
-
-    const bidRequestedCloseX = {
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-      auctionStart: 1540944528017,
-      bids: [
-        {
-          adUnitCode: 'div-1',
-          bidId: '43d454020e9409',
-          bidder: 'closex',
-          params: { unit: '513144370' },
-          transactionId: 'ac66c3e6-3118-4213-a3ae-8cdbe4f72873'
-        }
-      ],
-      start: 1540944528026
-    };
-
-    const bidResponseOpenX = {
-      requestId: '2f0c647b904e25',
-      adId: '33dddbb61d359a',
-      adUnitCode: 'div-1',
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-      cpm: 0.5,
-      creativeId: 'openx-crid',
-      responseTimestamp: 1540944528184,
-      ts: '2DAABBgABAAECAAIBAAsAAgAAAJccGApKSGt6NUZxRXYyHBbinsLj'
-    };
-
-    const bidResponseCloseX = {
-      requestId: '43d454020e9409',
-      adId: '43dddbb61d359a',
-      adUnitCode: 'div-1',
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-      cpm: 0.3,
-      creativeId: 'closex-crid',
-      responseTimestamp: 1540944528196,
-      ts: 'hu1QWo6iD3MHs6NG_AQAcFtyNqsj9y4S0YRbX7Kb06IrGns0BABb'
-    };
-
-    const bidTimeoutOpenX = {
-      0: {
-        adUnitCode: 'div-1',
-        auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-        bidId: '2f0c647b904e25'
-      }
-    };
-
-    const bidTimeoutCloseX = {
-      0: {
-        adUnitCode: 'div-1',
-        auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-        bidId: '43d454020e9409'
-      }
-    };
-
-    const bidWonOpenX = {
-      requestId: '2f0c647b904e25',
-      adId: '33dddbb61d359a',
-      adUnitCode: 'div-1',
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79'
-    };
-
-    const bidWonCloseX = {
-      requestId: '43d454020e9409',
-      adId: '43dddbb61d359a',
-      adUnitCode: 'div-1',
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79'
-    };
-
-    function simulateAuction(events) {
-      let highestBid;
-
-      events.forEach(event => {
-        const [eventType, args] = event;
-        openxAdapter.track({ eventType, args });
-        if (eventType === BID_RESPONSE) {
-          highestBid = highestBid || args;
-          if (highestBid.cpm < args.cpm) {
-            highestBid = args;
-          }
-        }
-      });
-
-      openxAdapter.track({
-        eventType: SLOT_LOADED,
-        args: {
-          slot: {
-            getAdUnitPath: () => {
-              return '/90577858/test_ad_unit';
-            },
-            getTargetingKeys: () => {
-              return [];
-            },
-            getTargeting: sinon
-              .stub()
-              .withArgs('hb_adid')
-              .returns(highestBid ? [highestBid.adId] : [])
-          }
-        }
-      });
-    }
-
-    function getQueryData(url) {
-      const queryArgs = url.split('?')[1].split('&');
-      return queryArgs.reduce((data, arg) => {
-        const [key, val] = arg.split('=');
-        data[key] = val;
-        return data;
-      }, {});
-    }
-
-    before(function() {
-      sinon.stub(events, 'getEvents').returns([]);
-      openxAdapter.enableAnalytics({
-        options: {
-          publisherId: 'test123'
-        }
-      });
-    });
-
-    after(function() {
-      events.getEvents.restore();
-      openxAdapter.disableAnalytics();
-    });
-
-    beforeEach(function() {
-      openxAdapter.reset();
-    });
-
-    afterEach(function() {});
-
-    it('should not send request if no bid response', function() {
-      simulateAuction([
-        [AUCTION_INIT, auctionInit],
-        [BID_REQUESTED, bidRequestedOpenX]
-      ]);
-
-      expect(server.requests.length).to.equal(0);
-    });
-
-    it('should send 1 request to the right endpoint', function() {
-      simulateAuction([
-        [AUCTION_INIT, auctionInit],
-        [BID_REQUESTED, bidRequestedOpenX],
-        [BID_RESPONSE, bidResponseOpenX]
-      ]);
-
-      expect(server.requests.length).to.equal(1);
-
-      const endpoint = server.requests[0].url.split('?')[0];
-      // note IE11 returns the default secure port, so we look for this alternate value as well in these tests
-      expect(endpoint).to.be.oneOf(['https://ads.openx.net/w/1.0/pban', 'https://ads.openx.net:443/w/1.0/pban']);
-    });
-
-    describe('hb.ct, hb.rid, dddid, hb.asiid, hb.pubid', function() {
-      it('should always be in the query string', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.ct': String(bidRequestedOpenX.auctionStart),
-          'hb.rid': auctionInit.auctionId,
-          dddid: bidRequestedOpenX.bids[0].transactionId,
-          'hb.asiid': '/90577858/test_ad_unit',
-          'hb.pubid': 'test123'
-        });
-      });
-    });
-
-    describe('hb.cur', function() {
-      it('should be in the query string if currency is set', function() {
-        sinon
-          .stub(config, 'getConfig')
-          .withArgs('currency.adServerCurrency')
-          .returns('bitcoin');
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
-        ]);
-
-        config.getConfig.restore();
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.cur': 'bitcoin'
-        });
-      });
-
-      it('should not be in the query string if currency is not set', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.not.have.key('hb.cur');
-      });
-    });
-
-    describe('hb.dcl, hb.dl, hb.tta, hb.ttr', function() {
-      it('should be in the query string if browser supports performance API', function() {
-        const timing = {
-          fetchStart: 1540944528000,
-          domContentLoadedEventEnd: 1540944528010,
-          loadEventEnd: 1540944528110
-        };
-        const originalPerf = window.top.performance;
-        window.top.performance = { timing };
-
-        const renderTime = 1540944528100;
-        sinon.stub(Date, 'now').returns(renderTime);
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
-        ]);
-
-        window.top.performance = originalPerf;
-        Date.now.restore();
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.dcl': String(timing.domContentLoadedEventEnd - timing.fetchStart),
-          'hb.dl': String(timing.loadEventEnd - timing.fetchStart),
-          'hb.tta': String(bidRequestedOpenX.auctionStart - timing.fetchStart),
-          'hb.ttr': String(renderTime - timing.fetchStart)
-        });
-      });
-
-      it('should not be in the query string if browser does not support performance API', function() {
-        const originalPerf = window.top.performance;
-        window.top.performance = undefined;
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
-        ]);
-
-        window.top.performance = originalPerf;
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.not.have.keys(
-          'hb.dcl',
-          'hb.dl',
-          'hb.tta',
-          'hb.ttr'
-        );
-      });
-    });
-
-    describe('ts, auid', function() {
-      it('OpenX is in auction and has a bid response', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseOpenX],
-          [BID_RESPONSE, bidResponseCloseX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          ts: bidResponseOpenX.ts,
-          auid: bidRequestedOpenX.bids[0].params.unit
-        });
-      });
-
-      it('OpenX is in auction but no bid response', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseCloseX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          auid: bidRequestedOpenX.bids[0].params.unit
-        });
-        expect(queryData).to.not.have.key('ts');
-      });
-
-      it('OpenX is not in auction', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseCloseX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.not.have.keys('auid', 'ts');
-      });
+  describe('deprecation message', function () {
+    let spy;
+    beforeEach(function () {
+      spy = sinon.spy(utils, 'logWarn');
     });
 
-    describe('hb.exn, hb.sts, hb.ets, hb.bv, hb.crid, hb.to', function() {
-      it('2 bidders in auction', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseOpenX],
-          [BID_RESPONSE, bidResponseCloseX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        const auctionStart = bidRequestedOpenX.auctionStart;
-        expect(queryData).to.include({
-          'hb.exn': [
-            bidRequestedOpenX.bids[0].bidder,
-            bidRequestedCloseX.bids[0].bidder
-          ].join(','),
-          'hb.sts': [
-            bidRequestedOpenX.start - auctionStart,
-            bidRequestedCloseX.start - auctionStart
-          ].join(','),
-          'hb.ets': [
-            bidResponseOpenX.responseTimestamp - auctionStart,
-            bidResponseCloseX.responseTimestamp - auctionStart
-          ].join(','),
-          'hb.bv': [bidResponseOpenX.cpm, bidResponseCloseX.cpm].join(','),
-          'hb.crid': [
-            bidResponseOpenX.creativeId,
-            bidResponseCloseX.creativeId
-          ].join(','),
-          'hb.to': [false, false].join(',')
-        });
-      });
-
-      it('OpenX timed out', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseCloseX],
-          [BID_TIMEOUT, bidTimeoutOpenX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        const auctionStart = bidRequestedOpenX.auctionStart;
-        expect(queryData).to.include({
-          'hb.exn': [
-            bidRequestedOpenX.bids[0].bidder,
-            bidRequestedCloseX.bids[0].bidder
-          ].join(','),
-          'hb.sts': [
-            bidRequestedOpenX.start - auctionStart,
-            bidRequestedCloseX.start - auctionStart
-          ].join(','),
-          'hb.ets': [
-            undefined,
-            bidResponseCloseX.responseTimestamp - auctionStart
-          ].join(','),
-          'hb.bv': [0, bidResponseCloseX.cpm].join(','),
-          'hb.crid': [undefined, bidResponseCloseX.creativeId].join(','),
-          'hb.to': [true, false].join(',')
-        });
-      });
+    afterEach(function() {
+      utils.logWarn.restore();
     });
 
-    describe('hb.we, hb.g1', function() {
-      it('OpenX won', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX],
-          [BID_WON, bidWonOpenX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.we': '0',
-          'hb.g1': 'false'
-        });
-      });
-
-      it('DFP won', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
-        ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.we': '-1',
-          'hb.g1': 'true'
-        });
-      });
+    it('should warn on enable', function() {
+      openxAdapter.enableAnalytics();
+      expect(spy.firstCall.args[0]).to.match(/OpenX Analytics has been deprecated/);
     });
   });
 });
diff --git a/test/spec/modules/openxBidAdapter_spec.js b/test/spec/modules/openxBidAdapter_spec.js
index a6fbc9666b9..cc1c2d1e607 100644
--- a/test/spec/modules/openxBidAdapter_spec.js
+++ b/test/spec/modules/openxBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec, USER_ID_CODE_TO_QUERY_ARG} from 'modules/openxBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from 'src/mediaTypes.js';
 import {userSync} from 'src/userSync.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
@@ -121,6 +122,84 @@ describe('OpenxAdapter', function () {
     }
   };
 
+  // Sample bid requests
+
+  const BANNER_BID_REQUESTS_WITH_MEDIA_TYPES = [{
+    bidder: 'openx',
+    params: {
+      unit: '11',
+      delDomain: 'test-del-domain'
+    },
+    adUnitCode: '/adunit-code/test-path',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    bidId: 'test-bid-id-1',
+    bidderRequestId: 'test-bid-request-1',
+    auctionId: 'test-auction-1',
+    ortb2Imp: { ext: { data: { pbadslot: '/12345/my-gpt-tag-0' } } },
+  }, {
+    bidder: 'openx',
+    params: {
+      unit: '22',
+      delDomain: 'test-del-domain'
+    },
+    adUnitCode: 'adunit-code',
+    mediaTypes: {
+      banner: {
+        sizes: [[728, 90]]
+      }
+    },
+    bidId: 'test-bid-id-2',
+    bidderRequestId: 'test-bid-request-2',
+    auctionId: 'test-auction-2',
+    ortb2Imp: { ext: { data: { pbadslot: '/12345/my-gpt-tag-1' } } },
+  }];
+
+  const VIDEO_BID_REQUESTS_WITH_MEDIA_TYPES = [{
+    bidder: 'openx',
+    mediaTypes: {
+      video: {
+        playerSize: [640, 480]
+      }
+    },
+    params: {
+      unit: '12345678',
+      delDomain: 'test-del-domain'
+    },
+    adUnitCode: 'adunit-code',
+
+    bidId: '30b31c1838de1e',
+    bidderRequestId: '22edbae2733bf6',
+    auctionId: '1d1a030790a475',
+    transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e',
+    ortb2Imp: { ext: { data: { pbadslot: '/12345/my-gpt-tag-0' } } },
+  }];
+
+  const MULTI_FORMAT_BID_REQUESTS = [{
+    bidder: 'openx',
+    params: {
+      unit: '12345678',
+      delDomain: 'test-del-domain'
+    },
+    adUnitCode: 'adunit-code',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      },
+      video: {
+        playerSize: [300, 250]
+      }
+    },
+    bidId: '30b31c1838de1e',
+    bidderRequestId: '22edbae2733bf6',
+    auctionId: '1d1a030790a475',
+    transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e',
+    ortb2Imp: { ext: { data: { pbadslot: '/12345/my-gpt-tag-0' } } },
+  }];
+
   describe('inherited functions', function () {
     it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
@@ -180,28 +259,8 @@ describe('OpenxAdapter', function () {
 
     describe('when request is for a multiformat ad', function () {
       describe('and request config uses mediaTypes video and banner', () => {
-        const multiformatBid = {
-          bidder: 'openx',
-          params: {
-            unit: '12345678',
-            delDomain: 'test-del-domain'
-          },
-          adUnitCode: 'adunit-code',
-          mediaTypes: {
-            banner: {
-              sizes: [[300, 250]]
-            },
-            video: {
-              playerSize: [300, 250]
-            }
-          },
-          bidId: '30b31c1838de1e',
-          bidderRequestId: '22edbae2733bf6',
-          auctionId: '1d1a030790a475',
-          transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e'
-        };
         it('should return true multisize when required params found', function () {
-          expect(spec.isBidRequestValid(multiformatBid)).to.equal(true);
+          expect(spec.isBidRequestValid(MULTI_FORMAT_BID_REQUESTS[0])).to.equal(true);
         });
       });
     });
@@ -290,41 +349,43 @@ describe('OpenxAdapter', function () {
           expect(spec.isBidRequestValid(videoBidWithMediaType)).to.equal(false);
         });
       });
+
+      describe('and request config uses test', () => {
+        const videoBidWithTest = {
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain',
+            test: true
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            video: {
+              playerSize: [640, 480]
+            }
+          },
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e'
+        };
+
+        let mockBidderRequest = {refererInfo: {}};
+
+        it('should return true when required params found', function () {
+          expect(spec.isBidRequestValid(videoBidWithTest)).to.equal(true);
+        });
+
+        it('should send video bid request to openx url via GET, with vtest=1 video parameter', function () {
+          const request = spec.buildRequests([videoBidWithTest], mockBidderRequest);
+          expect(request[0].data.vtest).to.equal(1);
+        });
+      });
     });
   });
 
   describe('buildRequests for banner ads', function () {
-    const bidRequestsWithMediaTypes = [{
-      'bidder': 'openx',
-      'params': {
-        'unit': '11',
-        'delDomain': 'test-del-domain'
-      },
-      'adUnitCode': '/adunit-code/test-path',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300, 600]]
-        }
-      },
-      'bidId': 'test-bid-id-1',
-      'bidderRequestId': 'test-bid-request-1',
-      'auctionId': 'test-auction-1'
-    }, {
-      'bidder': 'openx',
-      'params': {
-        'unit': '22',
-        'delDomain': 'test-del-domain'
-      },
-      'adUnitCode': 'adunit-code',
-      mediaTypes: {
-        banner: {
-          sizes: [[728, 90]]
-        }
-      },
-      'bidId': 'test-bid-id-2',
-      'bidderRequestId': 'test-bid-request-2',
-      'auctionId': 'test-auction-2'
-    }];
+    const bidRequestsWithMediaTypes = BANNER_BID_REQUESTS_WITH_MEDIA_TYPES;
 
     const bidRequestsWithPlatform = [{
       'bidder': 'openx',
@@ -417,7 +478,12 @@ describe('OpenxAdapter', function () {
 
     it('should send the adunit codes', function () {
       const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
-      expect(request[0].data.divIds).to.equal(`${encodeURIComponent(bidRequestsWithMediaTypes[0].adUnitCode)},${encodeURIComponent(bidRequestsWithMediaTypes[1].adUnitCode)}`);
+      expect(request[0].data.divids).to.equal(`${encodeURIComponent(bidRequestsWithMediaTypes[0].adUnitCode)},${encodeURIComponent(bidRequestsWithMediaTypes[1].adUnitCode)}`);
+    });
+
+    it('should send the gpids', function () {
+      const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+      expect(request[0].data.aucs).to.equal(`${encodeURIComponent('/12345/my-gpt-tag-0')},${encodeURIComponent('/12345/my-gpt-tag-1')}`);
     });
 
     it('should send ad unit ids when any are defined', function () {
@@ -508,25 +574,6 @@ describe('OpenxAdapter', function () {
       expect(dataParams.tps).to.equal(btoa('test1=testval1.&test2=testval2_,testval3'));
     });
 
-    it('should send out custom floors on bids that have customFloors specified', function () {
-      const bidRequest = Object.assign({},
-        bidRequestsWithMediaTypes[0],
-        {
-          params: {
-            'unit': '12345678',
-            'delDomain': 'test-del-domain',
-            'customFloor': 1.500001
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest], mockBidderRequest);
-      const dataParams = request[0].data;
-
-      expect(dataParams.aumfs).to.exist;
-      expect(dataParams.aumfs).to.equal('1500');
-    });
-
     it('should send out custom bc parameter, if override is present', function () {
       const bidRequest = Object.assign({},
         bidRequestsWithMediaTypes[0],
@@ -1029,14 +1076,36 @@ describe('OpenxAdapter', function () {
       const EXAMPLE_DATA_BY_ATTR = {
         britepoolid: '1111-britepoolid',
         criteoId: '1111-criteoId',
-        digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        id5id: '1111-id5id',
+        fabrickId: '1111-fabrickid',
+        haloId: '1111-haloid',
+        id5id: {uid: '1111-id5id'},
         idl_env: '1111-idl_env',
+        IDP: '1111-zeotap-idplusid',
+        idxId: '1111-idxid',
+        intentIqId: '1111-intentiqid',
         lipb: {lipbid: '1111-lipb'},
+        lotamePanoramaId: '1111-lotameid',
+        merkleId: {id: '1111-merkleid'},
         netId: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
-        parrableid: 'eidVersion.encryptionKeyReference.encryptedValue',
+        parrableId: { eid: 'eidVersion.encryptionKeyReference.encryptedValue' },
         pubcid: '1111-pubcid',
+        quantcastId: '1111-quantcastid',
+        tapadId: '111-tapadid',
         tdid: '1111-tdid',
+        uid2: {id: '1111-uid2'},
+        novatiq: {snowflake: '1111-novatiqid'},
+        admixerId: '1111-admixerid',
+        deepintentId: '1111-deepintentid',
+        dmdId: '111-dmdid',
+        nextrollId: '1111-nextrollid',
+        mwOpenLinkId: '1111-mwopenlinkid',
+        dapId: '1111-dapId',
+        amxId: '1111-amxid',
+        kpuid: '1111-kpuid',
+        publinkId: '1111-publinkid',
+        naveggId: '1111-naveggid',
+        imuid: '1111-imuid',
+        adtelligentId: '1111-adtelligentid'
       };
 
       // generates the same set of tests for each id provider
@@ -1074,12 +1143,24 @@ describe('OpenxAdapter', function () {
             let userIdValue;
             // handle cases where userId key refers to an object
             switch (userIdProviderKey) {
-              case 'digitrustid':
-                userIdValue = EXAMPLE_DATA_BY_ATTR.digitrustid.data.id;
+              case 'merkleId':
+                userIdValue = EXAMPLE_DATA_BY_ATTR.merkleId.id;
+                break;
+              case 'uid2':
+                userIdValue = EXAMPLE_DATA_BY_ATTR.uid2.id;
                 break;
               case 'lipb':
                 userIdValue = EXAMPLE_DATA_BY_ATTR.lipb.lipbid;
                 break;
+              case 'parrableId':
+                userIdValue = EXAMPLE_DATA_BY_ATTR.parrableId.eid;
+                break;
+              case 'id5id':
+                userIdValue = EXAMPLE_DATA_BY_ATTR.id5id.uid;
+                break;
+              case 'novatiq':
+                userIdValue = EXAMPLE_DATA_BY_ATTR.novatiq.snowflake;
+                break;
               default:
                 userIdValue = EXAMPLE_DATA_BY_ATTR[userIdProviderKey];
             }
@@ -1089,27 +1170,113 @@ describe('OpenxAdapter', function () {
         });
       });
     });
+
+    describe('floors', function () {
+      it('should send out custom floors on bids that have customFloors specified', function () {
+        const bidRequest = Object.assign({},
+          bidRequestsWithMediaTypes[0],
+          {
+            params: {
+              'unit': '12345678',
+              'delDomain': 'test-del-domain',
+              'customFloor': 1.500001
+            }
+          }
+        );
+
+        const request = spec.buildRequests([bidRequest], mockBidderRequest);
+        const dataParams = request[0].data;
+
+        expect(dataParams.aumfs).to.exist;
+        expect(dataParams.aumfs).to.equal('1500');
+      });
+
+      context('with floors module', function () {
+        let adServerCurrencyStub;
+
+        beforeEach(function () {
+          adServerCurrencyStub = sinon
+            .stub(config, 'getConfig')
+            .withArgs('currency.adServerCurrency')
+        });
+
+        afterEach(function () {
+          config.getConfig.restore();
+        });
+
+        it('should send out floors on bids', function () {
+          const bidRequest1 = Object.assign({},
+            bidRequestsWithMediaTypes[0],
+            {
+              getFloor: () => {
+                return {
+                  currency: 'AUS',
+                  floor: 9.99
+                }
+              }
+            }
+          );
+
+          const bidRequest2 = Object.assign({},
+            bidRequestsWithMediaTypes[1],
+            {
+              getFloor: () => {
+                return {
+                  currency: 'AUS',
+                  floor: 18.881
+                }
+              }
+            }
+          );
+
+          const request = spec.buildRequests([bidRequest1, bidRequest2], mockBidderRequest);
+          const dataParams = request[0].data;
+
+          expect(dataParams.aumfs).to.exist;
+          expect(dataParams.aumfs).to.equal('9990,18881');
+        });
+
+        it('should send out floors on bids in the default currency', function () {
+          const bidRequest1 = Object.assign({},
+            bidRequestsWithMediaTypes[0],
+            {
+              getFloor: () => {
+                return {};
+              }
+            }
+          );
+
+          let getFloorSpy = sinon.spy(bidRequest1, 'getFloor');
+
+          spec.buildRequests([bidRequest1], mockBidderRequest);
+          expect(getFloorSpy.args[0][0].mediaType).to.equal(BANNER);
+          expect(getFloorSpy.args[0][0].currency).to.equal('USD');
+        });
+
+        it('should send out floors on bids in the ad server currency if defined', function () {
+          adServerCurrencyStub.returns('bitcoin');
+
+          const bidRequest1 = Object.assign({},
+            bidRequestsWithMediaTypes[0],
+            {
+              getFloor: () => {
+                return {};
+              }
+            }
+          );
+
+          let getFloorSpy = sinon.spy(bidRequest1, 'getFloor');
+
+          spec.buildRequests([bidRequest1], mockBidderRequest);
+          expect(getFloorSpy.args[0][0].mediaType).to.equal(BANNER);
+          expect(getFloorSpy.args[0][0].currency).to.equal('bitcoin');
+        });
+      })
+    })
   });
 
   describe('buildRequests for video', function () {
-    const bidRequestsWithMediaTypes = [{
-      'bidder': 'openx',
-      'mediaTypes': {
-        video: {
-          playerSize: [640, 480]
-        }
-      },
-      'params': {
-        'unit': '12345678',
-        'delDomain': 'test-del-domain'
-      },
-      'adUnitCode': 'adunit-code',
-
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-      'transactionId': '4008d88a-8137-410b-aa35-fbfdabcb478e'
-    }];
+    const bidRequestsWithMediaTypes = VIDEO_BID_REQUESTS_WITH_MEDIA_TYPES;
     const mockBidderRequest = {refererInfo: {}};
 
     it('should send bid request to openx url via GET, with mediaTypes having video parameter', function () {
@@ -1124,6 +1291,12 @@ describe('OpenxAdapter', function () {
       expect(dataParams.auid).to.equal('12345678');
       expect(dataParams.vht).to.equal(480);
       expect(dataParams.vwd).to.equal(640);
+      expect(dataParams.aucs).to.equal(encodeURIComponent('/12345/my-gpt-tag-0'));
+    });
+
+    it('shouldn\'t have the test parameter', function () {
+      const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+      expect(request[0].data.vtest).to.be.undefined;
     });
 
     it('should send a bc parameter', function () {
@@ -1178,81 +1351,387 @@ describe('OpenxAdapter', function () {
         expect(request[0].data.ju).to.not.equal(myUrl);
       });
 
-      describe('when using the openRtb param', function () {
-        it('should covert the param to a JSON string', function () {
-          let myOpenRTBObject = {};
+      describe('when using the openrtb video params', function () {
+        it('should parse legacy params.video.openrtb', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript']};
           videoBidRequest.params.video = {
             openrtb: myOpenRTBObject
           };
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
           const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
 
-          expect(request[0].data.openrtb).to.equal(JSON.stringify(myOpenRTBObject));
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
         });
 
-        it("should use the bidRequest's playerSize when it is available", function () {
-          const width = 200;
-          const height = 100;
-          const myOpenRTBObject = {v: height, w: width};
+        it('should parse legacy params.openrtb', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript']};
+          videoBidRequest.params.openrtb = myOpenRTBObject;
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should parse legacy params.video', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript']};
+          videoBidRequest.params.video = myOpenRTBObject;
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should parse legacy params.video as full openrtb', function () {
+          let myOpenRTBObject = {imp: [{video: {mimes: ['application/javascript']}}]};
+          videoBidRequest.params.video = myOpenRTBObject;
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should parse legacy video.openrtb', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript']};
+          videoBidRequest.params.video = {
+            openrtb: myOpenRTBObject
+          };
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should omit filtered values for legacy', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript'], dont: 'use'};
           videoBidRequest.params.video = {
             openrtb: myOpenRTBObject
           };
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should parse mediatypes.video', function () {
+          videoBidRequest.mediaTypes.video.mimes = ['application/javascript']
+          videoBidRequest.mediaTypes.video.minduration = 15
           const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
           const openRtbRequestParams = JSON.parse(request[0].data.openrtb);
+          expect(openRtbRequestParams.imp[0].video.mimes).to.eql(['application/javascript']);
+          expect(openRtbRequestParams.imp[0].video.minduration).to.equal(15);
+        });
 
-          expect(openRtbRequestParams.w).to.not.equal(width);
-          expect(openRtbRequestParams.v).to.not.equal(height);
+        it('should filter mediatypes.video', function () {
+          videoBidRequest.mediaTypes.video.mimes = ['application/javascript']
+          videoBidRequest.mediaTypes.video.minnothing = 15
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+          const openRtbRequestParams = JSON.parse(request[0].data.openrtb);
+          expect(openRtbRequestParams.imp[0].video.mimes).to.eql(['application/javascript']);
+          expect(openRtbRequestParams.imp[0].video.minnothing).to.equal(undefined);
         });
 
-        it('should use the the openRTB\'s sizing when the bidRequest\'s playerSize is not available', function () {
+        it("should use the bidRequest's playerSize", function () {
           const width = 200;
           const height = 100;
           const myOpenRTBObject = {v: height, w: width};
           videoBidRequest.params.video = {
             openrtb: myOpenRTBObject
           };
-          videoBidRequest.mediaTypes.video.playerSize = undefined;
-
           const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
           const openRtbRequestParams = JSON.parse(request[0].data.openrtb);
 
-          expect(openRtbRequestParams.w).to.equal(width);
-          expect(openRtbRequestParams.v).to.equal(height);
+          expect(openRtbRequestParams.imp[0].video.w).to.equal(640);
+          expect(openRtbRequestParams.imp[0].video.h).to.equal(480);
         });
       });
     });
+
+    describe('floors', function () {
+      it('should send out custom floors on bids that have customFloors specified', function () {
+        const bidRequest = Object.assign({},
+          bidRequestsWithMediaTypes[0],
+          {
+            params: {
+              'unit': '12345678',
+              'delDomain': 'test-del-domain',
+              'customFloor': 1.500001
+            }
+          }
+        );
+
+        const request = spec.buildRequests([bidRequest], mockBidderRequest);
+        const dataParams = request[0].data;
+
+        expect(dataParams.aumfs).to.exist;
+        expect(dataParams.aumfs).to.equal('1500');
+      });
+
+      context('with floors module', function () {
+        let adServerCurrencyStub;
+        function makeBidWithFloorInfo(floorInfo) {
+          return Object.assign(utils.deepClone(bidRequestsWithMediaTypes[0]),
+            {
+              getFloor: () => {
+                return floorInfo;
+              }
+            });
+        }
+
+        beforeEach(function () {
+          adServerCurrencyStub = sinon
+            .stub(config, 'getConfig')
+            .withArgs('currency.adServerCurrency')
+        });
+
+        afterEach(function () {
+          config.getConfig.restore();
+        });
+
+        it('should send out floors on bids', function () {
+          const floors = [9.99, 18.881];
+          const bidRequests = floors.map(floor => {
+            return makeBidWithFloorInfo({
+              currency: 'AUS',
+              floor: floor
+            });
+          });
+          const request = spec.buildRequests(bidRequests, mockBidderRequest);
+
+          expect(request[0].data.aumfs).to.exist;
+          expect(request[0].data.aumfs).to.equal('9990');
+          expect(request[1].data.aumfs).to.exist;
+          expect(request[1].data.aumfs).to.equal('18881');
+        });
+
+        it('should send out floors on bids in the default currency', function () {
+          const bidRequest1 = makeBidWithFloorInfo({});
+
+          let getFloorSpy = sinon.spy(bidRequest1, 'getFloor');
+
+          spec.buildRequests([bidRequest1], mockBidderRequest);
+          expect(getFloorSpy.args[0][0].mediaType).to.equal(VIDEO);
+          expect(getFloorSpy.args[0][0].currency).to.equal('USD');
+        });
+
+        it('should send out floors on bids in the ad server currency if defined', function () {
+          adServerCurrencyStub.returns('bitcoin');
+
+          const bidRequest1 = makeBidWithFloorInfo({});
+
+          let getFloorSpy = sinon.spy(bidRequest1, 'getFloor');
+
+          spec.buildRequests([bidRequest1], mockBidderRequest);
+          expect(getFloorSpy.args[0][0].mediaType).to.equal(VIDEO);
+          expect(getFloorSpy.args[0][0].currency).to.equal('bitcoin');
+        });
+      })
+    })
   });
 
   describe('buildRequest for multi-format ad', function () {
-    const multiformatBid = {
-      bidder: 'openx',
-      params: {
-        unit: '12345678',
-        delDomain: 'test-del-domain'
-      },
-      adUnitCode: 'adunit-code',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250]]
-        },
-        video: {
-          playerSize: [300, 250]
-        }
-      },
-      bidId: '30b31c1838de1e',
-      bidderRequestId: '22edbae2733bf6',
-      auctionId: '1d1a030790a475',
-      transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e'
-    };
+    const multiformatBid = MULTI_FORMAT_BID_REQUESTS[0];
     let mockBidderRequest = {refererInfo: {}};
 
     it('should default to a banner request', function () {
       const request = spec.buildRequests([multiformatBid], mockBidderRequest);
       const dataParams = request[0].data;
 
-      expect(dataParams.divIds).to.have.string(multiformatBid.adUnitCode);
+      expect(dataParams.divids).to.have.string(multiformatBid.adUnitCode);
     });
   });
 
+  describe('buildRequests for all kinds of ads', function () {
+    utils._each({
+      banner: BANNER_BID_REQUESTS_WITH_MEDIA_TYPES[0],
+      video: VIDEO_BID_REQUESTS_WITH_MEDIA_TYPES[0],
+      multi: MULTI_FORMAT_BID_REQUESTS[0]
+    }, (bidRequest, name) => {
+      describe('with segments', function () {
+        const TESTS = [
+          {
+            name: 'should send proprietary segment data from ortb2.user.data',
+            config: {
+              ortb2: {
+                user: {
+                  data: [
+                    {name: 'dmp1', ext: {segtax: 4}, segment: [{id: 'foo'}, {id: 'bar'}]},
+                    {name: 'dmp2', segment: [{id: 'baz'}]},
+                  ]
+                }
+              }
+            },
+            expect: {sm: 'dmp1/4:foo|bar,dmp2:baz'},
+          },
+          {
+            name: 'should send proprietary segment data from ortb2.site.content.data',
+            config: {
+              ortb2: {
+                site: {
+                  content: {
+                    data: [
+                      {name: 'dmp1', ext: {segtax: 4}, segment: [{id: 'foo'}, {id: 'bar'}]},
+                      {name: 'dmp2', segment: [{id: 'baz'}]},
+                    ]
+                  }
+                }
+              }
+            },
+            expect: {scsm: 'dmp1/4:foo|bar,dmp2:baz'},
+          },
+          {
+            name: 'should send proprietary segment data from both ortb2.site.content.data and ortb2.user.data',
+            config: {
+              ortb2: {
+                user: {
+                  data: [
+                    {name: 'dmp1', ext: {segtax: 4}, segment: [{id: 'foo'}, {id: 'bar'}]},
+                    {name: 'dmp2', segment: [{id: 'baz'}]},
+                  ]
+                },
+                site: {
+                  content: {
+                    data: [
+                      {name: 'dmp3', ext: {segtax: 5}, segment: [{id: 'foo2'}, {id: 'bar2'}]},
+                      {name: 'dmp4', segment: [{id: 'baz2'}]},
+                    ]
+                  }
+                }
+              }
+            },
+            expect: {
+              sm: 'dmp1/4:foo|bar,dmp2:baz',
+              scsm: 'dmp3/5:foo2|bar2,dmp4:baz2'
+            },
+          },
+          {
+            name: 'should combine same provider segment data from ortb2.user.data',
+            config: {
+              ortb2: {
+                user: {
+                  data: [
+                    {name: 'dmp1', ext: {segtax: 4}, segment: [{id: 'foo'}, {id: 'bar'}]},
+                    {name: 'dmp1', ext: {}, segment: [{id: 'baz'}]},
+                  ]
+                }
+              }
+            },
+            expect: {sm: 'dmp1/4:foo|bar,dmp1:baz'},
+          },
+          {
+            name: 'should combine same provider segment data from ortb2.site.content.data',
+            config: {
+              ortb2: {
+                site: {
+                  content: {
+                    data: [
+                      {name: 'dmp1', ext: {segtax: 4}, segment: [{id: 'foo'}, {id: 'bar'}]},
+                      {name: 'dmp1', ext: {}, segment: [{id: 'baz'}]},
+                    ]
+                  }
+                }
+              }
+            },
+            expect: {scsm: 'dmp1/4:foo|bar,dmp1:baz'},
+          },
+          {
+            name: 'should not send any segment data if first party config is incomplete',
+            config: {
+              ortb2: {
+                user: {
+                  data: [
+                    {name: 'provider-with-no-segments'},
+                    {segment: [{id: 'segments-with-no-provider'}]},
+                    {},
+                  ]
+                }
+              }
+            }
+          },
+          {
+            name: 'should send first party data segments and liveintent segments from request',
+            config: {
+              ortb2: {
+                user: {
+                  data: [
+                    {name: 'dmp1', segment: [{id: 'foo'}, {id: 'bar'}]},
+                    {name: 'dmp2', segment: [{id: 'baz'}]},
+                  ]
+                },
+                site: {
+                  content: {
+                    data: [
+                      {name: 'dmp3', ext: {segtax: 5}, segment: [{id: 'foo2'}, {id: 'bar2'}]},
+                      {name: 'dmp4', segment: [{id: 'baz2'}]},
+                    ]
+                  }
+                }
+              }
+            },
+            request: {
+              userId: {
+                lipb: {
+                  lipbid: 'aaa',
+                  segments: ['l1', 'l2']
+                },
+              },
+            },
+            expect: {
+              sm: 'dmp1:foo|bar,dmp2:baz,liveintent:l1|l2',
+              scsm: 'dmp3/5:foo2|bar2,dmp4:baz2'
+            },
+          },
+          {
+            name: 'should send just liveintent segment from request if no first party config',
+            config: {},
+            request: {
+              userId: {
+                lipb: {
+                  lipbid: 'aaa',
+                  segments: ['l1', 'l2']
+                },
+              },
+            },
+            expect: {sm: 'liveintent:l1|l2'},
+          },
+          {
+            name: 'should send nothing if lipb section does not contain segments',
+            config: {},
+            request: {
+              userId: {
+                lipb: {
+                  lipbid: 'aaa',
+                },
+              },
+            },
+          },
+        ];
+        utils._each(TESTS, (t) => {
+          context('in ortb2.user.data', function () {
+            let bidRequests;
+            beforeEach(function () {
+              bidRequests = [{...bidRequest, ...t.request}];
+            });
+
+            const mockBidderRequest = {refererInfo: {}, ortb2: t.config.ortb2};
+            it(`${t.name} for type ${name}`, function () {
+              const request = spec.buildRequests(bidRequests, mockBidderRequest)
+              expect(request.length).to.equal(1);
+              if (t.expect) {
+                for (const key in t.expect) {
+                  expect(request[0].data[key]).to.exist;
+                  expect(request[0].data[key]).to.equal(t.expect[key]);
+                }
+              } else {
+                expect(request[0].data.sm).to.not.exist;
+                expect(request[0].data.scsm).to.not.exist;
+              }
+            });
+          });
+        });
+      });
+    });
+  })
+
   describe('interpretResponse for banner ads', function () {
     beforeEach(function () {
       sinon.spy(userSync, 'registerSync');
@@ -1354,7 +1833,11 @@ describe('OpenxAdapter', function () {
         expect(bid.meta.brandId).to.equal(DEFAULT_TEST_ARJ_AD_UNIT.brand_id);
       });
 
-      it('should return a brand ID', function () {
+      it('should return an adomain', function () {
+        expect(bid.meta.advertiserDomains).to.deep.equal([]);
+      });
+
+      it('should return a dsp ID', function () {
         expect(bid.meta.dspid).to.equal(DEFAULT_TEST_ARJ_AD_UNIT.adv_id);
       });
     });
@@ -1634,6 +2117,13 @@ describe('OpenxAdapter', function () {
       expect(JSON.stringify(Object.keys(result[0]).sort())).to.eql(JSON.stringify(Object.keys(expectedResponse[0]).sort()));
     });
 
+    it('should return correct bid response with MediaType and deal_id', function () {
+      const bidResponseOverride = { 'deal_id': 'OX-mydeal' };
+      const bidResponseWithDealId = Object.assign({}, bidResponse, bidResponseOverride);
+      const result = spec.interpretResponse({body: bidResponseWithDealId}, bidRequestsWithMediaType);
+      expect(result[0].dealId).to.equal(bidResponseOverride.deal_id);
+    });
+
     it('should handle nobid responses for bidRequests with MediaTypes', function () {
       const bidResponse = {'vastUrl': '', 'pub_rev': '', 'width': '', 'height': '', 'adid': '', 'pixels': ''};
       const result = spec.interpretResponse({body: bidResponse}, bidRequestsWithMediaTypes);
diff --git a/test/spec/modules/openxOrtbBidAdapter_spec.js b/test/spec/modules/openxOrtbBidAdapter_spec.js
new file mode 100644
index 00000000000..be6427f607b
--- /dev/null
+++ b/test/spec/modules/openxOrtbBidAdapter_spec.js
@@ -0,0 +1,1512 @@
+import {expect} from 'chai';
+import {spec, REQUEST_URL, SYNC_URL, DEFAULT_PH} from 'modules/openxOrtbBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from 'src/mediaTypes.js';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+// load modules that register ORTB processors
+import 'src/prebid.js'
+import 'modules/currency.js';
+import 'modules/userId/index.js';
+import 'modules/multibid/index.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagement.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
+import {deepClone} from 'src/utils.js';
+import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
+import {hook} from '../../../src/hook.js';
+
+const DEFAULT_SYNC = SYNC_URL + '?ph=' + DEFAULT_PH;
+
+describe('OpenxRtbAdapter', function () {
+  before(() => {
+    hook.ready();
+  });
+
+  const adapter = newBidder(spec);
+
+  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('when request is for a banner ad', function () {
+      let bannerBid;
+      beforeEach(function () {
+        bannerBid = {
+          bidder: 'openx',
+          params: {},
+          adUnitCode: 'adunit-code',
+          mediaTypes: {banner: {}},
+          sizes: [[300, 250], [300, 600]],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475'
+        };
+      });
+
+      it('should return false when there is no delivery domain', function () {
+        bannerBid.params = {'unit': '12345678'};
+        expect(spec.isBidRequestValid(bannerBid)).to.equal(false);
+      });
+
+      describe('when there is a delivery domain', function () {
+        beforeEach(function () {
+          bannerBid.params = {delDomain: 'test-delivery-domain'}
+        });
+
+        it('should return false when there is no ad unit id and size', function () {
+          expect(spec.isBidRequestValid(bannerBid)).to.equal(false);
+        });
+
+        it('should return true if there is an adunit id ', function () {
+          bannerBid.params.unit = '12345678';
+          expect(spec.isBidRequestValid(bannerBid)).to.equal(true);
+        });
+
+        it('should return true if there is no adunit id and sizes are defined', function () {
+          bannerBid.mediaTypes.banner.sizes = [720, 90];
+          expect(spec.isBidRequestValid(bannerBid)).to.equal(true);
+        });
+
+        it('should return false if no sizes are defined ', function () {
+          expect(spec.isBidRequestValid(bannerBid)).to.equal(false);
+        });
+
+        it('should return false if sizes empty ', function () {
+          bannerBid.mediaTypes.banner.sizes = [];
+          expect(spec.isBidRequestValid(bannerBid)).to.equal(false);
+        });
+      });
+    });
+
+    describe('when request is for a multiformat ad', function () {
+      describe('and request config uses mediaTypes video and banner', () => {
+        const multiformatBid = {
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]]
+            },
+            video: {
+              playerSize: [300, 250]
+            }
+          },
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e'
+        };
+        it('should return true multisize when required params found', function () {
+          expect(spec.isBidRequestValid(multiformatBid)).to.equal(true);
+        });
+      });
+    });
+
+    describe('when request is for a video ad', function () {
+      describe('and request config uses mediaTypes', () => {
+        const videoBidWithMediaTypes = {
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            video: {
+              playerSize: [640, 480]
+            }
+          },
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e'
+        };
+        it('should return true when required params found', function () {
+          expect(spec.isBidRequestValid(videoBidWithMediaTypes)).to.equal(true);
+        });
+
+        it('should return false when required params are not passed', function () {
+          let videoBidWithMediaTypes = Object.assign({}, videoBidWithMediaTypes);
+          videoBidWithMediaTypes.params = {};
+          expect(spec.isBidRequestValid(videoBidWithMediaTypes)).to.equal(false);
+        });
+      });
+      describe('and request config uses both delDomain and platform', () => {
+        const videoBidWithDelDomainAndPlatform = {
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain',
+            platform: '1cabba9e-cafe-3665-beef-f00f00f00f00'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            video: {
+              playerSize: [640, 480]
+            }
+          },
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e'
+        };
+        it('should return true when required params found', function () {
+          expect(spec.isBidRequestValid(videoBidWithDelDomainAndPlatform)).to.equal(true);
+        });
+
+        it('should return false when required params are not passed', function () {
+          let videoBidWithMediaTypes = Object.assign({}, videoBidWithDelDomainAndPlatform);
+          videoBidWithMediaTypes.params = {};
+          expect(spec.isBidRequestValid(videoBidWithMediaTypes)).to.equal(false);
+        });
+      });
+      describe('and request config uses mediaType', () => {
+        const videoBidWithMediaType = {
+          'bidder': 'openx',
+          'params': {
+            'unit': '12345678',
+            'delDomain': 'test-del-domain'
+          },
+          'adUnitCode': 'adunit-code',
+          'mediaType': 'video',
+          'sizes': [640, 480],
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+          'transactionId': '4008d88a-8137-410b-aa35-fbfdabcb478e'
+        };
+        it('should return true when required params found', function () {
+          expect(spec.isBidRequestValid(videoBidWithMediaType)).to.equal(true);
+        });
+
+        it('should return false when required params are not passed', function () {
+          let videoBidWithMediaType = Object.assign({}, videoBidWithMediaType);
+          delete videoBidWithMediaType.params;
+          videoBidWithMediaType.params = {};
+          expect(spec.isBidRequestValid(videoBidWithMediaType)).to.equal(false);
+        });
+      });
+    });
+  });
+
+  describe('buildRequests()', function () {
+    let bidRequestsWithMediaTypes;
+    let bidRequestsWithPlatform;
+    let mockBidderRequest;
+
+    beforeEach(function () {
+      mockBidderRequest = {refererInfo: {}};
+
+      bidRequestsWithMediaTypes = [{
+        bidder: 'openx',
+        params: {
+          unit: '11',
+          delDomain: 'test-del-domain',
+          platform: '1cabba9e-cafe-3665-beef-f00f00f00f00',
+        },
+        adUnitCode: '/adunit-code/test-path',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        bidId: 'test-bid-id-1',
+        bidderRequestId: 'test-bid-request-1',
+        auctionId: 'test-auction-1',
+        transactionId: 'test-transactionId-1',
+        ortb2Imp: {
+          ext: {
+            ae: 2
+          }
+        }
+      }, {
+        bidder: 'openx',
+        params: {
+          unit: '22',
+          delDomain: 'test-del-domain',
+          platform: '1cabba9e-cafe-3665-beef-f00f00f00f00',
+        },
+        adUnitCode: 'adunit-code',
+        mediaTypes: {
+          video: {
+            playerSize: [640, 480]
+          }
+        },
+        bidId: 'test-bid-id-2',
+        bidderRequestId: 'test-bid-request-2',
+        auctionId: 'test-auction-2',
+        transactionId: 'test-transactionId-2'
+      }];
+    });
+
+    context('common requests checks', function() {
+      it('should send bid request to openx url via POST', function () {
+        const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+        expect(request[0].url).to.equal(REQUEST_URL);
+        expect(request[0].method).to.equal('POST');
+      });
+
+      it('should send delivery domain, if available', function () {
+        const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+        expect(request[0].data.ext.delDomain).to.equal(bidRequestsWithMediaTypes[0].params.delDomain);
+        expect(request[0].data.ext.platformId).to.be.undefined;
+      });
+
+      it('should send platform id, if available', function () {
+        bidRequestsWithMediaTypes[0].params.platform = '1cabba9e-cafe-3665-beef-f00f00f00f00';
+        bidRequestsWithMediaTypes[1].params.platform = '1cabba9e-cafe-3665-beef-f00f00f00f00';
+
+        const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+        expect(request[0].data.ext.platform).to.equal(bidRequestsWithMediaTypes[0].params.platform);
+        expect(request[1].data.ext.platform).to.equal(bidRequestsWithMediaTypes[0].params.platform);
+      });
+
+      it('should send openx adunit codes', function () {
+        const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+        expect(request[0].data.imp[0].tagid).to.equal(bidRequestsWithMediaTypes[0].params.unit);
+        expect(request[1].data.imp[0].tagid).to.equal(bidRequestsWithMediaTypes[1].params.unit);
+      });
+
+      it('should send out custom params on bids that have customParams specified', function () {
+        const bidRequest = Object.assign({},
+          bidRequestsWithMediaTypes[0],
+          {
+            params: {
+              unit: '12345678',
+              delDomain: 'test-del-domain',
+              customParams: {'Test1': 'testval1+', 'test2': ['testval2/', 'testval3']}
+            }
+          }
+        );
+
+        mockBidderRequest.bids = [bidRequest];
+        const request = spec.buildRequests([bidRequest], mockBidderRequest);
+        expect(request[0].data.imp[0].ext.customParams).to.equal(bidRequest.params.customParams);
+      })
+
+      describe('floors', function () {
+        it('should send out custom floors on bids that have customFloors, no currency as account currency is used', function () {
+          const bidRequest = Object.assign({},
+            bidRequestsWithMediaTypes[0],
+            {
+              params: {
+                unit: '12345678',
+                delDomain: 'test-del-domain',
+                customFloor: 1.500
+              }
+            }
+          );
+
+          const request = spec.buildRequests([bidRequest], mockBidderRequest);
+          expect(request[0].data.imp[0].bidfloor).to.equal(bidRequest.params.customFloor);
+          expect(request[0].data.imp[0].bidfloorcur).to.equal(undefined);
+        });
+
+        context('with floors module', function () {
+          let adServerCurrencyStub;
+
+          beforeEach(function () {
+            adServerCurrencyStub = sinon
+              .stub(config, 'getConfig')
+              .withArgs('currency.adServerCurrency')
+          });
+
+          afterEach(function () {
+            config.getConfig.restore();
+          });
+
+          it('should send out floors on bids in USD', function () {
+            const bidRequest = Object.assign({},
+              bidRequestsWithMediaTypes[0],
+              {
+                getFloor: () => {
+                  return {
+                    currency: 'USD',
+                    floor: 9.99
+                  }
+                }
+              }
+            );
+
+            const request = spec.buildRequests([bidRequest], mockBidderRequest);
+            expect(request[0].data.imp[0].bidfloor).to.equal(9.99);
+            expect(request[0].data.imp[0].bidfloorcur).to.equal('USD');
+          });
+
+          it('should send not send floors', function () {
+            adServerCurrencyStub.returns('EUR');
+            const bidRequest = Object.assign({},
+              bidRequestsWithMediaTypes[0],
+              {
+                getFloor: () => {
+                  return {
+                    currency: 'BTC',
+                    floor: 9.99
+                  }
+                }
+              }
+            );
+
+            const request = spec.buildRequests([bidRequest], mockBidderRequest);
+            expect(request[0].data.imp[0].bidfloor).to.equal(undefined)
+            expect(request[0].data.imp[0].bidfloorcur).to.equal(undefined)
+          });
+        })
+      })
+
+      describe('FPD', function() {
+        let bidRequests;
+        const mockBidderRequest = {refererInfo: {}};
+
+        beforeEach(function () {
+          bidRequests = [{
+            bidder: 'openx',
+            params: {
+              unit: '12345678-banner',
+              delDomain: 'test-del-domain'
+            },
+            adUnitCode: 'adunit-code',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250], [300, 600]]
+              }
+            },
+            bidId: 'test-bid-id',
+            bidderRequestId: 'test-bidder-request-id',
+            auctionId: 'test-auction-id',
+            transactionId: 'test-transaction-id-1'
+          }, {
+            bidder: 'openx',
+            mediaTypes: {
+              video: {
+                playerSize: [640, 480]
+              }
+            },
+            params: {
+              unit: '12345678-video',
+              delDomain: 'test-del-domain'
+            },
+            'adUnitCode': 'adunit-code',
+
+            bidId: 'test-bid-id',
+            bidderRequestId: 'test-bidder-request-id',
+            auctionId: 'test-auction-id',
+            transactionId: 'test-transaction-id-2'
+          }];
+        });
+
+        it('ortb2.site should be merged in the request', function() {
+          const request = spec.buildRequests(bidRequests, {
+            ...mockBidderRequest,
+            'ortb2': {
+              site: {
+                domain: 'page.example.com',
+                cat: ['IAB2'],
+                sectioncat: ['IAB2-2']
+              }
+            }
+          });
+          let data = request[0].data;
+          expect(data.site.domain).to.equal('page.example.com');
+          expect(data.site.cat).to.deep.equal(['IAB2']);
+          expect(data.site.sectioncat).to.deep.equal(['IAB2-2']);
+        });
+
+        it('ortb2.user should be merged in the request', function() {
+          const request = spec.buildRequests(bidRequests, {
+            ...mockBidderRequest,
+            'ortb2': {
+              user: {
+                yob: 1985
+              }
+            }
+          });
+          let data = request[0].data;
+          expect(data.user.yob).to.equal(1985);
+        });
+
+        describe('ortb2Imp', function() {
+          describe('ortb2Imp.ext.data.pbadslot', function() {
+            beforeEach(function () {
+              if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                delete bidRequests[0].ortb2Imp;
+              }
+            });
+
+            it('should not send if imp[].ext.data object is invalid', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {}
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              expect(data.imp[0].ext).to.not.have.property('data');
+            });
+
+            it('should not send if imp[].ext.data.pbadslot is undefined', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              if (data.imp[0].ext.data) {
+                expect(data.imp[0].ext.data).to.not.have.property('pbadslot');
+              } else {
+                expect(data.imp[0].ext).to.not.have.property('data');
+              }
+            });
+
+            it('should send if imp[].ext.data.pbadslot is string', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                    pbadslot: 'abcd'
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              expect(data.imp[0].ext.data).to.have.property('pbadslot');
+              expect(data.imp[0].ext.data.pbadslot).to.equal('abcd');
+            });
+          });
+
+          describe('ortb2Imp.ext.data.adserver', function() {
+            beforeEach(function () {
+              if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                delete bidRequests[0].ortb2Imp;
+              }
+            });
+
+            it('should not send if imp[].ext.data object is invalid', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {}
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              expect(data.imp[0].ext).to.not.have.property('data');
+            });
+
+            it('should not send if imp[].ext.data.adserver is undefined', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              if (data.imp[0].ext.data) {
+                expect(data.imp[0].ext.data).to.not.have.property('adserver');
+              } else {
+                expect(data.imp[0].ext).to.not.have.property('data');
+              }
+            });
+
+            it('should send', function() {
+              let adSlotValue = 'abc';
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                    adserver: {
+                      name: 'GAM',
+                      adslot: adSlotValue
+                    }
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              expect(data.imp[0].ext.data.adserver.name).to.equal('GAM');
+              expect(data.imp[0].ext.data.adserver.adslot).to.equal(adSlotValue);
+            });
+          });
+
+          describe('ortb2Imp.ext.data.other', function() {
+            beforeEach(function () {
+              if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                delete bidRequests[0].ortb2Imp;
+              }
+            });
+
+            it('should not send if imp[].ext.data object is invalid', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {}
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              expect(data.imp[0].ext).to.not.have.property('data');
+            });
+
+            it('should not send if imp[].ext.data.other is undefined', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              if (data.imp[0].ext.data) {
+                expect(data.imp[0].ext.data).to.not.have.property('other');
+              } else {
+                expect(data.imp[0].ext).to.not.have.property('data');
+              }
+            });
+
+            it('ortb2Imp.ext.data.other', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                    other: 1234
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, mockBidderRequest);
+              let data = request[0].data;
+              expect(data.imp[0].ext.data.other).to.equal(1234);
+            });
+          });
+        });
+      });
+
+      context('when there is a consent management framework', function () {
+        let bidRequests;
+        let mockConfig;
+        let bidderRequest;
+
+        beforeEach(function () {
+          bidRequests = [{
+            bidder: 'openx',
+            params: {
+              unit: '12345678-banner',
+              delDomain: 'test-del-domain'
+            },
+            adUnitCode: 'adunit-code',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250], [300, 600]]
+              }
+            },
+            bidId: 'test-bid-id',
+            bidderRequestId: 'test-bidder-request-id',
+            auctionId: 'test-auction-id',
+            transactionId: 'test-transaction-id-1'
+          }, {
+            bidder: 'openx',
+            mediaTypes: {
+              video: {
+                playerSize: [640, 480]
+              }
+            },
+            params: {
+              unit: '12345678-video',
+              delDomain: 'test-del-domain'
+            },
+            'adUnitCode': 'adunit-code',
+
+            bidId: 'test-bid-id',
+            bidderRequestId: 'test-bidder-request-id',
+            auctionId: 'test-auction-id',
+            transactionId: 'test-transaction-id-2'
+          }];
+        });
+
+        describe('us_privacy', function () {
+          beforeEach(function () {
+            bidderRequest = {
+              uspConsent: '1YYN',
+              refererInfo: {}
+            };
+
+            sinon.stub(config, 'getConfig').callsFake((key) => {
+              return utils.deepAccess(mockConfig, key);
+            });
+          });
+
+          afterEach(function () {
+            config.getConfig.restore();
+          });
+
+          it('should send a signal to specify that US Privacy applies to this request', function () {
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+            expect(request[0].data.regs.ext.us_privacy).to.equal('1YYN');
+            expect(request[1].data.regs.ext.us_privacy).to.equal('1YYN');
+          });
+
+          it('should not send the regs object, when consent string is undefined', function () {
+            delete bidderRequest.uspConsent;
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+            expect(request[0].data.regs?.us_privacy).to.not.exist;
+          });
+        });
+
+        describe('GDPR', function () {
+          beforeEach(function () {
+            bidderRequest = {
+              gdprConsent: {
+                consentString: 'test-gdpr-consent-string',
+                addtlConsent: 'test-addtl-consent-string',
+                gdprApplies: true
+              },
+              refererInfo: {}
+            };
+
+            mockConfig = {
+              consentManagement: {
+                cmpApi: 'iab',
+                timeout: 1111,
+                allowAuctionWithoutConsent: 'cancel'
+              }
+            };
+
+            sinon.stub(config, 'getConfig').callsFake((key) => {
+              return utils.deepAccess(mockConfig, key);
+            });
+          });
+
+          afterEach(function () {
+            config.getConfig.restore();
+          });
+
+          it('should send a signal to specify that GDPR applies to this request', function () {
+            bidderRequest.bids = bidRequests;
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+            expect(request[0].data.regs.ext.gdpr).to.equal(1);
+            expect(request[1].data.regs.ext.gdpr).to.equal(1);
+          });
+
+          it('should send the consent string', function () {
+            bidderRequest.bids = bidRequests;
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+            expect(request[0].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
+            expect(request[1].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
+          });
+
+          it('should send the addtlConsent string', function () {
+            bidderRequest.bids = bidRequests;
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+            expect(request[0].data.user.ext.ConsentedProvidersSettings.consented_providers).to.equal(bidderRequest.gdprConsent.addtlConsent);
+            expect(request[1].data.user.ext.ConsentedProvidersSettings.consented_providers).to.equal(bidderRequest.gdprConsent.addtlConsent);
+          });
+
+          it('should send a signal to specify that GDPR does not apply to this request', function () {
+            bidderRequest.gdprConsent.gdprApplies = false;
+            bidderRequest.bids = bidRequests;
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+            expect(request[0].data.regs.ext.gdpr).to.equal(0);
+            expect(request[1].data.regs.ext.gdpr).to.equal(0);
+          });
+
+          it('when GDPR application is undefined, should not send a signal to specify whether GDPR applies to this request, ' +
+            'but can send consent data, ', function () {
+            delete bidderRequest.gdprConsent.gdprApplies;
+            bidderRequest.bids = bidRequests;
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+            expect(request[0].data.regs?.ext?.gdpr).to.not.be.ok;
+            expect(request[0].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
+            expect(request[1].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
+          });
+
+          it('when consent string is undefined, should not send the consent string, ', function () {
+            delete bidderRequest.gdprConsent.consentString;
+            bidderRequest.bids = bidRequests;
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
+            expect(request[0].data.imp[0].ext.consent).to.equal(undefined);
+            expect(request[1].data.imp[0].ext.consent).to.equal(undefined);
+          });
+        });
+      });
+
+      context('coppa', function() {
+        it('when there are no coppa param settings, should not send a coppa flag', function () {
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
+          expect(request[0].data.regs?.coppa).to.be.not.ok;
+        });
+
+        it('should send a coppa flag there is when there is coppa param settings in the bid requests', function () {
+          let mockConfig = {
+            coppa: true
+          };
+
+          sinon.stub(config, 'getConfig').callsFake((key) => {
+            return utils.deepAccess(mockConfig, key);
+          });
+
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
+          expect(request[0].data.regs.coppa).to.equal(1);
+        });
+
+        after(function () {
+          config.getConfig.restore()
+        });
+      });
+
+      context('do not track (DNT)', function() {
+        let doNotTrackStub;
+
+        beforeEach(function () {
+          doNotTrackStub = sinon.stub(utils, 'getDNT');
+        });
+        afterEach(function() {
+          doNotTrackStub.restore();
+        });
+
+        it('when there is a do not track, should send a dnt', function () {
+          doNotTrackStub.returns(1);
+
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
+          expect(request[0].data.device.dnt).to.equal(1);
+        });
+
+        it('when there is not do not track, don\'t send dnt', function () {
+          doNotTrackStub.returns(0);
+
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
+          expect(request[0].data.device.dnt).to.equal(0);
+        });
+
+        it('when there is no defined do not track, don\'t send dnt', function () {
+          doNotTrackStub.returns(null);
+
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
+          expect(request[0].data.device.dnt).to.equal(0);
+        });
+      });
+
+      context('supply chain (schain)', function () {
+        let bidRequests;
+        let schainConfig;
+        const supplyChainNodePropertyOrder = ['asi', 'sid', 'hp', 'rid', 'name', 'domain'];
+
+        beforeEach(function () {
+          schainConfig = {
+            ver: '1.0',
+            complete: 1,
+            nodes: [
+              {
+                asi: 'exchange1.com',
+                sid: '1234',
+                hp: 1,
+                rid: 'bid-request-1',
+                name: 'publisher',
+                domain: 'publisher.com'
+                // omitted ext
+              },
+              {
+                asi: 'exchange2.com',
+                sid: 'abcd',
+                hp: 1,
+                rid: 'bid-request-2',
+                // name field missing
+                domain: 'intermediary.com'
+              },
+              {
+                asi: 'exchange3.com',
+                sid: '4321',
+                hp: 1,
+                // request id
+                // name field missing
+                domain: 'intermediary-2.com'
+              }
+            ]
+          };
+
+          bidRequests = [{
+            bidder: 'openx',
+            params: {
+              unit: '11',
+              delDomain: 'test-del-domain'
+            },
+            adUnitCode: '/adunit-code/test-path',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250], [300, 600]]
+              }
+            },
+            bidId: 'test-bid-id-1',
+            bidderRequestId: 'test-bid-request-1',
+            auctionId: 'test-auction-1',
+            schain: schainConfig
+          }];
+        });
+
+        it('should send a supply chain object', function () {
+          const request = spec.buildRequests(bidRequests, mockBidderRequest);
+          expect(request[0].data.source.ext.schain).to.equal(schainConfig);
+        });
+
+        it('should send the supply chain object with the right version', function () {
+          const request = spec.buildRequests(bidRequests, mockBidderRequest);
+          expect(request[0].data.source.ext.schain.ver).to.equal(schainConfig.ver);
+        });
+
+        it('should send the supply chain object with the right complete value', function () {
+          const request = spec.buildRequests(bidRequests, mockBidderRequest);
+          expect(request[0].data.source.ext.schain.complete).to.equal(schainConfig.complete);
+        });
+      });
+
+      context('when there are userid providers', function () {
+        const userIdAsEids = [
+          {
+            source: 'adserver.org',
+            uids: [{
+              id: 'some-random-id-value',
+              atype: 1,
+              ext: {
+                rtiPartner: 'TDID'
+              }
+            }]
+          },
+          {
+            source: 'id5-sync.com',
+            uids: [{
+              id: 'some-random-id-value',
+              atype: 1
+            }]
+          },
+          {
+            source: 'sharedid.org',
+            uids: [{
+              id: 'some-random-id-value',
+              atype: 1,
+              ext: {
+                third: 'some-random-id-value'
+              }
+            }]
+          }
+        ];
+
+        it(`should send the user id under the extended ids`, function () {
+          const bidRequestsWithUserId = [{
+            bidder: 'openx',
+            params: {
+              unit: '11',
+              delDomain: 'test-del-domain'
+            },
+            userId: {
+            },
+            adUnitCode: 'adunit-code',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 250], [300, 600]]
+              }
+            },
+            bidId: 'test-bid-id-1',
+            bidderRequestId: 'test-bid-request-1',
+            auctionId: 'test-auction-1',
+            userIdAsEids: userIdAsEids
+          }];
+          // enrich bid request with userId key/value
+
+          const request = spec.buildRequests(bidRequestsWithUserId, mockBidderRequest);
+          expect(request[0].data.user.ext.eids).to.equal(userIdAsEids);
+        });
+
+        it(`when no user ids are available, it should not send any extended ids`, function () {
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          expect(request[0].data).to.not.have.any.keys('user');
+        });
+      });
+
+      context('FLEDGE', function() {
+        it('when FLEDGE is disabled, should not send imp.ext.ae', function () {
+          const request = spec.buildRequests(
+            bidRequestsWithMediaTypes,
+            {
+              ...mockBidderRequest,
+              fledgeEnabled: false
+            }
+          );
+          expect(request[0].data.imp[0].ext).to.not.have.property('ae');
+        });
+
+        it('when FLEDGE is enabled, should send whatever is set in ortb2imp.ext.ae in all bid requests', function () {
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, {
+            ...mockBidderRequest,
+            fledgeEnabled: true
+          });
+          expect(request[0].data.imp[0].ext.ae).to.equal(2);
+        });
+      });
+    });
+
+    context('banner', function () {
+      it('should send bid request with a mediaTypes specified with banner type', function () {
+        const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+        expect(request[0].data.imp[0]).to.have.any.keys(BANNER);
+      });
+    });
+
+    context('video', function () {
+      it('should send bid request with a mediaTypes specified with video type', function () {
+        const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+        expect(request[1].data.imp[0]).to.have.any.keys(VIDEO);
+      });
+    });
+
+    it.skip('should send ad unit ids when any are defined', function () {
+      const bidRequestsWithUnitIds = [{
+        bidder: 'openx',
+        params: {
+          delDomain: 'test-del-domain'
+        },
+        adUnitCode: 'adunit-code',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        bidId: 'test-bid-id-1',
+        bidderRequestId: 'test-bid-request-1',
+        auctionId: 'test-auction-1',
+        transactionId: 'test-transaction-id-1'
+      }, {
+        bidder: 'openx',
+        params: {
+          unit: '22',
+          delDomain: 'test-del-domain'
+        },
+        adUnitCode: 'adunit-code',
+        mediaTypes: {
+          banner: {
+            sizes: [[728, 90]]
+          }
+        },
+        bidId: 'test-bid-id-2',
+        bidderRequestId: 'test-bid-request-2',
+        auctionId: 'test-auction-2',
+        transactionId: 'test-transaction-id-2'
+      }];
+      mockBidderRequest.bids = bidRequestsWithUnitIds;
+      const request = spec.buildRequests(bidRequestsWithUnitIds, mockBidderRequest);
+      expect(request[0].data.imp[1].tagid).to.equal(bidRequestsWithUnitIds[1].params.unit);
+      expect(request[0].data.imp[1].ext.divid).to.equal(bidRequestsWithUnitIds[1].params.adUnitCode);
+    });
+  });
+
+  describe('interpretResponse()', function () {
+    let bidRequestConfigs;
+    let bidRequest;
+    let bidResponse;
+    let bid;
+
+    context('when there is an nbr response', function () {
+      let bids;
+      beforeEach(function () {
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = {nbr: 0}; // Unknown error
+        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      it('should not return any bids', function () {
+        expect(bids.length).to.equal(0);
+      });
+    });
+
+    context('when no seatbid in response', function () {
+      let bids;
+      beforeEach(function () {
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = {ext: {}, id: 'test-bid-id'};
+        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      it('should not return any bids', function () {
+        expect(bids.length).to.equal(0);
+      });
+    });
+
+    context('when there is no response', function () {
+      let bids;
+      beforeEach(function () {
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = ''; // Unknown error
+        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      it('should not return any bids', function () {
+        expect(bids.length).to.equal(0);
+      });
+    });
+
+    const SAMPLE_BID_REQUESTS = [{
+      bidder: 'openx',
+      params: {
+        unit: '12345678',
+        delDomain: 'test-del-domain'
+      },
+      adUnitCode: 'adunit-code',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]],
+        },
+      },
+      bidId: 'test-bid-id',
+      bidderRequestId: 'test-bidder-request-id',
+      auctionId: 'test-auction-id'
+    }];
+
+    const SAMPLE_BID_RESPONSE = {
+      seatbid: [{
+        bid: [{
+          impid: 'test-bid-id',
+          price: 2,
+          w: 300,
+          h: 250,
+          crid: 'test-creative-id',
+          dealid: 'test-deal-id',
+          adm: 'test-ad-markup',
+          adomain: ['brand.com'],
+          ext: {
+            dsp_id: '123',
+            buyer_id: '456',
+            brand_id: '789',
+            paf: {
+              content_id: 'paf_content_id'
+            }
+          }
+        }]
+      }],
+      cur: 'AUS',
+      ext: {
+        paf: {
+          transmission: {version: '12'}
+        }
+      }
+    };
+
+    context('when there is a response, the common response properties', function () {
+      beforeEach(function () {
+        bidRequestConfigs = deepClone(SAMPLE_BID_REQUESTS);
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+        bidResponse = deepClone(SAMPLE_BID_RESPONSE);
+
+        bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
+      });
+
+      it('should return a price', function () {
+        expect(bid.cpm).to.equal(bidResponse.seatbid[0].bid[0].price);
+      });
+
+      it('should return a request id', function () {
+        expect(bid.requestId).to.equal(bidResponse.seatbid[0].bid[0].impid);
+      });
+
+      it('should return width and height for the creative', function () {
+        expect(bid.width).to.equal(bidResponse.seatbid[0].bid[0].w);
+        expect(bid.height).to.equal(bidResponse.seatbid[0].bid[0].h);
+      });
+
+      it('should return a creativeId', function () {
+        expect(bid.creativeId).to.equal(bidResponse.seatbid[0].bid[0].crid);
+      });
+
+      it('should return an ad', function () {
+        expect(bid.ad).to.equal(bidResponse.seatbid[0].bid[0].adm);
+      });
+
+      it('should return a deal id if it exists', function () {
+        expect(bid.dealId).to.equal(bidResponse.seatbid[0].bid[0].dealid);
+      });
+
+      it('should have a time-to-live of 5 minutes', function () {
+        expect(bid.ttl).to.equal(300);
+      });
+
+      it('should always return net revenue', function () {
+        expect(bid.netRevenue).to.equal(true);
+      });
+
+      it('should return a currency', function () {
+        expect(bid.currency).to.equal(bidResponse.cur);
+      });
+
+      it('should return a brand ID', function () {
+        expect(bid.meta.brandId).to.equal(bidResponse.seatbid[0].bid[0].ext.brand_id);
+      });
+
+      it('should return a dsp ID', function () {
+        expect(bid.meta.networkId).to.equal(bidResponse.seatbid[0].bid[0].ext.dsp_id);
+      });
+
+      it('should return a buyer ID', function () {
+        expect(bid.meta.advertiserId).to.equal(bidResponse.seatbid[0].bid[0].ext.buyer_id);
+      });
+
+      it('should return adomain', function () {
+        expect(bid.meta.advertiserDomains).to.equal(bidResponse.seatbid[0].bid[0].adomain);
+      });
+
+      it('should return paf fields', function () {
+        const paf = {
+          transmission: {version: '12'},
+          content_id: 'paf_content_id'
+        }
+        expect(bid.meta.paf).to.deep.equal(paf);
+      });
+    });
+
+    context('when there is more than one response', () => {
+      let bids;
+      beforeEach(function () {
+        bidRequestConfigs = deepClone(SAMPLE_BID_REQUESTS);
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+        bidResponse = deepClone(SAMPLE_BID_RESPONSE);
+        bidResponse.seatbid[0].bid.push(deepClone(bidResponse.seatbid[0].bid[0]));
+        bidResponse.seatbid[0].bid[1].ext.paf.content_id = 'second_paf'
+
+        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      it('should not confuse paf content_id', () => {
+        expect(bids.map(b => b.meta.paf.content_id)).to.eql(['paf_content_id', 'second_paf']);
+      });
+    })
+
+    context('when the response is a banner', function() {
+      beforeEach(function () {
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = {
+          seatbid: [{
+            bid: [{
+              impid: 'test-bid-id',
+              price: 2,
+              w: 300,
+              h: 250,
+              crid: 'test-creative-id',
+              dealid: 'test-deal-id',
+              adm: 'test-ad-markup'
+            }]
+          }],
+          cur: 'AUS'
+        };
+
+        bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
+      });
+
+      it('should return the proper mediaType', function () {
+        it('should return a creativeId', function () {
+          expect(bid.mediaType).to.equal(Object.keys(bidRequestConfigs[0].mediaTypes)[0]);
+        });
+      });
+    });
+
+    context('when the response is a video', function() {
+      beforeEach(function () {
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            video: {
+              playerSize: [[640, 360], [854, 480]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = {
+          seatbid: [{
+            bid: [{
+              impid: 'test-bid-id',
+              price: 2,
+              w: 854,
+              h: 480,
+              crid: 'test-creative-id',
+              dealid: 'test-deal-id',
+              adm: 'test-ad-markup',
+            }]
+          }],
+          cur: 'AUS'
+        };
+      });
+
+      it('should return the proper mediaType', function () {
+        bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
+        expect(bid.mediaType).to.equal(Object.keys(bidRequestConfigs[0].mediaTypes)[0]);
+      });
+
+      it('should return the proper mediaType', function () {
+        const winUrl = 'https//my.win.url';
+        bidResponse.seatbid[0].bid[0].nurl = winUrl
+        bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
+
+        expect(bid.vastUrl).to.equal(winUrl);
+      });
+    });
+
+    context('when the response contains FLEDGE interest groups config', function() {
+      let response;
+
+      beforeEach(function () {
+        sinon.stub(config, 'getConfig')
+          .withArgs('fledgeEnabled')
+          .returns(true);
+
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = {
+          seatbid: [{
+            bid: [{
+              impid: 'test-bid-id',
+              price: 2,
+              w: 300,
+              h: 250,
+              crid: 'test-creative-id',
+              dealid: 'test-deal-id',
+              adm: 'test-ad-markup'
+            }]
+          }],
+          cur: 'AUS',
+          ext: {
+            fledge_auction_configs: {
+              'test-bid-id': {
+                seller: 'codinginadtech.com',
+                interestGroupBuyers: ['somedomain.com'],
+                sellerTimeout: 0,
+                perBuyerSignals: {
+                  'somedomain.com': {
+                    base_bid_micros: 0.1,
+                    disallowed_advertiser_ids: [
+                      '1234',
+                      '2345'
+                    ],
+                    multiplier: 1.3,
+                    use_bid_multiplier: true,
+                    win_reporting_id: '1234567asdf'
+                  }
+                }
+              }
+            }
+          }
+        };
+
+        response = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      afterEach(function () {
+        config.getConfig.restore();
+      });
+
+      it('should return FLEDGE auction_configs alongside bids', function () {
+        expect(response).to.have.property('bids');
+        expect(response).to.have.property('fledgeAuctionConfigs');
+        expect(response.fledgeAuctionConfigs.length).to.equal(1);
+        expect(response.fledgeAuctionConfigs[0].bidId).to.equal('test-bid-id');
+      });
+    });
+  });
+
+  describe('user sync', function () {
+    it('should register the default image pixel if no pixels available', function () {
+      let syncs = spec.getUserSyncs(
+        {pixelEnabled: true},
+        []
+      );
+      expect(syncs).to.deep.equal([{type: 'image', url: DEFAULT_SYNC}]);
+    });
+
+    it('should register custom syncUrl when exists', function () {
+      let syncs = spec.getUserSyncs(
+        {pixelEnabled: true},
+        [{body: {ext: {delDomain: 'www.url.com'}}}]
+      );
+      expect(syncs).to.deep.equal([{type: 'image', url: 'https://www.url.com/w/1.0/pd'}]);
+    });
+
+    it('should register custom syncUrl when exists', function () {
+      let syncs = spec.getUserSyncs(
+        {pixelEnabled: true},
+        [{body: {ext: {platform: 'abc'}}}]
+      );
+      expect(syncs).to.deep.equal([{type: 'image', url: SYNC_URL + '?ph=abc'}]);
+    });
+
+    it('when iframe sync is allowed, it should register an iframe sync', function () {
+      let syncs = spec.getUserSyncs(
+        {iframeEnabled: true},
+        []
+      );
+      expect(syncs).to.deep.equal([{type: 'iframe', url: DEFAULT_SYNC}]);
+    });
+
+    it('should prioritize iframe over image for user sync', function () {
+      let syncs = spec.getUserSyncs(
+        {iframeEnabled: true, pixelEnabled: true},
+        []
+      );
+      expect(syncs).to.deep.equal([{type: 'iframe', url: DEFAULT_SYNC}]);
+    });
+
+    describe('when gdpr applies', function () {
+      let gdprConsent;
+      let gdprPixelUrl;
+      const consentString = 'gdpr-pixel-consent';
+      const gdprApplies = '1';
+      beforeEach(() => {
+        gdprConsent = {
+          consentString,
+          gdprApplies: true
+        };
+
+        gdprPixelUrl = `${SYNC_URL}&gdpr=${gdprApplies}&gdpr_consent=${consentString}`;
+      });
+
+      it('when there is a response, it should have the gdpr query params', () => {
+        let [{url}] = spec.getUserSyncs(
+          {iframeEnabled: true, pixelEnabled: true},
+          [],
+          gdprConsent
+        );
+
+        expect(url).to.have.string(`gdpr_consent=${consentString}`);
+        expect(url).to.have.string(`gdpr=${gdprApplies}`);
+      });
+
+      it('should not send signals if no consent object is available', function () {
+        let [{url}] = spec.getUserSyncs(
+          {iframeEnabled: true, pixelEnabled: true},
+          [],
+        );
+        expect(url).to.not.have.string('gdpr_consent=');
+        expect(url).to.not.have.string('gdpr=');
+      });
+    });
+
+    describe('when ccpa applies', function () {
+      let usPrivacyConsent;
+      let uspPixelUrl;
+      const privacyString = 'TEST';
+      beforeEach(() => {
+        usPrivacyConsent = 'TEST';
+        uspPixelUrl = `${DEFAULT_SYNC}&us_privacy=${privacyString}`
+      });
+      it('should send the us privacy string, ', () => {
+        let [{url}] = spec.getUserSyncs(
+          {iframeEnabled: true, pixelEnabled: true},
+          [],
+          undefined,
+          usPrivacyConsent
+        );
+        expect(url).to.have.string(`us_privacy=${privacyString}`);
+      });
+
+      it('should not send signals if no consent string is available', function () {
+        let [{url}] = spec.getUserSyncs(
+          {iframeEnabled: true, pixelEnabled: true},
+          [],
+        );
+        expect(url).to.not.have.string('us_privacy=');
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/operaadsBidAdapter_spec.js b/test/spec/modules/operaadsBidAdapter_spec.js
new file mode 100644
index 00000000000..45bc8995a5c
--- /dev/null
+++ b/test/spec/modules/operaadsBidAdapter_spec.js
@@ -0,0 +1,737 @@
+import { expect } from 'chai';
+import { spec } from 'modules/operaadsBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from 'src/mediaTypes.js';
+
+describe('Opera Ads Bid Adapter', function () {
+  describe('Test isBidRequestValid', function () {
+    it('undefined bid should return false', function () {
+      expect(spec.isBidRequestValid()).to.be.false;
+    });
+
+    it('null bid should return false', function () {
+      expect(spec.isBidRequestValid(null)).to.be.false;
+    });
+
+    it('bid.params should be set', function () {
+      expect(spec.isBidRequestValid({})).to.be.false;
+    });
+
+    it('bid.params.placementId should be set', function () {
+      expect(spec.isBidRequestValid({
+        params: { endpointId: 'ep12345678', publisherId: 'pub12345678' }
+      })).to.be.false;
+    });
+
+    it('bid.params.publisherId should be set', function () {
+      expect(spec.isBidRequestValid({
+        params: { placementId: 's12345678', endpointId: 'ep12345678' }
+      })).to.be.false;
+    });
+
+    it('bid.params.endpointId should be set', function () {
+      expect(spec.isBidRequestValid({
+        params: { placementId: 's12345678', publisherId: 'pub12345678' }
+      })).to.be.false;
+    });
+
+    it('valid bid should return true', function () {
+      expect(spec.isBidRequestValid({
+        params: { placementId: 's12345678', endpointId: 'ep12345678', publisherId: 'pub12345678' }
+      })).to.be.true;
+    });
+  });
+
+  describe('Test buildRequests', function () {
+    const bidderRequest = {
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      auctionStart: Date.now(),
+      bidderCode: 'myBidderCode',
+      bidderRequestId: '15246a574e859f',
+      refererInfo: {
+        page: 'http://example.com',
+        stack: ['http://example.com']
+      },
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'IwuyYwpjmnsauyYasIUWwe'
+      },
+      uspConsent: 'Oush3@jmUw82has',
+      timeout: 3000
+    };
+
+    it('build request object', function () {
+      const bidRequests = [
+        {
+          adUnitCode: 'test-div',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f461',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            banner: { sizes: [[300, 250]] }
+          },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub12345678',
+            endpointId: 'ep12345678'
+          }
+        },
+        {
+          adUnitCode: 'test-native',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f4622',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            native: {
+              title: {
+                required: true,
+                len: 20,
+              },
+              image: {
+                required: true,
+                sizes: [300, 250],
+                aspect_ratios: [{
+                  ratio_width: 1,
+                  ratio_height: 1
+                }]
+              },
+              icon: {
+                required: true,
+                sizes: [60, 60],
+                aspect_ratios: [{
+                  ratio_width: 1,
+                  ratio_height: 1
+                }]
+              },
+              sponsoredBy: {
+                required: true,
+                len: 20
+              },
+              body: {
+                required: true,
+                len: 140
+              },
+              cta: {
+                required: true,
+                len: 20,
+              }
+            }
+          },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub12345678',
+            endpointId: 'ep12345678'
+          }
+        },
+        {
+          adUnitCode: 'test-native2',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f4632',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            native: {
+              title: {},
+              image: {},
+              icon: {},
+              sponsoredBy: {},
+              body: {},
+              cta: {}
+            }
+          },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub12345678',
+            endpointId: 'ep12345678'
+          }
+        },
+        {
+          adUnitCode: 'test-native3',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f4633',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            native: {},
+          },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub12345678',
+            endpointId: 'ep12345678'
+          }
+        },
+        {
+          adUnitCode: 'test-video',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f4623',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [[640, 480]],
+              mimes: ['video/mp4'],
+              protocols: [2, 3, 5, 6],
+              startdelay: 0,
+              skip: 1,
+              playbackmethod: [1, 2, 3, 4],
+              delivery: [1],
+              api: [1, 2, 5],
+            }
+          },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub12345678',
+            endpointId: 'ep12345678'
+          }
+        },
+        {
+          adUnitCode: 'test-video',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f4643',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: {
+            video: {}
+          },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub12345678',
+            endpointId: 'ep12345678'
+          }
+        }
+      ];
+
+      let reqs;
+
+      expect(function () {
+        reqs = spec.buildRequests(bidRequests, bidderRequest);
+      }).to.not.throw();
+
+      expect(reqs).to.be.an('array').that.have.lengthOf(bidRequests.length);
+
+      for (let i = 0, len = reqs.length; i < len; i++) {
+        const req = reqs[i];
+        const bidRequest = bidRequests[i];
+
+        expect(req.method).to.equal('POST');
+        expect(req.url).to.equal('https://s.adx.opera.com/ortb/v2/' +
+          bidRequest.params.publisherId + '?ep=' + bidRequest.params.endpointId);
+
+        expect(req.options).to.be.an('object');
+        expect(req.options.contentType).to.contain('application/json');
+        expect(req.options.customHeaders).to.be.an('object');
+        expect(req.options.customHeaders['x-openrtb-version']).to.equal(2.5);
+
+        expect(req.originalBidRequest).to.equal(bidRequest);
+
+        expect(req.data).to.be.a('string');
+
+        let requestData;
+        expect(function () {
+          requestData = JSON.parse(req.data);
+        }).to.not.throw();
+
+        expect(requestData.id).to.equal(bidderRequest.auctionId);
+        expect(requestData.tmax).to.equal(bidderRequest.timeout);
+        expect(requestData.test).to.equal(0);
+        expect(requestData.imp).to.be.an('array').that.have.lengthOf(1);
+        expect(requestData.device).to.be.an('object');
+        expect(requestData.site).to.be.an('object');
+        expect(requestData.site.id).to.equal(bidRequest.params.publisherId);
+        expect(requestData.site.domain).to.not.be.empty;
+        expect(requestData.site.page).to.equal(bidderRequest.refererInfo.page);
+        expect(requestData.at).to.equal(1);
+        expect(requestData.bcat).to.be.an('array').that.is.empty;
+        expect(requestData.cur).to.be.an('array').that.not.be.empty;
+        expect(requestData.user).to.be.an('object');
+
+        let impItem = requestData.imp[0];
+        expect(impItem).to.be.an('object');
+        expect(impItem.id).to.equal(bidRequest.bidId);
+        expect(impItem.tagid).to.equal(bidRequest.params.placementId);
+        expect(impItem.bidfloor).to.be.a('number');
+
+        if (bidRequest.mediaTypes.banner) {
+          expect(impItem.banner).to.be.an('object');
+        } else if (bidRequest.mediaTypes.native) {
+          expect(impItem.native).to.be.an('object');
+        } else if (bidRequest.mediaTypes.video) {
+          expect(impItem.video).to.be.an('object');
+        } else {
+          expect.fail('should not happen');
+        }
+      }
+    });
+
+    it('test getBidFloor', function() {
+      const bidRequests = [
+        {
+          adUnitCode: 'test-div',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f461',
+          mediaTypes: { banner: { sizes: [[300, 250]] } },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub12345678',
+            endpointId: 'ep12345678'
+          },
+          getFloor: function() {
+            return {
+              currency: 'USD',
+              floor: 0.1
+            }
+          }
+        }
+      ];
+
+      const reqs = spec.buildRequests(bidRequests, bidderRequest);
+
+      expect(reqs).to.be.an('array').that.have.lengthOf(1);
+
+      for (const req of reqs) {
+        let requestData;
+        expect(function () {
+          requestData = JSON.parse(req.data);
+        }).to.not.throw();
+
+        expect(requestData.imp).to.be.an('array').that.have.lengthOf(1);
+        expect(requestData.imp[0].bidfloor).to.be.equal(0.1);
+        expect(requestData.imp[0].bidfloorcur).to.be.equal('USD');
+      }
+    });
+
+    it('bcat in params should be used', function () {
+      const bidRequests = [
+        {
+          adUnitCode: 'test-div',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f461',
+          mediaTypes: { banner: { sizes: [[300, 250]] } },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub12345678',
+            endpointId: 'ep12345678',
+            bcat: ['IAB1-1']
+          }
+        }
+      ];
+
+      const reqs = spec.buildRequests(bidRequests, bidderRequest);
+
+      expect(reqs).to.be.an('array').that.have.lengthOf(1);
+
+      for (const req of reqs) {
+        let requestData;
+        expect(function () {
+          requestData = JSON.parse(req.data);
+        }).to.not.throw();
+
+        expect(requestData.bcat).to.be.an('array').that.includes('IAB1-1');
+      }
+    });
+
+    it('sharedid should be used', function () {
+      const bidRequests = [{
+        adUnitCode: 'test-div',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidId: '22c4871113f461',
+        bidder: 'operaads',
+        bidderRequestId: '15246a574e859f',
+        mediaTypes: {
+          banner: { sizes: [[300, 250]] }
+        },
+        params: {
+          placementId: 's12345678',
+          publisherId: 'pub12345678',
+          endpointId: 'ep12345678'
+        },
+        userId: {
+          sharedid: {
+            id: '01F5DEQW731Q2VKT031KBKMW5W'
+          }
+        },
+        userIdAsEids: [{
+          source: 'pubcid.org',
+          uids: [{
+            atype: 1,
+            id: '01F5DEQW731Q2VKT031KBKMW5W'
+          }]
+        }]
+      }];
+
+      const reqs = spec.buildRequests(bidRequests, bidderRequest);
+
+      let requestData;
+      expect(function () {
+        requestData = JSON.parse(reqs[0].data);
+      }).to.not.throw();
+
+      expect(requestData.user.buyeruid).to.equal(bidRequests[0].userId.sharedid.id);
+    });
+
+    it('pubcid should be used when sharedid is empty', function () {
+      const bidRequests = [{
+        adUnitCode: 'test-div',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidId: '22c4871113f461',
+        bidder: 'operaads',
+        bidderRequestId: '15246a574e859f',
+        mediaTypes: {
+          banner: { sizes: [[300, 250]] }
+        },
+        params: {
+          placementId: 's12345678',
+          publisherId: 'pub12345678',
+          endpointId: 'ep12345678'
+        },
+        userId: {
+          'pubcid': '21F5DEQW731Q2VKT031KBKMW5W'
+        },
+        userIdAsEids: [{
+          source: 'pubcid.org',
+          uids: [{
+            atype: 1,
+            id: '21F5DEQW731Q2VKT031KBKMW5W'
+          }]
+        }]
+      }];
+
+      const reqs = spec.buildRequests(bidRequests, bidderRequest);
+
+      let requestData;
+      expect(function () {
+        requestData = JSON.parse(reqs[0].data);
+      }).to.not.throw();
+
+      expect(requestData.user.buyeruid).to.equal(bidRequests[0].userId.pubcid);
+    });
+
+    it('random uid will be generate when userId is empty', function () {
+      const bidRequests = [{
+        adUnitCode: 'test-div',
+        auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+        bidId: '22c4871113f461',
+        bidder: 'operaads',
+        bidderRequestId: '15246a574e859f',
+        mediaTypes: {
+          banner: { sizes: [[300, 250]] }
+        },
+        params: {
+          placementId: 's12345678',
+          publisherId: 'pub12345678',
+          endpointId: 'ep12345678'
+        }
+      }];
+
+      const reqs = spec.buildRequests(bidRequests, bidderRequest);
+
+      let requestData;
+      expect(function () {
+        requestData = JSON.parse(reqs[0].data);
+      }).to.not.throw();
+
+      expect(requestData.user.buyeruid).to.not.be.empty;
+    })
+  });
+
+  describe('Test adapter request', function () {
+    const adapter = newBidder(spec);
+
+    it('adapter.callBids exists and is a function', function () {
+      expect(adapter.callBids).to.be.a('function');
+    });
+  });
+
+  describe('Test response interpretResponse', function () {
+    it('Test banner interpretResponse', function () {
+      const serverResponse = {
+        body: {
+          'id': 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '003004d9c05c6bc7fec0',
+                  'impid': '22c4871113f461',
+                  'price': 1.04,
+                  'nurl': 'https://s.adx.opera.com/win',
+                  'lurl': 'https://s.adx.opera.com/loss',
+                  'adm': '<img src="https://res.adx.opera.com/xxx.jpeg" width="300" height="250" />',
+                  'adomain': [
+                    'opera.com',
+                  ],
+                  'cid': '0.49379027',
+                  'crid': '0.49379027',
+                  'cat': [
+                    'IAB9-31',
+                    'IAB8'
+                  ],
+                  'language': 'EN',
+                  'h': 300,
+                  'w': 250,
+                  'exp': 500,
+                  'ext': {}
+                }
+              ],
+              'seat': 'adv4199760017536'
+            }
+          ],
+          'bidid': '003004d9c05c6bc7fec0',
+          'cur': 'USD'
+        }
+      };
+
+      const bidResponses = spec.interpretResponse(serverResponse, {
+        originalBidRequest: {
+          adUnitCode: 'test-div',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f461',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: { banner: { sizes: [[300, 250]] } },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub123456',
+            endpointId: 'ep1234566'
+          },
+          src: 'client',
+          transactionId: '4781e6ac-93c4-42ba-86fe-ab5f278863cf'
+        }
+      });
+
+      expect(bidResponses).to.be.an('array').that.is.not.empty;
+
+      const bid = serverResponse.body.seatbid[0].bid[0];
+      const bidResponse = bidResponses[0];
+
+      expect(bidResponse.mediaType).to.equal(BANNER);
+      expect(bidResponse.requestId).to.equal(bid.impid);
+      expect(bidResponse.cpm).to.equal(parseFloat(bid.price).toFixed(2))
+      expect(bidResponse.currency).to.equal(serverResponse.body.cur);
+      expect(bidResponse.creativeId).to.equal(bid.crid || bid.id);
+      expect(bidResponse.netRevenue).to.be.true;
+      expect(bidResponse.nurl).to.equal(bid.nurl);
+      expect(bidResponse.lurl).to.equal(bid.lurl);
+
+      expect(bidResponse.meta).to.be.an('object');
+      expect(bidResponse.meta.mediaType).to.equal(BANNER);
+      expect(bidResponse.meta.primaryCatId).to.equal('IAB9-31');
+      expect(bidResponse.meta.secondaryCatIds).to.deep.equal(['IAB8']);
+      expect(bidResponse.meta.advertiserDomains).to.deep.equal(bid.adomain);
+      expect(bidResponse.meta.clickUrl).to.equal(bid.adomain[0]);
+
+      expect(bidResponse.ad).to.equal(bid.adm);
+      expect(bidResponse.width).to.equal(bid.w);
+      expect(bidResponse.height).to.equal(bid.h);
+    });
+
+    it('Test video interpretResponse', function () {
+      const serverResponse = {
+        body: {
+          'id': 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '003004d9c05c6bc7fec0',
+                  'impid': '22c4871113f461',
+                  'price': 1.04,
+                  'nurl': 'https://s.adx.opera.com/win',
+                  'lurl': 'https://s.adx.opera.com/loss',
+                  'adm': '<VAST version="2.0"><Ad id="static"><InLine><AdSystem>Static VAST Template</AdSystem><AdTitle>Static VAST Tag</AdTitle><Impression>http://example.com/pixel.gif?asi=[ADSERVINGID]</Impression><Creatives><Creative><Linear><Duration>00:00:08</Duration><TrackingEvents><Tracking event="start">http://example.com/pixel.gif</Tracking><Tracking event="firstQuartile">http://example.com/pixel.gif</Tracking><Tracking event="midpoint">http://example.com/pixel.gif</Tracking><Tracking event="thirdQuartile">http://example.com/pixel.gif</Tracking><Tracking event="complete">http://example.com/pixel.gif</Tracking><Tracking event="pause">http://example.com/pixel.gif</Tracking><Tracking event="mute">http://example.com/pixel.gif</Tracking><Tracking event="fullscreen">http://example.com/pixel.gif</Tracking></TrackingEvents><VideoClicks><ClickThrough>http://www.jwplayer.com/</ClickThrough><ClickTracking>http://example.com/pixel.gif?r=[REGULATIONS]&gdpr=[GDPRCONSENT]&pu=[PAGEURL]&da=[DEVICEUA]</ClickTracking></VideoClicks><MediaFiles><MediaFile type="video/mp4" bitrate="300" width="480" height="270"> http://example.com/uploads/myPrerollVideo.mp4</MediaFile></MediaFiles><Icons><Icon program="AdChoices" height="16" width="16" xPosition="right" yPosition="top"><StaticResource creativeType="image/png"> https://example.com/adchoices-sm.png</StaticResource><Iconclicks><IconClickThrough>https://sample-url.com</IconClickThrough></IconClicks></Icon></Icons></Linear></Creative></Creatives></InLine></Ad></VAST>',
+                  'adomain': [
+                    'opera.com',
+                  ],
+                  'cid': '0.49379027',
+                  'crid': '0.49379027',
+                  'cat': [
+                    'IAB9-31',
+                    'IAB8'
+                  ],
+                  'language': 'EN',
+                  'h': 300,
+                  'w': 250,
+                  'exp': 500,
+                  'ext': {}
+                }
+              ],
+              'seat': 'adv4199760017536'
+            }
+          ],
+          'bidid': '003004d9c05c6bc7fec0',
+          'cur': 'USD'
+        }
+      };
+
+      const bidResponses = spec.interpretResponse(serverResponse, {
+        originalBidRequest: {
+          adUnitCode: 'test-div',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f461',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: { video: { context: 'outstream' } },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub123456',
+            endpointId: 'ep1234566'
+          },
+          src: 'client',
+          transactionId: '4781e6ac-93c4-42ba-86fe-ab5f278863cf'
+        }
+      });
+
+      expect(bidResponses).to.be.an('array').that.is.not.empty;
+
+      const bid = serverResponse.body.seatbid[0].bid[0];
+      const bidResponse = bidResponses[0];
+
+      expect(bidResponse.mediaType).to.equal(VIDEO);
+      expect(bidResponse.vastXml).to.equal(bid.adm);
+      expect(bidResponse.width).to.equal(bid.w);
+      expect(bidResponse.height).to.equal(bid.h);
+
+      expect(bidResponse.adResponse).to.be.an('object');
+      expect(bidResponse.renderer).to.be.an('object');
+    });
+
+    it('Test native interpretResponse', function () {
+      const serverResponse = {
+        body: {
+          'id': 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '003004d9c05c6bc7fec0',
+                  'impid': '22c4871113f461',
+                  'price': 1.04,
+                  'nurl': 'https://s.adx.opera.com/win',
+                  'lurl': 'https://s.adx.opera.com/loss',
+                  'adm': '{"native":{"ver":"1.1","assets":[{"id":1,"required":1,"title":{"text":"The first personal browser"}},{"id":2,"required":1,"img":{"url":"https://res.adx.opera.com/xxx.png","w":720,"h":1280}},{"id":3,"required":1,"img":{"url":"https://res.adx.opera.com/xxx.png","w":60,"h":60}},{"id":4,"required":1,"data":{"value":"Download Opera","len":14}},{"id":5,"required":1,"data":{"value":"Opera","len":5}},{"id":6,"required":1,"data":{"value":"Download","len":8}}],"link":{"url":"https://www.opera.com/mobile/opera","clicktrackers":["https://thirdpart-click.tracker.com","https://t-odx.op-mobile.opera.com/click"]},"imptrackers":["https://thirdpart-imp.tracker.com","https://t-odx.op-mobile.opera.com/impr"],"jstracker":"<script src=\\"https://t-odx.op-mobile.opera.com/jstracker\\"></script>"}}',
+                  'adomain': [
+                    'opera.com',
+                  ],
+                  'cid': '0.49379027',
+                  'crid': '0.49379027',
+                  'cat': [
+                    'IAB9-31',
+                    'IAB8'
+                  ],
+                  'language': 'EN',
+                  'h': 300,
+                  'w': 250,
+                  'exp': 500,
+                  'ext': {}
+                }
+              ],
+              'seat': 'adv4199760017536'
+            }
+          ],
+          'bidid': '003004d9c05c6bc7fec0',
+          'cur': 'USD'
+        }
+      };
+
+      const bidResponses = spec.interpretResponse(serverResponse, {
+        originalBidRequest: {
+          adUnitCode: 'test-div',
+          auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+          bidId: '22c4871113f461',
+          bidder: 'operaads',
+          bidderRequestId: '15246a574e859f',
+          mediaTypes: { native: { } },
+          params: {
+            placementId: 's12345678',
+            publisherId: 'pub123456',
+            endpointId: 'ep1234566'
+          },
+          src: 'client',
+          transactionId: '4781e6ac-93c4-42ba-86fe-ab5f278863cf'
+        }
+      });
+
+      expect(bidResponses).to.be.an('array').that.is.not.empty;
+
+      const bidResponse = bidResponses[0];
+
+      expect(bidResponse.mediaType).to.equal(NATIVE)
+      expect(bidResponse.native).to.be.an('object');
+      expect(bidResponse.native.clickUrl).is.not.empty;
+      expect(bidResponse.native.clickTrackers).to.have.lengthOf(2);
+      expect(bidResponse.native.impressionTrackers).to.have.lengthOf(2);
+      expect(bidResponse.native.javascriptTrackers).to.have.lengthOf(1);
+    });
+
+    it('Test empty server response', function () {
+      const bidResponses = spec.interpretResponse({}, {});
+
+      expect(bidResponses).to.be.an('array').that.is.empty;
+    });
+
+    it('Test empty bid response', function () {
+      const bidResponses = spec.interpretResponse({ body: { seatbid: null } }, {});
+
+      expect(bidResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('Test getUserSyncs with both iframe and pixel disabled', function () {
+    it('getUserSyncs should return an empty array', function () {
+      const syncOptions = {};
+      expect(spec.getUserSyncs(syncOptions)).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('Test getUserSyncs with iframe enabled', function () {
+    it('getUserSyncs should return array', function () {
+      const syncOptions = {
+        iframeEnabled: true
+      }
+      const userSyncPixels = spec.getUserSyncs(syncOptions)
+      expect(userSyncPixels).to.have.lengthOf(1);
+      expect(userSyncPixels[0].url).to.equal('https://s.adx.opera.com/usersync/page')
+    });
+  });
+
+  describe('Test getUserSyncs with pixel enabled', function () {
+    it('getUserSyncs should return array', function () {
+      const serverResponse = {
+        body: {
+          'pixels': [
+            'https://b1.com/usersync',
+            'https://b2.com/usersync'
+          ]
+        }
+      };
+      const syncOptions = {
+        pixelEnabled: true
+      }
+      const userSyncPixels = spec.getUserSyncs(syncOptions, [serverResponse])
+      expect(userSyncPixels).to.have.lengthOf(2);
+      expect(userSyncPixels[0].url).to.equal('https://b1.com/usersync')
+      expect(userSyncPixels[1].url).to.equal('https://b2.com/usersync')
+    });
+  });
+
+  describe('Test onTimeout', function () {
+    it('onTimeout should not throw', function () {
+      expect(spec.onTimeout()).to.not.throw;
+    });
+  });
+
+  describe('Test onBidWon', function () {
+    it('onBidWon should not throw', function () {
+      expect(spec.onBidWon({nurl: '#', originalCpm: '1.04', currency: 'USD'})).to.not.throw;
+    });
+  });
+
+  describe('Test onSetTargeting', function () {
+    it('onSetTargeting should not throw', function () {
+      expect(spec.onSetTargeting()).to.not.throw;
+    });
+  });
+});
diff --git a/test/spec/modules/optimeraBidAdapter_spec.js b/test/spec/modules/optimeraBidAdapter_spec.js
deleted file mode 100644
index ada07fe25c2..00000000000
--- a/test/spec/modules/optimeraBidAdapter_spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/optimeraBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-describe('OptimeraAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  })
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'optimera',
-      'params': {
-        'clientID': '9999'
-      },
-      'adUnitCode': 'div-0',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-  })
-
-  describe('buildRequests', function () {
-    let bid = [
-      {
-        'adUnitCode': 'div-0',
-        'auctionId': '1ab30503e03994',
-        'bidId': '313e0afede8cdb',
-        'bidder': 'optimera',
-        'bidderRequestId': '202be1ce3f6194',
-        'params': {
-          'clientID': '0'
-        }
-      }
-    ];
-    it('buildRequests fires', function () {
-      let request = spec.buildRequests(bid);
-      expect(request).to.exist;
-      expect(request.method).to.equal('GET');
-      expect(request.payload).to.exist;
-    });
-  })
-
-  describe('interpretResponse', function () {
-    let serverResponse = {};
-    serverResponse.body = JSON.parse('{"div-0":["RB_K","728x90K"], "timestamp":["RB_K","1507565666"], "device": { "de": { "div-0":["A1","728x90K"] }, "mo": { "div-0":["RB_K","728x90K"] }, "tb": { "div-0":["RB_K","728x90K"] } } }');
-    var bidRequest = {
-      'method': 'get',
-      'payload': [
-        {
-          'bidder': 'optimera',
-          'params': {
-            'clientID': '0'
-          },
-          'adUnitCode': 'div-0',
-          'bidId': '307440db8538ab'
-        }
-      ]
-    }
-    it('interpresResponse fires', function () {
-      let bidResponses = spec.interpretResponse(serverResponse, bidRequest);
-      expect(bidResponses[0].dealId[0]).to.equal('RB_K');
-      expect(bidResponses[0].dealId[1]).to.equal('728x90K');
-    });
-  });
-
-  describe('interpretResponse with optional device param', function () {
-    let serverResponse = {};
-    serverResponse.body = JSON.parse('{"div-0":["RB_K","728x90K"], "timestamp":["RB_K","1507565666"], "device": { "de": { "div-0":["A1","728x90K"] }, "mo": { "div-0":["RB_K","728x90K"] }, "tb": { "div-0":["RB_K","728x90K"] } } }');
-    var bidRequest = {
-      'method': 'get',
-      'payload': [
-        {
-          'bidder': 'optimera',
-          'params': {
-            'clientID': '0',
-            'device': 'de'
-          },
-          'adUnitCode': 'div-0',
-          'bidId': '307440db8538ab'
-        }
-      ]
-    }
-    it('interpresResponse fires', function () {
-      let bidResponses = spec.interpretResponse(serverResponse, bidRequest);
-      expect(bidResponses[0].dealId[0]).to.equal('A1');
-      expect(bidResponses[0].dealId[1]).to.equal('728x90K');
-    });
-  });
-});
diff --git a/test/spec/modules/optimeraRtdProvider_spec.js b/test/spec/modules/optimeraRtdProvider_spec.js
new file mode 100644
index 00000000000..aec8b79045e
--- /dev/null
+++ b/test/spec/modules/optimeraRtdProvider_spec.js
@@ -0,0 +1,136 @@
+import * as optimeraRTD from '../../../modules/optimeraRtdProvider.js';
+
+const utils = require('src/utils.js');
+
+describe('Optimera RTD sub module', () => {
+  it('should init, return true, and set the params', () => {
+    const conf = {
+      dataProviders: [{
+        name: 'optimeraRTD',
+        params: {
+          clientID: '9999',
+          optimeraKeyName: 'optimera',
+          device: 'de'
+        }
+      }]
+    };
+    expect(optimeraRTD.init(conf.dataProviders[0])).to.equal(true);
+    expect(optimeraRTD.clientID).to.equal('9999');
+    expect(optimeraRTD.optimeraKeyName).to.equal('optimera');
+    expect(optimeraRTD.device).to.equal('de');
+  });
+});
+
+describe('Optimera RTD score file url is properly set', () => {
+  it('Proerly set the score file url', () => {
+    optimeraRTD.setScores();
+    expect(optimeraRTD.scoresURL).to.equal('https://dyv1bugovvq1g.cloudfront.net/9999/localhost:9876/context.html.js');
+  });
+});
+
+describe('Optimera RTD score file properly sets targeting values', () => {
+  const scores = {
+    'div-0': ['A1', 'A2'],
+    'div-1': ['A3', 'A4'],
+    device: {
+      de: {
+        'div-0': ['A5', 'A6'],
+        'div-1': ['A7', 'A8'],
+        insights: {
+          ilv: ['div-0'],
+          miv: ['div-4'],
+        }
+      },
+      mo: {
+        'div-0': ['A9', 'B0'],
+        'div-1': ['B1', 'B2'],
+        insights: {
+          ilv: ['div-1'],
+          miv: ['div-2'],
+        }
+      }
+    },
+    insights: {
+      ilv: ['div-5'],
+      miv: ['div-6'],
+    }
+  };
+  it('Properly set the score file url and scores', () => {
+    optimeraRTD.setScores(JSON.stringify(scores));
+    expect(optimeraRTD.optimeraTargeting['div-0']).to.include.ordered.members(['A5', 'A6']);
+    expect(optimeraRTD.optimeraTargeting['div-1']).to.include.ordered.members(['A7', 'A8']);
+  });
+});
+
+describe('Optimera RTD propery sets the window.optimera object', () => {
+  const scores = {
+    'div-0': ['A1', 'A2'],
+    'div-1': ['A3', 'A4'],
+    device: {
+      de: {
+        'div-0': ['A5', 'A6'],
+        'div-1': ['A7', 'A8'],
+        insights: {
+          ilv: ['div-0'],
+          miv: ['div-4'],
+        }
+      },
+      mo: {
+        'div-0': ['A9', 'B0'],
+        'div-1': ['B1', 'B2'],
+        insights: {
+          ilv: ['div-1'],
+          miv: ['div-2'],
+        }
+      }
+    },
+    insights: {
+      ilv: ['div-5'],
+      miv: ['div-6'],
+    }
+  };
+  it('Properly set the score file url and scores', () => {
+    optimeraRTD.setScores(JSON.stringify(scores));
+    expect(window.optimera.data['div-1']).to.include.ordered.members(['A7', 'A8']);
+    expect(window.optimera.insights.ilv).to.include.ordered.members(['div-0']);
+  });
+});
+
+describe('Optimera RTD targeting object is properly formed', () => {
+  const adDivs = ['div-0', 'div-1'];
+  it('applyTargeting properly created the targeting object', () => {
+    const targeting = optimeraRTD.returnTargetingData(adDivs);
+    expect(targeting).to.deep.include({ 'div-0': { optimera: [['A5', 'A6']] } });
+    expect(targeting).to.deep.include({ 'div-1': { optimera: [['A7', 'A8']] } });
+  });
+});
+
+describe('Optimera RTD error logging', () => {
+  let utilsLogErrorStub;
+
+  beforeEach(() => {
+    utilsLogErrorStub = sinon.stub(utils, 'logError');
+  });
+  afterEach(() => {
+    utilsLogErrorStub.restore();
+  });
+
+  it('ommitting clientID should log an error', () => {
+    const conf = {
+      dataProviders: [{
+        name: 'optimeraRTD',
+        params: {
+          optimeraKeyName: 'optimera',
+          device: 'de'
+        }
+      }]
+    };
+    optimeraRTD.init(conf.dataProviders[0]);
+    expect(utils.logError.called).to.equal(true);
+  });
+
+  it('if adUnits is not an array should log an error', () => {
+    optimeraRTD.returnTargetingData('test');
+    expect(utils.logError.called).to.equal(true);
+  });
+});
diff --git a/test/spec/modules/optimonAnalyticsAdapter_spec.js b/test/spec/modules/optimonAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..f1aa00334b5
--- /dev/null
+++ b/test/spec/modules/optimonAnalyticsAdapter_spec.js
@@ -0,0 +1,33 @@
+import * as utils from 'src/utils.js';
+import { expect } from 'chai';
+import optimonAnalyticsAdapter from '../../../modules/optimonAnalyticsAdapter.js';
+import adapterManager from 'src/adapterManager';
+import * as events from 'src/events';
+import constants from 'src/constants.json'
+import {expectEvents} from '../../helpers/analytics.js';
+
+const AD_UNIT_CODE = 'demo-adunit-1';
+const PUBLISHER_CONFIG = {
+  pubId: 'optimon_test',
+  pubAdxAccount: 123456789,
+  pubTimezone: 'Asia/Jerusalem'
+};
+
+describe('Optimon Analytics Adapter', () => {
+  const optmn_currentWindow = utils.getWindowSelf();
+
+  beforeEach(() => {
+    optmn_currentWindow.OptimonAnalyticsAdapter = sinon.stub()
+    adapterManager.enableAnalytics({
+      provider: 'optimon'
+    });
+  });
+
+  afterEach(() => {
+    optimonAnalyticsAdapter.disableAnalytics();
+  });
+
+  it('should forward all events to the queue', () => {
+    expectEvents().to.beBundledTo(optmn_currentWindow.OptimonAnalyticsAdapter);
+  });
+});
diff --git a/test/spec/modules/optoutBidAdapter_spec.js b/test/spec/modules/optoutBidAdapter_spec.js
new file mode 100644
index 00000000000..a31becdc394
--- /dev/null
+++ b/test/spec/modules/optoutBidAdapter_spec.js
@@ -0,0 +1,115 @@
+import { expect } from 'chai';
+import { spec } from 'modules/optoutBidAdapter.js';
+import {config} from 'src/config.js';
+
+describe('optoutAdapterTest', function () {
+  describe('bidRequestValidity', function () {
+    it('bidRequest with adslot param', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'optout',
+        params: {
+          'adslot': 'prebid_demo',
+          'publisher': '8'
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest with no adslot param', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'optout',
+        params: {
+          'publisher': '8'
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest with no publisher param', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'optout',
+        params: {
+          'adslot': 'prebid_demo'
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without params', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'optout',
+        params: { }
+      })).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', function () {
+    const bidRequests = [{
+      'bidder': 'optout',
+      'params': {
+        'adslot': 'prebid_demo',
+        'publisher': '8'
+      },
+      'adUnitCode': 'aaa',
+      'transactionId': '1b8389fe-615c-482d-9f1a-177fb8f7d5b0',
+      'bidId': '9304jr394ddfj',
+      'bidderRequestId': '70deaff71c281d',
+      'auctionId': '5c66da22-426a-4bac-b153-77360bef5337'
+    },
+    {
+      'bidder': 'optout',
+      'params': {
+        'adslot': 'testslot2',
+        'publisher': '2'
+      },
+      'adUnitCode': 'bbb',
+      'transactionId': '193995b4-7122-4739-959b-2463282a138b',
+      'bidId': '893j4f94e8jei',
+      'bidderRequestId': '70deaff71c281d',
+      'gdprConsent': {
+        consentString: '',
+        gdprApplies: true,
+        apiVersion: 2
+      },
+      'auctionId': 'e97cafd0-ebfc-4f5c-b7c9-baa0fd335a4a'
+    }];
+
+    it('bidRequest HTTP method', function () {
+      const requests = spec.buildRequests(bidRequests, {});
+      requests.forEach(function(requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+
+    it('bidRequest url without consent', function () {
+      const requests = spec.buildRequests(bidRequests, {});
+      requests.forEach(function(requestItem) {
+        expect(requestItem.url).to.match(new RegExp('adscience-nocookie\\.nl/prebid/display'));
+      });
+    });
+
+    it('bidRequest id', function () {
+      const requests = spec.buildRequests(bidRequests, {});
+      expect(requests[0].data.requestId).to.equal('9304jr394ddfj');
+      expect(requests[1].data.requestId).to.equal('893j4f94e8jei');
+    });
+
+    it('bidRequest with config for currency', function () {
+      config.setConfig({
+        currency: {
+       	    adServerCurrency: 'USD',
+          granularityMultiplier: 1
+        }
+      })
+
+      const requests = spec.buildRequests(bidRequests, {});
+      expect(requests[0].data.cur.adServerCurrency).to.equal('USD');
+      expect(requests[1].data.cur.adServerCurrency).to.equal('USD');
+    });
+
+    it('bidRequest without config for currency', function () {
+      config.resetConfig();
+
+      const requests = spec.buildRequests(bidRequests, {});
+      expect(requests[0].data.cur.adServerCurrency).to.equal('EUR');
+      expect(requests[1].data.cur.adServerCurrency).to.equal('EUR');
+    });
+  });
+});
diff --git a/test/spec/modules/orbidderBidAdapter_spec.js b/test/spec/modules/orbidderBidAdapter_spec.js
index eec6ccd19f6..0d1396866e7 100644
--- a/test/spec/modules/orbidderBidAdapter_spec.js
+++ b/test/spec/modules/orbidderBidAdapter_spec.js
@@ -1,12 +1,12 @@
 import {expect} from 'chai';
 import {spec} from 'modules/orbidderBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
-import openxAdapter from '../../../modules/openxAnalyticsAdapter.js';
-import {detectReferer} from 'src/refererDetection.js';
+import * as _ from 'lodash';
+import { BANNER, NATIVE } from '../../../src/mediaTypes.js';
 
 describe('orbidderBidAdapter', () => {
   const adapter = newBidder(spec);
-  const defaultBidRequest = {
+  const defaultBidRequestBanner = {
     bidId: 'd66fa86787e0b0ca900a96eacfd5f0bb',
     auctionId: 'ccc4c7cdfe11cfbd74065e6dd28413d8',
     transactionId: 'd58851660c0c4461e4aa06344fc9c0c6',
@@ -16,6 +16,38 @@ describe('orbidderBidAdapter', () => {
     params: {
       'accountId': 'string1',
       'placementId': 'string2'
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]],
+      }
+    }
+  };
+
+  const defaultBidRequestNative = {
+    bidId: 'd66fa86787e0b0ca900a96eacfd5f0bc',
+    auctionId: 'ccc4c7cdfe11cfbd74065e6dd28413d9',
+    transactionId: 'd58851660c0c4461e4aa06344fc9c0c7',
+    bidRequestCount: 1,
+    adUnitCode: 'adunit-code-native',
+    sizes: [],
+    params: {
+      'accountId': 'string3',
+      'placementId': 'string4'
+    },
+    mediaTypes: {
+      native: {
+        title: {
+          required: true
+        },
+        image: {
+          required: true,
+          sizes: [300, 250]
+        },
+        sponsoredBy: {
+          required: true
+        }
+      }
     }
   };
 
@@ -31,7 +63,7 @@ describe('orbidderBidAdapter', () => {
     return spec.buildRequests(buildRequest, {
       ...bidderRequest || {},
       refererInfo: {
-        referer: 'https://localhost:9876/'
+        page: 'https://localhost:9876/'
       }
     })[0];
   };
@@ -43,36 +75,64 @@ describe('orbidderBidAdapter', () => {
   });
 
   describe('isBidRequestValid', () => {
-    it('should return true when required params found', () => {
-      expect(spec.isBidRequestValid(defaultBidRequest)).to.equal(true);
+    it('banner: should return true when required params found', () => {
+      expect(spec.isBidRequestValid(defaultBidRequestBanner)).to.equal(true);
+    });
+
+    it('native: should return true when required params found', () => {
+      expect(spec.isBidRequestValid(defaultBidRequestNative)).to.equal(true);
+    });
+
+    it('banner: accepts optional profile object', () => {
+      const bidRequest = deepClone(defaultBidRequestBanner);
+      bidRequest.params.profile = {'key': 'value'};
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
     });
 
-    it('accepts optional profile object', () => {
-      const bidRequest = deepClone(defaultBidRequest);
+    it('native: accepts optional profile object', () => {
+      const bidRequest = deepClone(defaultBidRequestNative);
       bidRequest.params.profile = {'key': 'value'};
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
     });
 
-    it('performs type checking', () => {
-      const bidRequest = deepClone(defaultBidRequest);
+    it('banner: performs type checking', () => {
+      const bidRequest = deepClone(defaultBidRequestBanner);
       bidRequest.params.accountId = 1; // supposed to be a string
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
     });
 
-    it('doesn\'t accept malformed profile', () => {
-      const bidRequest = deepClone(defaultBidRequest);
+    it('native: performs type checking', () => {
+      const bidRequest = deepClone(defaultBidRequestNative);
+      bidRequest.params.accountId = 1; // supposed to be a string
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('banner: doesn\'t accept malformed profile', () => {
+      const bidRequest = deepClone(defaultBidRequestBanner);
+      bidRequest.params.profile = 'another not usable string';
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('native: doesn\'t accept malformed profile', () => {
+      const bidRequest = deepClone(defaultBidRequestNative);
       bidRequest.params.profile = 'another not usable string';
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
     });
 
-    it('should return false when required params are not passed', () => {
-      const bidRequest = deepClone(defaultBidRequest);
+    it('banner: should return false when required params are not passed', () => {
+      const bidRequest = deepClone(defaultBidRequestBanner);
       delete bidRequest.params;
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
     });
 
-    it('accepts optional bidfloor', () => {
-      const bidRequest = deepClone(defaultBidRequest);
+    it('native: should return false when required params are not passed', () => {
+      const bidRequest = deepClone(defaultBidRequestNative);
+      delete bidRequest.params;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('banner: accepts optional bidfloor', () => {
+      const bidRequest = deepClone(defaultBidRequestBanner);
       bidRequest.params.bidfloor = 123;
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
 
@@ -80,53 +140,109 @@ describe('orbidderBidAdapter', () => {
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
     });
 
-    it('doesn\'t accept malformed bidfloor', () => {
-      const bidRequest = deepClone(defaultBidRequest);
-      bidRequest.params.bidfloor = 'another not usable string';
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    it('native: accepts optional bidfloor', () => {
+      const bidRequest = deepClone(defaultBidRequestNative);
+      bidRequest.params.bidfloor = 123;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+
+      bidRequest.params.bidfloor = 1.23;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
     });
   });
 
   describe('buildRequests', () => {
-    const request = buildRequest(defaultBidRequest);
+    const request = buildRequest(defaultBidRequestBanner);
+    const nativeRequest = buildRequest(defaultBidRequestNative);
 
     it('sends bid request to endpoint via https using post', () => {
       expect(request.method).to.equal('POST');
       expect(request.url.indexOf('https://')).to.equal(0);
-      expect(request.url).to.equal(`${spec.orbidderHost}/bid`);
+      expect(request.url).to.equal(`${spec.hostname}/bid`);
     });
 
     it('contains prebid version parameter', () => {
       expect(request.data.v).to.equal($$PREBID_GLOBAL$$.version);
     });
 
-    it('sends correct bid parameters', () => {
-      // we add two, because we add referer information and version from bidderRequest object
-      expect(Object.keys(request.data).length).to.equal(Object.keys(defaultBidRequest).length + 2);
+    it('banner: sends correct bid parameters', () => {
+      // we add two, because we add pageUrl and version from bidderRequest object
+      expect(Object.keys(request.data).length).to.equal(Object.keys(defaultBidRequestBanner).length + 2);
+
+      expect(request.data.bidId).to.equal(defaultBidRequestBanner.bidId);
+      expect(request.data.auctionId).to.equal(defaultBidRequestBanner.auctionId);
+      expect(request.data.transactionId).to.equal(defaultBidRequestBanner.transactionId);
+      expect(request.data.bidRequestCount).to.equal(defaultBidRequestBanner.bidRequestCount);
+      expect(request.data.adUnitCode).to.equal(defaultBidRequestBanner.adUnitCode);
       expect(request.data.pageUrl).to.equal('https://localhost:9876/');
-      // expect(request.data.referrer).to.equal('');
-      Object.keys(defaultBidRequest).forEach((key) => {
-        expect(defaultBidRequest[key]).to.equal(request.data[key]);
+      expect(request.data.v).to.equal($$PREBID_GLOBAL$$.version);
+      expect(request.data.sizes).to.equal(defaultBidRequestBanner.sizes);
+
+      expect(_.isEqual(request.data.params, defaultBidRequestBanner.params)).to.be.true;
+      expect(_.isEqual(request.data.mediaTypes, defaultBidRequestBanner.mediaTypes)).to.be.true;
+    });
+
+    it('native: sends correct bid parameters', () => {
+      // we add two, because we add pageUrl and version from bidderRequest object
+      expect(Object.keys(nativeRequest.data).length).to.equal(Object.keys(defaultBidRequestNative).length + 2);
+
+      expect(nativeRequest.data.bidId).to.equal(defaultBidRequestNative.bidId);
+      expect(nativeRequest.data.auctionId).to.equal(defaultBidRequestNative.auctionId);
+      expect(nativeRequest.data.transactionId).to.equal(defaultBidRequestNative.transactionId);
+      expect(nativeRequest.data.bidRequestCount).to.equal(defaultBidRequestNative.bidRequestCount);
+      expect(nativeRequest.data.adUnitCode).to.equal(defaultBidRequestNative.adUnitCode);
+      expect(nativeRequest.data.pageUrl).to.equal('https://localhost:9876/');
+      expect(nativeRequest.data.v).to.equal($$PREBID_GLOBAL$$.version);
+      expect(nativeRequest.data.sizes).to.be.empty;
+
+      expect(_.isEqual(nativeRequest.data.params, defaultBidRequestNative.params)).to.be.true;
+      expect(_.isEqual(nativeRequest.data.mediaTypes, defaultBidRequestNative.mediaTypes)).to.be.true;
+    });
+
+    it('banner: handles empty gdpr object', () => {
+      const request = buildRequest(defaultBidRequestBanner, {
+        gdprConsent: {}
       });
+      expect(request.data.gdprConsent.consentRequired).to.be.equal(false);
     });
 
-    it('handles empty gdpr object', () => {
-      const request = buildRequest(defaultBidRequest, {
+    it('native: handles empty gdpr object', () => {
+      const request = buildRequest(defaultBidRequestNative, {
         gdprConsent: {}
       });
       expect(request.data.gdprConsent.consentRequired).to.be.equal(false);
     });
 
-    it('handles non-existent gdpr object', () => {
-      const request = buildRequest(defaultBidRequest, {
+    it('banner: handles non-existent gdpr object', () => {
+      const request = buildRequest(defaultBidRequestBanner, {
         gdprConsent: null
       });
       expect(request.data.gdprConsent).to.be.undefined;
     });
 
-    it('handles properly filled gdpr object where gdpr applies', () => {
+    it('native: handles non-existent gdpr object', () => {
+      const request = buildRequest(defaultBidRequestNative, {
+        gdprConsent: null
+      });
+      expect(request.data.gdprConsent).to.be.undefined;
+    });
+
+    it('banner: handles properly filled gdpr object where gdpr applies', () => {
+      const consentString = 'someWeirdString';
+      const request = buildRequest(defaultBidRequestBanner, {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: consentString
+        }
+      });
+
+      const gdprConsent = request.data.gdprConsent;
+      expect(gdprConsent.consentRequired).to.be.equal(true);
+      expect(gdprConsent.consentString).to.be.equal(consentString);
+    });
+
+    it('native: handles properly filled gdpr object where gdpr applies', () => {
       const consentString = 'someWeirdString';
-      const request = buildRequest(defaultBidRequest, {
+      const request = buildRequest(defaultBidRequestNative, {
         gdprConsent: {
           gdprApplies: true,
           consentString: consentString
@@ -138,9 +254,9 @@ describe('orbidderBidAdapter', () => {
       expect(gdprConsent.consentString).to.be.equal(consentString);
     });
 
-    it('handles properly filled gdpr object where gdpr does not apply', () => {
+    it('banner: handles properly filled gdpr object where gdpr does not apply', () => {
       const consentString = 'someWeirdString';
-      const request = buildRequest(defaultBidRequest, {
+      const request = buildRequest(defaultBidRequestBanner, {
         gdprConsent: {
           gdprApplies: false,
           consentString: consentString
@@ -151,10 +267,45 @@ describe('orbidderBidAdapter', () => {
       expect(gdprConsent.consentRequired).to.be.equal(false);
       expect(gdprConsent.consentString).to.be.equal(consentString);
     });
+
+    it('native: handles properly filled gdpr object where gdpr does not apply', () => {
+      const consentString = 'someWeirdString';
+      const request = buildRequest(defaultBidRequestNative, {
+        gdprConsent: {
+          gdprApplies: false,
+          consentString: consentString
+        }
+      });
+
+      const gdprConsent = request.data.gdprConsent;
+      expect(gdprConsent.consentRequired).to.be.equal(false);
+      expect(gdprConsent.consentString).to.be.equal(consentString);
+    });
+  });
+
+  describe('buildRequests with price floor module', () => {
+    const bidRequest = deepClone(defaultBidRequestBanner);
+    bidRequest.params.bidfloor = 1;
+    bidRequest.getFloor = (floorObj) => {
+      return {
+        floor: bidRequest.floors.values['banner|640x480'],
+        currency: floorObj.currency,
+        mediaType: floorObj.mediaType
+      }
+    };
+
+    bidRequest.floors = {
+      currency: 'EUR',
+      values: {
+        'banner|640x480': 15.07
+      }
+    };
+    const request = buildRequest(bidRequest);
+    expect(request.data.params.bidfloor).to.equal(15.07);
   });
 
   describe('interpretResponse', () => {
-    it('should get correct bid response', () => {
+    it('banner: should get correct bid response', () => {
       const serverResponse = [
         {
           'width': 300,
@@ -165,7 +316,8 @@ describe('orbidderBidAdapter', () => {
           'requestId': '30b31c1838de1e',
           'ttl': 60,
           'netRevenue': true,
-          'currency': 'EUR'
+          'currency': 'EUR',
+          'mediaType': BANNER,
         }
       ];
 
@@ -179,7 +331,48 @@ describe('orbidderBidAdapter', () => {
           'ttl': 60,
           'currency': 'EUR',
           'ad': '<!-- Creative -->',
-          'netRevenue': true
+          'netRevenue': true,
+          'mediaType': BANNER,
+        }
+      ];
+
+      const result = spec.interpretResponse({body: serverResponse});
+      expect(result.length).to.equal(expectedResponse.length);
+      expect(_.isEqual(expectedResponse, serverResponse)).to.be.true;
+    });
+
+    it('should get correct bid response with advertiserDomains', () => {
+      const serverResponse = [
+        {
+          'width': 300,
+          'height': 250,
+          'creativeId': '29681110',
+          'ad': '<!-- Creative -->',
+          'cpm': 0.5,
+          'requestId': '30b31c1838de1e',
+          'ttl': 60,
+          'netRevenue': true,
+          'currency': 'EUR',
+          'advertiserDomains': ['cm.tavira.pt'],
+          'mediaType': BANNER
+        }
+      ];
+
+      const expectedResponse = [
+        {
+          'requestId': '30b31c1838de1e',
+          'cpm': 0.5,
+          'creativeId': '29681110',
+          'width': 300,
+          'height': 250,
+          'ttl': 60,
+          'currency': 'EUR',
+          'ad': '<!-- Creative -->',
+          'netRevenue': true,
+          'meta': {
+            'advertiserDomains': ['cm.tavira.pt']
+          },
+          'mediaType': BANNER
         }
       ];
 
@@ -187,28 +380,140 @@ describe('orbidderBidAdapter', () => {
 
       expect(result.length).to.equal(expectedResponse.length);
       Object.keys(expectedResponse[0]).forEach((key) => {
-        expect(result[0][key]).to.equal(expectedResponse[0][key]);
+        expect(result[0][key]).to.deep.equal(expectedResponse[0][key]);
       });
     });
 
-    it('handles broken server response', () => {
+    it('native: should get correct bid response', () => {
+      const serverResponse = [
+        {
+          'creativeId': '29681110',
+          'cpm': 0.5,
+          'requestId': '30b31c1838de1e',
+          'ttl': 60,
+          'netRevenue': true,
+          'currency': 'EUR',
+          'mediaType': NATIVE,
+          'native': {
+            'image': {
+              'url': 'image url',
+              'width': 300,
+              'height': 250,
+            },
+            'icon': {
+              'url': 'icon url',
+              'width': 50,
+              'height': 50,
+            },
+            'impressionTrackers': 'imp tracker',
+            'clickUrl': 'click',
+            'sponsoredBy': 'brand',
+            'cta': 'action',
+            'body': 'text',
+          }
+        }
+      ];
+
+      const expectedResponse = [
+        {
+          'creativeId': '29681110',
+          'cpm': 0.5,
+          'requestId': '30b31c1838de1e',
+          'ttl': 60,
+          'netRevenue': true,
+          'currency': 'EUR',
+          'mediaType': NATIVE,
+          'native': {
+            'image': {
+              'url': 'image url',
+              'width': 300,
+              'height': 250,
+            },
+            'icon': {
+              'url': 'icon url',
+              'width': 50,
+              'height': 50,
+            },
+            'impressionTrackers': 'imp tracker',
+            'clickUrl': 'click',
+            'sponsoredBy': 'brand',
+            'cta': 'action',
+            'body': 'text',
+          }
+        }
+      ];
+
+      const result = spec.interpretResponse({body: serverResponse});
+
+      expect(result.length).to.equal(expectedResponse.length);
+      expect(_.isEqual(expectedResponse, serverResponse)).to.be.true;
+    });
+
+    it('banner: handles broken bid response, missing creativeId', () => {
       const serverResponse = [
         {
           'ad': '<!-- Creative -->',
           'cpm': 0.5,
           'requestId': '30b31c1838de1e',
-          'ttl': 60
+          'ttl': 60,
+          'currency': 'EUR',
+          'mediaType': BANNER,
+          'width': 300,
+          'height': 250,
+          'netRevenue': true,
         }
       ];
       const result = spec.interpretResponse({body: serverResponse});
+      expect(result.length).to.equal(0);
+    });
 
+    it('banner: handles broken bid response, missing ad', () => {
+      const serverResponse = [
+        {
+          'cpm': 0.5,
+          'requestId': '30b31c1838de1e',
+          'ttl': 60,
+          'currency': 'EUR',
+          'mediaType': BANNER,
+          'width': 300,
+          'height': 250,
+          'netRevenue': true,
+          'creativeId': '29681110',
+        }
+      ];
+      const result = spec.interpretResponse({body: serverResponse});
+      expect(result.length).to.equal(0);
+    });
+
+    it('native: handles broken bid response, missing impressionTrackers', () => {
+      const serverResponse = [
+        {
+          'creativeId': '29681110',
+          'cpm': 0.5,
+          'requestId': '30b31c1838de1e',
+          'ttl': 60,
+          'netRevenue': true,
+          'currency': 'EUR',
+          'mediaType': NATIVE,
+          'native': {
+            'title': 'native title',
+            'sponsoredBy': 'test brand',
+            'image': {
+              'url': 'image url',
+              'width': 300,
+              'height': 250,
+            },
+            'clickUrl': 'click'
+          }
+        }
+      ];
+      const result = spec.interpretResponse({body: serverResponse});
       expect(result.length).to.equal(0);
     });
 
     it('handles nobid responses', () => {
       const serverResponse = [];
       const result = spec.interpretResponse({body: serverResponse});
-
       expect(result.length).to.equal(0);
     });
   });
diff --git a/test/spec/modules/orbitsoftBidAdapter_spec.js b/test/spec/modules/orbitsoftBidAdapter_spec.js
new file mode 100644
index 00000000000..8c3187e9324
--- /dev/null
+++ b/test/spec/modules/orbitsoftBidAdapter_spec.js
@@ -0,0 +1,255 @@
+import {expect} from 'chai';
+import {spec} from 'modules/orbitsoftBidAdapter.js';
+
+const ENDPOINT_URL = 'https://orbitsoft.com/php/ads/hb.phps';
+const REFERRER_URL = 'http://referrer.url/?_=';
+
+describe('Orbitsoft adapter', function () {
+  describe('implementation', function () {
+    describe('for requests', function () {
+      it('should accept valid bid', function () {
+        let validBid = {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123',
+              requestUrl: ENDPOINT_URL
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+
+        expect(isValid).to.equal(true);
+      });
+
+      it('should reject invalid bid', function () {
+        let invalidBid = {
+            bidder: 'orbitsoft'
+          },
+          isValid = spec.isBidRequestValid(invalidBid);
+
+        expect(isValid).to.equal(false);
+      });
+    });
+    describe('for requests', function () {
+      it('should accept valid bid with styles', function () {
+        let validBid = {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123',
+              requestUrl: ENDPOINT_URL,
+              style: {
+                title: {
+                  family: 'Tahoma',
+                  size: 'medium',
+                  weight: 'normal',
+                  style: 'normal',
+                  color: '0053F9'
+                },
+                description: {
+                  family: 'Tahoma',
+                  size: 'medium',
+                  weight: 'normal',
+                  style: 'normal',
+                  color: '0053F9'
+                },
+                url: {
+                  family: 'Tahoma',
+                  size: 'medium',
+                  weight: 'normal',
+                  style: 'normal',
+                  color: '0053F9'
+                },
+                colors: {
+                  background: 'ffffff',
+                  border: 'E0E0E0',
+                  link: '5B99FE'
+                }
+              }
+            },
+            refererInfo: {referer: REFERRER_URL},
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(true);
+
+        let buildRequest = spec.buildRequests([validBid])[0];
+        let requestUrl = buildRequest.url;
+        let requestUrlParams = buildRequest.data;
+        expect(requestUrl).to.equal(ENDPOINT_URL);
+        expect(requestUrlParams).have.property('f1', 'Tahoma');
+        expect(requestUrlParams).have.property('fs1', 'medium');
+        expect(requestUrlParams).have.property('w1', 'normal');
+        expect(requestUrlParams).have.property('s1', 'normal');
+        expect(requestUrlParams).have.property('c3', '0053F9');
+        expect(requestUrlParams).have.property('f2', 'Tahoma');
+        expect(requestUrlParams).have.property('fs2', 'medium');
+        expect(requestUrlParams).have.property('w2', 'normal');
+        expect(requestUrlParams).have.property('s2', 'normal');
+        expect(requestUrlParams).have.property('c4', '0053F9');
+        expect(requestUrlParams).have.property('f3', 'Tahoma');
+        expect(requestUrlParams).have.property('fs3', 'medium');
+        expect(requestUrlParams).have.property('w3', 'normal');
+        expect(requestUrlParams).have.property('s3', 'normal');
+        expect(requestUrlParams).have.property('c5', '0053F9');
+        expect(requestUrlParams).have.property('c2', 'ffffff');
+        expect(requestUrlParams).have.property('c1', 'E0E0E0');
+        expect(requestUrlParams).have.property('c6', '5B99FE');
+      });
+
+      it('should accept valid bid with custom params', function () {
+        let validBid = {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123',
+              requestUrl: ENDPOINT_URL,
+              customParams: {
+                cacheBuster: 'bf4d7c1',
+                clickUrl: 'http://testclickurl.com'
+              }
+            },
+            refererInfo: {referer: REFERRER_URL},
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(true);
+
+        let buildRequest = spec.buildRequests([validBid])[0];
+        let requestUrlCustomParams = buildRequest.data;
+        expect(requestUrlCustomParams).have.property('c.cacheBuster', 'bf4d7c1');
+        expect(requestUrlCustomParams).have.property('c.clickUrl', 'http://testclickurl.com');
+      });
+
+      it('should reject invalid bid without requestUrl', function () {
+        let invalidBid = {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123'
+            }
+          },
+          isValid = spec.isBidRequestValid(invalidBid);
+
+        expect(isValid).to.equal(false);
+      });
+
+      it('should reject invalid bid without placementId', function () {
+        let invalidBid = {
+            bidder: 'orbitsoft',
+            params: {
+              requestUrl: ENDPOINT_URL
+            }
+          },
+          isValid = spec.isBidRequestValid(invalidBid);
+
+        expect(isValid).to.equal(false);
+      });
+    });
+    describe('bid responses', function () {
+      it('should return complete bid response', function () {
+        let serverResponse = {
+          body: {
+            callback_uid: '265b29b70cc106',
+            cpm: 0.5,
+            width: 240,
+            height: 240,
+            content_url: 'https://orbitsoft.com/php/ads/hb.html',
+            adomain: ['test.adomain.tld']
+          }
+        };
+
+        let bidRequests = [
+          {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123',
+              requestUrl: ENDPOINT_URL
+            }
+          }
+        ];
+        let bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
+        expect(bids).to.be.lengthOf(1);
+        expect(bids[0].cpm).to.equal(serverResponse.body.cpm);
+        expect(bids[0].width).to.equal(serverResponse.body.width);
+        expect(bids[0].height).to.equal(serverResponse.body.height);
+        expect(bids[0].currency).to.equal('USD');
+        expect(bids[0].netRevenue).to.equal(true);
+        expect(bids[0].adUrl).to.have.length.above(1);
+        expect(bids[0].adUrl).to.have.string('https://orbitsoft.com/php/ads/hb.html');
+        expect(Object.keys(bids[0].meta)).to.include.members(['advertiserDomains']);
+        expect(bids[0].meta.advertiserDomains).to.deep.equal(serverResponse.body.adomain);
+      });
+
+      it('should return empty bid response', function () {
+        let bidRequests = [
+          {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123',
+              requestUrl: ENDPOINT_URL
+            }
+          }
+        ];
+        let serverResponse = {
+            body: {
+              callback_uid: '265b29b70cc106',
+              cpm: 0
+            }
+          },
+          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
+
+        expect(bids).to.be.lengthOf(0);
+      });
+
+      it('should return empty bid response on incorrect size', function () {
+        let bidRequests = [
+          {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123',
+              requestUrl: ENDPOINT_URL
+            }
+          }
+        ];
+        let serverResponse = {
+            body: {
+              callback_uid: '265b29b70cc106',
+              cpm: 1.5,
+              width: 0,
+              height: 0
+            }
+          },
+          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
+
+        expect(bids).to.be.lengthOf(0);
+      });
+
+      it('should return empty bid response with error', function () {
+        let bidRequests = [
+          {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123',
+              requestUrl: ENDPOINT_URL
+            }
+          }
+        ];
+        let serverResponse = {error: 'error'},
+          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
+
+        expect(bids).to.be.lengthOf(0);
+      });
+
+      it('should return empty bid response on empty body', function () {
+        let bidRequests = [
+          {
+            bidder: 'orbitsoft',
+            params: {
+              placementId: '123',
+              requestUrl: ENDPOINT_URL
+            }
+          }
+        ];
+        let serverResponse = {},
+          bids = spec.interpretResponse(serverResponse, {'bidRequest': bidRequests[0]});
+
+        expect(bids).to.be.lengthOf(0);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/otmBidAdapter_spec.js b/test/spec/modules/otmBidAdapter_spec.js
index 8ac01c1657e..27da17b8415 100644
--- a/test/spec/modules/otmBidAdapter_spec.js
+++ b/test/spec/modules/otmBidAdapter_spec.js
@@ -1,8 +1,8 @@
 import {expect} from 'chai';
-import {spec} from 'modules/otmBidAdapter.js';
+import {spec} from 'modules/otmBidAdapter';
 
-describe('otmBidAdapterTests', function () {
-  it('validate_pub_params', function () {
+describe('otmBidAdapter', function () {
+  it('pub_params', function () {
     expect(spec.isBidRequestValid({
       bidder: 'otm',
       params: {
@@ -12,69 +12,52 @@ describe('otmBidAdapterTests', 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('validate_best_size_select', function () {
-    // when:
-    let bidRequestData = [{
+  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: [[300, 500], [300, 600], [240, 400], [300, 50]]
+      sizes: [[240, 400]]
     }];
 
-    let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
-
-    // then:
-    expect(req_data.w).to.equal(240);
-    expect(req_data.h).to.equal(400);
-
-    // when:
-    bidRequestData = [{
-      bidId: 'bid1234',
-      bidder: 'otm',
-      params: {
-        tid: '123',
-        bidfloor: 20
-      },
-      sizes: [[200, 240], [400, 440]]
-    }];
+    const bidderRequest = {refererInfo: {page: `https://github.com:3000/`, domain: 'github.com:3000'}}
 
-    request = spec.buildRequests(bidRequestData);
-    req_data = request[0].data;
+    const request = spec.buildRequests(bidRequestData, bidderRequest);
+    const req_data = request[0].data;
 
-    // then:
-    expect(req_data.w).to.equal(200);
-    expect(req_data.h).to.equal(240);
+    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',
@@ -91,9 +74,9 @@ describe('otmBidAdapterTests', 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/outbrainBidAdapter_spec.js b/test/spec/modules/outbrainBidAdapter_spec.js
new file mode 100644
index 00000000000..5d7bebc1de1
--- /dev/null
+++ b/test/spec/modules/outbrainBidAdapter_spec.js
@@ -0,0 +1,691 @@
+import {expect} from 'chai';
+import {spec} from 'modules/outbrainBidAdapter.js';
+import {config} from 'src/config.js';
+import {server} from 'test/mocks/xhr';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+describe('Outbrain Adapter', function () {
+  describe('Bid request and response', function () {
+    const commonBidRequest = {
+      bidder: 'outbrain',
+      params: {
+        publisher: {
+          id: 'publisher-id'
+        },
+      },
+      bidId: '2d6815a92ba1ba',
+      auctionId: '12043683-3254-4f74-8934-f941b085579e',
+    }
+    const nativeBidRequestParams = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [
+            120,
+            100
+          ],
+          sendId: true
+        },
+        title: {
+          required: true,
+          sendId: true
+        },
+        sponsoredBy: {
+          required: false
+        }
+      },
+    }
+
+    const displayBidRequestParams = {
+      sizes: [
+        [
+          300,
+          250
+        ]
+      ]
+    }
+
+    describe('isBidRequestValid', function () {
+      before(() => {
+        config.setConfig({
+          outbrain: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      it('should fail when bid is invalid', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should succeed when bid contains native params', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should succeed when bid contains sizes', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...displayBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should fail if publisher id is not set', function () {
+        const bid = {
+          bidder: 'outbrain',
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should fail if tag id is not string', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            tagid: 123
+          },
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should fail if badv does not include strings', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            tagid: 123,
+            badv: ['a', 2, 'c']
+          },
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should fail if bcat does not include strings', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            tagid: 123,
+            bcat: ['a', 2, 'c']
+          },
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should succeed with outbrain config', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        config.setConfig({
+          outbrain: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        })
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should fail if bidder url is not set', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+    })
+
+    describe('buildRequests', function () {
+      before(() => {
+        config.setConfig({
+          outbrain: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      const commonBidderRequest = {
+        refererInfo: {
+          page: 'https://example.com/'
+        }
+      }
+
+      it('should build native request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const expectedNativeAssets = {
+          assets: [
+            {
+              required: 1,
+              id: 3,
+              img: {
+                type: 3,
+                w: 120,
+                h: 100
+              }
+            },
+            {
+              required: 1,
+              id: 0,
+              title: {}
+            },
+            {
+              required: 0,
+              id: 5,
+              data: {
+                type: 1
+              }
+            }
+          ]
+        }
+        const expectedData = {
+          site: {
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          device: {
+            ua: navigator.userAgent
+          },
+          source: {
+            fd: 1
+          },
+          cur: [
+            'USD'
+          ],
+          imp: [
+            {
+              id: '1',
+              native: {
+                request: JSON.stringify(expectedNativeAssets)
+              }
+            }
+          ],
+          ext: {
+            prebid: {
+              channel: {
+                name: 'pbjs', version: '$prebid.version$'
+              }
+            }
+          }
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://bidder-url.com')
+        expect(res.data).to.deep.equal(JSON.stringify(expectedData))
+      });
+
+      it('should build display request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...displayBidRequestParams,
+        }
+        const expectedData = {
+          site: {
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          device: {
+            ua: navigator.userAgent
+          },
+          source: {
+            fd: 1
+          },
+          cur: [
+            'USD'
+          ],
+          imp: [
+            {
+              id: '1',
+              banner: {
+                format: [
+                  {
+                    w: 300,
+                    h: 250
+                  }
+                ]
+              }
+            }
+          ],
+          ext: {
+            prebid: {
+              channel: {
+                name: 'pbjs', version: '$prebid.version$'
+              }
+            }
+          }
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://bidder-url.com')
+        expect(res.data).to.deep.equal(JSON.stringify(expectedData))
+      })
+
+      it('should pass optional parameters in request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        bidRequest.params.tagid = 'test-tag'
+        bidRequest.params.publisher.name = 'test-publisher'
+        bidRequest.params.publisher.domain = 'test-publisher.com'
+        bidRequest.params.bcat = ['bad-category']
+        bidRequest.params.badv = ['bad-advertiser']
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.imp[0].tagid).to.equal('test-tag')
+        expect(resData.site.publisher.name).to.equal('test-publisher')
+        expect(resData.site.publisher.domain).to.equal('test-publisher.com')
+        expect(resData.bcat).to.deep.equal(['bad-category'])
+        expect(resData.badv).to.deep.equal(['bad-advertiser'])
+      });
+
+      it('first party data', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ortb2: {
+            bcat: ['IAB1', 'IAB2-1'],
+            badv: ['domain1.com', 'domain2.com'],
+            wlang: ['en'],
+          },
+          ...commonBidderRequest,
+        }
+
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.bcat).to.deep.equal(bidderRequest.ortb2.bcat)
+        expect(resData.badv).to.deep.equal(bidderRequest.ortb2.badv)
+        expect(resData.wlang).to.deep.equal(bidderRequest.ortb2.wlang)
+      });
+
+      it('should pass bidder timeout', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          timeout: 500
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.tmax).to.equal(500)
+      });
+
+      it('should pass GDPR consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentString',
+          }
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.user.ext.consent).to.equal('consentString')
+        expect(resData.regs.ext.gdpr).to.equal(1)
+      });
+
+      it('should pass us privacy consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          uspConsent: 'consentString'
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.ext.us_privacy).to.equal('consentString')
+      });
+
+      it('should pass coppa consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        config.setConfig({coppa: true})
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.coppa).to.equal(1)
+
+        config.resetConfig()
+      });
+
+      it('should pass extended ids', function () {
+        let bidRequest = {
+          bidId: 'bidId',
+          params: {},
+          userIdAsEids: createEidsArray({
+            idl_env: 'id-value',
+          }),
+          ...commonBidRequest,
+        };
+
+        let res = spec.buildRequests([bidRequest], commonBidderRequest);
+        const resData = JSON.parse(res.data)
+        expect(resData.user.ext.eids).to.deep.equal([
+          {source: 'liveramp.com', uids: [{id: 'id-value', atype: 3}]}
+        ]);
+      });
+
+      it('should pass bidfloor', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        bidRequest.getFloor = function() {
+          return {
+            currency: 'USD',
+            floor: 1.23,
+          }
+        }
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.imp[0].bidfloor).to.equal(1.23)
+      });
+
+      it('should transform string sizes to numbers', function () {
+        let bidRequest = {
+          bidId: 'bidId',
+          params: {},
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        };
+        bidRequest.nativeParams.image.sizes = ['120', '100']
+
+        const expectedNativeAssets = {
+          assets: [
+            {
+              required: 1,
+              id: 3,
+              img: {
+                type: 3,
+                w: 120,
+                h: 100
+              }
+            },
+            {
+              required: 1,
+              id: 0,
+              title: {}
+            },
+            {
+              required: 0,
+              id: 5,
+              data: {
+                type: 1
+              }
+            }
+          ]
+        }
+
+        let res = spec.buildRequests([bidRequest], commonBidderRequest);
+        const resData = JSON.parse(res.data)
+        expect(resData.imp[0].native.request).to.equal(JSON.stringify(expectedNativeAssets));
+      });
+    })
+
+    describe('interpretResponse', function () {
+      it('should return empty array if no valid bids', function () {
+        const res = spec.interpretResponse({}, [])
+        expect(res).to.be.an('array').that.is.empty
+      });
+
+      it('should interpret native response', function () {
+        const serverResponse = {
+          body: {
+            id: '0a73e68c-9967-4391-b01b-dda2d9fc54e4',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: '82822cf5-259c-11eb-8a52-f29e5275aa57',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '{"ver":"1.2","assets":[{"id":3,"required":1,"img":{"url":"http://example.com/img/url","w":120,"h":100}},{"id":0,"required":1,"title":{"text":"Test title"}},{"id":5,"data":{"value":"Test sponsor"}}],"privacy":"http://example.com/privacy","link":{"url":"http://example.com/click/url"},"eventtrackers":[{"event":1,"method":1,"url":"http://example.com/impression"}]}',
+                    adomain: [
+                      'example.com'
+                    ],
+                    cid: '3487171',
+                    crid: '28023739',
+                    cat: [
+                      'IAB10-2'
+                    ]
+                  }
+                ],
+                seat: 'acc-5537'
+              }
+            ],
+            bidid: '82822cf5-259c-11eb-8a52-b48e7518c657',
+            cur: 'USD'
+          },
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...nativeBidRequestParams,
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '28023739',
+            ttl: 360,
+            netRevenue: false,
+            currency: 'USD',
+            mediaType: 'native',
+            nurl: 'http://example.com/win/${AUCTION_PRICE}',
+            meta: {
+              'advertiserDomains': [
+                'example.com'
+              ]
+            },
+            native: {
+              clickTrackers: undefined,
+              clickUrl: 'http://example.com/click/url',
+              image: {
+                url: 'http://example.com/img/url',
+                width: 120,
+                height: 100
+              },
+              title: 'Test title',
+              sponsoredBy: 'Test sponsor',
+              impressionTrackers: [
+                'http://example.com/impression',
+              ],
+              privacyLink: 'http://example.com/privacy'
+            }
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+
+      it('should interpret display response', function () {
+        const serverResponse = {
+          body: {
+            id: '6b2eedc8-8ff5-46ef-adcf-e701b508943e',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: 'd90fe7fa-28d7-11eb-8ce4-462a842a7cf9',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '<div>ad</div>',
+                    adomain: [
+                      'example.com'
+                    ],
+                    cid: '3865084',
+                    crid: '29998660',
+                    cat: [
+                      'IAB10-2'
+                    ],
+                    w: 300,
+                    h: 250
+                  }
+                ],
+                seat: 'acc-6536'
+              }
+            ],
+            bidid: 'd90fe7fa-28d7-11eb-8ce4-13d94bfa26f9',
+            cur: 'USD'
+          }
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...displayBidRequestParams
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '29998660',
+            ttl: 360,
+            netRevenue: false,
+            currency: 'USD',
+            mediaType: 'banner',
+            nurl: 'http://example.com/win/${AUCTION_PRICE}',
+            ad: '<div>ad</div>',
+            width: 300,
+            height: 250,
+            meta: {
+              'advertiserDomains': [
+                'example.com'
+              ]
+            },
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+    })
+  })
+
+  describe('getUserSyncs', function () {
+    const usersyncUrl = 'https://usersync-url.com';
+    beforeEach(() => {
+      config.setConfig({
+        outbrain: {
+          usersyncUrl: usersyncUrl,
+        }
+      }
+      )
+    })
+    after(() => {
+      config.resetConfig()
+    })
+
+    it('should return user sync if pixel enabled with outbrain config', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.deep.equal([{type: 'image', url: usersyncUrl}])
+    })
+
+    it('should not return user sync if pixel disabled', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: false})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+
+    it('should not return user sync if url is not set', function () {
+      config.resetConfig()
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.be.an('array').that.is.empty
+    })
+
+    it('should pass GDPR consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: false, consentString: 'foo'}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=0&gdpr_consent=foo`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: undefined}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=`
+      }]);
+    });
+
+    it('should pass US consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, '1NYN')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?us_privacy=1NYN`
+      }]);
+    });
+
+    it('should pass GDPR and US consent', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'foo'}, '1NYN')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo&us_privacy=1NYN`
+      }]);
+    });
+  })
+
+  describe('onBidWon', function () {
+    it('should make an ajax call with the original cpm', function () {
+      const bid = {
+        nurl: 'http://example.com/win/${AUCTION_PRICE}',
+        cpm: 2.1,
+        originalCpm: 1.1,
+      }
+      spec.onBidWon(bid)
+      expect(server.requests[0].url).to.equals('http://example.com/win/1.1')
+    });
+  })
+})
diff --git a/test/spec/modules/outconBidAdapter_spec.js b/test/spec/modules/outconBidAdapter_spec.js
deleted file mode 100644
index 81c3fdded62..00000000000
--- a/test/spec/modules/outconBidAdapter_spec.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import { expect } from 'chai';
-import { spec } from '../../../modules/outconBidAdapter.js';
-
-describe('outconBidAdapter', function () {
-  describe('bidRequestValidity', function () {
-    it('Check the bidRequest with pod param', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'outcon',
-        params: {
-          pod: '5d603538eba7192ae14e39a4',
-          env: 'test'
-        }
-      })).to.equal(true);
-    });
-    it('Check the bidRequest with internalID and publisherID params', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'outcon',
-        params: {
-          internalId: '12345678',
-          publisher: '5d5d66f2306ea4114a37c7c2',
-          env: 'test'
-        }
-      })).to.equal(true);
-    });
-  });
-  describe('buildRequests', function () {
-    it('Build requests with pod param', function () {
-      expect(spec.buildRequests([{
-        bidder: 'outcon',
-        params: {
-          pod: '5d603538eba7192ae14e39a4',
-          env: 'test'
-        }
-      }])).to.have.keys('method', 'url', 'data');
-    });
-    it('Build requests with internalID and publisherID params', function () {
-      expect(spec.buildRequests([{
-        bidder: 'outcon',
-        params: {
-          internalId: '12345678',
-          publisher: '5d5d66f2306ea4114a37c7c2',
-          env: 'test'
-        }
-      }])).to.have.keys('method', 'url', 'data');
-    });
-  });
-  describe('interpretResponse', function () {
-    const bidRequest = {
-      method: 'GET',
-      url: 'https://test.outcondigital.com/ad/',
-      data: {
-        pod: '5d603538eba7192ae14e39a4',
-        env: 'test',
-        vast: 'true'
-      }
-    };
-    const bidResponse = {
-      body: {
-        cpm: 0.10,
-        cur: 'USD',
-        exp: 10,
-        creatives: [
-          {
-            url: 'https://test.outcondigital.com/uploads/5d42e7a7306ea4689b67c122/frutas.mp4',
-            size: 3,
-            width: 1920,
-            height: 1080,
-            codec: 'video/mp4'
-          }
-        ],
-        ad: '5d6e6aef22063e392bf7f564',
-        type: 'video',
-        campaign: '5d42e44b306ea469593c76a2',
-        trackingURL: 'https://test.outcondigital.com/ad/track?track=5d6e6aef22063e392bf7f564',
-        vastURL: 'https://test.outcondigital.com/outcon.xml?impression=5d6e6aef22063e392bf7f564&demo=true'
-      },
-    };
-    it('check all the keys that are needed to interpret the response', function () {
-      const result = spec.interpretResponse(bidResponse, bidRequest);
-      let requiredKeys = [
-        'requestId',
-        'cpm',
-        'width',
-        'height',
-        'creativeId',
-        'currency',
-        'netRevenue',
-        'ttl',
-        'ad',
-        'vastImpUrl',
-        'mediaType',
-        'vastUrl'
-      ];
-      let resultKeys = Object.keys(result[0]);
-      resultKeys.forEach(function(key) {
-        expect(requiredKeys.indexOf(key) !== -1).to.equal(true);
-      });
-    })
-  });
-});
diff --git a/test/spec/modules/oxxionRtdProvider_spec.js b/test/spec/modules/oxxionRtdProvider_spec.js
new file mode 100644
index 00000000000..776076cc215
--- /dev/null
+++ b/test/spec/modules/oxxionRtdProvider_spec.js
@@ -0,0 +1,142 @@
+import {oxxionSubmodule} from 'modules/oxxionRtdProvider.js';
+import 'src/prebid.js';
+
+const utils = require('src/utils.js');
+
+const moduleConfig = {
+  params: {
+    domain: 'test.endpoint',
+    contexts: ['instream', 'outstream']
+  }
+};
+
+let request = {
+  'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+  'timestamp': 1647424261187,
+  'auctionEnd': 1647424261714,
+  'auctionStatus': 'completed',
+  'adUnits': [
+    {
+      'code': 'msq_tag_200124_banner',
+      'mediaTypes': { 'banner': { 'sizes': [[300, 600]] } },
+      'bids': [{'bidder': 'appnexus', 'params': {'placementId': 123456}}],
+      'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b40'
+    },
+    {
+      'code': 'msq_tag_200125_video',
+      'mediaTypes': { 'video': { 'context': 'instream' }, playerSize: [640, 480], mimes: ['video/mp4'] },
+      'bids': [
+        {'bidder': 'mediasquare', 'params': {'code': 'publishername_atf_desktop_rg_video', 'owner': 'test'}},
+        {'bidder': 'appnexusAst', 'params': {'placementId': 345678}},
+      ],
+      'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b41'
+    },
+  ]
+};
+
+let bids = [{
+  'bidderCode': 'mediasquare',
+  'width': 640,
+  'height': 480,
+  'statusMessage': 'Bid available',
+  'adId': '3647626fdbe68a',
+  'requestId': '2d891705d2125b',
+  'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b41',
+  'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+  'mediaType': 'video',
+  'source': 'client',
+  'cpm': 0.9723,
+  'creativeId': 'freewheel|AdswizzAd71819',
+  'currency': 'USD',
+  'netRevenue': true,
+  'ttl': 2000,
+  'mediasquare': {
+    'bidder': 'freewheel',
+    'code': 'test/publishername_atf_desktop_rg_video',
+    'hasConsent': true
+  },
+  'meta': {
+    'advertiserDomains': [
+      'unknown'
+    ]
+  },
+  'vastUrl': 'https://some.vast-url.com',
+  'vastXml': '<VAST version="3.0"><Ad><Wrapper><VASTAdTagURI><![CDATA[https://pbs-front.mediasquare.fr/cache?uuid=4de68767e8f2f9974fd4addd5a9d135a]]></VASTAdTagURI><Impression><![CDATA[https://pbs-front.mediasquare.fr/winning?adUnitCode=&auctionId=ZltsQnBqbcyC6aalwAdD4irnXmrl3E&bidder=freewheel&code=test/publishername_atf_desktop_rg_video&cpm=0.9723&creativeId=AdswizzAd71819&currency=USD&hasConsent=true&mediaType=video&pbjs=&requestId=2d891705d2125b&size=video&timeToRespond=unknown]]></Impression></Wrapper></Ad></VAST>',
+  'adapterCode': 'mediasquare',
+  'originalCpm': 0.9723,
+  'originalCurrency': 'USD',
+  'responseTimestamp': 1665505150740,
+  'requestTimestamp': 1665505150594,
+  'bidder': 'mediasquare',
+  'adUnitCode': 'msq_tag_200125_video',
+  'timeToRespond': 146,
+  'size': '640x480',
+}, {
+  'bidderCode': 'appnexusAst',
+  'width': 640,
+  'height': 480,
+  'statusMessage': 'Bid available',
+  'adId': '4b2e1581c0ca1a',
+  'requestId': '2d891705d2125b',
+  'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b41',
+  'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+  'mediaType': 'video',
+  'source': 'client',
+  'cpm': 1.9723,
+  'creativeId': '159080650',
+  'currency': 'USD',
+  'netRevenue': true,
+  'ttl': 2000,
+  'vastUrl': 'https://some.vast-url.com',
+  'vastXml': '<VAST version="3.0"><Ad><InLine><AdSystem>Adnxs</AdSystem><AdTitle>Title</AdTitle><Creatives/></InLine></Ad></VAST>',
+  'adapterCode': 'mediasquare',
+  'originalCpm': 1.9723,
+  'originalCurrency': 'USD',
+  'responseTimestamp': 1665505150740,
+  'requestTimestamp': 1665505150594,
+  'bidder': 'appnexusAst',
+  'adUnitCode': 'msq_tag_200125_video',
+  'timeToRespond': 146,
+  'size': '640x480',
+  'vastImpUrl': 'https://some.tracking-url.com'
+},
+];
+
+describe('oxxionRtdProvider', () => {
+  describe('Oxxion RTD sub module', () => {
+    it('should init, return true, and set the params', () => {
+      expect(oxxionSubmodule.init(moduleConfig)).to.equal(true);
+    });
+  });
+
+  describe('Oxxion RTD sub module', () => {
+    let auctionEnd = request;
+    auctionEnd.bidsReceived = bids;
+    it('call everything', function() {
+      oxxionSubmodule.getBidRequestData(request, null, moduleConfig);
+      oxxionSubmodule.onAuctionEndEvent(auctionEnd, moduleConfig);
+    });
+    it('check vastImpUrl', function() {
+      expect(auctionEnd.bidsReceived[0]).to.have.property('vastImpUrl');
+      let expectVastImpUrl = 'https://' + moduleConfig.params.domain + '.oxxion.io/analytics/vast_imp?';
+      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(expectVastImpUrl);
+      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(encodeURI('https://some.tracking-url.com'));
+    });
+    it('check vastXml', function() {
+      expect(auctionEnd.bidsReceived[0]).to.have.property('vastXml');
+      let vastWrapper = new DOMParser().parseFromString(auctionEnd.bidsReceived[0].vastXml, 'text/xml');
+      let impressions = vastWrapper.querySelectorAll('VAST Ad Wrapper Impression');
+      expect(impressions.length).to.equal(2);
+      expect(auctionEnd.bidsReceived[1]).to.have.property('vastXml');
+      expect(auctionEnd.bidsReceived[1].adId).to.equal('4b2e1581c0ca1a');
+      let vastInline = new DOMParser().parseFromString(auctionEnd.bidsReceived[1].vastXml, 'text/xml');
+      let inline = vastInline.querySelectorAll('VAST Ad InLine');
+      expect(inline).to.have.lengthOf(1);
+      let inlineImpressions = vastInline.querySelectorAll('VAST Ad InLine Impression');
+      expect(inlineImpressions).to.have.lengthOf.above(0);
+    });
+    it('check cpmIncrement', function() {
+      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(encodeURI('cpmIncrement=1'));
+    });
+  });
+});
diff --git a/test/spec/modules/ozoneBidAdapter_spec.js b/test/spec/modules/ozoneBidAdapter_spec.js
index c8a636efb4c..4c7e330b237 100644
--- a/test/spec/modules/ozoneBidAdapter_spec.js
+++ b/test/spec/modules/ozoneBidAdapter_spec.js
@@ -6,12 +6,7 @@ import {getGranularityKeyName, getGranularityObject} from '../../../modules/ozon
 import * as utils from '../../../src/utils.js';
 const OZONEURI = 'https://elb.the-ozone-project.com/openrtb2/auction';
 const BIDDER_CODE = 'ozone';
-/*
 
-NOTE - use firefox console to deep copy the objects to use here
-
- */
-var originalPropertyBag = {'lotameWasOverridden': 0, 'pageId': null};
 var validBidRequests = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -21,7 +16,21 @@ var validBidRequests = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsNoCustomData = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'ozone',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -36,7 +45,7 @@ var validBidRequestsMulti = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   },
@@ -49,7 +58,7 @@ var validBidRequestsMulti = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c0',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -63,10 +72,75 @@ var validBidRequestsWithUserIdData = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87',
-    userId: {'pubcid': '12345678', 'id5id': 'ID5-someId', 'criteortus': {'ozone': {'userid': 'critId123'}}, 'idl_env': 'liverampId', 'lipb': {'lipbid': 'lipbidId123'}, 'parrableid': 'parrableid123'}
+    userId: {
+      'pubcid': '12345678',
+      'tdid': '1111tdid',
+      'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+      'criteoId': '1111criteoId',
+      'idl_env': 'liverampId',
+      'lipb': {'lipbid': 'lipbidId123'},
+      'parrableId': {'eid': '01.5678.parrableid'},
+      'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
+    },
+    userIdAsEids: [
+      {
+        'source': 'pubcid.org',
+        'uids': [
+          {
+            'id': '12345678',
+            'atype': 1
+          }
+        ]
+      },
+      {
+        'source': 'adserver.org',
+        'uids': [{
+          'id': '1111tdid',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      },
+      {
+        'source': 'id5-sync.com',
+        'uids': [{
+          'id': 'ID5-someId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'criteoId',
+        'uids': [{
+          'id': '1111criteoId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'idl_env',
+        'uids': [{
+          'id': 'liverampId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'lipb',
+        'uids': [{
+          'id': {'lipbid': 'lipbidId123'},
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'parrableId',
+        'uids': [{
+          'id': {'eid': '01.5678.parrableid'},
+          'atype': 1,
+        }]
+      }
+    ]
   }
 ];
 var validBidRequestsMinimal = [
@@ -91,11 +165,10 @@ var validBidRequestsNoSizes = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
-
 var validBidRequestsWithBannerMediaType = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -105,7 +178,7 @@ var validBidRequestsWithBannerMediaType = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     mediaTypes: {banner: {sizes: [[300, 250], [300, 600]]}},
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -119,12 +192,11 @@ var validBidRequestsWithNonBannerMediaTypesAndValidOutstreamVideo = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, video: {skippable: true, playback_method: ['auto_play_sound_off'], targetDiv: 'some-different-div-id-to-my-adunitcode'} } ] },
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, video: {skippable: true, playback_method: ['auto_play_sound_off'], targetDiv: 'some-different-div-id-to-my-adunitcode'} } ] },
     mediaTypes: {video: {mimes: ['video/mp4'], 'context': 'outstream', 'sizes': [640, 480], playerSize: [640, 480]}, native: {info: 'dummy data'}},
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
-
 var validBidRequests1OutstreamVideo2020 = [
   {
     'bidder': 'ozone',
@@ -161,43 +233,21 @@ var validBidRequests1OutstreamVideo2020 = [
           }
         }
       ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
+      'userId': {
+        'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
+      },
+      'userIdAsEids': [
+        {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56',
+              'atype': 1
+            }
+          ]
         }
-      }
-    },
-    'userId': {
-      'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
+      ]
     },
-    'userIdAsEids': [
-      {
-        'source': 'pubcid.org',
-        'uids': [
-          {
-            'id': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56',
-            'atype': 1
-          }
-        ]
-      }
-    ],
     'mediaTypes': {
       'video': {
         'playerSize': [
@@ -229,8 +279,6 @@ var validBidRequests1OutstreamVideo2020 = [
     'bidderWinsCount': 0
   }
 ];
-
-// WHEN sent as bidderRequest to buildRequests you should send the child: .bidderRequest
 var validBidderRequest1OutstreamVideo2020 = {
   bidderRequest: {
     auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
@@ -272,32 +320,10 @@ var validBidderRequest1OutstreamVideo2020 = {
                 'pt9': '|k0xw2vqzp33kklb3j5w4|||'
               }
             }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
-            }
-          }
+          ]
         },
         'userId': {
-          'id5id': 'ID5-ZHMOpSv9CkZNiNd1oR4zc62AzCgSS73fPjmQ6Od7OA',
+          'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
           'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
         },
         'userIdAsEids': [
@@ -355,91 +381,80 @@ var validBidderRequest1OutstreamVideo2020 = {
     timeout: 3000
   }
 };
-// WHEN sent as bidderRequest to buildRequests you should send the child: .bidderRequest
 var validBidderRequest = {
-  bidderRequest: {
+  auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+  auctionStart: 1536838908986,
+  bidderCode: 'ozone',
+  bidderRequestId: '1c1586b27a1b5c8',
+  bids: [{
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
     auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
-    auctionStart: 1536838908986,
-    bidderCode: 'ozone',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
-    bids: [{
-      adUnitCode: 'div-gpt-ad-1460505748561-0',
-      auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
-      bidId: '2899ec066a91ff8',
-      bidRequestsCount: 1,
-      bidder: 'ozone',
-      bidderRequestId: '1c1586b27a1b5c8',
-      crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
-      sizes: [[300, 250], [300, 600]],
-      transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
-    }],
-    doneCbCallCount: 1,
-    start: 1536838908987,
-    timeout: 3000
-  }
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }],
+  doneCbCallCount: 1,
+  start: 1536838908987,
+  timeout: 3000
 };
-
-// bidder request with GDPR - change the values for testing:
-// gdprConsent.gdprApplies (true/false)
-// gdprConsent.vendorData.purposeConsents (make empty, make null, remove it)
-// gdprConsent.vendorData.vendorConsents (remove 524, remove all, make the element null, remove it)
-// WHEN sent as bidderRequest to buildRequests you should send the child: .bidderRequest
 var bidderRequestWithFullGdpr = {
-  bidderRequest: {
+  auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+  auctionStart: 1536838908986,
+  bidderCode: 'ozone',
+  bidderRequestId: '1c1586b27a1b5c8',
+  bids: [{
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
     auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
-    auctionStart: 1536838908986,
-    bidderCode: 'ozone',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
-    bids: [{
-      adUnitCode: 'div-gpt-ad-1460505748561-0',
-      auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
-      bidId: '2899ec066a91ff8',
-      bidRequestsCount: 1,
-      bidder: 'ozone',
-      bidderRequestId: '1c1586b27a1b5c8',
-      crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
-      sizes: [[300, 250], [300, 600]],
-      transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
-    }],
-    doneCbCallCount: 1,
-    start: 1536838908987,
-    timeout: 3000,
-    gdprConsent: {
-      'consentString': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
-      'vendorData': {
-        'metadata': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
-        'gdprApplies': true,
-        'hasGlobalScope': false,
-        'cookieVersion': '1',
-        'created': '2019-05-31T12:46:48.825',
-        'lastUpdated': '2019-05-31T12:46:48.825',
-        'cmpId': '28',
-        'cmpVersion': '1',
-        'consentLanguage': 'en',
-        'consentScreen': '1',
-        'vendorListVersion': 148,
-        'maxVendorId': 631,
-        'purposeConsents': {
-          '1': true,
-          '2': true,
-          '3': true,
-          '4': true,
-          '5': true
-        },
-        'vendorConsents': {
-          '468': true,
-          '522': true,
-          '524': true, /* 524 is ozone */
-          '565': true,
-          '591': true
-        }
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }],
+  doneCbCallCount: 1,
+  start: 1536838908987,
+  timeout: 3000,
+  gdprConsent: {
+    'consentString': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
+    'vendorData': {
+      'metadata': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
+      'gdprApplies': true,
+      'hasGlobalScope': false,
+      'cookieVersion': '1',
+      'created': '2019-05-31T12:46:48.825',
+      'lastUpdated': '2019-05-31T12:46:48.825',
+      'cmpId': '28',
+      'cmpVersion': '1',
+      'consentLanguage': 'en',
+      'consentScreen': '1',
+      'vendorListVersion': 148,
+      'maxVendorId': 631,
+      'purposeConsents': {
+        '1': true,
+        '2': true,
+        '3': true,
+        '4': true,
+        '5': true
       },
-      'gdprApplies': true
-    }, }
+      'vendorConsents': {
+        '468': true,
+        '522': true,
+        '524': true, /* 524 is ozone */
+        '565': true,
+        '591': true
+      }
+    },
+    'gdprApplies': true
+  }
 };
-
 var gdpr1 = {
   'consentString': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
   'vendorData': {
@@ -472,8 +487,6 @@ var gdpr1 = {
   },
   'gdprApplies': true
 };
-
-// simulating the Mirror
 var bidderRequestWithPartialGdpr = {
   bidderRequest: {
     auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
@@ -491,17 +504,6 @@ var bidderRequestWithPartialGdpr = {
       params: {
         publisherId: '9876abcd12-3',
         customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}],
-        lotameData: {
-          'Profile': {
-            'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4',
-            'Audiences': {
-              'Audience': [{'id': '99999', 'abbr': 'sports'}, {
-                'id': '88888',
-                'abbr': 'movie'
-              }, {'id': '77777', 'abbr': 'blogger'}]
-            }
-          }
-        },
         placementId: '1310000099',
         siteId: '1234567890',
         id: 'fea37168-78f1-4a23-a40e-88437a99377e',
@@ -529,8 +531,6 @@ var bidderRequestWithPartialGdpr = {
     }
   }
 };
-
-// make sure the impid matches the request bidId
 var validResponse = {
   'body': {
     'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
@@ -587,7 +587,6 @@ var validResponse = {
   },
   'headers': {}
 };
-
 var validResponse2Bids = {
   'body': {
     'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
@@ -674,9 +673,6 @@ var validResponse2Bids = {
   },
   'headers': {}
 };
-/*
-A bidder returns a bid for both sizes in an adunit
- */
 var validResponse2BidsSameAdunit = {
   'body': {
     'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
@@ -763,14 +759,6 @@ var validResponse2BidsSameAdunit = {
   },
   'headers': {}
 };
-/*
-
-SPECIAL CONSIDERATION FOR VIDEO TESTS:
-
-DO NOT USE _validVideoResponse directly - the interpretResponse function will modify it (adding a renderer!!!) so all
-subsequent calls will already have a renderer attached!!!
-
-*/
 function getCleanValidVideoResponse() {
   return JSON.parse(JSON.stringify(_validVideoResponse));
 }
@@ -856,7 +844,6 @@ var _validVideoResponse = {
   },
   'headers': {}
 };
-
 var validBidResponse1adWith2Bidders = {
   'body': {
     'id': '91221f96-b931-4acc-8f05-c2a1186fa5ac',
@@ -947,11 +934,6 @@ var validBidResponse1adWith2Bidders = {
   },
   'headers': {}
 };
-
-/*
-testing 2 ads, 2 bidders, one bidder bids for both slots in one adunit
- */
-
 var multiRequest1 = [
   {
     'bidder': 'ozone',
@@ -982,29 +964,7 @@ var multiRequest1 = [
             'pt9': '|k0xw2vqzp33kklb3j5w4|||'
           }
         }
-      ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
-        }
-      }
+      ]
     },
     'mediaTypes': {
       'banner': {
@@ -1069,29 +1029,7 @@ var multiRequest1 = [
             'pt9': '|k0xw2vqzp33kklb3j5w4|||'
           }
         }
-      ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
-        }
-      }
+      ]
     },
     'mediaTypes': {
       'banner': {
@@ -1128,227 +1066,178 @@ var multiRequest1 = [
     'bidderWinsCount': 0
   }
 ];
-
-// WHEN sent as bidderRequest to buildRequests you should send the child: .bidderRequest
 var multiBidderRequest1 = {
-  bidderRequest: {
-    'bidderCode': 'ozone',
-    'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
-    'bidderRequestId': '1d03a1dfc563fc',
-    'bids': [
-      {
-        'bidder': 'ozone',
-        'params': {
-          'publisherId': 'OZONERUP0001',
-          'siteId': '4204204201',
-          'placementId': '0420420421',
-          'customData': [
-            {
-              'settings': {},
-              'targeting': {
-                'sens': 'f',
-                'pt1': '/uk',
-                'pt2': 'uk',
-                'pt3': 'network-front',
-                'pt4': 'ng',
-                'pt5': [
-                  'uk'
-                ],
-                'pt7': 'desktop',
-                'pt8': [
-                  'tfmqxwj7q',
-                  'txeh7uyo0',
-                  't8nxz6qzd',
-                  't8nyiude5',
-                  'sek9ghqwi'
-                ],
-                'pt9': '|k0xw2vqzp33kklb3j5w4|||'
-              }
-            }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
-            }
-          }
-        },
-        'mediaTypes': {
-          'banner': {
-            'sizes': [
-              [
-                300,
-                250
+  'bidderCode': 'ozone',
+  'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+  'bidderRequestId': '1d03a1dfc563fc',
+  'bids': [
+    {
+      'bidder': 'ozone',
+      'params': {
+        'publisherId': 'OZONERUP0001',
+        'siteId': '4204204201',
+        'placementId': '0420420421',
+        'customData': [
+          {
+            'settings': {},
+            'targeting': {
+              'sens': 'f',
+              'pt1': '/uk',
+              'pt2': 'uk',
+              'pt3': 'network-front',
+              'pt4': 'ng',
+              'pt5': [
+                'uk'
               ],
-              [
-                300,
-                600
-              ]
-            ]
-          }
-        },
-        'adUnitCode': 'mpu',
-        'transactionId': '6480bac7-31b5-4723-9145-ad8966660651',
-        'sizes': [
-          [
-            300,
-            250
-          ],
-          [
-            300,
-            600
-          ]
-        ],
-        'bidId': '2d30e86db743a8',
-        'bidderRequestId': '1d03a1dfc563fc',
-        'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
-        'src': 'client',
-        'bidRequestsCount': 1,
-        'bidderRequestsCount': 1,
-        'bidderWinsCount': 0
-      },
-      {
-        'bidder': 'ozone',
-        'params': {
-          'publisherId': 'OZONERUP0001',
-          'siteId': '4204204201',
-          'placementId': '0420420421',
-          'customData': [
-            {
-              'settings': {},
-              'targeting': {
-                'sens': 'f',
-                'pt1': '/uk',
-                'pt2': 'uk',
-                'pt3': 'network-front',
-                'pt4': 'ng',
-                'pt5': [
-                  'uk'
-                ],
-                'pt7': 'desktop',
-                'pt8': [
-                  'tfmqxwj7q',
-                  'penl4dfdk',
-                  't8nxz6qzd',
-                  't8nyiude5',
-                  'sek9ghqwi'
-                ],
-                'pt9': '|k0xw2vqzp33kklb3j5w4|||'
-              }
-            }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
+              'pt7': 'desktop',
+              'pt8': [
+                'tfmqxwj7q',
+                'txeh7uyo0',
+                't8nxz6qzd',
+                't8nyiude5',
+                'sek9ghqwi'
+              ],
+              'pt9': '|k0xw2vqzp33kklb3j5w4|||'
             }
           }
-        },
-        'mediaTypes': {
-          'banner': {
-            'sizes': [
-              [
-                728,
-                90
-              ],
-              [
-                970,
-                250
-              ]
+        ]
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
             ]
-          }
-        },
-        'adUnitCode': 'leaderboard',
-        'transactionId': 'a49988e6-ae7c-46c4-9598-f18db49892a0',
-        'sizes': [
-          [
-            728,
-            90
-          ],
-          [
-            970,
-            250
           ]
+        }
+      },
+      'adUnitCode': 'mpu',
+      'transactionId': '6480bac7-31b5-4723-9145-ad8966660651',
+      'sizes': [
+        [
+          300,
+          250
         ],
-        'bidId': '3025f169863b7f8',
-        'bidderRequestId': '1d03a1dfc563fc',
-        'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
-        'src': 'client',
-        'bidRequestsCount': 1,
-        'bidderRequestsCount': 1,
-        'bidderWinsCount': 0
-      }
-    ],
-    'auctionStart': 1592918645574,
-    'timeout': 3000,
-    'refererInfo': {
-      'referer': 'http://ozone.ardm.io/adapter/2.4.0/620x350-switch.html?guardian=true&pbjs_debug=true',
-      'reachedTop': true,
-      'numIframes': 0,
-      'stack': [
-        'http://ozone.ardm.io/adapter/2.4.0/620x350-switch.html?guardian=true&pbjs_debug=true'
-      ]
+        [
+          300,
+          600
+        ]
+      ],
+      'bidId': '2d30e86db743a8',
+      'bidderRequestId': '1d03a1dfc563fc',
+      'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
     },
-    'gdprConsent': {
-      'consentString': 'BOvy5sFO1dBa2AKAiBENDP-AAAAwVrv7_77-_9f-_f__9uj3Gr_v_f__32ccL5tv3h_7v-_7fi_-0nV4u_1tft9ydk1-5ctDztp507iakiPHmqNeb9n_mz1eZpRP58E09j53z7Ew_v8_v-b7BCPN_Y3v-8K96kA',
-      'vendorData': {
-        'metadata': 'BOvy5sFO1dBa2AKAiBENDPA',
-        'gdprApplies': true,
-        'hasGlobalConsent': false,
-        'hasGlobalScope': false,
-        'purposeConsents': {
-          '1': true,
-          '2': true,
-          '3': true,
-          '4': true,
-          '5': true
-        },
-        'vendorConsents': {
-          '1': true,
-          '2': true,
-          '3': false,
-          '4': true,
-          '5': true
+    {
+      'bidder': 'ozone',
+      'params': {
+        'publisherId': 'OZONERUP0001',
+        'siteId': '4204204201',
+        'placementId': '0420420421',
+        'customData': [
+          {
+            'settings': {},
+            'targeting': {
+              'sens': 'f',
+              'pt1': '/uk',
+              'pt2': 'uk',
+              'pt3': 'network-front',
+              'pt4': 'ng',
+              'pt5': [
+                'uk'
+              ],
+              'pt7': 'desktop',
+              'pt8': [
+                'tfmqxwj7q',
+                'penl4dfdk',
+                't8nxz6qzd',
+                't8nyiude5',
+                'sek9ghqwi'
+              ],
+              'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+            }
+          }
+        ]
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [
+              728,
+              90
+            ],
+            [
+              970,
+              250
+            ]
+          ]
         }
       },
-      'gdprApplies': true
+      'adUnitCode': 'leaderboard',
+      'transactionId': 'a49988e6-ae7c-46c4-9598-f18db49892a0',
+      'sizes': [
+        [
+          728,
+          90
+        ],
+        [
+          970,
+          250
+        ]
+      ],
+      'bidId': '3025f169863b7f8',
+      'bidderRequestId': '1d03a1dfc563fc',
+      'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }
+  ],
+  'auctionStart': 1592918645574,
+  'timeout': 3000,
+  'refererInfo': {
+    'referer': 'http://ozone.ardm.io/adapter/2.4.0/620x350-switch.html?guardian=true&pbjs_debug=true',
+    'reachedTop': true,
+    'numIframes': 0,
+    'stack': [
+      'http://ozone.ardm.io/adapter/2.4.0/620x350-switch.html?guardian=true&pbjs_debug=true'
+    ]
+  },
+  'gdprConsent': {
+    'consentString': 'BOvy5sFO1dBa2AKAiBENDP-AAAAwVrv7_77-_9f-_f__9uj3Gr_v_f__32ccL5tv3h_7v-_7fi_-0nV4u_1tft9ydk1-5ctDztp507iakiPHmqNeb9n_mz1eZpRP58E09j53z7Ew_v8_v-b7BCPN_Y3v-8K96kA',
+    'vendorData': {
+      'metadata': 'BOvy5sFO1dBa2AKAiBENDPA',
+      'gdprApplies': true,
+      'hasGlobalConsent': false,
+      'hasGlobalScope': false,
+      'purposeConsents': {
+        '1': true,
+        '2': true,
+        '3': true,
+        '4': true,
+        '5': true
+      },
+      'vendorConsents': {
+        '1': true,
+        '2': true,
+        '3': false,
+        '4': true,
+        '5': true
+      }
     },
-    'start': 1592918645578
-  }
+    'gdprApplies': true
+  },
+  'start': 1592918645578
 };
-
 var multiResponse1 = {
   'body': {
     'id': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
@@ -1560,14 +1449,8 @@ var multiResponse1 = {
   },
   'headers': {}
 };
-
-/*
---------------------end of 2 slots, 2 ----------------------------
- */
-
 describe('ozone Adapter', function () {
   describe('isBidRequestValid', function () {
-    // A test ad unit that will consistently return test creatives
     let validBidReq = {
       bidder: BIDDER_CODE,
       params: {
@@ -1576,28 +1459,22 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should return true when required params found', function () {
       expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
     });
-
     var validBidReq2 = {
-
       bidder: BIDDER_CODE,
       params: {
         placementId: '1310000099',
         publisherId: '9876abcd12-3',
         siteId: '1234567890',
-        customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}],
-        lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}},
+        customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}]
       },
       siteId: 1234567890
     }
-
     it('should return true when required params found and all optional params are valid', function () {
       expect(spec.isBidRequestValid(validBidReq2)).to.equal(true);
     });
-
     var xEmptyPlacement = {
       bidder: BIDDER_CODE,
       params: {
@@ -1606,11 +1483,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate empty placementId', function () {
       expect(spec.isBidRequestValid(xEmptyPlacement)).to.equal(false);
     });
-
     var xMissingPlacement = {
       bidder: BIDDER_CODE,
       params: {
@@ -1618,11 +1493,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate missing placementId', function () {
       expect(spec.isBidRequestValid(xMissingPlacement)).to.equal(false);
     });
-
     var xBadPlacement = {
       bidder: BIDDER_CODE,
       params: {
@@ -1631,11 +1504,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate placementId with a non-numeric value', function () {
       expect(spec.isBidRequestValid(xBadPlacement)).to.equal(false);
     });
-
     var xBadPlacementTooShort = {
       bidder: BIDDER_CODE,
       params: {
@@ -1644,11 +1515,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate placementId with a numeric value of wrong length', function () {
       expect(spec.isBidRequestValid(xBadPlacementTooShort)).to.equal(false);
     });
-
     var xBadPlacementTooLong = {
       bidder: BIDDER_CODE,
       params: {
@@ -1657,11 +1526,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate placementId with a numeric value of wrong length', function () {
       expect(spec.isBidRequestValid(xBadPlacementTooLong)).to.equal(false);
     });
-
     var xMissingPublisher = {
       bidder: BIDDER_CODE,
       params: {
@@ -1669,11 +1536,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate missing publisherId', function () {
       expect(spec.isBidRequestValid(xMissingPublisher)).to.equal(false);
     });
-
     var xMissingSiteId = {
       bidder: BIDDER_CODE,
       params: {
@@ -1681,11 +1546,9 @@ describe('ozone Adapter', function () {
         placementId: '1234567890',
       }
     };
-
     it('should not validate missing sitetId', function () {
       expect(spec.isBidRequestValid(xMissingSiteId)).to.equal(false);
     });
-
     var xBadPublisherTooShort = {
       bidder: BIDDER_CODE,
       params: {
@@ -1694,11 +1557,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate publisherId being too short', function () {
       expect(spec.isBidRequestValid(xBadPublisherTooShort)).to.equal(false);
     });
-
     var xBadPublisherTooLong = {
       bidder: BIDDER_CODE,
       params: {
@@ -1707,11 +1568,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate publisherId being too long', function () {
       expect(spec.isBidRequestValid(xBadPublisherTooLong)).to.equal(false);
     });
-
     var publisherNumericOk = {
       bidder: BIDDER_CODE,
       params: {
@@ -1720,11 +1579,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should validate publisherId being 12 digits', function () {
       expect(spec.isBidRequestValid(publisherNumericOk)).to.equal(true);
     });
-
     var xEmptyPublisher = {
       bidder: BIDDER_CODE,
       params: {
@@ -1733,11 +1590,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate empty publisherId', function () {
       expect(spec.isBidRequestValid(xEmptyPublisher)).to.equal(false);
     });
-
     var xBadSite = {
       bidder: BIDDER_CODE,
       params: {
@@ -1746,37 +1601,15 @@ describe('ozone Adapter', function () {
         siteId: '12345Z'
       }
     };
-
     it('should not validate bad siteId', function () {
       expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
     });
-
-    var xBadSiteTooLong = {
-      bidder: BIDDER_CODE,
-      params: {
-        placementId: '1234567890',
-        publisherId: '9876abcd12-3',
-        siteId: '12345678901'
-      }
-    };
-
     it('should not validate siteId too long', function () {
       expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
     });
-
-    var xBadSiteTooShort = {
-      bidder: BIDDER_CODE,
-      params: {
-        placementId: '1234567890',
-        publisherId: '9876abcd12-3',
-        siteId: '123456789'
-      }
-    };
-
     it('should not validate siteId too short', function () {
       expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
     });
-
     var allNonStrings = {
       bidder: BIDDER_CODE,
       params: {
@@ -1785,11 +1618,9 @@ describe('ozone Adapter', function () {
         siteId: 1234567890
       }
     };
-
     it('should validate all numeric values being sent as non-string numbers', function () {
       expect(spec.isBidRequestValid(allNonStrings)).to.equal(true);
     });
-
     var emptySiteId = {
       bidder: BIDDER_CODE,
       params: {
@@ -1798,11 +1629,9 @@ describe('ozone Adapter', function () {
         siteId: ''
       }
     };
-
     it('should not validate siteId being empty string (it is required now)', function () {
       expect(spec.isBidRequestValid(emptySiteId)).to.equal(false);
     });
-
     var xBadCustomData = {
       bidder: BIDDER_CODE,
       params: {
@@ -1812,12 +1641,10 @@ describe('ozone Adapter', function () {
         'customData': 'this aint gonna work'
       }
     };
-
     it('should not validate customData not being an array', function () {
       expect(spec.isBidRequestValid(xBadCustomData)).to.equal(false);
     });
-
-    var xBadCustomData_OLD_CUSTOMDATA_VALUE = {
+    var xBadCustomDataOldCustomdataValue = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
@@ -1826,12 +1653,10 @@ describe('ozone Adapter', function () {
         'customData': {'gender': 'bart', 'age': 'low'}
       }
     };
-
     it('should not validate customData being an object, not an array', function () {
-      expect(spec.isBidRequestValid(xBadCustomData_OLD_CUSTOMDATA_VALUE)).to.equal(false);
+      expect(spec.isBidRequestValid(xBadCustomDataOldCustomdataValue)).to.equal(false);
     });
-
-    var xBadCustomData_zerocd = {
+    var xBadCustomDataZerocd = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1111111110',
@@ -1840,12 +1665,10 @@ describe('ozone Adapter', function () {
         'customData': []
       }
     };
-
     it('should not validate customData array having no elements', function () {
-      expect(spec.isBidRequestValid(xBadCustomData_zerocd)).to.equal(false);
+      expect(spec.isBidRequestValid(xBadCustomDataZerocd)).to.equal(false);
     });
-
-    var xBadCustomData_notargeting = {
+    var xBadCustomDataNotargeting = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
@@ -1855,10 +1678,9 @@ describe('ozone Adapter', function () {
       }
     };
     it('should not validate customData[] having no "targeting"', function () {
-      expect(spec.isBidRequestValid(xBadCustomData_notargeting)).to.equal(false);
+      expect(spec.isBidRequestValid(xBadCustomDataNotargeting)).to.equal(false);
     });
-
-    var xBadCustomData_tgt_not_obj = {
+    var xBadCustomDataTgtNotObj = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
@@ -1868,9 +1690,8 @@ describe('ozone Adapter', function () {
       }
     };
     it('should not validate customData[0].targeting not being an object', function () {
-      expect(spec.isBidRequestValid(xBadCustomData_tgt_not_obj)).to.equal(false);
+      expect(spec.isBidRequestValid(xBadCustomDataTgtNotObj)).to.equal(false);
     });
-
     var xBadCustomParams = {
       bidder: BIDDER_CODE,
       params: {
@@ -1883,26 +1704,11 @@ describe('ozone Adapter', function () {
     it('should not validate customParams - this is a renamed key', function () {
       expect(spec.isBidRequestValid(xBadCustomParams)).to.equal(false);
     });
-
-    var xBadLotame = {
-      bidder: BIDDER_CODE,
-      params: {
-        'placementId': '1234567890',
-        'publisherId': '9876abcd12-3',
-        'lotameData': 'this should be an object',
-        siteId: '1234567890'
-      }
-    };
-    it('should not validate lotameData being sent', function () {
-      expect(spec.isBidRequestValid(xBadLotame)).to.equal(false);
-    });
-
     var xBadVideoContext2 = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
         'publisherId': '9876abcd12-3',
-        'lotameData': {},
         siteId: '1234567890'
       },
       mediaTypes: {
@@ -1910,11 +1716,9 @@ describe('ozone Adapter', function () {
           mimes: ['video/mp4']}
       }
     };
-
     it('should not validate video without context attribute', function () {
       expect(spec.isBidRequestValid(xBadVideoContext2)).to.equal(false);
     });
-
     let validVideoBidReq = {
       bidder: BIDDER_CODE,
       params: {
@@ -1928,7 +1732,6 @@ describe('ozone Adapter', function () {
           'context': 'outstream'},
       }
     };
-
     it('should validate video outstream being sent', function () {
       expect(spec.isBidRequestValid(validVideoBidReq)).to.equal(true);
     });
@@ -1937,114 +1740,82 @@ describe('ozone Adapter', function () {
       instreamVid.mediaTypes.video.context = 'instream';
       expect(spec.isBidRequestValid(instreamVid)).to.equal(true);
     });
-    // validate lotame override parameters
-    it('should validate lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': 'tpid123'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
-    });
-    it('should validate missing lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(false);
-    });
-    it('should validate invalid lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123 "this ain\\t right!" eee'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(false);
-    });
-    it('should validate no lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
-    });
   });
-
   describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig()
+    });
     it('sends bid request to OZONEURI via POST', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.url).to.equal(OZONEURI);
       expect(request.method).to.equal('POST');
     });
-
     it('sends data as a string', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.data).to.be.a('string');
     });
-
     it('sends all bid parameters', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('adds all parameters inside the ext object only', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.data).to.be.a('string');
+      var data = JSON.parse(request.data);
+      expect(data.imp[0].ext.ozone.customData).to.be.an('array');
+      expect(request).not.to.have.key('lotameData');
+      expect(request).not.to.have.key('customData');
+    });
+    it('adds all parameters inside the ext object only - lightning', function () {
+      let localBidReq = JSON.parse(JSON.stringify(validBidRequests));
+      const request = spec.buildRequests(localBidReq, validBidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
-      expect(data.ext.ozone.lotameData).to.be.an('object');
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(request).not.to.have.key('lotameData');
       expect(request).not.to.have.key('customData');
     });
-
     it('ignores ozoneData in & after version 2.1.1', function () {
-      let validBidRequestsWithOzoneData = validBidRequests;
+      let validBidRequestsWithOzoneData = JSON.parse(JSON.stringify(validBidRequests));
       validBidRequestsWithOzoneData[0].params.ozoneData = {'networkID': '3048', 'dfpSiteID': 'd.thesun', 'sectionID': 'homepage', 'path': '/', 'sec_id': 'null', 'sec': 'sec', 'topics': 'null', 'kw': 'null', 'aid': 'null', 'search': 'null', 'article_type': 'null', 'hide_ads': '', 'article_slug': 'null'};
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsWithOzoneData, validBidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
-      expect(data.ext.ozone.lotameData).to.be.an('object');
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.ozoneData).to.be.undefined;
       expect(request).not.to.have.key('lotameData');
       expect(request).not.to.have.key('customData');
     });
-
     it('has correct bidder', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.bidderRequest.bids[0].bidder).to.equal(BIDDER_CODE);
     });
-
     it('handles mediaTypes element correctly', function () {
-      const request = spec.buildRequests(validBidRequestsWithBannerMediaType, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsWithBannerMediaType, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
-    it('handles no ozone, lotame or custom data', function () {
-      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+    it('handles no ozone or custom data', function () {
+      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('handles video mediaType element correctly, with outstream video', function () {
-      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('should not crash when there is no sizes element at all', function () {
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('should be able to handle non-single requests', function () {
       config.setConfig({'ozone': {'singleRequest': false}});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       expect(request).to.be.a('array');
       expect(request[0]).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
-      // need to reset the singleRequest config flag:
       config.setConfig({'ozone': {'singleRequest': true}});
     });
-
     it('should add gdpr consent information to the request when ozone is true', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest.bidderRequest;
+      let bidderRequest = validBidderRequest;
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: true,
@@ -2055,17 +1826,14 @@ describe('ozone Adapter', function () {
           purposeConsents: {1: true, 2: true, 3: true, 4: true, 5: true}
         }
       }
-
       const request = spec.buildRequests(validBidRequestsNoSizes, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.regs.ext.gdpr).to.equal(1);
       expect(payload.user.ext.consent).to.equal(consentString);
     });
-
-    // mirror
     it('should add gdpr consent information to the request when vendorData is missing vendorConsents (Mirror)', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest.bidderRequest;
+      let bidderRequest = validBidderRequest;
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: true,
@@ -2074,7 +1842,6 @@ describe('ozone Adapter', function () {
           gdprApplies: true
         }
       }
-
       const request = spec.buildRequests(validBidRequestsNoSizes, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.regs.ext.gdpr).to.equal(1);
@@ -2082,7 +1849,7 @@ describe('ozone Adapter', function () {
     });
     it('should set regs.ext.gdpr flag to 0 when gdprApplies is false', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest.bidderRequest;
+      let bidderRequest = validBidderRequest;
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: false,
@@ -2093,15 +1860,13 @@ describe('ozone Adapter', function () {
           purposeConsents: {1: true, 2: true, 3: true, 4: true, 5: true}
         }
       };
-
       const request = spec.buildRequests(validBidRequestsNoSizes, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.regs.ext.gdpr).to.equal(0);
     });
-
     it('should not have imp[N].ext.ozone.userId', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest.bidderRequest;
+      let bidderRequest = validBidderRequest;
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: false,
@@ -2112,217 +1877,338 @@ describe('ozone Adapter', function () {
           purposeConsents: {1: true, 2: true, 3: true, 4: true, 5: true}
         }
       };
-
       let bidRequests = validBidRequests;
-      // values from http://prebid.org/dev-docs/modules/userId.html#pubcommon-id
       bidRequests[0]['userId'] = {
-        'criteortus': '1111',
         'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        'id5id': '2222',
+        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
         'idl_env': '3333',
-        'lipb': {'lipbid': '4444'},
         'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
         'pubcid': '5555',
-        'tdid': '6666'
+        'tdid': '6666',
+        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
       };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
       let firstBid = payload.imp[0].ext.ozone;
       expect(firstBid).to.not.have.property('userId');
       delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
     });
-
     it('should pick up the value of pubcid when built using the pubCommonId module (not userId)', function () {
       let bidRequests = validBidRequests;
-      // values from http://prebid.org/dev-docs/modules/userId.html#pubcommon-id
       bidRequests[0]['userId'] = {
-        'criteortus': '1111',
         'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        'id5id': '2222',
+        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
         'idl_env': '3333',
-        'lipb': {'lipbid': '4444'},
         'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
-        // 'pubcid': '5555', // remove pubcid from here to emulate the OLD module & cause the failover code to kick in
-        'tdid': '6666'
+        'tdid': '6666',
+        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
       };
-      const request = spec.buildRequests(bidRequests, validBidderRequest.bidderRequest);
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
+      const request = spec.buildRequests(bidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.pubcid).to.equal(bidRequests[0]['crumbs']['pubcid']);
       delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
     });
-
-    it('should add a user.ext.eids object to contain user ID data in the new location (Nov 2019)', function() {
-      const request = spec.buildRequests(validBidRequestsWithUserIdData, validBidderRequest.bidderRequest);
+    it('should add a user.ext.eids object to contain user ID data in the new location (Nov 2019) Updated Aug 2020', function() {
+      const request = spec.buildRequests(validBidRequestsWithUserIdData, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.user).to.exist;
       expect(payload.user.ext).to.exist;
       expect(payload.user.ext.eids).to.exist;
-      expect(payload.user.ext.eids[0]['source']).to.equal('pubcid');
+      expect(payload.user.ext.eids[0]['source']).to.equal('pubcid.org');
       expect(payload.user.ext.eids[0]['uids'][0]['id']).to.equal('12345678');
-      expect(payload.user.ext.eids[1]['source']).to.equal('pubcommon');
-      expect(payload.user.ext.eids[1]['uids'][0]['id']).to.equal('12345678');
+      expect(payload.user.ext.eids[1]['source']).to.equal('adserver.org');
+      expect(payload.user.ext.eids[1]['uids'][0]['id']).to.equal('1111tdid');
       expect(payload.user.ext.eids[2]['source']).to.equal('id5-sync.com');
       expect(payload.user.ext.eids[2]['uids'][0]['id']).to.equal('ID5-someId');
-      expect(payload.user.ext.eids[3]['source']).to.equal('criteortus');
-      expect(payload.user.ext.eids[3]['uids'][0]['id']).to.equal('critId123');
-      expect(payload.user.ext.eids[4]['source']).to.equal('liveramp.com');
+      expect(payload.user.ext.eids[3]['source']).to.equal('criteoId');
+      expect(payload.user.ext.eids[3]['uids'][0]['id']).to.equal('1111criteoId');
+      expect(payload.user.ext.eids[4]['source']).to.equal('idl_env');
       expect(payload.user.ext.eids[4]['uids'][0]['id']).to.equal('liverampId');
-      expect(payload.user.ext.eids[5]['source']).to.equal('liveintent.com');
-      expect(payload.user.ext.eids[5]['uids'][0]['id']).to.equal('lipbidId123');
-      expect(payload.user.ext.eids[6]['source']).to.equal('parrable.com');
-      expect(payload.user.ext.eids[6]['uids'][0]['id']).to.equal('parrableid123');
+      expect(payload.user.ext.eids[5]['source']).to.equal('lipb');
+      expect(payload.user.ext.eids[5]['uids'][0]['id']['lipbid']).to.equal('lipbidId123');
+      expect(payload.user.ext.eids[6]['source']).to.equal('parrableId');
+      expect(payload.user.ext.eids[6]['uids'][0]['id']['eid']).to.equal('01.5678.parrableid');
+    });
+    it('replaces the auction url for a config override', function () {
+      spec.propertyBag.whitelabel = null;
+      let fakeOrigin = 'http://sometestendpoint';
+      config.setConfig({'ozone': {'endpointOverride': {'origin': fakeOrigin}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.url).to.equal(fakeOrigin + '/openrtb2/auction');
+      expect(request.method).to.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone.origin).to.equal(fakeOrigin);
+      config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+    it('replaces the FULL auction url for a config override', function () {
+      spec.propertyBag.whitelabel = null;
+      let fakeurl = 'http://sometestendpoint/myfullurl';
+      config.setConfig({'ozone': {'endpointOverride': {'auctionUrl': fakeurl}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.url).to.equal(fakeurl);
+      expect(request.method).to.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone.origin).to.equal(fakeurl);
+      config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+    it('replaces the renderer url for a config override', function () {
+      spec.propertyBag.whitelabel = null;
+      let fakeUrl = 'http://renderer.com';
+      config.setConfig({'ozone': {'endpointOverride': {'rendererUrl': fakeUrl}}});
+      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest1OutstreamVideo2020.bidderRequest);
+      const result = spec.interpretResponse(getCleanValidVideoResponse(), validBidderRequest1OutstreamVideo2020);
+      const bid = result[0];
+      expect(bid.renderer).to.be.an.instanceOf(Renderer);
+      expect(bid.renderer.url).to.equal(fakeUrl);
+      config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+    it('should generate all the adservertargeting keys correctly named', function () {
+      config.setConfig({'ozone': {'kvpPrefix': 'xx'}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0].adserverTargeting).to.have.own.property('xx_appnexus_crid');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_appnexus_crid')).to.equal('98493581');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_pb')).to.equal(0.5);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_adId')).to.equal('2899ec066a91ff8-0-xx-0');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_size')).to.equal('300x600');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_pb_r')).to.equal('0.50');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_bid')).to.equal('true');
+    });
+    it('should create a meta object on each bid returned', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0]).to.have.own.property('meta');
+      expect(result[0].meta.advertiserDomains[0]).to.equal('http://prebid.org');
+    });
+    it('replaces the kvp prefix ', function () {
+      spec.propertyBag.whitelabel = null;
+      config.setConfig({'ozone': {'kvpPrefix': 'test'}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone).to.haveOwnProperty('test_rw');
+      config.setConfig({'ozone': {'kvpPrefix': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+    it('handles an alias ', function () {
+      spec.propertyBag.whitelabel = null;
+      config.setConfig({'lmc': {'kvpPrefix': 'test'}});
+      let br = JSON.parse(JSON.stringify(validBidRequests));
+      br[0]['bidder'] = 'lmc';
+      const request = spec.buildRequests(br, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.lmc).to.haveOwnProperty('test_rw');
+      config.setConfig({'lmc': {'kvpPrefix': null}}); // I cant remove the key so set the value to null
+      spec.propertyBag.whitelabel = null;
     });
-
     it('should use oztestmode GET value if set', function() {
-      // mock the getGetParametersAsObject function to simulate GET parameters for oztestmode:
-      spec.getGetParametersAsObject = function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
         return {'oztestmode': 'mytestvalue_123'};
       };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.customData[0].targeting.oztestmode).to.equal('mytestvalue_123');
     });
+    it('should pass through GET params if present: ozf, ozpf, ozrp, ozip', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {ozf: '1', ozpf: '0', ozrp: '2', ozip: '123'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone.ozf).to.equal(1);
+      expect(data.ext.ozone.ozpf).to.equal(0);
+      expect(data.ext.ozone.ozrp).to.equal(2);
+      expect(data.ext.ozone.ozip).to.equal(123);
+    });
+    it('should pass through GET params if present: ozf, ozpf, ozrp, ozip with alternative values', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {ozf: 'false', ozpf: 'true', ozrp: 'xyz', ozip: 'hello'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone.ozf).to.equal(0);
+      expect(data.ext.ozone.ozpf).to.equal(1);
+      expect(data.ext.ozone).to.not.haveOwnProperty('ozrp');
+      expect(data.ext.ozone).to.not.haveOwnProperty('ozip');
+    });
     it('should use oztestmode GET value if set, even if there is no customdata in config', function() {
-      // mock the getGetParametersAsObject function to simulate GET parameters for oztestmode:
-      spec.getGetParametersAsObject = function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
         return {'oztestmode': 'mytestvalue_123'};
       };
-      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.customData[0].targeting.oztestmode).to.equal('mytestvalue_123');
     });
-    var specMock = utils.deepClone(spec);
+    it('should use GET values auction=dev & cookiesync=dev if set', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {};
+      };
+      let request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      let url = request.url;
+      expect(url).to.equal('https://elb.the-ozone-project.com/openrtb2/auction');
+      let cookieUrl = specMock.getCookieSyncUrl();
+      expect(cookieUrl).to.equal('https://elb.the-ozone-project.com/static/load-cookie.html');
+      specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'auction': 'dev', 'cookiesync': 'dev'};
+      };
+      request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      url = request.url;
+      expect(url).to.equal('https://test.ozpr.net/openrtb2/auction');
+      cookieUrl = specMock.getCookieSyncUrl();
+      expect(cookieUrl).to.equal('https://test.ozpr.net/static/load-cookie.html');
+    });
     it('should use a valid ozstoredrequest GET value if set to override the placementId values, and set oz_rw if we find it', function() {
-      // mock the getGetParametersAsObject function to simulate GET parameters for ozstoredrequest:
+      var specMock = utils.deepClone(spec);
       specMock.getGetParametersAsObject = function() {
         return {'ozstoredrequest': '1122334455'}; // 10 digits are valid
       };
-      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.ext.ozone.oz_rw).to.equal(1);
       expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1122334455');
     });
     it('should NOT use an invalid ozstoredrequest GET value if set to override the placementId values, and set oz_rw to 0', function() {
-      // mock the getGetParametersAsObject function to simulate GET parameters for ozstoredrequest:
+      var specMock = utils.deepClone(spec);
       specMock.getGetParametersAsObject = function() {
         return {'ozstoredrequest': 'BADVAL'}; // 10 digits are valid
       };
-      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.ext.ozone.oz_rw).to.equal(0);
       expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1310000099');
     });
-
-    it('should pick up the value of valid lotame override parameters when there is a lotame object', function () {
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eee'};
-      };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-    });
-    it('should pick up the value of valid lotame override parameters when there is an empty lotame object', function () {
-      let nolotameBidReq = JSON.parse(JSON.stringify(validBidRequests));
-      nolotameBidReq[0].params.lotameData = {};
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eeetpid'};
-      };
-      const request = spec.buildRequests(nolotameBidReq, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.lotameData.Profile.tpid).to.equal('123eeetpid');
-      expect(payload.ext.ozone.lotameData.Profile.pid).to.equal('pid123');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-    });
-    it('should pick up the value of valid lotame override parameters when there is NO "lotame" key at all', function () {
-      let nolotameBidReq = JSON.parse(JSON.stringify(validBidRequests));
-      delete (nolotameBidReq[0].params['lotameData']);
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eeetpid'};
-      };
-      const request = spec.buildRequests(nolotameBidReq, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.lotameData.Profile.tpid).to.equal('123eeetpid');
-      expect(payload.ext.ozone.lotameData.Profile.pid).to.equal('pid123');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-      spec.propertyBag = originalPropertyBag; // tidy up
-    });
-    // NOTE - only one negative test case;
-    // you can't send invalid lotame params to buildRequests because 'validate' will have rejected them
-    it('should not use lotame override parameters if they dont exist', function () {
-      expect(spec.propertyBag.lotameWasOverridden).to.equal(0);
-      spec.getGetParametersAsObject = function() {
-        return {}; //  no lotame override params
-      };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(0);
-    });
-
     it('should pick up the config value of coppa & set it in the request', function () {
       config.setConfig({'coppa': true});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.regs).to.include.keys('coppa');
       expect(payload.regs.coppa).to.equal(1);
-      config.resetConfig();
     });
     it('should pick up the config value of coppa & only set it in the request if its true', function () {
       config.setConfig({'coppa': false});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'regs.coppa')).to.be.undefined;
-      config.resetConfig();
     });
     it('should handle oz_omp_floor correctly', function () {
       config.setConfig({'ozone': {'oz_omp_floor': 1.56}});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'ext.ozone.oz_omp_floor')).to.equal(1.56);
-      config.resetConfig();
     });
     it('should ignore invalid oz_omp_floor values', function () {
       config.setConfig({'ozone': {'oz_omp_floor': '1.56'}});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'ext.ozone.oz_omp_floor')).to.be.undefined;
-      config.resetConfig();
     });
     it('should should contain a unique page view id in the auction request which persists across calls', function () {
-      let request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      let request = spec.buildRequests(validBidRequests, validBidderRequest);
       let payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'ext.ozone.pv')).to.be.a('string');
-      request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest.bidderRequest);
+      request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest);
       let payload2 = JSON.parse(request.data);
       expect(utils.deepAccess(payload2, 'ext.ozone.pv')).to.be.a('string');
       expect(utils.deepAccess(payload2, 'ext.ozone.pv')).to.equal(utils.deepAccess(payload, 'ext.ozone.pv'));
     });
     it('should indicate that the whitelist was used when it contains valid data', function () {
       config.setConfig({'ozone': {'oz_whitelist_adserver_keys': ['oz_ozappnexus_pb', 'oz_ozappnexus_imp_id']}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.oz_kvp_rw).to.equal(1);
-      config.resetConfig();
     });
     it('should indicate that the whitelist was not used when it contains no data', function () {
       config.setConfig({'ozone': {'oz_whitelist_adserver_keys': []}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.oz_kvp_rw).to.equal(0);
-      config.resetConfig();
     });
     it('should indicate that the whitelist was not used when it is not set in the config', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.oz_kvp_rw).to.equal(0);
     });
+    it('should handle ortb2 site data', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'site': {
+          'name': 'example_ortb2_name',
+          'domain': 'page.example.com',
+          'cat': ['IAB2'],
+          'sectioncat': ['IAB2-2'],
+          'pagecat': ['IAB2-2'],
+          'page': 'https://page.example.com/here.html',
+          'ref': 'https://ref.example.com',
+          'keywords': 'power tools, drills',
+          'search': 'drill'
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.ozone.customData[0].targeting.name).to.equal('example_ortb2_name');
+      expect(payload.user.ext).to.not.have.property('gender');
+    });
+    it('should add ortb2 site data when there is no customData already created', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'site': {
+          'name': 'example_ortb2_name',
+          'domain': 'page.example.com',
+          'cat': ['IAB2'],
+          'sectioncat': ['IAB2-2'],
+          'pagecat': ['IAB2-2'],
+          'page': 'https://page.example.com/here.html',
+          'ref': 'https://ref.example.com',
+          'keywords': 'power tools, drills',
+          'search': 'drill'
+        }
+      };
+      const request = spec.buildRequests(validBidRequestsNoCustomData, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.ozone.customData[0].targeting.name).to.equal('example_ortb2_name');
+      expect(payload.imp[0].ext.ozone.customData[0].targeting).to.not.have.property('gender')
+    });
+    it('should add ortb2 user data to the user object', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'user': {
+          'gender': 'I identify as a box of rocks'
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.gender).to.equal('I identify as a box of rocks');
+    });
+    it('should not override the user.ext.consent string even if this is set in config ortb2', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr));
+      bidderRequest.ortb2 = {
+        'user': {
+          'ext': {
+            'consent': 'this is the consent override that shouldnt work',
+            'consent2': 'this should be set'
+          }
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.consent2).to.equal('this should be set');
+      expect(payload.user.ext.consent).to.equal('BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
+    });
     it('should have openrtb video params', function() {
       let allowed = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad', 'api', 'companiontype', 'ext'];
-      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest);
       const payload = JSON.parse(request.data);
       const vid = (payload.imp[0].video);
       const keys = Object.keys(vid);
@@ -2331,57 +2217,107 @@ describe('ozone Adapter', function () {
       }
       expect(payload.imp[0].video.ext).to.include({'context': 'outstream'});
     });
+    it('should handle standard floor config correctly', function () {
+      config.setConfig({
+        floors: {
+          enforcement: {
+            floorDeals: false,
+            bidAdjustment: true
+          },
+          data: {
+            currency: 'USD',
+            schema: {
+              fields: ['mediaType']
+            },
+            values: {
+              'video': 1.20,
+              'banner': 0.8
+            }
+          }
+        }
+      });
+      let localBidRequest = JSON.parse(JSON.stringify(validBidRequestsWithBannerMediaType));
+      localBidRequest[0].getFloor = function(x) { return {'currency': 'USD', 'floor': 0.8} };
+      const request = spec.buildRequests(localBidRequest, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(utils.deepAccess(payload, 'imp.0.floor.banner.currency')).to.equal('USD');
+      expect(utils.deepAccess(payload, 'imp.0.floor.banner.floor')).to.equal(0.8);
+    });
+    it('handles schain object in each bidrequest (will be the same in each br)', function () {
+      let br = JSON.parse(JSON.stringify(validBidRequests));
+      let schainConfigObject = {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'bidderA.com',
+            'sid': '00001',
+            'hp': 1
+          }
+        ]
+      };
+      br[0]['schain'] = schainConfigObject;
+      const request = spec.buildRequests(br, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.source.ext).to.haveOwnProperty('schain');
+      expect(data.source.ext.schain).to.deep.equal(schainConfigObject); // .deep.equal() : Target object deeply (but not strictly) equals `{a: 1}`
+    });
   });
-
   describe('interpretResponse', function () {
+    beforeEach(function () {
+      config.resetConfig()
+    })
     it('should build bid array', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(result.length).to.equal(1);
     });
-
     it('should have all relevant fields', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       const bid = result[0];
       expect(bid.cpm).to.equal(validResponse.body.seatbid[0].bid[0].cpm);
       expect(bid.width).to.equal(validResponse.body.seatbid[0].bid[0].width);
       expect(bid.height).to.equal(validResponse.body.seatbid[0].bid[0].height);
     });
-
     it('should build bid array with gdpr', function () {
-      let validBR = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr.bidderRequest));
+      let validBR = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr));
       validBR.gdprConsent = {'gdprApplies': 1, 'consentString': 'This is the gdpr consent string'};
       const request = spec.buildRequests(validBidRequests, validBR); // works the old way, with GDPR not enforced by default
       const result = spec.interpretResponse(validResponse, request);
       expect(result.length).to.equal(1);
     });
-
+    it('should build bid array with usp/CCPA', function () {
+      let validBR = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr));
+      validBR.uspConsent = '1YNY';
+      const request = spec.buildRequests(validBidRequests, validBR);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.uspConsent).not.to.exist;
+      expect(payload.regs.ext.us_privacy).to.equal('1YNY');
+    });
     it('should build bid array with only partial gdpr', function () {
       var validBidderRequestWithGdpr = bidderRequestWithPartialGdpr.bidderRequest;
       validBidderRequestWithGdpr.gdprConsent = {'gdprApplies': 1, 'consentString': 'This is the gdpr consent string'};
       const request = spec.buildRequests(validBidRequests, validBidderRequestWithGdpr);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.consent).to.be.a('string');
     });
-
     it('should fail ok if no seatbid in server response', function () {
       const result = spec.interpretResponse({}, {});
       expect(result).to.be.an('array');
       expect(result).to.be.empty;
     });
-
     it('should fail ok if seatbid is not an array', function () {
       const result = spec.interpretResponse({'body': {'seatbid': 'nothing_here'}}, {});
       expect(result).to.be.an('array');
       expect(result).to.be.empty;
     });
-
     it('should have video renderer for outstream video', function () {
       const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest1OutstreamVideo2020.bidderRequest);
       const result = spec.interpretResponse(getCleanValidVideoResponse(), validBidderRequest1OutstreamVideo2020);
       const bid = result[0];
       expect(bid.renderer).to.be.an.instanceOf(Renderer);
     });
-
     it('should have NO video renderer for instream video', function () {
       let instreamRequestsObj = JSON.parse(JSON.stringify(validBidRequests1OutstreamVideo2020));
       instreamRequestsObj[0].mediaTypes.video.context = 'instream';
@@ -2392,99 +2328,87 @@ describe('ozone Adapter', function () {
       const bid = result[0];
       expect(bid.hasOwnProperty('renderer')).to.be.false;
     });
-
     it('should correctly parse response where there are more bidders than ad slots', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validBidResponse1adWith2Bidders, request);
       expect(result.length).to.equal(2);
     });
-
     it('should have a ttl of 600', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(result[0].ttl).to.equal(300);
     });
-
     it('should handle oz_omp_floor_dollars correctly, inserting 1 as necessary', function () {
       config.setConfig({'ozone': {'oz_omp_floor': 0.01}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_omp')).to.equal('1');
-      config.resetConfig();
     });
     it('should handle oz_omp_floor_dollars correctly, inserting 0 as necessary', function () {
       config.setConfig({'ozone': {'oz_omp_floor': 2.50}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_omp')).to.equal('0');
-      config.resetConfig();
     });
     it('should handle missing oz_omp_floor_dollars correctly, inserting nothing', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_omp')).to.be.undefined;
     });
     it('should handle ext.bidder.ozone.floor correctly, setting flr & rid as necessary', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let vres = JSON.parse(JSON.stringify(validResponse));
       vres.body.seatbid[0].bid[0].ext.bidder.ozone = {floor: 1, ruleId: 'ZjbsYE1q'};
       const result = spec.interpretResponse(vres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_flr')).to.equal(1);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_rid')).to.equal('ZjbsYE1q');
-      config.resetConfig();
     });
     it('should handle ext.bidder.ozone.floor correctly, inserting 0 as necessary', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let vres = JSON.parse(JSON.stringify(validResponse));
       vres.body.seatbid[0].bid[0].ext.bidder.ozone = {floor: 0, ruleId: 'ZjbXXE1q'};
       const result = spec.interpretResponse(vres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_flr')).to.equal(0);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_rid')).to.equal('ZjbXXE1q');
-      config.resetConfig();
     });
     it('should handle ext.bidder.ozone.floor correctly, inserting nothing as necessary', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let vres = JSON.parse(JSON.stringify(validResponse));
       vres.body.seatbid[0].bid[0].ext.bidder.ozone = {};
       const result = spec.interpretResponse(vres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_flr', null)).to.equal(null);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_rid', null)).to.equal(null);
-      config.resetConfig();
     });
     it('should handle ext.bidder.ozone.floor correctly, when bidder.ozone is not there', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let vres = JSON.parse(JSON.stringify(validResponse));
       const result = spec.interpretResponse(vres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_flr', null)).to.equal(null);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_rid', null)).to.equal(null);
-      config.resetConfig();
     });
     it('should handle a valid whitelist, removing items not on the list & leaving others', function () {
       config.setConfig({'ozone': {'oz_whitelist_adserver_keys': ['oz_appnexus_crid', 'oz_appnexus_adId']}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adv')).to.be.undefined;
-      expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adId')).to.equal('2899ec066a91ff8-0-0');
-      config.resetConfig();
+      expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adId')).to.equal('2899ec066a91ff8-0-oz-0');
     });
     it('should ignore a whitelist if enhancedAdserverTargeting is false', function () {
       config.setConfig({'ozone': {'oz_whitelist_adserver_keys': ['oz_appnexus_crid', 'oz_appnexus_imp_id'], 'enhancedAdserverTargeting': false}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adv')).to.be.undefined;
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_imp_id')).to.be.undefined;
-      config.resetConfig();
     });
     it('should correctly handle enhancedAdserverTargeting being false', function () {
       config.setConfig({'ozone': {'enhancedAdserverTargeting': false}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adv')).to.be.undefined;
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_imp_id')).to.be.undefined;
-      config.resetConfig();
     });
     it('should add flr into ads request if floor exists in the auction response', function () {
-      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2Bids));
       validres.body.seatbid[0].bid[0].ext.bidder.ozone = {'floor': 1};
       const result = spec.interpretResponse(validres, request);
@@ -2492,7 +2416,7 @@ describe('ozone Adapter', function () {
       expect(utils.deepAccess(result[1].adserverTargeting, 'oz_appnexus_flr', '')).to.equal('');
     });
     it('should add rid into ads request if ruleId exists in the auction response', function () {
-      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2Bids));
       validres.body.seatbid[0].bid[0].ext.bidder.ozone = {'ruleId': 123};
       const result = spec.interpretResponse(validres, request);
@@ -2500,41 +2424,53 @@ describe('ozone Adapter', function () {
       expect(utils.deepAccess(result[1].adserverTargeting, 'oz_appnexus_rid', '')).to.equal('');
     });
     it('should add oz_ozappnexus_sid (cid value) for all appnexus bids', function () {
-      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2BidsSameAdunit));
       const result = spec.interpretResponse(validres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_ozappnexus_sid')).to.equal(result[0].cid);
     });
     it('should add unique adId values to each bid', function() {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2BidsSameAdunit));
       const result = spec.interpretResponse(validres, request);
       expect(result.length).to.equal(1);
       expect(result[0]['price']).to.equal(0.9);
-      expect(result[0]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('2899ec066a91ff8-0-1');
+      expect(result[0]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('2899ec066a91ff8-0-oz-1');
     });
     it('should correctly process an auction with 2 adunits & multiple bidders one of which bids for both adslots', function() {
       let validres = JSON.parse(JSON.stringify(multiResponse1));
-      let request = spec.buildRequests(multiRequest1, multiBidderRequest1.bidderRequest);
+      let request = spec.buildRequests(multiRequest1, multiBidderRequest1);
       let result = spec.interpretResponse(validres, request);
       expect(result.length).to.equal(4); // one of the 5 bids will have been removed
       expect(result[1]['price']).to.equal(0.521);
       expect(result[1]['impid']).to.equal('3025f169863b7f8');
       expect(result[1]['id']).to.equal('18552976939844999');
-      expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-2');
-      // change the bid values so a different second bid for an impid by the same bidder gets dropped
+      expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-oz-2');
       validres = JSON.parse(JSON.stringify(multiResponse1));
       validres.body.seatbid[0].bid[1].price = 1.1;
       validres.body.seatbid[0].bid[1].cpm = 1.1;
-      request = spec.buildRequests(multiRequest1, multiBidderRequest1.bidderRequest);
+      request = spec.buildRequests(multiRequest1, multiBidderRequest1);
       result = spec.interpretResponse(validres, request);
       expect(result[1]['price']).to.equal(1.1);
       expect(result[1]['impid']).to.equal('3025f169863b7f8');
       expect(result[1]['id']).to.equal('18552976939844681');
-      expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-1');
+      expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-oz-1');
+    });
+    it('should add mediaType: banner for a banner ad', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0].mediaType).to.equal('banner');
+    });
+    it('should add mediaType: video for a video ad', function () {
+      let instreamRequestsObj = JSON.parse(JSON.stringify(validBidRequests1OutstreamVideo2020));
+      instreamRequestsObj[0].mediaTypes.video.context = 'instream';
+      let instreamBidderReq = JSON.parse(JSON.stringify(validBidderRequest1OutstreamVideo2020));
+      instreamBidderReq.bidderRequest.bids[0].mediaTypes.video.context = 'instream';
+      const result = spec.interpretResponse(getCleanValidVideoResponse(), instreamBidderReq);
+      const bid = result[0];
+      expect(bid.mediaType).to.equal('video');
     });
   });
-
   describe('userSyncs', function () {
     it('should fail gracefully if no server response', function () {
       const result = spec.getUserSyncs('bad', false, gdpr1);
@@ -2545,8 +2481,7 @@ describe('ozone Adapter', function () {
       expect(result).to.be.empty;
     });
     it('should append the various values if they exist', function() {
-      // get the cookie bag populated
-      spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1);
       expect(result).to.be.an('array');
       expect(result[0].url).to.include('publisherId=9876abcd12-3');
@@ -2554,8 +2489,19 @@ describe('ozone Adapter', function () {
       expect(result[0].url).to.include('gdpr=1');
       expect(result[0].url).to.include('gdpr_consent=BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
     });
+    it('should append ccpa (usp data)', function() {
+      spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1, '1YYN');
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('usp_consent=1YYN');
+    });
+    it('should use "" if no usp is sent to cookieSync', function() {
+      spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1);
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('usp_consent=&');
+    });
   });
-
   describe('video object utils', function () {
     it('should find width & height from video object', function () {
       let obj = {'playerSize': [640, 480], 'mimes': ['video/mp4'], 'context': 'outstream'};
@@ -2609,8 +2555,15 @@ describe('ozone Adapter', function () {
       const result = playerSizeIsNestedArray(obj);
       expect(result).to.be.null;
     });
+    it('should add oz_appnexus_dealid into ads request if dealid exists in the auction response', function () {
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest);
+      let validres = JSON.parse(JSON.stringify(validResponse2Bids));
+      validres.body.seatbid[0].bid[0].dealid = '1234';
+      const result = spec.interpretResponse(validres, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_dealid')).to.equal('1234');
+      expect(utils.deepAccess(result[1].adserverTargeting, 'oz_appnexus_dealid', '')).to.equal('');
+    });
   });
-
   describe('default size', function () {
     it('should should return default sizes if no obj is sent', function () {
       let obj = '';
@@ -2619,7 +2572,6 @@ describe('ozone Adapter', function () {
       expect(result.defaultWidth).to.equal(300);
     });
   });
-
   describe('getGranularityKeyName', function() {
     it('should return a string granularity as-is', function() {
       const result = getGranularityKeyName('', 'this is it', '');
@@ -2634,7 +2586,6 @@ describe('ozone Adapter', function () {
       expect(result).to.equal('string buckets');
     });
   });
-
   describe('getGranularityObject', function() {
     it('should return an object as-is', function() {
       const result = getGranularityObject('', {'name': 'mark'}, '', '');
@@ -2645,56 +2596,18 @@ describe('ozone Adapter', function () {
       expect(result.name).to.equal('rupert');
     });
   });
-
   describe('blockTheRequest', function() {
+    beforeEach(function () {
+      config.resetConfig()
+    })
     it('should return true if oz_request is false', function() {
       config.setConfig({'ozone': {'oz_request': false}});
-      let result = spec.blockTheRequest(bidderRequestWithFullGdpr);
+      let result = spec.blockTheRequest();
       expect(result).to.be.true;
-      config.resetConfig();
     });
     it('should return false if oz_request is true', function() {
       config.setConfig({'ozone': {'oz_request': true}});
-      let result = spec.blockTheRequest(bidderRequestWithFullGdpr);
-      expect(result).to.be.false;
-      config.resetConfig();
-    });
-  });
-  describe('makeLotameObjectFromOverride', function() {
-    it('should update an object with valid lotame data', function () {
-      let objLotameOverride = {'oz_lotametpid': '1234', 'oz_lotameid': '12345', 'oz_lotamepid': '123456'};
-      let result = spec.makeLotameObjectFromOverride(
-        objLotameOverride,
-        {'Profile': {'pid': 'originalpid', 'tpid': 'originaltpid', 'Audiences': {'Audience': [{'id': 'aud1'}]}}}
-      );
-      expect(result.Profile.Audiences.Audience).to.be.an('array');
-      expect(result.Profile.Audiences.Audience[0]).to.be.an('object');
-      expect(result.Profile.Audiences.Audience[0]).to.deep.include({'id': '12345', 'abbr': '12345'});
-    });
-    it('should return the original object if it seems weird', function () {
-      let objLotameOverride = {'oz_lotametpid': '1234', 'oz_lotameid': '12345', 'oz_lotamepid': '123456'};
-      let objLotameOriginal = {'Profile': {'pid': 'originalpid', 'tpid': 'originaltpid', 'somethingstrange': [{'id': 'aud1'}]}};
-      let result = spec.makeLotameObjectFromOverride(
-        objLotameOverride,
-        objLotameOriginal
-      );
-      expect(result).to.equal(objLotameOriginal);
-    });
-  });
-  describe('lotameDataIsValid', function() {
-    it('should allow a valid minimum lotame object', function() {
-      let obj = {'Profile': {'pid': '', 'tpid': '', 'Audiences': {'Audience': []}}};
-      let result = spec.isLotameDataValid(obj);
-      expect(result).to.be.true;
-    });
-    it('should allow a valid lotame object', function() {
-      let obj = {'Profile': {'pid': '12345', 'tpid': '45678', 'Audiences': {'Audience': [{'id': '1234', 'abbr': '567'}, {'id': '9999', 'abbr': '1111'}]}}};
-      let result = spec.isLotameDataValid(obj);
-      expect(result).to.be.true;
-    });
-    it('should disallow a lotame object without an Audience.id', function() {
-      let obj = {'Profile': {'tpid': '', 'pid': '', 'Audiences': {'Audience': [{'abbr': 'marktest'}]}}};
-      let result = spec.isLotameDataValid(obj);
+      let result = spec.blockTheRequest();
       expect(result).to.be.false;
     });
   });
@@ -2720,24 +2633,6 @@ describe('ozone Adapter', function () {
       expect(result).to.equal('outstream');
     });
   });
-  describe('getLotameOverrideParams', function() {
-    it('should get 3 valid lotame params that exist in GET params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': 'tpid123'};
-      };
-      let result = spec.getLotameOverrideParams();
-      expect(Object.keys(result).length).to.equal(3);
-    });
-    it('should get only 1 valid lotame param that exists in GET params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'xoz_lotamepid': 'pid123', 'xoz_lotametpid': 'tpid123'};
-      };
-      let result = spec.getLotameOverrideParams();
-      expect(Object.keys(result).length).to.equal(1);
-    });
-  });
   describe('unpackVideoConfigIntoIABformat', function() {
     it('should correctly unpack a usual video config', function () {
       let mediaTypes = {
@@ -2819,4 +2714,45 @@ describe('ozone Adapter', function () {
       expect(response[1].bid.length).to.equal(2);
     });
   });
+  describe('getWhitelabelConfigItem', function() {
+    beforeEach(function () {
+      config.resetConfig()
+    })
+    it('should fetch the whitelabelled equivalent config value correctly', function () {
+      var specMock = utils.deepClone(spec);
+      config.setConfig({'ozone': {'oz_omp_floor': 'ozone-floor-value'}});
+      config.setConfig({'markbidder': {'mb_omp_floor': 'markbidder-floor-value'}});
+      specMock.propertyBag.whitelabel = {bidder: 'ozone', keyPrefix: 'oz'};
+      let testKey = 'ozone.oz_omp_floor';
+      let ozone_value = specMock.getWhitelabelConfigItem(testKey);
+      expect(ozone_value).to.equal('ozone-floor-value');
+      specMock.propertyBag.whitelabel = {bidder: 'markbidder', keyPrefix: 'mb'};
+      let markbidder_config = specMock.getWhitelabelConfigItem(testKey);
+      expect(markbidder_config).to.equal('markbidder-floor-value');
+      config.setConfig({'markbidder': {'singleRequest': 'markbidder-singlerequest-value'}});
+      let testKey2 = 'ozone.singleRequest';
+      let markbidder_config2 = specMock.getWhitelabelConfigItem(testKey2);
+      expect(markbidder_config2).to.equal('markbidder-singlerequest-value');
+    });
+  });
+  describe('setBidMediaTypeIfNotExist', function() {
+    it('should leave the bid object alone if it already contains mediaType', function() {
+      let thisBid = {mediaType: 'marktest'};
+      spec.setBidMediaTypeIfNotExist(thisBid, 'replacement');
+      expect(thisBid.mediaType).to.equal('marktest');
+    });
+    it('should change the bid object if it doesnt already contain mediaType', function() {
+      let thisBid = {someKey: 'someValue'};
+      spec.setBidMediaTypeIfNotExist(thisBid, 'replacement');
+      expect(thisBid.mediaType).to.equal('replacement');
+    });
+  });
+  describe('getLoggableBidObject', function() {
+    it('should return an object without a "renderer" element', function () {
+      let obj = {'renderer': {}, 'somevalue': '', 'h': 100};
+      let ret = spec.getLoggableBidObject(obj);
+      expect(ret).to.not.have.own.property('renderer');
+      expect(ret.h).to.equal(100);
+    });
+  });
 });
diff --git a/test/spec/modules/papyrusBidAdapter_spec.js b/test/spec/modules/papyrusBidAdapter_spec.js
deleted file mode 100644
index 20fcced2950..00000000000
--- a/test/spec/modules/papyrusBidAdapter_spec.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/papyrusBidAdapter.js';
-
-const ENDPOINT = 'https://prebid.papyrus.global';
-const BIDDER_CODE = 'papyrus';
-
-describe('papyrus Adapter', function () {
-  describe('isBidRequestValid', function () {
-    let validBidReq = {
-      bidder: BIDDER_CODE,
-      params: {
-        address: '0xd7e2a771c5dcd5df7f789477356aecdaeee6c985',
-        placementId: 'b57e55fd18614b0591893e9fff41fbea'
-      }
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
-    });
-
-    let invalidBidReq = {
-      bidder: BIDDER_CODE,
-      params: {
-        'placementId': ''
-      }
-    };
-
-    it('should not validate incorrect bid request', function () {
-      expect(spec.isBidRequestValid(invalidBidReq)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        bidder: BIDDER_CODE,
-        params: {
-          address: '0xd7e2a771c5dcd5df7f789477356aecdaeee6c985',
-          placementId: 'b57e55fd18614b0591893e9fff41fbea'
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      }
-    ];
-
-    it('sends bid request to ENDPOINT via POST', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal(ENDPOINT);
-      expect(request.method).to.equal('POST');
-    });
-
-    it('sends valid bids count', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.data.length).to.equal(1);
-    });
-
-    it('sends all bid parameters', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.data[0]).to.have.all.keys(['address', 'placementId', 'sizes', 'bidId', 'transactionId']);
-    });
-
-    it('sedns valid sizes parameter', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.data[0].sizes[0]).to.equal('300x250');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let bidRequests = [
-      {
-        bidder: BIDDER_CODE,
-        params: {
-          address: '0xd7e2a771c5dcd5df7f789477356aecdaeee6c985',
-          placementId: 'b57e55fd18614b0591893e9fff41fbea'
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      }
-    ];
-
-    let bidResponse = {
-      bids: [
-        {
-          id: '1036e9746c-d186-49ae-90cb-2796d0f9b223',
-          adm: 'test adm',
-          cpm: 100,
-          height: 250,
-          width: 300
-        }
-      ]
-    };
-
-    it('should build bid array', function () {
-      const request = spec.buildRequests(bidRequests);
-      const result = spec.interpretResponse({body: bidResponse}, request[0]);
-      expect(result.length).to.equal(1);
-    });
-
-    it('should have all relevant fields', function () {
-      const request = spec.buildRequests(bidRequests);
-      const result = spec.interpretResponse({body: bidResponse}, request[0]);
-      const bid = result[0];
-
-      expect(bid.cpm).to.equal(bidResponse.bids[0].cpm);
-      expect(bid.width).to.equal(bidResponse.bids[0].width);
-      expect(bid.height).to.equal(bidResponse.bids[0].height);
-    });
-  });
-});
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index fdfd3042561..55287e0bfec 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import {find} from 'src/polyfill.js';
 import { config } from 'src/config.js';
 import * as utils from 'src/utils.js';
 import { newStorageManager } from 'src/storageManager.js';
@@ -7,19 +8,22 @@ 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();
 
 const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+const EXPIRE_COOKIE_TIME = 864000000;
 const P_COOKIE_NAME = '_parrable_id';
 const P_COOKIE_EID = '01.1563917337.test-eid';
 const P_XHR_EID = '01.1588030911.test-new-eid'
 const P_CONFIG_MOCK = {
   name: 'parrableId',
   params: {
-    partner: 'parrable_test_partner_123,parrable_test_partner_456'
+    partners: 'parrable_test_partner_123,parrable_test_partner_456'
   }
 };
+const RESPONSE_HEADERS = { 'Content-Type': 'application/json' };
 
 function getConfigMock() {
   return {
@@ -56,6 +60,15 @@ function serializeParrableId(parrableId) {
   if (parrableId.ccpaOptout) {
     str += ',ccpaOptout:1';
   }
+  if (parrableId.tpc !== undefined) {
+    const tpcSupportComponent = parrableId.tpc === true ? 'tpc:1' : 'tpc:0';
+    str += `,${tpcSupportComponent}`;
+    str += `,tpcUntil:${parrableId.tpcUntil}`;
+  }
+  if (parrableId.filteredUntil) {
+    str += `,filteredUntil:${parrableId.filteredUntil}`;
+    str += `,filterHits:${parrableId.filterHits}`;
+  }
   return str;
 }
 
@@ -64,7 +77,7 @@ function writeParrableCookie(parrableId) {
   storage.setCookie(
     P_COOKIE_NAME,
     cookieValue,
-    (new Date(Date.now() + 5000).toUTCString()),
+    (new Date(Date.now() + EXPIRE_COOKIE_TIME).toUTCString()),
     'lax'
   );
 }
@@ -73,114 +86,344 @@ function removeParrableCookie() {
   storage.setCookie(P_COOKIE_NAME, '', EXPIRED_COOKIE_DATE);
 }
 
+function decodeBase64UrlSafe(encBase64) {
+  const DEC = {
+    '-': '+',
+    '_': '/',
+    '.': '='
+  };
+  return encBase64.replace(/[-_.]/g, (m) => DEC[m]);
+}
+
 describe('Parrable ID System', function() {
-  describe('parrableIdSystem.getId() callback', function() {
-    let logErrorStub;
-    let callbackSpy = sinon.spy();
+  after(() => {
+    // reset ID system to avoid delayed callbacks in other tests
+    config.resetConfig();
+    init(config);
+  });
 
-    beforeEach(function() {
-      logErrorStub = sinon.stub(utils, 'logError');
-      callbackSpy.resetHistory();
-      writeParrableCookie({ eid: P_COOKIE_EID });
-    });
+  describe('parrableIdSystem.getId()', function() {
+    describe('response callback function', function() {
+      let logErrorStub;
+      let callbackSpy = sinon.spy();
 
-    afterEach(function() {
-      removeParrableCookie();
-      logErrorStub.restore();
-    })
+      beforeEach(function() {
+        logErrorStub = sinon.stub(utils, 'logError');
+        callbackSpy.resetHistory();
+        writeParrableCookie({ eid: P_COOKIE_EID });
+      });
+
+      afterEach(function() {
+        removeParrableCookie();
+        logErrorStub.restore();
+      })
 
-    it('creates xhr to Parrable that synchronizes the ID', function() {
-      let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK.params);
+      it('creates xhr to Parrable that synchronizes the ID', function() {
+        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
 
-      getIdResult.callback(callbackSpy);
+        getIdResult.callback(callbackSpy);
+
+        let request = server.requests[0];
+        let queryParams = utils.parseQS(request.url.split('?')[1]);
+        let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
+
+        expect(getIdResult.callback).to.be.a('function');
+        expect(request.url).to.contain('h.parrable.com');
+
+        expect(queryParams).to.not.have.property('us_privacy');
+        expect(data).to.deep.equal({
+          eid: P_COOKIE_EID,
+          trackers: P_CONFIG_MOCK.params.partners.split(','),
+          url: getRefererInfo().page,
+          prebidVersion: '$prebid.version$',
+          isIframe: true
+        });
 
-      let request = server.requests[0];
-      let queryParams = utils.parseQS(request.url.split('?')[1]);
-      let data = JSON.parse(atob(queryParams.data));
+        server.requests[0].respond(200,
+          { 'Content-Type': 'text/plain' },
+          JSON.stringify({ eid: P_XHR_EID })
+        );
+        expect(callbackSpy.lastCall.lastArg).to.deep.equal({
+          eid: P_XHR_EID
+        });
 
-      expect(getIdResult.callback).to.be.a('function');
-      expect(request.url).to.contain('h.parrable.com');
+        expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+          encodeURIComponent('eid:' + P_XHR_EID)
+        );
+      });
 
-      expect(queryParams).to.not.have.property('us_privacy');
-      expect(data).to.deep.equal({
-        eid: P_COOKIE_EID,
-        trackers: P_CONFIG_MOCK.params.partner.split(','),
-        url: getRefererInfo().referer
+      it('xhr passes the uspString to Parrable', function() {
+        let uspString = '1YNN';
+        uspDataHandler.setConsentData(uspString);
+        parrableIdSubmodule.getId(
+          P_CONFIG_MOCK,
+          null,
+          null
+        ).callback(callbackSpy);
+        uspDataHandler.setConsentData(null);
+        expect(server.requests[0].url).to.contain('us_privacy=' + uspString);
       });
 
-      server.requests[0].respond(200,
-        { 'Content-Type': 'text/plain' },
-        JSON.stringify({ eid: P_XHR_EID })
-      );
+      it('xhr base64 safely encodes url data object', function() {
+        const urlSafeBase64EncodedData = '-_.';
+        const btoaStub = sinon.stub(window, 'btoa').returns('+/=');
+        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+
+        getIdResult.callback(callbackSpy);
 
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal({
-        eid: P_XHR_EID
+        let request = server.requests[0];
+        let queryParams = utils.parseQS(request.url.split('?')[1]);
+        expect(queryParams.data).to.equal(urlSafeBase64EncodedData);
+        btoaStub.restore();
       });
 
-      expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-        encodeURIComponent('eid:' + P_XHR_EID)
-      );
+      it('should log an error and continue to callback if ajax request errors', function () {
+        let callBackSpy = sinon.spy();
+        let submoduleCallback = parrableIdSubmodule.getId({ params: {partners: 'prebid'} }).callback;
+        submoduleCallback(callBackSpy);
+        let request = server.requests[0];
+        expect(request.url).to.contain('h.parrable.com');
+        request.respond(
+          503,
+          null,
+          'Unavailable'
+        );
+        expect(logErrorStub.calledOnce).to.be.true;
+        expect(callBackSpy.calledOnce).to.be.true;
+      });
     });
 
-    it('xhr passes the uspString to Parrable', function() {
-      let uspString = '1YNN';
-      uspDataHandler.setConsentData(uspString);
-      parrableIdSubmodule.getId(
-        P_CONFIG_MOCK.params,
-        null,
-        null
-      ).callback(callbackSpy);
-      uspDataHandler.setConsentData(null);
-      expect(server.requests[0].url).to.contain('us_privacy=' + uspString);
+    describe('response id', function() {
+      it('provides the stored Parrable values if a cookie exists', function() {
+        writeParrableCookie({ eid: P_COOKIE_EID });
+        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+        removeParrableCookie();
+
+        expect(getIdResult.id).to.deep.equal({
+          eid: P_COOKIE_EID
+        });
+      });
+
+      it('provides the stored legacy Parrable ID values if cookies exist', function() {
+        let oldEid = '01.111.old-eid';
+        let oldEidCookieName = '_parrable_eid';
+        let oldOptoutCookieName = '_parrable_optout';
+
+        storage.setCookie(oldEidCookieName, oldEid);
+        storage.setCookie(oldOptoutCookieName, 'true');
+
+        let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+        expect(getIdResult.id).to.deep.equal({
+          eid: oldEid,
+          ibaOptout: true
+        });
+
+        // The ID system is expected to migrate old cookies to the new format
+        expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+          encodeURIComponent('eid:' + oldEid + ',ibaOptout:1')
+        );
+        expect(storage.getCookie(oldEidCookieName)).to.equal(null);
+        expect(storage.getCookie(oldOptoutCookieName)).to.equal(null);
+        removeParrableCookie();
+      });
     });
 
-    it('should log an error and continue to callback if ajax request errors', function () {
-      let callBackSpy = sinon.spy();
-      let submoduleCallback = parrableIdSubmodule.getId({partner: 'prebid'}).callback;
-      submoduleCallback(callBackSpy);
-      let request = server.requests[0];
-      expect(request.url).to.contain('h.parrable.com');
-      request.respond(
-        503,
-        null,
-        'Unavailable'
-      );
-      expect(logErrorStub.calledOnce).to.be.true;
-      expect(callBackSpy.calledOnce).to.be.true;
+    describe('GDPR consent', () => {
+      let callbackSpy = sinon.spy();
+
+      const config = {
+        params: {
+          partner: 'partner'
+        }
+      };
+
+      const gdprConsentTestCases = [
+        { consentData: { gdprApplies: true, consentString: 'expectedConsentString' }, expected: { gdpr: 1, gdpr_consent: 'expectedConsentString' } },
+        { consentData: { gdprApplies: false, consentString: 'expectedConsentString' }, expected: { gdpr: 0 } },
+        { consentData: { gdprApplies: true, consentString: undefined }, expected: { gdpr: 1, gdpr_consent: '' } },
+        { consentData: { gdprApplies: 'yes', consentString: 'expectedConsentString' }, expected: { gdpr: 0 } },
+        { consentData: undefined, expected: { gdpr: 0 } }
+      ];
+
+      gdprConsentTestCases.forEach((testCase, index) => {
+        it(`should call user sync url with the gdprConsent - case ${index}`, () => {
+          parrableIdSubmodule.getId(config, testCase.consentData).callback(callbackSpy);
+
+          if (testCase.expected.gdpr === 1) {
+            expect(server.requests[0].url).to.contain('gdpr=' + testCase.expected.gdpr);
+            expect(server.requests[0].url).to.contain('gdpr_consent=' + testCase.expected.gdpr_consent);
+          } else {
+            expect(server.requests[0].url).to.contain('gdpr=' + testCase.expected.gdpr);
+            expect(server.requests[0].url).to.not.contain('gdpr_consent');
+          }
+        })
+      });
     });
-  });
 
-  describe('parrableIdSystem.getId() id', function() {
-    it('provides the stored Parrable values if a cookie exists', function() {
-      writeParrableCookie({ eid: P_COOKIE_EID });
-      let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK.params);
-      removeParrableCookie();
+    describe('third party cookie support', function () {
+      let logErrorStub;
+      let callbackSpy = sinon.spy();
+
+      beforeEach(function() {
+        logErrorStub = sinon.stub(utils, 'logError');
+      });
+
+      afterEach(function () {
+        callbackSpy.resetHistory();
+        removeParrableCookie();
+      });
 
-      expect(getIdResult.id).to.deep.equal({
-        eid: P_COOKIE_EID
+      afterEach(function() {
+        logErrorStub.restore();
+      });
+
+      describe('when getting tpcSupport from XHR response', function () {
+        let request;
+        let dateNowStub;
+        const dateNowMock = Date.now();
+        const tpcSupportTtl = 1;
+
+        before(() => {
+          dateNowStub = sinon.stub(Date, 'now').returns(dateNowMock);
+        });
+
+        after(() => {
+          dateNowStub.restore();
+        });
+
+        it('should set tpcSupport: true and tpcUntil in the cookie', function () {
+          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+          callback(callbackSpy);
+          request = server.requests[0];
+
+          request.respond(
+            200,
+            RESPONSE_HEADERS,
+            JSON.stringify({ eid: P_XHR_EID, tpcSupport: true, tpcSupportTtl })
+          );
+
+          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+            encodeURIComponent('eid:' + P_XHR_EID + ',tpc:1,tpcUntil:' + Math.floor((dateNowMock / 1000) + tpcSupportTtl))
+          );
+        });
+
+        it('should set tpcSupport: false and tpcUntil in the cookie', function () {
+          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+          callback(callbackSpy);
+          request = server.requests[0];
+          request.respond(
+            200,
+            RESPONSE_HEADERS,
+            JSON.stringify({ eid: P_XHR_EID, tpcSupport: false, tpcSupportTtl })
+          );
+
+          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+            encodeURIComponent('eid:' + P_XHR_EID + ',tpc:0,tpcUntil:' + Math.floor((dateNowMock / 1000) + tpcSupportTtl))
+          );
+        });
+
+        it('should not set tpcSupport in the cookie', function () {
+          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+          callback(callbackSpy);
+          request = server.requests[0];
+
+          request.respond(
+            200,
+            RESPONSE_HEADERS,
+            JSON.stringify({ eid: P_XHR_EID })
+          );
+
+          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+            encodeURIComponent('eid:' + P_XHR_EID)
+          );
+        });
       });
     });
 
-    it('provides the stored legacy Parrable ID values if cookies exist', function() {
-      let oldEid = '01.111.old-eid';
-      let oldEidCookieName = '_parrable_eid';
-      let oldOptoutCookieName = '_parrable_optout';
+    describe('request-filter status', function () {
+      let logErrorStub;
+      let callbackSpy = sinon.spy();
 
-      storage.setCookie(oldEidCookieName, oldEid);
-      storage.setCookie(oldOptoutCookieName, 'true');
+      beforeEach(function() {
+        logErrorStub = sinon.stub(utils, 'logError');
+      });
 
-      let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK.params);
-      expect(getIdResult.id).to.deep.equal({
-        eid: oldEid,
-        ibaOptout: true
+      afterEach(function () {
+        callbackSpy.resetHistory();
+        removeParrableCookie();
       });
 
-      // The ID system is expected to migrate old cookies to the new format
-      expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
-        encodeURIComponent('eid:' + oldEid + ',ibaOptout:1')
-      );
-      expect(storage.getCookie(oldEidCookieName)).to.equal(null);
-      expect(storage.getCookie(oldOptoutCookieName)).to.equal(null);
+      afterEach(function() {
+        logErrorStub.restore();
+      });
+
+      describe('when getting filterTtl from XHR response', function () {
+        let request;
+        let dateNowStub;
+        const dateNowMock = Date.now();
+        const filterTtl = 1000;
+
+        before(() => {
+          dateNowStub = sinon.stub(Date, 'now').returns(dateNowMock);
+        });
+
+        after(() => {
+          dateNowStub.restore();
+        });
+
+        it('should set filteredUntil in the cookie', function () {
+          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+          callback(callbackSpy);
+          request = server.requests[0];
+
+          request.respond(
+            200,
+            RESPONSE_HEADERS,
+            JSON.stringify({ eid: P_XHR_EID, filterTtl })
+          );
+
+          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+            encodeURIComponent(
+              'eid:' + P_XHR_EID +
+              ',filteredUntil:' + Math.floor((dateNowMock / 1000) + filterTtl) +
+              ',filterHits:0')
+          );
+        });
+
+        it('should increment filterHits in the cookie', function () {
+          writeParrableCookie({
+            eid: P_XHR_EID,
+            filteredUntil: Math.floor((dateNowMock / 1000) + filterTtl),
+            filterHits: 0
+          });
+          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+          callback(callbackSpy);
+
+          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+            encodeURIComponent(
+              'eid:' + P_XHR_EID +
+              ',filteredUntil:' + Math.floor((dateNowMock / 1000) + filterTtl) +
+              ',filterHits:1')
+          );
+        });
+
+        it('should send filterHits in the XHR', function () {
+          const filterHits = 1;
+          writeParrableCookie({
+            eid: P_XHR_EID,
+            filteredUntil: Math.floor(dateNowMock / 1000),
+            filterHits
+          });
+          let { callback } = parrableIdSubmodule.getId(P_CONFIG_MOCK);
+          callback(callbackSpy);
+          request = server.requests[0];
+
+          let queryParams = utils.parseQS(request.url.split('?')[1]);
+          let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
+
+          expect(data.filterHits).to.equal(filterHits);
+        });
+      });
     });
   });
 
@@ -189,41 +432,331 @@ describe('Parrable ID System', function() {
       let eid = '01.123.4567890';
       let parrableId = {
         eid,
-        ccpaOptout: true
+        ibaOptout: true
       };
 
       expect(parrableIdSubmodule.decode(parrableId)).to.deep.equal({
-        parrableid: eid
+        parrableId
       });
     });
   });
 
+  describe('timezone filtering', function() {
+    before(function() {
+      sinon.stub(Intl, 'DateTimeFormat');
+    });
+
+    after(function() {
+      Intl.DateTimeFormat.restore();
+    });
+
+    it('permits an impression when no timezoneFilter is configured', function() {
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+      } })).to.have.property('callback');
+    });
+
+    it('permits an impression from a blocked timezone when a cookie exists', function() {
+      const blockedZone = 'Antarctica/South_Pole';
+      const resolvedOptions = sinon.stub().returns({ timeZone: blockedZone });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      writeParrableCookie({ eid: P_COOKIE_EID });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          blockedZones: [ blockedZone ]
+        }
+      } })).to.have.property('callback');
+      expect(resolvedOptions.called).to.equal(false);
+
+      removeParrableCookie();
+    })
+
+    it('permits an impression from an allowed timezone', function() {
+      const allowedZone = 'America/New_York';
+      const resolvedOptions = sinon.stub().returns({ timeZone: allowedZone });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          allowedZones: [ allowedZone ]
+        }
+      } })).to.have.property('callback');
+      expect(resolvedOptions.called).to.equal(true);
+    });
+
+    it('permits an impression from a lower cased allowed timezone', function() {
+      const allowedZone = 'America/New_York';
+      const resolvedOptions = sinon.stub().returns({ timeZone: allowedZone });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partner: 'prebid-test',
+        timezoneFilter: {
+          allowedZones: [ allowedZone.toLowerCase() ]
+        }
+      } })).to.have.property('callback');
+      expect(resolvedOptions.called).to.equal(true);
+    });
+
+    it('permits an impression from a timezone that is not blocked', function() {
+      const blockedZone = 'America/New_York';
+      const resolvedOptions = sinon.stub().returns({ timeZone: 'Iceland' });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          blockedZones: [ blockedZone ]
+        }
+      } })).to.have.property('callback');
+      expect(resolvedOptions.called).to.equal(true);
+    });
+
+    it('does not permit an impression from a blocked timezone', function() {
+      const blockedZone = 'America/New_York';
+      const resolvedOptions = sinon.stub().returns({ timeZone: blockedZone });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          blockedZones: [ blockedZone ]
+        }
+      } })).to.equal(null);
+      expect(resolvedOptions.called).to.equal(true);
+    });
+
+    it('does not permit an impression from a lower cased blocked timezone', function() {
+      const blockedZone = 'America/New_York';
+      const resolvedOptions = sinon.stub().returns({ timeZone: blockedZone });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partner: 'prebid-test',
+        timezoneFilter: {
+          blockedZones: [ blockedZone.toLowerCase() ]
+        }
+      } })).to.equal(null);
+      expect(resolvedOptions.called).to.equal(true);
+    });
+
+    it('does not permit an impression from a blocked timezone even when also allowed', function() {
+      const timezone = 'America/New_York';
+      const resolvedOptions = sinon.stub().returns({ timeZone: timezone });
+      Intl.DateTimeFormat.returns({ resolvedOptions });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          allowedZones: [ timezone ],
+          blockedZones: [ timezone ]
+        }
+      } })).to.equal(null);
+      expect(resolvedOptions.called).to.equal(true);
+    });
+  });
+
+  describe('timezone offset filtering', function() {
+    before(function() {
+      sinon.stub(Date.prototype, 'getTimezoneOffset');
+    });
+
+    afterEach(function() {
+      Date.prototype.getTimezoneOffset.reset();
+    })
+
+    after(function() {
+      Date.prototype.getTimezoneOffset.restore();
+    });
+
+    it('permits an impression from a blocked offset when a cookie exists', function() {
+      const blockedOffset = -4;
+      Date.prototype.getTimezoneOffset.returns(blockedOffset * 60);
+
+      writeParrableCookie({ eid: P_COOKIE_EID });
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          blockedOffsets: [ blockedOffset ]
+        }
+      } })).to.have.property('callback');
+
+      removeParrableCookie();
+    });
+
+    it('permits an impression from an allowed offset', function() {
+      const allowedOffset = -5;
+      Date.prototype.getTimezoneOffset.returns(allowedOffset * 60);
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          allowedOffsets: [ allowedOffset ]
+        }
+      } })).to.have.property('callback');
+      expect(Date.prototype.getTimezoneOffset.called).to.equal(true);
+    });
+
+    it('permits an impression from an offset that is not blocked', function() {
+      const allowedOffset = -5;
+      const blockedOffset = 5;
+      Date.prototype.getTimezoneOffset.returns(allowedOffset * 60);
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          blockedOffsets: [ blockedOffset ]
+        }
+      }})).to.have.property('callback');
+      expect(Date.prototype.getTimezoneOffset.called).to.equal(true);
+    });
+
+    it('does not permit an impression from a blocked offset', function() {
+      const blockedOffset = -5;
+      Date.prototype.getTimezoneOffset.returns(blockedOffset * 60);
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          blockedOffsets: [ blockedOffset ]
+        }
+      } })).to.equal(null);
+      expect(Date.prototype.getTimezoneOffset.called).to.equal(true);
+    });
+
+    it('does not permit an impression from a blocked offset even when also allowed', function() {
+      const offset = -5;
+      Date.prototype.getTimezoneOffset.returns(offset * 60);
+
+      expect(parrableIdSubmodule.getId({ params: {
+        partners: 'prebid-test',
+        timezoneFilter: {
+          allowedOffset: [ offset ],
+          blockedOffsets: [ offset ]
+        }
+      } })).to.equal(null);
+      expect(Date.prototype.getTimezoneOffset.called).to.equal(true);
+    });
+  });
+
   describe('userId requestBids hook', function() {
     let adUnits;
+    let sandbox;
 
     beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      mockGdprConsent(sandbox);
       adUnits = [getAdUnitMock()];
-      writeParrableCookie({ eid: P_COOKIE_EID });
-      setSubmoduleRegistry([parrableIdSubmodule]);
+      writeParrableCookie({ eid: P_COOKIE_EID, ibaOptout: true });
       init(config);
-      config.setConfig(getConfigMock());
+      setSubmoduleRegistry([parrableIdSubmodule]);
     });
 
     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) {
+      config.setConfig(getConfigMock());
+      requestBidsHook(function() {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.parrableId');
+            expect(bid.userId.parrableId.eid).to.equal(P_COOKIE_EID);
+            expect(bid.userId.parrableId.ibaOptout).to.equal(true);
+            const parrableIdAsEid = find(bid.userIdAsEids, e => e.source == 'parrable.com');
+            expect(parrableIdAsEid).to.deep.equal({
+              source: 'parrable.com',
+              uids: [{
+                id: P_COOKIE_EID,
+                atype: 1,
+                ext: {
+                  ibaOptout: true
+                }
+              }]
+            });
+          });
+        });
+        done();
+      }, { adUnits });
+    });
+
+    it('supplies an optout reason when the EID is missing due to CCPA non-consent', function(done) {
+      // the ID system itself will not write a cookie with an EID when CCPA=true
+      writeParrableCookie({ ccpaOptout: true });
+      config.setConfig(getConfigMock());
+
       requestBidsHook(function() {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.parrableid');
-            expect(bid.userId.parrableid).to.equal(P_COOKIE_EID);
+            expect(bid).to.have.deep.nested.property('userId.parrableId');
+            expect(bid.userId.parrableId).to.not.have.property('eid');
+            expect(bid.userId.parrableId.ccpaOptout).to.equal(true);
+            const parrableIdAsEid = find(bid.userIdAsEids, e => e.source == 'parrable.com');
+            expect(parrableIdAsEid).to.deep.equal({
+              source: 'parrable.com',
+              uids: [{
+                id: '',
+                atype: 1,
+                ext: {
+                  ccpaOptout: true
+                }
+              }]
+            });
           });
         });
         done();
       }, { adUnits });
     });
   });
+
+  describe('partners parsing', function () {
+    let callbackSpy = sinon.spy();
+
+    const partnersTestCase = [
+      {
+        name: '"partners" as an array',
+        config: { params: { partners: ['parrable_test_partner_123', 'parrable_test_partner_456'] } },
+        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
+      },
+      {
+        name: '"partners" as a string list',
+        config: { params: { partners: 'parrable_test_partner_123,parrable_test_partner_456' } },
+        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
+      },
+      {
+        name: '"partners" as a string',
+        config: { params: { partners: 'parrable_test_partner_123' } },
+        expected: ['parrable_test_partner_123']
+      },
+      {
+        name: '"partner" as a string list',
+        config: { params: { partner: 'parrable_test_partner_123,parrable_test_partner_456' } },
+        expected: ['parrable_test_partner_123', 'parrable_test_partner_456']
+      },
+      {
+        name: '"partner" as string',
+        config: { params: { partner: 'parrable_test_partner_123' } },
+        expected: ['parrable_test_partner_123']
+      },
+    ];
+    partnersTestCase.forEach(testCase => {
+      it(`accepts config property ${testCase.name}`, () => {
+        parrableIdSubmodule.getId(testCase.config).callback(callbackSpy);
+
+        let request = server.requests[0];
+        let queryParams = utils.parseQS(request.url.split('?')[1]);
+        let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
+
+        expect(data.trackers).to.deep.equal(testCase.expected);
+      });
+    });
+  });
 });
diff --git a/test/spec/modules/permutiveRtdProvider_spec.js b/test/spec/modules/permutiveRtdProvider_spec.js
new file mode 100644
index 00000000000..5030e662ea9
--- /dev/null
+++ b/test/spec/modules/permutiveRtdProvider_spec.js
@@ -0,0 +1,801 @@
+import {
+  permutiveSubmodule,
+  storage,
+  getSegments,
+  initSegments,
+  isAcEnabled,
+  isPermutiveOnPage,
+  setBidderRtb,
+  getModuleConfig,
+  PERMUTIVE_SUBMODULE_CONFIG_KEY,
+} from 'modules/permutiveRtdProvider.js'
+import { deepAccess, deepSetValue, mergeDeep } from '../../../src/utils.js'
+import { config } from 'src/config.js'
+
+describe('permutiveRtdProvider', function () {
+  beforeEach(function () {
+    const data = getTargetingData()
+    setLocalStorage(data)
+    config.resetConfig()
+  })
+
+  afterEach(function () {
+    const data = getTargetingData()
+    removeLocalStorage(data)
+    config.resetConfig()
+  })
+
+  describe('permutiveSubmodule', function () {
+    it('should initalise and return true', function () {
+      expect(permutiveSubmodule.init()).to.equal(true)
+    })
+  })
+
+  describe('getModuleConfig', function () {
+    beforeEach(function () {
+      // Reads data from the cache
+      permutiveSubmodule.init()
+    })
+
+    const liftToParams = (params) => ({ params })
+
+    const getDefaultConfig = () => ({
+      waitForIt: false,
+      params: {
+        maxSegs: 500,
+        acBidders: [],
+        overwrites: {},
+      },
+    })
+
+    const storeConfigInCacheAndInit = (data) => {
+      const dataToStore = { [PERMUTIVE_SUBMODULE_CONFIG_KEY]: data }
+      setLocalStorage(dataToStore)
+      // Reads data from the cache
+      permutiveSubmodule.init()
+
+      // Cleanup
+      return () => removeLocalStorage(dataToStore)
+    }
+
+    const setWindowPermutivePrebid = (getPermutiveRtdConfig) => {
+      // Read from Permutive
+      const backup = window.permutive
+
+      deepSetValue(window, 'permutive.addons.prebid', {
+        getPermutiveRtdConfig,
+      })
+
+      // Cleanup
+      return () => window.permutive = backup
+    }
+
+    it('should return default values', function () {
+      const config = getModuleConfig({})
+      expect(config).to.deep.equal(getDefaultConfig())
+    })
+
+    it('should override deeply on custom config', function () {
+      const defaultConfig = getDefaultConfig()
+
+      const customModuleConfig = { waitForIt: true, params: { acBidders: ['123'] } }
+      const config = getModuleConfig(customModuleConfig)
+
+      expect(config).to.deep.equal(mergeDeep(defaultConfig, customModuleConfig))
+    })
+
+    it('should override deeply on cached config', function () {
+      const defaultConfig = getDefaultConfig()
+
+      const cachedParamsConfig = { acBidders: ['123'] }
+      const cleanupCache = storeConfigInCacheAndInit(cachedParamsConfig)
+
+      const config = getModuleConfig({})
+
+      expect(config).to.deep.equal(mergeDeep(defaultConfig, liftToParams(cachedParamsConfig)))
+
+      // Cleanup
+      cleanupCache()
+    })
+
+    it('should override deeply on Permutive Rtd config', function () {
+      const defaultConfig = getDefaultConfig()
+
+      const permutiveRtdConfigParams = { acBidders: ['123'], overwrites: { '123': true } }
+      const cleanupPermutive = setWindowPermutivePrebid(function () {
+        return permutiveRtdConfigParams
+      })
+
+      const config = getModuleConfig({})
+
+      expect(config).to.deep.equal(mergeDeep(defaultConfig, liftToParams(permutiveRtdConfigParams)))
+
+      // Cleanup
+      cleanupPermutive()
+    })
+
+    it('should NOT use cached Permutive Rtd config if window.permutive is available', function () {
+      const defaultConfig = getDefaultConfig()
+
+      // As Permutive is available on the window object, this value won't be used.
+      const cachedParamsConfig = { acBidders: ['123'] }
+      const cleanupCache = storeConfigInCacheAndInit(cachedParamsConfig)
+
+      const permutiveRtdConfigParams = { acBidders: ['456'], overwrites: { '123': true } }
+      const cleanupPermutive = setWindowPermutivePrebid(function () {
+        return permutiveRtdConfigParams
+      })
+
+      const config = getModuleConfig({})
+
+      expect(config).to.deep.equal(mergeDeep(defaultConfig, liftToParams(permutiveRtdConfigParams)))
+
+      // Cleanup
+      cleanupCache()
+      cleanupPermutive()
+    })
+
+    it('should handle calling Permutive method throwing error', function () {
+      const defaultConfig = getDefaultConfig()
+
+      const cleanupPermutive = setWindowPermutivePrebid(function () {
+        throw new Error()
+      })
+
+      const config = getModuleConfig({})
+
+      expect(config).to.deep.equal(defaultConfig)
+
+      // Cleanup
+      cleanupPermutive()
+    })
+
+    it('should override deeply in priority order', function () {
+      const defaultConfig = getDefaultConfig()
+
+      // As Permutive is available on the window object, this value won't be used.
+      const cachedConfig = { acBidders: ['123'] }
+      const cleanupCache = storeConfigInCacheAndInit(cachedConfig)
+
+      // Read from Permutive
+      const permutiveRtdConfig = { acBidders: ['456'] }
+      const cleanupPermutive = setWindowPermutivePrebid(function () {
+        return permutiveRtdConfig
+      })
+
+      const customModuleConfig = { params: { acBidders: ['789'], maxSegs: 499 } }
+      const config = getModuleConfig(customModuleConfig)
+
+      // The configs are in reverse priority order as configs are merged left to right. So the priority is,
+      // 1. customModuleConfig <- set by publisher with pbjs.setConfig
+      // 2. permutiveRtdConfig <- set by the publisher using Permutive.
+      // 3. defaultConfig
+      const configMergedInPriorityOrder = mergeDeep(defaultConfig, liftToParams(permutiveRtdConfig), customModuleConfig)
+      expect(config).to.deep.equal(configMergedInPriorityOrder)
+
+      // Cleanup
+      cleanupCache()
+      cleanupPermutive()
+    })
+  })
+
+  describe('ortb2 config', function () {
+    beforeEach(function () {
+      config.resetConfig()
+    })
+
+    it('should add ortb2 config', function () {
+      const moduleConfig = getConfig()
+      const bidderConfig = {};
+      const acBidders = moduleConfig.params.acBidders
+      const expectedTargetingData = transformedTargeting().ac.map(seg => {
+        return { id: seg }
+      })
+
+      setBidderRtb(bidderConfig, moduleConfig)
+
+      acBidders.forEach(bidder => {
+        expect(bidderConfig[bidder].user.data).to.deep.include.members([{
+          name: 'permutive.com',
+          segment: expectedTargetingData
+        }])
+      })
+    })
+    it('should include ortb2 user data transformation for IAB audience taxonomy', function() {
+      const moduleConfig = getConfig()
+      const bidderConfig = {}
+      const acBidders = moduleConfig.params.acBidders
+      const expectedTargetingData = transformedTargeting().ac.map(seg => {
+        return { id: seg }
+      })
+
+      Object.assign(
+        moduleConfig.params,
+        {
+          transformations: [{
+            id: 'iab',
+            config: {
+              segtax: 4,
+              iabIds: {
+                1000001: '9000009',
+                1000002: '9000008'
+              }
+            }
+          }]
+        }
+      )
+
+      setBidderRtb(bidderConfig, moduleConfig)
+
+      acBidders.forEach(bidder => {
+        expect(bidderConfig[bidder].user.data).to.deep.include.members([
+          {
+            name: 'permutive.com',
+            segment: expectedTargetingData
+          },
+          {
+            name: 'permutive.com',
+            ext: { segtax: 4 },
+            segment: [{ id: '9000009' }, { id: '9000008' }]
+          }
+        ])
+      })
+    })
+    it('should not overwrite ortb2 config', function () {
+      const moduleConfig = getConfig()
+      const acBidders = moduleConfig.params.acBidders
+      const sampleOrtbConfig = {
+        site: {
+          name: 'example'
+        },
+        user: {
+          data: [
+            {
+              name: 'www.dataprovider1.com',
+              ext: { taxonomyname: 'iab_audience_taxonomy' },
+              segment: [{ id: '687' }, { id: '123' }]
+            }
+          ]
+        }
+      }
+
+      const bidderConfig = Object.fromEntries(acBidders.map(bidder => [bidder, sampleOrtbConfig]))
+
+      const transformedUserData = {
+        name: 'transformation',
+        ext: { test: true },
+        segment: [1, 2, 3]
+      }
+
+      setBidderRtb(bidderConfig, moduleConfig, {
+        // TODO: this argument is unused, is the test still valid / needed?
+        testTransformation: userData => transformedUserData
+      })
+
+      acBidders.forEach(bidder => {
+        expect(bidderConfig[bidder].site.name).to.equal(sampleOrtbConfig.site.name)
+        expect(bidderConfig[bidder].user.data).to.deep.include.members([sampleOrtbConfig.user.data[0]])
+      })
+    })
+    it('should update user.keywords and not override existing values', function () {
+      const moduleConfig = getConfig()
+      const acBidders = moduleConfig.params.acBidders
+      const sampleOrtbConfig = {
+        site: {
+          name: 'example'
+        },
+        user: {
+          keywords: 'a,b',
+          data: [
+            {
+              name: 'www.dataprovider1.com',
+              ext: { taxonomyname: 'iab_audience_taxonomy' },
+              segment: [{ id: '687' }, { id: '123' }]
+            }
+          ]
+        }
+      }
+
+      const bidderConfig = Object.fromEntries(acBidders.map(bidder => [bidder, sampleOrtbConfig]))
+
+      const transformedUserData = {
+        name: 'transformation',
+        ext: { test: true },
+        segment: [1, 2, 3]
+      }
+
+      setBidderRtb(bidderConfig, moduleConfig, {
+        // TODO: this argument is unused, is the test still valid / needed?
+        testTransformation: userData => transformedUserData
+      })
+
+      acBidders.forEach(bidder => {
+        expect(bidderConfig[bidder].site.name).to.equal(sampleOrtbConfig.site.name)
+        expect(bidderConfig[bidder].user.data).to.deep.include.members([sampleOrtbConfig.user.data[0]])
+        expect(bidderConfig[bidder].user.keywords).to.deep.equal('a,b,p_standard_aud=123,p_standard_aud=abc')
+      })
+    })
+    it('should merge ortb2 correctly for ac and ssps', function () {
+      setLocalStorage({
+        '_ppam': [],
+        '_psegs': [],
+        '_pcrprs': ['abc', 'def', 'xyz'],
+        '_pssps': {
+          ssps: ['foo', 'bar'],
+          cohorts: ['xyz', 'uvw'],
+        }
+      })
+      const moduleConfig = {
+        name: 'permutive',
+        waitForIt: true,
+        params: {
+          acBidders: ['foo', 'other'],
+          maxSegs: 30
+        }
+      }
+      const bidderConfig = {};
+
+      setBidderRtb(bidderConfig, moduleConfig)
+
+      // include both ac and ssp cohorts, as foo is both in ac bidders and ssps
+      const expectedFooTargetingData = [
+        { id: 'abc' },
+        { id: 'def' },
+        { id: 'xyz' },
+        { id: 'uvw' },
+      ]
+      expect(bidderConfig['foo'].user.data).to.deep.include.members([{
+        name: 'permutive.com',
+        segment: expectedFooTargetingData
+      }])
+
+      // don't include ac targeting as it's not in ac bidders
+      const expectedBarTargetingData = [
+        { id: 'xyz' },
+        { id: 'uvw' },
+      ]
+      expect(bidderConfig['bar'].user.data).to.deep.include.members([{
+        name: 'permutive.com',
+        segment: expectedBarTargetingData
+      }])
+
+      // only include ac targeting as this ssp is not in ssps list
+      const expectedOtherTargetingData = [
+        { id: 'abc' },
+        { id: 'def' },
+        { id: 'xyz' },
+      ]
+      expect(bidderConfig['other'].user.data).to.deep.include.members([{
+        name: 'permutive.com',
+        segment: expectedOtherTargetingData
+      }])
+    })
+  })
+
+  describe('Getting segments', function () {
+    it('should retrieve segments in the expected structure', function () {
+      const data = transformedTargeting()
+      expect(getSegments(250)).to.deep.equal(data)
+    })
+    it('should enforce max segments', function () {
+      const max = 1
+      const segments = getSegments(max)
+
+      for (const key in segments) {
+        if (key === 'ssp') {
+          expect(segments[key].cohorts).to.have.length(max)
+        } else {
+          expect(segments[key]).to.have.length(max)
+        }
+      }
+    })
+  })
+
+  describe('Default segment targeting', function () {
+    it('sets segment targeting for Xandr', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'appnexus') {
+              expect(deepAccess(params, 'keywords.permutive')).to.eql(data.appnexus)
+              expect(deepAccess(params, 'keywords.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
+            }
+          })
+        })
+      }
+    })
+
+    it('sets segment targeting for Magnite', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(deepAccess(params, 'visitor.permutive')).to.eql(data.rubicon)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
+            }
+          })
+        })
+      }
+    })
+
+    it('sets segment targeting for Magnite video', function () {
+      const targetingData = getTargetingData()
+      targetingData._prubicons.push(321)
+
+      setLocalStorage(targetingData)
+
+      const data = transformedTargeting(targetingData)
+      const config = getConfig()
+
+      const adUnits = getAdUnits().filter(adUnit => adUnit.mediaTypes.video)
+      expect(adUnits).to.have.lengthOf(1)
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback() {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(
+                deepAccess(params, 'visitor.permutive'),
+                'Should map all targeting values to a string',
+              ).to.eql(data.rubicon.map(String))
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
+            }
+          })
+        })
+      }
+    })
+
+    it('sets segment targeting for Ozone', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'ozone') {
+              expect(deepAccess(params, 'customData.0.targeting.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
+            }
+          })
+        })
+      }
+    })
+  })
+
+  describe('Custom segment targeting', function () {
+    it('sets custom segment targeting for Magnite', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      config.params.overwrites = {
+        rubicon: function (bid, data, acEnabled, utils, defaultFn) {
+          if (defaultFn) {
+            bid = defaultFn(bid, data, acEnabled)
+          }
+          if (data.gam && data.gam.length) {
+            utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+          }
+        }
+      }
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(deepAccess(params, 'visitor.permutive')).to.eql(data.gam)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
+            }
+          })
+        })
+      }
+    })
+  })
+
+  describe('Existing key-value targeting', function () {
+    it('doesn\'t overwrite existing key-values for Xandr', function () {
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'appnexus') {
+              expect(deepAccess(params, 'keywords.test_kv')).to.eql(['true'])
+            }
+          })
+        })
+      }
+    })
+    it('doesn\'t overwrite existing key-values for Magnite', function () {
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(deepAccess(params, 'visitor.test_kv')).to.eql(['true'])
+            }
+          })
+        })
+      }
+    })
+    it('doesn\'t overwrite existing key-values for Ozone', function () {
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'ozone') {
+              expect(deepAccess(params, 'customData.0.targeting.test_kv')).to.eql(['true'])
+            }
+          })
+        })
+      }
+    })
+    it('doesn\'t overwrite existing key-values for TrustX', function () {
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'trustx') {
+              expect(deepAccess(params, 'keywords.test_kv')).to.eql(['true'])
+            }
+          })
+        })
+      }
+    })
+  })
+
+  describe('Permutive on page', function () {
+    it('checks if Permutive is on page', function () {
+      expect(isPermutiveOnPage()).to.equal(false)
+    })
+  })
+
+  describe('AC is enabled', function () {
+    it('checks if AC is enabled for Xandr', function () {
+      expect(isAcEnabled({ params: { acBidders: ['appnexus'] } }, 'appnexus')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdbfkvb'] } }, 'appnexus')).to.equal(false)
+    })
+    it('checks if AC is enabled for Magnite', function () {
+      expect(isAcEnabled({ params: { acBidders: ['rubicon'] } }, 'rubicon')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdbfkb'] } }, 'rubicon')).to.equal(false)
+    })
+    it('checks if AC is enabled for Ozone', function () {
+      expect(isAcEnabled({ params: { acBidders: ['ozone'] } }, 'ozone')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdvb'] } }, 'ozone')).to.equal(false)
+    })
+    it('checks if AC is enabled for Index', function () {
+      expect(isAcEnabled({ params: { acBidders: ['ix'] } }, 'ix')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdvb'] } }, 'ix')).to.equal(false)
+    })
+  })
+})
+
+function setLocalStorage (data) {
+  for (const key in data) {
+    storage.setDataInLocalStorage(key, JSON.stringify(data[key]))
+  }
+}
+
+function removeLocalStorage (data) {
+  for (const key in data) {
+    storage.removeDataFromLocalStorage(key)
+  }
+}
+
+function getConfig () {
+  return {
+    name: 'permutive',
+    waitForIt: true,
+    params: {
+      acBidders: ['appnexus', 'rubicon', 'ozone', 'trustx', 'ix'],
+      maxSegs: 500
+    }
+  }
+}
+
+function transformedTargeting (data = getTargetingData()) {
+  return {
+    ac: [...data._pcrprs, ...data._ppam, ...data._psegs.filter(seg => seg >= 1000000)],
+    appnexus: data._papns,
+    rubicon: data._prubicons,
+    gam: data._pdfps,
+    ssp: data._pssps,
+  }
+}
+
+function getTargetingData () {
+  return {
+    _pdfps: ['gam1', 'gam2'],
+    _prubicons: ['rubicon1', 'rubicon2'],
+    _papns: ['appnexus1', 'appnexus2'],
+    _psegs: ['1234', '1000001', '1000002'],
+    _ppam: ['ppam1', 'ppam2'],
+    _pcrprs: ['pcrprs1', 'pcrprs2', 'dup'],
+    _pssps: { ssps: ['xyz', 'abc', 'dup'], cohorts: ['123', 'abc'] }
+  }
+}
+
+function getAdUnits () {
+  const div1sizes = [
+    [300, 250],
+    [300, 600]
+  ]
+  const div2sizes = [
+    [728, 90],
+    [970, 250]
+  ]
+  return [
+    {
+      code: '/19968336/header-bid-tag-0',
+      mediaTypes: {
+        banner: {
+          sizes: div1sizes
+        }
+      },
+      bids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370,
+            keywords: {
+              test_kv: ['true']
+            }
+          }
+        },
+        {
+          bidder: 'rubicon',
+          params: {
+            accountId: '9840',
+            siteId: '123564',
+            zoneId: '583584',
+            inventory: {
+              area: ['home']
+            },
+            visitor: {
+              test_kv: ['true']
+            }
+          }
+        },
+        {
+          bidder: 'ozone',
+          params: {
+            publisherId: 'OZONEGMG0001',
+            siteId: '4204204209',
+            placementId: '0420420500',
+            customData: [
+              {
+                settings: {},
+                targeting: {
+                  test_kv: ['true']
+                }
+              }
+            ],
+            ozoneData: {}
+          }
+        },
+        {
+          bidder: 'trustx',
+          params: {
+            uid: 45,
+            keywords: {
+              test_kv: ['true']
+            }
+          }
+        }
+      ]
+    },
+    {
+      code: '/19968336/header-bid-tag-1',
+      mediaTypes: {
+        banner: {
+          sizes: div2sizes
+        }
+      },
+      bids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370,
+            keywords: {
+              test_kv: ['true']
+            }
+          }
+        },
+        {
+          bidder: 'ozone',
+          params: {
+            publisherId: 'OZONEGMG0001',
+            siteId: '4204204209',
+            placementId: '0420420500',
+            customData: [
+              {
+                targeting: {
+                  test_kv: ['true']
+                }
+              }
+            ]
+          }
+        }
+      ]
+    },
+    {
+      code: 'myVideoAdUnit',
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [640, 480],
+          mimes: ['video/mp4', 'video/x-ms-wmv'],
+          protocols: [2, 3, 5, 6],
+          api: [2],
+          maxduration: 30,
+          linearity: 1
+        }
+      },
+      bids: [{
+        bidder: 'rubicon',
+        params: {
+          accountId: '9840',
+          siteId: '123564',
+          zoneId: '583584',
+          video: {
+            language: 'en'
+          },
+          visitor: {
+            test_kv: ['true']
+          }
+        }
+      }]
+    }
+  ]
+}
diff --git a/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js b/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..0c4949264a7
--- /dev/null
+++ b/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
@@ -0,0 +1,63 @@
+import pianoDmpAnalytics from 'modules/pianoDmpAnalyticsAdapter.js';
+import adapterManager from 'src/adapterManager';
+import * as events from 'src/events';
+import constants from 'src/constants.json';
+import { expect } from 'chai';
+
+describe('Piano DMP Analytics Adapter', () => {
+  let sandbox;
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox();
+
+    sandbox.stub(events, 'getEvents').returns([]);
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  describe('track', () => {
+    beforeEach(() => {
+      adapterManager.enableAnalytics({
+        provider: 'pianoDmp',
+      });
+    });
+
+    afterEach(() => {
+      delete window.cX;
+      pianoDmpAnalytics.disableAnalytics();
+    });
+
+    it('should pass events to call queue', () => {
+      const eventsList = [
+        constants.EVENTS.AUCTION_INIT,
+        constants.EVENTS.AUCTION_END,
+        constants.EVENTS.BID_ADJUSTMENT,
+        constants.EVENTS.BID_TIMEOUT,
+        constants.EVENTS.BID_REQUESTED,
+        constants.EVENTS.BID_RESPONSE,
+        constants.EVENTS.NO_BID,
+        constants.EVENTS.BID_WON,
+      ];
+
+      // Given
+      const testEvents = eventsList.map((event) => ({
+        event,
+        args: { test: event },
+      }));
+
+      // When
+      testEvents.forEach(({ event, args }) => events.emit(event, args));
+
+      // Then
+      const callQueue = (window.cX || {}).callQueue;
+
+      testEvents.forEach(({event, args}) => {
+        const [method, params] = callQueue.filter(item => item[1].eventType === event)[0];
+        expect(method).to.equal('prebid');
+        expect(params.params).to.deep.equal(args);
+      })
+    });
+  });
+});
diff --git a/test/spec/modules/pilotxBidAdapter_spec.js b/test/spec/modules/pilotxBidAdapter_spec.js
new file mode 100644
index 00000000000..2ef31c0a8f5
--- /dev/null
+++ b/test/spec/modules/pilotxBidAdapter_spec.js
@@ -0,0 +1,244 @@
+// import or require modules necessary for the test, e.g.:
+import { expect } from 'chai'; // may prefer 'assert' in place of 'expect'
+import { spec } from '../../../modules/pilotxBidAdapter.js';
+
+describe('pilotxAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let banner;
+    beforeEach(function () {
+      banner = {
+        bidder: 'pilotx',
+        adUnitCode: 'adunit-test',
+        mediaTypes: { banner: {} },
+        sizes: [[300, 250], [468, 60]],
+        bidId: '2de8c82e30665a',
+        params: {
+          placementId: '1'
+        }
+      };
+    });
+
+    it('should return false if sizes is empty', function () {
+      banner.sizes = []
+      expect(spec.isBidRequestValid(banner)).to.equal(false);
+    });
+    it('should return true if all is valid/ is not empty', function () {
+      expect(spec.isBidRequestValid(banner)).to.equal(true);
+    });
+    it('should return false if there is no placement id found', function () {
+      banner.params = {}
+      expect(spec.isBidRequestValid(banner)).to.equal(false);
+    });
+    it('should return false if sizes is empty', function () {
+      banner.sizes = []
+      expect(spec.isBidRequestValid(banner)).to.equal(false);
+    });
+    it('should return false for no size and empty params', function() {
+      const emptySizes = {
+        bidder: 'pilotx',
+        adUnitCode: 'adunit-test',
+        mediaTypes: { banner: {} },
+        bidId: '2de8c82e30665a',
+        params: {
+          placementId: '1',
+          sizes: []
+        }
+      };
+      expect(spec.isBidRequestValid(emptySizes)).to.equal(false);
+    })
+    it('should return true for no size and valid size params', function() {
+      const emptySizes = {
+        bidder: 'pilotx',
+        adUnitCode: 'adunit-test',
+        mediaTypes: { banner: {} },
+        bidId: '2de8c82e30665a',
+        params: {
+          placementId: '1',
+          sizes: [[300, 250], [468, 60]]
+        }
+      };
+      expect(spec.isBidRequestValid(emptySizes)).to.equal(true);
+    })
+    it('should return false for no size items', function() {
+      const emptySizes = {
+        bidder: 'pilotx',
+        adUnitCode: 'adunit-test',
+        mediaTypes: { banner: {} },
+        bidId: '2de8c82e30665a',
+        params: {
+          placementId: '1'
+        }
+      };
+      expect(spec.isBidRequestValid(emptySizes)).to.equal(false);
+    })
+  });
+
+  describe('buildRequests', function () {
+    const mockRequest = { refererInfo: {} };
+    const mockRequestGDPR = {
+      refererInfo: {},
+      gdprConsent: {
+        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+        gdprApplies: true
+      }
+
+    }
+    const mockVideo1 = [{
+      adUnitCode: 'video1',
+      auctionId: '01618029-7ae9-4e98-a73a-1ed0c817f414',
+      bidId: '2a59588c0114fa',
+      bidRequestsCount: 1,
+      bidder: 'pilotx',
+      bidderRequestId: '1f6b4ba2039726',
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0,
+      crumbs: { pubcid: 'de5240ef-ff80-4b55-8837-26a11cfbf64c' },
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          mimes: ['video/mp4'],
+          playbackmethod: [2],
+          playerSize: [[640, 480]],
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          data: {
+            pbadslot: 'video1'
+          }
+        }
+      },
+      params: { placementId: '379' },
+      sizes: [[640, 480]],
+      src: 'client',
+      transactionId: 'fec9f2ff-da13-4921-8437-8d679c2be7fe',
+    }];
+    const mockVideo2 = [{
+      adUnitCode: 'video1',
+      auctionId: '01618029-7ae9-4e98-a73a-1ed0c817f414',
+      bidId: '2a59588c0114fa',
+      bidRequestsCount: 1,
+      bidder: 'pilotx',
+      bidderRequestId: '1f6b4ba2039726',
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0,
+      crumbs: { pubcid: 'de5240ef-ff80-4b55-8837-26a11cfbf64c' },
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          mimes: ['video/mp4'],
+          playbackmethod: [2],
+          playerSize: [[640, 480]],
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          skip: 1
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          data: {
+            pbadslot: 'video1'
+          }
+        }
+      },
+      params: { placementId: '379' },
+      sizes: [640, 480],
+      src: 'client',
+      transactionId: 'fec9f2ff-da13-4921-8437-8d679c2be7fe',
+    }];
+    it('should return correct response', function () {
+      const builtRequest = spec.buildRequests(mockVideo1, mockRequest)
+      let builtRequestData = builtRequest.data
+      let data = JSON.parse(builtRequestData)
+      expect(data['379'].bidId).to.equal(mockVideo1[0].bidId)
+    });
+    it('should return correct response for only array of size', function () {
+      const builtRequest = spec.buildRequests(mockVideo2, mockRequest)
+      let builtRequestData = builtRequest.data
+      let data = JSON.parse(builtRequestData)
+      expect(data['379'].sizes[0][0]).to.equal(mockVideo2[0].sizes[0])
+      expect(data['379'].sizes[0][1]).to.equal(mockVideo2[0].sizes[1])
+    });
+    it('should be valid and pass gdpr items correctly', function () {
+      const builtRequest = spec.buildRequests(mockVideo2, mockRequestGDPR)
+      let builtRequestData = builtRequest.data
+      let data = JSON.parse(builtRequestData)
+      expect(data['379'].gdprConsentString).to.equal(mockRequestGDPR.gdprConsent.consentString)
+      expect(data['379'].gdprConsentRequired).to.equal(mockRequestGDPR.gdprConsent.gdprApplies)
+    });
+  });
+  describe('interpretResponse', function () {
+    const bidRequest = {}
+    const serverResponse = {
+      cpm: 2.5,
+      creativeId: 'V9060',
+      currency: 'US',
+      height: 480,
+      mediaType: 'video',
+      netRevenue: false,
+      requestId: '273b39c74069cb',
+      ttl: 3000,
+      vastUrl: 'http://testadserver.com/ads?&k=60cd901ad8ab70c9cedf373cb17b93b8&pid=379&tid=91342717',
+      width: 640
+    }
+    const serverResponseVideo = {
+      body: serverResponse
+    }
+    const serverResponse2 = {
+      cpm: 2.5,
+      creativeId: 'V9060',
+      currency: 'US',
+      height: 480,
+      mediaType: 'banner',
+      netRevenue: false,
+      requestId: '273b39c74069cb',
+      ttl: 3000,
+      vastUrl: 'http://testadserver.com/ads?&k=60cd901ad8ab70c9cedf373cb17b93b8&pid=379&tid=91342717',
+      width: 640
+    }
+    const serverResponseBanner = {
+      body: serverResponse2
+    }
+    it('should be valid from bidRequest for video', function () {
+      const bidResponses = spec.interpretResponse(serverResponseVideo, bidRequest)
+      expect(bidResponses[0].requestId).to.equal(serverResponse.requestId)
+      expect(bidResponses[0].cpm).to.equal(serverResponse.cpm)
+      expect(bidResponses[0].width).to.equal(serverResponse.width)
+      expect(bidResponses[0].height).to.equal(serverResponse.height)
+      expect(bidResponses[0].creativeId).to.equal(serverResponse.creativeId)
+      expect(bidResponses[0].currency).to.equal(serverResponse.currency)
+      expect(bidResponses[0].netRevenue).to.equal(serverResponse.netRevenue)
+      expect(bidResponses[0].ttl).to.equal(serverResponse.ttl)
+      expect(bidResponses[0].vastUrl).to.equal(serverResponse.vastUrl)
+      expect(bidResponses[0].mediaType).to.equal(serverResponse.mediaType)
+      expect(bidResponses[0].meta.mediaType).to.equal(serverResponse.mediaType)
+    });
+    it('should be valid from bidRequest for banner', function () {
+      const bidResponses = spec.interpretResponse(serverResponseBanner, bidRequest)
+      expect(bidResponses[0].requestId).to.equal(serverResponse2.requestId)
+      expect(bidResponses[0].cpm).to.equal(serverResponse2.cpm)
+      expect(bidResponses[0].width).to.equal(serverResponse2.width)
+      expect(bidResponses[0].height).to.equal(serverResponse2.height)
+      expect(bidResponses[0].creativeId).to.equal(serverResponse2.creativeId)
+      expect(bidResponses[0].currency).to.equal(serverResponse2.currency)
+      expect(bidResponses[0].netRevenue).to.equal(serverResponse2.netRevenue)
+      expect(bidResponses[0].ttl).to.equal(serverResponse2.ttl)
+      expect(bidResponses[0].ad).to.equal(serverResponse2.ad)
+      expect(bidResponses[0].mediaType).to.equal(serverResponse2.mediaType)
+      expect(bidResponses[0].meta.mediaType).to.equal(serverResponse2.mediaType)
+    });
+  });
+  describe('setPlacementID', function () {
+    const multiplePlacementIds = ['380', '381']
+    it('should be valid with an array of placement ids passed', function () {
+      const placementID = spec.setPlacementID(multiplePlacementIds)
+      expect(placementID).to.equal('380#381')
+    });
+    it('should be valid with single placement ID passed', function () {
+      const placementID = spec.setPlacementID('381')
+      expect(placementID).to.equal('381')
+    });
+  });
+  // Add other `describe` or `it` blocks as necessary
+});
diff --git a/test/spec/modules/pixfutureBidAdapter_spec.js b/test/spec/modules/pixfutureBidAdapter_spec.js
new file mode 100644
index 00000000000..a236478c9b4
--- /dev/null
+++ b/test/spec/modules/pixfutureBidAdapter_spec.js
@@ -0,0 +1,255 @@
+import { expect } from 'chai'; // may prefer 'assert' in place of 'expect'
+import { spec } from 'modules/pixfutureBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { auctionManager } from 'src/auctionManager.js';
+import { deepClone } from 'src/utils.js';
+import { config } from 'src/config.js';
+
+describe('PixFutureAdapter', function () {
+  it('<description of unit or feature being tested>', function () {
+    const adapter = newBidder(spec);
+    describe('inherited functions', function () {
+      it('exists and is a function', function () {
+        expect(adapter.callBids).to.exist.and.to.be.a('function');
+      });
+    });
+
+    // Test of isBidRequestValid method
+
+    describe('isBidRequestValid', function () {
+      let bid = {
+        'bidder': 'pixfuture',
+        'pageUrl': 'https://adinify.com/prebidjs/?pbjs_debug=true',
+        'bidId': '236e806f760f0c',
+        'auctionId': 'aa7f5d76-806b-4e0d-b795-cd6bd84ddc63',
+        'transactionId': '0fdf67c0-7b48-4fef-9716-cc64d948e95d',
+        'adUnitCode': '26335x300x250x14x_ADSLOT88',
+        'sizes': [[300, 250], [300, 600]],
+        'params': {
+          'pix_id': '777'
+        }
+      };
+      it('should return true when required params found (bid)', function () {
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+
+      it('should return true when required params found (bid.param=true)', function () {
+        delete bid.params;
+        bid.params = {
+          'pix_id': '777'
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+
+      it('should return false when required params are not passed', function () {
+        let bid = Object.assign({}, bid);
+        delete bid.params;
+        bid.params = {
+          'pix_id': 0
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+    });
+
+    // Test of buildRequest method
+
+    describe('Test of buildRequest method', function () {
+      let validBidRequests = [{
+        'labelAny': ['display'],
+        'bidder': 'pixfuture',
+        'params': {
+          'pix_id': '777'
+        },
+        'userId': {
+          'criteoId': 'P9iqSF9MSDVlZ2ZwdTVGanp5U2l0MWt1cnZya25TdEs4VlY4ZjNTeHQ4czlJUkZES0NFRXBZblJNcTNYYjU4MWxYS2VWalM5dnd5RUhRYm0lMkJuQUFNVm1iclRvSVJTYzBuNkcxZUtTa2duRyUyQnU4S3clM0Q',
+          'id5id': {
+            'uid': 'ID5-ZHMOcvSShIBZiIth_yYh9odjNFxVEmMQ_i5TArPfWw!ID5*dtrjfV5mPLasyya5TW2IE9oVzQZwx7xRPGyAYS4hcWkAAOoxoFef4bIoREpQys8x',
+            'ext': {
+              'linkType': 2
+            }
+          },
+          'pubcid': 'e09ab6a3-ae74-4f01-b2e8-81b141d6dc61',
+          'sharedid': {
+            'id': '01EXPPGZ9C8NKG1MTXVHV98505',
+            'third': '01EXPPGZ9C8NKG1MTXVHV98505'
+          }
+        },
+        'userIdAsEids': [{
+          'source': 'criteo.com',
+          'uids': [{
+            'id': 'P9iqSF9MSDVlZ2ZwdTVGanp5U2l0MWt1cnZya25TdEs4VlY4ZjNTeHQ4czlJUkZES0NFRXBZblJNcTNYYjU4MWxYS2VWalM5dnd5RUhRYm0lMkJuQUFNVm1iclRvSVJTYzBuNkcxZUtTa2duRyUyQnU4S3clM0Q',
+            'atype': 1
+          }]
+        }, {
+          'source': 'id5-sync.com',
+          'uids': [{
+            'id': 'ID5-ZHMOcvSShIBZiIth_yYh9odjNFxVEmMQ_i5TArPfWw!ID5*dtrjfV5mPLasyya5TW2IE9oVzQZwx7xRPGyAYS4hcWkAAOoxoFef4bIoREpQys8x',
+            'atype': 1,
+            'ext': {
+              'linkType': 2
+            }
+          }]
+        }, {
+          'source': 'pubcid.org',
+          'uids': [{
+            'id': 'e09ab6a3-ae74-4f01-b2e8-81b141d6dc61',
+            'atype': 1
+          }]
+        }, {
+          'source': 'sharedid.org',
+          'uids': [{
+            'id': '01EXPPGZ9C8NKG1MTXVHV98505',
+            'atype': 1,
+            'ext': {
+              'third': '01EXPPGZ9C8NKG1MTXVHV98505'
+            }
+          }]
+        }],
+        'crumbs': {
+          'pubcid': 'e09ab6a3-ae74-4f01-b2e8-81b141d6dc61'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [300, 250]
+            ]
+          }
+        },
+        'adUnitCode': '26335x300x250x14x_ADSLOT88',
+        'transactionId': '09310832-cd12-478c-86dd-fbd819dff9d3',
+        'sizes': [
+          [300, 250]
+        ],
+        'bidId': '279272f27dfb3e',
+        'bidderRequestId': '10a0de227377a3',
+        'auctionId': '4cd5684b-ae2a-4d1f-84be-5f1ee66d9ff3',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0,
+        'schain': {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [{
+            'asi': 'pixfuture.com',
+            'sid': '14',
+            'hp': 1
+          }]
+        }
+      }];
+
+      let bidderRequests =
+                    {
+                      'bidderCode': 'pixfuture',
+                      'auctionId': '4cd5684b-ae2a-4d1f-84be-5f1ee66d9ff3',
+                      'bidderRequestId': '10a0de227377a3',
+                      'bids': [{
+                        'labelAny': ['display'],
+                        'bidder': 'pixfuture',
+                        'params': {
+                          'pix_id': '777'
+                        },
+                        'userId': {
+                          'criteoId': 'P9iqSF9MSDVlZ2ZwdTVGanp5U2l0MWt1cnZya25TdEs4VlY4ZjNTeHQ4czlJUkZES0NFRXBZblJNcTNYYjU4MWxYS2VWalM5dnd5RUhRYm0lMkJuQUFNVm1iclRvSVJTYzBuNkcxZUtTa2duRyUyQnU4S3clM0Q',
+                          'id5id': {
+                            'uid': 'ID5-ZHMOcvSShIBZiIth_yYh9odjNFxVEmMQ_i5TArPfWw!ID5*dtrjfV5mPLasyya5TW2IE9oVzQZwx7xRPGyAYS4hcWkAAOoxoFef4bIoREpQys8x',
+                            'ext': {
+                              'linkType': 2
+                            }
+                          },
+                          'pubcid': 'e09ab6a3-ae74-4f01-b2e8-81b141d6dc61',
+                          'sharedid': {
+                            'id': '01EXPPGZ9C8NKG1MTXVHV98505',
+                            'third': '01EXPPGZ9C8NKG1MTXVHV98505'
+                          }
+                        },
+                        'userIdAsEids': [{
+                          'source': 'criteo.com',
+                          'uids': [{
+                            'id': 'P9iqSF9MSDVlZ2ZwdTVGanp5U2l0MWt1cnZya25TdEs4VlY4ZjNTeHQ4czlJUkZES0NFRXBZblJNcTNYYjU4MWxYS2VWalM5dnd5RUhRYm0lMkJuQUFNVm1iclRvSVJTYzBuNkcxZUtTa2duRyUyQnU4S3clM0Q',
+                            'atype': 1
+                          }]
+                        }, {
+                          'source': 'id5-sync.com',
+                          'uids': [{
+                            'id': 'ID5-ZHMOcvSShIBZiIth_yYh9odjNFxVEmMQ_i5TArPfWw!ID5*dtrjfV5mPLasyya5TW2IE9oVzQZwx7xRPGyAYS4hcWkAAOoxoFef4bIoREpQys8x',
+                            'atype': 1,
+                            'ext': {
+                              'linkType': 2
+                            }
+                          }]
+                        }, {
+                          'source': 'pubcid.org',
+                          'uids': [{
+                            'id': 'e09ab6a3-ae74-4f01-b2e8-81b141d6dc61',
+                            'atype': 1
+                          }]
+                        }, {
+                          'source': 'sharedid.org',
+                          'uids': [{
+                            'id': '01EXPPGZ9C8NKG1MTXVHV98505',
+                            'atype': 1,
+                            'ext': {
+                              'third': '01EXPPGZ9C8NKG1MTXVHV98505'
+                            }
+                          }]
+                        }],
+                        'crumbs': {
+                          'pubcid': 'e09ab6a3-ae74-4f01-b2e8-81b141d6dc61'
+                        },
+                        'mediaTypes': {
+                          'banner': {
+                            'sizes': [
+                              [300, 250]
+                            ]
+                          }
+                        },
+                        'adUnitCode': '26335x300x250x14x_ADSLOT88',
+                        'transactionId': '09310832-cd12-478c-86dd-fbd819dff9d3',
+                        'sizes': [
+                          [300, 250]
+                        ],
+                        'bidId': '279272f27dfb3e',
+                        'bidderRequestId': '10a0de227377a3',
+                        'auctionId': '4cd5684b-ae2a-4d1f-84be-5f1ee66d9ff3',
+                        'src': 'client',
+                        'bidRequestsCount': 1,
+                        'bidderRequestsCount': 1,
+                        'bidderWinsCount': 0,
+                        'schain': {
+                          'ver': '1.0',
+                          'complete': 1,
+                          'nodes': [{
+                            'asi': 'pixfuture.com',
+                            'sid': '14',
+                            'hp': 1
+                          }]
+                        }
+                      }],
+                      'auctionStart': 1620934247115,
+                      'timeout': 3000,
+                      'refererInfo': {
+                        'referer': 'https://adinify.com/prebidjs/?pbjs_debug=true',
+                        'reachedTop': true,
+                        'isAmp': false,
+                        'numIframes': 0,
+                        'stack': ['https://adinify.com/prebidjs/?pbjs_debug=true'],
+                        'canonicalUrl': null
+                      },
+                      'start': 1620934247117
+                    };
+
+      // let bidderRequest = Object.assign({}, bidderRequests);
+      const request = spec.buildRequests(validBidRequests, bidderRequests);
+      // console.log(JSON.stringify(request));
+      let bidRequest = Object.assign({}, request[0]);
+
+      expect(bidRequest.data).to.exist;
+      expect(bidRequest.data.sizes).to.deep.equal([[300, 250]]);
+      expect(bidRequest.data.params).to.deep.equal({'pix_id': '777'});
+      expect(bidRequest.data.adUnitCode).to.deep.equal('26335x300x250x14x_ADSLOT88');
+    });
+  });
+  // Add other `describe` or `it` blocks as necessary
+});
diff --git a/test/spec/modules/piximediaBidAdapter_spec.js b/test/spec/modules/piximediaBidAdapter_spec.js
deleted file mode 100644
index 88a6433b71d..00000000000
--- a/test/spec/modules/piximediaBidAdapter_spec.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/piximediaBidAdapter.js';
-
-describe('piximediaAdapterTest', function() {
-  describe('bidRequestValidity', function() {
-    it('bidRequest with site ID and placement ID param', function() {
-      expect(spec.isBidRequestValid({
-        bidder: 'piximedia',
-        params: {
-          'siteId': 'PIXIMEDIA_PREBID10',
-          'placementId': 'RG'
-        },
-      })).to.equal(true);
-    });
-
-    it('bidRequest with no required params', function() {
-      expect(spec.isBidRequestValid({
-        bidder: 'piximedia',
-        params: {
-        },
-      })).to.equal(false);
-    });
-  });
-
-  describe('bidRequest', function() {
-    const bidRequests = [{
-      'bidder': 'piximedia',
-      'params': {
-        'siteId': 'PIXIMEDIA_PREBID10',
-        'placementId': 'RG'
-      },
-      'adUnitCode': 'div-gpt-ad-1460505748561-0',
-      'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-      'sizes': [300, 250],
-      'bidId': '51ef8751f9aead',
-      'bidderRequestId': '418b37f85e772c',
-      'auctionId': '18fd8b8b0bd757'
-    }];
-
-    it('bidRequest HTTP method', function() {
-      const requests = spec.buildRequests(bidRequests);
-      requests.forEach(function(requestItem) {
-        expect(requestItem.method).to.equal('GET');
-      });
-    });
-
-    it('bidRequest data', function() {
-      const requests = spec.buildRequests(bidRequests);
-      expect(typeof requests[0].data.timestamp).to.equal('number');
-      expect(requests[0].data.pbsizes).to.equal('["300x250"]');
-      expect(requests[0].data.pver).to.equal('1.0');
-      expect(requests[0].data.pbparams).to.equal(JSON.stringify(bidRequests[0].params));
-      expect(requests[0].data.pbwidth).to.equal('300');
-      expect(requests[0].data.pbheight).to.equal('250');
-      expect(requests[0].data.pbbidid).to.equal('51ef8751f9aead');
-    });
-  });
-
-  describe('interpretResponse', function() {
-    const bidRequest = {
-      'method': 'GET',
-      'url': 'https://ad.piximedia.com/',
-      'data': {
-        'ver': 2,
-        'hb': 1,
-        'output': 'js',
-        'pub': 267,
-        'zone': 62546,
-        'width': '300',
-        'height': '250',
-        'callback': 'json',
-        'callback_uid': '51ef8751f9aead',
-        'url': 'https://example.com',
-        'cb': '',
-      }
-    };
-
-    const bidResponse = {
-      body: {
-        'bidId': '51ef8751f9aead',
-        'cpm': 4.2,
-        'width': '300',
-        'height': '250',
-        'creative_id': '1234',
-        'currency': 'EUR',
-        'adm': '<div></div>',
-      },
-      headers: {}
-    };
-
-    it('result is correct', function() {
-      const result = spec.interpretResponse(bidResponse, bidRequest);
-      expect(result[0].requestId).to.equal('51ef8751f9aead');
-      expect(result[0].cpm).to.equal(4.2);
-      expect(result[0].width).to.equal('300');
-      expect(result[0].height).to.equal('250');
-      expect(result[0].creativeId).to.equal('1234');
-      expect(result[0].currency).to.equal('EUR');
-      expect(result[0].ttl).to.equal(300);
-      expect(result[0].ad).to.equal('<div></div>');
-    });
-  });
-});
diff --git a/test/spec/modules/platformioBidAdapter_spec.js b/test/spec/modules/platformioBidAdapter_spec.js
deleted file mode 100644
index ee753be17a7..00000000000
--- a/test/spec/modules/platformioBidAdapter_spec.js
+++ /dev/null
@@ -1,348 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/platformioBidAdapter';
-import {newBidder} from 'src/adapters/bidderFactory';
-
-describe('Platform.io Adapter Tests', function () {
-  const slotConfigs = [{
-    placementCode: '/DfpAccount1/slot1',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]]
-      }
-    },
-    bidId: 'bid12345',
-    mediaType: 'banner',
-    params: {
-      pubId: '29521',
-      siteId: '26047',
-      placementId: '123',
-      bidFloor: '0.001',
-      ifa: 'IFA',
-      latitude: '40.712775',
-      longitude: '-74.005973'
-    }
-  }, {
-    placementCode: '/DfpAccount2/slot2',
-    mediaTypes: {
-      banner: {
-        sizes: [[728, 90]]
-      }
-    },
-    bidId: 'bid23456',
-    mediaType: 'banner',
-    params: {
-      pubId: '29521',
-      siteId: '26047',
-      placementId: '1234',
-      bidFloor: '0.000001',
-    }
-  }];
-  const nativeSlotConfig = [{
-    placementCode: '/DfpAccount1/slot3',
-    bidId: 'bid12345',
-    mediaType: 'native',
-    nativeParams: {
-      title: { required: true, len: 200 },
-      body: {},
-      image: { wmin: 100 },
-      sponsoredBy: { },
-      icon: { }
-    },
-    params: {
-      pubId: '29521',
-      placementId: '123',
-      siteId: '26047'
-    }
-  }];
-  const videoSlotConfig = [{
-    placementCode: '/DfpAccount1/slot4',
-    mediaTypes: {
-      video: {
-        playerSize: [[640, 480]]
-      }
-    },
-    bidId: 'bid12345678',
-    mediaType: 'video',
-    video: {
-      skippable: true
-    },
-    params: {
-      pubId: '29521',
-      placementId: '1234567',
-      siteId: '26047',
-    }
-  }];
-  const appSlotConfig = [{
-    placementCode: '/DfpAccount1/slot5',
-    bidId: 'bid12345',
-    params: {
-      pubId: '29521',
-      placementId: '1234',
-      app: {
-        id: '1111',
-        name: 'app name',
-        bundle: 'io.platform.apps',
-        storeUrl: 'https://platform.io/apps',
-        domain: 'platform.io'
-      }
-    }
-  }];
-
-  it('Verify build request', function () {
-    const request = spec.buildRequests(slotConfigs);
-    expect(request.url).to.equal('https://piohbdisp.hb.adx1.com/');
-    expect(request.method).to.equal('POST');
-    const ortbRequest = JSON.parse(request.data);
-    // site object
-    expect(ortbRequest.site).to.not.equal(null);
-    expect(ortbRequest.site.publisher).to.not.equal(null);
-    expect(ortbRequest.site.publisher.id).to.equal('29521');
-    expect(ortbRequest.site.ref).to.equal(window.top.document.referrer);
-    expect(ortbRequest.site.page).to.equal(window.location.href);
-    expect(ortbRequest.imp).to.have.lengthOf(2);
-    // device object
-    expect(ortbRequest.device).to.not.equal(null);
-    expect(ortbRequest.device.ua).to.equal(navigator.userAgent);
-    expect(ortbRequest.device.ifa).to.equal('IFA');
-    expect(ortbRequest.device.geo.lat).to.equal('40.712775');
-    expect(ortbRequest.device.geo.lon).to.equal('-74.005973');
-    // slot 1
-    expect(ortbRequest.imp[0].tagid).to.equal('123');
-    expect(ortbRequest.imp[0].banner).to.not.equal(null);
-    expect(ortbRequest.imp[0].banner.w).to.equal(300);
-    expect(ortbRequest.imp[0].banner.h).to.equal(250);
-    expect(ortbRequest.imp[0].bidfloor).to.equal('0.001');
-    // slot 2
-    expect(ortbRequest.imp[1].tagid).to.equal('1234');
-    expect(ortbRequest.imp[1].banner).to.not.equal(null);
-    expect(ortbRequest.imp[1].banner.w).to.equal(728);
-    expect(ortbRequest.imp[1].banner.h).to.equal(90);
-    expect(ortbRequest.imp[1].bidfloor).to.equal('0.000001');
-  });
-
-  it('Verify parse response', function () {
-    const request = spec.buildRequests(slotConfigs);
-    const ortbRequest = JSON.parse(request.data);
-    const ortbResponse = {
-      seatbid: [{
-        bid: [{
-          impid: ortbRequest.imp[0].id,
-          price: 1.25,
-          adm: 'This is an Ad',
-          w: 300,
-          h: 250
-        }]
-      }],
-      cur: 'USD'
-    };
-    const bids = spec.interpretResponse({ body: ortbResponse }, request);
-    expect(bids).to.have.lengthOf(1);
-    // verify first bid
-    const bid = bids[0];
-    expect(bid.cpm).to.equal(1.25);
-    expect(bid.ad).to.equal('This is an Ad');
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.adId).to.equal('bid12345');
-    expect(bid.creativeId).to.equal('bid12345');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.ttl).to.equal(360);
-  });
-
-  it('Verify full passback', function () {
-    const request = spec.buildRequests(slotConfigs);
-    const bids = spec.interpretResponse({ body: null }, request)
-    expect(bids).to.have.lengthOf(0);
-  });
-
-  it('Verify Native request', function () {
-    const request = spec.buildRequests(nativeSlotConfig);
-    expect(request.url).to.equal('https://piohbdisp.hb.adx1.com/');
-    expect(request.method).to.equal('POST');
-    const ortbRequest = JSON.parse(request.data);
-    // native impression
-    expect(ortbRequest.imp[0].tagid).to.equal('123');
-    const nativePart = ortbRequest.imp[0]['native'];
-    expect(nativePart).to.not.equal(null);
-    expect(nativePart.ver).to.equal('1.1');
-    expect(nativePart.request).to.not.equal(null);
-    // native request assets
-    const nativeRequest = JSON.parse(ortbRequest.imp[0]['native'].request);
-    expect(nativeRequest).to.not.equal(null);
-    expect(nativeRequest.assets).to.have.lengthOf(5);
-    expect(nativeRequest.assets[0].id).to.equal(1);
-    expect(nativeRequest.assets[1].id).to.equal(2);
-    expect(nativeRequest.assets[2].id).to.equal(3);
-    expect(nativeRequest.assets[3].id).to.equal(4);
-    expect(nativeRequest.assets[4].id).to.equal(5);
-    expect(nativeRequest.assets[0].required).to.equal(1);
-    expect(nativeRequest.assets[0].title).to.not.equal(null);
-    expect(nativeRequest.assets[0].title.len).to.equal(200);
-    expect(nativeRequest.assets[1].title).to.be.undefined;
-    expect(nativeRequest.assets[1].data).to.not.equal(null);
-    expect(nativeRequest.assets[1].data.type).to.equal(2);
-    expect(nativeRequest.assets[1].data.len).to.equal(200);
-    expect(nativeRequest.assets[2].required).to.equal(0);
-    expect(nativeRequest.assets[3].img).to.not.equal(null);
-    expect(nativeRequest.assets[3].img.wmin).to.equal(50);
-    expect(nativeRequest.assets[3].img.hmin).to.equal(50);
-    expect(nativeRequest.assets[3].img.type).to.equal(1);
-    expect(nativeRequest.assets[4].img).to.not.equal(null);
-    expect(nativeRequest.assets[4].img.wmin).to.equal(100);
-    expect(nativeRequest.assets[4].img.hmin).to.equal(150);
-    expect(nativeRequest.assets[4].img.type).to.equal(3);
-  });
-
-  it('Verify Native response', function () {
-    const request = spec.buildRequests(nativeSlotConfig);
-    expect(request.url).to.equal('https://piohbdisp.hb.adx1.com/');
-    expect(request.method).to.equal('POST');
-    const ortbRequest = JSON.parse(request.data);
-    const nativeResponse = {
-      'native': {
-        assets: [
-          { id: 1, title: { text: 'Ad Title' } },
-          { id: 2, data: { value: 'Test description' } },
-          { id: 3, data: { value: 'Brand' } },
-          { id: 4, img: { url: 'https://adx1public.s3.amazonaws.com/creatives_icon.png', w: 100, h: 100 } },
-          { id: 5, img: { url: 'https://adx1public.s3.amazonaws.com/creatives_image.png', w: 300, h: 300 } }
-        ],
-        link: { url: 'https://brand.com/' }
-      }
-    };
-    const ortbResponse = {
-      seatbid: [{
-        bid: [{
-          impid: ortbRequest.imp[0].id,
-          price: 1.25,
-          nurl: 'https://rtb.adx1.com/log',
-          adm: JSON.stringify(nativeResponse)
-        }]
-      }],
-      cur: 'USD',
-    };
-    const bids = spec.interpretResponse({ body: ortbResponse }, request);
-    // verify bid
-    const bid = bids[0];
-    expect(bid.cpm).to.equal(1.25);
-    expect(bid.adId).to.equal('bid12345');
-    expect(bid.ad).to.be.undefined;
-    expect(bid.mediaType).to.equal('native');
-    const nativeBid = bid['native'];
-    expect(nativeBid).to.not.equal(null);
-    expect(nativeBid.title).to.equal('Ad Title');
-    expect(nativeBid.sponsoredBy).to.equal('Brand');
-    expect(nativeBid.icon.url).to.equal('https://adx1public.s3.amazonaws.com/creatives_icon.png');
-    expect(nativeBid.image.url).to.equal('https://adx1public.s3.amazonaws.com/creatives_image.png');
-    expect(nativeBid.image.width).to.equal(300);
-    expect(nativeBid.image.height).to.equal(300);
-    expect(nativeBid.icon.width).to.equal(100);
-    expect(nativeBid.icon.height).to.equal(100);
-    expect(nativeBid.clickUrl).to.equal(encodeURIComponent('https://brand.com/'));
-    expect(nativeBid.impressionTrackers).to.have.lengthOf(1);
-    expect(nativeBid.impressionTrackers[0]).to.equal('https://rtb.adx1.com/log');
-  });
-
-  it('Verify Video request', function () {
-    const request = spec.buildRequests(videoSlotConfig);
-    expect(request.url).to.equal('https://piohbdisp.hb.adx1.com/');
-    expect(request.method).to.equal('POST');
-    const videoRequest = JSON.parse(request.data);
-    // site object
-    expect(videoRequest.site).to.not.equal(null);
-    expect(videoRequest.site.publisher.id).to.equal('29521');
-    expect(videoRequest.site.ref).to.equal(window.top.document.referrer);
-    expect(videoRequest.site.page).to.equal(window.location.href);
-    // device object
-    expect(videoRequest.device).to.not.equal(null);
-    expect(videoRequest.device.ua).to.equal(navigator.userAgent);
-    // slot 1
-    expect(videoRequest.imp[0].tagid).to.equal('1234567');
-    expect(videoRequest.imp[0].video).to.not.equal(null);
-    expect(videoRequest.imp[0].video.w).to.equal(640);
-    expect(videoRequest.imp[0].video.h).to.equal(480);
-    expect(videoRequest.imp[0].banner).to.equal(null);
-    expect(videoRequest.imp[0].native).to.equal(null);
-  });
-
-  it('Verify parse video response', function () {
-    const request = spec.buildRequests(videoSlotConfig);
-    const videoRequest = JSON.parse(request.data);
-    const videoResponse = {
-      seatbid: [{
-        bid: [{
-          impid: videoRequest.imp[0].id,
-          price: 1.90,
-          adm: 'https://vid.example.com/9876',
-          crid: '510511_754567308'
-        }]
-      }],
-      cur: 'USD'
-    };
-    const bids = spec.interpretResponse({ body: videoResponse }, request);
-    expect(bids).to.have.lengthOf(1);
-    // verify first bid
-    const bid = bids[0];
-    expect(bid.cpm).to.equal(1.90);
-    expect(bid.vastUrl).to.equal('https://vid.example.com/9876');
-    expect(bid.crid).to.equal('510511_754567308');
-    expect(bid.width).to.equal(640);
-    expect(bid.height).to.equal(480);
-    expect(bid.adId).to.equal('bid12345678');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.ttl).to.equal(360);
-  });
-
-  it('Verifies bidder code', function () {
-    expect(spec.code).to.equal('platformio');
-  });
-
-  it('Verifies supported media types', function () {
-    expect(spec.supportedMediaTypes).to.have.lengthOf(3);
-    expect(spec.supportedMediaTypes[0]).to.equal('banner');
-    expect(spec.supportedMediaTypes[1]).to.equal('native');
-    expect(spec.supportedMediaTypes[2]).to.equal('video');
-  });
-
-  it('Verifies if bid request valid', function () {
-    expect(spec.isBidRequestValid(slotConfigs[0])).to.equal(true);
-    expect(spec.isBidRequestValid(slotConfigs[1])).to.equal(true);
-    expect(spec.isBidRequestValid(nativeSlotConfig[0])).to.equal(true);
-    expect(spec.isBidRequestValid(videoSlotConfig[0])).to.equal(true);
-  });
-
-  it('Verify app requests', function () {
-    const request = spec.buildRequests(appSlotConfig);
-    const ortbRequest = JSON.parse(request.data);
-    expect(ortbRequest.site).to.equal(null);
-    expect(ortbRequest.app).to.not.be.null;
-    expect(ortbRequest.app.publisher).to.not.equal(null);
-    expect(ortbRequest.app.publisher.id).to.equal('29521');
-    expect(ortbRequest.app.id).to.equal('1111');
-    expect(ortbRequest.app.name).to.equal('app name');
-    expect(ortbRequest.app.bundle).to.equal('io.platform.apps');
-    expect(ortbRequest.app.storeurl).to.equal('https://platform.io/apps');
-    expect(ortbRequest.app.domain).to.equal('platform.io');
-  });
-
-  it('Verify GDPR', function () {
-    const bidderRequest = {
-      gdprConsent: {
-        gdprApplies: true,
-        consentString: 'serialized_gpdr_data'
-      }
-    };
-    const request = spec.buildRequests(slotConfigs, bidderRequest);
-    expect(request.url).to.equal('https://piohbdisp.hb.adx1.com/');
-    expect(request.method).to.equal('POST');
-    const ortbRequest = JSON.parse(request.data);
-    expect(ortbRequest.user).to.not.equal(null);
-    expect(ortbRequest.user.ext).to.not.equal(null);
-    expect(ortbRequest.user.ext.consent).to.equal('serialized_gpdr_data');
-    expect(ortbRequest.regs).to.not.equal(null);
-    expect(ortbRequest.regs.ext).to.not.equal(null);
-    expect(ortbRequest.regs.ext.gdpr).to.equal(1);
-  });
-});
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index d99ec9d421d..9da242381be 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1,13 +1,36 @@
-import { expect } from 'chai';
-import { PrebidServer as Adapter, resetSyncedStatus, resetWurlMap } from 'modules/prebidServerBidAdapter/index.js';
+import {expect} from 'chai';
+import {
+  PrebidServer as Adapter,
+  resetSyncedStatus,
+  resetWurlMap,
+  s2sDefaultConfig
+} from 'modules/prebidServerBidAdapter/index.js';
 import adapterManager from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
-import { ajax } from 'src/ajax.js';
-import { config } from 'src/config.js';
-import events from 'src/events.js';
+import {deepAccess, deepClone} from 'src/utils.js';
+import {ajax} from 'src/ajax.js';
+import {config} from 'src/config.js';
+import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
-import { server } from 'test/mocks/xhr.js';
-import { createEidsArray } from 'modules/userId/eids.js';
+import {server} from 'test/mocks/xhr.js';
+import {createEidsArray} from 'modules/userId/eids.js';
+import 'modules/appnexusBidAdapter.js'; // appnexus alias test
+import 'modules/rubiconBidAdapter.js'; // rubicon alias test
+import 'src/prebid.js'; // $$PREBID_GLOBAL$$.aliasBidder test
+import 'modules/currency.js'; // adServerCurrency test
+import 'modules/userId/index.js';
+import 'modules/multibid/index.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagement.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
+import {hook} from '../../../src/hook.js';
+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';
+import {syncAddFPDEnrichments, syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
 
 let CONFIG = {
   accountId: '1',
@@ -15,7 +38,10 @@ let CONFIG = {
   bidders: ['appnexus'],
   timeout: 1000,
   cacheMarkup: 2,
-  endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+  endpoint: {
+    p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
+    noP1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+  }
 };
 
 const REQUEST = {
@@ -26,6 +52,7 @@ const REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '0.30.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -72,6 +99,84 @@ const REQUEST = {
   ]
 };
 
+const NATIVE_ORTB_MTO = {
+  ortb: {
+    context: 3,
+    plcmttype: 2,
+    eventtrackers: [
+      {
+        event: 1,
+        methods: [
+          1
+        ]
+      },
+      {
+        event: 2,
+        methods: [
+          2
+        ]
+      }
+    ],
+    assets: [
+      {
+        id: 1,
+        required: 1,
+        img: {
+          type: 3,
+          w: 300,
+          h: 250
+        }
+      },
+      {
+        id: 2,
+        required: 1,
+        img: {
+          type: 1,
+          w: 127,
+          h: 83
+        }
+      },
+      {
+        id: 3,
+        required: 1,
+        data: {
+          type: 1,
+          len: 25
+        }
+      },
+      {
+        id: 4,
+        required: 1,
+        title: {
+          len: 140
+        }
+      },
+      {
+        id: 5,
+        required: 1,
+        data: {
+          type: 2,
+          len: 40
+        }
+      },
+      {
+        id: 6,
+        required: 1,
+        data: {
+          type: 12,
+          len: 15
+        }
+      },
+    ],
+    ext: {
+      custom_param: {
+        key: 'custom_value'
+      }
+    },
+    ver: '1.2'
+  }
+}
+
 const VIDEO_REQUEST = {
   'account_id': '1',
   'tid': '437fbbf5-33f5-487a-8e16-a7112903cfe5',
@@ -80,6 +185,7 @@ const VIDEO_REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '1.4.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -110,6 +216,7 @@ const OUTSTREAM_VIDEO_REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '1.4.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -118,7 +225,16 @@ const OUTSTREAM_VIDEO_REQUEST = {
         'video': {
           playerSize: [[640, 480]],
           context: 'outstream',
-          mimes: ['video/mp4']
+          mimes: ['video/mp4'],
+          renderer: {
+            url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+            render: function (bid) {
+              ANOutstreamVideo.renderAd({
+                targetId: bid.adUnitCode,
+                adResponse: bid.adResponse,
+              });
+            }
+          }
         },
         banner: { sizes: [[300, 250]] }
       },
@@ -137,7 +253,8 @@ const OUTSTREAM_VIDEO_REQUEST = {
         video: {
           playerSize: [640, 480],
           context: 'outstream',
-          mimes: ['video/mp4']
+          mimes: ['video/mp4'],
+          skip: 1
         }
       },
       bids: [
@@ -151,18 +268,9 @@ const OUTSTREAM_VIDEO_REQUEST = {
             }
           }
         }
-      ],
-      renderer: {
-        url: 'http://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
-        render: function (bid) {
-          ANOutstreamVideo.renderAd({
-            targetId: bid.adUnitCode,
-            adResponse: bid.adResponse,
-          });
-        }
-      }
+      ]
     }
-  ]
+  ],
 };
 
 let BID_REQUESTS;
@@ -265,6 +373,9 @@ const RESPONSE_OPENRTB = {
               'type': 'banner',
               'event': {
                 'win': 'http://wurl.org?id=333'
+              },
+              'meta': {
+                'dchain': { 'ver': '1.0', 'complete': 0, 'nodes': [{ 'asi': 'magnite.com', 'bsid': '123456789', }] }
               }
             },
             'bidder': {
@@ -432,13 +543,38 @@ const RESPONSE_OPENRTB_NATIVE = {
   ]
 };
 
+function addFpdEnrichmentsToS2SRequest(s2sReq, bidderRequests) {
+  return {
+    ...s2sReq,
+    ortb2Fragments: {
+      ...(s2sReq.ortb2Fragments || {}),
+      global: syncAddFPDToBidderRequest({...(bidderRequests?.[0] || {}), ortb2: s2sReq.ortb2Fragments?.global || {}}).ortb2
+    }
+  }
+}
+
 describe('S2S Adapter', function () {
   let adapter,
     addBidResponse = sinon.spy(),
     done = sinon.spy();
 
+  addBidResponse.reject = sinon.spy();
+
+  function prepRequest(req) {
+    req.ad_units.forEach((adUnit) => {
+      delete adUnit.nativeParams
+    });
+    decorateAdUnitsWithNativeParams(req.ad_units);
+  }
+
+  before(() => {
+    hook.ready();
+    prepRequest(REQUEST);
+  });
+
   beforeEach(function () {
     config.resetConfig();
+    config.setConfig({floors: {enabled: false}});
     adapter = new Adapter();
     BID_REQUESTS = [
       {
@@ -468,8 +604,7 @@ describe('S2S Adapter', function () {
             'sizes': [300, 250],
             'bidId': '123',
             'bidderRequestId': '3d1063078dfcc8',
-            'auctionId': '173afb6d132ba3',
-            'storedAuctionResponse': 11111
+            'auctionId': '173afb6d132ba3'
           }
         ],
         'auctionStart': 1510852447530,
@@ -477,7 +612,7 @@ describe('S2S Adapter', function () {
         'src': 's2s',
         'doneCbCallCount': 0,
         'refererInfo': {
-          'referer': 'http://mytestpage.com'
+          'page': 'http://mytestpage.com'
         }
       }
     ];
@@ -485,6 +620,7 @@ describe('S2S Adapter', function () {
 
   afterEach(function () {
     addBidResponse.resetHistory();
+    addBidResponse.reject = sinon.spy();
     done.resetHistory();
   });
 
@@ -497,45 +633,179 @@ describe('S2S Adapter', function () {
       resetSyncedStatus();
     });
 
-    it('should not add outstrean without renderer', function () {
-      let ortb2Config = utils.deepClone(CONFIG);
-      ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
+    it('should set id and source.tid to auction ID', function () {
+      config.setConfig({ s2sConfig: CONFIG });
+
+      adapter.callBids(OUTSTREAM_VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.id).to.equal(BID_REQUESTS[0].auctionId);
+      expect(requestBid.source.tid).to.equal(BID_REQUESTS[0].auctionId);
+    });
+
+    it('should set tmax to s2sConfig.timeout', () => {
+      const cfg = {...CONFIG, timeout: 123};
+      config.setConfig({s2sConfig: cfg});
+      adapter.callBids({...REQUEST, s2sConfig: cfg}, BID_REQUESTS, addBidResponse, done, ajax);
+      const req = JSON.parse(server.requests[0].requestBody);
+      expect(req.tmax).to.eql(123);
+    })
+
+    it('should block request if config did not define p1Consent URL in endpoint object config', function () {
+      let badConfig = utils.deepClone(CONFIG);
+      badConfig.endpoint = { noP1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction' };
+      config.setConfig({ s2sConfig: badConfig });
+
+      let badCfgRequest = utils.deepClone(REQUEST);
+      badCfgRequest.s2sConfig = badConfig;
+
+      adapter.callBids(badCfgRequest, BID_REQUESTS, addBidResponse, done, ajax);
+
+      expect(server.requests.length).to.equal(0);
+    });
+
+    it('should block request if config did not define noP1Consent URL in endpoint object config', function () {
+      let badConfig = utils.deepClone(CONFIG);
+      badConfig.endpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction' };
+      config.setConfig({ s2sConfig: badConfig });
+
+      let badCfgRequest = utils.deepClone(REQUEST);
+      badCfgRequest.s2sConfig = badConfig;
+
+      let badBidderRequest = utils.deepClone(BID_REQUESTS);
+      badBidderRequest[0].gdprConsent = {
+        consentString: 'abc123',
+        addtlConsent: 'superduperconsent',
+        gdprApplies: true,
+        apiVersion: 2,
+        vendorData: {
+          purpose: {
+            consents: {
+              1: false
+            }
+          }
+        }
+      };
+
+      adapter.callBids(badCfgRequest, badBidderRequest, addBidResponse, done, ajax);
+
+      expect(server.requests.length).to.equal(0);
+    });
+
+    it('should block request if config did not define any URLs in endpoint object config', function () {
+      let badConfig = utils.deepClone(CONFIG);
+      badConfig.endpoint = {};
+      config.setConfig({ s2sConfig: badConfig });
+
+      let badCfgRequest = utils.deepClone(REQUEST);
+      badCfgRequest.s2sConfig = badConfig;
+
+      adapter.callBids(badCfgRequest, BID_REQUESTS, addBidResponse, done, ajax);
+
+      expect(server.requests.length).to.equal(0);
+    });
+
+    it('should add outstream bc renderer exists on mediatype', function () {
+      config.setConfig({ s2sConfig: CONFIG });
 
-      config.setConfig({ s2sConfig: ortb2Config });
       adapter.callBids(OUTSTREAM_VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.imp[0].banner).to.exist;
-      expect(requestBid.imp[0].video).to.not.exist;
+      expect(requestBid.imp[0].video).to.exist;
+    });
+
+    it('should default video placement if not defined and instream', function () {
+      let ortb2Config = utils.deepClone(CONFIG);
+      ortb2Config.endpoint.p1Consent = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
+
+      config.setConfig({ s2sConfig: ortb2Config });
+
+      let videoBid = utils.deepClone(VIDEO_REQUEST);
+      videoBid.ad_units[0].mediaTypes.video.context = 'instream';
+      adapter.callBids(videoBid, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.imp[0].banner).to.not.exist;
+      expect(requestBid.imp[0].video).to.exist;
+      expect(requestBid.imp[0].video.placement).to.equal(1);
+    });
+
+    it('converts video mediaType properties into openRTB format', function () {
+      let ortb2Config = utils.deepClone(CONFIG);
+      ortb2Config.endpoint.p1Consent = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
+
+      config.setConfig({ s2sConfig: ortb2Config });
+
+      let videoBid = utils.deepClone(VIDEO_REQUEST);
+      videoBid.ad_units[0].mediaTypes.video.context = 'instream';
+      adapter.callBids(videoBid, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.imp[0].banner).to.not.exist;
+      expect(requestBid.imp[0].video).to.exist;
+      expect(requestBid.imp[0].video.placement).to.equal(1);
+      expect(requestBid.imp[0].video.w).to.equal(640);
+      expect(requestBid.imp[0].video.h).to.equal(480);
+      expect(requestBid.imp[0].video.playerSize).to.be.undefined;
+      expect(requestBid.imp[0].video.context).to.be.undefined;
     });
 
     it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
 
+    function mockConsent({applies = true, hasP1Consent = true} = {}) {
+      return {
+        consentString: 'mockConsent',
+        gdprApplies: applies,
+        vendorData: {purpose: {consents: {1: hasP1Consent}}},
+      }
+    }
+
     describe('gdpr tests', function () {
       afterEach(function () {
         $$PREBID_GLOBAL$$.requestBids.removeAll();
       });
 
       it('adds gdpr consent information to ortb2 request depending on presence of module', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
+        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+
+        let gdprBidRequest = utils.deepClone(BID_REQUESTS);
+        gdprBidRequest[0].gdprConsent = mockConsent();
+
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, gdprBidRequest), gdprBidRequest, addBidResponse, done, ajax);
+        let requestBid = JSON.parse(server.requests[0].requestBody);
+
+        expect(requestBid.regs.ext.gdpr).is.equal(1);
+        expect(requestBid.user.ext.consent).is.equal('mockConsent');
+
+        config.resetConfig();
+        config.setConfig({ s2sConfig: CONFIG });
+
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
+        requestBid = JSON.parse(server.requests[1].requestBody);
+
+        expect(requestBid.regs).to.not.exist;
+        expect(requestBid.user).to.not.exist;
+      });
 
-        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: ortb2Config };
+      it('adds additional consent information to ortb2 request depending on presence of module', function () {
+        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: CONFIG };
         config.setConfig(consentConfig);
 
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
-        gdprBidRequest[0].gdprConsent = {
-          consentString: 'abc123',
-          gdprApplies: true
-        };
+        gdprBidRequest[0].gdprConsent = Object.assign(mockConsent(), {
+          addtlConsent: 'superduperconsent',
+        });
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, gdprBidRequest), gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.regs.ext.gdpr).is.equal(1);
-        expect(requestBid.user.ext.consent).is.equal('abc123');
+        expect(requestBid.user.ext.consent).is.equal('mockConsent');
+        expect(requestBid.user.ext.ConsentedProvidersSettings.consented_providers).is.equal('superduperconsent');
 
         config.resetConfig();
         config.setConfig({ s2sConfig: CONFIG });
@@ -549,64 +819,64 @@ describe('S2S Adapter', function () {
 
       it('check gdpr info gets added into cookie_sync request: have consent data', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
 
         let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
         config.setConfig(consentConfig);
 
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
 
-        gdprBidRequest[0].gdprConsent = {
-          consentString: 'abc123def',
-          gdprApplies: true
-        };
+        gdprBidRequest[0].gdprConsent = mockConsent();
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.gdpr).is.equal(1);
-        expect(requestBid.gdpr_consent).is.equal('abc123def');
+        expect(requestBid.gdpr_consent).is.equal('mockConsent');
         expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
         expect(requestBid.account).is.equal('1');
       });
 
       it('check gdpr info gets added into cookie_sync request: have consent data but gdprApplies is false', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
 
         let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
         config.setConfig(consentConfig);
 
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
-        gdprBidRequest[0].gdprConsent = {
-          consentString: 'xyz789abcc',
-          gdprApplies: false
-        };
+        gdprBidRequest[0].gdprConsent = mockConsent({applies: false});
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.gdpr).is.equal(0);
         expect(requestBid.gdpr_consent).is.undefined;
       });
 
-      it('checks gdpr info gets added to cookie_sync request: consent data unknown', function () {
+      it('checks gdpr info gets added to cookie_sync request: applies is false', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
 
         let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
         config.setConfig(consentConfig);
 
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
-        gdprBidRequest[0].gdprConsent = {
-          consentString: undefined,
-          gdprApplies: undefined
-        };
+        gdprBidRequest[0].gdprConsent = mockConsent({applies: false});
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
-        expect(requestBid.gdpr).is.undefined;
+        expect(requestBid.gdpr).is.equal(0);
         expect(requestBid.gdpr_consent).is.undefined;
       });
     });
@@ -616,15 +886,13 @@ describe('S2S Adapter', function () {
         $$PREBID_GLOBAL$$.requestBids.removeAll();
       });
 
-      it('is added to ortb2 request when in bidRequest', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        config.setConfig({ s2sConfig: ortb2Config });
+      it('is added to ortb2 request when in FPD', function () {
+        config.setConfig({ s2sConfig: CONFIG });
 
         let uspBidRequest = utils.deepClone(BID_REQUESTS);
         uspBidRequest[0].uspConsent = '1NYN';
 
-        adapter.callBids(REQUEST, uspBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, uspBidRequest), uspBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.regs.ext.us_privacy).is.equal('1NYN');
@@ -632,7 +900,7 @@ describe('S2S Adapter', function () {
         config.resetConfig();
         config.setConfig({ s2sConfig: CONFIG });
 
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
         requestBid = JSON.parse(server.requests[1].requestBody);
 
         expect(requestBid.regs).to.not.exist;
@@ -640,13 +908,16 @@ describe('S2S Adapter', function () {
 
       it('is added to cookie_sync request when in bidRequest', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
         config.setConfig({ s2sConfig: cookieSyncConfig });
 
         let uspBidRequest = utils.deepClone(BID_REQUESTS);
         uspBidRequest[0].uspConsent = '1YNN';
 
-        adapter.callBids(REQUEST, uspBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, uspBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.us_privacy).is.equal('1YNN');
@@ -661,23 +932,18 @@ describe('S2S Adapter', function () {
       });
 
       it('is added to ortb2 request when in bidRequest', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        config.setConfig({ s2sConfig: ortb2Config });
+        config.setConfig({ s2sConfig: CONFIG });
 
         let consentBidRequest = utils.deepClone(BID_REQUESTS);
         consentBidRequest[0].uspConsent = '1NYN';
-        consentBidRequest[0].gdprConsent = {
-          consentString: 'abc123',
-          gdprApplies: true
-        };
+        consentBidRequest[0].gdprConsent = mockConsent();
 
-        adapter.callBids(REQUEST, consentBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, consentBidRequest), consentBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.regs.ext.us_privacy).is.equal('1NYN');
         expect(requestBid.regs.ext.gdpr).is.equal(1);
-        expect(requestBid.user.ext.consent).is.equal('abc123');
+        expect(requestBid.user.ext.consent).is.equal('mockConsent');
 
         config.resetConfig();
         config.setConfig({ s2sConfig: CONFIG });
@@ -691,61 +957,27 @@ describe('S2S Adapter', function () {
 
       it('is added to cookie_sync request when in bidRequest', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
         config.setConfig({ s2sConfig: cookieSyncConfig });
 
         let consentBidRequest = utils.deepClone(BID_REQUESTS);
         consentBidRequest[0].uspConsent = '1YNN';
-        consentBidRequest[0].gdprConsent = {
-          consentString: 'abc123def',
-          gdprApplies: true
-        };
+        consentBidRequest[0].gdprConsent = mockConsent();
+
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig
 
-        adapter.callBids(REQUEST, consentBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(s2sBidRequest, consentBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.us_privacy).is.equal('1YNN');
         expect(requestBid.gdpr).is.equal(1);
-        expect(requestBid.gdpr_consent).is.equal('abc123def');
+        expect(requestBid.gdpr_consent).is.equal('mockConsent');
         expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
         expect(requestBid.account).is.equal('1');
       });
     });
 
-    it('adds digitrust id is present and user is not optout', function () {
-      let ortb2Config = utils.deepClone(CONFIG);
-      ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-
-      let consentConfig = { s2sConfig: ortb2Config };
-      config.setConfig(consentConfig);
-
-      let digiTrustObj = {
-        privacy: {
-          optout: false
-        },
-        id: 'testId',
-        keyv: 'testKeyV'
-      };
-
-      let digiTrustBidRequest = utils.deepClone(BID_REQUESTS);
-      digiTrustBidRequest[0].bids[0].userId = { digitrustid: { data: digiTrustObj } };
-
-      adapter.callBids(REQUEST, digiTrustBidRequest, addBidResponse, done, ajax);
-      let requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.user.ext.digitrust).to.deep.equal({
-        id: digiTrustObj.id,
-        keyv: digiTrustObj.keyv
-      });
-
-      digiTrustObj.privacy.optout = true;
-
-      adapter.callBids(REQUEST, digiTrustBidRequest, addBidResponse, done, ajax);
-      requestBid = JSON.parse(server.requests[1].requestBody);
-
-      expect(requestBid.user && request.user.ext && requestBid.user.ext.digitrust).to.not.exist;
-    });
-
     it('adds device and app objects to request', function () {
       const _config = {
         s2sConfig: CONFIG,
@@ -754,13 +986,13 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.device).to.deep.equal({
+      sinon.assert.match(requestBid.device, {
         ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC',
         w: window.innerWidth,
         h: window.innerHeight
-      });
+      })
       expect(requestBid.app).to.deep.equal({
         bundle: 'com.test.app',
         publisher: { 'id': '1' }
@@ -769,7 +1001,9 @@ describe('S2S Adapter', function () {
 
     it('adds device and app objects to request for OpenRTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       });
 
       const _config = {
@@ -779,93 +1013,334 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.device).to.deep.equal({
+      sinon.assert.match(requestBid.device, {
         ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC',
         w: window.innerWidth,
         h: window.innerHeight
-      });
+      })
       expect(requestBid.app).to.deep.equal({
         bundle: 'com.test.app',
         publisher: { 'id': '1' }
       });
     });
 
-    it('adds debugging value from storedAuctionResponse to OpenRTB', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+    describe('price floors module', function () {
+      function runTest(expectedFloor, expectedCur) {
+        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+        const requestBid = JSON.parse(server.requests[requestCount].requestBody);
+        expect(requestBid.imp[0].bidfloor).to.equal(expectedFloor);
+        expect(requestBid.imp[0].bidfloorcur).to.equal(expectedCur);
+        requestCount += 1;
+      }
+
+      let getFloorResponse, requestCount;
+      beforeEach(function () {
+        getFloorResponse = {};
+        requestCount = 0;
       });
-      const _config = {
-        s2sConfig: s2sConfig,
-        device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
-        app: { bundle: 'com.test.app' }
-      };
 
-      config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
-      const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.imp).to.exist.and.to.be.a('array');
-      expect(requestBid.imp).to.have.lengthOf(1);
-      expect(requestBid.imp[0].ext).to.exist.and.to.be.a('object');
-      expect(requestBid.imp[0].ext.prebid).to.exist.and.to.be.a('object');
-      expect(requestBid.imp[0].ext.prebid.storedauctionresponse).to.exist.and.to.be.a('object');
-      expect(requestBid.imp[0].ext.prebid.storedauctionresponse.id).to.equal('11111');
-    });
+      it('should NOT pass bidfloor and bidfloorcur when getFloor not present or returns invalid response', function () {
+        const _config = {
+          s2sConfig: CONFIG,
+        };
 
-    it('adds device.w and device.h even if the config lacks a device object', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        config.setConfig(_config);
+
+        // if no get floor
+        runTest(undefined, undefined);
+
+        // if getFloor returns empty object
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        runTest(undefined, undefined);
+        // make sure getFloor was called
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'USD',
+            mediaType: '*',
+            size: '*'
+          })
+        ).to.be.true;
+
+        // if getFloor does not return number
+        getFloorResponse = { currency: 'EUR', floor: 'not a number' };
+        runTest(undefined, undefined);
+
+        // if getFloor does not return currency
+        getFloorResponse = { floor: 1.1 };
+        runTest(undefined, undefined);
       });
 
-      const _config = {
-        s2sConfig: s2sConfig,
-        app: { bundle: 'com.test.app' },
-      };
+      it('should correctly pass bidfloor and bidfloorcur', function () {
+        const _config = {
+          s2sConfig: CONFIG,
+        };
 
-      config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
-      const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.device).to.deep.equal({
-        w: window.innerWidth,
-        h: window.innerHeight
+        config.setConfig(_config);
+
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        // returns USD and string floor
+        getFloorResponse = { currency: 'USD', floor: '1.23' };
+        runTest(1.23, 'USD');
+        // make sure getFloor was called
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'USD',
+            mediaType: '*',
+            size: '*'
+          })
+        ).to.be.true;
+
+        // returns non USD and number floor
+        getFloorResponse = { currency: 'EUR', floor: 0.85 };
+        runTest(0.85, 'EUR');
       });
-      expect(requestBid.app).to.deep.equal({
-        bundle: 'com.test.app',
-        publisher: { 'id': '1' }
+
+      it('should correctly pass adServerCurrency when set to getFloor not default', function () {
+        config.setConfig({
+          s2sConfig: CONFIG,
+          currency: { adServerCurrency: 'JPY' },
+        });
+
+        // we have to start requestCount at 1 because a conversion rates fetch occurs when adServerCur is not USD!
+        requestCount = 1;
+
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        // returns USD and string floor
+        getFloorResponse = { currency: 'JPY', floor: 97.2 };
+        runTest(97.2, 'JPY');
+        // make sure getFloor was called with JPY
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'JPY',
+            mediaType: '*',
+            size: '*'
+          })
+        ).to.be.true;
       });
-    });
 
-    it('adds native request for OpenRTB', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+      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');
       });
 
-      const _config = {
-        s2sConfig: s2sConfig
-      };
+      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},
+                ]
+              }
+            ]
+          };
+        });
 
-      config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
-      const requestBid = JSON.parse(server.requests[0].requestBody);
+        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;
+          });
+        })
 
-      expect(requestBid.imp[0].native).to.deep.equal({
-        request: JSON.stringify({
-          'context': 1,
-          'plcmttype': 1,
-          'eventtrackers': [{
-            event: 1,
-            methods: [1]
-          }],
+        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: 'absolute minimum',
+            expectedFloor: 1,
+            expectedCur: '10',
+            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);
+            });
+          });
+        });
+      });
+    });
+
+    if (FEATURES.NATIVE) {
+      describe('native requests', function () {
+        const ORTB_NATIVE_REQ = {
+          'ver': '1.2',
           'assets': [
             {
               'required': 1,
+              'id': 0,
               'title': {
                 'len': 800
               }
             },
             {
               'required': 1,
+              'id': 1,
               'img': {
                 'type': 3,
                 'w': 989,
@@ -874,6 +1349,7 @@ describe('S2S Adapter', function () {
             },
             {
               'required': 1,
+              'id': 2,
               'img': {
                 'type': 1,
                 'wmin': 10,
@@ -885,23 +1361,116 @@ describe('S2S Adapter', function () {
             },
             {
               'required': 1,
+              'id': 3,
               'data': {
                 'type': 1
               }
             }
           ]
-        }),
-        ver: '1.2'
-      });
-    });
+        };
 
-    it('adds site if app is not present', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        it('adds device.w and device.h even if the config lacks a device object', function () {
+          const _config = {
+            s2sConfig: CONFIG,
+            app: { bundle: 'com.test.app' },
+          };
+
+          config.setConfig(_config);
+          adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+          sinon.assert.match(requestBid.device, {
+            w: window.innerWidth,
+            h: window.innerHeight
+          })
+          expect(requestBid.app).to.deep.equal({
+            bundle: 'com.test.app',
+            publisher: { 'id': '1' }
+          });
+          expect(requestBid.imp[0].native.ver).to.equal('1.2');
+        });
+
+        it('adds native request for OpenRTB', function () {
+          const _config = {
+            s2sConfig: CONFIG
+          };
+
+          config.setConfig(_config);
+          adapter.callBids({...REQUEST, s2sConfig: Object.assign({}, CONFIG, s2sDefaultConfig)}, BID_REQUESTS, addBidResponse, done, ajax);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+          const ortbReq = JSON.parse(requestBid.imp[0].native.request);
+          expect(ortbReq).to.deep.equal({
+            ...ORTB_NATIVE_REQ,
+            'context': 1,
+            'plcmttype': 1,
+            'eventtrackers': [{
+              event: 1,
+              methods: [1]
+            }],
+          });
+          expect(requestBid.imp[0].native.ver).to.equal('1.2');
+        });
+
+        it('adds native ortb request for OpenRTB', function () {
+          const _config = {
+            s2sConfig: CONFIG
+          };
+
+          const openRtbNativeRequest = deepClone(REQUEST);
+          delete openRtbNativeRequest.ad_units[0].mediaTypes.native;
+          delete openRtbNativeRequest.ad_units[0].nativeParams;
+
+          openRtbNativeRequest.ad_units[0].mediaTypes.native = NATIVE_ORTB_MTO;
+          prepRequest(openRtbNativeRequest);
+
+          config.setConfig(_config);
+          adapter.callBids(openRtbNativeRequest, BID_REQUESTS, addBidResponse, done, ajax);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+          const nativeReq = JSON.parse(requestBid.imp[0].native.request);
+          expect(nativeReq).to.deep.equal(NATIVE_ORTB_MTO.ortb);
+          expect(requestBid.imp[0].native.ver).to.equal('1.2');
+        });
+
+        it('can override default values for imp.native.request with s2sConfig.ortbNative', () => {
+          const cfg = {
+            ...CONFIG,
+            ortbNative: {
+              eventtrackers: [
+                {event: 1, methods: [1, 2]}
+              ]
+            }
+          }
+          config.setConfig({
+            s2sConfig: cfg
+          });
+          adapter.callBids({...REQUEST, s2sConfig: cfg}, BID_REQUESTS, addBidResponse, done, ajax);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+          const ortbReq = JSON.parse(requestBid.imp[0].native.request);
+          expect(ortbReq).to.eql({
+            ...ORTB_NATIVE_REQ,
+            eventtrackers: [
+              {event: 1, methods: [1, 2]}
+            ]
+          })
+        })
+
+        it('should not include ext.aspectratios if adunit\'s aspect_ratios do not define radio_width and ratio_height', () => {
+          const req = deepClone(REQUEST);
+          req.ad_units[0].mediaTypes.native.icon.aspect_ratios[0] = {'min_width': 1, 'min_height': 2};
+          prepRequest(req);
+          adapter.callBids(req, BID_REQUESTS, addBidResponse, done, ajax);
+          const nativeReq = JSON.parse(JSON.parse(server.requests[0].requestBody).imp[0].native.request);
+          const icons = nativeReq.assets.map((a) => a.img).filter((img) => img && img.type === 1);
+          expect(icons).to.have.length(1);
+          expect(icons[0].hmin).to.equal(2);
+          expect(icons[0].wmin).to.equal(1);
+          expect(deepAccess(icons[0], 'ext.aspectratios')).to.be.undefined;
+        });
       });
+    }
 
+    it('adds site if app is not present', function () {
       const _config = {
-        s2sConfig: s2sConfig,
+        s2sConfig: CONFIG,
         site: {
           publisher: {
             id: '1234',
@@ -914,7 +1483,7 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.site).to.exist.and.to.be.a('object');
       expect(requestBid.site.publisher).to.exist.and.to.be.a('object');
@@ -931,72 +1500,171 @@ describe('S2S Adapter', function () {
         content: {
           language: 'en'
         },
+        domain: 'mytestpage.com',
         page: 'http://mytestpage.com'
       });
     });
 
     it('adds appnexus aliases to request', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+      config.setConfig({ s2sConfig: CONFIG });
+
+      const aliasBidder = {
+        bidder: 'beintoo',
+        bid_id: REQUEST.ad_units[0].bids[0].bid_id,
+        params: { placementId: '123456' }
+      };
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: 'beintoo'}], addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext).to.haveOwnProperty('prebid');
+      expect(requestBid.ext.prebid).to.deep.include({
+        aliases: {
+          beintoo: 'appnexus'
+        },
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
+        }
       });
-      config.setConfig({ s2sConfig: s2sConfig });
+    });
+
+    it('unregistered bidder should alias', function () {
+      const adjustedConfig = utils.deepClone(CONFIG);
+      adjustedConfig.bidders = 'bidderD'
+      config.setConfig({ s2sConfig: adjustedConfig });
+
+      const aliasBidder = {
+        ...REQUEST.ad_units[0].bids[0],
+        bidder: 'bidderD',
+        params: {
+          unit: '10433394',
+        }
+      };
+
+      $$PREBID_GLOBAL$$.aliasBidder('mockBidder', aliasBidder.bidder);
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+      request.s2sConfig = adjustedConfig;
+
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: aliasBidder.bidder}], addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext.prebid.aliases).to.deep.equal({ bidderD: 'mockBidder' });
+    });
 
+    it('adds dynamic aliases to request', function () {
+      config.setConfig({ s2sConfig: CONFIG });
+
+      const alias = 'foobar';
       const aliasBidder = {
-        bidder: 'brealtime',
+        bidder: alias,
+        bid_id: REQUEST.ad_units[0].bids[0].bid_id,
         params: { placementId: '123456' }
       };
 
       const request = utils.deepClone(REQUEST);
       request.ad_units[0].bids = [aliasBidder];
 
-      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+      // TODO: stub this
+      $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias);
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: 'foobar'}], addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext).to.haveOwnProperty('prebid');
+      expect(requestBid.ext.prebid).to.deep.include({
+        aliases: {
+          [alias]: 'appnexus'
+        },
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
+        }
+      });
+    });
+
+    it('skips pbs alias when skipPbsAliasing is enabled in adapter', function () {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
+      });
+      config.setConfig({ s2sConfig: s2sConfig });
+      registerBidder({
+        code: 'bidderCodeForTestSkipBPSAlias',
+        aliases: [{
+          code: 'bidderCodeForTestSkipBPSAlias_Alias',
+          skipPbsAliasing: true
+        }]
+      })
+      const aliasBidder = {
+        bidder: 'bidderCodeForTestSkipBPSAlias_Alias',
+        bid_id: REQUEST.ad_units[0].bids[0].bid_id,
+        params: { aid: 123 }
+      };
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: aliasBidder.bidder}], addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext).to.deep.equal({
         prebid: {
-          aliases: {
-            brealtime: 'appnexus'
-          },
           auctiontimestamp: 1510852447530,
           targeting: {
             includebidderkeys: false,
             includewinners: true
+          },
+          channel: {
+            name: 'pbjs',
+            version: 'v$prebid.version$'
           }
         }
       });
     });
 
-    it('adds dynamic aliases to request', function () {
+    it('skips dynamic aliases to request when skipPbsAliasing enabled', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       });
       config.setConfig({ s2sConfig: s2sConfig });
 
-      const alias = 'foobar';
+      const alias = 'foobar_1';
       const aliasBidder = {
         bidder: alias,
-        params: { placementId: '123456' }
+        bid_id: REQUEST.ad_units[0].bids[0].bid_id,
+        params: { aid: 1234567 }
       };
 
       const request = utils.deepClone(REQUEST);
       request.ad_units[0].bids = [aliasBidder];
 
       // TODO: stub this
-      $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias);
-      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+      $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias, { skipPbsAliasing: true });
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: aliasBidder.bidder}], addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext).to.deep.equal({
         prebid: {
-          aliases: {
-            [alias]: 'appnexus'
-          },
           auctiontimestamp: 1510852447530,
           targeting: {
             includebidderkeys: false,
             includewinners: true
+          },
+          channel: {
+            name: 'pbjs',
+            version: 'v$prebid.version$'
           }
         }
       });
@@ -1004,25 +1672,29 @@ describe('S2S Adapter', function () {
 
     it('converts appnexus params to expected format for PBS', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       });
       config.setConfig({ s2sConfig: s2sConfig });
 
-      const myRequest = utils.deepClone(REQUEST);
-      myRequest.ad_units[0].bids[0].params.usePaymentRule = true;
-      myRequest.ad_units[0].bids[0].params.keywords = {
-        foo: ['bar', 'baz'],
-        fizz: ['buzz']
-      };
+      Object.assign(BID_REQUESTS[0].bids[0].params, {
+        usePaymentRule: true,
+        keywords: {
+          foo: ['bar', 'baz'],
+          fizz: ['buzz']
+        }
+      })
 
-      adapter.callBids(myRequest, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
-      expect(requestBid.imp[0].ext.appnexus).to.exist;
-      expect(requestBid.imp[0].ext.appnexus.placement_id).to.exist.and.to.equal(10433394);
-      expect(requestBid.imp[0].ext.appnexus.use_pmt_rule).to.exist.and.to.be.true;
-      expect(requestBid.imp[0].ext.appnexus.member).to.exist;
-      expect(requestBid.imp[0].ext.appnexus.keywords).to.exist.and.to.deep.equal([{
+      const requestParams = requestBid.imp[0].ext.prebid.bidder;
+      expect(requestParams.appnexus).to.exist;
+      expect(requestParams.appnexus.placement_id).to.exist.and.to.equal(10433394);
+      expect(requestParams.appnexus.use_pmt_rule).to.exist.and.to.be.true;
+      expect(requestParams.appnexus.member).to.exist;
+      expect(requestParams.appnexus.keywords).to.exist.and.to.deep.equal([{
         key: 'foo',
         value: ['bar', 'baz']
       }, {
@@ -1033,13 +1705,16 @@ describe('S2S Adapter', function () {
 
     it('adds limit to the cookie_sync request if userSyncLimit is greater than 0', function () {
       let cookieSyncConfig = utils.deepClone(CONFIG);
-      cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+      cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
       cookieSyncConfig.userSyncLimit = 1;
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = cookieSyncConfig;
+
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
       let bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
       let requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1049,11 +1724,14 @@ describe('S2S Adapter', function () {
 
     it('does not add limit to cooke_sync request if userSyncLimit is missing or 0', function () {
       let cookieSyncConfig = utils.deepClone(CONFIG);
-      cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+      cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = cookieSyncConfig;
+
       let bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
       let requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1064,8 +1742,11 @@ describe('S2S Adapter', function () {
       config.resetConfig();
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
+      const s2sBidRequest2 = utils.deepClone(REQUEST);
+      s2sBidRequest2.s2sConfig = cookieSyncConfig;
+
       bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest2, bidRequest, addBidResponse, done, ajax);
       requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1075,7 +1756,6 @@ describe('S2S Adapter', function () {
 
     it('adds s2sConfig adapterOptions to request for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1088,16 +1768,19 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.imp[0].ext.appnexus).to.haveOwnProperty('key');
-      expect(requestBid.imp[0].ext.appnexus.key).to.be.equal('value')
+      const requestParams = requestBid.imp[0].ext.prebid.bidder;
+      expect(requestParams.appnexus).to.haveOwnProperty('key');
+      expect(requestParams.appnexus.key).to.be.equal('value')
     });
 
     describe('config site value is added to the oRTB request', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1109,6 +1792,9 @@ describe('S2S Adapter', function () {
         ip: '75.97.0.47'
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       it('and overrides publisher and page', function () {
         config.setConfig({
           s2sConfig: s2sConfig,
@@ -1119,7 +1805,8 @@ describe('S2S Adapter', function () {
           },
           device: device
         });
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+        adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
         const requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -1137,7 +1824,8 @@ describe('S2S Adapter', function () {
           },
           device: device
         });
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(s2sBidRequest, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
 
         const requestBid = JSON.parse(server.requests[0].requestBody);
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -1149,10 +1837,7 @@ describe('S2S Adapter', function () {
     });
 
     it('when userId is defined on bids, it\'s properties should be copied to user.ext.tpid properties', function () {
-      let ortb2Config = utils.deepClone(CONFIG);
-      ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-
-      let consentConfig = { s2sConfig: ortb2Config };
+      let consentConfig = { s2sConfig: CONFIG };
       config.setConfig(consentConfig);
 
       let userIdBidRequest = utils.deepClone(BID_REQUESTS);
@@ -1160,12 +1845,18 @@ describe('S2S Adapter', function () {
         criteoId: '44VmRDeUE3ZGJ5MzRkRVJHU3BIUlJ6TlFPQUFU',
         tdid: 'abc123',
         pubcid: '1234',
-        parrableid: '01.1563917337.test-eid',
+        parrableId: { eid: '01.1563917337.test-eid' },
         lipb: {
           lipbid: 'li-xyz',
           segments: ['segA', 'segB']
         },
-        idl_env: '0000-1111-2222-3333'
+        idl_env: '0000-1111-2222-3333',
+        id5id: {
+          uid: '11111',
+          ext: {
+            linkType: 'some-link-type'
+          }
+        }
       };
       userIdBidRequest[0].bids[0].userIdAsEids = createEidsArray(userIdBidRequest[0].bids[0].userId);
 
@@ -1186,31 +1877,16 @@ describe('S2S Adapter', function () {
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveintent.com')[0].ext.segments.length).is.equal(2);
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveintent.com')[0].ext.segments[0]).is.equal('segA');
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveintent.com')[0].ext.segments[1]).is.equal('segB');
+      expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')).is.not.empty;
+      expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')[0].uids[0].id).is.equal('11111');
+      expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')[0].uids[0].ext.linkType).is.equal('some-link-type');
       // LiveRamp should exist
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveramp.com')[0].uids[0].id).is.equal('0000-1111-2222-3333');
     });
 
-    it('when config \'currency.adServerCurrency\' value is an array: ORTB has property \'cur\' value set to a single item array', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-      config.setConfig({
-        currency: { adServerCurrency: ['USD', 'GB', 'UK', 'AU'] },
-        s2sConfig: s2sConfig
-      });
-
-      const bidRequests = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
-
-      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
-      expect(parsedRequestBody.cur).to.deep.equal(['USD']);
-    });
-
     it('when config \'currency.adServerCurrency\' value is a string: ORTB has property \'cur\' value set to a single item array', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
       config.setConfig({
         currency: { adServerCurrency: 'NZ' },
-        s2sConfig: s2sConfig
       });
 
       const bidRequests = utils.deepClone(BID_REQUESTS);
@@ -1221,9 +1897,7 @@ describe('S2S Adapter', function () {
     });
 
     it('when config \'currency.adServerCurrency\' is unset: ORTB should not define a \'cur\' property', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-      config.setConfig({ s2sConfig: s2sConfig });
+      config.setConfig({ s2sConfig: CONFIG });
 
       const bidRequests = utils.deepClone(BID_REQUESTS);
       adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
@@ -1234,7 +1908,6 @@ describe('S2S Adapter', function () {
 
     it('always add ext.prebid.targeting.includebidderkeys: false for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1248,7 +1921,11 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext.prebid.targeting).to.haveOwnProperty('includebidderkeys');
@@ -1257,7 +1934,6 @@ describe('S2S Adapter', function () {
 
     it('always add ext.prebid.targeting.includewinners: true for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1269,9 +1945,12 @@ describe('S2S Adapter', function () {
         device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
         app: { bundle: 'com.test.app' },
       };
-
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext.prebid.targeting).to.haveOwnProperty('includewinners');
@@ -1280,7 +1959,6 @@ describe('S2S Adapter', function () {
 
     it('adds s2sConfig video.ext.prebid to request for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           foo: 'bar'
         }
@@ -1291,13 +1969,16 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         foo: 'bar',
         targeting: {
@@ -1309,7 +1990,6 @@ describe('S2S Adapter', function () {
 
     it('overrides request.ext.prebid properties using s2sConfig video.ext.prebid values for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           targeting: {
             includewinners: false,
@@ -1323,13 +2003,16 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         targeting: {
           includewinners: false,
@@ -1340,7 +2023,6 @@ describe('S2S Adapter', function () {
 
     it('overrides request.ext.prebid properties using s2sConfig video.ext.prebid values for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           cache: {
             vastxml: 'vastxml-set-though-extPrebid.cache.vastXml'
@@ -1357,13 +2039,16 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         cache: {
           vastxml: 'vastxml-set-though-extPrebid.cache.vastXml'
@@ -1375,36 +2060,238 @@ describe('S2S Adapter', function () {
       });
     });
 
-    it('passes schain object in request', function () {
-      const bidRequests = utils.deepClone(BID_REQUESTS);
-      const schainObject = {
-        'ver': '1.0',
-        'complete': 1,
-        'nodes': [
-          {
-            'asi': 'indirectseller.com',
-            'sid': '00001',
-            'hp': 1
-          },
+    it('should have extPrebid.schains present on req object if bidder specific schains were configured with pbjs', function () {
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+      bidRequest[0].bids[0].schain = {
+        complete: 1,
+        nodes: [{
+          asi: 'test.com',
+          hp: 1,
+          sid: '11111'
+        }],
+        ver: '1.0'
+      };
 
-          {
-            'asi': 'indirectseller-2.com',
-            'sid': '00002',
-            'hp': 2
+      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.ext.prebid.schains).to.deep.equal([
+        {
+          bidders: ['appnexus'],
+          schain: {
+            complete: 1,
+            nodes: [
+              {
+                asi: 'test.com',
+                hp: 1,
+                sid: '11111'
+              }
+            ],
+            ver: '1.0'
           }
-        ]
+        }
+      ]);
+    });
+
+    it('should skip over adding any bid specific schain entries that already exist on extPrebid.schains', function () {
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+      bidRequest[0].bids[0].schain = {
+        complete: 1,
+        nodes: [{
+          asi: 'pbjs.com',
+          hp: 1,
+          sid: '22222'
+        }],
+        ver: '1.0'
+      };
+
+      const s2sConfig = Object.assign({}, CONFIG, {
+        extPrebid: {
+          schains: [
+            {
+              bidders: ['appnexus'],
+              schain: {
+                complete: 1,
+                nodes: [
+                  {
+                    asi: 'pbs.com',
+                    hp: 1,
+                    sid: '11111'
+                  }
+                ],
+                ver: '1.0'
+              }
+            }
+          ]
+        }
+      });
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext.prebid.schains).to.deep.equal([
+        {
+          bidders: ['appnexus'],
+          schain: {
+            complete: 1,
+            nodes: [
+              {
+                asi: 'pbs.com',
+                hp: 1,
+                sid: '11111'
+              }
+            ],
+            ver: '1.0'
+          }
+        }
+      ]);
+    });
+
+    it('should add a bidder name to pbs schain if the schain is equal to a pbjs one but the pbjs bidder name is not in the bidder array on the pbs side', function () {
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+      bidRequest[0].bids[0].schain = {
+        complete: 1,
+        nodes: [{
+          asi: 'test.com',
+          hp: 1,
+          sid: '11111'
+        }],
+        ver: '1.0'
       };
-      bidRequests[0].bids[0].schain = schainObject;
+
+      bidRequest[0].bids[1] = {
+        bidder: 'rubicon',
+        params: {
+          accountId: 14062,
+          siteId: 70608,
+          zoneId: 498816
+        }
+      };
+
+      const s2sConfig = Object.assign({}, CONFIG, {
+        bidders: ['rubicon', 'appnexus'],
+        extPrebid: {
+          schains: [
+            {
+              bidders: ['rubicon'],
+              schain: {
+                complete: 1,
+                nodes: [
+                  {
+                    asi: 'test.com',
+                    hp: 1,
+                    sid: '11111'
+                  }
+                ],
+                ver: '1.0'
+              }
+            }
+          ]
+        }
+      });
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext.prebid.schains).to.deep.equal([
+        {
+          bidders: ['rubicon', 'appnexus'],
+          schain: {
+            complete: 1,
+            nodes: [
+              {
+                asi: 'test.com',
+                hp: 1,
+                sid: '11111'
+              }
+            ],
+            ver: '1.0'
+          }
+        }
+      ]);
+    });
+
+    it('should "promote" the most reused bidder schain to source.ext.schain', () => {
+      const bidderReqs = [
+        {...deepClone(BID_REQUESTS[0]), bidderCode: 'A'},
+        {...deepClone(BID_REQUESTS[0]), bidderCode: 'B'},
+        {...deepClone(BID_REQUESTS[0]), bidderCode: 'C'}
+      ];
+      const chain1 = {chain: 1};
+      const chain2 = {chain: 2};
+
+      bidderReqs[0].bids[0].schain = chain1;
+      bidderReqs[1].bids[0].schain = chain2;
+      bidderReqs[2].bids[0].schain = chain2;
+
+      adapter.callBids(REQUEST, bidderReqs, addBidResponse, done, ajax);
+      const req = JSON.parse(server.requests[0].requestBody);
+      expect(req.source.ext.schain).to.eql(chain2);
+    });
+
+    it('passes multibid array in request', function () {
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+      const multibid = [{
+        bidder: 'bidderA',
+        maxBids: 2
+      }, {
+        bidder: 'bidderB',
+        maxBids: 2
+      }];
+      const expected = [{
+        bidder: 'bidderA',
+        maxbids: 2
+      }, {
+        bidder: 'bidderB',
+        maxbids: 2
+      }];
+
+      config.setConfig({ multibid: multibid });
+
       adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
       const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
-      expect(parsedRequestBody.source.ext.schain).to.deep.equal(schainObject);
+      expect(parsedRequestBody.ext.prebid.multibid).to.deep.equal(expected);
+    });
+
+    it('sets and passes pbjs version in request if channel does not exist in s2sConfig', () => {
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(s2sBidRequest, bidRequests, addBidResponse, done, ajax);
+
+      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+      expect(parsedRequestBody.ext.prebid.channel).to.deep.equal({ name: 'pbjs', version: 'v$prebid.version$' });
+    });
+
+    it('extPrebid is now mergedDeep -> should include default channel as well', () => {
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+
+      utils.deepSetValue(s2sBidRequest, 's2sConfig.extPrebid.channel', { test: 1 });
+
+      adapter.callBids(s2sBidRequest, bidRequests, addBidResponse, done, ajax);
+
+      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+      // extPrebid is now deep merged with
+      expect(parsedRequestBody.ext.prebid.channel).to.deep.equal({
+        name: 'pbjs',
+        test: 1,
+        version: 'v$prebid.version$'
+      });
     });
 
     it('passes first party data in request', () => {
       const s2sBidRequest = utils.deepClone(REQUEST);
       const bidRequests = utils.deepClone(BID_REQUESTS);
 
-      const commonContext = {
+      const commonSite = {
         keywords: ['power tools'],
         search: 'drill'
       };
@@ -1413,42 +2300,153 @@ describe('S2S Adapter', function () {
         gender: 'M'
       };
 
-      const context = {
-        content: { userrating: 4 },
-        data: {
-          pageType: 'article',
-          category: 'tools'
+      const site = {
+        content: {userrating: 4},
+        ext: {
+          data: {
+            pageType: 'article',
+            category: 'tools'
+          }
         }
       };
       const user = {
         yob: '1984',
         geo: { country: 'ca' },
-        data: {
-          registered: true,
-          interests: ['cars']
+        ext: {
+          data: {
+            registered: true,
+            interests: ['cars']
+          }
         }
       };
-      const allowedBidders = [ 'rubicon', 'appnexus' ];
+      const bcat = ['IAB25', 'IAB7-39'];
+      const badv = ['blockedAdv-1.com', 'blockedAdv-2.com'];
+      const allowedBidders = ['rubicon', 'appnexus'];
 
       const expected = allowedBidders.map(bidder => ({
-        bidders: [ bidder ],
-        config: { fpd: { site: context, user } }
+        bidders: [bidder],
+        config: {
+          ortb2: {
+            site: {
+              content: { userrating: 4 },
+              ext: {
+                data: {
+                  pageType: 'article',
+                  category: 'tools'
+                }
+              }
+            },
+            user: {
+              yob: '1984',
+              geo: { country: 'ca' },
+              ext: {
+                data: {
+                  registered: true,
+                  interests: ['cars']
+                }
+              }
+            },
+            bcat: ['IAB25', 'IAB7-39'],
+            badv: ['blockedAdv-1.com', 'blockedAdv-2.com']
+          }
+        }
       }));
+      const commonContextExpected = utils.mergeDeep({
+        'page': 'http://mytestpage.com',
+        'domain': 'mytestpage.com',
+        'publisher': {
+          'id': '1',
+          'domain': 'mytestpage.com'
+        }
+      }, commonSite);
 
-      config.setConfig({ fpd: { context: commonContext, user: commonUser } });
-      config.setBidderConfig({ bidders: allowedBidders, config: { fpd: { context, user } } });
-      adapter.callBids(s2sBidRequest, bidRequests, addBidResponse, done, ajax);
+      const ortb2Fragments = {
+        global: {site: commonSite, user: commonUser, badv, bcat},
+        bidder: Object.fromEntries(allowedBidders.map(bidder => [bidder, {site, user, bcat, badv}]))
+      };
+
+      adapter.callBids(addFpdEnrichmentsToS2SRequest({...s2sBidRequest, ortb2Fragments}, bidRequests), bidRequests, addBidResponse, done, ajax);
       const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
       expect(parsedRequestBody.ext.prebid.bidderconfig).to.deep.equal(expected);
-      expect(parsedRequestBody.site.ext.data).to.deep.equal(commonContext);
-      expect(parsedRequestBody.user.ext.data).to.deep.equal(commonUser);
+      expect(parsedRequestBody.site).to.deep.equal(commonContextExpected);
+      expect(parsedRequestBody.user).to.deep.equal(commonUser);
+      expect(parsedRequestBody.badv).to.deep.equal(badv);
+      expect(parsedRequestBody.bcat).to.deep.equal(bcat);
     });
 
     describe('pbAdSlot config', function () {
-      it('should not send \"imp.ext.context.data.adslot\" if \"fpd.context\" is undefined', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext\" is undefined', function () {
+        const consentConfig = { s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+        const bidRequest = utils.deepClone(REQUEST);
+
+        adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+        expect(parsedRequestBody.imp).to.be.a('array');
+        expect(parsedRequestBody.imp[0]).to.be.a('object');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
+      });
+
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" is undefined', function () {
+        const consentConfig = { s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+        const bidRequest = utils.deepClone(REQUEST);
+        bidRequest.ad_units[0].ortb2Imp = {};
+
+        adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+        expect(parsedRequestBody.imp).to.be.a('array');
+        expect(parsedRequestBody.imp[0]).to.be.a('object');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
+      });
+
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" is empty string', function () {
+        const consentConfig = { s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+        const bidRequest = utils.deepClone(REQUEST);
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              pbadslot: ''
+            }
+          }
+        };
+
+        adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+        expect(parsedRequestBody.imp).to.be.a('array');
+        expect(parsedRequestBody.imp[0]).to.be.a('object');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
+      });
+
+      it('should send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a non-empty string', function () {
+        const consentConfig = { s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+        const bidRequest = utils.deepClone(REQUEST);
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              pbadslot: '/a/b/c'
+            }
+          }
+        };
+
+        adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+        expect(parsedRequestBody.imp).to.be.a('array');
+        expect(parsedRequestBody.imp[0]).to.be.a('object');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.pbadslot');
+        expect(parsedRequestBody.imp[0].ext.data.pbadslot).to.equal('/a/b/c');
+      });
+    });
+
+    describe('GAM ad unit config', function () {
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext\" is undefined', function () {
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
 
@@ -1457,34 +2455,34 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should not send \"imp.ext.context.data.adslot\" if \"fpd.context.pbAdSlot\" is undefined', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext.data.adserver.adslot\" is undefined', function () {
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {};
+        bidRequest.ad_units[0].ortb2Imp = {};
 
         adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
         const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should not send \"imp.ext.context.data.adslot\" if \"fpd.context.pbAdSlot\" is empty string', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext.data.adserver.adslot\" is empty string', function () {
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {
-          context: {
-            pbAdSlot: ''
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              adserver: {
+                adslot: ''
+              }
+            }
           }
         };
 
@@ -1493,18 +2491,21 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should send \"imp.ext.context.data.adslot\" if \"fpd.context.pbAdSlot\" value is a non-empty string', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+      it('should send both \"adslot\" and \"name\" from \"imp.ext.data.adserver\" if \"ortb2Imp.ext.data.adserver.adslot\" and \"ortb2Imp.ext.data.adserver.name\" values are non-empty strings', function () {
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {
-          context: {
-            pbAdSlot: '/a/b/c'
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              adserver: {
+                adslot: '/a/b/c',
+                name: 'adserverName1'
+              }
+            }
           }
         };
 
@@ -1513,12 +2514,40 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.context.data.adslot');
-        expect(parsedRequestBody.imp[0].ext.context.data.adslot).to.equal('/a/b/c');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.adserver.adslot');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.adserver.name');
+        expect(parsedRequestBody.imp[0].ext.data.adserver.adslot).to.equal('/a/b/c');
+        expect(parsedRequestBody.imp[0].ext.data.adserver.name).to.equal('adserverName1');
       });
     });
   });
 
+  describe('ext.prebid config', function () {
+    it('should send \"imp.ext.prebid.storedrequest.id\" if \"ortb2Imp.ext.prebid.storedrequest.id\" is set', function () {
+      const consentConfig = { s2sConfig: CONFIG };
+      config.setConfig(consentConfig);
+      const bidRequest = utils.deepClone(REQUEST);
+      const storedRequestId = 'my-id';
+      bidRequest.ad_units[0].ortb2Imp = {
+        ext: {
+          prebid: {
+            storedrequest: {
+              id: storedRequestId
+            }
+          }
+        }
+      };
+
+      adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+      expect(parsedRequestBody.imp).to.be.a('array');
+      expect(parsedRequestBody.imp[0]).to.be.a('object');
+      expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.prebid.storedrequest.id');
+      expect(parsedRequestBody.imp[0].ext.prebid.storedrequest.id).to.equal(storedRequestId);
+    });
+  });
+
   describe('response handler', function () {
     beforeEach(function () {
       sinon.stub(utils, 'triggerPixel');
@@ -1587,7 +2616,7 @@ describe('S2S Adapter', function () {
     });
 
     it('should pass through default adserverTargeting if present in bidObject for video request', function () {
-      config.setConfig({s2sConfig: CONFIG});
+      config.setConfig({ s2sConfig: CONFIG });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB);
       const targetingTestData = {
         hb_cache_path: '/cache',
@@ -1609,7 +2638,7 @@ describe('S2S Adapter', function () {
       });
     });
 
-    it('should set the bidResponse currency to whats in the PBS response', function() {
+    it('should set the bidResponse currency to whats in the PBS response', function () {
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
       sinon.assert.calledOnce(addBidResponse);
@@ -1617,7 +2646,7 @@ describe('S2S Adapter', function () {
       expect(pbjsResponse).to.have.property('currency', 'EUR');
     });
 
-    it('should set the default bidResponse currency when not specified in OpenRTB', function() {
+    it('should set the default bidResponse currency when not specified in OpenRTB', function () {
       let modifiedResponse = utils.deepClone(RESPONSE_OPENRTB);
       modifiedResponse.cur = '';
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
@@ -1667,10 +2696,7 @@ describe('S2S Adapter', function () {
       };
       sinon.stub(adapterManager, 'getBidAdapter').returns(rubiconAdapter);
 
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-      config.setConfig({ s2sConfig });
+      config.setConfig({ CONFIG });
 
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
@@ -1680,11 +2706,8 @@ describe('S2S Adapter', function () {
       adapterManager.getBidAdapter.restore();
     });
 
-    it('handles OpenRTB responses and call BIDDER_DONE', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-      config.setConfig({ s2sConfig });
+    it('handles OpenRTB responses and call BIDDER_DONE', function () {
+      config.setConfig({ CONFIG });
 
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
@@ -1700,6 +2723,12 @@ describe('S2S Adapter', function () {
       expect(response).to.have.property('bidderCode', 'appnexus');
       expect(response).to.have.property('requestId', '123');
       expect(response).to.have.property('cpm', 0.5);
+      expect(response).to.have.property('meta');
+      expect(response.meta).to.have.property('advertiserDomains');
+      expect(response.meta.advertiserDomains[0]).to.equal('appnexus.com');
+      expect(response.meta).to.have.property('dchain');
+      expect(response.meta.dchain.ver).to.equal('1.0');
+      expect(response.meta.dchain.nodes[0].asi).to.equal('magnite.com');
       expect(response).to.not.have.property('vastUrl');
       expect(response).to.not.have.property('videoCacheKey');
       expect(response).to.have.property('ttl', 60);
@@ -1707,12 +2736,13 @@ describe('S2S Adapter', function () {
 
     it('respects defaultTtl', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         defaultTtl: 30
       });
-      config.setConfig({ s2sConfig });
 
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
 
       sinon.assert.calledOnce(events.emit);
@@ -1724,11 +2754,16 @@ describe('S2S Adapter', function () {
 
     it('handles OpenRTB video responses', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB_VIDEO));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1743,7 +2778,9 @@ describe('S2S Adapter', function () {
 
     it('handles response cache from ext.prebid.cache.vastXml', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1756,7 +2793,10 @@ describe('S2S Adapter', function () {
         }
       });
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1769,7 +2809,9 @@ describe('S2S Adapter', function () {
 
     it('add adserverTargeting object to bids when ext.prebid.targeting is defined', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1781,7 +2823,11 @@ describe('S2S Adapter', function () {
       cacheResponse.seatbid.forEach(item => {
         item.bid[0].ext.prebid.targeting = targetingTestData
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1796,7 +2842,9 @@ describe('S2S Adapter', function () {
 
     it('handles response cache from ext.prebid.targeting', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1807,7 +2855,11 @@ describe('S2S Adapter', function () {
           hb_cache_path: '/cache'
         }
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1820,7 +2872,9 @@ describe('S2S Adapter', function () {
 
     it('handles response cache from ext.prebid.targeting with wurl', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1834,7 +2888,10 @@ describe('S2S Adapter', function () {
           hb_cache_path: '/cache'
         }
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1842,77 +2899,178 @@ describe('S2S Adapter', function () {
       expect(response).to.have.property('pbsBidId', '654321');
     });
 
-    it('handles response cache from ext.prebid.targeting with wurl and removes invalid targeting', function () {
+    it('add request property pbsBidId with ext.prebid.bidid value', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
-      cacheResponse.seatbid.forEach(item => {
-        item.bid[0].ext.prebid.events = {
-          win: 'https://wurl.com?a=1&b=2'
-        };
-        item.bid[0].ext.prebid.targeting = {
-          hb_uuid: 'a5ad3993',
-          hb_cache_host: 'prebid-cache.net',
-          hb_cache_path: '/cache',
-          hb_winurl: 'https://hbwinurl.com?a=1&b=2',
-          hb_bidid: '1234567890',
-        }
-      });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
       const response = addBidResponse.firstCall.args[1];
 
-      expect(response.adserverTargeting).to.deep.equal({
-        hb_uuid: 'a5ad3993',
-        hb_cache_host: 'prebid-cache.net',
-        hb_cache_path: '/cache'
-      });
+      expect(response).to.have.property('pbsBidId', '654321');
     });
 
-    it('add request property pbsBidId with ext.prebid.bidid value', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+    if (FEATURES.NATIVE) {
+      it('handles OpenRTB native responses', function () {
+        const stub = sinon.stub(auctionManager, 'index');
+        stub.get(() => stubAuctionIndex({adUnits: REQUEST.ad_units}));
+        const s2sConfig = Object.assign({}, CONFIG, {
+          endpoint: {
+            p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+          }
+        });
+        config.setConfig({s2sConfig});
+
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = s2sConfig;
+
+        adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB_NATIVE));
+
+        sinon.assert.calledOnce(addBidResponse);
+        const response = addBidResponse.firstCall.args[1];
+        expect(response).to.have.property('statusMessage', 'Bid available');
+        expect(response).to.have.property('adm').deep.equal(RESPONSE_OPENRTB_NATIVE.seatbid[0].bid[0].adm);
+        expect(response).to.have.property('mediaType', 'native');
+        expect(response).to.have.property('bidderCode', 'appnexus');
+        expect(response).to.have.property('requestId', '123');
+        expect(response).to.have.property('cpm', 10);
+
+        stub.restore();
       });
-      config.setConfig({ s2sConfig });
-      const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
+    }
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
-      server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
+    it('should reject invalid bids', () => {
+      config.setConfig({ s2sConfig: CONFIG });
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const response = deepClone(RESPONSE_OPENRTB);
+      Object.assign(response.seatbid[0].bid[0], {w: null, h: null});
+      server.requests[0].respond(200, {}, JSON.stringify(response));
+      expect(addBidResponse.reject.calledOnce).to.be.true;
+      expect(addBidResponse.called).to.be.false;
+    });
 
-      sinon.assert.calledOnce(addBidResponse);
-      const response = addBidResponse.firstCall.args[1];
+    it('does not (by default) allow bids that were not requested', function () {
+      config.setConfig({ s2sConfig: CONFIG });
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const response = deepClone(RESPONSE_OPENRTB);
+      response.seatbid[0].seat = 'unknown';
+      server.requests[0].respond(200, {}, JSON.stringify(response));
 
-      expect(response).to.have.property('pbsBidId', '654321');
+      expect(addBidResponse.called).to.be.false;
+      expect(addBidResponse.reject.calledOnce).to.be.true;
     });
 
-    it('handles OpenRTB native responses', function () {
-      sinon.stub(utils, 'getBidRequest').returns({
-        adUnitCode: 'div-gpt-ad-1460505748561-0',
-        bidder: 'appnexus',
-        bidId: '123'
+    it('allows unrequested bids if config.allowUnknownBidderCodes', function () {
+      const cfg = { ...CONFIG, allowUnknownBidderCodes: true };
+      config.setConfig({ s2sConfig: cfg });
+      adapter.callBids({ ...REQUEST, s2sConfig: cfg }, BID_REQUESTS, addBidResponse, done, ajax);
+      const response = deepClone(RESPONSE_OPENRTB);
+      response.seatbid[0].seat = 'unknown';
+      server.requests[0].respond(200, {}, JSON.stringify(response));
+
+      expect(addBidResponse.calledWith(sinon.match.any, sinon.match({ bidderCode: 'unknown' }))).to.be.true;
+    });
+
+    describe('stored impressions', () => {
+      let bidReq, response;
+
+      function mks2sReq(s2sConfig = CONFIG) {
+        return {...REQUEST, s2sConfig, ad_units: [{...REQUEST.ad_units[0], bids: [{bidder: null, bid_id: 'testId'}]}]};
+      }
+
+      beforeEach(() => {
+        bidReq = {...BID_REQUESTS[0], bidderCode: null, bids: [{...BID_REQUESTS[0].bids[0], bidder: null, bidId: 'testId'}]}
+        response = deepClone(RESPONSE_OPENRTB);
+        response.seatbid[0].seat = 'storedImpression';
+      })
+
+      it('uses "null" request\'s ID for all responses, when a null request is present', function () {
+        const cfg = {...CONFIG, allowUnknownBidderCodes: true};
+        config.setConfig({s2sConfig: cfg});
+        adapter.callBids(mks2sReq(cfg), [bidReq], addBidResponse, done, ajax);
+        server.requests[0].respond(200, {}, JSON.stringify(response));
+        sinon.assert.calledWith(addBidResponse, sinon.match.any, sinon.match({bidderCode: 'storedImpression', requestId: 'testId'}))
       });
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+
+      it('does not allow null requests (= stored impressions) if allowUnknownBidderCodes is not set', () => {
+        config.setConfig({s2sConfig: CONFIG});
+        adapter.callBids(mks2sReq(), [bidReq], addBidResponse, done, ajax);
+        server.requests[0].respond(200, {}, JSON.stringify(response));
+        expect(addBidResponse.called).to.be.false;
+        expect(addBidResponse.reject.calledOnce).to.be.true;
       });
-      config.setConfig({ s2sConfig });
+    })
+
+    it('copies ortb2Imp to response when there is only a null bid', () => {
+      const cfg = {...CONFIG};
+      config.setConfig({s2sConfig: cfg});
+      const ortb2Imp = {ext: {prebid: {storedrequest: 'value'}}};
+      const req = {...REQUEST, s2sConfig: cfg, ad_units: [{...REQUEST.ad_units[0], bids: [{bidder: null, bid_id: 'testId'}], ortb2Imp}]};
+      const bidReq = {...BID_REQUESTS[0], bidderCode: null, bids: [{...BID_REQUESTS[0].bids[0], bidder: null, bidId: 'testId'}]}
+      adapter.callBids(req, [bidReq], addBidResponse, done, ajax);
+      const actual = JSON.parse(server.requests[0].requestBody);
+      sinon.assert.match(actual.imp[0], sinon.match(ortb2Imp));
+    });
 
+    it('setting adapterCode for default bidder', function () {
+      config.setConfig({ CONFIG });
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
-      server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB_NATIVE));
+      server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
 
-      sinon.assert.calledOnce(addBidResponse);
       const response = addBidResponse.firstCall.args[1];
-      expect(response).to.have.property('statusMessage', 'Bid available');
-      expect(response).to.have.property('adm').deep.equal(RESPONSE_OPENRTB_NATIVE.seatbid[0].bid[0].adm);
-      expect(response).to.have.property('mediaType', 'native');
-      expect(response).to.have.property('bidderCode', 'appnexus');
-      expect(response).to.have.property('requestId', '123');
-      expect(response).to.have.property('cpm', 10);
+      expect(response).to.have.property('adapterCode', 'appnexus');
+    });
 
-      utils.getBidRequest.restore();
+    it('setting adapterCode for alternate bidder', function () {
+      config.setConfig({ CONFIG });
+      let RESPONSE_OPENRTB2 = deepClone(RESPONSE_OPENRTB);
+      RESPONSE_OPENRTB2.seatbid[0].bid[0].ext.prebid.meta.adaptercode = 'appnexus2'
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB2));
+
+      const response = addBidResponse.firstCall.args[1];
+      expect(response).to.have.property('adapterCode', 'appnexus2');
+    });
+
+    describe('on sync requested with no cookie', () => {
+      let cfg, req, csRes;
+
+      beforeEach(() => {
+        cfg = utils.deepClone(CONFIG);
+        req = utils.deepClone(REQUEST);
+        cfg.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
+        req.s2sConfig = cfg;
+        config.setConfig({ s2sConfig: cfg });
+        csRes = utils.deepClone(RESPONSE_NO_COOKIE);
+      });
+
+      afterEach(() => {
+        resetSyncedStatus();
+      })
+
+      Object.entries({
+        iframe: () => utils.insertUserSyncIframe,
+        image: () => utils.triggerPixel,
+      }).forEach(([type, syncer]) => {
+        it(`passes timeout to ${type} syncs`, () => {
+          cfg.syncTimeout = 123;
+          csRes.bidder_status[0].usersync.type = type;
+          adapter.callBids(req, BID_REQUESTS, addBidResponse, done, ajax);
+          server.requests[0].respond(200, {}, JSON.stringify(csRes));
+          expect(syncer().args[0]).to.include.members([123]);
+        });
+      });
     });
   });
 
@@ -1937,7 +3095,9 @@ describe('S2S Adapter', function () {
 
       config.setConfig({
         s2sConfig: Object.assign({}, CONFIG, {
-          endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+          endpoint: {
+            p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+          }
         })
       });
     });
@@ -2026,20 +3186,9 @@ describe('S2S Adapter', function () {
         bidders: ['appnexus'],
         timeout: 1000,
         adapter: 'prebidServer',
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      };
-
-      config.setConfig({ s2sConfig: options });
-      sinon.assert.calledOnce(logErrorSpy);
-    });
-
-    it('should log an error when bidders is missing', function () {
-      const options = {
-        accountId: '1',
-        enabled: true,
-        timeout: 1000,
-        adapter: 's2s',
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       };
 
       config.setConfig({ s2sConfig: options });
@@ -2086,8 +3235,38 @@ describe('S2S Adapter', function () {
       expect(vendorConfig).to.have.property('adapter', 'prebidServer');
       expect(vendorConfig.bidders).to.deep.equal(['appnexus']);
       expect(vendorConfig.enabled).to.be.true;
-      expect(vendorConfig).to.have.property('endpoint', 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction');
-      expect(vendorConfig).to.have.property('syncEndpoint', 'https://prebid.adnxs.com/pbs/v1/cookie_sync');
+      expect(vendorConfig.endpoint).to.deep.equal({
+        p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
+        noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/openrtb2/auction'
+      });
+      expect(vendorConfig.syncEndpoint).to.deep.equal({
+        p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync',
+        noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/cookie_sync'
+      });
+      expect(vendorConfig).to.have.property('timeout', 750);
+    });
+
+    it('should configure the s2sConfig object with appnexuspsp vendor defaults unless specified by user', function () {
+      const options = {
+        accountId: '123',
+        bidders: ['appnexus'],
+        defaultVendor: 'appnexuspsp',
+        timeout: 750
+      };
+
+      config.setConfig({ s2sConfig: options });
+      sinon.assert.notCalled(logErrorSpy);
+
+      let vendorConfig = config.getConfig('s2sConfig');
+      expect(vendorConfig).to.have.property('accountId', '123');
+      expect(vendorConfig).to.have.property('adapter', 'prebidServer');
+      expect(vendorConfig.bidders).to.deep.equal(['appnexus']);
+      expect(vendorConfig.enabled).to.be.true;
+      expect(vendorConfig.endpoint).to.deep.equal({
+        p1Consent: 'https://ib.adnxs.com/openrtb2/prebid',
+        noP1Consent: 'https://ib.adnxs-simple.com/openrtb2/prebid'
+      });
+      expect(vendorConfig.syncEndpoint).to.be.undefined;
       expect(vendorConfig).to.have.property('timeout', 750);
     });
 
@@ -2107,8 +3286,14 @@ describe('S2S Adapter', function () {
       expect(vendorConfig).to.have.property('adapter', 'prebidServer');
       expect(vendorConfig.bidders).to.deep.equal(['rubicon']);
       expect(vendorConfig.enabled).to.be.true;
-      expect(vendorConfig).to.have.property('endpoint', 'https://prebid-server.rubiconproject.com/openrtb2/auction');
-      expect(vendorConfig).to.have.property('syncEndpoint', 'https://prebid-server.rubiconproject.com/cookie_sync');
+      expect(vendorConfig.endpoint).to.deep.equal({
+        p1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+        noP1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction'
+      });
+      expect(vendorConfig.syncEndpoint).to.deep.equal({
+        p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
+        noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync'
+      });
       expect(vendorConfig).to.have.property('timeout', 750);
     });
 
@@ -2127,8 +3312,14 @@ describe('S2S Adapter', function () {
         'bidders': ['rubicon'],
         'defaultVendor': 'rubicon',
         'enabled': true,
-        'endpoint': 'https://prebid-server.rubiconproject.com/openrtb2/auction',
-        'syncEndpoint': 'https://prebid-server.rubiconproject.com/cookie_sync',
+        'endpoint': {
+          p1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+          noP1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction'
+        },
+        'syncEndpoint': {
+          p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
+          noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync'
+        },
         'timeout': 750
       })
     });
@@ -2149,8 +3340,14 @@ describe('S2S Adapter', function () {
         accountId: 'abc',
         bidders: ['rubicon'],
         defaultVendor: 'rubicon',
-        endpoint: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
-        syncEndpoint: 'https://prebid-server.rubiconproject.com/cookie_sync',
+        endpoint: {
+          p1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+          noP1Consent: 'https://prebid-server.rubiconproject.com/openrtb2/auction'
+        },
+        syncEndpoint: {
+          p1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync',
+          noP1Consent: 'https://prebid-server.rubiconproject.com/cookie_sync'
+        },
       })
     });
 
@@ -2186,7 +3383,8 @@ describe('S2S Adapter', function () {
       config.setConfig({
         s2sConfig: {
           syncUrlModifier: {
-            appnexus: () => { }
+            appnexus: () => {
+            }
           }
         }
       });
@@ -2198,13 +3396,14 @@ describe('S2S Adapter', function () {
 
       // Add syncEndpoint so that the request goes to the User Sync endpoint
       // Modify the bidders property to include an alias for Rubicon adapter
-      s2sConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+      s2sConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
       s2sConfig.bidders = ['appnexus', 'rubicon-alias'];
 
-      const request = utils.deepClone(REQUEST);
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
 
       // Add another bidder, `rubicon-alias`
-      request.ad_units[0].bids.push({
+      s2sBidRequest.ad_units[0].bids.push({
         bidder: 'rubicon-alias',
         params: {
           accoundId: 14062,
@@ -2216,8 +3415,6 @@ describe('S2S Adapter', function () {
       // create an alias for the Rubicon Bid Adapter
       adapterManager.aliasBidAdapter('rubicon', 'rubicon-alias');
 
-      config.setConfig({ s2sConfig });
-
       const bidRequest = utils.deepClone(BID_REQUESTS);
       bidRequest.push({
         'bidderCode': 'rubicon-alias',
@@ -2261,10 +3458,255 @@ describe('S2S Adapter', function () {
         'src': 's2s'
       });
 
-      adapter.callBids(request, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.bidders).to.deep.equal(['appnexus', 'rubicon']);
     });
+
+    it('should add cooperative sync flag to cookie_sync request if property is present', function () {
+      let s2sConfig = utils.deepClone(CONFIG);
+      s2sConfig.coopSync = false;
+      s2sConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.coopSync).to.equal(false);
+    });
+
+    it('should not add cooperative sync flag to cookie_sync request if property is not present', function () {
+      let s2sConfig = utils.deepClone(CONFIG);
+      s2sConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.coopSync).to.be.undefined;
+    });
+
+    it('should set imp banner if ortb2Imp.banner is present', function () {
+      const consentConfig = { s2sConfig: CONFIG };
+      config.setConfig(consentConfig);
+      const bidRequest = utils.deepClone(REQUEST);
+      bidRequest.ad_units[0].ortb2Imp = {
+        banner: {
+          api: 7
+        },
+        instl: 1
+      };
+
+      adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+      expect(parsedRequestBody.imp[0].banner.api).to.equal(7);
+      expect(parsedRequestBody.imp[0].instl).to.equal(1);
+    });
+
+    it('adds debug flag', function () {
+      config.setConfig({ debug: true });
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.ext.prebid.debug).is.equal(true);
+    });
+
+    it('should correctly add floors flag', function () {
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      // should not pass if floorData is undefined
+      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.ext.prebid.floors).to.be.undefined;
+
+      config.setConfig({floors: {}});
+
+      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      requestBid = JSON.parse(server.requests[1].requestBody);
+
+      expect(requestBid.ext.prebid.floors).to.deep.equal({ enabled: false });
+    });
+
+    it('should override prebid server default DEFAULT_S2S_CURRENCY', function () {
+      config.setConfig({
+        currency: { adServerCurrency: 'JPY' },
+      });
+
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+      adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
+
+      const parsedRequestBody = JSON.parse(server.requests[1].requestBody);
+      expect(parsedRequestBody.cur).to.deep.equal(['JPY']);
+    });
+
+    it('should correctly set the floorMin key when multiple bids with various bidfloors exist', function () {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        extPrebid: {
+          floors: {
+            enabled: true
+          }
+        },
+        bidders: ['b1', 'b2']
+      });
+
+      const bidderRequests = [
+        {
+          ...BID_REQUESTS[0],
+          bidderCode: 'b1',
+          bids: [{
+            bidder: 'b1',
+            bidId: 1,
+            getFloor: () => ({
+              currency: 'US',
+              floor: 1.23
+            })
+          }]
+        },
+        {
+          ...BID_REQUESTS[0],
+          bidderCode: 'b2',
+          bids: [{
+            bidder: 'b2',
+            bidId: 2,
+            getFloor: () => ({
+              currency: 'EUR',
+              floor: 3.21
+            })
+          }],
+        }
+      ];
+
+      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 _config = {
+        s2sConfig: s2sConfig,
+      };
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+      s2sBidRequest.ad_units = adUnits;
+      config.setConfig(_config);
+
+      adapter.callBids(s2sBidRequest, bidderRequests, addBidResponse, done, ajax);
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.imp[0].bidfloor).to.equal(1.23);
+      expect(requestBid.imp[1].bidfloor).to.equal(3.21);
+
+      // first imp floorCur should be set
+      expect(requestBid.ext.prebid.floors).to.deep.equal({ enabled: true, floorMin: 1.23, floorMinCur: 'US' });
+    });
+
+    it('should correctly set the floorMin key when multiple bids with various bidfloors exist and ortb2Imp contains the lowest floorMin', function () {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        extPrebid: {
+          floors: {
+            enabled: true
+          }
+        },
+        bidders: ['b1', 'b2']
+      });
+
+      const bidderRequests = [
+        {
+          ...BID_REQUESTS[0],
+          bidderCode: 'b1',
+          bids: [{
+            bidder: 'b1',
+            bidId: 1,
+            getFloor: () => ({
+              currency: 'CUR',
+              floor: 1.23
+            })
+          }]
+        },
+        {
+          ...BID_REQUESTS[0],
+          bidderCode: 'b2',
+          bids: [{
+            bidder: 'b2',
+            bidId: 2,
+            getFloor: () => ({
+              currency: 'CUR',
+              floor: 3.21
+            })
+          }],
+        }
+      ];
+
+      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]}
+          },
+          ortb2Imp: {
+            ext: {
+              prebid: {
+                floors: {
+                  floorMin: 1
+                }
+              }
+            }
+          }
+        }
+      ];
+
+      const _config = {
+        s2sConfig: s2sConfig,
+      };
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+      s2sBidRequest.ad_units = adUnits;
+      config.setConfig(_config);
+
+      adapter.callBids(s2sBidRequest, bidderRequests, addBidResponse, done, ajax);
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.imp[0].bidfloor).to.equal(1.23);
+      expect(requestBid.imp[1].bidfloor).to.equal(3.21);
+
+      expect(requestBid.ext.prebid.floors).to.deep.equal({ enabled: true, floorMin: 1, floorMinCur: 'CUR' });
+    });
   });
 });
diff --git a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
index e87be40314c..522a78627d7 100644
--- a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
+++ b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
@@ -1,6 +1,9 @@
-import prebidmanagerAnalytics from 'modules/prebidmanagerAnalyticsAdapter.js';
+import prebidmanagerAnalytics, {storage} from 'modules/prebidmanagerAnalyticsAdapter.js';
 import {expect} from 'chai';
 import {server} from 'test/mocks/xhr.js';
+import * as utils from 'src/utils.js';
+import {expectEvents} from '../../helpers/analytics.js';
+
 let events = require('src/events');
 let constants = require('src/constants.json');
 
@@ -91,31 +94,23 @@ describe('Prebid Manager Analytics Adapter', function () {
         }
       });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
-
-      sinon.assert.callCount(prebidmanagerAnalytics.track, 6);
+      expectEvents().to.beTrackedBy(prebidmanagerAnalytics.track);
     });
   });
 
   describe('build utm tag data', function () {
+    let getDataFromLocalStorageStub;
+    this.timeout(4000)
     beforeEach(function () {
-      localStorage.setItem('pm_utm_source', 'utm_source');
-      localStorage.setItem('pm_utm_medium', 'utm_medium');
-      localStorage.setItem('pm_utm_campaign', 'utm_camp');
-      localStorage.setItem('pm_utm_term', '');
-      localStorage.setItem('pm_utm_content', '');
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      getDataFromLocalStorageStub.withArgs('pm_utm_source').returns('utm_source');
+      getDataFromLocalStorageStub.withArgs('pm_utm_medium').returns('utm_medium');
+      getDataFromLocalStorageStub.withArgs('pm_utm_campaign').returns('utm_camp');
+      getDataFromLocalStorageStub.withArgs('pm_utm_term').returns('');
+      getDataFromLocalStorageStub.withArgs('pm_utm_content').returns('');
     });
     afterEach(function () {
-      localStorage.removeItem('pm_utm_source');
-      localStorage.removeItem('pm_utm_medium');
-      localStorage.removeItem('pm_utm_campaign');
-      localStorage.removeItem('pm_utm_term');
-      localStorage.removeItem('pm_utm_content');
+      getDataFromLocalStorageStub.restore();
       prebidmanagerAnalytics.disableAnalytics()
     });
     it('should build utm data from local storage', function () {
@@ -135,4 +130,23 @@ describe('Prebid Manager Analytics Adapter', function () {
       expect(pmEvents.utmTags.utm_content).to.equal('');
     });
   });
+
+  describe('build page info', function () {
+    afterEach(function () {
+      prebidmanagerAnalytics.disableAnalytics()
+    });
+    it('should build page info', function () {
+      prebidmanagerAnalytics.enableAnalytics({
+        provider: 'prebidmanager',
+        options: {
+          bundleId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+        }
+      });
+
+      const pmEvents = JSON.parse(server.requests[0].requestBody.substring(2));
+
+      expect(pmEvents.pageInfo.domain).to.equal(window.location.hostname);
+      expect(pmEvents.pageInfo.referrerDomain).to.equal(utils.parseUrl(document.referrer).hostname);
+    });
+  });
 });
diff --git a/test/spec/modules/priceFloors_spec.js b/test/spec/modules/priceFloors_spec.js
index 9d35554c27f..b7d771814d0 100644
--- a/test/spec/modules/priceFloors_spec.js
+++ b/test/spec/modules/priceFloors_spec.js
@@ -14,7 +14,12 @@ import {
   fieldMatchingFunctions,
   allowedFields
 } from 'modules/priceFloors.js';
-import events from 'src/events.js';
+import * as events from 'src/events.js';
+import * as mockGpt from '../integration/faker/googletag.js';
+import 'src/prebid.js';
+import {createBid} from '../../../src/bidfactory.js';
+import {auctionManager} from '../../../src/auctionManager.js';
+import {stubAuctionIndex} from '../../helpers/indexStub.js';
 
 describe('the price floors module', function () {
   let logErrorSpy;
@@ -23,6 +28,38 @@ describe('the price floors module', function () {
   let clock;
   const basicFloorData = {
     modelVersion: 'basic model',
+    modelWeight: 10,
+    modelTimestamp: 1606772895,
+    currency: 'USD',
+    schema: {
+      delimiter: '|',
+      fields: ['mediaType']
+    },
+    values: {
+      'banner': 1.0,
+      'video': 5.0,
+      '*': 2.5
+    }
+  };
+  const basicFloorDataHigh = {
+    floorMin: 7.0,
+    modelVersion: 'basic model',
+    modelWeight: 10,
+    currency: 'USD',
+    schema: {
+      delimiter: '|',
+      fields: ['mediaType']
+    },
+    values: {
+      'banner': 1.0,
+      'video': 5.0,
+      '*': 2.5
+    }
+  };
+  const basicFloorDataLow = {
+    floorMin: 2.3,
+    modelVersion: 'basic model',
+    modelWeight: 10,
     currency: 'USD',
     schema: {
       delimiter: '|',
@@ -46,10 +83,37 @@ describe('the price floors module', function () {
     },
     data: basicFloorData
   }
+  const minFloorConfigHigh = {
+    enabled: true,
+    auctionDelay: 0,
+    floorMin: 7,
+    endpoint: {},
+    enforcement: {
+      enforceJS: true,
+      enforcePBS: false,
+      floorDeals: false,
+      bidAdjustment: true
+    },
+    data: basicFloorDataHigh
+  }
+  const minFloorConfigLow = {
+    enabled: true,
+    auctionDelay: 0,
+    floorMin: 2.3,
+    endpoint: {},
+    enforcement: {
+      enforceJS: true,
+      enforcePBS: false,
+      floorDeals: false,
+      bidAdjustment: true
+    },
+    data: basicFloorDataLow
+  }
   const basicBidRequest = {
     bidder: 'rubicon',
     adUnitCode: 'test_div_1',
     auctionId: '1234-56-789',
+    transactionId: 'tr_test_div_1'
   };
 
   function getAdUnitMock(code = 'adUnit-code') {
@@ -130,6 +194,8 @@ describe('the price floors module', function () {
       let resultingData = getFloorsDataForAuction(inputFloorData, 'test_div_1');
       expect(resultingData).to.deep.equal({
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         currency: 'USD',
         schema: {
           delimiter: '|',
@@ -147,6 +213,8 @@ describe('the price floors module', function () {
       resultingData = getFloorsDataForAuction(inputFloorData, 'this_is_a_div');
       expect(resultingData).to.deep.equal({
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         currency: 'USD',
         schema: {
           delimiter: '^',
@@ -162,25 +230,157 @@ describe('the price floors module', function () {
   });
 
   describe('getFirstMatchingFloor', function () {
+    it('uses a 0 floor as overrite', function () {
+      let inputFloorData = {
+        currency: 'USD',
+        schema: {
+          delimiter: '|',
+          fields: ['adUnitCode']
+        },
+        values: {
+          'test_div_1': 0,
+          'test_div_2': 2
+        },
+        default: 0.5
+      };
+
+      expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'banner', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 0,
+        matchingFloor: 0,
+        matchingData: 'test_div_1',
+        matchingRule: 'test_div_1'
+      });
+
+      expect(getFirstMatchingFloor(inputFloorData, {...basicBidRequest, adUnitCode: 'test_div_2'}, {mediaType: 'banner', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 2,
+        matchingFloor: 2,
+        matchingData: 'test_div_2',
+        matchingRule: 'test_div_2'
+      });
+
+      expect(getFirstMatchingFloor(inputFloorData, {...basicBidRequest, adUnitCode: 'test_div_3'}, {mediaType: 'banner', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 0.5,
+        matchingFloor: 0.5,
+        matchingData: 'test_div_3',
+        matchingRule: undefined
+      });
+    });
+    it('correctly applies floorMin if on adunit', function () {
+      let inputFloorData = {
+        floorMin: 2.6,
+        currency: 'USD',
+        schema: {
+          delimiter: '|',
+          fields: ['adUnitCode']
+        },
+        values: {
+          'test_div_1': 1.0,
+          'test_div_2': 2.0
+        },
+        default: 0.5
+      };
+
+      let myBidRequest = { ...basicBidRequest };
+
+      // should take adunit floormin first even if lower
+      utils.deepSetValue(myBidRequest, 'ortb2Imp.ext.prebid.floorMin', 2.2);
+      expect(getFirstMatchingFloor(inputFloorData, myBidRequest, { mediaType: 'banner', size: '*' })).to.deep.equal({
+        floorMin: 2.2,
+        floorRuleValue: 1.0,
+        matchingFloor: 2.2,
+        matchingData: 'test_div_1',
+        matchingRule: 'test_div_1'
+      });
+      delete inputFloorData.matchingInputs;
+
+      // should take adunit floormin if higher
+      utils.deepSetValue(myBidRequest, 'ortb2Imp.ext.prebid.floorMin', 3.0);
+      expect(getFirstMatchingFloor(inputFloorData, myBidRequest, { mediaType: 'banner', size: '*' })).to.deep.equal({
+        floorMin: 3.0,
+        floorRuleValue: 1.0,
+        matchingFloor: 3.0,
+        matchingData: 'test_div_1',
+        matchingRule: 'test_div_1'
+      });
+      delete inputFloorData.matchingInputs;
+
+      // should take top floormin if no adunit floor min
+      delete myBidRequest.ortb2Imp;
+      expect(getFirstMatchingFloor(inputFloorData, myBidRequest, { mediaType: 'banner', size: '*' })).to.deep.equal({
+        floorMin: 2.6,
+        floorRuleValue: 1.0,
+        matchingFloor: 2.6,
+        matchingData: 'test_div_1',
+        matchingRule: 'test_div_1'
+      });
+      delete inputFloorData.matchingInputs;
+    });
     it('selects the right floor for different mediaTypes', function () {
       // banner with * size (not in rule file so does not do anything)
       expect(getFirstMatchingFloor({...basicFloorData}, basicBidRequest, {mediaType: 'banner', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 1.0,
         matchingFloor: 1.0,
         matchingData: 'banner',
         matchingRule: 'banner'
       });
       // video with * size (not in rule file so does not do anything)
       expect(getFirstMatchingFloor({...basicFloorData}, basicBidRequest, {mediaType: 'video', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 5.0,
         matchingFloor: 5.0,
         matchingData: 'video',
         matchingRule: 'video'
       });
       // native (not in the rule list) with * size (not in rule file so does not do anything)
       expect(getFirstMatchingFloor({...basicFloorData}, basicBidRequest, {mediaType: 'native', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 2.5,
         matchingFloor: 2.5,
         matchingData: 'native',
         matchingRule: '*'
       });
+      // banner with floorMin higher than matching rule
+      handleSetFloorsConfig({
+        ...minFloorConfigHigh
+      });
+      expect(getFirstMatchingFloor({...basicFloorDataHigh}, basicBidRequest, {mediaType: 'banner', size: '*'})).to.deep.equal({
+        floorMin: 7,
+        floorRuleValue: 1.0,
+        matchingFloor: 7,
+        matchingData: 'banner',
+        matchingRule: 'banner'
+      });
+      // banner with floorMin higher than matching rule
+      handleSetFloorsConfig({
+        ...minFloorConfigLow
+      });
+      expect(getFirstMatchingFloor({...basicFloorDataLow}, basicBidRequest, {mediaType: 'video', size: '*'})).to.deep.equal({
+        floorMin: 2.3,
+        floorRuleValue: 5,
+        matchingFloor: 5,
+        matchingData: 'video',
+        matchingRule: 'video'
+      });
+    });
+    it('does not alter cached matched input if conversion occurs', function () {
+      let inputData = {...basicFloorData};
+      [0.2, 0.4, 0.6, 0.8].forEach(modifier => {
+        let result = getFirstMatchingFloor(inputData, basicBidRequest, {mediaType: 'banner', size: '*'});
+        // result should always be the same
+        expect(result).to.deep.equal({
+          floorMin: 0,
+          floorRuleValue: 1.0,
+          matchingFloor: 1.0,
+          matchingData: 'banner',
+          matchingRule: 'banner'
+        });
+        // make sure a post retrieval adjustment does not alter the cached floor
+        result.matchingFloor = result.matchingFloor * modifier;
+      });
     });
     it('selects the right floor for different sizes', function () {
       let inputFloorData = {
@@ -199,24 +399,32 @@ describe('the price floors module', function () {
       }
       // banner with 300x250 size
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'banner', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 1.1,
         matchingFloor: 1.1,
         matchingData: '300x250',
         matchingRule: '300x250'
       });
       // video with 300x250 size
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'video', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 1.1,
         matchingFloor: 1.1,
         matchingData: '300x250',
         matchingRule: '300x250'
       });
       // native (not in the rule list) with 300x600 size
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'native', size: [600, 300]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 4.4,
         matchingFloor: 4.4,
         matchingData: '600x300',
         matchingRule: '600x300'
       });
       // n/a mediaType with a size not in file should go to catch all
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: undefined, size: [1, 1]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 5.5,
         matchingFloor: 5.5,
         matchingData: '1x1',
         matchingRule: '*'
@@ -240,12 +448,16 @@ describe('the price floors module', function () {
       };
       // banner with 300x250 size
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'banner', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 1.1,
         matchingFloor: 1.1,
         matchingData: 'test_div_1^banner^300x250',
         matchingRule: 'test_div_1^banner^300x250'
       });
       // video with 300x250 size -> No matching rule so should use default
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'video', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 0.5,
         matchingFloor: 0.5,
         matchingData: 'test_div_1^video^300x250',
         matchingRule: undefined
@@ -253,6 +465,8 @@ describe('the price floors module', function () {
       // remove default and should still return the same floor as above since matches are cached
       delete inputFloorData.default;
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'video', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 0.5,
         matchingFloor: 0.5,
         matchingData: 'test_div_1^video^300x250',
         matchingRule: undefined
@@ -260,6 +474,8 @@ describe('the price floors module', function () {
       // update adUnitCode to test_div_2 with weird other params
       let newBidRequest = { ...basicBidRequest, adUnitCode: 'test_div_2' }
       expect(getFirstMatchingFloor(inputFloorData, newBidRequest, {mediaType: 'badmediatype', size: [900, 900]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 3.3,
         matchingFloor: 3.3,
         matchingData: 'test_div_2^badmediatype^900x900',
         matchingRule: 'test_div_2^*^*'
@@ -276,6 +492,90 @@ describe('the price floors module', function () {
         matchingFloor: 5.0
       });
     });
+    describe('with gpt enabled', function () {
+      let gptFloorData;
+      let indexStub, adUnits;
+      beforeEach(function () {
+        gptFloorData = {
+          currency: 'USD',
+          schema: {
+            fields: ['gptSlot']
+          },
+          values: {
+            '/12345/sports/soccer': 1.1,
+            '/12345/sports/basketball': 2.2,
+            '/12345/news/politics': 3.3,
+            '/12345/news/weather': 4.4,
+            '*': 5.5,
+          },
+          default: 0.5
+        };
+        // reset it so no lingering stuff from other test specs
+        mockGpt.reset();
+        mockGpt.makeSlot({
+          code: '/12345/sports/soccer',
+          divId: 'test_div_1'
+        });
+        mockGpt.makeSlot({
+          code: '/12345/sports/basketball',
+          divId: 'test_div_2'
+        });
+        indexStub = sinon.stub(auctionManager, 'index');
+        indexStub.get(() => stubAuctionIndex({adUnits}))
+      });
+      afterEach(function () {
+        // reset it so no lingering stuff from other test specs
+        mockGpt.reset();
+        indexStub.restore();
+      });
+      it('picks the right rule when looking for gptSlot', function () {
+        expect(getFirstMatchingFloor(gptFloorData, basicBidRequest)).to.deep.equal({
+          floorMin: 0,
+          floorRuleValue: 1.1,
+          matchingFloor: 1.1,
+          matchingData: '/12345/sports/soccer',
+          matchingRule: '/12345/sports/soccer'
+        });
+
+        let newBidRequest = { ...basicBidRequest, adUnitCode: 'test_div_2' }
+        expect(getFirstMatchingFloor(gptFloorData, newBidRequest)).to.deep.equal({
+          floorMin: 0,
+          floorRuleValue: 2.2,
+          matchingFloor: 2.2,
+          matchingData: '/12345/sports/basketball',
+          matchingRule: '/12345/sports/basketball'
+        });
+      });
+      it('picks the gptSlot from the adUnit and does not call the slotMatching', function () {
+        const newBidRequest1 = { ...basicBidRequest, transactionId: 'au1' };
+        adUnits = [{code: newBidRequest1.code, transactionId: 'au1'}];
+        utils.deepSetValue(adUnits[0], 'ortb2Imp.ext.data.adserver', {
+          name: 'gam',
+          adslot: '/12345/news/politics'
+        })
+        expect(getFirstMatchingFloor(gptFloorData, newBidRequest1)).to.deep.equal({
+          floorMin: 0,
+          floorRuleValue: 3.3,
+          matchingFloor: 3.3,
+          matchingData: '/12345/news/politics',
+          matchingRule: '/12345/news/politics'
+        });
+
+        const newBidRequest2 = { ...basicBidRequest, adUnitCode: 'test_div_2', transactionId: 'au2' };
+        adUnits = [{code: newBidRequest2.adUnitCode, transactionId: newBidRequest2.transactionId}];
+        utils.deepSetValue(adUnits[0], 'ortb2Imp.ext.data.adserver', {
+          name: 'gam',
+          adslot: '/12345/news/weather'
+        })
+        expect(getFirstMatchingFloor(gptFloorData, newBidRequest2)).to.deep.equal({
+          floorMin: 0,
+          floorRuleValue: 4.4,
+          matchingFloor: 4.4,
+          matchingData: '/12345/news/weather',
+          matchingRule: '/12345/news/weather'
+        });
+      });
+    });
   });
   describe('pre-auction tests', function () {
     let exposedAdUnits;
@@ -313,10 +613,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(false, {
         skipped: true,
+        floorMin: undefined,
         modelVersion: undefined,
-        location: undefined,
+        modelWeight: undefined,
+        modelTimestamp: undefined,
+        location: 'noData',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('should use adUnit level data if not setConfig or fetch has occured', function () {
@@ -345,21 +649,120 @@ describe('the price floors module', function () {
       runStandardAuction([adUnitWithFloors1, adUnitWithFloors2]);
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'adUnit Model Version',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'adUnit',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
+      });
+    });
+    it('should use adUnit level data and minFloor should be set', function () {
+      handleSetFloorsConfig({
+        ...minFloorConfigHigh,
+        data: undefined
+      });
+      // attach floor data onto an adUnit and run an auction
+      let adUnitWithFloors1 = {
+        ...getAdUnitMock('adUnit-Div-1'),
+        floors: {
+          ...basicFloorData,
+          modelVersion: 'adUnit Model Version', // change the model name
+        }
+      };
+      let adUnitWithFloors2 = {
+        ...getAdUnitMock('adUnit-Div-2'),
+        floors: {
+          ...basicFloorData,
+          values: {
+            'banner': 5.0,
+            '*': 10.4
+          }
+        }
+      };
+      runStandardAuction([adUnitWithFloors1, adUnitWithFloors2]);
+      validateBidRequests(true, {
+        skipped: false,
+        modelVersion: 'adUnit Model Version',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'adUnit',
+        skipRate: 0,
+        floorMin: 7,
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('bidRequests should have getFloor function and flooring meta data when setConfig occurs', function () {
-      handleSetFloorsConfig({...basicFloorConfig});
+      handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorprovider'});
+      runStandardAuction();
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: 'floorprovider'
+      });
+    });
+    it('should pick the right floorProvider', function () {
+      let inputFloors = {
+        ...basicFloorConfig,
+        floorProvider: 'providerA',
+        data: {
+          ...basicFloorData,
+          floorProvider: 'providerB',
+        }
+      };
+      handleSetFloorsConfig(inputFloors);
+      runStandardAuction();
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: 'providerB'
+      });
+
+      // if not at data level take top level
+      delete inputFloors.data.floorProvider;
+      handleSetFloorsConfig(inputFloors);
+      runStandardAuction();
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: 'providerA'
+      });
+
+      // if none should be undefined
+      delete inputFloors.floorProvider;
+      handleSetFloorsConfig(inputFloors);
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('should take the right skipRate depending on input', function () {
@@ -377,10 +780,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 50,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
 
       // if that does not exist uses topLevel skipRate setting
@@ -389,10 +796,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 10,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
 
       // if that is not there defaults to zero
@@ -401,15 +812,20 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('should randomly pick a model if floorsSchemaVersion is 2', function () {
       let inputFloors = {
         ...basicFloorConfig,
+        floorProvider: 'floorprovider',
         data: {
           floorsSchemaVersion: 2,
           currency: 'USD',
@@ -462,10 +878,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'model-1',
+        modelWeight: 10,
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: 'floorprovider'
       });
 
       // 11 - 50 should use second model
@@ -473,10 +893,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'model-2',
+        modelWeight: 40,
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: 'floorprovider'
       });
 
       // 51 - 100 should use third model
@@ -484,10 +908,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'model-3',
+        modelWeight: 50,
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: 'floorprovider'
       });
     });
     it('should not overwrite previous data object if the new one is bad', function () {
@@ -511,10 +939,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('should dynamically add new schema fileds and functions if added via setConfig', function () {
@@ -588,10 +1020,14 @@ describe('the price floors module', function () {
       // the exposedAdUnits should be from the fetch not setConfig level data
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: 'timeout'
+        fetchStatus: 'timeout',
+        floorProvider: undefined
       });
       fakeFloorProvider.respond();
     });
@@ -604,7 +1040,7 @@ describe('the price floors module', function () {
       fakeFloorProvider.respondWith(JSON.stringify(fetchFloorData));
 
       // run setConfig indicating fetch
-      handleSetFloorsConfig({...basicFloorConfig, auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
+      handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorprovider', auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
 
       // floor provider should be called
       expect(fakeFloorProvider.requests.length).to.equal(1);
@@ -624,10 +1060,53 @@ describe('the price floors module', function () {
       // and fetchStatus is success since fetch worked
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 0,
-        fetchStatus: 'success'
+        fetchStatus: 'success',
+        floorProvider: 'floorprovider'
+      });
+    });
+    it('it should correctly overwrite floorProvider with fetch provider', function () {
+      // init the fake server with response stuff
+      let fetchFloorData = {
+        ...basicFloorData,
+        floorProvider: 'floorProviderD', // change the floor provider
+        modelVersion: 'fetch model name', // change the model name
+      };
+      fakeFloorProvider.respondWith(JSON.stringify(fetchFloorData));
+
+      // run setConfig indicating fetch
+      handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorproviderC', auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
+
+      // floor provider should be called
+      expect(fakeFloorProvider.requests.length).to.equal(1);
+      expect(fakeFloorProvider.requests[0].url).to.equal('http://www.fakeFloorProvider.json');
+
+      // start the auction it should delay and not immediately call `continueAuction`
+      runStandardAuction();
+
+      // exposedAdUnits should be undefined if the auction has not continued
+      expect(exposedAdUnits).to.be.undefined;
+
+      // make the fetch respond
+      fakeFloorProvider.respond();
+
+      // the exposedAdUnits should be from the fetch not setConfig level data
+      // and fetchStatus is success since fetch worked
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'fetch model name',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'fetch',
+        skipRate: 0,
+        fetchStatus: 'success',
+        floorProvider: 'floorProviderD'
       });
     });
     it('it should correctly overwrite skipRate with fetch skipRate', function () {
@@ -642,7 +1121,7 @@ describe('the price floors module', function () {
       fakeFloorProvider.respondWith(JSON.stringify(fetchFloorData));
 
       // run setConfig indicating fetch
-      handleSetFloorsConfig({...basicFloorConfig, auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
+      handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorprovider', auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
 
       // floor provider should be called
       expect(fakeFloorProvider.requests.length).to.equal(1);
@@ -662,10 +1141,14 @@ describe('the price floors module', function () {
       // and fetchStatus is success since fetch worked
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 95,
-        fetchStatus: 'success'
+        fetchStatus: 'success',
+        floorProvider: 'floorprovider'
       });
     });
     it('Should not break if floor provider returns 404', function () {
@@ -682,10 +1165,14 @@ describe('the price floors module', function () {
       // and fetch failed is true
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: 'error'
+        fetchStatus: 'error',
+        floorProvider: undefined
       });
     });
     it('Should not break if floor provider returns non json', function () {
@@ -704,10 +1191,14 @@ describe('the price floors module', function () {
       // and fetchStatus is 'success' but location is setConfig since it had bad data
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: 'success'
+        fetchStatus: 'success',
+        floorProvider: undefined
       });
     });
     it('should handle not using fetch correctly', function () {
@@ -1003,6 +1494,74 @@ describe('the price floors module', function () {
           floor: 1.3334 // 1.3334 * 0.75 = 1.000005 which is the floor (we cut off getFloor at 4 decimal points)
         });
       });
+
+      it('should use standard cpmAdjustment if no bidder cpmAdjustment', function () {
+        getGlobal().bidderSettings = {
+          rubicon: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.5;
+            },
+          },
+          standard: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.75;
+            },
+          }
+        };
+        _floorDataForAuction[bidRequest.auctionId] = utils.deepClone(basicFloorConfig);
+        _floorDataForAuction[bidRequest.auctionId].data.values = { '*': 1.0 };
+        let appnexusBid = {
+          ...bidRequest,
+          bidder: 'appnexus'
+        };
+
+        // the conversion should be what the bidder would need to return in order to match the actual floor
+        // rubicon
+        expect(bidRequest.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 2.0 // a 2.0 bid after rubicons cpm adjustment would be 1.0 and thus is the floor after adjust
+        });
+
+        // appnexus
+        expect(appnexusBid.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 1.3334 // 1.3334 * 0.75 = 1.000005 which is the floor (we cut off getFloor at 4 decimal points)
+        });
+      });
+
+      it('should work when cpmAdjust function uses bid object', function () {
+        getGlobal().bidderSettings = {
+          rubicon: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.5;
+            },
+          },
+          appnexus: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.75;
+            },
+          }
+        };
+        _floorDataForAuction[bidRequest.auctionId] = utils.deepClone(basicFloorConfig);
+        _floorDataForAuction[bidRequest.auctionId].data.values = { '*': 1.0 };
+        let appnexusBid = {
+          ...bidRequest,
+          bidder: 'appnexus'
+        };
+
+        // the conversion should be what the bidder would need to return in order to match the actual floor
+        // rubicon
+        expect(bidRequest.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 2.0 // a 2.0 bid after rubicons cpm adjustment would be 1.0 and thus is the floor after adjust
+        });
+
+        // appnexus
+        expect(appnexusBid.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 1.3334 // 1.3334 * 0.75 = 1.000005 which is the floor (we cut off getFloor at 4 decimal points)
+        });
+      });
       it('should correctly pick the right attributes if * is passed in and context can be assumed', function () {
         let inputBidReq = {
           bidder: 'rubicon',
@@ -1105,17 +1664,12 @@ describe('the price floors module', function () {
     });
   });
   describe('bidResponseHook tests', function () {
-    let returnedBidResponse;
-    let bidderRequest = {
-      bidderCode: 'appnexus',
-      auctionId: '123456',
-      bids: [{
-        bidder: 'appnexus',
-        adUnitCode: 'test_div_1',
-        auctionId: '123456',
-        bidId: '1111'
-      }]
-    };
+    const AUCTION_ID = '123456';
+    let returnedBidResponse, indexStub, reject;
+    let adUnit = {
+      transactionId: 'au',
+      code: 'test_div_1'
+    }
     let basicBidResponse = {
       bidderCode: 'appnexus',
       width: 300,
@@ -1123,41 +1677,50 @@ describe('the price floors module', function () {
       cpm: 0.5,
       mediaType: 'banner',
       requestId: '1111',
+      transactionId: 'au',
     };
     beforeEach(function () {
       returnedBidResponse = {};
+      reject = sinon.stub().returns({status: 'rejected'});
+      indexStub = sinon.stub(auctionManager, 'index');
+      indexStub.get(() => stubAuctionIndex({adUnits: [adUnit]}));
     });
+
+    afterEach(() => {
+      indexStub.restore();
+    });
+
     function runBidResponse(bidResp = basicBidResponse) {
       let next = (adUnitCode, bid) => {
         returnedBidResponse = bid;
       };
-      addBidResponseHook.bind({ bidderRequest })(next, bidResp.adUnitCode, bidResp);
+      addBidResponseHook(next, bidResp.adUnitCode, Object.assign(createBid(CONSTANTS.STATUS.GOOD, {auctionId: AUCTION_ID}), bidResp), reject);
     };
     it('continues with the auction if not floors data is present without any flooring', function () {
       runBidResponse();
       expect(returnedBidResponse).to.not.haveOwnProperty('floorData');
     });
     it('if no matching rule it should not floor and should call log warn', function () {
-      _floorDataForAuction[bidderRequest.auctionId] = utils.deepClone(basicFloorConfig);
-      _floorDataForAuction[bidderRequest.auctionId].data.values = { 'video': 1.0 };
+      _floorDataForAuction[AUCTION_ID] = utils.deepClone(basicFloorConfig);
+      _floorDataForAuction[AUCTION_ID].data.values = { 'video': 1.0 };
       runBidResponse();
       expect(returnedBidResponse).to.not.haveOwnProperty('floorData');
       expect(logWarnSpy.calledOnce).to.equal(true);
     });
     it('if it finds a rule and floors should update the bid accordingly', function () {
-      _floorDataForAuction[bidderRequest.auctionId] = utils.deepClone(basicFloorConfig);
-      _floorDataForAuction[bidderRequest.auctionId].data.values = { 'banner': 1.0 };
+      _floorDataForAuction[AUCTION_ID] = utils.deepClone(basicFloorConfig);
+      _floorDataForAuction[AUCTION_ID].data.values = { 'banner': 1.0 };
       runBidResponse();
-      expect(returnedBidResponse).to.haveOwnProperty('floorData');
-      expect(returnedBidResponse.status).to.equal(CONSTANTS.BID_STATUS.BID_REJECTED);
-      expect(returnedBidResponse.cpm).to.equal(0);
+      expect(reject.calledOnce).to.be.true;
+      expect(returnedBidResponse.status).to.equal('rejected');
     });
     it('if it finds a rule and does not floor should update the bid accordingly', function () {
-      _floorDataForAuction[bidderRequest.auctionId] = utils.deepClone(basicFloorConfig);
-      _floorDataForAuction[bidderRequest.auctionId].data.values = { 'banner': 0.3 };
+      _floorDataForAuction[AUCTION_ID] = utils.deepClone(basicFloorConfig);
+      _floorDataForAuction[AUCTION_ID].data.values = { 'banner': 0.3 };
       runBidResponse();
       expect(returnedBidResponse).to.haveOwnProperty('floorData');
       expect(returnedBidResponse.floorData).to.deep.equal({
+        floorRuleValue: 0.3,
         floorValue: 0.3,
         floorCurrency: 'USD',
         floorRule: 'banner',
@@ -1175,7 +1738,7 @@ describe('the price floors module', function () {
       expect(returnedBidResponse.cpm).to.equal(0.5);
     });
     it('if should work with more complex rules and update accordingly', function () {
-      _floorDataForAuction[bidderRequest.auctionId] = {
+      _floorDataForAuction[AUCTION_ID] = {
         ...basicFloorConfig,
         data: {
           currency: 'USD',
@@ -1195,6 +1758,7 @@ describe('the price floors module', function () {
       expect(returnedBidResponse).to.haveOwnProperty('floorData');
       expect(returnedBidResponse.floorData).to.deep.equal({
         floorValue: 0.5,
+        floorRuleValue: 0.5,
         floorCurrency: 'USD',
         floorRule: 'banner|300x250',
         cpmAfterAdjustments: 0.5,
@@ -1221,6 +1785,7 @@ describe('the price floors module', function () {
       });
       expect(returnedBidResponse).to.haveOwnProperty('floorData');
       expect(returnedBidResponse.floorData).to.deep.equal({
+        floorRuleValue: 5.5,
         floorValue: 5.5,
         floorCurrency: 'USD',
         floorRule: 'video|*',
@@ -1259,4 +1824,49 @@ describe('the price floors module', function () {
       expect(_floorDataForAuction[AUCTION_END_EVENT.auctionId]).to.be.undefined;
     });
   });
+
+  describe('fieldMatchingFunctions', () => {
+    let sandbox;
+
+    const req = {
+      ...basicBidRequest,
+    }
+
+    const resp = {
+      transactionId: req.transactionId,
+      size: [100, 100],
+      mediaType: 'banner',
+    }
+
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(auctionManager, 'index').get(() => stubAuctionIndex({
+        adUnits: [
+          {
+            code: req.adUnitCode,
+            transactionId: req.transactionId,
+            ortb2Imp: {ext: {data: {adserver: {name: 'gam', adslot: 'slot'}}}}
+          }
+        ]
+      }));
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    })
+
+    Object.entries({
+      size: '100x100',
+      mediaType: resp.mediaType,
+      gptSlot: 'slot',
+      domain: 'localhost',
+      adUnitCode: req.adUnitCode,
+    }).forEach(([test, expected]) => {
+      describe(`${test}`, () => {
+        it('should work with only bidResponse', () => {
+          expect(fieldMatchingFunctions[test](undefined, resp)).to.eql(expected)
+        })
+      });
+    })
+  });
 });
diff --git a/test/spec/modules/prismaBidAdapter_spec.js b/test/spec/modules/prismaBidAdapter_spec.js
new file mode 100644
index 00000000000..be1c16c9059
--- /dev/null
+++ b/test/spec/modules/prismaBidAdapter_spec.js
@@ -0,0 +1,261 @@
+import {expect} from 'chai';
+import {spec} from 'modules/prismaBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+import { requestBidsHook } from 'modules/consentManagement.js';
+
+describe('Prisma bid adapter tests', function () {
+  const DISPLAY_BID_REQUEST = [{
+    'bidder': 'prisma',
+    'params': {
+      'account': '1067',
+      'tagId': 'luvxjvgn'
+    },
+    'userId': {
+      'id5id': {
+        'uid': 'ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU',
+        'ext': {
+          'linkType': 2
+        }
+      }
+    },
+    'userIdAsEids': [
+      {
+        'source': 'id5-sync.com',
+        'uids': [
+          {
+            'id': 'ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU',
+            'atype': 1,
+            'ext': {
+              'linkType': 2
+            }
+          }
+        ]
+      }
+    ],
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250], [300, 600]]
+      }
+    },
+    'adUnitCode': 'banner-div',
+    'transactionId': '9ad89d90-eb73-41b9-bf5f-7a8e2eecff27',
+    'sizes': [[300, 250], [300, 600]],
+    'bidId': '4d9e29504f8af6',
+    'bidderRequestId': '3423b6bd1a922c',
+    'auctionId': '05e0a3a1-9f57-41f6-bbcb-2ba9c9e3d2d5',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }];
+
+  const DISPLAY_BID_RESPONSE = {'body': {
+    'responses': [
+      {
+        'bidId': '4d9e29504f8af6',
+        'cpm': 0.437245,
+        'width': 300,
+        'height': 250,
+        'creativeId': '98493581',
+        'currency': 'EUR',
+        'netRevenue': true,
+        'type': 'banner',
+        'ttl': 360,
+        'uuid': 'ce6d1ee3-2a05-4d7c-b97a-9e62097798ec',
+        'bidder': 'appnexus',
+        'consent': 1,
+        'tagId': 'luvxjvgn'
+      }
+    ],
+  }};
+
+  const VIDEO_BID_REQUEST = [
+    {
+      'bidder': 'prisma',
+      'params': {
+        'account': '1067',
+        'tagId': 'yqsc1tfj'
+      },
+      'mediaTypes': {
+        'video': {
+          'context': 'instream',
+          'playerSize': [[640, 480]],
+          'mimes': ['video/mp4'],
+          'protocols': [1, 2, 3, 4, 5, 6],
+          'playbackmethod': [2],
+          'skip': 1
+        }
+      },
+      'adUnitCode': 'video1',
+      'transactionId': '5434c81c-7210-44ae-9014-67c75dee48d0',
+      'sizes': [[640, 480]],
+      'bidId': '22f90541e576a3',
+      'bidderRequestId': '1d4549243f3bfd',
+      'auctionId': 'ed21b528-bcab-47e2-8605-ec9b71000c89',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }
+  ]
+
+  const VIDEO_BID_RESPONSE = {'body': {
+    'responses': [
+      {
+        'bidId': '2c129e8e01859a',
+        'type': 'video',
+        'uuid': 'b8e7b2f0-c378-479f-aa4f-4f55d5d7d1d5',
+        'cpm': 4.5421,
+        'width': 1,
+        'height': 1,
+        'creativeId': '97517771',
+        'currency': 'EUR',
+        'netRevenue': true,
+        'ttl': 360,
+        'bidder': 'appnexus',
+        'consent': 1,
+        'tagId': 'yqsc1tfj'
+      }
+    ]
+  }};
+
+  const DEFAULT_OPTIONS = {
+    gdprConsent: {
+      gdprApplies: true,
+      consentString: 'BOzZdA0OzZdA0AGABBENDJ-AAAAvh7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__79__3z3_9pxP78k89r7337Mw_v-_v-b7JCPN_Y3v-8Kg',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    },
+    uspConsent: '111222333',
+    userId: { 'id5id': { uid: '1111' } },
+    schain: {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [{
+        'asi': 'exchange1.com',
+        'sid': '1234',
+        'hp': 1,
+        'rid': 'bid-request-1',
+        'name': 'publisher',
+        'domain': 'publisher.com'
+      }]
+    },
+  };
+
+  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://prisma.nexx360.io/prebid');
+    expect(request).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request.data);
+    expect(requestContent.userEids.length).to.be.eql(1);
+    expect(requestContent.userEids[0]).to.have.property('source').and.to.equal('id5-sync.com');
+    expect(requestContent.userEids[0]).to.have.property('uids');
+    expect(requestContent.userEids[0].uids[0]).to.have.property('id').and.to.equal('ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU');
+    expect(requestContent.adUnits[0]).to.have.property('account').and.to.equal('1067');
+    expect(requestContent.adUnits[0]).to.have.property('tagId').and.to.equal('luvxjvgn');
+    expect(requestContent.adUnits[0]).to.have.property('label').and.to.equal('banner-div');
+    expect(requestContent.adUnits[0]).to.have.property('bidId').and.to.equal('4d9e29504f8af6');
+    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('Verify banner parse response', function () {
+    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
+    const response = spec.interpretResponse(DISPLAY_BID_RESPONSE, request);
+    expect(response).to.have.lengthOf(1);
+    const bid = response[0];
+    expect(bid.cpm).to.equal(0.437245);
+    expect(bid.adUrl).to.equal('https://prisma.nexx360.io/cache?uuid=ce6d1ee3-2a05-4d7c-b97a-9e62097798ec');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('98493581');
+    expect(bid.currency).to.equal('EUR');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.ttl).to.equal(360);
+    expect(bid.requestId).to.equal('4d9e29504f8af6');
+    expect(bid.prisma).to.exist;
+    expect(bid.prisma.ssp).to.equal('appnexus');
+  });
+
+  it('Verify video build request', function () {
+    const request = spec.buildRequests(VIDEO_BID_REQUEST, DEFAULT_OPTIONS);
+    expect(request).to.have.property('url').and.to.equal('https://prisma.nexx360.io/prebid');
+    expect(request).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request.data);
+    expect(requestContent.adUnits[0]).to.have.property('account').and.to.equal('1067');
+    expect(requestContent.adUnits[0]).to.have.property('tagId').and.to.equal('yqsc1tfj');
+    expect(requestContent.adUnits[0]).to.have.property('label').and.to.equal('video1');
+    expect(requestContent.adUnits[0]).to.have.property('bidId').and.to.equal('22f90541e576a3');
+    expect(requestContent.adUnits[0]).to.have.property('auctionId').and.to.equal('ed21b528-bcab-47e2-8605-ec9b71000c89');
+    expect(requestContent.adUnits[0]).to.have.property('mediatypes').exist;
+    expect(requestContent.adUnits[0].mediatypes).to.have.property('video').exist;
+  });
+
+  it('Verify video parse response', function () {
+    const request = spec.buildRequests(VIDEO_BID_REQUEST, DEFAULT_OPTIONS);
+    const response = spec.interpretResponse(VIDEO_BID_RESPONSE, request);
+    expect(response).to.have.lengthOf(1);
+    const bid = response[0];
+    expect(bid.cpm).to.equal(4.5421);
+    expect(bid.vastUrl).to.equal('https://prisma.nexx360.io/cache?uuid=b8e7b2f0-c378-479f-aa4f-4f55d5d7d1d5');
+    expect(bid.vastImpUrl).to.equal('https://prisma.nexx360.io/track-imp?type=prebid&mediatype=video&ssp=appnexus&tag_id=yqsc1tfj&consent=1&price=4.5421');
+    expect(bid.width).to.equal(1);
+    expect(bid.height).to.equal(1);
+    expect(bid.creativeId).to.equal('97517771');
+    expect(bid.currency).to.equal('EUR');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.ttl).to.equal(360);
+    expect(bid.requestId).to.equal('2c129e8e01859a');
+    expect(bid.prisma).to.exist;
+    expect(bid.prisma.ssp).to.equal('appnexus');
+  });
+
+  it('Verifies bidder code', function () {
+    expect(spec.code).to.equal('prisma');
+  });
+
+  it('Verifies bidder aliases', function () {
+    expect(spec.aliases).to.have.lengthOf(1);
+    expect(spec.aliases[0]).to.eql('prismadirect');
+  });
+  it('Verifies if bid request valid', function () {
+    expect(spec.isBidRequestValid(DISPLAY_BID_REQUEST[0])).to.equal(true);
+  });
+  it('Verifies bid won', function () {
+    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
+    const response = spec.interpretResponse(DISPLAY_BID_RESPONSE, request);
+    const won = spec.onBidWon(response[0]);
+    expect(won).to.equal(true);
+  });
+  it('Verifies user sync without cookie in bid response', function () {
+    var syncs = spec.getUserSyncs({}, [DISPLAY_BID_RESPONSE], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+  });
+  it('Verifies user sync with cookies in bid response', function () {
+    DISPLAY_BID_RESPONSE.body.cookies = [{'type': 'image', 'url': 'http://www.cookie.sync.org/'}];
+    var syncs = spec.getUserSyncs({}, [DISPLAY_BID_RESPONSE], DEFAULT_OPTIONS.gdprConsent);
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0]).to.have.property('type').and.to.equal('image');
+    expect(syncs[0]).to.have.property('url').and.to.equal('http://www.cookie.sync.org/');
+  });
+  it('Verifies user sync with no bid response', function() {
+    var syncs = spec.getUserSyncs({}, null, DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+  });
+  it('Verifies user sync with no bid body response', function() {
+    var syncs = spec.getUserSyncs({}, [], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+    var syncs = spec.getUserSyncs({}, [{}], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+  });
+});
diff --git a/test/spec/modules/projectLimeLightBidAdapter_spec.js b/test/spec/modules/projectLimeLightBidAdapter_spec.js
deleted file mode 100644
index 3ffc017f177..00000000000
--- a/test/spec/modules/projectLimeLightBidAdapter_spec.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/projectLimeLightBidAdapter.js';
-
-describe('ProjectLimeLightAdapter', function () {
-  let bid = {
-    bidId: '2dd581a2b6281d',
-    bidder: 'project-limelight',
-    bidderRequestId: '145e1d6a7837c9',
-    params: {
-      adUnitId: 123,
-      adUnitType: 'banner'
-    },
-    placementCode: 'placement_0',
-    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-    sizes: [[300, 250]],
-    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
-  };
-
-  describe('buildRequests', function () {
-    let serverRequest = spec.buildRequests([bid]);
-    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://ads.project-limelight.com/hb');
-    });
-    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', 'secure', 'adUnits');
-      expect(data.deviceWidth).to.be.a('number');
-      expect(data.deviceHeight).to.be.a('number');
-      expect(data.secure).to.be.a('boolean');
-      let adUnits = data['adUnits'];
-      for (let i = 0; i < adUnits.length; i++) {
-        let adUnit = adUnits[i];
-        expect(adUnit).to.have.all.keys('id', 'bidId', 'type', 'sizes', 'transactionId');
-        expect(adUnit.id).to.be.a('number');
-        expect(adUnit.bidId).to.be.a('string');
-        expect(adUnit.type).to.be.a('string');
-        expect(adUnit.transactionId).to.be.a('string');
-        expect(adUnit.sizes).to.be.an('array');
-      }
-    });
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
-      let data = serverRequest.data;
-      expect(data.adUnits).to.be.an('array').that.is.empty;
-    });
-  });
-  describe('interpretBannerResponse', function () {
-    let resObject = {
-      body: [ {
-        requestId: '123',
-        mediaType: 'banner',
-        cpm: 0.3,
-        width: 320,
-        height: 50,
-        ad: '<h1>Hello ad</h1>',
-        ttl: 1000,
-        creativeId: '123asd',
-        netRevenue: true,
-        currency: 'USD'
-      } ]
-    };
-    let serverResponses = spec.interpretResponse(resObject);
-    it('Returns an array of valid server responses if response object is valid', function () {
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType');
-        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.ad).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');
-      }
-      it('Returns an empty array if invalid response is passed', function () {
-        serverResponses = spec.interpretResponse('invalid_response');
-        expect(serverResponses).to.be.an('array').that.is.empty;
-      });
-    });
-  });
-  describe('interpretVideoResponse', function () {
-    let resObject = {
-      body: [ {
-        requestId: '123',
-        mediaType: 'video',
-        cpm: 0.3,
-        width: 320,
-        height: 50,
-        vastXml: '<VAST></VAST>',
-        ttl: 1000,
-        creativeId: '123asd',
-        netRevenue: true,
-        currency: 'USD'
-      } ]
-    };
-    let serverResponses = spec.interpretResponse(resObject);
-    it('Returns an array of valid server responses if response object is valid', function () {
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastXml', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'mediaType');
-        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.vastXml).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');
-      }
-      it('Returns an empty array if invalid response is passed', function () {
-        serverResponses = spec.interpretResponse('invalid_response');
-        expect(serverResponses).to.be.an('array').that.is.empty;
-      });
-    });
-  });
-  describe('isBidRequestValid', function() {
-    let bid = {
-      bidId: '2dd581a2b6281d',
-      bidder: 'project-limelight',
-      bidderRequestId: '145e1d6a7837c9',
-      params: {
-        adUnitId: 123,
-        adUnitType: 'banner'
-      },
-      placementCode: 'placement_0',
-      auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-      sizes: [[300, 250]],
-      transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
-    };
-
-    it('should return true when required params found', function() {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function() {
-      let bidFailed = {
-        bidder: 'project-limelight',
-        bidderRequestId: '145e1d6a7837c9',
-        params: {
-          adUnitId: 123,
-          adUnitType: 'banner'
-        },
-        placementCode: 'placement_0',
-        auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-        sizes: [[300, 250]],
-        transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
-      };
-      expect(spec.isBidRequestValid(bidFailed)).to.equal(false);
-    });
-  });
-});
diff --git a/test/spec/modules/proxistoreBidAdapter_spec.js b/test/spec/modules/proxistoreBidAdapter_spec.js
index 410c3c59fb6..5b9f35c5bcf 100644
--- a/test/spec/modules/proxistoreBidAdapter_spec.js
+++ b/test/spec/modules/proxistoreBidAdapter_spec.js
@@ -1,55 +1,66 @@
 import { expect } from 'chai';
-let { spec } = require('modules/proxistoreBidAdapter');
+import { spec } from 'modules/proxistoreBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from '../../../src/config.js';
 
 const BIDDER_CODE = 'proxistore';
 describe('ProxistoreBidAdapter', function () {
+  const consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
   const bidderRequest = {
-    'bidderCode': BIDDER_CODE,
-    'auctionId': '1025ba77-5463-4877-b0eb-14b205cb9304',
-    'bidderRequestId': '10edf38ec1a719',
-    'gdprConsent': {
-      'gdprApplies': true,
-      'consentString': 'CONSENT_STRING',
-      'vendorData': {
-        'vendorConsents': {
-          '418': true
-        }
-      }
-    }
+    bidderCode: BIDDER_CODE,
+    auctionId: '1025ba77-5463-4877-b0eb-14b205cb9304',
+    bidderRequestId: '10edf38ec1a719',
+    gdprConsent: {
+      apiVersion: 2,
+      gdprApplies: true,
+      consentString: consentString,
+      vendorData: {
+        vendor: {
+          consents: {
+            418: true,
+          },
+        },
+      },
+    },
   };
   let bid = {
     sizes: [[300, 600]],
     params: {
       website: 'example.fr',
-      language: 'fr'
+      language: 'fr',
+    },
+    ortb2: {
+      user: { ext: { data: { segments: [], contextual_categories: {} } } },
     },
     auctionId: 442133079,
     bidId: 464646969,
-    transactionId: 511916005
+    transactionId: 511916005,
   };
   describe('isBidRequestValid', function () {
     it('it should be true if required params are presents and there is no info in the local storage', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
-
-    it('it should be false if the value in the localstorage is less than 5minutes of the actual time', function() {
+    it('it should be false if the value in the localstorage is less than 5minutes of the actual time', function () {
       const date = new Date();
-      date.setMinutes(date.getMinutes() - 1)
-      localStorage.setItem(`PX_NoAds_${bid.params.website}`, date)
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      date.setMinutes(date.getMinutes() - 1);
+      localStorage.setItem(`PX_NoAds_${bid.params.website}`, date);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
-
-    it('it should be true if the value in the localstorage is more than 5minutes of the actual time', function() {
+    it('it should be true if the value in the localstorage is more than 5minutes of the actual time', function () {
       const date = new Date();
-      date.setMinutes(date.getMinutes() - 10)
-      localStorage.setItem(`PX_NoAds_${bid.params.website}`, date)
+      date.setMinutes(date.getMinutes() - 10);
+      localStorage.setItem(`PX_NoAds_${bid.params.website}`, date);
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
   });
-
   describe('buildRequests', function () {
-    const url = 'https://abs.proxistore.com/fr/v3/rtb/prebid/multi';
-    const request = spec.buildRequests([bid], bidderRequest);
+    const url = {
+      cookieBase: 'https://abs.proxistore.com/v3/rtb/prebid/multi',
+      cookieLess:
+        'https://abs.cookieless-proxistore.com/v3/rtb/prebid/multi',
+    };
+
+    let request = spec.buildRequests([bid], bidderRequest);
     it('should return a valid object', function () {
       expect(request).to.be.an('object');
       expect(request.method).to.exist;
@@ -59,16 +70,45 @@ describe('ProxistoreBidAdapter', function () {
     it('request method should be POST', function () {
       expect(request.method).to.equal('POST');
     });
-    it('should contain a valid url', function () {
-      expect(request.url).equal(url);
-    });
     it('should have the value consentGiven to true bc we have 418 in the vendor list', function () {
       const data = JSON.parse(request.data);
-
-      expect(data.gdpr.consentString).equal(bidderRequest.gdprConsent.consentString);
+      expect(data.gdpr.consentString).equal(
+        bidderRequest.gdprConsent.consentString
+      );
       expect(data.gdpr.applies).to.be.true;
       expect(data.gdpr.consentGiven).to.be.true;
     });
+    it('should contain a valid url', function () {
+      // has gdpr consent
+      expect(request.url).equal(url.cookieBase);
+      // doens't have gpdr consent
+      bidderRequest.gdprConsent.vendorData = null;
+
+      request = spec.buildRequests([bid], bidderRequest);
+      expect(request.url).equal(url.cookieLess);
+
+      // api v2
+      bidderRequest.gdprConsent = {
+        gdprApplies: true,
+        allowAuctionWithoutConsent: true,
+        consentString: consentString,
+        vendorData: {
+          vendor: {
+            consents: {
+              418: true,
+            },
+          },
+        },
+        apiVersion: 2,
+      };
+      // has gdpr consent
+      request = spec.buildRequests([bid], bidderRequest);
+      expect(request.url).equal(url.cookieBase);
+
+      bidderRequest.gdprConsent.vendorData.vendor = {};
+      request = spec.buildRequests([bid], bidderRequest);
+      expect(request.url).equal(url.cookieLess);
+    });
     it('should have a property a length of bids equal to one if there is only one bid', function () {
       const data = JSON.parse(request.data);
       expect(data.hasOwnProperty('bids')).to.be.true;
@@ -77,51 +117,51 @@ describe('ProxistoreBidAdapter', function () {
       expect(data.bids[0].hasOwnProperty('id')).to.be.true;
       expect(data.bids[0].sizes).to.be.an('array');
     });
-  });
+    it('should correctly set bidfloor on imp when getfloor in scope', function () {
+      let data = JSON.parse(request.data);
+      expect(data.bids[0].floor).to.be.null;
 
+      bid.params['bidFloor'] = 1;
+      let req = spec.buildRequests([bid], bidderRequest);
+      data = JSON.parse(req.data);
+      expect(data.bids[0].floor).equal(1);
+      bid.getFloor = function () {
+        return { currency: 'USD', floor: 1.0 };
+      };
+      req = spec.buildRequests([bid], bidderRequest);
+      data = JSON.parse(req.data);
+      expect(data.bids[0].floor).to.be.null;
+    });
+  });
   describe('interpretResponse', function () {
-    const responses = {
-      body:
-        [{
+    const emptyResponseParam = { body: [] };
+    const fakeResponseParam = {
+      body: [
+        {
+          ad: '',
           cpm: 6.25,
-          creativeId: '48fd47c9-ce35-4fda-804b-17e16c8c36ac',
+          creativeId: '22c3290b-8cd5-4cd6-8e8c-28a2de180ccd',
           currency: 'EUR',
-          dealId: '2019-10_e3ecad8e-d07a-4c90-ad46-cd0f306c8960',
+          dealId: '2021-03_a63ec55e-b9bb-4ca4-b2c9-f456be67e656',
           height: 600,
           netRevenue: true,
-          requestId: '923756713',
+          requestId: '3543724f2a033c9',
+          segments: [],
           ttl: 10,
           vastUrl: null,
           vastXml: null,
           width: 300,
-        }]
+        },
+      ],
     };
-    const badResponse = { body: [] };
-    const interpretedResponse = spec.interpretResponse(responses, bid)[0];
-    it('should send an empty array if body is empty', function () {
-      expect(spec.interpretResponse(badResponse, bid)).to.be.an('array');
-      expect(spec.interpretResponse(badResponse, bid).length).equal(0);
-    });
-    it('should interpret the response correctly if it is valid', function () {
-      expect(interpretedResponse.cpm).equal(6.25);
-      expect(interpretedResponse.creativeId).equal('48fd47c9-ce35-4fda-804b-17e16c8c36ac');
-      expect(interpretedResponse.currency).equal('EUR');
-      expect(interpretedResponse.height).equal(600);
-      expect(interpretedResponse.width).equal(300);
-      expect(interpretedResponse.requestId).equal('923756713');
-      expect(interpretedResponse.netRevenue).to.be.true;
-      expect(interpretedResponse.netRevenue).to.be.true;
-    });
-    it('should have a value in the local storage if the response is empty', function() {
-      spec.interpretResponse(badResponse, bid);
-      expect(localStorage.getItem(`PX_NoAds_${bid.params.website}`)).to.be.string;
-    });
-  });
 
-  describe('interpretResponse', function () {
-    it('should aways return an empty array', function () {
-      expect(spec.getUserSyncs()).to.be.an('array');
-      expect(spec.getUserSyncs().length).equal(0);
+    it('should always return an array', function () {
+      let response = spec.interpretResponse(emptyResponseParam, bid);
+      expect(response).to.be.an('array');
+      expect(response.length).equal(0);
+      response = spec.interpretResponse(fakeResponseParam, bid);
+      expect(response).to.be.an('array');
+      expect(response.length).equal(1);
     });
   });
 });
diff --git a/test/spec/modules/pubCommonId_spec.js b/test/spec/modules/pubCommonId_spec.js
index ab0ef2adc51..a46ff26c4b8 100644
--- a/test/spec/modules/pubCommonId_spec.js
+++ b/test/spec/modules/pubCommonId_spec.js
@@ -234,7 +234,7 @@ describe('Publisher Common ID', function () {
       });
     });
 
-    it('disable auto create', function() {
+    it.skip('disable auto create', function() {
       setConfig({
         create: false
       });
diff --git a/test/spec/modules/pubgeniusBidAdapter_spec.js b/test/spec/modules/pubgeniusBidAdapter_spec.js
index c510be99402..1d1b0e65ec8 100644
--- a/test/spec/modules/pubgeniusBidAdapter_spec.js
+++ b/test/spec/modules/pubgeniusBidAdapter_spec.js
@@ -1,8 +1,9 @@
 import { expect } from 'chai';
 
 import { spec } from 'modules/pubgeniusBidAdapter.js';
-import { deepClone, parseQueryStringParameters } from 'src/utils.js';
 import { config } from 'src/config.js';
+import { VIDEO } from 'src/mediaTypes.js';
+import { deepClone, parseQueryStringParameters } from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
 
 const {
@@ -23,8 +24,8 @@ describe('pubGENIUS adapter', () => {
   });
 
   describe('supportedMediaTypes', () => {
-    it('should contain only banner', () => {
-      expect(supportedMediaTypes).to.deep.equal(['banner']);
+    it('should contain banner and video', () => {
+      expect(supportedMediaTypes).to.deep.equal(['banner', 'video']);
     });
   });
 
@@ -77,6 +78,51 @@ describe('pubGENIUS adapter', () => {
 
       expect(isBidRequestValid(bid)).to.be.false;
     });
+
+    it('should return false without banner or video', () => {
+      bid.mediaTypes = {};
+
+      expect(isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('should return true with valid video media type', () => {
+      bid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[100, 100]],
+          mimes: ['video/mp4'],
+          protocols: [1],
+        },
+      };
+
+      expect(isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should return true with valid video params', () => {
+      bid.params.video = {
+        placement: 1,
+        w: 200,
+        h: 200,
+        mimes: ['video/mp4'],
+        protocols: [1],
+      };
+
+      expect(isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should return false without video protocols', () => {
+      bid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[100, 100]],
+        },
+      };
+      bid.params.video = {
+        mimes: ['video/mp4'],
+      };
+
+      expect(isBidRequestValid(bid)).to.be.false;
+    });
   });
 
   describe('buildRequests', () => {
@@ -122,11 +168,12 @@ describe('pubGENIUS adapter', () => {
         bidderCode: 'pubgenius',
         bidderRequestId: 'fakebidderrequestid',
         refererInfo: {},
+        timeout: 1200,
       };
 
       expectedRequest = {
         method: 'POST',
-        url: 'https://ortb.adpearl.io/prebid/auction',
+        url: 'https://auction.adpearl.io/prebid/auction',
         data: {
           id: 'fake-auction-id',
           imp: [
@@ -142,14 +189,14 @@ describe('pubGENIUS adapter', () => {
           tmax: 1200,
           ext: {
             pbadapter: {
-              version: '1.0.0',
+              version: '1.1.0',
             },
           },
         },
       };
 
       config.setConfig({
-        bidderTimeout: 1200,
+        bidderTimeout: 1000,
         pageUrl: undefined,
         coppa: undefined,
       });
@@ -178,8 +225,8 @@ describe('pubGENIUS adapter', () => {
       expect(buildRequests([bidRequest, bidRequest1], bidderRequest)).to.deep.equal(expectedRequest);
     });
 
-    it('should take bid floor in bidder params', () => {
-      bidRequest.params.bidFloor = 0.5;
+    it('should take bid floor from getFloor interface', () => {
+      bidRequest.getFloor = () => ({ floor: 0.5, currency: 'USD' });
       expectedRequest.data.imp[0].bidfloor = 0.5;
 
       expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
@@ -192,9 +239,8 @@ describe('pubGENIUS adapter', () => {
       expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
     });
 
-    it('should take pageUrl in config over referer in refererInfo', () => {
-      config.setConfig({ pageUrl: 'http://pageurl.org' });
-      bidderRequest.refererInfo.referer = 'http://referer.org';
+    it('should use page from refererInfo', () => {
+      bidderRequest.refererInfo.page = 'http://pageurl.org';
       expectedRequest.data.site = { page: 'http://pageurl.org' };
 
       expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
@@ -248,7 +294,7 @@ describe('pubGENIUS adapter', () => {
           }
         ]
       };
-      bidderRequest.schain = deepClone(schain);
+      bidRequest.schain = deepClone(schain);
       expectedRequest.data.source = {
         ext: { schain: deepClone(schain) },
       };
@@ -305,6 +351,47 @@ describe('pubGENIUS adapter', () => {
 
       expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
     });
+
+    it('should build video imp', () => {
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[200, 100]],
+          mimes: ['video/mp4'],
+          protocols: [2, 3],
+          api: [1, 2],
+          playbackmethod: [3, 4],
+          maxduration: 10,
+          linearity: 1,
+        },
+      };
+      bidRequest.params.video = {
+        minduration: 5,
+        maxduration: 100,
+        skip: 1,
+        skipafter: 1,
+        startdelay: -1,
+      };
+
+      delete expectedRequest.data.imp[0].banner;
+      expectedRequest.data.imp[0].video = {
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 100,
+        protocols: [2, 3],
+        w: 200,
+        h: 100,
+        startdelay: -1,
+        placement: 1,
+        skip: 1,
+        skipafter: 1,
+        playbackmethod: [3, 4],
+        api: [1, 2],
+        linearity: 1,
+      };
+
+      expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
+    });
   });
 
   describe('interpretResponse', () => {
@@ -361,6 +448,29 @@ describe('pubGENIUS adapter', () => {
     it('should interpret no bids', () => {
       expect(interpretResponse({ body: {} })).to.deep.equal([]);
     });
+
+    it('should interpret video response', () => {
+      serverResponse.body.seatbid[0].bid[0] = {
+        ...serverResponse.body.seatbid[0].bid[0],
+        nurl: 'http://vasturl/cache?id=x',
+        ext: {
+          pbadapter: {
+            mediaType: 'video',
+            cacheKey: 'x',
+          },
+        },
+      };
+
+      delete expectedBidResponse.ad;
+      expectedBidResponse = {
+        ...expectedBidResponse,
+        vastUrl: 'http://vasturl/cache?id=x',
+        vastXml: 'fake_creative',
+        mediaType: VIDEO,
+      };
+
+      expect(interpretResponse(serverResponse)).to.deep.equal([expectedBidResponse]);
+    });
   });
 
   describe('getUserSyncs', () => {
@@ -374,7 +484,7 @@ describe('pubGENIUS adapter', () => {
       };
       expectedSync = {
         type: 'iframe',
-        url: 'https://ortb.adpearl.io/usersync/pixels.html?',
+        url: 'https://auction.adpearl.io/usersync/pixels.html?',
       };
     });
 
@@ -432,7 +542,7 @@ describe('pubGENIUS adapter', () => {
       onTimeout(timeoutData);
 
       expect(server.requests[0].method).to.equal('POST');
-      expect(server.requests[0].url).to.equal('https://ortb.adpearl.io/prebid/events?type=timeout');
+      expect(server.requests[0].url).to.equal('https://auction.adpearl.io/prebid/events?type=timeout');
       expect(JSON.parse(server.requests[0].requestBody)).to.deep.equal(timeoutData);
     });
   });
diff --git a/test/spec/modules/publinkIdSystem_spec.js b/test/spec/modules/publinkIdSystem_spec.js
new file mode 100644
index 00000000000..4656afe1585
--- /dev/null
+++ b/test/spec/modules/publinkIdSystem_spec.js
@@ -0,0 +1,169 @@
+import {publinkIdSubmodule} from 'modules/publinkIdSystem.js';
+import {getStorageManager} from '../../../src/storageManager';
+import {server} from 'test/mocks/xhr.js';
+import sinon from 'sinon';
+import {uspDataHandler} from '../../../src/adapterManager';
+import {parseUrl} from '../../../src/utils';
+
+export const storage = getStorageManager({gvlid: 24});
+const TEST_COOKIE_VALUE = 'cookievalue';
+describe('PublinkIdSystem', () => {
+  describe('decode', () => {
+    it('decode', () => {
+      const result = publinkIdSubmodule.decode(TEST_COOKIE_VALUE);
+      expect(result).deep.equals({publinkId: TEST_COOKIE_VALUE});
+    });
+  });
+
+  describe('Fetch Local Cookies', () => {
+    const PUBLINK_COOKIE = '_publink';
+    const PUBLINK_SRV_COOKIE = '_publink_srv';
+    const EXP = Date.now() + 60 * 60 * 24 * 7 * 1000;
+    const COOKIE_VALUE = {publink: 'publinkCookieValue', exp: EXP};
+    const LOCAL_VALUE = {publink: 'publinkLocalStorageValue', exp: EXP};
+    const COOKIE_EXPIRATION = (new Date(Date.now() + 60 * 60 * 24 * 1000)).toUTCString();
+    const DELETE_COOKIE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+    it('publink srv cookie', () => {
+      storage.setCookie(PUBLINK_SRV_COOKIE, JSON.stringify(COOKIE_VALUE), COOKIE_EXPIRATION);
+      const result = publinkIdSubmodule.getId();
+      expect(result.id).to.equal(COOKIE_VALUE.publink);
+      storage.setCookie(PUBLINK_SRV_COOKIE, '', DELETE_COOKIE);
+    });
+    it('publink srv local storage', () => {
+      storage.setDataInLocalStorage(PUBLINK_SRV_COOKIE, JSON.stringify(LOCAL_VALUE));
+      const result = publinkIdSubmodule.getId();
+      expect(result.id).to.equal(LOCAL_VALUE.publink);
+      storage.removeDataFromLocalStorage(PUBLINK_SRV_COOKIE);
+    });
+    it('publink cookie', () => {
+      storage.setCookie(PUBLINK_COOKIE, JSON.stringify(COOKIE_VALUE), COOKIE_EXPIRATION);
+      const result = publinkIdSubmodule.getId();
+      expect(result.id).to.equal(COOKIE_VALUE.publink);
+      storage.setCookie(PUBLINK_COOKIE, '', DELETE_COOKIE);
+    });
+    it('publink local storage', () => {
+      storage.setDataInLocalStorage(PUBLINK_COOKIE, JSON.stringify(LOCAL_VALUE));
+      const result = publinkIdSubmodule.getId();
+      expect(result.id).to.equal(LOCAL_VALUE.publink);
+      storage.removeDataFromLocalStorage(PUBLINK_COOKIE);
+    });
+    it('priority goes to publink_srv cookie', () => {
+      storage.setCookie(PUBLINK_SRV_COOKIE, JSON.stringify(COOKIE_VALUE), COOKIE_EXPIRATION);
+      storage.setDataInLocalStorage(PUBLINK_COOKIE, JSON.stringify(LOCAL_VALUE));
+      const result = publinkIdSubmodule.getId();
+      expect(result.id).to.equal(COOKIE_VALUE.publink);
+      storage.setCookie(PUBLINK_SRV_COOKIE, '', DELETE_COOKIE);
+      storage.removeDataFromLocalStorage(PUBLINK_COOKIE);
+    });
+    it('publink non-json cookie', () => {
+      storage.setCookie(PUBLINK_COOKIE, COOKIE_VALUE.publink, COOKIE_EXPIRATION);
+      const result = publinkIdSubmodule.getId();
+      expect(result.id).to.equal(COOKIE_VALUE.publink);
+      storage.setCookie(PUBLINK_COOKIE, '', DELETE_COOKIE);
+    });
+  });
+
+  describe('getId', () => {
+    const serverResponse = {publink: 'ec0xHT3yfAOnykP64Qf0ORSi7LjNT1wju04ZSCsoPBekOJdBwK-0Zl_lXKDNnzhauC4iszBc-PvA1Be6IMlh1QocA'};
+    it('no config', () => {
+      const result = publinkIdSubmodule.getId();
+      expect(result).to.exist;
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('Use local copy', () => {
+      const result = publinkIdSubmodule.getId({}, undefined, TEST_COOKIE_VALUE);
+      expect(result).to.be.undefined;
+    });
+
+    describe('callout for id', () => {
+      let callbackSpy = sinon.spy();
+
+      beforeEach(() => {
+        callbackSpy.resetHistory();
+      });
+
+      it('Fetch with consent data', () => {
+        const config = {storage: {type: 'cookie'}, params: {e: 'ca11c0ca7', site_id: '102030'}};
+        const consentData = {gdprApplies: 1, consentString: 'myconsentstring'};
+        let submoduleCallback = publinkIdSubmodule.getId(config, consentData).callback;
+        submoduleCallback(callbackSpy);
+
+        const request = server.requests[0];
+        const parsed = parseUrl(request.url);
+
+        expect(parsed.hostname).to.equal('proc.ad.cpe.dotomi.com');
+        expect(parsed.pathname).to.equal('/cvx/client/sync/publink');
+        expect(parsed.search.mpn).to.equal('Prebid.js');
+        expect(parsed.search.mpv).to.equal('$prebid.version$');
+        expect(parsed.search.gdpr).to.equal('1');
+        expect(parsed.search.gdpr_consent).to.equal('myconsentstring');
+        expect(parsed.search.sid).to.equal('102030');
+        expect(parsed.search.apikey).to.be.undefined;
+
+        request.respond(200, {}, JSON.stringify(serverResponse));
+        expect(callbackSpy.calledOnce).to.be.true;
+        expect(callbackSpy.lastCall.lastArg).to.equal(serverResponse.publink);
+      });
+
+      it('server doesnt respond', () => {
+        const config = {storage: {type: 'cookie'}, params: {e: 'ca11c0ca7'}};
+        let submoduleCallback = publinkIdSubmodule.getId(config).callback;
+        submoduleCallback(callbackSpy);
+
+        let request = server.requests[0];
+        const parsed = parseUrl(request.url);
+
+        expect(parsed.hostname).to.equal('proc.ad.cpe.dotomi.com');
+        expect(parsed.pathname).to.equal('/cvx/client/sync/publink');
+        expect(parsed.search.mpn).to.equal('Prebid.js');
+        expect(parsed.search.mpv).to.equal('$prebid.version$');
+
+        request.respond(204, {}, JSON.stringify(serverResponse));
+        expect(callbackSpy.called).to.be.false;
+      });
+
+      it('reject plain email address', () => {
+        const config = {storage: {type: 'cookie'}, params: {e: 'tester@test.com'}};
+        const consentData = {gdprApplies: 1, consentString: 'myconsentstring'};
+        let submoduleCallback = publinkIdSubmodule.getId(config, consentData).callback;
+        submoduleCallback(callbackSpy);
+
+        expect(server.requests).to.have.lengthOf(0);
+        expect(callbackSpy.called).to.be.false;
+      });
+    });
+
+    describe('usPrivacy', () => {
+      let callbackSpy = sinon.spy();
+      const oldPrivacy = uspDataHandler.getConsentData();
+      before(() => {
+        uspDataHandler.setConsentData('1YNN');
+      });
+      after(() => {
+        uspDataHandler.setConsentData(oldPrivacy);
+        callbackSpy.resetHistory();
+      });
+
+      it('Fetch with usprivacy data', () => {
+        const config = {storage: {type: 'cookie'}, params: {e: 'ca11c0ca7', api_key: 'abcdefg'}};
+        let submoduleCallback = publinkIdSubmodule.getId(config).callback;
+        submoduleCallback(callbackSpy);
+
+        let request = server.requests[0];
+        const parsed = parseUrl(request.url);
+
+        expect(parsed.hostname).to.equal('proc.ad.cpe.dotomi.com');
+        expect(parsed.pathname).to.equal('/cvx/client/sync/publink');
+        expect(parsed.search.mpn).to.equal('Prebid.js');
+        expect(parsed.search.mpv).to.equal('$prebid.version$');
+        expect(parsed.search.us_privacy).to.equal('1YNN');
+        expect(parsed.search.apikey).to.equal('abcdefg');
+
+        request.respond(200, {}, JSON.stringify(serverResponse));
+        expect(callbackSpy.calledOnce).to.be.true;
+        expect(callbackSpy.lastCall.lastArg).to.equal(serverResponse.publink);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
index bb9aa20f1b4..4ad048fef9a 100755
--- a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
@@ -1,4 +1,5 @@
 import pubmaticAnalyticsAdapter from 'modules/pubmaticAnalyticsAdapter.js';
+import adapterManager from 'src/adapterManager.js';
 import CONSTANTS from 'src/constants.json';
 import { config } from 'src/config.js';
 import {
@@ -6,11 +7,16 @@ import {
   addBidResponseHook,
 } from 'modules/currency.js';
 
-// using es6 "import * as events from 'src/events'" causes the events.getEvents stub not to work...
 let events = require('src/events');
 let ajax = require('src/ajax');
 let utils = require('src/utils');
 
+const DEFAULT_USER_AGENT = window.navigator.userAgent;
+const MOBILE_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.5 Mobile/15E148 Safari/604.1';
+const setUADefault = () => { window.navigator.__defineGetter__('userAgent', function () { return DEFAULT_USER_AGENT }) };
+const setUAMobile = () => { window.navigator.__defineGetter__('userAgent', function () { return MOBILE_USER_AGENT }) };
+const setUANull = () => { window.navigator.__defineGetter__('userAgent', function () { return null }) };
+
 const {
   EVENTS: {
     AUCTION_INIT,
@@ -31,6 +37,7 @@ const BID = {
   'mediaType': 'video',
   'statusMessage': 'Bid available',
   'bidId': '2ecff0db240757',
+  'partnerImpId': 'partnerImpressionID-1',
   'adId': 'fake_ad_id',
   'source': 's2s',
   'requestId': '2ecff0db240757',
@@ -61,6 +68,14 @@ const BID = {
     'hb_size': '640x480',
     'hb_source': 'server'
   },
+  'floorData': {
+    'cpmAfterAdjustments': 6.3,
+    'enforcements': {'enforceJS': true, 'enforcePBS': false, 'floorDeals': false, 'bidAdjustment': true},
+    'floorCurrency': 'USD',
+    'floorRule': 'banner',
+    'floorRuleValue': 1.1,
+    'floorValue': 1.1
+  },
   getStatusCode() {
     return 1;
   }
@@ -69,6 +84,7 @@ const BID = {
 const BID2 = Object.assign({}, BID, {
   adUnitCode: '/19968336/header-bid-tag-1',
   bidId: '3bd4ebb1c900e2',
+  partnerImpId: 'partnerImpressionID-2',
   adId: 'fake_ad_id_2',
   requestId: '3bd4ebb1c900e2',
   width: 728,
@@ -86,6 +102,9 @@ const BID2 = Object.assign({}, BID, {
     'hb_pb': '1.500',
     'hb_size': '728x90',
     'hb_source': 'server'
+  },
+  meta: {
+    advertiserDomains: ['example.com']
   }
 });
 
@@ -138,7 +157,7 @@ const MOCK = {
       ],
       'timeout': 3000,
       'refererInfo': {
-        'referer': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+        'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
       }
     }
     ],
@@ -153,6 +172,8 @@ const MOCK = {
     'bids': [
       {
         'bidder': 'pubmatic',
+        'adapterCode': 'pubmatic',
+        'bidderCode': 'pubmatic',
         'params': {
           'publisherId': '1001',
           'video': {
@@ -170,6 +191,8 @@ const MOCK = {
       },
       {
         'bidder': 'pubmatic',
+        'adapterCode': 'pubmatic',
+        'bidderCode': 'pubmatic',
         'params': {
           'publisherId': '1001',
           'kgpv': 'this-is-a-kgpv'
@@ -185,14 +208,25 @@ const MOCK = {
         'bidId': '3bd4ebb1c900e2',
         'seatBidId': 'aaaa-bbbb-cccc-dddd',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'floorData': {
+          'fetchStatus': 'success',
+          'floorMin': undefined,
+          'floorProvider': 'pubmatic',
+          'location': 'fetch',
+          'modelTimestamp': undefined,
+          'modelVersion': 'floorModelTest',
+          'modelWeight': undefined,
+          'skipRate': 0,
+          'skipped': false
+        }
       }
     ],
     'auctionStart': 1519149536560,
     'timeout': 5000,
     'start': 1519149562216,
     'refererInfo': {
-      'referer': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+      'topmostLocation': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
     },
     'gdprConsent': {
       'consentString': 'here-goes-gdpr-consent-string',
@@ -245,6 +279,7 @@ describe('pubmatic analytics adapter', function () {
   let clock;
 
   beforeEach(function () {
+    setUADefault();
     sandbox = sinon.sandbox.create();
 
     xhr = sandbox.useFakeXMLHttpRequest();
@@ -293,10 +328,16 @@ describe('pubmatic analytics adapter', function () {
     });
 
     it('Logger: best case + win tracker', function() {
+      this.timeout(5000)
+
       sandbox.stub($$PREBID_GLOBAL$$, 'getHighestCpmBids').callsFake((key) => {
         return [MOCK.BID_RESPONSE[0], MOCK.BID_RESPONSE[1]]
       });
 
+      config.setConfig({
+        testGroupId: 15
+      });
+
       events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
       events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
       events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
@@ -310,7 +351,7 @@ describe('pubmatic analytics adapter', function () {
       clock.tick(2000 + 1000);
       expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
       let request = requests[2]; // logger is executed late, trackers execute first
-      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999&gdEn=1');
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.pubid).to.equal('9999');
       expect(data.pid).to.equal('1111');
@@ -320,17 +361,21 @@ describe('pubmatic analytics adapter', function () {
       expect(data.purl).to.equal('http://www.test.com/page.html');
       expect(data.orig).to.equal('www.test.com');
       expect(data.tst).to.equal(1519767016);
-      expect(data.cns).to.equal('here-goes-gdpr-consent-string');
-      expect(data.gdpr).to.equal(1);
+      expect(data.tgid).to.equal(15);
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
       expect(data.s[0].ps.length).to.equal(1);
       expect(data.s[0].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
+      expect(data.s[0].ps[0].piid).to.equal('partnerImpressionID-1');
       expect(data.s[0].ps[0].db).to.equal(0);
       expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].kgpsv).to.equal('/19968336/header-bid-tag-0');
@@ -347,13 +392,17 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].af).to.equal('video');
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
+      expect(data.s[0].ps[0].frv).to.equal(undefined);
       // slot 2
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
+      expect(data.s[1].ps[0].piid).to.equal('partnerImpressionID-2');
       expect(data.s[1].ps[0].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
       expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
@@ -363,6 +412,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].di).to.equal('the-deal-id');
       expect(data.s[1].ps[0].dc).to.equal('PMP');
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[1].ps[0].l1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
@@ -371,6 +421,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
 
       // tracker slot1
       let firstTracker = requests[0].url;
@@ -387,13 +438,16 @@ describe('pubmatic analytics adapter', function () {
       expect(decodeURIComponent(data.slot)).to.equal('/19968336/header-bid-tag-0');
       expect(decodeURIComponent(data.kgpv)).to.equal('/19968336/header-bid-tag-0');
       expect(data.pn).to.equal('pubmatic');
+      expect(data.bc).to.equal('pubmatic');
       expect(data.eg).to.equal('1.23');
       expect(data.en).to.equal('1.23');
+      expect(data.piid).to.equal('partnerImpressionID-1');
     });
 
     it('bidCpmAdjustment: USD: Logger: best case + win tracker', function() {
       const bidCopy = utils.deepClone(BID);
       bidCopy.cpm = bidCopy.originalCpm * 2; //  bidCpmAdjustment => bidCpm * 2
+      this.timeout(5000)
 
       sandbox.stub($$PREBID_GLOBAL$$, 'getHighestCpmBids').callsFake((key) => {
         return [bidCopy, MOCK.BID_RESPONSE[1]]
@@ -413,18 +467,23 @@ describe('pubmatic analytics adapter', function () {
       clock.tick(2000 + 1000);
       expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
       let request = requests[2]; // logger is executed late, trackers execute first
-      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999&gdEn=1');
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.pubid).to.equal('9999');
       expect(data.pid).to.equal('1111');
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
+      expect(data.tgid).to.equal(0);
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
       expect(data.s[0].ps.length).to.equal(1);
       expect(data.s[0].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
       expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].eg).to.equal(1.23);
@@ -433,6 +492,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].af).to.equal('video');
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
       // tracker slot1
       let firstTracker = requests[0].url;
       expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
@@ -446,6 +506,10 @@ describe('pubmatic analytics adapter', function () {
     });
 
     it('bidCpmAdjustment: JPY: Logger: best case + win tracker', function() {
+      config.setConfig({
+        testGroupId: 25
+      });
+
       setConfig({
         adServerCurrency: 'JPY',
         rates: {
@@ -475,10 +539,13 @@ describe('pubmatic analytics adapter', function () {
       clock.tick(2000 + 1000);
       expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
       let request = requests[2]; // logger is executed late, trackers execute first
-      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999&gdEn=1');
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.pubid).to.equal('9999');
       expect(data.pid).to.equal('1111');
+      expect(data.tgid).to.equal(0);// test group id should be between 0-15 else set to 0
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
       // slot 1
@@ -487,6 +554,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps).to.be.an('array');
       expect(data.s[0].ps.length).to.equal(1);
       expect(data.s[0].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
       expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].eg).to.equal(1);
@@ -508,6 +576,10 @@ describe('pubmatic analytics adapter', function () {
     });
 
     it('Logger: when bid is not submitted, default bid status 1 check: pubmatic set as s2s', function() {
+      config.setConfig({
+        testGroupId: '25'
+      });
+
       events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
       events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
       events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
@@ -520,11 +592,14 @@ describe('pubmatic analytics adapter', function () {
       expect(requests.length).to.equal(2); // 1 logger and 1 win-tracker
       let request = requests[1]; // logger is executed late, trackers execute first
       let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.tgid).to.equal(0);// test group id should be an INT between 0-15 else set to 0
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
       expect(data.s[1].ps[0].db).to.equal(1);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
@@ -543,6 +618,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal(undefined);
       expect(data.s[1].ps[0].ocpm).to.equal(0);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
     });
 
     it('Logger: post-timeout check without bid response', function() {
@@ -561,6 +637,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
       expect(data.s[1].ps[0].db).to.equal(1);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
@@ -599,10 +676,12 @@ describe('pubmatic analytics adapter', function () {
       let request = requests[0];
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
       expect(data.s[1].ps[0].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
@@ -613,6 +692,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].di).to.equal('the-deal-id');
       expect(data.s[1].ps[0].dc).to.equal('PMP');
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[1].ps[0].l1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
@@ -621,9 +701,11 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
     });
 
     it('Logger: currency conversion check', function() {
+      setUANull();
       setConfig({
         adServerCurrency: 'JPY',
         rates: {
@@ -651,13 +733,14 @@ describe('pubmatic analytics adapter', function () {
       clock.tick(2000 + 1000);
       expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
       let request = requests[2]; // logger is executed late, trackers execute first
-      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999&gdEn=1');
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
       expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bc).to.equal('pubmatic');
       expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
       expect(data.s[1].ps[0].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
@@ -668,6 +751,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].di).to.equal('the-deal-id');
       expect(data.s[1].ps[0].dc).to.equal('PMP');
       expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
       expect(data.s[1].ps[0].l1).to.equal(3214);
       expect(data.s[1].ps[0].l2).to.equal(0);
       expect(data.s[1].ps[0].ss).to.equal(1);
@@ -676,6 +760,463 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(100);
       expect(data.s[1].ps[0].ocry).to.equal('JPY');
+      expect(data.dvc).to.deep.equal({'plt': 3});
+    });
+
+    it('Logger: regexPattern in bid.params', function() {
+      setUAMobile();
+      const BID_REQUESTED_COPY = utils.deepClone(MOCK.BID_REQUESTED);
+      BID_REQUESTED_COPY.bids[1].params.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, BID_REQUESTED_COPY);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, BID2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
+      let request = requests[2]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].ps).to.be.an('array');
+      expect(data.s[1].ps.length).to.equal(1);
+      expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
+      expect(data.s[1].ps[0].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      expect(data.s[1].ps[0].dc).to.equal('PMP');
+      expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
+      expect(data.s[1].ps[0].l1).to.equal(3214);
+      expect(data.s[1].ps[0].l2).to.equal(0);
+      expect(data.s[1].ps[0].ss).to.equal(1);
+      expect(data.s[1].ps[0].t).to.equal(0);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      expect(data.s[1].ps[0].ocpm).to.equal(1.52);
+      expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
+      expect(data.dvc).to.deep.equal({'plt': 2});
+      // respective tracker slot
+      let firstTracker = requests[1].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      data = {};
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.bidResponse and url in adomain', function() {
+      const BID2_COPY = utils.deepClone(BID2);
+      BID2_COPY.regexPattern = '*';
+      BID2_COPY.meta.advertiserDomains = ['https://www.example.com/abc/223']
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, BID2_COPY);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, Object.assign({}, BID2_COPY, {
+        'status': 'rendered'
+      }));
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
+      let request = requests[2]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].ps).to.be.an('array');
+      expect(data.s[1].ps.length).to.equal(1);
+      expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
+      expect(data.s[1].ps[0].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      expect(data.s[1].ps[0].dc).to.equal('PMP');
+      expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
+      expect(data.s[1].ps[0].l1).to.equal(3214);
+      expect(data.s[1].ps[0].l2).to.equal(0);
+      expect(data.s[1].ps[0].ss).to.equal(1);
+      expect(data.s[1].ps[0].t).to.equal(0);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      expect(data.s[1].ps[0].ocpm).to.equal(1.52);
+      expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.dvc).to.deep.equal({'plt': 1});
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
+      // respective tracker slot
+      let firstTracker = requests[1].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      data = {};
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.params', function() {
+      const BID_REQUESTED_COPY = utils.deepClone(MOCK.BID_REQUESTED);
+      BID_REQUESTED_COPY.bids[1].params.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, BID_REQUESTED_COPY);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, BID2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
+      let request = requests[2]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].ps).to.be.an('array');
+      expect(data.s[1].ps.length).to.equal(1);
+      expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
+      expect(data.s[1].ps[0].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      expect(data.s[1].ps[0].dc).to.equal('PMP');
+      expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
+      expect(data.s[1].ps[0].l1).to.equal(3214);
+      expect(data.s[1].ps[0].l2).to.equal(0);
+      expect(data.s[1].ps[0].ss).to.equal(1);
+      expect(data.s[1].ps[0].t).to.equal(0);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      expect(data.s[1].ps[0].ocpm).to.equal(1.52);
+      expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
+      // respective tracker slot
+      let firstTracker = requests[1].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      data = {};
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.bidResponse', function() {
+      const BID2_COPY = utils.deepClone(BID2);
+      BID2_COPY.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, BID2_COPY);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, Object.assign({}, BID2_COPY, {
+        'status': 'rendered'
+      }));
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
+      let request = requests[2]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].ps).to.be.an('array');
+      expect(data.s[1].ps.length).to.equal(1);
+      expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
+      expect(data.s[1].ps[0].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      expect(data.s[1].ps[0].dc).to.equal('PMP');
+      expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
+      expect(data.s[1].ps[0].l1).to.equal(3214);
+      expect(data.s[1].ps[0].l2).to.equal(0);
+      expect(data.s[1].ps[0].ss).to.equal(1);
+      expect(data.s[1].ps[0].t).to.equal(0);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      expect(data.s[1].ps[0].ocpm).to.equal(1.52);
+      expect(data.s[1].ps[0].ocry).to.equal('USD');
+      // respective tracker slot
+      let firstTracker = requests[1].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      data = {};
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.kgpv).to.equal('*');
+    });
+
+    it('Logger: best case + win tracker in case of Bidder Aliases', function() {
+      MOCK.BID_REQUESTED['bids'][0]['bidder'] = 'pubmatic_alias';
+      MOCK.BID_REQUESTED['bids'][0]['bidderCode'] = 'pubmatic_alias';
+      adapterManager.aliasRegistry['pubmatic_alias'] = 'pubmatic';
+
+      sandbox.stub($$PREBID_GLOBAL$$, 'getHighestCpmBids').callsFake((key) => {
+        return [MOCK.BID_RESPONSE[0], MOCK.BID_RESPONSE[1]]
+      });
+
+      config.setConfig({
+        testGroupId: 15
+      });
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
+      let request = requests[2]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.pubid).to.equal('9999');
+      expect(data.pid).to.equal('1111');
+      expect(data.pdvid).to.equal('20');
+      expect(data.iid).to.equal('25c6d7f5-699a-4bfc-87c9-996f915341fa');
+      expect(data.to).to.equal('3000');
+      expect(data.purl).to.equal('http://www.test.com/page.html');
+      expect(data.orig).to.equal('www.test.com');
+      expect(data.tst).to.equal(1519767016);
+      expect(data.tgid).to.equal(15);
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
+      expect(data.s).to.be.an('array');
+      expect(data.s.length).to.equal(2);
+
+      // slot 1
+      expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
+      expect(data.s[0].sz).to.deep.equal(['640x480']);
+      expect(data.s[0].ps).to.be.an('array');
+      expect(data.s[0].ps.length).to.equal(1);
+      expect(data.s[0].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic_alias');
+      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
+      expect(data.s[0].ps[0].piid).to.equal('partnerImpressionID-1');
+      expect(data.s[0].ps[0].db).to.equal(0);
+      expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].ps[0].kgpsv).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].ps[0].psz).to.equal('640x480');
+      expect(data.s[0].ps[0].eg).to.equal(1.23);
+      expect(data.s[0].ps[0].en).to.equal(1.23);
+      expect(data.s[0].ps[0].di).to.equal('');
+      expect(data.s[0].ps[0].dc).to.equal('');
+      expect(data.s[0].ps[0].l1).to.equal(3214);
+      expect(data.s[0].ps[0].l2).to.equal(0);
+      expect(data.s[0].ps[0].ss).to.equal(0);
+      expect(data.s[0].ps[0].t).to.equal(0);
+      expect(data.s[0].ps[0].wb).to.equal(1);
+      expect(data.s[0].ps[0].af).to.equal('video');
+      expect(data.s[0].ps[0].ocpm).to.equal(1.23);
+      expect(data.s[0].ps[0].ocry).to.equal('USD');
+      expect(data.s[0].ps[0].frv).to.equal(1.1);
+
+      // slot 2
+      expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].ps).to.be.an('array');
+      expect(data.s[1].ps.length).to.equal(1);
+      expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
+      expect(data.s[1].ps[0].piid).to.equal('partnerImpressionID-2');
+      expect(data.s[1].ps[0].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      expect(data.s[1].ps[0].dc).to.equal('PMP');
+      expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
+      expect(data.s[1].ps[0].l1).to.equal(3214);
+      expect(data.s[1].ps[0].l2).to.equal(0);
+      expect(data.s[1].ps[0].ss).to.equal(1);
+      expect(data.s[1].ps[0].t).to.equal(0);
+      expect(data.s[1].ps[0].wb).to.equal(1);
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      expect(data.s[1].ps[0].ocpm).to.equal(1.52);
+      expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
+
+      // tracker slot1
+      let firstTracker = requests[0].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      data = {};
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.pubid).to.equal('9999');
+      expect(decodeURIComponent(data.purl)).to.equal('http://www.test.com/page.html');
+      expect(data.tst).to.equal('1519767014');
+      expect(data.iid).to.equal('25c6d7f5-699a-4bfc-87c9-996f915341fa');
+      expect(data.bidid).to.equal('2ecff0db240757');
+      expect(data.pid).to.equal('1111');
+      expect(data.pdvid).to.equal('20');
+      expect(decodeURIComponent(data.slot)).to.equal('/19968336/header-bid-tag-0');
+      expect(decodeURIComponent(data.kgpv)).to.equal('/19968336/header-bid-tag-0');
+      expect(data.pn).to.equal('pubmatic');
+      expect(data.bc).to.equal('pubmatic_alias');
+      expect(data.eg).to.equal('1.23');
+      expect(data.en).to.equal('1.23');
+      expect(data.piid).to.equal('partnerImpressionID-1');
+    });
+
+    it('Logger: best case + win tracker in case of GroupM as alternate bidder', function() {
+      MOCK.BID_REQUESTED['bids'][0]['bidderCode'] = 'groupm';
+      sandbox.stub($$PREBID_GLOBAL$$, 'getHighestCpmBids').callsFake((key) => {
+        return [MOCK.BID_RESPONSE[0], MOCK.BID_RESPONSE[1]]
+      });
+
+      config.setConfig({
+        testGroupId: 15
+      });
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      clock.tick(2000 + 1000);
+      expect(requests.length).to.equal(3); // 1 logger and 2 win-tracker
+      let request = requests[2]; // logger is executed late, trackers execute first
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
+      let data = getLoggerJsonFromRequest(request.requestBody);
+      expect(data.pubid).to.equal('9999');
+      expect(data.pid).to.equal('1111');
+      expect(data.pdvid).to.equal('20');
+      expect(data.iid).to.equal('25c6d7f5-699a-4bfc-87c9-996f915341fa');
+      expect(data.to).to.equal('3000');
+      expect(data.purl).to.equal('http://www.test.com/page.html');
+      expect(data.orig).to.equal('www.test.com');
+      expect(data.tst).to.equal(1519767016);
+      expect(data.tgid).to.equal(15);
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
+      expect(data.s).to.be.an('array');
+      expect(data.s.length).to.equal(2);
+
+      // slot 1
+      expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
+      expect(data.s[0].sz).to.deep.equal(['640x480']);
+      expect(data.s[0].ps).to.be.an('array');
+      expect(data.s[0].ps.length).to.equal(1);
+      expect(data.s[0].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bc).to.equal('groupm');
+      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
+      expect(data.s[0].ps[0].piid).to.equal('partnerImpressionID-1');
+      expect(data.s[0].ps[0].db).to.equal(0);
+      expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].ps[0].kgpsv).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].ps[0].psz).to.equal('640x480');
+      expect(data.s[0].ps[0].eg).to.equal(1.23);
+      expect(data.s[0].ps[0].en).to.equal(1.23);
+      expect(data.s[0].ps[0].di).to.equal('');
+      expect(data.s[0].ps[0].dc).to.equal('');
+      expect(data.s[0].ps[0].l1).to.equal(3214);
+      expect(data.s[0].ps[0].l2).to.equal(0);
+      expect(data.s[0].ps[0].ss).to.equal(0);
+      expect(data.s[0].ps[0].t).to.equal(0);
+      expect(data.s[0].ps[0].wb).to.equal(1);
+      expect(data.s[0].ps[0].af).to.equal('video');
+      expect(data.s[0].ps[0].ocpm).to.equal(1.23);
+      expect(data.s[0].ps[0].ocry).to.equal('USD');
+      expect(data.s[0].ps[0].frv).to.equal(1.1);
+
+      // slot 2
+      expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].ps).to.be.an('array');
+      expect(data.s[1].ps.length).to.equal(1);
+      expect(data.s[1].ps[0].pn).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[1].ps[0].bidid).to.equal('3bd4ebb1c900e2');
+      expect(data.s[1].ps[0].piid).to.equal('partnerImpressionID-2');
+      expect(data.s[1].ps[0].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      expect(data.s[1].ps[0].dc).to.equal('PMP');
+      expect(data.s[1].ps[0].mi).to.equal('matched-impression');
+      expect(data.s[1].ps[0].adv).to.equal('example.com');
+      expect(data.s[1].ps[0].l1).to.equal(3214);
+      expect(data.s[1].ps[0].l2).to.equal(0);
+      expect(data.s[1].ps[0].ss).to.equal(1);
+      expect(data.s[1].ps[0].t).to.equal(0);
+      expect(data.s[1].ps[0].wb).to.equal(1);
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      expect(data.s[1].ps[0].ocpm).to.equal(1.52);
+      expect(data.s[1].ps[0].ocry).to.equal('USD');
+
+      // tracker slot1
+      let firstTracker = requests[0].url;
+      expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
+      data = {};
+      firstTracker.split('?')[1].split('&').map(e => e.split('=')).forEach(e => data[e[0]] = e[1]);
+      expect(data.pubid).to.equal('9999');
+      expect(decodeURIComponent(data.purl)).to.equal('http://www.test.com/page.html');
+      expect(data.tst).to.equal('1519767014');
+      expect(data.iid).to.equal('25c6d7f5-699a-4bfc-87c9-996f915341fa');
+      expect(data.bidid).to.equal('2ecff0db240757');
+      expect(data.pid).to.equal('1111');
+      expect(data.pdvid).to.equal('20');
+      expect(decodeURIComponent(data.slot)).to.equal('/19968336/header-bid-tag-0');
+      expect(decodeURIComponent(data.kgpv)).to.equal('/19968336/header-bid-tag-0');
+      expect(data.pn).to.equal('pubmatic');
+      expect(data.bc).to.equal('groupm');
+      expect(data.eg).to.equal('1.23');
+      expect(data.en).to.equal('1.23');
+      expect(data.piid).to.equal('partnerImpressionID-1');
     });
   });
 });
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 7a33df6fdfa..6b240cb2d06 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1,8 +1,9 @@
-import {expect} from 'chai';
-import {spec} from 'modules/pubmaticBidAdapter.js';
+import { expect } from 'chai';
+import { spec, checkVideoPlacement, _getDomainFromURL, assignDealTier } from 'modules/pubmaticBidAdapter.js';
 import * as utils from 'src/utils.js';
-import {config} from 'src/config.js';
+import { config } from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
+import { bidderSettings } from 'src/bidderSettings.js';
 const constants = require('src/constants.json');
 
 describe('PubMatic adapter', function () {
@@ -26,6 +27,9 @@ describe('PubMatic adapter', function () {
   let bannerBidResponse;
   let videoBidResponse;
   let schainConfig;
+  let outstreamBidRequest;
+  let validOutstreamBidRequest;
+  let outstreamVideoBidResponse;
 
   beforeEach(function () {
     schainConfig = {
@@ -55,7 +59,7 @@ describe('PubMatic adapter', function () {
           }
         },
         params: {
-          publisherId: '301',
+          publisherId: '5670',
           adSlot: '/15671365/DMDemo@300x250:0',
           kadfloor: '1.2',
     		  pmzoneid: 'aabc, ddef',
@@ -656,7 +660,89 @@ describe('PubMatic adapter', function () {
           }]
         }]
       }
-    }
+    };
+    outstreamBidRequest =
+    [
+      {
+        code: 'video1',
+        mediaTypes: {
+          video: {
+            playerSize: [640, 480],
+            context: 'outstream'
+          }
+        },
+        bidder: 'pubmatic',
+        bidId: '47acc48ad47af5',
+        requestId: '0fb4905b-1234-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+        params: {
+          publisherId: '5670',
+          outstreamAU: 'pubmatic-test',
+          adSlot: 'Div1@0x0', // ad_id or tagid
+          video: {
+            mimes: ['video/mp4', 'video/x-flv'],
+            skippable: true,
+            minduration: 5,
+            maxduration: 30
+          }
+        }
+      }
+    ];
+
+    validOutstreamBidRequest = {
+      auctionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      auctionStart: 1585918458868,
+      bidderCode: 'pubmatic',
+      bidderRequestId: '47acc48ad47af5',
+      bids: [{
+        adUnitCode: 'video1',
+        auctionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+        bidId: '47acc48ad47af5',
+        bidRequestsCount: 1,
+        bidder: 'pubmatic',
+        bidderRequestId: '47acc48ad47af5',
+        mediaTypes: {
+          video: {
+            context: 'outstream'
+          }
+        },
+        params: {
+          publisherId: '5670',
+          outstreamAU: 'pubmatic-test',
+          adSlot: 'Div1@0x0', // ad_id or tagid
+          video: {
+            mimes: ['video/mp4', 'video/x-flv'],
+            skippable: true,
+            minduration: 5,
+            maxduration: 30
+          }
+        },
+        sizes: [[768, 432], [640, 480], [630, 360]],
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+      }],
+      start: 11585918458869,
+      timeout: 3000
+    };
+
+    outstreamVideoBidResponse = {
+      'body': {
+        'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
+        'seatbid': [{
+          'bid': [{
+            'id': '0fb4905b-1234-4152-86be-c6f6d259ba99',
+            'impid': '47acc48ad47af5',
+            'price': 1.3,
+            'adm': '<VAST version="3.0"><Ad id="601364"><InLine><AdSystem>Acudeo Compatible</AdSystem><AdTitle>VAST 2.0 Instream Test 1</AdTitle><Description>VAST 2.0 Instream Test 1</Description><Impression><![CDATA[http://172.16.4.213/AdServer/AdDisplayTrackerServlet?operId=1&pubId=5890&siteId=47163&adId=1405268&adType=13&adServerId=243&kefact=70.000000&kaxefact=70.000000&kadNetFrequecy=0&kadwidth=0&kadheight=0&kadsizeid=97&kltstamp=1529929473&indirectAdId=0&adServerOptimizerId=2&ranreq=0.1&kpbmtpfact=100.000000&dcId=1&tldId=0&passback=0&svr=MADS1107&ekefact=Ad8wW91TCwCmdG0jlfjXn7Tyzh20hnTVx-m5DoNSep-RXGDr&ekaxefact=Ad8wWwRUCwAGir4Zzl1eF0bKiC-qrCV0D0yp_eE7YizB_BQk&ekpbmtpfact=Ad8wWxRUCwD7qgzwwPE2LnS5-Ou19uO5amJl1YT6-XVFvQ41&imprId=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&oid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&crID=creative-1_1_2&ucrid=160175026529250297&campaignId=17050&creativeId=0&pctr=0.000000&wDSPByrId=511&wDspId=6&wbId=0&wrId=0&wAdvID=3170&isRTB=1&rtbId=EBCA079F-8D7C-45B8-B733-92951F670AA1&pmZoneId=zone1&pageURL=www.yahoo.com&lpu=ae.com]]></Impression><Impression>https://dsptracker.com/{PSPM}</Impression><Error><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&er=[ERRORCODE]]]></Error><Error><![CDATA[https://Errortrack.com?p=1234&er=[ERRORCODE]]]></Error><Creatives><Creative AdID="601364"><Linear skipoffset="20%"><TrackingEvents><Tracking event="close"><![CDATA[https://mytracking.com/linear/close]]></Tracking><Tracking event="skip"><![CDATA[https://mytracking.com/linear/skip]]></Tracking><Tracking event="creativeView"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=1]]></Tracking><Tracking event="start"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=2]]></Tracking><Tracking event="midpoint"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=3]]></Tracking><Tracking event="firstQuartile"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=4]]></Tracking><Tracking event="thirdQuartile"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=5]]></Tracking><Tracking event="complete"><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=6]]></Tracking></TrackingEvents><Duration>00:00:04</Duration><VideoClicks><ClickTracking><![CDATA[http://172.16.4.213/track?operId=7&p=5890&s=47163&a=1405268&wa=243&ts=1529929473&wc=17050&crId=creative-1_1_2&ucrid=160175026529250297&impid=48F73E1A-7F23-443D-A53C-30EE6BBF5F7F&advertiser_id=3170&ecpm=70.000000&e=99]]></ClickTracking><ClickThrough>https://www.pubmatic.com</ClickThrough></VideoClicks><MediaFiles><MediaFile delivery="progressive" type="video/mp4" bitrate="500" width="400" height="300" scalable="true" maintainAspectRatio="true"><![CDATA[https://stagingnyc.pubmatic.com:8443/video/Shashank/mediaFileHost/media/mp4-sample-2.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives></InLine></Ad></VAST>',
+            'h': 250,
+            'w': 300,
+            'ext': {
+              'deal_channel': 6
+            }
+          }]
+        }]
+      }
+    };
   });
 
   describe('implementation', function () {
@@ -706,29 +792,269 @@ describe('PubMatic adapter', function () {
           isValid = spec.isBidRequestValid(validBid);
         expect(isValid).to.equal(true);
       });
+
+      it('should check for context if video is present', function() {
+        let bid = {
+            'bidder': 'pubmatic',
+            'params': {
+              'adSlot': 'SLOT_NHB1@728x90',
+              'publisherId': '5890'
+            },
+            'mediaTypes': {
+              'video': {
+                'playerSize': [
+                  [640, 480]
+                ],
+                'protocols': [1, 2, 5],
+                'context': 'instream',
+                'mimes': ['video/flv'],
+                'skippable': false,
+                'skip': 1,
+                'linearity': 2
+              }
+            },
+            'adUnitCode': 'video1',
+            'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+            'sizes': [
+              [640, 480]
+            ],
+            'bidId': '2c95df014cfe97',
+            'bidderRequestId': '1fe59391566442',
+            'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          },
+          isValid = spec.isBidRequestValid(bid);
+        expect(isValid).to.equal(true);
+      })
+
+      it('should return false if context is not present in video', function() {
+        let bid = {
+            'bidder': 'pubmatic',
+            'params': {
+              'adSlot': 'SLOT_NHB1@728x90',
+              'publisherId': '5890'
+            },
+            'mediaTypes': {
+              'video': {
+                'w': 640,
+                'h': 480,
+                'protocols': [1, 2, 5],
+                'mimes': ['video/flv'],
+                'skippable': false,
+                'skip': 1,
+                'linearity': 2
+              }
+            },
+            'adUnitCode': 'video1',
+            'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+            'sizes': [
+              [640, 480]
+            ],
+            'bidId': '2c95df014cfe97',
+            'bidderRequestId': '1fe59391566442',
+            'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          },
+          isValid = spec.isBidRequestValid(bid);
+        expect(isValid).to.equal(false);
+      })
+
+      it('bid.mediaTypes.video.mimes OR bid.params.video.mimes should be present and must be a non-empty array', function() {
+        let bid = {
+          'bidder': 'pubmatic',
+          'params': {
+            'adSlot': 'SLOT_NHB1@728x90',
+            'publisherId': '5890',
+            'video': {}
+          },
+          'mediaTypes': {
+            'video': {
+              'playerSize': [
+                [640, 480]
+              ],
+              'protocols': [1, 2, 5],
+              'context': 'instream',
+              'skippable': false,
+              'skip': 1,
+              'linearity': 2
+            }
+          },
+          'adUnitCode': 'video1',
+          'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+          'sizes': [
+            [640, 480]
+          ],
+          'bidId': '2c95df014cfe97',
+          'bidderRequestId': '1fe59391566442',
+          'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0
+        };
+
+        delete bid.params.video.mimes; // Undefined
+        bid.mediaTypes.video.mimes = 'string'; // NOT array
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+        delete bid.params.video.mimes; // Undefined
+        delete bid.mediaTypes.video.mimes; // Undefined
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+        delete bid.params.video.mimes; // Undefined
+        bid.mediaTypes.video.mimes = ['video/flv']; // Valid
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+        delete bid.mediaTypes.video.mimes; // mediaTypes.video.mimes undefined
+        bid.params.video = {mimes: 'string'}; // NOT array
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+        delete bid.mediaTypes.video.mimes; // mediaTypes.video.mimes undefined
+        delete bid.params.video.mimes; // Undefined
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+        delete bid.mediaTypes.video.mimes; // mediaTypes.video.mimes undefined
+        bid.params.video.mimes = ['video/flv']; // Valid
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+        delete bid.mediaTypes.video.mimes; // Undefined
+        bid.params.video.mimes = ['video/flv']; // Valid
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+        delete bid.mediaTypes.video.mimes; // Undefined
+        delete bid.params.video.mimes; // Undefined
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('checks on bid.params.outstreamAU & bid.renderer & bid.mediaTypes.video.renderer', function() {
+        const getThebid = function() {
+          let bid = utils.deepClone(validOutstreamBidRequest.bids[0]);
+          bid.params.outstreamAU = 'pubmatic-test';
+          bid.renderer = ' '; // we are only checking if this key is set or not
+          bid.mediaTypes.video.renderer = ' '; // we are only checking if this key is set or not
+          return bid;
+        }
+
+        // true: when all are present
+        // mdiatype: outstream
+        // bid.params.outstreamAU : Y
+        // bid.renderer : Y
+        // bid.mediaTypes.video.renderer : Y
+        let bid = getThebid();
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+        // true: atleast one is present; 3 cases
+        // mdiatype: outstream
+        // bid.params.outstreamAU : Y
+        // bid.renderer : N
+        // bid.mediaTypes.video.renderer : N
+        bid = getThebid();
+        delete bid.renderer;
+        delete bid.mediaTypes.video.renderer;
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+        // true: atleast one is present; 3 cases
+        // mdiatype: outstream
+        // bid.params.outstreamAU : N
+        // bid.renderer : Y
+        // bid.mediaTypes.video.renderer : N
+        bid = getThebid();
+        delete bid.params.outstreamAU;
+        delete bid.mediaTypes.video.renderer;
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+        // true: atleast one is present; 3 cases
+        // mdiatype: outstream
+        // bid.params.outstreamAU : N
+        // bid.renderer : N
+        // bid.mediaTypes.video.renderer : Y
+        bid = getThebid();
+        delete bid.params.outstreamAU;
+        delete bid.renderer;
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+        // false: none present; only outstream
+        // mdiatype: outstream
+        // bid.params.outstreamAU : N
+        // bid.renderer : N
+        // bid.mediaTypes.video.renderer : N
+        bid = getThebid();
+        delete bid.params.outstreamAU;
+        delete bid.renderer;
+        delete bid.mediaTypes.video.renderer;
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+        // true: none present; outstream + Banner
+        // mdiatype: outstream, banner
+        // bid.params.outstreamAU : N
+        // bid.renderer : N
+        // bid.mediaTypes.video.renderer : N
+        bid = getThebid();
+        delete bid.params.outstreamAU;
+        delete bid.renderer;
+        delete bid.mediaTypes.video.renderer;
+        bid.mediaTypes.banner = {sizes: [ [300, 250], [300, 600] ]};
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+        // true: none present; outstream + Native
+        // mdiatype: outstream, native
+        // bid.params.outstreamAU : N
+        // bid.renderer : N
+        // bid.mediaTypes.video.renderer : N
+        bid = getThebid();
+        delete bid.params.outstreamAU;
+        delete bid.renderer;
+        delete bid.mediaTypes.video.renderer;
+        bid.mediaTypes.native = {}
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
     });
 
   	describe('Request formation', function () {
   		it('buildRequests function should not modify original bidRequests object', function () {
         let originalBidRequests = utils.deepClone(bidRequests);
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         expect(bidRequests).to.deep.equal(originalBidRequests);
       });
 
       it('buildRequests function should not modify original nativebidRequests object', function () {
         let originalBidRequests = utils.deepClone(nativeBidRequests);
-        let request = spec.buildRequests(nativeBidRequests);
+        let request = spec.buildRequests(nativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         expect(nativeBidRequests).to.deep.equal(originalBidRequests);
       });
 
       it('Endpoint checking', function () {
-  		  let request = spec.buildRequests(bidRequests);
+  		  let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         expect(request.url).to.equal('https://hbopenbid.pubmatic.com/translator?source=prebid-client');
         expect(request.method).to.equal('POST');
-  		});
+      });
 
-      it('test flag not sent when pubmaticTest=true is absent in page url', function() {
+      it('should return bidderRequest property', function() {
+        let request = spec.buildRequests(bidRequests, validOutstreamBidRequest);
+        expect(request.bidderRequest).to.equal(validOutstreamBidRequest);
+      });
+
+      it('bidderRequest should be undefined if bidderRequest is not present', function() {
         let request = spec.buildRequests(bidRequests);
+        expect(request.bidderRequest).to.be.undefined;
+      });
+
+      it('test flag not sent when pubmaticTest=true is absent in page url', function() {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.test).to.equal(undefined);
       });
@@ -738,21 +1064,23 @@ describe('PubMatic adapter', function () {
       xit('test flag set to 1 when pubmaticTest=true is present in page url', function() {
         window.location.href += '#pubmaticTest=true';
         // now all the test cases below will have window.location.href with #pubmaticTest=true
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.test).to.equal(1);
       });
 
   		it('Request params check', function () {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
   		  expect(data.at).to.equal(1); // auction type
   		  expect(data.cur[0]).to.equal('USD'); // currency
   		  expect(data.site.domain).to.be.a('string'); // domain should be set
   		  expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
   		  expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
-        expect(data.site.ext).to.exist.and.to.be.an('object'); // dctr parameter
-        expect(data.site.ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
   		  expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
   		  expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
   		  expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
@@ -772,10 +1100,102 @@ describe('PubMatic adapter', function () {
   		  expect(data.imp[0].banner.w).to.equal(300); // width
   		  expect(data.imp[0].banner.h).to.equal(250); // height
   		  expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
+        expect(data.imp[0].ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
         expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+        expect(data.ext.epoch).to.exist;
   		});
 
+      it('Set tmax from global config if not set by requestBids method', function() {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake((key) => {
+			  var config = {
+            bidderTimeout: 3000
+			  };
+			  return config[key];
+        });
+        let request = spec.buildRequests(bidRequests, {
+			  auctionId: 'new-auction-id', timeout: 3000
+        });
+        let data = JSON.parse(request.data);
+        expect(data.tmax).to.deep.equal(3000);
+        sandbox.restore();
+      });
+      describe('Marketplace parameters', function() {
+        let bidderSettingStub;
+        beforeEach(function() {
+          bidderSettingStub = sinon.stub(bidderSettings, 'get');
+        });
+
+        afterEach(function() {
+          bidderSettingStub.restore();
+        });
+
+        it('should not be present when allowAlternateBidderCodes is undefined', function () {
+          bidderSettingStub.returns(undefined);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.ext.marketplace).to.equal(undefined);
+        });
+
+        it('should be pubmatic and groupm when allowedAlternateBidderCodes is \'groupm\'', function () {
+          bidderSettingStub.withArgs('pubmatic', 'allowAlternateBidderCodes').returns(true);
+          bidderSettingStub.withArgs('pubmatic', 'allowedAlternateBidderCodes').returns(['groupm']);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id',
+            bidderCode: 'pubmatic'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.ext.marketplace.allowedbidders).to.be.an('array');
+          expect(data.ext.marketplace.allowedbidders.length).to.equal(2);
+          expect(data.ext.marketplace.allowedbidders[0]).to.equal('pubmatic');
+          expect(data.ext.marketplace.allowedbidders[1]).to.equal('groupm');
+        });
+
+        it('should be ALL by default', function () {
+          bidderSettingStub.returns(true);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.ext.marketplace.allowedbidders).to.be.an('array');
+          expect(data.ext.marketplace.allowedbidders[0]).to.equal('all');
+        });
+
+        it('should be ALL when allowedAlternateBidderCodes is \'*\'', function () {
+          bidderSettingStub.withArgs('pubmatic', 'allowAlternateBidderCodes').returns(true);
+          bidderSettingStub.withArgs('pubmatic', 'allowedAlternateBidderCodes').returns(['*']);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id',
+            bidderCode: 'pubmatic'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.ext.marketplace.allowedbidders).to.be.an('array');
+          expect(data.ext.marketplace.allowedbidders[0]).to.equal('all');
+        });
+      })
+
+      it('Set content from config, set site.content', function() {
+        let sandbox = sinon.sandbox.create();
+        const content = {
+          'id': 'alpha-numeric-id'
+        };
+        sandbox.stub(config, 'getConfig').callsFake((key) => {
+          var config = {
+            content: content
+          };
+          return config[key];
+        });
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.site.content).to.deep.equal(content);
+        sandbox.restore();
+      });
+
       it('Merge the device info from config', function() {
         let sandbox = sinon.sandbox.create();
         sandbox.stub(config, 'getConfig').callsFake((key) => {
@@ -786,13 +1206,15 @@ describe('PubMatic adapter', function () {
           };
           return config[key];
         });
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.device.js).to.equal(1);
         expect(data.device.dnt).to.equal((navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0);
         expect(data.device.h).to.equal(screen.height);
         expect(data.device.w).to.equal(screen.width);
-        expect(data.device.language).to.equal(navigator.language);
+        expect(data.device.language).to.equal(navigator.language.split('-')[0]);
         expect(data.device.newkey).to.equal('new-device-data');// additional data from config
         sandbox.restore();
       });
@@ -808,7 +1230,9 @@ describe('PubMatic adapter', function () {
           };
           return config[key];
         });
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.device.js).to.equal(1);
         expect(data.device.dnt).to.equal((navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0);
@@ -830,27 +1254,86 @@ describe('PubMatic adapter', function () {
           };
           return config[key];
         });
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.app.bundle).to.equal('org.prebid.mobile.demoapp');
         expect(data.app.domain).to.equal('prebid.org');
         expect(data.app.publisher.id).to.equal(bidRequests[0].params.publisherId);
-        expect(data.app.ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
+        expect(data.site).to.not.exist;
+        sandbox.restore();
+      });
+
+      it('Set app, content from config, copy publisher and ext from site, unset site, config.content in app.content', function() {
+        let sandbox = sinon.sandbox.create();
+        const content = {
+          'id': 'alpha-numeric-id'
+        };
+        sandbox.stub(config, 'getConfig').callsFake((key) => {
+          var config = {
+            content: content,
+            app: {
+              bundle: 'org.prebid.mobile.demoapp',
+              domain: 'prebid.org'
+            }
+          };
+          return config[key];
+        });
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.app.bundle).to.equal('org.prebid.mobile.demoapp');
+        expect(data.app.domain).to.equal('prebid.org');
+        expect(data.app.publisher.id).to.equal(bidRequests[0].params.publisherId);
+        expect(data.app.content).to.deep.equal(content);
+        expect(data.site).to.not.exist;
+        sandbox.restore();
+      });
+
+      it('Set app.content, content from config, copy publisher and ext from site, unset site, config.app.content in app.content', function() {
+        let sandbox = sinon.sandbox.create();
+        const content = {
+          'id': 'alpha-numeric-id'
+        };
+        const appContent = {
+          id: 'app-content-id-2'
+        };
+        sandbox.stub(config, 'getConfig').callsFake((key) => {
+          var config = {
+            content: content,
+            app: {
+              bundle: 'org.prebid.mobile.demoapp',
+              domain: 'prebid.org',
+              content: appContent
+            }
+          };
+          return config[key];
+        });
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.app.bundle).to.equal('org.prebid.mobile.demoapp');
+        expect(data.app.domain).to.equal('prebid.org');
+        expect(data.app.publisher.id).to.equal(bidRequests[0].params.publisherId);
+        expect(data.app.content).to.deep.equal(appContent);
         expect(data.site).to.not.exist;
         sandbox.restore();
       });
 
       it('Request params check: without adSlot', function () {
         delete bidRequests[0].params.adSlot;
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.at).to.equal(1); // auction type
         expect(data.cur[0]).to.equal('USD'); // currency
         expect(data.site.domain).to.be.a('string'); // domain should be set
         expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
         expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
-        expect(data.site.ext).to.exist.and.to.be.an('object'); // dctr parameter
-        expect(data.site.ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
         expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
         expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
         expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
@@ -869,6 +1352,7 @@ describe('PubMatic adapter', function () {
         expect(data.imp[0].banner.w).to.equal(728); // width
         expect(data.imp[0].banner.h).to.equal(90); // height
         expect(data.imp[0].banner.format).to.deep.equal([{w: 160, h: 600}]);
+        expect(data.imp[0].ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
         expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
       });
@@ -900,7 +1384,9 @@ describe('PubMatic adapter', function () {
           }
         ];
         /* case 1 - size passed in adslot */
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
 
         expect(data.imp[0].banner.w).to.equal(300); // width
@@ -913,7 +1399,9 @@ describe('PubMatic adapter', function () {
             sizes: [[300, 600], [300, 250]]
           }
         };
-        request = spec.buildRequests(bidRequests);
+        request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
 
         expect(data.imp[0].banner.w).to.equal(300); // width
@@ -927,7 +1415,9 @@ describe('PubMatic adapter', function () {
             sizes: [[300, 250], [300, 600]]
           }
         };
-        request = spec.buildRequests(bidRequests);
+        request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
 
         expect(data.imp[0].banner.w).to.equal(300); // width
@@ -995,7 +1485,9 @@ describe('PubMatic adapter', function () {
             output: imp[0] and imp[1] both use currency specified in bidRequests[0].params.currency
 
         */
-        let request = spec.buildRequests(multipleBidRequests);
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
 
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
@@ -1007,7 +1499,9 @@ describe('PubMatic adapter', function () {
 
         */
         delete multipleBidRequests[1].params.currency;
-        request = spec.buildRequests(multipleBidRequests);
+        request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
         expect(data.imp[1].bidfloorcur).to.equal(bidRequests[0].params.currency);
@@ -1018,7 +1512,9 @@ describe('PubMatic adapter', function () {
 
         */
         delete multipleBidRequests[0].params.currency;
-        request = spec.buildRequests(multipleBidRequests);
+        request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
         expect(data.imp[0].bidfloorcur).to.equal('USD');
         expect(data.imp[1].bidfloorcur).to.equal('USD');
@@ -1029,12 +1525,46 @@ describe('PubMatic adapter', function () {
 
         */
         multipleBidRequests[1].params.currency = 'AUD';
-        request = spec.buildRequests(multipleBidRequests);
+        request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
         expect(data.imp[0].bidfloorcur).to.equal('USD');
         expect(data.imp[1].bidfloorcur).to.equal('USD');
       });
 
+      it('Pass auctiondId as wiid if wiid is not passed in params', function () {
+        let bidRequest = {
+          auctionId: 'new-auction-id'
+        };
+        delete bidRequests[0].params.wiid;
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.at).to.equal(1); // auction type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
+        expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
+        expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+        expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+        expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+        expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+        expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.ext.wrapper.wiid).to.equal('new-auction-id'); // OpenWrap: Wrapper Impression ID
+        expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
+        expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
+
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
+        expect(data.imp[0].bidfloor).to.equal(parseFloat(bidRequests[0].params.kadfloor)); // kadfloor
+        expect(data.imp[0].tagid).to.equal('/15671365/DMDemo'); // tagid
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
+      });
+
       it('Request params check with GDPR Consent', function () {
         let bidRequest = {
           gdprConsent: {
@@ -1108,6 +1638,312 @@ describe('PubMatic adapter', function () {
         expect(data2.regs).to.equal(undefined);// USP/CCPAs
       });
 
+      it('Request params check with JW player params', function() {
+        let bidRequests = [
+          {
+            bidder: 'pubmatic',
+            params: {
+              publisherId: '301',
+              adSlot: '/15671365/DMDemo@300x250:0',
+              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',
+            rtd: {
+              jwplayer: {
+                targeting: {
+                  content: { id: 'jw_d9J2zcaA' },
+                  segments: ['80011026', '80011035']
+                }
+              }
+            }
+          }];
+        let key_val_output = 'key1=val1|key2=val2,val3|jw-id=jw_d9J2zcaA|jw-80011026=1|jw-80011035=1'
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.imp[0].ext).to.exist.and.to.be.an('object');
+        expect(data.imp[0].ext.key_val).to.exist.and.to.equal(key_val_output);
+
+        // jw player data not available. Only dctr sent.
+        delete bidRequests[0].rtd;
+        request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        data = JSON.parse(request.data);
+
+        expect(data.imp[0].ext).to.exist.and.to.be.an('object'); // dctr parameter
+        expect(data.imp[0].ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
+
+        // jw player data is available, but dctr is not present
+        bidRequests[0].rtd = {
+          jwplayer: {
+            targeting: {
+              content: { id: 'jw_d9J2zcaA' },
+              segments: ['80011026', '80011035']
+            }
+          }
+        };
+
+        delete bidRequests[0].params.dctr;
+        key_val_output = 'jw-id=jw_d9J2zcaA|jw-80011026=1|jw-80011035=1';
+        request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        data = JSON.parse(request.data);
+
+        expect(data.imp[0].ext).to.exist.and.to.be.an('object');
+        expect(data.imp[0].ext.key_val).to.exist.and.to.equal(key_val_output);
+      });
+
+      describe('FPD', function() {
+        let newRequest;
+
+        describe('ortb2.site should not override page, domain & ref values', function() {
+          it('When above properties are present in ortb2.site', function() {
+            const ortb2 = {
+              site: {
+                domain: 'page.example.com',
+                page: 'https://page.example.com/here.html',
+                ref: 'https://page.example.com/here.html'
+              }
+            };
+            const request = spec.buildRequests(bidRequests, {ortb2});
+            let data = JSON.parse(request.data);
+            expect(data.site.domain).not.equal('page.example.com');
+            expect(data.site.page).not.equal('https://page.example.com/here.html');
+            expect(data.site.ref).not.equal('https://page.example.com/here.html');
+          });
+
+          it('When above properties are absent in ortb2.site', function () {
+            const ortb2 = {
+              site: {}
+            };
+            let request = spec.buildRequests(bidRequests, {
+              auctionId: 'new-auction-id',
+              ortb2
+            });
+            let data = JSON.parse(request.data);
+            let response = spec.interpretResponse(bidResponses, request);
+            expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl);
+            expect(data.site.domain).to.equal(_getDomainFromURL(data.site.page));
+            expect(response[0].referrer).to.equal(data.site.ref);
+          });
+
+          it('With some extra properties in ortb2.site', function() {
+            const ortb2 = {
+              site: {
+                domain: 'page.example.com',
+                page: 'https://page.example.com/here.html',
+                ref: 'https://page.example.com/here.html',
+                cat: ['IAB2'],
+                sectioncat: ['IAB2-2']
+              }
+            };
+            const request = spec.buildRequests(bidRequests, {ortb2});
+            let data = JSON.parse(request.data);
+            expect(data.site.domain).not.equal('page.example.com');
+            expect(data.site.page).not.equal('https://page.example.com/here.html');
+            expect(data.site.ref).not.equal('https://page.example.com/here.html');
+            expect(data.site.cat).to.deep.equal(['IAB2']);
+            expect(data.site.sectioncat).to.deep.equal(['IAB2-2']);
+          });
+        });
+
+        it('ortb2.site should be merged except page, domain & ref in the request', function() {
+          const ortb2 = {
+            site: {
+              cat: ['IAB2'],
+              sectioncat: ['IAB2-2']
+            }
+          };
+          const request = spec.buildRequests(bidRequests, {ortb2});
+          let data = JSON.parse(request.data);
+          expect(data.site.cat).to.deep.equal(['IAB2']);
+          expect(data.site.sectioncat).to.deep.equal(['IAB2-2']);
+        });
+
+        it('ortb2.user should be merged in the request', function() {
+          const ortb2 = {
+            user: {
+              yob: 1985
+            }
+          };
+          const request = spec.buildRequests(bidRequests, {ortb2});
+          let data = JSON.parse(request.data);
+          expect(data.user.yob).to.equal(1985);
+        });
+
+        describe('ortb2Imp', function() {
+          describe('ortb2Imp.ext.data.pbadslot', function() {
+            beforeEach(function () {
+              if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                delete bidRequests[0].ortb2Imp;
+              }
+            });
+
+            it('should not send if imp[].ext.data object is invalid', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {}
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.imp[0].ext).to.not.have.property('data');
+            });
+
+            it('should not send if imp[].ext.data.pbadslot is undefined', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              if (data.imp[0].ext.data) {
+                expect(data.imp[0].ext.data).to.not.have.property('pbadslot');
+              } else {
+                expect(data.imp[0].ext).to.not.have.property('data');
+              }
+            });
+
+            it('should not send if imp[].ext.data.pbadslot is empty string', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                    pbadslot: ''
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              if (data.imp[0].ext.data) {
+                expect(data.imp[0].ext.data).to.not.have.property('pbadslot');
+              } else {
+                expect(data.imp[0].ext).to.not.have.property('data');
+              }
+            });
+
+            it('should send if imp[].ext.data.pbadslot is string', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                    pbadslot: 'abcd'
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.imp[0].ext.data).to.have.property('pbadslot');
+              expect(data.imp[0].ext.data.pbadslot).to.equal('abcd');
+            });
+          });
+
+          describe('ortb2Imp.ext.data.adserver', function() {
+            beforeEach(function () {
+              if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                delete bidRequests[0].ortb2Imp;
+              }
+            });
+
+            it('should not send if imp[].ext.data object is invalid', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {}
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.imp[0].ext).to.not.have.property('data');
+            });
+
+            it('should not send if imp[].ext.data.adserver is undefined', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              if (data.imp[0].ext.data) {
+                expect(data.imp[0].ext.data).to.not.have.property('adserver');
+              } else {
+                expect(data.imp[0].ext).to.not.have.property('data');
+              }
+            });
+
+            it('should send', function() {
+              let adSlotValue = 'abc';
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                    adserver: {
+                      name: 'GAM',
+                      adslot: adSlotValue
+                    }
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.imp[0].ext.data.adserver.name).to.equal('GAM');
+              expect(data.imp[0].ext.data.adserver.adslot).to.equal(adSlotValue);
+              expect(data.imp[0].ext.dfp_ad_unit_code).to.equal(adSlotValue);
+            });
+          });
+
+          describe('ortb2Imp.ext.data.other', function() {
+            beforeEach(function () {
+              if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                delete bidRequests[0].ortb2Imp;
+              }
+            });
+
+            it('should not send if imp[].ext.data object is invalid', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {}
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.imp[0].ext).to.not.have.property('data');
+            });
+
+            it('should not send if imp[].ext.data.other is undefined', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              if (data.imp[0].ext.data) {
+                expect(data.imp[0].ext.data).to.not.have.property('other');
+              } else {
+                expect(data.imp[0].ext).to.not.have.property('data');
+              }
+            });
+
+            it('ortb2Imp.ext.data.other', function() {
+              bidRequests[0].ortb2Imp = {
+                ext: {
+                  data: {
+                    other: 1234
+                  }
+                }
+              };
+              const request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.imp[0].ext.data.other).to.equal(1234);
+            });
+          });
+        });
+      });
+
       describe('setting imp.floor using floorModule', function() {
         /*
           Use the minimum value among floor from floorModule per mediaType
@@ -1118,14 +1954,25 @@ describe('PubMatic adapter', function () {
         let newRequest;
         let floorModuleTestData;
         let getFloor = function(req) {
-          return floorModuleTestData[req.mediaType];
+          // actual getFloor module does not work like this :)
+          // special treatment for banner since for other mediaTypes we pass *
+          if (req.mediaType === 'banner') {
+            return floorModuleTestData[req.mediaType][ req.size[0] + 'x' + req.size[1] ] || {};
+          }
+          return floorModuleTestData[req.mediaType] || {};
         };
 
         beforeEach(() => {
           floorModuleTestData = {
             'banner': {
-              'currency': 'USD',
-              'floor': 1.50
+              '300x250': {
+                'currency': 'USD',
+                'floor': 1.50
+              },
+              '300x600': {
+                'currency': 'USD',
+                'floor': 2.0
+              }
             },
             'video': {
               'currency': 'USD',
@@ -1141,27 +1988,35 @@ describe('PubMatic adapter', function () {
         });
 
         it('bidfloor should be undefined if calculation is <= 0', function() {
-          floorModuleTestData.banner.floor = 0; // lowest of them all
+          floorModuleTestData.banner['300x250'].floor = 0; // lowest of them all
           newRequest[0].params.kadfloor = undefined;
-          let request = spec.buildRequests(newRequest);
+          let request = spec.buildRequests(newRequest, {
+            auctionId: 'new-auction-id'
+          });
           let data = JSON.parse(request.data);
           data = data.imp[0];
           expect(data.bidfloor).to.equal(undefined);
         });
 
         it('ignore floormodule o/p if floor is not number', function() {
-          floorModuleTestData.banner.floor = 'INR';
+          floorModuleTestData.banner['300x250'].floor = 'Not-a-Number';
+          floorModuleTestData.banner['300x600'].floor = 'Not-a-Number';
           newRequest[0].params.kadfloor = undefined;
-          let request = spec.buildRequests(newRequest);
+          let request = spec.buildRequests(newRequest, {
+            auctionId: 'new-auction-id'
+          });
           let data = JSON.parse(request.data);
           data = data.imp[0];
           expect(data.bidfloor).to.equal(2.5); // video will be lowest now
         });
 
         it('ignore floormodule o/p if currency is not matched', function() {
-          floorModuleTestData.banner.currency = 'INR';
+          floorModuleTestData.banner['300x250'].currency = 'INR';
+          floorModuleTestData.banner['300x600'].currency = 'INR';
           newRequest[0].params.kadfloor = undefined;
-          let request = spec.buildRequests(newRequest);
+          let request = spec.buildRequests(newRequest, {
+            auctionId: 'new-auction-id'
+          });
           let data = JSON.parse(request.data);
           data = data.imp[0];
           expect(data.bidfloor).to.equal(2.5); // video will be lowest now
@@ -1169,7 +2024,9 @@ describe('PubMatic adapter', function () {
 
         it('kadfloor is not passed, use minimum from floorModule', function() {
           newRequest[0].params.kadfloor = undefined;
-          let request = spec.buildRequests(newRequest);
+          let request = spec.buildRequests(newRequest, {
+            auctionId: 'new-auction-id'
+          });
           let data = JSON.parse(request.data);
           data = data.imp[0];
           expect(data.bidfloor).to.equal(1.5);
@@ -1177,15 +2034,19 @@ describe('PubMatic adapter', function () {
 
         it('kadfloor is passed as 3, use kadfloor as it is highest', function() {
           newRequest[0].params.kadfloor = '3.0';// yes, we want it as a string
-          let request = spec.buildRequests(newRequest);
+          let request = spec.buildRequests(newRequest, {
+            auctionId: 'new-auction-id'
+          });
           let data = JSON.parse(request.data);
           data = data.imp[0];
           expect(data.bidfloor).to.equal(3);
         });
 
-        it('kadfloor is passed as 1, use min of fllorModule as it is highest', function() {
+        it('kadfloor is passed as 1, use min of floorModule as it is highest', function() {
           newRequest[0].params.kadfloor = '1.0';// yes, we want it as a string
-          let request = spec.buildRequests(newRequest);
+          let request = spec.buildRequests(newRequest, {
+            auctionId: 'new-auction-id'
+          });
           let data = JSON.parse(request.data);
           data = data.imp[0];
           expect(data.bidfloor).to.equal(1.5);
@@ -1353,7 +2214,7 @@ describe('PubMatic adapter', function () {
         describe('ID5 Id', function() {
           it('send the id5 id if it is present', function() {
             bidRequests[0].userId = {};
-            bidRequests[0].userId.id5id = 'id5-user-id';
+            bidRequests[0].userId.id5id = { uid: 'id5-user-id' };
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
             let request = spec.buildRequests(bidRequests, {});
             let data = JSON.parse(request.data);
@@ -1368,22 +2229,22 @@ describe('PubMatic adapter', function () {
 
           it('do not pass if not string', function() {
             bidRequests[0].userId = {};
-            bidRequests[0].userId.id5id = 1;
+            bidRequests[0].userId.id5id = { uid: 1 };
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
             let request = spec.buildRequests(bidRequests, {});
             let data = JSON.parse(request.data);
             expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.id5id = [];
+            bidRequests[0].userId.id5id = { uid: [] };
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
             request = spec.buildRequests(bidRequests, {});
             data = JSON.parse(request.data);
             expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.id5id = null;
+            bidRequests[0].userId.id5id = { uid: null };
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
             request = spec.buildRequests(bidRequests, {});
             data = JSON.parse(request.data);
             expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.id5id = {};
+            bidRequests[0].userId.id5id = { uid: {} };
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
             request = spec.buildRequests(bidRequests, {});
             data = JSON.parse(request.data);
@@ -1443,7 +2304,7 @@ describe('PubMatic adapter', function () {
               'source': 'liveramp.com',
               'uids': [{
                 'id': 'identity-link-user-id',
-                'atype': 1
+                'atype': 3
               }]
             }]);
           });
@@ -1484,7 +2345,7 @@ describe('PubMatic adapter', function () {
               'source': 'liveintent.com',
               'uids': [{
                 'id': 'live-intent-user-id',
-                'atype': 1
+                'atype': 3
               }]
             }]);
           });
@@ -1517,7 +2378,7 @@ describe('PubMatic adapter', function () {
         describe('Parrable Id', function() {
           it('send the Parrable id if it is present', function() {
             bidRequests[0].userId = {};
-            bidRequests[0].userId.parrableid = 'parrable-user-id';
+            bidRequests[0].userId.parrableId = { eid: 'parrable-user-id' };
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
             let request = spec.buildRequests(bidRequests, {});
             let data = JSON.parse(request.data);
@@ -1530,7 +2391,7 @@ describe('PubMatic adapter', function () {
             }]);
           });
 
-          it('do not pass if not string', function() {
+          it('do not pass if not object with eid key', function() {
             bidRequests[0].userId = {};
             bidRequests[0].userId.parrableid = 1;
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
@@ -1566,7 +2427,7 @@ describe('PubMatic adapter', function () {
               'source': 'britepool.com',
               'uids': [{
                 'id': 'britepool-user-id',
-                'atype': 1
+                'atype': 3
               }]
             }]);
           });
@@ -1639,11 +2500,12 @@ describe('PubMatic adapter', function () {
       });
 
       it('Request params check for video ad', function () {
-        let request = spec.buildRequests(videoBidRequests);
+        let request = spec.buildRequests(videoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.imp[0].video).to.exist;
         expect(data.imp[0].tagid).to.equal('Div1');
-        expect(data.imp[0].video.ext['video_skippable']).to.equal(videoBidRequests[0].params.video.skippable ? 1 : 0);
         expect(data.imp[0]['video']['mimes']).to.exist.and.to.be.an('array');
         expect(data.imp[0]['video']['mimes'][0]).to.equal(videoBidRequests[0].params.video['mimes'][0]);
         expect(data.imp[0]['video']['mimes'][1]).to.equal(videoBidRequests[0].params.video['mimes'][1]);
@@ -1677,7 +2539,9 @@ describe('PubMatic adapter', function () {
       });
 
       it('Request params check for 1 banner and 1 video ad', function () {
-        let request = spec.buildRequests(multipleMediaRequests);
+        let request = spec.buildRequests(multipleMediaRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
 
         expect(data.imp).to.be.an('array')
@@ -1711,7 +2575,6 @@ describe('PubMatic adapter', function () {
         // video imp object check
         expect(data.imp[1].video).to.exist;
         expect(data.imp[1].tagid).to.equal('Div1');
-        expect(data.imp[1].video.ext['video_skippable']).to.equal(multipleMediaRequests[1].params.video.skippable ? 1 : 0);
         expect(data.imp[1]['video']['mimes']).to.exist.and.to.be.an('array');
         expect(data.imp[1]['video']['mimes'][0]).to.equal(multipleMediaRequests[1].params.video['mimes'][0]);
         expect(data.imp[1]['video']['mimes'][1]).to.equal(multipleMediaRequests[1].params.video['mimes'][1]);
@@ -1745,7 +2608,9 @@ describe('PubMatic adapter', function () {
       });
 
       it('Request params should have valid native bid request for all valid params', function () {
-        let request = spec.buildRequests(nativeBidRequests);
+        let request = spec.buildRequests(nativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.imp[0].native).to.exist;
         expect(data.imp[0].native['request']).to.exist;
@@ -1755,13 +2620,17 @@ describe('PubMatic adapter', function () {
       });
 
       it('Request params should not have valid native bid request for non native request', function () {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.imp[0].native).to.not.exist;
       });
 
       it('Request params should have valid native bid request with valid required param values for all valid params', function () {
-        let request = spec.buildRequests(nativeBidRequestsWithRequiredParam);
+        let request = spec.buildRequests(nativeBidRequestsWithRequiredParam, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.imp[0].native).to.exist;
         expect(data.imp[0].native['request']).to.exist;
@@ -1771,12 +2640,16 @@ describe('PubMatic adapter', function () {
       });
 
       it('should not have valid native request if assets are not defined with minimum required params and only native is the slot', function () {
-        let request = spec.buildRequests(nativeBidRequestsWithoutAsset);
+        let request = spec.buildRequests(nativeBidRequestsWithoutAsset, {
+          auctionId: 'new-auction-id'
+        });
         expect(request).to.deep.equal(undefined);
       });
 
       it('Request params should have valid native bid request for all native params', function () {
-        let request = spec.buildRequests(nativeBidRequestsWithAllParams);
+        let request = spec.buildRequests(nativeBidRequestsWithAllParams, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.imp[0].native).to.exist;
         expect(data.imp[0].native['request']).to.exist;
@@ -1786,7 +2659,9 @@ describe('PubMatic adapter', function () {
       });
 
 	    it('Request params - should handle banner and video format in single adunit', function() {
-        let request = spec.buildRequests(bannerAndVideoBidRequests);
+        let request = spec.buildRequests(bannerAndVideoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
         expect(data.banner).to.exist;
@@ -1797,7 +2672,9 @@ describe('PubMatic adapter', function () {
 
         // Case: when size is not present in adslo
         bannerAndVideoBidRequests[0].params.adSlot = '/15671365/DMDemo';
-        request = spec.buildRequests(bannerAndVideoBidRequests);
+        request = spec.buildRequests(bannerAndVideoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
         data = data.imp[0];
         expect(data.banner).to.exist;
@@ -1819,7 +2696,9 @@ describe('PubMatic adapter', function () {
         */
         bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid'], [160, 600]];
 
-        let request = spec.buildRequests(bannerAndVideoBidRequests);
+        let request = spec.buildRequests(bannerAndVideoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1838,7 +2717,9 @@ describe('PubMatic adapter', function () {
         bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid'], [160, 600]];
         bannerAndVideoBidRequests[0].params.adSlot = '/15671365/DMDemo';
 
-        request = spec.buildRequests(bannerAndVideoBidRequests);
+        request = spec.buildRequests(bannerAndVideoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1856,7 +2737,9 @@ describe('PubMatic adapter', function () {
         */
 
         bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [[728, 90], ['fluid'], [300, 250]];
-        request = spec.buildRequests(bannerAndVideoBidRequests);
+        request = spec.buildRequests(bannerAndVideoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1874,7 +2757,9 @@ describe('PubMatic adapter', function () {
         */
 
         bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid']];
-        request = spec.buildRequests(bannerAndVideoBidRequests);
+        request = spec.buildRequests(bannerAndVideoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1886,14 +2771,18 @@ describe('PubMatic adapter', function () {
         delete bannerAndVideoBidRequests[0].mediaTypes.banner;
         bannerAndVideoBidRequests[0].params.sizes = [300, 250];
 
-        let request = spec.buildRequests(bannerAndVideoBidRequests);
+        let request = spec.buildRequests(bannerAndVideoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
         expect(data.banner).to.not.exist;
       });
 
       it('Request params - should handle banner and native format in single adunit', function() {
-        let request = spec.buildRequests(bannerAndNativeBidRequests);
+        let request = spec.buildRequests(bannerAndNativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1908,7 +2797,9 @@ describe('PubMatic adapter', function () {
       });
 
       it('Request params - should handle video and native format in single adunit', function() {
-        let request = spec.buildRequests(videoAndNativeBidRequests);
+        let request = spec.buildRequests(videoAndNativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1921,7 +2812,9 @@ describe('PubMatic adapter', function () {
       });
 
       it('Request params - should handle banner, video and native format in single adunit', function() {
-        let request = spec.buildRequests(bannerVideoAndNativeBidRequests);
+        let request = spec.buildRequests(bannerVideoAndNativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1943,7 +2836,9 @@ describe('PubMatic adapter', function () {
         delete bannerAndNativeBidRequests[0].mediaTypes.banner;
         bannerAndNativeBidRequests[0].sizes = [729, 90];
 
-        let request = spec.buildRequests(bannerAndNativeBidRequests);
+        let request = spec.buildRequests(bannerAndNativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1966,7 +2861,9 @@ describe('PubMatic adapter', function () {
           sponsoredBy: { required: true },
           clickUrl: { required: true }
         }
-        let request = spec.buildRequests(bannerAndNativeBidRequests);
+        let request = spec.buildRequests(bannerAndNativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
 
@@ -1987,13 +2884,102 @@ describe('PubMatic adapter', function () {
           sponsoredBy: { required: true },
           clickUrl: { required: true }
         }
-        let request = spec.buildRequests(videoAndNativeBidRequests);
+        let request = spec.buildRequests(videoAndNativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data = data.imp[0];
 
         expect(data.video).to.exist;
         expect(data.native).to.not.exist;
       });
+
+      it('should build video impression if video params are present in adunit.mediaTypes instead of bid.params', function() {
+        let videoReq = [{
+          'bidder': 'pubmatic',
+          'params': {
+            'adSlot': 'SLOT_NHB1@728x90',
+            'publisherId': '5890',
+          },
+          'mediaTypes': {
+            'video': {
+              'playerSize': [
+                [640, 480]
+              ],
+              'protocols': [1, 2, 5],
+              'context': 'instream',
+              'mimes': ['video/flv'],
+              'skip': 1,
+              'linearity': 2
+            }
+          },
+          'adUnitCode': 'video1',
+          'transactionId': 'adc36682-887c-41e9-9848-8b72c08332c0',
+          'sizes': [
+            [640, 480]
+          ],
+          'bidId': '21b59b1353ba82',
+          'bidderRequestId': '1a08245305e6dd',
+          'auctionId': 'bad3a743-7491-4d19-9a96-b0a69dd24a67',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0
+        }]
+        let request = spec.buildRequests(videoReq, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        data = data.imp[0];
+        expect(data.video).to.exist;
+      });
+
+      it('should build video impression with overwriting video params present in adunit.mediaTypes with bid.params', function() {
+        let videoReq = [{
+          'bidder': 'pubmatic',
+          'params': {
+            'adSlot': 'SLOT_NHB1@728x90',
+            'publisherId': '5890',
+            'video': {
+              'mimes': ['video/mp4'],
+              'protocols': [1, 2, 5],
+              'linearity': 1
+            }
+          },
+          'mediaTypes': {
+            'video': {
+              'playerSize': [
+                [640, 480]
+              ],
+              'protocols': [1, 2, 5],
+              'context': 'instream',
+              'mimes': ['video/flv'],
+              'skip': 1,
+              'linearity': 2
+            }
+          },
+          'adUnitCode': 'video1',
+          'transactionId': 'adc36682-887c-41e9-9848-8b72c08332c0',
+          'sizes': [
+            [640, 480]
+          ],
+          'bidId': '21b59b1353ba82',
+          'bidderRequestId': '1a08245305e6dd',
+          'auctionId': 'bad3a743-7491-4d19-9a96-b0a69dd24a67',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0
+        }]
+        let request = spec.buildRequests(videoReq, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        data = data.imp[0];
+
+        expect(data.video).to.exist;
+        expect(data.video.linearity).to.equal(1);
+      });
   	});
 
     it('Request params dctr check', function () {
@@ -2003,17 +2989,6 @@ describe('PubMatic adapter', function () {
           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',
@@ -2050,33 +3025,41 @@ describe('PubMatic adapter', function () {
         }
       ];
 
-      let request = spec.buildRequests(multipleBidRequests);
+      let request = spec.buildRequests(multipleBidRequests, {
+        auctionId: 'new-auction-id'
+      });
       let data = JSON.parse(request.data);
 
       /* case 1 -
         dctr is found in adunit[0]
       */
 
-      expect(data.site.ext).to.exist.and.to.be.an('object'); // dctr parameter
-      expect(data.site.ext.key_val).to.exist.and.to.equal(multipleBidRequests[0].params.dctr);
+      expect(data.imp[0].ext).to.exist.and.to.be.an('object'); // dctr parameter
+      expect(data.imp[0].ext.key_val).to.exist.and.to.equal(multipleBidRequests[0].params.dctr);
 
       /* case 2 -
-        dctr not present in adunit[0]
+        dctr not present in adunit[0] but present in adunit[1]
       */
       delete multipleBidRequests[0].params.dctr;
-      request = spec.buildRequests(multipleBidRequests);
+      request = spec.buildRequests(multipleBidRequests, {
+        auctionId: 'new-auction-id'
+      });
       data = JSON.parse(request.data);
 
-      expect(data.site.ext).to.not.exist;
+      expect(data.imp[0].ext).to.exist.and.to.deep.equal({});
+      expect(data.imp[1].ext).to.exist.and.to.be.an('object'); // dctr parameter
+      expect(data.imp[1].ext.key_val).to.exist.and.to.equal(multipleBidRequests[1].params.dctr);
 
       /* case 3 -
         dctr is present in adunit[0], but is not a string value
       */
       multipleBidRequests[0].params.dctr = 123;
-      request = spec.buildRequests(multipleBidRequests);
+      request = spec.buildRequests(multipleBidRequests, {
+        auctionId: 'new-auction-id'
+      });
       data = JSON.parse(request.data);
 
-      expect(data.site.ext).to.not.exist;
+      expect(data.imp[0].ext).to.exist.and.to.deep.equal({});
     });
 
     it('Request params deals check', function () {
@@ -2133,7 +3116,9 @@ describe('PubMatic adapter', function () {
         }
       ];
 
-      let request = spec.buildRequests(multipleBidRequests);
+      let request = spec.buildRequests(multipleBidRequests, {
+        auctionId: 'new-auction-id'
+      });
       let data = JSON.parse(request.data);
       // case 1 - deals are passed as expected, ['', ''] , in both adUnits
       expect(data.imp[0].pmp).to.deep.equal({
@@ -2161,19 +3146,25 @@ describe('PubMatic adapter', function () {
 
       // case 2 - deals not present in adunit[0]
       delete multipleBidRequests[0].params.deals;
-      request = spec.buildRequests(multipleBidRequests);
+      request = spec.buildRequests(multipleBidRequests, {
+        auctionId: 'new-auction-id'
+      });
       data = JSON.parse(request.data);
       expect(data.imp[0].pmp).to.not.exist;
 
       // case 3 - deals is present in adunit[0], but is not an array
       multipleBidRequests[0].params.deals = 123;
-      request = spec.buildRequests(multipleBidRequests);
+      request = spec.buildRequests(multipleBidRequests, {
+        auctionId: 'new-auction-id'
+      });
       data = JSON.parse(request.data);
       expect(data.imp[0].pmp).to.not.exist;
 
       // case 4 - deals is present in adunit[0] as an array but one of the value is not a string
       multipleBidRequests[0].params.deals = [123, 'deal-id-1'];
-      request = spec.buildRequests(multipleBidRequests);
+      request = spec.buildRequests(multipleBidRequests, {
+        auctionId: 'new-auction-id'
+      });
       data = JSON.parse(request.data);
       expect(data.imp[0].pmp).to.deep.equal({
         'private_auction': 0,
@@ -2185,6 +3176,109 @@ 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() {
+        const ortb2 = {
+          ext: {
+            prebid: {
+              bidderparams: {
+                pubmatic: {
+                  acat: ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB2']
+                }
+              }
+            }
+          }
+        };
+        const request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id',
+          bidderCode: 'pubmatic',
+          ortb2
+        });
+        let data = JSON.parse(request.data);
+        expect(data.ext.acat).to.deep.equal(['IAB1', 'IAB2']);
+      });
+    });
+
     describe('Request param bcat checking', function() {
       let multipleBidRequests = [
         {
@@ -2241,21 +3335,27 @@ describe('PubMatic adapter', function () {
 
       it('bcat: pass only strings', function() {
         multipleBidRequests[0].params.bcat = [1, 2, 3, 'IAB1', 'IAB2'];
-        let request = spec.buildRequests(multipleBidRequests);
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
       });
 
       it('bcat: pass strings with length greater than 3', function() {
         multipleBidRequests[0].params.bcat = ['AB', 'CD', 'IAB1', 'IAB2'];
-        let request = spec.buildRequests(multipleBidRequests);
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
       });
 
       it('bcat: trim the strings', function() {
         multipleBidRequests[0].params.bcat = ['   IAB1    ', '   IAB2   '];
-        let request = spec.buildRequests(multipleBidRequests);
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
       });
@@ -2264,7 +3364,9 @@ describe('PubMatic adapter', function () {
         // multi slot
         multipleBidRequests[0].params.bcat = ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB2'];
         multipleBidRequests[1].params.bcat = ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB3'];
-        let request = spec.buildRequests(multipleBidRequests);
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2', 'IAB3']);
       });
@@ -2273,20 +3375,38 @@ describe('PubMatic adapter', function () {
         // multi slot
         multipleBidRequests[0].params.bcat = ['', 'IAB', 'IAB'];
         multipleBidRequests[1].params.bcat = ['    ', 22, 99999, 'IA'];
-        let request = spec.buildRequests(multipleBidRequests);
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         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'];
+        const ortb2 = {
+          bcat: ['IAB-3', 'IAB-4']
+        };
+        const request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id',
+          bidderCode: 'pubmatic',
+          ortb2
+        });
+        let data = JSON.parse(request.data);
+        expect(data.bcat).to.deep.equal(['IAB-1', 'IAB-2', 'IAB-3', 'IAB-4']);
       });
     });
 
     describe('Response checking', function () {
       it('should check for valid response values', function () {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         let response = spec.interpretResponse(bidResponses, request);
         expect(response).to.be.an('array').with.length.above(0);
         expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
-        expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
+        expect(response[0].cpm).to.equal(parseFloat((bidResponses.body.seatbid[0].bid[0].price).toFixed(2)));
         expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
         expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
         if (bidResponses.body.seatbid[0].bid[0].crid) {
@@ -2296,19 +3416,21 @@ describe('PubMatic adapter', function () {
         }
         expect(response[0].dealId).to.equal(bidResponses.body.seatbid[0].bid[0].dealid);
         expect(response[0].currency).to.equal('USD');
-        expect(response[0].netRevenue).to.equal(false);
+        expect(response[0].netRevenue).to.equal(true);
         expect(response[0].ttl).to.equal(300);
         expect(response[0].meta.networkId).to.equal(123);
         expect(response[0].adserverTargeting.hb_buyid_pubmatic).to.equal('BUYER-ID-987');
         expect(response[0].meta.buyerId).to.equal(976);
         expect(response[0].meta.clickUrl).to.equal('blackrock.com');
+        expect(response[0].meta.advertiserDomains[0]).to.equal('blackrock.com');
         expect(response[0].referrer).to.include(data.site.ref);
         expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
         expect(response[0].pm_seat).to.equal(bidResponses.body.seatbid[0].seat);
         expect(response[0].pm_dspid).to.equal(bidResponses.body.seatbid[0].bid[0].ext.dspid);
+        expect(response[0].partnerImpId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
 
         expect(response[1].requestId).to.equal(bidResponses.body.seatbid[1].bid[0].impid);
-        expect(response[1].cpm).to.equal((bidResponses.body.seatbid[1].bid[0].price).toFixed(2));
+        expect(response[1].cpm).to.equal(parseFloat((bidResponses.body.seatbid[1].bid[0].price).toFixed(2)));
         expect(response[1].width).to.equal(bidResponses.body.seatbid[1].bid[0].w);
         expect(response[1].height).to.equal(bidResponses.body.seatbid[1].bid[0].h);
         if (bidResponses.body.seatbid[1].bid[0].crid) {
@@ -2318,20 +3440,24 @@ describe('PubMatic adapter', function () {
         }
         expect(response[1].dealId).to.equal(bidResponses.body.seatbid[1].bid[0].dealid);
         expect(response[1].currency).to.equal('USD');
-        expect(response[1].netRevenue).to.equal(false);
+        expect(response[1].netRevenue).to.equal(true);
         expect(response[1].ttl).to.equal(300);
         expect(response[1].meta.networkId).to.equal(422);
         expect(response[1].adserverTargeting.hb_buyid_pubmatic).to.equal('BUYER-ID-789');
         expect(response[1].meta.buyerId).to.equal(832);
         expect(response[1].meta.clickUrl).to.equal('hivehome.com');
+        expect(response[1].meta.advertiserDomains[0]).to.equal('hivehome.com');
         expect(response[1].referrer).to.include(data.site.ref);
         expect(response[1].ad).to.equal(bidResponses.body.seatbid[1].bid[0].adm);
         expect(response[1].pm_seat).to.equal(bidResponses.body.seatbid[1].seat || null);
         expect(response[1].pm_dspid).to.equal(bidResponses.body.seatbid[1].bid[0].ext.dspid);
+        expect(response[0].partnerImpId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
       });
 
       it('should check for dealChannel value selection', function () {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let response = spec.interpretResponse(bidResponses, request);
         expect(response).to.be.an('array').with.length.above(0);
         expect(response[0].dealChannel).to.equal('PMPG');
@@ -2339,7 +3465,9 @@ describe('PubMatic adapter', function () {
       });
 
       it('should check for unexpected dealChannel value selection', function () {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let updateBiResponse = bidResponses;
         updateBiResponse.body.seatbid[0].bid[0].ext.deal_channel = 11;
 
@@ -2350,7 +3478,9 @@ describe('PubMatic adapter', function () {
       });
 
       it('should have a valid native bid response', function() {
-        let request = spec.buildRequests(nativeBidRequests);
+        let request = spec.buildRequests(nativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         data.imp[0].id = '2a5571261281d4';
         request.data = JSON.stringify(data);
@@ -2368,29 +3498,221 @@ describe('PubMatic adapter', function () {
       });
 
       it('should check for valid banner mediaType in case of multiformat request', function() {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let response = spec.interpretResponse(bannerBidResponse, request);
 
         expect(response[0].mediaType).to.equal('banner');
       });
 
       it('should check for valid video mediaType in case of multiformat request', function() {
-        let request = spec.buildRequests(videoBidRequests);
+        let request = spec.buildRequests(videoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let response = spec.interpretResponse(videoBidResponse, request);
-
         expect(response[0].mediaType).to.equal('video');
       });
 
       it('should check for valid native mediaType in case of multiformat request', function() {
-        let request = spec.buildRequests(nativeBidRequests);
+        let request = spec.buildRequests(nativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let response = spec.interpretResponse(nativeBidResponse, request);
 
         expect(response[0].mediaType).to.equal('native');
       });
+
+      it('should assign renderer if bid is video and request is for outstream', function() {
+        let request = spec.buildRequests(outstreamBidRequest, validOutstreamBidRequest);
+        let response = spec.interpretResponse(outstreamVideoBidResponse, request);
+        expect(response[0].renderer).to.exist;
+      });
+
+      it('should not assign renderer if bidderRequest is not present', function() {
+        let request = spec.buildRequests(outstreamBidRequest, {
+          auctionId: 'new-auction-id'
+        });
+        let response = spec.interpretResponse(outstreamVideoBidResponse, request);
+        expect(response[0].renderer).to.not.exist;
+      });
+
+      it('should not assign renderer if bid is video and request is for instream', function() {
+        let request = spec.buildRequests(videoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let response = spec.interpretResponse(videoBidResponse, request);
+        expect(response[0].renderer).to.not.exist;
+      });
+
+      it('should not assign renderer if bid is native', function() {
+        let request = spec.buildRequests(nativeBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let response = spec.interpretResponse(nativeBidResponse, request);
+        expect(response[0].renderer).to.not.exist;
+      });
+
+      it('should not assign renderer if bid is of banner', function() {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let response = spec.interpretResponse(bidResponses, request);
+        expect(response[0].renderer).to.not.exist;
+      });
+
+      it('should assign mediaType by reading bid.ext.mediaType', function() {
+        let newvideoRequests = [{
+          'bidder': 'pubmatic',
+          'params': {
+            'adSlot': 'SLOT_NHB1@728x90',
+            'publisherId': '5670',
+            'video': {
+              'mimes': ['video/mp4'],
+              'skippable': true,
+              'protocols': [1, 2, 5],
+              'linearity': 1
+            }
+          },
+          'mediaTypes': {
+            'video': {
+              'playerSize': [
+                [640, 480]
+              ],
+              'protocols': [1, 2, 5],
+              'context': 'instream',
+              'mimes': ['video/flv'],
+              'skippable': false,
+              'skip': 1,
+              'linearity': 2
+            }
+          },
+          'adUnitCode': 'video1',
+          'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+          'sizes': [
+            [640, 480]
+          ],
+          'bidId': '2c95df014cfe97',
+          'bidderRequestId': '1fe59391566442',
+          'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0
+        }];
+        let newvideoBidResponses = {
+          'body': {
+            'id': '1621441141473',
+            'cur': 'USD',
+            'customdata': 'openrtb1',
+            'ext': {
+              'buyid': 'myBuyId'
+            },
+            'seatbid': [{
+              'bid': [{
+                'id': '2c95df014cfe97',
+                'impid': '2c95df014cfe97',
+                'price': 4.2,
+                'cid': 'test1',
+                'crid': 'test2',
+                'adm': "<VAST version='3.0'><Ad id='601364'><InLine><AdSystem>Acudeo Compatible</AdSystem><AdTitle>VAST 2.0 Instream Test 1</AdTitle><Description>VAST 2.0 Instream Test 1</Description><Creatives><Creative AdID='601364'><Linear skipoffset='20%'><TrackingEvents><Tracking event='close'><![CDATA[https://mytracking.com/linear/close]]></Tracking><Tracking event='skip'><![CDATA[https://mytracking.com/linear/skip]]></Tracking><MediaFiles><MediaFile delivery='progressive' type='video/mp4' bitrate='500' width='400' height='300' scalable='true' maintainAspectRatio='true'><![CDATA[https://localhost/pubmatic.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives></InLine></Ad></VAST>",
+                'w': 0,
+                'h': 0,
+                'dealId': 'ASEA-MS-KLY-TTD-DESKTOP-ID-VID-6S-030420',
+                'ext': {
+                  'bidtype': 1
+                }
+              }],
+              'ext': {
+                'buyid': 'myBuyId'
+              }
+            }]
+          },
+          'headers': {}
+        }
+        let newrequest = spec.buildRequests(newvideoRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let newresponse = spec.interpretResponse(newvideoBidResponses, newrequest);
+        expect(newresponse[0].mediaType).to.equal('video')
+      })
+
+      it('should assign mediaType even if bid.ext.mediaType does not exists', function() {
+        let newvideoRequests = [{
+          'bidder': 'pubmatic',
+          'params': {
+            'adSlot': 'SLOT_NHB1@728x90',
+            'publisherId': '5670',
+            'video': {
+              'mimes': ['video/mp4'],
+              'skippable': true,
+              'protocols': [1, 2, 5],
+              'linearity': 1
+            }
+          },
+          'mediaTypes': {
+            'video': {
+              'playerSize': [
+                [640, 480]
+              ],
+              'protocols': [1, 2, 5],
+              'context': 'instream',
+              'mimes': ['video/flv'],
+              'skippable': false,
+              'skip': 1,
+              'linearity': 2
+            }
+          },
+          'adUnitCode': 'video1',
+          'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+          'sizes': [
+            [640, 480]
+          ],
+          'bidId': '2c95df014cfe97',
+          'bidderRequestId': '1fe59391566442',
+          'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0
+        }];
+        let newvideoBidResponses = {
+          'body': {
+            'id': '1621441141473',
+            'cur': 'USD',
+            'customdata': 'openrtb1',
+            'ext': {
+              'buyid': 'myBuyId'
+            },
+            'seatbid': [{
+              'bid': [{
+                'id': '2c95df014cfe97',
+                'impid': '2c95df014cfe97',
+                'price': 4.2,
+                'cid': 'test1',
+                'crid': 'test2',
+                'adm': "<VAST version='3.0'><Ad id='601364'><InLine><AdSystem>Acudeo Compatible</AdSystem><AdTitle>VAST 2.0 Instream Test 1</AdTitle><Description>VAST 2.0 Instream Test 1</Description><Creatives><Creative AdID='601364'><Linear skipoffset='20%'><TrackingEvents><Tracking event='close'><![CDATA[https://mytracking.com/linear/close]]></Tracking><Tracking event='skip'><![CDATA[https://mytracking.com/linear/skip]]></Tracking><MediaFiles><MediaFile delivery='progressive' type='video/mp4' bitrate='500' width='400' height='300' scalable='true' maintainAspectRatio='true'><![CDATA[https://localhost/pubmatic.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives></InLine></Ad></VAST>",
+                'w': 0,
+                'h': 0,
+                'dealId': 'ASEA-MS-KLY-TTD-DESKTOP-ID-VID-6S-030420'
+              }],
+              'ext': {
+                'buyid': 'myBuyId'
+              }
+            }]
+          },
+          'headers': {}
+        }
+        let newrequest = spec.buildRequests(newvideoRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let newresponse = spec.interpretResponse(newvideoBidResponses, newrequest);
+        expect(newresponse[0].mediaType).to.equal('video')
+      })
     });
 
     describe('getUserSyncs', function() {
-      const syncurl_iframe = 'https://ads.pubmatic.com/AdServer/js/showad.js#PIX&kdntuid=1&p=5670';
+      const syncurl_iframe = 'https://ads.pubmatic.com/AdServer/js/user_sync.html?kdntuid=1&p=5670';
       const syncurl_image = 'https://image8.pubmatic.com/AdServer/ImgSync?p=5670';
       let sandbox;
       beforeEach(function () {
@@ -2485,5 +3807,343 @@ describe('PubMatic adapter', function () {
         }]);
       });
     });
+
+    describe('JW player segment data for S2S', function() {
+      let sandbox = sinon.sandbox.create();
+      beforeEach(function () {
+        sandbox = sinon.sandbox.create();
+      });
+      afterEach(function() {
+        sandbox.restore();
+      });
+      it('Should append JW player segment data to dctr values in auction endpoint', function() {
+        var videoAdUnit = {
+          'bidderCode': 'pubmatic',
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'publisherId': '156276',
+                'adSlot': 'pubmatic_video2',
+                'dctr': 'key1=123|key2=345',
+                'pmzoneid': '1243',
+                'video': {
+                  'mimes': ['video/mp4', 'video/x-flv'],
+                  'skippable': true,
+                  'minduration': 5,
+                  'maxduration': 30,
+                  'startdelay': 5,
+                  'playbackmethod': [1, 3],
+                  'api': [1, 2],
+                  'protocols': [2, 3],
+                  'battr': [13, 14],
+                  'linearity': 1,
+                  'placement': 2,
+                  'minbitrate': 10,
+                  'maxbitrate': 10
+                }
+              },
+              'rtd': {
+                'jwplayer': {
+                  'targeting': {
+                    'segments': ['80011026', '80011035'],
+                    'content': {
+                      'id': 'jw_d9J2zcaA'
+                    }
+                  }
+                }
+              },
+              'bid_id': '17a6771be26cc4',
+              'ortb2Imp': {
+                'ext': {
+                  'data': {
+                    'pbadslot': 'abcd',
+                    'jwTargeting': {
+                      'playerID': 'myElement1',
+                      'mediaID': 'd9J2zcaA'
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          'auctionStart': 1630923178417,
+          'timeout': 1000,
+          'src': 's2s'
+        }
+
+        spec.transformBidParams(bidRequests[0].params, true, videoAdUnit);
+        expect(bidRequests[0].params.dctr).to.equal('key1:val1,val2|key2:val1|jw-id=jw_d9J2zcaA|jw-80011026=1|jw-80011035=1');
+      });
+      it('Should send only JW player segment data in auction endpoint, if dctr is missing', function() {
+        var videoAdUnit = {
+          'bidderCode': 'pubmatic',
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'publisherId': '156276',
+                'adSlot': 'pubmatic_video2',
+                'dctr': 'key1=123|key2=345',
+                'pmzoneid': '1243',
+                'video': {
+                  'mimes': ['video/mp4', 'video/x-flv'],
+                  'skippable': true,
+                  'minduration': 5,
+                  'maxduration': 30,
+                  'startdelay': 5,
+                  'playbackmethod': [1, 3],
+                  'api': [1, 2],
+                  'protocols': [2, 3],
+                  'battr': [13, 14],
+                  'linearity': 1,
+                  'placement': 2,
+                  'minbitrate': 10,
+                  'maxbitrate': 10
+                }
+              },
+              'rtd': {
+                'jwplayer': {
+                  'targeting': {
+                    'segments': ['80011026', '80011035'],
+                    'content': {
+                      'id': 'jw_d9J2zcaA'
+                    }
+                  }
+                }
+              },
+              'bid_id': '17a6771be26cc4',
+              'ortb2Imp': {
+                'ext': {
+                  'data': {
+                    'pbadslot': 'abcd',
+                    'jwTargeting': {
+                      'playerID': 'myElement1',
+                      'mediaID': 'd9J2zcaA'
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          'auctionStart': 1630923178417,
+          'timeout': 1000,
+          'src': 's2s'
+        }
+
+        delete bidRequests[0].params.dctr;
+        spec.transformBidParams(bidRequests[0].params, true, videoAdUnit);
+        expect(bidRequests[0].params.dctr).to.equal('jw-id=jw_d9J2zcaA|jw-80011026=1|jw-80011035=1');
+      });
+
+      it('Should not send any JW player segment data in auction endpoint, if it is not available', function() {
+        var videoAdUnit = {
+          'bidderCode': 'pubmatic',
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'publisherId': '156276',
+                'adSlot': 'pubmatic_video2',
+                'dctr': 'key1=123|key2=345',
+                'pmzoneid': '1243',
+                'video': {
+                  'mimes': ['video/mp4', 'video/x-flv'],
+                  'skippable': true,
+                  'minduration': 5,
+                  'maxduration': 30,
+                  'startdelay': 5,
+                  'playbackmethod': [1, 3],
+                  'api': [1, 2],
+                  'protocols': [2, 3],
+                  'battr': [13, 14],
+                  'linearity': 1,
+                  'placement': 2,
+                  'minbitrate': 10,
+                  'maxbitrate': 10
+                }
+              },
+              'bid_id': '17a6771be26cc4',
+              'ortb2Imp': {
+                'ext': {
+                  'data': {
+                    'pbadslot': 'abcd',
+                    'jwTargeting': {
+                      'playerID': 'myElement1',
+                      'mediaID': 'd9J2zcaA'
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          'auctionStart': 1630923178417,
+          'timeout': 1000,
+          'src': 's2s'
+        }
+        spec.transformBidParams(bidRequests[0].params, true, videoAdUnit);
+        expect(bidRequests[0].params.dctr).to.equal('key1:val1,val2|key2:val1');
+      });
+    })
+
+    describe('Checking for Video.Placement property', function() {
+      let sandbox, utilsMock;
+      const adUnit = 'Div1';
+      const msg_placement_missing = 'Video.Placement param missing for Div1';
+      let videoData = {
+        battr: [6, 7],
+        skipafter: 15,
+        maxduration: 50,
+        context: 'instream',
+        playerSize: [640, 480],
+        skip: 0,
+        connectiontype: [1, 2, 6],
+        skipmin: 10,
+        minduration: 10,
+        mimes: ['video/mp4', 'video/x-flv'],
+      }
+      beforeEach(() => {
+        utilsMock = sinon.mock(utils);
+        sandbox = sinon.sandbox.create();
+        sandbox.spy(utils, 'logWarn');
+      });
+
+      afterEach(() => {
+        utilsMock.restore();
+        sandbox.restore();
+      })
+
+      it('should log Video.Placement param missing', function() {
+        checkVideoPlacement(videoData, adUnit);
+        sinon.assert.calledWith(utils.logWarn, msg_placement_missing);
+      })
+      it('shoud not log Video.Placement param missing', function() {
+        videoData['placement'] = 1;
+        checkVideoPlacement(videoData, adUnit);
+        sinon.assert.neverCalledWith(utils.logWarn, msg_placement_missing);
+      })
+    });
+  });
+
+  describe('Video request params', function() {
+    let sandbox, utilsMock, newVideoRequest;
+    beforeEach(() => {
+      utilsMock = sinon.mock(utils);
+      sandbox = sinon.sandbox.create();
+      sandbox.spy(utils, 'logWarn');
+      newVideoRequest = utils.deepClone(videoBidRequests)
+    });
+
+    afterEach(() => {
+      utilsMock.restore();
+      sandbox.restore();
+    })
+
+    it('Should log warning if video params from mediaTypes and params obj of bid are not present', function () {
+      delete newVideoRequest[0].mediaTypes.video;
+      delete newVideoRequest[0].params.video;
+
+      let request = spec.buildRequests(newVideoRequest, {
+        auctionId: 'new-auction-id'
+      });
+
+      sinon.assert.calledOnce(utils.logWarn);
+      expect(request).to.equal(undefined);
+    });
+
+    it('Should consider video params from mediaType object of bid', function () {
+      delete newVideoRequest[0].params.video;
+
+      let request = spec.buildRequests(newVideoRequest, {
+        auctionId: 'new-auction-id'
+      });
+      let data = JSON.parse(request.data);
+      expect(data.imp[0].video).to.exist;
+      expect(data.imp[0]['video']['w']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[0]);
+      expect(data.imp[0]['video']['h']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[1]);
+      expect(data.imp[0]['video']['battr']).to.equal(undefined);
+    });
+
+    describe('Assign Deal Tier (i.e. prebidDealPriority)', function () {
+      let videoSeatBid, request, newBid;
+      // let data = JSON.parse(request.data);
+      beforeEach(function () {
+        videoSeatBid = videoBidResponse.body.seatbid[0].bid[0];
+        // const adpodValidOutstreamBidRequest = validOutstreamBidRequest.bids[0].mediaTypes.video.context = 'adpod';
+        request = spec.buildRequests(bidRequests, validOutstreamBidRequest);
+        newBid = {
+          requestId: '47acc48ad47af5'
+        };
+        videoSeatBid.ext = videoSeatBid.ext || {};
+        videoSeatBid.ext.video = videoSeatBid.ext.video || {};
+        // videoBidRequests[0].mediaTypes.video = videoBidRequests[0].mediaTypes.video || {};
+      });
+
+      it('should not assign video object if deal priority is missing', function () {
+        assignDealTier(newBid, videoSeatBid, request);
+        expect(newBid.video).to.equal(undefined);
+        expect(newBid.video).to.not.exist;
+      });
+
+      it('should not assign video object if context is not a adpod', function () {
+        videoSeatBid.ext.prebiddealpriority = 5;
+        assignDealTier(newBid, videoSeatBid, request);
+        expect(newBid.video).to.equal(undefined);
+        expect(newBid.video).to.not.exist;
+      });
+
+      describe('when video deal tier object is present', function () {
+        beforeEach(function () {
+          videoSeatBid.ext.prebiddealpriority = 5;
+          request.bidderRequest.bids[0].mediaTypes.video = {
+            ...request.bidderRequest.bids[0].mediaTypes.video,
+            context: 'adpod',
+            maxduration: 50
+          };
+        });
+
+        it('should set video deal tier object, when maxduration is present in ext', function () {
+          assignDealTier(newBid, videoSeatBid, request);
+          expect(newBid.video.durationSeconds).to.equal(50);
+          expect(newBid.video.context).to.equal('adpod');
+          expect(newBid.video.dealTier).to.equal(5);
+        });
+
+        it('should set video deal tier object, when duration is present in ext', function () {
+          videoSeatBid.ext.video.duration = 20;
+          assignDealTier(newBid, videoSeatBid, request);
+          expect(newBid.video.durationSeconds).to.equal(20);
+          expect(newBid.video.context).to.equal('adpod');
+          expect(newBid.video.dealTier).to.equal(5);
+        });
+      });
+    });
+  });
+
+  describe('Marketplace params', function () {
+    let sandbox, utilsMock, newBidRequests, newBidResponses;
+    beforeEach(() => {
+      utilsMock = sinon.mock(utils);
+      sandbox = sinon.sandbox.create();
+      sandbox.spy(utils, 'logInfo');
+      newBidRequests = utils.deepClone(bidRequests)
+      newBidRequests[0].bidder = 'groupm';
+      newBidResponses = utils.deepClone(bidResponses);
+      newBidResponses.body.seatbid[0].bid[0].ext.marketplace = 'groupm'
+    });
+
+    afterEach(() => {
+      utilsMock.restore();
+      sandbox.restore();
+    })
+
+    it('Should add bidder code as groupm for marketplace groupm response ', function () {
+      let request = spec.buildRequests(newBidRequests, {
+        auctionId: 'new-auction-id'
+      });
+      let response = spec.interpretResponse(newBidResponses, request);
+      expect(response).to.be.an('array').with.length.above(0);
+      expect(response[0].bidderCode).to.equal('groupm');
+    });
   });
 });
diff --git a/test/spec/modules/pubperfAnalyticsAdapter_spec.js b/test/spec/modules/pubperfAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..9949d87a2bc
--- /dev/null
+++ b/test/spec/modules/pubperfAnalyticsAdapter_spec.js
@@ -0,0 +1,43 @@
+import pubperfAnalytics from 'modules/pubperfAnalyticsAdapter.js';
+import {expect} from 'chai';
+import {server} from 'test/mocks/xhr.js';
+import {expectEvents, fireEvents} from '../../helpers/analytics.js';
+
+let events = require('src/events');
+let utils = require('src/utils.js');
+
+describe('Pubperf Analytics Adapter', function() {
+  describe('Prebid Manager Analytic tests', function() {
+    beforeEach(function() {
+      sinon.stub(events, 'getEvents').returns([]);
+      sinon.stub(utils, 'logError');
+    });
+
+    afterEach(function() {
+      events.getEvents.restore();
+      utils.logError.restore();
+    });
+
+    it('should throw error, when pubperf_pbjs is not defined', function() {
+      pubperfAnalytics.enableAnalytics({
+        provider: 'pubperf'
+      });
+
+      fireEvents();
+      expect(server.requests.length).to.equal(0);
+      expect(utils.logError.called).to.equal(true);
+    });
+
+    it('track event without errors', function() {
+      sinon.spy(pubperfAnalytics, 'track');
+
+      window['pubperf_pbjs'] = function() {};
+
+      pubperfAnalytics.enableAnalytics({
+        provider: 'pubperf'
+      });
+
+      expectEvents().to.beTrackedBy(pubperfAnalytics.track);
+    });
+  });
+});
diff --git a/test/spec/modules/pubstackAnalyticsAdapter_spec.js b/test/spec/modules/pubstackAnalyticsAdapter_spec.js
index e3db334c888..fe7441e91e5 100644
--- a/test/spec/modules/pubstackAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubstackAnalyticsAdapter_spec.js
@@ -1,19 +1,18 @@
 import * as utils from 'src/utils.js';
 import pubstackAnalytics from '../../../modules/pubstackAnalyticsAdapter.js';
 import adapterManager from 'src/adapterManager';
-import events from 'src/events';
+import * as events from 'src/events';
 import constants from 'src/constants.json'
+import {expectEvents} from '../../helpers/analytics.js';
 
 describe('Pubstack Analytics Adapter', () => {
   const scope = utils.getWindowSelf();
-  let queue = [];
 
   beforeEach(() => {
-    scope.PubstackAnalytics = (...args) => queue.push(args);
+    scope.PubstackAnalytics = sinon.stub();
     adapterManager.enableAnalytics({
       provider: 'pubstack'
     });
-    queue = []
   });
 
   afterEach(() => {
@@ -21,18 +20,6 @@ describe('Pubstack Analytics Adapter', () => {
   });
 
   it('should forward all events to the queue', () => {
-    // Given
-    const args = 'any-args'
-
-    // When
-    events.emit(constants.EVENTS.AUCTION_END, args)
-    events.emit(constants.EVENTS.BID_REQUESTED, args)
-    events.emit(constants.EVENTS.BID_ADJUSTMENT, args)
-    events.emit(constants.EVENTS.BID_RESPONSE, args)
-    events.emit(constants.EVENTS.BID_WON, args)
-    events.emit(constants.EVENTS.NO_BID, args)
-
-    // Then
-    expect(queue.length).to.eql(6);
+    expectEvents().to.beBundledTo(scope.PubstackAnalytics);
   });
 });
diff --git a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
index 5e4b2be894e..e14582edc39 100644
--- a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
@@ -1,47 +1,158 @@
+import {expect} from 'chai';
 import pubwiseAnalytics from 'modules/pubwiseAnalyticsAdapter.js';
+import {expectEvents} from '../../helpers/analytics.js';
+
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
 let constants = require('src/constants.json');
 
 describe('PubWise Prebid Analytics', function () {
-  after(function () {
+  let requests;
+  let sandbox;
+  let xhr;
+  let clock;
+  let mock = {};
+
+  mock.DEFAULT_PW_CONFIG = {
+    provider: 'pubwiseanalytics',
+    options: {
+      site: ['b1ccf317-a6fc-428d-ba69-0c9c208aa61c'],
+      custom: {'c_script_type': 'test-script-type', 'c_host': 'test-host', 'c_slot1': 'test-slot1', 'c_slot2': 'test-slot2', 'c_slot3': 'test-slot3', 'c_slot4': 'test-slot4'}
+    }
+  };
+  mock.AUCTION_INIT = {auctionId: '53c35d77-bd62-41e7-b920-244140e30c77'};
+  mock.AUCTION_INIT_EXTRAS = {
+    auctionId: '53c35d77-bd62-41e7-b920-244140e30c77',
+    adUnitCodes: 'not empty',
+    adUnits: '',
+    bidderRequests: ['0'],
+    bidsReceived: '0',
+    config: {test: 'config'},
+    noBids: 'no bids today',
+    winningBids: 'winning bids',
+    extraProp: 'extraProp retained'
+  };
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    clock = sandbox.useFakeTimers();
+    sandbox.stub(events, 'getEvents').returns([]);
+
+    xhr = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+    xhr.onCreate = request => requests.push(request);
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    clock.restore();
     pubwiseAnalytics.disableAnalytics();
   });
 
   describe('enableAnalytics', function () {
     beforeEach(function () {
-      sinon.stub(events, 'getEvents').returns([]);
-    });
-
-    afterEach(function () {
-      events.getEvents.restore();
+      requests = [];
     });
 
     it('should catch all events', function () {
-      sinon.spy(pubwiseAnalytics, 'track');
+      pubwiseAnalytics.enableAnalytics(mock.DEFAULT_PW_CONFIG);
+
+      sandbox.spy(pubwiseAnalytics, 'track');
 
-      adapterManager.registerAnalyticsAdapter({
-        code: 'pubwiseanalytics',
-        adapter: pubwiseAnalytics
-      });
+      expectEvents([
+        constants.EVENTS.AUCTION_INIT,
+        constants.EVENTS.BID_REQUESTED,
+        constants.EVENTS.BID_RESPONSE,
+        constants.EVENTS.BID_WON,
+        constants.EVENTS.AD_RENDER_FAILED,
+        constants.EVENTS.TCF2_ENFORCEMENT,
+        constants.EVENTS.BID_TIMEOUT,
+        constants.EVENTS.AUCTION_END,
+      ]).to.beTrackedBy(pubwiseAnalytics.track);
+    });
 
-      adapterManager.enableAnalytics({
-        provider: 'pubwiseanalytics',
-        options: {
-          site: ['test-test-test-test']
-        }
-      });
+    it('should initialize the auction properly', function () {
+      pubwiseAnalytics.enableAnalytics(mock.DEFAULT_PW_CONFIG);
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
+      // sent
+      events.emit(constants.EVENTS.AUCTION_INIT, mock.AUCTION_INIT);
       events.emit(constants.EVENTS.BID_REQUESTED, {});
       events.emit(constants.EVENTS.BID_RESPONSE, {});
       events.emit(constants.EVENTS.BID_WON, {});
+      // force flush
+      clock.tick(500);
+
+      /* check for critical values */
+      let request = requests[0];
+      let data = JSON.parse(request.requestBody);
+      // eslint-disable-next-line
+      // console.log(data.metaData);
+      expect(data.metaData, 'metaData property').to.exist;
+      expect(data.metaData.pbjs_version, 'pbjs version').to.equal('$prebid.version$')
+      expect(data.metaData.session_id, 'session id').not.to.be.empty
+      expect(data.metaData.activation_id, 'activation id').not.to.be.empty
+
+      // check custom metadata slots
+      expect(data.metaData.c_script_type, 'c_script_type property').to.exist;
+      expect(data.metaData.c_script_type, 'c_script_type').not.to.be.empty
+      expect(data.metaData.c_script_type).to.equal('test-script-type');
+
+      expect(data.metaData.c_host, 'c_host property').to.exist;
+      expect(data.metaData.c_host, 'c_host').not.to.be.empty
+      expect(data.metaData.c_host).to.equal('test-host');
+
+      expect(data.metaData.c_slot1, 'c_slot1 property').to.exist;
+      expect(data.metaData.c_slot1, 'c_slot1').not.to.be.empty
+      expect(data.metaData.c_slot1).to.equal('test-slot1');
+
+      expect(data.metaData.c_slot2, 'c_slot1 property').to.exist;
+      expect(data.metaData.c_slot2, 'c_slot1').not.to.be.empty
+      expect(data.metaData.c_slot2).to.equal('test-slot2');
+
+      expect(data.metaData.c_slot3, 'c_slot1 property').to.exist;
+      expect(data.metaData.c_slot3, 'c_slot1').not.to.be.empty
+      expect(data.metaData.c_slot3).to.equal('test-slot3');
+
+      expect(data.metaData.c_slot4, 'c_slot1 property').to.exist;
+      expect(data.metaData.c_slot4, 'c_slot1').not.to.be.empty
+      expect(data.metaData.c_slot4).to.equal('test-slot4');
+
+      // check for version info too
+      expect(data.metaData.pw_version, 'pw_version property').to.exist;
+      expect(data.metaData.pbjs_version, 'pbjs_version property').to.exist;
+    });
+
+    it('should remove extra data on init', function () {
+      pubwiseAnalytics.enableAnalytics(mock.DEFAULT_PW_CONFIG);
+
+      // sent
+      events.emit(constants.EVENTS.AUCTION_INIT, mock.AUCTION_INIT_EXTRAS);
+      // force flush
+      clock.tick(500);
+
+      /* check for critical values */
+      let request = requests[0];
+      let data = JSON.parse(request.requestBody);
+
+      // check the basics
+      expect(data.eventList, 'eventList property').to.exist;
+      expect(data.eventList[0], 'eventList property').to.exist;
+      expect(data.eventList[0].args, 'eventList property').to.exist;
+
+      // eslint-disable-next-line
+      // console.log(data.eventList[0].args);
 
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
+      let eventArgs = data.eventList[0].args;
+      // the props we want removed should go away
+      expect(eventArgs.adUnitCodes, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.bidderRequests, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.bidsReceived, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.config, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.noBids, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.winningBids, 'adUnitCodes property').not.to.exist;
 
-      /* testing for 6 calls, including the 2 we're not currently tracking */
-      sinon.assert.callCount(pubwiseAnalytics.track, 6);
+      // the extra prop should still exist
+      expect(eventArgs.extraProp, 'adUnitCodes property').to.exist;
     });
   });
 });
diff --git a/test/spec/modules/pubwiseBidAdapter_spec.js b/test/spec/modules/pubwiseBidAdapter_spec.js
new file mode 100644
index 00000000000..d7b7a527485
--- /dev/null
+++ b/test/spec/modules/pubwiseBidAdapter_spec.js
@@ -0,0 +1,585 @@
+// import or require modules necessary for the test, e.g.:
+
+import {expect} from 'chai';
+import {spec} from 'modules/pubwiseBidAdapter.js';
+import {_checkMediaType} from 'modules/pubwiseBidAdapter.js'; // this is exported only for testing so maintaining the JS convention of _ to indicate the intent
+import {_parseAdSlot} from 'modules/pubwiseBidAdapter.js'; // this is exported only for testing so maintaining the JS convention of _ to indicate the intent
+import * as utils from 'src/utils.js';
+
+const sampleRequestBanner = {
+  'id': '6c148795eb836a',
+  'tagid': 'div-gpt-ad-1460505748561-0',
+  'bidfloor': 1,
+  'secure': 1,
+  'bidfloorcur': 'USD',
+  'banner': {
+    'w': 300,
+    'h': 250,
+    'format': [
+      {
+        'w': 300,
+        'h': 600
+      }
+    ],
+    'pos': 0,
+    'topframe': 1
+  }
+};
+
+const sampleRequest = {
+  'at': 1,
+  'cur': [
+    'USD'
+  ],
+  'imp': [
+    sampleRequestBanner,
+    {
+      'id': '7329ddc1d84eb3',
+      'tagid': 'div-gpt-ad-1460505748561-1',
+      'secure': 1,
+      'bidfloorcur': 'USD',
+      'native': {
+        'request': '{"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":5,"required":1,"data":{"type":2}},{"id":2,"required":1,"img":{"type":{"ID":2,"KEY":"image","TYPE":0},"w":150,"h":50}},{"id":4,"required":1,"data":{"type":1}}]}'
+      }
+    }
+  ],
+  'site': {
+    'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'ref': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'publisher': {
+      'id': 'xxxxxx'
+    }
+  },
+  'device': {
+    'ua': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/86.0.4240.198 Safari/537.36',
+    'js': 1,
+    'dnt': 0,
+    'h': 600,
+    'w': 800,
+    'language': 'en-US',
+    'geo': {
+      'lat': 33.91989876432274,
+      'lon': -84.38897708175764
+    }
+  },
+  'user': {
+    'gender': 'M',
+    'geo': {
+      'lat': 33.91989876432274,
+      'lon': -84.38897708175764
+    },
+    'yob': 2000
+  },
+  'test': 0,
+  'ext': {
+    'version': '0.0.1'
+  },
+  'source': {
+    'tid': '2c8cd034-f068-4419-8c30-f07292c0d17b'
+  }
+};
+
+const sampleValidBannerBidRequest = {
+  'bidder': 'pubwise',
+  'params': {
+    'siteId': 'xxxxxx',
+    'bidFloor': '1.00',
+    'currency': 'USD',
+    'gender': 'M',
+    'lat': '33.91989876432274',
+    'lon': '-84.38897708175764',
+    'yob': '2000',
+    'bcat': ['IAB25-3', 'IAB26-1', 'IAB26-2', 'IAB26-3', 'IAB26-4'],
+  },
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+  'crumbs': {
+    'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+  },
+  ortb2Imp: {
+    ext: {
+      data: {
+        adserver: {
+          name: 'gam',
+          adslot: '/19968336/header-bid-tag-0'
+        },
+        pbadslot: '/19968336/header-bid-tag-0',
+      }
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'div-gpt-ad-1460505748561-0',
+  'transactionId': '2001a8b2-3bcf-417d-b64f-92641dae21e0',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '6c148795eb836a',
+  'bidderRequestId': '18a45bff5ff705',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0
+};
+
+const sampleValidBidRequests = [
+  sampleValidBannerBidRequest,
+  {
+    'bidder': 'pubwise',
+    'params': {
+      'siteId': 'xxxxxx'
+    },
+    'crumbs': {
+      'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+    },
+    'nativeParams': {
+      'title': {
+        'required': true,
+        'len': 80
+      },
+      'body': {
+        'required': true
+      },
+      'image': {
+        'required': true,
+        'sizes': [
+          150,
+          50
+        ]
+      },
+      'sponsoredBy': {
+        'required': true
+      },
+      'icon': {
+        'required': false
+      }
+    },
+    ortb2Imp: {
+      ext: {
+        data: {
+          adserver: {
+            name: 'gam',
+            adslot: '/19968336/header-bid-tag-0'
+          },
+          pbadslot: '/19968336/header-bid-tag-0',
+        }
+      }
+    },
+    'mediaTypes': {
+      'native': {
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'body': {
+          'required': true
+        },
+        'image': {
+          'required': true,
+          'sizes': [
+            150,
+            50
+          ]
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'icon': {
+          'required': false
+        }
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-1',
+    'transactionId': '2c8cd034-f068-4419-8c30-f07292c0d17b',
+    'sizes': [],
+    'bidId': '30ab7516a51a7c',
+    'bidderRequestId': '18a45bff5ff705',
+    'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }
+]
+
+const sampleBidderBannerRequest = {
+  'bidder': 'pubwise',
+  'params': {
+    'siteId': 'xxxxxx',
+    'height': 250,
+    'width': 300,
+    'gender': 'M',
+    'yob': '2000',
+    'lat': '33.91989876432274',
+    'lon': '-84.38897708175764',
+    'bidFloor': '1.00',
+    'currency': 'USD',
+    'adSlot': '',
+    'adUnit': 'div-gpt-ad-1460505748561-0',
+    'bcat': [
+      'IAB25-3',
+      'IAB26-1',
+      'IAB26-2',
+      'IAB26-3',
+      'IAB26-4',
+    ],
+  },
+  'crumbs': {
+    'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+  },
+  ortb2Imp: {
+    ext: {
+      data: {
+        adserver: {
+          name: 'gam',
+          adslot: '/19968336/header-bid-tag-0'
+        },
+        pbadslot: '/19968336/header-bid-tag-0',
+      }
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'div-gpt-ad-1460505748561-0',
+  'transactionId': '2001a8b2-3bcf-417d-b64f-92641dae21e0',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '6c148795eb836a',
+  'bidderRequestId': '18a45bff5ff705',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+};
+
+const sampleBidderRequest = {
+  'bidderCode': 'pubwise',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'bidderRequestId': '18a45bff5ff705',
+  'bids': [
+    sampleBidderBannerRequest,
+    {
+      'bidder': 'pubwise',
+      'params': {
+        'siteId': 'xxxxxx'
+      },
+      'crumbs': {
+        'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+      },
+      'nativeParams': {
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'body': {
+          'required': true
+        },
+        'image': {
+          'required': true,
+          'sizes': [
+            150,
+            50
+          ]
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'icon': {
+          'required': false
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          data: {
+            adserver: {
+              name: 'gam',
+              adslot: '/19968336/header-bid-tag-0'
+            },
+            pbadslot: '/19968336/header-bid-tag-0',
+          }
+        }
+      },
+      'mediaTypes': {
+        'native': {
+          'title': {
+            'required': true,
+            'len': 80
+          },
+          'body': {
+            'required': true
+          },
+          'image': {
+            'required': true,
+            'sizes': [
+              150,
+              50
+            ]
+          },
+          'sponsoredBy': {
+            'required': true
+          },
+          'icon': {
+            'required': false
+          }
+        }
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-1',
+      'transactionId': '2c8cd034-f068-4419-8c30-f07292c0d17b',
+      'sizes': [],
+      'bidId': '30ab7516a51a7c',
+      'bidderRequestId': '18a45bff5ff705',
+      'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }
+  ],
+  'auctionStart': 1606269202001,
+  'timeout': 1000,
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+  'refererInfo': {
+    'referer': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'reachedTop': true,
+    'isAmp': false,
+    'numIframes': 0,
+    'stack': [
+      'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true'
+    ],
+    'canonicalUrl': null
+  },
+  'start': 1606269202004
+};
+
+const sampleRTBResponse = {
+  'body': {
+    'id': '1606251348404',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '1606579704052',
+            'impid': '6c148795eb836a',
+            'price': 1.23,
+            'adm': '\u003cdiv style="box-sizing: border-box;width:298px;height:248px;border: 1px solid rgba(0,0,0,.25);border-radius:10px;"\u003e\n\t\u003ch3 style="margin-top:80px;text-align: center;"\u003ePubWise Test Bid\u003c/h3\u003e\n\u003c/div\u003e',
+            'crid': 'test',
+            'w': 300,
+            'h': 250
+          },
+          {
+            'id': '1606579704052',
+            'impid': '7329ddc1d84eb3',
+            'price': 1.23,
+            'adm': '{"ver":"1.2","assets":[{"id":1,"title":{"text":"PubWise Test"}},{"id":2,"img":{"type":3,"url":"http://www.pubwise.io","w":300,"h":250}},{"id":3,"img":{"type":1,"url":"http://www.pubwise.io","w":150,"h":125}},{"id":5,"data":{"type":2,"value":"PubWise Test Desc"}},{"id":4,"data":{"type":1,"value":"PubWise.io"}}],"link":{"url":"http://www.pubwise.io"}}',
+            'crid': 'test',
+            'w': 300,
+            'h': 250
+          }
+        ]
+      }
+    ],
+    'bidid': 'testtesttest'
+  }
+};
+
+const samplePBBidObjects = [
+  {
+    'requestId': '6c148795eb836a',
+    'cpm': '1.23',
+    'width': 300,
+    'height': 250,
+    'creativeId': 'test',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'ad': '<div style="box-sizing: border-box;width:298px;height:248px;border: 1px solid rgba(0,0,0,.25);border-radius:10px;">\n\t<h3 style="margin-top:80px;text-align: center;">PubWise Test Bid</h3>\n</div>',
+    'pw_seat': null,
+    'pw_dspid': null,
+    'partnerImpId': '1606579704052',
+    'meta': {},
+    'mediaType': 'banner',
+  },
+  {
+    'requestId': '7329ddc1d84eb3',
+    'cpm': '1.23',
+    'width': 300,
+    'height': 250,
+    'creativeId': 'test',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'ad': '{\"ver\":\"1.2\",\"assets\":[{\"id\":1,\"title\":{\"text\":\"PubWise Test\"}},{\"id\":2,\"img\":{\"type\":3,\"url\":\"http://www.pubwise.io\",\"w\":300,\"h\":250}},{\"id\":3,\"img\":{\"type\":1,\"url\":\"http://www.pubwise.io\",\"w\":150,\"h\":125}},{\"id\":5,\"data\":{\"type\":2,\"value\":\"PubWise Test Desc\"}},{\"id\":4,\"data\":{\"type\":1,\"value\":\"PubWise.io\"}}],\"link\":{\"url\":\"http://www.pubwise.io\"}}',
+    'pw_seat': null,
+    'pw_dspid': null,
+    'partnerImpId': '1606579704052',
+    'mediaType': 'native',
+    'native': {
+      'body': 'PubWise Test Desc',
+      'icon': {
+        'height': 125,
+        'url': 'http://www.pubwise.io',
+        'width': 150,
+      },
+      'image': {
+        'height': 250,
+        'url': 'http://www.pubwise.io',
+        'width': 300,
+      },
+      'sponsoredBy': 'PubWise.io',
+      'title': 'PubWise Test'
+    },
+    'meta': {},
+    'impressionTrackers': [],
+    'jstracker': [],
+    'clickTrackers': [],
+    'clickUrl': 'http://www.pubwise.io'
+  }
+];
+
+describe('PubWiseAdapter', function () {
+  describe('Properly Validates Bids', function () {
+    it('valid bid', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 'xxxxxx'
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('valid bid: extra fields are ok', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 'xxxxxx',
+            gender: 'M',
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('invalid bid: no siteId', function () {
+      let inValidBid = {
+          bidder: 'pubwise',
+          params: {
+            gender: 'M',
+          }
+        },
+        isValid = spec.isBidRequestValid(inValidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('invalid bid: siteId should be a string', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 123456
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('Handling Request Construction', function () {
+    it('bid requests are not mutable', function() {
+      let sourceBidRequest = utils.deepClone(sampleValidBidRequests);
+      spec.buildRequests(sampleValidBidRequests, {auctionId: 'placeholder'});
+      expect(sampleValidBidRequests).to.deep.equal(sourceBidRequest, 'Should be unedited as they are used elsewhere');
+    });
+    it('should handle complex bidRequest', function() {
+      let request = spec.buildRequests(sampleValidBidRequests, sampleBidderRequest);
+      expect(request.bidderRequest).to.equal(sampleBidderRequest, "Bid Request Doesn't Match Sample");
+      expect(request.data.source.tid).to.equal(sampleBidderRequest.auctionId, 'AuctionId -> source.tid Mismatch');
+      expect(request.data.imp[0].ext.tid).to.equal(sampleBidderRequest.bids[0].transactionId, 'TransactionId -> ext.tid Mismatch');
+    });
+    it('must conform to API for buildRequests', function() {
+      let request = spec.buildRequests(sampleValidBidRequests);
+      expect(request.bidderRequest).to.be.undefined;
+    });
+  });
+
+  describe('Identifies Media Types', function () {
+    it('identifies native adm type', function() {
+      let adm = '{"ver":"1.2","assets":[{"title":{"text":"PubWise Test"}},{"img":{"type":3,"url":"http://www.pubwise.io"}},{"img":{"type":1,"url":"http://www.pubwise.io"}},{"data":{"type":2,"value":"PubWise Test Desc"}},{"data":{"type":1,"value":"PubWise.io"}}],"link":{"url":""}}';
+      let newBid = {mediaType: 'unknown'};
+      _checkMediaType(adm, newBid);
+      expect(newBid.mediaType).to.equal('native', adm + ' Is a Native adm');
+    });
+
+    it('identifies banner adm type', function() {
+      let adm = '<div style="box-sizing: border-box;width:298px;height:248px;border: 1px solid rgba(0,0,0,.25);border-radius:10px;">↵	<h3 style="margin-top:80px;text-align: center;">PubWise Test Bid</h3>↵</div>';
+      let newBid = {mediaType: 'unknown'};
+      _checkMediaType(adm, newBid);
+      expect(newBid.mediaType).to.equal('banner', adm + ' Is a Banner adm');
+    });
+  });
+
+  describe('Properly Parses AdSlot Data', function () {
+    it('parses banner', function() {
+      let testBid = utils.deepClone(sampleValidBannerBidRequest)
+      _parseAdSlot(testBid)
+      expect(testBid).to.deep.equal(sampleBidderBannerRequest);
+    });
+  });
+
+  describe('Properly Handles Response', function () {
+    it('handles response with muiltiple responses', function() {
+      // the request when it comes back is on the data object
+      let pbResponse = spec.interpretResponse(sampleRTBResponse, {'data': sampleRequest})
+      expect(pbResponse).to.deep.equal(samplePBBidObjects);
+    });
+  });
+});
diff --git a/test/spec/modules/pubxBidAdapter_spec.js b/test/spec/modules/pubxBidAdapter_spec.js
new file mode 100644
index 00000000000..06bb5b5f638
--- /dev/null
+++ b/test/spec/modules/pubxBidAdapter_spec.js
@@ -0,0 +1,199 @@
+import {expect} from 'chai';
+import {spec} from 'modules/pubxBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import * as utils from 'src/utils.js';
+
+describe('pubxAdapter', function () {
+  const adapter = newBidder(spec);
+  const ENDPOINT = 'https://api.primecaster.net/adlogue/api/slot/bid';
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      bidder: 'pubx',
+      params: {
+        sid: '12345abc'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        id: '26c1ee0038ac11',
+        params: {
+          sid: '12345abc'
+        }
+      }
+    ];
+
+    const data = {
+      banner: {
+        sid: '12345abc'
+      }
+    };
+
+    it('sends bid request to ENDPOINT via GET', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('should attach params to the banner request', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.data).to.deep.equal(data.banner);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const sandbox = sinon.sandbox.create();
+
+    const keywordsText = 'meta1,meta2,meta3,meta4,meta5';
+    const descriptionText = 'description1description2description3description4description5description';
+
+    let documentStubMeta;
+
+    beforeEach(function () {
+      documentStubMeta = sandbox.stub(document, 'getElementsByName');
+      const metaElKeywords = document.createElement('meta');
+      metaElKeywords.setAttribute('name', 'keywords');
+      metaElKeywords.setAttribute('content', keywordsText);
+      documentStubMeta.withArgs('keywords').returns([metaElKeywords]);
+
+      const metaElDescription = document.createElement('meta');
+      metaElDescription.setAttribute('name', 'description');
+      metaElDescription.setAttribute('content', descriptionText);
+      documentStubMeta.withArgs('description').returns([metaElDescription]);
+    });
+
+    afterEach(function () {
+      documentStubMeta.restore();
+    });
+
+    let kwString = '';
+    let kwEnc = '';
+    let descContent = '';
+    let descEnc = '';
+
+    it('returns empty sync array when iframe is not enabled', function () {
+      const syncOptions = {};
+      expect(spec.getUserSyncs(syncOptions)).to.deep.equal([]);
+    });
+
+    it('returns kwEnc when there is kwTag with more than 20 length', function () {
+      const kwArray = keywordsText.substr(0, 20).split(',');
+      kwArray.pop();
+      kwString = kwArray.join();
+      kwEnc = encodeURIComponent(kwString);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pkw=${kwEnc}`);
+    });
+
+    it('returns kwEnc when there is kwTag with more than 60 length', function () {
+      descContent = descContent.substr(0, 60);
+      descEnc = encodeURIComponent(descContent);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pkw=${descEnc}`);
+    });
+
+    it('returns titleEnc when there is titleContent with more than 30 length', function () {
+      let titleText = 'title1title2title3title4title5title';
+      const documentStubTitle = sandbox.stub(document, 'title').value(titleText);
+
+      if (titleText.length > 30) {
+        titleText = titleText.substr(0, 30);
+      }
+
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pt=${encodeURIComponent(titleText)}`);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const serverResponse = {
+      body: {
+        TTL: 300,
+        adm: '<div>some creative</div>',
+        cid: 'TKmB',
+        cpm: 500,
+        currency: 'JPY',
+        height: 250,
+        width: 300,
+        adomains: [
+          'test.com'
+        ],
+      }
+    }
+
+    const bidRequests = [
+      {
+        id: '26c1ee0038ac11',
+        params: {
+          sid: '12345abc'
+        }
+      }
+    ];
+
+    const bidResponses = [
+      {
+        requestId: '26c1ee0038ac11',
+        cpm: 500,
+        currency: 'JPY',
+        width: 300,
+        height: 250,
+        creativeId: 'TKmB',
+        netRevenue: true,
+        ttl: 300,
+        ad: '<div>some creative</div>',
+        meta: {
+          advertiserDomains: [
+            'test.com'
+          ]
+        },
+      }
+    ];
+    it('should return empty array when required param is empty', function () {
+      const serverResponseWithCidEmpty = {
+        body: {
+          TTL: 300,
+          adm: '<div>some creative</div>',
+          cid: '',
+          cpm: '',
+          currency: 'JPY',
+          height: 250,
+          width: 300,
+        }
+      }
+      const result = spec.interpretResponse(serverResponseWithCidEmpty, bidRequests[0]);
+      expect(result).to.be.empty;
+    });
+    it('handles banner responses', function () {
+      const result = spec.interpretResponse(serverResponse, bidRequests[0])[0];
+      expect(result.requestId).to.equal(bidResponses[0].requestId);
+      expect(result.width).to.equal(bidResponses[0].width);
+      expect(result.height).to.equal(bidResponses[0].height);
+      expect(result.creativeId).to.equal(bidResponses[0].creativeId);
+      expect(result.currency).to.equal(bidResponses[0].currency);
+      expect(result.netRevenue).to.equal(bidResponses[0].netRevenue);
+      expect(result.ttl).to.equal(bidResponses[0].ttl);
+      expect(result.ad).to.equal(bidResponses[0].ad);
+      expect(result.meta.advertiserDomains).deep.to.equal(bidResponses[0].meta.advertiserDomains);
+    });
+  });
+});
diff --git a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..1ad23b9a41e
--- /dev/null
+++ b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
@@ -0,0 +1,706 @@
+import pubxaiAnalyticsAdapter from 'modules/pubxaiAnalyticsAdapter.js';
+import { getDeviceType, getBrowser, getOS } from 'modules/pubxaiAnalyticsAdapter.js';
+import {
+  expect
+} from 'chai';
+import adapterManager from 'src/adapterManager.js';
+import * as utils from 'src/utils.js';
+import {
+  server
+} from 'test/mocks/xhr.js';
+
+let events = require('src/events');
+let constants = require('src/constants.json');
+
+describe('pubxai analytics adapter', function() {
+  beforeEach(function() {
+    sinon.stub(events, 'getEvents').returns([]);
+  });
+
+  afterEach(function() {
+    events.getEvents.restore();
+  });
+
+  describe('track', function() {
+    let initOptions = {
+      samplingRate: '1',
+      pubxId: '6c415fc0-8b0e-4cf5-be73-01526a4db625'
+    };
+
+    let location = utils.getWindowLocation();
+    let storage = window.top['sessionStorage'];
+
+    let prebidEvent = {
+      'auctionInit': {
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'timestamp': 1603865707180,
+        'auctionStatus': 'inProgress',
+        'adUnits': [{
+          'code': '/19968336/header-bid-tag-1',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'test model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloorProvider',
+              'fetchStatus': 'success'
+            }
+          }],
+          'sizes': [
+            [
+              300,
+              250
+            ]
+          ],
+          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294'
+        }],
+        'adUnitCodes': [
+          '/19968336/header-bid-tag-1'
+        ],
+        'bidderRequests': [{
+          'bidderCode': 'appnexus',
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'bidderRequestId': '184cbc05bb90ba',
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'test model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloorProvider',
+              'fetchStatus': 'success'
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    300,
+                    250
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': '/19968336/header-bid-tag-1',
+            'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ],
+            'bidId': '248f9a4489835e',
+            'bidderRequestId': '184cbc05bb90ba',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }],
+          'auctionStart': 1603865707180,
+          'timeout': 1000,
+          'refererInfo': {
+            'referer': 'http://local-pnh.net:8080/stream/',
+            'reachedTop': true,
+            'isAmp': false,
+            'numIframes': 0,
+            'stack': [
+              'http://local-pnh.net:8080/stream/'
+            ],
+            'canonicalUrl': null
+          },
+          'start': 1603865707182
+        }],
+        'noBids': [],
+        'bidsReceived': [],
+        'winningBids': [],
+        'timeout': 1000,
+        'config': {
+          'samplingRate': '1',
+          'pubxId': '6c415fc0-8b0e-4cf5-be73-01526a4db625'
+        }
+      },
+      'bidRequested': {
+        'bidderCode': 'appnexus',
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'bidderRequestId': '184cbc05bb90ba',
+        'bids': [{
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': 13144370
+          },
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'floorData': {
+            'skipped': false,
+            'skipRate': 0,
+            'modelVersion': 'test model 1.0',
+            'location': 'fetch',
+            'floorProvider': 'PubXFloorProvider',
+            'fetchStatus': 'success'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          'adUnitCode': '/19968336/header-bid-tag-1',
+          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+          'sizes': [
+            [
+              300,
+              250
+            ]
+          ],
+          'bidId': '248f9a4489835e',
+          'bidderRequestId': '184cbc05bb90ba',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0
+        }],
+        'auctionStart': 1603865707180,
+        'timeout': 1000,
+        'refererInfo': {
+          'referer': 'http://local-pnh.net:8080/stream/',
+          'reachedTop': true,
+          'isAmp': false,
+          'numIframes': 0,
+          'stack': [
+            'http://local-pnh.net:8080/stream/'
+          ],
+          'canonicalUrl': null
+        },
+        'start': 1603865707182
+      },
+      'bidTimeout': [],
+      'bidResponse': {
+        'bidderCode': 'appnexus',
+        'width': 300,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'adId': '32780c4bc382cb',
+        'requestId': '248f9a4489835e',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.5,
+        'creativeId': 96846035,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        'appnexus': {
+          'buyerMemberId': 9325
+        },
+        'meta': {
+          'advertiserId': 2529885
+        },
+        'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
+        'originalCpm': 0.5,
+        'originalCurrency': 'USD',
+        'floorData': {
+          'fetchStatus': 'success',
+          'floorProvider': 'PubXFloorProvider',
+          'location': 'fetch',
+          'modelVersion': 'test model 1.0',
+          'skipRate': 0,
+          'skipped': false,
+          'floorValue': 0.4,
+          'floorRule': '/19968336/header-bid-tag-1|banner',
+          'floorCurrency': 'USD',
+          'cpmAfterAdjustments': 0.5,
+          'enforcements': {
+            'enforceJS': true,
+            'enforcePBS': false,
+            'floorDeals': true,
+            'bidAdjustment': true
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'responseTimestamp': 1616654313071,
+        'requestTimestamp': 1616654312804,
+        'bidder': 'appnexus',
+        'timeToRespond': 267,
+        'pbLg': '0.50',
+        'pbMg': '0.50',
+        'pbHg': '0.50',
+        'pbAg': '0.50',
+        'pbDg': '0.50',
+        'pbCg': '0.50',
+        'size': '300x250',
+        'adserverTargeting': {
+          'hb_bidder': 'appnexus',
+          'hb_adid': '32780c4bc382cb',
+          'hb_pb': '0.50',
+          'hb_size': '300x250',
+          'hb_source': 'client',
+          'hb_format': 'banner'
+        },
+      },
+      'auctionEnd': {
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'timestamp': 1616654312804,
+        'auctionEnd': 1616654313090,
+        'auctionStatus': 'completed',
+        'adUnits': [{
+          'code': '/19968336/header-bid-tag-1',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'test model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloorProvider',
+              'fetchStatus': 'success'
+            }
+          }],
+          'sizes': [
+            [
+              300,
+              250
+            ]
+          ],
+          'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294'
+        }],
+        'adUnitCodes': [
+          '/19968336/header-bid-tag-1'
+        ],
+        'bidderRequests': [{
+          'bidderCode': 'appnexus',
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'bidderRequestId': '184cbc05bb90ba',
+          'bids': [{
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13144370
+            },
+            'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+            'floorData': {
+              'skipped': false,
+              'skipRate': 0,
+              'modelVersion': 'test model 1.0',
+              'location': 'fetch',
+              'floorProvider': 'PubXFloorProvider',
+              'fetchStatus': 'success'
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    300,
+                    250
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': '/19968336/header-bid-tag-1',
+            'transactionId': '41ec8eaf-3e7c-4a8b-8344-ab796ff6e294',
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ],
+            'bidId': '248f9a4489835e',
+            'bidderRequestId': '184cbc05bb90ba',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }],
+          'auctionStart': 1603865707180,
+          'timeout': 1000,
+          'refererInfo': {
+            'referer': 'http://local-pnh.net:8080/stream/',
+            'reachedTop': true,
+            'isAmp': false,
+            'numIframes': 0,
+            'stack': [
+              'http://local-pnh.net:8080/stream/'
+            ],
+            'canonicalUrl': null
+          },
+          'start': 1603865707182
+        }],
+        'noBids': [],
+        'bidsReceived': [{
+          'bidderCode': 'appnexus',
+          'width': 300,
+          'height': 250,
+          'statusMessage': 'Bid available',
+          'adId': '32780c4bc382cb',
+          'requestId': '248f9a4489835e',
+          'mediaType': 'banner',
+          'source': 'client',
+          'cpm': 0.5,
+          'creativeId': 96846035,
+          'currency': 'USD',
+          'netRevenue': true,
+          'ttl': 300,
+          'adUnitCode': '/19968336/header-bid-tag-1',
+          'appnexus': {
+            'buyerMemberId': 9325
+          },
+          'meta': {
+            'advertiserId': 2529885
+          },
+          'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
+          'originalCpm': 0.5,
+          'originalCurrency': 'USD',
+          'floorData': {
+            'fetchStatus': 'success',
+            'floorProvider': 'PubXFloorProvider',
+            'location': 'fetch',
+            'modelVersion': 'test model 1.0',
+            'skipRate': 0,
+            'skipped': false,
+            'floorValue': 0.4,
+            'floorRule': '/19968336/header-bid-tag-1|banner',
+            'floorCurrency': 'USD',
+            'cpmAfterAdjustments': 0.5,
+            'enforcements': {
+              'enforceJS': true,
+              'enforcePBS': false,
+              'floorDeals': true,
+              'bidAdjustment': true
+            },
+            'matchedFields': {
+              'gptSlot': '/19968336/header-bid-tag-1',
+              'mediaType': 'banner'
+            }
+          },
+          'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+          'responseTimestamp': 1616654313071,
+          'requestTimestamp': 1616654312804,
+          'bidder': 'appnexus',
+          'timeToRespond': 267,
+          'pbLg': '0.50',
+          'pbMg': '0.50',
+          'pbHg': '0.50',
+          'pbAg': '0.50',
+          'pbDg': '0.50',
+          'pbCg': '0.50',
+          'size': '300x250',
+          'adserverTargeting': {
+            'hb_bidder': 'appnexus',
+            'hb_adid': '32780c4bc382cb',
+            'hb_pb': '0.50',
+            'hb_size': '300x250',
+            'hb_source': 'client',
+            'hb_format': 'banner'
+          },
+          'status': 'rendered',
+          'params': [{
+            'placementId': 13144370
+          }]
+        }],
+        'winningBids': [],
+        'timeout': 1000
+      },
+      'bidWon': {
+        'bidderCode': 'appnexus',
+        'width': 300,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'adId': '32780c4bc382cb',
+        'requestId': '248f9a4489835e',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.5,
+        'creativeId': 96846035,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        'appnexus': {
+          'buyerMemberId': 9325
+        },
+        'meta': {
+          'advertiserId': 2529885
+        },
+        'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
+        'originalCpm': 0.5,
+        'originalCurrency': 'USD',
+        'floorData': {
+          'fetchStatus': 'success',
+          'floorProvider': 'PubXFloorProvider',
+          'location': 'fetch',
+          'modelVersion': 'test model 1.0',
+          'skipRate': 0,
+          'skipped': false,
+          'floorValue': 0.4,
+          'floorRule': '/19968336/header-bid-tag-1|banner',
+          'floorCurrency': 'USD',
+          'cpmAfterAdjustments': 0.5,
+          'enforcements': {
+            'enforceJS': true,
+            'enforcePBS': false,
+            'floorDeals': true,
+            'bidAdjustment': true
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'responseTimestamp': 1616654313071,
+        'requestTimestamp': 1616654312804,
+        'bidder': 'appnexus',
+        'timeToRespond': 267,
+        'pbLg': '0.50',
+        'pbMg': '0.50',
+        'pbHg': '0.50',
+        'pbAg': '0.50',
+        'pbDg': '0.50',
+        'pbCg': '0.50',
+        'size': '300x250',
+        'adserverTargeting': {
+          'hb_bidder': 'appnexus',
+          'hb_adid': '32780c4bc382cb',
+          'hb_pb': '0.50',
+          'hb_size': '300x250',
+          'hb_source': 'client',
+          'hb_format': 'banner'
+        },
+        'status': 'rendered',
+        'params': [{
+          'placementId': 13144370
+        }]
+      },
+      'pageDetail': {
+        'host': location.host,
+        'path': location.pathname,
+        'search': location.search
+      },
+      'pmcDetail': {
+        'bidDensity': storage.getItem('pbx:dpbid'),
+        'maxBid': storage.getItem('pbx:mxbid'),
+        'auctionId': storage.getItem('pbx:aucid')
+      }
+    };
+
+    let expectedAfterBid = {
+      'bids': [{
+        'bidderCode': 'appnexus',
+        'bidId': '248f9a4489835e',
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        'gptSlotCode': utils.getGptSlotInfoForAdUnitCode('/19968336/header-bid-tag-1').gptSlot || null,
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'sizes': '300x250',
+        'renderStatus': 2,
+        'requestTimestamp': 1616654312804,
+        'creativeId': 96846035,
+        'currency': 'USD',
+        'cpm': 0.5,
+        'netRevenue': true,
+        'mediaType': 'banner',
+        'statusMessage': 'Bid available',
+        'floorData': {
+          'fetchStatus': 'success',
+          'floorProvider': 'PubXFloorProvider',
+          'location': 'fetch',
+          'modelVersion': 'test model 1.0',
+          'skipRate': 0,
+          'skipped': false,
+          'floorValue': 0.4,
+          'floorRule': '/19968336/header-bid-tag-1|banner',
+          'floorCurrency': 'USD',
+          'cpmAfterAdjustments': 0.5,
+          'enforcements': {
+            'enforceJS': true,
+            'enforcePBS': false,
+            'floorDeals': true,
+            'bidAdjustment': true
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'timeToRespond': 267,
+        'responseTimestamp': 1616654313071
+      }],
+      'pageDetail': {
+        'host': location.host,
+        'path': location.pathname,
+        'search': location.search,
+        'adUnitCount': 1
+      },
+      'floorDetail': {
+        'fetchStatus': 'success',
+        'floorProvider': 'PubXFloorProvider',
+        'location': 'fetch',
+        'modelVersion': 'test model 1.0',
+        'skipRate': 0,
+        'skipped': false
+      },
+      'deviceDetail': {
+        'platform': navigator.platform,
+        'deviceType': getDeviceType(),
+        'deviceOS': getOS(),
+        'browser': getBrowser()
+      },
+      'pmcDetail': {
+        'bidDensity': storage.getItem('pbx:dpbid'),
+        'maxBid': storage.getItem('pbx:mxbid'),
+        'auctionId': storage.getItem('pbx:aucid')
+      },
+      'initOptions': initOptions
+    };
+
+    let expectedAfterBidWon = {
+      'winningBid': {
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        'gptSlotCode': utils.getGptSlotInfoForAdUnitCode('/19968336/header-bid-tag-1').gptSlot || null,
+        'auctionId': 'bc3806e4-873e-453c-8ae5-204f35e923b4',
+        'bidderCode': 'appnexus',
+        'bidId': '248f9a4489835e',
+        'cpm': 0.5,
+        'creativeId': 96846035,
+        'currency': 'USD',
+        'floorData': {
+          'fetchStatus': 'success',
+          'floorProvider': 'PubXFloorProvider',
+          'location': 'fetch',
+          'modelVersion': 'test model 1.0',
+          'skipRate': 0,
+          'skipped': false,
+          'floorValue': 0.4,
+          'floorRule': '/19968336/header-bid-tag-1|banner',
+          'floorCurrency': 'USD',
+          'cpmAfterAdjustments': 0.5,
+          'enforcements': {
+            'enforceJS': true,
+            'enforcePBS': false,
+            'floorDeals': true,
+            'bidAdjustment': true
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'floorProvider': 'PubXFloorProvider',
+        'floorFetchStatus': 'success',
+        'floorLocation': 'fetch',
+        'floorModelVersion': 'test model 1.0',
+        'floorSkipRate': 0,
+        'isFloorSkipped': false,
+        'isWinningBid': true,
+        'mediaType': 'banner',
+        'netRevenue': true,
+        'placementId': 13144370,
+        'renderedSize': '300x250',
+        'renderStatus': 4,
+        'responseTimestamp': 1616654313071,
+        'requestTimestamp': 1616654312804,
+        'status': 'rendered',
+        'statusMessage': 'Bid available',
+        'timeToRespond': 267
+      },
+      'pageDetail': {
+        'host': location.host,
+        'path': location.pathname,
+        'search': location.search
+      },
+      'deviceDetail': {
+        'platform': navigator.platform,
+        'deviceType': getDeviceType(),
+        'deviceOS': getOS(),
+        'browser': getBrowser()
+      },
+      'initOptions': initOptions
+    }
+
+    adapterManager.registerAnalyticsAdapter({
+      code: 'pubxai',
+      adapter: pubxaiAnalyticsAdapter
+    });
+
+    beforeEach(function() {
+      adapterManager.enableAnalytics({
+        provider: 'pubxai',
+        options: initOptions
+      });
+    });
+
+    afterEach(function() {
+      pubxaiAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('builds and sends auction data', function() {
+      // Step 1: Send auction init event
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
+
+      // Step 2: Send bid requested event
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+
+      // Step 3: Send bid response event
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
+
+      // Step 4: Send bid time out event
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidEvent['bidTimeout']);
+
+      // Step 5: Send auction end event
+      events.emit(constants.EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
+
+      expect(server.requests.length).to.equal(1);
+
+      let realAfterBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(realAfterBid).to.deep.equal(expectedAfterBid);
+
+      // Step 6: Send auction bid won event
+      events.emit(constants.EVENTS.BID_WON, prebidEvent['bidWon']);
+
+      expect(server.requests.length).to.equal(2);
+
+      let winEventData = JSON.parse(server.requests[1].requestBody);
+
+      expect(winEventData).to.deep.equal(expectedAfterBidWon);
+    });
+  });
+});
diff --git a/test/spec/modules/pulsepointBidAdapter_spec.js b/test/spec/modules/pulsepointBidAdapter_spec.js
index 4b21856b68e..825b3abf432 100644
--- a/test/spec/modules/pulsepointBidAdapter_spec.js
+++ b/test/spec/modules/pulsepointBidAdapter_spec.js
@@ -2,6 +2,7 @@
 import {expect} from 'chai';
 import {spec} from 'modules/pulsepointBidAdapter.js';
 import {deepClone} from 'src/utils.js';
+import { config } from 'src/config.js';
 
 describe('PulsePoint Adapter Tests', function () {
   const slotConfigs = [{
@@ -19,6 +20,11 @@ describe('PulsePoint Adapter Tests', function () {
     }
   }, {
     placementCode: '/DfpAccount2/slot2',
+    mediaTypes: {
+      banner: {
+        sizes: [[728, 90]]
+      }
+    },
     bidId: 'bid23456',
     params: {
       cp: 'p10000',
@@ -72,6 +78,11 @@ describe('PulsePoint Adapter Tests', function () {
   }];
   const additionalParamsConfig = [{
     placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]]
+      }
+    },
     bidId: 'bid12345',
     params: {
       cp: 'p10000',
@@ -89,6 +100,11 @@ describe('PulsePoint Adapter Tests', function () {
 
   const ortbParamsSlotConfig = [{
     placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]]
+      }
+    },
     bidId: 'bid12345',
     params: {
       cp: 'p10000',
@@ -146,6 +162,11 @@ describe('PulsePoint Adapter Tests', function () {
 
   const schainParamsSlotConfig = [{
     placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]]
+      }
+    },
     bidId: 'bid12345',
     params: {
       cp: 'p10000',
@@ -174,7 +195,8 @@ describe('PulsePoint Adapter Tests', function () {
 
   const bidderRequest = {
     refererInfo: {
-      referer: 'https://publisher.com/home'
+      page: 'https://publisher.com/home',
+      ref: 'https://referrer'
     }
   };
 
@@ -187,7 +209,7 @@ describe('PulsePoint Adapter Tests', function () {
     expect(ortbRequest.site).to.not.equal(null);
     expect(ortbRequest.site.publisher).to.not.equal(null);
     expect(ortbRequest.site.publisher.id).to.equal('p10000');
-    expect(ortbRequest.site.ref).to.equal(window.top.document.referrer);
+    expect(ortbRequest.site.ref).to.equal(bidderRequest.refererInfo.ref);
     expect(ortbRequest.site.page).to.equal('https://publisher.com/home');
     expect(ortbRequest.imp).to.have.lengthOf(2);
     // device object
@@ -234,7 +256,7 @@ describe('PulsePoint Adapter Tests', function () {
     expect(bid.ttl).to.equal(20);
   });
 
-  it('Verify ttl/currency applied to bid', function () {
+  it('Verify ttl/currency/adomain applied to bid', function () {
     const request = spec.buildRequests(slotConfigs, bidderRequest);
     const ortbRequest = request.data;
     const ortbResponse = {
@@ -244,7 +266,8 @@ describe('PulsePoint Adapter Tests', function () {
           price: 1.25,
           adm: 'This is an Ad#1',
           crid: 'Creative#123',
-          exp: 50
+          exp: 50,
+          adomain: ['advertiser.com']
         }, {
           impid: ortbRequest.imp[1].id,
           price: 1.25,
@@ -262,11 +285,15 @@ describe('PulsePoint Adapter Tests', function () {
     expect(bid.ad).to.equal('This is an Ad#1');
     expect(bid.ttl).to.equal(50);
     expect(bid.currency).to.equal('GBP');
+    expect(bid.meta).to.not.be.null;
+    expect(bid.meta.advertiserDomains).to.eql(['advertiser.com']);
     const secondBid = bids[1];
     expect(secondBid.cpm).to.equal(1.25);
     expect(secondBid.ad).to.equal('This is an Ad#2');
     expect(secondBid.ttl).to.equal(20);
     expect(secondBid.currency).to.equal('GBP');
+    expect(secondBid.meta).to.not.be.null;
+    expect(secondBid.meta.advertiserDomains).to.eql([]);
   });
 
   it('Verify full passback', function () {
@@ -590,60 +617,21 @@ describe('PulsePoint Adapter Tests', function () {
   });
   it('Verify common id parameters', function () {
     const bidRequests = deepClone(slotConfigs);
-    bidRequests[0].userId = {
-      pubcid: 'userid_pubcid',
-      tdid: 'userid_ttd',
-      digitrustid: {
-        data: {
-          id: 'userid_digitrust',
-          keyv: 4,
-          privacy: {optout: false},
-          producer: 'ABC',
-          version: 2
+    bidRequests[0].userIdAsEids = [{
+      source: 'pubcid.org',
+      uids: [{
+        id: 'userid_pubcid'
+      }]
+    }, {
+      source: 'adserver.org',
+      uids: [{
+        id: 'userid_ttd',
+        ext: {
+          rtiPartner: 'TDID'
         }
-      }
-    };
-    const request = spec.buildRequests(bidRequests, bidderRequest);
-    expect(request).to.be.not.null;
-    const ortbRequest = request.data;
-    expect(request.data).to.be.not.null;
-    // user object
-    expect(ortbRequest.user).to.not.be.undefined;
-    expect(ortbRequest.user.ext).to.not.be.undefined;
-    expect(ortbRequest.user.ext.eids).to.not.be.undefined;
-    expect(ortbRequest.user.ext.eids).to.have.lengthOf(2);
-    expect(ortbRequest.user.ext.eids[0].source).to.equal('pubcommon');
-    expect(ortbRequest.user.ext.eids[0].uids).to.have.lengthOf(1);
-    expect(ortbRequest.user.ext.eids[0].uids[0].id).to.equal('userid_pubcid');
-    expect(ortbRequest.user.ext.eids[1].source).to.equal('adserver.org');
-    expect(ortbRequest.user.ext.eids[1].uids).to.have.lengthOf(1);
-    expect(ortbRequest.user.ext.eids[1].uids[0].id).to.equal('userid_ttd');
-    expect(ortbRequest.user.ext.eids[1].uids[0].ext).to.not.be.null;
-    expect(ortbRequest.user.ext.eids[1].uids[0].ext.rtiPartner).to.equal('TDID');
-    expect(ortbRequest.user.ext.digitrust).to.not.be.null;
-    expect(ortbRequest.user.ext.digitrust.id).to.equal('userid_digitrust');
-    expect(ortbRequest.user.ext.digitrust.keyv).to.equal(4);
-  });
-  it('Verify new external user id partners', function () {
-    const bidRequests = deepClone(slotConfigs);
-    bidRequests[0].userId = {
-      britepoolid: 'britepool_id123',
-      criteoId: 'criteo_id234',
-      idl_env: 'idl_id123',
-      id5id: 'id5id_234',
-      parrableid: 'parrable_id234',
-      lipb: {
-        lipbid: 'liveintent_id123'
-      }
-    };
-    const userVerify = function(obj, source, id) {
-      expect(obj).to.deep.equal({
-        source,
-        uids: [{
-          id
-        }]
-      });
-    };
+      }]
+    }
+    ];
     const request = spec.buildRequests(bidRequests, bidderRequest);
     expect(request).to.be.not.null;
     const ortbRequest = request.data;
@@ -652,13 +640,7 @@ describe('PulsePoint Adapter Tests', function () {
     expect(ortbRequest.user).to.not.be.undefined;
     expect(ortbRequest.user.ext).to.not.be.undefined;
     expect(ortbRequest.user.ext.eids).to.not.be.undefined;
-    expect(ortbRequest.user.ext.eids).to.have.lengthOf(6);
-    userVerify(ortbRequest.user.ext.eids[0], 'britepool.com', 'britepool_id123');
-    userVerify(ortbRequest.user.ext.eids[1], 'criteo', 'criteo_id234');
-    userVerify(ortbRequest.user.ext.eids[2], 'identityLink', 'idl_id123');
-    userVerify(ortbRequest.user.ext.eids[3], 'id5-sync.com', 'id5id_234');
-    userVerify(ortbRequest.user.ext.eids[4], 'parrable.com', 'parrable_id234');
-    userVerify(ortbRequest.user.ext.eids[5], 'liveintent.com', 'liveintent_id123');
+    expect(ortbRequest.user.ext.eids).to.deep.equal(bidRequests[0].userIdAsEids);
   });
   it('Verify multiple adsizes', function () {
     const bidRequests = deepClone(slotConfigs);
@@ -681,7 +663,10 @@ describe('PulsePoint Adapter Tests', function () {
     expect(ortbRequest.imp[1].banner).to.not.be.null;
     expect(ortbRequest.imp[1].banner.w).to.equal(728);
     expect(ortbRequest.imp[1].banner.h).to.equal(90);
-    expect(ortbRequest.imp[1].banner.format).to.be.null;
+    expect(ortbRequest.imp[1].banner.format).to.not.be.null;
+    expect(ortbRequest.imp[1].banner.format).to.have.lengthOf(1);
+    expect(ortbRequest.imp[1].banner.format[0].w).to.equal(728);
+    expect(ortbRequest.imp[1].banner.format[0].h).to.equal(90);
     // adsize on response
     const ortbResponse = {
       seatbid: [{
@@ -701,4 +686,236 @@ describe('PulsePoint Adapter Tests', function () {
     expect(bid.width).to.equal(728);
     expect(bid.height).to.equal(90);
   });
+  it('Verify multi-format response', function () {
+    const bidRequests = deepClone(slotConfigs);
+    bidRequests[0].mediaTypes['native'] = {
+      title: {
+        required: true
+      },
+      image: {
+        required: true
+      },
+      sponsoredBy: {
+        required: true
+      }
+    };
+    bidRequests[1].params.video = {
+      w: 400,
+      h: 300,
+      minduration: 5,
+      maxduration: 10,
+    };
+    const request = spec.buildRequests(bidRequests, bidderRequest);
+    expect(request).to.be.not.null;
+    expect(request.data).to.be.not.null;
+    const ortbRequest = request.data;
+    expect(ortbRequest.imp).to.have.lengthOf(2);
+    // adsize on response
+    const ortbResponse = {
+      seatbid: [{
+        bid: [{
+          impid: ortbRequest.imp[0].id,
+          price: 1.25,
+          adm: 'This is an Ad',
+          crid: 'Creative#123',
+          w: 728,
+          h: 90
+        }, {
+          impid: ortbRequest.imp[1].id,
+          price: 2.5,
+          adm: '<vast url="http://ad.com/video"></vast>',
+          crid: 'Creative#234',
+          w: 728,
+          h: 90
+        }]
+      }]
+    };
+    // request has both types - banner and native, response is parsed as banner.
+    // for impression#2, response is parsed as video
+    const bids = spec.interpretResponse({ body: ortbResponse }, request);
+    expect(bids).to.have.lengthOf(2);
+    const bid = bids[0];
+    expect(bid.width).to.equal(728);
+    expect(bid.height).to.equal(90);
+    const secondBid = bids[1];
+    expect(secondBid.vastXml).to.equal('<vast url="http://ad.com/video"></vast>');
+  });
+  it('Verify bid floor', function () {
+    const bidRequests = deepClone(slotConfigs);
+    bidRequests[0].params.bidfloor = 1.05;
+    let request = spec.buildRequests(bidRequests, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp[0].bidfloor).to.equal(1.05);
+    expect(ortbRequest.imp[1].bidfloor).to.be.undefined;
+    let floorArg = null;
+    // publisher uses the floor module
+    bidRequests[0].getFloor = (arg) => {
+      floorArg = arg;
+      return { floor: 1.25 };
+    };
+    bidRequests[1].getFloor = () => {
+      return { floor: 2.05 };
+    };
+    request = spec.buildRequests(bidRequests, bidderRequest);
+    ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp[0].bidfloor).to.equal(1.25);
+    expect(ortbRequest.imp[1].bidfloor).to.equal(2.05);
+    expect(floorArg).to.not.be.null;
+    expect(floorArg.mediaType).to.equal('banner');
+    expect(floorArg.currency).to.equal('USD');
+    expect(floorArg.size).to.equal('*');
+  });
+  it('Verify Video params on mediaTypes.video', function () {
+    const bidRequests = deepClone(videoSlotConfig);
+    bidRequests[0].mediaTypes = {
+      video: {
+        w: 600,
+        h: 400,
+        minduration: 15,
+        maxduration: 20,
+        startdelay: 10,
+        skip: 0,
+      }
+    };
+    const request = spec.buildRequests(bidRequests, bidderRequest);
+    const ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp).to.have.lengthOf(1);
+    expect(ortbRequest.imp[0].video).to.not.be.null;
+    expect(ortbRequest.imp[0].native).to.be.null;
+    expect(ortbRequest.imp[0].banner).to.be.null;
+    expect(ortbRequest.imp[0].video.w).to.equal(600);
+    expect(ortbRequest.imp[0].video.h).to.equal(400);
+    expect(ortbRequest.imp[0].video.minduration).to.equal(15);
+    expect(ortbRequest.imp[0].video.maxduration).to.equal(20);
+    expect(ortbRequest.imp[0].video.startdelay).to.equal(10);
+    expect(ortbRequest.imp[0].video.skip).to.equal(0);
+    expect(ortbRequest.imp[0].video.minbitrate).to.equal(200);
+    expect(ortbRequest.imp[0].video.protocols).to.eql([1, 2, 4]);
+  });
+  it('Verify user level first party data', function () {
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://publisher.com/home',
+        ref: 'https://referrer'
+      },
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'serialized_gpdr_data'
+      },
+      ortb2: {
+        user: {
+          yob: 1985,
+          gender: 'm',
+          ext: {
+            data: {
+              registered: true,
+              interests: ['cars']
+            }
+          }
+        }
+      }
+    };
+    let request = spec.buildRequests(slotConfigs, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.user).to.not.equal(null);
+    expect(ortbRequest.user).to.deep.equal({
+      yob: 1985,
+      gender: 'm',
+      ext: {
+        data: {
+          registered: true,
+          interests: ['cars']
+        },
+        consent: 'serialized_gpdr_data'
+      }
+    });
+  });
+  it('Verify site level first party data', function () {
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://publisher.com/home',
+        ref: 'https://referrer'
+      },
+      ortb2: {
+        site: {
+          content: {
+            data: [{
+              name: 'www.iris.com',
+              ext: {
+                segtax: 500,
+                cids: ['iris_c73g5jq96mwso4d8']
+              }
+            }]
+          },
+          page: 'http://pub.com/news',
+          ref: 'http://google.com'
+        }
+      }
+    };
+    let request = spec.buildRequests(slotConfigs, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.site).to.not.equal(null);
+    expect(ortbRequest.site).to.deep.equal({
+      content: {
+        data: [{
+          name: 'www.iris.com',
+          ext: {
+            segtax: 500,
+            cids: ['iris_c73g5jq96mwso4d8']
+          }
+        }]
+      },
+      page: 'https://publisher.com/home',
+      ref: 'https://referrer',
+      publisher: {
+        id: 'p10000'
+      }
+    });
+  });
+  it('Verify impression/slot level first party data', function () {
+    const bidderRequests = [{
+      placementCode: '/DfpAccount1/slot1',
+      mediaTypes: {
+        banner: {
+          sizes: [[1, 1]]
+        }
+      },
+      bidId: 'bid12345',
+      params: {
+        cp: 'p10000',
+        ct: 't10000',
+        extra_key1: 'extra_val1',
+        extra_key2: 12345
+      },
+      ortb2Imp: {
+        ext: {
+          data: {
+            pbadslot: 'homepage-top-rect',
+            adUnitSpecificAttribute: '123'
+          }
+        }
+      }
+    }];
+    let request = spec.buildRequests(bidderRequests, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp).to.not.equal(null);
+    expect(ortbRequest.imp).to.have.lengthOf(1);
+    expect(ortbRequest.imp[0].ext).to.not.equal(null);
+    expect(ortbRequest.imp[0].ext).to.deep.equal({
+      prebid: {
+        extra_key1: 'extra_val1',
+        extra_key2: 12345
+      },
+      data: {
+        pbadslot: 'homepage-top-rect',
+        adUnitSpecificAttribute: '123'
+      }
+    });
+  });
 });
diff --git a/test/spec/modules/pxyzBidAdapter_spec.js b/test/spec/modules/pxyzBidAdapter_spec.js
index 6d8c6056076..3a336c86e46 100644
--- a/test/spec/modules/pxyzBidAdapter_spec.js
+++ b/test/spec/modules/pxyzBidAdapter_spec.js
@@ -8,7 +8,7 @@ const GDPR_CONSENT = 'XYZ-CONSENT';
 
 const BIDDER_REQUEST = {
   refererInfo: {
-    referer: 'https://example.com'
+    page: 'https://example.com',
   }
 };
 
@@ -191,11 +191,15 @@ describe('pxyzBidAdapter', function () {
           'mediaType': 'banner',
           'currency': 'AUD',
           'ttl': 300,
-          'netRevenue': true
+          'netRevenue': true,
+          'meta': {
+            advertiserDomains: ['pg.xyz']
+          }
         }
       ];
       let result = spec.interpretResponse({ body: response }, {bidderRequest});
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal(expectedResponse[0].meta.advertiserDomains);
     });
 
     it('handles nobid response', function () {
diff --git a/test/spec/modules/quantcastBidAdapter_spec.js b/test/spec/modules/quantcastBidAdapter_spec.js
index cd168ec61e6..d10fea829bc 100644
--- a/test/spec/modules/quantcastBidAdapter_spec.js
+++ b/test/spec/modules/quantcastBidAdapter_spec.js
@@ -7,7 +7,8 @@ import {
   QUANTCAST_TEST_PUBLISHER,
   QUANTCAST_PROTOCOL,
   QUANTCAST_PORT,
-  spec as qcSpec
+  spec as qcSpec,
+  storage
 } from '../../../modules/quantcastBidAdapter.js';
 import { newBidder } from '../../../src/adapters/bidderFactory.js';
 import { parseUrl } from 'src/utils.js';
@@ -18,7 +19,15 @@ describe('Quantcast adapter', function () {
   let bidRequest;
   let bidderRequest;
 
+  afterEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+  });
   beforeEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      quantcast: {
+        storageAllowed: true
+      }
+    };
     bidRequest = {
       bidder: 'quantcast',
       bidId: '2f7b179d443f14',
@@ -38,22 +47,24 @@ describe('Quantcast adapter', function () {
 
     bidderRequest = {
       refererInfo: {
-        referer: 'http://example.com/hello.html',
-        canonicalUrl: 'http://example.com/hello.html'
+        page: 'http://example.com/hello.html',
+        ref: 'http://example.com/hello.html',
+        domain: 'example.com'
       }
     };
+
+    storage.setCookie('__qca', '', 'Thu, 01 Jan 1970 00:00:00 GMT');
   });
 
-  function setupVideoBidRequest(videoParams) {
+  function setupVideoBidRequest(videoParams, mediaTypesParams) {
     bidRequest.params = {
       publisherId: 'test-publisher', // REQUIRED - Publisher ID provided by Quantcast
       // Video object as specified in OpenRTB 2.5
       video: videoParams
     };
-    bidRequest['mediaTypes'] = {
-      video: {
-        context: 'instream',
-        playerSize: [600, 300]
+    if (mediaTypesParams) {
+      bidRequest['mediaTypes'] = {
+        video: mediaTypesParams
       }
     }
   };
@@ -140,7 +151,8 @@ describe('Quantcast adapter', function () {
       gdprSignal: 0,
       uspSignal: 0,
       coppa: 0,
-      prebidJsVersion: '$prebid.version$'
+      prebidJsVersion: '$prebid.version$',
+      fpa: ''
     };
 
     it('sends banner bid requests contains all the required parameters', function () {
@@ -171,6 +183,9 @@ describe('Quantcast adapter', function () {
         delivery: [1], // optional
         placement: 1, // optional
         api: [2, 3] // optional
+      }, {
+        context: 'instream',
+        playerSize: [600, 300]
       });
 
       const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
@@ -208,7 +223,68 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
+      };
+
+      expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
+    });
+
+    it('sends video bid requests containing all the required parameters from mediaTypes', function() {
+      setupVideoBidRequest(null, {
+        mimes: ['video/mp4'], // required
+        minduration: 3, // optional
+        maxduration: 5, // optional
+        protocols: [3], // optional
+        startdelay: 1, // optional
+        linearity: 1, // optinal
+        battr: [1, 2], // optional
+        maxbitrate: 10, // optional
+        playbackmethod: [1], // optional
+        delivery: [1], // optional
+        placement: 1, // optional
+        api: [2, 3], // optional
+        context: 'instream',
+        playerSize: [600, 300]
+      });
+
+      const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
+      const expectedVideoBidRequest = {
+        publisherId: QUANTCAST_TEST_PUBLISHER,
+        requestId: '2f7b179d443f14',
+        imp: [
+          {
+            video: {
+              mimes: ['video/mp4'],
+              minduration: 3,
+              maxduration: 5,
+              protocols: [3],
+              startdelay: 1,
+              linearity: 1,
+              battr: [1, 2],
+              maxbitrate: 10,
+              playbackmethod: [1],
+              delivery: [1],
+              placement: 1,
+              api: [2, 3],
+              w: 600,
+              h: 300
+            },
+            placementCode: 'div-gpt-ad-1438287399331-0',
+            bidFloor: 1e-10
+          }
+        ],
+        site: {
+          page: 'http://example.com/hello.html',
+          referrer: 'http://example.com/hello.html',
+          domain: 'example.com'
+        },
+        bidId: '2f7b179d443f14',
+        gdprSignal: 0,
+        uspSignal: 0,
+        coppa: 0,
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
@@ -217,6 +293,9 @@ describe('Quantcast adapter', function () {
     it('overrides video parameters with parameters from adunit', function() {
       setupVideoBidRequest({
         mimes: ['video/mp4']
+      }, {
+        context: 'instream',
+        playerSize: [600, 300]
       });
       bidRequest.mediaTypes.video.mimes = ['video/webm'];
 
@@ -244,14 +323,18 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
     });
 
     it('sends video bid request when no video parameters are given', function () {
-      setupVideoBidRequest(null);
+      setupVideoBidRequest(null, {
+        context: 'instream',
+        playerSize: [600, 300]
+      });
 
       const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
       const expectedVideoBidRequest = {
@@ -276,7 +359,8 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
@@ -340,7 +424,8 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedBidRequest));
@@ -362,94 +447,6 @@ describe('Quantcast adapter', function () {
     expect(parsed.gdprConsent).to.equal('consentString');
   });
 
-  it('allows TCF v1 request with consent for purpose 1', function () {
-    const bidderRequest = {
-      gdprConsent: {
-        gdprApplies: true,
-        consentString: 'consentString',
-        vendorData: {
-          vendorConsents: {
-            '11': true
-          },
-          purposeConsents: {
-            '1': true
-          }
-        },
-        apiVersion: 1
-      }
-    };
-
-    const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
-    const parsed = JSON.parse(requests[0].data);
-
-    expect(parsed.gdprSignal).to.equal(1);
-    expect(parsed.gdprConsent).to.equal('consentString');
-  });
-
-  it('blocks TCF v1 request without vendor consent', function () {
-    const bidderRequest = {
-      gdprConsent: {
-        gdprApplies: true,
-        consentString: 'consentString',
-        vendorData: {
-          vendorConsents: {
-            '11': false
-          },
-          purposeConsents: {
-            '1': true
-          }
-        },
-        apiVersion: 1
-      }
-    };
-
-    const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
-
-    expect(requests).to.equal(undefined);
-  });
-
-  it('blocks TCF v1 request without consent for purpose 1', function () {
-    const bidderRequest = {
-      gdprConsent: {
-        gdprApplies: true,
-        consentString: 'consentString',
-        vendorData: {
-          vendorConsents: {
-            '11': true
-          },
-          purposeConsents: {
-            '1': false
-          }
-        },
-        apiVersion: 1
-      }
-    };
-
-    const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
-
-    expect(requests).to.equal(undefined);
-  });
-
-  it('allows TCF v2 request from Germany for purpose 1', function () {
-    const bidderRequest = {
-      gdprConsent: {
-        gdprApplies: true,
-        consentString: 'consentString',
-        vendorData: {
-          publisherCC: 'DE',
-          purposeOneTreatment: true
-        },
-        apiVersion: 2
-      }
-    };
-
-    const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
-    const parsed = JSON.parse(requests[0].data);
-
-    expect(parsed.gdprSignal).to.equal(1);
-    expect(parsed.gdprConsent).to.equal('consentString');
-  });
-
   it('allows TCF v2 request when Quantcast has consent for purpose 1', function() {
     const bidderRequest = {
       gdprConsent: {
@@ -604,6 +601,13 @@ describe('Quantcast adapter', function () {
     expect(parsed.uspConsent).to.equal('consentString');
   });
 
+  it('propagates Quantcast first-party cookie (fpa)', function() {
+    storage.setCookie('__qca', 'P0-TestFPA');
+    const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
+    const parsed = JSON.parse(requests[0].data);
+    expect(parsed.fpa).to.equal('P0-TestFPA');
+  });
+
   describe('propagates coppa', function() {
     let sandbox;
     beforeEach(() => {
@@ -663,7 +667,10 @@ describe('Quantcast adapter', function () {
             '<!DOCTYPE html><div style="height: 250; width: 300; display: table-cell; vertical-align: middle;"><div style="width: 300px; margin-left: auto; margin-right: auto;"><script src="https://adserver.adtechus.com/addyn/3.0/5399.1/2394397/0/-1/QUANTCAST;size=300x250;target=_blank;alias=;kvp36=;sub1=;kvl=;kvc=;kvs=300x250;kvi=;kva=;sub2=;rdclick=http://exch.quantserve.com/r?a=;labels=_qc.clk,_click.adserver.rtb,_click.rand.;rtbip=;rtbdata2=;redirecturl2=" type="text/javascript"></script><img src="https://exch.quantserve.com/pixel/p_12345.gif?media=ad&p=&r=&rand=&labels=_qc.imp,_imp.adserver.rtb&rtbip=&rtbdata2=" style="display: none;" border="0" height="1" width="1" alt="Quantcast"/></div></div>',
           creativeId: 1001,
           width: 300,
-          height: 250
+          height: 250,
+          meta: {
+            advertiserDomains: ['dailymail.com']
+          }
         }
       ]
     };
@@ -723,7 +730,10 @@ describe('Quantcast adapter', function () {
         ttl: QUANTCAST_TTL,
         creativeId: 1001,
         netRevenue: QUANTCAST_NET_REVENUE,
-        currency: 'USD'
+        currency: 'USD',
+        meta: {
+          advertiserDomains: ['dailymail.com']
+        }
       };
       const interpretedResponse = qcSpec.interpretResponse(response);
 
@@ -743,7 +753,10 @@ describe('Quantcast adapter', function () {
         creativeId: 1001,
         netRevenue: QUANTCAST_NET_REVENUE,
         currency: 'USD',
-        dealId: 'test-dealid'
+        dealId: 'test-dealid',
+        meta: {
+          advertiserDomains: ['dailymail.com']
+        }
       };
       const interpretedResponse = qcSpec.interpretResponse(response);
 
diff --git a/test/spec/modules/quantcastIdSystem_spec.js b/test/spec/modules/quantcastIdSystem_spec.js
new file mode 100644
index 00000000000..e9d44dd6124
--- /dev/null
+++ b/test/spec/modules/quantcastIdSystem_spec.js
@@ -0,0 +1,383 @@
+import { quantcastIdSubmodule, storage, firePixel, hasCCPAConsent, hasGDPRConsent, checkTCFv2 } from 'modules/quantcastIdSystem.js';
+import * as utils from 'src/utils.js';
+import {coppaDataHandler} from 'src/adapterManager';
+
+describe('QuantcastId module', function () {
+  beforeEach(function() {
+    sinon.stub(coppaDataHandler, 'getCoppa');
+    sinon.stub(utils, 'triggerPixel');
+    sinon.stub(window, 'addEventListener');
+  });
+
+  afterEach(function () {
+    utils.triggerPixel.restore();
+    coppaDataHandler.getCoppa.restore();
+    window.addEventListener.restore();
+  });
+
+  it('getId() should return a quantcast id when the Quantcast first party cookie exists', function () {
+    sinon.stub(storage, 'getCookie').returns('P0-TestFPA');
+    const id = quantcastIdSubmodule.getId();
+    expect(id).to.be.deep.equal({id: {quantcastId: 'P0-TestFPA'}});
+    storage.getCookie.restore();
+  });
+
+  it('getId() should return an empty id when the Quantcast first party cookie is missing', function () {
+    const id = quantcastIdSubmodule.getId();
+    expect(id).to.be.deep.equal({id: undefined});
+  });
+});
+
+describe('QuantcastId fire pixel', function () {
+  beforeEach(function () {
+    storage.setCookie('__qca', '', 'Thu, 01 Jan 1970 00:00:00 GMT');
+    sinon.stub(storage, 'setCookie');
+    sinon.stub(utils, 'triggerPixel');
+  });
+
+  afterEach(function () {
+    utils.triggerPixel.restore();
+    storage.setCookie.restore();
+  });
+
+  it('fpa should be set when not present on this call', function () {
+    firePixel('clientId');
+    var urlString = utils.triggerPixel.getCall(0).args[0];
+    var parsedUrl = utils.parseUrl(urlString);
+    var urlSearchParams = parsedUrl.search;
+    assert.equal(urlSearchParams.fpan, '1');
+    assert.notEqual(urlSearchParams.fpa, null);
+  });
+
+  it('fpa should be extracted from the Quantcast first party cookie when present on this call', function () {
+    sinon.stub(storage, 'getCookie').returns('P0-TestFPA');
+    firePixel('clientId');
+    var urlString = utils.triggerPixel.getCall(0).args[0];
+    var parsedUrl = utils.parseUrl(urlString);
+    var urlSearchParams = parsedUrl.search;
+    assert.equal(urlSearchParams.fpan, '0');
+    assert.equal(urlSearchParams.fpa, 'P0-TestFPA');
+    storage.getCookie.restore();
+  });
+
+  it('function to trigger pixel is called once', function () {
+    firePixel('clientId');
+    expect(utils.triggerPixel.calledOnce).to.equal(true);
+  });
+
+  it('function to trigger pixel is not called when client id is absent', function () {
+    firePixel();
+    expect(utils.triggerPixel.calledOnce).to.equal(false);
+  });
+});
+
+describe('Quantcast CCPA consent check', function() {
+  it('returns true when CCPA constent string is not present', function() {
+    expect(hasCCPAConsent()).to.equal(true);
+  });
+
+  it("returns true when notice_given or do-not-sell in CCPA constent string is not 'Y' ", function() {
+    expect(hasCCPAConsent('1NNN')).to.equal(true);
+    expect(hasCCPAConsent('1YNN')).to.equal(true);
+    expect(hasCCPAConsent('1NYN')).to.equal(true);
+  });
+
+  it("returns false when CCPA consent string is present, and notice_given or do-not-sell in the string is 'Y' ", function() {
+    expect(hasCCPAConsent('1YYN')).to.equal(false);
+  });
+});
+
+describe('Quantcast GDPR consent check', function() {
+  it("returns true when GDPR doesn't apply", function() {
+    expect(hasGDPRConsent({gdprApplies: false})).to.equal(true);
+  });
+
+  it('returns false if denied consent, even if special purpose 1 treatment is true in DE', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      publisherCC: 'DE',
+      purposeOneTreatment: true,
+      vendor: {
+        consents: { '11': false }
+      },
+      purpose: {
+        consents: { '1': false }
+      },
+      publisher: {
+        restrictions: {
+          '1': {
+            '11': 0 // flatly disallow Quantcast
+          }
+        }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if publisher flatly denies required purpose', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true }
+      },
+      purpose: {
+        consents: { '1': true }
+      },
+      publisher: {
+        restrictions: {
+          '1': {
+            '11': 0 // flatly disallow Quantcast
+          }
+        }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns true if positive consent for required purpose', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true }
+      },
+      purpose: {
+        consents: { '1': true }
+      }
+    }, ['1'])).to.equal(true);
+  });
+
+  it('returns false if positive consent but publisher requires legitimate interest for required purpose', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true }
+      },
+      purpose: {
+        consents: { '1': true }
+      },
+      publisher: {
+        restrictions: {
+          '1': {
+            '11': 2 // require legitimate interest for Quantcast
+          }
+        }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if no vendor consent and no legitimate interest', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false }
+      },
+      purpose: {
+        consents: { '1': true }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if no purpose consent and no legitimate interest', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true }
+      },
+      purpose: {
+        consents: { '1': false }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if no consent, but legitimate interest for consent-first purpose, and no restrictions specified', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '1': false },
+        legitimateInterests: { '1': true }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if consent, but no legitimate interest for legitimate-interest-first purpose, and no restrictions specified', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '10': true },
+        legitimateInterests: { '10': false }
+      }
+    }, ['10'])).to.equal(false);
+  });
+
+  it('returns true if consent, but no legitimate interest for legitimate-interest-first purpose, and corresponding consent restriction specified', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '10': true },
+        legitimateInterests: { '10': false }
+      },
+      publisher: {
+        restrictions: {
+          '10': {
+            '11': 1 // require consent for Quantcast
+          }
+        }
+      }
+    }, ['10'])).to.equal(true);
+  });
+
+  it('returns false if no consent but legitimate interest for required purpose other than 1, but publisher requires consent', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '10': false },
+        legitimateInterests: { '10': true }
+      },
+      publisher: {
+        restrictions: {
+          '10': {
+            '11': 1 // require consent for Quantcast
+          }
+        }
+      }
+    }, ['10'])).to.equal(false);
+  });
+
+  it('returns false if no consent and no legitimate interest for vendor for required purpose other than 1', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false },
+        legitimateInterests: { '11': false }
+      },
+      purpose: {
+        consents: { '10': false },
+        legitimateInterests: { '10': true }
+      }
+    }, ['10'])).to.equal(false);
+  });
+
+  it('returns false if no consent and no legitimate interest for required purpose other than 1', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '10': false },
+        legitimateInterests: { '10': false }
+      }
+    }, ['10'])).to.equal(false);
+  });
+
+  it('returns false if no consent but legitimate interest for required purpose, but required purpose is purpose 1', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '1': false },
+        legitimateInterests: { '1': true }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns true if different legal bases for multiple required purposes', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: {
+          '1': true,
+          '10': false
+        },
+        legitimateInterests: {
+          '1': false,
+          '10': true
+        }
+      },
+      publisher: {
+        restrictions: {
+          '10': {
+            '11': 2 // require legitimate interest for Quantcast
+          }
+        }
+      }
+    })).to.equal(true);
+  });
+
+  it('returns true if full consent and legitimate interest for all required purposes with no restrictions specified', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: {
+          '1': true,
+          '3': true,
+          '7': true,
+          '8': true,
+          '9': true,
+          '10': true
+        },
+        legitimateInterests: {
+          '1': true,
+          '3': true,
+          '7': true,
+          '8': true,
+          '9': true,
+          '10': true
+        }
+      }
+    })).to.equal(true);
+  });
+
+  it('returns false if one of multiple required purposes has no legal basis', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: {
+          '1': true,
+          '10': false
+        },
+        legitimateInterests: {
+          '11': false,
+          '10': true
+        }
+      },
+      publisher: {
+        restrictions: {
+          '10': {
+            '11': 1 // require consent for Quantcast
+          }
+        }
+      }
+    })).to.equal(false);
+  });
+});
diff --git a/test/spec/modules/quantumBidAdapter_spec.js b/test/spec/modules/quantumBidAdapter_spec.js
deleted file mode 100644
index c03d74ea52e..00000000000
--- a/test/spec/modules/quantumBidAdapter_spec.js
+++ /dev/null
@@ -1,325 +0,0 @@
-import { expect } from 'chai'
-import { spec } from 'modules/quantumBidAdapter.js'
-import { newBidder } from 'src/adapters/bidderFactory.js'
-
-const ENDPOINT = 'https://s.sspqns.com/hb'
-const REQUEST = {
-  'bidder': 'quantum',
-  'sizes': [[300, 250]],
-  'renderMode': 'banner',
-  'params': {
-    placementId: 21546
-  }
-}
-
-const NATIVE_REQUEST = {
-  'bidder': 'quantum',
-  'mediaType': 'native',
-  'sizes': [[0, 0]],
-  'params': {
-    placementId: 21546
-  }
-}
-
-const serverResponse = {
-  'price': 0.3,
-  'debug': [
-    ''
-  ],
-  'is_fallback': false,
-  'nurl': 'https://s.sspqns.com/imp/KpQ1WNMHV-9a3HqWL_0JnujJFGo1Hnx9RS3FT_Yy8jW-Z6t_PJYmP2otidJsxE3qcY2EozzcBjRzGM7HEQcxVnjOzq0Th1cxb6A5bSp5BizTwY5SRaxx_0PgF6--8LqaF4LMUgMmhfF5k3gOOzzK6gKdavia4_w3LJ1CRWkMEwABr8bPzeovy1y4MOZsOXv7vXjPGMKJSTgphuZR57fL4u4ZFF4XY70K_TaH5bfXHMRAzE0Q38tfpTvbdFV_u2g-FoF0gjzKjiS88VnetT-Jo3qtrMphWzr52jsg5tH3L7hbymUOm1YkuJP9xrXLoZNVgC5sTMYolKLMSu6dqhS2FXcdfaGAcHweaaAAwJq-pB7DuiVcdnZQphUymhIia_KG2AYweWp6TYEpJbJjf2BcLpm_-KGw4gLh6L3DtEvUZwXZe-JpUJ4/',
-  'native': {
-    'link': {
-      'url': 'https://s.sspqns.com/click/KpQ1WNMHV-9a3HqWL_0JnujJFGo1Hnx9RS3FT_Yy8jW-Z6t_PJYmP2otidJsxE3qcY2EozzcBjRzGM7HEQcxVnjOzq0Th1cxb6A5bSp5BizTwY5SRaxx_0PgF6--8LqaF4LMUgMmhfF5k3gOOzzK6gKdavia4_w3LJ1CRWkMEwABr8bPzeovy1y4MOZsOXv7vXjPGMKJSTgphuZR57fL4u4ZFF4XY70K_TaH5bfXHMRAzE0Q38tfpTvbdFV_u2g-FoF0gjzKjiS88VnetT-Jo3qtrMphWzr52jsg5tH3L7hbymUOm1YkuJP9xrXLoZNVgC5sTMYolKLMSu6dqhS2FXcdfaGAcHweaaAAwJq-pB7DuiVcdnZQphUymhIia_KG2AYweWp6TYEpJbJjf2BcLpm_-KGw4gLh6L3DtEvUZwXZe-JpUJ4///',
-      'clicktrackers': ['https://elasticad.net']
-    },
-    'assets': [
-      {
-        'id': 1,
-        'title': {
-          'text': 'ad.SSP.1x1'
-        },
-        'required': 1
-      },
-      {
-        'id': 2,
-        'img': {
-          'w': 15,
-          'h': 15,
-          'url': 'https://files.ssp.theadtech.com.s3.amazonaws.com/media/image/sxjermpz/scalecrop-15x15'
-        }
-      },
-      {
-        'id': 3,
-        'data': {
-          'value': 'Lorem Ipsum is simply dummy text of the printing and typesetting industry.Lorem Ipsum is simply dummy text of the printing and typesetting industry.'
-        },
-        'required': 1
-      },
-      {
-        'id': 4,
-        'img': {
-          'w': 500,
-          'h': 500,
-          'url': 'https://files.ssp.theadtech.com.s3.amazonaws.com/media/image/sxjermpz/scalecrop-500x500'
-        }
-      },
-      {
-        'id': 6,
-        'video': {
-          'vasttag': 'https://elasticad.net/vast.xml'
-        }
-      },
-      {
-        'id': 2001,
-        'data': {
-          'value': 'https://elasticad.net'
-        }
-      },
-      {
-        'id': 2002,
-        'data': {
-          'value': 'vast'
-        }
-      },
-      {
-        'id': 2007,
-        'data': {
-          'value': 'click'
-        }
-      },
-      {
-        'id': 10,
-        'data': {
-          'value': 'ad.SSP.1x1 sponsor'
-        }
-      },
-      {
-        'id': 2003,
-        'data': {
-          'value': 'https://elasticad.net'
-        }
-      },
-      {
-        'id': 2004,
-        'data': {
-          'value': 'prism'
-        }
-      },
-      {
-        'id': 2005,
-        'data': {
-          'value': '/home'
-        }
-      },
-      {
-        'id': 2006,
-        'data': {
-          'value': 'https://elasticad.net/vast.xml'
-        }
-      },
-      {
-        'id': 2022,
-        'data': {
-          'value': 'Lorem ipsum....'
-        }
-      }
-    ],
-    'imptrackers': [],
-    'ver': '1.1'
-  },
-  'sync': [
-    'https://match.adsrvr.org/track/cmb/generic?ttd_pid=s6e8ued&ttd_tpi=1'
-  ]
-}
-
-const nativeServerResponse = {
-  'price': 0.3,
-  'debug': [
-    ''
-  ],
-  'is_fallback': false,
-  'nurl': 'https://s.sspqns.com/imp/KpQ1WNMHV-9a3HqWL_0JnujJFGo1Hnx9RS3FT_Yy8jW-Z6t_PJYmP2otidJsxE3qcY2EozzcBjRzGM7HEQcxVnjOzq0Th1cxb6A5bSp5BizTwY5SRaxx_0PgF6--8LqaF4LMUgMmhfF5k3gOOzzK6gKdavia4_w3LJ1CRWkMEwABr8bPzeovy1y4MOZsOXv7vXjPGMKJSTgphuZR57fL4u4ZFF4XY70K_TaH5bfXHMRAzE0Q38tfpTvbdFV_u2g-FoF0gjzKjiS88VnetT-Jo3qtrMphWzr52jsg5tH3L7hbymUOm1YkuJP9xrXLoZNVgC5sTMYolKLMSu6dqhS2FXcdfaGAcHweaaAAwJq-pB7DuiVcdnZQphUymhIia_KG2AYweWp6TYEpJbJjf2BcLpm_-KGw4gLh6L3DtEvUZwXZe-JpUJ4/',
-  'native': {
-    'link': {
-      'url': 'https://s.sspqns.com/click/KpQ1WNMHV-9a3HqWL_0JnujJFGo1Hnx9RS3FT_Yy8jW-Z6t_PJYmP2otidJsxE3qcY2EozzcBjRzGM7HEQcxVnjOzq0Th1cxb6A5bSp5BizTwY5SRaxx_0PgF6--8LqaF4LMUgMmhfF5k3gOOzzK6gKdavia4_w3LJ1CRWkMEwABr8bPzeovy1y4MOZsOXv7vXjPGMKJSTgphuZR57fL4u4ZFF4XY70K_TaH5bfXHMRAzE0Q38tfpTvbdFV_u2g-FoF0gjzKjiS88VnetT-Jo3qtrMphWzr52jsg5tH3L7hbymUOm1YkuJP9xrXLoZNVgC5sTMYolKLMSu6dqhS2FXcdfaGAcHweaaAAwJq-pB7DuiVcdnZQphUymhIia_KG2AYweWp6TYEpJbJjf2BcLpm_-KGw4gLh6L3DtEvUZwXZe-JpUJ4///'
-    },
-    'assets': [
-      {
-        'id': 1,
-        'title': {
-          'text': 'ad.SSP.1x1'
-        },
-        'required': 1
-      },
-      {
-        'id': 2,
-        'img': {
-          'w': 15,
-          'h': 15,
-          'url': 'https://files.ssp.theadtech.com.s3.amazonaws.com/media/image/sxjermpz/scalecrop-15x15'
-        }
-      },
-      {
-        'id': 3,
-        'data': {
-          'value': 'Lorem Ipsum is simply dummy text of the printing and typesetting industry.Lorem Ipsum is simply dummy text of the printing and typesetting industry.'
-        },
-        'required': 1
-      },
-      {
-        'id': 4,
-        'img': {
-          'w': 500,
-          'h': 500,
-          'url': 'https://files.ssp.theadtech.com.s3.amazonaws.com/media/image/sxjermpz/scalecrop-500x500'
-        }
-      },
-      {
-        'id': 2007,
-        'data': {
-          'value': 'click'
-        }
-      },
-      {
-        'id': 10,
-        'data': {
-          'value': 'ad.SSP.1x1 sponsor'
-        }
-      },
-
-      {
-        'id': 2003,
-        'data': {
-          'value': 'https://elasticad.net'
-        }
-      }
-    ],
-    'imptrackers': [],
-    'ver': '1.1'
-  },
-  'sync': [
-    'https://match.adsrvr.org/track/cmb/generic?ttd_pid=s6e8ued&ttd_tpi=1'
-  ]
-}
-
-describe('quantumBidAdapter', function () {
-  const adapter = newBidder(spec)
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function')
-    })
-  })
-
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(REQUEST)).to.equal(true)
-    })
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, REQUEST)
-      delete bid.params
-      expect(spec.isBidRequestValid(bid)).to.equal(false)
-    })
-  })
-
-  describe('buildRequests', function () {
-    let bidRequests = [REQUEST]
-
-    const request = spec.buildRequests(bidRequests, {})
-
-    it('sends bid request to ENDPOINT via GET', function () {
-      expect(request[0].method).to.equal('GET')
-    })
-  })
-
-  describe('GDPR conformity', function () {
-    const bidRequests = [{
-      'bidder': 'quantum',
-      'mediaType': 'native',
-      'params': {
-        placementId: 21546
-      },
-      adUnitCode: 'aaa',
-      transactionId: '2b8389fe-615c-482d-9f1a-376fb8f7d6b0',
-      sizes: [[0, 0]],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337'
-    }];
-
-    const bidderRequest = {
-      gdprConsent: {
-        consentString: 'awefasdfwefasdfasd',
-        gdprApplies: true
-      }
-    };
-
-    it('should transmit correct data', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.quantx_gdpr).to.equal(1);
-      expect(requests[0].data.quantx_user_consent_string).to.equal('awefasdfwefasdfasd');
-    });
-  });
-
-  describe('GDPR absence conformity', function () {
-    const bidRequests = [{
-      'bidder': 'quantum',
-      'mediaType': 'native',
-      'params': {
-        placementId: 21546
-      },
-      adUnitCode: 'aaa',
-      transactionId: '2b8389fe-615c-482d-9f1a-376fb8f7d6b0',
-      sizes: [[0, 0]],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337'
-    }];
-
-    const bidderRequest = {
-      gdprConsent: undefined
-    };
-
-    it('should transmit correct data', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.quantx_gdpr).to.be.undefined;
-      expect(requests[0].data.quantx_user_consent_string).to.be.undefined;
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let bidderRequest = {
-      bidderCode: 'bidderCode',
-      bids: []
-    }
-
-    it('handles native request : should get correct bid response', function () {
-      const result = spec.interpretResponse({body: nativeServerResponse}, NATIVE_REQUEST)
-      expect(result[0]).to.have.property('cpm').equal(0.3)
-      expect(result[0]).to.have.property('width').to.be.below(2)
-      expect(result[0]).to.have.property('height').to.be.below(2)
-      expect(result[0]).to.have.property('mediaType').equal('native')
-      expect(result[0]).to.have.property('native')
-    })
-
-    it('should get correct bid response', function () {
-      const result = spec.interpretResponse({body: serverResponse}, REQUEST)
-      expect(result[0]).to.have.property('cpm').equal(0.3)
-      expect(result[0]).to.have.property('width').equal(300)
-      expect(result[0]).to.have.property('height').equal(250)
-      expect(result[0]).to.have.property('mediaType').equal('banner')
-      expect(result[0]).to.have.property('ad')
-    })
-
-    it('handles nobid responses', function () {
-      const nobidServerResponse = {bids: []}
-      const nobidResult = spec.interpretResponse({body: nobidServerResponse}, bidderRequest)
-      // console.log(nobidResult)
-      expect(nobidResult.length).to.equal(0)
-    })
-  })
-})
diff --git a/test/spec/modules/quantumdexBidAdapter_spec.js b/test/spec/modules/quantumdexBidAdapter_spec.js
deleted file mode 100644
index 82429cbedae..00000000000
--- a/test/spec/modules/quantumdexBidAdapter_spec.js
+++ /dev/null
@@ -1,604 +0,0 @@
-import { expect } from 'chai'
-import { spec } from 'modules/quantumdexBidAdapter.js'
-import { newBidder } from 'src/adapters/bidderFactory.js'
-import { userSync } from '../../../src/userSync.js';
-
-describe('QuantumdexBidAdapter', function () {
-  const adapter = newBidder(spec)
-
-  describe('.code', function () {
-    it('should return a bidder code of quantumdex', function () {
-      expect(spec.code).to.equal('quantumdex')
-    })
-  })
-
-  describe('inherited functions', function () {
-    it('should exist and be a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function')
-    })
-  })
-
-  describe('.isBidRequestValid', function () {
-    it('should return false if there are no params', () => {
-      const bid = {
-        'bidder': 'quantumdex',
-        'adUnitCode': 'adunit-code',
-        'mediaTypes': {
-          banner: {
-            sizes: [[300, 250], [300, 600]]
-          }
-        },
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false if there is no siteId param', () => {
-      const bid = {
-        'bidder': 'quantumdex',
-        'adUnitCode': 'adunit-code',
-        params: {
-          site_id: '1a2b3c4d5e6f1a2b3c4d',
-        },
-        'mediaTypes': {
-          banner: {
-            sizes: [[300, 250], [300, 600]]
-          }
-        },
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false if there is no mediaTypes', () => {
-      const bid = {
-        'bidder': 'quantumdex',
-        'adUnitCode': 'adunit-code',
-        params: {
-          siteId: '1a2b3c4d5e6f1a2b3c4d'
-        },
-        'mediaTypes': {
-        },
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return true if the bid is valid', () => {
-      const bid = {
-        'bidder': 'quantumdex',
-        'adUnitCode': 'adunit-code',
-        params: {
-          siteId: '1a2b3c4d5e6f1a2b3c4d'
-        },
-        'mediaTypes': {
-          banner: {
-            sizes: [[300, 250], [300, 600]]
-          }
-        },
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    describe('banner', () => {
-      it('should return false if there are no banner sizes', () => {
-        const bid = {
-          'bidder': 'quantumdex',
-          'adUnitCode': 'adunit-code',
-          params: {
-            siteId: '1a2b3c4d5e6f1a2b3c4d'
-          },
-          'mediaTypes': {
-            banner: {
-
-            }
-          },
-          'bidId': '30b31c1838de1e',
-          'bidderRequestId': '22edbae2733bf6',
-          'auctionId': '1d1a030790a475',
-        };
-        expect(spec.isBidRequestValid(bid)).to.equal(false);
-      });
-
-      it('should return true if there is banner sizes', () => {
-        const bid = {
-          'bidder': 'quantumdex',
-          'adUnitCode': 'adunit-code',
-          params: {
-            siteId: '1a2b3c4d5e6f1a2b3c4d'
-          },
-          'mediaTypes': {
-            banner: {
-              sizes: [[300, 250], [300, 600]]
-            }
-          },
-          'bidId': '30b31c1838de1e',
-          'bidderRequestId': '22edbae2733bf6',
-          'auctionId': '1d1a030790a475',
-        };
-        expect(spec.isBidRequestValid(bid)).to.equal(true);
-      });
-    });
-
-    describe('video', () => {
-      it('should return false if there is no playerSize defined in the video mediaType', () => {
-        const bid = {
-          'bidder': 'quantumdex',
-          'adUnitCode': 'adunit-code',
-          params: {
-            siteId: '1a2b3c4d5e6f1a2b3c4d',
-            sizes: [[300, 250], [300, 600]]
-          },
-          'mediaTypes': {
-            video: {
-              context: 'instream'
-            }
-          },
-          'bidId': '30b31c1838de1e',
-          'bidderRequestId': '22edbae2733bf6',
-          'auctionId': '1d1a030790a475',
-        };
-        expect(spec.isBidRequestValid(bid)).to.equal(false);
-      });
-
-      it('should return true if there is playerSize defined on the video mediaType', () => {
-        const bid = {
-          'bidder': 'quantumdex',
-          'adUnitCode': 'adunit-code',
-          params: {
-            siteId: '1a2b3c4d5e6f1a2b3c4d',
-          },
-          'mediaTypes': {
-            video: {
-              context: 'instream',
-              playerSize: [[640, 480]]
-            }
-          },
-          'bidId': '30b31c1838de1e',
-          'bidderRequestId': '22edbae2733bf6',
-          'auctionId': '1d1a030790a475',
-        };
-        expect(spec.isBidRequestValid(bid)).to.equal(true);
-      });
-    });
-  });
-
-  describe('.buildRequests', function () {
-    beforeEach(function () {
-      sinon.stub(userSync, 'canBidderRegisterSync');
-    });
-    afterEach(function () {
-      userSync.canBidderRegisterSync.restore();
-    });
-    let bidRequest = [{
-      'schain': {
-        'ver': '1.0',
-        'complete': 1,
-        'nodes': [
-          {
-            'asi': 'indirectseller.com',
-            'sid': '00001',
-            'hp': 1
-          },
-          {
-            'asi': 'indirectseller-2.com',
-            'sid': '00002',
-            'hp': 0
-          },
-        ]
-      },
-      'bidder': 'quantumdex',
-      'params': {
-        'siteId': '1a2b3c4d5e6f1a2b3c4d',
-      },
-      'adUnitCode': 'adunit-code-1',
-      'sizes': [[300, 250], [300, 600]],
-      'targetKey': 0,
-      'bidId': '30b31c1838de1f',
-    },
-    {
-      'bidder': 'quantumdex',
-      'params': {
-        'ad_unit': '/7780971/sparks_prebid_LB',
-        'sizes': [[300, 250], [300, 600]],
-        'referrer': 'overrides_top_window_location'
-      },
-      'adUnitCode': 'adunit-code-2',
-      'sizes': [[120, 600], [300, 600], [160, 600]],
-      'targetKey': 1,
-      'bidId': '30b31c1838de1e',
-    }];
-
-    let bidderRequests = {
-      'gdprConsent': {
-        'consentString': 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
-        'vendorData': {},
-        'gdprApplies': true
-      },
-      'refererInfo': {
-        'numIframes': 0,
-        'reachedTop': true,
-        'referer': 'https://example.com',
-        'stack': ['https://example.com']
-      },
-      uspConsent: 'someCCPAString'
-    };
-
-    it('should return a properly formatted request', function () {
-      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/quantumdex')
-      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/quantumdex')
-      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==')
-    })
-
-    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/quantumdex')
-      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==')
-    })
-    it('should return a properly formatted request with GDPR applies set to false with no consent_string param', function () {
-      let bidderRequests = {
-        'gdprConsent': {
-          'consentString': undefined,
-          'vendorData': {},
-          'gdprApplies': false
-        },
-        'refererInfo': {
-          'numIframes': 0,
-          'reachedTop': true,
-          'referer': 'https://example.com',
-          'stack': ['https://example.com']
-        }
-      };
-      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/quantumdex')
-      expect(bidRequests.method).to.equal('POST')
-      expect(bidRequests.data.gdpr.gdprApplies).to.equal('false')
-      expect(bidRequests.data.gdpr).to.not.include.keys('consentString')
-    })
-    it('should return a properly formatted request with GDPR applies set to true with no consentString param', function () {
-      let bidderRequests = {
-        'gdprConsent': {
-          'consentString': undefined,
-          'vendorData': {},
-          'gdprApplies': true
-        },
-        'refererInfo': {
-          'numIframes': 0,
-          'reachedTop': true,
-          'referer': 'https://example.com',
-          'stack': ['https://example.com']
-        }
-      };
-      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/quantumdex')
-      expect(bidRequests.method).to.equal('POST')
-      expect(bidRequests.data.gdpr.gdprApplies).to.equal('true')
-      expect(bidRequests.data.gdpr).to.not.include.keys('consentString')
-    })
-    it('should return a properly formatted request with schain defined', function () {
-      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
-      expect(JSON.parse(bidRequests.data.schain)).to.deep.equal(bidRequest[0].schain)
-    });
-    it('should return a properly formatted request with us_privacy included', function () {
-      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
-      expect(bidRequests.data.us_privacy).to.equal('someCCPAString');
-    });
-  });
-
-  describe('.interpretResponse', function () {
-    const bidRequests = {
-      'method': 'POST',
-      'url': 'https://useast.quantumdex.io/auction/quantumdex',
-      'withCredentials': true,
-      'data': {
-        'device': {
-          'ua': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36',
-          'height': 937,
-          'width': 1920,
-          'dnt': 0,
-          'language': 'vi'
-        },
-        'site': {
-          'id': '343',
-          'page': 'https://www.example.com/page',
-          'referrer': '',
-          'hostname': 'www.example.com'
-        }
-      },
-      'bidderRequests': [
-        {
-          'bidder': 'quantumdex',
-          'params': {
-            'siteId': '343'
-          },
-          'crumbs': {
-            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[160, 600], [120, 600]]
-            }
-          },
-          'adUnitCode': 'vi_3431035_1',
-          'transactionId': '994d8404-4a28-4c43-98d8-a38dbb061910',
-          'sizes': [[160, 600], [120, 600]],
-          'bidId': '3000aa31c41a29c21',
-          'bidderRequestId': '299926b3d3628cdd7',
-          'auctionId': '22445943-a0aa-4c63-a413-4deb64fcff1c',
-          'src': 'client',
-          'bidRequestsCount': 41,
-          'bidderRequestsCount': 41,
-          'bidderWinsCount': 0,
-          'schain': {
-            'ver': '1.0',
-            'complete': 1,
-            'nodes': [
-              {
-                'asi': 'freegames66.com',
-                'sid': '343',
-                'hp': 1
-              }
-            ]
-          }
-        },
-        {
-          'bidder': 'quantumdex',
-          'params': {
-            'siteId': '343'
-          },
-          'crumbs': {
-            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 250], [250, 250], [200, 200], [180, 150]]
-            }
-          },
-          'adUnitCode': 'vi_3431033_1',
-          'transactionId': '800fe87e-bfec-43a5-ace0-c4e2373ff4b5',
-          'sizes': [[300, 250], [250, 250], [200, 200], [180, 150]],
-          'bidId': '30024615be22ef66a',
-          'bidderRequestId': '299926b3d3628cdd7',
-          'auctionId': '22445943-a0aa-4c63-a413-4deb64fcff1c',
-          'src': 'client',
-          'bidRequestsCount': 41,
-          'bidderRequestsCount': 41,
-          'bidderWinsCount': 0,
-          'schain': {
-            'ver': '1.0',
-            'complete': 1,
-            'nodes': [
-              {
-                'asi': 'freegames66.com',
-                'sid': '343',
-                'hp': 1
-              }
-            ]
-          }
-        },
-        {
-          'bidder': 'quantumdex',
-          'params': {
-            'siteId': '343'
-          },
-          'crumbs': {
-            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
-          },
-          'mediaTypes': {
-            'video': {
-              'playerSize': [[640, 480]],
-              'context': 'instream',
-              'mimes': [
-                'video/mp4',
-                'video/x-flv',
-                'video/x-ms-wmv',
-                'application/vnd.apple.mpegurl',
-                'application/x-mpegurl',
-                'video/3gpp',
-                'video/mpeg',
-                'video/ogg',
-                'video/quicktime',
-                'video/webm',
-                'video/x-m4v',
-                'video/ms-asf',
-                'video/x-msvideo'
-              ],
-              'protocols': [1, 2, 3, 4, 5, 6],
-              'playbackmethod': [6],
-              'maxduration': 120,
-              'linearity': 1,
-              'api': [2]
-            }
-          },
-          'adUnitCode': 'vi_3431909',
-          'transactionId': '33d83d87-43cc-499b-aabe-5c22eb6acfbb',
-          'sizes': [[640, 480]],
-          'bidId': '1854b40107d6745c',
-          'bidderRequestId': '1840763b6bda185d',
-          'auctionId': 'df495de0-5d42-471f-a501-73bcd7254b80',
-          'src': 'client',
-          'bidRequestsCount': 1,
-          'bidderRequestsCount': 1,
-          'bidderWinsCount': 0,
-          'schain': {
-            'ver': '1.0',
-            'complete': 1,
-            'nodes': [
-              {
-                'asi': 'freegames66.com',
-                'sid': '343',
-                'hp': 1
-              }
-            ]
-          }
-        }
-      ]
-    };
-
-    let serverResponse = {
-      'body': {
-        'bids': [
-          {
-            'requestId': '3000aa31c41a29c21',
-            'cpm': 1.07,
-            'width': 160,
-            'height': 600,
-            'ad': `<div>Quantumdex AD</div>`,
-            'ttl': 500,
-            'creativeId': '1234abcd',
-            'netRevenue': true,
-            'currency': 'USD',
-            'dealId': 'quantumdex',
-            'mediaType': 'banner'
-          },
-          {
-            'requestId': '30024615be22ef66a',
-            'cpm': 1,
-            'width': 300,
-            'height': 250,
-            'ad': `<div>Quantumdex AD</div>`,
-            'ttl': 500,
-            'creativeId': '1234abcd',
-            'netRevenue': true,
-            'currency': 'USD',
-            'dealId': 'quantumdex',
-            'mediaType': 'banner'
-          },
-          {
-            'requestId': '1854b40107d6745c',
-            'cpm': 1.25,
-            'width': 300,
-            'height': 250,
-            'vastXml': '<VAST><Ad id="20001"><InLine><AdSystem version="4.0">quantumdex</AdSystem></InLine></Ad></VAST>',
-            'ttl': 500,
-            'creativeId': '30292e432662bd5f86d90774b944b038',
-            'netRevenue': true,
-            'currency': 'USD',
-            'dealId': 'quantumdex',
-            'mediaType': 'video'
-          }
-        ],
-        'pixel': [{
-          'url': 'https://example.com/pixel.png',
-          'type': 'image'
-        }]
-      }
-    };
-
-    let prebidResponse = [
-      {
-        'requestId': '3000aa31c41a29c21',
-        'cpm': 1.07,
-        'width': 160,
-        'height': 600,
-        'ad': `<div>Quantumdex AD</div>`,
-        'ttl': 500,
-        'creativeId': '1234abcd',
-        'netRevenue': true,
-        'currency': 'USD',
-        'dealId': 'quantumdex',
-        'mediaType': 'banner'
-      },
-      {
-        'requestId': '30024615be22ef66a',
-        'cpm': 1,
-        'width': 300,
-        'height': 250,
-        'ad': `<div>Quantumdex AD</div>`,
-        'ttl': 500,
-        'creativeId': '1234abcd',
-        'netRevenue': true,
-        'currency': 'USD',
-        'dealId': 'quantumdex',
-        'mediaType': 'banner'
-      },
-      {
-        'requestId': '1854b40107d6745c',
-        'cpm': 1.25,
-        'width': 300,
-        'height': 250,
-        'vastXml': '<VAST><Ad id="20001"><InLine><AdSystem version="4.0">quantumdex</AdSystem></InLine></Ad></VAST>',
-        'ttl': 500,
-        'creativeId': '30292e432662bd5f86d90774b944b038',
-        'netRevenue': true,
-        'currency': 'USD',
-        'dealId': 'quantumdex',
-        'mediaType': 'video'
-      }
-    ];
-
-    it('should map bidResponse to prebidResponse', function () {
-      const response = spec.interpretResponse(serverResponse, bidRequests);
-      response.forEach((resp, i) => {
-        expect(resp.requestId).to.equal(prebidResponse[i].requestId);
-        expect(resp.cpm).to.equal(prebidResponse[i].cpm);
-        expect(resp.width).to.equal(prebidResponse[i].width);
-        expect(resp.height).to.equal(prebidResponse[i].height);
-        expect(resp.ttl).to.equal(prebidResponse[i].ttl);
-        expect(resp.creativeId).to.equal(prebidResponse[i].creativeId);
-        expect(resp.netRevenue).to.equal(prebidResponse[i].netRevenue);
-        expect(resp.currency).to.equal(prebidResponse[i].currency);
-        expect(resp.dealId).to.equal(prebidResponse[i].dealId);
-        if (resp.mediaType === 'video') {
-          expect(resp.vastXml.indexOf('quantumdex')).to.be.greaterThan(0);
-        }
-        if (resp.mediaType === 'banner') {
-          expect(resp.ad.indexOf('Quantumdex AD')).to.be.greaterThan(0);
-        }
-      });
-    });
-  });
-
-  describe('.getUserSyncs', function () {
-    let bidResponse = [{
-      'body': {
-        'pixel': [{
-          'url': 'https://pixel-test',
-          'type': 'image'
-        }]
-      }
-    }];
-
-    it('should return one sync pixel', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, bidResponse)).to.deep.equal([{
-        type: 'image',
-        url: 'https://pixel-test'
-      }]);
-    });
-    it('should return an empty array when sync is enabled but there are no bidResponses', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: true }, [])).to.have.length(0);
-    });
-
-    it('should return an empty array when sync is enabled but no sync pixel returned', function () {
-      const pixel = Object.assign({}, bidResponse);
-      delete pixel[0].body.pixel;
-      expect(spec.getUserSyncs({ pixelEnabled: true }, bidResponse)).to.have.length(0);
-    });
-
-    it('should return an empty array', function () {
-      expect(spec.getUserSyncs({ pixelEnabled: false }, bidResponse)).to.have.length(0);
-      expect(spec.getUserSyncs({ pixelEnabled: true }, [])).to.have.length(0);
-    });
-  });
-});
diff --git a/test/spec/modules/qwarryBidAdapter_spec.js b/test/spec/modules/qwarryBidAdapter_spec.js
new file mode 100644
index 00000000000..5d48d92066a
--- /dev/null
+++ b/test/spec/modules/qwarryBidAdapter_spec.js
@@ -0,0 +1,164 @@
+import { expect } from 'chai'
+import { ENDPOINT, spec } from 'modules/qwarryBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const REQUEST = {
+  'bidId': '456',
+  'bidder': 'qwarry',
+  'sizes': [[100, 200], [300, 400]],
+  'params': {
+    zoneToken: 'e64782a4-8e68-4c38-965b-80ccf115d46f',
+    pos: 7
+  },
+  'schain': {
+    ver: '1.0',
+    complete: 1,
+    nodes: [{
+      asi: 'qwarry.com',
+      sid: '00001',
+      hp: 1
+    }]
+  }
+}
+
+const BIDDER_BANNER_RESPONSE = {
+  'prebidResponse': [{
+    'ad': '<div>test</div>',
+    'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46d',
+    'cpm': 900.5,
+    'currency': 'USD',
+    'width': 640,
+    'height': 480,
+    'ttl': 300,
+    'creativeId': 1,
+    'netRevenue': true,
+    'winUrl': 'http://test.com',
+    'format': 'banner',
+    'adomain': ['test.com']
+  }]
+}
+
+const BIDDER_VIDEO_RESPONSE = {
+  'prebidResponse': [{
+    'ad': '<xml>vast</xml>',
+    'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46z',
+    'cpm': 800.4,
+    'currency': 'USD',
+    'width': 1024,
+    'height': 768,
+    'ttl': 200,
+    'creativeId': 2,
+    'netRevenue': true,
+    'winUrl': 'http://test.com',
+    'format': 'video',
+    'adomain': ['test.com']
+  }]
+}
+
+const BIDDER_NO_BID_RESPONSE = ''
+
+describe('qwarryBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(REQUEST)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, REQUEST)
+      delete bid.params.zoneToken
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+      delete bid.params
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    let bidRequests = [REQUEST]
+    const bidderRequest = spec.buildRequests(bidRequests, {
+      bidderRequestId: '123',
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A=='
+      },
+      refererInfo: {
+        page: 'http://test.com/path.html',
+      }
+    })
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      expect(bidderRequest.method).to.equal('POST')
+      expect(bidderRequest.data.requestId).to.equal('123')
+      expect(bidderRequest.data.referer).to.equal('http://test.com/path.html')
+      expect(bidderRequest.data.schain).to.deep.contains({ver: '1.0', complete: 1, nodes: [{asi: 'qwarry.com', sid: '00001', hp: 1}]})
+      expect(bidderRequest.data.bids).to.deep.contains({ bidId: '456', zoneToken: 'e64782a4-8e68-4c38-965b-80ccf115d46f', pos: 7, sizes: [{ width: 100, height: 200 }, { width: 300, height: 400 }] })
+      expect(bidderRequest.data.gdprConsent).to.deep.contains({ consentRequired: true, consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==' })
+      expect(bidderRequest.options.customHeaders).to.deep.equal({ 'Rtb-Direct': true })
+      expect(bidderRequest.options.contentType).to.equal('application/json')
+      expect(bidderRequest.url).to.equal(ENDPOINT)
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('handles banner request : should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: BIDDER_BANNER_RESPONSE }, {})
+
+      expect(result[0]).to.have.property('ad').equal('<div>test</div>')
+      expect(result[0]).to.have.property('requestId').equal('e64782a4-8e68-4c38-965b-80ccf115d46d')
+      expect(result[0]).to.have.property('cpm').equal(900.5)
+      expect(result[0]).to.have.property('currency').equal('USD')
+      expect(result[0]).to.have.property('width').equal(640)
+      expect(result[0]).to.have.property('height').equal(480)
+      expect(result[0]).to.have.property('ttl').equal(300)
+      expect(result[0]).to.have.property('creativeId').equal(1)
+      expect(result[0]).to.have.property('netRevenue').equal(true)
+      expect(result[0]).to.have.property('winUrl').equal('http://test.com')
+      expect(result[0]).to.have.property('format').equal('banner')
+      expect(result[0].meta).to.exist.property('advertiserDomains')
+      expect(result[0].meta).to.have.property('advertiserDomains').lengthOf(1)
+    })
+
+    it('handles video request : should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: BIDDER_VIDEO_RESPONSE }, {})
+
+      expect(result[0]).to.have.property('ad').equal('<xml>vast</xml>')
+      expect(result[0]).to.have.property('requestId').equal('e64782a4-8e68-4c38-965b-80ccf115d46z')
+      expect(result[0]).to.have.property('cpm').equal(800.4)
+      expect(result[0]).to.have.property('currency').equal('USD')
+      expect(result[0]).to.have.property('width').equal(1024)
+      expect(result[0]).to.have.property('height').equal(768)
+      expect(result[0]).to.have.property('ttl').equal(200)
+      expect(result[0]).to.have.property('creativeId').equal(2)
+      expect(result[0]).to.have.property('netRevenue').equal(true)
+      expect(result[0]).to.have.property('winUrl').equal('http://test.com')
+      expect(result[0]).to.have.property('format').equal('video')
+      expect(result[0]).to.have.property('vastXml').equal('<xml>vast</xml>')
+      expect(result[0].meta).to.exist.property('advertiserDomains')
+      expect(result[0].meta).to.have.property('advertiserDomains').lengthOf(1)
+    })
+
+    it('handles no bid response : should get empty array', function () {
+      let result = spec.interpretResponse({ body: undefined }, {})
+      expect(result).to.deep.equal([])
+
+      result = spec.interpretResponse({ body: BIDDER_NO_BID_RESPONSE }, {})
+      expect(result).to.deep.equal([])
+    })
+  })
+
+  describe('onBidWon', function () {
+    it('handles banner win: should get true', function () {
+      const win = BIDDER_BANNER_RESPONSE.prebidResponse[0]
+      const bidWonResult = spec.onBidWon(win)
+
+      expect(bidWonResult).to.equal(true)
+    })
+  })
+})
diff --git a/test/spec/modules/radsBidAdapter_spec.js b/test/spec/modules/radsBidAdapter_spec.js
index c629daf3da5..3ad7ada2ae7 100644
--- a/test/spec/modules/radsBidAdapter_spec.js
+++ b/test/spec/modules/radsBidAdapter_spec.js
@@ -59,9 +59,24 @@ describe('radsAdapter', function () {
       'sizes': [
         [300, 250]
       ],
+      'mediaTypes': {
+        'video': {
+          'playerSize': [640, 480],
+          'context': 'instream'
+        },
+        'banner': {
+          'sizes': [
+            [100, 100], [400, 400], [500, 500]
+          ]
+        }
+      },
       'bidId': '30b31c1838de1e',
       'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475'
+      'auctionId': '1d1a030790a475',
+      'userId': {
+        'netId': '123',
+        'uid2': '456'
+      }
     }, {
       'bidder': 'rads',
       'params': {
@@ -78,7 +93,7 @@ describe('radsAdapter', function () {
       },
       'mediaTypes': {
         'video': {
-          'playerSize': [640, 480],
+          'playerSize': [[640, 480], [500, 500], [600, 600]],
           'context': 'instream'
         }
       },
@@ -87,23 +102,50 @@ describe('radsAdapter', function () {
       'auctionId': '1d1a030790a475'
     }];
 
+    // Without gdprConsent
     let bidderRequest = {
       refererInfo: {
-        referer: 'some_referrer.net'
+        page: 'some_referrer.net'
       }
     }
+    // With gdprConsent
+    var bidderRequestGdprConsent = {
+      refererInfo: {
+        page: 'some_referrer.net'
+      },
+      gdprConsent: {
+        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+        vendorData: {someData: 'value'},
+        gdprApplies: true
+      }
+    };
 
+    // without gdprConsent
     const request = spec.buildRequests(bidRequests, bidderRequest);
     it('sends bid request to our endpoint via GET', function () {
       expect(request[0].method).to.equal('GET');
       let data = request[0].data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
-      expect(data).to.equal('rt=bid-response&_f=prebid_js&_ps=6682&srw=300&srh=250&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&bcat=IAB2%2CIAB4&dvt=desktop&i=1.1.1.1');
+      expect(data).to.equal('_f=prebid_js&_ps=6682&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&rt=bid-response&srw=100&srh=100&alt_ad_sizes%5B0%5D=400x400&alt_ad_sizes%5B1%5D=500x500&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&bcat=IAB2%2CIAB4&dvt=desktop&i=1.1.1.1&did_netid=123&did_uid2=456');
     });
 
     it('sends bid video request to our rads endpoint via GET', function () {
       expect(request[1].method).to.equal('GET');
       let data = request[1].data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
-      expect(data).to.equal('rt=vast2&_f=prebid_js&_ps=6682&srw=640&srh=480&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgeo%5D%5Bregion%5D=DE-BE&bcat=IAB2%2CIAB4&dvt=desktop');
+      expect(data).to.equal('_f=prebid_js&_ps=6682&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&rt=vast2&srw=640&srh=480&alt_ad_sizes%5B0%5D=500x500&alt_ad_sizes%5B1%5D=600x600&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgeo%5D%5Bregion%5D=DE-BE&bcat=IAB2%2CIAB4&dvt=desktop');
+    });
+
+    // with gdprConsent
+    const request2 = spec.buildRequests(bidRequests, bidderRequestGdprConsent);
+    it('sends bid request to our endpoint via GET', function () {
+      expect(request2[0].method).to.equal('GET');
+      let data = request2[0].data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
+      expect(data).to.equal('_f=prebid_js&_ps=6682&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&rt=bid-response&srw=100&srh=100&alt_ad_sizes%5B0%5D=400x400&alt_ad_sizes%5B1%5D=500x500&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&bcat=IAB2%2CIAB4&dvt=desktop&i=1.1.1.1&did_netid=123&did_uid2=456');
+    });
+
+    it('sends bid video request to our rads endpoint via GET', function () {
+      expect(request2[1].method).to.equal('GET');
+      let data = request2[1].data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
+      expect(data).to.equal('_f=prebid_js&_ps=6682&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&rt=vast2&srw=640&srh=480&alt_ad_sizes%5B0%5D=500x500&alt_ad_sizes%5B1%5D=600x600&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgeo%5D%5Bregion%5D=DE-BE&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&bcat=IAB2%2CIAB4&dvt=desktop');
     });
   });
 
@@ -119,7 +161,8 @@ describe('radsAdapter', function () {
         'currency': 'EUR',
         'ttl': 60,
         'netRevenue': true,
-        'zone': '6682'
+        'zone': '6682',
+        'adomain': ['bdomain']
       }
     };
     let serverVideoResponse = {
@@ -147,7 +190,8 @@ describe('radsAdapter', function () {
       currency: 'EUR',
       netRevenue: true,
       ttl: 300,
-      ad: '<!-- test creative -->'
+      ad: '<!-- test creative -->',
+      meta: {advertiserDomains: ['bdomain']}
     }, {
       requestId: '23beaa6af6cdde',
       cpm: 0.5,
@@ -159,7 +203,8 @@ describe('radsAdapter', function () {
       netRevenue: true,
       ttl: 300,
       vastXml: '{"reason":7001,"status":"accepted"}',
-      mediaType: 'video'
+      mediaType: 'video',
+      meta: {advertiserDomains: []}
     }];
 
     it('should get the correct bid response by display ad', function () {
@@ -175,6 +220,8 @@ describe('radsAdapter', function () {
       }];
       let result = spec.interpretResponse(serverBannerResponse, bidRequest[0]);
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains.length).to.equal(1);
+      expect(result[0].meta.advertiserDomains[0]).to.equal(expectedResponse[0].meta.advertiserDomains[0]);
     });
 
     it('should get the correct rads video bid response by display ad', function () {
@@ -193,6 +240,7 @@ describe('radsAdapter', function () {
       }];
       let result = spec.interpretResponse(serverVideoResponse, bidRequest[0]);
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[1]));
+      expect(result[0].meta.advertiserDomains.length).to.equal(0);
     });
 
     it('handles empty bid response', function () {
@@ -203,4 +251,85 @@ describe('radsAdapter', function () {
       expect(result.length).to.equal(0);
     });
   });
+
+  describe(`getUserSyncs test usage`, function () {
+    let serverResponses;
+
+    beforeEach(function () {
+      serverResponses = [{
+        body: {
+          requestId: '23beaa6af6cdde',
+          cpm: 0.5,
+          width: 0,
+          height: 0,
+          creativeId: 100500,
+          dealId: '',
+          currency: 'EUR',
+          netRevenue: true,
+          ttl: 300,
+          type: 'sspHTML',
+          ad: '<!-- test creative -->',
+          userSync: {
+            iframeUrl: ['anyIframeUrl?a=1'],
+            imageUrl: ['anyImageUrl', 'anyImageUrl2']
+          }
+        }
+      }];
+    });
+
+    it(`return value should be an array`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true })).to.be.an('array');
+    });
+    it(`array should have only one object and it should have a property type = 'iframe'`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, serverResponses).length).to.be.equal(1);
+      let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, serverResponses);
+      expect(userSync).to.have.property('type');
+      expect(userSync.type).to.be.equal('iframe');
+    });
+    it(`we have valid sync url for iframe`, function () {
+      let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, serverResponses, {consentString: 'anyString'});
+      expect(userSync.url).to.be.equal('anyIframeUrl?a=1&gdpr_consent=anyString')
+      expect(userSync.type).to.be.equal('iframe');
+    });
+    it(`we have valid sync url for image`, function () {
+      let [userSync] = spec.getUserSyncs({ pixelEnabled: true }, serverResponses, {gdprApplies: true, consentString: 'anyString'});
+      expect(userSync.url).to.be.equal('anyImageUrl?gdpr=1&gdpr_consent=anyString')
+      expect(userSync.type).to.be.equal('image');
+    });
+    it(`we have valid sync url for image and iframe`, function () {
+      let userSync = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses, {gdprApplies: true, consentString: 'anyString'});
+      expect(userSync.length).to.be.equal(3);
+      expect(userSync[0].url).to.be.equal('anyIframeUrl?a=1&gdpr=1&gdpr_consent=anyString')
+      expect(userSync[0].type).to.be.equal('iframe');
+      expect(userSync[1].url).to.be.equal('anyImageUrl?gdpr=1&gdpr_consent=anyString')
+      expect(userSync[1].type).to.be.equal('image');
+      expect(userSync[2].url).to.be.equal('anyImageUrl2?gdpr=1&gdpr_consent=anyString')
+      expect(userSync[2].type).to.be.equal('image');
+    });
+  });
+
+  describe(`getUserSyncs test usage passback response`, function () {
+    let serverResponses;
+
+    beforeEach(function () {
+      serverResponses = [{
+        body: {
+          reason: 8002,
+          status: 'rejected',
+          msg: 'passback',
+          bid_id: '115de76437d5ae6',
+          'zone': '4773',
+        }
+      }];
+    });
+
+    it(`check for zero array when iframeEnabled`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true })).to.be.an('array');
+      expect(spec.getUserSyncs({ iframeEnabled: true }, serverResponses).length).to.be.equal(0);
+    });
+    it(`check for zero array when iframeEnabled`, function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true })).to.be.an('array');
+      expect(spec.getUserSyncs({ pixelEnabled: true }, serverResponses).length).to.be.equal(0);
+    });
+  });
 });
diff --git a/test/spec/modules/rasBidAdapter_spec.js b/test/spec/modules/rasBidAdapter_spec.js
new file mode 100644
index 00000000000..bfa72a2510e
--- /dev/null
+++ b/test/spec/modules/rasBidAdapter_spec.js
@@ -0,0 +1,196 @@
+import { expect } from 'chai';
+import { spec } from 'modules/rasBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+const CSR_ENDPOINT = 'https://csr.onet.pl/4178463/csr-006/csr.json?nid=4178463&';
+
+describe('rasBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      const bid = {
+        sizes: [[300, 250], [300, 600]],
+        bidder: 'ras',
+        params: {
+          slot: 'slot',
+          area: 'areatest',
+          site: 'test',
+          network: '4178463'
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params not found', function () {
+      const failBid = {
+        sizes: [[300, 250], [300, 300]],
+        bidder: 'ras',
+        params: {
+          site: 'test',
+          network: '4178463'
+        }
+      };
+      expect(spec.isBidRequestValid(failBid)).to.equal(false);
+    });
+
+    it('should return nothing when bid request is malformed', function () {
+      const failBid = {
+        sizes: [[300, 250], [300, 300]],
+        bidder: 'ras',
+      };
+      expect(spec.isBidRequestValid(failBid)).to.equal(undefined);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bid = {
+      sizes: [[300, 250], [300, 600]],
+      bidder: 'ras',
+      bidId: 1,
+      params: {
+        slot: 'test',
+        area: 'areatest',
+        site: 'test',
+        slotSequence: '0',
+        network: '4178463',
+        customParams: {
+          test: 'name=value'
+        }
+      }
+    };
+    const bid2 = {
+      sizes: [[750, 300]],
+      bidder: 'ras',
+      bidId: 2,
+      params: {
+        slot: 'test2',
+        area: 'areatest',
+        site: 'test',
+        network: '4178463'
+      }
+    };
+
+    it('should parse bids to request', function () {
+      const requests = spec.buildRequests([bid], {
+        'gdprConsent': {
+          'gdprApplies': true,
+          'consentString': 'some-consent-string'
+        },
+        'refererInfo': {
+          'ref': 'https://example.org/',
+          'page': 'https://example.com/'
+        }
+      });
+      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
+      expect(requests[0].url).to.have.string('slot0=test');
+      expect(requests[0].url).to.have.string('id0=1');
+      expect(requests[0].url).to.have.string('site=test');
+      expect(requests[0].url).to.have.string('area=areatest');
+      expect(requests[0].url).to.have.string('cre_format=html');
+      expect(requests[0].url).to.have.string('systems=das');
+      expect(requests[0].url).to.have.string('ems_url=1');
+      expect(requests[0].url).to.have.string('bid_rate=1');
+      expect(requests[0].url).to.have.string('gdpr_applies=true');
+      expect(requests[0].url).to.have.string('euconsent=some-consent-string');
+      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
+      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
+      expect(requests[0].url).to.have.string('test=name%3Dvalue');
+    });
+
+    it('should return empty consent string when undefined', function () {
+      const requests = spec.buildRequests([bid]);
+      const gdpr = requests[0].url.search('gdpr_applies');
+      const euconsent = requests[0].url.search('euconsent=');
+      expect(gdpr).to.equal(-1);
+      expect(euconsent).to.equal(-1);
+    });
+
+    it('should parse bids to request from pageContext', function () {
+      const bidCopy = { ...bid };
+      bidCopy.params = {
+        ...bid.params,
+        pageContext: {
+          dv: 'test/areatest',
+          du: 'https://example.com/',
+          dr: 'https://example.org/',
+          keyWords: ['val1', 'val2'],
+          keyValues: {
+            adunit: 'test/areatest'
+          }
+        }
+      };
+      const requests = spec.buildRequests([bidCopy, bid2]);
+      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
+      expect(requests[0].url).to.have.string('slot0=test');
+      expect(requests[0].url).to.have.string('id0=1');
+      expect(requests[0].url).to.have.string('iusizes0=300x250%2C300x600');
+      expect(requests[0].url).to.have.string('slot1=test2');
+      expect(requests[0].url).to.have.string('id1=2');
+      expect(requests[0].url).to.have.string('iusizes1=750x300');
+      expect(requests[0].url).to.have.string('site=test');
+      expect(requests[0].url).to.have.string('area=areatest');
+      expect(requests[0].url).to.have.string('cre_format=html');
+      expect(requests[0].url).to.have.string('systems=das');
+      expect(requests[0].url).to.have.string('ems_url=1');
+      expect(requests[0].url).to.have.string('bid_rate=1');
+      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
+      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
+      expect(requests[0].url).to.have.string('DV=test%2Fareatest');
+      expect(requests[0].url).to.have.string('kwrd=val1%2Bval2');
+      expect(requests[0].url).to.have.string('kvadunit=test%2Fareatest');
+      expect(requests[0].url).to.have.string('pos0=0');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      'adsCheck': 'ok',
+      'geoloc': {},
+      'ir': '92effd60-0c84-4dac-817e-763ea7b8ac65',
+      'ads': [
+        {
+          'id': 'flat-belkagorna',
+          'slot': 'flat-belkagorna',
+          'prio': 10,
+          'type': 'html',
+          'bid_rate': 0.321123,
+          'adid': 'das,50463,152276',
+          'id_3': '12734',
+          'html': '<script type=\"text/javascript\">test</script>'
+        }
+      ],
+      'iv': '202003191334467636346500'
+    };
+
+    it('should get correct bid response', function () {
+      const resp = spec.interpretResponse({ body: response }, { bidIds: [{ slot: 'flat-belkagorna', bidId: 1 }] });
+      expect(resp[0]).to.have.all.keys('cpm', 'currency', 'netRevenue', 'requestId', 'ttl', 'width', 'height', 'creativeId', 'dealId', 'ad', 'meta');
+      expect(resp.length).to.equal(1);
+    });
+
+    it('should handle empty ad', function () {
+      let res = {
+        'ads': [{
+          type: 'empty'
+        }]
+      };
+      const resp = spec.interpretResponse({ body: res }, {});
+      expect(resp).to.deep.equal([]);
+    });
+
+    it('should handle empty server response', function () {
+      let res = {
+        'ads': []
+      };
+      const resp = spec.interpretResponse({ body: res }, {});
+      expect(resp).to.deep.equal([]);
+    });
+  });
+});
diff --git a/test/spec/modules/readpeakBidAdapter_spec.js b/test/spec/modules/readpeakBidAdapter_spec.js
index eb9077fac39..8772aeac88f 100644
--- a/test/spec/modules/readpeakBidAdapter_spec.js
+++ b/test/spec/modules/readpeakBidAdapter_spec.js
@@ -4,46 +4,74 @@ import { config } from 'src/config.js';
 import { parseUrl } from 'src/utils.js';
 
 describe('ReadPeakAdapter', function() {
-  let bidRequest;
-  let serverResponse;
-  let serverRequest;
+  let baseBidRequest;
+  let bannerBidRequest;
+  let nativeBidRequest;
+  let nativeServerResponse;
+  let nativeServerRequest;
+  let bannerServerResponse;
+  let bannerServerRequest;
   let bidderRequest;
 
   beforeEach(function() {
     bidderRequest = {
       refererInfo: {
-        referer: 'https://publisher.com/home'
+        page: 'https://publisher.com/home',
+        domain: 'publisher.com'
       }
     };
 
-    bidRequest = {
+    baseBidRequest = {
       bidder: 'readpeak',
-      nativeParams: {
-        title: { required: true, len: 200 },
-        image: { wmin: 100 },
-        sponsoredBy: {},
-        body: { required: false },
-        cta: { required: false }
-      },
       params: {
         bidfloor: 5.0,
         publisherId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-        siteId: '11bc5dd5-7421-4dd8-c926-40fa653bec77'
+        siteId: '11bc5dd5-7421-4dd8-c926-40fa653bec77',
+        tagId: 'test-tag-1'
       },
       bidId: '2ffb201a808da7',
       bidderRequestId: '178e34bad3658f',
       auctionId: 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
-      transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+      transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
+    };
+
+    nativeBidRequest = {
+      ...baseBidRequest,
+      nativeParams: {
+        title: { required: true, len: 200 },
+        image: { wmin: 100 },
+        sponsoredBy: {},
+        body: { required: false },
+        cta: { required: false }
+      },
+      mediaTypes: {
+        native: {
+          title: { required: true, len: 200 },
+          image: { wmin: 100 },
+          sponsoredBy: {},
+          body: { required: false },
+          cta: { required: false }
+        },
+      }
     };
-    serverResponse = {
-      id: bidRequest.bidderRequestId,
+    bannerBidRequest = {
+      ...baseBidRequest,
+      mediaTypes: {
+        banner: {
+          sizes: [[640, 320], [300, 600]],
+        }
+      },
+      sizes: [[640, 320], [300, 600]],
+    }
+    nativeServerResponse = {
+      id: baseBidRequest.bidderRequestId,
       cur: 'USD',
       seatbid: [
         {
           bid: [
             {
-              id: 'bidRequest.bidId',
-              impid: bidRequest.bidId,
+              id: 'baseBidRequest.bidId',
+              impid: baseBidRequest.bidId,
               price: 0.12,
               cid: '12',
               crid: '123',
@@ -90,7 +118,30 @@ describe('ReadPeakAdapter', function() {
         }
       ]
     };
-    serverRequest = {
+    bannerServerResponse = {
+      id: baseBidRequest.bidderRequestId,
+      cur: 'USD',
+      seatbid: [
+        {
+          bid: [
+            {
+              id: 'baseBidRequest.bidId',
+              impid: baseBidRequest.bidId,
+              price: 0.12,
+              cid: '12',
+              crid: '123',
+              adomain: ['readpeak.com'],
+              adm: '<iframe src=\"http://localhost:8081/url/creative?id=4326&l=f707685dfbbcdbe3&bad=0-0-95O0O0OdO640360&b=e4d39f94-533d-4577-a579-585fd4c02b0a&w=640&h=360&gc=0\" style=\"border: 0; display: block\" width=640 height=360></iframe>',
+              burl: 'https://localhost:8081/url/b?d=0O95O4326I528Ie4d39f94-533d-4577-a579-585fd4c02b0aI0I352e303232363639333139393939393939&c=USD&p=${AUCTION_PRICE}&bad=0-0-95O0O0OdO640360&gc=0',
+              nurl: 'https://localhost:8081/url/n?d=0O95O4326I528Ie4d39f94-533d-4577-a579-585fd4c02b0aI0I352e303232363639333139393939393939&gc=0',
+              w: 640,
+              h: 360,
+            }
+          ]
+        }
+      ]
+    };
+    nativeServerRequest = {
       method: 'POST',
       url: 'http://localhost:60080/header/prebid',
       data: JSON.stringify({
@@ -100,11 +151,51 @@ describe('ReadPeakAdapter', function() {
             id: '2ffb201a808da7',
             native: {
               request:
-                '{"assets":[{"id":1,"required":1,"title":{"len":200}},{"id":2,"required":0,"data":{"type":1,"len":50}},{"id":3,"required":0,"img":{"type":3,"wmin":100,"hmin":150}}]}',
+                '{\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":70}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":150,\"hmin\":150}},{\"id\":4,\"required\":1,\"data\":{\"type\":2,\"len\":120}}]}',
               ver: '1.1'
             },
             bidfloor: 5,
-            bidfloorcur: 'USD'
+            bidfloorcur: 'USD',
+            tagId: 'test-tag-1'
+          }
+        ],
+        site: {
+          publisher: {
+            id: '11bc5dd5-7421-4dd8-c926-40fa653bec76'
+          },
+          id: '11bc5dd5-7421-4dd8-c926-40fa653bec77',
+          ref: '',
+          page: 'http://localhost',
+          domain: 'localhost'
+        },
+        app: null,
+        device: {
+          ua:
+            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/61.0.3163.100 Safari/537.36',
+          language: 'en-US'
+        },
+        isPrebid: true
+      })
+    };
+    bannerServerRequest = {
+      method: 'POST',
+      url: 'http://localhost:60080/header/prebid',
+      data: JSON.stringify({
+        id: '178e34bad3658f',
+        imp: [
+          {
+            id: '2ffb201a808da7',
+            bidfloor: 5,
+            bidfloorcur: 'USD',
+            tagId: 'test-tag-1',
+            banner: {
+              w: 640,
+              h: 360,
+              format: [
+                { w: 640, h: 360 },
+                { w: 320, h: 320 },
+              ]
+            }
           }
         ],
         site: {
@@ -127,107 +218,322 @@ describe('ReadPeakAdapter', function() {
     };
   });
 
-  describe('spec.isBidRequestValid', function() {
-    it('should return true when the required params are passed', function() {
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
+  describe('Native', function() {
+    describe('spec.isBidRequestValid', function() {
+      it('should return true when the required params are passed', function() {
+        expect(spec.isBidRequestValid(nativeBidRequest)).to.equal(true);
+      });
 
-    it('should return false when the native params are missing', function() {
-      bidRequest.nativeParams = undefined;
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-    });
+      it('should return false when the "publisherId" param is missing', function() {
+        nativeBidRequest.params = {
+          bidfloor: 5.0
+        };
+        expect(spec.isBidRequestValid(nativeBidRequest)).to.equal(false);
+      });
 
-    it('should return false when the "publisherId" param is missing', function() {
-      bidRequest.params = {
-        bidfloor: 5.0
-      };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      it('should return false when no bid params are passed', function() {
+        nativeBidRequest.params = {};
+        expect(spec.isBidRequestValid(nativeBidRequest)).to.equal(false);
+      });
+
+      it('should return false when a bid request is not passed', function() {
+        expect(spec.isBidRequestValid()).to.equal(false);
+        expect(spec.isBidRequestValid({})).to.equal(false);
+      });
     });
 
-    it('should return false when no bid params are passed', function() {
-      bidRequest.params = {};
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    describe('spec.buildRequests', function() {
+      it('should create a POST request for every bid', function() {
+        const request = spec.buildRequests([nativeBidRequest], bidderRequest);
+        expect(request.method).to.equal('POST');
+        expect(request.url).to.equal(ENDPOINT);
+      });
+
+      it('should attach request data', function() {
+        config.setConfig({
+          currency: {
+            adServerCurrency: 'EUR'
+          }
+        });
+
+        const request = spec.buildRequests([nativeBidRequest], bidderRequest);
+
+        const data = JSON.parse(request.data);
+
+        expect(data.source.ext.prebid).to.equal('$prebid.version$');
+        expect(data.id).to.equal(nativeBidRequest.bidderRequestId);
+        expect(data.imp[0].bidfloor).to.equal(nativeBidRequest.params.bidfloor);
+        expect(data.imp[0].bidfloorcur).to.equal('USD');
+        expect(data.imp[0].tagId).to.equal('test-tag-1');
+        expect(data.site.publisher.id).to.equal(nativeBidRequest.params.publisherId);
+        expect(data.site.id).to.equal(nativeBidRequest.params.siteId);
+        expect(data.site.page).to.equal(bidderRequest.refererInfo.page);
+        expect(data.site.domain).to.equal(bidderRequest.refererInfo.domain);
+        expect(data.device).to.deep.contain({
+          ua: navigator.userAgent,
+          language: navigator.language
+        });
+        expect(data.cur).to.deep.equal(['EUR']);
+        expect(data.user).to.be.undefined;
+        expect(data.regs).to.be.undefined;
+      });
+
+      it('should get bid floor from module', function() {
+        const floorModuleData = {
+          currency: 'USD',
+          floor: 3.2,
+        }
+        nativeBidRequest.getFloor = function () {
+          return floorModuleData
+        }
+        const request = spec.buildRequests([nativeBidRequest], bidderRequest);
+
+        const data = JSON.parse(request.data);
+
+        expect(data.source.ext.prebid).to.equal('$prebid.version$');
+        expect(data.id).to.equal(nativeBidRequest.bidderRequestId);
+        expect(data.imp[0].bidfloor).to.equal(floorModuleData.floor);
+        expect(data.imp[0].bidfloorcur).to.equal(floorModuleData.currency);
+      });
+
+      it('should send gdpr data when gdpr does not apply', function() {
+        const gdprData = {
+          gdprConsent: {
+            gdprApplies: false,
+            consentString: undefined,
+          }
+        }
+        const request = spec.buildRequests([nativeBidRequest], {...bidderRequest, ...gdprData});
+
+        const data = JSON.parse(request.data);
+
+        expect(data.user).to.deep.equal({
+          ext: {
+            consent: ''
+          }
+        });
+        expect(data.regs).to.deep.equal({
+          ext: {
+            gdpr: false
+          }
+        });
+      });
+
+      it('should send gdpr data when gdpr applies', function() {
+        const tcString = 'sometcstring';
+        const gdprData = {
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: tcString
+          }
+        }
+        const request = spec.buildRequests([nativeBidRequest], {...bidderRequest, ...gdprData});
+
+        const data = JSON.parse(request.data);
+
+        expect(data.user).to.deep.equal({
+          ext: {
+            consent: tcString
+          }
+        });
+        expect(data.regs).to.deep.equal({
+          ext: {
+            gdpr: true
+          }
+        });
+      });
     });
 
-    it('should return false when a bid request is not passed', function() {
-      expect(spec.isBidRequestValid()).to.equal(false);
-      expect(spec.isBidRequestValid({})).to.equal(false);
+    describe('spec.interpretResponse', function() {
+      it('should return no bids if the response is not valid', function() {
+        const bidResponse = spec.interpretResponse({ body: null }, nativeServerRequest);
+        expect(bidResponse.length).to.equal(0);
+      });
+
+      it('should return a valid bid response', function() {
+        const bidResponse = spec.interpretResponse(
+          { body: nativeServerResponse },
+          nativeServerRequest
+        )[0];
+        expect(bidResponse).to.contain({
+          requestId: nativeBidRequest.bidId,
+          cpm: nativeServerResponse.seatbid[0].bid[0].price,
+          creativeId: nativeServerResponse.seatbid[0].bid[0].crid,
+          ttl: 300,
+          netRevenue: true,
+          mediaType: 'native',
+          currency: nativeServerResponse.cur
+        });
+
+        expect(bidResponse.meta).to.deep.equal({
+          advertiserDomains: ['readpeak.com'],
+        })
+        expect(bidResponse.native.title).to.equal('Title');
+        expect(bidResponse.native.body).to.equal('Description');
+        expect(bidResponse.native.image).to.deep.equal({
+          url: 'http://url.to/image',
+          width: 750,
+          height: 500
+        });
+        expect(bidResponse.native.clickUrl).to.equal(
+          'http%3A%2F%2Furl.to%2Ftarget'
+        );
+        expect(bidResponse.native.impressionTrackers).to.contain(
+          'http://url.to/pixeltracker'
+        );
+      });
     });
   });
 
-  describe('spec.buildRequests', function() {
-    it('should create a POST request for every bid', function() {
-      const request = spec.buildRequests([bidRequest], bidderRequest);
-      expect(request.method).to.equal('POST');
-      expect(request.url).to.equal(ENDPOINT);
+  describe('Banner', function() {
+    describe('spec.isBidRequestValid', function() {
+      it('should return true when the required params are passed', function() {
+        expect(spec.isBidRequestValid(bannerBidRequest)).to.equal(true);
+      });
+
+      it('should return false when the "publisherId" param is missing', function() {
+        bannerBidRequest.params = {
+          bidfloor: 5.0
+        };
+        expect(spec.isBidRequestValid(bannerBidRequest)).to.equal(false);
+      });
+
+      it('should return false when no bid params are passed', function() {
+        bannerBidRequest.params = {};
+        expect(spec.isBidRequestValid(bannerBidRequest)).to.equal(false);
+      });
     });
 
-    it('should attach request data', function() {
-      config.setConfig({
-        currency: {
-          adServerCurrency: 'EUR'
+    describe('spec.buildRequests', function() {
+      it('should create a POST request for every bid', function() {
+        const request = spec.buildRequests([bannerBidRequest], bidderRequest);
+        expect(request.method).to.equal('POST');
+        expect(request.url).to.equal(ENDPOINT);
+      });
+
+      it('should attach request data', function() {
+        config.setConfig({
+          currency: {
+            adServerCurrency: 'EUR'
+          }
+        });
+
+        const request = spec.buildRequests([bannerBidRequest], bidderRequest);
+
+        const data = JSON.parse(request.data);
+
+        expect(data.source.ext.prebid).to.equal('$prebid.version$');
+        expect(data.id).to.equal(bannerBidRequest.bidderRequestId);
+        expect(data.imp[0].bidfloor).to.equal(bannerBidRequest.params.bidfloor);
+        expect(data.imp[0].bidfloorcur).to.equal('USD');
+        expect(data.imp[0].tagId).to.equal('test-tag-1');
+        expect(data.site.publisher.id).to.equal(bannerBidRequest.params.publisherId);
+        expect(data.site.id).to.equal(bannerBidRequest.params.siteId);
+        expect(data.site.page).to.equal(bidderRequest.refererInfo.page);
+        expect(data.site.domain).to.equal(bidderRequest.refererInfo.domain);
+        expect(data.device).to.deep.contain({
+          ua: navigator.userAgent,
+          language: navigator.language
+        });
+        expect(data.cur).to.deep.equal(['EUR']);
+        expect(data.user).to.be.undefined;
+        expect(data.regs).to.be.undefined;
+      });
+
+      it('should get bid floor from module', function() {
+        const floorModuleData = {
+          currency: 'USD',
+          floor: 3.2,
+        }
+        bannerBidRequest.getFloor = function () {
+          return floorModuleData
         }
+        const request = spec.buildRequests([bannerBidRequest], bidderRequest);
+
+        const data = JSON.parse(request.data);
+
+        expect(data.source.ext.prebid).to.equal('$prebid.version$');
+        expect(data.id).to.equal(bannerBidRequest.bidderRequestId);
+        expect(data.imp[0].bidfloor).to.equal(floorModuleData.floor);
+        expect(data.imp[0].bidfloorcur).to.equal(floorModuleData.currency);
       });
 
-      const request = spec.buildRequests([bidRequest], bidderRequest);
+      it('should send gdpr data when gdpr does not apply', function() {
+        const gdprData = {
+          gdprConsent: {
+            gdprApplies: false,
+            consentString: undefined,
+          }
+        }
+        const request = spec.buildRequests([bannerBidRequest], {...bidderRequest, ...gdprData});
 
-      const data = JSON.parse(request.data);
+        const data = JSON.parse(request.data);
 
-      expect(data.source.ext.prebid).to.equal('$prebid.version$');
-      expect(data.id).to.equal(bidRequest.bidderRequestId);
-      expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
-      expect(data.imp[0].bidfloorcur).to.equal('USD');
-      expect(data.site).to.deep.equal({
-        publisher: {
-          id: bidRequest.params.publisherId,
-          domain: 'http://localhost:9876'
-        },
-        id: bidRequest.params.siteId,
-        page: bidderRequest.refererInfo.referer,
-        domain: parseUrl(bidderRequest.refererInfo.referer).hostname
+        expect(data.user).to.deep.equal({
+          ext: {
+            consent: ''
+          }
+        });
+        expect(data.regs).to.deep.equal({
+          ext: {
+            gdpr: false
+          }
+        });
       });
-      expect(data.device).to.deep.contain({
-        ua: navigator.userAgent,
-        language: navigator.language
+
+      it('should send gdpr data when gdpr applies', function() {
+        const tcString = 'sometcstring';
+        const gdprData = {
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: tcString
+          }
+        }
+        const request = spec.buildRequests([bannerBidRequest], {...bidderRequest, ...gdprData});
+
+        const data = JSON.parse(request.data);
+
+        expect(data.user).to.deep.equal({
+          ext: {
+            consent: tcString
+          }
+        });
+        expect(data.regs).to.deep.equal({
+          ext: {
+            gdpr: true
+          }
+        });
       });
-      expect(data.cur).to.deep.equal(['EUR']);
     });
-  });
 
-  describe('spec.interpretResponse', function() {
-    it('should return no bids if the response is not valid', function() {
-      const bidResponse = spec.interpretResponse({ body: null }, serverRequest);
-      expect(bidResponse.length).to.equal(0);
-    });
+    describe('spec.interpretResponse', function() {
+      it('should return no bids if the response is not valid', function() {
+        const bidResponse = spec.interpretResponse({ body: null }, bannerServerRequest);
+        expect(bidResponse.length).to.equal(0);
+      });
 
-    it('should return a valid bid response', function() {
-      const bidResponse = spec.interpretResponse(
-        { body: serverResponse },
-        serverRequest
-      )[0];
-      expect(bidResponse).to.contain({
-        requestId: bidRequest.bidId,
-        cpm: serverResponse.seatbid[0].bid[0].price,
-        creativeId: serverResponse.seatbid[0].bid[0].crid,
-        ttl: 300,
-        netRevenue: true,
-        mediaType: 'native',
-        currency: serverResponse.cur
-      });
-
-      expect(bidResponse.native.title).to.equal('Title');
-      expect(bidResponse.native.body).to.equal('Description');
-      expect(bidResponse.native.image).to.deep.equal({
-        url: 'http://url.to/image',
-        width: 750,
-        height: 500
-      });
-      expect(bidResponse.native.clickUrl).to.equal(
-        'http%3A%2F%2Furl.to%2Ftarget'
-      );
-      expect(bidResponse.native.impressionTrackers).to.contain(
-        'http://url.to/pixeltracker'
-      );
+      it('should return a valid bid response', function() {
+        const bidResponse = spec.interpretResponse(
+          { body: bannerServerResponse },
+          bannerServerRequest
+        )[0];
+        expect(bidResponse).to.contain({
+          requestId: bannerBidRequest.bidId,
+          cpm: bannerServerResponse.seatbid[0].bid[0].price,
+          creativeId: bannerServerResponse.seatbid[0].bid[0].crid,
+          ttl: 300,
+          netRevenue: true,
+          mediaType: 'banner',
+          currency: bannerServerResponse.cur,
+          ad: bannerServerResponse.seatbid[0].bid[0].adm,
+          width: bannerServerResponse.seatbid[0].bid[0].w,
+          height: bannerServerResponse.seatbid[0].bid[0].h,
+          burl: bannerServerResponse.seatbid[0].bid[0].burl,
+        });
+        expect(bidResponse.meta).to.deep.equal({
+          advertiserDomains: ['readpeak.com'],
+        });
+      });
     });
   });
 });
diff --git a/test/spec/modules/realTimeDataModule_spec.js b/test/spec/modules/realTimeDataModule_spec.js
new file mode 100644
index 00000000000..ced2f697649
--- /dev/null
+++ b/test/spec/modules/realTimeDataModule_spec.js
@@ -0,0 +1,373 @@
+import * as rtdModule from 'modules/rtdModule/index.js';
+import {config} from 'src/config.js';
+import * as sinon from 'sinon';
+import {default as CONSTANTS} from '../../../src/constants.json';
+import * as events from '../../../src/events.js';
+import 'src/prebid.js';
+import {attachRealTimeDataProvider, onDataDeletionRequest} from 'modules/rtdModule/index.js';
+
+const getBidRequestDataSpy = sinon.spy();
+
+const validSM = {
+  name: 'validSM',
+  init: () => { return true },
+  getTargetingData: (adUnitsCodes) => {
+    return {'ad2': {'key': 'validSM'}}
+  },
+  getBidRequestData: getBidRequestDataSpy
+};
+
+const validSMWait = {
+  name: 'validSMWait',
+  init: () => { return true },
+  getTargetingData: (adUnitsCodes) => {
+    return {'ad1': {'key': 'validSMWait'}}
+  },
+  getBidRequestData: getBidRequestDataSpy
+};
+
+const invalidSM = {
+  name: 'invalidSM'
+};
+
+const failureSM = {
+  name: 'failureSM',
+  init: () => { return false }
+};
+
+const nonConfSM = {
+  name: 'nonConfSM',
+  init: () => { return true }
+};
+
+const conf = {
+  'realTimeData': {
+    'auctionDelay': 100,
+    dataProviders: [
+      {
+        'name': 'validSMWait',
+        'waitForIt': true,
+      },
+      {
+        'name': 'validSM',
+        'waitForIt': false,
+      },
+      {
+        'name': 'invalidSM'
+      },
+      {
+        'name': 'failureSM'
+      }]
+  }
+};
+
+describe('Real time module', function () {
+  let eventHandlers;
+  let sandbox;
+
+  function mockEmitEvent(event, ...args) {
+    (eventHandlers[event] || []).forEach((h) => h(...args));
+  }
+
+  before(() => {
+    eventHandlers = {};
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(events, 'on').callsFake((event, handler) => {
+      if (!eventHandlers.hasOwnProperty(event)) {
+        eventHandlers[event] = [];
+      }
+      eventHandlers[event].push(handler);
+    });
+  });
+
+  after(() => {
+    sandbox.restore();
+  });
+
+  describe('', () => {
+    const PROVIDERS = [validSM, invalidSM, failureSM, nonConfSM, validSMWait];
+    let _detachers;
+
+    beforeEach(function () {
+      _detachers = PROVIDERS.map(rtdModule.attachRealTimeDataProvider);
+      rtdModule.init(config);
+      config.setConfig(conf);
+    });
+
+    afterEach(function () {
+      _detachers.forEach((f) => f());
+      config.resetConfig();
+    });
+
+    it('should use only valid modules', function () {
+      expect(rtdModule.subModules).to.eql([validSMWait, validSM]);
+    });
+
+    it('should be able to modify bid request', function (done) {
+      rtdModule.setBidRequestsData(() => {
+        assert(getBidRequestDataSpy.calledTwice);
+        assert(getBidRequestDataSpy.calledWith({bidRequest: {}}));
+        done();
+      }, {bidRequest: {}})
+    });
+
+    it('sould place targeting on adUnits', function (done) {
+      const auction = {
+        adUnitCodes: ['ad1', 'ad2'],
+        adUnits: [
+          {
+            code: 'ad1'
+          },
+          {
+            code: 'ad2',
+            adserverTargeting: {preKey: 'preValue'}
+          }
+        ]
+      };
+
+      const expectedAdUnits = [
+        {
+          code: 'ad1',
+          adserverTargeting: {key: 'validSMWait'}
+        },
+        {
+          code: 'ad2',
+          adserverTargeting: {
+            preKey: 'preValue',
+            key: 'validSM'
+          }
+        }
+      ];
+
+      const adUnits = rtdModule.getAdUnitTargeting(auction);
+      assert.deepEqual(expectedAdUnits, adUnits)
+      done();
+    });
+
+    describe('setBidRequestData', () => {
+      let withWait, withoutWait;
+
+      function runSetBidRequestData() {
+        return new Promise((resolve) => {
+          rtdModule.setBidRequestsData(resolve, {bidRequest: {}});
+        });
+      }
+
+      beforeEach(() => {
+        withWait = {
+          submod: validSMWait,
+          cbTime: 0,
+          cbRan: false
+        };
+        withoutWait = {
+          submod: validSM,
+          cbTime: 0,
+          cbRan: false
+        };
+
+        [withWait, withoutWait].forEach((c) => {
+          c.submod.getBidRequestData = sinon.stub().callsFake((_, cb) => {
+            setTimeout(() => {
+              c.cbRan = true;
+              cb();
+            }, c.cbTime);
+          });
+        });
+      });
+
+      it('should allow non-priority submodules to run synchronously', () => {
+        withWait.cbTime = withoutWait.cbTime = 0;
+        return runSetBidRequestData().then(() => {
+          expect(withWait.cbRan).to.be.true;
+          expect(withoutWait.cbRan).to.be.true;
+        })
+      });
+
+      it('should not wait for non-priority submodules if priority ones complete first', () => {
+        withWait.cbTime = 10;
+        withoutWait.cbTime = 100;
+        return runSetBidRequestData().then(() => {
+          expect(withWait.cbRan).to.be.true;
+          expect(withoutWait.cbRan).to.be.false;
+        });
+      });
+    });
+  });
+
+  it('deep merge object', function () {
+    const obj1 = {
+      id1: {
+        key: 'value',
+        key2: 'value2'
+      },
+      id2: {
+        k: 'v'
+      }
+    };
+    const obj2 = {
+      id1: {
+        key3: 'value3'
+      }
+    };
+    const obj3 = {
+      id3: {
+        key: 'value'
+      }
+    };
+    const expected = {
+      id1: {
+        key: 'value',
+        key2: 'value2',
+        key3: 'value3'
+      },
+      id2: {
+        k: 'v'
+      },
+      id3: {
+        key: 'value'
+      }
+    };
+
+    const merged = rtdModule.deepMerge([obj1, obj2, obj3]);
+    assert.deepEqual(expected, merged);
+  });
+
+  describe('event', () => {
+    const EVENTS = {
+      [CONSTANTS.EVENTS.AUCTION_INIT]: 'onAuctionInitEvent',
+      [CONSTANTS.EVENTS.AUCTION_END]: 'onAuctionEndEvent',
+      [CONSTANTS.EVENTS.BID_RESPONSE]: 'onBidResponseEvent',
+      [CONSTANTS.EVENTS.BID_REQUESTED]: 'onBidRequestEvent'
+    }
+    const conf = {
+      'realTimeData': {
+        dataProviders: [
+          {
+            'name': 'tp1',
+          },
+          {
+            'name': 'tp2',
+          }
+        ]
+      }
+    };
+    let providers;
+    let _detachers;
+
+    function eventHandlingProvider(name) {
+      const provider = {
+        name: name,
+        init: () => true,
+      }
+      Object.values(EVENTS).forEach((ev) => provider[ev] = sinon.spy());
+      return provider;
+    }
+
+    beforeEach(() => {
+      providers = [eventHandlingProvider('tp1'), eventHandlingProvider('tp2')];
+      _detachers = providers.map(rtdModule.attachRealTimeDataProvider);
+      rtdModule.init(config);
+      config.setConfig(conf);
+    });
+
+    afterEach(() => {
+      _detachers.forEach((d) => d())
+      config.resetConfig();
+    });
+
+    it('should set targeting for auctionEnd', () => {
+      providers.forEach(p => p.getTargetingData = sinon.spy());
+      const auction = {
+        adUnitCodes: ['a1'],
+        adUnits: [{code: 'a1'}]
+      };
+      mockEmitEvent(CONSTANTS.EVENTS.AUCTION_END, auction);
+      providers.forEach(p => {
+        expect(p.getTargetingData.calledWith(auction.adUnitCodes)).to.be.true;
+      });
+    });
+
+    Object.entries(EVENTS).forEach(([event, hook]) => {
+      it(`'${event}' should be propagated to providers through '${hook}'`, () => {
+        const eventArg = {};
+        mockEmitEvent(event, eventArg);
+        providers.forEach((provider) => {
+          const providerConf = conf.realTimeData.dataProviders.find((cfg) => cfg.name === provider.name);
+          expect(provider[hook].called).to.be.true;
+          expect(provider[hook].args).to.have.length(1);
+          expect(provider[hook].args[0]).to.include.members([eventArg, providerConf])
+        })
+      });
+
+      it(`${event} should not fail to propagate elsewhere if a provider throws in its event handler`, () => {
+        providers[0][hook] = function () { throw new Error() };
+        mockEmitEvent(event);
+        expect(providers[1][hook].called).to.be.true;
+      });
+    });
+  });
+
+  describe('data deletion requests', () => {
+    let detach = () => null;
+
+    function mkRtdModule(name) {
+      const mod = {
+        name,
+        init: () => true,
+        onDataDeletionRequest: sinon.stub()
+      };
+      detach = ((orig) => {
+        const smDetach = attachRealTimeDataProvider(mod);
+        return function () {
+          orig();
+          smDetach();
+        }
+      })(detach);
+      return mod;
+    }
+    let sm1, sm2, cfg1, cfg2;
+    beforeEach(() => {
+      sm1 = mkRtdModule('mockMod1');
+      sm2 = mkRtdModule('mockMod2');
+      cfg1 = {
+        name: 'mockMod1',
+        i: 0
+      };
+      cfg2 = {
+        name: 'mockMod2',
+        i: 1
+      };
+      rtdModule.init(config);
+      config.setConfig({
+        realTimeData: {
+          dataProviders: [cfg1, cfg2],
+        }
+      });
+    });
+    afterEach(() => {
+      detach();
+      config.resetConfig();
+    });
+
+    it('calls onDataDeletionRequest on submodules', () => {
+      const next = sinon.stub();
+      onDataDeletionRequest(next, {a: 0});
+      sinon.assert.calledWith(next, {a: 0});
+      sinon.assert.calledWith(sm1.onDataDeletionRequest, cfg1);
+      sinon.assert.calledWith(sm2.onDataDeletionRequest, cfg2);
+    });
+
+    describe('does not choke if onDataDeletionRequest', () => {
+      Object.entries({
+        'is missing': () => { delete sm1.onDataDeletionRequest },
+        'throws': () => { sm1.onDataDeletionRequest.throws(new Error()) }
+      }).forEach(([t, setup]) => {
+        it(t, () => {
+          setup();
+          onDataDeletionRequest(sinon.stub());
+          sinon.assert.calledWith(sm2.onDataDeletionRequest, cfg2);
+        })
+      })
+    })
+  });
+});
diff --git a/test/spec/modules/realTimeModule_spec.js b/test/spec/modules/realTimeModule_spec.js
deleted file mode 100644
index ca149fe7a44..00000000000
--- a/test/spec/modules/realTimeModule_spec.js
+++ /dev/null
@@ -1,282 +0,0 @@
-import {
-  init,
-  requestBidsHook,
-  setTargetsAfterRequestBids,
-  deepMerge,
-  validateProviderDataForGPT
-} from 'modules/rtdModule/index.js';
-import {
-  init as browsiInit,
-  addBrowsiTag,
-  isIdMatchingAdUnit,
-  setData,
-  getMacroId
-} from 'modules/browsiRtdProvider.js';
-import {
-  init as audigentInit,
-  setData as setAudigentData
-} from 'modules/audigentRtdProvider.js';
-import { config } from 'src/config.js';
-import { makeSlot } from '../integration/faker/googletag.js';
-
-let expect = require('chai').expect;
-
-describe('Real time module', function () {
-  const conf = {
-    'realTimeData': {
-      'auctionDelay': 250,
-      dataProviders: [{
-        'name': 'browsi',
-        'params': {
-          'url': 'testUrl.com',
-          'siteKey': 'testKey',
-          'pubKey': 'testPub',
-          'keyName': 'bv'
-        }
-      }, {
-        'name': 'audigent'
-      }]
-    }
-  };
-
-  const predictions = {
-    p: {
-      'browsiAd_2': {
-        'w': [
-          '/57778053/Browsi_Demo_Low',
-          '/57778053/Browsi_Demo_300x250'
-        ],
-        'p': 0.07
-      },
-      'browsiAd_1': {
-        'w': [],
-        'p': 0.06
-      },
-      'browsiAd_3': {
-        'w': [],
-        'p': 0.53
-      },
-      'browsiAd_4': {
-        'w': [
-          '/57778053/Browsi_Demo'
-        ],
-        'p': 0.85
-      }
-    }
-  };
-
-  const audigentSegments = {
-    audigent_segments: { 'a': 1, 'b': 2 }
-  }
-
-  function getAdUnitMock(code = 'adUnit-code') {
-    return {
-      code,
-      mediaTypes: { banner: {}, native: {} },
-      sizes: [[300, 200], [300, 600]],
-      bids: [{ bidder: 'sampleBidder', params: { placementId: 'banner-only-bidder' } }]
-    };
-  }
-
-  function createSlots() {
-    const slot1 = makeSlot({ code: '/57778053/Browsi_Demo_300x250', divId: 'browsiAd_1' });
-    const slot2 = makeSlot({ code: '/57778053/Browsi', divId: 'browsiAd_1' });
-    return [slot1, slot2];
-  }
-
-  describe('Real time module with browsi provider', function () {
-    afterEach(function () {
-      $$PREBID_GLOBAL$$.requestBids.removeAll();
-    });
-
-    after(function () {
-      config.resetConfig();
-    });
-
-    it('check module using bidsBackCallback', function () {
-      let adUnits1 = [getAdUnitMock('browsiAd_1')];
-      let targeting = [];
-      init(config);
-      browsiInit(config);
-      config.setConfig(conf);
-      setData(predictions);
-
-      // set slot
-      const slots = createSlots();
-      window.googletag.pubads().setSlots(slots);
-
-      function afterBidHook() {
-        slots.map(s => {
-          targeting = [];
-          s.getTargeting().map(value => {
-            targeting.push(Object.keys(value).toString());
-          });
-        });
-
-        expect(targeting.indexOf('bv')).to.be.greaterThan(-1);
-      }
-      setTargetsAfterRequestBids(afterBidHook, adUnits1, true);
-    });
-
-    it('check module using requestBidsHook', function () {
-      let adUnits1 = [getAdUnitMock('browsiAd_1')];
-      let targeting = [];
-      let dataReceived = null;
-
-      // set slot
-      const slotsB = createSlots();
-      window.googletag.pubads().setSlots(slotsB);
-
-      function afterBidHook(data) {
-        dataReceived = data;
-        slotsB.map(s => {
-          targeting = [];
-          s.getTargeting().map(value => {
-            targeting.push(Object.keys(value).toString());
-          });
-        });
-
-        expect(targeting.indexOf('bv')).to.be.greaterThan(-1);
-        dataReceived.adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid.realTimeData).to.have.property('bv');
-          });
-        });
-      }
-      requestBidsHook(afterBidHook, { adUnits: adUnits1 });
-    });
-
-    it('check object deep merge', function () {
-      const obj1 = {
-        id1: {
-          key: 'value',
-          key2: 'value2'
-        },
-        id2: {
-          k: 'v'
-        }
-      };
-      const obj2 = {
-        id1: {
-          key3: 'value3'
-        }
-      };
-      const obj3 = {
-        id3: {
-          key: 'value'
-        }
-      };
-      const expected = {
-        id1: {
-          key: 'value',
-          key2: 'value2',
-          key3: 'value3'
-        },
-        id2: {
-          k: 'v'
-        },
-        id3: {
-          key: 'value'
-        }
-      };
-
-      const merged = deepMerge([obj1, obj2, obj3]);
-      assert.deepEqual(expected, merged);
-    });
-
-    it('check data validation for GPT targeting', function () {
-      // non strings values should be removed
-      const obj = {
-        valid: {'key': 'value'},
-        invalid: {'key': ['value']},
-        combine: {
-          'a': 'value',
-          'b': []
-        }
-      };
-
-      const expected = {
-        valid: {'key': 'value'},
-        invalid: {},
-        combine: {
-          'a': 'value',
-        }
-      };
-      const validationResult = validateProviderDataForGPT(obj);
-      assert.deepEqual(expected, validationResult);
-    });
-
-    it('check browsi sub module', function () {
-      const script = addBrowsiTag('scriptUrl.com');
-      expect(script.getAttribute('data-sitekey')).to.equal('testKey');
-      expect(script.getAttribute('data-pubkey')).to.equal('testPub');
-      expect(script.async).to.equal(true);
-
-      const slots = createSlots();
-      const test1 = isIdMatchingAdUnit(slots[0], ['/57778053/Browsi_Demo_300x250']); // true
-      const test2 = isIdMatchingAdUnit(slots[0], ['/57778053/Browsi_Demo_300x250', '/57778053/Browsi']); // true
-      const test3 = isIdMatchingAdUnit(slots[0], ['/57778053/Browsi_Demo_Low']); // false
-      const test4 = isIdMatchingAdUnit(slots[0], []); // true
-
-      expect(test1).to.equal(true);
-      expect(test2).to.equal(true);
-      expect(test3).to.equal(false);
-      expect(test4).to.equal(true);
-
-      // macro results
-      slots[0].setTargeting('test', ['test', 'value']);
-      // slot getTargeting doesn't act like GPT so we can't expect real value
-      const macroResult = getMacroId({p: '<AD_UNIT>/<KEY_test>'}, slots[0]);
-      expect(macroResult).to.equal('/57778053/Browsi_Demo_300x250/NA');
-
-      const macroResultB = getMacroId({}, slots[0]);
-      expect(macroResultB).to.equal('browsiAd_1');
-
-      const macroResultC = getMacroId({p: '<AD_UNIT>', s: {s: 0, e: 1}}, slots[0]);
-      expect(macroResultC).to.equal('/');
-    })
-  });
-
-  describe('Real time module with Audigent provider', function () {
-    before(function () {
-      init(config);
-      audigentInit(config);
-      config.setConfig(conf);
-      setAudigentData(audigentSegments);
-    });
-
-    afterEach(function () {
-      $$PREBID_GLOBAL$$.requestBids.removeAll();
-      config.resetConfig();
-    });
-
-    it('check module using requestBidsHook', function () {
-      let adUnits1 = [getAdUnitMock('audigentAd_1')];
-      let targeting = [];
-      let dataReceived = null;
-
-      // set slot
-      const slotsB = createSlots();
-      window.googletag.pubads().setSlots(slotsB);
-
-      function afterBidHook(data) {
-        dataReceived = data;
-        slotsB.map(s => {
-          targeting = [];
-          s.getTargeting().map(value => {
-            targeting.push(Object.keys(value).toString());
-          });
-        });
-
-        dataReceived.adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid.realTimeData).to.have.property('audigent_segments');
-            expect(bid.realTimeData.audigent_segments).to.deep.equal(audigentSegments.audigent_segments);
-          });
-        });
-      }
-
-      requestBidsHook(afterBidHook, { adUnits: adUnits1 });
-    });
-  });
-});
diff --git a/test/spec/modules/reconciliationRtdProvider_spec.js b/test/spec/modules/reconciliationRtdProvider_spec.js
new file mode 100644
index 00000000000..6efe55ddf46
--- /dev/null
+++ b/test/spec/modules/reconciliationRtdProvider_spec.js
@@ -0,0 +1,221 @@
+import {
+  reconciliationSubmodule,
+  track,
+  getTopIFrameWin,
+  getSlotByWin
+} from 'modules/reconciliationRtdProvider.js';
+import { makeSlot } from '../integration/faker/googletag.js';
+import * as utils from 'src/utils.js';
+
+describe('Reconciliation Real time data submodule', function () {
+  const conf = {
+    dataProviders: [{
+      'name': 'reconciliation',
+      'params': {
+        'publisherMemberId': 'test_prebid_publisher'
+      },
+    }]
+  };
+
+  let trackPostStub;
+
+  beforeEach(function () {
+    trackPostStub = sinon.stub(track, 'trackPost');
+  });
+
+  afterEach(function () {
+    trackPostStub.restore();
+  });
+
+  describe('reconciliationSubmodule', function () {
+    describe('initialization', function () {
+      let utilsLogErrorSpy;
+
+      before(function () {
+        utilsLogErrorSpy = sinon.spy(utils, 'logError');
+      });
+
+      after(function () {
+        utils.logError.restore();
+      });
+
+      it('successfully instantiates', function () {
+        expect(reconciliationSubmodule.init(conf.dataProviders[0])).to.equal(true);
+      });
+
+      it('should log error if initializied without parameters', function () {
+        expect(reconciliationSubmodule.init({'name': 'reconciliation', 'params': {}})).to.equal(true);
+        expect(utilsLogErrorSpy.calledOnce).to.be.true;
+      });
+    });
+
+    describe('getData', function () {
+      it('should return data in proper format', function () {
+        makeSlot({code: '/reconciliationAdunit1', divId: 'reconciliationAd1'});
+
+        const targetingData = reconciliationSubmodule.getTargetingData(['/reconciliationAdunit1']);
+        expect(targetingData['/reconciliationAdunit1'].RSDK_AUID).to.eql('/reconciliationAdunit1');
+        expect(targetingData['/reconciliationAdunit1'].RSDK_ADID).to.be.a('string');
+      });
+
+      it('should return unit path if called with divId', function () {
+        makeSlot({code: '/reconciliationAdunit2', divId: 'reconciliationAd2'});
+
+        const targetingData = reconciliationSubmodule.getTargetingData(['reconciliationAd2']);
+        expect(targetingData['reconciliationAd2'].RSDK_AUID).to.eql('/reconciliationAdunit2');
+        expect(targetingData['reconciliationAd2'].RSDK_ADID).to.be.a('string');
+      });
+
+      it('should skip empty adUnit id', function () {
+        makeSlot({code: '/reconciliationAdunit3', divId: 'reconciliationAd3'});
+
+        const targetingData = reconciliationSubmodule.getTargetingData(['reconciliationAd3', '']);
+        expect(targetingData).to.have.all.keys('reconciliationAd3');
+      });
+    });
+
+    describe('track events', function () {
+      it('should track init event with data', function () {
+        const adUnit = {
+          code: '/adunit'
+        };
+
+        reconciliationSubmodule.getTargetingData([adUnit.code]);
+
+        expect(trackPostStub.calledOnce).to.be.true;
+        expect(trackPostStub.getCalls()[0].args[0]).to.eql('https://confirm.fiduciadlt.com/init');
+        expect(trackPostStub.getCalls()[0].args[1].adUnits[0].adUnitId).to.eql(adUnit.code);
+        expect(trackPostStub.getCalls()[0].args[1].adUnits[0].adDeliveryId).be.a('string');
+        expect(trackPostStub.getCalls()[0].args[1].publisherMemberId).to.eql('test_prebid_publisher');
+      });
+    });
+
+    describe('get topmost iframe', function () {
+      /**
+       * - top
+       * -- iframe.window  <-- top iframe window
+       * --- iframe.window
+       * ---- iframe.window <-- win
+       */
+      const mockFrameWin = (topWin, parentWin) => {
+        return {
+          top: topWin,
+          parent: parentWin
+        }
+      }
+
+      it('should return null if called with null', function() {
+        expect(getTopIFrameWin(null)).to.be.null;
+      });
+
+      it('should return null if there is an error in frames chain', function() {
+        const topWin = {};
+        const iframe1Win = mockFrameWin(topWin, null); // break chain
+        const iframe2Win = mockFrameWin(topWin, iframe1Win);
+
+        expect(getTopIFrameWin(iframe1Win, topWin)).to.be.null;
+      });
+
+      it('should get the topmost iframe', function () {
+        const topWin = {};
+        const iframe1Win = mockFrameWin(topWin, topWin);
+        const iframe2Win = mockFrameWin(topWin, iframe1Win);
+
+        expect(getTopIFrameWin(iframe2Win, topWin)).to.eql(iframe1Win);
+      });
+    });
+
+    describe('get slot by nested iframe window', function () {
+      it('should return the slot', function () {
+        const adSlotElement = document.createElement('div');
+        const adSlotIframe = document.createElement('iframe');
+
+        adSlotElement.id = 'reconciliationAd';
+        adSlotElement.appendChild(adSlotIframe);
+        document.body.appendChild(adSlotElement);
+
+        const adSlot = makeSlot({code: '/reconciliationAdunit', divId: adSlotElement.id});
+
+        expect(getSlotByWin(adSlotIframe.contentWindow)).to.eql(adSlot);
+      });
+
+      it('should return null if the slot is not found', function () {
+        const adSlotElement = document.createElement('div');
+        const adSlotIframe = document.createElement('iframe');
+
+        adSlotElement.id = 'reconciliationAd';
+        document.body.appendChild(adSlotElement);
+        document.body.appendChild(adSlotIframe); // iframe is not in ad slot
+
+        const adSlot = makeSlot({code: '/reconciliationAdunit', divId: adSlotElement.id});
+
+        expect(getSlotByWin(adSlotIframe.contentWindow)).to.be.null;
+      });
+    });
+
+    describe('handle postMessage from Reconciliation Tag in ad iframe', function () {
+      it('should track impression pixel with parameters', function (done) {
+        const adSlotElement = document.createElement('div');
+        const adSlotIframe = document.createElement('iframe');
+
+        adSlotElement.id = 'reconciliationAdMessage';
+        adSlotElement.appendChild(adSlotIframe);
+        document.body.appendChild(adSlotElement);
+
+        const adSlot = makeSlot({code: '/reconciliationAdunit', divId: adSlotElement.id});
+        // Fix targeting methods
+        adSlot.targeting = {};
+        adSlot.setTargeting = function(key, value) {
+          this.targeting[key] = [value];
+        };
+        adSlot.getTargeting = function(key) {
+          return this.targeting[key];
+        };
+
+        adSlot.setTargeting('RSDK_AUID', '/reconciliationAdunit');
+        adSlot.setTargeting('RSDK_ADID', '12345');
+        adSlotIframe.contentDocument.open();
+        adSlotIframe.contentDocument.write(`<script>
+          window.parent.postMessage(JSON.stringify({
+            type: 'rsdk:impression:req',
+            args: {
+              tagOwnerMemberId: "test_member_id",
+              dataSources: [
+                {
+                  memberId: "member_test",
+                  dataFeedName: "12345",
+                  impressionId: "54321",
+                  impressionIdDataField: "imp_id",
+                  allowedRecipientTypes: 41
+                }
+              ],
+              dataRecipients: [
+                {
+                  type: 1,
+                  memberId: "test_publisher_recipient"
+                },
+                {
+                  type: 16,
+                  memberId: "test_agency_recipient"
+                }
+              ]
+            }
+          }), '*');
+        </script>`);
+        adSlotIframe.contentDocument.close();
+
+        setTimeout(() => {
+          expect(trackPostStub.calledOnce).to.be.true;
+          expect(trackPostStub.getCalls()[0].args[0]).to.eql('https://confirm.fiduciadlt.com/pimp');
+          expect(trackPostStub.getCalls()[0].args[1].adUnitId).to.eql('/reconciliationAdunit');
+          expect(trackPostStub.getCalls()[0].args[1].adDeliveryId).to.eql('12345');
+          expect(trackPostStub.getCalls()[0].args[1].tagOwnerMemberId).to.eql('test_member_id'); ;
+          expect(trackPostStub.getCalls()[0].args[1].dataSources.length).to.eql(1);
+          expect(trackPostStub.getCalls()[0].args[1].dataRecipients.length).to.eql(2);
+          expect(trackPostStub.getCalls()[0].args[1].publisherMemberId).to.eql('test_prebid_publisher');
+          done();
+        }, 100);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/redtramBidAdapter_spec.js b/test/spec/modules/redtramBidAdapter_spec.js
new file mode 100644
index 00000000000..e136c37962b
--- /dev/null
+++ b/test/spec/modules/redtramBidAdapter_spec.js
@@ -0,0 +1,256 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/redtramBidAdapter.js';
+import { BANNER } from '../../../src/mediaTypes.js';
+import * as utils from '../../../src/utils.js';
+
+describe('RedtramBidAdapter', function () {
+  const bid = {
+    bidId: '23dc19818e5293',
+    bidder: 'redtram',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 23611,
+    }
+  };
+
+  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://prebid.redtram.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', '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.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', 'adFormat', 'sizes', 'schain', 'bidfloor');
+      expect(placement.placementId).to.equal(23611);
+      expect(placement.bidId).to.equal('23dc19818e5293');
+      expect(placement.adFormat).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+      expect(placement.bidfloor).to.exist.and.to.equal(0);
+    });
+
+    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: '23dc19818e5293',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {}
+        }]
+      };
+      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('23dc19818e5293');
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23dc19818e5293',
+          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 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;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should do nothing on getUserSyncs', function () {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://prebid.redtram.com/sync/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+  });
+
+  describe('on bidWon', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('should replace nurl for banner', function () {
+      const nurl = 'nurl/?ap=${' + 'AUCTION_PRICE}';
+      const bid = {
+        'bidderCode': 'redtram',
+        'width': 300,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'adId': '5691dd18ba6ab6',
+        'requestId': '23dc19818e5293',
+        'transactionId': '948c716b-bf64-4303-bcf4-395c2f6a9770',
+        'auctionId': 'a6b7c61f-15a9-481b-8f64-e859787e9c07',
+        'mediaType': 'banner',
+        'source': 'client',
+        'ad': "<div class=\"r23611\"></div>\n<script type=\"text/javascript\">\n(function() {\nvar tag = (function() {\nvar informers = document.getElementsByClassName('r23611'),\nlen = informers.length;\nreturn len ? informers[len - 1] : null;\n})(),\nidn = (function() {\nvar i, num, idn = '', chars = \"abcdefghiklmnopqrstuvwxyz\",\nlen = Math.floor((Math.random() * 2) + 4);\nfor (i = 0; i < len; i++) {\nnum = Math.floor(Math.random() * chars.length);\nidn += chars.substring(num, num + 1);\n}\nreturn idn;\n})();\nvar container = document.createElement('div');\ncontainer.id = idn;\ntag.appendChild(container);\nvar script = document.createElement('script');\nscript.className = 's23611';\nscript.src = 'https://goods.redtram.com/j/23611/?v=1';\nscript.charset = 'utf-8';\nscript.dataset.idn = idn;\ntag.parentNode.insertBefore(script, tag);\n})();\n</script>",
+        'cpm': 0.68,
+        'nurl': nurl,
+        'creativeId': 'test',
+        'currency': 'USD',
+        'dealId': '',
+        'meta': {
+          'advertiserDomains': [],
+          'dchain': {
+            'ver': '1.0',
+            'complete': 0,
+            'nodes': [
+              {
+                'name': 'redtram'
+              }
+            ]
+          }
+        },
+        'netRevenue': true,
+        'ttl': 120,
+        'metrics': {},
+        'adapterCode': 'redtram',
+        'originalCpm': 0.68,
+        'originalCurrency': 'USD',
+        'responseTimestamp': 1668162732297,
+        'requestTimestamp': 1668162732292,
+        'bidder': 'redtram',
+        'adUnitCode': 'div-prebid',
+        'timeToRespond': 5,
+        'pbLg': '0.50',
+        'pbMg': '0.60',
+        'pbHg': '0.68',
+        'pbAg': '0.65',
+        'pbDg': '0.68',
+        'pbCg': '',
+        'size': '300x250',
+        'adserverTargeting': {
+          'hb_bidder': 'redtram',
+          'hb_adid': '5691dd18ba6ab6',
+          'hb_pb': '0.68',
+          'hb_size': '300x250',
+          'hb_source': 'client',
+          'hb_format': 'banner',
+          'hb_adomain': ''
+        },
+        'status': 'rendered',
+        'params': [
+          {
+            'placementId': 23611
+          }
+        ]
+      };
+      spec.onBidWon(bid);
+      expect(bid.nurl).to.deep.equal('nurl/?ap=0.68');
+    });
+  });
+});
diff --git a/test/spec/modules/reklamstoreBidAdapter_spec.js b/test/spec/modules/reklamstoreBidAdapter_spec.js
deleted file mode 100644
index 1dcd6c17ca4..00000000000
--- a/test/spec/modules/reklamstoreBidAdapter_spec.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/reklamstoreBidAdapter.js';
-
-describe('reklamstoreBidAdapterTests', function() {
-  let bidRequestData = {
-    bids: [
-      {
-        bidder: 'reklamstore',
-        params: {
-          regionId: 532211
-        },
-        sizes: [[300, 250]]
-      }
-    ]
-  };
-  let request = [];
-
-  it('validate_params', function() {
-    expect(
-      spec.isBidRequestValid({
-        bidder: 'reklamstore',
-        params: {
-          regionId: 532211
-        }
-      })
-    ).to.equal(true);
-  });
-
-  it('validate_generated_params', function() {
-    let bidderRequest = {
-      refererInfo: {
-        referer: 'https://reklamstore.com'
-      }
-    };
-    request = spec.buildRequests(bidRequestData.bids, bidderRequest);
-    let req_data = request[0].data;
-
-    expect(req_data.regionId).to.equal(532211);
-  });
-
-  const serverResponse = {
-    body:
-      {
-        cpm: 1.2,
-        ad: 'Ad html',
-        w: 300,
-        h: 250,
-        syncs: [{
-          type: 'image',
-          url: 'https://link1'
-        },
-        {
-          type: 'iframe',
-          url: 'https://link2'
-        }
-        ]
-      }
-  };
-
-  it('validate_response_params', function() {
-    let bids = spec.interpretResponse(serverResponse, bidRequestData.bids[0]);
-    expect(bids).to.have.lengthOf(1);
-
-    let bid = bids[0];
-    expect(bid.ad).to.equal('Ad html');
-    expect(bid.cpm).to.equal(1.2);
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.currency).to.equal('USD');
-  });
-
-  it('should return no syncs when pixel syncing is disabled', function () {
-    const syncs = spec.getUserSyncs({ pixelEnabled: false }, [serverResponse]);
-    expect(syncs).to.deep.equal([]);
-  });
-
-  it('should return user syncs', function () {
-    const syncs = spec.getUserSyncs({pixelEnabled: true, iframeEnabled: true}, [serverResponse]);
-    const expected = [
-      { type: 'image', url: 'https://link1' },
-      { type: 'iframe', url: 'https://link2' },
-    ];
-    expect(syncs).to.deep.equal(expected);
-  });
-});
diff --git a/test/spec/modules/relaidoBidAdapter_spec.js b/test/spec/modules/relaidoBidAdapter_spec.js
index cd4918460db..6a6e79c633d 100644
--- a/test/spec/modules/relaidoBidAdapter_spec.js
+++ b/test/spec/modules/relaidoBidAdapter_spec.js
@@ -1,22 +1,27 @@
 import { expect } from 'chai';
 import { spec } from 'modules/relaidoBidAdapter.js';
 import * as utils from 'src/utils.js';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import { getStorageManager } from '../../../src/storageManager.js';
 
 const UUID_KEY = 'relaido_uuid';
-const DEFAULT_USER_AGENT = window.navigator.userAgent;
-const MOBILE_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.5 Mobile/15E148 Safari/604.1';
+const relaido_uuid = 'hogehoge';
 
-const setUADefault = () => { window.navigator.__defineGetter__('userAgent', function () { return DEFAULT_USER_AGENT }) };
-const setUAMobile = () => { window.navigator.__defineGetter__('userAgent', function () { return MOBILE_USER_AGENT }) };
+const storage = getStorageManager();
+storage.setCookie(UUID_KEY, relaido_uuid);
 
 describe('RelaidoAdapter', function () {
-  const relaido_uuid = 'hogehoge';
   let bidRequest;
   let bidderRequest;
   let serverResponse;
+  let serverResponseBanner;
   let serverRequest;
+  let generateUUIDStub;
+  let triggerPixelStub;
 
   beforeEach(function () {
+    generateUUIDStub = sinon.stub(utils, 'generateUUID').returns(relaido_uuid);
+    triggerPixelStub = sinon.stub(utils, 'triggerPixel');
     bidRequest = {
       bidder: 'relaido',
       params: {
@@ -42,30 +47,69 @@ describe('RelaidoAdapter', function () {
     bidderRequest = {
       timeout: 1000,
       refererInfo: {
-        referer: 'https://publisher.com/home'
+        page: 'https://publisher.com/home?aaa=test1&bbb=test2',
+        canonicalUrl: 'https://publisher.com/home'
       }
     };
     serverResponse = {
       body: {
         status: 'ok',
-        price: 500,
-        model: 'vcpm',
-        currency: 'JPY',
-        creativeId: 1000,
-        uuid: relaido_uuid,
-        vast: '<VAST version="3.0"><Ad><InLine></InLine></Ad></VAST>',
+        ads: [{
+          placementId: 100000,
+          width: 640,
+          height: 360,
+          bidId: '2ed93003f7bb99',
+          price: 500,
+          model: 'vcpm',
+          currency: 'JPY',
+          creativeId: 1000,
+          vast: '<VAST version="3.0"><Ad><InLine></InLine></Ad></VAST>',
+          syncUrl: 'https://relaido/sync.html',
+          adomain: ['relaido.co.jp', 'www.cmertv.co.jp'],
+          mediaType: 'video'
+        }],
         playerUrl: 'https://relaido/player.js',
-        syncUrl: 'https://relaido/sync.html'
+        syncUrl: 'https://api-dev.ulizaex.com/tr/v1/prebid/sync.html',
+        uuid: relaido_uuid,
+      }
+    };
+    serverResponseBanner = {
+      body: {
+        status: 'ok',
+        ads: [{
+          placementId: 100000,
+          width: 640,
+          height: 360,
+          bidId: '2ed93003f7bb99',
+          price: 500,
+          model: 'vcpm',
+          currency: 'JPY',
+          creativeId: 1000,
+          adTag: '%3Cdiv%3E%3Cimg%20src%3D%22https%3A%2F%2Frelaido%2Ftest.jpg%22%20%2F%3E%3C%2Fdiv%3E',
+          syncUrl: 'https://relaido/sync.html',
+          adomain: ['relaido.co.jp', 'www.cmertv.co.jp'],
+          mediaType: 'banner'
+        }],
+        syncUrl: 'https://api-dev.ulizaex.com/tr/v1/prebid/sync.html',
+        uuid: relaido_uuid,
       }
     };
     serverRequest = {
-      method: 'GET',
-      bidId: bidRequest.bidId,
-      width: bidRequest.mediaTypes.video.playerSize[0][0],
-      height: bidRequest.mediaTypes.video.playerSize[0][1],
-      mediaType: 'video',
+      method: 'POST',
+      data: {
+        bids: [{
+          bidId: bidRequest.bidId,
+          width: bidRequest.mediaTypes.video.playerSize[0][0] || bidRequest.mediaTypes.video.playerSize[0],
+          height: bidRequest.mediaTypes.video.playerSize[0][1] || bidRequest.mediaTypes.video.playerSize[1],
+          mediaType: 'video'
+        }]
+      }
     };
-    localStorage.setItem(UUID_KEY, relaido_uuid);
+  });
+
+  afterEach(() => {
+    generateUUIDStub.restore();
+    triggerPixelStub.restore();
   });
 
   describe('spec.isBidRequestValid', function () {
@@ -73,8 +117,34 @@ describe('RelaidoAdapter', function () {
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
     });
 
+    it('should return true when not existed mediaTypes.video.playerSize and existed valid params.video.playerSize by video', function () {
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'outstream'
+        }
+      };
+      bidRequest.params = {
+        placementId: '100000',
+        video: {
+          playerSize: [
+            [640, 360]
+          ]
+        }
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return even true when the playerSize is Array[Number, Number] by video', function () {
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'outstream',
+          playerSize: [640, 360]
+        }
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
     it('should return true when the required params are passed by banner', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         banner: {
           sizes: [
@@ -83,44 +153,70 @@ describe('RelaidoAdapter', function () {
         }
       };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-      setUADefault();
-    });
-
-    it('should return false when the uuid are missing', function () {
-      localStorage.removeItem(UUID_KEY);
-      const result = !!(utils.isSafariBrowser());
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(result);
     });
 
-    it('should return false when the placementId params are missing', function () {
-      bidRequest.params.placementId = undefined;
+    it('should return false when missing 300x250 over and 1x1 by banner', function () {
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: [
+            [100, 100],
+            [300, 100]
+          ]
+        }
+      };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
     });
 
-    it('should return false when the mediaType video params are missing', function () {
+    it('should return true when 300x250 by banner', function () {
       bidRequest.mediaTypes = {
-        video: {}
+        banner: {
+          sizes: [
+            [300, 250]
+          ]
+        }
       };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
     });
 
-    it('should return false when the mediaType banner params are missing', function () {
-      setUAMobile();
+    it('should return true when 1x1 by banner', function () {
       bidRequest.mediaTypes = {
-        banner: {}
+        banner: {
+          sizes: [
+            [1, 1]
+          ]
+        }
       };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-      setUADefault();
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
     });
 
-    it('should return false when the non-mobile', function () {
+    it('should return true when 300x250 over by banner', function () {
       bidRequest.mediaTypes = {
         banner: {
           sizes: [
+            [100, 100],
             [300, 250]
           ]
         }
       };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return false when the placementId params are missing', function () {
+      bidRequest.params.placementId = undefined;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when the mediaType video params are missing', function () {
+      bidRequest.mediaTypes = {
+        video: {}
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when the mediaType banner params are missing', function () {
+      bidRequest.mediaTypes = {
+        banner: {}
+      };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
     });
 
@@ -133,85 +229,157 @@ describe('RelaidoAdapter', function () {
   describe('spec.buildRequests', function () {
     it('should build bid requests by video', function () {
       const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
-      expect(bidRequests).to.have.lengthOf(1);
-      const request = bidRequests[0];
-      expect(request.method).to.equal('GET');
-      expect(request.url).to.equal('https://api.relaido.jp/bid/v1/prebid/100000');
-      expect(request.bidId).to.equal(bidRequest.bidId);
-      expect(request.width).to.equal(bidRequest.mediaTypes.video.playerSize[0][0]);
-      expect(request.height).to.equal(bidRequest.mediaTypes.video.playerSize[0][1]);
-      expect(request.mediaType).to.equal('video');
-      expect(request.data.ref).to.equal(bidderRequest.refererInfo.referer);
-      expect(request.data.timeout_ms).to.equal(bidderRequest.timeout);
-      expect(request.data.ad_unit_code).to.equal(bidRequest.adUnitCode);
-      expect(request.data.auction_id).to.equal(bidRequest.auctionId);
-      expect(request.data.bidder).to.equal(bidRequest.bidder);
-      expect(request.data.bidder_request_id).to.equal(bidRequest.bidderRequestId);
-      expect(request.data.bid_requests_count).to.equal(bidRequest.bidRequestsCount);
-      expect(request.data.bid_id).to.equal(bidRequest.bidId);
-      expect(request.data.transaction_id).to.equal(bidRequest.transactionId);
-      expect(request.data.media_type).to.equal('video');
-      expect(request.data.uuid).to.equal(relaido_uuid);
-      expect(request.data.width).to.equal(bidRequest.mediaTypes.video.playerSize[0][0]);
-      expect(request.data.height).to.equal(bidRequest.mediaTypes.video.playerSize[0][1]);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      const request = data.bids[0];
+      expect(bidRequests.method).to.equal('POST');
+      expect(bidRequests.url).to.equal('https://api.relaido.jp/bid/v1/sprebid');
+      expect(data.canonical_url_hash).to.equal('e6092f44a0044903ae3764126eedd6187c1d9f04');
+      expect(data.ref).to.equal(bidderRequest.refererInfo.page);
+      expect(data.timeout_ms).to.equal(bidderRequest.timeout);
+      expect(request.ad_unit_code).to.equal(bidRequest.adUnitCode);
+      expect(request.auction_id).to.equal(bidRequest.auctionId);
+      expect(data.bidder).to.equal(bidRequest.bidder);
+      expect(request.bidder_request_id).to.equal(bidRequest.bidderRequestId);
+      expect(data.bid_requests_count).to.equal(bidRequest.bidRequestsCount);
+      expect(request.bid_id).to.equal(bidRequest.bidId);
+      expect(request.transaction_id).to.equal(bidRequest.transactionId);
+      expect(request.media_type).to.equal('video');
+      expect(data.uuid).to.equal(relaido_uuid);
+      expect(data.pv).to.equal('$prebid.version$');
     });
 
     it('should build bid requests by banner', function () {
       bidRequest.mediaTypes = {
+        video: {
+          context: 'outstream',
+          playerSize: [
+            [320, 180]
+          ]
+        },
         banner: {
           sizes: [
-            [640, 360]
+            [640, 360],
+            [1, 1]
+          ]
+        }
+      };
+      const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      const request = data.bids[0];
+      expect(request.media_type).to.equal('banner');
+      expect(request.banner_sizes).to.equal('640x360,1x1');
+    });
+
+    it('should take 1x1 size', function () {
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'outstream',
+          playerSize: [
+            [320, 180]
+          ]
+        },
+        banner: {
+          sizes: [
+            [640, 360],
+            [1, 1]
           ]
         }
       };
       const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
-      expect(bidRequests).to.have.lengthOf(1);
-      const request = bidRequests[0];
-      expect(request.mediaType).to.equal('banner');
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      const request = data.bids[0];
+
+      expect(request.width).to.equal(1);
     });
 
     it('The referrer should be the last', function () {
       const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
-      expect(bidRequests).to.have.lengthOf(1);
-      const request = bidRequests[0];
-      const keys = Object.keys(request.data);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      const keys = Object.keys(data);
       expect(keys[0]).to.equal('version');
       expect(keys[keys.length - 1]).to.equal('ref');
     });
+
+    it('should get imuid', function () {
+      bidRequest.userId = {}
+      bidRequest.userId.imuid = 'i.tjHcK_7fTcqnbrS_YA2vaw';
+      const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(bidRequests.data);
+      expect(data.bids).to.have.lengthOf(1);
+      expect(data.imuid).to.equal('i.tjHcK_7fTcqnbrS_YA2vaw');
+    });
   });
 
   describe('spec.interpretResponse', function () {
-    it('should build bid response by video', function () {
+    it('should build bid response by video and serverResponse contains vast', function () {
       const bidResponses = spec.interpretResponse(serverResponse, serverRequest);
       expect(bidResponses).to.have.lengthOf(1);
       const response = bidResponses[0];
-      expect(response.requestId).to.equal(serverRequest.bidId);
-      expect(response.width).to.equal(serverRequest.width);
-      expect(response.height).to.equal(serverRequest.height);
-      expect(response.cpm).to.equal(serverResponse.body.price);
-      expect(response.currency).to.equal(serverResponse.body.currency);
-      expect(response.creativeId).to.equal(serverResponse.body.creativeId);
-      expect(response.vastXml).to.equal(serverResponse.body.vast);
+      expect(response.requestId).to.equal(serverRequest.data.bids[0].bidId);
+      expect(response.width).to.equal(serverRequest.data.bids[0].width);
+      expect(response.height).to.equal(serverRequest.data.bids[0].height);
+      expect(response.cpm).to.equal(serverResponse.body.ads[0].price);
+      expect(response.currency).to.equal(serverResponse.body.ads[0].currency);
+      expect(response.creativeId).to.equal(serverResponse.body.ads[0].creativeId);
+      expect(response.vastXml).to.equal(serverResponse.body.ads[0].vast);
+      expect(response.playerUrl).to.equal(serverResponse.body.playerUrl);
+      expect(response.meta.advertiserDomains).to.equal(serverResponse.body.ads[0].adomain);
+      expect(response.meta.mediaType).to.equal(VIDEO);
       expect(response.ad).to.be.undefined;
     });
 
-    it('should build bid response by banner', function () {
-      serverRequest.mediaType = 'banner';
+    it('should build bid response by banner and serverResponse contains vast', function () {
+      serverResponse.body.ads[0].mediaType = 'banner';
       const bidResponses = spec.interpretResponse(serverResponse, serverRequest);
       expect(bidResponses).to.have.lengthOf(1);
       const response = bidResponses[0];
-      expect(response.requestId).to.equal(serverRequest.bidId);
-      expect(response.width).to.equal(serverRequest.width);
-      expect(response.height).to.equal(serverRequest.height);
-      expect(response.cpm).to.equal(serverResponse.body.price);
-      expect(response.currency).to.equal(serverResponse.body.currency);
-      expect(response.creativeId).to.equal(serverResponse.body.creativeId);
+      expect(response.requestId).to.equal(serverRequest.data.bids[0].bidId);
+      expect(response.width).to.equal(serverRequest.data.bids[0].width);
+      expect(response.height).to.equal(serverRequest.data.bids[0].height);
+      expect(response.cpm).to.equal(serverResponse.body.ads[0].price);
+      expect(response.currency).to.equal(serverResponse.body.ads[0].currency);
+      expect(response.creativeId).to.equal(serverResponse.body.ads[0].creativeId);
       expect(response.vastXml).to.be.undefined;
+      expect(response.playerUrl).to.equal(serverResponse.body.playerUrl);
       expect(response.ad).to.include(`<div id="rop-prebid">`);
       expect(response.ad).to.include(`<script src="https://relaido/player.js"></script>`);
       expect(response.ad).to.include(`window.RelaidoPlayer.renderAd`);
     });
 
+    it('should build bid response by banner and serverResponse contains adTag', function () {
+      const bidResponses = spec.interpretResponse(serverResponseBanner, serverRequest);
+      expect(bidResponses).to.have.lengthOf(1);
+      const response = bidResponses[0];
+      expect(response.requestId).to.equal(serverRequest.data.bids[0].bidId);
+      expect(response.cpm).to.equal(serverResponseBanner.body.ads[0].price);
+      expect(response.currency).to.equal(serverResponseBanner.body.ads[0].currency);
+      expect(response.creativeId).to.equal(serverResponseBanner.body.ads[0].creativeId);
+      expect(response.vastXml).to.be.undefined;
+      expect(response.playerUrl).to.be.undefined;
+      expect(response.ad).to.include(`<div><img src="https://relaido/test.jpg" /></div>`);
+    });
+
+    it('should build bid response by video and playerUrl in ads', function () {
+      serverResponse.body.ads[0].playerUrl = 'https://relaido/player-customized.js';
+      const bidResponses = spec.interpretResponse(serverResponse, serverRequest);
+      expect(bidResponses).to.have.lengthOf(1);
+      const response = bidResponses[0];
+      expect(response.playerUrl).to.equal(serverResponse.body.ads[0].playerUrl);
+    });
+
+    it('should build bid response by banner and playerUrl in ads', function () {
+      serverResponse.body.ads[0].playerUrl = 'https://relaido/player-customized.js';
+      serverResponse.body.ads[0].mediaType = 'banner';
+      const bidResponses = spec.interpretResponse(serverResponse, serverRequest);
+      expect(bidResponses).to.have.lengthOf(1);
+      const response = bidResponses[0];
+      expect(response.playerUrl).to.equal(serverResponse.body.ads[0].playerUrl);
+    });
+
     it('should not build bid response', function () {
       serverResponse = {};
       const bidResponses = spec.interpretResponse(serverResponse, serverRequest);
@@ -234,7 +402,7 @@ describe('RelaidoAdapter', function () {
       let userSyncs = spec.getUserSyncs({iframeEnabled: true}, [serverResponse]);
       expect(userSyncs).to.deep.equal([{
         type: 'iframe',
-        url: serverResponse.body.syncUrl
+        url: serverResponse.body.syncUrl + '?uu=hogehoge'
       }]);
     });
 
@@ -242,7 +410,7 @@ describe('RelaidoAdapter', function () {
       let userSyncs = spec.getUserSyncs({iframeEnabled: true}, []);
       expect(userSyncs).to.deep.equal([{
         type: 'iframe',
-        url: 'https://api.relaido.jp/tr/v1/prebid/sync.html'
+        url: 'https://api.relaido.jp/tr/v1/prebid/sync.html?uu=hogehoge'
       }]);
     });
 
@@ -251,7 +419,7 @@ describe('RelaidoAdapter', function () {
       let userSyncs = spec.getUserSyncs({iframeEnabled: true}, [serverResponse]);
       expect(userSyncs).to.deep.equal([{
         type: 'iframe',
-        url: 'https://api.relaido.jp/tr/v1/prebid/sync.html'
+        url: 'https://api.relaido.jp/tr/v1/prebid/sync.html?uu=hogehoge'
       }]);
     });
 
@@ -262,19 +430,11 @@ describe('RelaidoAdapter', function () {
   });
 
   describe('spec.onBidWon', function () {
-    let stub;
-    beforeEach(() => {
-      stub = sinon.stub(utils, 'triggerPixel');
-    });
-    afterEach(() => {
-      stub.restore();
-    });
-
     it('Should create nurl pixel if bid nurl', function () {
       let bid = {
         bidder: bidRequest.bidder,
-        creativeId: serverResponse.body.creativeId,
-        cpm: serverResponse.body.price,
+        creativeId: serverResponse.body.ads[0].creativeId,
+        cpm: serverResponse.body.ads[0].price,
         params: [bidRequest.params],
         auctionId: bidRequest.auctionId,
         requestId: bidRequest.bidId,
@@ -283,7 +443,7 @@ describe('RelaidoAdapter', function () {
         ref: window.location.href,
       }
       spec.onBidWon(bid);
-      const parser = utils.parseUrl(stub.getCall(0).args[0]);
+      const parser = utils.parseUrl(triggerPixelStub.getCall(0).args[0]);
       const query = parser.search;
       expect(parser.hostname).to.equal('api.relaido.jp');
       expect(parser.pathname).to.equal('/tr/v1/prebid/win.gif');
@@ -299,14 +459,6 @@ describe('RelaidoAdapter', function () {
   });
 
   describe('spec.onTimeout', function () {
-    let stub;
-    beforeEach(() => {
-      stub = sinon.stub(utils, 'triggerPixel');
-    });
-    afterEach(() => {
-      stub.restore();
-    });
-
     it('Should create nurl pixel if bid nurl', function () {
       const data = [{
         bidder: bidRequest.bidder,
@@ -317,7 +469,7 @@ describe('RelaidoAdapter', function () {
         timeout: bidderRequest.timeout,
       }];
       spec.onTimeout(data);
-      const parser = utils.parseUrl(stub.getCall(0).args[0]);
+      const parser = utils.parseUrl(triggerPixelStub.getCall(0).args[0]);
       const query = parser.search;
       expect(parser.hostname).to.equal('api.relaido.jp');
       expect(parser.pathname).to.equal('/tr/v1/prebid/timeout.gif');
diff --git a/test/spec/modules/relevantAnalyticsAdapter_spec.js b/test/spec/modules/relevantAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..5c818fe01d4
--- /dev/null
+++ b/test/spec/modules/relevantAnalyticsAdapter_spec.js
@@ -0,0 +1,43 @@
+import relevantAnalytics from '../../../modules/relevantAnalyticsAdapter.js';
+import adapterManager from 'src/adapterManager';
+import * as events from 'src/events';
+import constants from 'src/constants.json'
+import { expect } from 'chai';
+
+describe('Relevant Analytics Adapter', () => {
+  beforeEach(() => {
+    adapterManager.enableAnalytics({
+      provider: 'relevant'
+    });
+  });
+
+  afterEach(() => {
+    relevantAnalytics.disableAnalytics();
+  });
+
+  it('should pass all events to the global array', () => {
+    // Given
+    const testEvents = [
+      { ev: constants.EVENTS.AUCTION_INIT, args: { test: 1 } },
+      { ev: constants.EVENTS.BID_REQUESTED, args: { test: 2 } },
+    ];
+
+    // When
+    testEvents.forEach(({ ev, args }) => (
+      events.emit(ev, args)
+    ));
+
+    // Then
+    const eventQueue = (window.relevantDigital || {}).pbEventLog;
+    expect(eventQueue).to.be.an('array');
+    expect(eventQueue.length).to.be.at.least(testEvents.length);
+
+    // The last events should be our test events
+    const myEvents = eventQueue.slice(-testEvents.length);
+    testEvents.forEach(({ ev, args }, idx) => {
+      const actualEvent = myEvents[idx];
+      expect(actualEvent.ev).to.eql(ev);
+      expect(actualEvent.args).to.eql(args);
+    });
+  });
+});
diff --git a/test/spec/modules/reloadBidAdapter_spec.js b/test/spec/modules/reloadBidAdapter_spec.js
deleted file mode 100644
index b22dd9e7b92..00000000000
--- a/test/spec/modules/reloadBidAdapter_spec.js
+++ /dev/null
@@ -1,295 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/reloadBidAdapter.js';
-
-let getParams = () => {
-  return JSON.parse(JSON.stringify({
-    'plcmID': 'placement_01',
-    'partID': 'part00',
-    'opdomID': 1,
-    'bsrvID': 1,
-    'type': 'pcm'
-  }));
-};
-
-let getBidderRequest = () => {
-  return JSON.parse(JSON.stringify({
-    bidderCode: 'reload',
-    auctionId: 'd3e07445-ab06-44c8-a9dd-5ef9af06d2a6',
-    bidderRequestId: '7101db09af0db2',
-    start: new Date().getTime(),
-    bids: [{
-      bidder: 'reload',
-      bidId: '84ab500420319d',
-      bidderRequestId: '7101db09af0db2',
-      auctionId: 'd3e07445-ab06-44c8-a9dd-5ef9af06d2a6',
-      params: getParams()
-    }]
-  }));
-};
-
-let getValidBidRequests = () => {
-  return JSON.parse(JSON.stringify([
-    {
-      'bidder': 'reload',
-      'params': getParams(),
-      'mediaTypes': {
-        'banner': {
-          'sizes': [[160, 600]]
-        }
-      },
-      'adUnitCode': '1b243858-3c53-43dc-9fdf-89f839ea4a0f',
-      'transactionId': '8cbafa10-123d-4673-a1a5-04a1c7d62ded',
-      'sizes': [[160, 600]],
-      'bidId': '2236e11dc09931',
-      'bidderRequestId': '1266bb886c2267',
-      'auctionId': '4fb72c4d-94dc-4db1-8fac-3c2090ceeec0',
-      'src': 'client',
-      'bidRequestsCount': 1
-    }
-  ]));
-}
-
-let getExt1ServerResponse = () => {
-  return JSON.parse(JSON.stringify({
-    'pcmdata': {
-      'thisVer': '100',
-      'plcmSett': {
-        'name': 'zz_test_mariano_adapter',
-        'Version': '210',
-        'lifeSpan': '100',
-        'versionFolder': 'v4.14q',
-        'versionFolderA': 'v4.14q',
-        'versionFolderB': '',
-        'stage': 'zz_test_mariano_adapter',
-        'synchro': 1556916507000,
-        'localCache': 'true',
-        'testCase': 'A:00_B:100',
-        'opdomain': '1',
-        'checksum': '6378',
-        'cpm': '0',
-        'bstfct': '100',
-        'totstop': 'false',
-        'pcmurl': 'bidsrv01.reload.net'
-      },
-      'srvUrl': 'bidsrv01.reload.net',
-      'instr': {'go': true, 'prc': 32, 'cur': 'USD'},
-      'statStr': 'eyN4aHYnQCk5OTotOC',
-      'status': 'ok',
-      'message': '',
-      'log': '---- LOG ----'
-    },
-    'plcmID': 'zz_test_mariano_adapter',
-    'partID': 'prx_part',
-    'opdomID': '0',
-    'bsrvID': 1,
-    'adUnitCode': '1b243858-3c53-43dc-9fdf-89f839ea4a0f',
-    'banner': {'w': 300, 'h': 250}
-  }));
-}
-
-let getExt2ServerResponse = () => {
-  return JSON.parse(JSON.stringify({
-    'pcmdata': {
-      'thisVer': '100',
-      'plcmSett': {
-        'name': 'placement_01',
-        'Version': '210',
-        'lifeSpan': '100',
-        'versionFolder': 'v4.14q',
-        'versionFolderA': 'v4.14q',
-        'versionFolderB': '',
-        'stage': 'placement_01',
-        'synchro': 1556574760000,
-        'localCache': 'true',
-        'testCase': 'A:00_B:100',
-        'opdomain': '1',
-        'checksum': '6378',
-        'cpm': '0',
-        'bstfct': '100',
-        'totstop': 'false',
-        'pcmurl': 'bidsrv00.reload.net'
-      },
-      'srvUrl': 'bidsrv00.reload.net',
-      'log': 'incomp_input_obj_version',
-      'message': 'incomp_input_obj_version',
-      'status': 'error'
-    },
-    'plcmID': 'placement_01',
-    'partID': 'prx_part',
-    'opdomID': '0',
-    'bsrvID': 1,
-    'adUnitCode': '1b243858-3c53-43dc-9fdf-89f839ea4a0f',
-    'banner': {'w': 160, 'h': 600}
-  }));
-}
-
-let getServerResponse = (pExt) => {
-  return JSON.parse(JSON.stringify({
-    'body': {
-      'id': '2759340f70210d',
-      'bidid': 'fbs-br-3mzdbycetjv8f8079',
-      'seatbid': [
-        {
-          'bid': [
-            {
-              'id': 'fbs-br-stbd-bd-3mzdbycetjv8f807b',
-              'price': 0,
-              'nurl': '',
-              'adm': '',
-              'ext': pExt
-            }
-          ],
-          'seat': 'fbs-br-stbd-3mzdbycetjv8f807a',
-          'group': 0
-        }
-      ]
-    },
-    'headers': {}
-  }));
-}
-
-describe('ReloadAdapter', function () {
-  describe('isBidRequestValid', function () {
-    var bid = {
-      'bidder': 'reload',
-      'params': {
-        'plcmID': 'placement_01',
-        'partID': 'part00',
-        'opdomID': 1,
-        'bsrvID': 23,
-        'type': 'pcm'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when bsrvID is not number', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'plcmID': 'placement_01',
-        'partID': 'part00',
-        'opdomID': 1,
-        'bsrvID': 'abc'
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when bsrvID > 99', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'plcmID': 'placement_01',
-        'partID': 'part00',
-        'opdomID': 1,
-        'bsrvID': 230
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when bsrvID < 0', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'plcmID': 'placement_01',
-        'partID': 'part00',
-        'opdomID': 1,
-        'bsrvID': -3,
-        'type': 'pcm'
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'plcmID': 'placement_01'
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests()', function () {
-    let vRequests = spec.buildRequests(getValidBidRequests(), {});
-    let vData = JSON.parse(vRequests[0].data);
-
-    it('should send one requests', () => {
-      expect(vRequests.length).to.equal(1);
-    });
-
-    it('should send one requests, one impression', () => {
-      expect(vData.imp.length).to.equal(1);
-    });
-
-    it('should exists ext.type and ext.pcmdata', () => {
-      expect(vData.imp[0].banner).to.exist;
-      expect(vData.imp[0].banner.ext).to.exist;
-      expect(vData.imp[0].banner.ext.type).to.exist;
-      expect(vData.imp[0].banner.ext.pcmdata).to.exist;
-      expect(vData.imp[0].banner.ext.type).to.equal('pcm');
-    });
-  });
-
-  describe('interpretResponse()', function () {
-    it('Returns an empty array', () => {
-      let vData = spec.interpretResponse(getServerResponse(getExt2ServerResponse()), {});
-
-      expect(vData.length).to.equal(0);
-    });
-
-    it('Returns an array with one response', () => {
-      let vData = spec.interpretResponse(getServerResponse(getExt1ServerResponse()), {});
-      expect(vData.length).to.equal(1);
-    });
-
-    it('required fileds', () => {
-      let vData = spec.interpretResponse(getServerResponse(getExt1ServerResponse()), {});
-      expect(vData.length).to.equal(1);
-      expect(vData[0]).to.have.all.keys(['requestId', 'ad', 'cpm', 'width', 'height', 'creativeId', 'currency', 'ttl', 'netRevenue']);
-    });
-
-    it('CPM great than 0', () => {
-      let vData = spec.interpretResponse(getServerResponse(getExt1ServerResponse()), {});
-      expect(vData[0].cpm).to.greaterThan(0);
-    });
-
-    it('instruction empty', () => {
-      let vResponse = Object.assign({}, getServerResponse(getExt1ServerResponse()));
-      vResponse.body.seatbid[0].bid[0].ext.pcmdata.instr = null;
-      let vData = spec.interpretResponse(vResponse, {});
-      expect(vData.length).to.equal(0);
-
-      vResponse = Object.assign({}, getServerResponse(getExt1ServerResponse()));
-      vResponse.body.seatbid[0].bid[0].ext.pcmdata.instr = undefined;
-      vData = spec.interpretResponse(vResponse, {});
-      expect(vData.length).to.equal(0);
-
-      vResponse = Object.assign({}, getServerResponse(getExt1ServerResponse()));
-      vResponse.body.seatbid[0].bid[0].ext.pcmdata.instr.go = undefined;
-      vData = spec.interpretResponse(vResponse, {});
-      expect(vData.length).to.equal(0);
-    });
-
-    it('instruction with go = false', () => {
-      let vResponse = getServerResponse(getExt1ServerResponse());
-      vResponse.body.seatbid[0].bid[0].ext.pcmdata.instr.go = false;
-      let vData = spec.interpretResponse(vResponse, {});
-      expect(vData.length).to.equal(0);
-    });
-
-    it('incompatibility output object version (thisVer)', () => {
-      let vResponse = getServerResponse(getExt1ServerResponse());
-      vResponse.body.seatbid[0].bid[0].ext.pcmdata.thisVer = '200';
-      let vData = spec.interpretResponse(vResponse, {});
-      expect(vData.length).to.equal(0);
-    });
-  });
-});
diff --git a/test/spec/modules/resetdigitalBidAdapter_spec.js b/test/spec/modules/resetdigitalBidAdapter_spec.js
new file mode 100644
index 00000000000..34354ceeea8
--- /dev/null
+++ b/test/spec/modules/resetdigitalBidAdapter_spec.js
@@ -0,0 +1,158 @@
+import { expect } from 'chai'
+import { spec, _getPlatform } from 'modules/resetdigitalBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const br = {
+  body: {
+    bids: [{
+      bid_id: '123',
+      cpm: 1.23,
+      w: 300,
+      h: 250,
+      html: '<b>deadbeef</b>',
+      crid: 'crid'
+    }],
+    pixels: [
+      { type: 'image', url: 'https://reset.com/image' },
+      { type: 'iframe', url: 'https://reset.com/iframe' }
+    ]
+  }
+}
+
+const vr = {
+  body: {
+    bids: [{
+      bid_id: 'abc',
+      cpm: 2.34,
+      w: 640,
+      h: 480,
+      vast_url: 'https://demo.tremorvideo.com/proddev/vast/vast_inline_nonlinear.xml',
+      crid: 'video_crid'
+    }],
+    pixels: [
+      { type: 'image', url: 'https://reset.com/image' },
+      { type: 'iframe', url: 'https://reset.com/iframe' }
+    ]
+  }
+}
+
+describe('resetdigitalBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  let bannerRequest = {
+    bidId: '123',
+    transactionId: '456',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    params: {
+      pubId: '12345'
+    }
+  }
+
+  let videoRequest = {
+    bidId: 'abc',
+    transactionId: 'def',
+    mediaTypes: {
+      video: {
+        playerDimension: [640, 480]
+      }
+    },
+    params: {
+      pubId: 'CK6gUYp58EGopLJnUvM2'
+    }
+  }
+
+  describe('codes', function () {
+    it('should return a bidder code of resetdigital', function () {
+      expect(spec.code).to.equal('resetdigital')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('should return true if all params present', function () {
+      expect(spec.isBidRequestValid(bannerRequest)).to.be.true
+    })
+
+    it('should return false if zone id and pub id missing', function () {
+      expect(spec.isBidRequestValid(Object.assign(bannerRequest, { params: { pubId: null, zoneId: null } }))).to.be.false
+    })
+  })
+
+  describe('buildRequests', function () {
+    let req = spec.buildRequests([ bannerRequest ], { refererInfo: { } })
+    let rdata
+
+    it('should return request object', function () {
+      expect(req).to.not.be.null
+    })
+
+    it('should build request data', function () {
+      expect(req.data).to.not.be.null
+    })
+
+    it('should include one request', function () {
+      rdata = JSON.parse(req.data)
+      expect(rdata.imps.length).to.equal(1)
+    })
+
+    it('should include all publisher params', function () {
+      expect(rdata.imps[0].zone_id !== null).to.be.true
+    })
+
+    it('should include media types', function () {
+      expect(rdata.imps[0].media_types !== null).to.be.true
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('should form compliant banner bid object response', function () {
+      let ir = spec.interpretResponse(br, bannerRequest)
+
+      expect(ir.length).to.equal(1)
+
+      let en = ir[0]
+
+      expect(en.requestId != null &&
+            en.cpm != null && typeof en.cpm === 'number' &&
+            en.width != null && typeof en.width === 'number' &&
+            en.height != null && typeof en.height === 'number' &&
+            en.ad != null &&
+            en.creativeId != null
+      ).to.be.true
+    })
+    it('should form compliant video object response', function () {
+      let ir = spec.interpretResponse(vr, videoRequest)
+
+      expect(ir.length).to.equal(1)
+
+      let en = ir[0]
+
+      expect(en.requestId != null &&
+            en.cpm != null && typeof en.cpm === 'number' &&
+            en.width != null && typeof en.width === 'number' &&
+            en.height != null && typeof en.height === 'number' &&
+            (en.vastUrl != null || en.vastXml != null) &&
+            en.creativeId != null
+      ).to.be.true
+    })
+  })
+
+  describe('getUserSyncs', function () {
+    it('should return iframe sync', function () {
+      let sync = spec.getUserSyncs({ iframeEnabled: true }, [br])
+      expect(sync.length).to.equal(1)
+      expect(sync[0].type === 'iframe')
+      expect(typeof sync[0].url === 'string')
+    })
+
+    it('should return pixel sync', function () {
+      let sync = spec.getUserSyncs({ pixelEnabled: true }, [br])
+      expect(sync.length).to.equal(1)
+      expect(sync[0].type === 'image')
+      expect(typeof sync[0].url === 'string')
+    })
+  })
+})
diff --git a/test/spec/modules/resultsmediaBidAdapter_spec.js b/test/spec/modules/resultsmediaBidAdapter_spec.js
deleted file mode 100644
index 0e2d4c0013a..00000000000
--- a/test/spec/modules/resultsmediaBidAdapter_spec.js
+++ /dev/null
@@ -1,574 +0,0 @@
-import {spec} from '../../../modules/resultsmediaBidAdapter.js';
-import * as utils from '../../../src/utils.js';
-import * as sinon from 'sinon';
-
-var r1adapter = spec;
-
-describe('resultsmedia adapter tests', function () {
-  beforeEach(function() {
-    this.defaultBidderRequest = {
-      'refererInfo': {
-        'referer': 'Reference Page',
-        'stack': [
-          'aodomain.dvl',
-          'page.dvl'
-        ]
-      }
-    };
-  });
-
-  describe('Verify 1.0 POST Banner Bid Request', function () {
-    it('buildRequests works', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaType': 'banner',
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-
-      expect(bidRequest.url).to.have.string('https://bid306.rtbsrv.com/bidder/?bid=3mhdom&zoneId=9999&hbv=');
-      expect(bidRequest.method).to.equal('POST');
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.site).to.not.equal(null);
-      expect(openrtbRequest.site.ref).to.equal('Reference Page');
-      expect(openrtbRequest.device).to.not.equal(null);
-      expect(openrtbRequest.device.ua).to.equal(navigator.userAgent);
-      expect(openrtbRequest.device.dnt).to.equal(0);
-      expect(openrtbRequest.imp[0].banner).to.not.equal(null);
-      expect(openrtbRequest.imp[0].banner.format[0].w).to.equal(300);
-      expect(openrtbRequest.imp[0].banner.format[0].h).to.equal(250);
-      expect(openrtbRequest.imp[0].ext.bidder.zoneId).to.equal(9999);
-    });
-
-    it('interpretResponse works', function() {
-      var bidList = {
-        'body': [
-          {
-            'impid': 'div-gpt-ad-1438287399331-0',
-            'w': 300,
-            'h': 250,
-            'adm': '<div>My Compelling Ad</div>',
-            'price': 1,
-            'crid': 'cr-cfy24'
-          }
-        ]
-      };
-
-      var bannerBids = r1adapter.interpretResponse(bidList);
-
-      expect(bannerBids.length).to.equal(1);
-      const bid = bannerBids[0];
-      expect(bid.width).to.equal(300);
-      expect(bid.height).to.equal(250);
-      expect(bid.creativeId).to.equal('cr-cfy24');
-      expect(bid.currency).to.equal('USD');
-      expect(bid.netRevenue).to.equal(true);
-      expect(bid.cpm).to.equal(1.0);
-      expect(bid.ttl).to.equal(350);
-    });
-  });
-
-  describe('Verify POST Video Bid Request', function() {
-    it('buildRequests works', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'video': {
-              'playerSize': [640, 480],
-              'context': 'instream'
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
-          'sizes': [
-            [300, 250]
-          ],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-
-      expect(bidRequest.url).to.have.string('https://bid306.rtbsrv.com/bidder/?bid=3mhdom&zoneId=9999&hbv=');
-      expect(bidRequest.method).to.equal('POST');
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.site).to.not.equal(null);
-      expect(openrtbRequest.device).to.not.equal(null);
-      expect(openrtbRequest.device.ua).to.equal(navigator.userAgent);
-      expect(openrtbRequest.device).to.have.property('dnt');
-      expect(openrtbRequest.imp[0].video).to.not.equal(null);
-      expect(openrtbRequest.imp[0].video.w).to.equal(640);
-      expect(openrtbRequest.imp[0].video.h).to.equal(480);
-      expect(openrtbRequest.imp[0].video.mimes[0]).to.equal('video/mp4');
-      expect(openrtbRequest.imp[0].video.protocols).to.eql([2, 3, 5, 6]);
-      expect(openrtbRequest.imp[0].video.startdelay).to.equal(0);
-      expect(openrtbRequest.imp[0].video.skip).to.equal(0);
-      expect(openrtbRequest.imp[0].video.playbackmethod).to.eql([1, 2, 3, 4]);
-      expect(openrtbRequest.imp[0].video.delivery[0]).to.equal(1);
-      expect(openrtbRequest.imp[0].video.api).to.eql([1, 2, 5]);
-    });
-
-    it('interpretResponse works', function() {
-      var bidList = {
-        'body': [
-          {
-            'impid': 'div-gpt-ad-1438287399331-1',
-            'price': 1,
-            'adm': 'https://example.com/',
-            'adomain': [
-              'test.com'
-            ],
-            'cid': '467415',
-            'crid': 'cr-vid',
-            'w': 800,
-            'h': 600
-          }
-        ]
-      };
-
-      var videoBids = r1adapter.interpretResponse(bidList);
-
-      expect(videoBids.length).to.equal(1);
-      const bid = videoBids[0];
-      expect(bid.width).to.equal(800);
-      expect(bid.height).to.equal(600);
-      expect(bid.vastUrl).to.equal('https://example.com/');
-      expect(bid.mediaType).to.equal('video');
-      expect(bid.creativeId).to.equal('cr-vid');
-      expect(bid.currency).to.equal('USD');
-      expect(bid.netRevenue).to.equal(true);
-      expect(bid.cpm).to.equal(1.0);
-      expect(bid.ttl).to.equal(600);
-    });
-  });
-
-  describe('misc buildRequests', function() {
-    it('should send GDPR Consent data to resultsmedia tag', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 250]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-3',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var consentString = 'testConsentString';
-      var gdprBidderRequest = this.defaultBidderRequest;
-      gdprBidderRequest.gdprConsent = {
-        'gdprApplies': true,
-        'consentString': consentString
-      };
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, gdprBidderRequest);
-
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.user.ext.consent).to.equal(consentString);
-      expect(openrtbRequest.regs.ext.gdpr).to.equal(true);
-    });
-
-    it('prefer 2.0 sizes', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 600]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.imp[0].banner.format[0].w).to.equal(300);
-      expect(openrtbRequest.imp[0].banner.format[0].h).to.equal(600);
-    });
-
-    it('does not return request for invalid banner size configuration', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-      expect(bidRequest.method).to.be.undefined;
-    });
-
-    it('does not return request for missing banner size configuration', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {}
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-      expect(bidRequest.method).to.be.undefined;
-    });
-
-    it('reject bad sizes', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {'sizes': [['400', '500'], ['4n0', '5g0']]}
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.imp[0].banner.format.length).to.equal(1);
-    });
-
-    it('dnt is correctly set to 1', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 600]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var dntStub = sinon.stub(utils, 'getDNT').returns(1);
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-
-      dntStub.restore();
-
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.device.dnt).to.equal(1);
-    });
-
-    it('supports string video sizes', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'video': {
-              'context': 'instream',
-              'playerSize': ['600', '300']
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.imp[0].video.w).to.equal(600);
-      expect(openrtbRequest.imp[0].video.h).to.equal(300);
-    });
-
-    it('rejects bad video sizes', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'video': {
-              'context': 'instream',
-              'playerSize': ['badWidth', 'badHeight']
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.imp[0].video.w).to.be.undefined;
-      expect(openrtbRequest.imp[0].video.h).to.be.undefined;
-    });
-
-    it('supports missing video size', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'video': {
-              'context': 'instream'
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-
-      const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.imp[0].video.w).to.be.undefined;
-      expect(openrtbRequest.imp[0].video.h).to.be.undefined;
-    });
-
-    it('should return empty site data when refererInfo is missing', function() {
-      delete this.defaultBidderRequest.refererInfo;
-      var bidRequestList = [
-        {
-          'bidder': 'resultsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaType': 'banner',
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-      const openrtbRequest = JSON.parse(bidRequest.data);
-
-      expect(openrtbRequest.site.domain).to.equal('');
-      expect(openrtbRequest.site.page).to.equal('');
-      expect(openrtbRequest.site.ref).to.equal('');
-    });
-  });
-
-  it('should return empty site.domain and site.page when refererInfo.stack is empty', function() {
-    this.defaultBidderRequest.refererInfo.stack = [];
-    var bidRequestList = [
-      {
-        'bidder': 'resultsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-    const openrtbRequest = JSON.parse(bidRequest.data);
-
-    expect(openrtbRequest.site.domain).to.equal('');
-    expect(openrtbRequest.site.page).to.equal('');
-    expect(openrtbRequest.site.ref).to.equal('Reference Page');
-  });
-
-  it('should secure correctly', function() {
-    this.defaultBidderRequest.refererInfo.stack[0] = ['https://securesite.dvl'];
-    var bidRequestList = [
-      {
-        'bidder': 'resultsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-    const openrtbRequest = JSON.parse(bidRequest.data);
-
-    expect(openrtbRequest.imp[0].secure).to.equal(1);
-  });
-
-  it('should pass schain', function() {
-    var schain = {
-      'ver': '1.0',
-      'complete': 1,
-      'nodes': [{
-        'asi': 'indirectseller.com',
-        'sid': '00001',
-        'hp': 1
-      }, {
-        'asi': 'indirectseller-2.com',
-        'sid': '00002',
-        'hp': 1
-      }]
-    };
-    var bidRequestList = [
-      {
-        'bidder': 'resultsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead',
-        'schain': schain
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-    const openrtbRequest = JSON.parse(bidRequest.data);
-
-    expect(openrtbRequest.source.ext.schain).to.deep.equal(schain);
-  });
-
-  describe('misc interpretResponse', function () {
-    it('No bid response', function() {
-      var noBidResponse = r1adapter.interpretResponse({
-        'body': ''
-      });
-      expect(noBidResponse.length).to.equal(0);
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    var bid = {
-      'bidder': 'resultsmedia',
-      'params': {
-        'zoneId': 9999
-      },
-      'mediaTypes': {
-        'banner': {
-          'sizes': [[300, 250]]
-        }
-      },
-      'adUnitCode': 'bannerDiv'
-    };
-
-    it('should return true when required params found', function () {
-      expect(r1adapter.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when placementId missing', function () {
-      delete bid.params.zoneId;
-      expect(r1adapter.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('getUserSyncs', function () {
-    it('returns an empty string', function () {
-      expect(r1adapter.getUserSyncs()).to.deep.equal([]);
-    });
-  });
-});
diff --git a/test/spec/modules/revcontentBidAdapter_spec.js b/test/spec/modules/revcontentBidAdapter_spec.js
index 0a0263837c6..e6ef4adec87 100644
--- a/test/spec/modules/revcontentBidAdapter_spec.js
+++ b/test/spec/modules/revcontentBidAdapter_spec.js
@@ -45,7 +45,7 @@ describe('revcontent adapter', function () {
           endpoint: 'trends-s0.revcontent.com'
         }
       }];
-      let request = spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}});
+      let request = spec.buildRequests(validBidRequests, {refererInfo: {page: 'page'}});
       request = request[0];
       assert.equal(request.method, 'POST');
       assert.equal(request.url, 'https://trends-s0.revcontent.com/rtb?apiKey=8a33fa9cf220ae685dcc3544f847cdda858d3b1c&userId=673&widgetId=33861');
@@ -66,7 +66,7 @@ describe('revcontent adapter', function () {
           endpoint: 'trends-s0.revcontent.com'
         }
       }];
-      let request = spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}});
+      let request = spec.buildRequests(validBidRequests, {refererInfo: {page: 'page'}});
 
       request = request[0];
       let data = Object.keys(request);
@@ -87,12 +87,37 @@ describe('revcontent adapter', function () {
           bidfloor: 0.05
         }
       }];
-      let request = spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}});
+      let request = spec.buildRequests(validBidRequests, {refererInfo: {page: 'page'}});
       request = JSON.parse(request[0].data);
       assert.equal(request.imp[0].bidfloor, 0.05);
       assert.equal(request.device.ua, navigator.userAgent);
     });
 
+    it('should send info about device and use getFloor', function () {
+      let validBidRequests = [{
+        bidder: 'revcontent',
+        nativeParams: {},
+        params: {
+          size: {width: 300, height: 250},
+          apiKey: '8a33fa9cf220ae685dcc3544f847cdda858d3b1c',
+          userId: 673,
+          domain: 'test.com',
+          endpoint: 'trends-s0.revcontent.com',
+          bidfloor: 0.05
+        }
+      }];
+      validBidRequests[0].getFloor = () => {
+        return {
+          floor: 0.07,
+          currency: 'USD'
+        };
+      };
+      let request = spec.buildRequests(validBidRequests, {refererInfo: {page: 'page'}});
+      request = JSON.parse(request[0].data);
+      assert.equal(request.imp[0].bidfloor, 0.07);
+      assert.equal(request.device.ua, navigator.userAgent);
+    });
+
     it('should send info about the site and default bidfloor', function () {
       let validBidRequests = [{
         bidder: 'revcontent',
@@ -121,7 +146,7 @@ describe('revcontent adapter', function () {
           endpoint: 'trends-s0.revcontent.com'
         }
       }];
-      let refererInfo = {referer: 'page'};
+      let refererInfo = {page: 'page'};
       let request = spec.buildRequests(validBidRequests, {refererInfo});
 
       request = JSON.parse(request[0].data);
@@ -129,7 +154,6 @@ describe('revcontent adapter', function () {
       assert.deepEqual(request.site, {
         domain: 'test.com',
         page: 'page',
-        cat: ['IAB17'],
         publisher: {id: 673, domain: 'test.com'}
       });
     });
@@ -140,7 +164,8 @@ describe('revcontent adapter', function () {
       let serverResponse = {};
       let bidRequest = {};
 
-      assert.ok(!spec.interpretResponse(serverResponse, bidRequest));
+      let result = spec.interpretResponse(serverResponse, bidRequest);
+      assert.equal(result.length, 0);
     });
 
     const serverResponse = {
@@ -153,7 +178,7 @@ describe('revcontent adapter', function () {
                 id: '6bbe3eed-f443-4e2b-a8da-57fd6327b37d',
                 impid: '1',
                 price: 0.1,
-                adid: '4162547',
+                crid: '4162547',
                 nurl: 'https://trends-s0.revcontent.com/push/track/?p=${AUCTION_PRICE}&d=nTCdHIfsgKOLFuV7DS1LF%2FnTk5HiFduGU65BgKgB%2BvKyG9YV7ceQWN76HMbBE0C6gwQeXUjravv3Hq5x9TT8CM6r2oUNgkGC9mhgv2yroTH9i3cSoH%2BilxyY19fMXFirtBz%2BF%2FEXKi4bsNh%2BDMPfj0L4elo%2FJEZmx4nslvOneJJjsFjJJtUJc%2F3UPivOisSCa%2B36mAgFQqt%2FSWBriYB%2BVAufz70LaGspF6T6jDzuIyVFJUpLhZVDtLRSJEzh7Lyzzw1FmYarp%2FPg0gZDY48aDdjw5A3Tlj%2Bap0cPHLDprNOyF0dmHDn%2FOVJEDRTWvrQ2JNK1t%2Fg1bGHIih0ec6XBVIBNurqRpLFBuUY6LgXCt0wRZWTByTEZ8AEv8IoYVILJAL%2BXL%2F9IyS4eTcdOUfn5X7gT8QBghCrAFrsCg8ZXKgWddTEXbpN1lU%2FzHdI5eSHkxkJ6WcYxSkY9PyripaIbmKiyb98LQMgTD%2B20RJO5dAmXTQTAcauw6IUPTjgSPEU%2Bd6L5Txd3CM00Hbd%2Bw1bREIQcpKEmlMwrRSwe4bu1BCjlh5A9gvU9Xc2sf7ekS3qPPmtp059r5IfzdNFQJB5aH9HqeDEU%2FxbMHx4ggMgojLBBL1fKrCKLAteEDQxd7PVmFJv7GHU2733vt5TnjKiEhqxHVFyi%2B0MIYMGIziM5HfUqfq3KUf%2F%2FeiCtJKXjg7FS6hOambdimSt7BdGDIZq9QECWdXsXcQqqVLwli27HYDMFVU3TWWRyjkjbhnQID9gQJlcpwIi87jVAODb6qP%2FKGQ%3D%3D',
                 adm: '{"ver":"1.1","assets":[{"id":3,"required":1,"img":{"url":"//img.revcontent.com/?url=https://revcontent-p0.s3.amazonaws.com/content/images/15761052960288727821.jpg&static=true"}},{"id":0,"required":1,"title":{"text":"Do You Eat Any of These Craving-trigger Foods?"}},{"id":5,"required":1,"data":{"value":""}}],"link":{"url":"https://trends-s0.revcontent.com/click.php?d=A7EVbNYBVyonty19Ak08zCr9J54qg%2Bmduq6p0Zyn5%2F%2Bapm4deUo9VAXmOGEIbUBf6i7m3%2F%2FWJm%2FzTha8SJ%2Br9MZL9jhhUxDeiKb6aRY1biLrvr6tFUd1phvtKqVmPd76l9VBLFMxS1brSzKjRCJlIGmyGJg7ueFvxpE9X%2BpHmdbE2uqUdRC49ENO3XZyHCCKMAZ8XD29fasX9Kli9mKpZTqw8vayFlXbVYSUwB8wfSwCt1sIUrt0aICYc0jcyWU3785GTS1xXzQj%2FIVszFYYrdTWd%2BDijjNZtFny0OomPHp8lRy5VcQVCuLpw0Fks4myvsE38XcNvs4wO3tWTNrI%2BMqcW1%2BD2OnMSq5nN5FCbmi2ly%2F1LbN9fibaFvW%2FQbzQhN9ZsAwmhm409UTtdmSA6hd96vDxDWLeUJhVO3UQyI0yq2TtVnB9tEICD8mZNWwYehOab%2BQ1EWmTerF6ZCDx8RyZus1UrsDfRwvTCyUjCmkZhmeo4QVJkpPy6QobCsngSaxkkKhH%2Fb7coZyBXXEt3ORoYBLUbfRO6nR8GdIt8413vrYr4gTAroh46VcWK0ls0gFNe2u3%2FqP%2By1yLKbzDVaR%2Fa02G%2Biiqbw86sCYfsy7qK9atyjNTm8RkH6JLESUzxc6IEazu4iwHKGnu5phTacmseXCi8y9Y5AdBZn8VnLP%2F2a%2FyAqq93xEH%2BIrkAdhGRY1tY39rBYAtvH%2FVyNFZcong%2FutUMYbp0WhDNyfl6iWxmpE28Cx9KDcqXss0NIwQm0AWeu8ogJCIG3faAkm5PdFsUdf2X9h3HuFDbnbvnXW27ml6z9GykEzv%2F8aSZlMZ"}}'
               }
@@ -310,7 +335,7 @@ describe('revcontent adapter', function () {
         }
       };
       let bidRequest = {
-        data: {},
+        data: '{}',
         bids: [{bidId: 'bidId1'}]
       };
       const result = spec.interpretResponse(serverResponse, bidRequest)[0];
diff --git a/test/spec/modules/rhythmoneBidAdapter_spec.js b/test/spec/modules/rhythmoneBidAdapter_spec.js
index d9342332e61..359b02db37e 100644
--- a/test/spec/modules/rhythmoneBidAdapter_spec.js
+++ b/test/spec/modules/rhythmoneBidAdapter_spec.js
@@ -8,7 +8,7 @@ describe('rhythmone adapter tests', function () {
   beforeEach(function() {
     this.defaultBidderRequest = {
       'refererInfo': {
-        'referer': 'Reference Page',
+        'ref': 'Reference Page',
         'stack': [
           'aodomain.dvl',
           'page.dvl'
@@ -157,6 +157,7 @@ describe('rhythmone adapter tests', function () {
       expect(bid.width).to.equal(800);
       expect(bid.height).to.equal(600);
       expect(bid.vastUrl).to.equal('https://testdomain/rmp/placementid/0/path?reqId=1636037');
+      expect(bid.meta.advertiserDomains).to.deep.equal(['test.com']);
       expect(bid.mediaType).to.equal('video');
       expect(bid.creativeId).to.equal('cr-vid');
       expect(bid.currency).to.equal('USD');
@@ -443,7 +444,7 @@ describe('rhythmone adapter tests', function () {
       expect(openrtbRequest.device.dnt).to.equal(1);
     });
 
-    it('sets floor', function () {
+    it('sets floor to zero', function () {
       var bidRequestList = [
         {
           'bidder': 'rhythmone',
@@ -468,7 +469,7 @@ describe('rhythmone adapter tests', function () {
       var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
-      expect(openrtbRequest.imp[0].bidfloor).to.equal(100.0);
+      expect(openrtbRequest.imp[0].bidfloor).to.equal(0);
     });
 
     it('supports string video sizes', function () {
@@ -646,35 +647,6 @@ describe('rhythmone adapter tests', function () {
     });
   });
 
-  it('should return empty site.domain and site.page when refererInfo.stack is empty', function() {
-    this.defaultBidderRequest.refererInfo.stack = [];
-    var bidRequestList = [
-      {
-        'bidder': 'rhythmone',
-        'params': {
-          'placementId': 'myplacement',
-          'zone': 'myzone',
-          'path': 'mypath'
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
-    const openrtbRequest = JSON.parse(bidRequest.data);
-
-    expect(openrtbRequest.site.domain).to.equal('');
-    expect(openrtbRequest.site.page).to.equal('');
-    expect(openrtbRequest.site.ref).to.equal('Reference Page');
-  });
-
   it('should secure correctly', function() {
     this.defaultBidderRequest.refererInfo.stack[0] = ['https://securesite.dvl'];
     var bidRequestList = [
diff --git a/test/spec/modules/richaudienceBidAdapter_spec.js b/test/spec/modules/richaudienceBidAdapter_spec.js
index f18e67a3ac5..86d3df8be59 100644
--- a/test/spec/modules/richaudienceBidAdapter_spec.js
+++ b/test/spec/modules/richaudienceBidAdapter_spec.js
@@ -4,7 +4,6 @@ import {
   spec
 } from 'modules/richaudienceBidAdapter.js';
 import {config} from 'src/config.js';
-import * as utils from 'src/utils.js';
 
 describe('Richaudience adapter tests', function () {
   var DEFAULT_PARAMS_NEW_SIZES = [{
@@ -20,7 +19,8 @@ describe('Richaudience adapter tests', function () {
     params: {
       bidfloor: 0.5,
       pid: 'ADb1f40rmi',
-      supplyType: 'site'
+      supplyType: 'site',
+      keywords: 'key1=value1;key2=value2'
     },
     auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
     bidRequestsCount: 1,
@@ -75,26 +75,19 @@ describe('Richaudience adapter tests', function () {
     user: {}
   }];
 
-  var DEFAULT_PARAMS_VIDEO_OUT_PARAMS = [{
+  var DEFAULT_PARAMS_BANNER_OUTSTREAM = [{
     adUnitCode: 'test-div',
     bidId: '2c7c8e9c900244',
     mediaTypes: {
-      video: {
-        context: 'outstream',
-        playerSize: [640, 480],
-        mimes: ['video/mp4']
+      banner: {
+        sizes: [[300, 250], [600, 300]]
       }
     },
     bidder: 'richaudience',
     params: {
       bidfloor: 0.5,
       pid: 'ADb1f40rmi',
-      supplyType: 'site',
-      player: {
-        init: 'close',
-        end: 'close',
-        skin: 'dark'
-      }
+      supplyType: 'site'
     },
     auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
     bidRequestsCount: 1,
@@ -156,8 +149,8 @@ describe('Richaudience adapter tests', function () {
       netRevenue: true,
       currency: 'USD',
       ttl: 300,
-      dealId: 'dealId'
-
+      dealId: 'dealId',
+      adomain: 'richaudience.com'
     }
   };
 
@@ -172,7 +165,8 @@ describe('Richaudience adapter tests', function () {
       currency: 'USD',
       ttl: 300,
       vastXML: '<VAST></VAST>',
-      dealId: 'dealId'
+      dealId: 'dealId',
+      adomain: 'richaudience.com'
     }
   };
 
@@ -182,7 +176,7 @@ describe('Richaudience adapter tests', function () {
       gdprApplies: true
     },
     refererInfo: {
-      referer: 'http://domain.com',
+      page: 'http://domain.com',
       numIframes: 0
     }
   }
@@ -211,7 +205,7 @@ describe('Richaudience adapter tests', function () {
         gdprApplies: true
       },
       refererInfo: {
-        referer: 'https://domain.com',
+        page: 'https://domain.com',
         numIframes: 0
       }
     });
@@ -240,6 +234,9 @@ describe('Richaudience adapter tests', function () {
     expect(requestContent).to.have.property('transactionId').and.to.equal('29df2112-348b-4961-8863-1b33684d95e6');
     expect(requestContent).to.have.property('timeout').and.to.equal(3000);
     expect(requestContent).to.have.property('numIframes').and.to.equal(0);
+    expect(typeof requestContent.scr_rsl === 'string')
+    expect(typeof requestContent.cpuc === 'number')
+    expect(requestContent).to.have.property('kws').and.to.equal('key1=value1;key2=value2');
   })
 
   it('Verify build request to prebid video inestream', function() {
@@ -249,7 +246,7 @@ describe('Richaudience adapter tests', function () {
         gdprApplies: true
       },
       refererInfo: {
-        referer: 'https://domain.com',
+        page: 'https://domain.com',
         numIframes: 0
       }
     });
@@ -259,8 +256,6 @@ describe('Richaudience adapter tests', function () {
 
     expect(requestContent).to.have.property('demand').and.to.equal('video');
     expect(requestContent.videoData).to.have.property('format').and.to.equal('instream');
-    // expect(requestContent.videoData.playerSize[0][0]).to.equal('640');
-    // expect(requestContent.videoData.playerSize[0][0]).to.equal('480');
   })
 
   it('Verify build request to prebid video outstream', function() {
@@ -270,7 +265,7 @@ describe('Richaudience adapter tests', function () {
         gdprApplies: true
       },
       refererInfo: {
-        referer: 'https://domain.com',
+        page: 'https://domain.com',
         numIframes: 0
       }
     });
@@ -278,6 +273,7 @@ describe('Richaudience adapter tests', function () {
     expect(request[0]).to.have.property('method').and.to.equal('POST');
     const requestContent = JSON.parse(request[0].data);
 
+    expect(requestContent).to.have.property('demand').and.to.equal('video');
     expect(requestContent.videoData).to.have.property('format').and.to.equal('outstream');
   })
 
@@ -300,7 +296,7 @@ describe('Richaudience adapter tests', function () {
           gdprApplies: true
         },
         refererInfo: {
-          referer: 'https://domain.com',
+          page: 'https://domain.com',
           numIframes: 0
         }
       });
@@ -315,7 +311,7 @@ describe('Richaudience adapter tests', function () {
           gdprApplies: true
         },
         refererInfo: {
-          referer: 'https://domain.com',
+          page: 'https://domain.com',
           numIframes: 0
         }
       });
@@ -338,7 +334,7 @@ describe('Richaudience adapter tests', function () {
           consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA'
         },
         refererInfo: {
-          referer: 'https://domain.com',
+          page: 'https://domain.com',
           numIframes: 0
         }
       });
@@ -348,34 +344,49 @@ describe('Richaudience adapter tests', function () {
   });
 
   describe('UID test', function () {
-    pbjs.setConfig({
+    config.setConfig({
       consentManagement: {
         cmpApi: 'iab',
         timeout: 5000,
         allowAuctionWithoutConsent: true
+      },
+      userSync: {
+        userIds: [{
+          name: 'id5Id',
+          params: {
+            partner: 173, // change to the Partner Number you received from ID5
+            pd: 'MT1iNTBjY...' // optional, see table below for a link to how to generate this
+          },
+          storage: {
+            type: 'html5', // "html5" is the required storage type
+            name: 'id5id', // "id5id" is the required storage name
+            expires: 90, // storage lasts for 90 days
+            refreshInSeconds: 8 * 3600 // refresh ID every 8 hours to ensure it's fresh
+          }
+        }],
+        auctionDelay: 50 // 50ms maximum auction delay, applies to all userId modules
       }
     });
     it('Verify build id5', function () {
+      var request;
       DEFAULT_PARAMS_WO_OPTIONAL[0].userId = {};
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = 'id5-user-id';
-
-      var request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
+      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: 1 };
+      request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
       var requestContent = JSON.parse(request[0].data);
 
-      expect(requestContent.user).to.deep.equal([{
-        'userId': 'id5-user-id',
-        'source': 'id5-sync.com'
-      }]);
+      expect(requestContent.user.eids).to.equal(undefined);
 
-      var request;
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId = {};
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = 1;
+      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: [] };
       request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
-      var requestContent = JSON.parse(request[0].data);
+      requestContent = JSON.parse(request[0].data);
+      expect(requestContent.user.eids).to.equal(undefined);
 
+      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: null };
+      request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
+      requestContent = JSON.parse(request[0].data);
       expect(requestContent.user.eids).to.equal(undefined);
 
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = [];
+      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: {} };
       request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
       requestContent = JSON.parse(request[0].data);
       expect(requestContent.user.eids).to.equal(undefined);
@@ -572,7 +583,7 @@ describe('Richaudience adapter tests', function () {
         gdprApplies: true
       },
       refererInfo: {
-        referer: 'https://domain.com',
+        page: 'https://domain.com',
         numIframes: 0
       }
     });
@@ -590,6 +601,7 @@ describe('Richaudience adapter tests', function () {
     expect(bid.currency).to.equal('USD');
     expect(bid.ttl).to.equal(300);
     expect(bid.dealId).to.equal('dealId');
+    expect(bid.meta).to.equal('richaudience.com');
   });
 
   it('no banner media response inestream', function () {
@@ -599,15 +611,26 @@ describe('Richaudience adapter tests', function () {
         gdprApplies: true
       },
       refererInfo: {
-        referer: 'https://domain.com',
+        page: 'https://domain.com',
         numIframes: 0
       }
     });
 
     const bids = spec.interpretResponse(BID_RESPONSE_VIDEO, request[0]);
+    expect(bids).to.have.lengthOf(1);
     const bid = bids[0];
+    expect(bid.cpm).to.equal(1.50);
     expect(bid.mediaType).to.equal('video');
     expect(bid.vastXml).to.equal('<VAST></VAST>');
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.width).to.equal(1);
+    expect(bid.height).to.equal(1);
+    expect(bid.creativeId).to.equal('189198063');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.ttl).to.equal(300);
+    expect(bid.dealId).to.equal('dealId');
+    expect(bid.meta).to.equal('richaudience.com');
   });
 
   it('no banner media response outstream', function () {
@@ -617,7 +640,36 @@ describe('Richaudience adapter tests', function () {
         gdprApplies: true
       },
       refererInfo: {
-        referer: 'https://domain.com',
+        page: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    const bids = spec.interpretResponse(BID_RESPONSE_VIDEO, request[0]);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.mediaType).to.equal('video');
+    expect(bid.vastXml).to.equal('<VAST></VAST>');
+    expect(bid.renderer.url).to.equal('https://cdn3.richaudience.com/prebidVideo/player.js');
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.width).to.equal(1);
+    expect(bid.height).to.equal(1);
+    expect(bid.creativeId).to.equal('189198063');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.ttl).to.equal(300);
+    expect(bid.dealId).to.equal('dealId');
+  });
+
+  it('banner media and response VAST', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS_BANNER_OUTSTREAM, {
+      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
+      },
+      refererInfo: {
+        page: 'https://domain.com',
         numIframes: 0
       }
     });
@@ -638,6 +690,16 @@ describe('Richaudience adapter tests', function () {
     expect(spec.aliases[0]).to.equal('ra');
   });
 
+  it('Verifies bidder gvlid', function () {
+    expect(spec.gvlid).to.equal(108);
+  });
+
+  it('Verifies bidder supportedMediaTypes', function () {
+    expect(spec.supportedMediaTypes).to.have.lengthOf(2);
+    expect(spec.supportedMediaTypes[0]).to.equal('banner');
+    expect(spec.supportedMediaTypes[1]).to.equal('video');
+  });
+
   it('Verifies if bid request is valid', function () {
     expect(spec.isBidRequestValid(DEFAULT_PARAMS_NEW_SIZES[0])).to.equal(true);
     expect(spec.isBidRequestValid(DEFAULT_PARAMS_WO_OPTIONAL[0])).to.equal(true);
@@ -699,78 +761,413 @@ describe('Richaudience adapter tests', function () {
         bidfloor: 0.50,
       }
     })).to.equal(true);
+    expect(spec.isBidRequestValid({
+      params: {
+        pid: ['1gCB5ZC4XL', '1a40xk8qSV'],
+        bidfloor: 0.50,
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        pid: ['1gCB5ZC4XL', '1a40xk8qSV'],
+        supplyType: 'site',
+        bidfloor: 0.50,
+      }
+    })).to.equal(true);
+    expect(spec.isBidRequestValid({
+      params: {
+        supplyType: 'site',
+        bidfloor: 0.50,
+        ifa: 'AAAAAAAAA-BBBB-CCCC-1111-222222220000',
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        pid: ['1gCB5ZC4XL', '1a40xk8qSV'],
+        supplyType: 'site',
+        bidfloor: 0.50,
+        ifa: 'AAAAAAAAA-BBBB-CCCC-1111-222222220000',
+      }
+    })).to.equal(true);
   });
 
-  it('Verifies user syncs iframe', function () {
-    var syncs = spec.getUserSyncs({
-      iframeEnabled: true
-    }, [BID_RESPONSE], {
-      consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
-      gdprApplies: true
+  it('should pass schain', function() {
+    let schain = {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [{
+        'asi': 'richaudience.com',
+        'sid': '00001',
+        'hp': 1
+      }, {
+        'asi': 'richaudience-2.com',
+        'sid': '00002',
+        'hp': 1
+      }]
+    }
+
+    DEFAULT_PARAMS_NEW_SIZES[0].schain = {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [{
+        'asi': 'richaudience.com',
+        'sid': '00001',
+        'hp': 1
+      }, {
+        'asi': 'richaudience-2.com',
+        'sid': '00002',
+        'hp': 1
+      }]
+    }
+
+    const request = spec.buildRequests(DEFAULT_PARAMS_NEW_SIZES, {
+      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
+      },
+      refererInfo: {}
+    })
+    const requestContent = JSON.parse(request[0].data);
+    expect(requestContent).to.have.property('schain').to.deep.equal(schain);
+  })
+
+  describe('userSync', function () {
+    it('Verifies user syncs iframe include', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'include'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(1);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
     });
+    it('Verifies user syncs iframe exclude', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'exclude'}}}
+      })
 
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0].type).to.equal('iframe');
-    syncs = spec.getUserSyncs({
-      iframeEnabled: false
-    }, [BID_RESPONSE], {
-      consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
-      gdprApplies: true
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
     });
-    expect(syncs).to.have.lengthOf(0);
 
-    syncs = spec.getUserSyncs({
-      iframeEnabled: true
-    }, [], {consentString: '', gdprApplies: false});
-    expect(syncs).to.have.lengthOf(1);
+    it('Verifies user syncs image include', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {image: {bidders: '*', filter: 'include'}}}
+      })
 
-    syncs = spec.getUserSyncs({
-      iframeEnabled: false
-    }, [], {consentString: '', gdprApplies: true});
-    expect(syncs).to.have.lengthOf(0);
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
 
-    pbjs.setConfig({
-      consentManagement: {
-        cmpApi: 'iab',
-        timeout: 5000,
-        allowAuctionWithoutConsent: true,
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
         pixelEnabled: true
-      }
+      }, [BID_RESPONSE], {
+        consentString: '',
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [], {
+        consentString: null,
+        referer: 'http://domain.com',
+        gdprApplies: false
+      })
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
     });
-  });
 
-  it('Verifies user syncs image', function () {
-    var syncs = spec.getUserSyncs({
-      iframeEnabled: false,
-      pixelEnabled: true
-    }, [BID_RESPONSE], {
-      consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
-      referer: 'http://domain.com',
-      gdprApplies: true
-    })
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0].type).to.equal('image');
-
-    syncs = spec.getUserSyncs({
-      iframeEnabled: false,
-      pixelEnabled: true
-    }, [BID_RESPONSE], {
-      consentString: '',
-      referer: 'http://domain.com',
-      gdprApplies: true
-    })
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0].type).to.equal('image');
-
-    syncs = spec.getUserSyncs({
-      iframeEnabled: false,
-      pixelEnabled: true
-    }, [], {
-      consentString: null,
-      referer: 'http://domain.com',
-      gdprApplies: true
-    })
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0].type).to.equal('image');
-  });
+    it('Verifies user syncs image exclude', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {image: {bidders: '*', filter: 'exclude'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: '',
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [], {
+        consentString: null,
+        referer: 'http://domain.com',
+        gdprApplies: false
+      })
+      expect(syncs).to.have.lengthOf(0);
+    });
+
+    it('Verifies user syncs iframe/image include', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'include'}, image: {bidders: '*', filter: 'include'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(1);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
+    });
+
+    it('Verifies user syncs iframe/image exclude', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'exclude'}, image: {bidders: '*', filter: 'exclude'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
+    });
+
+    it('Verifies user syncs iframe exclude / image include', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'exclude'}, image: {bidders: '*', filter: 'include'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(1);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
+    });
+
+    it('Verifies user syncs iframe include / image exclude', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'include'}, image: {bidders: '*', filter: 'exclude'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(1);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
+    });
+  })
 });
diff --git a/test/spec/modules/riseBidAdapter_spec.js b/test/spec/modules/riseBidAdapter_spec.js
new file mode 100644
index 00000000000..4fa4ff354ec
--- /dev/null
+++ b/test/spec/modules/riseBidAdapter_spec.js
@@ -0,0 +1,530 @@
+import { expect } from 'chai';
+import { spec } from 'modules/riseBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT = 'https://hb.yellowblue.io/hb-multi';
+const TEST_ENDPOINT = 'https://hb.yellowblue.io/hb-multi-test';
+const RTB_DOMAIN_TEST = 'testseller.com';
+const RTB_DOMAIN_ENDPOINT = `https://${RTB_DOMAIN_TEST}/hb-multi`;
+const RTB_DOMAIN_TEST_ENDPOINT = `https://${RTB_DOMAIN_TEST}/hb-multi-test`;
+const TTL = 360;
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
+
+describe('riseAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      'bidder': spec.code,
+      'adUnitCode': 'adunit-code',
+      'sizes': [['640', '480']],
+      'params': {
+        'org': 'jdye8weeyirk00000001'
+      }
+    };
+
+    it('should return true when required params are passed', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'org': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'video': {
+            'playerSize': [[640, 480]],
+            'context': 'instream'
+          }
+        },
+        'vastXml': '"<VAST version=\\\"2.0\\\">...</VAST>"'
+      },
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 1,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'banner': {
+          }
+        },
+        'ad': '"<img src=\"https://...\"/>"'
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001',
+          'testMode': true
+        },
+        'bidId': '299ffc8cca0b87',
+        'loop': 2,
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'rise',
+    }
+    const placementId = '12345678';
+    const api = [1, 2];
+    const mimes = ['application/javascript', 'video/mp4', 'video/quicktime'];
+    const protocols = [2, 3, 5, 6];
+
+    it('sends the placementId to ENDPOINT via POST', function () {
+      bidRequests[0].params.placementId = placementId;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].placementId).to.equal(placementId);
+    });
+
+    it('sends the is_wrapper parameter to ENDPOINT via POST', function() {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('is_wrapper');
+      expect(request.data.params.is_wrapper).to.equal(false);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to TEST ENDPOINT via POST', function () {
+      const request = spec.buildRequests(testModeBidRequests, bidderRequest);
+      expect(request.url).to.equal(TEST_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to rtbDomain ENDPOINT via POST', function () {
+      bidRequests[0].params.rtbDomain = RTB_DOMAIN_TEST;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(RTB_DOMAIN_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to rtbDomain TEST ENDPOINT via POST', function () {
+      testModeBidRequests[0].params.rtbDomain = RTB_DOMAIN_TEST;
+      const request = spec.buildRequests(testModeBidRequests, bidderRequest);
+      expect(request.url).to.equal(RTB_DOMAIN_TEST_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the correct bid Id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].bidId).to.equal('299ffc8cca0b87');
+    });
+
+    it('should send the correct supported api array', function () {
+      bidRequests[0].mediaTypes.video.api = api;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].api).to.be.an('array');
+      expect(request.data.bids[0].api).to.eql([1, 2]);
+    });
+
+    it('should send the correct mimes array', function () {
+      bidRequests[1].mediaTypes.banner.mimes = mimes;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[1].mimes).to.be.an('array');
+      expect(request.data.bids[1].mimes).to.eql(['application/javascript', 'video/mp4', 'video/quicktime']);
+    });
+
+    it('should send the correct protocols array', function () {
+      bidRequests[0].mediaTypes.video.protocols = protocols;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].protocols).to.be.an('array');
+      expect(request.data.bids[0].protocols).to.eql([2, 3, 5, 6]);
+    });
+
+    it('should send the correct sizes array', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sizes).to.be.an('array');
+      expect(request.data.bids[0].sizes).to.equal(bidRequests[0].sizes)
+      expect(request.data.bids[1].sizes).to.be.an('array');
+      expect(request.data.bids[1].sizes).to.equal(bidRequests[1].sizes)
+    });
+
+    it('should send the correct media type', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].mediaType).to.equal(VIDEO)
+      expect(request.data.bids[1].mediaType).to.equal(BANNER)
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should respect "iframe" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            iframe: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should respect "all" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            all: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should send the pixel user sync param if userSync is enabled and no "iframe" or "all" configs are present', function () {
+      config.resetConfig();
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'pixel');
+    });
+
+    it('should respect total exclusion', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            image: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            },
+            iframe: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should have us_privacy param if usPrivacy is available in the bidRequest', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('us_privacy', '1YNN');
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('us_privacy');
+    });
+
+    it('should not send the gdpr param if gdprApplies is false in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: false}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gdpr');
+      expect(request.data.params).to.not.have.property('gdpr_consent');
+    });
+
+    it('should send the gdpr param if gdprApplies is true in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: true, consentString: 'test-consent-string'}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gdpr', true);
+      expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
+    });
+
+    it('should have schain param if it is available in the bidRequest', () => {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
+      };
+      bidRequests[0].schain = schain;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('schain', '1.0,1!indirectseller.com,00001,1,,,');
+    });
+
+    it('should set flooPrice to getFloor.floor value if it is greater than params.floorPrice', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.32
+        }
+      }
+      bid.params.floorPrice = 0.64;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 3.32);
+    });
+
+    it('should set floorPrice to params.floorPrice value if it is greater than getFloor.floor', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 0.8
+        }
+      }
+      bid.params.floorPrice = 1.5;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 1.5);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      params: {
+        currency: 'USD',
+        netRevenue: true,
+      },
+      bids: [{
+        cpm: 12.5,
+        vastXml: '<VAST version="3.0"></VAST>',
+        width: 640,
+        height: 480,
+        requestId: '21e12606d47ba7',
+        adomain: ['abc.com'],
+        mediaType: VIDEO
+      },
+      {
+        cpm: 12.5,
+        ad: '"<img src=\"https://...\"/>"',
+        width: 300,
+        height: 250,
+        requestId: '21e12606d47ba7',
+        adomain: ['abc.com'],
+        mediaType: BANNER
+      }]
+    };
+
+    const expectedVideoResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 640,
+      height: 480,
+      ttl: TTL,
+      creativeId: '21e12606d47ba7',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: VIDEO,
+      meta: {
+        mediaType: VIDEO,
+        advertiserDomains: ['abc.com']
+      },
+      vastXml: '<VAST version="3.0"></VAST>',
+    };
+
+    const expectedBannerResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 640,
+      height: 480,
+      ttl: TTL,
+      creativeId: '21e12606d47ba7',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: BANNER,
+      meta: {
+        mediaType: BANNER,
+        advertiserDomains: ['abc.com']
+      },
+      ad: '"<img src=\"https://...\"/>"'
+    };
+
+    it('should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedVideoResponse));
+      expect(Object.keys(result[1])).to.deep.equal(Object.keys(expectedBannerResponse));
+    });
+
+    it('video type should have vastXml key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[0].vastXml).to.equal(expectedVideoResponse.vastXml)
+    });
+
+    it('banner type should have ad key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[1].ad).to.equal(expectedBannerResponse.ad)
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        params: {
+          userSyncPixels: [
+            'https://image-sync-url.test/1',
+            'https://image-sync-url.test/2',
+            'https://image-sync-url.test/3'
+          ]
+        }
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        params: {
+          userSyncURL: 'https://iframe-sync-url.test'
+        }
+      }
+    };
+
+    it('should register all img urls from the response', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should register the iframe url from the response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [iframeSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        }
+      ]);
+    });
+
+    it('should register both image and iframe urls from the responses', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, [iframeSyncResponse, imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should handle an empty response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should handle when user syncs are disabled', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: false }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([]);
+    });
+  })
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should trigger pixel if bid nurl', function() {
+      const bid = {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [['640', '480']],
+        'nurl': 'http://example.com/win/1234',
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        }
+      };
+
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    })
+  })
+});
diff --git a/test/spec/modules/rtbdemandBidAdapter_spec.js b/test/spec/modules/rtbdemandBidAdapter_spec.js
deleted file mode 100644
index be9872ec01b..00000000000
--- a/test/spec/modules/rtbdemandBidAdapter_spec.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/rtbdemandBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-describe('rtbdemandAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'rtbdemand',
-      'params': {
-        'zoneid': '37',
-        'floor': '0.05',
-        'server': 'bidding.rtbdemand.com',
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'zoneid': '37',
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'zoneid': 0,
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidderRequest = {
-      bidderCode: 'rtbdemand',
-      auctionId: 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
-      bidderRequestId: '178e34bad3658f',
-      bids: [
-        {
-          bidder: 'rtbdemand',
-          params: {
-            zoneid: '37',
-            floor: '0.05',
-            server: 'bidding.rtbdemand.com',
-          },
-          placementCode: '/19968336/header-bid-tag-0',
-          sizes: [[300, 250], [320, 50]],
-          bidId: '2ffb201a808da7',
-          bidderRequestId: '178e34bad3658f',
-          auctionId: 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
-          transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
-        },
-        {
-          bidder: 'rtbdemand',
-          params: {
-            zoneid: '37',
-            floor: '0.05',
-            server: 'bidding.rtbdemand.com',
-          },
-          placementCode: '/19968336/header-bid-tag-0',
-          sizes: [[728, 90], [320, 50]],
-          bidId: '2ffb201a808da7',
-          bidderRequestId: '178e34bad3658f',
-          auctionId: 'c45dd708-a418-42ec-b8a7-b70a6c6fab0a',
-          transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
-        }
-      ],
-      start: 1472239426002,
-      auctionStart: 1472239426000,
-      timeout: 5000
-    };
-
-    it('should add source and verison to the tag', function () {
-      const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-      const payload = request.data;
-      expect(payload.from).to.exist;
-      expect(payload.v).to.exist;
-      expect(payload.request_id).to.exist;
-      expect(payload.imp_id).to.exist;
-      expect(payload.aff).to.exist;
-      expect(payload.bid_floor).to.exist;
-      expect(payload.charset).to.exist;
-      expect(payload.site_domain).to.exist;
-      expect(payload.site_page).to.exist;
-      expect(payload.subid).to.exist;
-      expect(payload.flashver).to.exist;
-      expect(payload.tmax).to.exist;
-    });
-
-    it('sends bid request to ENDPOINT via GET', function () {
-      const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-      expect(request.url).to.equal('https://bidding.rtbdemand.com/hb');
-      expect(request.method).to.equal('GET');
-    });
-  })
-
-  describe('interpretResponse', function () {
-    let response = {
-      'id': '543210',
-      'seatbid': [ {
-        'bid': [ {
-          'id': '1111111',
-          'impid': 'bidId-123456-1',
-          'w': 728,
-          'h': 90,
-          'price': 0.09,
-          'adm': '<!-- Creative -->',
-        } ],
-      } ]
-    };
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {
-          requestId: 'bidId-123456-1',
-          creativeId: 'bidId-123456-1',
-          cpm: 0.09,
-          width: 728,
-          height: 90,
-          ad: '<!-- Creative -->',
-          netRevenue: true,
-          currency: 'USD',
-          ttl: 360,
-        }
-      ];
-
-      let result = spec.interpretResponse({ body: response });
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
-
-    it('handles nobid responses', function () {
-      let response = {
-        'id': '543210',
-        'seatbid': [ ]
-      };
-
-      let result = spec.interpretResponse({ body: response });
-      expect(result.length).to.equal(0);
-    });
-  });
-
-  describe('user sync', function () {
-    const syncUrl = 'https://bidding.rtbdemand.com/delivery/matches.php?type=iframe';
-
-    it('should register the sync iframe', function () {
-      expect(spec.getUserSyncs({})).to.be.undefined;
-      expect(spec.getUserSyncs({iframeEnabled: false})).to.be.undefined;
-      const options = spec.getUserSyncs({iframeEnabled: true});
-      expect(options).to.not.be.undefined;
-      expect(options).to.have.lengthOf(1);
-      expect(options[0].type).to.equal('iframe');
-      expect(options[0].url).to.equal(syncUrl);
-    });
-  });
-});
diff --git a/test/spec/modules/rtbhouseBidAdapter_spec.js b/test/spec/modules/rtbhouseBidAdapter_spec.js
index efaed87dd15..6d41df7605b 100644
--- a/test/spec/modules/rtbhouseBidAdapter_spec.js
+++ b/test/spec/modules/rtbhouseBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { OPENRTB, spec } from 'modules/rtbhouseBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
 
 describe('RTBHouseAdapter', () => {
   const adapter = newBidder(spec);
@@ -51,38 +52,7 @@ describe('RTBHouseAdapter', () => {
   });
 
   describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        'bidder': 'rtbhouse',
-        'params': {
-          'publisherId': 'PREBID_TEST',
-          'region': 'prebid-eu',
-          'test': 1
-        },
-        'adUnitCode': 'adunit-code',
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[300, 250], [300, 600]],
-          }
-        },
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-        'transactionId': 'example-transaction-id',
-        'schain': {
-          'ver': '1.0',
-          'complete': 1,
-          'nodes': [
-            {
-              'asi': 'directseller.com',
-              'sid': '00001',
-              'rid': 'BidRequest1',
-              'hp': 1
-            }
-          ]
-        }
-      }
-    ];
+    let bidRequests;
     const bidderRequest = {
       'refererInfo': {
         'numIframes': 0,
@@ -92,11 +62,70 @@ describe('RTBHouseAdapter', () => {
       }
     };
 
+    beforeEach(() => {
+      bidRequests = [
+        {
+          'bidder': 'rtbhouse',
+          'params': {
+            'publisherId': 'PREBID_TEST',
+            'region': 'prebid-eu',
+            'channel': 'Partner_Site - news',
+            'test': 1
+          },
+          'adUnitCode': 'adunit-code',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[300, 250], [300, 600]],
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+          'transactionId': 'example-transaction-id',
+          'schain': {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'directseller.com',
+                'sid': '00001',
+                'rid': 'BidRequest1',
+                'hp': 1
+              }
+            ]
+          }
+        }
+      ];
+    });
+
+    afterEach(function () {
+      config.resetConfig();
+    });
+
     it('should build test param into the request', () => {
       let builtTestRequest = spec.buildRequests(bidRequests, bidderRequest).data;
       expect(JSON.parse(builtTestRequest).test).to.equal(1);
     });
 
+    it('should build channel param into request.site', () => {
+      let builtTestRequest = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(JSON.parse(builtTestRequest).site.channel).to.equal('Partner_Site - news');
+    })
+
+    it('should not build channel param into request.site if no value is passed', () => {
+      let bidRequest = Object.assign([], bidRequests);
+      bidRequest[0].params.channel = undefined;
+      let builtTestRequest = spec.buildRequests(bidRequest, bidderRequest).data;
+      expect(JSON.parse(builtTestRequest).site.channel).to.be.undefined
+    })
+
+    it('should cap the request.site.channel length to 50', () => {
+      let bidRequest = Object.assign([], bidRequests);
+      bidRequest[0].params.channel = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent scelerisque ipsum eu purus lobortis iaculis.';
+      let builtTestRequest = spec.buildRequests(bidRequest, bidderRequest).data;
+      expect(JSON.parse(builtTestRequest).site.channel.length).to.equal(50)
+    })
+
     it('should build valid OpenRTB banner object', () => {
       const request = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
       const imp = request.imp[0];
@@ -177,6 +206,23 @@ describe('RTBHouseAdapter', () => {
       expect(data.source.tid).to.equal('example-transaction-id');
     });
 
+    it('should include bidfloor from floor module if avaiable', () => {
+      const bidRequest = Object.assign([], bidRequests);
+      bidRequest[0].getFloor = () => ({floor: 1.22});
+      const request = spec.buildRequests(bidRequest, bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].bidfloor).to.equal(1.22)
+    });
+
+    it('should use bidfloor from floor module if both floor module and bid floor avaiable', () => {
+      const bidRequest = Object.assign([], bidRequests);
+      bidRequest[0].getFloor = () => ({floor: 1.22});
+      bidRequest[0].params.bidfloor = 0.01;
+      const request = spec.buildRequests(bidRequest, bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].bidfloor).to.equal(1.22)
+    });
+
     it('should include bidfloor in request if available', () => {
       const bidRequest = Object.assign([], bidRequests);
       bidRequest[0].params.bidfloor = 0.01;
@@ -185,11 +231,11 @@ describe('RTBHouseAdapter', () => {
       expect(data.imp[0].bidfloor).to.equal(0.01)
     });
 
-    it('should include source.ext.schain in request', () => {
+    it('should include schain in request', () => {
       const bidRequest = Object.assign([], bidRequests);
       const request = spec.buildRequests(bidRequest, bidderRequest);
       const data = JSON.parse(request.data);
-      expect(data.source.ext.schain).to.deep.equal({
+      expect(data.ext.schain).to.deep.equal({
         'ver': '1.0',
         'complete': 1,
         'nodes': [
@@ -203,6 +249,13 @@ describe('RTBHouseAdapter', () => {
       });
     });
 
+    it('should include source.tid in request', () => {
+      const bidRequest = Object.assign([], bidRequests);
+      const request = spec.buildRequests(bidRequest, bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.source).to.have.deep.property('tid');
+    });
+
     it('should not include invalid schain', () => {
       const bidRequest = Object.assign([], bidRequests);
       bidRequest[0].schain = {
@@ -215,6 +268,45 @@ describe('RTBHouseAdapter', () => {
       expect(data.source).to.not.have.property('ext');
     });
 
+    context('FLEDGE', function() {
+      afterEach(function () {
+        config.resetConfig();
+      });
+
+      it('sends bid request to FLEDGE ENDPOINT via POST', function () {
+        let bidRequest = Object.assign([], bidRequests);
+        delete bidRequest[0].params.test;
+        config.setConfig({ fledgeConfig: true });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: true });
+        expect(request.url).to.equal('https://prebid-eu.creativecdn.com/bidder/prebidfledge/bids');
+        expect(request.method).to.equal('POST');
+      });
+
+      it('when FLEDGE is disabled, should not send imp.ext.ae', function () {
+        let bidRequest = Object.assign([], bidRequests);
+        delete bidRequest[0].params.test;
+        bidRequest[0].ortb2Imp = {
+          ext: { ae: 2 }
+        };
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: false });
+        let data = JSON.parse(request.data);
+        if (data.imp[0].ext) {
+          expect(data.imp[0].ext).to.not.have.property('ae');
+        }
+      });
+
+      it('when FLEDGE is enabled, should send whatever is set in ortb2imp.ext.ae in all bid requests', function () {
+        let bidRequest = Object.assign([], bidRequests);
+        delete bidRequest[0].params.test;
+        bidRequest[0].ortb2Imp = {
+          ext: { ae: 2 }
+        };
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: true });
+        let data = JSON.parse(request.data);
+        expect(data.imp[0].ext.ae).to.equal(2);
+      });
+    });
+
     describe('native imp', () => {
       function basicRequest(extension) {
         return Object.assign({
@@ -412,6 +504,29 @@ describe('RTBHouseAdapter', () => {
       'h': 250
     }];
 
+    let fledgeResponse = {
+      'id': 'bid-identifier',
+      'ext': {
+        'igbid': [{
+          'impid': 'test-bid-id',
+          'igbuyer': [{
+            'igdomain': 'https://buyer-domain.com',
+            'buyersignal': {}
+          }]
+        }],
+        'sellerTimeout': 500,
+        'seller': 'https://seller-domain.com',
+        'decisionLogicUrl': 'https://seller-domain.com/decision-logic.js'
+      },
+      'bidid': 'bid-identifier',
+      'seatbid': [{
+        'bid': [{
+          'id': 'bid-response-id',
+          'impid': 'test-bid-id'
+        }]
+      }]
+    };
+
     it('should get correct bid response', function () {
       let expectedResponse = [
         {
@@ -424,6 +539,7 @@ describe('RTBHouseAdapter', () => {
           'mediaType': 'banner',
           'currency': 'USD',
           'ttl': 300,
+          'meta': { advertiserDomains: ['rtbhouse.com'] },
           'netRevenue': true
         }
       ];
@@ -439,6 +555,18 @@ describe('RTBHouseAdapter', () => {
       expect(result.length).to.equal(0);
     });
 
+    context('when the response contains FLEDGE interest groups config', function () {
+      let bidderRequest;
+      let response = spec.interpretResponse({body: fledgeResponse}, {bidderRequest});
+
+      it('should return FLEDGE auction_configs alongside bids', function () {
+        expect(response).to.have.property('bids');
+        expect(response).to.have.property('fledgeAuctionConfigs');
+        expect(response.fledgeAuctionConfigs.length).to.equal(1);
+        expect(response.fledgeAuctionConfigs[0].bidId).to.equal('test-bid-id');
+      });
+    });
+
     describe('native', () => {
       const adm = {
         native: {
@@ -486,6 +614,7 @@ describe('RTBHouseAdapter', () => {
 
       it('should contain native assets in valid format', () => {
         const bids = spec.interpretResponse({body: response}, {});
+        expect(bids[0].meta.advertiserDomains).to.deep.equal(['rtbhouse.com']);
         expect(bids[0].native).to.deep.equal({
           title: 'Title text',
           clickUrl: encodeURIComponent('https://example.com'),
diff --git a/test/spec/modules/rtbsapeBidAdapter_spec.js b/test/spec/modules/rtbsapeBidAdapter_spec.js
new file mode 100644
index 00000000000..eea9e51b1a9
--- /dev/null
+++ b/test/spec/modules/rtbsapeBidAdapter_spec.js
@@ -0,0 +1,209 @@
+import {expect} from 'chai';
+import {spec} from 'modules/rtbsapeBidAdapter.js';
+import 'src/prebid.js';
+import * as utils from 'src/utils.js';
+import {executeRenderer, Renderer} from 'src/Renderer.js';
+
+describe('rtbsapeBidAdapterTests', function () {
+  describe('isBidRequestValid', function () {
+    it('valid', function () {
+      expect(spec.isBidRequestValid({bidder: 'rtbsape', mediaTypes: {banner: true}, params: {placeId: 4321}})).to.equal(true);
+      expect(spec.isBidRequestValid({bidder: 'rtbsape', mediaTypes: {video: true}, params: {placeId: 4321}})).to.equal(true);
+    });
+
+    it('invalid', function () {
+      expect(spec.isBidRequestValid({bidder: 'rtbsape', mediaTypes: {banner: true}, params: {}})).to.equal(false);
+      expect(spec.isBidRequestValid({bidder: 'rtbsape', params: {placeId: 4321}})).to.equal(false);
+    });
+  });
+
+  it('buildRequests', function () {
+    let bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'rtbsape',
+      params: {placeId: 4321},
+      sizes: [[240, 400]]
+    }];
+    let bidderRequest = {
+      auctionId: '2e208334-cafe-4c2c-b06b-f055ff876852',
+      bidderRequestId: '1392d0aa613366',
+      refererInfo: {}
+    };
+    let request = spec.buildRequests(bidRequestData, bidderRequest);
+    expect(request.data.auctionId).to.equal('2e208334-cafe-4c2c-b06b-f055ff876852');
+    expect(request.data.requestId).to.equal('1392d0aa613366');
+    expect(request.data.bids[0].bidId).to.equal('bid1234');
+    expect(request.data.timezone).to.not.equal(undefined);
+  });
+
+  describe('interpretResponse', function () {
+    it('banner', function () {
+      let serverResponse = {
+        body: {
+          bids: [{
+            requestId: 'bid1234',
+            cpm: 2.21,
+            currency: 'RUB',
+            width: 240,
+            height: 400,
+            netRevenue: true,
+            ad: 'Ad html',
+            meta: {
+              advertiserDomains: ['rtb.sape.ru']
+            }
+          }]
+        }
+      };
+      let bids = spec.interpretResponse(serverResponse, {data: {bids: [{mediaTypes: {banner: true}}]}});
+      expect(bids).to.have.lengthOf(1);
+      let bid = bids[0];
+      expect(bid.cpm).to.equal(2.21);
+      expect(bid.currency).to.equal('RUB');
+      expect(bid.width).to.equal(240);
+      expect(bid.height).to.equal(400);
+      expect(bid.netRevenue).to.equal(true);
+      expect(bid.requestId).to.equal('bid1234');
+      expect(bid.ad).to.equal('Ad html');
+    });
+
+    describe('video (outstream)', function () {
+      let bid;
+
+      before(() => {
+        let serverResponse = {
+          body: {
+            bids: [{
+              requestId: 'bid1234',
+              adUnitCode: 'ad-bid1234',
+              cpm: 3.32,
+              currency: 'RUB',
+              width: 600,
+              height: 340,
+              netRevenue: true,
+              vastUrl: 'https://cdn-rtb.sape.ru/vast/4321.xml',
+              meta: {
+                advertiserDomains: ['rtb.sape.ru'],
+                mediaType: 'video'
+              }
+            }]
+          }
+        };
+        let serverRequest = {
+          data: {
+            bids: [{
+              bidId: 'bid1234',
+              adUnitCode: 'ad-bid1234',
+              mediaTypes: {
+                video: {
+                  context: 'outstream'
+                }
+              },
+              params: {
+                placeId: 4321,
+                video: {
+                  playerMuted: false
+                }
+              }
+            }]
+          }
+        };
+        let bids = spec.interpretResponse(serverResponse, serverRequest);
+        expect(bids).to.have.lengthOf(1);
+        bid = bids[0];
+      });
+
+      it('should add renderer', () => {
+        expect(bid).to.have.own.property('renderer');
+        expect(bid.renderer).to.be.instanceof(Renderer);
+        expect(bid.renderer.url).to.equal('https://cdn-rtb.sape.ru/js/player.js');
+        expect(bid.playerMuted).to.equal(false);
+      });
+
+      it('should create player instance', () => {
+        let spy = false;
+
+        window.sapeRtbPlayerHandler = function (id, w, h, m) {
+          const player = {addSlot: () => [id, w, h, m]}
+          expect(spy).to.equal(false);
+          spy = sinon.spy(player, 'addSlot');
+          return player;
+        };
+
+        executeRenderer(bid.renderer, bid);
+        bid.renderer.callback();
+        expect(spy).to.not.equal(false);
+        expect(spy.called).to.be.true;
+
+        const spyCall = spy.getCall(0);
+        expect(spyCall.args[0].url).to.be.equal('https://cdn-rtb.sape.ru/vast/4321.xml');
+        expect(spyCall.returnValue[0]).to.be.equal('ad-bid1234');
+        expect(spyCall.returnValue[1]).to.be.equal(600);
+        expect(spyCall.returnValue[2]).to.be.equal(340);
+        expect(spyCall.returnValue[3]).to.be.equal(false);
+      });
+    });
+
+    it('skip adomain', function () {
+      let serverResponse = {
+        body: {
+          bids: [{
+            requestId: 'bid1234',
+            cpm: 2.21,
+            currency: 'RUB',
+            width: 240,
+            height: 400,
+            netRevenue: true,
+            ad: 'Ad html 1'
+          }, {
+            requestId: 'bid1235',
+            cpm: 2.23,
+            currency: 'RUB',
+            width: 300,
+            height: 250,
+            netRevenue: true,
+            ad: 'Ad html 2',
+            meta: {
+              advertiserDomains: ['rtb.sape.ru']
+            }
+          }]
+        }
+      };
+      let bids = spec.interpretResponse(serverResponse, {data: {bids: [{mediaTypes: {banner: true}}]}});
+      expect(bids).to.have.lengthOf(1);
+      let bid = bids[0];
+      expect(bid.cpm).to.equal(2.23);
+      expect(bid.currency).to.equal('RUB');
+      expect(bid.width).to.equal(300);
+      expect(bid.height).to.equal(250);
+      expect(bid.netRevenue).to.equal(true);
+      expect(bid.requestId).to.equal('bid1235');
+      expect(bid.ad).to.equal('Ad html 2');
+    });
+  });
+
+  it('getUserSyncs', function () {
+    const syncs = spec.getUserSyncs({iframeEnabled: true});
+    expect(syncs).to.be.an('array').that.to.have.lengthOf(1);
+    expect(syncs[0]).to.deep.equal({type: 'iframe', url: 'https://www.acint.net/mc/?dp=141'});
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('called once', function () {
+      spec.onBidWon({cpm: '2.21', nurl: 'https://ssp-rtb.sape.ru/track?event=win'});
+      expect(utils.triggerPixel.calledOnce).to.equal(true);
+    });
+
+    it('called false', function () {
+      spec.onBidWon({cpm: '2.21'});
+      expect(utils.triggerPixel.called).to.equal(false);
+    });
+  });
+});
diff --git a/test/spec/modules/rtbsolutionsBidAdapter_spec.js b/test/spec/modules/rtbsolutionsBidAdapter_spec.js
deleted file mode 100644
index c47b086fe50..00000000000
--- a/test/spec/modules/rtbsolutionsBidAdapter_spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/rtbsolutionsBidAdapter.js';
-
-describe('rtbsolutionsBidAdapterTests', function () {
-  it('validate_pub_params_1', function () {
-    expect(spec.isBidRequestValid({
-      bidder: 'rtbsolutions',
-      params: {
-        blockId: 777
-      }
-    })).to.equal(true);
-  });
-  it('validate_pub_params_2', function () {
-    expect(spec.isBidRequestValid({
-      bidder: 'rtbsolutions',
-      params: {
-        s1: 'test'
-      }
-    })).to.equal(false);
-  });
-  it('validate_generated_params', function () {
-    let bidderRequest = {
-      bids: [],
-      refererInfo: {
-        referer: ''
-      }
-    };
-    bidderRequest.bids.push({
-      bidId: 'bid1234',
-      bidder: 'rtbsolutions',
-      params: {blockId: 777},
-      sizes: [[240, 400]]
-    });
-    let request = spec.buildRequests(true, bidderRequest);
-    let req_data = request.data[0];
-    expect(req_data.bid_id).to.equal('bid1234');
-  });
-  it('validate_response_params', function () {
-    let serverResponse = {
-      body: [{
-        ad: 'Ad html',
-        bid_id: 'bid1234',
-        cpm: 1,
-        creative_id: 1,
-        height: 480,
-        nurl: 'http://test.test',
-        width: 640,
-        currency: 'USD',
-      }]
-    };
-    let bids = spec.interpretResponse(serverResponse);
-    expect(bids).to.have.lengthOf(1);
-    let bid = bids[0];
-    expect(bid.cpm).to.equal(1);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.width).to.equal(640);
-    expect(bid.height).to.equal(480);
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.requestId).to.equal('bid1234');
-    expect(bid.ad).to.equal('Ad html');
-  });
-});
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 1639389fe24..05b6cc6b6f4 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -2,11 +2,14 @@ import rubiconAnalyticsAdapter, {
   SEND_TIMEOUT,
   parseBidResponse,
   getHostNameFromReferer,
+  storage,
+  rubiConf,
+  resetRubiConf
 } from 'modules/rubiconAnalyticsAdapter.js';
 import CONSTANTS from 'src/constants.json';
 import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr.js';
-
+import * as mockGpt from '../integration/faker/googletag.js';
 import {
   setConfig,
   addBidResponseHook,
@@ -25,7 +28,6 @@ function validate(message) {
   expect(validator.errors).to.deep.equal(null);
 }
 
-// using es6 "import * as events from 'src/events.js'" causes the events.getEvents stub not to work...
 let events = require('src/events.js');
 let utils = require('src/utils.js');
 
@@ -38,7 +40,8 @@ const {
     BIDDER_DONE,
     BID_WON,
     BID_TIMEOUT,
-    SET_TARGETING
+    SET_TARGETING,
+    BILLABLE_EVENT
   }
 } = CONSTANTS;
 
@@ -110,33 +113,108 @@ const BID2 = Object.assign({}, BID, {
   }
 });
 
+const BID3 = Object.assign({}, BID, {
+  adUnitCode: '/19968336/siderail-tag1',
+  bidId: '5fg6hyy4r879f0',
+  adId: 'fake_ad_id',
+  requestId: '5fg6hyy4r879f0',
+  width: 300,
+  height: 250,
+  mediaType: 'banner',
+  cpm: 2.01,
+  source: 'server',
+  seatBidId: 'aaaa-bbbb-cccc-dddd',
+  rubiconTargeting: {
+    'rpfl_elemid': '/19968336/siderail-tag1',
+    'rpfl_14062': '15_tier0200'
+  },
+  adserverTargeting: {
+    'hb_bidder': 'rubicon',
+    'hb_adid': '5fg6hyy4r879f0',
+    'hb_pb': '2.00',
+    'hb_size': '300x250',
+    'hb_source': 'server'
+  }
+});
+
+const BID4 = Object.assign({}, BID, {
+  adUnitCode: '/19968336/header-bid-tag1',
+  bidId: '3bd4ebb1c900e2',
+  adId: 'fake_ad_id',
+  requestId: '3bd4ebb1c900e2',
+  width: 728,
+  height: 90,
+  mediaType: 'banner',
+  cpm: 1.52,
+  source: 'server',
+  pbsBidId: 'zzzz-yyyy-xxxx-wwww',
+  seatBidId: 'aaaa-bbbb-cccc-dddd',
+  rubiconTargeting: {
+    'rpfl_elemid': '/19968336/header-bid-tag1',
+    'rpfl_14062': '2_tier0100'
+  },
+  adserverTargeting: {
+    'hb_bidder': 'rubicon',
+    'hb_adid': '3bd4ebb1c900e2',
+    'hb_pb': '1.500',
+    'hb_size': '728x90',
+    'hb_source': 'server'
+  }
+});
+
+const floorMinRequest = {
+  'bidder': 'rubicon',
+  'params': {
+    'accountId': '14062',
+    'siteId': '70608',
+    'zoneId': '335918',
+    'userId': '12346',
+    'keywords': ['a', 'b', 'c'],
+    'inventory': { 'rating': '4-star', 'prodtype': 'tech' },
+    'visitor': { 'ucat': 'new', 'lastsearch': 'iphone' },
+    'position': 'atf'
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [[300, 250]]
+    }
+  },
+  'adUnitCode': '/19968336/siderail-tag1',
+  'transactionId': 'c435626g-9e3f-401a-bee1-d56aec29a1d4',
+  'sizes': [[300, 250]],
+  'bidId': '5fg6hyy4r879f0',
+  'bidderRequestId': '1be65d7958826a',
+  'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+};
+
 const MOCK = {
   SET_TARGETING: {
     [BID.adUnitCode]: BID.adserverTargeting,
-    [BID2.adUnitCode]: BID2.adserverTargeting
+    [BID2.adUnitCode]: BID2.adserverTargeting,
+    [BID3.adUnitCode]: BID3.adserverTargeting
   },
   AUCTION_INIT: {
     'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
     'timestamp': 1519767010567,
     'auctionStatus': 'inProgress',
-    'adUnits': [ {
+    'adUnits': [{
       'code': '/19968336/header-bid-tag1',
       'sizes': [[640, 480]],
-      'bids': [ {
+      'bids': [{
         'bidder': 'rubicon',
         'params': {
           'accountId': 1001, 'siteId': 113932, 'zoneId': 535512
         }
-      } ],
+      }],
       'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014'
     }
     ],
     'adUnitCodes': ['/19968336/header-bid-tag1'],
-    'bidderRequests': [ {
+    'bidderRequests': [{
       'bidderCode': 'rubicon',
       'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
       'bidderRequestId': '1be65d7958826a',
-      'bids': [ {
+      'bids': [{
         'bidder': 'rubicon',
         'params': {
           'accountId': 1001, 'siteId': 113932, 'zoneId': 535512
@@ -158,7 +236,7 @@ const MOCK = {
       ],
       'timeout': 3000,
       'refererInfo': {
-        'referer': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+        'page': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
       }
     }
     ],
@@ -170,7 +248,7 @@ const MOCK = {
     }
   },
   BID_REQUESTED: {
-    'bidder': 'rubicon',
+    'bidderCode': 'rubicon',
     'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
     'bidderRequestId': '1be65d7958826a',
     'bids': [
@@ -183,7 +261,7 @@ const MOCK = {
           'userId': '12346',
           'keywords': ['a', 'b', 'c'],
           'inventory': 'test',
-          'visitor': {'ucat': 'new', 'lastsearch': 'iphone'},
+          'visitor': { 'ucat': 'new', 'lastsearch': 'iphone' },
           'position': 'btf',
           'video': {
             'language': 'en',
@@ -198,13 +276,19 @@ const MOCK = {
             }
           }
         },
-        'mediaType': 'video',
+        'mediaTypes': {
+          'video': {
+            'context': 'instream',
+            'playerSize': [640, 480]
+          }
+        },
         'adUnitCode': '/19968336/header-bid-tag-0',
         'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014',
         'sizes': [[640, 480]],
         'bidId': '2ecff0db240757',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'src': 'client'
       },
       {
         'bidder': 'rubicon',
@@ -214,8 +298,8 @@ const MOCK = {
           'zoneId': '335918',
           'userId': '12346',
           'keywords': ['a', 'b', 'c'],
-          'inventory': {'rating': '4-star', 'prodtype': 'tech'},
-          'visitor': {'ucat': 'new', 'lastsearch': 'iphone'},
+          'inventory': { 'rating': '4-star', 'prodtype': 'tech' },
+          'visitor': { 'ucat': 'new', 'lastsearch': 'iphone' },
           'position': 'atf'
         },
         'mediaTypes': {
@@ -228,19 +312,21 @@ const MOCK = {
         'sizes': [[1000, 300], [970, 250], [728, 90]],
         'bidId': '3bd4ebb1c900e2',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'src': 's2s'
       }
     ],
     'auctionStart': 1519149536560,
     'timeout': 5000,
     'start': 1519149562216,
     'refererInfo': {
-      'referer': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
+      'page': 'http://www.test.com/page.html', 'reachedTop': true, 'numIframes': 0, 'stack': ['http://www.test.com/page.html']
     }
   },
   BID_RESPONSE: [
     BID,
-    BID2
+    BID2,
+    BID3
   ],
   AUCTION_END: {
     'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
@@ -251,14 +337,21 @@ const MOCK = {
     }),
     Object.assign({}, BID2, {
       'status': 'rendered'
+    }),
+    Object.assign({}, BID3, {
+      'status': 'rendered'
     })
   ],
   BIDDER_DONE: {
     'bidderCode': 'rubicon',
+    'serverResponseTimeMs': 42,
     'bids': [
       BID,
       Object.assign({}, BID2, {
         'serverResponseTimeMs': 42,
+      }),
+      Object.assign({}, BID3, {
+        'serverResponseTimeMs': 55,
       })
     ]
   },
@@ -272,14 +365,32 @@ const MOCK = {
   ]
 };
 
+const STUBBED_UUID = '12345678-1234-1234-1234-123456789abc';
+
 const ANALYTICS_MESSAGE = {
-  'eventTimeMillis': 1519767013781,
+  'channel': 'web',
   'integration': 'pbjs',
   'version': '$prebid.version$',
   'referrerUri': 'http://www.test.com/page.html',
+  'session': {
+    'expires': 1519788613781,
+    'id': STUBBED_UUID,
+    'start': 1519767013781
+  },
+  'timestamps': {
+    'auctionEnded': 1519767013781,
+    'eventTime': 1519767013781,
+    'prebidLoaded': rubiconAnalyticsAdapter.MODULE_INITIALIZED_TIME
+  },
+  'trigger': 'allBidWons',
   'referrerHostname': 'www.test.com',
   'auctions': [
     {
+
+      'auctionEnd': 1519767013781,
+      'auctionStart': 1519767010567,
+      'bidderOrder': ['rubicon'],
+      'requestId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
       'clientTimeoutMillis': 3000,
       'serverTimeoutMillis': 1000,
       'accountId': 1001,
@@ -463,30 +574,45 @@ const ANALYTICS_MESSAGE = {
       'bidwonStatus': 'success'
     }
   ],
-  'wrapperName': '10000_fakewrapper_test'
+  'wrapper': {
+    'name': '10000_fakewrapper_test'
+  }
 };
 
-function performStandardAuction() {
-  events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
-  events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
-  events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
-  events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
-  events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
-  events.emit(AUCTION_END, MOCK.AUCTION_END);
-  events.emit(SET_TARGETING, MOCK.SET_TARGETING);
-  events.emit(BID_WON, MOCK.BID_WON[0]);
-  events.emit(BID_WON, MOCK.BID_WON[1]);
+function performStandardAuction(gptEvents, auctionId = MOCK.AUCTION_INIT.auctionId) {
+  events.emit(AUCTION_INIT, { ...MOCK.AUCTION_INIT, auctionId });
+  events.emit(BID_REQUESTED, { ...MOCK.BID_REQUESTED, auctionId });
+  events.emit(BID_RESPONSE, { ...MOCK.BID_RESPONSE[0], auctionId });
+  events.emit(BID_RESPONSE, { ...MOCK.BID_RESPONSE[1], auctionId });
+  events.emit(BIDDER_DONE, { ...MOCK.BIDDER_DONE, auctionId });
+  events.emit(AUCTION_END, { ...MOCK.AUCTION_END, auctionId });
+
+  if (gptEvents && gptEvents.length) {
+    gptEvents.forEach(gptEvent => mockGpt.emitEvent(gptEvent.eventName, gptEvent.params));
+  }
+
+  events.emit(SET_TARGETING, { ...MOCK.SET_TARGETING, auctionId });
+  events.emit(BID_WON, { ...MOCK.BID_WON[0], auctionId });
+  events.emit(BID_WON, { ...MOCK.BID_WON[1], auctionId });
 }
 
 describe('rubicon analytics adapter', function () {
   let sandbox;
   let clock;
-
+  let getDataFromLocalStorageStub, setDataInLocalStorageStub, localStorageIsEnabledStub;
   beforeEach(function () {
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    setDataInLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
+    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    mockGpt.disable();
     sandbox = sinon.sandbox.create();
 
+    localStorageIsEnabledStub.returns(true);
+
     sandbox.stub(events, 'getEvents').returns([]);
 
+    sandbox.stub(utils, 'generateUUID').returns(STUBBED_UUID);
+
     clock = sandbox.useFakeTimers(1519767013781);
 
     rubiconAnalyticsAdapter.referrerHostname = '';
@@ -505,6 +631,10 @@ describe('rubicon analytics adapter', function () {
   afterEach(function () {
     sandbox.restore();
     config.resetConfig();
+    mockGpt.enable();
+    getDataFromLocalStorageStub.restore();
+    setDataInLocalStorageStub.restore();
+    localStorageIsEnabledStub.restore();
   });
 
   it('should require accountId', function () {
@@ -531,6 +661,89 @@ describe('rubicon analytics adapter', function () {
     expect(utils.logError.called).to.equal(true);
   });
 
+  describe('config subscribe', function () {
+    it('should update the pvid if user asks', function () {
+      expect(utils.generateUUID.called).to.equal(false);
+      config.setConfig({ rubicon: { updatePageView: true } });
+      expect(utils.generateUUID.called).to.equal(true);
+    });
+    it('should merge in and preserve older set configs', function () {
+      resetRubiConf();
+      config.setConfig({
+        rubicon: {
+          wrapperName: '1001_general',
+          int_type: 'dmpbjs',
+          fpkvs: {
+            source: 'fb'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          source: 'fb'
+        },
+      });
+
+      // update it with stuff
+      config.setConfig({
+        rubicon: {
+          fpkvs: {
+            link: 'email'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          source: 'fb',
+          link: 'email'
+        },
+      });
+
+      // overwriting specific edge keys should update them
+      config.setConfig({
+        rubicon: {
+          fpkvs: {
+            link: 'iMessage',
+            source: 'twitter'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          link: 'iMessage',
+          source: 'twitter'
+        },
+      });
+    });
+  });
+
   describe('sampling', function () {
     beforeEach(function () {
       sandbox.stub(Math, 'random').returns(0.08);
@@ -659,14 +872,229 @@ describe('rubicon analytics adapter', function () {
       expect(message).to.deep.equal(ANALYTICS_MESSAGE);
     });
 
-    it('should capture price floor information correctly', function () {
+    it('should pass along bidderOrder correctly', function () {
+      const appnexusBid = utils.deepClone(MOCK.BID_REQUESTED);
+      appnexusBid.bidderCode = 'appnexus';
+      const pubmaticBid = utils.deepClone(MOCK.BID_REQUESTED);
+      pubmaticBid.bidderCode = 'pubmatic';
+      const indexBid = utils.deepClone(MOCK.BID_REQUESTED);
+      indexBid.bidderCode = 'ix';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, pubmaticBid);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_REQUESTED, indexBid);
+      events.emit(BID_REQUESTED, appnexusBid);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      clock.tick(SEND_TIMEOUT + 1000);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message.auctions[0].bidderOrder).to.deep.equal([
+        'pubmatic',
+        'rubicon',
+        'ix',
+        'appnexus'
+      ]);
+    });
+
+    it('should pass along user ids', function () {
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.bidderRequests[0].bids[0].userId = {
+        criteoId: 'sadfe4334',
+        lotamePanoramaId: 'asdf3gf4eg',
+        pubcid: 'dsfa4545-svgdfs5',
+        sharedId: { id1: 'asdf', id2: 'sadf4344' }
+      };
+
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+
+      let message = JSON.parse(request.requestBody);
+      validate(message);
+
+      expect(message.auctions[0].user).to.deep.equal({
+        ids: [
+          { provider: 'criteoId', 'hasId': true },
+          { provider: 'lotamePanoramaId', 'hasId': true },
+          { provider: 'pubcid', 'hasId': true },
+          { provider: 'sharedId', 'hasId': true },
+        ]
+      });
+    });
+
+    it('should handle bidResponse dimensions correctly', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // mock bid response with playerWidth and playerHeight (NO width and height)
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      delete bidResponse1.width;
+      delete bidResponse1.height;
+      bidResponse1.playerWidth = 640;
+      bidResponse1.playerHeight = 480;
+
+      // mock bid response with no width height or playerwidth playerheight
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      delete bidResponse2.width;
+      delete bidResponse2.height;
+      delete bidResponse2.playerWidth;
+      delete bidResponse2.playerHeight;
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.dimensions).to.deep.equal({
+        width: 640,
+        height: 480
+      });
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.dimensions).to.equal(undefined);
+    });
+
+    it('should pass along adomians correctly', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // 1 adomains
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      bidResponse1.meta = {
+        advertiserDomains: ['magnite.com']
+      }
+
+      // two adomains
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse2.meta = {
+        advertiserDomains: ['prebid.org', 'magnite.com']
+      }
+
+      // make sure we only pass max 10 adomains
+      bidResponse2.meta.advertiserDomains = [...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains]
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.deep.equal(['magnite.com']);
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.adomains).to.deep.equal(['prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com']);
+    });
+
+    it('should NOT pass along adomians correctly when edge cases', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // empty => nothing
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      bidResponse1.meta = {
+        advertiserDomains: []
+      }
+
+      // not array => nothing
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse2.meta = {
+        advertiserDomains: 'prebid.org'
+      }
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.be.undefined;
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.adomains).to.be.undefined;
+    });
+
+    it('should NOT pass along adomians with other edge cases', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // should filter out non string values and pass valid ones
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      bidResponse1.meta = {
+        advertiserDomains: [123, 'prebid.org', false, true, [], 'magnite.com', {}]
+      }
+
+      // array of arrays (as seen when passed by kargo bid adapter)
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse2.meta = {
+        advertiserDomains: [['prebid.org']]
+      }
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.deep.equal(['prebid.org', 'magnite.com']);
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.adomains).to.be.undefined;
+    });
+
+    it('should not pass empty adServerTargeting values', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      const mockTargeting = utils.deepClone(MOCK.SET_TARGETING);
+      mockTargeting['/19968336/header-bid-tag-0'].hb_test = '';
+      mockTargeting['/19968336/header-bid-tag1'].hb_test = 'NOT_EMPTY';
+      events.emit(SET_TARGETING, mockTargeting);
+
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].adserverTargeting.hb_test).to.be.undefined;
+      expect(message.auctions[0].adUnits[1].adserverTargeting.hb_test).to.equal('NOT_EMPTY');
+    });
+
+    function performFloorAuction(provider) {
       let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
       auctionInit.bidderRequests[0].bids[0].floorData = {
         skipped: false,
         modelVersion: 'someModelName',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 15,
-        fetchStatus: 'error'
+        fetchStatus: 'error',
+        floorProvider: provider
       };
       let flooredResponse = {
         ...BID,
@@ -713,69 +1141,791 @@ describe('rubicon analytics adapter', function () {
         }
       };
 
+      let floorMinResponse = {
+        ...BID3,
+        floorData: {
+          floorValue: 1.5,
+          floorRuleValue: 1,
+          floorRule: '12345/entertainment|banner',
+          floorCurrency: 'USD',
+          cpmAfterAdjustments: 2.00,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: false,
+            bidAdjustment: true
+          },
+          matchedFields: {
+            gptSlot: '12345/entertainment',
+            mediaType: 'banner'
+          }
+        }
+      };
+
+      let bidRequest = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequest.bids.push(floorMinRequest)
+
       // spoof the auction with just our duplicates
       events.emit(AUCTION_INIT, auctionInit);
-      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_REQUESTED, bidRequest);
       events.emit(BID_RESPONSE, flooredResponse);
       events.emit(BID_RESPONSE, notFlooredResponse);
+      events.emit(BID_RESPONSE, floorMinResponse);
       events.emit(AUCTION_END, MOCK.AUCTION_END);
       events.emit(SET_TARGETING, MOCK.SET_TARGETING);
       events.emit(BID_WON, MOCK.BID_WON[1]);
+      events.emit(BID_WON, MOCK.BID_WON[2]);
       clock.tick(SEND_TIMEOUT + 1000);
 
       expect(server.requests.length).to.equal(1);
 
       let message = JSON.parse(server.requests[0].requestBody);
       validate(message);
+      return message;
+    }
+
+    it('should capture price floor information correctly', function () {
+      let message = performFloorAuction('rubicon');
 
       // verify our floor stuff is passed
       // top level floor info
       expect(message.auctions[0].floors).to.deep.equal({
         location: 'setConfig',
         modelName: 'someModelName',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         skipped: false,
         enforcement: true,
         dealsEnforced: false,
         skipRate: 15,
-        fetchStatus: 'error'
+        fetchStatus: 'error',
+        provider: 'rubicon'
       });
       // first adUnit's adSlot
-      expect(message.auctions[0].adUnits[0].adSlot).to.equal('12345/sports');
+      expect(message.auctions[0].adUnits[0].gam.adSlot).to.equal('12345/sports');
       // since no other bids, we set adUnit status to no-bid
       expect(message.auctions[0].adUnits[0].status).to.equal('no-bid');
       // first adUnits bid is rejected
-      expect(message.auctions[0].adUnits[0].bids[0].status).to.equal('rejected');
+      expect(message.auctions[0].adUnits[0].bids[0].status).to.equal('rejected-ipf');
       expect(message.auctions[0].adUnits[0].bids[0].bidResponse.floorValue).to.equal(4);
       // if bid rejected should take cpmAfterAdjustments val
       expect(message.auctions[0].adUnits[0].bids[0].bidResponse.bidPriceUSD).to.equal(2.1);
 
       // second adUnit's adSlot
-      expect(message.auctions[0].adUnits[1].adSlot).to.equal('12345/news');
+      expect(message.auctions[0].adUnits[1].gam.adSlot).to.equal('12345/news');
       // top level adUnit status is success
       expect(message.auctions[0].adUnits[1].status).to.equal('success');
       // second adUnits bid is success
       expect(message.auctions[0].adUnits[1].bids[0].status).to.equal('success');
       expect(message.auctions[0].adUnits[1].bids[0].bidResponse.floorValue).to.equal(1);
       expect(message.auctions[0].adUnits[1].bids[0].bidResponse.bidPriceUSD).to.equal(1.52);
-    });
-
-    it('should correctly overwrite bidId if seatBidId is on the bidResponse', function () {
-      // Only want one bid request in our mock auction
-      let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
-      bidRequested.bids.shift();
-      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
-      auctionInit.adUnits.shift();
 
-      // clone the mock bidResponse and duplicate
-      let seatBidResponse = utils.deepClone(BID2);
-      seatBidResponse.seatBidId = 'abc-123-do-re-me';
+      // second adUnit's adSlot
+      expect(message.auctions[0].adUnits[2].gam.adSlot).to.equal('12345/entertainment');
+      // top level adUnit status is success
+      expect(message.auctions[0].adUnits[2].status).to.equal('success');
+      // second adUnits bid is success
+      expect(message.auctions[0].adUnits[2].bids[0].status).to.equal('success');
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.floorValue).to.equal(1.5);
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.floorRuleValue).to.equal(1);
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.bidPriceUSD).to.equal(2.01);
+    });
 
-      const setTargeting = {
-        [seatBidResponse.adUnitCode]: seatBidResponse.adserverTargeting
-      };
+    it('should still send floor info if provider is not rubicon', function () {
+      let message = performFloorAuction('randomProvider');
 
-      const bidWon = Object.assign({}, seatBidResponse, {
-        'status': 'rendered'
+      // verify our floor stuff is passed
+      // top level floor info
+      expect(message.auctions[0].floors).to.deep.equal({
+        location: 'setConfig',
+        modelName: 'someModelName',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        skipped: false,
+        enforcement: true,
+        dealsEnforced: false,
+        skipRate: 15,
+        fetchStatus: 'error',
+        provider: 'randomProvider'
+      });
+      // first adUnit's adSlot
+      expect(message.auctions[0].adUnits[0].gam.adSlot).to.equal('12345/sports');
+      // since no other bids, we set adUnit status to no-bid
+      expect(message.auctions[0].adUnits[0].status).to.equal('no-bid');
+      // first adUnits bid is rejected
+      expect(message.auctions[0].adUnits[0].bids[0].status).to.equal('rejected-ipf');
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.floorValue).to.equal(4);
+      // if bid rejected should take cpmAfterAdjustments val
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.bidPriceUSD).to.equal(2.1);
+
+      // second adUnit's adSlot
+      expect(message.auctions[0].adUnits[1].gam.adSlot).to.equal('12345/news');
+      // top level adUnit status is success
+      expect(message.auctions[0].adUnits[1].status).to.equal('success');
+      // second adUnits bid is success
+      expect(message.auctions[0].adUnits[1].bids[0].status).to.equal('success');
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.floorValue).to.equal(1);
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.bidPriceUSD).to.equal(1.52);
+
+      // second adUnit's adSlot
+      expect(message.auctions[0].adUnits[2].gam.adSlot).to.equal('12345/entertainment');
+      // top level adUnit status is success
+      expect(message.auctions[0].adUnits[2].status).to.equal('success');
+      // second adUnits bid is success
+      expect(message.auctions[0].adUnits[2].bids[0].status).to.equal('success');
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.floorValue).to.equal(1.5);
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.floorRuleValue).to.equal(1);
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.bidPriceUSD).to.equal(2.01);
+    });
+
+    describe('with session handling', function () {
+      const expectedPvid = STUBBED_UUID.slice(0, 8);
+      beforeEach(function () {
+        config.setConfig({ rubicon: { updatePageView: true } });
+      });
+
+      it('should not log any session data if local storage is not enabled', function () {
+        localStorageIsEnabledStub.returns(false);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        delete expectedMessage.session;
+        delete expectedMessage.fpkvs;
+
+        performStandardAuction();
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+
+        expect(request.url).to.equal('//localhost:9999/event');
+
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should should pass along custom rubicon kv and pvid when defined', function () {
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              source: 'fb',
+              link: 'email'
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'fb' },
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should convert kvs to strings before sending', function () {
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              number: 24,
+              boolean: false,
+              string: 'hello',
+              array: ['one', 2, 'three'],
+              object: { one: 'two' }
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'number', value: '24' },
+          { key: 'boolean', value: 'false' },
+          { key: 'string', value: 'hello' },
+          { key: 'array', value: 'one,2,three' },
+          { key: 'object', value: '[object Object]' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should use the query utm param rubicon kv value and pass updated kv and pvid when defined', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({ 'search': '?utm_source=other', 'pbjs_debug': 'true' });
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              source: 'fb',
+              link: 'email'
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'other' },
+          { key: 'link', value: 'email' }
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should pick up existing localStorage and use its values', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519766113781, // 15 mins before "now"
+          expires: 1519787713781, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519766113781,
+          expires: 1519787713781,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'tw' },
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519766113781, // should have stayed same
+          expires: 1519787713781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { source: 'tw', link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should overwrite matching localstorge value and use its remaining values', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({ 'search': '?utm_source=fb&utm_click=dog' });
+
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519766113781, // 15 mins before "now"
+          expires: 1519787713781, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw', link: 'email' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519766113781,
+          expires: 1519787713781,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'fb' },
+          { key: 'link', value: 'email' },
+          { key: 'click', value: 'dog' }
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519766113781, // should have stayed same
+          expires: 1519787713781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { source: 'fb', link: 'email', click: 'dog' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should throw out session if lastSeen > 30 mins ago and create new one', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519764313781, // 45 mins before "now"
+          expires: 1519785913781, // six hours later
+          lastSeen: 1519764313781, // 45 mins before "now"
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        // session should match what is already in ANALYTICS_MESSAGE, just need to add pvid
+        expectedMessage.session.pvid = expectedPvid;
+
+        // the saved fpkvs should have been thrown out since session expired
+        expectedMessage.fpkvs = [
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: STUBBED_UUID, // should have stayed same
+          start: 1519767013781, // should have stayed same
+          expires: 1519788613781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should throw out session if past expires time and create new one', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519745353781, // 6 hours before "expires"
+          expires: 1519766953781, // little more than six hours ago
+          lastSeen: 1519767008781, // 5 seconds ago
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        // session should match what is already in ANALYTICS_MESSAGE, just need to add pvid
+        expectedMessage.session.pvid = expectedPvid;
+
+        // the saved fpkvs should have been thrown out since session expired
+        expectedMessage.fpkvs = [
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: STUBBED_UUID, // should have stayed same
+          start: 1519767013781, // should have stayed same
+          expires: 1519788613781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+    });
+    describe('with googletag enabled', function () {
+      let gptSlot0, gptSlot1;
+      let gptSlotRenderEnded0, gptSlotRenderEnded1;
+      beforeEach(function () {
+        mockGpt.enable();
+        gptSlot0 = mockGpt.makeSlot({ code: '/19968336/header-bid-tag-0' });
+        gptSlotRenderEnded0 = {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot0,
+            isEmpty: false,
+            advertiserId: 1111,
+            sourceAgnosticCreativeId: 2222,
+            sourceAgnosticLineItemId: 3333
+          }
+        };
+
+        gptSlot1 = mockGpt.makeSlot({ code: '/19968336/header-bid-tag1' });
+        gptSlotRenderEnded1 = {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot1,
+            isEmpty: false,
+            advertiserId: 4444,
+            sourceAgnosticCreativeId: 5555,
+            sourceAgnosticLineItemId: 6666
+          }
+        };
+      });
+
+      afterEach(function () {
+        mockGpt.disable();
+      });
+
+      it('should add necessary gam information if gpt is enabled and slotRender event emmited', function () {
+        performStandardAuction([gptSlotRenderEnded0, gptSlotRenderEnded1]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should handle empty gam renders', function () {
+        performStandardAuction([gptSlotRenderEnded0, {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot1,
+            isEmpty: true
+          }
+        }]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          isSlotEmpty: true,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should still add gam ids if falsy', function () {
+        performStandardAuction([gptSlotRenderEnded0, {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot1,
+            isEmpty: false,
+            advertiserId: 0,
+            sourceAgnosticCreativeId: 0,
+            sourceAgnosticLineItemId: 0
+          }
+        }]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 0,
+          creativeId: 0,
+          lineItemId: 0,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should pick backup Ids if no sourceAgnostic available first', function () {
+        performStandardAuction([gptSlotRenderEnded0, {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot1,
+            isEmpty: false,
+            advertiserId: 0,
+            lineItemId: 1234,
+            creativeId: 5678
+          }
+        }]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 0,
+          creativeId: 5678,
+          lineItemId: 1234,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should correctly set adUnit for associated slots', function () {
+        performStandardAuction([gptSlotRenderEnded0, gptSlotRenderEnded1]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should only mark the first gam data not all matches', function () {
+        config.setConfig({
+          rubicon: {
+            waitForGamSlots: true
+          }
+        });
+        performStandardAuction();
+        performStandardAuction([gptSlotRenderEnded0, gptSlotRenderEnded1], '32d332de-123a-32dg-2345-cefef3423324');
+
+        // tick the clock and both should fire
+        clock.tick(3000);
+
+        expect(server.requests.length).to.equal(2);
+
+        // first one should have GAM data
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        // trigger should be gam since all adunits had associated gam render
+        expect(message.trigger).to.be.equal('gam');
+        expect(message.auctions[0].adUnits[0].gam).to.deep.equal({
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        });
+        expect(message.auctions[0].adUnits[1].gam).to.deep.equal({
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        });
+
+        // second one should NOT have gam data
+        request = server.requests[1];
+        message = JSON.parse(request.requestBody);
+        validate(message);
+
+        // trigger should be auctionEnd
+        expect(message.trigger).to.be.equal('auctionEnd');
+        expect(message.auctions[0].adUnits[0].gam).to.be.undefined;
+        expect(message.auctions[0].adUnits[1].gam).to.be.undefined;
+      });
+
+      it('should send request when waitForGamSlots is present but no bidWons are sent', function () {
+        config.setConfig({
+          rubicon: {
+            waitForGamSlots: true,
+          }
+        });
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+        events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+
+        // should send if just slotRenderEnded is emmitted for both
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+        mockGpt.emitEvent(gptSlotRenderEnded1.eventName, gptSlotRenderEnded1.params);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        delete expectedMessage.bidsWon; // should not be any of these
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expectedMessage.trigger = 'gam';
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should delay the event call depending on analyticsEventDelay config', function () {
+        config.setConfig({
+          rubicon: {
+            waitForGamSlots: true,
+            analyticsEventDelay: 2000
+          }
+        });
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+        events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+
+        // should send if just slotRenderEnded is emmitted for both
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+        mockGpt.emitEvent(gptSlotRenderEnded1.eventName, gptSlotRenderEnded1.params);
+
+        // Should not be sent until delay
+        expect(server.requests.length).to.equal(0);
+
+        // tick the clock and it should fire
+        clock.tick(2000);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+        let expectedGam0 = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        let expectedGam1 = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(expectedGam0).to.deep.equal(message.auctions[0].adUnits[0].gam);
+        expect(expectedGam1).to.deep.equal(message.auctions[0].adUnits[1].gam);
+      });
+    });
+
+    it('should correctly overwrite bidId if seatBidId is on the bidResponse', function () {
+      // Only want one bid request in our mock auction
+      let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequested.bids.shift();
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.adUnits.shift();
+
+      // clone the mock bidResponse and duplicate
+      let seatBidResponse = utils.deepClone(BID2);
+      seatBidResponse.seatBidId = 'abc-123-do-re-me';
+
+      const setTargeting = {
+        [seatBidResponse.adUnitCode]: seatBidResponse.adserverTargeting
+      };
+
+      const bidWon = Object.assign({}, seatBidResponse, {
+        'status': 'rendered'
       });
 
       // spoof the auction with just our duplicates
@@ -793,6 +1943,73 @@ describe('rubicon analytics adapter', function () {
       expect(message.bidsWon[0].bidId).to.equal('abc-123-do-re-me');
     });
 
+    it('should correctly overwrite bidId if pbsBidId is on the bidResponse', function () {
+      // Only want one bid request in our mock auction
+      let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequested.bids.shift();
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.adUnits.shift();
+
+      // clone the mock bidResponse and duplicate
+      let seatBidResponse = utils.deepClone(BID4);
+
+      const setTargeting = {
+        [seatBidResponse.adUnitCode]: seatBidResponse.adserverTargeting
+      };
+
+      const bidWon = Object.assign({}, seatBidResponse, {
+        'status': 'rendered'
+      });
+
+      // spoof the auction with just our duplicates
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, bidRequested);
+      events.emit(BID_RESPONSE, seatBidResponse);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, setTargeting);
+      events.emit(BID_WON, bidWon);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidId).to.equal('zzzz-yyyy-xxxx-wwww');
+      expect(message.bidsWon[0].bidId).to.equal('zzzz-yyyy-xxxx-wwww');
+    });
+
+    it('should correctly generate new bidId if it is 0', function () {
+      // Only want one bid request in our mock auction
+      let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequested.bids.shift();
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.adUnits.shift();
+
+      // clone the mock bidResponse and duplicate
+      let seatBidResponse = utils.deepClone(BID4);
+      seatBidResponse.pbsBidId = '0';
+
+      const setTargeting = {
+        [seatBidResponse.adUnitCode]: seatBidResponse.adserverTargeting
+      };
+
+      const bidWon = Object.assign({}, seatBidResponse, {
+        'status': 'rendered'
+      });
+
+      // spoof the auction with just our duplicates
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, bidRequested);
+      events.emit(BID_RESPONSE, seatBidResponse);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, setTargeting);
+      events.emit(BID_WON, bidWon);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidId).to.equal(STUBBED_UUID);
+      expect(message.bidsWon[0].bidId).to.equal(STUBBED_UUID);
+    });
+
     it('should pick the highest cpm bid if more than one bid per bidRequestId', function () {
       // Only want one bid request in our mock auction
       let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
@@ -887,9 +2104,98 @@ describe('rubicon analytics adapter', function () {
       let timedOutBid = message.auctions[0].adUnits[0].bids[0];
       expect(timedOutBid.status).to.equal('error');
       expect(timedOutBid.error.code).to.equal('timeout-error');
+      expect(timedOutBid.error.description).to.equal('prebid.js timeout');
       expect(timedOutBid).to.not.have.property('bidResponse');
     });
 
+    it('should pass aupName as pattern', function () {
+      let bidRequest = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequest.bids[0].ortb2Imp = {
+        ext: {
+          data: {
+            aupname: '1234/mycoolsite/*&gpt_leaderboard&deviceType=mobile'
+          }
+        }
+      };
+      bidRequest.bids[1].ortb2Imp = {
+        ext: {
+          data: {
+            aupname: '1234/mycoolsite/*&gpt_skyscraper&deviceType=mobile'
+          }
+        }
+      };
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, bidRequest);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+
+      clock.tick(SEND_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].pattern).to.equal('1234/mycoolsite/*&gpt_leaderboard&deviceType=mobile');
+      expect(message.auctions[0].adUnits[1].pattern).to.equal('1234/mycoolsite/*&gpt_skyscraper&deviceType=mobile');
+    });
+
+    it('should pass gpid if defined', function () {
+      let bidRequest = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequest.bids[0].ortb2Imp = {
+        ext: {
+          gpid: '1234/mycoolsite/lowerbox'
+        }
+      };
+      bidRequest.bids[1].ortb2Imp = {
+        ext: {
+          gpid: '1234/mycoolsite/leaderboard'
+        }
+      };
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, bidRequest);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+
+      clock.tick(SEND_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].gpid).to.equal('1234/mycoolsite/lowerbox');
+      expect(message.auctions[0].adUnits[1].gpid).to.equal('1234/mycoolsite/leaderboard');
+    });
+
+    it('should pass bidderDetail for multibid auctions', function () {
+      let bidResponse = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse.targetingBidder = 'rubi2';
+      bidResponse.originalRequestId = bidResponse.requestId;
+      bidResponse.requestId = '1a2b3c4d5e6f7g8h9';
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, bidResponse);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+
+      clock.tick(SEND_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+
+      expect(message.auctions[0].adUnits[1].bids[1].bidder).to.equal('rubicon');
+      expect(message.auctions[0].adUnits[1].bids[1].bidderDetail).to.equal('rubi2');
+    });
+
     it('should successfully convert bid price to USD in parseBidResponse', function () {
       // Set the rates
       setConfig({
@@ -908,7 +2214,7 @@ describe('rubicon analytics adapter', function () {
 
       // Now add the bidResponse hook which hooks on the currenct conversion function onto the bid response
       let innerBid;
-      addBidResponseHook(function(adCodeId, bid) {
+      addBidResponseHook(function (adCodeId, bid) {
         innerBid = bid;
       }, 'elementId', bidCopy);
 
@@ -921,12 +2227,11 @@ describe('rubicon analytics adapter', function () {
 
   describe('config with integration type', () => {
     it('should use the integration type provided in the config instead of the default', () => {
-      sandbox.stub(config, 'getConfig').callsFake(function (key) {
-        const config = {
-          'rubicon.int_type': 'testType'
-        };
-        return config[key];
-      });
+      config.setConfig({
+        rubicon: {
+          int_type: 'testType'
+        }
+      })
 
       rubiconAnalyticsAdapter.enableAnalytics({
         options: {
@@ -946,6 +2251,278 @@ describe('rubicon analytics adapter', function () {
     });
   });
 
+  describe('billing events integration', () => {
+    beforeEach(function () {
+      rubiconAnalyticsAdapter.enableAnalytics({
+        options: {
+          endpoint: '//localhost:9999/event',
+          accountId: 1001
+        }
+      });
+      // default dmBilling
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: false,
+            vendors: [],
+            waitForAuction: true
+          }
+        }
+      })
+    });
+    afterEach(function () {
+      rubiconAnalyticsAdapter.disableAnalytics();
+    });
+    const basicBillingAuction = (billingEvents = []) => {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // emit billing events
+      billingEvents.forEach(ev => events.emit(BILLABLE_EVENT, ev));
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+    }
+    it('should ignore billing events when not enabled', () => {
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should ignore billing events when enabled but vendor is not whitelisted', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true
+          }
+        }
+      });
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should ignore billing events if billingId is not defined or billingId is not a string', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: true
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 1233434
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: null
+        }
+      ]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should pass along billing event in same payload', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'pageView',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([{
+        accountId: 1001,
+        vendor: 'vendorName',
+        type: 'pageView',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+    });
+    it('should pass along multiple billing events but filter out duplicates', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        },
+        {
+          vendor: 'vendorName',
+          type: 'impression',
+          billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f'
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        }
+      ]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        },
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'impression',
+          billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f'
+        }
+      ]);
+    });
+    it('should pass along event right away if no pending auction', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+
+      events.emit(BILLABLE_EVENT, {
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      });
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.not.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        }
+      ]);
+    });
+    it('should pass along event right away if pending auction but not waiting', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName'],
+            waitForAuction: false
+          }
+        }
+      });
+      // should fire right away, and then auction later
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(2);
+      const billingRequest = server.requests[0];
+      const billingMessage = JSON.parse(billingRequest.requestBody);
+      expect(billingMessage).to.not.haveOwnProperty('auctions');
+      expect(billingMessage.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        }
+      ]);
+      // auction event after
+      const auctionRequest = server.requests[1];
+      const auctionMessage = JSON.parse(auctionRequest.requestBody);
+      // should not double pass events!
+      expect(auctionMessage).to.not.haveOwnProperty('billableEvents');
+    });
+  });
+
+  describe('wrapper details passed in', () => {
+    it('should correctly pass in the wrapper details if provided', () => {
+      config.setConfig({
+        rubicon: {
+          wrapperName: '1001_wrapperName_exp.4',
+          wrapperFamily: '1001_wrapperName',
+          rule_name: 'na-mobile'
+        }
+      });
+
+      rubiconAnalyticsAdapter.enableAnalytics({
+        options: {
+          endpoint: '//localhost:9999/event',
+          accountId: 1001
+        }
+      });
+
+      performStandardAuction();
+
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.wrapper).to.deep.equal({
+        name: '1001_wrapperName_exp.4',
+        family: '1001_wrapperName',
+        rule: 'na-mobile'
+      });
+
+      rubiconAnalyticsAdapter.disableAnalytics();
+    });
+  });
+
   it('getHostNameFromReferer correctly grabs hostname from an input URL', function () {
     let inputUrl = 'https://www.prebid.org/some/path?pbjs_debug=true';
     expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.org');
diff --git a/test/spec/modules/rubiconAnalyticsSchema.json b/test/spec/modules/rubiconAnalyticsSchema.json
index 16cca629d8c..2d0dca42d23 100644
--- a/test/spec/modules/rubiconAnalyticsSchema.json
+++ b/test/spec/modules/rubiconAnalyticsSchema.json
@@ -1,10 +1,9 @@
 {
-  "$schema": "http://json-schema.org/draft-06/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Prebid Auctions",
   "description": "A batched data object describing the lifecycle of an auction or multiple auction across a single page view.",
   "type": "object",
   "required": [
-    "eventTimeMillis",
     "integration",
     "version"
   ],
@@ -18,13 +17,14 @@
       "required": [
         "bidsWon"
       ]
+    },
+    {
+      "required": [
+        "billableEvents"
+      ]
     }
   ],
   "properties": {
-    "eventTimeMillis": {
-      "type": "integer",
-      "description": "Unix timestamp of time of creation for this batched event in milliseconds."
-    },
     "integration": {
       "type": "string",
       "description": "Integration type that generated this event.",
@@ -34,6 +34,53 @@
       "type": "string",
       "description": "Version of Prebid.js responsible for the auctions contained within."
     },
+    "fpkvs": {
+      "type": "array",
+      "description": "List of any dynamic key value pairs set by publisher.",
+      "minItems": 1,
+      "items": {
+        "type": "object",
+        "required": [
+          "key",
+          "value"
+        ],
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "session": {
+      "type": "object",
+      "description": "The session information for a given event",
+      "required": [
+        "id",
+        "start",
+        "expires"
+      ],
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "UUID of session."
+        },
+        "start": {
+          "type": "integer",
+          "description": "Unix timestamp of time of creation for this session in milliseconds."
+        },
+        "expires": {
+          "type": "integer",
+          "description": "Unix timestamp of the maximum allowed time in milliseconds of the session."
+        },
+        "pvid": {
+          "type": "string",
+          "description": "id to track page view."
+        }
+      }
+    },
     "auctions": {
       "type": "array",
       "minItems": 1,
@@ -125,6 +172,9 @@
                 "zoneId": {
                   "type": "number",
                   "description": "The Rubicon zoneId associated with this adUnit - Removed if null"
+                },
+                "gam": {
+                  "$ref": "#/definitions/gam"
                 }
               }
             }
@@ -192,11 +242,73 @@
         ]
       }
     },
-    "wrapperName": {
-      "type": "string"
-    }
+    "billableEvents":{
+      "type":"array",
+      "minItems":1,
+      "items":{
+         "type":"object",
+         "required":[
+           "accountId",
+            "vendor",
+            "type",
+            "billingId"
+         ],
+         "properties":{
+            "vendor":{
+               "type":"string",
+               "description":"The name of the vendor who emitted the billable event"
+            },
+            "type":{
+               "type":"string",
+               "description":"The type of billable event",
+               "enum":[
+                  "impression",
+                  "pageLoad",
+                  "auction",
+                  "request",
+                  "general"
+               ]
+            },
+            "billingId":{
+               "type":"string",
+               "description":"A UUID which is responsible more mapping this event to"
+            },
+            "accountId": {
+              "type": "number",
+              "description": "The account id for the rubicon publisher"
+            }
+         }
+      }
+   }
   },
   "definitions": {
+    "gam": {
+      "type": "object",
+      "description": "The gam information for a given ad unit",
+      "required": [
+        "adSlot"
+      ],
+      "properties": {
+        "adSlot": {
+          "type": "string"
+        },
+        "advertiserId": {
+          "type": "integer"
+        },
+        "creativeId": {
+          "type": "integer"
+        },
+        "LineItemId": {
+          "type": "integer"
+        },
+        "isSlotEmpty": {
+          "type": "boolean",
+          "enum": [
+            true
+          ]
+        }
+      }
+    },
     "adserverTargeting": {
       "type": "object",
       "description": "The adserverTargeting key/value pairs",
@@ -293,11 +405,13 @@
             "success",
             "no-bid",
             "error",
-            "rejected"
+            "rejected-gdpr",
+            "rejected-ipf"
           ]
         },
         "error": {
           "type": "object",
+          "additionalProperties": false,
           "required": [
             "code"
           ],
@@ -333,7 +447,6 @@
         "bidResponse": {
           "type": "object",
           "required": [
-            "dimensions",
             "mediaType",
             "bidPriceUSD"
           ],
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index 11ed17df5f8..e81ef1c805f 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -1,10 +1,17 @@
 import {expect} from 'chai';
-import adapterManager from 'src/adapterManager.js';
-import {spec, getPriceGranularity, masSizeOrdering, resetUserSync, hasVideoMediaType, FASTLANE_ENDPOINT} from 'modules/rubiconBidAdapter.js';
+import {
+  spec,
+  getPriceGranularity,
+  masSizeOrdering,
+  resetUserSync,
+  classifiedAsVideo,
+  resetRubiConf
+} from 'modules/rubiconBidAdapter.js';
 import {parse as parseQuery} from 'querystring';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
-import find from 'core-js-pure/features/array/find.js';
+import {find} from 'src/polyfill.js';
+import {createEidsArray} from 'modules/userId/eids.js';
 
 const INTEGRATION = `pbjs_lite_v$prebid.version$`; // $prebid.version$ will be substituted in by gulp in built prebid
 const PBS_INTEGRATION = 'pbjs';
@@ -13,7 +20,8 @@ describe('the rubicon adapter', function () {
   let sandbox,
     bidderRequest,
     sizeMap,
-    getFloorResponse;
+    getFloorResponse,
+    logErrorSpy;
 
   /**
    * @typedef {Object} sizeMapConverted
@@ -136,7 +144,7 @@ describe('the rubicon adapter', function () {
       'targeting': [
         {
           'key': getProp('targeting_key', `rpfl_${i}`),
-          'values': [ '43_tier_all_test' ]
+          'values': ['43_tier_all_test']
         }
       ]
     };
@@ -219,13 +227,27 @@ describe('the rubicon adapter', function () {
       'size_id': 201,
     };
     bid.userId = {
-      lipb: {
-        lipbid: '0000-1111-2222-3333',
-        segments: ['segA', 'segB']
-      },
-      idl_env: '1111-2222-3333-4444'
+      lipb: {lipbid: '0000-1111-2222-3333', segments: ['segA', 'segB']},
+      idl_env: '1111-2222-3333-4444',
+      tdid: '3000',
+      pubcid: '4000',
+      pubProvidedId: [{
+        source: 'example.com',
+        uids: [{
+          id: '333333',
+          ext: {
+            stype: 'ppuid'
+          }
+        }]
+      }, {
+        source: 'id-partner.com',
+        uids: [{
+          id: '4444444'
+        }]
+      }],
+      criteoId: '1111',
     };
-    bid.storedAuctionResponse = 11111;
+    bid.userIdAsEids = createEidsArray(bid.userId);
   }
 
   function createVideoBidderRequestNoVideo() {
@@ -235,7 +257,7 @@ describe('the rubicon adapter', function () {
         context: 'instream'
       },
     };
-    bid.params.video = '';
+    bid.params.video = false;
   }
 
   function createVideoBidderRequestOutstream() {
@@ -272,6 +294,7 @@ describe('the rubicon adapter', function () {
 
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
+    logErrorSpy = sinon.spy(utils, 'logError');
     getFloorResponse = {};
     bidderRequest = {
       bidderCode: 'rubicon',
@@ -343,6 +366,10 @@ describe('the rubicon adapter', function () {
 
   afterEach(function () {
     sandbox.restore();
+    utils.logError.restore();
+    config.resetConfig();
+    resetRubiConf();
+    delete $$PREBID_GLOBAL$$.installedModules;
   });
 
   describe('MAS mapping / ordering', function () {
@@ -368,7 +395,10 @@ describe('the rubicon adapter', function () {
       describe('to fastlane', function () {
         it('should make a well-formed request object', function () {
           sandbox.stub(Math, 'random').callsFake(() => 0.1);
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let duplicate = Object.assign(bidderRequest);
+          duplicate.bids[0].params.floor = 0.01;
+
+          let [request] = spec.buildRequests(duplicate.bids, duplicate);
           let data = parseQuery(request.data);
 
           expect(request.url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
@@ -412,7 +442,18 @@ describe('the rubicon adapter', function () {
         it('should correctly send hard floors when getFloor function is present and returns valid floor', function () {
           // default getFloor response is empty object so should not break and not send hard_floor
           bidderRequest.bids[0].getFloor = () => getFloorResponse;
+          sinon.spy(bidderRequest.bids[0], 'getFloor');
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          // make sure banner bid called with right stuff
+          expect(
+            bidderRequest.bids[0].getFloor.calledWith({
+              currency: 'USD',
+              mediaType: 'banner',
+              size: '*'
+            })
+          ).to.be.true;
+
           let data = parseQuery(request.data);
           expect(data.rp_hard_floor).to.be.undefined;
 
@@ -446,35 +487,73 @@ describe('the rubicon adapter', function () {
           data = parseQuery(request.data);
           expect(data.rp_hard_floor).to.equal('1.23');
         });
-        it('should not send p_pos to AE if not params.position specified', function() {
-	      var noposRequest = utils.deepClone(bidderRequest);
-	      delete noposRequest.bids[0].params.position;
 
-	      let [request] = spec.buildRequests(noposRequest.bids, noposRequest);
-	      let data = parseQuery(request.data);
+        it('should send rp_maxbids to AE if rubicon multibid config exists', function () {
+          var multibidRequest = utils.deepClone(bidderRequest);
+          multibidRequest.bidLimit = 5;
+
+          let [request] = spec.buildRequests(multibidRequest.bids, multibidRequest);
+          let data = parseQuery(request.data);
+
+          expect(data['rp_maxbids']).to.equal('5');
+        });
+
+        it('should not send p_pos to AE if not params.position specified', function () {
+          var noposRequest = utils.deepClone(bidderRequest);
+          delete noposRequest.bids[0].params.position;
+
+          let [request] = spec.buildRequests(noposRequest.bids, noposRequest);
+          let data = parseQuery(request.data);
+
+          expect(data['site_id']).to.equal('70608');
+          expect(data['p_pos']).to.equal(undefined);
+        });
+
+        it('should not send p_pos to AE if not mediaTypes.banner.pos is invalid', function () {
+          var bidRequest = utils.deepClone(bidderRequest);
+          bidRequest.bids[0].mediaTypes = {
+            banner: {
+              pos: 5
+            }
+          };
+          delete bidRequest.bids[0].params.position;
+
+          let [request] = spec.buildRequests(bidRequest.bids, bidRequest);
+          let data = parseQuery(request.data);
+
+          expect(data['site_id']).to.equal('70608');
+          expect(data['p_pos']).to.equal(undefined);
+        });
+
+        it('should send p_pos to AE if mediaTypes.banner.pos is valid', function () {
+          var bidRequest = utils.deepClone(bidderRequest);
+          bidRequest.bids[0].mediaTypes = {
+            banner: {
+              pos: 1
+            }
+          };
+          delete bidRequest.bids[0].params.position;
+
+          let [request] = spec.buildRequests(bidRequest.bids, bidRequest);
+          let data = parseQuery(request.data);
 
-	      expect(data['site_id']).to.equal('70608');
-	      expect(data['p_pos']).to.equal(undefined);
+          expect(data['site_id']).to.equal('70608');
+          expect(data['p_pos']).to.equal('atf');
         });
 
-        it('should not send p_pos to AE if not params.position is invalid', function() {
-	      var badposRequest = utils.deepClone(bidderRequest);
-	      badposRequest.bids[0].params.position = 'bad';
+        it('should not send p_pos to AE if not params.position is invalid', function () {
+          var badposRequest = utils.deepClone(bidderRequest);
+          badposRequest.bids[0].params.position = 'bad';
 
-	      let [request] = spec.buildRequests(badposRequest.bids, badposRequest);
-	      let data = parseQuery(request.data);
+          let [request] = spec.buildRequests(badposRequest.bids, badposRequest);
+          let data = parseQuery(request.data);
 
-	      expect(data['site_id']).to.equal('70608');
-	      expect(data['p_pos']).to.equal(undefined);
+          expect(data['site_id']).to.equal('70608');
+          expect(data['p_pos']).to.equal(undefined);
         });
 
         it('should correctly send p_pos in sra fashion', function() {
-          sandbox.stub(config, 'getConfig').callsFake((key) => {
-            const config = {
-              'rubicon.singleRequest': true
-            };
-            return config[key];
-          });
+          config.setConfig({rubicon: {singleRequest: true}});
           // first one is atf
           var sraPosRequest = utils.deepClone(bidderRequest);
 
@@ -504,11 +583,11 @@ describe('the rubicon adapter', function () {
           expect(data['p_pos']).to.equal('atf;;btf;;');
         });
 
-        it('should not send x_source.pchain to AE if params.pchain is not specified', function() {
-	      var noPchainRequest = utils.deepClone(bidderRequest);
-	      delete noPchainRequest.bids[0].params.pchain;
+        it('should not send x_source.pchain to AE if params.pchain is not specified', function () {
+          var noPchainRequest = utils.deepClone(bidderRequest);
+          delete noPchainRequest.bids[0].params.pchain;
 
-	      let [request] = spec.buildRequests(noPchainRequest.bids, noPchainRequest);
+          let [request] = spec.buildRequests(noPchainRequest.bids, noPchainRequest);
           expect(request.data).to.contain('&site_id=70608&');
           expect(request.data).to.not.contain('x_source.pchain');
         });
@@ -517,7 +596,7 @@ describe('the rubicon adapter', function () {
           sandbox.stub(Math, 'random').callsFake(() => 0.1);
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
-          const referenceOrdering = ['account_id', 'site_id', 'zone_id', 'size_id', 'alt_size_ids', 'p_pos', 'rf', 'p_geo.latitude', 'p_geo.longitude', 'kw', 'tg_v.ucat', 'tg_v.lastsearch', 'tg_v.likes', 'tg_i.rating', 'tg_i.prodtype', 'tk_flint', 'x_source.tid', 'x_source.pchain', 'p_screen_res', 'rp_floor', 'rp_secure', 'tk_user_key', 'tg_fl.eid', 'slots', 'rand'];
+          const referenceOrdering = ['account_id', 'site_id', 'zone_id', 'size_id', 'alt_size_ids', 'p_pos', 'rf', 'p_geo.latitude', 'p_geo.longitude', 'kw', 'tg_v.ucat', 'tg_v.lastsearch', 'tg_v.likes', 'tg_i.rating', 'tg_i.prodtype', 'tk_flint', 'x_source.tid', 'l_pb_bid_id', 'x_source.pchain', 'p_screen_res', 'rp_secure', 'tk_user_key', 'tg_fl.eid', 'rp_maxbids', 'slots', 'rand'];
 
           request.data.split('&').forEach((item, i) => {
             expect(item.split('=')[0]).to.equal(referenceOrdering[i]);
@@ -532,7 +611,6 @@ describe('the rubicon adapter', function () {
             'size_id': '15',
             'alt_size_ids': '43',
             'p_pos': 'atf',
-            'rp_floor': '0.01',
             'rp_secure': /[01]/,
             'rand': '0.1',
             'tk_flint': INTEGRATION,
@@ -587,7 +665,7 @@ describe('the rubicon adapter', function () {
 
         it('should add referer info to request data', function () {
           let refererInfo = {
-            referer: 'https://www.prebid.org',
+            page: 'https://www.prebid.org',
             reachedTop: true,
             numIframes: 1,
             stack: [
@@ -604,29 +682,20 @@ describe('the rubicon adapter', function () {
           expect(parseQuery(request.data).rf).to.equal('https://www.prebid.org');
         });
 
-        it('page_url should use params.referrer, config.getConfig("pageUrl"), bidderRequest.refererInfo in that order', function () {
+        it('page_url should use params.referrer, bidderRequest.refererInfo in that order', function () {
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           expect(parseQuery(request.data).rf).to.equal('localhost');
 
           delete bidderRequest.bids[0].params.referrer;
-          let refererInfo = { referer: 'https://www.prebid.org' };
+          let refererInfo = {page: 'https://www.prebid.org'};
           bidderRequest = Object.assign({refererInfo}, bidderRequest);
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           expect(parseQuery(request.data).rf).to.equal('https://www.prebid.org');
 
-          let origGetConfig = config.getConfig;
-          sandbox.stub(config, 'getConfig').callsFake(function (key) {
-            if (key === 'pageUrl') {
-              return 'https://www.rubiconproject.com';
-            }
-            return origGetConfig.apply(config, arguments);
-          });
-          [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(parseQuery(request.data).rf).to.equal('https://www.rubiconproject.com');
-
+          bidderRequest.refererInfo.page = 'http://www.prebid.org';
           bidderRequest.bids[0].params.secure = true;
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(parseQuery(request.data).rf).to.equal('https://www.rubiconproject.com');
+          expect(parseQuery(request.data).rf).to.equal('https://www.prebid.org');
         });
 
         it('should use rubicon sizes if present (including non-mappable sizes)', function () {
@@ -668,233 +737,6 @@ describe('the rubicon adapter', function () {
           expect(data['rp_floor']).to.equal('2');
         });
 
-        it('should send digitrust params', function () {
-          window.DigiTrust = {
-            getUser: function () {
-            }
-          };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
-            ({
-              success: true,
-              identity: {
-                privacy: {optout: false},
-                id: 'testId',
-                keyv: 'testKeyV'
-              }
-            })
-          );
-
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
-
-          let expectedQuery = {
-            'dt.id': 'testId',
-            'dt.keyv': 'testKeyV',
-            'dt.pref': '0'
-          };
-
-          // test that all values above are both present and correct
-          Object.keys(expectedQuery).forEach(key => {
-            let value = expectedQuery[key];
-            expect(data[key]).to.equal(value);
-          });
-
-          delete window.DigiTrust;
-        });
-
-        it('should not send digitrust params when DigiTrust not loaded', function () {
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
-
-          let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-          // Test that none of the DigiTrust keys are part of the query
-          undefinedKeys.forEach(key => {
-            expect(typeof data[key]).to.equal('undefined');
-          });
-        });
-
-        it('should not send digitrust params due to optout', function () {
-          window.DigiTrust = {
-            getUser: function () {
-            }
-          };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
-            ({
-              success: true,
-              identity: {
-                privacy: {optout: true},
-                id: 'testId',
-                keyv: 'testKeyV'
-              }
-            })
-          );
-
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
-
-          let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-          // Test that none of the DigiTrust keys are part of the query
-          undefinedKeys.forEach(key => {
-            expect(typeof data[key]).to.equal('undefined');
-          });
-
-          delete window.DigiTrust;
-        });
-
-        it('should not send digitrust params due to failure', function () {
-          window.DigiTrust = {
-            getUser: function () {
-            }
-          };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
-            ({
-              success: false,
-              identity: {
-                privacy: {optout: false},
-                id: 'testId',
-                keyv: 'testKeyV'
-              }
-            })
-          );
-
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
-
-          let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-          // Test that none of the DigiTrust keys are part of the query
-          undefinedKeys.forEach(key => {
-            expect(typeof data[key]).to.equal('undefined');
-          });
-
-          delete window.DigiTrust;
-        });
-
-        describe('digiTrustId config', function () {
-          beforeEach(function () {
-            window.DigiTrust = {
-              getUser: sandbox.spy()
-            };
-          });
-
-          afterEach(function () {
-            delete window.DigiTrust;
-          });
-
-          it('should send digiTrustId config params', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              var config = {
-                digiTrustId: {
-                  success: true,
-                  identity: {
-                    privacy: {optout: false},
-                    id: 'testId',
-                    keyv: 'testKeyV'
-                  }
-                }
-              };
-              return config[key];
-            });
-
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-
-            let expectedQuery = {
-              'dt.id': 'testId',
-              'dt.keyv': 'testKeyV'
-            };
-
-            // test that all values above are both present and correct
-            Object.keys(expectedQuery).forEach(key => {
-              let value = expectedQuery[key];
-              expect(data[key]).to.equal(value);
-            });
-
-            // should not have called DigiTrust.getUser()
-            expect(window.DigiTrust.getUser.notCalled).to.equal(true);
-          });
-
-          it('should not send digiTrustId config params due to optout', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              var config = {
-                digiTrustId: {
-                  success: true,
-                  identity: {
-                    privacy: {optout: true},
-                    id: 'testId',
-                    keyv: 'testKeyV'
-                  }
-                }
-              }
-              return config[key];
-            });
-
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-
-            let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-            // Test that none of the DigiTrust keys are part of the query
-            undefinedKeys.forEach(key => {
-              expect(typeof data[key]).to.equal('undefined');
-            });
-
-            // should not have called DigiTrust.getUser()
-            expect(window.DigiTrust.getUser.notCalled).to.equal(true);
-          });
-
-          it('should not send digiTrustId config params due to failure', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              var config = {
-                digiTrustId: {
-                  success: false,
-                  identity: {
-                    privacy: {optout: false},
-                    id: 'testId',
-                    keyv: 'testKeyV'
-                  }
-                }
-              }
-              return config[key];
-            });
-
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-
-            let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-            // Test that none of the DigiTrust keys are part of the query
-            undefinedKeys.forEach(key => {
-              expect(typeof data[key]).to.equal('undefined');
-            });
-
-            // should not have called DigiTrust.getUser()
-            expect(window.DigiTrust.getUser.notCalled).to.equal(true);
-          });
-
-          it('should not send digiTrustId config params if they do not exist', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              var config = {};
-              return config[key];
-            });
-
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-
-            let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-            // Test that none of the DigiTrust keys are part of the query
-            undefinedKeys.forEach(key => {
-              expect(typeof data[key]).to.equal('undefined');
-            });
-
-            // should have called DigiTrust.getUser() once
-            expect(window.DigiTrust.getUser.calledOnce).to.equal(true);
-          });
-        });
-
         describe('GDPR consent config', function () {
           it('should send "gdpr" and "gdpr_consent", when gdprConsent defines consentString and gdprApplies', function () {
             createGdprBidderRequest(true);
@@ -1017,42 +859,86 @@ describe('the rubicon adapter', function () {
             });
           });
 
-          it('should use first party data from getConfig over the bid params, if present', () => {
-            const context = {
-              keywords: ['e', 'f'],
-              rating: '4-star'
+          it('should merge first party data from getConfig with the bid params, if present', () => {
+            const site = {
+              keywords: 'e,f',
+              rating: '4-star',
+              ext: {
+                data: {
+                  page: 'home'
+                }
+              },
+              content: {
+                data: [{
+                  'name': 'www.dataprovider1.com',
+                  'ext': { 'segtax': 1 },
+                  'segment': [
+                    { 'id': '987' }
+		    ]
+		  }, {
+		    'name': 'www.dataprovider1.com',
+		    'ext': { 'segtax': 2 },
+		    'segment': [
+		      { 'id': '432' }
+		    ]
+                }, {
+                  'name': 'www.dataprovider1.com',
+                  'ext': { 'segtax': 5 },
+                  'segment': [
+                    { 'id': '55' }
+                  ]
+                }, {
+                  'name': 'www.dataprovider1.com',
+                  'ext': { 'segtax': 6 },
+                  'segment': [
+                    { 'id': '66' }
+                  ]
+                }
+                ]
+              }
             };
             const user = {
-              keywords: ['d'],
+              data: [{
+                'name': 'www.dataprovider1.com',
+                'ext': { 'segtax': 4 },
+                'segment': [
+                  { 'id': '687' },
+                  { 'id': '123' }
+                ]
+              }],
               gender: 'M',
               yob: '1984',
-              geo: { country: 'ca' }
+              geo: {country: 'ca'},
+              keywords: 'd',
+              ext: {
+                data: {
+                  age: 40
+                }
+              }
             };
 
-            sandbox.stub(config, 'getConfig').callsFake(key => {
-              const config = {
-                fpd: {
-                  context,
-                  user
-                }
-              };
-              return utils.deepAccess(config, key);
-            });
+            const ortb2 = {
+              site,
+              user
+            }
 
             const expectedQuery = {
-              'kw': 'a,b,c,d,e,f',
+              'kw': 'a,b,c,d',
               'tg_v.ucat': 'new',
               'tg_v.lastsearch': 'iphone',
               'tg_v.likes': 'sports,video games',
               'tg_v.gender': 'M',
+              'tg_v.age': '40',
+              'tg_v.iab': '687,123',
+              'tg_i.iab': '987,432,55,66',
               'tg_v.yob': '1984',
-              'tg_v.geo': '{"country":"ca"}',
-              'tg_i.rating': '4-star',
+              'tg_i.rating': '4-star,5-star',
+              'tg_i.page': 'home',
               'tg_i.prodtype': 'tech,mobile',
             };
 
             // get the built request
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            let [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({...b, ortb2})), bidderRequest);
             let data = parseQuery(request.data);
 
             // make sure that tg_v, tg_i, and kw values are correct
@@ -1067,12 +953,7 @@ describe('the rubicon adapter', function () {
           it('should group all bid requests with the same site id', function () {
             sandbox.stub(Math, 'random').callsFake(() => 0.1);
 
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              const config = {
-                'rubicon.singleRequest': true
-              };
-              return config[key];
-            });
+            config.setConfig({rubicon: {singleRequest: true}});
 
             const expectedQuery = {
               'account_id': '14062',
@@ -1081,7 +962,6 @@ describe('the rubicon adapter', function () {
               'size_id': '15',
               'alt_size_ids': '43',
               'p_pos': 'atf',
-              'rp_floor': '0.01',
               'rp_secure': /[01]/,
               'rand': '0.1',
               'tk_flint': INTEGRATION,
@@ -1180,13 +1060,7 @@ describe('the rubicon adapter', function () {
           });
 
           it('should not send more than 10 bids in a request (split into separate requests with <= 10 bids each)', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              const config = {
-                'rubicon.singleRequest': true
-              };
-              return config[key];
-            });
-
+            config.setConfig({rubicon: {singleRequest: true}});
             let serverRequests;
             let data;
 
@@ -1228,12 +1102,7 @@ describe('the rubicon adapter', function () {
           });
 
           it('should not group bid requests if singleRequest does not equal true', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              const config = {
-                'rubicon.singleRequest': false
-              };
-              return config[key];
-            });
+            config.setConfig({rubicon: {singleRequest: false}});
 
             const bidCopy = utils.deepClone(bidderRequest.bids[0]);
             bidderRequest.bids.push(bidCopy);
@@ -1251,12 +1120,7 @@ describe('the rubicon adapter', function () {
           });
 
           it('should not group video bid requests', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              const config = {
-                'rubicon.singleRequest': true
-              };
-              return config[key];
-            });
+            config.setConfig({rubicon: {singleRequest: true}});
 
             const bidCopy = utils.deepClone(bidderRequest.bids[0]);
             bidderRequest.bids.push(bidCopy);
@@ -1300,33 +1164,39 @@ describe('the rubicon adapter', function () {
           });
         });
 
-        describe('user id config', function() {
-          it('should send tpid_tdid when userId defines tdid', function () {
+        describe('user id config', function () {
+          it('should send tpid_tdid when userIdAsEids contains unifiedId', function () {
             const clonedBid = utils.deepClone(bidderRequest.bids[0]);
             clonedBid.userId = {
               tdid: 'abcd-efgh-ijkl-mnop-1234'
             };
+            clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
             let [request] = spec.buildRequests([clonedBid], bidderRequest);
             let data = parseQuery(request.data);
 
             expect(data['tpid_tdid']).to.equal('abcd-efgh-ijkl-mnop-1234');
+            expect(data['eid_adserver.org']).to.equal('abcd-efgh-ijkl-mnop-1234');
           });
 
           describe('LiveIntent support', function () {
-            it('should send tpid_liveintent.com when userId defines lipd', function () {
+            it('should send tpid_liveintent.com when userIdAsEids contains liveintentId', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               clonedBid.userId = {
                 lipb: {
-                  lipbid: '0000-1111-2222-3333'
+                  lipbid: '0000-1111-2222-3333',
+                  segments: ['segA', 'segB']
                 }
               };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
               let data = parseQuery(request.data);
 
               expect(data['tpid_liveintent.com']).to.equal('0000-1111-2222-3333');
+              expect(data['eid_liveintent.com']).to.equal('0000-1111-2222-3333');
+              expect(data['tg_v.LIseg']).to.equal('segA,segB');
             });
 
-            it('should send tg_v.LIseg when userId defines lipd.segments', function () {
+            it('should send tg_v.LIseg when userIdAsEids contains liveintentId with ext.segments as array', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               clonedBid.userId = {
                 lipb: {
@@ -1334,6 +1204,7 @@ describe('the rubicon adapter', function () {
                   segments: ['segD', 'segE']
                 }
               };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
               const unescapedData = unescape(request.data);
 
@@ -1343,49 +1214,275 @@ describe('the rubicon adapter', function () {
           });
 
           describe('LiveRamp support', function () {
-            it('should send tpid_liveramp.com when userId defines idl_env', function () {
+            it('should send x_liverampidl when userIdAsEids contains liverampId', function () {
               const clonedBid = utils.deepClone(bidderRequest.bids[0]);
               clonedBid.userId = {
                 idl_env: '1111-2222-3333-4444'
               };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
               let data = parseQuery(request.data);
 
-              expect(data['tpid_liveramp.com']).to.equal('1111-2222-3333-4444');
+              expect(data['x_liverampidl']).to.equal('1111-2222-3333-4444');
             });
           });
-        })
+
+          describe('pubcid support', function () {
+            it('should send eid_pubcid.org when userIdAsEids contains pubcid', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                pubcid: '1111'
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_pubcid.org']).to.equal('1111^1');
+            });
+          });
+
+          describe('Criteo support', function () {
+            it('should send eid_criteo.com when userIdAsEids contains criteo', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                criteoId: '1111'
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_criteo.com']).to.equal('1111^1');
+            });
+          });
+
+          describe('pubProvidedId support', function () {
+            it('should send pubProvidedId when userIdAsEids contains pubProvidedId ids', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                pubProvidedId: [{
+                  source: 'example.com',
+                  uids: [{
+                    id: '11111',
+                    ext: {
+                      stype: 'ppuid'
+                    }
+                  }]
+                }, {
+                  source: 'id-partner.com',
+                  uids: [{
+                    id: '222222'
+                  }]
+                }]
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['ppuid']).to.equal('11111');
+            });
+          });
+
+          describe('ID5 support', function () {
+            it('should send ID5 id when userIdAsEids contains ID5', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                id5id: {
+                  uid: '11111',
+                  ext: {
+                    linkType: '22222'
+                  }
+                }
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_id5-sync.com']).to.equal('11111^1^22222');
+            });
+          });
+
+          describe('UserID catchall support', function () {
+            it('should send user id with generic format', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              // Hardcoding userIdAsEids since createEidsArray returns empty array if source not found in eids.js
+              clonedBid.userIdAsEids = [{
+                source: 'catchall',
+                uids: [{
+                  id: '11111',
+                  atype: 2
+                }]
+              }]
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_catchall']).to.equal('11111^2');
+            });
+          });
+
+          describe('Config user.id support', function () {
+            it('should send ppuid when config defines user.id', function () {
+              config.setConfig({user: {id: '123'}});
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                pubcid: '1111'
+              };
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['ppuid']).to.equal('123');
+            });
+          });
+        });
 
         describe('Prebid AdSlot', function () {
           beforeEach(function () {
             // enforce that the bid at 0 does not have a 'context' property
-            if (bidderRequest.bids[0].hasOwnProperty('fpd')) {
-              delete bidderRequest.bids[0].fpd;
+            if (bidderRequest.bids[0].hasOwnProperty('ortb2Imp')) {
+              delete bidderRequest.bids[0].ortb2Imp;
             }
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code\" if \"fpd.context\" object is not valid', function () {
+          it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data\" object is not valid', function () {
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
             const data = parseQuery(request.data);
 
             expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
+            expect(data).to.not.have.property('tg_i.pbadslot’');
+          });
+
+          it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data.pbadslot\" is undefined', function () {
+            bidderRequest.bids[0].ortb2Imp = {};
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.not.have.property('tg_i.pbadslot’');
+          });
+
+          it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data.pbadslot\" value is an empty string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: ''
+                }
+              }
+            };
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.not.have.property('tg_i.pbadslot');
+          });
+
+          it('should send \"tg_i.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a valid string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: 'abc'
+                }
+              }
+            }
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.have.property('tg_i.pbadslot');
+            expect(data['tg_i.pbadslot']).to.equal('abc');
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.pbAdSlot\" is undefined', function () {
-            bidderRequest.bids[0].fpd = {};
+          it('should send \"tg_i.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a valid string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: '/a/b/c'
+                }
+              }
+            }
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.have.property('tg_i.pbadslot');
+            expect(data['tg_i.pbadslot']).to.equal('/a/b/c');
+          });
+
+          it('should send gpid as p_gpid if valid', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                gpid: '/1233/sports&div1'
+              }
+            }
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.have.property('p_gpid');
+            expect(data['p_gpid']).to.equal('/1233/sports&div1');
+          });
+
+          it('should send gpid and pbadslot since it is prefered over dfp code', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                gpid: '/1233/sports&div1',
+                data: {
+                  pbadslot: 'pb_slot',
+                  adserver: {
+                    adslot: '/1234/sports',
+                    name: 'gam'
+                  }
+                }
+              }
+            }
 
             const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
             const data = parseQuery(request.data);
 
             expect(data).to.be.an('Object');
+            expect(data['p_gpid']).to.equal('/1233/sports&div1');
             expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
+            expect(data['tg_i.pbadslot']).to.equal('pb_slot');
+          });
+        });
+
+        describe('GAM ad unit', function () {
+          beforeEach(function () {
+            // enforce that the bid at 0 does not have a 'context' property
+            if (bidderRequest.bids[0].hasOwnProperty('ortb2Imp')) {
+              delete bidderRequest.bids[0].ortb2Imp;
+            }
+          });
+
+          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data\" object is not valid', function () {
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code’');
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.pbAdSlot\" value is an empty string', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: ''
+          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data.adServer.adslot\" is undefined', function () {
+            bidderRequest.bids[0].ortb2Imp = {};
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code’');
+          });
+
+          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data.adServer.adslot\" value is an empty string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    adslot: ''
+                  }
+                }
               }
             };
 
@@ -1396,10 +1493,15 @@ describe('the rubicon adapter', function () {
             expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
           });
 
-          it('should send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.pbAdSlot\" value is a valid string', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: 'abc'
+          it('should send NOT \"tg_i.dfp_ad_unit_code\" if \"ortb2Imp.ext.data.adServer.adslot\" value is a valid string but not gam', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    adslot: '/a/b/c',
+                    name: 'not gam'
+                  }
+                }
               }
             }
 
@@ -1407,14 +1509,18 @@ describe('the rubicon adapter', function () {
             const data = parseQuery(request.data);
 
             expect(data).to.be.an('Object');
-            expect(data).to.have.property('tg_i.dfp_ad_unit_code');
-            expect(data['tg_i.dfp_ad_unit_code']).to.equal('abc');
+            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
           });
 
-          it('should send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.pbAdSlot\" value is a valid string, but all leading slash characters should be removed', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: '/a/b/c'
+          it('should send \"tg_i.dfp_ad_unit_code\" if \"ortb2Imp.ext.data.adServer.adslot\" value is a valid string and name is gam', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    name: 'gam',
+                    adslot: '/a/b/c'
+                  }
+                }
               }
             };
 
@@ -1423,7 +1529,7 @@ describe('the rubicon adapter', function () {
 
             expect(data).to.be.an('Object');
             expect(data).to.have.property('tg_i.dfp_ad_unit_code');
-            expect(data['tg_i.dfp_ad_unit_code']).to.equal('a/b/c');
+            expect(data['tg_i.dfp_ad_unit_code']).to.equal('/a/b/c');
           });
         });
       });
@@ -1439,11 +1545,11 @@ describe('the rubicon adapter', function () {
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           let post = request.data;
 
-          expect(post).to.have.property('imp')
+          expect(post).to.have.property('imp');
           // .with.length.of(1);
           let imp = post.imp[0];
           expect(imp.id).to.equal(bidderRequest.bids[0].adUnitCode);
-          expect(imp.exp).to.equal(300);
+          expect(imp.exp).to.equal(undefined); // now undefined
           expect(imp.video.w).to.equal(640);
           expect(imp.video.h).to.equal(480);
           expect(imp.video.pos).to.equal(1);
@@ -1462,20 +1568,42 @@ describe('the rubicon adapter', function () {
           expect(imp.ext.rubicon.video.skip).to.equal(1);
           expect(imp.ext.rubicon.video.skipafter).to.equal(15);
           expect(imp.ext.prebid.auctiontimestamp).to.equal(1472239426000);
+          // should contain version
+          expect(post.ext.prebid.channel).to.deep.equal({name: 'pbjs', version: 'v$prebid.version$'});
           expect(post.user.ext.consent).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
+          // EIDs should exist
+          expect(post.user.ext).to.have.property('eids').that.is.an('array');
+          // LiveIntent should exist
           expect(post.user.ext.eids[0].source).to.equal('liveintent.com');
           expect(post.user.ext.eids[0].uids[0].id).to.equal('0000-1111-2222-3333');
-          expect(post.user.ext.tpid).that.is.an('object');
-          expect(post.user.ext.tpid.source).to.equal('liveintent.com');
-          expect(post.user.ext.tpid.uid).to.equal('0000-1111-2222-3333');
+          expect(post.user.ext.eids[0].uids[0].atype).to.equal(3);
+          expect(post.user.ext.eids[0]).to.have.property('ext').that.is.an('object');
+          expect(post.user.ext.eids[0].ext).to.have.property('segments').that.is.an('array');
+          expect(post.user.ext.eids[0].ext.segments[0]).to.equal('segA');
+          expect(post.user.ext.eids[0].ext.segments[1]).to.equal('segB');
           // LiveRamp should exist
           expect(post.user.ext.eids[1].source).to.equal('liveramp.com');
           expect(post.user.ext.eids[1].uids[0].id).to.equal('1111-2222-3333-4444');
-          expect(post.rp).that.is.an('object');
-          expect(post.rp.target).that.is.an('object');
-          expect(post.rp.target.LIseg).that.is.an('array');
-          expect(post.rp.target.LIseg[0]).to.equal('segA');
-          expect(post.rp.target.LIseg[1]).to.equal('segB');
+          expect(post.user.ext.eids[1].uids[0].atype).to.equal(3);
+          // UnifiedId should exist
+          expect(post.user.ext.eids[2].source).to.equal('adserver.org');
+          expect(post.user.ext.eids[2].uids[0].atype).to.equal(1);
+          expect(post.user.ext.eids[2].uids[0].id).to.equal('3000');
+          // PubCommonId should exist
+          expect(post.user.ext.eids[3].source).to.equal('pubcid.org');
+          expect(post.user.ext.eids[3].uids[0].atype).to.equal(1);
+          expect(post.user.ext.eids[3].uids[0].id).to.equal('4000');
+          // example should exist
+          expect(post.user.ext.eids[4].source).to.equal('example.com');
+          expect(post.user.ext.eids[4].uids[0].id).to.equal('333333');
+          // id-partner.com
+          expect(post.user.ext.eids[5].source).to.equal('id-partner.com');
+          expect(post.user.ext.eids[5].uids[0].id).to.equal('4444444');
+          // CriteoId should exist
+          expect(post.user.ext.eids[6].source).to.equal('criteo.com');
+          expect(post.user.ext.eids[6].uids[0].id).to.equal('1111');
+          expect(post.user.ext.eids[6].uids[0].atype).to.equal(1);
+
           expect(post.regs.ext.gdpr).to.equal(1);
           expect(post.regs.ext.us_privacy).to.equal('1NYN');
           expect(post).to.have.property('ext').that.is.an('object');
@@ -1487,16 +1615,68 @@ describe('the rubicon adapter', function () {
           expect(post.ext.prebid.bidders.rubicon.integration).to.equal(PBS_INTEGRATION);
         });
 
+        describe('ortb2imp sent to video bids', function () {
+          beforeEach(function () {
+            // initialize
+            if (bidderRequest.bids[0].hasOwnProperty('ortb2Imp')) {
+              delete bidderRequest.bids[0].ortb2Imp;
+            }
+          });
+
+          it('should add ortb values to video requests', function () {
+            createVideoBidderRequest();
+
+            sandbox.stub(Date, 'now').callsFake(() =>
+              bidderRequest.auctionStart + 100
+            );
+
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                gpid: '/test/gpid',
+                data: {
+                  pbadslot: '/test/pbadslot'
+                },
+                prebid: {
+                  storedauctionresponse: {
+                    id: 'sample_video_response'
+                  }
+                }
+              }
+            }
+
+            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            let post = request.data;
+
+            expect(post).to.have.property('imp');
+            // .with.length.of(1);
+            let imp = post.imp[0];
+            expect(imp.ext.gpid).to.equal('/test/gpid');
+            expect(imp.ext.data.pbadslot).to.equal('/test/pbadslot');
+            expect(imp.ext.prebid.storedauctionresponse.id).to.equal('sample_video_response');
+          });
+        });
+
         it('should correctly set bidfloor on imp when getfloor in scope', function () {
           createVideoBidderRequest();
           // default getFloor response is empty object so should not break and not send hard_floor
           bidderRequest.bids[0].getFloor = () => getFloorResponse;
+          sinon.spy(bidderRequest.bids[0], 'getFloor');
+
           sandbox.stub(Date, 'now').callsFake(() =>
             bidderRequest.auctionStart + 100
           );
 
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
+          // make sure banner bid called with right stuff
+          expect(
+            bidderRequest.bids[0].getFloor.calledWith({
+              currency: 'USD',
+              mediaType: 'video',
+              size: [640, 480]
+            })
+          ).to.be.true;
+
           // not an object should work and not send
           expect(request.data.imp[0].bidfloor).to.be.undefined;
 
@@ -1520,7 +1700,31 @@ describe('the rubicon adapter', function () {
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           expect(request.data.imp[0].bidfloor).to.equal(1.23);
         });
-        it('should add alias name to PBS Request', function() {
+
+        it('should continue with auction and log error if getFloor throws one', function () {
+          createVideoBidderRequest();
+          // default getFloor response is empty object so should not break and not send hard_floor
+          bidderRequest.bids[0].getFloor = () => {
+            throw new Error('An exception!');
+          };
+          sandbox.stub(Date, 'now').callsFake(() =>
+            bidderRequest.auctionStart + 100
+          );
+
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          // log error called
+          expect(logErrorSpy.calledOnce).to.equal(true);
+
+          // should have an imp
+          expect(request.data.imp).to.exist.and.to.be.a('array');
+          expect(request.data.imp).to.have.lengthOf(1);
+
+          // should be NO bidFloor
+          expect(request.data.imp[0].bidfloor).to.be.undefined;
+        });
+
+        it('should add alias name to PBS Request', function () {
           createVideoBidderRequest();
 
           bidderRequest.bidderCode = 'superRubicon';
@@ -1536,7 +1740,109 @@ describe('the rubicon adapter', function () {
           expect(request.data.imp[0].ext).to.not.haveOwnProperty('rubicon');
         });
 
-        it('should send correct bidfloor to PBS', function() {
+        it('should add floors flag correctly to PBS Request', function () {
+          createVideoBidderRequest();
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          // should not pass if undefined
+          expect(request.data.ext.prebid.floors).to.be.undefined;
+
+          // should pass it as false
+          bidderRequest.bids[0].floorData = {
+            skipped: false,
+            location: 'fetch',
+          }
+          let [newRequest] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          expect(newRequest.data.ext.prebid.floors).to.deep.equal({ enabled: false });
+        });
+
+        it('should add multibid configuration to PBS Request', function () {
+          createVideoBidderRequest();
+
+          const multibid = [{
+            bidder: 'bidderA',
+            maxBids: 2
+          }, {
+            bidder: 'bidderB',
+            maxBids: 2
+          }];
+          const expected = [{
+            bidder: 'bidderA',
+            maxbids: 2
+          }, {
+            bidder: 'bidderB',
+            maxbids: 2
+          }];
+
+          config.setConfig({multibid: multibid});
+
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          // should have the aliases object sent to PBS
+          expect(request.data.ext.prebid).to.haveOwnProperty('multibid');
+          expect(request.data.ext.prebid.multibid).to.deep.equal(expected);
+        });
+
+        it('should pass client analytics to PBS endpoint if all modules included', function () {
+          createVideoBidderRequest();
+          $$PREBID_GLOBAL$$.installedModules = [];
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let payload = request.data;
+
+          expect(payload.ext.prebid.analytics).to.not.be.undefined;
+          expect(payload.ext.prebid.analytics).to.deep.equal({'rubicon': {'client-analytics': true}});
+        });
+
+        it('should pass client analytics to PBS endpoint if rubicon analytics adapter is included', function () {
+          createVideoBidderRequest();
+          $$PREBID_GLOBAL$$.installedModules = ['rubiconBidAdapter', 'rubiconAnalyticsAdapter'];
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let payload = request.data;
+
+          expect(payload.ext.prebid.analytics).to.not.be.undefined;
+          expect(payload.ext.prebid.analytics).to.deep.equal({'rubicon': {'client-analytics': true}});
+        });
+
+        it('should not pass client analytics to PBS endpoint if rubicon analytics adapter is not included', function () {
+          createVideoBidderRequest();
+          $$PREBID_GLOBAL$$.installedModules = ['rubiconBidAdapter'];
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let payload = request.data;
+
+          expect(payload.ext.prebid.analytics).to.be.undefined;
+        });
+
+        it('should send video exp param correctly when set', function () {
+          createVideoBidderRequest();
+          config.setConfig({s2sConfig: {defaultTtl: 600}});
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let post = request.data;
+
+          // should exp set to the right value according to config
+          let imp = post.imp[0];
+          expect(imp.exp).to.equal(600);
+        });
+
+        it('should not send video exp at all if not set in s2sConfig config', function () {
+          createVideoBidderRequest();
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let post = request.data;
+
+          // should exp set to the right value according to config
+          let imp = post.imp[0];
+          // bidderFactory stringifies request body before sending so removes undefined attributes:
+          expect(imp.exp).to.equal(undefined);
+        });
+
+        it('should send tmax as the bidderRequest timeout value', function () {
+          createVideoBidderRequest();
+          bidderRequest.timeout = 3333;
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let post = request.data;
+          expect(post.tmax).to.equal(3333);
+        });
+
+        it('should send correct bidfloor to PBS', function () {
           createVideoBidderRequest();
 
           bidderRequest.bids[0].params.floor = 0.1;
@@ -1663,16 +1969,6 @@ describe('the rubicon adapter', function () {
           delete bidderRequest.bids[0].mediaTypes.video.protocols;
           expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
 
-          // change maxduration to an string, no good
-          createVideoBidderRequest();
-          bidderRequest.bids[0].mediaTypes.video.maxduration = 'string';
-          expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
-
-          // delete maxduration, no good
-          createVideoBidderRequest();
-          delete bidderRequest.bids[0].mediaTypes.video.maxduration;
-          expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
-
           // change linearity to an string, no good
           createVideoBidderRequest();
           bidderRequest.bids[0].mediaTypes.video.linearity = 'string';
@@ -1726,14 +2022,14 @@ describe('the rubicon adapter', function () {
           let requests = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
           expect(requests.length).to.equal(1);
-          expect(requests[0].url).to.equal(FASTLANE_ENDPOINT);
+          expect(requests[0].url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
 
           bidderRequest.mediaTypes.video.context = 'instream';
 
           requests = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
           expect(requests.length).to.equal(1);
-          expect(requests[0].url).to.equal(FASTLANE_ENDPOINT);
+          expect(requests[0].url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
         });
 
         it('should send request as banner when invalid video bid in multiple mediaType bidRequest', function () {
@@ -1752,7 +2048,7 @@ describe('the rubicon adapter', function () {
 
           let requests = spec.buildRequests(bidRequestCopy.bids, bidRequestCopy);
           expect(requests.length).to.equal(1);
-          expect(requests[0].url).to.equal(FASTLANE_ENDPOINT);
+          expect(requests[0].url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
         });
 
         it('should include coppa flag in video bid request', () => {
@@ -1776,62 +2072,110 @@ describe('the rubicon adapter', function () {
         it('should include first party data', () => {
           createVideoBidderRequest();
 
-          const context = {
-            keywords: ['e', 'f'],
-            rating: '4-star'
+          const site = {
+            ext: {
+              data: {
+                page: 'home'
+              }
+            },
+            content: {
+              data: [{foo: 'bar'}]
+            },
+            keywords: 'e,f',
+            rating: '4-star',
+            data: [{foo: 'bar'}]
           };
           const user = {
-            keywords: ['d'],
+            ext: {
+              data: {
+                age: 31
+              }
+            },
+            keywords: 'd',
             gender: 'M',
             yob: '1984',
-            geo: { country: 'ca' }
+            geo: {country: 'ca'},
+            data: [{foo: 'bar'}]
           };
 
-          sandbox.stub(config, 'getConfig').callsFake(key => {
-            const config = {
-              fpd: {
-                context,
-                user
-              }
-            };
-            return utils.deepAccess(config, key);
-          });
+          const ortb2 = {
+            site,
+            user
+          };
 
-          const expected = [{
-            bidders: [ 'rubicon' ],
-            config: {
-              fpd: {
-                site: Object.assign({}, bidderRequest.bids[0].params.inventory, context),
-                user: Object.assign({}, bidderRequest.bids[0].params.visitor, user)
+          const [request] = spec.buildRequests(bidderRequest.bids.map((b) => ({...b, ortb2})), bidderRequest);
+
+          const expected = {
+            site: Object.assign({}, site, {keywords: bidderRequest.bids[0].params.keywords.join(',')}),
+            user: Object.assign({}, user),
+            siteData: Object.assign({}, site.ext.data, bidderRequest.bids[0].params.inventory),
+            userData: Object.assign({}, user.ext.data, bidderRequest.bids[0].params.visitor),
+          };
+
+          delete request.data.site.page;
+          delete request.data.site.content.language;
+
+          expect(request.data.site.keywords).to.deep.equal('a,b,c');
+          expect(request.data.user.keywords).to.deep.equal('d');
+          expect(request.data.site.ext.data).to.deep.equal(expected.siteData);
+          expect(request.data.user.ext.data).to.deep.equal(expected.userData);
+        });
+
+        it('should include pbadslot in bid request', function () {
+          createVideoBidderRequest();
+          bidderRequest.bids[0].ortb2Imp = {
+            ext: {
+              data: {
+                pbadslot: '1234567890'
               }
             }
-          }];
+          }
+
+          sandbox.stub(Date, 'now').callsFake(() =>
+            bidderRequest.auctionStart + 100
+          );
 
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(request.data.ext.prebid.bidderconfig).to.deep.equal(expected);
+          expect(request.data.imp[0].ext.data.pbadslot).to.equal('1234567890');
         });
 
-        it('should include storedAuctionResponse in video bid request', function () {
+        it('should NOT include storedrequests in pbs payload', function () {
           createVideoBidderRequest();
+          bidderRequest.bids[0].ortb2 = {
+            ext: {
+              prebid: {
+                storedrequest: 'no-send-top-level-sr'
+              }
+            }
+          }
+
+          bidderRequest.bids[0].ortb2Imp = {
+            ext: {
+              prebid: {
+                storedrequest: 'no-send-imp-sr'
+              }
+            }
+          }
 
           sandbox.stub(Date, 'now').callsFake(() =>
             bidderRequest.auctionStart + 100
           );
 
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(request.data.imp).to.exist.and.to.be.a('array');
-          expect(request.data.imp).to.have.lengthOf(1);
-          expect(request.data.imp[0].ext).to.exist.and.to.be.a('object');
-          expect(request.data.imp[0].ext.prebid).to.exist.and.to.be.a('object');
-          expect(request.data.imp[0].ext.prebid.storedauctionresponse).to.exist.and.to.be.a('object');
-          expect(request.data.imp[0].ext.prebid.storedauctionresponse.id).to.equal('11111');
+          expect(request.data.ext.prebid.storedrequest).to.be.undefined;
+          expect(request.data.imp[0].ext.prebid.storedrequest).to.be.undefined;
         });
 
-        it('should include pbAdSlot in bid request', function () {
+        it('should include GAM ad unit in bid request', function () {
           createVideoBidderRequest();
-          bidderRequest.bids[0].fpd = {
-            context: {
-              pbAdSlot: '1234567890'
+          bidderRequest.bids[0].ortb2Imp = {
+            ext: {
+              data: {
+                adserver: {
+                  adslot: '1234567890',
+                  name: 'adServerName1'
+                }
+              }
             }
           };
 
@@ -1840,43 +2184,77 @@ describe('the rubicon adapter', function () {
           );
 
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(request.data.imp[0].ext.context.data.adslot).to.equal('1234567890');
+          expect(request.data.imp[0].ext.data.adserver.adslot).to.equal('1234567890');
+          expect(request.data.imp[0].ext.data.adserver.name).to.equal('adServerName1');
         });
 
         it('should use the integration type provided in the config instead of the default', () => {
           createVideoBidderRequest();
-          sandbox.stub(config, 'getConfig').callsFake(function (key) {
-            const config = {
-              'rubicon.int_type': 'testType'
-            };
-            return config[key];
-          });
+          config.setConfig({rubicon: {int_type: 'testType'}});
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           expect(request.data.ext.prebid.bidders.rubicon.integration).to.equal('testType');
         });
-      });
 
-      it('should include pbAdSlot in bid request', function () {
-        createVideoBidderRequest();
-        bidderRequest.bids[0].fpd = {
-          context: {
-            pbAdSlot: '1234567890'
-          }
-        };
+        it('should pass the user.id provided in the config', function () {
+          config.setConfig({user: {id: '123'}});
+          createVideoBidderRequest();
+
+          sandbox.stub(Date, 'now').callsFake(() =>
+            bidderRequest.auctionStart + 100
+          );
+
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let post = request.data;
+
+          expect(post).to.have.property('imp')
+          // .with.length.of(1);
+          let imp = post.imp[0];
+          expect(imp.id).to.equal(bidderRequest.bids[0].adUnitCode);
+          expect(imp.exp).to.equal(undefined);
+          expect(imp.video.w).to.equal(640);
+          expect(imp.video.h).to.equal(480);
+          expect(imp.video.pos).to.equal(1);
+          expect(imp.video.context).to.equal('instream');
+          expect(imp.video.minduration).to.equal(15);
+          expect(imp.video.maxduration).to.equal(30);
+          expect(imp.video.startdelay).to.equal(0);
+          expect(imp.video.skip).to.equal(1);
+          expect(imp.video.skipafter).to.equal(15);
+          expect(imp.ext.rubicon.video.playerWidth).to.equal(640);
+          expect(imp.ext.rubicon.video.playerHeight).to.equal(480);
+          expect(imp.ext.rubicon.video.size_id).to.equal(201);
+          expect(imp.ext.rubicon.video.language).to.equal('en');
+          // Also want it to be in post.site.content.language
+          expect(post.site.content.language).to.equal('en');
+          expect(imp.ext.rubicon.video.skip).to.equal(1);
+          expect(imp.ext.rubicon.video.skipafter).to.equal(15);
+          expect(imp.ext.prebid.auctiontimestamp).to.equal(1472239426000);
+          expect(post.user.ext.consent).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
 
-        sandbox.stub(Date, 'now').callsFake(() =>
-          bidderRequest.auctionStart + 100
-        );
+          // Config user.id
+          expect(post.user.id).to.equal('123');
 
-        const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-        expect(request.data.imp[0].ext.context.data.adslot).to.equal('1234567890');
+          expect(post.regs.ext.gdpr).to.equal(1);
+          expect(post.regs.ext.us_privacy).to.equal('1NYN');
+          expect(post).to.have.property('ext').that.is.an('object');
+          expect(post.ext.prebid.targeting.includewinners).to.equal(true);
+          expect(post.ext.prebid).to.have.property('cache').that.is.an('object');
+          expect(post.ext.prebid.cache).to.have.property('vastxml').that.is.an('object');
+          expect(post.ext.prebid.cache.vastxml).to.have.property('returnCreative').that.is.an('boolean');
+          expect(post.ext.prebid.cache.vastxml.returnCreative).to.equal(false);
+          expect(post.ext.prebid.bidders.rubicon.integration).to.equal(PBS_INTEGRATION);
+        })
       });
 
       describe('combineSlotUrlParams', function () {
         it('should combine an array of slot url params', function () {
           expect(spec.combineSlotUrlParams([])).to.deep.equal({});
 
-          expect(spec.combineSlotUrlParams([{p1: 'foo', p2: 'test', p3: ''}])).to.deep.equal({p1: 'foo', p2: 'test', p3: ''});
+          expect(spec.combineSlotUrlParams([{p1: 'foo', p2: 'test', p3: ''}])).to.deep.equal({
+            p1: 'foo',
+            p2: 'test',
+            p3: ''
+          });
 
           expect(spec.combineSlotUrlParams([{}, {p1: 'foo', p2: 'test'}])).to.deep.equal({p1: ';foo', p2: ';test'});
 
@@ -1907,7 +2285,6 @@ describe('the rubicon adapter', function () {
             'size_id': 15,
             'alt_size_ids': '43',
             'p_pos': 'atf',
-            'rp_floor': 0.01,
             'rp_secure': /[01]/,
             'tk_flint': INTEGRATION,
             'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
@@ -1939,61 +2316,54 @@ describe('the rubicon adapter', function () {
         it('should not fail if keywords param is not an array', function () {
           bidderRequest.bids[0].params.keywords = 'a,b,c';
           const slotParams = spec.createSlotParams(bidderRequest.bids[0], bidderRequest);
-          expect(slotParams.kw).to.equal('');
+          expect(slotParams.kw).to.equal('a,b,c');
         });
       });
 
-      describe('hasVideoMediaType', function () {
-        it('should return true if mediaType is video and size_id is set', function () {
+      describe('classifiedAsVideo', function () {
+        it('should return true if mediaTypes is video', function () {
           createVideoBidderRequest();
-          const legacyVideoTypeBidRequest = hasVideoMediaType(bidderRequest.bids[0]);
-          expect(legacyVideoTypeBidRequest).is.equal(true);
+          const bidClassifiedAsVideo = classifiedAsVideo(bidderRequest.bids[0]);
+          expect(bidClassifiedAsVideo).is.equal(true);
         });
 
         it('should return false if trying to use legacy mediaType with video', function () {
           createVideoBidderRequest();
           delete bidderRequest.bids[0].mediaTypes;
           bidderRequest.bids[0].mediaType = 'video';
-          const legacyVideoTypeBidRequest = hasVideoMediaType(bidderRequest.bids[0]);
+          const legacyVideoTypeBidRequest = classifiedAsVideo(bidderRequest.bids[0]);
           expect(legacyVideoTypeBidRequest).is.equal(false);
         });
 
-        it('should return false if bidRequest.mediaType is not equal to video', function () {
-          expect(hasVideoMediaType({
+        it('should return false if bid.mediaTypes is not equal to video', function () {
+          expect(classifiedAsVideo({
             mediaType: 'banner'
           })).is.equal(false);
         });
 
-        it('should return false if bidRequest.mediaType is not defined', function () {
-          expect(hasVideoMediaType({})).is.equal(false);
+        it('should return false if bid.mediaTypes is not defined', function () {
+          expect(classifiedAsVideo({})).is.equal(false);
         });
 
-        it('should return true if bidRequest.mediaTypes.video.context is instream and size_id is defined', function () {
-          expect(hasVideoMediaType({
-            mediaTypes: {
-              video: {
-                context: 'instream'
-              }
-            },
-            params: {
-              video: {
-                size_id: 7
-              }
-            }
-          })).is.equal(true);
+        it('Should return false if both banner and video mediaTypes are set and params.video is not an object', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0];
+          bid.mediaTypes.banner = {flag: true};
+          expect(classifiedAsVideo(bid)).to.equal(false);
+        });
+        it('Should return true if both banner and video mediaTypes are set and params.video is an object', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0];
+          bid.mediaTypes.banner = {flag: true};
+          bid.params.video = {};
+          expect(classifiedAsVideo(bid)).to.equal(true);
         });
 
-        it('should return false if bidRequest.mediaTypes.video.context is instream but size_id is not defined', function () {
-          expect(spec.isBidRequestValid({
-            mediaTypes: {
-              video: {
-                context: 'instream'
-              }
-            },
-            params: {
-              video: {}
-            }
-          })).is.equal(false);
+        it('Should return true and create a params.video object if one is not already present', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0]
+          expect(classifiedAsVideo(bid)).to.equal(true);
+          expect(bid.params.video).to.not.be.undefined;
         });
       });
     });
@@ -2018,6 +2388,7 @@ describe('the rubicon adapter', function () {
                 'impression_id': '153dc240-8229-4604-b8f5-256933b9374c',
                 'size_id': '15',
                 'ad_id': '6',
+                'adomain': ['test.com'],
                 'advertiser': 7,
                 'network': 8,
                 'creative_id': 'crid-9',
@@ -2039,6 +2410,7 @@ describe('the rubicon adapter', function () {
                 'impression_id': '153dc240-8229-4604-b8f5-256933b9374d',
                 'size_id': '43',
                 'ad_id': '7',
+                'adomain': ['test.com'],
                 'advertiser': 7,
                 'network': 8,
                 'creative_id': 'crid-9',
@@ -2073,6 +2445,8 @@ describe('the rubicon adapter', function () {
           expect(bids[0].rubicon.networkId).to.equal(8);
           expect(bids[0].creativeId).to.equal('crid-9');
           expect(bids[0].currency).to.equal('USD');
+          expect(bids[0].meta.mediaType).to.equal('banner');
+          expect(String(bids[0].meta.advertiserDomains)).to.equal('test.com');
           expect(bids[0].ad).to.contain(`alert('foo')`)
             .and.to.contain(`<html>`)
             .and.to.contain(`<div data-rp-impression-id='153dc240-8229-4604-b8f5-256933b9374d'>`);
@@ -2357,6 +2731,146 @@ describe('the rubicon adapter', function () {
           expect(bids[0].cpm).to.be.equal(0);
         });
 
+        it('should create bids with matching requestIds if imp id matches', function () {
+          let bidRequests = [{
+            'bidder': 'rubicon',
+            'params': {
+              'accountId': 1001,
+              'siteId': 12345,
+              'zoneId': 67890,
+              'floor': null
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [[300, 250]]
+              }
+            },
+            'adUnitCode': 'div-gpt-ad-1460505748561-0',
+            'transactionId': '404a7b28-f276-41cc-a5cf-c1d3dc5671f9',
+            'sizes': [[300, 250]],
+            'bidId': '557ba307cef098',
+            'bidderRequestId': '46a00704ffeb7',
+            'auctionId': '3fdc6494-da94-44a0-a292-b55a90b08b2c',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0,
+            'startTime': 1615412098213
+          }, {
+            'bidder': 'rubicon',
+            'params': {
+              'accountId': 1001,
+              'siteId': 12345,
+              'zoneId': 67890,
+              'floor': null
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [[300, 250]]
+              }
+            },
+            'adUnitCode': 'div-gpt-ad-1460505748561-1',
+            'transactionId': '404a7b28-f276-41cc-a5cf-c1d3dc5671f9',
+            'sizes': [[300, 250]],
+            'bidId': '456gt123jkl098',
+            'bidderRequestId': '46a00704ffeb7',
+            'auctionId': '3fdc6494-da94-44a0-a292-b55a90b08b2c',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0,
+            'startTime': 1615412098213
+          }];
+
+          let response = {
+            'status': 'ok',
+            'account_id': 14062,
+            'site_id': 70608,
+            'zone_id': 530022,
+            'size_id': 15,
+            'alt_size_ids': [
+              43
+            ],
+            'tracking': '',
+            'inventory': {},
+            'ads': [
+              {
+                'status': 'ok',
+                'impression_id': '153dc240-8229-4604-b8f5-256933b9374c',
+                'size_id': '15',
+                'ad_id': '6',
+                'advertiser': 7,
+                'network': 8,
+                'creative_id': 'crid-9',
+                'type': 'script',
+                'script': 'alert(\'foo\')',
+                'campaign_id': 10,
+                'cpm': 0.811,
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '15_tier_all_test'
+                    ]
+                  }
+                ]
+              },
+              {
+                'status': 'ok',
+                'impression_id': '153dc240-8229-4604-b8f5-256933b9374c',
+                'size_id': '15',
+                'ad_id': '7',
+                'advertiser': 7,
+                'network': 8,
+                'creative_id': 'crid-9',
+                'type': 'script',
+                'script': 'alert(\'foo\')',
+                'campaign_id': 10,
+                'cpm': 0.911,
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '43_tier_all_test'
+                    ]
+                  }
+                ]
+              },
+              {
+                'status': 'ok',
+                'impression_id': '153dc240-8229-4604-b8f5-256933b9374d',
+                'size_id': '43',
+                'ad_id': '7',
+                'advertiser': 7,
+                'network': 8,
+                'creative_id': 'crid-9',
+                'type': 'script',
+                'script': 'alert(\'foo\')',
+                'campaign_id': 10,
+                'cpm': 1.911,
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '43_tier_all_test'
+                    ]
+                  }
+                ]
+              }
+            ]
+          };
+
+          config.setConfig({ multibid: [{bidder: 'rubicon', maxbids: 2, targetbiddercodeprefix: 'rubi'}] });
+
+          let bids = spec.interpretResponse({body: response}, {
+            bidRequest: bidRequests
+          });
+
+          expect(bids).to.be.lengthOf(3);
+          expect(bids[0].requestId).to.not.equal(bids[1].requestId);
+          expect(bids[1].requestId).to.equal(bids[2].requestId);
+        });
+
         it('should handle an error with no ads returned', function () {
           let response = {
             'status': 'ok',
@@ -2432,7 +2946,7 @@ describe('the rubicon adapter', function () {
             }]
           };
 
-          let bids = spec.interpretResponse({ body: response }, {
+          let bids = spec.interpretResponse({body: response}, {
             bidRequest: [utils.deepClone(bidderRequest.bids[0])]
           });
 
@@ -2443,7 +2957,7 @@ describe('the rubicon adapter', function () {
         describe('singleRequest enabled', function () {
           it('handles bidRequest of type Array and returns associated adUnits', function () {
             const overrideMap = [];
-            overrideMap[0] = { impression_id: '1' };
+            overrideMap[0] = {impression_id: '1'};
 
             const stubAds = [];
             for (let i = 0; i < 10; i++) {
@@ -2465,7 +2979,8 @@ describe('the rubicon adapter', function () {
                 'tracking': '',
                 'inventory': {},
                 'ads': stubAds
-              }}, { bidRequest: stubBids });
+              }
+            }, {bidRequest: stubBids});
             expect(bids).to.be.a('array').with.lengthOf(10);
 
             bids.forEach((bid) => {
@@ -2498,7 +3013,7 @@ describe('the rubicon adapter', function () {
 
           it('handles incorrect adUnits length by returning all bids with matching ads', function () {
             const overrideMap = [];
-            overrideMap[0] = { impression_id: '1' };
+            overrideMap[0] = {impression_id: '1'};
 
             const stubAds = [];
             for (let i = 0; i < 6; i++) {
@@ -2520,7 +3035,8 @@ describe('the rubicon adapter', function () {
                 'tracking': '',
                 'inventory': {},
                 'ads': stubAds
-              }}, { bidRequest: stubBids });
+              }
+            }, {bidRequest: stubBids});
 
             // no bids expected because response didn't match requested bid number
             expect(bids).to.be.a('array').with.lengthOf(6);
@@ -2531,11 +3047,11 @@ describe('the rubicon adapter', function () {
             // Create overrides to break associations between bids and ads
             // Each override should cause one less bid to be returned by interpretResponse
             const overrideMap = [];
-            overrideMap[0] = { impression_id: '1' };
-            overrideMap[2] = { status: 'error' };
-            overrideMap[4] = { status: 'error' };
-            overrideMap[7] = { status: 'error' };
-            overrideMap[8] = { status: 'error' };
+            overrideMap[0] = {impression_id: '1'};
+            overrideMap[2] = {status: 'error'};
+            overrideMap[4] = {status: 'error'};
+            overrideMap[7] = {status: 'error'};
+            overrideMap[8] = {status: 'error'};
 
             for (let i = 0; i < 10; i++) {
               stubAds.push(createResponseAdByIndex(i, sizeMap[i].sizeId, overrideMap));
@@ -2556,7 +3072,8 @@ describe('the rubicon adapter', function () {
                 'tracking': '',
                 'inventory': {},
                 'ads': stubAds
-              }}, { bidRequest: stubBids });
+              }
+            }, {bidRequest: stubBids});
             expect(bids).to.be.a('array').with.lengthOf(6);
 
             bids.forEach((bid) => {
@@ -2603,13 +3120,15 @@ describe('the rubicon adapter', function () {
               bid: [{
                 id: '0',
                 impid: 'instream_video1',
+                adomain: ['test.com'],
                 price: 2,
                 crid: '4259970',
                 ext: {
                   bidder: {
                     rp: {
                       mime: 'application/javascript',
-                      size_id: 201
+                      size_id: 201,
+                      advid: 12345
                     }
                   },
                   prebid: {
@@ -2638,6 +3157,9 @@ describe('the rubicon adapter', function () {
           expect(bids[0].netRevenue).to.equal(true);
           expect(bids[0].adserverTargeting).to.deep.equal({hb_uuid: '0c498f63-5111-4bed-98e2-9be7cb932a64'});
           expect(bids[0].mediaType).to.equal('video');
+          expect(bids[0].meta.mediaType).to.equal('video');
+          expect(String(bids[0].meta.advertiserDomains)).to.equal('test.com');
+          expect(bids[0].meta.advertiserId).to.equal(12345);
           expect(bids[0].bidderCode).to.equal('rubicon');
           expect(bids[0].currency).to.equal('USD');
           expect(bids[0].width).to.equal(640);
@@ -2645,14 +3167,156 @@ describe('the rubicon adapter', function () {
         });
       });
 
+      describe('for outstream video', function () {
+        const sandbox = sinon.createSandbox();
+        beforeEach(function () {
+          createVideoBidderRequestOutstream();
+          config.setConfig({rubicon: {
+            rendererConfig: {
+              align: 'left',
+              closeButton: true
+            },
+            rendererUrl: 'https://example.test/renderer.js'
+          }});
+          window.MagniteApex = {
+            renderAd: function() {
+              return null;
+            }
+          }
+        });
+
+        afterEach(function () {
+          sandbox.restore();
+          delete window.MagniteApex;
+        });
+
+        it('should register a successful bid', function () {
+          let response = {
+            cur: 'USD',
+            seatbid: [{
+              bid: [{
+                id: '0',
+                impid: 'outstream_video1',
+                adomain: ['test.com'],
+                price: 2,
+                crid: '4259970',
+                ext: {
+                  bidder: {
+                    rp: {
+                      mime: 'application/javascript',
+                      size_id: 201,
+                      advid: 12345
+                    }
+                  },
+                  prebid: {
+                    targeting: {
+                      hb_uuid: '0c498f63-5111-4bed-98e2-9be7cb932a64'
+                    },
+                    type: 'video'
+                  }
+                }
+              }],
+              group: 0,
+              seat: 'rubicon'
+            }],
+          };
+
+          let bids = spec.interpretResponse({body: response}, {
+            bidRequest: bidderRequest.bids[0]
+          });
+
+          expect(bids).to.be.lengthOf(1);
+
+          expect(bids[0].seatBidId).to.equal('0');
+          expect(bids[0].creativeId).to.equal('4259970');
+          expect(bids[0].cpm).to.equal(2);
+          expect(bids[0].ttl).to.equal(300);
+          expect(bids[0].netRevenue).to.equal(true);
+          expect(bids[0].adserverTargeting).to.deep.equal({hb_uuid: '0c498f63-5111-4bed-98e2-9be7cb932a64'});
+          expect(bids[0].mediaType).to.equal('video');
+          expect(bids[0].meta.mediaType).to.equal('video');
+          expect(String(bids[0].meta.advertiserDomains)).to.equal('test.com');
+          expect(bids[0].meta.advertiserId).to.equal(12345);
+          expect(bids[0].bidderCode).to.equal('rubicon');
+          expect(bids[0].currency).to.equal('USD');
+          expect(bids[0].width).to.equal(640);
+          expect(bids[0].height).to.equal(320);
+          // check custom renderer
+          expect(typeof bids[0].renderer).to.equal('object');
+          expect(bids[0].renderer.getConfig()).to.deep.equal({
+            align: 'left',
+            closeButton: true
+          });
+          expect(bids[0].renderer.url).to.equal('https://example.test/renderer.js');
+        });
+
+        it('should render ad with Magnite renderer', function () {
+          let response = {
+            cur: 'USD',
+            seatbid: [{
+              bid: [{
+                id: '0',
+                impid: 'outstream_video1',
+                adomain: ['test.com'],
+                price: 2,
+                crid: '4259970',
+                ext: {
+                  bidder: {
+                    rp: {
+                      mime: 'application/javascript',
+                      size_id: 201,
+                      advid: 12345
+                    }
+                  },
+                  prebid: {
+                    targeting: {
+                      hb_uuid: '0c498f63-5111-4bed-98e2-9be7cb932a64'
+                    },
+                    type: 'video'
+                  }
+                },
+                nurl: 'https://test.com/vast.xml'
+              }],
+              group: 0,
+              seat: 'rubicon'
+            }],
+          };
+
+          sinon.spy(window.MagniteApex, 'renderAd');
+
+          let bids = spec.interpretResponse({body: response}, {
+            bidRequest: bidderRequest.bids[0]
+          });
+          const bid = bids[0];
+          bid.adUnitCode = 'outstream_video1_placement';
+          const adUnit = document.createElement('div');
+          adUnit.id = bid.adUnitCode;
+          document.body.appendChild(adUnit);
+
+          bid.renderer.render(bid);
+
+          const renderCall = window.MagniteApex.renderAd.getCall(0);
+          expect(renderCall.args[0]).to.deep.equal({
+            closeButton: true,
+            collapse: true,
+            height: 320,
+            label: undefined,
+            placement: {
+              align: 'left',
+              attachTo: adUnit,
+              position: 'append',
+            },
+            vastUrl: 'https://test.com/vast.xml',
+            width: 640
+          });
+          // cleanup
+          adUnit.parentNode.removeChild(adUnit);
+        });
+      });
+
       describe('config with integration type', () => {
         it('should use the integration type provided in the config instead of the default', () => {
-          sandbox.stub(config, 'getConfig').callsFake(function (key) {
-            const config = {
-              'rubicon.int_type': 'testType'
-            };
-            return config[key];
-          });
+          config.setConfig({rubicon: {int_type: 'testType'}});
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           expect(parseQuery(request.data).tk_flint).to.equal('testType_v$prebid.version$');
         });
@@ -2687,7 +3351,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass gdpr params if consent is true', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         gdprApplies: true, consentString: 'foo'
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?gdpr=1&gdpr_consent=foo`
@@ -2695,7 +3359,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass gdpr params if consent is false', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         gdprApplies: false, consentString: 'foo'
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?gdpr=0&gdpr_consent=foo`
@@ -2703,7 +3367,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass gdpr param gdpr_consent only when gdprApplies is undefined', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: 'foo'
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?gdpr_consent=foo`
@@ -2711,13 +3375,13 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass no params if gdpr consentString is not defined', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {})).to.deep.equal({
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {})).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
       });
     });
 
     it('should pass no params if gdpr consentString is a number', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: 0
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
@@ -2725,7 +3389,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass no params if gdpr consentString is null', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: null
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
@@ -2733,7 +3397,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass no params if gdpr consentString is a object', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: {}
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
@@ -2741,28 +3405,45 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass no params if gdpr is not defined', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined)).to.deep.equal({
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, undefined)).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
       });
     });
 
     it('should pass us_privacy if uspConsent is defined', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, '1NYN')).to.deep.equal({
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, undefined, '1NYN')).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?us_privacy=1NYN`
       });
     });
 
     it('should pass us_privacy after gdpr if both are present', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: 'foo'
       }, '1NYN')).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?gdpr_consent=foo&us_privacy=1NYN`
       });
     });
+
+    it('should pass gdprApplies', function () {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
+        gdprApplies: true
+      }, '1NYN')).to.deep.equal({
+        type: 'iframe', url: `${emilyUrl}?gdpr=1&us_privacy=1NYN`
+      });
+    });
+
+    it('should pass all correctly', function () {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
+        gdprApplies: true,
+        consentString: 'foo'
+      }, '1NYN')).to.deep.equal({
+        type: 'iframe', url: `${emilyUrl}?gdpr=1&gdpr_consent=foo&us_privacy=1NYN`
+      });
+    });
   });
 
-  describe('get price granularity', function() {
-    it('should return correct buckets for all price granularity values', function() {
+  describe('get price granularity', function () {
+    it('should return correct buckets for all price granularity values', function () {
       const CUSTOM_PRICE_BUCKET_ITEM = {max: 5, increment: 0.5};
 
       const mockConfig = {
@@ -2795,7 +3476,7 @@ describe('the rubicon adapter', function () {
     });
   });
 
-  describe('Supply Chain Support', function() {
+  describe('Supply Chain Support', function () {
     const nodePropsOrder = ['asi', 'sid', 'hp', 'rid', 'name', 'domain'];
     let bidRequests;
     let schainConfig;
@@ -2888,4 +3569,51 @@ describe('the rubicon adapter', function () {
       expect(request[0].data.source.ext.schain).to.deep.equal(schain);
     });
   });
+
+  describe('configurable settings', function() {
+    afterEach(() => {
+      config.setConfig({
+        rubicon: {
+          bannerHost: 'rubicon',
+          videoHost: 'prebid-server',
+          syncHost: 'eus',
+          returnVast: false
+        }
+      });
+      config.resetConfig();
+    });
+
+    beforeEach(function () {
+      resetUserSync();
+    });
+
+    it('should update fastlane endpoint if', function () {
+      config.setConfig({
+        rubicon: {
+          bannerHost: 'fastlane-qa',
+          videoHost: 'prebid-server-qa',
+          syncHost: 'eus-qa',
+          returnVast: true
+        }
+      });
+
+      // banner
+      let [bannerRequest] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      expect(bannerRequest.url).to.equal('https://fastlane-qa.rubiconproject.com/a/api/fastlane.json');
+
+      // video and returnVast
+      createVideoBidderRequest();
+      let [videoRequest] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      let post = videoRequest.data;
+      expect(videoRequest.url).to.equal('https://prebid-server-qa.rubiconproject.com/openrtb2/auction');
+      expect(post.ext.prebid.cache.vastxml).to.have.property('returnCreative').that.is.an('boolean');
+      expect(post.ext.prebid.cache.vastxml.returnCreative).to.equal(true);
+
+      // user sync
+      let syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      });
+      expect(syncs).to.deep.equal({type: 'iframe', url: 'https://eus-qa.rubiconproject.com/usync.html'});
+    });
+  });
 });
diff --git a/test/spec/modules/s2sTesting_spec.js b/test/spec/modules/s2sTesting_spec.js
index 5c7f3004dee..273f6747e52 100644
--- a/test/spec/modules/s2sTesting_spec.js
+++ b/test/spec/modules/s2sTesting_spec.js
@@ -1,5 +1,4 @@
 import s2sTesting from 'modules/s2sTesting.js';
-import { config } from 'src/config.js';
 
 var expect = require('chai').expect;
 
@@ -78,26 +77,16 @@ describe('s2sTesting', function () {
       beforeEach(function () {
         // set random number for testing
         s2sTesting.globalRand = 0.7;
-      });
-
-      it('does not work if testing is "false"', function () {
-        config.setConfig({s2sConfig: {
-          bidders: ['rubicon'],
-          testing: false,
-          bidderControl: {rubicon: {bidSource: {server: 1, client: 1}}}
-        }});
-        expect(s2sTesting.getSourceBidderMap()).to.eql({
-          server: [],
-          client: []
-        });
+        s2sTesting.bidSource = {};
       });
 
       it('sets one client bidder', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true,
           bidderControl: {rubicon: {bidSource: {server: 1, client: 1}}}
-        }});
+        };
+
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: [],
           client: ['rubicon']
@@ -105,11 +94,11 @@ describe('s2sTesting', function () {
       });
 
       it('sets one server bidder', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true,
           bidderControl: {rubicon: {bidSource: {server: 4, client: 1}}}
-        }});
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon'],
           client: []
@@ -117,10 +106,10 @@ describe('s2sTesting', function () {
       });
 
       it('defaults to server', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true
-        }});
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon'],
           client: []
@@ -128,13 +117,14 @@ describe('s2sTesting', function () {
       });
 
       it('sets two bidders', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 3, client: 1}},
             appnexus: {bidSource: {server: 1, client: 1}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         var serverClientBidders = s2sTesting.getSourceBidderMap();
         expect(serverClientBidders.server).to.eql(['rubicon']);
         expect(serverClientBidders.client).to.have.members(['appnexus']);
@@ -143,33 +133,37 @@ describe('s2sTesting', function () {
       it('sends both bidders to same source when weights are the same', function () {
         s2sTesting.globalRand = 0.01;
 
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 1, client: 99}},
             appnexus: {bidSource: {server: 1, client: 99}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
 
-        config.setConfig({s2sConfig: {
+        const s2sConfig2 = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 99, client: 1}},
             appnexus: {bidSource: {server: 99, client: 1}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig2);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon', 'appnexus'],
           client: []
@@ -186,11 +180,12 @@ describe('s2sTesting', function () {
     });
 
     describe('setting source through adUnits', function () {
+      const s2sConfig3 = {testing: true};
+
       beforeEach(function () {
-        // reset s2sconfig bid sources
-        config.setConfig({s2sConfig: {testing: true}});
         // set random number for testing
         s2sTesting.globalRand = 0.7;
+        s2sTesting.bidSource = {};
       });
 
       it('sets one bidder source from one adUnit', function () {
@@ -199,7 +194,8 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {server: 4, client: 1}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: ['rubicon'],
           client: []
         });
@@ -212,7 +208,7 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {server: 1, client: 1}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: [],
           client: ['rubicon']
         });
@@ -227,7 +223,7 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: [],
           client: ['rubicon']
         });
@@ -243,7 +239,7 @@ describe('s2sTesting', function () {
             {bidder: 'appnexus', bidSource: {server: 3, client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
         expect(serverClientBidders.server).to.eql(['appnexus']);
         expect(serverClientBidders.client).to.have.members(['rubicon']);
         // should have saved the source on the bid
@@ -264,7 +260,7 @@ describe('s2sTesting', function () {
             {bidder: 'bidder3', bidSource: {client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
         expect(serverClientBidders.server).to.have.members(['rubicon']);
         expect(serverClientBidders.server).to.not.have.members(['appnexus', 'bidder3']);
         expect(serverClientBidders.client).to.have.members(['rubicon', 'appnexus', 'bidder3']);
@@ -287,7 +283,7 @@ describe('s2sTesting', function () {
             {bidder: 'bidder3', calcSource: 'server', bidSource: {client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
 
         expect(serverClientBidders.server).to.have.members(['appnexus', 'bidder3']);
         expect(serverClientBidders.server).to.not.have.members(['rubicon']);
@@ -305,8 +301,6 @@ describe('s2sTesting', function () {
 
     describe('setting source through s2sconfig and adUnits', function () {
       beforeEach(function () {
-        // reset s2sconfig bid sources
-        config.setConfig({s2sConfig: {testing: true}});
         // set random number for testing
         s2sTesting.globalRand = 0.7;
       });
@@ -321,15 +315,15 @@ describe('s2sTesting', function () {
         ];
 
         // set rubicon: client and appnexus: server
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
           testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 2, client: 1}},
             appnexus: {bidSource: {server: 1}}
           }
-        }});
-
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
         expect(serverClientBidders.server).to.have.members(['rubicon', 'appnexus']);
         expect(serverClientBidders.client).to.have.members(['rubicon', 'appnexus']);
diff --git a/test/spec/modules/scaleableAnalyticsAdapter_spec.js b/test/spec/modules/scaleableAnalyticsAdapter_spec.js
index 70b94a2b807..c65740252d2 100644
--- a/test/spec/modules/scaleableAnalyticsAdapter_spec.js
+++ b/test/spec/modules/scaleableAnalyticsAdapter_spec.js
@@ -1,6 +1,6 @@
 import scaleableAnalytics from 'modules/scaleableAnalyticsAdapter.js';
 import { expect } from 'chai';
-import events from 'src/events.js';
+import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
 import { server } from 'test/mocks/xhr.js';
 
diff --git a/test/spec/modules/seedingAllianceAdapter_spec.js b/test/spec/modules/seedingAllianceAdapter_spec.js
index e6f96c92fd9..81af9546ff0 100755
--- a/test/spec/modules/seedingAllianceAdapter_spec.js
+++ b/test/spec/modules/seedingAllianceAdapter_spec.js
@@ -38,7 +38,7 @@ describe('SeedingAlliance adapter', function () {
     });
 
     it('should have default request structure', function () {
-      let keys = 'site,device,cur,imp,user'.split(',');
+      let keys = 'site,device,cur,imp,user,regs'.split(',');
       let validBidRequests = [{
         bidId: 'bidId',
         params: {}
diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index 5c8c58196f7..d0efd5f1f75 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -1,10 +1,18 @@
-import { expect } from 'chai'
-import { spec, getTimeoutUrl } from 'modules/seedtagBidAdapter.js'
+import { expect } from 'chai';
+import { spec, getTimeoutUrl } from 'modules/seedtagBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { config } from '../../../src/config.js';
+
+const PUBLISHER_ID = '0000-0000-01';
+const ADUNIT_ID = '000000';
 
 function getSlotConfigs(mediaTypes, params) {
   return {
     params: params,
-    sizes: [[300, 250], [300, 600]],
+    sizes: [
+      [300, 250],
+      [300, 600],
+    ],
     bidId: '30b31c1838de1e',
     bidderRequestId: '22edbae2733bf6',
     auctionId: '1d1a030790a475',
@@ -12,283 +20,404 @@ function getSlotConfigs(mediaTypes, params) {
     bidder: 'seedtag',
     mediaTypes: mediaTypes,
     src: 'client',
-    transactionId: 'd704d006-0d6e-4a09-ad6c-179e7e758096'
-  }
+    transactionId: 'd704d006-0d6e-4a09-ad6c-179e7e758096',
+    adUnitCode: 'adunit-code',
+  };
+}
+
+function createInStreamSlotConfig(mediaType) {
+  return getSlotConfigs(mediaType, {
+    publisherId: PUBLISHER_ID,
+    adUnitId: ADUNIT_ID,
+    placement: 'inStream',
+  });
 }
 
-describe('Seedtag Adapter', function() {
-  describe('isBidRequestValid method', function() {
-    const PUBLISHER_ID = '0000-0000-01'
-    const ADUNIT_ID = '000000'
-    describe('returns true', function() {
+describe('Seedtag Adapter', function () {
+  describe('isBidRequestValid method', function () {
+    describe('returns true', function () {
       describe('when banner slot config has all mandatory params', () => {
-        describe('and placement has the correct value', function() {
-          const createBannerSlotConfig = placement => {
+        describe('and placement has the correct value', function () {
+          const createBannerSlotConfig = (placement) => {
             return getSlotConfigs(
               { banner: {} },
               {
                 publisherId: PUBLISHER_ID,
                 adUnitId: ADUNIT_ID,
-                placement
+                placement,
               }
-            )
-          }
-          const placements = ['banner', 'video', 'inImage', 'inScreen']
-          placements.forEach(placement => {
-            it('should be ' + placement, function() {
+            );
+          };
+          const placements = ['inBanner', 'inImage', 'inScreen', 'inArticle'];
+          placements.forEach((placement) => {
+            it('should be ' + placement, function () {
               const isBidRequestValid = spec.isBidRequestValid(
                 createBannerSlotConfig(placement)
-              )
-              expect(isBidRequestValid).to.equal(true)
-            })
-          })
-        })
-      })
-      describe('when video slot has all mandatory params.', function() {
-        it('should return true, when video mediatype object are correct.', function() {
+              );
+              expect(isBidRequestValid).to.equal(true);
+            });
+          });
+        });
+      });
+      describe('when video slot has all mandatory params', function () {
+        it('should return true, when video context is instream', function () {
+          const slotConfig = createInStreamSlotConfig({
+            video: {
+              context: 'instream',
+              playerSize: [[600, 200]],
+            },
+          });
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig);
+          expect(isBidRequestValid).to.equal(true);
+        });
+        it('should return true, when video context is instream, but placement is not inStream', function () {
           const slotConfig = getSlotConfigs(
             {
               video: {
                 context: 'instream',
-                playerSize: [[600, 200]]
-              }
+                playerSize: [[600, 200]],
+              },
             },
             {
               publisherId: PUBLISHER_ID,
               adUnitId: ADUNIT_ID,
-              placement: 'video'
+              placement: 'inBanner',
             }
-          )
-          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
-          expect(isBidRequestValid).to.equal(true)
-        })
-      })
-    })
-    describe('returns false', function() {
-      describe('when params are not correct', function() {
-        function createSlotconfig(params) {
-          return getSlotConfigs({ banner: {} }, params)
+          );
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig);
+          expect(isBidRequestValid).to.equal(false);
+        });
+        it('should return false, when video context is outstream', function () {
+          const slotConfig = createInStreamSlotConfig({
+            video: {
+              context: 'outstream',
+              playerSize: [[600, 200]],
+            },
+          });
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig);
+          expect(isBidRequestValid).to.equal(false);
+        });
+      });
+    });
+    describe('returns false', function () {
+      describe('when params are not correct', function () {
+        function createSlotConfig(params) {
+          return getSlotConfigs({ banner: {} }, params);
         }
-        it('does not have the PublisherToken.', function() {
+        it('does not have the PublisherToken.', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createSlotconfig({
-              adUnitId: '000000',
-              placement: 'banner'
+            createSlotConfig({
+              adUnitId: ADUNIT_ID,
+              placement: 'inBanner',
             })
-          )
-          expect(isBidRequestValid).to.equal(false)
-        })
-        it('does not have the AdUnitId.', function() {
+          );
+          expect(isBidRequestValid).to.equal(false);
+        });
+        it('does not have the AdUnitId.', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createSlotconfig({
-              publisherId: '0000-0000-01',
-              placement: 'banner'
+            createSlotConfig({
+              publisherId: PUBLISHER_ID,
+              placement: 'inBanner',
             })
-          )
-          expect(isBidRequestValid).to.equal(false)
-        })
-        it('does not have the placement.', function() {
+          );
+          expect(isBidRequestValid).to.equal(false);
+        });
+        it('does not have the placement.', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createSlotconfig({
-              publisherId: '0000-0000-01',
-              adUnitId: '000000'
+            createSlotConfig({
+              publisherId: PUBLISHER_ID,
+              adUnitId: ADUNIT_ID,
             })
-          )
-          expect(isBidRequestValid).to.equal(false)
-        })
-        it('does not have a the correct placement.', function() {
+          );
+          expect(isBidRequestValid).to.equal(false);
+        });
+        it('does not have a the correct placement.', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createSlotconfig({
-              publisherId: '0000-0000-01',
-              adUnitId: '000000',
-              placement: 'another_thing'
+            createSlotConfig({
+              publisherId: PUBLISHER_ID,
+              adUnitId: ADUNIT_ID,
+              placement: 'another_thing',
             })
-          )
-          expect(isBidRequestValid).to.equal(false)
-        })
-      })
-      describe('when video mediaType object is not correct.', function() {
-        function createVideoSlotconfig(mediaType) {
-          return getSlotConfigs(mediaType, {
-            publisherId: PUBLISHER_ID,
-            adUnitId: ADUNIT_ID,
-            placement: 'video'
-          })
-        }
-        it('is a void object', function() {
+          );
+          expect(isBidRequestValid).to.equal(false);
+        });
+      });
+
+      describe('when video mediaType object is not correct', function () {
+        it('is a void object', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotconfig({ video: {} })
-          )
-          expect(isBidRequestValid).to.equal(false)
-        })
-        it('does not have playerSize.', function() {
+            createInStreamSlotConfig({ video: {} })
+          );
+          expect(isBidRequestValid).to.equal(false);
+        });
+        it('does not have playerSize.', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotconfig({ video: { context: 'instream' } })
-          )
-          expect(isBidRequestValid).to.equal(false)
-        })
-        it('is not instream ', function() {
+            createInStreamSlotConfig({ video: { context: 'instream' } })
+          );
+          expect(isBidRequestValid).to.equal(false);
+        });
+        it('is outstream ', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotconfig({
+            createInStreamSlotConfig({
               video: {
                 context: 'outstream',
-                playerSize: [[600, 200]]
-              }
+                playerSize: [[600, 200]],
+              },
             })
-          )
-          expect(isBidRequestValid).to.equal(false)
-        })
-      })
-    })
-  })
-
-  describe('buildRequests method', function() {
+          );
+          expect(isBidRequestValid).to.equal(false);
+        });
+        describe('order does not matter', function () {
+          it('when video is not the first slot', function () {
+            const isBidRequestValid = spec.isBidRequestValid(
+              createInStreamSlotConfig({ banner: {}, video: {} })
+            );
+            expect(isBidRequestValid).to.equal(false);
+          });
+          it('when video is the first slot', function () {
+            const isBidRequestValid = spec.isBidRequestValid(
+              createInStreamSlotConfig({ video: {}, banner: {} })
+            );
+            expect(isBidRequestValid).to.equal(false);
+          });
+        });
+      });
+    });
+  });
+
+  describe('buildRequests method', function () {
     const bidderRequest = {
-      refererInfo: { referer: 'referer' },
-      timeout: 1000
-    }
-    const mandatoryParams = {
-      publisherId: '0000-0000-01',
-      adUnitId: '000000',
-      placement: 'banner'
-    }
-    const inStreamParams = Object.assign({}, mandatoryParams, {
-      video: {
-        mimes: 'mp4'
-      }
-    })
+      refererInfo: { page: 'referer' },
+      timeout: 1000,
+    };
+    const mandatoryDisplayParams = {
+      publisherId: PUBLISHER_ID,
+      adUnitId: ADUNIT_ID,
+      placement: 'inBanner',
+    };
+    const mandatoryVideoParams = {
+      publisherId: PUBLISHER_ID,
+      adUnitId: ADUNIT_ID,
+      placement: 'inStream',
+    };
     const validBidRequests = [
-      getSlotConfigs({ banner: {} }, mandatoryParams),
+      getSlotConfigs({ banner: {} }, mandatoryDisplayParams),
       getSlotConfigs(
-        { video: { context: 'instream', playerSize: [[300, 200]] } },
-        inStreamParams
-      )
-    ]
-    it('Url params should be correct ', function() {
-      const request = spec.buildRequests(validBidRequests, bidderRequest)
-      expect(request.method).to.equal('POST')
-      expect(request.url).to.equal('https://s.seedtag.com/c/hb/bid')
-    })
-
-    it('Common data request should be correct', function() {
-      const request = spec.buildRequests(validBidRequests, bidderRequest)
-      const data = JSON.parse(request.data)
-      expect(data.url).to.equal('referer')
-      expect(data.publisherToken).to.equal('0000-0000-01')
-      expect(typeof data.version).to.equal('string')
-    })
-
-    describe('adPosition param', function() {
-      it('should sended when publisher set adPosition param', function() {
-        const params = Object.assign({}, mandatoryParams, {
-          adPosition: 1
-        })
-        const validBidRequests = [getSlotConfigs({ banner: {} }, params)]
-        const request = spec.buildRequests(validBidRequests, bidderRequest)
-        const data = JSON.parse(request.data)
-        expect(data.bidRequests[0].adPosition).to.equal(1)
-      })
-      it('should not sended when publisher has not set adPosition param', function() {
-        const validBidRequests = [
-          getSlotConfigs({ banner: {} }, mandatoryParams)
-        ]
-        const request = spec.buildRequests(validBidRequests, bidderRequest)
-        const data = JSON.parse(request.data)
-        expect(data.bidRequests[0].adPosition).to.equal(undefined)
-      })
-    })
-
-    describe('GDPR params', function() {
-      describe('when there arent consent management platform', function() {
-        it('cmp should be false', function() {
-          const request = spec.buildRequests(validBidRequests, bidderRequest)
-          const data = JSON.parse(request.data)
-          expect(data.cmp).to.equal(false)
-        })
-      })
-      describe('when there are consent management platform', function() {
-        it('cmps should be true and ga should not sended, when gdprApplies is undefined', function() {
+        {
+          video: {
+            context: 'instream',
+            playerSize: [[300, 200]],
+            mimes: ['video/mp4'],
+          },
+        },
+        mandatoryVideoParams
+      ),
+    ];
+    it('Url params should be correct ', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://s.seedtag.com/c/hb/bid');
+    });
+
+    it('Common data request should be correct', function () {
+      const now = Date.now();
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.url).to.equal('referer');
+      expect(data.publisherToken).to.equal('0000-0000-01');
+      expect(typeof data.version).to.equal('string');
+      expect(
+        ['fixed', 'mobile', 'unknown'].indexOf(data.connectionType)
+      ).to.be.above(-1);
+      expect(data.auctionStart).to.be.greaterThanOrEqual(now);
+      expect(data.ttfb).to.be.greaterThanOrEqual(0);
+
+      expect(data.bidRequests[0].adUnitCode).to.equal('adunit-code');
+    });
+
+    describe('GDPR params', function () {
+      describe('when there arent consent management platform', function () {
+        it('cmp should be false', function () {
+          const request = spec.buildRequests(validBidRequests, bidderRequest);
+          const data = JSON.parse(request.data);
+          expect(data.cmp).to.equal(false);
+        });
+      });
+      describe('when there are consent management platform', function () {
+        it('cmps should be true and ga should not sended, when gdprApplies is undefined', function () {
           bidderRequest['gdprConsent'] = {
             gdprApplies: undefined,
-            consentString: 'consentString'
-          }
-          const request = spec.buildRequests(validBidRequests, bidderRequest)
-          const data = JSON.parse(request.data)
-          expect(data.cmp).to.equal(true)
-          expect(Object.keys(data).indexOf('data')).to.equal(-1)
-          expect(data.cd).to.equal('consentString')
-        })
-        it('cmps should be true and all gdpr parameters should be sended, when there are gdprApplies', function() {
+            consentString: 'consentString',
+          };
+          const request = spec.buildRequests(validBidRequests, bidderRequest);
+          const data = JSON.parse(request.data);
+          expect(data.cmp).to.equal(true);
+          expect(Object.keys(data).indexOf('data')).to.equal(-1);
+          expect(data.cd).to.equal('consentString');
+        });
+        it('cmps should be true and all gdpr parameters should be sended, when there are gdprApplies', function () {
           bidderRequest['gdprConsent'] = {
             gdprApplies: true,
-            consentString: 'consentString'
-          }
-          const request = spec.buildRequests(validBidRequests, bidderRequest)
-          const data = JSON.parse(request.data)
-          expect(data.cmp).to.equal(true)
-          expect(data.ga).to.equal(true)
-          expect(data.cd).to.equal('consentString')
-        })
-      })
-    })
-
-    describe('BidRequests params', function() {
-      const request = spec.buildRequests(validBidRequests, bidderRequest)
-      const data = JSON.parse(request.data)
-      const bidRequests = data.bidRequests
-      it('should request a Banner', function() {
-        const bannerBid = bidRequests[0]
-        expect(bannerBid.id).to.equal('30b31c1838de1e')
+            consentString: 'consentString',
+          };
+          const request = spec.buildRequests(validBidRequests, bidderRequest);
+          const data = JSON.parse(request.data);
+          expect(data.cmp).to.equal(true);
+          expect(data.ga).to.equal(true);
+          expect(data.cd).to.equal('consentString');
+        });
+        it('should expose gvlid', function () {
+          expect(spec.gvlid).to.equal(157);
+        });
+        it('should handle uspConsent', function () {
+          const uspConsent = '1---';
+
+          bidderRequest['uspConsent'] = uspConsent;
+
+          const request = spec.buildRequests(validBidRequests, bidderRequest);
+          const payload = JSON.parse(request.data);
+
+          expect(payload.uspConsent).to.exist;
+          expect(payload.uspConsent).to.equal(uspConsent);
+        });
+
+        it("shouldn't send uspConsent when not available", function () {
+          const uspConsent = undefined;
+
+          bidderRequest['uspConsent'] = uspConsent;
+
+          const request = spec.buildRequests(validBidRequests, bidderRequest);
+          const payload = JSON.parse(request.data);
+
+          expect(payload.uspConsent).to.not.exist;
+        });
+      });
+    });
+
+    describe('BidRequests params', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const data = JSON.parse(request.data);
+      const bidRequests = data.bidRequests;
+      it('should request a Banner', function () {
+        const bannerBid = bidRequests[0];
+        expect(bannerBid.id).to.equal('30b31c1838de1e');
         expect(bannerBid.transactionId).to.equal(
           'd704d006-0d6e-4a09-ad6c-179e7e758096'
-        )
-        expect(bannerBid.supplyTypes[0]).to.equal('display')
-        expect(bannerBid.adUnitId).to.equal('000000')
-        expect(bannerBid.sizes[0][0]).to.equal(300)
-        expect(bannerBid.sizes[0][1]).to.equal(250)
-        expect(bannerBid.sizes[1][0]).to.equal(300)
-        expect(bannerBid.sizes[1][1]).to.equal(600)
-      })
-      it('should request an InStream Video', function() {
-        const videoBid = bidRequests[1]
-        expect(videoBid.id).to.equal('30b31c1838de1e')
+        );
+        expect(bannerBid.supplyTypes[0]).to.equal('display');
+        expect(bannerBid.adUnitId).to.equal('000000');
+        expect(bannerBid.sizes[0][0]).to.equal(300);
+        expect(bannerBid.sizes[0][1]).to.equal(250);
+        expect(bannerBid.sizes[1][0]).to.equal(300);
+        expect(bannerBid.sizes[1][1]).to.equal(600);
+        expect(bannerBid.requestCount).to.equal(1);
+      });
+      it('should request an InStream Video', function () {
+        const videoBid = bidRequests[1];
+        expect(videoBid.id).to.equal('30b31c1838de1e');
         expect(videoBid.transactionId).to.equal(
           'd704d006-0d6e-4a09-ad6c-179e7e758096'
-        )
-        expect(videoBid.supplyTypes[0]).to.equal('video')
-        expect(videoBid.adUnitId).to.equal('000000')
-        expect(videoBid.videoParams.mimes).to.equal('mp4')
-        expect(videoBid.videoParams.w).to.equal(300)
-        expect(videoBid.videoParams.h).to.equal(200)
-        expect(videoBid.sizes[0][0]).to.equal(300)
-        expect(videoBid.sizes[0][1]).to.equal(250)
-        expect(videoBid.sizes[1][0]).to.equal(300)
-        expect(videoBid.sizes[1][1]).to.equal(600)
-      })
-    })
-  })
-
-  describe('interpret response method', function() {
-    it('should return a void array, when the server response are not correct.', function() {
-      const request = { data: JSON.stringify({}) }
+        );
+        expect(videoBid.supplyTypes[0]).to.equal('video');
+        expect(videoBid.adUnitId).to.equal('000000');
+        expect(videoBid.videoParams.mimes).to.eql(['video/mp4']);
+        expect(videoBid.videoParams.w).to.equal(300);
+        expect(videoBid.videoParams.h).to.equal(200);
+        expect(videoBid.sizes[0][0]).to.equal(300);
+        expect(videoBid.sizes[0][1]).to.equal(250);
+        expect(videoBid.sizes[1][0]).to.equal(300);
+        expect(videoBid.sizes[1][1]).to.equal(600);
+        expect(videoBid.requestCount).to.equal(1);
+      });
+    });
+
+    describe('COPPA param', function () {
+      it('should add COPPA param to payload when prebid config has parameter COPPA equal to true', function () {
+        config.setConfig({ coppa: true });
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.coppa).to.equal(true);
+      });
+
+      it('should not add COPPA param to payload when prebid config has parameter COPPA equal to false', function () {
+        config.setConfig({ coppa: false });
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.coppa).to.be.undefined;
+      });
+
+      it('should not add COPPA param to payload when prebid config has not parameter COPPA', function () {
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.coppa).to.be.undefined;
+      });
+    });
+    describe('schain param', function () {
+      it('should add schain to payload when exposed on validBidRequest', function () {
+        // https://github.com/prebid/Prebid.js/blob/master/modules/schain.md#sample-code-for-passing-the-schain-object
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'indirectseller.com',
+              sid: '00001',
+              hp: 1,
+            },
+
+            {
+              asi: 'indirectseller-2.com',
+              sid: '00002',
+              hp: 1,
+            },
+          ],
+        };
+
+        // duplicate
+        const bidRequests = JSON.parse(JSON.stringify(validBidRequests));
+        bidRequests[0].schain = schain;
+
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+
+        const payload = JSON.parse(request.data);
+
+        expect(payload.schain).to.exist;
+        expect(payload.schain).to.deep.equal(schain);
+      });
+
+      it("shouldn't add schain to payload when not exposed", function () {
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+
+        const payload = JSON.parse(request.data);
+
+        expect(payload.schain).to.not.exist;
+      });
+    });
+  });
+
+  describe('interpret response method', function () {
+    it('should return a void array, when the server response are not correct.', function () {
+      const request = { data: JSON.stringify({}) };
       const serverResponse = {
-        body: {}
-      }
-      const bids = spec.interpretResponse(serverResponse, request)
-      expect(typeof bids).to.equal('object')
-      expect(bids.length).to.equal(0)
-    })
-    it('should return a void array, when the server response have not got bids.', function() {
-      const request = { data: JSON.stringify({}) }
-      const serverResponse = { body: { bids: [] } }
-      const bids = spec.interpretResponse(serverResponse, request)
-      expect(typeof bids).to.equal('object')
-      expect(bids.length).to.equal(0)
-    })
-    describe('when the server response return a bid', function() {
-      describe('the bid is a banner', function() {
-        it('should return a banner bid', function() {
-          const request = { data: JSON.stringify({}) }
+        body: {},
+      };
+      const bids = spec.interpretResponse(serverResponse, request);
+      expect(typeof bids).to.equal('object');
+      expect(bids.length).to.equal(0);
+    });
+    it('should return a void array, when the server response have no bids.', function () {
+      const request = { data: JSON.stringify({}) };
+      const serverResponse = { body: { bids: [] } };
+      const bids = spec.interpretResponse(serverResponse, request);
+      expect(typeof bids).to.equal('object');
+      expect(bids.length).to.equal(0);
+    });
+    describe('when the server response return a bid', function () {
+      describe('the bid is a banner', function () {
+        it('should return a banner bid', function () {
+          const request = { data: JSON.stringify({}) };
           const serverResponse = {
             body: {
               bids: [
@@ -300,26 +429,32 @@ describe('Seedtag Adapter', function() {
                   width: 728,
                   height: 90,
                   mediaType: 'display',
-                  ttl: 360
-                }
+                  ttl: 360,
+                  nurl: 'testurl.com/nurl',
+                  adomain: ['advertiserdomain.com'],
+                },
               ],
-              cookieSync: { url: '' }
-            }
-          }
-          const bids = spec.interpretResponse(serverResponse, request)
-          expect(bids.length).to.equal(1)
-          expect(bids[0].requestId).to.equal('2159a54dc2566f')
-          expect(bids[0].cpm).to.equal(0.5)
-          expect(bids[0].width).to.equal(728)
-          expect(bids[0].height).to.equal(90)
-          expect(bids[0].currency).to.equal('USD')
-          expect(bids[0].netRevenue).to.equal(true)
-          expect(bids[0].ad).to.equal('content')
-        })
-      })
-      describe('the bid is a video', function() {
-        it('should return a instream bid', function() {
-          const request = { data: JSON.stringify({}) }
+              cookieSync: { url: '' },
+            },
+          };
+          const bids = spec.interpretResponse(serverResponse, request);
+          expect(bids.length).to.equal(1);
+          expect(bids[0].requestId).to.equal('2159a54dc2566f');
+          expect(bids[0].cpm).to.equal(0.5);
+          expect(bids[0].width).to.equal(728);
+          expect(bids[0].height).to.equal(90);
+          expect(bids[0].currency).to.equal('USD');
+          expect(bids[0].netRevenue).to.equal(true);
+          expect(bids[0].ad).to.equal('content');
+          expect(bids[0].nurl).to.equal('testurl.com/nurl');
+          expect(bids[0].meta.advertiserDomains).to.deep.equal([
+            'advertiserdomain.com',
+          ]);
+        });
+      });
+      describe('the bid is a video', function () {
+        it('should return a instream bid', function () {
+          const request = { data: JSON.stringify({}) };
           const serverResponse = {
             body: {
               bids: [
@@ -331,66 +466,125 @@ describe('Seedtag Adapter', function() {
                   width: 728,
                   height: 90,
                   mediaType: 'video',
-                  ttl: 360
-                }
+                  ttl: 360,
+                  nurl: undefined,
+                },
               ],
-              cookieSync: { url: '' }
-            }
-          }
-          const bids = spec.interpretResponse(serverResponse, request)
-          expect(bids.length).to.equal(1)
-          expect(bids[0].requestId).to.equal('2159a54dc2566f')
-          expect(bids[0].cpm).to.equal(0.5)
-          expect(bids[0].width).to.equal(728)
-          expect(bids[0].height).to.equal(90)
-          expect(bids[0].currency).to.equal('USD')
-          expect(bids[0].netRevenue).to.equal(true)
-          expect(bids[0].vastXml).to.equal('content')
-        })
-      })
-    })
-  })
-
-  describe('user syncs method', function() {
-    it('should return empty array, when iframe sync option are disabled.', function() {
-      const syncOption = { iframeEnabled: false }
-      const serverResponses = [{ body: { cookieSync: 'someUrl' } }]
-      const cookieSyncArray = spec.getUserSyncs(syncOption, serverResponses)
-      expect(cookieSyncArray.length).to.equal(0)
-    })
-    it('should return empty array, when the server response are wrong.', function() {
-      const syncOption = { iframeEnabled: true }
-      const serverResponses = [{ body: {} }]
-      const cookieSyncArray = spec.getUserSyncs(syncOption, serverResponses)
-      expect(cookieSyncArray.length).to.equal(0)
-    })
-    it('should return empty array, when the server response are void.', function() {
-      const syncOption = { iframeEnabled: true }
-      const serverResponses = [{ body: { cookieSync: '' } }]
-      const cookieSyncArray = spec.getUserSyncs(syncOption, serverResponses)
-      expect(cookieSyncArray.length).to.equal(0)
-    })
-    it('should return a array with the cookie sync, when the server response with a cookie sync.', function() {
-      const syncOption = { iframeEnabled: true }
-      const serverResponses = [{ body: { cookieSync: 'someUrl' } }]
-      const cookieSyncArray = spec.getUserSyncs(syncOption, serverResponses)
-      expect(cookieSyncArray.length).to.equal(1)
-      expect(cookieSyncArray[0].type).to.equal('iframe')
-      expect(cookieSyncArray[0].url).to.equal('someUrl')
-    })
-  })
+              cookieSync: { url: '' },
+            },
+          };
+          const bids = spec.interpretResponse(serverResponse, request);
+          expect(bids.length).to.equal(1);
+          expect(bids[0].requestId).to.equal('2159a54dc2566f');
+          expect(bids[0].cpm).to.equal(0.5);
+          expect(bids[0].width).to.equal(728);
+          expect(bids[0].height).to.equal(90);
+          expect(bids[0].currency).to.equal('USD');
+          expect(bids[0].netRevenue).to.equal(true);
+          expect(bids[0].vastXml).to.equal('content');
+          expect(bids[0].meta.advertiserDomains).to.deep.equal([]);
+        });
+      });
+    });
+  });
+
+  describe('user syncs method', function () {
+    it('should return empty array, when iframe sync option are disabled.', function () {
+      const syncOption = { iframeEnabled: false };
+      const serverResponses = [{ body: { cookieSync: 'someUrl' } }];
+      const cookieSyncArray = spec.getUserSyncs(syncOption, serverResponses);
+      expect(cookieSyncArray.length).to.equal(0);
+    });
+    it('should return empty array, when the server response are wrong.', function () {
+      const syncOption = { iframeEnabled: true };
+      const serverResponses = [{ body: {} }];
+      const cookieSyncArray = spec.getUserSyncs(syncOption, serverResponses);
+      expect(cookieSyncArray.length).to.equal(0);
+    });
+    it('should return empty array, when the server response are void.', function () {
+      const syncOption = { iframeEnabled: true };
+      const serverResponses = [{ body: { cookieSync: '' } }];
+      const cookieSyncArray = spec.getUserSyncs(syncOption, serverResponses);
+      expect(cookieSyncArray.length).to.equal(0);
+    });
+    it('should return a array with the cookie sync, when the server response with a cookie sync.', function () {
+      const syncOption = { iframeEnabled: true };
+      const serverResponses = [{ body: { cookieSync: 'someUrl' } }];
+      const cookieSyncArray = spec.getUserSyncs(syncOption, serverResponses);
+      expect(cookieSyncArray.length).to.equal(1);
+      expect(cookieSyncArray[0].type).to.equal('iframe');
+      expect(cookieSyncArray[0].url).to.equal('someUrl');
+    });
+  });
 
   describe('onTimeout', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
     it('should return the correct endpoint', function () {
-      const params = { publisherId: '0000', adUnitId: '11111' }
-      const timeoutData = [{ params: [ params ] }];
+      const params = { publisherId: '0000', adUnitId: '11111' };
+      const timeout = 3000;
+      const timeoutData = [{ params: [params], timeout }];
       const timeoutUrl = getTimeoutUrl(timeoutData);
       expect(timeoutUrl).to.equal(
         'https://s.seedtag.com/se/hb/timeout?publisherToken=' +
-        params.publisherId +
-        '&adUnitId=' +
-        params.adUnitId
-      )
-    })
-  })
-})
+          params.publisherId +
+          '&adUnitId=' +
+          params.adUnitId +
+          '&timeout=' +
+          timeout
+      );
+    });
+
+    it('should set the timeout pixel', function () {
+      const params = { publisherId: '0000', adUnitId: '11111' };
+      const timeout = 3000;
+      const timeoutData = [{ params: [params], timeout }];
+      spec.onTimeout(timeoutData);
+      expect(
+        utils.triggerPixel.calledWith(
+          'https://s.seedtag.com/se/hb/timeout?publisherToken=' +
+            params.publisherId +
+            '&adUnitId=' +
+            params.adUnitId +
+            '&timeout=' +
+            timeout
+        )
+      ).to.equal(true);
+    });
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    describe('without nurl', function () {
+      const bid = {};
+
+      it('does not create pixel ', function () {
+        spec.onBidWon(bid);
+        expect(utils.triggerPixel.called).to.equal(false);
+      });
+    });
+
+    describe('with nurl', function () {
+      const nurl = 'http://seedtag_domain/won';
+      const bid = { nurl };
+
+      it('creates nurl pixel if bid nurl', function () {
+        spec.onBidWon({ nurl });
+        expect(utils.triggerPixel.calledWith(nurl)).to.equal(true);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/segmentoBidAdapter_spec.js b/test/spec/modules/segmentoBidAdapter_spec.js
deleted file mode 100644
index 17ad424f73f..00000000000
--- a/test/spec/modules/segmentoBidAdapter_spec.js
+++ /dev/null
@@ -1,187 +0,0 @@
-import { expect } from 'chai';
-import { spec } from '../../../modules/segmentoBidAdapter.js';
-
-const BIDDER_CODE = 'segmento';
-const URL = 'https://prebid-bidder.rutarget.ru/bid';
-const SYNC_IFRAME_URL = 'https://tag.rutarget.ru/tag?event=otherPage&check=true&response=syncframe&synconly=true';
-const SYNC_IMAGE_URL = 'https://tag.rutarget.ru/tag?event=otherPage&check=true&synconly=true';
-const RUB = 'RUB';
-const TIME_TO_LIVE = 0;
-
-describe('SegmentoAdapter', function () {
-  describe('isBidRequestValid', function () {
-    const bid = {
-      bidder: BIDDER_CODE,
-      bidId: '51ef8751f9aead',
-      params: {
-        placementId: 34
-      },
-      adUnitCode: 'div-gpt-ad-1460505748561-0',
-      transactionId: 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-      sizes: [[320, 50], [300, 250], [300, 600]],
-      bidderRequestId: '418b37f85e772c',
-      auctionId: '18fd8b8b0bd757'
-    };
-
-    it('should return true if placementId is a number', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false if placementId is not a number', function () {
-      bid.params.placementId = 'placementId';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false if no placementId param', function () {
-      delete bid.params.placementId;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bids = [{
-      bidder: 'segmento',
-      bidId: '51ef8751f9aead',
-      params: {
-        placementId: 34
-      },
-      adUnitCode: 'div-gpt-ad-1460505748561-0',
-      transactionId: 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-      sizes: [[320, 50], [300, 250], [300, 600]],
-      bidderRequestId: '418b37f85e772c',
-      auctionId: '18fd8b8b0bd757'
-    }];
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://comepage.com'
-      }
-    };
-
-    const request = spec.buildRequests(bids, bidderRequest);
-    it('should return POST method', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('should return valid url', function () {
-      expect(request.url).to.equal(URL);
-    });
-
-    it('should return valid data', function () {
-      const data = request.data;
-      expect(data).to.have.all.keys('settings', 'places');
-      expect(data.settings.currency).to.be.equal(RUB);
-      expect(data.settings.referrer).to.be.a('string');
-      expect(data.settings.referrer).to.be.equal(bidderRequest.refererInfo.referer);
-      const places = data.places;
-      for (let i = 0; i < places.length; i++) {
-        const place = places[i];
-        const bid = bids[i];
-        expect(place).to.have.all.keys('id', 'placementId', 'sizes');
-        expect(place.id).to.be.a('string');
-        expect(place.id).to.be.equal(bid.bidId);
-        expect(place.placementId).to.be.a('number');
-        expect(place.placementId).to.be.equal(bid.params.placementId);
-        expect(place.sizes).to.be.an('array');
-        expect(place.sizes).to.deep.equal(bid.sizes);
-      }
-    });
-
-    it('should return empty places if no valid bids are passed', function () {
-      const request = spec.buildRequests([], {});
-      expect(request.data.places).to.be.an('array').to.deep.equal([]);
-    });
-  });
-
-  describe('interpretResponse', function() {
-    const serverResponse = {
-      body: {
-        bids: [{
-          id: '51ef8751f9aead',
-          cpm: 0.23,
-          currency: RUB,
-          creativeId: 123,
-          displayUrl: 'displayUrl?t=123&p=456',
-          size: {
-            width: 300,
-            height: 250
-          }
-        }]
-      }
-    };
-
-    const emptyServerResponse = {
-      body: {
-        bids: []
-      }
-    };
-
-    it('should return valid data', function () {
-      const response = spec.interpretResponse(serverResponse);
-      expect(response).to.be.an('array');
-      for (let i = 0; i < response.length; i++) {
-        const item = response[i];
-        const bid = serverResponse.body.bids[i];
-        expect(item).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'creativeId',
-          'currency', 'netRevenue', 'ttl', 'adUrl');
-        expect(item.requestId).to.be.a('string');
-        expect(item.requestId).to.be.equal(bid.id);
-        expect(item.cpm).to.be.a('number');
-        expect(item.cpm).to.be.equal(bid.cpm);
-        expect(item.width).to.be.a('number');
-        expect(item.width).to.be.equal(bid.size.width);
-        expect(item.height).to.be.a('number');
-        expect(item.height).to.be.equal(bid.size.height);
-        expect(item.creativeId).to.be.a('number');
-        expect(item.creativeId).to.be.equal(bid.creativeId);
-        expect(item.currency).to.be.a('string');
-        expect(item.currency).to.be.equal(bid.currency);
-        expect(item.netRevenue).to.be.a('boolean');
-        expect(item.netRevenue).to.equal(true);
-        expect(item.ttl).to.be.a('number');
-        expect(item.ttl).to.be.equal(TIME_TO_LIVE);
-        expect(item.adUrl).to.be.a('string');
-        expect(item.adUrl).to.be.equal(bid.displayUrl);
-      }
-    });
-
-    it('should return empty array if no bids', function () {
-      const response = spec.interpretResponse(emptyServerResponse);
-      expect(response).to.be.an('array').to.deep.equal([]);
-    });
-
-    it('should return empty array if server response is invalid', function () {
-      const response = spec.interpretResponse({});
-      expect(response).to.be.an('array').to.deep.equal([]);
-    });
-  });
-
-  describe('getUserSyncs', function() {
-    it('should return iframe type if iframe enabled', function () {
-      const syncs = spec.getUserSyncs({ iframeEnabled: true });
-      const sync = syncs[0];
-      expect(syncs).to.be.an('array').with.lengthOf(1);
-      expect(sync).to.have.all.keys('type', 'url');
-      expect(sync.type).to.be.a('string');
-      expect(sync.type).to.be.equal('iframe');
-      expect(sync.url).to.be.a('string');
-      expect(sync.url).to.be.equal(SYNC_IFRAME_URL);
-    });
-
-    it('should return iframe type if iframe disabled, but image enable', function () {
-      const syncs = spec.getUserSyncs({ pixelEnabled: true });
-      const sync = syncs[0];
-      expect(syncs).to.be.an('array').with.lengthOf(1);
-      expect(sync).to.have.all.keys('type', 'url');
-      expect(sync.type).to.be.a('string');
-      expect(sync.type).to.be.equal('image');
-      expect(sync.url).to.be.a('string');
-      expect(sync.url).to.be.equal(SYNC_IMAGE_URL);
-    });
-
-    it('should return empty array if iframe and pixels disabled', function () {
-      const syncs = spec.getUserSyncs({});
-      expect(syncs).to.be.an('array').to.deep.equal([]);
-    });
-  });
-});
diff --git a/test/spec/modules/sekindoUMBidAdapter_spec.js b/test/spec/modules/sekindoUMBidAdapter_spec.js
deleted file mode 100644
index 2c361c21303..00000000000
--- a/test/spec/modules/sekindoUMBidAdapter_spec.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/sekindoUMBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-describe('sekindoUMAdapter', function () {
-  const adapter = newBidder(spec);
-
-  const bannerParams = {
-    'spaceId': '14071'
-  };
-
-  const videoParams = {
-    'spaceId': '14071',
-    'video': {
-      playerWidth: 300,
-      playerHeight: 250,
-      vid_vastType: 2 // optional
-    }
-  };
-
-  var bidRequests = {
-    'bidder': 'sekindoUM',
-    'params': bannerParams,
-    'adUnitCode': 'adunit-code',
-    'sizes': [[300, 250], [300, 600]],
-    'bidId': '30b31c1838de1e',
-    'bidderRequestId': '22edbae2733bf6',
-    'auctionId': '1d1a030790a475',
-    'mediaType': 'banner'
-  };
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found', function () {
-      bidRequests.mediaType = 'banner';
-      bidRequests.params = bannerParams;
-      expect(spec.isBidRequestValid(bidRequests)).to.equal(true);
-    });
-
-    it('should return false when required video params are missing', function () {
-      bidRequests.mediaType = 'video';
-      bidRequests.params = bannerParams;
-      expect(spec.isBidRequestValid(bidRequests)).to.equal(false);
-    });
-
-    it('should return true when required Video params found', function () {
-      bidRequests.mediaType = 'video';
-      bidRequests.params = videoParams;
-      expect(spec.isBidRequestValid(bidRequests)).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    it('banner data should be a query string and method = GET', function () {
-      bidRequests.mediaType = 'banner';
-      bidRequests.params = bannerParams;
-      const request = spec.buildRequests([bidRequests]);
-      expect(request[0].data).to.be.a('string');
-      expect(request[0].method).to.equal('GET');
-    });
-
-    it('with gdprConsent, banner data should be a query string and method = GET', function () {
-      bidRequests.mediaType = 'banner';
-      bidRequests.params = bannerParams;
-      const request = spec.buildRequests([bidRequests], {'gdprConsent': {'consentString': 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==', 'vendorData': {}, 'gdprApplies': true}});
-      expect(request[0].data).to.be.a('string');
-      expect(request[0].method).to.equal('GET');
-    });
-
-    it('video data should be a query string and method = GET', function () {
-      bidRequests.mediaType = 'video';
-      bidRequests.params = videoParams;
-      const request = spec.buildRequests([bidRequests]);
-      expect(request[0].data).to.be.a('string');
-      expect(request[0].method).to.equal('GET');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('banner should get correct bid response', function () {
-      let response = {
-        'headers': function(header) {
-          return 'dummy header';
-        },
-        'body': {'id': '30b31c1838de1e', 'bidderCode': 'sekindoUM', 'cpm': 2.1951, 'width': 300, 'height': 250, 'ad': '<h1>sekindo creative<\/h1>', 'ttl': 36000, 'creativeId': '323774', 'netRevenue': true, 'currency': 'USD'}
-      };
-
-      bidRequests.mediaType = 'banner';
-      bidRequests.params = bannerParams;
-      let expectedResponse = [
-        {
-          'requestId': '30b31c1838de1e',
-          'bidderCode': 'sekindoUM',
-          'cpm': 2.1951,
-          'width': 300,
-          'height': 250,
-          'creativeId': '323774',
-          'currency': 'USD',
-          'netRevenue': true,
-          'ttl': 36000,
-          'ad': '<h1>sekindo creative</h1>'
-        }
-      ];
-      let result = spec.interpretResponse(response, bidRequests);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
-
-    it('vastXml video should get correct bid response', function () {
-      let response = {
-        'headers': function(header) {
-          return 'dummy header';
-        },
-        'body': {'id': '30b31c1838de1e', 'bidderCode': 'sekindoUM', 'cpm': 2.1951, 'width': 300, 'height': 250, 'vastXml': '<vast/>', 'ttl': 36000, 'creativeId': '323774', 'netRevenue': true, 'currency': 'USD'}
-      };
-
-      bidRequests.mediaType = 'video';
-      bidRequests.params = videoParams;
-      let expectedResponse = [
-        {
-          'requestId': '30b31c1838de1e',
-          'bidderCode': 'sekindoUM',
-          'cpm': 2.1951,
-          'width': 300,
-          'height': 250,
-          'creativeId': '323774',
-          'currency': 'USD',
-          'netRevenue': true,
-          'ttl': 36000,
-          'vastXml': '<vast/>'
-        }
-      ];
-      let result = spec.interpretResponse(response, bidRequests);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
-
-    it('vastUrl video should get correct bid response', function () {
-      let response = {
-        'headers': function(header) {
-          return 'dummy header';
-        },
-        'body': {'id': '30b31c1838de1e', 'bidderCode': 'sekindoUM', 'cpm': 2.1951, 'width': 300, 'height': 250, 'vastUrl': 'https://vastUrl', 'ttl': 36000, 'creativeId': '323774', 'netRevenue': true, 'currency': 'USD'}
-      };
-      bidRequests.mediaType = 'video';
-      bidRequests.params = videoParams;
-      let expectedResponse = [
-        {
-          'requestId': '30b31c1838de1e',
-          'bidderCode': 'sekindoUM',
-          'cpm': 2.1951,
-          'width': 300,
-          'height': 250,
-          'creativeId': '323774',
-          'currency': 'USD',
-          'netRevenue': true,
-          'ttl': 36000,
-          'vastUrl': 'https://vastUrl'
-        }
-      ];
-      let result = spec.interpretResponse(response, bidRequests);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
-  });
-});
diff --git a/test/spec/modules/shareUserIds_spec.js b/test/spec/modules/shareUserIds_spec.js
deleted file mode 100644
index 451892919cb..00000000000
--- a/test/spec/modules/shareUserIds_spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import {userIdTargeting} from '../../../modules/userIdTargeting.js';
-import { expect } from 'chai';
-
-describe('#userIdTargeting', function() {
-  let userIds;
-  let config;
-
-  beforeEach(function() {
-    userIds = {
-      tdid: 'my-tdid'
-    };
-    config = {
-      'GAM': true,
-      'GAM_KEYS': {
-        'tdid': 'TD_ID'
-      }
-    };
-  });
-
-  it('Do nothing if config is invaild', function() {
-    let pubads = window.googletag.pubads();
-    pubads.clearTargeting();
-    pubads.setTargeting('test', ['TEST']);
-    userIdTargeting(userIds, JSON.stringify(config));
-    expect(pubads.getTargeting('test')).to.deep.equal(['TEST']);
-  });
-
-  it('all UserIds are passed as is with GAM: true', function() {
-    let pubads = window.googletag.pubads();
-    pubads.clearTargeting();
-    pubads.setTargeting('test', ['TEST']);
-    delete config.GAM_KEYS;
-    userIdTargeting(userIds, config);
-    expect(pubads.getTargeting('test')).to.deep.equal(['TEST']);
-    expect(pubads.getTargeting('tdid')).to.deep.equal(['my-tdid']);
-  })
-
-  it('Publisher prefered key-names are used', function() {
-    let pubads = window.googletag.pubads();
-    pubads.clearTargeting();
-    pubads.setTargeting('test', ['TEST']);
-    userIdTargeting(userIds, config);
-    expect(pubads.getTargeting('test')).to.deep.equal(['TEST']);
-    expect(pubads.getTargeting('TD_ID')).to.deep.equal(['my-tdid']);
-  });
-
-  it('Publisher does not want to pass an id', function() {
-    let pubads = window.googletag.pubads();
-    pubads.clearTargeting();
-    pubads.setTargeting('test', ['TEST']);
-    config.GAM_KEYS.tdid = '';
-    userIdTargeting(userIds, config);
-    expect(pubads.getTargeting('test')).to.deep.equal(['TEST']);
-  });
-});
diff --git a/test/spec/modules/sharedIdSystem_spec.js b/test/spec/modules/sharedIdSystem_spec.js
new file mode 100644
index 00000000000..8ef34a1599e
--- /dev/null
+++ b/test/spec/modules/sharedIdSystem_spec.js
@@ -0,0 +1,140 @@
+import {sharedIdSystemSubmodule, storage} from 'modules/sharedIdSystem.js';
+import {coppaDataHandler} from 'src/adapterManager';
+
+import sinon from 'sinon';
+import * as utils from 'src/utils.js';
+
+let expect = require('chai').expect;
+
+describe('SharedId System', function () {
+  const UUID = '15fde1dc-1861-4894-afdf-b757272f3568';
+
+  before(function () {
+    sinon.stub(utils, 'generateUUID').returns(UUID);
+    sinon.stub(utils, 'logInfo');
+  });
+
+  after(function () {
+    utils.generateUUID.restore();
+    utils.logInfo.restore();
+  });
+  describe('SharedId System getId()', function () {
+    const callbackSpy = sinon.spy();
+
+    let coppaDataHandlerDataStub
+    let sandbox;
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+      coppaDataHandlerDataStub = sandbox.stub(coppaDataHandler, 'getCoppa');
+      sandbox.stub(utils, 'hasDeviceAccess').returns(true);
+      coppaDataHandlerDataStub.returns('');
+      callbackSpy.resetHistory();
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+    });
+
+    it('should call UUID', function () {
+      let config = {
+        storage: {
+          type: 'cookie',
+          name: '_pubcid',
+          expires: 10
+        }
+      };
+
+      let submoduleCallback = sharedIdSystemSubmodule.getId(config, undefined).callback;
+      submoduleCallback(callbackSpy);
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(callbackSpy.lastCall.lastArg).to.equal(UUID);
+    });
+    it('should abort if coppa is set', function () {
+      coppaDataHandlerDataStub.returns('true');
+      const result = sharedIdSystemSubmodule.getId({});
+      expect(result).to.be.undefined;
+    });
+  });
+  describe('SharedId System extendId()', function () {
+    const callbackSpy = sinon.spy();
+    let coppaDataHandlerDataStub;
+    let sandbox;
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+      coppaDataHandlerDataStub = sandbox.stub(coppaDataHandler, 'getCoppa');
+      sandbox.stub(utils, 'hasDeviceAccess').returns(true);
+      callbackSpy.resetHistory();
+      coppaDataHandlerDataStub.returns('');
+    });
+    afterEach(function () {
+      sandbox.restore();
+    });
+    it('should call UUID', function () {
+      let config = {
+        params: {
+          extend: true
+        },
+        storage: {
+          type: 'cookie',
+          name: '_pubcid',
+          expires: 10
+        }
+      };
+      let pubcommId = sharedIdSystemSubmodule.extendId(config, undefined, 'TestId').id;
+      expect(pubcommId).to.equal('TestId');
+    });
+    it('should abort if coppa is set', function () {
+      coppaDataHandlerDataStub.returns('true');
+      const result = sharedIdSystemSubmodule.extendId({params: {extend: true}}, undefined, 'TestId');
+      expect(result).to.be.undefined;
+    });
+  });
+
+  describe('SharedID System domainOverride', () => {
+    let sandbox, domain, cookies, rejectCookiesFor;
+
+    beforeEach(() => {
+      sandbox = sinon.createSandbox();
+      sandbox.stub(document, 'domain').get(() => domain);
+      cookies = {};
+      sandbox.stub(storage, 'getCookie').callsFake((key) => cookies[key]);
+      rejectCookiesFor = null;
+      sandbox.stub(storage, 'setCookie').callsFake((key, value, expires, sameSite, domain) => {
+        if (domain !== rejectCookiesFor) {
+          if (expires != null) {
+            expires = new Date(expires);
+          }
+          if (expires == null || expires > Date.now()) {
+            cookies[key] = value;
+          } else {
+            delete cookies[key];
+          }
+        }
+      });
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('should return TLD if cookies can be set there', () => {
+      domain = 'sub.domain.com';
+      rejectCookiesFor = 'com';
+      expect(sharedIdSystemSubmodule.domainOverride()).to.equal('domain.com');
+    });
+
+    it('should return undefined when cookies cannot be set', () => {
+      domain = 'sub.domain.com';
+      rejectCookiesFor = 'sub.domain.com';
+      expect(sharedIdSystemSubmodule.domainOverride()).to.be.undefined;
+    });
+
+    it('should return half-way domain if parent domain rejects cookies', () => {
+      domain = 'inner.outer.domain.com';
+      rejectCookiesFor = 'domain.com';
+      expect(sharedIdSystemSubmodule.domainOverride()).to.equal('outer.domain.com');
+    });
+  });
+});
diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js
index 92f9fd11eeb..56e10a74240 100644
--- a/test/spec/modules/sharethroughBidAdapter_spec.js
+++ b/test/spec/modules/sharethroughBidAdapter_spec.js
@@ -1,198 +1,39 @@
 import { expect } from 'chai';
+import * as sinon from 'sinon';
 import { sharethroughAdapterSpec, sharethroughInternal } from 'modules/sharethroughBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config';
+import * as utils from 'src/utils';
 
 const spec = newBidder(sharethroughAdapterSpec).getSpec();
-const bidRequests = [
-  {
-    bidder: 'sharethrough',
-    bidId: 'bidId1',
-    sizes: [[600, 300]],
-    placementCode: 'foo',
-    params: {
-      pkey: 'aaaa1111'
-    },
-    userId: { tdid: 'fake-tdid' }
-  },
-  {
-    bidder: 'sharethrough',
-    bidId: 'bidId2',
-    sizes: [[700, 400]],
-    placementCode: 'bar',
-    params: {
-      pkey: 'bbbb2222',
-      iframe: true
-    }
-  },
-  {
-    bidder: 'sharethrough',
-    bidId: 'bidId3',
-    sizes: [[700, 400]],
-    placementCode: 'coconut',
-    params: {
-      pkey: 'cccc3333',
-      iframe: true,
-      iframeSize: [500, 500]
-    },
-  },
-];
-
-const prebidRequests = [
-  {
-    method: 'GET',
-    url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
-    data: {
-      bidId: 'bidId',
-      placement_key: 'pKey'
-    },
-    strData: {
-      skipIframeBusting: false,
-      sizes: []
-    }
-  },
-  {
-    method: 'GET',
-    url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
-    data: {
-      bidId: 'bidId',
-      placement_key: 'pKey'
-    },
-    strData: {
-      skipIframeBusting: true,
-      sizes: [[300, 250], [300, 300], [250, 250], [600, 50]]
-    }
-  },
-  {
-    method: 'GET',
-    url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
-    data: {
-      bidId: 'bidId',
-      placement_key: 'pKey'
-    },
-    strData: {
-      skipIframeBusting: true,
-      iframeSize: [500, 500],
-      sizes: [[300, 250], [300, 300], [250, 250], [600, 50]]
-    }
-  },
-  {
-    method: 'GET',
-    url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
-    data: {
-      bidId: 'bidId',
-      placement_key: 'pKey'
-    },
-    strData: {
-      skipIframeBusting: false,
-      sizes: [[0, 0]]
-    }
-  },
-  {
-    method: 'GET',
-    url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
-    data: {
-      bidId: 'bidId',
-      placement_key: 'pKey'
-    },
-    strData: {
-      skipIframeBusting: false,
-      sizes: [[300, 250], [300, 300], [250, 250], [600, 50]]
-    }
-  },
-];
-
-const bidderResponse = {
-  body: {
-    'adserverRequestId': '40b6afd5-6134-4fbb-850a-bb8972a46994',
-    'bidId': 'bidId1',
-    'version': 1,
-    'creatives': [{
-      'auctionWinId': 'b2882d5e-bf8b-44da-a91c-0c11287b8051',
-      'cpm': 12.34,
-      'creative': {
-        'deal_id': 'aDealId',
-        'creative_key': 'aCreativeId',
-        'title': '✓ à la mode'
-      }
-    }],
-    'stxUserId': ''
-  },
-  header: { get: (header) => header }
-};
-
-const setUserAgent = (uaString) => {
-  window.navigator['__defineGetter__']('userAgent', function () {
-    return uaString;
-  });
-};
 
-describe('sharethrough internal spec', function () {
-  let windowSpy, windowTopSpy;
+describe('sharethrough adapter spec', function () {
+  let protocolStub;
+  let inIframeStub;
 
-  beforeEach(function() {
-    windowSpy = sinon.spy(window.document, 'getElementsByTagName');
-    windowTopSpy = sinon.spy(window.top.document, 'getElementsByTagName');
+  beforeEach(() => {
+    protocolStub = sinon.stub(sharethroughInternal, 'getProtocol').returns('https');
+    inIframeStub = sinon.stub(utils, 'inIframe').returns(false);
   });
 
-  afterEach(function() {
-    windowSpy.restore();
-    windowTopSpy.restore();
-    window.STR = undefined;
-    window.top.STR = undefined;
+  afterEach(() => {
+    protocolStub.restore();
+    inIframeStub.restore();
   });
 
-  describe('we cannot access top level document', function () {
-    beforeEach(function() {
-      window.lockedInFrame = true;
-    });
-
-    afterEach(function() {
-      window.lockedInFrame = false;
-    });
-
-    it('appends sfp.js to the safeframe', function () {
-      sharethroughInternal.handleIframe();
-      expect(windowSpy.calledOnce).to.be.true;
-    });
-
-    it('does not append anything if sfp.js is already loaded in the safeframe', function () {
-      window.STR = { Tag: true };
-      sharethroughInternal.handleIframe();
-      expect(windowSpy.notCalled).to.be.true;
-      expect(windowTopSpy.notCalled).to.be.true;
-    });
-  });
-
-  describe('we are able to bust out of the iframe', function () {
-    it('appends sfp.js to window.top', function () {
-      sharethroughInternal.handleIframe();
-      expect(windowSpy.calledOnce).to.be.true;
-      expect(windowTopSpy.calledOnce).to.be.true;
-    });
-
-    it('only appends sfp-set-targeting.js if sfp.js is already loaded on the page', function () {
-      window.top.STR = { Tag: true };
-      sharethroughInternal.handleIframe();
-      expect(windowSpy.calledOnce).to.be.true;
-      expect(windowTopSpy.notCalled).to.be.true;
-    });
-  });
-});
-
-describe('sharethrough adapter spec', function () {
-  describe('.code', function () {
+  describe('code', function () {
     it('should return a bidder code of sharethrough', function () {
       expect(spec.code).to.eql('sharethrough');
     });
   });
 
-  describe('.isBidRequestValid', function () {
+  describe('isBidRequestValid', function () {
     it('should return false if req has no pkey', function () {
       const invalidBidRequest = {
         bidder: 'sharethrough',
         params: {
-          notPKey: 'abc123'
-        }
+          notPKey: 'abc123',
+        },
       };
       expect(spec.isBidRequestValid(invalidBidRequest)).to.eql(false);
     });
@@ -201,297 +42,623 @@ describe('sharethrough adapter spec', function () {
       const invalidBidRequest = {
         bidder: 'notSharethrough',
         params: {
-          notPKey: 'abc123'
-        }
+          pkey: 'abc123',
+        },
       };
       expect(spec.isBidRequestValid(invalidBidRequest)).to.eql(false);
     });
 
     it('should return true if req is correct', function () {
-      expect(spec.isBidRequestValid(bidRequests[0])).to.eq(true);
-      expect(spec.isBidRequestValid(bidRequests[1])).to.eq(true);
-    })
+      const validBidRequest = {
+        bidder: 'sharethrough',
+        params: {
+          pkey: 'abc123',
+        },
+      };
+      expect(spec.isBidRequestValid(validBidRequest)).to.eq(true);
+    });
   });
 
-  describe('.buildRequests', function () {
-    it('should return an array of requests', function () {
-      const builtBidRequests = spec.buildRequests(bidRequests);
+  describe('open rtb', () => {
+    let bidRequests, bidderRequest;
 
-      expect(builtBidRequests[0].url).to.eq('https://btlr.sharethrough.com/WYu2BXv1/v1');
-      expect(builtBidRequests[1].url).to.eq('https://btlr.sharethrough.com/WYu2BXv1/v1');
-      expect(builtBidRequests[0].method).to.eq('GET');
+    beforeEach(() => {
+      config.setConfig({
+        bidderTimeout: 242,
+        coppa: true,
+      });
+
+      bidRequests = [
+        {
+          bidder: 'sharethrough',
+          bidId: 'bidId1',
+          transactionId: 'transactionId1',
+          sizes: [[300, 250], [300, 600]],
+          params: {
+            pkey: 'aaaa1111',
+            bcat: ['cat1', 'cat2'],
+            badv: ['adv1', 'adv2'],
+          },
+          mediaTypes: {
+            banner: {
+              pos: 1,
+            },
+          },
+          ortb2Imp: {
+            ext: {
+              tid: 'transaction-id-1',
+              gpid: 'universal-id',
+              data: {
+                pbadslot: 'pbadslot-id',
+              },
+            },
+          },
+          userId: {
+            tdid: 'fake-tdid',
+            pubcid: 'fake-pubcid',
+            idl_env: 'fake-identity-link',
+            id5id: {
+              uid: 'fake-id5id',
+              ext: {
+                linkType: 2,
+              },
+            },
+            lipb: {
+              lipbid: 'fake-lipbid',
+            },
+            criteoId: 'fake-criteo',
+            britepoolid: 'fake-britepool',
+            intentIqId: 'fake-intentiq',
+            lotamePanoramaId: 'fake-lotame',
+            parrableId: {
+              eid: 'fake-parrable',
+            },
+            netId: 'fake-netid',
+            sharedid: {
+              id: 'fake-sharedid',
+            },
+          },
+          crumbs: {
+            pubcid: 'fake-pubcid-in-crumbs-obj',
+          },
+          schain: {
+            ver: '1.0',
+            complete: 1,
+            nodes: [
+              {
+                asi: 'directseller.com',
+                sid: '00001',
+                rid: 'BidRequest1',
+                hp: 1,
+              },
+            ],
+          },
+          getFloor: () => ({ currency: 'USD', floor: 42 }),
+        },
+        {
+          bidder: 'sharethrough',
+          bidId: 'bidId2',
+          sizes: [[600, 300]],
+          transactionId: 'transactionId2',
+          params: {
+            pkey: 'bbbb2222',
+          },
+          mediaTypes: {
+            video: {
+              pos: 3,
+              skip: 1,
+              linearity: 0,
+              minduration: 10,
+              maxduration: 30,
+              playbackmethod: [1],
+              api: [3],
+              mimes: ['video/3gpp'],
+              protocols: [2, 3],
+              playerSize: [640, 480],
+              startdelay: 42,
+              skipmin: 10,
+              skipafter: 20,
+              delivery: 1,
+              companiontype: 'companion type',
+              companionad: 'companion ad',
+              context: 'instream',
+            },
+          },
+          getFloor: () => ({ currency: 'USD', floor: 42 }),
+        },
+      ];
+
+      bidderRequest = {
+        refererInfo: {
+          ref: 'https://referer.com',
+        },
+        auctionId: 'auction-id'
+      };
     });
 
-    it('should set the instant_play_capable parameter correctly based on browser userAgent string', function () {
-      setUserAgent('Android Chrome/60');
-      let builtBidRequests = spec.buildRequests(bidRequests);
-      expect(builtBidRequests[0].data.instant_play_capable).to.be.true;
+    describe('buildRequests', function () {
+      describe('top level object', () => {
+        it('should build openRTB request', () => {
+          const builtRequests = spec.buildRequests(bidRequests, bidderRequest);
+
+          const expectedImpValues = [
+            {
+              id: 'bidId1',
+              tagid: 'aaaa1111',
+              secure: 1,
+              bidfloor: 42,
+            },
+            {
+              id: 'bidId2',
+              tagid: 'bbbb2222',
+              secure: 1,
+              bidfloor: 42,
+            },
+          ];
+
+          builtRequests.map((builtRequest, rIndex) => {
+            expect(builtRequest.method).to.equal('POST');
+            expect(builtRequest.url).not.to.be.undefined;
+            expect(builtRequest.options).to.be.undefined;
+
+            const openRtbReq = builtRequest.data;
+            expect(openRtbReq.id).not.to.be.undefined;
+            expect(openRtbReq.cur).to.deep.equal(['USD']);
+            expect(openRtbReq.tmax).to.equal(242);
+
+            expect(Object.keys(openRtbReq.site)).to.have.length(3);
+            expect(openRtbReq.site.domain).not.to.be.undefined;
+            expect(openRtbReq.site.page).not.to.be.undefined;
+            expect(openRtbReq.site.ref).to.equal('https://referer.com');
+
+            const expectedEids = {
+              'liveramp.com': { id: 'fake-identity-link' },
+              'id5-sync.com': { id: 'fake-id5id' },
+              'pubcid.org': { id: 'fake-pubcid' },
+              'adserver.org': { id: 'fake-tdid' },
+              'criteo.com': { id: 'fake-criteo' },
+              'britepool.com': { id: 'fake-britepool' },
+              'liveintent.com': { id: 'fake-lipbid' },
+              'intentiq.com': { id: 'fake-intentiq' },
+              'crwdcntrl.net': { id: 'fake-lotame' },
+              'parrable.com': { id: 'fake-parrable' },
+              'netid.de': { id: 'fake-netid' },
+            };
+            expect(openRtbReq.user.ext.eids).to.be.an('array').that.have.length(Object.keys(expectedEids).length);
+            for (const eid of openRtbReq.user.ext.eids) {
+              expect(Object.keys(expectedEids)).to.include(eid.source);
+              expect(eid.uids[0].id).to.equal(expectedEids[eid.source].id);
+              expect(eid.uids[0].atype).to.be.ok;
+            }
+
+            expect(openRtbReq.device.ua).to.equal(navigator.userAgent);
+            expect(openRtbReq.regs.coppa).to.equal(1);
+
+            expect(openRtbReq.source.tid).to.equal(bidderRequest.auctionId);
+            expect(openRtbReq.source.ext.version).not.to.be.undefined;
+            expect(openRtbReq.source.ext.str).not.to.be.undefined;
+            expect(openRtbReq.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+
+            expect(openRtbReq.bcat).to.deep.equal(bidRequests[0].params.bcat);
+            expect(openRtbReq.badv).to.deep.equal(bidRequests[0].params.badv);
+
+            expect(openRtbReq.imp).to.have.length(1);
+
+            expect(openRtbReq.imp[0].id).to.equal(expectedImpValues[rIndex].id);
+            expect(openRtbReq.imp[0].tagid).to.equal(expectedImpValues[rIndex].tagid);
+            expect(openRtbReq.imp[0].secure).to.equal(expectedImpValues[rIndex].secure);
+            expect(openRtbReq.imp[0].bidfloor).to.equal(expectedImpValues[rIndex].bidfloor);
+          });
+        });
+
+        it('should have empty eid array if no id is provided', () => {
+          const openRtbReq = spec.buildRequests([bidRequests[1]], bidderRequest)[0].data;
 
-      setUserAgent('iPhone Version/11');
-      builtBidRequests = spec.buildRequests(bidRequests);
-      expect(builtBidRequests[0].data.instant_play_capable).to.be.true;
+          expect(openRtbReq.user.ext.eids).to.deep.equal([]);
+        });
+      });
 
-      setUserAgent('iPhone CriOS/60');
-      builtBidRequests = spec.buildRequests(bidRequests);
-      expect(builtBidRequests[0].data.instant_play_capable).to.be.true;
+      describe('no referer provided', () => {
+        beforeEach(() => {
+          bidderRequest = {};
+        });
 
-      setUserAgent('Android Chrome/50');
-      builtBidRequests = spec.buildRequests(bidRequests);
-      expect(builtBidRequests[0].data.instant_play_capable).to.be.false;
+        it('should set referer to undefined', () => {
+          const openRtbReq = spec.buildRequests(bidRequests, bidderRequest)[0].data;
+          expect(openRtbReq.site.ref).to.be.undefined;
+        });
+      });
 
-      setUserAgent('Android Chrome');
-      builtBidRequests = spec.buildRequests(bidRequests);
-      expect(builtBidRequests[0].data.instant_play_capable).to.be.false;
+      describe('regulation', () => {
+        describe('gdpr', () => {
+          it('should populate request accordingly when gdpr applies', () => {
+            bidderRequest.gdprConsent = {
+              gdprApplies: true,
+              consentString: 'consent',
+            };
 
-      setUserAgent(undefined);
-      builtBidRequests = spec.buildRequests(bidRequests);
-      expect(builtBidRequests[0].data.instant_play_capable).to.be.false;
-    });
+            const openRtbReq = spec.buildRequests(bidRequests, bidderRequest)[0].data;
 
-    it('should set the secure parameter to false when the protocol is http', function() {
-      const stub = sinon.stub(sharethroughInternal, 'getProtocol').returns('http:');
-      const bidRequest = spec.buildRequests(bidRequests, null)[0];
-      expect(bidRequest.data.secure).to.be.false;
-      stub.restore()
-    });
+            expect(openRtbReq.regs.ext.gdpr).to.equal(1);
+            expect(openRtbReq.user.ext.consent).to.equal('consent');
+          });
 
-    it('should set the secure parameter to true when the protocol is https', function() {
-      const stub = sinon.stub(sharethroughInternal, 'getProtocol').returns('https:');
-      const bidRequest = spec.buildRequests(bidRequests, null)[0];
-      expect(bidRequest.data.secure).to.be.true;
-      stub.restore()
-    });
+          it('should populate request accordingly when gdpr explicitly does not apply', () => {
+            bidderRequest.gdprConsent = {
+              gdprApplies: false,
+            };
 
-    it('should set the secure parameter to true when the protocol is neither http or https', function() {
-      const stub = sinon.stub(sharethroughInternal, 'getProtocol').returns('about:');
-      const bidRequest = spec.buildRequests(bidRequests, null)[0];
-      expect(bidRequest.data.secure).to.be.true;
-      stub.restore()
-    });
+            const openRtbReq = spec.buildRequests(bidRequests, bidderRequest)[0].data;
 
-    it('should add ccpa parameter if uspConsent is present', function () {
-      const uspConsent = '1YNN';
-      const bidderRequest = { uspConsent: uspConsent };
-      const bidRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
-      expect(bidRequest.data.us_privacy).to.eq(uspConsent);
-    });
+            expect(openRtbReq.regs.ext.gdpr).to.equal(0);
+            expect(openRtbReq.user.ext.consent).to.be.undefined;
+          });
+        });
 
-    it('should add consent parameters if gdprConsent is present', function () {
-      const gdprConsent = { consentString: 'consent_string123', gdprApplies: true };
-      const bidderRequest = { gdprConsent: gdprConsent };
-      const bidRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
-      expect(bidRequest.data.consent_required).to.eq(true);
-      expect(bidRequest.data.consent_string).to.eq('consent_string123');
-    });
+        describe('US privacy', () => {
+          it('should populate request accordingly when us privacy applies', () => {
+            bidderRequest.uspConsent = 'consent';
 
-    it('should handle gdprConsent is present but values are undefined case', function () {
-      const gdprConsent = { consent_string: undefined, gdprApplies: undefined };
-      const bidderRequest = { gdprConsent: gdprConsent };
-      const bidRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
-      expect(bidRequest.data).to.not.include.any.keys('consent_string')
-    });
+            const openRtbReq = spec.buildRequests(bidRequests, bidderRequest)[0].data;
 
-    it('should add the ttduid parameter if a bid request contains a value for Unified ID from The Trade Desk', function () {
-      const bidRequest = spec.buildRequests(bidRequests)[0];
-      expect(bidRequest.data.ttduid).to.eq('fake-tdid');
-    });
+            expect(openRtbReq.regs.ext.us_privacy).to.equal('consent');
+          });
+        });
 
-    it('should add Sharethrough specific parameters', function () {
-      const builtBidRequests = spec.buildRequests(bidRequests);
-      expect(builtBidRequests[0]).to.deep.include({
-        strData: {
-          skipIframeBusting: undefined,
-          iframeSize: undefined,
-          sizes: [[600, 300]]
-        }
+        describe('coppa', () => {
+          it('should populate request accordingly when coppa does not apply', () => {
+            config.setConfig({ coppa: false });
+
+            const openRtbReq = spec.buildRequests(bidRequests, bidderRequest)[0].data;
+
+            expect(openRtbReq.regs.coppa).to.equal(0);
+          });
+        });
       });
-    });
 
-    it('should add a supply chain parameter if schain is present', function() {
-      // shallow copy of the first bidRequest obj, so we don't mutate
-      const bidRequest = Object.assign({}, bidRequests[0]);
-      bidRequest['schain'] = {
-        ver: '1.0',
-        complete: 1,
-        nodes: [
-          {
-            asi: 'directseller.com',
-            sid: '00001',
-            rid: 'BidRequest1',
-            hp: 1
-          }
-        ]
-      };
+      describe('transaction id at the impression level', () => {
+        it('should include transaction id when provided', () => {
+          const requests = spec.buildRequests(bidRequests, bidderRequest);
 
-      const builtBidRequest = spec.buildRequests([bidRequest])[0];
-      expect(builtBidRequest.data.schain).to.eq(JSON.stringify(bidRequest.schain));
-    });
+          expect(requests[0].data.imp[0].ext.tid).to.equal('transaction-id-1');
+          expect(requests[1].data.imp[0].ext).to.be.empty;
+        });
+      });
 
-    it('should not add a supply chain parameter if schain is missing', function() {
-      const bidRequest = spec.buildRequests(bidRequests)[0];
-      expect(bidRequest.data).to.not.include.any.keys('schain');
-    });
+      describe('universal id', () => {
+        it('should include gpid when universal id is provided', () => {
+          const requests = spec.buildRequests(bidRequests, bidderRequest);
 
-    it('should include the bidfloor parameter if it is present in the bid request', function() {
-      const bidRequest = Object.assign({}, bidRequests[0]);
-      bidRequest['bidfloor'] = 0.50;
-      const builtBidRequest = spec.buildRequests([bidRequest])[0];
-      expect(builtBidRequest.data.bidfloor).to.eq(0.5);
-    });
+          expect(requests[0].data.imp[0].ext.gpid).to.equal('universal-id');
+          expect(requests[1].data.imp[0].ext).to.be.empty;
+        });
 
-    it('should not include the bidfloor parameter if it is missing in the bid request', function() {
-      const bidRequest = Object.assign({}, bidRequests[0]);
-      const builtBidRequest = spec.buildRequests([bidRequest])[0];
-      expect(builtBidRequest.data).to.not.include.any.keys('bidfloor');
-    });
-  });
+        it('should include gpid when pbadslot is provided without universal id', () => {
+          delete bidRequests[0].ortb2Imp.ext.gpid;
+          const requests = spec.buildRequests(bidRequests, bidderRequest);
 
-  describe('.interpretResponse', function () {
-    it('returns a correctly parsed out response', function () {
-      expect(spec.interpretResponse(bidderResponse, prebidRequests[0])[0]).to.include(
-        {
-          width: 1,
-          height: 1,
-          cpm: 12.34,
-          creativeId: 'aCreativeId',
-          dealId: 'aDealId',
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 360,
+          expect(requests[0].data.imp[0].ext.gpid).to.equal('pbadslot-id');
         });
-    });
+      });
 
-    it('returns a correctly parsed out response with largest size when strData.skipIframeBusting is true', function () {
-      expect(spec.interpretResponse(bidderResponse, prebidRequests[1])[0]).to.include(
-        {
-          width: 300,
-          height: 300,
-          cpm: 12.34,
-          creativeId: 'aCreativeId',
-          dealId: 'aDealId',
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 360,
+      describe('secure flag', () => {
+        it('should be positive when protocol is https', () => {
+          protocolStub.returns('https');
+          const requests = spec.buildRequests(bidRequests, bidderRequest);
+
+          expect(requests[0].data.imp[0].secure).to.equal(1);
+          expect(requests[1].data.imp[0].secure).to.equal(1);
         });
-    });
 
-    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is true and strData.iframeSize is provided', function () {
-      expect(spec.interpretResponse(bidderResponse, prebidRequests[2])[0]).to.include(
-        {
-          width: 500,
-          height: 500,
-          cpm: 12.34,
-          creativeId: 'aCreativeId',
-          dealId: 'aDealId',
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 360,
+        it('should be negative when protocol is http', () => {
+          protocolStub.returns('http');
+          const requests = spec.buildRequests(bidRequests, bidderRequest);
+
+          expect(requests[0].data.imp[0].secure).to.equal(0);
+          expect(requests[1].data.imp[0].secure).to.equal(0);
         });
-    });
 
-    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is false and strData.sizes contains [0, 0] only', function () {
-      expect(spec.interpretResponse(bidderResponse, prebidRequests[3])[0]).to.include(
-        {
-          width: 0,
-          height: 0,
-          cpm: 12.34,
-          creativeId: 'aCreativeId',
-          dealId: 'aDealId',
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 360,
+        it('should be positive when protocol is neither http nor https', () => {
+          protocolStub.returns('about');
+          const requests = spec.buildRequests(bidRequests, bidderRequest);
+
+          expect(requests[0].data.imp[0].secure).to.equal(1);
+          expect(requests[1].data.imp[0].secure).to.equal(1);
         });
-    });
+      });
 
-    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is false and strData.sizes contains multiple sizes', function () {
-      expect(spec.interpretResponse(bidderResponse, prebidRequests[4])[0]).to.include(
-        {
-          width: 300,
-          height: 300,
-          cpm: 12.34,
-          creativeId: 'aCreativeId',
-          dealId: 'aDealId',
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 360,
+      describe('banner imp', () => {
+        it('should generate open rtb banner imp', () => {
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
+
+          const bannerImp = builtRequest.data.imp[0].banner;
+          expect(bannerImp.pos).to.equal(1);
+          expect(bannerImp.topframe).to.equal(1);
+          expect(bannerImp.format).to.deep.equal([{ w: 300, h: 250 }, { w: 300, h: 600 }]);
         });
-    });
 
-    it('returns a blank array if there are no creatives', function () {
-      const bidResponse = { body: { creatives: [] } };
-      expect(spec.interpretResponse(bidResponse, prebidRequests[0])).to.be.an('array').that.is.empty;
-    });
+        it('should default to pos 0 if not provided', () => {
+          delete bidRequests[0].mediaTypes;
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
 
-    it('returns a blank array if body object is empty', function () {
-      const bidResponse = { body: {} };
-      expect(spec.interpretResponse(bidResponse, prebidRequests[0])).to.be.an('array').that.is.empty;
-    });
+          const bannerImp = builtRequest.data.imp[0].banner;
+          expect(bannerImp.pos).to.equal(0);
+        });
+      });
 
-    it('returns a blank array if body is null', function () {
-      const bidResponse = { body: null };
-      expect(spec.interpretResponse(bidResponse, prebidRequests[0])).to.be.an('array').that.is.empty;
-    });
+      describe('video imp', () => {
+        it('should generate open rtb video imp', () => {
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[1];
+
+          const videoImp = builtRequest.data.imp[0].video;
+          expect(videoImp.pos).to.equal(3);
+          expect(videoImp.topframe).to.equal(1);
+          expect(videoImp.skip).to.equal(1);
+          expect(videoImp.linearity).to.equal(0);
+          expect(videoImp.minduration).to.equal(10);
+          expect(videoImp.maxduration).to.equal(30);
+          expect(videoImp.playbackmethod).to.deep.equal([1]);
+          expect(videoImp.api).to.deep.equal([3]);
+          expect(videoImp.mimes).to.deep.equal(['video/3gpp']);
+          expect(videoImp.protocols).to.deep.equal([2, 3]);
+          expect(videoImp.w).to.equal(640);
+          expect(videoImp.h).to.equal(480);
+          expect(videoImp.startdelay).to.equal(42);
+          expect(videoImp.skipmin).to.equal(10);
+          expect(videoImp.skipafter).to.equal(20);
+          expect(videoImp.placement).to.equal(1);
+          expect(videoImp.delivery).to.equal(1);
+          expect(videoImp.companiontype).to.equal('companion type');
+          expect(videoImp.companionad).to.equal('companion ad');
+        });
 
-    it('correctly generates ad markup when skipIframeBusting is false', function () {
-      const adMarkup = spec.interpretResponse(bidderResponse, prebidRequests[0])[0].ad;
-      let resp = null;
+        it('should set defaults if no value provided', () => {
+          delete bidRequests[1].mediaTypes.video.pos;
+          delete bidRequests[1].mediaTypes.video.skip;
+          delete bidRequests[1].mediaTypes.video.linearity;
+          delete bidRequests[1].mediaTypes.video.minduration;
+          delete bidRequests[1].mediaTypes.video.maxduration;
+          delete bidRequests[1].mediaTypes.video.playbackmethod;
+          delete bidRequests[1].mediaTypes.video.api;
+          delete bidRequests[1].mediaTypes.video.mimes;
+          delete bidRequests[1].mediaTypes.video.protocols;
+          delete bidRequests[1].mediaTypes.video.playerSize;
+          delete bidRequests[1].mediaTypes.video.startdelay;
+          delete bidRequests[1].mediaTypes.video.skipmin;
+          delete bidRequests[1].mediaTypes.video.skipafter;
+          delete bidRequests[1].mediaTypes.video.placement;
+          delete bidRequests[1].mediaTypes.video.delivery;
+          delete bidRequests[1].mediaTypes.video.companiontype;
+          delete bidRequests[1].mediaTypes.video.companionad;
+
+          const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[1];
+
+          const videoImp = builtRequest.data.imp[0].video;
+          expect(videoImp.pos).to.equal(0);
+          expect(videoImp.skip).to.equal(0);
+          expect(videoImp.linearity).to.equal(1);
+          expect(videoImp.minduration).to.equal(5);
+          expect(videoImp.maxduration).to.equal(60);
+          expect(videoImp.playbackmethod).to.deep.equal([2]);
+          expect(videoImp.api).to.deep.equal([2]);
+          expect(videoImp.mimes).to.deep.equal(['video/mp4']);
+          expect(videoImp.protocols).to.deep.equal([2, 3, 5, 6, 7, 8]);
+          expect(videoImp.w).to.equal(640);
+          expect(videoImp.h).to.equal(360);
+          expect(videoImp.startdelay).to.equal(0);
+          expect(videoImp.skipmin).to.equal(0);
+          expect(videoImp.skipafter).to.equal(0);
+          expect(videoImp.placement).to.equal(1);
+          expect(videoImp.delivery).to.be.undefined;
+          expect(videoImp.companiontype).to.be.undefined;
+          expect(videoImp.companionad).to.be.undefined;
+        });
 
-      expect(() => btoa(JSON.stringify(bidderResponse))).to.throw();
-      expect(() => resp = sharethroughInternal.b64EncodeUnicode(JSON.stringify(bidderResponse))).not.to.throw();
-      expect(adMarkup).to.match(
-        /data-str-native-key="pKey" data-stx-response-name="str_response_bidId"/);
-      expect(!!adMarkup.indexOf(resp)).to.eql(true);
+        describe('outstream', () => {
+          it('should use placement value if provided', () => {
+            bidRequests[1].mediaTypes.video.context = 'outstream';
+            bidRequests[1].mediaTypes.video.placement = 3;
 
-      // insert functionality to autodetect whether or not in safeframe, and handle JS insertion
-      expect(adMarkup).to.match(/isLockedInFrame/);
-      expect(adMarkup).to.match(/handleIframe/);
-    });
+            const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[1];
+            const videoImp = builtRequest.data.imp[0].video;
 
-    it('correctly generates ad markup when skipIframeBusting is true', function () {
-      const adMarkup = spec.interpretResponse(bidderResponse, prebidRequests[1])[0].ad;
-      let resp = null;
-
-      expect(() => btoa(JSON.stringify(bidderResponse))).to.throw();
-      expect(() => resp = sharethroughInternal.b64EncodeUnicode(JSON.stringify(bidderResponse))).not.to.throw();
-      expect(adMarkup).to.match(
-        /data-str-native-key="pKey" data-stx-response-name="str_response_bidId"/);
-      expect(!!adMarkup.indexOf(resp)).to.eql(true);
-      expect(adMarkup).to.match(
-        /<script src="https:\/\/native.sharethrough.com\/assets\/sfp.js"><\/script>/);
-    });
-  });
+            expect(videoImp.placement).to.equal(3);
+          });
 
-  describe('.getUserSyncs', function () {
-    const cookieSyncs = ['cookieUrl1', 'cookieUrl2', 'cookieUrl3'];
-    const serverResponses = [{ body: { cookieSyncUrls: cookieSyncs } }];
-
-    it('returns an array of correctly formatted user syncs', function () {
-      const syncArray = spec.getUserSyncs({ pixelEnabled: true }, serverResponses, null, 'fake-privacy-signal');
-      expect(syncArray).to.deep.equal([
-        { type: 'image', url: 'cookieUrl1&us_privacy=fake-privacy-signal' },
-        { type: 'image', url: 'cookieUrl2&us_privacy=fake-privacy-signal' },
-        { type: 'image', url: 'cookieUrl3&us_privacy=fake-privacy-signal' }]
-      );
-    });
+          it('should default placement to 4 if not provided', () => {
+            bidRequests[1].mediaTypes.video.context = 'outstream';
 
-    it('returns an empty array if serverResponses is empty', function () {
-      const syncArray = spec.getUserSyncs({ pixelEnabled: true }, []);
-      expect(syncArray).to.be.an('array').that.is.empty;
-    });
+            const builtRequest = spec.buildRequests(bidRequests, bidderRequest)[1];
+            const videoImp = builtRequest.data.imp[0].video;
 
-    it('returns an empty array if the body is null', function () {
-      const syncArray = spec.getUserSyncs({ pixelEnabled: true }, [{ body: null }]);
-      expect(syncArray).to.be.an('array').that.is.empty;
+            expect(videoImp.placement).to.equal(4);
+          });
+        });
+      });
+
+      describe('first party data', () => {
+        const firstPartyData = {
+          site: {
+            name: 'example',
+            keywords: 'power tools, drills',
+            search: 'drill',
+            content: {
+              userrating: '4',
+            },
+            ext: {
+              data: {
+                pageType: 'article',
+                category: 'repair',
+              },
+            },
+          },
+          user: {
+            yob: 1985,
+            gender: 'm',
+            ext: {
+              data: {
+                registered: true,
+                interests: ['cars'],
+              },
+            },
+          },
+          bcat: ['IAB1', 'IAB2-1'],
+          badv: ['domain1.com', 'domain2.com'],
+        };
+
+        it('should include first party data in open rtb request, site section', () => {
+          const openRtbReq = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: firstPartyData})[0].data;
+
+          expect(openRtbReq.site.name).to.equal(firstPartyData.site.name);
+          expect(openRtbReq.site.keywords).to.equal(firstPartyData.site.keywords);
+          expect(openRtbReq.site.search).to.equal(firstPartyData.site.search);
+          expect(openRtbReq.site.content).to.deep.equal(firstPartyData.site.content);
+          expect(openRtbReq.site.ext).to.deep.equal(firstPartyData.site.ext);
+        });
+
+        it('should include first party data in open rtb request, user section', () => {
+          const openRtbReq = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2: firstPartyData })[0].data;
+
+          expect(openRtbReq.user.yob).to.equal(firstPartyData.user.yob);
+          expect(openRtbReq.user.gender).to.equal(firstPartyData.user.gender);
+          expect(openRtbReq.user.ext.data).to.deep.equal(firstPartyData.user.ext.data);
+          expect(openRtbReq.user.ext.eids).not.to.be.undefined;
+        });
+
+        it('should include first party data in open rtb request, ORTB blocked section', () => {
+          const openRtbReq = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2: firstPartyData })[0].data;
+
+          expect(openRtbReq.bcat).to.deep.equal(firstPartyData.bcat);
+          expect(openRtbReq.badv).to.deep.equal(firstPartyData.badv);
+        });
+      });
     });
 
-    it('returns an empty array if the body.cookieSyncUrls is missing', function () {
-      const syncArray = spec.getUserSyncs({ pixelEnabled: true }, [{ body: { creatives: ['creative'] } }]);
-      expect(syncArray).to.be.an('array').that.is.empty;
+    describe('interpretResponse', function () {
+      let request;
+      let response;
+
+      describe('banner', () => {
+        beforeEach(() => {
+          request = spec.buildRequests(bidRequests, bidderRequest)[0];
+          response = {
+            body: {
+              seatbid: [{
+                bid: [{
+                  id: '123',
+                  impid: 'bidId1',
+                  w: 300,
+                  h: 250,
+                  price: 42,
+                  crid: 'creative',
+                  dealid: 'deal',
+                  adomain: ['domain.com'],
+                  adm: 'markup',
+                }, {
+                  id: '456',
+                  impid: 'bidId2',
+                  w: 640,
+                  h: 480,
+                  price: 42,
+                  adm: 'vastTag',
+                }],
+              }],
+            },
+          };
+        });
+
+        it('should return a banner bid', () => {
+          const resp = spec.interpretResponse(response, request);
+
+          const bannerBid = resp[0];
+          expect(bannerBid.requestId).to.equal('bidId1');
+          expect(bannerBid.width).to.equal(300);
+          expect(bannerBid.height).to.equal(250);
+          expect(bannerBid.cpm).to.equal(42);
+          expect(bannerBid.creativeId).to.equal('creative');
+          expect(bannerBid.dealId).to.equal('deal');
+          expect(bannerBid.mediaType).to.equal('banner');
+          expect(bannerBid.currency).to.equal('USD');
+          expect(bannerBid.netRevenue).to.equal(true);
+          expect(bannerBid.ttl).to.equal(360);
+          expect(bannerBid.ad).to.equal('markup');
+          expect(bannerBid.meta.advertiserDomains).to.deep.equal(['domain.com']);
+          expect(bannerBid.vastXml).to.be.undefined;
+        });
+      });
+
+      describe('video', () => {
+        beforeEach(() => {
+          request = spec.buildRequests(bidRequests, bidderRequest)[1];
+          response = {
+            body: {
+              seatbid: [{
+                bid: [{
+                  id: '456',
+                  impid: 'bidId2',
+                  w: 640,
+                  h: 480,
+                  price: 42,
+                  adm: 'vastTag',
+                }],
+              }],
+            },
+          };
+        });
+
+        it('should return a video bid', () => {
+          const resp = spec.interpretResponse(response, request);
+
+          const bannerBid = resp[0];
+          expect(bannerBid.requestId).to.equal('bidId2');
+          expect(bannerBid.width).to.equal(640);
+          expect(bannerBid.height).to.equal(480);
+          expect(bannerBid.cpm).to.equal(42);
+          expect(bannerBid.creativeId).to.be.undefined;
+          expect(bannerBid.dealId).to.be.null;
+          expect(bannerBid.mediaType).to.equal('video');
+          expect(bannerBid.currency).to.equal('USD');
+          expect(bannerBid.netRevenue).to.equal(true);
+          expect(bannerBid.ttl).to.equal(3600);
+          expect(bannerBid.ad).to.equal('vastTag');
+          expect(bannerBid.meta.advertiserDomains).to.deep.equal([]);
+          expect(bannerBid.vastXml).to.equal('vastTag');
+        });
+      });
     });
 
-    it('returns an empty array if pixels are not enabled', function () {
-      const syncArray = spec.getUserSyncs({ pixelEnabled: false }, serverResponses);
-      expect(syncArray).to.be.an('array').that.is.empty;
+    describe('getUserSyncs', function () {
+      const cookieSyncs = ['cookieUrl1', 'cookieUrl2', 'cookieUrl3'];
+      const serverResponses = [{ body: { cookieSyncUrls: cookieSyncs } }];
+
+      it('returns an array of correctly formatted user syncs', function () {
+        const syncArray = spec.getUserSyncs({ pixelEnabled: true }, serverResponses);
+        expect(syncArray).to.deep.equal([
+          { type: 'image', url: 'cookieUrl1' },
+          { type: 'image', url: 'cookieUrl2' },
+          { type: 'image', url: 'cookieUrl3' }],
+        );
+      });
+
+      it('returns an empty array if serverResponses is empty', function () {
+        const syncArray = spec.getUserSyncs({ pixelEnabled: true }, []);
+        expect(syncArray).to.be.an('array').that.is.empty;
+      });
+
+      it('returns an empty array if the body is null', function () {
+        const syncArray = spec.getUserSyncs({ pixelEnabled: true }, [{ body: null }]);
+        expect(syncArray).to.be.an('array').that.is.empty;
+      });
+
+      it('returns an empty array if the body.cookieSyncUrls is missing', function () {
+        const syncArray = spec.getUserSyncs({ pixelEnabled: true }, [{ body: { creatives: ['creative'] } }]);
+        expect(syncArray).to.be.an('array').that.is.empty;
+      });
+
+      it('returns an empty array if pixels are not enabled', function () {
+        const syncArray = spec.getUserSyncs({ pixelEnabled: false }, serverResponses);
+        expect(syncArray).to.be.an('array').that.is.empty;
+      });
     });
   });
 });
diff --git a/test/spec/modules/shinezBidAdapter_spec.js b/test/spec/modules/shinezBidAdapter_spec.js
new file mode 100644
index 00000000000..4e6c2d3420e
--- /dev/null
+++ b/test/spec/modules/shinezBidAdapter_spec.js
@@ -0,0 +1,479 @@
+import { expect } from 'chai';
+import { spec } from 'modules/shinezBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT = 'https://hb.sweetgum.io/hb-sz-multi';
+const TEST_ENDPOINT = 'https://hb.sweetgum.io/hb-multi-sz-test';
+const TTL = 360;
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
+
+describe('shinezAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const bid = {
+      'bidder': spec.code,
+      'adUnitCode': 'adunit-code',
+      'sizes': [['640', '480']],
+      'params': {
+        'org': 'jdye8weeyirk00000001'
+      }
+    };
+
+    it('should return true when required params are passed', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not found', function () {
+      const newBid = Object.assign({}, bid);
+      delete newBid.params;
+      newBid.params = {
+        'org': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'video': {
+            'playerSize': [[640, 480]],
+            'context': 'instream'
+          }
+        },
+        'vastXml': '"<VAST version=\\\"2.0\\\">...</VAST>"'
+      },
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+        'mediaTypes': {
+          'banner': {
+          }
+        },
+        'ad': '"<img src=\"https://...\"/>"'
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001',
+          'testMode': true
+        },
+        'bidId': '299ffc8cca0b87',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'shinez',
+    }
+    const placementId = '12345678';
+
+    it('sends the placementId to ENDPOINT via POST', function () {
+      bidRequests[0].params.placementId = placementId;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].placementId).to.equal(placementId);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to TEST ENDPOINT via POST', function () {
+      const request = spec.buildRequests(testModeBidRequests, bidderRequest);
+      expect(request.url).to.equal(TEST_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the correct bid Id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].bidId).to.equal('299ffc8cca0b87');
+    });
+
+    it('should send the correct sizes array', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].sizes).to.be.an('array');
+      expect(request.data.bids[0].sizes).to.equal(bidRequests[0].sizes)
+      expect(request.data.bids[1].sizes).to.be.an('array');
+      expect(request.data.bids[1].sizes).to.equal(bidRequests[1].sizes)
+    });
+
+    it('should send the correct media type', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].mediaType).to.equal(VIDEO)
+      expect(request.data.bids[1].mediaType).to.equal(BANNER)
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should respect "iframe" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            iframe: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should respect "all" filter settings', function () {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            all: {
+              bidders: [spec.code],
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'iframe');
+    });
+
+    it('should send the pixel user sync param if userSync is enabled and no "iframe" or "all" configs are present', function () {
+      config.resetConfig();
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('cs_method', 'pixel');
+    });
+
+    it('should respect total exclusion', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: true,
+          filterSettings: {
+            image: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            },
+            iframe: {
+              bidders: [spec.code],
+              filter: 'exclude'
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('cs_method');
+    });
+
+    it('should have us_privacy param if usPrivacy is available in the bidRequest', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('us_privacy', '1YNN');
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('us_privacy');
+    });
+
+    it('should not send the gdpr param if gdprApplies is false in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: false}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.not.have.property('gdpr');
+      expect(request.data.params).to.not.have.property('gdpr_consent');
+    });
+
+    it('should send the gdpr param if gdprApplies is true in the bidRequest', function () {
+      const bidderRequestWithGDPR = Object.assign({gdprConsent: {gdprApplies: true, consentString: 'test-consent-string'}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('gdpr', true);
+      expect(request.data.params).to.have.property('gdpr_consent', 'test-consent-string');
+    });
+
+    it('should have schain param if it is available in the bidRequest', () => {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
+      };
+      bidRequests[0].schain = schain;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('schain', '1.0,1!indirectseller.com,00001,1,,,');
+    });
+
+    it('should set flooPrice to getFloor.floor value if it is greater than params.floorPrice', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.32
+        }
+      }
+      bid.params.floorPrice = 0.64;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 3.32);
+    });
+
+    it('should set floorPrice to params.floorPrice value if it is greater than getFloor.floor', function() {
+      const bid = utils.deepClone(bidRequests[0]);
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 0.8
+        }
+      }
+      bid.params.floorPrice = 1.5;
+      const request = spec.buildRequests([bid], bidderRequest);
+      expect(request.data.bids[0]).to.be.an('object');
+      expect(request.data.bids[0]).to.have.property('floorPrice', 1.5);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      params: {
+        currency: 'USD',
+        netRevenue: true,
+      },
+      bids: [{
+        cpm: 12.5,
+        vastXml: '<VAST version="3.0"></VAST>',
+        width: 640,
+        height: 480,
+        requestId: '21e12606d47ba7',
+        adomain: ['abc.com'],
+        mediaType: VIDEO
+      },
+      {
+        cpm: 12.5,
+        ad: '"<img src=\"https://...\"/>"',
+        width: 300,
+        height: 250,
+        requestId: '21e12606d47ba7',
+        adomain: ['abc.com'],
+        mediaType: BANNER
+      }]
+    };
+
+    const expectedVideoResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 640,
+      height: 480,
+      ttl: TTL,
+      creativeId: '21e12606d47ba7',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: VIDEO,
+      meta: {
+        mediaType: VIDEO,
+        advertiserDomains: ['abc.com']
+      },
+      vastXml: '<VAST version="3.0"></VAST>',
+    };
+
+    const expectedBannerResponse = {
+      requestId: '21e12606d47ba7',
+      cpm: 12.5,
+      currency: 'USD',
+      width: 640,
+      height: 480,
+      ttl: TTL,
+      creativeId: '21e12606d47ba7',
+      netRevenue: true,
+      nurl: 'http://example.com/win/1234',
+      mediaType: BANNER,
+      meta: {
+        mediaType: BANNER,
+        advertiserDomains: ['abc.com']
+      },
+      ad: '"<img src=\"https://...\"/>"'
+    };
+
+    it('should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedVideoResponse));
+      expect(Object.keys(result[1])).to.deep.equal(Object.keys(expectedBannerResponse));
+    });
+
+    it('video type should have vastXml key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[0].vastXml).to.equal(expectedVideoResponse.vastXml)
+    });
+
+    it('banner type should have ad key', function () {
+      const result = spec.interpretResponse({ body: response });
+      expect(result[1].ad).to.equal(expectedBannerResponse.ad)
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        params: {
+          userSyncPixels: [
+            'https://image-sync-url.test/1',
+            'https://image-sync-url.test/2',
+            'https://image-sync-url.test/3'
+          ]
+        }
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        params: {
+          userSyncURL: 'https://iframe-sync-url.test'
+        }
+      }
+    };
+
+    it('should register all img urls from the response', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should register the iframe url from the response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [iframeSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        }
+      ]);
+    });
+
+    it('should register both image and iframe urls from the responses', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: true, iframeEnabled: true }, [iframeSyncResponse, imageSyncResponse]);
+      expect(syncs).to.deep.equal([
+        {
+          type: 'iframe',
+          url: 'https://iframe-sync-url.test'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/1'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/2'
+        },
+        {
+          type: 'image',
+          url: 'https://image-sync-url.test/3'
+        }
+      ]);
+    });
+
+    it('should handle an empty response', function() {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, []);
+      expect(syncs).to.deep.equal([]);
+    });
+
+    it('should handle when user syncs are disabled', function() {
+      const syncs = spec.getUserSyncs({ pixelEnabled: false }, [imageSyncResponse]);
+      expect(syncs).to.deep.equal([]);
+    });
+  })
+
+  describe('onBidWon', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should trigger pixel if bid nurl', function() {
+      const bid = {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [['640', '480']],
+        'nurl': 'http://example.com/win/1234',
+        'params': {
+          'org': 'jdye8weeyirk00000001'
+        }
+      };
+
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.callCount).to.equal(1)
+    })
+  })
+});
diff --git a/test/spec/modules/showheroes-bsBidAdapter_spec.js b/test/spec/modules/showheroes-bsBidAdapter_spec.js
index 9525146a629..1aa7b132221 100644
--- a/test/spec/modules/showheroes-bsBidAdapter_spec.js
+++ b/test/spec/modules/showheroes-bsBidAdapter_spec.js
@@ -9,8 +9,11 @@ const bidderRequest = {
   }
 }
 
+const adomain = ['showheroes.com'];
+
 const gdpr = {
   'gdprConsent': {
+    'apiVersion': 2,
     'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
     'gdprApplies': true
   }
@@ -45,6 +48,18 @@ const bidRequestCommonParams = {
   'auctionId': '43aa080090a47f',
 }
 
+const bidRequestCommonParamsV2 = {
+  'bidder': 'showheroes-bs',
+  'params': {
+    'unitId': 'AACBWAcof-611K4U',
+  },
+  'adUnitCode': 'adunit-code-1',
+  'sizes': [[640, 480]],
+  'bidId': '38b373e1e31c18',
+  'bidderRequestId': '12e3ade2543ba6',
+  'auctionId': '43aa080090a47f',
+}
+
 const bidRequestVideo = {
   ...bidRequestCommonParams,
   ...{
@@ -69,6 +84,30 @@ const bidRequestOutstream = {
   }
 }
 
+const bidRequestVideoV2 = {
+  ...bidRequestCommonParamsV2,
+  ...{
+    'mediaTypes': {
+      'video': {
+        'playerSize': [640, 480],
+        'context': 'instream',
+      }
+    }
+  }
+}
+
+const bidRequestOutstreamV2 = {
+  ...bidRequestCommonParamsV2,
+  ...{
+    'mediaTypes': {
+      'video': {
+        'playerSize': [640, 480],
+        'context': 'outstream'
+      }
+    }
+  }
+}
+
 const bidRequestVideoVpaid = {
   ...bidRequestCommonParams,
   ...{
@@ -126,12 +165,19 @@ describe('shBidAdapter', function () {
 
   describe('isBidRequestValid', function () {
     it('should return true when required params found', function () {
-      const request = {
+      const requestV1 = {
         'params': {
           'playerId': '47427aa0-f11a-4d24-abca-1295a46a46cd',
         }
       }
-      expect(spec.isBidRequestValid(request)).to.equal(true)
+      expect(spec.isBidRequestValid(requestV1)).to.equal(true)
+
+      const requestV2 = {
+        'params': {
+          'unitId': 'AACBTwsZVANd9NlB',
+        }
+      }
+      expect(spec.isBidRequestValid(requestV2)).to.equal(true)
     })
 
     it('should return false when required params are not passed', function () {
@@ -146,6 +192,9 @@ describe('shBidAdapter', function () {
     it('sends bid request to ENDPOINT via POST', function () {
       const request = spec.buildRequests([bidRequestVideo], bidderRequest)
       expect(request.method).to.equal('POST')
+
+      const requestV2 = spec.buildRequests([bidRequestVideoV2], bidderRequest)
+      expect(requestV2.method).to.equal('POST')
     })
 
     it('check sizes formats', function () {
@@ -265,6 +314,30 @@ describe('shBidAdapter', function () {
       expect(payload2).to.have.property('type', 5);
     })
 
+    it('should attach valid params to the payload when type is video (instream V2)', function () {
+      const request = spec.buildRequests([bidRequestVideoV2], bidderRequest)
+      const payload = request.data.bidRequests[0];
+      expect(payload).to.be.an('object');
+      expect(payload).to.have.property('unitId', 'AACBWAcof-611K4U');
+      expect(payload.mediaTypes).to.eql({
+        [VIDEO]: {
+          'context': 'instream'
+        }
+      });
+    })
+
+    it('should attach valid params to the payload when type is video (outstream V2)', function () {
+      const request = spec.buildRequests([bidRequestOutstreamV2], bidderRequest)
+      const payload = request.data.bidRequests[0];
+      expect(payload).to.be.an('object');
+      expect(payload).to.have.property('unitId', 'AACBWAcof-611K4U');
+      expect(payload.mediaTypes).to.eql({
+        [VIDEO]: {
+          'context': 'outstream'
+        }
+      });
+    })
+
     it('passes gdpr if present', function () {
       const request = spec.buildRequests([bidRequestVideo], {...bidderRequest, ...gdpr})
       const payload = request.data.requests[0];
@@ -272,6 +345,13 @@ describe('shBidAdapter', function () {
       expect(payload.gdprConsent).to.eql(gdpr.gdprConsent)
     })
 
+    it('passes gdpr if present (V2)', function () {
+      const request = spec.buildRequests([bidRequestVideoV2], {...bidderRequest, ...gdpr})
+      const context = request.data.context;
+      expect(context).to.be.an('object');
+      expect(context.gdprConsent).to.eql(gdpr.gdprConsent)
+    })
+
     it('passes schain object if present', function() {
       const request = spec.buildRequests([{
         ...bidRequestVideo,
@@ -281,6 +361,16 @@ describe('shBidAdapter', function () {
       expect(payload).to.be.an('object');
       expect(payload.schain).to.eql(schain.schain);
     })
+
+    it('passes schain object if present (V2)', function() {
+      const request = spec.buildRequests([{
+        ...bidRequestVideoV2,
+        ...schain
+      }], bidderRequest)
+      const context = request.data.context;
+      expect(context).to.be.an('object');
+      expect(context.schain).to.eql(schain.schain);
+    })
   })
 
   describe('interpretResponse', function () {
@@ -301,6 +391,7 @@ describe('shBidAdapter', function () {
       'size': {'width': 640, 'height': 480},
       'vastTag': 'https:\/\/video-library.stage.showheroes.com\/commercial\/wrapper?player_id=47427aa0-f11a-4d24-abca-1295a46a46cd&ad_bidder=showheroes-bs&master_shadt=1&description_url=https%3A%2F%2Fbid-service.stage.showheroes.com%2Fvast%2Fad%2Fcache%2F4840b920-40e1-4e09-9231-60bbf088c8d6',
       'vastXml': vastXml,
+      'adomain': adomain,
     };
 
     const responseVideo = {
@@ -323,12 +414,46 @@ describe('shBidAdapter', function () {
       }],
     };
 
+    const basicResponseV2 = {
+      'requestId': '38b373e1e31c18',
+      'adUnitCode': 'adunit-code-1',
+      'cpm': 1,
+      'currency': 'EUR',
+      'width': 640,
+      'height': 480,
+      'advertiserDomain': [],
+      'callbacks': {
+        'won': ['https://api-n729.qa.viralize.com/track/?ver=15&session_id=01ecd03ce381505ccdeb88e555b05001&category=request_session&type=event&request_session_id=01ecd03ce381505ccdeb88e555b05001&label=prebid_won&reason=ok']
+      },
+      'mediaType': 'video',
+      'adomain': adomain,
+    };
+
+    const vastUrl = 'https://api-n729.qa.viralize.com/vast/?zid=AACBWAcof-611K4U&u=https://example.org/?foo=bar&gdpr=0&cs=XXXXXXXXXXXXXXXXXXXX&sid=01ecd03ce381505ccdeb88e555b05001&width=300&height=200&prebidmode=1'
+
+    const responseVideoV2 = {
+      'bidResponses': [{
+        ...basicResponseV2,
+        'context': 'instream',
+        'vastUrl': vastUrl,
+      }],
+    };
+
+    const responseVideoOutstreamV2 = {
+      'bidResponses': [{
+        ...basicResponseV2,
+        'context': 'outstream',
+        'ad': '<script id="testScript" data-wid="auto" type="text/javascript" src="https://ads.viralize.tv/display/?zid=AACBTwsZVANd9NlB&u=https%3A%2F%2Fexample.org%2F%3Ffoo%3Dbar&gdpr=0&cs=XXXXXXXXXXXXXXXXXXXX&sid=01ececb3b4c19270d6a77ccf75433001&width=300&height=200&prebidmode=1"></script>',
+      }],
+    };
+
     it('should get correct bid response when type is video', function () {
       const request = spec.buildRequests([bidRequestVideo], bidderRequest)
       const expectedResponse = [
         {
           'cpm': 5,
           'creativeId': 'c_38b373e1e31c18',
+          'adUnitCode': 'adunit-code-1',
           'currency': 'EUR',
           'width': 640,
           'height': 480,
@@ -340,6 +465,9 @@ describe('shBidAdapter', function () {
           'ttl': 300,
           'adResponse': {
             'content': vastXml
+          },
+          'meta': {
+            'advertiserDomains': adomain
           }
         }
       ]
@@ -348,6 +476,31 @@ describe('shBidAdapter', function () {
       expect(result).to.deep.equal(expectedResponse)
     })
 
+    it('should get correct bid response when type is video (V2)', function () {
+      const request = spec.buildRequests([bidRequestVideoV2], bidderRequest)
+      const expectedResponse = [
+        {
+          'cpm': 1,
+          'creativeId': 'c_38b373e1e31c18',
+          'adUnitCode': 'adunit-code-1',
+          'currency': 'EUR',
+          'width': 640,
+          'height': 480,
+          'mediaType': 'video',
+          'netRevenue': true,
+          'vastUrl': vastUrl,
+          'requestId': '38b373e1e31c18',
+          'ttl': 300,
+          'meta': {
+            'advertiserDomains': adomain
+          }
+        }
+      ]
+
+      const result = spec.interpretResponse({'body': responseVideoV2}, request)
+      expect(result).to.deep.equal(expectedResponse)
+    })
+
     it('should get correct bid response when type is banner', function () {
       const request = spec.buildRequests([bidRequestBanner], bidderRequest)
 
@@ -388,6 +541,32 @@ describe('shBidAdapter', function () {
       expect(spots.length).to.equal(1)
     })
 
+    it('should get correct bid response when type is outstream (slot V2)', function () {
+      const bidRequestV2 = JSON.parse(JSON.stringify(bidRequestOutstreamV2));
+      const slotId = 'testSlot2'
+      bidRequestV2.params.outstreamOptions = {
+        slot: slotId
+      }
+
+      const container = document.createElement('div')
+      container.setAttribute('id', slotId)
+      document.body.appendChild(container)
+
+      const request = spec.buildRequests([bidRequestV2], bidderRequest)
+
+      const result = spec.interpretResponse({'body': responseVideoOutstreamV2}, request)
+      const bid = result[0]
+      expect(bid).to.have.property('mediaType', VIDEO);
+
+      const renderer = bid.renderer
+      expect(renderer).to.be.an('object')
+      expect(renderer.id).to.equal(bidRequestV2.bidId)
+      renderer.render(bid)
+
+      const scripts = container.querySelectorAll('#testScript')
+      expect(scripts.length).to.equal(1)
+    })
+
     it('should get correct bid response when type is outstream (iframe)', function () {
       const bidRequest = JSON.parse(JSON.stringify(bidRequestOutstream));
       const slotId = 'testIframe'
diff --git a/test/spec/modules/sigmoidAnalyticsAdapter_spec.js b/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
index 75afb0ed86e..6cdc3c448b9 100644
--- a/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
+++ b/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
@@ -1,5 +1,7 @@
 import sigmoidAnalytic from 'modules/sigmoidAnalyticsAdapter.js';
-import { expect } from 'chai';
+import {expect} from 'chai';
+import {expectEvents} from '../../helpers/analytics.js';
+
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
 let constants = require('src/constants.json');
@@ -32,13 +34,7 @@ describe('sigmoid Prebid Analytic', function () {
         }
       });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-
-      sinon.assert.callCount(sigmoidAnalytic.track, 5);
+      expectEvents().to.beTrackedBy(sigmoidAnalytic.track);
     });
   });
   describe('build utm tag data', function () {
diff --git a/test/spec/modules/sirdataRtdProvider_spec.js b/test/spec/modules/sirdataRtdProvider_spec.js
new file mode 100644
index 00000000000..9cf392ebd62
--- /dev/null
+++ b/test/spec/modules/sirdataRtdProvider_spec.js
@@ -0,0 +1,94 @@
+import { addSegmentData, getSegmentsAndCategories, sirdataSubmodule } from 'modules/sirdataRtdProvider.js';
+import { server } from 'test/mocks/xhr.js';
+
+const responseHeader = {'Content-Type': 'application/json'};
+
+describe('sirdataRtdProvider', function() {
+  describe('sirdataSubmodule', function() {
+    it('successfully instantiates', function () {
+		      expect(sirdataSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Add Segment Data', function() {
+    it('adds segment data', function() {
+      const config = {
+        params: {
+          setGptKeyValues: false,
+          contextualMinRelevancyScore: 50,
+          bidders: [{
+            bidder: 'appnexus'
+          }, {
+            bidder: 'other'
+          }]
+        }
+      };
+
+      let adUnits = [
+        {
+          bids: [{
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370
+            }
+          }, {
+            bidder: 'other'
+          }]
+        }
+      ];
+
+      let data = {
+        segments: [111111, 222222],
+        contextual_categories: {'333333': 100}
+      };
+
+      addSegmentData({adUnits}, data, config, () => {});
+      expect(adUnits[0].bids[0].params.keywords).to.have.deep.property('sd_rtd', ['111111', '222222', '333333']);
+      expect(adUnits[0].bids[1].ortb2.site.ext.data).to.have.deep.property('sd_rtd', ['333333']);
+      expect(adUnits[0].bids[1].ortb2.user.ext.data).to.have.deep.property('sd_rtd', ['111111', '222222']);
+    });
+  });
+
+  describe('Get Segments And Categories', function() {
+    it('gets data from async request and adds segment data', function() {
+      const config = {
+        params: {
+          setGptKeyValues: false,
+          contextualMinRelevancyScore: 50,
+          bidders: [{
+            bidder: 'appnexus'
+          }, {
+            bidder: 'other'
+          }]
+        }
+      };
+
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [{
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370
+            }
+          }, {
+            bidder: 'other'
+          }]
+        }]
+      };
+
+      let data = {
+        segments: [111111, 222222],
+        contextual_categories: {'333333': 100}
+      };
+
+      getSegmentsAndCategories(reqBidsConfigObj, () => {}, config, {});
+
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(data));
+
+      expect(reqBidsConfigObj.adUnits[0].bids[0].params.keywords).to.have.deep.property('sd_rtd', ['111111', '222222', '333333']);
+      expect(reqBidsConfigObj.adUnits[0].bids[1].ortb2.site.ext.data).to.have.deep.property('sd_rtd', ['333333']);
+      expect(reqBidsConfigObj.adUnits[0].bids[1].ortb2.user.ext.data).to.have.deep.property('sd_rtd', ['111111', '222222']);
+    });
+  });
+});
diff --git a/test/spec/modules/sizeMappingV2_spec.js b/test/spec/modules/sizeMappingV2_spec.js
index 2462db3b144..27fd7a33c14 100644
--- a/test/spec/modules/sizeMappingV2_spec.js
+++ b/test/spec/modules/sizeMappingV2_spec.js
@@ -13,10 +13,11 @@ import {
   getAdUnitDetail,
   getFilteredMediaTypes,
   getBids,
-  internal
+  internal, setupAdUnitMediaTypes
 } from '../../../modules/sizeMappingV2.js';
 
 import { adUnitSetupChecks } from '../../../src/prebid.js';
+import {deepClone} from '../../../src/utils.js';
 
 const AD_UNITS = [{
   code: 'div-gpt-ad-1460505748561-0',
@@ -193,37 +194,23 @@ describe('sizeMappingV2', function () {
       utils.logError.restore();
     });
 
-    it('should filter out adUnit if it does not contain the required property mediaTypes', function () {
-      let adUnits = utils.deepClone(AD_UNITS);
-      delete adUnits[0].mediaTypes;
-      // before checkAdUnitSetupHook is called, the length of adUnits should be '2'
-      expect(adUnits.length).to.equal(2);
-      adUnits = checkAdUnitSetupHook(adUnits);
-
-      // after checkAdUnitSetupHook is called, the length of adUnits should be '1'
-      expect(adUnits.length).to.equal(1);
-      expect(adUnits[0].code).to.equal('div-gpt-ad-1460505748561-1');
-    });
+    describe('basic validation', () => {
+      let validateAdUnit;
 
-    it('should filter out adUnit if it has declared property mediaTypes with an empty object', function () {
-      let adUnits = utils.deepClone(AD_UNITS);
-      adUnits[0].mediaTypes = {};
-      // before checkAdUnitSetupHook is called, the length of adUnits should be '2'
-      expect(adUnits.length).to.equal(2);
-      adUnits = checkAdUnitSetupHook(adUnits);
-
-      // after checkAdUnitSetupHook is called, the length of adUnits should be '1'
-      expect(adUnits.length).to.equal(1);
-      expect(adUnits[0].code).to.equal('div-gpt-ad-1460505748561-1');
-    });
+      beforeEach(() => {
+        validateAdUnit = sinon.stub(adUnitSetupChecks, 'validateAdUnit');
+      });
 
-    it('should log an error message if Ad Unit does not contain the required property "mediaTypes"', function () {
-      let adUnits = utils.deepClone(AD_UNITS);
-      delete adUnits[0].mediaTypes;
+      afterEach(() => {
+        validateAdUnit.restore();
+      });
 
-      checkAdUnitSetupHook(adUnits);
-      sinon.assert.callCount(utils.logError, 1);
-      sinon.assert.calledWith(utils.logError, 'Detected adUnit.code \'div-gpt-ad-1460505748561-0\' did not have a \'mediaTypes\' object defined. This is a required field for the auction, so this adUnit has been removed.');
+      it('should filter out adUnits that do not pass adUnitSetupChecks.validateAdUnit', () => {
+        validateAdUnit.returns(null);
+        const adUnits = checkAdUnitSetupHook(utils.deepClone(AD_UNITS));
+        AD_UNITS.forEach((u) => sinon.assert.calledWith(validateAdUnit, u));
+        expect(adUnits.length).to.equal(0);
+      });
     });
 
     describe('banner mediaTypes checks', function () {
@@ -235,7 +222,7 @@ describe('sizeMappingV2', function () {
         adUnitSetupChecks.validateBannerMediaType.restore();
       });
 
-      it('should delete banner mediaType if it does not constain sizes or sizeConfig property', function () {
+      it('should delete banner mediaType if it does not contain sizes or sizeConfig property', function () {
         let adUnits = utils.deepClone(AD_UNITS);
         delete adUnits[0].mediaTypes.banner.sizeConfig;
 
@@ -255,7 +242,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, 'Detected a mediaTypes.banner object did not include required property sizes or sizeConfig. Removing invalid mediaTypes.banner object from Ad Unit.');
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: 'mediaTypes.banner' does not contain either 'sizes' or 'sizeConfig' property. Removing 'mediaTypes.banner' from ad unit.`);
       });
 
       it('should call function "validateBannerMediaType" if mediaTypes.sizes is present', function () {
@@ -293,7 +280,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.banner.sizeConfig is NOT an Array. Removing the invalid object mediaTypes.banner from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'sizeConfig' in 'mediaTypes.banner.sizeConfig'. Removing mediaTypes.banner from ad unit.`);
       });
 
       it('should delete mediaTypes.banner object if it\'s property sizeConfig does not contain the required properties "minViewPort" and "sizes"', function () {
@@ -329,7 +316,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.banner.sizeConfig[2] is missing required property minViewPort or sizes or both.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Missing required property 'minViewPort' or 'sizes' from 'mediaTypes.banner.sizeConfig[2]'. Removing mediaTypes.banner from ad unit.`);
       });
 
       it('should delete mediaTypes.banner object if it\'s property sizeConfig has declared minViewPort property which is NOT an Array of two integers', function () {
@@ -365,7 +352,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.banner.sizeConfig[0] has property minViewPort decalared with invalid value. Please ensure minViewPort is an Array and is listed like: [700, 0]. Declaring an empty array is not allowed, instead use: [0, 0].`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'minViewPort' in 'mediaTypes.banner.sizeConfig[0]'. Removing mediaTypes.banner from ad unit.`);
       });
 
       it('should delete mediaTypes.banner object if it\'s property sizeConfig has declared sizes property which is not in the format, [[vw1, vh1], [vw2, vh2]], where vw is viewport width and vh is viewport height', function () {
@@ -401,7 +388,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.banner.sizeConfig[1] has propery sizes declared with invalid value. Please ensure the sizes are listed like: [[300, 250], ...] or like: [] if no sizes are present for that size bucket.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'sizes' in 'mediaTypes.banner.sizeConfig[1]'. Removing mediaTypes.banner from ad unit.`);
       });
 
       it('should convert sizeConfig.sizes to an array of array, i.e., [360, 600] to [[360, 600]]', function () {
@@ -427,6 +414,21 @@ describe('sizeMappingV2', function () {
         expect(validatedAdUnits[0].mediaTypes.banner.sizeConfig[0].sizes).to.deep.equal([[]]);
       });
 
+      it('should log an error message if "sizes" in sizeConfig is not declared as an array', function () {
+        const adUnits = utils.deepClone(AD_UNITS);
+        const badSizeConfig = [
+          { minViewPort: [0, 0], sizes: [] },
+          { minViewPort: [750, 0], sizes: { 'incorrect': 'format' } },
+          { minViewPort: [1200, 0], sizes: [[300, 250], [300, 600]] }
+        ]
+        adUnits[0].mediaTypes.banner.sizeConfig = badSizeConfig;
+
+        checkAdUnitSetupHook(adUnits);
+
+        // Assertions
+        sinon.assert.callCount(utils.logError, 1);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'sizes' in 'mediaTypes.banner.sizeConfig[1]'. Removing mediaTypes.banner from ad unit.`);
+      });
       it('should NOT delete mediaTypes.banner object if sizeConfig object is declared correctly', function () {
         const adUnits = utils.deepClone(AD_UNITS);
 
@@ -451,8 +453,31 @@ describe('sizeMappingV2', function () {
         adUnitSetupChecks.validateVideoMediaType.restore();
       });
 
-      it('should call function "validateVideoMediaType" if mediaTypes.video.playerSize is present in the Ad Unit', function () {
+      it('should call function "validateVideoMediaType" if mediaTypes.video.playerSize is present in the Ad Unit (PART - 1)', function () {
+        // PART - 1 (Ad unit has banner.sizes defined, so, validateVideoMediaType function would be called with 'validatedBanner' as an argument)
+
+        const adUnits = utils.deepClone(AD_UNITS);
+
+        checkAdUnitSetupHook(adUnits);
+
+        // since adUntis[1].mediaTypes.video has defined property "playserSize", it should call function "validateVideoMediaType" only once
+        sinon.assert.callCount(adUnitSetupChecks.validateVideoMediaType, 1);
+        /*
+          'validateVideoMediaType' function should be called with 'validatedBanner' as an argument instead of the adUnit because validatedBanner is already a processed form of adUnit and is validated by banner checks.
+          It is not 'undefined' in this case because the adUnit[1] is using 'mediaTypes.banner.sizes' which will populate data into 'validatedBanner' variable.
+
+          'validatedBanner' will be idetical to adUnits[1] with the exceptions of an added property, 'sizes' on the validateBanner object itself.
+        */
+        const validatedBanner = adUnits[1];
+        validatedBanner.sizes = [[300, 250], [300, 600]];
+        sinon.assert.calledWith(adUnitSetupChecks.validateVideoMediaType, validatedBanner);
+      });
+
+      it('should call function "validateVideoMediaType" if mediaTypes.video.playerSize" is present in the Ad Unit (PART - 2)', function () {
+        // PART - 2 (Ad unit does not have banner.sizes defined, so, validateVideoMediaType function would be called with 'adUnit' as an argument)
+
         const adUnits = utils.deepClone(AD_UNITS);
+        delete adUnits[1].mediaTypes.banner;
 
         checkAdUnitSetupHook(adUnits);
 
@@ -480,7 +505,7 @@ describe('sizeMappingV2', function () {
 
         // check if correct logError is written to the console.
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.video.sizeConfig is NOT an Array. Removing the invalid property mediaTypes.video.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'sizeConfig' in 'mediaTypes.video.sizeConfig'. Removing mediaTypes.video.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.video.sizeConfig property if sizeConfig does not contain the required properties "minViewPort" and "playerSize"', function () {
@@ -503,7 +528,7 @@ describe('sizeMappingV2', function () {
 
         // check if correct logError is written to the console.
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.video.sizeConfig[0] is missing required property minViewPort or playerSize or both. Removing the invalid property mediaTypes.video.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Missing required property 'minViewPort' or 'sizes' from 'mediaTypes.video.sizeConfig[0]'. Removing mediaTypes.video.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.video.sizeConfig property if sizeConfig has declared minViewPort property which is NOT an Array of two integers', function () {
@@ -526,7 +551,7 @@ describe('sizeMappingV2', function () {
 
         // check if correct logError is written to the console.
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.video.sizeConfig[1] has property minViewPort decalared with invalid value. Please ensure minViewPort is an Array and is listed like: [700, 0]. Declaring an empty array is not allowed, instead use: [0, 0].`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'minViewPort' in 'mediaTypes.video.sizeConfig[1]'. Removing mediaTypes.video.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.video.sizeConfig property if sizeConfig has declared "playerSize" property which is not in the format, [[vw1, vh1]], where vw is viewport width and vh is viewport height', function () {
@@ -549,7 +574,7 @@ describe('sizeMappingV2', function () {
 
         // check if correct logError is written to the console.
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.video.sizeConfig[0] has propery playerSize declared with invalid value. Please ensure the playerSize is listed like: [640, 480] or like: [] if no playerSize is present for that size bucket.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'playerSize' in 'mediaTypes.video.sizeConfig[0]'. Removing mediaTypes.video.sizeConfig from ad unit.`);
       });
 
       it('should convert sizeConfig.playerSize to an array of array, i.e., [360, 600] to [[360, 600]]', function () {
@@ -591,6 +616,9 @@ describe('sizeMappingV2', function () {
     });
 
     describe('native mediaTypes checks', function () {
+      if (!FEATURES.NATIVE) {
+        return;
+      }
       beforeEach(function () {
         sinon.spy(adUnitSetupChecks, 'validateNativeMediaType');
       });
@@ -602,7 +630,72 @@ describe('sizeMappingV2', function () {
       it('should call function "validateNativeMediaTypes" if mediaTypes.native is defined', function () {
         const adUnits = utils.deepClone(AD_UNITS);
         checkAdUnitSetupHook(adUnits);
+
+        sinon.assert.callCount(adUnitSetupChecks.validateNativeMediaType, 1);
+      });
+
+      it('should call function "validateNativeMediaTypes" if mediaTypes.native is defined (PART - 1)', function () {
+        // PART - 1 (Ad unit contains 'banner', 'video' and 'native' media types)
+        const adUnit = [{
+          code: 'ad-unit-1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 400]]
+            },
+            video: {
+              playerSize: [[600, 400]]
+            },
+            native: {}
+          },
+          bids: [{bidder: 'appnexus', params: 1234}]
+        }];
+
+        checkAdUnitSetupHook(adUnit);
+
+        // 'validatedVideo' should be passed as an argument to "validatedNativeMediaType"
+        const validatedVideo = adUnit[0];
+        validatedVideo.sizes = [[600, 400]];
+        sinon.assert.callCount(adUnitSetupChecks.validateNativeMediaType, 1);
+        sinon.assert.calledWith(adUnitSetupChecks.validateNativeMediaType, validatedVideo);
+      });
+
+      it('should call function "validateNativeMediaTypes" if mediaTypes.native is defined (PART - 2)', function () {
+        // PART - 2 (Ad unit contains only 'banner' and 'native' media types)
+        const adUnit = [{
+          code: 'ad-unit-1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 400]]
+            },
+            native: {}
+          },
+          bids: [{bidder: 'appnexus', params: 1234}]
+        }];
+
+        checkAdUnitSetupHook(adUnit);
+
+        // 'validatedBanner' should be passed as an argument to "validatedNativeMediaType"
+        const validatedBanner = adUnit[0];
+        validatedBanner.sizes = [[300, 400]];
+        sinon.assert.callCount(adUnitSetupChecks.validateNativeMediaType, 1);
+        sinon.assert.calledWith(adUnitSetupChecks.validateNativeMediaType, validatedBanner);
+      });
+
+      it('should call function "validateNativeMediaTypes" if mediaTypes.native is defined (PART - 3)', function () {
+        // PART - 2 (Ad unit contains only 'native' media types)
+        const adUnit = [{
+          code: 'ad-unit-1',
+          mediaTypes: {
+            native: {}
+          },
+          bids: [{bidder: 'appnexus', params: 1234}]
+        }];
+
+        checkAdUnitSetupHook(adUnit);
+
+        // 'adUnit[0]' should be passed as an argument to "validatedNativeMediaType"
         sinon.assert.callCount(adUnitSetupChecks.validateNativeMediaType, 1);
+        sinon.assert.calledWith(adUnitSetupChecks.validateNativeMediaType, adUnit[0]);
       });
 
       it('should delete mediaTypes.native.sizeConfig property if sizeConfig does not contain the required properties "minViewPort" and "active"', function () {
@@ -618,7 +711,7 @@ describe('sizeMappingV2', function () {
         const validatedAdUnits = checkAdUnitSetupHook(adUnits);
         expect(validatedAdUnits[0].mediaTypes.native).to.not.have.property('sizeConfig');
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.native.sizeConfig is missing required property minViewPort or active or both. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Missing required property 'minViewPort' or 'sizes' from 'mediaTypes.native.sizeConfig[1]'. Removing mediaTypes.native.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.native.sizeConfig property if sizeConfig[].minViewPort is NOT an array of TWO integers', function () {
@@ -634,7 +727,7 @@ describe('sizeMappingV2', function () {
         const validatedAdUnits = checkAdUnitSetupHook(adUnits);
         expect(validatedAdUnits[0].mediaTypes.native).to.not.have.property('sizeConfig');
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.native.sizeConfig has properties minViewPort or active decalared with invalid values. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'minViewPort' in 'mediaTypes.native.sizeConfig[0]'. Removing mediaTypes.native.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.native.sizeConfig property if sizeConfig[].active is NOT a Boolean', function () {
@@ -651,7 +744,7 @@ describe('sizeMappingV2', function () {
         const validatedAdUnits = checkAdUnitSetupHook(adUnits);
         expect(validatedAdUnits[0].mediaTypes.native).to.not.have.property('sizeConfig');
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.native.sizeConfig has properties minViewPort or active decalared with invalid values. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'active' in 'mediaTypes.native.sizeConfig[0]'. Removing mediaTypes.native.sizeConfig from ad unit.`);
       });
 
       it('should NOT delete mediaTypes.native.sizeConfig property if sizeConfig property is declared correctly', function () {
@@ -886,7 +979,7 @@ describe('sizeMappingV2', function () {
       expect(activeBidder).to.equal(true);
     });
 
-    it('should throw a warning message if labelAny/labelAll operator found on adunit/bidder when "label" is not passed to pbjs.requestBids', function() {
+    it('should throw a warning message if labelAny/labelAll operator found on adunit/bidder when "label" is not passed to pbjs.requestBids', function () {
       const adUnit = {
         code: 'ad-unit-1',
         mediaTypes: {
@@ -991,14 +1084,14 @@ describe('sizeMappingV2', function () {
       internal.checkBidderSizeConfigFormat.restore();
       internal.getActiveSizeBucket.restore();
     });
-    it('should return an empty array if the bidder sizeConfig object is not formatted correctly', function () {
+    it('should return an empty set if the bidder sizeConfig object is not formatted correctly', function () {
       const sizeConfig = [
         { minViewPort: [], relevantMediaTypes: ['none'] },
         { minViewPort: [700, 0], relevantMediaTypes: ['banner', 'video'] }
       ];
       const activeViewport = [720, 600];
       const relevantMediaTypes = getRelevantMediaTypesForBidder(sizeConfig, activeViewport);
-      expect(relevantMediaTypes).to.deep.equal([]);
+      expect(relevantMediaTypes.size).to.equal(0)
     });
 
     it('should call function checkBidderSizeConfigFormat() once', function () {
@@ -1025,220 +1118,51 @@ describe('sizeMappingV2', function () {
       sinon.assert.calledWith(internal.getActiveSizeBucket, sizeConfig, activeViewport);
     });
 
-    it('should return the array contained in "relevantMediaTypes" property whose sizeBucket matches with the current viewport', function () {
+    it('should return the types contained in "relevantMediaTypes" property whose sizeBucket matches with the current viewport', function () {
       const sizeConfig = [
         { minViewPort: [0, 0], relevantMediaTypes: ['none'] },
         { minViewPort: [700, 0], relevantMediaTypes: ['banner', 'video'] }
       ];
       const activeVewport = [720, 600];
       const relevantMediaTypes = getRelevantMediaTypesForBidder(sizeConfig, activeVewport);
-      expect(relevantMediaTypes).to.deep.equal(['banner', 'video']);
+      expect([...relevantMediaTypes]).to.deep.equal(['banner', 'video']);
     });
   });
 
-  describe('getAdUnitDetail(auctionId, adUnit, labels)', function () {
+  describe('getAdUnitDetail', function () {
     const adUnitDetailFixture_1 = {
-      adUnitCode: 'div-gpt-ad-1460505748561-0',
-      mediaTypes: {
-        banner: {
-          sizeConfig: [
-            { minViewPort: [0, 0], sizes: [] },		// remove if < 750px
-            { minViewPort: [750, 0], sizes: [[300, 250], [300, 600]] },		// between 750px and 1199px
-            { minViewPort: [1200, 0], sizes: [[970, 90], [728, 90], [300, 250]] }, // between 1200px and 1599px
-            { minViewPort: [1600, 0], sizes: [[1000, 300], [970, 90], [728, 90], [300, 250]] } // greater than 1600px
-          ]
-        },
-        video: {
-          context: 'instream',
-          sizeConfig: [
-            { minViewPort: [0, 0], playerSize: [] },
-            { minViewPort: [800, 0], playerSize: [[640, 400]] },
-            { minViewPort: [1200, 0], playerSize: [] }
-          ]
-        },
-        native: {
-          image: {
-            required: true,
-            sizes: [150, 50]
-          },
-          title: {
-            required: true,
-            len: 80
-          },
-          sponsoredBy: {
-            required: true
-          },
-          clickUrl: {
-            required: true
-          },
-          privacyLink: {
-            required: false
-          },
-          body: {
-            required: true
-          },
-          icon: {
-            required: true,
-            sizes: [50, 50]
-          },
-          sizeConfig: [
-            { minViewPort: [0, 0], active: false },
-            { minViewPort: [600, 0], active: true },
-            { minViewPort: [1000, 0], active: false }
-          ]
-        }
-      },
-      sizeBucketToSizeMap: {},
-      activeViewport: {},
-      transformedMediaTypes: {},
-      cacheHits: 0,
-      instance: 1,
-      isLabelActivated: true,
-    };
-    const adUnitDetailFixture_2 = {
-      adUnitCode: 'div-gpt-ad-1460505748561-1',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 250], [300, 600]]
-        },
-        video: {
-          context: 'instream',
-          playerSize: [300, 460]
-        }
-      },
       sizeBucketToSizeMap: {},
       activeViewport: {},
-      cacheHits: 0,
-      instance: 1,
-      isLabelActivated: true,
       transformedMediaTypes: { banner: {}, video: {} }
     }
-    // adunit with same code at adUnitDetailFixture_1 but differnet mediaTypes object
-    const adUnitDetailFixture_3 = {
-      adUnitCode: 'div-gpt-ad-1460505748561-0',
-      mediaTypes: {
-        banner: {
-          sizeConfig: [
-            { minViewPort: [0, 0], sizes: [] },
-            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] }
-          ]
-        }
-      },
-      sizeBucketToSizeMap: {},
-      activeViewport: {},
-      transformedMediaTypes: {},
-      cacheHits: 0,
-      instance: 1,
-      isLabelActivated: true,
-    }
     const labels = ['mobile'];
     beforeEach(function () {
-      sinon
-        .stub(sizeMappingInternalStore, 'getAuctionDetail')
-        .withArgs('a1b2c3')
-        .returns({
-          usingSizeMappingV2: true,
-          adUnits: [adUnitDetailFixture_1]
-        });
-
-      sinon
-        .stub(sizeMappingInternalStore, 'setAuctionDetail')
-        .withArgs('a1b2c3', adUnitDetailFixture_2);
-
       const getFilteredMediaTypesStub = sinon.stub(internal, 'getFilteredMediaTypes');
 
       getFilteredMediaTypesStub
         .withArgs(AD_UNITS[1].mediaTypes)
-        .returns(adUnitDetailFixture_2);
-
-      getFilteredMediaTypesStub
-        .withArgs(adUnitDetailFixture_3.mediaTypes)
-        .returns(adUnitDetailFixture_3);
-
+        .returns(adUnitDetailFixture_1);
       sinon.spy(utils, 'logInfo');
       sinon.spy(utils, 'deepEqual');
     });
 
     afterEach(function () {
-      sizeMappingInternalStore.getAuctionDetail.restore();
-      sizeMappingInternalStore.setAuctionDetail.restore();
       internal.getFilteredMediaTypes.restore();
       utils.logInfo.restore();
       utils.deepEqual.restore();
     });
 
-    it('should return adUnit detail object from "sizeMappingInternalStore" if adUnit is already present in the store', function () {
-      const [adUnit] = utils.deepClone(AD_UNITS);
-      const adUnitDetail = getAdUnitDetail('a1b2c3', adUnit, labels);
-      sinon.assert.callCount(sizeMappingInternalStore.getAuctionDetail, 1);
-      sinon.assert.callCount(utils.deepEqual, 1);
-      sinon.assert.callCount(internal.getFilteredMediaTypes, 0);
-      expect(adUnitDetail.cacheHits).to.equal(1);
-      expect(adUnitDetail).to.deep.equal(adUnitDetailFixture_1);
-    });
-
-    it('should NOT return adunit detail object from "sizeMappingInternalStore" if adUnit with the SAME CODE BUT DIFFERENT MEDIATYPES OBJECT is present in the store', function () {
-      const [adUnit] = utils.deepClone(AD_UNITS);
-      adUnit.mediaTypes = {
-        banner: {
-          sizeConfig: [
-            { minViewPort: [0, 0], sizes: [] },
-            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] }
-          ]
-        }
-      };
-      const adUnitDetail = getAdUnitDetail('a1b2c3', adUnit, labels);
-      sinon.assert.callCount(sizeMappingInternalStore.getAuctionDetail, 1);
-      sinon.assert.callCount(utils.deepEqual, 1);
-      expect(adUnitDetail).to.not.deep.equal(adUnitDetailFixture_1);
-      sinon.assert.callCount(internal.getFilteredMediaTypes, 1);
-    });
-
-    it('should store value in "sizeMappingInterStore" object if adUnit is NOT preset in this object', function () {
-      const [, adUnit] = utils.deepClone(AD_UNITS);
-      const adUnitDetail = getAdUnitDetail('a1b2c3', adUnit, labels);
-      sinon.assert.callCount(sizeMappingInternalStore.setAuctionDetail, 1);
-      sinon.assert.callCount(internal.getFilteredMediaTypes, 1);
-      expect(adUnitDetail).to.deep.equal(adUnitDetailFixture_2);
-    });
-
     it('should log info message to show the details for activeSizeBucket', function () {
       const [, adUnit] = utils.deepClone(AD_UNITS);
-      getAdUnitDetail('a1b2c3', adUnit, labels);
+      getAdUnitDetail(adUnit, labels, 1);
       sinon.assert.callCount(utils.logInfo, 1);
-      sinon.assert.calledWith(utils.logInfo, `Size Mapping V2:: Ad Unit: div-gpt-ad-1460505748561-1(1) => Active size buckets after filtration: `, adUnitDetailFixture_2.sizeBucketToSizeMap);
+      sinon.assert.calledWith(utils.logInfo, `Size Mapping V2:: Ad Unit: div-gpt-ad-1460505748561-1(1) => Active size buckets after filtration: `, adUnitDetailFixture_1.sizeBucketToSizeMap);
     });
 
-    it('should increment "instance" count if presence of "Identical ad units" is detected', function() {
-      const adUnit = {
-        code: 'div-gpt-ad-1460505748561-0',
-        mediaTypes: {
-          banner: {
-            sizeConfig: [{ minViewPort: [0, 0], sizes: [[300, 300]] }]
-          }
-        },
-        bids: [{
-          bidder: 'appnexus',
-          params: 12
-        }]
-      };
-
-      internal.getFilteredMediaTypes.restore();
-
-      sinon.stub(internal, 'getFilteredMediaTypes')
-        .withArgs(adUnit.mediaTypes)
-        .returns({ mediaTypes: {}, sizeBucketToSizeMap: {}, activeViewPort: [], transformedMediaTypes: {} });
-
-      const adUnitDetail = getAdUnitDetail('a1b2c3', adUnit, labels);
-      sinon.assert.callCount(sizeMappingInternalStore.setAuctionDetail, 1);
-      sinon.assert.callCount(internal.getFilteredMediaTypes, 1);
-      expect(adUnitDetail.instance).to.equal(2);
-    });
-
-    it('should not execute "getFilteredMediaTypes" function if label is not activated on the ad unit', function() {
+    it('should not execute "getFilteredMediaTypes" function if label is not activated on the ad unit', function () {
       const [adUnit] = utils.deepClone(AD_UNITS);
       adUnit.labelAny = ['tablet'];
-      getAdUnitDetail('a1b2c3', adUnit, labels);
+      getAdUnitDetail(adUnit, labels, 1);
 
       // assertions
       sinon.assert.callCount(internal.getFilteredMediaTypes, 0);
@@ -1261,57 +1185,8 @@ describe('sizeMappingV2', function () {
       utils.getWindowTop.restore();
       utils.logWarn.restore();
     });
-    it('should return filteredMediaTypes object with all four properties (mediaTypes, transformedMediaTypes, activeViewport, sizeBucketToSizeMap) evaluated correctly', function () {
+    it('should return filteredMediaTypes object with all properties (transformedMediaTypes, activeViewport, sizeBucketToSizeMap) evaluated correctly', function () {
       const [adUnit] = utils.deepClone(AD_UNITS);
-      const expectedMediaTypes = {
-        banner: {
-          sizeConfig: [
-            { minViewPort: [0, 0], sizes: [] },		// remove if < 750px
-            { minViewPort: [750, 0], sizes: [[300, 250], [300, 600]] },		// between 750px and 1199px
-            { minViewPort: [1200, 0], sizes: [[970, 90], [728, 90], [300, 250]] }, // between 1200px and 1599px
-            { minViewPort: [1600, 0], sizes: [[1000, 300], [970, 90], [728, 90], [300, 250]] } // greater than 1600px
-          ]
-        },
-        video: {
-          context: 'instream',
-          sizeConfig: [
-            { minViewPort: [0, 0], playerSize: [] },
-            { minViewPort: [800, 0], playerSize: [[640, 400]] },
-            { minViewPort: [1200, 0], playerSize: [] }
-          ]
-        },
-        native: {
-          image: {
-            required: true,
-            sizes: [150, 50]
-          },
-          title: {
-            required: true,
-            len: 80
-          },
-          sponsoredBy: {
-            required: true
-          },
-          clickUrl: {
-            required: true
-          },
-          privacyLink: {
-            required: false
-          },
-          body: {
-            required: true
-          },
-          icon: {
-            required: true,
-            sizes: [50, 50]
-          },
-          sizeConfig: [
-            { minViewPort: [0, 0], active: false },
-            { minViewPort: [600, 0], active: true },
-            { minViewPort: [1000, 0], active: false }
-          ]
-        }
-      };
       const expectedSizeBucketToSizeMap = {
         banner: {
           activeSizeBucket: [1600, 0],
@@ -1344,8 +1219,7 @@ describe('sizeMappingV2', function () {
           ]
         }
       };
-      const { mediaTypes, sizeBucketToSizeMap, activeViewport, transformedMediaTypes } = getFilteredMediaTypes(adUnit.mediaTypes);
-      expect(mediaTypes).to.deep.equal(expectedMediaTypes);
+      const { sizeBucketToSizeMap, activeViewport, transformedMediaTypes } = getFilteredMediaTypes(adUnit.mediaTypes);
       expect(activeViewport).to.deep.equal(expectedActiveViewport);
       expect(sizeBucketToSizeMap).to.deep.equal(expectedSizeBucketToSizeMap);
       expect(transformedMediaTypes).to.deep.equal(expectedTransformedMediaTypes);
@@ -1363,7 +1237,8 @@ describe('sizeMappingV2', function () {
     });
   });
 
-  describe('getBids({ bidderCode, auctionId, bidderRequestId, adUnits, labels, src })', function () {
+  describe('setupAdUnitsForLabels', function () {
+    let adUnits, adUnitDetail;
     const basic_AdUnit = [{
       code: 'adUnit1',
       mediaTypes: {
@@ -1393,46 +1268,31 @@ describe('sizeMappingV2', function () {
       }],
       transactionId: '123456'
     }];
-    const adUnitDetailFixture = {
-      adUnitCode: 'adUnit1',
-      transactionId: '123456',
-      sizes: [[300, 200], [400, 600]],
-      mediaTypes: {
-        banner: {
-          sizeConfig: [
-            { minViewPort: [0, 0], sizes: [] },
-            { minViewPort: [600, 0], sizes: [[300, 200], [400, 600]] }
-          ]
-        }
-      },
-      sizeBucketToSizeMap: {
-        banner: {
-          activeSizeBucket: [[500, 0]],
-          activeSizeDimensions: [[300, 200], [400, 600]]
-        }
-      },
-      activeViewport: [560, 260],
-      transformedMediaTypes: {
-        banner: {
-          filteredSizeConfig: [
-            { minViewPort: [500, 0], sizes: [[300, 200], [400, 600]] }
-          ],
-          sizeConfig: [
-            { minViewPort: [0, 0], sizes: [[]] },
-            { minViewPort: [500, 0], sizes: [[300, 200], [400, 600]] }
-          ],
-          sizes: [[300, 200], [400, 600]]
-        }
-      },
-      isLabelActivated: true,
-      instance: 1,
-      cacheHits: 0
-    };
+
+    const bidderMap = (adUnit) => Object.fromEntries(adUnit.bids.map((bid) => [bid.bidder, bid]));
+
     beforeEach(function () {
+      adUnits = deepClone(basic_AdUnit);
+      adUnitDetail = {
+        activeViewport: [560, 260],
+        transformedMediaTypes: {
+          banner: {
+            filteredSizeConfig: [
+              { minViewPort: [500, 0], sizes: [[300, 200], [400, 600]] }
+            ],
+            sizeConfig: [
+              { minViewPort: [0, 0], sizes: [[]] },
+              { minViewPort: [500, 0], sizes: [[300, 200], [400, 600]] }
+            ],
+            sizes: [[300, 200], [400, 600]]
+          }
+        },
+        isLabelActivated: true,
+      };
       sinon
         .stub(internal, 'getAdUnitDetail')
-        .withArgs('6d51e2d7-1447-4242-b6af-aaa5525a2c6e', basic_AdUnit[0], [])
-        .returns(adUnitDetailFixture);
+        .withArgs(adUnits[0], [])
+        .callsFake(() => adUnitDetail);
 
       sinon.spy(internal, 'getRelevantMediaTypesForBidder');
 
@@ -1449,153 +1309,82 @@ describe('sizeMappingV2', function () {
       utils.logWarn.restore();
     });
 
-    it('should return an array of bids specific to the bidder', function () {
-      const expectedMediaTypes = {
-        banner: {
-          filteredSizeConfig: [
-            { minViewPort: [500, 0], sizes: [[300, 200], [400, 600]] }
-          ],
-          sizeConfig: [
-            { minViewPort: [0, 0], sizes: [[]] },
-            { minViewPort: [500, 0], sizes: [[300, 200], [400, 600]] }
-          ],
-          sizes: [[300, 200], [400, 600]]
-        }
+    it('should update adUnit mediaTypes', function () {
+      adUnitDetail = {
+        activeViewport: [560, 260],
+        transformedMediaTypes: {
+          banner: {
+            filteredSizeConfig: [
+              { minViewPort: [500, 0], sizes: [[300, 200], [400, 600]] }
+            ],
+            sizeConfig: [
+              { minViewPort: [0, 0], sizes: [[]] },
+              { minViewPort: [500, 0], sizes: [[300, 200], [400, 600]] }
+            ],
+            sizes: [[300, 200], [400, 600]]
+          }
+        },
+        isLabelActivated: true,
       };
 
-      const bidRequests_1 = getBids({
-        bidderCode: 'appnexus',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0ac',
-        adUnits: basic_AdUnit,
-        labels: [],
-        src: 'client'
-      });
-      expect(bidRequests_1[0].mediaTypes).to.deep.equal(expectedMediaTypes);
-      expect(bidRequests_1[0].bidder).to.equal('appnexus');
-
-      const bidRequests_2 = getBids({
-        bidderCode: 'rubicon',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0aa',
-        adUnits: basic_AdUnit,
-        labels: [],
-        src: 'client'
-      });
-      expect(bidRequests_2[0]).to.be.undefined;
+      const actual = setupAdUnitMediaTypes(adUnits, [])[0];
+
+      expect(actual.mediaTypes).to.deep.equal(adUnitDetail.transformedMediaTypes);
+      const bids = bidderMap(actual);
+      expect(bids.appnexus).to.not.be.undefined;
+      expect(bids.appnexus.mediaTypes).to.be.undefined;
+      expect(bids.rubicon).to.be.undefined;
       sinon.assert.callCount(internal.getRelevantMediaTypesForBidder, 1);
     });
 
     it('should log an error message if ad unit is disabled because there are no active media types left after size config filtration', function () {
-      internal.getAdUnitDetail.restore();
-
-      const adUnit = utils.deepClone(basic_AdUnit);
-      adUnit[0].mediaTypes.banner.sizeConfig = [
+      adUnits[0].mediaTypes.banner.sizeConfig = [
         { minViewPort: [0, 0], sizes: [] },
         { minViewPort: [600, 0], sizes: [[300, 200], [400, 600]] }
       ];
 
-      const adUnitDetailFixture = {
-        adUnitCode: 'adUnit1',
-        mediaTypes: {
-          banner: {
-            sizeConfig: [
-              { minViewPort: [0, 0], sizes: [] },
-              { minViewPort: [600, 0], sizes: [[300, 200], [400, 600]] }
-            ]
-          }
-        },
-        sizeBucketToSizeMap: {
-          banner: {
-            activeSizeBucket: [0, 0],
-            activeSizeDimensions: [[]]
-          }
-        },
+      adUnitDetail = {
         activeViewport: [560, 260],
         transformedMediaTypes: {},
         isLabelActivated: true,
-        instance: 1,
-        cacheHits: 0
       };
 
-      sinon
-        .stub(internal, 'getAdUnitDetail')
-        .withArgs('6d51e2d7-1447-4242-b6af-aaa5525a2c6e', adUnit[0])
-        .returns(adUnitDetailFixture);
-
-      const bidRequests = getBids({
-        bidderCode: 'appnexus',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0ac',
-        adUnits: adUnit,
-        labels: [],
-        src: 'client'
-      });
-      expect(bidRequests[0]).to.be.undefined;
+      const actual = setupAdUnitMediaTypes(adUnits, [])[0];
+      expect(actual).to.be.undefined;
       sinon.assert.callCount(utils.logInfo, 1);
       sinon.assert.calledWith(utils.logInfo, `Size Mapping V2:: Ad Unit: adUnit1(1) => Ad unit disabled since there are no active media types after sizeConfig filtration.`);
     });
 
     it('should throw an error if bidder level sizeConfig is not configured properly', function () {
-      internal.getAdUnitDetail.restore();
-
-      const adUnit = utils.deepClone(basic_AdUnit);
-      adUnit[0].bids[1].sizeConfig = [
+      adUnits[0].bids[1].sizeConfig = [
         { minViewPort: [], relevantMediaTypes: ['none'] },
         { minViewPort: [700, 0], relevantMediaTypes: ['banner'] }
       ];
-
-      sinon
-        .stub(internal, 'getAdUnitDetail')
-        .withArgs('6d51e2d7-1447-4242-b6af-aaa5525a2c6e', adUnit[0])
-        .returns(adUnitDetailFixture);
-
-      const bidRequests = getBids({
-        bidderCode: 'rubicon',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0ac',
-        adUnits: adUnit,
-        labels: [],
-        src: 'client'
-      });
-
-      expect(bidRequests[0]).to.not.be.undefined;
+      const actual = setupAdUnitMediaTypes(adUnits, [])[0];
+      expect(actual).to.not.be.undefined;
+      const bids = bidderMap(actual);
+      expect(bids.rubicon.mediaTypes).to.be.undefined;
       sinon.assert.callCount(utils.logError, 1);
-      sinon.assert.calledWith(utils.logError, `Size Mapping V2:: Ad Unit: adUnit1(1), Bidder: rubicon => 'sizeConfig' is not configured properly. This bidder won't be eligible for sizeConfig checks and will remail active.`);
+      sinon.assert.calledWith(utils.logError, `Size Mapping V2:: Ad Unit: adUnit1(1), Bidder: rubicon => 'sizeConfig' is not configured properly. This bidder won't be eligible for sizeConfig checks and will remain active.`);
     });
 
-    it('should ensure bidder relevantMediaTypes is a subset of active media types at the ad unit level', function () {
-      internal.getAdUnitDetail.restore();
-
-      const adUnit = utils.deepClone(basic_AdUnit);
-      adUnit[0].bids[1].sizeConfig = [
+    it('should ensure only relevant sizes are in adUnit.mediaTypes', function () {
+      adUnits[0].bids[1].sizeConfig = [
         { minViewPort: [0, 0], relevantMediaTypes: ['none'] },
         { minViewPort: [400, 0], relevantMediaTypes: ['banner'] }
       ];
 
-      sinon
-        .stub(internal, 'getAdUnitDetail')
-        .withArgs('6d51e2d7-1447-4242-b6af-aaa5525a2c6e', adUnit[0])
-        .returns(adUnitDetailFixture);
-
-      const bidRequests = getBids({
-        bidderCode: 'rubicon',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0ac',
-        adUnits: adUnit,
-        labels: [],
-        src: 'client'
-      });
-      expect(bidRequests[0]).to.not.be.undefined;
-      expect(bidRequests[0].mediaTypes.banner).to.not.be.undefined;
-      expect(bidRequests[0].mediaTypes.banner.sizes).to.deep.equal([[300, 200], [400, 600]]);
+      const actual = setupAdUnitMediaTypes(adUnits, [])[0];
+      expect(actual).to.not.be.undefined;
+      const bids = bidderMap(actual);
+      expect(bids.rubicon.mediaTypes).to.be.undefined;
+      expect(bids.appnexus.mediaTypes).to.be.undefined;
+      expect(actual.mediaTypes.banner).to.not.be.undefined;
+      expect(actual.mediaTypes.banner.sizes).to.deep.equal([[300, 200], [400, 600]]);
     });
 
-    it('should logInfo if bidder relevantMediaTypes contains media type that is not active at the ad unit level', function () {
-      internal.getAdUnitDetail.restore();
-
-      const adUnit = utils.deepClone(basic_AdUnit);
-      adUnit[0].mediaTypes = {
+    it('should remove bidder if its relevantMediaTypes contains media type that is not active at the ad unit level', function () {
+      adUnits[0].mediaTypes = {
         banner: {
           sizeConfig: [
             { minViewPort: [0, 0], sizes: [] },
@@ -1610,60 +1399,22 @@ describe('sizeMappingV2', function () {
         }
       };
 
-      adUnit[0].bids[1].sizeConfig = [
+      adUnits[0].bids[1].sizeConfig = [
         { minViewPort: [0, 0], relevantMediaTypes: ['none'] },
         { minViewPort: [200, 0], relevantMediaTypes: ['banner'] }
       ];
 
-      const adUnitDetailFixture = {
-        adUnitCode: 'adUnit1',
-        mediaTypes: {
-          banner: {
-            sizeConfig: [
-              { minViewPort: [0, 0], sizes: [] },
-              { minViewPort: [700, 0], sizes: [[300, 200], [400, 600]] }
-            ]
-          },
-          native: {
-            sizeConfig: [
-              { minViewPort: [0, 0], active: false },
-              { minViewPort: [400, 0], active: true }
-            ]
-          }
-        },
-        sizeBucketToSizeMap: {
-          banner: {
-            activeSizeBucket: [0, 0],
-            activeSizeDimensions: [[]]
-          },
-          native: {
-            activeSizeBucket: [400, 0],
-            activeSizeDimensions: 'NA'
-          }
-        },
+      adUnitDetail = {
         activeViewport: [560, 260],
         transformedMediaTypes: {
           native: {}
         },
         isLabelActivated: true,
-        instance: 1,
-        cacheHits: 0
       };
 
-      sinon
-        .stub(internal, 'getAdUnitDetail')
-        .withArgs('6d51e2d7-1447-4242-b6af-aaa5525a2c6e', adUnit[0], [])
-        .returns(adUnitDetailFixture);
-
-      const bidRequests = getBids({
-        bidderCode: 'rubicon',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0ac',
-        adUnits: adUnit,
-        labels: [],
-        src: 'client'
-      });
-      expect(bidRequests[0]).to.be.undefined;
+      const actual = setupAdUnitMediaTypes(adUnits, [])[0];
+      const bids = bidderMap(actual);
+      expect(bids.rubicon).to.be.undefined;
       sinon.assert.callCount(utils.logInfo, 1);
       sinon.assert.calledWith(utils.logInfo, `Size Mapping V2:: Ad Unit: adUnit1(1), Bidder: rubicon => 'relevantMediaTypes' does not match with any of the active mediaTypes at the Ad Unit level. This bidder is disabled.`);
     });
@@ -1673,38 +1424,19 @@ describe('sizeMappingV2', function () {
         .stub(utils, 'isValidMediaTypes')
         .returns(false);
 
-      getBids({
-        bidderCode: 'appnexus',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0ac',
-        adUnits: basic_AdUnit,
-        labels: [],
-        src: 'client'
-      });
+      try {
+        setupAdUnitMediaTypes(adUnits, []);
+      } finally {
+        utils.isValidMediaTypes.restore();
+      }
+
       sinon.assert.callCount(utils.logWarn, 1);
       sinon.assert.calledWith(utils.logWarn, `Size Mapping V2:: Ad Unit: adUnit1 => Ad unit has declared invalid 'mediaTypes' or has not declared a 'mediaTypes' property`);
-
-      utils.isValidMediaTypes.restore();
     });
 
     it('should log a message if ad unit is disabled due to a failing label check', function () {
-      internal.getAdUnitDetail.restore();
-      const adUnitDetail = Object.assign({}, adUnitDetailFixture);
       adUnitDetail.isLabelActivated = false;
-      sinon
-        .stub(internal, 'getAdUnitDetail')
-        .withArgs('6d51e2d7-1447-4242-b6af-aaa5525a2c6e', basic_AdUnit[0], [])
-        .returns(adUnitDetail);
-
-      getBids({
-        bidderCode: 'appnexus',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0ac',
-        adUnits: basic_AdUnit,
-        labels: [],
-        src: 'client'
-      });
-
+      setupAdUnitMediaTypes(adUnits, []);
       sinon.assert.callCount(utils.logInfo, 1);
       sinon.assert.calledWith(utils.logInfo, `Size Mapping V2:: Ad Unit: adUnit1(1) => Ad unit is disabled due to failing label check.`);
     });
@@ -1712,19 +1444,25 @@ describe('sizeMappingV2', function () {
     it('should log a message if bidder is disabled due to a failing label check', function () {
       const stub = sinon.stub(internal, 'isLabelActivated').returns(false);
 
-      getBids({
-        bidderCode: 'appnexus',
-        auctionId: '6d51e2d7-1447-4242-b6af-aaa5525a2c6e',
-        bidderRequestId: '393a43193a0ac',
-        adUnits: basic_AdUnit,
-        labels: [],
-        src: 'client'
-      });
+      try {
+        setupAdUnitMediaTypes(adUnits, []);
+      } finally {
+        stub.restore();
+      }
 
-      sinon.assert.callCount(utils.logInfo, 1);
+      sinon.assert.callCount(utils.logInfo, 2); // called once for each bidder
       sinon.assert.calledWith(utils.logInfo, `Size Mapping V2:: Ad Unit: adUnit1(1), Bidder: appnexus => Label check for this bidder has failed. This bidder is disabled.`);
+    });
 
-      internal.isLabelActivated.restore();
-    })
+    it('should set adUnit.bids[].mediaTypes if the bid mediaTypes should differ from the adUnit', () => {
+      adUnits[0].mediaTypes.native = {};
+      adUnits[0].bids[1].sizeConfig = [
+        { minViewPort: [0, 0], relevantMediaTypes: ['banner'] }
+      ];
+      adUnitDetail.transformedMediaTypes.native = {};
+      const actual = setupAdUnitMediaTypes(adUnits, [])[0];
+      const bids = bidderMap(actual);
+      expect(bids.rubicon.mediaTypes).to.deep.equal({banner: adUnitDetail.transformedMediaTypes.banner});
+    });
   });
 });
diff --git a/test/spec/modules/slimcutBidAdapter_spec.js b/test/spec/modules/slimcutBidAdapter_spec.js
index 44da1d87824..d821627c24b 100644
--- a/test/spec/modules/slimcutBidAdapter_spec.js
+++ b/test/spec/modules/slimcutBidAdapter_spec.js
@@ -1,19 +1,21 @@
-import {expect} from 'chai';
-import {spec} from 'modules/slimcutBidAdapter.js';
-import {newBidder} from 'src/adapters/bidderFactory.js';
-
+import {
+  expect
+} from 'chai';
+import {
+  spec
+} from 'modules/slimcutBidAdapter.js';
+import {
+  newBidder
+} from 'src/adapters/bidderFactory.js';
 const ENDPOINT = 'https://sb.freeskreen.com/pbr';
 const AD_SCRIPT = '<script type="text/javascript" class="slimcut" async="true" src="https://static.freeskreen.com/publisher/83/freeskreen.min.js"></script>"';
-
 describe('slimcutBidAdapter', function() {
   const adapter = newBidder(spec);
-
   describe('inherited functions', function() {
     it('exists and is a function', function() {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
   });
-
   describe('isBidRequestValid', function() {
     let bid = {
       'bidder': 'slimcut',
@@ -21,75 +23,66 @@ describe('slimcutBidAdapter', function() {
         'placementId': 83
       },
       'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
+      'sizes': [
+        [300, 250],
+        [300, 600]
+      ],
       'bidId': '3c871ffa8ef14c',
       'bidderRequestId': 'b41642f1aee381',
       'auctionId': '4e156668c977d7'
     };
-
     it('should return true when required params found', function() {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
-
     it('should return false when placementId is not valid (letters)', function() {
       let bid = Object.assign({}, bid);
       delete bid.params;
       bid.params = {
         'placementId': 'ABCD'
       };
-
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
-
     it('should return false when placementId < 0', function() {
       let bid = Object.assign({}, bid);
       delete bid.params;
       bid.params = {
         'placementId': -1
       };
-
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
-
     it('should return false when required params are not passed', function() {
       let bid = Object.assign({}, bid);
       delete bid.params;
-
       bid.params = {};
-
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
   });
-
   describe('buildRequests', function() {
-    let bidRequests = [
-      {
-        'bidder': 'teads',
-        'params': {
-          'placementId': 10433394
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '3c871ffa8ef14c',
-        'bidderRequestId': 'b41642f1aee381',
-        'auctionId': '4e156668c977d7',
-        'deviceWidth': 1680
-      }
-    ];
-
+    let bidRequests = [{
+      'bidder': 'teads',
+      'params': {
+        'placementId': 10433394
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [
+        [300, 250],
+        [300, 600]
+      ],
+      'bidId': '3c871ffa8ef14c',
+      'bidderRequestId': 'b41642f1aee381',
+      'auctionId': '4e156668c977d7',
+      'deviceWidth': 1680
+    }];
     let bidderResquestDefault = {
       'auctionId': '4e156668c977d7',
       'bidderRequestId': 'b41642f1aee381',
       'timeout': 3000
     };
-
     it('sends bid request to ENDPOINT via POST', function() {
       const request = spec.buildRequests(bidRequests, bidderResquestDefault);
-
       expect(request.url).to.equal(ENDPOINT);
       expect(request.method).to.equal('POST');
     });
-
     it('should send GDPR to endpoint', function() {
       let consentString = 'JRJ8RKfDeBNsERRDCSAAZ+A==';
       let bidderRequest = {
@@ -104,31 +97,26 @@ describe('slimcutBidAdapter', function() {
           }
         }
       };
-
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
-
       expect(payload.gdpr_iab).to.exist;
       expect(payload.gdpr_iab.consent).to.equal(consentString);
     });
-
-    it('should add referer info to payload', function () {
+    it('should add referer info to payload', function() {
       const bidRequest = Object.assign({}, bidRequests[0])
       const bidderRequest = {
         refererInfo: {
-          referer: 'https://example.com/page.html',
+          page: 'https://example.com/page.html',
           reachedTop: true,
           numIframes: 2
         }
       }
       const request = spec.buildRequests([bidRequest], bidderRequest);
       const payload = JSON.parse(request.data);
-
       expect(payload.referrer).to.exist;
       expect(payload.referrer).to.deep.equal('https://example.com/page.html')
     });
   });
-
   describe('getUserSyncs', () => {
     let bids = {
       'body': {
@@ -147,19 +135,20 @@ describe('slimcutBidAdapter', function() {
         }]
       }
     };
-
     it('should get the correct number of sync urls', () => {
-      let urls = spec.getUserSyncs({iframeEnabled: true}, bids);
+      let urls = spec.getUserSyncs({
+        iframeEnabled: true
+      }, bids);
       expect(urls.length).to.equal(1);
       expect(urls[0].url).to.equal('https://sb.freeskreen.com/async_usersync.html');
     });
-
     it('should return no url if not iframe enabled', () => {
-      let urls = spec.getUserSyncs({iframeEnabled: false}, bids);
+      let urls = spec.getUserSyncs({
+        iframeEnabled: false
+      }, bids);
       expect(urls.length).to.equal(0);
     });
   });
-
   describe('interpretResponse', function() {
     let bids = {
       'body': {
@@ -178,7 +167,6 @@ describe('slimcutBidAdapter', function() {
         }]
       }
     };
-
     it('should get correct bid response', function() {
       let expectedResponse = [{
         'cpm': 0.5,
@@ -191,20 +179,20 @@ describe('slimcutBidAdapter', function() {
         'requestId': '3ede2a3fa0db94',
         'creativeId': 'er2ee',
         'transactionId': 'deadb33f',
-        'winUrl': 'https://sb.freeskreen.com/win'
+        'winUrl': 'https://sb.freeskreen.com/win',
+        'meta': {
+          'advertiserDomains': []
+        }
       }];
-
       let result = spec.interpretResponse(bids);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
     });
-
     it('handles nobid responses', function() {
       let bids = {
         'body': {
           'responses': []
         }
       };
-
       let result = spec.interpretResponse(bids);
       expect(result.length).to.equal(0);
     });
diff --git a/test/spec/modules/smaatoBidAdapter_spec.js b/test/spec/modules/smaatoBidAdapter_spec.js
new file mode 100644
index 00000000000..c7dbf1363e7
--- /dev/null
+++ b/test/spec/modules/smaatoBidAdapter_spec.js
@@ -0,0 +1,1511 @@
+import {spec} from 'modules/smaatoBidAdapter.js';
+import * as utils from 'src/utils.js';
+import {config} from 'src/config.js';
+import {createEidsArray} from 'modules/userId/eids.js';
+
+const ADTYPE_IMG = 'Img';
+const ADTYPE_RICHMEDIA = 'Richmedia';
+const ADTYPE_VIDEO = 'Video';
+const ADTYPE_NATIVE = 'Native';
+
+const REFERRER = 'http://example.com/page.html'
+const CONSENT_STRING = 'HFIDUYFIUYIUYWIPOI87392DSU'
+const AUCTION_ID = '6653';
+
+const defaultBidderRequest = {
+  gdprConsent: {
+    consentString: CONSENT_STRING,
+    gdprApplies: true
+  },
+  uspConsent: 'uspConsentString',
+  refererInfo: {
+    ref: REFERRER,
+  },
+  timeout: 1200,
+  auctionId: AUCTION_ID
+};
+
+const BANNER_PREBID_MEDIATYPE = {
+  sizes: [[300, 50]]
+}
+
+const singleBannerBidRequest = {
+  bidder: 'smaato',
+  params: {
+    publisherId: 'publisherId',
+    adspaceId: 'adspaceId'
+  },
+  mediaTypes: {
+    banner: BANNER_PREBID_MEDIATYPE
+  },
+  adUnitCode: '/19968336/header-bid-tag-0',
+  transactionId: 'transactionId',
+  sizes: [[300, 50]],
+  bidId: 'bidId',
+  bidderRequestId: 'bidderRequestId',
+  src: 'client',
+  bidRequestsCount: 1,
+  bidderRequestsCount: 1,
+  bidderWinsCount: 0
+};
+
+const extractPayloadOfFirstAndOnlyRequest = (reqs) => {
+  expect(reqs).to.have.length(1);
+  return JSON.parse(reqs[0].data);
+}
+
+describe('smaatoBidAdapterTest', () => {
+  describe('isBidRequestValid', () => {
+    it('is invalid, when params object is not present', () => {
+      expect(spec.isBidRequestValid({})).to.be.false;
+    });
+
+    it('is invalid, when params object is empty', () => {
+      expect(spec.isBidRequestValid({params: {}})).to.be.false;
+    });
+
+    it('is invalid, when publisherId is present but of wrong type', () => {
+      expect(spec.isBidRequestValid({params: {publisherId: 123}})).to.be.false;
+    });
+
+    describe('for ad pod / long form video requests', () => {
+      const ADPOD = {video: {context: 'adpod'}}
+      it('is invalid, when adbreakId is missing', () => {
+        expect(spec.isBidRequestValid({mediaTypes: ADPOD, params: {publisherId: '123'}})).to.be.false;
+      });
+
+      it('is invalid, when adbreakId is present but of wrong type', () => {
+        expect(spec.isBidRequestValid({mediaTypes: ADPOD, params: {publisherId: '123', adbreakId: 456}})).to.be.false;
+      });
+
+      it('is valid, when required params are present', () => {
+        expect(spec.isBidRequestValid({mediaTypes: ADPOD, params: {publisherId: '123', adbreakId: '456'}})).to.be.true;
+      });
+
+      it('is invalid, when forbidden adspaceId param is present', () => {
+        expect(spec.isBidRequestValid({
+          mediaTypes: ADPOD,
+          params: {publisherId: '123', adbreakId: '456', adspaceId: '42'}
+        })).to.be.false;
+      });
+    });
+
+    describe('for non adpod requests', () => {
+      it('is invalid, when adspaceId is missing', () => {
+        expect(spec.isBidRequestValid({params: {publisherId: '123'}})).to.be.false;
+      });
+
+      it('is invalid, when adspaceId is present but of wrong type', () => {
+        expect(spec.isBidRequestValid({params: {publisherId: '123', adspaceId: 456}})).to.be.false;
+      });
+
+      it('is valid, when required params are present for minimal request', () => {
+        expect(spec.isBidRequestValid({params: {publisherId: '123', adspaceId: '456'}})).to.be.true;
+      });
+
+      it('is invalid, when forbidden adbreakId param is present', () => {
+        expect(spec.isBidRequestValid({params: {publisherId: '123', adspaceId: '456', adbreakId: '42'}})).to.be.false;
+      });
+    });
+  });
+
+  describe('buildRequests', () => {
+    const BANNER_OPENRTB_IMP = {
+      w: 300,
+      h: 50,
+      format: [
+        {
+          h: 50,
+          w: 300
+        }
+      ]
+    }
+
+    describe('common', () => {
+      const MINIMAL_BIDDER_REQUEST = {
+        refererInfo: {
+          ref: REFERRER,
+        }
+      };
+
+      let sandbox;
+      beforeEach(() => {
+        sandbox = sinon.sandbox.create();
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      })
+
+      it('auction type is 1 (first price auction)', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.at).to.be.equal(1);
+      })
+
+      it('currency is US dollar', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.cur).to.be.deep.equal(['USD']);
+      })
+
+      it('can override endpoint', () => {
+        const overridenEndpoint = 'https://prebid/bidder';
+        const updatedBidRequest = utils.deepClone(singleBannerBidRequest);
+        utils.deepSetValue(updatedBidRequest, 'params.endpoint', overridenEndpoint);
+
+        const reqs = spec.buildRequests([updatedBidRequest], defaultBidderRequest);
+
+        expect(reqs).to.have.length(1);
+        expect(reqs[0].url).to.equal(overridenEndpoint);
+      });
+
+      it('sends correct imp', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp).to.deep.equal([
+          {
+            id: 'bidId',
+            banner: BANNER_OPENRTB_IMP,
+            tagid: 'adspaceId',
+          }
+        ]);
+      });
+
+      it('sends bidfloor when configured', () => {
+        const singleBannerBidRequestWithFloor = Object.assign({}, singleBannerBidRequest);
+        singleBannerBidRequestWithFloor.getFloor = function(arg) {
+          if (arg.currency === 'USD' &&
+              arg.mediaType === 'banner' &&
+              JSON.stringify(arg.size) === JSON.stringify([300, 50])) {
+            return {
+              currency: 'USD',
+              floor: 0.123
+            }
+          }
+        }
+        const reqs = spec.buildRequests([singleBannerBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.equal(0.123);
+      });
+
+      it('bidfloor uses catch-all when multiple sizes', () => {
+        const singleBannerMultipleSizesBidRequestWithFloor = Object.assign({}, singleBannerBidRequest, {
+          mediaTypes: {
+            banner: {
+              sizes: [[320, 50], [320, 250]]
+            }
+          }
+        });
+        singleBannerMultipleSizesBidRequestWithFloor.getFloor = function(arg) {
+          if (arg.size === '*') {
+            return {
+              currency: 'USD',
+              floor: 0.101
+            }
+          }
+        }
+        const reqs = spec.buildRequests([singleBannerMultipleSizesBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.equal(0.101);
+      });
+
+      it('sends undefined bidfloor when not a function', () => {
+        const singleBannerBidRequestWithFloor = Object.assign({}, singleBannerBidRequest);
+        singleBannerBidRequestWithFloor.getFloor = 0
+
+        const reqs = spec.buildRequests([singleBannerBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.undefined
+      });
+
+      it('sends undefined bidfloor when invalid', () => {
+        const singleBannerBidRequestWithFloor = Object.assign({}, singleBannerBidRequest);
+        singleBannerBidRequestWithFloor.getFloor = function() {
+          return undefined;
+        }
+        const reqs = spec.buildRequests([singleBannerBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.undefined
+      });
+
+      it('sends undefined bidfloor when not a number', () => {
+        const singleBannerBidRequestWithFloor = Object.assign({}, singleBannerBidRequest);
+        singleBannerBidRequestWithFloor.getFloor = function() {
+          return {
+            currency: 'USD',
+          }
+        }
+        const reqs = spec.buildRequests([singleBannerBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.undefined;
+      });
+
+      it('sends undefined bidfloor when wrong currency', () => {
+        const singleBannerBidRequestWithFloor = Object.assign({}, singleBannerBidRequest);
+        singleBannerBidRequestWithFloor.getFloor = function() {
+          return {
+            currency: 'EUR',
+            floor: 0.123
+          }
+        }
+        const reqs = spec.buildRequests([singleBannerBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.undefined;
+      });
+
+      it('sends correct site', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.site.id).to.exist.and.to.be.a('string');
+        expect(req.site.domain).to.exist.and.to.be.a('string');
+        expect(req.site.page).to.exist.and.to.be.a('string');
+        expect(req.site.ref).to.equal(REFERRER);
+        expect(req.site.publisher.id).to.equal('publisherId');
+      })
+
+      it('sends gdpr applies if exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.regs.ext.gdpr).to.equal(1);
+        expect(req.user.ext.consent).to.equal(CONSENT_STRING);
+      });
+
+      it('sends no gdpr applies if no gdpr exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], MINIMAL_BIDDER_REQUEST);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.regs.ext.gdpr).to.not.exist;
+        expect(req.user.ext.consent).to.not.exist;
+      });
+
+      it('sends us_privacy if exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.regs.ext.us_privacy).to.equal('uspConsentString');
+      });
+
+      it('sends no schain if no schain exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.source.ext.schain).to.not.exist;
+      });
+
+      it('sends instl if instl exists', () => {
+        const instl = { instl: 1 };
+        const bidRequestWithInstl = Object.assign({}, singleBannerBidRequest, {ortb2Imp: instl});
+
+        const reqs = spec.buildRequests([bidRequestWithInstl], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].instl).to.equal(1);
+      });
+
+      it('sends tmax', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.tmax).to.equal(1200);
+      });
+
+      it('sends no us_privacy if no us_privacy exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], MINIMAL_BIDDER_REQUEST);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.regs.ext.us_privacy).to.not.exist;
+      });
+
+      it('sends first party data', () => {
+        const ortb2 = {
+          site: {
+            keywords: 'power tools,drills',
+            publisher: {
+              id: 'otherpublisherid',
+              name: 'publishername'
+            }
+          },
+          user: {
+            keywords: 'a,b',
+            gender: 'M',
+            yob: 1984
+          }
+        };
+
+        const reqs = spec.buildRequests([singleBannerBidRequest], {...defaultBidderRequest, ortb2});
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.user.gender).to.equal('M');
+        expect(req.user.yob).to.equal(1984);
+        expect(req.user.keywords).to.eql('a,b');
+        expect(req.user.ext.consent).to.equal(CONSENT_STRING);
+        expect(req.site.keywords).to.eql('power tools,drills');
+        expect(req.site.publisher.id).to.equal('publisherId');
+      });
+
+      it('has no user ids', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.user.ext.eids).to.not.exist;
+      });
+    });
+
+    describe('multiple requests', () => {
+      it('build individual server request for each bid request', () => {
+        const bidRequest1 = utils.deepClone(singleBannerBidRequest);
+        const bidRequest1BidId = '1111';
+        utils.deepSetValue(bidRequest1, 'bidId', bidRequest1BidId);
+        const bidRequest2 = utils.deepClone(singleBannerBidRequest);
+        const bidRequest2BidId = '2222';
+        utils.deepSetValue(bidRequest2, 'bidId', bidRequest2BidId);
+
+        const reqs = spec.buildRequests([bidRequest1, bidRequest2], defaultBidderRequest);
+
+        expect(reqs).to.have.length(2);
+        expect(JSON.parse(reqs[0].data).imp[0].id).to.be.equal(bidRequest1BidId);
+        expect(JSON.parse(reqs[1].data).imp[0].id).to.be.equal(bidRequest2BidId);
+      });
+    });
+
+    describe('buildRequests for video imps', () => {
+      const VIDEO_OUTSTREAM_PREBID_MEDIATYPE = {
+        context: 'outstream',
+        playerSize: [[768, 1024]],
+        mimes: ['video/mp4', 'video/quicktime', 'video/3gpp', 'video/x-m4v'],
+        minduration: 5,
+        maxduration: 30,
+        startdelay: 0,
+        linearity: 1,
+        protocols: [7],
+        skip: 1,
+        skipmin: 5,
+        api: [7],
+        ext: {rewarded: 0}
+      };
+      const VIDEO_OUTSTREAM_OPENRTB_IMP = {
+        mimes: ['video/mp4', 'video/quicktime', 'video/3gpp', 'video/x-m4v'],
+        minduration: 5,
+        startdelay: 0,
+        linearity: 1,
+        h: 1024,
+        maxduration: 30,
+        skip: 1,
+        protocols: [7],
+        ext: {
+          rewarded: 0
+        },
+        skipmin: 5,
+        api: [7],
+        w: 768
+      };
+      const singleVideoBidRequest = {
+        bidder: 'smaato',
+        params: {
+          publisherId: 'publisherId',
+          adspaceId: 'adspaceId'
+        },
+        mediaTypes: {
+          video: VIDEO_OUTSTREAM_PREBID_MEDIATYPE
+        },
+        adUnitCode: '/19968336/header-bid-tag-0',
+        transactionId: 'transactionId',
+        bidId: 'bidId',
+        bidderRequestId: 'bidderRequestId',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0
+      };
+
+      it('sends correct video imps', () => {
+        const reqs = spec.buildRequests([singleVideoBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].id).to.be.equal('bidId');
+        expect(req.imp[0].tagid).to.be.equal('adspaceId');
+        expect(req.imp[0].bidfloor).to.be.undefined;
+        expect(req.imp[0].video).to.deep.equal(VIDEO_OUTSTREAM_OPENRTB_IMP);
+      });
+
+      it('sends bidfloor when configured', () => {
+        const singleVideoBidRequestWithFloor = Object.assign({}, singleVideoBidRequest);
+        singleVideoBidRequestWithFloor.getFloor = function(arg) {
+          if (arg.currency === 'USD' &&
+              arg.mediaType === 'video' &&
+              JSON.stringify(arg.size) === JSON.stringify([768, 1024])) {
+            return {
+              currency: 'USD',
+              floor: 0.456
+            }
+          }
+        }
+        const reqs = spec.buildRequests([singleVideoBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.equal(0.456);
+      });
+
+      it('sends instl if instl exists', () => {
+        const instl = { instl: 1 };
+        const bidRequestWithInstl = Object.assign({}, singleVideoBidRequest, {ortb2Imp: instl});
+
+        const reqs = spec.buildRequests([bidRequestWithInstl], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].instl).to.equal(1);
+      });
+
+      it('splits multi format bid requests', () => {
+        const combinedBannerAndVideoBidRequest = {
+          bidder: 'smaato',
+          params: {
+            publisherId: 'publisherId',
+            adspaceId: 'adspaceId'
+          },
+          mediaTypes: {
+            banner: BANNER_PREBID_MEDIATYPE,
+            video: VIDEO_OUTSTREAM_PREBID_MEDIATYPE
+          },
+          adUnitCode: '/19968336/header-bid-tag-0',
+          transactionId: 'transactionId',
+          sizes: [[300, 50]],
+          bidId: 'bidId',
+          bidderRequestId: 'bidderRequestId',
+          src: 'client',
+          bidRequestsCount: 1,
+          bidderRequestsCount: 1,
+          bidderWinsCount: 0
+        };
+
+        const reqs = spec.buildRequests([combinedBannerAndVideoBidRequest], defaultBidderRequest);
+
+        expect(reqs).to.have.length(2);
+        expect(JSON.parse(reqs[0].data).imp[0].banner).to.deep.equal(BANNER_OPENRTB_IMP);
+        expect(JSON.parse(reqs[0].data).imp[0].video).to.not.exist;
+        expect(JSON.parse(reqs[1].data).imp[0].banner).to.not.exist;
+        expect(JSON.parse(reqs[1].data).imp[0].video).to.deep.equal(VIDEO_OUTSTREAM_OPENRTB_IMP);
+      });
+
+      describe('ad pod / long form video', () => {
+        describe('required parameters with requireExactDuration false', () => {
+          const ADBREAK_ID = 'adbreakId';
+          const ADPOD = 'adpod';
+          const BID_ID = '4331';
+          const W = 640;
+          const H = 480;
+          const ADPOD_DURATION = 300;
+          const DURATION_RANGE = [15, 30];
+          const longFormVideoBidRequest = {
+            params: {
+              publisherId: 'publisherId',
+              adbreakId: ADBREAK_ID,
+            },
+            mediaTypes: {
+              video: {
+                context: ADPOD,
+                playerSize: [[W, H]],
+                adPodDurationSec: ADPOD_DURATION,
+                durationRangeSec: DURATION_RANGE,
+                requireExactDuration: false
+              }
+            },
+            bidId: BID_ID
+          };
+
+          it('sends required fields', () => {
+            const reqs = spec.buildRequests([longFormVideoBidRequest], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.id).to.be.equal(AUCTION_ID);
+            expect(req.imp.length).to.be.equal(ADPOD_DURATION / DURATION_RANGE[0]);
+            expect(req.imp[0].id).to.be.equal(BID_ID);
+            expect(req.imp[0].tagid).to.be.equal(ADBREAK_ID);
+            expect(req.imp[0].bidfloor).to.be.undefined;
+            expect(req.imp[0].video.ext.context).to.be.equal(ADPOD);
+            expect(req.imp[0].video.w).to.be.equal(W);
+            expect(req.imp[0].video.h).to.be.equal(H);
+            expect(req.imp[0].video.maxduration).to.be.equal(DURATION_RANGE[1]);
+            expect(req.imp[0].video.sequence).to.be.equal(1);
+            expect(req.imp[1].id).to.be.equal(BID_ID);
+            expect(req.imp[1].tagid).to.be.equal(ADBREAK_ID);
+            expect(req.imp[1].bidfloor).to.be.undefined;
+            expect(req.imp[1].video.ext.context).to.be.equal(ADPOD);
+            expect(req.imp[1].video.w).to.be.equal(W);
+            expect(req.imp[1].video.h).to.be.equal(H);
+            expect(req.imp[1].video.maxduration).to.be.equal(DURATION_RANGE[1]);
+            expect(req.imp[1].video.sequence).to.be.equal(2);
+          });
+
+          it('sends instl if instl exists', () => {
+            const instl = { instl: 1 };
+            const bidRequestWithInstl = Object.assign({}, longFormVideoBidRequest, {ortb2Imp: instl});
+
+            const reqs = spec.buildRequests([bidRequestWithInstl], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.imp[0].instl).to.equal(1);
+            expect(req.imp[1].instl).to.equal(1);
+          });
+
+          it('sends bidfloor when configured', () => {
+            const longFormVideoBidRequestWithFloor = Object.assign({}, longFormVideoBidRequest);
+            longFormVideoBidRequestWithFloor.getFloor = function(arg) {
+              if (arg.currency === 'USD' &&
+                  arg.mediaType === 'video' &&
+                  JSON.stringify(arg.size) === JSON.stringify([640, 480])) {
+                return {
+                  currency: 'USD',
+                  floor: 0.789
+                }
+              }
+            }
+            const reqs = spec.buildRequests([longFormVideoBidRequestWithFloor], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.imp[0].bidfloor).to.be.equal(0.789);
+            expect(req.imp[1].bidfloor).to.be.equal(0.789);
+          });
+
+          it('sends brand category exclusion as true when config is set to true', () => {
+            config.setConfig({adpod: {brandCategoryExclusion: true}});
+
+            const reqs = spec.buildRequests([longFormVideoBidRequest], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.imp[0].video.ext.brandcategoryexclusion).to.be.equal(true);
+          });
+
+          it('sends brand category exclusion as false when config is set to false', () => {
+            config.setConfig({adpod: {brandCategoryExclusion: false}});
+
+            const reqs = spec.buildRequests([longFormVideoBidRequest], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.imp[0].video.ext.brandcategoryexclusion).to.be.equal(false);
+          });
+
+          it('sends brand category exclusion as false when config is not set', () => {
+            const reqs = spec.buildRequests([longFormVideoBidRequest], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.imp[0].video.ext.brandcategoryexclusion).to.be.equal(false);
+          });
+        });
+        describe('required parameters with requireExactDuration true', () => {
+          const ADBREAK_ID = 'adbreakId';
+          const ADPOD = 'adpod';
+          const BID_ID = '4331';
+          const W = 640;
+          const H = 480;
+          const ADPOD_DURATION = 5;
+          const DURATION_RANGE = [5, 15, 25];
+          const longFormVideoBidRequest = {
+            params: {
+              publisherId: 'publisherId',
+              adbreakId: ADBREAK_ID,
+            },
+            mediaTypes: {
+              video: {
+                context: ADPOD,
+                playerSize: [[W, H]],
+                adPodDurationSec: ADPOD_DURATION,
+                durationRangeSec: DURATION_RANGE,
+                requireExactDuration: true
+              }
+            },
+            bidId: BID_ID
+          };
+
+          it('sends required fields', () => {
+            const reqs = spec.buildRequests([longFormVideoBidRequest], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.id).to.be.equal(AUCTION_ID);
+            expect(req.imp.length).to.be.equal(DURATION_RANGE.length);
+            expect(req.imp[0].id).to.be.equal(BID_ID);
+            expect(req.imp[0].tagid).to.be.equal(ADBREAK_ID);
+            expect(req.imp[0].video.ext.context).to.be.equal(ADPOD);
+            expect(req.imp[0].video.w).to.be.equal(W);
+            expect(req.imp[0].video.h).to.be.equal(H);
+            expect(req.imp[0].video.minduration).to.be.equal(DURATION_RANGE[0]);
+            expect(req.imp[0].video.maxduration).to.be.equal(DURATION_RANGE[0]);
+            expect(req.imp[0].video.sequence).to.be.equal(1);
+            expect(req.imp[1].id).to.be.equal(BID_ID);
+            expect(req.imp[1].tagid).to.be.equal(ADBREAK_ID);
+            expect(req.imp[1].video.ext.context).to.be.equal(ADPOD);
+            expect(req.imp[1].video.w).to.be.equal(W);
+            expect(req.imp[1].video.h).to.be.equal(H);
+            expect(req.imp[1].video.minduration).to.be.equal(DURATION_RANGE[1]);
+            expect(req.imp[1].video.maxduration).to.be.equal(DURATION_RANGE[1]);
+            expect(req.imp[1].video.sequence).to.be.equal(2);
+            expect(req.imp[2].id).to.be.equal(BID_ID);
+            expect(req.imp[2].tagid).to.be.equal(ADBREAK_ID);
+            expect(req.imp[2].video.ext.context).to.be.equal(ADPOD);
+            expect(req.imp[2].video.w).to.be.equal(W);
+            expect(req.imp[2].video.h).to.be.equal(H);
+            expect(req.imp[2].video.minduration).to.be.equal(DURATION_RANGE[2]);
+            expect(req.imp[2].video.maxduration).to.be.equal(DURATION_RANGE[2]);
+            expect(req.imp[2].video.sequence).to.be.equal(3);
+          });
+        });
+
+        describe('forwarding of optional parameters', () => {
+          const MIMES = ['video/mp4', 'video/quicktime', 'video/3gpp', 'video/x-m4v'];
+          const STARTDELAY = 0;
+          const LINEARITY = 1;
+          const SKIP = 1;
+          const PROTOCOLS = [7];
+          const SKIPMIN = 5;
+          const API = [7];
+          const validBasicAdpodBidRequest = {
+            params: {
+              publisherId: 'publisherId',
+              adbreakId: 'adbreakId',
+            },
+            mediaTypes: {
+              video: {
+                context: 'adpod',
+                playerSize: [640, 480],
+                adPodDurationSec: 300,
+                durationRangeSec: [15, 30],
+                mimes: MIMES,
+                startdelay: STARTDELAY,
+                linearity: LINEARITY,
+                skip: SKIP,
+                protocols: PROTOCOLS,
+                skipmin: SKIPMIN,
+                api: API
+              }
+            },
+            bidId: 'bidId'
+          };
+
+          it('sends general video fields when they are present', () => {
+            const reqs = spec.buildRequests([validBasicAdpodBidRequest], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.imp[0].video.mimes).to.eql(MIMES);
+            expect(req.imp[0].video.startdelay).to.be.equal(STARTDELAY);
+            expect(req.imp[0].video.linearity).to.be.equal(LINEARITY);
+            expect(req.imp[0].video.skip).to.be.equal(SKIP);
+            expect(req.imp[0].video.protocols).to.eql(PROTOCOLS);
+            expect(req.imp[0].video.skipmin).to.be.equal(SKIPMIN);
+            expect(req.imp[0].video.api).to.eql(API);
+          });
+
+          it('sends series name when parameter is present', () => {
+            const SERIES_NAME = 'foo'
+            const adpodRequestWithParameter = utils.deepClone(validBasicAdpodBidRequest);
+            adpodRequestWithParameter.mediaTypes.video.tvSeriesName = SERIES_NAME;
+
+            const reqs = spec.buildRequests([adpodRequestWithParameter], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.site.content.series).to.be.equal(SERIES_NAME);
+          });
+
+          it('sends episode name when parameter is present', () => {
+            const EPISODE_NAME = 'foo'
+            const adpodRequestWithParameter = utils.deepClone(validBasicAdpodBidRequest);
+            adpodRequestWithParameter.mediaTypes.video.tvEpisodeName = EPISODE_NAME;
+
+            const reqs = spec.buildRequests([adpodRequestWithParameter], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.site.content.title).to.be.equal(EPISODE_NAME);
+          });
+
+          it('sends season number as string when parameter is present', () => {
+            const SEASON_NUMBER_AS_NUMBER_IN_PREBID_REQUEST = 42
+            const SEASON_NUMBER_AS_STRING_IN_OUTGOING_REQUEST = '42'
+            const adpodRequestWithParameter = utils.deepClone(validBasicAdpodBidRequest);
+            adpodRequestWithParameter.mediaTypes.video.tvSeasonNumber = SEASON_NUMBER_AS_NUMBER_IN_PREBID_REQUEST;
+
+            const reqs = spec.buildRequests([adpodRequestWithParameter], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.site.content.season).to.be.equal(SEASON_NUMBER_AS_STRING_IN_OUTGOING_REQUEST);
+          });
+
+          it('sends episode number when parameter is present', () => {
+            const EPISODE_NUMBER = 42
+            const adpodRequestWithParameter = utils.deepClone(validBasicAdpodBidRequest);
+            adpodRequestWithParameter.mediaTypes.video.tvEpisodeNumber = EPISODE_NUMBER;
+
+            const reqs = spec.buildRequests([adpodRequestWithParameter], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.site.content.episode).to.be.equal(EPISODE_NUMBER);
+          });
+
+          it('sends content length when parameter is present', () => {
+            const LENGTH = 42
+            const adpodRequestWithParameter = utils.deepClone(validBasicAdpodBidRequest);
+            adpodRequestWithParameter.mediaTypes.video.contentLengthSec = LENGTH;
+
+            const reqs = spec.buildRequests([adpodRequestWithParameter], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.site.content.len).to.be.equal(LENGTH);
+          });
+
+          it('sends livestream as 1 when content mode parameter is live', () => {
+            const adpodRequestWithParameter = utils.deepClone(validBasicAdpodBidRequest);
+            adpodRequestWithParameter.mediaTypes.video.contentMode = 'live';
+
+            const reqs = spec.buildRequests([adpodRequestWithParameter], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.site.content.livestream).to.be.equal(1);
+          });
+
+          it('sends livestream as 0 when content mode parameter is on-demand', () => {
+            const adpodRequestWithParameter = utils.deepClone(validBasicAdpodBidRequest);
+            adpodRequestWithParameter.mediaTypes.video.contentMode = 'on-demand';
+
+            const reqs = spec.buildRequests([adpodRequestWithParameter], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.site.content.livestream).to.be.equal(0);
+          });
+
+          it("doesn't send any optional parameters when none are present", () => {
+            const reqs = spec.buildRequests([validBasicAdpodBidRequest], defaultBidderRequest);
+
+            const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+            expect(req.imp[0].video.ext.requireExactDuration).to.not.exist;
+            expect(req.site.content).to.not.exist;
+          });
+        });
+      });
+    });
+
+    describe('buildRequests for native imps', () => {
+      const NATIVE_OPENRTB_REQUEST = {
+        ver: '1.2',
+        assets: [
+          {
+            id: 4,
+            required: 1,
+            img: {
+              type: 3,
+              w: 150,
+              h: 50,
+            }
+          },
+          {
+            id: 2,
+            required: 1,
+            img: {
+              type: 2,
+              w: 50,
+              h: 50
+            }
+          },
+          {
+            id: 0,
+            required: 1,
+            title: {
+              len: 80
+            }
+          },
+          {
+            id: 1,
+            required: 1,
+            data: {
+              type: 1
+            }
+          },
+          {
+            id: 3,
+            required: 1,
+            data: {
+              type: 2
+            }
+          },
+          {
+            id: 5,
+            required: 1,
+            data: {
+              type: 3
+            }
+          },
+          {
+            id: 6,
+            required: 1,
+            data: {
+              type: 4
+            }
+          },
+          {
+            id: 7,
+            required: 1,
+            data: {
+              type: 5
+            }
+          },
+          {
+            id: 8,
+            required: 1,
+            data: {
+              type: 6
+            }
+          },
+          {
+            id: 9,
+            required: 1,
+            data: {
+              type: 7
+            }
+          },
+          {
+            id: 10,
+            required: 0,
+            data: {
+              type: 8
+            }
+          },
+          {
+            id: 11,
+            required: 1,
+            data: {
+              type: 9
+            }
+          },
+          {
+            id: 12,
+            require: 0,
+            data: {
+              type: 10
+            }
+          },
+          {
+            id: 13,
+            required: 0,
+            data: {
+              type: 11
+            }
+          },
+          {
+            id: 14,
+            required: 1,
+            data: {
+              type: 12
+            }
+          }
+        ]
+      };
+
+      const singleNativeBidRequest = {
+        bidder: 'smaato',
+        params: {
+          publisherId: 'publisherId',
+          adspaceId: 'adspaceId'
+        },
+        nativeOrtbRequest: NATIVE_OPENRTB_REQUEST,
+        adUnitCode: '/19968336/header-bid-tag-0',
+        transactionId: 'transactionId',
+        bidId: 'bidId',
+        bidderRequestId: 'bidderRequestId',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0
+      };
+
+      it('sends correct native imps', () => {
+        const reqs = spec.buildRequests([singleNativeBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].id).to.be.equal('bidId');
+        expect(req.imp[0].tagid).to.be.equal('adspaceId');
+        expect(req.imp[0].bidfloor).to.be.undefined;
+        expect(req.imp[0].native.request).to.deep.equal(JSON.stringify(NATIVE_OPENRTB_REQUEST));
+      });
+
+      it('sends bidfloor when configured', () => {
+        const singleNativeBidRequestWithFloor = Object.assign({}, singleNativeBidRequest);
+        singleNativeBidRequestWithFloor.getFloor = function(arg) {
+          if (arg.currency === 'USD' &&
+              arg.mediaType === 'native' &&
+              JSON.stringify(arg.size) === JSON.stringify([150, 50])) {
+            return {
+              currency: 'USD',
+              floor: 0.123
+            }
+          }
+        }
+        const reqs = spec.buildRequests([singleNativeBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.equal(0.123);
+      });
+    });
+
+    describe('in-app requests', () => {
+      const LOCATION = {
+        lat: 33.3,
+        lon: -88.8
+      }
+      const DEVICE_ID = 'aDeviceId'
+      const inAppBidRequestWithoutAppParams = {
+        bidder: 'smaato',
+        params: {
+          publisherId: 'publisherId',
+          adspaceId: 'adspaceId'
+        },
+        mediaTypes: {
+          banner: BANNER_PREBID_MEDIATYPE
+        },
+        adUnitCode: '/19968336/header-bid-tag-0',
+        transactionId: 'transactionId',
+        sizes: [[300, 50]],
+        bidId: 'bidId',
+        bidderRequestId: 'bidderRequestId',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0
+      };
+
+      it('when geo and ifa info present, then add both to device object', () => {
+        const inAppBidRequest = utils.deepClone(inAppBidRequestWithoutAppParams);
+        inAppBidRequest.params.app = {ifa: DEVICE_ID, geo: LOCATION};
+
+        const reqs = spec.buildRequests([inAppBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.device.geo).to.deep.equal(LOCATION);
+        expect(req.device.ifa).to.equal(DEVICE_ID);
+      });
+
+      it('when ifa is present but geo is missing, then add only ifa to device object', () => {
+        const inAppBidRequest = utils.deepClone(inAppBidRequestWithoutAppParams);
+        inAppBidRequest.params.app = {ifa: DEVICE_ID};
+
+        const reqs = spec.buildRequests([inAppBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.device.geo).to.not.exist;
+        expect(req.device.ifa).to.equal(DEVICE_ID);
+      });
+
+      it('when geo is present but ifa is missing, then add only geo to device object', () => {
+        const inAppBidRequest = utils.deepClone(inAppBidRequestWithoutAppParams);
+        inAppBidRequest.params.app = {geo: LOCATION};
+
+        const reqs = spec.buildRequests([inAppBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.device.geo).to.deep.equal(LOCATION);
+        expect(req.device.ifa).to.not.exist;
+      });
+
+      it('when app param does not exist, then add no specific device info', () => {
+        const reqs = spec.buildRequests([inAppBidRequestWithoutAppParams], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.device.geo).to.not.exist;
+        expect(req.device.ifa).to.not.exist;
+      });
+    });
+
+    describe('user ids in requests', () => {
+      it('user ids are added to user.ext.eids', () => {
+        const userIdBidRequest = {
+          bidder: 'smaato',
+          params: {
+            publisherId: 'publisherId',
+            adspaceId: 'adspaceId'
+          },
+          mediaTypes: {
+            banner: BANNER_PREBID_MEDIATYPE
+          },
+          adUnitCode: '/19968336/header-bid-tag-0',
+          transactionId: 'transactionId',
+          sizes: [[300, 50]],
+          bidId: 'bidId',
+          bidderRequestId: 'bidderRequestId',
+          src: 'client',
+          bidRequestsCount: 1,
+          bidderRequestsCount: 1,
+          bidderWinsCount: 0,
+          userId: {
+            criteoId: '123456',
+            tdid: '89145'
+          },
+          userIdAsEids: createEidsArray({
+            criteoId: '123456',
+            tdid: '89145'
+          })
+        };
+
+        const reqs = spec.buildRequests([userIdBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.user.ext.eids).to.exist;
+        expect(req.user.ext.eids).to.have.length(2);
+      });
+    });
+
+    describe('schain in request', () => {
+      it('schain is added to source.ext.schain', () => {
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              'asi': 'asi',
+              'sid': 'sid',
+              'rid': 'rid',
+              'hp': 1
+            }
+          ]
+        };
+        const bidRequestWithSchain = Object.assign({}, singleBannerBidRequest, {schain: schain});
+
+        const reqs = spec.buildRequests([bidRequestWithSchain], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.source.ext.schain).to.deep.equal(schain);
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    function buildBidRequest(payloadAsJsObj = {imp: [{}]}) {
+      return {
+        method: 'POST',
+        url: 'https://prebid.ad.smaato.net/oapi/prebid',
+        data: JSON.stringify(payloadAsJsObj)
+      }
+    }
+
+    const NATIVE_RESPONSE = {
+      ver: '1.2',
+      link: {
+        url: 'https://link.url',
+        clicktrackers: [
+          'http://click.url/v1/click?e=prebid'
+        ]
+      },
+      assets: [
+        {
+          id: 0,
+          required: 1,
+          title: {
+            text: 'Title'
+          }
+        },
+        {
+          id: 2,
+          required: 1,
+          img: {
+            type: 1,
+            url: 'https://logo.png',
+            w: 40,
+            h: 40
+          }
+        },
+        {
+          id: 4,
+          required: 1,
+          img: {
+            type: 3,
+            url: 'https://main.png',
+            w: 480,
+            h: 320
+          }
+        },
+        {
+          id: 3,
+          required: 1,
+          data: {
+            type: 2,
+            value: 'Desc'
+          }
+        },
+        {
+          id: 14,
+          required: 1,
+          data: {
+            type: 12,
+            value: 'CTAText'
+          }
+        },
+        {
+          id: 5,
+          required: 0,
+          data: {
+            type: 3,
+            value: '2 stars'
+          }
+        }
+      ],
+      eventtrackers: [
+        {
+          event: 2,
+          method: 1,
+          url: 'https://js.url'
+        },
+        {
+          event: 1,
+          method: 1,
+          url: 'http://view.url/v1/view?e=prebid'
+        }
+      ],
+      privacy: 'https://privacy.com/'
+    }
+
+    const buildOpenRtbBidResponse = (adType) => {
+      let adm = '';
+
+      switch (adType) {
+        case ADTYPE_IMG:
+          adm = JSON.stringify(
+            {
+              image: {
+                img: {
+                  url: 'https://prebid/static/ad.jpg',
+                  w: 320,
+                  h: 50,
+                  ctaurl: 'https://prebid/track/ctaurl'
+                },
+                impressiontrackers: [
+                  'https://prebid/track/imp/1',
+                  'https://prebid/track/imp/2'
+                ],
+                clicktrackers: [
+                  'https://prebid/track/click/1'
+                ]
+              }
+            });
+          break;
+        case ADTYPE_RICHMEDIA:
+          adm = JSON.stringify(
+            {
+              richmedia: {
+                mediadata: {
+                  content: '<div><h3>RICHMEDIA CONTENT</h3></div>',
+                  w: 800,
+                  h: 600
+                },
+                impressiontrackers: [
+                  'https://prebid/track/imp/1',
+                  'https://prebid/track/imp/2'
+                ],
+                clicktrackers: [
+                  'https://prebid/track/click/1'
+                ]
+              }
+            });
+          break;
+        case ADTYPE_VIDEO:
+          adm = '<VAST version="2.0"></VAST>';
+          break;
+        case ADTYPE_NATIVE:
+          adm = JSON.stringify({ native: NATIVE_RESPONSE })
+          break;
+        default:
+          throw Error('Invalid AdType');
+      }
+
+      return {
+        body: {
+          bidid: '04db8629-179d-4bcd-acce-e54722969006',
+          cur: 'USD',
+          ext: {},
+          id: '5ebea288-f13a-4754-be6d-4ade66c68877',
+          seatbid: [
+            {
+              bid: [
+                {
+                  'adm': adm,
+                  'adomain': [
+                    'smaato.com'
+                  ],
+                  'bidderName': 'smaato',
+                  'cid': 'CM6523',
+                  'crid': 'CR69381',
+                  'dealid': '12345',
+                  'id': '6906aae8-7f74-4edd-9a4f-f49379a3cadd',
+                  'impid': '226416e6e6bf41',
+                  'iurl': 'https://prebid/iurl',
+                  'nurl': 'https://prebid/nurl',
+                  'price': 0.01,
+                  'w': 350,
+                  'h': 50
+                }
+              ],
+              seat: 'CM6523'
+            }
+          ],
+        },
+        headers: {
+          get: function (header) {
+            if (header === 'X-SMT-ADTYPE') {
+              return adType;
+            }
+          }
+        }
+      };
+    };
+
+    it('returns empty array on no bid responses', () => {
+      const response_with_empty_body = {body: {}};
+
+      const bids = spec.interpretResponse(response_with_empty_body, buildBidRequest());
+
+      expect(bids).to.be.empty;
+    });
+
+    describe('non ad pod', () => {
+      it('single image response', () => {
+        const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_IMG), buildBidRequest());
+
+        expect(bids).to.deep.equal([
+          {
+            requestId: '226416e6e6bf41',
+            cpm: 0.01,
+            width: 350,
+            height: 50,
+            ad: '<div style="cursor:pointer" onclick="fetch(decodeURIComponent(\'https%3A%2F%2Fprebid%2Ftrack%2Fclick%2F1\'), {cache: \'no-cache\'});;window.open(decodeURIComponent(\'https%3A%2F%2Fprebid%2Ftrack%2Fctaurl\'));"><img src="https://prebid/static/ad.jpg" width="320" height="50"/><img src="https://prebid/track/imp/1" alt="" width="0" height="0"/><img src="https://prebid/track/imp/2" alt="" width="0" height="0"/></div>',
+            ttl: 300,
+            creativeId: 'CR69381',
+            dealId: '12345',
+            netRevenue: true,
+            currency: 'USD',
+            mediaType: 'banner',
+            meta: {
+              advertiserDomains: ['smaato.com'],
+              agencyId: 'CM6523',
+              networkName: 'smaato',
+              mediaType: 'banner'
+            }
+          }
+        ]);
+      });
+
+      it('single richmedia response', () => {
+        const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_RICHMEDIA), buildBidRequest());
+
+        expect(bids).to.deep.equal([
+          {
+            requestId: '226416e6e6bf41',
+            cpm: 0.01,
+            width: 350,
+            height: 50,
+            ad: '<div onclick="fetch(decodeURIComponent(\'https%3A%2F%2Fprebid%2Ftrack%2Fclick%2F1\'), {cache: \'no-cache\'});"><div><h3>RICHMEDIA CONTENT</h3></div><img src="https://prebid/track/imp/1" alt="" width="0" height="0"/><img src="https://prebid/track/imp/2" alt="" width="0" height="0"/></div>',
+            ttl: 300,
+            creativeId: 'CR69381',
+            dealId: '12345',
+            netRevenue: true,
+            currency: 'USD',
+            mediaType: 'banner',
+            meta: {
+              advertiserDomains: ['smaato.com'],
+              agencyId: 'CM6523',
+              networkName: 'smaato',
+              mediaType: 'banner'
+            }
+          }
+        ]);
+      });
+
+      it('single video response', () => {
+        const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_VIDEO), buildBidRequest());
+
+        expect(bids).to.deep.equal([
+          {
+            requestId: '226416e6e6bf41',
+            cpm: 0.01,
+            width: 350,
+            height: 50,
+            vastXml: '<VAST version="2.0"></VAST>',
+            ttl: 300,
+            creativeId: 'CR69381',
+            dealId: '12345',
+            netRevenue: true,
+            currency: 'USD',
+            mediaType: 'video',
+            meta: {
+              advertiserDomains: ['smaato.com'],
+              agencyId: 'CM6523',
+              networkName: 'smaato',
+              mediaType: 'video'
+            }
+          }
+        ]);
+      });
+
+      it('single native response', () => {
+        const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_NATIVE), buildBidRequest());
+
+        expect(bids).to.deep.equal([
+          {
+            requestId: '226416e6e6bf41',
+            cpm: 0.01,
+            width: 350,
+            height: 50,
+            native: {
+              ortb: NATIVE_RESPONSE
+            },
+            ttl: 300,
+            creativeId: 'CR69381',
+            dealId: '12345',
+            netRevenue: true,
+            currency: 'USD',
+            mediaType: 'native',
+            meta: {
+              advertiserDomains: ['smaato.com'],
+              agencyId: 'CM6523',
+              networkName: 'smaato',
+              mediaType: 'native'
+            }
+          }
+        ]);
+      });
+
+      it('ignores bid response with invalid ad type', () => {
+        const serverResponse = buildOpenRtbBidResponse(ADTYPE_IMG);
+        serverResponse.headers.get = (header) => {
+          if (header === 'X-SMT-ADTYPE') {
+            return undefined;
+          }
+        };
+
+        const bids = spec.interpretResponse(serverResponse, buildBidRequest());
+
+        expect(bids).to.be.empty;
+      });
+    });
+
+    describe('ad pod', () => {
+      const bidRequestWithAdpodContext = buildBidRequest({imp: [{video: {ext: {context: 'adpod'}}}]});
+      const PRIMARY_CAT_ID = 1337
+      const serverResponse = {
+        body: {
+          bidid: '04db8629-179d-4bcd-acce-e54722969006',
+          cur: 'USD',
+          ext: {},
+          id: '5ebea288-f13a-4754-be6d-4ade66c68877',
+          seatbid: [
+            {
+              bid: [
+                {
+                  adm: '<VAST version="2.0"></VAST>',
+                  adomain: [
+                    'smaato.com'
+                  ],
+                  bidderName: 'smaato',
+                  cid: 'CM6523',
+                  crid: 'CR69381',
+                  dealid: '12345',
+                  id: '6906aae8-7f74-4edd-9a4f-f49379a3cadd',
+                  impid: '226416e6e6bf41',
+                  iurl: 'https://prebid/iurl',
+                  nurl: 'https://prebid/nurl',
+                  price: 0.01,
+                  w: 350,
+                  h: 50,
+                  cat: [PRIMARY_CAT_ID],
+                  ext: {
+                    duration: 42
+                  }
+                }
+              ],
+              seat: 'CM6523'
+            }
+          ]
+        },
+        headers: {get: () => undefined}
+      };
+
+      it('sets required values for adpod bid from server response', () => {
+        const bids = spec.interpretResponse(serverResponse, bidRequestWithAdpodContext);
+
+        expect(bids).to.deep.equal([
+          {
+            requestId: '226416e6e6bf41',
+            cpm: 0.01,
+            width: 350,
+            height: 50,
+            vastXml: '<VAST version="2.0"></VAST>',
+            ttl: 300,
+            creativeId: 'CR69381',
+            dealId: '12345',
+            netRevenue: true,
+            currency: 'USD',
+            mediaType: 'video',
+            video: {
+              context: 'adpod',
+              durationSeconds: 42
+            },
+            meta: {
+              advertiserDomains: ['smaato.com'],
+              agencyId: 'CM6523',
+              networkName: 'smaato',
+              mediaType: 'video'
+            }
+          }
+        ]);
+      });
+
+      it('sets primary category id in case of enabled brand category exclusion', () => {
+        config.setConfig({adpod: {brandCategoryExclusion: true}});
+
+        const bids = spec.interpretResponse(serverResponse, bidRequestWithAdpodContext)
+
+        expect(bids[0].meta.primaryCatId).to.be.equal(PRIMARY_CAT_ID)
+      })
+    });
+
+    it('uses correct TTL when expire header exists', () => {
+      const clock = sinon.useFakeTimers();
+      clock.tick(2000);
+      const resp = buildOpenRtbBidResponse(ADTYPE_IMG);
+      resp.headers.get = (header) => {
+        if (header === 'X-SMT-ADTYPE') {
+          return ADTYPE_IMG;
+        }
+        if (header === 'X-SMT-Expires') {
+          return 2000 + (400 * 1000);
+        }
+      };
+
+      const bids = spec.interpretResponse(resp, buildBidRequest());
+
+      expect(bids[0].ttl).to.equal(400);
+
+      clock.restore();
+    });
+
+    it('uses net revenue flag send from server', () => {
+      const resp = buildOpenRtbBidResponse(ADTYPE_IMG);
+      resp.body.seatbid[0].bid[0].ext = {net: false};
+
+      const bids = spec.interpretResponse(resp, buildBidRequest());
+
+      expect(bids[0].netRevenue).to.equal(false);
+    });
+  });
+
+  describe('getUserSyncs', () => {
+    it('returns no pixels', () => {
+      expect(spec.getUserSyncs()).to.be.empty
+    })
+  })
+});
diff --git a/test/spec/modules/smartadserverBidAdapter_spec.js b/test/spec/modules/smartadserverBidAdapter_spec.js
index 2faad47aca8..db61983c9c9 100644
--- a/test/spec/modules/smartadserverBidAdapter_spec.js
+++ b/test/spec/modules/smartadserverBidAdapter_spec.js
@@ -1,17 +1,6 @@
-import {
-  expect
-} from 'chai';
-import {
-  spec
-} from 'modules/smartadserverBidAdapter.js';
-import {
-  newBidder
-} from 'src/adapters/bidderFactory.js';
-import {
-  config
-} from 'src/config.js';
-import * as utils from 'src/utils.js';
-import { requestBidsHook } from 'modules/consentManagement.js';
+import { expect } from 'chai';
+import { config } from 'src/config.js';
+import { spec } from 'modules/smartadserverBidAdapter.js';
 
 // Default params with optional ones
 describe('Smart bid adapter tests', function () {
@@ -71,7 +60,7 @@ describe('Smart bid adapter tests', function () {
       britepoolid: '1111',
       criteoId: '1111',
       digitrustid: { data: { id: 'DTID', keyv: 4, privacy: { optout: false }, producer: 'ABC', version: 2 } },
-      id5id: '1111',
+      id5id: { uid: '1111' },
       idl_env: '1111',
       lipbid: '1111',
       parrableid: 'eidVersion.encryptionKeyReference.encryptedValue',
@@ -115,16 +104,98 @@ describe('Smart bid adapter tests', function () {
       ttl: 300,
       adUrl: 'http://awesome.fake.url',
       ad: '< --- awesome script --- >',
-      cSyncUrl: 'http://awesome.fake.csync.url'
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: false
     }
   };
 
+  var BID_RESPONSE_IS_NO_AD = {
+    body: {
+      cpm: 12,
+      width: 300,
+      height: 250,
+      creativeId: 'zioeufg',
+      currency: 'GBP',
+      isNetCpm: true,
+      ttl: 300,
+      adUrl: 'http://awesome.fake.url',
+      ad: '< --- awesome script --- >',
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: true
+    }
+  };
+
+  var BID_RESPONSE_IMAGE_SYNC = {
+    body: {
+      cpm: 12,
+      width: 300,
+      height: 250,
+      creativeId: 'zioeufg',
+      currency: 'GBP',
+      isNetCpm: true,
+      ttl: 300,
+      adUrl: 'http://awesome.fake.url',
+      ad: '< --- awesome script --- >',
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: false,
+      dspPixels: ['pixelOne', 'pixelTwo', 'pixelThree']
+    }
+  };
+
+  var BID_RESPONSE_IFRAME_SYNC_MISSING_CSYNC = {
+    body: {
+      cpm: 12,
+      width: 300,
+      height: 250,
+      creativeId: 'zioeufg',
+      currency: 'GBP',
+      isNetCpm: true,
+      ttl: 300,
+      adUrl: 'http://awesome.fake.url',
+      ad: '< --- awesome script --- >',
+      cSyncUrl: null,
+      isNoAd: false
+    }
+  };
+
+  var sellerDefinedAudience = [
+    {
+      'name': 'hearst.com',
+      'ext': { 'segtax': 1 },
+      'segment': [
+        { 'id': '1001' },
+        { 'id': '1002' }
+      ]
+    }
+  ];
+
+  var sellerDefinedContext = [
+    {
+      'name': 'cnn.com',
+      'ext': { 'segtax': 2 },
+      'segment': [
+        { 'id': '2002' }
+      ]
+    }
+  ];
+
   it('Verify build request', function () {
     config.setConfig({
       'currency': {
         'adServerCurrency': 'EUR'
+      },
+      ortb2: {
+        'user': {
+          'data': sellerDefinedAudience
+        },
+        'site': {
+          'content': {
+            'data': sellerDefinedContext
+          }
+        }
       }
     });
+
     const request = spec.buildRequests(DEFAULT_PARAMS);
     expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
     expect(request[0]).to.have.property('method').and.to.equal('POST');
@@ -147,6 +218,41 @@ describe('Smart bid adapter tests', function () {
     expect(requestContent).to.have.property('buid').and.to.equal('7569');
     expect(requestContent).to.have.property('appname').and.to.equal('Mozilla');
     expect(requestContent).to.have.property('ckid').and.to.equal(42);
+    expect(requestContent).to.have.property('sda').and.to.deep.equal(sellerDefinedAudience);
+    expect(requestContent).to.have.property('sdc').and.to.deep.equal(sellerDefinedContext);
+  });
+
+  it('Verify parse response with no ad', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS);
+    const bids = spec.interpretResponse(BID_RESPONSE_IS_NO_AD, request[0]);
+    expect(bids).to.have.lengthOf(0);
+
+    expect(function () {
+      spec.interpretResponse(BID_RESPONSE_IS_NO_AD, {
+        data: 'invalid Json'
+      })
+    }).to.not.throw();
+  });
+
+  it('Should not nest response if ad and adUrl empty', () => {
+    const BID_RESPONSE_EMPTY = {
+      body: {
+        ad: null,
+        adUrl: null,
+        cpm: 0.92,
+        isNoAd: false
+      }
+    };
+
+    const request = spec.buildRequests(DEFAULT_PARAMS);
+    const bids = spec.interpretResponse(BID_RESPONSE_EMPTY, request[0]);
+
+    expect(bids).to.have.lengthOf(0);
+    expect(() => {
+      spec.interpretResponse(BID_RESPONSE_EMPTY, {
+        data: 'invalid Json'
+      });
+    }).to.not.throw();
   });
 
   it('Verify parse response', function () {
@@ -256,10 +362,37 @@ describe('Smart bid adapter tests', function () {
       iframeEnabled: true
     }, []);
     expect(syncs).to.have.lengthOf(0);
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: true
+    }, [BID_RESPONSE_IFRAME_SYNC_MISSING_CSYNC]);
+    expect(syncs).to.have.lengthOf(0);
+  });
+
+  it('Verifies user sync using dspPixels', function () {
+    var syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [BID_RESPONSE_IMAGE_SYNC]);
+    expect(syncs).to.have.lengthOf(3);
+    expect(syncs[0].type).to.equal('image');
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: false
+    }, [BID_RESPONSE_IMAGE_SYNC]);
+    expect(syncs).to.have.lengthOf(0);
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, []);
+    expect(syncs).to.have.lengthOf(0);
   });
 
   describe('gdpr tests', function () {
     afterEach(function () {
+      config.setConfig({ ortb2: undefined });
       config.resetConfig();
       $$PREBID_GLOBAL$$.requestBids.removeAll();
     });
@@ -391,6 +524,16 @@ describe('Smart bid adapter tests', function () {
       config.setConfig({
         'currency': {
           'adServerCurrency': 'EUR'
+        },
+        ortb2: {
+          'user': {
+            'data': sellerDefinedAudience
+          },
+          'site': {
+            'content': {
+              'data': sellerDefinedContext
+            }
+          }
         }
       });
       const request = spec.buildRequests(INSTREAM_DEFAULT_PARAMS);
@@ -409,6 +552,8 @@ describe('Smart bid adapter tests', function () {
       expect(requestContent).to.have.property('buid').and.to.equal('7569');
       expect(requestContent).to.have.property('appname').and.to.equal('Mozilla');
       expect(requestContent).to.have.property('ckid').and.to.equal(42);
+      expect(requestContent).to.have.property('sda').and.to.deep.equal(sellerDefinedAudience);
+      expect(requestContent).to.have.property('sdc').and.to.deep.equal(sellerDefinedContext);
       expect(requestContent).to.have.property('isVideo').and.to.equal(true);
       expect(requestContent).to.have.property('videoData');
       expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(6);
@@ -425,6 +570,7 @@ describe('Smart bid adapter tests', function () {
       expect(bid.mediaType).to.equal('video');
       expect(bid.vastUrl).to.equal('http://awesome.fake-vast.url');
       expect(bid.vastXml).to.equal('<VAST version="4.0"></VAST>');
+      expect(bid.content).to.equal('<VAST version="4.0"></VAST>');
       expect(bid.width).to.equal(640);
       expect(bid.height).to.equal(480);
       expect(bid.creativeId).to.equal('zioeufg');
@@ -471,6 +617,369 @@ describe('Smart bid adapter tests', function () {
       expect(request[0]).to.be.empty;
       expect(request[1]).to.not.be.empty;
     });
+
+    describe('Instream videoData meta & params tests', function () {
+      it('Verify videoData assigns values from meta', function () {
+        config.setConfig({
+          'currency': {
+            'adServerCurrency': 'EUR'
+          }
+        });
+        const request = spec.buildRequests([{
+          adUnitCode: 'sas_42',
+          bidId: 'abcd1234',
+          bidder: 'smartadserver',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [[640, 480]], // It seems prebid.js transforms the player size array into an array of array...
+              protocols: [8, 2],
+              startdelay: 0
+            }
+          },
+          params: {
+            siteId: '1234',
+            pageId: '5678',
+            formatId: '90',
+            target: 'test=prebid',
+            bidfloor: 0.420,
+            buId: '7569',
+            appName: 'Mozilla',
+            ckId: 42,
+          },
+          requestId: 'efgh5678',
+          transactionId: 'zsfgzzg'
+        }]);
+
+        expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+        expect(request[0]).to.have.property('method').and.to.equal('POST');
+        const requestContent = JSON.parse(request[0].data);
+        expect(requestContent).to.have.property('videoData');
+        expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(8);
+        expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(1);
+      });
+
+      it('Verify videoData default values assigned', function () {
+        config.setConfig({
+          'currency': {
+            'adServerCurrency': 'EUR'
+          }
+        });
+        const request = spec.buildRequests([{
+          adUnitCode: 'sas_42',
+          bidId: 'abcd1234',
+          bidder: 'smartadserver',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [[640, 480]] // It seems prebid.js transforms the player size array into an array of array...
+            }
+          },
+          params: {
+            siteId: '1234',
+            pageId: '5678',
+            formatId: '90',
+            target: 'test=prebid',
+            bidfloor: 0.420,
+            buId: '7569',
+            appName: 'Mozilla',
+            ckId: 42,
+          },
+          requestId: 'efgh5678',
+          transactionId: 'zsfgzzg'
+        }]);
+
+        expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+        expect(request[0]).to.have.property('method').and.to.equal('POST');
+        const requestContent = JSON.parse(request[0].data);
+        expect(requestContent).to.have.property('videoData');
+        expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(null);
+        expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(2);
+      });
+
+      it('Verify videoData params override meta values', function () {
+        config.setConfig({
+          'currency': {
+            'adServerCurrency': 'EUR'
+          }
+        });
+        const request = spec.buildRequests([{
+          adUnitCode: 'sas_42',
+          bidId: 'abcd1234',
+          bidder: 'smartadserver',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [[640, 480]], // It seems prebid.js transforms the player size array into an array of array...
+              protocols: [8, 2],
+              startdelay: 0
+            }
+          },
+          params: {
+            siteId: '1234',
+            pageId: '5678',
+            formatId: '90',
+            target: 'test=prebid',
+            bidfloor: 0.420,
+            buId: '7569',
+            appName: 'Mozilla',
+            ckId: 42,
+            video: {
+              protocol: 6,
+              startDelay: 3
+            }
+          },
+          requestId: 'efgh5678',
+          transactionId: 'zsfgzzg'
+        }]);
+
+        expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+        expect(request[0]).to.have.property('method').and.to.equal('POST');
+        const requestContent = JSON.parse(request[0].data);
+        expect(requestContent).to.have.property('videoData');
+        expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(6);
+        expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(3);
+      });
+    });
+  });
+
+  describe('Outstream video tests', function () {
+    afterEach(function () {
+      config.resetConfig();
+      $$PREBID_GLOBAL$$.requestBids.removeAll();
+    });
+
+    const OUTSTREAM_DEFAULT_PARAMS = [{
+      adUnitCode: 'sas_43',
+      bidId: 'abcd1234',
+      bidder: 'smartadserver',
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [[800, 600]] // It seems prebid.js transforms the player size array into an array of array...
+        }
+      },
+      params: {
+        siteId: '1234',
+        pageId: '5678',
+        formatId: '91',
+        target: 'test=prebid-outstream',
+        bidfloor: 0.430,
+        buId: '7579',
+        appName: 'Mozilla',
+        ckId: 43,
+        video: {
+          protocol: 7
+        }
+      },
+      requestId: 'efgh5679',
+      transactionId: 'zsfgzzga'
+    }];
+
+    var OUTSTREAM_BID_RESPONSE = {
+      body: {
+        cpm: 14,
+        width: 800,
+        height: 600,
+        creativeId: 'zioeufga',
+        currency: 'USD',
+        isNetCpm: true,
+        ttl: 300,
+        adUrl: 'http://awesome.fake-vast2.url',
+        ad: '<VAST version="4.0"><!--Outstream--></VAST>',
+        cSyncUrl: 'http://awesome.fake2.csync.url'
+      }
+    };
+
+    it('Verify outstream video build request', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        },
+        ortb2: {
+          'user': {
+            'data': sellerDefinedAudience
+          },
+          'site': {
+            'content': {
+              'data': sellerDefinedContext
+            }
+          }
+        }
+      });
+      const request = spec.buildRequests(OUTSTREAM_DEFAULT_PARAMS);
+      expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+      expect(request[0]).to.have.property('method').and.to.equal('POST');
+      const requestContent = JSON.parse(request[0].data);
+      expect(requestContent).to.have.property('siteid').and.to.equal('1234');
+      expect(requestContent).to.have.property('pageid').and.to.equal('5678');
+      expect(requestContent).to.have.property('formatid').and.to.equal('91');
+      expect(requestContent).to.have.property('currencyCode').and.to.equal('EUR');
+      expect(requestContent).to.have.property('bidfloor').and.to.equal(0.43);
+      expect(requestContent).to.have.property('targeting').and.to.equal('test=prebid-outstream');
+      expect(requestContent).to.have.property('tagId').and.to.equal('sas_43');
+      expect(requestContent).to.not.have.property('pageDomain');
+      expect(requestContent).to.have.property('transactionId').and.to.not.equal(null).and.to.not.be.undefined;
+      expect(requestContent).to.have.property('buid').and.to.equal('7579');
+      expect(requestContent).to.have.property('appname').and.to.equal('Mozilla');
+      expect(requestContent).to.have.property('ckid').and.to.equal(43);
+      expect(requestContent).to.have.property('sda').and.to.deep.equal(sellerDefinedAudience);
+      expect(requestContent).to.have.property('sdc').and.to.deep.equal(sellerDefinedContext);
+      expect(requestContent).to.have.property('isVideo').and.to.equal(false);
+      expect(requestContent).to.have.property('videoData');
+      expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(7);
+      expect(requestContent.videoData).to.have.property('playerWidth').and.to.equal(800);
+      expect(requestContent.videoData).to.have.property('playerHeight').and.to.equal(600);
+    });
+
+    it('Verify outstream parse response', function () {
+      const request = spec.buildRequests(OUTSTREAM_DEFAULT_PARAMS);
+      const bids = spec.interpretResponse(OUTSTREAM_BID_RESPONSE, request[0]);
+      expect(bids).to.have.lengthOf(1);
+      const bid = bids[0];
+      expect(bid.cpm).to.equal(14);
+      expect(bid.mediaType).to.equal('video');
+      expect(bid.vastUrl).to.equal('http://awesome.fake-vast2.url');
+      expect(bid.vastXml).to.equal('<VAST version="4.0"><!--Outstream--></VAST>');
+      expect(bid.content).to.equal('<VAST version="4.0"><!--Outstream--></VAST>');
+      expect(bid.width).to.equal(800);
+      expect(bid.height).to.equal(600);
+      expect(bid.creativeId).to.equal('zioeufga');
+      expect(bid.currency).to.equal('USD');
+      expect(bid.netRevenue).to.equal(true);
+      expect(bid.ttl).to.equal(300);
+      expect(bid.requestId).to.equal(OUTSTREAM_DEFAULT_PARAMS[0].bidId);
+
+      expect(function () {
+        spec.interpretResponse(OUTSTREAM_BID_RESPONSE, {
+          data: 'invalid Json'
+        })
+      }).to.not.throw();
+    });
+  });
+
+  describe('Outstream videoData meta & params tests', function () {
+    it('Verify videoData assigns values from meta', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        }
+      });
+      const request = spec.buildRequests([{
+        adUnitCode: 'sas_42',
+        bidId: 'abcd1234',
+        bidder: 'smartadserver',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 480]], // It seems prebid.js transforms the player size array into an array of array...
+            protocols: [8, 2],
+            startdelay: 0
+          }
+        },
+        params: {
+          siteId: '1234',
+          pageId: '5678',
+          formatId: '90',
+          target: 'test=prebid-outstream',
+          bidfloor: 0.420,
+          buId: '7569',
+          appName: 'Mozilla',
+          ckId: 42,
+        },
+        requestId: 'efgh5678',
+        transactionId: 'zsfgzzg'
+      }]);
+
+      expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+      expect(request[0]).to.have.property('method').and.to.equal('POST');
+      const requestContent = JSON.parse(request[0].data);
+      expect(requestContent).to.have.property('videoData');
+      expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(8);
+      expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(1);
+    });
+
+    it('Verify videoData default values assigned', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        }
+      });
+      const request = spec.buildRequests([{
+        adUnitCode: 'sas_42',
+        bidId: 'abcd1234',
+        bidder: 'smartadserver',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 480]] // It seems prebid.js transforms the player size array into an array of array...
+          }
+        },
+        params: {
+          siteId: '1234',
+          pageId: '5678',
+          formatId: '90',
+          target: 'test=prebid-outstream',
+          bidfloor: 0.420,
+          buId: '7569',
+          appName: 'Mozilla',
+          ckId: 42,
+        },
+        requestId: 'efgh5678',
+        transactionId: 'zsfgzzg'
+      }]);
+
+      expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+      expect(request[0]).to.have.property('method').and.to.equal('POST');
+      const requestContent = JSON.parse(request[0].data);
+      expect(requestContent).to.have.property('videoData');
+      expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(null);
+      expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(2);
+    });
+
+    it('Verify videoData params override meta values', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        }
+      });
+      const request = spec.buildRequests([{
+        adUnitCode: 'sas_42',
+        bidId: 'abcd1234',
+        bidder: 'smartadserver',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 480]], // It seems prebid.js transforms the player size array into an array of array...
+            protocols: [8, 2],
+            startdelay: 0
+          }
+        },
+        params: {
+          siteId: '1234',
+          pageId: '5678',
+          formatId: '90',
+          target: 'test=prebid-outstream',
+          bidfloor: 0.420,
+          buId: '7569',
+          appName: 'Mozilla',
+          ckId: 42,
+          video: {
+            protocol: 6,
+            startDelay: 3
+          }
+        },
+        requestId: 'efgh5678',
+        transactionId: 'zsfgzzg'
+      }]);
+
+      expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+      expect(request[0]).to.have.property('method').and.to.equal('POST');
+      const requestContent = JSON.parse(request[0].data);
+      expect(requestContent).to.have.property('videoData');
+      expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(6);
+      expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(3);
+    });
   });
 
   describe('External ids tests', function () {
@@ -544,4 +1053,117 @@ describe('Smart bid adapter tests', function () {
       expect(null, actual);
     });
   });
+
+  describe('Floors module', function () {
+    it('should include floor from bid params', function() {
+      const bidRequest = JSON.parse((spec.buildRequests(DEFAULT_PARAMS))[0].data);
+      expect(bidRequest.bidfloor).to.deep.equal(DEFAULT_PARAMS[0].params.bidfloor);
+    });
+
+    it('should return floor from module', function() {
+      const moduleFloor = 1.5;
+      const bidRequest = JSON.parse((spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL))[0].data);
+      bidRequest.getFloor = function () {
+        return { floor: moduleFloor };
+      };
+
+      const floor = spec.getBidFloor(bidRequest, 'EUR');
+      expect(floor).to.deep.equal(moduleFloor);
+    });
+
+    it('should return default floor when module not activated', function() {
+      const bidRequest = JSON.parse((spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL))[0].data);
+
+      const floor = spec.getBidFloor(bidRequest, 'EUR');
+      expect(floor).to.deep.equal(0);
+    });
+
+    it('should return default floor when getFloor returns not proper object', function() {
+      const bidRequest = JSON.parse((spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL))[0].data);
+      bidRequest.getFloor = function () {
+        return { floor: 'one' };
+      };
+
+      const floor = spec.getBidFloor(bidRequest, 'EUR');
+      expect(floor).to.deep.equal(0.0);
+    });
+
+    it('should return default floor when currency unknown', function() {
+      const bidRequest = JSON.parse((spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL))[0].data);
+
+      const floor = spec.getBidFloor(bidRequest, null);
+      expect(floor).to.deep.equal(0);
+    });
+  });
+
+  describe('Verify bid requests with multiple mediaTypes', function () {
+    afterEach(function () {
+      config.resetConfig();
+      $$PREBID_GLOBAL$$.requestBids.removeAll();
+    });
+
+    var DEFAULT_PARAMS_MULTIPLE_MEDIA_TYPES = [{
+      adUnitCode: 'sas_42',
+      bidId: 'abcd1234',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [300, 200]
+          ]
+        },
+        video: {
+          context: 'outstream',
+          playerSize: [[640, 480]] // It seems prebid.js transforms the player size array into an array of array...
+        }
+      },
+      bidder: 'smartadserver',
+      params: {
+        domain: 'https://prg.smartadserver.com',
+        siteId: '1234',
+        pageId: '5678',
+        formatId: '90',
+        target: 'test=prebid',
+        bidfloor: 0.420,
+        buId: '7569',
+        appName: 'Mozilla',
+        ckId: 42,
+        video: {
+          protocol: 6,
+          startDelay: 1
+        }
+      },
+      requestId: 'efgh5678',
+      transactionId: 'zsfgzzg'
+    }];
+
+    it('Verify build request with banner and outstream', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        }
+      });
+      const requests = spec.buildRequests(DEFAULT_PARAMS_MULTIPLE_MEDIA_TYPES);
+      expect(requests).to.have.lengthOf(2);
+
+      const requestContents = requests.map(r => JSON.parse(r.data));
+      const videoRequest = requestContents.filter(r => r.videoData)[0];
+      expect(videoRequest).to.not.equal(null).and.to.not.be.undefined;
+
+      const bannerRequest = requestContents.filter(r => !r.videoData)[0];
+      expect(bannerRequest).to.not.equal(null).and.to.not.be.undefined;
+
+      expect(videoRequest).to.not.equal(bannerRequest);
+      expect(videoRequest.videoData).to.have.property('videoProtocol').and.to.equal(6);
+      expect(videoRequest.videoData).to.have.property('playerWidth').and.to.equal(640);
+      expect(videoRequest.videoData).to.have.property('playerHeight').and.to.equal(480);
+      expect(videoRequest).to.have.property('siteid').and.to.equal('1234');
+      expect(videoRequest).to.have.property('pageid').and.to.equal('5678');
+      expect(videoRequest).to.have.property('formatid').and.to.equal('90');
+
+      expect(bannerRequest).to.have.property('siteid').and.to.equal('1234');
+      expect(bannerRequest).to.have.property('pageid').and.to.equal('5678');
+      expect(bannerRequest).to.have.property('formatid').and.to.equal('90');
+    });
+  });
 });
diff --git a/test/spec/modules/smarthubBidAdapter_spec.js b/test/spec/modules/smarthubBidAdapter_spec.js
new file mode 100644
index 00000000000..e1787dfe880
--- /dev/null
+++ b/test/spec/modules/smarthubBidAdapter_spec.js
@@ -0,0 +1,392 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/smarthubBidAdapter';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'smarthub'
+
+describe('SmartHubBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        partnerName: 'testname',
+        seat: 'testSeat',
+        token: 'testBanner',
+        iabCat: ['IAB1-1', 'IAB3-1', 'IAB4-3'],
+        minBidfloor: 10,
+        pos: 1,
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60,
+        }
+      },
+      params: {
+        partnerName: 'testname',
+        seat: 'testSeat',
+        token: 'testVideo',
+        iabCat: ['IAB1-1', 'IAB3-1', 'IAB4-3'],
+        minBidfloor: 10,
+        pos: 1,
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        partnerName: 'testname',
+        seat: 'testSeat',
+        token: 'testToken',
+        iabCat: ['IAB1-1', 'IAB3-1', 'IAB4-3'],
+        minBidfloor: 10,
+        pos: 1,
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      page: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    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;
+      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://testname-prebid.smart-hub.io/pbjs');
+    });
+
+    it('Returns general data 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',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      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.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.partnerName).to.be.a('string');
+        expect(placement.seat).to.be.a('string');
+        expect(placement.token).to.be.a('string');
+        expect(placement.iabCat).to.be.an('array');
+        expect(placement.minBidfloor).to.be.a('number');
+        expect(placement.pos).to.be.within(0, 7);
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest[0].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 = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest[0].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([], bidderRequest);
+      expect(serverRequest).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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.property('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          width: 300,
+          height: 250,
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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', 'width', 'height');
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.property('advertiserDomains');
+    });
+    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',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      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');
+      expect(dataItem.meta).to.be.an('object').that.has.property('advertiserDomains');
+    });
+    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/smarticoBidAdapter_spec.js b/test/spec/modules/smarticoBidAdapter_spec.js
new file mode 100644
index 00000000000..104fa22a851
--- /dev/null
+++ b/test/spec/modules/smarticoBidAdapter_spec.js
@@ -0,0 +1,135 @@
+import {expect} from 'chai';
+import {spec} from 'modules/smarticoBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+
+describe('smarticoBidAdapter', function () {
+  const adapter = newBidder(spec);
+  let bid = {
+    adUnitCode: 'adunit-code',
+    auctionId: '5kaj89l8-3456-2s56-c455-4g6h78jsdfgf',
+    bidRequestsCount: 1,
+    bidder: 'smartico',
+    bidderRequestId: '24081afs940568',
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    bidId: '22499d052045',
+    mediaTypes: {banner: {sizes: [[300, 250]]}},
+    params: {
+      token: 'FNVzUGZn9ebpIOoheh3kEJ2GQ6H6IyMH39sHXaya',
+      placementId: 'testPlacementId'
+    },
+    sizes: [
+      [300, 250]
+    ],
+    transactionId: '34562345-4dg7-46g7-4sg6-45gdsdj8fd56'
+  }
+  let bidderRequests = {
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    auctionStart: 1579746300522,
+    bidderCode: 'myBidderCode',
+    bidderRequestId: '15246a574e859f',
+    bids: [bid],
+    refererInfo: {
+      canonicalUrl: '',
+      numIframes: 0,
+      reachedTop: true
+    }
+  }
+  describe('isBidRequestValid', function () {
+    it('should return true where required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+  describe('buildRequests', function () {
+    let bidRequests = [ bid ];
+    let request = spec.buildRequests(bidRequests, bidderRequests);
+    it('sends bid request via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+    it('must contain token', function() {
+      expect(request.data.bidParams[0].token).to.equal('FNVzUGZn9ebpIOoheh3kEJ2GQ6H6IyMH39sHXaya');
+    });
+    it('must contain auctionId', function() {
+      expect(request.data.auctionId).to.exist.and.to.be.a('string')
+    });
+    it('must contain valid width and height', function() {
+      expect(request.data.bidParams[0]['banner-format-width']).to.exist.and.to.be.a('number')
+      expect(request.data.bidParams[0]['banner-format-height']).to.exist.and.to.be.a('number')
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bidRequest = {
+      method: 'POST',
+      url: 'https://trmads.eu/preBidRequest',
+      bids: [bid],
+      data: [{
+        token: 'FNVzUGZn9ebpIOoheh3kEJ2GQ6H6IyMH39sHXaya',
+        bidId: '22499d052045',
+        'banner-format-width': 300,
+        'banner-format-height': 250,
+        placementId: 'testPlacementId',
+      }]
+    };
+    let serverResponse = {
+      body: [{
+        bidId: '22499d052045',
+        id: 987654,
+        cpm: 10,
+        netRevenue: 0,
+        currency: 'EUR',
+        ttl: 30,
+        bannerFormatWidth: 300,
+        bannerFormatHeight: 250,
+        bannerFormatAlias: 'medium_rectangle',
+        domains: ['www.advertiser.com'],
+        title: 'Advertiser'
+      }]
+    };
+    let expectedResponse = [{
+      requestId: bid.bidId,
+      cpm: 10,
+      width: 300,
+      height: 250,
+      creativeId: 987654,
+      currency: 'EUR',
+      netRevenue: false, // gross
+      ttl: 30,
+      ad: '<script id="smartico-widget-testPlacementId-0" async defer type="text/javascript" src="https://trmads.eu/get?token=FNVzUGZn9ebpIOoheh3kEJ2GQ6H6IyMH39sHXaya&auction-id=5kaj89l8-3456-2s56-c455-4g6h78jsdfgf&from-auction-buffer=1&own_session=1&ad=987654&scriptid=smartico-widget-testPlacementId-0&banner-format=medium_rectangle"><\/script>',
+      meta: {
+        advertiserDomains: ['www.advertiser.com'],
+        advertiserName: 'Advertiser'
+      }}];
+    let result = spec.interpretResponse(serverResponse, bidRequest);
+    it('should contain correct creativeId', function () {
+	  expect(result[0].creativeId).to.equal(expectedResponse[0].creativeId)
+    });
+    it('should contain correct cpm', function () {
+	  expect(result[0].cpm).to.equal(expectedResponse[0].cpm)
+    });
+    it('should contain correct width', function () {
+	  expect(result[0].width).to.equal(expectedResponse[0].width)
+    });
+    it('should contain correct height', function () {
+	  expect(result[0].height).to.equal(expectedResponse[0].height)
+    });
+    it('should contain correct requestId', function () {
+	  expect(result[0].requestId).to.equal(expectedResponse[0].requestId)
+    });
+    it('should contain correct ttl', function () {
+	  expect(result[0].ttl).to.equal(expectedResponse[0].ttl)
+    });
+    it('should contain correct netRevenue', function () {
+	  expect(result[0].netRevenue).to.equal(expectedResponse[0].netRevenue)
+    });
+    it('should contain correct netRevenue', function () {
+	  expect(result[0].currency).to.equal(expectedResponse[0].currency)
+    });
+    it('should contain correct ad content', function () {
+	  expect(result[0].ad).to.equal(expectedResponse[0].ad)
+    });
+    it('should contain correct meta content', function () {
+	  expect(result[0].meta).to.deep.equal(expectedResponse[0].meta)
+    });
+  });
+});
diff --git a/test/spec/modules/smartrtbBidAdapter_spec.js b/test/spec/modules/smartrtbBidAdapter_spec.js
deleted file mode 100644
index cb5ceee0870..00000000000
--- a/test/spec/modules/smartrtbBidAdapter_spec.js
+++ /dev/null
@@ -1,161 +0,0 @@
-import { expect } from 'chai'
-import { spec, _getPlatform } from 'modules/smartrtbBidAdapter.js'
-import { newBidder } from 'src/adapters/bidderFactory.js'
-
-const br = {
-  body: {
-    bids: [{
-      bid_id: '123',
-      cpm: 1.23,
-      w: 300,
-      h: 250,
-      html: '<b>deadbeef</b>',
-      crid: 'crid'
-    }],
-    pixels: [
-      { type: 'image', url: 'https://smrtb.com/image' },
-      { type: 'iframe', url: 'https://smrtb.com/iframe' }
-    ]
-  }
-}
-
-const vr = {
-  body: {
-    bids: [{
-      bid_id: 'abc',
-      cpm: 2.34,
-      w: 640,
-      h: 480,
-      vast_url: 'https://demo.tremorvideo.com/proddev/vast/vast_inline_nonlinear.xml',
-      crid: 'video_crid'
-    }],
-    pixels: [
-      { type: 'image', url: 'https://smrtb.com/image' },
-      { type: 'iframe', url: 'https://smrtb.com/iframe' }
-    ]
-  }
-}
-
-describe('SmartRTBBidAdapter', function () {
-  const adapter = newBidder(spec)
-
-  let bannerRequest = {
-    bidId: '123',
-    transactionId: '456',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250], [300, 600]]
-      }
-    },
-    params: {
-      zoneId: 'N4zTDq3PPEHBIODv7cXK'
-    }
-  }
-
-  let videoRequest = {
-    bidId: 'abc',
-    transactionId: 'def',
-    mediaTypes: {
-      video: {
-        playerDimension: [640, 480]
-      }
-    },
-    params: {
-      zoneId: 'CK6gUYp58EGopLJnUvM2'
-    }
-  }
-
-  describe('codes', function () {
-    it('should return a bidder code of smartrtb', function () {
-      expect(spec.code).to.equal('smartrtb')
-    })
-    it('should alias smrtb', function () {
-      expect(spec.aliases.length > 0 && spec.aliases[0] === 'smrtb').to.be.true
-    })
-  })
-
-  describe('isBidRequestValid', function () {
-    it('should return true if all params present', function () {
-      expect(spec.isBidRequestValid(bannerRequest)).to.be.true
-    })
-
-    it('should return false if any zone id missing', function () {
-      expect(spec.isBidRequestValid(Object.assign(bannerRequest, { params: { zoneId: null } }))).to.be.false
-    })
-  })
-
-  describe('buildRequests', function () {
-    let req = spec.buildRequests([ bannerRequest ], { refererInfo: { } })
-    let rdata
-
-    it('should return request object', function () {
-      expect(req).to.not.be.null
-    })
-
-    it('should build request data', function () {
-      expect(req.data).to.not.be.null
-    })
-
-    it('should include one request', function () {
-      rdata = JSON.parse(req.data)
-      expect(rdata.imps.length).to.equal(1)
-    })
-
-    it('should include all publisher params', function () {
-      expect(rdata.imps[0].zone_id !== null).to.be.true
-    })
-
-    it('should include media types', function () {
-      expect(rdata.imps[0].media_types !== null).to.be.true
-    })
-  })
-
-  describe('interpretResponse', function () {
-    it('should form compliant banner bid object response', function () {
-      let ir = spec.interpretResponse(br, bannerRequest)
-
-      expect(ir.length).to.equal(1)
-
-      let en = ir[0]
-
-      expect(en.requestId != null &&
-            en.cpm != null && typeof en.cpm === 'number' &&
-            en.width != null && typeof en.width === 'number' &&
-            en.height != null && typeof en.height === 'number' &&
-            en.ad != null &&
-            en.creativeId != null
-      ).to.be.true
-    })
-    it('should form compliant video object response', function () {
-      let ir = spec.interpretResponse(vr, videoRequest)
-
-      expect(ir.length).to.equal(1)
-
-      let en = ir[0]
-
-      expect(en.requestId != null &&
-            en.cpm != null && typeof en.cpm === 'number' &&
-            en.width != null && typeof en.width === 'number' &&
-            en.height != null && typeof en.height === 'number' &&
-            (en.vastUrl != null || en.vastXml != null) &&
-            en.creativeId != null
-      ).to.be.true
-    })
-  })
-
-  describe('getUserSyncs', function () {
-    it('should return iframe sync', function () {
-      let sync = spec.getUserSyncs({ iframeEnabled: true }, [br])
-      expect(sync.length).to.equal(1)
-      expect(sync[0].type === 'iframe')
-      expect(typeof sync[0].url === 'string')
-    })
-
-    it('should return pixel sync', function () {
-      let sync = spec.getUserSyncs({ pixelEnabled: true }, [br])
-      expect(sync.length).to.equal(1)
-      expect(sync[0].type === 'image')
-      expect(typeof sync[0].url === 'string')
-    })
-  })
-})
diff --git a/test/spec/modules/smartxBidAdapter_spec.js b/test/spec/modules/smartxBidAdapter_spec.js
new file mode 100644
index 00000000000..5bd08064c79
--- /dev/null
+++ b/test/spec/modules/smartxBidAdapter_spec.js
@@ -0,0 +1,697 @@
+import {
+  expect
+} from 'chai';
+import {
+  spec
+} from 'modules/smartxBidAdapter.js';
+
+describe('The smartx adapter', function () {
+  function getValidBidObject() {
+    return {
+      bidId: 123,
+      mediaTypes: {
+        video: {
+          // context: 'outstream',
+          playerSize: [
+            ['640', '360']
+          ]
+        }
+      },
+      params: {
+        tagId: 'Nu68JuOWAvrbzoyrOR9a7A',
+        publisherId: '__name__',
+        siteId: '__name__',
+        bidfloor: 0.3,
+        bidfloorcur: 'EUR',
+        // user: {
+        // data: ''
+        // }
+        // outstream_options: {
+        //    slot: 'yourelementid'
+        // }
+      }
+
+    };
+  };
+
+  describe('isBidRequestValid', function () {
+    var bid;
+
+    beforeEach(function () {
+      bid = getValidBidObject();
+    });
+
+    it('should fail validation if the bid isn\'t defined or not an object', function () {
+      var result = spec.isBidRequestValid();
+
+      expect(result).to.equal(false);
+
+      result = spec.isBidRequestValid('not an object');
+
+      expect(result).to.equal(false);
+    });
+
+    it('should succeed validation with all the right parameters', function () {
+      expect(spec.isBidRequestValid(getValidBidObject())).to.equal(true);
+    });
+
+    it('should succeed validation with mediaType and outstream_function or outstream_options', function () {
+      bid.mediaType = 'video';
+      bid.params.outstream_function = 'outstream_func';
+
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+      delete bid.params.outstream_function;
+      bid.params.outstream_options = {
+        slot: 'yourelementid'
+      };
+
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should succeed with ad_unit outstream and outstream function set', function () {
+      bid.params.ad_unit = 'outstream';
+      bid.params.outstream_function = function () {};
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should succeed with mediaTypes_video_context outstream, options set for outstream and slot provided', function () {
+      bid.mediaTypes.video.context = 'outstream';
+      bid.params.outstream_options = {
+        slot: 'yourelementid'
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should fail without video', function () {
+      delete bid.mediaTypes.video;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should fail without playerSize', function () {
+      delete bid.mediaTypes.video.playerSize;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should fail without tagId', function () {
+      delete bid.params.tagId;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should fail without publisherId', function () {
+      delete bid.params.publisherId;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should fail without siteId', function () {
+      delete bid.params.siteId;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should succeed with floor Module set', function () {
+      delete bid.params.bidfloor;
+      delete bid.params.bidfloorcur;
+      bid.floors = {
+        currency: 'EUR'
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should fail with context outstream but no options set for outstream', function () {
+      bid.mediaTypes.video.context = 'outstream';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should fail with context outstream, options set for outstream but no slot provided', function () {
+      bid.mediaTypes.video.context = 'outstream';
+      bid.params.outstream_options = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should succeed with context outstream, options set for outstream but no outstream_function is set', function () {
+      bid.mediaTypes.video.context = 'outstream';
+      bid.params.outstream_options = {
+        slot: 'yourelementid'
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    var bid,
+      bidRequestObj;
+
+    beforeEach(function () {
+      bid = getValidBidObject();
+      bidRequestObj = {
+        refererInfo: {
+          page: 'prebid.js'
+        }
+      };
+    });
+
+    it('should build a very basic request', function () {
+      var request = spec.buildRequests([bid], bidRequestObj)[0];
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.equal('https://bid.sxp.smartclip.net/bid/1000');
+      expect(request.bidRequest).to.equal(bidRequestObj);
+      expect(request.data.imp[0].id).to.match(/\d+/);
+      expect(request.data.imp[0].secure).to.equal(0);
+
+      expect(request.data.imp[0].video).to.deep.equal({
+        ext: {
+          sdk_name: 'Prebid 1+'
+        },
+        h: '360',
+        w: '640',
+        mimes: [
+          'application/javascript', 'video/mp4', 'video/webm'
+        ],
+        api: [2],
+        delivery: [2],
+        linearity: 1,
+        maxbitrate: 3500,
+        maxduration: 500,
+        minbitrate: 0,
+        minduration: 0,
+        protocols: [
+          2, 3, 5, 6
+        ],
+        startdelay: 0,
+        placement: 1,
+        pos: 1
+      });
+
+      expect(request.data.site).to.deep.equal({
+        id: '__name__',
+        page: 'prebid.js',
+        cat: [''],
+        domain: '',
+        publisher: {
+          id: '__name__'
+        },
+        content: {
+          ext: {
+            prebid: {
+              name: 'pbjs',
+              version: '$prebid.version$'
+            }
+          }
+        }
+      });
+    });
+
+    it('should change request parameters based on options sent', function () {
+      var request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.imp[0].video.ext).to.deep.equal({
+        sdk_name: 'Prebid 1+'
+      });
+
+      expect(request.data.imp[0].video).to.contain({
+        placement: 1
+      });
+
+      bid.mediaTypes.video.context = 'outstream';
+
+      bid.params = {
+        outstream_options: {
+          foo: 'bar'
+        },
+        outstream_function: '987',
+        mimes: 'foo',
+        linearity: 2,
+        minduration: 5,
+        maxduration: 10,
+        startdelay: 1,
+        minbitrate: 50,
+        maxbitrate: 500,
+        delivery: [1],
+        pos: 2,
+        api: [1],
+        protocols: [
+          2, 3, 5
+        ],
+        bidfloor: 55,
+        bidfloorcur: 'foo',
+        at: 1,
+        cur: ['FOO']
+      };
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.imp[0].video.ext).to.deep.equal({
+        sdk_name: 'Prebid 1+'
+      });
+
+      expect(request.data.imp[0].video).to.contain({
+        minduration: 5,
+        maxduration: 10
+      });
+
+      expect(request.data.imp[0].video.startdelay).to.equal(1);
+
+      expect(request.data.imp[0].video).to.contain({
+        placement: 3
+      });
+
+      expect(request.data.imp[0].bidfloor).to.equal(55);
+
+      expect(request.data.imp[0].bidfloorcur).to.equal('foo');
+
+      expect(request.data.imp[0].video.linearity).to.equal(2);
+
+      expect(request.data.imp[0].video.minbitrate).to.equal(50);
+
+      expect(request.data.imp[0].video.maxbitrate).to.equal(500);
+    });
+
+    it('should pass GDPR params', function () {
+      var request;
+
+      bidRequestObj.gdprConsent = {
+        gdprApplies: true,
+        consentString: 'foo'
+      }
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.regs.ext.gdpr).to.equal(1);
+      expect(request.data.user.ext.consent).to.be.an('string');
+      expect(request.data.user.ext.consent).to.equal('foo');
+    });
+
+    it('should pass emq params', function () {
+      var request;
+
+      bid.params.user = {
+        data: [{
+          id: 'emq',
+          name: 'emq',
+          segment: [{
+            name: 'emq',
+            value: 'foo'
+          }]
+        }]
+      }
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.user.data).to.deep.equal([{
+        id: 'emq',
+        name: 'emq',
+        segment: {
+          name: 'emq',
+          value: 'foo'
+        }
+      }]);
+    });
+
+    it('should pass crumbs params', function () {
+      var request;
+
+      bid.crumbs = {
+        pubcid: 'pubcid_1'
+      };
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.user.ext).to.contain({
+        fpc: 'pubcid_1'
+      });
+    });
+
+    it('should pass linearity params', function () {
+      var request;
+
+      bid.params.linearity = 3
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.imp[0].video.linearity).to.equal(3);
+    });
+
+    it('should pass min and max duration params', function () {
+      var request;
+
+      bid.params.minduration = 3
+      bid.params.maxduration = 15
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.imp[0].video.minduration).to.equal(3);
+      expect(request.data.imp[0].video.maxduration).to.equal(15);
+    });
+
+    it('should pass schain param', function () {
+      var request;
+
+      bid.schain = {
+        complete: 1,
+        nodes: [
+          {
+            asi: 'indirectseller.com',
+            sid: '00001',
+            hp: 1
+          }
+        ]
+      }
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.source).to.deep.equal({
+        ext: {
+          schain: {
+            complete: 1,
+            nodes: [
+              {
+                asi: 'indirectseller.com',
+                sid: '00001',
+                hp: 1
+              }
+            ]
+          }
+        }
+      })
+    });
+  });
+
+  describe('interpretResponse', function () {
+    var serverResponse, bidderRequestObj;
+
+    beforeEach(function () {
+      bidderRequestObj = {
+        bidRequest: {
+          bids: [{
+            mediaTypes: {
+              video: {
+                playerSize: [
+                  ['400', '300']
+                ]
+              }
+            },
+            bidId: 123,
+            params: {
+              player_width: 400,
+              player_height: 300,
+              content_page_url: 'prebid.js',
+              ad_mute: 1,
+              outstream_options: {
+                foo: 'bar'
+              },
+              outstream_function: 'function',
+            }
+          }, {
+            mediaTypes: {
+              video: {
+                playerSize: [
+                  ['200', '100']
+                ]
+              }
+            },
+            bidId: 124,
+            params: {
+              player_width: 200,
+              player_height: 100,
+              content_page_url: 'prebid.js',
+              ad_mute: 1,
+              outstream_options: {
+                foo: 'bar'
+              },
+              outstream_function: 'function'
+            }
+          }]
+        }
+      };
+
+      serverResponse = {
+        body: {
+          id: 12345,
+          seatbid: [{
+            bid: [{
+              impid: 123,
+              cur: 'USD',
+              price: 12,
+              adomain: ['abc.com'],
+              crid: 321,
+              w: 400,
+              h: 300,
+              ext: {
+                slot: 'slot123'
+              }
+            }, {
+              impid: 124,
+              cur: 'USD',
+              price: 13,
+              adomain: ['def.com'],
+              crid: 654,
+              w: 200,
+              h: 100,
+              ext: {
+                slot: 'slot124'
+              }
+            }]
+          }]
+        }
+      };
+    });
+
+    it('should return an array of bid responses', function () {
+      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      expect(responses).to.be.an('array').with.length(2);
+      expect(bidderRequestObj).to.be.an('Object');
+      expect(bidderRequestObj.bidRequest.bids).to.be.an('array').with.length(2);
+      expect(responses[0].meta.advertiserDomains[0]).to.equal('abc.com');
+      expect(responses[0].requestId).to.equal(123);
+      expect(responses[0].currency).to.equal('USD');
+      expect(responses[0].cpm).to.equal(12);
+      expect(responses[0].creativeId).to.equal(321);
+      expect(responses[0].ttl).to.equal(360);
+      expect(responses[0].netRevenue).to.equal(true);
+      expect(responses[0].mediaType).to.equal('video');
+      expect(responses[0].width).to.equal(400);
+      expect(responses[0].height).to.equal(300);
+      expect(responses[1].meta.advertiserDomains[0]).to.equal('def.com');
+      expect(responses[1].requestId).to.equal(124);
+      expect(responses[1].currency).to.equal('USD');
+      expect(responses[1].cpm).to.equal(13);
+      expect(responses[1].creativeId).to.equal(654);
+      expect(responses[1].ttl).to.equal(360);
+      expect(responses[1].netRevenue).to.equal(true);
+      expect(responses[1].mediaType).to.equal('video');
+      expect(responses[1].width).to.equal(200);
+      expect(responses[1].height).to.equal(100);
+    });
+  });
+
+  describe('oustreamRender', function () {
+    var serverResponse, bidderRequestObj;
+
+    beforeEach(function () {
+      bidderRequestObj = {
+        bidRequest: {
+          bids: [{
+            mediaTypes: {
+              video: {
+                context: 'outstream',
+                playerSize: [
+                  ['400', '300']
+                ]
+              }
+            },
+            bidId: 123,
+            params: {
+              player_width: 400,
+              player_height: 300,
+              content_page_url: 'prebid.js',
+              ad_mute: 1,
+              outstream_options: {
+                slot: 'slot123'
+              },
+              outstream_function: 'function',
+            }
+          }]
+        }
+      };
+
+      serverResponse = {
+        body: {
+          id: 12345,
+          seatbid: [{
+            bid: [{
+              impid: 123,
+              cur: 'USD',
+              price: 12,
+              adomain: ['abc.com'],
+              crid: 321,
+              w: 400,
+              h: 300,
+              ext: {
+                slot: 'slot123'
+              }
+            }]
+          }]
+        }
+      };
+    });
+
+    it('should attempt to insert the script without outstream config options set', function () {
+      var scriptTag;
+      sinon.stub(window.document, 'getElementById').returns({
+        appendChild: sinon.stub().callsFake(function (script) {
+          scriptTag = script
+        })
+      });
+      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+
+      responses[0].renderer.render(responses[0]);
+
+      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777779');
+
+      window.document.getElementById.restore();
+    });
+
+    it('should attempt to insert the script with outstream config options set', function () {
+      var scriptTag;
+      sinon.stub(window.document, 'getElementById').returns({
+        appendChild: sinon.stub().callsFake(function (script) {
+          scriptTag = script
+        })
+      });
+      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.startOpen = 'true';
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.endingScreen = 'true';
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.title = 'abc';
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.skipOffset = 2;
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.desiredBitrate = 123;
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.visibilityThreshold = 30;
+
+      responses[0].renderer.render(responses[0]);
+
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.startOpen = 'false';
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.endingScreen = 'false';
+
+      responses[0].renderer.render(responses[0]);
+
+      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777779');
+
+      window.document.getElementById.restore();
+    });
+
+    it('should attempt to insert the script without defined slot', function () {
+      var scriptTag;
+      sinon.stub(window.document, 'getElementById').returns({
+        appendChild: sinon.stub().callsFake(function (script) {
+          scriptTag = script
+        })
+      });
+      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+
+      delete bidderRequestObj.bidRequest.bids[0].params.outstream_options.slot;
+
+      responses[0].renderer.render(responses[0]);
+
+      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777779');
+
+      window.document.getElementById.restore();
+    });
+  });
+
+  describe('price floor module', function () {
+    var bid,
+      bidRequestObj;
+
+    beforeEach(function () {
+      bid = getValidBidObject();
+      bidRequestObj = {
+        refererInfo: {
+          page: 'prebid.js'
+        }
+      };
+      delete bid.params.bidfloor;
+    });
+
+    it('obtain floor from getFloor', function () {
+      bid.getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 3.21
+        };
+      };
+
+      const payload = spec.buildRequests([bid], bidRequestObj)[0];
+      expect(payload.data.imp[0]).to.have.property('bidfloor', 3.21);
+    });
+
+    it('obtain floor from params', function () {
+      bid.getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 3.21
+        };
+      };
+      bid.params.bidfloor = 0.64;
+
+      const payload = spec.buildRequests([bid], bidRequestObj)[0];
+      expect(payload.data.imp[0]).to.have.property('bidfloor', 0.64);
+    });
+
+    it('check currency USD', function () {
+      bid.getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 1.23
+        };
+      };
+      bid.params.bidfloorcur = 'USD'
+
+      const payload = spec.buildRequests([bid], bidRequestObj)[0];
+      expect(payload.data.imp[0]).to.have.property('bidfloorcur', 'USD');
+      expect(payload.data.imp[0]).to.have.property('bidfloor', 1.23);
+    });
+
+    it('check defaut currency EUR', function () {
+      delete bid.params.bidfloorcur;
+
+      bid.getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 4.56
+        };
+      };
+
+      const payload = spec.buildRequests([bid], bidRequestObj)[0];
+      expect(payload.data.imp[0]).to.have.property('bidfloorcur', 'EUR');
+      expect(payload.data.imp[0]).to.have.property('bidfloor', 4.56);
+    });
+
+    it('bad floor value', function () {
+      bid.getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 'bad'
+        };
+      };
+
+      const payload = spec.buildRequests([bid], bidRequestObj)[0];
+      expect(payload.data.imp[0]).to.have.property('bidfloor', 0);
+    });
+
+    it('empty floor object', function () {
+      bid.getFloor = () => {
+        return {};
+      };
+
+      const payload = spec.buildRequests([bid], bidRequestObj)[0];
+      expect(payload.data.imp[0]).to.have.property('bidfloor', 0);
+    });
+
+    it('undefined floor result', function () {
+      bid.getFloor = () => {};
+
+      const payload = spec.buildRequests([bid], bidRequestObj)[0];
+      expect(payload.data.imp[0]).to.have.property('bidfloor', 0);
+    });
+  });
+})
diff --git a/test/spec/modules/smartyadsBidAdapter_spec.js b/test/spec/modules/smartyadsBidAdapter_spec.js
index 2780e88255d..3474753c838 100644
--- a/test/spec/modules/smartyadsBidAdapter_spec.js
+++ b/test/spec/modules/smartyadsBidAdapter_spec.js
@@ -1,22 +1,25 @@
 import {expect} from 'chai';
 import {spec} from '../../../modules/smartyadsBidAdapter.js';
+import { config } from '../../../src/config.js';
 
 describe('SmartyadsAdapter', function () {
   let bid = {
     bidId: '23fhj33i987f',
     bidder: 'smartyads',
     params: {
-      placementId: 0,
+      host: 'prebid',
+      sourceid: '0',
+      accountid: '0',
       traffic: 'banner'
     }
   };
 
   describe('isBidRequestValid', function () {
-    it('Should return true if there are bidId, params and placementId parameters present', function () {
+    it('Should return true if there are bidId, params and sourceid 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;
+      delete bid.params.sourceid;
       expect(spec.isBidRequestValid(bid)).to.be.false;
     });
   });
@@ -33,21 +36,22 @@ describe('SmartyadsAdapter', function () {
       expect(serverRequest.method).to.equal('POST');
     });
     it('Returns valid URL', function () {
-      expect(serverRequest.url).to.equal('https://ssp-nj.webtradehub.com/?c=o&m=multi');
+      expect(serverRequest.url).to.equal('https://n1.smartyads.com/?c=o&m=prebid&secret_key=prebid_js');
     });
     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', 'coppa');
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
+      expect(data.coppa).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 placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes');
-      expect(placement.placementId).to.equal(0);
+      expect(placement).to.have.keys('placementId', 'bidId', 'traffic', 'sizes', 'publisherId');
+      expect(placement.placementId).to.equal('0');
       expect(placement.bidId).to.equal('23fhj33i987f');
       expect(placement.traffic).to.equal('banner');
     });
@@ -57,6 +61,23 @@ describe('SmartyadsAdapter', function () {
       expect(data.placements).to.be.an('array').that.is.empty;
     });
   });
+
+  describe('with COPPA', function() {
+    beforeEach(function() {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+    });
+    afterEach(function() {
+      config.getConfig.restore();
+    });
+
+    it('should send the Coppa "required" flag set to "1" in the request', function () {
+      let serverRequest = spec.buildRequests([bid]);
+      expect(serverRequest.data.coppa).to.equal(1);
+    });
+  });
+
   describe('interpretResponse', function () {
     it('Should interpret banner response', function () {
       const banner = {
@@ -71,19 +92,22 @@ describe('SmartyadsAdapter', function () {
           creativeId: '2',
           netRevenue: true,
           currency: 'USD',
-          dealId: '1'
+          dealId: '1',
+          meta: {advertiserDomains: ['example.com']}
         }]
       };
       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');
+        '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.meta).to.have.property('advertiserDomains')
+      expect(dataItem.meta.advertiserDomains).to.deep.equal(['example.com']);
       expect(dataItem.ttl).to.equal(120);
       expect(dataItem.creativeId).to.equal('2');
       expect(dataItem.netRevenue).to.be.true;
@@ -219,13 +243,18 @@ describe('SmartyadsAdapter', function () {
     });
   });
   describe('getUserSyncs', function () {
-    let userSync = spec.getUserSyncs();
+    const syncUrl = 'https://as.ck-ie.com/prebidjs?p=7c47322e527cf8bdeb7facc1bb03387a&gdpr=0&gdpr_consent=&type=iframe&us_privacy=';
+    const syncOptions = {
+      iframeEnabled: true
+    };
+    let userSync = spec.getUserSyncs(syncOptions);
     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('image');
-      expect(userSync[0].url).to.be.equal('https://ssp-nj.webtradehub.com/?c=o&m=cookie');
+      expect(userSync).to.deep.equal([
+        { type: 'iframe', url: syncUrl }
+      ]);
     });
   });
 });
diff --git a/test/spec/modules/smartytechBidAdapter_spec.js b/test/spec/modules/smartytechBidAdapter_spec.js
new file mode 100644
index 00000000000..78503d7a6f0
--- /dev/null
+++ b/test/spec/modules/smartytechBidAdapter_spec.js
@@ -0,0 +1,162 @@
+import {expect} from 'chai';
+import {spec, ENDPOINT_PROTOCOL, ENDPOINT_DOMAIN, ENDPOINT_PATH} from 'modules/smartytechBidAdapter';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'smartytech';
+
+describe('SmartyTechDSPAdapter: inherited functions', function () {
+  let adapter;
+  beforeEach(() => {
+    adapter = newBidder(spec);
+  });
+  it('exists and is a function', function () {
+    expect(adapter.callBids).to.be.exist.and.to.be.a('function');
+  });
+  it(`bidder code is ${BIDDER_CODE}`, function () {
+    expect(spec.code).to.be.equal(BIDDER_CODE);
+  })
+});
+
+describe('SmartyTechDSPAdapter: isBidRequestValid', function () {
+  it('Invalid bid request. Should return false', function () {
+    const invalidBidFixture = {
+      params: {
+        use_id: 13144375
+      }
+    }
+    expect(spec.isBidRequestValid(invalidBidFixture)).to.be.false
+  });
+  it('Valid bid request. Should return true', function () {
+    const validBidFixture = {
+      params: {
+        endpointId: 13144375
+      }
+    }
+    expect(spec.isBidRequestValid(validBidFixture)).to.be.true
+  });
+});
+
+function mockRandomSizeArray(len) {
+  return Array.apply(null, {length: len}).map(i => {
+    return [Math.floor(Math.random() * 800), Math.floor(Math.random() * 800)]
+  });
+}
+
+function mockBidRequestListData(size) {
+  return Array.apply(null, {length: size}).map((i, index) => {
+    const id = Math.floor(Math.random() * 800) * (index + 1);
+    return {
+      adUnitCode: `adUnitCode-${id}`,
+      sizes: mockRandomSizeArray(index + 1),
+      bidId: `bidId-${id}`,
+      params: {
+        endpointId: id
+      }
+    }
+  });
+}
+
+function mockRefererData() {
+  return {
+    refererInfo: {
+      page: 'https://some-test.page'
+    }
+  }
+}
+
+function mockResponseData(requestData) {
+  let data = {}
+
+  requestData.data.forEach((request, index) => {
+    const sizeArrayIndex = Math.floor(Math.random() * (request.sizes.length - 1));
+    const rndIndex = Math.floor(Math.random() * 800);
+
+    data[request.adUnitCode] = {
+      ad: `ad-${rndIndex}`,
+      width: request.sizes[sizeArrayIndex][0],
+      height: request.sizes[sizeArrayIndex][1],
+      creativeId: `creative-id-${index}`,
+      cpm: Math.floor(Math.random() * 100),
+      currency: `UAH-${rndIndex}`
+    };
+  });
+  return {
+    body: data
+  }
+};
+
+describe('SmartyTechDSPAdapter: buildRequests', () => {
+  let mockBidRequest;
+  let mockReferer;
+  beforeEach(() => {
+    mockBidRequest = mockBidRequestListData(8);
+    mockReferer = mockRefererData();
+  });
+  it('has return data', () => {
+    const request = spec.buildRequests(mockBidRequest, mockReferer);
+    expect(request).not.null;
+  });
+  it('correct request URL', () => {
+    const request = spec.buildRequests(mockBidRequest, mockReferer);
+    expect(request.url).to.be.equal(`${ENDPOINT_PROTOCOL}://${ENDPOINT_DOMAIN}${ENDPOINT_PATH}`)
+  });
+  it('correct request method', () => {
+    const request = spec.buildRequests(mockBidRequest, mockReferer);
+    expect(request.method).to.be.equal(`POST`)
+  });
+  it('correct request data', () => {
+    const data = spec.buildRequests(mockBidRequest, mockReferer).data;
+    data.forEach((request, index) => {
+      expect(request.adUnitCode).to.be.equal(mockBidRequest[index].adUnitCode);
+      expect(request.sizes).to.be.equal(mockBidRequest[index].sizes);
+      expect(request.bidId).to.be.equal(mockBidRequest[index].bidId);
+      expect(request.endpointId).to.be.equal(mockBidRequest[index].params.endpointId);
+      expect(request.referer).to.be.equal(mockReferer.refererInfo.page);
+    })
+  });
+});
+
+describe('SmartyTechDSPAdapter: interpretResponse', () => {
+  let mockBidRequest;
+  let mockReferer;
+  let request;
+  let mockResponse;
+  beforeEach(() => {
+    const brData = mockBidRequestListData(2);
+    mockReferer = mockRefererData();
+    request = spec.buildRequests(brData, mockReferer);
+    mockBidRequest = {
+      data: brData
+    }
+    mockResponse = mockResponseData(request);
+  });
+
+  it('interpretResponse: empty data request', () => {
+    delete mockResponse['body']
+    const data = spec.interpretResponse(mockResponse, mockBidRequest);
+    expect(data.length).to.be.equal(0);
+  });
+
+  it('interpretResponse: response data and convert data arrays has same length', () => {
+    const keys = Object.keys(mockResponse.body);
+    const data = spec.interpretResponse(mockResponse, mockBidRequest);
+    expect(data.length).to.be.equal(keys.length);
+  });
+
+  it('interpretResponse: convert to correct data', () => {
+    const keys = Object.keys(mockResponse.body);
+    const data = spec.interpretResponse(mockResponse, mockBidRequest);
+
+    data.forEach((responseItem, index) => {
+      expect(responseItem.ad).to.be.equal(mockResponse.body[keys[index]].ad);
+      expect(responseItem.cpm).to.be.equal(mockResponse.body[keys[index]].cpm);
+      expect(responseItem.creativeId).to.be.equal(mockResponse.body[keys[index]].creativeId);
+      expect(responseItem.currency).to.be.equal(mockResponse.body[keys[index]].currency);
+      expect(responseItem.netRevenue).to.be.true;
+      expect(responseItem.ttl).to.be.equal(60);
+      expect(responseItem.requestId).to.be.equal(mockBidRequest.data[index].bidId);
+      expect(responseItem.width).to.be.equal(mockResponse.body[keys[index]].width);
+      expect(responseItem.height).to.be.equal(mockResponse.body[keys[index]].height);
+    });
+  });
+});
diff --git a/test/spec/modules/smilewantedBidAdapter_spec.js b/test/spec/modules/smilewantedBidAdapter_spec.js
index 0ac242ce0e1..b9a816cf3d5 100644
--- a/test/spec/modules/smilewantedBidAdapter_spec.js
+++ b/test/spec/modules/smilewantedBidAdapter_spec.js
@@ -6,6 +6,21 @@ import * as utils from 'src/utils.js';
 import { requestBidsHook } from 'modules/consentManagement.js';
 
 const DISPLAY_REQUEST = [{
+  adUnitCode: 'sw_300x250',
+  bidId: '12345',
+  sizes: [
+    [300, 250],
+    [300, 200]
+  ],
+  bidder: 'smilewanted',
+  params: {
+    zoneId: 1
+  },
+  requestId: 'request_abcd1234',
+  transactionId: 'trans_abcd1234'
+}];
+
+const DISPLAY_REQUEST_WITH_POSITION_TYPE = [{
   adUnitCode: 'sw_300x250',
   bidId: '12345',
   sizes: [
@@ -15,7 +30,7 @@ const DISPLAY_REQUEST = [{
   bidder: 'smilewanted',
   params: {
     zoneId: 1,
-    bidfloor: 2.50
+    positionType: 'infeed'
   },
   requestId: 'request_abcd1234',
   transactionId: 'trans_abcd1234'
@@ -115,7 +130,6 @@ describe('smilewantedBidAdapterTests', function () {
     const requestDisplayContent = JSON.parse(requestDisplay[0].data);
     expect(requestDisplayContent).to.have.property('zoneId').and.to.equal(1);
     expect(requestDisplayContent).to.have.property('currencyCode').and.to.equal('EUR');
-    expect(requestDisplayContent).to.have.property('bidfloor').and.to.equal(2.50);
     expect(requestDisplayContent).to.have.property('sizes');
     expect(requestDisplayContent.sizes[0]).to.have.property('w').and.to.equal(300);
     expect(requestDisplayContent.sizes[0]).to.have.property('h').and.to.equal(250);
@@ -129,7 +143,6 @@ describe('smilewantedBidAdapterTests', function () {
     const requestVideoInstreamContent = JSON.parse(requestVideoInstream[0].data);
     expect(requestVideoInstreamContent).to.have.property('zoneId').and.to.equal(2);
     expect(requestVideoInstreamContent).to.have.property('currencyCode').and.to.equal('EUR');
-    expect(requestVideoInstreamContent).to.have.property('bidfloor').and.to.equal(2.50);
     expect(requestVideoInstreamContent).to.have.property('sizes');
     expect(requestVideoInstreamContent.sizes[0]).to.have.property('w').and.to.equal(640);
     expect(requestVideoInstreamContent.sizes[0]).to.have.property('h').and.to.equal(480);
@@ -141,7 +154,6 @@ describe('smilewantedBidAdapterTests', function () {
     const requestVideoOutstreamContent = JSON.parse(requestVideoOutstream[0].data);
     expect(requestVideoOutstreamContent).to.have.property('zoneId').and.to.equal(3);
     expect(requestVideoOutstreamContent).to.have.property('currencyCode').and.to.equal('EUR');
-    expect(requestVideoOutstreamContent).to.have.property('bidfloor').and.to.equal(2.50);
     expect(requestVideoOutstreamContent).to.have.property('sizes');
     expect(requestVideoOutstreamContent.sizes[0]).to.have.property('w').and.to.equal(640);
     expect(requestVideoOutstreamContent.sizes[0]).to.have.property('h').and.to.equal(480);
@@ -151,7 +163,7 @@ describe('smilewantedBidAdapterTests', function () {
   it('SmileWanted - Verify build request with referrer', function () {
     const request = spec.buildRequests(DISPLAY_REQUEST, {
       refererInfo: {
-        referer: 'https://localhost/Prebid.js/integrationExamples/gpt/hello_world.html'
+        page: 'https://localhost/Prebid.js/integrationExamples/gpt/hello_world.html'
       }
     });
     const requestContent = JSON.parse(request[0].data);
@@ -304,13 +316,25 @@ describe('smilewantedBidAdapterTests', function () {
     })).to.equal(false);
   });
 
+  it('SmileWanted - Verify if payload(positionType) is default value when nothing is passed on the param', function () {
+    const request = spec.buildRequests(DISPLAY_REQUEST, {});
+    const requestContent = JSON.parse(request[0].data);
+    expect(requestContent).to.have.property('positionType').and.to.equal('');
+  });
+
+  it('SmileWanted - Verify if payload(positionType) is well passed', function () {
+    const request = spec.buildRequests(DISPLAY_REQUEST_WITH_POSITION_TYPE, {});
+    const requestContent = JSON.parse(request[0].data);
+    expect(requestContent).to.have.property('positionType').and.to.equal('infeed');
+  });
+
   it('SmileWanted - Verify user sync', function () {
-    var syncs = spec.getUserSyncs({
-      iframeEnabled: true
-    }, [BID_RESPONSE_DISPLAY]);
+    var syncs = spec.getUserSyncs({iframeEnabled: true}, {}, {
+      consentString: 'foo'
+    }, '1NYN');
     expect(syncs).to.have.lengthOf(1);
     expect(syncs[0].type).to.equal('iframe');
-    expect(syncs[0].url).to.equal('https://csync.smilewanted.com');
+    expect(syncs[0].url).to.equal('https://csync.smilewanted.com?gdpr_consent=foo&us_privacy=1NYN');
 
     syncs = spec.getUserSyncs({
       iframeEnabled: false
@@ -320,6 +344,6 @@ describe('smilewantedBidAdapterTests', function () {
     syncs = spec.getUserSyncs({
       iframeEnabled: true
     }, []);
-    expect(syncs).to.have.lengthOf(0);
+    expect(syncs).to.have.lengthOf(1);
   });
 });
diff --git a/test/spec/modules/smmsBidAdapter_spec.js b/test/spec/modules/smmsBidAdapter_spec.js
deleted file mode 100644
index 3cbeb91cf5a..00000000000
--- a/test/spec/modules/smmsBidAdapter_spec.js
+++ /dev/null
@@ -1,161 +0,0 @@
-import {expect} from 'chai';
-import {spec, _getUrlVars} from 'modules/smmsBidAdapter.js';
-import * as utils from 'src/utils.js';
-
-const BASE_URI = 'https://bidder.mediams.mb.softbank.jp/api/v1/prebid/banner'
-const NATIVE_BASE_URI = 'https://bidder.mediams.mb.softbank.jp/api/v1/prebid/native'
-
-describe('smms adapter', function() {
-  let bidRequests;
-  let nativeBidRequests;
-
-  beforeEach(function() {
-    bidRequests = [
-      {
-        bidder: 'smms',
-        params: {
-          placementId: 1440837,
-          currency: 'USD'
-        }
-      }
-    ]
-
-    nativeBidRequests = [
-      {
-        bidder: 'smms',
-        params: {
-          placementId: 1440838,
-          currency: 'USD'
-        },
-        nativeParams: {
-          title: {
-            required: true,
-            len: 80
-          },
-          image: {
-            required: true,
-            sizes: [150, 50]
-          },
-          sponsoredBy: {
-            required: true
-          }
-        }
-      }
-    ]
-  })
-
-  describe('isBidRequestValid', function () {
-    it('valid bid case: required params found', function () {
-      let validBid = {
-        bidder: 'smms',
-        params: {
-          placementId: 1440837,
-          currency: 'USD'
-        }
-      }
-      let isValid = spec.isBidRequestValid(validBid);
-      expect(isValid).to.equal(true);
-    });
-
-    it('invalid bid case: placementId is not passed', function() {
-      let validBid = {
-        bidder: 'smms',
-        params: {
-        }
-      }
-      let isValid = spec.isBidRequestValid(validBid);
-      expect(isValid).to.equal(false);
-    })
-
-    it('invalid bid case: currency is not support', function() {
-      let validBid = {
-        bidder: 'smms',
-        params: {
-          placementId: 1440837,
-          currency: 'AUD'
-        }
-      }
-      let isValid = spec.isBidRequestValid(validBid);
-      expect(isValid).to.equal(false);
-    })
-  })
-
-  describe('buildRequests', function () {
-    it('sends bid request to ENDPOINT via GET', function () {
-      const request = spec.buildRequests(bidRequests)[0];
-      expect(request.url).to.equal(BASE_URI);
-      expect(request.method).to.equal('GET');
-    });
-
-    it('sends native bid request to ENDPOINT via GET', function () {
-      const request = spec.buildRequests(nativeBidRequests)[0];
-      expect(request.url).to.equal(NATIVE_BASE_URI);
-      expect(request.method).to.equal('GET');
-    });
-
-    it('buildRequests function should not modify original bidRequests object', function () {
-      let originalBidRequests = utils.deepClone(bidRequests);
-      spec.buildRequests(bidRequests);
-      expect(bidRequests).to.deep.equal(originalBidRequests);
-    });
-
-    it('buildRequests function should not modify original nativeBidRequests object', function () {
-      let originalBidRequests = utils.deepClone(nativeBidRequests);
-      spec.buildRequests(nativeBidRequests);
-      expect(nativeBidRequests).to.deep.equal(originalBidRequests);
-    });
-
-    it('Request params check', function() {
-      let request = spec.buildRequests(bidRequests)[0];
-      const data = _getUrlVars(request.data)
-      expect(parseInt(data.placementid)).to.exist.and.to.equal(bidRequests[0].params.placementId);
-      expect(data.cur).to.exist.and.to.equal(bidRequests[0].params.currency);
-    })
-
-    it('Native request params check', function() {
-      let request = spec.buildRequests(nativeBidRequests)[0];
-      const data = _getUrlVars(request.data)
-      expect(parseInt(data.placementid)).to.exist.and.to.equal(nativeBidRequests[0].params.placementId);
-      expect(data.cur).to.exist.and.to.equal(nativeBidRequests[0].params.currency);
-    })
-  })
-
-  describe('interpretResponse', function () {
-    let response = {
-      1440837:
-      {
-        'creativeId': '<!-- CREATIVE ID -->',
-        'cur': 'USD',
-        'price': 0.0920,
-        'width': 300,
-        'height': 250,
-        'requestid': '2e42361a6172bf',
-        'adm': '<!-- ADS TAG -->'
-      }
-    }
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {
-          'requestId': '2e42361a6172bf',
-          'cpm': 0.0920,
-          'width': 300,
-          'height': 250,
-          'netRevenue': true,
-          'currency': 'USD',
-          'creativeId': '<!-- CREATIVE ID -->',
-          'ttl': 700,
-          'ad': '<!-- ADS TAG -->'
-        }
-      ];
-      let request = spec.buildRequests(bidRequests)[0];
-      let result = spec.interpretResponse({body: response}, request);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
-      expect(result[0].cpm).to.not.equal(null);
-      expect(result[0].creativeId).to.not.equal(null);
-      expect(result[0].ad).to.not.equal(null);
-      expect(result[0].currency).to.equal('USD');
-      expect(result[0].netRevenue).to.equal(true);
-    });
-  })
-})
diff --git a/test/spec/modules/snigelBidAdapter_spec.js b/test/spec/modules/snigelBidAdapter_spec.js
new file mode 100644
index 00000000000..3fc09493f03
--- /dev/null
+++ b/test/spec/modules/snigelBidAdapter_spec.js
@@ -0,0 +1,296 @@
+import {expect} from 'chai';
+import {spec} from 'modules/snigelBidAdapter.js';
+import {config} from 'src/config.js';
+import {isValid} from 'src/adapters/bidderFactory.js';
+
+const BASE_BID_REQUEST = {
+  adUnitCode: 'top_leaderboard',
+  bidId: 'bid_test',
+  sizes: [
+    [970, 90],
+    [728, 90],
+  ],
+  bidder: 'snigel',
+  params: {},
+  requestId: 'req_test',
+  transactionId: 'trans_test',
+};
+const makeBidRequest = function (overrides) {
+  return {...BASE_BID_REQUEST, ...overrides};
+};
+
+const BASE_BIDDER_REQUEST = {
+  bidderRequestId: 'test',
+  refererInfo: {
+    canonicalUrl: 'https://localhost',
+  },
+};
+const makeBidderRequest = function (overrides) {
+  return {...BASE_BIDDER_REQUEST, ...overrides};
+};
+
+const DUMMY_USP_CONSENT = '1YYN';
+const DUMMY_GDPR_CONSENT_STRING =
+  'BOSSotLOSSotLAPABAENBc-AAAAgR7_______9______9uz_Gv_v_f__33e8__9v_l_7_-___u_-33d4-_1vX99yfm1-7ftr3tp_86ues2_XqK_9oIiA';
+
+describe('snigelBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    it('should return false if no placement provided', function () {
+      expect(spec.isBidRequestValid(BASE_BID_REQUEST)).to.equal(false);
+    });
+
+    it('should return true if placement provided', function () {
+      const bidRequest = makeBidRequest({params: {placement: 'top_leaderboard'}});
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    afterEach(function () {
+      config.resetConfig();
+    });
+
+    it('should build a single request for every impression and its placement', function () {
+      const bidderRequest = Object.assign({}, BASE_BIDDER_REQUEST);
+      const bidRequests = [
+        makeBidRequest({bidId: 'a', params: {placement: 'top_leaderboard'}}),
+        makeBidRequest({bidId: 'b', params: {placement: 'bottom_leaderboard'}}),
+      ];
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request).to.be.an('object');
+      expect(request).to.have.property('url').and.to.equal('https://adserv.snigelweb.com/bp/v1/prebid');
+      expect(request).to.have.property('method').and.to.equal('POST');
+
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('id').and.to.equal('test');
+      expect(data).to.have.property('cur').and.to.deep.equal(['USD']);
+      expect(data).to.have.property('test').and.to.equal(false);
+      expect(data).to.have.property('page').and.to.equal('https://localhost');
+      expect(data).to.have.property('placements');
+      expect(data.placements.length).to.equal(2);
+      expect(data.placements[0].uuid).to.equal('a');
+      expect(data.placements[0].name).to.equal('top_leaderboard');
+      expect(data.placements[1].uuid).to.equal('b');
+      expect(data.placements[1].name).to.equal('bottom_leaderboard');
+    });
+
+    it('should forward GDPR flag and GDPR consent string if enabled', function () {
+      const bidderRequest = makeBidderRequest({
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: DUMMY_GDPR_CONSENT_STRING,
+        },
+      });
+
+      const request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('gdprApplies').and.to.equal(true);
+      expect(data).to.have.property('gdprConsentString').and.to.equal(DUMMY_GDPR_CONSENT_STRING);
+    });
+
+    it('should forward GDPR flag and no GDPR consent string if disabled', function () {
+      const bidderRequest = makeBidderRequest({
+        gdprConsent: {
+          gdprApplies: false,
+          consentString: DUMMY_GDPR_CONSENT_STRING,
+        },
+      });
+
+      const request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('gdprApplies').and.to.equal(false);
+      expect(data).to.not.have.property('gdprConsentString');
+    });
+
+    it('should forward USP consent if set', function () {
+      const bidderRequest = makeBidderRequest({
+        uspConsent: DUMMY_USP_CONSENT,
+      });
+
+      const request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('uspConsent').and.to.equal(DUMMY_USP_CONSENT);
+    });
+
+    it('should forward whether or not COPPA applies', function () {
+      config.setConfig({
+        'coppa': true,
+      });
+
+      const request = spec.buildRequests([], BASE_BIDDER_REQUEST);
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('coppa').and.to.equal(true);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should not return any bids if the request failed', function () {
+      expect(spec.interpretResponse({}, {})).to.be.empty;
+      expect(spec.interpretResponse({body: 'Some error message'}, {})).to.be.empty;
+    });
+
+    it('should not return any bids if the request did not return any bids either', function () {
+      expect(spec.interpretResponse({body: {bids: []}})).to.be.empty;
+    });
+
+    it('should return valid bids with additional meta information', function () {
+      const serverResponse = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          bids: [
+            {
+              uuid: BASE_BID_REQUEST.bidId,
+              price: 0.0575,
+              ad: '<html><body><h1>Test Ad</h1></body></html>',
+              width: 728,
+              height: 90,
+              crid: 'test',
+              meta: {
+                advertiserDomains: ['addomain.com'],
+              },
+            },
+          ],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {});
+      expect(bids.length).to.equal(1);
+      const bid = bids[0];
+      expect(isValid(BASE_BID_REQUEST.adUnitCode, bid)).to.be.true;
+      expect(bid).to.have.property('meta');
+      expect(bid.meta).to.have.property('advertiserDomains');
+      expect(bid.meta.advertiserDomains).to.be.an('array');
+      expect(bid.meta.advertiserDomains.length).to.equal(1);
+      expect(bid.meta.advertiserDomains[0]).to.equal('addomain.com');
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should not return any user syncs if sync url does not exist in response', function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: true,
+      };
+      const gdprConsent = {
+        gdprApplies: false,
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.undefined;
+    });
+
+    it('should not return any user syncs if publisher disabled iframe-based sync', function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          syncUrl: 'https://somesyncurl',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: false,
+      };
+      const gdprConsent = {
+        gdprApplies: false,
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.undefined;
+    });
+
+    it('should not return any user syncs if GDPR applies and the user did not consent to purpose one', function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          syncUrl: 'https://somesyncurl',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: true,
+      };
+      const gdprConsent = {
+        gdprApplies: true,
+        vendorData: {
+          purpose: {
+            consents: {1: false},
+          },
+        },
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.undefined;
+    });
+
+    it("should return an iframe specific to the publisher's property if all conditions are met", function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          syncUrl: 'https://somesyncurl',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: true,
+      };
+      const gdprConsent = {
+        gdprApplies: false,
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.an('array').and.of.length(1);
+      const sync = syncs[0];
+      expect(sync).to.have.property('type');
+      expect(sync.type).to.equal('iframe');
+      expect(sync).to.have.property('url');
+      expect(sync.url).to.equal('https://somesyncurl?gdpr=0&gdpr_consent=');
+    });
+
+    it('should pass GDPR applicability and consent string as query parameters', function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          syncUrl: 'https://somesyncurl',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: true,
+      };
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: DUMMY_GDPR_CONSENT_STRING,
+        vendorData: {
+          purpose: {
+            consents: {1: true},
+          },
+        },
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.an('array').and.of.length(1);
+      const sync = syncs[0];
+      expect(sync).to.have.property('type');
+      expect(sync.type).to.equal('iframe');
+      expect(sync).to.have.property('url');
+      expect(sync.url).to.equal(`https://somesyncurl?gdpr=1&gdpr_consent=${DUMMY_GDPR_CONSENT_STRING}`);
+    });
+  });
+});
diff --git a/test/spec/modules/somoBidAdapter_spec.js b/test/spec/modules/somoBidAdapter_spec.js
deleted file mode 100644
index 32e9c6c5323..00000000000
--- a/test/spec/modules/somoBidAdapter_spec.js
+++ /dev/null
@@ -1,545 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/somoBidAdapter.js';
-import * as utils from 'src/utils.js';
-
-describe('Somo Audience Adapter Tests', function () {
-  describe('isBidRequestValid', function () {
-    it('should return false when given an invalid bid', function () {
-      const bid = {
-        bidder: 'somo',
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(false);
-    });
-    it('should return true when given a placementId bid', function () {
-      const bid = {
-        bidder: 'somo',
-        params: {
-          placementId: 'test'
-        }
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    describe('buildBannerRequests', function () {
-      it('should properly build a banner request with type not defined and sizes not defined', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          params: {
-            placementId: 'test'
-          }
-        }];
-        const bidderRequest = {
-          refererInfo: {
-            referer: 'https://www.test.com/page?var=val',
-            canonicalUrl: 'https://www.test.com/page'
-          }
-        };
-
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        expect(request[0].url).to.equal('https://publisher-east.mobileadtrading.com/rtb/bid?s=test');
-        expect(request[0].method).to.equal('POST');
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.site).to.not.equal(null);
-        expect(ortbRequest.site.ref).to.equal('https://www.test.com/page?var=val');
-        expect(ortbRequest.site.page).to.equal('https://www.test.com/page');
-        expect(ortbRequest.site.domain).to.not.be.undefined;
-        expect(ortbRequest.imp).to.have.lengthOf(1);
-        expect(ortbRequest.device).to.not.equal(null);
-        expect(ortbRequest.device.ua).to.equal(navigator.userAgent);
-        expect(ortbRequest.imp[0].bidfloor).to.not.be.null;
-        expect(ortbRequest.imp[0].banner).to.not.equal(null);
-      });
-
-      it('should properly build a banner request with sizes defined in 2d array', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          mediaTypes: {
-            banner: {
-              sizes: [[300, 250]]
-            }
-          },
-          params: {
-            placementId: 'test'
-          }
-        }];
-
-        const bidderRequest = {
-          refererInfo: {
-            referer: 'https://www.test.com/page?var=val',
-            canonicalUrl: 'https://www.test.com/page'
-          }
-        }
-
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        expect(request[0].url).to.equal('https://publisher-east.mobileadtrading.com/rtb/bid?s=test');
-        expect(request[0].method).to.equal('POST');
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.site).to.not.equal(null);
-        expect(ortbRequest.site.ref).to.equal('https://www.test.com/page?var=val');
-        expect(ortbRequest.site.page).to.equal('https://www.test.com/page');
-        expect(ortbRequest.site.domain).to.not.be.undefined;
-        expect(ortbRequest.imp).to.have.lengthOf(1);
-        expect(ortbRequest.imp[0].bidfloor).to.not.be.null;
-        expect(ortbRequest.imp[0].banner).to.not.equal(null);
-        expect(ortbRequest.imp[0].banner.w).to.equal(300);
-        expect(ortbRequest.imp[0].banner.h).to.equal(250);
-      });
-      it('should properly build a banner request with sizes defined in 1d array', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          mediaTypes: {
-            banner: {
-              sizes: [300, 250]
-            }
-          },
-          params: {
-            placementId: 'test'
-          }
-        }];
-
-        const bidderRequest = {
-          refererInfo: {
-            referer: 'https://www.test.com/page?var=val',
-            canonicalUrl: 'https://www.test.com/page'
-          }
-        };
-
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        expect(request[0].url).to.equal('https://publisher-east.mobileadtrading.com/rtb/bid?s=test');
-        expect(request[0].method).to.equal('POST');
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.site).to.not.equal(null);
-        expect(ortbRequest.site.ref).to.equal('https://www.test.com/page?var=val');
-        expect(ortbRequest.site.page).to.equal('https://www.test.com/page');
-        expect(ortbRequest.site.domain).to.not.be.undefined;
-        expect(ortbRequest.imp).to.have.lengthOf(1);
-        expect(ortbRequest.imp[0].bidfloor).to.not.be.null;
-        expect(ortbRequest.imp[0].banner).to.not.equal(null);
-        expect(ortbRequest.imp[0].banner.w).to.equal(300);
-        expect(ortbRequest.imp[0].banner.h).to.equal(250);
-        expect(ortbRequest.imp[0].banner.mimes).to.equal(undefined);
-        expect(ortbRequest.imp[0].banner.btype).to.equal(undefined);
-        expect(ortbRequest.imp[0].banner.pos).to.equal(undefined);
-        expect(ortbRequest.imp[0].banner.battr).to.equal(undefined);
-      });
-
-      it('should populate optional banner parameters', function () {
-        const bidRequests = [
-          {
-            bidder: 'somo',
-            mediaTypes: {
-              banner: {
-                sizes: [[300, 200]]
-              }
-            },
-            mediaType: 'banner',
-            params: {
-              placementId: 'test',
-              banner: {
-                mimes: 'video/mp4',
-                btype: '4',
-                pos: '1',
-                battr: 'ibv',
-              }
-            }
-          }
-        ];
-        const request = spec.buildRequests(bidRequests);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.imp[0].banner).to.not.equal(null);
-        expect(ortbRequest.imp[0].banner.w).to.equal(300);
-        expect(ortbRequest.imp[0].banner.h).to.equal(200);
-        expect(ortbRequest.imp[0].banner.mimes).to.equal('video/mp4');
-        expect(ortbRequest.imp[0].banner.btype).to.equal('4');
-        expect(ortbRequest.imp[0].banner.pos).to.equal('1');
-        expect(ortbRequest.imp[0].banner.battr).to.equal('ibv');
-      });
-    });
-
-    describe('buildVideoRequests', function () {
-      it('should properly build a video request with sizes defined', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          mediaTypes: {
-            video: {
-              sizes: [200, 300]
-            }
-          },
-          params: {
-            placementId: 'test'
-          }
-        }];
-
-        const bidderRequest = {
-          refererInfo: {
-            referer: 'https://www.test.com/page?var=val',
-            canonicalUrl: 'https://www.test.com/page'
-          }
-        };
-
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.site).to.not.equal(null);
-        expect(ortbRequest.site.ref).to.equal('https://www.test.com/page?var=val');
-        expect(ortbRequest.site.page).to.equal('https://www.test.com/page');
-        expect(ortbRequest.site.domain).to.not.be.undefined;
-        expect(ortbRequest.imp).to.have.lengthOf(1);
-        expect(ortbRequest.imp[0].video).to.not.equal(null);
-        expect(ortbRequest.imp[0].video.w).to.equal(200);
-        expect(ortbRequest.imp[0].video.h).to.equal(300);
-      });
-
-      it('should properly build a video request with sizes defined in 2d array', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          mediaTypes: {
-            video: {
-              sizes: [[200, 300]]
-            }
-          },
-          params: {
-            placementId: 'test'
-          }
-        }];
-
-        const bidderRequest = {
-          refererInfo: {
-            referer: 'https://www.test.com/page?var=val',
-            canonicalUrl: 'https://www.test.com/page'
-          }
-        };
-
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.site).to.not.equal(null);
-        expect(ortbRequest.site.ref).to.equal('https://www.test.com/page?var=val');
-        expect(ortbRequest.site.page).to.equal('https://www.test.com/page');
-        expect(ortbRequest.site.domain).to.not.be.undefined;
-        expect(ortbRequest.imp).to.have.lengthOf(1);
-        expect(ortbRequest.imp[0].video).to.not.equal(null);
-        expect(ortbRequest.imp[0].video.w).to.equal(200);
-        expect(ortbRequest.imp[0].video.h).to.equal(300);
-      });
-      it('should properly build a video request with sizes not defined', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          mediaType: 'video',
-          params: {
-            placementId: 'test'
-          }
-        }];
-        const request = spec.buildRequests(bidRequests);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.imp).to.have.lengthOf(1);
-        expect(ortbRequest.imp[0].video).to.not.equal(null);
-        expect(ortbRequest.imp[0].video.mimes).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.minduration).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.maxduration).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.protocols).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.startdelay).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.linearity).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.skip).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.delivery).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.pos).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.api).to.equal(undefined);
-        expect(ortbRequest.imp[0].video.battr).to.equal(undefined);
-      });
-
-      it('should populate optional video parameters', function () {
-        const bidRequests = [
-          {
-            bidder: 'somo',
-            mediaTypes: {
-              video: {
-                sizes: [[200, 300]]
-              }
-            },
-            params: {
-              placementId: 'test',
-              video: {
-                mimes: 'video/mp4',
-                minduration: '15',
-                maxduration: '30',
-                protocols: 'mp4',
-                startdelay: '0',
-                linearity: 'linear',
-                skip: '1',
-                delivery: 'web',
-                pos: '1',
-                api: 'VPAID 1.0',
-                battr: 'ibv',
-              }
-            }
-          }
-        ];
-        const request = spec.buildRequests(bidRequests);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.imp[0].video).to.not.equal(null);
-        expect(ortbRequest.imp[0].video.w).to.equal(200);
-        expect(ortbRequest.imp[0].video.h).to.equal(300);
-        expect(ortbRequest.imp[0].video.mimes).to.equal('video/mp4');
-        expect(ortbRequest.imp[0].video.minduration).to.equal('15');
-        expect(ortbRequest.imp[0].video.maxduration).to.equal('30');
-        expect(ortbRequest.imp[0].video.protocols).to.equal('mp4');
-        expect(ortbRequest.imp[0].video.startdelay).to.equal('0');
-        expect(ortbRequest.imp[0].video.linearity).to.equal('linear');
-        expect(ortbRequest.imp[0].video.skip).to.equal('1');
-        expect(ortbRequest.imp[0].video.delivery).to.equal('web');
-        expect(ortbRequest.imp[0].video.pos).to.equal('1');
-        expect(ortbRequest.imp[0].video.api).to.equal('VPAID 1.0');
-        expect(ortbRequest.imp[0].video.battr).to.equal('ibv');
-      });
-    });
-
-    describe('buildSiteRequests', function () {
-      it('should fill in basic site parameters', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          params: {
-            placementId: 'test'
-          }
-        }];
-
-        const bidderRequest = {
-          refererInfo: {
-            referer: 'https://www.test.com/page?var=val',
-            canonicalUrl: 'https://www.test.com/page'
-          }
-        };
-
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.app).to.equal(null);
-        expect(ortbRequest.site).to.not.equal(null);
-        expect(ortbRequest.site.ref).to.equal('https://www.test.com/page?var=val');
-        expect(ortbRequest.site.page).to.equal('https://www.test.com/page');
-        expect(ortbRequest.site.domain).to.not.be.undefined;
-      });
-
-      it('should fill in optional site parameters', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          params: {
-            placementId: 'test',
-            site: {
-              domain: 'somoaudience.com',
-              name: 'Somo Audience',
-              cat: 'IAB-25',
-              keywords: 'unit testing',
-              content: 'Unit Testing'
-            }
-          }
-        }];
-        const request = spec.buildRequests(bidRequests);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.app).to.equal(null);
-        expect(ortbRequest.site).to.not.equal(null);
-        expect(ortbRequest.site.name).to.equal('Somo Audience');
-        expect(ortbRequest.site.domain).to.equal('somoaudience.com');
-        expect(ortbRequest.site.cat).to.equal('IAB-25');
-        expect(ortbRequest.site.keywords).to.equal('unit testing');
-        expect(ortbRequest.site.content).to.equal('Unit Testing');
-      })
-    });
-
-    describe('buildAppRequests', function () {
-      it('should fill in app parameters', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          params: {
-            placementId: 'test',
-            app: {
-              bundle: 'com.somoaudience.apps',
-              storeUrl: 'http://somoaudience.com/apps',
-              domain: 'somoaudience.com',
-              name: 'Generic SomoAudience App 5',
-              cat: 'IAB-25',
-              keywords: 'unit testing',
-              content: 'Unit Testing',
-              ver: '5.423-s',
-            }
-          }
-        }];
-        const request = spec.buildRequests(bidRequests);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.site).to.equal(null);
-        expect(ortbRequest.app).to.not.be.null;
-        expect(ortbRequest.app.bundle).to.equal('com.somoaudience.apps');
-        expect(ortbRequest.app.storeUrl).to.equal('http://somoaudience.com/apps');
-        expect(ortbRequest.app.domain).to.equal('somoaudience.com');
-        expect(ortbRequest.app.name).to.equal('Generic SomoAudience App 5');
-        expect(ortbRequest.app.ver).to.equal('5.423-s');
-        expect(ortbRequest.app.cat).to.equal('IAB-25');
-        expect(ortbRequest.app.keywords).to.equal('unit testing');
-        expect(ortbRequest.app.content).to.equal('Unit Testing');
-      });
-    });
-
-    describe('buildGDPRRequests', function () {
-      const bidderRequest = {
-        gdprConsent: {
-          gdprApplies: true,
-          consentString: 'test'
-        },
-      };
-
-      it('should properly build request with gdpr consent', function () {
-        const bidRequests = [{
-          bidder: 'somo',
-          params: {
-            placementId: 'test'
-          }
-        }];
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.reqs).to.not.equal(undefined);
-        expect(ortbRequest.reqs.ext).to.not.equal(undefined);
-        expect(ortbRequest.reqs.ext.gdpr).to.equal(true);
-        expect(ortbRequest.user).to.not.equal(undefined);
-        expect(ortbRequest.user.ext).to.not.equal(undefined);
-        expect(ortbRequest.user.ext.consent).to.equal('test');
-      });
-      it('should properly build request with gdpr not applies', function () {
-        bidderRequest.gdprConsent.gdprApplies = false;
-        const bidRequests = [{
-          bidder: 'somo',
-          params: {
-            placementId: 'test'
-          }
-        }];
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.reqs).to.not.equal(undefined);
-        expect(ortbRequest.reqs.ext).to.not.equal(undefined);
-        expect(ortbRequest.reqs.ext.gdpr).to.equal(false);
-        expect(ortbRequest.user).to.not.equal(undefined);
-        expect(ortbRequest.user.ext).to.not.equal(undefined);
-        expect(ortbRequest.user.ext.consent).to.equal('test');
-      });
-    });
-
-    describe('buildExtraArgsRequests', function () {
-      it('should populate optional parameters', function () {
-        const bidRequests = [
-          {
-            bidder: 'somo',
-            params: {
-              placementId: 'test',
-              bcat: ['IAB-2', 'IAB-7'],
-              badv: ['somoaudience.com', 'mobileadtrading.com'],
-              bidfloor: '0.05',
-            },
-          }
-        ];
-        const request = spec.buildRequests(bidRequests);
-        const ortbRequest = request[0].data;
-        expect(ortbRequest.imp[0].bidfloor).to.not.be.null;
-        expect(ortbRequest.imp[0].bidfloor).to.be.equal('0.05');
-        expect(ortbRequest.bcat).to.not.be.null;
-        expect(ortbRequest.bcat).to.have.lengthOf(2);
-        expect(ortbRequest.bcat).to.contain('IAB-2');
-        expect(ortbRequest.badv).to.not.be.null;
-        expect(ortbRequest.badv).to.have.lengthOf(2);
-        expect(ortbRequest.badv).to.contain('somoaudience.com');
-      });
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('Verify banner parse response', function () {
-      const bidRequests = [
-        {
-          bidder: 'somo',
-          params: {
-            placementId: 'test',
-          },
-          bidId: '234234234',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const ortbRequest = request[0].data;
-      const ortbResponse = {
-        seatbid: [{
-          bid: [{
-            impid: ortbRequest.imp[0].id,
-            price: 1.25,
-            adm: 'Somo Test Ad'
-          }],
-          bidId: '234234234'
-        }]
-      };
-      const bids = spec.interpretResponse({ body: ortbResponse }, {bidRequest: bidRequests[0]});
-      const bid = bids[0];
-      expect(bid.cpm).to.equal(1.25);
-      expect(bid.ad).to.equal('Somo Test Ad');
-    });
-
-    it('Verify video parse response', function () {
-      const bidRequests = [
-        {
-          bidder: 'somo',
-          mediaTypes: {
-            video: {
-            }
-          },
-          params: {
-            placementId: 'test',
-          },
-          bidId: '234234234',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const ortbRequest = request[0].data;
-      const ortbResponse = {
-        seatbid: [{
-          bid: [{
-            impid: ortbRequest.imp[0].id,
-            price: 1.25,
-            adm: 'Somo Test Ad'
-          }],
-          bidId: '234234234'
-        }]
-      };
-      const bids = spec.interpretResponse({ body: ortbResponse }, {bidRequest: bidRequests[0]});
-      const bid = bids[0];
-      expect(bid.cpm).to.equal(1.25);
-      expect(bid.vastXml).to.equal('Somo Test Ad');
-    });
-  });
-
-  describe('user sync', function () {
-    it('should register the pixel sync url', function () {
-      let syncs = spec.getUserSyncs({
-        pixelEnabled: true
-      });
-      expect(syncs).to.not.be.an('undefined');
-      expect(syncs).to.have.lengthOf(1);
-      expect(syncs[0].type).to.equal('image');
-    });
-
-    it('should pass gdpr params', function () {
-      let syncs = spec.getUserSyncs({ pixelEnabled: true }, {}, {
-        gdprApplies: false, consentString: 'test'
-      });
-      expect(syncs).to.not.be.an('undefined');
-      expect(syncs).to.have.lengthOf(1);
-      expect(syncs[0].type).to.equal('image');
-      expect(syncs[0].url).to.contains('gdpr=0');
-    });
-
-    it('should pass gdpr applies params', function () {
-      let syncs = spec.getUserSyncs({ pixelEnabled: true }, {}, {
-        gdprApplies: true, consentString: 'test'
-      });
-      expect(syncs).to.not.be.an('undefined');
-      expect(syncs).to.have.lengthOf(1);
-      expect(syncs[0].type).to.equal('image');
-      expect(syncs[0].url).to.contains('gdpr=1');
-      expect(syncs[0].url).to.contains('gdpr_consent=test');
-    });
-  });
-});
diff --git a/test/spec/modules/sonobiBidAdapter_spec.js b/test/spec/modules/sonobiBidAdapter_spec.js
index 019edd84c9f..a9382f092e2 100644
--- a/test/spec/modules/sonobiBidAdapter_spec.js
+++ b/test/spec/modules/sonobiBidAdapter_spec.js
@@ -1,11 +1,12 @@
 import { expect } from 'chai'
 import { spec, _getPlatform } from 'modules/sonobiBidAdapter.js'
 import { newBidder } from 'src/adapters/bidderFactory.js'
-import {userSync} from '../../../src/userSync.js';
+import { userSync } from '../../../src/userSync.js';
+import { config } from 'src/config.js';
+import * as utils from '../../../src/utils.js';
 
 describe('SonobiBidAdapter', function () {
   const adapter = newBidder(spec)
-
   describe('.code', function () {
     it('should return a bidder code of sonobi', function () {
       expect(spec.code).to.equal('sonobi')
@@ -237,11 +238,17 @@ describe('SonobiBidAdapter', function () {
   });
 
   describe('.buildRequests', function () {
-    beforeEach(function() {
+    let sandbox;
+    beforeEach(function () {
       sinon.stub(userSync, 'canBidderRegisterSync');
+      sinon.stub(utils, 'getGptSlotInfoForAdUnitCode')
+        .onFirstCall().returns({ gptSlot: '/123123/gpt_publisher/adunit-code-3', divId: 'adunit-code-3-div-id' });
+      sandbox = sinon.createSandbox();
     });
-    afterEach(function() {
+    afterEach(function () {
       userSync.canBidderRegisterSync.restore();
+      utils.getGptSlotInfoForAdUnitCode.restore();
+      sandbox.restore();
     });
     let bidRequest = [{
       'schain': {
@@ -271,6 +278,41 @@ describe('SonobiBidAdapter', function () {
       'adUnitCode': 'adunit-code-1',
       'sizes': [[300, 250], [300, 600]],
       'bidId': '30b31c1838de1f',
+      ortb2Imp: {
+        ext: {
+          data: {
+            pbadslot: '/123123/gpt_publisher/adunit-code-1'
+          }
+        }
+      },
+      mediaTypes: {
+        video: {
+          sizes: [[300, 250], [300, 600]],
+          context: 'outstream'
+        }
+      }
+    },
+    {
+      'bidder': 'sonobi',
+      'params': {
+        'placement_id': '1a2b3c4d5e6f1a2b3c4e',
+        'sizes': [[300, 250], [300, 600]],
+        'referrer': 'overrides_top_window_location'
+      },
+      'adUnitCode': 'adunit-code-3',
+      'sizes': [[120, 600], [300, 600], [160, 600]],
+      'bidId': '30b31c1838de1d',
+      'getFloor': ({ currency, mediaType, size }) => {
+        return {
+          currency: 'USD',
+          floor: 0.42
+        }
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        }
+      }
     },
     {
       'bidder': 'sonobi',
@@ -282,11 +324,17 @@ describe('SonobiBidAdapter', function () {
       'adUnitCode': 'adunit-code-2',
       'sizes': [[120, 600], [300, 600], [160, 600]],
       'bidId': '30b31c1838de1e',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        }
+      }
     }];
 
     let keyMakerData = {
-      '30b31c1838de1f': '1a2b3c4d5e6f1a2b3c4d|300x250,300x600|f=1.25',
-      '/7780971/sparks_prebid_LB|30b31c1838de1e': '300x250,300x600',
+      '30b31c1838de1f': '1a2b3c4d5e6f1a2b3c4d|300x250,300x600|f=1.25,gpid=/123123/gpt_publisher/adunit-code-1,c=v,',
+      '30b31c1838de1d': '1a2b3c4d5e6f1a2b3c4e|300x250,300x600|f=0.42,gpid=/123123/gpt_publisher/adunit-code-3,c=d,',
+      '/7780971/sparks_prebid_LB|30b31c1838de1e': '300x250,300x600|gpid=/7780971/sparks_prebid_LB,c=d,',
     };
 
     let bidderRequests = {
@@ -298,51 +346,47 @@ describe('SonobiBidAdapter', function () {
       'refererInfo': {
         'numIframes': 0,
         'reachedTop': true,
-        'referer': 'https://example.com',
+        'page': 'https://example.com',
         'stack': ['https://example.com']
       },
       uspConsent: 'someCCPAString'
     };
-    it('should include the digitrust id and keyv', () => {
-      window.DigiTrust = {
-        getUser: function () {
+
+    it('should set fpd if there is any data in ortb2', function () {
+      const ortb2 = {
+        site: {
+          ext: {
+            data: {
+              pageType: 'article',
+              category: 'tools'
+            }
+          }
+        },
+        user: {
+          ext: {
+            data: {
+              registered: true,
+              interests: ['cars']
+            }
+          }
         }
       };
-      let sandbox = sinon.sandbox.create();
-      sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
-        ({
-          success: true,
-          identity: {
-            id: 'Vb0YJIxTMJV4W0GHRdJ3MwyiOVYJjYEgc2QYdBSG',
-            keyv: 4,
-            version: 2,
-            privacy: {}
-          }
-        })
-      );
-      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.data.digid).to.equal('Vb0YJIxTMJV4W0GHRdJ3MwyiOVYJjYEgc2QYdBSG');
-      expect(bidRequests.data.digkeyv).to.equal(4);
-      sandbox.restore();
-      delete window.DigiTrust;
+      const bidRequests = spec.buildRequests(bidRequest, {...bidderRequests, ortb2});
+      expect(bidRequests.data.fpd).to.equal(JSON.stringify(ortb2));
     });
 
-    it('should not include the digitrust id and keyv', () => {
-      window.DigiTrust = {
-        getUser: function () {
-        }
-      };
-      let sandbox = sinon.sandbox.create();
-      sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
-        ({
-          success: false
-        })
-      );
-      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.data.digid).to.be.undefined;
-      expect(bidRequests.data.digkeyv).to.be.undefined;
-      sandbox.restore();
-      delete window.DigiTrust;
+    it('should populate coppa as 1 if set in config', function () {
+      config.setConfig({ coppa: true });
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+
+      expect(bidRequests.data.coppa).to.equal(1);
+    });
+
+    it('should populate coppa as 0 if set in config', function () {
+      config.setConfig({ coppa: false });
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+
+      expect(bidRequests.data.coppa).to.equal(0);
     });
 
     it('should return a properly formatted request', function () {
@@ -392,7 +436,7 @@ describe('SonobiBidAdapter', function () {
         'refererInfo': {
           'numIframes': 0,
           'reachedTop': true,
-          'referer': 'https://example.com',
+          'page': 'https://example.com',
           'stack': ['https://example.com']
         }
       };
@@ -412,7 +456,7 @@ describe('SonobiBidAdapter', function () {
         'refererInfo': {
           'numIframes': 0,
           'reachedTop': true,
-          'referer': 'https://example.com',
+          'page': 'https://example.com',
           'stack': ['https://example.com']
         }
       };
@@ -434,7 +478,7 @@ describe('SonobiBidAdapter', function () {
     })
 
     it('should return null if there is nothing to bid on', function () {
-      const bidRequests = spec.buildRequests([{params: {}}], bidderRequests)
+      const bidRequests = spec.buildRequests([{ params: {} }], bidderRequests)
       expect(bidRequests).to.equal(null);
     });
 
@@ -444,7 +488,7 @@ describe('SonobiBidAdapter', function () {
       expect(bidRequests.data.ius).to.equal(0);
     });
 
-    it('should set ius as 1 if Sonobi can drop iframe pixels', function() {
+    it('should set ius as 1 if Sonobi can drop iframe pixels', function () {
       userSync.canBidderRegisterSync.returns(true);
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
       expect(bidRequests.data.ius).to.equal(1);
@@ -455,15 +499,56 @@ describe('SonobiBidAdapter', function () {
       expect(JSON.parse(bidRequests.data.schain)).to.deep.equal(bidRequest[0].schain)
     });
 
+    it('should return a properly formatted request with eids as a JSON-encoded set of eids', function () {
+      bidRequest[0].userIdAsEids = [
+        {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '97b1ff9b-6bf1-41fc-95de-acfd33dbb95a',
+              'atype': 1
+            }
+          ]
+        }
+      ];
+      bidRequest[1].userIdAsEids = [
+        {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '97b1ff9b-6bf1-41fc-95de-acfd33dbb95a',
+              'atype': 1
+            }
+          ]
+        }
+      ];
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.url).to.equal('https://apex.go.sonobi.com/trinity.json');
+      expect(bidRequests.method).to.equal('GET');
+      expect(bidRequests.data.ref).not.to.be.empty;
+      expect(bidRequests.data.s).not.to.be.empty;
+      expect(JSON.parse(bidRequests.data.eids)).to.eql([
+        {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '97b1ff9b-6bf1-41fc-95de-acfd33dbb95a',
+              'atype': 1
+            }
+          ]
+        }
+      ]);
+    });
+
     it('should return a properly formatted request with userid as a JSON-encoded set of User ID results', function () {
-      bidRequest[0].userId = {'pubcid': 'abcd-efg-0101', 'tdid': 'td-abcd-efg-0101'};
-      bidRequest[1].userId = {'pubcid': 'abcd-efg-0101', 'tdid': 'td-abcd-efg-0101'};
+      bidRequest[0].userId = { 'pubcid': 'abcd-efg-0101', 'tdid': 'td-abcd-efg-0101', 'id5id': { 'uid': 'ID5-ZHMOrVeUVTUKgrZ-a2YGxeh5eS_pLzHCQGYOEAiTBQ', 'ext': { 'linkType': 2 } } };
+      bidRequest[1].userId = { 'pubcid': 'abcd-efg-0101', 'tdid': 'td-abcd-efg-0101', 'id5id': { 'uid': 'ID5-ZHMOrVeUVTUKgrZ-a2YGxeh5eS_pLzHCQGYOEAiTBQ', 'ext': { 'linkType': 2 } } };
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
       expect(bidRequests.url).to.equal('https://apex.go.sonobi.com/trinity.json');
       expect(bidRequests.method).to.equal('GET');
       expect(bidRequests.data.ref).not.to.be.empty;
       expect(bidRequests.data.s).not.to.be.empty;
-      expect(JSON.parse(bidRequests.data.userid)).to.eql({'pubcid': 'abcd-efg-0101', 'tdid': 'td-abcd-efg-0101'});
+      expect(JSON.parse(bidRequests.data.userid)).to.eql({ 'pubcid': 'abcd-efg-0101', 'tdid': 'td-abcd-efg-0101', 'id5id': 'ID5-ZHMOrVeUVTUKgrZ-a2YGxeh5eS_pLzHCQGYOEAiTBQ' });
     });
 
     it('should return a properly formatted request with userid omitted if there are no userIds', function () {
@@ -488,17 +573,17 @@ describe('SonobiBidAdapter', function () {
       expect(bidRequests.data.userid).to.equal(undefined);
     });
 
-    it('should return a properly formatted request with keywrods included as a csv of strings', function() {
+    it('should return a properly formatted request with keywrods included as a csv of strings', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
       expect(bidRequests.data.kw).to.equal('sports,news,some_other_keyword');
     });
 
-    it('should return a properly formatted request with us_privacy included', function() {
+    it('should return a properly formatted request with us_privacy included', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
       expect(bidRequests.data.us_privacy).to.equal('someCCPAString');
     });
 
-    it('should make a request to the url defined in the bidder param', function() {
+    it('should make a request to the url defined in the bidder param', function () {
       const bRequest = [
         {
           ...bidRequest[0],
@@ -510,7 +595,7 @@ describe('SonobiBidAdapter', function () {
       ];
       const bidRequests = spec.buildRequests(bRequest, bidderRequests);
       expect(bidRequests.url).to.equal('https://iad-2-apex.go.sonobi.com/trinity.json');
-    })
+    });
   });
 
   describe('.interpretResponse', function () {
@@ -579,6 +664,7 @@ describe('SonobiBidAdapter', function () {
             'sbi_crid': '1234abcd',
             'sbi_aid': '30292e432662bd5f86d90774b944b039',
             'sbi_mouse': 1.07,
+            'sbi_adomain': 'sonobi.com'
           },
           '30b31c1838de1e': {
             'sbi_size': '300x250',
@@ -586,7 +672,9 @@ describe('SonobiBidAdapter', function () {
             'sbi_aid': '30292e432662bd5f86d90774b944b038',
             'sbi_mouse': 1.25,
             'sbi_dozer': 'dozerkey',
-            'sbi_ct': 'video'
+            'sbi_ct': 'video',
+            'sbi_adomain': 'sonobi.com'
+
           },
           '/7780971/sparks_prebid_LB_OUTSTREAM|30b31c1838de1g': {
             'sbi_size': '300x600',
@@ -594,6 +682,8 @@ describe('SonobiBidAdapter', function () {
             'sbi_crid': '1234abcd',
             'sbi_aid': '30292e432662bd5f86d90774b944b038',
             'sbi_mouse': 1.07,
+            'sbi_adomain': 'sonobi.com'
+
           },
           '/7780971/sparks_prebid_LB|30b31c1838de1g': {},
           '30b31c1838de1zzzz': {
@@ -604,6 +694,7 @@ describe('SonobiBidAdapter', function () {
             sbi_mouse: 1.25,
             sbi_size: 'preroll',
             'sbi_crid': 'somecrid',
+            'sbi_adomain': 'sonobi.com'
 
           }
 
@@ -630,7 +721,10 @@ describe('SonobiBidAdapter', function () {
         'creativeId': '1234abcd',
         'netRevenue': true,
         'currency': 'USD',
-        'aid': '30292e432662bd5f86d90774b944b039'
+        'aid': '30292e432662bd5f86d90774b944b039',
+        meta: {
+          advertiserDomains: ['sonobi.com']
+        }
       },
       {
         'requestId': '30b31c1838de1e',
@@ -644,7 +738,10 @@ describe('SonobiBidAdapter', function () {
         'currency': 'USD',
         'dealId': 'dozerkey',
         'aid': '30292e432662bd5f86d90774b944b038',
-        'mediaType': 'video'
+        'mediaType': 'video',
+        meta: {
+          advertiserDomains: ['sonobi.com']
+        }
       },
       {
         'requestId': '30b31c1838de1g',
@@ -656,7 +753,10 @@ describe('SonobiBidAdapter', function () {
         'creativeId': '1234abcd',
         'netRevenue': true,
         'currency': 'USD',
-        'aid': '30292e432662bd5f86d90774b944b038'
+        'aid': '30292e432662bd5f86d90774b944b038',
+        meta: {
+          advertiserDomains: ['sonobi.com']
+        }
       },
       {
         'requestId': '30b31c1838de1zzzz',
@@ -671,7 +771,10 @@ describe('SonobiBidAdapter', function () {
         'dealId': 'dozerkey',
         'aid': 'force_1550072228_da1c5d030cb49150c5db8a2136175755',
         'mediaType': 'video',
-        renderer: () => {}
+        renderer: () => { },
+        meta: {
+          advertiserDomains: ['sonobi.com']
+        }
       },
     ];
 
@@ -691,6 +794,7 @@ describe('SonobiBidAdapter', function () {
           expect(resp.width).to.equal(prebidResponse[i].width);
           expect(resp.height).to.equal(prebidResponse[i].height);
           expect(resp.renderer).to.be.ok;
+          expect(resp.ad).to.equal(undefined);
         } else if (resp.mediaType === 'video') {
           expect(resp.vastUrl.indexOf('vast.xml')).to.be.greaterThan(0);
           expect(resp.ad).to.be.undefined;
@@ -740,13 +844,13 @@ describe('SonobiBidAdapter', function () {
   })
   describe('_getPlatform', function () {
     it('should return mobile', function () {
-      expect(_getPlatform({innerWidth: 767})).to.equal('mobile')
+      expect(_getPlatform({ innerWidth: 767 })).to.equal('mobile')
     })
     it('should return tablet', function () {
-      expect(_getPlatform({innerWidth: 800})).to.equal('tablet')
+      expect(_getPlatform({ innerWidth: 800 })).to.equal('tablet')
     })
     it('should return desktop', function () {
-      expect(_getPlatform({innerWidth: 1000})).to.equal('desktop')
+      expect(_getPlatform({ innerWidth: 1000 })).to.equal('desktop')
     })
   })
 })
diff --git a/test/spec/modules/sortableAnalyticsAdapter_spec.js b/test/spec/modules/sortableAnalyticsAdapter_spec.js
deleted file mode 100644
index 258c4b8f74d..00000000000
--- a/test/spec/modules/sortableAnalyticsAdapter_spec.js
+++ /dev/null
@@ -1,307 +0,0 @@
-import {expect} from 'chai';
-import sortableAnalyticsAdapter, {TIMEOUT_FOR_REGISTRY, DEFAULT_PBID_TIMEOUT} from 'modules/sortableAnalyticsAdapter.js';
-import events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
-import * as prebidGlobal from 'src/prebidGlobal.js';
-import {server} from 'test/mocks/xhr.js';
-
-describe('Sortable Analytics Adapter', function() {
-  let sandbox;
-  let clock;
-
-  const initialConfig = {
-    provider: 'sortable',
-    options: {
-      siteId: 'testkey'
-    }
-  };
-
-  const TEST_DATA = {
-    AUCTION_INIT: {
-      auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-      timeout: 3000
-    },
-    BID_REQUESTED: {
-      refererInfo: {
-        referer: 'test.com',
-        reachedTop: true,
-        numIframes: 1
-      },
-      bidderCode: 'sortable',
-      auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-      bids: [{
-        bidder: 'sortable',
-        params: {
-          tagId: 'medrec_1'
-        },
-        adUnitCode: '300x250',
-        transactionId: 'aa02b498-8a99-418e-bc59-6b6fd45f32de',
-        sizes: [
-          [300, 250]
-        ],
-        bidId: '26721042674416',
-        bidderRequestId: '10141593b1d84a',
-        auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-        bidRequestsCount: 1
-      }, {
-        bidder: 'sortable',
-        params: {
-          tagId: 'lead_1'
-        },
-        adUnitCode: '728x90',
-        transactionId: 'b7e9e957-af4f-4c47-8ca7-41f01cb4f105',
-        sizes: [
-          [728, 90]
-        ],
-        bidId: '50fa575b41e596',
-        bidderRequestId: '37a8760be6db23',
-        auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-        bidRequestsCount: 1
-      }],
-      start: 1553529405788
-    },
-    BID_ADJUSTMENT_1: {
-      bidderCode: 'sortable',
-      adId: '88221d316425f7',
-      mediaType: 'banner',
-      cpm: 0.70,
-      dealId: null,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 60,
-      auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-      responseTimestamp: 1553534161763,
-      bidder: 'sortable',
-      adUnitCode: '300x250',
-      timeToRespond: 331,
-      width: '300',
-      height: '250'
-    },
-    AUCTION_END: {
-      auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e'
-    },
-    BID_ADJUSTMENT_2: {
-      bidderCode: 'sortable',
-      adId: '88221d316425f8',
-      mediaType: 'banner',
-      cpm: 0.50,
-      dealId: null,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 60,
-      auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-      responseTimestamp: 1553534161770,
-      bidder: 'sortable',
-      adUnitCode: '728x90',
-      timeToRespond: 338,
-      width: '728',
-      height: '90'
-    },
-    BID_WON_1: {
-      bidderCode: 'sortable',
-      adId: '88221d316425f7',
-      mediaType: 'banner',
-      cpm: 0.70,
-      dealId: null,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 60,
-      auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-      responseTimestamp: 1553534161763,
-      bidder: 'sortable',
-      adUnitCode: '300x250',
-      timeToRespond: 331
-    },
-    BID_WON_2: {
-      bidderCode: 'sortable',
-      adId: '88221d316425f8',
-      mediaType: 'banner',
-      cpm: 0.50,
-      dealId: null,
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 60,
-      auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-      responseTimestamp: 1553534161770,
-      bidder: 'sortable',
-      adUnitCode: '728x90',
-      timeToRespond: 338
-    },
-    BID_TIMEOUT: [{
-      auctionId: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-      adUnitCode: '300x250',
-      bidder: 'sortable'
-    }]
-  };
-
-  beforeEach(function() {
-    sandbox = sinon.sandbox.create();
-    clock = sandbox.useFakeTimers();
-    sandbox.stub(events, 'getEvents').returns([]);
-    sandbox.stub(prebidGlobal, 'getGlobal').returns({
-      version: '1.0',
-      bidderSettings: {
-        'sortable': {
-          bidCpmAdjustment: function (number) {
-            return number * 0.95;
-          }
-        }
-      }
-    });
-
-    sortableAnalyticsAdapter.enableAnalytics(initialConfig);
-  });
-
-  afterEach(function() {
-    sandbox.restore();
-    clock.restore();
-    sortableAnalyticsAdapter.disableAnalytics();
-  });
-
-  describe('initialize adapter', function() {
-    const settings = sortableAnalyticsAdapter.getOptions();
-
-    it('should init settings correctly and apply defaults', function() {
-      expect(settings).to.include({
-        'disableSessionTracking': false,
-        'key': initialConfig.options.siteId,
-        'protocol': 'https',
-        'url': `https://pa.deployads.com/pae/${initialConfig.options.siteId}`,
-        'timeoutForPbid': DEFAULT_PBID_TIMEOUT
-      });
-    });
-    it('should assign a pageview ID', function() {
-      expect(settings).to.have.own.property('pageviewId');
-    });
-  });
-
-  describe('events tracking', function() {
-    beforeEach(function() {
-      server.requests = [];
-    });
-    it('should send the PBID event', function() {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, TEST_DATA.AUCTION_INIT);
-      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, TEST_DATA.BID_REQUESTED);
-      events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, TEST_DATA.BID_ADJUSTMENT_1);
-      events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, TEST_DATA.BID_ADJUSTMENT_2);
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, TEST_DATA.AUCTION_END);
-      events.emit(CONSTANTS.EVENTS.BID_WON, TEST_DATA.BID_WON_1);
-      events.emit(CONSTANTS.EVENTS.BID_WON, TEST_DATA.BID_WON_2);
-
-      clock.tick(DEFAULT_PBID_TIMEOUT);
-
-      expect(server.requests.length).to.equal(1);
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.have.own.property('pbid');
-      expect(result.pbid).to.deep.include({
-        ai: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-        ac: ['300x250', '728x90'],
-        adi: ['88221d316425f7', '88221d316425f8'],
-        bs: 'sortable',
-        bid: ['26721042674416', '50fa575b41e596'],
-        bif: 0.95,
-        brc: 1,
-        brid: ['10141593b1d84a', '37a8760be6db23'],
-        rs: ['300x250', '728x90'],
-        btcp: [0.70, 0.50],
-        btcc: 'USD',
-        btin: true,
-        btsrc: 'sortable',
-        c: [0.70, 0.50],
-        cc: 'USD',
-        did: null,
-        inr: true,
-        it: true,
-        iw: true,
-        ito: false,
-        mt: 'banner',
-        rtp: true,
-        nif: 1,
-        pbv: '1.0',
-        siz: ['300x250', '728x90'],
-        st: 1553529405788,
-        tgid: ['medrec_1', 'lead_1'],
-        to: 3000,
-        trid: ['aa02b498-8a99-418e-bc59-6b6fd45f32de', 'b7e9e957-af4f-4c47-8ca7-41f01cb4f105'],
-        ttl: 60,
-        ttr: [331, 338],
-        u: 'test.com',
-        _count: 2
-      });
-    });
-
-    it('should track a late bidWon event', function() {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, TEST_DATA.AUCTION_INIT);
-      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, TEST_DATA.BID_REQUESTED);
-      events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, TEST_DATA.BID_ADJUSTMENT_1);
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, TEST_DATA.AUCTION_END);
-
-      clock.tick(DEFAULT_PBID_TIMEOUT);
-
-      events.emit(CONSTANTS.EVENTS.BID_WON, TEST_DATA.BID_WON_1);
-
-      clock.tick(TIMEOUT_FOR_REGISTRY);
-
-      expect(server.requests.length).to.equal(2);
-      const pbid_req = JSON.parse(server.requests[0].requestBody);
-      expect(pbid_req).to.have.own.property('pbid');
-      const pbwon_req = JSON.parse(server.requests[1].requestBody);
-      expect(pbwon_req).to.have.own.property('pbrw');
-      expect(pbwon_req.pbrw).to.deep.equal({
-        ac: '300x250',
-        ai: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-        bif: 0.95,
-        bs: 'sortable',
-        s: initialConfig.options.siteId,
-        cc: 'USD',
-        c: 0.70,
-        inr: true,
-        _count: 1,
-        _type: 'pbrw'
-      });
-    });
-
-    it('should track late bidder timeouts', function() {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, TEST_DATA.AUCTION_INIT);
-      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, TEST_DATA.BID_REQUESTED);
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, TEST_DATA.AUCTION_END);
-      clock.tick(DEFAULT_PBID_TIMEOUT);
-      events.emit(CONSTANTS.EVENTS.BID_TIMEOUT, TEST_DATA.BID_TIMEOUT);
-
-      clock.tick(TIMEOUT_FOR_REGISTRY);
-
-      expect(server.requests.length).to.equal(2);
-      const pbid_req = JSON.parse(server.requests[0].requestBody);
-      expect(pbid_req).to.have.own.property('pbid');
-      const pbto_req = JSON.parse(server.requests[1].requestBody);
-      expect(pbto_req).to.have.own.property('pbto');
-      expect(pbto_req.pbto).to.deep.equal({
-        ai: 'fb8d579a-5c3f-4705-ab94-3cff39005d9e',
-        s: initialConfig.options.siteId,
-        ac: '300x250',
-        bs: 'sortable',
-        _type: 'pbto',
-        _count: 1
-      });
-    });
-
-    it('should track errors', function() {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, TEST_DATA.AUCTION_INIT);
-      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, {});
-
-      clock.tick(TIMEOUT_FOR_REGISTRY);
-
-      expect(server.requests.length).to.equal(1);
-      const err_req = JSON.parse(server.requests[0].requestBody);
-      expect(err_req).to.have.own.property('pber');
-      expect(err_req.pber).to.include({
-        args: '{}',
-        s: initialConfig.options.siteId,
-        _count: 1,
-        ti: 'bidRequested',
-        _type: 'pber'
-      });
-      expect(err_req.pber.msg).to.be.a('string');
-    });
-  });
-});
diff --git a/test/spec/modules/sortableBidAdapter_spec.js b/test/spec/modules/sortableBidAdapter_spec.js
deleted file mode 100644
index 8d2b4eea87d..00000000000
--- a/test/spec/modules/sortableBidAdapter_spec.js
+++ /dev/null
@@ -1,539 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/sortableBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import * as utils from 'src/utils.js';
-
-describe('sortableBidAdapter', function() {
-  const adapter = newBidder(spec);
-
-  describe('isBidRequestValid', function () {
-    function makeBid() {
-      return {
-        'bidder': 'sortable',
-        'params': {
-          'tagId': '403370',
-          'siteId': 'example.com',
-          'keywords': {
-            'key1': 'val1',
-            'key2': 'val2'
-          },
-          'floorSizeMap': {
-            '728x90': 0.15,
-            '300x250': 1.20
-          }
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [
-          [300, 250]
-        ],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      };
-    }
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(makeBid())).to.equal(true);
-    });
-
-    it('should return false when tagId not passed correctly', function () {
-      let bid = makeBid();
-      delete bid.params.tagId;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when sizes not passed correctly', function () {
-      let bid = makeBid();
-      delete bid.sizes;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when sizes are wrong length', function () {
-      let bid = makeBid();
-      bid.sizes = [[300]];
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when sizes are empty', function () {
-      let bid = makeBid();
-      bid.sizes = [];
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when require params are not passed', function () {
-      let bid = makeBid();
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return false when the floorSizeMap is invalid', function () {
-      let bid = makeBid();
-      bid.params.floorSizeMap = {
-        'sixforty by foureighty': 1234
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-      bid.params.floorSizeMap = {
-        '728x90': 'three'
-      }
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-      bid.params.floorSizeMap = 'a';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return true when the floorSizeMap is missing or empty', function () {
-      let bid = makeBid();
-      bid.params.floorSizeMap = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-      delete bid.params.floorSizeMap;
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-    it('should return false when the keywords are invalid', function () {
-      let bid = makeBid();
-      bid.params.keywords = {
-        'badval': 1234
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-      bid.params.keywords = 'a';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-
-    it('should return true when the keywords are missing or empty', function () {
-      let bid = makeBid();
-      bid.params.keywords = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-      delete bid.params.keywords;
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return true with video media type', () => {
-      const videoBid = {
-        'bidder': 'sortable',
-        'params': {
-          'tagId': '403370',
-          'siteId': 'example.com',
-        },
-        'adUnitCode': 'adunit-code',
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-        'mediaTypes': {
-          'video': {
-          }
-        }
-      };
-      expect(spec.isBidRequestValid(videoBid)).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bidRequests = [{
-      'bidder': 'sortable',
-      'params': {
-        'tagId': '403370',
-        'siteId': 'example.com',
-        'floor': 0.21,
-        'keywords': {
-          'key1': 'val1',
-          'key2': 'val2'
-        },
-        'floorSizeMap': {
-          '728x90': 0.15,
-          '300x250': 1.20
-        }
-      },
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475'
-    }, {
-      'bidder': 'sortable',
-      'params': {
-        'tagId': '403371',
-        'siteId': 'example.com',
-        'floor': 0.21
-      },
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-      'mediaTypes': {
-        'native': {
-          'body': {'required': true, 'sendId': true},
-          'clickUrl': {'required': true, 'sendId': true},
-          'cta': {'required': true, 'sendId': true},
-          'icon': {'required': true, 'sendId': true},
-          'image': {'required': true, 'sendId': true},
-          'sponsoredBy': {'required': true, 'sendId': true},
-          'title': {'required': true, 'sendId': true, 'len': 100}
-        }
-      }
-    }];
-
-    const request = spec.buildRequests(bidRequests, {refererInfo: { referer: 'http://example.com/page?param=val' }});
-    const requestBody = JSON.parse(request.data);
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('attaches source and version to endpoint URL as query params', function () {
-      const ENDPOINT = `https://c.deployads.com/openrtb2/auction?src=$$REPO_AND_VERSION$$&host=example.com`;
-      expect(request.url).to.equal(ENDPOINT);
-    });
-
-    it('sends screen dimensions', function () {
-      expect(requestBody.site.device.w).to.equal(screen.width);
-      expect(requestBody.site.device.h).to.equal(screen.height);
-    });
-
-    it('includes the ad size in the bid request', function () {
-      expect(requestBody.imp[0].banner.format[0].w).to.equal(300);
-      expect(requestBody.imp[0].banner.format[0].h).to.equal(250);
-    });
-
-    it('includes the params in the bid request', function () {
-      expect(requestBody.imp[0].ext.keywords).to.deep.equal(
-        {'key1': 'val1',
-          'key2': 'val2'}
-      );
-      expect(requestBody.site.publisher.id).to.equal('example.com');
-      expect(requestBody.imp[0].tagid).to.equal('403370');
-      expect(requestBody.imp[0].bidfloor).to.equal(0.21);
-    });
-
-    it('should have the floor size map set', function () {
-      expect(requestBody.imp[0].ext.floorSizeMap).to.deep.equal({
-        '728x90': 0.15,
-        '300x250': 1.20
-      });
-    });
-
-    it('sets domain and href correctly', function () {
-      expect(requestBody.site.domain).to.equal('example.com');
-      expect(requestBody.site.page).to.equal('http://example.com/page?param=val');
-    });
-
-    it('should have the version in native object set for native bid', function() {
-      expect(requestBody.imp[1].native.ver).to.equal('1');
-    });
-
-    it('should have the assets set for native bid', function() {
-      const assets = JSON.parse(requestBody.imp[1].native.request).assets;
-      expect(assets[0]).to.deep.equal({'title': {'len': 100}, 'required': 1, 'id': 0});
-      expect(assets[1]).to.deep.equal({'img': {'type': 3, 'wmin': 1, 'hmin': 1}, 'required': 1, 'id': 1});
-      expect(assets[2]).to.deep.equal({'img': {'type': 1, 'wmin': 1, 'hmin': 1}, 'required': 1, 'id': 2});
-      expect(assets[3]).to.deep.equal({'data': {'type': 2}, 'required': 1, 'id': 3});
-      expect(assets[4]).to.deep.equal({'data': {'type': 12}, 'required': 1, 'id': 4});
-      expect(assets[5]).to.deep.equal({'data': {'type': 1}, 'required': 1, 'id': 5});
-    });
-
-    const videoBidRequests = [{
-      'bidder': 'sortable',
-      'params': {
-        'tagId': '403370',
-        'siteId': 'example.com',
-        'video': {
-          'minduration': 5,
-          'maxduration': 10,
-          'startdelay': 0
-        }
-      },
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-      'mediaTypes': {
-        'video': {
-          'context': 'instream',
-          'mimes': ['video/x-ms-wmv'],
-          'playerSize': [[400, 300]],
-          'api': [0],
-          'protocols': [2, 3],
-          'playbackmethod': [1]
-        }
-      }
-    }];
-
-    const videoRequest = spec.buildRequests(videoBidRequests, {refererInfo: { referer: 'http://localhost:9876/' }});
-    const videoRequestBody = JSON.parse(videoRequest.data);
-
-    it('should include video params', () => {
-      const video = videoRequestBody.imp[0].video;
-      expect(video.mimes).to.deep.equal(['video/x-ms-wmv']);
-      expect(video.w).to.equal(400);
-      expect(video.h).to.equal(300);
-      expect(video.api).to.deep.equal([0]);
-      expect(video.protocols).to.deep.equal([2, 3]);
-      expect(video.playbackmethod).to.deep.equal([1]);
-      expect(video.minduration).to.equal(5);
-      expect(video.maxduration).to.equal(10);
-      expect(video.startdelay).to.equal(0);
-    });
-
-    it('sets domain and href correctly', function () {
-      expect(videoRequestBody.site.domain).to.equal('localhost');
-      expect(videoRequestBody.site.page).to.equal('http://localhost:9876/');
-    });
-
-    const gdprBidRequests = [{
-      'bidder': 'sortable',
-      'params': {
-        'tagId': '403370',
-        'siteId': 'example.com',
-        'floor': 0.21,
-        'keywords': {},
-        'floorSizeMap': {}
-      },
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475'
-    }];
-    const consentString = 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==';
-
-    function getGdprRequestBody(gdprApplies, consentString) {
-      const gdprRequest = spec.buildRequests(gdprBidRequests, {'gdprConsent': {
-        'gdprApplies': gdprApplies,
-        'consentString': consentString
-      },
-      refererInfo: {
-        referer: 'http://localhost:9876/'
-      }});
-      return JSON.parse(gdprRequest.data);
-    }
-
-    it('should handle gdprApplies being present and true', function() {
-      const gdprRequestBody = getGdprRequestBody(true, consentString);
-      expect(gdprRequestBody.regs.ext.gdpr).to.equal(1);
-      expect(gdprRequestBody.user.ext.consent).to.equal(consentString);
-    })
-
-    it('should handle gdprApplies being present and false', function() {
-      const gdprRequestBody = getGdprRequestBody(false, consentString);
-      expect(gdprRequestBody.regs.ext.gdpr).to.equal(0);
-      expect(gdprRequestBody.user.ext.consent).to.equal(consentString);
-    })
-
-    it('should handle gdprApplies being undefined', function() {
-      const gdprRequestBody = getGdprRequestBody(undefined, consentString);
-      expect(gdprRequestBody.regs).to.deep.equal({ext: {}});
-      expect(gdprRequestBody.user.ext.consent).to.equal(consentString);
-    })
-
-    it('should handle gdprConsent being undefined', function() {
-      const gdprRequest = spec.buildRequests(gdprBidRequests, {refererInfo: { referer: 'http://localhost:9876/' }});
-      const gdprRequestBody = JSON.parse(gdprRequest.data);
-      expect(gdprRequestBody.regs).to.deep.equal({ext: {}});
-      expect(gdprRequestBody.user).to.equal(undefined);
-    })
-  });
-
-  describe('interpretResponse', function () {
-    function makeResponse() {
-      return {
-        body: {
-          'id': '5e5c23a5ba71e78',
-          'seatbid': [
-            {
-              'bid': [
-                {
-                  'id': '6vmb3isptf',
-                  'crid': 'sortablescreative',
-                  'impid': '322add653672f68',
-                  'price': 1.22,
-                  'adm': '<!-- creative -->',
-                  'attr': [5],
-                  'h': 90,
-                  'nurl': 'http://nurl',
-                  'w': 728
-                }
-              ],
-              'seat': 'MOCK'
-            }
-          ],
-          'bidid': '5e5c23a5ba71e78'
-        }
-      };
-    }
-
-    function makeNativeResponse() {
-      return {
-        body: {
-          'id': '5e5c23a5ba71e77',
-          'seatbid': [
-            {
-              'bid': [
-                {
-                  'id': '6vmb3isptf',
-                  'crid': 'sortablescreative',
-                  'impid': '322add653672f67',
-                  'price': 1.55,
-                  'adm': '{"native":{"link":{"clicktrackers":[],"url":"https://www.sortable.com/"},"assets":[{"title":{"text":"Ads With Sortable"},"id":1},{"img":{"w":790,"url":"https://path.to/image","h":294},"id":2},{"img":{"url":"https://path.to/icon"},"id":3},{"data":{"value":"Body here"},"id":4},{"data":{"value":"Learn More"},"id":5},{"data":{"value":"Sortable"},"id":6}],"imptrackers":[],"ver":1}}',
-                  'ext': {'ad_format': 'native'},
-                  'h': 90,
-                  'nurl': 'http://nurl',
-                  'w': 728
-                }
-              ],
-              'seat': 'MOCK'
-            }
-          ],
-          'bidid': '5e5c23a5ba71e77'
-        }
-      };
-    }
-
-    const expectedBid = {
-      'requestId': '322add653672f68',
-      'cpm': 1.22,
-      'width': 728,
-      'height': 90,
-      'creativeId': 'sortablescreative',
-      'dealId': null,
-      'currency': 'USD',
-      'netRevenue': true,
-      'mediaType': 'banner',
-      'ttl': 60,
-      'ad': '<!-- creative --><div style="position:absolute;left:0px;top:0px;visibility:hidden;"><img src="http://nurl"></div>'
-    };
-
-    const expectedNativeBid = {
-      'requestId': '322add653672f67',
-      'cpm': 1.55,
-      'width': 728,
-      'height': 90,
-      'creativeId': 'sortablescreative',
-      'dealId': null,
-      'currency': 'USD',
-      'netRevenue': true,
-      'sortable': { 'ad_format': 'native' },
-      'mediaType': 'native',
-      'ttl': 60,
-      'native': {
-        'clickUrl': 'https://www.sortable.com/',
-        'title': 'Ads With Sortable',
-        'image': {'url': 'https://path.to/image', 'height': 294, 'width': 790},
-        'icon': 'https://path.to/icon',
-        'body': 'Body here',
-        'cta': 'Learn More',
-        'sponsoredBy': 'Sortable'
-      }
-    };
-
-    it('should get the correct bid response', function () {
-      let result = spec.interpretResponse(makeResponse());
-      expect(result.length).to.equal(1);
-      expect(result[0]).to.deep.equal(expectedBid);
-    });
-
-    it('should handle a missing crid', function () {
-      let noCridResponse = makeResponse();
-      delete noCridResponse.body.seatbid[0].bid[0].crid;
-      const fallbackCrid = noCridResponse.body.seatbid[0].bid[0].id;
-      let noCridResult = Object.assign({}, expectedBid, {'creativeId': fallbackCrid});
-      let result = spec.interpretResponse(noCridResponse);
-      expect(result.length).to.equal(1);
-      expect(result[0]).to.deep.equal(noCridResult);
-    });
-
-    it('should handle a missing nurl', function () {
-      let noNurlResponse = makeResponse();
-      delete noNurlResponse.body.seatbid[0].bid[0].nurl;
-      let noNurlResult = Object.assign({}, expectedBid);
-      noNurlResult.ad = '<!-- creative -->';
-      let result = spec.interpretResponse(noNurlResponse);
-      expect(result.length).to.equal(1);
-      expect(result[0]).to.deep.equal(noNurlResult);
-    });
-
-    it('should handle a missing adm', function () {
-      let noAdmResponse = makeResponse();
-      delete noAdmResponse.body.seatbid[0].bid[0].adm;
-      let noAdmResult = Object.assign({}, expectedBid);
-      delete noAdmResult.ad;
-      noAdmResult.adUrl = 'http://nurl';
-      let result = spec.interpretResponse(noAdmResponse);
-      expect(result.length).to.equal(1);
-      expect(result[0]).to.deep.equal(noAdmResult);
-    });
-
-    it('handles empty bid response', function () {
-      let response = {
-        body: {
-          'id': '5e5c23a5ba71e78',
-          'seatbid': []
-        }
-      };
-      let result = spec.interpretResponse(response);
-      expect(result.length).to.equal(0);
-    });
-
-    it('should get the correct native bid response', function () {
-      let result = spec.interpretResponse(makeNativeResponse());
-      expect(result.length).to.equal(1);
-      expect(result[0]).to.deep.equal(expectedNativeBid);
-    });
-
-    it('fail to parse invalid native bid response', function () {
-      let response = makeNativeResponse();
-      response.body.seatbid[0].bid[0].adm = '<!-- creative -->';
-      let result = spec.interpretResponse(response);
-      expect(result.length).to.equal(0);
-    });
-
-    it('should keep custom properties', () => {
-      const customProperties = {test: 'a test message', param: {testParam: 1}};
-      const expectedResult = Object.assign({}, expectedBid, {[spec.code]: customProperties});
-      const response = makeResponse();
-      response.body.seatbid[0].bid[0].ext = customProperties;
-      const result = spec.interpretResponse(response);
-      expect(result.length).to.equal(1);
-      expect(result[0]).to.deep.equal(expectedResult);
-    });
-
-    it('should handle instream response', () => {
-      const response = makeResponse();
-      const bid = response.body.seatbid[0].bid[0];
-      delete bid.nurl;
-      bid.ext = {ad_format: 'instream'};
-      const result = spec.interpretResponse(response)[0];
-      expect(result.mediaType).to.equal('video');
-      expect(result.vastXml).to.equal(bid.adm);
-    });
-
-    it('should return iframe syncs', () => {
-      const syncResponse = {
-        ext: {
-          sync_dsps: [
-            ['iframe', 'http://example-dsp/sync-iframe'],
-            ['image', 'http://example-dsp/sync-image']
-          ]
-        }
-      };
-      expect(spec.getUserSyncs({iframeEnabled: true}, [{body: syncResponse}])).to.deep.equal([{
-        type: 'iframe',
-        url: 'http://example-dsp/sync-iframe'
-      }]);
-    });
-
-    it('should return image syncs', () => {
-      const syncResponse = {
-        ext: {
-          sync_dsps: [
-            ['iframe', 'http://example-dsp/sync-iframe'],
-            ['image', 'http://example-dsp/sync-image']
-          ]
-        }
-      };
-      expect(spec.getUserSyncs({pixelEnabled: true}, [{body: syncResponse}])).to.deep.equal([{
-        type: 'image',
-        url: 'http://example-dsp/sync-image'
-      }]);
-    });
-  });
-});
diff --git a/test/spec/modules/sovrnAnalyticsAdapter_spec.js b/test/spec/modules/sovrnAnalyticsAdapter_spec.js
index d6795331417..68552eb3d8a 100644
--- a/test/spec/modules/sovrnAnalyticsAdapter_spec.js
+++ b/test/spec/modules/sovrnAnalyticsAdapter_spec.js
@@ -1,8 +1,10 @@
 import sovrnAnalyticsAdapter from '../../../modules/sovrnAnalyticsAdapter.js';
-import { expect } from 'chai';
+import {expect} from 'chai';
 import {config} from 'src/config.js';
 import adaptermanager from 'src/adapterManager.js';
-import { server } from 'test/mocks/xhr.js';
+import {server} from 'test/mocks/xhr.js';
+import {expectEvents, fireEvents} from '../../helpers/analytics.js';
+
 var assert = require('assert');
 
 let events = require('src/events');
@@ -195,14 +197,7 @@ describe('Sovrn Analytics Adapter', function () {
           sovrnId: 123
         }
       });
-
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-
-      sinon.assert.callCount(sovrnAnalyticsAdapter.track, 5);
+      expectEvents().to.beTrackedBy(sovrnAnalyticsAdapter.track);
     });
 
     it('should catch no events if no affiliate id', function () {
@@ -211,13 +206,7 @@ describe('Sovrn Analytics Adapter', function () {
         options: {
         }
       });
-
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-
+      fireEvents();
       sinon.assert.callCount(sovrnAnalyticsAdapter.track, 0);
     });
   });
diff --git a/test/spec/modules/sovrnBidAdapter_spec.js b/test/spec/modules/sovrnBidAdapter_spec.js
index 54ccff870eb..02a3d86b29a 100644
--- a/test/spec/modules/sovrnBidAdapter_spec.js
+++ b/test/spec/modules/sovrnBidAdapter_spec.js
@@ -1,403 +1,689 @@
-import {expect} from 'chai';
-import {LogError, spec} from 'modules/sovrnBidAdapter.js';
-import {newBidder} from 'src/adapters/bidderFactory.js';
-
-const ENDPOINT = `https://ap.lijit.com/rtb/bid?src=$$REPO_AND_VERSION$$`;
+import {expect} from 'chai'
+import {spec} from 'modules/sovrnBidAdapter.js'
+import {config} from 'src/config.js'
+import * as utils from 'src/utils.js'
+
+const ENDPOINT = `https://ap.lijit.com/rtb/bid?src=$$REPO_AND_VERSION$$`
+
+const baseBidRequest = {
+  bidder: 'sovrn',
+  params: {
+    tagid: 403370
+  },
+  adUnitCode: 'adunit-code',
+  sizes: [
+    [300, 250],
+    [300, 600]
+  ],
+  bidId: '30b31c1838de1e',
+  bidderRequestId: '22edbae2733bf6',
+  auctionId: '1d1a030790a475',
+}
+const baseBidderRequest = {
+  refererInfo: {
+    page: 'http://example.com/page.html',
+    domain: 'example.com',
+  }
+}
 
 describe('sovrnBidAdapter', function() {
-  const adapter = newBidder(spec);
-
   describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'sovrn',
-      'params': {
-        'tagid': '403370'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250],
-        [300, 600]
-      ],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
     it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
+      expect(spec.isBidRequestValid(baseBidRequest)).to.equal(true)
+    })
 
     it('should return false when tagid not passed correctly', function () {
-      bid.params.tagid = 'ABCD';
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
+      const bidRequest = {
+        ...baseBidRequest,
+        params: {
+          ...baseBidRequest.params,
+          tagid: 'ABCD'
+        },
+      }
+
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false)
+    })
 
     it('should return false when require params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      bid.params = {};
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
+      const bidRequest = {
+        ...baseBidRequest,
+        params: {}
+      }
+
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false)
+    })
+
+    it('should return false when require video params are not passed', function () {
+      const bidRequest = {
+        ...baseBidRequest,
+        mediaTypes: {
+          'video': {
+          }
+        }
+      }
+
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false)
+    })
+  })
 
   describe('buildRequests', function () {
-    const bidRequests = [{
-      'bidder': 'sovrn',
-      'params': {
-        'tagid': '403370'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250],
-        [300, 600]
-      ],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475'
-    }];
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'http://example.com/page.html',
-      }
-    };
-    const request = spec.buildRequests(bidRequests, bidderRequest);
-
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request.method).to.equal('POST');
-    });
-
-    it('attaches source and version to endpoint URL as query params', function () {
-      expect(request.url).to.equal(ENDPOINT)
-    });
-
-    it('sets the proper banner object', function() {
+    describe('basic bid parameters', function() {
+      const request = spec.buildRequests([baseBidRequest], baseBidderRequest)
       const payload = JSON.parse(request.data)
-      expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}])
-      expect(payload.imp[0].banner.w).to.equal(1)
-      expect(payload.imp[0].banner.h).to.equal(1)
-    })
 
-    it('includes the ad unit code int the request', function() {
-      const payload = JSON.parse(request.data);
-      expect(payload.imp[0].adunitcode).to.equal('adunit-code')
+      it('sends bid request to our endpoint via POST', function () {
+        expect(request.method).to.equal('POST')
+      })
+
+      it('attaches source and version to endpoint URL as query params', function () {
+        expect(request.url).to.equal(ENDPOINT)
+      })
+
+      it('sets the proper banner object', function() {
+        const bannerBidRequest = {
+          ...baseBidRequest,
+          mediaTypes: {
+            banner: {}
+          }
+        }
+        const request = spec.buildRequests([bannerBidRequest], baseBidderRequest)
+        const payload = JSON.parse(request.data)
+        const impression = payload.imp[0]
+
+        expect(impression.banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}])
+        expect(impression.banner.w).to.equal(1)
+        expect(impression.banner.h).to.equal(1)
+      })
+
+      it('sets the proper video object with sizes defined', function() {
+        const width = 300
+        const height = 250
+        const mimes = ['video/mp4', 'application/javascript']
+        const protocols = [2, 5]
+        const minduration = 5
+        const maxduration = 60
+        const startdelay = 0
+        const videoBidRequest = {
+          ...baseBidRequest,
+          mediaTypes: {
+            video: {
+              mimes,
+              protocols,
+              playerSize: [[width, height], [360, 240]],
+              minduration,
+              maxduration,
+              startdelay
+            }
+          }
+        }
+        const request = spec.buildRequests([videoBidRequest], baseBidderRequest)
+        const payload = JSON.parse(request.data)
+        const impression = payload.imp[0]
+
+        expect(impression.video.w).to.equal(width)
+        expect(impression.video.h).to.equal(height)
+        expect(impression.video.mimes).to.have.same.members(mimes)
+        expect(impression.video.protocols).to.have.same.members(protocols)
+        expect(impression.video.minduration).to.equal(minduration)
+        expect(impression.video.maxduration).to.equal(maxduration)
+        expect(impression.video.startdelay).to.equal(startdelay)
+      })
+
+      it('sets the proper video object wihtout sizes defined but video sizes defined', function() {
+        const width = 360
+        const height = 240
+        const mimes = ['video/mp4', 'application/javascript']
+        const protocols = [2, 5]
+        const minduration = 5
+        const maxduration = 60
+        const startdelay = 0
+        const modifiedBidRequest = baseBidRequest;
+        delete modifiedBidRequest.sizes;
+        const videoBidRequest = {
+          ...modifiedBidRequest,
+          mediaTypes: {
+            video: {
+              mimes,
+              protocols,
+              playerSize: [[width, height], [360, 240]],
+              minduration,
+              maxduration,
+              startdelay
+            }
+          }
+        }
+        const request = spec.buildRequests([videoBidRequest], baseBidderRequest)
+        const payload = JSON.parse(request.data)
+        const impression = payload.imp[0]
+
+        expect(impression.video.w).to.equal(width)
+        expect(impression.video.h).to.equal(height)
+        expect(impression.video.mimes).to.have.same.members(mimes)
+        expect(impression.video.protocols).to.have.same.members(protocols)
+        expect(impression.video.minduration).to.equal(minduration)
+        expect(impression.video.maxduration).to.equal(maxduration)
+        expect(impression.video.startdelay).to.equal(startdelay)
+      })
+
+      it('gets correct site info', function() {
+        expect(payload.site.page).to.equal('http://example.com/page.html')
+        expect(payload.site.domain).to.equal('example.com')
+      })
+
+      it('includes the ad unit code in the request', function() {
+        const impression = payload.imp[0]
+        expect(impression.adunitcode).to.equal('adunit-code')
+      })
+
+      it('converts tagid to string', function () {
+        expect(request.data).to.contain('"tagid":"403370"')
+      })
     })
 
     it('accepts a single array as a size', function() {
-      const singleSize = [{
-        'bidder': 'sovrn',
-        'params': {
-          'tagid': '403370',
-          'iv': 'vet'
+      const singleSizeBidRequest = {
+        ...baseBidRequest,
+        params: {
+          iv: 'vet'
+        },
+        sizes: [300, 250],
+        mediaTypes: {
+          banner: {}
         },
-        'adUnitCode': 'adunit-code',
-        'sizes': [300, 250],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475'
-      }]
-      const bidderRequest = {
-        refererInfo: {
-          referer: 'http://example.com/page.html',
-        }
       }
-      const request = spec.buildRequests(singleSize, bidderRequest)
+      const request = spec.buildRequests([singleSizeBidRequest], baseBidderRequest)
       const payload = JSON.parse(request.data)
-      expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}])
-      expect(payload.imp[0].banner.w).to.equal(1)
-      expect(payload.imp[0].banner.h).to.equal(1)
+      const impression = payload.imp[0]
+
+      expect(impression.banner.format).to.deep.equal([{w: 300, h: 250}])
+      expect(impression.banner.w).to.equal(1)
+      expect(impression.banner.h).to.equal(1)
     })
 
     it('sends \'iv\' as query param if present', function () {
-      const ivBidRequests = [{
-        'bidder': 'sovrn',
-        'params': {
-          'tagid': '403370',
-          'iv': 'vet'
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [
-          [300, 250],
-          [300, 600]
-        ],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475'
-      }];
-      const bidderRequest = {
-        refererInfo: {
-          referer: 'http://example.com/page.html',
+      const ivBidRequest = {
+        ...baseBidRequest,
+        params: {
+          iv: 'vet'
         }
-      };
-      const request = spec.buildRequests(ivBidRequests, bidderRequest);
+      }
+      const request = spec.buildRequests([ivBidRequest], baseBidderRequest)
 
       expect(request.url).to.contain('iv=vet')
-    });
+    })
 
     it('sends gdpr info if exists', function () {
-      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
-      let bidderRequest = {
-        'bidderCode': 'sovrn',
-        'auctionId': '1d1a030790a475',
-        'bidderRequestId': '22edbae2733bf6',
-        'timeout': 3000,
+      const bidderRequest = {
+        ...baseBidderRequest,
+        bidderCode: 'sovrn',
+        auctionId: '1d1a030790a475',
+        bidderRequestId: '22edbae2733bf6',
+        timeout: 3000,
         gdprConsent: {
-          consentString: consentString,
+          consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==',
           gdprApplies: true
         },
-        refererInfo: {
-          referer: 'http://example.com/page.html',
-        }
-      };
-      bidderRequest.bids = bidRequests;
-
-      const data = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
+        bids: [baseBidRequest]
+      }
+      const { regs, user } = JSON.parse(spec.buildRequests([baseBidRequest], bidderRequest).data)
 
-      expect(data.regs.ext.gdpr).to.exist.and.to.be.a('number');
-      expect(data.regs.ext.gdpr).to.equal(1);
-      expect(data.user.ext.consent).to.exist.and.to.be.a('string');
-      expect(data.user.ext.consent).to.equal(consentString);
-    });
+      expect(regs.ext.gdpr).to.exist.and.to.be.a('number')
+      expect(regs.ext.gdpr).to.equal(1)
+      expect(user.ext.consent).to.exist.and.to.be.a('string')
+      expect(user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString)
+    })
 
     it('should send us_privacy if bidderRequest has a value for uspConsent', function () {
-      let uspString = '1NYN';
-      let bidderRequest = {
-        'bidderCode': 'sovrn',
-        'auctionId': '1d1a030790a475',
-        'bidderRequestId': '22edbae2733bf6',
-        'timeout': 3000,
-        uspConsent: uspString,
-        refererInfo: {
-          referer: 'http://example.com/page.html',
-        }
-      };
-      bidderRequest.bids = bidRequests;
-
-      const data = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data);
-
-      expect(data.regs.ext['us_privacy']).to.equal(uspString);
-    });
-
-    it('converts tagid to string', function () {
-      const ivBidRequests = [{
-        'bidder': 'sovrn',
-        'params': {
-          'tagid': 403370,
-          'iv': 'vet'
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [
-          [300, 250],
-          [300, 600]
-        ],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475'
-      }];
       const bidderRequest = {
-        refererInfo: {
-          referer: 'http://example.com/page.html',
-        }
-      };
-      const request = spec.buildRequests(ivBidRequests, bidderRequest);
+        ...baseBidderRequest,
+        bidderCode: 'sovrn',
+        auctionId: '1d1a030790a475',
+        bidderRequestId: '22edbae2733bf6',
+        timeout: 3000,
+        uspConsent: '1NYN',
+        bids: [baseBidRequest]
+      }
+      const data = JSON.parse(spec.buildRequests([baseBidRequest], bidderRequest).data)
 
-      expect(request.data).to.contain('"tagid":"403370"')
-    });
+      expect(data.regs.ext['us_privacy']).to.equal(bidderRequest.uspConsent)
+    })
 
     it('should add schain if present', function() {
-      const schainRequests = [{
-        'bidder': 'sovrn',
-        'params': {
-          'tagid': 403370
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [
-          [300, 250],
-          [300, 600]
-        ],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-        'schain': {
-          'ver': '1.0',
-          'complete': 1,
-          'nodes': [
+      const schainRequest = {
+        ...baseBidRequest,
+        schain: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
             {
-              'asi': 'directseller.com',
-              'sid': '00001',
-              'rid': 'BidRequest1',
-              'hp': 1
+              asi: 'directseller.com',
+              sid: '00001',
+              rid: 'BidRequest1',
+              hp: 1
             }
           ]
         }
-      }].concat(bidRequests);
-      const bidderRequest = {
-        refererInfo: {
-          referer: 'http://example.com/page.html',
-        }
-      };
-      const data = JSON.parse(spec.buildRequests(schainRequests, bidderRequest).data);
+      }
+      const schainRequests = [schainRequest, baseBidRequest]
+      const data = JSON.parse(spec.buildRequests(schainRequests, baseBidderRequest).data)
 
       expect(data.source.ext.schain.nodes.length).to.equal(1)
-    });
+    })
 
-    it('should add the unifiedID if present', function() {
-      const digitrustRequests = [{
-        'bidder': 'sovrn',
-        'params': {
-          'tagid': 403370
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [
-          [300, 250],
-          [300, 600]
-        ],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-        'userId': {
-          'tdid': 'SOMESORTOFID',
+    it('should add eds to the bid request', function() {
+      const criteoIdRequest = {
+        ...baseBidRequest,
+        userId: {
+          criteoId: 'A_CRITEO_ID',
+          tdid: 'SOMESORTOFID',
         }
-      }].concat(bidRequests);
-      const bidderRequest = {
-        refererInfo: {
-          referer: 'http://example.com/page.html',
+      }
+      const criteoIdRequests = [criteoIdRequest, baseBidRequest]
+      const ext = JSON.parse(spec.buildRequests(criteoIdRequests, baseBidderRequest).data).user.ext
+      const firstEID = ext.eids[0]
+      const secondEID = ext.eids[1]
+
+      expect(firstEID.source).to.equal('criteo.com')
+      expect(firstEID.uids[0].id).to.equal('A_CRITEO_ID')
+      expect(firstEID.uids[0].atype).to.equal(1)
+      expect(secondEID.source).to.equal('adserver.org')
+      expect(secondEID.uids[0].id).to.equal('SOMESORTOFID')
+      expect(secondEID.uids[0].ext.rtiPartner).to.equal('TDID')
+      expect(secondEID.uids[0].atype).to.equal(1)
+      expect(ext.prebid_criteoid).to.equal('A_CRITEO_ID')
+    })
+
+    it('should ignore empty segments', function() {
+      const request = spec.buildRequests([baseBidRequest], baseBidderRequest)
+      const payload = JSON.parse(request.data)
+
+      expect(payload.imp[0].ext).to.be.undefined
+    })
+
+    it('should pass the segments param value as trimmed deal ids array', function() {
+      const segmentsRequest = {
+        ...baseBidRequest,
+        params: {
+          segments: ' test1,test2 '
         }
-      };
+      }
+      const request = spec.buildRequests([segmentsRequest], baseBidderRequest)
+      const deals = JSON.parse(request.data).imp[0].ext.deals
+
+      expect(deals[0]).to.equal('test1')
+      expect(deals[1]).to.equal('test2')
+    })
+    it('should use the floor provided from the floor module if present', function() {
+      const floorBid = {
+        ...baseBidRequest,
+        getFloor: () => ({currency: 'USD', floor: 1.10}),
+        params: {
+          tagid: 1234,
+          bidfloor: 2.00
+        }
+      }
+      const request = spec.buildRequests([floorBid], baseBidderRequest)
+      const payload = JSON.parse(request.data)
 
-      const data = JSON.parse(spec.buildRequests(digitrustRequests, bidderRequest).data);
-      expect(data.user.ext.eids[0].source).to.equal('adserver.org')
-      expect(data.user.ext.eids[0].uids[0].id).to.equal('SOMESORTOFID')
-      expect(data.user.ext.eids[0].uids[0].ext.rtiPartner).to.equal('TDID')
+      expect(payload.imp[0].bidfloor).to.equal(1.10)
     })
-  });
+    it('should use the floor from the param if there is no floor from the floor module', function() {
+      const floorBid = {
+        ...baseBidRequest,
+        getFloor: () => ({})
+      }
+      floorBid.params = {
+        tagid: 1234,
+        bidfloor: 2.00
+      }
+      const request = spec.buildRequests([floorBid], baseBidderRequest)
+      const impression = JSON.parse(request.data).imp[0]
+
+      expect(impression.bidfloor).to.equal(2.00)
+    })
+    describe('First Party Data', function () {
+      it('should provide first party data if provided', function() {
+        const ortb2 = {
+          site: {
+            keywords: 'test keyword'
+          },
+          user: {
+            data: 'some user data'
+          }
+        };
+
+        const request = spec.buildRequests([baseBidRequest], {...baseBidderRequest, ortb2})
+        const { user, site } = JSON.parse(request.data)
+
+        expect(user.data).to.equal('some user data')
+        expect(site.keywords).to.equal('test keyword')
+        expect(site.page).to.equal('http://example.com/page.html')
+        expect(site.domain).to.equal('example.com')
+      })
+      it('should append impression first party data', function () {
+        const fpdBidRequest = {
+          ...baseBidRequest,
+          ortb2Imp: {
+            ext: {
+              data: {
+                pbadslot: 'homepage-top-rect',
+                adUnitSpecificAttribute: '123'
+              }
+            }
+          }
+        }
+        const request = spec.buildRequests([fpdBidRequest], baseBidderRequest)
+        const payload = JSON.parse(request.data)
+
+        expect(payload.imp[0].ext.data.pbadslot).to.equal('homepage-top-rect')
+        expect(payload.imp[0].ext.data.adUnitSpecificAttribute).to.equal('123')
+      })
+      it('should not overwrite deals when impression fpd is present', function() {
+        const fpdBid = {
+          ...baseBidRequest,
+          params: {
+            segments: 'seg1, seg2'
+          },
+          ortb2Imp: {
+            ext: {
+              data: {
+                pbadslot: 'homepage-top-rect',
+                adUnitSpecificAttribute: '123'
+              }
+            }
+          }
+        }
+        const request = spec.buildRequests([fpdBid], baseBidderRequest)
+        const impression = JSON.parse(request.data).imp[0]
+
+        expect(impression.ext.data.pbadslot).to.equal('homepage-top-rect')
+        expect(impression.ext.data.adUnitSpecificAttribute).to.equal('123')
+        expect(impression.ext.deals).to.deep.equal(['seg1', 'seg2'])
+      })
+    })
+  })
+
   describe('interpretResponse', function () {
-    let response;
+    let response
+    const baseResponse = {
+      requestId: '263c448586f5a1',
+      cpm: 0.45882675,
+      width: 728,
+      height: 90,
+      creativeId: 'creativelycreatedcreativecreative',
+      dealId: null,
+      currency: 'USD',
+      netRevenue: true,
+      mediaType: 'banner',
+      ttl: 90,
+      meta: { advertiserDomains: [] },
+      ad: decodeURIComponent(`<!-- Creative --><img src="<!-- NURL -->">`),
+    }
+    const videoBid = {
+      id: 'a_403370_332fdb9b064040ddbec05891bd13ab28',
+      crid: 'creativelycreatedcreativecreative',
+      impid: '263c448586f5a1',
+      price: 0.45882675,
+      nurl: '',
+      adm: '<VAST version="4.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST">key%3Dvalue</VAST>',
+      h: 480,
+      w: 640
+    }
+    const bannerBid = {
+      id: 'a_403370_332fdb9b064040ddbec05891bd13ab28',
+      crid: 'creativelycreatedcreativecreative',
+      impid: '263c448586f5a1',
+      price: 0.45882675,
+      nurl: '<!-- NURL -->',
+      adm: '<!-- Creative -->',
+      h: 90,
+      w: 728
+    }
+
     beforeEach(function () {
       response = {
         body: {
-          'id': '37386aade21a71',
-          'seatbid': [{
-            'bid': [{
-              'id': 'a_403370_332fdb9b064040ddbec05891bd13ab28',
-              'crid': 'creativelycreatedcreativecreative',
-              'impid': '263c448586f5a1',
-              'price': 0.45882675,
-              'nurl': '<!-- NURL -->',
-              'adm': '<!-- Creative -->',
-              'h': 90,
-              'w': 728
+          id: '37386aade21a71',
+          seatbid: [{
+            bid: [{
+              ...bannerBid
             }]
           }]
         }
-      };
-    });
+      }
+    })
 
     it('should get the correct bid response', function () {
-      let expectedResponse = [{
-        'requestId': '263c448586f5a1',
-        'cpm': 0.45882675,
-        'width': 728,
-        'height': 90,
-        'creativeId': 'creativelycreatedcreativecreative',
-        'dealId': null,
-        'currency': 'USD',
-        'netRevenue': true,
-        'mediaType': 'banner',
-        'ad': decodeURIComponent(`<!-- Creative --><img src=<!-- NURL -->>`),
-        'ttl': 60000
-      }];
-
-      let result = spec.interpretResponse(response);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
+      const expectedResponse = {
+        requestId: '263c448586f5a1',
+        cpm: 0.45882675,
+        width: 728,
+        height: 90,
+        creativeId: 'creativelycreatedcreativecreative',
+        dealId: null,
+        currency: 'USD',
+        netRevenue: true,
+        mediaType: 'banner',
+        ttl: 60000,
+        meta: { advertiserDomains: [] },
+        ad: decodeURIComponent(`<!-- Creative --><img src=<!-- NURL -->>`)
+      }
+      const result = spec.interpretResponse(response)
+
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse))
+    })
 
     it('crid should default to the bid id if not on the response', function () {
-      delete response.body.seatbid[0].bid[0].crid;
-      let expectedResponse = [{
-        'requestId': '263c448586f5a1',
-        'cpm': 0.45882675,
-        'width': 728,
-        'height': 90,
-        'creativeId': response.body.seatbid[0].bid[0].id,
-        'dealId': null,
-        'currency': 'USD',
-        'netRevenue': true,
-        'mediaType': 'banner',
-        'ad': decodeURIComponent(`<!-- Creative --><img src=<!-- NURL -->>`),
-        'ttl': 60000
-      }];
-
-      let result = spec.interpretResponse(response);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
+      delete response.body.seatbid[0].bid[0].crid
+
+      const expectedResponse = {
+        ...baseResponse,
+        creativeId: response.body.seatbid[0].bid[0].id,
+        ad: decodeURIComponent(`<!-- Creative --><img src="<!-- NURL -->">`),
+      }
+      const result = spec.interpretResponse(response)
+
+      expect(result[0]).to.deep.equal(expectedResponse)
+    })
 
     it('should get correct bid response when dealId is passed', function () {
-      response.body.dealid = 'baking';
-
-      let expectedResponse = [{
-        'requestId': '263c448586f5a1',
-        'cpm': 0.45882675,
-        'width': 728,
-        'height': 90,
-        'creativeId': 'creativelycreatedcreativecreative',
-        'dealId': 'baking',
-        'currency': 'USD',
-        'netRevenue': true,
-        'mediaType': 'banner',
-        'ad': decodeURIComponent(`<!-- Creative --><img src=<!-- NURL -->>`),
-        'ttl': 60000
-      }];
-
-      let result = spec.interpretResponse(response);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
-    });
+      response.body.seatbid[0].bid[0].dealid = 'baking'
+      const expectedResponse = {
+        ...baseResponse,
+        dealId: 'baking',
+      }
+      const result = spec.interpretResponse(response)
+
+      expect(result[0]).to.deep.equal(expectedResponse)
+    })
+
+    it('should get correct bid response when ttl is set', function () {
+      response.body.seatbid[0].bid[0].ext = { ttl: 480 }
+
+      const expectedResponse = {
+        ...baseResponse,
+        ttl: 480,
+      }
+      const result = spec.interpretResponse(response)
+
+      expect(result[0]).to.deep.equal(expectedResponse)
+    })
 
     it('handles empty bid response', function () {
-      let response = {
+      const response = {
         body: {
-          'id': '37386aade21a71',
-          'seatbid': []
+          id: '37386aade21a71',
+          seatbid: []
         }
-      };
-      let result = spec.interpretResponse(response);
-      expect(result.length).to.equal(0);
-    });
-  });
+      }
+      const result = spec.interpretResponse(response)
+
+      expect(result.length).to.equal(0)
+    })
+
+    it('should get the correct bid response with 2 different bids', function () {
+      const expectedVideoResponse = {
+        ...baseResponse,
+        vastXml: decodeURIComponent(videoBid.adm)
+      }
+      delete expectedVideoResponse.ad
+
+      const expectedBannerResponse = {
+        ...baseResponse
+      }
+
+      response.body.seatbid = [{ bid: [bannerBid] }, { bid: [videoBid] }]
+      const result = spec.interpretResponse(response)
+
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedBannerResponse))
+      expect(Object.keys(result[1])).to.deep.equal(Object.keys(expectedVideoResponse))
+    })
+
+    it('should get the correct bid response with 2 seatbid items', function () {
+      const expectedResponse = {
+        ...baseResponse
+      }
+      response.body.seatbid = [response.body.seatbid[0], response.body.seatbid[0]]
+
+      const result = spec.interpretResponse(response)
+
+      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse))
+      expect(Object.keys(result[1])).to.deep.equal(Object.keys(expectedResponse))
+    })
+  })
+
+  describe('interpretResponse video', function () {
+    let videoResponse
+    const bidAdm = '<VAST version="4.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.iab.com/VAST">key%3Dvalue</VAST>'
+    const decodedBidAdm = decodeURIComponent(bidAdm)
+    const baseVideoResponse = {
+      requestId: '263c448586f5a1',
+      cpm: 0.45882675,
+      width: 640,
+      height: 480,
+      creativeId: 'creativelycreatedcreativecreative',
+      dealId: null,
+      currency: 'USD',
+      netRevenue: true,
+      mediaType: 'video',
+      ttl: 90,
+      meta: { advertiserDomains: [] },
+      vastXml: decodedBidAdm
+    }
+
+    beforeEach(function () {
+      videoResponse = {
+        body: {
+          id: '37386aade21a71',
+          seatbid: [{
+            bid: [{
+              id: 'a_403370_332fdb9b064040ddbec05891bd13ab28',
+              crid: 'creativelycreatedcreativecreative',
+              impid: '263c448586f5a1',
+              price: 0.45882675,
+              nurl: '',
+              adm: bidAdm,
+              h: 480,
+              w: 640
+            }]
+          }]
+        }
+      }
+    })
+
+    it('should get the correct bid response', function () {
+      const expectedResponse = {
+        ...baseVideoResponse,
+        ttl: 60000,
+      }
+      const result = spec.interpretResponse(videoResponse)
+
+      expect(result[0]).to.have.deep.keys(expectedResponse)
+    })
+
+    it('crid should default to the bid id if not on the response', function () {
+      delete videoResponse.body.seatbid[0].bid[0].crid
+
+      const expectedResponse = {
+        ...baseVideoResponse,
+        creativeId: videoResponse.body.seatbid[0].bid[0].id,
+      }
+      const result = spec.interpretResponse(videoResponse)
+
+      expect(result[0]).to.deep.equal(expectedResponse)
+    })
+
+    it('should get correct bid response when dealId is passed', function () {
+      videoResponse.body.seatbid[0].bid[0].dealid = 'baking'
+      const expectedResponse = {
+        ...baseVideoResponse,
+        dealId: 'baking',
+      }
+      const result = spec.interpretResponse(videoResponse)
+
+      expect(result[0]).to.deep.equal(expectedResponse)
+    })
+
+    it('should get correct bid response when ttl is set', function () {
+      videoResponse.body.seatbid[0].bid[0].ext = { 'ttl': 480 }
+
+      const expectedResponse = {
+        ...baseVideoResponse,
+        ttl: 480,
+      }
+      const result = spec.interpretResponse(videoResponse)
+
+      expect(result[0]).to.deep.equal(expectedResponse)
+    })
+
+    it('handles empty bid response', function () {
+      const response = {
+        body: {
+          id: '37386aade21a71',
+          seatbid: []
+        }
+      }
+      const result = spec.interpretResponse(response)
+
+      expect(result.length).to.equal(0)
+    })
+  })
 
   describe('getUserSyncs ', function() {
-    let syncOptions = { iframeEnabled: true, pixelEnabled: false };
-    let iframeDisabledSyncOptions = { iframeEnabled: false, pixelEnabled: false };
-    let serverResponse = [
+    const syncOptions = { iframeEnabled: true, pixelEnabled: false }
+    const iframeDisabledSyncOptions = { iframeEnabled: false, pixelEnabled: false }
+    const serverResponse = [
       {
-        'body': {
-          'id': '546956d68c757f',
-          'seatbid': [
+        body: {
+          id: '546956d68c757f',
+          seatbid: [
             {
-              'bid': [
+              bid: [
                 {
-                  'id': 'a_448326_16c2ada014224bee815a90d2248322f5',
-                  'impid': '2a3826aae345f4',
-                  'price': 1.0099999904632568,
-                  'nurl': 'http://localhost/rtb/impression?bannerid=220958&campaignid=3890&rtb_tid=15588614-75d2-40ab-b27e-13d2127b3c2e&rpid=1295&seatid=seat1&zoneid=448326&cb=26900712&tid=a_448326_16c2ada014224bee815a90d2248322f5',
-                  'adm': 'yo a creative',
-                  'crid': 'cridprebidrtb',
-                  'w': 160,
-                  'h': 600
+                  id: 'a_448326_16c2ada014224bee815a90d2248322f5',
+                  impid: '2a3826aae345f4',
+                  price: 1.0099999904632568,
+                  nurl: 'http://localhost/rtb/impression?bannerid=220958&campaignid=3890&rtb_tid=15588614-75d2-40ab-b27e-13d2127b3c2e&rpid=1295&seatid=seat1&zoneid=448326&cb=26900712&tid=a_448326_16c2ada014224bee815a90d2248322f5',
+                  adm: 'yo a creative',
+                  crid: 'cridprebidrtb',
+                  w: 160,
+                  h: 600
                 },
                 {
-                  'id': 'a_430392_beac4c1515da4576acf6cb9c5340b40c',
-                  'impid': '3cf96fd26ed4c5',
-                  'price': 1.0099999904632568,
-                  'nurl': 'http://localhost/rtb/impression?bannerid=220957&campaignid=3890&rtb_tid=5bc0e68b-3492-448d-a6f9-26fa3fd0b646&rpid=1295&seatid=seat1&zoneid=430392&cb=62735099&tid=a_430392_beac4c1515da4576acf6cb9c5340b40c',
-                  'adm': 'yo a creative',
-                  'crid': 'cridprebidrtb',
-                  'w': 300,
-                  'h': 250
+                  id: 'a_430392_beac4c1515da4576acf6cb9c5340b40c',
+                  impid: '3cf96fd26ed4c5',
+                  price: 1.0099999904632568,
+                  nurl: 'http://localhost/rtb/impression?bannerid=220957&campaignid=3890&rtb_tid=5bc0e68b-3492-448d-a6f9-26fa3fd0b646&rpid=1295&seatid=seat1&zoneid=430392&cb=62735099&tid=a_430392_beac4c1515da4576acf6cb9c5340b40c',
+                  adm: 'yo a creative',
+                  crid: 'cridprebidrtb',
+                  w: 300,
+                  h: 250
                 },
               ]
             }
           ],
-          'ext': {
-            'iid': 13487408,
+          ext: {
+            iid: 13487408,
             sync: {
               pixels: [
                 {
@@ -410,107 +696,83 @@ describe('sovrnBidAdapter', function() {
             }
           }
         },
-        'headers': {}
+        headers: {}
       }
-    ];
+    ]
 
     it('should return if iid present on server response & iframe syncs enabled', function() {
-      const expectedReturnStatement = [
-        {
-          'type': 'iframe',
-          'url': 'https://ap.lijit.com/beacon?informer=13487408',
-        }
-      ];
-      const returnStatement = spec.getUserSyncs(syncOptions, serverResponse);
-      expect(returnStatement[0]).to.deep.equal(expectedReturnStatement[0]);
-    });
+      const expectedReturnStatement = {
+        type: 'iframe',
+        url: 'https://ap.lijit.com/beacon?informer=13487408',
+      }
+      const returnStatement = spec.getUserSyncs(syncOptions, serverResponse)
+
+      expect(returnStatement[0]).to.deep.equal(expectedReturnStatement)
+    })
 
     it('should include gdpr consent string if present', function() {
       const gdprConsent = {
         gdprApplies: 1,
         consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A=='
       }
-      const expectedReturnStatement = [
-        {
-          'type': 'iframe',
-          'url': `https://ap.lijit.com/beacon?gdpr_consent=${gdprConsent.consentString}&informer=13487408`,
-        }
-      ];
-      const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent, '');
-      expect(returnStatement[0]).to.deep.equal(expectedReturnStatement[0]);
-    });
+      const expectedReturnStatement = {
+        type: 'iframe',
+        url: `https://ap.lijit.com/beacon?gdpr_consent=${gdprConsent.consentString}&informer=13487408`,
+      }
+
+      const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent, '')
+
+      expect(returnStatement[0]).to.deep.equal(expectedReturnStatement)
+    })
 
     it('should include us privacy string if present', function() {
-      const uspString = '1NYN';
-      const expectedReturnStatement = [
-        {
-          'type': 'iframe',
-          'url': `https://ap.lijit.com/beacon?us_privacy=${uspString}&informer=13487408`,
-        }
-      ];
-      const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, null, uspString);
-      expect(returnStatement[0]).to.deep.equal(expectedReturnStatement[0]);
-    });
+      const uspString = '1NYN'
+      const expectedReturnStatement = {
+        type: 'iframe',
+        url: `https://ap.lijit.com/beacon?us_privacy=${uspString}&informer=13487408`,
+      }
+
+      const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, null, uspString)
+
+      expect(returnStatement[0]).to.deep.equal(expectedReturnStatement)
+    })
 
     it('should include all privacy strings if present', function() {
       const gdprConsent = {
         gdprApplies: 1,
         consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A=='
       }
-      const uspString = '1NYN';
-      const expectedReturnStatement = [
-        {
-          'type': 'iframe',
-          'url': `https://ap.lijit.com/beacon?gdpr_consent=${gdprConsent.consentString}&us_privacy=${uspString}&informer=13487408`,
-        }
-      ];
-      const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent, uspString);
-      expect(returnStatement[0]).to.deep.equal(expectedReturnStatement[0]);
-    });
+      const uspString = '1NYN'
+      const expectedReturnStatement = {
+        type: 'iframe',
+        url: `https://ap.lijit.com/beacon?gdpr_consent=${gdprConsent.consentString}&us_privacy=${uspString}&informer=13487408`,
+      }
+
+      const returnStatement = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent, uspString)
+
+      expect(returnStatement[0]).to.deep.equal(expectedReturnStatement)
+    })
 
     it('should not return if iid missing on server response', function() {
-      const returnStatement = spec.getUserSyncs(syncOptions, []);
-      expect(returnStatement).to.be.empty;
-    });
+      const returnStatement = spec.getUserSyncs(syncOptions, [])
+
+      expect(returnStatement).to.be.empty
+    })
 
     it('should not return if iframe syncs disabled', function() {
-      const returnStatement = spec.getUserSyncs(iframeDisabledSyncOptions, serverResponse);
-      expect(returnStatement).to.be.empty;
-    });
+      const returnStatement = spec.getUserSyncs(iframeDisabledSyncOptions, serverResponse)
+
+      expect(returnStatement).to.be.empty
+    })
 
     it('should include pixel syncs', function() {
-      let pixelEnabledOptions = { iframeEnabled: false, pixelEnabled: true };
-      const resp2 = {
-        'body': {
-          'id': '546956d68c757f-2',
-          'seatbid': [
-            {
-              'bid': [
-                {
-                  'id': 'a_448326_16c2ada014224bee815a90d2248322f5-2',
-                  'impid': '2a3826aae345f4',
-                  'price': 1.0099999904632568,
-                  'nurl': 'http://localhost/rtb/impression?bannerid=220958&campaignid=3890&rtb_tid=15588614-75d2-40ab-b27e-13d2127b3c2e&rpid=1295&seatid=seat1&zoneid=448326&cb=26900712&tid=a_448326_16c2ada014224bee815a90d2248322f5',
-                  'adm': 'yo a creative',
-                  'crid': 'cridprebidrtb',
-                  'w': 160,
-                  'h': 600
-                },
-                {
-                  'id': 'a_430392_beac4c1515da4576acf6cb9c5340b40c-2',
-                  'impid': '3cf96fd26ed4c5',
-                  'price': 1.0099999904632568,
-                  'nurl': 'http://localhost/rtb/impression?bannerid=220957&campaignid=3890&rtb_tid=5bc0e68b-3492-448d-a6f9-26fa3fd0b646&rpid=1295&seatid=seat1&zoneid=430392&cb=62735099&tid=a_430392_beac4c1515da4576acf6cb9c5340b40c',
-                  'adm': 'yo a creative',
-                  'crid': 'cridprebidrtb',
-                  'w': 300,
-                  'h': 250
-                },
-              ]
-            }
-          ],
-          'ext': {
-            'iid': 13487408,
+      const pixelEnabledOptions = { iframeEnabled: false, pixelEnabled: true }
+      const otherResponce = {
+        ...serverResponse,
+        body: {
+          ...serverResponse.body,
+          ext: {
+            iid: 13487408,
             sync: {
               pixels: [
                 {
@@ -522,27 +784,27 @@ describe('sovrnBidAdapter', function() {
               ]
             }
           }
-        },
-        'headers': {}
+        }
       }
-      const returnStatement = spec.getUserSyncs(pixelEnabledOptions, [...serverResponse, resp2]);
-      expect(returnStatement.length).to.equal(4);
+
+      const returnStatement = spec.getUserSyncs(pixelEnabledOptions, [...serverResponse, otherResponce])
+
+      expect(returnStatement.length).to.equal(4)
       expect(returnStatement).to.deep.include.members([
         { type: 'image', url: 'http://idprovider1.com' },
         { type: 'image', url: 'http://idprovider2.com' },
         { type: 'image', url: 'http://idprovider3.com' },
         { type: 'image', url: 'http://idprovider4.com' }
-      ]);
-    });
-  });
+      ])
+    })
+  })
 
   describe('prebid 3 upgrade', function() {
-    const bidRequests = [{
-      'bidder': 'sovrn',
-      'params': {
-        'tagid': '403370'
+    const bidRequest = {
+      ...baseBidRequest,
+      params: {
+        tagid: '403370'
       },
-      'adUnitCode': 'adunit-code',
       mediaTypes: {
         banner: {
           sizes: [
@@ -551,17 +813,9 @@ describe('sovrnBidAdapter', function() {
           ]
         }
       },
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475'
-    }];
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'http://example.com/page.html',
-      }
-    };
-    const request = spec.buildRequests(bidRequests, bidderRequest);
-    const payload = JSON.parse(request.data);
+    }
+    const request = spec.buildRequests([bidRequest], baseBidderRequest)
+    const payload = JSON.parse(request.data)
 
     it('gets sizes from mediaTypes.banner', function() {
       expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}])
@@ -570,8 +824,8 @@ describe('sovrnBidAdapter', function() {
     })
 
     it('gets correct site info', function() {
-      expect(payload.site.page).to.equal('http://example.com/page.html');
-      expect(payload.site.domain).to.equal('example.com');
+      expect(payload.site.page).to.equal('http://example.com/page.html')
+      expect(payload.site.domain).to.equal('example.com')
     })
   })
 })
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
index 78d17f35c69..ec99d0f7142 100644
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ b/test/spec/modules/spotxBidAdapter_spec.js
@@ -1,4 +1,7 @@
 import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {loadExternalScript} from '../../../src/adloader';
+import {isRendererRequired} from '../../../src/Renderer';
 import {spec, GOOGLE_CONSENT} from 'modules/spotxBidAdapter.js';
 
 describe('the spotx adapter', function () {
@@ -17,14 +20,14 @@ describe('the spotx adapter', function () {
   };
 
   describe('isBidRequestValid', function() {
-    var bid;
+    let bid;
 
     beforeEach(function() {
       bid = getValidBidObject();
     });
 
     it('should fail validation if the bid isn\'t defined or not an object', function() {
-      var result = spec.isBidRequestValid();
+      let result = spec.isBidRequestValid();
 
       expect(result).to.equal(false);
 
@@ -89,18 +92,23 @@ describe('the spotx adapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
   });
+
   describe('buildRequests', function() {
-    var bid, bidRequestObj;
+    let bid, bidRequestObj;
 
     beforeEach(function() {
       bid = getValidBidObject();
-      bidRequestObj = {refererInfo: {referer: 'prebid.js'}};
+      bidRequestObj = {
+        refererInfo: {
+          page: 'prebid.js'
+        }
+      };
     });
 
     it('should build a very basic request', function() {
-      var request = spec.buildRequests([bid], bidRequestObj)[0];
+      let request = spec.buildRequests([bid], bidRequestObj)[0];
       expect(request.method).to.equal('POST');
-      expect(request.url).to.equal('https://search.spotxchange.com/openrtb/2.3/dados/12345');
+      expect(request.url).to.equal('https://search.spotxchange.com/openrtb/2.3/dados/12345?src_sys=prebid');
       expect(request.bidRequest).to.equal(bidRequestObj);
       expect(request.data.id).to.equal(12345);
       expect(request.data.ext.wrap_response).to.equal(1);
@@ -125,8 +133,9 @@ describe('the spotx adapter', function () {
         page: 'prebid.js'
       });
     });
+
     it('should change request parameters based on options sent', function() {
-      var request = spec.buildRequests([bid], bidRequestObj)[0];
+      let request = spec.buildRequests([bid], bidRequestObj)[0];
       expect(request.data.imp.video.ext).to.deep.equal({
         sdk_name: 'Prebid 1+',
         versionOrtb: '2.3'
@@ -141,7 +150,6 @@ describe('the spotx adapter', function () {
         outstream_options: {foo: 'bar'},
         outstream_function: '987',
         custom: {bar: 'foo'},
-        price_floor: 123,
         start_delay: true,
         number_of_ads: 2,
         spotx_all_google_consent: 1,
@@ -151,10 +159,22 @@ describe('the spotx adapter', function () {
         position: 1
       };
 
-      bid.userId = {
-        id5id: 'id5id_1',
-        tdid: 'tdid_1'
-      };
+      bid.userIdAsEids = [{
+        source: 'adserver.org',
+        uids: [{id: 'tdid_1', atype: 1, ext: {rtiPartner: 'TDID'}}]
+      },
+      {
+        source: 'id5-sync.com',
+        uids: [{id: 'id5id_1', ext: {}}]
+      },
+      {
+        source: 'uidapi.com',
+        uids: [{
+          id: 'uid_1',
+          atype: 3
+        }]
+      }
+      ];
 
       bid.crumbs = {
         pubcid: 'pubcid_1'
@@ -191,7 +211,6 @@ describe('the spotx adapter', function () {
       });
 
       expect(request.data.imp.video.startdelay).to.equal(1);
-      expect(request.data.imp.bidfloor).to.equal(123);
       expect(request.data.ext).to.deep.equal({
         number_of_ads: 2,
         wrap_response: 1
@@ -199,22 +218,33 @@ describe('the spotx adapter', function () {
       expect(request.data.user.ext).to.deep.equal({
         consented_providers_settings: GOOGLE_CONSENT,
         eids: [{
+          source: 'adserver.org',
+          uids: [{
+            id: 'tdid_1',
+            atype: 1,
+            ext: {
+              rtiPartner: 'TDID'
+            }
+          }]
+        }, {
           source: 'id5-sync.com',
           uids: [{
-            id: 'id5id_1'
+            id: 'id5id_1',
+            ext: {}
           }]
         },
         {
-          source: 'adserver.org',
+          source: 'uidapi.com',
           uids: [{
-            id: 'tdid_1',
+            id: 'uid_1',
+            atype: 3,
             ext: {
-              rtiPartner: 'TDID'
+              rtiPartner: 'UID2'
             }
           }]
         }],
         fpc: 'pubcid_1'
-      })
+      });
 
       expect(request.data.source).to.deep.equal({
         ext: {
@@ -233,7 +263,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should process premarket bids', function() {
-      var request;
+      let request;
       sinon.stub(Date, 'now').returns(1000);
 
       bid.params.pre_market_bids = [{
@@ -271,7 +301,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass GDPR params', function() {
-      var request;
+      let request;
 
       bidRequestObj.gdprConsent = {
         consentString: 'consent123',
@@ -285,7 +315,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass CCPA us_privacy string', function() {
-      var request;
+      let request;
 
       bidRequestObj.uspConsent = '1YYY'
 
@@ -294,7 +324,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass both GDPR params and CCPA us_privacy', function() {
-      var request;
+      let request;
 
       bidRequestObj.gdprConsent = {
         consentString: 'consent123',
@@ -309,7 +339,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass min and max duration params', function() {
-      var request;
+      let request;
 
       bid.params.min_duration = 3
       bid.params.max_duration = 15
@@ -321,7 +351,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass placement_type and position params', function() {
-      var request;
+      let request;
 
       bid.params.placement_type = 2
       bid.params.position = 5
@@ -331,10 +361,99 @@ describe('the spotx adapter', function () {
       expect(request.data.imp.video.ext.placement).to.equal(2);
       expect(request.data.imp.video.ext.pos).to.equal(5);
     });
+
+    it('should pass page param and override refererInfo.referer', function() {
+      let request;
+
+      bid.params.page = 'https://example.com';
+
+      let origGetConfig = config.getConfig;
+      sinon.stub(config, 'getConfig').callsFake(function (key) {
+        if (key === 'pageUrl') {
+          return 'https://www.spotx.tv';
+        }
+        return origGetConfig.apply(config, arguments);
+      });
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.site.page).to.equal('https://example.com');
+      config.getConfig.restore();
+    });
+
+    it('should use refererInfo.referer if no page is passed', function() {
+      let request;
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.site.page).to.equal('prebid.js');
+    });
+
+    it('should set ext.wrap_response to 0 when cache url is set and ignoreBidderCacheKey is true', function() {
+      let request;
+
+      let origGetConfig = config.getConfig;
+      sinon.stub(config, 'getConfig').callsFake(function (key) {
+        if (key === 'cache') {
+          return {
+            url: 'prebidCacheLocation',
+            ignoreBidderCacheKey: true
+          };
+        }
+        if (key === 'cache.url') {
+          return 'prebidCacheLocation';
+        }
+        if (key === 'cache.ignoreBidderCacheKey') {
+          return true;
+        }
+        return origGetConfig.apply(config, arguments);
+      });
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.ext.wrap_response).to.equal(0);
+      config.getConfig.restore();
+    });
+
+    it('should pass price floor in USD from the floors module if available', function () {
+      let request;
+
+      bid.getFloor = function () {
+        return { currency: 'USD', floor: 3 };
+      }
+
+      bid.params.price_floor = 2;
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.imp.bidfloor).to.equal(3);
+    });
+
+    it('should not pass price floor if price floors module gives a non-USD currency', function () {
+      let request;
+
+      bid.getFloor = function () {
+        return { currency: 'EUR', floor: 3 };
+      }
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.imp.bidfloor).to.be.undefined;
+    });
+
+    it('if floors module is not available, should pass price floor from price_floor param if available', function () {
+      let request;
+
+      bid.params.price_floor = 2;
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.imp.bidfloor).to.equal(2);
+    });
   });
 
   describe('interpretResponse', function() {
-    var serverResponse, bidderRequestObj;
+    let serverResponse, bidderRequestObj;
 
     beforeEach(function() {
       bidderRequestObj = {
@@ -347,6 +466,7 @@ describe('the spotx adapter', function () {
             },
             bidId: 123,
             params: {
+              ad_unit: 'outstream',
               player_width: 400,
               player_height: 300,
               content_page_url: 'prebid.js',
@@ -381,6 +501,7 @@ describe('the spotx adapter', function () {
               impid: 123,
               cur: 'USD',
               price: 12,
+              adomain: ['abc.com'],
               crid: 321,
               w: 400,
               h: 300,
@@ -392,6 +513,7 @@ describe('the spotx adapter', function () {
               impid: 124,
               cur: 'USD',
               price: 13,
+              adomain: ['def.com'],
               w: 200,
               h: 100,
               ext: {
@@ -405,10 +527,11 @@ describe('the spotx adapter', function () {
     });
 
     it('should return an array of bid responses', function() {
-      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
       expect(responses).to.be.an('array').with.length(2);
       expect(responses[0].cache_key).to.equal('cache123');
       expect(responses[0].channel_id).to.equal(12345);
+      expect(responses[0].meta.advertiserDomains[0]).to.equal('abc.com');
       expect(responses[0].cpm).to.equal(12);
       expect(responses[0].creativeId).to.equal(321);
       expect(responses[0].currency).to.equal('USD');
@@ -423,6 +546,7 @@ describe('the spotx adapter', function () {
       expect(responses[1].cache_key).to.equal('cache124');
       expect(responses[1].channel_id).to.equal(12345);
       expect(responses[1].cpm).to.equal(13);
+      expect(responses[1].meta.advertiserDomains[0]).to.equal('def.com');
       expect(responses[1].creativeId).to.equal('');
       expect(responses[1].currency).to.equal('USD');
       expect(responses[1].height).to.equal(100);
@@ -434,12 +558,35 @@ describe('the spotx adapter', function () {
       expect(responses[1].videoCacheKey).to.equal('cache124');
       expect(responses[1].width).to.equal(200);
     });
+
+    it('should set the renderer attached to the bid to render immediately', function () {
+      var renderer = spec.interpretResponse(serverResponse, bidderRequestObj)[0].renderer,
+        hasRun = false;
+      expect(renderer._render).to.be.a('function');
+      renderer._render = () => {
+        hasRun = true;
+      }
+      renderer.render();
+      expect(hasRun).to.equal(true);
+    });
+
+    it('should include the url property on the renderer for Prebid Core checks', function () {
+      var renderer = spec.interpretResponse(serverResponse, bidderRequestObj)[0].renderer;
+      expect(isRendererRequired(renderer)).to.be.true;
+    });
   });
 
-  describe('oustreamRender', function() {
-    var serverResponse, bidderRequestObj;
+  describe('outstreamRender', function() {
+    let serverResponse, bidderRequestObj;
 
     beforeEach(function() {
+      sinon.stub(window.document, 'getElementById').returns({
+        clientWidth: 200,
+        appendChild: sinon.stub().callsFake(function(script) {})
+      });
+      sinon.stub(window.document, 'createElement').returns({
+        setAttribute: function () {}
+      });
       bidderRequestObj = {
         bidRequest: {
           bids: [{
@@ -489,61 +636,76 @@ describe('the spotx adapter', function () {
         }
       };
     });
+    afterEach(function () {
+      window.document.getElementById.restore();
+      window.document.createElement.restore();
+    });
 
     it('should attempt to insert the EASI script', function() {
-      var scriptTag;
+      window.document.getElementById.restore();
       sinon.stub(window.document, 'getElementById').returns({
-        appendChild: sinon.stub().callsFake(function(script) { scriptTag = script })
+        appendChild: sinon.stub().callsFake(function(script) {}),
       });
-      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      let attrs;
 
       responses[0].renderer.render(responses[0]);
-
-      expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
-      expect(scriptTag.getAttribute('src')).to.equal('https://js.spotx.tv/easi/v1/12345.js');
-      expect(scriptTag.getAttribute('data-spotx_channel_id')).to.equal('12345');
-      expect(scriptTag.getAttribute('data-spotx_vast_url')).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache123');
-      expect(scriptTag.getAttribute('data-spotx_ad_unit')).to.equal('incontent');
-      expect(scriptTag.getAttribute('data-spotx_collapse')).to.equal('0');
-      expect(scriptTag.getAttribute('data-spotx_autoplay')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_blocked_autoplay_override_mode')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_video_slot_can_autoplay')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_digitrust_opt_out')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_content_width')).to.equal('400');
-      expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('300');
-      window.document.getElementById.restore();
+      expect(loadExternalScript.called).to.be.true;
+      attrs = valuesToString(loadExternalScript.args[0][4]);
+
+      expect(attrs['data-spotx_channel_id']).to.equal('12345');
+      expect(attrs['data-spotx_vast_url']).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache123');
+      expect(attrs['data-spotx_ad_unit']).to.equal('incontent');
+      expect(attrs['data-spotx_collapse']).to.equal('0');
+      expect(attrs['data-spotx_autoplay']).to.equal('1');
+      expect(attrs['data-spotx_blocked_autoplay_override_mode']).to.equal('1');
+      expect(attrs['data-spotx_video_slot_can_autoplay']).to.equal('1');
+      expect(attrs['data-spotx_digitrust_opt_out']).to.equal('1');
+      expect(attrs['data-spotx_content_width']).to.equal('400');
+      expect(attrs['data-spotx_content_height']).to.equal('300');
+      expect(attrs['data-spotx_ad_mute']).to.equal('1');
     });
 
     it('should append into an iframe', function() {
-      var scriptTag;
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.in_iframe = 'iframeId';
+      window.document.getElementById.restore();
       sinon.stub(window.document, 'getElementById').returns({
         nodeName: 'IFRAME',
-        contentDocument: {
-          body: {
-            appendChild: sinon.stub().callsFake(function(script) { scriptTag = script })
-          }
-        }
+        clientWidth: 200,
+        appendChild: sinon.stub().callsFake(function(script) {}),
+        contentDocument: {nodeName: 'IFRAME'}
       });
 
-      bidderRequestObj.bidRequest.bids[0].params.outstream_options.in_iframe = 'iframeId';
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      responses[0].renderer.render(responses[0]);
+      expect(loadExternalScript.called).to.be.true;
+      expect(loadExternalScript.args[0][3].nodeName).to.equal('IFRAME');
+    });
 
-      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+    it('should adjust width and height to match slot clientWidth if playersize_auto_adapt is used', function() {
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
 
       responses[0].renderer.render(responses[0]);
+      expect(loadExternalScript.args[0][4]['data-spotx_content_width']).to.equal('200');
+      expect(loadExternalScript.args[0][4]['data-spotx_content_height']).to.equal('150');
+    });
 
-      expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
-      expect(scriptTag.getAttribute('src')).to.equal('https://js.spotx.tv/easi/v1/12345.js');
-      expect(scriptTag.getAttribute('data-spotx_channel_id')).to.equal('12345');
-      expect(scriptTag.getAttribute('data-spotx_vast_url')).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache123');
-      expect(scriptTag.getAttribute('data-spotx_ad_unit')).to.equal('incontent');
-      expect(scriptTag.getAttribute('data-spotx_collapse')).to.equal('0');
-      expect(scriptTag.getAttribute('data-spotx_autoplay')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_blocked_autoplay_override_mode')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_video_slot_can_autoplay')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_digitrust_opt_out')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_content_width')).to.equal('400');
-      expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('300');
-      window.document.getElementById.restore();
+    it('should use a default 4/3 ratio if playersize_auto_adapt is used and response does not contain width or height', function() {
+      delete serverResponse.body.seatbid[0].bid[0].w;
+      delete serverResponse.body.seatbid[0].bid[0].h;
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+
+      responses[0].renderer.render(responses[0]);
+      expect(loadExternalScript.args[0][4]['data-spotx_content_width']).to.equal('200');
+      expect(loadExternalScript.args[0][4]['data-spotx_content_height']).to.equal('150');
     });
   });
 });
+
+function valuesToString(obj) {
+  let newObj = {};
+  for (let prop in obj) {
+    newObj[prop] = '' + obj[prop];
+  }
+  return newObj;
+}
diff --git a/test/spec/modules/sspBCBidAdapter_spec.js b/test/spec/modules/sspBCBidAdapter_spec.js
new file mode 100644
index 00000000000..d182b9db24c
--- /dev/null
+++ b/test/spec/modules/sspBCBidAdapter_spec.js
@@ -0,0 +1,723 @@
+import { assert, expect } from 'chai';
+import { spec } from 'modules/sspBCBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const BIDDER_CODE = 'sspBC';
+const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
+const SYNC_URL = 'https://ssp.wp.pl/bidder/usersync';
+
+describe('SSPBC adapter', function () {
+  function prepareTestData() {
+    const bidderRequestId = '1041bb47b0fafa';
+    const auctionId = '8eda6d06-3d7c-4a94-9b35-74e42fbb3089';
+    const transactionId = '50259989-b5c0-4edf-8f47-b1ef5fbedf39';
+    const gdprConsent = {
+      consentString: 'BOtq-3dOtq-30BIABCPLC4-AAAAthr_7__7-_9_-_f__9uj3Or_v_f__30ccL59v_h_7v-_7fi_20nV4u_1vft9yfk1-5ctDztp505iakivHmqNeb9v_mz1_5pRP78k89r7337Ew_v8_v-b7JCON_Ig',
+      gdprApplies: true,
+    }
+    const bids = [{
+      adUnitCode: 'test_wideboard',
+      bidder: BIDDER_CODE,
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [728, 90],
+            [750, 100],
+            [750, 200]
+          ]
+        }
+      },
+      sizes: [
+        [728, 90],
+        [750, 100],
+        [750, 200]
+      ],
+      params: {
+        id: '003',
+        siteId: '8816',
+      },
+      auctionId,
+      bidderRequestId,
+      bidId: auctionId + '1',
+      transactionId,
+    },
+    {
+      adUnitCode: 'test_rectangle',
+      bidder: BIDDER_CODE,
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250]
+          ]
+        }
+      },
+      sizes: [
+        [300, 250]
+      ],
+      params: {
+        id: '005',
+        siteId: '8816',
+      },
+      auctionId,
+      bidderRequestId,
+      bidId: auctionId + '2',
+      transactionId,
+    }
+    ];
+    const bid_OneCode = {
+      adUnitCode: 'test_wideboard',
+      bidder: BIDDER_CODE,
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [728, 90],
+            [750, 100],
+            [750, 200]
+          ]
+        }
+      },
+      sizes: [
+        [728, 90],
+        [750, 100],
+        [750, 200]
+      ],
+      auctionId,
+      bidderRequestId,
+      bidId: auctionId + '1',
+      transactionId,
+    };
+    const bid_native = {
+      adUnitCode: 'test_native',
+      bidder: BIDDER_CODE,
+      mediaTypes: {
+        native: {
+          image: {
+            required: true,
+            sizes: [150, 50],
+          },
+          title: {
+            required: true,
+            len: 80
+          },
+          sponsoredBy: {
+            required: true,
+          },
+          clickUrl: {
+            required: true,
+          },
+          privacyLink: {
+            required: false,
+          },
+          body: {
+            required: true,
+          },
+          icon: {
+            required: true,
+            sizes: [50, 50]
+          }
+        }
+      },
+      sizes: [
+        [1, 1],
+      ],
+      auctionId,
+      bidderRequestId,
+      bidId: auctionId + '1',
+      transactionId,
+    };
+    const bid_video = {
+      adUnitCode: 'test_video',
+      bidder: BIDDER_CODE,
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[640, 480]],
+          mimes: ['video/mp4', 'video/x-ms-wmv', 'video/webm', 'video/3gpp', 'application/javascript'],
+          protocols: [2, 3, 5, 6],
+          api: [2],
+          maxduration: 30,
+          linearity: 1
+        }
+      },
+      sizes: [
+        [640, 480],
+      ],
+      auctionId,
+      bidderRequestId,
+      bidId: auctionId + '1',
+      transactionId,
+    };
+    const bids_timeouted = [{
+      adUnitCode: 'test_wideboard',
+      bidder: BIDDER_CODE,
+      params: [{
+        id: '003',
+        siteId: '8816',
+      }],
+      auctionId,
+      bidId: auctionId + '1',
+      timeout: 100,
+    },
+    {
+      adUnitCode: 'test_rectangle',
+      bidder: BIDDER_CODE,
+      params: [{
+        id: '005',
+        siteId: '8816',
+      }],
+      auctionId,
+      bidId: auctionId + '2',
+      timeout: 100,
+    }
+    ];
+    const bids_test = [{
+      adUnitCode: 'test_wideboard',
+      bidder: BIDDER_CODE,
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [970, 300],
+            [750, 300],
+            [750, 200],
+            [750, 100],
+            [300, 250]
+          ]
+        }
+      },
+      sizes: [
+        [970, 300],
+        [750, 300],
+        [750, 200],
+        [750, 100],
+        [300, 250]
+      ],
+      params: {
+        id: '005',
+        siteId: '235911',
+        test: 1
+      },
+      auctionId,
+      bidderRequestId,
+      bidId: auctionId + '1',
+      transactionId,
+    }];
+    const bidRequest = {
+      auctionId,
+      bidderCode: BIDDER_CODE,
+      bidderRequestId,
+      bids,
+      gdprConsent,
+      refererInfo: {
+        reachedTop: true,
+        page: 'https://test.site.pl/',
+        domain: 'test.site.pl',
+        stack: ['https://test.site.pl/'],
+      }
+    };
+    const bidRequestSingle = {
+      auctionId,
+      bidderCode: BIDDER_CODE,
+      bidderRequestId,
+      bids: [bids[0]],
+      gdprConsent,
+      refererInfo: {
+        reachedTop: true,
+        page: 'https://test.site.pl/',
+        domain: 'test.site.pl',
+        stack: ['https://test.site.pl/'],
+      }
+    };
+    const bidRequestNative = {
+      auctionId,
+      bidderCode: BIDDER_CODE,
+      bidderRequestId,
+      bids: [bid_native],
+      gdprConsent,
+      refererInfo: {
+        reachedTop: true,
+        page: 'https://test.site.pl/',
+        domain: 'test.site.pl',
+        stack: ['https://test.site.pl/'],
+      }
+    };
+    const bidRequestVideo = {
+      auctionId,
+      bidderCode: BIDDER_CODE,
+      bidderRequestId,
+      bids: [bid_video],
+      gdprConsent,
+      refererInfo: {
+        reachedTop: true,
+        page: 'https://test.site.pl/',
+        domain: 'test.site.pl',
+        stack: ['https://test.site.pl/'],
+      }
+    };
+    const bidRequestOneCode = {
+      auctionId,
+      bidderCode: BIDDER_CODE,
+      bidderRequestId,
+      bids: [bid_OneCode],
+      gdprConsent,
+      refererInfo: {
+        reachedTop: true,
+        page: 'https://test.site.pl/',
+        domain: 'test.site.pl',
+        stack: ['https://test.site.pl/'],
+      }
+    };
+    const bidRequestTest = {
+      auctionId,
+      bidderCode: BIDDER_CODE,
+      bidderRequestId,
+      bids: bids_test,
+      gdprConsent,
+      refererInfo: {
+        reachedTop: true,
+        page: 'https://test.site.pl/',
+        domain: 'test.site.pl',
+        stack: ['https://test.site.pl/'],
+      }
+    };
+    const bidRequestTestNoGDPR = {
+      auctionId,
+      bidderCode: BIDDER_CODE,
+      bidderRequestId,
+      bids: bids_test,
+      refererInfo: {
+        reachedTop: true,
+        page: 'https://test.site.pl/',
+        domain: 'test.site.pl',
+        stack: ['https://test.site.pl/'],
+      }
+    };
+    const serverResponse = {
+      'body': {
+        'id': auctionId,
+        'seatbid': [{
+          'bid': [{
+            'id': '3347324c-6889-46d2-a800-ae78a5214c06',
+            'impid': '003',
+            'siteid': '8816',
+            'slotid': '003',
+            'price': 1,
+            'adid': 'lxHWkB7OnZeso3QiN1N4',
+            'nurl': '',
+            'adm': 'AD CODE 1',
+            'adomain': ['adomain.pl'],
+            'cid': 'BZ4gAg21T5nNtxlUCDSW',
+            'crid': 'lxHWkB7OnZeso3QiN1N4',
+            'w': 728,
+            'h': 90
+          }],
+          'seat': 'dsp1',
+          'group': 0
+        }, {
+          'bid': [{
+            'id': '2d766853-ea07-4529-8299-5f0ebadc546a',
+            'impid': '005',
+            'siteid': '8816',
+            'slotid': '005',
+            'price': 2,
+            'adm': 'AD CODE 2',
+            'cid': '57744',
+            'crid': '858252',
+            'w': 300,
+            'h': 250
+          }],
+          'seat': 'dsp2',
+          'group': 0
+        }],
+        'cur': 'PLN'
+      }
+    };
+    const serverResponseSingle = {
+      'body': {
+        'id': auctionId,
+        'seatbid': [{
+          'bid': [{
+            'id': '3347324c-6889-46d2-a800-ae78a5214c06',
+            'impid': '003',
+            'siteid': '8816',
+            'slotid': '003',
+            'price': 1,
+            'adid': 'lxHWkB7OnZeso3QiN1N4',
+            'nurl': '',
+            'adm': 'AD CODE 1',
+            'adomain': ['adomain.pl'],
+            'cid': 'BZ4gAg21T5nNtxlUCDSW',
+            'crid': 'lxHWkB7OnZeso3QiN1N4',
+            'w': 728,
+            'h': 90
+          }],
+          'seat': 'dsp1',
+          'group': 0
+        }],
+        'cur': 'PLN'
+      }
+    };
+    const serverResponseOneCode = {
+      'body': {
+        'id': auctionId,
+        'seatbid': [{
+          'bid': [{
+            'id': '3347324c-6889-46d2-a800-ae78a5214c06',
+            'impid': 'bidid-' + auctionId + '1',
+            'price': 1,
+            'adid': 'lxHWkB7OnZeso3QiN1N4',
+            'nurl': '',
+            'adm': 'AD CODE 1',
+            'adomain': ['adomain.pl'],
+            'cid': 'BZ4gAg21T5nNtxlUCDSW',
+            'crid': 'lxHWkB7OnZeso3QiN1N4',
+            'w': 728,
+            'h': 90,
+            'ext': {
+              'siteid': '8816',
+              'slotid': '003',
+            },
+          }],
+          'seat': 'dsp1',
+          'group': 0
+        }],
+        'cur': 'PLN'
+      }
+    };
+    const serverResponseVideo = {
+      'body': {
+        'id': auctionId,
+        'seatbid': [{
+          'bid': [{
+            'id': '3347324c-6889-46d2-a800-ae78a5214c06',
+            'impid': 'bidid-' + auctionId + '1',
+            'price': 1,
+            'adid': 'lxHWkB7OnZeso3QiN1N4',
+            'nurl': '',
+            'adm': '<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><VAST version=\"3.0\"><Ad id=\"12345\"><Wrapper><AdSystem version=\"3.0\">adnxs</AdSystem><VASTAdTagURI><![CDATA[https://video.tag.uri]]></VASTAdTagURI><Impression><![CDATA[https://video.tag.tracker]]></Impression><Creatives><Creative adID=\"305683174\"><Linear></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
+            'adomain': ['adomain.pl'],
+            'cid': 'BZ4gAg21T5nNtxlUCDSW',
+            'crid': 'lxHWkB7OnZeso3QiN1N4',
+            'w': 640,
+            'h': 480,
+            'ext': {
+              'siteid': '8816',
+              'slotid': '150',
+              'cache': 'https://video.tag.cache'
+            },
+          }],
+          'seat': 'dsp1',
+          'group': 0
+        }],
+        'cur': 'PLN'
+      }
+    };
+    const serverResponseNative = {
+      'body': {
+        'id': auctionId,
+        'seatbid': [{
+          'bid': [{
+            'id': '3347324c-6889-46d2-a800-ae78a5214c06',
+            'impid': 'bidid-' + auctionId + '1',
+            'price': 1,
+            'adid': 'lxHWkB7OnZeso3QiN1N4',
+            'nurl': '',
+            'adm': '{\"native\":{\"assets\":[{\"id\":3,\"img\":{\"url\":\"native_image\",\"w\":300,\"h\":150}},{\"id\":2,\"img\":{\"url\":\"native_icon\",\"w\":50,\"h\":50}},{\"id\":0,\"title\":{\"text\":\"native_title\"}},{\"id\":5,\"data\":{\"value\":\"native adomain\"}},{\"id\":4,\"data\":{\"value\":\"native_text\"}}],\"link\":{\"url\":\"native_url\"},\"imptrackers\":[\"native_tracker\"]}}',
+            'adomain': ['adomain.pl'],
+            'cid': 'BZ4gAg21T5nNtxlUCDSW',
+            'crid': 'lxHWkB7OnZeso3QiN1N4',
+            'ext': {
+              'siteid': '8816',
+              'slotid': '80',
+            },
+          }],
+          'seat': 'dsp1',
+          'group': 0
+        }],
+        'cur': 'PLN'
+      }
+    };
+    const emptyResponse = {
+      'body': {
+        'id': auctionId,
+      }
+    }
+    return {
+      bid_OneCode,
+      bids,
+      bids_test,
+      bids_timeouted,
+      bid_native,
+      bid_video,
+      bidRequest,
+      bidRequestOneCode,
+      bidRequestSingle,
+      bidRequestNative,
+      bidRequestVideo,
+      bidRequestTest,
+      bidRequestTestNoGDPR,
+      serverResponse,
+      serverResponseOneCode,
+      serverResponseSingle,
+      serverResponseVideo,
+      serverResponseNative,
+      emptyResponse
+    };
+  };
+
+  describe('dependencies', function () {
+    it('utils should contain required functions', function () {
+      expect(utils.parseUrl).to.be.a('function');
+      expect(utils.deepAccess).to.be.a('function');
+      expect(utils.logWarn).to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    const { bids } = prepareTestData();
+    let bid = bids[0];
+
+    it('should always return true whether bid has params (standard) or not (OneCode)', function () {
+      assert(spec.isBidRequestValid(bid));
+      bid.params.id = undefined;
+      assert(spec.isBidRequestValid(bid));
+    });
+  });
+
+  describe('buildRequests', function () {
+    const { bids, bid_native, bid_video, bidRequest, bidRequestSingle, bidRequestNative, bidRequestVideo } = prepareTestData();
+    const request = spec.buildRequests(bids, bidRequest);
+    const requestSingle = spec.buildRequests([bids[0]], bidRequestSingle);
+    const requestNative = spec.buildRequests([bid_native], bidRequestNative);
+    const requestVideo = spec.buildRequests([bid_video], bidRequestVideo);
+    const payload = request ? JSON.parse(request.data) : { site: false, imp: false };
+    const payloadSingle = requestSingle ? JSON.parse(requestSingle.data) : { site: false, imp: false };
+    const payloadNative = requestNative ? JSON.parse(requestNative.data) : { site: false, imp: false };
+    const payloadVideo = requestVideo ? JSON.parse(requestVideo.data) : { site: false, imp: false };
+
+    it('should send bid request to endpoint via POST', function () {
+      expect(request.url).to.contain(BIDDER_URL);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should contain prebid and bidder versions', function () {
+      expect(request.url).to.contain('bdver');
+      expect(request.url).to.contain('pbver=$prebid.version$');
+    });
+
+    it('should create one imp object per bid', function () {
+      expect(payload.imp.length).to.equal(bids.length);
+      expect(payloadSingle.imp.length).to.equal(1);
+    });
+
+    it('should save bidder request data', function () {
+      expect(request.bidderRequest).to.deep.equal(bidRequest);
+    });
+
+    it('should send site Id from bidder params', function () {
+      expect(payload.site.id).to.equal(bids[0].params.siteId);
+    });
+
+    it('should send page url from refererInfo', function () {
+      expect(payload.site.page).to.equal(bidRequest.refererInfo.page);
+    });
+
+    it('should send gdpr data', function () {
+      expect(payload.regs).to.be.an('object').and.to.have.property('gdpr', 1);
+      expect(payload.user).to.be.an('object').and.to.have.property('consent', bidRequest.gdprConsent.consentString);
+    });
+
+    it('should send net info and pvid', function () {
+      expect(payload.user).to.be.an('object').and.to.have.property('data').that.is.an('array');
+
+      const userData = payload.user.data;
+      expect(userData.length).to.equal(2);
+
+      const netInfo = userData[0];
+      expect(netInfo.id).to.equal('12');
+      expect(netInfo.name).to.equal('NetInfo');
+      expect(netInfo).to.have.property('segment').that.is.an('array');
+
+      const pvid = userData[1];
+      expect(pvid.id).to.equal('7');
+      expect(pvid.name).to.equal('pvid');
+      expect(pvid).to.have.property('segment').that.is.an('array');
+      expect(pvid.segment[0]).to.have.property('value');
+    });
+
+    it('pvid should be constant on a single page view', function () {
+      const userData1 = payload.user.data;
+      const userData2 = payloadNative.user.data;
+      const pvid1 = userData1[1];
+      const pvid2 = userData2[1];
+
+      expect(pvid1.segment[0].value).to.equal(pvid2.segment[0].value);
+    });
+
+    it('should build correct native payload', function () {
+      const nativeAssets = payloadNative.imp && payloadNative.imp[0].native.request;
+
+      expect(payloadNative.imp.length).to.equal(1);
+      expect(nativeAssets).to.contain('{"id":0,"required":true,"title":{"len":80}}');
+      expect(nativeAssets).to.contain('{"id":2,"required":true,"img":{"type":1,"w":50,"h":50}}');
+      expect(nativeAssets).to.contain('{"id":3,"required":true,"img":{"type":3,"w":150,"h":50}}');
+      expect(nativeAssets).to.contain('{"id":4,"required":true,"data":{"type":2}');
+      expect(nativeAssets).to.contain('{"id":5,"required":true,"data":{"type":1}');
+    });
+
+    it('should build correct video payload', function () {
+      const videoAssets = payloadVideo.imp && payloadVideo.imp[0].video;
+
+      expect(payloadVideo.imp.length).to.equal(1);
+      expect(videoAssets).to.have.property('w').that.equals(640);
+      expect(videoAssets).to.have.property('h').that.equals(480);
+      expect(videoAssets).to.have.property('context').that.equals('instream');
+      expect(videoAssets).to.have.property('maxduration').that.equals(30);
+      expect(videoAssets).to.have.property('linearity').that.equals(1);
+      expect(videoAssets).to.have.property('mimes').that.is.an('array');
+      expect(videoAssets).to.have.property('protocols').that.is.an('array');
+      expect(videoAssets).to.have.property('api').that.is.an('array');
+    });
+
+    it('should create auxilary placement identifier (size_numUsed), that is constant for a given adUnit', function () {
+      const extAssets1 = payload.imp && payload.imp[0].ext.data;
+      const extAssets2 = payloadSingle.imp && payloadSingle.imp[0].ext.data;
+
+      /*
+        note that payload comes from first, and payloadSingle from second auction in the test run
+        also, since both have same adUnitName, value of pbsize property should be the same
+      */
+      expect(extAssets1).to.have.property('pbsize').that.equals('750x200_1')
+      expect(extAssets2).to.have.property('pbsize').that.equals('750x200_1')
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const { bid_OneCode, bid_video, bid_native, bids, emptyResponse, serverResponse, serverResponseOneCode, serverResponseSingle, serverResponseVideo, serverResponseNative, bidRequest, bidRequestOneCode, bidRequestSingle, bidRequestVideo, bidRequestNative } = prepareTestData();
+    const request = spec.buildRequests(bids, bidRequest);
+    const requestSingle = spec.buildRequests([bids[0]], bidRequestSingle);
+    const requestOneCode = spec.buildRequests([bid_OneCode], bidRequestOneCode);
+    const requestVideo = spec.buildRequests([bid_video], bidRequestVideo);
+    const requestNative = spec.buildRequests([bid_native], bidRequestNative);
+
+    it('should handle nobid responses', function () {
+      let result = spec.interpretResponse(emptyResponse, request);
+      expect(result.length).to.equal(0);
+    });
+
+    it('should create bids from non-empty responses', function () {
+      let result = spec.interpretResponse(serverResponse, request);
+      let resultSingle = spec.interpretResponse(serverResponseSingle, requestSingle);
+
+      expect(result.length).to.equal(bids.length);
+      expect(resultSingle.length).to.equal(1);
+      expect(resultSingle[0]).to.have.keys('ad', 'cpm', 'width', 'height', 'bidderCode', 'mediaType', 'meta', 'requestId', 'creativeId', 'currency', 'netRevenue', 'ttl');
+    });
+
+    it('should create bid from OneCode (parameter-less) request, if response contains siteId', function () {
+      let resultOneCode = spec.interpretResponse(serverResponseOneCode, requestOneCode);
+
+      expect(resultOneCode.length).to.equal(1);
+      expect(resultOneCode[0]).to.have.keys('ad', 'cpm', 'width', 'height', 'bidderCode', 'mediaType', 'meta', 'requestId', 'creativeId', 'currency', 'netRevenue', 'ttl');
+    });
+
+    it('should not create bid from OneCode (parameter-less) request, if response does not contain siteId', function () {
+      let resultOneCodeNoMatch = spec.interpretResponse(serverResponse, requestOneCode);
+
+      expect(resultOneCodeNoMatch.length).to.equal(0);
+    });
+
+    it('should handle a partial response', function () {
+      let resultPartial = spec.interpretResponse(serverResponseSingle, request);
+      expect(resultPartial.length).to.equal(1);
+    });
+
+    it('banner ad code should contain required variables', function () {
+      let resultSingle = spec.interpretResponse(serverResponseSingle, requestSingle);
+      let adcode = resultSingle[0].ad;
+      expect(adcode).to.be.a('string');
+      expect(adcode).to.contain('window.rekid');
+      expect(adcode).to.contain('window.mcad');
+      expect(adcode).to.contain('window.gdpr');
+      expect(adcode).to.contain('window.page');
+      expect(adcode).to.contain('window.requestPVID');
+    });
+
+    it('should create a correct video bid', function () {
+      let resultVideo = spec.interpretResponse(serverResponseVideo, requestVideo);
+
+      expect(resultVideo.length).to.equal(1);
+
+      let videoBid = resultVideo[0];
+      expect(videoBid).to.have.keys('adType', 'bidderCode', 'cpm', 'creativeId', 'currency', 'width', 'height', 'meta', 'mediaType', 'netRevenue', 'requestId', 'ttl', 'vastContent', 'vastXml', 'vastUrl');
+      expect(videoBid.adType).to.equal('instream');
+      expect(videoBid.mediaType).to.equal('video');
+      expect(videoBid.vastXml).to.match(/^<\?xml.*<\/VAST>$/);
+      expect(videoBid.vastContent).to.match(/^<\?xml.*<\/VAST>$/);
+      expect(videoBid.vastUrl).to.equal('https://video.tag.cache');
+    });
+
+    it('should create a correct native bid', function () {
+      let resultNative = spec.interpretResponse(serverResponseNative, requestNative);
+
+      expect(resultNative.length).to.equal(1);
+
+      let nativeBid = resultNative[0];
+      expect(nativeBid).to.have.keys('bidderCode', 'cpm', 'creativeId', 'currency', 'width', 'height', 'meta', 'mediaType', 'netRevenue', 'requestId', 'ttl', 'native');
+      expect(nativeBid.native).to.have.keys('image', 'icon', 'title', 'sponsoredBy', 'body', 'clickUrl', 'impressionTrackers', 'javascriptTrackers');
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    let syncResultAll = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true });
+    let syncResultImage = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: true });
+    let syncResultNone = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: false });
+
+    it('should provide correct url, if frame sync is allowed', function () {
+      expect(syncResultAll).to.have.length(1);
+      expect(syncResultAll[0].url).to.have.string(SYNC_URL);
+    });
+
+    it('should send no syncs, if frame sync is not allowed', function () {
+      expect(syncResultImage).to.have.length(0);
+      expect(syncResultNone).to.have.length(0);
+    });
+  });
+
+  describe('onBidWon', function () {
+    it('should generate no notification if bid is undefined', function () {
+      let notificationPayload = spec.onBidWon();
+      expect(notificationPayload).to.be.undefined;
+    });
+
+    it('should generate notification with event name and request/adUnit data, if correct bid is provided. Should also contain site/slot data as arrays.', function () {
+      const { bids } = prepareTestData();
+      let bid = bids[0];
+
+      let notificationPayload = spec.onBidWon(bid);
+      expect(notificationPayload).to.have.property('event').that.equals('bidWon');
+      expect(notificationPayload).to.have.property('requestId').that.equals(bid.auctionId);
+      expect(notificationPayload).to.have.property('tagid').that.deep.equals([bid.adUnitCode]);
+      expect(notificationPayload).to.have.property('siteId').that.is.an('array');
+      expect(notificationPayload).to.have.property('slotId').that.is.an('array');
+    });
+  });
+
+  describe('onTimeout', function () {
+    it('should generate no notification if timeout data is undefined / has no bids', function () {
+      let notificationPayloadUndefined = spec.onTimeout();
+      let notificationPayloadNoBids = spec.onTimeout([]);
+
+      expect(notificationPayloadUndefined).to.be.undefined;
+      expect(notificationPayloadNoBids).to.be.undefined;
+    });
+
+    it('should generate single notification for any number of timeouted bids', function () {
+      const { bids_timeouted } = prepareTestData();
+      let notificationPayload = spec.onTimeout(bids_timeouted);
+
+      expect(notificationPayload).to.have.property('event').that.equals('timeout');
+      expect(notificationPayload).to.have.property('requestId').that.equals(bids_timeouted[0].auctionId);
+      expect(notificationPayload).to.have.property('tagid').that.deep.equals([bids_timeouted[0].adUnitCode, bids_timeouted[1].adUnitCode]);
+    });
+  });
+});
diff --git a/test/spec/modules/stroeerCoreBidAdapter_spec.js b/test/spec/modules/stroeerCoreBidAdapter_spec.js
new file mode 100644
index 00000000000..6489d8ece7e
--- /dev/null
+++ b/test/spec/modules/stroeerCoreBidAdapter_spec.js
@@ -0,0 +1,852 @@
+import {assert} from 'chai';
+import {spec} from 'modules/stroeerCoreBidAdapter.js';
+import * as utils from 'src/utils.js';
+import {BANNER, VIDEO} from '../../../src/mediaTypes.js';
+import {find} from 'src/polyfill.js';
+
+describe('stroeerCore bid adapter', function () {
+  let sandbox;
+  let fakeServer;
+  let bidderRequest;
+  let clock;
+
+  beforeEach(() => {
+    bidderRequest = buildBidderRequest();
+    sandbox = sinon.sandbox.create();
+    fakeServer = sandbox.useFakeServer();
+    clock = sandbox.useFakeTimers();
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  function assertStandardFieldsBid(bidObject, bidId, width, height, cpm) {
+    assert.propertyVal(bidObject, 'requestId', bidId);
+    assert.propertyVal(bidObject, 'width', width);
+    assert.propertyVal(bidObject, 'height', height);
+    assert.propertyVal(bidObject, 'cpm', cpm);
+    assert.propertyVal(bidObject, 'currency', 'EUR');
+    assert.propertyVal(bidObject, 'netRevenue', true);
+    assert.propertyVal(bidObject, 'creativeId', '');
+  }
+
+  function assertStandardFieldsOnBannerBid(bidObject, bidId, ad, width, height, cpm) {
+    assertStandardFieldsBid(bidObject, bidId, width, height, cpm);
+    assertBannerAdMarkup(bidObject, ad);
+  }
+
+  function assertStandardFieldsOnVideoBid(bidObject, bidId, vastXml, width, height, cpm) {
+    assertStandardFieldsBid(bidObject, bidId, width, height, cpm);
+    assertVideoVastXml(bidObject, vastXml);
+  }
+
+  function assertBannerAdMarkup(bidObject, ad) {
+    assert.propertyVal(bidObject, 'ad', ad);
+    assert.notProperty(bidObject, 'vastXml');
+  }
+
+  function assertVideoVastXml(bidObject, vastXml) {
+    assert.propertyVal(bidObject, 'vastXml', vastXml);
+    assert.notProperty(bidObject, 'ad');
+  }
+
+  const AUCTION_ID = utils.getUniqueIdentifierStr();
+
+  // Vendor user ids and associated data
+  const userIds = Object.freeze({
+    criteoId: 'criteo-user-id',
+    digitrustid: {
+      data: {
+        id: 'encrypted-user-id==',
+        keyv: 4,
+        privacy: {optout: false},
+        producer: 'ABC',
+        version: 2
+      }
+    },
+    lipb: {
+      lipbid: 'T7JiRRvsRAmh88',
+      segments: ['999']
+    }
+  });
+
+  const buildBidderRequest = () => ({
+    auctionId: AUCTION_ID,
+    bidderRequestId: 'bidder-request-id-123',
+    bidderCode: 'stroeerCore',
+    timeout: 5000,
+    auctionStart: 10000,
+    refererInfo: {
+      page: 'https://www.example.com/monkey/index.html',
+      ref: 'https://www.example.com/?search=monkey'
+    },
+    bids: [{
+      bidId: 'bid1',
+      bidder: 'stroeerCore',
+      adUnitCode: 'div-1',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 600], [160, 60]]
+        }
+      },
+      params: {
+        sid: 'NDA='
+      },
+      userId: userIds
+    }, {
+      bidId: 'bid2',
+      bidder: 'stroeerCore',
+      adUnitCode: 'div-2',
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90]],
+        }
+      },
+      params: {
+        sid: 'ODA='
+      },
+      userId: userIds
+    }],
+  });
+
+  const buildBidderResponse = () => ({
+    'bids': [{
+      'bidId': 'bid1', 'cpm': 4.0, 'width': 300, 'height': 600, 'ad': '<div>tag1</div>', 'tracking': {'brandId': 123}
+    }, {
+      'bidId': 'bid2', 'cpm': 7.3, 'width': 728, 'height': 90, 'ad': '<div>tag2</div>'
+    }]
+  });
+
+  const buildBidderResponseWithVideo = () => ({
+    'bids': [{
+      'bidId': 'bid1', 'cpm': 4.0, 'width': 800, 'height': 250, 'vastXml': '<vast>video</vast>'
+    }]
+  });
+
+  const createWindow = (href, params = {}) => {
+    let {parent, top, frameElement, placementElements = []} = params;
+
+    const protocol = href.startsWith('https') ? 'https:' : 'http:';
+    const win = {
+      frameElement,
+      parent,
+      top,
+      location: {
+        protocol, href
+      },
+      document: {
+        createElement: function () {
+          return {
+            setAttribute: function () {
+            }
+          }
+        },
+        getElementById: id => find(placementElements, el => el.id === id)
+      }
+    };
+
+    win.self = win;
+
+    if (!parent) {
+      win.parent = win;
+    }
+
+    if (!top) {
+      win.top = win;
+    }
+
+    return win;
+  };
+
+  function createElement(id, offsetTop = 0) {
+    return {
+      id,
+      getBoundingClientRect: function () {
+        return {
+          top: offsetTop, height: 1
+        }
+      }
+    }
+  }
+
+  function setupSingleWindow(sandBox, placementElements = [createElement('div-1', 17), createElement('div-2', 54)]) {
+    const win = createWindow('http://www.xyz.com/', {
+      parent: win, top: win, frameElement: createElement(undefined, 304), placementElements: placementElements
+    });
+
+    win.innerHeight = 200;
+
+    sandBox.stub(utils, 'getWindowSelf').returns(win);
+    sandBox.stub(utils, 'getWindowTop').returns(win);
+
+    return win;
+  }
+
+  function setupNestedWindows(sandBox, placementElements = [createElement('div-1', 17), createElement('div-2', 54)]) {
+    const topWin = createWindow('http://www.abc.org/');
+    topWin.innerHeight = 800;
+
+    const midWin = createWindow('http://www.abc.org/', {parent: topWin, top: topWin, frameElement: createElement()});
+    midWin.innerHeight = 400;
+
+    const win = createWindow('http://www.xyz.com/', {
+      parent: midWin, top: topWin, frameElement: createElement(undefined, 304), placementElements
+    });
+
+    win.innerHeight = 200;
+
+    sandBox.stub(utils, 'getWindowSelf').returns(win);
+    sandBox.stub(utils, 'getWindowTop').returns(topWin);
+
+    return {topWin, midWin, win};
+  }
+
+  it('should support BANNER and VIDEO mediaType', function () {
+    assert.deepEqual(spec.supportedMediaTypes, [BANNER, VIDEO]);
+  });
+
+  it('should have GDPR vendor list id (gvlid) set on the spec', function () {
+    assert.equal(spec.gvlid, 136);
+  });
+
+  describe('bid validation entry point', () => {
+    let bidRequest;
+
+    beforeEach(() => {
+      bidRequest = buildBidderRequest().bids[0];
+    });
+
+    it('should have \"isBidRequestValid\" function', () => {
+      assert.isFunction(spec.isBidRequestValid);
+    });
+
+    it('should pass a valid bid', () => {
+      assert.isTrue(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should exclude bids without slot id param', () => {
+      bidRequest.params.sid = undefined;
+      assert.isFalse(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should allow instream video bids', () => {
+      delete bidRequest.mediaTypes.banner;
+      bidRequest.mediaTypes.video = {
+        playerSize: [640, 480],
+        context: 'instream'
+      };
+
+      assert.isTrue(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should allow outstream video bids', () => {
+      delete bidRequest.mediaTypes.banner;
+      bidRequest.mediaTypes.video = {
+        playerSize: [640, 480],
+        context: 'outstream'
+      };
+
+      assert.isTrue(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should allow multi-format bid that has banner and instream video', () => {
+      assert.isTrue('banner' in bidRequest.mediaTypes);
+
+      // Allowed because instream video component of the bid will be ignored in buildRequest()
+      bidRequest.mediaTypes.video = {
+        playerSize: [640, 480],
+        context: 'instream'
+      };
+
+      assert.isTrue(spec.isBidRequestValid(bidRequest))
+    });
+
+    it('should exclude multi-format bid that has no format of interest', () => {
+      bidRequest.mediaTypes = {
+        video: {
+          playerSize: [640, 480],
+          context: 'adpod'
+        },
+        native: {
+          image: {
+            required: true,
+            sizes: [150, 50]
+          },
+          title: {
+            required: true,
+            len: 80
+          },
+          sponsoredBy: {
+            required: true
+          },
+          clickUrl: {
+            required: true
+          },
+          privacyLink: {
+            required: false
+          },
+          body: {
+            required: true
+          },
+          icon: {
+            required: true,
+            sizes: [50, 50]
+          }
+        }
+      };
+
+      assert.isFalse(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should exclude video bids without context', () => {
+      delete bidRequest.mediaTypes.banner;
+      bidRequest.mediaTypes.video = {
+        playerSize: [640, 480],
+        context: undefined
+      };
+
+      assert.isFalse(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should exclude video, pre-version 3 bids', () => {
+      delete bidRequest.mediaTypes;
+      bidRequest.mediaType = VIDEO;
+      assert.isFalse(spec.isBidRequestValid(bidRequest));
+    });
+  });
+
+  describe('build request entry point', () => {
+    it('should have \"buildRequests\" function', () => {
+      assert.isFunction(spec.buildRequests);
+    });
+
+    describe('url on server request info object', () => {
+      let win;
+      beforeEach(() => {
+        win = setupSingleWindow(sandbox);
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should use hardcoded url as default endpoint', () => {
+        const bidReq = buildBidderRequest();
+        let serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+        assert.equal(serverRequestInfo.method, 'POST');
+        assert.isObject(serverRequestInfo.data);
+        assert.equal(serverRequestInfo.url, 'https://hb.adscale.de/dsh');
+      });
+
+      describe('should use custom url if provided', () => {
+        const samples = [{
+          protocol: 'http:',
+          params: {sid: 'ODA=', host: 'other.com', port: '234', path: '/xyz'},
+          expected: 'https://other.com:234/xyz'
+        }, {
+          protocol: 'https:',
+          params: {sid: 'ODA=', host: 'other.com', port: '234', path: '/xyz'},
+          expected: 'https://other.com:234/xyz'
+        }, {
+          protocol: 'https:',
+          params: {sid: 'ODA=', host: 'other.com', port: '234', securePort: '871', path: '/xyz'},
+          expected: 'https://other.com:871/xyz'
+        }, {
+          protocol: 'http:', params: {sid: 'ODA=', port: '234', path: '/xyz'}, expected: 'https://hb.adscale.de:234/xyz'
+        }, ];
+
+        samples.forEach(sample => {
+          it(`should use ${sample.expected} as endpoint when given params ${JSON.stringify(sample.params)} and protocol ${sample.protocol}`,
+            function () {
+              win.location.protocol = sample.protocol;
+
+              const bidReq = buildBidderRequest();
+              bidReq.bids[0].params = sample.params;
+              bidReq.bids.length = 1;
+
+              let serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+              assert.equal(serverRequestInfo.method, 'POST');
+              assert.isObject(serverRequestInfo.data);
+              assert.equal(serverRequestInfo.url, sample.expected);
+            });
+        });
+      });
+    });
+
+    describe('payload on server request info object', () => {
+      let topWin;
+      let win;
+
+      let placementElements;
+      beforeEach(() => {
+        placementElements = [createElement('div-1', 17), createElement('div-2', 54)];
+        ({ topWin, win } = setupNestedWindows(sandbox, placementElements));
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('should have expected JSON structure', () => {
+        clock.tick(13500);
+        const bidReq = buildBidderRequest();
+
+        const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+        const expectedTimeout = bidderRequest.timeout - (13500 - bidderRequest.auctionStart);
+
+        assert.equal(expectedTimeout, 1500);
+
+        const expectedJsonPayload = {
+          'id': AUCTION_ID,
+          'timeout': expectedTimeout,
+          'ref': 'https://www.example.com/?search=monkey',
+          'mpa': true,
+          'ssl': false,
+          'url': 'https://www.example.com/monkey/index.html',
+          'bids': [{
+            'sid': 'NDA=',
+            'bid': 'bid1',
+            'viz': true,
+            'ban': {
+              'siz': [[300, 600], [160, 60]]
+            }
+          }, {
+            'sid': 'ODA=',
+            'bid': 'bid2',
+            'viz': true,
+            'ban': {
+              'siz': [[728, 90]]
+            }
+          }],
+          'user': {
+            'euids': userIds
+          }
+        };
+
+        // trim away fields with undefined
+        const actualJsonPayload = JSON.parse(JSON.stringify(serverRequestInfo.data));
+
+        assert.deepEqual(actualJsonPayload, expectedJsonPayload);
+      });
+
+      describe('video bids', () => {
+        it('should be able to build instream video bid', () => {
+          bidderRequest.bids = [{
+            bidId: 'bid1',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-1',
+            mediaTypes: {
+              video: {
+                context: 'instream',
+                playerSize: [640, 480],
+                mimes: ['video/mp4', 'video/quicktime']
+              }
+            },
+            params: {
+              sid: 'NDA='
+            },
+            userId: userIds
+          }];
+
+          const expectedBids = [{
+            'sid': 'NDA=',
+            'bid': 'bid1',
+            'viz': true,
+            'vid': {
+              'ctx': 'instream',
+              'siz': [640, 480],
+              'mim': ['video/mp4', 'video/quicktime']
+            }
+          }];
+
+          const serverRequestInfo = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          const bids = JSON.parse(JSON.stringify(serverRequestInfo.data.bids));
+          assert.deepEqual(bids, expectedBids);
+        });
+      });
+
+      describe('multi-formats', () => {
+        it(`should create a request for video and banner`, () => {
+          const videoBid = {
+            bidId: 'bid3',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-1',
+            mediaTypes: {
+              video: {
+                context: 'instream',
+                playerSize: [640, 480],
+                mimes: ['video/mp4', 'video/quicktime'],
+              }
+            },
+            params: {
+              sid: 'ODA=',
+            },
+            userId: userIds
+          }
+
+          const bannerBid1 = {
+            bidId: 'bid8',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-2',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 600], [160, 60]],
+              }
+            },
+            params: {
+              sid: 'NDA=',
+            },
+            userId: userIds
+          }
+
+          const bannerBid2 = {
+            bidId: 'bid12',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-3',
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 200], [300, 500]],
+              }
+            },
+            params: {
+              sid: 'ABC=',
+            },
+            userId: userIds
+          }
+
+          bidderRequest.bids = [bannerBid1, videoBid, bannerBid2];
+
+          const expectedBannerBids = [
+            {
+              'sid': 'NDA=',
+              'bid': 'bid8',
+              'viz': true,
+              'ban': {
+                'siz': [[300, 600], [160, 60]]
+              }
+            },
+            {
+              'sid': 'ABC=',
+              'bid': 'bid12',
+              'ban': {
+                'siz': [[100, 200], [300, 500]]
+              },
+              'viz': undefined
+            }
+          ];
+
+          const expectedVideoBids = [
+            {
+              'sid': 'ODA=',
+              'bid': 'bid3',
+              'viz': true,
+              'vid': {
+                'ctx': 'instream',
+                'siz': [640, 480],
+                'mim': ['video/mp4', 'video/quicktime']
+              }
+            }
+          ];
+
+          const serverRequestInfo = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          assert.deepEqual(serverRequestInfo.data.bids, [...expectedBannerBids, ...expectedVideoBids]);
+        });
+
+        it('should split multi-format bid', function() {
+          const multiFormatBid = {
+            bidId: 'bid3',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-1',
+            mediaTypes: {
+              video: {
+                context: 'instream',
+                playerSize: [640, 480],
+                mimes: ['video/mp4', 'video/quicktime'],
+              },
+              banner: {
+                sizes: [[100, 200], [300, 500]],
+              }
+            },
+            params: {
+              sid: 'ODA=',
+            },
+            userId: userIds
+          }
+
+          bidderRequest.bids = [multiFormatBid];
+
+          const serverRequestInfo = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          const expectedBannerBids = [
+            {
+              'sid': 'ODA=',
+              'bid': 'bid3',
+              'viz': true,
+              'ban': {
+                'siz': [[100, 200], [300, 500]]
+              }
+            }
+          ];
+
+          const expectedVideoBids = [
+            {
+              'sid': 'ODA=',
+              'bid': 'bid3',
+              'viz': true,
+              'vid': {
+                'ctx': 'instream',
+                'siz': [640, 480],
+                'mim': ['video/mp4', 'video/quicktime']
+              }
+            }
+          ];
+
+          assert.deepEqual(serverRequestInfo.data.bids, [...expectedBannerBids, ...expectedVideoBids]);
+        });
+      });
+
+      describe('optional fields', () => {
+        it('should skip viz field when unable to determine visibility of placement', () => {
+          placementElements.length = 0;
+          const bidReq = buildBidderRequest();
+
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+          assert.lengthOf(serverRequestInfo.data.bids, 2);
+
+          for (let bid of serverRequestInfo.data.bids) {
+            assert.isUndefined(bid.viz);
+          }
+        });
+
+        it('should skip ref field when unable to determine document referrer', () => {
+          // i.e., empty if user came from bookmark, or web page using 'rel="noreferrer" on link, etc
+          buildBidderRequest();
+
+          const serverRequestInfo = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          assert.lengthOf(serverRequestInfo.data.bids, 2);
+
+          for (let bid of serverRequestInfo.data.bids) {
+            assert.isUndefined(bid.ref);
+          }
+        });
+
+        const gdprSamples = [{consentString: 'RG9ua2V5IEtvbmc=', gdprApplies: true}, {
+          consentString: 'UGluZyBQb25n',
+          gdprApplies: false
+        }];
+        gdprSamples.forEach((sample) => {
+          it(`should add GDPR info ${JSON.stringify(sample)} when provided`, () => {
+            const bidReq = buildBidderRequest();
+            bidReq.gdprConsent = sample;
+
+            const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+            const actualGdpr = serverRequestInfo.data.gdpr;
+            assert.propertyVal(actualGdpr, 'applies', sample.gdprApplies);
+            assert.propertyVal(actualGdpr, 'consent', sample.consentString);
+          });
+        });
+
+        const skippableGdprSamples = [{consentString: null, gdprApplies: true}, //
+          {consentString: 'UGluZyBQb25n', gdprApplies: null}, //
+          {consentString: null, gdprApplies: null}, //
+          {consentString: undefined, gdprApplies: true}, //
+          {consentString: 'UGluZyBQb25n', gdprApplies: undefined}, //
+          {consentString: undefined, gdprApplies: undefined}];
+        skippableGdprSamples.forEach((sample) => {
+          it(`should not add GDPR info ${JSON.stringify(sample)} when one or more values are missing`, () => {
+            const bidReq = buildBidderRequest();
+            bidReq.gdprConsent = sample;
+
+            const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+            const actualGdpr = serverRequestInfo.data.gdpr;
+            assert.isUndefined(actualGdpr);
+          });
+        });
+
+        it('should be able to build without third party user id data', () => {
+          const bidReq = buildBidderRequest();
+          bidReq.bids.forEach(bid => delete bid.userId);
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+          assert.lengthOf(serverRequestInfo.data.bids, 2);
+          assert.notProperty(serverRequestInfo, 'uids');
+        });
+
+        it('should add schain if available', () => {
+          const schain = Object.freeze({
+            ver: '1.0',
+            complete: 1,
+            'nodes': [
+              {
+                asi: 'exchange1.com',
+                sid: 'ABC',
+                hp: 1,
+                rid: 'bid-request-1',
+                name: 'publisher',
+                domain: 'publisher.com'
+              }
+            ]
+          });
+
+          const bidReq = buildBidderRequest();
+          bidReq.bids.forEach(bid => bid.schain = schain);
+
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+          assert.deepEqual(serverRequestInfo.data.schain, schain);
+        });
+      });
+    });
+  });
+
+  describe('interpret response entry point', () => {
+    it('should have \"interpretResponse\" function', () => {
+      assert.isFunction(spec.interpretResponse);
+    });
+
+    const invalidResponses = ['', '  ', ' ', undefined, null];
+    invalidResponses.forEach(sample => {
+      it('should ignore invalid responses (\"' + sample + '\") response', () => {
+        const result = spec.interpretResponse({body: sample});
+        assert.isArray(result);
+        assert.lengthOf(result, 0);
+      });
+    });
+
+    it('should interpret a standard response', () => {
+      const bidderResponse = buildBidderResponse();
+
+      const result = spec.interpretResponse({body: bidderResponse});
+      assertStandardFieldsOnBannerBid(result[0], 'bid1', '<div>tag1</div>', 300, 600, 4);
+      assertStandardFieldsOnBannerBid(result[1], 'bid2', '<div>tag2</div>', 728, 90, 7.3);
+    });
+
+    it('should return empty array, when response contains no bids', () => {
+      const result = spec.interpretResponse({body: {bids: []}});
+      assert.deepStrictEqual(result, []);
+    });
+
+    it('should interpret a video response', () => {
+      const bidderResponse = buildBidderResponseWithVideo();
+      const bidResponses = spec.interpretResponse({body: bidderResponse});
+      let videoBidResponse = bidResponses[0];
+      assertStandardFieldsOnVideoBid(videoBidResponse, 'bid1', '<vast>video</vast>', 800, 250, 4);
+    })
+
+    it('should add data to meta object', () => {
+      const response = buildBidderResponse();
+      response.bids[0] = Object.assign(response.bids[0], {adomain: ['website.org', 'domain.com']});
+      const result = spec.interpretResponse({body: response});
+      assert.deepPropertyVal(result[0], 'meta', {advertiserDomains: ['website.org', 'domain.com']});
+      // nothing provided for the second bid
+      assert.deepPropertyVal(result[1], 'meta', {advertiserDomains: undefined});
+    });
+  });
+
+  describe('get user syncs entry point', () => {
+    let win;
+
+    beforeEach(() => {
+      win = setupSingleWindow(sandbox);
+
+      // fake
+      win.document.createElement = function () {
+        const attrs = {};
+        return {
+          setAttribute: (name, value) => {
+            attrs[name] = value
+          },
+          getAttribute: (name) => attrs[name],
+          hasAttribute: (name) => attrs[name] !== undefined,
+          tagName: 'SCRIPT',
+        }
+      }
+    });
+
+    it('should have \"getUserSyncs\" function', () => {
+      assert.isFunction(spec.getUserSyncs);
+    });
+
+    describe('when iframe option is enabled', () => {
+      it('should perform user connect when there was a response', () => {
+        const expectedUrl = 'https://js.adscale.de/pbsync.html';
+        const userSyncResponse = spec.getUserSyncs({iframeEnabled: true}, ['']);
+
+        assert.deepStrictEqual(userSyncResponse, [{type: 'iframe', url: expectedUrl}]);
+      });
+
+      it('should not perform user connect when there was no response', () => {
+        const userSyncResponse = spec.getUserSyncs({iframeEnabled: true}, []);
+
+        assert.deepStrictEqual(userSyncResponse, []);
+      });
+
+      describe('and gdpr consent is defined', () => {
+        describe('and gdpr applies', () => {
+          it('should place gdpr query param to the user sync url with value of 1', () => {
+            const expectedUrl = 'https://js.adscale.de/pbsync.html?gdpr=1&gdpr_consent=';
+            const userSyncResponse = spec.getUserSyncs({iframeEnabled: true}, [''], {gdprApplies: true});
+
+            assert.deepStrictEqual(userSyncResponse, [{type: 'iframe', url: expectedUrl}]);
+          });
+        });
+
+        describe('and gdpr does not apply', () => {
+          it('should place gdpr query param to the user sync url with zero value', () => {
+            const expectedUrl = 'https://js.adscale.de/pbsync.html?gdpr=0&gdpr_consent=';
+            const userSyncResponse = spec.getUserSyncs({iframeEnabled: true}, [''], {gdprApplies: false});
+
+            assert.deepStrictEqual(userSyncResponse, [{type: 'iframe', url: expectedUrl}]);
+          });
+
+          describe('because consent does not specify it', () => {
+            it('should place gdpr query param to the user sync url with zero value', () => {
+              const expectedUrl = 'https://js.adscale.de/pbsync.html?gdpr=0&gdpr_consent=';
+              const userSyncResponse = spec.getUserSyncs({iframeEnabled: true}, [''], {});
+
+              assert.deepStrictEqual(userSyncResponse, [{type: 'iframe', url: expectedUrl}]);
+            });
+          });
+        });
+
+        describe('and consent string is defined', () => {
+          it('should pass consent string to gdpr consent query param', () => {
+            const consentString = 'consent_string';
+            const expectedUrl = `https://js.adscale.de/pbsync.html?gdpr=1&gdpr_consent=${consentString}`;
+            const userSyncResponse = spec.getUserSyncs({iframeEnabled: true}, [''], {gdprApplies: true, consentString});
+
+            assert.deepStrictEqual(userSyncResponse, [{type: 'iframe', url: expectedUrl}]);
+          });
+
+          it('should correctly escape invalid characters', () => {
+            const consentString = 'consent ?stri&ng';
+            const expectedUrl = `https://js.adscale.de/pbsync.html?gdpr=1&gdpr_consent=consent%20%3Fstri%26ng`;
+            const userSyncResponse = spec.getUserSyncs({iframeEnabled: true}, [''], {gdprApplies: true, consentString});
+
+            assert.deepStrictEqual(userSyncResponse, [{type: 'iframe', url: expectedUrl}]);
+          });
+        });
+      });
+    });
+
+    describe('when iframe option is disabled', () => {
+      it('should not perform user connect even when there was a response', () => {
+        const userSyncResponse = spec.getUserSyncs({iframeEnabled: false}, ['']);
+
+        assert.deepStrictEqual(userSyncResponse, []);
+      });
+
+      it('should not perform user connect when there was no response', () => {
+        const userSyncResponse = spec.getUserSyncs({iframeEnabled: false}, []);
+
+        assert.deepStrictEqual(userSyncResponse, []);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/stvBidAdapter_spec.js b/test/spec/modules/stvBidAdapter_spec.js
deleted file mode 100644
index c2278313b2d..00000000000
--- a/test/spec/modules/stvBidAdapter_spec.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/stvBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-const VADS_ENDPOINT_URL = 'https://ads.smartstream.tv/r/';
-
-describe('stvAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'stv',
-      'params': {
-        'placement': '6682',
-        'pfilter': {
-          'floorprice': 1000000
-        },
-        'bcat': 'IAB2,IAB4',
-        'dvt': 'desktop'
-      },
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475'
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'someIncorrectParam': 0
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidRequests = [{
-      'bidder': 'stv',
-      'params': {
-        'source': 'vads',
-        'placement': 'prer0-0%3D4137',
-        'pfilter': {
-          'min_duration': 1,
-          'max_duration': 100,
-          'min_bitrate': 32,
-          'max_bitrate': 128,
-        },
-        'noskip': 1
-      },
-      'mediaTypes': {
-        'video': {
-          'playerSize': [640, 480],
-          'context': 'instream'
-        }
-      },
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475'
-    }];
-
-    let bidderRequest = {
-      refererInfo: {
-        referer: 'some_referrer.net'
-      }
-    }
-
-    const request = spec.buildRequests(bidRequests, bidderRequest);
-    it('sends bid video request to our vads endpoint via GET', function () {
-      expect(request[0].method).to.equal('GET');
-      let data = request[0].data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
-      expect(data).to.equal('_f=vast2&alternative=prebid_js&_ps=prer0-0%3D4137&srw=640&srh=480&idt=100&bid_id=30b31c1838de1e&pfilter%5Bmin_duration%5D=1&pfilter%5Bmax_duration%5D=100&pfilter%5Bmin_bitrate%5D=32&pfilter%5Bmax_bitrate%5D=128&noskip=1');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let vadsServerVideoResponse = {
-      'body': {
-        'cpm': 5000000,
-        'crid': 100500,
-        'width': '300',
-        'height': '250',
-        'vastXml': '{"reason":7001,"status":"accepted"}',
-        'requestId': '220ed41385952a',
-        'currency': 'EUR',
-        'ttl': 60,
-        'netRevenue': true,
-        'zone': '6682'
-      }
-    };
-
-    let expectedResponse = [{
-      requestId: '23beaa6af6cdde',
-      cpm: 0.5,
-      width: 0,
-      height: 0,
-      creativeId: 100500,
-      dealId: '',
-      currency: 'EUR',
-      netRevenue: true,
-      ttl: 300,
-      vastXml: '{"reason":7001,"status":"accepted"}',
-      mediaType: 'video'
-    }];
-
-    it('should get the correct vads video bid response by display ad', function () {
-      let bidRequest = [{
-        'method': 'GET',
-        'url': VADS_ENDPOINT_URL,
-        'mediaTypes': {
-          'video': {
-            'playerSize': [640, 480],
-            'context': 'instream'
-          }
-        },
-        'data': {
-          'bid_id': '30b31c1838de1e'
-        }
-      }];
-      let result = spec.interpretResponse(vadsServerVideoResponse, bidRequest[0]);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
-    });
-
-    it('handles empty bid response', function () {
-      let response = {
-        body: {}
-      };
-      let result = spec.interpretResponse(response);
-      expect(result.length).to.equal(0);
-    });
-  });
-});
diff --git a/test/spec/modules/sublimeBidAdapter_spec.js b/test/spec/modules/sublimeBidAdapter_spec.js
index ae9e293a757..e687ff0970f 100644
--- a/test/spec/modules/sublimeBidAdapter_spec.js
+++ b/test/spec/modules/sublimeBidAdapter_spec.js
@@ -1,14 +1,193 @@
 import { expect } from 'chai';
-import { spec, sendEvent, log, setState, state } from 'modules/sublimeBidAdapter.js';
+import { spec } from 'modules/sublimeBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+const sinon = require('sinon');
+
+const utils = require('src/utils');
+
+const USER_AGENT = {
+  // UNKOWN
+  'Opera/9.80 (S60; SymbOS; Opera Mobi/1209; U; sk) Presto/2.5.28 Version/10.1': {
+    type: 'desktop', os: { name: '', version: 0 }, browser: { name: '', version: 0 },
+  },
+  'Opera/12.02 (Android 4.1; Linux; Opera Mobi/ADR-1111101157; U; en-US) Presto/2.9.201 Version/12.02': {
+    type: 'tablet', os: { name: 'android', version: 4.1 }, browser: { name: '', version: 0 },
+  },
+
+  // MOBILES
+  // Android Mobile User Agents
+  'Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0)': {
+    type: 'mobile', os: { name: 'windowsPhone', version: 7.5 }, browser: { name: 'Internet Explorer', version: 9 },
+  },
+  'Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1': {
+    type: 'mobile', os: { name: 'android', version: 2.3 }, browser: { name: 'Safari', version: 4 },
+  },
+  'Mozilla/5.0 (Linux; U; Android 4.0.3; ko-kr; LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30': {
+    type: 'mobile', os: { name: 'android', version: 4 }, browser: { name: 'Safari', version: 4 },
+  },
+  'Mozilla/5.0 (Linux; U; Android 4.4.3; ko-kr; LG-L160L Build/IML74K) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30': {
+    type: 'mobile', os: { name: 'android', version: 4.4 }, browser: { name: 'Safari', version: 4 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 55 },
+  },
+  'Mozilla/5.0 (Linux; Android 7.0; SM-G892A Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/60.0.3112.107 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 7 }, browser: { name: 'Chrome', version: 60 },
+  },
+  'Mozilla/5.0 (Linux; Android 7.0; SM-G930VC Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/58.0.3029.83 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 7 }, browser: { name: 'Chrome', version: 58 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0.1; SM-G935S Build/MMB29K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 55 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0.1; SM-G920V Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.98 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 52 },
+  },
+  'Mozilla/5.0 (Linux; Android 5.1.1; SM-G928X Build/LMY47X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 5.1 }, browser: { name: 'Chrome', version: 47 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0.1; Nexus 6P Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 47 },
+  },
+  'Mozilla/5.0 (Linux; Android 7.1.1; G8231 Build/41.2.A.0.219; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/59.0.3071.125 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 7.1 }, browser: { name: 'Chrome', version: 59 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0.1; E6653 Build/32.2.A.0.253) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.98 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 52 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0; HTC One X10 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/61.0.3163.98 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 61 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0; HTC One M9 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.98 Mobile Safari/537.3': {
+    type: 'mobile', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 52 },
+  },
+  'Mozilla/5.0 (Linux; U; 4.0.2; en-us; Galaxy Nexus Build/ICL53F) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Mobile Safari/534.30': {
+    type: 'mobile', os: { name: '', version: 0 }, browser: { name: 'Safari', version: 4 },
+  },
+  // iPhone User Agents
+  'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1': {
+    type: 'mobile', os: { name: 'iOS', version: 11 }, browser: { name: 'Safari', version: 11 },
+  },
+  'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) Version/11.0 Mobile/15A5341f Safari/604.1': {
+    type: 'mobile', os: { name: 'iOS', version: 11 }, browser: { name: 'Safari', version: 11 },
+  },
+  'Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A5370a Safari/604.1': {
+    type: 'mobile', os: { name: 'iOS', version: 11 }, browser: { name: 'Safari', version: 11 },
+  },
+  'Mozilla/5.0 (iPhone9,3; U; CPU iPhone OS 10_0_1 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A403 Safari/602.1': {
+    type: 'mobile', os: { name: 'iOS', version: 10 }, browser: { name: 'Safari', version: 10 },
+  },
+  'Mozilla/5.0 (iPhone9,4; U; CPU iPhone OS 10_0_1 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A403 Safari/602.1': {
+    type: 'mobile', os: { name: 'iOS', version: 10 }, browser: { name: 'Safari', version: 10 },
+  },
+  'Mozilla/5.0 (Apple-iPhone7C2/1202.466; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543 Safari/419.3': {
+    type: 'mobile', os: { name: '', version: 0 }, browser: { name: 'Safari', version: 3 },
+  },
+  'Mozilla/5.0 (Windows Phone 10.0; Android 6.0.1; Microsoft; RM-1152) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Mobile Safari/537.36 Edge/15.15254': {
+    type: 'mobile', os: { name: 'windowsPhone', version: 10 }, browser: { name: 'Edge', version: 15.15254 },
+  },
+  'Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; RM-1127_16056) AppleWebKit/537.36(KHTML, like Gecko) Chrome/42.0.2311.135 Mobile Safari/537.36 Edge/12.10536': {
+    type: 'mobile', os: { name: 'windowsPhone', version: 10 }, browser: { name: 'Edge', version: 12.10536 },
+  },
+  'Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/13.1058': {
+    type: 'mobile', os: { name: 'windowsPhone', version: 10 }, browser: { name: 'Edge', version: 13.1058 },
+  },
+  'Mozilla/5.0 (Linux; 7.0; SM-G892A Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/60.0.3112.107 Mobile Safari/537.36': {
+    type: 'mobile', os: { name: '', version: 0 }, browser: { name: 'Chrome', version: 60 },
+  },
+  'Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1': {
+    type: 'mobile', os: { name: 'iOS', version: 11.3 }, browser: { name: 'Safari', version: 11 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0.1; SM-G903F Build/MMB29K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36 ACHEETAHI/1': {
+    type: 'mobile', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 44 },
+  },
+
+  // TABLETS
+  'Mozilla/5.0 (Linux; Android 5.0.2; SAMSUNG SM-T550 Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/3.3 Chrome/38.0.2125.102 Safari/537.36': {
+    type: 'tablet', os: { name: 'android', version: 5 }, browser: { name: 'Chrome', version: 38 },
+  },
+  'Mozilla/5.0 (Linux; Android 5.1.1; SHIELD Tablet Build/LMY48C) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.98 Safari/537.36': {
+    type: 'tablet', os: { name: 'android', version: 5.1 }, browser: { name: 'Chrome', version: 52 },
+  },
+  'Mozilla/5.0 (Linux; Android 7.0; Pixel C Build/NRD90M; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/52.0.2743.98 Safari/537.36': {
+    type: 'tablet', os: { name: 'android', version: 7 }, browser: { name: 'Chrome', version: 52 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0.1; SGP771 Build/32.2.A.0.253; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/52.0.2743.98 Safari/537.36': {
+    type: 'tablet', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 52 },
+  },
+  'Mozilla/5.0 (Linux; Android 6.0.1; SHIELD Tablet K1 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Safari/537.36': {
+    type: 'tablet', os: { name: 'android', version: 6 }, browser: { name: 'Chrome', version: 55 },
+  },
+  'Mozilla/5.0 (Linux; Android 7.0; SM-T827R4 Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Safari/537.36': {
+    type: 'tablet', os: { name: 'android', version: 7 }, browser: { name: 'Chrome', version: 60 },
+  },
+  'Mozilla/5.0 (Linux; Android 4.4.3; KFTHWI Build/KTU84M) AppleWebKit/537.36 (KHTML, like Gecko) Silk/47.1.79 like Chrome/47.0.2526.80 Safari/537.36': {
+    type: 'tablet', os: { name: 'android', version: 4.4 }, browser: { name: 'Chrome', version: 47 },
+  },
+  'Mozilla/5.0 (Linux; Android 5.0.2; LG-V410/V41020c Build/LRX22G) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/34.0.1847.118 Safari/537.36': {
+    type: 'tablet', os: { name: 'android', version: 5 }, browser: { name: 'Chrome', version: 34 },
+  },
+  'Mozilla/5.0 (iPad; CPU OS 9_3_2 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13F69 Safari/601.1': {
+    type: 'tablet', os: { name: 'iOS', version: 9.3 }, browser: { name: 'Safari', version: 9 },
+  },
+  'Mozilla/5.0 (iPad; CPU OS 11_0_2 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A421 Safari/604.1': {
+    type: 'tablet', os: { name: 'iOS', version: 11 }, browser: { name: 'Safari', version: 11 },
+  },
+  'Mozilla/5.0 (Android 7.0; Tablet; rv:62.0) Gecko/62.0 Firefox/62.0': {
+    type: 'tablet', os: { name: 'android', version: 7 }, browser: { name: 'Firefox', version: 62 },
+  },
+
+  // DESKTOP
+  'Mozilla/ 5.0(Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari / 537.36': {
+    type: 'desktop', os: { name: 'Windows', version: 6.1 }, browser: { name: 'Chrome', version: 41 },
+  },
+  'Mozilla/5.0 (hone; CPU one OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1': {
+    type: 'desktop', os: { name: '', version: 0 }, browser: { name: 'Safari', version: 11 },
+  },
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246': {
+    type: 'desktop', os: { name: 'Windows', version: 10 }, browser: { name: 'Edge', version: 12.246 },
+  },
+  'Mozilla/5.0 (X11; CrOS x86_64 8172.45.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.64 Safari/537.36': {
+    type: 'desktop', os: { name: '', version: 0 }, browser: { name: 'Chrome', version: 51 },
+  },
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9': {
+    type: 'desktop', os: { name: 'Mac', version: 10.11 }, browser: { name: 'Safari', version: 9 },
+  },
+  'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.111 Safari/537.36': {
+    type: 'desktop', os: { name: 'Windows', version: 6.1 }, browser: { name: 'Chrome', version: 47 },
+  },
+};
+
+describe('Sublime Adapter', function () {
+  describe('detectDevice', function () {
+    it('should correctly detect device', function () {
+      const uaStub = sinon.stub(window.navigator, 'userAgent');
+
+      Object.keys(USER_AGENT).forEach(userAgent => {
+        const value = USER_AGENT[userAgent];
+        uaStub.value(userAgent);
+        expect(spec.detectDevice()).to.equal(value.type.charAt(0));
+      });
 
-let utils = require('src/utils');
-
-describe('Sublime Adapter', function() {
-  const adapter = newBidder(spec);
+      uaStub.restore();
+    })
+  });
 
-  describe('sendEvent', function() {
+  describe('sendEvent', function () {
     let sandbox;
+    const triggeredPixelProperties = [
+      't',
+      'tse',
+      'z',
+      'e',
+      'src',
+      'puid',
+      'notid',
+      'pbav',
+      'pubpbv',
+      'device',
+      'pubtimeout',
+    ];
 
     beforeEach(function () {
       sandbox = sinon.sandbox.create();
@@ -16,8 +195,10 @@ describe('Sublime Adapter', function() {
 
     it('should trigger pixel', function () {
       sandbox.spy(utils, 'triggerPixel');
-      sendEvent('test', true);
+      spec.sendEvent('test');
       expect(utils.triggerPixel.called).to.equal(true);
+      const params = utils.parseUrl(utils.triggerPixel.args[0][0]).search;
+      expect(Object.keys(params)).to.have.members(triggeredPixelProperties);
     });
 
     afterEach(function () {
@@ -25,34 +206,104 @@ describe('Sublime Adapter', function() {
     });
   })
 
-  describe('inherited functions', function() {
-    it('exists and is a function', function() {
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      const adapter = newBidder(spec);
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
   });
 
-  describe('isBidRequestValid', function() {
-    let bid = {
-      bidder: 'sublime',
-      params: {
-        zoneId: 24549,
-        endpoint: '',
-      },
-    };
+  describe('isBidRequestValid', function () {
+    let bid;
+    beforeEach(function () {
+      bid = {
+        bidder: 'sublime',
+        params: {
+          zoneId: 24549,
+          endpoint: '',
+        },
+      };
+    })
+
+    afterEach(function () {
+      delete window.sublime;
+    })
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
 
-    it('should return true when required params found', function() {
+    it('should return true when a valid notifyId is provided', function () {
+      bid.params.notifyId = 'f1514724-0922-4b45-a297-27531aeb829a';
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
-    it('should return false when required params are not passed', function() {
-      let bid = Object.assign({}, bid);
+    it('should return false when an invalid notifyId is provided', function () {
+      bid.params.notifyId = 'some_invalid_notify_id';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required params are not passed', function () {
       bid.params = {};
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('should return false when the notifyId does not match sublime one', function () {
+      bid.params.notifyId = 'f1514724-0922-4b45-a297-27531aeb829a';
+      window.sublime = { notifyId: '5c444a48-7713-4333-a895-44b1ae793417' };
+      expect(spec.isBidRequestValid(bid)).to.equal(false); // FIX THIS
+      delete window.sublime;
+    });
   });
 
-  describe('buildRequests', function() {
-    let bidRequests = [
+  describe('getNotifyId', function () {
+    afterEach(function () {
+      delete window.sublime;
+    });
+
+    it('generates a notifyId (not in params, not in sublime)', function () {
+      const params = Object.freeze({});
+      window.sublime = {};
+      const notifyId = spec.getNotifyId(params);
+      expect(spec.isValidNotifyId(notifyId)).to.be.true;
+      expect(window.sublime.notifyId).to.equal(notifyId);
+    });
+
+    it('uses sublime notifyId (not in params, present in sublime)', function () {
+      const params = Object.freeze({});
+      window.sublime = { notifyId: '5c444a48-7713-4333-a895-44b1ae793417' };
+      const notifyId = spec.getNotifyId(params);
+      expect(notifyId).to.equal('5c444a48-7713-4333-a895-44b1ae793417');
+      expect(window.sublime.notifyId).to.equal('5c444a48-7713-4333-a895-44b1ae793417');
+    });
+
+    it('assigns notifyId from params to sublime (present in params, not in sublime)', function () {
+      const params = Object.freeze({ notifyId: 'f1514724-0922-4b45-a297-27531aeb829a' });
+      window.sublime = {};
+      const notifyId = spec.getNotifyId(params);
+      expect(notifyId).to.equal('f1514724-0922-4b45-a297-27531aeb829a');
+      expect(window.sublime.notifyId).to.equal('f1514724-0922-4b45-a297-27531aeb829a');
+    });
+
+    it('returns notifyId from params (same in params & in sublime)', function () {
+      const params = Object.freeze({ notifyId: 'f1514724-0922-4b45-a297-27531aeb829a' });
+      window.sublime = { notifyId: 'f1514724-0922-4b45-a297-27531aeb829a' };
+      const notifyId = spec.getNotifyId(params);
+      expect(notifyId).to.equal('f1514724-0922-4b45-a297-27531aeb829a');
+      expect(window.sublime.notifyId).to.equal('f1514724-0922-4b45-a297-27531aeb829a');
+    });
+
+    it('returns notifyId from params (present in params & in sublime, with mismatch)', function () {
+      const params = Object.freeze({ notifyId: 'f1514724-0922-4b45-a297-27531aeb829a' });
+      window.sublime = { notifyId: '5c444a48-7713-4333-a895-44b1ae793417' };
+      const notifyId = spec.getNotifyId(params);
+      expect(notifyId).to.equal('f1514724-0922-4b45-a297-27531aeb829a');
+      expect(window.sublime.notifyId).to.equal('5c444a48-7713-4333-a895-44b1ae793417'); // did not change
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
       {
         bidder: 'sublime',
         adUnitCode: 'sublime_code',
@@ -61,7 +312,8 @@ describe('Sublime Adapter', function() {
         requestId: 'xyz654',
         params: {
           zoneId: 123,
-          callbackName: 'false'
+          callbackName: 'false',
+          notifyId: 'ea252d4f-93d9-4c2f-8cca-88cec3a0a347'
         }
       }, {
         bidder: 'sublime',
@@ -75,7 +327,7 @@ describe('Sublime Adapter', function() {
       }
     ];
 
-    let bidderRequest = {
+    const bidderRequest = {
       gdprConsent: {
         consentString: 'EOHEIRCOUCOUIEHZIOEIU-TEST',
         gdprApplies: true
@@ -86,26 +338,36 @@ describe('Sublime Adapter', function() {
       }
     };
 
-    let request = spec.buildRequests(bidRequests, bidderRequest);
-
-    it('should have a post method', function() {
+    it('should have a post method', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request[0].method).to.equal('POST');
       expect(request[1].method).to.equal('POST');
     });
 
-    it('should contains a request id equals to the bid id', function() {
-      expect(request[0].data.requestId).to.equal(bidRequests[0].bidId);
-      expect(request[1].data.requestId).to.equal(bidRequests[1].bidId);
+    it('should contains a request id equals to the bid id', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      for (let i = 0; i < request.length; i = i + 1) {
+        expect(JSON.parse(request[i].data).requestId).to.equal(bidRequests[i].bidId);
+      }
     });
 
-    it('should have an url that contains bid keyword', function() {
+    it('should have an url that contains bid keyword', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request[0].url).to.match(/bid/);
       expect(request[1].url).to.match(/bid/);
     });
+
+    it('should contains a request notifyId', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      for (let i = 0; i < request.length; i = i + 1) {
+        const { notifyId } = JSON.parse(request[i].data);
+        expect(spec.isValidNotifyId(notifyId)).to.be.true;
+      }
+    });
   });
 
-  describe('buildRequests: default arguments', function() {
-    let bidRequests = [{
+  describe('buildRequests: default arguments', function () {
+    const bidRequests = [{
       bidder: 'sublime',
       adUnitCode: 'sublime_code',
       bidId: 'abc1234',
@@ -116,29 +378,29 @@ describe('Sublime Adapter', function() {
       }
     }];
 
-    let request = spec.buildRequests(bidRequests);
-
-    it('should have an url that match the default endpoint', function() {
+    it('should have an url that match the default endpoint', function () {
+      const request = spec.buildRequests(bidRequests);
       expect(request[0].url).to.equal('https://pbjs.sskzlabs.com/bid');
     });
   });
 
-  describe('interpretResponse', function() {
-    let serverResponse = {
+  describe('interpretResponse', function () {
+    const serverResponse = {
       'request_id': '3db3773286ee59',
+      'sspname': 'foo',
       'cpm': 0.5,
       'ad': '<!-- Creative -->',
     };
 
-    it('should get correct bid response', function() {
+    it('should get correct bid response', function () {
       // Mock the fire method
       top.window.sublime = {
         analytics: {
-          fire: function() {}
+          fire: function () { }
         }
       };
 
-      let expectedResponse = [
+      const expectedResponse = [
         {
           requestId: '',
           cpm: 0.5,
@@ -147,24 +409,26 @@ describe('Sublime Adapter', function() {
           creativeId: 1,
           dealId: 1,
           currency: 'USD',
+          sspname: 'foo',
           netRevenue: true,
           ttl: 600,
-          pbav: '0.5.2',
+          pbav: '0.8.0',
           ad: '',
         },
       ];
-      let result = spec.interpretResponse({body: serverResponse});
+      const result = spec.interpretResponse({ body: serverResponse });
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
     });
 
-    it('should get correct default size for 1x1', function() {
-      let serverResponse = {
+    it('should get correct default size for 1x1', function () {
+      const serverResponse = {
         'requestId': 'xyz654_2',
+        'sspname': 'sublime',
         'cpm': 0.5,
         'ad': '<!-- Creative -->',
       };
 
-      let bidRequest = {
+      const bidRequest = {
         bidder: 'sublime',
         adUnitCode: 'sublime_code_2',
         bidId: 'abc1234_2',
@@ -178,9 +442,9 @@ describe('Sublime Adapter', function() {
         }
       };
 
-      let result = spec.interpretResponse({body: serverResponse}, bidRequest);
+      const result = spec.interpretResponse({ body: serverResponse }, bidRequest);
 
-      let expectedResponse = {
+      const expectedResponse = {
         requestId: 'xyz654_2',
         cpm: 0.5,
         width: 1,
@@ -191,30 +455,32 @@ describe('Sublime Adapter', function() {
         netRevenue: true,
         ttl: 600,
         ad: '<!-- Creative -->',
-        pbav: '0.5.2',
+        pbav: '0.8.0',
+        sspname: 'sublime'
       };
 
       expect(result[0]).to.deep.equal(expectedResponse);
     });
 
     it('should return bid empty response', function () {
-      let serverResponse = '';
-      let bidRequest = {};
+      const serverResponse = '';
+      const bidRequest = {};
 
-      let result = spec.interpretResponse({ body: serverResponse }, bidRequest);
+      const result = spec.interpretResponse({ body: serverResponse }, bidRequest);
 
-      let expectedResponse = [];
+      const expectedResponse = [];
 
       expect(result).to.deep.equal(expectedResponse);
     });
 
     it('should return bid with default value in response', function () {
-      let serverResponse = {
+      const serverResponse = {
         'requestId': 'xyz654_2',
+        'sspname': 'sublime',
         'ad': '<!-- ad -->',
       };
 
-      let bidRequest = {
+      const bidRequest = {
         bidder: 'sublime',
         adUnitCode: 'sublime_code_2',
         bidId: 'abc1234_2',
@@ -228,9 +494,9 @@ describe('Sublime Adapter', function() {
         }
       };
 
-      let result = spec.interpretResponse({ body: serverResponse }, bidRequest);
+      const result = spec.interpretResponse({ body: serverResponse }, bidRequest);
 
-      let expectedResponse = {
+      const expectedResponse = {
         requestId: 'xyz654_2',
         cpm: 0,
         width: 1,
@@ -238,23 +504,24 @@ describe('Sublime Adapter', function() {
         creativeId: 1,
         dealId: 1,
         currency: 'EUR',
+        sspname: 'sublime',
         netRevenue: true,
         ttl: 600,
         ad: '<!-- ad -->',
-        pbav: '0.5.2',
+        pbav: '0.8.0',
       };
 
       expect(result[0]).to.deep.equal(expectedResponse);
     });
 
     it('should return empty bid response because of timeout', function () {
-      let serverResponse = {
+      const serverResponse = {
         'requestId': 'xyz654_2',
         'timeout': true,
         'ad': '',
       };
 
-      let bidRequest = {
+      const bidRequest = {
         bidder: 'sublime',
         adUnitCode: 'sublime_code_2',
         bidId: 'abc1234_2',
@@ -268,9 +535,9 @@ describe('Sublime Adapter', function() {
         }
       };
 
-      let result = spec.interpretResponse({ body: serverResponse }, bidRequest);
+      const result = spec.interpretResponse({ body: serverResponse }, bidRequest);
 
-      let expectedResponse = [];
+      const expectedResponse = [];
 
       expect(result).to.deep.equal(expectedResponse);
 
@@ -278,5 +545,70 @@ describe('Sublime Adapter', function() {
         spec.onTimeout(result);
       });
     });
+
+    it('should add advertiserDomains', function () {
+      const responseWithAdvertiserDomains = utils.deepClone(serverResponse);
+      responseWithAdvertiserDomains.advertiserDomains = ['a_sublime_adomain'];
+
+      const bidRequest = {
+        bidder: 'sublime',
+        params: {
+          zoneId: 456,
+        }
+      };
+
+      const result = spec.interpretResponse({ body: responseWithAdvertiserDomains }, bidRequest);
+
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserDomains']);
+      expect(Object.keys(result[0].meta.advertiserDomains)).to.deep.equal([]);
+    });
+  });
+
+  describe('onBidWon', function () {
+    let sandbox;
+    const bid = { foo: 'bar' };
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+
+    it('should trigger "bidwon" pixel', function () {
+      sandbox.spy(utils, 'triggerPixel');
+      spec.onBidWon(bid);
+      const params = utils.parseUrl(utils.triggerPixel.args[0][0]).search;
+      expect(params.e).to.equal('bidwon');
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+    });
   });
+
+  describe('onTimeout', function () {
+    let sandbox;
+    // Array of bids that timed out
+    const timeoutData = [{
+      timeout: 1234
+    }];
+
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+
+    it('should trigger "bidtimeout" pixel', function () {
+      sandbox.spy(utils, 'triggerPixel');
+      spec.onTimeout(timeoutData);
+      const params = utils.parseUrl(utils.triggerPixel.args[0][0]).search;
+      expect(params.e).to.equal('bidtimeout');
+    });
+
+    it('should set timeout value in state', function () {
+      spec.onTimeout(timeoutData);
+      expect(spec.state).to.deep.include({ timeout: 1234 });
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+    });
+  })
 });
diff --git a/test/spec/modules/synacormediaBidAdapter_spec.js b/test/spec/modules/synacormediaBidAdapter_spec.js
index e15481d47e5..0773d29789d 100644
--- a/test/spec/modules/synacormediaBidAdapter_spec.js
+++ b/test/spec/modules/synacormediaBidAdapter_spec.js
@@ -1,6 +1,6 @@
 import { assert, expect } from 'chai';
 import { BANNER } from 'src/mediaTypes.js';
-import {config} from 'src/config.js';
+import { config } from 'src/config.js';
 import { spec } from 'modules/synacormediaBidAdapter.js';
 
 describe('synacormediaBidAdapter ', function () {
@@ -11,12 +11,19 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [300, 250],
         params: {
           seatId: 'prebid',
-          placementId: '1234'
+          tagId: '1234'
         }
       };
     });
 
     it('should return true when params placementId and seatId are truthy', function () {
+      bid.params.placementId = bid.params.tagId;
+      delete bid.params.tagId;
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return true when params tagId and seatId are truthy', function () {
+      delete bid.params.placementId;
       assert(spec.isBidRequestValid(bid));
     });
 
@@ -35,8 +42,9 @@ describe('synacormediaBidAdapter ', function () {
       assert.isFalse(spec.isBidRequestValid(bid));
     });
 
-    it('should return false when placementId param is missing', function () {
+    it('should return false when both placementId param and tagId param are missing', function () {
       delete bid.params.placementId;
+      delete bid.params.tagId;
       assert.isFalse(spec.isBidRequestValid(bid));
     });
 
@@ -47,13 +55,13 @@ describe('synacormediaBidAdapter ', function () {
     });
   });
 
-  describe('impression type', function() {
+  describe('impression type', function () {
     let nonVideoReq = {
       bidId: '9876abcd',
       sizes: [[300, 250], [300, 600]],
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         bidfloor: '0.50'
       }
     };
@@ -63,7 +71,7 @@ describe('synacormediaBidAdapter ', function () {
       sizes: [[300, 250], [300, 600]],
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         bidfloor: '0.50'
       },
       mediaTypes: {
@@ -84,7 +92,7 @@ describe('synacormediaBidAdapter ', function () {
       sizes: [[640, 480]],
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         bidfloor: '0.50'
       },
       mediaTypes: {
@@ -99,7 +107,7 @@ describe('synacormediaBidAdapter ', function () {
         }
       },
     };
-    it('should return correct impression type video/banner', function() {
+    it('should return correct impression type video/banner', function () {
       assert.isFalse(spec.isVideoBid(nonVideoReq));
       assert.isFalse(spec.isVideoBid(bannerReq));
       assert.isTrue(spec.isVideoBid(videoReq));
@@ -110,7 +118,7 @@ describe('synacormediaBidAdapter ', function () {
       bidder: 'synacormedia',
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         video: {
           minduration: 30
         }
@@ -118,12 +126,12 @@ describe('synacormediaBidAdapter ', function () {
       mediaTypes: {
         video: {
           context: 'instream',
-          playerSize: [[ 640, 480 ]]
+          playerSize: [[640, 480]]
         }
       },
       adUnitCode: 'video1',
       transactionId: '93e5def8-29aa-4fe8-bd3a-0298c39f189a',
-      sizes: [[ 640, 480 ]],
+      sizes: [[640, 480]],
       bidId: '2624fabbb078e8',
       bidderRequestId: '117954d20d7c9c',
       auctionId: 'defd525f-4f1e-4416-a4cb-ae53be90e706',
@@ -141,7 +149,7 @@ describe('synacormediaBidAdapter ', function () {
         referer: 'https://localhost:9999/test/pages/video.html?pbjs_debug=true',
         reachedTop: true,
         numIframes: 0,
-        stack: [ 'https://localhost:9999/test/pages/video.html?pbjs_debug=true' ]
+        stack: ['https://localhost:9999/test/pages/video.html?pbjs_debug=true']
       },
       start: 1553624929700
     };
@@ -163,7 +171,7 @@ describe('synacormediaBidAdapter ', function () {
       sizes: [[300, 250], [300, 600]],
       params: {
         seatId: 'prebid',
-        placementId: '1234',
+        tagId: '1234',
         bidfloor: '0.50'
       }
     };
@@ -175,6 +183,85 @@ describe('synacormediaBidAdapter ', function () {
       }
     };
 
+    let bidderRequestWithTimeout = {
+      auctionId: 'xyz123',
+      refererInfo: {
+        referer: 'https://test.com/foo/bar'
+      },
+      timeout: 3000
+    };
+
+    let bidderRequestWithCCPA = {
+      auctionId: 'xyz123',
+      refererInfo: {
+        referer: 'https://test.com/foo/bar'
+      },
+      uspConsent: '1YYY'
+    };
+
+    let validBidRequestWithUserIds = {
+      bidId: '9876abcd',
+      sizes: [[300, 250], [300, 600]],
+      params: {
+        seatId: 'prebid',
+        tagId: '1234',
+        bidfloor: '0.50'
+      },
+      userIdAsEids: [
+        {
+          source: 'pubcid.org',
+          uids: [{
+            id: 'cid0032l2344jskdsl3',
+            atype: 1
+          }]
+        },
+        {
+          source: 'liveramp.com',
+          uids: [{
+            id: 'lrv39010k42dl',
+            atype: 1,
+            ext: {
+              rtiPartner: 'TDID'
+            }
+          }]
+        },
+        {
+          source: 'neustar.biz',
+          uids: [{
+            id: 'neustar809-044-23njhwer3',
+            atype: 1
+          }]
+        }
+      ]
+    };
+
+    let expectedEids = [
+      {
+        source: 'pubcid.org',
+        uids: [{
+          id: 'cid0032l2344jskdsl3',
+          atype: 1
+        }]
+      },
+      {
+        source: 'liveramp.com',
+        uids: [{
+          id: 'lrv39010k42dl',
+          atype: 1,
+          ext: {
+            rtiPartner: 'TDID'
+          }
+        }]
+      },
+      {
+        source: 'neustar.biz',
+        uids: [{
+          id: 'neustar809-044-23njhwer3',
+          atype: 1
+        }]
+      }
+    ];
+
     let expectedDataImp1 = {
       banner: {
         format: [
@@ -216,13 +303,49 @@ describe('synacormediaBidAdapter ', function () {
       expect(reqVideo.data.imp).to.eql([expectedDataVideo1]);
     });
 
+    it('should return no tmax', function () {
+      let req = spec.buildRequests([validBidRequest], bidderRequest);
+      expect(req.data).to.not.have.property('tmax');
+    });
+
+    it('should return tmax equal to callback timeout', function () {
+      let req = spec.buildRequests([validBidRequest], bidderRequestWithTimeout);
+      expect(req.data.tmax).to.eql(bidderRequestWithTimeout.timeout);
+    });
+
+    it('should return tmax equal to smaller global timeout', function () {
+      let sandbox = sinon.sandbox.create();
+      sandbox.stub(config, 'getConfig').callsFake(key => {
+        const config = {
+          'bidderTimeout': bidderRequestWithTimeout.timeout - 100
+        };
+        return config[key];
+      });
+      let req = spec.buildRequests([validBidRequest], bidderRequestWithTimeout);
+      sandbox.restore();
+      expect(req.data.tmax).to.eql(bidderRequestWithTimeout.timeout - 100);
+    });
+
+    it('should return tmax equal to smaller callback timeout', function () {
+      let sandbox = sinon.sandbox.create();
+      sandbox.stub(config, 'getConfig').callsFake(key => {
+        const config = {
+          'bidderTimeout': bidderRequestWithTimeout.timeout + 100
+        };
+        return config[key];
+      });
+      let req = spec.buildRequests([validBidRequest], bidderRequestWithTimeout);
+      sandbox.restore();
+      expect(req.data.tmax).to.eql(bidderRequestWithTimeout.timeout);
+    });
+
     it('should return multiple bids when multiple valid requests with the same seatId are used', function () {
       let secondBidRequest = {
         bidId: 'foobar',
         sizes: [[300, 600]],
         params: {
           seatId: validBidRequest.params.seatId,
-          placementId: '5678',
+          tagId: '5678',
           bidfloor: '0.50'
         }
       };
@@ -254,14 +377,14 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'somethingelse',
-          placementId: '5678',
+          tagId: '5678',
           bidfloor: '0.50'
         }
       };
       let req = spec.buildRequests([mismatchedSeatBidRequest, validBidRequest], bidderRequest);
       expect(req).to.have.property('method', 'POST');
       expect(req).to.have.property('url');
-      expect(req.url).to.contain('https://prebid.technoratimedia.com/openrtb/bids/somethingelse?');
+      expect(req.url).to.contain('https://somethingelse.technoratimedia.com/openrtb/bids/somethingelse?');
       expect(req.data.id).to.equal('xyz123');
       expect(req.data.imp).to.eql([
         {
@@ -287,7 +410,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           bidfloor: 'abcd'
         }
       };
@@ -319,7 +442,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'prebid',
-          placementId: '1234'
+          tagId: '1234'
         }
       };
       let req = spec.buildRequests([badFloorBidRequest], bidderRequest);
@@ -350,7 +473,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           pos: 1
         }
       };
@@ -382,7 +505,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300, 250]],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
         }
       };
       let req = spec.buildRequests([newPosBidRequest], bidderRequest);
@@ -411,13 +534,13 @@ describe('synacormediaBidAdapter ', function () {
       expect(spec.buildRequests([validBidRequest], null)).to.be.undefined;
     });
 
-    it('should return empty impression when there is no valid sizes in bidrequest', function() {
+    it('should return empty impression when there is no valid sizes in bidrequest', function () {
       let validBidReqWithoutSize = {
         bidId: '9876abcd',
         sizes: [],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           bidfloor: '0.50'
         }
       };
@@ -427,7 +550,7 @@ describe('synacormediaBidAdapter ', function () {
         sizes: [[300]],
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           bidfloor: '0.50'
         }
       };
@@ -449,7 +572,7 @@ describe('synacormediaBidAdapter ', function () {
         bidder: 'synacormedia',
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           video: {
             minduration: 30,
             maxduration: 45,
@@ -464,12 +587,12 @@ describe('synacormediaBidAdapter ', function () {
         mediaTypes: {
           video: {
             context: 'instream',
-            playerSize: [[ 640, 480 ]]
+            playerSize: [[640, 480]]
           }
         },
         adUnitCode: 'video1',
         transactionId: '93e5def8-29aa-4fe8-bd3a-0298c39f189a',
-        sizes: [[ 640, 480 ]],
+        sizes: [[640, 480]],
         bidId: '2624fabbb078e8',
         bidderRequestId: '117954d20d7c9c',
         auctionId: 'defd525f-4f1e-4416-a4cb-ae53be90e706',
@@ -507,7 +630,7 @@ describe('synacormediaBidAdapter ', function () {
         bidder: 'synacormedia',
         params: {
           seatId: 'prebid',
-          placementId: '1234',
+          tagId: '1234',
           video: {
             minduration: 30,
             maxduration: 45,
@@ -518,7 +641,7 @@ describe('synacormediaBidAdapter ', function () {
         mediaTypes: {
           video: {
             context: 'instream',
-            playerSize: [[ 640, 480 ]],
+            playerSize: [[640, 480]],
             startdelay: 1,
             linearity: 1,
             placement: 1,
@@ -527,7 +650,7 @@ describe('synacormediaBidAdapter ', function () {
         },
         adUnitCode: 'video1',
         transactionId: '93e5def8-29aa-4fe8-bd3a-0298c39f189a',
-        sizes: [[ 640, 480 ]],
+        sizes: [[640, 480]],
         bidId: '2624fabbb078e8',
         bidderRequestId: '117954d20d7c9c',
         auctionId: 'defd525f-4f1e-4416-a4cb-ae53be90e706',
@@ -560,10 +683,80 @@ describe('synacormediaBidAdapter ', function () {
         }
       ]);
     });
+    it('should create params.video object if not present on bid request and move any video params in the mediaTypes object to it', function () {
+      let validBidRequestVideo = {
+        bidder: 'synacormedia',
+        params: {
+          seatId: 'prebid',
+          tagId: '1234'
+        },
+        mediaTypes: {
+          video: {
+            context: 'instream',
+            playerSize: [[ 640, 480 ]],
+            startdelay: 1,
+            linearity: 1,
+            placement: 1,
+            mimes: ['video/mp4']
+          }
+        },
+        adUnitCode: 'video1',
+        transactionId: '93e5def8-29aa-4fe8-bd3a-0298c39f189a',
+        sizes: [[ 640, 480 ]],
+        bidId: '2624fabbb078e8',
+        bidderRequestId: '117954d20d7c9c',
+        auctionId: 'defd525f-4f1e-4416-a4cb-ae53be90e706',
+        src: 'client',
+        bidRequestsCount: 1
+      };
+
+      let req = spec.buildRequests([validBidRequestVideo], bidderRequest);
+      expect(req.data.imp).to.eql([
+        {
+          video: {
+            h: 480,
+            pos: 0,
+            w: 640,
+            startdelay: 1,
+            linearity: 1,
+            placement: 1,
+            mimes: ['video/mp4']
+          },
+          id: 'v2624fabbb078e8-640x480',
+          tagid: '1234',
+        }
+      ]);
+    });
+    it('should contain the CCPA privacy string when UspConsent is in bidder request', function () {
+      // banner test
+      let req = spec.buildRequests([validBidRequest], bidderRequestWithCCPA);
+      expect(req).be.an('object');
+      expect(req).to.have.property('method', 'POST');
+      expect(req).to.have.property('url');
+      expect(req.url).to.contain('https://prebid.technoratimedia.com/openrtb/bids/prebid?');
+      expect(req.data).to.exist.and.to.be.an('object');
+      expect(req.data.id).to.equal('xyz123');
+      expect(req.data.regs.ext.us_privacy).to.equal('1YYY');
+      expect(req.data.imp).to.eql([expectedDataImp1]);
+    });
+    it('should contain user object when user ids are present in the bidder request', function () {
+      let req = spec.buildRequests([validBidRequestWithUserIds], bidderRequest);
+      expect(req).be.an('object');
+      expect(req).to.have.property('method', 'POST');
+      expect(req).to.have.property('url');
+      expect(req.url).to.contain('https://prebid.technoratimedia.com/openrtb/bids/prebid?');
+      expect(req.data).to.exist.and.to.be.an('object');
+      expect(req.data.id).to.equal('xyz123');
+      expect(req.data.user).be.an('object');
+      expect(req.data.user).to.have.property('ext');
+      expect(req.data.user.ext).to.have.property('eids');
+      expect(req.data.user.ext.eids).to.eql(expectedEids);
+      expect(req.data.imp).to.eql([expectedDataImp1]);
+    });
   });
 
-  describe('Bid Requests with schain object ', function() {
-    let validBidReq = {
+  describe('Bid Requests with placementId should be backward compatible ', function () {
+    let validVideoBidReq = {
       bidder: 'synacormedia',
       params: {
         seatId: 'prebid',
@@ -589,6 +782,68 @@ describe('synacormediaBidAdapter ', function () {
       src: 'client',
       bidRequestsCount: 1,
       bidderRequestsCount: 1,
+      bidderWinsCount: 0
+    };
+
+    let validBannerBidRequest = {
+      bidId: '9876abcd',
+      sizes: [[300, 250]],
+      params: {
+        seatId: 'prebid',
+        placementId: '1234',
+      }
+    };
+
+    let bidderRequest = {
+      refererInfo: {
+        referer: 'http://localhost:9999/'
+      },
+      bidderCode: 'synacormedia',
+      auctionId: 'f8a75621-d672-4cbb-9275-3db7d74fb110'
+    };
+
+    it('should return valid bid request for banner impression', function () {
+      let req = spec.buildRequests([validBannerBidRequest], bidderRequest);
+      expect(req).to.have.property('method', 'POST');
+      expect(req).to.have.property('url');
+      expect(req.url).to.contain('//prebid.technoratimedia.com/openrtb/bids/prebid?src=$$REPO_AND_VERSION$$');
+    });
+
+    it('should return valid bid request for video impression', function () {
+      let req = spec.buildRequests([validVideoBidReq], bidderRequest);
+      expect(req).to.have.property('method', 'POST');
+      expect(req).to.have.property('url');
+      expect(req.url).to.contain('//prebid.technoratimedia.com/openrtb/bids/prebid?src=$$REPO_AND_VERSION$$');
+    });
+  });
+
+  describe('Bid Requests with schain object ', function () {
+    let validBidReq = {
+      bidder: 'synacormedia',
+      params: {
+        seatId: 'prebid',
+        tagId: 'demo1',
+        pos: 1,
+        video: {}
+      },
+      renderer: {
+        url: '../syncOutstreamPlayer.js'
+      },
+      mediaTypes: {
+        video: {
+          playerSize: [[300, 250]],
+          context: 'outstream'
+        }
+      },
+      adUnitCode: 'div-1',
+      transactionId: '0869f34e-090b-4b20-84ee-46ff41405a39',
+      sizes: [[300, 250]],
+      bidId: '22b3a2268d9f0e',
+      bidderRequestId: '1d195910597e13',
+      auctionId: '3375d336-2aea-4ee7-804c-6d26b621ad20',
+      src: 'client',
+      bidRequestsCount: 1,
+      bidderRequestsCount: 1,
       bidderWinsCount: 0,
       schain: {
         ver: '1.0',
@@ -614,7 +869,7 @@ describe('synacormediaBidAdapter ', function () {
           bidder: 'synacormedia',
           params: {
             seatId: 'prebid',
-            placementId: 'demo1',
+            tagId: 'demo1',
             pos: 1,
             video: {}
           },
@@ -668,23 +923,52 @@ describe('synacormediaBidAdapter ', function () {
   describe('interpretResponse', function () {
     let bidResponse = {
       id: '10865933907263896~9998~0',
-      impid: 'b9876abcd-300x250',
+      impid: 'b9876abcd',
       price: 0.13,
       crid: '1022-250',
       adm: '<script src=\"//uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=${AUCTION_PRICE}\"></script>',
-      nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=${AUCTION_PRICE}'
+      nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=${AUCTION_PRICE}',
+      w: 300,
+      h: 250
     };
     let bidResponse2 = {
       id: '10865933907263800~9999~0',
-      impid: 'b9876abcd-300x600',
+      impid: 'b9876abcd',
       price: 1.99,
       crid: '9993-013',
       adm: '<script src=\"//uat-net.technoratimedia.com/openrtb/tags?ID=OTk5OX4wJkFVQ1RJT05fU0VBVF9JR&AUCTION_PRICE=${AUCTION_PRICE}\"></script>',
-      nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=OTk5OX4wJkFVQ1RJT05fU0VBVF9JR&AUCTION_PRICE=${AUCTION_PRICE}'
+      nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=OTk5OX4wJkFVQ1RJT05fU0VBVF9JR&AUCTION_PRICE=${AUCTION_PRICE}',
+      w: 300,
+      h: 600
     };
 
+    let bidRequest = {
+      data: {
+        id: '',
+        imp: [
+          {
+            id: 'abc123',
+            banner: {
+              format: [
+                {
+                  w: 400,
+                  h: 350
+                }
+              ],
+              pos: 1
+            }
+          }
+        ],
+      },
+      method: 'POST',
+      options: {
+        contentType: 'application/json',
+        withCredentials: true
+      },
+      url: 'https://prebid.technoratimedia.com/openrtb/bids/prebid?src=prebid_prebid_3.27.0-pre'
+    };
     let serverResponse;
-    beforeEach(function() {
+    beforeEach(function () {
       serverResponse = {
         body: {
           id: 'abc123',
@@ -697,6 +981,26 @@ describe('synacormediaBidAdapter ', function () {
     });
 
     it('should return 1 video bid when 1 bid is in the video response', function () {
+      bidRequest = {
+        data: {
+          id: 'abcd1234',
+          imp: [
+            {
+              video: {
+                w: 640,
+                h: 480
+              },
+              id: 'v2da7322b2df61f'
+            }
+          ]
+        },
+        method: 'POST',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true
+        },
+        url: 'https://prebid.technoratimedia.com/openrtb/bids/prebid?src=prebid_prebid_3.27.0-pre'
+      };
       let serverRespVideo = {
         body: {
           id: 'abcd1234',
@@ -705,14 +1009,16 @@ describe('synacormediaBidAdapter ', function () {
               bid: [
                 {
                   id: '11339128001692337~9999~0',
-                  impid: 'v2da7322b2df61f-640x480',
+                  impid: 'v2da7322b2df61f',
                   price: 0.45,
                   nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}',
                   adm: '<?xml version="1.0" encoding="UTF-8"?>\n<VAST version="3.0">\n<Ad id="11339128001692337~9999~0">\n<Wrapper>\n<AdSystem>Synacor Media Ad Server - 9999</AdSystem>\n<VASTAdTagURI>https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}</VASTAdTagURI>\n</Wrapper>\n</Ad>\n</VAST>',
-                  adomain: [ 'psacentral.org' ],
+                  adomain: ['psacentral.org'],
                   cid: 'bidder-crid',
                   crid: 'bidder-cid',
-                  cat: []
+                  cat: [],
+                  w: 640,
+                  h: 480
                 }
               ],
               seat: '9999'
@@ -722,11 +1028,10 @@ describe('synacormediaBidAdapter ', function () {
       };
 
       // serverResponse.body.seatbid[0].bid.push(bidResponse);
-      let resp = spec.interpretResponse(serverRespVideo);
+      let resp = spec.interpretResponse(serverRespVideo, bidRequest);
       expect(resp).to.be.an('array').to.have.lengthOf(1);
       expect(resp[0]).to.eql({
         requestId: '2da7322b2df61f',
-        adId: '11339128001692337-9999-0',
         cpm: 0.45,
         width: 640,
         height: 480,
@@ -735,7 +1040,8 @@ describe('synacormediaBidAdapter ', function () {
         netRevenue: true,
         mediaType: 'video',
         ad: '<?xml version="1.0" encoding="UTF-8"?>\n<VAST version="3.0">\n<Ad id="11339128001692337~9999~0">\n<Wrapper>\n<AdSystem>Synacor Media Ad Server - 9999</AdSystem>\n<VASTAdTagURI>https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=0.45</VASTAdTagURI>\n</Wrapper>\n</Ad>\n</VAST>',
-        ttl: 60,
+        ttl: 420,
+        meta: { advertiserDomains: ['psacentral.org'] },
         videoCacheKey: 'QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk',
         vastUrl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=0.45'
       });
@@ -743,11 +1049,10 @@ describe('synacormediaBidAdapter ', function () {
 
     it('should return 1 bid when 1 bid is in the response', function () {
       serverResponse.body.seatbid[0].bid.push(bidResponse);
-      let resp = spec.interpretResponse(serverResponse);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
       expect(resp).to.be.an('array').to.have.lengthOf(1);
       expect(resp[0]).to.eql({
         requestId: '9876abcd',
-        adId: '10865933907263896-9998-0',
         cpm: 0.13,
         width: 300,
         height: 250,
@@ -756,7 +1061,7 @@ describe('synacormediaBidAdapter ', function () {
         netRevenue: true,
         mediaType: BANNER,
         ad: '<script src=\"//uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=0.13\"></script>',
-        ttl: 60
+        ttl: 420
       });
     });
 
@@ -766,11 +1071,10 @@ describe('synacormediaBidAdapter ', function () {
         seat: '9999',
         bid: [bidResponse2],
       });
-      let resp = spec.interpretResponse(serverResponse);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
       expect(resp).to.be.an('array').to.have.lengthOf(2);
       expect(resp[0]).to.eql({
         requestId: '9876abcd',
-        adId: '10865933907263896-9998-0',
         cpm: 0.13,
         width: 300,
         height: 250,
@@ -779,12 +1083,11 @@ describe('synacormediaBidAdapter ', function () {
         netRevenue: true,
         mediaType: BANNER,
         ad: '<script src=\"//uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=0.13\"></script>',
-        ttl: 60
+        ttl: 420
       });
 
       expect(resp[1]).to.eql({
         requestId: '9876abcd',
-        adId: '10865933907263800-9999-0',
         cpm: 1.99,
         width: 300,
         height: 600,
@@ -793,12 +1096,12 @@ describe('synacormediaBidAdapter ', function () {
         netRevenue: true,
         mediaType: BANNER,
         ad: '<script src=\"//uat-net.technoratimedia.com/openrtb/tags?ID=OTk5OX4wJkFVQ1RJT05fU0VBVF9JR&AUCTION_PRICE=1.99\"></script>',
-        ttl: 60
+        ttl: 420
       });
     });
 
     it('should not return a bid when no bid is in the response', function () {
-      let resp = spec.interpretResponse(serverResponse);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
       expect(resp).to.be.an('array').that.is.empty;
     });
 
@@ -817,14 +1120,16 @@ describe('synacormediaBidAdapter ', function () {
               bid: [
                 {
                   id: '11339128001692337~9999~0',
-                  impid: 'v2da7322b2df61f-640x480',
+                  impid: 'v2da7322b2df61f',
                   price: 0.45,
                   nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}',
                   adm: '<?xml version="1.0" encoding="UTF-8"?>\n<VAST version="3.0">\n<Ad id="11339128001692337~9999~0">\n<Wrapper>\n<AdSystem>Synacor Media Ad Server - 9999</AdSystem>\n<VASTAdTagURI>https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}</VASTAdTagURI>\n</Wrapper>\n</Ad>\n</VAST>',
-                  adomain: [ 'psacentral.org' ],
+                  adomain: ['psacentral.org'],
                   cid: 'bidder-crid',
                   crid: 'bidder-cid',
-                  cat: []
+                  cat: [],
+                  w: 640,
+                  h: 480
                 }
               ],
               seat: '9999'
@@ -840,9 +1145,177 @@ describe('synacormediaBidAdapter ', function () {
         return config[key];
       });
 
-      let resp = spec.interpretResponse(serverRespVideo);
-	  sandbox.restore();
-	  expect(resp[0].videoCacheKey).to.not.exist;
+      let resp = spec.interpretResponse(serverRespVideo, bidRequest);
+      sandbox.restore();
+      expect(resp[0].videoCacheKey).to.not.exist;
+    });
+
+    it('should use video bid request height and width if not present in response', function () {
+      bidRequest = {
+        data: {
+          id: 'abcd1234',
+          imp: [
+            {
+              video: {
+                w: 300,
+                h: 250
+              },
+              id: 'v2da7322b2df61f'
+            }
+          ]
+        },
+        method: 'POST',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true
+        },
+        url: 'https://prebid.technoratimedia.com/openrtb/bids/prebid?src=prebid_prebid_3.27.0-pre'
+      };
+
+      let serverRespVideo = {
+        body: {
+          id: 'abcd1234',
+          seatbid: [
+            {
+              bid: [
+                {
+                  id: '11339128001692337~9999~0',
+                  impid: 'v2da7322b2df61f',
+                  price: 0.45,
+                  nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}',
+                  adm: '<?xml version="1.0" encoding="UTF-8"?>\n<VAST version="3.0">\n<Ad id="11339128001692337~9999~0">\n<Wrapper>\n<AdSystem>Synacor Media Ad Server - 9999</AdSystem>\n<VASTAdTagURI>https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}</VASTAdTagURI>\n</Wrapper>\n</Ad>\n</VAST>',
+                  adomain: ['psacentral.org'],
+                  cid: 'bidder-crid',
+                  crid: 'bidder-cid',
+                  cat: []
+                }
+              ],
+              seat: '9999'
+            }
+          ]
+        }
+      };
+      let resp = spec.interpretResponse(serverRespVideo, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.eql({
+        requestId: '2da7322b2df61f',
+        cpm: 0.45,
+        width: 300,
+        height: 250,
+        creativeId: '9999_bidder-cid',
+        currency: 'USD',
+        netRevenue: true,
+        mediaType: 'video',
+        ad: '<?xml version="1.0" encoding="UTF-8"?>\n<VAST version="3.0">\n<Ad id="11339128001692337~9999~0">\n<Wrapper>\n<AdSystem>Synacor Media Ad Server - 9999</AdSystem>\n<VASTAdTagURI>https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=0.45</VASTAdTagURI>\n</Wrapper>\n</Ad>\n</VAST>',
+        ttl: 420,
+        meta: { advertiserDomains: ['psacentral.org'] },
+        videoCacheKey: 'QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk',
+        vastUrl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=0.45'
+      });
+    });
+
+    it('should use banner bid request height and width if not present in response', function () {
+      bidRequest = {
+        data: {
+          id: 'abc123',
+          imp: [
+            {
+              banner: {
+                format: [{
+                  w: 400,
+                  h: 350
+                }]
+              },
+              id: 'babc123'
+            }
+          ]
+        },
+        method: 'POST',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true
+        },
+        url: 'https://prebid.technoratimedia.com/openrtb/bids/prebid?src=prebid_prebid_3.27.0-pre'
+      };
+
+      bidResponse = {
+        id: '10865933907263896~9998~0',
+        impid: 'babc123',
+        price: 0.13,
+        crid: '1022-250',
+        adm: '<script src=\"//uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=${AUCTION_PRICE}\"></script>',
+        nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=${AUCTION_PRICE}',
+      };
+
+      serverResponse.body.seatbid[0].bid.push(bidResponse);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.eql({
+        requestId: 'abc123',
+        cpm: 0.13,
+        width: 400,
+        height: 350,
+        creativeId: '9998_1022-250',
+        currency: 'USD',
+        netRevenue: true,
+        mediaType: BANNER,
+        ad: '<script src=\"//uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=0.13\"></script>',
+        ttl: 420
+      });
+    });
+
+    it('should return ttl equal to DEFAULT_TTL_MAX if bid.exp and bid.ext["imds.tv"].ttl are both undefined', function() {
+      const br = { ...bidResponse };
+      serverResponse.body.seatbid[0].bid.push(br);
+      const resp = spec.interpretResponse(serverResponse, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.have.property('ttl');
+      expect(resp[0].ttl).to.equal(420);
+    });
+
+    it('should return ttl equal to bid.ext["imds.tv"].ttl if it is defined but bid.exp is undefined', function() {
+      let br = { ext: { 'imds.tv': { ttl: 4321 } }, ...bidResponse };
+      serverResponse.body.seatbid[0].bid.push(br);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.have.property('ttl');
+      expect(resp[0].ttl).to.equal(4321);
+    });
+
+    it('should return ttl equal to bid.exp if bid.exp is less than or equal to DEFAULT_TTL_MAX and bid.ext["imds.tv"].ttl is undefined', function() {
+      const br = { exp: 123, ...bidResponse };
+      serverResponse.body.seatbid[0].bid.push(br);
+      const resp = spec.interpretResponse(serverResponse, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.have.property('ttl');
+      expect(resp[0].ttl).to.equal(123);
+    });
+
+    it('should return ttl equal to DEFAULT_TTL_MAX if bid.exp is greater than DEFAULT_TTL_MAX and bid.ext["imds.tv"].ttl is undefined', function() {
+      const br = { exp: 4321, ...bidResponse };
+      serverResponse.body.seatbid[0].bid.push(br);
+      const resp = spec.interpretResponse(serverResponse, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.have.property('ttl');
+      expect(resp[0].ttl).to.equal(420);
+    });
+
+    it('should return ttl equal to bid.exp if bid.exp is less than or equal to bid.ext["imds.tv"].ttl', function() {
+      const br = { exp: 1234, ext: { 'imds.tv': { ttl: 4321 } }, ...bidResponse };
+      serverResponse.body.seatbid[0].bid.push(br);
+      const resp = spec.interpretResponse(serverResponse, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.have.property('ttl');
+      expect(resp[0].ttl).to.equal(1234);
+    });
+
+    it('should return ttl equal to bid.ext["imds.tv"].ttl if bid.exp is greater than bid.ext["imds.tv"].ttl', function() {
+      const br = { exp: 4321, ext: { 'imds.tv': { ttl: 1234 } }, ...bidResponse };
+      serverResponse.body.seatbid[0].bid.push(br);
+      const resp = spec.interpretResponse(serverResponse, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.have.property('ttl');
+      expect(resp[0].ttl).to.equal(1234);
     });
   });
   describe('getUserSyncs', function () {
@@ -863,4 +1336,148 @@ describe('synacormediaBidAdapter ', function () {
       expect(usersyncs).to.be.an('array').that.is.empty;
     });
   });
+
+  describe('Bid Requests with price module should use if available', function () {
+    let validVideoBidRequest = {
+      bidder: 'synacormedia',
+      params: {
+        bidfloor: '0.50',
+        seatId: 'prebid',
+        placementId: 'demo1',
+        pos: 1,
+        video: {}
+      },
+      renderer: {
+        url: '../syncOutstreamPlayer.js'
+      },
+      mediaTypes: {
+        video: {
+          playerSize: [[300, 250]],
+          context: 'outstream'
+        }
+      },
+      adUnitCode: 'div-1',
+      transactionId: '0869f34e-090b-4b20-84ee-46ff41405a39',
+      sizes: [[300, 250]],
+      bidId: '22b3a2268d9f0e',
+      bidderRequestId: '1d195910597e13',
+      auctionId: '3375d336-2aea-4ee7-804c-6d26b621ad20',
+      src: 'client',
+      bidRequestsCount: 1,
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0
+    };
+
+    let validBannerBidRequest = {
+      bidId: '9876abcd',
+      sizes: [[300, 250]],
+      params: {
+        bidfloor: '0.50',
+        seatId: 'prebid',
+        placementId: '1234',
+      }
+    };
+
+    let bidderRequest = {
+      refererInfo: {
+        referer: 'http://localhost:9999/'
+      },
+      bidderCode: 'synacormedia',
+      auctionId: 'f8a75621-d672-4cbb-9275-3db7d74fb110'
+    };
+
+    it('should return valid bidfloor using price module for banner/video impression', function () {
+      let bannerRequest = spec.buildRequests([validBannerBidRequest], bidderRequest);
+      let videoRequest = spec.buildRequests([validVideoBidRequest], bidderRequest);
+
+      expect(bannerRequest.data.imp[0].bidfloor).to.equal(0.5);
+      expect(videoRequest.data.imp[0].bidfloor).to.equal(0.5);
+
+      let priceModuleFloor = 3;
+      let floorResponse = { currency: 'USD', floor: priceModuleFloor };
+
+      validBannerBidRequest.getFloor = () => { return floorResponse; };
+      validVideoBidRequest.getFloor = () => { return floorResponse; };
+
+      bannerRequest = spec.buildRequests([validBannerBidRequest], bidderRequest);
+      videoRequest = spec.buildRequests([validVideoBidRequest], bidderRequest);
+
+      expect(bannerRequest.data.imp[0].bidfloor).to.equal(priceModuleFloor);
+      expect(videoRequest.data.imp[0].bidfloor).to.equal(priceModuleFloor);
+    });
+  });
+
+  describe('Bid Requests with gpid or anything in bid.ext should use if available', function () {
+    let validVideoBidRequest = {
+      bidder: 'synacormedia',
+      params: {
+        seatId: 'prebid',
+        placementId: 'demo1',
+        pos: 1,
+        video: {}
+      },
+      renderer: {
+        url: '../syncOutstreamPlayer.js'
+      },
+      ortb2Imp: {
+        ext: {
+          gpid: '/1111/homepage-video',
+	          data: {
+            pbadslot: '/1111/homepage-video'
+          }
+        }
+      },
+      mediaTypes: {
+        video: {
+          playerSize: [[300, 250]],
+          context: 'outstream'
+        }
+      },
+      adUnitCode: 'div-1',
+      transactionId: '0869f34e-090b-4b20-84ee-46ff41405a39',
+      sizes: [[300, 250]],
+      bidId: '22b3a2268d9f0e',
+      bidderRequestId: '1d195910597e13',
+      auctionId: '3375d336-2aea-4ee7-804c-6d26b621ad20',
+      src: 'client',
+      bidRequestsCount: 1,
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0
+    };
+
+    let validBannerBidRequest = {
+      bidId: '9876abcd',
+      sizes: [[300, 250]],
+      params: {
+        seatId: 'prebid',
+        placementId: '1234',
+      },
+      ortb2Imp: {
+        ext: {
+          gpid: '/1111/homepage-banner',
+	          data: {
+            pbadslot: '/1111/homepage-banner'
+          }
+        }
+      }
+    };
+
+    let bidderRequest = {
+      refererInfo: {
+        referer: 'http://localhost:9999/'
+      },
+      bidderCode: 'synacormedia',
+      auctionId: 'f8a75621-d672-4cbb-9275-3db7d74fb110'
+    };
+
+    it('should return valid gpid and pbadslot', function () {
+      let videoRequest = spec.buildRequests([validVideoBidRequest], bidderRequest);
+      let bannerRequest = spec.buildRequests([validBannerBidRequest], bidderRequest);
+
+      expect(videoRequest.data.imp[0].ext.gpid).to.equal('/1111/homepage-video');
+      expect(videoRequest.data.imp[0].ext.data.pbadslot).to.equal('/1111/homepage-video');
+      expect(bannerRequest.data.imp[0].ext.gpid).to.equal('/1111/homepage-banner');
+      expect(bannerRequest.data.imp[0].ext.data.pbadslot).to.equal('/1111/homepage-banner');
+    });
+  });
 });
diff --git a/test/spec/modules/taboolaBidAdapter_spec.js b/test/spec/modules/taboolaBidAdapter_spec.js
new file mode 100644
index 00000000000..17cc5fc0213
--- /dev/null
+++ b/test/spec/modules/taboolaBidAdapter_spec.js
@@ -0,0 +1,731 @@
+import {expect} from 'chai';
+import {spec, internal, END_POINT_URL, userData} from 'modules/taboolaBidAdapter.js';
+import {config} from '../../../src/config'
+import * as utils from '../../../src/utils'
+import {server} from '../../mocks/xhr'
+
+describe('Taboola Adapter', function () {
+  let hasLocalStorage, cookiesAreEnabled, getDataFromLocalStorage, localStorageIsEnabled, getCookie, commonBidRequest;
+
+  beforeEach(() => {
+    hasLocalStorage = sinon.stub(userData.storageManager, 'hasLocalStorage');
+    cookiesAreEnabled = sinon.stub(userData.storageManager, 'cookiesAreEnabled');
+    getCookie = sinon.stub(userData.storageManager, 'getCookie');
+    getDataFromLocalStorage = sinon.stub(userData.storageManager, 'getDataFromLocalStorage');
+    localStorageIsEnabled = sinon.stub(userData.storageManager, 'localStorageIsEnabled');
+    commonBidRequest = createBidRequest();
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      taboola: {
+        storageAllowed: true
+      }
+    };
+  });
+
+  afterEach(() => {
+    hasLocalStorage.restore();
+    cookiesAreEnabled.restore();
+    getCookie.restore();
+    getDataFromLocalStorage.restore();
+    localStorageIsEnabled.restore();
+
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+  })
+
+  const displayBidRequestParams = {
+    sizes: [[300, 250], [300, 600]]
+  }
+
+  const createBidRequest = () => ({
+    bidder: 'taboola',
+    params: {
+      publisherId: 'publisherId',
+      tagId: 'placement name'
+    },
+    bidId: utils.generateUUID(),
+    auctionId: utils.generateUUID(),
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should fail when bid is invalid - tagId isn`t defined', function () {
+      const bid = {
+        bidder: 'taboola',
+        params: {
+          publisherId: 'publisherId'
+        },
+        ...displayBidRequestParams
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+
+    it('should fail when bid is invalid - publisherId isn`t defined', function () {
+      const bid = {
+        bidder: 'taboola',
+        params: {
+          tagId: 'below the article'
+        },
+        ...displayBidRequestParams
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+
+    it('should fail when bid is invalid - sizes isn`t defined', function () {
+      const bid = {
+        bidder: 'taboola',
+        params: {
+          publisherId: 'publisherId',
+          tagId: 'below the article'
+        },
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+
+    it('should succeed when bid contains valid', function () {
+      const bid = {
+        bidder: 'taboola',
+        params: {
+          publisherId: 'publisherId',
+          tagId: 'below the article'
+        },
+        ...displayBidRequestParams,
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+  })
+
+  describe('onBidWon', function () {
+    it('onBidWon exist as a function', () => {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function');
+    });
+
+    it('should resolve price macro in nurl', function () {
+      const nurl = 'http://win.example.com/${AUCTION_PRICE}';
+      const bid = {
+        requestId: 1,
+        cpm: 2,
+        originalCpm: 3.4,
+        creativeId: 1,
+        ttl: 60,
+        netRevenue: true,
+        mediaType: 'banner',
+        ad: '...',
+        width: 300,
+        height: 250,
+        nurl: nurl
+      }
+      spec.onBidWon(bid);
+      expect(server.requests[0].url).to.equals('http://win.example.com/3.4')
+    });
+  });
+
+  describe('buildRequests', function () {
+    const defaultBidRequest = {
+      ...createBidRequest(),
+      ...displayBidRequestParams,
+    }
+
+    const commonBidderRequest = {
+      refererInfo: {
+        page: 'https://example.com/ref',
+        ref: 'https://ref',
+        domain: 'example.com',
+      }
+    }
+
+    it('should build display request', function () {
+      const expectedData = {
+        'imp': [{
+          'id': 1,
+          'banner': {
+            format: [{
+              w: displayBidRequestParams.sizes[0][0],
+              h: displayBidRequestParams.sizes[0][1]
+            },
+            {
+              w: displayBidRequestParams.sizes[1][0],
+              h: displayBidRequestParams.sizes[1][1]
+            }
+            ]
+          },
+          'tagid': commonBidRequest.params.tagId,
+          'bidfloor': null,
+          'bidfloorcur': 'USD',
+          'ext': {}
+        }],
+        'site': {
+          'id': commonBidRequest.params.publisherId,
+          'name': commonBidRequest.params.publisherId,
+          'domain': commonBidderRequest.refererInfo.domain,
+          'page': commonBidderRequest.refererInfo.page,
+          'ref': commonBidderRequest.refererInfo.ref,
+          'publisher': {'id': commonBidRequest.params.publisherId},
+          'content': {'language': navigator.language}
+        },
+        'device': {'ua': navigator.userAgent},
+        'source': {'fd': 1},
+        'bcat': [],
+        'badv': [],
+        'wlang': [],
+        'user': {
+          'buyeruid': 0,
+          'ext': {},
+        },
+        'regs': {'coppa': 0, 'ext': {}},
+        'ext': {}
+      };
+
+      const res = spec.buildRequests([defaultBidRequest], commonBidderRequest);
+
+      expect(res.url).to.equal(`${END_POINT_URL}/${commonBidRequest.params.publisherId}`);
+      expect(res.data).to.deep.equal(JSON.stringify(expectedData));
+    });
+
+    it('should pass optional parameters in request', function () {
+      const optionalParams = {
+        bidfloor: 0.25,
+        bidfloorcur: 'EUR'
+      };
+
+      const bidRequest = {
+        ...defaultBidRequest,
+        params: {...commonBidRequest.params, ...optionalParams}
+      };
+
+      const res = spec.buildRequests([bidRequest], commonBidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.imp[0].bidfloor).to.deep.equal(0.25);
+      expect(resData.imp[0].bidfloorcur).to.deep.equal('EUR');
+    });
+
+    it('should pass bid floor', function () {
+      const bidRequest = {
+        ...defaultBidRequest,
+        params: {...commonBidRequest.params},
+        getFloor: function() {
+          return {
+            currency: 'USD',
+            floor: 2.7,
+          }
+        }
+      };
+      const res = spec.buildRequests([bidRequest], commonBidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.imp[0].bidfloor).to.deep.equal(2.7);
+      expect(resData.imp[0].bidfloorcur).to.deep.equal('USD');
+    });
+
+    it('should pass bid floor even if it is a bid floor param', function () {
+      const optionalParams = {
+        bidfloor: 0.25,
+        bidfloorcur: 'EUR'
+      };
+
+      const bidRequest = {
+        ...defaultBidRequest,
+        params: {...commonBidRequest.params, ...optionalParams},
+        getFloor: function() {
+          return {
+            currency: 'USD',
+            floor: 2.7,
+          }
+        }
+      };
+      const res = spec.buildRequests([bidRequest], commonBidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.imp[0].bidfloor).to.deep.equal(2.7);
+      expect(resData.imp[0].bidfloorcur).to.deep.equal('USD');
+    });
+
+    it('should pass impression position', function () {
+      const optionalParams = {
+        position: 2
+      };
+
+      const bidRequest = {
+        ...defaultBidRequest,
+        params: {...commonBidRequest.params, ...optionalParams}
+      };
+
+      const res = spec.buildRequests([bidRequest], commonBidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.imp[0].banner.pos).to.deep.equal(2);
+    });
+
+    it('should pass gpid if configured', function () {
+      const ortb2Imp = {
+        ext: {
+          gpid: '/homepage/#1'
+        }
+      }
+      const bidRequest = {
+        ...defaultBidRequest,
+        ortb2Imp: ortb2Imp,
+        params: {...commonBidRequest.params}
+      };
+
+      const res = spec.buildRequests([bidRequest], commonBidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.imp[0].ext.gpid).to.deep.equal('/homepage/#1');
+    });
+
+    it('should pass bidder timeout', function () {
+      const bidderRequest = {
+        ...commonBidderRequest,
+        timeout: 500
+      }
+      const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.tmax).to.equal(500);
+    });
+
+    describe('first party data', function () {
+      it('should parse first party data', function () {
+        const bidderRequest = {
+          ...commonBidderRequest,
+          ortb2: {
+            bcat: ['EX1', 'EX2', 'EX3'],
+            badv: ['site.com'],
+            wlang: ['de'],
+          }
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.bcat).to.deep.equal(bidderRequest.ortb2.bcat)
+        expect(resData.badv).to.deep.equal(bidderRequest.ortb2.badv)
+        expect(resData.wlang).to.deep.equal(bidderRequest.ortb2.wlang)
+      });
+
+      it('should pass pageType if exists in ortb2', function () {
+        const bidderRequest = {
+          ...commonBidderRequest,
+          ortb2: {
+            ext: {
+              data: {
+                pageType: 'news'
+              }
+            }
+          }
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.ext.pageType).to.deep.equal(bidderRequest.ortb2.ext.data.pageType);
+      });
+    });
+
+    describe('handle privacy segments when building request', function () {
+      it('should pass GDPR consent', function () {
+        const bidderRequest = {
+          refererInfo: {
+            referer: 'https://example.com/'
+          },
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentString',
+          }
+        };
+
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.user.ext.consent).to.equal('consentString')
+        expect(resData.regs.ext.gdpr).to.equal(1)
+      });
+
+      it('should pass GPP consent if exist in ortb2', function () {
+        const ortb2 = {
+          regs: {
+            gpp: 'testGpp',
+            gpp_sid: [1, 2, 3]
+          }
+        }
+
+        const res = spec.buildRequests([defaultBidRequest], {...commonBidderRequest, ortb2})
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.ext.gpp).to.equal('testGpp')
+        expect(resData.regs.ext.gpp_sid).to.deep.equal([1, 2, 3])
+      });
+
+      it('should pass us privacy consent', function () {
+        const bidderRequest = {
+          refererInfo: {
+            referer: 'https://example.com/'
+          },
+          uspConsent: 'consentString'
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.regs.ext.us_privacy).to.equal('consentString');
+      });
+
+      it('should pass coppa consent', function () {
+        config.setConfig({coppa: true})
+
+        const res = spec.buildRequests([defaultBidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data);
+        expect(resData.regs.coppa).to.equal(1)
+
+        config.resetConfig()
+      });
+    })
+
+    describe('handle userid ', function () {
+      it('should get user id from local storage', function () {
+        getDataFromLocalStorage.returns(51525152);
+        hasLocalStorage.returns(true);
+        localStorageIsEnabled.returns(true);
+
+        const bidderRequest = {
+          ...commonBidderRequest,
+          timeout: 500
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.user.buyeruid).to.equal(51525152);
+      });
+
+      it('should get user id from cookie if local storage isn`t defined', function () {
+        getDataFromLocalStorage.returns(51525152);
+        hasLocalStorage.returns(false);
+        localStorageIsEnabled.returns(false);
+        cookiesAreEnabled.returns(true);
+        getCookie.returns('taboola%20global%3Auser-id=12121212');
+
+        const bidderRequest = {
+          ...commonBidderRequest
+        };
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+
+        expect(resData.user.buyeruid).to.equal('12121212');
+      });
+
+      it('should get user id from TRC if local storage and cookie isn`t defined', function () {
+        hasLocalStorage.returns(false);
+        cookiesAreEnabled.returns(false);
+        localStorageIsEnabled.returns(false);
+
+        window.TRC = {
+          user_id: 31313132
+        };
+
+        const bidderRequest = {
+          ...commonBidderRequest
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.user.buyeruid).to.equal(window.TRC.user_id);
+
+        delete window.TRC;
+      });
+
+      it('should get user id to be 0 if cookie, local storage, TRC isn`t defined', function () {
+        hasLocalStorage.returns(false);
+        cookiesAreEnabled.returns(false);
+
+        const bidderRequest = {
+          ...commonBidderRequest
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.user.buyeruid).to.equal(0);
+      });
+
+      it('should set buyeruid to be 0 if it`s a new user', function () {
+        const bidderRequest = {
+          ...commonBidderRequest
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.user.buyeruid).to.equal(0);
+      });
+    });
+  })
+
+  describe('interpretResponse', function () {
+    const serverResponse = {
+      body: {
+        'id': '49ffg4d58ef9a163a69fhgfghd4fad03621b9e036f24f7_15',
+        'seatbid': [
+          {
+            'bid': [
+              {
+                'id': '0b3dd94348-134b-435f-8db5-6bf5afgfc39e86c',
+                'impid': '1',
+                'price': 0.342068,
+                'adid': '2785119545551083381',
+                'adm': '\u003chtml\u003e\n\u003chead\u003e\n\u003cmeta charset\u003d"UTF-8"\u003e\n\u003cmeta http-equiv\u003d"Content-Type" content\u003d"text/html; charset\u003dutf-8"/\u003e\u003c/head\u003e\n\u003cbody style\u003d"margin: 0px; overflow:hidden;"\u003e \n\u003cscript type\u003d"text/javascript"\u003e\nwindow.tbl_trc_domain \u003d \u0027us-trc.taboola.com\u0027;\nwindow._taboola \u003d window._taboola || [];\n_taboola.push({article:\u0027auto\u0027});\n!function (e, f, u, i) {\nif (!document.getElementById(i)){\ne.async \u003d 1;\ne.src \u003d u;\ne.id \u003d i;\nf.parentNode.insertBefore(e, f);\n}\n}(document.createElement(\u0027script\u0027),\ndocument.getElementsByTagName(\u0027script\u0027)[0],\n\u0027//cdn.taboola.com/libtrc/wattpad-placement-255/loader.js\u0027,\n\u0027tb_loader_script\u0027);\nif(window.performance \u0026\u0026 typeof window.performance.mark \u003d\u003d \u0027function\u0027)\n{window.performance.mark(\u0027tbl_ic\u0027);}\n\u003c/script\u003e\n\n\u003cdiv id\u003d"taboola-below-article-thumbnails" style\u003d"height: 250px; width: 300px;"\u003e\u003c/div\u003e\n\u003cscript type\u003d"text/javascript"\u003e\nwindow._taboola \u003d window._taboola || [];\n_taboola.push({\nmode: \u0027Rbox_300x250_1x1\u0027,\ncontainer: \u0027taboola-below-article-thumbnails\u0027,\nplacement: \u0027wattpad.com_P18694_S257846_W300_H250_N1_TB\u0027,\ntarget_type: \u0027mix\u0027,\n"rtb-win":{ \nbi:\u002749ff4d58ef9a163a696d4fad03621b9e036f24f7_15\u0027,\ncu:\u0027USD\u0027,\nwp:\u0027${AUCTION_PRICE:BF}\u0027,\nwcb:\u0027~!audex-display-impression!~\u0027,\nrt:\u00271643227025284\u0027,\nrdc:\u0027us.taboolasyndication.com\u0027,\nti:\u00274212\u0027,\nex:\u0027MagniteSCoD\u0027,\nbs:\u0027xapi:257846:lvvSm6Ak7_wE\u0027,\nbp:\u002718694\u0027,\nbd:\u0027wattpad.com\u0027,\nsi:\u00279964\u0027\n} \n,\nrec: {"trc":{"si":"a69c7df43b2334f0aa337c37e2d80c21","sd":"v2_a69c7df43b2334f0aa337c37e2d80c21_3c70f7c7d64a65b15e4a4175c9a2cfa51072f04bMagniteSCoD_1643227025_1643227025_CJS1tQEQ5NdWGPLA0d76xo-9ngEgASgEMCY4iegHQIroB0iB09kDUKPPB1gAYABop-G2i_Hl-eVucAA","ui":"3c70f7c7d64a65b15e4a4175c9a2cfa51072f04bMagniteSCoD","plc":"PHON","wi":"-643136642229425433","cc":"CA","route":"US:US:V","el2r":["bulk-metrics","debug","social","metrics","perf"],"uvpw":"1","pi":"1420260","cpb":"GNO629MGIJz__________wEqGXVzLnRhYm9vbGFzeW5kaWNhdGlvbi5jb20yC3RyYy1zY29kMTI5OIDwmrUMQInoB0iK6AdQgdPZA1ijzwdjCN3__________wEQ3f__________ARgjZGMI3AoQoBAYFmRjCNIDEOAGGAhkYwiWFBCcHBgYZGMI9AUQiwoYC2RjCNkUEPkcGB1kYwj0FBCeHRgfZGorNDlmZjRkNThlZjlhMTYzYTY5NmQ0ZmFkMDM2MjFiOWUwMzZmMjRmN18xNXgCgAHpbIgBrPvTxQE","dcga":{"pubConfigOverride":{"border-color":"black","font-weight":"bold","inherit-title-color":"true","module-name":"cta-lazy-module","enable-call-to-action-creative-component":"true","disable-cta-on-custom-module":"true"}},"tslt":{"p-video-overlay":{"cancel":"סגור","goto":"עבור לדף"},"read-more":{"DEFAULT_CAPTION":"%D7%A7%D7%A8%D7%90%20%D7%A2%D7%95%D7%93"},"next-up":{"BTN_TEXT":"לקריאת התוכן הבא"},"time-ago":{"now":"עכשיו","today":"היום","yesterday":"אתמול","minutes":"לפני {0} דקות","hour":"לפני שעה","hours":"לפני {0} שעות","days":"לפני {0} ימים"},"explore-more":{"TITLE_TEXT":"המשיכו לקרוא","POPUP_TEXT":"אל תפספסו הזדמנות לקרוא עוד תוכן מעולה, רגע לפני שתעזבו"}},"evh":"-1964913910","vl":[{"ri":"185db6d274ce94b27caaabd9eed7915b","uip":"wattpad.com_P18694_S257846_W300_H250_N1_TB","ppb":"COIF","estimation_method":"EcpmEstimationMethodType_ESTIMATION","baseline_variant":"false","original_ecpm":"0.4750949889421463","v":[{"thumbnail":"https://cdn.taboola.com/libtrc/static/thumbnails/a2b272be514ca3ebe3f97a4a32a41db5.jpg","all-thumbnails":"https://cdn.taboola.com/libtrc/static/thumbnails/a2b272be514ca3ebe3f97a4a32a41db5.jpg!-#@1600x1000","origin":"default","thumb-size":"1600x1000","title":"Get Roofing Services At Prices You Can Afford In Edmonton","type":"text","published-date":"1641997069","branding-text":"Roofing Services | Search Ads","url":"https://inneth-conded.xyz/9ad2e613-8777-4fe7-9a52-386c88879289?site\u003dwattpad-placement-255\u0026site_id\u003d1420260\u0026title\u003dGet+Roofing+Services+At+Prices+You+Can+Afford+In+Edmonton\u0026platform\u003dSmartphone\u0026campaign_id\u003d15573949\u0026campaign_item_id\u003d3108610633\u0026thumbnail\u003dhttp%3A%2F%2Fcdn.taboola.com%2Flibtrc%2Fstatic%2Fthumbnails%2Fa2b272be514ca3ebe3f97a4a32a41db5.jpg\u0026cpc\u003d{cpc}\u0026click_id\u003dGiCIypnAQogsMTFL3e_mPaVM2qLvK3KRU6LWzEMUgeB6piCit1Uox6CNr5v5n-x1\u0026tblci\u003dGiCIypnAQogsMTFL3e_mPaVM2qLvK3KRU6LWzEMUgeB6piCit1Uox6CNr5v5n-x1#tblciGiCIypnAQogsMTFL3e_mPaVM2qLvK3KRU6LWzEMUgeB6piCit1Uox6CNr5v5n-x1","duration":"0","sig":"328243c4127ff16e3fdcd7270bab908f6f3fc5b4c98d","item-id":"~~V1~~2785119550041083381~~PnBkfBE9JnQxpahv0adkcuIcmMhroRAHXwLZd-7zhunTxvAnL2wqac4MyzR7uD46gj3kUkbS3FhelBtnsiJV6MhkDZRZzzIqDobN6rWmCPA3hYz5D3PLat6nhIftiT1lwdxwdlxkeV_Mfb3eos_TQavImGhxk0e7psNAZxHJ9RKL2w3lppALGgQJoy2o6lkf-pOqODtX1VkgWpEEM4WsVoWOnUTAwdyGd-8yrze8CWNp752y28hl7lleicyO1vByRdbgwlJdnqyroTPEQNNEn1JRxBOSYSWt-Xm3vkPm-G4","uploader":"","is-syndicated":"true","publisher":"search","id":"~~V1~~2785119550041083381~~PnBkfBE9JnQxpahv0adkcuIcmMhroRAHXwLZd-7zhunTxvAnL2wqac4MyzR7uD46gj3kUkbS3FhelBtnsiJV6MhkDZRZzzIqDobN6rWmCPA3hYz5D3PLat6nhIftiT1lwdxwdlxkeV_Mfb3eos_TQavImGhxk0e7psNAZxHJ9RKL2w3lppALGgQJoy2o6lkf-pOqODtX1VkgWpEEM4WsVoWOnUTAwdyGd-8yrze8CWNp752y28hl7lleicyO1vByRdbgwlJdnqyroTPEQNNEn1JRxBOSYSWt-Xm3vkPm-G4","category":"home","views":"0","itp":[{"u":"https://trc.taboola.com/1326786/log/3/unip?en\u003dclickersusa","t":"c"}],"description":""}]}],"cpcud":{"upc":"0.0","upr":"0.0"}}}\n});\n\u003c/script\u003e\n\n\u003cscript type\u003d"text/javascript"\u003e\nwindow._taboola \u003d window._taboola || [];\n_taboola.push({flush: true});\n\u003c/script\u003e\n\n\u003c/body\u003e\n\u003c/html\u003e',
+                'adomain': [
+                  'example.xyz'
+                ],
+                'cid': '15744349',
+                'crid': '278195503434041083381',
+                'w': 300,
+                'h': 250,
+                'exp': 60,
+                'lurl': 'http://us-trc.taboola.com/sample'
+              }
+            ],
+            'seat': '14204545260'
+          }
+        ],
+        'bidid': 'da43860a-4644-442a-b5e0-93f268cf8d19',
+        'cur': 'USD'
+      }
+    };
+
+    const request = {
+      bids: [
+        {
+          ...commonBidRequest,
+          ...displayBidRequestParams
+        }
+      ]
+    }
+
+    it('should return empty array if no valid bids', function () {
+      const res = spec.interpretResponse(serverResponse, [])
+      expect(res).to.be.an('array').that.is.empty
+    });
+
+    it('should return empty array if no server response', function () {
+      const res = spec.interpretResponse({}, request)
+      expect(res).to.be.an('array').that.is.empty
+    });
+
+    it('should return empty array if server response without seatbid', function () {
+      const overriddenServerResponse = {...serverResponse};
+      const seatbid = {...serverResponse.body.seatbid[0]};
+      overriddenServerResponse.body.seatbid[0] = {};
+
+      const res = spec.interpretResponse(overriddenServerResponse, request)
+      expect(res).to.be.an('array').that.is.empty
+
+      overriddenServerResponse.body.seatbid[0] = seatbid;
+    });
+
+    it('should return empty array if server response without bids', function () {
+      const overriddenServerResponse = {...serverResponse};
+      const bid = [...serverResponse.body.seatbid[0].bid];
+      overriddenServerResponse.body.seatbid[0].bid = {};
+
+      const res = spec.interpretResponse(overriddenServerResponse, request)
+      expect(res).to.be.an('array').that.is.empty
+
+      overriddenServerResponse.body.seatbid[0].bid = bid;
+    });
+
+    it('should interpret multi impression request', function () {
+      const multiRequest = {
+        bids: [
+          {
+            ...createBidRequest(),
+            ...displayBidRequestParams
+          },
+          {
+            ...createBidRequest(),
+            ...displayBidRequestParams
+          }
+        ]
+      }
+
+      const multiServerResponse = {
+        body: {
+          'id': '49ffg4d58ef9a163a69fhgfghd4fad03621b9e036f24f7_15',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '0b3dd94348-134b-435f-8db5-6bf5afgfc39e86c',
+                  'impid': '2',
+                  'price': 0.342068,
+                  'adid': '2785119545551083381',
+                  'adm': 'ADM2',
+                  'adomain': [
+                    'example.xyz'
+                  ],
+                  'cid': '15744349',
+                  'crid': '278195503434041083381',
+                  'w': 300,
+                  'h': 250,
+                  'exp': 60,
+                  'lurl': 'http://us-trc.taboola.com/sample'
+                },
+                {
+                  'id': '0b3dd94348-134b-435f-8db5-6bf5afgfc39e86c',
+                  'impid': '1',
+                  'price': 0.342068,
+                  'adid': '2785119545551083381',
+                  'adm': 'ADM1',
+                  'adomain': [
+                    'example.xyz'
+                  ],
+                  'cid': '15744349',
+                  'crid': '278195503434041083381',
+                  'w': 300,
+                  'h': 250,
+                  'exp': 60,
+                  'lurl': 'http://us-trc.taboola.com/sample'
+                }
+              ],
+              'seat': '14204545260'
+            }
+          ],
+          'bidid': 'da43860a-4644-442a-b5e0-93f268cf8d19',
+          'cur': 'USD'
+        }
+      };
+
+      const [bid] = multiServerResponse.body.seatbid[0].bid;
+      const expectedRes = [
+        {
+          requestId: multiRequest.bids[1].bidId,
+          cpm: bid.price,
+          creativeId: bid.crid,
+          ttl: 60,
+          netRevenue: true,
+          currency: multiServerResponse.body.cur,
+          mediaType: 'banner',
+          ad: multiServerResponse.body.seatbid[0].bid[0].adm,
+          width: bid.w,
+          height: bid.h,
+          meta: {
+            'advertiserDomains': bid.adomain
+          },
+        },
+        {
+          requestId: multiRequest.bids[0].bidId,
+          cpm: bid.price,
+          creativeId: bid.crid,
+          ttl: 60,
+          netRevenue: true,
+          currency: multiServerResponse.body.cur,
+          mediaType: 'banner',
+          ad: multiServerResponse.body.seatbid[0].bid[1].adm,
+          width: bid.w,
+          height: bid.h,
+          meta: {
+            'advertiserDomains': bid.adomain
+          },
+        }
+      ]
+
+      const res = spec.interpretResponse(multiServerResponse, multiRequest)
+      expect(res).to.deep.equal(expectedRes)
+    });
+
+    it('should interpret display response', function () {
+      const [bid] = serverResponse.body.seatbid[0].bid;
+      const expectedRes = [
+        {
+          requestId: request.bids[0].bidId,
+          cpm: bid.price,
+          creativeId: bid.crid,
+          ttl: 60,
+          netRevenue: true,
+          currency: serverResponse.body.cur,
+          mediaType: 'banner',
+          ad: bid.adm,
+          width: bid.w,
+          height: bid.h,
+          meta: {
+            'advertiserDomains': bid.adomain
+          },
+        }
+      ]
+
+      const res = spec.interpretResponse(serverResponse, request)
+      expect(res).to.deep.equal(expectedRes)
+    });
+
+    it('should set the correct ttl form the response', function () {
+      // set exp-ttl to be 125
+      const [bid] = serverResponse.body.seatbid[0].bid;
+      serverResponse.body.seatbid[0].bid[0].exp = 125;
+      const expectedRes = [
+        {
+          requestId: request.bids[0].bidId,
+          cpm: bid.price,
+          creativeId: bid.crid,
+          ttl: 125,
+          netRevenue: true,
+          currency: serverResponse.body.cur,
+          mediaType: 'banner',
+          ad: bid.adm,
+          width: bid.w,
+          height: bid.h,
+          meta: {
+            'advertiserDomains': bid.adomain
+          },
+        }
+      ];
+      const res = spec.interpretResponse(serverResponse, request);
+      expect(res).to.deep.equal(expectedRes);
+    });
+  })
+
+  describe('getUserSyncs', function () {
+    const usersyncUrl = 'https://trc.taboola.com/sg/prebidJS/1/cm';
+
+    it('should not return user sync if pixelEnabled is false', function () {
+      const res = spec.getUserSyncs({pixelEnabled: false});
+      expect(res).to.be.an('array').that.is.empty;
+    });
+
+    it('should return user sync if pixelEnabled is true', function () {
+      const res = spec.getUserSyncs({pixelEnabled: true});
+      expect(res).to.deep.equal([{type: 'image', url: usersyncUrl}]);
+    });
+
+    it('should pass consent tokens values', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'GDPR_CONSENT'}, 'USP_CONSENT')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=GDPR_CONSENT&us_privacy=USP_CONSENT`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: false, consentString: undefined}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=0&gdpr_consent=`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: false, consentString: undefined}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=0&gdpr_consent=`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, 'USP_CONSENT')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?us_privacy=USP_CONSENT`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, 'USP_CONSENT', 'GPP_STRING')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?us_privacy=USP_CONSENT&gpp=GPP_STRING`
+      }]);
+    });
+  })
+
+  describe('internal functions', function () {
+    describe('getPageUrl', function () {
+      const bidderRequest = {
+        refererInfo: {
+          page: 'http://canonical.url'
+        }
+      };
+
+      it('should handle empty or missing data', function () {
+        expect(internal.getPageUrl(undefined)).to.equal(utils.getWindowSelf().location.href);
+        expect(internal.getPageUrl('')).to.equal(utils.getWindowSelf().location.href);
+      });
+
+      it('should use bidderRequest.refererInfo.page', function () {
+        expect(internal.getPageUrl(bidderRequest.refererInfo)).to.equal(bidderRequest.refererInfo.page);
+      });
+    });
+
+    describe('getReferrer', function () {
+      it('should handle empty or missing data', function () {
+        expect(internal.getReferrer(undefined)).to.equal(utils.getWindowSelf().document.referrer);
+        expect(internal.getReferrer('')).to.equal(utils.getWindowSelf().document.referrer);
+      });
+
+      it('should use bidderRequest.refererInfo.ref', () => {
+        const bidderRequest = {
+          refererInfo: {
+            ref: 'foobar'
+          }
+        };
+
+        expect(internal.getReferrer(bidderRequest.refererInfo)).to.equal(bidderRequest.refererInfo.ref);
+      });
+    });
+  })
+})
diff --git a/test/spec/modules/talkadsBidAdapter_spec.js b/test/spec/modules/talkadsBidAdapter_spec.js
new file mode 100644
index 00000000000..c48808cbc15
--- /dev/null
+++ b/test/spec/modules/talkadsBidAdapter_spec.js
@@ -0,0 +1,233 @@
+import {expect} from 'chai';
+import {spec} from 'modules/talkadsBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {config} from '../../../src/config';
+import {server} from '../../mocks/xhr';
+
+describe('TalkAds adapter', function () {
+  const commonBidderRequest = {
+    refererInfo: {
+      referer: 'https://example.com/'
+    },
+    timeout: 3000,
+  }
+  const commonBidRequest = {
+    bidder: 'talkads',
+    params: {
+      tag_id: 999999,
+      bidder_url: 'https://test.natexo-programmatic.com/tad/tag/prebid',
+    },
+    bidId: '1a2b3c4d56e7f0',
+    auctionId: '12345678-1234-1a2b-3c4d-1a2b3c4d56e7',
+    transactionId: '4f68b713-04ba-4d7f-8df9-643bcdab5efb',
+  };
+  const nativeBidRequestParams = {
+    nativeParams: {},
+  };
+  const bannerBidRequestParams = {
+    sizes: [[300, 250], [300, 600]],
+  };
+
+  /**
+   * isBidRequestValid
+   */
+  describe('isBidRequestValid1', function() {
+    it('should fail when config is invalid', function () {
+      const bidRequest = {
+        ...commonBidRequest,
+        ...bannerBidRequestParams,
+      };
+      bidRequest.params = Object.assign({}, bidRequest.params);
+      delete bidRequest.params;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  }); // isBidRequestValid1
+  describe('isBidRequestValid2', function() {
+    it('should fail when config is invalid', function () {
+      const bidRequest = {
+        ...commonBidRequest,
+        ...bannerBidRequestParams,
+      };
+      bidRequest.params = Object.assign({}, bidRequest.params);
+      delete bidRequest.params.bidder_url;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  }); // isBidRequestValid2
+  describe('isBidRequestValid3', function() {
+    it('should fail when config is invalid', function () {
+      const bidRequest = {
+        ...commonBidRequest,
+        ...bannerBidRequestParams,
+      };
+      bidRequest.params = Object.assign({}, bidRequest.params);
+      delete bidRequest.params.tag_id;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  }); // isBidRequestValid3
+  describe('isBidRequestValid4', function() {
+    let bidRequest = {
+      ...commonBidRequest,
+      ...bannerBidRequestParams,
+    };
+    it('should succeed when a banner bid is valid', function () {
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+    bidRequest = {
+      ...commonBidRequest,
+      ...nativeBidRequestParams,
+    };
+    it('should succeed when a native bid is valid', function () {
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+  }); // isBidRequestValid4
+
+  /**
+   * buildRequests
+   */
+  describe('buildRequests1', function() {
+    let bidRequest = {
+      ...commonBidRequest,
+      ...bannerBidRequestParams,
+    };
+    const loServerRequest = {
+      cur: 'EUR',
+      timeout: commonBidderRequest.timeout,
+      auction_id: commonBidRequest.auctionId,
+      transaction_id: commonBidRequest.transactionId,
+      bids: [{ id: 0, bid_id: commonBidRequest.bidId, type: 'banner', size: bannerBidRequestParams.sizes }],
+      gdpr: { applies: false, consent: false },
+    };
+    it('should generate a valid banner bid request', function () {
+      let laResponse = spec.buildRequests([bidRequest], commonBidderRequest);
+      expect(laResponse.method).to.equal('POST');
+      expect(laResponse.url).to.equal('https://test.natexo-programmatic.com/tad/tag/prebid/999999');
+      expect(laResponse.data).to.equal(JSON.stringify(loServerRequest));
+    });
+  }); // buildRequests1
+  describe('buildRequests2', function() {
+    let bidRequest = {
+      ...commonBidRequest,
+      ...nativeBidRequestParams,
+    };
+    const loServerRequest = {
+      cur: 'EUR',
+      timeout: commonBidderRequest.timeout,
+      auction_id: commonBidRequest.auctionId,
+      transaction_id: commonBidRequest.transactionId,
+      bids: [{ id: 0, bid_id: commonBidRequest.bidId, type: 'native', size: [] }],
+      gdpr: { applies: false, consent: false },
+    };
+    it('should generate a valid native bid request', function () {
+      let laResponse = spec.buildRequests([bidRequest], commonBidderRequest);
+      expect(laResponse.method).to.equal('POST');
+      expect(laResponse.url).to.equal('https://test.natexo-programmatic.com/tad/tag/prebid/999999');
+      expect(laResponse.data).to.equal(JSON.stringify(loServerRequest));
+    });
+    const bidderRequest = {
+      ...commonBidderRequest,
+      gdprConsent: { gdprApplies: true, consentString: 'yes' }
+    };
+    const loServerRequest2 = {
+      ...loServerRequest,
+      gdpr: { applies: true, consent: 'yes' },
+    };
+    it('should generate a valid native bid request', function () {
+      let laResponse = spec.buildRequests([bidRequest], bidderRequest);
+      expect(laResponse.method).to.equal('POST');
+      expect(laResponse.url).to.equal('https://test.natexo-programmatic.com/tad/tag/prebid/999999');
+      expect(laResponse.data).to.equal(JSON.stringify(loServerRequest2));
+    });
+  }); // buildRequests2
+
+  /**
+   * interpretResponse
+   */
+  describe('interpretResponse1', function() {
+    it('should return empty array if no valid bids', function () {
+      const laResult = spec.interpretResponse({}, [])
+      expect(laResult).to.be.an('array').that.is.empty;
+    });
+    const loServerResult = {
+      body: { status: 'error', error: 'aie' }
+    };
+    it('should return empty array if there is an error', function () {
+      const laResult = spec.interpretResponse(loServerResult, [])
+      expect(laResult).to.be.an('array').that.is.empty;
+    });
+  }); // interpretResponse1
+  describe('interpretResponse2', function() {
+    const loServerResult = {
+      body: {
+        status: 'ok',
+        error: '',
+        pbid: '6147833a65749742875ace47',
+        bids: [{
+          requestId: commonBidRequest.bidId,
+          cpm: 0.10,
+          currency: 'EUR',
+          width: 300,
+          height: 250,
+          ad: 'test ad',
+          ttl: 60,
+          creativeId: 'c123a456',
+          netRevenue: false,
+        }]
+      }
+    };
+    const loExpected = [{
+      requestId: '1a2b3c4d56e7f0',
+      cpm: 0.1,
+      currency: 'EUR',
+      width: 300,
+      height: 250,
+      ad: 'test ad',
+      ttl: 60,
+      creativeId: 'c123a456',
+      netRevenue: false,
+      pbid: '6147833a65749742875ace47'
+    }];
+    it('should return a correct bid response', function () {
+      const laResult = spec.interpretResponse(loServerResult, [])
+      expect(JSON.stringify(laResult)).to.equal(JSON.stringify(loExpected));
+    });
+  }); // interpretResponse2
+
+  /**
+   * onBidWon
+   */
+  describe('onBidWon', function() {
+    it('should not make an ajax call if pbid is null', function () {
+      const loBid = {
+        requestId: '1a2b3c4d56e7f0',
+        cpm: 0.1,
+        currency: 'EUR',
+        width: 300,
+        height: 250,
+        ad: 'test ad',
+        ttl: 60,
+        creativeId: 'c123a456',
+        netRevenue: false,
+        params: [Object.assign({}, commonBidRequest.params)],
+      }
+      spec.onBidWon(loBid)
+      expect(server.requests.length).to.equals(0);
+    });
+    it('should make an ajax call', function () {
+      const loBid = {
+        requestId: '1a2b3c4d56e7f0',
+        cpm: 0.1,
+        currency: 'EUR',
+        width: 300,
+        height: 250,
+        ad: 'test ad',
+        ttl: 60,
+        creativeId: 'c123a456',
+        netRevenue: false,
+        pbid: '6147833a65749742875ace47',
+        params: [Object.assign({}, commonBidRequest.params)],
+      }
+      spec.onBidWon(loBid)
+      expect(server.requests[0].url).to.equals('https://test.natexo-programmatic.com/tad/tag/prebidwon/6147833a65749742875ace47');
+    });
+  }); // onBidWon
+});
diff --git a/test/spec/modules/tapadIdSystem_spec.js b/test/spec/modules/tapadIdSystem_spec.js
new file mode 100644
index 00000000000..bc31f1d37ba
--- /dev/null
+++ b/test/spec/modules/tapadIdSystem_spec.js
@@ -0,0 +1,65 @@
+import { tapadIdSubmodule, graphUrl } from 'modules/tapadIdSystem.js';
+import * as utils from 'src/utils.js';
+
+import { server } from 'test/mocks/xhr.js';
+
+describe('TapadIdSystem', function () {
+  describe('getId', function() {
+    const config = { params: { companyId: 12345 } };
+    it('should call to real time graph endpoint and handle valid response', function() {
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+      expect(request.url).to.eq(`${graphUrl}?company_id=12345&tapad_id_type=TAPAD_ID`);
+
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ tapadId: 'your-tapad-id' }));
+      expect(callbackSpy.lastCall.lastArg).to.eq('your-tapad-id');
+    });
+
+    it('should remove stored tapadId if not found', function() {
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+
+      request.respond(404);
+      expect(callbackSpy.lastCall.lastArg).to.be.undefined;
+    });
+
+    it('should log message with invalid company id', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+
+      request.respond(403);
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Invalid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+
+    it('should log message if company id not given', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId({}).callback;
+      callback(callbackSpy);
+
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+
+    it('should log message if company id is incorrect format', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId({ params: { companyId: 'notANumber' } }).callback;
+      callback(callbackSpy);
+
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+  });
+})
diff --git a/test/spec/modules/taphypeBidAdapter_spec.js b/test/spec/modules/taphypeBidAdapter_spec.js
deleted file mode 100644
index 6b36973814e..00000000000
--- a/test/spec/modules/taphypeBidAdapter_spec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/taphypeBidAdapter.js';
-
-describe('taphypeBidAdapterTests', function () {
-  it('validate_pub_params', function () {
-    expect(spec.isBidRequestValid({
-      bidder: 'taphype',
-      params: {
-        placementId: 12345
-      }
-    })).to.equal(true);
-  });
-
-  it('validate_generated_params', function () {
-    let bidRequestData = [{
-      bidId: 'bid12345',
-      bidder: 'taphype',
-      params: {
-        placementId: 12345
-      },
-      sizes: [[300, 250]]
-    }];
-
-    let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
-
-    expect(req_data.bidId).to.equal('bid12345');
-  });
-
-  it('validate_response_params', function () {
-    let bidRequestData = {
-      data: {
-        bidId: 'bid12345'
-      }
-    };
-
-    let serverResponse = {
-      body: {
-        price: 1.23,
-        ad: '<html></html>',
-        size: '300,250'
-      }
-    };
-
-    let bids = spec.interpretResponse(serverResponse, bidRequestData);
-    expect(bids).to.have.lengthOf(1);
-    let bid = bids[0];
-    expect(bid.cpm).to.equal(1.23);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.width).to.equal('300');
-    expect(bid.height).to.equal('250');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.requestId).to.equal('bid12345');
-    expect(bid.ad).to.equal('<html></html>');
-  });
-});
diff --git a/test/spec/modules/tappxBidAdapter_spec.js b/test/spec/modules/tappxBidAdapter_spec.js
new file mode 100644
index 00000000000..58a62fb2869
--- /dev/null
+++ b/test/spec/modules/tappxBidAdapter_spec.js
@@ -0,0 +1,469 @@
+import { assert } from 'chai';
+import { spec } from 'modules/tappxBidAdapter.js';
+import { _checkParamDataType, _getHostInfo, _extractPageUrl } from '../../../modules/tappxBidAdapter.js';
+
+const c_BIDREQUEST = {
+  data: {
+  },
+  bids: [
+    {
+      bidder: 'tappx',
+      params: {
+        host: 'testing.ssp.tappx.com\/rtb\/v2\/',
+        tappxkey: 'pub-1234-android-1234',
+        endpoint: 'ZZ1234PBJS',
+        bidfloor: 0.05
+      },
+      crumbs: {
+        pubcid: 'df2144f7-673f-4440-83f5-cd4a73642d99'
+      },
+      ortb2Imp: {
+        ext: {
+          data: {
+            adserver: {
+              name: 'gam',
+              adslot: '/19968336/header-bid-tag-0'
+            },
+            pbadslot: '/19968336/header-bid-tag-0',
+          }
+        }
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [
+              320,
+              480
+            ]
+          ]
+        }
+      },
+      adUnitCode: 'div-1',
+      transactionId: '47dd44e8-e7db-417c-a8f1-621a2e1a117d',
+      sizes: [
+        [
+          320,
+          480
+        ]
+      ],
+      bidId: '2170932097e505',
+      bidderRequestId: '140ba7a1ab7aeb',
+      auctionId: '1c54b4f1-645f-44e6-b8ae-5d43c923ef1c',
+      src: 'client',
+      bidRequestsCount: 1,
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0,
+    }
+  ]
+};
+const c_SERVERRESPONSE_B = {
+  body: {
+    id: '1c54b4f1-645f-44e6-b8ae-5d43c923ef1c',
+    bidid: 'bid3811165568213389257',
+    seatbid: [
+      {
+        seat: '1',
+        group: 0,
+        bid: [
+          {
+            id: '3811165568213389257',
+            impid: 1,
+            price: 0.05,
+            adm: "<!-- Tappx Test AD :: 320x480 --><a href='http://www.tappx.com' target=\"_blank\">\t<img src='https://testing.ssp.tappx.com/zcdn/creatives/interstitial320x480.gif'></a>",
+            w: 320,
+            h: 480,
+            lurl: 'https:\/\/ssp.api.tappx.com\/burlURL',
+            burl: 'https:\/\/ssp.api.tappx.com\/burlURL',
+            nurl: 'https:\/\/ssp.api.tappx.com\/nurllURL',
+            dealId: 'b21d0704-9688-4e46-81d9-41de1050fef7',
+            cid: '01744fbb521e9fb10ffea926190effea',
+            crid: 'a13cf884e66e7c660afec059c89d98b6',
+            adomain: [
+            ],
+          },
+        ],
+      },
+    ],
+    cur: 'USD',
+  },
+  headers: {}
+};
+
+const c_SERVERRESPONSE_V = {
+  body: {
+    id: '1c54b4f1-645f-44e6-b8ae-5d43c923ef1c',
+    bidid: 'bid3811165568213389257',
+    seatbid: [
+      {
+        seat: '1',
+        group: 0,
+        bid: [
+          {
+            id: '3811165568213389257',
+            impid: 1,
+            price: 0.05,
+            adm: "<?xml version='1.0'?><VAST version='2.0'><Ad id='4381'><InLine><AdSystem>Tappx<\/AdSystem><AdTitle>Tappx<\/AdTitle><Description \/><Impression><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/impression?tag=VZ12TESTCTV]]><\/Impression><Error><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/error?tag=VZ12TESTCTV]]><\/Error><Creatives><Creative AdID='4381'><Linear><Duration>00:00:22<\/Duration><TrackingEvents><Tracking event='start'><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/start?tag=VZ12TESTCTV]]><\/Tracking><Tracking event='pause'><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/pause?tag=VZ12TESTCTV]]><\/Tracking><Tracking event='complete'><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/complete?tag=VZ12TESTCTV]]><\/Tracking><Tracking event='mute'><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/mute?tag=VZ12TESTCTV]]><\/Tracking><Tracking event='firstQuartile'><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/firstquartile?tag=VZ12TESTCTV]]><\/Tracking><Tracking event='midpoint'><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/midpoint?tag=VZ12TESTCTV]]><\/Tracking><Tracking event='thirdQuartile'><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/thirdquartile?tag=VZ12TESTCTV]]><\/Tracking><\/TrackingEvents><VideoClicks><ClickThrough id='ang'><![CDATA[https:\/\/play.google.com\/store\/apps\/details?id=com.tappx.flipnsave.battery&hl=en]]><\/ClickThrough><ClickTracking><![CDATA[https:\/\/ssp.api.tappx.com\/vasttag\/tracker\/click?tag=VZ12TESTCTV]]><\/ClickTracking><\/VideoClicks><MediaFiles><MediaFile delivery='progressive' type='video\/mp4' bitrate='763' width='640' height='480' scalable='true' maintainAspectRatio='true'><![CDATA[https:\/\/ssp.api.tappx.com\/zcdn\/videos\/flipnsave_01_low.mp4]]><\/MediaFile><\/MediaFiles><\/Linear><\/Creative><\/Creatives><\/InLine><\/Ad><\/VAST>",
+            lurl: 'https:\/\/ssp.api.tappx.com\/lurlURL',
+            burl: 'https:\/\/ssp.api.tappx.com\/burlURL',
+            nurl: 'https:\/\/ssp.api.tappx.com\/nurllURL',
+            dealId: 'b21d0704-9688-4e46-81d9-41de1050fef7',
+            cid: '01744fbb521e9fb10ffea926190effea',
+            crid: 'a13cf884e66e7c660afec059c89d98b6',
+            adomain: [
+            ],
+          },
+        ],
+      },
+    ],
+    cur: 'USD',
+  },
+  headers: {}
+};
+
+const c_CONSENTSTRING = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+const c_VALIDBIDREQUESTS = [{'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com\/rtb\/v2\/', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005, 'test': 1}, 'userId': {'haloId': '0000x179MZAzMqUWsFonu7Drm3eDDBMYtj5SPoWQnl89Upk3WTlCvEnKI9SshX0p6eFJ7otPYix179MZAzMqUWsFonu7Drm3eDDBMYtj5SPoWQnl89Upk3WTlCvEnKI9SshX0p6e', 'id5id': {'uid': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_rEXbz6UYtYEJelYrDaZOLkh8WcF9J0ZHmEHFKZEBlLXsgP6xqXU3BCj4Ay0Z6fw_jSOaHxMHwd-voRHqFA4Q9NwAxFcVLyPWnNGZ9VbcSAPos1wupq7Xu3MIm-Bw_0vxjhZdWNy4chM9x3i', 'ext': {'linkType': 0}}, 'intentIqId': 'GIF89a\u0000\u0000\u0000\u0000�\u0000\u0000���\u0000\u0000\u0000?�\u0000\u0000\u0000\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000A\u0000\u0000;', 'lotamePanoramaId': 'xTtLUY7GwqX2MMqSHo9RQ2YUOIBFhlASOR43I9KjvgtcrxIys3RxME96M02LTjWR', 'parrableId': {'eid': '02.YoqC9lWZh8.C8QTSiJTNgI6Pp0KCM5zZgEgwVMSsVP5W51X8cmiUHQESq9WRKB4nreqZJwsWIcNKlORhG4u25Wm6lmDOBmQ0B8hv0KP6uVQ97aouuH52zaz2ctVQTORUKkErPRPcaCJ7dKFcrNoF2i6WOR0S5Nk'}, 'pubcid': 'b1254-152f-12F5-5698-dI1eljK6C7WA', 'pubProvidedId': [{'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}, {'source': '3rdpartyprovided.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 3, 'ext': {'stype': 'sha256email'}}]}]}, 'userIdAsEids': [{'source': 'audigent.com', 'uids': [{'id': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'atype': 1}]}, {'source': 'id5-sync.com', 'uids': [{'id': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'atype': 1, 'ext': {'linkType': 0}}]}], 'ortb2Imp': {'ext': {'data': {'adserver': {'name': 'gam', 'adslot': '/19968336/header-bid-tag-0'}, 'pbadslot': '/19968336/header-bid-tag-0'}}}, 'mediaTypes': {'banner': {'sizes': [[320, 480], [320, 50]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '71c0d86b-4b47-4aff-a6da-1af0b1712439', 'sizes': [[320, 480], [320, 50]], 'bidId': '264d7969b125a5', 'bidderRequestId': '1c674c14a3889c', 'auctionId': '13a8a3a9-ed3a-4101-9435-4699ee77bb62', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}];
+const c_VALIDBIDAPPREQUESTS = [{'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com\/rtb\/v2\/', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005, 'test': 1, 'app': {'name': 'Tappx Test', 'bundle': 'com.test.tappx', 'domain': 'tappx.com', 'publisher': { 'name': 'Tappx', 'domain': 'tappx.com' }}}, 'userId': {'haloId': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'id5id': {'uid': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'ext': {'linkType': 0}}, 'intentIqId': 'GIF89a\u0001\u0000\u0001\u0000�\u0000\u0000���\u0000\u0000\u0000!�\u0004\u0001\u0000\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0002\u0002D\u0001\u0000;', 'lotamePanoramaId': '8003916b61a95b185690ec103bdf4945a70213e01818a5e5d8690b542730755a', 'parrableId': {'eid': '01.1617088921.7faa68d9570a50ea8e4f359e9b99ca4b7509e948a6175b3e5b0b8cbaf5b62424104ccfb0191ca79366de8368ed267b89a68e236df5f41f96f238e4301659e9023fec05e46399fb1ad0a0'}, 'pubcid': 'b7143795-852f-42f0-8864-5ecbea1ade4e', 'pubProvidedId': [{'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}, {'source': '3rdpartyprovided.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 3, 'ext': {'stype': 'sha256email'}}]}]}, 'userIdAsEids': [{'source': 'audigent.com', 'uids': [{'id': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'atype': 1}]}, {'source': 'id5-sync.com', 'uids': [{'id': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'atype': 1, 'ext': {'linkType': 0}}]}, {'source': 'intentiq.com', 'uids': [{'id': 'GIF89a\u0001\u0000\u0001\u0000�\u0000\u0000���\u0000\u0000\u0000!�\u0004\u0001\u0000\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0002\u0002D\u0001\u0000;', 'atype': 1}]}, {'source': 'crwdcntrl.net', 'uids': [{'id': '8003916b61a95b185690ec103bdf4945a70213e01818a5e5d8690b542730755a', 'atype': 1}]}, {'source': 'parrable.com', 'uids': [{'id': '01.1617088921.7faa68d9570a50ea8e4f359e9b99ca4b7509e948a6175b3e5b0b8cbaf5b62424104ccfb0191ca79366de8368ed267b89a68e236df5f41f96f238e4301659e9023fec05e46399fb1ad0a0', 'atype': 1}]}, {'source': 'pubcid.org', 'uids': [{'id': 'b7143795-852f-42f0-8864-5ecbea1ade4e', 'atype': 1}]}, {'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}, {'source': '3rdpartyprovided.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 3, 'ext': {'stype': 'sha256email'}}]}], 'ortb2Imp': {'ext': {'data': {'adserver': {'name': 'gam', 'adslot': '/19968336/header-bid-tag-0'}, 'pbadslot': '/19968336/header-bid-tag-0'}}}, 'mediaTypes': {'banner': {'sizes': [[320, 480], [320, 50]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '71c0d86b-4b47-4aff-a6da-1af0b1712439', 'sizes': [[320, 480], [320, 50]], 'bidId': '264d7969b125a5', 'bidderRequestId': '1c674c14a3889c', 'auctionId': '13a8a3a9-ed3a-4101-9435-4699ee77bb62', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}];
+const c_BIDDERREQUEST_B = {'bidderCode': 'tappx', 'auctionId': '13a8a3a9-ed3a-4101-9435-4699ee77bb62', 'bidderRequestId': '1c674c14a3889c', 'bids': [{'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com\/rtb\/v2\/', 'tappxkey': 'pub-1234-android-1234', 'endpoint': 'ZZ1234PBJS', 'bidfloor': 0.005, 'test': 1}, 'userId': {'haloId': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'id5id': {'uid': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'ext': {'linkType': 0}}, 'intentIqId': 'GIF89a\u0000\u0000\u0000\u0000�\u0000\u0000���\u0000\u0000\u0000?�\u0000\u0000\u0000\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000A\u0000\u0000;', 'lotamePanoramaId': '8003916b61a95b185690ec103bdf4945a70213e01818a5e5d8690b542730755a', 'parrableId': {'eid': '01.1617088921.7faa68d9570a50ea8e4f359e9b99ca4b7509e948a6175b3e5b0b8cbaf5b62424104ccfb0191ca79366de8368ed267b89a68e236df5f41f96f238e4301659e9023fec05e46399fb1ad0a0'}, 'pubcid': 'b7143795-852f-42f0-8864-5ecbea1ade4e', 'pubProvidedId': [{'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}, {'source': '3rdpartyprovided.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 3, 'ext': {'stype': 'sha256email'}}]}]}, 'userIdAsEids': [{'source': 'audigent.com', 'uids': [{'id': '0000fgclxw05ycn0608xiyi90bwpa0c0evvlif0hv1x0i0ku88il0ntek0o0qskvir0trr70u0wqxiix0zq3u1012pa5j315ogh1618nmsj91bmt41c1elzfjf1hl5r1i1kkc2jl', 'atype': 1}]}, {'source': 'id5-sync.com', 'uids': [{'id': 'ID5@iu-PJX_OQ0d6FJjKS8kYfUpHriD_qpoXJUngedfpNva812If1fHEqHHkamLC89txVxk1i9WGqeQrTX97HFCgv9QDa1M_bkHUBsAWFm-D5r1rYrsfMFFiyqwCAEzqNbvsUZXOYCAQSjPcLxR4of22w-U9_JDRThCGRDV3Fmvc38E', 'atype': 1, 'ext': {'linkType': 0}}]}], 'ortb2Imp': {'ext': {'data': {'adserver': {'name': 'gam', 'adslot': '/19968336/header-bid-tag-0'}, 'pbadslot': '/19968336/header-bid-tag-0'}}}, 'mediaTypes': {'banner': {'sizes': [[320, 480], [320, 50]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '71c0d86b-4b47-4aff-a6da-1af0b1712439', 'sizes': [[320, 480], [320, 50]], 'bidId': '264d7969b125a5', 'bidderRequestId': '1c674c14a3889c', 'auctionId': '13a8a3a9-ed3a-4101-9435-4699ee77bb62', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}], 'auctionStart': 1617088922120, 'timeout': 700, 'refererInfo': {'page': 'http://localhost:9999/integrationExamples/gpt/gdpr_hello_world.html?pbjs_debug=true', 'reachedTop': true, 'isAmp': false, 'numIframes': 0, 'stack': ['http://localhost:9999/integrationExamples/gpt/gdpr_hello_world.html?pbjs_debug=true'], 'canonicalUrl': null}, 'gdprConsent': {'consentString': c_CONSENTSTRING, 'vendorData': {'metadata': 'BO-JeiTPABAOkAAABAENABA', 'gdprApplies': true, 'hasGlobalScope': false, 'cookieVersion': 1, 'created': '2020-12-09T09:22:09.900Z', 'lastUpdated': '2021-01-14T15:44:03.600Z', 'cmpId': 0, 'cmpVersion': 1, 'consentScreen': 0, 'consentLanguage': 'EN', 'vendorListVersion': 1, 'maxVendorId': 0, 'purposeConsents': {}, 'vendorConsents': {}}, 'gdprApplies': true, 'apiVersion': 1}, 'uspConsent': '1YCC', 'start': 1611308859099};
+const c_BIDDERREQUEST_V = {'method': 'POST', 'url': 'https://testing.ssp.tappx.com/rtb/v2//VZ12TESTCTV?type_cnn=prebidjs&v=0.1.10329', 'data': '{"site":{"name":"localhost","bundle":"localhost","domain":"localhost"},"user":{"ext":{}},"id":"0fecfa84-c541-49f8-8c45-76b90fddc30e","test":1,"at":1,"tmax":1000,"bidder":"tappx","imp":[{"video":{"mimes":["video/mp4","application/javascript"],"minduration":3,"maxduration":30,"startdelay":5,"playbackmethod":[1,3],"api":[1,2],"protocols":[2,3],"battr":[13,14],"linearity":1,"placement":2,"minbitrate":10,"maxbitrate":10,"w":320,"h":250},"id":"2398241a5a860b","tagid":"localhost_typeAdBanVid_windows","secure":1,"bidfloor":0.005,"ext":{"bidder":{"tappxkey":"pub-1234-desktop-1234","endpoint":"vz34906po","host":"https://vz34906po.pub.tappx.com/rtb/","bidfloor":0.005}}}],"device":{"os":"windows","ip":"peer","ua":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36","h":864,"w":1536,"dnt":0,"language":"en","make":"Google Inc."},"params":{"host":"tappx.com","bidfloor":0.005},"regs":{"gdpr":0,"ext":{}}}', 'bids': {'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com/rtb/v2/', 'tappxkey': 'pub-1234-desktop-1234', 'endpoint': 'VZ12TESTCTV', 'bidfloor': 0.005, 'test': true}, 'crumbs': {'pubcid': 'dccfe922-3823-4676-b7b2-e5ed8743154e'}, 'ortb2Imp': {'ext': {'data': {'pbadslot': 'video-ad-div'}}}, 'renderer': {'options': {'text': 'Tappx Outstream Video'}}, 'mediaTypes': {'video': {'mimes': ['video/mp4', 'application/javascript'], 'minduration': 3, 'maxduration': 30, 'startdelay': 5, 'playbackmethod': [1, 3], 'api': [1, 2], 'protocols': [2, 3], 'battr': [13, 14], 'linearity': 1, 'placement': 2, 'minbitrate': 10, 'maxbitrate': 10, 'w': 320, 'h': 250}}, 'adUnitCode': 'video-ad-div', 'transactionId': 'ed41c805-d14c-49c3-954d-26b98b2aa2c2', 'sizes': [[320, 250]], 'bidId': '28f49c71b13f2f', 'bidderRequestId': '1401710496dc7', 'auctionId': 'e807363f-3095-43a8-a4a6-f44196cb7318', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}}
+const c_BIDDERREQUEST_VOutstream = {'method': 'POST', 'url': 'https://testing.ssp.tappx.com/rtb/v2//VZ12TESTCTV?type_cnn=prebidjs&v=0.1.10329', 'data': '{"site":{"name":"localhost","bundle":"localhost","domain":"localhost"},"user":{"ext":{}},"id":"0fecfa84-c541-49f8-8c45-76b90fddc30e","test":1,"at":1,"tmax":1000,"bidder":"tappx","imp":[{"video":{"context": "outstream","playerSize":[640, 480],"mimes":["video/mp4","application/javascript"],"minduration":3,"maxduration":30,"startdelay":5,"playbackmethod":[1,3],"api":[1,2],"protocols":[2,3],"battr":[13,14],"linearity":1,"placement":2,"minbitrate":10,"maxbitrate":10,"w":320,"h":250},"id":"2398241a5a860b","tagid":"localhost_typeAdBanVid_windows","secure":1,"bidfloor":0.005,"ext":{"bidder":{"tappxkey":"pub-1234-desktop-1234","endpoint":"vz34906po","host":"https://vz34906po.pub.tappx.com/rtb/","bidfloor":0.005}}}],"device":{"os":"windows","ip":"peer","ua":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36","h":864,"w":1536,"dnt":0,"language":"en","make":"Google Inc."},"params":{"host":"tappx.com","bidfloor":0.005},"regs":{"gdpr":0,"ext":{}}}', 'bids': {'bidder': 'tappx', 'params': {'host': 'testing.ssp.tappx.com/rtb/v2/', 'tappxkey': 'pub-1234-desktop-1234', 'endpoint': 'VZ12TESTCTV', 'bidfloor': 0.005, 'test': true}, 'crumbs': {'pubcid': 'dccfe922-3823-4676-b7b2-e5ed8743154e'}, 'ortb2Imp': {'ext': {'data': {'pbadslot': 'video-ad-div'}}}, 'renderer': {'options': {'text': 'Tappx Outstream Video'}}, 'mediaTypes': {'video': {'mimes': ['video/mp4', 'application/javascript'], 'minduration': 3, 'maxduration': 30, 'startdelay': 5, 'playbackmethod': [1, 3], 'api': [1, 2], 'protocols': [2, 3], 'battr': [13, 14], 'linearity': 1, 'placement': 2, 'minbitrate': 10, 'maxbitrate': 10, 'w': 320, 'h': 250}}, 'adUnitCode': 'video-ad-div', 'transactionId': 'ed41c805-d14c-49c3-954d-26b98b2aa2c2', 'sizes': [[320, 250]], 'bidId': '28f49c71b13f2f', 'bidderRequestId': '1401710496dc7', 'auctionId': 'e807363f-3095-43a8-a4a6-f44196cb7318', 'src': 'client', 'bidRequestsCount': 1, 'bidderRequestsCount': 1, 'bidderWinsCount': 0}}
+
+describe('Tappx bid adapter', function () {
+  /**
+   * IS REQUEST VALID
+   */
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      assert.isTrue(spec.isBidRequestValid(c_BIDREQUEST.bids[0]), JSON.stringify(c_BIDREQUEST));
+    });
+
+    it('should return false when tappxkey is missing', function () {
+      let badBidRequestTpxkey = JSON.parse(JSON.stringify(c_BIDREQUEST)); ;
+      delete badBidRequestTpxkey.bids[0].params.tappxkey;
+      assert.isFalse(spec.isBidRequestValid(badBidRequestTpxkey.bids[0]));
+    });
+
+    it('should return false when host is missing', function () {
+      let badBidRequestHost = JSON.parse(JSON.stringify(c_BIDREQUEST)); ;
+      delete badBidRequestHost.bids[0].params.host;
+      assert.isFalse(spec.isBidRequestValid(badBidRequestHost.bids[0]));
+    });
+
+    it('should return false when classic endpoint is missing', function () {
+      let badBidRequestClEp = JSON.parse(JSON.stringify(c_BIDREQUEST)); ;
+      delete badBidRequestClEp.bids[0].params.endpoint;
+      assert.isFalse(spec.isBidRequestValid(badBidRequestClEp.bids[0]));
+    });
+
+    it('should return true when endpoint is not set for new endpoints', function () {
+      let badBidRequestNwEp = JSON.parse(JSON.stringify(c_BIDREQUEST)); ;
+      delete badBidRequestNwEp.bids[0].params.endpoint;
+      badBidRequestNwEp.bids[0].params.host = 'zztesting.ssp.tappx.com/rtb/v2/';
+      assert.isTrue(spec.isBidRequestValid(badBidRequestNwEp.bids[0]));
+    });
+
+    it('should return false for not instream/outstream requests', function () {
+      let badBidRequest_v = c_BIDDERREQUEST_V;
+      delete badBidRequest_v.bids.mediaTypes.banner;
+      badBidRequest_v.bids.mediaTypes.video = {};
+      badBidRequest_v.bids.mediaTypes.video.context = '';
+      badBidRequest_v.bids.mediaTypes.video.playerSize = [320, 250];
+      assert.isFalse(spec.isBidRequestValid(badBidRequest_v.bids));
+    });
+
+    it('should export the TCF vendor ID', function () {
+      expect(spec.gvlid).to.equal(628);
+    })
+  });
+
+  /**
+   * BUILD REQUEST TEST
+   */
+  describe('buildRequest', function () {
+    // Web Test
+    let validBidRequests = c_VALIDBIDREQUESTS;
+    let validBidRequests_V = c_VALIDBIDREQUESTS;
+    let validBidRequests_Voutstream = c_VALIDBIDREQUESTS;
+    // App Test
+    let validAppBidRequests = c_VALIDBIDAPPREQUESTS;
+
+    let bidderRequest = c_BIDDERREQUEST_B;
+    let bidderRequest_V = c_BIDDERREQUEST_V;
+    let bidderRequest_VOutstream = c_BIDDERREQUEST_VOutstream;
+
+    it('should add gdpr/usp consent information to the request', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request[0].data);
+
+      expect(payload.regs.gdpr).to.exist.and.to.be.true;
+      expect(payload.user.ext.consent).to.exist.and.to.equal(c_CONSENTSTRING);
+      expect(payload.regs.ext.us_privacy).to.exist;
+    });
+
+    it('should properly build a banner request', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].banner).to.not.equal(null);
+      expect(data.imp[0].banner.w).to.be.oneOf([320, 50, 250, 480]);
+      expect(data.imp[0].banner.h).to.be.oneOf([320, 50, 250, 480]);
+    });
+
+    it('should properly build a video request', function () {
+      delete validBidRequests_V[0].mediaTypes.banner
+      validBidRequests_V[0].mediaTypes.video = {};
+      validBidRequests_V[0].mediaTypes.video.playerSize = [640, 480];
+      validBidRequests_V[0].mediaTypes.video.context = 'instream';
+
+      bidderRequest_V.bids.mediaTypes.context = 'instream';
+
+      const request = spec.buildRequests(validBidRequests_V, bidderRequest_V);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].video).to.not.equal(null);
+    });
+
+    it('should properly build a video outstream request', function () {
+      delete validBidRequests_Voutstream[0].mediaTypes.banner
+      validBidRequests_Voutstream[0].mediaTypes.video = {};
+      validBidRequests_Voutstream[0].mediaTypes.video.playerSize = [640, 480];
+      validBidRequests_Voutstream[0].mediaTypes.video.context = 'outstream';
+
+      bidderRequest_VOutstream.bids.mediaTypes.context = 'outstream';
+
+      const request = spec.buildRequests(validBidRequests_Voutstream, bidderRequest_VOutstream);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].video).to.not.equal(null);
+    });
+
+    it('should properly create video rewarded request', function () {
+      delete validBidRequests_Voutstream[0].mediaTypes.banner
+      validBidRequests_Voutstream[0].mediaTypes.video = {};
+      validBidRequests_Voutstream[0].mediaTypes.video.rewarded = 1;
+      validBidRequests_Voutstream[0].mediaTypes.video.playerSize = [640, 480];
+      validBidRequests_Voutstream[0].mediaTypes.video.context = 'outstream';
+
+      bidderRequest_VOutstream.bids.mediaTypes.context = 'outstream';
+
+      const request = spec.buildRequests(validBidRequests_Voutstream, bidderRequest_VOutstream);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].video).to.not.equal(null);
+    });
+
+    it('should set user eids array', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+
+      const data = JSON.parse(request[0].data);
+      expect(data.user.ext.eids, data).to.not.be.null;
+      expect(data.user.ext.eids[0]).to.have.keys(['source', 'uids']);
+    });
+
+    it('should properly build a banner request with app params', function () {
+      const request = spec.buildRequests(validAppBidRequests, bidderRequest);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].banner).to.not.equal(null);
+      expect(data.imp[0].banner.w).to.be.oneOf([320, 50, 250, 480]);
+      expect(data.imp[0].banner.h).to.be.oneOf([320, 50, 250, 480]);
+    });
+
+    it('should properly build a ext optional object', function() {
+      let extBidRequest = c_VALIDBIDREQUESTS;
+      extBidRequest[0].params.ext = {'optionalData': '1234'};
+      let extBidderRequest = c_BIDDERREQUEST_B;
+      extBidderRequest.bids[0].ext = {'optionalData': '1234'};
+
+      const request = spec.buildRequests(extBidRequest, extBidderRequest);
+      const data = JSON.parse(request[0].data);
+      expect(data.imp[0].ext.bidder.ext).to.be.an('object');
+      expect(data.imp[0].ext.bidder.ext.optionalData).to.be.equal('1234');
+    });
+
+    it('should ignore ext optional if is not a object', function() {
+      let badExtBidRequest = c_VALIDBIDREQUESTS;
+      badExtBidRequest[0].params.ext = 'stringValue';
+      let badExtBidderRequest = c_BIDDERREQUEST_B;
+      badExtBidderRequest.bids[0].ext = 'stringValue';
+
+      const request = spec.buildRequests(badExtBidRequest, badExtBidderRequest);
+      const data = JSON.parse(request[0].data);
+      expect(data.imp[0].ext.bidder.ext).not.to.be.an('string');
+      expect(data.imp[0].ext.bidder.ext).to.be.an('undefined');
+      expect(data.imp[0].ext.bidder).to.not.have.property('ext')
+    });
+  });
+
+  /**
+   * INTERPRET RESPONSE TESTS
+   */
+  describe('interpretResponse', function () {
+    it('receive banner reponse with single placement', function () {
+      const bids = spec.interpretResponse(c_SERVERRESPONSE_B, c_BIDDERREQUEST_B);
+      const bid = bids[0];
+      expect(bid.cpm).to.exist;
+      expect(bid.ad).to.match(/^<!-- Tappx Test AD/);
+    });
+
+    it('receive video reponse with single placement', function () {
+      const bids = spec.interpretResponse(c_SERVERRESPONSE_V, c_BIDDERREQUEST_V);
+      const bid = bids[0];
+      expect(bid.cpm).to.exist;
+      expect(bid.ad).to.match(/^<\?xml version=\'1\.0\'\?><VAST version=/);
+    });
+
+    let emptyServerResponse = { headers: {} };
+    it('receive reponse without ad', function () {
+      const bids = spec.interpretResponse(emptyServerResponse, c_BIDDERREQUEST_B);
+      expect(bids).to.have.lengthOf(0);
+    });
+  });
+
+  /**
+   * GET USER SYNC TESTS
+   */
+  describe('getUserSync', function () {
+    it('check pixel enabled', function () {
+      let syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: true
+      }
+
+      const consent = spec.getUserSyncs(syncOptions, null, c_BIDDERREQUEST_B.gdprConsent, c_BIDDERREQUEST_B.uspConsent);
+      expect(consent[0].type).to.be.equal('image', JSON.stringify(consent[0]));
+      expect(consent[0].url).to.match(/&type=img/);
+    });
+
+    it('check iframe enabled', function () {
+      let syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: false
+      }
+
+      const consent = spec.getUserSyncs(syncOptions, null, c_BIDDERREQUEST_B.gdprConsent, c_BIDDERREQUEST_B.uspConsent);
+      expect(consent[0].type).to.be.equal('iframe', JSON.stringify(consent[0]));
+      expect(consent[0].url).to.match(/&type=iframe/);
+    });
+  })
+
+  describe('module Floor implementation', function() {
+    let getFloorResponse, bidderRequest_f;
+    beforeEach(function() {
+      getFloorResponse = {};
+      bidderRequest_f = c_BIDREQUEST;
+    })
+    it('should correctly send hard floors when getFloor function is present and returns valid floor', function () {
+      // default getFloor response is empty object so should not break and not send hard_floor
+      bidderRequest_f.bids[0].getFloor = () => getFloorResponse;
+      let request = spec.buildRequests(bidderRequest_f.bids, bidderRequest_f);
+      let payload;
+
+      getFloorResponse = undefined;
+      request = spec.buildRequests(bidderRequest_f.bids, bidderRequest_f);
+
+      // without Module floor
+      payload = JSON.parse(request[0].data);
+      expect(payload.imp[0].bidfloor).to.equal(0.05);
+
+      // make it respond with USD floor and string floor
+      getFloorResponse = {currency: 'USD', floor: '1.23'};
+      request = spec.buildRequests(bidderRequest_f.bids, bidderRequest_f);
+      payload = JSON.parse(request[0].data);
+      expect(payload.imp[0].bidfloor).to.equal('1.23');
+
+      // make it respond with EUR floor (not valid)
+      getFloorResponse = {currency: 'EUR', floor: '1.23'};
+      request = spec.buildRequests(bidderRequest_f.bids, bidderRequest_f);
+      payload = JSON.parse(request[0].data);
+      expect(payload.imp[0].bidfloor).to.equal(0.05); // Default value from tappx/bidder bidfloor
+
+      // make it respond with USD floor and num floor
+      getFloorResponse = {currency: 'USD', floor: 1.23};
+      request = spec.buildRequests(bidderRequest_f.bids, bidderRequest_f);
+      payload = JSON.parse(request[0].data);
+      expect(payload.imp[0].bidfloor).to.equal(1.23);
+    });
+  })
+
+  describe('_getHostInfo tests', function() {
+    const HOST_VALIDBIDREQ = {};
+    HOST_VALIDBIDREQ.bidder = 'tappx';
+    HOST_VALIDBIDREQ.params = {};
+    HOST_VALIDBIDREQ.params.endpoint = 'ZZ1234PBJS';
+
+    it('Test testing endpoints', function() {
+      let testHostValidRequest = HOST_VALIDBIDREQ;
+      testHostValidRequest.params.host = 'testing.xxx.tappx.com\/rtb\/v2\/';
+      let testHostObject = _getHostInfo(testHostValidRequest);
+      assert.isObject(testHostObject);
+      expect(testHostObject.newEndpoint).to.be.false;
+      expect(testHostObject.endpoint).to.be.equal(testHostValidRequest.params.endpoint);
+    })
+    it('Test classic endpoints', function() {
+      let classicHostValidRequest = HOST_VALIDBIDREQ;
+      classicHostValidRequest.params.host = 'xxx.xxx.tappx.com\/rtb\/v2\/';
+      let classicHostObject = _getHostInfo(classicHostValidRequest);
+      assert.isObject(classicHostObject);
+      expect(classicHostObject.newEndpoint).to.be.false;
+      expect(classicHostObject.endpoint).to.be.equal(classicHostValidRequest.params.endpoint);
+    })
+    it('Test new endpoints', function() {
+      let newHostValidRequest = HOST_VALIDBIDREQ;
+      newHostValidRequest.params.host = 'zz1111xxx.xxx.tappx.com\/rtb\/v2\/';
+      let newHostObject = _getHostInfo(newHostValidRequest);
+      assert.isObject(newHostObject);
+      expect(newHostObject.newEndpoint).to.be.true;
+      expect(newHostObject.endpoint).to.be.equal('zz1111xxx');
+    })
+  })
+
+  describe('_checkParamDataType tests', function() {
+    it('should return the expected datatypes', function () {
+      assert.isString(_checkParamDataType('Right string', 'test', 'string'));
+      assert.isBoolean(_checkParamDataType('Right bool', true, 'boolean'));
+      assert.isNumber(_checkParamDataType('Right number', 10, 'number'));
+      assert.isArray(_checkParamDataType('Right array', [10, 11], 'array'));
+    });
+
+    it('should return undefined var for wrong datatypes', function () {
+      expect(_checkParamDataType('Wrong string', 10, 'string')).to.be.undefined;
+      expect(_checkParamDataType('Wrong bool', 10, 'boolean')).to.be.undefined;
+      expect(_checkParamDataType('Wrong number', 'one', 'number')).to.be.undefined;
+      expect(_checkParamDataType('Wrong array', false, 'array')).to.be.undefined;
+    });
+  })
+
+  describe('_extractPageUrl tests', function() {
+    let validBidRequests = c_VALIDBIDREQUESTS;
+    let bidderRequest = c_BIDDERREQUEST_B;
+    it('should return the Domain of the site', function () {
+      validBidRequests[0].params.domainUrl = 'testUrl.com';
+      assert.isString(_extractPageUrl(validBidRequests, bidderRequest));
+    });
+  })
+});
diff --git a/test/spec/modules/targetVideoBidAdapter_spec.js b/test/spec/modules/targetVideoBidAdapter_spec.js
new file mode 100644
index 00000000000..adbc982e509
--- /dev/null
+++ b/test/spec/modules/targetVideoBidAdapter_spec.js
@@ -0,0 +1,139 @@
+import { spec } from '../../../modules/targetVideoBidAdapter.js'
+
+describe('TargetVideo Bid Adapter', function() {
+  const bannerRequest = [{
+    bidder: 'targetVideo',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    },
+    params: {
+      placementId: 12345,
+    }
+  }];
+
+  it('Test the bid validation function', function() {
+    const validBid = spec.isBidRequestValid(bannerRequest[0]);
+    const invalidBid = spec.isBidRequestValid(null);
+
+    expect(validBid).to.be.true;
+    expect(invalidBid).to.be.false;
+  });
+
+  it('Test the request processing function', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    expect(request).to.not.be.empty;
+
+    const payload = JSON.parse(request.data);
+    expect(payload).to.not.be.empty;
+    expect(payload.sdk).to.deep.equal({
+      source: 'pbjs',
+      version: '$prebid.version$'
+    });
+    expect(payload.tags[0].id).to.equal(12345);
+    expect(payload.tags[0].gpid).to.equal('targetVideo');
+    expect(payload.tags[0].ad_types[0]).to.equal('video');
+  });
+
+  it('Handle nobid responses', function () {
+    const responseBody = {
+      'version': '0.0.1',
+      'tags': [{
+        'uuid': '84ab500420319d',
+        'tag_id': 5976557,
+        'auction_id': '297492697822162468',
+        'nobid': true
+      }]
+    };
+    const bidderRequest = null;
+
+    const bidResponse = spec.interpretResponse({ body: responseBody }, {bidderRequest});
+    expect(bidResponse.length).to.equal(0);
+  });
+
+  it('Test the response parsing function', function () {
+    const responseBody = {
+      'tags': [{
+        'uuid': '84ab500420319d',
+        'ads': [{
+          'ad_type': 'video',
+          'cpm': 0.500000,
+          'notify_url': 'https://www.target-video.com/',
+          'rtb': {
+            'video': {
+              'player_width': 640,
+              'player_height': 360,
+              'asset_url': 'https://www.target-video.com/'
+            }
+          }
+        }]
+      }]
+    };
+    const bidderRequest = {
+      bids: [{
+        bidId: '84ab500420319d',
+        adUnitCode: 'code',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        }
+      }]
+    };
+
+    const bidResponse = spec.interpretResponse({ body: responseBody }, {bidderRequest});
+    expect(bidResponse).to.not.be.empty;
+
+    const bid = bidResponse[0];
+    expect(bid).to.not.be.empty;
+    expect(bid.cpm).to.equal(0.675);
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.ad).to.include('<script src="https://player.target-video.com/custom/targetvideo-banner.js"></script>')
+    expect(bid.ad).to.include('initPlayer')
+  });
+
+  it('Test GDPR consent information is present in the request', function () {
+    let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+    let bidderRequest = {
+      'bidderCode': 'targetVideo',
+      'auctionId': '1d1a030790a475',
+      'bidderRequestId': '22edbae2733bf6',
+      'timeout': 3000,
+      'gdprConsent': {
+        consentString: consentString,
+        gdprApplies: true,
+        addtlConsent: '1~7.12.35.62.66.70.89.93.108'
+      }
+    };
+    bidderRequest.bids = bannerRequest;
+
+    const request = spec.buildRequests(bannerRequest, bidderRequest);
+    expect(request.options).to.deep.equal({withCredentials: true});
+    const payload = JSON.parse(request.data);
+
+    expect(payload.gdpr_consent).to.exist;
+    expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
+    expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+    expect(payload.gdpr_consent.addtl_consent).to.exist.and.to.deep.equal([7, 12, 35, 62, 66, 70, 89, 93, 108]);
+  });
+
+  it('Test US Privacy string is present in the request', function() {
+    let consentString = '1YA-';
+    let bidderRequest = {
+      'bidderCode': 'targetVideo',
+      'auctionId': '1d1a030790a475',
+      'bidderRequestId': '22edbae2733bf6',
+      'timeout': 3000,
+      'uspConsent': consentString
+    };
+    bidderRequest.bids = bannerRequest;
+
+    const request = spec.buildRequests(bannerRequest, bidderRequest);
+    const payload = JSON.parse(request.data);
+
+    expect(payload.us_privacy).to.exist;
+    expect(payload.us_privacy).to.exist.and.to.equal(consentString);
+  });
+});
diff --git a/test/spec/modules/teadsBidAdapter_spec.js b/test/spec/modules/teadsBidAdapter_spec.js
index cc5bbb840a9..e981d80c8ae 100644
--- a/test/spec/modules/teadsBidAdapter_spec.js
+++ b/test/spec/modules/teadsBidAdapter_spec.js
@@ -1,12 +1,24 @@
 import {expect} from 'chai';
-import {spec} from 'modules/teadsBidAdapter.js';
+import {spec, storage} from 'modules/teadsBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import {getStorageManager} from 'src/storageManager';
 
 const ENDPOINT = 'https://a.teads.tv/hb/bid-request';
 const AD_SCRIPT = '<script type="text/javascript" class="teads" async="true" src="https://a.teads.tv/hb/getAdSettings"></script>"';
 
 describe('teadsBidAdapter', () => {
   const adapter = newBidder(spec);
+  let cookiesAreEnabledStub, getCookieStub;
+
+  beforeEach(function () {
+    cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+    getCookieStub = sinon.stub(storage, 'getCookie');
+  });
+
+  afterEach(function () {
+    cookiesAreEnabledStub.restore();
+    getCookieStub.restore();
+  });
 
   describe('inherited functions', () => {
     it('exists and is a function', () => {
@@ -102,7 +114,7 @@ describe('teadsBidAdapter', () => {
       'timeout': 3000
     };
 
-    it('sends bid request to ENDPOINT via POST', function() {
+    it('should send bid request to ENDPOINT via POST', function() {
       const request = spec.buildRequests(bidRequests, bidderResquestDefault);
 
       expect(request.url).to.equal(ENDPOINT);
@@ -135,9 +147,9 @@ describe('teadsBidAdapter', () => {
           'consentString': consentString,
           'gdprApplies': true,
           'vendorData': {
-            'hasGlobalConsent': false
+            'isServiceSpecific': true
           },
-          'apiVersion': 1
+          'apiVersion': 2
         }
       };
 
@@ -147,14 +159,14 @@ describe('teadsBidAdapter', () => {
       expect(payload.gdpr_iab).to.exist;
       expect(payload.gdpr_iab.consent).to.equal(consentString);
       expect(payload.gdpr_iab.status).to.equal(12);
-      expect(payload.gdpr_iab.apiVersion).to.equal(1);
+      expect(payload.gdpr_iab.apiVersion).to.equal(2);
     });
 
     it('should add referer info to payload', function () {
       const bidRequest = Object.assign({}, bidRequests[0])
       const bidderRequest = {
         refererInfo: {
-          referer: 'https://example.com/page.html',
+          page: 'https://example.com/page.html',
           reachedTop: true,
           numIframes: 2
         }
@@ -189,6 +201,40 @@ describe('teadsBidAdapter', () => {
       expect(payload.pageReferrer).to.deep.equal(document.referrer);
     });
 
+    it('should add timeToFirstByte info to payload', function () {
+      const request = spec.buildRequests(bidRequests, bidderResquestDefault);
+      const payload = JSON.parse(request.data);
+      const performance = window.performance || window.webkitPerformance || window.msPerformance || window.mozPerformance;
+
+      const ttfbExpectedV2 = performance &&
+        typeof performance.getEntriesByType === 'function' &&
+        Object.prototype.toString.call(performance.getEntriesByType) === '[object Function]' &&
+        performance.getEntriesByType('navigation')[0] &&
+        performance.getEntriesByType('navigation')[0].responseStart &&
+        performance.getEntriesByType('navigation')[0].requestStart &&
+        performance.getEntriesByType('navigation')[0].responseStart > 0 &&
+        performance.getEntriesByType('navigation')[0].requestStart > 0 &&
+        Math.round(
+          performance.getEntriesByType('navigation')[0].responseStart - performance.getEntriesByType('navigation')[0].requestStart
+        );
+
+      expect(payload.timeToFirstByte).to.exist;
+
+      if (ttfbExpectedV2) {
+        expect(payload.timeToFirstByte).to.deep.equal(ttfbExpectedV2.toString());
+      } else {
+        const ttfbWithTimingV1 = performance &&
+            performance.timing.responseStart &&
+            performance.timing.requestStart &&
+            performance.timing.responseStart > 0 &&
+            performance.timing.requestStart > 0 &&
+            performance.timing.responseStart - performance.timing.requestStart;
+        const ttfbExpectedV1 = ttfbWithTimingV1 ? ttfbWithTimingV1.toString() : '';
+
+        expect(payload.timeToFirstByte).to.deep.equal(ttfbExpectedV1);
+      }
+    });
+
     it('should send GDPR to endpoint with 11 status', function() {
       let consentString = 'JRJ8RKfDeBNsERRDCSAAZ+A==';
       let bidderRequest = {
@@ -199,9 +245,9 @@ describe('teadsBidAdapter', () => {
           'consentString': consentString,
           'gdprApplies': true,
           'vendorData': {
-            'hasGlobalScope': true
+            'isServiceSpecific': false,
           },
-          'apiVersion': 1
+          'apiVersion': 2
         }
       };
 
@@ -211,7 +257,7 @@ describe('teadsBidAdapter', () => {
       expect(payload.gdpr_iab).to.exist;
       expect(payload.gdpr_iab.consent).to.equal(consentString);
       expect(payload.gdpr_iab.status).to.equal(11);
-      expect(payload.gdpr_iab.apiVersion).to.equal(1);
+      expect(payload.gdpr_iab.apiVersion).to.equal(2);
     });
 
     it('should send GDPR TCF2 to endpoint with 12 status', function() {
@@ -240,7 +286,6 @@ describe('teadsBidAdapter', () => {
     });
 
     it('should send GDPR to endpoint with 22 status', function() {
-      let consentString = 'JRJ8RKfDeBNsERRDCSAAZ+A==';
       let bidderRequest = {
         'auctionId': '1d1a030790a475',
         'bidderRequestId': '22edbae2733bf6',
@@ -249,7 +294,7 @@ describe('teadsBidAdapter', () => {
           'consentString': undefined,
           'gdprApplies': undefined,
           'vendorData': undefined,
-          'apiVersion': 1
+          'apiVersion': 2
         }
       };
 
@@ -259,7 +304,7 @@ describe('teadsBidAdapter', () => {
       expect(payload.gdpr_iab).to.exist;
       expect(payload.gdpr_iab.consent).to.equal('');
       expect(payload.gdpr_iab.status).to.equal(22);
-      expect(payload.gdpr_iab.apiVersion).to.equal(1);
+      expect(payload.gdpr_iab.apiVersion).to.equal(2);
     });
 
     it('should send GDPR to endpoint with 0 status', function() {
@@ -274,7 +319,7 @@ describe('teadsBidAdapter', () => {
           'vendorData': {
             'hasGlobalScope': false
           },
-          'apiVersion': 1
+          'apiVersion': 2
         }
       };
 
@@ -284,11 +329,10 @@ describe('teadsBidAdapter', () => {
       expect(payload.gdpr_iab).to.exist;
       expect(payload.gdpr_iab.consent).to.equal(consentString);
       expect(payload.gdpr_iab.status).to.equal(0);
-      expect(payload.gdpr_iab.apiVersion).to.equal(1);
+      expect(payload.gdpr_iab.apiVersion).to.equal(2);
     });
 
     it('should send GDPR to endpoint with 0 status when gdprApplies = false (vendorData = undefined)', function() {
-      let consentString = 'JRJ8RKfDeBNsERRDCSAAZ+A==';
       let bidderRequest = {
         'auctionId': '1d1a030790a475',
         'bidderRequestId': '22edbae2733bf6',
@@ -297,7 +341,7 @@ describe('teadsBidAdapter', () => {
           'consentString': undefined,
           'gdprApplies': false,
           'vendorData': undefined,
-          'apiVersion': 1
+          'apiVersion': 2
         }
       };
 
@@ -307,7 +351,7 @@ describe('teadsBidAdapter', () => {
       expect(payload.gdpr_iab).to.exist;
       expect(payload.gdpr_iab.consent).to.equal('');
       expect(payload.gdpr_iab.status).to.equal(0);
-      expect(payload.gdpr_iab.apiVersion).to.equal(1);
+      expect(payload.gdpr_iab.apiVersion).to.equal(2);
     });
 
     it('should send GDPR to endpoint with 12 status when apiVersion = 0', function() {
@@ -320,7 +364,7 @@ describe('teadsBidAdapter', () => {
           'consentString': consentString,
           'gdprApplies': true,
           'vendorData': {
-            'hasGlobalScope': false
+            'isServiceSpecific': true
           },
           'apiVersion': 0
         }
@@ -343,7 +387,7 @@ describe('teadsBidAdapter', () => {
           }
         }
       };
-      checkMediaTypesSizes(mediaTypesPlayerSize, '32x34')
+      checkMediaTypesSizes(mediaTypesPlayerSize, '32x34');
     });
 
     it('should add schain info to payload if available', function () {
@@ -374,6 +418,74 @@ describe('teadsBidAdapter', () => {
       });
     });
 
+    it('should add userAgentClientHints info to payload if available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        ortb2: {
+          device: {
+            sua: {
+              source: 2,
+              platform: {
+                brand: 'macOS',
+                version: [ '12', '4', '0' ]
+              },
+              browsers: [
+                {
+                  brand: 'Chromium',
+                  version: [ '106', '0', '5249', '119' ]
+                },
+                {
+                  brand: 'Google Chrome',
+                  version: [ '106', '0', '5249', '119' ]
+                },
+                {
+                  brand: 'Not;A=Brand',
+                  version: [ '99', '0', '0', '0' ]
+                }
+              ],
+              mobile: 0,
+              model: '',
+              bitness: '64',
+              architecture: 'x86'
+            }
+          }
+        }
+      });
+
+      const requestWithUserAgentClientHints = spec.buildRequests([bidRequest], bidderResquestDefault);
+      const payload = JSON.parse(requestWithUserAgentClientHints.data);
+
+      expect(payload.userAgentClientHints).to.exist;
+      expect(payload.userAgentClientHints).to.deep.equal({
+        source: 2,
+        platform: {
+          brand: 'macOS',
+          version: [ '12', '4', '0' ]
+        },
+        browsers: [
+          {
+            brand: 'Chromium',
+            version: [ '106', '0', '5249', '119' ]
+          },
+          {
+            brand: 'Google Chrome',
+            version: [ '106', '0', '5249', '119' ]
+          },
+          {
+            brand: 'Not;A=Brand',
+            version: [ '99', '0', '0', '0' ]
+          }
+        ],
+        mobile: 0,
+        model: '',
+        bitness: '64',
+        architecture: 'x86'
+      }
+      );
+
+      const defaultRequest = spec.buildRequests(bidRequests, bidderResquestDefault);
+      expect(JSON.parse(defaultRequest.data).userAgentClientHints).to.not.exist;
+    });
+
     it('should use good mediaTypes video sizes', function() {
       const mediaTypesVideoSizes = {
         'mediaTypes': {
@@ -382,7 +494,7 @@ describe('teadsBidAdapter', () => {
           }
         }
       };
-      checkMediaTypesSizes(mediaTypesVideoSizes, '12x14')
+      checkMediaTypesSizes(mediaTypesVideoSizes, '12x14');
     });
 
     it('should use good mediaTypes banner sizes', function() {
@@ -393,7 +505,7 @@ describe('teadsBidAdapter', () => {
           }
         }
       };
-      checkMediaTypesSizes(mediaTypesBannerSize, '46x48')
+      checkMediaTypesSizes(mediaTypesBannerSize, '46x48');
     });
 
     it('should use good mediaTypes for both video and banner sizes', function() {
@@ -407,7 +519,271 @@ describe('teadsBidAdapter', () => {
           }
         }
       };
-      checkMediaTypesSizes(hybridMediaTypes, ['46x48', '50x34', '45x45'])
+      checkMediaTypesSizes(hybridMediaTypes, ['46x48', '50x34', '45x45']);
+    });
+
+    describe('User IDs', function () {
+      const baseBidRequest = {
+        'bidder': 'teads',
+        'params': {
+          'placementId': 10433394,
+          'pageId': 1234
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'creativeId': 'er2ee',
+        'deviceWidth': 1680
+      };
+
+      const userIdModules = {
+        unifiedId2: {uid2: {id: 'unifiedId2-id'}},
+        liveRampId: {idl_env: 'liveRampId-id'},
+        lotamePanoramaId: {lotamePanoramaId: 'lotamePanoramaId-id'},
+        id5Id: {id5id: {uid: 'id5Id-id'}},
+        criteoId: {criteoId: 'criteoId-id'},
+        yahooConnectId: {connectId: 'yahooConnectId-id'},
+        quantcastId: {quantcastId: 'quantcastId-id'},
+        epsilonPublisherLinkId: {publinkId: 'epsilonPublisherLinkId-id'},
+        publisherFirstPartyViewerId: {pubcid: 'publisherFirstPartyViewerId-id'},
+        merkleId: {merkleId: {id: 'merkleId-id'}},
+        kinessoId: {kpuid: 'kinessoId-id'}
+      };
+
+      describe('User Id Modules', function () {
+        it(`should not add param to payload if user id system is not enabled`, function () {
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {} // no property -> assumption that the system is disabled
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+          const payload = JSON.parse(request.data);
+
+          for (const userId in userIdModules) {
+            expect(payload, userId).not.to.have.property(userId);
+          }
+        });
+
+        it(`should not add param to payload if user id field is absent`, function () {
+          const request = spec.buildRequests([baseBidRequest], bidderResquestDefault);
+          const payload = JSON.parse(request.data);
+
+          for (const userId in userIdModules) {
+            expect(payload, userId).not.to.have.property(userId);
+          }
+        });
+
+        it(`should not add param to payload if user id is enabled but there is no value`, function () {
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              idl_env: '',
+              pubcid: 'publisherFirstPartyViewerId-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+          const payload = JSON.parse(request.data);
+
+          expect(payload).not.to.have.property('liveRampId');
+          expect(payload['publisherFirstPartyViewerId']).to.equal('publisherFirstPartyViewerId-id');
+        });
+
+        it(`should add userId param to payload for each enabled user id system`, function () {
+          let userIdObject = {};
+          for (const userId in userIdModules) {
+            userIdObject = {
+              ...userIdObject,
+              ...userIdModules[userId]
+            }
+          }
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: userIdObject
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+          const payload = JSON.parse(request.data);
+
+          expect(payload['unifiedId2']).to.equal('unifiedId2-id');
+          expect(payload['liveRampId']).to.equal('liveRampId-id');
+          expect(payload['lotamePanoramaId']).to.equal('lotamePanoramaId-id');
+          expect(payload['id5Id']).to.equal('id5Id-id');
+          expect(payload['criteoId']).to.equal('criteoId-id');
+          expect(payload['yahooConnectId']).to.equal('yahooConnectId-id');
+          expect(payload['quantcastId']).to.equal('quantcastId-id');
+          expect(payload['epsilonPublisherLinkId']).to.equal('epsilonPublisherLinkId-id');
+          expect(payload['publisherFirstPartyViewerId']).to.equal('publisherFirstPartyViewerId-id');
+          expect(payload['merkleId']).to.equal('merkleId-id');
+          expect(payload['kinessoId']).to.equal('kinessoId-id');
+        });
+      })
+
+      describe('First-party cookie Teads ID', function () {
+        it('should not add firstPartyCookieTeadsId param to payload if cookies are not enabled' +
+            ' and teads user id not available', function () {
+          cookiesAreEnabledStub.returns(false);
+
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              pubcid: 'publisherFirstPartyViewerId-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+          const payload = JSON.parse(request.data);
+
+          expect(payload).not.to.have.property('firstPartyCookieTeadsId');
+        });
+
+        it('should not add firstPartyCookieTeadsId param to payload if cookies are enabled ' +
+            'but first-party cookie and teads user id are not available', function () {
+          cookiesAreEnabledStub.returns(true);
+          getCookieStub.withArgs('_tfpvi').returns(undefined);
+
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              pubcid: 'publisherFirstPartyViewerId-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+          const payload = JSON.parse(request.data);
+
+          expect(payload).not.to.have.property('firstPartyCookieTeadsId');
+        });
+
+        it('should add firstPartyCookieTeadsId from cookie if it\'s available ' +
+            'and teads user id is not', function () {
+          cookiesAreEnabledStub.returns(true);
+          getCookieStub.withArgs('_tfpvi').returns('my-teads-id');
+
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              pubcid: 'publisherFirstPartyViewerId-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+
+          const payload = JSON.parse(request.data);
+
+          expect(payload.firstPartyCookieTeadsId).to.equal('my-teads-id');
+        });
+
+        it('should add firstPartyCookieTeadsId from user id module if it\'s available ' +
+            'even if cookie is available too', function () {
+          cookiesAreEnabledStub.returns(true);
+          getCookieStub.withArgs('_tfpvi').returns('my-teads-id');
+
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              pubcid: 'publisherFirstPartyViewerId-id',
+              teadsId: 'teadsId-fake-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+
+          const payload = JSON.parse(request.data);
+
+          expect(payload.firstPartyCookieTeadsId).to.equal('teadsId-fake-id');
+        });
+      });
+    });
+
+    describe('Global Placement Id', function () {
+      let bidRequests = [
+        {
+          'bidder': 'teads',
+          'params': {
+            'placementId': 10433394,
+            'pageId': 1234
+          },
+          'adUnitCode': 'adunit-code-1',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+          'creativeId': 'er2ee',
+          'deviceWidth': 1680
+        },
+        {
+          'bidder': 'teads',
+          'params': {
+            'placementId': 10433395,
+            'pageId': 1234
+          },
+          'adUnitCode': 'adunit-code-2',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '30b31c1838de1f',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+          'creativeId': 'er2ef',
+          'deviceWidth': 1680
+        }
+      ];
+
+      it('should add gpid if ortb2Imp.ext.gpid is present and is non empty', function () {
+        const updatedBidRequests = bidRequests.map(function(bidRequest, index) {
+          return {
+            ...bidRequest,
+            ortb2Imp: {
+              ext: {
+                gpid: '1111/home-left-' + index
+              }
+            }
+          };
+        }
+        );
+        const request = spec.buildRequests(updatedBidRequests, bidderResquestDefault);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.data[0].gpid).to.equal('1111/home-left-0');
+        expect(payload.data[1].gpid).to.equal('1111/home-left-1');
+      });
+
+      it('should not add gpid if ortb2Imp.ext.gpid is present but empty', function () {
+        const updatedBidRequests = bidRequests.map(bidRequest => ({
+          ...bidRequest,
+          ortb2Imp: {
+            ext: {
+              gpid: ''
+            }
+          }
+        }));
+
+        const request = spec.buildRequests(updatedBidRequests, bidderResquestDefault);
+        const payload = JSON.parse(request.data);
+
+        return payload.data.forEach(bid => {
+          expect(bid).not.to.have.property('gpid');
+        });
+      });
+
+      it('should not add gpid if ortb2Imp.ext.gpid is not present', function () {
+        const updatedBidRequests = bidRequests.map(bidRequest => ({
+          ...bidRequest,
+          ortb2Imp: {
+            ext: {
+            }
+          }
+        }));
+
+        const request = spec.buildRequests(updatedBidRequests, bidderResquestDefault);
+        const payload = JSON.parse(request.data);
+
+        return payload.data.forEach(bid => {
+          expect(bid).not.to.have.property('gpid');
+        });
+      });
     });
 
     function checkMediaTypesSizes(mediaTypes, expectedSizes) {
@@ -460,6 +836,9 @@ describe('teadsBidAdapter', () => {
           'height': 250,
           'currency': 'USD',
           'netRevenue': true,
+          'meta': {
+            advertiserDomains: []
+          },
           'ttl': 360,
           'ad': AD_SCRIPT,
           'requestId': '3ede2a3fa0db94',
@@ -471,6 +850,9 @@ describe('teadsBidAdapter', () => {
           'height': 200,
           'currency': 'USD',
           'netRevenue': true,
+          'meta': {
+            advertiserDomains: []
+          },
           'ttl': 360,
           'ad': AD_SCRIPT,
           'requestId': '4fef3b4gb1ec15',
diff --git a/test/spec/modules/teadsIdSystem_spec.js b/test/spec/modules/teadsIdSystem_spec.js
new file mode 100644
index 00000000000..7b977e2fb2b
--- /dev/null
+++ b/test/spec/modules/teadsIdSystem_spec.js
@@ -0,0 +1,271 @@
+import {
+  teadsIdSubmodule,
+  storage,
+  buildAnalyticsTagUrl,
+  getGdprStatus,
+  gdprStatus,
+  getPublisherId,
+  getGdprConsentString,
+  getCookieExpirationDate, getTimestampFromDays, getCcpaConsentString
+} from 'modules/teadsIdSystem.js';
+import {server} from 'test/mocks/xhr.js';
+import * as utils from '../../../src/utils.js';
+
+const FP_TEADS_ID_COOKIE_NAME = '_tfpvi';
+const teadsCookieIdSent = 'teadsCookieIdSent';
+const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+
+describe('TeadsIdSystem', function () {
+  describe('buildAnalyticsTagUrl', function () {
+    it('return complete URL of server request', function () {
+      const submoduleConfig = {
+        params: {
+          pubId: 1234
+        }
+      };
+
+      const consentData = {
+        gdprApplies: true,
+        consentString: 'abc123=='
+      }
+
+      const result = buildAnalyticsTagUrl(submoduleConfig, consentData);
+      const expected = 'https://at.teads.tv/fpc?analytics_tag_id=PUB_1234&tfpvi=&gdpr_consent=abc123%3D%3D&gdpr_status=12&gdpr_reason=120&ccpa_consent=&sv=prebid-v1'
+      expect(result).to.be.equal(expected);
+    })
+  });
+
+  describe('getPublisherId', function () {
+    it('return empty string if params.pubId param is missing', function () {
+      const submoduleConfig = {};
+      const result = getPublisherId(submoduleConfig);
+      const expected = '';
+      expect(result).to.be.equal(expected);
+    });
+    it('return empty string if params.pubId param has a wrong value', function () {
+      const pubIdDifferentValues = [null, undefined, false, true, {}, [], 'abc123'];
+
+      pubIdDifferentValues.forEach((value) => {
+        const submoduleConfig = {
+          params: {
+            pubId: value
+          }
+        };
+        const result = getPublisherId(submoduleConfig);
+        const expected = '';
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return a publisherId prefixed by PUB_ string if params.pubId has a good value', function () {
+      const pubIdDifferentValues = [1234, '1234'];
+
+      pubIdDifferentValues.forEach((value) => {
+        const submoduleConfig = {
+          params: {
+            pubId: value
+          }
+        };
+        const result = getPublisherId(submoduleConfig);
+        const expected = 'PUB_1234';
+        expect(result).to.be.equal(expected);
+      });
+    });
+  });
+
+  describe('getGdprConsentString', function () {
+    it('return empty consentString if no consentData given', function () {
+      const consentDataDifferentValues = [{}, undefined, null];
+
+      consentDataDifferentValues.forEach((value) => {
+        const result = getGdprConsentString(value);
+        const expected = '';
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return empty consentString if consentString has a wrong format', function () {
+      const consentStringDifferentValues = [1, 0, undefined, null, {}];
+
+      consentStringDifferentValues.forEach((value) => {
+        const consentData = {
+          consentString: value
+        };
+        const result = getGdprConsentString(consentData);
+        const expected = '';
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return a good consentString if present and a correct format', function () {
+      const consentData = {
+        consentString: 'consent-string-teads-O1'
+      };
+      const result = getGdprConsentString(consentData);
+      const expected = 'consent-string-teads-O1';
+      expect(result).to.be.equal(expected);
+    });
+  });
+
+  describe('getCcpaConsentString', function () {
+    it('return empty CCPA consentString if no CCPA data is available or a wrong format', function () {
+      const consentDataDifferentValues = [{}, undefined, null, 123];
+
+      consentDataDifferentValues.forEach((value) => {
+        const result = getCcpaConsentString(value);
+        const expected = '';
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return CCPA consentString if CCPA data is available and a good format', function () {
+      const consentData = '1NYN';
+      const result = getCcpaConsentString(consentData);
+      const expected = '1NYN';
+      expect(result).to.be.equal(expected);
+    });
+  });
+
+  describe('getGdprStatus', function () {
+    it('return CMP_NOT_FOUND_OR_ERROR if no given consentData', function () {
+      const consentDataDifferentValues = [{}, undefined, null];
+
+      consentDataDifferentValues.forEach((value) => {
+        const result = getGdprStatus(value);
+        const expected = gdprStatus.CMP_NOT_FOUND_OR_ERROR;
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return CMP_NOT_FOUND_OR_ERROR if gdprApplies param has a wrong format', function () {
+      const gdprAppliesDifferentValues = ['yes', 'true', 1, 0, undefined, null, {}];
+
+      gdprAppliesDifferentValues.forEach((value) => {
+        const consentData = {
+          gdprApplies: value
+        };
+        const result = getGdprStatus(consentData);
+        const expected = gdprStatus.CMP_NOT_FOUND_OR_ERROR;
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return GDPR_DOESNT_APPLY if gdprApplies are false', function () {
+      const consentData = {
+        gdprApplies: false
+      };
+      const result = getGdprStatus(consentData);
+      const expected = gdprStatus.GDPR_DOESNT_APPLY;
+      expect(result).to.be.equal(expected);
+    });
+    it('return GDPR_APPLIES_PUBLISHER if gdprApplies are true', function () {
+      const consentData = {
+        gdprApplies: true
+      };
+      const result = getGdprStatus(consentData);
+      const expected = gdprStatus.GDPR_APPLIES_PUBLISHER;
+      expect(result).to.be.equal(expected);
+    })
+  });
+
+  describe('getExpirationDate', function () {
+    it('return Date Formatted if no given consentData', function () {
+      let timeStampStub;
+      timeStampStub = sinon.stub(utils, 'timestamp').returns(Date.UTC(2022, 8, 19, 14, 30, 50, 0));
+      const cookiesMaxAge = getTimestampFromDays(365);
+
+      const result = getCookieExpirationDate(cookiesMaxAge);
+      const expected = 'Tue, 19 Sep 2023 14:30:50 GMT';
+      expect(result).to.be.equal(expected);
+      timeStampStub.restore();
+    });
+  });
+
+  describe('getId', function () {
+    let setCookieStub, setLocalStorageStub, removeFromLocalStorageStub, logErrorStub, logInfoStub, timeStampStub;
+    const teadsUrl = 'https://at.teads.tv/fpc';
+    const timestampNow = new Date().getTime();
+
+    beforeEach(function () {
+      setCookieStub = sinon.stub(storage, 'setCookie');
+      timeStampStub = sinon.stub(utils, 'timestamp').returns(timestampNow);
+      logErrorStub = sinon.stub(utils, 'logError');
+      logInfoStub = sinon.stub(utils, 'logInfo');
+    });
+
+    afterEach(function () {
+      setCookieStub.restore();
+      timeStampStub.restore();
+      logErrorStub.restore();
+      logInfoStub.restore();
+    });
+
+    it('should log an error and continue to callback if request errors', function () {
+      const config = {
+        params: {}
+      };
+
+      const callbackSpy = sinon.spy();
+      const callback = teadsIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.include(teadsUrl);
+      request.respond(503, null, 'Unavailable');
+      expect(logErrorStub.calledOnce).to.be.true;
+    });
+
+    it('should log an info and continue to callback if status 204 is sent', function () {
+      const config = {
+        params: {}
+      };
+
+      const callbackSpy = sinon.spy();
+      const callback = teadsIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.include(teadsUrl);
+      request.respond(204, null, 'Unavailable');
+      expect(logInfoStub.calledOnce).to.be.true;
+    });
+
+    it('should call the callback with the response body if status 200 is sent', function () {
+      const config = {
+        params: {}
+      };
+
+      const callbackSpy = sinon.spy();
+      const callback = teadsIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.include(teadsUrl);
+      request.respond(200, {'Content-Type': 'application/json'}, teadsCookieIdSent);
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal(teadsCookieIdSent);
+    });
+
+    it('should save teadsId in cookie and local storage if it was returned by API', function () {
+      const config = {
+        params: {}
+      };
+      const result = teadsIdSubmodule.getId(config, {});
+      result.callback((id) => {
+        expect(id).to.be.deep.equal(teadsCookieIdSent);
+      });
+
+      let request = server.requests[0];
+      request.respond(200, {'Content-Type': 'application/json'}, teadsCookieIdSent);
+
+      const cookiesMaxAge = getTimestampFromDays(365); // 1 year
+      const expirationCookieDate = getCookieExpirationDate(cookiesMaxAge);
+      expect(setCookieStub.calledWith(FP_TEADS_ID_COOKIE_NAME, teadsCookieIdSent, expirationCookieDate)).to.be.true;
+    });
+
+    it('should delete teadsId in cookie and local storage if it was not returned by API', function () {
+      const config = {
+        params: {}
+      };
+      const result = teadsIdSubmodule.getId(config, {});
+      result.callback((id) => {
+        expect(id).to.be.undefined
+      });
+
+      let request = server.requests[0];
+      request.respond(200, {'Content-Type': 'application/json'}, '');
+
+      expect(setCookieStub.calledWith(FP_TEADS_ID_COOKIE_NAME, '', EXPIRED_COOKIE_DATE)).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/telariaBidAdapter_spec.js b/test/spec/modules/telariaBidAdapter_spec.js
index 9e4098d7854..457dd568764 100644
--- a/test/spec/modules/telariaBidAdapter_spec.js
+++ b/test/spec/modules/telariaBidAdapter_spec.js
@@ -234,9 +234,7 @@ describe('TelariaAdapter', () => {
     }];
 
     it('should get correct bid response', () => {
-      let expectedResponseKeys = ['bidderCode', 'width', 'height', 'statusMessage', 'adId', 'mediaType', 'source',
-        'getStatusCode', 'getSize', 'requestId', 'cpm', 'creativeId', 'vastXml',
-        'vastUrl', 'currency', 'netRevenue', 'ttl', 'ad'];
+      let expectedResponseKeys = ['requestId', 'cpm', 'creativeId', 'vastXml', 'vastUrl', 'mediaType', 'width', 'height', 'currency', 'netRevenue', 'ttl', 'ad', 'meta'];
 
       let bidRequest = spec.buildRequests(stub, BIDDER_REQUEST)[0];
       bidRequest.bidId = '1234';
diff --git a/test/spec/modules/temedyaBidAdapter_spec.js b/test/spec/modules/temedyaBidAdapter_spec.js
new file mode 100644
index 00000000000..4867bfac4f4
--- /dev/null
+++ b/test/spec/modules/temedyaBidAdapter_spec.js
@@ -0,0 +1,177 @@
+import {expect} from 'chai';
+import {spec} from 'modules/temedyaBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT_URL = 'https://adm.vidyome.com/';
+
+export const _getUrlVars = function(url) {
+  var hash;
+  var myJson = {};
+  var hashes = url.slice(url.indexOf('?') + 1).split('&');
+  for (var i = 0; i < hashes.length; i++) {
+    hash = hashes[i].split('=');
+    myJson[hash[0]] = hash[1];
+  }
+  return myJson;
+}
+
+describe('temedya adapter', function() {
+  let bidRequests;
+  let nativeBidRequests;
+
+  beforeEach(function() {
+    bidRequests = [
+      {
+        bidder: 'temedya',
+        params: {
+          widgetId: 753497,
+          count: 1
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        }
+      }
+    ]
+
+    nativeBidRequests = [
+      {
+        bidder: 'temedya',
+        params: {
+          widgetId: 753497,
+          count: 1
+        },
+        nativeParams: {
+          title: {
+            required: true
+          },
+          image: {
+            required: true
+          }
+        }
+      }
+    ]
+  })
+
+  describe('isBidRequestValid', function () {
+    it('valid bid case', function () {
+      let validBid = {
+        bidder: 'temedya',
+        params: {
+          widgetId: 753497,
+          count: 1
+        }
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('invalid bid case: widgetId and countId is not passed', function() {
+      let validBid = {
+        bidder: 'temedya',
+        params: {
+        }
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(false);
+    })
+  })
+
+  describe('buildRequests', function () {
+    it('sends bid request to ENDPOINT via GET', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.include(ENDPOINT_URL);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('buildRequests function should not modify original bidRequests object', function () {
+      let originalBidRequests = utils.deepClone(bidRequests);
+      let request = spec.buildRequests(bidRequests);
+      expect(bidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('buildRequests function should not modify original nativeBidRequests object', function () {
+      let originalBidRequests = utils.deepClone(nativeBidRequests);
+      let request = spec.buildRequests(nativeBidRequests);
+      expect(nativeBidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('Request params check', function() {
+      let request = spec.buildRequests(bidRequests)[0];
+      const data = _getUrlVars(request.url)
+      data.type = 'native';
+      data.wid = bidRequests[0].params.widgetId;
+      data.count = bidRequests[0].params.count;
+    })
+  })
+
+  describe('interpretResponse', function () {
+    let response = {
+      ads: [
+        {
+          'id': 30,
+          'name': 'Pro Trader Desktop Ocak',
+          'assets': {
+            'sponsor': 'Yatırım Bülteni',
+            'cpm': '0.30188070875464',
+            'name': 'SLC2-DESKTOP',
+            'files': [
+              'https://dsp-vidyome.cdn.vidyome.com/dsp/assets/84066_SLC2_640X480_82KB.jpg'
+            ],
+            'id': 9,
+            'title': '6 ayda zengin oldu! Günde 2 saat çalışarak bilgisayar başında zengin oldu.',
+            'body': 'Sizde yapabilirsiniz!',
+            'landing_url': 'https://bit.ly/3l6RhKG',
+            'click_url': 'https://adclick.adm.vidyome.com/collect?campaignId=30&creativeId=9&widId=122129&v=1609960813742&uri=https%3A%2F%2Fbit.ly%2F3l6RhKG%3Futm_source%3DVidyome%26utm_medium%3Dnative%26utm_campaign%3D30%26utm_term%3D9%26utm_content%3D122129'
+          },
+          'conversion_urls': [
+
+          ],
+          'impression_urls': [
+
+          ]
+        }
+      ],
+      base: {
+        'isSmartphone': false,
+        'isTablet': false,
+        'isDesktop': true,
+        'isConnectedTv': false,
+        'country': 'tr',
+        'wid': 753497,
+        'type': 'native',
+        'locale': 'tr',
+        'widget': {
+          'click': 'https://stats.vidyome.com/s/widgets/collect?widgetId=122129&eventType=click',
+          'impression': 'https://impression.adm.vidyome.com/collect/v1?widgetId=122129'
+        }
+      },
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'requestId': '1d236f7890b',
+          'cpm': 0.0920,
+          'width': 300,
+          'height': 250,
+          'netRevenue': false,
+          'mediaType': 'native',
+          'currency': 'TRY',
+          'creativeId': '<!-- CREATIVE ID -->',
+          'ttl': 700,
+          'ad': '<!-- ADS TAG -->'
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({body: response}, request);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0].cpm).to.not.equal(null);
+      expect(result[0].creativeId).to.not.equal(null);
+      expect(result[0].ad).to.not.equal(null);
+      expect(result[0].currency).to.equal('TRY');
+      expect(result[0].netRevenue).to.equal(false);
+    });
+  })
+})
diff --git a/test/spec/modules/timBidAdapter_spec.js b/test/spec/modules/timBidAdapter_spec.js
deleted file mode 100644
index bf2d2e28510..00000000000
--- a/test/spec/modules/timBidAdapter_spec.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/timBidAdapter.js';
-
-describe('timAdapterTests', function () {
-  describe('bidRequestValidity', function () {
-    it('bidRequest with publisherid and placementCode params', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'tim',
-        params: {
-          publisherid: 'testid',
-          placementCode: 'testplacement'
-        }
-      })).to.equal(true);
-    });
-
-    it('bidRequest with only publisherid', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'tim',
-        params: {
-          publisherid: 'testid'
-        }
-      })).to.equal(false);
-    });
-
-    it('bidRequest with only placementCode', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'tim',
-        params: {
-          placementCode: 'testplacement'
-        }
-      })).to.equal(false);
-    });
-
-    it('bidRequest without params', function () {
-      expect(spec.isBidRequestValid({
-        bidder: 'tim',
-      })).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const validBidRequests = [{
-      'bidder': 'tim',
-      'params': {'placementCode': 'placementCode', 'publisherid': 'testpublisherid'},
-      'mediaTypes': {'banner': {'sizes': [[300, 250]]}},
-      'adUnitCode': 'adUnitCode',
-      'transactionId': 'transactionId',
-      'sizes': [[300, 250]],
-      'bidId': 'bidId',
-      'bidderRequestId': 'bidderRequestId',
-      'auctionId': 'auctionId',
-      'src': 'client',
-      'bidRequestsCount': 1
-    }];
-
-    it('bidRequest method', function () {
-      const requests = spec.buildRequests(validBidRequests);
-      expect(requests[0].method).to.equal('GET');
-    });
-
-    it('bidRequest url', function () {
-      const requests = spec.buildRequests(validBidRequests);
-      expect(requests[0].url).to.exist;
-    });
-
-    it('bidRequest data', function () {
-      const requests = spec.buildRequests(validBidRequests);
-      expect(requests[0].data).to.exist;
-    });
-
-    it('bidRequest options', function () {
-      const requests = spec.buildRequests(validBidRequests);
-      expect(requests[0].options).to.exist;
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const bidRequest = {
-      'method': 'GET',
-      'url': 'https://bidder.url/api/prebid/testpublisherid/header-bid-tag-0?br=%7B%22id%22%3A%223a3ac0d7fc2548%22%2C%22imp%22%3A%5B%7B%22id%22%3A%22251b8a6d3aac3e%22%2C%22banner%22%3A%7B%22w%22%3A300%2C%22h%22%3A250%7D%2C%22tagid%22%3A%22header-bid-tag-0%22%7D%5D%2C%22site%22%3A%7B%22domain%22%3A%22www.chinatimes.com%22%2C%22page%22%3A%22https%3A%2F%2Fwww.chinatimes.com%2Fa%22%2C%22publisher%22%3A%7B%22id%22%3A%22testpublisherid%22%7D%7D%2C%22device%22%3A%7B%22language%22%3A%22en%22%2C%22w%22%3A300%2C%22h%22%3A250%2C%22js%22%3A1%2C%22ua%22%3A%22Mozilla%2F5.0%20(Windows%20NT%2010.0%3B%20Win64%3B%20x64)%20AppleWebKit%2F537.36%20(KHTML%2C%20like%20Gecko)%20Chrome%2F71.0.3578.98%20Safari%2F537.36%22%7D%2C%22bidId%22%3A%22251b8a6d3aac3e%22%7D',
-      'data': '',
-      'options': {'withCredentials': false}
-    };
-
-    const serverResponse = {
-      'body': {
-        'id': 'id',
-        'seatbid': []
-      },
-      'headers': {}
-    };
-
-    it('check empty array response', function () {
-      const result = spec.interpretResponse(serverResponse, bidRequest);
-      expect(result).to.deep.equal([]);
-    });
-
-    const validBidRequest = {
-      'method': 'GET',
-      'url': 'https://bidder.url/api/v2/services/prebid/testpublisherid/placementCodeTest?br=%7B%22id%22%3A%2248640869bd9db94%22%2C%22imp%22%3A%5B%7B%22id%22%3A%224746fcaa11197f3%22%2C%22banner%22%3A%7B%22w%22%3A300%2C%22h%22%3A250%7D%2C%22tagid%22%3A%22placementCodeTest%22%7D%5D%2C%22site%22%3A%7B%22domain%22%3A%22mediamart.tv%22%2C%22page%22%3A%22https%3A%2F%2Fmediamart.tv%2Fsas%2Ftests%2FDesktop%2Fcaesar%2Fdfptest.html%22%2C%22publisher%22%3A%7B%22id%22%3A%22testpublisherid%22%7D%7D%2C%22device%22%3A%7B%22language%22%3A%22en%22%2C%22w%22%3A300%2C%22h%22%3A250%2C%22js%22%3A1%2C%22ua%22%3A%22Mozilla%2F5.0%20(Windows%20NT%2010.0%3B%20Win64%3B%20x64)%20AppleWebKit%2F537.36%20(KHTML%2C%20like%20Gecko)%20Chrome%2F71.0.3578.98%20Safari%2F537.36%22%7D%2C%22bidId%22%3A%224746fcaa11197f3%22%7D',
-      'data': '',
-      'options': {'withCredentials': false}
-    };
-    const validServerResponse = {
-      'body': {'id': 'id',
-        'seatbid': [
-          {'bid': [{'id': 'id',
-            'impid': 'impid',
-            'price': 3,
-            'nurl': 'https://bidder.url/api/v1/?price=${AUCTION_PRICE}&bidcur=USD&bidid=bidid=true',
-            'adm': '<script type=\"text/javascript\" src=\"https://domain.com/Player.php"></script>',
-            'adomain': [''],
-            'cid': '1',
-            'crid': '700',
-            'w': 300,
-            'h': 250
-          }]}],
-        'bidid': 'bidid',
-        'cur': 'USD'
-      },
-      'headers': {}
-    };
-    it('required keys', function () {
-      const result = spec.interpretResponse(validServerResponse, validBidRequest);
-
-      let requiredKeys = [
-        'requestId',
-        'creativeId',
-        'adId',
-        'cpm',
-        'width',
-        'height',
-        'currency',
-        'netRevenue',
-        'ttl',
-        'ad'
-      ];
-
-      let resultKeys = Object.keys(result[0]);
-      requiredKeys.forEach(function(key) {
-        expect(resultKeys.indexOf(key) !== -1).to.equal(true);
-      });
-    })
-  });
-
-  describe('getUserSyncs', function () {
-    it('check empty response getUserSyncs', function () {
-      const result = spec.getUserSyncs('', '');
-      expect(result).to.deep.equal([]);
-    });
-  });
-});
diff --git a/test/spec/modules/timeoutRtdProvider_spec.js b/test/spec/modules/timeoutRtdProvider_spec.js
new file mode 100644
index 00000000000..88415a99b5e
--- /dev/null
+++ b/test/spec/modules/timeoutRtdProvider_spec.js
@@ -0,0 +1,339 @@
+
+import { timeoutRtdFunctions, timeoutSubmodule } from '../../../modules/timeoutRtdProvider'
+import { expect } from 'chai';
+import * as ajax from 'src/ajax.js';
+import * as prebidGlobal from 'src/prebidGlobal.js';
+
+const DEFAULT_USER_AGENT = window.navigator.userAgent;
+const DEFAULT_CONNECTION = window.navigator.connection;
+
+const PC_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246';
+const MOBILE_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1';
+const TABLET_USER_AGENT = 'Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148';
+
+function resetUserAgent() {
+  window.navigator.__defineGetter__('userAgent', () => DEFAULT_USER_AGENT);
+};
+
+function setUserAgent(userAgent) {
+  window.navigator.__defineGetter__('userAgent', () => userAgent);
+}
+
+function resetConnection() {
+  window.navigator.__defineGetter__('connection', () => DEFAULT_CONNECTION);
+}
+function setConnectionType(connectionType) {
+  window.navigator.__defineGetter__('connection', () => { return {'type': connectionType} });
+}
+
+describe('getDeviceType', () => {
+  afterEach(() => {
+    resetUserAgent();
+  });
+
+  [
+    // deviceType, userAgent, deviceTypeNum
+    ['pc', PC_USER_AGENT, 2],
+    ['mobile', MOBILE_USER_AGENT, 4],
+    ['tablet', TABLET_USER_AGENT, 5],
+  ].forEach(function(args) {
+    const [deviceType, userAgent, deviceTypeNum] = args;
+    it(`should be able to recognize ${deviceType} devices`, () => {
+      setUserAgent(userAgent);
+      const res = timeoutRtdFunctions.getDeviceType();
+      expect(res).to.equal(deviceTypeNum)
+    })
+  })
+});
+
+describe('getConnectionSpeed', () => {
+  afterEach(() => {
+    resetConnection();
+  });
+  [
+    // connectionType, connectionSpeed
+    ['slow-2g', 'slow'],
+    ['2g', 'slow'],
+    ['3g', 'medium'],
+    ['bluetooth', 'fast'],
+    ['cellular', 'fast'],
+    ['ethernet', 'fast'],
+    ['wifi', 'fast'],
+    ['wimax', 'fast'],
+    ['4g', 'fast'],
+    ['not known', 'unknown'],
+    [undefined, 'unknown'],
+  ].forEach(function(args) {
+    const [connectionType, connectionSpeed] = args;
+    it(`should be able to categorize connection speed when the connection type is ${connectionType}`, () => {
+      setConnectionType(connectionType);
+      const res = timeoutRtdFunctions.getConnectionSpeed();
+      expect(res).to.equal(connectionSpeed)
+    })
+  })
+});
+
+describe('Timeout modifier calculations', () => {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  it('should be able to detect video ad units', () => {
+    let adUnits = []
+    let res = timeoutRtdFunctions.checkVideo(adUnits);
+    expect(res).to.be.false;
+
+    adUnits = [{
+      mediaTypes: {
+        video: []
+      }
+    }];
+    res = timeoutRtdFunctions.checkVideo(adUnits);
+    expect(res).to.be.true;
+
+    adUnits = [{
+      mediaTypes: {
+        banner: []
+      }
+    }];
+    res = timeoutRtdFunctions.checkVideo(adUnits);
+    expect(res).to.be.false;
+  });
+
+  it('should calculate the timeout modifier for video', () => {
+    sandbox.stub(timeoutRtdFunctions, 'checkVideo').returns(true);
+    const rules = {
+      includesVideo: {
+        'true': 200,
+        'false': 50
+      }
+    }
+    const res = timeoutRtdFunctions.calculateTimeoutModifier([], rules);
+    expect(res).to.equal(200)
+  });
+
+  it('should calculate the timeout modifier for connectionSpeed', () => {
+    sandbox.stub(timeoutRtdFunctions, 'getConnectionSpeed').returns('slow');
+    const rules = {
+      connectionSpeed: {
+        'slow': 200,
+        'medium': 100,
+        'fast': 50
+      }
+    }
+    const res = timeoutRtdFunctions.calculateTimeoutModifier([], rules);
+    expect(res).to.equal(200);
+  });
+
+  it('should calculate the timeout modifier for deviceType', () => {
+    sandbox.stub(timeoutRtdFunctions, 'getDeviceType').returns(4);
+    const rules = {
+      deviceType: {
+        '2': 50,
+        '4': 100,
+        '5': 200
+      },
+    }
+    const res = timeoutRtdFunctions.calculateTimeoutModifier([], rules);
+    expect(res).to.equal(100)
+  });
+
+  it('should calculate the timeout modifier for ranged numAdunits', () => {
+    const rules = {
+      numAdUnits: {
+        '1-5': 100,
+        '6-10': 200,
+        '11-15': 300,
+      }
+    }
+    const adUnits = [1, 2, 3, 4, 5, 6];
+    const res = timeoutRtdFunctions.calculateTimeoutModifier(adUnits, rules);
+    expect(res).to.equal(200)
+  });
+
+  it('should calculate the timeout modifier for exact numAdunits', () => {
+    const rules = {
+      numAdUnits: {
+        '1': 100,
+        '2': 200,
+        '3': 300,
+        '4-5': 400,
+      }
+    }
+    const adUnits = [1, 2];
+    const res = timeoutRtdFunctions.calculateTimeoutModifier(adUnits, rules);
+    expect(res).to.equal(200);
+  });
+
+  it('should add up all the modifiers when all the rules are present', () => {
+    sandbox.stub(timeoutRtdFunctions, 'getConnectionSpeed').returns('slow');
+    sandbox.stub(timeoutRtdFunctions, 'getDeviceType').returns(4);
+    const rules = {
+      connectionSpeed: {
+        'slow': 200,
+        'medium': 100,
+        'fast': 50
+      },
+      deviceType: {
+        '2': 50,
+        '4': 100,
+        '5': 200
+      },
+      includesVideo: {
+        'true': 200,
+        'false': 50
+      },
+      numAdUnits: {
+        '1': 100,
+        '2': 200,
+        '3': 300,
+        '4-5': 400,
+      }
+    }
+    const res = timeoutRtdFunctions.calculateTimeoutModifier([{
+      mediaTypes: {
+        video: []
+      }
+    }], rules);
+    expect(res).to.equal(600);
+  });
+});
+
+describe('Timeout RTD submodule', () => {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  it('should init successfully', () => {
+    expect(timeoutSubmodule.init()).to.equal(true);
+  });
+
+  it('should make a request to the endpoint url if it is provided, and handle the response', () => {
+    const response = '{"deviceType":{ "2": 50, "4": 100, "5": 200 }}'
+    const ajaxStub = sandbox.stub().callsFake(function (url, callbackObj) {
+      callbackObj.success(response);
+    });
+    sandbox.stub(ajax, 'ajaxBuilder').callsFake(function () { return ajaxStub });
+
+    const reqBidsConfigObj = {}
+    const expectedLink = 'https://somelink.json'
+    const config = {
+      'name': 'timeout',
+      'params': {
+        'endpoint': {
+          url: expectedLink
+        }
+      }
+    }
+    const handleTimeoutIncrementStub = sandbox.stub(timeoutRtdFunctions, 'handleTimeoutIncrement');
+    timeoutSubmodule.getBidRequestData(reqBidsConfigObj, function() {}, config)
+
+    expect(ajaxStub.calledWith(expectedLink)).to.be.true;
+    expect(handleTimeoutIncrementStub.calledWith(reqBidsConfigObj, JSON.parse(response))).to.be.true;
+  });
+
+  it('should make a request to the endpoint url and ignore the rules object if the endpoint is provided', () => {
+    const ajaxStub = sandbox.stub().callsFake((url, callbackObj) => {});
+    sandbox.stub(ajax, 'ajaxBuilder').callsFake(() => ajaxStub);
+    const expectedLink = 'https://somelink.json'
+    const config = {
+      'name': 'timeout',
+      'params': {
+        'endpoint': {
+          url: expectedLink
+        },
+        'rules': {
+          'includesVideo': {
+            'true': 200,
+          },
+        }
+      }
+    }
+    timeoutSubmodule.getBidRequestData({}, function() {}, config);
+    expect(ajaxStub.calledWith(expectedLink)).to.be.true;
+  });
+
+  it('should use the rules object if there is no endpoint url', () => {
+    const config = {
+      'name': 'timeout',
+      'params': {
+        'rules': {
+          'includesVideo': {
+            'true': 200,
+          },
+        }
+      }
+    }
+    const handleTimeoutIncrementStub = sandbox.stub(timeoutRtdFunctions, 'handleTimeoutIncrement');
+    const reqBidsConfigObj = {};
+    timeoutSubmodule.getBidRequestData(reqBidsConfigObj, function() {}, config);
+    expect(handleTimeoutIncrementStub.calledWith(reqBidsConfigObj, config.params.rules)).to.be.true;
+  });
+
+  it('should exit quietly if no relevant timeout config is found', () => {
+    const callback = sandbox.stub()
+    const ajaxStub = sandbox.stub().callsFake((url, callbackObj) => {});
+    sandbox.stub(ajax, 'ajaxBuilder').callsFake(function() { return ajaxStub });
+    const handleTimeoutIncrementStub = sandbox.stub(timeoutRtdFunctions, 'handleTimeoutIncrement');
+
+    timeoutSubmodule.getBidRequestData({}, callback, {});
+
+    expect(handleTimeoutIncrementStub.called).to.be.false;
+    expect(callback.called).to.be.true;
+    expect(ajaxStub.called).to.be.false;
+  });
+
+  it('should be able to increment the timeout with the calculated timeout modifier', () => {
+    const baseTimeout = 100;
+    const getConfigStub = sandbox.stub().returns(baseTimeout);
+    sandbox.stub(prebidGlobal, 'getGlobal').callsFake(() => {
+      return {
+        getConfig: getConfigStub
+      }
+    });
+
+    const reqBidsConfigObj = {adUnits: [1, 2, 3]}
+    const addedTimeout = 400;
+    const rules = {
+      numAdUnits: {
+        '3-5': addedTimeout,
+      }
+    }
+
+    timeoutRtdFunctions.handleTimeoutIncrement(reqBidsConfigObj, rules)
+    expect(reqBidsConfigObj.timeout).to.be.equal(baseTimeout + addedTimeout);
+  });
+
+  it('should be able to increment the timeout with the calculated timeout modifier when there are multiple matching rules', () => {
+    const baseTimeout = 100;
+    const getConfigStub = sandbox.stub().returns(baseTimeout);
+    sandbox.stub(prebidGlobal, 'getGlobal').callsFake(() => {
+      return {
+        getConfig: getConfigStub
+      }
+    });
+
+    const reqBidsConfigObj = {adUnits: [1, 2, 3]}
+    const addedTimeout = 400;
+    const rules = {
+      numAdUnits: {
+        '3-5': addedTimeout / 2,
+      },
+      includesVideo: {
+        'false': addedTimeout / 2,
+      }
+    }
+    timeoutRtdFunctions.handleTimeoutIncrement(reqBidsConfigObj, rules)
+    expect(reqBidsConfigObj.timeout).to.be.equal(baseTimeout + addedTimeout);
+  });
+});
diff --git a/test/spec/modules/tncIdSystem_spec.js b/test/spec/modules/tncIdSystem_spec.js
new file mode 100644
index 00000000000..57c5fa63645
--- /dev/null
+++ b/test/spec/modules/tncIdSystem_spec.js
@@ -0,0 +1,109 @@
+import { tncidSubModule } from 'modules/tncIdSystem';
+
+const consentData = {
+  gdprApplies: true,
+  consentString: 'GDPR_CONSENT_STRING'
+};
+
+describe('TNCID tests', function () {
+  describe('name', () => {
+    it('should expose the name of the submodule', () => {
+      expect(tncidSubModule.name).to.equal('tncId');
+    });
+  });
+
+  describe('gvlid', () => {
+    it('should expose the vendor id', () => {
+      expect(tncidSubModule.gvlid).to.equal(750);
+    });
+  });
+
+  describe('decode', () => {
+    it('should wrap the given value inside an object literal', () => {
+      expect(tncidSubModule.decode('TNCID_TEST_ID')).to.deep.equal({
+        tncid: 'TNCID_TEST_ID'
+      });
+    });
+  });
+
+  describe('getId', () => {
+    afterEach(function () {
+      Object.defineProperty(window, '__tnc', {value: undefined, configurable: true});
+      Object.defineProperty(window, '__tncPbjs', {value: undefined, configurable: true});
+    });
+
+    it('Should NOT give TNCID if GDPR applies but consent string is missing', function () {
+      const res = tncidSubModule.getId({}, { gdprApplies: true });
+      expect(res).to.be.undefined;
+    });
+
+    it('GDPR is OK and page has no TNC script on page, script goes in error, no TNCID is returned', function () {
+      const completeCallback = sinon.spy();
+      const {callback} = tncidSubModule.getId({}, consentData);
+
+      return callback(completeCallback).then(() => {
+        expect(completeCallback.calledOnce).to.be.true;
+      })
+    });
+
+    it('GDPR is OK and page has TNC script with ns: __tnc, present TNCID is returned', function () {
+      Object.defineProperty(window, '__tnc', {
+        value: {
+          ready: (readyFunc) => { readyFunc() },
+          on: (name, cb) => { cb() },
+          tncid: 'TNCID_TEST_ID_1',
+          providerId: 'TEST_PROVIDER_ID_1',
+        },
+        configurable: true
+      });
+
+      const completeCallback = sinon.spy();
+      const {callback} = tncidSubModule.getId({}, { gdprApplies: false });
+
+      return callback(completeCallback).then(() => {
+        expect(completeCallback.calledOnceWithExactly('TNCID_TEST_ID_1')).to.be.true;
+      })
+    });
+
+    it('GDPR is OK and page has TNC script with ns: __tnc but not loaded, TNCID is assigned and returned', function () {
+      Object.defineProperty(window, '__tnc', {
+        value: {
+          ready: (readyFunc) => { readyFunc() },
+          on: (name, cb) => { cb() },
+          providerId: 'TEST_PROVIDER_ID_1',
+        },
+        configurable: true
+      });
+
+      const completeCallback = sinon.spy();
+      const {callback} = tncidSubModule.getId({}, { gdprApplies: false });
+
+      return callback(completeCallback).then(() => {
+        expect(completeCallback.calledOnceWithExactly(undefined)).to.be.true;
+      })
+    });
+
+    it('GDPR is OK and page has TNC script with ns: __tncPbjs, TNCID is returned', function () {
+      Object.defineProperty(window, '__tncPbjs', {
+        value: {
+          ready: (readyFunc) => { readyFunc() },
+          on: (name, cb) => {
+            window.__tncPbjs.tncid = 'TNCID_TEST_ID_2';
+            cb();
+          },
+          providerId: 'TEST_PROVIDER_ID_1',
+          options: {},
+        },
+        configurable: true,
+        writable: true
+      });
+
+      const completeCallback = sinon.spy();
+      const {callback} = tncidSubModule.getId({params: {url: 'TEST_URL'}}, consentData);
+
+      return callback(completeCallback).then(() => {
+        expect(completeCallback.calledOnceWithExactly('TNCID_TEST_ID_2')).to.be.true;
+      })
+    });
+  });
+});
diff --git a/test/spec/modules/topRTBBidAdapter_spec.js b/test/spec/modules/topRTBBidAdapter_spec.js
deleted file mode 100644
index 9b97917a0b6..00000000000
--- a/test/spec/modules/topRTBBidAdapter_spec.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/topRTBBidAdapter.js';
-
-describe('topRTBBidAdapterTests', function () {
-  it('validate_pub_params', function () {
-    expect(spec.isBidRequestValid({
-      bidder: 'topRTB',
-      params: {
-        adUnitId: 'c5c06f77430c4c33814a0577cb4cc978'
-      },
-      adName: 'banner'
-    }));
-  });
-
-  it('validate_generated_params', function () {
-    let bidRequestData = [{
-      bidId: 'bid12345',
-      bidder: 'topRTB',
-      adName: 'banner',
-      adType: '{"banner":{"sizes":[[]]}}',
-      params: {
-        adUnitId: 'c5c06f77430c4c33814a0577cb4cc978'
-      },
-      sizes: [[728, 90]]
-    }];
-
-    let request = spec.buildRequests(bidRequestData);
-    const current_url = request.url;
-    const search_params = current_url.searchParams;
-  });
-
-  it('validate_response_params', function () {
-    let bidRequestData = {
-      data: {
-        bidId: 'bid12345'
-      }
-    };
-
-    let serverResponse = {
-      body: [{
-        'cpm': 1,
-        'mediadata': "<a href='https://13.125.21.204:8080/bidder/click?url=xaCQyxrEJsY7XQj4dRGD2RVQiVaLJ%2Bar%2BVDhwhlpnR%2FSQG%2B9%2FtSmvV4X45AM9mMl%2BOSaJzKXTKN82WHc1li3gCzibhr%2ByfcqPIl%2FQHJjBKS7bznHEwRh1kZShVVnSpp3DBjS5I5WSmSD4Qbyo61IJq3LFc9OpHKmJeMgATc4bHK00MqW7atQStUWWSTuhlGO&details=l5G4hDG5UmRmJ%2BB9AdG7v2OpwH%2Bio9Y2oIETI6KooMoo7lJ4Yo7pTbfVGhA5Vn%2BaPCoBX4779c1Jqok45%2FL2ZUP0nc7F0IDfRpLdtoX%2B7Hr2tqmK2Suide0LIsB0woVDXBiq62%2BfneGrTnCi6Nq6GDIBFpmFH8CFinYL%2F%2BB33V8%3D' target='_blank'><img src='https://www.toprtb.com/uploads/d037c2d94369417ab9aea6e712723235/728-90_1546872001356_728x90.gif' alt='Banner 728x90' width='728' height='90' /></a><img src='https://13.125.21.204:8080/bidder/impression?id=e1fb1fbdb97643189827b1b4d2b51acc&impid=1' width='1' height='1' alt=''/></a><img src='https://13.124.144.40:8080/ssp/impression?id=e1fb1fbdb97643189827b1b4d2b51acc&impid=1' width='1' height='1' alt=''/>",
-        'width': 728,
-        'currency': 'USD',
-        'id': 'cd95dffec6b645afbc4e5aa9f68f2ff3',
-        'type': 'RICHMEDIA',
-        'ttl': 4000,
-        'bidId': 'bid12345',
-        'status': 'success',
-        'height': 90}],
-    	'adName': 'banner',
-    	'vastXml': '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><VAST version="2.0"></VAST>',
-    	'mediaType': 'banner',
-    	'tracking': 'https://ssp.toprtb.com/ssp/tracking?F0cloTiKIw%2BjZ2UNDvlKGn5%2FWoAO9cnlAUDm6gFBM8bImY2fKo%2BMTvI0XvXzFTZSb5v8o4EUbPId9hckptTqA4QPaWvpVYCRKRZceXNa4kjtvfm4j2e%2FcRKgkns2goHXi7IZC0sBIbE77WWg%2BPBYv%2BCu84H%2FSH69mi%2FDaWcQlfaEOdkaJdstJEkaZtkgWnFnS7aagte%2BfdEbOqcTxq5hzj%2BZ4NZbwgReuWTQZbfrMWjkXFbn%2B35vZuI319o6XH9n9fKLS4xp8zstXfQT2oSgjw1NmrwqRKf1efB1UaWlS1TbkSqxZ7Kcy7nJvAZrDk0tzcSeIxe4VfHpwgPPs%2BueUeGwz3o7OCh7H1sCmogSrmJFB9JTeXudFjC13iANAtu4SvG9bGIbiJxS%2BNfkjy2mLFm8kSIcIobjNkMEcUAwmoqJNRndwb66a3Iovk2NTo0Ly%2FV7Y5ECPcS5%2FPBrIEOuQXS5SNUPRWKoklX5nexHtOc%3D',
-    	'impression': 'https://ssp.toprtb.com/ssp/impression?id=64f29f7b226249f19925a680a506b32d'
-    };
-
-    let bids = spec.interpretResponse(serverResponse, bidRequestData);
-    expect(bids).to.have.lengthOf(1);
-    let bid = bids[0];
-    expect(bid.cpm).to.equal(1);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.width).to.equal(728);
-    expect(bid.height).to.equal(90);
-    expect(bid.requestId).to.equal('bid12345');
-  });
-});
diff --git a/test/spec/modules/topicsFpdModule_spec.js b/test/spec/modules/topicsFpdModule_spec.js
new file mode 100644
index 00000000000..958489f2728
--- /dev/null
+++ b/test/spec/modules/topicsFpdModule_spec.js
@@ -0,0 +1,432 @@
+import {
+  getTopics,
+  getTopicsData,
+  processFpd,
+  hasGDPRConsent,
+  getCachedTopics,
+  receiveMessage,
+  topicStorageName
+} from '../../../modules/topicsFpdModule.js';
+import {deepClone, safeJSONParse} from '../../../src/utils.js';
+import {gdprDataHandler} from 'src/adapterManager.js';
+import {getCoreStorageManager} from 'src/storageManager.js';
+
+describe('getTopicsData', () => {
+  function makeTopic(topic, modelv, taxv = '1') {
+    return {
+      topic,
+      taxonomyVersion: taxv,
+      modelVersion: modelv
+    };
+  }
+
+  function byTaxClass(segments) {
+    return segments.reduce((memo, segment) => {
+      memo[`${segment.ext.segtax}:${segment.ext.segclass}`] = segment;
+      return memo;
+    }, {});
+  }
+
+  [
+    {
+      t: 'no topics',
+      topics: [],
+      expected: []
+    },
+    {
+      t: 'single topic',
+      topics: [makeTopic(123, 'm1')],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '123'}
+          ]
+        }
+      ]
+    },
+    {
+      t: 'multiple topics with the same model version',
+      topics: [makeTopic(123, 'm1'), makeTopic(321, 'm1')],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '123'},
+            {id: '321'}
+          ]
+        }
+      ]
+    },
+    {
+      t: 'multiple topics with different model versions',
+      topics: [makeTopic(1, 'm1'), makeTopic(2, 'm1'), makeTopic(3, 'm2')],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '1'},
+            {id: '2'}
+          ]
+        },
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm2'
+          },
+          segment: [
+            {id: '3'}
+          ]
+        }
+      ]
+    },
+    {
+      t: 'multiple topics, some with a taxonomy version other than "1"',
+      topics: [makeTopic(123, 'm1'), makeTopic(321, 'm1', 'other')],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '123'}
+          ]
+        }
+      ]
+    },
+    {
+      t: 'multiple topics in multiple taxonomies',
+      taxonomies: {
+        '1': 600,
+        '2': 601
+      },
+      topics: [
+        makeTopic(123, 'm1', '1'),
+        makeTopic(321, 'm1', '2'),
+        makeTopic(213, 'm2', '1'),
+      ],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '123'}
+          ]
+        },
+        {
+          ext: {
+            segtax: 601,
+            segclass: 'm1',
+          },
+          segment: [
+            {id: '321'}
+          ]
+        },
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm2'
+          },
+          segment: [
+            {id: '213'}
+          ]
+        }
+      ]
+    }
+  ].forEach(({t, topics, expected, taxonomies}) => {
+    describe(`on ${t}`, () => {
+      it('should convert topics to user.data segments correctly', () => {
+        const actual = getTopicsData('mockName', topics, taxonomies);
+        expect(actual.length).to.eql(expected.length);
+        expected = byTaxClass(expected);
+        Object.entries(byTaxClass(actual)).forEach(([key, datum]) => {
+          sinon.assert.match(datum, expected[key]);
+          expect(datum.name).to.equal('mockName');
+        });
+      });
+
+      it('should not set name if null', () => {
+        getTopicsData(null, topics).forEach((data) => {
+          expect(data.hasOwnProperty('name')).to.be.false;
+        });
+      });
+    });
+  });
+});
+
+describe('getTopics', () => {
+  Object.entries({
+    'document with no browsingTopics': {},
+    'document that disallows topics': {
+      featurePolicy: {
+        allowsFeature: sinon.stub().returns(false)
+      }
+    },
+    'document that throws on featurePolicy': {
+      browsingTopics: sinon.stub(),
+      get featurePolicy() {
+        throw new Error();
+      }
+    },
+    'document that throws on browsingTopics': {
+      browsingTopics: sinon.stub().callsFake(() => {
+        throw new Error();
+      }),
+      featurePolicy: {
+        allowsFeature: sinon.stub().returns(true)
+      }
+    },
+  }).forEach(([t, doc]) => {
+    it(`should resolve to an empty list on ${t}`, () => {
+      return getTopics(doc).then((topics) => {
+        expect(topics).to.eql([]);
+      });
+    });
+  });
+
+  it('should call `document.browsingTopics` when allowed', () => {
+    const topics = ['t1', 't2'];
+    return getTopics({
+      browsingTopics: sinon.stub().returns(Promise.resolve(topics)),
+      featurePolicy: {
+        allowsFeature: sinon.stub().returns(true)
+      }
+    }).then((actual) => {
+      expect(actual).to.eql(topics);
+    });
+  });
+});
+
+describe('processFpd', () => {
+  const mockData = [
+    {
+      name: 'domain',
+      segment: [{id: 123}]
+    },
+    {
+      name: 'domain',
+      segment: [{id: 321}]
+    }
+  ];
+
+  it('should add topics data', () => {
+    return processFpd({}, {global: {}}, {data: Promise.resolve(mockData)})
+      .then(({global}) => {
+        expect(global.user.data).to.eql(mockData);
+      });
+  });
+
+  it('should apppend to existing user.data', () => {
+    const global = {
+      user: {
+        data: [
+          {name: 'preexisting'},
+        ]
+      }
+    };
+    return processFpd({}, {global: deepClone(global)}, {data: Promise.resolve(mockData)})
+      .then((data) => {
+        expect(data.global.user.data).to.eql(global.user.data.concat(mockData));
+      });
+  });
+
+  it('should not modify fpd when there is no data', () => {
+    return processFpd({}, {global: {}}, {data: Promise.resolve([])})
+      .then((data) => {
+        expect(data.global).to.eql({});
+      });
+  });
+});
+
+describe('Topics Module GDPR consent check', () => {
+  let gdprDataHdlrStub;
+  beforeEach(() => {
+    gdprDataHdlrStub = sinon.stub(gdprDataHandler, 'getConsentData');
+  });
+
+  afterEach(() => {
+    gdprDataHdlrStub.restore();
+  });
+
+  it('should return false when GDPR is applied but consent string is not present', () => {
+    const consentString = '';
+    const consentConfig = {
+      consentString: consentString,
+      gdprApplies: true,
+      vendorData: {}
+    };
+    gdprDataHdlrStub.returns(consentConfig);
+    expect(hasGDPRConsent()).to.equal(false);
+  });
+
+  it('should return true when GDPR doesn\'t apply', () => {
+    const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
+    const consentConfig = {
+      consentString: consentString,
+      gdprApplies: false,
+      vendorData: {}
+    };
+
+    gdprDataHdlrStub.returns(consentConfig);
+    expect(hasGDPRConsent()).to.equal(true);
+  });
+
+  it('should return true when GDPR is applied and purpose consent is true for all purpose[1,2,3,4]', () => {
+    const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
+    const consentConfig = {
+      consentString: consentString,
+      gdprApplies: true,
+      vendorData: {
+        metadata: consentString,
+        gdprApplies: true,
+        purpose: {
+          consents: {
+            1: true,
+            2: true,
+            3: true,
+            4: true
+          }
+        }
+      }
+    };
+
+    gdprDataHdlrStub.returns(consentConfig);
+    expect(hasGDPRConsent()).to.equal(true);
+  });
+
+  it('should return false when GDPR is applied and purpose consent is false for one of the purpose[1,2,3,4]', () => {
+    const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
+    const consentConfig = {
+      consentString: consentString,
+      gdprApplies: true,
+      vendorData: {
+        metadata: consentString,
+        gdprApplies: true,
+        purpose: {
+          consents: {
+            1: true,
+            2: true,
+            3: true,
+            4: false
+          }
+        }
+      }
+    };
+
+    gdprDataHdlrStub.returns(consentConfig);
+    expect(hasGDPRConsent()).to.equal(false);
+  });
+});
+
+describe('getCachedTopics()', () => {
+  const storage = getCoreStorageManager('topicsFpd');
+  const expected = [{
+    ext: {
+      segtax: 600,
+      segclass: '2206021246'
+    },
+    segment: [{
+      'id': '243'
+    }, {
+      'id': '265'
+    }],
+    name: 'ads.pubmatic.com'
+  }];
+  const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
+  const consentConfig = {
+    consentString: consentString,
+    gdprApplies: true,
+    vendorData: {
+      metadata: consentString,
+      gdprApplies: true,
+      purpose: {
+        consents: {
+          1: true,
+          2: true,
+          3: true,
+          4: true
+        }
+      }
+    }
+  };
+  const mockData = [
+    {
+      name: 'domain',
+      segment: [{id: 123}]
+    },
+    {
+      name: 'domain',
+      segment: [{id: 321}],
+    }
+  ];
+
+  const evt = {
+    data: '{"segment":{"domain":"ads.pubmatic.com","topics":[{"configVersion":"chrome.1","modelVersion":"2206021246","taxonomyVersion":"1","topic":165,"version":"chrome.1:1:2206021246"}],"bidder":"pubmatic"},"date":1669743901858}',
+    origin: 'https://ads.pubmatic.com'
+  };
+
+  let gdprDataHdlrStub;
+  beforeEach(() => {
+    gdprDataHdlrStub = sinon.stub(gdprDataHandler, 'getConsentData');
+  });
+
+  afterEach(() => {
+    storage.removeDataFromLocalStorage(topicStorageName);
+    gdprDataHdlrStub.restore();
+  });
+
+  it('should return segments for bidder if GDPR consent is true and there is cached segments stored which is not expired', () => {
+    const storedSegments = JSON.stringify(
+      [['pubmatic', {
+        '2206021246': {
+          'ext': {'segtax': 600, 'segclass': '2206021246'},
+          'segment': [{'id': '243'}, {'id': '265'}],
+          'name': 'ads.pubmatic.com'
+        },
+        'lastUpdated': new Date().getTime()
+      }]]
+    );
+    storage.setDataInLocalStorage(topicStorageName, storedSegments);
+    gdprDataHdlrStub.returns(consentConfig);
+    assert.deepEqual(getCachedTopics(), expected);
+  });
+
+  it('should return empty segments for bidder if GDPR consent is true and there is cached segments stored which is expired', () => {
+    let storedSegments = '[["pubmatic",{"2206021246":{"ext":{"segtax":600,"segclass":"2206021246"},"segment":[{"id":"243"},{"id":"265"}],"name":"ads.pubmatic.com"},"lastUpdated":10}]]';
+    storage.setDataInLocalStorage(topicStorageName, storedSegments);
+    gdprDataHdlrStub.returns(consentConfig);
+    assert.deepEqual(getCachedTopics(), []);
+  });
+
+  it('should stored segments if receiveMessage event is triggerred with segment data', () => {
+    return processFpd({}, {global: {}}, {data: Promise.resolve(mockData)})
+      .then(({global}) => {
+        receiveMessage(evt);
+        let segments = new Map(safeJSONParse(storage.getDataFromLocalStorage(topicStorageName)));
+        expect(segments.has('pubmatic')).to.equal(true);
+      });
+  });
+
+  it('should update stored segments if receiveMessage event is triggerred with segment data', () => {
+    let storedSegments = '[["pubmatic",{"2206021246":{"ext":{"segtax":600,"segclass":"2206021246"},"segment":[{"id":"243"},{"id":"265"}],"name":"ads.pubmatic.com"},"lastUpdated":1669719242027}]]';
+    storage.setDataInLocalStorage(topicStorageName, storedSegments);
+    return processFpd({}, {global: {}}, {data: Promise.resolve(mockData)})
+      .then(({global}) => {
+        receiveMessage(evt);
+        let segments = new Map(safeJSONParse(storage.getDataFromLocalStorage(topicStorageName)));
+        expect(segments.get('pubmatic')[2206021246].segment.length).to.equal(1);
+      });
+  });
+});
diff --git a/test/spec/modules/tpmnBidAdapter_spec.js b/test/spec/modules/tpmnBidAdapter_spec.js
index b4f6882dbe1..e2b14b18f61 100644
--- a/test/spec/modules/tpmnBidAdapter_spec.js
+++ b/test/spec/modules/tpmnBidAdapter_spec.js
@@ -1,9 +1,39 @@
 /* eslint-disable no-tabs */
-import { expect } from 'chai';
-import { spec } from 'modules/tpmnBidAdapter.js';
+import {expect} from 'chai';
+import {spec, storage} from 'modules/tpmnBidAdapter.js';
+import {generateUUID} from '../../../src/utils.js';
+import {newBidder} from '../../../src/adapters/bidderFactory';
+import * as sinon from 'sinon';
 
-describe('tpmnAdapterTests', function() {
-  describe('isBidRequestValid', function() {
+describe('tpmnAdapterTests', function () {
+  const adapter = newBidder(spec);
+  const BIDDER_CODE = 'tpmn';
+  let sandbox = sinon.sandbox.create();
+  let getCookieStub;
+
+  beforeEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      tpmn: {
+        storageAllowed: true
+      }
+    };
+    sandbox = sinon.sandbox.create();
+    getCookieStub = sinon.stub(storage, 'getCookie');
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    getCookieStub.restore();
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+  });
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  });
+
+  describe('isBidRequestValid', function () {
     let bid = {
       adUnitCode: 'temp-unitcode',
       bidder: 'tpmn',
@@ -20,17 +50,18 @@ describe('tpmnAdapterTests', function() {
         }
       }
     };
-    it('should return true if a bid is valid banner bid request', function() {
+
+    it('should return true if a bid is valid banner bid request', function () {
       expect(spec.isBidRequestValid(bid)).to.be.equal(true);
     });
 
-    it('should return false where requried param is missing', function() {
+    it('should return false where requried param is missing', function () {
       let bid = Object.assign({}, bid);
       bid.params = {};
       expect(spec.isBidRequestValid(bid)).to.be.equal(false);
     });
 
-    it('should return false when required param values have invalid type', function() {
+    it('should return false when required param values have invalid type', function () {
       let bid = Object.assign({}, bid);
       bid.params = {
         'inventoryId': null,
@@ -40,14 +71,14 @@ describe('tpmnAdapterTests', function() {
     });
   });
 
-  describe('buildRequests', function() {
-    it('should return an empty list  if there are no bid requests', function() {
+  describe('buildRequests', function () {
+    it('should return an empty list  if there are no bid requests', function () {
       const emptyBidRequests = [];
       const bidderRequest = {};
       const request = spec.buildRequests(emptyBidRequests, bidderRequest);
       expect(request).to.be.an('array').that.is.empty;
     });
-    it('should generate a POST server request with bidder API url, data', function() {
+    it('should generate a POST server request with bidder API url, data', function () {
       const bid = {
         adUnitCode: 'temp-unitcode',
         bidder: 'tpmn',
@@ -65,13 +96,15 @@ describe('tpmnAdapterTests', function() {
         }
       };
       const tempBidRequests = [bid];
-      const tempBidderRequest = {refererInfo: {
-        referer: 'http://localhost/test',
-        site: {
-          domain: 'localhost',
-          page: 'http://localhost/test'
+      const tempBidderRequest = {
+        refererInfo: {
+          page: 'http://localhost/test',
+          site: {
+            domain: 'localhost',
+            page: 'http://localhost/test'
+          }
         }
-      }};
+      };
       const builtRequest = spec.buildRequests(tempBidRequests, tempBidderRequest);
 
       expect(builtRequest).to.have.lengthOf(1);
@@ -96,7 +129,7 @@ describe('tpmnAdapterTests', function() {
     });
   });
 
-  describe('interpretResponse', function() {
+  describe('interpretResponse', function () {
     const bid = {
       adUnitCode: 'temp-unitcode',
       bidder: 'tpmn',
@@ -115,12 +148,12 @@ describe('tpmnAdapterTests', function() {
     };
     const tempBidRequests = [bid];
 
-    it('should return an empty aray to indicate no valid bids', function() {
+    it('should return an empty aray to indicate no valid bids', function () {
       const emptyServerResponse = {};
       const bidResponses = spec.interpretResponse(emptyServerResponse, tempBidRequests);
       expect(bidResponses).is.an('array').that.is.empty;
     });
-    it('should return an empty array to indicate no valid bids', function() {
+    it('should return an empty array to indicate no valid bids', function () {
       const mockBidResult = {
         requestId: '9cf19229-34f6-4d06-bc1d-0e44e8d616c8',
         cpm: 10.0,
@@ -141,4 +174,36 @@ describe('tpmnAdapterTests', function() {
       expect(bidResponses).deep.equal([mockBidResult]);
     });
   });
+
+  describe('getUserSync', function () {
+    const KEY_ID = 'uuid';
+    const TMP_UUID = generateUUID().replace(/-/g, '');
+
+    it('getCookie mock Test', () => {
+      const uuid = storage.getCookie(KEY_ID);
+      expect(uuid).to.equal(undefined);
+    });
+
+    it('getCookie mock Test', () => {
+      expect(TMP_UUID.length).to.equal(32);
+      getCookieStub.withArgs(KEY_ID).returns(TMP_UUID);
+      const uuid = storage.getCookie(KEY_ID);
+      expect(uuid).to.equal(TMP_UUID);
+    });
+
+    it('case 1 -> allow iframe', () => {
+      const syncs = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true});
+      expect(syncs.length).to.equal(1);
+      expect(syncs[0].type).to.equal('iframe');
+    });
+
+    it('case 2 -> allow pixel with static sync', () => {
+      const syncs = spec.getUserSyncs({ iframeEnabled: false, pixelEnabled: true });
+      expect(syncs.length).to.be.equal(4);
+      expect(syncs[0].type).to.be.equal('image');
+      expect(syncs[1].type).to.be.equal('image');
+      expect(syncs[2].type).to.be.equal('image');
+      expect(syncs[3].type).to.be.equal('image');
+    });
+  });
 });
diff --git a/test/spec/modules/trafficgateBidAdapter_spec.js b/test/spec/modules/trafficgateBidAdapter_spec.js
new file mode 100644
index 00000000000..ecea0e69ca1
--- /dev/null
+++ b/test/spec/modules/trafficgateBidAdapter_spec.js
@@ -0,0 +1,223 @@
+import { expect } from 'chai'
+import { spec } from '../../../modules/trafficgateBidAdapter'
+import { deepStrictEqual, notStrictEqual, ok, strictEqual } from 'assert'
+
+describe('TrafficGateAdapter', () => {
+  const bid = {
+    bidId: '9ec5b177515ee2e5',
+    bidder: 'trafficgate',
+    params: {
+      placementId: 1,
+      host: 'example'
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    }
+  }
+
+  describe('isBidRequestValid', () => {
+    it('Should return true if there are bidId, params and placementId parameters present', () => {
+      strictEqual(true, spec.isBidRequestValid(bid))
+    })
+
+    it('Should return false if at least one of parameters is not present', () => {
+      const b = { ...bid }
+      delete b.params.placementId
+      strictEqual(false, spec.isBidRequestValid(b))
+    })
+
+    it('Should return false if at least one of parameters is not present', () => {
+      const b = { ...bid }
+      delete b.params.host
+      strictEqual(false, spec.isBidRequestValid(b))
+    })
+  })
+
+  describe('buildRequests', () => {
+    const serverRequest = spec.buildRequests([bid])
+
+    it('Creates a ServerRequest object with method, URL and data', () => {
+      ok(serverRequest)
+      ok(serverRequest.method)
+      ok(serverRequest.url)
+      ok(serverRequest.data)
+    })
+
+    it('Returns POST method', () => {
+      strictEqual('POST', serverRequest.method)
+    })
+
+    it('Returns valid URL', () => {
+      strictEqual('https://example.bc-plugin.com/?c=o&m=multi', serverRequest.url)
+    })
+
+    it('Returns valid data if array of bids is valid', () => {
+      const { data } = serverRequest
+      strictEqual('object', typeof data)
+      deepStrictEqual(['language', 'secure', 'host', 'page', 'placements'], Object.keys(data))
+      strictEqual('string', typeof data.language)
+      strictEqual('string', typeof data.host)
+      strictEqual('string', typeof data.page)
+      notStrictEqual(-1, [0, 1].indexOf(data.secure))
+
+      const placement = data.placements[0]
+      deepStrictEqual(['placementId', 'bidId', 'traffic'], Object.keys(placement))
+      strictEqual(1, placement.placementId)
+      strictEqual('9ec5b177515ee2e5', placement.bidId)
+      strictEqual('banner', placement.traffic)
+    })
+
+    it('Returns empty data if no valid requests are passed', () => {
+      deepStrictEqual([], spec.buildRequests([]))
+    })
+  })
+
+  describe('interpretResponse', () => {
+    const validData = [
+      {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      },
+      {
+        body: [{
+          vastUrl: 'example.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'example.com',
+          title: 'Test',
+          image: 'example.com',
+          creativeId: '2',
+          impressionTrackers: ['example.com'],
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '9ec5b177515ee2e5',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      }
+    ]
+
+    for (const obj of validData) {
+      const { mediaType } = obj.body[0]
+
+      it(`Should interpret ${mediaType} response`, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response).to.be.an('array')
+        strictEqual(1, response.length)
+
+        const copy = { ...obj.body[0] }
+        deepStrictEqual(copy, response[0])
+      })
+    }
+
+    for (const obj of validData) {
+      it(`Should interpret response has meta.advertiserDomains`, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response[0]['meta']['advertiserDomains']).to.be.an('array')
+        expect(response[0]['meta']['advertiserDomains'][0]).to.be.an('string')
+      })
+    }
+
+    const invalidData = [
+      {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'example.com',
+          title: 'Test',
+          impressionTrackers: ['example.com'],
+          ttl: 120,
+          requestId: '9ec5b177515ee2e5',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      }
+    ]
+
+    for (const obj of invalidData) {
+      const { mediaType } = obj.body[0]
+
+      it(`Should return an empty array if invalid ${mediaType} response is passed `, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response).to.be.an('array')
+        strictEqual(0, response.length)
+      })
+    }
+
+    it('Should return an empty array if invalid response is passed', () => {
+      const response = spec.interpretResponse({
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      })
+
+      expect(response).to.be.an('array')
+      strictEqual(0, response.length)
+    })
+  })
+})
diff --git a/test/spec/modules/trendqubeBidAdapter_spec.js b/test/spec/modules/trendqubeBidAdapter_spec.js
deleted file mode 100644
index f2ce95832ff..00000000000
--- a/test/spec/modules/trendqubeBidAdapter_spec.js
+++ /dev/null
@@ -1,270 +0,0 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/trendqubeBidAdapter.js';
-import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
-
-describe('TrendqubebBidAdapter', function () {
-  const bid = {
-    bidId: '23fhj33i987f',
-    bidder: 'trendqube',
-    params: {
-      placementId: 0,
-      traffic: BANNER
-    }
-  };
-
-  const bidderRequest = {
-    refererInfo: {
-      referer: 'test.com'
-    }
-  };
-
-  describe('isBidRequestValid', function () {
-    it('Should return true if there are bidId, params and placementId 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://ads.trendqube.com/?c=o&m=multi');
-    });
-    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', 'hPlayer', 'wPlayer', 'schain');
-      expect(placement.placementId).to.equal(0);
-      expect(placement.bidId).to.equal('23fhj33i987f');
-      expect(placement.traffic).to.equal(BANNER);
-      expect(placement.schain).to.be.an('object');
-    });
-
-    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.traffic).to.equal(VIDEO);
-      expect(placement.wPlayer).to.equal(playerSize[0]);
-      expect(placement.hPlayer).to.equal(playerSize[1]);
-    });
-
-    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');
-      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');
-      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');
-      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/tribeosBidAdapter_spec.js b/test/spec/modules/tribeosBidAdapter_spec.js
deleted file mode 100644
index fd7f7087eb7..00000000000
--- a/test/spec/modules/tribeosBidAdapter_spec.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/tribeosBidAdapter.js';
-
-describe('tribeosBidAdapter', function() {
-  describe('isBidRequestValid', function() {
-    it('should return true if all parameters are passed', function() {
-      expect(spec.isBidRequestValid({
-        bidder: 'tribeos',
-        params: {
-          placementId: '12345'
-        }
-      })).to.equal(true);
-    });
-
-    it('should return false is placementId is missing', function() {
-      expect(spec.isBidRequestValid({
-        bidder: 'tribeos',
-        params: {}
-      })).to.equal(false);
-    });
-  });
-
-  it('validate bid request data from backend', function() {
-    let bidRequestData = [{
-      bidId: 'bid12',
-      bidder: 'tribeos',
-      mediaTypes: {
-        banner: {
-          sizes: [
-            [300, 250]
-          ],
-        }
-      },
-      params: {
-        placementId: 'test-bid'
-      }
-    }];
-
-    let request = spec.buildRequests(bidRequestData);
-    let payload = JSON.parse(request[0].data);
-
-    expect(payload.bidId).to.equal('bid12');
-  });
-
-  it('validate response parameters', function() {
-    let bidRequestData = {
-      data: {
-        bidId: '21f3e9c3ce92f2'
-      }
-    };
-
-    let serverResponse = {
-      body: {
-        'id': '5e23a6c74314aa782328376f5954',
-        'bidid': '5e23a6c74314aa782328376f5954',
-        'seatbid': [{
-          'bid': [{
-            'id': '5e23a6c74314aa782328376f5954',
-            'impid': '21f3e9c3ce92f2',
-            'price': 1.1,
-            'adid': '5e23a6c74314aa782328376f5954',
-            'adm': '<html></html>',
-            'cid': '5e1eea895d37673aef2134825195rnd2',
-            'crid': '5e0b71e6823bb66fcb6c9858',
-            'h': 250,
-            'w': 300
-          }],
-          'seats': '1'
-        }],
-        'cur': 'USD'
-      }
-    };
-
-    let bids = spec.interpretResponse(serverResponse, bidRequestData);
-    expect(bids).to.have.lengthOf(1);
-    let bid = bids[0];
-
-    expect(bid.cpm).to.equal(1.1);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.requestId).to.equal('21f3e9c3ce92f2');
-    expect(bid.ad).to.equal('<html></html>');
-  });
-});
diff --git a/test/spec/modules/trionBidAdapter_spec.js b/test/spec/modules/trionBidAdapter_spec.js
index 596e8a3e2d9..d7f09c2a057 100644
--- a/test/spec/modules/trionBidAdapter_spec.js
+++ b/test/spec/modules/trionBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import * as utils from 'src/utils.js';
 import {spec, acceptPostMessage, getStorageData, setStorageData} from 'modules/trionBidAdapter.js';
+import {deepClone} from 'src/utils.js';
 
 const CONSTANTS = require('src/constants.json');
 const adloader = require('src/adloader');
@@ -70,10 +71,16 @@ describe('Trion adapter tests', function () {
 
   beforeEach(function () {
     // adapter = trionAdapter.createNew();
+    $$PREBID_GLOBAL$$.bidderSettings = {
+      trion: {
+        storageAllowed: true
+      }
+    };
     sinon.stub(document.body, 'appendChild');
   });
 
   afterEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {};
     document.body.appendChild.restore();
   });
 
@@ -146,47 +153,47 @@ describe('Trion adapter tests', function () {
       expect(bidUrlParams).to.include(getPublisherUrl());
     });
 
-    describe('webdriver', function () {
-      let originalWD;
-
-      beforeEach(function () {
-        originalWD = window.navigator.webdriver;
-      });
-
-      afterEach(function () {
-        window.navigator['__defineGetter__']('webdriver', function () {
-          return originalWD;
-        });
-      });
-
-      describe('is present', function () {
-        beforeEach(function () {
-          window.navigator['__defineGetter__']('webdriver', function () {
-            return 1;
-          });
-        });
-
-        it('when there is non human traffic', function () {
-          let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
-          let bidUrlParams = bidRequests[0].data;
-          expect(bidUrlParams).to.include('tr_wd=1');
-        });
-      });
-
-      describe('is not present', function () {
-        beforeEach(function () {
-          window.navigator['__defineGetter__']('webdriver', function () {
-            return 0;
-          });
-        });
-
-        it('when there is not non human traffic', function () {
-          let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
-          let bidUrlParams = bidRequests[0].data;
-          expect(bidUrlParams).to.include('tr_wd=0');
-        });
-      });
-    });
+    // describe('webdriver', function () {
+    //   let originalWD;
+
+    //   beforeEach(function () {
+    //     originalWD = window.navigator.webdriver;
+    //   });
+
+    //   afterEach(function () {
+    //     window.navigator['__defineGetter__']('webdriver', function () {
+    //       return originalWD;
+    //     });
+    //   });
+
+    //   describe('is present', function () {
+    //     beforeEach(function () {
+    //       window.navigator['__defineGetter__']('webdriver', function () {
+    //         return 1;
+    //       });
+    //     });
+
+    //     it('when there is non human traffic', function () {
+    //       let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
+    //       let bidUrlParams = bidRequests[0].data;
+    //       expect(bidUrlParams).to.include('tr_wd=1');
+    //     });
+    //   });
+
+    //   describe('is not present', function () {
+    //     beforeEach(function () {
+    //       window.navigator['__defineGetter__']('webdriver', function () {
+    //         return 0;
+    //       });
+    //     });
+
+    //     it('when there is not non human traffic', function () {
+    //       let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
+    //       let bidUrlParams = bidRequests[0].data;
+    //       expect(bidUrlParams).to.include('tr_wd=0');
+    //     });
+    //   });
+    // });
 
     describe('document', function () {
       let originalHD;
@@ -316,6 +323,14 @@ describe('Trion adapter tests', function () {
       expect(response[0].cpm).to.equal(bidCpm);
       TRION_BID_RESPONSE.result.cpm = 100;
     });
+
+    it('advertiserDomains is included when sent by server', function () {
+      TRION_BID_RESPONSE.result.adomain = ['test_adomain'];
+      let response = spec.interpretResponse({body: TRION_BID_RESPONSE}, {bidRequest: TRION_BID});
+      expect(Object.keys(response[0].meta)).to.include.members(['advertiserDomains']);
+      expect(response[0].meta.advertiserDomains).to.deep.equal(['test_adomain']);
+      delete TRION_BID_RESPONSE.result.adomain;
+    });
   });
 
   describe('getUserSyncs', function () {
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index 73373293114..5cfa64184f9 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -1,58 +1,104 @@
 import { expect } from 'chai';
-import { tripleliftAdapterSpec } from 'modules/tripleliftBidAdapter.js';
+import { tripleliftAdapterSpec, storage } from 'modules/tripleliftBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { deepClone } from 'src/utils.js';
 import { config } from 'src/config.js';
 import prebid from '../../../package.json';
+import * as utils from 'src/utils.js';
 
 const ENDPOINT = 'https://tlx.3lift.com/header/auction?';
 const GDPR_CONSENT_STR = 'BOONm0NOONm0NABABAENAa-AAAARh7______b9_3__7_9uz_Kv_K7Vf7nnG072lPVA9LTOQ6gEaY';
 
 describe('triplelift adapter', function () {
   const adapter = newBidder(tripleliftAdapterSpec);
+  let bid, instreamBid, sandbox, logErrorSpy;
 
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
+  this.beforeEach(() => {
+    bid = {
       bidder: 'triplelift',
       params: {
         inventoryCode: '12345',
         floor: 1.0,
       },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [970, 250],
+            [1, 1]
+          ]
+        }
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    instreamBid = {
+      bidder: 'triplelift',
+      params: {
+        inventoryCode: 'insteam_test',
+        floor: 1.0,
+        video: {
+          mimes: ['video/mp4'],
+          maxduration: 30,
+          minduration: 6,
+          w: 640,
+          h: 480
+        }
+      },
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [640, 480]
+        }
+      },
       'adUnitCode': 'adunit-code',
       'sizes': [[300, 250], [300, 600]],
       'bidId': '30b31c1838de1e',
       'bidderRequestId': '22edbae2733bf6',
       'auctionId': '1d1a030790a475',
     };
+  })
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
 
+  describe('isBidRequestValid', function () {
     it('should return true for valid bid request', function () {
       expect(tripleliftAdapterSpec.isBidRequestValid(bid)).to.equal(true);
     });
 
     it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        inventoryCode: 'another_inv_code',
-        floor: 0.05
-      };
+      bid.params.inventoryCode = 'another_inv_code';
       expect(tripleliftAdapterSpec.isBidRequestValid(bid)).to.equal(true);
     });
 
+    it('should return true when required params found - instream', function () {
+      expect(tripleliftAdapterSpec.isBidRequestValid(instreamBid)).to.equal(true);
+    });
+
+    it('should return true when required params found - instream - 2', function () {
+      delete instreamBid.mediaTypes.playerSize;
+      delete instreamBid.params.video.w;
+      delete instreamBid.params.video.h;
+      // the only required param is inventoryCode
+      expect(tripleliftAdapterSpec.isBidRequestValid(instreamBid)).to.equal(true);
+    });
+
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        floor: 1.0
-      };
+      delete bid.params.inventoryCode;
       expect(tripleliftAdapterSpec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('should return false when required params are not passed - instream', function () {
+      delete instreamBid.params.inventoryCode;
+      expect(tripleliftAdapterSpec.isBidRequestValid(instreamBid)).to.equal(false);
+    });
   });
 
   describe('buildRequests', function () {
@@ -81,6 +127,14 @@ describe('triplelift adapter', function () {
             inventoryCode: '12345',
             floor: 1.0,
           },
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
           adUnitCode: 'adunit-code',
           sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
           bidId: '30b31c1838de1e',
@@ -88,6 +142,412 @@ describe('triplelift adapter', function () {
           auctionId: '1d1a030790a475',
           userId: {},
           schain,
+          ortb2Imp: {
+            ext: {
+              data: {
+                pbAdSlot: 'homepage-top-rect',
+                adUnitSpecificAttribute: 123
+              }
+            }
+          }
+        },
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'insteam_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [640, 480]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and outstream video
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480]
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and incomplete video
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // incomplete banner and incomplete video
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+
+            },
+            banner: {
+
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and instream video
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [640, 480]
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and outream video and native
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480]
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            },
+            native: {
+
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video only
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480]
+            }
+          },
+          adUnitCode: 'adunit-code-outstream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and incomplete outstream (missing size)
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; valid placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480],
+              placement: 3
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; valid placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480],
+              placement: 4
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; valid placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480],
+              placement: 5
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; undefined placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; invalid placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480],
+              placement: 6
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
         }
       ];
 
@@ -103,16 +563,36 @@ describe('triplelift adapter', function () {
             height: 250,
             ad: 'ad-markup',
             iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg'
+          },
+          {
+            imp_id: 1,
+            crid: '10092_76480_i2j6qm8u',
+            cpm: 0.01,
+            ad: '<VAST version=\"2.0\"><Ad id=\"gsen95th\"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version=\"1.0\">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event=\"mute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event=\"unmute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event=\"expand\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event=\"collapse\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event=\"pause\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event=\"resume\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event=\"fullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event=\"exitFullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event=\"skip\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event=\"start\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event=\"firstQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event=\"midpoint\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event=\"thirdQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event=\"complete\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:02\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event=\"progress\" offset=\"00:00:03\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event=\"progress\" offset=\"00:00:05\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event=\"progress\" offset=\"00:00:10\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:15\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event=\"progress\" offset=\"00:00:30\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
+            tlx_source: 'hdx'
           }
         ],
         refererInfo: {
-          referer: 'https://examplereferer.com'
+          page: 'https://examplereferer.com'
         },
         gdprConsent: {
           consentString: GDPR_CONSENT_STR,
           gdprApplies: true
         },
       };
+      sandbox = sinon.sandbox.create();
+      logErrorSpy = sinon.spy(utils, 'logError');
+
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        triplelift: {
+          storageAllowed: true
+        }
+      };
+    });
+    afterEach(() => {
+      sandbox.restore();
+      utils.logError.restore();
+      $$PREBID_GLOBAL$$.bidderSettings = {};
     });
 
     it('exists and is an object', function () {
@@ -120,6 +600,11 @@ describe('triplelift adapter', function () {
       expect(request).to.exist.and.to.be.a('object');
     });
 
+    it('should be able find video object from the instream request', function () {
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[1].video).to.exist.and.to.be.a('object');
+    });
+
     it('should only parse sizes that are of the proper length and format', function () {
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.imp[0].banner.format).to.have.length(2);
@@ -133,6 +618,73 @@ describe('triplelift adapter', function () {
       expect(payload.imp[0].tagid).to.equal('12345');
       expect(payload.imp[0].floor).to.equal(1.0);
       expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      // instream
+      expect(payload.imp[1].tagid).to.equal('insteam_test');
+      expect(payload.imp[1].floor).to.equal(1.0);
+      expect(payload.imp[1].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[1].video.placement).to.equal(1);
+      // banner and outstream video
+      expect(payload.imp[2]).to.have.property('video');
+      expect(payload.imp[2]).to.have.property('banner');
+      expect(payload.imp[2].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      expect(payload.imp[2].video).to.deep.equal({'mimes': ['video/mp4'], 'maxduration': 30, 'minduration': 6, 'w': 640, 'h': 480, 'context': 'outstream', 'placement': 3});
+      // banner and incomplete video
+      expect(payload.imp[3]).to.not.have.property('video');
+      expect(payload.imp[3]).to.have.property('banner');
+      expect(payload.imp[3].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      // incomplete mediatypes.banner and incomplete video
+      expect(payload.imp[4]).to.not.have.property('video');
+      expect(payload.imp[4]).to.have.property('banner');
+      expect(payload.imp[4].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      // banner and instream video
+      expect(payload.imp[5]).to.not.have.property('banner');
+      expect(payload.imp[5]).to.have.property('video');
+      expect(payload.imp[5].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[5].video.placement).to.equal(1);
+      // banner and outream video and native
+      expect(payload.imp[6]).to.have.property('video');
+      expect(payload.imp[6]).to.have.property('banner');
+      expect(payload.imp[6].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      expect(payload.imp[6].video).to.deep.equal({'mimes': ['video/mp4'], 'maxduration': 30, 'minduration': 6, 'w': 640, 'h': 480, 'context': 'outstream', 'placement': 3});
+      // outstream video only
+      expect(payload.imp[7]).to.have.property('video');
+      expect(payload.imp[7]).to.not.have.property('banner');
+      expect(payload.imp[7].video).to.deep.equal({'mimes': ['video/mp4'], 'maxduration': 30, 'minduration': 6, 'w': 640, 'h': 480, 'context': 'outstream', 'placement': 3});
+      // banner and incomplete outstream (missing size); video request is permitted so banner can still monetize
+      expect(payload.imp[8]).to.have.property('video');
+      expect(payload.imp[8]).to.have.property('banner');
+      expect(payload.imp[8].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      expect(payload.imp[8].video).to.deep.equal({'mimes': ['video/mp4'], 'maxduration': 30, 'minduration': 6, 'context': 'outstream', 'placement': 3});
+    });
+
+    it('should check for valid outstream placement values', function () {
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const payload = request.data;
+      // outstream video; valid placement
+      expect(payload.imp[9]).to.not.have.property('banner');
+      expect(payload.imp[9]).to.have.property('video');
+      expect(payload.imp[9].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[9].video.placement).to.equal(3);
+      // outstream video; valid placement
+      expect(payload.imp[10]).to.not.have.property('banner');
+      expect(payload.imp[10]).to.have.property('video');
+      expect(payload.imp[10].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[10].video.placement).to.equal(4);
+      // outstream video; valid placement
+      expect(payload.imp[11]).to.not.have.property('banner');
+      expect(payload.imp[11]).to.have.property('video');
+      expect(payload.imp[11].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[11].video.placement).to.equal(5);
+      // outstream video; undefined placement
+      expect(payload.imp[12]).to.not.have.property('banner');
+      expect(payload.imp[12]).to.have.property('video');
+      expect(payload.imp[12].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[12].video.placement).to.equal(3);
+      // outstream video; invalid placement
+      expect(payload.imp[13]).to.not.have.property('banner');
+      expect(payload.imp[13]).to.have.property('video');
+      expect(payload.imp[13].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[13].video.placement).to.equal(3);
     });
 
     it('should add tdid to the payload if included', function () {
@@ -150,16 +702,34 @@ describe('triplelift adapter', function () {
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       const payload = request.data;
       expect(payload).to.exist;
-      expect(payload.user).to.deep.equal({ext: {eids: [{source: 'liveramp.com', uids: [{id, ext: {rtiPartner: 'idl'}}]}]}});
+      expect(payload.user).to.deep.equal({ext: {eids: [{source: 'liveramp.com', uids: [{id, ext: {rtiPartner: 'idl'}}]}]}});
+    });
+
+    it('should add criteoId to the payload if included', function () {
+      const id = '53e30ea700424f7bbdd793b02abc5d7';
+      bidRequests[0].userId.criteoId = id;
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const payload = request.data;
+      expect(payload).to.exist;
+      expect(payload.user).to.deep.equal({ext: {eids: [{source: 'criteo.com', uids: [{id, ext: {rtiPartner: 'criteoId'}}]}]}});
+    });
+
+    it('should add adqueryId to the payload if included', function () {
+      const id = '%7B%22qid%22%3A%229c985f8cc31d9b3c000d%22%7D';
+      bidRequests[0].userIdAsEids = [{ source: 'adquery.io', uids: [{ id }] }];
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const payload = request.data;
+      expect(payload).to.exist;
+      expect(payload.user).to.deep.equal({ext: {eids: [{source: 'adquery.io', uids: [{id, ext: {rtiPartner: 'adquery.io'}}]}]}});
     });
 
-    it('should add criteoId to the payload if included', function () {
-      const id = '53e30ea700424f7bbdd793b02abc5d7';
-      bidRequests[0].userId.criteoId = id;
+    it('should add amxRtbId to the payload if included', function () {
+      const id = 'Ok9JQkBM-UFlAXEZQ-UUNBQlZOQzgrUFhW-UUNBQkRQTUBPQVpVWVxNXlZUUF9AUFhAUF9PXFY/';
+      bidRequests[0].userIdAsEids = [{ source: 'amxrtb.com', uids: [{ id }] }];
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       const payload = request.data;
       expect(payload).to.exist;
-      expect(payload.user).to.deep.equal({ext: {eids: [{source: 'criteo.com', uids: [{id, ext: {rtiPartner: 'criteoId'}}]}]}});
+      expect(payload.user).to.deep.equal({ext: {eids: [{source: 'amxrtb.com', uids: [{id, ext: {rtiPartner: 'amxrtb.com'}}]}]}});
     });
 
     it('should add tdid, idl_env and criteoId to the payload if both are included', function () {
@@ -209,15 +779,16 @@ describe('triplelift adapter', function () {
       });
     });
 
-    it('should add user ids from multiple bid requests', function () {
+    it('should consolidate user ids from multiple bid requests', function () {
       const tdidId = '6bca7f6b-a98a-46c0-be05-6020f7604598';
       const idlEnvId = 'XY6104gr0njcH9UDIR7ysFFJcm2XNpqeJTYslleJ_cMlsFOfZI';
       const criteoId = '53e30ea700424f7bbdd793b02abc5d7';
+      const pubcid = '3261d8ad-435d-481d-abd1-9f1a9ec99f0e';
 
       const bidRequestsMultiple = [
-        { ...bidRequests[0], userId: { tdid: tdidId } },
-        { ...bidRequests[0], userId: { idl_env: idlEnvId } },
-        { ...bidRequests[0], userId: { criteoId: criteoId } }
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } }
       ];
 
       const request = tripleliftAdapterSpec.buildRequests(bidRequestsMultiple, bidderRequest);
@@ -244,6 +815,143 @@ describe('triplelift adapter', function () {
                 }
               ]
             },
+            {
+              source: 'criteo.com',
+              uids: [
+                {
+                  id: criteoId,
+                  ext: { rtiPartner: 'criteoId' }
+                }
+              ]
+            },
+            {
+              source: 'pubcid.org',
+              uids: [
+                {
+                  id: '3261d8ad-435d-481d-abd1-9f1a9ec99f0e',
+                  ext: { rtiPartner: 'pubcid' }
+                }
+              ]
+            }
+          ]
+        }
+      });
+
+      expect(payload.user.ext.eids).to.be.an('array');
+      expect(payload.user.ext.eids).to.have.lengthOf(4);
+    });
+
+    it('should remove malformed ids that would otherwise break call', function () {
+      let tdidId = '6bca7f6b-a98a-46c0-be05-6020f7604598';
+      let idlEnvId = null; // fail; can't be null
+      let criteoId = '53e30ea700424f7bbdd793b02abc5d7';
+      let pubcid = ''; // fail; can't be empty string
+
+      let bidRequestsMultiple = [
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } }
+      ];
+
+      let request = tripleliftAdapterSpec.buildRequests(bidRequestsMultiple, bidderRequest);
+      let payload = request.data;
+
+      expect(payload.user).to.deep.equal({
+        ext: {
+          eids: [
+            {
+              source: 'adserver.org',
+              uids: [
+                {
+                  id: tdidId,
+                  ext: { rtiPartner: 'TDID' }
+                }
+              ],
+            },
+            {
+              source: 'criteo.com',
+              uids: [
+                {
+                  id: criteoId,
+                  ext: { rtiPartner: 'criteoId' }
+                }
+              ]
+            }
+          ]
+        }
+      });
+
+      expect(payload.user.ext.eids).to.be.an('array');
+      expect(payload.user.ext.eids).to.have.lengthOf(2);
+
+      tdidId = {}; // fail; can't be empty object
+      idlEnvId = { id: '987654' }; // pass
+      criteoId = [{ id: '123456' }]; // fail; can't be an array
+      pubcid = '3261d8ad-435d-481d-abd1-9f1a9ec99f0e'; // pass
+
+      bidRequestsMultiple = [
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } }
+      ];
+
+      request = tripleliftAdapterSpec.buildRequests(bidRequestsMultiple, bidderRequest);
+      payload = request.data;
+
+      expect(payload.user).to.deep.equal({
+        ext: {
+          eids: [
+            {
+              source: 'liveramp.com',
+              uids: [
+                {
+                  id: '987654',
+                  ext: { rtiPartner: 'idl' }
+                }
+              ]
+            },
+            {
+              source: 'pubcid.org',
+              uids: [
+                {
+                  id: pubcid,
+                  ext: { rtiPartner: 'pubcid' }
+                }
+              ]
+            }
+          ]
+        }
+      });
+
+      expect(payload.user.ext.eids).to.be.an('array');
+      expect(payload.user.ext.eids).to.have.lengthOf(2);
+
+      tdidId = { id: '987654' }; // pass
+      idlEnvId = { id: 987654 }; // fail; can't be an int
+      criteoId = '53e30ea700424f7bbdd793b02abc5d7'; // pass
+      pubcid = { id: '' }; // fail; can't be an empty string
+
+      bidRequestsMultiple = [
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } }
+      ];
+
+      request = tripleliftAdapterSpec.buildRequests(bidRequestsMultiple, bidderRequest);
+      payload = request.data;
+
+      expect(payload.user).to.deep.equal({
+        ext: {
+          eids: [
+            {
+              source: 'adserver.org',
+              uids: [
+                {
+                  id: '987654',
+                  ext: { rtiPartner: 'TDID' }
+                }
+              ],
+            },
             {
               source: 'criteo.com',
               uids: [
@@ -256,6 +964,9 @@ describe('triplelift adapter', function () {
           ]
         }
       });
+
+      expect(payload.user.ext.eids).to.be.an('array');
+      expect(payload.user.ext.eids).to.have.lengthOf(2);
     });
 
     it('should return a query string for TL call', function () {
@@ -268,6 +979,13 @@ describe('triplelift adapter', function () {
       expect(url).to.match(new RegExp('(?:' + prebid.version + ')'))
       expect(url).to.match(/(?:referrer)/);
     });
+    it('should use refererInfo.page for referrer', function () {
+      bidderRequest.refererInfo.page = 'https://topmostlocation.com?foo=bar'
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const url = request.url;
+      expect(url).to.match(/(\?|&)referrer=https%3A%2F%2Ftopmostlocation.com%3Ffoo%3Dbar/);
+      delete bidderRequest.refererInfo.page
+    });
     it('should return us_privacy param when CCPA info is available', function() {
       bidderRequest.uspConsent = '1YYY';
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
@@ -300,79 +1018,162 @@ describe('triplelift adapter', function () {
       expect(payload.ext).to.deep.equal(undefined);
     });
     it('should get floor from floors module if available', function() {
-      const floorInfo = {
-        currency: 'USD',
-        floor: 1.99
-      };
+      let floorInfo;
       bidRequests[0].getFloor = () => floorInfo;
-      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+
+      // standard float response; expected functionality of floors module
+      floorInfo = { currency: 'USD', floor: 1.99 };
+      let request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[0].floor).to.equal(1.99);
+
+      // if string response, convert to float
+      floorInfo = { currency: 'USD', floor: '1.99' };
+      request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.imp[0].floor).to.equal(1.99);
     });
-  });
+    it('should call getFloor with the correct parameters based on mediaType', function() {
+      bidRequests.forEach(request => {
+        request.getFloor = () => {};
+        sinon.spy(request, 'getFloor')
+      });
 
-  describe('interpretResponse', function () {
-    let response = {
-      body: {
-        bids: [
-          {
-            imp_id: 0,
-            cpm: 1.062,
-            width: 300,
-            height: 250,
-            ad: 'ad-markup',
-            iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
-            tl_source: 'tlx',
+      tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+
+      // banner
+      expect(bidRequests[0].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'banner',
+        size: '*'
+      })).to.be.true;
+
+      // instream
+      expect(bidRequests[1].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'video',
+        size: '*'
+      })).to.be.true;
+
+      // banner and incomplete video (POST will only include banner)
+      expect(bidRequests[3].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'banner',
+        size: '*'
+      })).to.be.true;
+
+      // banner and instream (POST will only include video)
+      expect(bidRequests[5].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'video',
+        size: '*'
+      })).to.be.true;
+    });
+    it('should catch error if getFloor throws error', function() {
+      bidRequests[0].getFloor = () => {
+        throw new Error('An exception!');
+      };
+
+      tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+
+      expect(logErrorSpy.calledOnce).to.equal(true);
+    });
+    it('should send global config fpd if kvps are available', function() {
+      const sens = null;
+      const category = ['news', 'weather', 'hurricane'];
+      const pmp_elig = 'true';
+      const ortb2 = {
+        site: {
+          pmp_elig: pmp_elig,
+          ext: {
+            data: {
+              category: category
+            }
           }
-        ]
+        },
+        user: {
+          sens: sens,
+        }
       }
-    };
-    let bidderRequest = {
-      bidderCode: 'triplelift',
-      auctionId: 'a7ebcd1d-66ff-4b5c-a82c-6a21a6ee5a18',
-      bidderRequestId: '5c55612f99bc11',
-      bids: [
-        {
-          imp_id: 0,
-          cpm: 1.062,
-          width: 300,
-          height: 250,
-          ad: 'ad-markup',
-          iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
-          tl_source: 'tlx',
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, {...bidderRequest, ortb2});
+      const { data: payload } = request;
+      expect(payload.ext.fpd.user).to.not.exist;
+      expect(payload.ext.fpd.context.ext.data).to.haveOwnProperty('category');
+      expect(payload.ext.fpd.context).to.haveOwnProperty('pmp_elig');
+    });
+    it('should send ad unit fpd if kvps are available', function() {
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[0].fpd.context).to.haveOwnProperty('data');
+      expect(request.data.imp[0].fpd.context.data).to.haveOwnProperty('pbAdSlot');
+      expect(request.data.imp[0].fpd.context.data).to.haveOwnProperty('adUnitSpecificAttribute');
+      expect(request.data.imp[1].fpd).to.not.exist;
+    });
+    it('should send 1PlusX data as fpd if localStorage is available and no other fpd is defined', function() {
+      sandbox.stub(storage, 'getDataFromLocalStorage').callsFake(() => '{"kid":1,"s":"ySRdArquXuBolr/cVv0UNqrJhTO4QZsbNH/t+2kR3gXjbA==","t":"/yVtBrquXuBolr/cVv0UNtx1mssdLYeKFhWFI3Dq1dJnug=="}');
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.ext.fpd).to.deep.equal({
+        'user': {
+          'data': [
+            {
+              'name': 'www.1plusx.com',
+              'ext': {
+                'kid': 1,
+                's': 'ySRdArquXuBolr/cVv0UNqrJhTO4QZsbNH/t+2kR3gXjbA==',
+                't': '/yVtBrquXuBolr/cVv0UNtx1mssdLYeKFhWFI3Dq1dJnug=='
+              }
+            }
+          ]
+        }
+      })
+    });
+    it('should append 1PlusX data to existing user.data entries if localStorage is available', function() {
+      bidderRequest.ortb2 = {
+        user: {
+          data: [
+            { name: 'dataprovider.com', ext: { segtax: 4 }, segment: [{ id: '1' }] }
+          ]
         }
-      ],
-      refererInfo: {
-        referer: 'https://examplereferer.com'
-      },
-      gdprConsent: {
-        consentString: GDPR_CONSENT_STR,
-        gdprApplies: true
       }
-    };
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {
-          requestId: '3db3773286ee59',
-          cpm: 1.062,
-          width: 300,
-          height: 250,
-          netRevenue: true,
-          ad: 'ad-markup',
-          creativeId: 29681110,
-          dealId: '',
-          currency: 'USD',
-          ttl: 33,
-          tl_source: 'tlx',
+      sandbox.stub(storage, 'getDataFromLocalStorage').callsFake(() => '{"kid":1,"s":"ySRdArquXuBolr/cVv0UNqrJhTO4QZsbNH/t+2kR3gXjbA==","t":"/yVtBrquXuBolr/cVv0UNtx1mssdLYeKFhWFI3Dq1dJnug=="}');
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.ext.fpd).to.deep.equal({
+        'user': {
+          'data': [
+            { 'name': 'dataprovider.com', 'ext': { 'segtax': 4 }, 'segment': [{ 'id': '1' }] },
+            {
+              'name': 'www.1plusx.com',
+              'ext': {
+                'kid': 1,
+                's': 'ySRdArquXuBolr/cVv0UNqrJhTO4QZsbNH/t+2kR3gXjbA==',
+                't': '/yVtBrquXuBolr/cVv0UNtx1mssdLYeKFhWFI3Dq1dJnug=='
+              }
+            }
+          ]
         }
-      ];
-      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
-      expect(result).to.have.length(1);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      })
+    });
+    it('should not append anything if getDataFromLocalStorage returns null', function() {
+      bidderRequest.ortb2 = {
+        user: {
+          data: [
+            { name: 'dataprovider.com', ext: { segtax: 4 }, segment: [{ id: '1' }] }
+          ]
+        }
+      }
+      sandbox.stub(storage, 'getDataFromLocalStorage').callsFake(() => null);
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.ext.fpd).to.deep.equal({
+        'user': {
+          'data': [
+            { 'name': 'dataprovider.com', 'ext': { 'segtax': 4 }, 'segment': [{ 'id': '1' }] },
+          ]
+        }
+      })
     });
+  });
 
-    it('should return multiple responses to support SRA', function () {
-      let response = {
+  describe('interpretResponse', function () {
+    let response, bidderRequest;
+    this.beforeEach(() => {
+      response = {
         body: {
           bids: [
             {
@@ -383,20 +1184,46 @@ describe('triplelift adapter', function () {
               ad: 'ad-markup',
               iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
               tl_source: 'tlx',
+              advertiser_name: 'fake advertiser name',
+              adomain: ['basspro.com', 'internetalerts.org'],
+              media_type: 'banner'
             },
             {
-              imp_id: 0,
-              cpm: 1.9,
-              width: 300,
-              height: 600,
-              ad: 'ad-markup-2',
-              iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
-              tl_source: 'tlx',
+              imp_id: 1,
+              crid: '10092_76480_i2j6qm8u',
+              cpm: 9.99,
+              ad: '<VAST version="2.0"><Ad id="gsen95th"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version="1.0">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event="mute"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event="unmute"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event="expand"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event="collapse"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event="pause"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event="resume"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event="fullscreen"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event="exitFullscreen"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event="skip"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event="start"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event="midpoint"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event="complete"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event="progress" offset="00:00:02"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event="progress" offset="00:00:03"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event="progress" offset="00:00:05"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event="progress" offset="00:00:10"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event="progress" offset="00:00:15"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event="progress" offset="00:00:30"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
+              tl_source: 'hdx',
+              media_type: 'video'
+            },
+            // video bid on banner+outstream request
+            {
+              imp_id: 2,
+              crid: '5989_33264_352817187',
+              cpm: 20,
+              ad: '<VAST xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:noNamespaceSchemaLocation="vast.xsd">\n  <Ad id="21641499">\n  \t<Wrapper><Error><![CDATA[https://eb2.3lift.com/sce?aid=148508128401385324170&inv_code=testing_mobile_outstream&e=[ERRORCODE]&block=video]]>',
+              tl_source: 'hdx',
+              advertiser_name: 'zennioptical.com',
+              adomain: ['zennioptical.com'],
+              media_type: 'video'
+            },
+            // banner bid on banner+outstream request
+            {
+              imp_id: 3,
+              crid: '5989_33264_352817187',
+              cpm: 20,
+              width: 970,
+              height: 250,
+              ad: 'ad-markup',
+              tl_source: 'hdx',
+              advertiser_name: 'zennioptical.com',
+              adomain: ['zennioptical.com'],
+              media_type: 'banner'
             }
           ]
         }
       };
-      let bidderRequest = {
+      bidderRequest = {
         bidderCode: 'triplelift',
         auctionId: 'a7ebcd1d-66ff-4b5c-a82c-6a21a6ee5a18',
         bidderRequestId: '5c55612f99bc11',
@@ -405,19 +1232,115 @@ describe('triplelift adapter', function () {
             imp_id: 0,
             cpm: 1.062,
             width: 300,
-            height: 600,
+            height: 250,
             ad: 'ad-markup',
             iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
             tl_source: 'tlx',
+            mediaTypes: {
+              banner: {
+                sizes: [
+                  [970, 250],
+                  [1, 1]
+                ]
+              }
+            },
+            bidId: '30b31c1838de1e'
           },
           {
-            imp_id: 0,
-            cpm: 1.9,
-            width: 300,
-            height: 250,
-            ad: 'ad-markup-2',
-            iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
-            tl_source: 'tlx',
+            imp_id: 1,
+            crid: '10092_76480_i2j6qm8u',
+            cpm: 9.99,
+            ad: '<VAST version="2.0"><Ad id="gsen95th"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version="1.0">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event="mute"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event="unmute"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event="expand"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event="collapse"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event="pause"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event="resume"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event="fullscreen"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event="exitFullscreen"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event="skip"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event="start"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event="midpoint"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event="complete"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event="progress" offset="00:00:02"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event="progress" offset="00:00:03"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event="progress" offset="00:00:05"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event="progress" offset="00:00:10"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event="progress" offset="00:00:15"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event="progress" offset="00:00:30"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
+            tlx_source: 'hdx',
+            mediaTypes: {
+              video: {
+                context: 'instream',
+                playerSize: [640, 480]
+              }
+            },
+            bidId: '30b31c1838de1e'
+          },
+          // banner and outstream
+          {
+            bidder: 'triplelift',
+            params: {
+              inventoryCode: 'testing_desktop_outstream',
+              floor: 1
+            },
+            nativeParams: {},
+            mediaTypes: {
+              video: {
+                context: 'outstream',
+                playerSize: [[640, 480]],
+                mimes: ['video/mp4'],
+                protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+                playbackmethod: [2],
+                skip: 1
+              },
+              banner: {
+                sizes: [
+                  [728, 90],
+                  [970, 250],
+                  [970, 90]
+                ]
+              },
+              native: {}
+            },
+            adUnitCode: 'video-outstream',
+            transactionId: '135061c3-f546-4e28-8a07-44c2fb58a958',
+            sizes: [
+              [728, 90],
+              [970, 250],
+              [970, 90]
+            ],
+            bidId: '73edc0ba8de203',
+            bidderRequestId: '3d81143328560b',
+            auctionId: 'f6427dc0-b954-4010-a76c-d498380796a2',
+            src: 'client',
+            bidRequestsCount: 2,
+            bidderRequestsCount: 2,
+            bidderWinsCount: 0
+          },
+          // banner and outstream
+          {
+            bidder: 'triplelift',
+            params: {
+              inventoryCode: 'testing_desktop_outstream',
+              floor: 1
+            },
+            nativeParams: {},
+            mediaTypes: {
+              video: {
+                context: 'outstream',
+                playerSize: [[640, 480]],
+                mimes: ['video/mp4'],
+                protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+                playbackmethod: [2],
+                skip: 1
+              },
+              banner: {
+                sizes: [
+                  [728, 90],
+                  [970, 250],
+                  [970, 90]
+                ]
+              },
+              native: {}
+            },
+            adUnitCode: 'video-outstream',
+            transactionId: '135061c3-f546-4e28-8a07-44c2fb58a958',
+            sizes: [
+              [728, 90],
+              [970, 250],
+              [970, 90]
+            ],
+            bidId: '73edc0ba8de203',
+            bidderRequestId: '3d81143328560b',
+            auctionId: 'f6427dc0-b954-4010-a76c-d498380796a2',
+            src: 'client',
+            bidRequestsCount: 2,
+            bidderRequestsCount: 2,
+            bidderWinsCount: 0
           }
         ],
         refererInfo: {
@@ -428,8 +1351,78 @@ describe('triplelift adapter', function () {
           gdprApplies: true
         }
       };
+    })
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          requestId: '30b31c1838de1e',
+          cpm: 1.062,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          ad: 'ad-markup',
+          creativeId: 29681110,
+          dealId: '',
+          currency: 'USD',
+          ttl: 33,
+          tl_source: 'tlx',
+          meta: {}
+        },
+        {
+          requestId: '30b31c1838de1e',
+          cpm: 1.062,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          ad: '<VAST version=\"2.0\"><Ad id=\"gsen95th\"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version=\"1.0\">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event=\"mute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event=\"unmute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event=\"expand\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event=\"collapse\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event=\"pause\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event=\"resume\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event=\"fullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event=\"exitFullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event=\"skip\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event=\"start\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event=\"firstQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event=\"midpoint\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event=\"thirdQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event=\"complete\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:02\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event=\"progress\" offset=\"00:00:03\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event=\"progress\" offset=\"00:00:05\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event=\"progress\" offset=\"00:00:10\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:15\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event=\"progress\" offset=\"00:00:30\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
+          creativeId: 29681110,
+          dealId: '',
+          currency: 'USD',
+          ttl: 33,
+          tl_source: 'hdx',
+          mediaType: 'video',
+          vastXml: '<VAST version=\"2.0\"><Ad id=\"gsen95th\"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version=\"1.0\">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event=\"mute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event=\"unmute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event=\"expand\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event=\"collapse\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event=\"pause\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event=\"resume\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event=\"fullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event=\"exitFullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event=\"skip\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event=\"start\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event=\"firstQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event=\"midpoint\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event=\"thirdQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event=\"complete\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:02\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event=\"progress\" offset=\"00:00:03\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event=\"progress\" offset=\"00:00:05\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event=\"progress\" offset=\"00:00:10\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:15\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event=\"progress\" offset=\"00:00:30\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
+          meta: {}
+        }
+      ];
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result).to.have.length(4);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(Object.keys(result[1])).to.have.members(Object.keys(expectedResponse[1]));
+      expect(result[0].ttl).to.equal(300);
+      expect(result[1].ttl).to.equal(3600);
+    });
+
+    it('should identify format of bid and respond accordingly', function() {
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result[0].meta.mediaType).to.equal('native');
+      expect(result[1].mediaType).to.equal('video');
+      expect(result[1].meta.mediaType).to.equal('video');
+      // video bid on banner+outstream request
+      expect(result[2].mediaType).to.equal('video');
+      expect(result[2].meta.mediaType).to.equal('video');
+      expect(result[2].vastXml).to.include('aid=148508128401385324170&inv_code=testing_mobile_outstream');
+      // banner bid on banner+outstream request
+      expect(result[3].meta.mediaType).to.equal('banner');
+    })
+
+    it('should return multiple responses to support SRA', function () {
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result).to.have.length(4);
+    });
+
+    it('should include the advertiser name in the meta field if available', function () {
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result[0].meta.advertiserName).to.equal('fake advertiser name');
+      expect(result[1].meta).to.not.have.key('advertiserName');
+    });
+
+    it('should include the advertiser domain array in the meta field if available', function () {
       let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
-      expect(result).to.have.length(2);
+      expect(result[0].meta.advertiserDomains[0]).to.equal('basspro.com');
+      expect(result[0].meta.advertiserDomains[1]).to.equal('internetalerts.org');
+      expect(result[1].meta).to.not.have.key('advertiserDomains');
     });
   });
 
diff --git a/test/spec/modules/truereachBidAdapter_spec.js b/test/spec/modules/truereachBidAdapter_spec.js
new file mode 100644
index 00000000000..cd7d0873569
--- /dev/null
+++ b/test/spec/modules/truereachBidAdapter_spec.js
@@ -0,0 +1,105 @@
+import { expect } from 'chai';
+import { spec } from 'modules/truereachBidAdapter.js';
+
+describe('truereachBidAdapterTests', function () {
+  it('validate_pub_params', function () {
+    expect(spec.isBidRequestValid({
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bidder: 'truereach',
+      params: {
+        site_id: '0142010a-8400-1b01-72cb-a553b9000009',
+        bidfloor: 0.1
+      }
+    })).to.equal(true);
+  });
+
+  it('validate_generated_params', function () {
+    let bidRequestData = [{
+      bidId: '34ce3f3b15190a',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bidder: 'truereach',
+      params: {
+        site_id: '0142010a-8400-1b01-72cb-a553b9000009',
+        bidfloor: 0.1
+      },
+      sizes: [[300, 250]]
+    }];
+
+    let request = spec.buildRequests(bidRequestData, {});
+    let req_data = request.data;
+
+    expect(request.method).to.equal('POST');
+    expect(req_data.imp[0].id).to.equal('34ce3f3b15190a');
+    expect(req_data.imp[0].banner.w).to.equal(300);
+    expect(req_data.imp[0].banner.h).to.equal(250);
+    expect(req_data.imp[0].bidfloor).to.equal(0);
+  });
+
+  it('validate_response_params', function () {
+    let serverResponse = {
+      body: {
+        'id': '34ce3f3b15190a',
+        'seatbid': [{
+          'bid': [{
+            'id': '0142010a-8400-0801-72dc-04a99e6f7fc0:1ed',
+            'impid': '34ce3f3b15190a',
+            'price': 2.55,
+            'adm': '<html></html>',
+            'adid': '493',
+            'adomain': ['https://www.momagic.com/'],
+            'iurl': '',
+            'cid': '260',
+            'crid': '0142010a-8400-1b01-72cb-afb296000012',
+            'w': 300,
+            'h': 250
+          }]
+        }],
+        'bidid': '0142010a-8400-0801-72dc-04a99e6f7fc1',
+        'cur': 'USD'
+      }
+    };
+
+    let bids = spec.interpretResponse(serverResponse, {});
+    expect(bids).to.have.lengthOf(1);
+    let bid = bids[0];
+    expect(bid.requestId).to.equal('34ce3f3b15190a');
+    expect(bid.cpm).to.equal(2.55);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.ad).to.equal('<html></html>');
+    expect(bid.ttl).to.equal(180);
+    expect(bid.creativeId).to.equal('0142010a-8400-1b01-72cb-afb296000012');
+    expect(bid.netRevenue).to.equal(false);
+    expect(bid.meta.advertiserDomains[0]).to.equal('https://www.momagic.com/');
+  });
+
+  describe('user_sync', function() {
+    const user_sync_url = 'https://ads-sg.momagic.com/jsp/usersync.jsp';
+    it('register_iframe_pixel_if_iframeEnabled_is_true', function() {
+      let syncs = spec.getUserSyncs(
+        {iframeEnabled: true}
+      );
+      expect(syncs).to.be.an('array');
+      expect(syncs.length).to.equal(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.equal(user_sync_url);
+    });
+
+    it('if_pixelEnabled_is_true', function() {
+      let syncs = spec.getUserSyncs(
+        {pixelEnabled: true}
+      );
+      expect(syncs).to.be.an('array');
+      expect(syncs.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/trustpidSystem_spec.js b/test/spec/modules/trustpidSystem_spec.js
new file mode 100644
index 00000000000..38e861d977f
--- /dev/null
+++ b/test/spec/modules/trustpidSystem_spec.js
@@ -0,0 +1,237 @@
+import { expect } from 'chai';
+import { trustpidSubmodule } from 'modules/trustpidSystem.js';
+import { storage } from 'modules/trustpidSystem.js';
+
+describe('trustpid System', () => {
+  const connectDataKey = 'fcIdConnectData';
+  const connectDomainKey = 'fcIdConnectDomain';
+
+  const getStorageData = (idGraph) => {
+    if (!idGraph) {
+      idGraph = {id: 501, domain: ''};
+    }
+    return {
+      'connectId': {
+        'idGraph': [idGraph],
+      }
+    }
+  };
+
+  it('should have the correct module name declared', () => {
+    expect(trustpidSubmodule.name).to.equal('trustpid');
+  });
+
+  describe('trustpid getId()', () => {
+    afterEach(() => {
+      storage.removeDataFromLocalStorage(connectDataKey);
+      storage.removeDataFromLocalStorage(connectDomainKey);
+    });
+
+    after(() => {
+      window.FC_CONF = {};
+    })
+
+    it('it should return object with key callback', () => {
+      expect(trustpidSubmodule.getId()).to.have.property('callback');
+    });
+
+    it('should return object with key callback with value type - function', () => {
+      storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData()));
+      expect(trustpidSubmodule.getId()).to.have.property('callback');
+      expect(typeof trustpidSubmodule.getId().callback).to.be.equal('function');
+    });
+
+    it('tests if localstorage & JSON works properly ', () => {
+      const idGraph = {
+        'domain': 'domainValue',
+        'atid': 'atidValue',
+      };
+      storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
+      expect(JSON.parse(storage.getDataFromLocalStorage(connectDataKey))).to.have.property('connectId');
+    });
+
+    it('returns {callback: func} if domains don\'t match', () => {
+      const idGraph = {
+        'domain': 'domainValue',
+        'atid': 'atidValue',
+      };
+      storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('differentDomainValue'));
+      storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
+      expect(trustpidSubmodule.getId()).to.have.property('callback');
+    });
+
+    it('returns {id: {trustpid: data.trustpid}} if we have the right data stored in the localstorage ', () => {
+      const idGraph = {
+        'domain': 'test.domain',
+        'atid': 'atidValue',
+      };
+      storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('test.domain'));
+      storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
+      const response = trustpidSubmodule.getId();
+      expect(response).to.have.property('id');
+      expect(response.id).to.have.property('trustpid');
+      expect(response.id.trustpid).to.be.equal('atidValue');
+    });
+
+    it('returns {trustpid: data.trustpid} if we have the right data stored in the localstorage right after the callback is called', (done) => {
+      const idGraph = {
+        'domain': 'test.domain',
+        'atid': 'atidValue',
+      };
+      const response = trustpidSubmodule.getId();
+      expect(response).to.have.property('callback');
+      expect(response.callback.toString()).contain('result(callback)');
+
+      if (typeof response.callback === 'function') {
+        storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('test.domain'));
+        storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
+        response.callback(function (result) {
+          expect(result).to.not.be.null;
+          expect(result).to.have.property('trustpid');
+          expect(result.trustpid).to.be.equal('atidValue');
+          done()
+        })
+      }
+    });
+
+    it('returns null if domains don\'t match', (done) => {
+      const idGraph = {
+        'domain': 'test.domain',
+        'atid': 'atidValue',
+      };
+      storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('differentDomainValue'));
+      storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
+
+      const response = trustpidSubmodule.getId();
+      expect(response).to.have.property('callback');
+      expect(response.callback.toString()).contain('result(callback)');
+
+      if (typeof response.callback === 'function') {
+        setTimeout(() => {
+          expect(JSON.parse(storage.getDataFromLocalStorage(connectDomainKey))).to.be.equal('differentDomainValue');
+        }, 100)
+        response.callback(function (result) {
+          expect(result).to.be.null;
+          done()
+        })
+      }
+    });
+
+    it('returns {trustpid: data.trustpid} if we have the right data stored in the localstorage right after 500ms delay', (done) => {
+      const idGraph = {
+        'domain': 'test.domain',
+        'atid': 'atidValue',
+      };
+
+      const response = trustpidSubmodule.getId();
+      expect(response).to.have.property('callback');
+      expect(response.callback.toString()).contain('result(callback)');
+
+      if (typeof response.callback === 'function') {
+        setTimeout(() => {
+          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('test.domain'));
+          storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
+        }, 500);
+        response.callback(function (result) {
+          expect(result).to.not.be.null;
+          expect(result).to.have.property('trustpid');
+          expect(result.trustpid).to.be.equal('atidValue');
+          done()
+        })
+      }
+    });
+
+    it('returns null if we have the data stored in the localstorage after 500ms delay and the max (waiting) delay is only 200ms ', (done) => {
+      const idGraph = {
+        'domain': 'test.domain',
+        'atid': 'atidValue',
+      };
+
+      const response = trustpidSubmodule.getId({params: {maxDelayTime: 200}});
+      expect(response).to.have.property('callback');
+      expect(response.callback.toString()).contain('result(callback)');
+
+      if (typeof response.callback === 'function') {
+        setTimeout(() => {
+          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('test.domain'));
+          storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
+        }, 500);
+        response.callback(function (result) {
+          expect(result).to.be.null;
+          done()
+        })
+      }
+    });
+  });
+
+  describe('trustpid decode()', () => {
+    const VALID_API_RESPONSES = [
+      {
+        expected: '32a97f612',
+        payload: {
+          trustpid: '32a97f612'
+        }
+      },
+      {
+        expected: '32a97f61',
+        payload: {
+          trustpid: '32a97f61',
+        }
+      },
+    ];
+    VALID_API_RESPONSES.forEach(responseData => {
+      it('should return a newly constructed object with the trustpid for a payload with {trustpid: value}', () => {
+        expect(trustpidSubmodule.decode(responseData.payload)).to.deep.equal(
+          {trustpid: responseData.expected}
+        );
+      });
+    });
+
+    [{}, '', {foo: 'bar'}].forEach((response) => {
+      it(`should return null for an invalid response "${JSON.stringify(response)}"`, () => {
+        expect(trustpidSubmodule.decode(response)).to.be.null;
+      });
+    });
+  });
+
+  describe('trustpid messageHandler', () => {
+    afterEach(() => {
+      storage.removeDataFromLocalStorage(connectDataKey);
+      storage.removeDataFromLocalStorage(connectDomainKey);
+    });
+
+    after(() => {
+      window.FC_CONF = {};
+    })
+
+    const domains = [
+      'domain1',
+      'domain2',
+      'domain3',
+    ];
+
+    domains.forEach(domain => {
+      it(`correctly sets trustpid value for domain name ${domain}`, (done) => {
+        const idGraph = {
+          'domain': domain,
+          'atid': 'atidValue',
+        };
+
+        storage.setDataInLocalStorage(connectDomainKey, JSON.stringify(domain));
+        storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
+
+        const eventData = {
+          data: `{\"msgType\":\"MNOSELECTOR\",\"body\":{\"url\":\"https://${domain}/some/path\"}}`
+        };
+
+        window.dispatchEvent(new MessageEvent('message', eventData));
+
+        const response = trustpidSubmodule.getId();
+        expect(response).to.have.property('id');
+        expect(response.id).to.have.property('trustpid');
+        expect(response.id.trustpid).to.be.equal('atidValue');
+        done();
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/trustxBidAdapter_spec.js b/test/spec/modules/trustxBidAdapter_spec.js
deleted file mode 100644
index 9e0aad9b36f..00000000000
--- a/test/spec/modules/trustxBidAdapter_spec.js
+++ /dev/null
@@ -1,806 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/trustxBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-describe('TrustXAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'trustx',
-      'params': {
-        'uid': '44'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'uid': 0
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    function parseRequest(url) {
-      const res = {};
-      url.split('&').forEach((it) => {
-        const couple = it.split('=');
-        res[couple[0]] = decodeURIComponent(couple[1]);
-      });
-      return res;
-    }
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-    const referrer = bidderRequest.refererInfo.referer;
-
-    let bidRequests = [
-      {
-        'bidder': 'trustx',
-        'params': {
-          'uid': '43'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      },
-      {
-        'bidder': 'trustx',
-        'params': {
-          'uid': '43'
-        },
-        'adUnitCode': 'adunit-code-2',
-        'sizes': [[728, 90], [300, 250]],
-        'bidId': '3150ccb55da321',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      },
-      {
-        'bidder': 'trustx',
-        'params': {
-          'uid': '45'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '42dbe3a7168a6a',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      }
-    ];
-
-    it('should attach valid params to the tag', function () {
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '43');
-      expect(payload).to.have.property('sizes', '300x250,300x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('wrapperType', 'Prebid_js');
-      expect(payload).to.have.property('wrapperVersion', '$prebid.version$');
-    });
-
-    it('sizes must not be duplicated', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '43,43,45');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-    });
-
-    it('pt parameter must be "gross" if params.priceType === "gross"', function () {
-      bidRequests[1].params.priceType = 'gross';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'gross');
-      expect(payload).to.have.property('auids', '43,43,45');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      delete bidRequests[1].params.priceType;
-    });
-
-    it('pt parameter must be "net" or "gross"', function () {
-      bidRequests[1].params.priceType = 'some';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '43,43,45');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      delete bidRequests[1].params.priceType;
-    });
-
-    it('if gdprConsent is present payload must have gdpr params', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
-    });
-
-    it('if gdprApplies is false gdpr_applies must be 0', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: false}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '0');
-    });
-
-    it('if gdprApplies is undefined gdpr_applies must be 1', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA'}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
-    });
-
-    it('if usPrivacy is present payload must have us_privacy param', function () {
-      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('us_privacy', '1YNN');
-    });
-
-    it('should convert keyword params to proper form and attaches to request', function () {
-      const bidRequestWithKeywords = [].concat(bidRequests);
-      bidRequestWithKeywords[1] = Object.assign({},
-        bidRequests[1],
-        {
-          params: {
-            uid: '43',
-            keywords: {
-              single: 'val',
-              singleArr: ['val'],
-              singleArrNum: [5],
-              multiValMixed: ['value1', 2, 'value3'],
-              singleValNum: 123,
-              emptyStr: '',
-              emptyArr: [''],
-              badValue: {'foo': 'bar'} // should be dropped
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload.keywords).to.be.an('string');
-      payload.keywords = JSON.parse(payload.keywords);
-
-      expect(payload.keywords).to.deep.equal([{
-        'key': 'single',
-        'value': ['val']
-      }, {
-        'key': 'singleArr',
-        'value': ['val']
-      }, {
-        'key': 'singleArrNum',
-        'value': ['5']
-      }, {
-        'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
-      }, {
-        'key': 'singleValNum',
-        'value': ['123']
-      }, {
-        'key': 'emptyStr'
-      }, {
-        'key': 'emptyArr'
-      }]);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const responses = [
-      {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 43, 'h': 250, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 44, 'h': 600, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 43, 'h': 90, 'w': 728}], 'seat': '1'},
-      {'bid': [{'price': 0, 'auid': 45, 'h': 250, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0, 'adm': '<div>test content 5</div>', 'h': 250, 'w': 300}], 'seat': '1'},
-      undefined,
-      {'bid': [], 'seat': '1'},
-      {'seat': '1'},
-    ];
-
-    it('should get correct bid response', function () {
-      const bidRequests = [
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '659423fff799cb',
-          'bidderRequestId': '5f2009617a7c0a',
-          'auctionId': '1cbd2feafe5e8b',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '659423fff799cb',
-          'cpm': 1.15,
-          'creativeId': 43,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': [responses[0]]}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('should get correct multi bid response', function () {
-      const bidRequests = [
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71a5b',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '44'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '4dff80cc4ee346',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '5703af74d0472a',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '300bfeb0d71a5b',
-          'cpm': 1.15,
-          'creativeId': 43,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '4dff80cc4ee346',
-          'cpm': 0.5,
-          'creativeId': 44,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '5703af74d0472a',
-          'cpm': 0.15,
-          'creativeId': 43,
-          'dealId': undefined,
-          'width': 728,
-          'height': 90,
-          'ad': '<div>test content 3</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': responses.slice(0, 3)}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('handles wrong and nobid responses', function () {
-      const bidRequests = [
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '45'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d7190gf',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '46'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71321',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '50'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '300bfeb0d7183bb',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const result = spec.interpretResponse({'body': {'seatbid': responses.slice(3)}}, request);
-      expect(result.length).to.equal(0);
-    });
-
-    it('complicated case', function () {
-      const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 43, 'h': 250, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 44, 'h': 600, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 43, 'h': 90, 'w': 728}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 4</div>', 'auid': 43, 'h': 600, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 5</div>', 'auid': 44, 'h': 600, 'w': 350}], 'seat': '1'},
-      ];
-      const bidRequests = [
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '2164be6358b9',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '326bde7fbf69',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '44'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '4e111f1b66e4',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '26d6f897b516',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '44'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '1751cd90161',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '2164be6358b9',
-          'cpm': 1.15,
-          'creativeId': 43,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '4e111f1b66e4',
-          'cpm': 0.5,
-          'creativeId': 44,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '26d6f897b516',
-          'cpm': 0.15,
-          'creativeId': 43,
-          'dealId': undefined,
-          'width': 728,
-          'height': 90,
-          'ad': '<div>test content 3</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '326bde7fbf69',
-          'cpm': 0.15,
-          'creativeId': 43,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 4</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('dublicate uids and sizes in one slot', function () {
-      const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 43, 'h': 250, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 43, 'h': 250, 'w': 300}], 'seat': '1'},
-      ];
-      const bidRequests = [
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '5126e301f4be',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '57b2ebe70e16',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        },
-        {
-          'bidder': 'trustx',
-          'params': {
-            'uid': '43'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '225fcd44b18c',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '5126e301f4be',
-          'cpm': 1.15,
-          'creativeId': 43,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '57b2ebe70e16',
-          'cpm': 0.5,
-          'creativeId': 43,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'trustx',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-  });
-
-  it('should get correct video bid response', function () {
-    const bidRequests = [
-      {
-        'bidder': 'trustx',
-        'params': {
-          'uid': '50'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '57dfefb80eca',
-        'bidderRequestId': '20394420a762a2',
-        'auctionId': '140132d07b031',
-        'mediaTypes': {
-          'video': {
-            'context': 'instream'
-          }
-        }
-      },
-      {
-        'bidder': 'trustx',
-        'params': {
-          'uid': '51'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'e893c787c22dd',
-        'bidderRequestId': '20394420a762a2',
-        'auctionId': '140132d07b031',
-        'mediaTypes': {
-          'video': {
-            'context': 'instream'
-          }
-        }
-      }
-    ];
-    const response = [
-      {'bid': [{'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>', 'auid': 50, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
-      {'bid': [{'price': 1.00, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>', 'auid': 51, content_type: 'video'}], 'seat': '2'}
-    ];
-    const request = spec.buildRequests(bidRequests);
-    const expectedResponse = [
-      {
-        'requestId': '57dfefb80eca',
-        'cpm': 1.15,
-        'creativeId': 50,
-        'dealId': undefined,
-        'width': 300,
-        'height': 600,
-        'bidderCode': 'trustx',
-        'currency': 'USD',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>'
-        }
-      }
-    ];
-
-    const result = spec.interpretResponse({'body': {'seatbid': response}}, request);
-    expect(result).to.deep.equal(expectedResponse);
-  });
-
-  it('should have right renderer in the bid response', function () {
-    const spySetRenderer = sinon.spy();
-    const stubRenderer = {
-      setRender: spySetRenderer
-    };
-    const spyRendererInstall = sinon.spy(function() { return stubRenderer; });
-    const stubRendererConst = {
-      install: spyRendererInstall
-    };
-    const bidRequests = [
-      {
-        'bidder': 'trustx',
-        'params': {
-          'uid': '50'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'e6e65553fc8',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3',
-        'mediaTypes': {
-          'video': {
-            'context': 'outstream'
-          }
-        }
-      },
-      {
-        'bidder': 'trustx',
-        'params': {
-          'uid': '51'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c8fdcb3f269f',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3'
-      },
-      {
-        'bidder': 'trustx',
-        'params': {
-          'uid': '52'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '1de036c37685',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3',
-        'renderer': {}
-      }
-    ];
-    const response = [
-      {'bid': [{'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>', 'auid': 50, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
-      {'bid': [{'price': 1.00, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>', 'auid': 51, content_type: 'video', w: 300, h: 250}], 'seat': '2'},
-      {'bid': [{'price': 1.20, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"21376532\"><\/Ad>\n<\/VAST>', 'auid': 52, content_type: 'video', w: 300, h: 250}], 'seat': '2'}
-    ];
-    const request = spec.buildRequests(bidRequests);
-    const expectedResponse = [
-      {
-        'requestId': 'e6e65553fc8',
-        'cpm': 1.15,
-        'creativeId': 50,
-        'dealId': undefined,
-        'width': 300,
-        'height': 600,
-        'bidderCode': 'trustx',
-        'currency': 'USD',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"21341234\"><\/Ad>\n<\/VAST>'
-        },
-        'renderer': stubRenderer
-      },
-      {
-        'requestId': 'c8fdcb3f269f',
-        'cpm': 1.00,
-        'creativeId': 51,
-        'dealId': undefined,
-        'width': 300,
-        'height': 250,
-        'bidderCode': 'trustx',
-        'currency': 'USD',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"21331274\"><\/Ad>\n<\/VAST>'
-        },
-        'renderer': stubRenderer
-      },
-      {
-        'requestId': '1de036c37685',
-        'cpm': 1.20,
-        'creativeId': 52,
-        'dealId': undefined,
-        'width': 300,
-        'height': 250,
-        'bidderCode': 'trustx',
-        'currency': 'USD',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"21376532\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"21376532\"><\/Ad>\n<\/VAST>'
-        }
-      }
-    ];
-
-    const result = spec.interpretResponse({'body': {'seatbid': response}}, request, stubRendererConst);
-
-    expect(spySetRenderer.calledTwice).to.equal(true);
-    expect(spySetRenderer.getCall(0).args[0]).to.be.a('function');
-    expect(spySetRenderer.getCall(1).args[0]).to.be.a('function');
-
-    expect(spyRendererInstall.calledTwice).to.equal(true);
-    expect(spyRendererInstall.getCall(0).args[0]).to.deep.equal({
-      id: 'e6e65553fc8',
-      url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
-      loaded: false
-    });
-    expect(spyRendererInstall.getCall(1).args[0]).to.deep.equal({
-      id: 'c8fdcb3f269f',
-      url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
-      loaded: false
-    });
-
-    expect(result).to.deep.equal(expectedResponse);
-  });
-});
diff --git a/test/spec/modules/ttdBidAdapter_spec.js b/test/spec/modules/ttdBidAdapter_spec.js
new file mode 100644
index 00000000000..9869d072657
--- /dev/null
+++ b/test/spec/modules/ttdBidAdapter_spec.js
@@ -0,0 +1,1444 @@
+import { expect } from 'chai';
+import { spec } from 'modules/ttdBidAdapter';
+import { deepClone } from 'src/utils.js';
+import { config } from 'src/config';
+import { detectReferer } from 'src/refererDetection.js';
+
+import { buildWindowTree } from '../../helpers/refererDetectionHelper';
+
+describe('ttdBidAdapter', function () {
+  function testBuildRequests(bidRequests, bidderRequestBase) {
+    let clonedBidderRequest = deepClone(bidderRequestBase);
+    clonedBidderRequest.bids = bidRequests;
+    return spec.buildRequests(bidRequests, clonedBidderRequest);
+  }
+
+  describe('isBidRequestValid', function() {
+    function makeBid() {
+      return {
+        'bidder': 'ttd',
+        'params': {
+          'supplySourceId': 'supplier',
+          'publisherId': '22222222',
+          'placementId': 'some-PlacementId_1'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [300, 250]
+            ]
+          }
+        },
+        'adUnitCode': 'adunit-code',
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+    }
+
+    describe('core', function () {
+      it('should return true when required params found', function () {
+        expect(spec.isBidRequestValid(makeBid())).to.equal(true);
+      });
+
+      it('should return false when publisherId not passed', function () {
+        let bid = makeBid();
+        delete bid.params.publisherId;
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return false when supplySourceId not passed', function () {
+        let bid = makeBid();
+        delete bid.params.supplySourceId;
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return false when publisherId is longer than 64 characters', function () {
+        let bid = makeBid();
+        bid.params.publisherId = '1111111111111111111111111111111111111111111111111111111111111111111111';
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return true if placementId is not passed and gpid is passed', function () {
+        let bid = makeBid();
+        delete bid.params.placementId;
+        bid.ortb2Imp = {
+          ext: {
+            gpid: '/1111/home#header'
+          }
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+
+      it('should return false if neither placementId nor gpid is passed', function () {
+        let bid = makeBid();
+        delete bid.params.placementId;
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return false if neither mediaTypes.banner nor mediaTypes.video is passed', function () {
+        let bid = makeBid();
+        delete bid.mediaTypes
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+    });
+
+    describe('banner', function () {
+      it('should return true if banner.pos is passed correctly', function () {
+        let bid = makeBid();
+        bid.mediaTypes.banner.pos = 1;
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+
+    describe('video', function () {
+      function makeBid() {
+        return {
+          'bidder': 'ttd',
+          'params': {
+            'supplySourceId': 'supplier',
+            'publisherId': '22222222',
+            'placementId': 'somePlacementId'
+          },
+          'mediaTypes': {
+            'video': {
+              'minduration': 5,
+              'maxduration': 30,
+              'playerSize': [640, 480],
+              'api': [1, 3],
+              'mimes': ['video/mp4'],
+              'protocols': [2, 3, 5, 6]
+            }
+          },
+          'adUnitCode': 'adunit-code',
+          'sizes': [
+            [300, 250]
+          ],
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+      }
+
+      it('should return true if required parameters are passed', function () {
+        let bid = makeBid();
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+
+      it('should return false if maxduration is missing', function () {
+        let bid = makeBid();
+        delete bid.mediaTypes.video.maxduration;
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return false if api is missing', function () {
+        let bid = makeBid();
+        delete bid.mediaTypes.video.api;
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return false if mimes is missing', function () {
+        let bid = makeBid();
+        delete bid.mediaTypes.video.mimes;
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return false if protocols is missing', function () {
+        let bid = makeBid();
+        delete bid.mediaTypes.video.protocols;
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('to check the user sync iframe', function () {
+      const syncOptions = {
+        pixelEnabled: true
+      };
+      const gdprConsentString = 'BON3G4EON3G4EAAABAENAA____ABl____A';
+      const gdprConsent = {
+        consentString: gdprConsentString,
+        gdprApplies: true
+      };
+      const uspConsent = '1YYY';
+
+      let syncs = spec.getUserSyncs(syncOptions, [], gdprConsent, uspConsent);
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
+
+      let params = new URLSearchParams(new URL(syncs[0].url).search);
+      expect(params.get('us_privacy')).to.equal(uspConsent);
+      expect(params.get('ust')).to.equal('image');
+      expect(params.get('gdpr')).to.equal('1');
+      expect(params.get('gdpr_consent')).to.equal(gdprConsentString);
+    });
+  });
+
+  describe('buildRequests-banner', function () {
+    const baseBannerBidRequests = [{
+      'bidder': 'ttd',
+      'params': {
+        'supplySourceId': 'supplier',
+        'publisherId': '13144370',
+        'placementId': '1gaa015'
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 250], [300, 600]]
+        }
+      },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '8651474f-58b1-4368-b812-84f8c937a099',
+        }
+      },
+      'sizes': [[300, 250], [300, 600]],
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'bidId': '243310435309b5',
+      'bidderRequestId': '18084284054531',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'src': 'client',
+      'bidRequestsCount': 1
+    }];
+
+    const testWindow = buildWindowTree(['https://www.example.com/test', 'https://www.example.com/other/page', 'https://www.example.com/third/page'], 'https://othersite.com/', 'https://example.com/canonical/page');
+    const baseBidderRequestReferer = detectReferer(testWindow)();
+    const baseBidderRequest = {
+      'bidderCode': 'ttd',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'bidderRequestId': '18084284054531',
+      'auctionStart': 1540945362095,
+      'timeout': 3000,
+      'refererInfo': baseBidderRequestReferer,
+      'start': 1540945362099,
+      'doneCbCallCount': 0
+    };
+
+    it('sends bid request to our endpoint that makes sense', function () {
+      const request = testBuildRequests(baseBannerBidRequests, baseBidderRequest);
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.be.not.empty;
+      expect(request.data).to.be.not.null;
+    });
+
+    it('sets impression id to ad unit\'s bid id', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].id).to.equal('243310435309b5');
+    });
+
+    it('sends bid requests to the correct endpoint', function () {
+      const url = testBuildRequests(baseBannerBidRequests, baseBidderRequest).url;
+      expect(url).to.equal('https://direct.adsrvr.org/bid/bidder/supplier');
+    });
+
+    it('sends publisher id', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.site).to.be.not.null;
+      expect(requestBody.site.publisher).to.be.not.null;
+      expect(requestBody.site.publisher.id).to.equal(baseBannerBidRequests[0].params.publisherId);
+    });
+
+    it('sends placement id in tagid', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].tagid).to.equal(baseBannerBidRequests[0].params.placementId);
+    });
+
+    it('sends gpid in tagid if present', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      const gpid = '/1111/home#header';
+      clonedBannerRequests[0].ortb2Imp = {
+        ext: {
+          gpid: gpid
+        }
+      };
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].tagid).to.equal(gpid);
+    });
+
+    it('sends gpid in ext.gpid if present', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      const gpid = '/1111/home#header';
+      clonedBannerRequests[0].ortb2Imp = {
+        ext: {
+          gpid: gpid
+        }
+      };
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].ext).to.be.not.null;
+      expect(requestBody.imp[0].ext.gpid).to.equal(gpid);
+    });
+
+    it('sends auction id in source.tid', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.source).to.be.not.null;
+      expect(requestBody.source.tid).to.equal(baseBidderRequest.auctionId);
+    });
+
+    it('includes the ad size in the bid request', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].banner.format[0].w).to.equal(300);
+      expect(requestBody.imp[0].banner.format[0].h).to.equal(250);
+      expect(requestBody.imp[0].banner.format[1].w).to.equal(300);
+      expect(requestBody.imp[0].banner.format[1].h).to.equal(600);
+    });
+
+    it('includes the detected referer in the bid request', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.site.page).to.equal('https://www.example.com/test');
+    });
+
+    it('ensure top most location is used', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.site.page).to.equal('https://www.example.com/test');
+    });
+
+    it('sets the banner pos correctly if sent', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      clonedBannerRequests[0].mediaTypes.banner.pos = 1;
+
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].banner.pos).to.equal(1);
+    });
+
+    it('sets the banner expansion direction correctly if sent', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      const expdir = [1, 3]
+      clonedBannerRequests[0].params.banner = {
+        expdir: expdir
+      };
+
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].banner.expdir).to.equal(expdir);
+    });
+
+    it('merges first party site data', function () {
+      const ortb2 = {
+        site: {
+          publisher: {
+            domain: 'https://foo.bar',
+          }
+        }
+      };
+      const baseBidderRequestWithoutRefererDomain = {
+        ...baseBidderRequest,
+        refererInfo: {
+          ...baseBannerBidRequests.referer,
+          domain: null
+        }
+      }
+      const requestBody = testBuildRequests(
+        baseBannerBidRequests, {...baseBidderRequestWithoutRefererDomain, ortb2}
+      ).data;
+      config.resetConfig();
+      expect(requestBody.site.publisher).to.deep.equal({domain: 'https://foo.bar', id: '13144370'});
+    });
+
+    it('referer domain overrides first party site data publisher domain', function () {
+      const ortb2 = {
+        site: {
+          publisher: {
+            domain: 'https://foo.bar',
+          }
+        }
+      };
+      const requestBody = testBuildRequests(
+        baseBannerBidRequests, {...baseBidderRequest, ortb2}
+      ).data;
+      config.resetConfig();
+      expect(requestBody.site.publisher.domain).to.equal(baseBidderRequest.refererInfo.domain);
+    });
+
+    it('sets keywords properly if sent', function () {
+      const ortb2 = {
+        site: {
+          keywords: 'highViewability, clothing, holiday shopping'
+        }
+      };
+      const requestBody = testBuildRequests(baseBannerBidRequests, {...baseBidderRequest, ortb2}).data;
+      config.resetConfig();
+      expect(requestBody.ext.ttdprebid.keywords).to.deep.equal(['highViewability', 'clothing', 'holiday shopping']);
+    });
+
+    it('sets bcat properly if sent', function () {
+      const ortb2 = {
+        bcat: ['IAB1-1', 'IAB2-9']
+      };
+      const requestBody = testBuildRequests(baseBannerBidRequests, {...baseBidderRequest, ortb2}).data;
+      config.resetConfig();
+      expect(requestBody.bcat).to.deep.equal(['IAB1-1', 'IAB2-9']);
+    });
+
+    it('sets badv properly if sent', function () {
+      const ortb2 = {
+        badv: ['adv1.com', 'adv2.com']
+      };
+      const requestBody = testBuildRequests(baseBannerBidRequests, {...baseBidderRequest, ortb2}).data;
+      config.resetConfig();
+      expect(requestBody.badv).to.deep.equal(['adv1.com', 'adv2.com']);
+    });
+
+    it('sets battr properly if present', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      const battr = [1, 2, 3];
+      clonedBannerRequests[0].ortb2Imp = {
+        battr: battr
+      };
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].banner.battr).to.equal(battr);
+    });
+
+    it('sets ext properly', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.ext.ttdprebid.pbjs).to.equal('$prebid.version$');
+    });
+
+    it('adds gdpr consent info to the request', function () {
+      let consentString = 'BON3G4EON3G4EAAABAENAA____ABl____A';
+      let clonedBidderRequest = deepClone(baseBidderRequest);
+      clonedBidderRequest.gdprConsent = {
+        consentString: consentString,
+        gdprApplies: true
+      };
+
+      const requestBody = testBuildRequests(baseBannerBidRequests, clonedBidderRequest).data;
+      expect(requestBody.user.ext.consent).to.equal(consentString);
+      expect(requestBody.regs.ext.gdpr).to.equal(1);
+    });
+
+    it('adds usp consent info to the request', function () {
+      let consentString = 'BON3G4EON3G4EAAABAENAA____ABl____A';
+      let clonedBidderRequest = deepClone(baseBidderRequest);
+      clonedBidderRequest.uspConsent = consentString;
+
+      const requestBody = testBuildRequests(baseBannerBidRequests, clonedBidderRequest).data;
+      expect(requestBody.regs.ext.us_privacy).to.equal(consentString);
+    });
+
+    it('adds coppa consent info to the request', function () {
+      let clonedBidderRequest = deepClone(baseBidderRequest);
+
+      config.setConfig({coppa: true});
+      const requestBody = testBuildRequests(baseBannerBidRequests, clonedBidderRequest).data;
+      config.resetConfig();
+      expect(requestBody.regs.coppa).to.equal(1);
+    });
+
+    it('adds gpp consent info to the request', function () {
+      const ortb2 = {
+        regs: {
+          gpp: 'somegppstring',
+          gpp_sid: [6, 7]
+        }
+      };
+      let clonedBidderRequest = {...deepClone(baseBidderRequest), ortb2};
+      const requestBody = testBuildRequests(baseBannerBidRequests, clonedBidderRequest).data;
+      config.resetConfig();
+      expect(requestBody.regs.gpp).to.equal('somegppstring');
+      expect(requestBody.regs.gpp_sid).to.eql([6, 7]);
+    });
+
+    it('adds schain info to the request', function () {
+      const schain = {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [{
+          'asi': 'indirectseller.com',
+          'sid': '00001',
+          'hp': 1
+        }, {
+          'asi': 'indirectseller-2.com',
+          'sid': '00002',
+          'hp': 1
+        }]
+      };
+      let clonedBannerBidRequests = deepClone(baseBannerBidRequests);
+      clonedBannerBidRequests[0].schain = schain;
+
+      const requestBody = testBuildRequests(clonedBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.source.ext.schain).to.deep.equal(schain);
+    });
+
+    it('adds unified ID info to the request', function () {
+      const TDID = '00000000-0000-0000-0000-000000000000';
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      clonedBannerRequests[0].userId = {
+        tdid: TDID
+      };
+
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.user.buyeruid).to.equal(TDID);
+    });
+
+    it('adds unified ID and UID2 info to user.ext.eids in the request', function () {
+      const TDID = '00000000-0000-0000-0000-000000000000';
+      const UID2 = '99999999-9999-9999-9999-999999999999';
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      clonedBannerRequests[0].userId = {
+        tdid: TDID,
+        uid2: {
+          id: UID2
+        }
+      };
+      const expectedEids = [
+        {
+          source: 'adserver.org',
+          uids: [
+            {
+              atype: 1,
+              ext: {
+                rtiPartner: 'TDID'
+              },
+              id: TDID
+            }
+          ]
+        },
+        {
+          source: 'uidapi.com',
+          uids: [
+            {
+              atype: 3,
+              id: UID2
+            }
+          ]
+        }
+      ];
+
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.user.ext.eids).to.deep.equal(expectedEids);
+    });
+
+    it('adds first party site data to the request', function () {
+      const ortb2 = {
+        site: {
+          name: 'example',
+          domain: 'page.example.com',
+          cat: ['IAB2'],
+          sectioncat: ['IAB2-2'],
+          pagecat: ['IAB2-2'],
+          page: 'https://page.example.com/here.html',
+          ref: 'https://ref.example.com',
+          keywords: 'power tools, drills'
+        }
+      };
+      let clonedBidderRequest = {...deepClone(baseBidderRequest), ortb2};
+      const requestBody = testBuildRequests(baseBannerBidRequests, clonedBidderRequest).data;
+      expect(requestBody.site.name).to.equal('example');
+      expect(requestBody.site.domain).to.equal('page.example.com');
+      expect(requestBody.site.cat[0]).to.equal('IAB2');
+      expect(requestBody.site.sectioncat[0]).to.equal('IAB2-2');
+      expect(requestBody.site.pagecat[0]).to.equal('IAB2-2');
+      expect(requestBody.site.page).to.equal('https://page.example.com/here.html');
+      expect(requestBody.site.ref).to.equal('https://ref.example.com');
+      expect(requestBody.site.keywords).to.equal('power tools, drills');
+    });
+  });
+
+  describe('buildRequests-banner-multiple', function () {
+    const baseBannerMultipleBidRequests = [{
+      'bidder': 'ttd',
+      'params': {
+        'supplySourceId': 'supplier',
+        'publisherId': '13144370',
+        'placementId': 'bottom'
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 250], [300, 600]]
+        }
+      },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '8651474f-58b1-4368-b812-84f8c937a099',
+        }
+      },
+      'sizes': [[300, 250], [300, 600]],
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'bidId': 'small',
+      'bidderRequestId': '18084284054531',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'src': 'client',
+      'bidRequestsCount': 1
+    }, {
+      'bidder': 'ttd',
+      'params': {
+        'publisherId': '13144370',
+        'placementId': 'top'
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[728, 90]]
+        }
+      },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '12345678-58b1-4368-b812-84f8c937a099',
+        }
+      },
+      'sizes': [[728, 90]],
+      'transactionId': '825c1228-ca8c-4657-b40f-2df500621527',
+      'adUnitCode': 'div-gpt-ad-91515710-0',
+      'bidId': 'large',
+      'bidderRequestId': '18084284054531',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'src': 'client',
+      'bidRequestsCount': 1
+    }];
+
+    const baseBidderRequest = {
+      'bidderCode': 'ttd',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'bidderRequestId': '18084284054531',
+      'auctionStart': 1540945362095,
+      'timeout': 3000,
+      'refererInfo': {
+        'referer': 'https://www.test.com',
+        'reachedTop': true,
+        'numIframes': 0,
+        'stack': [
+          'https://www.test.com'
+        ]
+      },
+      'start': 1540945362099,
+      'doneCbCallCount': 0
+    };
+
+    it('sends multiple impressions', function () {
+      const requestBody = testBuildRequests(baseBannerMultipleBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp.length).to.equal(2);
+      expect(requestBody.source).to.be.not.null;
+      expect(requestBody.source.tid).to.equal(baseBidderRequest.auctionId);
+      expect(requestBody.imp[0].ext).to.be.not.null;
+      expect(requestBody.imp[0].ext.tid).to.equal('8651474f-58b1-4368-b812-84f8c937a099');
+      expect(requestBody.imp[1].ext).to.be.not.null;
+      expect(requestBody.imp[1].ext.tid).to.equal('12345678-58b1-4368-b812-84f8c937a099');
+    });
+
+    it('sends the right tag ids for each ad unit', function () {
+      const requestBody = testBuildRequests(baseBannerMultipleBidRequests, baseBidderRequest).data;
+      requestBody.imp.forEach(imp => {
+        if (imp.id === 'small') {
+          expect(imp.tagid).to.equal('bottom');
+        } else if (imp.id === 'large') {
+          expect(imp.tagid).to.equal('top');
+        } else {
+          assert.fail('no matching impression id found');
+        }
+      });
+    });
+
+    it('sends the sizes for each ad unit', function () {
+      const requestBody = testBuildRequests(baseBannerMultipleBidRequests, baseBidderRequest).data;
+      requestBody.imp.forEach(imp => {
+        if (imp.id === 'small') {
+          expect(imp.banner.format[0].w).to.equal(300);
+          expect(imp.banner.format[0].h).to.equal(250);
+          expect(imp.banner.format[1].w).to.equal(300);
+          expect(imp.banner.format[1].h).to.equal(600);
+        } else if (imp.id === 'large') {
+          expect(imp.banner.format[0].w).to.equal(728);
+          expect(imp.banner.format[0].h).to.equal(90);
+        } else {
+          assert.fail('no matching impression id found');
+        }
+      });
+    });
+  });
+
+  describe('buildRequests-display-video-multiformat', function () {
+    const baseMultiformatBidRequests = [{
+      'bidder': 'ttd',
+      'params': {
+        'supplySourceId': 'supplier',
+        'publisherId': '13144370',
+        'placementId': '1gaa015'
+      },
+      'mediaTypes': {
+        'video': {
+          'playerSize': [640, 480],
+          'api': [1, 3],
+          'mimes': ['video/mp4'],
+          'protocols': [2, 3, 5, 6],
+          'minduration': 5,
+          'maxduration': 30
+        },
+        'banner': {
+          'sizes': [[300, 250], [300, 600]]
+        }
+      },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '8651474f-58b1-4368-b812-84f8c937a099',
+        }
+      },
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'bidId': '243310435309b5',
+      'bidderRequestId': '18084284054531',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'src': 'client',
+      'bidRequestsCount': 1
+    }];
+
+    const baseBidderRequest = {
+      'bidderCode': 'ttd',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'bidderRequestId': '18084284054531',
+      'auctionStart': 1540945362095,
+      'timeout': 3000,
+      'refererInfo': {
+        'referer': 'https://www.example.com/test',
+        'reachedTop': true,
+        'numIframes': 0,
+        'stack': [
+          'https://www.example.com/test'
+        ]
+      },
+      'start': 1540945362099,
+      'doneCbCallCount': 0
+    };
+
+    it('includes the video ad size in the bid request', function () {
+      const requestBody = testBuildRequests(baseMultiformatBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.w).to.equal(640);
+      expect(requestBody.imp[0].video.h).to.equal(480);
+    });
+
+    it('includes the banner ad size in the bid request', function () {
+      const requestBody = testBuildRequests(baseMultiformatBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].banner.format[0].w).to.equal(300);
+      expect(requestBody.imp[0].banner.format[0].h).to.equal(250);
+      expect(requestBody.imp[0].banner.format[1].w).to.equal(300);
+      expect(requestBody.imp[0].banner.format[1].h).to.equal(600);
+    });
+  });
+
+  describe('buildRequests-video', function () {
+    const baseVideoBidRequests = [{
+      'bidder': 'ttd',
+      'params': {
+        'supplySourceId': 'supplier',
+        'publisherId': '13144370',
+        'placementId': '1gaa015'
+      },
+      'mediaTypes': {
+        'video': {
+          'playerSize': [640, 480],
+          'api': [1, 3],
+          'mimes': ['video/mp4'],
+          'protocols': [2, 3, 5, 6],
+          'minduration': 5,
+          'maxduration': 30
+        }
+      },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '8651474f-58b1-4368-b812-84f8c937a099',
+        }
+      },
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'bidId': '243310435309b5',
+      'bidderRequestId': '18084284054531',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'src': 'client',
+      'bidRequestsCount': 1
+    }];
+
+    const baseBidderRequest = {
+      'bidderCode': 'ttd',
+      'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+      'bidderRequestId': '18084284054531',
+      'auctionStart': 1540945362095,
+      'timeout': 3000,
+      'refererInfo': {
+        'referer': 'https://www.example.com/test',
+        'reachedTop': true,
+        'numIframes': 0,
+        'stack': [
+          'https://www.example.com/test'
+        ]
+      },
+      'start': 1540945362099,
+      'doneCbCallCount': 0
+    };
+
+    it('includes the ad size in the bid request', function () {
+      const requestBody = testBuildRequests(baseVideoBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.w).to.equal(640);
+      expect(requestBody.imp[0].video.h).to.equal(480);
+    });
+
+    it('includes the mimes in the bid request', function () {
+      const requestBody = testBuildRequests(baseVideoBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.mimes[0]).to.equal('video/mp4');
+    });
+
+    it('includes the min and max duration in the bid request', function () {
+      const requestBody = testBuildRequests(baseVideoBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.minduration).to.equal(5);
+      expect(requestBody.imp[0].video.maxduration).to.equal(30);
+    });
+
+    it('sets the minduration to 0 if missing', function () {
+      let clonedVideoRequests = deepClone(baseVideoBidRequests);
+      delete clonedVideoRequests[0].mediaTypes.video.minduration
+
+      const requestBody = testBuildRequests(clonedVideoRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.minduration).to.equal(0);
+    });
+
+    it('includes the api frameworks in the bid request', function () {
+      const requestBody = testBuildRequests(baseVideoBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.api[0]).to.equal(1);
+      expect(requestBody.imp[0].video.api[1]).to.equal(3);
+    });
+
+    it('includes the protocols in the bid request', function () {
+      const requestBody = testBuildRequests(baseVideoBidRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.protocols[0]).to.equal(2);
+      expect(requestBody.imp[0].video.protocols[1]).to.equal(3);
+      expect(requestBody.imp[0].video.protocols[2]).to.equal(5);
+      expect(requestBody.imp[0].video.protocols[3]).to.equal(6);
+    });
+
+    it('sets skip correctly if sent', function () {
+      let clonedVideoRequests = deepClone(baseVideoBidRequests);
+      clonedVideoRequests[0].mediaTypes.video.skip = 1;
+      clonedVideoRequests[0].mediaTypes.video.skipmin = 5;
+      clonedVideoRequests[0].mediaTypes.video.skipafter = 10;
+
+      const requestBody = testBuildRequests(clonedVideoRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.skip).to.equal(1);
+      expect(requestBody.imp[0].video.skipmin).to.equal(5);
+      expect(requestBody.imp[0].video.skipafter).to.equal(10);
+    });
+
+    it('sets bitrate correctly if sent', function () {
+      let clonedVideoRequests = deepClone(baseVideoBidRequests);
+      clonedVideoRequests[0].mediaTypes.video.minbitrate = 100;
+      clonedVideoRequests[0].mediaTypes.video.maxbitrate = 500;
+
+      const requestBody = testBuildRequests(clonedVideoRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.minbitrate).to.equal(100);
+      expect(requestBody.imp[0].video.maxbitrate).to.equal(500);
+    });
+
+    it('sets pos correctly if sent', function () {
+      let clonedVideoRequests = deepClone(baseVideoBidRequests);
+      clonedVideoRequests[0].mediaTypes.video.pos = 1;
+
+      const requestBody = testBuildRequests(clonedVideoRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.pos).to.equal(1);
+    });
+
+    it('sets playbackmethod correctly if sent', function () {
+      let clonedVideoRequests = deepClone(baseVideoBidRequests);
+      clonedVideoRequests[0].mediaTypes.video.playbackmethod = [1];
+
+      const requestBody = testBuildRequests(clonedVideoRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.playbackmethod[0]).to.equal(1);
+    });
+
+    it('sets startdelay correctly if sent', function () {
+      let clonedVideoRequests = deepClone(baseVideoBidRequests);
+      clonedVideoRequests[0].mediaTypes.video.startdelay = -1;
+
+      const requestBody = testBuildRequests(clonedVideoRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.startdelay).to.equal(-1);
+    });
+
+    it('sets placement correctly if sent', function () {
+      let clonedVideoRequests = deepClone(baseVideoBidRequests);
+      clonedVideoRequests[0].mediaTypes.video.placement = 3;
+
+      const requestBody = testBuildRequests(clonedVideoRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].video.placement).to.equal(3);
+    });
+  });
+
+  describe('interpretResponse-empty', function () {
+    it('should handle empty response', function () {
+      let result = spec.interpretResponse({});
+      expect(result.length).to.equal(0);
+    });
+
+    it('should handle empty seatbid response', function () {
+      let response = {
+        body: {
+          'id': '5e5c23a5ba71e78',
+          'seatbid': []
+        }
+      };
+      let result = spec.interpretResponse(response);
+      expect(result.length).to.equal(0);
+    });
+  });
+
+  describe('interpretResponse-simple-display', function () {
+    const incoming = {
+      body: {
+        'id': '5e5c23a5ba71e78',
+        'seatbid': [
+          {
+            'bid': [
+              {
+                'id': '6vmb3isptf',
+                'crid': 'ttdscreative',
+                'impid': '322add653672f68',
+                'price': 1.22,
+                'adm': '<!-- creative -->',
+                'cat': [],
+                'h': 90,
+                'w': 728,
+                'ttl': 60,
+                'dealid': 'ttd-dealid-1',
+                'adomain': ['advertiser.com'],
+                'ext': {
+                  'mediatype': 1
+                }
+              }
+            ],
+            'seat': 'MOCK'
+          }
+        ],
+        'cur': 'EUR',
+        'bidid': '5e5c23a5ba71e78'
+      }
+    };
+
+    const serverRequest = {
+      'method': 'POST',
+      'url': 'https://direct.adsrvr.org/bid/bidder/supplier',
+      'data': {
+        'id': 'c47237df-c108-419f-9c2b-da513dc3c133',
+        'imp': [
+          {
+            'id': '322add653672f68',
+            'tagid': 'simple',
+            'banner': {
+              'w': 728,
+              'h': 90,
+              'format': [
+                {
+                  'w': 728,
+                  'h': 90
+                }
+              ]
+            }
+          }
+        ],
+        'site': {
+          'page': 'http://www.test.com',
+          'publisher': {
+            'id': '111'
+          }
+        },
+        'device': {
+          'ua': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36',
+          'dnt': 0,
+          'language': 'en-US',
+          'connectiontype': 0
+        },
+        'user': {},
+        'at': 1,
+        'cur': [
+          'USD'
+        ],
+        'regs': {},
+        'ext': {
+          'ttdprebid': {
+            'ver': 'TTD-PREBID-2019.11.12',
+            'pbjs': '2.31.0'
+          }
+        }
+      },
+      'options': {
+        'withCredentials': true
+      }
+    };
+
+    const expectedBid = {
+      'requestId': '322add653672f68',
+      'cpm': 1.22,
+      'width': 728,
+      'height': 90,
+      'creativeId': 'ttdscreative',
+      'dealId': 'ttd-dealid-1',
+      'currency': 'EUR',
+      'netRevenue': true,
+      'ttl': 60,
+      'ad': '<!-- creative -->',
+      'mediaType': 'banner',
+      'meta': {
+        'advertiserDomains': ['advertiser.com']
+      }
+    };
+
+    it('should get the correct bid response', function () {
+      let result = spec.interpretResponse(incoming, serverRequest);
+      expect(result.length).to.equal(1);
+      expect(result[0]).to.deep.equal(expectedBid);
+    });
+  });
+
+  describe('interpretResponse-multiple-display', function () {
+    const incoming = {
+      'body': {
+        'id': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+        'seatbid': [
+          {
+            'bid': [
+              {
+                'id': 'small',
+                'impid': 'small',
+                'price': 4.25,
+                'adm': '<img src=\"https://test.adsrvr.org/feedback/prebid?iid=a6702d4e-8d0f-4c48-b251-ce7db4150b46&crid=creativeId999&wp=${AUCTION_PRICE}&aid=small&wpc=USD&sfe=f8d2db2&puid=&tdid=825c1228-ca8c-4657-b40f-2df500621527&pid=&ag=adgroupid&sig=dFthumiovXraET6E7SiXy41xVCF0HgbuBSVkvazJp-w.&cf=&fq=0&td_s=www.test.com&rcats=&mcat=&mste=&mfld=0&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=1&dt=Other&osf=&os=&br=&rlangs=en&mlang=&svpid=13144370&did=&rcxt=Other&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&bp=250.25&c=OAA.&dur=&crrelr=&ipl=bottom&vc=0&said=e7b34fa3-8654-424e-8c49-03e509e53d8c&ict=Unknown\" width=\"1\" height=\"1\" style=\"display: none;\"/>Default Test Ad Tag',
+                'cid': 'campaignId132',
+                'crid': 'creativeId999',
+                'adomain': [
+                  'http://foo'
+                ],
+                'dealid': null,
+                'w': 300,
+                'h': 600,
+                'cat': [],
+                'ext': {
+                  'mediatype': 1
+                }
+              },
+              {
+                'id': 'large',
+                'impid': 'large',
+                'price': 5.25,
+                'adm': '<img src=\"https://test.adsrvr.org/feedback/prebid?iid=02348bcc-773a-4e98-8550-d27a870262e4&crid=creativeId222&wp=${AUCTION_PRICE}&aid=large&wpc=USD&sfe=f8d2db2&puid=&tdid=825c1228-ca8c-4657-b40f-2df500621527&pid=&ag=adgroupid&sig=iK1Drckqd-4kokX0eXwWQn5rh0EynlQim0H22GyT3pg.&cf=&fq=0&td_s=www.test.com&rcats=&mcat=&mste=&mfld=0&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=1&dt=Other&osf=&os=&br=&rlangs=en&mlang=&svpid=13144370&did=&rcxt=Other&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&bp=251.25&c=OAA.&dur=&crrelr=&ipl=top&vc=0&said=e7b34fa3-8654-424e-8c49-03e509e53d8c&ict=Unknown\" width=\"1\" height=\"1\" style=\"display: none;\"/>Default Test Ad Tag',
+                'cid': 'campaignId132',
+                'crid': 'creativeId222',
+                'adomain': [
+                  'http://foo2'
+                ],
+                'dealid': null,
+                'w': 728,
+                'h': 90,
+                'cat': [],
+                'ext': {
+                  'mediatype': 1
+                }
+              }
+            ],
+            'seat': 'supplyVendorBuyerId132'
+          }
+        ],
+        'cur': 'USD'
+      }
+    };
+
+    const expectedBids = [
+      {
+        'requestId': 'small',
+        'cpm': 4.25,
+        'width': 300,
+        'height': 600,
+        'creativeId': 'creativeId999',
+        'currency': 'USD',
+        'dealId': null,
+        'netRevenue': true,
+        'ttl': 360,
+        'ad': '<img src=\"https://test.adsrvr.org/feedback/prebid?iid=a6702d4e-8d0f-4c48-b251-ce7db4150b46&crid=creativeId999&wp=4.25&aid=small&wpc=USD&sfe=f8d2db2&puid=&tdid=825c1228-ca8c-4657-b40f-2df500621527&pid=&ag=adgroupid&sig=dFthumiovXraET6E7SiXy41xVCF0HgbuBSVkvazJp-w.&cf=&fq=0&td_s=www.test.com&rcats=&mcat=&mste=&mfld=0&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=1&dt=Other&osf=&os=&br=&rlangs=en&mlang=&svpid=13144370&did=&rcxt=Other&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&bp=250.25&c=OAA.&dur=&crrelr=&ipl=bottom&vc=0&said=e7b34fa3-8654-424e-8c49-03e509e53d8c&ict=Unknown\" width=\"1\" height=\"1\" style=\"display: none;\"/>Default Test Ad Tag',
+        'mediaType': 'banner',
+        'meta': {
+          'advertiserDomains': ['http://foo']
+        }
+      },
+      {
+        'requestId': 'large',
+        'cpm': 5.25,
+        'width': 728,
+        'height': 90,
+        'creativeId': 'creativeId222',
+        'currency': 'USD',
+        'dealId': null,
+        'netRevenue': true,
+        'ttl': 360,
+        'ad': '<img src=\"https://test.adsrvr.org/feedback/prebid?iid=02348bcc-773a-4e98-8550-d27a870262e4&crid=creativeId222&wp=5.25&aid=large&wpc=USD&sfe=f8d2db2&puid=&tdid=825c1228-ca8c-4657-b40f-2df500621527&pid=&ag=adgroupid&sig=iK1Drckqd-4kokX0eXwWQn5rh0EynlQim0H22GyT3pg.&cf=&fq=0&td_s=www.test.com&rcats=&mcat=&mste=&mfld=0&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=1&dt=Other&osf=&os=&br=&rlangs=en&mlang=&svpid=13144370&did=&rcxt=Other&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&bp=251.25&c=OAA.&dur=&crrelr=&ipl=top&vc=0&said=e7b34fa3-8654-424e-8c49-03e509e53d8c&ict=Unknown\" width=\"1\" height=\"1\" style=\"display: none;\"/>Default Test Ad Tag',
+        'mediaType': 'banner',
+        'meta': {
+          'advertiserDomains': ['http://foo2']
+        }
+      }
+    ];
+
+    const serverRequest = {
+      'method': 'POST',
+      'url': 'https://direct.adsrvr.org/bid/bidder/supplier',
+      'data': {
+        'id': 'c47237df-c108-419f-9c2b-da513dc3c133',
+        'imp': [
+          {
+            'id': 'small',
+            'tagid': 'test1',
+            'banner': {
+              'w': 300,
+              'h': 600,
+              'format': [
+                {
+                  'w': 300,
+                  'h': 600
+                }
+              ]
+            }
+          },
+          {
+            'id': 'large',
+            'tagid': 'test2',
+            'banner': {
+              'w': 728,
+              'h': 90,
+              'format': [
+                {
+                  'w': 728,
+                  'h': 90
+                }
+              ]
+            }
+          }
+        ],
+        'site': {
+          'page': 'http://www.test.com',
+          'publisher': {
+            'id': '111'
+          }
+        },
+        'device': {
+          'ua': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36',
+          'dnt': 0,
+          'language': 'en-US',
+          'connectiontype': 0
+        },
+        'user': {},
+        'at': 1,
+        'cur': [
+          'USD'
+        ],
+        'regs': {},
+        'ext': {
+          'ttdprebid': {
+            'ver': 'TTD-PREBID-2019.11.12',
+            'pbjs': '2.31.0'
+          }
+        }
+      },
+      'options': {
+        'withCredentials': true
+      }
+    };
+
+    it('should get the correct bid response', function () {
+      let result = spec.interpretResponse(incoming, serverRequest);
+      expect(result.length).to.equal(2);
+      expect(result).to.deep.equal(expectedBids);
+    });
+  });
+
+  describe('interpretResponse-simple-video', function () {
+    const incoming = {
+      'body': {
+        'cur': 'USD',
+        'seatbid': [
+          {
+            'bid': [
+              {
+                'crid': 'mokivv6m',
+                'ext': {
+                  'advid': '7ieo6xk',
+                  'agid': '7q9n3s2',
+                  'deal': {
+                    'dealid': '7013542'
+                  },
+                  'imptrackers': [],
+                  'viewabilityvendors': [],
+                  'mediatype': 2
+                },
+                'h': 480,
+                'impid': '2eabb87dfbcae4',
+                'nurl': 'https://insight.adsrvr.org/enduser/vast?iid=00000000-0000-0000-0000-000000000000&crid=v3pek2eh&wp=${AUCTION_PRICE}&aid=&wpc=&sfe=0&puid=&tdid=00000000-0000-0000-0000-000000000000&pid=&ag=&adv=&sig=AAAAAAAAAAAAAA.&cf=&fq=0&td_s=&rcats=&mcat=&mste=&mfld=4&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=0&dt=&osf=&os=&br=&rlangs=en&mlang=en&svpid=&did=&rcxt=&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&dc=0&vcc=QAFIAVABiAECwAEDyAED0AED6AEG8AEBgAIDigIMCAIIBQgDCAYICwgMmgIECAEIAqACA6gCAsACAA..&sv=noop&pidi=&advi=&cmpi=&agi=&cridi=&svi=&cmp=&skip=1&c=&dur=&crrelr=',
+                'price': 13.6,
+                'ttl': 500,
+                'w': 600
+              }
+            ],
+            'seat': 'supplyVendorBuyerId132'
+          }
+        ]
+      },
+      'headers': {}
+    };
+
+    const serverRequest = {
+      'method': 'POST',
+      'url': 'https://direct.bid.adsrvr.org/bid/bidder/supplier',
+      'data': {
+        'id': 'e94ec12d-ae1d-4ed7-abd1-eb3198ce3b63',
+        'imp': [
+          {
+            'id': '2eabb87dfbcae4',
+            'tagid': 'video',
+            'video': {
+              'api': [
+                1,
+                3
+              ],
+              'mimes': [
+                'video/mp4'
+              ],
+              'minduration': 5,
+              'maxduration': 30,
+              'w': 640,
+              'h': 480,
+              'protocols': [
+                2,
+                3,
+                5,
+                6
+              ]
+            }
+          }
+        ],
+        'site': {
+          'page': 'http://www.test.com',
+          'publisher': {
+            'id': '111'
+          }
+        },
+        'device': {
+          'ua': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36',
+          'dnt': 0,
+          'language': 'en-US',
+          'connectiontype': 0
+        },
+        'user': {},
+        'at': 1,
+        'cur': [
+          'USD'
+        ],
+        'regs': {},
+        'ext': {
+          'ttdprebid': {
+            'ver': 'TTD-PREBID-2019.11.12',
+            'pbjs': '3.10.0'
+          }
+        }
+      },
+      'options': {
+        'withCredentials': true
+      }
+    };
+
+    const expectedBid =
+    {
+      'requestId': '2eabb87dfbcae4',
+      'cpm': 13.6,
+      'creativeId': 'mokivv6m',
+      'dealId': null,
+      'currency': 'USD',
+      'netRevenue': true,
+      'ttl': 500,
+      'width': 640,
+      'height': 480,
+      'mediaType': 'video',
+      'vastUrl': 'https://insight.adsrvr.org/enduser/vast?iid=00000000-0000-0000-0000-000000000000&crid=v3pek2eh&wp=13.6&aid=&wpc=&sfe=0&puid=&tdid=00000000-0000-0000-0000-000000000000&pid=&ag=&adv=&sig=AAAAAAAAAAAAAA.&cf=&fq=0&td_s=&rcats=&mcat=&mste=&mfld=4&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=0&dt=&osf=&os=&br=&rlangs=en&mlang=en&svpid=&did=&rcxt=&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&dc=0&vcc=QAFIAVABiAECwAEDyAED0AED6AEG8AEBgAIDigIMCAIIBQgDCAYICwgMmgIECAEIAqACA6gCAsACAA..&sv=noop&pidi=&advi=&cmpi=&agi=&cridi=&svi=&cmp=&skip=1&c=&dur=&crrelr=',
+      'meta': {}
+    };
+
+    it('should get the correct bid response if nurl is returned', function () {
+      let result = spec.interpretResponse(incoming, serverRequest);
+      expect(result.length).to.equal(1);
+      expect(result[0]).to.deep.equal(expectedBid);
+    });
+
+    it('should get the correct bid response if adm is returned', function () {
+      const vastXml = "<VAST version=\"2.0\"><Ad id=\"preroll-1\"><InLine><AdSystem>2.0</AdSystem><AdTitle>5748406</AdTitle><Impression id=\"blah\"><![CDATA[http://b.scorecardresearch.com/b?C1=1&C2=6000003&C3=0000000200500000197000000&C4=us&C7=http://www.scanscout.com&C8=scanscout.com&C9=http://www.scanscout.com&C10=xn&rn=-103217130]]></Impression><Creatives><Creative><Linear><Duration>00:00:30</Duration><TrackingEvents> </TrackingEvents><VideoClicks><ClickThrough id=\"scanscout\"><![CDATA[ http://www.target.com ]]></ClickThrough></VideoClicks><MediaFiles><MediaFile height=\"396\" width=\"600\" bitrate=\"496\" type=\"video/x-flv\" delivery=\"progressive\"><![CDATA[http://media.scanscout.com/ads/partner1_a1d1fbbc-c4d4-419f-b6c8-e9db63fd4491.flv]]></MediaFile></MediaFiles></Linear></Creative><Creative><CompanionAds><Companion height=\"250\" width=\"300\" id=\"555750\"><HTMLResource><![CDATA[<A onClick=\"var i= new Image(1,1); i.src='http://app.scanscout.com/ssframework/log/log.png?a=logitemaction&RI=555750&CbC=1&CbF=true&EC=0&RC=0&SmC=2&CbM=1.0E-5&VI=736e6b13bad531dc476bc3612749bc35&admode=preroll&PRI=-4827170214961170629&RprC=0&ADsn=17&VcaI=192,197&RrC=1&VgI=736e6b13bad531dc476bc3612749bc35&AVI=142&Ust=ma&Uctry=us&CI=1223187&AC=4&PI=567&Udma=506&ADI=5748406&VclF=true';\" HREF=\"http://target.com\" target=\"_blank\"> <IMG SRC=\"http://media.scanscout.com/ads/target300x250Companion.jpg\" BORDER=0 WIDTH=300 HEIGHT=250 ALT=\"Click Here\"> </A> <img src=\"http://app.scanscout.com/ssframework/log/log.png?a=logitemaction&RI=555750&CbC=1&CbF=true&EC=1&RC=0&SmC=2&CbM=1.0E-5&VI=736e6b13bad531dc476bc3612749bc35&admode=preroll&PRI=-4827170214961170629&RprC=0&ADsn=17&VcaI=192,197&RrC=1&VgI=736e6b13bad531dc476bc3612749bc35&AVI=142&Ust=ma&Uctry=us&CI=1223187&AC=4&PI=567&Udma=506&ADI=5748406&VclF=true\" height=\"1\" width=\"1\">]]></HTMLResource></Companion></CompanionAds></Creative></Creatives></InLine></Ad></VAST>";
+      let admIncoming = deepClone(incoming);
+      delete admIncoming.body.seatbid[0].bid[0].nurl;
+      admIncoming.body.seatbid[0].bid[0].adm = vastXml;
+
+      let vastXmlExpectedBid = deepClone(expectedBid);
+      delete vastXmlExpectedBid.vastUrl;
+      vastXmlExpectedBid.vastXml = vastXml;
+
+      let result = spec.interpretResponse(admIncoming, serverRequest);
+      expect(result.length).to.equal(1);
+      expect(result[0]).to.deep.equal(vastXmlExpectedBid);
+    });
+  });
+
+  describe('interpretResponse-display-and-video', function () {
+    const incoming = {
+      'body': {
+        'id': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
+        'seatbid': [
+          {
+            'bid': [
+              {
+                'id': 'small',
+                'impid': 'small',
+                'price': 4.25,
+                'adm': '<img src=\"https://test.adsrvr.org/feedback/prebid?iid=a6702d4e-8d0f-4c48-b251-ce7db4150b46&crid=creativeId999&wp=${AUCTION_PRICE}&aid=small&wpc=USD&sfe=f8d2db2&puid=&tdid=825c1228-ca8c-4657-b40f-2df500621527&pid=&ag=adgroupid&sig=dFthumiovXraET6E7SiXy41xVCF0HgbuBSVkvazJp-w.&cf=&fq=0&td_s=www.test.com&rcats=&mcat=&mste=&mfld=0&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=1&dt=Other&osf=&os=&br=&rlangs=en&mlang=&svpid=13144370&did=&rcxt=Other&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&bp=250.25&c=OAA.&dur=&crrelr=&ipl=bottom&vc=0&said=e7b34fa3-8654-424e-8c49-03e509e53d8c&ict=Unknown\" width=\"1\" height=\"1\" style=\"display: none;\"/>Default Test Ad Tag',
+                'cid': 'campaignId132',
+                'crid': 'creativeId999',
+                'adomain': [
+                  'http://foo'
+                ],
+                'dealid': null,
+                'w': 300,
+                'h': 600,
+                'cat': [],
+                'ext': {
+                  'mediatype': 1
+                }
+              },
+              {
+                'crid': 'mokivv6m',
+                'ext': {
+                  'advid': '7ieo6xk',
+                  'agid': '7q9n3s2',
+                  'deal': {
+                    'dealid': '7013542'
+                  },
+                  'imptrackers': [],
+                  'viewabilityvendors': [],
+                  'mediatype': 2
+                },
+                'h': 480,
+                'impid': '2eabb87dfbcae4',
+                'nurl': 'https://insight.adsrvr.org/enduser/vast?iid=00000000-0000-0000-0000-000000000000&crid=v3pek2eh&wp=${AUCTION_PRICE}&aid=&wpc=&sfe=0&puid=&tdid=00000000-0000-0000-0000-000000000000&pid=&ag=&adv=&sig=AAAAAAAAAAAAAA.&cf=&fq=0&td_s=&rcats=&mcat=&mste=&mfld=4&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=0&dt=&osf=&os=&br=&rlangs=en&mlang=en&svpid=&did=&rcxt=&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&dc=0&vcc=QAFIAVABiAECwAEDyAED0AED6AEG8AEBgAIDigIMCAIIBQgDCAYICwgMmgIECAEIAqACA6gCAsACAA..&sv=noop&pidi=&advi=&cmpi=&agi=&cridi=&svi=&cmp=&skip=1&c=&dur=&crrelr=',
+                'price': 13.6,
+                'ttl': 500,
+                'w': 600
+              }
+            ],
+            'seat': 'supplyVendorBuyerId132'
+          }
+        ],
+        'cur': 'USD'
+      }
+    };
+
+    const expectedBids = [
+      {
+        'requestId': 'small',
+        'cpm': 4.25,
+        'width': 300,
+        'height': 600,
+        'creativeId': 'creativeId999',
+        'currency': 'USD',
+        'dealId': null,
+        'netRevenue': true,
+        'ttl': 360,
+        'ad': '<img src=\"https://test.adsrvr.org/feedback/prebid?iid=a6702d4e-8d0f-4c48-b251-ce7db4150b46&crid=creativeId999&wp=4.25&aid=small&wpc=USD&sfe=f8d2db2&puid=&tdid=825c1228-ca8c-4657-b40f-2df500621527&pid=&ag=adgroupid&sig=dFthumiovXraET6E7SiXy41xVCF0HgbuBSVkvazJp-w.&cf=&fq=0&td_s=www.test.com&rcats=&mcat=&mste=&mfld=0&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=1&dt=Other&osf=&os=&br=&rlangs=en&mlang=&svpid=13144370&did=&rcxt=Other&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&bp=250.25&c=OAA.&dur=&crrelr=&ipl=bottom&vc=0&said=e7b34fa3-8654-424e-8c49-03e509e53d8c&ict=Unknown\" width=\"1\" height=\"1\" style=\"display: none;\"/>Default Test Ad Tag',
+        'mediaType': 'banner',
+        'meta': {
+          'advertiserDomains': ['http://foo']
+        }
+      },
+      {
+        'requestId': '2eabb87dfbcae4',
+        'cpm': 13.6,
+        'creativeId': 'mokivv6m',
+        'dealId': null,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 500,
+        'width': 640,
+        'height': 480,
+        'mediaType': 'video',
+        'vastUrl': 'https://insight.adsrvr.org/enduser/vast?iid=00000000-0000-0000-0000-000000000000&crid=v3pek2eh&wp=13.6&aid=&wpc=&sfe=0&puid=&tdid=00000000-0000-0000-0000-000000000000&pid=&ag=&adv=&sig=AAAAAAAAAAAAAA.&cf=&fq=0&td_s=&rcats=&mcat=&mste=&mfld=4&mssi=&mfsi=&uhow=&agsa=&rgco=&rgre=&rgme=&rgci=&rgz=&svbttd=0&dt=&osf=&os=&br=&rlangs=en&mlang=en&svpid=&did=&rcxt=&lat=&lon=&tmpc=&daid=&vp=0&osi=&osv=&dc=0&vcc=QAFIAVABiAECwAEDyAED0AED6AEG8AEBgAIDigIMCAIIBQgDCAYICwgMmgIECAEIAqACA6gCAsACAA..&sv=noop&pidi=&advi=&cmpi=&agi=&cridi=&svi=&cmp=&skip=1&c=&dur=&crrelr=',
+        'meta': {}
+      }
+    ];
+
+    const serverRequest = {
+      'method': 'POST',
+      'url': 'https://direct.adsrvr.org/bid/bidder/supplier',
+      'data': {
+        'id': 'c47237df-c108-419f-9c2b-da513dc3c133',
+        'imp': [
+          {
+            'id': 'small',
+            'tagid': 'test1',
+            'banner': {
+              'w': 300,
+              'h': 600,
+              'format': [
+                {
+                  'w': 300,
+                  'h': 600
+                }
+              ]
+            },
+          },
+          {
+            'id': '2eabb87dfbcae4',
+            'tagid': 'video',
+            'video': {
+              'api': [
+                1,
+                3
+              ],
+              'mimes': [
+                'video/mp4'
+              ],
+              'minduration': 5,
+              'maxduration': 30,
+              'w': 640,
+              'h': 480,
+              'protocols': [
+                2,
+                3,
+                5,
+                6
+              ]
+            }
+          }
+        ],
+        'site': {
+          'page': 'http://www.test.com',
+          'publisher': {
+            'id': '111'
+          }
+        },
+        'device': {
+          'ua': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36',
+          'dnt': 0,
+          'language': 'en-US',
+          'connectiontype': 0
+        },
+        'user': {},
+        'at': 1,
+        'cur': [
+          'USD'
+        ],
+        'regs': {},
+        'ext': {
+          'ttdprebid': {
+            'ver': 'TTD-PREBID-2019.11.12',
+            'pbjs': '2.31.0'
+          }
+        }
+      },
+      'options': {
+        'withCredentials': true
+      }
+    };
+
+    it('should get the correct bid response', function () {
+      let result = spec.interpretResponse(incoming, serverRequest);
+      expect(result.length).to.equal(2);
+      expect(result).to.deep.equal(expectedBids);
+    });
+  });
+});
diff --git a/test/spec/modules/turktelekomBidAdapter_spec.js b/test/spec/modules/turktelekomBidAdapter_spec.js
deleted file mode 100644
index c4e55178638..00000000000
--- a/test/spec/modules/turktelekomBidAdapter_spec.js
+++ /dev/null
@@ -1,749 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/turktelekomBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-describe('TurkTelekomAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'turktelekom',
-      'params': {
-        'uid': '17'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'uid': 0
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    function parseRequest(url) {
-      const res = {};
-      url.split('&').forEach((it) => {
-        const couple = it.split('=');
-        res[couple[0]] = decodeURIComponent(couple[1]);
-      });
-      return res;
-    }
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://example.com'
-      }
-    };
-    const referrer = bidderRequest.refererInfo.referer;
-
-    let bidRequests = [
-      {
-        'bidder': 'turktelekom',
-        'params': {
-          'uid': '18'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      },
-      {
-        'bidder': 'turktelekom',
-        'params': {
-          'uid': '18'
-        },
-        'adUnitCode': 'adunit-code-2',
-        'sizes': [[728, 90], [300, 250]],
-        'bidId': '3150ccb55da321',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      },
-      {
-        'bidder': 'turktelekom',
-        'params': {
-          'uid': '20'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '42dbe3a7168a6a',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      }
-    ];
-
-    it('should attach valid params to the tag', function () {
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '18');
-      expect(payload).to.have.property('sizes', '300x250,300x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('wrapperType', 'Prebid_js');
-      expect(payload).to.have.property('wrapperVersion', '$prebid.version$');
-    });
-
-    it('sizes must not be duplicated', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '18,18,20');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-    });
-
-    it('pt parameter must be "gross" if params.priceType === "gross"', function () {
-      bidRequests[1].params.priceType = 'gross';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'gross');
-      expect(payload).to.have.property('auids', '18,18,20');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      delete bidRequests[1].params.priceType;
-    });
-
-    it('pt parameter must be "net" or "gross"', function () {
-      bidRequests[1].params.priceType = 'some';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '18,18,20');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      delete bidRequests[1].params.priceType;
-    });
-
-    it('if gdprConsent is present payload must have gdpr params', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
-    });
-
-    it('if gdprApplies is false gdpr_applies must be 0', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: false}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '0');
-    });
-
-    it('if gdprApplies is undefined gdpr_applies must be 1', function () {
-      const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA'}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    const responses = [
-      {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 17, 'h': 250, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 18, 'h': 600, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 17, 'h': 90, 'w': 728}], 'seat': '1'},
-      {'bid': [{'price': 0, 'auid': 19, 'h': 250, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0, 'adm': '<div>test content 5</div>', 'h': 250, 'w': 300}], 'seat': '1'},
-      undefined,
-      {'bid': [], 'seat': '1'},
-      {'seat': '1'},
-    ];
-
-    it('should get correct bid response', function () {
-      const bidRequests = [
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '659423fff799cb',
-          'bidderRequestId': '5f2009617a7c0a',
-          'auctionId': '1cbd2feafe5e8b',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '659423fff799cb',
-          'cpm': 1.15,
-          'creativeId': 17,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': [responses[0]]}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('should get correct multi bid response', function () {
-      const bidRequests = [
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71a5b',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '18'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '4dff80cc4ee346',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '5703af74d0472a',
-          'bidderRequestId': '2c2bb1972df9a',
-          'auctionId': '1fa09aee5c8c99',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '300bfeb0d71a5b',
-          'cpm': 1.15,
-          'creativeId': 17,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '4dff80cc4ee346',
-          'cpm': 0.5,
-          'creativeId': 18,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '5703af74d0472a',
-          'cpm': 0.15,
-          'creativeId': 17,
-          'dealId': undefined,
-          'width': 728,
-          'height': 90,
-          'ad': '<div>test content 3</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': responses.slice(0, 3)}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('handles wrong and nobid responses', function () {
-      const bidRequests = [
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '19'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d7190gf',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '20'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71321',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '25'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '300bfeb0d7183bb',
-          'bidderRequestId': '2c2bb1972d23af',
-          'auctionId': '1fa09aee5c84d34',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const result = spec.interpretResponse({'body': {'seatbid': responses.slice(3)}}, request);
-      expect(result.length).to.equal(0);
-    });
-
-    it('complicated case', function () {
-      const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 17, 'h': 250, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 18, 'h': 600, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 17, 'h': 90, 'w': 728}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 4</div>', 'auid': 17, 'h': 600, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 5</div>', 'auid': 18, 'h': 600, 'w': 350}], 'seat': '1'},
-      ];
-      const bidRequests = [
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '2164be6358b9',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '326bde7fbf69',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '18'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '4e111f1b66e4',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '26d6f897b516',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '44'
-          },
-          'adUnitCode': 'adunit-code-2',
-          'sizes': [[728, 90]],
-          'bidId': '1751cd90161',
-          'bidderRequestId': '106efe3247',
-          'auctionId': '32a1f276cb87cb8',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '2164be6358b9',
-          'cpm': 1.15,
-          'creativeId': 17,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '4e111f1b66e4',
-          'cpm': 0.5,
-          'creativeId': 18,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '26d6f897b516',
-          'cpm': 0.15,
-          'creativeId': 17,
-          'dealId': undefined,
-          'width': 728,
-          'height': 90,
-          'ad': '<div>test content 3</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '326bde7fbf69',
-          'cpm': 0.15,
-          'creativeId': 17,
-          'dealId': undefined,
-          'width': 300,
-          'height': 600,
-          'ad': '<div>test content 4</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('dublicate uids and sizes in one slot', function () {
-      const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 17, 'h': 250, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 17, 'h': 250, 'w': 300}], 'seat': '1'},
-      ];
-      const bidRequests = [
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '5126e301f4be',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '57b2ebe70e16',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        },
-        {
-          'bidder': 'turktelekom',
-          'params': {
-            'uid': '17'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '225fcd44b18c',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '5126e301f4be',
-          'cpm': 1.15,
-          'creativeId': 17,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 1</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        },
-        {
-          'requestId': '57b2ebe70e16',
-          'cpm': 0.5,
-          'creativeId': 17,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<div>test content 2</div>',
-          'bidderCode': 'turktelekom',
-          'currency': 'TRY',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-  });
-
-  it('should get correct video bid response', function () {
-    const bidRequests = [
-      {
-        'bidder': 'turktelekom',
-        'params': {
-          'uid': '25'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '57dfefb80eca',
-        'bidderRequestId': '20394420a762a2',
-        'auctionId': '140132d07b031',
-        'mediaTypes': {
-          'video': {
-            'context': 'instream'
-          }
-        }
-      },
-      {
-        'bidder': 'turktelekom',
-        'params': {
-          'uid': '26'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'e893c787c22dd',
-        'bidderRequestId': '20394420a762a2',
-        'auctionId': '140132d07b031',
-        'mediaTypes': {
-          'video': {
-            'context': 'instream'
-          }
-        }
-      }
-    ];
-    const response = [
-      {'bid': [{'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"123123123\"><\/Ad>\n<\/VAST>', 'auid': 25, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
-      {'bid': [{'price': 1.00, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"345345345\"><\/Ad>\n<\/VAST>', 'auid': 26, content_type: 'video'}], 'seat': '2'}
-    ];
-    const request = spec.buildRequests(bidRequests);
-    const expectedResponse = [
-      {
-        'requestId': '57dfefb80eca',
-        'cpm': 1.15,
-        'creativeId': 25,
-        'dealId': undefined,
-        'width': 300,
-        'height': 600,
-        'bidderCode': 'turktelekom',
-        'currency': 'TRY',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"123123123\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"123123123\"><\/Ad>\n<\/VAST>'
-        }
-      }
-    ];
-
-    const result = spec.interpretResponse({'body': {'seatbid': response}}, request);
-    expect(result).to.deep.equal(expectedResponse);
-  });
-
-  it('should have right renderer in the bid response', function () {
-    const spySetRenderer = sinon.spy();
-    const stubRenderer = {
-      setRender: spySetRenderer
-    };
-    const spyRendererInstall = sinon.spy(function() { return stubRenderer; });
-    const stubRendererConst = {
-      install: spyRendererInstall
-    };
-    const bidRequests = [
-      {
-        'bidder': 'turktelekom',
-        'params': {
-          'uid': '25'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'e6e65553fc8',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3',
-        'mediaTypes': {
-          'video': {
-            'context': 'outstream'
-          }
-        }
-      },
-      {
-        'bidder': 'turktelekom',
-        'params': {
-          'uid': '26'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c8fdcb3f269f',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3'
-      },
-      {
-        'bidder': 'turktelekom',
-        'params': {
-          'uid': '27'
-        },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '1de036c37685',
-        'bidderRequestId': '1380f393215dc7',
-        'auctionId': '10b8d2f3c697e3',
-        'renderer': {}
-      }
-    ];
-    const response = [
-      {'bid': [{'price': 1.15, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"123123123\"><\/Ad>\n<\/VAST>', 'auid': 25, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
-      {'bid': [{'price': 1.00, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"345345345\"><\/Ad>\n<\/VAST>', 'auid': 26, content_type: 'video', w: 300, h: 250}], 'seat': '2'},
-      {'bid': [{'price': 1.20, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"234234234\"><\/Ad>\n<\/VAST>', 'auid': 27, content_type: 'video', w: 300, h: 250}], 'seat': '2'}
-    ];
-    const request = spec.buildRequests(bidRequests);
-    const expectedResponse = [
-      {
-        'requestId': 'e6e65553fc8',
-        'cpm': 1.15,
-        'creativeId': 25,
-        'dealId': undefined,
-        'width': 300,
-        'height': 600,
-        'bidderCode': 'turktelekom',
-        'currency': 'TRY',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"123123123\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"123123123\"><\/Ad>\n<\/VAST>'
-        },
-        'renderer': stubRenderer
-      },
-      {
-        'requestId': 'c8fdcb3f269f',
-        'cpm': 1.00,
-        'creativeId': 26,
-        'dealId': undefined,
-        'width': 300,
-        'height': 250,
-        'bidderCode': 'turktelekom',
-        'currency': 'TRY',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"345345345\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"345345345\"><\/Ad>\n<\/VAST>'
-        },
-        'renderer': stubRenderer
-      },
-      {
-        'requestId': '1de036c37685',
-        'cpm': 1.20,
-        'creativeId': 27,
-        'dealId': undefined,
-        'width': 300,
-        'height': 250,
-        'bidderCode': 'turktelekom',
-        'currency': 'TRY',
-        'mediaType': 'video',
-        'netRevenue': true,
-        'ttl': 360,
-        'vastXml': '<VAST version=\"3.0\">\n<Ad id=\"234234234\"><\/Ad>\n<\/VAST>',
-        'adResponse': {
-          'content': '<VAST version=\"3.0\">\n<Ad id=\"234234234\"><\/Ad>\n<\/VAST>'
-        }
-      }
-    ];
-
-    const result = spec.interpretResponse({'body': {'seatbid': response}}, request, stubRendererConst);
-
-    expect(spySetRenderer.calledTwice).to.equal(true);
-    expect(spySetRenderer.getCall(0).args[0]).to.be.a('function');
-    expect(spySetRenderer.getCall(1).args[0]).to.be.a('function');
-
-    expect(spyRendererInstall.calledTwice).to.equal(true);
-    expect(spyRendererInstall.getCall(0).args[0]).to.deep.equal({
-      id: 'e6e65553fc8',
-      url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
-      loaded: false
-    });
-    expect(spyRendererInstall.getCall(1).args[0]).to.deep.equal({
-      id: 'c8fdcb3f269f',
-      url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
-      loaded: false
-    });
-
-    expect(result).to.deep.equal(expectedResponse);
-  });
-});
diff --git a/test/spec/modules/ucfunnelBidAdapter_spec.js b/test/spec/modules/ucfunnelBidAdapter_spec.js
index b5f29287f81..992708bd2ea 100644
--- a/test/spec/modules/ucfunnelBidAdapter_spec.js
+++ b/test/spec/modules/ucfunnelBidAdapter_spec.js
@@ -1,23 +1,43 @@
 import { expect } from 'chai';
 import { spec } from 'modules/ucfunnelBidAdapter.js';
 import {BANNER, VIDEO, NATIVE} from 'src/mediaTypes.js';
-
 const URL = 'https://hb.aralego.com/header';
 const BIDDER_CODE = 'ucfunnel';
 
 const bidderRequest = {
-  uspConsent: '1YNN'
+  uspConsent: '1YNN',
+  refererInfo: {
+    domain: 'example.com',
+    page: 'http://example.com/index.html'
+  }
 };
 
+const userId = {
+  'criteoId': 'vYlICF9oREZlTHBGRVdrJTJCUUJnc3U2ckNVaXhrV1JWVUZVSUxzZmJlcnJZR0ZxbVhFRnU5bDAlMkJaUWwxWTlNcmdEeHFrJTJGajBWVlV4T3lFQ0FyRVcxNyUyQlIxa0lLSlFhcWJpTm9PSkdPVkx0JTJCbzlQRTQlM0Q',
+  'id5id': {'uid': 'ID5-8ekgswyBTQqnkEKy0ErmeQ1GN5wV4pSmA-RE4eRedA'},
+  'netId': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
+  'parrableId': {'eid': '01.1608624401.fe44bca9b96873084a0d4e9d0ac5729f13790ba8f8e58fa4707b6b3c096df91c6b5f254992bdad4ab1dd4a89919081e9b877d7a039ac3183709277665bac124f28e277d109f0ff965058'},
+  'pubcid': 'd8aa10fa-d86c-451d-aad8-5f16162a9e64',
+  'tdid': 'D6885E90-2A7A-4E0F-87CB-7734ED1B99A3',
+  'haloId': {},
+  'uid2': {'id': 'eb33b0cb-8d35-4722-b9c0-1a31d4064888'},
+  'connectid': '4567'
+}
+
 const validBannerBidReq = {
   bidder: BIDDER_CODE,
   params: {
-    adid: 'ad-34BBD2AA24B678BBFD4E7B9EE3B872D',
-    bidfloor: 1.0
+    adid: 'ad-34BBD2AA24B678BBFD4E7B9EE3B872D'
   },
   sizes: [[300, 250]],
   bidId: '263be71e91dd9d',
   auctionId: '9ad1fa8d-2297-4660-a018-b39945054746',
+  ortb2Imp: {
+    ext: {
+      gpid: '/1111/homepage#div-leftnav'
+    }
+  },
+  userId: userId,
   'schain': {
     'ver': '1.0',
     'complete': 1,
@@ -50,7 +70,8 @@ const validBannerBidRes = {
   adm: '<html style="height:100%"><body style="width:300px;height: 100%;padding:0;margin:0 auto;"><div style="width:100%;height:100%;display:table;"><div style="width:100%;height:100%;display:table-cell;text-align:center;vertical-align:middle;"><a href="//www.ucfunnel.com/" target="_blank"><img src="//cdn.aralego.net/ucfad/house/ucf/AdGent-300x250.jpg" width="300px" height="250px" align="middle" style="border:none"></a></div></div></body></html>',
   cpm: 1.01,
   height: 250,
-  width: 300
+  width: 300,
+  crid: 'test-crid'
 };
 
 const invalidBannerBidRes = '';
@@ -112,6 +133,13 @@ const validNativeBidRes = {
   width: 1
 };
 
+const gdprConsent = {
+  consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+  vendorData: {},
+  gdprApplies: true,
+  apiVersion: 2
+};
+
 describe('ucfunnel Adapter', function () {
   describe('request', function () {
     it('should validate bid request', function () {
@@ -132,6 +160,11 @@ describe('ucfunnel Adapter', function () {
       expect(request[0].bidRequest).to.equal(validBannerBidReq);
     });
 
+    it('should set gpid if configured', function () {
+      const data = request[0].data;
+      expect(data.gpid).to.equal('/1111/homepage#div-leftnav');
+    });
+
     it('should attach request data', function () {
       const data = request[0].data;
       const [ width, height ] = validBannerBidReq.sizes[0];
@@ -139,6 +172,7 @@ describe('ucfunnel Adapter', function () {
       expect(data.adid).to.equal('ad-34BBD2AA24B678BBFD4E7B9EE3B872D');
       expect(data.w).to.equal(width);
       expect(data.h).to.equal(height);
+      expect(data.eids).to.equal('uid2,eb33b0cb-8d35-4722-b9c0-1a31d4064888!verizonMediaId,4567');
       expect(data.schain).to.equal('1.0,1!exchange1.com,1234,1,bid-request-1,publisher,publisher.com');
     });
 
@@ -146,16 +180,51 @@ describe('ucfunnel Adapter', function () {
       const width = 640;
       const height = 480;
       validBannerBidReq.sizes = [[ width, height ]];
-      const requests = spec.buildRequests([ validBannerBidReq ]);
+      const requests = spec.buildRequests([ validBannerBidReq ], bidderRequest);
       const data = requests[0].data;
       expect(data.w).to.equal(width);
       expect(data.h).to.equal(height);
     });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, validBannerBidReq);
+      bid.getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 2.02
+        }
+      };
+      const requests = spec.buildRequests([ bid ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.fp).to.equal(2.02);
+    });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, validBannerBidReq);
+      bid.params.bidfloor = 2.01;
+      const requests = spec.buildRequests([ bid ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.fp).to.equal(2.01);
+    });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, validBannerBidReq);
+      bid.getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 2.02
+        }
+      };
+      bid.params.bidfloor = 2.01;
+      const requests = spec.buildRequests([ bid ], bidderRequest);
+      const data = requests[0].data;
+      expect(data.fp).to.equal(2.01);
+    });
   });
 
   describe('interpretResponse', function () {
     describe('should support banner', function () {
-      const request = spec.buildRequests([ validBannerBidReq ]);
+      const request = spec.buildRequests([ validBannerBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: validBannerBidRes}, request[0]);
       it('should build bid array for banner', function () {
         expect(result.length).to.equal(1);
@@ -174,7 +243,7 @@ describe('ucfunnel Adapter', function () {
     });
 
     describe('handle banner no ad', function () {
-      const request = spec.buildRequests([ validBannerBidReq ]);
+      const request = spec.buildRequests([ validBannerBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: invalidBannerBidRes}, request[0]);
       it('should build bid array for banner', function () {
         expect(result.length).to.equal(1);
@@ -192,7 +261,7 @@ describe('ucfunnel Adapter', function () {
     });
 
     describe('handle banner cpm under bidfloor', function () {
-      const request = spec.buildRequests([ validBannerBidReq ]);
+      const request = spec.buildRequests([ validBannerBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: invalidBannerBidRes}, request[0]);
       it('should build bid array for banner', function () {
         expect(result.length).to.equal(1);
@@ -210,7 +279,7 @@ describe('ucfunnel Adapter', function () {
     });
 
     describe('should support video', function () {
-      const request = spec.buildRequests([ validVideoBidReq ]);
+      const request = spec.buildRequests([ validVideoBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: validVideoBidRes}, request[0]);
       it('should build bid array', function () {
         expect(result.length).to.equal(1);
@@ -230,7 +299,7 @@ describe('ucfunnel Adapter', function () {
     });
 
     describe('should support native', function () {
-      const request = spec.buildRequests([ validNativeBidReq ]);
+      const request = spec.buildRequests([ validNativeBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: validNativeBidRes}, request[0]);
       it('should build bid array', function () {
         expect(result.length).to.equal(1);
@@ -253,18 +322,18 @@ describe('ucfunnel Adapter', function () {
 
   describe('cookie sync', function () {
     describe('cookie sync iframe', function () {
-      const result = spec.getUserSyncs({'iframeEnabled': true});
+      const result = spec.getUserSyncs({'iframeEnabled': true}, null, gdprConsent);
 
       it('should return cookie sync iframe info', function () {
         expect(result[0].type).to.equal('iframe');
-        expect(result[0].url).to.equal('https://cdn.aralego.net/ucfad/cookie/sync.html');
+        expect(result[0].url).to.equal('https://cdn.aralego.net/ucfad/cookie/sync.html?gdpr=1&euconsent-v2=CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA&');
       });
     });
     describe('cookie sync image', function () {
-      const result = spec.getUserSyncs({'pixelEnabled': true});
+      const result = spec.getUserSyncs({'pixelEnabled': true}, null, gdprConsent);
       it('should return cookie sync image info', function () {
         expect(result[0].type).to.equal('image');
-        expect(result[0].url).to.equal('https://sync.aralego.com/idSync');
+        expect(result[0].url).to.equal('https://sync.aralego.com/idSync?gdpr=1&euconsent-v2=CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA&');
       });
     });
   });
diff --git a/test/spec/modules/uid2IdSystem_spec.js b/test/spec/modules/uid2IdSystem_spec.js
new file mode 100644
index 00000000000..b33e8cda501
--- /dev/null
+++ b/test/spec/modules/uid2IdSystem_spec.js
@@ -0,0 +1,310 @@
+import {coreStorage, init, setSubmoduleRegistry, requestBidsHook} from 'modules/userId/index.js';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+import { uid2IdSubmodule } from 'modules/uid2IdSystem.js';
+import 'src/prebid.js';
+import { getGlobal } from 'src/prebidGlobal.js';
+import { server } from 'test/mocks/xhr.js';
+import { configureTimerInterceptors } from 'test/mocks/timers.js';
+import {hook} from 'src/hook.js';
+import {uninstall as uninstallGdprEnforcement} from 'modules/gdprEnforcement.js';
+
+let expect = require('chai').expect;
+
+const clearTimersAfterEachTest = true;
+const debugOutput = () => {};
+
+const expireCookieDate = 'Thu, 01 Jan 1970 00:00:01 GMT';
+const msIn12Hours = 60 * 60 * 12 * 1000;
+const moduleCookieName = '__uid2_advertising_token';
+const publisherCookieName = '__UID2_SERVER_COOKIE';
+const auctionDelayMs = 10;
+const legacyConfigParams = null;
+const serverCookieConfigParams = { uid2ServerCookie: publisherCookieName }
+const getFutureCookieExpiry = () => new Date(Date.now() + msIn12Hours).toUTCString();
+const setPublisherCookie = (token) => coreStorage.setCookie(publisherCookieName, JSON.stringify(token), getFutureCookieExpiry());
+
+const makePrebidIdentityContainer = (token) => ({uid2: {id: token}});
+const makePrebidConfig = (params = null, extraSettings = {}, debug = false) => ({
+  userSync: { auctionDelay: auctionDelayMs, userIds: [{name: 'uid2', params}] }, debug, ...extraSettings
+});
+
+const initialToken = `initial-advertising-token`;
+const legacyToken = 'legacy-advertising-token';
+const refreshedToken = 'refreshed-advertising-token';
+const makeUid2Token = (token = initialToken, shouldRefresh = false, expired = false) => ({
+  advertising_token: token,
+  refresh_token: 'fake-refresh-token',
+  identity_expires: expired ? Date.now() - 1000 : Date.now() + 60 * 60 * 1000,
+  refresh_from: shouldRefresh ? Date.now() - 1000 : Date.now() + 60 * 1000,
+  refresh_expires: Date.now() + 24 * 60 * 60 * 1000, // 24 hours
+  refresh_response_key: 'wR5t6HKMfJ2r4J7fEGX9Gw==',
+});
+const expectInitialToken = (bid) => expect(bid?.userId ?? {}).to.deep.include(makePrebidIdentityContainer(initialToken));
+const expectRefreshedToken = (bid) => expect(bid?.userId ?? {}).to.deep.include(makePrebidIdentityContainer(refreshedToken));
+const expectNoIdentity = (bid) => expect(bid).to.not.haveOwnProperty('userId');
+const expectGlobalToHaveRefreshedIdentity = () => expect(getGlobal().getUserIds()).to.deep.include(makePrebidIdentityContainer(refreshedToken));
+const expectGlobalToHaveNoUid2 = () => expect(getGlobal().getUserIds()).to.not.haveOwnProperty('uid2');
+const expectLegacyToken = (bid) => expect(bid.userId).to.deep.include(makePrebidIdentityContainer(legacyToken));
+const expectNoLegacyToken = (bid) => expect(bid.userId).to.not.deep.include(makePrebidIdentityContainer(legacyToken));
+const expectModuleCookieEmptyOrMissing = () => expect(coreStorage.getCookie(moduleCookieName)).to.be.null;
+const expectModuleCookieToContain = (initialIdentity, latestIdentity) => {
+  const cookie = JSON.parse(coreStorage.getCookie(moduleCookieName));
+  if (initialIdentity) expect(cookie.originalToken.advertising_token).to.equal(initialIdentity);
+  if (latestIdentity) expect(cookie.latestToken.advertising_token).to.equal(latestIdentity);
+}
+
+const apiUrl = 'https://prod.uidapi.com/v2/token/refresh';
+const headers = { 'Content-Type': 'application/json' };
+const makeSuccessResponseBody = () => btoa(JSON.stringify({ status: 'success', body: { ...makeUid2Token(), advertising_token: refreshedToken } }));
+const configureUid2Response = (httpStatus, response) => server.respondWith('POST', apiUrl, (xhr) => xhr.respond(httpStatus, headers, response));
+const configureUid2ApiSuccessResponse = () => configureUid2Response(200, makeSuccessResponseBody());
+const configureUid2ApiFailResponse = () => configureUid2Response(500, 'Error');
+
+const respondAfterDelay = (delay) => new Promise((resolve) => setTimeout(() => {
+  server.respond();
+  setTimeout(() => resolve());
+}, delay));
+
+const runAuction = async () => {
+  const adUnits = [{
+    code: 'adUnit-code',
+    mediaTypes: {banner: {}, native: {}},
+    sizes: [[300, 200], [300, 600]],
+    bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}]
+  }];
+  return new Promise(function(resolve) {
+    requestBidsHook(function() {
+      resolve(adUnits[0].bids[0]);
+    }, {adUnits});
+  });
+}
+
+// Runs the provided test twice - once with a successful API mock, once with one which returns a server error
+const testApiSuccessAndFailure = (act, testDescription, failTestDescription, only = false) => {
+  const testFn = only ? it.only : it;
+  testFn(`API responds successfully: ${testDescription}`, async function() {
+    configureUid2ApiSuccessResponse();
+    await act(true);
+  });
+  testFn(`API responds with an error: ${failTestDescription ?? testDescription}`, async function() {
+    configureUid2ApiFailResponse();
+    await act(false);
+  });
+}
+describe(`UID2 module`, function () {
+  let suiteSandbox, testSandbox, timerSpy, fullTestTitle, restoreSubtleToUndefined = false;
+  before(function () {
+    timerSpy = configureTimerInterceptors(debugOutput);
+    hook.ready();
+    uninstallGdprEnforcement();
+
+    suiteSandbox = sinon.sandbox.create();
+    // I'm unable to find an authoritative source, but apparently subtle isn't available in some test stacks for security reasons.
+    // I've confirmed it's available in Firefox since v34 (it seems to be unavailable on BrowserStack in Firefox v106).
+    if (typeof window.crypto.subtle === 'undefined') {
+      restoreSubtleToUndefined = true;
+      window.crypto.subtle = { importKey: () => {}, decrypt: () => {} };
+    }
+    suiteSandbox.stub(window.crypto.subtle, 'importKey').callsFake(() => Promise.resolve());
+    suiteSandbox.stub(window.crypto.subtle, 'decrypt').callsFake((settings, key, data) => Promise.resolve(new Uint8Array([...settings.iv, ...data])));
+  });
+
+  after(function () {
+    suiteSandbox.restore();
+    timerSpy.restore();
+    if (restoreSubtleToUndefined) window.crypto.subtle = undefined;
+  });
+
+  const getFullTestTitle = (test) => `${test.parent.title ? getFullTestTitle(test.parent) + ' | ' : ''}${test.title}`;
+  beforeEach(function () {
+    debugOutput(`----------------- START TEST ------------------`);
+    fullTestTitle = getFullTestTitle(this.test.ctx.currentTest);
+    debugOutput(fullTestTitle);
+    testSandbox = sinon.sandbox.create();
+    testSandbox.stub(utils, 'logWarn');
+
+    init(config);
+    setSubmoduleRegistry([uid2IdSubmodule]);
+  });
+
+  afterEach(async function() {
+    $$PREBID_GLOBAL$$.requestBids.removeAll();
+    config.resetConfig();
+    testSandbox.restore();
+    if (timerSpy.timers.length > 0) {
+      if (clearTimersAfterEachTest) {
+        debugOutput(`Cancelling ${timerSpy.timers.length} still-active timers.`);
+        timerSpy.clearAllActiveTimers();
+      } else {
+        debugOutput(`Waiting on ${timerSpy.timers.length} still-active timers...`, timerSpy.timers);
+        await timerSpy.waitAllActiveTimers();
+      }
+    }
+    coreStorage.setCookie(moduleCookieName, '', expireCookieDate);
+    coreStorage.setCookie(publisherCookieName, '', expireCookieDate);
+
+    debugOutput('----------------- END TEST ------------------');
+  });
+
+  describe('Configuration', function() {
+    it('When no baseUrl is provided in config, the module calls the production endpoint', function() {
+      const uid2Token = makeUid2Token(initialToken, true, true);
+      config.setConfig(makePrebidConfig({uid2Token}));
+      expect(server.requests[0]?.url).to.have.string('https://prod.uidapi.com/');
+    });
+
+    it('When a baseUrl is provided in config, the module calls the provided endpoint', function() {
+      const uid2Token = makeUid2Token(initialToken, true, true);
+      config.setConfig(makePrebidConfig({uid2Token, uid2ApiBase: 'https://operator-integ.uidapi.com'}));
+      expect(server.requests[0]?.url).to.have.string('https://operator-integ.uidapi.com/');
+    });
+  });
+
+  it('When a legacy value is provided directly in configuration, it is passed on', async function() {
+    const valueConfig = makePrebidConfig();
+    valueConfig.userSync.userIds[0].value = {uid2: {id: legacyToken}}
+    config.setConfig(valueConfig);
+    const bid = await runAuction();
+
+    expectLegacyToken(bid);
+  });
+
+  // These tests cover 'legacy' cookies - i.e. cookies set with just the uid2 advertising token, which was how some previous integrations worked.
+  // Some users might still have this cookie, and the module should use that token if a newer one isn't provided.
+  // This should cover older integrations where the server is setting this legacy cookie and expecting the module to pass it on.
+  describe('When a legacy cookie exists', function () {
+    // Creates a test which sets the legacy cookie, configures the UID2 module with provided params, runs an
+    const createLegacyTest = function(params, bidAssertions) {
+      return async function() {
+        coreStorage.setCookie(moduleCookieName, legacyToken, getFutureCookieExpiry());
+        config.setConfig(makePrebidConfig(params));
+
+        const bid = await runAuction();
+        bidAssertions.forEach(function(assertion) { assertion(bid); });
+      }
+    };
+
+    it('and a legacy config is used, it should provide the legacy cookie',
+      createLegacyTest(legacyConfigParams, [expectLegacyToken]));
+    it('and a server cookie config is used without a valid server cookie, it should provide the legacy cookie',
+      createLegacyTest(serverCookieConfigParams, [expectLegacyToken]));
+    it('and a server cookie is used with a valid server cookie, it should provide the server cookie',
+      async function() { setPublisherCookie(makeUid2Token()); await createLegacyTest(serverCookieConfigParams, [expectInitialToken, expectNoLegacyToken])(); });
+    it('and a token is provided in config, it should provide the config token',
+      createLegacyTest({uid2Token: makeUid2Token()}, [expectInitialToken, expectNoLegacyToken]));
+  });
+
+  // This setup runs all of the functional tests with both types of config - the full token response in params, or a server cookie with the cookie name provided
+  let scenarios = [
+    {
+      name: 'Token provided in config call',
+      setConfig: (token, extraConfig = {}) => config.setConfig(makePrebidConfig({uid2Token: token}, extraConfig)),
+    },
+    {
+      name: 'Token provided in server-set cookie',
+      setConfig: (token, extraConfig) => {
+        setPublisherCookie(token);
+        config.setConfig(makePrebidConfig(serverCookieConfigParams, extraConfig));
+      },
+    }
+  ]
+
+  scenarios.forEach(function(scenario) {
+    describe(scenario.name, function() {
+      describe(`When an expired token which can be refreshed is provided`, function() {
+        describe('When the refresh is available in time', function() {
+          testApiSuccessAndFailure(async function(apiSucceeds) {
+            scenario.setConfig(makeUid2Token(initialToken, true, true));
+            respondAfterDelay(auctionDelayMs / 10);
+            const bid = await runAuction();
+
+            if (apiSucceeds) expectRefreshedToken(bid);
+            else expectNoIdentity(bid);
+          }, 'it should be used in the auction', 'the auction should have no uid2');
+
+          testApiSuccessAndFailure(async function(apiSucceeds) {
+            scenario.setConfig(makeUid2Token(initialToken, true, true));
+            respondAfterDelay(auctionDelayMs / 10);
+
+            await runAuction();
+            if (apiSucceeds) {
+              expectModuleCookieToContain(initialToken, refreshedToken);
+            } else {
+              expectModuleCookieEmptyOrMissing();
+            }
+          }, 'the refreshed token should be stored in the module cookie', 'the module cookie should not be set');
+        });
+        describe(`when the response doesn't arrive before the auction timer`, function() {
+          testApiSuccessAndFailure(async function() {
+            scenario.setConfig(makeUid2Token(initialToken, true, true));
+            const bid = await runAuction();
+            expectNoIdentity(bid);
+          }, 'it should run the auction');
+
+          testApiSuccessAndFailure(async function(apiSucceeds) {
+            scenario.setConfig(makeUid2Token(initialToken, true, true));
+            const promise = respondAfterDelay(auctionDelayMs * 2);
+
+            const bid = await runAuction();
+            expectNoIdentity(bid);
+            expectGlobalToHaveNoUid2();
+            await promise;
+            if (apiSucceeds) expectGlobalToHaveRefreshedIdentity();
+            else expectGlobalToHaveNoUid2();
+          }, 'it should update the userId after the auction', 'there should be no global identity');
+        })
+        describe('and there is a refreshed token in the module cookie', function() {
+          it('the refreshed value from the cookie is used', async function() {
+            const initialIdentity = makeUid2Token(initialToken, true, true);
+            const refreshedIdentity = makeUid2Token(refreshedToken);
+            const moduleCookie = {originalToken: initialIdentity, latestToken: refreshedIdentity};
+            coreStorage.setCookie(moduleCookieName, JSON.stringify(moduleCookie), getFutureCookieExpiry());
+            scenario.setConfig(initialIdentity);
+
+            const bid = await runAuction();
+            expectRefreshedToken(bid);
+          });
+        })
+      });
+
+      describe(`When a current token is provided`, function() {
+        beforeEach(function() {
+          scenario.setConfig(makeUid2Token());
+        });
+
+        it('it should use the token in the auction', async function() {
+          const bid = await runAuction();
+          expectInitialToken(bid);
+        });
+      });
+
+      describe(`When a current token which should be refreshed is provided, and the auction is set to run immediately`, function() {
+        beforeEach(function() {
+          scenario.setConfig(makeUid2Token(initialToken, true), {auctionDelay: 0, syncDelay: 1});
+        });
+        testApiSuccessAndFailure(async function() {
+          respondAfterDelay(10);
+          const bid = await runAuction();
+          expectInitialToken(bid);
+        }, 'it should not be refreshed before the auction runs');
+
+        testApiSuccessAndFailure(async function(success) {
+          const promise = respondAfterDelay(1);
+          await runAuction();
+          await promise;
+          if (success) {
+            expectModuleCookieToContain(initialToken, refreshedToken);
+          } else {
+            expectModuleCookieToContain(initialToken, initialToken);
+          }
+        }, 'the refreshed token should be stored in the module cookie after the auction runs', 'the module cookie should only have the original token');
+
+        it('it should use the current token in the auction', async function() {
+          const bid = await runAuction();
+          expectInitialToken(bid);
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/underdogmediaBidAdapter_spec.js b/test/spec/modules/underdogmediaBidAdapter_spec.js
index aeb9f56c851..70d09513f27 100644
--- a/test/spec/modules/underdogmediaBidAdapter_spec.js
+++ b/test/spec/modules/underdogmediaBidAdapter_spec.js
@@ -276,6 +276,7 @@ describe('UnderdogMedia adapter', function () {
             mids: [
               {
                 ad_code_html: 'ad_code_html',
+                advertiser_domains: ['domain1'],
                 cpm: 2.5,
                 height: '600',
                 mid: '32634',
@@ -300,6 +301,7 @@ describe('UnderdogMedia adapter', function () {
 
         expect(bids).to.be.lengthOf(2);
 
+        expect(bids[0].meta.advertiserDomains).to.deep.equal(['domain1'])
         expect(bids[0].bidderCode).to.equal('underdogmedia');
         expect(bids[0].cpm).to.equal(2.5);
         expect(bids[0].width).to.equal('160');
diff --git a/test/spec/modules/undertoneBidAdapter_spec.js b/test/spec/modules/undertoneBidAdapter_spec.js
index e4218019e0d..8766307b3bd 100644
--- a/test/spec/modules/undertoneBidAdapter_spec.js
+++ b/test/spec/modules/undertoneBidAdapter_spec.js
@@ -1,5 +1,7 @@
-import { expect } from 'chai';
-import { spec } from 'modules/undertoneBidAdapter.js';
+import {expect} from 'chai';
+import {spec} from 'modules/undertoneBidAdapter.js';
+import {BANNER, VIDEO} from '../../../src/mediaTypes';
+import {deepClone} from '../../../src/utils';
 
 const URL = 'https://hb.undertone.com/hb';
 const BIDDER_CODE = 'undertone';
@@ -24,18 +26,94 @@ const invalidBidReq = {
   auctionId: '9ad1fa8d-2297-4660-a018-b39945054746'
 };
 
-const bidReq = [{
+const videoBidReq = [{
   adUnitCode: 'div-gpt-ad-1460505748561-0',
   bidder: BIDDER_CODE,
   params: {
     placementId: '10433394',
+    publisherId: 12345,
+    video: {
+      id: 123,
+      skippable: true,
+      playbackMethod: 2,
+      maxDuration: 30
+    }
+  },
+  mediaTypes: {video: {
+    context: 'outstream',
+    playerSize: [640, 480]
+  }},
+  sizes: [[300, 250], [300, 600]],
+  bidId: '263be71e91dd9d',
+  auctionId: '9ad1fa8d-2297-4660-a018-b39945054746'
+},
+{
+  adUnitCode: 'div-gpt-ad-1460505748561-1',
+  bidder: BIDDER_CODE,
+  params: {
+    placementId: '10433395',
     publisherId: 12345
   },
+  mediaTypes: {video: {
+    context: 'outstream',
+    playerSize: [640, 480]
+  }},
+  sizes: [[300, 250], [300, 600]],
+  bidId: '263be71e91dd9d',
+  auctionId: '9ad1fa8d-2297-4660-a018-b39945054746'
+}];
+const schainObj = {
+  'ver': '1.0',
+  'complete': 1,
+  'nodes': [
+    {
+      'asi': 'indirectseller.com',
+      'sid': '00001',
+      'hp': 1
+    },
+
+    {
+      'asi': 'indirectseller-2.com',
+      'sid': '00002',
+      'hp': 2
+    }
+  ]
+};
+const bidReq = [{
+  adUnitCode: 'div-gpt-ad-1460505748561-0',
+  bidder: BIDDER_CODE,
+  params: {
+    placementId: '10433394',
+    publisherId: 12345,
+  },
   sizes: [[300, 250], [300, 600]],
   bidId: '263be71e91dd9d',
   auctionId: '9ad1fa8d-2297-4660-a018-b39945054746'
 },
 {
+  adUnitCode: 'div-gpt-ad-1460505748561-0',
+  bidder: BIDDER_CODE,
+  params: {
+    publisherId: 12345
+  },
+  sizes: [[1, 1]],
+  bidId: '453cf42d72bb3c',
+  auctionId: '6c22f5a5-59df-4dc6-b92c-f433bcf0a874',
+  schain: schainObj
+}];
+
+const supplyChainedBidReqs = [{
+  adUnitCode: 'div-gpt-ad-1460505748561-0',
+  bidder: BIDDER_CODE,
+  params: {
+    placementId: '10433394',
+    publisherId: 12345,
+  },
+  sizes: [[300, 250], [300, 600]],
+  bidId: '263be71e91dd9d',
+  auctionId: '9ad1fa8d-2297-4660-a018-b39945054746',
+  schain: schainObj
+}, {
   adUnitCode: 'div-gpt-ad-1460505748561-0',
   bidder: BIDDER_CODE,
   params: {
@@ -58,7 +136,8 @@ const bidReqUserIds = [{
   userId: {
     idl_env: '1111',
     tdid: '123456',
-    digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}}
+    digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
+    id5id: { uid: '1111' }
   }
 },
 {
@@ -73,13 +152,13 @@ const bidReqUserIds = [{
 
 const bidderReq = {
   refererInfo: {
-    referer: 'http://prebid.org/dev-docs/bidder-adaptor.html'
+    topmostLocation: 'http://prebid.org/dev-docs/bidder-adaptor.html'
   }
 };
 
 const bidderReqGdpr = {
   refererInfo: {
-    referer: 'http://prebid.org/dev-docs/bidder-adaptor.html'
+    topmostLocation: 'http://prebid.org/dev-docs/bidder-adaptor.html'
   },
   gdprConsent: {
     gdprApplies: true,
@@ -89,14 +168,14 @@ const bidderReqGdpr = {
 
 const bidderReqCcpa = {
   refererInfo: {
-    referer: 'http://prebid.org/dev-docs/bidder-adaptor.html'
+    topmostLocation: 'http://prebid.org/dev-docs/bidder-adaptor.html'
   },
   uspConsent: 'NY12'
 };
 
 const bidderReqCcpaAndGdpr = {
   refererInfo: {
-    referer: 'http://prebid.org/dev-docs/bidder-adaptor.html'
+    topmostLocation: 'http://prebid.org/dev-docs/bidder-adaptor.html'
   },
   gdprConsent: {
     gdprApplies: true,
@@ -147,6 +226,20 @@ const bidResArray = [
     ttl: 360
   }
 ];
+const bidVideoResponse = [
+  {
+    ad: '<xml />',
+    bidRequestId: '263be71e91dd9d',
+    cpm: 100,
+    adId: '123abc',
+    currency: 'USD',
+    mediaType: 'video',
+    netRevenue: true,
+    width: 300,
+    height: 250,
+    ttl: 360
+  }
+];
 
 let element;
 let sandbox;
@@ -185,20 +278,83 @@ describe('Undertone Adapter', () => {
       sandbox.restore();
     });
 
+    describe('getFloor', function () {
+      it('should send 0 floor when getFloor is undefined', function() {
+        const request = spec.buildRequests(videoBidReq, bidderReq);
+        const bidReq = JSON.parse(request.data)['x-ut-hb-params'][0];
+        expect(bidReq.mediaType).to.deep.equal(VIDEO);
+        expect(bidReq.bidfloor).to.deep.equal(0);
+      });
+      it('should send mocked floor when defined on video media-type', function() {
+        const clonedVideoBidReqArr = deepClone(videoBidReq);
+        const mockedFloorResponse = {
+          currency: 'USD',
+          floor: 2.3
+        };
+        clonedVideoBidReqArr[1].getFloor = () => mockedFloorResponse;
+
+        const request = spec.buildRequests(clonedVideoBidReqArr, bidderReq);
+        const bidReq1 = JSON.parse(request.data)['x-ut-hb-params'][0];
+        const bidReq2 = JSON.parse(request.data)['x-ut-hb-params'][1];
+        expect(bidReq1.mediaType).to.deep.equal(VIDEO);
+        expect(bidReq1.bidfloor).to.deep.equal(0);
+
+        expect(bidReq2.mediaType).to.deep.equal(VIDEO);
+        expect(bidReq2.bidfloor).to.deep.equal(mockedFloorResponse.floor);
+      });
+      it('should send mocked floor on banner media-type', function() {
+        const clonedValidBidReqArr = [deepClone(validBidReq)];
+        const mockedFloorResponse = {
+          currency: 'USD',
+          floor: 2.3
+        };
+        clonedValidBidReqArr[0].getFloor = () => mockedFloorResponse;
+
+        const request = spec.buildRequests(clonedValidBidReqArr, bidderReq);
+        const bidReq = JSON.parse(request.data)['x-ut-hb-params'][0];
+        expect(bidReq.mediaType).to.deep.equal(BANNER);
+        expect(bidReq.bidfloor).to.deep.equal(mockedFloorResponse.floor);
+      });
+      it('should send 0 floor on invalid currency', function() {
+        const clonedValidBidReqArr = [deepClone(validBidReq)];
+        const mockedFloorResponse = {
+          currency: 'EUR',
+          floor: 2.3
+        };
+        clonedValidBidReqArr[0].getFloor = () => mockedFloorResponse;
+
+        const request = spec.buildRequests(clonedValidBidReqArr, bidderReq);
+        const bidReq = JSON.parse(request.data)['x-ut-hb-params'][0];
+        expect(bidReq.mediaType).to.deep.equal(BANNER);
+        expect(bidReq.bidfloor).to.deep.equal(0);
+      });
+    });
+    describe('supply chain', function () {
+      it('should send supply chain if found on first bid', function () {
+        const request = spec.buildRequests(supplyChainedBidReqs, bidderReq);
+        const commons = JSON.parse(request.data)['commons'];
+        expect(commons.schain).to.deep.equal(schainObj);
+      });
+      it('should not send supply chain if not found on first bid', function () {
+        const request = spec.buildRequests(bidReq, bidderReq);
+        const commons = JSON.parse(request.data)['commons'];
+        expect(commons.schain).to.not.exist;
+      });
+    });
     it('should send request to correct url via POST not in GDPR or CCPA', function () {
       const request = spec.buildRequests(bidReq, bidderReq);
-      const domainStart = bidderReq.refererInfo.referer.indexOf('//');
-      const domainEnd = bidderReq.refererInfo.referer.indexOf('/', domainStart + 2);
-      const domain = bidderReq.refererInfo.referer.substring(domainStart + 2, domainEnd);
+      const domainStart = bidderReq.refererInfo.topmostLocation.indexOf('//');
+      const domainEnd = bidderReq.refererInfo.topmostLocation.indexOf('/', domainStart + 2);
+      const domain = bidderReq.refererInfo.topmostLocation.substring(domainStart + 2, domainEnd);
       const REQ_URL = `${URL}?pid=${bidReq[0].params.publisherId}&domain=${domain}`;
       expect(request.url).to.equal(REQ_URL);
       expect(request.method).to.equal('POST');
     });
     it('should send request to correct url via POST when in GDPR', function () {
       const request = spec.buildRequests(bidReq, bidderReqGdpr);
-      const domainStart = bidderReq.refererInfo.referer.indexOf('//');
-      const domainEnd = bidderReq.refererInfo.referer.indexOf('/', domainStart + 2);
-      const domain = bidderReq.refererInfo.referer.substring(domainStart + 2, domainEnd);
+      const domainStart = bidderReq.refererInfo.topmostLocation.indexOf('//');
+      const domainEnd = bidderReq.refererInfo.topmostLocation.indexOf('/', domainStart + 2);
+      const domain = bidderReq.refererInfo.topmostLocation.substring(domainStart + 2, domainEnd);
       let gdpr = bidderReqGdpr.gdprConsent.gdprApplies ? 1 : 0;
       const REQ_URL = `${URL}?pid=${bidReq[0].params.publisherId}&domain=${domain}&gdpr=${gdpr}&gdprstr=${bidderReqGdpr.gdprConsent.consentString}`;
       expect(request.url).to.equal(REQ_URL);
@@ -206,9 +362,9 @@ describe('Undertone Adapter', () => {
     });
     it('should send request to correct url via POST when in CCPA', function () {
       const request = spec.buildRequests(bidReq, bidderReqCcpa);
-      const domainStart = bidderReq.refererInfo.referer.indexOf('//');
-      const domainEnd = bidderReq.refererInfo.referer.indexOf('/', domainStart + 2);
-      const domain = bidderReq.refererInfo.referer.substring(domainStart + 2, domainEnd);
+      const domainStart = bidderReq.refererInfo.topmostLocation.indexOf('//');
+      const domainEnd = bidderReq.refererInfo.topmostLocation.indexOf('/', domainStart + 2);
+      const domain = bidderReq.refererInfo.topmostLocation.substring(domainStart + 2, domainEnd);
       let ccpa = bidderReqCcpa.uspConsent;
       const REQ_URL = `${URL}?pid=${bidReq[0].params.publisherId}&domain=${domain}&ccpa=${ccpa}`;
       expect(request.url).to.equal(REQ_URL);
@@ -216,9 +372,9 @@ describe('Undertone Adapter', () => {
     });
     it('should send request to correct url via POST when in GDPR and CCPA', function () {
       const request = spec.buildRequests(bidReq, bidderReqCcpaAndGdpr);
-      const domainStart = bidderReq.refererInfo.referer.indexOf('//');
-      const domainEnd = bidderReq.refererInfo.referer.indexOf('/', domainStart + 2);
-      const domain = bidderReq.refererInfo.referer.substring(domainStart + 2, domainEnd);
+      const domainStart = bidderReq.refererInfo.topmostLocation.indexOf('//');
+      const domainEnd = bidderReq.refererInfo.topmostLocation.indexOf('/', domainStart + 2);
+      const domain = bidderReq.refererInfo.topmostLocation.substring(domainStart + 2, domainEnd);
       let ccpa = bidderReqCcpaAndGdpr.uspConsent;
       let gdpr = bidderReqCcpaAndGdpr.gdprConsent.gdprApplies ? 1 : 0;
       const REQ_URL = `${URL}?pid=${bidReq[0].params.publisherId}&domain=${domain}&gdpr=${gdpr}&gdprstr=${bidderReqGdpr.gdprConsent.consentString}&ccpa=${ccpa}`;
@@ -241,6 +397,23 @@ describe('Undertone Adapter', () => {
       expect(bid2.publisherId).to.equal(12345);
       expect(bid2.params).to.be.an('object');
     });
+    it('should send video fields correctly', function () {
+      const request = spec.buildRequests(videoBidReq, bidderReq);
+      const bidVideo = JSON.parse(request.data)['x-ut-hb-params'][0];
+      const bidVideo2 = JSON.parse(request.data)['x-ut-hb-params'][1];
+
+      expect(bidVideo.mediaType).to.equal('video');
+      expect(bidVideo.video).to.be.an('object');
+      expect(bidVideo.video.playerSize).to.be.an('array');
+      expect(bidVideo.video.streamType).to.equal('outstream');
+      expect(bidVideo.video.playbackMethod).to.equal(2);
+      expect(bidVideo.video.maxDuration).to.equal(30);
+      expect(bidVideo.video.skippable).to.equal(true);
+
+      expect(bidVideo2.video.skippable).to.equal(null);
+      expect(bidVideo2.video.maxDuration).to.equal(null);
+      expect(bidVideo2.video.playbackMethod).to.equal(null);
+    });
     it('should send all userIds data to server', function () {
       const request = spec.buildRequests(bidReqUserIds, bidderReq);
       const bidCommons = JSON.parse(request.data)['commons'];
@@ -249,6 +422,7 @@ describe('Undertone Adapter', () => {
       expect(bidCommons.uids.tdid).to.equal('123456');
       expect(bidCommons.uids.idl_env).to.equal('1111');
       expect(bidCommons.uids.digitrustid.data.id).to.equal('DTID');
+      expect(bidCommons.uids.id5id.uid).to.equal('1111');
     });
     it('should send page sizes sizes correctly', function () {
       const request = spec.buildRequests(bidReqUserIds, bidderReq);
@@ -289,6 +463,7 @@ describe('Undertone Adapter', () => {
       expect(bid.cpm).to.equal(100);
       expect(bid.width).to.equal(300);
       expect(bid.height).to.equal(250);
+      expect(bid.meta.advertiserDomains).to.deep.equal([]);
       expect(bid.creativeId).to.equal(15);
       expect(bid.currency).to.equal('USD');
       expect(bid.netRevenue).to.equal(true);
@@ -303,6 +478,13 @@ describe('Undertone Adapter', () => {
     it('should only use valid bid responses', () => {
       expect(spec.interpretResponse({ body: bidResArray }).length).to.equal(1);
     });
+
+    it('should detect video response', () => {
+      const videoResult = spec.interpretResponse({body: bidVideoResponse});
+      const vbid = videoResult[0];
+
+      expect(vbid.mediaType).to.equal('video');
+    });
   });
 
   describe('getUserSyncs', () => {
diff --git a/test/spec/modules/unicornBidAdapter_spec.js b/test/spec/modules/unicornBidAdapter_spec.js
index 4c56c37700b..0abb09bfb78 100644
--- a/test/spec/modules/unicornBidAdapter_spec.js
+++ b/test/spec/modules/unicornBidAdapter_spec.js
@@ -1,22 +1,35 @@
-import { assert, expect } from 'chai';
-import { spec } from 'modules/unicornBidAdapter.js';
+import {assert, expect} from 'chai';
+import {spec} from 'modules/unicornBidAdapter.js';
 import * as _ from 'lodash';
 
 const bidRequests = [
   {
     bidder: 'unicorn',
     params: {
-      bidfloorCpm: 0,
       accountId: 12345
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [
+          [
+            300, 250
+          ],
+          [
+            336, 280
+          ]
+        ]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-0',
     transactionId: 'ea0aa332-a6e1-4474-8180-83720e6b87bc',
-    sizes: [[300, 250]],
+    sizes: [
+      [
+        300, 250
+      ],
+      [
+        336, 280
+      ]
+    ],
     bidId: '226416e6e6bf41',
     bidderRequestId: '1f41cbdcbe58d5',
     auctionId: '77987c3a-9be9-4e43-985a-26fc91d84724',
@@ -24,20 +37,22 @@ const bidRequests = [
     bidRequestsCount: 1,
     bidderRequestsCount: 1,
     bidderWinsCount: 0
-  },
-  {
+  }, {
     bidder: 'unicorn',
     params: {
-      bidfloorCpm: 0,
       accountId: 12345
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [
+          [300, 250]
+        ]
       }
     },
     transactionId: 'cf801303-cf98-4b4a-9e0a-c27b93bce6d8',
-    sizes: [[300, 250]],
+    sizes: [
+      [300, 250]
+    ],
     bidId: '37cdc0b5d0363b',
     bidderRequestId: '1f41cbdcbe58d5',
     auctionId: '77987c3a-9be9-4e43-985a-26fc91d84724',
@@ -45,20 +60,22 @@ const bidRequests = [
     bidRequestsCount: 1,
     bidderRequestsCount: 1,
     bidderWinsCount: 0
-  },
-  {
+  }, {
     bidder: 'unicorn',
     params: {
-      bidfloorCpm: 0
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [
+          [300, 250]
+        ]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-2',
     transactionId: 'ba7f114c-3676-4a08-a26d-1ee293d521ed',
-    sizes: [[300, 250]],
+    sizes: [
+      [300, 250]
+    ],
     bidId: '468569a6597a4',
     bidderRequestId: '1f41cbdcbe58d5',
     auctionId: '77987c3a-9be9-4e43-985a-26fc91d84724',
@@ -74,19 +91,32 @@ const validBidRequests = [
     bidder: 'unicorn',
     params: {
       placementId: 'rectangle-ad-1',
-      bidfloorCpm: 0,
       accountId: 12345,
       publisherId: 99999,
       mediaId: 'example'
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [
+          [
+            300, 250
+          ],
+          [
+            336, 280
+          ]
+        ]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-0',
     transactionId: 'fbf94ccf-f377-4201-a662-32c2feb8ab6d',
-    sizes: [[300, 250]],
+    sizes: [
+      [
+        300, 250
+      ],
+      [
+        336, 280
+      ]
+    ],
     bidId: '2fb90842443e24',
     bidderRequestId: '123ae4cc3eeb7e',
     auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -94,21 +124,23 @@ const validBidRequests = [
     bidRequestsCount: 1,
     bidderRequestsCount: 1,
     bidderWinsCount: 0
-  },
-  {
+  }, {
     bidder: 'unicorn',
     params: {
-      bidfloorCpm: 0,
       accountId: 12345
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [
+          [300, 250]
+        ]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-1',
     transactionId: '2d65e313-f8a6-4888-b9ab-50fb3ca744ea',
-    sizes: [[300, 250]],
+    sizes: [
+      [300, 250]
+    ],
     bidId: '352f86f158d97a',
     bidderRequestId: '123ae4cc3eeb7e',
     auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -116,22 +148,24 @@ const validBidRequests = [
     bidRequestsCount: 1,
     bidderRequestsCount: 1,
     bidderWinsCount: 0
-  },
-  {
+  }, {
     bidder: 'unicorn',
     params: {
       placementId: 'rectangle-ad-2',
-      bidfloorCpm: 0,
       accountId: 12345
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [
+          [300, 250]
+        ]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-2',
     transactionId: '82f445a8-44bc-40bc-9913-739b40375566',
-    sizes: [[300, 250]],
+    sizes: [
+      [300, 250]
+    ],
     bidId: '4cde82cc90126b',
     bidderRequestId: '123ae4cc3eeb7e',
     auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -151,17 +185,30 @@ const bidderRequest = {
       bidder: 'unicorn',
       params: {
         placementId: 'rectangle-ad-1',
-        bidfloorCpm: 0,
         accountId: 12345
       },
       mediaTypes: {
         banner: {
-          sizes: [[300, 250]]
+          sizes: [
+            [
+              300, 250
+            ],
+            [
+              336, 280
+            ]
+          ]
         }
       },
       adUnitCode: '/19968336/header-bid-tag-0',
       transactionId: 'fbf94ccf-f377-4201-a662-32c2feb8ab6d',
-      sizes: [[300, 250]],
+      sizes: [
+        [
+          300, 250
+        ],
+        [
+          336, 280
+        ]
+      ],
       bidId: '2fb90842443e24',
       bidderRequestId: '123ae4cc3eeb7e',
       auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -169,21 +216,23 @@ const bidderRequest = {
       bidRequestsCount: 1,
       bidderRequestsCount: 1,
       bidderWinsCount: 0
-    },
-    {
+    }, {
       bidder: 'unicorn',
       params: {
-        bidfloorCpm: 0,
         accountId: 12345
       },
       mediaTypes: {
         banner: {
-          sizes: [[300, 250]]
+          sizes: [
+            [300, 250]
+          ]
         }
       },
       adUnitCode: '/19968336/header-bid-tag-1',
       transactionId: '2d65e313-f8a6-4888-b9ab-50fb3ca744ea',
-      sizes: [[300, 250]],
+      sizes: [
+        [300, 250]
+      ],
       bidId: '352f86f158d97a',
       bidderRequestId: '123ae4cc3eeb7e',
       auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -191,22 +240,24 @@ const bidderRequest = {
       bidRequestsCount: 1,
       bidderRequestsCount: 1,
       bidderWinsCount: 0
-    },
-    {
+    }, {
       bidder: 'unicorn',
       params: {
         placementId: 'rectangle-ad-2',
-        bidfloorCpm: 0,
         accountId: 12345
       },
       mediaTypes: {
         banner: {
-          sizes: [[300, 250]]
+          sizes: [
+            [300, 250]
+          ]
         }
       },
       adUnitCode: '/19968336/header-bid-tag-2',
       transactionId: '82f445a8-44bc-40bc-9913-739b40375566',
-      sizes: [[300, 250]],
+      sizes: [
+        [300, 250]
+      ],
       bidId: '4cde82cc90126b',
       bidderRequestId: '123ae4cc3eeb7e',
       auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -219,7 +270,7 @@ const bidderRequest = {
   auctionStart: 1581064124172,
   timeout: 1000,
   refererInfo: {
-    referer: 'https://uni-corn.net/',
+    ref: 'https://uni-corn.net/',
     reachedTop: true,
     numIframes: 0,
     stack: ['https://uni-corn.net/']
@@ -234,42 +285,61 @@ const openRTBRequest = {
     {
       id: '216255f234b602',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          }, {
+            w: 336,
+            h: 280
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
       tagid: 'rectangle-ad-1'
-    },
-    {
+    }, {
       id: '31e2b28ced2475',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
       tagid: '/19968336/header-bid-tag-1'
-    },
-    {
+    }, {
       id: '40a333e047a9bd',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
       tagid: 'rectangle-ad-2'
     }
   ],
-  cur: 'JPY',
+  cur: ['JPY'],
   ext: {
     accountId: 12345
   },
   site: {
     id: 'example',
     publisher: {
-      id: 99999
+      id: '99999'
     },
     domain: 'uni-corn.net',
     page: 'https://uni-corn.net/',
@@ -277,8 +347,7 @@ const openRTBRequest = {
   },
   device: {
     language: 'ja',
-    ua:
-      'Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36'
+    ua: 'Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36'
   },
   user: {
     id: '69d9e1c2-801e-4901-a665-fad467550fec'
@@ -287,7 +356,8 @@ const openRTBRequest = {
   source: {
     ext: {
       stype: 'prebid_uncn',
-      bidder: 'unicorn'
+      bidder: 'unicorn',
+      prebid_version: '1.1'
     }
   }
 };
@@ -319,11 +389,10 @@ const serverResponse = {
             iurl: 'https://assets.ucontent.net/test1.jpg',
             price: 1.0017,
             w: 300
-          },
-          {
+          }, {
             adid: 'uqgbp4y0_uqjrNT7h_25512',
             adm: '<div>test</div>',
-            adomain: ['test1.co.jp'],
+            adomain: null,
             attr: ['6'],
             bundle: 'com.test1.android',
             cat: ['IAB9'],
@@ -342,13 +411,11 @@ const serverResponse = {
         ],
         group: 0,
         seat: '65'
-      },
-      {
+      }, {
         bid: [
           {
             adid: 'uoNYC6II_eoySuXNi',
             adm: '<div>test</div>',
-            adomain: ['test2.co.jp'],
             attr: [],
             bundle: 'jp.co.test2',
             cat: ['IAB9'],
@@ -377,8 +444,7 @@ const serverResponse = {
 const request = {
   method: 'POST',
   url: 'https://ds.uncn.jp/pb/0/bid.json',
-  data:
-    '{"id":"5ebea288-f13a-4754-be6d-4ade66c68877","at":1,"imp":[{"id":"216255f234b602","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-0"},{"id":"31e2b28ced2475","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0"tagid":"/19968336/header-bid-tag-1"},{"id":"40a333e047a9bd","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-2"}],"cur":"JPY","site":{"id":"uni-corn.net","publisher":{"id":12345},"domain":"uni-corn.net","page":"https://uni-corn.net/","ref":"https://uni-corn.net/"},"device":{"language":"ja","ua":"Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36"},"user":{"id":"69d9e1c2-801e-4901-a665-fad467550fec"},"bcat":[],"source":{"ext":{"stype":"prebid_uncn","bidder":"unicorn"}}}'
+  data: '{"id":"5ebea288-f13a-4754-be6d-4ade66c68877","at":1,"imp":[{"id":"216255f234b602","banner":{"w":300,"h":250},"format":[{"w":300,"h":250},{"w":336,"h":280}],"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-0"},{"id":"31e2b28ced2475","banner":{"w":"300","h":"250"},"format":[{"w":"300","h":"250"}],"secure":1,"bidfloor":0"tagid":"/19968336/header-bid-tag-1"},{"id":"40a333e047a9bd","banner":{"w":300,"h":250},"format":[{"w":300,"h":250}],"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-2"}],"cur":"JPY","site":{"id":"uni-corn.net","publisher":{"id":12345},"domain":"uni-corn.net","page":"https://uni-corn.net/","ref":"https://uni-corn.net/"},"device":{"language":"ja","ua":"Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36"},"user":{"id":"69d9e1c2-801e-4901-a665-fad467550fec"},"bcat":[],"source":{"ext":{"stype":"prebid_uncn","bidder":"unicorn","prebid_version":"1.1"}}}'
 };
 
 const interpretedBids = [
@@ -387,13 +453,17 @@ const interpretedBids = [
     cpm: 1.0017,
     width: 300,
     height: 250,
+    meta: {
+      advertiserDomains: [
+        'test1.co.jp'
+      ]
+    },
     ad: '<div>test</div>',
     ttl: 1000,
     creativeId: 'ABCDE',
     netRevenue: false,
     currency: 'JPY'
-  },
-  {
+  }, {
     requestId: '31e2b28ced2475',
     cpm: 0.9513,
     width: 300,
@@ -403,8 +473,7 @@ const interpretedBids = [
     creativeId: 'abcde',
     netRevenue: false,
     currency: 'JPY'
-  },
-  {
+  }, {
     requestId: '40a333e047a9bd',
     cpm: 0.674,
     width: 300,
@@ -427,6 +496,16 @@ describe('unicornBidAdapterTest', () => {
   });
 
   describe('buildBidRequest', () => {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        unicorn: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
     it('buildBidRequest', () => {
       const req = spec.buildRequests(validBidRequests, bidderRequest);
       const removeUntestableAttrs = data => {
diff --git a/test/spec/modules/unrulyBidAdapter_spec.js b/test/spec/modules/unrulyBidAdapter_spec.js
index 9ece8927ef7..6d1d8f9949f 100644
--- a/test/spec/modules/unrulyBidAdapter_spec.js
+++ b/test/spec/modules/unrulyBidAdapter_spec.js
@@ -1,16 +1,15 @@
 /* globals describe, it, beforeEach, afterEach, sinon */
-import { expect } from 'chai'
+import {expect} from 'chai'
 import * as utils from 'src/utils.js'
-import { STATUS } from 'src/constants.json'
-import { VIDEO } from 'src/mediaTypes.js'
-import { Renderer } from 'src/Renderer.js'
-import { adapter } from 'modules/unrulyBidAdapter.js'
+import {VIDEO, BANNER} from 'src/mediaTypes.js'
+import {Renderer} from 'src/Renderer.js'
+import {adapter} from 'modules/unrulyBidAdapter.js'
 
 describe('UnrulyAdapter', function () {
   function createOutStreamExchangeBid({
     adUnitCode = 'placement2',
     statusCode = 1,
-    bidId = 'foo',
+    requestId = 'foo',
     vastUrl = 'https://targeting.unrulymedia.com/in_article?uuid=74544e00-d43b-4f3a-a799-69d22ce979ce&supported_mime_type=application/javascript&supported_mime_type=video/mp4&tj=%7B%22site%22%3A%7B%22lang%22%3A%22en-GB%22%2C%22ref%22%3A%22%22%2C%22page%22%3A%22https%3A%2F%2Fdemo.unrulymedia.com%2FinArticle%2Finarticle_nypost_upbeat%2Ftravel_magazines.html%22%2C%22domain%22%3A%22demo.unrulymedia.com%22%7D%2C%22user%22%3A%7B%22profile%22%3A%7B%22quantcast%22%3A%7B%22segments%22%3A%5B%7B%22id%22%3A%22D%22%7D%2C%7B%22id%22%3A%22T%22%7D%5D%7D%7D%7D%7D&video_width=618&video_height=347'
   }) {
     return {
@@ -30,15 +29,70 @@ describe('UnrulyAdapter', function () {
       'bidderCode': 'unruly',
       'width': 323,
       'vastUrl': vastUrl,
-      'bidId': bidId,
-      'height': 323
+      'requestId': requestId,
+      'creativeId': requestId,
+      'height': 323,
+      'netRevenue': true,
+      'ttl': 360,
+      'currency': 'USD',
+      'meta': {
+        'mediaType': 'video',
+        'videoContext': 'outstream'
+      }
     }
   }
 
   const createExchangeResponse = (...bids) => ({
-    body: { bids }
+    body: {bids}
   });
 
+  const inStreamServerResponse = {
+    'requestId': '262594d5d1f8104',
+    'cpm': 0.3825,
+    'currency': 'USD',
+    'width': 640,
+    'height': 480,
+    'creativeId': 'cr-test-video-3',
+    'netRevenue': true,
+    'ttl': 350,
+    'vastUrl': 'https://adserve.rhythmxchange.dvl/rtbtest/nurlvast?event=impnurl&doc_type=testad&doc_version=2&crid=cr-test-video-3&ssp=2057&pubid=545454&placementid=1052819&oppid=b516bc57-0475-4377-bdc6-369c44b31d46&mediatype=site&attempt_ts=1622740567081&extra=1',
+    'meta': {
+      'mediaType': 'video',
+      'videoContext': 'instream'
+    }
+  };
+
+  const inStreamServerResponseWithVastXml = {
+    'requestId': '262594d5d1f8104',
+    'cpm': 0.3825,
+    'currency': 'USD',
+    'width': 640,
+    'height': 480,
+    'creativeId': 'cr-test-video-3',
+    'netRevenue': true,
+    'ttl': 350,
+    'vastXml': 'https://adserve.rhythmxchange.dvl/rtbtest/nurlvast?event=impnurl&doc_type=testad&doc_version=2&crid=cr-test-video-3&ssp=2057&pubid=545454&placementid=1052819&oppid=b516bc57-0475-4377-bdc6-369c44b31d46&mediatype=site&attempt_ts=1622740567081&extra=1',
+    'meta': {
+      'mediaType': 'video',
+      'videoContext': 'instream'
+    }
+  };
+
+  const bannerServerResponse = {
+    'requestId': '2de3a9047fa9c6',
+    'cpm': 5.34,
+    'currency': 'USD',
+    'width': 300,
+    'height': 250,
+    'creativeId': 'cr-test-banner-1',
+    'netRevenue': true,
+    'ttl': 350,
+    'ad': "<script src='http://a-ap.1rx.io/rtbtest/js?event=impservedoc_type=testad&doc_version=2&crid=cr-test-banner-1&ssp=2129&pubid=100144&placementid=215243&oppid=b82f5c10-213e-49f6-96f7-910d7e331055&mediatype=site&attempt_ts=1623162232956&extra=1'></script>",
+    'meta': {
+      'mediaType': 'banner'
+    }
+  };
+
   let sandbox;
   let fakeRenderer;
 
@@ -63,65 +117,547 @@ describe('UnrulyAdapter', function () {
   });
 
   it('should contain the VIDEO mediaType', function () {
-    expect(adapter.supportedMediaTypes).to.deep.equal([ VIDEO ])
+    expect(adapter.supportedMediaTypes).to.deep.equal([VIDEO, BANNER])
   });
 
   describe('isBidRequestValid', function () {
     it('should be a function', function () {
       expect(typeof adapter.isBidRequestValid).to.equal('function')
     });
-
-    it('should return false if bid is falsey', function () {
+    it('should return false if bid is false', function () {
       expect(adapter.isBidRequestValid()).to.be.false;
     });
-
-    it('should return true if bid.mediaType is "video"', function () {
-      const mockBid = { mediaType: 'video' };
-
+    it('should return true if bid.mediaType is "banner"', function () {
+      const mockBid = {
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [600, 500],
+              [300, 250]
+            ]
+          }
+        },
+        params: {
+          siteId: 233261
+        }
+      };
       expect(adapter.isBidRequestValid(mockBid)).to.be.true;
     });
-
     it('should return true if bid.mediaTypes.video.context is "outstream"', function () {
       const mockBid = {
         mediaTypes: {
           video: {
-            context: 'outstream'
+            context: 'outstream',
+            mimes: ['video/mp4'],
+            playerSize: [[640, 480]]
           }
+        },
+        params: {
+          siteId: 233261
+        }
+      };
+      expect(adapter.isBidRequestValid(mockBid)).to.be.true;
+    });
+    it('should return true if bid.mediaTypes.video.context is "instream"', function () {
+      const mockBid = {
+        mediaTypes: {
+          video: {
+            context: 'instream',
+            mimes: ['video/mp4'],
+            playerSize: [[640, 480]]
+          }
+        },
+        params: {
+          siteId: 233261
         }
       };
-
       expect(adapter.isBidRequestValid(mockBid)).to.be.true;
     });
+    it('should return false if bid.mediaTypes.video.context is not "instream" or "outstream"', function () {
+      const mockBid = {
+        mediaTypes: {
+          video: {
+            context: 'context',
+            mimes: ['video/mp4'],
+            playerSize: [[640, 480]]
+          }
+        },
+        params: {
+          siteId: 233261
+        }
+      };
+      expect(adapter.isBidRequestValid(mockBid)).to.be.false;
+    });
+    it('should return false if bid.mediaTypes.video.context not exist', function () {
+      const mockBid = {
+        mediaTypes: {
+          video: {
+            mimes: ['video/mp4'],
+            playerSize: [[640, 480]]
+          }
+        },
+        params: {
+          siteId: 233261
+        }
+      };
+      expect(adapter.isBidRequestValid(mockBid)).to.be.false;
+    });
+    it('should return false if bid.mediaType is not "video" or "banner"', function () {
+      const mockBid = {
+        mediaTypes: {
+          native: {
+            image: {
+              sizes: [300, 250]
+            }
+          }
+        },
+        params: {
+          siteId: 233261
+        }
+      };
+      expect(adapter.isBidRequestValid(mockBid)).to.be.false;
+    });
+    it('should return false if bid.mediaTypes is empty', function () {
+      const mockBid = {
+        mediaTypes: {},
+        params: {
+          siteId: 233261
+        }
+      };
+      expect(adapter.isBidRequestValid(mockBid)).to.be.false;
+    });
+    it('should return false if bid.params.siteId not exist', function () {
+      const mockBid = {
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            mimes: ['video/mp4'],
+            playerSize: [[640, 480]]
+          }
+        },
+        params: {
+          targetingUUID: 233261
+        }
+      };
+      expect(adapter.isBidRequestValid(mockBid)).to.be.false;
+    });
   });
 
   describe('buildRequests', function () {
+    let mockBidRequests;
+    beforeEach(function () {
+      mockBidRequests = {
+        'bidderCode': 'unruly',
+        'bids': [
+          {
+            'bidder': 'unruly',
+            'params': {
+              'siteId': 233261,
+            },
+            'mediaTypes': {
+              'video': {
+                'context': 'outstream',
+                'mimes': [
+                  'video/mp4'
+                ],
+                'playerSize': [
+                  [
+                    640,
+                    480
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': 'video2',
+            'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+            'sizes': [
+              [
+                640,
+                480
+              ]
+            ],
+            'bidId': '27a3ee1626a5c7',
+            'bidderRequestId': '12e00d17dff07b',
+          }
+        ]
+      };
+    });
+
     it('should be a function', function () {
       expect(typeof adapter.buildRequests).to.equal('function');
     });
     it('should return an object', function () {
-      const mockBidRequests = ['mockBid'];
-      expect(typeof adapter.buildRequests(mockBidRequests)).to.equal('object')
+      // const mockBidRequests = ['mockBid'];
+      expect(typeof adapter.buildRequests(mockBidRequests.bids, mockBidRequests)).to.equal('object')
+    });
+    it('should return an array with 2 items when the bids has different siteId\'s', function () {
+      mockBidRequests = {
+        'bidderCode': 'unruly',
+        'bids': [
+          {
+            'bidder': 'unruly',
+            'params': {
+              'siteId': 233261,
+            },
+            'mediaTypes': {
+              'video': {
+                'context': 'outstream',
+                'mimes': [
+                  'video/mp4'
+                ],
+                'playerSize': [
+                  [
+                    640,
+                    480
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': 'video2',
+            'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+            'sizes': [
+              [
+                640,
+                480
+              ]
+            ],
+            'bidId': '27a3ee1626a5c7',
+            'bidderRequestId': '12e00d17dff07b',
+          },
+          {
+            'bidder': 'unruly',
+            'params': {
+              'siteId': 2234554,
+            },
+            'mediaTypes': {
+              'video': {
+                'context': 'outstream',
+                'mimes': [
+                  'video/mp4'
+                ],
+                'playerSize': [
+                  [
+                    640,
+                    480
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': 'video2',
+            'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+            'sizes': [
+              [
+                640,
+                480
+              ]
+            ],
+            'bidId': '27a3ee1626a5c7',
+            'bidderRequestId': '12e00d17dff07b',
+          }
+        ]
+      };
+
+      let result = adapter.buildRequests(mockBidRequests.bids, mockBidRequests);
+      expect(typeof result).to.equal('object');
+      expect(result.length).to.equal(2);
+      expect(result[0].data.bidderRequest.bids.length).to.equal(1);
+      expect(result[1].data.bidderRequest.bids.length).to.equal(1);
+    });
+    it('should return an array with 1 items when the bids has same siteId', function () {
+      mockBidRequests = {
+        'bidderCode': 'unruly',
+        'bids': [
+          {
+            'bidder': 'unruly',
+            'params': {
+              'siteId': 233261,
+            },
+            'mediaTypes': {
+              'video': {
+                'context': 'outstream',
+                'mimes': [
+                  'video/mp4'
+                ],
+                'playerSize': [
+                  [
+                    640,
+                    480
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': 'video2',
+            'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+            'sizes': [
+              [
+                640,
+                480
+              ]
+            ],
+            'bidId': '27a3ee1626a5c7',
+            'bidderRequestId': '12e00d17dff07b',
+          },
+          {
+            'bidder': 'unruly',
+            'params': {
+              'siteId': 233261,
+            },
+            'mediaTypes': {
+              'video': {
+                'context': 'outstream',
+                'mimes': [
+                  'video/mp4'
+                ],
+                'playerSize': [
+                  [
+                    640,
+                    480
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': 'video2',
+            'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+            'sizes': [
+              [
+                640,
+                480
+              ]
+            ],
+            'bidId': '27a3ee1626a5c7',
+            'bidderRequestId': '12e00d17dff07b',
+          }
+        ]
+      };
+
+      let result = adapter.buildRequests(mockBidRequests.bids, mockBidRequests);
+      expect(typeof result).to.equal('object');
+      expect(result.length).to.equal(1);
+      expect(result[0].data.bidderRequest.bids.length).to.equal(2);
     });
     it('should return a server request with a valid exchange url', function () {
-      const mockBidRequests = ['mockBid'];
-      expect(adapter.buildRequests(mockBidRequests).url).to.equal('https://targeting.unrulymedia.com/prebid')
+      expect(adapter.buildRequests(mockBidRequests.bids, mockBidRequests)[0].url).to.equal('https://targeting.unrulymedia.com/unruly_prebid')
+    });
+    it('should return a server request with a the end point url instead of the exchange url', function () {
+      mockBidRequests.bids[0].params.endpoint = '//testendpoint.com';
+      expect(adapter.buildRequests(mockBidRequests.bids, mockBidRequests)[0].url).to.equal('//testendpoint.com');
     });
     it('should return a server request with method === POST', function () {
-      const mockBidRequests = ['mockBid'];
-      expect(adapter.buildRequests(mockBidRequests).method).to.equal('POST');
+      expect(adapter.buildRequests(mockBidRequests.bids, mockBidRequests)[0].method).to.equal('POST');
     });
-    it('should ensure contentType is `text/plain`', function () {
-      const mockBidRequests = ['mockBid'];
-      expect(adapter.buildRequests(mockBidRequests).options).to.deep.equal({
-        contentType: 'text/plain'
+    it('should ensure contentType is `application/json`', function () {
+      expect(adapter.buildRequests(mockBidRequests.bids, mockBidRequests)[0].options).to.deep.equal({
+        contentType: 'application/json'
       });
     });
     it('should return a server request with valid payload', function () {
-      const mockBidRequests = ['mockBid'];
-      const mockBidderRequest = {bidderCode: 'mockBidder'};
-      expect(adapter.buildRequests(mockBidRequests, mockBidderRequest).data)
-        .to.deep.equal({bidRequests: mockBidRequests, bidderRequest: mockBidderRequest})
-    })
+      const expectedResult = {
+        bidderRequest: {
+          'bids': [
+            {
+              'bidder': 'unruly',
+              'params': {
+                'siteId': 233261
+              },
+              'mediaTypes': {
+                'video': {
+                  'context': 'outstream',
+                  'mimes': [
+                    'video/mp4'
+                  ],
+                  'playerSize': [
+                    [
+                      640,
+                      480
+                    ]
+                  ],
+                  'floor': 0
+                }
+              },
+              'adUnitCode': 'video2',
+              'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+              'sizes': [
+                [
+                  640,
+                  480
+                ]
+              ],
+              'bidId': '27a3ee1626a5c7',
+              'bidderRequestId': '12e00d17dff07b'
+            }
+          ],
+          'invalidBidsCount': 0
+        }
+      };
+
+      expect(adapter.buildRequests(mockBidRequests.bids, mockBidRequests)[0].data).to.deep.equal(expectedResult)
+    });
+    it('should return request and remove the duplicate sizes', function () {
+      mockBidRequests = {
+        'bidderCode': 'unruly',
+        'bids': [
+          {
+            'bidder': 'unruly',
+            'params': {
+              'siteId': 233261,
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    640,
+                    480
+                  ],
+                  [
+                    640,
+                    480
+                  ],
+                  [
+                    300,
+                    250
+                  ],
+                  [
+                    300,
+                    250
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': 'video2',
+            'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+            'bidId': '27a3ee1626a5c7',
+            'bidderRequestId': '12e00d17dff07b',
+          }
+        ]
+      };
+
+      const expectedResult = {
+        bidderRequest: {
+          'bids': [
+            {
+              'bidder': 'unruly',
+              'params': {
+                'siteId': 233261
+              },
+              'mediaTypes': {
+                'banner': {
+                  'sizes': [
+                    [
+                      640,
+                      480
+                    ],
+                    [
+                      300,
+                      250
+                    ]
+                  ],
+                  'floor': 0
+                }
+              },
+              'adUnitCode': 'video2',
+              'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+              'bidId': '27a3ee1626a5c7',
+              'bidderRequestId': '12e00d17dff07b',
+            }
+          ],
+          'invalidBidsCount': 0
+        }
+      };
+
+      let result = adapter.buildRequests(mockBidRequests.bids, mockBidRequests);
+      expect(result[0].data).to.deep.equal(expectedResult);
+    });
+
+    it('should return have the floor value from the bid', function () {
+      mockBidRequests = {
+        'bidderCode': 'unruly',
+        'bids': [
+          {
+            'bidder': 'unruly',
+            'params': {
+              'siteId': 233261,
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    640,
+                    480
+                  ]
+                ]
+              }
+            },
+            'floors': {
+              'enforceFloors': true,
+              'currency': 'USD',
+              'schema': {
+                'fields': [
+                  'mediaType'
+                ]
+              },
+              'values': {
+                'banner': 3
+              },
+            },
+            'adUnitCode': 'video2',
+            'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+            'bidId': '27a3ee1626a5c7',
+            'bidderRequestId': '12e00d17dff07b',
+          }
+        ]
+      };
+
+      const getFloor = (data) => {
+        return {floor: 3}
+      };
+
+      mockBidRequests.bids[0].getFloor = getFloor;
+
+      const expectedResult = {
+        bidderRequest: {
+          'bids': [
+            {
+              'bidder': 'unruly',
+              'params': {
+                'siteId': 233261
+              },
+              'mediaTypes': {
+                'banner': {
+                  'sizes': [
+                    [
+                      640,
+                      480
+                    ]
+                  ],
+                  'floor': 3
+                }
+              },
+              'floors': {
+                'enforceFloors': true,
+                'currency': 'USD',
+                'schema': {
+                  'fields': [
+                    'mediaType'
+                  ]
+                },
+                'values': {
+                  'banner': 3
+                },
+              },
+              getFloor: getFloor,
+              'adUnitCode': 'video2',
+              'transactionId': 'a89619e3-137d-4cc5-9ed4-58a0b2a0bbc2',
+              'bidId': '27a3ee1626a5c7',
+              'bidderRequestId': '12e00d17dff07b',
+            }
+          ],
+          'invalidBidsCount': 0
+        }
+      };
+
+      let result = adapter.buildRequests(mockBidRequests.bids, mockBidRequests);
+      expect(result[0].data).to.deep.equal(expectedResult);
+    });
   });
 
   describe('interpretResponse', function () {
@@ -132,15 +668,28 @@ describe('UnrulyAdapter', function () {
       expect(adapter.interpretResponse()).to.deep.equal([]);
     });
     it('should return [] when  serverResponse has no bids', function () {
-      const mockServerResponse = { body: { bids: [] } };
+      const mockServerResponse = {body: {bids: []}};
       expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([])
     });
     it('should return array of bids when receive a successful response from server', function () {
-      const mockExchangeBid = createOutStreamExchangeBid({adUnitCode: 'video1', bidId: 'mockBidId'});
+      const mockExchangeBid = createOutStreamExchangeBid({adUnitCode: 'video1', requestId: 'mockBidId'});
       const mockServerResponse = createExchangeResponse(mockExchangeBid);
       expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([
         {
+          'ext': {
+            'statusCode': 1,
+            'renderer': {
+              'id': 'unruly_inarticle',
+              'config': {
+                'siteId': 123456,
+                'targetingUUID': 'xxx-yyy-zzz'
+              },
+              'url': 'https://video.unrulymedia.com/native/prebid-loader.js'
+            },
+            'adUnitCode': 'video1'
+          },
           requestId: 'mockBidId',
+          bidderCode: 'unruly',
           cpm: 20,
           width: 323,
           height: 323,
@@ -148,6 +697,10 @@ describe('UnrulyAdapter', function () {
           netRevenue: true,
           creativeId: 'mockBidId',
           ttl: 360,
+          'meta': {
+            'mediaType': 'video',
+            'videoContext': 'outstream'
+          },
           currency: 'USD',
           renderer: fakeRenderer,
           mediaType: 'video'
@@ -159,7 +712,7 @@ describe('UnrulyAdapter', function () {
       expect(Renderer.install.called).to.be.false;
       expect(fakeRenderer.setRender.called).to.be.false;
 
-      const mockReturnedBid = createOutStreamExchangeBid({adUnitCode: 'video1', bidId: 'mockBidId'});
+      const mockReturnedBid = createOutStreamExchangeBid({adUnitCode: 'video1', requestId: 'mockBidId'});
       const mockRenderer = {
         url: 'value: mockRendererURL',
         config: {
@@ -175,7 +728,7 @@ describe('UnrulyAdapter', function () {
       expect(Renderer.install.calledOnce).to.be.true;
       sinon.assert.calledWithExactly(
         Renderer.install,
-        Object.assign({}, mockRenderer, {callback: sinon.match.func})
+        Object.assign({}, mockRenderer)
       );
 
       sinon.assert.calledOnce(fakeRenderer.setRender);
@@ -183,12 +736,12 @@ describe('UnrulyAdapter', function () {
     });
 
     it('should return [] and log if bidResponse renderer config is not available', function () {
-      sinon.assert.notCalled(utils.logError)
+      sinon.assert.notCalled(utils.logError);
 
       expect(Renderer.install.called).to.be.false;
       expect(fakeRenderer.setRender.called).to.be.false;
 
-      const mockReturnedBid = createOutStreamExchangeBid({adUnitCode: 'video1', bidId: 'mockBidId'});
+      const mockReturnedBid = createOutStreamExchangeBid({adUnitCode: 'video1', requestId: 'mockBidId'});
       const mockRenderer = {
         url: 'value: mockRendererURL'
       };
@@ -198,24 +751,21 @@ describe('UnrulyAdapter', function () {
       expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([]);
 
       const logErrorCalls = utils.logError.getCalls();
-      expect(logErrorCalls.length).to.equal(2);
+      expect(logErrorCalls.length).to.equal(1);
 
-      const [ configErrorCall, siteIdErrorCall ] = logErrorCalls;
+      const [configErrorCall] = logErrorCalls;
 
       expect(configErrorCall.args.length).to.equal(1);
       expect(configErrorCall.args[0].message).to.equal('UnrulyBidAdapter: Missing renderer config.');
-
-      expect(siteIdErrorCall.args.length).to.equal(1);
-      expect(siteIdErrorCall.args[0].message).to.equal('UnrulyBidAdapter: Missing renderer siteId.');
     });
 
     it('should return [] and log if siteId is not available', function () {
-      sinon.assert.notCalled(utils.logError)
+      sinon.assert.notCalled(utils.logError);
 
       expect(Renderer.install.called).to.be.false;
       expect(fakeRenderer.setRender.called).to.be.false;
 
-      const mockReturnedBid = createOutStreamExchangeBid({adUnitCode: 'video1', bidId: 'mockBidId'});
+      const mockReturnedBid = createOutStreamExchangeBid({adUnitCode: 'video1', requestId: 'mockBidId'});
       const mockRenderer = {
         url: 'value: mockRendererURL',
         config: {}
@@ -228,14 +778,14 @@ describe('UnrulyAdapter', function () {
       const logErrorCalls = utils.logError.getCalls();
       expect(logErrorCalls.length).to.equal(1);
 
-      const [ siteIdErrorCall ] = logErrorCalls;
+      const [siteIdErrorCall] = logErrorCalls;
 
       expect(siteIdErrorCall.args.length).to.equal(1);
       expect(siteIdErrorCall.args[0].message).to.equal('UnrulyBidAdapter: Missing renderer siteId.');
     });
 
     it('bid is placed on the bid queue when render is called', function () {
-      const exchangeBid = createOutStreamExchangeBid({ adUnitCode: 'video', vastUrl: 'value: vastUrl' });
+      const exchangeBid = createOutStreamExchangeBid({adUnitCode: 'video', vastUrl: 'value: vastUrl'});
       const exchangeResponse = createExchangeResponse(exchangeBid);
 
       adapter.interpretResponse(exchangeResponse);
@@ -255,7 +805,7 @@ describe('UnrulyAdapter', function () {
     });
 
     it('should ensure that renderer is placed in Prebid supply mode', function () {
-      const mockExchangeBid = createOutStreamExchangeBid({adUnitCode: 'video1', bidId: 'mockBidId'});
+      const mockExchangeBid = createOutStreamExchangeBid({adUnitCode: 'video1', requestId: 'mockBidId'});
       const mockServerResponse = createExchangeResponse(mockExchangeBid);
 
       expect('unruly' in window.parent).to.equal(false);
@@ -266,65 +816,94 @@ describe('UnrulyAdapter', function () {
 
       expect(supplyMode).to.equal('prebid');
     });
-  });
 
-  describe('getUserSyncs', () => {
-    it('should push user sync iframe if enabled', () => {
-      const mockConsent = {}
-      const response = {}
-      const syncOptions = { iframeEnabled: true }
-      const syncs = adapter.getUserSyncs(syncOptions, response, mockConsent)
-      expect(syncs[0]).to.deep.equal({
-        type: 'iframe',
-        url: 'https://video.unrulymedia.com/iframes/third-party-iframes.html'
-      });
-    })
+    it('should return correct response when ad type is instream with vastUrl', function () {
+      const mockServerResponse = createExchangeResponse(inStreamServerResponse);
+      const expectedResponse = inStreamServerResponse;
+      expectedResponse.mediaType = 'video';
 
-    it('should not push user sync iframe if not enabled', () => {
-      const mockConsent = {}
-      const response = {}
-      const syncOptions = { iframeEnabled: false }
-      const syncs = adapter.getUserSyncs(syncOptions, response, mockConsent);
-      expect(syncs).to.be.empty;
+      expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([expectedResponse]);
     });
-  });
 
-  it('should not append consent params if gdpr does not apply', () => {
-    const mockConsent = {}
-    const response = {}
-    const syncOptions = { iframeEnabled: true }
-    const syncs = adapter.getUserSyncs(syncOptions, response, mockConsent)
-    expect(syncs[0]).to.deep.equal({
-      type: 'iframe',
-      url: 'https://video.unrulymedia.com/iframes/third-party-iframes.html'
-    })
-  });
+    it('should return correct response when ad type is instream with vastXml', function () {
+      const mockServerResponse = {...createExchangeResponse(inStreamServerResponseWithVastXml)};
+      const expectedResponse = inStreamServerResponseWithVastXml;
+      expectedResponse.mediaType = 'video';
 
-  it('should append consent params if gdpr does apply and consent is given', () => {
-    const mockConsent = {
-      gdprApplies: true,
-      consentString: 'hello'
-    };
-    const response = {}
-    const syncOptions = { iframeEnabled: true }
-    const syncs = adapter.getUserSyncs(syncOptions, response, mockConsent)
-    expect(syncs[0]).to.deep.equal({
-      type: 'iframe',
-      url: 'https://video.unrulymedia.com/iframes/third-party-iframes.html?gdpr=1&gdpr_consent=hello'
-    })
-  });
+      expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([expectedResponse]);
+    });
 
-  it('should append consent param if gdpr applies and no consent is given', () => {
-    const mockConsent = {
-      gdprApplies: true,
-      consentString: {}
-    };
-    const response = {};
-    const syncOptions = { iframeEnabled: true }
-    const syncs = adapter.getUserSyncs(syncOptions, response, mockConsent)
-    expect(syncs[0]).to.deep.equal({
-      type: 'iframe',
-      url: 'https://video.unrulymedia.com/iframes/third-party-iframes.html?gdpr=0'
-    })
-  })
+    it('should return [] and log if no vastUrl in instream response', function () {
+      const {vastUrl, ...inStreamServerResponseNoVast} = inStreamServerResponse;
+      const mockServerResponse = createExchangeResponse(inStreamServerResponseNoVast);
+
+      expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([]);
+
+      const logErrorCalls = utils.logError.getCalls();
+
+      expect(logErrorCalls.length).to.equal(1);
+
+      const [siteIdErrorCall] = logErrorCalls;
+
+      expect(siteIdErrorCall.args.length).to.equal(1);
+      expect(siteIdErrorCall.args[0].message).to.equal('UnrulyBidAdapter: Missing vastUrl or vastXml config.');
+    });
+
+    it('should return correct response when ad type is banner', function () {
+      const mockServerResponse = createExchangeResponse(bannerServerResponse);
+      const expectedResponse = bannerServerResponse;
+      expectedResponse.mediaType = 'banner';
+
+      expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([expectedResponse]);
+    });
+
+    it('should return [] and log if no ad in banner response', function () {
+      const {ad, ...bannerServerResponseNoAd} = bannerServerResponse;
+      const mockServerResponse = createExchangeResponse(bannerServerResponseNoAd);
+
+      expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([]);
+
+      const logErrorCalls = utils.logError.getCalls();
+
+      expect(logErrorCalls.length).to.equal(1);
+
+      const [siteIdErrorCall] = logErrorCalls;
+
+      expect(siteIdErrorCall.args.length).to.equal(1);
+      expect(siteIdErrorCall.args[0].message).to.equal('UnrulyBidAdapter: Missing ad config.');
+    });
+
+    it('should return correct response for multiple bids', function () {
+      const outStreamServerResponse = createOutStreamExchangeBid({adUnitCode: 'video1', requestId: 'mockBidId'});
+      const mockServerResponse = createExchangeResponse(outStreamServerResponse, inStreamServerResponse, bannerServerResponse);
+      const expectedOutStreamResponse = outStreamServerResponse;
+      expectedOutStreamResponse.mediaType = 'video';
+
+      const expectedInStreamResponse = inStreamServerResponse;
+      expectedInStreamResponse.mediaType = 'video';
+
+      const expectedBannerResponse = bannerServerResponse;
+      expectedBannerResponse.mediaType = 'banner';
+
+      expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([expectedOutStreamResponse, expectedInStreamResponse, expectedBannerResponse]);
+    });
+
+    it('should return only valid bids', function () {
+      const {ad, ...bannerServerResponseNoAd} = bannerServerResponse;
+      const mockServerResponse = createExchangeResponse(bannerServerResponseNoAd, inStreamServerResponse);
+      const expectedInStreamResponse = inStreamServerResponse;
+      expectedInStreamResponse.mediaType = 'video';
+
+      expect(adapter.interpretResponse(mockServerResponse)).to.deep.equal([expectedInStreamResponse]);
+
+      const logErrorCalls = utils.logError.getCalls();
+
+      expect(logErrorCalls.length).to.equal(1);
+
+      const [siteIdErrorCall] = logErrorCalls;
+
+      expect(siteIdErrorCall.args.length).to.equal(1);
+      expect(siteIdErrorCall.args[0].message).to.equal('UnrulyBidAdapter: Missing ad config.');
+    });
+  });
 });
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 5dda322f3c8..99e0681e547 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -1,46 +1,70 @@
 import {
   attachIdSystem,
   auctionDelay,
+  coreStorage,
   init,
   requestBidsHook,
+  setStoredConsentData,
+  setStoredValue,
   setSubmoduleRegistry,
   syncDelay,
-  coreStorage
+  PBJS_USER_ID_OPTOUT_NAME,
+  findRootDomain, requestDataDeletion,
 } from 'modules/userId/index.js';
 import {createEidsArray} from 'modules/userId/eids.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
-import events from 'src/events.js';
+import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
 import {getGlobal} from 'src/prebidGlobal.js';
+import {
+  resetConsentData,
+} from 'modules/consentManagement.js';
+import {server} from 'test/mocks/xhr.js';
+import {find} from 'src/polyfill.js';
 import {unifiedIdSubmodule} from 'modules/unifiedIdSystem.js';
-import {pubCommonIdSubmodule} from 'modules/pubCommonIdSystem.js';
 import {britepoolIdSubmodule} from 'modules/britepoolIdSystem.js';
 import {id5IdSubmodule} from 'modules/id5IdSystem.js';
 import {identityLinkSubmodule} from 'modules/identityLinkIdSystem.js';
+import {dmdIdSubmodule} from 'modules/dmdIdSystem.js';
 import {liveIntentIdSubmodule} from 'modules/liveIntentIdSystem.js';
+import {merkleIdSubmodule} from 'modules/merkleIdSystem.js';
 import {netIdSubmodule} from 'modules/netIdSystem.js';
-import {sharedIdSubmodule} from 'modules/sharedIdSystem.js';
-import {server} from 'test/mocks/xhr.js';
+import {intentIqIdSubmodule} from 'modules/intentIqIdSystem.js';
+import {zeotapIdPlusSubmodule} from 'modules/zeotapIdPlusIdSystem.js';
+import {sharedIdSystemSubmodule} from 'modules/sharedIdSystem.js';
+import {hadronIdSubmodule} from 'modules/hadronIdSystem.js';
+import {pubProvidedIdSubmodule} from 'modules/pubProvidedIdSystem.js';
+import {criteoIdSubmodule} from 'modules/criteoIdSystem.js';
+import {mwOpenLinkIdSubModule} from 'modules/mwOpenLinkIdSystem.js';
+import {tapadIdSubmodule} from 'modules/tapadIdSystem.js';
+import {tncidSubModule} from 'modules/tncIdSystem.js';
+import {getPrebidInternal} from 'src/utils.js';
+import {uid2IdSubmodule} from 'modules/uid2IdSystem.js';
+import {admixerIdSubmodule} from 'modules/admixerIdSystem.js';
+import {deepintentDpesSubmodule} from 'modules/deepintentDpesIdSystem.js';
+import {amxIdSubmodule} from '../../../modules/amxIdSystem.js';
+import {kinessoIdSubmodule} from 'modules/kinessoIdSystem.js';
+import {adqueryIdSubmodule} from 'modules/adqueryIdSystem.js';
+import {imuIdSubmodule} from 'modules/imuIdSystem.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';
+import {getPPID} from '../../../src/adserver.js';
+import {uninstall as uninstallGdprEnforcement} from 'modules/gdprEnforcement.js';
 
 let assert = require('chai').assert;
 let expect = require('chai').expect;
 const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+const CONSENT_LOCAL_STORAGE_NAME = '_pbjs_userid_consent_data';
 
-describe('User ID', function() {
-  function getConfigMock(configArr1, configArr2, configArr3, configArr4, configArr5, configArr6, configArr7) {
+describe('User ID', function () {
+  function getConfigMock(...configArrays) {
     return {
       userSync: {
         syncDelay: 0,
-        userIds: [
-          (configArr1 && configArr1.length >= 3) ? getStorageMock.apply(null, configArr1) : null,
-          (configArr2 && configArr2.length >= 3) ? getStorageMock.apply(null, configArr2) : null,
-          (configArr3 && configArr3.length >= 3) ? getStorageMock.apply(null, configArr3) : null,
-          (configArr4 && configArr4.length >= 3) ? getStorageMock.apply(null, configArr4) : null,
-          (configArr5 && configArr5.length >= 3) ? getStorageMock.apply(null, configArr5) : null,
-          (configArr6 && configArr6.length >= 3) ? getStorageMock.apply(null, configArr6) : null,
-          (configArr7 && configArr7.length >= 3) ? getStorageMock.apply(null, configArr7) : null
-        ].filter(i => i)
+        userIds: configArrays.map(configArray => (configArray && configArray.length >= 3) ? getStorageMock.apply(null, configArray) : null)
       }
     }
   }
@@ -60,7 +84,7 @@ describe('User ID', function() {
       code,
       mediaTypes: {banner: {}, native: {}},
       sizes: [[300, 200], [300, 600]],
-      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}]
+      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}, {bidder: 'anotherSampleBidder', params: {placementId: 'banner-only-bidder'}}]
     };
   }
 
@@ -78,31 +102,95 @@ describe('User ID', function() {
     return cfg;
   }
 
-  before(function() {
-    coreStorage.setCookie('_pubcid_optout', '', EXPIRED_COOKIE_DATE);
-    localStorage.removeItem('_pbjs_id_optout');
-    localStorage.removeItem('_pubcid_optout');
+  function findEid(eids, source) {
+    return find(eids, (eid) => {
+      if (eid.source === source) { return true; }
+    });
+  }
+
+  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();
+    uninstallGdprEnforcement();
+    localStorage.removeItem(PBJS_USER_ID_OPTOUT_NAME);
+  });
+
+  beforeEach(function () {
+    // TODO: this whole suite needs to be redesigned; it is passing by accident
+    // some tests do not pass if consent data is available
+    // (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() {
+  describe('Decorate Ad Units', function () {
+    beforeEach(function () {
+      // reset mockGpt so nothing else interferes
+      mockGpt.disable();
+      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');
     });
 
-    afterEach(function() {
+    afterEach(function () {
+      mockGpt.enable();
       $$PREBID_GLOBAL$$.requestBids.removeAll();
       config.resetConfig();
       coreStorage.setCookie.restore();
+      utils.logWarn.restore();
     });
 
-    after(function() {
+    after(function () {
       coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('pubcid_alt', '', EXPIRED_COOKIE_DATE);
     });
 
-    it('Check same cookie behavior', function() {
+    it('Check same cookie behavior', function () {
       let adUnits1 = [getAdUnitMock()];
       let adUnits2 = [getAdUnitMock()];
       let innerAdUnits1;
@@ -111,33 +199,36 @@ describe('User ID', function() {
       let pubcid = coreStorage.getCookie('pubcid');
       expect(pubcid).to.be.null; // there should be no cookie initially
 
-      setSubmoduleRegistry([pubCommonIdSubmodule]);
       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() {
+    it('Check different cookies', function () {
       let adUnits1 = [getAdUnitMock()];
       let adUnits2 = [getAdUnitMock()];
       let innerAdUnits1;
@@ -145,216 +236,587 @@ describe('User ID', function() {
       let pubcid1;
       let pubcid2;
 
-      setSubmoduleRegistry([pubCommonIdSubmodule]);
       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([pubCommonIdSubmodule]);
-      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() {
+    it('Use existing cookie', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
 
-      setSubmoduleRegistry([pubCommonIdSubmodule]);
       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 cookie exists already, there should be no setCookie call by default
-      expect(coreStorage.setCookie.callCount).to.equal(0);
     });
 
-    it('Extend cookie', function() {
+    it('Extend cookie', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
       let customConfig = getConfigMock(['pubCommonId', 'pubcid_alt', 'cookie']);
       customConfig = addConfig(customConfig, 'params', {extend: true});
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, 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
-      expect(coreStorage.setCookie.callCount).to.equal(1);
     });
 
-    it('Disable auto create', function() {
+    it('Disable auto create', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
       let customConfig = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
       customConfig = addConfig(customConfig, 'params', {create: false});
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, 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);
       });
-      expect(coreStorage.setCookie.callCount).to.equal(0);
     });
 
-    it('pbjs.getUserIds', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule]);
+    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([pubCommonIdSubmodule]);
+    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
+          }]
+        }
+      });
+      getGlobal().getUserIdsAsync().then((ids) => {
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal(createEidsArray(ids));
+        done();
+      });
+    });
+
+    it('should set googletag ppid correctly', function () {
+      let adUnits = [getAdUnitMock()];
+      init(config);
+      setSubmoduleRegistry([amxIdSubmodule, sharedIdSystemSubmodule, identityLinkSubmodule, imuIdSubmodule]);
+
+      // before ppid should not be set
+      expect(window.googletag._ppid).to.equal(undefined);
+
+      config.setConfig({
+        userSync: {
+          ppid: 'pubcid.org',
+          userIds: [
+            { name: 'amxId', value: {'amxId': 'amx-id-value-amx-id-value-amx-id-value'} },
+            { name: 'pubCommonId', value: {'pubcid': 'pubCommon-id-value-pubCommon-id-value'} },
+            { name: 'identityLink', value: {'idl_env': 'identityLink-id-value-identityLink-id-value'} },
+            { name: 'imuid', value: {'imppid': 'imppid-value-imppid-value-imppid-value'} },
+          ]
+        }
+      });
+      return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
+        // ppid should have been set without dashes and stuff
+        expect(window.googletag._ppid).to.equal('pubCommonidvaluepubCommonidvalue');
+      });
+    });
+
+    it('should set PPID when the source needs to call out to the network', () => {
+      let adUnits = [getAdUnitMock()];
+      init(config);
+      const callback = sinon.stub();
+      setSubmoduleRegistry([{
+        name: 'sharedId',
+        getId: function () {
+          return {callback}
+        },
+        decode(d) {
+          return d
+        }
+      }]);
+      config.setConfig({
+        userSync: {
+          ppid: 'pubcid.org',
+          auctionDelay: 10,
+          userIds: [
+            {
+              name: 'sharedId',
+            }
+          ]
+        }
+      });
+      return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
+        expect(window.googletag._ppid).to.be.undefined;
+        const uid = 'thismustbelongerthan32characters'
+        callback.yield({pubcid: uid});
+        expect(window.googletag._ppid).to.equal(uid);
+      });
+    });
+
+    it('should set googletag ppid correctly for imuIdSubmodule', function () {
+      let adUnits = [getAdUnitMock()];
+      init(config);
+      setSubmoduleRegistry([imuIdSubmodule]);
+
+      // before ppid should not be set
+      expect(window.googletag._ppid).to.equal(undefined);
+
+      config.setConfig({
+        userSync: {
+          ppid: 'ppid.intimatemerger.com',
+          userIds: [
+            { name: 'imuid', value: {'imppid': 'imppid-value-imppid-value-imppid-value'} },
+          ]
+        }
+      });
+
+      return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
+        // ppid should have been set without dashes and stuff
+        expect(window.googletag._ppid).to.equal('imppidvalueimppidvalueimppidvalue');
+      });
+    });
+
+    it('should log a warning if PPID too big or small', function () {
+      let adUnits = [getAdUnitMock()];
+
+      init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+
+      config.setConfig({
+        userSync: {
+          ppid: 'pubcid.org',
+          userIds: [
+            { name: 'pubCommonId', value: {'pubcid': 'pubcommonIdValue'} },
+          ]
+        }
+      });
+      // before ppid should not be set
+      expect(window.googletag._ppid).to.equal(undefined);
+      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('should make PPID available to core', () => {
+      init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+      const id = 'thishastobelongerthan32characters';
+      config.setConfig({
+        userSync: {
+          ppid: 'pubcid.org',
+          userIds: [
+            { name: 'pubCommonId', value: {'pubcid': id} },
+          ]
+        }
+      });
+      return getGlobal().refreshUserIds().then(() => {
+        expect(getPPID()).to.eql(id);
+      })
+    });
+
+    describe('refreshing before init is complete', () => {
+      const MOCK_ID = {'MOCKID': '1111'};
+      let mockIdCallback;
+      let startInit;
+
+      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]);
+        startInit = () => config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'mockId',
+              storage: {name: 'MOCKID', type: 'cookie'}
+            }]
+          }
+        });
+      });
+
+      it('should still resolve promises returned by getUserIdsAsync', () => {
+        startInit();
+        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
+        });
+      });
+
+      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
+        startInit();
+        requestBidsHook(() => {
+          done();
+        }, {adUnits: [getAdUnitMock()]}, {delay: delay()});
+        getGlobal().refreshUserIds();
+        clearStack().then(() => {
+          // simulate init complete
+          mockIdCallback.callArg(0, {id: {MOCKID: '1111'}});
+        });
+      });
+
+      it('should continue the auction when init fails', (done) => {
+        startInit();
+        requestBidsHook(() => {
+          done();
+        },
+        {adUnits: [getAdUnitMock()]},
+        {
+          delay: delay(),
+          getIds: () => Promise.reject(new Error())
+        }
+        );
+      })
+
+      it('should not get stuck when init fails', () => {
+        const err = new Error();
+        mockIdCallback.callsFake(() => { throw err; });
+        startInit();
+        return getGlobal().getUserIdsAsync().catch((e) =>
+          expect(e).to.equal(err)
+        );
+      });
+    });
+
+    describe('when ID systems throw errors', () => {
+      function mockIdSystem(name) {
+        return {
+          name,
+          decode: function(value) {
+            return {
+              [name]: value
+            };
+          },
+          getId: sinon.stub().callsFake(() => ({id: name}))
+        };
+      }
+      let id1, id2;
+      beforeEach(() => {
+        id1 = mockIdSystem('mock1');
+        id2 = mockIdSystem('mock2');
+        init(config);
+        setSubmoduleRegistry([id1, id2]);
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'mock1',
+              storage: {name: 'mock1', type: 'cookie'}
+            }, {
+              name: 'mock2',
+              storage: {name: 'mock2', type: 'cookie'}
+            }]
+          }
+        })
+      });
+      afterEach(() => {
+        config.resetConfig();
+      })
+      Object.entries({
+        'in init': () => id1.getId.callsFake(() => { throw new Error() }),
+        'in callback': () => {
+          const mockCallback = sinon.stub().callsFake(() => { throw new Error() });
+          id1.getId.callsFake(() => ({callback: mockCallback}))
+        }
+      }).forEach(([t, setup]) => {
+        describe(`${t}`, () => {
+          beforeEach(setup);
+          it('should still retrieve IDs that do not throw', () => {
+            return getGlobal().getUserIdsAsync().then((uid) => {
+              expect(uid.mock2).to.not.be.undefined;
+            })
+          });
+        })
+      })
+    });
+    it('pbjs.refreshUserIds updates submodules', function(done) {
+      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
+      };
+      init(config);
+      setSubmoduleRegistry([mockIdSystem]);
+
+      config.setConfig({
+        userSync: {
+          auctionDelay: 10,
+          userIds: [{
+            name: 'mockId',
+            value: {id: {mockId: '1111'}}
           }]
         }
       });
-      expect(typeof (getGlobal()).getUserIdsAsEids).to.equal('function');
-      expect((getGlobal()).getUserIdsAsEids()).to.deep.equal(createEidsArray((getGlobal()).getUserIds()));
+
+      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();
+        });
+      });
+    });
+
+    it('pbjs.refreshUserIds refreshes single', function() {
+      coreStorage.setCookie('MOCKID', '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie('REFRESH', '', EXPIRED_COOKIE_DATE);
+
+      let sandbox = sinon.createSandbox();
+      let mockIdCallback = sandbox.stub().returns({id: {'MOCKID': '1111'}});
+      let refreshUserIdsCallback = sandbox.stub();
+
+      let mockIdSystem = {
+        name: 'mockId',
+        decode: function(value) {
+          return {
+            'mid': value['MOCKID']
+          };
+        },
+        getId: mockIdCallback
+      };
+
+      let refreshedIdCallback = sandbox.stub().returns({id: {'REFRESH': '1111'}});
+
+      let refreshedIdSystem = {
+        name: 'refreshedId',
+        decode: function(value) {
+          return {
+            'refresh': value['REFRESH']
+          };
+        },
+        getId: refreshedIdCallback
+      };
+
+      init(config);
+      setSubmoduleRegistry([refreshedIdSystem, mockIdSystem]);
+
+      config.setConfig({
+        userSync: {
+          auctionDelay: 10,
+          userIds: [
+            {
+              name: 'mockId',
+              storage: {name: 'MOCKID', type: 'cookie'},
+            },
+            {
+              name: 'refreshedId',
+              storage: {name: 'refreshedid', type: 'cookie'},
+            }
+          ]
+        }
+      });
+
+      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);
+      });
     });
   });
 
-  describe('Opt out', function() {
-    before(function() {
-      coreStorage.setCookie('_pbjs_id_optout', '1', (new Date(Date.now() + 5000).toUTCString()));
+  describe('Opt out', function () {
+    before(function () {
+      coreStorage.setCookie(PBJS_USER_ID_OPTOUT_NAME, '1', (new Date(Date.now() + 5000).toUTCString()));
     });
 
-    beforeEach(function() {
+    beforeEach(function () {
       sinon.stub(utils, 'logInfo');
     });
 
-    afterEach(function() {
+    afterEach(function () {
       // removed cookie
-      coreStorage.setCookie('_pbjs_id_optout', '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie(PBJS_USER_ID_OPTOUT_NAME, '', EXPIRED_COOKIE_DATE);
       $$PREBID_GLOBAL$$.requestBids.removeAll();
       utils.logInfo.restore();
       config.resetConfig();
     });
 
-    after(function() {
-      coreStorage.setCookie('_pbjs_id_optout', '', EXPIRED_COOKIE_DATE);
-    });
-
-    it('fails initialization if opt out cookie exists', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule]);
+    it('does not fetch ids if opt out cookie exists', function () {
       init(config);
-      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');
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
+      const cfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
+      cfg.userSync.auctionDelay = 1; // to let init complete without an auction
+      config.setConfig(cfg);
+      return getGlobal().getUserIdsAsync().then((uid) => {
+        expect(uid).to.eql({});
+      })
     });
 
-    it('initializes if no opt out cookie exists', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule]);
+    it('initializes if no opt out cookie exists', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule]);
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 1 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
   });
 
-  describe('Handle variations of config values', function() {
-    beforeEach(function() {
+  describe('Handle variations of config values', function () {
+    beforeEach(function () {
       sinon.stub(utils, 'logInfo');
     });
 
-    afterEach(function() {
+    afterEach(function () {
       $$PREBID_GLOBAL$$.requestBids.removeAll();
       utils.logInfo.restore();
       config.resetConfig();
     });
 
-    it('handles config with no usersync object', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with no usersync object', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, 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([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with empty usersync object', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, 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([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with usersync and userIds that are empty objs', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           userIds: [{}]
@@ -363,9 +825,9 @@ describe('User ID', function() {
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
-    it('handles config with usersync and userIds with empty names or that dont match a submodule.name', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with usersync and userIds with empty names or that dont match a submodule.name', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           userIds: [{
@@ -380,21 +842,37 @@ describe('User ID', function() {
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
-    it('config with 1 configurations should create 1 submodules', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config with 1 configurations should create 1 submodules', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig(getConfigMock(['unifiedId', 'unifiedid', 'cookie']));
 
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 1 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
 
-    it('config with 8 configurations should result in 8 submodules add', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with name in different case', function () {
       init(config);
+      setSubmoduleRegistry([criteoIdSubmodule]);
+      config.setConfig({
+        userSync: {
+          userIds: [{
+            name: 'Criteo'
+          }]
+        }
+      });
+
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
+    });
+
+    it('config with 22 configurations should result in 22 submodules add', function () {
+      init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule, tncidSubModule]);
       config.setConfig({
         userSync: {
           syncDelay: 0,
           userIds: [{
+            name: 'pubProvidedId'
+          }, {
             name: 'pubCommonId', value: {'pubcid': '11111'}
           }, {
             name: 'unifiedId',
@@ -415,17 +893,51 @@ describe('User ID', function() {
             name: 'netId',
             storage: {name: 'netId', type: 'cookie'}
           }, {
-            name: 'sharedId',
-            storage: {name: 'sharedid', type: 'cookie'}
+            name: 'intentIqId',
+            storage: {name: 'intentIqId', type: 'cookie'}
+          }, {
+            name: 'hadronId',
+            storage: {name: 'hadronId', type: 'cookie'}
+          }, {
+            name: 'zeotapIdPlus'
+          }, {
+            name: 'criteo'
+          }, {
+            name: 'mwOpenLinkId'
+          }, {
+            name: 'tapadId',
+            storage: {name: 'tapad_id', type: 'cookie'}
+          }, {
+            name: 'uid2'
+          }, {
+            name: 'admixerId',
+            storage: {name: 'admixerId', type: 'cookie'}
+          }, {
+            name: 'deepintentId',
+            storage: {name: 'deepintentId', type: 'cookie'}
+          }, {
+            name: 'dmdId',
+            storage: {name: 'dmdId', type: 'cookie'}
+          }, {
+            name: 'amxId',
+            storage: {name: 'amxId', type: 'html5'}
+          }, {
+            name: 'kpuid',
+            storage: {name: 'kpuid', type: 'cookie'}
+          }, {
+            name: 'qid',
+            storage: {name: 'qid', type: 'html5'}
+          }, {
+            name: 'tncId'
           }]
         }
       });
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 8 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 22 submodules');
     });
 
-    it('config syncDelay updates module correctly', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config syncDelay updates module correctly', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           syncDelay: 99,
@@ -438,9 +950,9 @@ describe('User ID', function() {
       expect(syncDelay).to.equal(99);
     });
 
-    it('config auctionDelay updates module correctly', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config auctionDelay updates module correctly', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           auctionDelay: 100,
@@ -453,9 +965,9 @@ describe('User ID', function() {
       expect(auctionDelay).to.equal(100);
     });
 
-    it('config auctionDelay defaults to 0 if not a number', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config auctionDelay defaults to 0 if not a number', function () {
       init(config);
+      setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
       config.setConfig({
         userSync: {
           auctionDelay: '',
@@ -467,949 +979,1903 @@ describe('User ID', function() {
       });
       expect(auctionDelay).to.equal(0);
     });
-  });
-
-  describe('auction and user sync delays', function() {
-    let sandbox;
-    let adUnits;
-    let mockIdCallback;
-    let auctionSpy;
 
-    beforeEach(function() {
-      sandbox = sinon.createSandbox();
-      sandbox.stub(global, 'setTimeout').returns(2);
-      sandbox.stub(events, 'on');
-      sandbox.stub(coreStorage, 'getCookie');
+    describe('auction and user sync delays', function () {
+      let sandbox;
+      let adUnits;
+      let mockIdCallback;
+      let auctionSpy;
 
-      // remove cookie
-      coreStorage.setCookie('MOCKID', '', EXPIRED_COOKIE_DATE);
+      beforeEach(function () {
+        sandbox = sinon.createSandbox();
+        sandbox.stub(events, 'on');
+        sandbox.stub(coreStorage, 'getCookie');
 
-      adUnits = [getAdUnitMock()];
+        // remove cookie
+        coreStorage.setCookie('MOCKID', '', EXPIRED_COOKIE_DATE);
 
-      auctionSpy = sandbox.spy();
-      mockIdCallback = sandbox.stub();
-      const mockIdSystem = {
-        name: 'mockId',
-        decode: function(value) {
-          return {
-            'mid': value['MOCKID']
-          };
-        },
-        getId: function() {
-          const storedId = coreStorage.getCookie('MOCKID');
-          if (storedId) {
-            return {id: {'MOCKID': storedId}};
+        adUnits = [getAdUnitMock()];
+
+        auctionSpy = sandbox.spy();
+        mockIdCallback = sandbox.stub();
+        const mockIdSystem = {
+          name: 'mockId',
+          decode: function (value) {
+            return {
+              'mid': value['MOCKID']
+            };
+          },
+          getId: function () {
+            const storedId = coreStorage.getCookie('MOCKID');
+            if (storedId) {
+              return {id: {'MOCKID': storedId}};
+            }
+            return {callback: mockIdCallback};
           }
-          return {callback: mockIdCallback};
-        }
-      };
-
-      init(config);
-
-      attachIdSystem(mockIdSystem, true);
-    });
-
-    afterEach(function() {
-      $$PREBID_GLOBAL$$.requestBids.removeAll();
-      config.resetConfig();
-      sandbox.restore();
-    });
-
-    it('delays auction if auctionDelay is set, timing out at auction delay', function() {
-      config.setConfig({
-        userSync: {
-          auctionDelay: 33,
-          syncDelay: 77,
-          userIds: [{
-            name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
-          }]
-        }
+        };
+        initModule(config);
+        attachIdSystem(mockIdSystem, true);
       });
 
-      requestBidsHook(auctionSpy, {adUnits});
+      afterEach(function () {
+        $$PREBID_GLOBAL$$.requestBids.removeAll();
+        config.resetConfig();
+        sandbox.restore();
+      });
 
-      // check auction was delayed
-      global.setTimeout.calledOnce.should.equal(true);
-      global.setTimeout.calledWith(sinon.match.func, 33);
-      auctionSpy.calledOnce.should.equal(false);
+      it('delays auction if auctionDelay is set, timing out at auction delay', function () {
+        config.setConfig({
+          userSync: {
+            auctionDelay: 33,
+            syncDelay: 77,
+            userIds: [{
+              name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
+            }]
+          }
+        });
 
-      // check ids were fetched
-      mockIdCallback.calledOnce.should.equal(true);
+        return runBidsHook(auctionSpy, {adUnits}).then(() => {
+          // check auction was delayed
+          startDelay.calledWith(33);
+          auctionSpy.calledOnce.should.equal(false);
 
-      // callback to continue auction if timed out
-      global.setTimeout.callArg(0);
-      auctionSpy.calledOnce.should.equal(true);
+          // check ids were fetched
+          mockIdCallback.calledOnce.should.equal(true);
 
-      // does not call auction again once ids are synced
-      mockIdCallback.callArgWith(0, {'MOCKID': '1234'});
-      auctionSpy.calledOnce.should.equal(true);
+          // mock timeout
+          return startDelay.resolve();
+        }).then(() => {
+          auctionSpy.calledOnce.should.equal(true);
 
-      // no sync after auction ends
-      events.on.called.should.equal(false);
-    });
+          // does not call auction again once ids are synced
+          mockIdCallback.callArgWith(0, {'MOCKID': '1234'});
+          auctionSpy.calledOnce.should.equal(true);
 
-    it('delays auction if auctionDelay is set, continuing auction if ids are fetched before timing out', function(done) {
-      config.setConfig({
-        userSync: {
-          auctionDelay: 33,
-          syncDelay: 77,
-          userIds: [{
-            name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
-          }]
-        }
+          // no sync after auction ends
+          events.on.called.should.equal(false);
+        });
       });
 
-      requestBidsHook(auctionSpy, {adUnits});
+      it('delays auction if auctionDelay is set, continuing auction if ids are fetched before timing out', function () {
+        config.setConfig({
+          userSync: {
+            auctionDelay: 33,
+            syncDelay: 77,
+            userIds: [{
+              name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
+            }]
+          }
+        });
 
-      // check auction was delayed
-      // global.setTimeout.calledOnce.should.equal(true);
-      global.setTimeout.calledWith(sinon.match.func, 33);
-      auctionSpy.calledOnce.should.equal(false);
+        return runBidsHook(auctionSpy, {adUnits}).then(() => {
+          // check auction was delayed
+          startDelay.calledWith(33);
+          auctionSpy.calledOnce.should.equal(false);
+
+          // 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);
+
+          // 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 fetched
-      mockIdCallback.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
+          // no sync after auction ends
+          events.on.called.should.equal(false);
         });
-        done();
       });
 
-      // 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 () {
+        config.setConfig({
+          userSync: {
+            syncDelay: 77,
+            userIds: [{
+              name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
+            }]
+          }
+        });
 
-    it('does not delay auction if not set, delays id fetch after auction ends with syncDelay', function() {
-      config.setConfig({
-        userSync: {
-          syncDelay: 77,
-          userIds: [{
-            name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
-          }]
-        }
+        // check config has been set correctly
+        expect(auctionDelay).to.equal(0);
+        expect(syncDelay).to.equal(77);
+
+        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);
+          });
       });
 
-      // check config has been set correctly
-      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);
+      it('does not delay user id sync after auction ends if set to 0', function () {
+        config.setConfig({
+          userSync: {
+            syncDelay: 0,
+            userIds: [{
+              name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
+            }]
+          }
+        });
 
-      // 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);
+        expect(syncDelay).to.equal(0);
 
-      // 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);
+        return expectImmediateBidHook(auctionSpy, {adUnits})
+          .then(() => {
+            // auction should not be delayed
+            auctionSpy.calledOnce.should.equal(true);
 
-      // once sync delay is over, ids should be fetched
-      global.setTimeout.callArg(0);
-      mockIdCallback.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);
 
-    it('does not delay user id sync after auction ends if set to 0', function() {
-      config.setConfig({
-        userSync: {
-          syncDelay: 0,
-          userIds: [{
-            name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
-          }]
-        }
+            // 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);
+          });
       });
 
-      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);
+      it('does not delay auction if there are no ids to fetch', function () {
+        coreStorage.getCookie.withArgs('MOCKID').returns('123456778');
+        config.setConfig({
+          userSync: {
+            auctionDelay: 33,
+            syncDelay: 77,
+            userIds: [{
+              name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
+            }]
+          }
+        });
 
-      // 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 runBidsHook(auctionSpy, {adUnits}).then(() => {
+          auctionSpy.calledOnce.should.equal(true);
+          mockIdCallback.calledOnce.should.equal(false);
 
-    it('does not delay auction if there are no ids to fetch', function() {
-      coreStorage.getCookie.withArgs('MOCKID').returns('123456778');
-      config.setConfig({
-        usersync: {
-          auctionDelay: 33,
-          syncDelay: 77,
-          userIds: [{
-            name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
-          }]
-        }
+          // no sync after auction ends
+          events.on.called.should.equal(false);
+        });
       });
-
-      requestBidsHook(auctionSpy, {adUnits});
-
-      global.setTimeout.calledOnce.should.equal(false);
-      auctionSpy.calledOnce.should.equal(true);
-      mockIdCallback.calledOnce.should.equal(false);
-
-      // no sync after auction ends
-      events.on.called.should.equal(false);
     });
-  });
-
-  describe('Request bids hook appends userId to bid objs in adapters', function() {
-    let adUnits;
 
-    beforeEach(function() {
-      adUnits = [getAdUnitMock()];
-    });
+    describe('Request bids hook appends userId to bid objs in adapters', function () {
+      let adUnits;
 
-    it('test hook from pubcommonid cookie', function(done) {
-      coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 100000).toUTCString()));
+      beforeEach(function () {
+        adUnits = [getAdUnitMock()];
+      });
 
-      setSubmoduleRegistry([pubCommonIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
+      it('test hook from pubcommonid cookie', function (done) {
+        coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 100000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+        config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.pubcid');
+              expect(bid.userId.pubcid).to.equal('testpubcid');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'pubcid.org',
+                uids: [{id: 'testpubcid', atype: 1}]
+              });
+            });
+          });
+          coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.pubcid');
-            expect(bid.userId.pubcid).to.equal('testpubcid');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'pubcid.org',
-              uids: [{id: 'testpubcid', atype: 1}]
+      it('test hook from pubcommonid html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('pubcid', 'testpubcid');
+        localStorage.setItem('pubcid_exp', new Date(Date.now() + 100000).toUTCString());
+
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+        config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'html5']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.pubcid');
+              expect(bid.userId.pubcid).to.equal('testpubcid');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'pubcid.org',
+                uids: [{id: 'testpubcid', atype: 1}]
+              });
             });
           });
-        });
-        coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
+          localStorage.removeItem('pubcid');
+          localStorage.removeItem('pubcid_exp');
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from pubcommonid config value object', function(done) {
-      setSubmoduleRegistry([pubCommonIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigValueMock('pubCommonId', {'pubcidvalue': 'testpubcidvalue'}));
+      it('test hook from pubcommonid config value object', function (done) {
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+        config.setConfig(getConfigValueMock('pubCommonId', {'pubcidvalue': 'testpubcidvalue'}));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.pubcidvalue');
+              expect(bid.userId.pubcidvalue).to.equal('testpubcidvalue');
+              expect(bid.userIdAsEids.length).to.equal(0);// "pubcidvalue" is an un-known submodule for USER_IDS_CONFIG in eids.js
+            });
+          });
+          done();
+        }, {adUnits});
+      });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.pubcidvalue');
-            expect(bid.userId.pubcidvalue).to.equal('testpubcidvalue');
-            expect(bid.userIdAsEids.length).to.equal(0);// "pubcidvalue" is an un-known submodule for USER_IDS_CONFIG in eids.js
+      it('test hook from UnifiedId html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('unifiedid_alt', JSON.stringify({'TDID': 'testunifiedid_alt'}));
+        localStorage.setItem('unifiedid_alt_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([unifiedIdSubmodule]);
+        config.setConfig(getConfigMock(['unifiedId', 'unifiedid_alt', 'html5']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.tdid');
+              expect(bid.userId.tdid).to.equal('testunifiedid_alt');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'adserver.org',
+                uids: [{id: 'testunifiedid_alt', atype: 1, ext: {rtiPartner: 'TDID'}}]
+              });
+            });
           });
-        });
-        done();
-      }, {adUnits});
-    });
+          localStorage.removeItem('unifiedid_alt');
+          localStorage.removeItem('unifiedid_alt_exp');
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from pubcommonid html5', function(done) {
-      // simulate existing browser local storage values
-      localStorage.setItem('unifiedid_alt', JSON.stringify({'TDID': 'testunifiedid_alt'}));
-      localStorage.setItem('unifiedid_alt_exp', '');
+      it('test hook from amxId html5', (done) => {
+        // simulate existing localStorage values
+        localStorage.setItem('amxId', 'test_amxid_id');
+        localStorage.setItem('amxId_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([amxIdSubmodule]);
+        config.setConfig(getConfigMock(['amxId', 'amxId', 'html5']));
+
+        requestBidsHook(() => {
+          adUnits.forEach((adUnit) => {
+            adUnit.bids.forEach((bid) => {
+              expect(bid).to.have.deep.nested.property('userId.amxId');
+              expect(bid.userId.amxId).to.equal('test_amxid_id');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'amxrtb.com',
+                uids: [{
+                  id: 'test_amxid_id',
+                  atype: 1,
+                }]
+              });
+            });
+          });
 
-      setSubmoduleRegistry([unifiedIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['unifiedId', 'unifiedid_alt', 'html5']));
+          // clear LS
+          localStorage.removeItem('amxId');
+          localStorage.removeItem('amxId_exp');
+          done();
+        }, {adUnits});
+      });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.tdid');
-            expect(bid.userId.tdid).to.equal('testunifiedid_alt');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'adserver.org',
-              uids: [{id: 'testunifiedid_alt', atype: 1, ext: {rtiPartner: 'TDID'}}]
+      it('test hook from identityLink html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('idl_env', 'AiGNC8Z5ONyZKSpIPf');
+        localStorage.setItem('idl_env_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([identityLinkSubmodule]);
+        config.setConfig(getConfigMock(['identityLink', 'idl_env', 'html5']));
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.idl_env');
+              expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'liveramp.com',
+                uids: [{id: 'AiGNC8Z5ONyZKSpIPf', atype: 3}]
+              });
             });
           });
-        });
-        localStorage.removeItem('unifiedid_alt');
-        localStorage.removeItem('unifiedid_alt_exp');
-        done();
-      }, {adUnits});
-    });
+          localStorage.removeItem('idl_env');
+          localStorage.removeItem('idl_env_exp');
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from identityLink html5', function(done) {
-      // simulate existing browser local storage values
-      localStorage.setItem('idl_env', 'AiGNC8Z5ONyZKSpIPf');
-      localStorage.setItem('idl_env_exp', '');
+      it('test hook from identityLink cookie', function (done) {
+        coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', (new Date(Date.now() + 100000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([identityLinkSubmodule]);
+        config.setConfig(getConfigMock(['identityLink', 'idl_env', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.idl_env');
+              expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'liveramp.com',
+                uids: [{id: 'AiGNC8Z5ONyZKSpIPf', atype: 3}]
+              });
+            });
+          });
+          coreStorage.setCookie('idl_env', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([identityLinkSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['identityLink', 'idl_env', 'html5']));
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.idl_env');
-            expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'liveramp.com',
-              uids: [{id: 'AiGNC8Z5ONyZKSpIPf', atype: 1}]
+      it('test hook from criteoIdModule cookie', function (done) {
+        coreStorage.setCookie('storage_bidid', JSON.stringify({'criteoId': 'test_bidid'}), (new Date(Date.now() + 100000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([criteoIdSubmodule]);
+        config.setConfig(getConfigMock(['criteo', 'storage_bidid', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.criteoId');
+              expect(bid.userId.criteoId).to.equal('test_bidid');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'criteo.com',
+                uids: [{id: 'test_bidid', atype: 1}]
+              });
             });
           });
-        });
-        localStorage.removeItem('idl_env');
-        localStorage.removeItem('idl_env_exp');
-        done();
-      }, {adUnits});
-    });
+          coreStorage.setCookie('storage_bidid', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from identityLink cookie', function(done) {
-      coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', (new Date(Date.now() + 100000).toUTCString()));
+      it('test hook from tapadIdModule cookie', function (done) {
+        coreStorage.setCookie('tapad_id', 'test-tapad-id', (new Date(Date.now() + 100000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([tapadIdSubmodule]);
+        config.setConfig(getConfigMock(['tapadId', 'tapad_id', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.tapadId');
+              expect(bid.userId.tapadId).to.equal('test-tapad-id');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'tapad.com',
+                uids: [{id: 'test-tapad-id', atype: 1}]
+              });
+            });
+          })
+          coreStorage.setCookie('tapad_id', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([identityLinkSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['identityLink', 'idl_env', 'cookie']));
+      it('test hook from liveIntentId html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier'}));
+        localStorage.setItem('_li_pbid_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([liveIntentIdSubmodule]);
+        config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'html5']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.lipb');
+              expect(bid.userId.lipb.lipbid).to.equal('random-ls-identifier');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'liveintent.com',
+                uids: [{id: 'random-ls-identifier', atype: 3}]
+              });
+            });
+          });
+          localStorage.removeItem('_li_pbid');
+          localStorage.removeItem('_li_pbid_exp');
+          done();
+        }, {adUnits});
+      });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.idl_env');
-            expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'liveramp.com',
-              uids: [{id: 'AiGNC8Z5ONyZKSpIPf', atype: 1}]
+      it('test hook from Kinesso cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('kpuid', 'KINESSO_ID', (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([kinessoIdSubmodule]);
+        config.setConfig(getConfigMock(['kpuid', 'kpuid', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.kpuid');
+              expect(bid.userId.kpuid).to.equal('KINESSO_ID');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'kpuid.com',
+                uids: [{id: 'KINESSO_ID', atype: 3}]
+              });
             });
           });
-        });
-        coreStorage.setCookie('idl_env', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
+          coreStorage.setCookie('kpuid', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from liveIntentId html5', function(done) {
-      // simulate existing browser local storage values
-      localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier'}));
-      localStorage.setItem('_li_pbid_exp', '');
+      it('test hook from Kinesso html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('kpuid', 'KINESSO_ID');
+        localStorage.setItem('kpuid_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([kinessoIdSubmodule]);
+        config.setConfig(getConfigMock(['kpuid', 'kpuid', 'html5']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.kpuid');
+              expect(bid.userId.kpuid).to.equal('KINESSO_ID');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'kpuid.com',
+                uids: [{id: 'KINESSO_ID', atype: 3}]
+              });
+            });
+          });
+          localStorage.removeItem('kpuid');
+          localStorage.removeItem('kpuid_exp', '');
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([liveIntentIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'html5']));
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.lipb');
-            expect(bid.userId.lipb.lipbid).to.equal('random-ls-identifier');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'liveintent.com',
-              uids: [{id: 'random-ls-identifier', atype: 1}]
+      it('test hook from liveIntentId cookie', function (done) {
+        coreStorage.setCookie('_li_pbid', JSON.stringify({'unifiedId': 'random-cookie-identifier'}), (new Date(Date.now() + 100000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([liveIntentIdSubmodule]);
+        config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.lipb');
+              expect(bid.userId.lipb.lipbid).to.equal('random-cookie-identifier');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'liveintent.com',
+                uids: [{id: 'random-cookie-identifier', atype: 3}]
+              });
             });
           });
-        });
-        localStorage.removeItem('_li_pbid');
-        localStorage.removeItem('_li_pbid_exp');
-        done();
-      }, {adUnits});
-    });
+          coreStorage.setCookie('_li_pbid', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from liveIntentId cookie', function(done) {
-      coreStorage.setCookie('_li_pbid', JSON.stringify({'unifiedId': 'random-cookie-identifier'}), (new Date(Date.now() + 100000).toUTCString()));
+      it('eidPermissions fun with bidders', function (done) {
+        coreStorage.setCookie('pubcid', 'test222', (new Date(Date.now() + 5000).toUTCString()));
 
-      setSubmoduleRegistry([liveIntentIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'cookie']));
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+        let eidPermissions;
+        getPrebidInternal().setEidPermissions = function (newEidPermissions) {
+          eidPermissions = newEidPermissions;
+        }
+        config.setConfig({
+          userSync: {
+            syncDelay: 0,
+            userIds: [
+              {
+                name: 'pubCommonId',
+                bidders: [
+                  'sampleBidder'
+                ],
+                storage: {
+                  type: 'cookie',
+                  name: 'pubcid',
+                  expires: 28
+                }
+              }
+            ]
+          }
+        });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.lipb');
-            expect(bid.userId.lipb.lipbid).to.equal('random-cookie-identifier');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'liveintent.com',
-              uids: [{id: 'random-cookie-identifier', atype: 1}]
+        requestBidsHook(function () {
+          expect(eidPermissions).to.deep.equal(
+            [
+              {
+                bidders: [
+                  'sampleBidder'
+                ],
+                source: 'pubcid.org'
+              }
+            ]
+          );
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              if (bid.bidder === 'sampleBidder') {
+                expect(bid).to.have.deep.nested.property('userId.pubcid');
+                expect(bid.userId.pubcid).to.equal('test222');
+                expect(bid.userIdAsEids[0]).to.deep.equal({
+                  source: 'pubcid.org',
+                  uids: [
+                    {
+                      id: 'test222',
+                      atype: 1
+                    }
+                  ]
+                });
+              }
+              if (bid.bidder === 'anotherSampleBidder') {
+                expect(bid).to.not.have.deep.nested.property('userId.pubcid');
+                expect(bid).to.not.have.property('userIdAsEids');
+              }
             });
           });
-        });
-        coreStorage.setCookie('_li_pbid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
+          coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+          getPrebidInternal().setEidPermissions = undefined;
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from sharedId html5', function(done) {
-      // simulate existing browser local storage values
-      localStorage.setItem('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}));
-      localStorage.setItem('sharedid_exp', '');
+      it('eidPermissions fun without bidders', function (done) {
+        coreStorage.setCookie('pubcid', 'test222', new Date(Date.now() + 5000).toUTCString());
 
-      setSubmoduleRegistry([sharedIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['sharedId', 'sharedid', 'html5']));
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.sharedid');
-            expect(bid.userId.sharedid).to.have.deep.nested.property('id');
-            expect(bid.userId.sharedid).to.have.deep.nested.property('third');
-            expect(bid.userId.sharedid).to.deep.equal({
-              id: 'test_sharedId',
-              third: 'test_sharedId'
-            });
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'sharedid.org',
-              uids: [{
-                id: 'test_sharedId',
-                atype: 1,
-                ext: {
-                  third: 'test_sharedId'
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+        let eidPermissions;
+        getPrebidInternal().setEidPermissions = function (newEidPermissions) {
+          eidPermissions = newEidPermissions;
+        }
+        config.setConfig({
+          userSync: {
+            syncDelay: 0,
+            userIds: [
+              {
+                name: 'pubCommonId',
+                storage: {
+                  type: 'cookie',
+                  name: 'pubcid',
+                  expires: 28
                 }
-              }]
+              }
+            ]
+          }
+        });
+
+        requestBidsHook(function () {
+          expect(eidPermissions).to.deep.equal(
+            []
+          );
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.pubcid');
+              expect(bid.userId.pubcid).to.equal('test222');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'pubcid.org',
+                uids: [
+                  {
+                    id: 'test222',
+                    atype: 1
+                  }]
+              });
             });
           });
+          getPrebidInternal().setEidPermissions = undefined;
+          coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
+
+      it('test hook from pubProvidedId config params', function (done) {
+        init(config);
+        setSubmoduleRegistry([pubProvidedIdSubmodule]);
+        config.setConfig({
+          userSync: {
+            syncDelay: 0,
+            userIds: [{
+              name: 'pubProvidedId',
+              params: {
+                eids: [{
+                  source: 'example.com',
+                  uids: [{
+                    id: 'value read from cookie or local storage',
+                    ext: {
+                      stype: 'ppuid'
+                    }
+                  }]
+                }, {
+                  source: 'id-partner.com',
+                  uids: [{
+                    id: 'value read from cookie or local storage',
+                    ext: {
+                      stype: 'dmp'
+                    }
+                  }]
+                }],
+                eidsFunction: function () {
+                  return [{
+                    source: 'provider.com',
+                    uids: [{
+                      id: 'value read from cookie or local storage',
+                      ext: {
+                        stype: 'sha256email'
+                      }
+                    }]
+                  }]
+                }
+              }
+            }
+            ]
+          }
         });
-        localStorage.removeItem('sharedid');
-        localStorage.removeItem('sharedid_exp');
-        done();
-      }, {adUnits});
-    });
 
-    it('test hook from sharedId html5 (id not synced)', function(done) {
-      // simulate existing browser local storage values
-      localStorage.setItem('sharedid', JSON.stringify({'id': 'test_sharedId', 'ns': true, 'ts': 1590525289611}));
-      localStorage.setItem('sharedid_exp', '');
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.pubProvidedId');
+              expect(bid.userId.pubProvidedId).to.deep.equal([{
+                source: 'example.com',
+                uids: [{
+                  id: 'value read from cookie or local storage',
+                  ext: {
+                    stype: 'ppuid'
+                  }
+                }]
+              }, {
+                source: 'id-partner.com',
+                uids: [{
+                  id: 'value read from cookie or local storage',
+                  ext: {
+                    stype: 'dmp'
+                  }
+                }]
+              }, {
+                source: 'provider.com',
+                uids: [{
+                  id: 'value read from cookie or local storage',
+                  ext: {
+                    stype: 'sha256email'
+                  }
+                }]
+              }]);
+
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'example.com',
+                uids: [{
+                  id: 'value read from cookie or local storage',
+                  ext: {
+                    stype: 'ppuid'
+                  }
+                }]
+              });
+              expect(bid.userIdAsEids[2]).to.deep.equal({
+                source: 'provider.com',
+                uids: [{
+                  id: 'value read from cookie or local storage',
+                  ext: {
+                    stype: 'sha256email'
+                  }
+                }]
+              });
+            });
+          });
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([sharedIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['sharedId', 'sharedid', 'html5']));
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.sharedid');
-            expect(bid.userId.sharedid).to.have.deep.nested.property('id');
-            expect(bid.userId.sharedid).to.deep.equal({
-              id: 'test_sharedId'
+      it('test hook from liveIntentId html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier', 'segments': ['123']}));
+        localStorage.setItem('_li_pbid_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([liveIntentIdSubmodule]);
+        config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'html5']));
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.lipb');
+              expect(bid.userId.lipb.lipbid).to.equal('random-ls-identifier');
+              expect(bid.userId.lipb.segments).to.include('123');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'liveintent.com',
+                uids: [{id: 'random-ls-identifier', atype: 3}],
+                ext: {segments: ['123']}
+              });
             });
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'sharedid.org',
-              uids: [{
-                id: 'test_sharedId',
-                atype: 1
-              }]
+          });
+          localStorage.removeItem('_li_pbid');
+          localStorage.removeItem('_li_pbid_exp');
+          done();
+        }, {adUnits});
+      });
+
+      it('test hook from liveIntentId cookie', function (done) {
+        coreStorage.setCookie('_li_pbid', JSON.stringify({
+          'unifiedId': 'random-cookie-identifier',
+          'segments': ['123']
+        }), (new Date(Date.now() + 100000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([liveIntentIdSubmodule]);
+        config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.lipb');
+              expect(bid.userId.lipb.lipbid).to.equal('random-cookie-identifier');
+              expect(bid.userId.lipb.segments).to.include('123');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'liveintent.com',
+                uids: [{id: 'random-cookie-identifier', atype: 3}],
+                ext: {segments: ['123']}
+              });
             });
           });
-        });
-        localStorage.removeItem('sharedid');
-        localStorage.removeItem('sharedid_exp');
-        done();
-      }, {adUnits});
-    });
-    it('test hook from sharedId cookie', function(done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}), (new Date(Date.now() + 100000).toUTCString()));
+          coreStorage.setCookie('_li_pbid', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([sharedIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['sharedId', 'sharedid', 'cookie']));
+      it('test hook from britepoolid cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': '279c0161-5152-487f-809e-05d7f7e653fd'}), (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([britepoolIdSubmodule]);
+        config.setConfig(getConfigMock(['britepoolId', 'britepoolid', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.britepoolid');
+              expect(bid.userId.britepoolid).to.equal('279c0161-5152-487f-809e-05d7f7e653fd');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'britepool.com',
+                uids: [{id: '279c0161-5152-487f-809e-05d7f7e653fd', atype: 3}]
+              });
+            });
+          });
+          coreStorage.setCookie('britepoolid', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.sharedid');
-            expect(bid.userId.sharedid).to.have.deep.nested.property('id');
-            expect(bid.userId.sharedid).to.have.deep.nested.property('third');
-            expect(bid.userId.sharedid).to.deep.equal({
-              id: 'test_sharedId',
-              third: 'test_sharedId'
+      it('test hook from dmdId cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('dmdId', 'testdmdId', (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([dmdIdSubmodule]);
+        config.setConfig(getConfigMock(['dmdId', 'dmdId', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.dmdId');
+              expect(bid.userId.dmdId).to.equal('testdmdId');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'hcn.health',
+                uids: [{id: 'testdmdId', atype: 3}]
+              });
             });
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'sharedid.org',
-              uids: [{
-                id: 'test_sharedId',
-                atype: 1,
-                ext: {
-                  third: 'test_sharedId'
-                }
-              }]
+          });
+          coreStorage.setCookie('dmdId', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
+
+      it('test hook from netId cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('netId', JSON.stringify({'netId': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg'}), (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([netIdSubmodule]);
+        config.setConfig(getConfigMock(['netId', 'netId', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.netId');
+              expect(bid.userId.netId).to.equal('fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'netid.de',
+                uids: [{id: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg', atype: 1}]
+              });
             });
           });
-        });
-        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
-    it('test hook from sharedId cookie (id not synced) ', function(done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': 'test_sharedId', 'ns': true, 'ts': 1590525289611}), (new Date(Date.now() + 100000).toUTCString()));
+          coreStorage.setCookie('netId', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([sharedIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['sharedId', 'sharedid', 'cookie']));
+      it('test hook from intentIqId cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('intentIqId', 'abcdefghijk', (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([intentIqIdSubmodule]);
+        config.setConfig(getConfigMock(['intentIqId', 'intentIqId', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.intentIqId');
+              expect(bid.userId.intentIqId).to.equal('abcdefghijk');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'intentiq.com',
+                uids: [{id: 'abcdefghijk', atype: 1}]
+              });
+            });
+          });
+          coreStorage.setCookie('intentIqId', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.sharedid');
-            expect(bid.userId.sharedid).to.have.deep.nested.property('id');
-            expect(bid.userId.sharedid).to.deep.equal({
-              id: 'test_sharedId'
+      it('test hook from hadronId html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('hadronId', JSON.stringify({'hadronId': 'random-ls-identifier'}));
+        localStorage.setItem('hadronId_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([hadronIdSubmodule]);
+        config.setConfig(getConfigMock(['hadronId', 'hadronId', 'html5']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.hadronId');
+              expect(bid.userId.hadronId).to.equal('random-ls-identifier');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'audigent.com',
+                uids: [{id: 'random-ls-identifier', atype: 1}]
+              });
             });
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'sharedid.org',
-              uids: [{
-                id: 'test_sharedId',
-                atype: 1
-              }]
+          });
+          localStorage.removeItem('hadronId');
+          localStorage.removeItem('hadronId_exp', '');
+          done();
+        }, {adUnits});
+      });
+
+      it('test hook from merkleId cookies - legacy', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('merkleId', JSON.stringify({'pam_id': {'id': 'testmerkleId', 'keyID': 1}}), (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([merkleIdSubmodule]);
+        config.setConfig(getConfigMock(['merkleId', 'merkleId', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.merkleId');
+              expect(bid.userId.merkleId).to.deep.equal({'id': 'testmerkleId', 'keyID': 1});
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'merkleinc.com',
+                uids: [{id: 'testmerkleId', atype: 3, ext: {keyID: 1}}]
+              });
             });
           });
-        });
-        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
+          coreStorage.setCookie('merkleId', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from liveIntentId html5', function(done) {
-      // simulate existing browser local storage values
-      localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier', 'segments': ['123']}));
-      localStorage.setItem('_li_pbid_exp', '');
+      it('test hook from merkleId cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('merkleId', JSON.stringify({
+          'merkleId': [{id: 'testmerkleId', ext: { keyID: 1, ssp: 'ssp1' }}, {id: 'another-random-id-value', ext: { ssp: 'ssp2' }}],
+          '_svsid': 'svs-id-1'
+        }), (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([merkleIdSubmodule]);
+        config.setConfig(getConfigMock(['merkleId', 'merkleId', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.merkleId');
+              expect(bid.userId.merkleId.length).to.equal(2);
+              expect(bid.userIdAsEids.length).to.equal(2);
+              expect(bid.userIdAsEids[0]).to.deep.equal({ source: 'ssp1.merkleinc.com', uids: [{id: 'testmerkleId', atype: 3, ext: { keyID: 1, ssp: 'ssp1' }}] });
+              expect(bid.userIdAsEids[1]).to.deep.equal({ source: 'ssp2.merkleinc.com', uids: [{id: 'another-random-id-value', atype: 3, ext: { ssp: 'ssp2' }}] });
+            });
+          });
+          coreStorage.setCookie('merkleId', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([liveIntentIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'html5']));
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.lipb');
-            expect(bid.userId.lipb.lipbid).to.equal('random-ls-identifier');
-            expect(bid.userId.lipb.segments).to.include('123');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'liveintent.com',
-              uids: [{id: 'random-ls-identifier', atype: 1}],
-              ext: {segments: ['123']}
+      it('test hook from zeotapIdPlus cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('IDP', btoa(JSON.stringify('abcdefghijk')), (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([zeotapIdPlusSubmodule]);
+        config.setConfig(getConfigMock(['zeotapIdPlus', 'IDP', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.IDP');
+              expect(bid.userId.IDP).to.equal('abcdefghijk');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'zeotap.com',
+                uids: [{id: 'abcdefghijk', atype: 1}]
+              });
             });
           });
-        });
-        localStorage.removeItem('_li_pbid');
-        localStorage.removeItem('_li_pbid_exp');
-        done();
-      }, {adUnits});
-    });
+          coreStorage.setCookie('IDP', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from liveIntentId cookie', function(done) {
-      coreStorage.setCookie('_li_pbid', JSON.stringify({
-        'unifiedId': 'random-cookie-identifier',
-        'segments': ['123']
-      }), (new Date(Date.now() + 100000).toUTCString()));
+      it('test hook from mwOpenLinkId cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('mwol', JSON.stringify({eid: 'XX-YY-ZZ-123'}), (new Date(Date.now() + 5000).toUTCString()));
 
-      setSubmoduleRegistry([liveIntentIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'cookie']));
+        init(config);
+        setSubmoduleRegistry([mwOpenLinkIdSubModule]);
+        config.setConfig(getConfigMock(['mwOpenLinkId', 'mwol', 'cookie']));
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.lipb');
-            expect(bid.userId.lipb.lipbid).to.equal('random-cookie-identifier');
-            expect(bid.userId.lipb.segments).to.include('123');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'liveintent.com',
-              uids: [{id: 'random-cookie-identifier', atype: 1}],
-              ext: {segments: ['123']}
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.mwOpenLinkId');
+              expect(bid.userId.mwOpenLinkId).to.equal('XX-YY-ZZ-123');
             });
           });
-        });
-        coreStorage.setCookie('_li_pbid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
+          coreStorage.setCookie('mwol', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from britepoolid cookies', function(done) {
-      // simulate existing browser local storage values
-      coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': '279c0161-5152-487f-809e-05d7f7e653fd'}), (new Date(Date.now() + 5000).toUTCString()));
+      it('test hook from admixerId html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('admixerId', 'testadmixerId');
+        localStorage.setItem('admixerId_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([admixerIdSubmodule]);
+        config.setConfig(getConfigMock(['admixerId', 'admixerId', 'html5']));
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.admixerId');
+              expect(bid.userId.admixerId).to.equal('testadmixerId');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'admixer.net',
+                uids: [{id: 'testadmixerId', atype: 3}]
+              });
+            });
+          });
+          localStorage.removeItem('admixerId');
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([britepoolIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['britepoolId', 'britepoolid', 'cookie']));
+      it('test hook from admixerId cookie', function (done) {
+        coreStorage.setCookie('admixerId', 'testadmixerId', (new Date(Date.now() + 100000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([admixerIdSubmodule]);
+        config.setConfig(getConfigMock(['admixerId', 'admixerId', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.admixerId');
+              expect(bid.userId.admixerId).to.equal('testadmixerId');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'admixer.net',
+                uids: [{id: 'testadmixerId', atype: 3}]
+              });
+            });
+          });
+          coreStorage.setCookie('admixerId', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.britepoolid');
-            expect(bid.userId.britepoolid).to.equal('279c0161-5152-487f-809e-05d7f7e653fd');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'britepool.com',
-              uids: [{id: '279c0161-5152-487f-809e-05d7f7e653fd', atype: 1}]
+      it('test hook from deepintentId cookies', function (done) {
+        // simulate existing browser local storage values
+        coreStorage.setCookie('deepintentId', 'testdeepintentId', (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([deepintentDpesSubmodule]);
+        config.setConfig(getConfigMock(['deepintentId', 'deepintentId', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.deepintentId');
+              expect(bid.userId.deepintentId).to.deep.equal('testdeepintentId');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'deepintent.com',
+                uids: [{id: 'testdeepintentId', atype: 3}]
+              });
             });
           });
-        });
-        coreStorage.setCookie('britepoolid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
+          coreStorage.setCookie('deepintentId', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
 
-    it('test hook from netId cookies', function(done) {
-      // simulate existing browser local storage values
-      coreStorage.setCookie('netId', JSON.stringify({'netId': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg'}), (new Date(Date.now() + 5000).toUTCString()));
+      it('test hook from deepintentId html5', function (done) {
+        // simulate existing browser local storage values
+        localStorage.setItem('deepintentId', 'testdeepintentId');
+        localStorage.setItem('deepintentId_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([deepintentDpesSubmodule]);
+        config.setConfig(getConfigMock(['deepintentId', 'deepintentId', 'html5']));
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.deepintentId');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'deepintent.com',
+                uids: [{id: 'testdeepintentId', atype: 3}]
+              });
+            });
+          });
+          localStorage.removeItem('deepintentId');
+          done();
+        }, {adUnits});
+      });
 
-      setSubmoduleRegistry([netIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['netId', 'netId', 'cookie']));
+      it('test hook from qid html5', (done) => {
+        // simulate existing localStorage values
+        localStorage.setItem('qid', 'testqid');
+        localStorage.setItem('qid_exp', '');
+
+        init(config);
+        setSubmoduleRegistry([adqueryIdSubmodule]);
+        config.setConfig(getConfigMock(['qid', 'qid', 'html5']));
+
+        requestBidsHook(() => {
+          adUnits.forEach((adUnit) => {
+            adUnit.bids.forEach((bid) => {
+              expect(bid).to.have.deep.nested.property('userId.qid');
+              expect(bid.userId.qid).to.equal('testqid');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'adquery.io',
+                uids: [{
+                  id: 'testqid',
+                  atype: 1,
+                }]
+              });
+            });
+          });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.netId');
-            expect(bid.userId.netId).to.equal('fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg');
-            expect(bid.userIdAsEids[0]).to.deep.equal({
-              source: 'netid.de',
-              uids: [{id: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg', atype: 1}]
+          // clear LS
+          localStorage.removeItem('qid');
+          localStorage.removeItem('qid_exp');
+          done();
+        }, {adUnits});
+      });
+
+      it('test hook when pubCommonId, unifiedId, id5Id, identityLink, britepoolId, intentIqId, zeotapIdPlus, netId, hadronId, Criteo, UID 2.0, admixerId, amxId, dmdId, kpuid, qid and mwOpenLinkId have data to pass', function (done) {
+        coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
+        coreStorage.setCookie('unifiedid', JSON.stringify({'TDID': 'testunifiedid'}), (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('dmdId', 'testdmdId', (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('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()));
+        // amxId only supports localStorage
+        localStorage.setItem('amxId', 'test_amxid_id');
+        localStorage.setItem('amxId_exp', (new Date(Date.now() + 5000)).toUTCString());
+        // qid only supports localStorage
+        localStorage.setItem('qid', 'testqid');
+        localStorage.setItem('qid_exp', (new Date(Date.now() + 5000)).toUTCString());
+        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'],
+          ['identityLink', 'idl_env', 'cookie'],
+          ['britepoolId', 'britepoolid', 'cookie'],
+          ['dmdId', 'dmdId', 'cookie'],
+          ['netId', 'netId', 'cookie'],
+          ['intentIqId', 'intentIqId', 'cookie'],
+          ['zeotapIdPlus', 'IDP', 'cookie'],
+          ['hadronId', 'hadronId', 'cookie'],
+          ['criteo', 'storage_criteo', 'cookie'],
+          ['mwOpenLinkId', 'mwol', 'cookie'],
+          ['tapadId', 'tapad_id', 'cookie'],
+          ['uid2', 'uid2id', 'cookie'],
+          ['admixerId', 'admixerId', 'cookie'],
+          ['amxId', 'amxId', 'html5'],
+          ['deepintentId', 'deepintentId', 'cookie'],
+          ['kpuid', 'kpuid', 'cookie'],
+          ['qid', 'qid', 'html5']));
+
+        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('testunifiedid');
+              // 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');
+              // 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 dmdID id was copied to bid
+              expect(bid).to.have.deep.nested.property('userId.dmdId');
+              expect(bid.userId.dmdId).to.equal('testdmdId');
+              // also check that netId 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 was copied to bid
+              expect(bid).to.have.deep.nested.property('userId.hadronId');
+              expect(bid.userId.hadronId).to.equal('testHadronId');
+              // also check that criteo id 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 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'
+              });
+              expect(bid).to.have.deep.nested.property('userId.amxId');
+              expect(bid.userId.amxId).to.equal('test_amxid_id');
+
+              // also check that criteo id 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).to.have.deep.nested.property('userId.qid');
+              expect(bid.userId.qid).to.equal('testqid');
+
+              expect(bid.userIdAsEids.length).to.equal(18);
+            });
+          });
+          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('dmdId', '', 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('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);
+          localStorage.removeItem('amxId');
+          localStorage.removeItem('amxId_exp');
+          localStorage.removeItem('qid');
+          localStorage.removeItem('qid_exp');
+          done();
+        }, {adUnits});
+      });
+
+      it('test hook from UID2 cookie', function (done) {
+        coreStorage.setCookie('uid2id', 'Sample_AD_Token', (new Date(Date.now() + 5000).toUTCString()));
+
+        init(config);
+        setSubmoduleRegistry([uid2IdSubmodule]);
+        config.setConfig(getConfigMock(['uid2', 'uid2id', 'cookie']));
+
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.uid2');
+              expect(bid.userId.uid2).to.have.deep.nested.property('id');
+              expect(bid.userId.uid2).to.deep.equal({
+                id: 'Sample_AD_Token'
+              });
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'uidapi.com',
+                uids: [{
+                  id: 'Sample_AD_Token',
+                  atype: 3,
+                }]
+              });
             });
           });
+          coreStorage.setCookie('uid2id', '', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
+      it('should add new id system ', 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('dmdId', 'testdmdId', (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('admixerId', 'testadmixerId', new Date(Date.now() + 5000).toUTCString());
+        coreStorage.setCookie('deepintentId', 'testdeepintentId', new Date(Date.now() + 5000).toUTCString());
+        coreStorage.setCookie('MOCKID', JSON.stringify({'MOCKID': '123456778'}), new Date(Date.now() + 5000).toUTCString());
+        coreStorage.setCookie('__uid2_advertising_token', 'Sample_AD_Token', (new Date(Date.now() + 5000).toUTCString()));
+        localStorage.setItem('amxId', 'test_amxid_id');
+        localStorage.setItem('amxId_exp', new Date(Date.now() + 5000).toUTCString())
+        coreStorage.setCookie('kpuid', 'KINESSO_ID', (new Date(Date.now() + 5000).toUTCString()));
+        localStorage.setItem('qid', 'testqid');
+        localStorage.setItem('qid_exp', new Date(Date.now() + 5000).toUTCString())
+
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, hadronIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, amxIdSubmodule, kinessoIdSubmodule, adqueryIdSubmodule]);
+
+        config.setConfig({
+          userSync: {
+            syncDelay: 0,
+            userIds: [{
+              name: 'pubCommonId', storage: {name: 'pubcid', type: 'cookie'}
+            }, {
+              name: 'unifiedId', storage: {name: 'unifiedid', type: 'cookie'}
+            }, {
+              name: 'id5Id', storage: {name: 'id5id', type: 'cookie'}
+            }, {
+              name: 'identityLink', storage: {name: 'idl_env', type: 'cookie'}
+            }, {
+              name: 'britepoolId', storage: {name: 'britepoolid', type: 'cookie'}
+            }, {
+              name: 'dmdId', storage: {name: 'dmdId', type: 'cookie'}
+            }, {
+              name: 'netId', storage: {name: 'netId', type: 'cookie'}
+            }, {
+              name: 'intentIqId', storage: {name: 'intentIqId', type: 'cookie'}
+            }, {
+              name: 'zeotapIdPlus'
+            }, {
+              name: 'hadronId', storage: {name: 'hadronId', type: 'cookie'}
+            }, {
+              name: 'admixerId', storage: {name: 'admixerId', type: 'cookie'}
+            }, {
+              name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
+            }, {
+              name: 'uid2'
+            }, {
+              name: 'deepintentId', storage: {name: 'deepintentId', type: 'cookie'}
+            }, {
+              name: 'amxId', storage: {name: 'amxId', type: 'html5'}
+            }, {
+              name: 'kpuid', storage: {name: 'kpuid', type: 'cookie'}
+            }, {
+              name: 'qid', storage: {name: 'qid', type: 'html5'}
+            }]
+          }
         });
-        coreStorage.setCookie('netId', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
 
-    it('test hook when pubCommonId, unifiedId, id5Id, identityLink, britepoolId, netId and sharedId have data to pass', function(done) {
-      coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
-      coreStorage.setCookie('unifiedid', JSON.stringify({'TDID': 'testunifiedid'}), (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('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}), (new Date(Date.now() + 5000).toUTCString()));
+        // Add new submodule named 'mockId'
+        attachIdSystem({
+          name: 'mockId',
+          decode: function (value) {
+            return {
+              'mid': value['MOCKID']
+            };
+          },
+          getId: function (config, storedId) {
+            if (storedId) return {};
+            return {id: {'MOCKID': '1234'}};
+          }
+        });
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
-        ['unifiedId', 'unifiedid', 'cookie'],
-        ['id5Id', 'id5id', 'cookie'],
-        ['identityLink', 'idl_env', 'cookie'],
-        ['britepoolId', 'britepoolid', 'cookie'],
-        ['netId', 'netId', 'cookie'],
-        ['sharedId', 'sharedid', '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('testunifiedid');
-            // also check that Id5Id id data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.id5id');
-            expect(bid.userId.id5id).to.equal('testid5id');
-            // 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 netId id data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.netId');
-            expect(bid.userId.netId).to.equal('testnetId');
-            expect(bid).to.have.deep.nested.property('userId.sharedid');
-            expect(bid.userId.sharedid).to.deep.equal({
-              id: 'test_sharedId',
-              third: 'test_sharedId'
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              // check PubCommonId id data was copied to bid
+              expect(bid).to.have.deep.nested.property('userId.pubcid');
+              expect(bid.userId.pubcid).to.equal('testpubcid');
+              // check 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 dmdId id data was copied to bid
+              expect(bid).to.have.deep.nested.property('userId.dmdId');
+              expect(bid.userId.dmdId).to.equal('testdmdId');
+              // check MockId data was copied to bid
+              expect(bid).to.have.deep.nested.property('userId.netId');
+              expect(bid.userId.netId).to.equal('testnetId');
+              // check MockId data was copied to bid
+              expect(bid).to.have.deep.nested.property('userId.mid');
+              expect(bid.userId.mid).to.equal('1234');
+              // 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');
+              expect(bid.userId.uid2).to.deep.equal({
+                id: 'Sample_AD_Token'
+              });
+
+              expect(bid).to.have.deep.nested.property('userId.amxId');
+              expect(bid.userId.amxId).to.equal('test_amxid_id');
+
+              // 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).to.have.deep.nested.property('userId.qid');
+              expect(bid.userId.qid).to.equal('testqid');
+              expect(bid.userIdAsEids.length).to.equal(16);
             });
-            expect(bid.userIdAsEids.length).to.equal(7);
           });
-        });
+          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('admixerId', '', EXPIRED_COOKIE_DATE);
+          coreStorage.setCookie('deepintentId', '', EXPIRED_COOKIE_DATE);
+          coreStorage.setCookie('MOCKID', '', EXPIRED_COOKIE_DATE);
+          coreStorage.setCookie('mwol', '', EXPIRED_COOKIE_DATE);
+          localStorage.removeItem('amxId');
+          localStorage.removeItem('amxId_exp');
+          coreStorage.setCookie('kpuid', EXPIRED_COOKIE_DATE);
+          done();
+        }, {adUnits});
+      });
+    });
+
+    describe('callbacks at the end of auction', function () {
+      beforeEach(function () {
+        sinon.stub(events, 'getEvents').returns([]);
+        sinon.stub(utils, 'triggerPixel');
         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('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
+        coreStorage.setCookie('_parrable_eid', '', EXPIRED_COOKIE_DATE);
+      });
 
-    it('test hook when sharedId (opted out) have data to pass', function(done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': '00000000000000000000000000', 'ts': 1590525289611}), (new Date(Date.now() + 5000).toUTCString()));
+      afterEach(function () {
+        events.getEvents.restore();
+        utils.triggerPixel.restore();
+        coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('unifiedid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('_parrable_eid', '', EXPIRED_COOKIE_DATE);
+        resetConsentData();
+        delete window.__tcfapi;
+      });
 
-      setSubmoduleRegistry([sharedIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['sharedId', 'sharedid', 'cookie']));
+      function endAuction() {
+        events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+        return new Promise((resolve) => setTimeout(resolve));
+      }
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid.userIdAsEids).to.be.undefined;
-          });
+      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'});
+
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
+        config.setConfig(customCfg);
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
+          expect(utils.triggerPixel.called).to.be.false;
+          return endAuction();
+        }).then(() => {
+          expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
         });
-        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
-
-    it('test hook when pubCommonId, unifiedId, id5Id, britepoolId, netId and sharedId 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('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}), (new Date(Date.now() + 5000).toUTCString()));
+      });
 
-      setSubmoduleRegistry([]);
+      it('unifiedid callback with url', function () {
+        let adUnits = [getAdUnitMock()];
+        let innerAdUnits;
+        let customCfg = getConfigMock(['unifiedId', 'unifiedid', 'cookie']);
+        addConfig(customCfg, 'params', {url: '/any/unifiedid/url'});
+
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
+        config.setConfig(customCfg);
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
+          expect(server.requests).to.be.empty;
+          return endAuction();
+        }).then(() => {
+          expect(server.requests[0].url).to.equal('/any/unifiedid/url');
+        });
+      });
 
-      // attaching before init
-      attachIdSystem(pubCommonIdSubmodule);
+      it('unifiedid callback with partner', function () {
+        let adUnits = [getAdUnitMock()];
+        let innerAdUnits;
+        let customCfg = getConfigMock(['unifiedId', 'unifiedid', 'cookie']);
+        addConfig(customCfg, 'params', {partner: 'rubicon'});
+
+        init(config);
+        setSubmoduleRegistry([sharedIdSystemSubmodule, unifiedIdSubmodule]);
+        config.setConfig(customCfg);
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {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');
+        });
+      });
+    });
 
-      init(config);
+    describe('Set cookie behavior', function () {
+      let coreStorageSpy;
+      beforeEach(function () {
+        coreStorageSpy = sinon.spy(coreStorage, 'setCookie');
+        setSubmoduleRegistry([sharedIdSystemSubmodule]);
+        init(config);
+      });
+      afterEach(function () {
+        coreStorageSpy.restore();
+      });
+      it('should allow submodules to override the domain', function () {
+        const submodule = {
+          submodule: {
+            domainOverride: function () {
+              return 'foo.com'
+            }
+          },
+          config: {
+            storage: {
+              type: 'cookie'
+            }
+          }
+        }
+        setStoredValue(submodule, 'bar');
+        expect(coreStorage.setCookie.getCall(0).args[4]).to.equal('foo.com');
+      });
 
-      // attaching after init
-      attachIdSystem(unifiedIdSubmodule);
-      attachIdSystem(id5IdSubmodule);
-      attachIdSystem(identityLinkSubmodule);
-      attachIdSystem(britepoolIdSubmodule);
-      attachIdSystem(netIdSubmodule);
-      attachIdSystem(sharedIdSubmodule);
-
-      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
-        ['unifiedId', 'unifiedid', 'cookie'],
-        ['id5Id', 'id5id', 'cookie'],
-        ['identityLink', 'idl_env', 'cookie'],
-        ['britepoolId', 'britepoolid', 'cookie'],
-        ['netId', 'netId', 'cookie'],
-        ['sharedId', 'sharedid', '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');
-            expect(bid.userId.id5id).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');
-            expect(bid).to.have.deep.nested.property('userId.sharedid');
-            expect(bid.userId.sharedid).to.deep.equal({
-              id: 'test_sharedId',
-              third: 'test_sharedId'
-            });
-            expect(bid.userIdAsEids.length).to.equal(7);
-          });
-        });
-        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('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
+      it('should pass null for domain if submodule does not override the domain', function () {
+        const submodule = {
+          submodule: {},
+          config: {
+            storage: {
+              type: 'cookie'
+            }
+          }
+        }
+        setStoredValue(submodule, 'bar');
+        expect(coreStorage.setCookie.getCall(0).args[4]).to.equal(null);
+      });
     });
 
-    it('test hook when sharedId(opted out) have their modules added before and after init', function(done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': '00000000000000000000000000', 'ts': 1590525289611}), (new Date(Date.now() + 5000).toUTCString()));
+    describe('Consent changes determine getId refreshes', function () {
+      let expStr;
+      let adUnits;
+      let mockGetId;
+      let mockDecode;
+      let mockExtendId;
+      let mockIdSystem;
+      let userIdConfig;
+
+      const mockIdCookieName = 'MOCKID';
+
+      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
+          }
+        };
 
-      setSubmoduleRegistry([]);
-      init(config);
+        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);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie(CONSENT_LOCAL_STORAGE_NAME, '', EXPIRED_COOKIE_DATE);
+
+        // init
+        adUnits = [getAdUnitMock()];
+        init(config);
+
+        // init id system
+        attachIdSystem(mockIdSystem);
+      });
 
-      attachIdSystem(sharedIdSubmodule);
+      afterEach(function () {
+        config.resetConfig();
+      });
 
-      config.setConfig(getConfigMock(['sharedId', 'sharedid', 'cookie']));
+      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);
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid.userIdAsEids).to.be.undefined;
-          });
+        config.setConfig(userIdConfig);
+
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
+          sinon.assert.calledOnce(mockGetId);
+          sinon.assert.calledOnce(mockDecode);
+          sinon.assert.notCalled(mockExtendId);
         });
-        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
+      });
 
-    it('should add new id system ', 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('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}), new Date(Date.now() + 5000).toUTCString());
-      coreStorage.setCookie('MOCKID', JSON.stringify({'MOCKID': '123456778'}), new Date(Date.now() + 5000).toUTCString());
-
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule]);
-      init(config);
+      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);
 
-      config.setConfig({
-        userSync: {
-          syncDelay: 0,
-          userIds: [{
-            name: 'pubCommonId', storage: {name: 'pubcid', type: 'cookie'}
-          }, {
-            name: 'unifiedId', storage: {name: 'unifiedid', type: 'cookie'}
-          }, {
-            name: 'id5Id', storage: {name: 'id5id', type: 'cookie'}
-          }, {
-            name: 'identityLink', storage: {name: 'idl_env', type: 'cookie'}
-          }, {
-            name: 'britepoolId', storage: {name: 'britepoolid', type: 'cookie'}
-          }, {
-            name: 'netId', storage: {name: 'netId', type: 'cookie'}
-          }, {
-            name: 'sharedId', storage: {name: 'sharedid', type: 'cookie'}
-          }, {
-            name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
-          }]
-        }
+        config.setConfig(userIdConfig);
+
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
+          sinon.assert.calledOnce(mockGetId);
+          sinon.assert.calledOnce(mockDecode);
+          sinon.assert.notCalled(mockExtendId);
+        });
       });
 
-      // Add new submodule named 'mockId'
-      attachIdSystem({
-        name: 'mockId',
-        decode: function(value) {
-          return {
-            'mid': value['MOCKID']
-          };
-        },
-        getId: function(params, storedId) {
-          if (storedId) return {};
-          return {id: {'MOCKID': '1234'}};
-        }
+      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();
+
+        config.setConfig(userIdConfig);
+
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
+          sinon.assert.calledOnce(mockGetId);
+          sinon.assert.calledOnce(mockDecode);
+          sinon.assert.notCalled(mockExtendId);
+        });
       });
 
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            // check PubCommonId id data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.pubcid');
-            expect(bid.userId.pubcid).to.equal('testpubcid');
-            // check 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');
-            expect(bid.userId.id5id).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');
-            // check MockId data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.netId');
-            expect(bid.userId.netId).to.equal('testnetId');
-            // also check that sharedId id data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.sharedid');
-            expect(bid.userId.sharedid).to.deep.equal({
-              id: 'test_sharedId',
-              third: 'test_sharedId'
-            });
-            // check MockId data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.mid');
-            expect(bid.userId.mid).to.equal('123456778');
-            expect(bid.userIdAsEids.length).to.equal(7);// mid is unknown for eids.js
-          });
+      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({...consentData, consentString: 'different'});
+
+        config.setConfig(userIdConfig);
+
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
+          sinon.assert.calledOnce(mockGetId);
+          sinon.assert.calledOnce(mockDecode);
+          sinon.assert.notCalled(mockExtendId);
         });
-        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('sharedid', '', EXPIRED_COOKIE_DATE);
-        coreStorage.setCookie('MOCKID', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
-  });
+      });
 
-  describe('callbacks at the end of auction', function() {
-    beforeEach(function() {
-      sinon.stub(events, 'getEvents').returns([]);
-      sinon.stub(utils, 'triggerPixel');
-      coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie('unifiedid', '', EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie('_parrable_eid', '', EXPIRED_COOKIE_DATE);
-    });
+      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);
 
-    afterEach(function() {
-      events.getEvents.restore();
-      utils.triggerPixel.restore();
-      coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie('unifiedid', '', EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie('_parrable_eid', '', EXPIRED_COOKIE_DATE);
+        setStoredConsentData({...consentData});
+
+        config.setConfig(userIdConfig);
+
+        let innerAdUnits;
+        return runBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits}).then(() => {
+          sinon.assert.notCalled(mockGetId);
+          sinon.assert.calledOnce(mockDecode);
+          sinon.assert.calledOnce(mockExtendId);
+        });
+      });
     });
 
-    it('pubcid callback with url', function() {
-      let adUnits = [getAdUnitMock()];
-      let innerAdUnits;
-      let customCfg = getConfigMock(['pubCommonId', 'pubcid_alt', 'cookie']);
-      customCfg = addConfig(customCfg, 'params', {pixelUrl: '/any/pubcid/url'});
+    describe('requestDataDeletion', () => {
+      function idMod(name, value) {
+        return {
+          name,
+          getId() {
+            return {id: value}
+          },
+          decode(d) {
+            return {[name]: d}
+          },
+          onDataDeletionRequest: sinon.stub()
+        }
+      }
+      let mod1, mod2, mod3, cfg1, cfg2, cfg3;
+
+      beforeEach(() => {
+        init(config);
+        mod1 = idMod('id1', 'val1');
+        mod2 = idMod('id2', 'val2');
+        mod3 = idMod('id3', 'val3');
+        cfg1 = getStorageMock('id1', 'id1', 'cookie');
+        cfg2 = getStorageMock('id2', 'id2', 'html5');
+        cfg3 = {name: 'id3', value: {id3: 'val3'}};
+        setSubmoduleRegistry([mod1, mod2, mod3]);
+        config.setConfig({
+          auctionDelay: 1,
+          userSync: {
+            userIds: [cfg1, cfg2, cfg3]
+          }
+        });
+        return getGlobal().refreshUserIds();
+      });
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule]);
-      init(config);
-      config.setConfig(customCfg);
-      requestBidsHook((config) => {
-        innerAdUnits = config.adUnits
-      }, {adUnits});
+      it('deletes stored IDs', () => {
+        expect(coreStorage.getCookie('id1')).to.exist;
+        expect(coreStorage.getDataFromLocalStorage('id2')).to.exist;
+        requestDataDeletion(sinon.stub());
+        expect(coreStorage.getCookie('id1')).to.not.exist;
+        expect(coreStorage.getDataFromLocalStorage('id2')).to.not.exist;
+      });
+
+      it('invokes onDataDeletionRequest', () => {
+        requestDataDeletion(sinon.stub());
+        sinon.assert.calledWith(mod1.onDataDeletionRequest, cfg1, {id1: 'val1'});
+        sinon.assert.calledWith(mod2.onDataDeletionRequest, cfg2, {id2: 'val2'})
+        sinon.assert.calledWith(mod3.onDataDeletionRequest, cfg3, {id3: 'val3'})
+      });
 
-      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');
+      describe('does not choke when onDataDeletionRequest', () => {
+        Object.entries({
+          'is missing': () => { delete mod1.onDataDeletionRequest },
+          'throws': () => { mod1.onDataDeletionRequest.throws(new Error()) }
+        }).forEach(([t, setup]) => {
+          it(t, () => {
+            setup();
+            const next = sinon.stub();
+            const arg = {random: 'value'};
+            requestDataDeletion(next, arg);
+            sinon.assert.calledOnce(mod2.onDataDeletionRequest);
+            sinon.assert.calledOnce(mod3.onDataDeletionRequest);
+            sinon.assert.calledWith(next, arg);
+          })
+        })
+      })
     });
+  });
 
-    it('unifiedid callback with url', function() {
-      let adUnits = [getAdUnitMock()];
-      let innerAdUnits;
-      let customCfg = getConfigMock(['unifiedId', 'unifiedid', 'cookie']);
-      addConfig(customCfg, 'params', {url: '/any/unifiedid/url'});
+  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');
+      });
+    })
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule]);
-      init(config);
-      config.setConfig(customCfg);
-      requestBidsHook((config) => {
-        innerAdUnits = config.adUnits
-      }, {adUnits});
+    describe('Call getEncryptedEidsForSource to get encrypted Eids for source', function() {
+      const signalSources = ['pubcid.org'];
 
-      expect(server.requests).to.be.empty;
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
-      expect(server.requests[0].url).to.equal('/any/unifiedid/url');
-    });
+      it('pbjs.getEncryptedEidsForSource should be defined', () => {
+        expect(typeof (getGlobal()).getEncryptedEidsForSource).to.equal('function');
+      });
 
-    it('unifiedid callback with partner', function() {
-      let adUnits = [getAdUnitMock()];
-      let innerAdUnits;
-      let customCfg = getConfigMock(['unifiedId', 'unifiedid', 'cookie']);
-      addConfig(customCfg, 'params', {partner: 'rubicon'});
+      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);
+      });
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule]);
-      init(config);
-      config.setConfig(customCfg);
-      requestBidsHook((config) => {
-        innerAdUnits = config.adUnits
-      }, {adUnits});
+      describe('pbjs.getEncryptedEidsForSource', () => {
+        beforeEach(() => {
+          init(config);
+          setSubmoduleRegistry([sharedIdSystemSubmodule]);
+          config.setConfig({
+            userSync: {
+              auctionDelay: 10,
+              userIds: [{
+                name: 'pubCommonId', value: {'pubcid': '11111'}
+              }]
+            }
+          });
+        });
 
-      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');
-    });
+        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;
+            done();
+          }).catch(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';
+          return (getGlobal()).getEncryptedEidsForSource(source, encrypt, getCustomSignal).then((result) => {
+            expect(result).to.equal(expectedString);
+          });
+        });
+      });
+
+      it('pbjs.getUserIdsAsEidBySource', (done) => {
+        const users = {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '11111',
+              'atype': 1
+            }
+          ]
+        }
+        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/validationFpdModule_spec.js b/test/spec/modules/validationFpdModule_spec.js
new file mode 100644
index 00000000000..b60360733d6
--- /dev/null
+++ b/test/spec/modules/validationFpdModule_spec.js
@@ -0,0 +1,395 @@
+import {expect} from 'chai';
+import * as utils from 'src/utils.js';
+import {
+  filterArrayData,
+  validateFpd
+} from 'modules/validationFpdModule/index.js';
+
+describe('the first party data validation module', function () {
+  let ortb2 = {
+    device: {
+      h: 911,
+      w: 1733
+    },
+    user: {
+      data: [{
+        segment: [{
+          id: 'foo'
+        }],
+        name: 'bar',
+        ext: 'string'
+      }]
+    },
+    site: {
+      content: {
+        data: [{
+          segment: [{
+            id: 'test'
+          }],
+          name: 'content',
+          ext: {
+            foo: 'bar'
+          }
+        }]
+      }
+    }
+  };
+
+  let conf = {
+    device: {
+      h: 500,
+      w: 750
+    },
+    user: {
+      keywords: 'test1, test2',
+      gender: 'f',
+      data: [{
+        segment: [{
+          id: 'test'
+        }],
+        name: 'alt'
+      }]
+    },
+    site: {
+      ref: 'domain.com',
+      page: 'www.domain.com/test',
+      ext: {
+        data: {
+          inventory: ['first']
+        }
+      }
+    }
+  };
+
+  describe('filtering first party array data', function () {
+    it('returns empty array if no valid data', function () {
+      let arr = [{}];
+      let path = 'site.children.cat';
+      let child = {type: 'string'};
+      let parent = 'site';
+      let key = 'cat';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal([]);
+    });
+
+    it('filters invalid type of array data', function () {
+      let arr = ['foo', {test: 1}];
+      let path = 'site.children.cat';
+      let child = {type: 'string'};
+      let parent = 'site';
+      let key = 'cat';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal(['foo']);
+    });
+
+    it('filters all data for missing required children', function () {
+      let arr = [{test: 1}];
+      let path = 'site.children.content.children.data';
+      let child = {type: 'object'};
+      let parent = 'site';
+      let key = 'data';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal([]);
+    });
+
+    it('filters all data for invalid required children types', function () {
+      let arr = [{name: 'foo', segment: 1}];
+      let path = 'site.children.content.children.data';
+      let child = {type: 'object'};
+      let parent = 'site';
+      let key = 'data';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal([]);
+    });
+
+    it('returns only data with valid required nested children types', function () {
+      let arr = [{name: 'foo', segment: [{id: '1'}, {id: 2}, 'foobar']}];
+      let path = 'site.children.content.children.data';
+      let child = {type: 'object'};
+      let parent = 'site';
+      let key = 'data';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal([{name: 'foo', segment: [{id: '1'}]}]);
+    });
+  });
+
+  describe('validating first party data', function () {
+    it('filters user.data[0].ext for incorrect type', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters user and site for empty data', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        }
+      };
+
+      duplicate.user.data = [];
+      duplicate.site.content.data = [];
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters user for empty valid segment values', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      duplicate.user.data[0].segment.push({test: 3});
+      duplicate.user.data[0].segment[0] = {foo: 'bar'};
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters user.data[0].ext and site.content.data[0].segement[1] for invalid data', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      duplicate.site.content.data[0].segment.push({test: 3});
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters device for invalid data types', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      duplicate.device = {
+        h: '1',
+        w: '1'
+      }
+
+      let expected = {
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      duplicate.site.content.data[0].segment.push({test: 3});
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters cur for invalid data type', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      duplicate.cur = 8;
+
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      duplicate.site.content.data[0].segment.push({test: 3});
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters bcat, badv for invalid data type', function () {
+      const duplicate = utils.deepClone(ortb2);
+      duplicate.badv = 'adadadbcd.com';
+      duplicate.bcat = ['IAB25', 'IAB7-39'];
+
+      const expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        },
+        bcat: ['IAB25', 'IAB7-39']
+      };
+
+      const validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters site.publisher object properties for invalid data type', function () {
+      const duplicate = utils.deepClone(ortb2);
+      duplicate.site.publisher = {
+        id: '1',
+        domain: ['xyz.com'],
+        name: 'xyz',
+      };
+
+      const expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          },
+          publisher: {
+            id: '1',
+            name: 'xyz',
+          }
+        }
+      };
+
+      const validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+  });
+});
diff --git a/test/spec/modules/vdoaiBidAdapter_spec.js b/test/spec/modules/vdoaiBidAdapter_spec.js
index c9d826d8dc8..b1cfa606d84 100644
--- a/test/spec/modules/vdoaiBidAdapter_spec.js
+++ b/test/spec/modules/vdoaiBidAdapter_spec.js
@@ -1,105 +1,146 @@
-import {assert, expect} from 'chai';
-import {spec} from 'modules/vdoaiBidAdapter.js';
-import {newBidder} from 'src/adapters/bidderFactory.js';
-
-const ENDPOINT_URL = 'https://prebid.vdo.ai/auction';
-
-describe('vdoaiBidAdapter', function () {
-  const adapter = newBidder(spec);
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'vdo.ai',
-      'params': {
-        placementId: 'testPlacementId'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [
-        [300, 250]
-      ],
-      'bidId': '1234asdf1234',
-      'bidderRequestId': '1234asdf1234asdf',
-      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf120'
-    };
-    it('should return true where required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-  });
-  describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        'bidder': 'vdo.ai',
-        'params': {
-          placementId: 'testPlacementId'
-        },
-        'sizes': [
-          [300, 250]
-        ],
-        'bidId': '23beaa6af6cdde',
-        'bidderRequestId': '19c0c1efdf37e7',
-        'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
-      }
-    ];
-
-    let bidderRequests = {
-      'refererInfo': {
-        'numIframes': 0,
-        'reachedTop': true,
-        'referer': 'https://example.com',
-        'stack': ['https://example.com']
-      }
-    };
-
-    const request = spec.buildRequests(bidRequests, bidderRequests);
-    it('sends bid request to our endpoint via POST', function () {
-      expect(request[0].method).to.equal('POST');
-    });
-    it('attaches source and version to endpoint URL as query params', function () {
-      expect(request[0].url).to.equal(ENDPOINT_URL);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let bidRequest = [
-      {
-        'method': 'POST',
-        'url': ENDPOINT_URL,
-        'data': {
-          'placementId': 'testPlacementId',
-          'width': '300',
-          'height': '200',
-          'bidId': 'bidId123',
-          'referer': 'www.example.com'
-        }
-
-      }
-    ];
-    let serverResponse = {
-      body: {
-        'vdoCreative': '<html><h3>I am an ad</h3></html> ',
-        'price': 4.2,
-        'adid': '12345asdfg',
-        'currency': 'EUR',
-        'statusMessage': 'Bid available',
-        'requestId': 'bidId123',
-        'width': 300,
-        'height': 250,
-        'netRevenue': true
-      }
-    };
-    it('should get the correct bid response', function () {
-      let expectedResponse = [{
-        'requestId': 'bidId123',
-        'cpm': 4.2,
-        'width': 300,
-        'height': 250,
-        'creativeId': '12345asdfg',
-        'currency': 'EUR',
-        'netRevenue': true,
-        'ttl': 3000,
-        'ad': '<html><h3>I am an ad</h3></html>'
-      }];
-      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
-      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
-    });
-  });
-});
+import {assert, expect} from 'chai';
+import {spec} from 'modules/vdoaiBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+
+const ENDPOINT_URL = 'https://prebid.vdo.ai/auction';
+
+describe('vdoaiBidAdapter', function () {
+  const adapter = newBidder(spec);
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'vdoai',
+      'params': {
+        placementId: 'testPlacementId'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [
+        [300, 250]
+      ],
+      'bidId': '1234asdf1234',
+      'bidderRequestId': '1234asdf1234asdf',
+      'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf120'
+    };
+    it('should return true where required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        'bidder': 'vdoai',
+        'params': {
+          placementId: 'testPlacementId'
+        },
+        'sizes': [
+          [300, 250]
+        ],
+        'bidId': '23beaa6af6cdde',
+        'bidderRequestId': '19c0c1efdf37e7',
+        'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
+        'mediaTypes': 'banner'
+      }
+    ];
+
+    let bidderRequests = {
+      'refererInfo': {
+        'numIframes': 0,
+        'reachedTop': true,
+        'referer': 'https://example.com',
+        'stack': ['https://example.com']
+      }
+    };
+
+    const request = spec.buildRequests(bidRequests, bidderRequests);
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request[0].method).to.equal('POST');
+    });
+    it('attaches source and version to endpoint URL as query params', function () {
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bidRequest = [
+      {
+        'method': 'POST',
+        'url': ENDPOINT_URL,
+        'data': {
+          'placementId': 'testPlacementId',
+          'width': '300',
+          'height': '200',
+          'bidId': 'bidId123',
+          'referer': 'www.example.com'
+        }
+
+      }
+    ];
+    let serverResponse = {
+      body: {
+        'vdoCreative': '<html><h3>I am an ad</h3></html> ',
+        'price': 4.2,
+        'adid': '12345asdfg',
+        'currency': 'EUR',
+        'statusMessage': 'Bid available',
+        'requestId': 'bidId123',
+        'width': 300,
+        'height': 250,
+        'netRevenue': true,
+        'adDomain': ['text.abc']
+      }
+    };
+    it('should get the correct bid response', function () {
+      let expectedResponse = [{
+        'requestId': 'bidId123',
+        'cpm': 4.2,
+        'width': 300,
+        'height': 250,
+        'creativeId': '12345asdfg',
+        'currency': 'EUR',
+        'netRevenue': true,
+        'ttl': 3000,
+        'ad': '<html><h3>I am an ad</h3></html>',
+        'meta': {
+          'advertiserDomains': ['text.abc']
+        }
+      }];
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+      expect(result[0].meta.advertiserDomains).to.deep.equal(expectedResponse[0].meta.advertiserDomains);
+    });
+
+    it('handles instream video responses', function () {
+      let serverResponse = {
+        body: {
+          'vdoCreative': '<!-- VAST Creative -->',
+          'price': 4.2,
+          'adid': '12345asdfg',
+          'currency': 'EUR',
+          'statusMessage': 'Bid available',
+          'requestId': 'bidId123',
+          'width': 300,
+          'height': 250,
+          'netRevenue': true,
+          'mediaType': 'video'
+        }
+      };
+      let bidRequest = [
+        {
+          'method': 'POST',
+          'url': ENDPOINT_URL,
+          'data': {
+            'placementId': 'testPlacementId',
+            'width': '300',
+            'height': '200',
+            'bidId': 'bidId123',
+            'referer': 'www.example.com',
+            'mediaType': 'video'
+          }
+        }
+      ];
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(result[0]).to.have.property('vastXml');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+  });
+});
diff --git a/test/spec/modules/ventesBidAdapter_spec.js b/test/spec/modules/ventesBidAdapter_spec.js
new file mode 100644
index 00000000000..8e1a747f6f7
--- /dev/null
+++ b/test/spec/modules/ventesBidAdapter_spec.js
@@ -0,0 +1,846 @@
+import { expect } from 'chai';
+import * as utils from 'src/utils.js';
+import { spec } from 'modules/ventesBidAdapter.js';
+
+const BIDDER_URL = 'https://ad.ventesavenues.in/va/ad';
+
+describe('Ventes Adapter', function () {
+  const examples = {
+    adUnit_banner: {
+      adUnitCode: 'ad_unit_banner',
+      bidder: 'ventes',
+      bidderRequestId: 'bid_request_id',
+      bidId: 'bid_id',
+      params: {
+        publisherId: 'agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV',
+        placementId: 'VA-062-0013-0183',
+        device: {
+          ip: '123.145.167.189',
+          ifa: 'AEBE52E7-03EE-455A-B3C4-E57283966239',
+        }
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      }
+    },
+
+    adUnitContext: {
+      refererInfo: {
+        page: 'https://ventesavenues.in',
+        domain: 'ventesavenues.in',
+      }
+    },
+
+    serverRequest_banner: {
+      method: 'POST',
+      url: BIDDER_URL,
+      data: {
+        id: 'bid_request_id',
+        imp: [
+          {
+            id: 'imp_id_banner',
+            banner: {
+              format: [{
+                w: 300,
+                h: 200
+              }]
+            }
+          }
+        ],
+        site: {
+          page: 'https://ventesavenues.in',
+          domain: 'ventesavenues.in',
+          name: 'ventesavenues.in'
+        },
+        device: {
+          ua: '',
+          ip: '123.145.167.189',
+          ifa: 'AEBE52E7-03EE-455A-B3C4-E57283966239',
+          language: 'en'
+        },
+        user: null,
+        regs: null,
+        at: 1
+      }
+    },
+    serverResponse_banner: {
+      body: {
+        cur: 'USD',
+        seatbid: [
+          {
+            seat: '4',
+            bid: [
+              {
+                id: 'id',
+                impid: 'imp_id_banner',
+                cid: 'campaign_id',
+                crid: 'creative_id',
+                adm: '<html>..</html>',
+                price: 1.5,
+                w: 300,
+                h: 200
+              }
+            ]
+          }
+        ]
+      }
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    describe('General', function () {
+      it('should return false when not given an ad unit', function () {
+        const adUnit = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an invalid ad unit', function () {
+        const adUnit = 'bad_bid';
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit without bidder code', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.bidder = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with a bad bidder code', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.bidder = 'unknownBidder';
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit without ad unit code', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.adUnitCode = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with an invalid ad unit code', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.adUnitCode = {};
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit without bid request identifier', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.bidderRequestId = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with an invalid bid request identifier', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.bidderRequestId = {};
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit without impression identifier', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.bidId = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with an invalid impression identifier', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.bidId = {};
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit without media types', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with empty media types', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes = {};
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with invalid media types', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes = 'bad_media_types';
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+    });
+
+    describe('Banner', function () {
+      it('should return true when given a valid ad unit', function () {
+        const adUnit = examples.adUnit_banner;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(true);
+      });
+
+      it('should return true when given a valid ad unit with invalid publisher id', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.params = {};
+        adUnit.params.publisherId = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return true when given a valid ad unit without placement id', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.params = {};
+        adUnit.params.publisherId = 'agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV';
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return true when given a valid ad unit with invalid placement id', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.params = {};
+        adUnit.params.publisherId = 'agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV';
+        adUnit.params.placementId = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit without size', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = undefined;
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with an invalid size', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = 'bad_banner_size';
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with an empty size', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = [];
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with an invalid size value', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = ['bad_banner_size_value'];
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with a size value with less than 2 dimensions', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = [[300]];
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with a size value with more than 2 dimensions', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = [[300, 250, 30]];
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with a negative width value', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = [[-300, 250]];
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with a negative height value', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = [[300, -250]];
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with an invalid width value', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = [[false, 250]];
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+
+      it('should return false when given an ad unit with an invalid height value', function () {
+        const adUnit = utils.deepClone(examples.adUnit_banner);
+        adUnit.mediaTypes.banner.sizes = [[300, {}]];
+
+        expect(spec.isBidRequestValid(adUnit)).to.equal(false);
+      });
+    });
+  });
+
+  describe('buildRequests', function () {
+    describe('ServerRequest', function () {
+      it('should return a server request when given a valid ad unit and a valid ad unit context', function () {
+        const adUnits = [examples.adUnit_banner];
+        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
+        expect(serverRequests).to.be.an('array').and.to.have.length(1);
+        expect(serverRequests[0].method).to.exist.and.to.be.a('string').and.to.equal('POST');
+        expect(serverRequests[0].url).to.exist.and.to.be.a('string').and.to.equal(BIDDER_URL);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+      });
+
+      it('should return an empty server request list when given an empty ad unit list and a valid ad unit context', function () {
+        const adUnits = [];
+        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
+        expect(serverRequests).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should not return a server request when given no ad unit and a valid ad unit context', function () {
+        const serverRequests = spec.buildRequests(null, examples.adUnitContext);
+        expect(serverRequests).to.equal(null);
+      });
+
+      it('should not return a server request when given a valid ad unit and no ad unit context', function () {
+        const adUnits = [examples.adUnit_banner];
+        const serverRequests = spec.buildRequests(adUnits, null);
+        expect(serverRequests).to.be.an('array').and.to.have.length(1);
+      });
+
+      it('should not return a server request when given a valid ad unit and an invalid ad unit context', function () {
+        const adUnits = [examples.adUnit_banner];
+        const serverRequests = spec.buildRequests(adUnits, {});
+        expect(serverRequests).to.be.an('array').and.to.have.length(1);
+      });
+    });
+
+    describe('BidRequest', function () {
+      it('should return a valid server request when given a valid ad unit', function () {
+        const adUnits = [examples.adUnit_banner];
+        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data.id).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].bidderRequestId);
+        expect(serverRequests[0].data.at).to.exist.and.to.be.a('number').and.to.equal(1);
+      });
+
+      it('should return one server request when given one valid ad unit', function () {
+        const adUnits = [examples.adUnit_banner];
+        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data.id).to.exist.and.to.be.a('string').and.to.equal(adUnits[0].bidderRequestId);
+      });
+    });
+
+    describe('Impression', function () {
+      describe('Banner', function () {
+        it('should return a server request with one impression when given a valid ad unit', function () {
+          const adUnits = [examples.adUnit_banner];
+
+          const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
+
+          expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+
+          expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+          expect(serverRequests[0].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
+          expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
+          expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}`);
+          expect(serverRequests[0].data.imp[0].banner).to.exist.and.to.be.an('object');
+          expect(serverRequests[0].data.imp[0].banner.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[0][0]);
+          expect(serverRequests[0].data.imp[0].banner.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.banner.sizes[0][1]);
+          expect(serverRequests[0].data.imp[0].banner.format).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
+          expect(serverRequests[0].data.imp[0].banner.format[0]).to.exist.and.to.be.an('object').and.to.deep.equal({
+            w: adUnits[0].mediaTypes.banner.sizes[0][0],
+            h: adUnits[0].mediaTypes.banner.sizes[0][1]
+          });
+        });
+      });
+    });
+
+    describe('Site', function () {
+      it('should return a server request with site information when given a valid ad unit and a valid ad unit context', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const adUnitContext = examples.adUnitContext;
+
+        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+        expect(serverRequests[0].data.site).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.site.page).to.exist.and.to.be.an('string').and.to.equal(adUnitContext.refererInfo.page);
+        expect(serverRequests[0].data.site.domain).to.exist.and.to.be.an('string').and.to.equal('ventesavenues.in');
+        expect(serverRequests[0].data.site.name).to.exist.and.to.be.an('string').and.to.equal('ventesavenues.in');
+      });
+
+      it('should return a server request without site information when given an ad unit context without referer information', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const adUnitContext = utils.deepClone(examples.adUnitContext);
+        adUnitContext.refererInfo = undefined;
+
+        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+      });
+
+      it('should return a server request without site information when given an ad unit context with invalid referer information', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const adUnitContext = utils.deepClone(examples.adUnitContext);
+        adUnitContext.refererInfo = 'bad_referer_information';
+
+        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+      });
+
+      it('should return a server request without site information when given an ad unit context without referer', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const adUnitContext = utils.deepClone(examples.adUnitContext);
+        adUnitContext.refererInfo.referer = undefined;
+
+        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+      });
+
+      it('should return a server request without site information when given an ad unit context with an invalid referer', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const adUnitContext = utils.deepClone(examples.adUnitContext);
+        adUnitContext.refererInfo.referer = {};
+
+        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+      });
+
+      it('should return a server request without site information when given an ad unit context with a misformatted referer', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const adUnitContext = utils.deepClone(examples.adUnitContext);
+        adUnitContext.refererInfo.referer = 'we-are-adot';
+
+        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+      });
+    });
+
+    describe('Device', function () {
+      it('should return a server request with device information when given a valid ad unit and a valid ad unit context', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const serverRequests = spec.buildRequests(adUnits, examples.adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+        expect(serverRequests[0].data.device).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.device.ua).to.exist.and.to.be.a('string');
+        expect(serverRequests[0].data.device.language).to.exist.and.to.be.a('string');
+      });
+    });
+
+    describe('User', function () {
+      it('should return a server request with user information when given a valid ad unit and a valid ad unit context', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const adUnitContext = examples.adUnitContext;
+
+        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+        expect(serverRequests[0].data.user).to.exist.and.to.be.an('object');
+      });
+
+      it('should return a server request without user information when not given an ad unit context', function () {
+        const adUnits = [examples.adUnit_banner];
+
+        const adUnitContext = undefined;
+
+        const serverRequests = spec.buildRequests(adUnits, adUnitContext);
+
+        expect(serverRequests).to.be.an('array').and.to.have.lengthOf(1);
+        expect(serverRequests[0].data).to.exist.and.to.be.an('object');
+        expect(serverRequests[0].data.id).to.exist.and.to.be.an('string').and.to.equal(adUnits[0].bidderRequestId);
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    describe('General', function () {
+      it('should return an ad when given a valid server response with one bid with USD currency', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.cur = 'USD';
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(1);
+        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
+        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
+        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
+        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
+        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
+        expect(ads[0].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
+        expect(ads[0].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
+        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
+      });
+
+      it('should return no ad when not given a server response', function () {
+        const ads = spec.interpretResponse(null);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when not given a server response body', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given an invalid server response body', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body = 'invalid_body';
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response without seat bids', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with invalid seat bids', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid = 'invalid_seat_bids';
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with an empty seat bids array', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid = [];
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with an invalid seat bid', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid = 'invalid_bids';
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with an empty bids array', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid = [];
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with an invalid bid', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid = ['invalid_bid'];
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid without currency', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.cur = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid with an invalid currency', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.cur = {};
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid without impression identifier', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].impid = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid with an invalid impression identifier', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].impid = {};
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid without creative identifier', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].crid = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid with an invalid creative identifier', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].crid = {};
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid without ad markup and ad serving URL', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].adm = undefined;
+        serverResponse.body.seatbid[0].bid[0].nurl = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid with an invalid ad markup', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].adm = {};
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid without bid price', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].price = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid with an invalid bid price', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].price = {};
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a valid server response and no server request', function () {
+        const serverRequest = undefined;
+
+        const serverResponse = examples.serverResponse_banner;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a valid server response and an invalid server request', function () {
+        const serverRequest = 'bad_server_request';
+
+        const serverResponse = examples.serverResponse_banner;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a valid server response and a server request without bid request', function () {
+        const serverRequest = utils.deepClone(examples.serverRequest_banner);
+        serverRequest.data = undefined;
+
+        const serverResponse = examples.serverResponse_banner;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a valid server response and a server request with an invalid bid request', function () {
+        const serverRequest = utils.deepClone(examples.serverRequest_banner);
+        serverRequest.data = 'bad_bid_request';
+
+        const serverResponse = examples.serverResponse_banner;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a valid server response and a server request without impression', function () {
+        const serverRequest = utils.deepClone(examples.serverRequest_banner);
+        serverRequest.data.imp = undefined;
+
+        const serverResponse = examples.serverResponse_banner;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a valid server response and a server request with an invalid impression field', function () {
+        const serverRequest = utils.deepClone(examples.serverRequest_banner);
+        serverRequest.data.imp = 'invalid_impressions';
+
+        const serverResponse = examples.serverResponse_banner;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+    });
+
+    describe('Banner', function () {
+      it('should return an ad when given a valid server response with one bid', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = examples.serverResponse_banner;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(1);
+        expect(ads[0].adUrl).to.equal(null);
+        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
+        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
+        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
+        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
+        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
+        expect(ads[0].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
+        expect(ads[0].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
+        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
+      });
+
+      it('should return no ad when given a server response with a bid without height', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].h = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid with an invalid height', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].h = {};
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid without width', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].w = undefined;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+
+      it('should return no ad when given a server response with a bid with an invalid width', function () {
+        const serverRequest = examples.serverRequest_banner;
+
+        const serverResponse = utils.deepClone(examples.serverResponse_banner);
+        serverResponse.body.seatbid[0].bid[0].w = {};
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        expect(ads).to.be.an('array').and.to.have.length(0);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/verizonMediaIdSystem_spec.js b/test/spec/modules/verizonMediaIdSystem_spec.js
new file mode 100644
index 00000000000..10054b5674c
--- /dev/null
+++ b/test/spec/modules/verizonMediaIdSystem_spec.js
@@ -0,0 +1,204 @@
+import {expect} from 'chai';
+import * as utils from 'src/utils.js';
+import {verizonMediaIdSubmodule} from 'modules/verizonMediaIdSystem.js';
+
+describe('Verizon Media ID Submodule', () => {
+  const HASHED_EMAIL = '6bda6f2fa268bf0438b5423a9861a2cedaa5dec163c03f743cfe05c08a8397b2';
+  const PIXEL_ID = '1234';
+  const PROD_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PIXEL_ID}/fed`;
+  const OVERRIDE_ENDPOINT = 'https://foo/bar';
+
+  it('should have the correct module name declared', () => {
+    expect(verizonMediaIdSubmodule.name).to.equal('verizonMediaId');
+  });
+
+  it('should have the correct TCFv2 Vendor ID declared', () => {
+    expect(verizonMediaIdSubmodule.gvlid).to.equal(25);
+  });
+
+  describe('getId()', () => {
+    let ajaxStub;
+    let getAjaxFnStub;
+    let consentData;
+    beforeEach(() => {
+      ajaxStub = sinon.stub();
+      getAjaxFnStub = sinon.stub(verizonMediaIdSubmodule, 'getAjaxFn');
+      getAjaxFnStub.returns(ajaxStub);
+
+      consentData = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 'GDPR_CONSENT_STRING'
+        },
+        uspConsent: 'USP_CONSENT_STRING'
+      };
+    });
+
+    afterEach(() => {
+      getAjaxFnStub.restore();
+    });
+
+    function invokeGetIdAPI(configParams, consentData) {
+      let result = verizonMediaIdSubmodule.getId({
+        params: configParams
+      }, consentData);
+      if (typeof result === 'object') {
+        result.callback(sinon.stub());
+      }
+      return result;
+    }
+
+    it('returns undefined if he and pixelId params are not passed', () => {
+      expect(invokeGetIdAPI({}, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns undefined if the pixelId param is not passed', () => {
+      expect(invokeGetIdAPI({
+        he: HASHED_EMAIL
+      }, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns undefined if the he param is not passed', () => {
+      expect(invokeGetIdAPI({
+        pixelId: PIXEL_ID
+      }, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns an object with the callback function if the correct params are passed', () => {
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('Makes an ajax GET request to the production API endpoint with query params', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+
+      const expectedParams = {
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent
+      };
+      const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${PROD_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('Makes an ajax GET request to the specified override API endpoint with query params', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+
+      const expectedParams = {
+        he: HASHED_EMAIL,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent
+      };
+      const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${OVERRIDE_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('sets the callbacks param of the ajax function call correctly', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      expect(ajaxStub.firstCall.args[1]).to.be.an('object').that.has.all.keys(['success', 'error']);
+    });
+
+    it('sets GDPR consent data flag correctly when call is under GDPR jurisdiction.', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+      expect(requestQueryParams.gdpr).to.equal('1');
+      expect(requestQueryParams.gdpr_consent).to.equal(consentData.gdpr.consentString);
+    });
+
+    it('sets GDPR consent data flag correctly when call is NOT under GDPR jurisdiction.', () => {
+      consentData.gdpr.gdprApplies = false;
+
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+      expect(requestQueryParams.gdpr).to.equal('0');
+      expect(requestQueryParams.gdpr_consent).to.equal('');
+    });
+
+    [1, '1', true].forEach(firstPartyParamValue => {
+      it(`sets 1p payload property to '1' for a config value of ${firstPartyParamValue}`, () => {
+        invokeGetIdAPI({
+          '1p': firstPartyParamValue,
+          he: HASHED_EMAIL,
+          pixelId: PIXEL_ID,
+        }, consentData);
+
+        const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+        expect(requestQueryParams['1p']).to.equal('1');
+      });
+    });
+  });
+
+  describe('decode()', () => {
+    const VALID_API_RESPONSES = [{
+      key: 'vmiud',
+      expected: '1234',
+      payload: {
+        vmuid: '1234'
+      }
+    },
+    {
+      key: 'connectid',
+      expected: '4567',
+      payload: {
+        connectid: '4567'
+      }
+    },
+    {
+      key: 'both',
+      expected: '4567',
+      payload: {
+        vmuid: '1234',
+        connectid: '4567'
+      }
+    }];
+    VALID_API_RESPONSES.forEach(responseData => {
+      it('should return a newly constructed object with the connectid for a payload with ${responseData.key} key(s)', () => {
+        expect(verizonMediaIdSubmodule.decode(responseData.payload)).to.deep.equal(
+          {connectid: responseData.expected}
+        );
+      });
+    });
+
+    [{}, '', {foo: 'bar'}].forEach((response) => {
+      it(`should return undefined for an invalid response "${JSON.stringify(response)}"`, () => {
+        expect(verizonMediaIdSubmodule.decode(response)).to.be.undefined;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/viBidAdapter_spec.js b/test/spec/modules/viBidAdapter_spec.js
deleted file mode 100644
index e1a88c004bb..00000000000
--- a/test/spec/modules/viBidAdapter_spec.js
+++ /dev/null
@@ -1,911 +0,0 @@
-import {
-  ratioToPercentageCeil,
-  merge,
-  getDocumentHeight,
-  getOffset,
-  getWindowParents,
-  getRectCuts,
-  getTopmostReachableWindow,
-  topDocumentIsReachable,
-  isInsideIframe,
-  isInsideSafeframe,
-  getIframeType,
-  getFrameElements,
-  getElementCuts,
-  getInViewRatio,
-  getMayBecomeVisible,
-  getInViewPercentage,
-  getInViewRatioInsideTopFrame,
-  getOffsetTopDocument,
-  getOffsetTopDocumentPercentage,
-  getOffsetToView,
-  getOffsetToViewPercentage,
-  area,
-  get,
-  getViewabilityDescription,
-  mergeArrays,
-  documentFocus
-} from 'modules/viBidAdapter.js';
-
-describe('ratioToPercentageCeil', () => {
-  it('1 converts to percentage', () =>
-    expect(ratioToPercentageCeil(0.01)).to.equal(1));
-  it('2 converts to percentage', () =>
-    expect(ratioToPercentageCeil(0.00000000001)).to.equal(1));
-  it('3 converts to percentage', () =>
-    expect(ratioToPercentageCeil(0.5)).to.equal(50));
-  it('4 converts to percentage', () =>
-    expect(ratioToPercentageCeil(1)).to.equal(100));
-  it('5 converts to percentage', () =>
-    expect(ratioToPercentageCeil(0.99)).to.equal(99));
-  it('6 converts to percentage', () =>
-    expect(ratioToPercentageCeil(0.990000000000001)).to.equal(100));
-});
-
-describe('merge', () => {
-  it('merges two objects', () => {
-    expect(
-      merge({ a: 1, b: 2, d: 0 }, { a: 2, b: 2, c: 3 }, (a, b) => a + b)
-    ).to.deep.equal({ a: 3, b: 4, c: 3, d: 0 });
-  });
-});
-
-describe('getDocumentHeight', () => {
-  [
-    {
-      curDocument: {
-        body: {
-          clientHeight: 0,
-          offsetHeight: 0,
-          scrollHeight: 0
-        },
-        documentElement: {
-          clientHeight: 0,
-          offsetHeight: 0,
-          scrollHeight: 0
-        }
-      },
-      expected: 0
-    },
-    {
-      curDocument: {
-        body: {
-          clientHeight: 0,
-          offsetHeight: 13,
-          scrollHeight: 24
-        },
-        documentElement: {
-          clientHeight: 0,
-          offsetHeight: 0,
-          scrollHeight: 0
-        }
-      },
-      expected: 24
-    },
-    {
-      curDocument: {
-        body: {
-          clientHeight: 0,
-          offsetHeight: 13,
-          scrollHeight: 24
-        },
-        documentElement: {
-          clientHeight: 100,
-          offsetHeight: 50,
-          scrollHeight: 30
-        }
-      },
-      expected: 100
-    }
-  ].forEach(({ curDocument, expected }) =>
-    expect(getDocumentHeight(curDocument)).to.be.equal(expected)
-  );
-});
-
-describe('getOffset', () => {
-  [
-    {
-      element: {
-        ownerDocument: {
-          defaultView: {
-            pageXOffset: 0,
-            pageYOffset: 0
-          }
-        },
-        getBoundingClientRect: () => ({
-          top: 0,
-          right: 0,
-          bottom: 0,
-          left: 0
-        })
-      },
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: 0
-      }
-    }
-  ].forEach(({ description, element, expected }, i) =>
-    it(
-      'returns element offsets from the document edges (including scroll): ' +
-        i,
-      () => expect(getOffset(element)).to.be.deep.equal(expected)
-    )
-  );
-  it('Throws when there is no window', () =>
-    expect(
-      getOffset.bind(null, {
-        ownerDocument: {
-          defaultView: null
-        },
-        getBoundingClientRect: () => ({
-          top: 0,
-          right: 0,
-          bottom: 0,
-          left: 0
-        })
-      })
-    ).to.throw());
-});
-
-describe('getWindowParents', () => {
-  const win = {};
-  win.top = win;
-  win.parent = win;
-  const win1 = { top: win, parent: win };
-  const win2 = { top: win, parent: win1 };
-  const win3 = { top: win, parent: win2 };
-
-  it('get parents up to the top', () =>
-    expect(getWindowParents(win3)).to.be.deep.equal([win2, win1, win]));
-});
-
-describe('getTopmostReachableWindow', () => {
-  const win = {};
-  win.top = win;
-  win.parent = win;
-  const win1 = { top: win, parent: win };
-  const win2 = { top: win, parent: win1 };
-  const win3 = { top: win, parent: win2 };
-
-  it('get parents up to the top', () =>
-    expect(getTopmostReachableWindow(win3)).to.be.equal(win));
-});
-
-const topWindow = { document, frameElement: 0 };
-topWindow.top = topWindow;
-topWindow.parent = topWindow;
-const topFrameElement = {
-  ownerDocument: {
-    defaultView: topWindow
-  }
-};
-const frameWindow1 = {
-  top: topWindow,
-  parent: topWindow,
-  frameElement: topFrameElement
-};
-const frameElement1 = {
-  ownerDocument: {
-    defaultView: frameWindow1
-  }
-};
-const frameWindow2 = {
-  top: topWindow,
-  parent: frameWindow1,
-  frameElement: frameElement1
-};
-const frameElement2 = {
-  ownerDocument: {
-    defaultView: frameWindow2
-  }
-};
-const frameWindow3 = {
-  top: topWindow,
-  parent: frameWindow2,
-  frameElement: frameElement2
-};
-
-describe('topDocumentIsReachable', () => {
-  it('returns true if it no inside iframe', () =>
-    expect(topDocumentIsReachable(topWindow)).to.be.true);
-  it('returns true if it can access top document', () =>
-    expect(topDocumentIsReachable(frameWindow3)).to.be.true);
-});
-
-describe('isInsideIframe', () => {
-  it('returns true if window !== window.top', () =>
-    expect(isInsideIframe(topWindow)).to.be.false);
-  it('returns true if window !== window.top', () =>
-    expect(isInsideIframe(frameWindow1)).to.be.true);
-});
-
-const safeframeWindow = { $sf: {} };
-
-describe('isInsideSafeframe', () => {
-  it('returns true if top window is not reachable and window.$sf is defined', () =>
-    expect(isInsideSafeframe(safeframeWindow)).to.be.true);
-});
-
-const hostileFrameWindow = {};
-
-describe('getIframeType', () => {
-  it('returns undefined when is not inside iframe', () =>
-    expect(getIframeType(topWindow)).to.be.undefined);
-  it("returns 'safeframe' when inside sf", () =>
-    expect(getIframeType(safeframeWindow)).to.be.equal('safeframe'));
-  it("returns 'friendly' when inside friendly iframe and can reach top window", () =>
-    expect(getIframeType(frameWindow3)).to.be.equal('friendly'));
-  it("returns 'nonfriendly' when cannot get top window", () =>
-    expect(getIframeType(hostileFrameWindow)).to.be.equal('nonfriendly'));
-});
-
-describe('getFrameElements', () => {
-  it('it returns a list iframe elements up to the top, topmost goes first', () => {
-    expect(getFrameElements(frameWindow3)).to.be.deep.equal([
-      topFrameElement,
-      frameElement1,
-      frameElement2
-    ]);
-  });
-});
-
-describe('area', () => {
-  it('calculates area', () => expect(area(10, 10)).to.be.equal(100));
-  it('calculates area', () =>
-    expect(
-      area(10, 10, { top: -2, left: -2, bottom: 0, right: 0 })
-    ).to.be.equal(64));
-});
-
-describe('getElementCuts', () => {
-  it('returns element cuts', () =>
-    expect(
-      getElementCuts({
-        getBoundingClientRect() {
-          return {
-            top: 0,
-            right: 200,
-            bottom: 200,
-            left: 0
-          };
-        },
-        ownerDocument: {
-          defaultView: {
-            innerHeight: 1000,
-            innerWidth: 1000
-          }
-        }
-      })
-    ).to.be.deep.equal({
-      top: 0,
-      right: 0,
-      bottom: 0,
-      left: 0
-    }));
-});
-
-describe('getInViewRatio', () => {
-  it('returns inViewRatio', () =>
-    expect(
-      getInViewRatio({
-        ownerDocument: {
-          defaultView: {
-            innerHeight: 1000,
-            innerWidth: 1000
-          }
-        },
-        offsetWidth: 200,
-        offsetHeight: 200,
-        getBoundingClientRect() {
-          return {
-            top: 0,
-            right: 200,
-            bottom: 200,
-            left: 0
-          };
-        }
-      })
-    ).to.be.deep.equal(1));
-});
-
-describe('getMayBecomeVisible', () => {
-  it('returns true if not inside iframe of visible inside the iframe', () =>
-    expect(
-      getMayBecomeVisible({
-        ownerDocument: {
-          defaultView: {
-            innerHeight: 1000,
-            innerWidth: 1000
-          }
-        },
-        offsetWidth: 200,
-        offsetHeight: 200,
-        getBoundingClientRect() {
-          return {
-            top: 0,
-            right: 200,
-            bottom: 200,
-            left: 0
-          };
-        }
-      })
-    ).to.be.true);
-});
-
-describe('getInViewPercentage', () => {
-  it('returns inViewRatioPercentage', () =>
-    expect(
-      getInViewPercentage({
-        ownerDocument: {
-          defaultView: {
-            innerHeight: 1000,
-            innerWidth: 1000
-          }
-        },
-        offsetWidth: 200,
-        offsetHeight: 200,
-        getBoundingClientRect() {
-          return {
-            top: 0,
-            right: 200,
-            bottom: 200,
-            left: 0
-          };
-        }
-      })
-    ).to.be.deep.equal(100));
-});
-
-describe('getInViewRatioInsideTopFrame', () => {
-  it('returns inViewRatio', () =>
-    expect(
-      getInViewRatioInsideTopFrame({
-        ownerDocument: {
-          defaultView: {
-            innerHeight: 1000,
-            innerWidth: 1000
-          }
-        },
-        offsetWidth: 200,
-        offsetHeight: 200,
-        getBoundingClientRect() {
-          return {
-            top: 0,
-            right: 200,
-            bottom: 200,
-            left: 0
-          };
-        }
-      })
-    ).to.be.deep.equal(1));
-});
-
-describe('getOffsetTopDocument', () => {
-  it('returns offset relative to the top document', () =>
-    expect(
-      getOffsetTopDocument({
-        ownerDocument: {
-          defaultView: {
-            pageXOffset: 0,
-            pageYOffset: 0
-          }
-        },
-        getBoundingClientRect: () => ({
-          top: 0,
-          right: 0,
-          bottom: 0,
-          left: 0
-        })
-      })
-    ).to.be.deep.equal({
-      top: 0,
-      right: 0,
-      bottom: 0,
-      left: 0
-    }));
-});
-
-describe('getOffsetTopDocumentPercentage', () => {
-  it('returns offset from the top as a percentage of the page length', () => {
-    const topWindow = {
-      pageXOffset: 0,
-      pageYOffset: 100,
-      document: {
-        body: {
-          clientHeight: 1000
-        }
-      }
-    };
-    topWindow.top = topWindow;
-    topWindow.parent = topWindow;
-    expect(
-      getOffsetTopDocumentPercentage({
-        ownerDocument: {
-          defaultView: topWindow
-        },
-        getBoundingClientRect: () => ({
-          top: 100,
-          right: 0,
-          bottom: 0,
-          left: 0
-        })
-      })
-    ).to.be.equal(20);
-  });
-  it('throws when cannot get window', () =>
-    expect(() =>
-      getOffsetTopDocumentPercentage({
-        ownerDocument: {}
-      })
-    ).to.throw());
-  it("throw when top document isn't reachable", () => {
-    const topWindow = { ...topWindow, document: null };
-    expect(() =>
-      getOffsetTopDocumentPercentage({
-        ownerDocument: {
-          defaultView: {
-            top: topWindow
-          }
-        }
-      })
-    ).to.throw();
-  });
-});
-
-describe('getOffsetToView', () => {
-  expect(
-    getOffsetToView({
-      ownerDocument: {
-        defaultView: {
-          scrollY: 0,
-          pageXOffset: 0,
-          pageYOffset: 0
-        }
-      },
-      getBoundingClientRect: () => ({
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: 0
-      })
-    })
-  ).to.be.equal(0);
-});
-
-describe('getOffsetToView', () => {
-  expect(
-    getOffsetToViewPercentage({
-      ownerDocument: {
-        defaultView: {
-          scrollY: 0,
-          pageXOffset: 0,
-          pageYOffset: 0,
-          document: {
-            body: {
-              clientHeight: 1000
-            }
-          }
-        }
-      },
-      getBoundingClientRect: () => ({
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: 0
-      })
-    })
-  ).to.be.equal(0);
-});
-
-describe('getCuts without vCuts', () => {
-  const cases = {
-    'completely in view 1': {
-      top: 0,
-      bottom: 200,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: 0
-      }
-    },
-    'completely in view 2': {
-      top: 100,
-      bottom: 200,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: 0
-      }
-    },
-    'half cut from the top': {
-      top: -200,
-      bottom: 200,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: -200,
-        right: 0,
-        bottom: 0,
-        left: 0
-      }
-    },
-    'half cut from the bottom': {
-      top: 0,
-      bottom: 600,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: -300,
-        left: 0
-      }
-    },
-    'quarter cut from top and bottom': {
-      top: -25,
-      bottom: 75,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 50,
-      expected: {
-        top: -25,
-        right: 0,
-        bottom: -25,
-        left: 0
-      }
-    },
-    'out of view top': {
-      top: -200,
-      bottom: -5,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 200,
-      expected: {
-        top: -200,
-        right: 0,
-        bottom: 0,
-        left: 0
-      }
-    },
-    'out of view bottom': {
-      top: 250,
-      bottom: 500,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 200,
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: -300,
-        left: 0
-      }
-    },
-    'half cut from left': {
-      top: 0,
-      bottom: 200,
-      left: -200,
-      right: 200,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: -200
-      }
-    },
-    'half cut from left and top': {
-      top: -100,
-      bottom: 100,
-      left: -200,
-      right: 200,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: -100,
-        right: 0,
-        bottom: 0,
-        left: -200
-      }
-    },
-    'quarter cut from all sides': {
-      top: -100,
-      left: -100,
-      bottom: 300,
-      right: 300,
-      vw: 200,
-      vh: 200,
-      expected: {
-        top: -100,
-        right: -100,
-        bottom: -100,
-        left: -100
-      }
-    }
-  };
-  for (let descr in cases) {
-    it(descr, () => {
-      const { expected, vh, vw, ...rect } = cases[descr];
-      expect(getRectCuts(rect, vh, vw)).to.deep.equal(expected);
-    });
-  }
-});
-
-describe('getCuts with vCuts', () => {
-  const cases = {
-    'completely in view 1, half-cut viewport from top': {
-      top: 0,
-      right: 200,
-      bottom: 200,
-      left: 0,
-      vw: 200,
-      vh: 200,
-      vCuts: {
-        top: -100,
-        right: 0,
-        bottom: 0,
-        left: 0
-      },
-      expected: {
-        top: -100,
-        right: 0,
-        bottom: 0,
-        left: 0
-      }
-    },
-    'completely in view 2, half-cut viewport from bottom': {
-      top: 100,
-      bottom: 200,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 300,
-      vCuts: {
-        top: 0,
-        right: 0,
-        bottom: -150,
-        left: 0
-      },
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: -50,
-        left: 0
-      }
-    },
-    'half cut from the top, 1/3 viewport cut from the bottom': {
-      top: -200,
-      bottom: 200,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 300,
-      vCuts: {
-        top: 0,
-        right: 0,
-        bottom: -100,
-        left: 0
-      },
-      expected: {
-        top: -200,
-        right: 0,
-        bottom: 0,
-        left: 0
-      }
-    },
-    'half cut from the bottom': {
-      top: 0,
-      bottom: 600,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: -300,
-        left: 0
-      }
-    },
-    'quarter cut from top and bottom': {
-      top: -25,
-      bottom: 75,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 50,
-      expected: {
-        top: -25,
-        right: 0,
-        bottom: -25,
-        left: 0
-      }
-    },
-    'out of view top': {
-      top: -200,
-      bottom: -5,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 200,
-      expected: {
-        top: -200,
-        right: 0,
-        bottom: 0,
-        left: 0
-      }
-    },
-    'out of view bottom': {
-      top: 250,
-      bottom: 500,
-      right: 200,
-      left: 0,
-      vw: 300,
-      vh: 200,
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: -300,
-        left: 0
-      }
-    },
-    'half cut from left': {
-      top: 0,
-      bottom: 200,
-      left: -200,
-      right: 200,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: -200
-      }
-    },
-    'half cut from left and top': {
-      top: -100,
-      bottom: 100,
-      left: -200,
-      right: 200,
-      vw: 300,
-      vh: 300,
-      expected: {
-        top: -100,
-        right: 0,
-        bottom: 0,
-        left: -200
-      }
-    },
-    'quarter cut from all sides': {
-      top: -100,
-      left: -100,
-      bottom: 300,
-      right: 300,
-      vw: 200,
-      vh: 200,
-      expected: {
-        top: -100,
-        right: -100,
-        bottom: -100,
-        left: -100
-      }
-    }
-  };
-  for (let descr in cases) {
-    it(descr, () => {
-      const { expected, vh, vw, vCuts, ...rect } = cases[descr];
-      expect(getRectCuts(rect, vh, vw, vCuts)).to.deep.equal(expected);
-    });
-  }
-});
-
-describe('get', () => {
-  it('returns a property in a nested object 1', () =>
-    expect(get(['a'], { a: 1 })).to.equal(1));
-  it('returns a property in a nested object 2', () =>
-    expect(get(['a', 'b'], { a: { b: 1 } })).to.equal(1));
-  it('returns a property in a nested object 3', () =>
-    expect(get(['a', 'b'], { a: { b: 1 } })).to.equal(1));
-  it('returns undefined if property does not exist', () =>
-    expect(get(['a', 'b'], { b: 1 })).to.equal(undefined));
-  it('returns undefined if property does not exist', () =>
-    expect(get(['a', 'b'], undefined)).to.equal(undefined));
-  it('returns undefined if property does not exist', () =>
-    expect(get(['a', 'b'], 1213)).to.equal(undefined));
-  const DEFAULT = -5;
-  it('returns defaultValue if property does not exist', () =>
-    expect(get(['a', 'b'], { b: 1 }, DEFAULT)).to.equal(DEFAULT));
-  it('returns defaultValue if property does not exist', () =>
-    expect(get(['a', 'b'], undefined, DEFAULT)).to.equal(DEFAULT));
-  it('returns defaultValue if property does not exist', () =>
-    expect(get(['a', 'b'], 1213, DEFAULT)).to.equal(DEFAULT));
-  it('can work with arrays 1', () => expect(get([0, 1], [[1, 2]])).to.equal(2));
-  it('can work with arrays 2', () =>
-    expect(get([0, 'a'], [{ a: 42 }])).to.equal(42));
-});
-
-describe('getViewabilityDescription', () => {
-  it('returns error when there is no element', () => {
-    expect(getViewabilityDescription(null)).to.deep.equal({
-      error: 'no element'
-    });
-  });
-  it('returns only iframe type for nonfrienly iframe', () => {
-    expect(
-      getViewabilityDescription({
-        ownerDocument: {
-          defaultView: {}
-        }
-      })
-    ).to.deep.equal({
-      iframeType: 'nonfriendly'
-    });
-  });
-  it('returns only iframe type for safeframe iframe', () => {
-    expect(
-      getViewabilityDescription({
-        ownerDocument: {
-          defaultView: {
-            $sf: true
-          }
-        }
-      })
-    ).to.deep.equal({
-      iframeType: 'safeframe'
-    });
-  });
-});
-
-describe('mergeSizes', () => {
-  it('merges provides arrays of tuples, leaving only unique', () => {
-    expect(
-      mergeArrays(x => x.join(','), [[1, 2], [2, 4]], [[1, 2]])
-    ).to.deep.equal([[1, 2], [2, 4]]);
-  });
-  it('merges provides arrays of tuples, leaving only unique', () => {
-    expect(
-      mergeArrays(
-        x => x.join(','),
-        [[1, 2], [2, 4]],
-        [[1, 2]],
-        [[400, 500], [500, 600]]
-      )
-    ).to.deep.equal([[1, 2], [2, 4], [400, 500], [500, 600]]);
-  });
-});
-
-describe('documentFocus', () => {
-  it('calls hasFocus function if it present, converting boolean to an int 0/1 value, returns undefined otherwise', () => {
-    expect(
-      documentFocus({
-        hasFocus: () => true
-      })
-    ).to.equal(1);
-    expect(
-      documentFocus({
-        hasFocus: () => false
-      })
-    ).to.equal(0);
-    expect(documentFocus({})).to.be.undefined;
-  });
-});
diff --git a/test/spec/modules/vibrantmediaBidAdapter_spec.js b/test/spec/modules/vibrantmediaBidAdapter_spec.js
new file mode 100644
index 00000000000..c6ce7d52fb3
--- /dev/null
+++ b/test/spec/modules/vibrantmediaBidAdapter_spec.js
@@ -0,0 +1,1237 @@
+import {expect} from 'chai';
+import {spec} from 'modules/vibrantmediaBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {BANNER, NATIVE, VIDEO} from 'src/mediaTypes.js';
+import {INSTREAM, OUTSTREAM} from 'src/video.js';
+
+const EXPECTED_PREBID_SERVER_URL = 'https://prebid.intellitxt.com/prebid';
+
+const BANNER_AD =
+  '<!DOCTYPE html><html lang="en"><head><title>Test Banner Ad Unit</title></head><body>Hello!</body></html>';
+const VIDEO_AD = '<!DOCTYPE html><html lang="en"><head><title>Test Video Ad Unit</title></head>' +
+  '<script type="text/javascript" src="https://www.example.com/myvideo.mp3"></script></body></html>';
+
+const VALID_BANNER_BID_PARAMS = Object.freeze({
+  member: '1234',
+  invCode: 'ABCD',
+  placementId: '10433394'
+});
+
+const VALID_VIDEO_BID_PARAMS = Object.freeze({
+  member: '1234',
+  invCode: 'ABCD',
+  placementId: '10433394',
+  video: {
+    skippable: false,
+    playback_method: 'auto_play_sound_off'
+  }
+});
+
+const VALID_NATIVE_BID_PARAMS = VALID_BANNER_BID_PARAMS;
+
+const DEFAULT_BID_SIZES = [[300, 250], [600, 240]];
+
+const VALID_CONSENT_STRING = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+
+const getValidBidderRequest = (bidRequests) => {
+  return Object.freeze({
+    bidderCode: 'vibrantmedia',
+    auctionId: '1d1a030790a475',
+    bidderRequestId: '22edbae2733bf6',
+    timeout: 3000,
+    gdprConsent: {
+      consentString: VALID_CONSENT_STRING,
+      vendorData: {},
+      gdprApplies: true,
+    },
+    bids: bidRequests,
+  });
+};
+
+describe('VibrantMediaBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('constants', function () {
+    expect(spec.code).to.equal('vibrantmedia');
+    expect(spec.supportedMediaTypes).to.deep.equal([BANNER, NATIVE, VIDEO]);
+  });
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('transformBidParams', function () {
+    it('transforms bid params correctly', function () {
+      expect(spec.transformBidParams(VALID_VIDEO_BID_PARAMS)).to.deep.equal(VALID_VIDEO_BID_PARAMS);
+    });
+  })
+
+  let bidRequest;
+
+  beforeEach(function () {
+    bidRequest = {
+      bidder: 'vibrantmedia',
+      params: {
+        // Filled in by individual tests
+      },
+      mediaTypes: {
+        // Filled in by individual tests
+      },
+      adUnitCode: 'test-div',
+      transactionId: '13579acef87623',
+      placementId: '7623587623857',
+      bidId: '30b31c1838de1e',
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '1d1a030790a475'
+    };
+  });
+
+  describe('isBidRequestValid', function () {
+    describe('with banner bid requests', function () {
+      beforeEach(function () {
+        bidRequest.mediaTypes.banner = {
+          sizes: DEFAULT_BID_SIZES,
+        };
+      });
+
+      it('should return true for a valid banner bid request', function () {
+        bidRequest.params = VALID_BANNER_BID_PARAMS;
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      });
+
+      it('should return true for a valid banner bid request with a member id and inventory code', function () {
+        bidRequest.params = {
+          member: '1234',
+          invCode: 'ABCD',
+        };
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      });
+
+      it('should return true for a valid banner bid request with a placement id', function () {
+        bidRequest.params = {
+          placementId: '10433394',
+        };
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      });
+
+      it('should return false for a valid banner bid request but with a member id and no inventory code', function () {
+        bidRequest.params = {
+          member: '1234',
+        };
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      });
+
+      it('should return false for a valid banner bid request but with no member id and an inventory code', function () {
+        bidRequest.params = {
+          invCode: 'ABCD',
+        };
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      });
+
+      it('should return false for a valid banner bid request but with no supported media types', function () {
+        bidRequest.params = {
+          placementId: '10433394',
+        };
+        delete bidRequest.mediaTypes.banner;
+        bidRequest.mediaTypes.unsupported = {
+          sizes: DEFAULT_BID_SIZES,
+        }
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      });
+
+      it('should return false for a valid banner bid request but with no params', function () {
+        bidRequest.params = {};
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      });
+    });
+
+    describe('with video bid requests', function () {
+      describe('with sizes attribute', function () {
+        const validVideoMediaTypes = {
+          context: OUTSTREAM,
+          sizes: DEFAULT_BID_SIZES,
+          minduration: 1,
+          maxduration: 60,
+          skip: 0,
+          skipafter: 5,
+          playbackmethod: [2],
+          protocols: [1, 2, 3]
+        };
+
+        it('should return true for a valid video bid request', function () {
+          bidRequest.params = VALID_VIDEO_BID_PARAMS;
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+        });
+
+        it('should return false for an instream video bid request', function () {
+          bidRequest.params = VALID_VIDEO_BID_PARAMS;
+          bidRequest.mediaTypes.video = {
+            context: INSTREAM,
+            sizes: DEFAULT_BID_SIZES,
+          };
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return false for a video bid request with an unknown context', function () {
+          bidRequest.params = VALID_VIDEO_BID_PARAMS;
+          bidRequest.mediaTypes.video = {
+            context: 'fake',
+            sizes: DEFAULT_BID_SIZES,
+          };
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return false for a video bid request with no context', function () {
+          bidRequest.params = VALID_VIDEO_BID_PARAMS;
+          bidRequest.mediaTypes.video = {
+            sizes: DEFAULT_BID_SIZES,
+          };
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return true for a valid video bid request with a member id and inventory code', function () {
+          bidRequest.params = {
+            member: '1234',
+            invCode: 'ABCD',
+          };
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+        });
+
+        it('should return true for a valid video bid request with a placement id', function () {
+          bidRequest.params = {
+            placementId: '10433394',
+          };
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+        });
+
+        it('should return false for a valid video bid request but with a member id and no inventory code', function () {
+          bidRequest.params = {
+            member: '1234',
+          };
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return false for a valid video bid request but with no member id and an inventory code', function () {
+          bidRequest.params = {
+            invCode: 'ABCD',
+          };
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return false for a valid video bid request but with no params', function () {
+          bidRequest.params = {};
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+      });
+
+      describe('with playerSize attribute', function () {
+        const validVideoMediaTypes = {
+          context: OUTSTREAM,
+          playerSize: DEFAULT_BID_SIZES,
+          minduration: 1,
+          maxduration: 60,
+          skip: 0,
+          skipafter: 5,
+          playbackmethod: [2],
+          protocols: [1, 2, 3]
+        };
+
+        beforeEach(function () {
+          bidRequest.mediaTypes.video = {
+            // Filled in by individual tests
+          };
+        });
+
+        it('should return true for a valid video bid request', function () {
+          bidRequest.params = VALID_VIDEO_BID_PARAMS;
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+        });
+
+        it('should return false for an instream video bid request', function () {
+          bidRequest.params = VALID_VIDEO_BID_PARAMS;
+          bidRequest.mediaTypes.video = {
+            context: INSTREAM,
+            playerSize: DEFAULT_BID_SIZES,
+          };
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return false for a video bid request with an unknown context', function () {
+          bidRequest.params = VALID_VIDEO_BID_PARAMS;
+          bidRequest.mediaTypes.video = {
+            context: 'fake',
+            playerSize: DEFAULT_BID_SIZES,
+          };
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return false for a video bid request with no context', function () {
+          bidRequest.params = VALID_VIDEO_BID_PARAMS;
+          bidRequest.mediaTypes.video = {
+            playerSize: DEFAULT_BID_SIZES,
+          };
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return true for a valid video bid request with a member id and inventory code', function () {
+          bidRequest.params = {
+            member: '1234',
+            invCode: 'ABCD',
+          };
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+        });
+
+        it('should return true for a valid video bid request with a placement id', function () {
+          bidRequest.params = {
+            placementId: '10433394',
+          };
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+        });
+
+        it('should return false for a valid video bid request but with a member id and no inventory code', function () {
+          bidRequest.params = {
+            member: '1234',
+          };
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return false for a valid video bid request but with no member id and an inventory code', function () {
+          bidRequest.params = {
+            invCode: 'ABCD',
+          };
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+
+        it('should return false for a valid video bid request but with no params', function () {
+          bidRequest.params = {};
+          bidRequest.mediaTypes.video = validVideoMediaTypes;
+
+          expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+        });
+      });
+    });
+
+    describe('with native bid requests', function () {
+      beforeEach(function () {
+        bidRequest.mediaTypes.native = {
+          image: {
+            required: true,
+            // Sizes is filled in by individual tests
+          },
+          title: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          },
+          clickUrl: {
+            required: true
+          }
+        };
+      });
+
+      it('should return true for a valid native bid request with a single size', function () {
+        bidRequest.params = VALID_NATIVE_BID_PARAMS;
+        bidRequest.mediaTypes.native.image.sizes = [300, 250];
+
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      });
+
+      it('should return true for a valid native bid request with multiple sizes', function () {
+        bidRequest.params = VALID_NATIVE_BID_PARAMS;
+        bidRequest.mediaTypes.native.image.sizes = [[300, 250], [300, 600]];
+
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      });
+
+      it('should return true for a valid native bid request with a member id and inventory code', function () {
+        bidRequest.params = {
+          member: '1234',
+          invCode: 'ABCD',
+        };
+        bidRequest.mediaTypes.native.image.sizes = [300, 250];
+
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      });
+
+      it('should return true for a valid native bid request with a placement id', function () {
+        bidRequest.params = {
+          placementId: '10433394',
+        };
+        bidRequest.mediaTypes.native.image.sizes = [300, 250];
+
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      });
+
+      it('should return false for a valid native bid request but with a member id and no inventory code', function () {
+        bidRequest.params = {
+          member: '1234',
+        };
+        bidRequest.mediaTypes.native.image.sizes = [300, 250];
+
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      });
+
+      it('should return false for a valid native bid request but with no member id and an inventory code', function () {
+        bidRequest.params = {
+          invCode: 'ABCD',
+        };
+        bidRequest.mediaTypes.native.image.sizes = [300, 250];
+
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      });
+
+      it('should return false for a valid native bid request but with no params', function () {
+        bidRequest.params = {};
+        bidRequest.mediaTypes.native.image.sizes = [300, 250];
+
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      });
+
+      it('should return false for a native bid request with no image property', function () {
+        bidRequest.params = VALID_NATIVE_BID_PARAMS;
+        delete bidRequest.mediaTypes.native.image;
+
+        expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      });
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests;
+
+    beforeEach(function () {
+      bidRequests = [bidRequest];
+
+      bidRequests[0].params = VALID_BANNER_BID_PARAMS;
+      bidRequests[0].mediaTypes.banner = {
+        sizes: DEFAULT_BID_SIZES,
+      };
+    });
+
+    it('should use HTTP POST', function () {
+      const request = spec.buildRequests(bidRequests, {});
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should use the correct prebid server URL', function () {
+      const request = spec.buildRequests(bidRequests, {});
+      expect(request.url).to.equal(EXPECTED_PREBID_SERVER_URL);
+    });
+
+    it('should add the page URL to the server request', function () {
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.url).to.exist;
+      expect(payload.url).to.be.a('string');
+    });
+
+    it('should add GDPR consent to the server request, where present', function () {
+      const bidderRequest = {
+        bidderCode: 'vibrantmedia',
+        auctionId: '1d1a030790a475',
+        bidderRequestId: '22edbae2733bf6',
+        timeout: 3000,
+        gdprConsent: {
+          consentString: VALID_CONSENT_STRING,
+          gdprApplies: true,
+        },
+        bids: bidRequests,
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      // TODO: Check that we should not be implementing withCredentials
+      // expect(request.options).to.deep.equal({withCredentials: true});
+
+      const payload = JSON.parse(request.data);
+      expect(payload.gdpr).to.exist;
+      expect(payload.gdpr.consentString).to.exist.and.to.equal(VALID_CONSENT_STRING);
+      expect(payload.gdpr.gdprApplies).to.exist.and.to.be.true;
+    });
+
+    it('should add USP consent to the server request, where present', function () {
+      const bidderRequest = {
+        bidderCode: 'vibrantmedia',
+        auctionId: '1d1a030790a475',
+        bidderRequestId: '22edbae2733bf6',
+        timeout: 3000,
+        uspConsent: {
+          cmpApi: 'iab',
+          timeout: 10000,
+          consentData: {
+            testDatum: true
+          }
+        },
+        bids: bidRequests
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      // TODO: Check that we should not be implementing withCredentials
+      // expect(request.options).to.deep.equal({withCredentials: true});
+
+      const payload = JSON.parse(request.data);
+      expect(payload.usp).to.exist;
+      expect(payload.usp.cmpApi).to.exist.and.to.equal('iab');
+      expect(payload.usp.timeout).to.exist.and.to.equal(10000);
+      expect(payload.usp.consentData).to.exist.and.to.deep.equal({
+        testDatum: true
+      });
+    });
+
+    it('should add GDPR and USP consent to the server request, where both present', function () {
+      const bidderRequest = {
+        bidderCode: 'vibrantmedia',
+        auctionId: '1d1a030790a475',
+        bidderRequestId: '22edbae2733bf6',
+        timeout: 3000,
+        gdprConsent: {
+          consentString: VALID_CONSENT_STRING,
+          gdprApplies: true,
+        },
+        uspConsent: {
+          cmpApi: 'iab',
+          timeout: 10000,
+          consentData: {
+            testDatum: true
+          }
+        },
+        bids: bidRequests,
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      // TODO: Check that we should not be implementing withCredentials
+      // expect(request.options).to.deep.equal({withCredentials: true});
+
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr).to.exist;
+      expect(payload.gdpr.consentString).to.exist.and.to.equal(VALID_CONSENT_STRING);
+      expect(payload.gdpr.gdprApplies).to.exist.and.to.be.true;
+
+      expect(payload.usp).to.exist;
+      expect(payload.usp.cmpApi).to.exist.and.to.equal('iab');
+      expect(payload.usp.timeout).to.exist.and.to.equal(10000);
+      expect(payload.usp.consentData).to.exist.and.to.deep.equal({
+        testDatum: true
+      });
+    });
+
+    it('should add window dimensions to the server request', function () {
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.window).to.exist;
+      expect(payload.window.width).to.equal(window.innerWidth);
+      expect(payload.window.height).to.equal(window.innerHeight);
+    });
+
+    it('should add the top-level sizes to the bid request, if present', function () {
+      bidRequest.params = VALID_BANNER_BID_PARAMS;
+      bidRequest.sizes = DEFAULT_BID_SIZES;
+      bidRequest.mediaTypes = {
+        banner: {},
+      };
+
+      const request = spec.buildRequests(bidRequests, {}, true);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.biddata).to.exist;
+      expect(payload.biddata.length).to.equal(1);
+      expect(payload.biddata[0]).to.exist;
+      expect(payload.biddata[0].code).to.equal(bidRequest.adUnitCode);
+      expect(payload.biddata[0].id).to.equal(bidRequest.placementId);
+      expect(payload.biddata[0].bidder).to.equal(bidRequest.bidder);
+      expect(payload.biddata[0].sizes).to.deep.equal(DEFAULT_BID_SIZES);
+      expect(payload.biddata[0].mediaTypes).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.deep.equal({});
+    });
+
+    it('should add the list of bids to the bid request, if present', function () {
+      const testBid = {
+        bidder: 'testBidder',
+        params: {
+          placement: '12345'
+        }
+      };
+
+      bidRequest.params = VALID_BANNER_BID_PARAMS;
+      bidRequest.bids = [testBid];
+      bidRequest.mediaTypes = {
+        banner: {},
+      };
+
+      // These will be present in the list of bids instead
+      delete bidRequest.bidId;
+      delete bidRequest.transactionId;
+      delete bidRequest.bidder;
+
+      const request = spec.buildRequests(bidRequests, {}, true);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.biddata).to.exist;
+      expect(payload.biddata.length).to.equal(1);
+      expect(payload.biddata[0]).to.exist;
+      expect(payload.biddata[0].code).to.equal(bidRequest.adUnitCode);
+      expect(payload.biddata[0].id).to.equal(bidRequest.placementId);
+      expect(payload.biddata[0].bidder).to.equal(bidRequest.bidder);
+      expect(payload.biddata[0].bids.length).to.equal(1);
+      expect(payload.biddata[0].bids[0]).to.deep.equal(testBid);
+      expect(payload.biddata[0].mediaTypes).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.deep.equal({});
+    });
+
+    it('should add the correct bid data to the server request for one bid request', function () {
+      bidRequest.params = VALID_BANNER_BID_PARAMS;
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: DEFAULT_BID_SIZES,
+        },
+      };
+
+      const request = spec.buildRequests(bidRequests, {}, true);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.biddata).to.exist;
+      expect(payload.biddata.length).to.equal(1);
+      expect(payload.biddata[0]).to.exist;
+      expect(payload.biddata[0].code).to.equal(bidRequest.adUnitCode);
+      expect(payload.biddata[0].id).to.equal(bidRequest.placementId);
+      expect(payload.biddata[0].bidder).to.equal(bidRequest.bidder);
+      expect(payload.biddata[0].sizes).to.be.undefined;
+      expect(payload.biddata[0].mediaTypes).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.deep.equal({
+        sizes: DEFAULT_BID_SIZES,
+      });
+    });
+
+    it('should add the correct bid data to the server request for multiple bid requests', function () {
+      bidRequest.params = VALID_BANNER_BID_PARAMS;
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: DEFAULT_BID_SIZES,
+        },
+      };
+      const bid2 = {
+        bidder: 'vibrantmedia',
+        params: VALID_VIDEO_BID_PARAMS,
+        mediaTypes: {
+          video: {
+            context: OUTSTREAM,
+            sizes: DEFAULT_BID_SIZES,
+          }
+        },
+        adUnitCode: 'video-div',
+        bidId: '30b31c1838de1f',
+        placementId: '135797531abcdef',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+      };
+      const bid3 = {
+        bidder: 'vibrantmedia',
+        params: VALID_NATIVE_BID_PARAMS,
+        mediaTypes: {
+          native: {
+            image: {
+              required: true,
+              sizes: [300, 250]
+            },
+            title: {
+              required: true
+            },
+            sponsoredBy: {
+              required: true
+            },
+            clickUrl: {
+              required: true
+            }
+          }
+        },
+        adUnitCode: 'native-div',
+        bidId: '30b31c1838de14',
+        placementId: '918273645abcdef',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+      };
+
+      bidRequests.push(bid2, bid3);
+
+      const request = spec.buildRequests(bidRequests, {}, true);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.biddata).to.exist;
+      expect(payload.biddata.length).to.equal(3);
+      expect(payload.biddata[0]).to.exist;
+      expect(payload.biddata[0].code).to.equal(bidRequest.adUnitCode);
+      expect(payload.biddata[0].id).to.equal(bidRequest.placementId);
+      expect(payload.biddata[0].bidder).to.equal(bidRequest.bidder);
+      expect(payload.biddata[0].mediaTypes).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.deep.equal({
+        sizes: DEFAULT_BID_SIZES,
+      });
+      expect(payload.biddata[1]).to.exist;
+      expect(payload.biddata[1].code).to.equal(bid2.adUnitCode);
+      expect(payload.biddata[1].id).to.equal(bid2.placementId);
+      expect(payload.biddata[1].bidder).to.equal(bid2.bidder);
+      expect(payload.biddata[1].mediaTypes).to.exist;
+      expect(payload.biddata[1].mediaTypes[VIDEO]).to.exist;
+      expect(payload.biddata[1].mediaTypes[VIDEO]).to.deep.equal({
+        context: OUTSTREAM,
+        sizes: DEFAULT_BID_SIZES,
+      });
+      expect(payload.biddata[2]).to.exist;
+      expect(payload.biddata[2].code).to.equal(bid3.adUnitCode);
+      expect(payload.biddata[2].id).to.equal(bid3.placementId);
+      expect(payload.biddata[2].bidder).to.equal(bid3.bidder);
+      expect(payload.biddata[2].mediaTypes[NATIVE]).to.exist;
+      expect(payload.biddata[2].mediaTypes[NATIVE]).to.deep.equal(bid3.mediaTypes.native);
+    });
+
+    it('should add the correct bid data to the bid request where a bid has multiple media types', function () {
+      bidRequest.params = VALID_VIDEO_BID_PARAMS;
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: DEFAULT_BID_SIZES,
+        },
+        video: {
+          context: OUTSTREAM,
+          sizes: DEFAULT_BID_SIZES,
+        },
+        native: {
+          image: {
+            required: true,
+            sizes: [300, 250]
+          },
+          title: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          },
+          clickUrl: {
+            required: true
+          }
+        }
+      };
+      bidRequest.adUnitCode = 'mixed-div';
+
+      const bid2 = {
+        bidder: 'vibrantmedia',
+        params: VALID_VIDEO_BID_PARAMS,
+        mediaTypes: {
+          video: {
+            context: OUTSTREAM,
+            sizes: DEFAULT_BID_SIZES,
+          }
+        },
+        adUnitCode: 'video-div',
+        bidId: '30b31c1838de1a',
+        bidderRequestId: '22edbae2733bf6',
+        placementId: '293857832abfef',
+        auctionId: '1d1a030790a475',
+      };
+
+      bidRequests.push(bid2);
+
+      const request = spec.buildRequests(bidRequests, {}, true);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.biddata).to.exist;
+      expect(payload.biddata.length).to.equal(2);
+      expect(payload.biddata[0]).to.exist;
+      expect(payload.biddata[0].code).to.equal(bidRequest.adUnitCode);
+      expect(payload.biddata[0].id).to.equal(bidRequest.placementId);
+      expect(payload.biddata[0].bidder).to.equal(bidRequest.bidder);
+      expect(payload.biddata[0].mediaTypes).to.exist;
+      expect(Object.keys(payload.biddata[0].mediaTypes).length).to.equal(3);
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.exist;
+      expect(payload.biddata[0].mediaTypes[BANNER]).to.deep.equal({
+        sizes: DEFAULT_BID_SIZES,
+      });
+      expect(payload.biddata[0].mediaTypes[VIDEO]).to.exist;
+      expect(payload.biddata[0].mediaTypes[VIDEO]).to.deep.equal({
+        context: OUTSTREAM,
+        sizes: DEFAULT_BID_SIZES,
+      });
+      expect(payload.biddata[0].code).to.equal(bidRequest.adUnitCode);
+      expect(payload.biddata[0].id).to.equal(bidRequest.placementId);
+      expect(payload.biddata[0].bidder).to.equal(bidRequest.bidder);
+      expect(payload.biddata[0].mediaTypes[NATIVE]).to.exist;
+      expect(payload.biddata[0].mediaTypes[NATIVE]).to.deep.equal(bidRequest.mediaTypes.native);
+      expect(payload.biddata[1]).to.exist;
+      expect(payload.biddata[1].code).to.equal(bid2.adUnitCode);
+      expect(payload.biddata[1].id).to.equal(bid2.placementId);
+      expect(payload.biddata[1].bidder).to.equal(bid2.bidder);
+      expect(payload.biddata[1].mediaTypes).to.exist;
+      expect(Object.keys(payload.biddata[1].mediaTypes).length).to.equal(1);
+      expect(payload.biddata[1].mediaTypes[VIDEO]).to.exist;
+      expect(payload.biddata[1].mediaTypes[VIDEO]).to.deep.equal({
+        context: OUTSTREAM,
+        sizes: DEFAULT_BID_SIZES,
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('returns a valid Prebid API response object for a banner Prebid Server response', function () {
+      const prebidServerResponse = {
+        body: [{
+          mediaType: 'banner',
+          requestId: '12345',
+          cpm: 1,
+          currency: 'USD',
+          width: 640,
+          height: 240,
+          ad: BANNER_AD,
+          ttl: 300,
+          creativeId: '86f4aef9-2f17-421d-84db-5c9814bf4a79',
+          netRevenue: false,
+          meta: Object.freeze({
+            advertiser: '105600',
+            width: 300,
+            height: 250,
+            isCustom: '1',
+            progressBar: false,
+            mpuSrc: '//images.intellitxt.com/a/105600/Genpact/genpact.jpg',
+            clickURL: '{{click}}'
+          })
+        }]
+      };
+
+      const interpretedResponse = spec.interpretResponse(prebidServerResponse, {});
+
+      expect(interpretedResponse).to.be.a('array');
+      expect(interpretedResponse.length).to.equal(1);
+
+      const interpretedBid = interpretedResponse[0];
+
+      expect(interpretedBid.mediaType).to.equal('banner');
+      expect(interpretedBid.requestId).to.equal('12345');
+      expect(interpretedBid.cpm).to.equal(1);
+      expect(interpretedBid.currency).to.equal('USD');
+      expect(interpretedBid.width).to.equal(640);
+      expect(interpretedBid.height).to.equal(240);
+      expect(interpretedBid.ad).to.equal(BANNER_AD);
+      expect(interpretedBid.ttl).to.equal(300);
+      expect(interpretedBid.creativeId).to.equal('86f4aef9-2f17-421d-84db-5c9814bf4a79');
+      expect(interpretedBid.netRevenue).to.be.false;
+      expect(interpretedBid.meta).to.deep.equal(prebidServerResponse.body[0].meta);
+      expect(interpretedBid.renderer).to.be.undefined;
+      expect(interpretedBid.adResponse).to.deep.equal(prebidServerResponse);
+    });
+
+    it('returns a valid Prebid API response object for a video Prebid Server response', function () {
+      const prebidServerResponse = Object.freeze({
+        body: [{
+          mediaType: 'video',
+          requestId: '67890',
+          cpm: 2,
+          currency: 'USD',
+          width: 600,
+          height: 300,
+          ad: VIDEO_AD,
+          ttl: 300,
+          creativeId: '248e8e0c-2f17-421d-84db-5c9814bf4a79',
+          netRevenue: false,
+          meta: {
+            advertiser: '105600',
+            width: 300,
+            height: 250,
+            isCustom: '1',
+            progressBar: false,
+            mpuSrc: '//images.intellitxt.com/a/105600/Genpact/genpact.jpg',
+            clickURL: '{{click}}'
+          },
+          vastUrl: 'https://www.example.com/myVastVideo'
+        }]
+      });
+
+      const interpretedResponse = spec.interpretResponse(prebidServerResponse, {});
+
+      expect(interpretedResponse).to.be.a('array');
+      expect(interpretedResponse.length).to.equal(1);
+
+      const interpretedBid = interpretedResponse[0];
+
+      expect(interpretedBid.mediaType).to.equal('video');
+      expect(interpretedBid.requestId).to.equal('67890');
+      expect(interpretedBid.cpm).to.equal(2);
+      expect(interpretedBid.currency).to.equal('USD');
+      expect(interpretedBid.width).to.equal(600);
+      expect(interpretedBid.height).to.equal(300);
+      expect(interpretedBid.ad).to.equal(VIDEO_AD);
+      expect(interpretedBid.ttl).to.equal(300);
+      expect(interpretedBid.creativeId).to.equal('248e8e0c-2f17-421d-84db-5c9814bf4a79');
+      expect(interpretedBid.netRevenue).to.be.false;
+      expect(interpretedBid.meta).to.deep.equal(prebidServerResponse.body[0].meta);
+      expect(interpretedBid.renderer).to.be.undefined;
+      expect(interpretedBid.adResponse).to.deep.equal(prebidServerResponse);
+    });
+
+    it('returns a valid Prebid API response object for a native Prebid Server response', function () {
+      const prebidServerResponse = Object.freeze({
+        body: [{
+          mediaType: 'native',
+          requestId: '13579',
+          cpm: 3,
+          currency: 'USD',
+          width: 240,
+          height: 300,
+          ad: 'https://www.example.com/native-display.html',
+          ttl: 300,
+          creativeId: 'd28e8e0c-2f17-421d-84db-5c9814bf4a81',
+          netRevenue: false,
+          meta: {},
+          title: 'Test native ad bid for 13579',
+          sponsoredBy: 'Vibrant Media Ltd',
+          clickUrl: 'https://www.example.com/native-ct.html',
+          image: {
+            url: 'https://www.example.com/native-display.html',
+            width: 240,
+            height: 300
+          }
+        }]
+      });
+
+      const interpretedResponse = spec.interpretResponse(prebidServerResponse, {});
+
+      expect(interpretedResponse).to.be.a('array');
+      expect(interpretedResponse.length).to.equal(1);
+
+      const interpretedBid = interpretedResponse[0];
+
+      expect(interpretedBid.mediaType).to.equal('native');
+      expect(interpretedBid.requestId).to.equal('13579');
+      expect(interpretedBid.cpm).to.equal(3);
+      expect(interpretedBid.currency).to.equal('USD');
+      expect(interpretedBid.width).to.equal(240);
+      expect(interpretedBid.height).to.equal(300);
+      expect(interpretedBid.ad).to.equal('https://www.example.com/native-display.html');
+      expect(interpretedBid.ttl).to.equal(300);
+      expect(interpretedBid.creativeId).to.equal('d28e8e0c-2f17-421d-84db-5c9814bf4a81');
+      expect(interpretedBid.netRevenue).to.be.false;
+      expect(interpretedBid.meta).to.deep.equal(prebidServerResponse.body[0].meta);
+      expect(interpretedBid.renderer).to.be.undefined;
+      expect(interpretedBid.adResponse).to.deep.equal(prebidServerResponse);
+    });
+
+    it('returns a valid Prebid API response object for a multi-bid Prebid Server response', function () {
+      const prebidServerResponse = Object.freeze({
+        body: [
+          {
+            mediaType: 'banner',
+            requestId: '12345',
+            cpm: 3,
+            currency: 'USD',
+            width: 640,
+            height: 240,
+            ad: BANNER_AD,
+            ttl: 300,
+            creativeId: '86f4aef9-2f17-421d-84db-5c9814bf4a79',
+            netRevenue: false,
+            meta: {
+              advertiser: '105600',
+              width: 300,
+              height: 250,
+              isCustom: '1',
+              progressBar: false,
+              mpuSrc: '//images.intellitxt.com/a/105600/Genpact/genpact.jpg',
+              clickURL: '{{click}}'
+            }
+          },
+          {
+            mediaType: 'video',
+            requestId: '67890',
+            cpm: 4,
+            currency: 'USD',
+            width: 300,
+            height: 300,
+            ad: VIDEO_AD,
+            ttl: 300,
+            creativeId: 'd28e8e0c-2f17-421d-84db-5c9814bf4a79',
+            netRevenue: false,
+            meta: {
+              advertiser: '105600',
+              width: 300,
+              height: 250,
+              isCustom: '1',
+              progressBar: false,
+              mpuSrc: '//images.intellitxt.com/a/105600/Genpact/genpact.jpg',
+              clickURL: '{{click}}'
+            },
+            vastUrl: 'https://www.example.com/myVastVideo'
+          },
+          {
+            mediaType: 'native',
+            requestId: '13579',
+            cpm: 5,
+            currency: 'USD',
+            width: 640,
+            height: 240,
+            ad: 'https://www.example.com/native-display.html',
+            ttl: 300,
+            creativeId: '888e8e0c-2f17-421d-84db-5c9814bf4a81',
+            netRevenue: false,
+            meta: {},
+            title: 'Test native ad bid for 13579',
+            sponsoredBy: 'Vibrant Media Ltd',
+            clickUrl: 'https://www.example.com/native-ct.html',
+            image: {
+              url: 'https://www.example.com/native-display.html',
+              width: 640,
+              height: 240
+            }
+          }
+        ]
+      });
+
+      const interpretedResponse = spec.interpretResponse(prebidServerResponse, {});
+
+      expect(interpretedResponse).to.be.a('array');
+      expect(interpretedResponse.length).to.equal(3);
+
+      const interpretedBannerBid = interpretedResponse[0];
+
+      expect(interpretedBannerBid.mediaType).to.equal('banner');
+      expect(interpretedBannerBid.requestId).to.equal('12345');
+      expect(interpretedBannerBid.cpm).to.equal(3);
+      expect(interpretedBannerBid.currency).to.equal('USD');
+      expect(interpretedBannerBid.width).to.equal(640);
+      expect(interpretedBannerBid.height).to.equal(240);
+      expect(interpretedBannerBid.ad).to.equal(BANNER_AD);
+      expect(interpretedBannerBid.ttl).to.equal(300);
+      expect(interpretedBannerBid.creativeId).to.equal('86f4aef9-2f17-421d-84db-5c9814bf4a79');
+      expect(interpretedBannerBid.netRevenue).to.be.false;
+      expect(interpretedBannerBid.meta).to.deep.equal(prebidServerResponse.body[0].meta);
+      expect(interpretedBannerBid.renderer).to.be.undefined;
+      expect(interpretedBannerBid.adResponse).to.deep.equal(prebidServerResponse);
+
+      const interpretedVideoBid = interpretedResponse[1];
+
+      expect(interpretedVideoBid.mediaType).to.equal('video');
+      expect(interpretedVideoBid.requestId).to.equal('67890');
+      expect(interpretedVideoBid.cpm).to.equal(4);
+      expect(interpretedVideoBid.currency).to.equal('USD');
+      expect(interpretedVideoBid.width).to.equal(300);
+      expect(interpretedVideoBid.height).to.equal(300);
+      expect(interpretedVideoBid.ad).to.equal(VIDEO_AD);
+      expect(interpretedVideoBid.ttl).to.equal(300);
+      expect(interpretedVideoBid.creativeId).to.equal('d28e8e0c-2f17-421d-84db-5c9814bf4a79');
+      expect(interpretedVideoBid.netRevenue).to.be.false;
+      expect(interpretedVideoBid.meta).to.deep.equal(prebidServerResponse.body[1].meta);
+      expect(interpretedVideoBid.renderer).to.be.undefined;
+      expect(interpretedVideoBid.adResponse).to.deep.equal(prebidServerResponse);
+
+      const interpretedNativeBid = interpretedResponse[2];
+
+      expect(interpretedNativeBid.mediaType).to.equal('native');
+      expect(interpretedNativeBid.requestId).to.equal('13579');
+      expect(interpretedNativeBid.cpm).to.equal(5);
+      expect(interpretedNativeBid.currency).to.equal('USD');
+      expect(interpretedNativeBid.width).to.equal(640);
+      expect(interpretedNativeBid.height).to.equal(240);
+      expect(interpretedNativeBid.ad).to.equal('https://www.example.com/native-display.html');
+      expect(interpretedNativeBid.ttl).to.equal(300);
+      expect(interpretedNativeBid.creativeId).to.equal('888e8e0c-2f17-421d-84db-5c9814bf4a81');
+      expect(interpretedNativeBid.netRevenue).to.be.false;
+      expect(interpretedNativeBid.meta).to.deep.equal(prebidServerResponse.body[2].meta);
+      expect(interpretedNativeBid.renderer).to.be.undefined;
+      expect(interpretedNativeBid.adResponse).to.deep.equal(prebidServerResponse);
+    });
+  });
+
+  describe('Flow tests', function () {
+    describe('For successive API calls to the public functions', function () {
+      it('should succeed with one media type per bid', function () {
+        const transformedBannerBidParams = spec.transformBidParams(VALID_BANNER_BID_PARAMS);
+        const transformedVideoBidParams = spec.transformBidParams(VALID_VIDEO_BID_PARAMS);
+        const transformedNativeBidParams = spec.transformBidParams(VALID_NATIVE_BID_PARAMS);
+
+        const bannerBid = {
+          bidder: 'vibrantmedia',
+          params: transformedBannerBidParams,
+          mediaTypes: {
+            banner: {
+              sizes: DEFAULT_BID_SIZES,
+            },
+          },
+          adUnitCode: 'banner-div',
+          bidId: '30b31c1838de11',
+          bidderRequestId: '22edbae2733bf6',
+          placementId: '293857832abfef',
+          auctionId: '1d1a030790a475',
+        };
+        const videoBid = {
+          bidder: 'vibrantmedia',
+          params: transformedVideoBidParams,
+          mediaTypes: {
+            video: {
+              context: OUTSTREAM,
+              sizes: DEFAULT_BID_SIZES,
+            },
+          },
+          adUnitCode: 'video-div',
+          bidId: '30b31c1838de15',
+          bidderRequestId: '22edbae2733bf6',
+          placementId: '293857832abfef',
+          auctionId: '1d1a030790a475',
+        };
+        const nativeBid = {
+          bidder: 'vibrantmedia',
+          params: transformedNativeBidParams,
+          mediaTypes: {
+            native: {
+              image: {
+                required: true,
+                sizes: [300, 250]
+              },
+              title: {
+                required: true
+              },
+              sponsoredBy: {
+                required: true
+              },
+              clickUrl: {
+                required: true
+              }
+            }
+          },
+          adUnitCode: 'native-div',
+          bidId: '30b31c1838de12',
+          bidderRequestId: '22edbae2733bf6',
+          placementId: '293857832abfef',
+          auctionId: '1d1a030790a475',
+        };
+
+        expect(spec.isBidRequestValid(bannerBid)).to.be.true;
+        expect(spec.isBidRequestValid(videoBid)).to.be.true;
+        expect(spec.isBidRequestValid(nativeBid)).to.be.true;
+
+        const bidRequests = [bannerBid, videoBid, nativeBid];
+        const validBidderRequest = getValidBidderRequest(bidRequests);
+        const serverRequest = spec.buildRequests(bidRequests, validBidderRequest);
+        expect(serverRequest.method).to.equal('POST');
+        expect(serverRequest.url).to.equal(EXPECTED_PREBID_SERVER_URL);
+
+        const payload = JSON.parse(serverRequest.data);
+        expect(payload.biddata).to.exist;
+        expect(payload.biddata.length).to.equal(3);
+        expect(payload.biddata[0]).to.exist;
+        expect(payload.biddata[0].code).to.equal(bannerBid.adUnitCode);
+        expect(payload.biddata[0].id).to.equal(bannerBid.placementId);
+        expect(payload.biddata[0].bidder).to.equal(bannerBid.bidder);
+        expect(payload.biddata[0].mediaTypes[BANNER]).to.exist;
+        expect(payload.biddata[0].mediaTypes[BANNER]).to.deep.equal({
+          sizes: DEFAULT_BID_SIZES,
+        });
+        expect(payload.biddata[1]).to.exist;
+        expect(payload.biddata[1].code).to.equal(videoBid.adUnitCode);
+        expect(payload.biddata[1].id).to.equal(videoBid.placementId);
+        expect(payload.biddata[1].bidder).to.equal(videoBid.bidder);
+        expect(payload.biddata[1].mediaTypes[VIDEO]).to.exist;
+        expect(payload.biddata[1].mediaTypes[VIDEO]).to.deep.equal({
+          context: OUTSTREAM,
+          sizes: DEFAULT_BID_SIZES
+        });
+        expect(payload.biddata[2]).to.exist;
+        expect(payload.biddata[2].code).to.equal(nativeBid.adUnitCode);
+        expect(payload.biddata[2].id).to.equal(nativeBid.placementId);
+        expect(payload.biddata[2].bidder).to.equal(nativeBid.bidder);
+        expect(payload.biddata[2].mediaTypes[NATIVE]).to.exist;
+        expect(payload.biddata[2].mediaTypes[NATIVE]).to.deep.equal(nativeBid.mediaTypes.native);
+
+        // From here, the API would call the Prebid Server and call interpretResponse, which is covered by tests elsewhere
+      });
+
+      it('should succeed with multiple media types for a single bid', function () {
+        const bidParams = spec.transformBidParams(VALID_VIDEO_BID_PARAMS);
+        const bid = {
+          bidder: 'vibrantmedia',
+          params: bidParams,
+          mediaTypes: {
+            banner: {
+              sizes: DEFAULT_BID_SIZES
+            },
+            video: {
+              context: OUTSTREAM,
+              sizes: DEFAULT_BID_SIZES
+            },
+            native: {
+              sizes: DEFAULT_BID_SIZES
+            }
+          },
+          adUnitCode: 'test-div',
+          bidId: '30b31c1838de13',
+          bidderRequestId: '22edbae2733bf6',
+          placementId: '293857832abfef',
+          auctionId: '1d1a030790a475',
+        };
+
+        expect(spec.isBidRequestValid(bid)).to.be.true;
+
+        const bidRequests = [bid];
+        const validBidderRequest = getValidBidderRequest(bidRequests);
+        const serverRequest = spec.buildRequests(bidRequests, validBidderRequest);
+        expect(serverRequest.method).to.equal('POST');
+        expect(serverRequest.url).to.equal(EXPECTED_PREBID_SERVER_URL);
+
+        const payload = JSON.parse(serverRequest.data);
+        expect(payload.biddata).to.exist;
+        expect(payload.biddata.length).to.equal(1);
+        expect(payload.biddata[0]).to.exist;
+        expect(payload.biddata[0].code).to.equal(bid.adUnitCode);
+        expect(payload.biddata[0].id).to.equal(bid.placementId);
+        expect(payload.biddata[0].bidder).to.equal(bid.bidder);
+        expect(payload.biddata[0].mediaTypes[BANNER]).to.exist;
+        expect(payload.biddata[0].mediaTypes[BANNER]).to.deep.equal({
+          sizes: DEFAULT_BID_SIZES,
+        });
+        expect(payload.biddata[0].mediaTypes[VIDEO]).to.exist;
+        expect(payload.biddata[0].mediaTypes[VIDEO]).to.deep.equal({
+          context: OUTSTREAM,
+          sizes: DEFAULT_BID_SIZES,
+        });
+        expect(payload.biddata[0].mediaTypes[NATIVE]).to.exist;
+        expect(payload.biddata[0].mediaTypes[NATIVE]).to.deep.equal({
+          sizes: DEFAULT_BID_SIZES,
+        });
+
+        // From here, the API would call the Prebid Server and call interpretResponse, which is covered by tests elsewhere
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index b8ab83a95ae..2ddb65469af 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -1,7 +1,23 @@
 import { expect } from 'chai';
-import { spec as adapter, SUPPORTED_ID_SYSTEMS, createDomain } from 'modules/vidazooBidAdapter.js';
+import {
+  spec as adapter,
+  SUPPORTED_ID_SYSTEMS,
+  createDomain,
+  hashCode,
+  extractPID,
+  extractCID,
+  extractSubDomain,
+  getStorageItem,
+  setStorageItem,
+  tryParseJSON,
+  getUniqueDealId,
+  getNextDealId,
+  getVidazooSessionId,
+} from 'modules/vidazooBidAdapter.js';
 import * as utils from 'src/utils.js';
 import { version } from 'package.json';
+import { useFakeTimers } from 'sinon';
+import { BANNER, VIDEO } from '../../../src/mediaTypes';
 
 const SUB_DOMAIN = 'openrtb';
 
@@ -22,9 +38,48 @@ const BID = {
   'transactionId': 'c881914b-a3b5-4ecf-ad9c-1c2f37c6aabf',
   'sizes': [[300, 250], [300, 600]],
   'bidderRequestId': '1fdb5ff1b6eaa7',
-  'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a'
+  'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'mediaTypes': [BANNER],
+  'ortb2Imp': {
+    'ext': {
+      'gpid': '1234567890'
+    }
+  }
 };
 
+const VIDEO_BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': '63550ad1ff6642d368cba59dh5884270560',
+  'bidderRequestId': '12a8ae9ada9c13',
+  'transactionId': '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '635509f7ff6642d368cb9837',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1
+  },
+  'sizes': [[545, 307]],
+  'mediaTypes': {
+    'video': {
+      'playerSize': [[545, 307]],
+      'context': 'instream',
+      'mimes': [
+        'video/mp4',
+        'application/javascript'
+      ],
+      'protocols': [2, 3, 5, 6],
+      'maxduration': 60,
+      'minduration': 0,
+      'startdelay': 0,
+      'linearity': 1,
+      'api': [2],
+      'placement': 1
+    }
+  }
+}
+
 const BIDDER_REQUEST = {
   'gdprConsent': {
     'consentString': 'consent_string',
@@ -32,12 +87,20 @@ const BIDDER_REQUEST = {
   },
   'uspConsent': 'consent_string',
   'refererInfo': {
-    'referer': 'https://www.greatsite.com'
-  }
+    'page': 'https://www.greatsite.com',
+    'ref': 'https://www.somereferrer.com'
+  },
+  'ortb2': {
+    'site': {
+      'cat': ['IAB2'],
+      'pagecat': ['IAB2-2']
+    }
+  },
 };
 
 const SERVER_RESPONSE = {
   body: {
+    cid: 'testcid123',
     results: [{
       'ad': '<iframe>console.log("hello world")</iframe>',
       'price': 0.8,
@@ -45,6 +108,7 @@ const SERVER_RESPONSE = {
       'exp': 30,
       'width': 300,
       'height': 250,
+      'advertiserDomains': ['securepubads.g.doubleclick.net'],
       'cookies': [{
         'src': 'https://sync.com',
         'type': 'iframe'
@@ -56,6 +120,23 @@ const SERVER_RESPONSE = {
   }
 };
 
+const VIDEO_SERVER_RESPONSE = {
+  body: {
+    'cid': '635509f7ff6642d368cb9837',
+    'results': [{
+      'ad': '<VAST version=\"3.0\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"></VAST>',
+      'advertiserDomains': ['vidazoo.com'],
+      'exp': 60,
+      'width': 545,
+      'height': 307,
+      'mediaType': 'video',
+      'creativeId': '12610997325162499419',
+      'price': 2,
+      'cookies': []
+    }]
+  }
+}
+
 const REQUEST = {
   data: {
     width: 300,
@@ -64,9 +145,14 @@ const REQUEST = {
   }
 };
 
-const SYNC_OPTIONS = {
-  'pixelEnabled': true
-};
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = utils.parseUrl(window.top.document.URL, { decodeSearchAsString: true });
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
 
 describe('VidazooBidAdapter', function () {
   describe('validtae spec', function () {
@@ -89,6 +175,11 @@ describe('VidazooBidAdapter', function () {
     it('exists and is a string', function () {
       expect(adapter.code).to.exist.and.to.be.a('string');
     });
+
+    it('exists and contains media types', function () {
+      expect(adapter.supportedMediaTypes).to.exist.and.to.be.an('array').with.length(2);
+      expect(adapter.supportedMediaTypes).to.contain.members([BANNER, VIDEO]);
+    });
   });
 
   describe('validate bid requests', function () {
@@ -124,11 +215,70 @@ describe('VidazooBidAdapter', function () {
   describe('build requests', function () {
     let sandbox;
     before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        vidazoo: {
+          storageAllowed: true,
+        }
+      };
       sandbox = sinon.sandbox.create();
       sandbox.stub(Date, 'now').returns(1000);
     });
 
-    it('should build request for each size', function () {
+    it('should build video request', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      const requests = adapter.buildRequests([VIDEO_BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/635509f7ff6642d368cb9837`,
+        data: {
+          adUnitCode: '63550ad1ff6642d368cba59dh5884270560',
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          bidderVersion: adapter.version,
+          cat: ['IAB2'],
+          pagecat: ['IAB2-2'],
+          cb: 1000,
+          dealId: 1,
+          gdpr: 1,
+          gdprConsent: 'consent_string',
+          usPrivacy: 'consent_string',
+          gpid: '',
+          prebidVersion: version,
+          ptrace: '1000',
+          publisherId: '59ac17c192832d0011283fe3',
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          schain: VIDEO_BID.schain,
+          sessionId: '',
+          sizes: ['545x307'],
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          uqs: getTopWindowQueryParams(),
+          isStorageAllowed: true,
+          mediaTypes: {
+            video: {
+              api: [2],
+              context: 'instream',
+              linearity: 1,
+              maxduration: 60,
+              mimes: [
+                'video/mp4',
+                'application/javascript'
+              ],
+              minduration: 0,
+              placement: 1,
+              playerSize: [[545, 307]],
+              protocols: [2, 3, 5, 6],
+              startdelay: 0
+            }
+          }
+        }
+      });
+    });
+
+    it('should build banner request for each size', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
       const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
       expect(requests).to.have.length(1);
       expect(requests[0]).to.deep.equal({
@@ -140,32 +290,53 @@ describe('VidazooBidAdapter', function () {
           usPrivacy: 'consent_string',
           sizes: ['300x250', '300x600'],
           url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
           cb: 1000,
           bidFloor: 0.1,
           bidId: '2d52001cabd527',
           adUnitCode: 'div-gpt-ad-12345-0',
           publisherId: '59ac17c192832d0011283fe3',
-          dealId: 1,
+          dealId: 2,
+          sessionId: '',
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
           bidderVersion: adapter.version,
           prebidVersion: version,
+          schain: BID.schain,
+          ptrace: '1000',
           res: `${window.top.screen.width}x${window.top.screen.height}`,
+          mediaTypes: [BANNER],
+          uqs: getTopWindowQueryParams(),
           'ext.param1': 'loremipsum',
           'ext.param2': 'dolorsitamet',
+          isStorageAllowed: true,
+          gpid: '1234567890',
+          cat: ['IAB2'],
+          pagecat: ['IAB2-2']
         }
       });
     });
 
     after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
       sandbox.restore();
     });
   });
+
   describe('getUserSyncs', function () {
     it('should have valid user sync with iframeEnabled', function () {
       const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
         type: 'iframe',
-        url: 'https://static.cootlogix.com/basev/sync/user_sync.html'
+        url: 'https://sync.cootlogix.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with cid on response', function () {
+      const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.cootlogix.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
       }]);
     });
 
@@ -173,7 +344,7 @@ describe('VidazooBidAdapter', function () {
       const result = adapter.getUserSyncs({ pixelEnabled: true }, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
-        'url': 'https://sync.com',
+        'url': 'https://sync.cootlogix.com/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
         'type': 'image'
       }]);
     })
@@ -195,7 +366,7 @@ describe('VidazooBidAdapter', function () {
       expect(responses).to.be.empty;
     });
 
-    it('should return an array of interpreted responses', function () {
+    it('should return an array of interpreted banner responses', function () {
       const responses = adapter.interpretResponse(SERVER_RESPONSE, REQUEST);
       expect(responses).to.have.length(1);
       expect(responses[0]).to.deep.equal({
@@ -207,7 +378,30 @@ describe('VidazooBidAdapter', function () {
         currency: 'USD',
         netRevenue: true,
         ttl: 30,
-        ad: '<iframe>console.log("hello world")</iframe>'
+        ad: '<iframe>console.log("hello world")</iframe>',
+        meta: {
+          advertiserDomains: ['securepubads.g.doubleclick.net']
+        }
+      });
+    });
+
+    it('should return an array of interpreted video responses', function () {
+      const responses = adapter.interpretResponse(VIDEO_SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 2,
+        width: 545,
+        height: 307,
+        mediaType: 'video',
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 60,
+        vastXml: '<VAST version=\"3.0\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"></VAST>',
+        meta: {
+          advertiserDomains: ['vidazoo.com']
+        }
       });
     });
 
@@ -220,16 +414,21 @@ describe('VidazooBidAdapter', function () {
     });
   });
 
-  describe(`user id system`, function () {
+  describe('user id system', function () {
     Object.keys(SUPPORTED_ID_SYSTEMS).forEach((idSystemProvider) => {
       const id = Date.now().toString();
       const bid = utils.deepClone(BID);
 
       const userId = (function () {
         switch (idSystemProvider) {
-          case 'digitrustid': return { data: { id: id } };
-          case 'lipb': return { lipbid: id };
-          default: return id;
+          case 'lipb':
+            return { lipbid: id };
+          case 'parrableId':
+            return { eid: id };
+          case 'id5id':
+            return { uid: id };
+          default:
+            return id;
         }
       })();
 
@@ -243,4 +442,159 @@ describe('VidazooBidAdapter', function () {
       });
     });
   });
+
+  describe('alternate param names extractors', function () {
+    it('should return undefined when param not supported', function () {
+      const cid = extractCID({ 'c_id': '1' });
+      const pid = extractPID({ 'p_id': '1' });
+      const subDomain = extractSubDomain({ 'sub_domain': 'prebid' });
+      expect(cid).to.be.undefined;
+      expect(pid).to.be.undefined;
+      expect(subDomain).to.be.undefined;
+    });
+
+    it('should return value when param supported', function () {
+      const cid = extractCID({ 'cID': '1' });
+      const pid = extractPID({ 'Pid': '2' });
+      const subDomain = extractSubDomain({ 'subDOMAIN': 'prebid' });
+      expect(cid).to.be.equal('1');
+      expect(pid).to.be.equal('2');
+      expect(subDomain).to.be.equal('prebid');
+    });
+  });
+
+  describe('vidazoo session id', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        vidazoo: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    it('should get undefined vidazoo session id', function () {
+      const sessionId = getVidazooSessionId();
+      expect(sessionId).to.be.empty;
+    });
+
+    it('should get vidazoo session id from storage', function () {
+      const vidSid = '1234-5678';
+      window.localStorage.setItem('vidSid', vidSid);
+      const sessionId = getVidazooSessionId();
+      expect(sessionId).to.be.equal(vidSid);
+    });
+  });
+
+  describe('deal id', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        vidazoo: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    const key = 'myDealKey';
+
+    it('should get the next deal id', function () {
+      const dealId = getNextDealId(key);
+      const nextDealId = getNextDealId(key);
+      expect(dealId).to.be.equal(1);
+      expect(nextDealId).to.be.equal(2);
+    });
+
+    it('should get the first deal id on expiration', function (done) {
+      setTimeout(function () {
+        const dealId = getNextDealId(key, 100);
+        expect(dealId).to.be.equal(1);
+        done();
+      }, 200);
+    });
+  });
+
+  describe('unique deal id', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        vidazoo: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    const key = 'myKey';
+    let uniqueDealId;
+    beforeEach(() => {
+      uniqueDealId = getUniqueDealId(key, 0);
+    })
+
+    it('should get current unique deal id', function (done) {
+      // waiting some time so `now` will become past
+      setTimeout(() => {
+        const current = getUniqueDealId(key);
+        expect(current).to.be.equal(uniqueDealId);
+        done();
+      }, 200);
+    });
+
+    it('should get new unique deal id on expiration', function (done) {
+      setTimeout(() => {
+        const current = getUniqueDealId(key, 100);
+        expect(current).to.not.be.equal(uniqueDealId);
+        done();
+      }, 200)
+    });
+  });
+
+  describe('storage utils', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        vidazoo: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    it('should get value from storage with create param', function () {
+      const now = Date.now();
+      const clock = useFakeTimers({
+        shouldAdvanceTime: true,
+        now
+      });
+      setStorageItem('myKey', 2020);
+      const { value, created } = getStorageItem('myKey');
+      expect(created).to.be.equal(now);
+      expect(value).to.be.equal(2020);
+      expect(typeof value).to.be.equal('number');
+      expect(typeof created).to.be.equal('number');
+      clock.restore();
+    });
+
+    it('should get external stored value', function () {
+      const value = 'superman'
+      window.localStorage.setItem('myExternalKey', value);
+      const item = getStorageItem('myExternalKey');
+      expect(item).to.be.equal(value);
+    });
+
+    it('should parse JSON value', function () {
+      const data = JSON.stringify({ event: 'send' });
+      const { event } = tryParseJSON(data);
+      expect(event).to.be.equal('send');
+    });
+
+    it('should get original value on parse fail', function () {
+      const value = 21;
+      const parsed = tryParseJSON(value);
+      expect(typeof parsed).to.be.equal('number');
+      expect(parsed).to.be.equal(value);
+    });
+  });
 });
diff --git a/test/spec/modules/videoModule/adQueue_spec.js b/test/spec/modules/videoModule/adQueue_spec.js
new file mode 100644
index 00000000000..4002e0b6dcc
--- /dev/null
+++ b/test/spec/modules/videoModule/adQueue_spec.js
@@ -0,0 +1,172 @@
+import { expect } from 'chai';
+import { AdQueueCoordinator } from '../../../../modules/videoModule/adQueue.js';
+import { AD_BREAK_END, SETUP_COMPLETE } from '../../../../libraries/video/constants/events.js'
+
+const testId = 'testId';
+describe('Ad Queue Coordinator', function () {
+  const mockVideoCoreFactory = function () {
+    return {
+      onEvents: sinon.spy(),
+      offEvents: sinon.spy(),
+      setAdTagUrl: sinon.spy(),
+    }
+  };
+
+  const mockEventsFactory = function () {
+    return {
+      emit: sinon.spy()
+    };
+  };
+
+  describe('Before Provider Setup Complete', function () {
+    it('should push ad to queue', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      const mockEvents = mockEventsFactory();
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEvents);
+      coordinator.registerProvider(testId);
+      coordinator.queueAd('testAdTag', testId, { param: {} });
+
+      expect(mockEvents.emit.calledOnce).to.be.true;
+      let emitArgs = mockEvents.emit.firstCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadQueued');
+      expect(mockVideoCore.setAdTagUrl.called).to.be.false;
+    });
+  });
+
+  describe('After Provider Setup Complete', function () {
+    it('should load from ad queue', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      const mockEvents = mockEventsFactory();
+      let setupComplete;
+      mockVideoCore.onEvents = function(events, callback, id) {
+        if (events[0] === SETUP_COMPLETE && id === testId) {
+          setupComplete = callback;
+        }
+      };
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEvents);
+      coordinator.registerProvider(testId);
+      coordinator.queueAd('testAdTag', testId, { param: {} });
+
+      expect(mockEvents.emit.calledOnce).to.be.true;
+      let emitArgs = mockEvents.emit.firstCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadQueued');
+
+      setupComplete('', { divId: testId });
+      expect(mockEvents.emit.calledTwice).to.be.true;
+      emitArgs = mockEvents.emit.secondCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledOnce).to.be.true;
+    });
+
+    it('should load ads without queueing', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      const mockEvents = mockEventsFactory();
+      let setupComplete;
+      mockVideoCore.onEvents = function(events, callback, id) {
+        if (events[0] === SETUP_COMPLETE && id === testId) {
+          setupComplete = callback;
+        }
+      };
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEvents);
+      coordinator.registerProvider(testId);
+
+      setupComplete('', { divId: testId });
+
+      coordinator.queueAd('testAdTag', testId, { param: {} });
+      expect(mockEvents.emit.calledOnce).to.be.true;
+      let emitArgs = mockEvents.emit.firstCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledOnce).to.be.true;
+    });
+  });
+
+  describe('On Ad Break End', function () {
+    it('should load from queue', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      const mockEvents = mockEventsFactory();
+      let setupComplete;
+      let adBreakEnd;
+
+      mockVideoCore.onEvents = function(events, callback, id) {
+        if (events[0] === SETUP_COMPLETE && id === testId) {
+          setupComplete = callback;
+        }
+
+        if (events[0] === AD_BREAK_END && id === testId) {
+          adBreakEnd = callback;
+        }
+      };
+
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEvents);
+      coordinator.registerProvider(testId);
+      coordinator.queueAd('testAdTag', testId);
+      coordinator.queueAd('testAdTag2', testId);
+      coordinator.queueAd('testAdTag3', testId);
+
+      mockEvents.emit.resetHistory();
+
+      setupComplete('', { divId: testId });
+
+      expect(mockEvents.emit.calledOnce).to.be.true;
+      let emitArgs = mockEvents.emit.firstCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledOnce).to.be.true;
+      let setAdTagArgs = mockVideoCore.setAdTagUrl.firstCall.args;
+      expect(setAdTagArgs[0]).to.be.equal('testAdTag');
+
+      adBreakEnd('', { divId: testId });
+
+      expect(mockEvents.emit.calledTwice).to.be.true;
+      emitArgs = mockEvents.emit.secondCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledTwice).to.be.true;
+      setAdTagArgs = mockVideoCore.setAdTagUrl.secondCall.args;
+      expect(setAdTagArgs[0]).to.be.equal('testAdTag2');
+
+      adBreakEnd('', { divId: testId });
+
+      expect(mockEvents.emit.calledThrice).to.be.true;
+      emitArgs = mockEvents.emit.thirdCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+      setAdTagArgs = mockVideoCore.setAdTagUrl.thirdCall.args;
+      expect(setAdTagArgs[0]).to.be.equal('testAdTag3');
+
+      adBreakEnd('', { divId: testId });
+
+      expect(mockEvents.emit.calledThrice).to.be.true;
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+    });
+
+    it('should stop responding to AdBreakEnd when queue is empty', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      let setupComplete;
+      let adBreakEnd;
+
+      mockVideoCore.onEvents = function(events, callback, id) {
+        if (events[0] === SETUP_COMPLETE && id === testId) {
+          setupComplete = callback;
+        }
+
+        if (events[0] === AD_BREAK_END && id === testId) {
+          adBreakEnd = callback;
+        }
+      };
+
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEventsFactory());
+      coordinator.registerProvider(testId);
+      coordinator.queueAd('testAdTag', testId);
+      coordinator.queueAd('testAdTag2', testId);
+      coordinator.queueAd('testAdTag3', testId);
+
+      setupComplete('', { divId: testId });
+      adBreakEnd('', { divId: testId });
+      adBreakEnd('', { divId: testId });
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+      adBreakEnd('', { divId: testId });
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+      adBreakEnd('', { divId: testId });
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/videoModule/coreVideo_spec.js b/test/spec/modules/videoModule/coreVideo_spec.js
new file mode 100644
index 00000000000..17c6e3811e0
--- /dev/null
+++ b/test/spec/modules/videoModule/coreVideo_spec.js
@@ -0,0 +1,98 @@
+import { expect } from 'chai';
+import { VideoCore } from 'modules/videoModule/coreVideo.js';
+
+describe('Video Core', function () {
+  const mockSubmodule = {
+    getOrtbVideo: sinon.spy(),
+    getOrtbContent: sinon.spy(),
+    setAdTagUrl: sinon.spy(),
+    onEvent: sinon.spy(),
+    offEvent: sinon.spy(),
+  };
+
+  const otherSubmodule = {
+    getOrtbVideo: () => {},
+    getOrtbContent: () => {},
+    setAdTagUrl: () => {},
+    onEvent: () => {},
+    offEvent: () => {},
+  };
+
+  const testId = 'test_id';
+  const testVendorCode = 0;
+  const otherId = 'other_id';
+  const otherVendorCode = 1;
+
+  const parentModuleMock = {
+    registerSubmodule: sinon.spy(),
+    getSubmodule: sinon.spy(id => {
+      if (id === testId) {
+        return mockSubmodule;
+      } else if (id === otherId) {
+        return otherSubmodule;
+      }
+    })
+  };
+
+  const videoCore = VideoCore(parentModuleMock);
+
+  videoCore.registerProvider({
+    vendorCode: testVendorCode,
+    divId: testId
+  });
+
+  videoCore.registerProvider({
+    vendorCode: otherVendorCode,
+    divId: otherId
+  });
+
+  describe('registerProvider', function () {
+    it('should delegate the registration to the Parent Module', function () {
+      expect(parentModuleMock.registerSubmodule.calledTwice).to.be.true;
+      expect(parentModuleMock.registerSubmodule.args[0][0]).to.be.equal(testId);
+      expect(parentModuleMock.registerSubmodule.args[1][0]).to.be.equal(otherId);
+      expect(parentModuleMock.registerSubmodule.args[0][1]).to.be.equal(testVendorCode);
+      expect(parentModuleMock.registerSubmodule.args[1][1]).to.be.equal(otherVendorCode);
+    });
+  });
+
+  describe('getOrtbVideo', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.getOrtbVideo(testId);
+      videoCore.getOrtbVideo(otherId);
+      expect(mockSubmodule.getOrtbVideo.calledOnce).to.be.true;
+    });
+  });
+
+  describe('getOrtbContent', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.getOrtbContent(testId);
+      videoCore.getOrtbContent(otherId);
+      expect(mockSubmodule.getOrtbContent.calledOnce).to.be.true;
+    });
+  });
+
+  describe('setAdTagUrl', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.setAdTagUrl('', testId);
+      videoCore.setAdTagUrl('', otherId);
+      expect(mockSubmodule.setAdTagUrl.calledOnce).to.be.true;
+    });
+  });
+
+  describe('onEvents', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.onEvents(['event'], () => {}, testId);
+      videoCore.onEvents(['event'], () => {}, otherId);
+      expect(mockSubmodule.onEvent.calledOnce).to.be.true;
+    });
+  });
+
+  describe('offEvents', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.offEvents(['event'], () => {}, testId);
+      videoCore.offEvents(['event'], () => {}, otherId);
+      expect(mockSubmodule.offEvent.calledOnce).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/videoModule/pbVideo_spec.js b/test/spec/modules/videoModule/pbVideo_spec.js
new file mode 100644
index 00000000000..41780a007dd
--- /dev/null
+++ b/test/spec/modules/videoModule/pbVideo_spec.js
@@ -0,0 +1,374 @@
+import { expect } from 'chai';
+import { PbVideo } from 'modules/videoModule';
+import CONSTANTS from 'src/constants.json';
+
+let ortbVideoMock;
+let ortbContentMock;
+let videoCoreMock;
+let getConfigMock;
+let requestBidsMock;
+let pbGlobalMock;
+let pbEventsMock;
+let videoEventsMock;
+let gamSubmoduleMock;
+let gamSubmoduleFactoryMock;
+let videoImpressionVerifierFactoryMock;
+let videoImpressionVerifierMock;
+let adQueueCoordinatorMock;
+let adQueueCoordinatorFactoryMock;
+
+function resetTestVars() {
+  ortbVideoMock = {};
+  ortbContentMock = {};
+  videoCoreMock = {
+    registerProvider: sinon.spy(),
+    initProvider: sinon.spy(),
+    onEvents: sinon.spy(),
+    getOrtbVideo: () => ortbVideoMock,
+    getOrtbContent: () => ortbContentMock,
+    setAdTagUrl: sinon.spy()
+  };
+  getConfigMock = () => {};
+  requestBidsMock = {
+    before: sinon.spy()
+  };
+  pbGlobalMock = {
+    requestBids: requestBidsMock,
+    getHighestCpmBids: sinon.spy(),
+    getBidResponsesForAdUnitCode: sinon.spy(),
+    setConfig: sinon.spy(),
+    getConfig: () => ({}),
+    markWinningBidAsUsed: sinon.spy()
+  };
+  pbEventsMock = {
+    emit: sinon.spy(),
+    on: sinon.spy()
+  };
+  videoEventsMock = [];
+  gamSubmoduleMock = {
+    getAdTagUrl: sinon.spy()
+  };
+
+  gamSubmoduleFactoryMock = sinon.spy(() => gamSubmoduleMock);
+
+  videoImpressionVerifierMock = {
+    trackBid: sinon.spy(),
+    getBidIdentifiers: sinon.spy()
+  };
+
+  videoImpressionVerifierFactoryMock = () => videoImpressionVerifierMock;
+
+  adQueueCoordinatorMock = {
+    registerProvider: sinon.spy(),
+    queueAd: sinon.spy()
+  };
+
+  adQueueCoordinatorFactoryMock = () => adQueueCoordinatorMock;
+}
+
+let pbVideoFactory = (videoCore, getConfig, pbGlobal, pbEvents, videoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory, adQueueCoordinator) => {
+  const pbVideo = PbVideo(
+    videoCore || videoCoreMock,
+    getConfig || getConfigMock,
+    pbGlobal || pbGlobalMock,
+    pbEvents || pbEventsMock,
+    videoEvents || videoEventsMock,
+    gamSubmoduleFactory || gamSubmoduleFactoryMock,
+    videoImpressionVerifierFactory || videoImpressionVerifierFactoryMock,
+    adQueueCoordinator || adQueueCoordinatorMock
+  );
+  pbVideo.init();
+  return pbVideo;
+}
+
+describe('Prebid Video', function () {
+  beforeEach(() => resetTestVars());
+
+  describe('Setting video to config', function () {
+    let providers = [{ divId: 'div1' }, { divId: 'div2' }];
+    let getConfigCallback;
+    let getConfig = (propertyName, callback) => {
+      if (propertyName === 'video') {
+        getConfigCallback = callback;
+      }
+    };
+
+    beforeEach(() => {
+      pbVideoFactory(null, getConfig);
+      getConfigCallback({ video: { providers } });
+    });
+
+    it('Should register providers', function () {
+      expect(videoCoreMock.registerProvider.calledTwice).to.be.true;
+    });
+
+    it('Should register events', function () {
+      expect(videoCoreMock.onEvents.calledTwice).to.be.true;
+      const onEventsSpy = videoCoreMock.onEvents;
+      expect(onEventsSpy.getCall(0).args[2]).to.be.equal('div1');
+      expect(onEventsSpy.getCall(1).args[2]).to.be.equal('div2');
+    });
+
+    describe('Event triggering', function () {
+      it('Should emit events off of Prebid\'s Events', function () {
+        let eventHandler;
+        const videoCore = Object.assign({}, videoCoreMock, {
+          onEvents: (events, eventHandler_) => eventHandler = eventHandler_
+        });
+        pbVideoFactory(videoCore, getConfig);
+        getConfigCallback({ video: { providers } });
+        const expectedType = 'test_event';
+        const expectedPayload = {'test': 'data'};
+        eventHandler(expectedType, expectedPayload);
+        expect(pbEventsMock.emit.calledOnce).to.be.true;
+        expect(pbEventsMock.emit.getCall(0).args[0]).to.be.equal('video' + expectedType.replace(/^./, expectedType[0].toUpperCase()));
+        expect(pbEventsMock.emit.getCall(0).args[1]).to.be.equal(expectedPayload);
+      });
+    });
+
+    describe('Ad Server configuration', function() {
+      const test_vendor_code = 5;
+      const test_params = { test: 'params' };
+      providers[0].adServer = { vendorCode: test_vendor_code, params: test_params };
+
+      it('should instantiate the GAM Submodule', function () {
+        expect(gamSubmoduleFactoryMock.calledOnce).to.be.true;
+      });
+    });
+  });
+
+  describe('Ad unit Enrichment', function () {
+    it('registers before:bidRequest hook', function () {
+      pbVideoFactory();
+      expect(requestBidsMock.before.calledOnce).to.be.true;
+    });
+
+    it('requests oRtb params and writes them to ad unit and config', function() {
+      const getOrtbVideoSpy = videoCoreMock.getOrtbVideo = sinon.spy(() => ({
+        test: 'videoTestValue'
+      }));
+      const getOrtbContentSpy = videoCoreMock.getOrtbContent = sinon.spy(() => ({
+        test: 'contentTestValue'
+      }));
+
+      let beforeBidRequestCallback;
+      const requestBids = {
+        before: callback_ => beforeBidRequestCallback = callback_
+      };
+
+      pbVideoFactory(null, null, Object.assign({}, pbGlobalMock, { requestBids }));
+      expect(beforeBidRequestCallback).to.not.be.undefined;
+      const nextFn = sinon.spy();
+      const adUnits = [{
+        code: 'ad1',
+        mediaTypes: {
+          video: {}
+        },
+        video: { divId: 'divId' }
+      }];
+      beforeBidRequestCallback(nextFn, { adUnits });
+      expect(getOrtbVideoSpy.calledOnce).to.be.true;
+      expect(getOrtbContentSpy.calledOnce).to.be.true;
+      const adUnit = adUnits[0];
+      expect(adUnit.mediaTypes.video).to.have.property('test', 'videoTestValue');
+      expect(nextFn.calledOnce).to.be.true;
+      expect(nextFn.getCall(0).args[0].ortb2).to.be.deep.equal({ site: { content: { test: 'contentTestValue' } } });
+    });
+  });
+
+  describe('Ad tag injection', function () {
+    let auctionEndCallback;
+    let providers = [{ divId: 'div1', adServer: {} }, { divId: 'div2' }];
+    let getConfig = (propertyName, callbackFn) => {
+      if (propertyName === 'video') {
+        if (callbackFn) {
+          callbackFn({ video: { providers } });
+        } else {
+          return { providers };
+        }
+      }
+    };
+
+    const pbEvents = {
+      emit: () => {},
+      on: (event, callback) => {
+        if (event === CONSTANTS.EVENTS.AUCTION_END) {
+          auctionEndCallback = callback
+        }
+      },
+      off: () => {}
+    };
+
+    const expectedVendorCode = 5;
+    const expectedAdTag = 'test_tag';
+    const expectedAdUnitCode = 'expectedAdUnitcode';
+    const expectedDivId = 'expectedDivId';
+    const expectedAdUnit = {
+      code: expectedAdUnitCode,
+      video: {
+        divId: expectedDivId,
+        adServer: {
+          vendorCode: expectedVendorCode,
+          baseAdTagUrl: expectedAdTag
+        }
+      }
+    };
+    const auctionResults = { adUnits: [ expectedAdUnit, {} ] };
+
+    beforeEach(() => {
+      gamSubmoduleMock.getAdTagUrl.resetHistory();
+      videoCoreMock.setAdTagUrl.resetHistory();
+      adQueueCoordinatorMock.queueAd.resetHistory();
+    });
+
+    let beforeBidRequestCallback;
+    const requestBids = {
+      before: callback_ => beforeBidRequestCallback = callback_
+    };
+
+    it('should request ad tag url from adServer when configured to use adServer', function () {
+      const expectedVastUrl = 'expectedVastUrl';
+      const expectedVastXml = 'expectedVastXml';
+      const pbGlobal = Object.assign({}, pbGlobalMock, {
+        requestBids,
+        getHighestCpmBids: () => [{
+          vastUrl: expectedVastUrl,
+          vastXml: expectedVastXml
+        }, {}, {}, {}]
+      });
+      pbVideoFactory(null, getConfig, pbGlobal, pbEvents);
+
+      beforeBidRequestCallback(() => {}, {});
+      auctionEndCallback(auctionResults);
+      expect(gamSubmoduleMock.getAdTagUrl.calledOnce).to.be.true;
+      expect(gamSubmoduleMock.getAdTagUrl.getCall(0).args[0]).is.equal(expectedAdUnit);
+      expect(gamSubmoduleMock.getAdTagUrl.getCall(0).args[1]).is.equal(expectedAdTag);
+    });
+
+    it('should load ad tag when ad server returns ad tag', function () {
+      const expectedAdTag = 'resulting ad tag';
+      const gamSubmoduleFactory = () => ({
+        getAdTagUrl: () => expectedAdTag
+      });
+      const expectedVastUrl = 'expectedVastUrl';
+      const expectedVastXml = 'expectedVastXml';
+      const pbGlobal = Object.assign({}, pbGlobalMock, {
+        requestBids,
+        getHighestCpmBids: () => [{
+          vastUrl: expectedVastUrl,
+          vastXml: expectedVastXml
+        }, {}, {}, {}]
+      });
+      pbVideoFactory(null, getConfig, pbGlobal, pbEvents, null, gamSubmoduleFactory);
+      beforeBidRequestCallback(() => {}, {});
+      auctionEndCallback(auctionResults);
+      expect(adQueueCoordinatorMock.queueAd.calledOnce).to.be.true;
+      expect(adQueueCoordinatorMock.queueAd.args[0][0]).to.be.equal(expectedAdTag);
+      expect(adQueueCoordinatorMock.queueAd.args[0][1]).to.be.equal(expectedDivId);
+      expect(adQueueCoordinatorMock.queueAd.args[0][2]).to.have.property('adUnitCode', expectedAdUnitCode);
+    });
+
+    it('should load ad tag from highest bid when ad server is not configured', function () {
+      const expectedVastUrl = 'expectedVastUrl';
+      const expectedVastXml = 'expectedVastXml';
+      const pbGlobal = Object.assign({}, pbGlobalMock, {
+        requestBids,
+        getHighestCpmBids: () => [{
+          vastUrl: expectedVastUrl,
+          vastXml: expectedVastXml
+        }, {}, {}, {}]
+      });
+      const expectedAdUnit = {
+        code: expectedAdUnitCode,
+        video: { divId: expectedDivId }
+      };
+      const auctionResults = { adUnits: [ expectedAdUnit, {} ] };
+
+      pbVideoFactory(null, () => ({ providers: [] }), pbGlobal, pbEvents);
+      beforeBidRequestCallback(() => {}, {});
+      auctionEndCallback(auctionResults);
+      expect(adQueueCoordinatorMock.queueAd.calledOnce).to.be.true;
+      expect(adQueueCoordinatorMock.queueAd.args[0][0]).to.be.equal(expectedVastUrl);
+      expect(adQueueCoordinatorMock.queueAd.args[0][1]).to.be.equal(expectedDivId);
+      expect(adQueueCoordinatorMock.queueAd.args[0][2]).to.have.property('adUnitCode', expectedAdUnitCode);
+      expect(adQueueCoordinatorMock.queueAd.args[0][2]).to.have.property('adXml', expectedVastXml);
+    });
+  });
+
+  describe('Ad tracking', function () {
+    const expectedAdEventPayload = { adEventPayloadMarker: 'marker' };
+    const expectedBid = { bidMarker: 'marker' };
+    let bidAdjustmentCb;
+    let adImpressionCb;
+    let adErrorCb;
+
+    const pbEvents = {
+      on: (event, callback) => {
+        if (event === CONSTANTS.EVENTS.BID_ADJUSTMENT) {
+          bidAdjustmentCb = callback;
+        } else if (event === 'videoAdImpression') {
+          adImpressionCb = callback;
+        } else if (event === 'videoAdError') {
+          adErrorCb = callback;
+        }
+      },
+      emit: sinon.spy()
+    };
+
+    it('should ask Impression Verifier to track bid on Bid Adjustment', function () {
+      pbVideoFactory(null, null, null, pbEvents);
+      bidAdjustmentCb();
+      expect(videoImpressionVerifierMock.trackBid.calledOnce).to.be.true;
+    });
+
+    it('should trigger video bid impression when the bid matched', function () {
+      pbEvents.emit.resetHistory();
+      const pbGlobal = Object.assign({}, pbGlobalMock, { getBidResponsesForAdUnitCode: () => ({ bids: [expectedBid] }) });
+      const videoImpressionVerifier = Object.assign({}, videoImpressionVerifierMock, { getBidIdentifiers: () => ({}) });
+      pbVideoFactory(null, null, pbGlobal, pbEvents, null, null, () => videoImpressionVerifier);
+      adImpressionCb(expectedAdEventPayload);
+
+      expect(pbEvents.emit.calledOnce).to.be.true;
+      expect(pbEvents.emit.getCall(0).args[0]).to.be.equal('videoBidImpression');
+      const payload = pbEvents.emit.getCall(0).args[1];
+      expect(payload.bid).to.be.equal(expectedBid);
+      expect(payload.adEvent).to.be.equal(expectedAdEventPayload);
+      expect(pbGlobal.markWinningBidAsUsed.calledOnce).to.be.true;
+    });
+
+    it('should trigger video bid error when the bid matched', function () {
+      pbEvents.emit.resetHistory();
+      const pbGlobal = Object.assign({}, pbGlobalMock, { getBidResponsesForAdUnitCode: () => ({ bids: [expectedBid] }) });
+      const videoImpressionVerifier = Object.assign({}, videoImpressionVerifierMock, { getBidIdentifiers: () => ({}) });
+      pbVideoFactory(null, null, pbGlobal, pbEvents, null, null, () => videoImpressionVerifier);
+      adErrorCb(expectedAdEventPayload);
+
+      expect(pbEvents.emit.calledOnce).to.be.true;
+      expect(pbEvents.emit.getCall(0).args[0]).to.be.equal('videoBidError');
+      const payload = pbEvents.emit.getCall(0).args[1];
+      expect(payload.bid).to.be.equal(expectedBid);
+      expect(payload.adEvent).to.be.equal(expectedAdEventPayload);
+      expect(pbGlobal.markWinningBidAsUsed.calledOnce).to.be.true;
+    });
+
+    it('should not trigger a bid impression when the bid did not match', function () {
+      pbEvents.emit.resetHistory();
+      const pbGlobal = Object.assign({}, pbGlobalMock, { getBidResponsesForAdUnitCode: () => ({ bids: [expectedBid] }) });
+      const videoImpressionVerifier = Object.assign({}, videoImpressionVerifierMock, { getBidIdentifiers: () => ({ auctionId: 'id' }) });
+      pbVideoFactory(null, null, pbGlobal, pbEvents, null, null, () => videoImpressionVerifier);
+      adImpressionCb(expectedAdEventPayload);
+
+      expect(pbEvents.emit.called).to.be.false;
+    });
+
+    it('should not trigger a bid error when the bid did not match', function () {
+      pbEvents.emit.resetHistory();
+      const pbGlobal = Object.assign({}, pbGlobalMock, { getBidResponsesForAdUnitCode: () => ({ bids: [expectedBid] }) });
+      const videoImpressionVerifier = Object.assign({}, videoImpressionVerifierMock, { getBidIdentifiers: () => ({ auctionId: 'id' }) });
+      pbVideoFactory(null, null, pbGlobal, pbEvents, null, null, () => videoImpressionVerifier);
+      adErrorCb(expectedAdEventPayload);
+
+      expect(pbEvents.emit.called).to.be.false;
+    });
+  });
+});
diff --git a/test/spec/modules/videoModule/shared/parentModule_spec.js b/test/spec/modules/videoModule/shared/parentModule_spec.js
new file mode 100644
index 00000000000..e3e4cfb7f3f
--- /dev/null
+++ b/test/spec/modules/videoModule/shared/parentModule_spec.js
@@ -0,0 +1,72 @@
+import { SubmoduleBuilder, ParentModule } from 'libraries/video/shared/parentModule.js';
+import { expect } from 'chai';
+
+describe('Parent Module', function() {
+  const idForMock = 0;
+  const vendorCodeForMock = 'a';
+  const unrecognizedId = 999;
+  const unrecognizedVendorCode = 'zzz';
+  const mockSubmodule = { test: 'test' };
+  const mockSubmoduleBuilder = {
+    build: vendorCode => {
+      if (vendorCode === vendorCodeForMock) {
+        return mockSubmodule;
+      } else {
+        throw new Error('flawed');
+      }
+    }
+  };
+  const parentModule = ParentModule(mockSubmoduleBuilder);
+
+  describe('Register Submodule', function () {
+    it('should throw when the builder fails to build', function () {
+      expect(() => parentModule.registerSubmodule(unrecognizedId, unrecognizedVendorCode)).to.throw('flawed');
+    });
+  });
+
+  describe('Get Submodule', function () {
+    it('should return registered submodules', function () {
+      parentModule.registerSubmodule(idForMock, vendorCodeForMock);
+      const submodule = parentModule.getSubmodule(idForMock);
+      expect(submodule).to.be.equal(mockSubmodule);
+    });
+
+    it('should return undefined when submodule is not registered', function () {
+      const submodule = parentModule.getSubmodule(unrecognizedId);
+      expect(submodule).to.be.undefined;
+    });
+  })
+});
+
+describe('Submodule Builder', function () {
+  const vendorCode1 = 1;
+  const vendorCode2 = 2;
+  const submodule1 = {};
+  const initSpy = sinon.spy();
+  const submodule2 = { init: initSpy };
+  const submoduleFactory1 = () => submodule1;
+  const submoduleFactory2 = () => submodule2;
+  const submoduleFactory1Spy = sinon.spy(submoduleFactory1);
+
+  const vendorDirectory = {};
+  vendorDirectory[vendorCode1] = submoduleFactory1Spy;
+  vendorDirectory[vendorCode2] = submoduleFactory2;
+
+  const submoduleBuilder = SubmoduleBuilder(vendorDirectory);
+
+  it('should call submodule factory when vendor code is supported', function () {
+    const submodule = submoduleBuilder.build(vendorCode1);
+    expect(submoduleFactory1Spy.calledOnce).to.be.true;
+    expect(submodule).to.be.equal(submodule1);
+  });
+
+  it('should instantiate the submodule, when supported', function () {
+    const submodule = submoduleBuilder.build(vendorCode2);
+    expect(submodule).to.be.equal(submodule2);
+  });
+
+  it('should throw when vendor code is not recognized', function () {
+    const unrecognizedVendorCode = 999;
+    expect(() => submoduleBuilder.build(unrecognizedVendorCode)).to.throw('Unrecognized submodule vendor code: ' + unrecognizedVendorCode);
+  });
+});
diff --git a/test/spec/modules/videoModule/shared/state_spec.js b/test/spec/modules/videoModule/shared/state_spec.js
new file mode 100644
index 00000000000..94f3cb73411
--- /dev/null
+++ b/test/spec/modules/videoModule/shared/state_spec.js
@@ -0,0 +1,26 @@
+import stateFactory from 'libraries/video/shared/state.js';
+import { expect } from 'chai';
+
+describe('State', function () {
+  let state = stateFactory();
+  beforeEach(() => {
+    state.clearState();
+  });
+
+  it('should update state', function () {
+    state.updateState({ 'test': 'a' });
+    expect(state.getState()).to.have.property('test', 'a');
+    state.updateState({ 'test': 'b' });
+    expect(state.getState()).to.have.property('test', 'b');
+    state.updateState({ 'test_2': 'c' });
+    expect(state.getState()).to.have.property('test', 'b');
+    expect(state.getState()).to.have.property('test_2', 'c');
+  });
+
+  it('should clear state', function () {
+    state.updateState({ 'test': 'a' });
+    state.clearState();
+    expect(state.getState()).to.not.have.property('test', 'a');
+    expect(state.getState()).to.be.empty;
+  });
+});
diff --git a/test/spec/modules/videoModule/shared/vastXmlBuilder_spec.js b/test/spec/modules/videoModule/shared/vastXmlBuilder_spec.js
new file mode 100644
index 00000000000..2c67b898a53
--- /dev/null
+++ b/test/spec/modules/videoModule/shared/vastXmlBuilder_spec.js
@@ -0,0 +1,103 @@
+import { buildVastWrapper, getVastNode, getAdNode, getWrapperNode, getAdSystemNode,
+  getAdTagUriNode, getErrorNode, getImpressionNode } from 'libraries/video/shared/vastXmlBuilder.js';
+import { expect } from 'chai';
+
+describe('buildVastWrapper', function () {
+  it('should include impression and error nodes when requested', function () {
+    const vastXml = buildVastWrapper(
+      'adId123',
+      'http://wwww.testUrl.com/redirectUrl.xml',
+      'http://wwww.testUrl.com/impression.jpg',
+      'impressionId123',
+      'http://wwww.testUrl.com/error.jpg'
+    );
+    expect(vastXml).to.be.equal(`<VAST version="4.2"><Ad id="adId123"><Wrapper><AdSystem version="${$$PREBID_GLOBAL$$.version}">Prebid org</AdSystem><VASTAdTagURI><![CDATA[http://wwww.testUrl.com/redirectUrl.xml]]></VASTAdTagURI><Impression id="impressionId123"><![CDATA[http://wwww.testUrl.com/impression.jpg]]></Impression><Error><![CDATA[http://wwww.testUrl.com/error.jpg]]></Error></Wrapper></Ad></VAST>`);
+  });
+
+  it('should omit error nodes when excluded', function () {
+    const vastXml = buildVastWrapper(
+      'adId123',
+      'http://wwww.testUrl.com/redirectUrl.xml',
+      'http://wwww.testUrl.com/impression.jpg',
+      'impressionId123',
+    );
+    expect(vastXml).to.be.equal(`<VAST version="4.2"><Ad id="adId123"><Wrapper><AdSystem version="${$$PREBID_GLOBAL$$.version}">Prebid org</AdSystem><VASTAdTagURI><![CDATA[http://wwww.testUrl.com/redirectUrl.xml]]></VASTAdTagURI><Impression id="impressionId123"><![CDATA[http://wwww.testUrl.com/impression.jpg]]></Impression></Wrapper></Ad></VAST>`);
+  });
+
+  it('should omit impression nodes when excluded', function () {
+    const vastXml = buildVastWrapper(
+      'adId123',
+      'http://wwww.testUrl.com/redirectUrl.xml',
+    );
+    expect(vastXml).to.be.equal(`<VAST version="4.2"><Ad id="adId123"><Wrapper><AdSystem version="${$$PREBID_GLOBAL$$.version}">Prebid org</AdSystem><VASTAdTagURI><![CDATA[http://wwww.testUrl.com/redirectUrl.xml]]></VASTAdTagURI></Wrapper></Ad></VAST>`);
+  });
+});
+
+describe('getVastNode', function () {
+  it('should return well formed Vast node', function () {
+    const vastNode = getVastNode('body', '4.0');
+    expect(vastNode).to.be.equal('<VAST version=\"4.0\">body</VAST>');
+  });
+
+  it('should omit version when missing', function() {
+    const vastNode = getVastNode('body');
+    expect(vastNode).to.be.equal('<VAST>body</VAST>');
+  });
+});
+
+describe('getAdNode', function () {
+  it('should return well formed Ad node', function () {
+    const adNode = getAdNode('body', 'adId123');
+    expect(adNode).to.be.equal('<Ad id=\"adId123\">body</Ad>');
+  });
+
+  it('should omit id when missing', function() {
+    const adNode = getAdNode('body');
+    expect(adNode).to.be.equal('<Ad>body</Ad>');
+  });
+});
+
+describe('getWrapperNode', function () {
+  it('should return well formed Wrapper node', function () {
+    const wrapperNode = getWrapperNode('body');
+    expect(wrapperNode).to.be.equal('<Wrapper>body</Wrapper>');
+  });
+});
+
+describe('getAdSystemNode', function () {
+  it('should return well formed AdSystem node', function () {
+    const adSystemNode = getAdSystemNode('testSysName', '5.0');
+    expect(adSystemNode).to.be.equal('<AdSystem version=\"5.0\">testSysName</AdSystem>');
+  });
+
+  it('should omit version when missing', function() {
+    const adSystemNode = getAdSystemNode('testSysName');
+    expect(adSystemNode).to.be.equal('<AdSystem>testSysName</AdSystem>');
+  });
+});
+
+describe('getAdTagUriNode', function () {
+  it('should return well formed ad tag URI node', function () {
+    const adTagNode = getAdTagUriNode('http://wwww.testUrl.com/ad.xml');
+    expect(adTagNode).to.be.equal('<VASTAdTagURI><![CDATA[http://wwww.testUrl.com/ad.xml]]></VASTAdTagURI>');
+  });
+});
+
+describe('getImpressionNode', function () {
+  it('should return well formed Impression node', function () {
+    const impressionNode = getImpressionNode('http://wwww.testUrl.com/adImpression.jpg', 'impresionId123');
+    expect(impressionNode).to.be.equal('<Impression id=\"impresionId123\"><![CDATA[http://wwww.testUrl.com/adImpression.jpg]]></Impression>');
+  });
+
+  it('should omit id when missing', function() {
+    const impressionNode = getImpressionNode('http://wwww.testUrl.com/adImpression.jpg');
+    expect(impressionNode).to.be.equal('<Impression><![CDATA[http://wwww.testUrl.com/adImpression.jpg]]></Impression>');
+  });
+});
+
+describe('getErrorNode', function () {
+  it('should return well formed Error node', function () {
+    const errorNode = getErrorNode('http://wwww.testUrl.com/adError.jpg');
+    expect(errorNode).to.be.equal('<Error><![CDATA[http://wwww.testUrl.com/adError.jpg]]></Error>');
+  });
+});
diff --git a/test/spec/modules/videoModule/shared/vastXmlEditor_spec.js b/test/spec/modules/videoModule/shared/vastXmlEditor_spec.js
new file mode 100644
index 00000000000..2304b2f2833
--- /dev/null
+++ b/test/spec/modules/videoModule/shared/vastXmlEditor_spec.js
@@ -0,0 +1,209 @@
+import { vastXmlEditorFactory } from 'libraries/video/shared/vastXmlEditor.js';
+import { expect } from 'chai';
+
+describe('Vast XML Editor', function () {
+  const adWrapperXml = `
+<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        </Wrapper>
+    </Ad>
+</VAST>
+`;
+
+  const inlineXml = `
+<VAST version="4.0">
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        </InLine>
+    </Ad>
+</VAST>
+`;
+
+  const inLineWithWrapper = `
+<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        </Wrapper>
+    </Ad>
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        </InLine>
+    </Ad>
+</VAST>
+`;
+
+  const vastXmlEditor = vastXmlEditorFactory();
+  const expectedImpressionUrl = 'https://test.impression.com/ping.gif';
+  const expectedImpressionId = 'test-impression-id';
+  const expectedErrorUrl = 'https://test.error.com/ping.gif';
+
+  it('should add Impression Nodes to the Ad Wrapper', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(adWrapperXml, null, expectedImpressionUrl, expectedImpressionId);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression></Wrapper>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes to the InLine', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inlineXml, null, expectedImpressionUrl, expectedImpressionId);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes to the Ad Wrapper and Inline', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inLineWithWrapper, null, expectedImpressionUrl, expectedImpressionId);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression></Wrapper>
+    </Ad>
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Error Nodes to the Ad Wrapper', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(adWrapperXml, null, null, null, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Error><![CDATA[${expectedErrorUrl}]]></Error></Wrapper>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Error Nodes to the InLine', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inlineXml, null, null, null, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Error><![CDATA[${expectedErrorUrl}]]></Error></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Error Nodes to the Ad Wrapper and Inline', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inLineWithWrapper, null, null, null, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Error><![CDATA[${expectedErrorUrl}]]></Error></Wrapper>
+    </Ad>
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Error><![CDATA[${expectedErrorUrl}]]></Error></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes and Error Nodes to the Ad Wrapper', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(adWrapperXml, null, expectedImpressionUrl, expectedImpressionId, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression><Error><![CDATA[${expectedErrorUrl}]]></Error></Wrapper>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes and Error Nodes to the InLine', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inlineXml, null, expectedImpressionUrl, expectedImpressionId, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression><Error><![CDATA[${expectedErrorUrl}]]></Error></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes and Error Nodes to the Ad Wrapper and Inline', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inLineWithWrapper, null, expectedImpressionUrl, expectedImpressionId, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression><Error><![CDATA[${expectedErrorUrl}]]></Error></Wrapper>
+    </Ad>
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression><Error><![CDATA[${expectedErrorUrl}]]></Error></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should override the ad id in inline', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inlineXml, 'adIdOverride');
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="adIdOverride">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        </InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should override the ad id in the Ad Wrapper', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(adWrapperXml, 'adIdOverride');
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="adIdOverride">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        </Wrapper>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+});
diff --git a/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js b/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js
new file mode 100644
index 00000000000..4377e989851
--- /dev/null
+++ b/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js
@@ -0,0 +1,846 @@
+import {
+  JWPlayerProvider,
+  adStateFactory,
+  timeStateFactory,
+  callbackStorageFactory,
+  utils
+} from 'modules/jwplayerVideoProvider';
+
+import {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE
+} from 'libraries/video/constants/ortb.js';
+
+import {
+  SETUP_COMPLETE, SETUP_FAILED, PLAY, AD_IMPRESSION, videoEvents
+} from 'libraries/video/constants/events.js';
+
+import { PLAYBACK_MODE } from 'libraries/video/constants/constants.js';
+
+function getPlayerMock() {
+  return makePlayerFactoryMock({
+    getState: function () {},
+    setup: function () {},
+    getViewable: function () {},
+    getPercentViewable: function () {},
+    getMute: function () {},
+    getVolume: function () {},
+    getConfig: function () {},
+    getHeight: function () {},
+    getWidth: function () {},
+    getFullscreen: function () {},
+    getPlaylistItem: function () {},
+    playAd: function () {},
+    on: function () {},
+    off: function () {},
+    remove: function () {},
+    getAudioTracks: function () {},
+    getCurrentAudioTrack: function () {},
+    getPlugin: function () {},
+    getFloating: function () {}
+  })();
+}
+
+function makePlayerFactoryMock(playerMock_) {
+  const playerFactory = function () {
+    return playerMock_;
+  }
+  playerFactory.version = '8.21.0';
+  return playerFactory;
+}
+
+function getUtilsMock() {
+  return {
+    getJwConfig: function () {},
+    getSupportedMediaTypes: function () {},
+    getStartDelay: function () {},
+    getPlacement: function () {},
+    getPlaybackMethod: function () {},
+    isOmidSupported: function () {},
+    getSkipParams: function () {},
+    getJwEvent: event => event,
+    getIsoLanguageCode: function () {},
+    getSegments: function () {},
+    getContentDatum: function () {}
+  };
+}
+
+const sharedUtils = { videoEvents };
+
+describe('JWPlayerProvider', function () {
+  describe('init', function () {
+    let config;
+    let adState;
+    let timeState;
+    let callbackStorage;
+    let utilsMock;
+
+    beforeEach(() => {
+      config = {};
+      adState = adStateFactory();
+      timeState = timeStateFactory();
+      callbackStorage = callbackStorageFactory();
+      utilsMock = getUtilsMock();
+    });
+
+    it('should trigger failure when jwplayer is missing', function () {
+      const provider = JWPlayerProvider(config, null, adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-1);
+    });
+
+    it('should trigger failure when jwplayer version is under min supported version', function () {
+      let jwplayerMock = () => {};
+      jwplayerMock.version = '8.20.0';
+      const provider = JWPlayerProvider(config, jwplayerMock, adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-2);
+    });
+
+    it('should instantiate the player when uninstantied', function () {
+      const player = getPlayerMock();
+      config.playerConfig = {};
+      const setupSpy = player.setup = sinon.spy();
+      const provider = JWPlayerProvider(config, makePlayerFactoryMock(player), adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      provider.init();
+      expect(setupSpy.calledOnce).to.be.true;
+    });
+
+    it('should trigger setup complete when player is already instantied', function () {
+      const player = getPlayerMock();
+      player.getState = () => 'idle';
+      const provider = JWPlayerProvider(config, makePlayerFactoryMock(player), adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      const setupComplete = sinon.spy();
+      provider.onEvent(SETUP_COMPLETE, setupComplete, {});
+      provider.init();
+      expect(setupComplete.calledOnce).to.be.true;
+    });
+
+    it('should not reinstantiate player', function () {
+      const player = getPlayerMock();
+      player.getState = () => 'idle';
+      const setupSpy = player.setup = sinon.spy();
+      const provider = JWPlayerProvider(config, makePlayerFactoryMock(player), adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      provider.init();
+      expect(setupSpy.called).to.be.false;
+    });
+  });
+
+  describe('getId', function () {
+    it('should return configured div id', function () {
+      const provider = JWPlayerProvider({ divId: 'test_id' }, undefined, undefined, undefined, undefined, undefined, sharedUtils);
+      expect(provider.getId()).to.be.equal('test_id');
+    });
+  });
+
+  describe('getOrtbVideo', function () {
+    it('should populate oRTB Video params', function () {
+      const test_media_type = VIDEO_MIME_TYPE.MP4;
+      const test_height = 100;
+      const test_width = 200;
+      const test_start_delay = 5;
+      const test_placement = PLACEMENT.ARTICLE;
+      const test_battr = 'battr';
+      const test_playback_method = PLAYBACK_METHODS.CLICK_TO_PLAY;
+      const test_skip = 0;
+
+      const config = {};
+      const player = getPlayerMock();
+      const utils = getUtilsMock();
+
+      player.getConfig = () => ({
+        advertising: {
+          battr: test_battr
+        }
+      });
+      player.getHeight = () => test_height;
+      player.getWidth = () => test_width;
+      player.getFullscreen = () => true; //
+
+      utils.getSupportedMediaTypes = () => [test_media_type];
+      utils.getStartDelay = () => test_start_delay;
+      utils.getPlacement = () => test_placement;
+      utils.getPlaybackMethod = () => test_playback_method;
+      utils.isOmidSupported = () => true; //
+      utils.getSkipParams = () => ({ skip: test_skip });
+
+      const provider = JWPlayerProvider(config, makePlayerFactoryMock(player), adStateFactory(), {}, {}, utils, sharedUtils);
+      provider.init();
+      let video = provider.getOrtbVideo();
+
+      expect(video.mimes).to.include(VIDEO_MIME_TYPE.MP4);
+      expect(video.protocols).to.include.members([
+        PROTOCOLS.VAST_2_0,
+        PROTOCOLS.VAST_3_0,
+        PROTOCOLS.VAST_4_0,
+        PROTOCOLS.VAST_2_0_WRAPPER,
+        PROTOCOLS.VAST_3_0_WRAPPER,
+        PROTOCOLS.VAST_4_0_WRAPPER
+      ]);
+      expect(video.h).to.equal(test_height);
+      expect(video.w).to.equal(test_width);
+      expect(video.startdelay).to.equal(test_start_delay);
+      expect(video.placement).to.equal(test_placement);
+      expect(video.battr).to.equal(test_battr);
+      expect(video.maxextended).to.equal(-1);
+      expect(video.boxingallowed).to.equal(1);
+      expect(video.playbackmethod).to.include(test_playback_method);
+      expect(video.playbackend).to.equal(1);
+      expect(video.api).to.have.length(2);
+      expect(video.api).to.include.members([API_FRAMEWORKS.VPAID_2_0, API_FRAMEWORKS.OMID_1_0]); //
+      expect(video.skip).to.equal(test_skip);
+      expect(video.pos).to.equal(7); //
+
+      player.getFullscreen = () => false;
+      utils.isOmidSupported = () => false;
+
+      video = provider.getOrtbVideo();
+      expect(video).to.not.have.property('pos');
+      expect(video.api).to.have.length(1);
+      expect(video.api).to.include(API_FRAMEWORKS.VPAID_2_0);
+      expect(video.api).to.not.include(API_FRAMEWORKS.OMID_1_0);
+    });
+  });
+
+  describe('getOrtbContent', function () {
+    it('should populate oRTB Content params', function () {
+      const test_item = {
+        mediaid: 'id',
+        file: 'file',
+        title: 'title',
+        iabCategories: 'iabCategories',
+        tags: 'keywords',
+      };
+      const test_duration = 30;
+      let test_playback_mode = PLAYBACK_MODE.VOD;//
+
+      const player = getPlayerMock();
+      player.getPlaylistItem = () => test_item;
+      const utils = getUtilsMock();
+
+      const timeState = {
+        getState: () => ({
+          duration: test_duration,
+          playbackMode: test_playback_mode
+        })
+      }
+
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), adStateFactory(), timeState, {}, utils, sharedUtils);
+      provider.init();
+
+      let content = provider.getOrtbContent();
+      expect(content.id).to.be.equal('jw_' + test_item.mediaid);
+      expect(content.url).to.be.equal(test_item.file);
+      expect(content.title).to.be.equal(test_item.title);
+      expect(content.cat).to.be.equal(test_item.iabCategories);
+      expect(content.keywords).to.be.equal(test_item.tags);
+      expect(content.len).to.be.equal(test_duration);
+      expect(content.livestream).to.be.equal(0);//
+
+      test_playback_mode = PLAYBACK_MODE.LIVE;
+
+      content = provider.getOrtbContent();
+      expect(content.livestream).to.be.equal(1);
+
+      test_playback_mode = PLAYBACK_MODE.DVR;
+
+      content = provider.getOrtbContent();
+      expect(content.livestream).to.be.equal(1);
+    });
+  });
+
+  describe('setAdTagUrl', function () {
+    it('should call playAd', function () {
+      const player = getPlayerMock();
+      const playAdSpy = player.playAd = sinon.spy();
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), {}, {}, {}, {}, sharedUtils);
+      provider.init();
+      provider.setAdTagUrl('tag');
+      expect(playAdSpy.called).to.be.true;
+      const argument = playAdSpy.args[0][0];
+      expect(argument).to.be.equal('tag');
+    });
+  });
+
+  describe('events', function () {
+    it('should register event listener on player', function () {
+      const player = getPlayerMock();
+      const onSpy = player.on = sinon.spy();
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), adStateFactory(), timeStateFactory(), callbackStorageFactory(), getUtilsMock(), sharedUtils);
+      provider.init();
+      const callback = () => {};
+      provider.onEvent(PLAY, callback, {});
+      expect(onSpy.calledOnce).to.be.true;
+      const eventName = onSpy.args[0][0];
+      expect(eventName).to.be.equal('play');
+    });
+
+    it('should remove event listener on player', function () {
+      const player = getPlayerMock();
+      const offSpy = player.off = sinon.spy();
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), adStateFactory(), timeStateFactory(), callbackStorageFactory(), utils, sharedUtils);
+      provider.init();
+      const callback = () => {};
+      provider.onEvent(AD_IMPRESSION, callback, {});
+      provider.offEvent(AD_IMPRESSION, callback);
+      expect(offSpy.calledOnce).to.be.true;
+      const eventName = offSpy.args[0][0];
+      expect(eventName).to.be.equal('adViewableImpression');
+    });
+  });
+
+  describe('destroy', function () {
+    it('should remove and null the player', function () {
+      const player = getPlayerMock();
+      const removeSpy = player.remove = sinon.spy();
+      player.remove = removeSpy;
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), adStateFactory(), timeStateFactory(), callbackStorageFactory(), getUtilsMock(), sharedUtils);
+      provider.init();
+      provider.destroy();
+      provider.destroy();
+      expect(removeSpy.calledOnce).to.be.true;
+    });
+  });
+});
+
+describe('adStateFactory', function () {
+  let adState = adStateFactory();
+
+  beforeEach(() => {
+    adState.clearState();
+  });
+
+  it('should update state for ad events', function () {
+    const tag = 'tag';
+    const adPosition = 'adPosition';
+    const timeLoading = 'timeLoading';
+    const id = 'id';
+    const description = 'description';
+    const adsystem = 'adsystem';
+    const adtitle = 'adtitle';
+    const advertiserId = 'advertiserId';
+    const advertiser = 'advertiser';
+    const dealId = 'dealId';
+    const linear = 'linear';
+    const vastversion = 'vastversion';
+    const mediaFile = 'mediaFile';
+    const adId = 'adId';
+    const universalAdId = 'universalAdId';
+    const creativeAdId = 'creativeAdId';
+    const creativetype = 'creativetype';
+    const clickThroughUrl = 'clickThroughUrl';
+    const witem = 'witem';
+    const wcount = 'wcount';
+    const podcount = 'podcount';
+    const sequence = 'sequence';
+
+    adState.updateForEvent({
+      tag,
+      adPosition,
+      timeLoading,
+      id,
+      description,
+      adsystem,
+      adtitle,
+      advertiserId,
+      advertiser,
+      dealId,
+      linear,
+      vastversion,
+      mediaFile,
+      adId,
+      universalAdId,
+      creativeAdId,
+      creativetype,
+      clickThroughUrl,
+      witem,
+      wcount,
+      podcount,
+      sequence
+    });
+
+    const state = adState.getState();
+    expect(state.adTagUrl).to.equal(tag);
+    expect(state.offset).to.equal(adPosition);
+    expect(state.loadTime).to.equal(timeLoading);
+    expect(state.vastAdId).to.equal(id);
+    expect(state.adDescription).to.equal(description);
+    expect(state.adServer).to.equal(adsystem);
+    expect(state.adTitle).to.equal(adtitle);
+    expect(state.advertiserId).to.equal(advertiserId);
+    expect(state.dealId).to.equal(dealId);
+    expect(state.linear).to.equal(linear);
+    expect(state.vastVersion).to.equal(vastversion);
+    expect(state.creativeUrl).to.equal(mediaFile);
+    expect(state.adId).to.equal(adId);
+    expect(state.universalAdId).to.equal(universalAdId);
+    expect(state.creativeId).to.equal(creativeAdId);
+    expect(state.creativeType).to.equal(creativetype);
+    expect(state.redirectUrl).to.equal(clickThroughUrl);
+    expect(state).to.have.property('adPlacementType');
+    expect(state.adPlacementType).to.be.undefined;
+    expect(state.waterfallIndex).to.equal(witem);
+    expect(state.waterfallCount).to.equal(wcount);
+    expect(state.adPodCount).to.equal(podcount);
+    expect(state.adPodIndex).to.equal(sequence);
+  });
+
+  it('should convert placement to oRTB value', function () {
+    adState.updateForEvent({
+      placement: 'instream'
+    });
+
+    let state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.INSTREAM);
+
+    adState.updateForEvent({
+      placement: 'banner'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.BANNER);
+
+    adState.updateForEvent({
+      placement: 'article'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.ARTICLE);
+
+    adState.updateForEvent({
+      placement: 'feed'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.FEED);
+
+    adState.updateForEvent({
+      placement: 'interstitial'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.INTERSTITIAL);
+
+    adState.updateForEvent({
+      placement: 'slider'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.SLIDER);
+
+    adState.updateForEvent({
+      placement: 'floating'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.FLOATING);
+  });
+});
+
+describe('timeStateFactory', function () {
+  let timeState = timeStateFactory();
+
+  beforeEach(() => {
+    timeState.clearState();
+  });
+
+  it('should update state for VOD time event', function() {
+    const position = 5;
+    const test_duration = 30;
+
+    timeState.updateForEvent({
+      position,
+      duration: test_duration
+    });
+
+    const { time, duration, playbackMode } = timeState.getState();
+    expect(time).to.be.equal(position);
+    expect(duration).to.be.equal(test_duration);
+    expect(playbackMode).to.be.equal(PLAYBACK_MODE.VOD);
+  });
+
+  it('should update state for LIVE time events', function() {
+    const position = 0;
+    const test_duration = 0;
+
+    timeState.updateForEvent({
+      position,
+      duration: test_duration
+    });
+
+    const { time, duration, playbackMode } = timeState.getState();
+    expect(time).to.be.equal(position);
+    expect(duration).to.be.equal(test_duration);
+    expect(playbackMode).to.be.equal(PLAYBACK_MODE.LIVE);
+  });
+
+  it('should update state for DVR time events', function() {
+    const position = -5;
+    const test_duration = -30;
+
+    timeState.updateForEvent({
+      position,
+      duration: test_duration
+    });
+
+    const { time, duration, playbackMode } = timeState.getState();
+    expect(time).to.be.equal(position);
+    expect(duration).to.be.equal(test_duration);
+    expect(playbackMode).to.be.equal(PLAYBACK_MODE.DVR);
+  });
+});
+
+describe('callbackStorageFactory', function () {
+  let callbackStorage = callbackStorageFactory();
+
+  beforeEach(() => {
+    callbackStorage.clearStorage();
+  });
+
+  it('should store callbacks', function () {
+    const callback1 = () => 'callback1';
+    const eventHandler1 = () => 'eventHandler1';
+    callbackStorage.storeCallback('event', eventHandler1, callback1);
+
+    const callback2 = () => 'callback2';
+    const eventHandler2 = () => 'eventHandler2';
+    callbackStorage.storeCallback('event', eventHandler2, callback2);
+
+    const callback3 = () => 'callback3';
+
+    expect(callbackStorage.getCallback('event', callback1)).to.be.equal(eventHandler1);
+    expect(callbackStorage.getCallback('event', callback2)).to.be.equal(eventHandler2);
+    expect(callbackStorage.getCallback('event', callback3)).to.be.undefined;
+  });
+
+  it('should remove callbacks after retrieval', function () {
+    const callback1 = () => 'callback1';
+    const eventHandler1 = () => 'eventHandler1';
+    callbackStorage.storeCallback('event', eventHandler1, callback1);
+
+    expect(callbackStorage.getCallback('event', callback1)).to.be.equal(eventHandler1);
+    expect(callbackStorage.getCallback('event', callback1)).to.be.undefined;
+  });
+
+  it('should clear callbacks', function () {
+    const callback1 = () => 'callback1';
+    const eventHandler1 = () => 'eventHandler1';
+    callbackStorage.storeCallback('event', eventHandler1, callback1);
+
+    callbackStorage.clearStorage();
+    expect(callbackStorage.getCallback('event', callback1)).to.be.undefined;
+  });
+});
+
+describe('utils', function () {
+  describe('getJwConfig', function () {
+    const getJwConfig = utils.getJwConfig;
+    it('should return undefined when no config is provided', function () {
+      let jwConfig = getJwConfig();
+      expect(jwConfig).to.be.undefined;
+
+      jwConfig = getJwConfig(null);
+      expect(jwConfig).to.be.undefined;
+    });
+
+    it('should set vendor config params to top level', function () {
+      let jwConfig = getJwConfig({
+        params: {
+          vendorConfig: {
+            'test': 'a',
+            'test_2': 'b'
+          }
+        }
+      });
+      expect(jwConfig.test).to.be.equal('a');
+      expect(jwConfig.test_2).to.be.equal('b');
+    });
+
+    it('should convert video module params', function () {
+      let jwConfig = getJwConfig({
+        mute: true,
+        autoStart: true,
+        licenseKey: 'key'
+      });
+
+      expect(jwConfig.mute).to.be.true;
+      expect(jwConfig.autostart).to.be.true;
+      expect(jwConfig.key).to.be.equal('key');
+    });
+
+    it('should apply video module params only when absent from vendor config', function () {
+      let jwConfig = getJwConfig({
+        mute: true,
+        autoStart: true,
+        licenseKey: 'key',
+        params: {
+          vendorConfig: {
+            mute: false,
+            autostart: false,
+            key: 'other_key'
+          }
+        }
+      });
+
+      expect(jwConfig.mute).to.be.false;
+      expect(jwConfig.autostart).to.be.false;
+      expect(jwConfig.key).to.be.equal('other_key');
+    });
+
+    it('should not convert undefined properties', function () {
+      let jwConfig = getJwConfig({
+        params: {
+          vendorConfig: {
+            test: 'a'
+          }
+        }
+      });
+
+      expect(jwConfig).to.not.have.property('mute');
+      expect(jwConfig).to.not.have.property('autostart');
+      expect(jwConfig).to.not.have.property('key');
+    });
+
+    it('should exclude fallback ad block when setupAds is explicitly disabled', function () {
+      let jwConfig = getJwConfig({
+        setupAds: false,
+        params: {
+
+          vendorConfig: {}
+        }
+      });
+
+      expect(jwConfig).to.not.have.property('advertising');
+    });
+
+    it('should set advertising block when setupAds is allowed', function () {
+      let jwConfig = getJwConfig({
+        params: {
+          vendorConfig: {
+            advertising: {
+              tag: 'test_tag'
+            }
+          }
+        }
+      });
+
+      expect(jwConfig).to.have.property('advertising');
+      expect(jwConfig.advertising).to.have.property('tag', 'test_tag');
+    });
+
+    it('should fallback to vast plugin', function () {
+      let jwConfig = getJwConfig({});
+
+      expect(jwConfig).to.have.property('advertising');
+      expect(jwConfig.advertising).to.have.property('client', 'vast');
+    });
+  });
+  describe('getSkipParams', function () {
+    const getSkipParams = utils.getSkipParams;
+
+    it('should return an empty object when skip is not configured', function () {
+      let skipParams = getSkipParams({});
+      expect(skipParams).to.be.empty;
+    });
+
+    it('should set skip to false when explicitly configured', function () {
+      let skipParams = getSkipParams({
+        skipoffset: -1
+      });
+      expect(skipParams.skip).to.be.equal(0);
+      expect(skipParams.skipmin).to.be.undefined;
+      expect(skipParams.skipafter).to.be.undefined;
+    });
+
+    it('should be skippable when skip offset is set', function () {
+      const skipOffset = 3;
+      let skipParams = getSkipParams({
+        skipoffset: skipOffset
+      });
+      expect(skipParams.skip).to.be.equal(1);
+      expect(skipParams.skipmin).to.be.equal(skipOffset + 2);
+      expect(skipParams.skipafter).to.be.equal(skipOffset);
+    });
+  });
+
+  describe('getSupportedMediaTypes', function () {
+    const getSupportedMediaTypes = utils.getSupportedMediaTypes;
+
+    it('should always support VPAID', function () {
+      let supportedMediaTypes = getSupportedMediaTypes([]);
+      expect(supportedMediaTypes).to.include(VPAID_MIME_TYPE);
+
+      supportedMediaTypes = getSupportedMediaTypes([VIDEO_MIME_TYPE.MP4]);
+      expect(supportedMediaTypes).to.include(VPAID_MIME_TYPE);
+    });
+  });
+
+  describe('getPlacement', function () {
+    const getPlacement = utils.getPlacement;
+
+    it('should be INSTREAM when not configured for outstream', function () {
+      let adConfig = {};
+      let placement = getPlacement(adConfig);
+      expect(placement).to.be.equal(PLACEMENT.INSTREAM);
+
+      adConfig = { outstream: false };
+      placement = getPlacement(adConfig);
+      expect(placement).to.be.equal(PLACEMENT.INSTREAM);
+    });
+
+    it('should be FLOATING when player is floating', function () {
+      const player = getPlayerMock();
+      player.getFloating = () => true;
+      const placement = getPlacement({outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.FLOATING);
+    });
+
+    it('should be the value  defined in the ad config', function () {
+      const player = getPlayerMock();
+      player.getFloating = () => false;
+
+      let placement = getPlacement({placement: 'banner', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.BANNER);
+
+      placement = getPlacement({placement: 'article', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.ARTICLE);
+
+      placement = getPlacement({placement: 'feed', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.FEED);
+
+      placement = getPlacement({placement: 'interstitial', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.INTERSTITIAL);
+
+      placement = getPlacement({placement: 'slider', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.SLIDER);
+    });
+
+    it('should be undefined when undetermined', function () {
+      const placement = getPlacement({ outstream: true }, getPlayerMock());
+      expect(placement).to.be.undefined;
+    });
+  });
+
+  describe('getPlaybackMethod', function() {
+    const getPlaybackMethod = utils.getPlaybackMethod;
+
+    it('should return autoplay with sound', function() {
+      const playbackMethod = getPlaybackMethod({
+        autoplay: true,
+        mute: false
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.AUTOPLAY);
+    });
+
+    it('should return autoplay muted', function() {
+      const playbackMethod = getPlaybackMethod({
+        autoplay: true,
+        mute: true
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.AUTOPLAY_MUTED);
+    });
+
+    it('should treat autoplayAdsMuted as mute', function () {
+      const playbackMethod = getPlaybackMethod({
+        autoplay: true,
+        autoplayAdsMuted: true
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.AUTOPLAY_MUTED);
+    });
+
+    it('should return click to play', function() {
+      let playbackMethod = getPlaybackMethod({ autoplay: false });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.CLICK_TO_PLAY);
+
+      playbackMethod = getPlaybackMethod({
+        autoplay: false,
+        autoplayAdsMuted: true
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.CLICK_TO_PLAY);
+
+      playbackMethod = getPlaybackMethod({
+        autoplay: false,
+        mute: true
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.CLICK_TO_PLAY);
+    });
+  });
+
+  describe('isOmidSupported', function () {
+    const isOmidSupported = utils.isOmidSupported;
+    const initialOmidSessionClient = window.OmidSessionClient;
+    afterEach(() => {
+      window.OmidSessionClient = initialOmidSessionClient;
+    });
+
+    it('should be true when Omid is loaded and client is VAST', function () {
+      window.OmidSessionClient = {};
+      expect(isOmidSupported('vast')).to.be.true;
+    });
+
+    it('should be false when Omid is not present', function () {
+      expect(isOmidSupported('vast')).to.be.false;
+    });
+
+    it('should be false when client is not Vast', function () {
+      window.OmidSessionClient = {};
+      expect(isOmidSupported('googima')).to.be.false;
+      expect(isOmidSupported('freewheel')).to.be.false;
+      expect(isOmidSupported('googimadai')).to.be.false;
+      expect(isOmidSupported('')).to.be.false;
+      expect(isOmidSupported(null)).to.be.false;
+      expect(isOmidSupported()).to.be.false;
+    });
+  });
+
+  describe('getIsoLanguageCode', function () {
+    const sampleAudioTracks = [{language: 'ht'}, {language: 'fr'}, {language: 'es'}, {language: 'pt'}];
+
+    it('should return undefined when audio tracks are unavailable', function () {
+      const player = getPlayerMock();
+      let languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.undefined;
+      player.getAudioTracks = () => [];
+      languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.undefined;
+    });
+
+    it('should return the first audio track language code if the getCurrentAudioTrack returns undefined', function () {
+      const player = getPlayerMock();
+      player.getAudioTracks = () => sampleAudioTracks;
+      let languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.equal('ht');
+    });
+
+    it('should return the first audio track  language code if the getCurrentAudioTrack returns null', function () {
+      const player = getPlayerMock();
+      player.getAudioTracks = () => sampleAudioTracks;
+      player.getCurrentAudioTrack = () => null;
+      let languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.equal('ht');
+    });
+
+    it('should return the first audio track language code if the getCurrentAudioTrack returns -1', function () {
+      const player = getPlayerMock();
+      player.getAudioTracks = () => sampleAudioTracks;
+      player.getCurrentAudioTrack = () => -1;
+      const languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.equal('ht');
+    });
+
+    it('should return the right audio track language code', function () {
+      const player = getPlayerMock();
+      player.getAudioTracks = () => sampleAudioTracks;
+      player.getCurrentAudioTrack = () => 2;
+      const languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.equal('es');
+    });
+  });
+});
diff --git a/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js b/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js
new file mode 100644
index 00000000000..a7379ccbab2
--- /dev/null
+++ b/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js
@@ -0,0 +1,391 @@
+// Using require style imports for fine grained control of import time
+import {
+  SETUP_COMPLETE, SETUP_FAILED
+} from 'libraries/video/constants/events.js';
+
+const {VideojsProvider, utils} = require('modules/videojsVideoProvider');
+
+const {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE, AD_POSITION
+} = require('libraries/video/constants/ortb.js');
+
+const videojs = require('video.js').default;
+require('videojs-playlist').default;
+require('videojs-ima').default;
+require('videojs-contrib-ads').default;
+
+describe('videojsProvider', function () {
+  let config;
+  let adState;
+  let timeState;
+  let callbackStorage;
+
+  describe('init', function () {
+    beforeEach(() => {
+      config = {};
+      document.body.innerHTML = '';
+    });
+
+    it('should trigger failure when videojs is missing', function () {
+      const provider = VideojsProvider(config, null, adState, timeState, callbackStorage, utils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-1);
+    });
+
+    it('should trigger failure when videojs version is under min supported version', function () {
+      const provider = VideojsProvider(config, {...videojs, VERSION: '0.0.0'}, adState, timeState, callbackStorage, utils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-2);
+    });
+
+    it('should trigger failure when the div is not found', function () {
+      config.divId = 'fake-div'
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-3);
+    });
+
+    it('should instantiate the player when uninstantied', function () {
+      config.playerConfig = {testAttr: true};
+      config.divId = 'test-div'
+      const div = document.createElement('div');
+      div.setAttribute('id', 'test-div');
+      document.body.appendChild(div);
+
+      const mockVideojs = sinon.spy();
+      const provider = VideojsProvider(config, mockVideojs, adState, timeState, callbackStorage, utils);
+      provider.init();
+      expect(mockVideojs.calledOnce).to.be.true
+    });
+
+    it('should not reinstantiate the player', function () {
+      const div = document.createElement('div');
+      div.setAttribute('id', 'test-div');
+      document.body.appendChild(div);
+      const player = videojs(div, {})
+      config.playerConfig = {};
+      config.divId = 'test-div'
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      provider.init();
+      expect(videojs.getPlayer('test-div')).to.be.equal(player)
+      videojs.getPlayer('test-div').dispose()
+    });
+
+    it('should trigger setup complete when player is already insantiated', function () {
+      const div = document.createElement('div');
+      div.setAttribute('id', 'test-div');
+      document.body.appendChild(div);
+      videojs(div, {})
+      config.playerConfig = {};
+      config.divId = 'test-div'
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      const setupComplete = sinon.spy();
+      provider.onEvent(SETUP_COMPLETE, setupComplete, {});
+      provider.init();
+      expect(setupComplete.called).to.be.true;
+      videojs.getPlayer('test-div').dispose()
+    });
+  });
+
+  describe('getId', function () {
+    it('should return configured div id', function () {
+      const provider = VideojsProvider({ divId: 'test_id' });
+      expect(provider.getId()).to.be.equal('test_id');
+    });
+  });
+
+  describe('getOrtbParams', function () {
+    beforeEach(() => {
+      config = {divId: 'test'};
+      // initialize videojs element
+      document.body.innerHTML = `
+      <video preload id='test' width="${200}" height="${100}">
+      <source src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4" type="video/mp4">
+      </video>`;
+    });
+
+    afterEach(() => {
+      const testPlayer = videojs('test');
+      if (testPlayer && !testPlayer.isDisposed()) {
+        testPlayer.dispose();
+      }
+    });
+
+    it('should populate oRTB Video and Content', function () {
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      provider.init();
+
+      const video = provider.getOrtbVideo();
+
+      expect(video.mimes).to.include(VIDEO_MIME_TYPE.MP4);
+      expect(video.protocols).to.deep.equal([2]);
+      expect(video.h).to.equal(100);
+      expect(video.w).to.equal(200);
+
+      expect(video.maxextended).to.equal(-1);
+      expect(video.boxingallowed).to.equal(1);
+      expect(video.playbackmethod).to.include(PLAYBACK_METHODS.CLICK_TO_PLAY);
+      expect(video.playbackend).to.equal(1);
+      expect(video.api).to.deep.equal([2]);
+      expect(video.placement).to.be.equal(PLACEMENT.INSTREAM);
+    });
+
+    it('should populate oRTB Content', function () {
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      provider.init();
+
+      const content = provider.getOrtbContent();
+      expect(content.url).to.be.equal('http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4');
+      expect(content).to.not.have.property('len');
+    });
+
+    it('should change populated oRTB params when ima present', function () {
+      require('videojs-contrib-ads');
+      require('videojs-ima');
+      config.playerConfig = {
+        params: {
+          vendorConfig: {
+            mediaid: 'vendor-id',
+            advertising: {
+              tag: ['test-tag']
+            }
+          }
+        }
+      }
+
+      let provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const video = provider.getOrtbVideo();
+
+      expect(video.protocols).to.include(PROTOCOLS.VAST_2_0);
+      expect(video.api).to.include(API_FRAMEWORKS.VPAID_2_0);
+      expect(video.mimes).to.include(VPAID_MIME_TYPE);
+    });
+    //
+    // We can't determine what type of outstream play is occuring
+    // if the src is absent so we should not set placement
+    it('should not set placement when src is absent', function() {
+      document.body.innerHTML = `<video preload id='test' width="${200}" height="${100}"></video>`
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const video = provider.getOrtbVideo();
+      expect(video).to.not.have.property('placement')
+    })
+    //
+    it('should populate position when fullscreen', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.isFullscreen = () => true;
+      const video = provider.getOrtbVideo();
+      expect(video.pos).to.equal(7);
+    });
+    //
+    it('should populate length when loaded', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.readyState = () => 1
+      player.duration = () => 100
+      const content = provider.getOrtbContent();
+      expect(content.len).to.equal(100);
+    });
+    //
+    it('should return the correct playback method for autoplay', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.autoplay(true)
+      const video = provider.getOrtbVideo();
+      expect(video.playbackmethod).to.include(PLAYBACK_METHODS.AUTOPLAY);
+    });
+    //
+    it('should return the correct playback method for autoplay muted', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.muted = () => true
+      player.autoplay = () => true
+      const video = provider.getOrtbVideo();
+      expect(video.playbackmethod).to.include(PLAYBACK_METHODS.AUTOPLAY_MUTED);
+    });
+    //
+    it('should return the correct playback method for the other autoplay muted', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.autoplay = () => 'muted'
+      const video = provider.getOrtbVideo();
+      expect(video.playbackmethod).to.include(PLAYBACK_METHODS.AUTOPLAY_MUTED);
+    });
+  });
+});
+
+describe('utils', function() {
+  describe('getSetupConfig', function() {
+    it('should return undefined when config is absent', function () {
+      expect(utils.getSetupConfig()).to.be.undefined;
+    });
+
+    it('should give priority to vendorConfig', function () {
+      const config = {
+        autostart: false,
+        mute: false,
+        params: {
+          vendorConfig: {
+            autostart: true,
+            mute: true,
+            other: true
+          }
+        }
+      };
+      const setupConfig = utils.getSetupConfig(config);
+      expect(setupConfig.autostart).to.be.true;
+      expect(setupConfig.mute).to.be.true;
+      expect(setupConfig.other).to.be.true;
+    });
+
+    it('should only global apply properties when absent from vendor config', function () {
+      const config = {
+        autostart: false,
+        params: {
+          vendorConfig: {
+            other: true
+          }
+        }
+      };
+      const setupConfig = utils.getSetupConfig(config);
+      expect(setupConfig.autostart).to.be.false;
+      expect(setupConfig.mute).to.be.undefined;
+      expect(setupConfig.other).to.be.true;
+    });
+  });
+
+  describe('getAdConfig', function () {
+    it('should return empty object when config is absent', function () {
+      expect(utils.getAdConfig()).to.deep.equal({});
+    });
+
+    it('should return adPluginConfig', function () {
+      const config = {
+        params: {
+          adPluginConfig: {
+            vpaid: true,
+          }
+        }
+      };
+
+      expect(utils.getAdConfig(config)).to.be.equal(config.params.adPluginConfig);
+    });
+  });
+
+  describe('getPositionCode', function() {
+    it('should return the correct position when video is above the fold', function () {
+      const code = utils.getPositionCode({
+        left: window.innerWidth / 10,
+        top: 0,
+        width: window.innerWidth - window.innerWidth / 10,
+        height: window.innerHeight,
+      })
+      expect(code).to.equal(AD_POSITION.ABOVE_THE_FOLD)
+    });
+
+    it('should return the correct position when video is below the fold', function () {
+      const code = utils.getPositionCode({
+        left: window.innerWidth / 10,
+        top: window.innerHeight,
+        width: window.innerWidth - window.innerWidth / 10,
+        height: window.innerHeight / 2,
+      })
+      expect(code).to.equal(AD_POSITION.BELOW_THE_FOLD)
+    });
+
+    it('should return the unkown position when the video is out of bounds', function () {
+      const code = utils.getPositionCode({
+        left: window.innerWidth / 10,
+        top: window.innerHeight,
+        width: window.innerWidth,
+        height: window.innerHeight,
+      })
+      expect(code).to.equal(AD_POSITION.UNKNOWN)
+    });
+  });
+
+  describe('Playlist', function () {
+    const emptyPlayer = {};
+
+    describe('getPlaylistCount', function () {
+      it('should return 1 when playlist is absent', function () {
+        expect(utils.getPlaylistCount(emptyPlayer)).to.be.equal(1);
+      });
+
+      it('should return playlist length', function () {
+        document.body.innerHTML = `
+      <video preload id='test' width="${200}" height="${100}">
+      <source src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4" type="video/mp4">
+      </video>`;
+        const player = videojs('test', {});
+        player.playlist([{
+          sources: { src: 'sample.mp4' }
+        }, {
+          sources: { src: 'sample2.mp4' }
+        }]);
+        expect(utils.getPlaylistCount(player)).to.be.equal(2);
+        player.dispose();
+      });
+    });
+
+    describe('getCurrentPlaylistIndex', function () {
+      it('should return 0 when playlist is absent', function () {
+        expect(utils.getCurrentPlaylistIndex(emptyPlayer)).to.be.equal(0);
+      });
+    });
+
+    describe('getCurrentPlaylistItem', function () {
+      it('should return undefined when playlist is absent', function () {
+        expect(utils.getCurrentPlaylistItem(emptyPlayer)).to.be.undefined;
+      });
+    });
+  });
+
+  describe('Get Media', function () {
+    describe('parseSource', function () {
+      it('should return src property when source is object', function () {
+        expect(utils.parseSource({
+          src: 'test.url',
+          other: 'other'
+        })).to.be.equal('test.url');
+      });
+
+      it('should return source when it is a string', function () {
+        expect(utils.parseSource('test.url')).to.be.equal('test.url');
+      });
+
+      it('should return undefined when not object or string', function () {
+        expect(utils.parseSource(() => {})).to.be.undefined;
+      });
+    });
+
+    describe('getMediaUrl', function () {
+      it('should return undefined when arg is missing', function () {
+        expect(utils.getMediaUrl()).to.be.undefined;
+      });
+
+      it('should parse first index when arg is array', function () {
+        expect(utils.getMediaUrl(['test.url.1', 'test.url.2'])).to.be.equal('test.url.1');
+      });
+    });
+  });
+})
diff --git a/test/spec/modules/videoModule/videoImpressionVerifier_spec.js b/test/spec/modules/videoModule/videoImpressionVerifier_spec.js
new file mode 100644
index 00000000000..58109219a37
--- /dev/null
+++ b/test/spec/modules/videoModule/videoImpressionVerifier_spec.js
@@ -0,0 +1,112 @@
+import { baseImpressionVerifier, PB_PREFIX } from 'modules/videoModule/videoImpressionVerifier.js';
+
+let trackerMock;
+trackerMock = {
+  store: sinon.spy(),
+  remove: sinon.spy()
+}
+
+describe('Base Impression Verifier', function() {
+  describe('trackBid', function () {
+    it('should generate uuid', function () {
+      const baseVerifier = baseImpressionVerifier(trackerMock);
+      const uuid = baseVerifier.trackBid({});
+      expect(uuid.substring(0, 3)).to.equal(PB_PREFIX);
+      expect(uuid.length).to.be.lessThan(16);
+    });
+  });
+
+  describe('getBidIdentifiers', function () {
+    it('should match ad id to uuid', function () {
+
+    });
+  });
+});
+
+/*
+const adUnitCode = 'test_ad_unit_code';
+const sampleBid = {
+  adId: 'test_ad_id',
+  adUnitCode,
+  vastUrl: 'test_ad_url'
+};
+const sampleAdUnit = {
+  code: adUnitCode,
+};
+
+const expectedImpressionUrl = 'test_impression_url';
+const expectedImpressionId = 'test_impression_id';
+const expectedErrorUrl = 'test_error_url';
+const expectedVastXml = 'test_xml';
+
+it('should not modify the bid\'s adXml when the tracking config is omitted', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: null } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  bidAdjustmentCb(sampleBid);
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.false;
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.false;
+});
+
+it('should request a vast wrapper when only an ad url is provided', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: { } } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  bidAdjustmentCb(sampleBid);
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.false;
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.true;
+});
+
+it('should request the addition of tracking nodes when an ad xml is provided', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: { } } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  const bid = Object.assign({}, sampleBid, { vastXml: 'test_xml' });
+  bidAdjustmentCb(bid);
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.true;
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.false;
+});
+
+it('should pass the tracking information as args to the xml editing function', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: {
+    impression: {
+      url: expectedImpressionUrl,
+      id: expectedImpressionId
+    },
+    error: {
+      url: expectedErrorUrl
+    }
+  } } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  const bid = Object.assign({}, sampleBid, { vastXml: expectedVastXml });
+  bidAdjustmentCb(bid);
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.true;
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.calledWith(expectedVastXml, expectedImpressionUrl, expectedImpressionId, expectedErrorUrl))
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.false;
+});
+
+it('should generate the impression id when not specified in config', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: {
+    impression: {
+      url: expectedImpressionUrl,
+    },
+    error: {
+      url: expectedErrorUrl
+    }
+  } } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  const bid = Object.assign({}, sampleBid, { vastXml: expectedVastXml });
+  bidAdjustmentCb(bid);
+  const expectedGeneratedId = sampleBid.adId + '-impression';
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.true;
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.calledWith(expectedVastXml, expectedImpressionUrl, expectedGeneratedId, expectedErrorUrl))
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.false;
+});
+*/
diff --git a/test/spec/modules/videoNowBidAdapter_spec.js b/test/spec/modules/videoNowBidAdapter_spec.js
deleted file mode 100644
index a419c73456b..00000000000
--- a/test/spec/modules/videoNowBidAdapter_spec.js
+++ /dev/null
@@ -1,599 +0,0 @@
-import { expect } from 'chai'
-import { spec } from 'modules/videoNowBidAdapter.js'
-import { replaceAuctionPrice } from 'src/utils.js'
-import * as utils from 'src/utils.js';
-
-// childNode.remove polyfill for ie11
-// suggested by: https://developer.mozilla.org/en-US/docs/Web/API/ChildNode/remove
-
-// from:https://github.com/jserz/js_piece/blob/master/DOM/ChildNode/remove()/remove().md
-(function (arr) {
-  arr.forEach(function (item) {
-    if (item.hasOwnProperty('remove')) {
-      return;
-    }
-    Object.defineProperty(item, 'remove', {
-      configurable: true,
-      enumerable: true,
-      writable: true,
-      value: function remove() {
-        if (this.parentNode === null) {
-          return;
-        }
-        this.parentNode.removeChild(this);
-      }
-    });
-  });
-})([Element.prototype, CharacterData.prototype, DocumentType.prototype]);
-
-const placementId = 'div-gpt-ad-1438287399331-1'
-const LS_ITEM_NAME = 'videonow-config'
-
-const getValidServerResponse = () => {
-  const serverResponse = {
-    body: {
-      id: '111-111',
-      bidid: '2955a162-699e-4811-ce88-5c3ac973e73c',
-      cur: 'RUB',
-      seatbid: [
-        {
-          bid: [
-            {
-              id: 'e3bf2b82e3e9485113fad6c9b27f8768.1',
-              impid: '1',
-              price: 10.97,
-              nurl: 'https://localhost:8086/event/nurl',
-              netRevenue: false,
-              ttl: 800,
-              adm: '<VAST></VAST>',
-              crid: 'e3bf2b82e3e9485113fad6c9b27f8768.1',
-              h: 640,
-              w: 480,
-              ext: {
-                init: 'https://localhost:8086/vn_init.js',
-                module: {
-                  min: 'https://localhost:8086/vn_module.js',
-                  log: 'https://localhost:8086/vn_module.js?log=1'
-                },
-                format: {
-                  name: 'flyRoll',
-                },
-              },
-
-            },
-          ],
-          group: 0,
-        },
-      ],
-      price: 10,
-      ext: {
-        placementId,
-        pixels: [
-          'https://localhost:8086/event/pxlcookiematching?uiid=1',
-          'https://localhost:8086/event/pxlcookiematching?uiid=2',
-        ],
-        iframes: [
-          'https://localhost:8086/event/ifrcookiematching?uiid=1',
-          'https://localhost:8086/event/ifrcookiematching?uiid=2',
-        ],
-      },
-    },
-    headers: {},
-  }
-
-  return JSON.parse(JSON.stringify(serverResponse))
-}
-
-describe('videonowAdapterTests', function() {
-  describe('bidRequestValidity', function() {
-    it('bidRequest with pId', function() {
-      expect(spec.isBidRequestValid({
-        bidder: 'videonow',
-        params: {
-          pId: '86858',
-        },
-      })).to.equal(true)
-    })
-
-    it('bidRequest without pId', function() {
-      expect(spec.isBidRequestValid({
-        bidder: 'videonow',
-        params: {
-          nomater: 86858,
-        },
-      })).to.equal(false)
-
-      it('bidRequest is empty', function() {
-        expect(spec.isBidRequestValid({})).to.equal(false)
-      })
-
-      it('bidRequest is undefned', function() {
-        expect(spec.isBidRequestValid(undefined)).to.equal(false)
-      })
-    })
-
-    describe('bidRequest', function() {
-      const validBidRequests = [
-        {
-          bidder: 'videonow',
-          params: {
-            pId: '1',
-            placementId,
-            url: 'https://localhost:8086/bid?p=exists',
-            bidFloor: 10,
-            cur: 'RUB'
-          },
-          crumbs: {
-            pubcid: 'feded041-35dd-4b54-979a-6d7805abfa75',
-          },
-          mediaTypes: {
-            banner: {
-              sizes: [[640, 480], [320, 200]]
-            },
-          },
-          adUnitCode: 'test-ad',
-          transactionId: '676403c7-09c9-4b56-be82-e7cae81f40b9',
-          sizes: [[640, 480], [320, 200]],
-          bidId: '268c309f46390d',
-          bidderRequestId: '1dfdd514c36ef6',
-          auctionId: '4d523546-889a-4029-9a79-13d3c69f9922',
-          src: 'client',
-          bidRequestsCount: 1,
-        },
-      ]
-
-      const bidderRequest = {
-        bidderCode: 'videonow',
-        auctionId: '4d523546-889a-4029-9a79-13d3c69f9922',
-        bidderRequestId: '1dfdd514c36ef6',
-        bids: [
-          {
-            bidder: 'videonow',
-            params: {
-              pId: '1',
-              placementId,
-              url: 'https://localhost:8086/bid',
-              bidFloor: 10,
-              cur: 'RUB',
-            },
-            crumbs: {
-              pubcid: 'feded041-35dd-4b54-979a-6d7805abfa75',
-            },
-            mediaTypes: {
-              banner: {
-                sizes: [[640, 480], [320, 200]],
-              },
-            },
-            adUnitCode: 'test-ad',
-            transactionId: '676403c7-09c9-4b56-be82-e7cae81f40b9',
-            sizes: [[640, 480], [320, 200]],
-            bidId: '268c309f46390d',
-            bidderRequestId: '1dfdd514c36ef6',
-            auctionId: '4d523546-889a-4029-9a79-13d3c69f9922',
-            src: 'client',
-            bidRequestsCount: 1,
-          },
-        ],
-        auctionStart: 1565794308584,
-        timeout: 3000,
-        refererInfo: {
-          referer: 'https://localhost:8086/page',
-          reachedTop: true,
-          numIframes: 0,
-          stack: [
-            'https://localhost:8086/page',
-          ],
-        },
-        start: 1565794308589,
-      }
-
-      const requests = spec.buildRequests(validBidRequests, bidderRequest)
-      const request = (requests && requests.length && requests[0]) || {}
-
-      it('bidRequest count', function() {
-        expect(requests.length).to.equal(1)
-      })
-
-      it('bidRequest method', function() {
-        expect(request.method).to.equal('POST')
-      })
-
-      it('bidRequest url', function() {
-        expect(request.url).to.equal('https://localhost:8086/bid?p=exists&profile_id=1')
-      })
-
-      it('bidRequest data', function() {
-        const data = request.data
-        expect(data.aid).to.be.eql(validBidRequests[0].params.aid)
-        expect(data.id).to.be.eql(validBidRequests[0].bidId)
-        expect(data.sizes).to.be.eql(validBidRequests[0].sizes)
-      })
-
-      describe('bidRequest advanced', function() {
-        const bidderRequestEmptyParamsAndExtParams = {
-          bidder: 'videonow',
-          params: {
-            pId: '1',
-          },
-          ext: {
-            p1: 'ext1',
-            p2: 'ext2',
-          },
-        }
-
-        it('bidRequest count', function() {
-          const requests = spec.buildRequests([bidderRequestEmptyParamsAndExtParams], bidderRequest)
-          expect(requests.length).to.equal(1)
-        })
-
-        it('bidRequest default url', function() {
-          const requests = spec.buildRequests([bidderRequestEmptyParamsAndExtParams], bidderRequest)
-          const request = (requests && requests.length && requests[0]) || {}
-          expect(request.url).to.equal('https://bidder.videonow.ru/prebid?profile_id=1')
-        })
-
-        it('bidRequest default currency', function() {
-          const requests = spec.buildRequests([bidderRequestEmptyParamsAndExtParams], bidderRequest)
-          const request = (requests && requests.length && requests[0]) || {}
-          const data = (request && request.data) || {}
-          expect(data.cur).to.equal('RUB')
-        })
-
-        it('bidRequest ext parameters ', function() {
-          const requests = spec.buildRequests([bidderRequestEmptyParamsAndExtParams], bidderRequest)
-          const request = (requests && requests.length && requests[0]) || {}
-          const data = (request && request.data) || {}
-          expect(data['ext_p1']).to.equal('ext1')
-          expect(data['ext_p2']).to.equal('ext2')
-        })
-
-        it('bidRequest without params', function() {
-          const bidderReq = {
-            bidder: 'videonow',
-          }
-          const requests = spec.buildRequests([bidderReq], bidderRequest)
-          expect(requests.length).to.equal(1)
-        })
-      })
-    })
-
-    describe('onBidWon', function() {
-      const cpm = 10
-      const nurl = 'https://fakedomain.nld?price=${AUCTION_PRICE}'
-      const imgSrc = replaceAuctionPrice(nurl, cpm)
-
-      beforeEach(function() {
-        sinon.stub(utils, 'triggerPixel')
-      })
-
-      afterEach(function() {
-        utils.triggerPixel.restore()
-      })
-
-      it('Should not create nurl pixel if bid is undefined', function() {
-        spec.onBidWon()
-        expect(utils.triggerPixel.called).to.equal(false);
-      })
-
-      it('Should not create nurl pixel if bid does not contains nurl', function() {
-        spec.onBidWon({})
-        expect(utils.triggerPixel.called).to.equal(false);
-      })
-
-      it('Should create nurl pixel if bid nurl', function() {
-        spec.onBidWon({ nurl, cpm })
-        expect(utils.triggerPixel.calledWith(imgSrc)).to.equal(true);
-      })
-    })
-
-    describe('getUserSyncs', function() {
-      it('Should return an empty array if not get serverResponses', function() {
-        expect(spec.getUserSyncs({}).length).to.equal(0)
-      })
-
-      it('Should return an empty array if get serverResponses as empty array', function() {
-        expect(spec.getUserSyncs({}, []).length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponses has no body', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body
-        const syncs = spec.getUserSyncs({}, [serverResp])
-        expect(syncs.length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponses has no ext', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.ext
-        const syncs = spec.getUserSyncs({}, [serverResp])
-        expect(syncs.length).to.equal(0)
-      })
-
-      it('Should return an array', function() {
-        const serverResp = getValidServerResponse()
-        const syncs = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, [serverResp])
-        expect(syncs.length).to.equal(4)
-      })
-
-      it('Should return pixels', function() {
-        const serverResp = getValidServerResponse()
-        const syncs = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [serverResp])
-        expect(syncs.length).to.equal(2)
-        expect(syncs[0].type).to.equal('image')
-        expect(syncs[1].type).to.equal('image')
-      })
-
-      it('Should return iframes', function() {
-        const serverResp = getValidServerResponse()
-        const syncs = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [serverResp])
-        expect(syncs.length).to.equal(2)
-        expect(syncs[0].type).to.equal('iframe')
-        expect(syncs[1].type).to.equal('iframe')
-      })
-    })
-
-    describe('interpretResponse', function() {
-      const bidRequest = {
-        method: 'POST',
-        url: 'https://localhost:8086/bid?profile_id=1',
-        data: {
-          id: '217b8ab59a18e8',
-          cpm: 10,
-          sizes: [[640, 480], [320, 200]],
-          cur: 'RUB',
-          placementId,
-          ref: 'https://localhost:8086/page',
-        },
-      }
-
-      it('Should have only one bid', function() {
-        const serverResponse = getValidServerResponse()
-        const result = spec.interpretResponse(serverResponse, bidRequest)
-        expect(result.length).to.equal(1)
-      })
-
-      it('Should have required keys', function() {
-        const serverResponse = getValidServerResponse()
-        const result = spec.interpretResponse(serverResponse, bidRequest)
-        const bid = serverResponse.body.seatbid[0].bid[0]
-        const res = result[0]
-        expect(res.requestId).to.be.eql(bidRequest.data.id)
-        expect(res.cpm).to.be.eql(bid.price)
-        expect(res.creativeId).to.be.eql(bid.crid)
-        expect(res.netRevenue).to.be.a('boolean')
-        expect(res.ttl).to.be.eql(bid.ttl)
-        expect(res.renderer).to.be.a('Object')
-        expect(res.renderer.render).to.be.a('function')
-      })
-
-      it('Should return an empty array if empty or no bids in response', function() {
-        expect(spec.interpretResponse({ body: '' }, {}).length).to.equal(0)
-      })
-
-      it('Should return an empty array if bidRequest\'s data is absent', function() {
-        const serverResponse = getValidServerResponse()
-        expect(spec.interpretResponse(serverResponse, undefined).length).to.equal(0)
-      })
-
-      it('Should return an empty array if bidRequest\'s data is not contains bidId ', function() {
-        const serverResponse = getValidServerResponse()
-        expect(spec.interpretResponse(serverResponse, { data: {} }).length).to.equal(0)
-      })
-
-      it('Should return an empty array if bidRequest\'s data bidId is undefined', function() {
-        const serverResponse = getValidServerResponse()
-        expect(spec.interpretResponse(serverResponse, { data: { id: null } }).length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse do not contains seatbid', function() {
-        expect(spec.interpretResponse({ body: {} }, bidRequest).length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s seatbid is empty', function() {
-        expect(spec.interpretResponse({ body: { seatbid: [] } }, bidRequest).length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s placementId is undefined', function() {
-        expect(spec.interpretResponse({ body: { seatbid: [1, 2] } }, bidRequest).length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s id in the bid is undefined', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.seatbid[0].bid[0].id
-        let res = spec.interpretResponse(serverResp, bidRequest)
-        expect(res.length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s price in the bid is undefined', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.seatbid[0].bid[0].price
-        const res = spec.interpretResponse(serverResp, bidRequest)
-        expect(res.length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s price in the bid is 0', function() {
-        const serverResp = getValidServerResponse()
-        serverResp.body.seatbid[0].bid[0].price = 0
-        const res = spec.interpretResponse(serverResp, bidRequest)
-
-        expect(res.length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s init in the bid\'s ext is undefined', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.seatbid[0].bid[0].ext.init
-        const res = spec.interpretResponse(serverResp, bidRequest)
-
-        expect(res.length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s module in the bid\'s ext is undefined', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.seatbid[0].bid[0].ext.module
-        const res = spec.interpretResponse(serverResp, bidRequest)
-
-        expect(res.length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s adm in the bid is undefined', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.seatbid[0].bid[0].adm
-        const res = spec.interpretResponse(serverResp, bidRequest)
-
-        expect(res.length).to.equal(0)
-      })
-
-      it('Should return an empty array if serverResponse\'s the bid\'s ext is undefined', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.seatbid[0].bid[0].ext
-        const res = spec.interpretResponse(serverResp, bidRequest)
-
-        expect(res.length).to.equal(0)
-      })
-
-      it('Default ttl is 300', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.seatbid[0].bid[0].ttl
-        const res = spec.interpretResponse(serverResp, bidRequest)
-        expect(res.length).to.equal(1)
-        expect(res[0].ttl).to.equal(300)
-      })
-
-      it('Default netRevenue is true', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.seatbid[0].bid[0].netRevenue
-        const res = spec.interpretResponse(serverResp, bidRequest)
-        expect(res.length).to.equal(1)
-        expect(res[0].netRevenue).to.be.true;
-      })
-
-      it('Default currency is RUB', function() {
-        const serverResp = getValidServerResponse()
-        delete serverResp.body.cur
-        const res = spec.interpretResponse(serverResp, bidRequest)
-        expect(res.length).to.equal(1)
-        expect(res[0].currency).to.equal('RUB')
-      })
-
-      describe('different module paths', function() {
-        beforeEach(function() {
-          window.localStorage && localStorage.setItem(LS_ITEM_NAME, '{}')
-        })
-
-        afterEach(function() {
-          const serverResp = getValidServerResponse()
-          const { module: { log, min }, init } = serverResp.body.seatbid[0].bid[0].ext
-          remove(init)
-          remove(log)
-          remove(min)
-
-          function remove(src) {
-            if (!src) return
-            const d = document.querySelectorAll(`script[src^="${src}"]`)
-            // using the Array.prototype.forEach as a workaround for IE11...
-            // see https://developer.mozilla.org/en-US/docs/Web/API/NodeList
-            d && d.length && Array.prototype.forEach.call(d, el => el && el.remove())
-          }
-        })
-
-        it('should use prod module by default', function() {
-          const serverResp = getValidServerResponse()
-          const res = spec.interpretResponse(serverResp, bidRequest)
-          expect(res.length).to.equal(1)
-
-          const renderer = res[0].renderer
-          expect(renderer).to.be.an('object')
-          expect(renderer.url).to.equal(serverResp.body.seatbid[0].bid[0].ext.module.min)
-        })
-
-        it('should use "log" module if "prod" is not exists', function() {
-          const serverResp = getValidServerResponse()
-          delete serverResp.body.seatbid[0].bid[0].ext.module.min
-          const res = spec.interpretResponse(serverResp, bidRequest)
-          expect(res.length).to.equal(1)
-
-          const renderer = res[0].renderer
-          expect(renderer).to.be.an('object')
-          expect(renderer.url).to.equal(serverResp.body.seatbid[0].bid[0].ext.module.log)
-        })
-
-        it('should correct combine src for init', function() {
-          const serverResp = getValidServerResponse()
-
-          const src = `${serverResp.body.seatbid[0].bid[0].ext.init}?profileId=1`
-          const placementElement = document.createElement('div')
-          placementElement.setAttribute('id', placementId)
-
-          const resp = spec.interpretResponse(serverResp, bidRequest)
-          expect(resp.length).to.equal(1)
-
-          const renderer = resp[0].renderer
-          expect(renderer).to.be.an('object')
-
-          document.body.appendChild(placementElement)
-
-          renderer.render()
-
-          // const res = document.querySelectorAll(`script[src="${src}"]`)
-          // expect(res.length).to.equal(1)
-        })
-
-        it('should correct combine src for init if init url contains "?"', function() {
-          const serverResp = getValidServerResponse()
-
-          serverResp.body.seatbid[0].bid[0].ext.init += '?div=1'
-          const src = `${serverResp.body.seatbid[0].bid[0].ext.init}&profileId=1`
-
-          const placementElement = document.createElement('div')
-          placementElement.setAttribute('id', placementId)
-
-          const resp = spec.interpretResponse(serverResp, bidRequest)
-          expect(resp.length).to.equal(1)
-
-          const renderer = resp[0].renderer
-          expect(renderer).to.be.an('object')
-
-          document.body.appendChild(placementElement)
-
-          renderer.render()
-
-          // const res = document.querySelectorAll(`script[src="${src}"]`)
-          // expect(res.length).to.equal(1)
-        })
-      })
-
-      describe('renderer object', function() {
-        it('execute renderer.render() should create window.videonow object', function() {
-          const serverResp = getValidServerResponse()
-          const res = spec.interpretResponse(serverResp, bidRequest)
-          expect(res.length).to.equal(1)
-
-          const renderer = res[0].renderer
-          expect(renderer).to.be.an('object')
-          expect(renderer.render).to.a('function')
-
-          const doc = window.document
-          const placementElement = doc.createElement('div')
-          placementElement.setAttribute('id', placementId)
-          doc.body.appendChild(placementElement)
-
-          renderer.render()
-          expect(window.videonow).to.an('object')
-        })
-      })
-
-      it('execute renderer.render() should not create window.videonow object if placement element not found', function() {
-        const serverResp = getValidServerResponse()
-        const res = spec.interpretResponse(serverResp, bidRequest)
-        expect(res.length).to.equal(1)
-
-        const renderer = res[0].renderer
-        expect(renderer).to.be.an('object')
-        expect(renderer.render).to.a('function')
-
-        renderer.render()
-        expect(window.videonow).to.be.undefined
-      })
-    })
-  })
-})
diff --git a/test/spec/modules/videobyteBidAdapter_spec.js b/test/spec/modules/videobyteBidAdapter_spec.js
new file mode 100644
index 00000000000..f7ea0698956
--- /dev/null
+++ b/test/spec/modules/videobyteBidAdapter_spec.js
@@ -0,0 +1,626 @@
+import { expect } from 'chai';
+import { spec } from 'modules/videobyteBidAdapter.js';
+
+describe('VideoByteBidAdapter', function () {
+  let bidRequest;
+  let bidderRequest = {
+    'bidderCode': 'videobyte',
+    'auctionId': 'e158486f-8c7f-472f-94ce-b0cbfbb50ab4',
+    'bidderRequestId': '1e498b84fffc39',
+    'bids': bidRequest,
+    'auctionStart': 1520001292880,
+    'timeout': 3000,
+    'start': 1520001292884,
+    'doneCbCallCount': 0,
+    'refererInfo': {
+      'numIframes': 1,
+      'reachedTop': true,
+      'referer': 'test.com'
+    }
+  };
+  let mockConfig;
+
+  beforeEach(function () {
+    bidRequest = {
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[640, 480]],
+        }
+      },
+      bidder: 'videobyte',
+      sizes: [640, 480],
+      bidId: '30b3efwfwe1e',
+      adUnitCode: 'video1',
+      params: {
+        video: {
+          playerWidth: 640,
+          playerHeight: 480,
+          mimes: ['video/mp4', 'application/javascript'],
+          protocols: [2, 5],
+          api: [2],
+          position: 1,
+          delivery: [2],
+          sid: 134,
+          rewarded: 1,
+          placement: 1,
+          hp: 1,
+          inventoryid: 123
+        },
+        site: {
+          id: 1,
+          page: 'https://test.com',
+          referrer: 'http://test.com'
+        },
+        pubId: 'vb12345'
+      }
+    };
+  });
+
+  describe('spec.isBidRequestValid', function () {
+    it('should return false when mediaTypes is empty', function () {
+      bidRequest.mediaTypes = {};
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return true (skip validations) when e2etest = true', function () {
+      bidRequest.params.video = {
+        e2etest: true
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true when mediaTypes.video has all mandatory params', function () {
+      bidRequest.mediaTypes.video = {
+        context: 'instream',
+        playerSize: [[640, 480]],
+        mimes: ['video/mp4', 'application/javascript'],
+      }
+      bidRequest.params.video = {};
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true when params.video has all override params instead of mediaTypes.video', function () {
+      bidRequest.mediaTypes.video = {
+        context: 'instream'
+      };
+      bidRequest.params.video = {
+        playerSize: [[640, 480]],
+        mimes: ['video/mp4', 'application/javascript']
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true when mimes is passed in params.video', function () {
+      bidRequest.mediaTypes.video = {
+        context: 'instream',
+        playerSize: [[640, 480]]
+      };
+      bidRequest.video = {
+        mimes: ['video/mp4', 'application/javascript']
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return false when both mediaTypes.video and params.video Objects are missing', function () {
+      bidRequest.mediaTypes = {};
+      bidRequest.params = {
+        pubId: 'brxd'
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when both mediaTypes.video and params.video are missing mimes and player size', function () {
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'instream'
+        }
+      };
+      bidRequest.params = {
+        pubId: 'brxd'
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when the "pubId" param is missing', function () {
+      bidRequest.params = {
+        video: {
+          playerWidth: 480,
+          playerHeight: 640,
+          mimes: ['video/mp4', 'application/javascript'],
+        }
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+    it('should return false when the "pubId" param is missing', function () {
+      bidRequest.params = {
+        video: {
+          playerWidth: 480,
+          playerHeight: 640,
+          mimes: ['video/mp4', 'application/javascript'],
+        }
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when no bid params are passed', function () {
+      bidRequest.params = {};
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  });
+
+  describe('spec.buildRequests', function () {
+    it('should create a POST request for every bid', function () {
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(spec.ENDPOINT + '?pid=' + bidRequest.params.pubId);
+    });
+
+    it('should attach request data', function () {
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      const [width, height] = bidRequest.sizes;
+      const VERSION = '1.0.0';
+      expect(data.imp[0].video.w).to.equal(width);
+      expect(data.imp[0].video.h).to.equal(height);
+      expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
+      expect(data.ext.prebidver).to.equal('$prebid.version$');
+      expect(data.ext.adapterver).to.equal(spec.VERSION);
+    });
+
+    it('should set pubId to e2etest when bid.params.video.e2etest = true', function () {
+      bidRequest.params.video.e2etest = true;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(spec.ENDPOINT + '?pid=e2etest');
+    });
+
+    it('should attach End 2 End test data', function () {
+      bidRequest.params.video.e2etest = true;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).to.not.exist;
+      expect(data.imp[0].video.w).to.equal(640);
+      expect(data.imp[0].video.h).to.equal(480);
+    });
+
+    it('should send Global schain', function () {
+      bidRequest.params.video.sid = null;
+      const globalSchain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'some-platform.com',
+          sid: '111111',
+          rid: bidRequest.id,
+          hp: 1
+        }]
+      };
+      bidRequest.schain = globalSchain;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      const schain = data.source.ext.schain;
+      expect(schain.nodes.length).to.equal(1);
+      expect(schain).to.deep.equal(globalSchain);
+    });
+
+    describe('content object validations', function () {
+      it('should not accept content object if value is Undefined ', function () {
+        bidRequest.params.video.content = null;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should not accept content object if value is is Array ', function () {
+        bidRequest.params.video.content = [];
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should not accept content object if value is Number ', function () {
+        bidRequest.params.video.content = 123456;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should not accept content object if value is String ', function () {
+        bidRequest.params.video.content = 'keyValuePairs';
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should not accept content object if value is Boolean ', function () {
+        bidRequest.params.video.content = true;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should accept content object if value is Object ', function () {
+        bidRequest.params.video.content = {};
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.a('object');
+      });
+
+      it('should not append unsupported content object keys', function () {
+        bidRequest.params.video.content = {
+          fake: 'news',
+          unreal: 'param',
+          counterfit: 'data'
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.empty;
+      });
+
+      it('should not append content string parameters if value is not string ', function () {
+        bidRequest.params.video.content = {
+          id: 1234,
+          title: ['Title'],
+          series: ['Series'],
+          season: ['Season'],
+          genre: ['Genre'],
+          contentrating: {1: 'C-Rating'},
+          language: {1: 'EN'}
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.a('object');
+        expect(data.site.content).to.be.empty
+      });
+      it('should not append content Number parameters if value is not Number ', function () {
+        bidRequest.params.video.content = {
+          episode: '1',
+          context: 'context',
+          livestream: {0: 'stream'},
+          len: [360],
+          prodq: [1],
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.a('object');
+        expect(data.site.content).to.be.empty
+      });
+      it('should not append content Array parameters if value is not Array ', function () {
+        bidRequest.params.video.content = {
+          cat: 'categories',
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.a('object');
+        expect(data.site.content).to.be.empty
+      });
+      it('should not append content ext if value is not Object ', function () {
+        bidRequest.params.video.content = {
+          ext: 'content.ext',
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.be.a('object');
+        expect(data.site.content).to.be.empty
+      });
+      it('should append supported parameters if value match validations ', function () {
+        bidRequest.params.video.content = {
+          id: '1234',
+          title: 'Title',
+          series: 'Series',
+          season: 'Season',
+          cat: [
+            'IAB1'
+          ],
+          genre: 'Genre',
+          contentrating: 'C-Rating',
+          language: 'EN',
+          episode: 1,
+          prodq: 1,
+          context: 1,
+          livestream: 0,
+          len: 360,
+          ext: {}
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = JSON.parse(requests[0].data);
+        expect(data.site.content).to.deep.equal(bidRequest.params.video.content);
+      });
+    });
+  });
+  describe('price floor module validations', function () {
+    beforeEach(function () {
+      bidRequest.getFloor = (floorObj) => {
+        return {
+          floor: bidRequest.floors.values[floorObj.mediaType + '|640x480'],
+          currency: floorObj.currency,
+          mediaType: floorObj.mediaType
+        }
+      }
+    });
+
+    it('should get bidfloor from getFloor method', function () {
+      bidRequest.params.cur = 'EUR';
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'video|640x480': 5.55
+        }
+      };
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(5.55);
+    });
+    it('should get bidfloor from params method', function () {
+      bidRequest.params.bidfloor = 4.0;
+      bidRequest.params.currency = 'EUR';
+      bidRequest.getFloor = null;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(4.0);
+      expect(data.imp[0].bidfloorcur).to.equal('EUR');
+    });
+
+    it('should use adUnit/module currency & floor instead of bid.params.bidfloor', function () {
+      bidRequest.params.cur = 'EUR';
+      bidRequest.params.bidfloor = 3.33;
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'video|640x480': 5.55
+        }
+      };
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(5.55);
+    });
+
+    it('should load video floor when multi-format adUnit is present', function () {
+      bidRequest.params.cur = 'EUR';
+      bidRequest.mediaTypes.banner = {
+        sizes: [
+          [640, 480]
+        ]
+      };
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'banner|640x480': 2.22,
+          'video|640x480': 9.99
+        }
+      };
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(requests[0].data);
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(9.99);
+    })
+  })
+
+  describe('spec.interpretResponse', function () {
+    it('should return no bids if the response is not valid', function () {
+      const bidResponse = spec.interpretResponse({
+        body: null
+      }, {
+        bidRequest
+      });
+      expect(bidResponse.length).to.equal(0);
+    });
+
+    it('should return no bids if the response "nurl" and "adm" are missing', function () {
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            price: 6.01
+          }]
+        }]
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
+      expect(bidResponse.length).to.equal(0);
+    });
+
+    it('should return no bids if the response "price" is missing', function () {
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            adm: '<VAST></VAST>'
+          }]
+        }]
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
+      expect(bidResponse.length).to.equal(0);
+    });
+
+    it('should return a valid video bid response with just "adm"', function () {
+      const serverResponse = {
+        id: '123',
+        seatbid: [{
+          bid: [{
+            id: 1,
+            adid: 123,
+            crid: 2,
+            price: 6.01,
+            adm: '<VAST></VAST>',
+            adomain: [
+              'videobyte.com'
+            ],
+            w: 640,
+            h: 480
+          }]
+        }],
+        cur: 'USD'
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
+      let o = {
+        requestId: serverResponse.id,
+        bidderCode: spec.code,
+        cpm: serverResponse.seatbid[0].bid[0].price,
+        creativeId: serverResponse.seatbid[0].bid[0].crid,
+        vastXml: serverResponse.seatbid[0].bid[0].adm,
+        width: 640,
+        height: 480,
+        mediaType: 'video',
+        currency: 'USD',
+        ttl: 300,
+        netRevenue: true,
+        meta: {
+          advertiserDomains: ['videobyte.com']
+        }
+      };
+      expect(bidResponse[0]).to.deep.equal(o);
+    });
+
+    it('should default ttl to 300', function () {
+      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
+      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      expect(bidResponse[0].ttl).to.equal(300);
+    });
+    it('should not allow ttl above 3601, default to 300', function () {
+      bidRequest.params.video.ttl = 3601;
+      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
+      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      expect(bidResponse[0].ttl).to.equal(300);
+    });
+    it('should not allow ttl below 1, default to 300', function () {
+      bidRequest.params.video.ttl = 0;
+      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '<VAST></VAST>'}]}], cur: 'USD'};
+      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      expect(bidResponse[0].ttl).to.equal(300);
+    });
+  });
+
+  describe('when GDPR and uspConsent applies', function () {
+    beforeEach(function () {
+      bidderRequest = {
+        'gdprConsent': {
+          'consentString': 'test-gdpr-consent-string',
+          'gdprApplies': true
+        },
+        'uspConsent': '1YN-',
+        'bidderCode': 'videobyte',
+        'auctionId': 'e158486f-8c7f-472f-94ce-b0cbfbb50ab4',
+        'bidderRequestId': '1e498b84fffc39',
+        'bids': bidRequest,
+        'auctionStart': 1520001292880,
+        'timeout': 3000,
+        'start': 1520001292884,
+        'doneCbCallCount': 0,
+        'refererInfo': {
+          'numIframes': 1,
+          'reachedTop': true,
+          'referer': 'test.com'
+        }
+      };
+
+      mockConfig = {
+        consentManagement: {
+          gdpr: {
+            cmpApi: 'iab',
+            timeout: 3000,
+            allowAuctionWithoutConsent: 'cancel'
+          },
+          usp: {
+            cmpApi: 'iab',
+            timeout: 1000,
+            allowAuctionWithoutConsent: 'cancel'
+          }
+        }
+      };
+    });
+
+    it('should send a signal to specify that GDPR applies to this request', function () {
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(request[0].data);
+      expect(data.regs.ext.gdpr).to.equal(1);
+    });
+
+    it('should send the consent string', function () {
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(request[0].data);
+      expect(data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
+    });
+
+    it('should send the uspConsent string', function () {
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(request[0].data);
+      expect(data.regs.ext.us_privacy).to.equal(bidderRequest.uspConsent);
+    });
+
+    it('should send the uspConsent and GDPR ', function () {
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const data = JSON.parse(request[0].data);
+      expect(data.regs.ext.gdpr).to.equal(1);
+      expect(data.regs.ext.us_privacy).to.equal(bidderRequest.uspConsent);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const ortbResponse = {
+      'body': {
+        'ext': {
+          'usersync': {
+            'sovrn': {
+              'status': 'none',
+              'syncs': [
+                {
+                  'url': 'urlsovrn',
+                  'type': 'iframe'
+                }
+              ]
+            },
+            'appnexus': {
+              'status': 'none',
+              'syncs': [
+                {
+                  'url': 'urlappnexus',
+                  'type': 'pixel'
+                }
+              ]
+            }
+          }
+        }
+      }
+    };
+    it('handles no parameters', function () {
+      let opts = spec.getUserSyncs({});
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+    it('returns non if sync is not allowed', function () {
+      let opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
+
+      expect(opts).to.be.an('array').that.is.empty;
+    });
+
+    it('iframe sync enabled should return results', function () {
+      let opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [ortbResponse]);
+
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('iframe');
+      expect(opts[0].url).to.equal(ortbResponse.body.ext.usersync['sovrn'].syncs[0].url);
+    });
+
+    it('pixel sync enabled should return results', function () {
+      let opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [ortbResponse]);
+
+      expect(opts.length).to.equal(1);
+      expect(opts[0].type).to.equal('image');
+      expect(opts[0].url).to.equal(ortbResponse.body.ext.usersync['appnexus'].syncs[0].url);
+    });
+
+    it('all sync enabled should return only iframe result', function () {
+      let opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, [ortbResponse]);
+
+      expect(opts.length).to.equal(1);
+    });
+  });
+});
diff --git a/test/spec/modules/videofyBidAdapter_spec.js b/test/spec/modules/videofyBidAdapter_spec.js
deleted file mode 100644
index 270eefd1efc..00000000000
--- a/test/spec/modules/videofyBidAdapter_spec.js
+++ /dev/null
@@ -1,253 +0,0 @@
-import { spec } from 'modules/videofyBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import * as utils from '../../../src/utils.js';
-
-const { expect } = require('chai');
-
-describe('Videofy Bid Adapter Test', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'videofy',
-      'params': {
-        'AV_PUBLISHERID': '123456',
-        'AV_CHANNELID': '123456'
-      },
-      'adUnitCode': 'video1',
-      'sizes': [[300, 250], [640, 480]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'requestId': 'a09c66c3-53e3-4428-b296-38fc08e7cd2a',
-      'transactionId': 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        something: 'is wrong'
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bid2Requests = [
-      {
-        'bidder': 'videofy',
-        'params': {
-          'AV_PUBLISHERID': '123456',
-          'AV_CHANNELID': '123456'
-        },
-        'adUnitCode': 'test1',
-        'sizes': [[300, 250], [640, 480]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'requestId': 'a09c66c3-53e3-4428-b296-38fc08e7cd2a',
-        'transactionId': 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
-      }
-    ];
-    let bid1Request = [
-      {
-        'bidder': 'videofy',
-        'params': {
-          'AV_PUBLISHERID': '123456',
-          'AV_CHANNELID': '123456'
-        },
-        'adUnitCode': 'test1',
-        'sizes': [640, 480],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'requestId': 'a09c66c3-53e3-4428-b296-38fc08e7cd2a',
-        'transactionId': 'd6f6b392-54a9-454c-85fb-a2fd882c4a2d',
-      }
-    ];
-
-    it('Test 2 requests', function () {
-      const requests = spec.buildRequests(bid2Requests);
-      expect(requests.length).to.equal(2);
-	  const r1 = requests[0];
-      const d1 = requests[0].data;
-      expect(d1).to.have.property('AV_PUBLISHERID');
-      expect(d1.AV_PUBLISHERID).to.equal('123456');
-      expect(d1).to.have.property('AV_CHANNELID');
-      expect(d1.AV_CHANNELID).to.equal('123456');
-      expect(d1).to.have.property('AV_WIDTH');
-      expect(d1.AV_WIDTH).to.equal(300);
-      expect(d1).to.have.property('AV_HEIGHT');
-      expect(d1.AV_HEIGHT).to.equal(250);
-      expect(d1).to.have.property('AV_URL');
-      expect(d1).to.have.property('cb');
-      expect(d1).to.have.property('s2s');
-      expect(d1.s2s).to.equal('1');
-      expect(d1).to.have.property('pbjs');
-      expect(d1.pbjs).to.equal(1);
-      expect(r1).to.have.property('url');
-      expect(r1.url).to.contain('https://servx.srv-mars.com/api/adserver/vast3/');
-      const r2 = requests[1];
-	  const d2 = requests[1].data;
-      expect(d2).to.have.property('AV_PUBLISHERID');
-      expect(d2.AV_PUBLISHERID).to.equal('123456');
-      expect(d2).to.have.property('AV_CHANNELID');
-      expect(d2.AV_CHANNELID).to.equal('123456');
-      expect(d2).to.have.property('AV_WIDTH');
-      expect(d2.AV_WIDTH).to.equal(640);
-      expect(d2).to.have.property('AV_HEIGHT');
-      expect(d2.AV_HEIGHT).to.equal(480);
-      expect(d2).to.have.property('AV_URL');
-      expect(d2).to.have.property('cb');
-      expect(d2).to.have.property('s2s');
-      expect(d2.s2s).to.equal('1');
-      expect(d2).to.have.property('pbjs');
-      expect(d2.pbjs).to.equal(1);
-      expect(r2).to.have.property('url');
-      expect(r2.url).to.contain('https://servx.srv-mars.com/api/adserver/vast3/');
-    });
-
-    it('Test 1 request', function () {
-      const requests = spec.buildRequests(bid1Request);
-      expect(requests.length).to.equal(1);
-      const r = requests[0];
-      const d = requests[0].data;
-      expect(d).to.have.property('AV_PUBLISHERID');
-      expect(d.AV_PUBLISHERID).to.equal('123456');
-      expect(d).to.have.property('AV_CHANNELID');
-      expect(d.AV_CHANNELID).to.equal('123456');
-      expect(d).to.have.property('AV_WIDTH');
-      expect(d.AV_WIDTH).to.equal(640);
-      expect(d).to.have.property('AV_HEIGHT');
-      expect(d.AV_HEIGHT).to.equal(480);
-      expect(d).to.have.property('AV_URL');
-      expect(d).to.have.property('cb');
-      expect(d).to.have.property('s2s');
-      expect(d.s2s).to.equal('1');
-      expect(d).to.have.property('pbjs');
-      expect(d.pbjs).to.equal(1);
-      expect(r).to.have.property('url');
-      expect(r.url).to.contain('https://servx.srv-mars.com/api/adserver/vast3/');
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let bidRequest = {
-      'url': 'https://servx.srv-mars.com/api/adserver/vast3/',
-      'data': {
-        'bidId': '253dcb69fb2577',
-        AV_PUBLISHERID: '55b78633181f4603178b4568',
-        AV_CHANNELID: '55b7904d181f46410f8b4568',
-      }
-    };
-    let serverResponse = {};
-    serverResponse.body = '<?xml version="1.0" encoding="UTF-8"?><VAST version="2.0"><Ad id="FORD"><InLine><AdSystem>FORD</AdSystem><AdTitle>FORD</AdTitle><Impression><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=impression]]></Impression><Creatives><Creative><Linear><Duration>00:00:15</Duration><TrackingEvents><Tracking event="start"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=start]]></Tracking><Tracking event="firstQuartile"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=firstQuartile]]></Tracking><Tracking event="midpoint"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=midpoint]]></Tracking><Tracking event="thirdQuartile"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=thirdQuartile]]></Tracking><Tracking event="complete"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=complete]]></Tracking><Tracking event="mute"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=mute]]></Tracking><Tracking event="unmute"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=unmute]]></Tracking><Tracking event="pause"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=pause]]></Tracking><Tracking event="resume"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=resume]]></Tracking><Tracking event="fullscreen"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=fullscreen]]></Tracking></TrackingEvents><VideoClicks><ClickTracking><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=click]]></ClickTracking><ClickThrough id="VideoHub"><![CDATA[http://www.ford.com/]]></ClickThrough></VideoClicks><MediaFiles><MediaFile height="360" width="480" bitrate="527" type="video/mp4" delivery="progressive"><![CDATA[https://play.aniview.com/clients/ford2.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives><Extensions><Extension type="ANIVIEW"><AdServingData><Asid><![CDATA[55b78d94181f46290f8b456a]]></Asid><Nasid><![CDATA[55b78d94181f46290f8b456a]]></Nasid><Cpm><![CDATA[2]]></Cpm><PlayerSettings><![CDATA[{"vpp":1,"fp":0,"maxRPM":0,"vit":3,"nc":"1","mips":0,"mrqs":0,"vpm":0,"vi":0,"t": 1,"res": 5}]]></PlayerSettings></AdServingData></Extension></Extensions></InLine></Ad></VAST>';
-
-    it('Check bid interpretResponse', function () {
-      const BIDDER_CODE = 'videofy';
-      let bidResponses = spec.interpretResponse(serverResponse, bidRequest);
-      expect(bidResponses.length).to.equal(1);
-      let bidResponse = bidResponses[0];
-      expect(bidResponse.requestId).to.equal(bidRequest.data.bidId);
-      expect(bidResponse.bidderCode).to.equal(BIDDER_CODE);
-      expect(bidResponse.cpm).to.equal('2');
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.currency).to.equal('USD');
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.mediaType).to.equal('video');
-    });
-
-    it('safely handles XML parsing failure from invalid bid response', function () {
-      let invalidServerResponse = {};
-      invalidServerResponse.body = '<Ad id="677477"><InLine></AdSystem></InLine></Ad>';
-
-      let result = spec.interpretResponse(invalidServerResponse, bidRequest);
-      expect(result.length).to.equal(0);
-    });
-
-    it('handles nobid responses', function () {
-      let nobidResponse = {};
-      nobidResponse.body = '<?xml version=\'1.0\' encoding=\'UTF-8\'?><VAST version=\'2.0\'></VAST>';
-
-      let result = spec.interpretResponse(nobidResponse, bidRequest);
-      expect(result.length).to.equal(0);
-    });
-  });
-
-  describe('getUserSyncs', function () {
-    it('Check get sync pixels from response', function () {
-      let pixelUrl = 'https://sync.pixel.url/sync';
-      let pixelEvent = 'inventory';
-      let pixelType = '3';
-      let pixelStr = '{"url":"' + pixelUrl + '", "e":"' + pixelEvent + '", "t":' + pixelType + '}';
-      let bidResponse = '<?xml version="1.0" encoding="UTF-8"?><VAST version="2.0"><Ad id="FORD"><InLine><AdSystem>FORD</AdSystem><AdTitle>FORD</AdTitle><Impression><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=impression]]></Impression><Creatives><Creative><Linear><Duration>00:00:15</Duration><TrackingEvents><Tracking event="start"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=start]]></Tracking><Tracking event="firstQuartile"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=firstQuartile]]></Tracking><Tracking event="midpoint"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=midpoint]]></Tracking><Tracking event="thirdQuartile"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=thirdQuartile]]></Tracking><Tracking event="complete"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=complete]]></Tracking><Tracking event="mute"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=mute]]></Tracking><Tracking event="unmute"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=unmute]]></Tracking><Tracking event="pause"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=pause]]></Tracking><Tracking event="resume"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=resume]]></Tracking><Tracking event="fullscreen"><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=fullscreen]]></Tracking></TrackingEvents><VideoClicks><ClickTracking><![CDATA[http://manage.newmanage.aniview.com/track?d=&cou=IL&cos=Android&r=play.aniview.com&rs=play.aniview.com&sid=71720&t=1549448635&cip=46.116.196.171&sn=&tgt=0&osv=6&bv=&brn=Chrome&wi=640&he=480&app=&AV_PUBLISHERID=55b78633181f4603178b4568&test=&aafaid=&cb=4293171175&asid=55b78d94181f46290f8b456a&pid=55b78633181f4603178b4568&cid=55b7904d181f46410f8b4568&h=b304444f9f8c28b12421555fef487f08e954c587&e=click]]></ClickTracking><ClickThrough id="VideoHub"><![CDATA[http://www.ford.com/]]></ClickThrough></VideoClicks><MediaFiles><MediaFile height="360" width="480" bitrate="527" type="video/mp4" delivery="progressive"><![CDATA[https://play.aniview.com/clients/ford2.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives><Extensions><Extension type="ANIVIEW"><AdServingSync><![CDATA[{"trackers":[' + pixelStr + ']}]]></AdServingSync><AdServingData><Asid><![CDATA[55b78d94181f46290f8b456a]]></Asid><Nasid><![CDATA[55b78d94181f46290f8b456a]]></Nasid><Cpm><![CDATA[2]]></Cpm><PlayerSettings><![CDATA[{"vpp":1,"fp":0,"maxRPM":0,"vit":3,"nc":"1","mips":0,"mrqs":0,"vpm":0,"vi":0,"t": 1,"res": 5}]]></PlayerSettings></AdServingData></Extension></Extensions></InLine></Ad></VAST>';
-      let serverResponse = [
-        {body: bidResponse}
-      ];
-      let syncPixels = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
-      expect(syncPixels.length).to.equal(1);
-      let pixel = syncPixels[0];
-      expect(pixel.url).to.equal(pixelUrl);
-      expect(pixel.type).to.equal('iframe');
-    });
-  });
-
-  describe('on bidWon', function () {
-    beforeEach(function() {
-      sinon.stub(utils, 'triggerPixel');
-    });
-    afterEach(function() {
-      utils.triggerPixel.restore();
-    });
-    it('exists and is a function', () => {
-      expect(spec.onBidWon).to.exist.and.to.be.a('function');
-    });
-    it('should return nothing', function () {
-      var response = spec.onBidWon({});
-      expect(response).to.be.an('undefined')
-      expect(utils.triggerPixel.called).to.equal(true);
-    });
-  });
-
-  describe('on Timeout', function () {
-    beforeEach(function() {
-      sinon.stub(utils, 'triggerPixel');
-    });
-    afterEach(function() {
-      utils.triggerPixel.restore();
-    });
-    it('exists and is a function', () => {
-      expect(spec.onTimeout).to.exist.and.to.be.a('function');
-    });
-    it('should return nothing', function () {
-      var response = spec.onTimeout({});
-      expect(response).to.be.an('undefined')
-      expect(utils.triggerPixel.called).to.equal(true);
-    });
-  });
-
-  describe('on Set Targeting', function () {
-    beforeEach(function() {
-      sinon.stub(utils, 'triggerPixel');
-    });
-    afterEach(function() {
-      utils.triggerPixel.restore();
-    });
-    it('exists and is a function', () => {
-      expect(spec.onSetTargeting).to.exist.and.to.be.a('function');
-    });
-    it('should return nothing', function () {
-      var response = spec.onSetTargeting({});
-      expect(response).to.be.an('undefined')
-      expect(utils.triggerPixel.called).to.equal(true);
-    });
-  });
-});
diff --git a/test/spec/modules/videoheroesBidAdapter_spec.js b/test/spec/modules/videoheroesBidAdapter_spec.js
new file mode 100644
index 00000000000..8f99ca4d17d
--- /dev/null
+++ b/test/spec/modules/videoheroesBidAdapter_spec.js
@@ -0,0 +1,363 @@
+import { expect } from 'chai';
+import { spec } from 'modules/videoheroesBidAdapter.js';
+
+const request_native = {
+  code: 'videoheroes-native-prebid',
+  mediaTypes: {
+    native: {
+      title: {
+        required: true,
+        len: 800
+      },
+      image: {
+        required: true,
+        len: 80
+      },
+      sponsoredBy: {
+        required: true
+      },
+      clickUrl: {
+        required: true
+      },
+      privacyLink: {
+        required: false
+      },
+      body: {
+        required: true
+      },
+      icon: {
+        required: true,
+        sizes: [50, 50]
+      }
+    }
+  },
+  bidder: 'videoheroes',
+  params: {
+    placementId: '1a8d9c22db19906cb8a5fd4518d05f62'
+  }
+};
+
+const request_banner = {
+  code: 'videoheroes-prebid',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]]
+    }
+  },
+  bidder: 'videoheroes',
+  params: {
+    placementId: '1a8d9c22db19906cb8a5fd4518d05f62'
+  }
+}
+
+const bidRequest = {
+  gdprConsent: {
+    consentString: 'HFIDUYFIUYIUYWIPOI87392DSU',
+    gdprApplies: true
+  },
+  uspConsent: 'uspConsentString',
+  bidderRequestId: 'testid',
+  refererInfo: {
+    referer: 'testdomain.com'
+  },
+  timeout: 700
+}
+
+const request_video = {
+  code: 'videoheroes-video-prebid',
+  mediaTypes: { video: {
+    minduration: 1,
+    maxduration: 999,
+    boxingallowed: 1,
+    skip: 0,
+    mimes: [
+      'application/javascript',
+      'video/mp4'
+    ],
+    playerSize: [[768, 1024]],
+    protocols: [
+      2, 3
+    ],
+    linearity: 1,
+    api: [
+      1,
+      2
+    ]
+  }
+  },
+
+  bidder: 'videoheroes',
+  params: {
+    placementId: '1a8d9c22db19906cb8a5fd4518d05f62'
+  }
+
+}
+
+const response_banner = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'banner'
+      }
+    }]
+  }]
+};
+
+const response_video = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: 'admcode',
+      crid: 'crid',
+      ext: {
+        mediaType: 'video'
+      }
+    }],
+  }],
+};
+
+let imgData = {
+  url: `https://example.com/image`,
+  w: 1200,
+  h: 627
+};
+
+const response_native = {
+  id: 'request_id',
+  bidid: 'request_imp_id',
+  seatbid: [{
+    bid: [{
+      id: 'bid_id',
+      impid: 'request_imp_id',
+      price: 5,
+      adomain: ['example.com'],
+      adm: { native:
+          {
+            assets: [
+              {id: 1, title: 'dummyText'},
+              {id: 3, image: imgData},
+              {
+                id: 5,
+                data: {value: 'organization.name'}
+              }
+            ],
+            link: {url: 'example.com'},
+            imptrackers: ['tracker1.com', 'tracker2.com', 'tracker3.com'],
+            jstracker: 'tracker1.com'
+          }
+      },
+      crid: 'crid',
+      ext: {
+        mediaType: 'native'
+      }
+    }],
+  }],
+};
+
+describe('VideoheroesBidAdapter', function() {
+  describe('isBidRequestValid', function() {
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(request_banner)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, request_banner);
+      bid.params = {
+        'IncorrectParam': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('build Native Request', function () {
+    const request = spec.buildRequests([request_native], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://point.contextualadv.com/?t=2&partner=1a8d9c22db19906cb8a5fd4518d05f62');
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      let serverRequest = spec.buildRequests([]);
+      expect(serverRequest).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('build Banner Request', function () {
+    const request = spec.buildRequests([request_banner], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://point.contextualadv.com/?t=2&partner=1a8d9c22db19906cb8a5fd4518d05f62');
+    });
+  });
+
+  describe('build Video Request', function () {
+    const request = spec.buildRequests([request_video], bidRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(request).to.exist;
+      expect(request.method).to.exist;
+      expect(request.url).to.exist;
+      expect(request.data).to.exist;
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(request.url).to.equal('https://point.contextualadv.com/?t=2&partner=1a8d9c22db19906cb8a5fd4518d05f62');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Empty response must return empty array', function() {
+      const emptyResponse = null;
+      let response = spec.interpretResponse(emptyResponse);
+
+      expect(response).to.be.an('array').that.is.empty;
+    })
+
+    it('Should interpret banner response', function () {
+      const bannerResponse = {
+        body: response_banner
+      }
+
+      const expectedBidResponse = {
+        requestId: response_banner.seatbid[0].bid[0].impid,
+        cpm: response_banner.seatbid[0].bid[0].price,
+        width: response_banner.seatbid[0].bid[0].w,
+        height: response_banner.seatbid[0].bid[0].h,
+        ttl: response_banner.ttl || 1200,
+        currency: response_banner.cur || 'USD',
+        netRevenue: true,
+        creativeId: response_banner.seatbid[0].bid[0].crid,
+        dealId: response_banner.seatbid[0].bid[0].dealid,
+        mediaType: 'banner',
+        ad: response_banner.seatbid[0].bid[0].adm
+      }
+
+      let bannerResponses = spec.interpretResponse(bannerResponse);
+
+      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');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.ad).to.equal(expectedBidResponse.ad);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret video response', function () {
+      const videoResponse = {
+        body: response_video
+      }
+
+      const expectedBidResponse = {
+        requestId: response_video.seatbid[0].bid[0].impid,
+        cpm: response_video.seatbid[0].bid[0].price,
+        width: response_video.seatbid[0].bid[0].w,
+        height: response_video.seatbid[0].bid[0].h,
+        ttl: response_video.ttl || 1200,
+        currency: response_video.cur || 'USD',
+        netRevenue: true,
+        creativeId: response_video.seatbid[0].bid[0].crid,
+        dealId: response_video.seatbid[0].bid[0].dealid,
+        mediaType: 'video',
+        vastUrl: response_video.seatbid[0].bid[0].adm
+      }
+
+      let videoResponses = spec.interpretResponse(videoResponse);
+
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.vastUrl).to.equal(expectedBidResponse.vastUrl)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+
+    it('Should interpret native response', function () {
+      const nativeResponse = {
+        body: response_native
+      }
+
+      const expectedBidResponse = {
+        requestId: response_native.seatbid[0].bid[0].impid,
+        cpm: response_native.seatbid[0].bid[0].price,
+        width: response_native.seatbid[0].bid[0].w,
+        height: response_native.seatbid[0].bid[0].h,
+        ttl: response_native.ttl || 1200,
+        currency: response_native.cur || 'USD',
+        netRevenue: true,
+        creativeId: response_native.seatbid[0].bid[0].crid,
+        dealId: response_native.seatbid[0].bid[0].dealid,
+        mediaType: 'native',
+        native: {clickUrl: response_native.seatbid[0].bid[0].adm.native.link.url}
+      }
+
+      let nativeResponses = spec.interpretResponse(nativeResponse);
+
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'native', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      expect(dataItem.native.clickUrl).to.equal(expectedBidResponse.native.clickUrl)
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(expectedBidResponse.currency);
+      expect(dataItem.width).to.equal(expectedBidResponse.width);
+      expect(dataItem.height).to.equal(expectedBidResponse.height);
+    });
+  });
+})
diff --git a/test/spec/modules/videonowBidAdapter_spec.js b/test/spec/modules/videonowBidAdapter_spec.js
new file mode 100644
index 00000000000..c9eb5ba0bbf
--- /dev/null
+++ b/test/spec/modules/videonowBidAdapter_spec.js
@@ -0,0 +1,80 @@
+import {expect} from 'chai';
+import {spec} from 'modules/videonowBidAdapter';
+
+describe('videonowBidAdapter', function () {
+  it('minimal params', function () {
+    expect(spec.isBidRequestValid({
+      bidder: 'videonow',
+      params: {
+        pId: 'advDesktopBillboard'
+      }})).to.equal(true)
+  })
+
+  it('minimal params no placementId', function () {
+    expect(spec.isBidRequestValid({
+      bidder: 'videonow',
+      params: {
+        currency: `GBP`
+      }})).to.equal(false)
+  })
+
+  it('generated_params common case', function () {
+    const bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'videonow',
+      params: {
+        pId: 'advDesktopBillboard',
+        currency: `GBP`
+      },
+      sizes: [[240, 400]]
+    }];
+
+    const request = spec.buildRequests(bidRequestData);
+    const req_data = request[0].data;
+
+    expect(req_data.places[0].id).to.equal(`bid1234`)
+    expect(req_data.places[0].placementId).to.equal(`advDesktopBillboard`)
+    expect(req_data.settings.currency).to.equal(`GBP`)
+    expect(req_data.places[0].sizes[0][0]).to.equal(240);
+    expect(req_data.places[0].sizes[0][1]).to.equal(400);
+  });
+
+  it('response_params common case', function () {
+    const bidRequestData = {
+      data: {
+        bidId: 'bid1234'
+      }
+    };
+
+    const serverResponse = {
+      body: {
+        bids: [
+          {
+            'displayCode': '<html><body>test html</body></html>',
+            'id': '123456',
+            'cpm': 375,
+            'currency': 'RUB',
+            'placementId': 'profileName',
+            'codeType': 'js',
+            'size': {
+              'width': 640,
+              'height': 480
+            }
+          }
+        ]
+      }
+    };
+
+    const bids = spec.interpretResponse(serverResponse, bidRequestData);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.requestId).to.equal('123456')
+    expect(bid.cpm).to.equal(375);
+    expect(bid.currency).to.equal('RUB');
+    expect(bid.width).to.equal(640);
+    expect(bid.height).to.equal(480);
+    expect(bid.ad).to.equal('<html><body>test html</body></html>');
+    expect(bid.creativeId).to.equal(`123456`)
+    expect(bid.netRevenue).to.equal(true);
+  });
+})
diff --git a/test/spec/modules/videoreachBidAdapter_spec.js b/test/spec/modules/videoreachBidAdapter_spec.js
index e5c6b9b30ad..67ad89eac3d 100644
--- a/test/spec/modules/videoreachBidAdapter_spec.js
+++ b/test/spec/modules/videoreachBidAdapter_spec.js
@@ -91,7 +91,8 @@ describe('videoreachBidAdapter', function () {
             'creativeId': '5cb5dc9375c0e',
             'netRevenue': true,
             'currency': 'EUR',
-            'sync': ['https:\/\/SYNC_URL']
+            'sync': ['https:\/\/SYNC_URL'],
+            'adomain': []
           }]
         }
       };
@@ -107,7 +108,10 @@ describe('videoreachBidAdapter', function () {
           ttl: 360,
           ad: '<!-- AD -->',
           requestId: '242d506d4e4f15',
-          creativeId: '5cb5dc9375c0e'
+          creativeId: '5cb5dc9375c0e',
+          meta: {
+            advertiserDomains: []
+          }
         }
       ];
 
diff --git a/test/spec/modules/vidoomyBidAdapter_spec.js b/test/spec/modules/vidoomyBidAdapter_spec.js
new file mode 100644
index 00000000000..61b7f2fad7d
--- /dev/null
+++ b/test/spec/modules/vidoomyBidAdapter_spec.js
@@ -0,0 +1,236 @@
+import { expect } from 'chai';
+import { spec } from 'modules/vidoomyBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { INSTREAM } from '../../../src/video';
+
+const ENDPOINT = `https://d.vidoomy.com/api/rtbserver/prebid/`;
+const PIXELS = ['/test.png', '/test2.png?gdpr={{GDPR}}&gdpr_consent={{GDPR_CONSENT}}']
+
+describe('vidoomyBidAdapter', function() {
+  const adapter = newBidder(spec);
+
+  describe('isBidRequestValid', function () {
+    let bid;
+    beforeEach(() => {
+      bid = {
+        'bidder': 'vidoomy',
+        'params': {
+          pid: '123123',
+          id: '123123',
+          bidfloor: 0.5
+        },
+        'adUnitCode': 'code',
+        'sizes': [[300, 250]]
+      };
+    });
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when pid is empty', function () {
+      bid.params.pid = '';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when bidfloor is invalid', function () {
+      bid.params.bidfloor = 'not a number';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when id is empty', function () {
+      bid.params.id = '';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when mediaType is video with INSTREAM context and lacks playerSize property', function () {
+      bid.params.mediaTypes = {
+        video: {
+          context: INSTREAM
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        'bidder': 'vidoomy',
+        'params': {
+          pid: '123123',
+          id: '123123'
+        },
+        'adUnitCode': 'code',
+        'mediaTypes': {
+          'banner': {
+            'context': 'outstream',
+            'sizes': [[300, 250], [200, 100]]
+          }
+        },
+      },
+      {
+        'bidder': 'vidoomy',
+        'params': {
+          pid: '456456',
+          id: '456456'
+        },
+        'mediaTypes': {
+          'video': {
+            'context': 'outstream',
+            'playerSize': [400, 225],
+          }
+        },
+        'adUnitCode': 'code2',
+      }
+    ];
+
+    let bidderRequest = {
+      refererInfo: {
+        numIframes: 0,
+        reachedTop: true,
+        domain: 'example.com',
+        page: 'http://example.com',
+        stack: ['http://example.com']
+      }
+    };
+
+    const request = spec.buildRequests(bidRequests, bidderRequest);
+
+    it('sends bid request to our endpoint via GET', function () {
+      expect(request[0].method).to.equal('GET');
+      expect(request[1].method).to.equal('GET');
+    });
+
+    it('attaches source and version to endpoint URL as query params', function () {
+      expect(request[0].url).to.equal(ENDPOINT);
+      expect(request[1].url).to.equal(ENDPOINT);
+    });
+
+    it('only accepts first width and height sizes', function () {
+      expect('' + request[0].data.w).to.equal('300');
+      expect('' + request[0].data.h).to.equal('250');
+      expect('' + request[0].data.w).to.not.equal('200');
+      expect('' + request[0].data.h).to.not.equal('100');
+      expect('' + request[1].data.w).to.equal('400');
+      expect('' + request[1].data.h).to.equal('225');
+    });
+
+    it('should send id and pid parameters', function () {
+      expect('' + request[0].data.id).to.equal('123123');
+      expect('' + request[0].data.pid).to.equal('123123');
+      expect('' + request[1].data.id).to.equal('456456');
+      expect('' + request[1].data.pid).to.equal('456456');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const serverResponseVideo = {
+      body: {
+        'vastUrl': 'https:\/\/vpaid.vidoomy.com\/demo-ad\/tag.xml',
+        'mediaType': 'video',
+        'requestId': '123123',
+        'cpm': 3.265,
+        'currency': 'USD',
+        'width': 0,
+        'height': 300,
+        'creativeId': '123123',
+        'dealId': '23cb20aa264b72',
+        'netRevenue': true,
+        'ttl': 60,
+        'meta': {
+          'mediaType': 'video',
+          'rendererUrl': 'https:\/\/vpaid.vidoomy.com\/outstreamplayer\/bundle.js',
+          'advertiserDomains': ['vidoomy.com'],
+          'advertiserId': 123,
+          'advertiserName': 'Vidoomy',
+          'agencyId': null,
+          'agencyName': null,
+          'brandId': null,
+          'brandName': null,
+          'dchain': null,
+          'networkId': null,
+          'networkName': null,
+          'primaryCatId': 'IAB3-1',
+          'secondaryCatIds': null
+        }
+      }
+    }
+
+    const serverResponseBanner = {
+      body: {
+        'ad': '<iframe src=\'https:\/\/vidoomy.com\/render\/ad.html\' width=\'300\' height=\'250\' frameborder=\'0\' scrolling=\'no\' marginheight=\'0\' marginwidth=\'0\' topmargin=\'0\' leftmargin=\'0\'><\/iframe>',
+        'mediaType': 'banner',
+        'requestId': '123123',
+        'cpm': 4.94,
+        'currency': 'USD',
+        'width': 250,
+        'height': 300,
+        'creativeId': '123123',
+        'dealId': '230aa095cea76b',
+        'netRevenue': true,
+        'ttl': 60,
+        'meta': {
+          'mediaType': 'banner',
+          'advertiserDomains': ['vidoomy.com'],
+          'advertiserId': 123,
+          'advertiserName': 'Vidoomy',
+          'agencyId': null,
+          'agencyName': null,
+          'brandId': null,
+          'brandName': null,
+          'dchain': null,
+          'networkId': null,
+          'networkName': null,
+          'primaryCatId': 'IAB3-1',
+          'secondaryCatIds': null
+        },
+        'pixels': PIXELS
+      }
+    }
+
+    it('should get the correct bid response for outstream video, with renderer, an url in ad, and same requestId', function () {
+      const bidRequest = {
+        data: {
+          videoContext: 'outstream'
+        }
+      }
+
+      let result = spec.interpretResponse(serverResponseVideo, bidRequest);
+
+      expect(result[0].renderer).to.not.be.undefined;
+      expect(result[0].ad).to.equal(serverResponseVideo.body.vastUrl);
+      expect(result[0].requestId).to.equal(serverResponseVideo.body.requestId);
+    });
+
+    it('should get the correct bid response for banner with same requestId', function () {
+      const bidRequest = {};
+      let result = spec.interpretResponse(serverResponseBanner, bidRequest);
+
+      expect(result[0].requestId).to.equal(serverResponseBanner.body.requestId);
+    });
+
+    it('should sync user cookies', function () {
+      const GDPR_CONSENT = 'GDPR_TEST'
+      const result = spec.getUserSyncs({
+        pixelEnabled: true
+      }, [serverResponseBanner], { consentString: GDPR_CONSENT, gdprApplies: 1 }, null)
+      expect(result).to.eql([
+        {
+          type: 'image',
+          url: PIXELS[0]
+        },
+        {
+          type: 'image',
+          url: `/test2.png?gdpr=1&gdpr_consent=${GDPR_CONSENT}`
+        }
+      ])
+    });
+  });
+});
diff --git a/test/spec/modules/viewdeosDXBidAdapter_spec.js b/test/spec/modules/viewdeosDXBidAdapter_spec.js
index f9bee1b0efe..31df9244ada 100644
--- a/test/spec/modules/viewdeosDXBidAdapter_spec.js
+++ b/test/spec/modules/viewdeosDXBidAdapter_spec.js
@@ -39,9 +39,9 @@ const SERVER_VIDEO_RESPONSE = {
     'height': 480,
     'cur': 'USD',
     'width': 640,
-    'cpm': 0.9
-  }
-  ]
+    'cpm': 0.9,
+    'adomain': ['a.com']
+  }]
 };
 const SERVER_OUSTREAM_VIDEO_RESPONSE = SERVER_VIDEO_RESPONSE;
 
@@ -123,7 +123,10 @@ const videoEqResponse = [{
   height: 480,
   width: 640,
   ttl: 3600,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: ['a.com']
+  }
 }];
 
 const displayEqResponse = [{
@@ -136,7 +139,10 @@ const displayEqResponse = [{
   height: 250,
   width: 300,
   ttl: 3600,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: []
+  }
 }];
 
 describe('viewdeosDXBidAdapter', function () {
diff --git a/test/spec/modules/viqeoBidAdapter_spec.js b/test/spec/modules/viqeoBidAdapter_spec.js
new file mode 100644
index 00000000000..8f597318af9
--- /dev/null
+++ b/test/spec/modules/viqeoBidAdapter_spec.js
@@ -0,0 +1,124 @@
+import {expect} from 'chai';
+import {spec} from 'modules/viqeoBidAdapter';
+
+describe('viqeoBidAdapter', function () {
+  it('minimal params', function () {
+    expect(spec.isBidRequestValid({
+      bidder: 'viqeo',
+      params: {
+        user: {
+          buyeruid: '1',
+        },
+        playerOptions: {
+          videoId: 'ed584da454c7205ca7e4',
+          profileId: 1382,
+        },
+      }})).to.equal(true);
+  });
+  it('minimal params no playerOptions', function () {
+    expect(spec.isBidRequestValid({
+      bidder: 'viqeo',
+      params: {
+        currency: 'EUR',
+      }})).to.equal(false);
+  });
+  it('build request check data', function () {
+    const bidRequestData = [{
+      bidId: 'id1',
+      bidder: 'viqeo',
+      params: {
+        user: {
+          buyeruid: '1',
+        },
+        currency: 'EUR',
+        floor: 0.5,
+        playerOptions: {
+          videoId: 'ed584da454c7205ca7e4',
+          profileId: 1382,
+        },
+      },
+      mediaTypes: {
+        video: { playerSize: [[240, 400]] }
+      },
+    }];
+    const request = spec.buildRequests(bidRequestData);
+    const requestData = request[0].data;
+    expect(requestData.id).to.equal('id1')
+    expect(requestData.imp[0].bidfloorcur).to.equal('EUR');
+    expect(requestData.imp[0].bidfloor).to.equal(0.5);
+    expect(requestData.imp[0].video.w).to.equal(240);
+    expect(requestData.imp[0].video.h).to.equal(400);
+    expect(requestData.user.buyeruid).to.equal('1');
+  });
+  it('build request check url', function () {
+    const bidRequestData = [{
+      bidder: 'viqeo',
+      params: {
+        playerOptions: {
+          videoId: 'ed584da454c7205ca7e4',
+          profileId: 1382,
+        },
+        sspId: 42,
+      },
+      mediaTypes: {
+        video: { playerSize: [[240, 400]] }
+      },
+    }];
+    const request = spec.buildRequests(bidRequestData);
+    expect(request[0].url).to.equal('https://ads.betweendigital.com/openrtb_bid/?sspId=42')
+  });
+  it('response_params common case', function () {
+    const bidRequestData = {
+      bids: [{
+        bidId: 'id1',
+        params: {},
+        mediaTypes: {
+          video: { playerSize: [[240, 400]] }
+        },
+      }],
+    };
+    const serverResponse = {
+      body: {
+        id: 'id1',
+        cur: 'EUR',
+        seatbid: [{
+          bid: [{
+            cpm: 0.5,
+            ttl: 3600,
+            netRevenue: true,
+            creativeId: 'test1',
+            adm: '',
+          }],
+        }],
+      }
+    };
+    const bids = spec.interpretResponse(serverResponse, bidRequestData);
+    expect(bids).to.have.lengthOf(1);
+  });
+  it('should set flooPrice to getFloor.floor value if it is greater than params.floor', function() {
+    const bidRequestData = [{
+      bidId: 'id1',
+      bidder: 'viqeo',
+      params: {
+        currency: 'EUR',
+        floor: 0.5,
+        playerOptions: {
+          videoId: 'ed584da454c7205ca7e4',
+          profileId: 1382,
+        },
+      },
+      mediaTypes: {
+        video: { playerSize: [[240, 400]] }
+      },
+      getFloor: () => {
+        return {
+          currency: 'EUR',
+          floor: 3.32
+        }
+      },
+    }];
+    const request = spec.buildRequests(bidRequestData);
+    const requestData = request[0].data;
+    expect(requestData.imp[0].bidfloor).to.equal(3.32)
+  });
+});
diff --git a/test/spec/modules/visxBidAdapter_spec.js b/test/spec/modules/visxBidAdapter_spec.js
index 2a4f8e4c7b5..b8a66e7c3b9 100755
--- a/test/spec/modules/visxBidAdapter_spec.js
+++ b/test/spec/modules/visxBidAdapter_spec.js
@@ -2,6 +2,8 @@ import { expect } from 'chai';
 import { spec } from 'modules/visxBidAdapter.js';
 import { config } from 'src/config.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as utils from 'src/utils.js';
+import { makeSlot } from '../integration/faker/googletag.js';
 
 describe('VisxAdapter', function () {
   const adapter = newBidder(spec);
@@ -16,7 +18,7 @@ describe('VisxAdapter', function () {
     let bid = {
       'bidder': 'visx',
       'params': {
-        'uid': '903536'
+        'uid': 903536
       },
       'adUnitCode': 'adunit-code',
       'sizes': [[300, 250], [300, 600]],
@@ -37,15 +39,56 @@ describe('VisxAdapter', function () {
       };
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('should return false when uid can not be parsed as number', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'uid': 'sdvsdv'
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('it should fail on invalid video bid', function () {
+      let videoBid = Object.assign({}, bid);
+      videoBid.mediaTypes = {
+        video: {
+          context: 'instream',
+          mimes: ['video/mp4'],
+          protocols: [3, 6]
+        }
+      };
+      expect(spec.isBidRequestValid(videoBid)).to.equal(false);
+    });
+
+    it('it should pass on valid video bid', function () {
+      let videoBid = Object.assign({}, bid);
+      videoBid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[400, 300]]
+        }
+      };
+      expect(spec.isBidRequestValid(videoBid)).to.equal(true);
+    })
   });
 
   describe('buildRequests', function () {
+    function parseRequest(url) {
+      const res = {};
+      (url.split('?')[1] || '').split('&').forEach((it) => {
+        const couple = it.split('=');
+        res[couple[0]] = decodeURIComponent(couple[1]);
+      });
+      return res;
+    }
     const bidderRequest = {
+      timeout: 3000,
       refererInfo: {
-        referer: 'https://example.com'
+        page: 'https://example.com'
       }
     };
-    const referrer = bidderRequest.refererInfo.referer;
+    const referrer = bidderRequest.refererInfo.page;
     const schainObject = {
       ver: '1.0',
       nodes: [
@@ -53,12 +96,11 @@ describe('VisxAdapter', function () {
         {asi: 'exchange1.com', sid: '1234!abcd', hp: 1, name: 'publisher, Inc.', domain: 'publisher.com'}
       ]
     };
-    const schainString = JSON.stringify(schainObject);
     let bidRequests = [
       {
         'bidder': 'visx',
         'params': {
-          'uid': '903535'
+          'uid': 903535
         },
         'adUnitCode': 'adunit-code-1',
         'sizes': [[300, 250], [300, 600]],
@@ -80,93 +122,121 @@ describe('VisxAdapter', function () {
       {
         'bidder': 'visx',
         'params': {
-          'uid': '903536'
+          'uid': 903536
         },
         'adUnitCode': 'adunit-code-1',
         'sizes': [[300, 250], [300, 600]],
         'bidId': '42dbe3a7168a6a',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '1d1a030790a475',
+      },
+      {
+        'bidder': 'visx',
+        'params': {
+          'uid': 903537
+        },
+        'adUnitCode': 'adunit-code-video-3',
+        'mediaTypes': {
+          'video': {
+            'context': 'instream',
+            'playerSize': [[400, 300]],
+            'mimes': ['video/mp4', 'video/mpeg'],
+            'protocols': [3, 6],
+            'minduration': 5,
+            'maxduration': 30
+          }
+        },
+        'bidId': '39a4e3a7168a6a',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
       }
     ];
 
+    const expectedFullImps = [{
+      'id': '30b31c1838de1e',
+      'banner': {'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]},
+      'ext': {'bidder': {'uid': 903535, 'adslotExists': false}}
+    },
+    {
+      'id': '3150ccb55da321',
+      'banner': {'format': [{'w': 728, 'h': 90}, {'w': 300, 'h': 250}]},
+      'ext': {'bidder': {'uid': 903535, 'adslotExists': false}}
+    },
+    {
+      'id': '42dbe3a7168a6a',
+      'banner': {'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]},
+      'ext': {'bidder': {'uid': 903536, 'adslotExists': false}}
+    },
+    {
+      'id': '39a4e3a7168a6a',
+      'video': {
+        'w': 400,
+        'h': 300,
+        'mimes': ['video/mp4', 'video/mpeg'],
+        'protocols': [3, 6],
+        'minduration': 5,
+        'maxduration': 30
+      },
+      'ext': {'bidder': {'uid': 903537}}
+    }];
+
     it('should attach valid params to the tag', function () {
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
-      const payload = request.data;
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
+      const firstBid = bidRequests[0];
+      const bids = [firstBid];
+      const request = spec.buildRequests(bids, bidderRequest);
+      const payload = parseRequest(request.url);
+      expect(request.url).to.be.an('string');
       expect(payload).to.have.property('auids', '903535');
-      expect(payload).to.have.property('sizes', '300x250,300x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('cur', 'EUR');
-    });
 
-    it('sizes must not be duplicated', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = request.data;
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('cur', 'EUR');
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': [expectedFullImps[0]],
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
+        'site': {'page': referrer}
+      });
     });
 
-    it('pt parameter must be "net" if params.priceType === "gross"', function () {
-      bidRequests[1].params.priceType = 'gross';
+    it('should attach valid params to the tag with multiformat request', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = request.data;
+      const payload = parseRequest(request.url);
       expect(payload).to.be.an('object');
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('cur', 'EUR');
-      delete bidRequests[1].params.priceType;
-    });
-    it('pt parameter must be "net" if params.priceType === "net"', function () {
-      bidRequests[1].params.priceType = 'net';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = request.data;
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('cur', 'EUR');
-      delete bidRequests[1].params.priceType;
-    });
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
 
-    it('pt parameter must be "net" if params.priceType === "undefined"', function () {
-      bidRequests[1].params.priceType = 'undefined';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = request.data;
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('cur', 'EUR');
-      delete bidRequests[1].params.priceType;
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps,
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
+        'site': {'page': referrer}
+      });
     });
 
     it('should add currency from currency.bidderCurrencyDefault', function () {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'currency.bidderCurrencyDefault.visx' ? 'GBP' : 'USD');
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = request.data;
+      const payload = parseRequest(request.url);
       expect(payload).to.be.an('object');
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('cur', 'GBP');
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps,
+        'tmax': 3000,
+        'cur': ['GBP'],
+        'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
+        'site': {'page': referrer}
+      });
+
       getConfigStub.restore();
     });
 
@@ -174,39 +244,73 @@ describe('VisxAdapter', function () {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'currency.bidderCurrencyDefault.visx' ? '' : 'USD');
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = request.data;
+      const payload = parseRequest(request.url);
       expect(payload).to.be.an('object');
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('cur', 'USD');
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps,
+        'tmax': 3000,
+        'cur': ['USD'],
+        'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
+        'site': {'page': referrer}
+      });
+
       getConfigStub.restore();
     });
 
     it('if gdprConsent is present payload must have gdpr params', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA', gdprApplies: true}});
-      const payload = request.data;
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', 1);
+      const request = spec.buildRequests(bidRequests, Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest));
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps,
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
+        'site': {'page': referrer},
+        'user': {'ext': {'consent': 'AAA'}},
+        'regs': {'ext': {'gdpr': 1}}
+      });
     });
 
     it('if gdprApplies is false gdpr_applies must be 0', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA', gdprApplies: false}});
-      const payload = request.data;
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', 0);
+      const request = spec.buildRequests(bidRequests, Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: false}}, bidderRequest));
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps,
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
+        'site': {'page': referrer},
+        'user': {'ext': {'consent': 'AAA'}},
+        'regs': {'ext': {'gdpr': 0}}
+      });
     });
 
     it('if gdprApplies is undefined gdpr_applies must be 1', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA'}});
-      const payload = request.data;
-      expect(payload).to.be.an('object');
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', 1);
+      const request = spec.buildRequests(bidRequests, Object.assign({gdprConsent: {consentString: 'AAA'}}, bidderRequest));
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps,
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {'ext': {'wrapperType': 'Prebid_js', 'wrapperVersion': '$prebid.version$'}},
+        'site': {'page': referrer},
+        'user': {'ext': {'consent': 'AAA'}},
+        'regs': {'ext': {'gdpr': 1}}
+      });
     });
 
     it('if schain is present payload must have schain param', function () {
@@ -216,42 +320,284 @@ describe('VisxAdapter', function () {
         bidRequests[2]
       ];
       const request = spec.buildRequests(schainBidRequests, bidderRequest);
-      const payload = request.data;
+      const payload = parseRequest(request.url);
       expect(payload).to.be.an('object');
-      expect(payload).to.have.property('schain', schainString);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('pt', 'net');
       expect(payload).to.have.property('auids', '903535,903535,903536');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('cur', 'EUR');
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps.slice(0, -1),
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {
+          'ext': {
+            'wrapperType': 'Prebid_js',
+            'wrapperVersion': '$prebid.version$',
+            'schain': schainObject
+          }
+        },
+        'site': {'page': referrer},
+      });
     });
 
     it('if userId is available payload must have appropriate params', function () {
-      const schainBidRequests = [
+      const eids = [
+        {
+          source: 'pubcid.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+          }]
+        },
+        {
+          source: 'adserver.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1,
+            ext: {
+              rtiPartner: 'TDID'
+            }
+          }]
+        }
+      ];
+      const userIdBidRequests = [
         Object.assign({userId: {
           tdid: '111',
-          id5id: '222',
+          id5id: { uid: '222' },
           digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}}
-        }}, bidRequests[0]),
+        },
+        userIdAsEids: eids}, bidRequests[0]),
         bidRequests[1],
         bidRequests[2]
       ];
-      const request = spec.buildRequests(schainBidRequests, bidderRequest);
-      const payload = request.data;
+      const request = spec.buildRequests(userIdBidRequests, bidderRequest);
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps.slice(0, -1),
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {
+          'ext': {
+            'wrapperType': 'Prebid_js',
+            'wrapperVersion': '$prebid.version$'
+          }
+        },
+        'site': {'page': referrer},
+        'user': {'ext': {'eids': eids}}
+      });
+    });
+
+    it('should pass grouped video bid\'s params in payload', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': expectedFullImps,
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {
+          'ext': {
+            'wrapperType': 'Prebid_js',
+            'wrapperVersion': '$prebid.version$'
+          }
+        },
+        'site': {'page': referrer}
+      });
+    });
+  });
+
+  describe('buildRequests (multiple media types w/ unsupported video+outstream)', function () {
+    function parseRequest(url) {
+      const res = {};
+      (url.split('?')[1] || '').split('&').forEach((it) => {
+        const couple = it.split('=');
+        res[couple[0]] = decodeURIComponent(couple[1]);
+      });
+      return res;
+    }
+    const bidderRequest = {
+      timeout: 3000,
+      refererInfo: {
+        page: 'https://example.com'
+      }
+    };
+    const referrer = bidderRequest.refererInfo.page;
+    const bidRequests = [
+      {
+        'bidder': 'visx',
+        'params': {
+          'uid': '903538'
+        },
+        'adUnitCode': 'misconfigured-video',
+        'sizes': [[300, 250], [300, 600]],
+        'mediaTypes': {
+          'video': {
+            'context': 'outstream',
+            'playerSize': [[400, 300]]
+          }
+        },
+        'bidId': '39aff3a7169a6a',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a476',
+      }
+    ];
+
+    it('should send requst for banner bid', function () {
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const payload = parseRequest(request.url);
       expect(payload).to.be.an('object');
-      expect(payload).to.have.property('tdid', '111');
-      expect(payload).to.have.property('id5', '222');
-      expect(payload).to.have.property('dtid', 'DTID');
+      expect(payload).to.have.property('auids', '903538');
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': [{
+          'id': '39aff3a7169a6a',
+          'banner': {'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]},
+          'ext': {'bidder': {'uid': 903538, 'adslotExists': false}}
+        }],
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {
+          'ext': {
+            'wrapperType': 'Prebid_js',
+            'wrapperVersion': '$prebid.version$'
+          }
+        },
+        'site': {'page': referrer}
+      });
+    });
+  });
+
+  describe('buildRequests (check ad slot exists)', function () {
+    function parseRequest(url) {
+      const res = {};
+      (url.split('?')[1] || '').split('&').forEach((it) => {
+        const couple = it.split('=');
+        res[couple[0]] = decodeURIComponent(couple[1]);
+      });
+      return res;
+    }
+    const bidderRequest = {
+      timeout: 3000,
+      refererInfo: {
+        page: 'https://example.com'
+      }
+    };
+    const referrer = bidderRequest.refererInfo.page;
+    const bidRequests = [
+      {
+        'bidder': 'visx',
+        'params': {
+          'uid': 903535
+        },
+        'adUnitCode': 'visx-adunit-code-1',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      },
+      {
+        'bidder': 'visx',
+        'params': {
+          'uid': 903535
+        },
+        'adUnitCode': 'visx-adunit-code-2',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      }
+    ];
+    let sandbox;
+    let documentStub;
+
+    before(function() {
+      sandbox = sinon.sandbox.create();
+      documentStub = sandbox.stub(document, 'getElementById');
+      documentStub.withArgs('visx-adunit-code-1').returns({
+        id: 'visx-adunit-code-1'
+      });
+      documentStub.withArgs('visx-adunit-element-2').returns({
+        id: 'visx-adunit-element-2'
+      });
+    });
+
+    after(function() {
+      sandbox.restore();
+    });
+
+    it('should find ad slot by ad unit code as element id', function () {
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const payload = parseRequest(request.url);
+      expect(payload).to.be.an('object');
+      expect(payload).to.have.property('auids', '903535');
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': [{
+          'id': '30b31c1838de1e',
+          'banner': {'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]},
+          'ext': {'bidder': {'uid': 903535, 'adslotExists': true}}
+        }],
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {
+          'ext': {
+            'wrapperType': 'Prebid_js',
+            'wrapperVersion': '$prebid.version$'
+          }
+        },
+        'site': {'page': referrer}
+      });
+    });
+
+    it('should find ad slot by ad unit code as adUnitPath', function () {
+      makeSlot({code: 'visx-adunit-code-2', divId: 'visx-adunit-element-2'});
+
+      const request = spec.buildRequests([bidRequests[1]], bidderRequest);
+      const payload = parseRequest(request.url);
+      expect(payload).to.be.an('object');
+      expect(payload).to.have.property('auids', '903535');
+
+      const postData = request.data;
+      expect(postData).to.be.an('object');
+      expect(postData).to.deep.equal({
+        'id': '22edbae2733bf6',
+        'imp': [{
+          'id': '30b31c1838de1e',
+          'banner': {'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]},
+          'ext': {'bidder': {'uid': 903535, 'adslotExists': true}}
+        }],
+        'tmax': 3000,
+        'cur': ['EUR'],
+        'source': {
+          'ext': {
+            'wrapperType': 'Prebid_js',
+            'wrapperVersion': '$prebid.version$'
+          }
+        },
+        'site': {'page': referrer}
+      });
     });
   });
 
   describe('interpretResponse', function () {
     const responses = [
-      {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-      {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-      {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR'}], 'seat': '1'},
-      {'bid': [{'price': 0, 'auid': 903537, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+      {'bid': [{'price': 1.15, 'impid': '300bfeb0d71a5b', 'adm': '<div>test content 1</div>', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner', 'advertiserDomains': ['some_domain.com'], 'ext': {'prebid': {'targeting': {'hb_visx_product': 'understitial', 'hb_visx_width': 300, 'hb_visx_height': 250}}}}], 'seat': '1'},
+      {'bid': [{'price': 0.5, 'impid': '4dff80cc4ee346', 'adm': '<div>test content 2</div>', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+      {'bid': [{'price': 0.15, 'impid': '5703af74d0472a', 'adm': '<div>test content 3</div>', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+      {'bid': [{'price': 0, 'impid': '300bfeb0d7190gf', 'auid': 903537, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
       {'bid': [{'price': 0, 'adm': '<div>test content 5</div>', 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
       undefined,
       {'bid': [], 'seat': '1'},
@@ -267,7 +613,7 @@ describe('VisxAdapter', function () {
           },
           'adUnitCode': 'adunit-code-1',
           'sizes': [[300, 250], [300, 600]],
-          'bidId': '659423fff799cb',
+          'bidId': '300bfeb0d71a5b',
           'bidderRequestId': '5f2009617a7c0a',
           'auctionId': '1cbd2feafe5e8b',
         }
@@ -275,7 +621,7 @@ describe('VisxAdapter', function () {
       const request = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
-          'requestId': '659423fff799cb',
+          'requestId': '300bfeb0d71a5b',
           'cpm': 1.15,
           'creativeId': 903535,
           'dealId': undefined,
@@ -285,6 +631,22 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
+          'adserverTargeting': {
+            'hb_visx_product': 'understitial',
+            'hb_visx_width': 300,
+            'hb_visx_height': 250,
+          },
+          'ext': {
+            'targeting': {
+              'hb_visx_product': 'understitial',
+              'hb_visx_width': 300,
+              'hb_visx_height': 250,
+            }
+          }
         }
       ];
 
@@ -341,6 +703,22 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
+          'adserverTargeting': {
+            'hb_visx_product': 'understitial',
+            'hb_visx_width': 300,
+            'hb_visx_height': 250,
+          },
+          'ext': {
+            'targeting': {
+              'hb_visx_product': 'understitial',
+              'hb_visx_width': 300,
+              'hb_visx_height': 250,
+            }
+          }
         },
         {
           'requestId': '4dff80cc4ee346',
@@ -353,6 +731,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '5703af74d0472a',
@@ -365,6 +747,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         }
       ];
 
@@ -381,7 +767,7 @@ describe('VisxAdapter', function () {
           },
           'adUnitCode': 'adunit-code-1',
           'sizes': [[300, 250], [300, 600]],
-          'bidId': '659423fff799cb',
+          'bidId': '300bfeb0d71a5b',
           'bidderRequestId': '5f2009617a7c0a',
           'auctionId': '1cbd2feafe5e8b',
         }
@@ -390,7 +776,7 @@ describe('VisxAdapter', function () {
       const request = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
-          'requestId': '659423fff799cb',
+          'requestId': '300bfeb0d71a5b',
           'cpm': 1.15,
           'creativeId': 903535,
           'dealId': undefined,
@@ -400,11 +786,27 @@ describe('VisxAdapter', function () {
           'currency': 'PLN',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
+          'adserverTargeting': {
+            'hb_visx_product': 'understitial',
+            'hb_visx_width': 300,
+            'hb_visx_height': 250,
+          },
+          'ext': {
+            'targeting': {
+              'hb_visx_product': 'understitial',
+              'hb_visx_width': 300,
+              'hb_visx_height': 250,
+            }
+          }
         }
       ];
 
       const response = Object.assign({}, responses[0]);
-      Object.assign(response.bid[0], {'cur': 'PLN'});
+      response.bid = [Object.assign({}, response.bid[0], {'cur': 'PLN'})];
       const result = spec.interpretResponse({'body': {'seatbid': [response]}}, request);
       expect(result).to.deep.equal(expectedResponse);
       getConfigStub.restore();
@@ -453,11 +855,11 @@ describe('VisxAdapter', function () {
 
     it('complicated case', function () {
       const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '<div>test content 4</div>', 'auid': 903535, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 5</div>', 'auid': 903536, 'h': 600, 'w': 350, 'cur': 'EUR'}], 'seat': '1'},
+        {'bid': [{'price': 1.15, 'impid': '2164be6358b9', 'adm': '<div>test content 1</div>', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner', 'advertiserDomains': ['some_domain.com']}], 'seat': '1'},
+        {'bid': [{'price': 0.5, 'impid': '4e111f1b66e4', 'adm': '<div>test content 2</div>', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+        {'bid': [{'price': 0.15, 'impid': '26d6f897b516', 'adm': '<div>test content 3</div>', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+        {'bid': [{'price': 0.15, 'impid': '326bde7fbf69', 'adm': '<div>test content 4</div>', 'auid': 903535, 'h': 600, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+        {'bid': [{'price': 0.5, 'impid': '1751cd90161', 'adm': '<div>test content 5</div>', 'auid': 903536, 'h': 600, 'w': 350, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
       ];
       const bidRequests = [
         {
@@ -529,6 +931,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '4e111f1b66e4',
@@ -541,6 +947,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '26d6f897b516',
@@ -553,6 +963,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '326bde7fbf69',
@@ -565,6 +979,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '1751cd90161',
@@ -577,6 +995,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         }
       ];
 
@@ -586,8 +1008,8 @@ describe('VisxAdapter', function () {
 
     it('dublicate uids and sizes in one slot', function () {
       const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+        {'bid': [{'price': 1.15, 'impid': '5126e301f4be', 'adm': '<div>test content 1</div>', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+        {'bid': [{'price': 0.5, 'impid': '57b2ebe70e16', 'adm': '<div>test content 2</div>', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
       ];
       const bidRequests = [
         {
@@ -637,6 +1059,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '57b2ebe70e16',
@@ -649,11 +1075,252 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         }
       ];
 
       const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
       expect(result).to.deep.equal(expectedResponse);
     });
+
+    it('handles video bid', function () {
+      const fullResponse = [
+        {'bid': [{'price': 0.5, 'impid': '2164be6358b9', 'adm': '<VAST/>', 'auid': 903537, 'w': 400, 'h': 300, 'cur': 'EUR', 'mediaType': 'video'}], 'seat': '1'},
+      ];
+      const bidRequests = [
+        {
+          'bidder': 'visx',
+          'params': {
+            'uid': '903537'
+          },
+          'adUnitCode': 'adunit-code-1',
+          'mediaTypes': {
+            'video': {
+              'context': 'instream',
+              'playerSize': [[400, 300]],
+              'mimes': ['video/mp4'],
+              'protocols': [3, 6]
+            }
+          },
+          'sizes': [[400, 300]],
+          'bidId': '2164be6358b9',
+          'bidderRequestId': '106efe3247',
+          'auctionId': '32a1f276cb87cb8',
+        }
+      ];
+      const request = spec.buildRequests(bidRequests);
+      const expectedResponse = [
+        {
+          'mediaType': 'video',
+          'requestId': '2164be6358b9',
+          'cpm': 0.5,
+          'creativeId': 903537,
+          'dealId': undefined,
+          'width': 400,
+          'height': 300,
+          'vastXml': '<VAST/>',
+          'currency': 'EUR',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'video',
+          },
+        }
+      ];
+      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
+      expect(result).to.deep.equal(expectedResponse);
+    });
+
+    it('handles multiformat bid response with outstream+banner as banner', function () {
+      const fullResponse = [
+        {'bid': [{'price': 0.5, 'impid': '2164be6358b9', 'adm': '<VAST/>', 'auid': 903537, 'w': 400, 'h': 300, 'cur': 'EUR', 'mediaType': 'video'}], 'seat': '1'},
+      ];
+      const bidRequests = [
+        {
+          'bidder': 'visx',
+          'params': {
+            'uid': '903537'
+          },
+          'adUnitCode': 'adunit-code-1',
+          'mediaTypes': {
+            'video': {
+              'context': 'outstream',
+              'playerSize': [[400, 300]],
+              'mimes': ['video/mp4'],
+              'protocols': [3, 6]
+            }
+          },
+          'banner': {
+            'sizes': []
+          },
+          'sizes': [[400, 300]],
+          'bidId': '2164be6358b9',
+          'bidderRequestId': '106efe3247',
+          'auctionId': '32a1f276cb87cb8',
+        }
+      ];
+      const request = spec.buildRequests(bidRequests);
+      const expectedResponse = [
+        {
+          'ad': '<VAST/>',
+          'requestId': '2164be6358b9',
+          'cpm': 0.5,
+          'creativeId': 903537,
+          'dealId': undefined,
+          'width': 400,
+          'height': 300,
+          'currency': 'EUR',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'video',
+          },
+        }
+      ];
+      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
+      expect(result).to.deep.equal(expectedResponse);
+    });
+
+    it('should get right ext data in bid response', function () {
+      const bidRequests = [
+        {
+          'bidder': 'visx',
+          'params': {
+            'uid': '903535'
+          },
+          'adUnitCode': 'adunit-code-1',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '300bfeb0d71a5b',
+          'bidderRequestId': '5f2009617a7c0a',
+          'auctionId': '1cbd2feafe5e8b',
+        }
+      ];
+      const request = spec.buildRequests(bidRequests);
+      const pendingUrl = 'https://t.visx.net/track/pending/123123123';
+      const winUrl = 'https://t.visx.net/track/win/53245341';
+      const expectedResponse = [
+        {
+          'requestId': '300bfeb0d71a5b',
+          'cpm': 1.15,
+          'creativeId': 903535,
+          'dealId': undefined,
+          'width': 300,
+          'height': 250,
+          'ad': '<div>test content 1</div>',
+          'currency': 'EUR',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
+          'adserverTargeting': {
+            'hb_visx_product': 'understitial',
+            'hb_visx_width': 300,
+            'hb_visx_height': 250,
+          },
+          'ext': {
+            'events': {
+              'pending': pendingUrl,
+              'win': winUrl
+            },
+            'targeting': {
+              'hb_visx_product': 'understitial',
+              'hb_visx_width': 300,
+              'hb_visx_height': 250,
+            }
+          }
+        }
+      ];
+      const serverResponse = Object.assign({}, responses[0]);
+      serverResponse.bid = [Object.assign({}, serverResponse.bid[0])];
+      serverResponse.bid[0].ext.prebid = Object.assign({}, serverResponse.bid[0].ext.prebid);
+      utils.deepSetValue(serverResponse.bid[0], 'ext.prebid.events', {
+        pending: pendingUrl,
+        win: winUrl,
+      });
+      const result = spec.interpretResponse({'body': {'seatbid': [serverResponse]}}, request);
+      expect(result).to.deep.equal(expectedResponse);
+    });
+  });
+  describe('check trackers', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('onSetTargeting', function () {
+      const trackUrl = 'https://t.visx.net/track/pending/123123123';
+      const bid = { ext: { events: { pending: trackUrl } } };
+      spec.onSetTargeting(bid);
+      expect(utils.triggerPixel.calledOnceWith(trackUrl)).to.equal(true);
+    });
+
+    it('onBidWon', function () {
+      const trackUrl = 'https://t.visx.net/track/win/123123123';
+      const bid = { ext: { events: { win: trackUrl } } };
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.calledOnceWith(trackUrl)).to.equal(true);
+    });
+
+    it('onTimeout', function () {
+      const data = [{ timeout: 3000, adUnitCode: 'adunit-code-1', auctionId: '1cbd2feafe5e8b', bidder: 'visx', bidId: '23423', params: [{ uid: '1' }] }];
+      const expectedData = [{ ...data[0], params: [{ uid: 1 }] }];
+      spec.onTimeout(data);
+      expect(utils.triggerPixel.calledOnceWith('https://t.visx.net/track/bid_timeout//' + JSON.stringify(expectedData))).to.equal(true);
+    });
+  });
+
+  describe('user sync', function () {
+    function parseUrl(url) {
+      const [, path, querySt] = url.match(/^https?:\/\/[^\/]+(?:\/([^?]+)?)?(?:\?(.+)?)?$/) || [];
+      const query = {};
+      (querySt || '').split('&').forEach((q) => {
+        var kv = q.split('=');
+        if (kv[0]) {
+          query[kv[0]] = decodeURIComponent(kv[1] || '');
+        }
+      });
+      return { path, query };
+    }
+    it('should call iframe', function () {
+      let syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      });
+
+      expect(Array.isArray(syncs)).to.equal(true);
+      expect(syncs.length).to.equal(1);
+      expect(syncs[0]).to.have.property('type', 'iframe');
+      expect(syncs[0]).to.have.property('url');
+      expect(syncs[0].url).to.be.an('string');
+
+      const { path, query } = parseUrl(syncs[0].url);
+      expect(path).to.equal('push_sync');
+      expect(query).to.deep.equal({iframe: '1'});
+    });
+
+    it('should call image', function () {
+      let syncs = spec.getUserSyncs({
+        pixelEnabled: true
+      });
+
+      expect(Array.isArray(syncs)).to.equal(true);
+      expect(syncs.length).to.equal(1);
+      expect(syncs[0]).to.have.property('type', 'image');
+      expect(syncs[0]).to.have.property('url');
+      expect(syncs[0].url).to.be.an('string');
+
+      const { path, query } = parseUrl(syncs[0].url);
+      expect(path).to.equal('push_sync');
+      expect(query).to.deep.equal({});
+    });
   });
 });
diff --git a/test/spec/modules/vlybyBidAdapter_spec.js b/test/spec/modules/vlybyBidAdapter_spec.js
new file mode 100644
index 00000000000..0e3bcdfbc4e
--- /dev/null
+++ b/test/spec/modules/vlybyBidAdapter_spec.js
@@ -0,0 +1,111 @@
+import { expect } from 'chai'
+import { spec } from 'modules/vlybyBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const REQUEST = {
+  bidder: 'vlyby',
+  params: {
+    publisherId: 'f363eb2b75459b34592cc4'
+  },
+  bidderRequestId: '2ab3ae978e021',
+  auctionId: 'a1427459-5be6-4076-b585-11a14eb5775',
+  adUnitCode: '/0000/vlyby',
+  bidId: '2d925f27f5079f',
+  sizes: [1, 1]
+}
+
+const BIDDER_REQUEST = {
+  'request': {
+    'auctionId': 'a1427459-5be6-4076-b585-11a14eb57758'
+  },
+  'gdprConsent': {
+
+  },
+  'bidRequests': [
+    {
+      'bidId': '2ab3ae978e021',
+      'adUnitCode': '/0000/vlyby',
+      'params': {
+        'publisherId': 'f363eb2b75459b34592cc4'
+      },
+      'sizes': [[1, 1]]
+    }
+  ]
+}
+
+const bids = {
+  bids: {
+    bid: '2ab3ae978e021',
+    cpm: 5.2,
+    size: {
+      width: 1,
+      height: 1
+    },
+    creative: {
+      id: '60fe2250-d13d-11eb-8983-d7b28b8ba5af',
+      ad: '<ad/>'
+    },
+    adomain: ['vlyby.com']
+  }
+}
+
+describe('vlybyBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      const request = {
+        'params': {
+          'publisherId': 'f363eb2b75459b34592cc4'
+        }
+      }
+      expect(spec.isBidRequestValid(request)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      expect(spec.isBidRequestValid({})).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    const bidRequests = [REQUEST]
+    const request = spec.buildRequests(bidRequests, BIDDER_REQUEST)
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      expect(request.method).to.equal('POST')
+    })
+
+    it('returns a list of valid requests', function () {
+      expect(request.validBidRequests).to.eql([REQUEST])
+    })
+
+    it('sends params.publisherId', function () {
+      expect(request.validBidRequests[0].params.publisherId).to.eql(REQUEST.params.publisherId)
+    })
+  });
+
+  describe('interpretResponse', function () {
+    it('nobid responses', function () {
+      expect(spec.interpretResponse({body: {}}).length).to.equal(0)
+      expect(spec.interpretResponse({body: []}).length).to.equal(0)
+    })
+
+    it('handles the response', function () {
+      const response = spec.interpretResponse({body: bids});
+
+      expect(response, 'response is not an Array').to.be.an('array')
+      expect(response[0].cpm, 'cpm does not match').to.equal(5.2)
+      expect(response[0].width, 'width does not match').to.equal(1)
+      expect(response[0].height, 'height does not match').to.equal(1)
+      expect(response[0].creativeId, 'creative ID does not match').to.equal('60fe2250-d13d-11eb-8983-d7b28b8ba5af')
+      expect(response[0].ad, 'creative Ad does not match').to.equal('<ad/>')
+      expect(response[0].meta.adomain, 'creative Ad does not match').to.be.an('array')
+    });
+  });
+});
diff --git a/test/spec/modules/vmgBidAdapter_spec.js b/test/spec/modules/vmgBidAdapter_spec.js
deleted file mode 100644
index 41aa077adc7..00000000000
--- a/test/spec/modules/vmgBidAdapter_spec.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/vmgBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-
-describe('VmgAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  })
-
-  describe('isBidRequestValid', function () {
-    let bidRequest = {
-      adUnitCode: 'div-0',
-      auctionId: 'd69cdd3f-75e3-42dc-b313-e54c0a99c757',
-      bidId: '280e2eb8ac3891',
-      bidRequestsCount: 1,
-      bidder: 'vmg',
-      bidderRequestId: '14690d27b056c8',
-      mediaTypes: {
-        banner: {
-          sizes: [ [ 970, 250 ] ]
-        }
-      },
-      sizes: [ 970, 250 ],
-      src: 'client',
-      transactionId: 'af62f065-dfa7-4564-8cb2-d277dc6069f2'
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-    });
-  })
-
-  describe('buildRequests', function () {
-    let validBidRequests = [
-      {
-        adUnitCode: 'div-0',
-        auctionId: 'd69cdd3f-75e3-42dc-b313-e54c0a99c757',
-        bidId: '280e2eb8ac3891',
-        bidRequestsCount: 1,
-        bidder: 'vmg',
-        bidderRequestId: '14690d27b056c8',
-        mediaTypes: {
-          banner: {
-            sizes: [ [ 970, 250 ] ]
-          }
-        },
-        sizes: [ 970, 250 ],
-        src: 'client',
-        transactionId: 'af62f065-dfa7-4564-8cb2-d277dc6069f2'
-      }
-    ];
-
-    let bidderRequest = {
-      auctionId: 'd69cdd3f-75e3-42dc-b313-e54c0a99c757',
-      auctionStart: 1549316149227,
-      bidderCode: 'vmg',
-      bidderRequestId: '14690d27b056c8',
-      refererInfo: {
-        canonicalUrl: undefined,
-        numIframes: 0,
-        reachedTop: true,
-        referer: 'https://vmg.nyc/public_assets/adapt/prebid.html',
-        stack: [ 'https://vmg.nyc/public_assets/adapt/prebid.html' ]
-      },
-      start: 1549316149229,
-      timeout: 1000
-    };
-
-    it('buildRequests fires', function () {
-      let request = spec.buildRequests(validBidRequests, bidderRequest);
-      expect(request).to.exist;
-      expect(request.method).to.equal('POST');
-      expect(request.data).to.exist;
-    });
-  })
-
-  describe('interpretResponse', function () {
-    let serverResponse = {};
-    serverResponse.body = {
-      'div-0': ['test']
-    };
-
-    var bidRequest = {
-      data: '[{"adUnitCode":"div-0","referer":"https://vmg.nyc/public_assets/adapt/prebid.html","bidId":"280e2eb8ac3891"}]',
-      method: 'POST',
-      url: 'https://predict.vmg.nyc'
-    };
-
-    it('interpresResponse fires', function () {
-      let bidResponses = spec.interpretResponse(serverResponse, bidRequest);
-      expect(bidResponses[0].dealId[0]).to.equal('test');
-    });
-  });
-});
diff --git a/test/spec/modules/voxBidAdapter_spec.js b/test/spec/modules/voxBidAdapter_spec.js
new file mode 100644
index 00000000000..923b0465e6c
--- /dev/null
+++ b/test/spec/modules/voxBidAdapter_spec.js
@@ -0,0 +1,322 @@
+import { expect } from 'chai'
+import { spec } from 'modules/voxBidAdapter.js'
+
+function getSlotConfigs(mediaTypes, params) {
+  return {
+    params: params,
+    sizes: [],
+    bidId: '2df8c0733f284e',
+    bidder: 'vox',
+    mediaTypes: mediaTypes,
+    transactionId: '31a58515-3634-4e90-9c96-f86196db1459'
+  }
+}
+
+describe('VOX Adapter', function() {
+  const PLACE_ID = '5af45ad34d506ee7acad0c26';
+  const bidderRequest = {
+    refererInfo: { page: 'referer' }
+  }
+  const bannerMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'banner'
+  }
+  const videoMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'video'
+  }
+  const inImageMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'inImage',
+    imageUrl: 'https://hybrid.ai/images/image.jpg'
+  }
+  const validBidRequests = [
+    getSlotConfigs({ banner: {} }, bannerMandatoryParams),
+    getSlotConfigs({ video: {playerSize: [[640, 480]], context: 'outstream'} }, videoMandatoryParams),
+    getSlotConfigs({ banner: {sizes: [0, 0]} }, inImageMandatoryParams)
+  ]
+  describe('isBidRequestValid method', function() {
+    describe('returns true', function() {
+      describe('when banner slot config has all mandatory params', () => {
+        describe('and banner placement has the correct value', function() {
+          const slotConfig = getSlotConfigs(
+            {banner: {}},
+            {
+              placementId: PLACE_ID,
+              placement: 'banner'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
+        describe('and In-Image placement has the correct value', function() {
+          const slotConfig = getSlotConfigs(
+            {
+              banner: {
+                sizes: [[0, 0]]
+              }
+            },
+            {
+              placementId: PLACE_ID,
+              placement: 'inImage',
+              imageUrl: 'imageUrl'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
+        describe('when video slot has all mandatory params.', function() {
+          it('should return true, when video mediatype object are correct.', function() {
+            const slotConfig = getSlotConfigs(
+              {
+                video: {
+                  context: 'instream',
+                  playerSize: [[640, 480]]
+                }
+              },
+              {
+                placementId: PLACE_ID,
+                placement: 'video'
+              }
+            )
+            const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+            expect(isBidRequestValid).to.equal(true)
+          })
+        })
+      })
+    })
+    describe('returns false', function() {
+      describe('when params are not correct', function() {
+        function createSlotconfig(params) {
+          return getSlotConfigs({ banner: {} }, params)
+        }
+        it('does not have the placementId.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placement: 'banner'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have the placement.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have the imageUrl.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID,
+              placement: 'inImage'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have a the correct placement.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID,
+              placement: 'something'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+      })
+      describe('when video mediaType object is not correct.', function() {
+        function createVideoSlotconfig(mediaType) {
+          return getSlotConfigs(mediaType, {
+            placementId: PLACE_ID,
+            placement: 'video'
+          })
+        }
+        it('is a void object', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({ video: {} })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have playerSize.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({ video: { context: 'instream' } })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have context', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({
+              video: {
+                playerSize: [[640, 480]]
+              }
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+      })
+    })
+  })
+  it('Url params should be correct ', function() {
+    const request = spec.buildRequests(validBidRequests, bidderRequest)
+    expect(request.method).to.equal('POST')
+    expect(request.url).to.equal('https://ssp.hybrid.ai/auction/prebid')
+  })
+
+  describe('buildRequests method', function() {
+    it('Common data request should be correct', function() {
+      const request = spec.buildRequests(validBidRequests, bidderRequest)
+      const data = JSON.parse(request.data)
+      expect(Array.isArray(data.bidRequests)).to.equal(true)
+      expect(data.url).to.equal('referer')
+      data.bidRequests.forEach(bid => {
+        expect(bid.bidId).to.equal('2df8c0733f284e')
+        expect(bid.placeId).to.equal(PLACE_ID)
+        expect(bid.transactionId).to.equal('31a58515-3634-4e90-9c96-f86196db1459')
+      })
+    })
+
+    describe('GDPR params', function() {
+      describe('when there are not consent management platform', function() {
+        it('cmp should be false', function() {
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(false)
+        })
+      })
+      describe('when there are consent management platform', function() {
+        it('cmps should be true and ga should not sended, when gdprApplies is undefined', function() {
+          bidderRequest['gdprConsent'] = {
+            gdprApplies: undefined,
+            consentString: 'consentString'
+          }
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(true)
+          expect(Object.keys(data).indexOf('data')).to.equal(-1)
+          expect(data.cs).to.equal('consentString')
+        })
+        it('cmps should be true and all gdpr parameters should be sended, when there are gdprApplies', function() {
+          bidderRequest['gdprConsent'] = {
+            gdprApplies: true,
+            consentString: 'consentString'
+          }
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(true)
+          expect(data.ga).to.equal(true)
+          expect(data.cs).to.equal('consentString')
+        })
+      })
+    })
+  })
+
+  describe('interpret response method', function() {
+    it('should return a void array, when the server response are not correct.', function() {
+      const request = { data: JSON.stringify({}) }
+      const serverResponse = {
+        body: {}
+      }
+      const bids = spec.interpretResponse(serverResponse, request)
+      expect(typeof bids).to.equal('object')
+      expect(bids.length).to.equal(0)
+    })
+    it('should return a void array, when the server response have not got bids.', function() {
+      const request = { data: JSON.stringify({}) }
+      const serverResponse = { body: { bids: [] } }
+      const bids = spec.interpretResponse(serverResponse, request)
+      expect(typeof bids).to.equal('object')
+      expect(bids.length).to.equal(0)
+    })
+    describe('when the server response return a bid', function() {
+      describe('the bid is a banner', function() {
+        it('should return a banner bid', function() {
+          const request = spec.buildRequests([validBidRequests[0]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    width: 100,
+                    height: 100
+                  },
+                  advertiserDomains: ['voxexchange.io']
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].mediaType).to.equal(spec.supportedMediaTypes[0])
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].width).to.equal(100)
+          expect(bids[0].height).to.equal(100)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(bids[0].meta.advertiserDomains).to.deep.equal(['voxexchange.io'])
+          expect(typeof bids[0].ad).to.equal('string')
+        })
+        it('should return a In-Image bid', function() {
+          const request = spec.buildRequests([validBidRequests[2]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    width: 100,
+                    height: 100
+                  },
+                  ttl: 360
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].width).to.equal(100)
+          expect(bids[0].height).to.equal(100)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(typeof bids[0].ad).to.equal('string')
+        })
+      })
+      describe('the bid is a video', function() {
+        it('should return a video bid', function() {
+          const request = spec.buildRequests([validBidRequests[1]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: 'html',
+                  transactionId: '31a58515-3634-4e90-9c96-f86196db1459'
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].mediaType).to.equal(spec.supportedMediaTypes[1])
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(typeof bids[0].vastXml).to.equal('string')
+        })
+      })
+    })
+  })
+})
diff --git a/test/spec/modules/vrtcalBidAdapter_spec.js b/test/spec/modules/vrtcalBidAdapter_spec.js
index 729b0a723e4..d911745d378 100644
--- a/test/spec/modules/vrtcalBidAdapter_spec.js
+++ b/test/spec/modules/vrtcalBidAdapter_spec.js
@@ -1,135 +1,121 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/vrtcalBidAdapter.js';
+import { expect } from 'chai'
+import { spec } from 'modules/vrtcalBidAdapter'
+import { newBidder } from 'src/adapters/bidderFactory'
+import { config } from 'src/config.js';
+import { createEidsArray } from 'modules/userId/eids.js';
 
-describe('Vrtcal Adapter', function () {
-  let bid = {
+describe('vrtcalBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  let bidRequest = {
     bidId: 'bidID0001',
-    bidder: 'vrtcal',
-    bidderRequestId: 'brID0001',
-    auctionId: 'auID0001',
-    sizes: [[300, 250]],
-    transactionId: 'tid0001',
-    adUnitCode: 'vrtcal-test-adunit'
-  };
+    transactionId: 'transID0001',
+    sizes: [[ 300, 250 ]]
+  }
 
   describe('isBidRequestValid', function () {
-    it('Should return true when base params as set', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
-    });
-    it('Should return false when bid.bidId is blank', function () {
-      bid.bidId = '';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-    });
-    it('Should return false when bid.auctionId is blank', function () {
-      bid.auctionId = '';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
-    });
-  });
+    it('should return true 100% of time as no special additional params are required, thus no additional validation needed', function () {
+      expect(spec.isBidRequestValid(bidRequest)).to.be.true
+    })
+  })
 
   describe('buildRequests', function () {
-    let serverRequests = spec.buildRequests([bid]);
+    let bidRequests = [
+      {
+        'bidder': 'vrtcal',
+        'adUnitCode': 'adunit0001',
+        'sizes': [[300, 250]],
+        'bidId': 'bidID0001',
+        'bidderRequestId': 'br0001',
+        'auctionId': 'auction0001',
+        'userIdAsEids': {}
+      }
+    ];
 
-    let serverRequest = serverRequests[0];
+    let request = spec.buildRequests(bidRequests);
 
-    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('sends bid request to our endpoint via POST', function () {
+      expect(request[0].method).to.equal('POST');
     });
-    it('Returns POST method', function () {
-      expect(serverRequest.method).to.equal('POST');
+
+    it('adUnitCode should be sent as prebidAdUnitCode parameters on any requests', function () {
+      expect(request[0].data).to.match(/"prebidAdUnitCode":"adunit0001"/);
     });
-    it('Returns valid URL', function () {
-      expect(serverRequest.url).to.equal('https://rtb.vrtcal.com/bidder_prebid.vap?ssp=1804');
+
+    it('if the publisher has NOT set a floor via the floors module, zero should be sent as  bidfloor parameter on any requests', function () {
+      expect(request[0].data).to.match(/"bidfloor":0/);
     });
 
-    it('Returns valid data if array of bids is valid', function () {
-      let data = JSON.parse(serverRequest.data);
-      expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('prebidJS', 'prebidAdUnitCode', 'id', 'imp', 'site', 'device');
-      expect(data.prebidJS).to.not.equal('');
-      expect(data.prebidAdUnitCode).to.not.equal('');
+    it('if the publisher has set a floor via the floors module, it should be sent as  bidfloor parameter on any requests', function () {
+      let floorInfo;
+      bidRequests[0].getFloor = () => floorInfo;
+      floorInfo = {currency: 'USD', floor: 0.55};
+      request = spec.buildRequests(bidRequests);
+      expect(request[0].data).to.match(/"bidfloor":0.55/);
     });
 
-    it('Sets width and height based on existence of bid.mediaTypes.banner', function () {
-      let data = JSON.parse(serverRequest.data);
-      if (typeof (bid.mediaTypes) !== 'undefined' && typeof (bid.mediaTypes.banner) !== 'undefined' && typeof (bid.mediaTypes.banner.sizes) !== 'undefined') {
-	   expect(data.imp[0].banner.w).to.equal(bid.mediaTypes.banner.sizes[0][0]);
-	   expect(data.imp[0].banner.h).to.equal(bid.mediaTypes.banner.sizes[0][1]);
-      } else {
-	   expect(data.imp[0].banner.w).to.equal(bid.sizes[0][0]);
-	   expect(data.imp[0].banner.h).to.equal(bid.sizes[0][1]);
-      }
+    it('pass GDPR,CCPA, and COPPA indicators/consent strings with the request when present', function () {
+      bidRequests[0].gdprConsent = {consentString: 'gdpr-consent-string', gdprApplies: true};
+      bidRequests[0].uspConsent = 'ccpa-consent-string';
+      config.setConfig({ coppa: false });
+
+      request = spec.buildRequests(bidRequests);
+      expect(request[0].data).to.match(/"user":{"ext":{"consent":"gdpr-consent-string"/);
+      expect(request[0].data).to.match(/"regs":{"coppa":0,"ext":{"gdpr":1,"us_privacy":"ccpa-consent-string"}}/);
     });
 
-    it('Returns empty data if no valid requests are passed', function () {
-      serverRequests = spec.buildRequests([]);
-      expect(serverRequests).to.be.an('array').that.is.empty;
+    it('pass bidder timeout/tmax with the request', function () {
+      config.setConfig({ bidderTimeout: 435 });
+      request = spec.buildRequests(bidRequests);
+      expect(request[0].data).to.match(/"tmax":435/);
+    });
+
+    it('pass 3rd party IDs with the request when present', function () {
+      bidRequests[0].userIdAsEids = createEidsArray({
+        tdid: 'TTD_ID_FROM_USER_ID_MODULE'
+      });
+
+      request = spec.buildRequests(bidRequests);
+      expect(request[0].data).to.include(JSON.stringify({ext: {consent: 'gdpr-consent-string', eids: [{source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]}]}}));
     });
   });
 
   describe('interpretResponse', function () {
-    let bid = {
-      bidId: 'bidID0001',
-      bidder: 'vrtcal',
-      bidderRequestId: 'brID0001',
-      auctionId: 'auID0001',
-      sizes: [[300, 250]],
-      transactionId: 'tid0001',
-      adUnitCode: 'vrtcal-test-adunit'
-    };
-
-    let serverRequests = spec.buildRequests([bid]);
-
-    let resObject = {body: {id: 'vrtcal-test-id', width: 300, height: 250, seatbid: [{bid: [{price: 3.0, w: 300, h: 250, crid: 'testcrid', adm: 'testad', nurl: 'https://vrtcal.com/faketracker'}]}], currency: 'USD', netRevenue: true, ttl: 900}};
-
-    let serverResponses = spec.interpretResponse(resObject, serverRequests);
-
-    it('Returns an array of valid server responses if response object is valid', function () {
-      expect(serverResponses).to.be.an('array').that.is.not.empty;
-      for (let i = 0; i < serverResponses.length; i++) {
-        let dataItem = serverResponses[i];
-        expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
-          'netRevenue', 'currency', 'nurl');
-        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.ad).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.nurl).to.be.a('string');
+    it('should form compliant bid object response', function () {
+      let res = {
+        body: {
+          id: 'bidID0001',
+          seatbid: [{
+            bid: [{
+              id: 'VRTB_240d3c8a3c12b68_1',
+              impid: '1',
+              price: 0.7554,
+              adm: 'TEST AD',
+              nurl: 'https://adplatform.vrtcal.com/wintracker',
+              w: 300,
+              h: 250,
+              crid: 'v2_1064_vrt_vrtcaltestdisplay2_300_250',
+              adomain: ['vrtcal.com']
+            }],
+            seat: '16'
+          }],
+          cur: 'USD'
+        }
       }
 
-      it('Returns an empty array if invalid response is passed', function () {
-        serverResponses = spec.interpretResponse('invalid_response');
-        expect(serverResponses).to.be.an('array').that.is.empty;
-      });
-    });
-  });
+      let ir = spec.interpretResponse(res, bidRequest)
 
-  describe('onBidWon', function () {
-    let bid = {
-      bidId: '2dd581a2b6281d',
-      bidder: 'vrtcal',
-      bidderRequestId: '145e1d6a7837c9',
-      auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
-      sizes: [[300, 250]],
-      transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
-      adUnitCode: 'vrtcal-test-adunit'
-    };
-
-    let serverRequests = spec.buildRequests([bid]);
-    let resObject = {body: {id: 'vrtcal-test-id', width: 300, height: 250, seatbid: [{bid: [{price: 3.0, w: 300, h: 250, crid: 'testcrid', adm: 'testad', nurl: 'https://vrtcal.com/faketracker'}]}], currency: 'USD', netRevenue: true, ttl: 900}};
-    let serverResponses = spec.interpretResponse(resObject, serverRequests);
-    let wonbid = serverResponses[0];
-
-    it('Returns true is nurl is good/not blank', function () {
-      expect(wonbid.nurl).to.not.equal('');
-      expect(spec.onBidWon(wonbid)).to.be.true;
-    });
-  });
-});
+      expect(ir.length).to.equal(1)
+
+      let en = ir[0]
+
+      expect(en.requestId != null &&
+            en.cpm != null && typeof en.cpm === 'number' &&
+            en.width != null && typeof en.width === 'number' &&
+            en.height != null && typeof en.height === 'number' &&
+            en.ad != null &&
+            en.creativeId != null
+      ).to.be.true
+    })
+  })
+})
diff --git a/test/spec/modules/vubleBidAdapter_spec.js b/test/spec/modules/vubleBidAdapter_spec.js
deleted file mode 100644
index 2f0d1c1e262..00000000000
--- a/test/spec/modules/vubleBidAdapter_spec.js
+++ /dev/null
@@ -1,412 +0,0 @@
-// import or require modules necessary for the test, e.g.:
-
-import {expect} from 'chai';
-import {spec as adapter} from 'modules/vubleBidAdapter.js';
-import * as utils from 'src/utils.js';
-
-describe('VubleAdapter', function () {
-  describe('Check methods existance', function () {
-    it('exists and is a function', function () {
-      expect(adapter.isBidRequestValid).to.exist.and.to.be.a('function');
-    });
-    it('exists and is a function', function () {
-      expect(adapter.buildRequests).to.exist.and.to.be.a('function');
-    });
-    it('exists and is a function', function () {
-      expect(adapter.interpretResponse).to.exist.and.to.be.a('function');
-    });
-    it('exists and is a function', function () {
-      expect(adapter.getUserSyncs).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('Check method isBidRequestValid return', function () {
-    let bid = {
-      bidder: 'vuble',
-      params: {
-        env: 'net',
-        pubId: '3',
-        zoneId: '12345',
-        floorPrice: 5.00 // optional
-      },
-      sizes: [[640, 360]],
-      mediaTypes: {
-        video: {
-          context: 'instream'
-        }
-      },
-    };
-    let bid2 = {
-      bidder: 'vuble',
-      params: {
-        env: 'net',
-        pubId: '3',
-        zoneId: '12345',
-        floorPrice: 5.00 // optional
-      },
-      mediaTypes: {
-        video: {
-          context: 'instream',
-          playerSize: [640, 360]
-        }
-      },
-    };
-
-    it('should be true', function () {
-      expect(adapter.isBidRequestValid(bid)).to.be.true;
-      expect(adapter.isBidRequestValid(bid2)).to.be.true;
-    });
-
-    it('should be false because the sizes are missing or in the wrong format', function () {
-      let wrongBid = utils.deepClone(bid);
-      wrongBid.sizes = '640360';
-      expect(adapter.isBidRequestValid(wrongBid)).to.be.false;
-
-      wrongBid = utils.deepClone(bid);
-      delete wrongBid.sizes;
-      expect(adapter.isBidRequestValid(wrongBid)).to.be.false;
-    });
-
-    it('should be false because the mediaType is missing or wrong', function () {
-      let wrongBid = utils.deepClone(bid);
-      wrongBid.mediaTypes = {};
-      expect(adapter.isBidRequestValid(wrongBid)).to.be.false;
-
-      wrongBid = utils.deepClone(bid);
-      delete wrongBid.mediaTypes;
-      expect(adapter.isBidRequestValid(wrongBid)).to.be.false;
-    });
-
-    it('should be false because the env is missing or wrong', function () {
-      let wrongBid = utils.deepClone(bid);
-      wrongBid.params.env = 'us';
-      expect(adapter.isBidRequestValid(wrongBid)).to.be.false;
-
-      wrongBid = utils.deepClone(bid);
-      delete wrongBid.params.env;
-      expect(adapter.isBidRequestValid(wrongBid)).to.be.false;
-    });
-
-    it('should be false because params.pubId is missing', function () {
-      let wrongBid = utils.deepClone(bid);
-      delete wrongBid.params.pubId;
-      expect(adapter.isBidRequestValid(wrongBid)).to.be.false;
-    });
-
-    it('should be false because params.zoneId is missing', function () {
-      let wrongBid = utils.deepClone(bid);
-      delete wrongBid.params.zoneId;
-      expect(adapter.isBidRequestValid(wrongBid)).to.be.false;
-    });
-  });
-
-  describe('Check buildRequests method', function () {
-    // Bids to be formatted
-    let bid1 = {
-      bidder: 'vuble',
-      params: {
-        env: 'net',
-        pubId: '3',
-        zoneId: '12345',
-        floorPrice: 5.50 // optional
-      },
-      sizes: [[640, 360]],
-      mediaTypes: {
-        video: {
-          context: 'instream'
-        }
-      },
-      bidId: 'abdc',
-      adUnitCode: ''
-    };
-    let bid2 = {
-      bidder: 'vuble',
-      params: {
-        env: 'com',
-        pubId: '8',
-        zoneId: '2468',
-        referrer: 'https://www.vuble.fr/'
-      },
-      sizes: '640x360',
-      mediaTypes: {
-        video: {
-          context: 'outstream'
-        }
-      },
-      bidId: 'efgh',
-      adUnitCode: 'code'
-    };
-    let bid3 = {
-      bidder: 'vuble',
-      params: {
-        env: 'net',
-        pubId: '3',
-        zoneId: '3579',
-      },
-      mediaTypes: {
-        video: {
-          context: 'instream',
-          playerSize: [640, 360]
-        }
-      },
-      bidId: 'ijkl',
-      adUnitCode: ''
-    };
-
-    // Formatted requets
-    let request1 = {
-      method: 'POST',
-      url: 'https://player.mediabong.net/prebid/request',
-      data: {
-        width: '640',
-        height: '360',
-        pub_id: '3',
-        zone_id: '12345',
-        context: 'instream',
-        floor_price: 5.5,
-        url: '',
-        env: 'net',
-        bid_id: 'abdc',
-        adUnitCode: ''
-      }
-    };
-    let request2 = {
-      method: 'POST',
-      url: 'https://player.mediabong.com/prebid/request',
-      data: {
-        width: '640',
-        height: '360',
-        pub_id: '8',
-        zone_id: '2468',
-        context: 'outstream',
-        floor_price: 0,
-        url: 'https://www.vuble.fr/',
-        env: 'com',
-        bid_id: 'efgh',
-        adUnitCode: 'code'
-      }
-    };
-    let request3 = {
-      method: 'POST',
-      url: 'https://player.mediabong.net/prebid/request',
-      data: {
-        width: '640',
-        height: '360',
-        pub_id: '3',
-        zone_id: '3579',
-        context: 'instream',
-        floor_price: 0,
-        url: 'https://www.vuble.tv/',
-        env: 'net',
-        bid_id: 'ijkl',
-        adUnitCode: ''
-      }
-    };
-    let request4 = {
-      method: 'POST',
-      url: 'https://player.mediabong.net/prebid/request',
-      data: {
-        width: '640',
-        height: '360',
-        pub_id: '3',
-        zone_id: '3579',
-        context: 'instream',
-        floor_price: 0,
-        url: '',
-        env: 'net',
-        bid_id: 'ijkl',
-        adUnitCode: '',
-        gdpr_consent: {
-          consent_string: 'test',
-          gdpr_applies: true
-        }
-      }
-    };
-    let bidderRequest1 = {
-      refererInfo: {
-        referer: 'https://www.vuble.tv/',
-        reachedTop: true,
-        numIframes: 1,
-        stack: [
-          'http://example.com/page.html',
-          'http://example.com/iframe1.html',
-          'http://example.com/iframe2.html'
-        ]
-      }
-    };
-    let bidderRequest2 = {
-      'gdprConsent': {
-        consentString: 'test',
-        gdprApplies: true
-      }
-    };
-
-    it('must return the right formatted requests', function () {
-      expect(adapter.buildRequests([bid1, bid2])).to.deep.equal([request1, request2]);
-      expect(adapter.buildRequests([bid3], bidderRequest1)).to.deep.equal([request3]);
-      expect(adapter.buildRequests([bid3], bidderRequest2)).to.deep.equal([request4]);
-    });
-  });
-
-  describe('Check interpretResponse method return', function () {
-    // Server's response
-    let response = {
-      body: {
-        status: 'ok',
-        cpm: 5.00,
-        creativeId: '2468',
-        url: 'https//player.mediabong.net/prebid/ad/a1b2c3d4',
-        dealId: 'MDB-TEST-1357'
-      }
-    };
-    // bid Request
-    let bid = {
-      data: {
-        context: 'instream',
-        env: 'net',
-        width: '640',
-        height: '360',
-        pub_id: '3',
-        zone_id: '12345',
-        bid_id: 'abdc',
-        floor_price: 5.50, // optional
-        adUnitCode: 'code'
-      },
-      method: 'POST',
-      url: 'https://player.mediabong.net/prebid/request'
-    };
-    // Formatted reponse
-    let result = {
-      requestId: 'abdc',
-      cpm: 5.00,
-      width: '640',
-      height: '360',
-      ttl: 60,
-      creativeId: '2468',
-      dealId: 'MDB-TEST-1357',
-      netRevenue: true,
-      currency: 'USD',
-      vastUrl: 'https//player.mediabong.net/prebid/ad/a1b2c3d4',
-      mediaType: 'video'
-    };
-
-    it('should equal to the expected formatted result', function () {
-      expect(adapter.interpretResponse(response, bid)).to.deep.equal([result]);
-    });
-
-    it('should be empty because the status is missing or wrong', function () {
-      let wrongResponse = utils.deepClone(response);
-      wrongResponse.body.status = 'ko';
-      expect(adapter.interpretResponse(wrongResponse, bid)).to.be.empty;
-
-      wrongResponse = utils.deepClone(response);
-      delete wrongResponse.body.status;
-      expect(adapter.interpretResponse(wrongResponse, bid)).to.be.empty;
-    });
-
-    it('should be empty because the body is missing or wrong', function () {
-      let wrongResponse = utils.deepClone(response);
-      wrongResponse.body = [1, 2, 3];
-      expect(adapter.interpretResponse(wrongResponse, bid)).to.be.empty;
-
-      wrongResponse = utils.deepClone(response);
-      delete wrongResponse.body;
-      expect(adapter.interpretResponse(wrongResponse, bid)).to.be.empty;
-    });
-
-    it('should equal to the expected formatted result', function () {
-      response.body.renderer_url = 'vuble_renderer.js';
-      result.adUnitCode = 'code';
-      let formattedResponses = adapter.interpretResponse(response, bid);
-      expect(formattedResponses[0].adUnitCode).to.equal(result.adUnitCode);
-    });
-  });
-
-  describe('Check getUserSyncs method return', function () {
-    // Sync options
-    let syncOptions = {
-      iframeEnabled: false
-    };
-    // Server's response
-    let response = {
-      body: {
-        status: 'ok',
-        cpm: 5.00,
-        creativeId: '2468',
-        url: 'https//player.mediabong.net/prebid/ad/a1b2c3d4'
-      }
-    };
-    // Formatted reponse
-    let result = {
-      type: 'iframe',
-      url: 'https://player.mediabong.net/csifr?1234'
-    };
-
-    it('should return an empty array', function () {
-      expect(adapter.getUserSyncs({}, [])).to.be.empty;
-      expect(adapter.getUserSyncs({}, [])).to.be.empty;
-      expect(adapter.getUserSyncs(syncOptions, [response])).to.be.empty;
-      expect(adapter.getUserSyncs(syncOptions, [response])).to.be.empty;
-      syncOptions.iframeEnabled = true;
-      expect(adapter.getUserSyncs(syncOptions, [response])).to.be.empty;
-      expect(adapter.getUserSyncs(syncOptions, [response])).to.be.empty;
-    });
-
-    it('should be equal to the expected result', function () {
-      response.body.iframeSync = 'https://player.mediabong.net/csifr?1234';
-      expect(adapter.getUserSyncs(syncOptions, [response])).to.deep.equal([result]);
-    })
-  });
-
-  describe('Check outstream scenario with renderer', function () {
-    // bid Request
-    let bid = {
-      data: {
-        context: 'outstream',
-        env: 'net',
-        width: '640',
-        height: '360',
-        pub_id: '3',
-        zone_id: '12345',
-        bid_id: 'abdc',
-        floor_price: 5.50, // optional
-        adUnitCode: 'code'
-      },
-      method: 'POST',
-      url: 'https://player.mediabong.net/prebid/request'
-    };
-    // Server's response
-    let response = {
-      body: {
-        status: 'ok',
-        cpm: 5.00,
-        creativeId: '2468',
-        url: 'https//player.mediabong.net/prebid/ad/a1b2c3d4',
-        dealId: 'MDB-TEST-1357',
-        renderer_id: 0,
-        renderer_url: 'vuble_renderer.js',
-        content: 'test'
-      }
-    };
-
-    let adResponse = {
-      ad: {
-        video: {
-          content: 'test'
-        }
-      }
-    };
-    let adUnitCode = 'code';
-    let rendererUrl = 'vuble_renderer.js';
-    let rendererId = 0;
-
-    let formattedResponses = adapter.interpretResponse(response, bid);
-    it('should equal to the expected format result', function () {
-      expect(formattedResponses[0].adResponse).to.deep.equal(adResponse);
-      expect(formattedResponses[0].adUnitCode).to.deep.equal(adUnitCode);
-      expect(formattedResponses[0].renderer.url).to.equal(rendererUrl);
-      expect(formattedResponses[0].renderer.id).to.equal(rendererId);
-      expect(formattedResponses[0].renderer.render).to.exist.and.to.be.a('function');
-    });
-  });
-});
diff --git a/test/spec/modules/vuukleBidAdapter_spec.js b/test/spec/modules/vuukleBidAdapter_spec.js
new file mode 100644
index 00000000000..32ba74867bb
--- /dev/null
+++ b/test/spec/modules/vuukleBidAdapter_spec.js
@@ -0,0 +1,148 @@
+import { expect } from 'chai';
+import { spec } from 'modules/vuukleBidAdapter.js';
+import { config } from '../../../src/config.js';
+
+describe('vuukleBidAdapterTests', function() {
+  let bidRequestData = {
+    bids: [
+      {
+        bidId: 'testbid',
+        bidder: 'vuukle',
+        params: {
+          test: 1
+        },
+        sizes: [[300, 250]]
+      }
+    ]
+  };
+  let request = [];
+
+  it('validate_pub_params', function() {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'vuukle',
+        params: {
+          test: 1
+        }
+      })
+    ).to.equal(true);
+  });
+
+  it('validate_generated_params', function() {
+    request = spec.buildRequests(bidRequestData.bids);
+    let req_data = request[0].data;
+
+    expect(req_data.bidId).to.equal('testbid');
+  });
+
+  it('validate_generated_params_tmax', function() {
+    request = spec.buildRequests(bidRequestData.bids, {timeout: 1234});
+    let req_data = request[0].data;
+
+    expect(req_data.tmax).to.equal(1234);
+  });
+
+  it('validate_response_params', function() {
+    let serverResponse = {
+      body: {
+        'cpm': 0.01,
+        'width': 300,
+        'height': 250,
+        'creative_id': '12345',
+        'ad': 'test ad',
+        'adomain': ['example.com']
+      }
+    };
+
+    request = spec.buildRequests(bidRequestData.bids);
+    let bids = spec.interpretResponse(serverResponse, request[0]);
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+    expect(bid.ad).to.equal('test ad');
+    expect(bid.cpm).to.equal(0.01);
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('12345');
+    expect(bid.meta.advertiserDomains).to.deep.equal(['example.com']);
+  });
+
+  describe('consent handling', function() {
+    const bidderRequest = {
+      gdprConsent: {
+        consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+        gdprApplies: 1,
+        vendorData: {
+          vendor: {
+            consents: {
+              1004: 1
+            }
+          }
+        }
+      }
+    }
+
+    it('must handle consent 1/1', function() {
+      request = spec.buildRequests(bidRequestData.bids, bidderRequest);
+      let req_data = request[0].data;
+
+      expect(req_data.gdpr).to.equal(1);
+      expect(req_data.consentGiven).to.equal(1);
+      expect(req_data.consent).to.equal('COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw');
+    })
+
+    it('must handle consent 0/1', function() {
+      bidderRequest.gdprConsent.gdprApplies = 0;
+      request = spec.buildRequests(bidRequestData.bids, bidderRequest);
+      let req_data = request[0].data;
+
+      expect(req_data.gdpr).to.equal(0);
+      expect(req_data.consentGiven).to.equal(1);
+    })
+
+    it('must handle consent 0/0', function() {
+      bidderRequest.gdprConsent.gdprApplies = 0;
+      bidderRequest.gdprConsent.vendorData = undefined;
+      request = spec.buildRequests(bidRequestData.bids, bidderRequest);
+      let req_data = request[0].data;
+
+      expect(req_data.gdpr).to.equal(0);
+      expect(req_data.consentGiven).to.equal(0);
+    })
+
+    it('must handle consent undef', function() {
+      request = spec.buildRequests(bidRequestData.bids, {});
+      let req_data = request[0].data;
+
+      expect(req_data.gdpr).to.equal(0);
+      expect(req_data.consentGiven).to.equal(0);
+    })
+  })
+
+  it('must handle usp consent', function() {
+    request = spec.buildRequests(bidRequestData.bids, {uspConsent: '1YNN'});
+    let req_data = request[0].data;
+
+    expect(req_data.uspConsent).to.equal('1YNN');
+  })
+
+  it('must handle undefined usp consent', function() {
+    request = spec.buildRequests(bidRequestData.bids, {});
+    let req_data = request[0].data;
+
+    expect(req_data.uspConsent).to.equal(undefined);
+  })
+
+  it('must handle coppa flag', function() {
+    sinon.stub(config, 'getConfig')
+      .withArgs('coppa')
+      .returns(true);
+
+    request = spec.buildRequests(bidRequestData.bids);
+    let req_data = request[0].data;
+
+    expect(req_data.coppa).to.equal(1);
+
+    config.getConfig.restore();
+  })
+});
diff --git a/test/spec/modules/waardexBidAdapter_spec.js b/test/spec/modules/waardexBidAdapter_spec.js
index fae70335d3c..0b2e971aafd 100644
--- a/test/spec/modules/waardexBidAdapter_spec.js
+++ b/test/spec/modules/waardexBidAdapter_spec.js
@@ -1,57 +1,201 @@
 import {expect} from 'chai';
 import {spec} from '../../../modules/waardexBidAdapter.js';
-import { auctionManager } from 'src/auctionManager.js';
-import { deepClone } from 'src/utils.js';
+import {auctionManager} from 'src/auctionManager.js';
+import {deepClone} from 'src/utils.js';
 
 describe('waardexBidAdapter', () => {
-  const validBid = {
-    bidId: '112435ry',
-    bidder: 'waardex',
-    params: {
-      placementId: 1,
-      traffic: 'banner',
-      pubId: 1,
-    }
-  };
-
   describe('isBidRequestValid', () => {
-    it('Should return true. bidId and params such as placementId and pubId are present', () => {
-      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    it('should return true. bidId and params such as placementId and zoneId are present', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.true;
+    });
+
+    it('should return false. bidId is not present in bid object', () => {
+      const result = spec.isBidRequestValid({
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return false. zoneId is not present in bid.params object', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return true when mediaTypes field is empty', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.true;
+    });
+
+    it('should return false when mediaTypes.video.playerSize field is empty', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {}
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return false when mediaTypes.video.playerSize field is not an array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: 'not-array'
+          }
+        }
+      });
+
+      expect(result).to.be.false;
     });
-    it('Should return false. bidId is not present in bid object', () => {
-      const invalidBid = deepClone(validBid);
-      delete invalidBid.bidId;
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+
+    it('should return false when mediaTypes.video.playerSize field is an empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: []
+          }
+        }
+      });
+
+      expect(result).to.be.false;
     });
-    it('Should return false. placementId is not present in bid.params object', () => {
-      const invalidBid = deepClone(validBid);
-      delete invalidBid.params.placementId;
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+
+    it('should return false when mediaTypes.video.playerSize field is empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: []
+          }
+        }
+      });
+
+      expect(result).to.be.false;
     });
-    it('Should return false. pubId is not present in bid.params object', () => {
-      const invalidBid = deepClone(validBid);
-      delete invalidBid.params.pubId;
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+
+    it('should return true when mediaTypes.video.playerSize field is non-empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 400]]
+          }
+        }
+      });
+
+      expect(result).to.be.true;
     });
   });
 
   describe('buildRequests', () => {
     let getAdUnitsStub;
-    const validBidRequests = [{
-      bidId: 'fergr675ujgh',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 600], [300, 250]]
-        }
-      },
-      params: {
-        placementId: 1,
-        bidfloor: 1.5,
-        position: 1,
-        instl: 1,
-        pubId: 100
+    const validBidRequests = [
+      {
+        bidId: 'fergr675ujgh',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 600], [300, 250]]
+          }
+        },
+        params: {
+          bidfloor: 1.5,
+          position: 1,
+          instl: 1,
+          zoneId: 100
+        },
       },
-    }];
+      {
+        bidId: 'unique-bid-id-2',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 400]]
+          }
+        },
+        params: {
+          mimes: ['video/x-ms-wmv', 'video/mp4'],
+          minduration: 2,
+          maxduration: 10,
+          protocols: ['VAST 1.0', 'VAST 2.0'],
+          startdelay: -1,
+          placement: 1,
+          skip: 1,
+          skipafter: 2,
+          minbitrate: 0,
+          maxbitrate: 0,
+          delivery: [1, 2, 3],
+          playbackmethod: [1, 2],
+          api: [1, 2, 3, 4, 5, 6],
+          linearity: 1,
+        }
+      }
+    ];
 
     const bidderRequest = {
       refererInfo: {
@@ -63,17 +207,17 @@ describe('waardexBidAdapter', () => {
     afterEach(() => getAdUnitsStub.restore());
 
     it('should return valid build request object', () => {
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
       const {
         data: payload,
         url,
-        method,
-      } = request;
+        method
+      } = spec.buildRequests(validBidRequests, bidderRequest);
+
+      const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid?pubId=${validBidRequests[0].params.zoneId}`;
 
       expect(payload.bidRequests[0]).deep.equal({
         bidId: validBidRequests[0].bidId,
-        placementId: validBidRequests[0].params.placementId,
-        bidfloor: validBidRequests[0].params.bidfloor,
+        bidfloor: 0,
         position: validBidRequests[0].params.position,
         instl: validBidRequests[0].params.instl,
         banner: {
@@ -89,7 +233,6 @@ describe('waardexBidAdapter', () => {
           ],
         }
       });
-      const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid?pubId=${validBidRequests[0].params.pubId}`;
       expect(url).to.equal(ENDPOINT);
       expect(method).to.equal('POST');
     });
@@ -98,44 +241,87 @@ describe('waardexBidAdapter', () => {
   describe('interpretResponse', () => {
     const serverResponse = {
       body: {
-        seatbid: [{
-          bid: [{
-            id: 'someId',
-            price: 3.3,
-            w: 250,
-            h: 300,
-            crid: 'dspCreativeIdHere',
-            adm: 'html markup here',
-            dealId: '123456789',
-            cid: 'dsp campaign id',
-            adomain: 'advertisers domain',
-            ext: {
-              mediaType: 'banner',
-            },
-          }],
-        }],
+        seatbid: [
+          {
+            bid: [
+              {
+                'id': 'ec90d4ee25433c0875c56f59acc12109',
+                'adm': 'banner should be here',
+                'w': 300,
+                'h': 250,
+                'price': 0.15827000000000002,
+                'nurl': 'http://n63.justbidit.xyz?w=n&p=${AUCTION_PRICE}&t=b&uq=eb31018b3da8965dde414c0006b1fb31',
+                'impid': 'unique-bid-id-1',
+                'adomain': [
+                  'www.kraeuterhaus.de'
+                ],
+                'cat': [
+                  'IAB24'
+                ],
+                'attr': [
+                  4
+                ],
+                'iurl': 'https://rtb.bsmartdata.com/preview.php?id=13',
+                'cid': '286557fda4585dc1c7f98b773de92509',
+                'crid': 'dd2b5a1f3f1fc5e63b042ebf4b00ca80'
+              },
+            ],
+          }
+        ],
       },
     };
 
+    const request = {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/86.0.4240.198 Safari/537.36',
+      'language': 'en',
+      'referer': 'https%3A%2F%2Fwww.google.com%2F%3Fsome_param%3Dsome_value',
+      'coppa': false,
+      'data': {
+        'bidRequests': [
+          {
+            'bidId': 'unique-bid-id-1',
+            'position': 1,
+            'instl': 1,
+            'banner': {
+              'sizes': [
+                {
+                  'width': 300,
+                  'height': 600
+                },
+                {
+                  'width': 300,
+                  'height': 250
+                }
+              ]
+            }
+          },
+        ]
+      }
+    };
+
     it('bid response is valid', () => {
-      const result = spec.interpretResponse(serverResponse);
-      const expected = [{
-        requestId: serverResponse.body.seatbid[0].bid[0].id,
-        cpm: serverResponse.body.seatbid[0].bid[0].price,
-        currency: 'USD',
-        width: serverResponse.body.seatbid[0].bid[0].w,
-        height: serverResponse.body.seatbid[0].bid[0].h,
-        creativeId: serverResponse.body.seatbid[0].bid[0].crid,
-        netRevenue: true,
-        ttl: 3000,
-        ad: serverResponse.body.seatbid[0].bid[0].adm,
-        dealId: serverResponse.body.seatbid[0].bid[0].dealid,
-        meta: {
-          cid: serverResponse.body.seatbid[0].bid[0].cid,
-          adomain: serverResponse.body.seatbid[0].bid[0].adomain,
-          mediaType: serverResponse.body.seatbid[0].bid[0].ext.mediaType,
-        },
-      }];
+      const result = spec.interpretResponse(serverResponse, request);
+
+      const expected = [
+        {
+          requestId: 'unique-bid-id-1',
+          cpm: serverResponse.body.seatbid[0].bid[0].price,
+          currency: 'USD',
+          width: serverResponse.body.seatbid[0].bid[0].w,
+          height: serverResponse.body.seatbid[0].bid[0].h,
+          mediaType: 'banner',
+          creativeId: serverResponse.body.seatbid[0].bid[0].crid,
+          netRevenue: true,
+          ttl: 3000,
+          ad: serverResponse.body.seatbid[0].bid[0].adm,
+          dealId: serverResponse.body.seatbid[0].bid[0].dealid,
+          meta: {
+            cid: serverResponse.body.seatbid[0].bid[0].cid,
+            adomain: serverResponse.body.seatbid[0].bid[0].adomain,
+            mediaType: (serverResponse.body.seatbid[0].bid[0].ext || {}).mediaType,
+          },
+        }
+      ];
       expect(result).deep.equal(expected);
     });
 
diff --git a/test/spec/modules/weboramaRtdProvider_spec.js b/test/spec/modules/weboramaRtdProvider_spec.js
new file mode 100644
index 00000000000..bbc1c6d6f02
--- /dev/null
+++ b/test/spec/modules/weboramaRtdProvider_spec.js
@@ -0,0 +1,3558 @@
+import {
+  weboramaSubmodule
+} from 'modules/weboramaRtdProvider.js';
+import {
+  server
+} from 'test/mocks/xhr.js';
+import {
+  storage,
+  DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY,
+  DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY
+} from '../../../modules/weboramaRtdProvider.js';
+
+import 'src/prebid.js';
+
+const responseHeader = {
+  'Content-Type': 'application/json'
+};
+
+describe('weboramaRtdProvider', function() {
+  describe('weboramaSubmodule', function() {
+    it('successfully instantiates and call contextual api', function() {
+      const moduleConfig = {
+        params: {
+          weboCtxConf: {
+            token: 'foo',
+            targetURL: 'https://prebid.org',
+          }
+        }
+      };
+
+      expect(weboramaSubmodule.init(moduleConfig)).to.equal(true);
+    });
+
+    it('instantiate without contextual token should fail', function() {
+      const moduleConfig = {
+        params: {
+          weboCtxConf: {}
+        }
+      };
+      expect(weboramaSubmodule.init(moduleConfig)).to.equal(false);
+    });
+
+    it('instantiate with empty weboUserData conf should return true', function() {
+      const moduleConfig = {
+        params: {
+          weboUserDataConf: {}
+        }
+      };
+      expect(weboramaSubmodule.init(moduleConfig)).to.equal(true);
+    });
+  });
+
+  describe('Handle Set Targeting and Bid Request', function() {
+    let sandbox;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+
+      storage.removeDataFromLocalStorage(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY);
+
+      storage.removeDataFromLocalStorage(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY);
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    });
+
+    describe('Add site-centric data (contextual)', function() {
+      it('should set gam targeting and send to bidders by default', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          webo_ctx: ['foo', 'bar'],
+          webo_ds: ['baz'],
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(200, responseHeader, JSON.stringify(data));
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_ctx=foo;webo_ctx=bar;webo_ds=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_ctx=foo,bar|webo_ds=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: data
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data
+            },
+          }
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'contextual',
+            isDefault: false,
+          },
+        });
+      });
+
+      it('should use asset id when available and set gam targeting and send to bidders by default', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              assetID: 'datasource:docId',
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          webo_vctx: ['foo', 'bar'],
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.weborama.com/api/document-profile?token=foo&assetId=datasource%3AdocId&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(200, responseHeader, JSON.stringify(data));
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_vctx=foo;webo_vctx=bar');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_vctx=foo,bar');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: data
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data
+            },
+          }
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'contextual',
+            isDefault: false,
+          },
+        });
+      });
+
+      it('should use asset id as callback when available and set gam targeting and send to bidders by default', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              assetID: () => 'datasource:docId',
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          webo_vctx: ['foo', 'bar'],
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.weborama.com/api/document-profile?token=foo&assetId=datasource%3AdocId&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(200, responseHeader, JSON.stringify(data));
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_vctx=foo;webo_vctx=bar');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_vctx=foo,bar');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: data
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data
+            },
+          }
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'contextual',
+            isDefault: false,
+          },
+        });
+      });
+
+      it('should handle exception from asset id callback', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              assetID: () => {
+                throw new Error('ops');
+              },
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(server.requests.length).to.equal(0);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({});
+      });
+
+      it('should handle case when callback return falsy value', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              assetID: () => '',
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(server.requests.length).to.equal(0);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({});
+      });
+
+      describe('should set gam targeting and send to one specific bidder and multiple adunits', function() {
+        const testcases = {
+          'single string': 'appnexus',
+          'array with one entry': ['appnexus'],
+          'map with one entry': {
+            'appnexus': true
+          },
+          'map complete': {
+            'smartadserver': false,
+            'pubmatic': false,
+            'appnexus': true,
+            'rubicon': false,
+            'other': false,
+          },
+          'callback': (bid) => {
+            return bid.bidder == 'appnexus'
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const sendToBidders = testcases[label];
+          it(`check sendToBidders as ${label}`, function() {
+            let onDataResponse = {};
+            const moduleConfig = {
+              params: {
+                weboCtxConf: {
+                  token: 'foo',
+                  targetURL: 'https://prebid.org',
+                  sendToBidders: sendToBidders,
+                  onData: (data, meta) => {
+                    onDataResponse = {
+                      data: data,
+                      meta: meta,
+                    };
+                  },
+                }
+              }
+            };
+            const data = {
+              webo_ctx: ['foo', 'bar'],
+              webo_ds: ['baz'],
+            };
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            let request = server.requests[0];
+
+            expect(request.method).to.equal('GET');
+            expect(request.url).to.equal('https://ctx.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+            expect(request.withCredentials).to.be.false;
+
+            request.respond(200, responseHeader, JSON.stringify(data));
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params).to.be.undefined;
+              expect(adUnit.bids[1].params).to.be.undefined;
+              expect(adUnit.bids[2].params.keywords).to.deep.equal(data);
+              expect(adUnit.bids[3].params).to.be.undefined;
+              expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+            });
+
+            expect(onDataResponse).to.deep.equal({
+              data: data,
+              meta: {
+                user: false,
+                source: 'contextual',
+                isDefault: false,
+              },
+            });
+          });
+        });
+      });
+
+      describe('should set gam targeting and send to one specific bidder and one adunit', function() {
+        const testcases = {
+          'map with one entry': {
+            'appnexus': ['adunit1']
+          },
+          'callback': (bid, adUnitCode) => {
+            return bid.bidder == 'appnexus' && adUnitCode == 'adunit1';
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const sendToBidders = testcases[label];
+          it(`check sendToBidders as ${label}`, function() {
+            let onDataResponse = {};
+            const moduleConfig = {
+              params: {
+                weboCtxConf: {
+                  token: 'foo',
+                  targetURL: 'https://prebid.org',
+                  sendToBidders: sendToBidders,
+                  onData: (data, meta) => {
+                    onDataResponse = {
+                      data: data,
+                      meta: meta,
+                    };
+                  },
+                }
+              }
+            };
+            const data = {
+              webo_ctx: ['foo', 'bar'],
+              webo_ds: ['baz'],
+            };
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            let request = server.requests[0];
+
+            expect(request.method).to.equal('GET');
+            expect(request.url).to.equal('https://ctx.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+            expect(request.withCredentials).to.be.false;
+
+            request.respond(200, responseHeader, JSON.stringify(data));
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params).to.be.undefined;
+              expect(adUnit.bids[1].params).to.be.undefined;
+              expect(adUnit.bids[3].params).to.be.undefined;
+              expect(adUnit.bids[4].ortb2).to.be.undefined;
+            });
+
+            expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+            expect(reqBidsConfigObj.adUnits[1].bids[2].params).to.be.undefined;
+
+            expect(onDataResponse).to.deep.equal({
+              data: data,
+              meta: {
+                user: false,
+                source: 'contextual',
+                isDefault: false,
+              },
+            });
+          });
+        });
+      });
+
+      describe('should set gam targeting for multiple adunits but not send to bidders with setPrebidTargeting=<true>/sendToBidders=false', function() {
+        const testcases = {
+          'boolean': true,
+          'array with both units': ['adunit1', 'adunit2'],
+          'callback': () => {
+            return true;
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const setPrebidTargeting = testcases[label];
+          it(`check setPrebidTargeting as ${label}`, function() {
+            const moduleConfig = {
+              params: {
+                weboCtxConf: {
+                  token: 'foo',
+                  targetURL: 'https://prebid.org',
+                  setPrebidTargeting: setPrebidTargeting,
+                  sendToBidders: false,
+                }
+              }
+            };
+            const data = {
+              webo_ctx: ['foo', 'bar'],
+              webo_ds: ['baz'],
+            };
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar',
+                    },
+                    visitor: {
+                      baz: 'bam',
+                    }
+                  }
+                }, {
+                  bidder: 'other',
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar',
+                    },
+                    visitor: {
+                      baz: 'bam',
+                    }
+                  }
+                }, {
+                  bidder: 'other',
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            let request = server.requests[0];
+
+            expect(request.method).to.equal('GET');
+            expect(request.url).to.equal('https://ctx.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+            expect(request.withCredentials).to.be.false;
+
+            request.respond(200, responseHeader, JSON.stringify(data));
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params.target).to.equal('foo=bar');
+              expect(adUnit.bids[1].params.dctr).to.equal('foo=bar');
+              expect(adUnit.bids[2].params.keywords).to.deep.equal({
+                foo: ['bar']
+              });
+              expect(adUnit.bids[3].params).to.deep.equal({
+                inventory: {
+                  foo: 'bar',
+                },
+                visitor: {
+                  baz: 'bam',
+                }
+              });
+
+              expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+            });
+          });
+        });
+      });
+
+      describe('should set gam targeting for one adunit but not send to bidders with setPrebidTargeting=<true>/sendToBidders=false', function() {
+        const testcases = {
+          'array with one unit': ['adunit1'],
+          'callback': (adUnitCode) => {
+            return adUnitCode == 'adunit1';
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const setPrebidTargeting = testcases[label];
+          it(`check setPrebidTargeting as ${label}`, function() {
+            const moduleConfig = {
+              params: {
+                weboCtxConf: {
+                  token: 'foo',
+                  targetURL: 'https://prebid.org',
+                  setPrebidTargeting: setPrebidTargeting,
+                  sendToBidders: false,
+                }
+              }
+            };
+            const data = {
+              webo_ctx: ['foo', 'bar'],
+              webo_ds: ['baz'],
+            };
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar',
+                    },
+                    visitor: {
+                      baz: 'bam',
+                    }
+                  }
+                }, {
+                  bidder: 'other',
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar',
+                    },
+                    visitor: {
+                      baz: 'bam',
+                    }
+                  }
+                }, {
+                  bidder: 'other',
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            let request = server.requests[0];
+
+            expect(request.method).to.equal('GET');
+            expect(request.url).to.equal('https://ctx.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+            expect(request.withCredentials).to.be.false;
+
+            request.respond(200, responseHeader, JSON.stringify(data));
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': {},
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params.target).to.equal('foo=bar');
+              expect(adUnit.bids[1].params.dctr).to.equal('foo=bar');
+              expect(adUnit.bids[2].params.keywords).to.deep.equal({
+                foo: ['bar']
+              });
+              expect(adUnit.bids[3].params).to.deep.equal({
+                inventory: {
+                  foo: 'bar',
+                },
+                visitor: {
+                  baz: 'bam',
+                }
+              });
+
+              expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+            });
+          });
+        });
+      });
+
+      it('should set gam targeting but not send to bidders with (submodule override) setPrebidTargeting=true/(global) sendToBidders=false', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            setPrebidTargeting: false,
+            sendToBidders: false,
+            onData: (data, meta) => {
+              onDataResponse = {
+                data: data,
+                meta: meta,
+              };
+            },
+            weboCtxConf: {
+              token: 'foo',
+              targetURL: 'https://prebid.org',
+              setPrebidTargeting: true, // submodule parameter will override module parameter
+            }
+          }
+        };
+        const data = {
+          webo_ctx: ['foo', 'bar'],
+          webo_ds: ['baz'],
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver',
+              params: {
+                target: 'foo=bar'
+              }
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(200, responseHeader, JSON.stringify(data));
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(1);
+
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'contextual',
+            isDefault: false,
+          },
+        });
+      });
+
+      it('should not set gam targeting with setPrebidTargeting=false but send to bidders', function() {
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              targetURL: 'https://prebid.org',
+              setPrebidTargeting: false,
+            }
+          }
+        };
+        const data = {
+          webo_ctx: ['foo', 'bar'],
+          webo_ds: ['baz'],
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver',
+              params: {
+                target: 'foo=bar'
+              }
+            }, {
+              bidder: 'pubmatic',
+              params: {
+                dctr: 'foo=bar'
+              }
+            }, {
+              bidder: 'appnexus',
+              params: {
+                keywords: {
+                  foo: ['bar']
+                }
+              }
+            }, {
+              bidder: 'rubicon',
+              params: {
+                inventory: {
+                  foo: 'bar',
+                },
+                visitor: {
+                  baz: 'bam',
+                }
+              }
+            }, {
+              bidder: 'other',
+            }]
+          }]
+        }
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(200, responseHeader, JSON.stringify(data));
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': {},
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('foo=bar;webo_ctx=foo;webo_ctx=bar;webo_ds=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('foo=bar|webo_ctx=foo,bar|webo_ds=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal({
+          foo: ['bar'],
+          webo_ctx: ['foo', 'bar'],
+          webo_ds: ['baz'],
+        });
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: {
+            foo: 'bar',
+            webo_ctx: ['foo', 'bar'],
+            webo_ds: ['baz'],
+          },
+          visitor: {
+            baz: 'bam',
+          }
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data
+            },
+          }
+        });
+      });
+
+      it('should use default profile in case of api error', function() {
+        const defaultProfile = {
+          webo_ctx: ['baz'],
+        };
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              targetURL: 'https://prebid.org',
+              setPrebidTargeting: true,
+              defaultProfile: defaultProfile,
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(500, responseHeader);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': defaultProfile,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_ctx=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_ctx=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(defaultProfile);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: defaultProfile
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: defaultProfile
+            },
+          }
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: defaultProfile,
+          meta: {
+            user: false,
+            source: 'contextual',
+            isDefault: true,
+          },
+        });
+      });
+
+      it('should be possible update profile from callbacks for a given bidder/adUnitCode', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              targetURL: 'https://prebid.org',
+              setPrebidTargeting: (adUnitCode, data, meta) => {
+                if (adUnitCode == 'adunit1') {
+                  data['webo_foo'] = ['bar'];
+                }
+                return true;
+              },
+              sendToBidders: (bid, adUnitCode, data, meta) => {
+                if (bid.bidder == 'appnexus' && adUnitCode == 'adunit1') {
+                  data['webo_bar'] = ['baz'];
+                }
+                return true;
+              },
+              baseURLProfileAPI: 'ctx.test.weborama.com',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          webo_ctx: ['foo', 'bar'],
+          webo_ds: ['baz'],
+        };
+        const adUnitCode1 = 'adunit1';
+        const adUnitCode2 = 'adunit2';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode1,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }, {
+            code: adUnitCode2,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.test.weborama.com/api/profile?token=foo&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(200, responseHeader, JSON.stringify(data));
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': {
+            webo_ctx: ['foo', 'bar'],
+            webo_ds: ['baz'],
+            webo_foo: ['bar'],
+          },
+          'adunit2': data,
+        });
+
+        reqBidsConfigObj.adUnits.forEach(adUnit => {
+          expect(adUnit.bids.length).to.equal(5);
+          expect(adUnit.bids[0].params.target).to.equal('webo_ctx=foo;webo_ctx=bar;webo_ds=baz');
+          expect(adUnit.bids[1].params.dctr).to.equal('webo_ctx=foo,bar|webo_ds=baz');
+          expect(adUnit.bids[3].params).to.deep.equal({
+            inventory: data
+          });
+          expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+            site: {
+              ext: {
+                data: data
+              },
+            }
+          });
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal({
+          webo_ctx: ['foo', 'bar'],
+          webo_ds: ['baz'],
+          webo_bar: ['baz'],
+        });
+        expect(reqBidsConfigObj.adUnits[1].bids[2].params.keywords).to.deep.equal(data);
+
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'contextual',
+            isDefault: false,
+          },
+        });
+      });
+    });
+
+    describe('Add user-centric data (wam)', function() {
+      it('should set gam targeting from local storage and send to bidders by default', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {
+              accoundId: 12345,
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          webo_cs: ['foo', 'bar'],
+          webo_audiences: ['baz'],
+        };
+
+        const entry = {
+          targeting: data,
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+          .returns(JSON.stringify(entry));
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_cs=foo;webo_cs=bar;webo_audiences=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_cs=foo,bar|webo_audiences=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          visitor: data
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          user: {
+            ext: {
+              data: data
+            },
+          }
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: true,
+            source: 'wam',
+            isDefault: false,
+          },
+        });
+      });
+
+      describe('should set gam targeting from local storage and send to one specific bidder and multiple adunits', function() {
+        const testcases = {
+          'single string': 'appnexus',
+          'array with one entry': ['appnexus'],
+          'map with one entry': {
+            'appnexus': true
+          },
+          'map complete': {
+            'smartadserver': false,
+            'pubmatic': false,
+            'appnexus': true,
+            'rubicon': false,
+            'other': false,
+          },
+          'callback': (bid) => {
+            return bid.bidder == 'appnexus'
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const sendToBidders = testcases[label];
+          it(`check sendToBidders as ${label}`, function() {
+            let onDataResponse = {};
+            const moduleConfig = {
+              params: {
+                weboUserDataConf: {
+                  accountId: 12345,
+                  sendToBidders: sendToBidders,
+                  onData: (data, meta) => {
+                    onDataResponse = {
+                      data: data,
+                      meta: meta,
+                    };
+                  },
+                }
+              }
+            };
+            const data = {
+              webo_cs: ['foo', 'bar'],
+              webo_audiences: ['baz'],
+            };
+
+            const entry = {
+              targeting: data,
+            };
+
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
+            sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+            sandbox.stub(storage, 'getDataFromLocalStorage')
+              .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+              .returns(JSON.stringify(entry));
+
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params).to.be.undefined;
+              expect(adUnit.bids[1].params).to.be.undefined;
+              expect(adUnit.bids[2].params.keywords).to.deep.equal(data);
+              expect(adUnit.bids[3].params).to.be.undefined;
+            });
+            expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+
+            expect(onDataResponse).to.deep.equal({
+              data: data,
+              meta: {
+                user: true,
+                source: 'wam',
+                isDefault: false,
+              },
+            });
+          });
+        });
+      });
+
+      describe('should set gam targeting from local storage and send to one specific bidder and one adunit', function() {
+        const testcases = {
+          'map with one entry': {
+            'appnexus': ['adunit1']
+          },
+          'callback': (bid, adUnitCode) => {
+            return bid.bidder == 'appnexus' && adUnitCode == 'adunit1';
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const sendToBidders = testcases[label];
+          it(`check sendToBidders as ${label}`, function() {
+            let onDataResponse = {};
+            const moduleConfig = {
+              params: {
+                weboUserDataConf: {
+                  accountId: 12345,
+                  sendToBidders: sendToBidders,
+                  onData: (data, meta) => {
+                    onDataResponse = {
+                      data: data,
+                      meta: meta,
+                    };
+                  },
+                }
+              }
+            };
+            const data = {
+              webo_cs: ['foo', 'bar'],
+              webo_audiences: ['baz'],
+            };
+
+            const entry = {
+              targeting: data,
+            };
+
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
+            sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+            sandbox.stub(storage, 'getDataFromLocalStorage')
+              .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+              .returns(JSON.stringify(entry));
+
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params).to.be.undefined;
+              expect(adUnit.bids[1].params).to.be.undefined;
+              expect(adUnit.bids[3].params).to.be.undefined;
+            });
+            expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+
+            expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+            expect(reqBidsConfigObj.adUnits[1].bids[2].params).to.be.undefined;
+
+            expect(onDataResponse).to.deep.equal({
+              data: data,
+              meta: {
+                user: true,
+                source: 'wam',
+                isDefault: false,
+              },
+            });
+          });
+        });
+      });
+
+      describe('should set gam targeting for multiple adunits but not send to bidders with setPrebidTargeting=<true>/sendToBidders=false', function() {
+        const testcases = {
+          'boolean': true,
+          'array with both units': ['adunit1', 'adunit2'],
+          'callback': () => {
+            return true;
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const setPrebidTargeting = testcases[label];
+          it(`check setPrebidTargeting as ${label}`, function() {
+            const moduleConfig = {
+              params: {
+                weboUserDataConf: {
+                  accoundId: 12345,
+                  setPrebidTargeting: setPrebidTargeting,
+                  sendToBidders: false
+                }
+              }
+            };
+            const data = {
+              webo_cs: ['foo', 'bar'],
+              webo_audiences: ['baz'],
+            };
+
+            const entry = {
+              targeting: data,
+            };
+
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
+            sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+            sandbox.stub(storage, 'getDataFromLocalStorage')
+              .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+              .returns(JSON.stringify(entry));
+
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar'
+                    },
+                    visitor: {
+                      baz: 'bam'
+                    }
+                  }
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar'
+                    },
+                    visitor: {
+                      baz: 'bam'
+                    }
+                  }
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params.target).to.equal('foo=bar');
+              expect(adUnit.bids[1].params.dctr).to.equal('foo=bar');
+              expect(adUnit.bids[2].params.keywords).to.deep.equal({
+                foo: ['bar']
+              });
+              expect(adUnit.bids[3].params).to.deep.equal({
+                inventory: {
+                  foo: 'bar'
+                },
+                visitor: {
+                  baz: 'bam'
+                }
+              });
+            });
+            expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+          });
+        });
+      });
+
+      describe('should set gam targeting for one adunit but not send to bidders with setPrebidTargeting=<true>/sendToBidders=false', function() {
+        const testcases = {
+          'array with one unit': ['adunit1'],
+          'callback': (adUnitCode) => {
+            return adUnitCode == 'adunit1';
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const setPrebidTargeting = testcases[label];
+          it(`check setPrebidTargeting as ${label}`, function() {
+            const moduleConfig = {
+              params: {
+                weboUserDataConf: {
+                  accoundId: 12345,
+                  setPrebidTargeting: setPrebidTargeting,
+                  sendToBidders: false
+                }
+              }
+            };
+            const data = {
+              webo_cs: ['foo', 'bar'],
+              webo_audiences: ['baz'],
+            };
+
+            const entry = {
+              targeting: data,
+            };
+
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
+            sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+            sandbox.stub(storage, 'getDataFromLocalStorage')
+              .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+              .returns(JSON.stringify(entry));
+
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar'
+                    },
+                    visitor: {
+                      baz: 'bam'
+                    }
+                  }
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar'
+                    },
+                    visitor: {
+                      baz: 'bam'
+                    }
+                  }
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': {},
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params.target).to.equal('foo=bar');
+              expect(adUnit.bids[1].params.dctr).to.equal('foo=bar');
+              expect(adUnit.bids[2].params.keywords).to.deep.equal({
+                foo: ['bar']
+              });
+              expect(adUnit.bids[3].params).to.deep.equal({
+                inventory: {
+                  foo: 'bar'
+                },
+                visitor: {
+                  baz: 'bam'
+                }
+              });
+            });
+            expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+          });
+        });
+      });
+
+      it('should set gam targeting but not send to bidders with (submodule override) setPrebidTargeting=true/(global) sendToBidders=false', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            setPrebidTargeting: false,
+            sendToBidders: false,
+            onData: (data, meta) => {
+              onDataResponse = {
+                data: data,
+                meta: meta,
+              };
+            },
+            weboUserDataConf: {
+              accoundId: 12345,
+              setPrebidTargeting: true, // submodule parameter will override module parameter
+            }
+          }
+        };
+        const data = {
+          webo_cs: ['foo', 'bar'],
+          webo_audiences: ['baz'],
+        };
+
+        const entry = {
+          targeting: data,
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+          .returns(JSON.stringify(entry));
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver',
+              params: {
+                target: 'foo=bar'
+              }
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(1);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('foo=bar');
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: true,
+            source: 'wam',
+            isDefault: false,
+          },
+        });
+      });
+
+      it('should not set gam targeting with setPrebidTargeting=false but send to bidders', function() {
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {
+              accoundId: 12345,
+              setPrebidTargeting: false,
+            }
+          }
+        };
+        const data = {
+          webo_cs: ['foo', 'bar'],
+          webo_audiences: ['baz'],
+        };
+
+        const entry = {
+          targeting: data,
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+          .returns(JSON.stringify(entry));
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver',
+              params: {
+                target: 'foo=bar'
+              }
+            }, {
+              bidder: 'pubmatic',
+              params: {
+                dctr: 'foo=bar'
+              }
+            }, {
+              bidder: 'appnexus',
+              params: {
+                keywords: {
+                  foo: ['bar']
+                }
+              }
+            }, {
+              bidder: 'rubicon',
+              params: {
+                inventory: {
+                  foo: 'bar',
+                },
+                visitor: {
+                  baz: 'bam',
+                }
+              }
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': {},
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('foo=bar;webo_cs=foo;webo_cs=bar;webo_audiences=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('foo=bar|webo_cs=foo,bar|webo_audiences=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal({
+          foo: ['bar'],
+          webo_cs: ['foo', 'bar'],
+          webo_audiences: ['baz'],
+        });
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: {
+            foo: 'bar',
+          },
+          visitor: {
+            baz: 'bam',
+            webo_cs: ['foo', 'bar'],
+            webo_audiences: ['baz'],
+          }
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          user: {
+            ext: {
+              data: data
+            },
+          }
+        });
+      });
+
+      it('should use default profile in case of nothing on local storage', function() {
+        const defaultProfile = {
+          webo_audiences: ['baz']
+        };
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {
+              accoundId: 12345,
+              setPrebidTargeting: true,
+              defaultProfile: defaultProfile,
+            }
+          }
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': defaultProfile,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_audiences=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_audiences=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(defaultProfile);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          visitor: defaultProfile
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          user: {
+            ext: {
+              data: defaultProfile
+            },
+          }
+        });
+      });
+
+      it('should use default profile if cant read from local storage', function() {
+        const defaultProfile = {
+          webo_audiences: ['baz']
+        };
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {
+              accoundId: 12345,
+              setPrebidTargeting: true,
+              defaultProfile: defaultProfile,
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(false);
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': defaultProfile,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_audiences=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_audiences=baz');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(defaultProfile);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          visitor: defaultProfile
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          user: {
+            ext: {
+              data: defaultProfile
+            },
+          }
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: defaultProfile,
+          meta: {
+            user: true,
+            source: 'wam',
+            isDefault: true,
+          },
+        });
+      });
+
+      it('should be possible update profile from callbacks for a given bidder/adUnitCode', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboUserDataConf: {
+              accoundId: 12345,
+              targetURL: 'https://prebid.org',
+              setPrebidTargeting: (adUnitCode, data, meta) => {
+                if (adUnitCode == 'adunit1') {
+                  data['webo_foo'] = ['bar'];
+                }
+                return true;
+              },
+              sendToBidders: (bid, adUnitCode, data, meta) => {
+                if (bid.bidder == 'appnexus' && adUnitCode == 'adunit1') {
+                  data['webo_bar'] = ['baz'];
+                }
+                return true;
+              },
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          webo_cs: ['foo', 'bar'],
+          webo_audiences: ['baz'],
+        };
+
+        const entry = {
+          targeting: data,
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
+          .returns(JSON.stringify(entry));
+
+        const adUnitCode1 = 'adunit1';
+        const adUnitCode2 = 'adunit2';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode1,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }, {
+            code: adUnitCode2,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': {
+            webo_cs: ['foo', 'bar'],
+            webo_audiences: ['baz'],
+            webo_foo: ['bar'],
+          },
+          'adunit2': data,
+        });
+
+        reqBidsConfigObj.adUnits.forEach(adUnit => {
+          expect(adUnit.bids.length).to.equal(5);
+          expect(adUnit.bids[0].params.target).to.equal('webo_cs=foo;webo_cs=bar;webo_audiences=baz');
+          expect(adUnit.bids[1].params.dctr).to.equal('webo_cs=foo,bar|webo_audiences=baz');
+          expect(adUnit.bids[3].params).to.deep.equal({
+            visitor: data
+          });
+          expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+            user: {
+              ext: {
+                data: data
+              },
+            }
+          });
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal({
+          webo_cs: ['foo', 'bar'],
+          webo_audiences: ['baz'],
+          webo_bar: ['baz'],
+        });
+        expect(reqBidsConfigObj.adUnits[1].bids[2].params.keywords).to.deep.equal(data);
+
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: true,
+            source: 'wam',
+            isDefault: false,
+          },
+        });
+      });
+    });
+
+    describe('Add support to sfbx lite', function() {
+      it('should set gam targeting from local storage and send to bidders by default', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            sfbxLiteDataConf: {
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          lite_occupation: ['gérant', 'bénévole'],
+          lite_hobbies: ['sport', 'cinéma'],
+        };
+
+        const entry = {
+          webo: data,
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
+          .returns(JSON.stringify(entry));
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('lite_occupation=gérant;lite_occupation=bénévole;lite_hobbies=sport;lite_hobbies=cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('lite_occupation=gérant,bénévole|lite_hobbies=sport,cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: data,
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data,
+            },
+          },
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'lite',
+            isDefault: false,
+          },
+        });
+      });
+
+      describe('should set gam targeting from local storage and send to one specific bidder and multiple adunits', function() {
+        const testcases = {
+          'single string': 'appnexus',
+          'array with one entry': ['appnexus'],
+          'map with one entry': {
+            'appnexus': true
+          },
+          'map complete': {
+            'smartadserver': false,
+            'pubmatic': false,
+            'appnexus': true,
+            'rubicon': false,
+            'other': false,
+          },
+          'callback': (bid) => {
+            return bid.bidder == 'appnexus'
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const sendToBidders = testcases[label];
+          it(`check sendToBidders as ${label}`, function() {
+            let onDataResponse = {};
+            const moduleConfig = {
+              params: {
+                sfbxLiteDataConf: {
+                  sendToBidders: sendToBidders,
+                  onData: (data, meta) => {
+                    onDataResponse = {
+                      data: data,
+                      meta: meta,
+                    };
+                  },
+                }
+              }
+            };
+            const data = {
+              lite_occupation: ['gérant', 'bénévole'],
+              lite_hobbies: ['sport', 'cinéma'],
+            };
+
+            const entry = {
+              webo: data,
+            };
+
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
+            sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+            sandbox.stub(storage, 'getDataFromLocalStorage')
+              .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
+              .returns(JSON.stringify(entry));
+
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params).to.be.undefined;
+              expect(adUnit.bids[1].params).to.be.undefined;
+              expect(adUnit.bids[2].params.keywords).to.deep.equal(data);
+              expect(adUnit.bids[3].params).to.be.undefined;
+            });
+            expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+
+            expect(onDataResponse).to.deep.equal({
+              data: data,
+              meta: {
+                user: false,
+                source: 'lite',
+                isDefault: false,
+              },
+            });
+          });
+        });
+      });
+
+      describe('should set gam targeting from local storage and send to one specific bidder and one adunit', function() {
+        const testcases = {
+          'map with one entry': {
+            'appnexus': ['adunit1']
+          },
+          'callback': (bid, adUnitCode) => {
+            return bid.bidder == 'appnexus' && adUnitCode == 'adunit1';
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const sendToBidders = testcases[label];
+          it(`check sendToBidders as ${label}`, function() {
+            let onDataResponse = {};
+            const moduleConfig = {
+              params: {
+                sfbxLiteDataConf: {
+                  sendToBidders: sendToBidders,
+                  onData: (data, meta) => {
+                    onDataResponse = {
+                      data: data,
+                      meta: meta,
+                    };
+                  },
+                }
+              }
+            };
+            const data = {
+              lite_occupation: ['gérant', 'bénévole'],
+              lite_hobbies: ['sport', 'cinéma'],
+            };
+
+            const entry = {
+              webo: data,
+            };
+
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
+            sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+            sandbox.stub(storage, 'getDataFromLocalStorage')
+              .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
+              .returns(JSON.stringify(entry));
+
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver'
+                }, {
+                  bidder: 'pubmatic'
+                }, {
+                  bidder: 'appnexus'
+                }, {
+                  bidder: 'rubicon'
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params).to.be.undefined;
+              expect(adUnit.bids[1].params).to.be.undefined;
+              expect(adUnit.bids[3].params).to.be.undefined;
+            });
+            expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+
+            expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+            expect(reqBidsConfigObj.adUnits[1].bids[2].params).to.be.undefined;
+
+            expect(onDataResponse).to.deep.equal({
+              data: data,
+              meta: {
+                user: false,
+                source: 'lite',
+                isDefault: false,
+              },
+            });
+          });
+        });
+      });
+
+      describe('should set gam targeting for multiple adunits but not send to bidders with setPrebidTargeting=<true>/sendToBidders=false', function() {
+        const testcases = {
+          'boolean': true,
+          'array with both units': ['adunit1', 'adunit2'],
+          'callback': () => {
+            return true;
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const setPrebidTargeting = testcases[label];
+          it(`check setPrebidTargeting as ${label}`, function() {
+            const moduleConfig = {
+              params: {
+                sfbxLiteDataConf: {
+                  setPrebidTargeting: setPrebidTargeting,
+                  sendToBidders: false
+                }
+              }
+            };
+            const data = {
+              lite_occupation: ['gérant', 'bénévole'],
+              lite_hobbies: ['sport', 'cinéma'],
+            };
+
+            const entry = {
+              webo: data,
+            };
+
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
+            sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+            sandbox.stub(storage, 'getDataFromLocalStorage')
+              .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
+              .returns(JSON.stringify(entry));
+
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar'
+                    },
+                    visitor: {
+                      baz: 'bam'
+                    }
+                  }
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar'
+                    },
+                    visitor: {
+                      baz: 'bam'
+                    }
+                  }
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': data,
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params.target).to.equal('foo=bar');
+              expect(adUnit.bids[1].params.dctr).to.equal('foo=bar');
+              expect(adUnit.bids[2].params.keywords).to.deep.equal({
+                foo: ['bar']
+              });
+              expect(adUnit.bids[3].params).to.deep.equal({
+                inventory: {
+                  foo: 'bar'
+                },
+                visitor: {
+                  baz: 'bam'
+                }
+              });
+            });
+            expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+          });
+        });
+      });
+
+      describe('should set gam targeting for one adunit but not send to bidders with setPrebidTargeting=<true>/sendToBidders=false', function() {
+        const testcases = {
+          'array with one unit': ['adunit1'],
+          'callback': (adUnitCode) => {
+            return adUnitCode == 'adunit1';
+          },
+        };
+
+        Object.keys(testcases).forEach(label => {
+          const setPrebidTargeting = testcases[label];
+          it(`check setPrebidTargeting as ${label}`, function() {
+            const moduleConfig = {
+              params: {
+                sfbxLiteDataConf: {
+                  setPrebidTargeting: setPrebidTargeting,
+                  sendToBidders: false
+                }
+              }
+            };
+            const data = {
+              lite_occupation: ['gérant', 'bénévole'],
+              lite_hobbies: ['sport', 'cinéma'],
+            };
+
+            const entry = {
+              webo: data,
+            };
+
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
+            sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+            sandbox.stub(storage, 'getDataFromLocalStorage')
+              .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
+              .returns(JSON.stringify(entry));
+
+            const adUnitCode1 = 'adunit1';
+            const adUnitCode2 = 'adunit2';
+            const reqBidsConfigObj = {
+              ortb2Fragments: {
+                global: {},
+                bidder: {},
+              },
+              adUnits: [{
+                code: adUnitCode1,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar'
+                    },
+                    visitor: {
+                      baz: 'bam'
+                    }
+                  }
+                }, {
+                  bidder: 'other'
+                }]
+              }, {
+                code: adUnitCode2,
+                bids: [{
+                  bidder: 'smartadserver',
+                  params: {
+                    target: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'pubmatic',
+                  params: {
+                    dctr: 'foo=bar'
+                  }
+                }, {
+                  bidder: 'appnexus',
+                  params: {
+                    keywords: {
+                      foo: ['bar']
+                    }
+                  }
+                }, {
+                  bidder: 'rubicon',
+                  params: {
+                    inventory: {
+                      foo: 'bar'
+                    },
+                    visitor: {
+                      baz: 'bam'
+                    }
+                  }
+                }, {
+                  bidder: 'other'
+                }]
+              }]
+            };
+            const onDoneSpy = sinon.spy();
+
+            expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+            weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+            expect(onDoneSpy.calledOnce).to.be.true;
+
+            const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+            expect(targeting).to.deep.equal({
+              'adunit1': data,
+              'adunit2': {},
+            });
+
+            reqBidsConfigObj.adUnits.forEach(adUnit => {
+              expect(adUnit.bids.length).to.equal(5);
+              expect(adUnit.bids[0].params.target).to.equal('foo=bar');
+              expect(adUnit.bids[1].params.dctr).to.equal('foo=bar');
+              expect(adUnit.bids[2].params.keywords).to.deep.equal({
+                foo: ['bar']
+              });
+              expect(adUnit.bids[3].params).to.deep.equal({
+                inventory: {
+                  foo: 'bar'
+                },
+                visitor: {
+                  baz: 'bam'
+                }
+              });
+            });
+            expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.be.undefined;
+          });
+        });
+      });
+
+      it('should set gam targeting but not send to bidders with (submodule override) setPrebidTargeting=true/(global) sendToBidders=false', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            setPrebidTargeting: false,
+            sendToBidders: false,
+            onData: (data, meta) => {
+              onDataResponse = {
+                data: data,
+                meta: meta,
+              };
+            },
+            sfbxLiteDataConf: {
+              setPrebidTargeting: true, // submodule parameter will override module parameter
+            }
+          }
+        };
+        const data = {
+          lite_occupation: ['gérant', 'bénévole'],
+          lite_hobbies: ['sport', 'cinéma'],
+        };
+
+        const entry = {
+          webo: data,
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
+          .returns(JSON.stringify(entry));
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver',
+              params: {
+                target: 'foo=bar'
+              }
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(1);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('foo=bar');
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'lite',
+            isDefault: false,
+          },
+        });
+      });
+
+      it('should not set gam targeting with setPrebidTargeting=false but send to bidders', function() {
+        const moduleConfig = {
+          params: {
+            sfbxLiteDataConf: {
+              setPrebidTargeting: false,
+            }
+          }
+        };
+        const data = {
+          lite_occupation: ['gérant', 'bénévole'],
+          lite_hobbies: ['sport', 'cinéma'],
+        };
+
+        const entry = {
+          webo: data,
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
+          .returns(JSON.stringify(entry));
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver',
+              params: {
+                target: 'foo=bar'
+              }
+            }, {
+              bidder: 'pubmatic',
+              params: {
+                dctr: 'foo=bar'
+              }
+            }, {
+              bidder: 'appnexus',
+              params: {
+                keywords: {
+                  foo: ['bar']
+                }
+              }
+            }, {
+              bidder: 'rubicon',
+              params: {
+                inventory: {
+                  foo: 'bar',
+                },
+                visitor: {
+                  baz: 'bam',
+                }
+              }
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': {},
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('foo=bar;lite_occupation=gérant;lite_occupation=bénévole;lite_hobbies=sport;lite_hobbies=cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('foo=bar|lite_occupation=gérant,bénévole|lite_hobbies=sport,cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal({
+          foo: ['bar'],
+          lite_occupation: ['gérant', 'bénévole'],
+          lite_hobbies: ['sport', 'cinéma'],
+        });
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: {
+            foo: 'bar',
+            lite_occupation: ['gérant', 'bénévole'],
+            lite_hobbies: ['sport', 'cinéma'],
+          },
+          visitor: {
+            baz: 'bam',
+          }
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data,
+            },
+          },
+        });
+      });
+
+      it('should use default profile in case of nothing on local storage', function() {
+        const defaultProfile = {
+          lite_hobbies: ['sport', 'cinéma'],
+        };
+        const moduleConfig = {
+          params: {
+            sfbxLiteDataConf: {
+              setPrebidTargeting: true,
+              defaultProfile: defaultProfile,
+            }
+          }
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': defaultProfile,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('lite_hobbies=sport;lite_hobbies=cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('lite_hobbies=sport,cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(defaultProfile);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: defaultProfile,
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: defaultProfile,
+            },
+          },
+        });
+      });
+
+      it('should use default profile if cant read from local storage', function() {
+        const defaultProfile = {
+          lite_hobbies: ['sport', 'cinéma'],
+        };
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            sfbxLiteDataConf: {
+              setPrebidTargeting: true,
+              defaultProfile: defaultProfile,
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(false);
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': defaultProfile,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('lite_hobbies=sport;lite_hobbies=cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('lite_hobbies=sport,cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(defaultProfile);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: defaultProfile,
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: defaultProfile,
+            },
+          },
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: defaultProfile,
+          meta: {
+            user: false,
+            source: 'lite',
+            isDefault: true,
+          },
+        });
+      });
+
+      it('should use default profile if has no local storage', function() {
+        const defaultProfile = {
+          lite_hobbies: ['sport', 'cinéma'],
+        };
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            sfbxLiteDataConf: {
+              setPrebidTargeting: true,
+              defaultProfile: defaultProfile,
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(false);
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': defaultProfile,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('lite_hobbies=sport;lite_hobbies=cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('lite_hobbies=sport,cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(defaultProfile);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: defaultProfile,
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: defaultProfile,
+            },
+          },
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: defaultProfile,
+          meta: {
+            user: false,
+            source: 'lite',
+            isDefault: true,
+          },
+        });
+      });
+      it('should be possible update profile from callbacks for a given bidder/adUnitCode', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            sfbxLiteDataConf: {
+              targetURL: 'https://prebid.org',
+              setPrebidTargeting: (adUnitCode, data, meta) => {
+                if (adUnitCode == 'adunit1') {
+                  data['lito_foo'] = ['bar'];
+                }
+                return true;
+              },
+              sendToBidders: (bid, adUnitCode, data, meta) => {
+                if (bid.bidder == 'appnexus' && adUnitCode == 'adunit1') {
+                  data['lito_bar'] = ['baz'];
+                }
+                return true;
+              },
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          lite_occupation: ['gérant', 'bénévole'],
+          lite_hobbies: ['sport', 'cinéma'],
+        };
+
+        const entry = {
+          webo: data,
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
+        sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+        sandbox.stub(storage, 'getDataFromLocalStorage')
+          .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
+          .returns(JSON.stringify(entry));
+
+        const adUnitCode1 = 'adunit1';
+        const adUnitCode2 = 'adunit2';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode1,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }, {
+            code: adUnitCode2,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode1, adUnitCode2], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': {
+            lite_occupation: ['gérant', 'bénévole'],
+            lite_hobbies: ['sport', 'cinéma'],
+            lito_foo: ['bar'],
+          },
+          'adunit2': data,
+        });
+
+        reqBidsConfigObj.adUnits.forEach(adUnit => {
+          expect(adUnit.bids.length).to.equal(5);
+          expect(adUnit.bids[0].params.target).to.equal('lite_occupation=gérant;lite_occupation=bénévole;lite_hobbies=sport;lite_hobbies=cinéma');
+          expect(adUnit.bids[1].params.dctr).to.equal('lite_occupation=gérant,bénévole|lite_hobbies=sport,cinéma');
+          expect(adUnit.bids[3].params).to.deep.equal({
+            inventory: data,
+          });
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data,
+            },
+          },
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal({
+          lite_occupation: ['gérant', 'bénévole'],
+          lite_hobbies: ['sport', 'cinéma'],
+          lito_bar: ['baz'],
+        });
+        expect(reqBidsConfigObj.adUnits[1].bids[2].params.keywords).to.deep.equal(data);
+
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'lite',
+            isDefault: false,
+          },
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/welectBidAdapter_spec.js b/test/spec/modules/welectBidAdapter_spec.js
new file mode 100644
index 00000000000..2f2af35eaec
--- /dev/null
+++ b/test/spec/modules/welectBidAdapter_spec.js
@@ -0,0 +1,211 @@
+import { expect } from 'chai';
+import { spec as adapter } from 'modules/welectBidAdapter.js';
+
+describe('WelectAdapter', function () {
+  describe('Check methods existance', function () {
+    it('exists and is a function', function () {
+      expect(adapter.isBidRequestValid).to.exist.and.to.be.a('function');
+    });
+    it('exists and is a function', function () {
+      expect(adapter.buildRequests).to.exist.and.to.be.a('function');
+    });
+    it('exists and is a function', function () {
+      expect(adapter.interpretResponse).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('Check method isBidRequestValid return', function () {
+    let bid = {
+      bidder: 'welect',
+      params: {
+        placementId: 'exampleAlias',
+        domain: 'www.welect.de'
+      },
+      sizes: [[640, 360]],
+      mediaTypes: {
+        video: {
+          context: 'instream'
+        }
+      },
+    };
+    let bid2 = {
+      bidder: 'welect',
+      params: {
+        domain: 'www.welect.de'
+      },
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [640, 360]
+        }
+      },
+    };
+
+    it('should be true', function () {
+      expect(adapter.isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should be false because the placementId is missing', function () {
+      expect(adapter.isBidRequestValid(bid2)).to.be.false;
+    });
+  });
+
+  describe('Check buildRequests method', function () {
+    // Bids to be formatted
+    let bid1 = {
+      bidder: 'welect',
+      params: {
+        placementId: 'exampleAlias'
+      },
+      sizes: [[640, 360]],
+      mediaTypes: {
+        video: {
+          context: 'instream'
+        }
+      },
+      bidId: 'abdc'
+    };
+    let bid2 = {
+      bidder: 'welect',
+      params: {
+        placementId: 'exampleAlias',
+        domain: 'www.welect2.de'
+      },
+      sizes: [[640, 360]],
+      mediaTypes: {
+        video: {
+          context: 'instream'
+        }
+      },
+      bidId: 'abdc',
+      gdprConsent: {
+        gdprApplies: 1,
+        gdprConsent: 'some_string'
+      }
+    };
+
+    let data1 = {
+      bid_id: 'abdc',
+      width: 640,
+      height: 360
+    }
+
+    let data2 = {
+      bid_id: 'abdc',
+      width: 640,
+      height: 360,
+      gdpr_consent: {
+        gdprApplies: 1,
+        tcString: 'some_string'
+      }
+    }
+
+    // Formatted requets
+    let request1 = {
+      method: 'POST',
+      url: 'https://www.welect.de/api/v2/preflight/exampleAlias',
+      data: data1,
+      options: {
+        contentType: 'application/json',
+        withCredentials: false,
+        crossOrigin: true,
+      }
+    };
+
+    let request2 = {
+      method: 'POST',
+      url: 'https://www.welect2.de/api/v2/preflight/exampleAlias',
+      data: data2,
+      options: {
+        contentType: 'application/json',
+        withCredentials: false,
+        crossOrigin: true,
+      }
+    }
+
+    it('defaults to www.welect.de, without gdpr object', function () {
+      expect(adapter.buildRequests([bid1])).to.deep.equal([request1]);
+    })
+
+    it('must return the right formatted requests, with gdpr object', function () {
+      expect(adapter.buildRequests([bid2])).to.deep.equal([request2]);
+    });
+  });
+
+  describe('Check interpretResponse method return', function () {
+    // invalid server response
+    let unavailableResponse = {
+      body: {
+        available: false
+      }
+    };
+
+    let availableResponse = {
+      body: {
+        available: true,
+        bidResponse: {
+          ad: {
+            video: 'some vast url'
+          },
+          meta: {
+            advertiserDomains: [],
+          },
+          cpm: 17,
+          creativeId: 'svmpreview',
+          currency: 'EUR',
+          netRevenue: true,
+          requestId: 'some bid id',
+          ttl: 120,
+          vastUrl: 'some vast url',
+          height: 640,
+          width: 320
+        }
+      }
+    }
+    // bid Request
+    let bid = {
+      data: {
+        bid_id: 'some bid id',
+        width: 640,
+        height: 320,
+        gdpr_consent: {
+          gdprApplies: 1,
+          tcString: 'some_string'
+        }
+      },
+      method: 'POST',
+      url: 'https://www.welect.de/api/v2/preflight/exampleAlias',
+      options: {
+        contentType: 'application/json',
+        withCredentials: false,
+        crossOrigin: true,
+      }
+    };
+    // Formatted reponse
+    let result = {
+      ad: {
+        video: 'some vast url'
+      },
+      meta: {
+        advertiserDomains: []
+      },
+      cpm: 17,
+      creativeId: 'svmpreview',
+      currency: 'EUR',
+      height: 640,
+      netRevenue: true,
+      requestId: 'some bid id',
+      ttl: 120,
+      vastUrl: 'some vast url',
+      width: 320
+    }
+
+    it('if response reflects unavailability, should be empty', function () {
+      expect(adapter.interpretResponse(unavailableResponse, bid)).to.deep.equal([]);
+    });
+
+    it('if response reflects availability, should equal result', function () {
+      expect(adapter.interpretResponse(availableResponse, bid)).to.deep.equal([result])
+    })
+  });
+});
diff --git a/test/spec/modules/widespaceBidAdapter_spec.js b/test/spec/modules/widespaceBidAdapter_spec.js
index 382bf2c593e..0a0af1f1229 100644
--- a/test/spec/modules/widespaceBidAdapter_spec.js
+++ b/test/spec/modules/widespaceBidAdapter_spec.js
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {spec, storage} from 'modules/widespaceBidAdapter.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {includes} from 'src/polyfill.js';
 
 describe('+widespaceAdatperTest', function () {
   // Dummy bid request
@@ -75,7 +75,10 @@ describe('+widespaceAdatperTest', function () {
       'status': 'ad',
       'ttl': 30,
       'width': 300,
-      'syncPixels': ['https://url1.com/url', 'https://url2.com/url']
+      'syncPixels': ['https://url1.com/url', 'https://url2.com/url'],
+      'meta': {
+        advertiserDomains: ['advertiserdomain.com']
+      }
     }],
     headers: {}
   };
@@ -195,10 +198,6 @@ describe('+widespaceAdatperTest', function () {
     it('-bidRequest options have header type', function () {
       expect(request[0].options.contentType).to.exist;
     });
-
-    it('-cookie test for wsCustomData ', function () {
-      expect(request[0].data.indexOf('hb.cd') > -1).to.equal(true);
-    });
   });
 
   describe('+interpretResponse', function () {
@@ -214,7 +213,8 @@ describe('+widespaceAdatperTest', function () {
         'netRevenue',
         'ttl',
         'referrer',
-        'ad'
+        'ad',
+        'meta'
       ];
       const resultKeys = Object.keys(result[0]);
       requiredKeys.forEach((key) => {
diff --git a/test/spec/modules/windtalkerBidAdapter_spec.js b/test/spec/modules/windtalkerBidAdapter_spec.js
deleted file mode 100644
index 222a7611b01..00000000000
--- a/test/spec/modules/windtalkerBidAdapter_spec.js
+++ /dev/null
@@ -1,348 +0,0 @@
-import {expect} from 'chai';
-import {spec} from 'modules/windtalkerBidAdapter';
-import {newBidder} from 'src/adapters/bidderFactory';
-
-describe('Windtalker Adapter Tests', function () {
-  const slotConfigs = [{
-    placementCode: '/DfpAccount1/slot1',
-    mediaTypes: {
-      banner: {
-        sizes: [[300, 250]]
-      }
-    },
-    bidId: 'bid12345',
-    mediaType: 'banner',
-    params: {
-      pubId: '29521',
-      siteId: '26047',
-      placementId: '123',
-      bidFloor: '0.001',
-      ifa: 'IFA',
-      latitude: '40.712775',
-      longitude: '-74.005973'
-    }
-  }, {
-    placementCode: '/DfpAccount2/slot2',
-    mediaTypes: {
-      banner: {
-        sizes: [[728, 90]]
-      }
-    },
-    bidId: 'bid23456',
-    mediaType: 'banner',
-    params: {
-      pubId: '29521',
-      siteId: '26047',
-      placementId: '1234',
-      bidFloor: '0.000001',
-    }
-  }];
-  const nativeSlotConfig = [{
-    placementCode: '/DfpAccount1/slot3',
-    bidId: 'bid12345',
-    mediaType: 'native',
-    nativeParams: {
-      title: { required: true, len: 200 },
-      body: {},
-      image: { wmin: 100 },
-      sponsoredBy: { },
-      icon: { }
-    },
-    params: {
-      pubId: '29521',
-      placementId: '123',
-      siteId: '26047'
-    }
-  }];
-  const videoSlotConfig = [{
-    placementCode: '/DfpAccount1/slot4',
-    mediaTypes: {
-      video: {
-        playerSize: [[640, 480]]
-      }
-    },
-    bidId: 'bid12345678',
-    mediaType: 'video',
-    video: {
-      skippable: true
-    },
-    params: {
-      pubId: '29521',
-      placementId: '1234567',
-      siteId: '26047',
-    }
-  }];
-  const appSlotConfig = [{
-    placementCode: '/DfpAccount1/slot5',
-    bidId: 'bid12345',
-    params: {
-      pubId: '29521',
-      placementId: '1234',
-      app: {
-        id: '1111',
-        name: 'app name',
-        bundle: 'io.windtalker.apps',
-        storeUrl: 'https://windtalker.io/apps',
-        domain: 'windtalker.io'
-      }
-    }
-  }];
-
-  it('Verify build request', function () {
-    const request = spec.buildRequests(slotConfigs);
-    expect(request.url).to.equal('https://windtalkerdisplay.hb.adp3.net/');
-    expect(request.method).to.equal('POST');
-    const ortbRequest = JSON.parse(request.data);
-    // site object
-    expect(ortbRequest.site).to.not.equal(null);
-    expect(ortbRequest.site.publisher).to.not.equal(null);
-    expect(ortbRequest.site.publisher.id).to.equal('29521');
-    expect(ortbRequest.site.ref).to.equal(window.top.document.referrer);
-    expect(ortbRequest.site.page).to.equal(window.location.href);
-    expect(ortbRequest.imp).to.have.lengthOf(2);
-    // device object
-    expect(ortbRequest.device).to.not.equal(null);
-    expect(ortbRequest.device.ua).to.equal(navigator.userAgent);
-    expect(ortbRequest.device.ifa).to.equal('IFA');
-    expect(ortbRequest.device.geo.lat).to.equal('40.712775');
-    expect(ortbRequest.device.geo.lon).to.equal('-74.005973');
-    // slot 1
-    expect(ortbRequest.imp[0].tagid).to.equal('123');
-    expect(ortbRequest.imp[0].banner).to.not.equal(null);
-    expect(ortbRequest.imp[0].banner.w).to.equal(300);
-    expect(ortbRequest.imp[0].banner.h).to.equal(250);
-    expect(ortbRequest.imp[0].bidfloor).to.equal('0.001');
-    // slot 2
-    expect(ortbRequest.imp[1].tagid).to.equal('1234');
-    expect(ortbRequest.imp[1].banner).to.not.equal(null);
-    expect(ortbRequest.imp[1].banner.w).to.equal(728);
-    expect(ortbRequest.imp[1].banner.h).to.equal(90);
-    expect(ortbRequest.imp[1].bidfloor).to.equal('0.000001');
-  });
-
-  it('Verify parse response', function () {
-    const request = spec.buildRequests(slotConfigs);
-    const ortbRequest = JSON.parse(request.data);
-    const ortbResponse = {
-      seatbid: [{
-        bid: [{
-          impid: ortbRequest.imp[0].id,
-          price: 1.25,
-          adm: 'This is an Ad',
-          w: 300,
-          h: 250
-        }]
-      }],
-      cur: 'USD'
-    };
-    const bids = spec.interpretResponse({ body: ortbResponse }, request);
-    expect(bids).to.have.lengthOf(1);
-    // verify first bid
-    const bid = bids[0];
-    expect(bid.cpm).to.equal(1.25);
-    expect(bid.ad).to.equal('This is an Ad');
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.adId).to.equal('bid12345');
-    expect(bid.creativeId).to.equal('bid12345');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.ttl).to.equal(360);
-  });
-
-  it('Verify full passback', function () {
-    const request = spec.buildRequests(slotConfigs);
-    const bids = spec.interpretResponse({ body: null }, request)
-    expect(bids).to.have.lengthOf(0);
-  });
-
-  it('Verify Native request', function () {
-    const request = spec.buildRequests(nativeSlotConfig);
-    expect(request.url).to.equal('https://windtalkerdisplay.hb.adp3.net/');
-    expect(request.method).to.equal('POST');
-    const ortbRequest = JSON.parse(request.data);
-    // native impression
-    expect(ortbRequest.imp[0].tagid).to.equal('123');
-    const nativePart = ortbRequest.imp[0]['native'];
-    expect(nativePart).to.not.equal(null);
-    expect(nativePart.ver).to.equal('1.1');
-    expect(nativePart.request).to.not.equal(null);
-    // native request assets
-    const nativeRequest = JSON.parse(ortbRequest.imp[0]['native'].request);
-    expect(nativeRequest).to.not.equal(null);
-    expect(nativeRequest.assets).to.have.lengthOf(5);
-    expect(nativeRequest.assets[0].id).to.equal(1);
-    expect(nativeRequest.assets[1].id).to.equal(2);
-    expect(nativeRequest.assets[2].id).to.equal(3);
-    expect(nativeRequest.assets[3].id).to.equal(4);
-    expect(nativeRequest.assets[4].id).to.equal(5);
-    expect(nativeRequest.assets[0].required).to.equal(1);
-    expect(nativeRequest.assets[0].title).to.not.equal(null);
-    expect(nativeRequest.assets[0].title.len).to.equal(200);
-    expect(nativeRequest.assets[1].title).to.be.undefined;
-    expect(nativeRequest.assets[1].data).to.not.equal(null);
-    expect(nativeRequest.assets[1].data.type).to.equal(2);
-    expect(nativeRequest.assets[1].data.len).to.equal(200);
-    expect(nativeRequest.assets[2].required).to.equal(0);
-    expect(nativeRequest.assets[3].img).to.not.equal(null);
-    expect(nativeRequest.assets[3].img.wmin).to.equal(50);
-    expect(nativeRequest.assets[3].img.hmin).to.equal(50);
-    expect(nativeRequest.assets[3].img.type).to.equal(1);
-    expect(nativeRequest.assets[4].img).to.not.equal(null);
-    expect(nativeRequest.assets[4].img.wmin).to.equal(100);
-    expect(nativeRequest.assets[4].img.hmin).to.equal(150);
-    expect(nativeRequest.assets[4].img.type).to.equal(3);
-  });
-
-  it('Verify Native response', function () {
-    const request = spec.buildRequests(nativeSlotConfig);
-    expect(request.url).to.equal('https://windtalkerdisplay.hb.adp3.net/');
-    expect(request.method).to.equal('POST');
-    const ortbRequest = JSON.parse(request.data);
-    const nativeResponse = {
-      'native': {
-        assets: [
-          { id: 1, title: { text: 'Ad Title' } },
-          { id: 2, data: { value: 'Test description' } },
-          { id: 3, data: { value: 'Brand' } },
-          { id: 4, img: { url: 'https://adx1public.s3.amazonaws.com/creatives_icon.png', w: 100, h: 100 } },
-          { id: 5, img: { url: 'https://adx1public.s3.amazonaws.com/creatives_image.png', w: 300, h: 300 } }
-        ],
-        link: { url: 'https://brand.com/' }
-      }
-    };
-    const ortbResponse = {
-      seatbid: [{
-        bid: [{
-          impid: ortbRequest.imp[0].id,
-          price: 1.25,
-          nurl: 'https://rtb.adx1.com/log',
-          adm: JSON.stringify(nativeResponse)
-        }]
-      }],
-      cur: 'USD',
-    };
-    const bids = spec.interpretResponse({ body: ortbResponse }, request);
-    // verify bid
-    const bid = bids[0];
-    expect(bid.cpm).to.equal(1.25);
-    expect(bid.adId).to.equal('bid12345');
-    expect(bid.ad).to.be.undefined;
-    expect(bid.mediaType).to.equal('native');
-    const nativeBid = bid['native'];
-    expect(nativeBid).to.not.equal(null);
-    expect(nativeBid.title).to.equal('Ad Title');
-    expect(nativeBid.sponsoredBy).to.equal('Brand');
-    expect(nativeBid.icon.url).to.equal('https://adx1public.s3.amazonaws.com/creatives_icon.png');
-    expect(nativeBid.image.url).to.equal('https://adx1public.s3.amazonaws.com/creatives_image.png');
-    expect(nativeBid.image.width).to.equal(300);
-    expect(nativeBid.image.height).to.equal(300);
-    expect(nativeBid.icon.width).to.equal(100);
-    expect(nativeBid.icon.height).to.equal(100);
-    expect(nativeBid.clickUrl).to.equal(encodeURIComponent('https://brand.com/'));
-    expect(nativeBid.impressionTrackers).to.have.lengthOf(1);
-    expect(nativeBid.impressionTrackers[0]).to.equal('https://rtb.adx1.com/log');
-  });
-
-  it('Verify Video request', function () {
-    const request = spec.buildRequests(videoSlotConfig);
-    expect(request.url).to.equal('https://windtalkerdisplay.hb.adp3.net/');
-    expect(request.method).to.equal('POST');
-    const videoRequest = JSON.parse(request.data);
-    // site object
-    expect(videoRequest.site).to.not.equal(null);
-    expect(videoRequest.site.publisher.id).to.equal('29521');
-    expect(videoRequest.site.ref).to.equal(window.top.document.referrer);
-    expect(videoRequest.site.page).to.equal(window.location.href);
-    // device object
-    expect(videoRequest.device).to.not.equal(null);
-    expect(videoRequest.device.ua).to.equal(navigator.userAgent);
-    // slot 1
-    expect(videoRequest.imp[0].tagid).to.equal('1234567');
-    expect(videoRequest.imp[0].video).to.not.equal(null);
-    expect(videoRequest.imp[0].video.w).to.equal(640);
-    expect(videoRequest.imp[0].video.h).to.equal(480);
-    expect(videoRequest.imp[0].banner).to.equal(null);
-    expect(videoRequest.imp[0].native).to.equal(null);
-  });
-
-  it('Verify parse video response', function () {
-    const request = spec.buildRequests(videoSlotConfig);
-    const videoRequest = JSON.parse(request.data);
-    const videoResponse = {
-      seatbid: [{
-        bid: [{
-          impid: videoRequest.imp[0].id,
-          price: 1.90,
-          adm: 'https://vid.example.com/9876',
-          crid: '510511_754567308'
-        }]
-      }],
-      cur: 'USD'
-    };
-    const bids = spec.interpretResponse({ body: videoResponse }, request);
-    expect(bids).to.have.lengthOf(1);
-    // verify first bid
-    const bid = bids[0];
-    expect(bid.cpm).to.equal(1.90);
-    expect(bid.vastUrl).to.equal('https://vid.example.com/9876');
-    expect(bid.crid).to.equal('510511_754567308');
-    expect(bid.width).to.equal(640);
-    expect(bid.height).to.equal(480);
-    expect(bid.adId).to.equal('bid12345678');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.currency).to.equal('USD');
-    expect(bid.ttl).to.equal(360);
-  });
-
-  it('Verifies bidder code', function () {
-    expect(spec.code).to.equal('windtalker');
-  });
-
-  it('Verifies supported media types', function () {
-    expect(spec.supportedMediaTypes).to.have.lengthOf(3);
-    expect(spec.supportedMediaTypes[0]).to.equal('banner');
-    expect(spec.supportedMediaTypes[1]).to.equal('native');
-    expect(spec.supportedMediaTypes[2]).to.equal('video');
-  });
-
-  it('Verifies if bid request valid', function () {
-    expect(spec.isBidRequestValid(slotConfigs[0])).to.equal(true);
-    expect(spec.isBidRequestValid(slotConfigs[1])).to.equal(true);
-    expect(spec.isBidRequestValid(nativeSlotConfig[0])).to.equal(true);
-    expect(spec.isBidRequestValid(videoSlotConfig[0])).to.equal(true);
-  });
-
-  it('Verify app requests', function () {
-    const request = spec.buildRequests(appSlotConfig);
-    const ortbRequest = JSON.parse(request.data);
-    expect(ortbRequest.site).to.equal(null);
-    expect(ortbRequest.app).to.not.be.null;
-    expect(ortbRequest.app.publisher).to.not.equal(null);
-    expect(ortbRequest.app.publisher.id).to.equal('29521');
-    expect(ortbRequest.app.id).to.equal('1111');
-    expect(ortbRequest.app.name).to.equal('app name');
-    expect(ortbRequest.app.bundle).to.equal('io.windtalker.apps');
-    expect(ortbRequest.app.storeurl).to.equal('https://windtalker.io/apps');
-    expect(ortbRequest.app.domain).to.equal('windtalker.io');
-  });
-
-  it('Verify GDPR', function () {
-    const bidderRequest = {
-      gdprConsent: {
-        gdprApplies: true,
-        consentString: 'serialized_gpdr_data'
-      }
-    };
-    const request = spec.buildRequests(slotConfigs, bidderRequest);
-    expect(request.url).to.equal('https://windtalkerdisplay.hb.adp3.net/');
-    expect(request.method).to.equal('POST');
-    const ortbRequest = JSON.parse(request.data);
-    expect(ortbRequest.user).to.not.equal(null);
-    expect(ortbRequest.user.ext).to.not.equal(null);
-    expect(ortbRequest.user.ext.consent).to.equal('serialized_gpdr_data');
-    expect(ortbRequest.regs).to.not.equal(null);
-    expect(ortbRequest.regs.ext).to.not.equal(null);
-    expect(ortbRequest.regs.ext.gdpr).to.equal(1);
-  });
-});
diff --git a/test/spec/modules/winrBidAdapter_spec.js b/test/spec/modules/winrBidAdapter_spec.js
new file mode 100644
index 00000000000..174f600fa06
--- /dev/null
+++ b/test/spec/modules/winrBidAdapter_spec.js
@@ -0,0 +1,782 @@
+import { expect } from 'chai';
+import { spec, storage } from 'modules/winrBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { auctionManager } from 'src/auctionManager.js';
+import { deepClone } from 'src/utils.js';
+import { config } from 'src/config.js';
+
+const GATE_COOKIE_NAME = 'wnr_gate';
+const ENDPOINT = 'https://ib.adnxs.com/ut/v3/prebid';
+
+function getMediaTypeFromBid(bid) {
+  return bid.mediaTypes && Object.keys(bid.mediaTypes)[0];
+}
+
+describe('WinrAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let getCookieStub;
+    let cookiesAreEnabledStub;
+
+    beforeEach(function() {
+      getCookieStub = sinon.stub(storage, 'getCookie');
+      cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+    });
+
+    afterEach(function() {
+      getCookieStub.restore();
+      cookiesAreEnabledStub.restore();
+    });
+
+    let placementId = '21543013';
+    let bid = {
+      'bidder': 'winr',
+      'params': {
+        'placementId': placementId,
+        'domParent': '.blog-post',
+        'child': 4
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[1, 1]],
+      'bidId': '2b21e2d141e6d4',
+      'bidderRequestId': '1dfdc89563b81a',
+      'auctionId': '0bc27fb0-ea39-4a5a-b1ba-5d83a5f28a69',
+      'mediaTypes': {
+        'banner': {}
+      },
+    };
+
+    describe('- with cookies disabled', function () {
+      beforeEach(function() {
+        cookiesAreEnabledStub.returns(false);
+      });
+
+      it('should return false', function () {
+        expect(storage.cookiesAreEnabled()).to.equal(false);
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+    });
+
+    describe('- with gate cookie set', function () {
+      beforeEach(function() {
+        getCookieStub.withArgs(GATE_COOKIE_NAME).returns('true');
+      });
+
+      it('should return false', function () {
+        expect(storage.getCookie(GATE_COOKIE_NAME)).to.not.equal(null);
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+    });
+
+    describe('- with cookies enabled and gate cookie not set', function () {
+      beforeEach(function() {
+        cookiesAreEnabledStub.returns(true);
+        getCookieStub.withArgs(GATE_COOKIE_NAME).returns(null);
+      });
+
+      it('should return true when required params found', function () {
+        expect(storage.cookiesAreEnabled()).to.equal(true);
+        expect(storage.getCookie(GATE_COOKIE_NAME)).to.equal(null);
+        expect(getMediaTypeFromBid(bid)).to.equal('banner');
+        expect(bid).to.have.deep.nested.property('params.placementId');
+        expect(bid.params.placementId).to.equal(placementId);
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+
+    it('should return false when mediaType is not banner', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.mediaTypes;
+      bid.mediaTypes = {
+        'video': {}
+      };
+      expect(getMediaTypeFromBid(bid)).to.not.equal('banner');
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'placementId': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let getAdUnitsStub;
+    let bidRequests = [
+      {
+        'bidder': 'winr',
+        'params': {
+          'placementId': '21543013'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[1, 1]],
+        'bidId': '2b21e2d141e6d4',
+        'bidderRequestId': '1dfdc89563b81a',
+        'auctionId': '0bc27fb0-ea39-4a5a-b1ba-5d83a5f28a69',
+        'transactionId': '270e4b6e-0acc-41c4-b253-b935f966fa7d'
+      }
+    ];
+
+    beforeEach(function() {
+      getAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits').callsFake(function() {
+        return [];
+      });
+    });
+
+    afterEach(function() {
+      getAdUnitsStub.restore();
+    });
+
+    it('should parse out private sizes', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '21543013',
+            privateSizes: [1, 1]
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].private_sizes).to.exist;
+      expect(payload.tags[0].private_sizes).to.deep.equal([{width: 1, height: 1}]);
+    });
+
+    it('should add publisher_id in request', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '21543013',
+            publisherId: '1231234'
+          }
+        });
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].publisher_id).to.exist;
+      expect(payload.tags[0].publisher_id).to.deep.equal(1231234);
+      expect(payload.publisher_id).to.exist;
+      expect(payload.publisher_id).to.deep.equal(1231234);
+    })
+
+    it('should add source and version to the tag', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.sdk).to.exist;
+      expect(payload.sdk).to.deep.equal({
+        source: 'pbjs',
+        version: '$prebid.version$'
+      });
+    });
+
+    it('should not populate the ad_types array when adUnit.mediaTypes is undefined', function() {
+      const bidRequest = Object.assign({}, bidRequests[0]);
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].ad_types).to.not.exist;
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should attach valid user params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '21543013',
+            user: {
+              externalUid: '123',
+              // dnt: false,
+              segments: [123, { id: 987, value: 876 }],
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user).to.exist;
+      expect(payload.user).to.deep.equal({
+        external_uid: '123',
+        // dnt: false
+        segments: [{id: 123}, {id: 987, value: 876}]
+      });
+    });
+
+    it('should attach reserve param when either bid param or getFloor function exists', function () {
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      let request, payload = null;
+      let bidRequest = deepClone(bidRequests[0]);
+
+      // 1 -> reserve not defined, getFloor not defined > empty
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.not.exist;
+
+      // 2 -> reserve is defined, getFloor not defined > reserve is used
+      bidRequest.params = {
+        'placementId': '21543013',
+        'reserve': 0.5
+      };
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(0.5);
+
+      // 3 -> reserve is defined, getFloor is defined > getFloor is used
+      bidRequest.getFloor = () => getFloorResponse;
+
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(3);
+    });
+
+    it('should contain hb_source value for other media', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'banner',
+          params: {
+            sizes: [[1, 1]],
+            placementId: 13144370
+          }
+        }
+      );
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('should convert keyword params to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '21543013',
+            keywords: {
+              single: 'val',
+              singleArr: ['val'],
+              singleArrNum: [5],
+              multiValMixed: ['value1', 2, 'value3'],
+              singleValNum: 123,
+              emptyStr: '',
+              emptyArr: [''],
+              badValue: {'foo': 'bar'} // should be dropped
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'single',
+        'value': ['val']
+      }, {
+        'key': 'singleArr',
+        'value': ['val']
+      }, {
+        'key': 'singleArrNum',
+        'value': ['5']
+      }, {
+        'key': 'multiValMixed',
+        'value': ['value1', '2', 'value3']
+      }, {
+        'key': 'singleValNum',
+        'value': ['123']
+      }, {
+        'key': 'emptyStr'
+      }, {
+        'key': 'emptyArr'
+      }]);
+    });
+
+    it('should add payment rules to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '21543013',
+            usePaymentRule: true
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].use_pmt_rule).to.equal(true);
+    });
+
+    it('should add gpid to the request', function () {
+      let testGpid = '/12345/my-gpt-tag-0';
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.ortb2Imp = { ext: { data: { pbadslot: testGpid } } };
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].gpid).to.exist.and.equal(testGpid)
+    });
+
+    it('should add gdpr consent information to the request', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'winr',
+        'auctionId': '0bc27fb0-ea39-4a5a-b1ba-5d83a5f28a69',
+        'bidderRequestId': '1dfdc89563b81a',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.options).to.deep.equal({withCredentials: true});
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr_consent).to.exist;
+      expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
+      expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+    });
+
+    it('should add us privacy string to payload', function() {
+      let consentString = '1YA-';
+      let bidderRequest = {
+        'bidderCode': 'winr',
+        'auctionId': '0bc27fb0-ea39-4a5a-b1ba-5d83a5f28a69',
+        'bidderRequestId': '1dfdc89563b81a',
+        'timeout': 3000,
+        'uspConsent': consentString
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.us_privacy).to.exist;
+      expect(payload.us_privacy).to.exist.and.to.equal(consentString);
+    });
+
+    it('supports sending hybrid mobile app parameters', function () {
+      let appRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '21543013',
+            app: {
+              id: 'B1O2W3M4AN.com.prebid.webview',
+              geo: {
+                lat: 40.0964439,
+                lng: -75.3009142
+              },
+              device_id: {
+                idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE', // Apple advertising identifier
+                aaid: '38400000-8cf0-11bd-b23e-10b96e40000d', // Android advertising identifier
+                md5udid: '5756ae9022b2ea1e47d84fead75220c8', // MD5 hash of the ANDROID_ID
+                sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF', // SHA1 hash of the ANDROID_ID
+                windowsadid: '750c6be243f1c4b5c9912b95a5742fc5' // Windows advertising identifier
+              }
+            }
+          }
+        }
+      );
+      const request = spec.buildRequests([appRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.app).to.exist;
+      expect(payload.app).to.deep.equal({
+        appid: 'B1O2W3M4AN.com.prebid.webview'
+      });
+      expect(payload.device.device_id).to.exist;
+      expect(payload.device.device_id).to.deep.equal({
+        aaid: '38400000-8cf0-11bd-b23e-10b96e40000d',
+        idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE',
+        md5udid: '5756ae9022b2ea1e47d84fead75220c8',
+        sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF',
+        windowsadid: '750c6be243f1c4b5c9912b95a5742fc5'
+      });
+      expect(payload.device.geo).to.exist;
+      expect(payload.device.geo).to.deep.equal({
+        lat: 40.0964439,
+        lng: -75.3009142
+      });
+    });
+
+    it('should add referer info to payload', function () {
+      const bidRequest = Object.assign({}, bidRequests[0])
+      const bidderRequest = {
+        refererInfo: {
+          topmostLocation: 'https://example.com/page.html',
+          reachedTop: true,
+          numIframes: 2,
+          stack: [
+            'https://example.com/page.html',
+            'https://example.com/iframe1.html',
+            'https://example.com/iframe2.html'
+          ]
+        }
+      }
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.referrer_detection).to.exist;
+      expect(payload.referrer_detection).to.deep.equal({
+        rd_ref: 'https%3A%2F%2Fexample.com%2Fpage.html',
+        rd_top: true,
+        rd_ifs: 2,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      });
+    });
+
+    it('should populate member if available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        params: {
+          member: '11626'
+        }
+      });
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.member_id).to.deep.equal(11626);
+    });
+
+    it('should populate schain if available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        schain: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              'asi': 'blob.com',
+              'sid': '001',
+              'hp': 1
+            }
+          ]
+        }
+      });
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.schain).to.deep.equal({
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            'asi': 'blob.com',
+            'sid': '001',
+            'hp': 1
+          }
+        ]
+      });
+    });
+
+    it('should populate coppa if set in config', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user.coppa).to.equal(true);
+
+      config.getConfig.restore();
+    });
+
+    it('should set the X-Is-Test customHeader if test flag is enabled', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('apn_test')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.customHeaders).to.deep.equal({'X-Is-Test': 1});
+
+      config.getConfig.restore();
+    });
+
+    it('should always set withCredentials: true on the request.options', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.withCredentials).to.equal(true);
+    });
+
+    it('should set simple domain variant if purpose 1 consent is not given', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'winr',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true,
+          apiVersion: 2,
+          vendorData: {
+            purpose: {
+              consents: {
+                1: false
+              }
+            }
+          }
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal('https://ib.adnxs-simple.com/ut/v3/prebid');
+    });
+
+    it('should populate eids when supported userIds are available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        userId: {
+          tdid: 'sample-userid',
+          uid2: { id: 'sample-uid2-value' },
+          criteoId: 'sample-criteo-userid',
+          netId: 'sample-netId-userid',
+          idl_env: 'sample-idl-userid'
+        }
+      });
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.eids).to.deep.include({
+        source: 'adserver.org',
+        id: 'sample-userid',
+        rti_partner: 'TDID'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'criteo.com',
+        id: 'sample-criteo-userid',
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'netid.de',
+        id: 'sample-netId-userid',
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'liveramp.com',
+        id: 'sample-idl-userid'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'uidapi.com',
+        id: 'sample-uid2-value',
+        rti_partner: 'UID2'
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bfStub;
+    before(function() {
+      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+    });
+
+    after(function() {
+      bfStub.restore();
+    });
+
+    let response = {
+      'version': '3.0.0',
+      'tags': [
+        {
+          'uuid': '3db3773286ee59',
+          'tag_id': 10433394,
+          'auction_id': '4534722592064951574',
+          'nobid': false,
+          'no_ad_url': 'https://lax1-ib.adnxs.com/no-ad',
+          'timeout_ms': 10000,
+          'ad_profile_id': 27079,
+          'ads': [
+            {
+              'content_source': 'rtb',
+              'ad_type': 'banner',
+              'advertiserId': 4849978,
+              'buyer_member_id': 11626,
+              'brand_category_id': 0,
+              'creative_id': 29681110,
+              'media_type_id': 1,
+              'media_subtype_id': 1,
+              'cpm': 0.5,
+              'cpm_publisher_currency': 0.5,
+              'publisher_currency_code': '$',
+              'client_initiated_ad_counting': true,
+              'viewability': {
+                'config': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=%native_dom_id%;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+              },
+              'rtb': {
+                'banner': {
+                  'content': '<!-- Creative -->',
+                  'width': 1,
+                  'height': 1
+                },
+                'trackers': [
+                  {
+                    'impression_urls': [
+                      'https://lax1-ib.adnxs.com/impression'
+                    ],
+                    'video_events': {}
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'adType': 'banner',
+          'requestId': '3db3773286ee59',
+          'auctionId': '28e94b67-b521-47b1-a284-e3cccc0a2707',
+          'cpm': 0.5,
+          'creativeId': 29681110,
+          'brandCategoryId': 0,
+          'dealId': undefined,
+          'currency': 'USD',
+          'netRevenue': true,
+          'ttl': 300,
+          'source': 'rtb',
+          'mediaSubtypeId': 1,
+          'mediaTypeId': 1,
+          'adUnitCode': 'code',
+          'buyerMemberId': 11626,
+          'appnexus': {
+            'buyerMemberId': 11626
+          },
+          'meta': {
+            'advertiserId': 4849978,
+            'placementId': 10433394,
+            'domParent': '.blog-post',
+            'child': 4
+          },
+          'width': 1,
+          'height': 1,
+          'banner': {
+            'content': '<!-- Creative -->',
+            'width': 1,
+            'height': 1,
+            'trackers': [
+              {
+                'impression_urls': [
+                  'https://www.example.com'
+                ]
+              }
+            ]
+          },
+          'mediaType': 'banner',
+          'ad': '<!-- Wrapped Ad -->'
+        }
+      ];
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code',
+          params: {
+            'placementId': 10433394,
+            'domParent': '.blog-post',
+            'child': 4
+          }
+        }]
+      }
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    it('handles nobid responses', function () {
+      let response = {
+        'version': '0.0.1',
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'tag_id': 5976557,
+          'auction_id': '297492697822162468',
+          'nobid': true
+        }]
+      };
+      let bidderRequest;
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result.length).to.equal(0);
+    });
+
+    it('should add advertiser id', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].advertiser_id = '123';
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserId']);
+    });
+
+    it('should add advertiserDomains', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].adomain = ['123'];
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserDomains']);
+      expect(Object.keys(result[0].meta.advertiserDomains)).to.deep.equal([]);
+    });
+
+    it('should add params', function() {
+      let responseParams = deepClone(response);
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code',
+          params: {
+            'placementId': 10433394,
+            'domParent': '.blog-post',
+            'child': 4
+          }
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseParams }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['placementId', 'domParent', 'child']);
+    });
+  });
+});
diff --git a/test/spec/modules/wipesBidAdapter_spec.js b/test/spec/modules/wipesBidAdapter_spec.js
index c453eca82c5..a458dcf69c8 100644
--- a/test/spec/modules/wipesBidAdapter_spec.js
+++ b/test/spec/modules/wipesBidAdapter_spec.js
@@ -108,7 +108,8 @@ describe('wipesBidAdapter', function () {
         'status_message': '',
         'currency': 'JPY',
         'video_creative_id': 600004,
-        'bid_id': '23beaa6af6cdde'
+        'bid_id': '23beaa6af6cdde',
+        'advertiser_domain': 'wipes.com',
       }
     };
 
@@ -125,7 +126,10 @@ describe('wipesBidAdapter', function () {
         'ttl': 3000,
         'referrer': '',
         'mediaType': 'banner',
-        'ad': '<!-- adtag -->'
+        'ad': '<!-- adtag -->',
+        'meta': {
+          'advertiserDomains': ['wipes.com'],
+        },
       }];
       let result = spec.interpretResponse(serverResponseVideo, bidRequestVideo[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
diff --git a/test/spec/modules/xeBidAdapter_spec.js b/test/spec/modules/xeBidAdapter_spec.js
new file mode 100644
index 00000000000..dcd82683221
--- /dev/null
+++ b/test/spec/modules/xeBidAdapter_spec.js
@@ -0,0 +1,450 @@
+import { expect } from 'chai';
+import { config } from 'src/config.js';
+import { spec, getBidFloor } from 'modules/xeBidAdapter.js';
+import { deepClone } from 'src/utils';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+const ENDPOINT = 'https://pbjs.xe.works/bid';
+
+const defaultRequest = {
+  adUnitCode: 'test',
+  bidId: '1',
+  requestId: 'qwerty',
+  auctionId: 'auctionId',
+  transactionId: 'tr1',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 200]
+      ]
+    }
+  },
+  bidder: 'xe',
+  params: {
+    env: 'xe',
+    placement: 'test-banner',
+    ext: {}
+  },
+  bidRequestsCount: 1
+};
+
+const defaultRequestVideo = deepClone(defaultRequest);
+defaultRequestVideo.mediaTypes = {
+  video: {
+    playerSize: [640, 480],
+    context: 'instream',
+    skipppable: true
+  }
+};
+
+describe('isBidRequestValid', function () {
+  it('should return false when request params is missing', function () {
+    const invalidRequest = deepClone(defaultRequest);
+    delete invalidRequest.params;
+    expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+  });
+
+  it('should return false when required env param is missing', function () {
+    const invalidRequest = deepClone(defaultRequest);
+    delete invalidRequest.params.env;
+    expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+  });
+
+  it('should return false when required placement param is missing', function () {
+    const invalidRequest = deepClone(defaultRequest);
+    delete invalidRequest.params.placement;
+    expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+  });
+
+  it('should return false when video.playerSize is missing', function () {
+    const invalidRequest = deepClone(defaultRequestVideo);
+    delete invalidRequest.mediaTypes.video.playerSize;
+    expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+  });
+
+  it('should return true when required params found', function () {
+    expect(spec.isBidRequestValid(defaultRequest)).to.equal(true);
+  });
+});
+
+describe('buildRequests', function () {
+  beforeEach(function () {
+    config.resetConfig();
+  });
+
+  it('should send request with correct structure', function () {
+    const request = spec.buildRequests([defaultRequest], {});
+    expect(request.method).to.equal('POST');
+    expect(request.url).to.equal(ENDPOINT);
+    expect(request.options).to.have.property('contentType').and.to.equal('application/json');
+    expect(request).to.have.property('data');
+  });
+
+  it('should build basic request structure', function () {
+    const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
+    expect(request).to.have.property('bidId').and.to.equal(defaultRequest.bidId);
+    expect(request).to.have.property('auctionId').and.to.equal(defaultRequest.auctionId);
+    expect(request).to.have.property('transactionId').and.to.equal(defaultRequest.transactionId);
+    expect(request).to.have.property('tz').and.to.equal(new Date().getTimezoneOffset());
+    expect(request).to.have.property('bc').and.to.equal(1);
+    expect(request).to.have.property('floor').and.to.equal(null);
+    expect(request).to.have.property('banner').and.to.deep.equal({ sizes: [[300, 250], [300, 200]] });
+    expect(request).to.have.property('gdprApplies').and.to.equal(0);
+    expect(request).to.have.property('consentString').and.to.equal('');
+    expect(request).to.have.property('userEids').and.to.deep.equal([]);
+    expect(request).to.have.property('usPrivacy').and.to.equal('');
+    expect(request).to.have.property('coppa').and.to.equal(0);
+    expect(request).to.have.property('sizes').and.to.deep.equal(['300x250', '300x200']);
+    expect(request).to.have.property('ext').and.to.deep.equal({});
+    expect(request).to.have.property('env').and.to.deep.equal({
+      env: 'xe',
+      placement: 'test-banner'
+    });
+    expect(request).to.have.property('device').and.to.deep.equal({
+      ua: navigator.userAgent,
+      lang: navigator.language
+    });
+  });
+
+  it('should build request with schain', function () {
+    const schainRequest = deepClone(defaultRequest);
+    schainRequest.schain = {
+      validation: 'strict',
+      config: {
+        ver: '1.0'
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([schainRequest], {}).data)[0];
+    expect(request).to.have.property('schain').and.to.deep.equal({
+      validation: 'strict',
+      config: {
+        ver: '1.0'
+      }
+    });
+  });
+
+  it('should build request with location', function () {
+    const bidderRequest = {
+      refererInfo: {
+        page: 'page',
+        location: 'location',
+        domain: 'domain',
+        ref: 'ref',
+        isAmp: false
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+    expect(request).to.have.property('location');
+    const location = request.location;
+    expect(location).to.have.property('page').and.to.equal('page');
+    expect(location).to.have.property('location').and.to.equal('location');
+    expect(location).to.have.property('domain').and.to.equal('domain');
+    expect(location).to.have.property('ref').and.to.equal('ref');
+    expect(location).to.have.property('isAmp').and.to.equal(false);
+  });
+
+  it('should build request with ortb2 info', function () {
+    const ortb2Request = deepClone(defaultRequest);
+    ortb2Request.ortb2 = {
+      site: {
+        name: 'name'
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([ortb2Request], {}).data)[0];
+    expect(request).to.have.property('ortb2').and.to.deep.equal({
+      site: {
+        name: 'name'
+      }
+    });
+  });
+
+  it('should build request with ortb2Imp info', function () {
+    const ortb2ImpRequest = deepClone(defaultRequest);
+    ortb2ImpRequest.ortb2Imp = {
+      ext: {
+        data: {
+          pbadslot: 'home1',
+          adUnitSpecificAttribute: '1'
+        }
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([ortb2ImpRequest], {}).data)[0];
+    expect(request).to.have.property('ortb2Imp').and.to.deep.equal({
+      ext: {
+        data: {
+          pbadslot: 'home1',
+          adUnitSpecificAttribute: '1'
+        }
+      }
+    });
+  });
+
+  it('should build request with valid bidfloor', function () {
+    const bfRequest = deepClone(defaultRequest);
+    bfRequest.getFloor = () => ({ floor: 5, currency: 'USD' });
+    const request = JSON.parse(spec.buildRequests([bfRequest], {}).data)[0];
+    expect(request).to.have.property('floor').and.to.equal(5);
+  });
+
+  it('should build request with gdpr consent data if applies', function () {
+    const bidderRequest = {
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'qwerty'
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+    expect(request).to.have.property('gdprApplies').and.equals(1);
+    expect(request).to.have.property('consentString').and.equals('qwerty');
+  });
+
+  it('should build request with usp consent data if applies', function () {
+    const bidderRequest = {
+      uspConsent: '1YA-'
+    };
+    const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+    expect(request).to.have.property('usPrivacy').and.equals('1YA-');
+  });
+
+  it('should build request with coppa 1', function () {
+    config.setConfig({
+      coppa: true
+    });
+    const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
+    expect(request).to.have.property('coppa').and.equals(1);
+  });
+
+  it('should build request with extended ids', function () {
+    const idRequest = deepClone(defaultRequest);
+    idRequest.userIdAsEids = createEidsArray({
+      tdid: 'TTD_ID_FROM_USER_ID_MODULE',
+      pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
+    });
+    const request = JSON.parse(spec.buildRequests([idRequest], {}).data)[0];
+    expect(request).to.have.property('userEids').and.deep.equal([
+      { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
+      { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
+    ]);
+  });
+
+  it('should build request with video', function () {
+    const request = JSON.parse(spec.buildRequests([defaultRequestVideo], {}).data)[0];
+    expect(request).to.have.property('video').and.to.deep.equal({
+      playerSize: [640, 480],
+      context: 'instream',
+      skipppable: true
+    });
+    expect(request).to.have.property('sizes').and.to.deep.equal(['640x480']);
+  });
+});
+
+describe('interpretResponse', function () {
+  it('should return empty bids', function () {
+    const serverResponse = {
+      body: {
+        data: null
+      }
+    };
+
+    const invalidResponse = spec.interpretResponse(serverResponse, {});
+    expect(invalidResponse).to.be.an('array').that.is.empty;
+  });
+
+  it('should interpret valid response', function () {
+    const serverResponse = {
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          cpm: 1,
+          currency: 'USD',
+          width: 300,
+          height: 250,
+          ttl: 600,
+          meta: {
+            advertiserDomains: ['xe.works']
+          },
+          ext: {
+            pixels: [
+              [ 'iframe', 'surl1' ],
+              [ 'image', 'surl2' ],
+            ]
+          }
+        }]
+      }
+    };
+
+    const validResponse = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequest });
+    const bid = validResponse[0];
+    expect(validResponse).to.be.an('array').that.is.not.empty;
+    expect(bid.requestId).to.equal('qwerty');
+    expect(bid.cpm).to.equal(1);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.ttl).to.equal(600);
+    expect(bid.meta).to.deep.equal({ advertiserDomains: ['xe.works'] });
+  });
+
+  it('should interpret valid banner response', function () {
+    const serverResponse = {
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          cpm: 1,
+          currency: 'USD',
+          width: 300,
+          height: 250,
+          ttl: 600,
+          mediaType: 'banner',
+          creativeId: 'xe-demo-banner',
+          ad: 'ad',
+          meta: {}
+        }]
+      }
+    };
+
+    const validResponseBanner = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequest });
+    const bid = validResponseBanner[0];
+    expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+    expect(bid.mediaType).to.equal('banner');
+    expect(bid.creativeId).to.equal('xe-demo-banner');
+    expect(bid.ad).to.equal('ad');
+  });
+
+  it('should interpret valid video response', function () {
+    const serverResponse = {
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          cpm: 1,
+          currency: 'USD',
+          width: 600,
+          height: 480,
+          ttl: 600,
+          mediaType: 'video',
+          creativeId: 'xe-demo-video',
+          ad: 'vast-xml',
+          meta: {}
+        }]
+      }
+    };
+
+    const validResponseBanner = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequestVideo });
+    const bid = validResponseBanner[0];
+    expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+    expect(bid.mediaType).to.equal('video');
+    expect(bid.creativeId).to.equal('xe-demo-video');
+    expect(bid.ad).to.equal('vast-xml');
+  });
+});
+
+describe('getUserSyncs', function () {
+  it('shoukd handle no params', function () {
+    const opts = spec.getUserSyncs({}, []);
+    expect(opts).to.be.an('array').that.is.empty;
+  });
+
+  it('should return empty if sync is not allowed', function () {
+    const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
+    expect(opts).to.be.an('array').that.is.empty;
+  });
+
+  it('should allow iframe sync', function () {
+    const opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [{
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          ext: {
+            pixels: [
+              [ 'iframe', 'surl1?a=b' ],
+              [ 'image', 'surl2?a=b' ],
+            ]
+          }
+        }]
+      }
+    }]);
+    expect(opts.length).to.equal(1);
+    expect(opts[0].type).to.equal('iframe');
+    expect(opts[0].url).to.equal('surl1?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+  });
+
+  it('should allow pixel sync', function () {
+    const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          ext: {
+            pixels: [
+              [ 'iframe', 'surl1?a=b' ],
+              [ 'image', 'surl2?a=b' ],
+            ]
+          }
+        }]
+      }
+    }]);
+    expect(opts.length).to.equal(1);
+    expect(opts[0].type).to.equal('image');
+    expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+  });
+
+  it('should allow pixel sync and parse consent params', function () {
+    const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          ext: {
+            pixels: [
+              [ 'iframe', 'surl1?a=b' ],
+              [ 'image', 'surl2?a=b' ],
+            ]
+          }
+        }]
+      }
+    }], {
+      gdprApplies: 1,
+      consentString: '1YA-'
+    });
+    expect(opts.length).to.equal(1);
+    expect(opts[0].type).to.equal('image');
+    expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=1&gdpr_consent=1YA-');
+  });
+});
+
+describe('getBidFloor', function () {
+  it('should return null when getFloor is not a function', () => {
+    const bid = { getFloor: 2 };
+    const result = getBidFloor(bid);
+    expect(result).to.be.null;
+  });
+
+  it('should return null when getFloor doesnt return an object', () => {
+    const bid = { getFloor: () => 2 };
+    const result = getBidFloor(bid);
+    expect(result).to.be.null;
+  });
+
+  it('should return null when floor is not a number', () => {
+    const bid = {
+      getFloor: () => ({ floor: 'string', currency: 'USD' })
+    };
+    const result = getBidFloor(bid);
+    expect(result).to.be.null;
+  });
+
+  it('should return null when currency is not USD', () => {
+    const bid = {
+      getFloor: () => ({ floor: 5, currency: 'EUR' })
+    };
+    const result = getBidFloor(bid);
+    expect(result).to.be.null;
+  });
+
+  it('should return floor value when everything is correct', () => {
+    const bid = {
+      getFloor: () => ({ floor: 5, currency: 'USD' })
+    };
+    const result = getBidFloor(bid);
+    expect(result).to.equal(5);
+  });
+});
diff --git a/test/spec/modules/xhbBidAdapter_spec.js b/test/spec/modules/xhbBidAdapter_spec.js
deleted file mode 100644
index a12abc74c64..00000000000
--- a/test/spec/modules/xhbBidAdapter_spec.js
+++ /dev/null
@@ -1,495 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/xhbBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import { deepClone } from 'src/utils.js';
-
-const ENDPOINT = 'https://ib.adnxs.com/ut/v3/prebid';
-
-describe('xhbAdapter', function () {
-  const adapter = newBidder(spec);
-
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    let bid = {
-      'bidder': 'xhb',
-      'params': {
-        'placementId': '10433394'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': '30b31c1838de1e',
-      'bidderRequestId': '22edbae2733bf6',
-      'auctionId': '1d1a030790a475',
-    };
-
-    it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'member': '1234',
-        'invCode': 'ABCD'
-      };
-
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-    });
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        'placementId': 0
-      };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
-  });
-
-  describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        'bidder': 'xhb',
-        'params': {
-          'placementId': '10433394'
-        },
-        'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-      }
-    ];
-
-    it('should parse out private sizes', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            privateSizes: [300, 250]
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].private_sizes).to.exist;
-      expect(payload.tags[0].private_sizes).to.deep.equal([{width: 300, height: 250}]);
-    });
-
-    it('should add source and verison to the tag', function () {
-      const request = spec.buildRequests(bidRequests);
-      const payload = JSON.parse(request.data);
-      expect(payload.sdk).to.exist;
-      expect(payload.sdk).to.deep.equal({
-        source: 'pbjs',
-        version: '$prebid.version$'
-      });
-    });
-
-    it('should populate the ad_types array on all requests', function () {
-      ['banner', 'video', 'native'].forEach(type => {
-        const bidRequest = Object.assign({}, bidRequests[0]);
-        bidRequest.mediaTypes = {};
-        bidRequest.mediaTypes[type] = {};
-
-        const request = spec.buildRequests([bidRequest]);
-        const payload = JSON.parse(request.data);
-
-        expect(payload.tags[0].ad_types).to.deep.equal([type]);
-      });
-    });
-
-    it('should populate the ad_types array on outstream requests', function () {
-      const bidRequest = Object.assign({}, bidRequests[0]);
-      bidRequest.mediaTypes = {};
-      bidRequest.mediaTypes.video = {context: 'outstream'};
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].ad_types).to.deep.equal(['video']);
-    });
-
-    it('sends bid request to ENDPOINT via POST', function () {
-      const request = spec.buildRequests(bidRequests);
-      expect(request.url).to.equal(ENDPOINT);
-      expect(request.method).to.equal('POST');
-    });
-
-    it('should attach valid video params to the tag', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            video: {
-              id: 123,
-              minduration: 100,
-              foobar: 'invalid'
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-      expect(payload.tags[0].video).to.deep.equal({
-        id: 123,
-        minduration: 100
-      });
-    });
-
-    it('should attach valid user params to the tag', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            user: {
-              external_uid: '123',
-              foobar: 'invalid'
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.user).to.exist;
-      expect(payload.user).to.deep.equal({
-        external_uid: '123',
-      });
-    });
-
-    it('should attach native params to the request', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          mediaType: 'native',
-          nativeParams: {
-            title: {required: true},
-            body: {required: true},
-            image: {required: true, sizes: [{ width: 100, height: 100 }]},
-            cta: {required: false},
-            sponsoredBy: {required: true}
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].native.layouts[0]).to.deep.equal({
-        title: {required: true},
-        description: {required: true},
-        main_image: {required: true, sizes: [{ width: 100, height: 100 }]},
-        ctatext: {required: false},
-        sponsored_by: {required: true}
-      });
-    });
-
-    it('sets minimum native asset params when not provided on adunit', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          mediaType: 'native',
-          nativeParams: {
-            image: {required: true},
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].native.layouts[0]).to.deep.equal({
-        main_image: {required: true, sizes: [{}]},
-      });
-    });
-
-    it('does not overwrite native ad unit params with mimimum params', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          mediaType: 'native',
-          nativeParams: {
-            image: {
-              aspect_ratios: [{
-                min_width: 100,
-                ratio_width: 2,
-                ratio_height: 3,
-              }]
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].native.layouts[0]).to.deep.equal({
-        main_image: {
-          required: true,
-          aspect_ratios: [{
-            min_width: 100,
-            ratio_width: 2,
-            ratio_height: 3,
-          }]
-        },
-      });
-    });
-
-    it('should convert keyword params to proper form and attaches to request', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            keywords: {
-              single: 'val',
-              singleArr: ['val'],
-              singleArrNum: [5],
-              multiValMixed: ['value1', 2, 'value3'],
-              singleValNum: 123,
-              badValue: {'foo': 'bar'} // should be dropped
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].keywords).to.deep.equal([{
-        'key': 'single',
-        'value': ['val']
-      }, {
-        'key': 'singleArr',
-        'value': ['val']
-      }, {
-        'key': 'singleArrNum',
-        'value': ['5']
-      }, {
-        'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
-      }, {
-        'key': 'singleValNum',
-        'value': ['123']
-      }]);
-    });
-
-    it('should add payment rules to the request', function () {
-      let bidRequest = Object.assign({},
-        bidRequests[0],
-        {
-          params: {
-            placementId: '10433394',
-            usePaymentRule: true
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest]);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.tags[0].use_pmt_rule).to.equal(true);
-    });
-
-    it('should add gdpr consent information to the request', function () {
-      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
-      let bidderRequest = {
-        'bidderCode': 'xhb',
-        'auctionId': '1d1a030790a475',
-        'bidderRequestId': '22edbae2733bf6',
-        'timeout': 3000,
-        'gdprConsent': {
-          consentString: consentString,
-          gdprApplies: true
-        }
-      };
-      bidderRequest.bids = bidRequests;
-
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      const payload = JSON.parse(request.data);
-
-      expect(payload.gdpr_consent).to.exist;
-      expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
-      expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let response = {
-      'version': '3.0.0',
-      'tags': [
-        {
-          'uuid': '3db3773286ee59',
-          'tag_id': 10433394,
-          'auction_id': '4534722592064951574',
-          'nobid': false,
-          'no_ad_url': 'https://lax1-ib.adnxs.com/no-ad',
-          'timeout_ms': 10000,
-          'ad_profile_id': 27079,
-          'ads': [
-            {
-              'content_source': 'rtb',
-              'ad_type': 'banner',
-              'buyer_member_id': 958,
-              'creative_id': 29681110,
-              'media_type_id': 1,
-              'media_subtype_id': 1,
-              'cpm': 0.5,
-              'cpm_publisher_currency': 0.5,
-              'publisher_currency_code': '$',
-              'client_initiated_ad_counting': true,
-              'rtb': {
-                'banner': {
-                  'content': '<!-- Creative -->',
-                  'width': 300,
-                  'height': 250
-                },
-                'trackers': [
-                  {
-                    'impression_urls': [
-                      'https://lax1-ib.adnxs.com/impression'
-                    ],
-                    'video_events': {}
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ]
-    };
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {
-          'requestId': '3db3773286ee59',
-          'cpm': 0.5,
-          'creativeId': 29681110,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '<!-- Creative -->',
-          'mediaType': 'banner',
-          'currency': 'USD',
-          'ttl': 300,
-          'netRevenue': true,
-          'appnexus': {
-            'buyerMemberId': 958
-          }
-        }
-      ];
-      let bidderRequest;
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
-    });
-
-    it('handles nobid responses', function () {
-      let response = {
-        'version': '0.0.1',
-        'tags': [{
-          'uuid': '84ab500420319d',
-          'tag_id': 5976557,
-          'auction_id': '297492697822162468',
-          'nobid': true
-        }]
-      };
-      let bidderRequest;
-
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
-      expect(result.length).to.equal(0);
-    });
-
-    it('handles non-banner media responses', function () {
-      let response = {
-        'tags': [{
-          'uuid': '84ab500420319d',
-          'ads': [{
-            'ad_type': 'video',
-            'cpm': 0.500000,
-            'notify_url': 'imptracker.com',
-            'rtb': {
-              'video': {
-                'content': '<!-- Creative -->'
-              }
-            }
-          }]
-        }]
-      };
-      let bidderRequest;
-
-      let result = spec.interpretResponse({ body: response }, {bidderRequest});
-      expect(result[0]).to.have.property('vastUrl');
-      expect(result[0]).to.have.property('vastImpUrl');
-      expect(result[0]).to.have.property('mediaType', 'video');
-    });
-
-    it('handles native responses', function () {
-      let response1 = deepClone(response);
-      response1.tags[0].ads[0].ad_type = 'native';
-      response1.tags[0].ads[0].rtb.native = {
-        'title': 'Native Creative',
-        'desc': 'Cool description great stuff',
-        'ctatext': 'Do it',
-        'sponsored': 'AppNexus',
-        'icon': {
-          'width': 0,
-          'height': 0,
-          'url': 'https://cdn.adnxs.com/icon.png'
-        },
-        'main_img': {
-          'width': 2352,
-          'height': 1516,
-          'url': 'https://cdn.adnxs.com/img.png'
-        },
-        'link': {
-          'url': 'https://www.appnexus.com',
-          'fallback_url': '',
-          'click_trackers': ['https://nym1-ib.adnxs.com/click']
-        },
-        'impression_trackers': ['https://example.com'],
-      };
-      let bidderRequest;
-
-      let result = spec.interpretResponse({ body: response1 }, {bidderRequest});
-      expect(result[0].native.title).to.equal('Native Creative');
-      expect(result[0].native.body).to.equal('Cool description great stuff');
-      expect(result[0].native.cta).to.equal('Do it');
-      expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
-    });
-
-    it('supports configuring outstream renderers', function () {
-      const outstreamResponse = deepClone(response);
-      outstreamResponse.tags[0].ads[0].rtb.video = {};
-      outstreamResponse.tags[0].ads[0].renderer_url = 'renderer.js';
-
-      const bidderRequest = {
-        bids: [{
-          renderer: {
-            options: {
-              adText: 'configured'
-            }
-          }
-        }]
-      };
-
-      const result = spec.interpretResponse({ body: outstreamResponse }, {bidderRequest});
-      expect(result[0].renderer.config).to.deep.equal(
-        bidderRequest.bids[0].renderer.options
-      );
-    });
-  });
-});
diff --git a/test/spec/modules/yahoosspBidAdapter_spec.js b/test/spec/modules/yahoosspBidAdapter_spec.js
new file mode 100644
index 00000000000..01583ac30dc
--- /dev/null
+++ b/test/spec/modules/yahoosspBidAdapter_spec.js
@@ -0,0 +1,1439 @@
+import { expect } from 'chai';
+import { config } from 'src/config.js';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import { spec } from 'modules/yahoosspBidAdapter.js';
+import {createEidsArray} from '../../../modules/userId/eids';
+import {deepClone} from '../../../src/utils';
+
+const DEFAULT_BID_ID = '84ab500420319d';
+const DEFAULT_BID_DCN = '2093845709823475';
+const DEFAULT_BID_POS = 'header';
+const DEFAULT_PUBID = 'PubId';
+const DEFAULT_AD_UNIT_CODE = '/19968336/header-bid-tag-1';
+const DEFAULT_AD_UNIT_TYPE = 'banner';
+const DEFAULT_PARAMS_BID_OVERRIDE = {};
+const DEFAULT_VIDEO_CONTEXT = 'instream';
+const ADAPTER_VERSION = '1.0.2';
+const PREBID_VERSION = '$prebid.version$';
+const INTEGRATION_METHOD = 'prebid.js';
+
+// Utility functions
+const generateBidRequest = ({bidId, pos, adUnitCode, adUnitType, bidOverrideObject, videoContext, pubIdMode, ortb2}) => {
+  const bidRequest = {
+    adUnitCode,
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    bidId,
+    bidderRequestsCount: 1,
+    bidder: 'yahoossp',
+    bidderRequestId: '7101db09af0db2',
+    bidderWinsCount: 0,
+    mediaTypes: {},
+    params: {
+      bidOverride: bidOverrideObject
+    },
+    src: 'client',
+    transactionId: '5b17b67d-7704-4732-8cc9-5b1723e9bcf9',
+    ortb2
+  };
+
+  const bannerObj = {
+    sizes: [[300, 250], [300, 600]]
+  };
+
+  const videoObject = {
+    context: videoContext,
+    playerSize: [[300, 250]],
+    mimes: ['video/mp4', 'application/javascript'],
+    api: [2]
+  };
+
+  if (videoContext === 'outstream') {
+    bidRequest.renderer = undefined
+  };
+
+  if (adUnitType === 'banner' || adUnitType === 'dap-o2' || adUnitType === 'dap-up') {
+    bidRequest.mediaTypes.banner = bannerObj;
+    bidRequest.sizes = [[300, 250], [300, 600]];
+  } else if (adUnitType === 'video') {
+    bidRequest.mediaTypes.video = videoObject;
+  } else if (adUnitType === 'multi-format') {
+    bidRequest.mediaTypes.banner = bannerObj;
+    bidRequest.sizes = [[300, 250], [300, 600]];
+    bidRequest.mediaTypes.video = videoObject;
+  } else if (adUnitType === 'native') {
+    bidRequest.mediaTypes.native = {a: 123, b: 456};
+  }
+
+  if (pubIdMode === true) {
+    bidRequest.params.pubId = DEFAULT_PUBID;
+  } else {
+    bidRequest.params.dcn = DEFAULT_BID_DCN;
+    bidRequest.params.pos = pos || DEFAULT_BID_POS;
+  };
+
+  return bidRequest;
+}
+
+let generateBidderRequest = (bidRequestArray, adUnitCode, ortb2 = {}) => {
+  const bidderRequest = {
+    adUnitCode: adUnitCode || 'default-adUnitCode',
+    auctionId: 'd4c83a3b-18e4-4208-b98b-63848449c7aa',
+    auctionStart: new Date().getTime(),
+    bidderCode: 'yahoossp',
+    bidderRequestId: '112f1c7c5d399a',
+    bids: bidRequestArray,
+    refererInfo: {
+      page: 'https://publisher-test.com',
+      reachedTop: true,
+      isAmp: false,
+      numIframes: 0,
+      stack: ['https://publisher-test.com'],
+    },
+    gdprConsent: {
+      consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+      vendorData: {},
+      gdprApplies: true
+    },
+    start: new Date().getTime(),
+    timeout: 1000,
+    ortb2
+  };
+
+  return bidderRequest;
+};
+
+const generateBuildRequestMock = ({bidId, pos, adUnitCode, adUnitType, bidOverrideObject, videoContext, pubIdMode, ortb2}) => {
+  const bidRequestConfig = {
+    bidId: bidId || DEFAULT_BID_ID,
+    pos: pos || DEFAULT_BID_POS,
+    adUnitCode: adUnitCode || DEFAULT_AD_UNIT_CODE,
+    adUnitType: adUnitType || DEFAULT_AD_UNIT_TYPE,
+    bidOverrideObject: bidOverrideObject || DEFAULT_PARAMS_BID_OVERRIDE,
+    videoContext: videoContext || DEFAULT_VIDEO_CONTEXT,
+    pubIdMode: pubIdMode || false,
+    ortb2: ortb2 || {}
+  };
+  const bidRequest = generateBidRequest(bidRequestConfig);
+  const validBidRequests = [bidRequest];
+  const bidderRequest = generateBidderRequest(validBidRequests, adUnitCode, ortb2);
+
+  return { bidRequest, validBidRequests, bidderRequest }
+};
+
+const generateAdmPayload = (admPayloadType) => {
+  let ADM_PAYLOAD;
+  switch (admPayloadType) {
+    case 'banner':
+      ADM_PAYLOAD = '<script>logInfo(\'ad\'); AdPlacement </script>'; // banner
+      break;
+    case 'video':
+      ADM_PAYLOAD = '<VAST></VAST>'; // VAST xml
+      break;
+    case 'multi-format':
+      const admPayloads = [
+        '<script>logInfo(\'ad\'); AdPlacement </script>', // banner
+        '<VAST></VAST>' // VAST xml
+      ]
+      const random = Math.floor(Math.random() * admPayloads.length);
+      ADM_PAYLOAD = admPayloads[random]
+      break;
+    case 'dap-o2':
+      ADM_PAYLOAD = '<script>o2playerSettings</script>'; // O2 player
+      break;
+    case 'dap-up':
+      ADM_PAYLOAD = '<script>YAHOO.VideoPlatform.VideoPlayer</script>'; // Unified Player
+      break;
+  };
+  return ADM_PAYLOAD;
+};
+
+const generateResponseMock = (admPayloadType, vastVersion, videoContext) => {
+  const bidResponse = {
+    id: 'fc0c35df-21fb-4f93-9ebd-88759dbe31f9',
+    impid: '274395c06a24e5',
+    adm: generateAdmPayload(admPayloadType),
+    price: 1,
+    w: 300,
+    h: 250,
+    crid: 'ssp-placement-name',
+    adomain: ['advertiser-domain.com']
+  };
+
+  if (vastVersion === 'vast') {
+    bidResponse.nurl = 'https://yahoo.com?event=adAttempt';
+  };
+
+  const serverResponse = {
+    body: {
+      id: 'fc0c35df-21fb-4f93-9ebd-88759dbe31f9',
+      seatbid: [{ bid: [ bidResponse ], seat: 13107 }]
+    }
+  };
+  const { validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: admPayloadType, videoContext: videoContext});
+  const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+
+  return {serverResponse, data, bidderRequest};
+}
+
+// Unit tests
+describe('YahooSSP Bid Adapter:', () => {
+  it('PLACEHOLDER TO PASS GULP', () => {
+    const obj = {};
+    expect(obj).to.be.an('object');
+  });
+
+  describe('Validate basic properties', () => {
+    it('should define the correct bidder code', () => {
+      expect(spec.code).to.equal('yahoossp')
+    });
+
+    it('should define the correct vendor ID', () => {
+      expect(spec.gvlid).to.equal(25)
+    });
+  });
+
+  describe('getUserSyncs()', () => {
+    const IMAGE_PIXEL_URL = 'http://image-pixel.com/foo/bar?1234&baz=true';
+    const IFRAME_ONE_URL = 'http://image-iframe.com/foo/bar?1234&baz=true';
+    const IFRAME_TWO_URL = 'http://image-iframe-two.com/foo/bar?1234&baz=true';
+
+    let serverResponses = [];
+    beforeEach(() => {
+      serverResponses[0] = {
+        body: {
+          ext: {
+            pixels: `<script>document.write('<iframe src="${IFRAME_ONE_URL}"></iframe>` +
+                    `<img src="${IMAGE_PIXEL_URL}"></iframe>` +
+                    `<iframe src="${IFRAME_TWO_URL}"></iframe>');</script>`
+          }
+        }
+      }
+    });
+
+    after(() => {
+      serverResponses = undefined;
+    });
+
+    it('for only iframe enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: false
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(2);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'iframe', 'url': IFRAME_ONE_URL},
+          {type: 'iframe', 'url': IFRAME_TWO_URL}
+        ]
+      )
+    });
+
+    it('for only pixel enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: true
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(1);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'image', 'url': IMAGE_PIXEL_URL}
+        ]
+      )
+    });
+
+    it('for both pixel and iframe enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(3);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'iframe', 'url': IFRAME_ONE_URL},
+          {type: 'image', 'url': IMAGE_PIXEL_URL},
+          {type: 'iframe', 'url': IFRAME_TWO_URL}
+        ]
+      )
+    });
+  });
+
+  // Validate Bid Requests
+  describe('isBidRequestValid()', () => {
+    const INVALID_INPUT = [
+      {},
+      {params: {}},
+      {params: {dcn: '2c9d2b50015a5aa95b70a9b0b5b10012'}},
+      {params: {dcn: 1234, pos: 'header'}},
+      {params: {dcn: '2c9d2b50015a5aa95b70a9b0b5b10012', pos: 1234}},
+      {params: {dcn: '2c9d2b50015a5aa95b70a9b0b5b10012', pos: ''}},
+      {params: {dcn: '', pos: 'header'}},
+    ];
+
+    INVALID_INPUT.forEach(input => {
+      it(`should determine that the bid is INVALID for the input ${JSON.stringify(input)}`, () => {
+        expect(spec.isBidRequestValid(input)).to.be.false;
+      });
+    });
+
+    it('should determine that the bid is VALID if dcn and pos are present on the params object', () => {
+      const validBid = {
+        params: {
+          dcn: '2c9d2b50015a5aa95b70a9b0b5b10012',
+          pos: 'header'
+        }
+      };
+      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    });
+
+    it('should mark bid as VALID if bid.params.testing.e2etest = "true" (dcn & pos not required)', () => {
+      const validBid = {
+        params: {
+          dcn: 8888,
+          pos: 9999,
+          testing: {
+            e2etest: true
+          }
+        }
+      };
+      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    });
+
+    it('should mark bid ad VALID if pubId exists instead of dcn & pos', () => {
+      const validBid = {
+        params: {
+          pubId: DEFAULT_PUBID
+        }
+      };
+      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    });
+  });
+
+  describe('Price Floor module support:', () => {
+    it('should get bidfloor from getFloor method', () => {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidRequest.params.bidOverride = {cur: 'EUR'};
+      bidRequest.getFloor = (floorObj) => {
+        return {
+          floor: bidRequest.floors.values[floorObj.mediaType + '|640x480'],
+          currency: floorObj.currency,
+          mediaType: floorObj.mediaType
+        }
+      };
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'banner|640x480': 5.55
+        }
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.cur).to.deep.equal(['EUR']);
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(5.55);
+    });
+  });
+
+  describe('Schain module support:', () => {
+    it('should not include schain data when schain array is empty', function () {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const globalSchain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: []
+      };
+      bidRequest.schain = globalSchain;
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain).to.be.undefined;
+    });
+
+    it('should send Global or Bidder specific schain', function () {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const globalSchain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'some-platform.com',
+          sid: '111111',
+          rid: bidRequest.bidId,
+          hp: 1
+        }]
+      };
+      bidRequest.schain = globalSchain;
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain.nodes.length).to.equal(1);
+      expect(schain).to.equal(globalSchain);
+    });
+  });
+
+  describe('First party data module - "Site" support (ortb2):', () => {
+    // Should not allow invalid "site" data types
+    const INVALID_ORTB2_TYPES = [ null, [], 123, 'unsupportedKeyName', true, false, undefined ];
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should not allow invalid site types to be added to bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = { site: param }
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.be.undefined;
+      });
+    });
+
+    // Should add valid "site" params
+    const VALID_SITE_STRINGS = ['name', 'domain', 'page', 'ref', 'keywords', 'search'];
+    const VALID_SITE_ARRAYS = ['cat', 'sectioncat', 'pagecat'];
+
+    VALID_SITE_STRINGS.forEach(param => {
+      it(`should allow supported site keys to be added bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            [param]: 'something'
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.exist;
+        expect(data.site[param]).to.be.a('string');
+        expect(data.site[param]).to.be.equal(ortb2.site[param]);
+      });
+    });
+
+    VALID_SITE_ARRAYS.forEach(param => {
+      it(`should determine that the ortb2.site Array key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            [param]: ['something']
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.exist;
+        expect(data.site[param]).to.be.a('array');
+        expect(data.site[param]).to.be.equal(ortb2.site[param]);
+      });
+    });
+
+    // Should not allow invalid "site.content" data types
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should determine that the ortb2.site.content key is invalid and should not be added to bid-request:  ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: param
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content).to.be.undefined;
+      });
+    });
+
+    // Should not allow invalid "site.content" keys
+    it(`should not allow invalid ortb2.site.content object keys to be added to bid-request: {custom object}`, () => {
+      const ortb2 = {
+        site: {
+          content: {
+            fake: 'news',
+            unreal: 'param',
+            counterfit: 'data'
+          }
+        }
+      };
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.site.content).to.be.a('object');
+    });
+
+    // Should append valid "site.content" keys
+    const VALID_CONTENT_STRINGS = ['id', 'title', 'series', 'season', 'genre', 'contentrating', 'language'];
+    VALID_CONTENT_STRINGS.forEach(param => {
+      it(`should determine that the ortb2.site String key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: {
+              [param]: 'something'
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content[param]).to.exist;
+        expect(data.site.content[param]).to.be.a('string');
+        expect(data.site.content[param]).to.be.equal(ortb2.site.content[param]);
+      });
+    });
+
+    const VALID_CONTENT_NUMBERS = ['episode', 'prodq', 'context', 'livestream', 'len'];
+    VALID_CONTENT_NUMBERS.forEach(param => {
+      it(`should determine that the ortb2.site.content Number key is valid and append to the bid-request:  ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: {
+              [param]: 1234
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content[param]).to.be.a('number');
+        expect(data.site.content[param]).to.be.equal(ortb2.site.content[param]);
+      });
+    });
+
+    const VALID_CONTENT_ARRAYS = ['cat'];
+    VALID_CONTENT_ARRAYS.forEach(param => {
+      it(`should determine that the ortb2.site Array key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: {
+              [param]: ['something', 'something-else']
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content[param]).to.be.a('array');
+        expect(data.site.content[param]).to.be.equal(ortb2.site.content[param]);
+      });
+    });
+
+    const VALID_CONTENT_OBJECTS = ['ext'];
+    VALID_CONTENT_OBJECTS.forEach(param => {
+      it(`should determine that the ortb2.site.content Object key is valid and append to the bid-request:  ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: {
+              [param]: {a: '123', b: '456'}
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content[param]).to.be.a('object');
+        expect(data.site.content[param]).to.be.equal(ortb2.site.content[param]);
+        config.setConfig({ortb2: {}});
+      });
+    });
+  });
+
+  describe('First party data module - "User" support (ortb2):', () => {
+    // Global ortb2.user validations
+    // Should not allow invalid "user" data types
+    const INVALID_ORTB2_TYPES = [ null, [], 'unsupportedKeyName', true, false, undefined ];
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should not allow invalid site types to be added to bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = { user: param }
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.be.undefined;
+      });
+    });
+
+    // Should add valid "user" params
+    const VALID_USER_STRINGS = ['id', 'buyeruid', 'gender', 'keywords', 'customdata'];
+    VALID_USER_STRINGS.forEach(param => {
+      it(`should allow supported user string keys to be added bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            [param]: 'something'
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.exist;
+        expect(data.user[param]).to.be.a('string');
+        expect(data.user[param]).to.be.equal(ortb2.user[param]);
+      });
+    });
+
+    const VALID_USER_NUMBERS = ['yob'];
+    VALID_USER_NUMBERS.forEach(param => {
+      it(`should allow supported user number keys to be added bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            [param]: 1982
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.exist;
+        expect(data.user[param]).to.be.a('number');
+        expect(data.user[param]).to.be.equal(ortb2.user[param]);
+      });
+    });
+
+    const VALID_USER_ARRAYS = ['data'];
+    VALID_USER_ARRAYS.forEach(param => {
+      it(`should allow supported user Array keys to be added to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            [param]: ['something']
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.exist;
+        expect(data.user[param]).to.be.a('array');
+        expect(data.user[param]).to.be.equal(ortb2.user[param]);
+      });
+    });
+
+    const VALID_USER_OBJECTS = ['ext'];
+    VALID_USER_OBJECTS.forEach(param => {
+      it(`should allow supported user extObject keys to be added to the bid-request:  ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            [param]: {a: '123', b: '456'}
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.be.a('object');
+        expect(data.user[param]).to.be.deep.include({[param]: {a: '123', b: '456'}});
+        config.setConfig({ortb2: {}});
+      });
+    });
+
+    // Should allow valid user.data && site.content.data
+    const VALID_USER_DATA_STRINGS = ['id', 'name'];
+    VALID_USER_DATA_STRINGS.forEach(param => {
+      it(`should allow supported user.data & site.content.data strings to be added to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            data: [{[param]: 'string'}]
+          },
+          site: {
+            content: {
+              data: [{[param]: 'string'}]
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user.data[0][param]).to.exist;
+        expect(data.user.data[0][param]).to.be.a('string');
+        expect(data.user.data[0][param]).to.be.equal(ortb2.user.data[0][param]);
+        expect(data.site.content.data[0][param]).to.exist;
+        expect(data.site.content.data[0][param]).to.be.a('string');
+        expect(data.site.content.data[0][param]).to.be.equal(ortb2.site.content.data[0][param]);
+      });
+    });
+
+    const VALID_USER_DATA_ARRAYS = ['segment']
+    VALID_USER_DATA_ARRAYS.forEach(param => {
+      it(`should allow supported user data arrays to be added to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            data: [{[param]: [{id: 1}]}]
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user.data[0][param]).to.exist;
+        expect(data.user.data[0][param]).to.be.a('array');
+        expect(data.user.data[0][param]).to.be.equal(ortb2.user.data[0][param]);
+      });
+    });
+
+    const VALID_USER_DATA_OBJECTS = ['ext'];
+    VALID_USER_DATA_OBJECTS.forEach(param => {
+      it(`should allow supported user data objects to be added to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            data: [{[param]: {id: 'ext'}}]
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user.data[0][param]).to.exist;
+        expect(data.user.data[0][param]).to.be.a('object');
+        expect(data.user.data[0][param]).to.be.equal(ortb2.user.data[0][param]);
+        config.setConfig({ortb2: {}});
+      });
+    });
+
+    // adUnit.ortb2Imp.ext.data
+    it(`should allow adUnit.ortb2Imp.ext.data object to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        ext: {
+          data: {
+            pbadslot: 'homepage-top-rect',
+            adUnitSpecificAttribute: '123'
+          }
+        }
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].ext.data).to.deep.equal(validBidRequests[0].ortb2Imp.ext.data);
+    });
+    // adUnit.ortb2Imp.instl
+    it(`should allow adUnit.ortb2Imp.instl numeric boolean "1" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: 1
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.deep.equal(validBidRequests[0].ortb2Imp.instl);
+    });
+
+    it(`should prevent adUnit.ortb2Imp.instl boolean "true" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: true
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.not.exist;
+    });
+
+    it(`should prevent adUnit.ortb2Imp.instl boolean "false" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: false
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.not.exist;
+    });
+  });
+
+  describe('e2etest mode support:', () => {
+    it(`should override DCN & POS when params.testing.e2etest = "true".`, () => {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const params = {
+        dcn: '1234',
+        pos: '5678',
+        testing: {
+          e2etest: true
+        }
+      }
+      bidRequest.params = params;
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.site.id).to.be.equal('8a969516017a7a396ec539d97f540011');
+      expect(data.imp[0].tagid).to.be.equal('8a969978017a7aaabab4ab0bc01a0009');
+      expect(data.imp[0].ext.e2eTestMode).to.be.true;
+    });
+  });
+
+  describe('GDPR & Consent & GPP:', () => {
+    it('should return request objects that do not send cookies if purpose 1 consent is not provided', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidderRequest.gdprConsent = {
+        consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+        apiVersion: 2,
+        vendorData: {
+          purpose: {
+            consents: {
+              '1': false
+            }
+          }
+        },
+        gdprApplies: true
+      };
+      const options = spec.buildRequests(validBidRequests, bidderRequest)[0].options;
+      expect(options.withCredentials).to.be.false;
+    });
+
+    it('adds the ortb2 gpp consent info to the request', function () {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const ortb2 = {
+        regs: {
+          gpp: 'somegppstring',
+          gpp_sid: [6, 7]
+        }
+      };
+      let clonedBidderRequest = {...bidderRequest, ortb2};
+      const data = spec.buildRequests(validBidRequests, clonedBidderRequest)[0].data;
+      expect(data.regs.ext.gpp).to.equal('somegppstring');
+      expect(data.regs.ext.gpp_sid).to.eql([6, 7]);
+    });
+  });
+
+  describe('Endpoint & Impression Request Mode:', () => {
+    it('should route request to config override endpoint', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const testOverrideEndpoint = 'http://foo.bar.baz.com/bidderRequest';
+      config.setConfig({
+        yahoossp: {
+          endpoint: testOverrideEndpoint
+        }
+      });
+      const response = spec.buildRequests(validBidRequests, bidderRequest)[0];
+      expect(response).to.deep.include(
+        {
+          method: 'POST',
+          url: testOverrideEndpoint
+        });
+    });
+
+    it('should route request to /bidRequest endpoint when dcn & pos present', () => {
+      config.setConfig({
+        yahoossp: {}
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const response = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(response[0]).to.deep.include({
+        method: 'POST',
+        url: 'https://c2shb.pubgw.yahoo.com/bidRequest'
+      });
+    });
+
+    it('should route request to /partners endpoint when pubId is present', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({pubIdMode: true});
+      const response = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(response[0]).to.deep.include({
+        method: 'POST',
+        url: 'https://c2shb.pubgw.yahoo.com/admax/bid/partners/PBJS'
+      });
+    });
+
+    it('should return a single request object for single request mode', () => {
+      let { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const BID_ID_2 = '84ab50xxxxx';
+      const BID_POS_2 = 'footer';
+      const AD_UNIT_CODE_2 = 'test-ad-unit-code-123';
+      const { bidRequest: bidRequest2 } = generateBuildRequestMock({bidId: BID_ID_2, pos: BID_POS_2, adUnitCode: AD_UNIT_CODE_2});
+      validBidRequests = [bidRequest, bidRequest2];
+      bidderRequest.bids = validBidRequests;
+
+      config.setConfig({
+        yahoossp: {
+          singleRequestMode: true
+        }
+      });
+
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.imp).to.be.an('array').with.lengthOf(2);
+
+      expect(data.imp[0]).to.deep.include({
+        id: DEFAULT_BID_ID,
+        ext: {
+          pos: DEFAULT_BID_POS,
+          dfp_ad_unit_code: DEFAULT_AD_UNIT_CODE
+        }
+      });
+
+      expect(data.imp[1]).to.deep.include({
+        id: BID_ID_2,
+        ext: {
+          pos: BID_POS_2,
+          dfp_ad_unit_code: AD_UNIT_CODE_2
+        }
+      });
+    });
+  });
+
+  describe('Validate request filtering:', () => {
+    it('should not return request when no bids are present', function () {
+      let request = spec.buildRequests([]);
+      expect(request).to.be.undefined;
+    });
+
+    it('buildRequests(): should return an array with the correct amount of request objects', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const response = spec.buildRequests(validBidRequests, bidderRequest).bidderRequest;
+      expect(response.bids).to.be.an('array').to.have.lengthOf(1);
+    });
+  });
+
+  describe('Request Headers validation:', () => {
+    it('should return request objects with the relevant custom headers and content type declaration', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidderRequest.gdprConsent.gdprApplies = false;
+      const options = spec.buildRequests(validBidRequests, bidderRequest).options;
+      expect(options).to.deep.equal(
+        {
+          contentType: 'application/json',
+          customHeaders: {
+            'x-openrtb-version': '2.5'
+          },
+          withCredentials: true
+        });
+    });
+  });
+
+  describe('User data', () => {
+    it('should set the allowed sources user eids', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      validBidRequests[0].userIdAsEids = createEidsArray({
+        admixerId: 'admixerId_FROM_USER_ID_MODULE',
+        adtelligentId: 'adtelligentId_FROM_USER_ID_MODULE',
+        amxId: 'amxId_FROM_USER_ID_MODULE',
+        britepoolid: 'britepoolid_FROM_USER_ID_MODULE',
+        deepintentId: 'deepintentId_FROM_USER_ID_MODULE',
+        publinkId: 'publinkId_FROM_USER_ID_MODULE',
+        intentIqId: 'intentIqId_FROM_USER_ID_MODULE',
+        idl_env: 'idl_env_FROM_USER_ID_MODULE',
+        imuid: 'imuid_FROM_USER_ID_MODULE',
+        criteoId: 'criteoId_FROM_USER_ID_MODULE',
+        fabrickId: 'fabrickId_FROM_USER_ID_MODULE',
+      });
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+
+      expect(data.user.ext.eids).to.deep.equal([
+        {source: 'admixer.net', uids: [{id: 'admixerId_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'adtelligent.com', uids: [{id: 'adtelligentId_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'amxrtb.com', uids: [{id: 'amxId_FROM_USER_ID_MODULE', atype: 1}]},
+        {source: 'britepool.com', uids: [{id: 'britepoolid_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'deepintent.com', uids: [{id: 'deepintentId_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'epsilon.com', uids: [{id: 'publinkId_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'intentiq.com', uids: [{id: 'intentIqId_FROM_USER_ID_MODULE', atype: 1}]},
+        {source: 'liveramp.com', uids: [{id: 'idl_env_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'intimatemerger.com', uids: [{id: 'imuid_FROM_USER_ID_MODULE', atype: 1}]},
+        {source: 'criteo.com', uids: [{id: 'criteoId_FROM_USER_ID_MODULE', atype: 1}]},
+        {source: 'neustar.biz', uids: [{id: 'fabrickId_FROM_USER_ID_MODULE', atype: 1}]}
+      ]);
+    });
+
+    it('should not set not allowed user eids sources', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      validBidRequests[0].userIdAsEids = createEidsArray({
+        justId: 'justId_FROM_USER_ID_MODULE'
+      });
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+
+      expect(data.user.ext.eids).to.deep.equal([]);
+    });
+  });
+
+  describe('Request Payload oRTB bid validation:', () => {
+    it('should generate a valid openRTB bid-request object in the data field', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.site).to.deep.equal({
+        id: bidderRequest.bids[0].params.dcn,
+        page: bidderRequest.refererInfo.page
+      });
+
+      expect(data.device).to.deep.equal({
+        dnt: 0,
+        ua: navigator.userAgent,
+        ip: undefined,
+        w: window.screen.width,
+        h: window.screen.height
+      });
+
+      expect(data.regs).to.deep.equal({
+        ext: {
+          'us_privacy': '',
+          gdpr: 1
+        }
+      });
+
+      expect(data.source).to.deep.equal({
+        ext: {
+          hb: 1,
+          adapterver: ADAPTER_VERSION,
+          prebidver: PREBID_VERSION,
+          integration: {
+            name: INTEGRATION_METHOD,
+            ver: PREBID_VERSION
+          }
+        },
+        fd: 1
+      });
+
+      expect(data.user).to.deep.equal({
+        ext: {
+          consent: bidderRequest.gdprConsent.consentString,
+          eids: []
+        }
+      });
+
+      expect(data.cur).to.deep.equal(['USD']);
+    });
+
+    it('should generate a valid openRTB imp.ext object in the bid-request', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const bid = validBidRequests[0];
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.imp[0].ext).to.deep.equal({
+        pos: bid.params.pos,
+        dfp_ad_unit_code: DEFAULT_AD_UNIT_CODE
+      });
+    });
+
+    it('should use siteId value as site.id in the outbound bid-request when using "pubId" integration mode', () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({pubIdMode: true});
+      validBidRequests[0].params.siteId = '1234567';
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.site.id).to.equal('1234567');
+    });
+
+    it('should use placementId value as imp.tagid in the outbound bid-request when using "pubId" integration mode', () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({pubIdMode: true});
+      validBidRequests[0].params.placementId = 'header-300x250';
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.imp[0].tagid).to.deep.equal('header-300x250');
+    });
+  });
+
+  describe('Request Payload oRTB bid.imp validation:', () => {
+    // Validate Banner imp imp when yahoossp.mode=undefined
+    it('should generate a valid "Banner" imp object', () => {
+      config.setConfig({
+        yahoossp: {}
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].video).to.not.exist;
+      expect(data.imp[0].banner).to.deep.equal({
+        mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: [{w: 300, h: 250}, {w: 300, h: 600}]
+      });
+    });
+
+    // Validate Banner imp when yahoossp.mode="banner"
+    it('should generate a valid "Banner" imp object', () => {
+      config.setConfig({
+        yahoossp: { mode: 'banner' }
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].video).to.not.exist;
+      expect(data.imp[0].banner).to.deep.equal({
+        mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: [{w: 300, h: 250}, {w: 300, h: 600}]
+      });
+    });
+
+    // Validate Video imp
+    it('should generate a valid "Video" only imp object', () => {
+      config.setConfig({
+        yahoossp: { mode: 'video' }
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: 'video'});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].banner).to.not.exist;
+      expect(data.imp[0].video).to.deep.equal({
+        mimes: ['video/mp4', 'application/javascript'],
+        w: 300,
+        h: 250,
+        api: [2],
+        protocols: [2, 5],
+        startdelay: 0,
+        linearity: 1,
+        maxbitrate: undefined,
+        maxduration: undefined,
+        minduration: undefined,
+        delivery: undefined,
+        pos: undefined,
+        playbackmethod: undefined,
+        rewarded: undefined,
+        placement: undefined
+      });
+    });
+
+    // Validate multi-format Video+banner imp
+    it('should generate a valid multi-format "Video + Banner" imp object', () => {
+      config.setConfig({
+        yahoossp: { mode: 'all' }
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: 'multi-format'});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].banner).to.deep.equal({
+        mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: [{w: 300, h: 250}, {w: 300, h: 600}]
+      });
+      expect(data.imp[0].video).to.deep.equal({
+        mimes: ['video/mp4', 'application/javascript'],
+        w: 300,
+        h: 250,
+        api: [2],
+        protocols: [2, 5],
+        startdelay: 0,
+        linearity: 1,
+        maxbitrate: undefined,
+        maxduration: undefined,
+        minduration: undefined,
+        delivery: undefined,
+        pos: undefined,
+        playbackmethod: undefined,
+        rewarded: undefined,
+        placement: undefined
+      });
+    });
+
+    // Validate Key-Value Pairs
+    it('should generate supported String, Number, Array of Strings, Array of Numbers key-value pairs and append to imp.ext.kvs', () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].params.kvp = {
+        key1: 'String',
+        key2: 123456,
+        key3: ['String', 'String', 'String'],
+        key4: [1, 2, 3],
+        invalidKey1: true,
+        invalidKey2: null,
+        invalidKey3: ['string', 1234],
+        invalidKey4: {a: 1, b: 2},
+        invalidKey5: undefined
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+
+      expect(data.imp[0].ext.kvs).to.deep.equal({
+        key1: 'String',
+        key2: 123456,
+        key3: ['String', 'String', 'String'],
+        key4: [1, 2, 3]
+      });
+    });
+  });
+
+  describe('Multiple adUnit validations:', () => {
+    // Multiple banner adUnits
+    it('should generate multiple bid-requests for each adUnit - 2 banner only', () => {
+      config.setConfig({
+        yahoossp: { mode: 'banner' }
+      });
+
+      const BID_ID_2 = '84ab50xxxxx';
+      const BID_POS_2 = 'footer';
+      const AD_UNIT_CODE_2 = 'test-ad-unit-code-123';
+      const BID_ID_3 = '84ab50yyyyy';
+      const BID_POS_3 = 'hero';
+      const AD_UNIT_CODE_3 = 'video-ad-unit';
+
+      let { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({}); // banner
+      const { bidRequest: bidRequest2 } = generateBuildRequestMock({bidId: BID_ID_2, pos: BID_POS_2, adUnitCode: AD_UNIT_CODE_2}); // banner
+      const { bidRequest: bidRequest3 } = generateBuildRequestMock({bidId: BID_ID_3, pos: BID_POS_3, adUnitCode: AD_UNIT_CODE_3, adUnitType: 'video'}); // video (should be filtered)
+      validBidRequests = [bidRequest, bidRequest2, bidRequest3];
+      bidderRequest.bids = validBidRequests;
+
+      const response = spec.buildRequests(validBidRequests, bidderRequest)
+      expect(response).to.be.a('array');
+      expect(response.length).to.equal(2);
+      response.forEach((obj) => {
+        expect(obj.data.imp[0].video).to.not.exist
+        expect(obj.data.imp[0].banner).to.deep.equal({
+          mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+          format: [{w: 300, h: 250}, {w: 300, h: 600}]
+        });
+      });
+    });
+
+    // Multiple video adUnits
+    it('should generate multiple bid-requests for each adUnit - 2 video only', () => {
+      config.setConfig({
+        yahoossp: { mode: 'video' }
+      });
+      const BID_ID_2 = '84ab50xxxxx';
+      const BID_POS_2 = 'footer';
+      const AD_UNIT_CODE_2 = 'test-ad-unit-code-123';
+      const BID_ID_3 = '84ab50yyyyy';
+      const BID_POS_3 = 'hero';
+      const AD_UNIT_CODE_3 = 'video-ad-unit';
+
+      let { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: 'video'}); // video
+      const { bidRequest: bidRequest2 } = generateBuildRequestMock({bidId: BID_ID_2, pos: BID_POS_2, adUnitCode: AD_UNIT_CODE_2, adUnitType: 'video'}); // video
+      const { bidRequest: bidRequest3 } = generateBuildRequestMock({bidId: BID_ID_3, pos: BID_POS_3, adUnitCode: AD_UNIT_CODE_3}); // banner (should be filtered)
+      validBidRequests = [bidRequest, bidRequest2, bidRequest3];
+      bidderRequest.bids = validBidRequests;
+
+      const response = spec.buildRequests(validBidRequests, bidderRequest)
+      expect(response).to.be.a('array');
+      expect(response.length).to.equal(2);
+      response.forEach((obj) => {
+        expect(obj.data.imp[0].banner).to.not.exist
+        expect(obj.data.imp[0].video).to.deep.equal({
+          mimes: ['video/mp4', 'application/javascript'],
+          w: 300,
+          h: 250,
+          api: [2],
+          protocols: [2, 5],
+          startdelay: 0,
+          linearity: 1,
+          maxbitrate: undefined,
+          maxduration: undefined,
+          minduration: undefined,
+          delivery: undefined,
+          pos: undefined,
+          playbackmethod: undefined,
+          rewarded: undefined,
+          placement: undefined
+        });
+      });
+    });
+    // Mixed adUnits 1-banner, 1-video, 1-native (should filter out native)
+    it('should generate multiple bid-requests for both "video & banner" adUnits', () => {
+      config.setConfig({
+        yahoossp: { mode: 'all' }
+      });
+      const BID_ID_2 = '84ab50xxxxx';
+      const BID_POS_2 = 'footer';
+      const AD_UNIT_CODE_2 = 'video-ad-unit';
+      const BID_ID_3 = '84ab50yyyyy';
+      const BID_POS_3 = 'hero';
+      const AD_UNIT_CODE_3 = 'native-ad-unit';
+
+      let { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: 'banner'}); // banner
+      const { bidRequest: bidRequest2 } = generateBuildRequestMock({bidId: BID_ID_2, pos: BID_POS_2, adUnitCode: AD_UNIT_CODE_2, adUnitType: 'video'}); // video
+      const { bidRequest: bidRequest3 } = generateBuildRequestMock({bidId: BID_ID_3, pos: BID_POS_3, adUnitCode: AD_UNIT_CODE_3, adUnitType: 'native'}); // native (should be filtered)
+      validBidRequests = [bidRequest, bidRequest2, bidRequest3];
+      bidderRequest.bids = validBidRequests;
+
+      const response = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(response).to.be.a('array');
+      expect(response.length).to.equal(2);
+      response.forEach((obj) => {
+        expect(obj.data.imp[0].native).to.not.exist;
+      });
+
+      const data1 = response[0].data;
+      expect(data1.imp[0].video).to.not.exist;
+      expect(data1.imp[0].banner).to.deep.equal({
+        mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: [{w: 300, h: 250}, {w: 300, h: 600}]
+      });
+
+      const data2 = response[1].data;
+      expect(data2.imp[0].banner).to.not.exist;
+      expect(data2.imp[0].video).to.deep.equal({
+        mimes: ['video/mp4', 'application/javascript'],
+        w: 300,
+        h: 250,
+        api: [2],
+        protocols: [2, 5],
+        startdelay: 0,
+        linearity: 1,
+        maxbitrate: undefined,
+        maxduration: undefined,
+        minduration: undefined,
+        delivery: undefined,
+        pos: undefined,
+        playbackmethod: undefined,
+        rewarded: undefined,
+        placement: undefined
+      });
+    });
+  });
+
+  describe('Video params firstlook & bidOverride validations:', () => {
+    it('should first look at params.bidOverride for video placement data', () => {
+      config.setConfig({
+        yahoossp: { mode: 'video' }
+      });
+      const bidOverride = {
+        imp: {
+          video: {
+            mimes: ['video/mp4'],
+            w: 400,
+            h: 350,
+            api: [1],
+            protocols: [1, 3],
+            startdelay: 0,
+            linearity: 1,
+            maxbitrate: 400000,
+            maxduration: 3600,
+            minduration: 1500,
+            delivery: 1,
+            pos: 123456,
+            playbackmethod: 1,
+            rewarded: 1,
+            placement: 1
+          }
+        }
+      }
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: 'video', bidOverrideObject: bidOverride});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].video).to.deep.equal(bidOverride.imp.video);
+    });
+
+    it('should second look at bid.mediaTypes.video for video placement data', () => {
+      config.setConfig({
+        yahoossp: { mode: 'video' }
+      });
+      let { bidRequest, bidderRequest } = generateBuildRequestMock({adUnitType: 'video'});
+      bidRequest.mediaTypes.video = {
+        mimes: ['video/mp4'],
+        playerSize: [400, 350],
+        api: [1],
+        protocols: [1, 3],
+        startdelay: 0,
+        linearity: 1,
+        maxbitrate: 400000,
+        maxduration: 3600,
+        minduration: 1500,
+        delivery: 1,
+        pos: 123456,
+        playbackmethod: 1,
+        placement: 1
+      }
+      const validBidRequests = [bidRequest];
+      bidderRequest.bids = validBidRequests;
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].video).to.deep.equal({
+        mimes: ['video/mp4'],
+        w: 400,
+        h: 350,
+        api: [1],
+        protocols: [1, 3],
+        startdelay: 0,
+        linearity: 1,
+        maxbitrate: 400000,
+        maxduration: 3600,
+        minduration: 1500,
+        delivery: 1,
+        pos: 123456,
+        playbackmethod: 1,
+        placement: 1,
+        rewarded: undefined
+      });
+    });
+
+    it('should use params.bidOverride.device.ip override', () => {
+      config.setConfig({
+        yahoossp: { mode: 'all' }
+      });
+      const bidOverride = {
+        device: {
+          ip: '1.2.3.4'
+        }
+      }
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: 'video', bidOverrideObject: bidOverride});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.device.ip).to.deep.equal(bidOverride.device.ip);
+    });
+  });
+  // #endregion buildRequests():
+
+  describe('interpretResponse()', () => {
+    describe('for mediaTypes: "banner"', () => {
+      it('should insert banner payload into response[0].ad', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ad).to.equal('<script>logInfo(\'ad\'); AdPlacement </script>');
+        expect(response[0].mediaType).to.equal('banner');
+      })
+    });
+
+    describe('for mediaTypes: "video"', () => {
+      it('should insert video VPAID payload into vastXml', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('video');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ad).to.be.undefined;
+        expect(response[0].vastXml).to.equal('<VAST></VAST>');
+        expect(response[0].mediaType).to.equal('video');
+      })
+
+      it('should insert video VAST win notification into vastUrl', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('video', 'vast');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ad).to.be.undefined;
+        expect(response[0].vastUrl).to.equal('https://yahoo.com?event=adAttempt');
+        expect(response[0].vastXml).to.equal('<VAST></VAST>');
+        expect(response[0].mediaType).to.equal('video');
+      })
+
+      it('should insert video DAP O2 Player into ad', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('dap-o2', 'vpaid');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ad).to.equal('<script>o2playerSettings</script>');
+        expect(response[0].vastUrl).to.be.undefined;
+        expect(response[0].vastXml).to.be.undefined;
+        expect(response[0].mediaType).to.equal('banner');
+      });
+
+      it('should insert video DAP Unified Player into ad', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('dap-up', 'vpaid');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ad).to.equal('<script>YAHOO.VideoPlatform.VideoPlayer</script>');
+        expect(response[0].vastUrl).to.be.undefined;
+        expect(response[0].vastXml).to.be.undefined;
+        expect(response[0].mediaType).to.equal('banner');
+      })
+    });
+
+    describe('Support Advertiser domains', () => {
+      it('should append bid-response adomain to meta.advertiserDomains', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('video', 'vpaid');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].meta.advertiserDomains).to.be.a('array');
+        expect(response[0].meta.advertiserDomains[0]).to.equal('advertiser-domain.com');
+      })
+    });
+
+    describe('bid response Ad ID / Creative ID', () => {
+      it('should use adId if it exists in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const adId = 'bid-response-adId';
+        serverResponse.body.seatbid[0].bid[0].adId = adId;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(adId);
+      });
+
+      it('should use impid if adId does not exist in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const impid = '25b6c429c1f52f';
+        serverResponse.body.seatbid[0].bid[0].impid = impid;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(impid);
+      });
+
+      it('should use crid if adId & impid do not exist in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const crid = 'passback-12579';
+        serverResponse.body.seatbid[0].bid[0].impid = undefined;
+        serverResponse.body.seatbid[0].bid[0].crid = crid;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(crid);
+      });
+    });
+
+    describe('Time To Live (ttl)', () => {
+      const UNSUPPORTED_TTL_FORMATS = ['string', [1, 2, 3], true, false, null, undefined];
+      UNSUPPORTED_TTL_FORMATS.forEach(param => {
+        it('should not allow unsupported global yahoossp.ttl formats and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          config.setConfig({
+            yahoossp: { ttl: param }
+          });
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+
+        it('should not allow unsupported params.ttl formats and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          bidderRequest.bids[0].params.ttl = param;
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+      });
+
+      const UNSUPPORTED_TTL_VALUES = [-1, 3601];
+      UNSUPPORTED_TTL_VALUES.forEach(param => {
+        it('should not allow invalid global yahoossp.ttl values 3600 < ttl < 0 and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          config.setConfig({
+            yahoossp: { ttl: param }
+          });
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+
+        it('should not allow invalid params.ttl values 3600 < ttl < 0 and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          bidderRequest.bids[0].params.ttl = param;
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+      });
+
+      it('should give presedence to Gloabl ttl over params.ttl ', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        config.setConfig({
+          yahoossp: { ttl: 500 }
+        });
+        bidderRequest.bids[0].params.ttl = 400;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ttl).to.equal(500);
+      });
+    });
+
+    describe('Aliasing support', () => {
+      it('should return undefined as the bidder code value', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].bidderCode).to.be.undefined;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/yandexBidAdapter_spec.js b/test/spec/modules/yandexBidAdapter_spec.js
new file mode 100644
index 00000000000..df91100b966
--- /dev/null
+++ b/test/spec/modules/yandexBidAdapter_spec.js
@@ -0,0 +1,176 @@
+import { assert, expect } from 'chai';
+import { spec } from 'modules/yandexBidAdapter.js';
+import { parseUrl } from 'src/utils.js';
+import { BANNER } from '../../../src/mediaTypes';
+
+describe('Yandex adapter', function () {
+  function getBidConfig() {
+    return {
+      bidder: 'yandex',
+      params: {
+        placementId: '123-1',
+      },
+    };
+  }
+
+  function getBidRequest() {
+    return {
+      ...getBidConfig(),
+      bidId: 'bidid-1',
+      adUnitCode: 'adUnit-123',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [300, 600]
+          ],
+        },
+      },
+    };
+  }
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      const bid = getBidRequest();
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return false when required params not found', function () {
+      expect(spec.isBidRequestValid({})).to.be.false;
+    });
+
+    it('should return false when required params.placementId are not passed', function () {
+      const bid = getBidConfig();
+      delete bid.params.placementId;
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('should return false when required params.placementId are not valid', function () {
+      const bid = getBidConfig();
+      bid.params.placementId = '123';
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('should return true when passed deprecated placement config', function () {
+      const bid = getBidConfig();
+      delete bid.params.placementId;
+
+      bid.params.pageId = 123;
+      bid.params.impId = 1;
+
+      expect(spec.isBidRequestValid(bid));
+    });
+  });
+
+  describe('buildRequests', function () {
+    const gdprConsent = {
+      gdprApplies: 1,
+      consentString: 'concent-string',
+      apiVersion: 1,
+    };
+
+    const bidderRequest = {
+      refererInfo: {
+        domain: 'ya.ru',
+        ref: 'https://ya.ru/',
+        page: 'https://ya.ru/',
+      },
+      gdprConsent
+    };
+
+    it('creates a valid banner request', function () {
+      const bannerRequest = getBidRequest();
+      bannerRequest.getFloor = () => ({
+        currency: 'EUR',
+        // floor: 0.5
+      });
+
+      const requests = spec.buildRequests([bannerRequest], bidderRequest);
+
+      expect(requests).to.have.lengthOf(1);
+      const request = requests[0];
+
+      expect(request).to.exist;
+      const { method, url, data } = request;
+
+      expect(method).to.equal('POST');
+
+      const parsedRequestUrl = parseUrl(url);
+      const { search: query } = parsedRequestUrl
+
+      expect(parsedRequestUrl.hostname).to.equal('bs.yandex.ru');
+      expect(parsedRequestUrl.pathname).to.equal('/metadsp/123');
+
+      expect(query['imp-id']).to.equal('1');
+      expect(query['target-ref']).to.equal('ya.ru');
+      expect(query['ssp-id']).to.equal('10500');
+
+      expect(query['gdpr']).to.equal('1');
+      expect(query['tcf-consent']).to.equal('concent-string');
+
+      expect(request.data).to.exist;
+      expect(data.site).to.not.equal(null);
+      expect(data.site.page_url).to.equal('https://ya.ru/');
+      expect(data.site.ref_url).to.equal('https://ya.ru/');
+
+      // expect(data.device).to.not.equal(null);
+      // expect(data.device.w).to.equal(window.innerWidth);
+      // expect(data.device.h).to.equal(window.innerHeight);
+
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].banner).to.not.equal(null);
+      expect(data.imp[0].banner.w).to.equal(300);
+      expect(data.imp[0].banner.h).to.equal(250);
+    });
+  });
+
+  describe('response handler', function () {
+    const bannerRequest = getBidRequest();
+
+    const bannerResponse = {
+      body: {
+        seatbid: [{
+          bid: [
+            {
+              impid: '1',
+              price: 0.3,
+              crid: 321,
+              adm: '<!-- HTML/JS -->',
+              w: 300,
+              h: 250,
+              adomain: [
+                'example.com'
+              ],
+              adid: 'yabs.123=',
+            }
+          ]
+        }],
+        cur: 'USD',
+      },
+    };
+
+    it('handles banner responses', function () {
+      bannerRequest.bidRequest = {
+        mediaType: BANNER,
+        bidId: 'bidid-1',
+      };
+      const result = spec.interpretResponse(bannerResponse, bannerRequest);
+
+      expect(result).to.have.lengthOf(1);
+      expect(result[0]).to.exist;
+
+      const rtbBid = result[0];
+      expect(rtbBid.width).to.equal(300);
+      expect(rtbBid.height).to.equal(250);
+      expect(rtbBid.cpm).to.be.within(0.1, 0.5);
+      expect(rtbBid.ad).to.equal('<!-- HTML/JS -->');
+      expect(rtbBid.currency).to.equal('USD');
+      expect(rtbBid.netRevenue).to.equal(true);
+      expect(rtbBid.ttl).to.equal(180);
+
+      expect(rtbBid.meta.advertiserDomains).to.deep.equal(['example.com']);
+    });
+  });
+});
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 097f85b9b8d..e5151cf789c 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -1,36 +1,165 @@
-import { expect } from 'chai'
-import { spec } from 'modules/yieldlabBidAdapter.js'
-import { newBidder } from 'src/adapters/bidderFactory.js'
-
-const REQUEST = {
-  'bidder': 'yieldlab',
-  'params': {
-    'adslotId': '1111',
-    'supplyId': '2222',
-    'adSize': '728x90',
-    'targeting': {
-      'key1': 'value1',
-      'key2': 'value2'
+import { config } from 'src/config.js';
+import { expect } from 'chai';
+import { spec } from 'modules/yieldlabBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+const DEFAULT_REQUEST = () => ({
+  bidder: 'yieldlab',
+  params: {
+    adslotId: '1111',
+    supplyId: '2222',
+    targeting: {
+      key1: 'value1',
+      key2: 'value2',
+      notDoubleEncoded: 'value3,value4',
+    },
+    customParams: {
+      extraParam: true,
+      foo: 'bar',
+    },
+    extId: 'abc',
+    iabContent: {
+      id: 'foo_id',
+      episode: '99',
+      title: 'foo_title,bar_title',
+      series: 'foo_series',
+      season: 's1',
+      artist: 'foo bar',
+      genre: 'baz',
+      isrc: 'CC-XXX-YY-NNNNN',
+      url: 'http://foo_url.de',
+      cat: ['cat1', 'cat2,ppp', 'cat3|||//'],
+      context: '7',
+      keywords: ['k1,', 'k2..'],
+      live: '0',
+    },
+  },
+  bidderRequestId: '143346cf0f1731',
+  auctionId: '2e41f65424c87c',
+  adUnitCode: 'adunit-code',
+  bidId: '2d925f27f5079f',
+  sizes: [728, 90],
+  userIdAsEids: [{
+    source: 'netid.de',
+    uids: [{
+      id: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
+      atype: 1,
+    }],
+  }, {
+    source: 'digitrust.de',
+    uids: [{
+      id: 'd8aa10fa-d86c-451d-aad8-5f16162a9e64',
+      atype: 2,
+    }],
+  }],
+  schain: {
+    ver: '1.0',
+    complete: 1,
+    nodes: [
+      {
+        asi: 'indirectseller.com',
+        sid: '1',
+        hp: 1,
+      },
+      {
+        asi: 'indirectseller2.com',
+        name: 'indirectseller2 name with comma , and bang !',
+        sid: '2',
+        hp: 1,
+      },
+    ],
+  },
+});
+
+const VIDEO_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
+  mediaTypes: {
+    video: {
+      playerSize: [[640, 480]],
+      context: 'instream',
     },
-    'customParams': {
-      'extraParam': true,
-      'foo': 'bar'
+  },
+});
+
+const NATIVE_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
+  mediaTypes: {
+    native: {},
+  },
+});
+
+const IAB_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
+  params: {
+    adslotId: '1111',
+    supplyId: '2222',
+    iabContent: {
+      id: 'foo',
+      episode: '99',
+      title: 'bar',
+      series: 'baz',
+      season: 's01',
+      artist: 'foobar',
+      genre: 'barbaz',
+      isrc: 'CC-XXX-YY-NNNNN',
+      url: 'https://foo.test',
+      cat: ['cat1', 'cat2,ppp', 'cat3|||//'],
+      context: '2',
+      keywords: ['k1', 'k2', 'k3', 'k4'],
+      live: '0',
+      album: 'foo',
+      cattax: '3',
+      prodq: 2,
+      contentrating: 'foo',
+      userrating: 'bar',
+      qagmediarating: 2,
+      sourcerelationship: 1,
+      len: 12345,
+      language: 'en',
+      embeddable: 0,
+      producer: {
+        id: 'foo',
+        name: 'bar',
+        cattax: 532,
+        cat: [1, 'foo', true],
+        domain: 'producer.test',
+      },
+      data: {
+        id: 'foo',
+        name: 'bar',
+        segment: [{
+          name: 'foo',
+          value: 'bar',
+          ext: {
+            foo: {
+              bar: 'bar',
+            },
+          },
+        }, {
+          name: 'foo2',
+          value: 'bar2',
+          ext: {
+            test: {
+              nums: {
+                int: 123,
+                float: 123.123,
+              },
+              bool: true,
+              string: 'foo2',
+            },
+          },
+        }],
+      },
+      network: {
+        id: 'foo',
+        name: 'bar',
+        domain: 'network.test',
+      },
+      channel: {
+        id: 'bar',
+        name: 'foo',
+        domain: 'channel.test',
+      },
     },
-    'extId': 'abc'
   },
-  'bidderRequestId': '143346cf0f1731',
-  'auctionId': '2e41f65424c87c',
-  'adUnitCode': 'adunit-code',
-  'bidId': '2d925f27f5079f',
-  'sizes': [728, 90],
-  'userIdAsEids': [{
-    'source': 'netid.de',
-    'uids': [{
-      'id': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
-      'atype': 1
-    }]
-  }]
-}
+});
 
 const RESPONSE = {
   advertiser: 'yieldlab',
@@ -39,155 +168,568 @@ const RESPONSE = {
   id: 1111,
   price: 1,
   pid: 2222,
-  adtype: 'BANNER'
-}
+  adsize: '728x90',
+  adtype: 'BANNER',
+};
+
+const NATIVE_RESPONSE = Object.assign({}, RESPONSE, {
+  adtype: 'NATIVE',
+  native: {
+    link: {
+      url: 'https://www.yieldlab.de',
+    },
+    assets: [
+      {
+        id: 1,
+        title: {
+          text: 'This is a great headline',
+        },
+      },
+      {
+        id: 2,
+        img: {
+          url: 'https://localhost:8080/yl-logo100x100.jpg',
+          w: 100,
+          h: 100,
+        },
+      },
+      {
+        id: 3,
+        data: {
+          value: 'Native body value',
+        },
+      },
+    ],
+    imptrackers: [
+      'http://localhost:8080/ve?d=ODE9ZSY2MTI1MjAzNjMzMzYxPXN0JjA0NWUwZDk0NTY5Yi05M2FiLWUwZTQtOWFjNy1hYWY0MzFiZj1kaXQmMj12',
+      'http://localhost:8080/md/1111/9efa4e76-2030-4f04-bb9f-322541f8d611?mdata=false&pvid=false&ids=x:1',
+      'http://localhost:8080/imp?s=13216&d=2171514&a=12548955&ts=1633363025216&tid=fb134faa-7ca9-4e0e-ba39-b96549d0e540&l=0',
+    ],
+  },
+});
 
 const VIDEO_RESPONSE = Object.assign({}, RESPONSE, {
-  'adtype': 'VIDEO'
-})
+  adtype: 'VIDEO',
+});
+
+const PVID_RESPONSE = Object.assign({}, VIDEO_RESPONSE, {
+  pvid: '43513f11-55a0-4a83-94e5-0ebc08f54a2c',
+});
 
-describe('yieldlabBidAdapter', function () {
-  const adapter = newBidder(spec)
+const REQPARAMS = {
+  json: true,
+  ts: 1234567890,
+};
 
-  describe('inherited functions', function () {
-    it('exists and is a function', function () {
-      expect(adapter.callBids).to.exist.and.to.be.a('function')
-    })
-  })
+const REQPARAMS_GDPR = Object.assign({}, REQPARAMS, {
+  gdpr: true,
+  consent: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
+});
 
-  describe('isBidRequestValid', function () {
-    it('should return true when required params found', function () {
+const REQPARAMS_IAB_CONTENT = Object.assign({}, REQPARAMS, {
+  iab_content: 'id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0',
+});
+
+describe('yieldlabBidAdapter', () => {
+  describe('instantiation from spec', () => {
+    it('is working properly', () => {
+      const yieldlabBidAdapter = newBidder(spec);
+      expect(yieldlabBidAdapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', () => {
+    it('should return true when all required parameters are found', () => {
       const request = {
-        'params': {
-          'adslotId': '1111',
-          'supplyId': '2222',
-          'adSize': '728x90'
-        }
-      }
-      expect(spec.isBidRequestValid(request)).to.equal(true)
-    })
-
-    it('should return false when required params are not passed', function () {
-      expect(spec.isBidRequestValid({})).to.equal(false)
-    })
-  })
-
-  describe('buildRequests', function () {
-    const bidRequests = [REQUEST]
-    const request = spec.buildRequests(bidRequests)
-
-    it('sends bid request to ENDPOINT via GET', function () {
-      expect(request.method).to.equal('GET')
-    })
-
-    it('returns a list of valid requests', function () {
-      expect(request.validBidRequests).to.eql([REQUEST])
-    })
-
-    it('passes targeting to bid request', function () {
-      expect(request.url).to.include('t=key1%3Dvalue1%26key2%3Dvalue2')
-    })
-
-    it('passes userids to bid request', function () {
-      expect(request.url).to.include('ids=netid.de%3AfH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg')
-    })
-
-    it('passes extra params to bid request', function () {
-      expect(request.url).to.include('extraParam=true&foo=bar')
-    })
-
-    const gdprRequest = spec.buildRequests(bidRequests, {
-      gdprConsent: {
-        consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
-        gdprApplies: true
-      }
-    })
-
-    it('passes gdpr flag and consent if present', function () {
-      expect(gdprRequest.url).to.include('consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA')
-      expect(gdprRequest.url).to.include('gdpr=true')
-    })
-  })
-
-  describe('interpretResponse', function () {
-    it('handles nobid responses', function () {
-      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0)
-      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0)
-    })
-
-    it('should get correct bid response', function () {
-      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [REQUEST]})
-
-      expect(result[0].requestId).to.equal('2d925f27f5079f')
-      expect(result[0].cpm).to.equal(0.01)
-      expect(result[0].width).to.equal(728)
-      expect(result[0].height).to.equal(90)
-      expect(result[0].creativeId).to.equal('1111')
-      expect(result[0].dealId).to.equal(2222)
-      expect(result[0].currency).to.equal('EUR')
-      expect(result[0].netRevenue).to.equal(false)
-      expect(result[0].ttl).to.equal(300)
-      expect(result[0].referrer).to.equal('')
-      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/728x90?ts=')
-      expect(result[0].ad).to.include('&id=abc')
-    })
-
-    it('should get correct bid response when passing more than one size', function () {
-      const REQUEST2 = Object.assign({}, REQUEST, {
-        'sizes': [
+        params: {
+          adslotId: '1111',
+          supplyId: '2222',
+        },
+      };
+      expect(spec.isBidRequestValid(request)).to.equal(true);
+    });
+
+    it('should return false when required parameters are missing', () => {
+      expect(spec.isBidRequestValid({})).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', () => {
+    const bidRequests = [DEFAULT_REQUEST()];
+
+    describe('default functionality', () => {
+      let request;
+
+      before(() => {
+        request = spec.buildRequests(bidRequests);
+      });
+
+      it('sends bid request to ENDPOINT via GET', () => {
+        expect(request.method).to.equal('GET');
+      });
+
+      it('returns a list of valid requests', () => {
+        expect(request.validBidRequests).to.eql(bidRequests);
+      });
+
+      it('passes single-encoded targeting to bid request', () => {
+        expect(request.url).to.include('t=key1%3Dvalue1%26key2%3Dvalue2%26notDoubleEncoded%3Dvalue3%2Cvalue4');
+      });
+
+      it('passes userids to bid request', () => {
+        expect(request.url).to.include('ids=netid.de%3AfH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg%2Cdigitrust.de%3Ad8aa10fa-d86c-451d-aad8-5f16162a9e64');
+      });
+
+      it('passes atype to bid request', () => {
+        expect(request.url).to.include('atypes=netid.de%3A1%2Cdigitrust.de%3A2');
+      });
+
+      it('passes extra params to bid request', () => {
+        expect(request.url).to.include('extraParam=true&foo=bar');
+      });
+
+      it('passes unencoded schain string to bid request', () => {
+        expect(request.url).to.include('schain=1.0,1!indirectseller.com,1,1,,,,!indirectseller2.com,2,1,,indirectseller2%20name%20with%20comma%20%2C%20and%20bang%20%21,,');
+      });
+
+      it('passes iab_content string to bid request', () => {
+        expect(request.url).to.include('iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0');
+      });
+
+      it('passes correct size to bid request', () => {
+        expect(request.url).to.include('728x90');
+      });
+
+      it('passes external id to bid request', () => {
+        expect(request.url).to.include('id=abc');
+      });
+    });
+
+    describe('iab_content handling', () => {
+      const siteConfig = {
+        ortb2: {
+          site: {
+            content: {
+              id: 'id_from_config',
+            },
+          },
+        },
+      };
+
+      beforeEach(() => {
+        config.setConfig(siteConfig);
+      });
+
+      afterEach(() => {
+        config.resetConfig();
+      });
+
+      it('generates iab_content string from bidder params', () => {
+        const request = spec.buildRequests(bidRequests);
+        expect(request.url).to.include('iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0');
+      });
+
+      it('generates iab_content string from first party data if not provided in bidder params', () => {
+        const requestWithoutIabContent = DEFAULT_REQUEST();
+        delete requestWithoutIabContent.params.iabContent;
+
+        const request = spec.buildRequests([{...requestWithoutIabContent, ...siteConfig}]);
+        expect(request.url).to.include('iab_content=id%3Aid_from_config');
+      });
+
+      it('flattens the iabContent, encodes the values, joins the keywords into one value, and than encodes the iab_content request param ', () => {
+        const expectedIabContentValue = encodeURIComponent(
+          'id:foo,' +
+          'episode:99,' +
+          'title:bar,' +
+          'series:baz,' +
+          'season:s01,' +
+          'artist:foobar,' +
+          'genre:barbaz,' +
+          'isrc:CC-XXX-YY-NNNNN,' +
+          'url:https%3A%2F%2Ffoo.test,' +
+          'cat:cat1|cat2%2Cppp|cat3%7C%7C%7C%2F%2F,' +
+          'context:2,' +
+          'keywords:k1|k2|k3|k4,' +
+          'live:0,' +
+          'album:foo,' +
+          'cattax:3,' +
+          'prodq:2,' +
+          'contentrating:foo,' +
+          'userrating:bar,' +
+          'qagmediarating:2,' +
+          'sourcerelationship:1,' +
+          'len:12345,' +
+          'language:en,' +
+          'embeddable:0,' +
+          'producer.id:foo,' +
+          'producer.name:bar,' +
+          'producer.cattax:532,' +
+          'cat:1|foo|true,' +
+          'producer.domain:producer.test,' +
+          'data.id:foo,data.name:bar,' +
+          'data.segment.0.name:foo,' +
+          'data.segment.0.value:bar,' +
+          'data.segment.0.ext.foo.bar:bar,' +
+          'data.segment.1.name:foo2,' +
+          'data.segment.1.value:bar2,' +
+          'data.segment.1.ext.test.nums.int:123,' +
+          'data.segment.1.ext.test.nums.float:123.123,' +
+          'data.segment.1.ext.test.bool:true,' +
+          'data.segment.1.ext.test.string:foo2,' +
+          'network.id:foo,network.name:bar,' +
+          'network.domain:network.test,' +
+          'channel.id:bar,' +
+          'channel.name:foo,' +
+          'channel.domain:channel.test'
+        );
+        const request = spec.buildRequests([IAB_REQUEST()], REQPARAMS);
+        expect(request.url).to.include('iab_content=' + expectedIabContentValue);
+      });
+    });
+
+    it('passes unencoded schain string to bid request when complete == 0', () => {
+      const schainRequest = DEFAULT_REQUEST();
+      schainRequest.schain.complete = 0; //
+      const request = spec.buildRequests([schainRequest]);
+      expect(request.url).to.include('schain=1.0,0!indirectseller.com,1,1,,,,!indirectseller2.com,2,1,,indirectseller2%20name%20with%20comma%20%2C%20and%20bang%20%21,,');
+    });
+
+    it('passes encoded referer to bid request', () => {
+      const refererRequest = spec.buildRequests(bidRequests, {
+        refererInfo: {
+          canonicalUrl: undefined,
+          numIframes: 0,
+          reachedTop: true,
+          page: 'https://www.yieldlab.de/test?with=querystring',
+          stack: ['https://www.yieldlab.de/test?with=querystring'],
+        },
+      });
+
+      expect(refererRequest.url).to.include('pubref=https%3A%2F%2Fwww.yieldlab.de%2Ftest%3Fwith%3Dquerystring');
+    });
+
+    it('passes gdpr flag and consent if present', () => {
+      const gdprRequest = spec.buildRequests(bidRequests, {
+        gdprConsent: {
+          consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
+          gdprApplies: true,
+        },
+      });
+
+      expect(gdprRequest.url).to.include('consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA');
+      expect(gdprRequest.url).to.include('gdpr=true');
+    });
+
+    describe('sizes handling', () => {
+      it('passes correct size to bid request for mediaType banner', () => {
+        const bannerRequest = DEFAULT_REQUEST();
+        bannerRequest.mediaTypes = {
+          banner: {
+            sizes: [[123, 456]],
+          },
+        };
+
+        // when mediaTypes is present it has precedence over the sizes field (728, 90)
+        let request = spec.buildRequests([bannerRequest], REQPARAMS);
+        expect(request.url).to.include('sizes');
+        expect(request.url).to.include('123x456');
+
+        bannerRequest.mediaTypes.banner.sizes = [123, 456];
+        request = spec.buildRequests([bannerRequest], REQPARAMS);
+        expect(request.url).to.include('123x456');
+
+        bannerRequest.mediaTypes.banner.sizes = [[123, 456], [320, 240]];
+        request = spec.buildRequests([bannerRequest], REQPARAMS);
+        expect(request.url).to.include('123x456');
+        expect(request.url).to.include('320x240');
+      });
+
+      it('passes correct sizes to bid request when mediaType is not present', () => {
+        // information is taken from the top level sizes field
+        const sizesRequest = DEFAULT_REQUEST();
+
+        let request = spec.buildRequests([sizesRequest], REQPARAMS);
+        expect(request.url).to.include('sizes');
+        expect(request.url).to.include('728x90');
+
+        sizesRequest.sizes = [[728, 90]];
+        request = spec.buildRequests([sizesRequest], REQPARAMS);
+        expect(request.url).to.include('728x90');
+
+        sizesRequest.sizes = [[728, 90], [320, 240]];
+        request = spec.buildRequests([sizesRequest], REQPARAMS);
+        expect(request.url).to.include('728x90');
+      });
+
+      it('does not pass the sizes parameter for mediaType video', () => {
+        const videoRequest = VIDEO_REQUEST();
+
+        let request = spec.buildRequests([videoRequest], REQPARAMS);
+        expect(request.url).to.not.include('sizes');
+      });
+
+      it('does not pass the sizes parameter for mediaType native', () => {
+        const nativeRequest = NATIVE_REQUEST();
+
+        let request = spec.buildRequests([nativeRequest], REQPARAMS);
+        expect(request.url).to.not.include('sizes');
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    let bidRequest;
+
+    before(() => {
+      bidRequest = DEFAULT_REQUEST();
+    });
+
+    it('handles nobid responses', () => {
+      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0);
+      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0);
+    });
+
+    it('should get correct bid response', () => {
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].width).to.equal(728);
+      expect(result[0].height).to.equal(90);
+      expect(result[0].creativeId).to.equal('1111');
+      expect(result[0].dealId).to.equal(2222);
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(300);
+      expect(result[0].referrer).to.equal('');
+      expect(result[0].meta.advertiserDomains).to.equal('yieldlab');
+      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].ad).to.include('&id=abc');
+    });
+
+    it('should append gdpr parameters to adtag', () => {
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS_GDPR});
+
+      expect(result[0].ad).to.include('&gdpr=true');
+      expect(result[0].ad).to.include('&consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA');
+    });
+
+    it('should append iab_content to adtag', () => {
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS_IAB_CONTENT});
+      expect(result[0].ad).to.include('&iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0');
+    });
+
+    it('should get correct bid response when passing more than one size', () => {
+      const REQUEST2 = Object.assign(DEFAULT_REQUEST(), {
+        sizes: [
           [800, 250],
           [728, 90],
           [970, 90],
-        ]
-      })
-      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [REQUEST2]})
-
-      expect(result[0].requestId).to.equal('2d925f27f5079f')
-      expect(result[0].cpm).to.equal(0.01)
-      expect(result[0].width).to.equal(728)
-      expect(result[0].height).to.equal(90)
-      expect(result[0].creativeId).to.equal('1111')
-      expect(result[0].dealId).to.equal(2222)
-      expect(result[0].currency).to.equal('EUR')
-      expect(result[0].netRevenue).to.equal(false)
-      expect(result[0].ttl).to.equal(300)
-      expect(result[0].referrer).to.equal('')
-      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/728x90?ts=')
-      expect(result[0].ad).to.include('&id=abc')
-    })
-
-    it('should add vastUrl when type is video', function () {
-      const VIDEO_REQUEST = Object.assign({}, REQUEST, {
-        'mediaTypes': {
-          'video': {
-            'context': 'instream'
-          }
-        }
-      })
-      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST]})
-
-      expect(result[0].requestId).to.equal('2d925f27f5079f')
-      expect(result[0].cpm).to.equal(0.01)
-      expect(result[0].mediaType).to.equal('video')
-      expect(result[0].vastUrl).to.include('https://ad.yieldlab.net/d/1111/2222/728x90?ts=')
-      expect(result[0].vastUrl).to.include('&id=abc')
-    })
-
-    it('should add renderer if outstream context', function () {
-      const OUTSTREAM_REQUEST = Object.assign({}, REQUEST, {
-        'mediaTypes': {
-          'video': {
-            'playerSize': [[640, 480]],
-            'context': 'outstream'
-          }
-        }
-      })
-      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [OUTSTREAM_REQUEST]})
-
-      expect(result[0].renderer.id).to.equal('2d925f27f5079f')
-      expect(result[0].renderer.url).to.equal('https://ad2.movad.net/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event')
-      expect(result[0].width).to.equal(640)
-      expect(result[0].height).to.equal(480)
-    })
-  })
-})
+        ],
+      });
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [REQUEST2], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].width).to.equal(728);
+      expect(result[0].height).to.equal(90);
+      expect(result[0].creativeId).to.equal('1111');
+      expect(result[0].dealId).to.equal(2222);
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(300);
+      expect(result[0].referrer).to.equal('');
+      expect(result[0].meta.advertiserDomains).to.equal('yieldlab');
+      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].ad).to.include('&id=abc');
+    });
+
+    it('should add vastUrl when type is video', () => {
+      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].mediaType).to.equal('video');
+      expect(result[0].vastUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].vastUrl).to.include('&id=abc');
+    });
+
+    it('should add adUrl and native assets when type is Native', () => {
+      const result = spec.interpretResponse({body: [NATIVE_RESPONSE]}, {validBidRequests: [NATIVE_REQUEST()], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].mediaType).to.equal('native');
+      expect(result[0].adUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].native.title).to.equal('This is a great headline');
+      expect(result[0].native.body).to.equal('Native body value');
+      expect(result[0].native.image.url).to.equal('https://localhost:8080/yl-logo100x100.jpg');
+      expect(result[0].native.image.width).to.equal(100);
+      expect(result[0].native.image.height).to.equal(100);
+      expect(result[0].native.clickUrl).to.equal('https://www.yieldlab.de');
+      expect(result[0].native.impressionTrackers.length).to.equal(3);
+    });
+
+    it('should add adUrl and default native assets when type is Native', () => {
+      const NATIVE_RESPONSE_2 = Object.assign({}, NATIVE_RESPONSE, {
+        native: {
+          link: {
+            url: 'https://www.yieldlab.de',
+          },
+          assets: [],
+          imptrackers: [],
+        },
+      });
+      const result = spec.interpretResponse({body: [NATIVE_RESPONSE_2]}, {validBidRequests: [NATIVE_REQUEST()], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].mediaType).to.equal('native');
+      expect(result[0].adUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].native.title).to.equal('');
+      expect(result[0].native.body).to.equal('');
+      expect(result[0].native.image.url).to.equal('');
+      expect(result[0].native.image.width).to.equal(0);
+      expect(result[0].native.image.height).to.equal(0);
+    });
+
+    it('should append gdpr parameters to vastUrl', () => {
+      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS_GDPR});
+
+      expect(result[0].vastUrl).to.include('&gdpr=true');
+      expect(result[0].vastUrl).to.include('&consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA');
+    });
+
+    it('should add renderer if outstream context', () => {
+      const OUTSTREAM_REQUEST = Object.assign(DEFAULT_REQUEST(), {
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'outstream',
+          },
+        },
+      });
+      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [OUTSTREAM_REQUEST], queryParams: REQPARAMS});
+
+      expect(result[0].renderer.id).to.equal('2d925f27f5079f');
+      expect(result[0].renderer.url).to.equal('https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event');
+      expect(result[0].width).to.equal(640);
+      expect(result[0].height).to.equal(480);
+    });
+
+    it('should add pvid to adtag urls when present', () => {
+      const result = spec.interpretResponse({body: [PVID_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS});
+
+      expect(result[0].ad).to.include('&pvid=43513f11-55a0-4a83-94e5-0ebc08f54a2c');
+      expect(result[0].vastUrl).to.include('&pvid=43513f11-55a0-4a83-94e5-0ebc08f54a2c');
+    });
+
+    it('should append iab_content to vastUrl', () => {
+      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS_IAB_CONTENT});
+      expect(result[0].vastUrl).to.include('&iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0');
+    });
+  });
+
+  describe('getUserSyncs', () => {
+    const syncOptions = {
+      iframeEnabled: true,
+      pixelEnabled: false,
+    };
+    const expectedUrlSnippets = ['https://ad.yieldlab.net/d/6846326/766/2x2?', 'ts=', 'type=h'];
+
+    it('should return user sync as expected', () => {
+      const bidRequest = {
+        gdprConsent: {
+          consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
+          gdprApplies: true,
+        },
+        uspConsent: '1YYY',
+      };
+      const sync = spec.getUserSyncs(syncOptions, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(expectedUrlSnippets.every(urlSnippet => sync[0].url.includes(urlSnippet)));
+      expect(sync[0].url).to.have.string('gdpr=' + Number(bidRequest.gdprConsent.gdprApplies));
+      expect(sync[0].url).to.have.string('gdpr_consent=' + bidRequest.gdprConsent.consentString);
+      // USP consent should be ignored
+      expect(sync[0].url).not.have.string('usp_consent=');
+      expect(sync[0].type).to.have.string('iframe');
+    });
+
+    it('should return user sync even without gdprApplies in gdprConsent', () => {
+      const gdprConsent = {
+        consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
+      };
+      const sync = spec.getUserSyncs(syncOptions, [], gdprConsent, undefined);
+      expect(expectedUrlSnippets.every(urlSnippet => sync[0].url.includes(urlSnippet)));
+      expect(sync[0].url).to.have.string('gdpr_consent=' + gdprConsent.consentString);
+      expect(sync[0].url).not.have.string('gdpr=');
+      expect(sync[0].type).to.have.string('iframe');
+    });
+  });
+
+  describe('getBidFloor', function () {
+    let bidRequest, bidRequest2, currency, floor;
+    const getFloor = () => {
+      return {
+        currency: currency,
+        floor: floor,
+      };
+    };
+
+    it('should add valid bid floor in the format floor={adslotId}:{floorPriceInCents}[, ...]', () => {
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {
+        getFloor: () => {
+          return {
+            currency: 'EUR',
+            floor: 1.33,
+          };
+        }});
+      bidRequest2 = Object.assign(DEFAULT_REQUEST(), {
+        params: {
+          adslotId: 2222,
+        },
+        getFloor: () => {
+          return {
+            currency: 'EUR',
+            floor: 2.99,
+          };
+        },
+      });
+      const result = spec.buildRequests([bidRequest, bidRequest2], REQPARAMS);
+      expect(result).to.have.nested.property('queryParams.floor', '1111:133,2222:299');
+    });
+
+    it('should round the floor price up', () => {
+      currency = 'EUR';
+      floor = 0.745;
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor});
+      const result = spec.buildRequests([bidRequest], REQPARAMS);
+      expect(result).to.have.nested.property('queryParams.floor', '1111:75');
+    });
+
+    it('should round the floor price down', () => {
+      currency = 'EUR';
+      floor = 0.034;
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor});
+      const result = spec.buildRequests([bidRequest], REQPARAMS);
+      expect(result).to.have.nested.property('queryParams.floor', '1111:3');
+    });
+
+    it('should not add empty bid floor', () => {
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {
+        getFloor: () => {
+          return {};
+        }});
+      const result = spec.buildRequests([bidRequest], REQPARAMS);
+      expect(result).not.to.have.nested.property('queryParams.floor');
+    });
+
+    it('should not add bid floor when currency is not matching', () => {
+      currency = 'USD';
+      floor = 1.33;
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor});
+      const result = spec.buildRequests([bidRequest], REQPARAMS);
+      expect(result).not.to.have.nested.property('queryParams.floor');
+    });
+  });
+});
diff --git a/test/spec/modules/yieldliftBidAdapter_spec.js b/test/spec/modules/yieldliftBidAdapter_spec.js
index 640a0f4e613..0cabdb594fe 100644
--- a/test/spec/modules/yieldliftBidAdapter_spec.js
+++ b/test/spec/modules/yieldliftBidAdapter_spec.js
@@ -45,7 +45,7 @@ const RESPONSE = {
             'price': 0.18,
             'adm': '<script>adm</script>',
             'adid': '144762342',
-            'adomain': [
+            'advertiserDomains': [
               'https://dummydomain.com'
             ],
             'iurl': 'iurl',
@@ -74,7 +74,7 @@ const RESPONSE = {
             'price': 0.1,
             'adm': '<script>adm2</script>',
             'adid': '144762342',
-            'adomain': [
+            'advertiserDomains': [
               'https://dummydomain.com'
             ],
             'iurl': 'iurl',
@@ -191,6 +191,26 @@ describe('YieldLift', function () {
       expect(payload.user.ext).to.have.property('consent', req.gdprConsent.consentString);
       expect(payload.regs.ext).to.have.property('gdpr', 1);
     });
+
+    it('should properly forward eids parameters', function () {
+      const req = Object.assign({}, REQUEST);
+      req.bidRequest[0].userIdAsEids = [
+        {
+          source: 'dummy.com',
+          uids: [
+            {
+              id: 'd6d0a86c-20c6-4410-a47b-5cba383a698a',
+              atype: 1
+            }
+          ]
+        }];
+      let request = spec.buildRequests(req.bidRequest, req);
+
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.eids[0].source).to.equal('dummy.com');
+      expect(payload.user.ext.eids[0].uids[0].id).to.equal('d6d0a86c-20c6-4410-a47b-5cba383a698a');
+      expect(payload.user.ext.eids[0].uids[0].atype).to.equal(1);
+    });
   });
 
   describe('interpretResponse', function () {
@@ -208,7 +228,8 @@ describe('YieldLift', function () {
         expect(bids[index]).to.have.property('height', RESPONSE.body.seatbid[0].bid[index].h);
         expect(bids[index]).to.have.property('ad', RESPONSE.body.seatbid[0].bid[index].adm);
         expect(bids[index]).to.have.property('creativeId', RESPONSE.body.seatbid[0].bid[index].crid);
-        expect(bids[index]).to.have.property('ttl', 30);
+        expect(bids[index].meta).to.have.property('advertiserDomains', RESPONSE.body.seatbid[0].bid[index].advertiserDomains);
+        expect(bids[index]).to.have.property('ttl', 300);
         expect(bids[index]).to.have.property('netRevenue', true);
       }
     });
diff --git a/test/spec/modules/yieldmoBidAdapter_spec.js b/test/spec/modules/yieldmoBidAdapter_spec.js
index 1c4c4812680..4123422ce6e 100644
--- a/test/spec/modules/yieldmoBidAdapter_spec.js
+++ b/test/spec/modules/yieldmoBidAdapter_spec.js
@@ -1,19 +1,20 @@
 import { expect } from 'chai';
 import { spec } from 'modules/yieldmoBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
 import * as utils from 'src/utils.js';
 
-describe('YieldmoAdapter', function () {
-  const adapter = newBidder(spec);
-  const ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
+// above is used for debugging purposes only
 
-  let tdid = '8d146286-91d4-4958-aff4-7e489dd1abd6';
-  let criteoId = 'aff4';
+describe('YieldmoAdapter', function () {
+  const BANNER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
+  const VIDEO_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebidvideo';
+  const PB_COOKIE_ASSIST_SYNC_ENDPOINT = `https://ads.yieldmo.com/pbcas`;
 
-  let bid = {
+  const mockBannerBid = (rootParams = {}, params = {}) => ({
     bidder: 'yieldmo',
     params: {
       bidFloor: 0.1,
+      ...params,
     },
     adUnitCode: 'adunit-code',
     mediaTypes: {
@@ -31,15 +32,47 @@ describe('YieldmoAdapter', function () {
       pubcid: 'c604130c-0144-4b63-9bf2-c2bd8c8d86da',
     },
     userId: {
-      tdid,
+      tdid: '8d146286-91d4-4958-aff4-7e489dd1abd6'
     },
-  };
-  let bidArray = [bid];
-  let bidderRequest = {
+    transactionId: '54a58774-7a41-494e-9aaf-fa7b79164f0c',
+    ...rootParams
+  });
+
+  const mockVideoBid = (rootParams = {}, params = {}, videoParams = {}) => ({
+    bidder: 'yieldmo',
+    adUnitCode: 'adunit-code-video',
+    bidId: '321video123',
+    auctionId: '1d1a03073455',
+    mediaTypes: {
+      video: {
+        playerSize: [640, 480],
+        context: 'instream',
+        mimes: ['video/mp4']
+      },
+    },
+    params: {
+      placementId: '123',
+      ...params,
+      video: {
+        placement: 1,
+        maxduration: 30,
+        startdelay: 10,
+        protocols: [2, 3],
+        api: [2, 3],
+        skipppable: true,
+        playbackmethod: [1, 2],
+        ...videoParams
+      }
+    },
+    transactionId: '54a58774-7a41-494e-8cbc-fa7b79164f0c',
+    ...rootParams
+  });
+
+  const mockBidderRequest = (params = {}, bids = [mockBannerBid()]) => ({
     bidderCode: 'yieldmo',
     auctionId: 'e3a336ad-2761-4a1c-b421-ecc7c5294a34',
     bidderRequestId: '14c4ede8c693f',
-    bids: bidArray,
+    bids,
     auctionStart: 1520001292880,
     timeout: 3000,
     start: 1520001292884,
@@ -49,237 +82,561 @@ describe('YieldmoAdapter', function () {
       reachedTop: true,
       referer: 'yieldmo.com',
     },
-  };
+    ...params
+  });
+
+  const mockGetFloor = floor => ({getFloor: () => ({ currency: 'USD', floor })});
 
   describe('isBidRequestValid', function () {
-    it('should return true when necessary information is found', function () {
-      expect(spec.isBidRequestValid(bid)).to.be.true;
+    describe('Banner:', function () {
+      it('should return true when necessary information is found', function () {
+        expect(spec.isBidRequestValid(mockBannerBid())).to.be.true;
+      });
+
+      it('should return false when necessary information is not found', function () {
+        // empty bid
+        expect(spec.isBidRequestValid({})).to.be.false;
+
+        // empty bidId
+        expect(spec.isBidRequestValid(mockBannerBid({bidId: ''}))).to.be.false;
+
+        // empty adUnitCode
+        expect(spec.isBidRequestValid(mockBannerBid({adUnitCode: ''}))).to.be.false;
+
+        let invalidBid = mockBannerBid();
+        delete invalidBid.mediaTypes.banner;
+        expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+      });
     });
 
-    it('should return false when necessary information is not found', function () {
-      // empty bid
-      expect(spec.isBidRequestValid({})).to.be.false;
+    describe('Instream video:', function () {
+      const getVideoBidWithoutParam = (key, paramToRemove) => {
+        let bid = mockVideoBid();
+        delete utils.deepAccess(bid, key)[paramToRemove];
+        return bid;
+      }
 
-      // empty bidId
-      bid.bidId = '';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      it('should return true when necessary information is found', function () {
+        expect(spec.isBidRequestValid(mockVideoBid())).to.be.true;
+      });
 
-      // empty adUnitCode
-      bid.bidId = '30b31c1838de1e';
-      bid.adUnitCode = '';
-      expect(spec.isBidRequestValid(bid)).to.be.false;
+      it('should return false when necessary information is not found', function () {
+        // empty bidId
+        expect(spec.isBidRequestValid(mockVideoBid({bidId: ''}))).to.be.false;
 
-      bid.adUnitCode = 'adunit-code';
+        // empty adUnitCode
+        expect(spec.isBidRequestValid(mockVideoBid({adUnitCode: ''}))).to.be.false;
+      });
+
+      it('should return false when required mediaTypes.video.* param is not found', function () {
+        const getBidAndExclude = paramToRemove => getVideoBidWithoutParam('mediaTypes.video', paramToRemove);
+
+        expect(spec.isBidRequestValid(getBidAndExclude('playerSize'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('mimes'))).to.be.false;
+      });
+
+      it('should return false when required bid.params.* is not found', function () {
+        const getBidAndExclude = paramToRemove => getVideoBidWithoutParam('params', paramToRemove);
+
+        expect(spec.isBidRequestValid(getBidAndExclude('placementId'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('video'))).to.be.false;
+      });
+
+      it('should return false when required bid.params.video.* is not found', function () {
+        const getBidAndExclude = paramToRemove => getVideoBidWithoutParam('params.video', paramToRemove);
+
+        expect(spec.isBidRequestValid(getBidAndExclude('placement'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('maxduration'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('startdelay'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('protocols'))).to.be.false;
+        expect(spec.isBidRequestValid(getBidAndExclude('api'))).to.be.false;
+      });
     });
   });
 
   describe('buildRequests', function () {
-    it('should attempt to send bid requests to the endpoint via GET', function () {
-      const request = spec.buildRequests(bidArray, bidderRequest);
-      expect(request.method).to.equal('GET');
-      expect(request.url).to.be.equal(ENDPOINT);
-    });
+    const build = (bidRequests, bidderReq = mockBidderRequest()) => spec.buildRequests(bidRequests, bidderReq);
+    const buildAndGetPlacementInfo = (bidRequests, index = 0, bidderReq = mockBidderRequest()) =>
+      utils.deepAccess(build(bidRequests, bidderReq), `${index}.data.p`);
+    const buildAndGetData = (bidRequests, index = 0, bidderReq = mockBidderRequest()) =>
+      utils.deepAccess(build(bidRequests, bidderReq), `${index}.data`) || {};
 
-    it('should not blow up if crumbs is undefined', function () {
-      let bidArray = [{ ...bid, crumbs: undefined }];
-      expect(function () {
-        spec.buildRequests(bidArray, bidderRequest);
-      }).not.to.throw();
-    });
+    describe('Banner:', function () {
+      it('should attempt to send banner bid requests to the endpoint via GET', function () {
+        const requests = build([mockBannerBid()]);
+        expect(requests.length).to.equal(1);
+        expect(requests[0].method).to.equal('GET');
+        expect(requests[0].url).to.be.equal(BANNER_ENDPOINT);
+      });
 
-    it('should place bid information into the p parameter of data', function () {
-      let placementInfo = spec.buildRequests(bidArray, bidderRequest).data.p;
-      expect(placementInfo).to.equal(
-        '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1}]'
-      );
-      bidArray.push({
-        bidder: 'yieldmo',
-        params: {
-          bidFloor: 0.2,
-        },
-        adUnitCode: 'adunit-code-1',
-        mediaTypes: {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600],
-            ],
-          },
-        },
-        bidId: '123456789',
-        bidderRequestId: '987654321',
-        auctionId: '0246810',
-        crumbs: {
-          pubcid: 'c604130c-0144-4b63-9bf2-c2bd8c8d86da',
-        },
+      it('should not blow up if crumbs is undefined', function () {
+        expect(function () {
+          build([mockBannerBid({crumbs: undefined})]);
+        }).not.to.throw();
       });
 
-      // multiple placements
-      placementInfo = spec.buildRequests(bidArray, bidderRequest).data.p;
-      expect(placementInfo).to.equal(
-        '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1},{"placement_id":"adunit-code-1","callback_id":"123456789","sizes":[[300,250],[300,600]],"bidFloor":0.2}]'
-      );
-    });
+      it('should place bid information into the p parameter of data', function () {
+        let bidArray = [mockBannerBid()];
+        expect(buildAndGetPlacementInfo(bidArray)).to.equal(
+          '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1,"auctionId":"1d1a030790a475"}]'
+        );
+        // multiple placements
+        bidArray.push(mockBannerBid(
+          {adUnitCode: 'adunit-2', bidId: '123a', bidderRequestId: '321', auctionId: '222', transactionId: '444'}, {bidFloor: 0.2}));
+        expect(buildAndGetPlacementInfo(bidArray)).to.equal(
+          '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1,"auctionId":"1d1a030790a475"},' +
+        '{"placement_id":"adunit-2","callback_id":"123a","sizes":[[300,250],[300,600]],"bidFloor":0.2,"auctionId":"222"}]'
+        );
+      });
 
-    it('should add placement id if given', function () {
-      bidArray[0].params.placementId = 'ym_1293871298';
-      let placementInfo = spec.buildRequests(bidArray, bidderRequest).data.p;
-      expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
-      expect(placementInfo).not.to.include('"ym_placement_id":"ym_0987654321"');
+      it('should add placement id if given', function () {
+        let bidArray = [mockBannerBid({}, {placementId: 'ym_1293871298'})];
+        let placementInfo = buildAndGetPlacementInfo(bidArray);
+        expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
+        expect(placementInfo).not.to.include('"ym_placement_id":"ym_0987654321"');
+        bidArray.push(mockBannerBid({}, {placementId: 'ym_0987654321'}));
+        placementInfo = buildAndGetPlacementInfo(bidArray);
+        expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
+        expect(placementInfo).to.include('"ym_placement_id":"ym_0987654321"');
+      });
 
-      bidArray[1].params.placementId = 'ym_0987654321';
-      placementInfo = spec.buildRequests(bidArray, bidderRequest).data.p;
-      expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
-      expect(placementInfo).to.include('"ym_placement_id":"ym_0987654321"');
-    });
+      it('should add additional information to data parameter of request', function () {
+        const data = buildAndGetData([mockBannerBid()]);
+        expect(data.hasOwnProperty('page_url')).to.be.true;
+        expect(data.hasOwnProperty('bust')).to.be.true;
+        expect(data.hasOwnProperty('pr')).to.be.true;
+        expect(data.hasOwnProperty('scrd')).to.be.true;
+        expect(data.dnt).to.be.false;
+        expect(data.hasOwnProperty('description')).to.be.true;
+        expect(data.hasOwnProperty('title')).to.be.true;
+        expect(data.hasOwnProperty('h')).to.be.true;
+        expect(data.hasOwnProperty('w')).to.be.true;
+        expect(data.hasOwnProperty('pubcid')).to.be.true;
+        expect(data.userConsent).to.equal('{"gdprApplies":"","cmp":""}');
+        expect(data.us_privacy).to.equal('');
+      });
 
-    it('should add additional information to data parameter of request', function () {
-      const data = spec.buildRequests(bidArray, bidderRequest).data;
-      expect(data.hasOwnProperty('page_url')).to.be.true;
-      expect(data.hasOwnProperty('bust')).to.be.true;
-      expect(data.hasOwnProperty('pr')).to.be.true;
-      expect(data.hasOwnProperty('scrd')).to.be.true;
-      expect(data.dnt).to.be.false;
-      expect(data.e).to.equal(90);
-      expect(data.hasOwnProperty('description')).to.be.true;
-      expect(data.hasOwnProperty('title')).to.be.true;
-      expect(data.hasOwnProperty('h')).to.be.true;
-      expect(data.hasOwnProperty('w')).to.be.true;
-      expect(data.hasOwnProperty('pubcid')).to.be.true;
-    });
+      it('should add pubcid as parameter of request', function () {
+        const pubcid = 'c604130c-0144-4b63-9bf2-c2bd8c8d86da2';
+        const pubcidBid = mockBannerBid({crumbs: undefined, userId: {pubcid}});
+        expect(buildAndGetData([pubcidBid]).pubcid).to.deep.equal(pubcid);
+      });
 
-    it('should add pubcid as parameter of request', function () {
-      const pubcidBid = {
-        bidder: 'yieldmo',
-        params: {},
-        adUnitCode: 'adunit-code',
-        mediaTypes: {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600],
-            ],
-          },
-        },
-        bidId: '30b31c1838de1e',
-        bidderRequestId: '22edbae2733bf6',
-        auctionId: '1d1a030790a475',
-        userId: {
-          pubcid: 'c604130c-0144-4b63-9bf2-c2bd8c8d86da2',
-        },
-      };
-      const data = spec.buildRequests([pubcidBid], bidderRequest).data;
-      expect(data.pubcid).to.deep.equal(
-        'c604130c-0144-4b63-9bf2-c2bd8c8d86da2'
-      );
-    });
+      it('should add transaction id as parameter of request', function () {
+        const transactionId = '54a58774-7a41-494e-9aaf-fa7b79164f0c';
+        const pubcidBid = mockBannerBid({ ortb2Imp: {
+          ext: {
+            tid: '54a58774-7a41-494e-9aaf-fa7b79164f0c',
+          }
+        }});
+        const bidRequest = buildAndGetData([pubcidBid]);
+        expect(bidRequest.p).to.contain(transactionId);
+      });
 
-    it('should add unified id as parameter of request', function () {
-      const unifiedIdBid = {
-        bidder: 'yieldmo',
-        params: {},
-        adUnitCode: 'adunit-code',
-        mediaTypes: {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600],
-            ],
-          },
-        },
-        bidId: '30b31c1838de1e',
-        bidderRequestId: '22edbae2733bf6',
-        auctionId: '1d1a030790a475',
-        userId: {
-          tdid,
-        },
-      };
-      const data = spec.buildRequests([unifiedIdBid], bidderRequest).data;
-      expect(data.tdid).to.deep.equal(tdid);
-    });
+      it('should add auction id as parameter of request', function () {
+        const auctionId = '1d1a030790a475';
+        const pubcidBid = mockBannerBid({});
+        const bidRequest = buildAndGetData([pubcidBid]);
+        expect(bidRequest.p).to.contain(auctionId);
+      });
 
-    it('should add CRITEO RTUS id as parameter of request', function () {
-      const criteoIdBid = {
-        bidder: 'yieldmo',
-        params: {},
-        adUnitCode: 'adunit-code',
-        mediaTypes: {
-          banner: {
-            sizes: [
-              [300, 250],
-              [300, 600],
-            ],
-          },
-        },
-        bidId: '30b31c1838de1e',
-        bidderRequestId: '22edbae2733bf6',
-        auctionId: '1d1a030790a475',
-        userId: {
-          criteoId,
-        },
-      };
-      const data = spec.buildRequests([criteoIdBid], bidderRequest).data;
-      expect(data.cri_prebid).to.deep.equal(criteoId);
-    });
+      it('should add unified id as parameter of request', function () {
+        const unifiedIdBid = mockBannerBid({crumbs: undefined});
+        expect(buildAndGetData([unifiedIdBid]).tdid).to.deep.equal(mockBannerBid().userId.tdid);
+      });
 
-    it('should add gdpr information to request if available', () => {
-      bidderRequest.gdprConsent = {
-        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
-        vendorData: { blerp: 1 },
-        gdprApplies: true,
-      };
-      const data = spec.buildRequests(bidArray, bidderRequest).data;
-      expect(data.userConsent).equal(
-        JSON.stringify({
+      it('should add CRITEO RTUS id as parameter of request', function () {
+        const criteoId = 'aff4';
+        const criteoIdBid = mockBannerBid({crumbs: undefined, userId: { criteoId }});
+        expect(buildAndGetData([criteoIdBid]).cri_prebid).to.deep.equal(criteoId);
+      });
+
+      it('should add gdpr information to request if available', () => {
+        const gdprConsent = {
+          consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+          vendorData: {blerp: 1},
           gdprApplies: true,
-          cmp: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
-        })
-      );
-    });
+        };
+        const data = buildAndGetData([mockBannerBid()], 0, mockBidderRequest({gdprConsent}));
+        expect(data.userConsent).equal(
+          JSON.stringify({
+            gdprApplies: true,
+            cmp: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+          })
+        );
+      });
+
+      it('should add ccpa information to request if available', () => {
+        const uspConsent = '1YNY';
+        const data = buildAndGetData([mockBannerBid()], 0, mockBidderRequest({uspConsent}));
+        expect(data.us_privacy).equal(uspConsent);
+      });
+
+      it('should add schain if it is in the bidRequest', () => {
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [{asi: 'indirectseller.com', sid: '00001', hp: 1}],
+        };
+        const data = buildAndGetData([mockBannerBid({schain})]);
+        expect(data.schain).equal(JSON.stringify(schain));
+      });
+
+      it('should process floors module if available', function () {
+        const placementsData = JSON.parse(buildAndGetPlacementInfo([
+          mockBannerBid({...mockGetFloor(3.99)}),
+          mockBannerBid({...mockGetFloor(1.23)}, { bidFloor: 1.1 }),
+        ]));
+        expect(placementsData[0].bidFloor).to.equal(3.99);
+        expect(placementsData[1].bidFloor).to.equal(1.23);
+      });
+
+      it('should use bidFloor if no floors module is available', function() {
+        const placementsData = JSON.parse(buildAndGetPlacementInfo([
+          mockBannerBid({}, { bidFloor: 1.2 }),
+          mockBannerBid({}, { bidFloor: 0.7 }),
+        ]));
+        expect(placementsData[0].bidFloor).to.equal(1.2);
+        expect(placementsData[1].bidFloor).to.equal(0.7);
+      });
+
+      it('should not write 0 bidfloor value by default', function() {
+        const placementsData = JSON.parse(buildAndGetPlacementInfo([mockBannerBid()]));
+        expect(placementsData[0].bidfloor).to.undefined;
+      });
+
+      it('should not exceed max url length', () => {
+        const longString = new Array(8000).join('a');
+        const localWindow = utils.getWindowTop();
+
+        const originalTitle = localWindow.document.title;
+        localWindow.document.title = longString;
+
+        const request = spec.buildRequests(
+          [mockBannerBid()],
+          mockBidderRequest({
+            refererInfo: {
+              numIframes: 1,
+              reachedTop: true,
+              referer: longString,
+            },
+          })
+        )[0];
+        const url = `${request.url}?${utils.parseQueryStringParameters(request.data)}`;
 
-    it('should add ccpa information to request if available', () => {
-      const privacy = '1YNY';
-      bidderRequest.uspConsent = privacy;
-      const data = spec.buildRequests(bidArray, bidderRequest).data;
-      expect(data.us_privacy).equal(privacy);
+        expect(url.length).equal(8000);
+
+        localWindow.document.title = originalTitle;
+      });
+
+      it('should only shortcut properties rather then completely remove it', () => {
+        const longString = new Array(8000).join('a');
+        const localWindow = utils.getWindowTop();
+
+        const originalTitle = localWindow.document.title;
+        localWindow.document.title = `testtitle${longString}`;
+
+        const request = spec.buildRequests(
+          [mockBannerBid()],
+          mockBidderRequest({
+            refererInfo: {
+              numIframes: 1,
+              reachedTop: true,
+              title: longString,
+            },
+          })
+        )[0];
+
+        expect(request.data.title.length).greaterThan(0);
+
+        localWindow.document.title = originalTitle;
+      });
+
+      it('should add ats_envelope to banner bid request', function() {
+        const envelope = 'test_envelope';
+        const requests = build([mockBannerBid({}, { lr_env: envelope })]);
+
+        expect(requests[0].data.ats_envelope).to.equal(envelope);
+      });
+
+      it('should add gpid to the banner bid request', function () {
+        let bidArray = [mockBannerBid({
+          ortb2Imp: {
+            ext: { data: { pbadslot: '/6355419/Travel/Europe/France/Paris' } },
+          }
+        })];
+        let placementInfo = buildAndGetPlacementInfo(bidArray);
+        expect(placementInfo).to.include('"gpid":"/6355419/Travel/Europe/France/Paris"');
+      });
+
+      it('should add eids to the banner bid request', function () {
+        const params = {
+          userId: {pubcid: 'fake_pubcid'},
+          fakeUserIdAsEids: [{
+            source: 'pubcid.org',
+            uids: [{
+              id: 'fake_pubcid',
+              atype: 1
+            }]
+          }]
+        };
+        expect(buildAndGetData([mockBannerBid({...params})]).eids).equal(JSON.stringify(params.fakeUserIdAsEids));
+      });
     });
 
-    it('should add schain if it is in the bidRequest', () => {
-      const schain = {
-        ver: '1.0',
-        complete: 1,
-        nodes: [{ asi: 'indirectseller.com', sid: '00001', hp: 1 }],
-      };
-      bidArray[0].schain = schain;
-      const request = spec.buildRequests([bidArray[0]], bidderRequest);
-      expect(request.data.schain).equal(JSON.stringify(schain));
+    describe('Instream video:', function () {
+      let videoBid;
+      const buildVideoBidAndGetVideoParam = () => build([videoBid])[0].data.imp[0].video;
+
+      beforeEach(() => {
+        videoBid = mockVideoBid();
+      });
+
+      it('should attempt to send video bid requests to the endpoint via POST', function () {
+        const requests = build([videoBid]);
+        expect(requests.length).to.equal(1);
+        expect(requests[0].method).to.equal('POST');
+        expect(requests[0].url).to.be.equal(VIDEO_ENDPOINT);
+      });
+
+      it('should add mediaTypes.video prop to the imp.video prop', function () {
+        utils.deepAccess(videoBid, 'mediaTypes.video')['minduration'] = 40;
+        expect(buildVideoBidAndGetVideoParam().minduration).to.equal(40);
+      });
+
+      it('should override mediaTypes.video prop if params.video prop is present', function () {
+        utils.deepAccess(videoBid, 'mediaTypes.video')['minduration'] = 50;
+        utils.deepAccess(videoBid, 'params.video')['minduration'] = 40;
+        expect(buildVideoBidAndGetVideoParam().minduration).to.equal(40);
+      });
+
+      it('should add mediaTypes.video.mimes prop to the imp.video', function () {
+        utils.deepAccess(videoBid, 'mediaTypes.video')['minduration'] = ['video/mp4'];
+        expect(buildVideoBidAndGetVideoParam().minduration).to.deep.equal(['video/mp4']);
+      });
+
+      it('should override mediaTypes.video.mimes prop if params.video.mimes is present', function () {
+        utils.deepAccess(videoBid, 'mediaTypes.video')['mimes'] = ['video/mp4'];
+        utils.deepAccess(videoBid, 'params.video')['mimes'] = ['video/mkv'];
+        expect(buildVideoBidAndGetVideoParam().mimes).to.deep.equal(['video/mkv']);
+      });
+
+      describe('video.skip state check', () => {
+        it('should not set video.skip if neither *.video.skip nor *.video.skippable is present', function () {
+          utils.deepAccess(videoBid, 'mediaTypes.video')['skippable'] = false;
+          utils.deepAccess(videoBid, 'params.video')['skippable'] = false;
+          expect(buildVideoBidAndGetVideoParam().skip).to.undefined;
+        });
+
+        it('should set video.skip=1 if mediaTypes.video.skip is present', function () {
+          utils.deepAccess(videoBid, 'mediaTypes.video')['skip'] = 1;
+          expect(buildVideoBidAndGetVideoParam().skip).to.equal(1);
+        });
+
+        it('should set video.skip=1 if params.video.skip is present', function () {
+          utils.deepAccess(videoBid, 'params.video')['skip'] = 1;
+          expect(buildVideoBidAndGetVideoParam().skip).to.equal(1);
+        });
+
+        it('should set video.skip=1 if mediaTypes.video.skippable is present', function () {
+          utils.deepAccess(videoBid, 'mediaTypes.video')['skippable'] = true;
+          expect(buildVideoBidAndGetVideoParam().skip).to.equal(1);
+        });
+
+        it('should set video.skip=1 if mediaTypes.video.skippable is present', function () {
+          utils.deepAccess(videoBid, 'params.video')['skippable'] = true;
+          expect(buildVideoBidAndGetVideoParam().skip).to.equal(1);
+        });
+
+        it('should set video.skip=1 if mediaTypes.video.skippable is present', function () {
+          utils.deepAccess(videoBid, 'mediaTypes.video')['skippable'] = false;
+          utils.deepAccess(videoBid, 'params.video')['skippable'] = true;
+          expect(buildVideoBidAndGetVideoParam().skip).to.equal(1);
+        });
+
+        it('should not set video.skip if params.video.skippable is false', function () {
+          utils.deepAccess(videoBid, 'mediaTypes.video')['skippable'] = true;
+          utils.deepAccess(videoBid, 'params.video')['skippable'] = false;
+          expect(buildVideoBidAndGetVideoParam().skip).to.undefined;
+        });
+      });
+
+      it('should process floors module if available', function () {
+        const requests = build([
+          mockVideoBid({...mockGetFloor(3.99)}),
+          mockVideoBid({...mockGetFloor(1.23)}, { bidfloor: 1.1 }),
+        ]);
+        const imps = requests[0].data.imp;
+        expect(imps[0].bidfloor).to.equal(3.99);
+        expect(imps[1].bidfloor).to.equal(1.23);
+      });
+
+      it('should use bidfloor if no floors module is available', function() {
+        const requests = build([
+          mockVideoBid({}, { bidfloor: 1.2 }),
+          mockVideoBid({}, { bidfloor: 0.7 }),
+        ]);
+        const imps = requests[0].data.imp;
+        expect(imps[0].bidfloor).to.equal(1.2);
+        expect(imps[1].bidfloor).to.equal(0.7);
+      });
+
+      it('should have 0 bidfloor value by default', function() {
+        const requests = build([mockVideoBid()]);
+        expect(requests[0].data.imp[0].bidfloor).to.equal(0);
+      });
+
+      it('should add ats_envelope to video bid request', function() {
+        const envelope = 'test_envelope';
+        const requests = build([mockVideoBid({}, { lr_env: envelope })]);
+
+        expect(requests[0].data.ats_envelope).to.equal(envelope);
+      });
+
+      it('should add transaction id to video bid request', function() {
+        const transactionId = '54a58774-7a41-494e-8cbc-fa7b79164f0c';
+        const requestData = {
+          ortb2Imp: {
+            ext: {
+              tid: '54a58774-7a41-494e-8cbc-fa7b79164f0c',
+            }
+          }
+        };
+        expect(buildAndGetData([mockVideoBid({...requestData})]).imp[0].ext.tid).to.equal(transactionId);
+      });
+
+      it('should add auction id to video bid request', function() {
+        const auctionId = '1d1a03073455';
+        expect(buildAndGetData([mockVideoBid({})]).auctionId).to.deep.equal(auctionId);
+      });
+
+      it('should add schain if it is in the bidRequest', () => {
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [{
+            asi: 'indirectseller.com',
+            sid: '00001',
+            hp: 1
+          }],
+        };
+        expect(buildAndGetData([mockVideoBid({schain})]).schain).to.deep.equal(schain);
+      });
+
+      it('should add gpid to the video request', function () {
+        const ortb2Imp = {
+          ext: { data: { pbadslot: '/6355419/Travel/Europe/France/Paris' } },
+        };
+        expect(buildAndGetData([mockVideoBid({ortb2Imp})]).imp[0].ext.gpid).to.be.equal(ortb2Imp.ext.data.pbadslot);
+      });
+
+      it('should add eids to the video bid request', function () {
+        const params = {
+          userId: {pubcid: 'fake_pubcid'},
+          fakeUserIdAsEids: [{
+            source: 'pubcid.org',
+            uids: [{
+              id: 'fake_pubcid',
+              atype: 1
+            }]
+          }]
+        };
+        expect(buildAndGetData([mockVideoBid({...params})]).user.eids).to.eql(params.fakeUserIdAsEids);
+      });
+      it('should add device info to payload if available', function () {
+        let videoBidder = mockBidderRequest({ ortb2: {
+          device: {
+            sua: {
+              platform: {
+                brand: 'macOS',
+                version: [ '12', '4', '0' ]
+              },
+              browsers: [
+                {
+                  brand: 'Chromium',
+                  version: [ '106', '0', '5249', '119' ]
+                },
+                {
+                  brand: 'Google Chrome',
+                  version: [ '106', '0', '5249', '119' ]
+                },
+                {
+                  brand: 'Not;A=Brand',
+                  version: [ '99', '0', '0', '0' ]
+                }
+              ],
+              mobile: 0,
+              model: '',
+              bitness: '64',
+              architecture: 'x86'
+            }
+          }
+        }}, [mockVideoBid()]);
+        let payload = buildAndGetData([mockVideoBid()], 0, videoBidder);
+        expect(payload.device.sua).to.exist;
+        expect(payload.device.sua).to.deep.equal({
+          platform: {
+            brand: 'macOS',
+            version: [ '12', '4', '0' ]
+          },
+          browsers: [
+            {
+              brand: 'Chromium',
+              version: [ '106', '0', '5249', '119' ]
+            },
+            {
+              brand: 'Google Chrome',
+              version: [ '106', '0', '5249', '119' ]
+            },
+            {
+              brand: 'Not;A=Brand',
+              version: [ '99', '0', '0', '0' ]
+            }
+          ],
+          mobile: 0,
+          model: '',
+          bitness: '64',
+          architecture: 'x86'
+        }
+        );
+        expect(payload.device.ua).to.not.exist;
+        expect(payload.device.language).to.not.exist;
+        // remove sua info and check device object
+        videoBidder = mockBidderRequest({ ortb2: {
+          device: {
+            ua: navigator.userAgent,
+            language: (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage),
+          }
+        }}, [mockVideoBid()]);
+        payload = buildAndGetData([mockVideoBid()], 0, videoBidder);
+        expect(payload.device.sua).to.not.exist;
+        expect(payload.device.ua).to.exist;
+        expect(payload.device.language).to.exist;
+      });
     });
   });
 
   describe('interpretResponse', function () {
-    let serverResponse;
-
-    beforeEach(function () {
-      serverResponse = {
-        body: [
-          {
-            callback_id: '21989fdbef550a',
-            cpm: 3.45455,
-            width: 300,
-            height: 250,
-            ad:
-              '<html><head></head><body><script>//GEX ad object</script><div id="ym_123" class="ym"></div><script>//js code</script></body></html>',
-            creative_id: '9874652394875',
-          },
-        ],
-        header: 'header?',
-      };
+    const mockServerResponse = () => ({
+      body: [{
+        callback_id: '21989fdbef550a',
+        cpm: 3.45455,
+        publisherDealId: 'YMO_123',
+        width: 300,
+        height: 250,
+        ad: '<html><head></head><body><script>//GEX ad object</script>' +
+          '<div id="ym_123" class="ym"></div><script>//js code</script></body></html>',
+        creative_id: '9874652394875',
+        adomain: ['www.example.com'],
+      }],
+      header: 'header?',
     });
 
     it('should correctly reorder the server response', function () {
-      const newResponse = spec.interpretResponse(serverResponse);
+      const newResponse = spec.interpretResponse(mockServerResponse());
       expect(newResponse.length).to.be.equal(1);
       expect(newResponse[0]).to.deep.equal({
+        dealId: 'YMO_123',
         requestId: '21989fdbef550a',
         cpm: 3.45455,
         width: 300,
@@ -288,25 +645,91 @@ describe('YieldmoAdapter', function () {
         currency: 'USD',
         netRevenue: true,
         ttl: 300,
-        ad:
-          '<html><head></head><body><script>//GEX ad object</script><div id="ym_123" class="ym"></div><script>//js code</script></body></html>',
+        ad: '<html><head></head><body><script>//GEX ad object</script>' +
+          '<div id="ym_123" class="ym"></div><script>//js code</script></body></html>',
+        meta: {
+          advertiserDomains: ['www.example.com'],
+          mediaType: 'banner',
+        },
+      });
+    });
+
+    it('should correctly reorder video bids', function () {
+      const response = mockServerResponse();
+      const seatbid = [
+        {
+          bid: {
+            adm: '<?xml version="1.0" encoding="UTF-8"?>',
+            adomain: ['www.example.com'],
+            crid: 'dd65c0a7536aff',
+            impid: '91ea8bba1',
+            price: 1.5,
+            dealid: 'YMO_456'
+          },
+        },
+      ];
+      const bidRequest = {
+        data: {
+          imp: [
+            {
+              id: '91ea8bba1',
+              video: {
+                h: 250,
+                w: 300,
+              },
+            },
+          ],
+        },
+      };
+
+      response.body.seatbid = seatbid;
+
+      const newResponse = spec.interpretResponse(response, bidRequest);
+      expect(newResponse.length).to.be.equal(2);
+      expect(newResponse[1]).to.deep.equal({
+        dealId: 'YMO_456',
+        cpm: 1.5,
+        creativeId: 'dd65c0a7536aff',
+        currency: 'USD',
+        height: 250,
+        mediaType: 'video',
+        meta: {
+          advertiserDomains: ['www.example.com'],
+          mediaType: 'video',
+        },
+        netRevenue: true,
+        requestId: '91ea8bba1',
+        ttl: 300,
+        vastXml: '<?xml version="1.0" encoding="UTF-8"?>',
+        width: 300,
       });
     });
 
     it('should not add responses if the cpm is 0 or null', function () {
-      serverResponse.body[0].cpm = 0;
-      let response = spec.interpretResponse(serverResponse);
-      expect(response).to.deep.equal([]);
+      let response = mockServerResponse();
+      response.body[0].cpm = 0;
+      expect(spec.interpretResponse(response)).to.deep.equal([]);
 
-      serverResponse.body[0].cpm = null;
-      response = spec.interpretResponse(serverResponse);
-      expect(response).to.deep.equal([]);
+      response.body[0].cpm = null;
+      expect(spec.interpretResponse(response)).to.deep.equal([]);
     });
   });
 
   describe('getUserSync', function () {
-    it('should return a tracker with type and url as parameters', function () {
-      expect(spec.getUserSyncs()).to.deep.equal([]);
+    const gdprFlag = `&gdpr=0`;
+    const usPrivacy = `us_privacy=`;
+    const gdprString = `&gdpr_consent=`;
+    const pbCookieAssistSyncUrl = `${PB_COOKIE_ASSIST_SYNC_ENDPOINT}?${usPrivacy}${gdprFlag}${gdprString}`;
+    it('should use type iframe when iframeEnabled', function() {
+      const syncs = spec.getUserSyncs({iframeEnabled: true});
+      expect(syncs).to.deep.equal([{type: 'iframe', url: pbCookieAssistSyncUrl + '&type=iframe'}])
+    });
+    it('should use type image when pixelEnabled', function() {
+      const syncs = spec.getUserSyncs({pixelEnabled: true});
+      expect(syncs).to.deep.equal([{type: 'image', url: pbCookieAssistSyncUrl + '&type=image'}])
+    });
+    it('should register no syncs', function () {
+      expect(spec.getUserSyncs({})).to.deep.equal([]);
     });
   });
 });
diff --git a/test/spec/modules/yieldmoSyntheticInventoryModule_spec.js b/test/spec/modules/yieldmoSyntheticInventoryModule_spec.js
new file mode 100644
index 00000000000..55b4e7255f7
--- /dev/null
+++ b/test/spec/modules/yieldmoSyntheticInventoryModule_spec.js
@@ -0,0 +1,89 @@
+import { expect } from 'chai';
+import {
+  init,
+  MODULE_NAME,
+  validateConfig
+} from 'modules/yieldmoSyntheticInventoryModule';
+
+const mockedYmConfig = {
+  placementId: '123456',
+  adUnitPath: '/6355419/ad_unit_name_used_in_gam'
+};
+
+const setGoogletag = () => {
+  window.googletag = {
+    cmd: [],
+    defineSlot: sinon.stub(),
+    addService: sinon.stub(),
+    pubads: sinon.stub(),
+    setTargeting: sinon.stub(),
+    enableServices: sinon.stub(),
+    display: sinon.stub(),
+  };
+  window.googletag.defineSlot.returns(window.googletag);
+  window.googletag.addService.returns(window.googletag);
+  window.googletag.pubads.returns({getSlots: sinon.stub()});
+  return window.googletag;
+}
+
+describe('Yieldmo Synthetic Inventory Module', function() {
+  let config = Object.assign({}, mockedYmConfig);
+  let googletagBkp;
+
+  beforeEach(function () {
+    googletagBkp = window.googletag;
+    delete window.googletag;
+  });
+
+  afterEach(function () {
+    window.googletag = googletagBkp;
+  });
+
+  it('should be enabled with valid required params', function() {
+    expect(function () {
+      init(mockedYmConfig);
+    }).not.to.throw()
+  });
+
+  it('should throw an error if placementId is missed', function() {
+    const {placementId, ...config} = mockedYmConfig;
+
+    expect(function () {
+      validateConfig(config);
+    }).throw(`${MODULE_NAME}: placementId required`)
+  });
+
+  it('should throw an error if adUnitPath is missed', function() {
+    const {adUnitPath, ...config} = mockedYmConfig;
+
+    expect(function () {
+      validateConfig(config);
+    }).throw(`${MODULE_NAME}: adUnitPath required`)
+  });
+
+  it('should add correct googletag.cmd', function() {
+    const containerName = 'ym_sim_container_' + mockedYmConfig.placementId;
+    const gtag = setGoogletag();
+
+    init(mockedYmConfig);
+
+    expect(gtag.cmd.length).to.equal(1);
+
+    gtag.cmd[0]();
+
+    expect(gtag.addService.getCall(0)).to.not.be.null;
+    expect(gtag.setTargeting.getCall(0)).to.not.be.null;
+    expect(gtag.setTargeting.getCall(0).args[0]).to.exist.and.to.equal('ym_sim_p_id');
+    expect(gtag.setTargeting.getCall(0).args[1]).to.exist.and.to.equal(mockedYmConfig.placementId);
+    expect(gtag.defineSlot.getCall(0)).to.not.be.null;
+    expect(gtag.enableServices.getCall(0)).to.not.be.null;
+    expect(gtag.display.getCall(0)).to.not.be.null;
+    expect(gtag.display.getCall(0).args[0]).to.exist.and.to.equal(containerName);
+    expect(gtag.pubads.getCall(0)).to.not.be.null;
+
+    const gamContainerEl = window.document.getElementById(containerName);
+    expect(gamContainerEl).to.not.be.null;
+
+    gamContainerEl.parentNode.removeChild(gamContainerEl);
+  });
+});
diff --git a/test/spec/modules/yieldoneAnalyticsAdapter_spec.js b/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
index 81a6365bba2..ea52f89773e 100644
--- a/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
+++ b/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
@@ -1,6 +1,7 @@
 import yieldoneAnalytics from 'modules/yieldoneAnalyticsAdapter.js';
 import { targeting } from 'src/targeting.js';
 import { expect } from 'chai';
+import _ from 'lodash';
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
 let constants = require('src/constants.json');
@@ -46,7 +47,7 @@ describe('Yieldone Prebid Analytic', function () {
         {
           bidderCode: 'biddertest_1',
           auctionId: auctionId,
-          refererInfo: {referer: testReferrer},
+          refererInfo: {page: testReferrer},
           bids: [
             {
               adUnitCode: '0000',
@@ -71,7 +72,7 @@ describe('Yieldone Prebid Analytic', function () {
         {
           bidderCode: 'biddertest_2',
           auctionId: auctionId,
-          refererInfo: {referer: testReferrer},
+          refererInfo: {page: testReferrer},
           bids: [
             {
               adUnitCode: '0000',
@@ -87,7 +88,7 @@ describe('Yieldone Prebid Analytic', function () {
         {
           bidderCode: 'biddertest_3',
           auctionId: auctionId,
-          refererInfo: {referer: testReferrer},
+          refererInfo: {page: testReferrer},
           bids: [
             {
               adUnitCode: '0000',
@@ -225,7 +226,9 @@ describe('Yieldone Prebid Analytic', function () {
         pubId: initOptions.pubId,
         page: {url: testReferrer},
         wrapper_version: '$prebid.version$',
-        events: expectedEvents
+        events: sinon.match(evs => {
+          return !expectedEvents.some((expectedEvent) => evs.find(ev => _.isEqual(ev, expectedEvent)) === -1)
+        })
       };
 
       const preparedWinnerParams = Object.assign({adServerTargeting: fakeTargeting}, winner);
@@ -262,14 +265,18 @@ describe('Yieldone Prebid Analytic', function () {
 
       events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
 
-      expect(yieldoneAnalytics.eventsStorage[auctionId]).to.deep.equal(expectedResult);
+      sinon.assert.match(yieldoneAnalytics.eventsStorage[auctionId], expectedResult);
 
       delete yieldoneAnalytics.eventsStorage[auctionId];
 
       setTimeout(function() {
         events.emit(constants.EVENTS.BID_WON, winner);
 
-        sinon.assert.callCount(sendStatStub, 2);
+        sinon.assert.callCount(sendStatStub, 2)
+        const billableEventIndex = yieldoneAnalytics.eventsStorage[auctionId].events.findIndex(event => event.eventType === constants.EVENTS.BILLABLE_EVENT);
+        if (billableEventIndex > -1) {
+          yieldoneAnalytics.eventsStorage[auctionId].events.splice(billableEventIndex, 1);
+        }
         expect(yieldoneAnalytics.eventsStorage[auctionId]).to.deep.equal(wonExpectedResult);
 
         delete yieldoneAnalytics.eventsStorage[auctionId];
diff --git a/test/spec/modules/yieldoneBidAdapter_spec.js b/test/spec/modules/yieldoneBidAdapter_spec.js
index 84065682297..a10247411db 100644
--- a/test/spec/modules/yieldoneBidAdapter_spec.js
+++ b/test/spec/modules/yieldoneBidAdapter_spec.js
@@ -6,6 +6,8 @@ const ENDPOINT = 'https://y.one.impact-ad.jp/h_bid';
 const USER_SYNC_URL = 'https://y.one.impact-ad.jp/push_sync';
 const VIDEO_PLAYER_URL = 'https://img.ak.impact-ad.jp/ic/pone/ivt/firstview/js/dac-video-prebid.min.js';
 
+const DEFAULT_VIDEO_SIZE = {w: 640, h: 360};
+
 describe('yieldoneBidAdapter', function() {
   const adapter = newBidder(spec);
 
@@ -39,32 +41,7 @@ describe('yieldoneBidAdapter', function() {
   });
 
   describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        'bidder': 'yieldone',
-        'params': {
-          placementId: '36891'
-        },
-        'adUnitCode': 'adunit-code1',
-        'sizes': [[300, 250], [336, 280]],
-        'bidId': '23beaa6af6cdde',
-        'bidderRequestId': '19c0c1efdf37e7',
-        'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
-      },
-      {
-        'bidder': 'yieldone',
-        'params': {
-          placementId: '47919'
-        },
-        'adUnitCode': 'adunit-code2',
-        'sizes': [[300, 250]],
-        'bidId': '382091349b149f"',
-        'bidderRequestId': '"1f9c98192de251"',
-        'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
-      }
-    ];
-
-    let bidderRequest = {
+    const bidderRequest = {
       refererInfo: {
         numIframes: 0,
         reachedTop: true,
@@ -73,35 +50,428 @@ describe('yieldoneBidAdapter', function() {
       }
     };
 
-    const request = spec.buildRequests(bidRequests, bidderRequest);
+    describe('Basic', function () {
+      const bidRequests = [
+        {
+          'bidder': 'yieldone',
+          'params': {placementId: '36891'},
+          'adUnitCode': 'adunit-code1',
+          'bidId': '23beaa6af6cdde',
+          'bidderRequestId': '19c0c1efdf37e7',
+          'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
+        },
+        {
+          'bidder': 'yieldone',
+          'params': {placementId: '47919'},
+          'adUnitCode': 'adunit-code2',
+          'bidId': '382091349b149f"',
+          'bidderRequestId': '"1f9c98192de251"',
+          'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
+        }
+      ];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
 
-    it('sends bid request to our endpoint via GET', function () {
-      expect(request[0].method).to.equal('GET');
-      expect(request[1].method).to.equal('GET');
+      it('sends bid request to our endpoint via GET', function () {
+        expect(request[0].method).to.equal('GET');
+        expect(request[1].method).to.equal('GET');
+      });
+      it('attaches source and version to endpoint URL as query params', function () {
+        expect(request[0].url).to.equal(ENDPOINT);
+        expect(request[1].url).to.equal(ENDPOINT);
+      });
+      it('adUnitCode should be sent as uc parameters on any requests', function () {
+        expect(request[0].data.uc).to.equal('adunit-code1');
+        expect(request[1].data.uc).to.equal('adunit-code2');
+      });
     });
 
-    it('attaches source and version to endpoint URL as query params', function () {
-      expect(request[0].url).to.equal(ENDPOINT);
-      expect(request[1].url).to.equal(ENDPOINT);
+    describe('Old Format', function () {
+      const bidRequests = [
+        {
+          params: {placementId: '0'},
+          mediaType: 'banner',
+          sizes: [[300, 250], [336, 280]],
+        },
+        {
+          params: {placementId: '1'},
+          mediaType: 'banner',
+          sizes: [[336, 280]],
+        },
+        {
+          // It doesn't actually exist.
+          params: {placementId: '2'},
+        },
+        {
+          params: {placementId: '3'},
+          mediaType: 'video',
+          sizes: [[1280, 720], [1920, 1080]],
+        },
+        {
+          params: {placementId: '4'},
+          mediaType: 'video',
+          sizes: [[1920, 1080]],
+        },
+        {
+          params: {placementId: '5'},
+          mediaType: 'video',
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      it('parameter sz has more than one size on banner requests', function () {
+        expect(request[0].data.sz).to.equal('300x250,336x280');
+        expect(request[1].data.sz).to.equal('336x280');
+        expect(request[2].data.sz).to.equal('');
+        expect(request[3].data).to.not.have.property('sz');
+        expect(request[4].data).to.not.have.property('sz');
+        expect(request[5].data).to.not.have.property('sz');
+      });
+
+      it('width and height should be set as separate parameters on outstream requests', function () {
+        expect(request[0].data).to.not.have.property('w');
+        expect(request[1].data).to.not.have.property('w');
+        expect(request[2].data).to.not.have.property('w');
+        expect(request[3].data.w).to.equal(1280);
+        expect(request[3].data.h).to.equal(720);
+        expect(request[4].data.w).to.equal(1920);
+        expect(request[4].data.h).to.equal(1080);
+        expect(request[5].data.w).to.equal(DEFAULT_VIDEO_SIZE.w);
+        expect(request[5].data.h).to.equal(DEFAULT_VIDEO_SIZE.h);
+      });
     });
 
-    it('parameter sz has more than one size on banner requests', function () {
-      expect(request[0].data.sz).to.equal('300x250,336x280');
-      expect(request[1].data.sz).to.equal('300x250');
+    describe('Single Format', function () {
+      const bidRequests = [
+        {
+          params: {placementId: '0'},
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [336, 280]],
+            },
+          },
+        },
+        {
+          params: {placementId: '1'},
+          mediaTypes: {
+            banner: {
+              sizes: [[336, 280]],
+            },
+          },
+        },
+        {
+          // It doesn't actually exist.
+          params: {placementId: '2'},
+          mediaTypes: {
+            banner: {
+            },
+          },
+        },
+        {
+          params: {placementId: '3'},
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [[1280, 720], [1920, 1080]],
+            },
+          },
+        },
+        {
+          params: {placementId: '4'},
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [1920, 1080],
+            },
+          },
+        },
+        {
+          params: {placementId: '5'},
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+            },
+          },
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      it('parameter sz has more than one size on banner requests', function () {
+        expect(request[0].data.sz).to.equal('300x250,336x280');
+        expect(request[1].data.sz).to.equal('336x280');
+        expect(request[2].data.sz).to.equal('');
+        expect(request[3].data).to.not.have.property('sz');
+        expect(request[4].data).to.not.have.property('sz');
+        expect(request[5].data).to.not.have.property('sz');
+      });
+
+      it('width and height should be set as separate parameters on outstream requests', function () {
+        expect(request[0].data).to.not.have.property('w');
+        expect(request[0].data).to.not.have.property('h');
+        expect(request[1].data).to.not.have.property('w');
+        expect(request[1].data).to.not.have.property('h');
+        expect(request[2].data).to.not.have.property('w');
+        expect(request[2].data).to.not.have.property('h');
+        expect(request[3].data.w).to.equal(1280);
+        expect(request[3].data.h).to.equal(720);
+        expect(request[4].data.w).to.equal(1920);
+        expect(request[4].data.h).to.equal(1080);
+        expect(request[5].data.w).to.equal(DEFAULT_VIDEO_SIZE.w);
+        expect(request[5].data.h).to.equal(DEFAULT_VIDEO_SIZE.h);
+      });
     });
 
-    it('width and height should be set as separate parameters on outstream requests', function () {
-      const bidRequest = Object.assign({}, bidRequests[0]);
-      bidRequest.mediaTypes = {};
-      bidRequest.mediaTypes.video = {context: 'outstream'};
-      const request = spec.buildRequests([bidRequest], bidderRequest);
-      expect(request[0].data.w).to.equal('300');
-      expect(request[0].data.h).to.equal('250');
+    describe('Multiple Format', function () {
+      const bidRequests = [
+        {
+          // It will be treated as a banner.
+          params: {
+            placementId: '0',
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [336, 280]],
+            },
+            video: {
+              context: 'outstream',
+              playerSize: [1920, 1080],
+            },
+          },
+        },
+        {
+          // It will be treated as a video.
+          params: {
+            placementId: '1',
+            playerParams: {},
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [336, 280]],
+            },
+            video: {
+              context: 'outstream',
+              playerSize: [1920, 1080],
+            },
+          },
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      it('parameter sz has more than one size on banner requests', function () {
+        expect(request[0].data.sz).to.equal('300x250,336x280');
+        expect(request[1].data).to.not.have.property('sz');
+      });
+
+      it('width and height should be set as separate parameters on outstream requests', function () {
+        expect(request[0].data).to.not.have.property('w');
+        expect(request[0].data).to.not.have.property('h');
+        expect(request[1].data.w).to.equal(1920);
+        expect(request[1].data.h).to.equal(1080);
+      });
     });
 
-    it('adUnitCode should be sent as uc parameters on any requests', function () {
-      expect(request[0].data.uc).to.equal('adunit-code1');
-      expect(request[1].data.uc).to.equal('adunit-code2');
+    describe('1x1 Format', function () {
+      const bidRequests = [
+        {
+          // It will be treated as a banner.
+          params: {
+            placementId: '0',
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [336, 280]],
+            },
+            video: {
+              context: 'outstream',
+              playerSize: [[1, 1]],
+            },
+          },
+        },
+        {
+          // It will be treated as a video.
+          params: {
+            placementId: '1',
+            playerParams: {},
+            playerSize: [1920, 1080],
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [336, 280]],
+            },
+            video: {
+              context: 'outstream',
+              playerSize: [[1, 1]],
+            },
+          },
+        },
+        {
+          // It will be treated as a video.
+          params: {
+            placementId: '2',
+            playerParams: {},
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [336, 280]],
+            },
+            video: {
+              context: 'outstream',
+              playerSize: [[1, 1]],
+            },
+          },
+        },
+      ];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      it('parameter sz has more than one size on banner requests', function () {
+        expect(request[0].data.sz).to.equal('300x250,336x280');
+        expect(request[1].data).to.not.have.property('sz');
+        expect(request[2].data).to.not.have.property('sz');
+      });
+
+      it('width and height should be set as separate parameters on outstream requests', function () {
+        expect(request[0].data).to.not.have.property('w');
+        expect(request[0].data).to.not.have.property('h');
+        expect(request[1].data.w).to.equal(1920);
+        expect(request[1].data.h).to.equal(1080);
+        expect(request[2].data.w).to.equal(DEFAULT_VIDEO_SIZE.w);
+        expect(request[2].data.h).to.equal(DEFAULT_VIDEO_SIZE.h);
+      });
+    });
+
+    describe('LiveRampID', function () {
+      it('dont send LiveRampID if undefined', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+          },
+          {
+            params: {placementId: '1'},
+            userId: {},
+          },
+          {
+            params: {placementId: '2'},
+            userId: undefined,
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data).to.not.have.property('lr_env');
+        expect(request[1].data).to.not.have.property('lr_env');
+        expect(request[2].data).to.not.have.property('lr_env');
+      });
+
+      it('should send LiveRampID if available', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+            userId: {idl_env: 'idl_env_sample'},
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data.lr_env).to.equal('idl_env_sample');
+      });
+    });
+
+    describe('IMID', function () {
+      it('dont send IMID if undefined', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+          },
+          {
+            params: {placementId: '1'},
+            userId: {},
+          },
+          {
+            params: {placementId: '2'},
+            userId: undefined,
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data).to.not.have.property('imuid');
+        expect(request[1].data).to.not.have.property('imuid');
+        expect(request[2].data).to.not.have.property('imuid');
+      });
+
+      it('should send IMID if available', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+            userId: {imuid: 'imuid_sample'},
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data.imuid).to.equal('imuid_sample');
+      });
+    });
+
+    describe('DAC ID', function () {
+      it('dont send DAC ID if undefined', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+          },
+          {
+            params: {placementId: '1'},
+            userId: {},
+          },
+          {
+            params: {placementId: '2'},
+            userId: undefined,
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data).to.not.have.property('dac_id');
+        expect(request[1].data).to.not.have.property('dac_id');
+        expect(request[2].data).to.not.have.property('dac_id');
+        expect(request[0].data).to.not.have.property('fuuid');
+        expect(request[1].data).to.not.have.property('fuuid');
+        expect(request[2].data).to.not.have.property('fuuid');
+      });
+
+      it('should send DAC ID if available', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+            userId: {dacId: {fuuid: 'fuuid_sample', id: 'dacId_sample'}},
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data.fuuid).to.equal('fuuid_sample');
+        expect(request[0].data.dac_id).to.equal('dacId_sample');
+      });
+    });
+
+    describe('ID5', function () {
+      it('dont send ID5 if undefined', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+          },
+          {
+            params: {placementId: '1'},
+            userId: {},
+          },
+          {
+            params: {placementId: '2'},
+            userId: undefined,
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data).to.not.have.property('id5Id');
+        expect(request[1].data).to.not.have.property('id5Id');
+        expect(request[2].data).to.not.have.property('id5Id');
+      });
+
+      it('should send ID5 if available', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+            userId: {id5id: {uid: 'id5id_sample'}},
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data.id5Id).to.equal('id5id_sample');
+      });
     });
   });
 
@@ -117,7 +487,9 @@ describe('yieldoneBidAdapter', function() {
           'cb': 12892917383,
           'r': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836',
           'uid': '23beaa6af6cdde',
-          't': 'i'
+          't': 'i',
+          'language': 'ja',
+          'screen_size': '1440x900'
         }
       }
     ];
@@ -132,7 +504,10 @@ describe('yieldoneBidAdapter', function() {
         'crid': '2494768',
         'currency': 'JPY',
         'statusMessage': 'Bid available',
-        'dealId': 'P1-FIX-7800-DSP-MON'
+        'dealId': 'P1-FIX-7800-DSP-MON',
+        'adomain': [
+          'www.example.com'
+        ],
       }
     };
 
@@ -148,12 +523,26 @@ describe('yieldoneBidAdapter', function() {
         'netRevenue': true,
         'ttl': 3000,
         'referrer': '',
+        'meta': {
+          'advertiserDomains': [
+            'www.example.com'
+          ]
+        },
         'mediaType': 'banner',
         'ad': '<!-- adtag -->'
       }];
       let result = spec.interpretResponse(serverResponseBanner, bidRequestBanner[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].requestId).to.equal(expectedResponse[0].requestId);
+      expect(result[0].cpm).to.equal(expectedResponse[0].cpm);
+      expect(result[0].width).to.equal(expectedResponse[0].width);
+      expect(result[0].height).to.equal(expectedResponse[0].height);
+      expect(result[0].creativeId).to.equal(expectedResponse[0].creativeId);
+      expect(result[0].dealId).to.equal(expectedResponse[0].dealId);
+      expect(result[0].currency).to.equal(expectedResponse[0].currency);
       expect(result[0].mediaType).to.equal(expectedResponse[0].mediaType);
+      expect(result[0].ad).to.equal(expectedResponse[0].ad);
+      expect(result[0].meta.advertiserDomains[0]).to.equal(expectedResponse[0].meta.advertiserDomains[0]);
     });
 
     let serverResponseVideo = {
@@ -162,7 +551,7 @@ describe('yieldoneBidAdapter', function() {
         'height': 360,
         'width': 640,
         'cpm': 0.0536616,
-        'dealId': 'P1-FIX-766-DSP-MON',
+        'dealId': 'P1-FIX-7800-DSP-MON',
         'crid': '2494768',
         'currency': 'JPY',
         'statusMessage': 'Bid available',
@@ -182,7 +571,9 @@ describe('yieldoneBidAdapter', function() {
           'cb': 12892917383,
           'r': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836',
           'uid': '23beaa6af6cdde',
-          't': 'i'
+          't': 'i',
+          'language': 'ja',
+          'screen_size': '1440x900'
         }
       }
     ];
@@ -198,7 +589,10 @@ describe('yieldoneBidAdapter', function() {
         'currency': 'JPY',
         'netRevenue': true,
         'ttl': 3000,
-        'referrer': '',
+        'referrer': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836',
+        'meta': {
+          'advertiserDomains': []
+        },
         'mediaType': 'video',
         'vastXml': '<!-- vast -->',
         'renderer': {
@@ -208,9 +602,19 @@ describe('yieldoneBidAdapter', function() {
       }];
       let result = spec.interpretResponse(serverResponseVideo, bidRequestVideo[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].requestId).to.equal(expectedResponse[0].requestId);
+      expect(result[0].cpm).to.equal(expectedResponse[0].cpm);
+      expect(result[0].width).to.equal(expectedResponse[0].width);
+      expect(result[0].height).to.equal(expectedResponse[0].height);
+      expect(result[0].creativeId).to.equal(expectedResponse[0].creativeId);
+      expect(result[0].dealId).to.equal(expectedResponse[0].dealId);
+      expect(result[0].currency).to.equal(expectedResponse[0].currency);
+      expect(result[0].vastXml).to.equal(expectedResponse[0].vastXml);
       expect(result[0].mediaType).to.equal(expectedResponse[0].mediaType);
+      expect(result[0].referrer).to.equal(expectedResponse[0].referrer);
       expect(result[0].renderer.id).to.equal(expectedResponse[0].renderer.id);
       expect(result[0].renderer.url).to.equal(expectedResponse[0].renderer.url);
+      expect(result[0].meta.advertiserDomains[0]).to.equal(expectedResponse[0].meta.advertiserDomains[0]);
     });
 
     it('handles empty bid response', function () {
diff --git a/test/spec/modules/yuktamediaAnalyticsAdapter_spec.js b/test/spec/modules/yuktamediaAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..e8eb4ab73be
--- /dev/null
+++ b/test/spec/modules/yuktamediaAnalyticsAdapter_spec.js
@@ -0,0 +1,713 @@
+import yuktamediaAnalyticsAdapter from 'modules/yuktamediaAnalyticsAdapter.js';
+import { expect } from 'chai';
+let events = require('src/events');
+let constants = require('src/constants.json');
+
+let prebidAuction = {
+  'auctionInit': {
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+    'timestamp': 1595850680304,
+  },
+  'bidRequested': {
+    'bidderCode': 'appnexus',
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+    'bidderRequestId': '181df4d465699c',
+    'bids': [
+      {
+        'bidder': 'appnexus',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'userId': {
+          'id5id': { uid: 'ID5-ZHMOxXeRXPe3inZKGD-Lj0g7y8UWdDbsYXQ_n6aWMQ' },
+          'parrableid': '01.1595590997.46d951017bdc272ca50b88dbcfb0545cfc636bec3e3d8c02091fb1b413328fb2fd3baf65cb4114b3f782895fd09f82f02c9042b85b42c4654d08ba06dc77f0ded936c8ea3fc4085b4a99',
+          'pubcid': '100a8bc9-f588-4c22-873e-a721cb68bc34'
+        },
+        'adUnitCode': 'div-gpt-ad-1460505748561-0',
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ],
+        'bidId': '2bccebeda7fbe4',
+        'bidderRequestId': '181df4d465699c',
+        'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      }
+    ],
+    'auctionStart': 1595850680304,
+    'timeout': 1100,
+    'start': 1595850680307
+  },
+  'noBid': {},
+  'bidTimeout': [],
+  'bidResponse': {
+    'bidderCode': 'appnexus',
+    'width': 300,
+    'height': 250,
+    'statusMessage': 'Bid available',
+    'getStatusCode': function () { return 1; },
+    'adId': '3ade442375213f',
+    'requestId': '2bccebeda7fbe4',
+    'mediaType': 'banner',
+    'source': 'client',
+    'cpm': 0.5,
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+    'responseTimestamp': 1595850681254,
+    'requestTimestamp': 1595850680307,
+    'bidder': 'appnexus',
+    'timeToRespond': 947,
+    'size': '300x250',
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_adid': '3ade442375213f',
+      'hb_pb': '0.50',
+      'hb_size': '300x250',
+      'hb_source': 'client',
+      'hb_format': 'banner'
+    }
+  },
+  'auctionEnd': {
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954'
+  },
+  'bidWon': {
+    'bidderCode': 'appnexus',
+    'width': 300,
+    'height': 250,
+    'requestId': '2bccebeda7fbe4',
+    'mediaType': 'banner',
+    'source': 'client',
+    'cpm': 0.5,
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+    'responseTimestamp': 1595850681254,
+    'requestTimestamp': 1595850680307,
+    'bidder': 'appnexus',
+    'timeToRespond': 947,
+    'size': '300x250',
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_adid': '3ade442375213f',
+      'hb_pb': '0.50',
+      'hb_size': '300x250',
+      'hb_source': 'client',
+      'hb_format': 'banner'
+    },
+    'status': 'rendered'
+  }
+};
+
+let prebidNativeAuction = {
+  'auctionInit': {
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'timestamp': 1595589742100,
+  },
+  'bidRequested': {
+    'bidderCode': 'appnexus',
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'tid': 'f9c220eb-e44f-412b-92ff-8c24085ca675',
+    'bids': [
+      {
+        'bidder': 'appnexus',
+        'bid_id': '19a879bd73bc8d',
+        'nativeParams': {
+          'title': {
+            'required': true,
+            'len': 800
+          },
+          'image': {
+            'required': true,
+            'sizes': [
+              989,
+              742
+            ]
+          },
+          'sponsoredBy': {
+            'required': true
+          }
+        },
+        'mediaTypes': {
+          'native': {
+            'title': {
+              'required': true,
+              'len': 800
+            },
+            'image': {
+              'required': true,
+              'sizes': [
+                989,
+                742
+              ]
+            },
+            'sponsoredBy': {
+              'required': true
+            }
+          }
+        },
+        'adUnitCode': '/19968336/prebid_native_example_1',
+        'sizes': [],
+        'bidId': '19a879bd73bc8d',
+        'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+        'src': 's2s',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 0,
+        'bidderWinsCount': 0
+      },
+      {
+        'bidder': 'appnexus',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'div-gpt-ad-1460505748561-0',
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ],
+        'bidId': '28f8cc7d10f2db',
+        'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+        'src': 's2s',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 2,
+        'bidderWinsCount': 0
+      }
+    ],
+    'auctionStart': 1595589742100,
+    'timeout': 1000,
+    'src': 's2s',
+    'start': 1595589742108
+  },
+  'bidRequested1': {
+    'bidderCode': 'ix',
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'bidderRequestId': '5e64168f3654af',
+    'bids': [
+      {
+        'bidder': 'ix',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'dfp-ad-rightrail_top',
+        'sizes': [[300, 250]],
+        'bidId': '9424dea605368f',
+        'bidderRequestId': '5e64168f3654af',
+        'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+        'src': 's2s'
+      }
+    ],
+    'auctionStart': 1595589742100,
+    'timeout': 1000,
+    'src': 's2s',
+    'start': 1595589742108
+  },
+  'noBid': {
+    'bidder': 'ix',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            300,
+            250
+          ]
+        ]
+      }
+    },
+    'adUnitCode': 'dfp-ad-rightrail_top',
+    'transactionId': 'd99d90e0-663a-459d-8c87-4c92ce6a527c',
+    'sizes': [[300, 250]],
+    'bidId': '9424dea605368f',
+    'bidderRequestId': '5e64168f3654af',
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'src': 's2s',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 4,
+    'bidderWinsCount': 0
+  },
+  'bidTimeout': [
+    {
+      'bidId': '28f8cc7d10f2db',
+      'bidder': 'appnexus',
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'auctionId': '86e005fa-1900-4782-b6df-528500f09128'
+    }
+  ],
+  'bidResponse': {
+    'bidderCode': 'appnexus',
+    'statusMessage': 'Bid available',
+    'source': 's2s',
+    'getStatusCode': function () { return 1; },
+    'cpm': 10,
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_pb': '10.00',
+      'hb_adid': '4e756c72ee9044',
+      'hb_size': 'undefinedxundefined',
+      'hb_source': 's2s',
+      'hb_format': 'native',
+      'hb_native_linkurl': 'some_long_url',
+      'hb_native_title': 'This is a Prebid Native Creative',
+      'hb_native_brand': 'Prebid.org'
+    },
+    'native': {
+      'clickUrl': {
+        'url': 'some_long_url'
+      },
+      'impressionTrackers': [
+        'some_long_url'
+      ],
+      'javascriptTrackers': [],
+      'image': {
+        'url': 'some_long_image_path',
+        'width': 989,
+        'height': 742
+      },
+      'title': 'This is a Prebid Native Creative',
+      'sponsoredBy': 'Prebid.org'
+    },
+    'currency': 'USD',
+    'ttl': 60,
+    'netRevenue': true,
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'responseTimestamp': 1595589742827,
+    'requestTimestamp': 1595589742108,
+    'bidder': 'appnexus',
+    'adUnitCode': '/19968336/prebid_native_example_1',
+    'timeToRespond': 719,
+    'size': 'undefinedxundefined'
+  },
+  'auctionEnd': {
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128'
+  },
+  'bidWon': {
+    'bidderCode': 'appnexus',
+    'mediaType': 'native',
+    'source': 's2s',
+    'getStatusCode': function () { return 1; },
+    'cpm': 10,
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_pb': '10.00',
+      'hb_adid': '4e756c72ee9044',
+      'hb_size': 'undefinedxundefined',
+      'hb_source': 's2s',
+      'hb_format': 'native',
+      'hb_native_linkurl': 'some_long_url',
+      'hb_native_title': 'This is a Prebid Native Creative',
+      'hb_native_brand': 'Prebid.org'
+    },
+    'native': {
+      'clickUrl': {
+        'url': 'some_long_url'
+      },
+      'impressionTrackers': [
+        'some_long_url'
+      ],
+      'javascriptTrackers': [],
+      'image': {
+        'url': 'some_long_image_path',
+        'width': 989,
+        'height': 742
+      },
+      'title': 'This is a Prebid Native Creative',
+      'sponsoredBy': 'Prebid.org'
+    },
+    'currency': 'USD',
+    'ttl': 60,
+    'netRevenue': true,
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'responseTimestamp': 1595589742827,
+    'requestTimestamp': 1595589742108,
+    'bidder': 'appnexus',
+    'adUnitCode': '/19968336/prebid_native_example_1',
+    'timeToRespond': 719,
+    'size': 'undefinedxundefined',
+    'status': 'rendered'
+  }
+}
+
+describe('yuktamedia analytics adapter', function () {
+  beforeEach(() => {
+    sinon.stub(events, 'getEvents').returns([]);
+  });
+  afterEach(() => {
+    events.getEvents.restore();
+  });
+
+  describe('enableAnalytics', function () {
+    beforeEach(() => {
+      sinon.spy(yuktamediaAnalyticsAdapter, 'track');
+    });
+    afterEach(() => {
+      yuktamediaAnalyticsAdapter.disableAnalytics();
+      yuktamediaAnalyticsAdapter.track.restore();
+    });
+
+    it('should catch all events 1', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidAuction[constants.EVENTS.AUCTION_INIT]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 2', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidAuction[constants.EVENTS.BID_REQUESTED]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 3', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.NO_BID, prebidAuction[constants.EVENTS.NO_BID]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 4', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidAuction[constants.EVENTS.BID_TIMEOUT]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 5', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidAuction[constants.EVENTS.BID_RESPONSE]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 6', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_END, prebidAuction[constants.EVENTS.AUCTION_END]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch no events if no pubKey and pubId', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+        }
+      });
+
+      events.emit(constants.EVENTS.AUCTION_INIT, {});
+      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(constants.EVENTS.BID_REQUESTED, {});
+      events.emit(constants.EVENTS.BID_RESPONSE, {});
+      events.emit(constants.EVENTS.BID_WON, {});
+
+      sinon.assert.callCount(yuktamediaAnalyticsAdapter.track, 0);
+    });
+
+    it('should catch nobid, timeout and bidwon event events one of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidNativeAuction[constants.EVENTS.AUCTION_INIT]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events two of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidNativeAuction[constants.EVENTS.BID_REQUESTED]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events three of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidNativeAuction[constants.EVENTS.BID_REQUESTED + '1']);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events four of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.NO_BID, prebidNativeAuction[constants.EVENTS.NO_BID]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events five of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidNativeAuction[constants.EVENTS.BID_TIMEOUT]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events six of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidNativeAuction[constants.EVENTS.BID_RESPONSE]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events seven of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_END, prebidNativeAuction[constants.EVENTS.AUCTION_END]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events eight of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_END, prebidNativeAuction[constants.EVENTS.BID_WON]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+  });
+
+  describe('build utm tag data', function () {
+    beforeEach(function () {
+      localStorage.setItem('yuktamediaAnalytics_utm_source', 'prebid');
+      localStorage.setItem('yuktamediaAnalytics_utm_medium', 'ad');
+      localStorage.setItem('yuktamediaAnalytics_utm_campaign', '');
+      localStorage.setItem('yuktamediaAnalytics_utm_term', '');
+      localStorage.setItem('yuktamediaAnalytics_utm_content', '');
+      localStorage.setItem('yuktamediaAnalytics_utm_timeout', Date.now());
+    });
+
+    afterEach(function () {
+      localStorage.clear();
+    });
+
+    it('should build utm data from local storage', function () {
+      let utmTagData = yuktamediaAnalyticsAdapter.buildUtmTagData({
+        pubId: '1',
+        pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+        enableUTMCollection: true,
+        enableSession: true,
+        enableUserIdCollection: true
+      });
+      expect(utmTagData.utm_source).to.equal('prebid');
+      expect(utmTagData.utm_medium).to.equal('ad');
+      expect(utmTagData.utm_campaign).to.equal('');
+      expect(utmTagData.utm_term).to.equal('');
+      expect(utmTagData.utm_content).to.equal('');
+    });
+
+    it('should return empty object for disabled utm setting', function () {
+      let utmTagData = yuktamediaAnalyticsAdapter.buildUtmTagData({
+        pubId: '1',
+        pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+        enableUTMCollection: false,
+        enableSession: true,
+        enableUserIdCollection: true
+      });
+      expect(utmTagData).deep.equal({});
+    });
+  });
+
+  describe('build session information', function () {
+    beforeEach(() => {
+      sinon.spy(yuktamediaAnalyticsAdapter, 'track');
+      localStorage.clear();
+    });
+    afterEach(() => {
+      yuktamediaAnalyticsAdapter.disableAnalytics();
+      yuktamediaAnalyticsAdapter.track.restore();
+      localStorage.clear();
+    });
+
+    it('should create session id in local storage if enabled', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidAuction[constants.EVENTS.AUCTION_INIT]);
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidAuction[constants.EVENTS.BID_REQUESTED]);
+      events.emit(constants.EVENTS.NO_BID, prebidAuction[constants.EVENTS.NO_BID]);
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidAuction[constants.EVENTS.BID_TIMEOUT]);
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidAuction[constants.EVENTS.BID_RESPONSE]);
+      events.emit(constants.EVENTS.AUCTION_END, prebidAuction[constants.EVENTS.AUCTION_END]);
+      expect(localStorage.getItem('yuktamediaAnalytics_session_id')).to.not.equal(null);
+    });
+
+    it('should not create session id in local storage if disabled', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: false,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidAuction[constants.EVENTS.AUCTION_INIT]);
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidAuction[constants.EVENTS.BID_REQUESTED]);
+      events.emit(constants.EVENTS.NO_BID, prebidAuction[constants.EVENTS.NO_BID]);
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidAuction[constants.EVENTS.BID_TIMEOUT]);
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidAuction[constants.EVENTS.BID_RESPONSE]);
+      events.emit(constants.EVENTS.AUCTION_END, prebidAuction[constants.EVENTS.AUCTION_END]);
+      expect(localStorage.getItem('yuktamediaAnalytics_session_id')).to.equal(null);
+    });
+  });
+});
diff --git a/test/spec/modules/yuktamediaAnalyticsAdaptor_spec.js b/test/spec/modules/yuktamediaAnalyticsAdaptor_spec.js
deleted file mode 100644
index 24a524c85c7..00000000000
--- a/test/spec/modules/yuktamediaAnalyticsAdaptor_spec.js
+++ /dev/null
@@ -1,788 +0,0 @@
-import yuktamediaAnalyticsAdapter from 'modules/yuktamediaAnalyticsAdapter.js';
-import { expect } from 'chai';
-import adapterManager from 'src/adapterManager.js';
-import * as utils from 'src/utils.js';
-import { server } from 'test/mocks/xhr.js';
-
-let events = require('src/events');
-let constants = require('src/constants.json');
-
-describe('yuktamedia analytics adapter', function () {
-  beforeEach(function () {
-    sinon.stub(events, 'getEvents').returns([]);
-  });
-
-  afterEach(function () {
-    events.getEvents.restore();
-  });
-
-  describe('track', function () {
-    let initOptions = {
-      pubId: '1',
-      pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT=='
-    };
-
-    let prebidEvent = {
-      'addAdUnits': {},
-      'requestBids': {},
-      'auctionInit': {
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'timestamp': 1576823893836,
-        'auctionStatus': 'inProgress',
-        'adUnits': [
-          {
-            'code': 'div-gpt-ad-1460505748561-0',
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                }
-              }
-            ],
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98'
-          }
-        ],
-        'adUnitCodes': [
-          'div-gpt-ad-1460505748561-0'
-        ],
-        'bidderRequests': [
-          {
-            'bidderCode': 'appnexus',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'bidderRequestId': '155975c76e13b1',
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                },
-                'mediaTypes': {
-                  'banner': {
-                    'sizes': [
-                      [
-                        300,
-                        250
-                      ],
-                      [
-                        300,
-                        600
-                      ]
-                    ]
-                  }
-                },
-                'adUnitCode': 'div-gpt-ad-1460505748561-0',
-                'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '263efc09896d0c',
-                'bidderRequestId': '155975c76e13b1',
-                'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-                'src': 'client',
-                'bidRequestsCount': 1,
-                'bidderRequestsCount': 1,
-                'bidderWinsCount': 0
-              }
-            ],
-            'auctionStart': 1576823893836,
-            'timeout': 1000,
-            'refererInfo': {
-              'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-              'reachedTop': true,
-              'numIframes': 0,
-              'stack': [
-                'http://observer.com/integrationExamples/gpt/hello_world.html'
-              ]
-            },
-            'start': 1576823893838
-          }
-        ],
-        'noBids': [],
-        'bidsReceived': [],
-        'winningBids': [],
-        'timeout': 1000
-      },
-      'bidRequested': {
-        'bidderCode': 'appnexus',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'bidderRequestId': '155975c76e13b1',
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
-            },
-            'crumbs': {
-              'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-            },
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'adUnitCode': 'div-gpt-ad-1460505748561-0',
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'bidId': '263efc09896d0c',
-            'bidderRequestId': '155975c76e13b1',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'src': 'client',
-            'bidRequestsCount': 1,
-            'bidderRequestsCount': 1,
-            'bidderWinsCount': 0
-          }
-        ],
-        'auctionStart': 1576823893836,
-        'timeout': 1000,
-        'refererInfo': {
-          'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-          'reachedTop': true,
-          'numIframes': 0,
-          'stack': [
-            'http://observer.com/integrationExamples/gpt/hello_world.html'
-          ]
-        },
-        'start': 1576823893838
-      },
-      'bidAdjustment': {
-        'bidderCode': 'appnexus',
-        'width': 300,
-        'height': 250,
-        'statusMessage': 'Bid available',
-        'adId': '393976d8770041',
-        'requestId': '263efc09896d0c',
-        'mediaType': 'banner',
-        'source': 'client',
-        'cpm': 0.5,
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'netRevenue': true,
-        'ttl': 300,
-        'adUnitCode': 'div-gpt-ad-1460505748561-0',
-        'appnexus': {
-          'buyerMemberId': 9325
-        },
-        'meta': {
-          'advertiserId': 2529885
-        },
-        'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
-        'originalCpm': 0.5,
-        'originalCurrency': 'USD',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'responseTimestamp': 1576823894050,
-        'requestTimestamp': 1576823893838,
-        'bidder': 'appnexus',
-        'timeToRespond': 212
-      },
-      'bidTimeout': [
-      ],
-      'bidResponse': {
-        'bidderCode': 'appnexus',
-        'width': 300,
-        'height': 250,
-        'statusMessage': 'Bid available',
-        'adId': '393976d8770041',
-        'requestId': '263efc09896d0c',
-        'mediaType': 'banner',
-        'source': 'client',
-        'cpm': 0.5,
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'netRevenue': true,
-        'ttl': 300,
-        'adUnitCode': 'div-gpt-ad-1460505748561-0',
-        'appnexus': {
-          'buyerMemberId': 9325
-        },
-        'meta': {
-          'advertiserId': 2529885
-        },
-        'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
-        'originalCpm': 0.5,
-        'originalCurrency': 'USD',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'responseTimestamp': 1576823894050,
-        'requestTimestamp': 1576823893838,
-        'bidder': 'appnexus',
-        'timeToRespond': 212,
-        'pbLg': '0.50',
-        'pbMg': '0.50',
-        'pbHg': '0.50',
-        'pbAg': '0.50',
-        'pbDg': '0.50',
-        'pbCg': '',
-        'size': '300x250',
-        'adserverTargeting': {
-          'hb_bidder': 'appnexus',
-          'hb_adid': '393976d8770041',
-          'hb_pb': '0.50',
-          'hb_size': '300x250',
-          'hb_source': 'client',
-          'hb_format': 'banner'
-        }
-      },
-      'auctionEnd': {
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'timestamp': 1576823893836,
-        'auctionEnd': 1576823894054,
-        'auctionStatus': 'completed',
-        'adUnits': [
-          {
-            'code': 'div-gpt-ad-1460505748561-0',
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                }
-              }
-            ],
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98'
-          }
-        ],
-        'adUnitCodes': [
-          'div-gpt-ad-1460505748561-0'
-        ],
-        'bidderRequests': [
-          {
-            'bidderCode': 'appnexus',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'bidderRequestId': '155975c76e13b1',
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                },
-                'mediaTypes': {
-                  'banner': {
-                    'sizes': [
-                      [
-                        300,
-                        250
-                      ],
-                      [
-                        300,
-                        600
-                      ]
-                    ]
-                  }
-                },
-                'adUnitCode': 'div-gpt-ad-1460505748561-0',
-                'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '263efc09896d0c',
-                'bidderRequestId': '155975c76e13b1',
-                'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-                'src': 'client',
-                'bidRequestsCount': 1,
-                'bidderRequestsCount': 1,
-                'bidderWinsCount': 0
-              }
-            ],
-            'auctionStart': 1576823893836,
-            'timeout': 1000,
-            'refererInfo': {
-              'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-              'reachedTop': true,
-              'numIframes': 0,
-              'stack': [
-                'http://observer.com/integrationExamples/gpt/hello_world.html'
-              ]
-            },
-            'start': 1576823893838
-          }
-        ],
-        'noBids': [],
-        'bidsReceived': [
-          {
-            'bidderCode': 'appnexus',
-            'width': 300,
-            'height': 250,
-            'statusMessage': 'Bid available',
-            'adId': '393976d8770041',
-            'requestId': '263efc09896d0c',
-            'mediaType': 'banner',
-            'source': 'client',
-            'cpm': 0.5,
-            'creativeId': 96846035,
-            'currency': 'USD',
-            'netRevenue': true,
-            'ttl': 300,
-            'adUnitCode': 'div-gpt-ad-1460505748561-0',
-            'appnexus': {
-              'buyerMemberId': 9325
-            },
-            'meta': {
-              'advertiserId': 2529885
-            },
-            'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
-            'originalCpm': 0.5,
-            'originalCurrency': 'USD',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'responseTimestamp': 1576823894050,
-            'requestTimestamp': 1576823893838,
-            'bidder': 'appnexus',
-            'timeToRespond': 212,
-            'pbLg': '0.50',
-            'pbMg': '0.50',
-            'pbHg': '0.50',
-            'pbAg': '0.50',
-            'pbDg': '0.50',
-            'pbCg': '',
-            'size': '300x250',
-            'adserverTargeting': {
-              'hb_bidder': 'appnexus',
-              'hb_adid': '393976d8770041',
-              'hb_pb': '0.50',
-              'hb_size': '300x250',
-              'hb_source': 'client',
-              'hb_format': 'banner'
-            }
-          }
-        ],
-        'winningBids': [],
-        'timeout': 1000
-      },
-      'setTargeting': {
-        'div-gpt-ad-1460505748561-0': {
-          'hb_format': 'banner',
-          'hb_source': 'client',
-          'hb_size': '300x250',
-          'hb_pb': '0.50',
-          'hb_adid': '393976d8770041',
-          'hb_bidder': 'appnexus',
-          'hb_format_appnexus': 'banner',
-          'hb_source_appnexus': 'client',
-          'hb_size_appnexus': '300x250',
-          'hb_pb_appnexus': '0.50',
-          'hb_adid_appnexus': '393976d8770041',
-          'hb_bidder_appnexus': 'appnexus'
-        }
-      },
-      'bidderDone': {
-        'bidderCode': 'appnexus',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'bidderRequestId': '155975c76e13b1',
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
-            },
-            'crumbs': {
-              'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-            },
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'adUnitCode': 'div-gpt-ad-1460505748561-0',
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'bidId': '263efc09896d0c',
-            'bidderRequestId': '155975c76e13b1',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'src': 'client',
-            'bidRequestsCount': 1,
-            'bidderRequestsCount': 1,
-            'bidderWinsCount': 0
-          }
-        ],
-        'auctionStart': 1576823893836,
-        'timeout': 1000,
-        'refererInfo': {
-          'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-          'reachedTop': true,
-          'numIframes': 0,
-          'stack': [
-            'http://observer.com/integrationExamples/gpt/hello_world.html'
-          ]
-        },
-        'start': 1576823893838
-      },
-      'bidWon': {
-        'bidderCode': 'appnexus',
-        'width': 300,
-        'height': 250,
-        'statusMessage': 'Bid available',
-        'adId': '393976d8770041',
-        'requestId': '263efc09896d0c',
-        'mediaType': 'banner',
-        'source': 'client',
-        'cpm': 0.5,
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'netRevenue': true,
-        'ttl': 300,
-        'adUnitCode': 'div-gpt-ad-1460505748561-0',
-        'appnexus': {
-          'buyerMemberId': 9325
-        },
-        'meta': {
-          'advertiserId': 2529885
-        },
-        'ad': '<!-- Creative 96846035 served by Member 9325 via AppNexus -->',
-        'originalCpm': 0.5,
-        'originalCurrency': 'USD',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'responseTimestamp': 1576823894050,
-        'requestTimestamp': 1576823893838,
-        'bidder': 'appnexus',
-        'timeToRespond': 212,
-        'pbLg': '0.50',
-        'pbMg': '0.50',
-        'pbHg': '0.50',
-        'pbAg': '0.50',
-        'pbDg': '0.50',
-        'pbCg': '',
-        'size': '300x250',
-        'adserverTargeting': {
-          'hb_bidder': 'appnexus',
-          'hb_adid': '393976d8770041',
-          'hb_pb': '0.50',
-          'hb_size': '300x250',
-          'hb_source': 'client',
-          'hb_format': 'banner'
-        },
-        'status': 'rendered',
-        'params': [
-          {
-            'placementId': 13144370
-          }
-        ]
-      }
-    };
-    let location = utils.getWindowLocation();
-
-    let expectedAfterBid = {
-      'bids': [
-        {
-          'adUnitCode': 'div-gpt-ad-1460505748561-0',
-          'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-          'bidId': '263efc09896d0c',
-          'bidderCode': 'appnexus',
-          'cpm': 0.5,
-          'creativeId': 96846035,
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'renderStatus': 2,
-          'requestId': '155975c76e13b1',
-          'requestTimestamp': 1576823893838,
-          'responseTimestamp': 1576823894050,
-          'sizes': '300x250,300x600',
-          'statusMessage': 'Bid available',
-          'timeToRespond': 212
-        }
-      ],
-      'auctionInit': {
-        'host': location.host,
-        'path': location.pathname,
-        'search': location.search,
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'timestamp': 1576823893836,
-        'auctionStatus': 'inProgress',
-        'adUnits': [
-          {
-            'code': 'div-gpt-ad-1460505748561-0',
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                }
-              }
-            ],
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98'
-          }
-        ],
-        'adUnitCodes': [
-          'div-gpt-ad-1460505748561-0'
-        ],
-        'bidderRequests': [
-          {
-            'bidderCode': 'appnexus',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'bidderRequestId': '155975c76e13b1',
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                },
-                'mediaTypes': {
-                  'banner': {
-                    'sizes': [
-                      [
-                        300,
-                        250
-                      ],
-                      [
-                        300,
-                        600
-                      ]
-                    ]
-                  }
-                },
-                'adUnitCode': 'div-gpt-ad-1460505748561-0',
-                'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '263efc09896d0c',
-                'bidderRequestId': '155975c76e13b1',
-                'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-                'src': 'client',
-                'bidRequestsCount': 1,
-                'bidderRequestsCount': 1,
-                'bidderWinsCount': 0
-              }
-            ],
-            'auctionStart': 1576823893836,
-            'timeout': 1000,
-            'refererInfo': {
-              'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-              'reachedTop': true,
-              'numIframes': 0,
-              'stack': [
-                'http://observer.com/integrationExamples/gpt/hello_world.html'
-              ]
-            },
-            'start': 1576823893838
-          }
-        ],
-        'noBids': [],
-        'bidsReceived': [],
-        'winningBids': [],
-        'timeout': 1000,
-        'config': initOptions
-      },
-      'initOptions': initOptions
-    };
-
-    let expectedAfterBidWon = {
-      'bidWon': {
-        'bidderCode': 'appnexus',
-        'bidId': '263efc09896d0c',
-        'adUnitCode': 'div-gpt-ad-1460505748561-0',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'cpm': 0.5,
-        'netRevenue': true,
-        'renderedSize': '300x250',
-        'mediaType': 'banner',
-        'statusMessage': 'Bid available',
-        'status': 'rendered',
-        'renderStatus': 4,
-        'timeToRespond': 212,
-        'requestTimestamp': 1576823893838,
-        'responseTimestamp': 1576823894050
-      },
-      'initOptions': {
-        'pubId': '1',
-        'pubKey': 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT=='
-      }
-    }
-
-    adapterManager.registerAnalyticsAdapter({
-      code: 'yuktamedia',
-      adapter: yuktamediaAnalyticsAdapter
-    });
-
-    beforeEach(function () {
-      adapterManager.enableAnalytics({
-        provider: 'yuktamedia',
-        options: initOptions
-      });
-    });
-
-    afterEach(function () {
-      yuktamediaAnalyticsAdapter.disableAnalytics();
-    });
-
-    it('builds and sends auction data', function () {
-      // Step 1: Send auction init event
-      events.emit(constants.EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
-
-      // Step 2: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
-
-      // Step 3: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
-
-      // Step 4: Send bid time out event
-      events.emit(constants.EVENTS.BID_TIMEOUT, prebidEvent['bidTimeout']);
-
-      // Step 5: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, prebidEvent['auctionEnd']);
-
-      expect(server.requests.length).to.equal(1);
-
-      let realAfterBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(realAfterBid).to.deep.equal(expectedAfterBid);
-
-      // Step 6: Send auction bid won event
-      events.emit(constants.EVENTS.BID_WON, prebidEvent['bidWon']);
-
-      expect(server.requests.length).to.equal(2);
-
-      let winEventData = JSON.parse(server.requests[1].requestBody);
-
-      expect(winEventData).to.deep.equal(expectedAfterBidWon);
-    });
-  });
-});
diff --git a/test/spec/modules/zedoBidAdapter_spec.js b/test/spec/modules/zedoBidAdapter_spec.js
deleted file mode 100644
index 8e5a789656e..00000000000
--- a/test/spec/modules/zedoBidAdapter_spec.js
+++ /dev/null
@@ -1,354 +0,0 @@
-import { expect } from 'chai';
-import { spec } from 'modules/zedoBidAdapter';
-
-describe('The ZEDO bidding adapter', function () {
-  describe('isBidRequestValid', function () {
-    it('should return false when given an invalid bid', function () {
-      const bid = {
-        bidder: 'zedo',
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(false);
-    });
-
-    it('should return true when given a channelcode bid', function () {
-      const bid = {
-        bidder: 'zedo',
-        params: {
-          channelCode: 20000000,
-          dimId: 9
-        },
-      };
-      const isValid = spec.isBidRequestValid(bid);
-      expect(isValid).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    const bidderRequest = {
-      timeout: 3000,
-    };
-
-    it('should properly build a channelCode request for dim Id with type not defined', function () {
-      const bidRequests = [
-        {
-          bidder: 'zedo',
-          adUnitCode: 'p12345',
-          transactionId: '12345667',
-          sizes: [[300, 200]],
-          params: {
-            channelCode: 20000000,
-            dimId: 10,
-            pubId: 1
-          },
-        },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/saxp.zedo.com\/asw\/fmh.json/);
-      expect(request.method).to.equal('GET');
-      const zedoRequest = request.data;
-      expect(zedoRequest).to.equal('g={"placements":[{"network":20,"channel":0,"publisher":1,"width":300,"height":200,"dimension":10,"version":"$prebid.version$","keyword":"","transactionId":"12345667","renderers":[{"name":"display"}]}]}');
-    });
-
-    it('should properly build a channelCode request for video with type defined', function () {
-      const bidRequests = [
-        {
-          bidder: 'zedo',
-          adUnitCode: 'p12345',
-          transactionId: '12345667',
-          sizes: [640, 480],
-          mediaTypes: {
-            video: {
-              context: 'instream',
-            },
-          },
-          params: {
-            channelCode: 20000000,
-            dimId: 85
-          },
-        },
-      ];
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.url).to.match(/^https:\/\/saxp.zedo.com\/asw\/fmh.json/);
-      expect(request.method).to.equal('GET');
-      const zedoRequest = request.data;
-      expect(zedoRequest).to.equal('g={"placements":[{"network":20,"channel":0,"publisher":0,"width":640,"height":480,"dimension":85,"version":"$prebid.version$","keyword":"","transactionId":"12345667","renderers":[{"name":"Inarticle"}]}]}');
-    });
-
-    describe('buildGDPRRequests', function () {
-      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
-      const bidderRequest = {
-        timeout: 3000,
-        gdprConsent: {
-          'consentString': consentString,
-          'gdprApplies': true
-        }
-      };
-
-      it('should properly build request with gdpr consent', function () {
-        const bidRequests = [
-          {
-            bidder: 'zedo',
-            adUnitCode: 'p12345',
-            transactionId: '12345667',
-            sizes: [[300, 200]],
-            params: {
-              channelCode: 20000000,
-              dimId: 10
-            },
-          },
-        ];
-        const request = spec.buildRequests(bidRequests, bidderRequest);
-        expect(request.method).to.equal('GET');
-        const zedoRequest = request.data;
-        expect(zedoRequest).to.equal('g={"placements":[{"network":20,"channel":0,"publisher":0,"width":300,"height":200,"dimension":10,"version":"$prebid.version$","keyword":"","transactionId":"12345667","renderers":[{"name":"display"}]}],"gdpr":1,"gdpr_consent":"BOJ8RZsOJ8RZsABAB8AAAAAZ+A=="}');
-      });
-    });
-  });
-  describe('interpretResponse', function () {
-    it('should return an empty array when there is bid response', function () {
-      const response = {};
-      const request = { bidRequests: [] };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('should properly parse a bid response with no valid creative', function () {
-      const response = {
-        body: {
-          ad: [
-            {
-              'slotId': 'ad1d762',
-              'network': '2000',
-              'creatives': [
-                {
-                  'adId': '12345',
-                  'height': '600',
-                  'width': '160',
-                  'isFoc': true,
-                  'creativeDetails': {
-                    'type': 'StdBanner',
-                    'adContent': {
-                      'focImage': {
-                        'url': 'https://c13.zedo.com/OzoDB/0/0/0/blank.gif',
-                        'target': '_blank',
-                      }
-                    }
-                  },
-                  'cpm': '0'
-                }
-              ]
-            }
-          ]
-        }
-      };
-      const request = {
-        bidRequests: [{
-          bidder: 'zedo',
-          adUnitCode: 'p12345',
-          bidId: 'test-bidId',
-          params: {
-            channelCode: 2000000,
-            dimId: 9
-          }
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('should properly parse a bid response with valid display creative', function () {
-      const response = {
-        body: {
-          ad: [
-            {
-              'slotId': 'ad1d762',
-              'network': '2000',
-              'creatives': [
-                {
-                  'adId': '12345',
-                  'height': '600',
-                  'width': '160',
-                  'isFoc': true,
-                  'creativeDetails': {
-                    'type': 'StdBanner',
-                    'adContent': '<a href="some_path"></a>'
-                  },
-                  'bidCpm': '720000'
-                }
-              ]
-            }
-          ]
-        }
-      };
-      const request = {
-        bidRequests: [{
-          bidder: 'zedo',
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          params: {
-            channelCode: 2000000,
-            dimId: 9
-          },
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('ad1d762');
-      expect(bids[0].cpm).to.equal(0.72);
-      expect(bids[0].width).to.equal('160');
-      expect(bids[0].height).to.equal('600');
-    });
-
-    it('should properly parse a bid response with valid video creative', function () {
-      const response = {
-        body: {
-          ad: [
-            {
-              'slotId': 'ad1d762',
-              'network': '2000',
-              'creatives': [
-                {
-                  'adId': '12345',
-                  'height': '480',
-                  'width': '640',
-                  'isFoc': true,
-                  'creativeDetails': {
-                    'type': 'VAST',
-                    'adContent': '<VAST></VAST>'
-                  },
-                  'bidCpm': '780000'
-                }
-              ]
-            }
-          ]
-        }
-      };
-      const request = {
-        bidRequests: [{
-          bidder: 'zedo',
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          params: {
-            channelCode: 2000000,
-            dimId: 85
-          },
-        }]
-      };
-
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(1);
-      expect(bids[0].requestId).to.equal('ad1d762');
-      expect(bids[0].cpm).to.equal(0.78);
-      expect(bids[0].width).to.equal('640');
-      expect(bids[0].height).to.equal('480');
-      expect(bids[0].adType).to.equal('VAST');
-      expect(bids[0].vastXml).to.not.equal('');
-      expect(bids[0].ad).to.be.an('undefined');
-      expect(bids[0].renderer).not.to.be.an('undefined');
-    });
-  });
-
-  describe('user sync', function () {
-    it('should register the iframe sync url', function () {
-      let syncs = spec.getUserSyncs({
-        iframeEnabled: true
-      });
-      expect(syncs).to.not.be.an('undefined');
-      expect(syncs).to.have.lengthOf(1);
-      expect(syncs[0].type).to.equal('iframe');
-    });
-
-    it('should pass gdpr params', function () {
-      let syncs = spec.getUserSyncs({ iframeEnabled: true }, {}, {
-        gdprApplies: false, consentString: 'test'
-      });
-      expect(syncs).to.not.be.an('undefined');
-      expect(syncs).to.have.lengthOf(1);
-      expect(syncs[0].type).to.equal('iframe');
-      expect(syncs[0].url).to.contains('gdpr=0');
-    });
-  });
-
-  describe('bid events', function () {
-    it('should trigger a win pixel', function () {
-      const bid = {
-        'bidderCode': 'zedo',
-        'width': '300',
-        'height': '250',
-        'statusMessage': 'Bid available',
-        'adId': '148018fe5e',
-        'cpm': 0.5,
-        'ad': 'dummy data',
-        'ad_id': '12345',
-        'sizeId': '15',
-        'adResponse':
-          {
-            'creatives': [
-              {
-                'adId': '12345',
-                'height': '480',
-                'width': '640',
-                'isFoc': true,
-                'creativeDetails': {
-                  'type': 'VAST',
-                  'adContent': '<VAST></VAST>'
-                },
-                'seeder': {
-                  'network': 1234,
-                  'servedChan': 1234567,
-                },
-                'cpm': '1200000',
-                'servedChan': 1234,
-              }]
-          },
-        'params': [{
-          'channelCode': '123456',
-          'dimId': '85'
-        }],
-        'requestTimestamp': 1540401686,
-        'responseTimestamp': 1540401687,
-        'timeToRespond': 6253,
-        'pbLg': '0.50',
-        'pbMg': '0.50',
-        'pbHg': '0.53',
-        'adUnitCode': '/123456/header-bid-tag-0',
-        'bidder': 'zedo',
-        'size': '300x250',
-        'adserverTargeting': {
-          'hb_bidder': 'zedo',
-          'hb_adid': '148018fe5e',
-          'hb_pb': '10.00',
-        }
-      };
-      spec.onBidWon(bid);
-      spec.onTimeout(bid);
-    });
-    it('should trigger a timeout pixel', function () {
-      const bid = {
-        'bidderCode': 'zedo',
-        'width': '300',
-        'height': '250',
-        'statusMessage': 'Bid available',
-        'adId': '148018fe5e',
-        'cpm': 0.5,
-        'ad': 'dummy data',
-        'ad_id': '12345',
-        'sizeId': '15',
-        'params': [{
-          'channelCode': '123456',
-          'dimId': '85'
-        }],
-        'timeout': 1,
-        'requestTimestamp': 1540401686,
-        'responseTimestamp': 1540401687,
-        'timeToRespond': 6253,
-        'adUnitCode': '/123456/header-bid-tag-0',
-        'bidder': 'zedo',
-        'size': '300x250',
-      };
-      spec.onBidWon(bid);
-      spec.onTimeout(bid);
-    });
-  });
-});
diff --git a/test/spec/modules/zeotapIdPlusIdSystem_spec.js b/test/spec/modules/zeotapIdPlusIdSystem_spec.js
new file mode 100644
index 00000000000..6494a7cbfef
--- /dev/null
+++ b/test/spec/modules/zeotapIdPlusIdSystem_spec.js
@@ -0,0 +1,195 @@
+import { expect } from 'chai';
+import {find} from 'src/polyfill.js';
+import { config } from 'src/config.js';
+import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
+import { storage, getStorage, zeotapIdPlusSubmodule } from 'modules/zeotapIdPlusIdSystem.js';
+import * as storageManager from 'src/storageManager.js';
+
+const ZEOTAP_COOKIE_NAME = 'IDP';
+const ZEOTAP_COOKIE = 'THIS-IS-A-DUMMY-COOKIE';
+const ENCODED_ZEOTAP_COOKIE = btoa(JSON.stringify(ZEOTAP_COOKIE));
+
+function getConfigMock() {
+  return {
+    userSync: {
+      syncDelay: 0,
+      userIds: [{
+        name: 'zeotapIdPlus'
+      }]
+    }
+  }
+}
+
+function getAdUnitMock(code = 'adUnit-code') {
+  return {
+    code,
+    mediaTypes: {banner: {}, native: {}},
+    sizes: [
+      [300, 200],
+      [300, 600]
+    ],
+    bids: [{
+      bidder: 'sampleBidder',
+      params: { placementId: 'banner-only-bidder' }
+    }]
+  };
+}
+
+function unsetCookie() {
+  storage.setCookie(ZEOTAP_COOKIE_NAME, '');
+}
+
+function unsetLocalStorage() {
+  storage.setDataInLocalStorage(ZEOTAP_COOKIE_NAME, '');
+}
+
+describe('Zeotap ID System', function() {
+  describe('Zeotap Module invokes StorageManager with appropriate arguments', function() {
+    let getStorageManagerSpy;
+
+    beforeEach(function() {
+      getStorageManagerSpy = sinon.spy(storageManager, 'getStorageManager');
+    });
+
+    it('when a stored Zeotap ID exists it is added to bids', function() {
+      let store = getStorage();
+      expect(getStorageManagerSpy.calledOnce).to.be.true;
+      sinon.assert.calledWith(getStorageManagerSpy, {gvlid: 301, moduleName: 'zeotapIdPlus'});
+    });
+  });
+
+  describe('test method: getId calls storage methods to fetch ID', function() {
+    let cookiesAreEnabledStub;
+    let getCookieStub;
+    let localStorageIsEnabledStub;
+    let getDataFromLocalStorageStub;
+
+    beforeEach(() => {
+      cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+      getCookieStub = sinon.stub(storage, 'getCookie');
+      localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(() => {
+      storage.cookiesAreEnabled.restore();
+      storage.getCookie.restore();
+      storage.localStorageIsEnabled.restore();
+      storage.getDataFromLocalStorage.restore();
+      unsetCookie();
+      unsetLocalStorage();
+    });
+
+    it('should check if cookies are enabled', function() {
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+    });
+
+    it('should call getCookie if cookies are enabled', function() {
+      cookiesAreEnabledStub.returns(true);
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+      expect(getCookieStub.calledOnce).to.be.true;
+      sinon.assert.calledWith(getCookieStub, 'IDP');
+    });
+
+    it('should check for localStorage if cookies are disabled', function() {
+      cookiesAreEnabledStub.returns(false);
+      localStorageIsEnabledStub.returns(true)
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+      expect(getCookieStub.called).to.be.false;
+      expect(localStorageIsEnabledStub.calledOnce).to.be.true;
+      expect(getDataFromLocalStorageStub.calledOnce).to.be.true;
+      sinon.assert.calledWith(getDataFromLocalStorageStub, 'IDP');
+    });
+  });
+
+  describe('test method: getId', function() {
+    afterEach(() => {
+      unsetCookie();
+      unsetLocalStorage();
+    });
+
+    it('provides the stored Zeotap id if a cookie exists', function() {
+      storage.setCookie(ZEOTAP_COOKIE_NAME, ENCODED_ZEOTAP_COOKIE);
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(id).to.deep.equal({
+        id: ENCODED_ZEOTAP_COOKIE
+      });
+    });
+
+    it('provides the stored Zeotap id if cookie is absent but present in local storage', function() {
+      storage.setDataInLocalStorage(ZEOTAP_COOKIE_NAME, ENCODED_ZEOTAP_COOKIE);
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(id).to.deep.equal({
+        id: ENCODED_ZEOTAP_COOKIE
+      });
+    });
+
+    it('returns undefined if both cookie and local storage are empty', function() {
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(id).to.be.undefined
+    })
+  });
+
+  describe('test method: decode', function() {
+    it('provides the Zeotap ID (IDP) from a stored object', function() {
+      let zeotapId = {
+        id: ENCODED_ZEOTAP_COOKIE,
+      };
+
+      expect(zeotapIdPlusSubmodule.decode(zeotapId)).to.deep.equal({
+        IDP: ZEOTAP_COOKIE
+      });
+    });
+
+    it('provides the Zeotap ID (IDP) from a stored string', function() {
+      let zeotapId = ENCODED_ZEOTAP_COOKIE;
+
+      expect(zeotapIdPlusSubmodule.decode(zeotapId)).to.deep.equal({
+        IDP: ZEOTAP_COOKIE
+      });
+    });
+  });
+
+  describe('requestBids hook', function() {
+    let adUnits;
+
+    beforeEach(function() {
+      adUnits = [getAdUnitMock()];
+      storage.setCookie(
+        ZEOTAP_COOKIE_NAME,
+        ENCODED_ZEOTAP_COOKIE
+      );
+      init(config);
+      setSubmoduleRegistry([zeotapIdPlusSubmodule]);
+      config.setConfig(getConfigMock());
+    });
+
+    afterEach(function() {
+      unsetCookie();
+      unsetLocalStorage();
+    });
+
+    it('when a stored Zeotap ID exists it is added to bids', function(done) {
+      requestBidsHook(function() {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.IDP');
+            expect(bid.userId.IDP).to.equal(ZEOTAP_COOKIE);
+            const zeotapIdAsEid = find(bid.userIdAsEids, e => e.source == 'zeotap.com');
+            expect(zeotapIdAsEid).to.deep.equal({
+              source: 'zeotap.com',
+              uids: [{
+                id: ZEOTAP_COOKIE,
+                atype: 1,
+              }]
+            });
+          });
+        });
+        done();
+      }, { adUnits });
+    });
+  });
+});
diff --git a/test/spec/modules/zetaBidAdapter_spec.js b/test/spec/modules/zetaBidAdapter_spec.js
new file mode 100644
index 00000000000..529fb8e8d31
--- /dev/null
+++ b/test/spec/modules/zetaBidAdapter_spec.js
@@ -0,0 +1,84 @@
+import { spec } from '../../../modules/zetaBidAdapter.js'
+
+describe('Zeta Bid Adapter', function() {
+  const bannerRequest = [{
+    bidId: 12345,
+    auctionId: 67890,
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    },
+    refererInfo: {
+      page: 'testprebid.com'
+    },
+    params: {
+      placement: 12345,
+      user: {
+        uid: 12345,
+        buyeruid: 12345
+      },
+      device: {
+        ip: '111.222.33.44',
+        geo: {
+          country: 'USA'
+        }
+      },
+      definerId: '44253',
+      test: 1
+    }
+  }];
+
+  it('Test the bid validation function', function() {
+    const validBid = spec.isBidRequestValid(bannerRequest[0]);
+    const invalidBid = spec.isBidRequestValid(null);
+
+    expect(validBid).to.be.true;
+    expect(invalidBid).to.be.false;
+  });
+
+  it('Test the request processing function', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    expect(request).to.not.be.empty;
+
+    const payload = request.data;
+    expect(payload).to.not.be.empty;
+  });
+
+  const responseBody = {
+    id: '12345',
+    seatbid: [
+      {
+        bid: [
+          {
+            id: 'auctionId',
+            impid: 'impId',
+            price: 0.0,
+            adm: 'adMarkup',
+            crid: 'creativeId',
+            h: 250,
+            w: 300
+          }
+        ]
+      }
+    ],
+    cur: 'USD'
+  };
+
+  it('Test the response parsing function', function () {
+    const receivedBid = responseBody.seatbid[0].bid[0];
+    const response = {};
+    response.body = responseBody;
+
+    const bidResponse = spec.interpretResponse(response, null);
+    expect(bidResponse).to.not.be.empty;
+
+    const bid = bidResponse[0];
+    expect(bid).to.not.be.empty;
+    expect(bid.ad).to.equal(receivedBid.adm);
+    expect(bid.cpm).to.equal(receivedBid.price);
+    expect(bid.height).to.equal(receivedBid.h);
+    expect(bid.width).to.equal(receivedBid.w);
+    expect(bid.requestId).to.equal(receivedBid.impid);
+  });
+});
diff --git a/test/spec/modules/zeta_global_sspAnalyticsAdapter_spec.js b/test/spec/modules/zeta_global_sspAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..15a1155f378
--- /dev/null
+++ b/test/spec/modules/zeta_global_sspAnalyticsAdapter_spec.js
@@ -0,0 +1,427 @@
+import zetaAnalyticsAdapter from 'modules/zeta_global_sspAnalyticsAdapter.js';
+import {config} from 'src/config';
+import CONSTANTS from 'src/constants.json';
+import {logError} from '../../../src/utils';
+
+let utils = require('src/utils');
+let events = require('src/events');
+
+const MOCK = {
+  STUB: {
+    'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+  },
+  AUCTION_END: {
+    'auctionId': '75e394d9-ccce-4978-9238-91e6a1ac88a1',
+    'timestamp': 1638441234544,
+    'auctionEnd': 1638441234784,
+    'auctionStatus': 'completed',
+    'adUnits': [
+      {
+        'code': '/19968336/header-bid-tag-0',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'bids': [
+          {
+            'bidder': 'zeta_global_ssp',
+            'params': {
+              'sid': 111,
+              'tags': {
+                'shortname': 'prebid_analytics_event_test_shortname',
+                'position': 'test_position'
+              }
+            }
+          },
+          {
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13232385
+            }
+          }
+        ],
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ],
+        'transactionId': '6b29369c-0c2e-414e-be1f-5867aec18d83'
+      }
+    ],
+    'adUnitCodes': [
+      '/19968336/header-bid-tag-0'
+    ],
+    'bidderRequests': [
+      {
+        'bidderCode': 'zeta_global_ssp',
+        'auctionId': '75e394d9-ccce-4978-9238-91e6a1ac88a1',
+        'bidderRequestId': '1207cb49191887',
+        'bids': [
+          {
+            'bidder': 'zeta_global_ssp',
+            'params': {
+              'sid': 111,
+              'tags': {
+                'shortname': 'prebid_analytics_event_test_shortname',
+                'position': 'test_position'
+              }
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    300,
+                    250
+                  ],
+                  [
+                    300,
+                    600
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': '/19968336/header-bid-tag-0',
+            'transactionId': '6b29369c-0c2e-414e-be1f-5867aec18d83',
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ],
+            'bidId': '206be9a13236af',
+            'bidderRequestId': '1207cb49191887',
+            'auctionId': '75e394d9-ccce-4978-9238-91e6a1ac88a1',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }
+        ],
+        'auctionStart': 1638441234544,
+        'timeout': 400,
+        'refererInfo': {
+          'referer': 'http://test-zeta-ssp.net:63342/zeta-ssp/ssp/_dev/examples/page_banner.html',
+          'reachedTop': true,
+          'isAmp': false,
+          'numIframes': 0,
+          'stack': [
+            'http://test-zeta-ssp.net:63342/zeta-ssp/ssp/_dev/examples/page_banner.html'
+          ],
+          'canonicalUrl': null
+        },
+        'start': 1638441234547
+      },
+      {
+        'bidderCode': 'appnexus',
+        'auctionId': '75e394d9-ccce-4978-9238-91e6a1ac88a1',
+        'bidderRequestId': '32b97f0a935422',
+        'bids': [
+          {
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': 13232385
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [
+                  [
+                    300,
+                    250
+                  ],
+                  [
+                    300,
+                    600
+                  ]
+                ]
+              }
+            },
+            'adUnitCode': '/19968336/header-bid-tag-0',
+            'transactionId': '6b29369c-0c2e-414e-be1f-5867aec18d83',
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ],
+            'bidId': '41badc0e164c758',
+            'bidderRequestId': '32b97f0a935422',
+            'auctionId': '75e394d9-ccce-4978-9238-91e6a1ac88a1',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }
+        ],
+        'auctionStart': 1638441234544,
+        'timeout': 400,
+        'refererInfo': {
+          'referer': 'http://test-zeta-ssp.net:63342/zeta-ssp/ssp/_dev/examples/page_banner.html',
+          'reachedTop': true,
+          'isAmp': false,
+          'numIframes': 0,
+          'stack': [
+            'http://test-zeta-ssp.net:63342/zeta-ssp/ssp/_dev/examples/page_banner.html'
+          ],
+          'canonicalUrl': null
+        },
+        'start': 1638441234550
+      }
+    ],
+    'noBids': [
+      {
+        'bidder': 'appnexus',
+        'params': {
+          'placementId': 13232385
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'adUnitCode': '/19968336/header-bid-tag-0',
+        'transactionId': '6b29369c-0c2e-414e-be1f-5867aec18d83',
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ],
+        'bidId': '41badc0e164c758',
+        'bidderRequestId': '32b97f0a935422',
+        'auctionId': '75e394d9-ccce-4978-9238-91e6a1ac88a1',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      }
+    ],
+    'bidsReceived': [
+      {
+        'bidderCode': 'zeta_global_ssp',
+        'width': 480,
+        'height': 320,
+        'statusMessage': 'Bid available',
+        'adId': '5759bb3ef7be1e8',
+        'requestId': '206be9a13236af',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 2.258302852806723,
+        'currency': 'USD',
+        'ad': 'test_ad',
+        'ttl': 200,
+        'creativeId': '456456456',
+        'netRevenue': true,
+        'meta': {
+          'advertiserDomains': [
+            'viaplay.fi'
+          ]
+        },
+        'originalCpm': 2.258302852806723,
+        'originalCurrency': 'USD',
+        'auctionId': '75e394d9-ccce-4978-9238-91e6a1ac88a1',
+        'responseTimestamp': 1638441234670,
+        'requestTimestamp': 1638441234547,
+        'bidder': 'zeta_global_ssp',
+        'adUnitCode': '/19968336/header-bid-tag-0',
+        'timeToRespond': 123,
+        'pbLg': '2.00',
+        'pbMg': '2.20',
+        'pbHg': '2.25',
+        'pbAg': '2.25',
+        'pbDg': '2.25',
+        'pbCg': '',
+        'size': '480x320',
+        'adserverTargeting': {
+          'hb_bidder': 'zeta_global_ssp',
+          'hb_adid': '5759bb3ef7be1e8',
+          'hb_pb': '2.20',
+          'hb_size': '480x320',
+          'hb_source': 'client',
+          'hb_format': 'banner',
+          'hb_adomain': 'viaplay.fi'
+        }
+      }
+    ],
+    'winningBids': [],
+    'timeout': 400
+  },
+  AD_RENDER_SUCCEEDED: {
+    'doc': {
+      'location': {
+        'href': 'http://test-zeta-ssp.net:63342/zeta-ssp/ssp/_dev/examples/page_banner.html',
+        'protocol': 'http:',
+        'host': 'localhost:63342',
+        'hostname': 'localhost',
+        'port': '63342',
+        'pathname': '/zeta-ssp/ssp/_dev/examples/page_banner.html',
+        'hash': '',
+        'origin': 'http://test-zeta-ssp.net:63342',
+        'ancestorOrigins': {
+          '0': 'http://test-zeta-ssp.net:63342'
+        }
+      }
+    },
+    'bid': {
+      'bidderCode': 'zeta_global_ssp',
+      'width': 480,
+      'height': 320,
+      'statusMessage': 'Bid available',
+      'adId': '5759bb3ef7be1e8',
+      'requestId': '206be9a13236af',
+      'mediaType': 'banner',
+      'source': 'client',
+      'cpm': 2.258302852806723,
+      'currency': 'USD',
+      'ad': 'test_ad',
+      'ttl': 200,
+      'creativeId': '456456456',
+      'netRevenue': true,
+      'meta': {
+        'advertiserDomains': [
+          'viaplay.fi'
+        ]
+      },
+      'originalCpm': 2.258302852806723,
+      'originalCurrency': 'USD',
+      'auctionId': '75e394d9-ccce-4978-9238-91e6a1ac88a1',
+      'responseTimestamp': 1638441234670,
+      'requestTimestamp': 1638441234547,
+      'bidder': 'zeta_global_ssp',
+      'adUnitCode': '/19968336/header-bid-tag-0',
+      'timeToRespond': 123,
+      'pbLg': '2.00',
+      'pbMg': '2.20',
+      'pbHg': '2.25',
+      'pbAg': '2.25',
+      'pbDg': '2.25',
+      'pbCg': '',
+      'size': '480x320',
+      'adserverTargeting': {
+        'hb_bidder': 'zeta_global_ssp',
+        'hb_adid': '5759bb3ef7be1e8',
+        'hb_pb': '2.20',
+        'hb_size': '480x320',
+        'hb_source': 'client',
+        'hb_format': 'banner',
+        'hb_adomain': 'viaplay.fi'
+      },
+      'status': 'rendered',
+      'params': [
+        {
+          'sid': 111,
+          'tags': {
+            'shortname': 'prebid_analytics_event_test_shortname',
+            'position': 'test_position'
+          }
+        }
+      ]
+    },
+    'adId': '5759bb3ef7be1e8'
+  }
+}
+
+describe('Zeta Global SSP Analytics Adapter', function() {
+  let sandbox;
+  let xhr;
+  let requests;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    requests = [];
+    xhr = sandbox.useFakeXMLHttpRequest();
+    xhr.onCreate = request => requests.push(request);
+    sandbox.stub(events, 'getEvents').returns([]);
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    config.resetConfig();
+  });
+
+  it('should require publisherId', function () {
+    sandbox.stub(utils, 'logError');
+    zetaAnalyticsAdapter.enableAnalytics({
+      options: {}
+    });
+    expect(utils.logError.called).to.equal(true);
+  });
+
+  describe('handle events', function() {
+    beforeEach(function() {
+      zetaAnalyticsAdapter.enableAnalytics({
+        options: {
+          sid: 111
+        }
+      });
+    });
+
+    afterEach(function () {
+      zetaAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('events are sent', function() {
+      this.timeout(5000);
+      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.AUCTION_END, MOCK.AUCTION_END);
+      events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BID_TIMEOUT, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BID_RESPONSE, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.NO_BID, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BID_WON, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BIDDER_DONE, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BIDDER_ERROR, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.SET_TARGETING, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BEFORE_REQUEST_BIDS, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BEFORE_BIDDER_HTTP, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.REQUEST_BIDS, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.ADD_AD_UNITS, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.AD_RENDER_FAILED, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED, MOCK.AD_RENDER_SUCCEEDED);
+      events.emit(CONSTANTS.EVENTS.TCF2_ENFORCEMENT, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.AUCTION_DEBUG, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.BID_VIEWABLE, MOCK.STUB);
+      events.emit(CONSTANTS.EVENTS.STALE_RENDER, MOCK.STUB);
+
+      expect(requests.length).to.equal(2);
+      expect(JSON.parse(requests[0].requestBody)).to.deep.equal(MOCK.AUCTION_END);
+      expect(JSON.parse(requests[1].requestBody)).to.deep.equal(MOCK.AD_RENDER_SUCCEEDED);
+    });
+  });
+});
diff --git a/test/spec/modules/zeta_global_sspBidAdapter_spec.js b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
new file mode 100644
index 00000000000..d6befa0fc78
--- /dev/null
+++ b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
@@ -0,0 +1,362 @@
+import {spec} from '../../../modules/zeta_global_sspBidAdapter.js'
+import {BANNER, VIDEO} from '../../../src/mediaTypes';
+
+describe('Zeta Ssp Bid Adapter', function () {
+  const eids = [
+    {
+      'source': 'example.com',
+      'uids': [
+        {
+          'id': 'someId1',
+          'atype': 1
+        },
+        {
+          'id': 'someId2',
+          'atype': 1
+        },
+        {
+          'id': 'someId3',
+          'atype': 2
+        }
+      ],
+      'ext': {
+        'foo': 'bar'
+      }
+    }
+  ];
+
+  const params = {
+    user: {
+      uid: 222,
+      buyeruid: 333
+    },
+    tags: {
+      someTag: 444,
+    },
+    sid: 'publisherId',
+    shortname: 'test_shortname',
+    site: {
+      page: 'testPage'
+    },
+    app: {
+      bundle: 'testBundle'
+    },
+    test: 1
+  };
+
+  const multiImpRequest = [
+    {
+      bidId: 12345,
+      auctionId: 67890,
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+      },
+      refererInfo: {
+        page: 'http://www.zetaglobal.com/page?param=value',
+        domain: 'www.zetaglobal.com',
+      },
+      gdprConsent: {
+        gdprApplies: 1,
+        consentString: 'consentString'
+      },
+      uspConsent: 'someCCPAString',
+      params: params,
+      userIdAsEids: eids
+    }, {
+      bidId: 54321,
+      auctionId: 67890,
+      mediaTypes: {
+        banner: {
+          sizes: [[600, 400]],
+        }
+      },
+      refererInfo: {
+        page: 'http://www.zetaglobal.com/page?param=value',
+        domain: 'www.zetaglobal.com',
+      },
+      gdprConsent: {
+        gdprApplies: 1,
+        consentString: 'consentString'
+      },
+      uspConsent: 'someCCPAString',
+      params: params,
+      userIdAsEids: eids
+    }
+  ];
+
+  const bannerRequest = [{
+    bidId: 12345,
+    auctionId: 67890,
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    },
+    refererInfo: {
+      page: 'http://www.zetaglobal.com/page?param=value',
+      domain: 'www.zetaglobal.com',
+    },
+    gdprConsent: {
+      gdprApplies: 1,
+      consentString: 'consentString'
+    },
+    uspConsent: 'someCCPAString',
+    params: params,
+    userIdAsEids: eids,
+    timeout: 500
+  }];
+
+  const videoRequest = [{
+    bidId: 112233,
+    auctionId: 667788,
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [[720, 340]],
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 30,
+        protocols: [2, 3]
+      }
+    },
+    refererInfo: {
+      referer: 'http://www.zetaglobal.com/page?param=video'
+    },
+    params: params
+  }];
+
+  it('Test the bid validation function', function () {
+    const validBid = spec.isBidRequestValid(bannerRequest[0]);
+    const invalidBid = spec.isBidRequestValid(null);
+
+    expect(validBid).to.be.true;
+    expect(invalidBid).to.be.false;
+  });
+
+  it('Test provide eids', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.user.ext.eids).to.eql(eids);
+  });
+
+  it('Test contains ua and language', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.device.ua).to.not.be.empty;
+    expect(payload.device.language).to.not.be.empty;
+  });
+
+  it('Test page and domain in site', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.site.page).to.eql('http://www.zetaglobal.com/page?param=value');
+    expect(payload.site.domain).to.eql('zetaglobal.com');
+  });
+
+  it('Test the request processing function', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    expect(request).to.not.be.empty;
+
+    const payload = request.data;
+    expect(payload).to.not.be.empty;
+  });
+
+  it('Test the response parsing function', function () {
+    const response = {
+      body: {
+        id: '12345',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: 'auctionId',
+                impid: 'impId',
+                price: 0.0,
+                adm: 'adMarkup',
+                crid: 'creativeId',
+                adomain: [
+                  'https://example.com'
+                ],
+                h: 250,
+                w: 300
+              },
+              {
+                id: 'auctionId2',
+                impid: 'impId2',
+                price: 0.1,
+                adm: 'adMarkup2',
+                crid: 'creativeId2',
+                adomain: [
+                  'https://example2.com'
+                ],
+                h: 150,
+                w: 200,
+                ext: {
+                  bidtype: 'video'
+                }
+              },
+              {
+                id: 'auctionId3',
+                impid: 'impId3',
+                price: 0.2,
+                adm: '<?xml version=\\"1.0\\"?><VAST version=\\"4.0\\">',
+                crid: 'creativeId3',
+                adomain: [
+                  'https://example3.com'
+                ],
+                h: 400,
+                w: 300
+              }
+            ]
+          }
+        ],
+        cur: 'USD'
+      }
+    };
+
+    const bidResponse = spec.interpretResponse(response, null);
+    expect(bidResponse).to.not.be.empty;
+
+    const bid1 = bidResponse[0];
+    const receivedBid1 = response.body.seatbid[0].bid[0];
+    expect(bid1).to.not.be.empty;
+    expect(bid1.ad).to.equal(receivedBid1.adm);
+    expect(bid1.vastXml).to.be.undefined;
+    expect(bid1.mediaType).to.equal(BANNER);
+    expect(bid1.cpm).to.equal(receivedBid1.price);
+    expect(bid1.height).to.equal(receivedBid1.h);
+    expect(bid1.width).to.equal(receivedBid1.w);
+    expect(bid1.requestId).to.equal(receivedBid1.impid);
+    expect(bid1.meta.advertiserDomains).to.equal(receivedBid1.adomain);
+
+    const bid2 = bidResponse[1];
+    const receivedBid2 = response.body.seatbid[0].bid[1];
+    expect(bid2).to.not.be.empty;
+    expect(bid2.ad).to.equal(receivedBid2.adm);
+    expect(bid2.vastXml).to.equal(receivedBid2.adm);
+    expect(bid2.mediaType).to.equal(VIDEO);
+    expect(bid2.cpm).to.equal(receivedBid2.price);
+    expect(bid2.height).to.equal(receivedBid2.h);
+    expect(bid2.width).to.equal(receivedBid2.w);
+    expect(bid2.requestId).to.equal(receivedBid2.impid);
+    expect(bid2.meta.advertiserDomains).to.equal(receivedBid2.adomain);
+
+    const bid3 = bidResponse[2];
+    const receivedBid3 = response.body.seatbid[0].bid[2];
+    expect(bid3).to.not.be.empty;
+    expect(bid3.ad).to.equal(receivedBid3.adm);
+    expect(bid3.vastXml).to.equal(receivedBid3.adm);
+    expect(bid3.mediaType).to.equal(VIDEO);
+    expect(bid3.cpm).to.equal(receivedBid3.price);
+    expect(bid3.height).to.equal(receivedBid3.h);
+    expect(bid3.width).to.equal(receivedBid3.w);
+    expect(bid3.requestId).to.equal(receivedBid3.impid);
+    expect(bid3.meta.advertiserDomains).to.equal(receivedBid3.adomain);
+  });
+
+  it('Different cases for user syncs', function () {
+    const USER_SYNC_URL_IFRAME = 'https://ssp.disqus.com/sync?type=iframe';
+    const USER_SYNC_URL_IMAGE = 'https://ssp.disqus.com/sync?type=image';
+
+    const sync1 = spec.getUserSyncs({iframeEnabled: true})[0];
+    expect(sync1.type).to.equal('iframe');
+    expect(sync1.url).to.include(USER_SYNC_URL_IFRAME);
+
+    const sync2 = spec.getUserSyncs({iframeEnabled: false})[0];
+    expect(sync2.type).to.equal('image');
+    expect(sync2.url).to.include(USER_SYNC_URL_IMAGE);
+
+    const sync3 = spec.getUserSyncs({iframeEnabled: true}, {}, {gdprApplies: true})[0];
+    expect(sync3.type).to.equal('iframe');
+    expect(sync3.url).to.include(USER_SYNC_URL_IFRAME);
+    expect(sync3.url).to.include('&gdpr=');
+
+    const sync4 = spec.getUserSyncs({iframeEnabled: true}, {}, {gdprApplies: true}, 'test')[0];
+    expect(sync4.type).to.equal('iframe');
+    expect(sync4.url).to.include(USER_SYNC_URL_IFRAME);
+    expect(sync4.url).to.include('&gdpr=');
+    expect(sync4.url).to.include('&us_privacy=');
+  });
+
+  it('Test provide gdpr and ccpa values in payload', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+
+    expect(payload.user.ext.consent).to.eql('consentString');
+    expect(payload.regs.ext.gdpr).to.eql(1);
+    expect(payload.regs.ext.us_privacy).to.eql('someCCPAString');
+  });
+
+  it('Test do not override user object', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.user.uid).to.eql(222);
+    expect(payload.user.buyeruid).to.eql(333);
+    expect(payload.user.ext.consent).to.eql('consentString');
+  });
+
+  it('Test video object', function () {
+    const request = spec.buildRequests(videoRequest, videoRequest[0]);
+    const payload = JSON.parse(request.data);
+
+    expect(payload.imp[0].video.minduration).to.eql(videoRequest[0].mediaTypes.video.minduration);
+    expect(payload.imp[0].video.maxduration).to.eql(videoRequest[0].mediaTypes.video.maxduration);
+    expect(payload.imp[0].video.protocols).to.eql(videoRequest[0].mediaTypes.video.protocols);
+    expect(payload.imp[0].video.mimes).to.eql(videoRequest[0].mediaTypes.video.mimes);
+    expect(payload.imp[0].video.w).to.eql(720);
+    expect(payload.imp[0].video.h).to.eql(340);
+
+    expect(payload.imp[0].banner).to.be.undefined;
+  });
+
+  it('Test required params in banner request', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(request.url).to.eql('https://ssp.disqus.com/bid/prebid?shortname=test_shortname');
+    expect(payload.ext.sid).to.eql('publisherId');
+    expect(payload.ext.tags.someTag).to.eql(444);
+    expect(payload.ext.tags.shortname).to.be.undefined;
+  });
+
+  it('Test required params in video request', function () {
+    const request = spec.buildRequests(videoRequest, videoRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(request.url).to.eql('https://ssp.disqus.com/bid/prebid?shortname=test_shortname');
+    expect(payload.ext.sid).to.eql('publisherId');
+    expect(payload.ext.tags.someTag).to.eql(444);
+    expect(payload.ext.tags.shortname).to.be.undefined;
+  });
+
+  it('Test multi imp', function () {
+    const request = spec.buildRequests(multiImpRequest, multiImpRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(request.url).to.eql('https://ssp.disqus.com/bid/prebid?shortname=test_shortname');
+
+    expect(payload.imp.length).to.eql(2);
+
+    expect(payload.imp[0].id).to.eql(12345);
+    expect(payload.imp[1].id).to.eql(54321);
+
+    expect(payload.imp[0].banner.w).to.eql(300);
+    expect(payload.imp[0].banner.h).to.eql(250);
+
+    expect(payload.imp[1].banner.w).to.eql(600);
+    expect(payload.imp[1].banner.h).to.eql(400);
+  });
+
+  it('Test provide tmax', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+
+    expect(payload.tmax).to.eql(500);
+  });
+
+  it('Test provide tmax without value', function () {
+    const request = spec.buildRequests(videoRequest, videoRequest[0]);
+    const payload = JSON.parse(request.data);
+
+    expect(payload.tmax).to.be.undefined;
+  });
+});
diff --git a/test/spec/modules/zeusPrimeRtdProvider_spec.js b/test/spec/modules/zeusPrimeRtdProvider_spec.js
new file mode 100644
index 00000000000..294d98df377
--- /dev/null
+++ b/test/spec/modules/zeusPrimeRtdProvider_spec.js
@@ -0,0 +1,410 @@
+import { zeusPrimeSubmodule } from 'modules/zeusPrimeRtdProvider';
+import { server } from 'test/mocks/xhr.js';
+import * as utils from 'src/utils';
+
+async function waitForStatus(statusVar) {
+  const MAX_COUNT = 20;
+  let count = 0;
+  while (
+    count <= MAX_COUNT &&
+    window.zeusPrime.status &&
+    window.zeusPrime.status[statusVar] !== true
+  ) {
+    count += 1;
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  }
+
+  if (count === MAX_COUNT) {
+    throw new Error('Timeout waiting for zeusPrimeRtdProvider to complete');
+  }
+}
+
+/**
+ * Execute all the commands in the googletag.cmd queue.
+ */
+function executeGoogletagTargeting() {
+  window.googletag.cmd.forEach((cmd) => cmd());
+}
+
+describe('Zeus Prime RTD submodule', () => {
+  let logErrorSpy;
+  let logMessageSpy;
+  let setTargetingStub;
+  let originalGtag;
+
+  beforeEach(() => {
+    logErrorSpy = sinon.spy(utils, 'logError');
+    logMessageSpy = sinon.spy(utils, 'logMessage');
+    setTargetingStub = sinon.stub();
+    window.zeusPrime = { cmd: [] };
+    originalGtag = window.googletag;
+    window.googletag = {
+      cmd: [],
+      pubads: () => ({
+        setTargeting: setTargetingStub,
+      }),
+    };
+
+    // Mock subtle since this doesnt exists in some test environments due to security in newer browsers.
+    if (typeof window.crypto.subtle === 'undefined') {
+      Object.defineProperty(crypto, 'subtle', { value: { digest: () => 'mockHash' } })
+    }
+  });
+
+  afterEach(() => {
+    logErrorSpy.restore();
+    logMessageSpy.restore();
+    window.googletag = originalGtag;
+  });
+
+  it('should init and set key-value for zeus_<gamId>', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/',
+      },
+    });
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.callCount(setTargetingStub, 1);
+    sinon.assert.calledWith(setTargetingStub, 'zeus_1234', 'www.example.com');
+  });
+
+  it('should init and set key-value for zeus_<gamId> from command queue', async () => {
+    window.zeusPrime.cmd.push((prime) => (prime.gamId = '9876'));
+    zeusPrimeSubmodule.init({
+      params: {
+        hostname: 'www.example.com',
+        pathname: '/',
+      },
+    });
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.callCount(setTargetingStub, 1);
+    sinon.assert.calledWith(setTargetingStub, 'zeus_9876', 'www.example.com');
+  });
+
+  it('should init with values from location and set key-value for zeus_<gamId>', async () => {
+    zeusPrimeSubmodule.init({ params: { gamId: '1234' } });
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.callCount(setTargetingStub, 1);
+    sinon.assert.calledWith(setTargetingStub, 'zeus_1234', 'localhost');
+    expect(window.zeusPrime.pathname).to.equal('/context.html');
+  });
+
+  it('should emit error when gamId is not set', async () => {
+    zeusPrimeSubmodule.init({});
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(window.googletag.cmd).to.have.length(0);
+    sinon.assert.callCount(setTargetingStub, 0);
+    sinon.assert.calledWith(
+      logErrorSpy,
+      'zeusPrimeRtdProvider: ',
+      'Failed to run.',
+      'window.zeusPrime.gamId must be a string. Received: undefined'
+    );
+  });
+
+  it('should not make a call to the server when url is a homepage', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/',
+      },
+    });
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    expect(server.requests).to.have.length(0);
+  });
+
+  it('should make a call to the server and set key-vlaue when url is an article page and returns topics', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Response
+    server.requests[0].respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      '{"topics": ["bs0"]}'
+    );
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(2);
+    sinon.assert.calledTwice(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.calledWith(setTargetingStub.secondCall, 'zeus_insights', [
+      'bs0',
+    ]);
+    sinon.assert.notCalled(logErrorSpy);
+  });
+
+  it('should not set insights keyvalue when server returns 204', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Response
+    server.requests[0].respond(204, { 'Content-Type': 'application/json' });
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledOnce(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.notCalled(logErrorSpy);
+  });
+
+  it('should not set insights keyvalue when server returns empty topics array', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Respond
+    server.requests[0].respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      '{ "topics": [] }'
+    );
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledOnce(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.notCalled(logErrorSpy);
+  });
+
+  it('should not set insights keyvalue and emit error when server returns error status (400)', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Response
+    server.requests[0].respond(
+      404,
+      { 'Content-Type': 'application/json' },
+      '{"message": "Not found"}'
+    );
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledOnce(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.calledWith(
+      logErrorSpy,
+      'zeusPrimeRtdProvider: ',
+      'Topics request returned error: 404'
+    );
+  });
+
+  it('should not set insights keyvalue and emit error when response is not received (network request)', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Response
+    server.requests[0].error();
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledOnce(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.calledWith(
+      logErrorSpy,
+      'zeusPrimeRtdProvider: ',
+      'failed to request topics'
+    );
+  });
+
+  it('fails gracefully when crypto fails', async () => {
+    const digestStub = sinon.stub(window.crypto.subtle, 'digest');
+    digestStub.throwsException('Failed to generate digest.');
+
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('scriptComplete');
+
+    sinon.assert.calledWith(
+      logErrorSpy,
+      'zeusPrimeRtdProvider: ',
+      'Failed to load hash'
+    );
+
+    digestStub.restore();
+  });
+
+  it('script should add zeus_prime key and not send request when disabled is set', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        disabled: true,
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(0);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledWith(setTargetingStub, 'zeus_prime', 'false');
+  });
+
+  it('debug true enables debug logging', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        debug: true,
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('scriptComplete');
+
+    sinon.assert.called(logMessageSpy);
+    sinon.assert.notCalled(logErrorSpy);
+  });
+
+  it('debug false disables debug logging', async () => {
+    window.zeusPrime.disabled = false;
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('scriptComplete');
+
+    sinon.assert.notCalled(logMessageSpy);
+    sinon.assert.notCalled(logErrorSpy);
+  });
+});
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index bd56ba53e4a..2b7c2b88449 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -1,10 +1,24 @@
 import { expect } from 'chai';
-import { fireNativeTrackers, getNativeTargeting, nativeBidIsValid, getAssetMessage } from 'src/native.js';
+import {
+  fireNativeTrackers,
+  getNativeTargeting,
+  nativeBidIsValid,
+  getAssetMessage,
+  getAllAssetsMessage,
+  toLegacyResponse,
+  decorateAdUnitsWithNativeParams,
+  isOpenRTBBidRequestValid,
+  isNativeOpenRTBBidValid,
+  toOrtbNativeRequest, toOrtbNativeResponse, legacyPropertiesToOrtbNative, fireImpressionTrackers, fireClickTrackers,
+} from 'src/native.js';
 import CONSTANTS from 'src/constants.json';
+import { stubAuctionIndex } from '../helpers/indexStub.js';
+import { convertOrtbRequestToProprietaryNative, fromOrtbNativeRequest } from '../../src/native.js';
 const utils = require('src/utils');
 
 const bid = {
   adId: '123',
+  transactionId: 'au',
   native: {
     title: 'Native Creative',
     body: 'Cool description great stuff',
@@ -12,22 +26,137 @@ const bid = {
     image: {
       url: 'http://cdn.example.com/p/creative-image/image.png',
       height: 83,
-      width: 127
+      width: 127,
     },
     icon: {
       url: 'http://cdn.example.com/p/creative-image/icon.jpg',
       height: 742,
-      width: 989
+      width: 989,
     },
     sponsoredBy: 'AppNexus',
     clickUrl: 'https://www.link.example',
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
-    javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>'
+    javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+    privacyLink: 'https://privacy-link.example',
+    ext: {
+      foo: 'foo-value',
+      baz: 'baz-value',
+    },
+  },
+};
+
+const ortbBid = {
+  adId: '123',
+  transactionId: 'au',
+  native: {
+    ortb: {
+      assets: [
+        {
+          id: 0,
+          title: {
+            text: 'Native Creative'
+          }
+        },
+        {
+          id: 1,
+          data: {
+            value: 'Cool description great stuff'
+          }
+        },
+        {
+          id: 2,
+          data: {
+            value: 'Do it'
+          }
+        },
+        {
+          id: 3,
+          img: {
+            url: 'http://cdn.example.com/p/creative-image/image.png',
+            h: 83,
+            w: 127
+          }
+        },
+        {
+          id: 4,
+          img: {
+            url: 'http://cdn.example.com/p/creative-image/icon.jpg',
+            h: 742,
+            w: 989
+          }
+        },
+        {
+          id: 5,
+          data: {
+            value: 'AppNexus',
+            type: 1
+          }
+        }
+      ],
+      link: {
+        url: 'https://www.link.example'
+      },
+      privacy: 'https://privacy-link.example',
+      ver: '1.2'
+    }
   }
 };
 
+const completeNativeBid = {
+  adId: '123',
+  transactionId: 'au',
+  native: {
+    ...bid.native,
+    ...ortbBid.native
+  }
+}
+
+const ortbRequest = {
+  assets: [
+    {
+      id: 0,
+      required: 0,
+      title: {
+        len: 140
+      }
+    }, {
+      id: 1,
+      required: 0,
+      data: {
+        type: 2
+      }
+    }, {
+      id: 2,
+      required: 0,
+      data: {
+        type: 12
+      }
+    }, {
+      id: 3,
+      required: 0,
+      img: {
+        type: 3
+      }
+    }, {
+      id: 4,
+      required: 0,
+      img: {
+        type: 1
+      }
+    }, {
+      id: 5,
+      required: 0,
+      data: {
+        type: 1
+      }
+    }
+  ],
+  ver: '1.2'
+}
+
 const bidWithUndefinedFields = {
+  transactionId: 'au',
   native: {
     title: 'Native Creative',
     body: undefined,
@@ -36,14 +165,22 @@ const bidWithUndefinedFields = {
     clickUrl: 'https://www.link.example',
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
-    javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>'
-  }
+    javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+    ext: {
+      foo: 'foo-value',
+      baz: undefined,
+    },
+  },
 };
 
 describe('native.js', function () {
   let triggerPixelStub;
   let insertHtmlIntoIframeStub;
 
+  function deps(adUnit) {
+    return { index: stubAuctionIndex({ adUnits: [adUnit] }) };
+  }
+
   beforeEach(function () {
     triggerPixelStub = sinon.stub(utils, 'triggerPixel');
     insertHtmlIntoIframeStub = sinon.stub(utils, 'insertHtmlIntoIframe');
@@ -58,40 +195,232 @@ describe('native.js', function () {
     const targeting = getNativeTargeting(bid);
     expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal(bid.native.title);
     expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal(bid.native.body);
-    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal(bid.native.clickUrl);
+    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal(
+      bid.native.clickUrl
+    );
+    expect(targeting.hb_native_foo).to.equal(bid.native.foo);
   });
 
+  it('can get targeting from null native keys', () => {
+    const targeting = getNativeTargeting({...bid, native: {...bid.native, displayUrl: null}});
+    expect(targeting.hb_native_displayurl).to.not.be.ok;
+  })
+
   it('sends placeholders for configured assets', function () {
-    const bidRequest = {
-      mediaTypes: {
-        native: {
-          body: { sendId: true },
-          clickUrl: { sendId: true },
-        }
-      }
+    const adUnit = {
+      transactionId: 'au',
+      nativeParams: {
+        body: { sendId: true },
+        clickUrl: { sendId: true },
+        ext: {
+          foo: {
+            sendId: false,
+          },
+          baz: {
+            sendId: true,
+          },
+        },
+      },
     };
-    const targeting = getNativeTargeting(bid, bidRequest);
+    const targeting = getNativeTargeting(bid, deps(adUnit));
 
     expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal(bid.native.title);
-    expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal('hb_native_body:123');
-    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal('hb_native_linkurl:123');
+    expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal(
+      'hb_native_body:123'
+    );
+    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal(
+      'hb_native_linkurl:123'
+    );
+    expect(targeting.hb_native_foo).to.equal(bid.native.ext.foo);
+    expect(targeting.hb_native_baz).to.equal('hb_native_baz:123');
+  });
+
+  it('sends placeholdes targetings with ortb native response', function () {
+    const targeting = getNativeTargeting(completeNativeBid);
+
+    expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal('Native Creative');
+    expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal('Cool description great stuff');
+    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal('https://www.link.example');
   });
 
   it('should only include native targeting keys with values', function () {
-    const targeting = getNativeTargeting(bidWithUndefinedFields);
+    const adUnit = {
+      transactionId: 'au',
+      nativeParams: {
+        body: { sendId: true },
+        clickUrl: { sendId: true },
+        ext: {
+          foo: {
+            required: false,
+          },
+          baz: {
+            required: false,
+          },
+        },
+      },
+    };
+
+    const targeting = getNativeTargeting(bidWithUndefinedFields, deps(adUnit));
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      'hb_native_foo',
+    ]);
+  });
+
+  it('should only include targeting that has sendTargetingKeys set to true', function () {
+    const adUnit = {
+      transactionId: 'au',
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50],
+        },
+        title: {
+          required: true,
+          len: 80,
+          sendTargetingKeys: true,
+        },
+        sendTargetingKeys: false,
+      },
+    };
+    const targeting = getNativeTargeting(bid, deps(adUnit));
+
+    expect(Object.keys(targeting)).to.deep.equal([CONSTANTS.NATIVE_KEYS.title]);
+  });
+
+  it('should only include targeting if sendTargetingKeys not set to false', function () {
+    const adUnit = {
+      transactionId: 'au',
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50],
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        body: {
+          required: true,
+        },
+        clickUrl: {
+          required: true,
+        },
+        icon: {
+          required: false,
+          sendTargetingKeys: false,
+        },
+        cta: {
+          required: false,
+          sendTargetingKeys: false,
+        },
+        sponsoredBy: {
+          required: false,
+          sendTargetingKeys: false,
+        },
+        privacyLink: {
+          required: false,
+          sendTargetingKeys: false,
+        },
+        ext: {
+          foo: {
+            required: false,
+            sendTargetingKeys: true,
+          },
+        },
+      },
+    };
+    const targeting = getNativeTargeting(bid, deps(adUnit));
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      'hb_native_foo',
+    ]);
+  });
+
+  it('should copy over rendererUrl to bid object and include it in targeting', function () {
+    const adUnit = {
+      transactionId: 'au',
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50],
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        rendererUrl: {
+          url: 'https://www.renderer.com/',
+        },
+      },
+    };
+    const targeting = getNativeTargeting(bid, deps(adUnit));
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.cta,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.icon,
+      CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      CONSTANTS.NATIVE_KEYS.privacyLink,
+      CONSTANTS.NATIVE_KEYS.rendererUrl,
+    ]);
+
+    expect(bid.native.rendererUrl).to.deep.equal('https://www.renderer.com/');
+    delete bid.native.rendererUrl;
+  });
+
+  it('should copy over adTemplate to bid object and include it in targeting', function () {
+    const adUnit = {
+      transactionId: 'au',
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50],
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        adTemplate: '<div><p>##hb_native_body##</p></div>',
+      },
+    };
+    const targeting = getNativeTargeting(bid, deps(adUnit));
 
     expect(Object.keys(targeting)).to.deep.equal([
       CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.cta,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.icon,
       CONSTANTS.NATIVE_KEYS.sponsoredBy,
-      CONSTANTS.NATIVE_KEYS.clickUrl
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      CONSTANTS.NATIVE_KEYS.privacyLink,
     ]);
+
+    expect(bid.native.adTemplate).to.deep.equal(
+      '<div><p>##hb_native_body##</p></div>'
+    );
+    delete bid.native.adTemplate;
   });
 
   it('fires impression trackers', function () {
     fireNativeTrackers({}, bid);
     sinon.assert.calledOnce(triggerPixelStub);
     sinon.assert.calledWith(triggerPixelStub, bid.native.impressionTrackers[0]);
-    sinon.assert.calledWith(insertHtmlIntoIframeStub, bid.native.javascriptTrackers);
+    sinon.assert.calledWith(
+      insertHtmlIntoIframeStub,
+      bid.native.javascriptTrackers
+    );
   });
 
   it('fires click trackers', function () {
@@ -101,7 +430,7 @@ describe('native.js', function () {
     sinon.assert.calledWith(triggerPixelStub, bid.native.clickTrackers[0]);
   });
 
-  it('creates native asset message', function() {
+  it('creates native asset message', function () {
     const messageRequest = {
       message: 'Prebid Native',
       action: 'assetRequest',
@@ -114,131 +443,865 @@ describe('native.js', function () {
     expect(message.assets.length).to.equal(3);
     expect(message.assets).to.deep.include({
       key: 'body',
-      value: bid.native.body
+      value: bid.native.body,
     });
     expect(message.assets).to.deep.include({
       key: 'image',
-      value: bid.native.image.url
+      value: bid.native.image.url,
     });
     expect(message.assets).to.deep.include({
       key: 'clickUrl',
-      value: bid.native.clickUrl
+      value: bid.native.clickUrl,
     });
   });
-});
 
-describe('validate native', function () {
-  let bidReq = [{
-    bids: [{
-      bidderCode: 'test_bidder',
-      bidId: 'test_bid_id',
-      mediaTypes: {
-        native: {
-          title: {
-            required: true,
-          },
-          body: {
-            required: true,
-          },
-          image: {
-            required: true,
-            sizes: [150, 50],
-            aspect_ratios: [150, 50]
-          },
-          icon: {
-            required: true,
-            sizes: [50, 50]
-          },
+  it('creates native all asset message', function () {
+    const messageRequest = {
+      message: 'Prebid Native',
+      action: 'allAssetRequest',
+      adId: '123',
+    };
+
+    const message = getAllAssetsMessage(messageRequest, bid);
+
+    expect(message.assets.length).to.equal(10);
+    expect(message.assets).to.deep.include({
+      key: 'body',
+      value: bid.native.body,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'image',
+      value: bid.native.image.url,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'clickUrl',
+      value: bid.native.clickUrl,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'title',
+      value: bid.native.title,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'icon',
+      value: bid.native.icon.url,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'cta',
+      value: bid.native.cta,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'sponsoredBy',
+      value: bid.native.sponsoredBy,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'foo',
+      value: bid.native.ext.foo,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'baz',
+      value: bid.native.ext.baz,
+    });
+  });
+
+  it('creates native all asset message with only defined fields', function () {
+    const messageRequest = {
+      message: 'Prebid Native',
+      action: 'allAssetRequest',
+      adId: '123',
+    };
+
+    const message = getAllAssetsMessage(messageRequest, bidWithUndefinedFields);
+
+    expect(message.assets.length).to.equal(4);
+    expect(message.assets).to.deep.include({
+      key: 'clickUrl',
+      value: bid.native.clickUrl,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'title',
+      value: bid.native.title,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'sponsoredBy',
+      value: bid.native.sponsoredBy,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'foo',
+      value: bid.native.ext.foo,
+    });
+  });
+
+  it('creates native all asset message with complete format', function () {
+    const messageRequest = {
+      message: 'Prebid Native',
+      action: 'allAssetRequest',
+      adId: '123',
+    };
+
+    const message = getAllAssetsMessage(messageRequest, completeNativeBid);
+
+    expect(message.assets.length).to.equal(10);
+    expect(message.assets).to.deep.include({
+      key: 'body',
+      value: bid.native.body,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'image',
+      value: bid.native.image.url,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'clickUrl',
+      value: bid.native.clickUrl,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'title',
+      value: bid.native.title,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'icon',
+      value: bid.native.icon.url,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'cta',
+      value: bid.native.cta,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'sponsoredBy',
+      value: bid.native.sponsoredBy,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'privacyLink',
+      value: ortbBid.native.ortb.privacy,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'foo',
+      value: bid.native.ext.foo,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'baz',
+      value: bid.native.ext.baz,
+    });
+  });
+
+  const SAMPLE_ORTB_REQUEST = toOrtbNativeRequest({
+    title: 'vtitle',
+    body: 'vbody'
+  });
+  const SAMPLE_ORTB_RESPONSE = {
+    link: {
+      url: 'url'
+    },
+    assets: [
+      {
+        id: 0,
+        title: {
+          text: 'vtitle'
+        }
+      },
+      {
+        id: 1,
+        data: {
+          value: 'vbody'
         }
       }
-    }]
-  }];
+    ],
+    eventtrackers: [
+      { event: 1, method: 1, url: 'https://sampleurl.com' },
+      { event: 1, method: 2, url: 'https://sampleurljs.com' }
+    ]
+  }
+  describe('toLegacyResponse', () => {
+    it('returns assets in legacy format for ortb responses', () => {
+      const actual = toLegacyResponse(SAMPLE_ORTB_RESPONSE, SAMPLE_ORTB_REQUEST);
+      expect(actual.body).to.equal('vbody');
+      expect(actual.title).to.equal('vtitle');
+      expect(actual.clickUrl).to.equal('url');
+      expect(actual.javascriptTrackers).to.equal('<script async src="https://sampleurljs.com"></script>');
+      expect(actual.impressionTrackers.length).to.equal(1);
+      expect(actual.impressionTrackers[0]).to.equal('https://sampleurl.com');
+    });
+  });
+});
+
+describe('validate native openRTB', function () {
+  it('should validate openRTB request', function () {
+    let openRTBNativeRequest = { assets: [] };
+    // assets array can't be empty
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(false);
+    openRTBNativeRequest.assets.push({
+      id: 1.5,
+      required: 1,
+      title: {},
+    });
+
+    // asset.id must be integer
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(false);
+    openRTBNativeRequest.assets[0].id = 1;
+    // title must have 'len' property
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(false);
+    openRTBNativeRequest.assets[0].title.len = 140;
+    // openRTB request is valid
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(true);
+
+    openRTBNativeRequest.assets.push({
+      id: 2,
+      required: 1,
+      video: {
+        mimes: [],
+        protocols: [],
+        minduration: 50,
+      },
+    });
+    // video asset should have all required properties
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(false);
+    openRTBNativeRequest.assets[1].video.maxduration = 60;
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(true);
+  });
+
+  it('should validate openRTB native bid', function () {
+    const openRTBRequest = {
+      assets: [
+        {
+          id: 1,
+          required: 1,
+        },
+        {
+          id: 2,
+          required: 0,
+        },
+        {
+          id: 3,
+          required: 1,
+        },
+      ],
+    };
+    let openRTBBid = {
+      assets: [
+        {
+          id: 1,
+        },
+        {
+          id: 2,
+        },
+      ],
+    };
+
+    // link is missing
+    expect(isNativeOpenRTBBidValid(openRTBBid, openRTBRequest)).to.eq(false);
+    openRTBBid.link = { url: 'www.foo.bar' };
+    // required id == 3 is missing
+    expect(isNativeOpenRTBBidValid(openRTBBid, openRTBRequest)).to.eq(false);
+
+    openRTBBid.assets[1].id = 3;
+    expect(isNativeOpenRTBBidValid(openRTBBid, openRTBRequest)).to.eq(true);
+  });
+});
+
+describe('validate native', function () {
+  const adUnit = {
+    transactionId: 'test_adunit',
+    mediaTypes: {
+      native: {
+        title: {
+          required: true,
+        },
+        body: {
+          required: true,
+        },
+        image: {
+          required: true,
+          sizes: [150, 50],
+          aspect_ratios: [150, 50],
+        },
+        icon: {
+          required: true,
+          sizes: [50, 50],
+        },
+      },
+    },
+  };
 
   let validBid = {
     adId: 'abc123',
     requestId: 'test_bid_id',
+    transactionId: 'test_adunit',
     adUnitCode: '123/prebid_native_adunit',
     bidder: 'test_bidder',
     native: {
-      body: 'This is a Prebid Native Creative. There are many like it, but this one is mine.',
+      body:
+        'This is a Prebid Native Creative. There are many like it, but this one is mine.',
       clickTrackers: ['http://my.click.tracker/url'],
       icon: {
         url: 'http://my.image.file/ad_image.jpg',
         height: 75,
-        width: 75
+        width: 75,
       },
       image: {
         url: 'http://my.icon.file/ad_icon.jpg',
         height: 2250,
-        width: 3000
+        width: 3000,
       },
       clickUrl: 'http://prebid.org/dev-docs/show-native-ads.html',
       impressionTrackers: ['http://my.imp.tracker/url'],
-      javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
-      title: 'This is an example Prebid Native creative'
-    }
+      javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+      title: 'This is an example Prebid Native creative',
+    },
   };
 
   let noIconDimBid = {
     adId: 'abc234',
     requestId: 'test_bid_id',
+    transactionId: 'test_adunit',
     adUnitCode: '123/prebid_native_adunit',
     bidder: 'test_bidder',
     native: {
-      body: 'This is a Prebid Native Creative. There are many like it, but this one is mine.',
+      body:
+        'This is a Prebid Native Creative. There are many like it, but this one is mine.',
       clickTrackers: ['http://my.click.tracker/url'],
-      icon: {
-        url: 'http://my.image.file/ad_image.jpg',
-        height: 0,
-        width: 0
-      },
+      icon: 'http://my.image.file/ad_image.jpg',
       image: {
         url: 'http://my.icon.file/ad_icon.jpg',
         height: 2250,
-        width: 3000
+        width: 3000,
       },
       clickUrl: 'http://prebid.org/dev-docs/show-native-ads.html',
       impressionTrackers: ['http://my.imp.tracker/url'],
-      javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
-      title: 'This is an example Prebid Native creative'
-    }
+      javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+      title: 'This is an example Prebid Native creative',
+    },
   };
 
   let noImgDimBid = {
     adId: 'abc345',
     requestId: 'test_bid_id',
+    transactionId: 'test_adunit',
     adUnitCode: '123/prebid_native_adunit',
     bidder: 'test_bidder',
     native: {
-      body: 'This is a Prebid Native Creative. There are many like it, but this one is mine.',
+      body:
+        'This is a Prebid Native Creative. There are many like it, but this one is mine.',
       clickTrackers: ['http://my.click.tracker/url'],
       icon: {
         url: 'http://my.image.file/ad_image.jpg',
         height: 75,
-        width: 75
-      },
-      image: {
-        url: 'http://my.icon.file/ad_icon.jpg',
-        height: 0,
-        width: 0
+        width: 75,
       },
+      image: 'http://my.icon.file/ad_icon.jpg',
       clickUrl: 'http://prebid.org/dev-docs/show-native-ads.html',
       impressionTrackers: ['http://my.imp.tracker/url'],
-      javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
-      title: 'This is an example Prebid Native creative'
-    }
+      javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+      title: 'This is an example Prebid Native creative',
+    },
   };
 
   beforeEach(function () {});
 
   afterEach(function () {});
 
-  it('should reject bid if no image sizes are defined', function () {
-    let result = nativeBidIsValid(validBid, bidReq);
+  it('should accept bid if no image sizes are defined', function () {
+    decorateAdUnitsWithNativeParams([adUnit]);
+    const index = stubAuctionIndex({ adUnits: [adUnit] });
+    let result = nativeBidIsValid(validBid, { index });
+    expect(result).to.be.true;
+    result = nativeBidIsValid(noIconDimBid, { index });
+    expect(result).to.be.true;
+    result = nativeBidIsValid(noImgDimBid, { index });
     expect(result).to.be.true;
-    result = nativeBidIsValid(noIconDimBid, bidReq);
-    expect(result).to.be.false;
-    result = nativeBidIsValid(noImgDimBid, bidReq);
-    expect(result).to.be.false;
   });
+
+  it('should convert from old-style native to OpenRTB request', () => {
+    const adUnit = {
+      transactionId: 'test_adunit',
+      mediaTypes: {
+        native: {
+          title: {
+            required: true,
+          },
+          body: {
+            required: true,
+            len: 45
+          },
+          image: {
+            required: true,
+            sizes: [150, 50],
+            aspect_ratios: [{
+              min_width: 150,
+              min_height: 50
+            }]
+          },
+          icon: {
+            required: true,
+            aspect_ratios: [{
+              min_width: 150,
+              min_height: 50
+            }]
+          },
+          address: {},
+        },
+      },
+    };
+
+    const ortb = toOrtbNativeRequest(adUnit.mediaTypes.native);
+    expect(ortb).to.be.a('object');
+    expect(ortb.assets).to.be.a('array');
+
+    // title
+    expect(ortb.assets[0]).to.deep.include({
+      id: 0,
+      required: 1,
+      title: {
+        len: 140
+      }
+    });
+
+    // body => data
+    expect(ortb.assets[1]).to.deep.include({
+      id: 1,
+      required: 1,
+      data: {
+        type: 2,
+        len: 45
+      }
+    });
+
+    // image => image
+    expect(ortb.assets[2]).to.deep.include({
+      id: 2,
+      required: 1,
+      img: {
+        type: 3, // Main Image
+        w: 150,
+        h: 50,
+      }
+    });
+
+    expect(ortb.assets[3]).to.deep.include({
+      id: 3,
+      required: 1,
+      img: {
+        type: 1, // Icon Image
+        wmin: 150,
+        hmin: 50,
+      }
+    });
+
+    expect(ortb.assets[4]).to.deep.include({
+      id: 4,
+      required: 0,
+      data: {
+        type: 9,
+      }
+    });
+  });
+
+  ['bogusKey', 'clickUrl', 'privacyLink'].forEach(nativeKey => {
+    it(`should not generate an empty asset for key ${nativeKey}`, () => {
+      const ortbReq = toOrtbNativeRequest({
+        [nativeKey]: {
+          required: true
+        }
+      });
+      expect(ortbReq.assets.length).to.equal(0);
+    });
+  })
+
+  it('should convert from ortb to old-style native request', () => {
+    const openRTBRequest = {
+      'ver': '1.2',
+      'context': 2,
+      'contextsubtype': 20,
+      'plcmttype': 11,
+      'plcmtcnt': 1,
+      'aurlsupport': 0,
+      'privacy': 1,
+      'eventrackers': [
+        {
+          'event': 1,
+          'methods': [1, 2]
+        },
+        {
+          'event': 2,
+          'methods': [1]
+        }
+      ],
+      'assets': [
+        {
+          'id': 123,
+          'required': 1,
+          'title': {
+            'len': 140
+          }
+        },
+        {
+          'id': 128,
+          'required': 0,
+          'img': {
+            'wmin': 836,
+            'hmin': 627,
+            'type': 3
+          }
+        },
+        {
+          'id': 124,
+          'required': 1,
+          'img': {
+            'wmin': 50,
+            'hmin': 50,
+            'type': 1
+          }
+        },
+        {
+          'id': 126,
+          'required': 1,
+          'data': {
+            'type': 1,
+            'len': 25
+          }
+        },
+        {
+          'id': 127,
+          'required': 1,
+          'data': {
+            'type': 2,
+            'len': 140
+          }
+        }
+      ]
+    };
+
+    const oldNativeRequest = fromOrtbNativeRequest(openRTBRequest);
+
+    expect(oldNativeRequest).to.be.a('object');
+    expect(oldNativeRequest.title).to.include({
+      required: true,
+      len: 140
+    });
+
+    expect(oldNativeRequest.image).to.deep.include({
+      required: false,
+      aspect_ratios: {
+        min_width: 836,
+        min_height: 627,
+        ratio_width: 836,
+        ratio_height: 627
+      }
+    });
+
+    expect(oldNativeRequest.icon).to.deep.include({
+      required: true,
+      aspect_ratios: {
+        min_width: 50,
+        min_height: 50,
+        ratio_width: 50,
+        ratio_height: 50
+      }
+    });
+    expect(oldNativeRequest.sponsoredBy).to.include({
+      required: true,
+      len: 25
+    })
+    expect(oldNativeRequest.body).to.include({
+      required: true,
+      len: 140
+    })
+  });
+
+  if (FEATURES.NATIVE) {
+    it('should convert ortb bid requests to proprietary requests', () => {
+      const validBidRequests = [{
+        bidId: 'bidId3',
+        adUnitCode: 'adUnitCode3',
+        transactionId: 'transactionId3',
+        mediaTypes: {
+          banner: {}
+        },
+        params: {
+          publisher: 'publisher2',
+          placement: 'placement3'
+        }
+      }];
+      const resultRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+      expect(resultRequests).to.be.deep.equals(validBidRequests);
+
+      validBidRequests[0].mediaTypes.native = {
+        ortb: {
+          ver: '1.2',
+          context: 2,
+          contextsubtype: 20,
+          plcmttype: 11,
+          plcmtcnt: 1,
+          aurlsupport: 0,
+          privacy: 1,
+          eventrackers: [
+            {
+              event: 1,
+              methods: [1, 2]
+            },
+            {
+              event: 2,
+              methods: [1]
+            }
+          ],
+          assets: [
+            {
+              id: 123,
+              required: 1,
+              title: {
+                len: 140
+              }
+            },
+            {
+              id: 128,
+              required: 0,
+              img: {
+                wmin: 836,
+                hmin: 627,
+                type: 3
+              }
+            },
+            {
+              id: 124,
+              required: 1,
+              img: {
+                wmin: 50,
+                hmin: 50,
+                type: 1
+              }
+            },
+            {
+              id: 126,
+              required: 1,
+              data: {
+                type: 1,
+                len: 25
+              }
+            },
+            {
+              id: 127,
+              required: 1,
+              data: {
+                type: 2,
+                len: 140
+              }
+            }
+          ]
+        }
+      };
+
+      const resultRequests2 = convertOrtbRequestToProprietaryNative(validBidRequests);
+      expect(resultRequests2[0].mediaTypes.native).to.deep.include({
+        title: {
+          required: true,
+          len: 140
+        },
+        icon: {
+          required: true,
+          aspect_ratios: {
+            min_width: 50,
+            min_height: 50,
+            ratio_width: 50,
+            ratio_height: 50
+          }
+        },
+        sponsoredBy: {
+          required: true,
+          len: 25
+        },
+        body: {
+          required: true,
+          len: 140
+        }
+      });
+    });
+  }
 });
+
+describe('legacyPropertiesToOrtbNative', () => {
+  describe('click trakckers', () => {
+    it('should convert clickUrl to link.url', () => {
+      const native = legacyPropertiesToOrtbNative({clickUrl: 'some-url'});
+      expect(native.link.url).to.eql('some-url');
+    });
+    it('should convert single clickTrackers to link.clicktrackers', () => {
+      const native = legacyPropertiesToOrtbNative({clickTrackers: 'some-url'});
+      expect(native.link.clicktrackers).to.eql([
+        'some-url'
+      ])
+    });
+    it('should convert multiple clickTrackers into link.clicktrackers', () => {
+      const native = legacyPropertiesToOrtbNative({clickTrackers: ['url1', 'url2']});
+      expect(native.link.clicktrackers).to.eql([
+        'url1',
+        'url2'
+      ])
+    })
+  });
+  describe('impressionTrackers', () => {
+    it('should convert a single tracker into an eventtracker entry', () => {
+      const native = legacyPropertiesToOrtbNative({impressionTrackers: 'some-url'});
+      expect(native.eventtrackers).to.eql([
+        {
+          event: 1,
+          method: 1,
+          url: 'some-url'
+        }
+      ]);
+    });
+
+    it('should convert an array into corresponding eventtracker entries', () => {
+      const native = legacyPropertiesToOrtbNative({impressionTrackers: ['url1', 'url2']});
+      expect(native.eventtrackers).to.eql([
+        {
+          event: 1,
+          method: 1,
+          url: 'url1'
+        },
+        {
+          event: 1,
+          method: 1,
+          url: 'url2'
+        }
+      ])
+    })
+  });
+  describe('javascriptTrackers', () => {
+    it('should convert a single value into jstracker', () => {
+      const native = legacyPropertiesToOrtbNative({javascriptTrackers: 'some-markup'});
+      expect(native.jstracker).to.eql('some-markup');
+    })
+    it('should merge multiple values into a single jstracker', () => {
+      const native = legacyPropertiesToOrtbNative({javascriptTrackers: ['some-markup', 'some-other-markup']});
+      expect(native.jstracker).to.eql('some-markupsome-other-markup');
+    })
+  });
+});
+
+describe('fireImpressionTrackers', () => {
+  let runMarkup, fetchURL;
+  beforeEach(() => {
+    runMarkup = sinon.stub();
+    fetchURL = sinon.stub();
+  })
+
+  function runTrackers(resp) {
+    fireImpressionTrackers(resp, {runMarkup, fetchURL})
+  }
+
+  it('should run markup in jstracker', () => {
+    runTrackers({
+      jstracker: 'some-markup'
+    });
+    sinon.assert.calledWith(runMarkup, 'some-markup');
+  });
+
+  it('should fetch each url in imptrackers', () => {
+    const urls = ['url1', 'url2'];
+    runTrackers({
+      imptrackers: urls
+    });
+    urls.forEach(url => sinon.assert.calledWith(fetchURL, url));
+  });
+
+  it('should fetch each url in eventtrackers that use the image method', () => {
+    const urls = ['url1', 'url2'];
+    runTrackers({
+      eventtrackers: urls.map(url => ({event: 1, method: 1, url}))
+    });
+    urls.forEach(url => sinon.assert.calledWith(fetchURL, url))
+  });
+
+  it('should load as a script each url in eventtrackers that use the js method', () => {
+    const urls = ['url1', 'url2'];
+    runTrackers({
+      eventtrackers: urls.map(url => ({event: 1, method: 2, url}))
+    });
+    urls.forEach(url => sinon.assert.calledWith(runMarkup, sinon.match(`script async src="${url}"`)))
+  });
+
+  it('should not fire trackers that are not impression trakcers', () => {
+    runTrackers({
+      link: {
+        clicktrackers: ['click-url']
+      },
+      eventtrackers: [{
+        event: 2, // not imp
+        method: 1,
+        url: 'some-url'
+      }]
+    });
+    sinon.assert.notCalled(fetchURL);
+    sinon.assert.notCalled(runMarkup);
+  })
+})
+
+describe('fireClickTrackers', () => {
+  let fetchURL;
+  beforeEach(() => {
+    fetchURL = sinon.stub();
+  });
+
+  function runTrackers(resp, assetId = null) {
+    fireClickTrackers(resp, assetId, {fetchURL});
+  }
+
+  it('should load each URL in link.clicktrackers', () => {
+    const urls = ['url1', 'url2'];
+    runTrackers({
+      link: {
+        clicktrackers: urls
+      }
+    });
+    urls.forEach(url => sinon.assert.calledWith(fetchURL, url));
+  })
+
+  it('should load each URL in asset.link.clicktrackers, when response is ORTB', () => {
+    const urls = ['asset_url1', 'asset_url2'];
+    runTrackers({
+      assets: [
+        {
+          id: 1,
+          link: {
+            clicktrackers: urls
+          }
+        }
+      ],
+    }, 1);
+    urls.forEach(url => sinon.assert.calledWith(fetchURL, url));
+  })
+})
+
+describe('toOrtbNativeResponse', () => {
+  it('should work when there are unrequested assets in the response', () => {
+    const legacyResponse = {
+      'title': 'vtitle',
+      'body': 'vbody'
+    }
+    const request = toOrtbNativeRequest({
+      title: {
+        required: 'true'
+      },
+
+    });
+    const ortbResponse = toOrtbNativeResponse(legacyResponse, request);
+    expect(ortbResponse.assets.length).to.eql(1);
+  });
+
+  it('should not modify the request', () => {
+    const legacyResponse = {
+      title: 'vtitle'
+    }
+    const request = toOrtbNativeRequest({
+      title: {
+        required: true
+      }
+    });
+    const requestCopy = JSON.parse(JSON.stringify(request));
+    const response = toOrtbNativeResponse(legacyResponse, request);
+    expect(request).to.eql(requestCopy);
+    sinon.assert.match(response.assets[0], {
+      title: {
+        text: 'vtitle'
+      }
+    })
+  })
+})
diff --git a/test/spec/ortb2.5StrictTranslator/dsl_spec.js b/test/spec/ortb2.5StrictTranslator/dsl_spec.js
new file mode 100644
index 00000000000..c9b4575bcd2
--- /dev/null
+++ b/test/spec/ortb2.5StrictTranslator/dsl_spec.js
@@ -0,0 +1,137 @@
+import {Arr, ERR_ENUM, ERR_TYPE, ERR_UNKNOWN_FIELD, IntEnum, Obj} from '../../../libraries/ortb2.5StrictTranslator/dsl.js';
+import {deepClone} from '../../../src/utils.js';
+
+describe('DSL', () => {
+  const spec = (() => {
+    const inner = Obj(['p21', 'p22'], {
+      enum: IntEnum(10, 20),
+      enumArray: Arr(IntEnum(10, 20))
+    });
+    return Obj(['p11', 'p12'], {
+      inner,
+      innerArray: Arr(inner)
+    });
+  })();
+
+  let onError;
+
+  function scan(obj) {
+    spec(null, null, null, obj, onError);
+  }
+
+  beforeEach(() => {
+    onError = sinon.stub();
+  });
+
+  it('checks object type', () => {
+    scan(null);
+    sinon.assert.calledWith(onError, ERR_TYPE, null, null, null, null);
+  });
+  it('ignores known fields and ext', () => {
+    scan({p11: 1, p12: 2, ext: {e1: 1, e2: 2}});
+    sinon.assert.notCalled(onError);
+  });
+  it('detects unknown fields', () => {
+    const obj = {p11: 1, unk: 2};
+    scan(obj);
+    sinon.assert.calledOnce(onError);
+    sinon.assert.calledWith(onError, ERR_UNKNOWN_FIELD, 'unk', obj, 'unk', 2);
+  });
+  describe('when nested', () => {
+    describe('directly', () => {
+      it('detects unknown fields', () => {
+        const obj = {inner: {p21: 1, unk: 2}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_UNKNOWN_FIELD, 'inner.unk', obj.inner, 'unk', 2);
+      });
+      it('accepts enum values in range', () => {
+        scan({inner: {enum: 12}});
+        sinon.assert.notCalled(onError);
+      });
+      [Infinity, NaN, -Infinity].forEach(val => {
+        it(`does not accept ${val} in enum`, () => {
+          const obj = {inner: {enum: val}};
+          scan(obj);
+          sinon.assert.calledOnce(onError);
+          sinon.assert.calledWith(onError, ERR_ENUM, 'inner.enum', obj.inner, 'enum', val);
+        });
+      });
+      it('accepts arrays of enums that are in range', () => {
+        scan({inner: {enumArray: [12, 13]}});
+        sinon.assert.notCalled(onError);
+      })
+      it('detects enum values out of range', () => {
+        const obj = {inner: {enum: -1}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_ENUM, 'inner.enum', obj.inner, 'enum', -1);
+      });
+      it('detects enum values that are not numbers', () => {
+        const obj = {inner: {enum: 'err'}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'inner.enum', obj.inner, 'enum', 'err');
+      })
+      it('detects arrays of enums that are out of range', () => {
+        const obj = {inner: {enumArray: [12, 13, -1, 14]}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_ENUM, 'inner.enumArray.2', obj.inner.enumArray, 2, -1);
+      });
+      it('detects when enum arrays are not arrays', () => {
+        const obj = {inner: {enumArray: 'err'}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'inner.enumArray', obj.inner, 'enumArray', 'err');
+      });
+      it('detects items within enum arrays that are not numbers', () => {
+        const obj = {inner: {enumArray: [12, 'err', 13]}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'inner.enumArray.1', obj.inner.enumArray, 1, 'err');
+      })
+    });
+    describe('into arrays', () => {
+      it('detects if inner array is not an array', () => {
+        const obj = {innerArray: 'err', inner: {p21: 1}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'innerArray', obj, 'innerArray', 'err');
+      });
+      it('detects when elements of inner array are not objects', () => {
+        const obj = {innerArray: [{p21: 1}, 'err', {ext: {r: 1}}]};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'innerArray.1', obj.innerArray, 1, 'err');
+      });
+      const oos = {
+        innerArray: [
+          {p22: 2, unk: 3, enumArray: [-1, 12, 'err']},
+          {p21: 1, enum: -1, ext: {e: 1}},
+        ]
+      };
+      it('detects invalid properties within inner array', () => {
+        const obj = deepClone(oos);
+        scan(obj);
+        sinon.assert.calledWith(onError, ERR_UNKNOWN_FIELD, 'innerArray.0.unk', obj.innerArray[0], 'unk', 3);
+        sinon.assert.calledWith(onError, ERR_ENUM, 'innerArray.0.enumArray.0', obj.innerArray[0].enumArray, 0, -1);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'innerArray.0.enumArray.2', obj.innerArray[0].enumArray, 2, 'err');
+        sinon.assert.calledWith(onError, ERR_ENUM, 'innerArray.1.enum', obj.innerArray[1], 'enum', -1);
+      });
+      it('can remove all invalid properties during scan', () => {
+        onError.callsFake((errno, path, obj, field) => {
+          Array.isArray(obj) ? obj.splice(field, 1) : delete obj[field];
+        });
+        const obj = deepClone(oos);
+        scan(obj);
+        expect(obj).to.eql({
+          innerArray: [
+            {p22: 2, enumArray: [12]},
+            {p21: 1, ext: {e: 1}}
+          ]
+        });
+      })
+    })
+  })
+});
diff --git a/test/spec/ortb2.5StrictTranslator/spec_spec.js b/test/spec/ortb2.5StrictTranslator/spec_spec.js
new file mode 100644
index 00000000000..a54b551bf61
--- /dev/null
+++ b/test/spec/ortb2.5StrictTranslator/spec_spec.js
@@ -0,0 +1,358 @@
+import {BidRequest} from '../../../libraries/ortb2.5StrictTranslator/spec.js';
+
+// sample requests taken from ORTB 2.5 spec: https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf
+const SAMPLE_REQUESTS = [
+  {
+    'id': '80ce30c53c16e6ede735f123ef6e32361bfc7b22',
+    'at': 1,
+    'cur': ['USD'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'banner': {
+          'h': 250, 'w': 300, 'pos': 0
+        }
+      }
+    ],
+    'site': {
+      'id': '102855',
+      'cat': ['IAB3-1'],
+      'domain': 'www.foobar.com',
+      'page': 'http://www.foobar.com/1234.html ',
+      'publisher': {
+        'id': '8953',
+        'name': 'foobar.com',
+        'cat': ['IAB3-1'],
+        'domain': 'foobar.com'
+      }
+    },
+    'device': {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+      'ip': '123.145.167.10'
+    },
+    'user': {
+      'id': '55816b39711f9b5acf3b90e313ed29e51665623f'
+    }
+  },
+  {
+    'id': '123456789316e6ede735f123ef6e32361bfc7b22',
+    'at': 2,
+    'cur': ['USD'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'iframebuster': ['vendor1.com', 'vendor2.com'],
+        'banner': {
+          'h': 250,
+          'w': 300,
+          'pos': 0,
+          'battr': [13],
+          'expdir': [2, 4]
+        }
+      }
+    ],
+    'site': {
+      'id': '102855',
+      'cat': ['IAB3-1'],
+      'domain': 'www.foobar.com',
+      'page': 'http://www.foobar.com/1234.html',
+      'publisher': {
+        'id': '8953',
+        'name': 'foobar.com',
+        'cat': ['IAB3-1'],
+        'domain': 'foobar.com'
+      }
+    },
+    'device': {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+      'ip': '123.145.167.10'
+    },
+    'user': {
+      'id': '55816b39711f9b5acf3b90e313ed29e51665623f',
+      'buyeruid': '545678765467876567898765678987654',
+      'data': [
+        {
+          'id': '6',
+          'name': 'Data Provider 1',
+          'segment': [
+            {
+              'id': '12341318394918', 'name': 'auto intenders'
+            },
+            {
+              'id': '1234131839491234', 'name': 'auto enthusiasts'
+            },
+            {
+              'id': '23423424',
+              'name': 'data-provider1-age',
+              'value': '30-40'
+            }
+          ]
+        }
+      ]
+    }
+  },
+  {
+    'id': 'IxexyLDIIk',
+    'at': 2,
+    'bcat': ['IAB25', 'IAB7-39', 'IAB8-18', 'IAB8-5', 'IAB9-9'],
+    'badv': ['apple.com', 'go-text.me', 'heywire.com'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.5,
+        'instl': 0,
+        'tagid': 'agltb3B1Yi1pbmNyDQsSBFNpdGUY7fD0FAw',
+        'banner': {
+          'w': 728,
+          'h': 90,
+          'pos': 1,
+          'btype': [4],
+          'battr': [14],
+          'api': [3]
+        }
+      }
+    ],
+    'app': {
+      'id': 'agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA',
+      'name': 'Yahoo Weather',
+      'cat': ['IAB15', 'IAB15-10'],
+      'ver': '1.0.2',
+      'bundle': '12345',
+      'storeurl': 'https://itunes.apple.com/id628677149',
+      'publisher': {
+        'id': 'agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV',
+        'name': 'yahoo',
+        'domain': 'www.yahoo.com'
+      }
+    },
+    'device': {
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3',
+      'ip': '123.145.167.189',
+      'ifa': 'AA000DFE74168477C70D291f574D344790E0BB11',
+      'carrier': 'VERIZON',
+      'language': 'en',
+      'make': 'Apple',
+      'model': 'iPhone',
+      'os': 'iOS',
+      'osv': '6.1',
+      'js': 1,
+      'connectiontype': 3,
+      'devicetype': 1,
+      'geo': {
+        'lat': 35.012345,
+        'lon': -115.12345,
+        'country': 'USA',
+        'metro': '803',
+        'region': 'CA',
+        'city': 'Los Angeles',
+        'zip': '90049'
+      }
+    },
+    'user': {
+      'id': 'ffffffd5135596709273b3a1a07e466ea2bf4fff',
+      'yob': 1984,
+      'gender': 'M'
+    }
+  },
+  {
+    'id': '1234567893',
+    'at': 2,
+    'tmax': 120,
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'video': {
+          'w': 640,
+          'h': 480,
+          'pos': 1,
+          'startdelay': 0,
+          'minduration': 5,
+          'maxduration': 30,
+          'maxextended': 30,
+          'minbitrate': 300,
+          'maxbitrate': 1500,
+          'api': [1, 2],
+          'protocols': [2, 3],
+          'mimes': [
+            'video/x-flv',
+            'video/mp4',
+            'application/x-shockwave-flash',
+            'application/javascript'
+          ],
+          'linearity': 1,
+          'boxingallowed': 1,
+          'playbackmethod': [1, 3],
+          'delivery': [2],
+          'battr': [13, 14],
+          'companionad': [
+            {
+              'id': '1234567893-1',
+              'w': 300,
+              'h': 250,
+              'pos': 1,
+              'battr': [13, 14],
+              'expdir': [2, 4]
+            },
+            {
+              'id': '1234567893-2',
+              'w': 728,
+              'h': 90,
+              'pos': 1,
+              'battr': [13, 14]
+            }
+          ],
+          'companiontype': [1, 2]
+        }
+      }
+    ],
+    'site': {
+      'id': '1345135123',
+      'name': 'Site ABCD',
+      'domain': 'siteabcd.com',
+      'cat': ['IAB2-1', 'IAB2-2'],
+      'page': 'http://siteabcd.com/page.htm',
+      'ref': 'http://referringsite.com/referringpage.htm',
+      'privacypolicy': 1,
+      'publisher': {
+        'id': 'pub12345', 'name': 'Publisher A'
+      },
+      'content': {
+        'id': '1234567',
+        'series': 'All About Cars',
+        'season': '2',
+        'episode': 23,
+        'title': 'Car Show',
+        'cat': ['IAB2-2'],
+        'keywords': 'keyword-a,keyword-b,keyword-c'
+      }
+    },
+    'device': {
+      'ip': '64.124.253.1',
+      'ua': 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.16) Gecko/20110319 Firefox/3.6.16',
+      'os': 'OS X',
+      'flashver': '10.1',
+      'js': 1
+    },
+    'user': {
+      'id': '456789876567897654678987656789',
+      'buyeruid': '545678765467876567898765678987654',
+      'data': [
+        {
+          'id': '6',
+          'name': 'Data Provider 1',
+          'segment': [
+            {
+              'id': '12341318394918', 'name': 'auto intenders'
+            },
+            {
+              'id': '1234131839491234', 'name': 'auto enthusiasts'
+            }
+          ]
+        }
+      ]
+    }
+  },
+  {
+    'id': '80ce30c53c16e6ede735f123ef6e32361bfc7b22',
+    'at': 1,
+    'cur': ['USD'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'banner': {
+          'h': 250, 'w': 300, 'pos': 0
+        },
+        'pmp': {
+          'private_auction': 1,
+          'deals': [
+            {
+              'id': 'AB-Agency1-0001',
+              'at': 1,
+              'bidfloor': 2.5,
+              'wseat': ['Agency1']
+            },
+            {
+              'id': 'XY-Agency2-0001',
+              'at': 2,
+              'bidfloor': 2,
+              'wseat': ['Agency2']
+            }
+          ]
+        }
+      }
+    ],
+    'site': {
+      'id': '102855',
+      'domain': 'www.foobar.com',
+      'cat': ['IAB3-1'],
+      'page': 'http://www.foobar.com/1234.html',
+      'publisher': {
+        'id': '8953',
+        'name': 'foobar.com',
+        'cat': ['IAB3-1'],
+        'domain': 'foobar.com'
+      }
+    },
+    'device': {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+      'ip': '123.145.167.10'
+    },
+    'user': {
+      'id': '55816b39711f9b5acf3b90e313ed29e51665623f'
+    }
+  },
+];
+
+if (FEATURES.NATIVE) {
+  SAMPLE_REQUESTS.push({
+    'id': '80ce30c53c16e6ede735f123ef6e32361bfc7b22',
+    'at': 1,
+    'cur': ['USD'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'native': {
+          'request': '{"native":{"ver":"1.0","assets":[ ... ]}}',
+          'ver': '1.0',
+          'api': [3],
+          'battr': [13, 14]
+        }
+      }
+    ],
+    'site': {
+      'id': '102855',
+      'cat': ['IAB3-1'],
+      'domain': 'www.foobar.com',
+      'page': 'http://www.foobar.com/1234.html ',
+      'publisher': {
+        'id': '8953',
+        'name': 'foobar.com',
+        'cat': ['IAB3-1'],
+        'domain': 'foobar.com'
+      }
+    },
+    'device': {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+      'ip': '123.145.167.10'
+    },
+    'user': {
+      'id': '55816b39711f9b5acf3b90e313ed29e51665623f'
+    }
+  });
+}
+
+describe('BidRequest spec', () => {
+  SAMPLE_REQUESTS.forEach((req, i) => {
+    it(`accepts sample #${i}`, () => {
+      const onError = sinon.stub();
+      BidRequest(null, null, null, req, onError);
+      sinon.assert.notCalled(onError);
+    });
+  });
+});
diff --git a/test/spec/ortb2.5StrictTranslator/translator_spec.js b/test/spec/ortb2.5StrictTranslator/translator_spec.js
new file mode 100644
index 00000000000..4bda3d96235
--- /dev/null
+++ b/test/spec/ortb2.5StrictTranslator/translator_spec.js
@@ -0,0 +1,16 @@
+import {toOrtb25Strict} from '../../../libraries/ortb2.5StrictTranslator/translator.js';
+
+describe('toOrtb25Strict', () => {
+  let translator;
+  beforeEach(() => {
+    translator = sinon.stub().callsFake((o) => o);
+  })
+  it('uses provided translator', () => {
+    translator.reset();
+    translator.callsFake(() => ({id: 'test'}));
+    expect(toOrtb25Strict(null, translator)).to.eql({id: 'test'});
+  });
+  it('removes fields out of spec', () => {
+    expect(toOrtb25Strict({unk: 'field', imp: ['err', {}]}, translator)).to.eql({imp: [{}]});
+  });
+});
diff --git a/test/spec/ortb2.5Translator/translator_spec.js b/test/spec/ortb2.5Translator/translator_spec.js
new file mode 100644
index 00000000000..db20a8f59be
--- /dev/null
+++ b/test/spec/ortb2.5Translator/translator_spec.js
@@ -0,0 +1,64 @@
+import {EXT_PROMOTIONS, moveRule, splitPath, toOrtb25} from '../../../libraries/ortb2.5Translator/translator.js';
+import {deepAccess, deepClone, deepSetValue} from '../../../src/utils.js';
+
+describe('ORTB 2.5 translation', () => {
+  describe('moveRule', () => {
+    const rule = moveRule('f1.f2.f3', (prefix, field) => `${prefix}.m1.m2.${field}`);
+
+    function applyRule(rule, obj, del = true) {
+      obj = deepClone(obj);
+      const deleter = rule(obj);
+      if (typeof deleter === 'function' && del) {
+        deleter();
+      }
+      return obj;
+    }
+
+    it('returns undef when field is not present', () => {
+      expect(rule({})).to.eql(undefined);
+    });
+    it('can copy field', () => {
+      expect(applyRule(rule, {f1: {f2: {f3: 'value'}}}, false)).to.eql({
+        f1: {
+          f2: {
+            f3: 'value',
+            m1: {m2: {f3: 'value'}}
+          }
+        }
+      });
+    });
+    it('can move field', () => {
+      expect(applyRule(rule, {f1: {f2: {f3: 'value'}}}, true)).to.eql({f1: {f2: {m1: {m2: {f3: 'value'}}}}});
+    });
+  });
+  describe('toOrtb25', () => {
+    EXT_PROMOTIONS.forEach(path => {
+      const newPath = (() => {
+        const [prefix, field] = splitPath(path);
+        return `${prefix}.ext.${field}`;
+      })();
+
+      it(`moves ${path} to ${newPath}`, () => {
+        const obj = {};
+        deepSetValue(obj, path, 'val');
+        toOrtb25(obj);
+        expect(deepAccess(obj, path)).to.eql(undefined);
+        expect(deepAccess(obj, newPath)).to.eql('val');
+      });
+    });
+    it('moves kwarray into keywords', () => {
+      expect(toOrtb25({app: {keywords: 'k1,k2', kwarray: ['ka1', 'ka2']}})).to.eql({app: {keywords: 'k1,k2,ka1,ka2'}});
+    });
+    it('does not choke if kwarray is not an array', () => {
+      expect(toOrtb25({site: {keywords: 'k1,k2', kwarray: 'err'}})).to.eql({site: {keywords: 'k1,k2'}});
+    });
+    it('does not choke if keywords is not a string', () => {
+      expect(toOrtb25({user: {keywords: {}, kwarray: ['ka1', 'ka2']}})).to.eql({
+        user: {
+          keywords: {},
+          kwarray: ['ka1', 'ka2']
+        }
+      });
+    });
+  });
+});
diff --git a/test/spec/ortbConverter/banner_spec.js b/test/spec/ortbConverter/banner_spec.js
new file mode 100644
index 00000000000..0f6686283a1
--- /dev/null
+++ b/test/spec/ortbConverter/banner_spec.js
@@ -0,0 +1,203 @@
+import {fillBannerImp, bannerResponseProcessor} from '../../../libraries/ortbConverter/processors/banner.js';
+import {BANNER, VIDEO} from '../../../src/mediaTypes.js';
+import {inIframe} from '../../../src/utils.js';
+
+const topframe = inIframe() ? 0 : 1;
+
+describe('pbjs -> ortb banner conversion', () => {
+  [
+    {
+      t: 'non-banner request',
+      request: {
+        mediaTypes: {
+          video: {}
+        }
+      },
+      imp: {}
+    },
+    {
+      t: 'banner with no sizes',
+      request: {
+        mediaTypes: {
+          banner: {
+            pos: 'pos',
+          }
+        }
+      },
+      imp: {
+        banner: {
+          topframe,
+          pos: 'pos',
+        }
+      }
+    },
+    {
+      t: 'single size banner',
+      request: {
+        mediaTypes: {
+          banner: {
+            sizes: [1, 2],
+          }
+        }
+      },
+      imp: {
+        banner: {
+          format: [
+            {w: 1, h: 2}
+          ],
+          topframe,
+        }
+      }
+    },
+    {
+      t: 'multi size banner',
+      request: {
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 2], [3, 4]]
+          }
+        }
+      },
+      imp: {
+        banner: {
+          format: [
+            {w: 1, h: 2},
+            {w: 3, h: 4}
+          ],
+          topframe,
+        }
+      }
+    },
+    {
+      t: 'banner with pos param',
+      request: {
+        mediaTypes: {
+          banner: {
+            sizes: [1, 2],
+            pos: 'pos'
+          }
+        }
+      },
+      imp: {
+        banner: {
+          format: [
+            {w: 1, h: 2}
+          ],
+          pos: 'pos',
+          topframe,
+        }
+      },
+    },
+    {
+      t: 'banner with pos 0',
+      request: {
+        mediaTypes: {
+          banner: {
+            sizes: [1, 2],
+            pos: 0
+          }
+        }
+      },
+      imp: {
+        banner: {
+          format: [
+            {w: 1, h: 2}
+          ],
+          pos: 0,
+          topframe,
+        }
+      }
+    }
+  ].forEach(({t, request, imp}) => {
+    it(`can convert ${t}`, () => {
+      const actual = {};
+      fillBannerImp(actual, request, {});
+      expect(actual).to.eql(imp);
+    });
+  });
+
+  it('should keep ortb2Imp.banner', () => {
+    const imp = {
+      banner: {
+        someParam: 'someValue'
+      }
+    };
+    fillBannerImp(imp, {mediaTypes: {banner: {sizes: [1, 2]}}}, {});
+    expect(imp.banner.someParam).to.eql('someValue');
+  });
+
+  it('does nothing if context.mediaType is set but is not BANNER', () => {
+    const imp = {};
+    fillBannerImp(imp, {mediaTypes: {banner: {sizes: [1, 2]}}}, {mediaType: VIDEO});
+    expect(imp).to.eql({});
+  })
+});
+
+describe('ortb -> pbjs banner conversion', () => {
+  let createPixel, seatbid2Banner;
+  beforeEach(() => {
+    createPixel = sinon.stub().callsFake((url) => `${url}Pixel`);
+    seatbid2Banner = bannerResponseProcessor({createPixel});
+  });
+
+  [
+    {
+      t: 'non-banner request',
+      seatbid: {
+        adm: 'mockAdm',
+        nurl: 'mockNurl'
+      },
+      response: {
+        mediaType: VIDEO
+      },
+      expected: {
+        mediaType: VIDEO
+      }
+    },
+    {
+      t: 'response with both adm and nurl',
+      seatbid: {
+        adm: 'mockAdm',
+        nurl: 'mockUrl'
+      },
+      response: {
+        mediaType: BANNER,
+      },
+      expected: {
+        mediaType: BANNER,
+        ad: 'mockAdmmockUrlPixel'
+      }
+    },
+    {
+      t: 'response with just adm',
+      seatbid: {
+        adm: 'mockAdm'
+      },
+      response: {
+        mediaType: BANNER,
+      },
+      expected: {
+        mediaType: BANNER,
+        ad: 'mockAdm'
+      }
+    },
+    {
+      t: 'response with just nurl',
+      seatbid: {
+        nurl: 'mockNurl'
+      },
+      response: {
+        mediaType: BANNER
+      },
+      expected: {
+        mediaType: BANNER,
+        adUrl: 'mockNurl'
+      }
+    }
+  ].forEach(({t, seatbid, response, expected}) => {
+    it(`can handle ${t}`, () => {
+      seatbid2Banner(response, seatbid, context);
+      expect(response).to.eql(expected)
+    })
+  });
+})
diff --git a/test/spec/ortbConverter/composer_spec.js b/test/spec/ortbConverter/composer_spec.js
new file mode 100644
index 00000000000..f342df38fde
--- /dev/null
+++ b/test/spec/ortbConverter/composer_spec.js
@@ -0,0 +1,69 @@
+import {compose} from '../../../libraries/ortbConverter/lib/composer.js';
+
+describe('compose', () => {
+  it('runs each component in order of priority', () => {
+    const order = [];
+    const components = {
+      first: {
+        fn: sinon.stub().callsFake(() => order.push(1)),
+      },
+      second: {
+        fn: sinon.stub().callsFake(() => order.push(2)),
+        priority: 10
+      },
+      third: {
+        fn: sinon.stub().callsFake(() => order.push(3)),
+        priority: 5
+      }
+    };
+    compose(components)();
+    expect(order).to.eql([2, 3, 1]);
+  });
+
+  it('passes parameters to each component', () => {
+    const components = {
+      first: {
+        fn: sinon.stub()
+      },
+      second: {
+        fn: sinon.stub()
+      }
+    };
+    compose(components)('one', 'two');
+    Object.values(components).forEach(comp => {
+      sinon.assert.calledWith(comp.fn, 'one', 'two')
+    })
+  })
+
+  it('respects overrides', () => {
+    const components = {
+      first: {
+        fn: sinon.stub()
+      },
+      second: {
+        fn: sinon.stub()
+      }
+    };
+    const overrides = {
+      second: sinon.stub()
+    }
+    compose(components, overrides)('one', 'two');
+    sinon.assert.calledWith(overrides.second, components.second.fn, 'one', 'two')
+  })
+
+  it('disables components when override is false', () => {
+    const components = {
+      first: {
+        fn: sinon.stub(),
+      },
+      second: {
+        fn: sinon.stub()
+      }
+    };
+    const overrides = {
+      second: false
+    };
+    compose(components, overrides)('one', 'two');
+    sinon.assert.notCalled(components.second.fn);
+  })
+});
diff --git a/test/spec/ortbConverter/converter_spec.js b/test/spec/ortbConverter/converter_spec.js
new file mode 100644
index 00000000000..e00b46e66da
--- /dev/null
+++ b/test/spec/ortbConverter/converter_spec.js
@@ -0,0 +1,283 @@
+import {ortbConverter} from '../../../libraries/ortbConverter/converter.js';
+import {BID_RESPONSE, IMP, REQUEST, RESPONSE} from '../../../src/pbjsORTB.js';
+
+describe('pbjs-ortb converter', () => {
+  const MOCK_BIDDER_REQUEST = {
+    id: 'bidderRequest',
+    bids: [
+      {
+        id: 111
+      },
+      {
+        id: 112
+      }
+    ]
+  }
+
+  const MOCK_ORTB_RESPONSE = {
+    id: 'response',
+    seatbid: [
+      {
+        seat: 'mockBidder1',
+        bid: [
+          {
+            impid: 'imp0'
+          },
+          {
+            impid: 'imp1'
+          }
+        ]
+      },
+      {
+        seat: 'mockBidder2',
+        bid: [
+          {
+            impid: 'imp1'
+          }
+        ]
+      }
+    ]
+  }
+
+  let processors, reqCnt, impCnt;
+
+  beforeEach(() => {
+    reqCnt = 0;
+    impCnt = 0;
+    processors = {
+      [REQUEST]: {
+        req: {
+          fn(ortbRequest, bidderRequest, context) {
+            ortbRequest.id = `req${reqCnt++}`;
+            if (context.ctx) {
+              ortbRequest.ctx = context.ctx;
+            }
+          }
+        }
+      },
+      [IMP]: {
+        imp: {
+          fn(imp, bidRequest, context) {
+            imp.id = `imp${impCnt++}`;
+            imp.bidId = bidRequest.id;
+            if (context.ctx) {
+              imp.ctx = context.ctx;
+            }
+            if (context.reqContext?.ctx) {
+              imp.reqCtx = context.reqContext?.ctx;
+            }
+          }
+        }
+      },
+      [BID_RESPONSE]: {
+        resp: {
+          fn(bidResponse, bid, context) {
+            bidResponse.impid = bid.impid;
+            bidResponse.bidId = context.imp.bidId;
+            if (context.ctx) {
+              bidResponse.ctx = context.ctx;
+            }
+            if (context.reqContext?.ctx) {
+              bidResponse.reqCtx = context.reqContext?.ctx;
+            }
+          }
+        }
+      },
+      [RESPONSE]: {
+        resp: {
+          fn(response, ortbResponse, context) {
+            response.marker = true;
+            if (context.ctx) {
+              response.ctx = context.ctx;
+            }
+          }
+        }
+      }
+    }
+  });
+
+  function makeConverter(options = {}) {
+    options = Object.assign({
+      processors: () => processors
+    }, options);
+    return ortbConverter(options);
+  }
+
+  it('runs each processor', () => {
+    const cvt = makeConverter();
+    const request = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST});
+    expect(request).to.eql({
+      id: 'req0',
+      imp: [
+        {id: 'imp0', bidId: 111},
+        {id: 'imp1', bidId: 112}
+      ]
+    });
+    const response = cvt.fromORTB({request, response: MOCK_ORTB_RESPONSE});
+    expect(response.bids).to.eql([{
+      impid: 'imp0',
+      bidId: 111
+    }, {
+      impid: 'imp1',
+      bidId: 112
+    }, {
+      impid: 'imp1',
+      bidId: 112
+    }]);
+    expect(response.marker).to.be.true;
+  });
+
+  it('fromORTB throws if request was not produced by the same converter', () => {
+    expect(() => {
+      makeConverter().fromORTB({
+        request: {
+          imp: [
+            {
+              id: 'imp0'
+            }
+          ]
+        },
+        response: MOCK_ORTB_RESPONSE
+      })
+    }).to.throw();
+  });
+
+  it('gives precedence to the bidRequests argument over bidderRequest.bids', () => {
+    expect(makeConverter().toORTB({bidderRequest: MOCK_BIDDER_REQUEST, bidRequests: [MOCK_BIDDER_REQUEST.bids[0]]})).to.eql({
+      id: 'req0',
+      imp: [
+        {
+          id: 'imp0',
+          bidId: 111
+        }
+      ]
+    })
+  });
+
+  it('passes context to every processor', () => {
+    const cvt = makeConverter();
+    const request = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}});
+    expect(request.ctx).to.equal('context');
+    request.imp.forEach(imp => expect(imp.ctx).to.equal('context'));
+    const response = cvt.fromORTB({request, response: MOCK_ORTB_RESPONSE});
+    expect(response.ctx).to.eql('context');
+    response.bids.forEach(bidResponse => expect(bidResponse.ctx).to.equal('context'));
+  });
+
+  it('passes request context to imp and bidResponse processors', () => {
+    const cvt = makeConverter();
+    const request = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}});
+    expect(request.imp[0].reqCtx).to.eql('context');
+    const response = cvt.fromORTB({request, response: MOCK_ORTB_RESPONSE});
+    expect(response.bids[0].reqCtx).to.eql('context');
+  });
+
+  it('allows overriding of imp building with `imp`', () => {
+    const cvt = makeConverter({
+      imp: function (buildImp, bidRequest, context) {
+        return Object.assign({
+          extraArg: bidRequest.id,
+          extraCtx: context.ctx
+        }, buildImp(bidRequest, context));
+      }
+    });
+    const request = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}});
+    expect(request.imp.length).to.eql(2);
+    request.imp.forEach(imp => {
+      expect(imp.extraArg).to.eql(imp.bidId);
+      expect(imp.extraCtx).to.eql('context');
+    })
+  });
+
+  it('allows filtering imps with `imp`', () => {
+    const cvt = makeConverter({
+      imp(buildImp, bidRequest, context) {
+        if (bidRequest.id === 112) {
+          return buildImp(bidRequest, context);
+        }
+      }
+    });
+    expect(cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST}).imp.length).to.eql(1);
+  });
+
+  it('does not include imps that have no id', () => {
+    const cvt = makeConverter({
+      imp(buildImp, bidRequest, context) {
+        const imp = buildImp(bidRequest, context);
+        delete imp.id;
+        return imp;
+      }
+    });
+    expect(cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST}).imp.length).to.eql(0);
+  })
+
+  it('allows overriding of response building with bidResponse', () => {
+    const cvt = makeConverter({
+      bidResponse(buildResponse, bid, context) {
+        return Object.assign({
+          extraArg: context.bidRequest.id,
+          extraCtx: context.ctx
+        }, buildResponse(bid, context));
+      }
+    });
+    const response = cvt.fromORTB({
+      response: MOCK_ORTB_RESPONSE,
+      request: cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}})
+    });
+
+    expect(response.bids.length).to.equal(3);
+    response.bids.forEach(response => {
+      expect(response.extraArg).to.eql(response.bidId);
+      expect(response.extraCtx).to.eql('context');
+    });
+  });
+
+  it('allows filtering of responses with `bidResponse`', () => {
+    const cvt = makeConverter({
+      bidResponse(buildBidResponse, bid, context) {
+        if (context.seatbid.seat === 'mockBidder1' && context.imp.id === 'imp0') {
+          return buildBidResponse(bid, context);
+        }
+      }
+    });
+    expect(cvt.fromORTB({
+      request: cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST}),
+      response: MOCK_ORTB_RESPONSE
+    }).bids.length).to.equal(1);
+  });
+
+  it('allows overriding of request building with `request`', () => {
+    const cvt = makeConverter({
+      request(buildRequest, imps, bidderRequest, context) {
+        return {
+          request: buildRequest(imps, bidderRequest, context),
+          extraArg: bidderRequest.id,
+          extraCtx: context.ctx
+        }
+      }
+    });
+    const req = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}});
+    expect(req.extraArg).to.equal(MOCK_BIDDER_REQUEST.id);
+    expect(req.extraCtx).to.equal('context');
+    expect(req.request.imp.length).to.equal(2);
+  });
+
+  it('allows overriding of response building with `response`', () => {
+    const cvt = makeConverter({
+      response(buildResponse, bidResponses, ortbResponse, context) {
+        return {
+          response: buildResponse(bidResponses, ortbResponse, context),
+          extraArg: ortbResponse.id,
+          extraCtx: context.ctx
+        }
+      }
+    });
+    const resp = cvt.fromORTB({
+      request: cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}}),
+      response: MOCK_ORTB_RESPONSE,
+    });
+    expect(resp.extraArg).to.equal(MOCK_ORTB_RESPONSE.id);
+    expect(resp.extraCtx).to.equal('context');
+    expect(resp.response.bids.length).to.equal(3);
+  })
+})
diff --git a/test/spec/ortbConverter/currency_spec.js b/test/spec/ortbConverter/currency_spec.js
new file mode 100644
index 00000000000..76f81223f27
--- /dev/null
+++ b/test/spec/ortbConverter/currency_spec.js
@@ -0,0 +1,40 @@
+import {config} from 'src/config.js';
+import {setOrtbCurrency} from '../../../modules/currency.js';
+
+describe('pbjs -> ortb currency', () => {
+  before(() => {
+    config.resetConfig();
+  });
+
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  it('does not set cur by default', () => {
+    const req = {};
+    setOrtbCurrency(req, {}, {});
+    expect(req).to.eql({});
+  });
+
+  it('sets currency based on config', () => {
+    config.setConfig({
+      currency: {
+        adServerCurrency: 'EUR'
+      }
+    });
+    const req = {};
+    setOrtbCurrency(req, {}, {});
+    expect(req.cur).to.eql(['EUR']);
+  });
+
+  it('sets currency based on context', () => {
+    config.setConfig({
+      currency: {
+        adServerCurrency: 'EUR'
+      }
+    });
+    const req = {};
+    setOrtbCurrency(req, {}, {currency: 'JPY'});
+    expect(req.cur).to.eql(['JPY']);
+  })
+});
diff --git a/test/spec/ortbConverter/gdpr_spec.js b/test/spec/ortbConverter/gdpr_spec.js
new file mode 100644
index 00000000000..78fd1830438
--- /dev/null
+++ b/test/spec/ortbConverter/gdpr_spec.js
@@ -0,0 +1,9 @@
+import {setOrtbAdditionalConsent} from '../../../modules/consentManagement.js';
+
+describe('pbjs -> ortb addtlConsent', () => {
+  it('sets ConsentedProvidersSettings', () => {
+    const req = {};
+    setOrtbAdditionalConsent(req, {gdprConsent: {addtlConsent: 'tl'}});
+    expect(req.user.ext.ConsentedProvidersSettings.consented_providers).to.eql('tl');
+  });
+})
diff --git a/test/spec/ortbConverter/mediaTypes_spec.js b/test/spec/ortbConverter/mediaTypes_spec.js
new file mode 100644
index 00000000000..4f4fd99fb75
--- /dev/null
+++ b/test/spec/ortbConverter/mediaTypes_spec.js
@@ -0,0 +1,67 @@
+import {ORTB_MTYPES, setResponseMediaType} from '../../../libraries/ortbConverter/processors/mediaType.js';
+import {BANNER} from '../../../src/mediaTypes.js';
+import {extPrebidMediaType} from '../../../libraries/pbsExtensions/processors/mediaType.js';
+
+function testMtype(processor) {
+  describe('respects 2.6 mtype', () => {
+    Object.entries(ORTB_MTYPES).forEach(([mtype, pbtype]) => {
+      it(`${mtype} -> ${pbtype}`, () => {
+        const resp = {};
+        processor(resp, {
+          mtype: parseInt(mtype, 10)
+        }, {});
+        expect(resp.mediaType).to.eql(pbtype);
+      });
+    });
+  });
+}
+
+describe('ortb -> pbjs mediaType conversion', () => {
+  testMtype(setResponseMediaType);
+  it('throws if mtype is missing', () => {
+    expect(() => {
+      setResponseMediaType({}, {});
+    }).to.throw();
+  });
+
+  it('respects pre-set bidResponse.mediaType', () => {
+    const resp = {mediaType: 'video'};
+    setResponseMediaType(resp, {mtype: 1});
+    expect(resp.mediaType).to.eql('video');
+  });
+
+  it('gives precedence to context.mediaType', () => {
+    const resp = {};
+    setResponseMediaType(resp, {mtype: 1}, {mediaType: 'video'});
+    expect(resp.mediaType).to.eql('video')
+  })
+});
+
+describe('ortb -> pbjs mediaType conversion based on ext.prebid.type', () => {
+  testMtype(extPrebidMediaType);
+  describe('respects ext.prebid.type', () => {
+    Object.values(ORTB_MTYPES).forEach(mediaType => {
+      const response = {};
+      extPrebidMediaType(response, {
+        ext: {
+          prebid: {
+            type: mediaType
+          }
+        }
+      }, {});
+      expect(response.mediaType).to.eql(mediaType);
+    });
+  });
+
+  it('defaults to banner', () => {
+    const response = {};
+    extPrebidMediaType(response, {}, {});
+    expect(response.mediaType).to.eql(BANNER);
+  });
+
+  it('gives precedence to context.mediaType', () => {
+    const response = {};
+    extPrebidMediaType(response, {ext: {prebid: {type: 'banner'}}}, {mediaType: 'video'});
+    expect(response.mediaType).to.eql('video');
+  })
+});
diff --git a/test/spec/ortbConverter/mergeProcessors_spec.js b/test/spec/ortbConverter/mergeProcessors_spec.js
new file mode 100644
index 00000000000..ba15de06031
--- /dev/null
+++ b/test/spec/ortbConverter/mergeProcessors_spec.js
@@ -0,0 +1,59 @@
+import {mergeProcessors} from '../../../libraries/ortbConverter/lib/mergeProcessors.js';
+import {BID_RESPONSE, IMP, REQUEST, RESPONSE} from '../../../src/pbjsORTB.js';
+
+describe('mergeProcessors', () => {
+  it('can merge', () => {
+    const result = mergeProcessors({
+      [REQUEST]: {
+        first: {
+          priority: 0,
+          fn: 'first'
+        }
+      },
+      [RESPONSE]: {
+        second: {
+          priority: 1,
+          fn: 'second'
+        }
+      }
+    }, {
+      [REQUEST]: {
+        first: {
+          fn: 'overriden'
+        }
+      },
+      [IMP]: {
+        third: {
+          fn: 'third'
+        }
+      }
+    }, {
+      [IMP]: {
+        third: {
+          priority: 3,
+          fn: 'overridden'
+        }
+      }
+    });
+    expect(result).to.eql({
+      [REQUEST]: {
+        first: {
+          fn: 'overriden'
+        }
+      },
+      [IMP]: {
+        third: {
+          priority: 3,
+          fn: 'overridden'
+        },
+      },
+      [RESPONSE]: {
+        second: {
+          priority: 1,
+          fn: 'second'
+        }
+      },
+      [BID_RESPONSE]: {}
+    });
+  });
+});
diff --git a/test/spec/ortbConverter/multibid_spec.js b/test/spec/ortbConverter/multibid_spec.js
new file mode 100644
index 00000000000..4886aaf6069
--- /dev/null
+++ b/test/spec/ortbConverter/multibid_spec.js
@@ -0,0 +1,35 @@
+import {config} from 'src/config.js';
+import {setOrtbExtPrebidMultibid} from '../../../modules/multibid/index.js';
+
+describe('pbjs - ortb ext.prebid.multibid', () => {
+  before(() => {
+    config.resetConfig();
+  });
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  it('sets ext.prebid.multibid according to config', () => {
+    config.setConfig({
+      multibid: [
+        {
+          bidder: 'A',
+          maxBids: 2
+        },
+        {
+          bidder: 'B',
+          maxBids: 3
+        }
+      ]
+    });
+    const req = {};
+    setOrtbExtPrebidMultibid(req);
+    expect(req.ext.prebid.multibid).to.eql([{bidder: 'A', maxbids: 2}, {bidder: 'B', maxbids: 3}]);
+  });
+
+  it('does not set it if not configured', () => {
+    const req = {};
+    setOrtbExtPrebidMultibid(req);
+    expect(req).to.eql({});
+  })
+});
diff --git a/test/spec/ortbConverter/native_spec.js b/test/spec/ortbConverter/native_spec.js
new file mode 100644
index 00000000000..56c733817cd
--- /dev/null
+++ b/test/spec/ortbConverter/native_spec.js
@@ -0,0 +1,95 @@
+import {fillNativeImp, fillNativeResponse} from '../../../libraries/ortbConverter/processors/native.js';
+import {BANNER, NATIVE} from '../../../src/mediaTypes.js';
+
+describe('pbjs -> ortb native requests', () => {
+  function toNative(bidRequest, context) {
+    const imp = {};
+    fillNativeImp(imp, bidRequest, context);
+    return imp;
+  }
+
+  it('should do nothing if request has no nativeOrtbRequest', () => {
+    expect(toNative({}, {})).to.eql({});
+  });
+
+  it('should set imp.native according to nativeOrtbRequest', () => {
+    const nativeOrtbRequest = {ver: 'version', prop: 'value', assets: [{}]};
+    const imp = toNative({nativeOrtbRequest}, {});
+    expect(imp.native.ver).to.eql('version');
+    expect(JSON.parse(imp.native.request)).to.eql(nativeOrtbRequest);
+  });
+
+  it('should do nothing if context.mediaType is set but is not NATIVE', () => {
+    expect(toNative({nativeOrtbRequest: {ver: 'version'}}, {mediaType: BANNER})).to.eql({})
+  });
+
+  it('should merge context.nativeRequest', () => {
+    const nativeOrtbRequest = {ver: 'version', eventtrackers: [{tracker: 'req'}], assets: [{}]};
+    const nativeDefaults = {eventtrackers: [{tracker: 'default'}], other: 'other'};
+    const imp = toNative({nativeOrtbRequest}, {nativeRequest: nativeDefaults});
+    expect(imp.native.ver).to.eql('version');
+    expect(JSON.parse(imp.native.request)).to.eql({
+      assets: [{}],
+      ver: 'version',
+      eventtrackers: [{tracker: 'req'}],
+      other: 'other'
+    });
+  });
+
+  it('should keep ortb2Imp.native', () => {
+    const imp = {
+      native: {
+        something: 'orother'
+      }
+    }
+    fillNativeImp(imp, {nativeOrtbRequest: {ver: 'version'}}, {});
+    expect(imp.native.something).to.eql('orother')
+  });
+
+  it('should do nothing if there are no assets', () => {
+    const imp = {};
+    fillNativeImp(imp, {nativeOrtbRequest: {assets: []}}, {});
+    expect(imp).to.eql({});
+  })
+});
+
+describe('ortb -> ortb native response', () => {
+  const MOCK_NATIVE_RESPONSE = {
+    property: 'value',
+    assets: [
+      {
+        id: 0
+      }
+    ]
+  }
+  Object.entries({
+    'serialized': JSON.stringify(MOCK_NATIVE_RESPONSE),
+    'an object': MOCK_NATIVE_RESPONSE
+  }).forEach(([t, adm]) => {
+    describe(`when adm is ${t}`, () => {
+      let bid;
+      beforeEach(() => {
+        bid = {adm};
+      })
+      it('should set bidResponse.native', () => {
+        const bidResponse = {
+          mediaType: NATIVE
+        };
+        fillNativeResponse(bidResponse, bid, {});
+        expect(bidResponse.native).to.eql({ortb: MOCK_NATIVE_RESPONSE});
+      });
+    });
+    it('should throw if response has no assets', () => {
+      expect(() => fillNativeResponse({mediaType: NATIVE}, {adm: {...MOCK_NATIVE_RESPONSE, assets: null}}, {})).to.throw;
+    })
+    it('should do nothing if bidResponse.mediaType is not NATIVE', () => {
+      const bidResponse = {
+        mediaType: BANNER
+      };
+      fillNativeResponse(bidResponse, {adm: MOCK_NATIVE_RESPONSE}, {});
+      expect(bidResponse).to.eql({
+        mediaType: BANNER
+      })
+    })
+  })
+});
diff --git a/test/spec/ortbConverter/pbjsORTB_spec.js b/test/spec/ortbConverter/pbjsORTB_spec.js
new file mode 100644
index 00000000000..16aefec2b35
--- /dev/null
+++ b/test/spec/ortbConverter/pbjsORTB_spec.js
@@ -0,0 +1,67 @@
+import {
+  DEFAULT,
+  PBS,
+  PROCESSOR_TYPES,
+  processorRegistry,
+  REQUEST
+} from '../../../src/pbjsORTB.js';
+
+describe('pbjsORTB register / get processors', () => {
+  let registerOrtbProcessor, getProcessors;
+  beforeEach(() => {
+    ({registerOrtbProcessor, getProcessors} = processorRegistry());
+  })
+  PROCESSOR_TYPES.forEach(type => {
+    it(`can get and set ${type} processors`, () => {
+      const proc = function () {};
+      registerOrtbProcessor({
+        type,
+        name: 'test',
+        fn: proc
+      });
+      expect(getProcessors(DEFAULT)).to.eql({
+        [type]: {
+          test: {
+            priority: 0,
+            fn: proc
+          }
+        }
+      });
+    });
+  });
+
+  it('throws on wrong type', () => {
+    expect(() => registerOrtbProcessor({
+      type: 'incorrect',
+      name: 'test',
+      fn: function () {}
+    })).to.throw();
+  });
+
+  it('can set priority', () => {
+    const proc = function () {};
+    registerOrtbProcessor({type: REQUEST, name: 'test', fn: proc, priority: 10});
+    expect(getProcessors(DEFAULT)).to.eql({
+      [REQUEST]: {
+        test: {
+          priority: 10,
+          fn: proc
+        }
+      }
+    })
+  });
+
+  it('can assign processors to specific dialects', () => {
+    const proc = function () {};
+    registerOrtbProcessor({type: REQUEST, name: 'test', fn: proc, dialects: [PBS]});
+    expect(getProcessors(DEFAULT)).to.eql({});
+    expect(getProcessors(PBS)).to.eql({
+      [REQUEST]: {
+        test: {
+          priority: 0,
+          fn: proc
+        }
+      }
+    })
+  });
+});
diff --git a/test/spec/ortbConverter/pbsExtensions/adUnitCode_spec.js b/test/spec/ortbConverter/pbsExtensions/adUnitCode_spec.js
new file mode 100644
index 00000000000..e17f9e856b0
--- /dev/null
+++ b/test/spec/ortbConverter/pbsExtensions/adUnitCode_spec.js
@@ -0,0 +1,23 @@
+import {setImpAdUnitCode} from '../../../../libraries/pbsExtensions/processors/adUnitCode.js';
+
+describe('pbjs -> ortb adunit code to imp[].ext.prebid.adunitcode', () => {
+  function setImp(bidRequest) {
+    const imp = {};
+    setImpAdUnitCode(imp, bidRequest);
+    return imp;
+  }
+
+  it('it sets adunitcode in ext.prebid.adunitcode when adUnitCode is present', () => {
+    expect(setImp({bidder: 'mockBidder', adUnitCode: 'mockAdUnit'})).to.eql({
+      'ext': {
+        'prebid': {
+          'adunitcode': 'mockAdUnit'
+        }
+      }
+    })
+  });
+
+  it('does not set adunitcode in ext.prebid.adunitcode if adUnit is undefined', () => {
+    expect(setImp({bidder: 'mockBidder'})).to.eql({});
+  });
+});
diff --git a/test/spec/ortbConverter/pbsExtensions/aliases_spec.js b/test/spec/ortbConverter/pbsExtensions/aliases_spec.js
new file mode 100644
index 00000000000..712ceaa397c
--- /dev/null
+++ b/test/spec/ortbConverter/pbsExtensions/aliases_spec.js
@@ -0,0 +1,57 @@
+import {setRequestExtPrebidAliases} from '../../../../libraries/pbsExtensions/processors/aliases.js';
+
+describe('PBS - ortb ext.prebid.aliases', () => {
+  let aliasRegistry, bidderRegistry;
+
+  function setAliases(bidderRequest) {
+    const req = {}
+    setRequestExtPrebidAliases(req, bidderRequest, {}, {
+      am: {
+        bidderRegistry,
+        aliasRegistry
+      }
+    });
+    return req;
+  }
+
+  beforeEach(() => {
+    aliasRegistry = {};
+    bidderRegistry = {};
+  })
+
+  describe('has no effect if', () => {
+    it('bidder is not an alias', () => {
+      expect(setAliases({bidderCode: 'not-an-alias'})).to.eql({});
+    });
+
+    it('bidder sets skipPbsAliasing', () => {
+      aliasRegistry['alias'] = 'bidder';
+      bidderRegistry['alias'] = {
+        getSpec() {
+          return {
+            skipPbsAliasing: true
+          }
+        }
+      };
+      expect(setAliases({bidderCode: 'alias'})).to.eql({});
+    });
+  });
+
+  it('sets ext.prebid.aliases.BIDDER', () => {
+    aliasRegistry['alias'] = 'bidder';
+    bidderRegistry['alias'] = {
+      getSpec() {
+        return {}
+      }
+    };
+    expect(setAliases({bidderCode: 'alias'})).to.eql({
+      ext: {
+        prebid: {
+          aliases: {
+            alias: 'bidder'
+          }
+        }
+      }
+    })
+  });
+})
diff --git a/test/spec/ortbConverter/pbsExtensions/params_spec.js b/test/spec/ortbConverter/pbsExtensions/params_spec.js
new file mode 100644
index 00000000000..73b92a0755d
--- /dev/null
+++ b/test/spec/ortbConverter/pbsExtensions/params_spec.js
@@ -0,0 +1,96 @@
+import {setImpBidParams} from '../../../../libraries/pbsExtensions/processors/params.js';
+
+describe('pbjs -> ortb bid params to imp[].ext.prebid.BIDDER', () => {
+  let bidderRegistry, index, adUnit;
+  beforeEach(() => {
+    bidderRegistry = {};
+    adUnit = {code: 'mockAdUnit'};
+    index = {
+      getAdUnit() {
+        return adUnit;
+      }
+    }
+  });
+
+  function setParams(bidRequest, context, deps = {}) {
+    const imp = {};
+    setImpBidParams(imp, bidRequest, context, Object.assign({bidderRegistry, index}, deps))
+    return imp;
+  }
+
+  it('sets params in ext.prebid.bidder.BIDDER', () => {
+    expect(setParams({bidder: 'mockBidder', params: {a: 'param'}})).to.eql({
+      ext: {
+        prebid: {
+          bidder: {
+            mockBidder: {
+              a: 'param'
+            }
+          }
+        }
+      }
+    })
+  });
+
+  it('has no effect if bidRequest has no params', () => {
+    expect(setParams({bidder: 'mockBidder'})).to.eql({});
+  })
+
+  describe('when adapter provides transformBidParams', () => {
+    let transform, bidderRequest;
+    beforeEach(() => {
+      bidderRequest = {bidderCode: 'mockBidder'};
+      transform = sinon.stub().callsFake((p) => Object.assign({transformed: true}, p));
+      bidderRegistry.mockBidder = {
+        getSpec() {
+          return {
+            transformBidParams: transform
+          }
+        }
+      }
+    })
+
+    it('runs params through transform', () => {
+      expect(setParams({bidder: 'mockBidder', params: {a: 'param'}}, {bidderRequest})).to.eql({
+        ext: {
+          prebid: {
+            bidder: {
+              mockBidder: {
+                a: 'param',
+                transformed: true
+              }
+            }
+          }
+        }
+      });
+    });
+
+    it('runs through transform even if bid has no params', () => {
+      expect(setParams({bidder: 'mockBidder'}, {bidderRequest})).to.eql({
+        ext: {
+          prebid: {
+            bidder: {
+              mockBidder: {
+                transformed: true
+              }
+            }
+          }
+        }
+      })
+    })
+
+    it('by default, passes adUnit from index, bidderRequest from context', () => {
+      const params = {a: 'param'};
+      setParams({bidder: 'mockBidder', params}, {bidderRequest});
+      sinon.assert.calledWith(transform, params, true, adUnit, [bidderRequest])
+    });
+
+    it('uses provided adUnit, bidderRequests', () => {
+      const adUnit = {code: 'other-ad-unit'};
+      const bidderRequests = [{bidderCode: 'one'}, {bidderCode: 'two'}];
+      const params = {a: 'param'};
+      setParams({bidder: 'mockBidder', params}, {}, {adUnit, bidderRequests});
+      sinon.assert.calledWith(transform, params, true, adUnit, bidderRequests);
+    })
+  });
+});
diff --git a/test/spec/ortbConverter/pbsExtensions/video_spec.js b/test/spec/ortbConverter/pbsExtensions/video_spec.js
new file mode 100644
index 00000000000..5bba32c447a
--- /dev/null
+++ b/test/spec/ortbConverter/pbsExtensions/video_spec.js
@@ -0,0 +1,52 @@
+import {setBidResponseVideoCache} from '../../../../libraries/pbsExtensions/processors/video.js';
+
+describe('pbjs - ortb videoCacheKey based on ext.prebid', () => {
+  const EXT_PREBID_CACHE = {
+    ext: {
+      prebid: {
+        cache: {
+          vastXml: {
+            cacheId: 'id',
+            url: 'url'
+          }
+        }
+      }
+    }
+  }
+
+  function setCache(bid) {
+    const bidResponse = {mediaType: 'video'};
+    setBidResponseVideoCache(bidResponse, bid);
+    return bidResponse;
+  }
+
+  it('has no effect if mediaType is not video', () => {
+    const resp = {mediaType: 'banner'};
+    setBidResponseVideoCache(resp, EXT_PREBID_CACHE);
+    expect(resp).to.eql({mediaType: 'banner'});
+  });
+
+  it('sets videoCacheKey, vastUrl from ext.prebid.cache.vastXml', () => {
+    sinon.assert.match(setCache(EXT_PREBID_CACHE), {
+      videoCacheKey: 'id',
+      vastUrl: 'url'
+    });
+  });
+
+  it('sets videoCacheKey, vastUrl from ext.prebid.targeting', () => {
+    sinon.assert.match(setCache({
+      ext: {
+        prebid: {
+          targeting: {
+            hb_uuid: 'id',
+            hb_cache_host: 'host',
+            hb_cache_path: '/path'
+          }
+        }
+      }
+    }), {
+      vastUrl: 'https://host/path?uuid=id',
+      videoCacheKey: 'id'
+    })
+  });
+});
diff --git a/test/spec/ortbConverter/priceFloors_spec.js b/test/spec/ortbConverter/priceFloors_spec.js
new file mode 100644
index 00000000000..f6d37992711
--- /dev/null
+++ b/test/spec/ortbConverter/priceFloors_spec.js
@@ -0,0 +1,143 @@
+import {config} from 'src/config.js';
+import {setOrtbExtPrebidFloors, setOrtbImpBidFloor} from '../../../modules/priceFloors.js';
+import 'src/prebid.js';
+
+describe('pbjs - ortb imp floor params', () => {
+  before(() => {
+    config.resetConfig();
+  });
+
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  Object.entries({
+    'has no getFloor': {},
+    'has getFloor that throws': {
+      getFloor: sinon.stub().callsFake(() => { throw new Error() }),
+    },
+    'returns invalid floor': {
+      getFloor: sinon.stub().callsFake(() => ({floor: NaN, currency: null}))
+    }
+  }).forEach(([t, req]) => {
+    it(`has no effect if bid ${t}`, () => {
+      const imp = {};
+      setOrtbImpBidFloor(imp, {}, {});
+      expect(imp).to.eql({});
+    })
+  })
+
+  it('sets bidfoor and bidfloorcur according to getFloor', () => {
+    const imp = {};
+    const req = {
+      getFloor() {
+        return {
+          currency: 'EUR',
+          floor: '1.23'
+        }
+      }
+    };
+    setOrtbImpBidFloor(imp, req, {});
+    expect(imp).to.eql({
+      bidfloor: 1.23,
+      bidfloorcur: 'EUR'
+    })
+  });
+
+  Object.entries({
+    'missing currency': {floor: 1.23},
+    'missing floor': {currency: 'USD'},
+    'not a number': {floor: 'abc', currency: 'USD'}
+  }).forEach(([t, floor]) => {
+    it(`should not set bidfloor if floor is ${t}`, () => {
+      const imp = {};
+      const req = {
+        getFloor: () => floor
+      }
+      setOrtbImpBidFloor(imp, req, {});
+      expect(imp).to.eql({});
+    })
+  })
+
+  describe('asks for floor in currency', () => {
+    let req;
+    beforeEach(() => {
+      req = {
+        getFloor(opts) {
+          return {
+            floor: 1.23,
+            currency: opts.currency
+          }
+        }
+      }
+    })
+
+    it('from context.currency', () => {
+      const imp = {};
+      setOrtbImpBidFloor(imp, req, {currency: 'JPY'});
+      config.setConfig({
+        currency: {
+          adServerCurrency: 'EUR'
+        }
+      })
+      expect(imp.bidfloorcur).to.eql('JPY');
+    });
+
+    it('from config', () => {
+      const imp = {};
+      config.setConfig({
+        currency: {
+          adServerCurrency: 'EUR'
+        }
+      });
+      setOrtbImpBidFloor(imp, req, {});
+      expect(imp.bidfloorcur).to.eql('EUR');
+    });
+
+    it('defaults to USD', () => {
+      const imp = {};
+      setOrtbImpBidFloor(imp, req, {});
+      expect(imp.bidfloorcur).to.eql('USD');
+    })
+  });
+
+  it('asks for specific mediaType if context.mediaType is set', () => {
+    let reqMediaType;
+    const req = {
+      getFloor(opts) {
+        reqMediaType = opts.mediaType;
+      }
+    }
+    setOrtbImpBidFloor({}, req, {mediaType: 'banner'});
+    expect(reqMediaType).to.eql('banner');
+  })
+});
+
+describe('setOrtbExtPrebidFloors', () => {
+  before(() => {
+    config.setConfig({floors: {}});
+  })
+  after(() => {
+    config.setConfig({floors: {enabled: false}});
+  });
+
+  it('should set ext.prebid.floors.enabled to false', () => {
+    const req = {};
+    setOrtbExtPrebidFloors(req);
+    expect(req.ext.prebid.floors.enabled).to.equal(false);
+  })
+
+  it('should respect fpd', () => {
+    const req = {
+      ext: {
+        prebid: {
+          floors: {
+            enabled: true
+          }
+        }
+      }
+    }
+    setOrtbExtPrebidFloors(req);
+    expect(req.ext.prebid.floors.enabled).to.equal(true);
+  })
+})
diff --git a/test/spec/ortbConverter/schain_spec.js b/test/spec/ortbConverter/schain_spec.js
new file mode 100644
index 00000000000..8eeef445948
--- /dev/null
+++ b/test/spec/ortbConverter/schain_spec.js
@@ -0,0 +1,33 @@
+import {setOrtbSourceExtSchain} from '../../../modules/schain.js';
+
+describe('pbjs - ortb source.ext.schain', () => {
+  it('sets schain from request', () => {
+    const req = {};
+    setOrtbSourceExtSchain(req, {}, {
+      bidRequests: [{schain: {s: 'chain'}}]
+    });
+    expect(req.source.ext.schain).to.eql({s: 'chain'});
+  });
+
+  it('does not set it if missing', () => {
+    const req = {};
+    setOrtbSourceExtSchain(req, {}, {bidRequests: [{}]});
+    expect(req).to.eql({});
+  })
+
+  it('does not set it if already in request', () => {
+    const req = {
+      source: {
+        ext: {
+          schain: {s: 'chain'}
+        }
+      }
+    }
+    setOrtbSourceExtSchain(req, {}, {
+      bidRequests: [{
+        schain: {other: 'chain'}
+      }]
+    });
+    expect(req.source.ext.schain).to.eql({s: 'chain'});
+  })
+});
diff --git a/test/spec/ortbConverter/userId_spec.js b/test/spec/ortbConverter/userId_spec.js
new file mode 100644
index 00000000000..0b1c8878edf
--- /dev/null
+++ b/test/spec/ortbConverter/userId_spec.js
@@ -0,0 +1,21 @@
+import {setOrtbUserExtEids} from '../../../modules/userId/index.js';
+
+describe('pbjs - ortb user eids', () => {
+  it('sets user.ext.eids from request', () => {
+    const req = {};
+    setOrtbUserExtEids(req, {}, {
+      bidRequests: [
+        {
+          userIdAsEids: {e: 'id'}
+        }
+      ]
+    });
+    expect(req.user.ext.eids).to.eql({e: 'id'});
+  });
+
+  it('has no effect if requests have no eids', () => {
+    const req = {};
+    setOrtbUserExtEids(req, {}, [{}]);
+    expect(req).to.eql({});
+  })
+})
diff --git a/test/spec/ortbConverter/video_spec.js b/test/spec/ortbConverter/video_spec.js
new file mode 100644
index 00000000000..8ac6d8b4d08
--- /dev/null
+++ b/test/spec/ortbConverter/video_spec.js
@@ -0,0 +1,189 @@
+import {fillVideoImp, fillVideoResponse, VALIDATIONS} from '../../../libraries/ortbConverter/processors/video.js';
+import {BANNER, VIDEO} from '../../../src/mediaTypes.js';
+
+describe('pbjs -> ortb video conversion', () => {
+  [
+    {
+      t: 'non-video request',
+      request: {
+        mediaTypes: {
+          banner: {}
+        }
+      },
+      imp: {}
+    },
+    {
+      t: 'instream video request',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [[1, 2]],
+            context: 'instream',
+            mimes: ['video/mp4'],
+            skip: 1,
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+          mimes: ['video/mp4'],
+          skip: 1,
+          placement: 1,
+        },
+      },
+    },
+    {
+      t: 'outstream video request',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [[1, 2]],
+            context: 'outstream',
+            mimes: ['video/mp4'],
+            skip: 1
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+          mimes: ['video/mp4'],
+          skip: 1,
+        },
+      },
+    },
+    {
+      t: 'video request with explicit placement',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [[1, 2]],
+            placement: 'explicit'
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+          placement: 'explicit',
+        }
+      }
+    },
+    {
+      t: 'video request with multiple playerSizes',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [[1, 2], [3, 4]]
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+        }
+      }
+    },
+    {
+      t: 'video request with 2-tuple playerSize',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [1, 2]
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+        }
+      }
+    },
+  ].forEach(({t, request, imp}) => {
+    it(`can handle ${t}`, () => {
+      const actual = {};
+      fillVideoImp(actual, request, {});
+      expect(actual).to.eql(imp);
+    });
+  });
+
+  it('should keep ortb2Imp.video', () => {
+    const imp = {
+      video: {
+        someParam: 'someValue'
+      }
+    };
+    fillVideoImp(imp, {mediaTypes: {video: {playerSize: [[1, 2]]}}}, {});
+    expect(imp.video.someParam).to.eql('someValue');
+  });
+
+  it('does nothing is context.mediaType is set but is not VIDEO', () => {
+    const imp = {};
+    fillVideoImp(imp, {mediaTypes: {video: {playerSize: [[1, 2]]}}}, {mediaType: BANNER});
+    expect(imp).to.eql({});
+  });
+});
+
+describe('ortb -> pbjs video conversion', () => {
+  [
+    {
+      t: 'non-video response',
+      seatbid: {},
+      response: {
+        mediaType: BANNER
+      },
+      expected: {
+        mediaType: BANNER
+      }
+    },
+    {
+      t: 'simple video response',
+      seatbid: {
+        adm: 'mockAdm',
+        nurl: 'mockNurl'
+      },
+      response: {
+        mediaType: VIDEO,
+      },
+      context: {
+        imp: {
+          video: {
+            w: 1,
+            h: 2
+          }
+        }
+      },
+      expected: {
+        mediaType: VIDEO,
+        playerWidth: 1,
+        playerHeight: 2,
+        vastXml: 'mockAdm',
+        vastUrl: 'mockNurl'
+      }
+    },
+    {
+      t: 'video response without playerSize',
+      seatbid: {},
+      response: {
+        mediaType: VIDEO,
+      },
+      context: {
+        imp: {}
+      },
+      expected: {
+        mediaType: VIDEO
+      }
+    }
+  ].forEach(({t, seatbid, context, response, expected}) => {
+    it(`can handle ${t}`, () => {
+      fillVideoResponse(response, seatbid, context);
+      expect(response).to.eql(expected);
+    })
+  })
+})
diff --git a/test/spec/refererDetection_spec.js b/test/spec/refererDetection_spec.js
index 90892d915fe..a0ffc3eddbe 100644
--- a/test/spec/refererDetection_spec.js
+++ b/test/spec/refererDetection_spec.js
@@ -1,87 +1,495 @@
-import { detectReferer } from 'src/refererDetection.js';
-import { expect } from 'chai';
-
-var mocks = {
-  createFakeWindow: function (referrer, href) {
-    return {
-      document: {
-        referrer: referrer
-      },
-      location: {
-        href: href,
-        // TODO: add ancestorOrigins to increase test coverage
+import {detectReferer, ensureProtocol, parseDomain} from 'src/refererDetection.js';
+import {config} from 'src/config.js';
+import {expect} from 'chai';
+
+import { buildWindowTree } from '../helpers/refererDetectionHelper';
+
+describe('Referer detection', () => {
+  afterEach(function () {
+    config.resetConfig();
+  });
+
+  describe('Non cross-origin scenarios', () => {
+    describe('No iframes', () => {
+      it('Should return the current window location and no canonical URL', () => {
+        const testWindow = buildWindowTree(['https://example.com/some/page'], 'https://othersite.com/'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page',
+          location: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page'],
+          canonicalUrl: null,
+          page: 'https://example.com/some/page',
+          ref: 'https://othersite.com/',
+          domain: 'example.com',
+        });
+      });
+
+      it('Should return the current window location and a canonical URL', () => {
+        const testWindow = buildWindowTree(['https://example.com/some/page'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page',
+          location: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page'],
+          canonicalUrl: 'https://example.com/canonical/page',
+          page: 'https://example.com/some/page',
+          ref: 'https://othersite.com/',
+          domain: 'example.com'
+        });
+      });
+
+      it('Should set page and canonical to pageUrl value set in config if present, even if canonical url is also present in head', () => {
+        config.setConfig({'pageUrl': 'https://www.set-from-config.com/path'});
+        const testWindow = buildWindowTree(['https://example.com/some/page'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page',
+          location: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page'],
+          canonicalUrl: 'https://www.set-from-config.com/path',
+          page: 'https://www.set-from-config.com/path',
+          ref: 'https://othersite.com/',
+          domain: 'www.set-from-config.com'
+        });
+      });
+
+      it('Should set page with query params if canonical url is present without query params but the current page does have them', () => {
+        config.setConfig({'pageUrl': 'https://www.set-from-config.com/path'});
+        const testWindow = buildWindowTree(['https://example.com/some/page?query1=123&query2=456'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page?query1=123&query2=456',
+          location: 'https://example.com/some/page?query1=123&query2=456',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page?query1=123&query2=456'],
+          canonicalUrl: 'https://www.set-from-config.com/path',
+          page: 'https://www.set-from-config.com/path?query1=123&query2=456',
+          ref: 'https://othersite.com/',
+          domain: 'www.set-from-config.com'
+        });
+      });
+    });
+
+    describe('Friendly iframes', () => {
+      it('Should return the top window location and no canonical URL', () => {
+        const testWindow = buildWindowTree(['https://example.com/some/page', 'https://example.com/other/page', 'https://example.com/third/page'], 'https://othersite.com/'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page',
+          location: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 2,
+          stack: [
+            'https://example.com/some/page',
+            'https://example.com/other/page',
+            'https://example.com/third/page'
+          ],
+          canonicalUrl: null,
+          page: 'https://example.com/some/page',
+          ref: 'https://othersite.com/',
+          domain: 'example.com'
+        });
+      });
+
+      it('Should return the top window location and a canonical URL', () => {
+        const testWindow = buildWindowTree(['https://example.com/some/page', 'https://example.com/other/page', 'https://example.com/third/page'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page',
+          location: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 2,
+          stack: [
+            'https://example.com/some/page',
+            'https://example.com/other/page',
+            'https://example.com/third/page'
+          ],
+          canonicalUrl: 'https://example.com/canonical/page',
+          page: 'https://example.com/some/page',
+          ref: 'https://othersite.com/',
+          domain: 'example.com'
+        });
+      });
+
+      it('Should override canonical URL (and page) with config pageUrl', () => {
+        config.setConfig({'pageUrl': 'https://testurl.com'});
+
+        const testWindow = buildWindowTree(['https://example.com/some/page', 'https://example.com/other/page', 'https://example.com/third/page'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page',
+          location: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 2,
+          stack: [
+            'https://example.com/some/page',
+            'https://example.com/other/page',
+            'https://example.com/third/page'
+          ],
+          canonicalUrl: 'https://testurl.com',
+          page: 'https://testurl.com',
+          ref: 'https://othersite.com/',
+          domain: 'testurl.com'
+        });
+      });
+    });
+  });
+
+  describe('Cross-origin scenarios', () => {
+    it('Should return the top URL and no canonical URL with one cross-origin iframe', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page', 'https://safe.frame/ad'], 'https://othersite.com/', 'https://canonical.example.com/'),
+        result = detectReferer(testWindow)();
+
+      sinon.assert.match(result, {
+        location: 'https://example.com/some/page',
+        topmostLocation: 'https://example.com/some/page',
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 1,
+        stack: [
+          'https://example.com/some/page',
+          'https://safe.frame/ad'
+        ],
+        canonicalUrl: null,
+        page: 'https://example.com/some/page',
+        ref: null,
+        domain: 'example.com'
+      });
+    });
+
+    it('Should return the top URL and no canonical URL with one cross-origin iframe and one friendly iframe', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page', 'https://safe.frame/ad', 'https://safe.frame/ad'], 'https://othersite.com/', 'https://canonical.example.com/'),
+        result = detectReferer(testWindow)();
+
+      sinon.assert.match(result, {
+        topmostLocation: 'https://example.com/some/page',
+        location: 'https://example.com/some/page',
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 2,
+        stack: [
+          'https://example.com/some/page',
+          'https://safe.frame/ad',
+          'https://safe.frame/ad'
+        ],
+        canonicalUrl: null,
+        page: 'https://example.com/some/page',
+        ref: null,
+        domain: 'example.com',
+      });
+    });
+
+    it('Should return the second iframe location with three cross-origin windows and no ancestorOrigins', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page', 'https://safe.frame/ad', 'https://otherfr.ame/ad'], 'https://othersite.com/', 'https://canonical.example.com/'),
+        result = detectReferer(testWindow)();
+
+      sinon.assert.match(result, {
+        topmostLocation: 'https://safe.frame/ad',
+        location: null,
+        reachedTop: false,
+        isAmp: false,
+        numIframes: 2,
+        stack: [
+          null,
+          'https://safe.frame/ad',
+          'https://otherfr.ame/ad'
+        ],
+        canonicalUrl: null,
+        page: null,
+        ref: null,
+        domain: null
+      });
+    });
+
+    it('Should return the top window origin with three cross-origin windows with ancestorOrigins', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page', 'https://safe.frame/ad', 'https://otherfr.ame/ad'], 'https://othersite.com/', 'https://canonical.example.com/', true),
+        result = detectReferer(testWindow)();
+
+      sinon.assert.match(result, {
+        topmostLocation: 'https://example.com/',
+        location: 'https://example.com/',
+        reachedTop: false,
+        isAmp: false,
+        numIframes: 2,
+        stack: [
+          'https://example.com/',
+          'https://safe.frame/ad',
+          'https://otherfr.ame/ad'
+        ],
+        canonicalUrl: null,
+        page: 'https://example.com/',
+        ref: null,
+        domain: 'example.com'
+      });
+    });
+  });
+
+  describe('Cross-origin AMP page scenarios', () => {
+    it('Should return the AMP page source and canonical URLs in an amp-ad iframe for a non-cached AMP page', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad']);
+
+      testWindow.context = {
+        sourceUrl: 'https://example.com/some/page/amp/',
+        canonicalUrl: 'https://example.com/some/page/'
+      };
+
+      const result = detectReferer(testWindow)();
+
+      sinon.assert.match(result, {
+        location: 'https://example.com/some/page/amp/',
+        topmostLocation: 'https://example.com/some/page/amp/',
+        reachedTop: true,
+        isAmp: true,
+        numIframes: 1,
+        stack: [
+          'https://example.com/some/page/amp/',
+          'https://ad-iframe.ampproject.org/ad'
+        ],
+        canonicalUrl: 'https://example.com/some/page/',
+        page: 'https://example.com/some/page/amp/',
+        ref: null,
+        domain: 'example.com'
+      });
+    });
+
+    it('Should return the AMP page source and canonical URLs in an amp-ad iframe for a cached AMP page on top', () => {
+      const testWindow = buildWindowTree(['https://example-com.amp-cache.example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad']);
+
+      testWindow.context = {
+        sourceUrl: 'https://example.com/some/page/amp/',
+        canonicalUrl: 'https://example.com/some/page/'
+      };
+
+      const result = detectReferer(testWindow)();
+
+      sinon.assert.match(result, {
+        topmostLocation: 'https://example.com/some/page/amp/',
+        location: 'https://example.com/some/page/amp/',
+        reachedTop: true,
+        isAmp: true,
+        numIframes: 1,
+        stack: [
+          'https://example.com/some/page/amp/',
+          'https://ad-iframe.ampproject.org/ad'
+        ],
+        canonicalUrl: 'https://example.com/some/page/',
+        page: 'https://example.com/some/page/amp/',
+        ref: null,
+        domain: 'example.com'
+      });
+    });
+
+    it('should respect pageUrl as the primary source of canonicalUrl', () => {
+      config.setConfig({
+        pageUrl: 'pub-defined'
+      });
+      const w = buildWindowTree(['https://example.com', 'https://amp.com']);
+      w.context = {
+        canonicalUrl: 'should-be-overridden'
+      };
+      expect(detectReferer(w)().canonicalUrl).to.equal('pub-defined');
+    });
+
+    describe('Cached AMP page in iframed search result', () => {
+      it('Should return the AMP source and canonical URLs but with a null top-level stack location Without ancesorOrigins', () => {
+        const testWindow = buildWindowTree(['https://google.com/amp/example-com/some/page/amp/', 'https://example-com.amp-cache.example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad']);
+
+        testWindow.context = {
+          sourceUrl: 'https://example.com/some/page/amp/',
+          canonicalUrl: 'https://example.com/some/page/'
+        };
+
+        const result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page/amp/',
+          location: 'https://example.com/some/page/amp/',
+          reachedTop: false,
+          isAmp: true,
+          numIframes: 2,
+          stack: [
+            null,
+            'https://example.com/some/page/amp/',
+            'https://ad-iframe.ampproject.org/ad'
+          ],
+          canonicalUrl: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
+          ref: null,
+          domain: 'example.com',
+        });
+      });
+
+      it('Should return the AMP source and canonical URLs and include the top window origin in the stack with ancesorOrigins', () => {
+        const testWindow = buildWindowTree(['https://google.com/amp/example-com/some/page/amp/', 'https://example-com.amp-cache.example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad'], null, null, true);
+
+        testWindow.context = {
+          sourceUrl: 'https://example.com/some/page/amp/',
+          canonicalUrl: 'https://example.com/some/page/'
+        };
+
+        const result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          location: 'https://example.com/some/page/amp/',
+          topmostLocation: 'https://example.com/some/page/amp/',
+          reachedTop: false,
+          isAmp: true,
+          numIframes: 2,
+          stack: [
+            'https://google.com/',
+            'https://example.com/some/page/amp/',
+            'https://ad-iframe.ampproject.org/ad'
+          ],
+          canonicalUrl: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
+          ref: null,
+          domain: 'example.com'
+        });
+      });
+
+      it('Should return the AMP source and canonical URLs and include the top window origin in the stack with ancesorOrigins and a friendly iframe under the amp-ad iframe', () => {
+        const testWindow = buildWindowTree(['https://google.com/amp/example-com/some/page/amp/', 'https://example-com.amp-cache.example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad', 'https://ad-iframe.ampproject.org/ad'], null, null, true);
+
+        testWindow.parent.context = {
+          sourceUrl: 'https://example.com/some/page/amp/',
+          canonicalUrl: 'https://example.com/some/page/'
+        };
+
+        const result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          location: 'https://example.com/some/page/amp/',
+          topmostLocation: 'https://example.com/some/page/amp/',
+          reachedTop: false,
+          isAmp: true,
+          numIframes: 3,
+          stack: [
+            'https://google.com/',
+            'https://example.com/some/page/amp/',
+            'https://ad-iframe.ampproject.org/ad',
+            'https://ad-iframe.ampproject.org/ad'
+          ],
+          canonicalUrl: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
+          ref: null,
+          domain: 'example.com',
+        });
+      });
+    });
+  });
+});
+
+describe('ensureProtocol', () => {
+  ['', null, undefined].forEach((val) => {
+    it(`should return unchanged invalid input: ${val}`, () => {
+      expect(ensureProtocol(val)).to.eql(val);
+    });
+  });
+
+  ['http:', 'https:'].forEach((protocol) => {
+    Object.entries({
+      'window.top.location.protocol': {
+        top: {
+          location: {
+            protocol
+          }
+        },
+        location: {
+          protocol: 'unused'
+        }
       },
-      parent: null,
-      top: null
-    };
-  }
-}
-
-describe('referer detection', () => {
-  it('should return referer details in nested friendly iframes', function() {
-    // Fake window object to test friendly iframes
-    // - Main page http://example.com/page.html
-    // - - Iframe1 http://example.com/iframe1.html
-    // - - - Iframe2 http://example.com/iframe2.html
-    let mockIframe2WinObject = mocks.createFakeWindow('http://example.com/iframe1.html', 'http://example.com/iframe2.html');
-    let mockIframe1WinObject = mocks.createFakeWindow('http://example.com/page.html', 'http://example.com/iframe1.html');
-    let mainWinObject = mocks.createFakeWindow('http://example.com/page.html', 'http://example.com/page.html');
-    mainWinObject.document.querySelector = function() {
-      return {
-        href: 'http://prebid.org'
-      }
-    }
-    mockIframe2WinObject.parent = mockIframe1WinObject;
-    mockIframe2WinObject.top = mainWinObject;
-    mockIframe1WinObject.parent = mainWinObject;
-    mockIframe1WinObject.top = mainWinObject;
-    mainWinObject.top = mainWinObject;
-
-    const getRefererInfo = detectReferer(mockIframe2WinObject);
-    let result = getRefererInfo();
-    let expectedResult = {
-      referer: 'http://example.com/page.html',
-      reachedTop: true,
-      numIframes: 2,
-      stack: [
-        'http://example.com/page.html',
-        'http://example.com/iframe1.html',
-        'http://example.com/iframe2.html'
-      ],
-      canonicalUrl: 'http://prebid.org'
-    };
-    expect(result).to.deep.equal(expectedResult);
+      'window.location.protocol': (() => {
+        const w = {
+          top: {},
+          location: {
+            protocol
+          }
+        };
+        Object.defineProperty(w.top, 'location', {
+          get: function () {
+            throw new Error('cross-origin');
+          }
+        });
+        return w;
+      })(),
+    }).forEach(([t, win]) => {
+      describe(`when ${t} declares ${protocol}`, () => {
+        Object.entries({
+          'declared': {
+            url: 'proto://example.com/page',
+            expect: 'proto://example.com/page'
+          },
+          'relative': {
+            url: '//example.com/page',
+            expect: `${protocol}//example.com/page`
+          },
+          'missing': {
+            url: 'example.com/page',
+            expect: `${protocol}//example.com/page`
+          }
+        }).forEach(([t, {url, expect: expected}]) => {
+          it(`should handle URLs with ${t} protocols`, () => {
+            expect(ensureProtocol(url, win)).to.equal(expected);
+          });
+        });
+      });
+    });
   });
+});
 
-  it('should return referer details in nested cross domain iframes', function() {
-    // Fake window object to test cross domain iframes.
-    // - Main page http://example.com/page.html
-    // - - Iframe1 http://aaa.com/iframe1.html
-    // - - - Iframe2 http://bbb.com/iframe2.html
-    let mockIframe2WinObject = mocks.createFakeWindow('http://aaa.com/iframe1.html', 'http://bbb.com/iframe2.html');
-    // Sinon cannot throw exception when accessing a propery so passing null to create cross domain
-    // environment for refererDetection module
-    let mockIframe1WinObject = mocks.createFakeWindow(null, null);
-    let mainWinObject = mocks.createFakeWindow(null, null);
-    mockIframe2WinObject.parent = mockIframe1WinObject;
-    mockIframe2WinObject.top = mainWinObject;
-    mockIframe1WinObject.parent = mainWinObject;
-    mockIframe1WinObject.top = mainWinObject;
-    mainWinObject.top = mainWinObject;
-
-    const getRefererInfo = detectReferer(mockIframe2WinObject);
-    let result = getRefererInfo();
-    let expectedResult = {
-      referer: 'http://aaa.com/iframe1.html',
-      reachedTop: false,
-      numIframes: 2,
-      stack: [
-        null,
-        'http://aaa.com/iframe1.html',
-        'http://bbb.com/iframe2.html'
-      ],
-      canonicalUrl: undefined
-    };
-    expect(result).to.deep.equal(expectedResult);
+describe('parseDomain', () => {
+  Object.entries({
+    'www.example.com': 'www.example.com',
+    'example.com:443': 'example.com:443',
+    'www.sub.example.com': 'www.sub.example.com',
+    'example.com/page': 'example.com',
+    'www.example.com:443/page': 'www.example.com:443',
+    'http://www.example.com:443/page?query=value': 'www.example.com:443',
+    '': undefined,
+  }).forEach(([input, expected]) => {
+    it(`should extract domain from '${input}' -> '${expected}`, () => {
+      expect(parseDomain(input)).to.equal(expected);
+    });
+  });
+  Object.entries({
+    'www.example.com': 'example.com',
+    'https://www.sub.example.com': 'sub.example.com',
+    '//www.example.com:443': 'example.com:443',
+    'without.www.example.com': 'without.www.example.com'
+  }).forEach(([input, expected]) => {
+    it('should remove leading www if requested', () => {
+      expect(parseDomain(input, {noLeadingWww: true})).to.equal(expected);
+    })
   });
+  Object.entries({
+    'example.com:443': 'example.com',
+    'https://sub.example.com': 'sub.example.com',
+    'http://sub.example.com:8443': 'sub.example.com'
+  }).forEach(([input, expected]) => {
+    it('should remove port if requested', () => {
+      expect(parseDomain(input, {noPort: true})).to.equal(expected);
+    })
+  })
 });
diff --git a/test/spec/renderer_spec.js b/test/spec/renderer_spec.js
index 77d806e4dbc..c41334f916a 100644
--- a/test/spec/renderer_spec.js
+++ b/test/spec/renderer_spec.js
@@ -1,9 +1,20 @@
 import { expect } from 'chai';
-import { Renderer } from 'src/Renderer.js';
+import { Renderer, executeRenderer } from 'src/Renderer.js';
 import * as utils from 'src/utils.js';
 import { loadExternalScript } from 'src/adloader.js';
+require('test/mocks/adloaderStub.js');
 
 describe('Renderer', function () {
+  let oldAdUnits;
+  beforeEach(function () {
+    oldAdUnits = $$PREBID_GLOBAL$$.adUnits;
+    $$PREBID_GLOBAL$$.adUnits = [];
+  });
+
+  afterEach(function () {
+    $$PREBID_GLOBAL$$.adUnits = oldAdUnits;
+  });
+
   describe('Renderer: A renderer installed on a bid response', function () {
     let testRenderer1;
     let testRenderer2;
@@ -96,18 +107,30 @@ describe('Renderer', function () {
       sinon.assert.calledOnce(func2);
       expect(testRenderer1.cmd.length).to.equal(0);
     });
+
+    it('renders immediately when requested', function () {
+      const testRenderer3 = Renderer.install({
+        url: 'https://httpbin.org/post',
+        config: { test: 'config2' },
+        id: 2,
+        renderNow: true
+      });
+      const func1 = sinon.spy();
+      const testArg = 'testArgument';
+
+      testRenderer3.setRender(func1);
+      testRenderer3.render(testArg);
+      func1.calledWith(testArg).should.be.ok;
+    });
   });
 
   describe('3rd party renderer', function () {
-    let adUnitsOld;
     let utilsSpy;
     before(function () {
-      adUnitsOld = $$PREBID_GLOBAL$$.adUnits;
       utilsSpy = sinon.spy(utils, 'logWarn');
     });
 
     after(function() {
-      $$PREBID_GLOBAL$$.adUnits = adUnitsOld;
       utilsSpy.restore();
     });
 
@@ -132,6 +155,59 @@ describe('Renderer', function () {
       expect(utilsSpy.callCount).to.equal(1);
     });
 
+    it('should load renderer adunit renderer when backupOnly', function() {
+      $$PREBID_GLOBAL$$.adUnits = [{
+        code: 'video1',
+        renderer: {
+          url: 'http://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+          backupOnly: true,
+          render: sinon.spy()
+        }
+      }]
+
+      let testRenderer = Renderer.install({
+        url: 'https://httpbin.org/post',
+        config: { test: 'config1' },
+        id: 1,
+        adUnitCode: 'video1'
+
+      });
+      testRenderer.setRender(() => {})
+
+      testRenderer.render()
+      expect(loadExternalScript.called).to.be.true;
+    });
+
+    it('should load external script instead of publisher-defined one when backupOnly option is true in mediaTypes.video options', function() {
+      $$PREBID_GLOBAL$$.adUnits = [{
+        code: 'video1',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            mimes: ['video/mp4'],
+            playerSize: [[400, 300]],
+            renderer: {
+              url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+              backupOnly: true,
+              render: sinon.spy()
+            },
+          }
+        }
+      }]
+
+      let testRenderer = Renderer.install({
+        url: 'https://httpbin.org/post',
+        config: { test: 'config1' },
+        id: 1,
+        adUnitCode: 'video1'
+
+      });
+      testRenderer.setRender(() => {})
+
+      testRenderer.render()
+      expect(loadExternalScript.called).to.be.true;
+    });
+
     it('should call loadExternalScript() for script not defined on adUnit, only when .render() is called', function() {
       $$PREBID_GLOBAL$$.adUnits = [{
         code: 'video1',
@@ -151,5 +227,20 @@ describe('Renderer', function () {
       testRenderer.render()
       expect(loadExternalScript.called).to.be.true;
     });
+
+    it('call\'s documentResolver when configured', function () {
+      const documentResolver = sinon.spy(function(bid, sDoc, tDoc) {
+        return document;
+      });
+
+      let testRenderer = Renderer.install({
+        url: 'https://httpbin.org/post',
+        config: { documentResolver: documentResolver }
+      });
+
+      executeRenderer(testRenderer, {}, {});
+
+      expect(documentResolver.called).to.be.true;
+    });
   });
 });
diff --git a/test/spec/sizeMapping_spec.js b/test/spec/sizeMapping_spec.js
index 78dd9797c36..c4efbddad6d 100644
--- a/test/spec/sizeMapping_spec.js
+++ b/test/spec/sizeMapping_spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { resolveStatus, setSizeConfig, sizeSupported } from 'src/sizeMapping.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {includes} from 'src/polyfill.js'
 
 let utils = require('src/utils');
 let deepClone = utils.deepClone;
@@ -93,6 +93,15 @@ describe('sizeMapping', function () {
       expect(utils.logWarn.firstCall.args[0]).to.match(/missing.+?mediaQuery/);
     });
 
+    it('should log a warning message when mediaQuery property is declared as an empty string', function() {
+      const errorConfig = deepClone(sizeConfig);
+      errorConfig[0].mediaQuery = '';
+
+      sandbox.stub(utils, 'logWarn');
+      resolveStatus(undefined, testSizes, undefined, errorConfig);
+      expect(utils.logWarn.firstCall.args[0]).to.match(/missing.+?mediaQuery/);
+    });
+
     it('should allow deprecated adUnit.sizes', function() {
       matchMediaOverride = (str) => str === '(min-width: 1200px)' ? {matches: true} : {matches: false};
 
diff --git a/test/spec/unit/core/adapterManager_spec.js b/test/spec/unit/core/adapterManager_spec.js
index 9ccdd6aef59..3fea8988a95 100644
--- a/test/spec/unit/core/adapterManager_spec.js
+++ b/test/spec/unit/core/adapterManager_spec.js
@@ -1,5 +1,11 @@
 import { expect } from 'chai';
-import adapterManager, { gdprDataHandler } from 'src/adapterManager.js';
+import adapterManager, {
+  gdprDataHandler,
+  coppaDataHandler,
+  _partitionBidders,
+  PARTITIONS,
+  getS2SBidderSet, _filterBidsForAdUnit
+} from 'src/adapterManager.js';
 import {
   getAdUnits,
   getServerTestingConfig,
@@ -11,9 +17,10 @@ import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { registerBidder } from 'src/adapters/bidderFactory.js';
 import { setSizeConfig } from 'src/sizeMapping.js';
-import find from 'core-js-pure/features/array/find.js';
-import includes from 'core-js-pure/features/array/includes.js';
+import {find, includes} from 'src/polyfill.js';
 import s2sTesting from 'modules/s2sTesting.js';
+import {hook} from '../../../../src/hook.js';
+import {auctionManager} from '../../../../src/auctionManager.js';
 var events = require('../../../../src/events');
 
 const CONFIG = {
@@ -25,6 +32,17 @@ const CONFIG = {
   bidders: ['appnexus'],
   accountId: 'abc'
 };
+
+const CONFIG2 = {
+  enabled: true,
+  endpoint: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+  timeout: 1000,
+  maxBids: 1,
+  adapter: 'prebidServer',
+  bidders: ['pubmatic'],
+  accountId: 'def'
+}
+
 var prebidServerAdapterMock = {
   bidder: 'prebidServer',
   callBids: sinon.stub()
@@ -43,6 +61,11 @@ var rubiconAdapterMock = {
   callBids: sinon.stub()
 };
 
+var pubmaticAdapterMock = {
+  bidder: 'rubicon',
+  callBids: sinon.stub()
+};
+
 var badAdapterMock = {
   bidder: 'badBidder',
   callBids: sinon.stub().throws(Error('some fake error'))
@@ -71,9 +94,14 @@ describe('adapterManager tests', function () {
     config.setConfig({s2sConfig: { enabled: false }});
   });
 
+  afterEach(() => {
+    s2sTesting.clientTestBidders.clear();
+  });
+
   describe('callBids', function () {
     before(function () {
       config.setConfig({s2sConfig: { enabled: false }});
+      hook.ready();
     });
 
     beforeEach(function () {
@@ -82,6 +110,7 @@ describe('adapterManager tests', function () {
       adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
       adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
       adapterManager.bidderRegistry['badBidder'] = badAdapterMock;
+      adapterManager.bidderRegistry['badBidder'] = badAdapterMock;
     });
 
     afterEach(function () {
@@ -145,7 +174,7 @@ describe('adapterManager tests', function () {
         'bidderCode': 'appnexus',
         'auctionId': '1863e370099523',
         'bidderRequestId': '2946b569352ef2',
-        'tid': '34566b569352ef2',
+        'uniquePbsTid': '34566b569352ef2',
         'bids': [
           {
             'bidder': 'appnexus',
@@ -387,6 +416,70 @@ describe('adapterManager tests', function () {
     });
   }); // end onSetTargeting
 
+  describe('onBidViewable', function () {
+    var criteoSpec = { onBidViewable: sinon.stub() }
+    var criteoAdapter = {
+      bidder: 'criteo',
+      getSpec: function() { return criteoSpec; }
+    }
+    before(function () {
+      config.setConfig({s2sConfig: { enabled: false }});
+    });
+
+    beforeEach(function () {
+      adapterManager.bidderRegistry['criteo'] = criteoAdapter;
+    });
+
+    afterEach(function () {
+      delete adapterManager.bidderRegistry['criteo'];
+    });
+
+    it('should call spec\'s onBidViewable callback when callBidViewableBidder is called', function () {
+      const bids = [
+        {bidder: 'criteo', params: {placementId: 'id'}},
+      ];
+      const adUnits = [{
+        code: 'adUnit-code',
+        sizes: [[728, 90]],
+        bids
+      }];
+      adapterManager.callBidViewableBidder(bids[0].bidder, bids[0]);
+      sinon.assert.called(criteoSpec.onBidViewable);
+    });
+  }); // end onBidViewable
+
+  describe('onBidderError', function () {
+    const bidder = 'appnexus';
+    const appnexusSpec = { onBidderError: sinon.stub() };
+    const appnexusAdapter = {
+      bidder,
+      getSpec: function() { return appnexusSpec; },
+    }
+    before(function () {
+      config.setConfig({s2sConfig: { enabled: false }});
+    });
+
+    beforeEach(function () {
+      adapterManager.bidderRegistry[bidder] = appnexusAdapter;
+    });
+
+    afterEach(function () {
+      delete adapterManager.bidderRegistry[bidder];
+    });
+
+    it('should call spec\'s onBidderError callback when callBidderError is called', function () {
+      const bidRequests = getBidRequests();
+      const bidderRequest = find(bidRequests, bidRequest => bidRequest.bidderCode === bidder);
+      const xhrErrorMock = {
+        status: 500,
+        statusText: 'Internal Server Error'
+      };
+      adapterManager.callBidderError(bidder, xhrErrorMock, bidderRequest);
+      sinon.assert.calledOnce(appnexusSpec.onBidderError);
+      sinon.assert.calledWithExactly(appnexusSpec.onBidderError, { error: xhrErrorMock, bidderRequest });
+    });
+  }); // end onBidderError
+
   describe('S2S tests', function () {
     beforeEach(function () {
       config.setConfig({s2sConfig: CONFIG});
@@ -394,144 +487,144 @@ describe('adapterManager tests', function () {
       prebidServerAdapterMock.callBids.reset();
     });
 
-    it('invokes callBids on the S2S adapter', function () {
-      let bidRequests = [{
-        'bidderCode': 'appnexus',
-        'auctionId': '1863e370099523',
-        'bidderRequestId': '2946b569352ef2',
-        'tid': '34566b569352ef2',
-        'timeout': 1000,
-        'src': 's2s',
-        'adUnitsS2SCopy': [
-          {
-            'code': '/19968336/header-bid-tag1',
-            'sizes': [
-              {
-                'w': 728,
-                'h': 90
+    const bidRequests = [{
+      'bidderCode': 'appnexus',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'uniquePbsTid': '34566b569352ef2',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
               },
-              {
-                'w': 970,
-                'h': 90
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '543221',
-                  'test': 'me'
-                },
-                'adUnitCode': '/19968336/header-bid-tag1',
-                'sizes': [
-                  [
-                    728,
-                    90
-                  ],
-                  [
-                    970,
-                    90
-                  ]
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
                 ],
-                'bidId': '68136e1c47023d',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220995,
-                'status': 1,
-                'bid_id': '68136e1c47023d'
-              }
-            ]
-          },
-          {
-            'code': '/19968336/header-bid-tag-0',
-            'sizes': [
-              {
-                'w': 300,
-                'h': 250
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '5324321'
               },
-              {
-                'w': 300,
-                'h': 600
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '5324321'
-                },
-                'adUnitCode': '/19968336/header-bid-tag-0',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
                 ],
-                'bidId': '7e5d6af25ed188',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220996,
-                'bid_id': '7e5d6af25ed188'
-              }
-            ]
-          }
-        ],
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418',
-              'test': 'me'
-            },
-            'adUnitCode': '/19968336/header-bid-tag1',
-            'sizes': [
-              [
-                728,
-                90
+                [
+                  300,
+                  600
+                ]
               ],
-              [
-                970,
-                90
-              ]
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
             ],
-            'bidId': '392b5a6b05d648',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897462,
-            'status': 1,
-            'transactionId': 'fsafsa'
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        },
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418'
           },
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418'
-            },
-            'adUnitCode': '/19968336/header-bid-tag-0',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
             ],
-            'bidId': '4dccdc37746135',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897463,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          }
-        ],
-        'start': 1462918897460
-      }];
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        }
+      ],
+      'start': 1462918897460
+    }];
 
+    it('invokes callBids on the S2S adapter', function () {
       adapterManager.callBids(
         getAdUnits(),
         bidRequests,
@@ -559,143 +652,6 @@ describe('adapterManager tests', function () {
         ]
       });
 
-      let bidRequests = [{
-        'bidderCode': 'appnexus',
-        'auctionId': '1863e370099523',
-        'bidderRequestId': '2946b569352ef2',
-        'tid': '34566b569352ef2',
-        'src': 's2s',
-        'timeout': 1000,
-        'adUnitsS2SCopy': [
-          {
-            'code': '/19968336/header-bid-tag1',
-            'sizes': [
-              {
-                'w': 728,
-                'h': 90
-              },
-              {
-                'w': 970,
-                'h': 90
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '543221',
-                  'test': 'me'
-                },
-                'adUnitCode': '/19968336/header-bid-tag1',
-                'sizes': [
-                  [
-                    728,
-                    90
-                  ],
-                  [
-                    970,
-                    90
-                  ]
-                ],
-                'bidId': '68136e1c47023d',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220995,
-                'status': 1,
-                'bid_id': '378a8914450b334'
-              }
-            ]
-          },
-          {
-            'code': '/19968336/header-bid-tag-0',
-            'sizes': [
-              {
-                'w': 300,
-                'h': 250
-              },
-              {
-                'w': 300,
-                'h': 600
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '5324321'
-                },
-                'adUnitCode': '/19968336/header-bid-tag-0',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '7e5d6af25ed188',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220996,
-                'bid_id': '387d9d9c32ca47c'
-              }
-            ]
-          }
-        ],
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418',
-              'test': 'me'
-            },
-            'adUnitCode': '/19968336/header-bid-tag1',
-            'sizes': [
-              [
-                728,
-                90
-              ],
-              [
-                970,
-                90
-              ]
-            ],
-            'bidId': '392b5a6b05d648',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897462,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          },
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418'
-            },
-            'adUnitCode': '/19968336/header-bid-tag-0',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'bidId': '4dccdc37746135',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897463,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          }
-        ],
-        'start': 1462918897460
-      }];
-
       adapterManager.callBids(
         adUnits,
         bidRequests,
@@ -749,97 +705,458 @@ describe('adapterManager tests', function () {
     });
   }); // end s2s tests
 
-  describe('s2sTesting', function () {
-    let doneStub = sinon.stub();
-    let ajaxStub = sinon.stub();
-
-    function getTestAdUnits() {
-      // copy adUnits
-      // return JSON.parse(JSON.stringify(getAdUnits()));
-      return utils.deepClone(getAdUnits()).map(adUnit => {
-        adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'rubicon'], bid.bidder));
-        return adUnit;
-      })
-    }
-
-    function callBids(adUnits = getTestAdUnits()) {
-      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
-      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
-    }
-
-    function checkServerCalled(numAdUnits, numBids) {
-      sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
-      let requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
-      expect(requestObj.ad_units.length).to.equal(numAdUnits);
-      for (let i = 0; i < numAdUnits; i++) {
-        expect(requestObj.ad_units[i].bids.filter((bid) => {
-          return bid.bidder === 'appnexus' || bid.bidder === 'adequant';
-        }).length).to.equal(numBids);
-      }
-    }
-
-    function checkClientCalled(adapter, numBids) {
-      sinon.assert.calledOnce(adapter.callBids);
-      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
-    }
-
-    let TESTING_CONFIG = utils.deepClone(CONFIG);
-    Object.assign(TESTING_CONFIG, {
-      bidders: ['appnexus', 'adequant'],
-      testing: true
-    });
-    let stubGetSourceBidderMap;
-
+  describe('Multiple S2S tests', function () {
     beforeEach(function () {
-      config.setConfig({s2sConfig: TESTING_CONFIG});
+      config.setConfig({s2sConfig: [CONFIG, CONFIG2]});
       adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
-      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
-      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
-      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
-
-      stubGetSourceBidderMap = sinon.stub(s2sTesting, 'getSourceBidderMap');
-
       prebidServerAdapterMock.callBids.reset();
-      adequantAdapterMock.callBids.reset();
-      appnexusAdapterMock.callBids.reset();
-      rubiconAdapterMock.callBids.reset();
-    });
-
-    afterEach(function () {
-      config.setConfig({s2sConfig: {}});
-      s2sTesting.getSourceBidderMap.restore();
-    });
-
-    it('calls server adapter if no sources defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: [], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      sinon.assert.notCalled(appnexusAdapterMock.callBids);
-
-      // adequant
-      sinon.assert.notCalled(adequantAdapterMock.callBids);
     });
 
-    it('calls client adapter if one client source defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus'], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      checkClientCalled(appnexusAdapterMock, 2);
-
+    const bidRequests = [{
+      'bidderCode': 'appnexus',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'uniquePbsTid': '34566b569352ef2',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
+              },
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
+                ],
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '5324321'
+              },
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
+                ],
+                [
+                  300,
+                  600
+                ]
+              ],
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
+            ],
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        },
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418'
+          },
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        }
+      ],
+      'start': 1462918897460
+    },
+    {
+      'bidderCode': 'pubmatic',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'uniquePbsTid': '2342342342lfi23',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
+              },
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
+                ],
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'placementId': '5324321'
+              },
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
+                ],
+                [
+                  300,
+                  600
+                ]
+              ],
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
+            ],
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': '4r42r23r23'
+        },
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'placementId': '4799418'
+          },
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': '4r42r23r23'
+        }
+      ],
+      'start': 1462918897460
+    }];
+
+    it('invokes callBids on the S2S adapter', function () {
+      adapterManager.callBids(
+        getAdUnits(),
+        bidRequests,
+        () => {},
+        () => () => {}
+      );
+      sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+    });
+
+    // Enable this test when prebidServer adapter is made 1.0 compliant
+    it('invokes callBids with only s2s bids', function () {
+      const adUnits = getAdUnits();
+      // adUnit without appnexus bidder
+      adUnits.push({
+        'code': '123',
+        'sizes': [300, 250],
+        'bids': [
+          {
+            'bidder': 'adequant',
+            'params': {
+              'publisher_id': '1234567',
+              'bidfloor': 0.01
+            }
+          }
+        ]
+      });
+
+      adapterManager.callBids(
+        adUnits,
+        bidRequests,
+        () => {},
+        () => () => {}
+      );
+      const requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
+      expect(requestObj.ad_units.length).to.equal(2);
+      sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+    });
+
+    describe('BID_REQUESTED event', function () {
+      // function to count BID_REQUESTED events
+      let cnt, count = () => cnt++;
+
+      beforeEach(function () {
+        prebidServerAdapterMock.callBids.reset();
+        cnt = 0;
+        events.on(CONSTANTS.EVENTS.BID_REQUESTED, count);
+      });
+
+      afterEach(function () {
+        events.off(CONSTANTS.EVENTS.BID_REQUESTED, count);
+      });
+
+      it('should fire for s2s requests', function () {
+        let adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
+          adUnit.bids = adUnit.bids.filter(bid => includes(['appnexus', 'pubmatic'], bid.bidder));
+          return adUnit;
+        })
+        let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+        adapterManager.callBids(adUnits, bidRequests, () => {}, () => {});
+        expect(cnt).to.equal(2);
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+      });
+
+      it('should have one tid for ALL s2s bidRequests', function () {
+        let adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
+          adUnit.bids = adUnit.bids.filter(bid => includes(['appnexus', 'pubmatic'], bid.bidder));
+          return adUnit;
+        })
+        let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+        adapterManager.callBids(adUnits, bidRequests, () => {}, () => {});
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+        const firstBid = prebidServerAdapterMock.callBids.firstCall.args[0];
+        const secondBid = prebidServerAdapterMock.callBids.secondCall.args[0];
+
+        // TIDS should be the same
+        expect(firstBid.tid).to.equal(secondBid.tid);
+      });
+
+      it('should fire for simultaneous s2s and client requests', function () {
+        adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+        let adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
+          adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'pubmatic'], bid.bidder));
+          return adUnit;
+        })
+        let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+        adapterManager.callBids(adUnits, bidRequests, () => {}, () => {});
+        expect(cnt).to.equal(3);
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+        sinon.assert.calledOnce(adequantAdapterMock.callBids);
+        adequantAdapterMock.callBids.reset();
+        delete adapterManager.bidderRegistry['adequant'];
+      });
+    });
+  }); // end multiple s2s tests
+
+  describe('s2sTesting', function () {
+    let doneStub = sinon.stub();
+    let ajaxStub = sinon.stub();
+
+    function getTestAdUnits() {
+      // copy adUnits
+      // return JSON.parse(JSON.stringify(getAdUnits()));
+      return utils.deepClone(getAdUnits()).map(adUnit => {
+        adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'rubicon'], bid.bidder));
+        return adUnit;
+      })
+    }
+
+    function callBids(adUnits = getTestAdUnits()) {
+      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
+    }
+
+    function checkServerCalled(numAdUnits, numBids) {
+      sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
+      let requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
+      expect(requestObj.ad_units.length).to.equal(numAdUnits);
+      for (let i = 0; i < numAdUnits; i++) {
+        expect(requestObj.ad_units[i].bids.filter((bid) => {
+          return bid.bidder === 'appnexus' || bid.bidder === 'adequant';
+        }).length).to.equal(numBids);
+      }
+    }
+
+    function checkClientCalled(adapter, numBids) {
+      sinon.assert.calledOnce(adapter.callBids);
+      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
+    }
+
+    let TESTING_CONFIG = utils.deepClone(CONFIG);
+    Object.assign(TESTING_CONFIG, {
+      bidders: ['appnexus', 'adequant'],
+      testing: true
+    });
+    let stubGetSourceBidderMap;
+
+    beforeEach(function () {
+      config.setConfig({s2sConfig: TESTING_CONFIG});
+      adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
+      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
+      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
+
+      stubGetSourceBidderMap = sinon.stub(s2sTesting, 'getSourceBidderMap');
+
+      prebidServerAdapterMock.callBids.reset();
+      adequantAdapterMock.callBids.reset();
+      appnexusAdapterMock.callBids.reset();
+      rubiconAdapterMock.callBids.reset();
+    });
+
+    afterEach(function () {
+      s2sTesting.getSourceBidderMap.restore();
+    });
+
+    it('calls server adapter if no sources defined', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: [], [s2sTesting.SERVER]: []});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
       // adequant
       sinon.assert.notCalled(adequantAdapterMock.callBids);
     });
 
-    it('calls client adapters if client sources defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+    it('calls client adapter if one client source defined', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus'], [s2sTesting.SERVER]: []});
       callBids();
 
       // server adapter
@@ -849,7 +1166,7 @@ describe('adapterManager tests', function () {
       checkClientCalled(appnexusAdapterMock, 2);
 
       // adequant
-      checkClientCalled(adequantAdapterMock, 2);
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
     });
 
     it('calls client adapters if client sources defined', function () {
@@ -943,6 +1260,331 @@ describe('adapterManager tests', function () {
     });
   });
 
+  describe('Multiple Server s2sTesting', function () {
+    let doneStub = sinon.stub();
+    let ajaxStub = sinon.stub();
+
+    function getTestAdUnits() {
+      // copy adUnits
+      return utils.deepClone(getAdUnits()).map(adUnit => {
+        adUnit.bids = adUnit.bids.filter(bid => {
+          return includes(['adequant', 'appnexus', 'pubmatic', 'rubicon'],
+            bid.bidder);
+        });
+        return adUnit;
+      })
+    }
+
+    function callBids(adUnits = getTestAdUnits()) {
+      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
+    }
+
+    function checkServerCalled(numAdUnits, firstConfigNumBids, secondConfigNumBids) {
+      let requestObjects = [];
+      let configBids;
+      if (firstConfigNumBids === 0 || secondConfigNumBids === 0) {
+        configBids = Math.max(firstConfigNumBids, secondConfigNumBids)
+        sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
+        let requestObj1 = prebidServerAdapterMock.callBids.firstCall.args[0];
+        requestObjects.push(requestObj1)
+      } else {
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+        let requestObj1 = prebidServerAdapterMock.callBids.firstCall.args[0];
+        let requestObj2 = prebidServerAdapterMock.callBids.secondCall.args[0];
+        requestObjects.push(requestObj1, requestObj2);
+      }
+
+      requestObjects.forEach((requestObj, index) => {
+        const numBids = configBids !== undefined ? configBids : index === 0 ? firstConfigNumBids : secondConfigNumBids
+        expect(requestObj.ad_units.length).to.equal(numAdUnits);
+        for (let i = 0; i < numAdUnits; i++) {
+          expect(requestObj.ad_units[i].bids.filter((bid) => {
+            return bid.bidder === 'appnexus' || bid.bidder === 'adequant' || bid.bidder === 'pubmatic';
+          }).length).to.equal(numBids);
+        }
+      })
+    }
+
+    function checkClientCalled(adapter, numBids) {
+      sinon.assert.calledOnce(adapter.callBids);
+      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
+    }
+
+    beforeEach(function () {
+      adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
+      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
+      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
+      adapterManager.bidderRegistry['pubmatic'] = pubmaticAdapterMock;
+
+      prebidServerAdapterMock.callBids.reset();
+      adequantAdapterMock.callBids.reset();
+      appnexusAdapterMock.callBids.reset();
+      rubiconAdapterMock.callBids.reset();
+      pubmaticAdapterMock.callBids.reset();
+    });
+
+    it('calls server adapter if no sources defined for config where testing is true, ' +
+    'calls client adapter for second config where testing is false', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        testing: true,
+      });
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2, 1);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.called(rubiconAdapterMock.callBids);
+    });
+
+    it('calls client adapter if one client source defined for config where testing is true, ' +
+    'calls client adapter for second config where testing is false', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 1, 1);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
+    });
+
+    it('calls client adapters if client sources defined in first config and server in second config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 0, 1);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 2);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
+    });
+
+    it('does not call server adapter for bidders that go to client when both configs are set to client', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
+
+      sinon.assert.notCalled(prebidServerAdapterMock.callBids);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 2);
+
+      // pubmatic
+      checkClientCalled(pubmaticAdapterMock, 2);
+
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
+    });
+
+    it('does not call client adapters for bidders in either config when testServerOnly if true in first config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        testServerOnly: true,
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          }
+        },
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 1, 0);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.notCalled(rubiconAdapterMock.callBids);
+    });
+
+    it('does not call client adapters for bidders in either config when testServerOnly if true in second config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testServerOnly: true,
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          }
+        },
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 1, 1);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.notCalled(rubiconAdapterMock.callBids);
+    });
+  });
+
   describe('aliasBidderAdaptor', function() {
     const CODE = 'sampleBidder';
 
@@ -988,6 +1630,27 @@ describe('adapterManager tests', function () {
         expect(adapterManager.aliasRegistry).to.have.property('s2sAlias');
       });
 
+      it('should allow an alias if alias is part of s2sConfig.bidders for multiple s2sConfigs', function () {
+        let testS2sConfig = utils.deepClone(CONFIG);
+        testS2sConfig.bidders = ['s2sAlias'];
+        config.setConfig({s2sConfig: [
+          testS2sConfig, {
+            enabled: true,
+            endpoint: 'rp-pbs-endpoint-test.com',
+            timeout: 500,
+            maxBids: 1,
+            adapter: 'prebidServer',
+            bidders: ['s2sRpAlias'],
+            accountId: 'def'
+          }
+        ]});
+
+        adapterManager.aliasBidAdapter('s2sBidder', 's2sAlias');
+        expect(adapterManager.aliasRegistry).to.have.property('s2sAlias');
+        adapterManager.aliasBidAdapter('s2sBidder', 's2sRpAlias');
+        expect(adapterManager.aliasRegistry).to.have.property('s2sRpAlias');
+      });
+
       it('should throw an error if alias + bidder are unknown and not part of s2sConfig.bidders', function () {
         let testS2sConfig = utils.deepClone(CONFIG);
         testS2sConfig.bidders = ['s2sAlias'];
@@ -1009,6 +1672,30 @@ describe('adapterManager tests', function () {
       })
     });
 
+    if (FEATURES.NATIVE) {
+      it('should add nativeParams to adUnits after BEFORE_REQUEST_BIDS', () => {
+        function beforeReqBids(adUnits) {
+          adUnits.forEach(adUnit => {
+            adUnit.mediaTypes.native = {
+              type: 'image',
+            }
+          })
+        }
+
+        events.on(CONSTANTS.EVENTS.BEFORE_REQUEST_BIDS, beforeReqBids);
+        adapterManager.makeBidRequests(
+          adUnits,
+          Date.now(),
+          utils.getUniqueIdentifierStr(),
+          function callback() {
+          },
+          []
+        );
+        events.off(CONSTANTS.EVENTS.BEFORE_REQUEST_BIDS, beforeReqBids);
+        expect(adUnits.map((u) => u.nativeParams).some(i => i == null)).to.be.false;
+      });
+    }
+
     it('should make separate bidder request objects for each bidder', () => {
       adUnits = [utils.deepClone(getAdUnits()[0])];
 
@@ -1029,36 +1716,174 @@ describe('adapterManager tests', function () {
       expect(sizes1).not.to.deep.equal(sizes2);
     });
 
-    describe('setBidderSequence', function () {
-      beforeEach(function () {
-        sinon.spy(utils, 'shuffle');
+    it('should make FPD available under `ortb2`', () => {
+      const global = {
+        k1: 'v1',
+        k2: {
+          k3: 'v3',
+          k4: 'v4'
+        }
+      };
+      const bidder = {
+        'appnexus': {
+          ka: 'va',
+          k2: {
+            k3: 'override',
+            k5: 'v5'
+          }
+        }
+      };
+      const requests = Object.fromEntries(
+        adapterManager.makeBidRequests(adUnits, 123, 'auction-id', 123, [], {global, bidder})
+          .map((r) => [r.bidderCode, r])
+      );
+      sinon.assert.match(requests, {
+        rubicon: {
+          ortb2: global
+        },
+        appnexus: {
+          ortb2: {
+            k1: 'v1',
+            ka: 'va',
+            k2: {
+              k3: 'override',
+              k4: 'v4',
+              k5: 'v5',
+            }
+          }
+        }
+      });
+      requests.rubicon.bids.forEach((bid) => expect(bid.ortb2).to.eql(requests.rubicon.ortb2));
+      requests.appnexus.bids.forEach((bid) => expect(bid.ortb2).to.eql(requests.appnexus.ortb2));
+    });
+
+    describe('when calling the s2s adapter', () => {
+      beforeEach(() => {
+        config.setConfig({
+          s2sConfig: {
+            enabled: true,
+            adapter: 'mockS2S',
+            bidders: ['appnexus']
+          }
+        })
+        adapterManager.bidderRegistry.mockS2S = {
+          callBids: sinon.stub()
+        };
+      });
+      afterEach(() => {
+        config.resetConfig();
+        delete adapterManager.bidderRegistry.mockS2S;
+      })
+
+      it('should pass FPD', () => {
+        const ortb2Fragments = {};
+        const req = {
+          bidderCode: 'appnexus',
+          src: CONSTANTS.S2S.SRC,
+          adUnitsS2SCopy: adUnits,
+          bids: [{
+            bidder: 'appnexus',
+            src: CONSTANTS.S2S.SRC
+          }]
+        };
+        adapterManager.callBids(adUnits, [req], sinon.stub(), sinon.stub(), {request: sinon.stub(), done: sinon.stub()}, 1000, sinon.stub(), ortb2Fragments);
+        sinon.assert.calledWith(adapterManager.bidderRegistry.mockS2S.callBids, sinon.match({
+          ortb2Fragments: sinon.match.same(ortb2Fragments)
+        }));
+      });
+    })
+
+    describe('setBidderSequence', function () {
+      beforeEach(function () {
+        sinon.spy(utils, 'shuffle');
+      });
+
+      afterEach(function () {
+        config.resetConfig();
+        utils.shuffle.restore();
+      });
+
+      it('setting to `random` uses shuffled order of adUnits', function () {
+        config.setConfig({ bidderSequence: 'random' });
+        let bidRequests = adapterManager.makeBidRequests(
+          adUnits,
+          Date.now(),
+          utils.getUniqueIdentifierStr(),
+          function callback() {},
+          []
+        );
+        sinon.assert.calledOnce(utils.shuffle);
+      });
+    });
+
+    describe('fledgeEnabled', function () {
+      const origRunAdAuction = navigator?.runAdAuction;
+      before(function () {
+        // navigator.runAdAuction doesn't exist, so we can't stub it normally with
+        // sinon.stub(navigator, 'runAdAuction') or something
+        navigator.runAdAuction = sinon.stub();
       });
 
+      after(function() {
+        navigator.runAdAuction = origRunAdAuction;
+      })
+
       afterEach(function () {
         config.resetConfig();
-        utils.shuffle.restore();
       });
 
-      it('setting to `random` uses shuffled order of adUnits', function () {
-        config.setConfig({ bidderSequence: 'random' });
-        let bidRequests = adapterManager.makeBidRequests(
+      it('should set fledgeEnabled correctly per bidder', function () {
+        config.setConfig({bidderSequence: 'fixed'})
+        config.setBidderConfig({
+          bidders: ['appnexus'],
+          config: {
+            fledgeEnabled: true,
+          }
+        });
+
+        const adUnits = [{
+          'code': '/19968336/header-bid-tag1',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[728, 90]]
+            },
+          },
+          'bids': [
+            {
+              'bidder': 'appnexus',
+            },
+            {
+              'bidder': 'rubicon',
+            },
+          ]
+        }];
+
+        const bidRequests = adapterManager.makeBidRequests(
           adUnits,
           Date.now(),
           utils.getUniqueIdentifierStr(),
           function callback() {},
           []
         );
-        sinon.assert.calledOnce(utils.shuffle);
+
+        expect(bidRequests[0].bids[0].bidder).equals('appnexus');
+        expect(bidRequests[0].fledgeEnabled).to.be.true;
+
+        expect(bidRequests[1].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[1].fledgeEnabled).to.be.undefined;
       });
     });
 
     describe('sizeMapping', function () {
+      let sandbox;
       beforeEach(function () {
-        sinon.stub(window, 'matchMedia').callsFake(() => ({matches: true}));
+        sandbox = sinon.sandbox.create();
+        // always have matchMedia return true for us
+        sandbox.stub(utils.getWindowTop(), 'matchMedia').callsFake(() => ({matches: true}));
       });
 
       afterEach(function () {
-        matchMedia.restore();
+        sandbox.restore();
         config.resetConfig();
         setSizeConfig([]);
       });
@@ -1187,7 +2012,7 @@ describe('adapterManager tests', function () {
           []
         );
 
-          // only valid sizes as specified in size config should show up in bidRequests
+        // only valid sizes as specified in size config should show up in bidRequests
         bidRequests.forEach(bidRequest => {
           bidRequest.bids.forEach(bid => {
             bid.sizes.forEach(size => {
@@ -1228,7 +2053,7 @@ describe('adapterManager tests', function () {
           ['visitor-uk', 'desktop']
         );
 
-          // only one adUnit and one bid from that adUnit should make it through the applied labels above
+        // only one adUnit and one bid from that adUnit should make it through the applied labels above
         expect(bidRequests.length).to.equal(1);
         expect(bidRequests[0].bidderCode).to.equal('rubicon');
         expect(bidRequests[0].bids.length).to.equal(1);
@@ -1290,13 +2115,34 @@ describe('adapterManager tests', function () {
         expect(bidRequests[0].gdprConsent).to.be.undefined;
       });
     });
-
+    describe('coppa consent module', function () {
+      afterEach(() => {
+        config.resetConfig();
+      });
+      it('test coppa configuration with value false', function () {
+        config.setConfig({ coppa: 0 });
+        const coppa = coppaDataHandler.getCoppa();
+        expect(coppa).to.be.false;
+      });
+      it('test coppa configuration with value true', function () {
+        config.setConfig({ coppa: 1 });
+        const coppa = coppaDataHandler.getCoppa();
+        expect(coppa).to.be.true;
+      });
+      it('test coppa configuration', function () {
+        const coppa = coppaDataHandler.getCoppa();
+        expect(coppa).to.be.false;
+      });
+    });
     describe('s2sTesting - testServerOnly', () => {
       beforeEach(() => {
         config.setConfig({ s2sConfig: getServerTestingConfig(CONFIG) });
+        s2sTesting.bidSource = {};
       });
 
-      afterEach(() => config.resetConfig());
+      afterEach(() => {
+        config.resetConfig();
+      });
 
       const makeBidRequests = ads => {
         let bidRequests = adapterManager.makeBidRequests(
@@ -1413,5 +2259,390 @@ describe('adapterManager tests', function () {
         }
       );
     });
+
+    describe('Multiple s2sTesting - testServerOnly', () => {
+      beforeEach(() => {
+        config.setConfig({s2sConfig: [getServerTestingConfig(CONFIG), CONFIG2]});
+      });
+
+      afterEach(() => {
+        config.resetConfig()
+        s2sTesting.bidSource = {};
+      });
+
+      const makeBidRequests = ads => {
+        let bidRequests = adapterManager.makeBidRequests(
+          ads, 1111, 2222, 1000
+        );
+
+        bidRequests.sort((a, b) => {
+          if (a.bidderCode < b.bidderCode) return -1;
+          if (a.bidderCode > b.bidderCode) return 1;
+          return 0;
+        });
+
+        return bidRequests;
+      };
+
+      const removeAdUnitsBidSource = adUnits => adUnits.map(adUnit => {
+        const newAdUnit = { ...adUnit };
+        newAdUnit.bids = newAdUnit.bids.map(bid => {
+          if (bid.bidSource) delete bid.bidSource;
+          return bid;
+        });
+        return newAdUnit;
+      });
+
+      it('suppresses all client bids if there are server bids resulting from bidSource at the adUnit Level', () => {
+        let ads = getServerTestingsAds();
+        ads.push({
+          code: 'test_div_5',
+          sizes: [[300, 250]],
+          bids: [{ bidder: 'pubmatic' }]
+        })
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('openx');
+        expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('pubmatic');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+      });
+
+      it('should not surpress client side bids if testServerOnly is true in one config, ' +
+      ',bidderControl resolves to server in another config' +
+      'and there are no bid with bidSource at the adUnit Level', () => {
+        let testConfig1 = utils.deepClone(getServerTestingConfig(CONFIG));
+        let testConfig2 = utils.deepClone(CONFIG2);
+        testConfig1.testServerOnly = false;
+        testConfig2.testServerOnly = true;
+        testConfig2.testing = true;
+        testConfig2.bidderControl = {
+          'pubmatic': {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        };
+        config.setConfig({s2sConfig: [testConfig1, testConfig2]});
+
+        let ads = [
+          {
+            code: 'test_div_1',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'adequant' }]
+          },
+          {
+            code: 'test_div_2',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'openx' }]
+          },
+          {
+            code: 'test_div_3',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'pubmatic' }]
+          },
+        ];
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('adequant');
+        expect(bidRequests[0].bids[0].finalSource).equals('client');
+
+        expect(bidRequests[1].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('openx');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('pubmatic');
+        expect(bidRequests[2].bids[0].finalSource).equals('client');
+      });
+
+      // todo: update description
+      it('suppresses all, and only, client bids if there are bids resulting from bidSource at the adUnit Level', () => {
+        const ads = getServerTestingsAds();
+
+        // change this adUnit to be server based
+        ads[1].bids[1].bidSource.client = 0;
+        ads[1].bids[1].bidSource.server = 100;
+
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('appnexus');
+        expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[1].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('openx');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+      });
+
+      // we have a server call now
+      it('does not suppress client bids if no "test case" bids result in a server bid', () => {
+        const ads = getServerTestingsAds();
+
+        // change this adUnit to be client based
+        ads[0].bids[0].bidSource.client = 100;
+        ads[0].bids[0].bidSource.server = 0;
+
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(4);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('adequant');
+        expect(bidRequests[0].bids[0].finalSource).equals('client');
+
+        expect(bidRequests[1].bids).lengthOf(2);
+        expect(bidRequests[1].bids[0].bidder).equals('appnexus');
+        expect(bidRequests[1].bids[0].finalSource).equals('client');
+        expect(bidRequests[1].bids[1].bidder).equals('appnexus');
+        expect(bidRequests[1].bids[1].finalSource).equals('client');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('openx');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[3].bids).lengthOf(2);
+        expect(bidRequests[3].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[3].bids[0].finalSource).equals('client');
+        expect(bidRequests[3].bids[1].bidder).equals('rubicon');
+        expect(bidRequests[3].bids[1].finalSource).equals('client');
+      });
+
+      it(
+        'should surpress client side bids if no ad unit bidSources are set, ' +
+        'but bidderControl resolves to server',
+        () => {
+          const ads = removeAdUnitsBidSource(getServerTestingsAds());
+
+          const bidRequests = makeBidRequests(ads);
+
+          expect(bidRequests).lengthOf(2);
+
+          expect(bidRequests[0].bids).lengthOf(1);
+          expect(bidRequests[0].bids[0].bidder).equals('openx');
+          expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+          expect(bidRequests[1].bids).lengthOf(2);
+          expect(bidRequests[1].bids[0].bidder).equals('rubicon');
+          expect(bidRequests[1].bids[0].finalSource).equals('server');
+        }
+      );
+    });
+  });
+
+  describe('getS2SBidderSet', () => {
+    it('should always return the "null" bidder', () => {
+      expect([...getS2SBidderSet({bidders: []})]).to.eql([null]);
+    });
+
+    it('should not consider disabled s2s adapters', () => {
+      const actual = getS2SBidderSet([{enabled: false, bidders: ['A', 'B']}, {enabled: true, bidders: ['C']}]);
+      expect([...actual]).to.include.members(['C']);
+      expect([...actual]).not.to.include.members(['A', 'B']);
+    });
+
+    it('should accept both single config objects and an array of them', () => {
+      const conf = {enabled: true, bidders: ['A', 'B']};
+      expect(getS2SBidderSet(conf)).to.eql(getS2SBidderSet([conf]));
+    });
+  });
+
+  describe('separation of client and server bidders', () => {
+    let s2sBidders, getS2SBidders;
+    beforeEach(() => {
+      s2sBidders = null;
+      getS2SBidders = sinon.stub();
+      getS2SBidders.callsFake(() => s2sBidders);
+    })
+
+    describe('partitionBidders', () => {
+      let adUnits;
+
+      beforeEach(() => {
+        adUnits = [{
+          bids: [{
+            bidder: 'A'
+          }, {
+            bidder: 'B'
+          }]
+        }, {
+          bids: [{
+            bidder: 'A',
+          }, {
+            bidder: 'C'
+          }]
+        }];
+      });
+
+      function partition(adUnits, s2sConfigs) {
+        return _partitionBidders(adUnits, s2sConfigs, {getS2SBidders})
+      }
+
+      Object.entries({
+        'all client': {
+          s2s: [],
+          expected: {
+            [PARTITIONS.CLIENT]: ['A', 'B', 'C'],
+            [PARTITIONS.SERVER]: []
+          }
+        },
+        'all server': {
+          s2s: ['A', 'B', 'C'],
+          expected: {
+            [PARTITIONS.CLIENT]: [],
+            [PARTITIONS.SERVER]: ['A', 'B', 'C']
+          }
+        },
+        'mixed': {
+          s2s: ['B', 'C'],
+          expected: {
+            [PARTITIONS.CLIENT]: ['A'],
+            [PARTITIONS.SERVER]: ['B', 'C']
+          }
+        }
+      }).forEach(([test, {s2s, expected}]) => {
+        it(`should partition ${test} requests`, () => {
+          s2sBidders = new Set(s2s);
+          const s2sConfig = {};
+          expect(partition(adUnits, s2sConfig)).to.eql(expected);
+          sinon.assert.calledWith(getS2SBidders, sinon.match.same(s2sConfig));
+        });
+      });
+    });
+
+    describe('filterBidsForAdUnit', () => {
+      function filterBids(bids, s2sConfig) {
+        return _filterBidsForAdUnit(bids, s2sConfig, {getS2SBidders});
+      }
+      it('should not filter any bids when s2sConfig == null', () => {
+        const bids = ['untouched', 'data'];
+        expect(filterBids(bids)).to.eql(bids);
+      });
+
+      it('should remove bids that have bidder not present in s2sConfig', () => {
+        s2sBidders = new Set('A', 'B');
+        const s2sConfig = {};
+        expect(filterBids(['A', 'C', 'D'].map((code) => ({bidder: code})), s2sConfig)).to.eql([{bidder: 'A'}]);
+        sinon.assert.calledWith(getS2SBidders, sinon.match.same(s2sConfig));
+      })
+    });
+  });
+
+  describe('callDataDeletionRequest', () => {
+    function delMethodForBidder(bidderCode) {
+      const del = sinon.stub();
+      adapterManager.registerBidAdapter({
+        callBids: sinon.stub(),
+        getSpec() {
+          return {
+            onDataDeletionRequest: del
+          }
+        }
+      }, bidderCode);
+      return del;
+    }
+
+    function delMethodForAnalytics(provider) {
+      const del = sinon.stub();
+      adapterManager.registerAnalyticsAdapter({
+        code: provider,
+        adapter: {
+          enableAnalytics: sinon.stub(),
+          onDataDeletionRequest: del,
+        },
+      })
+      return del;
+    }
+
+    Object.entries({
+      'bid adapters': delMethodForBidder,
+      'analytics adapters': delMethodForAnalytics
+    }).forEach(([t, getDelMethod]) => {
+      describe(t, () => {
+        it('invokes onDataDeletionRequest', () => {
+          const del = getDelMethod('mockAdapter');
+          adapterManager.callDataDeletionRequest();
+          sinon.assert.calledOnce(del);
+        });
+
+        it('does not choke if onDeletionRequest throws', () => {
+          const del1 = getDelMethod('mockAdapter1');
+          const del2 = getDelMethod('mockAdapter2');
+          del1.throws(new Error());
+          adapterManager.callDataDeletionRequest();
+          sinon.assert.calledOnce(del1);
+          sinon.assert.calledOnce(del2);
+        });
+      })
+    })
+
+    describe('for bid adapters', () => {
+      let bidderRequests;
+
+      beforeEach(() => {
+        bidderRequests = [];
+        sinon.stub(auctionManager, 'getBidsRequested').callsFake(() => bidderRequests);
+      })
+      afterEach(() => {
+        auctionManager.getBidsRequested.restore();
+      })
+
+      it('does not invoke onDataDeletionRequest on aliases', () => {
+        const del = delMethodForBidder('mockBidder');
+        adapterManager.aliasBidAdapter('mockBidder', 'mockBidderAlias');
+        adapterManager.aliasBidAdapter('mockBidderAlias2', 'mockBidderAlias');
+        adapterManager.callDataDeletionRequest();
+        sinon.assert.calledOnce(del);
+      });
+
+      it('passes known bidder requests', () => {
+        const del1 = delMethodForBidder('mockBidder1');
+        const del2 = delMethodForBidder('mockBidder2');
+        adapterManager.aliasBidAdapter('mockBidder1', 'mockBidder1Alias');
+        adapterManager.aliasBidAdapter('mockBidder1Alias', 'mockBidder1Alias2')
+        bidderRequests = [
+          {
+            bidderCode: 'mockBidder1',
+            id: 0
+          },
+          {
+            bidderCode: 'mockBidder2',
+            id: 1,
+          },
+          {
+            bidderCode: 'mockBidder1Alias',
+            id: 2,
+          },
+          {
+            bidderCode: 'someOtherBidder',
+            id: 3
+          },
+          {
+            bidderCode: 'mockBidder1Alias2',
+            id: 4
+          }
+        ];
+        adapterManager.callDataDeletionRequest();
+        sinon.assert.calledWith(del1, [bidderRequests[0], bidderRequests[2], bidderRequests[4]]);
+        sinon.assert.calledWith(del2, [bidderRequests[1]]);
+      })
+    })
   });
 });
diff --git a/test/spec/unit/core/auctionIndex_spec.js b/test/spec/unit/core/auctionIndex_spec.js
new file mode 100644
index 00000000000..f00e2cd281f
--- /dev/null
+++ b/test/spec/unit/core/auctionIndex_spec.js
@@ -0,0 +1,129 @@
+import {AuctionIndex} from '../../../../src/auctionIndex.js';
+
+describe('auction index', () => {
+  let index, auctions;
+
+  function mockAuction(id, adUnits, bidderRequests) {
+    return {
+      getAuctionId() { return id },
+      getAdUnits() { return adUnits; },
+      getBidRequests() { return bidderRequests; }
+    }
+  }
+
+  beforeEach(() => {
+    auctions = [];
+    index = new AuctionIndex(() => auctions);
+  })
+
+  describe('getAuction', () => {
+    beforeEach(() => {
+      auctions = [mockAuction('a1'), mockAuction('a2')];
+    });
+
+    it('should find auctions by auctionId', () => {
+      expect(index.getAuction({auctionId: 'a1'})).to.equal(auctions[0]);
+    });
+
+    it('should return undef if auction is missing', () => {
+      expect(index.getAuction({auctionId: 'missing'})).to.be.undefined;
+    });
+
+    it('should return undef if no auctionId is provided', () => {
+      expect(index.getAuction({})).to.be.undefined;
+    });
+  });
+
+  describe('getAdUnit', () => {
+    let adUnits;
+
+    beforeEach(() => {
+      adUnits = [{transactionId: 'au1'}, {transactionId: 'au2'}];
+      auctions = [
+        mockAuction('a1', [adUnits[0], {}]),
+        mockAuction('a2', [adUnits[1]])
+      ];
+    });
+
+    it('should find adUnits by transactionId', () => {
+      expect(index.getAdUnit({transactionId: 'au2'})).to.equal(adUnits[1]);
+    });
+
+    it('should return undefined if adunit is missing', () => {
+      expect(index.getAdUnit({transactionId: 'missing'})).to.be.undefined;
+    });
+
+    it('should return undefined if no transactionId is provided', () => {
+      expect(index.getAdUnit({})).to.be.undefined;
+    });
+  });
+
+  describe('getBidRequest', () => {
+    let bidRequests;
+    beforeEach(() => {
+      bidRequests = [{bidId: 'b1'}, {bidId: 'b2'}];
+      auctions = [
+        mockAuction('a1', [], [{bids: [bidRequests[0], {}]}]),
+        mockAuction('a2', [], [{bids: [bidRequests[1]]}])
+      ]
+    });
+
+    it('should find bidRequests by requestId', () => {
+      expect(index.getBidRequest({requestId: 'b2'})).to.equal(bidRequests[1]);
+    });
+
+    it('should return undef if bidRequest is missing', () => {
+      expect(index.getBidRequest({requestId: 'missing'})).to.be.undefined;
+    });
+
+    it('should return undef if no requestId is provided', () => {
+      expect(index.getBidRequest({})).to.be.undefined;
+    });
+  });
+
+  describe('getMediaTypes', () => {
+    let bidderRequests, mediaTypes, adUnits;
+
+    beforeEach(() => {
+      mediaTypes = [{mockMT: '1'}, {mockMT: '2'}, {mockMT: '3'}, {mockMT: '4'}]
+      adUnits = [
+        {transactionId: 'au1', mediaTypes: mediaTypes[0]},
+        {transactionId: 'au2', mediaTypes: mediaTypes[1]}
+      ]
+      bidderRequests = [
+        {bidderRequestId: 'ber1', bids: [{bidId: 'b1', mediaTypes: mediaTypes[2], transactionId: 'au1'}, {}]},
+        {bidderRequestId: 'ber2', bids: [{bidId: 'b2', mediaTypes: mediaTypes[3], transactionId: 'au2'}]}
+      ]
+      auctions = [
+        mockAuction('a1', [adUnits[0]], [bidderRequests[0], {}]),
+        mockAuction('a2', [adUnits[1]], [bidderRequests[1]])
+      ]
+    });
+
+    it('should find mediaTypes by transactionId', () => {
+      expect(index.getMediaTypes({transactionId: 'au2'})).to.equal(mediaTypes[1]);
+    });
+
+    it('should find mediaTypes by requestId', () => {
+      expect(index.getMediaTypes({requestId: 'b1'})).to.equal(mediaTypes[2]);
+    });
+
+    it('should give precedence to request.mediaTypes over adUnit.mediaTypes', () => {
+      expect(index.getMediaTypes({requestId: 'b2', transactionId: 'au2'})).to.equal(mediaTypes[3]);
+    });
+
+    it('should return undef if requestId and transactionId do not match', () => {
+      expect(index.getMediaTypes({requestId: 'b1', transactionId: 'au2'})).to.be.undefined;
+    });
+
+    it('should return undef if no params are provided', () => {
+      expect(index.getMediaTypes({})).to.be.undefined;
+    });
+
+    ['requestId', 'transactionId'].forEach(param => {
+      it(`should return undef if ${param} is missing`, () => {
+        expect(index.getMediaTypes({[param]: 'missing'})).to.be.undefined;
+      });
+    })
+  });
+});
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index cab0655a29d..1eecfac47a7 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -1,4 +1,4 @@
-import { newBidder, registerBidder, preloadBidderMappingFile, storage } from 'src/adapters/bidderFactory.js';
+import {newBidder, registerBidder, preloadBidderMappingFile, storage, isValid} from 'src/adapters/bidderFactory.js';
 import adapterManager from 'src/adapterManager.js';
 import * as ajax from 'src/ajax.js';
 import { expect } from 'chai';
@@ -6,6 +6,13 @@ import { userSync } from 'src/userSync.js'
 import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr.js';
+import CONSTANTS from 'src/constants.json';
+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';
+import {decorateAdUnitsWithNativeParams} from '../../../../src/native.js';
 
 const CODE = 'sampleBidder';
 const MOCK_BIDS_REQUEST = {
@@ -33,6 +40,10 @@ function onTimelyResponseStub() {
 
 }
 
+before(() => {
+  hook.ready();
+});
+
 let wrappedCallback = config.callbackWithBidder(CODE);
 
 describe('bidders created by newBidder', function () {
@@ -51,23 +62,29 @@ describe('bidders created by newBidder', function () {
     };
 
     addBidResponseStub = sinon.stub();
+    addBidResponseStub.reject = sinon.stub();
     doneStub = sinon.stub();
   });
 
   describe('when the ajax response is irrelevant', function () {
     let ajaxStub;
     let getConfigSpy;
+    let aliasRegistryStub, aliasRegistry;
 
     beforeEach(function () {
       ajaxStub = sinon.stub(ajax, 'ajax');
       addBidResponseStub.reset();
       getConfigSpy = sinon.spy(config, 'getConfig');
       doneStub.reset();
+      aliasRegistry = {};
+      aliasRegistryStub = sinon.stub(adapterManager, 'aliasRegistry');
+      aliasRegistryStub.get(() => aliasRegistry);
     });
 
     afterEach(function () {
       ajaxStub.restore();
       getConfigSpy.restore();
+      aliasRegistryStub.restore();
     });
 
     it('should let registerSyncs run with invalid alias and aliasSync enabled', function () {
@@ -114,6 +131,7 @@ describe('bidders created by newBidder', function () {
       });
       spec.code = 'aliasBidder';
       const bidder = newBidder(spec);
+      aliasRegistry = {[spec.code]: CODE};
       bidder.callBids({ bids: [] }, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
       expect(getConfigSpy.withArgs('userSync.filterSettings').calledOnce).to.equal(false);
     });
@@ -314,6 +332,28 @@ describe('bidders created by newBidder', function () {
 
       expect(addBidResponseStub.callCount).to.equal(0);
     });
+
+    it('should emit BEFORE_BIDDER_HTTP events before network requests', function () {
+      const bidder = newBidder(spec);
+      const req = {
+        method: 'POST',
+        url: 'test.url.com',
+        data: { arg: 2 }
+      };
+
+      spec.isBidRequestValid.returns(true);
+      spec.buildRequests.returns([req, req]);
+
+      const eventEmitterSpy = sinon.spy(events, 'emit');
+      bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(ajaxStub.calledTwice).to.equal(true);
+      expect(eventEmitterSpy.getCalls()
+        .filter(call => call.args[0] === CONSTANTS.EVENTS.BEFORE_BIDDER_HTTP)
+      ).to.length(2);
+
+      eventEmitterSpy.restore();
+    });
   });
 
   describe('when the ajax call succeeds', function () {
@@ -401,8 +441,12 @@ describe('bidders created by newBidder', function () {
         adUnitCode: 'mock/placement',
         currency: 'USD',
         netRevenue: true,
-        ttl: 300
+        ttl: 300,
+        bidderCode: 'sampleBidder',
+        sampleBidder: {advertiserId: '12345', networkId: '111222'}
       };
+      const bidderRequest = Object.assign({}, MOCK_BIDS_REQUEST);
+      bidderRequest.bids[0].bidder = 'sampleBidder';
       spec.isBidRequestValid.returns(true);
       spec.buildRequests.returns({
         method: 'POST',
@@ -413,7 +457,7 @@ describe('bidders created by newBidder', function () {
 
       spec.interpretResponse.returns(bid);
 
-      bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+      bidder.callBids(bidderRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
       expect(addBidResponseStub.calledOnce).to.equal(true);
       expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
@@ -423,6 +467,8 @@ describe('bidders created by newBidder', function () {
       expect(bidObject.originalCurrency).to.equal(bid.currency);
       expect(doneStub.calledOnce).to.equal(true);
       expect(logErrorSpy.callCount).to.equal(0);
+      expect(bidObject.meta).to.exist;
+      expect(bidObject.meta).to.deep.equal({advertiserId: '12345', networkId: '111222'});
     });
 
     it('should call spec.getUserSyncs() with the response', function () {
@@ -463,7 +509,7 @@ describe('bidders created by newBidder', function () {
       expect(userSyncStub.firstCall.args[2]).to.equal('usersync.com');
     });
 
-    it('should logError when required bid response params are missing', function () {
+    it('should logError and reject bid when required bid response params are missing', function () {
       const bidder = newBidder(spec);
 
       const bid = {
@@ -487,9 +533,10 @@ describe('bidders created by newBidder', function () {
       bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
       expect(logErrorSpy.calledOnce).to.equal(true);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
     });
 
-    it('should logError when required bid response params are undefined', function () {
+    it('should logError and reject bid when required response params are undefined', function () {
       const bidder = newBidder(spec);
 
       const bid = {
@@ -517,22 +564,58 @@ describe('bidders created by newBidder', function () {
       bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
       expect(logErrorSpy.calledOnce).to.equal(true);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
+    });
+
+    it('should require requestId from interpretResponse', () => {
+      const bidder = newBidder(spec);
+      const bid = {
+        'ad': 'creative',
+        'cpm': '1.99',
+        'creativeId': 'some-id',
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 360
+      };
+      spec.isBidRequestValid.returns(true);
+      spec.buildRequests.returns({
+        method: 'POST',
+        url: 'test.url.com',
+        data: {}
+      });
+      spec.getUserSyncs.returns([]);
+      spec.interpretResponse.returns(bid);
+
+      bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.called).to.be.false;
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
     });
   });
 
   describe('when the ajax call fails', function () {
     let ajaxStub;
+    let callBidderErrorStub;
+    let eventEmitterStub;
+    let xhrErrorMock = {
+      status: 500,
+      statusText: 'Internal Server Error'
+    };
 
     beforeEach(function () {
       ajaxStub = sinon.stub(ajax, 'ajax').callsFake(function(url, callbacks) {
-        callbacks.error('ajax call failed.');
+        callbacks.error('ajax call failed.', xhrErrorMock);
       });
+      callBidderErrorStub = sinon.stub(adapterManager, 'callBidderError');
+      eventEmitterStub = sinon.stub(events, 'emit');
       addBidResponseStub.reset();
       doneStub.reset();
     });
 
     afterEach(function () {
       ajaxStub.restore();
+      callBidderErrorStub.restore();
+      eventEmitterStub.restore();
     });
 
     it('should not spec.interpretResponse()', function () {
@@ -550,6 +633,14 @@ describe('bidders created by newBidder', function () {
 
       expect(spec.interpretResponse.called).to.equal(false);
       expect(doneStub.calledOnce).to.equal(true);
+      expect(callBidderErrorStub.calledOnce).to.equal(true);
+      expect(callBidderErrorStub.firstCall.args[0]).to.equal(CODE);
+      expect(callBidderErrorStub.firstCall.args[1]).to.equal(xhrErrorMock);
+      expect(callBidderErrorStub.firstCall.args[2]).to.equal(MOCK_BIDS_REQUEST);
+      sinon.assert.calledWith(eventEmitterStub, CONSTANTS.EVENTS.BIDDER_ERROR, {
+        error: xhrErrorMock,
+        bidderRequest: MOCK_BIDS_REQUEST
+      });
     });
 
     it('should not add bids for each adunit code into the auction', function () {
@@ -568,6 +659,14 @@ describe('bidders created by newBidder', function () {
 
       expect(addBidResponseStub.callCount).to.equal(0);
       expect(doneStub.calledOnce).to.equal(true);
+      expect(callBidderErrorStub.calledOnce).to.equal(true);
+      expect(callBidderErrorStub.firstCall.args[0]).to.equal(CODE);
+      expect(callBidderErrorStub.firstCall.args[1]).to.equal(xhrErrorMock);
+      expect(callBidderErrorStub.firstCall.args[2]).to.equal(MOCK_BIDS_REQUEST);
+      sinon.assert.calledWith(eventEmitterStub, CONSTANTS.EVENTS.BIDDER_ERROR, {
+        error: xhrErrorMock,
+        bidderRequest: MOCK_BIDS_REQUEST
+      });
     });
 
     it('should call spec.getUserSyncs() with no responses', function () {
@@ -586,6 +685,40 @@ describe('bidders created by newBidder', function () {
       expect(spec.getUserSyncs.calledOnce).to.equal(true);
       expect(spec.getUserSyncs.firstCall.args[1]).to.deep.equal([]);
       expect(doneStub.calledOnce).to.equal(true);
+      expect(callBidderErrorStub.calledOnce).to.equal(true);
+      expect(callBidderErrorStub.firstCall.args[0]).to.equal(CODE);
+      expect(callBidderErrorStub.firstCall.args[1]).to.equal(xhrErrorMock);
+      expect(callBidderErrorStub.firstCall.args[2]).to.equal(MOCK_BIDS_REQUEST);
+      sinon.assert.calledWith(eventEmitterStub, CONSTANTS.EVENTS.BIDDER_ERROR, {
+        error: xhrErrorMock,
+        bidderRequest: MOCK_BIDS_REQUEST
+      });
+    });
+
+    it('should call spec.getUserSyncs() with no responses', function () {
+      const bidder = newBidder(spec);
+
+      spec.isBidRequestValid.returns(true);
+      spec.buildRequests.returns({
+        method: 'POST',
+        url: 'test.url.com',
+        data: {}
+      });
+      spec.getUserSyncs.returns([]);
+
+      bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(spec.getUserSyncs.calledOnce).to.equal(true);
+      expect(spec.getUserSyncs.firstCall.args[1]).to.deep.equal([]);
+      expect(doneStub.calledOnce).to.equal(true);
+      expect(callBidderErrorStub.calledOnce).to.equal(true);
+      expect(callBidderErrorStub.firstCall.args[0]).to.equal(CODE);
+      expect(callBidderErrorStub.firstCall.args[1]).to.equal(xhrErrorMock);
+      expect(callBidderErrorStub.firstCall.args[2]).to.equal(MOCK_BIDS_REQUEST);
+      sinon.assert.calledWith(eventEmitterStub, CONSTANTS.EVENTS.BIDDER_ERROR, {
+        error: xhrErrorMock,
+        bidderRequest: MOCK_BIDS_REQUEST
+      });
     });
   });
 });
@@ -645,11 +778,55 @@ describe('registerBidder', function () {
     expect(registerBidAdapterStub.secondCall.args[1]).to.equal('foo')
     expect(registerBidAdapterStub.thirdCall.args[1]).to.equal('bar')
   });
+
+  it('should register alias with their gvlid', function() {
+    const aliases = [
+      {
+        code: 'foo',
+        gvlid: 1
+      },
+      {
+        code: 'bar',
+        gvlid: 2
+      },
+      {
+        code: 'baz'
+      }
+    ]
+    const thisSpec = Object.assign(newEmptySpec(), { aliases: aliases });
+    registerBidder(thisSpec);
+
+    expect(registerBidAdapterStub.getCall(1).args[0].getSpec().gvlid).to.equal(1);
+    expect(registerBidAdapterStub.getCall(2).args[0].getSpec().gvlid).to.equal(2);
+    expect(registerBidAdapterStub.getCall(3).args[0].getSpec().gvlid).to.equal(undefined);
+  })
+
+  it('should register alias with skipPbsAliasing', function() {
+    const aliases = [
+      {
+        code: 'foo',
+        skipPbsAliasing: true
+      },
+      {
+        code: 'bar',
+        skipPbsAliasing: false
+      },
+      {
+        code: 'baz'
+      }
+    ]
+    const thisSpec = Object.assign(newEmptySpec(), { aliases: aliases });
+    registerBidder(thisSpec);
+
+    expect(registerBidAdapterStub.getCall(1).args[0].getSpec().skipPbsAliasing).to.equal(true);
+    expect(registerBidAdapterStub.getCall(2).args[0].getSpec().skipPbsAliasing).to.equal(false);
+    expect(registerBidAdapterStub.getCall(3).args[0].getSpec().skipPbsAliasing).to.equal(undefined);
+  })
 })
 
 describe('validate bid response: ', function () {
   let spec;
-  let bidder;
+  let indexStub, adUnits, bidderRequests;
   let addBidResponseStub;
   let doneStub;
   let ajaxStub;
@@ -683,6 +860,7 @@ describe('validate bid response: ', function () {
     });
 
     addBidResponseStub = sinon.stub();
+    addBidResponseStub.reject = sinon.stub();
     doneStub = sinon.stub();
     ajaxStub = sinon.stub(ajax, 'ajax').callsFake(function(url, callbacks) {
       const fakeResponse = sinon.stub();
@@ -690,98 +868,119 @@ describe('validate bid response: ', function () {
       callbacks.success('response body', { getResponseHeader: fakeResponse });
     });
     logErrorSpy = sinon.spy(utils, 'logError');
+    indexStub = sinon.stub(auctionManager, 'index');
+    adUnits = [];
+    bidderRequests = [];
+    indexStub.get(() => stubAuctionIndex({adUnits: adUnits, bidderRequests: bidderRequests}))
   });
 
   afterEach(function () {
     ajaxStub.restore();
     logErrorSpy.restore();
+    indexStub.restore;
   });
 
-  it('should add native bids that do have required assets', function () {
-    let bidRequest = {
-      bids: [{
-        bidId: '1',
-        auctionId: 'first-bid-id',
-        adUnitCode: 'mock/placement',
-        params: {
-          param: 5
-        },
+  if (FEATURES.NATIVE) {
+    it('should add native bids that do have required assets', function () {
+      adUnits = [{
+        transactionId: 'au',
         nativeParams: {
           title: {'required': true},
-        },
-        mediaType: 'native',
+        }
       }]
-    };
+      decorateAdUnitsWithNativeParams(adUnits);
+      let bidRequest = {
+        bids: [{
+          bidId: '1',
+          auctionId: 'first-bid-id',
+          adUnitCode: 'mock/placement',
+          transactionId: 'au',
+          params: {
+            param: 5
+          },
+          mediaType: 'native',
+        }]
+      };
 
-    let bids1 = Object.assign({},
-      bids[0],
-      {
-        'mediaType': 'native',
-        'native': {
-          'title': 'Native Creative',
-          'clickUrl': 'https://www.link.example',
+      let bids1 = Object.assign({},
+        bids[0],
+        {
+          'mediaType': 'native',
+          'native': {
+            'title': 'Native Creative',
+            'clickUrl': 'https://www.link.example',
+          }
         }
-      }
-    );
+      );
 
-    const bidder = newBidder(spec);
+      const bidder = newBidder(spec);
 
-    spec.interpretResponse.returns(bids1);
-    bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-    expect(addBidResponseStub.calledOnce).to.equal(true);
-    expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
-    expect(logErrorSpy.callCount).to.equal(0);
-  });
+      expect(addBidResponseStub.calledOnce).to.equal(true);
+      expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
+      expect(logErrorSpy.callCount).to.equal(0);
+    });
 
-  it('should not add native bids that do not have required assets', function () {
-    let bidRequest = {
-      bids: [{
-        bidId: '1',
-        auctionId: 'first-bid-id',
-        adUnitCode: 'mock/placement',
-        params: {
-          param: 5
-        },
+    it('should not add native bids that do not have required assets', function () {
+      adUnits = [{
+        transactionId: 'au',
         nativeParams: {
           title: {'required': true},
         },
-        mediaType: 'native',
-      }]
-    };
-
-    let bids1 = Object.assign({},
-      bids[0],
-      {
-        bidderCode: CODE,
-        mediaType: 'native',
-        native: {
-          title: undefined,
-          clickUrl: 'https://www.link.example',
+      }];
+      decorateAdUnitsWithNativeParams(adUnits);
+      let bidRequest = {
+        bids: [{
+          bidId: '1',
+          auctionId: 'first-bid-id',
+          adUnitCode: 'mock/placement',
+          transactionId: 'au',
+          params: {
+            param: 5
+          },
+          mediaType: 'native',
+        }]
+      };
+      let bids1 = Object.assign({},
+        bids[0],
+        {
+          bidderCode: CODE,
+          mediaType: 'native',
+          native: {
+            title: undefined,
+            clickUrl: 'https://www.link.example',
+          }
         }
-      }
-    );
+      );
 
-    const bidder = newBidder(spec);
-    spec.interpretResponse.returns(bids1);
-    bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-    expect(addBidResponseStub.calledOnce).to.equal(false);
-    expect(logErrorSpy.callCount).to.equal(1);
-  });
+      expect(addBidResponseStub.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
+      expect(logErrorSpy.calledWithMatch('Ignoring bid: Native bid missing some required properties.')).to.equal(true);
+    });
+  }
 
   it('should add bid when renderer is present on outstream bids', function () {
+    adUnits = [{
+      transactionId: 'au',
+      mediaTypes: {
+        video: {context: 'outstream'}
+      }
+    }]
     let bidRequest = {
       bids: [{
         bidId: '1',
         auctionId: 'first-bid-id',
+        transactionId: 'au',
         adUnitCode: 'mock/placement',
         params: {
           param: 5
         },
-        mediaTypes: {
-          video: {context: 'outstream'}
-        }
       }]
     };
 
@@ -817,7 +1016,7 @@ describe('validate bid response: ', function () {
         sizes: [[300, 250]],
       }]
     };
-
+    bidderRequests = [bidRequest];
     let bids1 = Object.assign({},
       bids[0],
       {
@@ -835,6 +1034,235 @@ 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.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
+      expect(logWarnSpy.callCount).to.equal(1);
+    });
+
+    it('should reject the bid, when allowAlternateBidderCodes flag is undefined (default should be false)', function () {
+      bidderSettingStub.returns(undefined);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
+    });
+
+    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.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
+      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 is marked as * (with space) 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 not accept the bid, when allowedAlternateBidderCodes is marked as empty array 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.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
+      expect(logWarnSpy.callCount).to.equal(1);
+    });
+
+    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.called).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.called).to.equal(false);
+      expect(logWarnSpy.callCount).to.equal(1);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
+    });
+
+    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.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
+      expect(logWarnSpy.callCount).to.equal(1);
+    });
+  });
+
+  describe('when interpretResponse returns BidderAuctionResponse', function() {
+    const bidRequest = {
+      bids: [{
+        bidId: '1',
+        bidder: CODE,
+        auctionId: 'first-bid-id',
+        adUnitCode: 'mock/placement',
+        transactionId: 'au',
+      }]
+    };
+    const fledgeAuctionConfig = {
+      bidId: '1',
+    }
+    describe('when response has FLEDGE auction config', function() {
+      let logInfoSpy;
+
+      beforeEach(function () {
+        logInfoSpy = sinon.spy(utils, 'logInfo');
+      });
+
+      afterEach(function () {
+        logInfoSpy.restore();
+      });
+
+      it('should unwrap bids', function() {
+        const bidder = newBidder(spec);
+        spec.interpretResponse.returns({
+          bids: bids,
+          fledgeAuctionConfigs: []
+        });
+        bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+        expect(addBidResponseStub.calledOnce).to.equal(true);
+        expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
+      });
+
+      it('should call fledgeManager with FLEDGE configs', function() {
+        const bidder = newBidder(spec);
+        spec.interpretResponse.returns({
+          bids: bids,
+          fledgeAuctionConfigs: [fledgeAuctionConfig]
+        });
+        bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+        expect(logInfoSpy.calledOnce).to.equal(true);
+        expect(logInfoSpy.firstCall.args[1]).to.equal(fledgeAuctionConfig);
+        expect(addBidResponseStub.calledOnce).to.equal(true);
+        expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
+      })
+
+      it('should call fledgeManager with FLEDGE configs even if no bids returned', function() {
+        const bidder = newBidder(spec);
+        spec.interpretResponse.returns({
+          bids: [],
+          fledgeAuctionConfigs: [fledgeAuctionConfig]
+        });
+        bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+        expect(logInfoSpy.calledOnce).to.equal(true);
+        expect(logInfoSpy.firstCall.args[1]).to.equal(fledgeAuctionConfig);
+        expect(addBidResponseStub.calledOnce).to.equal(false);
+      })
+    })
+  })
 });
 
 describe('preload mapping url hook', function() {
@@ -969,3 +1397,42 @@ describe('preload mapping url hook', function() {
     clock.restore();
   });
 });
+
+describe('bid response isValid', () => {
+  describe('size check', () => {
+    let req, index;
+
+    beforeEach(() => {
+      req = {
+        ...MOCK_BIDS_REQUEST.bids[0],
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 2], [3, 4]]
+          }
+        }
+      }
+    });
+
+    function mkResponse(width, height) {
+      return {
+        requestId: req.bidId,
+        width,
+        height,
+        cpm: 1,
+        ttl: 60,
+        creativeId: '123',
+        netRevenue: true,
+        currency: 'USD',
+        mediaType: 'banner',
+      }
+    }
+
+    function checkValid(bid) {
+      return isValid('au', bid, {index: stubAuctionIndex({bidRequests: [req]})});
+    }
+
+    it('should succeed when response has a size that was in request', () => {
+      expect(checkValid(mkResponse(3, 4))).to.be.true;
+    });
+  })
+});
diff --git a/test/spec/unit/core/bidderSettings_spec.js b/test/spec/unit/core/bidderSettings_spec.js
new file mode 100644
index 00000000000..ece18040d1e
--- /dev/null
+++ b/test/spec/unit/core/bidderSettings_spec.js
@@ -0,0 +1,123 @@
+import {bidderSettings, ScopedSettings} from '../../../../src/bidderSettings.js';
+import {expect} from 'chai';
+import * as prebidGlobal from '../../../../src/prebidGlobal';
+import sinon from 'sinon';
+
+describe('ScopedSettings', () => {
+  let data;
+  let settings;
+
+  beforeEach(() => {
+    settings = new ScopedSettings(() => data, 'fallback');
+  });
+
+  describe('get', () => {
+    it('should retrieve setting from scope', () => {
+      data = {
+        scope: {key: 'value'}
+      };
+      expect(settings.get('scope', 'key')).to.equal('value');
+    });
+
+    it('should fallback to fallback scope', () => {
+      data = {
+        fallback: {
+          key: 'value'
+        }
+      };
+      expect(settings.get('scope', 'key')).to.equal('value');
+    });
+
+    it('should retrieve from default scope if scope is null', () => {
+      data = {
+        fallback: {
+          key: 'value'
+        }
+      };
+
+      expect(settings.get(null, 'key')).to.equal('value');
+    });
+
+    it('should not fall back if own setting has a falsy value', () => {
+      data = {
+        scope: {
+          key: false,
+        },
+        fallback: {
+          key: true
+        }
+      }
+      expect(settings.get('scope', 'key')).to.equal(false);
+    })
+  });
+
+  describe('getOwn', () => {
+    it('should not fall back to default scope', () => {
+      data = {
+        fallback: {
+          key: 'value'
+        }
+      };
+      expect(settings.getOwn('missing', 'key')).to.be.undefined;
+    });
+
+    it('should use default if scope is null', () => {
+      data = {
+        fallback: {
+          key: 'value'
+        }
+      };
+      expect(settings.getOwn(null, 'key')).to.equal('value');
+    });
+  });
+
+  describe('getScopes', () => {
+    it('should return all top-level keys except the default scope', () => {
+      data = {
+        fallback: {},
+        scope1: {},
+        scope2: {},
+      };
+      expect(settings.getScopes()).to.have.members(['scope1', 'scope2']);
+    });
+  });
+
+  describe('settingsFor', () => {
+    it('should merge with default scope', () => {
+      data = {
+        fallback: {
+          dkey: 'value'
+        },
+        scope: {
+          skey: 'value'
+        }
+      }
+      expect(settings.settingsFor('scope')).to.eql({
+        dkey: 'value',
+        skey: 'value'
+      })
+    })
+  });
+});
+
+describe('bidderSettings', () => {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(prebidGlobal, 'getGlobal').returns({
+      bidderSettings: {
+        scope: {
+          key: 'value'
+        }
+      }
+    });
+  })
+
+  afterEach(() => {
+    sandbox.restore();
+  })
+
+  it('should fetch data from getGlobal().bidderSettings', () => {
+    expect(bidderSettings.get('scope', 'key')).to.equal('value');
+  })
+});
diff --git a/test/spec/unit/core/consentHandler_spec.js b/test/spec/unit/core/consentHandler_spec.js
new file mode 100644
index 00000000000..082ff34f90c
--- /dev/null
+++ b/test/spec/unit/core/consentHandler_spec.js
@@ -0,0 +1,59 @@
+import {ConsentHandler} from '../../../../src/consentHandler.js';
+
+describe('Consent data handler', () => {
+  let handler;
+  beforeEach(() => {
+    handler = new ConsentHandler();
+  })
+
+  it('should be disabled, return null data on init', () => {
+    expect(handler.enabled).to.be.false;
+    expect(handler.getConsentData()).to.equal(null);
+  })
+
+  it('should resolve promise to null when disabled', () => {
+    return handler.promise.then((data) => {
+      expect(data).to.equal(null);
+    });
+  });
+
+  it('should return data after setConsentData', () => {
+    const data = {consent: 'string'};
+    handler.enable();
+    handler.setConsentData(data);
+    expect(handler.getConsentData()).to.equal(data);
+  });
+
+  it('should resolve .promise to data after setConsentData', (done) => {
+    let actual = null;
+    const data = {consent: 'string'};
+    handler.enable();
+    handler.promise.then((d) => actual = d);
+    setTimeout(() => {
+      expect(actual).to.equal(null);
+      handler.setConsentData(data);
+      setTimeout(() => {
+        expect(actual).to.equal(data);
+        done();
+      })
+    })
+  });
+
+  it('should resolve .promise to new data if setConsentData is called a second time', (done) => {
+    let actual = null;
+    const d1 = {data: '1'};
+    const d2 = {data: '2'};
+    handler.enable();
+    handler.promise.then((d) => actual = d);
+    handler.setConsentData(d1);
+    setTimeout(() => {
+      expect(actual).to.equal(d1);
+      handler.setConsentData(d2);
+      handler.promise.then((d) => actual = d);
+      setTimeout(() => {
+        expect(actual).to.equal(d2);
+        done();
+      })
+    })
+  });
+})
diff --git a/test/spec/unit/core/storageManager_spec.js b/test/spec/unit/core/storageManager_spec.js
index 0b406242f90..58bf8c9eb25 100644
--- a/test/spec/unit/core/storageManager_spec.js
+++ b/test/spec/unit/core/storageManager_spec.js
@@ -1,8 +1,20 @@
-import { resetData, getCoreStorageManager, storageCallbacks, getStorageManager } from 'src/storageManager.js';
+import {
+  resetData,
+  getCoreStorageManager,
+  storageCallbacks,
+  getStorageManager,
+  newStorageManager, validateStorageEnforcement
+} from 'src/storageManager.js';
 import { config } from 'src/config.js';
 import * as utils from 'src/utils.js';
+import {hook} from '../../../../src/hook.js';
+import {VENDORLESS_GVLID} from '../../../../src/consentHandler.js';
 
 describe('storage manager', function() {
+  before(() => {
+    hook.ready();
+  });
+
   beforeEach(function() {
     resetData();
   });
@@ -42,5 +54,142 @@ describe('storage manager', function() {
     storage.setCookie('foo1', 'baz1');
     expect(deviceAccessSpy.calledOnce).to.equal(true);
     deviceAccessSpy.restore();
+  });
+
+  describe(`core storage`, () => {
+    let storage, validateHook;
+
+    beforeEach(() => {
+      storage = getCoreStorageManager();
+      validateHook = sinon.stub().callsFake(function (next, ...args) {
+        next.apply(this, args);
+      });
+      validateStorageEnforcement.before(validateHook, 99);
+    });
+
+    afterEach(() => {
+      validateStorageEnforcement.getHooks({hook: validateHook}).remove();
+      config.resetConfig();
+    })
+
+    it('should respect (vendorless) consent enforcement', () => {
+      storage.localStorageIsEnabled();
+      expect(validateHook.args[0][1]).to.equal(VENDORLESS_GVLID); // gvlid should be set to VENDORLESS_GVLID
+    });
+
+    it('should respect the deviceAccess flag', () => {
+      config.setConfig({deviceAccess: false});
+      expect(storage.localStorageIsEnabled()).to.be.false
+    })
+  })
+
+  describe('localstorage forbidden access in 3rd-party context', function() {
+    let errorLogSpy;
+    let originalLocalStorage;
+    const localStorageMock = { get: () => { throw Error } };
+
+    beforeEach(function() {
+      originalLocalStorage = window.localStorage;
+      Object.defineProperty(window, 'localStorage', localStorageMock);
+      errorLogSpy = sinon.spy(utils, 'logError');
+    });
+
+    afterEach(function() {
+      Object.defineProperty(window, 'localStorage', { get: () => originalLocalStorage });
+      errorLogSpy.restore();
+    })
+
+    it('should not throw if the localstorage is not accessible when setting/getting/removing from localstorage', function() {
+      const coreStorage = getStorageManager();
+
+      coreStorage.setDataInLocalStorage('key', 'value');
+      const val = coreStorage.getDataFromLocalStorage('key');
+      coreStorage.removeDataFromLocalStorage('key');
+
+      expect(val).to.be.null;
+      sinon.assert.calledThrice(errorLogSpy);
+    })
+  })
+
+  describe('localstorage is enabled', function() {
+    let localStorage;
+
+    beforeEach(function() {
+      localStorage = window.localStorage;
+      localStorage.clear();
+    });
+
+    afterEach(function() {
+      localStorage.clear();
+    })
+
+    it('should remove side-effect after checking', function () {
+      const storage = getStorageManager();
+
+      localStorage.setItem('unrelated', 'dummy');
+      const val = storage.localStorageIsEnabled();
+
+      expect(val).to.be.true;
+      expect(localStorage.length).to.be.eq(1);
+      expect(localStorage.getItem('unrelated')).to.be.eq('dummy');
+    });
+  });
+
+  describe('when bidderSettings.allowStorage is defined', () => {
+    const ALLOWED_BIDDER = 'allowed-bidder';
+    const ALLOW_KEY = 'storageAllowed';
+
+    const COOKIE = 'test-cookie';
+    const LS_KEY = 'test-localstorage';
+
+    function mockBidderSettings() {
+      return {
+        get(bidder, key) {
+          if (bidder === ALLOWED_BIDDER && key === ALLOW_KEY) {
+            return true;
+          } else {
+            return undefined;
+          }
+        }
+      }
+    }
+
+    Object.entries({
+      disallowed: ['denied_bidder', false],
+      allowed: [ALLOWED_BIDDER, true]
+    }).forEach(([test, [bidderCode, shouldWork]]) => {
+      describe(`for ${test} bidders`, () => {
+        let mgr;
+
+        beforeEach(() => {
+          mgr = newStorageManager({bidderCode: bidderCode}, {bidderSettings: mockBidderSettings()});
+        })
+
+        afterEach(() => {
+          mgr.setCookie(COOKIE, 'delete', new Date().toUTCString());
+          mgr.removeDataFromLocalStorage(LS_KEY);
+        })
+
+        const testDesc = (desc) => `should ${shouldWork ? '' : 'not'} ${desc}`;
+
+        it(testDesc('allow cookies'), () => {
+          mgr.setCookie(COOKIE, 'value');
+          expect(mgr.getCookie(COOKIE)).to.equal(shouldWork ? 'value' : null);
+        });
+
+        it(testDesc('allow localStorage'), () => {
+          mgr.setDataInLocalStorage(LS_KEY, 'value');
+          expect(mgr.getDataFromLocalStorage(LS_KEY)).to.equal(shouldWork ? 'value' : null);
+        });
+
+        it(testDesc('report localStorage as available'), () => {
+          expect(mgr.hasLocalStorage()).to.equal(shouldWork);
+        });
+
+        it(testDesc('report cookies as available'), () => {
+          expect(mgr.cookiesAreEnabled()).to.equal(shouldWork);
+        });
+      });
+    });
   })
 });
diff --git a/test/spec/unit/core/targeting_spec.js b/test/spec/unit/core/targeting_spec.js
index a5da1c904f0..f9fe2e398b0 100644
--- a/test/spec/unit/core/targeting_spec.js
+++ b/test/spec/unit/core/targeting_spec.js
@@ -1,12 +1,19 @@
 import { expect } from 'chai';
-import { targeting as targetingInstance, filters, sortByDealAndPriceBucketOrCpm } from 'src/targeting.js';
+import { targeting as targetingInstance, filters, getHighestCpmBidsFromBidPool, sortByDealAndPriceBucketOrCpm } from 'src/targeting.js';
 import { config } from 'src/config.js';
-import { getAdUnits, createBidReceived } from 'test/fixtures/fixtures.js';
+import { createBidReceived } from 'test/fixtures/fixtures.js';
 import CONSTANTS from 'src/constants.json';
 import { auctionManager } from 'src/auctionManager.js';
 import * as utils from 'src/utils.js';
+import {deepClone} from 'src/utils.js';
+import {createBid} from '../../../../src/bidfactory.js';
+import {hook} from '../../../../src/hook.js';
 
-const bid1 = {
+function mkBid(bid, status = CONSTANTS.STATUS.GOOD) {
+  return Object.assign(createBid(status), bid);
+}
+
+const sampleBid = {
   'bidderCode': 'rubicon',
   'width': '300',
   'height': '250',
@@ -38,7 +45,9 @@ const bid1 = {
   'ttl': 300
 };
 
-const bid2 = {
+const bid1 = mkBid(sampleBid);
+
+const bid2 = mkBid({
   'bidderCode': 'rubicon',
   'width': '300',
   'height': '250',
@@ -66,9 +75,9 @@ const bid2 = {
   'netRevenue': true,
   'currency': 'USD',
   'ttl': 300
-};
+});
 
-const bid3 = {
+const bid3 = mkBid({
   'bidderCode': 'rubicon',
   'width': '300',
   'height': '600',
@@ -96,9 +105,9 @@ const bid3 = {
   'netRevenue': true,
   'currency': 'USD',
   'ttl': 300
-};
+});
 
-const nativeBid1 = {
+const nativeBid1 = mkBid({
   'bidderCode': 'appnexus',
   'width': 0,
   'height': 0,
@@ -164,8 +173,9 @@ const nativeBid1 = {
     [CONSTANTS.NATIVE_KEYS.image]: 'http://vcdn.adnxs.com/p/creative-image/94/22/cd/0f/9422cd0f-f400-45d3-80f5-2b92629d9257.jpg',
     [CONSTANTS.NATIVE_KEYS.icon]: 'http://vcdn.adnxs.com/p/creative-image/bd/59/a6/c6/bd59a6c6-0851-411d-a16d-031475a51312.png'
   }
-};
-const nativeBid2 = {
+});
+
+const nativeBid2 = mkBid({
   'bidderCode': 'dgads',
   'width': 0,
   'height': 0,
@@ -221,12 +231,18 @@ const nativeBid2 = {
     [CONSTANTS.NATIVE_KEYS.sponsoredBy]: 'test.com',
     [CONSTANTS.NATIVE_KEYS.clickUrl]: 'http://prebid.org/'
   }
-};
+});
 
 describe('targeting tests', function () {
   let sandbox;
   let enableSendAllBids = false;
   let useBidCache;
+  let bidCacheFilterFunction;
+  let undef;
+
+  before(() => {
+    hook.ready();
+  });
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -241,12 +257,50 @@ describe('targeting tests', function () {
       if (key === 'useBidCache') {
         return useBidCache;
       }
+      if (key === 'bidCacheFilterFunction') {
+        return bidCacheFilterFunction;
+      }
       return origGetConfig.apply(config, arguments);
     });
   });
 
   afterEach(function () {
     sandbox.restore();
+    bidCacheFilterFunction = undef;
+  });
+
+  describe('isBidNotExpired', () => {
+    let clock;
+    beforeEach(() => {
+      clock = sandbox.useFakeTimers(0);
+    });
+
+    Object.entries({
+      'bid.ttlBuffer': (bid, ttlBuffer) => {
+        bid.ttlBuffer = ttlBuffer
+      },
+      'setConfig({ttlBuffer})': (_, ttlBuffer) => {
+        config.setConfig({ttlBuffer})
+      },
+    }).forEach(([t, setup]) => {
+      describe(`respects ${t}`, () => {
+        [0, 2].forEach(ttlBuffer => {
+          it(`when ttlBuffer is ${ttlBuffer}`, () => {
+            const bid = {
+              responseTimestamp: 0,
+              ttl: 10,
+            }
+            setup(bid, ttlBuffer);
+
+            expect(filters.isBidNotExpired(bid)).to.be.true;
+            clock.tick((bid.ttl - ttlBuffer) * 1000 - 100);
+            expect(filters.isBidNotExpired(bid)).to.be.true;
+            clock.tick(101);
+            expect(filters.isBidNotExpired(bid)).to.be.false;
+          });
+        });
+      });
+    });
   });
 
   describe('getAllTargeting', function () {
@@ -280,6 +334,57 @@ describe('targeting tests', function () {
       bidExpiryStub.restore();
     });
 
+    it('should filter out NO_BID bids', () => {
+      bidsReceived = [mkBid(sampleBid, CONSTANTS.STATUS.NO_BID)];
+      const tg = targetingInstance.getAllTargeting();
+      expect(tg[bidsReceived[0].adUnitCode]).to.eql({});
+    });
+
+    describe('when handling different adunit targeting value types', function () {
+      const adUnitCode = '/123456/header-bid-tag-0';
+      const adServerTargeting = {};
+
+      let getAdUnitsStub;
+
+      before(function() {
+        getAdUnitsStub = sandbox.stub(auctionManager, 'getAdUnits').callsFake(function() {
+          return [
+            {
+              'code': adUnitCode,
+              [CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]: adServerTargeting
+            }
+          ];
+        });
+      });
+
+      after(function() {
+        getAdUnitsStub.restore();
+      });
+
+      afterEach(function() {
+        delete adServerTargeting.test_type;
+      });
+
+      const pairs = [
+        ['string', '2.3', '2.3'],
+        ['number', 2.3, '2.3'],
+        ['boolean', true, 'true'],
+        ['string-separated', '2.3, 4.5', '2.3,4.5'],
+        ['array-of-string', ['2.3', '4.5'], '2.3,4.5'],
+        ['array-of-number', [2.3, 4.5], '2.3,4.5'],
+        ['array-of-boolean', [true, false], 'true,false']
+      ];
+      pairs.forEach(([type, value, result]) => {
+        it(`accepts ${type}`, function() {
+          adServerTargeting.test_type = value;
+
+          const targeting = targetingInstance.getAllTargeting([adUnitCode]);
+
+          expect(targeting[adUnitCode].test_type).is.equal(result);
+        });
+      });
+    });
+
     describe('when hb_deal is present in bid.adserverTargeting', function () {
       let bid4;
 
@@ -338,11 +443,44 @@ describe('targeting tests', function () {
         bid4 = utils.deepClone(bid1);
         bid4.adserverTargeting['hb_bidder'] = bid4.bidder = bid4.bidderCode = 'appnexus';
         bid4.cpm = 2.25;
+        bid4.adId = '8383838';
         enableSendAllBids = true;
 
         bidsReceived.push(bid4);
       });
 
+      it('when sendBidsControl.bidLimit is set greater than 0 in getHighestCpmBidsFromBidPool', function () {
+        config.setConfig({
+          sendBidsControl: {
+            bidLimit: 2,
+            dealPrioritization: true
+          }
+        });
+
+        const bids = getHighestCpmBidsFromBidPool(bidsReceived, utils.getHighestCpm, 2);
+
+        expect(bids.length).to.equal(3);
+        expect(bids[0].adId).to.equal('8383838');
+        expect(bids[1].adId).to.equal('148018fe5e');
+        expect(bids[2].adId).to.equal('48747745');
+      });
+
+      it('when sendBidsControl.bidLimit is set greater than 0 and deal priortization is false in getHighestCpmBidsFromBidPool', function () {
+        config.setConfig({
+          sendBidsControl: {
+            bidLimit: 2,
+            dealPrioritization: false
+          }
+        });
+
+        const bids = getHighestCpmBidsFromBidPool(bidsReceived, utils.getHighestCpm, 2);
+
+        expect(bids.length).to.equal(3);
+        expect(bids[0].adId).to.equal('8383838');
+        expect(bids[1].adId).to.equal('148018fe5e');
+        expect(bids[2].adId).to.equal('48747745');
+      });
+
       it('selects the top n number of bids when enableSendAllBids is true and and bitLimit is set', function () {
         config.setConfig({
           sendBidsControl: {
@@ -369,7 +507,7 @@ describe('targeting tests', function () {
         expect(limitedBids.length).to.equal(2);
       });
 
-      it('Sends all bids when enableSendAllBids is true and and bitLimit is set to 0', function () {
+      it('Sends all bids when enableSendAllBids is true and and bidLimit is set to 0', function () {
         config.setConfig({
           sendBidsControl: {
             bidLimit: 0
@@ -383,6 +521,206 @@ describe('targeting tests', function () {
       });
     });
 
+    describe('targetingControls.allowZeroCpmBids', function () {
+      let bid4;
+      let bidderSettingsStorage;
+
+      before(function() {
+        bidderSettingsStorage = $$PREBID_GLOBAL$$.bidderSettings;
+      });
+
+      beforeEach(function () {
+        bid4 = utils.deepClone(bid1);
+        bid4.adserverTargeting = {
+          hb_pb: '0.0',
+          hb_adid: '567891011',
+          hb_bidder: 'appnexus',
+        };
+        bid4.bidder = bid4.bidderCode = 'appnexus';
+        bid4.cpm = 0;
+        bidsReceived = [bid4];
+      });
+
+      after(function() {
+        bidsReceived = [bid1, bid2, bid3];
+        $$PREBID_GLOBAL$$.bidderSettings = bidderSettingsStorage;
+      })
+
+      it('targeting should not include a 0 cpm by default', function() {
+        bid4.adserverTargeting = {};
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.deep.equal({});
+      });
+
+      it('targeting should allow a 0 cpm with targetingControls.allowZeroCpmBids set to true', function () {
+        $$PREBID_GLOBAL$$.bidderSettings = {
+          standard: {
+            allowZeroCpmBids: true
+          }
+        };
+
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_pb', 'hb_bidder', 'hb_adid', 'hb_bidder_appnexus', 'hb_adid_appnexus', 'hb_pb_appnexus');
+        expect(targeting['/123456/header-bid-tag-0']['hb_pb']).to.equal('0.0')
+      });
+    });
+
+    describe('targetingControls.allowTargetingKeys', function () {
+      let bid4;
+
+      beforeEach(function() {
+        bid4 = utils.deepClone(bid1);
+        bid4.adserverTargeting = {
+          hb_deal: '4321',
+          hb_pb: '0.1',
+          hb_adid: '567891011',
+          hb_bidder: 'appnexus',
+        };
+        bid4.bidder = bid4.bidderCode = 'appnexus';
+        bid4.cpm = 0.1; // losing bid so not included if enableSendAllBids === false
+        bid4.dealId = '4321';
+        enableSendAllBids = true;
+        config.setConfig({
+          targetingControls: {
+            allowTargetingKeys: ['BIDDER', 'AD_ID', 'PRICE_BUCKET']
+          }
+        });
+        bidsReceived.push(bid4);
+      });
+
+      it('targeting should include custom keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('foobar');
+      });
+
+      it('targeting should include keys prefixed by allowed default targeting keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_bidder_rubicon', 'hb_adid_rubicon', 'hb_pb_rubicon');
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_bidder_appnexus', 'hb_adid_appnexus', 'hb_pb_appnexus');
+      });
+
+      it('targeting should not include keys prefixed by disallowed default targeting keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.not.have.all.keys(['hb_deal_appnexus', 'hb_deal_rubicon']);
+      });
+    });
+
+    describe('targetingControls.addTargetingKeys', function () {
+      let winningBid = null;
+
+      beforeEach(function () {
+        bidsReceived = [bid1, bid2, nativeBid1, nativeBid2].map(deepClone);
+        bidsReceived.forEach((bid) => {
+          bid.adserverTargeting[CONSTANTS.TARGETING_KEYS.SOURCE] = 'test-source';
+          bid.adUnitCode = 'adunit';
+          if (winningBid == null || bid.cpm > winningBid.cpm) {
+            winningBid = bid;
+          }
+        });
+        enableSendAllBids = true;
+      });
+
+      const expandKey = function (key) {
+        const keys = new Set();
+        if (winningBid.adserverTargeting[key] != null) {
+          keys.add(key);
+        }
+        bidsReceived
+          .filter((bid) => bid.adserverTargeting[key] != null)
+          .map((bid) => bid.bidderCode)
+          .forEach((code) => keys.add(`${key}_${code}`.substr(0, 20)));
+        return new Array(...keys);
+      }
+
+      const targetingResult = function () {
+        return targetingInstance.getAllTargeting(['adunit'])['adunit'];
+      }
+
+      it('should include added keys', function () {
+        config.setConfig({
+          targetingControls: {
+            addTargetingKeys: ['SOURCE']
+          }
+        });
+        expect(targetingResult()).to.include.all.keys(...expandKey(CONSTANTS.TARGETING_KEYS.SOURCE));
+      });
+
+      it('should keep default and native keys', function() {
+        config.setConfig({
+          targetingControls: {
+            addTargetingKeys: ['SOURCE']
+          }
+        });
+        const defaultKeys = new Set(Object.values(CONSTANTS.DEFAULT_TARGETING_KEYS));
+        if (FEATURES.NATIVE) {
+          Object.values(CONSTANTS.NATIVE_KEYS).forEach((k) => defaultKeys.add(k));
+        }
+
+        const expectedKeys = new Set();
+        bidsReceived
+          .map((bid) => Object.keys(bid.adserverTargeting))
+          .reduce((left, right) => left.concat(right), [])
+          .filter((key) => defaultKeys.has(key))
+          .map(expandKey)
+          .reduce((left, right) => left.concat(right), [])
+          .forEach((k) => expectedKeys.add(k));
+        expect(targetingResult()).to.include.all.keys(...expectedKeys);
+      });
+
+      it('should not be allowed together with allowTargetingKeys', function () {
+        config.setConfig({
+          targetingControls: {
+            allowTargetingKeys: [CONSTANTS.TARGETING_KEYS.BIDDER],
+            addTargetingKeys: [CONSTANTS.TARGETING_KEYS.SOURCE]
+          }
+        });
+        expect(targetingResult).to.throw();
+      });
+    });
+
+    describe('targetingControls.allowSendAllBidsTargetingKeys', function () {
+      let bid4;
+
+      beforeEach(function() {
+        bid4 = utils.deepClone(bid1);
+        bid4.adserverTargeting = {
+          hb_deal: '4321',
+          hb_pb: '0.1',
+          hb_adid: '567891011',
+          hb_bidder: 'appnexus',
+        };
+        bid4.bidder = bid4.bidderCode = 'appnexus';
+        bid4.cpm = 0.1; // losing bid so not included if enableSendAllBids === false
+        bid4.dealId = '4321';
+        enableSendAllBids = true;
+        config.setConfig({
+          targetingControls: {
+            allowTargetingKeys: ['BIDDER', 'AD_ID', 'PRICE_BUCKET'],
+            allowSendAllBidsTargetingKeys: ['PRICE_BUCKET', 'AD_ID']
+          }
+        });
+        bidsReceived.push(bid4);
+      });
+
+      it('targeting should include custom keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('foobar');
+      });
+
+      it('targeting should only include keys prefixed by allowed default send all bids targeting keys and standard keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_bidder', 'hb_adid', 'hb_pb');
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_adid_rubicon', 'hb_pb_rubicon');
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_bidder', 'hb_adid', 'hb_pb', 'hb_adid_appnexus', 'hb_pb_appnexus');
+      });
+
+      it('targeting should not include keys prefixed by disallowed default targeting keys and disallowed send all bid targeting keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.not.have.all.keys(['hb_deal', 'hb_bidder_rubicon', 'hb_bidder_appnexus', 'hb_deal_appnexus', 'hb_deal_rubicon']);
+      });
+    });
+
     describe('targetingControls.alwaysIncludeDeals', function () {
       let bid4;
 
@@ -519,26 +857,28 @@ describe('targeting tests', function () {
       expect(targeting['/123456/header-bid-tag-0'][CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + '_rubicon']).to.deep.equal(targeting['/123456/header-bid-tag-0'][CONSTANTS.TARGETING_KEYS.PRICE_BUCKET]);
     });
 
-    it('ensures keys are properly generated when enableSendAllBids is true and multiple bidders use native', function() {
-      const nativeAdUnitCode = '/19968336/prebid_native_example_1';
-      enableSendAllBids = true;
+    if (FEATURES.NATIVE) {
+      it('ensures keys are properly generated when enableSendAllBids is true and multiple bidders use native', function () {
+        const nativeAdUnitCode = '/19968336/prebid_native_example_1';
+        enableSendAllBids = true;
 
-      // update mocks for this test to return native bids
-      amBidsReceivedStub.callsFake(function() {
-        return [nativeBid1, nativeBid2];
-      });
-      amGetAdUnitsStub.callsFake(function() {
-        return [nativeAdUnitCode];
-      });
+        // update mocks for this test to return native bids
+        amBidsReceivedStub.callsFake(function () {
+          return [nativeBid1, nativeBid2];
+        });
+        amGetAdUnitsStub.callsFake(function () {
+          return [nativeAdUnitCode];
+        });
 
-      let targeting = targetingInstance.getAllTargeting([nativeAdUnitCode]);
-      expect(targeting[nativeAdUnitCode].hb_native_image).to.equal(nativeBid1.native.image.url);
-      expect(targeting[nativeAdUnitCode].hb_native_linkurl).to.equal(nativeBid1.native.clickUrl);
-      expect(targeting[nativeAdUnitCode].hb_native_title).to.equal(nativeBid1.native.title);
-      expect(targeting[nativeAdUnitCode].hb_native_image_dgad).to.exist.and.to.equal(nativeBid2.native.image.url);
-      expect(targeting[nativeAdUnitCode].hb_pb_dgads).to.exist.and.to.equal(nativeBid2.pbMg);
-      expect(targeting[nativeAdUnitCode].hb_native_body_appne).to.exist.and.to.equal(nativeBid1.native.body);
-    });
+        let targeting = targetingInstance.getAllTargeting([nativeAdUnitCode]);
+        expect(targeting[nativeAdUnitCode].hb_native_image).to.equal(nativeBid1.native.image.url);
+        expect(targeting[nativeAdUnitCode].hb_native_linkurl).to.equal(nativeBid1.native.clickUrl);
+        expect(targeting[nativeAdUnitCode].hb_native_title).to.equal(nativeBid1.native.title);
+        expect(targeting[nativeAdUnitCode].hb_native_image_dgad).to.exist.and.to.equal(nativeBid2.native.image.url);
+        expect(targeting[nativeAdUnitCode].hb_pb_dgads).to.exist.and.to.equal(nativeBid2.pbMg);
+        expect(targeting[nativeAdUnitCode].hb_native_body_appne).to.exist.and.to.equal(nativeBid1.native.body);
+      });
+    }
 
     it('does not include adpod type bids in the getBidsReceived results', function () {
       let adpodBid = utils.deepClone(bid1);
@@ -624,6 +964,93 @@ describe('targeting tests', function () {
         expect(bids[0].adId).to.equal('adid-2');
       });
 
+      it('should use bidCacheFilterFunction', function() {
+        auctionManagerStub.returns([
+          createBidReceived({bidder: 'appnexus', cpm: 7, auctionId: 1, responseTimestamp: 100, adUnitCode: 'code-0', adId: 'adid-1', mediaType: 'banner'}),
+          createBidReceived({bidder: 'appnexus', cpm: 5, auctionId: 2, responseTimestamp: 102, adUnitCode: 'code-0', adId: 'adid-2', mediaType: 'banner'}),
+          createBidReceived({bidder: 'appnexus', cpm: 6, auctionId: 1, responseTimestamp: 101, adUnitCode: 'code-1', adId: 'adid-3', mediaType: 'banner'}),
+          createBidReceived({bidder: 'appnexus', cpm: 8, auctionId: 2, responseTimestamp: 103, adUnitCode: 'code-1', adId: 'adid-4', mediaType: 'banner'}),
+          createBidReceived({bidder: 'appnexus', cpm: 27, auctionId: 1, responseTimestamp: 100, adUnitCode: 'code-2', adId: 'adid-5', mediaType: 'video'}),
+          createBidReceived({bidder: 'appnexus', cpm: 25, auctionId: 2, responseTimestamp: 102, adUnitCode: 'code-2', adId: 'adid-6', mediaType: 'video'}),
+          createBidReceived({bidder: 'appnexus', cpm: 26, auctionId: 1, responseTimestamp: 101, adUnitCode: 'code-3', adId: 'adid-7', mediaType: 'video'}),
+          createBidReceived({bidder: 'appnexus', cpm: 28, auctionId: 2, responseTimestamp: 103, adUnitCode: 'code-3', adId: 'adid-8', mediaType: 'video'}),
+        ]);
+
+        let adUnitCodes = ['code-0', 'code-1', 'code-2', 'code-3'];
+        targetingInstance.setLatestAuctionForAdUnit('code-0', 2);
+        targetingInstance.setLatestAuctionForAdUnit('code-1', 2);
+        targetingInstance.setLatestAuctionForAdUnit('code-2', 2);
+        targetingInstance.setLatestAuctionForAdUnit('code-3', 2);
+
+        // Bid Caching On, No Filter Function
+        useBidCache = true;
+        bidCacheFilterFunction = undef;
+        let bids = targetingInstance.getWinningBids(adUnitCodes);
+
+        expect(bids.length).to.equal(4);
+        expect(bids[0].adId).to.equal('adid-1');
+        expect(bids[1].adId).to.equal('adid-4');
+        expect(bids[2].adId).to.equal('adid-5');
+        expect(bids[3].adId).to.equal('adid-8');
+
+        // Bid Caching Off, No Filter Function
+        useBidCache = false;
+        bidCacheFilterFunction = undef;
+        bids = targetingInstance.getWinningBids(adUnitCodes);
+
+        expect(bids.length).to.equal(4);
+        expect(bids[0].adId).to.equal('adid-2');
+        expect(bids[1].adId).to.equal('adid-4');
+        expect(bids[2].adId).to.equal('adid-6');
+        expect(bids[3].adId).to.equal('adid-8');
+
+        // Bid Caching On AGAIN, No Filter Function (should be same as first time)
+        useBidCache = true;
+        bidCacheFilterFunction = undef;
+        bids = targetingInstance.getWinningBids(adUnitCodes);
+
+        expect(bids.length).to.equal(4);
+        expect(bids[0].adId).to.equal('adid-1');
+        expect(bids[1].adId).to.equal('adid-4');
+        expect(bids[2].adId).to.equal('adid-5');
+        expect(bids[3].adId).to.equal('adid-8');
+
+        // Bid Caching On, with Filter Function to Exclude video
+        useBidCache = true;
+        let bcffCalled = 0;
+        bidCacheFilterFunction = bid => {
+          bcffCalled++;
+          return bid.mediaType !== 'video';
+        }
+        bids = targetingInstance.getWinningBids(adUnitCodes);
+
+        expect(bids.length).to.equal(4);
+        expect(bids[0].adId).to.equal('adid-1');
+        expect(bids[1].adId).to.equal('adid-4');
+        expect(bids[2].adId).to.equal('adid-6');
+        expect(bids[3].adId).to.equal('adid-8');
+        // filter function should have been called for each cached bid (4 times)
+        expect(bcffCalled).to.equal(4);
+
+        // Bid Caching Off, with Filter Function to Exclude video
+        // - should not use cached bids or call the filter function
+        useBidCache = false;
+        bcffCalled = 0;
+        bidCacheFilterFunction = bid => {
+          bcffCalled++;
+          return bid.mediaType !== 'video';
+        }
+        bids = targetingInstance.getWinningBids(adUnitCodes);
+
+        expect(bids.length).to.equal(4);
+        expect(bids[0].adId).to.equal('adid-2');
+        expect(bids[1].adId).to.equal('adid-4');
+        expect(bids[2].adId).to.equal('adid-6');
+        expect(bids[3].adId).to.equal('adid-8');
+        // filter function should not have been called
+        expect(bcffCalled).to.equal(0);
+      });
+
       it('should not use rendered bid to get winning bid', function () {
         let bidsReceived = [
           createBidReceived({bidder: 'appnexus', cpm: 8, auctionId: 1, responseTimestamp: 100, adUnitCode: 'code-0', adId: 'adid-1', status: 'rendered'}),
@@ -690,171 +1117,171 @@ describe('targeting tests', function () {
   describe('sortByDealAndPriceBucketOrCpm', function() {
     it('will properly sort bids when some bids have deals and some do not', function () {
       let bids = [{
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'abc',
           hb_pb: '1.00',
           hb_deal: '1234'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'def',
           hb_pb: '0.50',
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'ghi',
           hb_pb: '20.00',
           hb_deal: '4532'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'jkl',
           hb_pb: '9.00',
           hb_deal: '9864'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'mno',
           hb_pb: '50.00',
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'pqr',
           hb_pb: '100.00',
         }
       }];
       bids.sort(sortByDealAndPriceBucketOrCpm());
-      expect(bids[0].adUnitTargeting.hb_adid).to.equal('ghi');
-      expect(bids[1].adUnitTargeting.hb_adid).to.equal('jkl');
-      expect(bids[2].adUnitTargeting.hb_adid).to.equal('abc');
-      expect(bids[3].adUnitTargeting.hb_adid).to.equal('pqr');
-      expect(bids[4].adUnitTargeting.hb_adid).to.equal('mno');
-      expect(bids[5].adUnitTargeting.hb_adid).to.equal('def');
+      expect(bids[0].adserverTargeting.hb_adid).to.equal('ghi');
+      expect(bids[1].adserverTargeting.hb_adid).to.equal('jkl');
+      expect(bids[2].adserverTargeting.hb_adid).to.equal('abc');
+      expect(bids[3].adserverTargeting.hb_adid).to.equal('pqr');
+      expect(bids[4].adserverTargeting.hb_adid).to.equal('mno');
+      expect(bids[5].adserverTargeting.hb_adid).to.equal('def');
     });
 
     it('will properly sort bids when all bids have deals', function () {
       let bids = [{
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'abc',
           hb_pb: '1.00',
           hb_deal: '1234'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'def',
           hb_pb: '0.50',
           hb_deal: '4321'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'ghi',
           hb_pb: '2.50',
           hb_deal: '4532'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'jkl',
           hb_pb: '2.00',
           hb_deal: '9864'
         }
       }];
       bids.sort(sortByDealAndPriceBucketOrCpm());
-      expect(bids[0].adUnitTargeting.hb_adid).to.equal('ghi');
-      expect(bids[1].adUnitTargeting.hb_adid).to.equal('jkl');
-      expect(bids[2].adUnitTargeting.hb_adid).to.equal('abc');
-      expect(bids[3].adUnitTargeting.hb_adid).to.equal('def');
+      expect(bids[0].adserverTargeting.hb_adid).to.equal('ghi');
+      expect(bids[1].adserverTargeting.hb_adid).to.equal('jkl');
+      expect(bids[2].adserverTargeting.hb_adid).to.equal('abc');
+      expect(bids[3].adserverTargeting.hb_adid).to.equal('def');
     });
 
     it('will properly sort bids when no bids have deals', function () {
       let bids = [{
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'abc',
           hb_pb: '1.00'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'def',
           hb_pb: '0.10'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'ghi',
           hb_pb: '10.00'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'jkl',
           hb_pb: '10.01'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'mno',
           hb_pb: '1.00'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'pqr',
           hb_pb: '100.00'
         }
       }];
       bids.sort(sortByDealAndPriceBucketOrCpm());
-      expect(bids[0].adUnitTargeting.hb_adid).to.equal('pqr');
-      expect(bids[1].adUnitTargeting.hb_adid).to.equal('jkl');
-      expect(bids[2].adUnitTargeting.hb_adid).to.equal('ghi');
-      expect(bids[3].adUnitTargeting.hb_adid).to.equal('abc');
-      expect(bids[4].adUnitTargeting.hb_adid).to.equal('mno');
-      expect(bids[5].adUnitTargeting.hb_adid).to.equal('def');
+      expect(bids[0].adserverTargeting.hb_adid).to.equal('pqr');
+      expect(bids[1].adserverTargeting.hb_adid).to.equal('jkl');
+      expect(bids[2].adserverTargeting.hb_adid).to.equal('ghi');
+      expect(bids[3].adserverTargeting.hb_adid).to.equal('abc');
+      expect(bids[4].adserverTargeting.hb_adid).to.equal('mno');
+      expect(bids[5].adserverTargeting.hb_adid).to.equal('def');
     });
 
     it('will properly sort bids when some bids have deals and some do not and by cpm when flag is set to true', function () {
       let bids = [{
         cpm: 1.04,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'abc',
           hb_pb: '1.00',
           hb_deal: '1234'
         }
       }, {
         cpm: 0.50,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'def',
           hb_pb: '0.50',
           hb_deal: '4532'
         }
       }, {
         cpm: 0.53,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'ghi',
           hb_pb: '0.50',
           hb_deal: '4532'
         }
       }, {
         cpm: 9.04,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'jkl',
           hb_pb: '9.00',
           hb_deal: '9864'
         }
       }, {
         cpm: 50.00,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'mno',
           hb_pb: '50.00',
         }
       }, {
         cpm: 100.00,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'pqr',
           hb_pb: '100.00',
         }
       }];
       bids.sort(sortByDealAndPriceBucketOrCpm(true));
-      expect(bids[0].adUnitTargeting.hb_adid).to.equal('jkl');
-      expect(bids[1].adUnitTargeting.hb_adid).to.equal('abc');
-      expect(bids[2].adUnitTargeting.hb_adid).to.equal('ghi');
-      expect(bids[3].adUnitTargeting.hb_adid).to.equal('def');
-      expect(bids[4].adUnitTargeting.hb_adid).to.equal('pqr');
-      expect(bids[5].adUnitTargeting.hb_adid).to.equal('mno');
+      expect(bids[0].adserverTargeting.hb_adid).to.equal('jkl');
+      expect(bids[1].adserverTargeting.hb_adid).to.equal('abc');
+      expect(bids[2].adserverTargeting.hb_adid).to.equal('ghi');
+      expect(bids[3].adserverTargeting.hb_adid).to.equal('def');
+      expect(bids[4].adserverTargeting.hb_adid).to.equal('pqr');
+      expect(bids[5].adserverTargeting.hb_adid).to.equal('mno');
     });
   });
 
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 8a142d7a6aa..ae9ea09908a 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -15,8 +15,16 @@ import * as ajaxLib from 'src/ajax.js';
 import * as auctionModule from 'src/auction.js';
 import { registerBidder } from 'src/adapters/bidderFactory.js';
 import { _sendAdToCreative } from 'src/secureCreatives.js';
-import find from 'core-js-pure/features/array/find.js';
-
+import {find} from 'src/polyfill.js';
+import * as pbjsModule from 'src/prebid.js';
+import {hook} from '../../../src/hook.js';
+import {reset as resetDebugging} from '../../../src/debugging.js';
+import $$PREBID_GLOBAL$$ from 'src/prebid.js';
+import {resetAuctionState} from 'src/auction.js';
+import {stubAuctionIndex} from '../../helpers/indexStub.js';
+import {createBid} from '../../../src/bidfactory.js';
+import {enrichFPD} from '../../../src/fpd/enrichment.js';
+import {mockFpdEnrichments} from '../../helpers/fpd.js';
 var assert = require('chai').assert;
 var expect = require('chai').expect;
 
@@ -30,7 +38,6 @@ require('modules/appnexusBidAdapter');
 
 var config = require('test/fixtures/config.json');
 
-$$PREBID_GLOBAL$$ = $$PREBID_GLOBAL$$ || {};
 var adUnits = getAdUnits();
 var adUnitCodes = getAdUnits().map(unit => unit.code);
 var bidsBackHandler = function() {};
@@ -75,6 +82,10 @@ var Slot = function Slot(elementId, pathId) {
     clearTargeting: function clearTargeting() {
       this.targeting = {};
       return this;
+    },
+
+    updateTargetingFromMap: function updateTargetingFromMap(targetingMap) {
+      Object.keys(targetingMap).forEach(key => this.setTargeting(key, targetingMap[key]))
     }
   };
   slot.spySetTargeting = sinon.spy(slot, 'setTargeting');
@@ -94,7 +105,6 @@ var createSlotArrayScenario2 = function createSlotArrayScenario2() {
   var slot1 = new Slot(config.adUnitElementIDs[0], config.adUnitCodes[0]);
   slot1.setTargeting('pos1', '750x350');
   var slot2 = new Slot(config.adUnitElementIDs[1], config.adUnitCodes[0]);
-  slot2.setTargeting('gender', ['male', 'female']);
   return [
     slot1,
     slot2
@@ -187,18 +197,80 @@ window.apntag = {
 }
 
 describe('Unit: Prebid Module', function () {
-  let bidExpiryStub;
+  let bidExpiryStub, sandbox;
+
+  before(() => {
+    hook.ready();
+    $$PREBID_GLOBAL$$.requestBids.getHooks().remove();
+    resetDebugging();
+    sinon.stub(filters, 'isActualBid').returns(true); // stub this out so that we can use vanilla objects as bids
+  });
+
   beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    mockFpdEnrichments(sandbox);
     bidExpiryStub = sinon.stub(filters, 'isBidNotExpired').callsFake(() => true);
     configObj.setConfig({ useBidCache: true });
+    resetAuctionState();
   });
 
   afterEach(function() {
+    sandbox.restore();
     $$PREBID_GLOBAL$$.adUnits = [];
     bidExpiryStub.restore();
     configObj.setConfig({ useBidCache: false });
   });
 
+  after(function() {
+    auctionManager.clearAllAuctions();
+    filters.isActualBid.restore();
+  });
+
+  describe('and global adUnits', () => {
+    const startingAdUnits = [
+      {
+        code: 'one',
+      },
+      {
+        code: 'two',
+      }
+    ];
+    let actualAdUnits, hookRan, done;
+
+    function deferringHook(next, req) {
+      setTimeout(() => {
+        actualAdUnits = req.adUnits || $$PREBID_GLOBAL$$.adUnits;
+        done();
+      });
+    }
+
+    beforeEach(() => {
+      $$PREBID_GLOBAL$$.requestBids.before(deferringHook, 99);
+      $$PREBID_GLOBAL$$.adUnits.splice(0, $$PREBID_GLOBAL$$.adUnits.length, ...startingAdUnits);
+      hookRan = new Promise((resolve) => {
+        done = resolve;
+      });
+    });
+
+    afterEach(() => {
+      $$PREBID_GLOBAL$$.requestBids.getHooks({hook: deferringHook}).remove();
+      $$PREBID_GLOBAL$$.adUnits.splice(0, $$PREBID_GLOBAL$$.adUnits.length);
+    })
+
+    Object.entries({
+      'addAdUnits': (g) => g.addAdUnits({code: 'three'}),
+      'removeAdUnit': (g) => g.removeAdUnit('one')
+    }).forEach(([method, op]) => {
+      it(`once called, should not be affected by ${method}`, () => {
+        $$PREBID_GLOBAL$$.requestBids({});
+        op($$PREBID_GLOBAL$$);
+        return hookRan.then(() => {
+          expect(actualAdUnits).to.eql(startingAdUnits);
+        })
+      });
+    });
+  });
+
   describe('getAdserverTargetingForAdUnitCodeStr', function () {
     beforeEach(function () {
       resetAuction();
@@ -415,6 +487,7 @@ describe('Unit: Prebid Module', function () {
     let bid;
     let auction;
     let ajaxStub;
+    let indexStub;
     let cbTimeout = 3000;
     let targeting;
 
@@ -439,8 +512,8 @@ describe('Unit: Prebid Module', function () {
           'client_initiated_ad_counting': true,
           'rtb': {
             'banner': {
-              'width': 728,
-              'height': 90,
+              'width': 300,
+              'height': 250,
               'content': '<!-- Creative -->'
             },
             'trackers': [{
@@ -480,7 +553,8 @@ describe('Unit: Prebid Module', function () {
             ],
             'bidId': '4d0a6829338a07',
             'bidderRequestId': '331f3cf3f1d9c8',
-            'auctionId': '20882439e3238c'
+            'auctionId': '20882439e3238c',
+            'transactionId': 'trdiv-gpt-ad-1460505748561-0',
           }
         ],
         'auctionStart': 1505250713622,
@@ -498,6 +572,7 @@ describe('Unit: Prebid Module', function () {
       let auctionManagerInstance = newAuctionManager();
       targeting = newTargeting(auctionManagerInstance);
       let adUnits = [{
+        transactionId: 'trdiv-gpt-ad-1460505748561-0',
         code: 'div-gpt-ad-1460505748561-0',
         sizes: [[300, 250], [300, 600]],
         bids: [{
@@ -509,6 +584,8 @@ describe('Unit: Prebid Module', function () {
       }];
       let adUnitCodes = ['div-gpt-ad-1460505748561-0'];
       auction = auctionManagerInstance.createAuction({adUnits, adUnitCodes});
+      indexStub = sinon.stub(auctionManager, 'index');
+      indexStub.get(() => auctionManagerInstance.index);
       ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(function() {
         return function(url, callback) {
           const fakeResponse = sinon.stub();
@@ -520,6 +597,7 @@ describe('Unit: Prebid Module', function () {
 
     afterEach(function () {
       ajaxStub.restore();
+      indexStub.restore();
     });
 
     it('should get correct ' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + ' when using bid.cpm is between 0 to 5', function() {
@@ -559,6 +637,7 @@ describe('Unit: Prebid Module', function () {
     let cbTimeout = 3000;
     let auctionManagerInstance;
     let targeting;
+    let indexStub;
 
     const bannerResponse = {
       'version': '0.0.1',
@@ -637,6 +716,7 @@ describe('Unit: Prebid Module', function () {
       }
 
       const adUnit = {
+        transactionId: `tr${code}`,
         code: code,
         sizes: [[300, 250], [300, 600]],
         bids: [{
@@ -649,22 +729,22 @@ describe('Unit: Prebid Module', function () {
 
       let _mediaTypes = {};
       if (mediaTypes.indexOf('banner') !== -1) {
-        _mediaTypes['banner'] = {
+        Object.assign(_mediaTypes, {
           'banner': {}
-        };
+        });
       }
       if (mediaTypes.indexOf('video') !== -1) {
-        _mediaTypes['video'] = {
+        Object.assign(_mediaTypes, {
           'video': {
             context: 'instream',
             playerSize: [300, 250]
           }
-        };
+        });
       }
       if (mediaTypes.indexOf('native') !== -1) {
-        _mediaTypes['native'] = {
+        Object.assign(_mediaTypes, {
           'native': {}
-        };
+        });
       }
 
       if (Object.keys(_mediaTypes).length > 0) {
@@ -726,35 +806,41 @@ describe('Unit: Prebid Module', function () {
 
     before(function () {
       currentPriceBucket = configObj.getConfig('priceGranularity');
-      sinon.stub(adapterManager, 'makeBidRequests').callsFake(() => ([{
-        'bidderCode': 'appnexus',
-        'auctionId': '20882439e3238c',
-        'bidderRequestId': '331f3cf3f1d9c8',
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '10433394'
-            },
-            'adUnitCode': 'div-gpt-ad-1460505748561-0',
-            'sizes': [
-              [
-                300,
-                250
+      sinon.stub(adapterManager, 'makeBidRequests').callsFake(() => {
+        const br = {
+          'bidderCode': 'appnexus',
+          'auctionId': '20882439e3238c',
+          'bidderRequestId': '331f3cf3f1d9c8',
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '10433394'
+              },
+              'adUnitCode': 'div-gpt-ad-1460505748561-0',
+              'transactionId': 'trdiv-gpt-ad-1460505748561-0',
+              'sizes': [
+                [
+                  300,
+                  250
+                ],
+                [
+                  300,
+                  600
+                ]
               ],
-              [
-                300,
-                600
-              ]
-            ],
-            'bidId': '4d0a6829338a07',
-            'bidderRequestId': '331f3cf3f1d9c8',
-            'auctionId': '20882439e3238c'
-          }
-        ],
-        'auctionStart': 1505250713622,
-        'timeout': 3000
-      }]));
+              'bidId': '4d0a6829338a07',
+              'bidderRequestId': '331f3cf3f1d9c8',
+              'auctionId': '20882439e3238c'
+            }
+          ],
+          'auctionStart': 1505250713622,
+          'timeout': 3000
+        };
+        const au = auction.getAdUnits().find((au) => au.transactionId === br.bids[0].transactionId);
+        br.bids[0].mediaTypes = Object.assign({}, au.mediaTypes);
+        return [br];
+      });
     });
 
     after(function () {
@@ -762,8 +848,14 @@ describe('Unit: Prebid Module', function () {
       adapterManager.makeBidRequests.restore();
     })
 
+    beforeEach(() => {
+      indexStub = sinon.stub(auctionManager, 'index');
+      indexStub.get(() => auctionManagerInstance.index);
+    });
+
     afterEach(function () {
       ajaxStub.restore();
+      indexStub.restore();
     });
 
     it('should get correct ' + CONSTANTS.TARGETING_KEYS.PRICE_BUCKET + ' with cpm between 0 - 5', function() {
@@ -854,6 +946,9 @@ describe('Unit: Prebid Module', function () {
 
     it('should set googletag targeting keys after calling setTargetingForGPTAsync function', function () {
       var slots = createSlotArrayScenario2();
+
+      // explicitly setting some PBJS key value pairs to verify whether these are removed befor new keys are set
+
       window.googletag.pubads().setSlots(slots);
       $$PREBID_GLOBAL$$.setTargetingForGPTAsync([config.adUnitCodes[0]]);
 
@@ -861,7 +956,7 @@ describe('Unit: Prebid Module', function () {
       // googletag's targeting structure
       // googletag setTargeting will override old value if invoked with same key
 
-      const targeting = [];
+      let targeting = [];
       slots[1].getTargetingKeys().map(function (key) {
         const value = slots[1].getTargeting(key);
         targeting.push([key, value]);
@@ -879,6 +974,39 @@ describe('Unit: Prebid Module', function () {
         invokedTargeting.push([key, value]);
       });
       assert.deepEqual(targeting, invokedTargeting, 'google tag targeting options not matching');
+
+      // resetPresetTargeting: initiate a new auction with no winning bids, now old targeting should be removed
+
+      resetAuction();
+      auction.getBidsReceived = function() { return [] };
+
+      var slots = createSlotArrayScenario2();
+      window.googletag.pubads().setSlots(slots);
+
+      $$PREBID_GLOBAL$$.setTargetingForGPTAsync([config.adUnitCodes[0]]);
+
+      targeting = [];
+      slots[1].getTargetingKeys().map(function (key) {
+        const value = slots[1].getTargeting(key);
+        targeting.push([key, value]);
+      });
+
+      invokedTargetingMap = {};
+      slots[1].spySetTargeting.args.map(function (entry) {
+        invokedTargetingMap[entry[0]] = entry[1];
+      });
+
+      var invokedTargeting = [];
+
+      Object.getOwnPropertyNames(invokedTargetingMap).map(function (key) {
+        const value = Array.isArray(invokedTargetingMap[key]) ? invokedTargetingMap[key] : [invokedTargetingMap[key]]; // values are always returned as array in googletag
+        invokedTargeting.push([key, value]);
+      });
+      assert.deepEqual(targeting, invokedTargeting, 'google tag targeting options not matching');
+      targeting.forEach(function(e) {
+        // here e[0] is key and e[1] is value in array that should be [null] as we are un-setting prebid keys in resetPresetTargeting
+        assert.deepEqual(e[1], [null], 'resetPresetTargeting: the value of the key ' + e[0] + ' should be [null]');
+      });
     });
 
     it('should set googletag targeting keys to specific slot with customSlotMatching', function () {
@@ -959,12 +1087,7 @@ describe('Unit: Prebid Module', function () {
         adUnitCode: config.adUnitCodes[0],
       };
 
-      const event = {
-        source: { postMessage: sinon.stub() },
-        origin: 'origin.sf.com'
-      };
-
-      _sendAdToCreative(mockAdObject, event);
+      _sendAdToCreative(mockAdObject, sinon.stub());
 
       expect(slots[0].spyGetSlotElementId.called).to.equal(false);
       expect(slots[1].spyGetSlotElementId.called).to.equal(true);
@@ -1062,6 +1185,8 @@ describe('Unit: Prebid Module', function () {
     var adResponse = {};
     var spyLogError = null;
     var spyLogMessage = null;
+    var spyLogWarn = null;
+    var spyAddWinningBid;
     var inIframe = true;
     var triggerPixelStub;
 
@@ -1090,16 +1215,20 @@ describe('Unit: Prebid Module', function () {
             height: 0
           }
         },
-        getElementsByTagName: sinon.stub()
+        getElementsByTagName: sinon.stub(),
+        querySelector: sinon.stub()
       };
 
       elStub = {
         insertBefore: sinon.stub()
       };
       doc.getElementsByTagName.returns([elStub]);
+      doc.querySelector.returns(elStub);
 
       spyLogError = sinon.spy(utils, 'logError');
       spyLogMessage = sinon.spy(utils, 'logMessage');
+      spyLogWarn = sinon.spy(utils, 'logWarn');
+      spyAddWinningBid = sinon.spy(auctionManager, 'addWinningBid');
 
       inIframe = true;
       sinon.stub(utils, 'inIframe').callsFake(() => inIframe);
@@ -1110,13 +1239,15 @@ describe('Unit: Prebid Module', function () {
       auction.getBidsReceived = getBidResponses;
       utils.logError.restore();
       utils.logMessage.restore();
+      utils.logWarn.restore();
       utils.inIframe.restore();
       triggerPixelStub.restore();
+      spyAddWinningBid.restore();
     });
 
     it('should require doc and id params', function () {
       $$PREBID_GLOBAL$$.renderAd();
-      var error = 'Error trying to write ad Id :undefined to the page. Missing document or adId';
+      var error = 'Error trying to write ad Id :undefined to the page. Missing adId';
       assert.ok(spyLogError.calledWith(error), 'expected param error was logged');
     });
 
@@ -1197,6 +1328,14 @@ describe('Unit: Prebid Module', function () {
       assert.deepEqual($$PREBID_GLOBAL$$.getAllWinningBids()[0], adResponse);
     });
 
+    it('should replace ${CLICKTHROUGH} macro in winning bids response', function () {
+      pushBidResponseToAuction({
+        ad: "<script type='text/javascript' src='http://server.example.com/ad/ad.js?clickthrough=${CLICKTHROUGH}'></script>"
+      });
+      $$PREBID_GLOBAL$$.renderAd(doc, bidId, {clickThrough: 'https://someadserverclickurl.com'});
+      expect(adResponse).to.have.property('ad').and.to.match(/https:\/\/someadserverclickurl\.com/i);
+    });
+
     it('fires billing url if present on s2s bid', function () {
       const burl = 'http://www.example.com/burl';
       pushBidResponseToAuction({
@@ -1210,11 +1349,122 @@ describe('Unit: Prebid Module', function () {
       sinon.assert.calledOnce(triggerPixelStub);
       sinon.assert.calledWith(triggerPixelStub, burl);
     });
+
+    it('should call addWinningBid', function () {
+      pushBidResponseToAuction({
+        ad: "<script type='text/javascript' src='http://server.example.com/ad/ad.js'></script>"
+      });
+      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
+      var message = 'Calling renderAd with adId :' + bidId;
+      sinon.assert.calledWith(spyLogMessage, message);
+
+      sinon.assert.calledOnce(spyAddWinningBid);
+      sinon.assert.calledWith(spyAddWinningBid, adResponse);
+    });
+
+    it('should warn stale rendering', function () {
+      var message = 'Calling renderAd with adId :' + bidId;
+      var warning = `Ad id ${bidId} has been rendered before`;
+      var onWonEvent = sinon.stub();
+      var onStaleEvent = sinon.stub();
+
+      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
+      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.STALE_RENDER, onStaleEvent);
+
+      pushBidResponseToAuction({
+        ad: "<script type='text/javascript' src='http://server.example.com/ad/ad.js'></script>"
+      });
+
+      // First render should pass with no warning and added to winning bids
+      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
+      sinon.assert.calledWith(spyLogMessage, message);
+      sinon.assert.neverCalledWith(spyLogWarn, warning);
+
+      sinon.assert.calledOnce(spyAddWinningBid);
+      sinon.assert.calledWith(spyAddWinningBid, adResponse);
+
+      sinon.assert.calledWith(onWonEvent, adResponse);
+      sinon.assert.notCalled(onStaleEvent);
+      expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+
+      // Reset call history for spies and stubs
+      spyLogMessage.resetHistory();
+      spyLogWarn.resetHistory();
+      spyAddWinningBid.resetHistory();
+      onWonEvent.resetHistory();
+      onStaleEvent.resetHistory();
+
+      // Second render should have a warning but still added to winning bids
+      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
+      sinon.assert.calledWith(spyLogMessage, message);
+      sinon.assert.calledWith(spyLogWarn, warning);
+
+      sinon.assert.calledOnce(spyAddWinningBid);
+      sinon.assert.calledWith(spyAddWinningBid, adResponse);
+
+      sinon.assert.calledWith(onWonEvent, adResponse);
+      sinon.assert.calledWith(onStaleEvent, adResponse);
+
+      // Clean up
+      $$PREBID_GLOBAL$$.offEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
+      $$PREBID_GLOBAL$$.offEvent(CONSTANTS.EVENTS.STALE_RENDER, onStaleEvent);
+    });
+
+    it('should stop stale rendering', function () {
+      var message = 'Calling renderAd with adId :' + bidId;
+      var warning = `Ad id ${bidId} has been rendered before`;
+      var onWonEvent = sinon.stub();
+      var onStaleEvent = sinon.stub();
+
+      // Setting suppressStaleRender to true explicitly
+      configObj.setConfig({'auctionOptions': {'suppressStaleRender': true}});
+
+      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
+      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.STALE_RENDER, onStaleEvent);
+
+      pushBidResponseToAuction({
+        ad: "<script type='text/javascript' src='http://server.example.com/ad/ad.js'></script>"
+      });
+
+      // First render should pass with no warning and added to winning bids
+      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
+      sinon.assert.calledWith(spyLogMessage, message);
+      sinon.assert.neverCalledWith(spyLogWarn, warning);
+
+      sinon.assert.calledOnce(spyAddWinningBid);
+      sinon.assert.calledWith(spyAddWinningBid, adResponse);
+      expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+
+      sinon.assert.calledWith(onWonEvent, adResponse);
+      sinon.assert.notCalled(onStaleEvent);
+
+      // Reset call history for spies and stubs
+      spyLogMessage.resetHistory();
+      spyLogWarn.resetHistory();
+      spyAddWinningBid.resetHistory();
+      onWonEvent.resetHistory();
+      onStaleEvent.resetHistory();
+
+      // Second render should have a warning and do not proceed further
+      $$PREBID_GLOBAL$$.renderAd(doc, bidId);
+      sinon.assert.calledWith(spyLogMessage, message);
+      sinon.assert.calledWith(spyLogWarn, warning);
+
+      sinon.assert.notCalled(spyAddWinningBid);
+
+      sinon.assert.notCalled(onWonEvent);
+      sinon.assert.calledWith(onStaleEvent, adResponse);
+
+      // Clean up
+      $$PREBID_GLOBAL$$.offEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
+      $$PREBID_GLOBAL$$.offEvent(CONSTANTS.EVENTS.STALE_RENDER, onStaleEvent);
+      configObj.setConfig({'auctionOptions': {}});
+    });
   });
 
   describe('requestBids', function () {
     let logMessageSpy;
-    let makeRequestsStub;
+    let makeRequestsStub, createAuctionStub;
     let adUnits;
     let clock;
     before(function () {
@@ -1223,7 +1473,6 @@ describe('Unit: Prebid Module', function () {
     after(function () {
       clock.restore();
     });
-    let bidsBackHandlerStub = sinon.stub();
 
     const BIDDER_CODE = 'sampleBidder';
     let bids = [{
@@ -1260,11 +1509,12 @@ describe('Unit: Prebid Module', function () {
       'start': 1000
     }];
 
+    let spec, indexStub, auction, completeAuction;
+
     beforeEach(function () {
       logMessageSpy = sinon.spy(utils, 'logMessage');
       makeRequestsStub = sinon.stub(adapterManager, 'makeBidRequests');
       makeRequestsStub.returns(bidRequests);
-
       adUnits = [{
         code: 'adUnit-code',
         mediaTypes: {
@@ -1272,45 +1522,53 @@ describe('Unit: Prebid Module', function () {
             sizes: [[300, 250]]
           }
         },
+        transactionId: 'mock-tid',
         bids: [
           {bidder: BIDDER_CODE, params: {placementId: 'id'}},
         ]
       }];
-      let adUnitCodes = ['adUnit-code'];
-      let auction = auctionModule.newAuction({
-        adUnits,
-        adUnitCodes,
-        callback: bidsBackHandlerStub,
-        cbTimeout: 2000
-      });
-      let createAuctionStub = sinon.stub(auctionModule, 'newAuction');
-      createAuctionStub.returns(auction);
-    });
-
-    afterEach(function () {
-      clock.restore();
-      adapterManager.makeBidRequests.restore();
-      auctionModule.newAuction.restore();
-      utils.logMessage.restore();
-    });
-
-    it('should execute callback after timeout', function () {
-      let spec = {
+      indexStub = sinon.stub(auctionManager, 'index');
+      indexStub.get(() => stubAuctionIndex({adUnits, bidRequests}))
+      sinon.stub(adapterManager, 'callBids').callsFake((_, bidrequests, addBidResponse, adapterDone) => {
+        completeAuction = (bidsReceived) => {
+          bidsReceived.forEach((bid) => addBidResponse(bid.adUnitCode, Object.assign(createBid(), bid)));
+          bidRequests.forEach((req) => adapterDone.call(req));
+        }
+      })
+      const origNewAuction = auctionModule.newAuction;
+      sinon.stub(auctionModule, 'newAuction').callsFake(function (opts) {
+        auction = origNewAuction(opts);
+        return auction;
+      })
+      spec = {
         code: BIDDER_CODE,
         isBidRequestValid: sinon.stub(),
         buildRequests: sinon.stub(),
         interpretResponse: sinon.stub(),
         getUserSyncs: sinon.stub(),
-        onTimeout: sinon.stub()
+        onTimeout: sinon.stub(),
+        onSetTargeting: sinon.stub(),
       };
 
       registerBidder(spec);
       spec.buildRequests.returns([{'id': 123, 'method': 'POST'}]);
       spec.isBidRequestValid.returns(true);
       spec.interpretResponse.returns(bids);
+    });
+
+    afterEach(function () {
+      clock.restore();
+      adapterManager.makeBidRequests.restore();
+      adapterManager.callBids.restore();
+      indexStub.restore();
+      auction.getBidsReceived = () => [];
+      auctionModule.newAuction.restore();
+      utils.logMessage.restore();
+    });
 
+    it('should execute callback after timeout', function () {
       let requestObj = {
-        bidsBackHandler: null, // does not need to be defined because of newAuction mock in beforeEach
+        bidsBackHandler: sinon.stub(),
         timeout: 2000,
         adUnits: adUnits
       };
@@ -1323,26 +1581,13 @@ describe('Unit: Prebid Module', function () {
       clock.tick(1);
       assert.ok(logMessageSpy.calledWith(sinon.match(re)), 'executeCallback called');
 
-      expect(bidsBackHandlerStub.getCall(0).args[1]).to.equal(true,
+      expect(requestObj.bidsBackHandler.getCall(0).args[1]).to.equal(true,
         'bidsBackHandler should be called with timedOut=true');
 
       sinon.assert.called(spec.onTimeout);
     });
 
-    it('should execute callback after setTargeting', function () {
-      let spec = {
-        code: BIDDER_CODE,
-        isBidRequestValid: sinon.stub(),
-        buildRequests: sinon.stub(),
-        interpretResponse: sinon.stub(),
-        onSetTargeting: sinon.stub()
-      };
-
-      registerBidder(spec);
-      spec.buildRequests.returns([{'id': 123, 'method': 'POST'}]);
-      spec.isBidRequestValid.returns(true);
-      spec.interpretResponse.returns(bids);
-
+    it('should execute `onSetTargeting` after setTargetingForGPTAsync', function () {
       const bidId = 1;
       const auctionId = 1;
       let adResponse = Object.assign({
@@ -1351,6 +1596,7 @@ describe('Unit: Prebid Module', function () {
         width: 300,
         height: 250,
         adUnitCode: bidRequests[0].bids[0].adUnitCode,
+        transactionId: 'mock-tid',
         adserverTargeting: {
           'hb_bidder': BIDDER_CODE,
           'hb_adid': bidId,
@@ -1359,20 +1605,102 @@ describe('Unit: Prebid Module', function () {
         },
         bidder: bids[0].bidderCode,
       }, bids[0]);
-      auction.getBidsReceived = function() { return [adResponse]; }
-      auction.getAuctionId = () => auctionId;
 
       let requestObj = {
-        bidsBackHandler: null, // does not need to be defined because of newAuction mock in beforeEach
+        bidsBackHandler: null,
         timeout: 2000,
         adUnits: adUnits
       };
 
       $$PREBID_GLOBAL$$.requestBids(requestObj);
+      completeAuction([adResponse]);
       $$PREBID_GLOBAL$$.setTargetingForGPTAsync();
 
       sinon.assert.called(spec.onSetTargeting);
     });
+
+    describe('returns a promise that resolves', () => {
+      function delayHook(next, ...args) {
+        setTimeout(() => next(...args))
+      }
+
+      beforeEach(() => {
+        // make sure the return value works correctly when hooks give up priority
+        $$PREBID_GLOBAL$$.requestBids.before(delayHook)
+      });
+
+      afterEach(() => {
+        $$PREBID_GLOBAL$$.requestBids.getHooks({hook: delayHook}).remove();
+      });
+
+      Object.entries({
+        'immediately, without bidsBackHandler': (req) => $$PREBID_GLOBAL$$.requestBids(req),
+        'after bidsBackHandler': (() => {
+          const bidsBackHandler = sinon.stub();
+          return function (req) {
+            return $$PREBID_GLOBAL$$.requestBids({...req, bidsBackHandler}).then(({bids, timedOut, auctionId}) => {
+              sinon.assert.calledWith(bidsBackHandler, bids, timedOut, auctionId);
+              return {bids, timedOut, auctionId};
+            })
+          }
+        })(),
+        'after a bidsBackHandler that throws': (req) => $$PREBID_GLOBAL$$.requestBids({...req, bidsBackHandler: () => { throw new Error() }})
+      }).forEach(([t, requestBids]) => {
+        describe(t, () => {
+          it('with no args, when no adUnits are defined', () => {
+            return requestBids({}).then((res) => {
+              expect(res).to.eql({
+                bids: undefined,
+                timedOut: undefined,
+                auctionId: undefined
+              });
+            });
+          });
+
+          it('on timeout', (done) => {
+            requestBids({
+              auctionId: 'mock-auctionId',
+              adUnits,
+              timeout: 10
+            }).then(({timedOut, bids, auctionId}) => {
+              expect(timedOut).to.be.true;
+              expect(bids).to.eql({});
+              expect(auctionId).to.eql('mock-auctionId');
+              done();
+            });
+            clock.tick(12);
+          });
+
+          it('with auction result', (done) => {
+            const bid = {
+              bidder: 'mock-bidder',
+              adUnitCode: adUnits[0].code,
+              transactionId: adUnits[0].transactionId
+            }
+            requestBids({
+              adUnits,
+            }).then(({bids}) => {
+              sinon.assert.match(bids[bid.adUnitCode].bids[0], bid)
+              done();
+            });
+            // `completeAuction` won't work until we're out of `delayHook`
+            // and the mocked auction has been set up;
+            // setTimeout here takes us after the setTimeout in `delayHook`
+            setTimeout(() => completeAuction([bid]));
+          })
+        })
+      })
+    })
+
+    it('should transfer ttlBuffer to adUnit.ttlBuffer', () => {
+      $$PREBID_GLOBAL$$.requestBids({
+        ttlBuffer: 123,
+        adUnits: [adUnits[0], {...adUnits[0], ttlBuffer: 0}]
+      });
+      sinon.assert.calledWithMatch(auctionModule.newAuction, {
+        adUnits: sinon.match((units) => units[0].ttlBuffer === 123 && units[1].ttlBuffer === 0)
+      })
+    });
   })
 
   describe('requestBids', function () {
@@ -1408,8 +1736,158 @@ describe('Unit: Prebid Module', function () {
         assert.ok(spyExecuteCallback.calledOnce, 'callback executed when bidRequests is empty');
       });
     });
+
+    describe('starts auction', () => {
+      let startAuctionStub;
+      function saHook(fn, ...args) {
+        return startAuctionStub(...args);
+      }
+      beforeEach(() => {
+        startAuctionStub = sinon.stub();
+        pbjsModule.startAuction.before(saHook);
+        configObj.resetConfig();
+      });
+      afterEach(() => {
+        pbjsModule.startAuction.getHooks({hook: saHook}).remove();
+      })
+      after(() => {
+        configObj.resetConfig();
+      });
+
+      describe('with FPD', () => {
+        let globalFPD, auctionFPD, mergedFPD;
+        beforeEach(() => {
+          globalFPD = {
+            'k1': 'v1',
+            'k2': {
+              'k3': 'v3',
+              'k4': 'v4'
+            }
+          };
+          auctionFPD = {
+            'k5': 'v5',
+            'k2': {
+              'k3': 'override',
+              'k7': 'v7'
+            }
+          };
+          mergedFPD = {
+            'k1': 'v1',
+            'k5': 'v5',
+            'k2': {
+              'k3': 'override',
+              'k4': 'v4',
+              'k7': 'v7'
+            }
+          };
+        });
+
+        it('merged from setConfig and requestBids', () => {
+          configObj.setConfig({ortb2: globalFPD});
+          $$PREBID_GLOBAL$$.requestBids({ortb2: auctionFPD});
+          sinon.assert.calledWith(startAuctionStub, sinon.match({
+            ortb2Fragments: {global: mergedFPD}
+          }));
+        });
+
+        it('enriched through enrichFPD', () => {
+          function enrich(next, fpd) {
+            next.bail(fpd.then(ortb2 => {
+              ortb2.enrich = true;
+              return ortb2;
+            }))
+          }
+          enrichFPD.before(enrich);
+          try {
+            configObj.setConfig({ortb2: globalFPD});
+            $$PREBID_GLOBAL$$.requestBids({ortb2: auctionFPD});
+            sinon.assert.calledWith(startAuctionStub, sinon.match({
+              ortb2Fragments: {global: {...mergedFPD, enrich: true}}
+            }));
+          } finally {
+            enrichFPD.getHooks({hook: enrich}).remove();
+          }
+        })
+      });
+
+      it('filtering adUnits by adUnitCodes', () => {
+        $$PREBID_GLOBAL$$.requestBids({
+          adUnits: [{code: 'one'}, {code: 'two'}],
+          adUnitCodes: 'two'
+        });
+        sinon.assert.calledWith(startAuctionStub, sinon.match({
+          adUnits: [{code: 'two'}]
+        }));
+      });
+
+      it('passing bidder-specific FPD as ortb2Fragments.bidder', () => {
+        configObj.setBidderConfig({
+          bidders: ['bidderA', 'bidderC'],
+          config: {
+            ortb2: {
+              k1: 'v1'
+            }
+          }
+        });
+        configObj.setBidderConfig({
+          bidders: ['bidderB'],
+          config: {
+            ortb2: {
+              k2: 'v2'
+            }
+          }
+        });
+        $$PREBID_GLOBAL$$.requestBids({});
+        sinon.assert.calledWith(startAuctionStub, sinon.match({
+          ortb2Fragments: {
+            bidder: {
+              bidderA: {
+                k1: 'v1'
+              },
+              bidderB: {
+                k2: 'v2'
+              },
+              bidderC: {
+                k1: 'v1'
+              }
+            }
+          }
+        }));
+      });
+    });
   });
 
+  describe('startAuction', () => {
+    let sandbox, newAuctionStub;
+    beforeEach(() => {
+      sandbox = sinon.createSandbox();
+      newAuctionStub = sandbox.stub(auctionManager, 'createAuction').callsFake(() => ({
+        getAuctionId: () => 'mockAuctionId',
+        callBids: sinon.stub()
+      }));
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('passes ortb2 fragments to createAuction', () => {
+      const ortb2Fragments = {};
+      pbjsModule.startAuction({
+        adUnits: [{
+          code: 'au',
+          mediaTypes: {banner: {sizes: [[300, 250]]}},
+          bids: [{bidder: 'bd'}]
+        }],
+        adUnitCodes: ['au'],
+        ortb2Fragments
+      });
+      sinon.assert.calledWith(newAuctionStub, sinon.match({
+        ortb2Fragments: sinon.match.same(ortb2Fragments)
+      }));
+    });
+  })
+
   describe('requestBids', function () {
     var adUnitsBackup;
     var auctionManagerStub;
@@ -1430,6 +1908,7 @@ describe('Unit: Prebid Module', function () {
       let auctionArgs;
 
       beforeEach(function () {
+        auctionArgs = null;
         adUnitsBackup = auction.getAdUnits
         auctionManagerStub = sinon.stub(auctionManager, 'createAuction').callsFake(function() {
           auctionArgs = arguments[0];
@@ -1482,6 +1961,73 @@ describe('Unit: Prebid Module', function () {
           .and.to.match(/[a-f0-9\-]{36}/i);
       });
 
+      describe('transactionId', () => {
+        let adUnit;
+        beforeEach(() => {
+          adUnit = {
+            code: 'adUnit',
+            mediaTypes: {
+              banner: {
+                sizes: [300, 250]
+              }
+            },
+            bids: [
+              {
+                bidder: 'mock-bidder',
+              }
+            ]
+          };
+        });
+        it('should be set to ortb2Imp.ext.tid, if specified', () => {
+          $$PREBID_GLOBAL$$.requestBids({
+            adUnits: [
+              {...adUnit, ortb2Imp: {ext: {tid: 'custom-tid'}}}
+            ]
+          });
+          sinon.assert.match(auctionArgs.adUnits[0], {
+            transactionId: 'custom-tid',
+            ortb2Imp: {
+              ext: {
+                tid: 'custom-tid'
+              }
+            }
+          })
+        });
+        it('should be copied to ortb2Imp.ext.tid, if not specified', () => {
+          $$PREBID_GLOBAL$$.requestBids({
+            adUnits: [
+              adUnit
+            ]
+          });
+          const tid = auctionArgs.adUnits[0].transactionId;
+          expect(tid).to.exist;
+          expect(auctionArgs.adUnits[0].ortb2Imp.ext.tid).to.eql(tid);
+        });
+      });
+
+      it('should always set ortb2.ext.tid same as transactionId in adUnits', function () {
+        $$PREBID_GLOBAL$$.requestBids({
+          adUnits: [
+            {
+              code: 'test1',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: []
+            }, {
+              code: 'test2',
+              mediaTypes: { banner: { sizes: [] } },
+              bids: []
+            }
+          ]
+        });
+
+        expect(auctionArgs.adUnits[0]).to.have.property('transactionId');
+        expect(auctionArgs.adUnits[0]).to.have.property('ortb2Imp');
+        expect(auctionArgs.adUnits[0].transactionId).to.equal(auctionArgs.adUnits[0].ortb2Imp.ext.tid);
+        expect(auctionArgs.adUnits[1]).to.have.property('transactionId');
+        expect(auctionArgs.adUnits[1]).to.have.property('ortb2Imp');
+        expect(auctionArgs.adUnits[1].transactionId).to.equal(auctionArgs.adUnits[1].ortb2Imp.ext.tid);
+      });
+
       it('should notify targeting of the latest auction for each adUnit', function () {
         let latestStub = sinon.stub(targeting, 'setLatestAuctionForAdUnit');
         let getAuctionStub = sinon.stub(auction, 'getAuctionId').returns(2);
@@ -1654,6 +2200,70 @@ describe('Unit: Prebid Module', function () {
             expect(auctionArgs.adUnits[0].sizes).to.deep.equal([[300, 250]]);
             expect(auctionArgs.adUnits[0].mediaTypes.banner.sizes).to.deep.equal([[300, 250]]);
           });
+
+          it('should filter mediaType pos value if not integer', function () {
+            let adUnit = [{
+              code: 'test5',
+              bids: [],
+              sizes: [300, 250],
+              mediaTypes: {
+                banner: {
+                  sizes: [300, 250],
+                  pos: 'foo'
+                }
+              }
+            }];
+            $$PREBID_GLOBAL$$.requestBids({
+              adUnits: adUnit
+            });
+            expect(auctionArgs.adUnits[0].mediaTypes.banner.pos).to.be.undefined;
+          });
+
+          it('should pass mediaType pos value if integer', function () {
+            let adUnit = [{
+              code: 'test5',
+              bids: [],
+              sizes: [300, 250],
+              mediaTypes: {
+                banner: {
+                  sizes: [300, 250],
+                  pos: 2
+                }
+              }
+            },
+            {
+              code: 'test6',
+              bids: [],
+              sizes: [300, 250],
+              mediaTypes: {
+                banner: {
+                  sizes: [300, 250],
+                  pos: 0
+                }
+              }
+            }];
+            $$PREBID_GLOBAL$$.requestBids({
+              adUnits: adUnit
+            });
+            expect(auctionArgs.adUnits[0].mediaTypes.banner.pos).to.equal(2);
+            expect(auctionArgs.adUnits[1].mediaTypes.banner.pos).to.equal(0);
+          });
+
+          it(`should allow no bids if 'ortb2Imp' is specified`, () => {
+            const adUnit = {
+              code: 'test',
+              mediaTypes: {
+                banner: {
+                  sizes: [[300, 250]]
+                }
+              },
+              ortb2Imp: {}
+            };
+            $$PREBID_GLOBAL$$.requestBids({
+              adUnits: [adUnit]
+            });
+            sinon.assert.match(auctionArgs.adUnits[0], adUnit);
+          });
         });
 
         describe('negative tests for validating adUnits', function() {
@@ -1711,67 +2321,96 @@ describe('Unit: Prebid Module', function () {
             expect(auctionArgs.adUnits[0].mediaTypes.video).to.exist;
             assert.ok(logErrorSpy.calledWith('Detected incorrect configuration of mediaTypes.video.playerSize.  Please specify only one set of dimensions in a format like: [[640, 480]]. Removing invalid mediaTypes.video.playerSize property from request.'));
 
-            let badNativeImgSize = [{
-              code: 'testb4',
-              bids: [],
-              mediaTypes: {
-                native: {
-                  image: {
-                    sizes: '300x250'
+            if (FEATURES.NATIVE) {
+              let badNativeImgSize = [{
+                code: 'testb4',
+                bids: [],
+                mediaTypes: {
+                  native: {
+                    image: {
+                      sizes: '300x250'
+                    }
                   }
                 }
-              }
-            }];
-            $$PREBID_GLOBAL$$.requestBids({
-              adUnits: badNativeImgSize
-            });
-            expect(auctionArgs.adUnits[0].mediaTypes.native.image.sizes).to.be.undefined;
-            expect(auctionArgs.adUnits[0].mediaTypes.native.image).to.exist;
-            assert.ok(logErrorSpy.calledWith('Please use an array of sizes for native.image.sizes field.  Removing invalid mediaTypes.native.image.sizes property from request.'));
-
-            let badNativeImgAspRat = [{
-              code: 'testb5',
-              bids: [],
-              mediaTypes: {
-                native: {
-                  image: {
-                    aspect_ratios: '300x250'
+              }];
+              $$PREBID_GLOBAL$$.requestBids({
+                adUnits: badNativeImgSize
+              });
+              expect(auctionArgs.adUnits[0].mediaTypes.native.image.sizes).to.be.undefined;
+              expect(auctionArgs.adUnits[0].mediaTypes.native.image).to.exist;
+              assert.ok(logErrorSpy.calledWith('Please use an array of sizes for native.image.sizes field.  Removing invalid mediaTypes.native.image.sizes property from request.'));
+
+              let badNativeImgAspRat = [{
+                code: 'testb5',
+                bids: [],
+                mediaTypes: {
+                  native: {
+                    image: {
+                      aspect_ratios: '300x250'
+                    }
                   }
                 }
-              }
-            }];
-            $$PREBID_GLOBAL$$.requestBids({
-              adUnits: badNativeImgAspRat
-            });
-            expect(auctionArgs.adUnits[0].mediaTypes.native.image.aspect_ratios).to.be.undefined;
-            expect(auctionArgs.adUnits[0].mediaTypes.native.image).to.exist;
-            assert.ok(logErrorSpy.calledWith('Please use an array of sizes for native.image.aspect_ratios field.  Removing invalid mediaTypes.native.image.aspect_ratios property from request.'));
+              }];
+              $$PREBID_GLOBAL$$.requestBids({
+                adUnits: badNativeImgAspRat
+              });
+              expect(auctionArgs.adUnits[0].mediaTypes.native.image.aspect_ratios).to.be.undefined;
+              expect(auctionArgs.adUnits[0].mediaTypes.native.image).to.exist;
+              assert.ok(logErrorSpy.calledWith('Please use an array of sizes for native.image.aspect_ratios field.  Removing invalid mediaTypes.native.image.aspect_ratios property from request.'));
+
+              let badNativeIcon = [{
+                code: 'testb6',
+                bids: [],
+                mediaTypes: {
+                  native: {
+                    icon: {
+                      sizes: '300x250'
+                    }
+                  }
+                }
+              }];
+              $$PREBID_GLOBAL$$.requestBids({
+                adUnits: badNativeIcon
+              });
+              expect(auctionArgs.adUnits[0].mediaTypes.native.icon.sizes).to.be.undefined;
+              expect(auctionArgs.adUnits[0].mediaTypes.native.icon).to.exist;
+              assert.ok(logErrorSpy.calledWith('Please use an array of sizes for native.icon.sizes field.  Removing invalid mediaTypes.native.icon.sizes property from request.'));
+            }
+          });
 
-            let badNativeIcon = [{
-              code: 'testb6',
-              bids: [],
+          it('should throw error message and remove adUnit if adUnit.bids is not defined correctly', function () {
+            const adUnits = [{
+              code: 'ad-unit-1',
               mediaTypes: {
-                native: {
-                  icon: {
-                    sizes: '300x250'
-                  }
+                banner: {
+                  sizes: [300, 400]
+                }
+              },
+              bids: [{code: 'appnexus', params: 1234}]
+            }, {
+              code: 'bad-ad-unit-2',
+              mediaTypes: {
+                banner: {
+                  sizes: [300, 400]
                 }
               }
             }];
+
             $$PREBID_GLOBAL$$.requestBids({
-              adUnits: badNativeIcon
+              adUnits: adUnits
             });
-            expect(auctionArgs.adUnits[0].mediaTypes.native.icon.sizes).to.be.undefined;
-            expect(auctionArgs.adUnits[0].mediaTypes.native.icon).to.exist;
-            assert.ok(logErrorSpy.calledWith('Please use an array of sizes for native.icon.sizes field.  Removing invalid mediaTypes.native.icon.sizes property from request.'));
+            expect(auctionArgs.adUnits.length).to.equal(1);
+            expect(auctionArgs.adUnits[1]).to.not.exist;
+            assert.ok(logErrorSpy.calledWith("adUnit.code 'bad-ad-unit-2' has no 'adUnit.bids' and no 'adUnit.ortb2Imp'. Removing adUnit from auction"));
           });
         });
       });
     });
 
     describe('multiformat requests', function () {
-      let spyCallBids;
-      let createAuctionStub;
+      if (!FEATURES.NATIVE) {
+        return;
+      }
       let adUnits;
 
       beforeEach(function () {
@@ -1791,14 +2430,10 @@ describe('Unit: Prebid Module', function () {
         }];
         adUnitCodes = ['adUnit-code'];
         configObj.setConfig({maxRequestsPerOrigin: Number.MAX_SAFE_INTEGER || 99999999});
-        let auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: timeout});
-        spyCallBids = sinon.spy(adapterManager, 'callBids');
-        createAuctionStub = sinon.stub(auctionModule, 'newAuction');
-        createAuctionStub.returns(auction);
+        sinon.spy(adapterManager, 'callBids');
       })
 
       afterEach(function () {
-        auctionModule.newAuction.restore();
         adapterManager.callBids.restore();
       });
 
@@ -1821,13 +2456,15 @@ describe('Unit: Prebid Module', function () {
 
         const spyArgs = adapterManager.callBids.getCall(0);
         const biddersCalled = spyArgs.args[0][0].bids;
-
         // only appnexus supports native
         expect(biddersCalled.length).to.equal(1);
       });
     });
 
     describe('part 2', function () {
+      if (!FEATURES.NATIVE) {
+        return;
+      }
       let spyCallBids;
       let createAuctionStub;
       let adUnits;
@@ -1895,7 +2532,7 @@ describe('Unit: Prebid Module', function () {
       it('splits native type to individual native assets', function () {
         let adUnits = [{
           code: 'adUnit-code',
-          mediaTypes: { native: { type: 'image' } },
+          mediaTypes: {native: {type: 'image'}},
           bids: [
             {bidder: 'appnexus', params: {placementId: 'id'}}
           ]
@@ -1903,14 +2540,47 @@ describe('Unit: Prebid Module', function () {
         $$PREBID_GLOBAL$$.requestBids({adUnits});
         const spyArgs = adapterManager.callBids.getCall(0);
         const nativeRequest = spyArgs.args[1][0].bids[0].nativeParams;
-        expect(nativeRequest).to.deep.equal({
-          image: {required: true},
-          title: {required: true},
-          sponsoredBy: {required: true},
-          clickUrl: {required: true},
-          body: {required: false},
-          icon: {required: false},
-        });
+        expect(nativeRequest.ortb.assets).to.deep.equal([
+          {
+            required: 1,
+            id: 1,
+            img: {
+              type: 3,
+              wmin: 100,
+              hmin: 100,
+            }
+          },
+          {
+            required: 1,
+            id: 2,
+            title: {
+              len: 140,
+            }
+          },
+          {
+            required: 1,
+            id: 3,
+            data: {
+              type: 1,
+            }
+          },
+          {
+            required: 0,
+            id: 4,
+            data: {
+              type: 2,
+            }
+          },
+          {
+            required: 0,
+            id: 5,
+            img: {
+              type: 1,
+              wmin: 20,
+              hmin: 20,
+            }
+          },
+        ]);
         resetAuction();
       });
     });
@@ -2548,6 +3218,58 @@ describe('Unit: Prebid Module', function () {
     });
   });
 
+  describe('getHighestUnusedBidResponseForAdUnitCode', () => {
+    afterEach(() => {
+      resetAuction();
+    })
+
+    it('returns an empty object if there is no bid for the given adUnitCode', () => {
+      const highestBid = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('stallone');
+      expect(highestBid).to.deep.equal({});
+    })
+
+    it('returns undefined if adUnitCode is provided', () => {
+      const highestBid = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode();
+      expect(highestBid).to.be.undefined;
+    })
+
+    it('should ignore bids that have already been used (\'rendered\')', () => {
+      const _bidsReceived = getBidResponses().slice(0, 3);
+      _bidsReceived[0].cpm = 11
+      _bidsReceived[1].cpm = 13
+      _bidsReceived[2].cpm = 12
+
+      _bidsReceived.forEach((bid) => {
+        bid.adUnitCode = '/19968336/header-bid-tag-0';
+      });
+
+      auction.getBidsReceived = function() { return _bidsReceived };
+      const highestBid1 = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('/19968336/header-bid-tag-0');
+      expect(highestBid1).to.deep.equal(_bidsReceived[1])
+      _bidsReceived[1].status = CONSTANTS.BID_STATUS.RENDERED
+      const highestBid2 = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('/19968336/header-bid-tag-0');
+      expect(highestBid2).to.deep.equal(_bidsReceived[2])
+    })
+
+    it('should ignore expired bids', () => {
+      const _bidsReceived = getBidResponses().slice(0, 3);
+      _bidsReceived[0].cpm = 11
+      _bidsReceived[1].cpm = 13
+      _bidsReceived[2].cpm = 12
+
+      _bidsReceived.forEach((bid) => {
+        bid.adUnitCode = '/19968336/header-bid-tag-0';
+      });
+
+      auction.getBidsReceived = function() { return _bidsReceived };
+
+      bidExpiryStub.restore();
+      bidExpiryStub = sinon.stub(filters, 'isBidNotExpired').callsFake((bid) => bid.cpm !== 13);
+      const highestBid = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('/19968336/header-bid-tag-0');
+      expect(highestBid).to.deep.equal(_bidsReceived[2])
+    })
+  })
+
   describe('getHighestCpm', () => {
     after(() => {
       resetAuction();
diff --git a/test/spec/unit/secureCreatives_spec.js b/test/spec/unit/secureCreatives_spec.js
index 566154f0003..7d5f9af35dd 100644
--- a/test/spec/unit/secureCreatives_spec.js
+++ b/test/spec/unit/secureCreatives_spec.js
@@ -1,10 +1,59 @@
 import {
-  _sendAdToCreative
-} from '../../../src/secureCreatives.js';
-import { expect } from 'chai';
+  _sendAdToCreative, getReplier, receiveMessage
+} from 'src/secureCreatives.js';
 import * as utils from 'src/utils.js';
+import {getAdUnits, getBidRequests, getBidResponses} from 'test/fixtures/fixtures.js';
+import {auctionManager} from 'src/auctionManager.js';
+import * as auctionModule from 'src/auction.js';
+import * as native from 'src/native.js';
+import {fireNativeTrackers, getAllAssetsMessage} from 'src/native.js';
+import * as events from 'src/events.js';
+import { config as configObj } from 'src/config.js';
+import 'src/prebid.js';
+
+import { expect } from 'chai';
+
+var CONSTANTS = require('src/constants.json');
 
 describe('secureCreatives', () => {
+  function makeEvent(ev) {
+    return Object.assign({origin: 'mock-origin', ports: []}, ev)
+  }
+
+  describe('getReplier', () => {
+    it('should use source.postMessage if no MessagePort is available', () => {
+      const ev = {
+        ports: [],
+        source: {
+          postMessage: sinon.spy()
+        },
+        origin: 'mock-origin'
+      };
+      getReplier(ev)('test');
+      sinon.assert.calledWith(ev.source.postMessage, JSON.stringify('test'));
+    });
+
+    it('should use MesagePort.postMessage if available', () => {
+      const ev = {
+        ports: [{
+          postMessage: sinon.spy()
+        }]
+      }
+      getReplier(ev)('test');
+      sinon.assert.calledWith(ev.ports[0].postMessage, JSON.stringify('test'));
+    });
+
+    it('should throw if origin is null and no MessagePort is available', () => {
+      const ev = {
+        origin: null,
+        ports: [],
+        postMessage: sinon.spy()
+      }
+      const reply = getReplier(ev);
+      expect(() => reply('test')).to.throw();
+    });
+  });
+
   describe('_sendAdToCreative', () => {
     beforeEach(function () {
       sinon.stub(utils, 'logError');
@@ -30,16 +79,382 @@ describe('secureCreatives', () => {
         cpm: '1.00',
         adUnitCode: 'some_dom_id'
       };
-      const event = {
-        source: { postMessage: sinon.stub() },
-        origin: 'origin.sf.com'
-      };
-
-      _sendAdToCreative(mockAdObject, event);
-      expect(JSON.parse(event.source.postMessage.args[0][0]).ad).to.equal('<script src="http://prebid.org/creative/1.00"></script>');
-      expect(JSON.parse(event.source.postMessage.args[0][0]).adUrl).to.equal('http://creative.prebid.org/1.00');
+      const reply = sinon.spy();
+      _sendAdToCreative(mockAdObject, reply);
+      expect(reply.args[0][0].ad).to.equal('<script src="http://prebid.org/creative/1.00"></script>');
+      expect(reply.args[0][0].adUrl).to.equal('http://creative.prebid.org/1.00');
       window.googletag = oldVal;
       window.apntag = oldapntag;
     });
   });
+
+  describe('receiveMessage', function() {
+    const bidId = 1;
+    const warning = `Ad id ${bidId} has been rendered before`;
+    let auction;
+    let adResponse = {};
+    let spyAddWinningBid;
+    let spyLogWarn;
+    let stubFireNativeTrackers;
+    let stubGetAllAssetsMessage;
+    let stubEmit;
+
+    function pushBidResponseToAuction(obj) {
+      adResponse = Object.assign({
+        auctionId: 1,
+        adId: bidId,
+        width: 300,
+        height: 250,
+        renderer: null
+      }, obj);
+      auction.getBidsReceived = function() {
+        let bidsReceived = getBidResponses();
+        bidsReceived.push(adResponse);
+        return bidsReceived;
+      }
+      auction.getAuctionId = () => 1;
+    }
+
+    function resetAuction() {
+      $$PREBID_GLOBAL$$.setConfig({ enableSendAllBids: false });
+      auction.getBidRequests = getBidRequests;
+      auction.getBidsReceived = getBidResponses;
+      auction.getAdUnits = getAdUnits;
+      auction.getAuctionStatus = function() { return auctionModule.AUCTION_COMPLETED }
+    }
+
+    function resetHistories(...others) {
+      [
+        spyAddWinningBid,
+        spyLogWarn,
+        stubFireNativeTrackers,
+        stubGetAllAssetsMessage,
+        stubEmit
+      ].forEach(s => s.resetHistory());
+
+      if (others && others.length > 0) { others.forEach(s => s.resetHistory()); }
+    }
+
+    before(function() {
+      const adUnits = getAdUnits();
+      const adUnitCodes = getAdUnits().map(unit => unit.code);
+      const bidsBackHandler = function() {};
+      const timeout = 2000;
+      auction = auctionManager.createAuction({adUnits, adUnitCodes, callback: bidsBackHandler, cbTimeout: timeout});
+      resetAuction();
+    });
+
+    after(function() {
+      auctionManager.clearAllAuctions();
+    });
+
+    beforeEach(function() {
+      spyAddWinningBid = sinon.spy(auctionManager, 'addWinningBid');
+      spyLogWarn = sinon.spy(utils, 'logWarn');
+      stubFireNativeTrackers = sinon.stub(native, 'fireNativeTrackers').callsFake(message => { return message.action; });
+      stubGetAllAssetsMessage = sinon.stub(native, 'getAllAssetsMessage');
+      stubEmit = sinon.stub(events, 'emit');
+    });
+
+    afterEach(function() {
+      spyAddWinningBid.restore();
+      spyLogWarn.restore();
+      stubFireNativeTrackers.restore();
+      stubGetAllAssetsMessage.restore();
+      stubEmit.restore();
+      resetAuction();
+      adResponse.adId = bidId;
+    });
+
+    describe('Prebid Request', function() {
+      it('should render', function () {
+        pushBidResponseToAuction({
+          renderer: {render: sinon.stub(), url: 'some url'}
+        });
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Request'
+        };
+
+        const ev = makeEvent({
+          data: JSON.stringify(data),
+        });
+
+        receiveMessage(ev);
+
+        sinon.assert.neverCalledWith(spyLogWarn, warning);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(spyAddWinningBid, adResponse);
+        sinon.assert.calledOnce(adResponse.renderer.render);
+        sinon.assert.calledWith(adResponse.renderer.render, adResponse);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+
+        expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+      });
+
+      it('should allow stale rendering without config', function () {
+        pushBidResponseToAuction({
+          renderer: {render: sinon.stub(), url: 'some url'}
+        });
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Request'
+        };
+
+        const ev = makeEvent({
+          data: JSON.stringify(data)
+        });
+
+        receiveMessage(ev);
+
+        sinon.assert.neverCalledWith(spyLogWarn, warning);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(spyAddWinningBid, adResponse);
+        sinon.assert.calledOnce(adResponse.renderer.render);
+        sinon.assert.calledWith(adResponse.renderer.render, adResponse);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+
+        expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+
+        resetHistories(adResponse.renderer.render);
+
+        receiveMessage(ev);
+
+        sinon.assert.calledWith(spyLogWarn, warning);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(spyAddWinningBid, adResponse);
+        sinon.assert.calledOnce(adResponse.renderer.render);
+        sinon.assert.calledWith(adResponse.renderer.render, adResponse);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER, adResponse);
+      });
+
+      it('should stop stale rendering with config', function () {
+        configObj.setConfig({'auctionOptions': {'suppressStaleRender': true}});
+
+        pushBidResponseToAuction({
+          renderer: {render: sinon.stub(), url: 'some url'}
+        });
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Request'
+        };
+
+        const ev = makeEvent({
+          data: JSON.stringify(data)
+        });
+
+        receiveMessage(ev);
+
+        sinon.assert.neverCalledWith(spyLogWarn, warning);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(spyAddWinningBid, adResponse);
+        sinon.assert.calledOnce(adResponse.renderer.render);
+        sinon.assert.calledWith(adResponse.renderer.render, adResponse);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+
+        expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+
+        resetHistories(adResponse.renderer.render);
+
+        receiveMessage(ev);
+
+        sinon.assert.calledWith(spyLogWarn, warning);
+        sinon.assert.notCalled(spyAddWinningBid);
+        sinon.assert.notCalled(adResponse.renderer.render);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER, adResponse);
+
+        configObj.setConfig({'auctionOptions': {}});
+      });
+
+      it('should emit AD_RENDER_FAILED if requested missing adId', () => {
+        const ev = makeEvent({
+          data: JSON.stringify({
+            message: 'Prebid Request',
+            adId: 'missing'
+          })
+        });
+        receiveMessage(ev);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.AD_RENDER_FAILED, sinon.match({
+          reason: CONSTANTS.AD_RENDER_FAILED_REASON.CANNOT_FIND_AD,
+          adId: 'missing'
+        }));
+      });
+
+      it('should emit AD_RENDER_FAILED if creative can\'t be sent to rendering frame', () => {
+        pushBidResponseToAuction({});
+        const ev = makeEvent({
+          source: {
+            postMessage: sinon.stub().callsFake(() => { throw new Error(); })
+          },
+          data: JSON.stringify({
+            message: 'Prebid Request',
+            adId: bidId
+          })
+        });
+        receiveMessage(ev)
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.AD_RENDER_FAILED, sinon.match({
+          reason: CONSTANTS.AD_RENDER_FAILED_REASON.EXCEPTION,
+          adId: bidId
+        }));
+      });
+    });
+
+    describe('Prebid Native', function() {
+      if (!FEATURES.NATIVE) {
+        return;
+      }
+
+      it('Prebid native should render', function () {
+        pushBidResponseToAuction({});
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Native',
+          action: 'allAssetRequest'
+        };
+
+        const ev = makeEvent({
+          data: JSON.stringify(data),
+          source: {
+            postMessage: sinon.stub()
+          },
+          origin: 'any origin'
+        });
+
+        receiveMessage(ev);
+
+        sinon.assert.neverCalledWith(spyLogWarn, warning);
+        sinon.assert.calledOnce(stubGetAllAssetsMessage);
+        sinon.assert.calledWith(stubGetAllAssetsMessage, data, adResponse);
+        sinon.assert.calledOnce(ev.source.postMessage);
+        sinon.assert.notCalled(stubFireNativeTrackers);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+      });
+
+      it('Prebid native should not fire BID_WON when receiveMessage is called more than once', () => {
+        let adId = 3;
+        pushBidResponseToAuction({ adId });
+
+        const data = {
+          adId: adId,
+          message: 'Prebid Native',
+          action: 'allAssetRequest'
+        };
+
+        const ev = makeEvent({
+          data: JSON.stringify(data),
+          source: {
+            postMessage: sinon.stub()
+          },
+          origin: 'any origin'
+        });
+
+        receiveMessage(ev);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+
+        receiveMessage(ev);
+        stubEmit.withArgs(CONSTANTS.EVENTS.BID_WON, adResponse).calledOnce;
+      });
+
+      it('Prebid native should fire trackers', function () {
+        let adId = 2;
+        pushBidResponseToAuction({adId});
+
+        const data = {
+          adId: adId,
+          message: 'Prebid Native',
+          action: 'click',
+        };
+
+        const ev = makeEvent({
+          data: JSON.stringify(data),
+          source: {
+            postMessage: sinon.stub()
+          },
+          origin: 'any origin'
+        });
+
+        receiveMessage(ev);
+
+        sinon.assert.neverCalledWith(spyLogWarn, warning);
+        sinon.assert.calledOnce(stubFireNativeTrackers);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
+
+        resetHistories(ev.source.postMessage);
+
+        delete data.action;
+        ev.data = JSON.stringify(data);
+        receiveMessage(ev);
+
+        sinon.assert.neverCalledWith(spyLogWarn, warning);
+        sinon.assert.calledOnce(stubFireNativeTrackers);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
+        sinon.assert.notCalled(spyAddWinningBid);
+
+        expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+      });
+    });
+
+    describe('Prebid Event', () => {
+      Object.entries({
+        'unrendered': [false, (bid) => { delete bid.status; }],
+        'rendered': [true, (bid) => { bid.status = CONSTANTS.BID_STATUS.RENDERED }]
+      }).forEach(([test, [shouldEmit, prepBid]]) => {
+        describe(`for ${test} bids`, () => {
+          beforeEach(() => {
+            prepBid(adResponse);
+            pushBidResponseToAuction(adResponse);
+          });
+
+          it(`should${shouldEmit ? ' ' : ' not '}emit AD_RENDER_FAILED`, () => {
+            const event = makeEvent({
+              data: JSON.stringify({
+                message: 'Prebid Event',
+                event: CONSTANTS.EVENTS.AD_RENDER_FAILED,
+                adId: bidId,
+                info: {
+                  reason: 'Fail reason',
+                  message: 'Fail message',
+                },
+              })
+            });
+            receiveMessage(event);
+            expect(stubEmit.calledWith(CONSTANTS.EVENTS.AD_RENDER_FAILED, {
+              adId: bidId,
+              bid: adResponse,
+              reason: 'Fail reason',
+              message: 'Fail message'
+            })).to.equal(shouldEmit);
+          });
+
+          it(`should${shouldEmit ? ' ' : ' not '}emit AD_RENDER_SUCCEEDED`, () => {
+            const event = makeEvent({
+              data: JSON.stringify({
+                message: 'Prebid Event',
+                event: CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED,
+                adId: bidId,
+              })
+            });
+            receiveMessage(event);
+            expect(stubEmit.calledWith(CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED, {
+              adId: bidId,
+              bid: adResponse,
+              doc: null
+            })).to.equal(shouldEmit);
+          });
+        });
+      });
+    });
+  });
 });
diff --git a/test/spec/unit/utils/perfMetrics_spec.js b/test/spec/unit/utils/perfMetrics_spec.js
new file mode 100644
index 00000000000..4ce3336e030
--- /dev/null
+++ b/test/spec/unit/utils/perfMetrics_spec.js
@@ -0,0 +1,394 @@
+import {CONFIG_TOGGLE, metricsFactory, newMetrics, useMetrics} from '../../../../src/utils/perfMetrics.js';
+import {defer} from '../../../../src/utils/promise.js';
+import {hook} from '../../../../src/hook.js';
+import {config} from 'src/config.js';
+
+describe('metricsFactory', () => {
+  let metrics, now, enabled, newMetrics;
+
+  beforeEach(() => {
+    now = 0;
+    newMetrics = metricsFactory({now: () => now});
+    metrics = newMetrics();
+  });
+
+  it('can measure time with startTiming', () => {
+    now = 10;
+    const measure = metrics.startTiming('test');
+    now = 25.2;
+    measure();
+    expect(metrics.getMetrics()).to.eql({
+      test: 15.2
+    });
+  });
+
+  describe('measureTime', () => {
+    it('can measure time', () => {
+      metrics.measureTime('test', () => now += 3);
+      expect(metrics.getMetrics()).to.eql({
+        test: 3
+      })
+    });
+
+    it('still measures if fn throws', () => {
+      expect(() => {
+        metrics.measureTime('test', () => {
+          now += 4;
+          throw new Error();
+        });
+      }).to.throw();
+      expect(metrics.getMetrics()).to.eql({
+        test: 4
+      });
+    })
+  });
+
+  describe('measureHookTime', () => {
+    let testHook;
+    before(() => {
+      testHook = hook('sync', () => null, 0, 'testName');
+      hook.ready();
+    });
+    beforeEach(() => {
+      testHook.getHooks().remove();
+    });
+
+    ['before', 'after'].forEach(hookType => {
+      describe(`on ${hookType} hooks`, () => {
+        Object.entries({
+          next: (n) => n,
+          bail: (n) => n.bail
+        }).forEach(([t, fn]) => {
+          it(`can time when hooks call ${t}`, () => {
+            const q = defer();
+            testHook[hookType]((next) => {
+              metrics.measureHookTime('test', next, (next) => {
+                setTimeout(() => {
+                  now += 10;
+                  fn(next)();
+                  q.resolve();
+                })
+              })
+            });
+            testHook();
+            return q.promise.then(() => {
+              expect(metrics.getMetrics()).to.eql({
+                test: 10
+              });
+            })
+          });
+        });
+      })
+    })
+  });
+
+  describe('checkpoints', () => {
+    it('can measure time from checkpoint with timeSince', () => {
+      now = 10;
+      metrics.checkpoint('A');
+      now = 15;
+      expect(metrics.timeSince('A')).to.eql(5);
+    });
+
+    it('timeSince is null if checkpoint does not exist', () => {
+      expect(metrics.timeSince('missing')).to.equal(null);
+    });
+
+    it('timeSince saves a metric if given a name', () => {
+      now = 10;
+      metrics.checkpoint('A');
+      now = 15;
+      metrics.timeSince('A', 'test');
+      expect(metrics.getMetrics()).to.eql({test: 5});
+    });
+
+    it('can measure time between checkpoints with timeBetween', () => {
+      now = 10;
+      metrics.checkpoint('A');
+      now = 15;
+      metrics.checkpoint('B');
+      now = 20;
+      expect(metrics.timeBetween('A', 'B')).to.eql(5);
+    });
+
+    Object.entries({
+      'first checkpoint': [false, true],
+      'second checkpoint': [true, false],
+      'both checkpoints': [false, false]
+    }).forEach(([t, [checkFirst, checkSecond]]) => {
+      it(`timeBetween measures to null if missing ${t}`, () => {
+        if (checkFirst) {
+          metrics.checkpoint('A');
+        }
+        if (checkSecond) {
+          metrics.checkpoint('B');
+        }
+        expect(metrics.timeBetween('A', 'B')).to.equal(null)
+      })
+    });
+
+    it('saves a metric with timeBetween if given a name', () => {
+      now = 10;
+      metrics.checkpoint('A');
+      now = 15;
+      metrics.checkpoint('B');
+      metrics.timeBetween('A', 'B', 'test');
+      expect(metrics.getMetrics()).to.eql({test: 5});
+    });
+  });
+
+  describe('setMetrics', () => {
+    it('sets metric', () => {
+      metrics.setMetric('test', 1);
+      expect(metrics.getMetrics()).to.eql({test: 1});
+    });
+  });
+
+  describe('fork', () => {
+    it('keeps metrics from ancestors', () => {
+      const m2 = metrics.fork();
+      const m3 = m2.fork();
+      metrics.setMetric('1', 'one');
+      m2.setMetric('2', 'two');
+      m3.setMetric('3', 'three');
+      sinon.assert.match(metrics.getMetrics(), {
+        1: 'one'
+      })
+      sinon.assert.match(m2.getMetrics(), {
+        1: 'one',
+        2: 'two'
+      });
+      sinon.assert.match(m3.getMetrics(), {
+        1: 'one',
+        2: 'two',
+        3: 'three'
+      });
+    });
+
+    it('keeps checkpoints from ancestors', () => {
+      const m2 = metrics.fork();
+      const m3 = m2.fork();
+      now = 10;
+      metrics.checkpoint('1');
+      now = 20;
+      m2.checkpoint('2');
+      now = 30;
+      m3.checkpoint('3');
+      now = 40;
+      expect(m2.timeSince('1')).to.eql(30);
+      expect(m3.timeSince('2')).to.eql(20);
+    });
+
+    it('groups metrics into ancestors', () => {
+      const c1 = metrics.fork().fork();
+      const c2 = metrics.fork().fork();
+      c1.setMetric('test', 10);
+      c2.setMetric('test', 20);
+      expect(metrics.getMetrics().test).to.eql([10, 20]);
+    });
+
+    it('does not group metrics into ancestors if the name clashes', () => {
+      metrics.setMetric('test', {});
+      metrics.fork().setMetric('test', 1);
+      expect(metrics.getMetrics().test).to.eql({});
+    });
+
+    it('does not propagate further if stopPropagation = true', () => {
+      const c1 = metrics.fork();
+      const c2 = c1.fork({stopPropagation: true});
+      c2.setMetric('test', 1);
+      expect(c1.getMetrics().test).to.eql([1]);
+      expect(metrics.getMetrics().test).to.not.exist;
+    });
+
+    it('does not propagate at all if propagate = false', () => {
+      metrics.fork({propagate: false}).setMetric('test', 1);
+      expect(metrics.getMetrics()).to.eql({});
+    });
+
+    it('replicates grouped metrics if includeGroups = true', () => {
+      const child = metrics.fork({includeGroups: true});
+      metrics.fork().setMetric('test', 1);
+      expect(child.getMetrics()).to.eql({
+        test: [1]
+      });
+    })
+  });
+
+  describe('join', () => {
+    let other;
+    beforeEach(() => {
+      other = newMetrics();
+    });
+
+    it('joins metrics', () => {
+      metrics.setMetric('test', 1);
+      metrics.join(other);
+      expect(other.getMetrics()).to.eql({
+        test: 1
+      });
+    });
+
+    it('joins checkpoints', () => {
+      now = 10;
+      metrics.checkpoint('test');
+      metrics.join(other);
+      now = 20;
+      expect(other.timeSince('test')).to.eql(10);
+    })
+
+    it('groups metrics after joining', () => {
+      metrics.join(other);
+      other.setMetric('test', 1);
+      expect(metrics.getMetrics().test).to.eql([1]);
+    });
+
+    it('gives precedence to first join\'s metrics', () => {
+      metrics.join(other);
+      const metrics2 = newMetrics();
+      metrics2.join(other);
+      metrics.setMetric('test', 1);
+      metrics2.setMetric('test', 2);
+      expect(other.getMetrics()).to.eql({
+        test: 1
+      });
+    });
+
+    it('gives precedence to first joins\'s checkpoints', () => {
+      metrics.join(other);
+      const metrics2 = newMetrics();
+      metrics2.join(other);
+      now = 10;
+      metrics.checkpoint('testcp');
+      now = 20;
+      metrics2.checkpoint('testcp');
+      now = 30;
+      expect(other.timeSince('testcp')).to.eql(20);
+    });
+
+    it('does not propagate further if stopPropagation = true', () => {
+      const m2 = metrics.fork();
+      m2.join(other, {stopPropagation: true});
+      other.setMetric('test', 1);
+      expect(m2.getMetrics().test).to.eql([1]);
+      expect(metrics.getMetrics()).to.eql({});
+    });
+
+    it('does not propagate at all if propagate = false', () => {
+      metrics.join(other, {propagate: false});
+      other.setMetric('test', 1);
+      expect(metrics.getMetrics()).to.eql({});
+    });
+
+    it('replicates grouped metrics if includeGroups = true', () => {
+      const m2 = metrics.fork();
+      metrics.join(other, {includeGroups: true});
+      m2.setMetric('test', 1);
+      expect(other.getMetrics()).to.eql({
+        test: [1]
+      });
+    })
+
+    Object.entries({
+      'join with a common ancestor': () => [metrics.fork(), metrics.fork()],
+      'join with self': () => [metrics, metrics],
+    }).forEach(([t, makePair]) => {
+      it(`can ${t}`, () => {
+        const [m1, m2] = makePair();
+        m1.join(m2);
+        m1.setMetric('test', 1);
+        const expected = {'test': 1};
+        expect(m1.getMetrics()).to.eql(expected);
+        expect(m2.getMetrics()).to.eql(expected);
+      })
+    });
+
+    it('can join into a cycle', () => {
+      const c = metrics.fork();
+      c.join(metrics);
+      c.setMetric('child', 1);
+      metrics.setMetric('parent', 1);
+      expect(c.getMetrics()).to.eql({
+        child: 1,
+        parent: [1]
+      })
+      expect(metrics.getMetrics()).to.eql({
+        parent: 1,
+        child: [1]
+      })
+    });
+  });
+  describe('newMetrics', () => {
+    it('returns related, but independent, metrics', () => {
+      const m0 = metrics.newMetrics();
+      const m1 = newMetrics();
+      m1.join(m0);
+      m0.setMetric('m0', 1);
+      m1.setMetric('m1', 1);
+      expect(metrics.getMetrics()).to.eql({});
+      expect(m0.getMetrics()).to.eql({
+        m0: 1,
+        m1: 1
+      })
+    })
+  })
+})
+
+describe('nullMetrics', () => {
+  let nullMetrics;
+  beforeEach(() => {
+    nullMetrics = useMetrics(null);
+  });
+
+  Object.entries({
+    'stopBefore': (fn) => nullMetrics.startTiming('n').stopBefore(fn),
+    'stopAfter': (fn) => nullMetrics.startTiming('n').stopAfter(fn),
+    'measureTime': (fn) => (...args) => nullMetrics.measureTime('n', () => fn(...args)),
+    'measureHookTime': (fn) => (...args) => nullMetrics.measureHookTime('n', {}, () => fn(...args))
+  }).forEach(([t, wrapFn]) => {
+    describe(t, () => {
+      it('invokes the wrapped fn', () => {
+        const fn = sinon.stub();
+        wrapFn(fn)('one', 'two');
+        sinon.assert.calledWith(fn, 'one', 'two');
+      });
+      it('does not register timing metrics', () => {
+        wrapFn(sinon.stub())();
+        expect(nullMetrics.getMetrics()).to.eql({});
+      })
+    })
+  });
+
+  it('does not save checkpoints', () => {
+    nullMetrics.checkpoint('A');
+    expect(nullMetrics.timeSince('A')).to.equal(null);
+  });
+
+  it('does not save metrics', () => {
+    nullMetrics.setMetric('test', 1);
+    expect(nullMetrics.getMetrics()).to.eql({});
+  });
+})
+
+describe('configuration toggle', () => {
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  Object.entries({
+    'useMetrics': () => useMetrics(metricsFactory()()),
+    'newMetrics': newMetrics
+  }).forEach(([t, mkMetrics]) => {
+    it(`${t} returns no-op metrics when disabled`, () => {
+      config.setConfig({[CONFIG_TOGGLE]: false});
+      const metrics = mkMetrics();
+      metrics.setMetric('test', 'value');
+      expect(metrics.getMetrics()).to.eql({});
+    });
+    it(`returns actual metrics by default`, () => {
+      const metrics = mkMetrics();
+      metrics.setMetric('test', 'value');
+      expect(metrics.getMetrics()).to.eql({test: 'value'});
+    });
+  });
+});
diff --git a/test/spec/unit/utils/promise_spec.js b/test/spec/unit/utils/promise_spec.js
new file mode 100644
index 00000000000..a931b8bc9c4
--- /dev/null
+++ b/test/spec/unit/utils/promise_spec.js
@@ -0,0 +1,294 @@
+import {GreedyPromise, defer} from '../../../../src/utils/promise.js';
+
+describe('GreedyPromise', () => {
+  it('throws when resolver is not a function', () => {
+    expect(() => new GreedyPromise()).to.throw();
+  })
+
+  Object.entries({
+    'resolved': (use) => new GreedyPromise((resolve) => use(resolve)),
+    'rejected': (use) => new GreedyPromise((_, reject) => use(reject))
+  }).forEach(([t, makePromise]) => {
+    it(`runs callbacks immediately when ${t}`, () => {
+      let cbRan = false;
+      const cb = () => { cbRan = true };
+      let resolver;
+      makePromise((fn) => { resolver = fn }).then(cb, cb);
+      resolver();
+      expect(cbRan).to.be.true;
+    })
+  });
+
+  describe('unhandled rejections', () => {
+    let unhandled, done, stop;
+
+    function reset(expectUnhandled) {
+      let pending = expectUnhandled;
+      let resolver;
+      unhandled.reset();
+      unhandled.callsFake(() => {
+        pending--;
+        if (pending === 0) {
+          resolver();
+        }
+      })
+      done = new Promise((resolve) => {
+        resolver = resolve;
+        stop = function () {
+          if (expectUnhandled === 0) {
+            resolve()
+          } else {
+            resolver = resolve;
+          }
+        }
+      })
+    }
+
+    before(() => {
+      unhandled = sinon.stub();
+      window.addEventListener('unhandledrejection', unhandled);
+    });
+
+    after(() => {
+      window.removeEventListener('unhandledrejection', unhandled);
+    });
+
+    function getUnhandledErrors() {
+      return unhandled.args.map((args) => args[0].reason);
+    }
+
+    Object.entries({
+      'simple reject': [1, (P) => { P.reject('err'); stop() }],
+      'caught reject': [0, (P) => P.reject('err').catch((e) => { stop(); return e })],
+      'unhandled reject with finally': [1, (P) => P.reject('err').finally(() => 'finally')],
+      'error handler that throws': [1, (P) => P.reject('err').catch((e) => { stop(); throw e })],
+      'rejection handled later in the chain': [0, (P) => P.reject('err').then((v) => v).catch((e) => { stop(); return e })],
+      'multiple errors in one chain': [1, (P) => P.reject('err').then((v) => v).catch((e) => e).then((v) => { stop(); return P.reject(v) })],
+      'multiple errors in one chain, all handled': [0, (P) => P.reject('err').then((v) => v).catch((e) => e).then((v) => P.reject(v)).catch((e) => { stop(); return e })],
+      'separate chains for rejection and handling': [1, (P) => {
+        const p = P.reject('err');
+        p.catch((e) => { stop(); return e; })
+        p.then((v) => v);
+      }],
+      'separate rejections merged without handling': [2, (P) => {
+        const p1 = P.reject('err1');
+        const p2 = P.reject('err2');
+        p1.then(() => p2).finally(stop);
+      }],
+      'separate rejections merged for handling': [0, (P) => {
+        const p1 = P.reject('err1');
+        const p2 = P.reject('err2');
+        P.all([p1, p2]).catch((e) => { stop(); return e });
+      }],
+      // eslint-disable-next-line no-throw-literal
+      'exception in resolver': [1, (P) => new P(() => { stop(); throw 'err'; })],
+      // eslint-disable-next-line no-throw-literal
+      'exception in resolver, caught': [0, (P) => new P(() => { throw 'err' }).catch((e) => { stop(); return e })],
+      'errors from nested promises': [1, (P) => new P((resolve) => setTimeout(() => { resolve(P.reject('err')); stop(); }))],
+      'errors from nested promises, caught': [0, (P) => new P((resolve) => setTimeout(() => resolve(P.reject('err')))).catch((e) => { stop(); return e })],
+    }).forEach(([t, [expectUnhandled, op]]) => {
+      describe(`on ${t}`, () => {
+        it('should match vanilla Promises', () => {
+          let vanillaUnhandled;
+          reset(expectUnhandled);
+          op(Promise);
+          return done.then(() => {
+            vanillaUnhandled = getUnhandledErrors();
+            reset(expectUnhandled);
+            op(GreedyPromise);
+            return done;
+          }).then(() => {
+            const actualUnhandled = getUnhandledErrors();
+            expect(actualUnhandled.length).to.eql(expectUnhandled);
+            expect(actualUnhandled).to.eql(vanillaUnhandled);
+          })
+        })
+      })
+    });
+  });
+
+  describe('idioms', () => {
+    let makePromise, pendingFailure, pendingSuccess;
+
+    Object.entries({
+      // eslint-disable-next-line no-throw-literal
+      'resolver that throws': (P) => new P(() => { throw 'error' }),
+      'resolver that resolves multiple times': (P) => new P((resolve) => { resolve('first'); resolve('second'); }),
+      'resolver that rejects multiple times': (P) => new P((resolve, reject) => { reject('first'); reject('second') }),
+      'resolver that resolves and rejects': (P) => new P((resolve, reject) => { reject('first'); resolve('second') }),
+      'resolver that resolves with multiple arguments': (P) => new P((resolve) => resolve('one', 'two')),
+      'resolver that rejects with multiple arguments': (P) => new P((resolve, reject) => reject('one', 'two')),
+      'resolver that resolves to a promise': (P) => new P((resolve) => resolve(makePromise(P, 'val'))),
+      'resolver that resolves to a promise that resolves to a promise': (P) => new P((resolve) => resolve(makePromise(P, makePromise(P, 'val')))),
+      'resolver that resolves to a rejected promise': (P) => new P((resolve) => resolve(makePromise(P, 'err', true))),
+      'simple .then': (P) => makePromise(P, 'value').then((v) => `${v} and then`),
+      'chained .then': (P) => makePromise(P, 'value').then((v) => makePromise(P, `${v} and then`)),
+      '.then with error handler': (P) => makePromise(P, 'err', true).then(null, (e) => `${e} and then`),
+      '.then with chained error handler': (P) => makePromise(P, 'err', true).then(null, (e) => makePromise(P, `${e} and then`)),
+      '.then that throws': (P) => makePromise(P, 'value').then((v) => { throw v }),
+      '.then that throws in error handler': (P) => makePromise(P, 'err', true).then(null, (e) => { throw e }),
+      '.then with no args': (P) => makePromise(P, 'value').then(),
+      '.then that rejects': (P) => makePromise(P, 'value').then((v) => P.reject(v)),
+      '.then that rejects in error handler': (P) => makePromise(P, 'err', true).then(null, (err) => P.reject(err)),
+      '.then with no error handler on a rejection': (P) => makePromise(P, 'err', true).then((v) => `resolved ${v}`),
+      '.then with no success handler on a resolution': (P) => makePromise(P, 'value').then(null, (e) => `caught ${e}`),
+      'simple .catch': (P) => makePromise(P, 'err', true).catch((err) => `caught ${err}`),
+      'identity .catch': (P) => makePromise(P, 'err', true).catch((err) => err).then((v) => v),
+      '.catch that throws': (P) => makePromise(P, 'err', true).catch((err) => { throw err }),
+      'chained .catch': (P) => makePromise(P, 'err', true).catch((err) => makePromise(P, err)),
+      'chained .catch that rejects': (P) => makePromise(P, 'err', true).catch((err) => P.reject(`reject with ${err}`)),
+      'simple .finally': (P) => {
+        let fval;
+        return makePromise(P, 'value')
+          .finally(() => fval = 'finally ran')
+          .then((val) => `${val} ${fval}`)
+      },
+      'chained .finally': (P) => {
+        let fval;
+        return makePromise(P, 'value')
+          .finally(() => pendingSuccess.then(() => { fval = 'finally ran' }))
+          .then((val) => `${val} ${fval}`)
+      },
+      '.finally on a rejection': (P) => {
+        let fval;
+        return makePromise(P, 'error', true)
+          .finally(() => { fval = 'finally' })
+          .catch((err) => `${err} ${fval}`)
+      },
+      'chained .finally on a rejection': (P) => {
+        let fval;
+        return makePromise(P, 'error', true)
+          .finally(() => pendingSuccess.then(() => { fval = 'finally' }))
+          .catch((err) => `${err} ${fval}`)
+      },
+      // eslint-disable-next-line no-throw-literal
+      '.finally that throws': (P) => makePromise(P, 'value').finally(() => { throw 'error' }),
+      'chained .finally that rejects': (P) => makePromise(P, 'value').finally(() => P.reject('error')),
+      'scalar Promise.resolve': (P) => P.resolve('scalar'),
+      'null Promise.resolve': (P) => P.resolve(null),
+      'chained Promise.resolve': (P) => P.resolve(pendingSuccess),
+      'chained Promise.resolve on failure': (P) => P.resolve(pendingFailure),
+      'scalar Promise.reject': (P) => P.reject('scalar'),
+      'chained Promise.reject': (P) => P.reject(pendingSuccess),
+      'chained Promise.reject on failure': (P) => P.reject(pendingFailure),
+      'simple Promise.all': (P) => P.all([makePromise(P, 'one'), makePromise(P, 'two')]),
+      'Promise.all with scalars': (P) => P.all([makePromise(P, 'one'), 'two']),
+      'Promise.all with errors': (P) => P.all([makePromise(P, 'one'), makePromise(P, 'two'), makePromise(P, 'err', true)]),
+      'Promise.allSettled': (P) => P.allSettled([makePromise(P, 'one', true), makePromise(P, 'two'), makePromise(P, 'three', true)]),
+      'Promise.allSettled with scalars': (P) => P.allSettled([makePromise(P, 'value'), 'scalar']),
+      'Promise.race that succeeds': (P) => P.race([makePromise(P, 'error', true, 10), makePromise(P, 'success')]),
+      'Promise.race that fails': (P) => P.race([makePromise(P, 'success', false, 10), makePromise(P, 'error', true)]),
+      'Promise.race with scalars': (P) => P.race(['scalar', makePromise(P, 'success')]),
+    }).forEach(([t, op]) => {
+      describe(t, () => {
+        describe('when mixed with deferrals', () => {
+          beforeEach(() => {
+            makePromise = function(ctor, value, fail = false, delay = 0) {
+              // eslint-disable-next-line new-cap
+              return new ctor((resolve, reject) => {
+                setTimeout(() => fail ? reject(value) : resolve(value), delay)
+              })
+            };
+            pendingSuccess = makePromise(Promise, 'pending result', false, 10);
+            pendingFailure = makePromise(Promise, 'pending failure', true, 10);
+          });
+
+          it(`behaves like vanilla promises`, () => {
+            const vanilla = op(Promise);
+            const greedy = op(GreedyPromise);
+            // note that we are not using `allSettled` & co to resolve our promises,
+            // to avoid transformations those methods do under the hood
+            const {actual = {}, expected = {}} = {};
+            return new Promise((resolve) => {
+              let pending = 2;
+              function collect(dest, slot) {
+                return function (value) {
+                  dest[slot] = value;
+                  pending--;
+                  if (pending === 0) {
+                    resolve()
+                  }
+                }
+              }
+              vanilla.then(collect(expected, 'success'), collect(expected, 'failure'));
+              greedy.then(collect(actual, 'success'), collect(actual, 'failure'));
+            }).then(() => {
+              expect(actual).to.eql(expected);
+            });
+          });
+
+          it(`once resolved, runs callbacks immediately`, () => {
+            const promise = op(GreedyPromise).catch(() => null);
+            return promise.then(() => {
+              let cbRan = false;
+              promise.then(() => { cbRan = true });
+              expect(cbRan).to.be.true;
+            });
+          });
+        });
+
+        describe('when all promises involved are greedy', () => {
+          beforeEach(() => {
+            makePromise = function(ctor, value, fail = false, delay = 0) {
+              // eslint-disable-next-line new-cap
+              return new ctor((resolve, reject) => {
+                const run = () => fail ? reject(value) : resolve(value);
+                delay === 0 ? run() : setTimeout(run, delay);
+              })
+            };
+            pendingSuccess = makePromise(GreedyPromise, 'pending result');
+            pendingFailure = makePromise(GreedyPromise, 'pending failure', true);
+          });
+
+          it('resolves immediately', () => {
+            let cbRan = false;
+            op(GreedyPromise).catch(() => null).then(() => { cbRan = true });
+            expect(cbRan).to.be.true;
+          });
+        });
+      });
+    });
+  });
+
+  describe('.timeout', () => {
+    const timeout = GreedyPromise.timeout;
+
+    it('should resolve immediately when ms is 0', () => {
+      let cbRan = false;
+      timeout(0.0).then(() => { cbRan = true });
+      expect(cbRan).to.be.true;
+    });
+
+    it('should schedule timeout on ms > 0', (done) => {
+      let cbRan = false;
+      timeout(5).then(() => { cbRan = true });
+      expect(cbRan).to.be.false;
+      setTimeout(() => {
+        expect(cbRan).to.be.true;
+        done();
+      }, 10)
+    });
+  });
+});
+
+describe('promiseControls', () => {
+  Object.entries({
+    'resolve': (p) => p,
+    'reject': (p) => p.then(() => 'wrong', (v) => v)
+  }).forEach(([method, transform]) => {
+    describe(method, () => {
+      it(`should ${method} the promise`, () => {
+        const ctl = defer();
+        ctl[method]('result');
+        return transform(ctl.promise).then((res) => expect(res).to.equal('result'));
+      });
+
+      it('should ignore calls after the first', () => {
+        const ctl = defer();
+        ctl[method]('result');
+        ctl[method]('other');
+        return transform(ctl.promise).then((res) => expect(res).to.equal('result'));
+      });
+    });
+  });
+});
diff --git a/test/spec/userSync_spec.js b/test/spec/userSync_spec.js
index 2b68349ca31..910ffe7b2d6 100644
--- a/test/spec/userSync_spec.js
+++ b/test/spec/userSync_spec.js
@@ -401,6 +401,33 @@ describe('user sync', function () {
     expect(insertUserSyncIframeStub.getCall(0).args[0]).to.equal('http://example.com/iframe');
   });
 
+  it('should not fire image pixel for a bidder if iframe pixel is fired for same bidder', function() {
+    const userSync = newUserSync({
+      config: config.getConfig('userSync'),
+      browserSupportsCookies: true
+    });
+
+    config.setConfig({
+      userSync: {
+        filterSettings: {
+          iframe: {
+            bidders: ['bidderXYZ'],
+            filter: 'include'
+          }
+        }
+      }
+    });
+    // we are registering iframe and image sync for bidderXYZ and we expect image sync not to execute.
+    userSync.registerSync('image', 'testBidder', 'http://testBidder.example.com/image');
+    userSync.registerSync('iframe', 'bidderXYZ', 'http://bidderXYZ.example.com/iframe');
+    userSync.registerSync('image', 'bidderXYZ', 'http://bidderXYZ.example.com/image');
+    userSync.syncUsers();
+    expect(triggerPixelStub.getCall(0)).to.not.be.null;
+    expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.equal('http://testBidder.example.com/image');
+    expect(triggerPixelStub.callCount).to.equal(1); // should not be 2 for 2 registered image syncs
+    expect(insertUserSyncIframeStub.getCall(0).args[0]).to.equal('http://bidderXYZ.example.com/iframe');
+  });
+
   it('should override default image syncs if setConfig used image filter', function () {
     const userSync = newUserSync({
       config: config.getConfig('userSync'),
@@ -448,8 +475,9 @@ describe('user sync', function () {
     userSync.registerSync('iframe', 'testBidder', 'http://example.com/iframe');
     userSync.registerSync('iframe', 'bidderXYZ', 'http://example.com/iframe-blocked');
     userSync.syncUsers();
-    expect(triggerPixelStub.getCall(0)).to.not.be.null;
-    expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.equal('http://example.com');
+    // expect(triggerPixelStub.getCall(0)).to.not.be.null;
+    expect(triggerPixelStub.getCall(0)).to.be.null;// image sync will not execute as iframe sync has executed for same bidder
+    // expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.equal('http://example.com');
     expect(triggerPixelStub.getCall(1)).to.be.null;
     expect(insertUserSyncIframeStub.getCall(0).args[0]).to.equal('http://example.com/iframe');
     expect(insertUserSyncIframeStub.getCall(1)).to.be.null;
@@ -475,6 +503,24 @@ describe('user sync', function () {
           });
           expect(userSync.canBidderRegisterSync('iframe', 'otherTestBidder')).to.equal(false);
         });
+        it('should return false for iframe if there is no iframe filterSettings', function () {
+          const userSync = newUserSync({
+            config: {
+              syncEnabled: true,
+              filterSettings: {
+                image: {
+                  bidders: '*',
+                  filter: 'include'
+                }
+              },
+              syncsPerBidder: 5,
+              syncDelay: 3000,
+              auctionDelay: 0
+            }
+          });
+
+          expect(userSync.canBidderRegisterSync('iframe', 'otherTestBidder')).to.equal(false);
+        });
         it('should return true if filter settings does allow it', function () {
           const userSync = newUserSync({
             config: {
diff --git a/test/spec/utils_spec.js b/test/spec/utils_spec.js
index 4dbb40557af..9199b259ad6 100644
--- a/test/spec/utils_spec.js
+++ b/test/spec/utils_spec.js
@@ -2,6 +2,7 @@ import { getAdServerTargeting } from 'test/fixtures/fixtures.js';
 import { expect } from 'chai';
 import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
+import {memoize, deepEqual, waitForElementToLoad} from 'src/utils.js';
 
 var assert = require('assert');
 
@@ -1115,4 +1116,191 @@ describe('Utils', function () {
       });
     });
   });
+
+  describe('deepEqual', function() {
+    it('should return "true" if comparing the same object', function() {
+      const obj1 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] },
+          ],
+        },
+      };
+      const obj2 = obj1;
+      expect(utils.deepEqual(obj1, obj2)).to.equal(true);
+    });
+    it('should return "true" if two deeply nested objects are equal', function() {
+      const obj1 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] },
+          ],
+        },
+      };
+      const obj2 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] },
+          ],
+        },
+      };
+      expect(utils.deepEqual(obj1, obj2)).to.equal(true);
+    });
+    it('should return "true" if comparting the same primitive values', function() {
+      const primitive1 = 'Prebid.js';
+      const primitive2 = 'Prebid.js';
+      expect(utils.deepEqual(primitive1, primitive2)).to.equal(true);
+    });
+    it('should return "false" if comparing two different primitive values', function() {
+      const primitive1 = 12;
+      const primitive2 = 123;
+      expect(utils.deepEqual(primitive1, primitive2)).to.equal(false);
+    });
+    it('should return "false" if comparing two different deeply nested objects', function() {
+      const obj1 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] },
+          ],
+        },
+      };
+      const obj2 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [728, 90]] },
+          ],
+        },
+      }
+      expect(utils.deepEqual(obj1, obj2)).to.equal(false);
+    });
+    it('should check types if {matchTypes: true}', () => {
+      function Typed(obj) {
+        Object.assign(this, obj);
+      }
+      const obj = {key: 'value'};
+      expect(deepEqual({outer: obj}, {outer: new Typed(obj)}, {checkTypes: true})).to.be.false;
+    });
+
+    describe('cyrb53Hash', function() {
+      it('should return the same hash for the same string', function() {
+        const stringOne = 'string1';
+        expect(utils.cyrb53Hash(stringOne)).to.equal(utils.cyrb53Hash(stringOne));
+      });
+      it('should return a different hash for the same string with different seeds', function() {
+        const stringOne = 'string1';
+        expect(utils.cyrb53Hash(stringOne, 1)).to.not.equal(utils.cyrb53Hash(stringOne, 2));
+      });
+      it('should return a different hash for different strings with the same seed', function() {
+        const stringOne = 'string1';
+        const stringTwo = 'string2';
+        expect(utils.cyrb53Hash(stringOne)).to.not.equal(utils.cyrb53Hash(stringTwo));
+      });
+      it('should return a string value, not a number', function() {
+        const stringOne = 'string1';
+        expect(typeof utils.cyrb53Hash(stringOne)).to.equal('string');
+      });
+    });
+  });
+
+  describe('waitForElementToLoad', () => {
+    let element;
+    let callbacks;
+
+    function callback() {
+      callbacks++;
+    }
+
+    function delay(delay = 0) {
+      return new Promise((resolve) => {
+        window.setTimeout(resolve, delay);
+      })
+    }
+
+    beforeEach(() => {
+      callbacks = 0;
+      element = window.document.createElement('div');
+    });
+
+    it('should respect timeout if set', () => {
+      waitForElementToLoad(element, 50).then(callback);
+      return delay(60).then(() => {
+        expect(callbacks).to.equal(1);
+      });
+    });
+
+    ['load', 'error'].forEach((event) => {
+      it(`should complete on '${event} event'`, () => {
+        waitForElementToLoad(element).then(callback);
+        element.dispatchEvent(new Event(event));
+        return delay().then(() => {
+          expect(callbacks).to.equal(1);
+        })
+      });
+    });
+  });
+
+  describe('setScriptAttributes', () => {
+    it('correctly adds attributes from an object', () => {
+      const script = document.createElement('script'),
+        attrs = {
+          'data-first_prop': '1',
+          'data-second_prop': 'b',
+          'id': 'newId'
+        };
+      script.id = 'oldId';
+      utils.setScriptAttributes(script, attrs);
+      expect(script.dataset['first_prop']).to.equal('1');
+      expect(script.dataset.second_prop).to.equal('b');
+      expect(script.id).to.equal('newId');
+    });
+  });
 });
+
+describe('memoize', () => {
+  let fn;
+
+  beforeEach(() => {
+    fn = sinon.stub().callsFake(function() {
+      return Array.from(arguments);
+    });
+  });
+
+  it('delegates to fn', () => {
+    expect(memoize(fn)('one', 'two')).to.eql(['one', 'two']);
+  });
+
+  it('caches result after first call, if first argument is the same', () => {
+    const mem = memoize(fn);
+    mem('one', 'two');
+    expect(mem('one', 'three')).to.eql(['one', 'two']);
+    expect(fn.callCount).to.equal(1);
+  });
+
+  it('delegates again when the first argument changes', () => {
+    const mem = memoize(fn);
+    mem('one', 'two');
+    expect(mem('two', 'one')).to.eql(['two', 'one']);
+    expect(fn.callCount).to.eql(2);
+  });
+
+  it('can clear cache with .clear', () => {
+    const mem = memoize(fn);
+    mem('arg');
+    mem.clear();
+    expect(mem('arg')).to.eql(['arg']);
+    expect(fn.callCount).to.equal(2);
+  });
+
+  it('allows setting cache keys', () => {
+    const mem = memoize(fn, (...args) => args.join(','))
+    mem('one', 'two');
+    mem('one', 'three');
+    expect(mem('one', 'three')).to.eql(['one', 'three']);
+    expect(fn.callCount).to.eql(2);
+  })
+})
diff --git a/test/spec/videoCache_spec.js b/test/spec/videoCache_spec.js
index 6bb214af8a0..a13028c966a 100644
--- a/test/spec/videoCache_spec.js
+++ b/test/spec/videoCache_spec.js
@@ -2,6 +2,9 @@ import chai from 'chai';
 import { getCacheUrl, store } from 'src/videoCache.js';
 import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr.js';
+import {auctionManager} from '../../src/auctionManager.js';
+import {AuctionIndex} from '../../src/auctionIndex.js';
+import { batchingCache } from '../../src/auction.js';
 
 const should = chai.should();
 
@@ -27,28 +30,10 @@ function getMockBid(bidder, auctionId, bidderRequestId) {
     'sizes': [300, 250],
     'bidId': '123',
     'bidderRequestId': bidderRequestId,
-    'auctionId': auctionId,
-    'storedAuctionResponse': 11111
+    'auctionId': auctionId
   };
 }
 
-function getMockBidRequest(bidder = 'appnexus', auctionId = '173afb6d132ba3', bidderRequestId = '3d1063078dfcc8') {
-  return {
-    'bidderCode': bidder,
-    'auctionId': auctionId,
-    'bidderRequestId': bidderRequestId,
-    'tid': '437fbbf5-33f5-487a-8e16-a7112903cfe5',
-    'bids': [getMockBid(bidder, auctionId, bidderRequestId)],
-    'auctionStart': 1510852447530,
-    'timeout': 5000,
-    'src': 's2s',
-    'doneCbCallCount': 0,
-    'refererInfo': {
-      'referer': 'http://mytestpage.com'
-    }
-  }
-}
-
 describe('The video cache', function () {
   function assertError(callbackSpy) {
     callbackSpy.calledOnce.should.equal(true);
@@ -171,12 +156,12 @@ describe('The video cache', function () {
         puts: [{
           type: 'xml',
           value: vastXml1,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey1
         }, {
           type: 'xml',
           value: vastXml2,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey2
         }]
       };
@@ -201,13 +186,15 @@ describe('The video cache', function () {
         ttl: 25,
         customCacheKey: customKey1,
         requestId: '12345abc',
-        bidder: 'appnexus'
+        bidder: 'appnexus',
+        auctionId: '1234-56789-abcde'
       }, {
         vastXml: vastXml2,
         ttl: 25,
         customCacheKey: customKey2,
         requestId: 'cba54321',
-        bidder: 'rubicon'
+        bidder: 'rubicon',
+        auctionId: '1234-56789-abcde'
       }];
 
       store(bids, function () { });
@@ -219,16 +206,18 @@ describe('The video cache', function () {
         puts: [{
           type: 'xml',
           value: vastXml1,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey1,
           bidid: '12345abc',
+          aid: '1234-56789-abcde',
           bidder: 'appnexus'
         }, {
           type: 'xml',
           value: vastXml2,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey2,
           bidid: 'cba54321',
+          aid: '1234-56789-abcde',
           bidder: 'rubicon'
         }]
       };
@@ -236,7 +225,7 @@ describe('The video cache', function () {
       JSON.parse(request.requestBody).should.deep.equal(payload);
     });
 
-    it('should include additional params in request payload should config.cache.vasttrack be true and bidderRequest argument was defined', () => {
+    it('should include additional params in request payload should config.cache.vasttrack be true - with timestamp', () => {
       config.setConfig({
         cache: {
           url: 'https://prebid.adnxs.com/pbc/v1/cache',
@@ -254,16 +243,32 @@ describe('The video cache', function () {
         ttl: 25,
         customCacheKey: customKey1,
         requestId: '12345abc',
-        bidder: 'appnexus'
+        bidder: 'appnexus',
+        auctionId: '1234-56789-abcde'
       }, {
         vastXml: vastXml2,
         ttl: 25,
         customCacheKey: customKey2,
         requestId: 'cba54321',
-        bidder: 'rubicon'
+        bidder: 'rubicon',
+        auctionId: '1234-56789-abcde'
       }];
 
-      store(bids, function () { }, getMockBidRequest());
+      const stub = sinon.stub(auctionManager, 'index');
+      stub.get(() => new AuctionIndex(() => [{
+        getAuctionId() {
+          return '1234-56789-abcde';
+        },
+        getAuctionStart() {
+          return 1510852447530;
+        }
+      }]))
+      try {
+        store(bids, function () { });
+      } finally {
+        stub.restore();
+      }
+
       const request = server.requests[0];
       request.method.should.equal('POST');
       request.url.should.equal('https://prebid.adnxs.com/pbc/v1/cache');
@@ -272,18 +277,20 @@ describe('The video cache', function () {
         puts: [{
           type: 'xml',
           value: vastXml1,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey1,
           bidid: '12345abc',
           bidder: 'appnexus',
+          aid: '1234-56789-abcde',
           timestamp: 1510852447530
         }, {
           type: 'xml',
           value: vastXml2,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey2,
           bidid: 'cba54321',
           bidder: 'rubicon',
+          aid: '1234-56789-abcde',
           timestamp: 1510852447530
         }]
       };
@@ -291,6 +298,35 @@ describe('The video cache', function () {
       JSON.parse(request.requestBody).should.deep.equal(payload);
     });
 
+    it('should wait the duration of the batchTimeout and pass the correct batchSize if batched requests are enabled in the config', () => {
+      const mockAfterBidAdded = function() {};
+      let callback = null;
+      let mockTimeout = sinon.stub().callsFake((cb) => { callback = cb });
+
+      config.setConfig({
+        cache: {
+          url: 'https://prebid.adnxs.com/pbc/v1/cache',
+          batchSize: 3,
+          batchTimeout: 20
+        }
+      });
+
+      let stubCache = sinon.stub();
+      const batchAndStore = batchingCache(mockTimeout, stubCache);
+      for (let i = 0; i < 3; i++) {
+        batchAndStore({}, {}, mockAfterBidAdded);
+      }
+
+      sinon.assert.calledOnce(mockTimeout);
+      sinon.assert.calledWith(mockTimeout, sinon.match.any, 20);
+
+      const expectedBatch = [{ afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }, { afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }, { afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }];
+
+      callback();
+
+      sinon.assert.calledWith(stubCache, expectedBatch);
+    });
+
     function assertRequestMade(bid, expectedValue) {
       store([bid], function () { });
 
@@ -303,7 +339,7 @@ describe('The video cache', function () {
         puts: [{
           type: 'xml',
           value: expectedValue,
-          ttlseconds: 25
+          ttlseconds: 40
         }],
       });
     }
diff --git a/test/spec/video_spec.js b/test/spec/video_spec.js
index 72a585049c3..61621c7ec42 100644
--- a/test/spec/video_spec.js
+++ b/test/spec/video_spec.js
@@ -1,90 +1,103 @@
 import { isValidVideoBid } from 'src/video.js';
+import {hook} from '../../src/hook.js';
+import {stubAuctionIndex} from '../helpers/indexStub.js';
 
 describe('video.js', function () {
+  before(() => {
+    hook.ready();
+  });
+
   it('validates valid instream bids', function () {
     const bid = {
       adId: '456xyz',
       vastUrl: 'http://www.example.com/vastUrl',
-      requestId: '123abc'
+      transactionId: 'au'
     };
-    const bidRequests = [{
-      bids: [{
-        bidId: '123abc',
-        bidder: 'appnexus',
-        mediaTypes: {
-          video: { context: 'instream' }
-        }
-      }]
+    const adUnits = [{
+      transactionId: 'au',
+      mediaTypes: {
+        video: {context: 'instream'}
+      }
     }];
-    const valid = isValidVideoBid(bid, bidRequests);
+    const valid = isValidVideoBid(bid, {index: stubAuctionIndex({adUnits})});
     expect(valid).to.equal(true);
   });
 
   it('catches invalid instream bids', function () {
     const bid = {
-      requestId: '123abc'
+      transactionId: 'au'
     };
-    const bidRequests = [{
-      bids: [{
-        bidId: '123abc',
-        bidder: 'appnexus',
-        mediaTypes: {
-          video: { context: 'instream' }
-        }
-      }]
+    const adUnits = [{
+      transactionId: 'au',
+      mediaTypes: {
+        video: {context: 'instream'}
+      }
     }];
-    const valid = isValidVideoBid(bid, bidRequests);
+    const valid = isValidVideoBid(bid, {index: stubAuctionIndex({adUnits})});
     expect(valid).to.equal(false);
   });
 
   it('catches invalid bids when prebid-cache is disabled', function () {
-    const bidRequests = [{
-      bids: [{
-        bidder: 'vastOnlyVideoBidder',
-        mediaTypes: { video: {} },
-      }]
+    const adUnits = [{
+      transactionId: 'au',
+      bidder: 'vastOnlyVideoBidder',
+      mediaTypes: {video: {}},
     }];
 
-    const valid = isValidVideoBid({ vastXml: '<xml>vast</xml>' }, bidRequests);
+    const valid = isValidVideoBid({ transactionId: 'au', vastXml: '<xml>vast</xml>' }, {index: stubAuctionIndex({adUnits})});
 
     expect(valid).to.equal(false);
   });
 
   it('validates valid outstream bids', function () {
     const bid = {
-      requestId: '123abc',
+      transactionId: 'au',
       renderer: {
         url: 'render.url',
         render: () => true,
       }
     };
-    const bidRequests = [{
-      bids: [{
-        bidId: '123abc',
-        bidder: 'appnexus',
-        mediaTypes: {
-          video: { context: 'outstream' }
+    const adUnits = [{
+      transactionId: 'au',
+      mediaTypes: {
+        video: {context: 'outstream'}
+      }
+    }];
+    const valid = isValidVideoBid(bid, {index: stubAuctionIndex({adUnits})});
+    expect(valid).to.equal(true);
+  });
+
+  it('validates valid outstream bids with a publisher defined renderer', function () {
+    const bid = {
+      transactionId: 'au',
+    };
+    const adUnits = [{
+      transactionId: 'au',
+      mediaTypes: {
+        video: {
+          context: 'outstream',
         }
-      }]
+      },
+      renderer: {
+        url: 'render.url',
+        render: () => true,
+      }
     }];
-    const valid = isValidVideoBid(bid, bidRequests);
+    const valid = isValidVideoBid(bid, {index: stubAuctionIndex({adUnits})});
     expect(valid).to.equal(true);
   });
 
   it('catches invalid outstream bids', function () {
     const bid = {
-      requestId: '123abc'
+      transactionId: 'au',
     };
-    const bidRequests = [{
-      bids: [{
-        bidId: '123abc',
-        bidder: 'appnexus',
-        mediaTypes: {
-          video: { context: 'outstream' }
-        }
-      }]
+    const adUnits = [{
+      transactionId: 'au',
+      mediaTypes: {
+        video: {context: 'outstream'}
+      }
     }];
-    const valid = isValidVideoBid(bid, bidRequests);
+    const valid = isValidVideoBid(bid, {index: stubAuctionIndex({adUnits})});
     expect(valid).to.equal(false);
   });
 });
diff --git a/test/test_deps.js b/test/test_deps.js
new file mode 100644
index 00000000000..35713106f8c
--- /dev/null
+++ b/test/test_deps.js
@@ -0,0 +1,11 @@
+window.process = {
+  env: {
+    NODE_ENV: 'production'
+  }
+};
+
+require('test/helpers/consentData.js');
+require('test/helpers/prebidGlobal.js');
+require('test/mocks/adloaderStub.js');
+require('test/mocks/xhr.js');
+require('test/mocks/analyticsStub.js');
diff --git a/test/test_index.js b/test/test_index.js
index 53d75e36176..883f4d0590c 100644
--- a/test/test_index.js
+++ b/test/test_index.js
@@ -1,6 +1,4 @@
-require('test/helpers/prebidGlobal.js');
-require('test/mocks/adloaderStub.js');
-require('test/mocks/xhr.js');
+require('./test_deps.js');
 
 var testsContext = require.context('.', true, /_spec$/);
 testsContext.keys().forEach(testsContext);
diff --git a/wdio.conf.js b/wdio.conf.js
index 4d93f3d88d3..3d93f909971 100644
--- a/wdio.conf.js
+++ b/wdio.conf.js
@@ -1,65 +1,69 @@
-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 IE 11, 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;
 }
 
 exports.config = {
-    specs: [
-        './test/spec/e2e/**/*.spec.js'
-    ],
-    services: [
-      ['browserstack', {
-        browserstackLocal: true
-      }]
-    ],
-    user: process.env.BROWSERSTACK_USERNAME,
-    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
-    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
-    connectionRetryCount: 3, // Default request retries count
-    framework: 'mocha',
-    mochaOpts: {
-        ui: 'bdd',
-        timeout: 60000,
-        compilers: ['js:babel-register'],
-    },
-    // if you see error, update this to spec reporter and logLevel above to get detailed report.
-    reporters: ['concise']
+  specs: [
+    './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', {
+      browserstackLocal: true
+    }]
+  ],
+  user: process.env.BROWSERSTACK_USERNAME,
+  key: process.env.BROWSERSTACK_ACCESS_KEY,
+  maxInstances: 5, // Do not increase this, since we have only 5 parallel tests in browserstack account
+  maxInstancesPerCapability: 1,
+  capabilities: getCapabilities(),
+  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
+  connectionRetryCount: 3, // Default request retries count
+  framework: 'mocha',
+  mochaOpts: {
+    ui: 'bdd',
+    timeout: 60000,
+    compilers: ['js:babel-register'],
+  },
+  // if you see error, update this to spec reporter and logLevel above to get detailed report.
+  reporters: ['spec']
 }
diff --git a/webpack.conf.js b/webpack.conf.js
index a5c75fa8a1a..0ead550e446 100644
--- a/webpack.conf.js
+++ b/webpack.conf.js
@@ -1,19 +1,34 @@
+const TerserPlugin = require('terser-webpack-plugin');
 var prebid = require('./package.json');
 var path = require('path');
 var webpack = require('webpack');
-var helpers = require('./gulpHelpers');
-var RequireEnsureWithoutJsonp = require('./plugins/RequireEnsureWithoutJsonp.js');
+var helpers = require('./gulpHelpers.js');
 var { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 var argv = require('yargs').argv;
-var allowedModules = require('./allowedModules');
-
-// list of module names to never include in the common bundle chunk
-var neverBundle = [
-  'AnalyticsAdapter.js'
-];
+const fs = require('fs');
+const babelConfig = require('./babelConfig.js')({disableFeatures: helpers.getDisabledFeatures(), prebidDistUrlBase: argv.distUrlBase});
+const {WebpackManifestPlugin} = require('webpack-manifest-plugin')
 
 var plugins = [
-  new RequireEnsureWithoutJsonp()
+  new webpack.EnvironmentPlugin({'LiveConnectMode': null}),
+  new WebpackManifestPlugin({
+    fileName: 'dependencies.json',
+    generate: (seed, files) => {
+      const entries = new Set();
+      const addEntry = entries.add.bind(entries);
+
+      files.forEach(file => file.chunk && file.chunk._groups && file.chunk._groups.forEach(addEntry));
+
+      return Array.from(entries).reduce((acc, entry) => {
+        const name = (entry.options || {}).name || (entry.runtimeChunk || {}).name
+        const files = (entry.chunks || [])
+          .filter(chunk => chunk.name !== name)
+          .flatMap(chunk => [...chunk.files])
+          .filter(Boolean);
+        return name && files.length ? {...acc, [`${name}.js`]: files} : acc
+      }, seed)
+    }
+  })
 ];
 
 if (argv.analyze) {
@@ -22,25 +37,8 @@ if (argv.analyze) {
   )
 }
 
-plugins.push(  // this plugin must be last so it can be easily removed for karma unit tests
-  new webpack.optimize.CommonsChunkPlugin({
-    name: 'prebid',
-    filename: 'prebid-core.js',
-    minChunks: function(module) {
-       return (
-        (
-          module.context && module.context.startsWith(path.resolve('./src')) &&
-          !(module.resource && neverBundle.some(name => module.resource.includes(name)))
-        ) ||
-        module.resource && (allowedModules.src.concat(['core-js'])).some(
-          name => module.resource.includes(path.resolve('./node_modules/' + name))
-        )
-      );
-    }
-  })
-);
-
 module.exports = {
+  mode: 'production',
   devtool: 'source-map',
   resolve: {
     modules: [
@@ -48,8 +46,32 @@ module.exports = {
       'node_modules'
     ],
   },
+  entry: (() => {
+    const entry = {
+      'prebid-core': {
+        import: './src/prebid.js'
+      },
+      'debugging-standalone': {
+        import: './modules/debugging/standalone.js'
+      }
+    };
+    const selectedModules = new Set(helpers.getArgModules());
+
+    Object.entries(helpers.getModules()).forEach(([fn, mod]) => {
+      if (selectedModules.size === 0 || selectedModules.has(mod)) {
+        const moduleEntry = {
+          import: fn,
+          dependOn: 'prebid-core'
+        };
+
+        entry[mod] = moduleEntry;
+      }
+    });
+    return entry;
+  })(),
   output: {
-    jsonpFunction: prebid.globalVarName + "Chunk"
+    chunkLoadingGlobal: prebid.globalVarName + 'Chunk',
+    chunkLoading: 'jsonp',
   },
   module: {
     rules: [
@@ -59,7 +81,7 @@ module.exports = {
         use: [
           {
             loader: 'babel-loader',
-            options: helpers.getAnalyticsOptions(),
+            options: Object.assign({}, babelConfig, helpers.getAnalyticsOptions()),
           }
         ]
       },
@@ -69,10 +91,49 @@ module.exports = {
         use: [
           {
             loader: 'babel-loader',
+            options: babelConfig
           }
         ],
       }
     ]
   },
+  optimization: {
+    usedExports: true,
+    sideEffects: true,
+    minimizer: [
+      new TerserPlugin({
+        extractComments: false, // do not generate unhelpful LICENSE comment
+        terserOptions: {
+          module: true, // do not prepend every module with 'use strict'; allow mangling of top-level locals
+        }
+      })
+    ],
+    splitChunks: {
+      chunks: 'initial',
+      minChunks: 1,
+      minSize: 0,
+      cacheGroups: (() => {
+        const libRoot = path.resolve(__dirname, 'libraries');
+        const libraries = Object.fromEntries(
+          fs.readdirSync(libRoot)
+            .filter((f) => fs.lstatSync(path.resolve(libRoot, f)).isDirectory())
+            .map(lib => {
+              const dir = path.resolve(libRoot, lib)
+              const def = {
+                name: lib,
+                test: (module) => {
+                  return module.resource && module.resource.startsWith(dir)
+                }
+              }
+              return [lib, def];
+            })
+        );
+        return Object.assign(libraries, {
+          default: false,
+          defaultVendors: false
+        })
+      })()
+    }
+  },
   plugins
 };